Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

Conflicts:
	avmedia/inc/avmedia/mediaitem.hxx
	avmedia/prj/build.lst
	avmedia/source/framework/mediaitem.cxx
	avmedia/source/gstreamer/gstcommon.hxx
	avmedia/source/gstreamer/gstframegrabber.cxx
	avmedia/source/gstreamer/gstframegrabber.hxx
	avmedia/source/gstreamer/gstmanager.cxx
	avmedia/source/gstreamer/gstmanager.hxx
	avmedia/source/gstreamer/gstplayer.cxx
	avmedia/source/gstreamer/gstplayer.hxx
	avmedia/source/gstreamer/gstuno.cxx
	avmedia/source/gstreamer/gstwindow.cxx
	avmedia/source/gstreamer/gstwindow.hxx
	avmedia/source/gstreamer/makefile.mk
	avmedia/source/quicktime/quicktimeuno.cxx
	avmedia/source/viewer/mediawindow.cxx
	avmedia/source/viewer/mediawindow_impl.cxx
	avmedia/source/viewer/mediawindow_impl.hxx
	avmedia/source/viewer/mediawindowbase_impl.cxx
	avmedia/source/win/winuno.cxx
	basic/inc/basic/basmgr.hxx
	basic/inc/basic/mybasic.hxx
	basic/inc/basic/process.hxx
	basic/inc/basic/sbmeth.hxx
	basic/inc/basic/sbmod.hxx
	basic/inc/basic/sbxdef.hxx
	basic/inc/basic/sbxvar.hxx
	basic/source/app/app.cxx
	basic/source/app/app.hxx
	basic/source/app/appbased.cxx
	basic/source/app/appedit.cxx
	basic/source/app/appwin.cxx
	basic/source/app/appwin.hxx
	basic/source/app/brkpnts.cxx
	basic/source/app/brkpnts.hxx
	basic/source/app/dialogs.cxx
	basic/source/app/dialogs.hxx
	basic/source/app/msgedit.cxx
	basic/source/app/mybasic.cxx
	basic/source/app/process.cxx
	basic/source/app/processw.hxx
	basic/source/app/textedit.cxx
	basic/source/basmgr/basicmanagerrepository.cxx
	basic/source/basmgr/basmgr.cxx
	basic/source/classes/disas.cxx
	basic/source/classes/eventatt.cxx
	basic/source/classes/image.cxx
	basic/source/classes/sb.cxx
	basic/source/classes/sbunoobj.cxx
	basic/source/classes/sbxmod.cxx
	basic/source/comp/codegen.cxx
	basic/source/comp/dim.cxx
	basic/source/comp/exprgen.cxx
	basic/source/comp/exprnode.cxx
	basic/source/comp/exprtree.cxx
	basic/source/comp/sbcomp.cxx
	basic/source/inc/expr.hxx
	basic/source/inc/object.hxx
	basic/source/inc/sbunoobj.hxx
	basic/source/runtime/dllmgr-x86.cxx
	basic/source/runtime/iosys.cxx
	basic/source/runtime/makefile.mk
	basic/source/runtime/methods.cxx
	basic/source/runtime/methods1.cxx
	basic/source/runtime/runtime.cxx
	basic/source/runtime/stdobj.cxx
	basic/source/runtime/step0.cxx
	basic/source/runtime/step1.cxx
	basic/source/runtime/step2.cxx
	basic/source/sbx/sbxarray.cxx
	basic/source/sbx/sbxbase.cxx
	basic/source/sbx/sbxbool.cxx
	basic/source/sbx/sbxbyte.cxx
	basic/source/sbx/sbxcoll.cxx
	basic/source/sbx/sbxconv.hxx
	basic/source/sbx/sbxcurr.cxx
	basic/source/sbx/sbxexec.cxx
	basic/source/sbx/sbxint.cxx
	basic/source/sbx/sbxobj.cxx
	basic/source/sbx/sbxscan.cxx
	basic/source/sbx/sbxstr.cxx
	basic/source/sbx/sbxvals.cxx
	basic/source/sbx/sbxvalue.cxx
	basic/source/sbx/sbxvar.cxx
	basic/workben/mgrtest.cxx
	configmgr/prj/build.lst
	configmgr/source/access.cxx
	configmgr/source/configurationprovider.cxx
	configmgr/source/defaultprovider.cxx
	configmgr/source/pad.cxx
	configmgr/source/services.cxx
	configmgr/source/update.cxx
	configmgr/source/xmlreader.cxx
	configmgr/source/xmlreader.hxx
	connectivity/prj/build.lst
	connectivity/qa/complex/connectivity/TestCase.java
	connectivity/source/cpool/Zregistration.cxx
	connectivity/source/drivers/adabas/Bservices.cxx
	connectivity/source/drivers/ado/Aservices.cxx
	connectivity/source/drivers/calc/Cservices.cxx
	connectivity/source/drivers/calc/makefile.mk
	connectivity/source/drivers/dbase/DIndex.cxx
	connectivity/source/drivers/dbase/DIndexIter.cxx
	connectivity/source/drivers/dbase/DNoException.cxx
	connectivity/source/drivers/dbase/DTable.cxx
	connectivity/source/drivers/dbase/Dservices.cxx
	connectivity/source/drivers/dbase/dindexnode.cxx
	connectivity/source/drivers/evoab/LNoException.cxx
	connectivity/source/drivers/evoab/LServices.cxx
	connectivity/source/drivers/evoab2/NServices.cxx
	connectivity/source/drivers/file/FNoException.cxx
	connectivity/source/drivers/file/FPreparedStatement.cxx
	connectivity/source/drivers/file/FResultSet.cxx
	connectivity/source/drivers/file/FStatement.cxx
	connectivity/source/drivers/file/quotedstring.cxx
	connectivity/source/drivers/flat/ETable.cxx
	connectivity/source/drivers/flat/Eservices.cxx
	connectivity/source/drivers/hsqldb/Hservices.cxx
	connectivity/source/drivers/jdbc/jservices.cxx
	connectivity/source/drivers/kab/KServices.cxx
	connectivity/source/drivers/macab/MacabServices.cxx
	connectivity/source/drivers/mozab/MResultSet.cxx
	connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
	connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
	connectivity/source/drivers/mysql/Yservices.cxx
	connectivity/source/drivers/odbc/OFunctions.cxx
	connectivity/source/drivers/odbc/oservices.cxx
	connectivity/source/inc/dbase/DIndexPage.hxx
	connectivity/source/inc/file/FTable.hxx
	connectivity/source/manager/mregistration.cxx
	connectivity/source/parse/PColumn.cxx
	desktop/prj/build.lst
	desktop/qa/deployment_misc/test_dp_version.cxx
	desktop/source/app/app.cxx
	desktop/source/app/appfirststart.cxx
	desktop/source/app/cmdlineargs.cxx
	desktop/source/app/cmdlineargs.hxx
	desktop/source/app/sofficemain.cxx
	desktop/source/deployment/gui/dp_gui.hrc
	desktop/source/deployment/gui/dp_gui_dialog2.cxx
	desktop/source/deployment/gui/dp_gui_dialog2.hxx
	desktop/source/deployment/gui/dp_gui_updatedialog.cxx
	desktop/source/deployment/gui/dp_gui_updatedialog.hxx
	desktop/source/deployment/manager/dp_extensionmanager.cxx
	desktop/source/deployment/manager/dp_extensionmanager.hxx
	desktop/source/deployment/misc/dp_misc.src
	desktop/source/deployment/registry/component/dp_component.cxx
	desktop/source/deployment/registry/configuration/dp_configuration.cxx
	desktop/source/deployment/registry/dp_backend.cxx
	desktop/source/deployment/registry/help/dp_help.cxx
	desktop/source/deployment/registry/script/dp_script.cxx
	desktop/source/migration/pages.cxx
	desktop/source/migration/pages.hxx
	desktop/source/migration/wizard.cxx
	desktop/source/migration/wizard.hrc
	desktop/source/migration/wizard.hxx
	desktop/source/migration/wizard.src
	desktop/source/pkgchk/unopkg/unopkg_shared.h
	desktop/source/so_comp/services.cxx
	desktop/source/splash/makefile.mk
	desktop/source/splash/services_spl.cxx
	desktop/source/splash/splash.cxx
	drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
	editeng/inc/editeng/adjitem.hxx
	editeng/inc/editeng/bolnitem.hxx
	editeng/inc/editeng/borderline.hxx
	editeng/inc/editeng/boxitem.hxx
	editeng/inc/editeng/brkitem.hxx
	editeng/inc/editeng/brshitem.hxx
	editeng/inc/editeng/bulitem.hxx
	editeng/inc/editeng/charreliefitem.hxx
	editeng/inc/editeng/charrotateitem.hxx
	editeng/inc/editeng/charscaleitem.hxx
	editeng/inc/editeng/cmapitem.hxx
	editeng/inc/editeng/colritem.hxx
	editeng/inc/editeng/crsditem.hxx
	editeng/inc/editeng/editdata.hxx
	editeng/inc/editeng/editeng.hxx
	editeng/inc/editeng/editobj.hxx
	editeng/inc/editeng/editstat.hxx
	editeng/inc/editeng/editview.hxx
	editeng/inc/editeng/emphitem.hxx
	editeng/inc/editeng/escpitem.hxx
	editeng/inc/editeng/fhgtitem.hxx
	editeng/inc/editeng/flstitem.hxx
	editeng/inc/editeng/fontitem.hxx
	editeng/inc/editeng/frmdiritem.hxx
	editeng/inc/editeng/fwdtitem.hxx
	editeng/inc/editeng/hyznitem.hxx
	editeng/inc/editeng/kernitem.hxx
	editeng/inc/editeng/langitem.hxx
	editeng/inc/editeng/lrspitem.hxx
	editeng/inc/editeng/lspcitem.hxx
	editeng/inc/editeng/numitem.hxx
	editeng/inc/editeng/outliner.hxx
	editeng/inc/editeng/paravertalignitem.hxx
	editeng/inc/editeng/pmdlitem.hxx
	editeng/inc/editeng/postitem.hxx
	editeng/inc/editeng/protitem.hxx
	editeng/inc/editeng/shaditem.hxx
	editeng/inc/editeng/sizeitem.hxx
	editeng/inc/editeng/svxacorr.hxx
	editeng/inc/editeng/svxfont.hxx
	editeng/inc/editeng/svxrtf.hxx
	editeng/inc/editeng/swafopt.hxx
	editeng/inc/editeng/tstpitem.hxx
	editeng/inc/editeng/twolinesitem.hxx
	editeng/inc/editeng/txtrange.hxx
	editeng/inc/editeng/udlnitem.hxx
	editeng/inc/editeng/ulspitem.hxx
	editeng/inc/editeng/wghtitem.hxx
	editeng/inc/editeng/writingmodeitem.hxx
	editeng/inc/editeng/xmlcnitm.hxx
	editeng/inc/helpid.hrc
	editeng/inc/pch/precompiled_editeng.hxx
	editeng/source/editeng/editdbg.cxx
	editeng/source/editeng/editdoc.cxx
	editeng/source/editeng/editdoc.hxx
	editeng/source/editeng/editdoc2.cxx
	editeng/source/editeng/editeng.cxx
	editeng/source/editeng/editobj.cxx
	editeng/source/editeng/editobj2.hxx
	editeng/source/editeng/editsel.cxx
	editeng/source/editeng/editundo.cxx
	editeng/source/editeng/editundo.hxx
	editeng/source/editeng/editview.cxx
	editeng/source/editeng/edtspell.hxx
	editeng/source/editeng/eehtml.cxx
	editeng/source/editeng/eehtml.hxx
	editeng/source/editeng/eeobj.cxx
	editeng/source/editeng/eerdll.cxx
	editeng/source/editeng/eertfpar.cxx
	editeng/source/editeng/impedit.cxx
	editeng/source/editeng/impedit.hxx
	editeng/source/editeng/impedit2.cxx
	editeng/source/editeng/impedit3.cxx
	editeng/source/editeng/impedit4.cxx
	editeng/source/editeng/impedit5.cxx
	editeng/source/editeng/makefile.mk
	editeng/source/items/bulitem.cxx
	editeng/source/items/charhiddenitem.cxx
	editeng/source/items/flditem.cxx
	editeng/source/items/frmitems.cxx
	editeng/source/items/makefile.mk
	editeng/source/items/numitem.cxx
	editeng/source/items/paraitem.cxx
	editeng/source/items/svxfont.cxx
	editeng/source/items/textitem.cxx
	editeng/source/items/writingmodeitem.cxx
	editeng/source/items/xmlcnitm.cxx
	editeng/source/misc/SvXMLAutoCorrectImport.cxx
	editeng/source/misc/svxacorr.cxx
	editeng/source/misc/txtrange.cxx
	editeng/source/misc/unolingu.cxx
	editeng/source/outliner/outleeng.cxx
	editeng/source/outliner/outliner.cxx
	editeng/source/outliner/outlundo.hxx
	editeng/source/outliner/outlvw.cxx
	editeng/source/outliner/paralist.cxx
	editeng/source/outliner/paralist.hxx
	editeng/source/rtf/rtfgrf.cxx
	editeng/source/rtf/rtfitem.cxx
	editeng/source/rtf/svxrtf.cxx
	editeng/source/uno/unoipset.cxx
	editeng/util/makefile.mk
	embeddedobj/prj/build.lst
	embeddedobj/source/commonembedding/miscobj.cxx
	eventattacher/prj/build.lst
	fileaccess/source/FileAccess.cxx
	formula/inc/formula/FormulaCompiler.hxx
	formula/inc/formula/token.hxx
	formula/inc/formula/tokenarray.hxx
	formula/source/core/api/FormulaCompiler.cxx
	formula/source/core/api/token.cxx
	formula/source/ui/dlg/FormulaHelper.cxx
	formula/source/ui/dlg/formula.cxx
	formula/source/ui/dlg/parawin.cxx
	formula/source/ui/dlg/structpg.cxx
	fpicker/prj/d.lst
	fpicker/source/aqua/FPentry.cxx
	fpicker/source/office/OfficeControlAccess.cxx
	fpicker/source/office/iodlg.cxx
	fpicker/source/office/iodlg.hxx
	fpicker/source/office/iodlg.src
	fpicker/source/office/iodlgimp.cxx
	fpicker/source/unx/gnome/FPentry.cxx
	fpicker/source/unx/gnome/SalGtkFilePicker.cxx
	fpicker/source/unx/gnome/SalGtkPicker.cxx
	fpicker/source/unx/kde4/KDE4FPEntry.cxx
	fpicker/source/win32/filepicker/FPentry.cxx
	framework/AllLangResTarget_fwe.mk
	framework/inc/dispatch/interaction.hxx
	framework/inc/framework/addonmenu.hxx
	framework/inc/framework/addonsoptions.hxx
	framework/inc/framework/bmkmenu.hxx
	framework/inc/framework/imageproducer.hxx
	framework/inc/framework/sfxhelperfunctions.hxx
	framework/inc/framework/statusbarconfiguration.hxx
	framework/inc/framework/titlehelper.hxx
	framework/inc/framework/toolboxconfiguration.hxx
	framework/inc/threadhelp/lockhelper.hxx
	framework/inc/xml/eventsdocumenthandler.hxx
	framework/inc/xml/statusbardocumenthandler.hxx
	framework/inc/xml/toolboxconfiguration.hxx
	framework/inc/xml/toolboxconfigurationdefines.hxx
	framework/inc/xml/toolboxdocumenthandler.hxx
	framework/prj/build.lst
	framework/qa/complex/ModuleManager/makefile.mk
	framework/qa/complex/accelerators/makefile.mk
	framework/qa/complex/framework/recovery/makefile.mk
	framework/qa/complex/imageManager/_XInitialization.java
	framework/source/classes/menumanager.cxx
	framework/source/dispatch/interaction.cxx
	framework/source/fwe/classes/bmkmenu.cxx
	framework/source/fwe/helper/actiontriggerhelper.cxx
	framework/source/fwe/helper/imageproducer.cxx
	framework/source/fwe/xml/menuconfiguration.cxx
	framework/source/fwe/xml/toolboxdocumenthandler.cxx
	framework/source/helper/uiconfigelementwrapperbase.cxx
	framework/source/helper/uielementwrapperbase.cxx
	framework/source/inc/pattern/window.hxx
	framework/source/jobs/jobdata.cxx
	framework/source/layoutmanager/layoutmanager.cxx
	framework/source/layoutmanager/panel.hxx
	framework/source/loadenv/loadenv.cxx
	framework/source/register/registerservices.cxx
	framework/source/services/menudocumenthandler.cxx
	framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
	framework/source/uiconfiguration/uiconfigurationmanager.cxx
	framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
	framework/source/uielement/addonstoolbarmanager.cxx
	framework/source/uielement/controlmenucontroller.cxx
	framework/source/uielement/fontsizemenucontroller.cxx
	framework/source/uielement/imagebuttontoolbarcontroller.cxx
	framework/source/uielement/macrosmenucontroller.cxx
	framework/source/uielement/menubarmanager.cxx
	framework/source/uielement/newmenucontroller.cxx
	framework/source/uielement/togglebuttontoolbarcontroller.cxx
	framework/source/uielement/toolbarmanager.cxx
	framework/source/uielement/toolbarsmenucontroller.cxx
	framework/test/makefile.mk
	framework/test/threadtest/makefile.mk
	framework/test/typecfg/makefile.mk
	framework/util/guiapps/makefile.mk
	framework/util/makefile.mk
	idl/inc/bastype.hxx
	idl/inc/hash.hxx
	idl/inc/lex.hxx
	idl/inc/module.hxx
	idl/inc/object.hxx
	idl/inc/slot.hxx
	idl/inc/types.hxx
	idl/source/cmptools/hash.cxx
	idl/source/cmptools/lex.cxx
	idl/source/objects/basobj.cxx
	idl/source/objects/bastype.cxx
	idl/source/objects/module.cxx
	idl/source/objects/object.cxx
	idl/source/objects/slot.cxx
	idl/source/objects/types.cxx
	idl/source/prj/command.cxx
	idl/source/prj/database.cxx
	idl/source/prj/globals.cxx
	idl/source/prj/svidl.cxx
	linguistic/inc/linguistic/misc.hxx
	linguistic/prj/build.lst
	linguistic/source/convdic.cxx
	linguistic/source/convdiclist.cxx
	linguistic/source/dicimp.cxx
	linguistic/source/dlistimp.cxx
	linguistic/source/gciterator.cxx
	linguistic/source/iprcache.cxx
	linguistic/source/lngopt.cxx
	linguistic/source/lngprophelp.cxx
	linguistic/source/lngsvcmgr.cxx
	linguistic/source/lngsvcmgr.hxx
	linguistic/source/misc2.cxx
	linguistic/workben/sprophelp.cxx
	officecfg/registry/data/org/openoffice/VCL.xcu
	officecfg/util/makefile.mk
	oovbaapi/ooo/vba/XApplicationBase.idl
	oovbaapi/ooo/vba/XVBAAppService.idl
	oovbaapi/ooo/vba/XVBADocService.idl
	oovbaapi/ooo/vba/excel/XApplication.idl
	oovbaapi/ooo/vba/excel/XRange.idl
	oovbaapi/ooo/vba/excel/XWorkbook.idl
	oovbaapi/ooo/vba/excel/XWorksheet.idl
	oovbaapi/ooo/vba/word/XApplication.idl
	oovbaapi/ooo/vba/word/XGlobals.idl
	oovbaapi/ooo/vba/word/XTableOfContents.idl
	readlicense_oo/prj/build.lst
	scripting/prj/build.lst
	scripting/prj/d.lst
	scripting/source/basprov/basprov.cxx
	scripting/source/basprov/basscript.cxx
	scripting/source/basprov/basscript.hxx
	scripting/source/dlgprov/dlgprov.cxx
	scripting/source/inc/util/util.hxx
	scripting/source/protocolhandler/scripthandler.cxx
	scripting/source/provider/ProviderCache.cxx
	scripting/source/pyprov/makefile.mk
	scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
	scripting/source/runtimemgr/ScriptRuntimeManager.cxx
	scripting/source/runtimemgr/StorageBridge.cxx
	scripting/source/storage/ScriptMetadataImporter.cxx
	scripting/source/storage/ScriptSecurityManager.cxx
	scripting/source/storage/ScriptStorage.cxx
	scripting/source/storage/ScriptStorageManager.cxx
	sfx2/inc/about.hxx
	sfx2/inc/brokenpackageint.hxx
	sfx2/inc/docvor.hxx
	sfx2/inc/pch/precompiled_sfx2.hxx
	sfx2/inc/sfx2/app.hxx
	sfx2/inc/sfx2/basmgr.hxx
	sfx2/inc/sfx2/bindings.hxx
	sfx2/inc/sfx2/childwin.hxx
	sfx2/inc/sfx2/ctrlitem.hxx
	sfx2/inc/sfx2/dinfdlg.hxx
	sfx2/inc/sfx2/dispatch.hxx
	sfx2/inc/sfx2/docfilt.hxx
	sfx2/inc/sfx2/evntconf.hxx
	sfx2/inc/sfx2/fcontnr.hxx
	sfx2/inc/sfx2/frame.hxx
	sfx2/inc/sfx2/imagemgr.hxx
	sfx2/inc/sfx2/imgmgr.hxx
	sfx2/inc/sfx2/linksrc.hxx
	sfx2/inc/sfx2/macrconf.hxx
	sfx2/inc/sfx2/macropg.hxx
	sfx2/inc/sfx2/mnuitem.hxx
	sfx2/inc/sfx2/mnumgr.hxx
	sfx2/inc/sfx2/module.hxx
	sfx2/inc/sfx2/msg.hxx
	sfx2/inc/sfx2/objsh.hxx
	sfx2/inc/sfx2/passwd.hxx
	sfx2/inc/sfx2/prnmon.hxx
	sfx2/inc/sfx2/request.hxx
	sfx2/inc/sfx2/sfx.hrc
	sfx2/inc/sfx2/sfxbasemodel.hxx
	sfx2/inc/sfx2/sfxhtml.hxx
	sfx2/inc/sfx2/sfxresid.hxx
	sfx2/inc/sfx2/sfxsids.hrc
	sfx2/inc/sfx2/sfxuno.hxx
	sfx2/inc/sfx2/shell.hxx
	sfx2/inc/sfx2/stbitem.hxx
	sfx2/inc/sfx2/styfitem.hxx
	sfx2/inc/sfx2/tabdlg.hxx
	sfx2/inc/sfx2/tbxctrl.hxx
	sfx2/inc/sfx2/tplpitem.hxx
	sfx2/inc/sfx2/viewfrm.hxx
	sfx2/inc/sfx2/viewsh.hxx
	sfx2/inc/sfxbasic.hxx
	sfx2/inc/sorgitm.hxx
	sfx2/prj/build.lst
	sfx2/qa/complex/docinfo/makefile.mk
	sfx2/qa/cppunit/makefile.mk
	sfx2/sdi/makefile.mk
	sfx2/source/appl/app.cxx
	sfx2/source/appl/app.hrc
	sfx2/source/appl/app.src
	sfx2/source/appl/appbas.cxx
	sfx2/source/appl/appcfg.cxx
	sfx2/source/appl/appchild.cxx
	sfx2/source/appl/appmain.cxx
	sfx2/source/appl/appmisc.cxx
	sfx2/source/appl/appopen.cxx
	sfx2/source/appl/appquit.cxx
	sfx2/source/appl/appserv.cxx
	sfx2/source/appl/appuno.cxx
	sfx2/source/appl/childwin.cxx
	sfx2/source/appl/fileobj.cxx
	sfx2/source/appl/helpinterceptor.cxx
	sfx2/source/appl/imagemgr.cxx
	sfx2/source/appl/impldde.cxx
	sfx2/source/appl/impldde.hxx
	sfx2/source/appl/linkmgr2.cxx
	sfx2/source/appl/lnkbase2.cxx
	sfx2/source/appl/makefile.mk
	sfx2/source/appl/module.cxx
	sfx2/source/appl/newhelp.cxx
	sfx2/source/appl/opengrf.cxx
	sfx2/source/appl/sfxdll.cxx
	sfx2/source/appl/sfxhelp.cxx
	sfx2/source/appl/shutdownicon.cxx
	sfx2/source/appl/shutdowniconunx.cxx
	sfx2/source/appl/workwin.cxx
	sfx2/source/bastyp/fltfnc.cxx
	sfx2/source/bastyp/frmhtml.cxx
	sfx2/source/bastyp/frmhtmlw.cxx
	sfx2/source/bastyp/helper.cxx
	sfx2/source/bastyp/minarray.cxx
	sfx2/source/bastyp/progress.cxx
	sfx2/source/bastyp/sfxhtml.cxx
	sfx2/source/config/evntconf.cxx
	sfx2/source/control/bindings.cxx
	sfx2/source/control/ctrlitem.cxx
	sfx2/source/control/dispatch.cxx
	sfx2/source/control/macrconf.cxx
	sfx2/source/control/macro.cxx
	sfx2/source/control/makefile.mk
	sfx2/source/control/minfitem.cxx
	sfx2/source/control/msg.cxx
	sfx2/source/control/msgpool.cxx
	sfx2/source/control/objface.cxx
	sfx2/source/control/request.cxx
	sfx2/source/control/shell.cxx
	sfx2/source/control/sorgitm.cxx
	sfx2/source/dialog/about.cxx
	sfx2/source/dialog/basedlgs.cxx
	sfx2/source/dialog/dinfdlg.cxx
	sfx2/source/dialog/dinfedt.cxx
	sfx2/source/dialog/dockwin.cxx
	sfx2/source/dialog/filedlghelper.cxx
	sfx2/source/dialog/mailmodel.cxx
	sfx2/source/dialog/mailmodelapi.cxx
	sfx2/source/dialog/makefile.mk
	sfx2/source/dialog/mgetempl.cxx
	sfx2/source/dialog/passwd.cxx
	sfx2/source/dialog/passwd.hrc
	sfx2/source/dialog/printopt.cxx
	sfx2/source/dialog/securitypage.cxx
	sfx2/source/dialog/splitwin.cxx
	sfx2/source/dialog/styfitem.cxx
	sfx2/source/dialog/tabdlg.cxx
	sfx2/source/dialog/taskpane.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/dialog/tplpitem.cxx
	sfx2/source/dialog/versdlg.cxx
	sfx2/source/doc/QuerySaveDocument.cxx
	sfx2/source/doc/SfxDocumentMetaData.cxx
	sfx2/source/doc/applet.cxx
	sfx2/source/doc/doc.hrc
	sfx2/source/doc/doc.src
	sfx2/source/doc/docfile.cxx
	sfx2/source/doc/docinf.cxx
	sfx2/source/doc/doctempl.cxx
	sfx2/source/doc/doctemplates.cxx
	sfx2/source/doc/docvor.cxx
	sfx2/source/doc/guisaveas.cxx
	sfx2/source/doc/makefile.mk
	sfx2/source/doc/objcont.cxx
	sfx2/source/doc/objitem.cxx
	sfx2/source/doc/objmisc.cxx
	sfx2/source/doc/objserv.cxx
	sfx2/source/doc/printhelper.cxx
	sfx2/source/doc/sfxacldetect.cxx
	sfx2/source/doc/sfxbasemodel.cxx
	sfx2/source/inc/applet.hxx
	sfx2/source/inc/fltoptint.hxx
	sfx2/source/inc/sfxlocal.hrc
	sfx2/source/inc/virtmenu.hxx
	sfx2/source/inc/workwin.hxx
	sfx2/source/menu/mnuitem.cxx
	sfx2/source/menu/objmnctl.cxx
	sfx2/source/menu/virtmenu.cxx
	sfx2/source/notify/eventsupplier.cxx
	sfx2/source/notify/makefile.mk
	sfx2/source/toolbox/imgmgr.cxx
	sfx2/source/toolbox/tbxitem.cxx
	sfx2/source/view/frame.cxx
	sfx2/source/view/orgmgr.cxx
	sfx2/source/view/printer.cxx
	sfx2/source/view/prnmon.cxx
	sfx2/source/view/viewfrm.cxx
	sfx2/source/view/viewprn.cxx
	sfx2/source/view/viewsh.cxx
	sfx2/util/makefile.mk
	sfx2/workben/custompanel/makefile.mk
	shell/source/backends/desktopbe/desktopbackend.cxx
	shell/source/backends/gconfbe/gconfbackend.cxx
	shell/source/backends/kde4be/kde4backend.cxx
	shell/source/backends/kdebe/kdebackend.cxx
	shell/source/win32/SysShentry.cxx
	shell/source/win32/shlxthandler/propsheets/propsheets.cxx
	shell/source/win32/simplemail/smplmailentry.cxx
	svx/inc/float3d.hrc
	svx/inc/fmhelp.hrc
	svx/inc/globlmn_tmpl.hrc
	svx/inc/helpid.hrc
	svx/inc/pch/precompiled_svx.hxx
	svx/inc/sjctrl.hxx
	svx/inc/srchitem.hxx
	svx/inc/svdibrow.hxx
	svx/inc/svx/SmartTagItem.hxx
	svx/inc/svx/algitem.hxx
	svx/inc/svx/camera3d.hxx
	svx/inc/svx/chrtitem.hxx
	svx/inc/svx/clipfmtitem.hxx
	svx/inc/svx/ctredlin.hxx
	svx/inc/svx/dbtoolsclient.hxx
	svx/inc/svx/deflt3d.hxx
	svx/inc/svx/dialogs.hrc
	svx/inc/svx/drawitem.hxx
	svx/inc/svx/e3ditem.hxx
	svx/inc/svx/extrud3d.hxx
	svx/inc/svx/flagsdef.hxx
	svx/inc/svx/float3d.hxx
	svx/inc/svx/frmsel.hxx
	svx/inc/svx/gallery.hxx
	svx/inc/svx/gallery1.hxx
	svx/inc/svx/galtheme.hxx
	svx/inc/svx/grfcrop.hxx
	svx/inc/svx/hdft.hxx
	svx/inc/svx/hlnkitem.hxx
	svx/inc/svx/hyprlink.hxx
	svx/inc/svx/itemwin.hxx
	svx/inc/svx/lathe3d.hxx
	svx/inc/svx/linkwarn.hxx
	svx/inc/svx/modctrl.hxx
	svx/inc/svx/msdffdef.hxx
	svx/inc/svx/obj3d.hxx
	svx/inc/svx/optgenrl.hxx
	svx/inc/svx/optgrid.hxx
	svx/inc/svx/pageitem.hxx
	svx/inc/svx/paraprev.hxx
	svx/inc/svx/postattr.hxx
	svx/inc/svx/rotmodit.hxx
	svx/inc/svx/ruler.hxx
	svx/inc/svx/rulritem.hxx
	svx/inc/svx/scene3d.hxx
	svx/inc/svx/sdasaitm.hxx
	svx/inc/svx/sdasitm.hxx
	svx/inc/svx/sdggaitm.hxx
	svx/inc/svx/sdmetitm.hxx
	svx/inc/svx/sdtaaitm.hxx
	svx/inc/svx/sdtaditm.hxx
	svx/inc/svx/sdtaitm.hxx
	svx/inc/svx/sdtakitm.hxx
	svx/inc/svx/sdtfchim.hxx
	svx/inc/svx/sdtfsitm.hxx
	svx/inc/svx/srchdlg.hxx
	svx/inc/svx/svddrag.hxx
	svx/inc/svx/svdetc.hxx
	svx/inc/svx/svdglue.hxx
	svx/inc/svx/svdhlpln.hxx
	svx/inc/svx/svdlayer.hxx
	svx/inc/svx/svdmark.hxx
	svx/inc/svx/svdmodel.hxx
	svx/inc/svx/svdoashp.hxx
	svx/inc/svx/svdobj.hxx
	svx/inc/svx/svdocirc.hxx
	svx/inc/svx/svdoedge.hxx
	svx/inc/svx/svdogrp.hxx
	svx/inc/svx/svdomeas.hxx
	svx/inc/svx/svdoole2.hxx
	svx/inc/svx/svdorect.hxx
	svx/inc/svx/svdotable.hxx
	svx/inc/svx/svdotext.hxx
	svx/inc/svx/svdovirt.hxx
	svx/inc/svx/svdpage.hxx
	svx/inc/svx/svdsnpv.hxx
	svx/inc/svx/svdtrans.hxx
	svx/inc/svx/svdundo.hxx
	svx/inc/svx/svimbase.hxx
	svx/inc/svx/svx3ditems.hxx
	svx/inc/svx/svxdlg.hxx
	svx/inc/svx/sxcikitm.hxx
	svx/inc/svx/sxekitm.hxx
	svx/inc/svx/sxelditm.hxx
	svx/inc/svx/sxenditm.hxx
	svx/inc/svx/sxmkitm.hxx
	svx/inc/svx/sxmtpitm.hxx
	svx/inc/svx/sxmuitm.hxx
	svx/inc/svx/tabarea.hxx
	svx/inc/svx/tabline.hxx
	svx/inc/svx/unoprov.hxx
	svx/inc/svx/viewlayoutitem.hxx
	svx/inc/svx/xbitmap.hxx
	svx/inc/svx/xbtmpit.hxx
	svx/inc/svx/xcolit.hxx
	svx/inc/svx/xfillit0.hxx
	svx/inc/svx/xflclit.hxx
	svx/inc/svx/xflftrit.hxx
	svx/inc/svx/xflgrit.hxx
	svx/inc/svx/xflhtit.hxx
	svx/inc/svx/xftadit.hxx
	svx/inc/svx/xftsfit.hxx
	svx/inc/svx/xftshit.hxx
	svx/inc/svx/xlineit0.hxx
	svx/inc/svx/xlinjoit.hxx
	svx/inc/svx/xlnclit.hxx
	svx/inc/svx/xlndsit.hxx
	svx/inc/svx/xlnedcit.hxx
	svx/inc/svx/xlnedit.hxx
	svx/inc/svx/xlnedwit.hxx
	svx/inc/svx/xlnstcit.hxx
	svx/inc/svx/xlnstit.hxx
	svx/inc/svx/xlnstwit.hxx
	svx/inc/svx/xlnwtit.hxx
	svx/inc/svx/xtextit0.hxx
	svx/inc/svx/zoomitem.hxx
	svx/inc/svx/zoomslideritem.hxx
	svx/inc/xpolyimp.hxx
	svx/inc/zoom_def.hxx
	svx/prj/d.lst
	svx/source/accessibility/AccessibleShape.cxx
	svx/source/accessibility/DescriptionGenerator.cxx
	svx/source/customshapes/EnhancedCustomShapeEngine.cxx
	svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
	svx/source/dialog/_bmpmask.cxx
	svx/source/dialog/_contdlg.cxx
	svx/source/dialog/connctrl.cxx
	svx/source/dialog/contwnd.cxx
	svx/source/dialog/ctredlin.cxx
	svx/source/dialog/ctredlin.hrc
	svx/source/dialog/ctredlin.src
	svx/source/dialog/dialcontrol.cxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/dialog/docrecovery.cxx
	svx/source/dialog/fntctrl.cxx
	svx/source/dialog/fontwork.cxx
	svx/source/dialog/frmsel.cxx
	svx/source/dialog/graphctl.cxx
	svx/source/dialog/grfflt.cxx
	svx/source/dialog/hdft.cxx
	svx/source/dialog/hyperdlg.cxx
	svx/source/dialog/hyprdlg.hxx
	svx/source/dialog/hyprlink.cxx
	svx/source/dialog/hyprlink.hxx
	svx/source/dialog/hyprlink.src
	svx/source/dialog/imapdlg.cxx
	svx/source/dialog/imapwnd.cxx
	svx/source/dialog/linkwarn.hrc
	svx/source/dialog/makefile.mk
	svx/source/dialog/optgrid.cxx
	svx/source/dialog/orienthelper.cxx
	svx/source/dialog/pagectrl.cxx
	svx/source/dialog/prtqry.cxx
	svx/source/dialog/rlrcitem.cxx
	svx/source/dialog/rubydialog.cxx
	svx/source/dialog/rulritem.cxx
	svx/source/dialog/simptabl.cxx
	svx/source/dialog/srchdlg.cxx
	svx/source/dialog/svxbmpnumvalueset.cxx
	svx/source/dialog/svxruler.cxx
	svx/source/dialog/swframeexample.cxx
	svx/source/engine3d/float3d.cxx
	svx/source/engine3d/float3d.src
	svx/source/engine3d/svx3ditems.cxx
	svx/source/fmcomp/gridctrl.cxx
	svx/source/fmcomp/trace.cxx
	svx/source/form/ParseContext.cxx
	svx/source/form/datanavi.cxx
	svx/source/form/filtnav.cxx
	svx/source/form/fmexch.cxx
	svx/source/form/fmexpl.cxx
	svx/source/form/fmobjfac.cxx
	svx/source/form/fmpage.cxx
	svx/source/form/fmshell.cxx
	svx/source/form/fmshimp.cxx
	svx/source/form/fmsrcimp.cxx
	svx/source/form/fmvwimp.cxx
	svx/source/form/makefile.mk
	svx/source/form/tabwin.cxx
	svx/source/form/tbxform.cxx
	svx/source/form/typemap.cxx
	svx/source/gallery2/galbrws1.cxx
	svx/source/gallery2/galbrws2.cxx
	svx/source/gallery2/galexpl.cxx
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galtheme.cxx
	svx/source/gallery2/makefile.mk
	svx/source/gengal/gengal.cxx
	svx/source/gengal/makefile.mk
	svx/source/inc/fmgroup.hxx
	svx/source/intro/about_ooo.hrc
	svx/source/intro/iso.src
	svx/source/intro/ooo.src
	svx/source/items/SmartTagItem.cxx
	svx/source/items/algitem.cxx
	svx/source/items/chrtitem.cxx
	svx/source/items/clipfmtitem.cxx
	svx/source/items/customshapeitem.cxx
	svx/source/items/drawitem.cxx
	svx/source/items/e3ditem.cxx
	svx/source/items/grfitem.cxx
	svx/source/items/hlnkitem.cxx
	svx/source/items/makefile.mk
	svx/source/items/pageitem.cxx
	svx/source/items/rotmodit.cxx
	svx/source/items/viewlayoutitem.cxx
	svx/source/items/zoomitem.cxx
	svx/source/items/zoomslideritem.cxx
	svx/source/src/app.hrc
	svx/source/stbctrls/makefile.mk
	svx/source/stbctrls/modctrl.cxx
	svx/source/stbctrls/xmlsecctrl.cxx
	svx/source/stbctrls/zoomctrl.cxx
	svx/source/svdraw/clonelist.cxx
	svx/source/svdraw/svdattr.cxx
	svx/source/svdraw/svdcrtv.cxx
	svx/source/svdraw/svdedtv1.cxx
	svx/source/svdraw/svdedtv2.cxx
	svx/source/svdraw/svdedxv.cxx
	svx/source/svdraw/svdetc.cxx
	svx/source/svdraw/svdfmtf.cxx
	svx/source/svdraw/svdfmtf.hxx
	svx/source/svdraw/svdglue.cxx
	svx/source/svdraw/svdhdl.cxx
	svx/source/svdraw/svdhlpln.cxx
	svx/source/svdraw/svdibrow.cxx
	svx/source/svdraw/svdlayer.cxx
	svx/source/svdraw/svdmodel.cxx
	svx/source/svdraw/svdoashp.cxx
	svx/source/svdraw/svdobj.cxx
	svx/source/svdraw/svdocapt.cxx
	svx/source/svdraw/svdocirc.cxx
	svx/source/svdraw/svdoedge.cxx
	svx/source/svdraw/svdograf.cxx
	svx/source/svdraw/svdogrp.cxx
	svx/source/svdraw/svdomeas.cxx
	svx/source/svdraw/svdomedia.cxx
	svx/source/svdraw/svdopath.cxx
	svx/source/svdraw/svdotext.cxx
	svx/source/svdraw/svdotxdr.cxx
	svx/source/svdraw/svdotxed.cxx
	svx/source/svdraw/svdotxfl.cxx
	svx/source/svdraw/svdotxln.cxx
	svx/source/svdraw/svdotxtr.cxx
	svx/source/svdraw/svdoutl.cxx
	svx/source/svdraw/svdpage.cxx
	svx/source/svdraw/svdpagv.cxx
	svx/source/svdraw/svdpntv.cxx
	svx/source/svdraw/svdpoev.cxx
	svx/source/svdraw/svdsnpv.cxx
	svx/source/svdraw/svdstr.src
	svx/source/svdraw/svdtrans.cxx
	svx/source/svdraw/svdundo.cxx
	svx/source/svdraw/svdview.cxx
	svx/source/svdraw/svdxcgv.cxx
	svx/source/table/svdotable.cxx
	svx/source/tbxctrls/colorwindow.hxx
	svx/source/tbxctrls/extrusioncontrols.cxx
	svx/source/tbxctrls/fillctrl.cxx
	svx/source/tbxctrls/grafctrl.cxx
	svx/source/tbxctrls/itemwin.cxx
	svx/source/tbxctrls/layctrl.cxx
	svx/source/tbxctrls/lboxctrl.cxx
	svx/source/tbxctrls/linectrl.cxx
	svx/source/tbxctrls/tbcontrl.cxx
	svx/source/tbxctrls/verttexttbxctrl.cxx
	svx/source/unodraw/unomod.cxx
	svx/source/unodraw/unopage.cxx
	svx/source/unodraw/unoprov.cxx
	svx/source/unodraw/unoshape.cxx
	svx/source/unodraw/unoshtxt.cxx
	svx/source/xml/xmlxtexp.cxx
	svx/source/xoutdev/_xpoly.cxx
	svx/source/xoutdev/xattr.cxx
	svx/source/xoutdev/xattr2.cxx
	svx/source/xoutdev/xattrbmp.cxx
	svx/source/xoutdev/xtabcolr.cxx
	svx/util/makefile.mk
	svx/workben/edittest.cxx
	sysui/desktop/productversion.mk
	ucb/prj/build.lst
	ucb/source/cacher/cacheserv.cxx
	ucb/source/core/ucb1.component
	ucb/source/core/ucbserv.cxx
	ucb/source/core/ucbstore.cxx
	ucb/source/core/ucbstore.hxx
	ucb/source/sorter/sortmain.cxx
	ucb/source/ucp/file/prov.cxx
	ucb/source/ucp/file/shell.cxx
	ucb/source/ucp/ftp/ftpservices.cxx
	ucb/source/ucp/gio/gio_provider.cxx
	ucb/source/ucp/gvfs/gvfs_provider.cxx
	ucb/source/ucp/hierarchy/hierarchyservices.cxx
	ucb/source/ucp/odma/odma_lib.cxx
	ucb/source/ucp/odma/odma_services.cxx
	ucb/source/ucp/package/pkgservices.cxx
	ucb/source/ucp/tdoc/tdoc_services.cxx
	ucb/source/ucp/webdav/ContentProperties.cxx
	ucb/source/ucp/webdav/NeonHeadRequest.cxx
	ucb/source/ucp/webdav/webdavcontent.cxx
	ucb/source/ucp/webdav/webdavservices.cxx
	uui/source/iahndl.cxx
	uui/source/iahndl.hxx
	uui/source/loginerr.hxx
	uui/source/nameclashdlg.hxx
	uui/source/passcrtdlg.cxx
	uui/source/passworddlg.cxx
	uui/source/passworddlg.hxx
	uui/source/services.cxx
	vbahelper/inc/vbahelper/vbahelper.hxx
	vbahelper/prj/build.lst
	vbahelper/prj/d.lst
	vbahelper/source/msforms/makefile.mk
	vbahelper/source/msforms/vbauserform.cxx
	vbahelper/source/vbahelper/makefile.mk
	vbahelper/source/vbahelper/vbaapplicationbase.cxx
	vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
	vbahelper/source/vbahelper/vbadocumentbase.cxx
	vbahelper/source/vbahelper/vbadocumentsbase.cxx
	vbahelper/source/vbahelper/vbahelper.cxx
	vbahelper/util/makefile.mk
	xmlhelp/source/cxxhelp/provider/databases.cxx
	xmlhelp/source/cxxhelp/provider/services.cxx
	xmlhelp/source/treeview/tvfactory.cxx
	xmloff/JunitTest_xmloff_unoapi.mk
	xmloff/inc/functional.hxx
	xmloff/inc/xmloff/formlayerexport.hxx
	xmloff/inc/xmloff/formlayerimport.hxx
	xmloff/inc/xmloff/functional.hxx
	xmloff/inc/xmloff/shapeimport.hxx
	xmloff/inc/xmloff/xmlcnitm.hxx
	xmloff/inc/xmloff/xmlnumfi.hxx
	xmloff/prj/build.lst
	xmloff/source/chart/SchXMLChartContext.cxx
	xmloff/source/chart/SchXMLExport.cxx
	xmloff/source/chart/SchXMLImport.cxx
	xmloff/source/chart/SchXMLLegendContext.hxx
	xmloff/source/chart/SchXMLPlotAreaContext.cxx
	xmloff/source/core/xmluconv.cxx
	xmloff/source/draw/sdxmlexp.cxx
	xmloff/source/draw/shapeexport4.cxx
	xmloff/source/draw/ximp3dobject.cxx
	xmloff/source/draw/ximp3dscene.cxx
	xmloff/source/forms/formlayerexport.cxx
	xmloff/source/forms/formlayerimport.cxx
	xmloff/source/forms/handler/vcl_time_handler.hxx
	xmloff/source/forms/layerimport.cxx
	xmloff/source/forms/layerimport.hxx
	xmloff/source/forms/property_meta_data.hxx
	xmloff/source/style/PageHeaderFooterContext.cxx
	xmloff/source/style/PageMasterStyleMap.cxx
	xmloff/source/style/prstylei.cxx
	xmloff/source/style/xmlimppr.cxx
	xmloff/source/style/xmlnumfi.cxx
	xmloff/source/style/xmlstyle.cxx
	xmloff/source/table/tabledesignsimporter.cxx
	xmloff/source/text/XMLTextNumRuleInfo.cxx
	xmloff/source/text/XMLTextShapeStyleContext.cxx
	xmloff/source/text/txtstyle.cxx
	xmloff/source/transform/ChartOOoTContext.cxx
	xmloff/source/transform/EventOOoTContext.cxx
	xmloff/source/transform/TransformerBase.cxx
	xmloff/util/makefile.mk
	xmlscript/util/xcr.component

8534 files changed, 91546 insertions, 72784 deletions

diff --git a/.gitignore b/.gitignore
index 25df1065c1..25df1065c1 100644..100755
--- a/.gitignore
+++ b/.gitignore
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 7b80f5899a..bec9391f65 100644..100755
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -70,7 +70,7 @@ class MediaItem : public SfxPoolItem
 public:
                             TYPEINFO();
 
-                            MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+                            MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
                             MediaItem( const MediaItem& rMediaItem );
     virtual					~MediaItem();
 
@@ -81,8 +81,8 @@ public:
                                                  SfxMapUnit ePresUnit,
                                                  XubString& rText, 
                                                  const IntlWrapper *pIntl ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     void					merge( const MediaItem& rMediaItem );
 
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 175719a8f4..2d382113be 100644..100755
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -53,7 +53,7 @@ namespace avmedia
 class MediaPlayer : public SfxChildWindow
 {
 public:
-                        MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~MediaPlayer();
 
                         SFX_DECL_CHILDWINDOW( MediaPlayer );
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index c65a670a58..681305af55 100644..100755
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -49,10 +49,10 @@ public:
 
                                 SFX_DECL_TOOLBOX_CONTROL();
 
-                                MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX );
+                                MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
                                 ~MediaToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*				CreateItemWindow( Window* pParent );
 
 private:
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 62b998b2e1..62b998b2e1 100644..100755
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 1f7ffb6172..a16eaa6ce9 100644..100755
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,19 +28,17 @@
 #ifndef _AVMEDIA_HELPIDS_HRC
 #define _AVMEDIA_HELPIDS_HRC
 
-#include <svl/solar.hrc>
-
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY 	(HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE 	(HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP 	(HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE	(HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP	(HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN 	(HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT 	(HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX 	    (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER          (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT            (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER        (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW        (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE                      "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT                     "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX                            "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER                             "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT                               "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER                           "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW                           "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
 
 #endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 20e90c4ee2..20e90c4ee2 100644..100755
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 025e850973..7d9343b916 100644..100755
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,4 +1,4 @@
-av	avmedia	:    l10n tools sfx2 NULL
+av	avmedia	:    L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
 av	avmedia                 	usr1	-	all	av_mkout												NULL
 av	avmedia\prj					get		-	all	av_prj													NULL
 av	avmedia\inc					get		-	all	av_inv													NULL
@@ -7,5 +7,5 @@ av  avmedia\source\framework	nmake	-	all	av_framework	        								NULL
 av  avmedia\source\win	    	nmake	-	all	av_win	            									NULL
 av	avmedia\source\java			nmake	-	all	av_java	            									NULL
 av	avmedia\source\quicktime	nmake	-	all	av_quicktime											NULL
-av	avmedia\source\gstreamer		nmake	-	all	av_gstreamer           									NULL
+av	avmedia\source\gstreamer	nmake	-	all	av_gstreamer	            							NULL
 av	avmedia\util				nmake	-	all	av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer	NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index c82db252aa..eb140ed457 100644..100755
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -16,3 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\avmedia
 ..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
 
 ..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
+..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 4c814c5348..4c814c5348 100644..100755
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 56fac24e39..832fb1f27f 100644..100755
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -87,13 +87,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
 
     SetBackground();
-    SetPaintTransparent( TRUE );
+    SetPaintTransparent( sal_True );
     SetParentClipMode( PARENTCLIPMODE_NOCLIP );
 
     if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
     {
-
-
         maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
         maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
         
@@ -104,16 +102,14 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
     }
     else
     {
-        maTimeSlider.SetBackground();
-        maVolumeSlider.SetBackground();
         mpZoomListBox->SetBackground();
 
         maZoomToolBox.SetBackground();
-        maZoomToolBox.SetPaintTransparent( TRUE );
+        maZoomToolBox.SetPaintTransparent( sal_True );
         maPlayToolBox.SetBackground();
-        maPlayToolBox.SetPaintTransparent( TRUE );
+        maPlayToolBox.SetPaintTransparent( sal_True );
         maMuteToolBox.SetBackground();
-        maMuteToolBox.SetPaintTransparent( TRUE );
+        maMuteToolBox.SetPaintTransparent( sal_True );
 
     }
     
@@ -367,7 +363,7 @@ void MediaControl::implUpdateToolboxes()
         
         if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
         {
-            USHORT nSelectEntryPos ;
+            sal_uInt16 nSelectEntryPos ;
         
             switch( maItem.getZoom() )
             {
@@ -459,7 +455,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
 
 Image MediaControl::implGetImage( sal_Int32 nImageId ) const
 {
-    return maImageList.GetImage( static_cast< USHORT >( nImageId ) );
+    return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
 }
 
 // ------------------------------------------------------------------------------
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index 1c98b5ac81..1c98b5ac81 100644..100755
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index e7d6958e65..e7d6958e65 100644..100755
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 601366f084..2326152613 100644..100755
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -51,7 +51,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
 
 // ------------------------------------------------------------------------------
 
-MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) :
+MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) :
     SfxPoolItem( _nWhich ),
     mnMaskSet( nMaskSet ),
     meState( MEDIASTATE_STOP ),
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 73f1d75206..73f1d75206 100644..100755
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 9ef4042c5b..d1f20ee6ff 100644..100755
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -46,7 +46,7 @@ namespace avmedia
 // - MediaPlayer -
 // ---------------
 
-MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
     pWindow = new MediaFloater( _pBindings, this, _pParent );
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 993bf5d507..f0e10900f2 100644..100755
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -96,7 +96,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem )
 
 // -----------------------------------------------------------------------------
 
-MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
         rTbx.Invalidate();
@@ -110,7 +110,7 @@ MediaToolBoxControl::~MediaToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index b3203e3ffb..d2c09563d2 100644..100755
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -494,44 +494,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-       try
-       {
-           rtl::OUString sKeyName = DECLARE_ASCII( "/" );
-           sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName();
-           sKeyName += DECLARE_ASCII( "/UNO/SERVICES" );
-           css::uno::Reference< css::registry::XRegistryKey > xNewKey(
-               static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName));
-
-           if ( xNewKey.is() == sal_True )
-           {
-               css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames();
-               const ::rtl::OUString* pArray = seqServiceNames.getArray();
-               sal_Int32 nLength = seqServiceNames.getLength();
-               for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter )
-                   xNewKey->createKey( pArray[nCounter] );
-           }
-
-           bRet = sal_True;
-       }
-       catch( css::registry::InvalidRegistryException& )
-       {
-           OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-       }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index decb177178..decb177178 100644..100755
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
index 3eb039dec7..3eb039dec7 100644..100755
--- a/avmedia/source/framework/soundhandler.xml
+++ b/avmedia/source/framework/soundhandler.xml
diff --git a/avmedia/source/gstreamer/ChangeLog b/avmedia/source/gstreamer/ChangeLog
index 8671b11a97..8671b11a97 100644..100755
--- a/avmedia/source/gstreamer/ChangeLog
+++ b/avmedia/source/gstreamer/ChangeLog
diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component
new file mode 100755
index 0000000000..75d39d275f
--- /dev/null
+++ b/avmedia/source/gstreamer/avmediagst.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
+    <service name="com.sun.star.media.Manager_GStreamer"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/avmedia/source/gstreamer/exports.dxp
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 1d9b5caaff..1d9b5caaff 100644..100755
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index e0b161c483..e0b161c483 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index fc0795221a..fc0795221a 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 558b949563..558b949563 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 2d83215402..2d83215402 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index f6ea7295a5..f6ea7295a5 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 02839dc9b2..02839dc9b2 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 4ce3fdf6d2..4ce3fdf6d2 100644..100755
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 4e0f6f3c3d..4e0f6f3c3d 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index b63e769e3f..b63e769e3f 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
index 2f52b9cc47..2f52b9cc47 100644..100755
--- a/avmedia/source/gstreamer/makefile.mk
+++ b/avmedia/source/gstreamer/makefile.mk
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 7c24df071a..47c78f3f13 100644..100755
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -34,12 +34,30 @@ class ResMgr;
 #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
 #else
 #ifdef WNT 
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1          ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_False
+
 #else
 #ifdef QUARTZ
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1           ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_False
+
 #else
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED            sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1          "com.sun.star.comp.avmedia.Manager_Java"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1  sal_True
+
 #endif
 #endif
 #endif
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
index a3ad559aa9..a3ad559aa9 100644..100755
--- a/avmedia/source/java/FrameGrabber.java
+++ b/avmedia/source/java/FrameGrabber.java
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
index a85a5176a1..a85a5176a1 100644..100755
--- a/avmedia/source/java/Manager.java
+++ b/avmedia/source/java/Manager.java
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
index 004ae7cf68..b77fd97eae 100644..100755
--- a/avmedia/source/java/MediaUno.java
+++ b/avmedia/source/java/MediaUno.java
@@ -64,13 +64,4 @@ public class MediaUno
                 
         return null;
     }
-
-    // -------------------------------------------------------------------------
-    
-    public static boolean __writeRegistryServiceInfo(
-        com.sun.star.registry.XRegistryKey regKey )
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
-            s_implName, s_serviceName, regKey );
-    }
 }
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
index d35be5cc1a..d35be5cc1a 100644..100755
--- a/avmedia/source/java/Player.java
+++ b/avmedia/source/java/Player.java
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 4bc9db4ac7..58df751b39 100644..100755
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.java
@@ -67,9 +67,7 @@ public class PlayerWindow implements java.awt.event.KeyListener,
 
                 maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
                 maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
-
-                if( aArgs.length > 2 )
-                    mbShowControls = AnyConverter.toBoolean( aArgs[ 2 ] );
+                mbShowControls = false;
 
                 java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
 
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index 053b37e1bd..053b37e1bd 100644..100755
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/WindowAdapter.java
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
index 55576baa5b..85a98bbcf3 100644..100755
--- a/avmedia/source/java/avmedia.jar
+++ b/avmedia/source/java/avmedia.jar
diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component
new file mode 100755
index 0000000000..d7cc160bd7
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.media.Manager_Java">
+    <service name="com.sun.star.media.Manager_Java"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index 37c53a7211..1fe771c117 100644..100755
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -59,3 +59,11 @@ CUSTOMMANIFESTFILE      = manifest
 # --- Targets ------------------------------------------------------
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/avmedia.jar.component
+
+$(MISC)/avmedia.jar.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
diff --git a/avmedia/source/java/manifest b/avmedia/source/java/manifest
index fa9c2500d3..fa9c2500d3 100644..100755
--- a/avmedia/source/java/manifest
+++ b/avmedia/source/java/manifest
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
index 1d2f143add..1d2f143add 100644..100755
--- a/avmedia/source/java/win/SystemWindowAdapter.java
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
index 6cada42982..6cada42982 100644..100755
--- a/avmedia/source/java/x11/SystemWindowAdapter.java
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
new file mode 100755
index 0000000000..aa0251d74c
--- /dev/null
+++ b/avmedia/source/quicktime/avmediaQuickTime.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
+    <service name="com.sun.star.media.Manager_QuickTime"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index d6b51290cc..d6b51290cc 100644..100755
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 95d62c18cf..95d62c18cf 100644..100755
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index f3c9f244f3..358fce4918 100644..100755
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -83,3 +83,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 dummy:
     @echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
+
+ALLTAR : $(MISC)/avmediaQuickTime.component
+
+$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index bdf5105cae..bdf5105cae 100644..100755
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 2fb8f3d106..2fb8f3d106 100644..100755
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index 079307fd37..079307fd37 100644..100755
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 204f520703..204f520703 100644..100755
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index e89bc21dc4..e89bc21dc4 100644..100755
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index ba80cc85da..f127beb788 100644..100755
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -49,35 +49,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(                                
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
-                    AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) ) );
-            
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 024354093b..024354093b 100644..100755
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index a2e58ece2c..a2e58ece2c 100644..100755
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 7771d1eb05..7771d1eb05 100644..100755
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 1d96dc9245..1bdca46406 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -118,7 +118,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
@@ -139,7 +139,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
     if( mpNotifyWindow )
     {
         MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
-                                 sal::static_int_cast< USHORT >(e.ClickCount),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
                                  0,
                                 ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
                                 ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 7246eb7b36..7246eb7b36 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 2e20eadb97..1bec5100c5 100644..100755
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -163,7 +163,9 @@ Size MediaWindow::getPreferredSize() const
 void MediaWindow::setPosSize( const Rectangle& rNewRect )
 {
     if( mpImpl )
+    {
         mpImpl->setPosSize( rNewRect );
+    }
 }
 
 // -------------------------------------------------------------------------
@@ -370,6 +372,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
                                         "AVI", "avi",
                                         "CD Audio", "cda",
                                         "FLAC Audio", "flac",
+                                        "Matroska Media", "mkv",
                                         "MIDI Audio", "mid;midi",
                                         "MPEG Audio", "mp2;mp3;mpa",
                                         "MPEG Video", "mpg;mpeg;mpv;mp4",
@@ -466,39 +469,26 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
     {
         if( bDeep || pPreferredSizePixel )
         {
-            uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-
-            if( xFactory.is() )
+            try
             {
-                try
-                {
-                    fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+                uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer(
+                                                            aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
 
-                    uno::Reference< ::com::sun::star::media::XManager > xManager(
-                        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
-                        uno::UNO_QUERY );
+                if( xPlayer.is() )
+                {
+                    bRet = true;
 
-                    if( xManager.is() )
+                    if( pPreferredSizePixel )
                     {
-                        uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
-
-                        if( xPlayer.is() )
-                        {
-                            bRet = true;
+                        const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
 
-                            if( pPreferredSizePixel )
-                            {
-                                const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
-
-                                pPreferredSizePixel->Width() = aAwtSize.Width;
-                                pPreferredSizePixel->Height() = aAwtSize.Height;
-                            }
-                        }
+                        pPreferredSizePixel->Width() = aAwtSize.Width;
+                        pPreferredSizePixel->Height() = aAwtSize.Height;
                     }
                 }
-                catch( ... )
-                {
-                }
+            }
+            catch( ... )
+            {
             }
         }
         else
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
index 988088e88b..988088e88b 100644..100755
--- a/avmedia/source/viewer/mediawindow.hrc
+++ b/avmedia/source/viewer/mediawindow.hrc
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 4cadd3fac8..4cadd3fac8 100644..100755
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 3e4151037a..e0c901e580 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -77,7 +77,7 @@ MediaWindowControl::~MediaWindowControl()
 void MediaWindowControl::update()
 {
     MediaItem aItem;
-    
+
     static_cast< MediaWindowImpl* >( GetParent() )->updateMediaItem( aItem );
     setState( aItem );
 }
@@ -94,11 +94,7 @@ void  MediaWindowControl::execute( const MediaItem& rItem )
 // --------------------
 
 MediaChildWindow::MediaChildWindow( Window* pParent ) :
-#ifdef GSTREAMER
     SystemChildWindow( pParent, WB_CLIPCHILDREN )
-#else
-    JavaChildWindow( pParent, WB_CLIPCHILDREN )
-#endif
 {
 }
 
@@ -114,12 +110,8 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
 {
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::MouseMove( rMEvt );
-#else
-    JavaChildWindow::MouseMove( rMEvt );
-#endif
     GetParent()->MouseMove( aTransformedEvent );
 }
 
@@ -129,12 +121,8 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::MouseButtonDown( rMEvt );
-#else
-    JavaChildWindow::MouseButtonDown( rMEvt );
-#endif
     GetParent()->MouseButtonDown( aTransformedEvent );
 }
 
@@ -145,11 +133,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
     const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
                                           rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
 
-#ifdef GSTREAMER
     SystemChildWindow::MouseButtonUp( rMEvt );
-#else
-    JavaChildWindow::MouseButtonUp( rMEvt );
-#endif
     GetParent()->MouseButtonUp( aTransformedEvent );
 }
 
@@ -157,11 +141,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
 void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
 {
-#ifdef GSTREAMER
     SystemChildWindow::KeyInput( rKEvt );
-#else
-    JavaChildWindow::KeyInput( rKEvt );
-#endif
     GetParent()->KeyInput( rKEvt );
 }
 
@@ -169,11 +149,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
 
 void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
 {
-#ifdef GSTREAMER
     SystemChildWindow::KeyUp( rKEvt );
-#else
-    JavaChildWindow::KeyUp( rKEvt );
-#endif
     GetParent()->KeyUp( rKEvt );
 }
 
@@ -183,12 +159,8 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
 {
     const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
                                             rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
-    
-#ifdef GSTREAMER
+
     SystemChildWindow::Command( rCEvt );
-#else
-    JavaChildWindow::Command( rCEvt );
-#endif
     GetParent()->Command( aTransformedEvent );
 }
 
@@ -207,9 +179,10 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
     mpEmptyBmpEx( NULL ),
     mpAudioBmpEx( NULL )
 {
+    maChildWindow.SetBackground( Color( COL_BLACK ) );
     maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
     maChildWindow.Hide();
-    
+
     if( mpMediaWindowControl )
     {
         mpMediaWindowControl->SetSizePixel( mpMediaWindowControl->getMinSizePixel() );
@@ -239,12 +212,12 @@ void MediaWindowImpl::cleanUp()
         xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
         xPlayerWindow->removeMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
         xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
-        
+
         uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY );
-        
+
         if( xComponent.is() )
             xComponent->dispose();
-            
+
         setPlayerWindow( NULL );
     }
 
@@ -255,33 +228,24 @@ void MediaWindowImpl::cleanUp()
 
 void MediaWindowImpl::onURLChanged()
 {
+{
     if( getPlayer().is() )
     {
         uno::Sequence< uno::Any >              aArgs( 3 );
         uno::Reference< media::XPlayerWindow > xPlayerWindow;
         const Point                            aPoint;
         const Size					           aSize( maChildWindow.GetSizePixel() );
-#ifndef GSTREAMER
-        const sal_IntPtr                       nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
-#else
         const sal_Int32                        nWndHandle = 0;
-#endif
        
         aArgs[ 0 ] = uno::makeAny( nWndHandle );
         aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
-#ifdef GSTREAMER
-                const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
-                OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
-                aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
-#endif
+        const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
+        OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
+        aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
         
         try
         {
-#ifdef GSTREAMER
             if( pSystemData->aWindow != 0 )
-#else
-            if( nWndHandle != 0 )
-#endif
                 xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
         }
         catch( uno::RuntimeException )
@@ -323,7 +287,7 @@ void MediaWindowImpl::onURLChanged()
 void MediaWindowImpl::update()
 {
     uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
-    
+
     if( xPlayerWindow.is() )
         xPlayerWindow->update();
 }
@@ -332,7 +296,7 @@ void MediaWindowImpl::update()
 
 void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 {
-    SetPosSizePixel( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight() );
+    SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
 }
 
 // ---------------------------------------------------------------------
@@ -340,25 +304,24 @@ void MediaWindowImpl::setPosSize( const Rectangle& rRect )
 void MediaWindowImpl::setPointer( const Pointer& rPointer )
 {
     uno::Reference< media::XPlayerWindow >	xPlayerWindow( getPlayerWindow() );
-    
+
     SetPointer( rPointer );
     maChildWindow.SetPointer( rPointer );
-    
+
     if( xPlayerWindow.is() )
     {
-        
         long nPointer;
-        
+
         switch( rPointer.GetStyle() )
         {
             case( POINTER_CROSS ): nPointer = awt::SystemPointer::CROSS; break;
             case( POINTER_HAND ): nPointer = awt::SystemPointer::HAND; break;
             case( POINTER_MOVE ): nPointer = awt::SystemPointer::MOVE; break;
             case( POINTER_WAIT ): nPointer = awt::SystemPointer::WAIT; break;
-            
+
             default: nPointer = awt::SystemPointer::ARROW; break;
         }
-        
+
         xPlayerWindow->setPointerType( nPointer );
     }
 }
@@ -386,20 +349,20 @@ void MediaWindowImpl::Resize()
     const sal_Int32							nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 );
     Size 									aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ),
                                                                aCurSize.Height() - ( nOffset << 1 ) );
-    
+
     if( mpMediaWindowControl )
     {
         const sal_Int32	nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
         const sal_Int32	nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L );
-        
+
         aPlayerWindowSize.Height() = ( nControlY - ( nOffset << 1 ) );
         mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
     }
-                                       
-    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
-    
+
     if( xPlayerWindow.is() )
         xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+
+    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
 }
 
 // ---------------------------------------------------------------------
@@ -438,25 +401,25 @@ void MediaWindowImpl::StateChanged( StateChangedType eType )
 void MediaWindowImpl::Paint( const Rectangle& )
 {
     BitmapEx* pLogo = NULL;
-    
+
     if( !getPlayer().is() )
     {
         if( !mpEmptyBmpEx )
             mpEmptyBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
-        
+
         pLogo = mpEmptyBmpEx;
     }
-    else if ( !getPlayerWindow().is() )
+    else if( !getPlayerWindow().is() )
     {
         if( !mpAudioBmpEx )
             mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
-    
+
         pLogo = mpAudioBmpEx;
     }
 
     const Point     aBasePos( maChildWindow.GetPosPixel() );
-    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() ); 	
-        
+    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() );
+
     if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) )
     {
         Size	    aLogoSize( pLogo->GetSizePixel() );
@@ -465,7 +428,7 @@ void MediaWindowImpl::Paint( const Rectangle& )
         SetLineColor( aBackgroundColor );
         SetFillColor( aBackgroundColor );
         DrawRect( aVideoRect );
-        
+
         if( ( aLogoSize.Width() > aVideoRect.GetWidth() || aLogoSize.Height() > aVideoRect.GetHeight() ) &&
             ( aLogoSize.Height() > 0 ) )
         {
@@ -483,12 +446,10 @@ void MediaWindowImpl::Paint( const Rectangle& )
             }
         }
 
-        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ), 
+        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ),
                              aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
                       aLogoSize, *pLogo );
     }
-
-    update();
 }
 
 // ---------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index c2dc310821..f8abda9bb7 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -2,11 +2,14 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: mediawindow_impl.hxx,v $
+ * $Revision: 1.3 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,11 +33,7 @@
 #define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
 
 #include <svtools/transfer.hxx>
-#ifdef GSTREAMER
 #include <vcl/syschild.hxx>
-#else
-#include <vcl/javachild.hxx>
-#endif
 
 #include "mediawindowbase_impl.hxx"
 #include "mediacontrol.hxx"
@@ -48,16 +47,16 @@ namespace avmedia
         // ----------------------
         // - MediaWindowControl -
         // ----------------------
-        
+
         class MediaWindowControl : public MediaControl
         {
         public:
-        
+
                     MediaWindowControl( Window* pParent );
                     ~MediaWindowControl();
-        
+
         protected:
-        
+
             void 	update();
             void 	execute( const MediaItem& rItem );
         };
@@ -65,20 +64,16 @@ namespace avmedia
         // --------------------
         // - MediaChildWindow -
         // --------------------
-        
-#ifdef GSTREAMER
+
         class MediaChildWindow : public SystemChildWindow
-#else
-        class MediaChildWindow : public JavaChildWindow
-#endif
         {
         public:
-        
+
                             MediaChildWindow( Window* pParent );
                             ~MediaChildWindow();
-        
+
         protected:
-        
+
             virtual void    MouseMove( const MouseEvent& rMEvt );
             virtual void    MouseButtonDown( const MouseEvent& rMEvt );
             virtual void    MouseButtonUp( const MouseEvent& rMEvt );
@@ -86,7 +81,7 @@ namespace avmedia
             virtual void    KeyUp( const KeyEvent& rKEvt );
             virtual void    Command( const CommandEvent& rCEvt );
         };
-                
+
         // ------------------.
         // - MediaWindowImpl -
         // -------------------
@@ -97,7 +92,7 @@ namespace avmedia
                                 public MediaWindowBaseImpl,
                                 public DropTargetHelper,
                                 public DragSourceHelper
-                                   
+
         {
         public:
 
@@ -106,18 +101,18 @@ namespace avmedia
 
             virtual void    cleanUp();
             virtual void	onURLChanged();
-        
+
         public:
-        
+
             void			update();
 
             void    		setPosSize( const Rectangle& rRect );
-                
+
             void			setPointer( const Pointer& rPointer );
             const Pointer&	getPointer() const;
-            
+
             bool			hasInternalMediaControl() const;
-            
+
         protected:
 
             // Window
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index a5abf000ea..c4d9f95cf2 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -46,6 +46,7 @@ namespace avmedia { namespace priv {
 // - MediaWindowBaseImpl -
 // -----------------------
 
+
 MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow ) :
     mpMediaWindow( pMediaWindow )
 {
@@ -88,7 +89,6 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
     return xPlayer;
 }
 
-
 // ---------------------------------------------------------------------
 
 void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
@@ -142,10 +142,7 @@ void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
 {
     if( isPlaying() )
     {
-        if( bStop )
-            mxPlayer->stop();
-        else
-            mxPlayer->start();
+        bStop ? mxPlayer->stop() : mxPlayer->start();
     }
 }
 
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index 063665b97d..9cfa52e005 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -62,7 +62,8 @@ namespace avmedia
             virtual void 	cleanUp();
             virtual void	onURLChanged();
             
-            static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+            static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL,
+                                                                                                      sal_Bool& rbJavaBased );
         
         public:
 
@@ -113,6 +114,7 @@ namespace avmedia
             void	stopPlayingInternal( bool );
 
             MediaWindow* getMediaWindow() const;
+            inline sal_Bool isMediaWindowJavaBased() const { return( mbIsMediaWindowJavaBased ); }
 
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > getPlayer() const;
 
@@ -125,6 +127,7 @@ namespace avmedia
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > 		mxPlayer;
             ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow >	mxPlayerWindow;
             MediaWindow*                                                                mpMediaWindow;
+            sal_Bool                                                                    mbIsMediaWindowJavaBased;
         };
     }
 }
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
new file mode 100755
index 0000000000..c80c19bff0
--- /dev/null
+++ b/avmedia/source/win/avmediawin.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
+    <service name="com.sun.star.media.Manager_DirectX"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
index db9c0a52f2..926e49f5f1 100644..100755
--- a/avmedia/source/win/exports.dxp
+++ b/avmedia/source/win/exports.dxp
@@ -1,4 +1,3 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 9633aa7e98..9633aa7e98 100644..100755
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 9d3b23753c..9d3b23753c 100644..100755
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index be9efe3fcd..f14d35ba9f 100644..100755
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -91,7 +91,7 @@ public:
         IMediaSample *pSample) = 0;
     virtual HRESULT __stdcall BufferCB(
         double SampleTime,
-        WIN_BYTE *pBuffer,
+        BYTE *pBuffer,
         long BufferLen) = 0;
 };
 
@@ -104,13 +104,13 @@ ISampleGrabber : public IUnknown
 {
 public:
     virtual HRESULT __stdcall SetOneShot(
-        WIN_BOOL OneShot) = 0;
+        BOOL OneShot) = 0;
     virtual HRESULT __stdcall SetMediaType(
         const AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall GetConnectedMediaType(
         AM_MEDIA_TYPE *pType) = 0;
     virtual HRESULT __stdcall SetBufferSamples(
-        WIN_BOOL BufferThem) = 0;
+        BOOL BufferThem) = 0;
     virtual HRESULT __stdcall GetCurrentBuffer(
          long *pBufferSize,
          long *pBuffer) = 0;
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index 7fdb92378d..7c6c9e14da 100644..100755
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -78,3 +78,11 @@ SHL1STDLIBS += dxguid.lib
 .ENDIF
 
 .INCLUDE :  	target.mk
+
+ALLTAR : $(MISC)/avmediawin.component
+
+$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        avmediawin.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmediawin.component
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 3ba63fab82..3ba63fab82 100644..100755
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f4d6b46bb..9f4d6b46bb 100644..100755
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index f44f22f63b..f44f22f63b 100644..100755
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index c91a1435e5..c91a1435e5 100644..100755
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index d0877fd055..d0877fd055 100644..100755
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index ca66b0e8e0..ca66b0e8e0 100644..100755
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 047f1744c8..047f1744c8 100644..100755
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 9c8e6f4933..f444e8f14d 100644..100755
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -49,33 +49,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xNewKey1(
-                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(                                
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" )) ) );
-
-            bRet = sal_True;
-        }
-        catch( registry::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
@@ -85,13 +58,13 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*									pRet = 0;
 
-    if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
+    if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
     {
         const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_DirectX" )),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.avmedia.Manager_DirectX" )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
new file mode 100755
index 0000000000..fa01dc03eb
--- /dev/null
+++ b/avmedia/util/avmedia.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.framework.SoundHandler">
+    <service name="com.sun.star.frame.ContentHandler"/>
+  </implementation>
+</component>
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index bd167e8744..6d12706a26 100644..100755
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -77,3 +77,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo LibMain>>$@
     @echo CT>>$@
 .ENDIF
+
+ALLTAR : $(MISC)/avmedia.component
+
+$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        avmedia.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.component
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index 9af9f1603f..9af9f1603f 100644..100755
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 5366d9bf10..2e9a9d4d4a 100644..100755
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -45,8 +45,8 @@ public:
     xub_StrLen GetLine();
     xub_StrLen GetCol1();
     xub_StrLen GetCol2();
-    BOOL IsRun();
-    BOOL IsValid() { return pRun != NULL; }
+    sal_Bool IsRun();
+    sal_Bool IsValid() { return pRun != NULL; }
     BasicRuntime GetNextRuntime();
 };
 
@@ -68,12 +68,12 @@ class BasicRuntimeAccess
 public:
     static BasicRuntime GetRuntime();
     static bool HasRuntime();
-    static USHORT GetStackEntryCount();
-    static BasicErrorStackEntry GetStackEntry( USHORT nIndex );
-    static BOOL HasStack();
+    static sal_uInt16 GetStackEntryCount();
+    static BasicErrorStackEntry GetStackEntry( sal_uInt16 nIndex );
+    static sal_Bool HasStack();
     static void DeleteStack();
 
-    static BOOL IsRunInit();
+    static sal_Bool IsRunInit();
 };
 
 #endif
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 6b3a024ec4..feaddc8dc2 100644..100755
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -69,21 +69,21 @@ class SotStorage;
 class BasicError
 {
 private:
-    ULONG	nErrorId;
-    USHORT	nReason;
+    sal_uIntPtr	nErrorId;
+    sal_uInt16	nReason;
     String	aErrStr;
 
 public:
             BasicError();
             BasicError( const BasicError& rErr );
-            BasicError( ULONG nId, USHORT nR, const String& rErrStr );
+            BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr );
 
-    ULONG 	GetErrorId() const					{ return nErrorId; }
-    USHORT	GetReason() const					{ return nReason; }
+    sal_uIntPtr 	GetErrorId() const					{ return nErrorId; }
+    sal_uInt16	GetReason() const					{ return nReason; }
     String	GetErrorStr()						{ return aErrStr; }
 
-    void	SetErrorId( ULONG n )				{ nErrorId = n; }
-    void	SetReason( USHORT n )				{ nReason = n; }
+    void	SetErrorId( sal_uIntPtr n )				{ nErrorId = n; }
+    void	SetReason( sal_uInt16 n )				{ nReason = n; }
     void	SetErrorStr( const String& rStr)	{ aErrStr = rStr; }
 };
 
@@ -147,33 +147,33 @@ private:
 
     String				aName;
     String				maStorageName;
-    BOOL				bBasMgrModified;
-    BOOL				mbDocMgr;
+    sal_Bool				bBasMgrModified;
+    sal_Bool				mbDocMgr;
 
     BasicManagerImpl*	mpImpl;
 
     void				Init();
 
 protected:
-    BOOL			ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
-    BOOL			ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const;
+    sal_Bool			ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
+    sal_Bool			ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
     void			ImpCreateStdLib( StarBASIC* pParentFromStdLib );
     void			ImpMgrNotLoaded(  const String& rStorageName  );
     BasicLibInfo*	CreateLibInfo();
-    void            LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadBasics = TRUE );
+    void            LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadBasics = sal_True );
     void			LoadOldBasicManager( SotStorage& rStorage );
-    BOOL 			ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
-    BOOL			ImplEncryptStream( SvStream& rStream ) const;
+    sal_Bool 			ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
+    sal_Bool			ImplEncryptStream( SvStream& rStream ) const;
     BasicLibInfo*	FindLibInfo( StarBASIC* pBasic ) const;
-    void			CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
-    void			SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
+    void			CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
+    void			SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const;
                     BasicManager();	// This is used only to customize the paths for 'Save as'.
                     ~BasicManager();
 
 public:
                     TYPEINFO();
-                    BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
-                    BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
+                    BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
+                    BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
 
     /** deletes the given BasicManager instance
 
@@ -190,12 +190,12 @@ public:
     String			GetName() const							{ return aName; }
 
 
-    USHORT		    GetLibCount() const;
-    StarBASIC*	    GetLib( USHORT nLib ) const;
+    sal_uInt16		    GetLibCount() const;
+    StarBASIC*	    GetLib( sal_uInt16 nLib ) const;
     StarBASIC*	    GetLib( const String& rName ) const;
-    USHORT		    GetLibId( const String& rName ) const;
+    sal_uInt16		    GetLibId( const String& rName ) const;
 
-    String		    GetLibName( USHORT nLib );
+    String		    GetLibName( sal_uInt16 nLib );
 
     /** announces the library containers which belong to this BasicManager
 
@@ -209,14 +209,14 @@ public:
     const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
                     GetScriptLibraryContainer()  const;
 
-    BOOL		    LoadLib( USHORT nLib );
-    BOOL		    RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage );
+    sal_Bool		    LoadLib( sal_uInt16 nLib );
+    sal_Bool		    RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
 
     // Modify-Flag will be reset only during save.
-    BOOL		    IsModified() const;
-    BOOL		    IsBasicModified() const;
+    sal_Bool		    IsModified() const;
+    sal_Bool		    IsBasicModified() const;
 
-    BOOL		    HasErrors();
+    sal_Bool		    HasErrors();
     void		    ClearErrors();
     BasicError*     GetFirstError();
     BasicError*     GetNextError();
@@ -238,15 +238,22 @@ public:
     */
     bool            LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
     bool HasExeCode( const String& );
+    /// determines whether the Basic Manager has a given macro, given by fully qualified name
+    bool            HasMacro( String const& i_fullyQualifiedName ) const;
+    /// executes a given macro
+    ErrCode         ExecuteMacro( String const& i_fullyQualifiedName, SbxArray* i_arguments, SbxValue* i_retValue );
+    /// executes a given macro
+    ErrCode         ExecuteMacro( String const& i_fullyQualifiedName, String const& i_commaSeparatedArgs, SbxValue* i_retValue );
+
 private:
-    BOOL		    IsReference( USHORT nLib );
+    sal_Bool		    IsReference( sal_uInt16 nLib );
 
-    BOOL		    SetLibName( USHORT nLib, const String& rName );
+    sal_Bool		    SetLibName( sal_uInt16 nLib, const String& rName );
 
     StarBASIC*  	GetStdLib() const;
-    StarBASIC*      AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference );
-    BOOL		    RemoveLib( USHORT nLib );
-    BOOL	    	HasLib( const String& rName ) const;
+    StarBASIC*      AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference );
+    sal_Bool		    RemoveLib( sal_uInt16 nLib );
+    sal_Bool	    	HasLib( const String& rName ) const;
 
     StarBASIC*	    CreateLibForLibContainer( const String& rLibName,
                         const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >&
diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index c8a59a32fa..abf7ec99e2 100644..100755
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -39,8 +39,8 @@ private:
     ResMgr*		pSttResMgr;
     ResMgr*     pBasResMgr;
 
-    BOOL		bDebugMode;
-    BOOL		bBreakEnabled;
+    sal_Bool		bDebugMode;
+    sal_Bool		bBreakEnabled;
 
 public:
                 BasicDLL();
@@ -51,8 +51,8 @@ public:
 
     static void BasicBreak();
 
-    static void	EnableBreak( BOOL bEnable );
-    static void	SetDebugMode( BOOL bDebugMode );
+    static void	EnableBreak( sal_Bool bEnable );
+    static void	SetDebugMode( sal_Bool bDebugMode );
 };
 
 #define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) )
diff --git a/basic/inc/basic/dispdefs.hxx b/basic/inc/basic/dispdefs.hxx
index 75b7ce2f11..75b7ce2f11 100644..100755
--- a/basic/inc/basic/dispdefs.hxx
+++ b/basic/inc/basic/dispdefs.hxx
diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx
index 6e290b82a9..6e290b82a9 100644..100755
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/basic/modsizeexceeded.hxx
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index fb48d8cb11..6b9189bd31 100644..100755
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -42,10 +42,10 @@ class ErrorEntry;
 //-----------------------------------------------------------------------------
 class BasicError {
     AppBasEd* pWin;
-    USHORT  nLine, nCol1, nCol2;
+    sal_uInt16  nLine, nCol1, nCol2;
     String aText;
 public:
-    BasicError( AppBasEd*, USHORT, const String&, USHORT, USHORT, USHORT );
+    BasicError( AppBasEd*, sal_uInt16, const String&, sal_uInt16, sal_uInt16, sal_uInt16 );
     void Show();
 };
 
@@ -53,8 +53,8 @@ public:
 class MyBasic : public StarBASIC
 {
     SbError nError;
-    virtual BOOL ErrorHdl();
-    virtual USHORT BreakHdl();
+    virtual sal_Bool ErrorHdl();
+    virtual sal_uInt16 BreakHdl();
 
 protected:
     ::std::vector< BasicError* > aErrors;
@@ -73,7 +73,7 @@ public:
     TYPEINFO();
     MyBasic();
     virtual ~MyBasic();
-    virtual BOOL Compile( SbModule* );
+    virtual sal_Bool Compile( SbModule* );
     void Reset();
     SbError GetErrors() { return nError; }
     size_t GetCurrentError() { return CurrentError; }
@@ -87,10 +87,10 @@ public:
     virtual void LoadIniFile();
 
     // Determines the extended symbol type for syntax highlighting
-    virtual SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );
+    virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl );
     virtual const String GetSpechialErrorText();
     virtual void ReportRuntimeError( AppBasEd *pEditWin );
-    virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors );
+    virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
 
     static void SetCompileModule( SbModule *pMod );
     static SbModule *GetCompileModule();
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 68f3147ac6..7143493247 100644..100755
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -46,22 +46,22 @@ class Process
     rtl_uString               **m_pEnvList;
     rtl::OUString               m_aProcessName;
     oslProcess                  m_pProcess;
-    BOOL ImplIsRunning();
+    sal_Bool ImplIsRunning();
     long ImplGetExitCode();
-    BOOL bWasGPF;
-    BOOL bHasBeenStarted;
+    sal_Bool bWasGPF;
+    sal_Bool bHasBeenStarted;
 
 public:
     Process();
     ~Process();
     // Methoden
     void SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv = NULL );
-    BOOL Start();
-    ULONG GetExitCode();
-    BOOL IsRunning();
-    BOOL WasGPF();
+    sal_Bool Start();
+    sal_uIntPtr GetExitCode();
+    sal_Bool IsRunning();
+    sal_Bool WasGPF();
 
-    BOOL Terminate();
+    sal_Bool Terminate();
 };
 
 #endif
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index 03ae7c4dfe..03ae7c4dfe 100644..100755
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index 1a7d630f66..c77c783f94 100644..100755
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -32,7 +32,7 @@
 #include <basic/sbxdef.hxx>
 
 #ifndef __RSC
-typedef ULONG SbError;
+typedef sal_uIntPtr SbError;
 #endif
 
 // Mapping to SbxError
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index defc2c6418..bb890ace22 100644..100755
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -49,15 +49,15 @@ class SbMethod : public SbxMethod
     SbMethodImpl* mpSbMethodImpl;			// Impl data
     SbxVariable* mCaller;                   // caller
     SbModule* pMod;
-    USHORT    nDebugFlags;
-    USHORT	  nLine1, nLine2;
-    UINT32	  nStart;
-    BOOL	  bInvalid;
+    sal_uInt16    nDebugFlags;
+    sal_uInt16	  nLine1, nLine2;
+    sal_uInt32	  nStart;
+    sal_Bool	  bInvalid;
     SbxArrayRef refStatics;
     SbMethod( const String&, SbxDataType, SbModule* );
     SbMethod( const SbMethod& );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbMethod();
 
 public:
@@ -68,14 +68,14 @@ public:
     SbxArray* GetStatics();
     void      ClearStatics();
     SbModule* GetModule() 				 { return pMod; 	   }
-    UINT32	  GetId() const				 { return nStart;	   }
-    USHORT    GetDebugFlags()			 { return nDebugFlags; }
-    void 	  SetDebugFlags( USHORT n )  { nDebugFlags = n;    }
-    void 	  GetLineRange( USHORT&, USHORT& );
+    sal_uInt32	  GetId() const				 { return nStart;	   }
+    sal_uInt16    GetDebugFlags()			 { return nDebugFlags; }
+    void 	  SetDebugFlags( sal_uInt16 n )  { nDebugFlags = n;    }
+    void 	  GetLineRange( sal_uInt16&, sal_uInt16& );
 
     // Interface to execute a method from the applications
     virtual ErrCode Call( SbxValue* pRet = NULL,  SbxVariable* pCaller = NULL );
-    virtual void Broadcast( ULONG nHintId );
+    virtual void Broadcast( sal_uIntPtr nHintId );
 };
 
 #ifndef __SB_SBMETHODREF_HXX
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 678da36487..05a1930c65 100644..100755
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -36,15 +36,18 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 
+#include <deque>
+
 class SbMethod;
 class SbProperty;
 class SbiRuntime;
-class SbiBreakpoints;
+typedef std::deque< sal_uInt16 > SbiBreakpoints;
 class SbiImage;
 class SbProcedureProperty;
 class SbIfaceMapperMethod;
 class SbClassModuleObject;
 
+class ModuleInitDependencyMap;
 struct ClassModuleRunInitItem;
 struct SbClassData;
 class SbModuleImpl;
@@ -63,6 +66,8 @@ class SbModule : public SbxObject
     SbModule();
     SbModule(const SbModule&);
 
+    void 			implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
+
 protected:
     com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
     ::rtl::OUString     aOUSource;
@@ -70,36 +75,38 @@ protected:
     SbiImage*           pImage;        // the Image
     SbiBreakpoints*     pBreaks;       // Breakpoints
     SbClassData*        pClassData;
-    BOOL mbVBACompat;
-    INT32 mnType; 
+    sal_Bool mbVBACompat;
+    sal_Int32 mnType; 
     SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
     bool 	bIsProxyModule;
 
-    static void		implProcessModuleRunInit( ClassModuleRunInitItem& rItem );
+    static void		implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem );
     void			StartDefinitions();
     SbMethod*		GetMethod( const String&, SbxDataType );
     SbProperty*		GetProperty( const String&, SbxDataType );
     SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType );
     SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* );
-    void			EndDefinitions( BOOL=FALSE );
-    USHORT 			Run( SbMethod* );
+    void			EndDefinitions( sal_Bool=sal_False );
+    sal_uInt16 			Run( SbMethod* );
     void			RunInit();
     void 			ClearPrivateVars();
-    void			GlobalRunInit( BOOL bBasicStart );	// for all modules
+    void 			ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
+    void			GlobalRunInit( sal_Bool bBasicStart );	// for all modules
     void			GlobalRunDeInit( void );
-    const BYTE* 	FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const;
-    const BYTE* 	FindNextStmnt( const BYTE*, USHORT&, USHORT&, 
-                        BOOL bFollowJumps, const SbiImage* pImg=NULL ) const;
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
-    virtual BOOL LoadCompleted();
+    const sal_uInt8* 	FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
+    const sal_uInt8* 	FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&, 
+                        sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
+    virtual sal_Bool LoadCompleted();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
+    void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
     virtual ~SbModule();
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
     TYPEINFO();
-                    SbModule( const String&, BOOL bCompat = FALSE );
+                    SbModule( const String&, sal_Bool bCompat = sal_False );
     virtual void	SetParent( SbxObject* );
     virtual void 	Clear();
 
@@ -112,34 +119,34 @@ public:
     void	        SetSource32( const ::rtl::OUString& r );
     void			SetComment( const String& r );
 
-    virtual BOOL	Compile();
-    BOOL 			Disassemble( String& rText );
-    virtual BOOL	IsCompiled() const;
+    virtual sal_Bool	Compile();
+    sal_Bool 			Disassemble( String& rText );
+    virtual sal_Bool	IsCompiled() const;
     const SbxObject* FindType( String aTypeName ) const;
 
-    virtual BOOL	IsBreakable( USHORT nLine ) const;
-    virtual USHORT	GetBPCount() const;
-    virtual USHORT	GetBP( USHORT n ) const;
-    virtual BOOL	IsBP( USHORT nLine ) const;
-    virtual BOOL	SetBP( USHORT nLine );
-    virtual BOOL	ClearBP( USHORT nLine );
+    virtual sal_Bool	IsBreakable( sal_uInt16 nLine ) const;
+    virtual size_t	GetBPCount() const;
+    virtual sal_uInt16	GetBP( size_t n ) const;
+    virtual sal_Bool	IsBP( sal_uInt16 nLine ) const;
+    virtual sal_Bool	SetBP( sal_uInt16 nLine );
+    virtual sal_Bool	ClearBP( sal_uInt16 nLine );
     virtual void	ClearAllBP();
 
     // Lines of Subs
-    virtual SbMethod*	GetFunctionForLine( USHORT );
+    virtual SbMethod*	GetFunctionForLine( sal_uInt16 );
 
     // Store only image, no source (needed for new password protection)
-       BOOL StoreBinaryData( SvStream& );    
-       BOOL StoreBinaryData( SvStream&, USHORT nVer );    
-    BOOL LoadBinaryData( SvStream&, USHORT nVer );
-    BOOL LoadBinaryData( SvStream& );
-    BOOL ExceedsLegacyModuleSize();
+       sal_Bool StoreBinaryData( SvStream& );    
+       sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );    
+    sal_Bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
+    sal_Bool LoadBinaryData( SvStream& );
+    sal_Bool ExceedsLegacyModuleSize();
     void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
     bool HasExeCode();
-    BOOL IsVBACompat() const;
-    void SetVBACompat( BOOL bCompat );
-    INT32 GetModuleType() { return mnType; }
-    void SetModuleType( INT32 nType ) { mnType = nType; }
+    sal_Bool IsVBACompat() const;
+    void SetVBACompat( sal_Bool bCompat );
+    sal_Int32 GetModuleType() { return mnType; }
+    void SetModuleType( sal_Int32 nType ) { mnType = nType; }
     bool isProxyModule() { return bIsProxyModule; }
     void AddVarName( const String& aName );
     void RemoveVars();
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 5db50103ae..af602191cd 100644..100755
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -47,10 +47,18 @@ class SbObjModule : public SbModule
 {
     SbObjModule( const SbObjModule& );
     SbObjModule();
+
+protected:
+    virtual ~SbObjModule();
+
 public:
     TYPEINFO();
     SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+
+    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+                             const SfxHint& rHint, const TypeId& rHintType );
+
     using SbxValue::GetObject;
     SbxVariable* GetObject();
     void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
@@ -76,7 +84,7 @@ public:
     SbUserFormModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
     virtual ~SbUserFormModule();
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
-    void ResetApiObj();
+    void ResetApiObj( bool bTriggerTerminateEvent = true );
     void Unload();
     void Load();
     void triggerMethod( const String& );
@@ -88,6 +96,11 @@ public:
     void triggerLayoutEvent();
     void triggerResizeEvent();
 
+    bool getInitState( void )
+        { return mbInit; }
+    void setInitState( bool bInit )
+        { mbInit = bInit; }
+
     class SbUserFormModuleInstance* CreateInstance();
 };
 
@@ -99,7 +112,7 @@ public:
     SbUserFormModuleInstance( SbUserFormModule* pParentModule, const String& rName,
         const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
 
-    virtual BOOL IsClass( const String& ) const;
+    virtual sal_Bool IsClass( const String& ) const;
     virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
 };
 
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index e2920dffb0..db000f406c 100644..100755
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -40,7 +40,7 @@ class SbProperty : public SbxProperty
     friend class SbModule;
     friend class SbProcedureProperty;
     SbModule* pMod;
-    BOOL	 bInvalid;
+    sal_Bool	 bInvalid;
     SbProperty( const String&, SbxDataType, SbModule* );
     virtual ~SbProperty();
 public:
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index a40ac39433..e94e193ca1 100644..100755
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -37,16 +37,17 @@
 #include <basic/sbdef.hxx>
 #include <basic/sberrors.hxx>
 #include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 class SbModule;                     // completed module
 class SbiInstance;                  // runtime instance
 class SbiRuntime;                   // currently running procedure
 class SbiImage;                     // compiled image
 class BasicLibInfo;                 // info block for basic manager
-class SbiBreakpoints;
 class SbTextPortions;
 class SbMethod;
 class BasicManager;
+class DocBasicItem;
 
 class StarBASICImpl;
 
@@ -56,6 +57,7 @@ class StarBASIC : public SbxObject
     friend class SbiExpression; // Access to RTL
     friend class SbiInstance;
     friend class SbiRuntime;
+    friend class DocBasicItem;
 
     StarBASICImpl*	mpStarBASICImpl;
 
@@ -66,31 +68,33 @@ class StarBASIC : public SbxObject
    // Handler-Support:
     Link			aErrorHdl;              // Error handler
     Link			aBreakHdl;              // Breakpoint handler
-    BOOL			bNoRtl;                 // if TRUE: do not search RTL
-    BOOL			bBreak;                 // if TRUE: Break, otherwise Step
-    BOOL			bDocBasic;
-    BOOL			bVBAEnabled;
+    sal_Bool			bNoRtl;                 // if sal_True: do not search RTL
+    sal_Bool			bBreak;                 // if sal_True: Break, otherwise Step
+    sal_Bool			bDocBasic;
+    sal_Bool			bVBAEnabled;
     BasicLibInfo*	pLibInfo;			// Info block for basic manager
     SbLanguageMode	eLanguageMode;		// LanguageMode of the basic object
-    BOOL			bQuit;
+    sal_Bool			bQuit;
 
     SbxObjectRef pVBAGlobals; 
     SbxObject* getVBAGlobals( );
 
+    void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
+
 protected:
-    BOOL 			CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_Bool 			CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
 private:
-    BOOL 			RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
-    BOOL 			RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
-    USHORT 			BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
-    USHORT 			StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    sal_Bool 			RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_Bool 			RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
+    sal_uInt16 			BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    sal_uInt16 			StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 
 protected:
 
-    virtual	BOOL  	ErrorHdl();
-    virtual	USHORT	BreakHdl();
+    virtual	sal_Bool  	ErrorHdl();
+    virtual	sal_uInt16	BreakHdl();
     virtual ~StarBASIC();
 
 public:
@@ -98,11 +102,11 @@ public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
     TYPEINFO();
 
-    StarBASIC( StarBASIC* pParent = NULL, BOOL bIsDocBasic = FALSE );
+    StarBASIC( StarBASIC* pParent = NULL, sal_Bool bIsDocBasic = sal_False );
 
     // #51727 SetModified overridden so that the Modfied-State is
         // not delivered to Parent.
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 
     void* operator 	new( size_t );
     void operator 	delete( void* );
@@ -119,14 +123,14 @@ public:
     SbModule*   	MakeModule( const String& rName, const String& rSrc );
     SbModule*   	MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
     SbModule*       MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc );
-    BOOL			Compile( SbModule* );
-    BOOL 			Disassemble( SbModule*, String& rText );
+    sal_Bool			Compile( SbModule* );
+    sal_Bool 			Disassemble( SbModule*, String& rText );
     static void 	Stop();
     static void 	Error( SbError );
     static void 	Error( SbError, const String& rMsg );
     static void 	FatalError( SbError );
     static void 	FatalError( SbError, const String& rMsg );
-    static BOOL 	IsRunning();
+    static sal_Bool 	IsRunning();
     static SbError 	GetErrBasic();
     // #66536 make additional message accessible by RTL function Error
     static String	GetErrorMsg();
@@ -135,7 +139,7 @@ public:
     void 			Highlight( const String& rSrc, SbTextPortions& rList );
 
     virtual SbxVariable* Find( const String&, SbxClassType );
-    virtual BOOL Call( const String&, SbxArray* = NULL );
+    virtual sal_Bool Call( const String&, SbxArray* = NULL );
 
     SbxArray*		GetModules() { return pModules; }
     SbxObject*		GetRtl()	 { return pRtl;		}
@@ -144,26 +148,26 @@ public:
     void			InitAllModules( StarBASIC* pBasicNotToInit = NULL );
     void			DeInitAllModules( void );
     void			ClearAllModuleVars( void );
-    void			ActivateObject( const String*, BOOL );
-    BOOL 			LoadOldModules( SvStream& );
+    void			ActivateObject( const String*, sal_Bool );
+    sal_Bool 			LoadOldModules( SvStream& );
 
     // #43011 For TestTool; deletes global vars
     void			ClearGlobalVars( void );
 
     // Calls for error and break handler
-    static USHORT	GetLine();
-    static USHORT	GetCol1();
-    static USHORT	GetCol2();
-    static void		SetErrorData( SbError nCode, USHORT nLine,
-                                  USHORT nCol1, USHORT nCol2 );
+    static sal_uInt16	GetLine();
+    static sal_uInt16	GetCol1();
+    static sal_uInt16	GetCol2();
+    static void		SetErrorData( SbError nCode, sal_uInt16 nLine,
+                                  sal_uInt16 nCol1, sal_uInt16 nCol2 );
 
     // Specific to error handler
     static void		MakeErrorText( SbError, const String& aMsg );
     static const	String&	GetErrorText();
     static SbError	GetErrorCode();
-    static BOOL		IsCompilerError();
-    static USHORT	GetVBErrorCode( SbError nError );
-    static SbError	GetSfxFromVBError( USHORT nError );
+    static sal_Bool		IsCompilerError();
+    static sal_uInt16	GetVBErrorCode( SbError nError );
+    static SbError	GetSfxFromVBError( sal_uInt16 nError );
     static void		SetGlobalLanguageMode( SbLanguageMode eLangMode );
     static SbLanguageMode GetGlobalLanguageMode();
     // Local settings
@@ -172,7 +176,7 @@ public:
     SbLanguageMode GetLanguageMode();
 
     // Specific for break handler
-    BOOL   			IsBreak() const				{ return bBreak; }
+    sal_Bool   			IsBreak() const				{ return bBreak; }
 
     static Link 	GetGlobalErrorHdl();
     static void 	SetGlobalErrorHdl( const Link& rNewHdl );
@@ -188,24 +192,27 @@ public:
 
     static SbxBase*	FindSBXInCurrentScope( const String& rName );
     static SbxVariable*	FindVarInCurrentScopy
-                    ( const String& rName, USHORT& rStatus );
-    static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
+                    ( const String& rName, sal_uInt16& rStatus );
+    static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 );
     static SbModule* GetActiveModule();
-    void SetVBAEnabled( BOOL bEnabled );
-    BOOL isVBAEnabled();
+    void SetVBAEnabled( sal_Bool bEnabled );
+    sal_Bool isVBAEnabled();
 
-    // #60175 TRUE: SFX-Resource is not displayed on basic errors
-    static void StaticSuppressSfxResource( BOOL bSuppress );
+    // #60175 sal_True: SFX-Resource is not displayed on basic errors
+    static void StaticSuppressSfxResource( sal_Bool bSuppress );
 
-    // #91147 TRUE: Reschedule is enabled (default>, FALSE: No reschedule
-    static void StaticEnableReschedule( BOOL bReschedule );
+    // #91147 sal_True: Reschedule is enabled (default>, sal_False: No reschedule
+    static void StaticEnableReschedule( sal_Bool bReschedule );
 
     SbxObjectRef getRTL( void ) { return pRtl; }
-    BOOL IsDocBasic() { return bDocBasic; }
+    sal_Bool IsDocBasic() { return bDocBasic; }
     SbxVariable* VBAFind( const String& rName, SbxClassType t );
     bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
     void QuitAndExitApplication();
-    BOOL IsQuitApplication() { return bQuit; };
+    sal_Bool IsQuitApplication() { return bQuit; };
+
+    static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+        GetModelFromBasic( SbxObject* pBasic );
 };
 
 #ifndef __SB_SBSTARBASICREF_HXX
diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index 3ae022073c..ddff393c59 100644..100755
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -58,9 +58,9 @@ protected:
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void 	PropType( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropWidth( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropHeight( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void 	PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
 public:
     TYPEINFO();
@@ -78,23 +78,23 @@ public:
 class SbStdFont : public SbxObject
 {
 protected:
-    BOOL	bBold;
-    BOOL	bItalic;
-    BOOL	bStrikeThrough;
-    BOOL	bUnderline;
-    USHORT	nSize;
+    sal_Bool	bBold;
+    sal_Bool	bItalic;
+    sal_Bool	bStrikeThrough;
+    sal_Bool	bUnderline;
+    sal_uInt16	nSize;
     String	aName;
 
    ~SbStdFont();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void 	PropBold( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropItalic( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropUnderline( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropSize( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void	PropName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void 	PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropUnderline( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropSize( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void	PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
 public:
     TYPEINFO();
@@ -102,16 +102,16 @@ public:
     SbStdFont();
     virtual SbxVariable* Find( const String&, SbxClassType );
 
-    void	SetBold( BOOL bB ) { bBold = bB; }
-    BOOL	IsBold() const { return bBold; }
-    void	SetItalic( BOOL bI ) { bItalic = bI; }
-    BOOL	IsItalic() const { return bItalic; }
-    void	SetStrikeThrough( BOOL bS ) { bStrikeThrough = bS; }
-    BOOL	IsStrikeThrough() const { return bStrikeThrough; }
-    void	SetUnderline( BOOL bU ) { bUnderline = bU; }
-    BOOL	IsUnderline() const { return bUnderline; }
-    void	SetSize( USHORT nS ) { nSize = nS; }
-    USHORT	GetSize() const { return nSize; }
+    void	SetBold( sal_Bool bB ) { bBold = bB; }
+    sal_Bool	IsBold() const { return bBold; }
+    void	SetItalic( sal_Bool bI ) { bItalic = bI; }
+    sal_Bool	IsItalic() const { return bItalic; }
+    void	SetStrikeThrough( sal_Bool bS ) { bStrikeThrough = bS; }
+    sal_Bool	IsStrikeThrough() const { return bStrikeThrough; }
+    void	SetUnderline( sal_Bool bU ) { bUnderline = bU; }
+    sal_Bool	IsUnderline() const { return bUnderline; }
+    void	SetSize( sal_uInt16 nS ) { nSize = nS; }
+    sal_uInt16	GetSize() const { return nSize; }
     void	SetFontName( const String& rName ) { aName = rName; }
     String	GetFontName() const { return aName; }
 };
@@ -127,12 +127,12 @@ protected:
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 
-    void 	MethClear( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void	MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void	MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void	MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void	MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
-    void	MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
+    void 	MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void	MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void	MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void	MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void	MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+    void	MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
 
 public:
     TYPEINFO();
diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx
index cb0c670fbe..cb0c670fbe 100644..100755
--- a/basic/inc/basic/sbuno.hxx
+++ b/basic/inc/basic/sbuno.hxx
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 9b5acf4257..631e4b1796 100644..100755
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -68,9 +68,9 @@ struct SbxParamInfo
     const String aName;          // Name of the parameter
     SbxBaseRef   aTypeRef;       // Object, if object type
     SbxDataType  eType;          // Data type
-    UINT16       nFlags;         // Flag-Bits
-    UINT32       nUserData;      // IDs etc.
-    SbxParamInfo( const String& s, SbxDataType t, USHORT n, SbxBase* b = NULL )
+    sal_uInt16       nFlags;         // Flag-Bits
+    sal_uInt32       nUserData;      // IDs etc.
+    SbxParamInfo( const String& s, SbxDataType t, sal_uInt16 n, SbxBase* b = NULL )
     : aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
     ~SbxParamInfo() {}
 };
@@ -89,27 +89,27 @@ class SbxInfo : public SvRefBase
 
     String			aComment;
     String			aHelpFile;
-    UINT32			nHelpId;
+    sal_uInt32			nHelpId;
     SbxParams		aParams;
 
 protected:
-    BOOL LoadData( SvStream&, USHORT );
-    BOOL StoreData( SvStream& ) const;
+    sal_Bool LoadData( SvStream&, sal_uInt16 );
+    sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxInfo();
 public:
     SbxInfo();
-    SbxInfo( const String&, UINT32 );
+    SbxInfo( const String&, sal_uInt32 );
 
-    void				AddParam( const String&, SbxDataType, USHORT=SBX_READ );
+    void				AddParam( const String&, SbxDataType, sal_uInt16=SBX_READ );
     void				AddParam( const SbxParamInfo& );
-    const SbxParamInfo*	GetParam( USHORT n ) const;	// index starts with 1!
+    const SbxParamInfo*	GetParam( sal_uInt16 n ) const;	// index starts with 1!
     const String&		GetComment() const				{ return aComment; }
     const String&		GetHelpFile() const    			{ return aHelpFile; }
-    UINT32				GetHelpId() const				{ return nHelpId;   }
+    sal_uInt32				GetHelpId() const				{ return nHelpId;   }
 
     void				SetComment( const String& r )	{ aComment = r; }
     void				SetHelpFile( const String& r )	{ aHelpFile = r; }
-    void				SetHelpId( UINT32 nId )			{ nHelpId = nId; }
+    void				SetHelpId( sal_uInt32 nId )			{ nHelpId = nId; }
 };
 
 #endif
@@ -122,7 +122,7 @@ class SbxHint : public SfxSimpleHint
     SbxVariable* pVar;
 public:
     TYPEINFO();
-    SbxHint( ULONG n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
+    SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
     SbxVariable* GetVar() const { return pVar; }
 };
 
@@ -136,7 +136,7 @@ class SbxAlias : public SbxVariable, public SfxListener
 {
     SbxVariableRef xAlias;
     virtual ~SbxAlias();
-    virtual void Broadcast( ULONG );
+    virtual void Broadcast( sal_uIntPtr );
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
 public:
@@ -165,7 +165,7 @@ class SbxArray : public SbxBase
     friend class SbMethod;
     friend class SbClassModuleObject;
     friend SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
-    void PutDirect( SbxVariable* pVar, UINT32 nIdx );
+    void PutDirect( SbxVariable* pVar, sal_uInt32 nIdx );
 
     SbxArrayImpl* mpSbxArrayImpl; // Impl data
     SbxVarRefs*   pData;          // The variables
@@ -173,8 +173,8 @@ class SbxArray : public SbxBase
 protected:
     SbxDataType eType;            // Data type of the array
     virtual ~SbxArray();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
@@ -183,28 +183,28 @@ public:
     SbxArray( const SbxArray& );
     SbxArray& operator=( const SbxArray& );
     virtual void Clear();
-    USHORT Count() const;
+    sal_uInt16 Count() const;
     virtual SbxDataType GetType() const;
     virtual SbxClassType GetClass() const;
-    SbxVariableRef& GetRef( USHORT );
-    SbxVariable* Get( USHORT );
-    void Put( SbxVariable*, USHORT );
-    void Insert( SbxVariable*, USHORT );
-    void Remove( USHORT );
+    SbxVariableRef& GetRef( sal_uInt16 );
+    SbxVariable* Get( sal_uInt16 );
+    void Put( SbxVariable*, sal_uInt16 );
+    void Insert( SbxVariable*, sal_uInt16 );
+    void Remove( sal_uInt16 );
     void Remove( SbxVariable* );
     void Merge( SbxArray* );
-    const String& GetAlias( USHORT );
-    void PutAlias( const String&, USHORT );
-    SbxVariable* FindUserData( UINT32 nUserData );
+    const String& GetAlias( sal_uInt16 );
+    void PutAlias( const String&, sal_uInt16 );
+    SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
 
     // Additional methods for 32-bit indices
-    UINT32 Count32() const;
-    SbxVariableRef& GetRef32( UINT32 );
-    SbxVariable* Get32( UINT32 );
-    void Put32( SbxVariable*, UINT32 );
-    void Insert32( SbxVariable*, UINT32 );
-    void Remove32( UINT32 );
+    sal_uInt32 Count32() const;
+    SbxVariableRef& GetRef32( sal_uInt32 );
+    SbxVariable* Get32( sal_uInt32 );
+    void Put32( SbxVariable*, sal_uInt32 );
+    void Insert32( SbxVariable*, sal_uInt32 );
+    void Remove32( sal_uInt32 );
 };
 
 #endif
@@ -223,15 +223,15 @@ class SbxDimArray : public SbxArray
 
     SbxDim* pFirst, *pLast;               // Links to Dimension table
     short   nDim;                         // Number of dimensions
-    void   AddDimImpl32( INT32, INT32, BOOL bAllowSize0 );
+    void   AddDimImpl32( sal_Int32, sal_Int32, sal_Bool bAllowSize0 );
     bool mbHasFixedSize;
 protected:
-    USHORT  Offset( const short* );
-    UINT32  Offset32( const INT32* );
-    USHORT  Offset( SbxArray* );
-    UINT32  Offset32( SbxArray* );
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    sal_uInt16  Offset( const short* );
+    sal_uInt32  Offset32( const sal_Int32* );
+    sal_uInt16  Offset( SbxArray* );
+    sal_uInt32  Offset32( SbxArray* );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxDimArray();
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
@@ -253,17 +253,17 @@ public:
     short  GetDims() const { return nDim;  }
     void   AddDim( short, short );
     void   unoAddDim( short, short );
-    BOOL   GetDim( short, short&, short& ) const;
+    sal_Bool   GetDim( short, short&, short& ) const;
 
     using SbxArray::GetRef32;
-    SbxVariableRef& GetRef32( const INT32* );
+    SbxVariableRef& GetRef32( const sal_Int32* );
     using SbxArray::Get32;
-    SbxVariable* Get32( const INT32* );
+    SbxVariable* Get32( const sal_Int32* );
     using SbxArray::Put32;
-    void Put32( SbxVariable*, const INT32* );
-    void   AddDim32( INT32, INT32 );
-    void   unoAddDim32( INT32, INT32 );
-    BOOL   GetDim32( INT32, INT32&, INT32& ) const;
+    void Put32( SbxVariable*, const sal_Int32* );
+    void   AddDim32( sal_Int32, sal_Int32 );
+    void   unoAddDim32( sal_Int32, sal_Int32 );
+    sal_Bool   GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const;
         bool hasFixedSize() { return mbHasFixedSize; };
         void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
 };
@@ -278,7 +278,7 @@ class SbxCollection : public SbxObject
     void Initialize();
 protected:
     virtual ~SbxCollection();
-    virtual BOOL LoadData( SvStream&, USHORT );
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
     // Overridable methods (why not pure virtual?):
@@ -292,7 +292,7 @@ public:
     SbxCollection( const String& rClassname );
     SbxCollection( const SbxCollection& );
     SbxCollection& operator=( const SbxCollection& );
-    virtual SbxVariable* FindUserData( UINT32 nUserData );
+    virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
     virtual void Clear();
 };
@@ -306,17 +306,17 @@ class SbxStdCollection : public SbxCollection
 {
 protected:
     String aElemClass;
-    BOOL   bAddRemoveOk;
+    sal_Bool   bAddRemoveOk;
     virtual ~SbxStdCollection();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual void CollAdd( SbxArray* pPar );
     virtual void CollRemove( SbxArray* pPar );
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
     TYPEINFO();
     SbxStdCollection
-        ( const String& rClassname, const String& rElemClass, BOOL=TRUE );
+        ( const String& rClassname, const String& rElemClass, sal_Bool=sal_True );
     SbxStdCollection( const SbxStdCollection& );
     SbxStdCollection& operator=( const SbxStdCollection& );
     virtual void Insert( SbxVariable* );
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index abf2f77895..abf2f77895 100644..100755
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 5f37de70c2..7290480967 100644..100755
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -46,30 +46,30 @@ class UniString;
 
 // This version of the Macros does not define Load/StorePrivateData()-methods
 #define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )		\
-    virtual UINT32 GetCreator() const { return nCre;   }	\
-    virtual UINT16 GetVersion() const { return nVer;   }	\
-    virtual UINT16 GetSbxId() const	  { return nSbxId; }
+    virtual sal_uInt32 GetCreator() const { return nCre;   }	\
+    virtual sal_uInt16 GetVersion() const { return nVer;   }	\
+    virtual sal_uInt16 GetSbxId() const	  { return nSbxId; }
 
 #define SBX_DECL_PERSIST_NODATA_()							\
-    virtual UINT32 GetCreator() const;						\
-    virtual UINT16 GetVersion() const;						\
-    virtual UINT16 GetSbxId() const;
+    virtual sal_uInt32 GetCreator() const;						\
+    virtual sal_uInt16 GetVersion() const;						\
+    virtual sal_uInt16 GetSbxId() const;
 
 // This version of the macro defines Load/StorePrivateData()-methods
 #define SBX_DECL_PERSIST( nCre, nSbxId, nVer )				\
-    virtual BOOL LoadPrivateData( SvStream&, USHORT ); 		\
-    virtual BOOL StorePrivateData( SvStream& ) const;  		\
+    virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); 		\
+    virtual sal_Bool StorePrivateData( SvStream& ) const;  		\
     SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
 
 #define SBX_DECL_PERSIST_()									\
-    virtual BOOL LoadPrivateData( SvStream&, USHORT ); 		\
-    virtual BOOL StorePrivateData( SvStream& ) const;  		\
+    virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); 		\
+    virtual sal_Bool StorePrivateData( SvStream& ) const;  		\
     SBX_DECL_PERSIST_NODATA_()
 
 #define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer )			\
-    UINT32 C::GetCreator() const { return nCre;   }			\
-    UINT16 C::GetVersion() const { return nVer;   }			\
-    UINT16 C::GetSbxId() const	 { return nSbxId; }
+    sal_uInt32 C::GetCreator() const { return nCre;   }			\
+    sal_uInt16 C::GetVersion() const { return nVer;   }			\
+    sal_uInt16 C::GetSbxId() const	 { return nSbxId; }
 
 class SbxBase;
 class SbxFactory;
@@ -83,10 +83,10 @@ class SbxBase : virtual public SvRefBase
 {
     SbxBaseImpl* mpSbxBaseImpl;	// Impl data
 
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 protected:
-    USHORT nFlags;			// Flag-Bits
+    sal_uInt16 nFlags;			// Flag-Bits
 
     SbxBase();
     SbxBase( const SbxBase& );
@@ -95,21 +95,21 @@ protected:
     SBX_DECL_PERSIST(0,0,0);
 public:
     TYPEINFO();
-    inline void		SetFlags( USHORT n );
-    inline USHORT	GetFlags() const;
-    inline void		SetFlag( USHORT n );
-    inline void		ResetFlag( USHORT n );
-    inline BOOL		IsSet( USHORT n ) const;
-    inline BOOL		IsReset( USHORT n ) const;
-    inline BOOL		CanRead() const;
-    inline BOOL		CanWrite() const;
-    inline BOOL		IsModified() const;
-    inline BOOL		IsConst() const;
-    inline BOOL		IsHidden() const;
-    inline BOOL		IsVisible() const;
-
-    virtual BOOL IsFixed() const;
-    virtual void SetModified( BOOL );
+    inline void		SetFlags( sal_uInt16 n );
+    inline sal_uInt16	GetFlags() const;
+    inline void		SetFlag( sal_uInt16 n );
+    inline void		ResetFlag( sal_uInt16 n );
+    inline sal_Bool		IsSet( sal_uInt16 n ) const;
+    inline sal_Bool		IsReset( sal_uInt16 n ) const;
+    inline sal_Bool		CanRead() const;
+    inline sal_Bool		CanWrite() const;
+    inline sal_Bool		IsModified() const;
+    inline sal_Bool		IsConst() const;
+    inline sal_Bool		IsHidden() const;
+    inline sal_Bool		IsVisible() const;
+
+    virtual sal_Bool IsFixed() const;
+    virtual void SetModified( sal_Bool );
 
     virtual SbxDataType  GetType()  const;
     virtual SbxClassType GetClass() const;
@@ -118,24 +118,24 @@ public:
 
     static SbxBase* Load( SvStream& );
     static void Skip( SvStream& );
-    BOOL Store( SvStream& );
-    virtual BOOL LoadCompleted();
-    virtual BOOL StoreCompleted();
+    sal_Bool Store( SvStream& );
+    virtual sal_Bool LoadCompleted();
+    virtual sal_Bool StoreCompleted();
 
     static SbxError GetError();
     static void SetError( SbxError );
-    static BOOL IsError();
+    static sal_Bool IsError();
     static void ResetError();
 
     // Set the factory for Load/Store/Create
     static void AddFactory( SbxFactory* );
     static void RemoveFactory( SbxFactory* );
 
-    static SbxBase* Create( UINT16, UINT32=SBXCR_SBX );
+    static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
     static SbxObject* CreateObject( const String& );
     // Sbx solution as replacement for SfxBroadcaster::Enable()
-    static void StaticEnableBroadcasting( BOOL bEnable );
-    static BOOL StaticIsEnabledBroadcasting( void );
+    static void StaticEnableBroadcasting( sal_Bool bEnable );
+    static sal_Bool StaticIsEnabledBroadcasting( void );
 };
 
 #ifndef SBX_BASE_DECL_DEFINED
@@ -143,40 +143,40 @@ public:
 SV_DECL_REF(SbxBase)
 #endif
 
-inline void SbxBase::SetFlags( USHORT n )
+inline void SbxBase::SetFlags( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
 
-inline USHORT SbxBase::GetFlags() const
+inline sal_uInt16 SbxBase::GetFlags() const
 { DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
 
-inline void SbxBase::SetFlag( USHORT n )
+inline void SbxBase::SetFlag( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
 
-inline void SbxBase::ResetFlag( USHORT n )
+inline void SbxBase::ResetFlag( sal_uInt16 n )
 { DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
 
-inline BOOL SbxBase::IsSet( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) != 0 ); }
+inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
 
-inline BOOL SbxBase::IsReset( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) == 0 ); }
+inline sal_Bool SbxBase::IsReset( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) == 0 ); }
 
-inline BOOL SbxBase::CanRead() const
+inline sal_Bool SbxBase::CanRead() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
 
-inline BOOL SbxBase::CanWrite() const
+inline sal_Bool SbxBase::CanWrite() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
 
-inline BOOL SbxBase::IsModified() const
+inline sal_Bool SbxBase::IsModified() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
 
-inline BOOL SbxBase::IsConst() const
+inline sal_Bool SbxBase::IsConst() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
 
-inline BOOL SbxBase::IsHidden() const
+inline sal_Bool SbxBase::IsHidden() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
 
-inline BOOL SbxBase::IsVisible() const
+inline sal_Bool SbxBase::IsVisible() const
 { DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
 
 #endif
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 84c9832734..e40ad07917 100644..100755
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -56,15 +56,15 @@ enum SbxClassType {         // SBX-class-IDs (order is important!)
 enum SbxDataType {
     SbxEMPTY    =  0,    // * Uninitialized
     SbxNULL     =  1,    // * Contains no valid data
-    SbxINTEGER  =  2,    // * Integer (INT16)
-    SbxLONG     =  3,    // * Long integer (INT32)
+    SbxINTEGER	=  2,	 // * Integer (sal_Int16)
+    SbxLONG		=  3,	 // * Long integer (sal_Int32)
     SbxSINGLE   =  4,    // * Single-precision floating point number (float)
     SbxDOUBLE   =  5,    // * Double-precision floating point number (double)
-    SbxCURRENCY =  6,    //   Currency (INT64)
+    SbxCURRENCY =  6,	 //   Currency (sal_Int64)
     SbxDATE     =  7,    // * Date (double)
     SbxSTRING   =  8,    // * String (StarView)
     SbxOBJECT   =  9,    // * SbxBase object pointer
-    SbxERROR    = 10,    // * Error (UINT16)
+    SbxERROR    = 10,    // * Error (sal_uInt16)
     SbxBOOL     = 11,    // * Boolean (0 or -1)
 
     SbxVARIANT    = 12,  // * Display for variant datatype
@@ -72,8 +72,8 @@ enum SbxDataType {
 
     SbxCHAR     = 16,    // * signed char
     SbxBYTE     = 17,    // * unsigned char
-    SbxUSHORT   = 18,    // * unsigned short (UINT16)
-    SbxULONG    = 19,    // * unsigned long (UINT32)
+    SbxUSHORT   = 18,    // * unsigned short (sal_uInt16)
+    SbxULONG    = 19,    // * unsigned long (sal_uInt32)
 
 //deprecated:  // old 64bit types kept for backward compatibility in file I/O
     SbxLONG64   = 20,    //   moved to SbxSALINT64  as 64bit int
@@ -111,8 +111,9 @@ enum SbxDataType {
     SbxUSERn  = 2047     // last user defined data type
 };
 
-const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
-const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;    // same value as above as no conflict possible
+const sal_uInt32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const sal_uInt32 SBX_TYPE_DIM_AS_NEW_FLAG  = 0x20000;
+const sal_uInt32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;	// same value as above as no conflict possible
 #endif
 
 #ifndef _SBX_OPERATOR
@@ -127,8 +128,8 @@ enum SbxOperator {
     SbxPLUS,    // this + var
     SbxMINUS,   // this - var
     SbxNEG,     // -this (var is ignored)
-    SbxIDIV,    // this / var       (max INT32!)
-
+    SbxIDIV,			// this / var (both operands max. sal_Int32!)
+                        // Boolean operators (max sal_Int32!):
     // Boolean operators (TODO deprecate this limit: max INT32!)
     SbxAND,     // this & var
     SbxOR,      // this | var
@@ -164,7 +165,7 @@ enum SbxNameType {          // Type of the questioned name of a variable
 #endif
 
 // from 1996/3/20: New error messages
-typedef ULONG SbxError;            // Preserve old type
+typedef sal_uIntPtr SbxError;			// Preserve old type
 
 #endif
 
@@ -258,6 +259,8 @@ typedef ULONG SbxError;            // Preserve old type
 #define SBX_REFERENCE 0x4000    // Parameter is Reference (DLL-call)
 #define SBX_NO_MODIFY 0x8000    // SetModified is suppressed
 #define SBX_WITH_EVENTS 0x0080  // Same value as unused SBX_HIDDEN
+#define SBX_DIM_AS_NEW  0x0800	// Same value as SBX_GBLSEARCH, cannot conflict as one
+                                // is used for objects, the other for variables only
 
 // Broadcaster-IDs:
 #define SBX_HINT_DYING          SFX_HINT_DYING
@@ -294,10 +297,10 @@ typedef ULONG SbxError;            // Preserve old type
 #define SbxMAXBYTE  ( 255)
 #define SbxMAXINT   ( 32767)
 #define SbxMININT   (-32768)
-#define SbxMAXUINT  ((UINT16) 65535)
+#define	SbxMAXUINT	((sal_uInt16) 65535)
 #define SbxMAXLNG   ( 2147483647)
-#define SbxMINLNG   ((INT32)(-2147483647-1))
-#define SbxMAXULNG  ((UINT32) 0xffffffff)
+#define SbxMINLNG	((sal_Int32)(-2147483647-1))
+#define SbxMAXULNG	((sal_uInt32) 0xffffffff)
 
 #define SbxMAXSALUINT64     SAL_MAX_UINT64
 #define SbxMAXSALINT64      SAL_MAX_INT64
@@ -323,7 +326,7 @@ typedef ULONG SbxError;            // Preserve old type
 #define SBX_MAXINDEX    0x3FF0
 #define SBX_MAXINDEX32  SbxMAXLNG
 
-
+// The numeric values of sal_True and FALSE
 enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 };
 
 #endif //ifndef __RSC
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index bb58cf2d76..c7deb7559f 100644..100755
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -38,11 +38,11 @@ class UniString;
 
 class SbxFactory
 {
-    BOOL bHandleLast;	// TRUE: Factory is asked at last because of its expensiveness
+    sal_Bool bHandleLast;	// sal_True: Factory is asked at last because of its expensiveness
 public:
-    SbxFactory( BOOL bLast=FALSE )	{ bHandleLast = bLast; }
-    BOOL IsHandleLast( void )		{ return bHandleLast; }
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    SbxFactory( sal_Bool bLast=sal_False )	{ bHandleLast = bLast; }
+    sal_Bool IsHandleLast( void )		{ return bHandleLast; }
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index e1d25b979f..51ad59b817 100644..100755
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -112,16 +112,16 @@ class SbxBasicFormater {
     String	BasicFormat( double dNumber, String sFormatStrg );
     String  BasicFormatNull( String sFormatStrg );
 
-    static  BOOL isBasicFormat( String sFormatStrg );
+    static  sal_Bool isBasicFormat( String sFormatStrg );
 
   private:
     //*** some helper methods ***
     //void	ShowError( char *sErrMsg );
-    inline void	ShiftString( String& sStrg, USHORT nStartPos );
+    inline void	ShiftString( String& sStrg, sal_uInt16 nStartPos );
     inline void	StrAppendChar( String& sStrg, sal_Unicode ch );
     void	AppendDigit( String& sStrg, short nDigit );
     void	LeftShiftDecimalPoint( String& sStrg );
-    void	StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow );
+    void	StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow );
     void	StrRoundDigit( String& sStrg, short nPos );
     void	ParseBack( String& sStrg, const String& sFormatStrg,
                 short nFormatPos );
@@ -129,30 +129,30 @@ class SbxBasicFormater {
     // Methods for string conversion with sprintf():
     void	InitScan( double _dNum );
     void	InitExp( double _dNewExp );
-    short	GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit );
+    short	GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit );
     short	GetDigitAtPosExpScan( double dNewExponent, short nPos,
-                BOOL& bFoundFirstDigit );
-    short	GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit );
+                sal_Bool& bFoundFirstDigit );
+    short	GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit );
 #else
     // Methods for direct 'calculation' with log10() and pow():
     short	GetDigitAtPos( double dNumber, short nPos, double& dNextNumber,
-                BOOL& bFoundFirstDigit );
+                sal_Bool& bFoundFirstDigit );
     short	RoundDigit( double dNumber );
 #endif
-    String	GetPosFormatString( const String& sFormatStrg, BOOL & bFound );
-    String	GetNegFormatString( const String& sFormatStrg, BOOL & bFound );
-    String	Get0FormatString( const String& sFormatStrg, BOOL & bFound );
-    String	GetNullFormatString( const String& sFormatStrg, BOOL & bFound );
+    String	GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String	GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String	Get0FormatString( const String& sFormatStrg, sal_Bool & bFound );
+    String	GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound );
     short	AnalyseFormatString( const String& sFormatStrg,
                 short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
                 short& nNoOfOptionalDigitsLeft,
                 short& nNoOfExponentDigits,
                 short& nNoOfOptionalExponentDigits,
-                BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
-                BOOL& bGenerateThousandSeparator,
+                sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+                sal_Bool& bGenerateThousandSeparator,
                 short& nMultipleThousandSeparators );
     void	ScanFormatString( double dNumber, const String& sFormatStrg,
-                String& sReturnStrg, BOOL bCreateSign );
+                String& sReturnStrg, sal_Bool bCreateSign );
 
     //*** Data ***
     sal_Unicode cDecPoint;		// sign for the decimal point
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 875627f233..e054e15a64 100644..100755
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -45,7 +45,7 @@ public:
     SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
     SbxMethod& operator=( const SbxMethod& r )
     { SbxVariable::operator=( r ); return *this; }
-    BOOL Run( SbxValues* pValues = NULL );
+    sal_Bool Run( SbxValues* pValues = NULL );
     virtual SbxClassType GetClass() const;
 };
 
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index dfee8ecade..c5a6bd54f5 100644..100755
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -38,7 +38,7 @@ SV_DECL_REF(SbxMemoryStream)
 class SbxMemoryStream : public SbxBase, public SvMemoryStream
 {
   public:
-    SbxMemoryStream(ULONG nInitSize_=512, ULONG nResize_=64) :
+    SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
         SvMemoryStream(nInitSize_,nResize_) {}
     ~SbxMemoryStream();
 
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index cdcced040b..61f9dcf9a3 100644..100755
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -43,9 +43,9 @@ class SbxObject : public SbxVariable, public SfxListener
 {
     SbxObjectImpl* mpSbxObjectImpl;	// Impl data
 
-    SbxArray* FindVar( SbxVariable*, USHORT& );
+    SbxArray* FindVar( SbxVariable*, sal_uInt16& );
     // AB 23.3.1997, special method for VCPtrRemove (see below)
-    SbxArray* VCPtrFindVar( SbxVariable*, USHORT& );
+    SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
 protected:
     SbxArrayRef  pMethods;                  // Methods
     SbxArrayRef  pProps;                    // Properties
@@ -53,8 +53,8 @@ protected:
     SbxProperty* pDfltProp;                 // Default-Property
     String       aClassName;                // Classname
     String       aDfltPropName;
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
     virtual ~SbxObject();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
@@ -68,7 +68,7 @@ public:
     virtual SbxClassType GetClass() const;
     virtual void Clear();
 
-    virtual BOOL  IsClass( const String& ) const;
+    virtual sal_Bool  IsClass( const String& ) const;
     const String& GetClassName() const { return aClassName; }
     void		  SetClassName( const String &rNew ) { aClassName = rNew; }
     // Default-Property
@@ -76,15 +76,15 @@ public:
     void SetDfltProperty( const String& r );
     void SetDfltProperty( SbxProperty* );
     // Search for an element
-    virtual SbxVariable* FindUserData( UINT32 nUserData );
+    virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
     virtual SbxVariable* Find( const String&, SbxClassType );
     SbxVariable* FindQualified( const String&, SbxClassType );
     // Quick-Call-Interface for Methods
-    virtual BOOL Call( const String&, SbxArray* = NULL );
+    virtual sal_Bool Call( const String&, SbxArray* = NULL );
     // Execution of DDE-Commands
     SbxVariable* Execute( const String& );
     // Manage elements
-    virtual BOOL GetAll( SbxClassType ) { return TRUE; }
+    virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
     SbxVariable* Make( const String&, SbxClassType, SbxDataType );
     virtual SbxObject* MakeObject( const String&, const String& );
     virtual void Insert( SbxVariable* );
@@ -97,7 +97,7 @@ public:
     virtual void Remove( SbxVariable* );
     // AB 23.3.1997, deletion per pointer for controls (duplicate names!)
     void VCPtrRemove( SbxVariable* );
-    void SetPos( SbxVariable*, USHORT );
+    void SetPos( SbxVariable*, sal_uInt16 );
 
     // Macro-Recording
     virtual String GenerateSource( const String &rLinePrefix,
@@ -109,9 +109,9 @@ public:
     // Hooks
     virtual SvDispatch* GetSvDispatch();
     // Debugging
-    void Dump( SvStream&, BOOL bDumpAll=FALSE );
+    void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
 
-    static void GarbageCollection( ULONG nObjects = 0 /* ::= all */ );
+    static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
 };
 
 #ifndef __SBX_SBXOBJECTREF_HXX
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 33bbdd4188..33bbdd4188 100644..100755
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 787a7df063..26da3e0ef6 100644..100755
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -42,12 +42,12 @@ class SbxDecimal;
 struct SbxValues
 {
     union {
-        BYTE			nByte;
-        UINT16          nUShort;
+        sal_uInt8       nByte;
+        sal_uInt16      nUShort;
         sal_Unicode		nChar;
-        INT16			nInteger;
-        UINT32          nULong;
-        INT32           nLong;
+        sal_Int16		nInteger;
+        sal_uInt32      nULong;
+        sal_Int32       nLong;
         unsigned int    nUInt;
         int             nInt;
         sal_uInt64      uInt64;
@@ -61,12 +61,12 @@ struct SbxValues
 
         SbxBase*        pObj;
 
-        BYTE*	        pByte;
-        UINT16*	        pUShort;
+        sal_uInt8*      pByte;
+        sal_uInt16*     pUShort;
         sal_Unicode*    pChar;
-        INT16*	        pInteger;
-        UINT32*	        pULong;
-        INT32*	        pLong;
+        sal_Int16*      pInteger;
+        sal_uInt32*     pULong;
+        sal_Int32*      pLong;
         unsigned int*   pUInt;
         int*	        pInt;
         sal_uInt64*     puInt64;
@@ -82,11 +82,11 @@ struct SbxValues
     SbxValues(): pData( NULL ), eType(SbxEMPTY) {}
     SbxValues( SbxDataType e ): eType(e) {}
     SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
-    SbxValues( BYTE _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
+    SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
     SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
     SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
-    SbxValues( USHORT _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
-    SbxValues( ULONG _nULong ): nULong( _nULong ), eType(SbxULONG) {}
+    SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
+    SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
     SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
     SbxValues( unsigned int _nUInt ): nUInt( _nUInt ), eType(SbxUINT) {}
     SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
@@ -112,17 +112,17 @@ class SbxValue : public SbxBase
     SbxValueImpl* mpSbxValueImplImpl;	// Impl data
 
     // #55226 Transport additional infos
-    SbxValue* TheRealValue( BOOL bObjInObjError ) const;
+    SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
     SbxValue* TheRealValue() const;
 protected:
     SbxValues aData; // Data
     ::rtl::OUString aPic;  // Picture-String
     String          aToolString;  // tool string copy
 
-    virtual void Broadcast( ULONG );   	// Broadcast-Call
+    virtual void Broadcast( sal_uIntPtr );   	// Broadcast-Call
     virtual ~SbxValue();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
     TYPEINFO();
@@ -131,54 +131,47 @@ public:
     SbxValue( const SbxValue& );
     SbxValue& operator=( const SbxValue& );
     virtual void Clear();
-    virtual BOOL IsFixed() const;
-
-    BOOL IsInteger()    const { return BOOL( GetType() == SbxINTEGER  ); }
-    BOOL IsLong()       const { return BOOL( GetType() == SbxLONG     ); }
-    BOOL IsSingle()     const { return BOOL( GetType() == SbxSINGLE   ); }
-    BOOL IsDouble()     const { return BOOL( GetType() == SbxDOUBLE   ); }
-    BOOL IsString()     const { return BOOL( GetType() == SbxSTRING   ); }
-    BOOL IsDate()       const { return BOOL( GetType() == SbxDATE     ); }
-    BOOL IsCurrency()   const { return BOOL( GetType() == SbxCURRENCY ); }
-    BOOL IsObject()     const { return BOOL( GetType() == SbxOBJECT   ); }
-    BOOL IsDataObject() const { return BOOL( GetType() == SbxDATAOBJECT);}
-    BOOL IsBool()       const { return BOOL( GetType() == SbxBOOL     ); }
-    BOOL IsErr()        const { return BOOL( GetType() == SbxERROR    ); }
-    BOOL IsEmpty()      const { return BOOL( GetType() == SbxEMPTY    ); }
-    BOOL IsNull()       const { return BOOL( GetType() == SbxNULL     ); }
-    BOOL IsChar()       const { return BOOL( GetType() == SbxCHAR     ); }
-    BOOL IsByte()       const { return BOOL( GetType() == SbxBYTE     ); }
-    BOOL IsUShort()     const { return BOOL( GetType() == SbxUSHORT   ); }
-    BOOL IsULong()      const { return BOOL( GetType() == SbxULONG    ); }
-    BOOL IsInt()        const { return BOOL( GetType() == SbxINT      ); }
-    BOOL IsUInt()       const { return BOOL( GetType() == SbxUINT     ); }
-    BOOL IspChar()      const { return BOOL( GetType() == SbxLPSTR    ); }
-    BOOL IsNumeric()    const;
-    BOOL IsNumericRTL() const;	        // #41692 Interface for Basic
-    BOOL ImpIsNumeric( BOOL bOnlyIntntl ) const;	// Implementation
+    virtual sal_Bool IsFixed() const;
+
+    sal_Bool IsInteger() const { return sal_Bool( GetType() == SbxINTEGER  ); }
+    sal_Bool IsLong()    const { return sal_Bool( GetType() == SbxLONG     ); }
+    sal_Bool IsSingle()  const { return sal_Bool( GetType() == SbxSINGLE   ); }
+    sal_Bool IsDouble()  const { return sal_Bool( GetType() == SbxDOUBLE   ); }
+    sal_Bool IsString()  const { return sal_Bool( GetType() == SbxSTRING   ); }
+    sal_Bool IsDate()    const { return sal_Bool( GetType() == SbxDATE     ); }
+    sal_Bool IsCurrency()const { return sal_Bool( GetType() == SbxCURRENCY ); }
+    sal_Bool IsObject()  const { return sal_Bool( GetType() == SbxOBJECT   ); }
+    sal_Bool IsDataObject()const{return sal_Bool( GetType() == SbxDATAOBJECT);}
+    sal_Bool IsBool()    const { return sal_Bool( GetType() == SbxBOOL     ); }
+    sal_Bool IsErr()     const { return sal_Bool( GetType() == SbxERROR    ); }
+    sal_Bool IsEmpty()   const { return sal_Bool( GetType() == SbxEMPTY    ); }
+    sal_Bool IsNull()    const { return sal_Bool( GetType() == SbxNULL     ); }
+    sal_Bool IsChar()    const { return sal_Bool( GetType() == SbxCHAR     ); }
+    sal_Bool IsByte()    const { return sal_Bool( GetType() == SbxBYTE     ); }
+    sal_Bool IsUShort()  const { return sal_Bool( GetType() == SbxUSHORT   ); }
+    sal_Bool IsULong()   const { return sal_Bool( GetType() == SbxULONG    ); }
+    sal_Bool IsInt()     const { return sal_Bool( GetType() == SbxINT      ); }
+    sal_Bool IsUInt()    const { return sal_Bool( GetType() == SbxUINT     ); }
+    sal_Bool IspChar()   const { return sal_Bool( GetType() == SbxLPSTR    ); }
+    sal_Bool IsNumeric() const;
+    sal_Bool IsNumericRTL() const;	// #41692 Interface for Basic
+    sal_Bool ImpIsNumeric( sal_Bool bOnlyIntntl ) const;	// Implementation
 
     virtual SbxClassType GetClass() const;
     virtual SbxDataType GetType() const;
     SbxDataType GetFullType() const;
-    BOOL SetType( SbxDataType );
+    sal_Bool SetType( SbxDataType );
 
-    virtual BOOL Get( SbxValues& ) const;
-    BOOL GetNoBroadcast( SbxValues& );
+    virtual sal_Bool Get( SbxValues& ) const;
+    sal_Bool GetNoBroadcast( SbxValues& );
     const SbxValues& GetValues_Impl() const { return aData; }
-    virtual BOOL Put( const SbxValues& );
+    virtual sal_Bool Put( const SbxValues& );
 
     inline SbxValues * data() { return &aData; }
 
-    UINT16      GetErr() const;
-
-    BOOL        GetBool() const;
-    BYTE        GetByte() const;
     sal_Unicode GetChar() const;
-    UINT16      GetUShort() const;
-    UINT32      GetULong() const;
-    int         GetInt() const;
-    INT16       GetInteger() const;
-    INT32       GetLong() const;
+    sal_Int16   GetInteger() const;
+    sal_Int32   GetLong() const;
     sal_Int64   GetInt64() const;
     sal_uInt64  GetUInt64() const;
 
@@ -189,55 +182,56 @@ public:
     double      GetDouble() const;
     double      GetDate() const;
 
+    sal_Bool   GetBool() const;
+    sal_uInt16 GetErr() const;
     const String&   GetString() const;
     const String&   GetCoreString() const;
     rtl::OUString   GetOUString() const;
 
     SbxBase*    GetObject() const;
-    BOOL	    HasObject() const;
+    sal_Bool	HasObject() const;
     void*       GetData() const;
-
-
-    BOOL PutEmpty();
-    BOOL PutNull();
-    BOOL PutErr( USHORT );
-
-    BOOL PutBool( BOOL );
-    BOOL PutByte( BYTE );
-    BOOL PutChar( sal_Unicode );
-    BOOL PutUShort( UINT16 );
-    BOOL PutULong( UINT32 );
-    BOOL PutInt( int );
-    BOOL PutInteger( INT16 );
-    BOOL PutLong( INT32 );
-    BOOL PutInt64( sal_Int64 );
-    BOOL PutUInt64( sal_uInt64 );
-
-    BOOL PutSingle( float );
-    BOOL PutDouble( double );
-    BOOL PutDate( double );
-
-            // with extended analysis (International, "TRUE"/"FALSE")
-    BOOL PutStringExt( const ::rtl::OUString& );
-    BOOL PutString( const ::rtl::OUString& );
-    BOOL PutString( const sal_Unicode* );   // Type = SbxSTRING
-    BOOL PutpChar( const sal_Unicode* );    // Type = SbxLPSTR
+    sal_uInt8   GetByte() const;
+    sal_uInt16 GetUShort() const;
+    sal_uInt32 GetULong() const;
+    int	   GetInt() const;
+
+    sal_Bool PutInteger( sal_Int16 );
+    sal_Bool PutLong( sal_Int32 );
+    sal_Bool PutSingle( float );
+    sal_Bool PutDouble( double );
+    sal_Bool PutDate( double );
+    sal_Bool PutBool( sal_Bool );
+    sal_Bool PutErr( sal_uInt16 );
+    sal_Bool PutStringExt( const ::rtl::OUString& );     // with extended analysis (International, "sal_True"/"sal_False")
+    sal_Bool PutInt64( sal_Int64 );
+    sal_Bool PutUInt64( sal_uInt64 );
+    sal_Bool PutString( const ::rtl::OUString& );
+    sal_Bool PutString( const sal_Unicode* );   // Type = SbxSTRING
+    sal_Bool PutpChar( const sal_Unicode* );    // Type = SbxLPSTR
+    sal_Bool PutChar( sal_Unicode );
+    sal_Bool PutByte( sal_uInt8 );
+    sal_Bool PutUShort( sal_uInt16 );
+    sal_Bool PutULong( sal_uInt32 );
+    sal_Bool PutInt( int );
+    sal_Bool PutEmpty();
+    sal_Bool PutNull();
 
             // Special methods
-    BOOL PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
-    BOOL fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
-    BOOL PutDecimal( SbxDecimal* pDecimal );
-    BOOL PutCurrency( const sal_Int64& );
+    sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+    sal_Bool PutDecimal( SbxDecimal* pDecimal );
+    sal_Bool PutCurrency( const sal_Int64& );
             // Interface for CDbl in Basic
-    static SbxError ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle=FALSE );
+    static SbxError ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle = sal_False );
 
-    BOOL PutObject( SbxBase* );
-    BOOL PutData( void* );
+    sal_Bool PutObject( SbxBase* );
+    sal_Bool PutData( void* );
 
-    virtual BOOL Convert( SbxDataType );
-    virtual BOOL Compute( SbxOperator, const SbxValue& );
-    virtual BOOL Compare( SbxOperator, const SbxValue& ) const;
-    BOOL Scan( const String&, USHORT* = NULL );
+    virtual sal_Bool Convert( SbxDataType );
+    virtual sal_Bool Compute( SbxOperator, const SbxValue& );
+    virtual sal_Bool Compare( SbxOperator, const SbxValue& ) const;
+    sal_Bool Scan( const String&, sal_uInt16* = NULL );
     void Format( String&, const String* = NULL ) const;
 
     // The following operators are definied for easier handling.
@@ -324,6 +318,7 @@ SV_DECL_REF(SbxInfo)
 class SfxBroadcaster;
 
 class SbxVariableImpl;
+class StarBASIC;
 
 class SbxVariable : public SbxValue
 {
@@ -333,7 +328,7 @@ class SbxVariable : public SbxValue
     SfxBroadcaster*  pCst;		        // Broadcaster, if needed
     String           maName;            // Name, if available
     SbxArrayRef      mpPar;             // Parameter-Array, if set
-    USHORT           nHash;             // Hash-ID for search
+    sal_uInt16           nHash;             // Hash-ID for search
 
     SbxVariableImpl* getImpl( void );
 
@@ -342,8 +337,8 @@ protected:
     sal_uIntPtr nUserData;          // User data for Call()
     SbxObject* pParent;             // Currently attached object
     virtual ~SbxVariable();
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
     TYPEINFO();
@@ -352,13 +347,13 @@ public:
     SbxVariable( const SbxVariable& );
     SbxVariable& operator=( const SbxVariable& );
 
-    void Dump( SvStream&, BOOL bDumpAll=FALSE );
+    void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
 
     virtual void SetName( const String& );
     virtual const String& GetName( SbxNameType = SbxNAME_NONE ) const;
-    USHORT GetHashCode() const			{ return nHash; }
+    sal_uInt16 GetHashCode() const			{ return nHash; }
 
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 
     sal_uIntPtr GetUserData() const 	   { return nUserData; }
     void SetUserData( sal_uIntPtr n ) { nUserData = n;    }
@@ -375,8 +370,8 @@ public:
     // Sfx-Broadcasting-Support:
     // Due to data reduction and better DLL-hierarchie currently via casting
     SfxBroadcaster& GetBroadcaster();
-    BOOL IsBroadcaster() const { return BOOL( pCst != NULL ); }
-    virtual void Broadcast( ULONG nHintId );
+    sal_Bool IsBroadcaster() const { return sal_Bool( pCst != NULL ); }
+    virtual void Broadcast( sal_uIntPtr nHintId );
 
     inline const SbxObject* GetParent() const { return pParent; }
     inline SbxObject* GetParent() { return pParent; }
@@ -384,9 +379,11 @@ public:
 
     const String& GetDeclareClassName( void );
     void SetDeclareClassName( const String& );
-    void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener );
+    void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+        StarBASIC* pParentBasic );
+    void ClearComListener( void );
 
-    static USHORT MakeHashCode( const String& rName );
+    static sal_uInt16 MakeHashCode( const String& rName );
 };
 
 #ifndef SBX_VARIABLE_DECL_DEFINED
diff --git a/basic/inc/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc
index f94fca403d..f94fca403d 100644..100755
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/basic/svtmsg.hrc
diff --git a/basic/inc/testtool.hrc b/basic/inc/basic/testtool.hrc
index c61c2282f2..c61c2282f2 100644..100755
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/basic/testtool.hrc
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 80a8dc4b90..05495eaf6b 100644..100755
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -41,7 +41,7 @@
 
 // #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
 // this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine );
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
 
 #define ADD_ERROR_QUIET(nNr, aStr)										\
 {																		\
@@ -101,9 +101,9 @@ public:
     String aKurzname;
     String aSlotname;
     String aLangname;
-    USHORT nRType;
+    sal_uInt16 nRType;
     String aRName;
-    BOOL bIsReset;
+    sal_Bool bIsReset;
 };
 
 // Defines for syntax Highlighting
@@ -132,20 +132,20 @@ public:
 class TTExecutionStatusHint : public SfxSimpleHint
 {
 private:
-    USHORT mnType;
+    sal_uInt16 mnType;
     String maExecutionStatus;
     String maAdditionalExecutionStatus;
 
 public:
             TYPEINFO();
-            TTExecutionStatusHint( USHORT nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
+            TTExecutionStatusHint( sal_uInt16 nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
                 : SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
                 , mnType( nType )
                 , maExecutionStatus( pExecutionStatus, RTL_TEXTENCODING_ASCII_US )
                 , maAdditionalExecutionStatus( pAdditionalExecutionStatus, RTL_TEXTENCODING_ASCII_US )
                 {;}
 
-            TTExecutionStatusHint( USHORT nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
+            TTExecutionStatusHint( sal_uInt16 nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
                 : SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
                 , mnType( nType )
                 , maExecutionStatus( aExecutionStatus )
@@ -154,7 +154,7 @@ public:
 
     const String& GetExecutionStatus() const { return maExecutionStatus; }
     const String& GetAdditionalExecutionStatus() const { return maAdditionalExecutionStatus; }
-    USHORT GetType(){ return mnType; }
+    sal_uInt16 GetType(){ return mnType; }
 };
 
 #endif // _BASIC_TESTTOOL_HXX_
diff --git a/basic/inc/basic/ttglobal.hrc b/basic/inc/basic/ttglobal.hrc
index 4fa6130c7c..4fa6130c7c 100644..100755
--- a/basic/inc/basic/ttglobal.hrc
+++ b/basic/inc/basic/ttglobal.hrc
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/basic/ttmsg.hrc
index 07da20096a..07da20096a 100644..100755
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/basic/ttmsg.hrc
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 7600e7231f..ee70a614a6 100644..100755
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -32,6 +32,8 @@
 
 #define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) )
 #define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) )
+#define Str2Id( Str ) rtl::OUStringToOString( Str, RTL_TEXTENCODING_ASCII_US ) 
+#define Id2Str( Id ) String( rtl::OStringToOUString( Id, RTL_TEXTENCODING_ASCII_US ) )
 
 #define StartKenn			CUniString("%")
 #define EndKenn				CUniString("%")
@@ -43,7 +45,7 @@
 #define TabKenn				( StartKenn.AppendAscii("Tab") )
 #define MakeStringParam(Type,aText)	( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) )
 #define MakeStringNumber(Type,nNumber)	MakeStringParam (Type, UniString::CreateFromInt32(nNumber))
-#define UIdString(aID) MakeStringParam(UIdKenn,aID.GetText())
+#define UIdString(aID) MakeStringParam(UIdKenn,String(rtl::OStringToOUString( aID, RTL_TEXTENCODING_ASCII_US )))
 #define MethodString(nNumber) MakeStringNumber(MethodKenn,nNumber)
 #define TypeString(nNumber) MakeStringNumber(TypeKenn,nNumber)
 #define SlotString(nNumber) MakeStringNumber(SlotKenn,nNumber)
@@ -56,20 +58,20 @@
 #define ResString(nNumber) MakeStringNumber(ResKenn,nNumber)
 #define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText)
 
-UniString GEN_RES_STR0( ULONG nResId );
-UniString GEN_RES_STR1( ULONG nResId, const String &Text1 );
-UniString GEN_RES_STR2( ULONG nResId, const String &Text1, const String &Text2 );
-UniString GEN_RES_STR3( ULONG nResId, const String &Text1, const String &Text2, const String &Text3 );
+UniString GEN_RES_STR0( sal_uIntPtr nResId );
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const String &Text1 );
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const String &Text1, const String &Text2 );
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const String &Text1, const String &Text2, const String &Text3 );
 
 #define GEN_RES_STR1c( nResId, Text1 ) GEN_RES_STR1( nResId, CUniString(Text1) )
 #define GEN_RES_STR2c2( nResId, Text1, Text2 ) GEN_RES_STR2( nResId, Text1, CUniString(Text2) )
 #define GEN_RES_STR3c3( nResId, Text1, Text2, Text3 ) GEN_RES_STR3( nResId, Text1, Text2, CUniString(Text3) )
 
 #define IMPL_GEN_RES_STR \
-UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } \
-UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
-UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
-UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
+UniString GEN_RES_STR0( sal_uIntPtr nResId ) { return ResString( nResId ); } \
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
 
 #endif
 
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
new file mode 100755
index 0000000000..451d15cf40
--- /dev/null
+++ b/basic/inc/basic/vbahelper.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef BASIC_VBAHELPR_HXX
+#define BASIC_VBAHELPR_HXX
+
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace basic {
+namespace vba {
+
+/*  This header contains public helper functions for VBA used from this module
+    and from other VBA implementation modules such as vbahelper.
+ */
+ 
+// ============================================================================
+
+/** Locks or unlocks the controllers of all documents that have the same type
+    as the specified document.
+
+    First, the global module manager (com.sun.star.frame.ModuleManager) is
+    asked for the type of the passed model, and all open documents with the
+    same type will be locked or unlocked.
+    
+    @param rxModel
+        A document model determining the type of the documents to be locked or
+        unlocked.
+        
+    @param bLockControllers
+        Passing true will lock all controllers, passing false will unlock them.
+ */
+void lockControllersOfAllDocuments(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
+    sal_Bool bLockControllers );
+
+// ============================================================================
+
+/** Enables or disables the container windows of all controllers of all
+    documents that have the same type as the specified document.
+
+    First, the global module manager (com.sun.star.frame.ModuleManager) is
+    asked for the type of the passed model, and the container windows of all
+    open documents with the same type will be enabled or disabled.
+
+    @param rxModel
+        A document model determining the type of the documents to be enabled or
+        disabled.
+
+    @param bEnableWindows
+        Passing true will enable all container windows of all controllers,
+        passing false will disable them.
+ */
+void enableContainerWindowsOfAllDocuments(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
+    sal_Bool bEnableWindows );
+
+// ============================================================================
+
+} // namespace vba
+} // namespace basic
+
+#endif
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index a08e5d51e9..a08e5d51e9 100644..100755
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
diff --git a/basic/inc/makefile.mk b/basic/inc/makefile.mk
index 1b56b67748..1b56b67748 100644..100755
--- a/basic/inc/makefile.mk
+++ b/basic/inc/makefile.mk
diff --git a/basic/inc/pch/precompiled_basic.cxx b/basic/inc/pch/precompiled_basic.cxx
index 6c546e131b..6c546e131b 100644..100755
--- a/basic/inc/pch/precompiled_basic.cxx
+++ b/basic/inc/pch/precompiled_basic.cxx
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 6538399a28..1b7a570328 100644..100755
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -273,7 +273,7 @@
 #include "vcl/timer.hxx"
 #include "vcl/toolbox.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
 #include "xmlscript/xmldlg_imexp.hxx"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index 340b594bf0..340b594bf0 100644..100755
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index 19b72d1a22..19b72d1a22 100644..100755
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
diff --git a/basic/prj/build.lst b/basic/prj/build.lst
index c00a3d8412..17a34fa5bd 100755
--- a/basic/prj/build.lst
+++ b/basic/prj/build.lst
@@ -1,4 +1,4 @@
-sb	basic	:    l10n offuh oovbaapi svtools xmlscript framework salhelper NULL
+sb	basic	:    L10N:l10n offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL
 sb	basic									usr1	-	all	sb_mkout NULL
 sb	basic\inc								nmake	-	all	sb_inc NULL
 sb	basic\source\app						nmake	-	all	sb_app sb_class sb_inc NULL
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index d2a083ebcb..41d1a59550 100644..100755
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -20,40 +20,10 @@ mkdir: %COMMON_DEST%\res%_EXT%
 ..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
 
 mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\testtool.hrc %_DEST%\inc%_EXT%\basic\testtool.hrc
-..\inc\ttmsg.hrc %_DEST%\inc%_EXT%\basic\ttmsg.hrc
-..\inc\basic\ttglobal.hrc %_DEST%\inc%_EXT%\basic\ttglobal.hrc
-..\inc\svtmsg.hrc %_DEST%\inc%_EXT%\basic\svtmsg.hrc
+..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
+..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc
+..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h
 
-..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
-..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx
-..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx
-..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx
-..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx
-..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx
-..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx
-..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx
-..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx
-..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx
-..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx
-..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx
-..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx
-..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx
-..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx
-..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx
-..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx
-
-..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx
-..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx
-..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx
-..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx
-..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx
-..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx
-..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx
-..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx
-..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx
-..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx
-..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
-
-..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
 ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
+..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component
+
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index dba62993b0..15c63b6a39 100644..100755
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -89,52 +89,52 @@ IMPL_GEN_RES_STR;
 
 #ifdef DBG_UTIL
 // filter Messages generated due to missing configuration  Bug:#83887#
-void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
+void TestToolDebugMessageFilter( const sal_Char *pString, sal_Bool bIsOsl )
 {
-    static BOOL static_bInsideFilter = FALSE;
+    static sal_Bool static_bInsideFilter = sal_False;
 
     // Ignore messages during filtering to avoid endless recursions
     if ( static_bInsideFilter )
         return;
 
-    static_bInsideFilter = TRUE;
+    static_bInsideFilter = sal_True;
 
     ByteString aMessage( pString );
 
-    BOOL bIgnore = FALSE;
+    sal_Bool bIgnore = sal_False;
 
     if ( bIsOsl )
     {
         // OSL
         if ( aMessage.Search( CByteString("Cannot open Configuration: Connector: unknown delegatee com.sun.star.connection.Connector.portal") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
     }
     else
     {
         // DBG
 #if ! (OSL_DEBUG_LEVEL > 1)
         if ( aMessage.Search( CByteString("SelectAppIconPixmap") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
 #endif
         if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("property value missing") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND
             && aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("ucb::configureUcb(): Bad arguments") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("CreateInstance with arguments exception") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
         if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND )
-            bIgnore = TRUE;
+            bIgnore = sal_True;
     }
 
 
     if ( bIgnore )
     {
-        static_bInsideFilter = FALSE;
+        static_bInsideFilter = sal_False;
         return;
     }
 
@@ -156,25 +156,25 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
             printf("DbgPrintMsgBox failed: %s\n", pString );
         }
     }
-    static_bInsideFilter = FALSE;
+    static_bInsideFilter = sal_False;
 }
 
 void SAL_CALL DBG_TestToolDebugMessageFilter( const sal_Char *pString )
 {
-        TestToolDebugMessageFilter( pString, FALSE );
+        TestToolDebugMessageFilter( pString, sal_False );
 }
 
 extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString )
 {
     if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
-        TestToolDebugMessageFilter( pString, TRUE );
+        TestToolDebugMessageFilter( pString, sal_True );
 }
 
 #endif
 
 // #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
 // this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine )
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine )
 {
     aLine.SearchAndReplace( '\t', ' ' );
     String ThreeBlanks = CUniString("   ");
@@ -272,7 +272,7 @@ int BasicApp::Main( )
             if ( aDefIniPath.Exists() )
             {
                 aDefIniPath.CopyTo( aIniPath, FSYS_ACTION_COPYFILE );
-                FileStat::SetReadOnlyFlag( aIniPath, FALSE );
+                FileStat::SetReadOnlyFlag( aIniPath, sal_False );
             }
         }
     }
@@ -355,7 +355,7 @@ void BasicApp::SetFocus()
 IMPL_LINK( BasicApp, LateInit, void *, pDummy )
 {
     (void) pDummy; /* avoid warning about unused parameter */
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
     {
         if ( Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("-run") == COMPARE_EQUAL
@@ -363,7 +363,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
             || Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("/run") == COMPARE_EQUAL
 #endif
             )
-            pFrame->SetAutoRun( TRUE );
+            pFrame->SetAutoRun( sal_True );
         else if ( Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("-result") == COMPARE_EQUAL
 #ifndef UNX
             || Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("/result") == COMPARE_EQUAL
@@ -374,7 +374,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
             {
                 if ( ByteString( Application::GetCommandLineParam( i+1 ), osl_getThreadTextEncoding() ).IsNumericAscii() )
                 {
-                    MsgEdit::SetMaxLogLen( sal::static_int_cast< USHORT >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
+                    MsgEdit::SetMaxLogLen( sal::static_int_cast< sal_uInt16 >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
                 }
                 i++;
             }
@@ -446,7 +446,7 @@ FloatingExecutionStatus::FloatingExecutionStatus( Window * pParent )
 
 void FloatingExecutionStatus::SetStatus( String aW )
 {
-    Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+    Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     ToTop( TOTOP_NOGRABFOCUS );
     aAusblend.Start();
     aStatus.SetText( aW );
@@ -454,7 +454,7 @@ void FloatingExecutionStatus::SetStatus( String aW )
 
 void FloatingExecutionStatus::SetAdditionalInfo( String aF )
 {
-    Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+    Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     ToTop( TOTOP_NOGRABFOCUS );
     aAusblend.Start();
     aAdditionalInfo.SetText( aF );
@@ -473,11 +473,11 @@ TYPEINIT1(TTExecutionStatusHint, SfxSimpleHint);
 
 BasicFrame::BasicFrame() : WorkWindow( NULL,
     WinBits( WB_APP | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) )
-, bIsAutoRun( FALSE )
+, bIsAutoRun( sal_False )
 , pDisplayHidDlg( NULL )
 , pEditVar ( 0 )
-, bAutoReload( FALSE )
-, bAutoSave( TRUE )
+, bAutoReload( sal_False )
+, bAutoSave( sal_True )
 , pBasic( NULL )
 , pExecutionStatus( NULL )
 , pStatus( NULL )
@@ -487,10 +487,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
 {
 
     Application::SetDefDialogParent( this );
-    AlwaysEnableInput( TRUE );
+    AlwaysEnableInput( sal_True );
     pBasic  = TTBasic::CreateMyBasic();		// depending on what was linked to the executable
-    bInBreak = FALSE;
-    bDisas = FALSE;
+    bInBreak = sal_False;
+    bDisas = sal_False;
     nFlags  = 0;
 //	Icon aAppIcon;
 
@@ -594,11 +594,11 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
 }
 
 const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
 
 void BasicFrame::LoadIniFile()
 {
-    USHORT i;
+    sal_uInt16 i;
     Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
 
     for ( i = 0 ; i < aConf.GetGroupCount() ; i++ )
@@ -714,12 +714,12 @@ IMPL_LINK( BasicFrame, CheckAllFiles, Timer*, pTimer )
     return 0;
 }
 
-BOOL BasicFrame::IsAutoRun()
+sal_Bool BasicFrame::IsAutoRun()
 {
     return bIsAutoRun;
 }
 
-void BasicFrame::SetAutoRun( BOOL bAuto )
+void BasicFrame::SetAutoRun( sal_Bool bAuto )
 {
     bIsAutoRun = bAuto;
 }
@@ -809,7 +809,7 @@ IMPL_LINK( BasicFrame, CloseButtonClick, void*, EMPTYARG )
             break;
         }
     }
-    return Command( RID_FILECLOSE, FALSE );
+    return Command( RID_FILECLOSE, sal_False );
 }
 
 IMPL_LINK( BasicFrame, FloatButtonClick, void*, EMPTYARG )
@@ -848,7 +848,7 @@ void BasicFrame::WinShow_Hide()
         return;
 
     AppWin* p;
-    BOOL bWasFullscreen = FALSE;
+    sal_Bool bWasFullscreen = sal_False;
     for ( size_t i = pList->size(); i > 0; --i )
     {
         p = pList->at( i - 1 );
@@ -859,7 +859,7 @@ void BasicFrame::WinShow_Hide()
                )
                 p->Hide( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             else
-                p->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                p->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
         }
         bWasFullscreen |= p->GetWinState() == TT_WIN_STATE_MAX;
     }
@@ -869,13 +869,13 @@ void BasicFrame::WinMax_Restore()
 {
     // The application buttons
     AppWin* p;
-    BOOL bHasFullscreenWin = FALSE;
+    sal_Bool bHasFullscreenWin = sal_False;
     for ( size_t i = 0, n = pList->size(); i < n && !bHasFullscreenWin; ++i )
     {
         p = pList->at( i );
         bHasFullscreenWin = ( p->GetWinState() == TT_WIN_STATE_MAX );
     }
-    GetMenuBar()->ShowButtons( bHasFullscreenWin, FALSE, FALSE );
+    GetMenuBar()->ShowButtons( bHasFullscreenWin, sal_False, sal_False );
     WinShow_Hide();
 }
 
@@ -901,9 +901,9 @@ void BasicFrame::RemoveWindow( AppWin *pWin )
     Menu* pMenu = GetMenuBar();
     if( pList->empty() )
     {
-        pMenu->EnableItem( RID_APPEDIT,   FALSE );
-        pMenu->EnableItem( RID_APPRUN,	  FALSE );
-        pMenu->EnableItem( RID_APPWINDOW, FALSE );
+        pMenu->EnableItem( RID_APPEDIT,   sal_False );
+        pMenu->EnableItem( RID_APPRUN,	  sal_False );
+        pMenu->EnableItem( RID_APPWINDOW, sal_False );
     }
 
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -928,20 +928,20 @@ void BasicFrame::AddWindow( AppWin *pWin )
     MenuBar* pMenu = GetMenuBar();
     if( !pList->empty() )
     {
-        pMenu->EnableItem( RID_APPEDIT,   TRUE );
-        pMenu->EnableItem( RID_APPRUN,	  TRUE );
-        pMenu->EnableItem( RID_APPWINDOW, TRUE );
+        pMenu->EnableItem( RID_APPEDIT,   sal_True );
+        pMenu->EnableItem( RID_APPRUN,	  sal_True );
+        pMenu->EnableItem( RID_APPWINDOW, sal_True );
     }
 
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
-    USHORT nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
+    sal_uInt16 nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
 
     // Separator necessary
     if ( nLastID < RID_WIN_FILE1 && pWinMenu->GetItemType( pWinMenu->GetItemCount() - 1 ) != MENUITEM_SEPARATOR )
         pWinMenu->InsertSeparator();
 
     // Find free ID
-    USHORT nFreeID = RID_WIN_FILE1;
+    sal_uInt16 nFreeID = RID_WIN_FILE1;
     while ( pWinMenu->GetItemPos( nFreeID ) != MENU_ITEM_NOTFOUND && nFreeID < RID_WIN_FILEn )
         nFreeID++;
 
@@ -974,7 +974,7 @@ void BasicFrame::FocusWindow( AppWin *pWin )
         }
     }
     pList->push_back( pWin );
-    pWin->Minimize( FALSE );
+    pWin->Minimize( sal_False );
 
     aAppFile = pWin->GetText();
     UpdateTitle();
@@ -983,14 +983,14 @@ void BasicFrame::FocusWindow( AppWin *pWin )
     pStatus->LoadTaskToolBox();
 }
 
-BOOL BasicFrame::Close()
+sal_Bool BasicFrame::Close()
 {
     if( bInBreak || Basic().IsRunning() )
         if( RET_NO == QueryBox( this, SttResId( IDS_RUNNING ) ).Execute() )
-            return FALSE;
+            return sal_False;
 
     StarBASIC::Stop();
-    bInBreak = FALSE;
+    bInBreak = sal_False;
     if( CloseAll() )
     {
         aLineNum.Stop();
@@ -1004,33 +1004,33 @@ BOOL BasicFrame::Close()
         Application::SetDefDialogParent( NULL );
         WorkWindow::Close();
 
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
-BOOL BasicFrame::CloseAll()
+sal_Bool BasicFrame::CloseAll()
 {
     while ( !pList->empty() )
         if ( !pList->back()->Close() )
-            return FALSE;
-    return TRUE;
+            return sal_False;
+    return sal_True;
 }
 
-BOOL BasicFrame::CompileAll()
+sal_Bool BasicFrame::CompileAll()
 {
     AppWin* p;
     for ( size_t i = 0, n = pList->size(); i < n; ++i )
     {
         p = pList->at( i );
-        if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return FALSE;
+        if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 // Setup menu
 #define MENU2FILENAME( Name ) Name.Copy( Name.SearchAscii(" ") +1).EraseAllChars( '~' )
 #define LRUNr( nNr ) CByteString("LRU").Append( ByteString::CreateFromInt32( nNr ) )
-String FILENAME2MENU( USHORT nNr, String aName )
+String FILENAME2MENU( sal_uInt16 nNr, String aName )
 {
     String aRet;
     if ( nNr <= 9 )
@@ -1049,9 +1049,9 @@ void BasicFrame::AddToLRU(String const& aFile)
     PopupMenu *pPopup  = GetMenuBar()->GetPopupMenu(RID_APPFILE);
 
     aConfig.SetGroup("LRU");
-    USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+    sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
     DirEntry aFileEntry( aFile );
-    USHORT i,nLastMove = nMaxLRU;
+    sal_uInt16 i,nLastMove = nMaxLRU;
 
     for ( i = 1 ; i<nMaxLRU && nLastMove == nMaxLRU ; i++ )
     {
@@ -1083,15 +1083,15 @@ void BasicFrame::LoadLRU()
 {
     Config     aConfig(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
     PopupMenu *pPopup  = GetMenuBar()->GetPopupMenu(RID_APPFILE);
-    BOOL       bAddSep = TRUE;
+    sal_Bool       bAddSep = sal_True;
 
     aConfig.SetGroup("LRU");
-    USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+    sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
 
     if ( pPopup )
         bAddSep = pPopup->GetItemPos( IDM_FILE_LRU1 ) == MENU_ITEM_NOTFOUND;
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 1; i <= nMaxLRU && pPopup != NULL; i++)
     {
         String aFile = UniString( aConfig.ReadKey(LRUNr(i)), RTL_TEXTENCODING_UTF8 );
@@ -1101,7 +1101,7 @@ void BasicFrame::LoadLRU()
             if (bAddSep)
             {
                 pPopup->InsertSeparator();
-                bAddSep = FALSE;
+                bAddSep = sal_False;
             }
 
             if ( pPopup->GetItemPos( IDM_FILE_LRU1 + i-1 ) == MENU_ITEM_NOTFOUND )
@@ -1120,10 +1120,10 @@ void BasicFrame::LoadLRU()
 
 IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
 {
-    BOOL bNormal = BOOL( !bInBreak );
+    sal_Bool bNormal = sal_Bool( !bInBreak );
     pMenu->EnableItem( RID_RUNCOMPILE, bNormal );
 
-    BOOL bHasEdit = BOOL( pWork != NULL );
+    sal_Bool bHasEdit = sal_Bool( pWork != NULL );
 
     pMenu->EnableItem( RID_FILECLOSE,	bHasEdit );
     pMenu->EnableItem( RID_FILESAVE,	bHasEdit );
@@ -1133,16 +1133,16 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
     pMenu->EnableItem( RID_FILELOADLIB,	bNormal );
     pMenu->EnableItem( RID_FILESAVELIB,	bHasEdit );
 
-    BOOL bHasErr = BOOL( bNormal && pBasic->GetErrors() != 0 );
-    BOOL bNext   = bHasErr & bNormal;
-    BOOL bPrev   = bHasErr & bNormal;
+    sal_Bool bHasErr = sal_Bool( bNormal && pBasic->GetErrors() != 0 );
+    sal_Bool bNext   = bHasErr & bNormal;
+    sal_Bool bPrev   = bHasErr & bNormal;
     if( bHasErr )
     {
         size_t n = pBasic->GetCurrentError();
         if( n == 0 )
-            bPrev = FALSE;
+            bPrev = sal_False;
         if( SbError(n+1) == pBasic->GetErrors() )
-            bNext = FALSE;
+            bNext = sal_False;
     }
     pMenu->EnableItem( RID_RUNNEXTERR, bNext );
     pMenu->EnableItem( RID_RUNPREVERR, bPrev );
@@ -1150,14 +1150,14 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
     if( pWork )
         pWork->InitMenu( pMenu );
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
 {
     (void) pMenu; /* avoid warning about unused parameter */
 
-    SetAutoRun( FALSE );
+    SetAutoRun( sal_False );
     String aString;
     pStatus->Message( aString );
     return 0L;
@@ -1174,15 +1174,15 @@ IMPL_LINK_INLINE_END( BasicFrame, HighlightMenu, Menu *, pMenu )
 
 IMPL_LINK_INLINE_START( BasicFrame, MenuCommand, Menu *, pMenu )
 {
-    USHORT nId = pMenu->GetCurItemId();
-    BOOL bChecked = pMenu->IsItemChecked( nId );
+    sal_uInt16 nId = pMenu->GetCurItemId();
+    sal_Bool bChecked = pMenu->IsItemChecked( nId );
     return Command( nId, bChecked );
 }
 IMPL_LINK_INLINE_END( BasicFrame, MenuCommand, Menu *, pMenu )
 
 IMPL_LINK_INLINE_START( BasicFrame, Accel, Accelerator*, pAcc )
 {
-    SetAutoRun( FALSE );
+    SetAutoRun( sal_False );
     return Command( pAcc->GetCurItemId() );
 }
 IMPL_LINK_INLINE_END( BasicFrame, Accel, Accelerator*, pAcc )
@@ -1247,14 +1247,14 @@ AppBasEd* BasicFrame::CreateModuleWin( SbModule* pMod )
     return p;
 }
 
-BOOL BasicFrame::LoadFile( String aFilename )
+sal_Bool BasicFrame::LoadFile( String aFilename )
 {
-    BOOL bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
-    BOOL bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
+    sal_Bool bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
+    sal_Bool bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
     bIsBasic |= DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("INC") == COMPARE_EQUAL;
 
     AppWin* p;
-    BOOL bSuccess = TRUE;
+    sal_Bool bSuccess = sal_True;
     if ( bIsResult )
     {
         p = new AppError( this, aFilename );
@@ -1281,7 +1281,7 @@ BOOL BasicFrame::LoadFile( String aFilename )
 }
 
 // Execute command
-long BasicFrame::Command( short nID, BOOL bChecked )
+long BasicFrame::Command( short nID, sal_Bool bChecked )
 {
     BasicError* pErr;
 
@@ -1294,7 +1294,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
         case RID_FILEOPEN:
             {
                 String s;
-                if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) {
+                if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, sal_False ) ) {
                     AddToLRU( s );
                     LoadFile( s );
                 }
@@ -1333,7 +1333,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             {
                 SbModule *pModule = ((AppBasEd*)pWork)->GetModule();
 #if OSL_DEBUG_LEVEL > 1
-                USHORT x;
+                sal_uInt16 x;
                 x = pWork->GetLineNr();
                 x = ((AppBasEd*)pWork)->GetModule()->GetBPCount();
                 if ( !x )
@@ -1341,7 +1341,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                 x = pModule->GetBPCount();
 #endif
 
-                for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+                for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
                 {
                     SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
                     DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -1382,7 +1382,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 
                 if( bInBreak )
                     // Reset the flag
-                    bInBreak = FALSE;
+                    bInBreak = sal_False;
                 else
                 {
                     if( IsAutoSave() && !SaveAll() ) break;
@@ -1391,10 +1391,10 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                     pStatus->Message( aString );
                     if( p )
                     {
-                        BasicDLL::SetDebugMode( TRUE );
+                        BasicDLL::SetDebugMode( sal_True );
                         Basic().ClearGlobalVars();
                         p->Run();
-                        BasicDLL::SetDebugMode( FALSE );
+                        BasicDLL::SetDebugMode( sal_False );
                         // If cancelled during Interactive=FALSE
                     }
                 }}
@@ -1409,7 +1409,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             }
             break;
         case RID_RUNDISAS:
-            bDisas = BOOL( !bChecked );
+            bDisas = sal_Bool( !bChecked );
             break;
         case RID_RUNBREAK:
             if ( Basic().IsRunning() && !bInBreak )
@@ -1419,7 +1419,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             break;
         case RID_RUNSTOP:
             Basic().Stop();
-            bInBreak = FALSE;
+            bInBreak = sal_False;
             break;
         case RID_RUNNEXTERR:
             pErr = pBasic->NextError();
@@ -1560,23 +1560,23 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                     pWork->Command( CommandEvent( Point(), nID ) );
             }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL BasicFrame::SaveAll()
+sal_Bool BasicFrame::SaveAll()
 {
     AppWin* p, *q = pWork;
     for ( size_t i = 0, n = pList->size(); i < n ; i++ )
     {
         p = pList->at( i );
-        USHORT nRes = p->QuerySave( QUERY_DISK_CHANGED );
+        sal_uInt16 nRes = p->QuerySave( QUERY_DISK_CHANGED );
         if( (( nRes == SAVE_RES_ERROR ) && QueryBox(this,SttResId(IDS_ASKSAVEERROR)).Execute() == RET_NO )
             || ( nRes == SAVE_RES_CANCEL ) )
-            return FALSE;
+            return sal_False;
     }
     if ( q )
         q->ToTop();
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( BasicFrame, ModuleWinExists, String*, pFilename )
@@ -1620,7 +1620,7 @@ AppWin* BasicFrame::FindWin( const String& rName )
     return NULL;
 }
 
-AppWin* BasicFrame::FindWin( USHORT nWinId )
+AppWin* BasicFrame::FindWin( sal_uInt16 nWinId )
 {
     AppWin* p;
     for ( size_t i = 0, n = pList->size(); i < n ; i++ )
@@ -1649,10 +1649,10 @@ IMPL_LINK( BasicFrame, WriteString, String*, pString )
     if ( !pList->empty() )
     {
         pList->back()->pDataEdit->ReplaceSelected( *pString );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 class NewFileDialog : public FileDialog
@@ -1675,7 +1675,7 @@ void NewFileDialog::FilterSelect()
         return;	// User decides after he has changed the path
 
     String aCurFilter = GetCurFilter();
-    USHORT nFilterNr = 0;
+    sal_uInt16 nFilterNr = 0;
     while ( nFilterNr < GetFilterCount() && aCurFilter != GetFilterName( nFilterNr ) )
     {
         nFilterNr++;
@@ -1692,7 +1692,7 @@ void NewFileDialog::FilterSelect()
 
 short NewFileDialog::Execute()
 {
-    BOOL bRet = (BOOL)FileDialog::Execute();
+    sal_Bool bRet = (sal_Bool)FileDialog::Execute();
     if ( bRet )
     {
         Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -1705,8 +1705,8 @@ short NewFileDialog::Execute()
     return bRet;
 }
 
-BOOL BasicFrame::QueryFileName
-                (String& rName, FileType nFileType, BOOL bSave )
+sal_Bool BasicFrame::QueryFileName
+                (String& rName, FileType nFileType, sal_Bool bSave )
 {
     NewFileDialog aDlg( this, bSave ? WinBits( WB_SAVEAS ) :
                                 WinBits( WB_OPEN ) );
@@ -1752,13 +1752,13 @@ BOOL BasicFrame::QueryFileName
     if( aDlg.Execute() )
     {
         rName = aDlg.GetPath();
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
-USHORT BasicFrame::BreakHandler()
+sal_uInt16 BasicFrame::BreakHandler()
 {
-    bInBreak = TRUE;
+    bInBreak = sal_True;
     SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) );
 
     while( bInBreak ) {
@@ -1773,7 +1773,7 @@ USHORT BasicFrame::BreakHandler()
 void BasicFrame::LoadLibrary()
 {
     String s;
-    if( QueryFileName( s, FT_BASIC_LIBRARY, FALSE ) )
+    if( QueryFileName( s, FT_BASIC_LIBRARY, sal_False ) )
     {
         CloseAll();
         SvFileStream aStrm( s, STREAM_STD_READ );
@@ -1783,7 +1783,7 @@ void BasicFrame::LoadLibrary()
             pBasic = pNew;
             // Show all contents if existing
             SbxArray* pMods = pBasic->GetModules();
-            for( USHORT i = 0; i < pMods->Count(); i++ )
+            for( sal_uInt16 i = 0; i < pMods->Count(); i++ )
             {
                 SbModule* pMod = (SbModule*) pMods->Get( i );
                 AppWin* p = new AppBasEd( this, pMod );
@@ -1801,7 +1801,7 @@ void BasicFrame::LoadLibrary()
 void BasicFrame::SaveLibrary()
 {
     String s;
-    if( QueryFileName( s, FT_BASIC_LIBRARY, TRUE ) )
+    if( QueryFileName( s, FT_BASIC_LIBRARY, sal_True ) )
     {
         SvFileStream aStrm( s, STREAM_STD_WRITE );
         if( !Basic().Store( aStrm ) )
@@ -1815,8 +1815,8 @@ String BasicFrame::GenRealString( const String &aResString )
     String aType,aValue,aResult(aResString);
     String aString;
     xub_StrLen nInsertPos = 0;
-    BOOL bFound;
-    bFound = FALSE;
+    sal_Bool bFound;
+    bFound = sal_False;
 
     while ( (nStart = aResult.Search(StartKenn,nStartPos)) != STRING_NOTFOUND &&
             (nGleich = aResult.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND &&
@@ -1836,16 +1836,16 @@ String BasicFrame::GenRealString( const String &aResString )
                 aString.Erase();
             }
 
-            aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
+            aString = String( SttResId( (sal_uInt16)(aValue.ToInt32()) ) );
             nInsertPos = nStart;
             nStartPos = nStart;
             aResult.Erase( nStart, nEnd-nStart+1 );
-            bFound = TRUE;
+            bFound = sal_True;
         }
         else if ( aType.Search(BaseArgKenn) == 0 ) // Starts with BaseArgKenn
         {
             // TODO: What the hell is that for??
-            USHORT nArgNr = USHORT( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
+            sal_uInt16 nArgNr = sal_uInt16( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
             DBG_ASSERT( aString.Search( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")") ) != STRING_NOTFOUND, "Extra Argument given in String");
             aString.SearchAndReplace( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")"), aValue );
             nStartPos = nStart;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index f523b28821..0ea63ead07 100644..100755
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -62,7 +62,7 @@ public:
 
     void  LoadIniFile();
     void  SetFocus();
-    void  Wait( BOOL );
+    void  Wait( sal_Bool );
     DECL_LINK( LateInit, void * );
 
 #ifdef DBG_UTIL
@@ -71,7 +71,7 @@ public:
 };
 
 
-typedef USHORT FileType;
+typedef sal_uInt16 FileType;
 
 #define FT_NO_FILE              (FileType)0x00  // An error has occurred ...
 #define FT_BASIC_SOURCE	        (FileType)0x01
@@ -90,16 +90,16 @@ class BasicFrame : public WorkWindow, public SfxBroadcaster, public SfxListener
 using SystemWindow::Notify;
 using Window::Command;
 
-    virtual BOOL Close();
-    BOOL CloseAll();          // Close all windows
-    BOOL CompileAll();        // Compile all texts
+    virtual sal_Bool Close();
+    sal_Bool CloseAll();          // Close all windows
+    sal_Bool CompileAll();        // Compile all texts
     AutoTimer aLineNum;       // Show the line numbers
     virtual void Resize();
     virtual void Move();
     virtual void GetFocus();
     void LoadLibrary();
     void SaveLibrary();
-    BOOL bIsAutoRun;
+    sal_Bool bIsAutoRun;
     DisplayHidDlg* pDisplayHidDlg;
 
 //	BreakPoint *pRunToCursorBP;
@@ -109,8 +109,8 @@ using Window::Command;
 
 
     Timer aCheckFiles;		// Checks the files for changes
-    BOOL bAutoReload;
-    BOOL bAutoSave;
+    sal_Bool bAutoReload;
+    sal_Bool bAutoSave;
     DECL_LINK( CheckAllFiles, Timer* );
 
     MyBasicRef	pBasic;				// BASIC-Engine
@@ -126,16 +126,16 @@ using Window::Command;
     FloatingExecutionStatus *pExecutionStatus;
 
 public:
-    BOOL IsAutoRun();
-    void SetAutoRun( BOOL bAuto );
-    BOOL bInBreak;					// TRUE if in Break-Handler
+    sal_Bool IsAutoRun();
+    void SetAutoRun( sal_Bool bAuto );
+    sal_Bool bInBreak;					// sal_True if in Break-Handler
     StatusLine* pStatus;			// Status line
     EditList*	pList;				// List of edit windows
     AppWin* 	pWork;				// Current edit window
     BasicPrinter* pPrn;				// Printer
-    BOOL bDisas;					// TRUE: disassemble
-    USHORT nFlags;					// Debugging-Flags
-    USHORT nMaximizedWindows;		// Number of maximized windows
+    sal_Bool bDisas;					// sal_True: disassemble
+    sal_uInt16 nFlags;					// Debugging-Flags
+    sal_uInt16 nMaximizedWindows;		// Number of maximized windows
     void FocusWindow( AppWin *pWin );
     void WinMax_Restore();
     void WinShow_Hide();
@@ -157,25 +157,25 @@ public:
     MsgEdit* GetMsgTree( String aLogFileName );
     DECL_LINK( Log, TTLogMsg * );
     DECL_LINK( WinInfo, WinInfoRec * );
-    BOOL LoadFile( String aFilename );
-    long Command( short,BOOL=FALSE );  // Command handler
+    sal_Bool LoadFile( String aFilename );
+    long Command( short,sal_Bool=sal_False );  // Command handler
     virtual void Command( const CommandEvent& rCEvt );      // Command handler
-    BOOL SaveAll();					// Save all windows
-    BOOL QueryFileName( String& rName, FileType nFileType, BOOL bSave ); // Query for filename
+    sal_Bool SaveAll();					// Save all windows
+    sal_Bool QueryFileName( String& rName, FileType nFileType, sal_Bool bSave ); // Query for filename
     DECL_LINK( ModuleWinExists, String* );
     DECL_LINK( WriteString, String* );
     AppBasEd* CreateModuleWin( SbModule* pMod );
     AppBasEd* FindModuleWin( const String& );
     AppError* FindErrorWin( const String& );
     AppWin* FindWin( const String& );
-    AppWin* FindWin( USHORT nWinId );
+    AppWin* FindWin( sal_uInt16 nWinId );
     AppWin* IsWinValid( AppWin* pMaybeWin );
-    USHORT BreakHandler();			// Break-Handler-Callback
+    sal_uInt16 BreakHandler();			// Break-Handler-Callback
 
     void SetEditVar( SbxVariable *pVar ){ pEditVar = pVar;}
     SbxVariable* GetEditVar(){ return pEditVar;}
-    BOOL IsAutoReload() { return bAutoReload; }
-    BOOL IsAutoSave() { return bAutoSave; }
+    sal_Bool IsAutoReload() { return bAutoReload; }
+    sal_Bool IsAutoSave() { return bAutoSave; }
     void LoadIniFile();
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 66b92b5116..5b008673dd 100644..100755
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -56,10 +56,10 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p )
 
     pBreakpoints->Show();
 
-    ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( TRUE );
+    ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( sal_True );
     ((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetMaxTextLen( STRING_MAXLEN );
-    ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( TRUE );
-    ((TextEdit*)pDataEdit)->SaveAsUTF8( TRUE );
+    ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( sal_True );
+    ((TextEdit*)pDataEdit)->SaveAsUTF8( sal_True );
 
     String aEmpty;
 
@@ -101,7 +101,7 @@ void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
     const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
     if( p )
     {
-        ULONG nHintId = p->GetId();
+        sal_uIntPtr nHintId = p->GetId();
         if( nHintId == SBX_HINT_LANGUAGE_EXTENSION_LOADED )
         {
             ((TextEdit*)pDataEdit)->GetTextEditImp().InvalidateSyntaxHighlight();
@@ -117,8 +117,8 @@ FileType AppBasEd::GetFileType()
 IMPL_LINK_INLINE_START( AppBasEd, EditChange, void *, p )
 {
     (void) p; /* avoid warning about unused parameter */
-    bCompiled = FALSE;
-    return TRUE;
+    bCompiled = sal_False;
+    return sal_True;
 }
 IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
 
@@ -126,16 +126,16 @@ IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
 long AppBasEd::InitMenu( Menu* pMenu )
 {
     AppEdit::InitMenu (pMenu );
-    BOOL bRunning = pFrame->Basic().IsRunning();
+    sal_Bool bRunning = pFrame->Basic().IsRunning();
     pMenu->EnableItem( RID_RUNCOMPILE,	!bCompiled && !bRunning );
-    return TRUE;
+    return sal_True;
 }
 
 long AppBasEd::DeInitMenu( Menu* pMenu )
 {
     AppEdit::DeInitMenu (pMenu );
     pMenu->EnableItem( RID_RUNCOMPILE );
-    return TRUE;
+    return sal_True;
 }
 
 // Menu Handler
@@ -177,13 +177,13 @@ void AppBasEd::PostLoad()
     pMod->SetName( GetText() );
     pMod->Clear();
     pMod->SetSource( pDataEdit->GetText() );
-    bCompiled = FALSE;  // because the code might have changed in the meantime
+    bCompiled = sal_False;  // because the code might have changed in the meantime
     AppEdit::PostLoad();
 
     pBreakpoints->LoadBreakpoints( GetText() );
 }
 
-USHORT AppBasEd::ImplSave()
+sal_uInt16 AppBasEd::ImplSave()
 {
     pBreakpoints->SaveBreakpoints( GetText() );
     return AppEdit::ImplSave();
@@ -199,7 +199,7 @@ void AppBasEd::Reload()
 // Reload source code file after change
 void AppBasEd::LoadSource()
 {
-    BOOL bErr;
+    sal_Bool bErr;
 
     String aName = pMod->GetName();
     bErr = !pDataEdit->Load( aName );
@@ -208,7 +208,7 @@ void AppBasEd::LoadSource()
         ErrorBox( this, SttResId( IDS_READERROR ) ).Execute();
     else
         UpdateFileInfo( HAS_BEEN_LOADED );
-    bCompiled = FALSE;  // because the code might have changed in the meantime
+    bCompiled = sal_False;  // because the code might have changed in the meantime
 }
 
 // Save as (new name)
@@ -219,15 +219,15 @@ void AppBasEd::PostSaveAs()
 }
 
 // Compile
-BOOL AppBasEd::Compile()
+sal_Bool AppBasEd::Compile()
 {
     if( !pDataEdit->HasText() || bCompiled )
-        return TRUE;
+        return sal_True;
     pMod->SetSource( pDataEdit->GetText() );
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if( pFrame->Basic().Compile( pMod ) )
     {
-        bRes = TRUE;
+        bRes = sal_True;
         if( pFrame->bDisas )
             Disassemble();
         TextSelection aSel( pDataEdit->GetSelection() );
@@ -257,7 +257,7 @@ void AppBasEd::Run()
 {
     pFrame->Basic().Reset();
     SbxArray* pAllModules = pFrame->Basic().GetModules();
-    for (USHORT i = 0; i < pAllModules->Count(); i++)
+    for (sal_uInt16 i = 0; i < pAllModules->Count(); i++)
     {
         if ( (pAllModules->Get(i)->GetName()).Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL )
         {
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index 2baf8326c9..9684eabb60 100644..100755
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -40,12 +40,12 @@ class AppBasEd : public AppEdit	 {	// Editor-Window:
 using DockingWindow::Notify;
 
     SbModuleRef pMod;	   			// compile module
-    BOOL bCompiled;					// TRUE if compiled
+    sal_Bool bCompiled;					// sal_True if compiled
 protected:
     DECL_LINK( EditChange, void * );
 #define BREAKPOINTSWIDTH 15
     BreakpointWindow *pBreakpoints;
-    virtual USHORT ImplSave();				// Save file
+    virtual sal_uInt16 ImplSave();				// Save file
 
 public:
     TYPEINFO();
@@ -61,7 +61,7 @@ public:
     virtual void PostSaveAs();       // Postprocess of module...
     void Reload();
     void LoadSource();               // Load source for object
-    BOOL Compile();                  // Compile text
+    sal_Bool Compile();                  // Compile text
     void Run();                      // Run image
     void Disassemble();              // Disassemble image
     const String& GetModName() const { return pMod->GetName(); }
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index 43677543b4..fbaea06499 100644..100755
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -79,8 +79,8 @@ AppEdit::~AppEdit()
 void AppEdit::LoadIniFile()
 {
     TextView *pTextView = ((TextEdit*)pDataEdit)->aEdit.pTextView;
-    BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
-    pTextView->GetTextEngine()->SetModified( FALSE );
+    sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+    pTextView->GetTextEngine()->SetModified( sal_False );
 
     FontList aFontList( pFrame );   // Just some Window is needed
     Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -89,7 +89,7 @@ void AppEdit::LoadIniFile()
     String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
     String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
     Font aFont = aFontList.Get( aFontName, aFontStyle );
-    ULONG nFontSize = aFontSize.ToInt32();
+    sal_uIntPtr nFontSize = aFontSize.ToInt32();
     aFont.SetHeight( nFontSize );
 
 #if OSL_DEBUG_LEVEL > 1
@@ -97,7 +97,7 @@ void AppEdit::LoadIniFile()
         Font aFont2( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguage(), 0, pFrame ));
     }
 #endif
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
     pDataEdit->SetFont( aFont );
 
     if ( ((TextEdit*)pDataEdit)->GetBreakpointWindow() )
@@ -176,7 +176,7 @@ void AppEdit::SetScrollBarRanges()
 
 
 
-USHORT AppEdit::GetLineNr()
+sal_uInt16 AppEdit::GetLineNr()
 {
   return pDataEdit->GetLineNr();
 }
@@ -193,14 +193,14 @@ long AppEdit::InitMenu( Menu* pMenu )
     
     if( pDataEdit )
     {
-        USHORT UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
-        USHORT RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
+        size_t UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
+        size_t RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
     
         pMenu->EnableItem( RID_EDITUNDO,	UndoCount > 0 );
         pMenu->EnableItem( RID_EDITREDO, 	RedoCount > 0 );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 long AppEdit::DeInitMenu( Menu* pMenu )
@@ -210,7 +210,7 @@ long AppEdit::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITUNDO );
     pMenu->EnableItem( RID_EDITREDO );
 
-    return TRUE;
+    return sal_True;
 }
 
 void AppEdit::Resize()
@@ -225,7 +225,7 @@ void AppEdit::Resize()
     if ( pHScroll )
     {
         rHSize = pHScroll->GetSizePixel();
-        ULONG nHieght = rHSize.Height();
+        sal_uIntPtr nHieght = rHSize.Height();
         rNewSize.Height() -= nHieght;
         rHStart.Y() = rNewSize.Height();
     }
@@ -233,7 +233,7 @@ void AppEdit::Resize()
     if ( pVScroll )
     {
         rVSize = pVScroll->GetSizePixel();
-        ULONG nWidth = rVSize.Width();
+        sal_uIntPtr nWidth = rVSize.Width();
         rNewSize.Width() -= nWidth;
         rVStart.X() = rNewSize.Width();
     }
@@ -284,7 +284,7 @@ void AppEdit::PostSaveAs()
 {
 }
 
-void AppEdit::Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 )
+void AppEdit::Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
 {
     ((TextEdit*)pDataEdit)->Highlight( nLine, nCol1, nCol2 );
     ToTop();
diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 5b1a548b40..6dd14f0b44 100644..100755
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -43,7 +43,7 @@ public:
     ScrollBar *pVScroll;
     ScrollBar *pHScroll;
     void SetScrollBarRanges();
-    ULONG nCurTextWidth;
+    sal_uIntPtr nCurTextWidth;
 private:
     void InitScrollBars();
 protected:
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
     AppEdit( BasicFrame* );
     ~AppEdit();
-    USHORT GetLineNr();                                 // Current line number
+    sal_uInt16 GetLineNr();                                 // Current line number
     FileType GetFileType();                             // Returns the file type
     virtual long InitMenu( Menu* );                     // Inits the menu
     virtual long DeInitMenu( Menu* );                   // Reset to enable all Shortcuts
@@ -61,8 +61,8 @@ public:
     void PostLoad();
     void PostSaveAs();
     void Mark( short, short, short );                   // Select text
-    void Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 );
-    virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+    void Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 );
+    virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
     virtual void LoadIniFile();		// (re)load ini file after change
 };
 
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index 512a5ac406..bb4eab5e7a 100644..100755
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -64,10 +64,10 @@ long AppError::InitMenu( Menu* pMenu )
 {
     AppWin::InitMenu (pMenu );
     
-    pMenu->EnableItem( RID_EDITUNDO,	FALSE );
-    pMenu->EnableItem( RID_EDITREDO, 	FALSE );
+    pMenu->EnableItem( RID_EDITUNDO,	sal_False );
+    pMenu->EnableItem( RID_EDITREDO, 	sal_False );
     
-    return TRUE;
+    return sal_True;
 }
 
 long AppError::DeInitMenu( Menu* pMenu )
@@ -77,10 +77,10 @@ long AppError::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITUNDO );
     pMenu->EnableItem( RID_EDITREDO );
     
-    return TRUE;
+    return sal_True;
 }
 
-USHORT AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
+sal_uInt16 AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
 
 FileType AppError::GetFileType()
 {
@@ -102,12 +102,12 @@ void AppError::LoadIniFile()
     String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
     String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
     Font aFont = aFontList.Get( aFontName, aFontStyle );
-//    ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
-    ULONG nFontSize = aFontSize.ToInt32();
+//    sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+    sal_uIntPtr nFontSize = aFontSize.ToInt32();
 //    aFont.SetSize( Size( nFontSize, nFontSize ) );
     aFont.SetHeight( nFontSize );
 
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 //    aFont.SetAlign( ALIGN_BOTTOM );
 //    aFont.SetHeight( aFont.GetHeight()+2 );
     pDataEdit->SetFont( aFont );
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index 6e0bdbc7fd..93bf611fd3 100644..100755
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -40,10 +40,10 @@ public:
 //	long Command( short nID );
     virtual long InitMenu( Menu* );
     virtual long DeInitMenu( Menu* );
-    USHORT GetLineNr();
+    sal_uInt16 GetLineNr();
     FileType GetFileType();
     MsgEdit* GetMsgTree()			{ return ((MsgEdit*)pDataEdit);	}
-    virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+    virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
     virtual void LoadIniFile();		// (re)load ini file after change
     DirEntry aBaseDir;
 };
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index b47d7fb8bf..01002c7452 100644..100755
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -51,10 +51,10 @@ TYPEINIT0(AppWin);
 AppWin::AppWin( BasicFrame* pParent )
 : DockingWindow( pParent, WB_SIZEMOVE | WB_CLOSEABLE | WB_PINABLE )
 , nSkipReload(0)
-, bHasFile( FALSE )
-, bReloadAborted( FALSE )
+, bHasFile( sal_False )
+, bReloadAborted( sal_False )
 , pFrame( pParent )
-, bFind( TRUE )
+, bFind( sal_True )
 , pDataEdit(NULL)
 {
     // Load the Untitled string if not yet loaded
@@ -63,7 +63,7 @@ AppWin::AppWin( BasicFrame* pParent )
     nCount++;
 
     // Get maximized state from current window
-    USHORT nInitialWinState;
+    sal_uInt16 nInitialWinState;
     if ( pFrame->pWork )
     {
         nInitialWinState = pFrame->pWork->GetWinState();
@@ -97,7 +97,7 @@ void AppWin::SetText( const XubString& rStr )
     pFrame->WindowRenamed( this );
 }
 
-void AppWin::TitleButtonClick( USHORT nButton )
+void AppWin::TitleButtonClick( sal_uInt16 nButton )
 {
     if ( TITLE_BUTTON_DOCKING == nButton )
         if ( TT_WIN_STATE_MAX != nWinState )
@@ -105,7 +105,7 @@ void AppWin::TitleButtonClick( USHORT nButton )
         else
             Restore();
     else // if ( TITLE_BUTTON_HIDE == nButton )
-        Minimize( TRUE );
+        Minimize( sal_True );
 }
 
 void AppWin::Maximize()
@@ -115,7 +115,7 @@ void AppWin::Maximize()
         nNormalPos = GetPosPixel();
         nNormalSize = GetSizePixel();
 
-        SetFloatingMode( FALSE );
+        SetFloatingMode( sal_False );
 
         pFrame->nMaximizedWindows++;
         nWinState = TT_WIN_STATE_MAX;
@@ -137,7 +137,7 @@ void AppWin::Maximize()
 
 void AppWin::Restore()
 {
-    SetFloatingMode( TRUE );
+    SetFloatingMode( sal_True );
     SetPosSizePixel( nNormalPos, nNormalSize );
 
     if ( TT_WIN_STATE_MAX == nWinState )
@@ -147,7 +147,7 @@ void AppWin::Restore()
     pFrame->WinMax_Restore();
 }
 
-void AppWin::Minimize( BOOL bMinimize )
+void AppWin::Minimize( sal_Bool bMinimize )
 {
     if ( bMinimize )
         nWinState |= TT_WIN_STATE_HIDE;
@@ -156,7 +156,7 @@ void AppWin::Minimize( BOOL bMinimize )
     pFrame->WinMax_Restore();
 }
 
-void AppWin::Cascade( USHORT nNr )
+void AppWin::Cascade( sal_uInt16 nNr )
 {
     Restore();
 
@@ -228,7 +228,7 @@ long AppWin::PreNotify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         if ( pFrame->pList->back() != this )
             Activate();
-    return FALSE;		// Der event soll weiter verarbeitet werden
+    return sal_False;		// Der event soll weiter verarbeitet werden
 }
 
 void AppWin::Activate()
@@ -241,14 +241,14 @@ long AppWin::InitMenu( Menu* pMenu )
 {
 
     ::rtl::OUString aTemp;
-    BOOL bMarked;
+    sal_Bool bMarked;
     if( pDataEdit )
     {
         TextSelection r = pDataEdit->GetSelection();
         bMarked = r.HasRange();
     }
     else
-        bMarked = FALSE;
+        bMarked = sal_False;
     pMenu->EnableItem( RID_EDITREPEAT,	(aFind.Len() != 0 ) );
     pMenu->EnableItem( RID_EDITCUT, 	bMarked );
     pMenu->EnableItem( RID_EDITCOPY,	bMarked );
@@ -256,20 +256,20 @@ long AppWin::InitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_EDITDEL, 	bMarked );
 //	pMenu->EnableItem( RID_HELPTOPIC,	bMarked );
 
-    BOOL bHasText;
+    sal_Bool bHasText;
     if( pDataEdit )
         bHasText = pDataEdit->HasText();
     else
-        bHasText = FALSE;
-    BOOL bRunning = pFrame->Basic().IsRunning();
-    BOOL bCanExecute = BOOL( (!bRunning && bHasText) || pFrame->bInBreak );
+        bHasText = sal_False;
+    sal_Bool bRunning = pFrame->Basic().IsRunning();
+    sal_Bool bCanExecute = sal_Bool( (!bRunning && bHasText) || pFrame->bInBreak );
     pMenu->EnableItem( RID_RUNSTART,	bCanExecute );
     pMenu->EnableItem( RID_RUNBREAK, 	bRunning && !pFrame->bInBreak);
     pMenu->EnableItem( RID_RUNSTOP, 	bRunning );
     pMenu->EnableItem( RID_RUNTOCURSOR, bCanExecute );
     pMenu->EnableItem( RID_RUNSTEPINTO, bCanExecute );
     pMenu->EnableItem( RID_RUNSTEPOVER, bCanExecute );
-    return TRUE;
+    return sal_True;
 }
 
 long AppWin::DeInitMenu( Menu* pMenu )
@@ -286,7 +286,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
     pMenu->EnableItem( RID_RUNTOCURSOR );
     pMenu->EnableItem( RID_RUNSTEPINTO );
     pMenu->EnableItem( RID_RUNSTEPOVER );
-    return TRUE;
+    return sal_True;
 }
 
 // Menu Handler
@@ -294,7 +294,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
 void AppWin::Command( const CommandEvent& rCEvt )
 {
     TextSelection r  = pDataEdit->GetSelection();
-    BOOL bHasMark = r.HasRange();
+    sal_Bool bHasMark = r.HasRange();
     switch( rCEvt.GetCommand() ) {
         case RID_FILESAVE:
             QuerySave( QUERY_DISK_CHANGED | SAVE_NOT_DIRTY ); break;
@@ -336,7 +336,7 @@ void AppWin::Command( const CommandEvent& rCEvt )
                 pDataEdit->BuildKontextMenu( pKontext );
                 if ( pKontext )
                 {
-                    USHORT nRes = pKontext->Execute( this, GetPointerPosPixel() );
+                    sal_uInt16 nRes = pKontext->Execute( this, GetPointerPosPixel() );
                     if ( nRes )
                         pFrame->Command( nRes );
                     delete pKontext;
@@ -347,12 +347,12 @@ void AppWin::Command( const CommandEvent& rCEvt )
 }
 
 
-BOOL AppWin::IsSkipReload()
+sal_Bool AppWin::IsSkipReload()
 {
     return nSkipReload != 0;
 }
 
-void AppWin::SkipReload( BOOL bSkip )
+void AppWin::SkipReload( sal_Bool bSkip )
 {
     DBG_ASSERT( bSkip || nSkipReload, "SkipReload aufgehoben ohne es zu aktivieren");
     if ( bSkip )
@@ -361,17 +361,17 @@ void AppWin::SkipReload( BOOL bSkip )
         nSkipReload--;
 }
 
-BOOL AppWin::DiskFileChanged( USHORT nWhat )
+sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
 {
     if ( !bHasFile )
-        return FALSE;
+        return sal_False;
 
     switch ( nWhat )
     {
         case SINCE_LAST_LOAD:
             {
                 if ( bReloadAborted )
-                    return TRUE;
+                    return sal_True;
                 else
                     return DiskFileChanged( SINCE_LAST_ASK_RELOAD );
             }
@@ -392,16 +392,16 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
         default:
             OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
     }
-    return TRUE;
+    return sal_True;
 }
 
-void AppWin::UpdateFileInfo( USHORT nWhat )
+void AppWin::UpdateFileInfo( sal_uInt16 nWhat )
 {
     switch ( nWhat )
     {
         case HAS_BEEN_LOADED:
             {
-                bReloadAborted = FALSE;
+                bReloadAborted = sal_False;
                 UpdateFileInfo( ASKED_RELOAD );
 
             }
@@ -446,7 +446,7 @@ void AppWin::CheckReload()
         }
         else
         {
-            bReloadAborted = TRUE;
+            bReloadAborted = sal_True;
         }
     }
 }
@@ -457,14 +457,14 @@ void AppWin::Reload()
     TextSelection aSelMemo = pDataEdit->GetSelection();
     Load( GetText() );
     pDataEdit->SetSelection( aSelMemo );
-    SkipReload( FALSE );
+    SkipReload( sal_False );
 }
 
 // Load file
-BOOL AppWin::Load( const String& aName )
+sal_Bool AppWin::Load( const String& aName )
 {
     SkipReload();
-    BOOL bErr;
+    sal_Bool bErr;
 
 //	if( !QuerySave() )
 //		return;
@@ -493,17 +493,17 @@ BOOL AppWin::Load( const String& aName )
         SetText( aModName );
         UpdateFileInfo( HAS_BEEN_LOADED );
         PostLoad();
-        bHasFile = TRUE;
+        bHasFile = sal_True;
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return !bErr;
 }
 
 // Save file
-USHORT AppWin::ImplSave()
+sal_uInt16 AppWin::ImplSave()
 {
     SkipReload();
-    USHORT nResult = SAVE_RES_NOT_SAVED;
+    sal_uInt16 nResult = SAVE_RES_NOT_SAVED;
     String s1 = *pNoName;
     String s2 = GetText().Copy( 0, s1.Len() );
     if( s1 == s2 )
@@ -513,7 +513,7 @@ USHORT AppWin::ImplSave()
         if ( pDataEdit->Save( aName ) )
         {
             nResult = SAVE_RES_SAVED;
-            bHasFile = TRUE;
+            bHasFile = sal_True;
         }
         else
         {
@@ -522,38 +522,38 @@ USHORT AppWin::ImplSave()
         }
         UpdateFileInfo( HAS_BEEN_LOADED );
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return nResult;
 }
 
 // Save to new file name
-USHORT AppWin::SaveAs()
+sal_uInt16 AppWin::SaveAs()
 {
     SkipReload();
     String s1 = *pNoName;
     String s2 = GetText().Copy( 0, s1.Len() );
     if( s1 == s2 ) s2.Erase();
     else s2 = GetText();
-    if( pFrame->QueryFileName( s2, GetFileType(), TRUE ) )
+    if( pFrame->QueryFileName( s2, GetFileType(), sal_True ) )
     {
         SetText( s2 );
         PostSaveAs();
-        SkipReload( FALSE );
+        SkipReload( sal_False );
         return ImplSave();
     }
     else
     {
-        SkipReload( FALSE );
+        SkipReload( sal_False );
         return SAVE_RES_CANCEL;
     }
 }
 
 // Should we save the file?
-USHORT AppWin::QuerySave( QueryBits nBits )
+sal_uInt16 AppWin::QuerySave( QueryBits nBits )
 {
-    BOOL bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
-    BOOL bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
-    BOOL bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
+    sal_Bool bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
+    sal_Bool bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
+    sal_Bool bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
 
     SkipReload();
     short nResult;
@@ -562,8 +562,8 @@ USHORT AppWin::QuerySave( QueryBits nBits )
     else
         nResult = RET_NO;
 
-    BOOL bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
-    pFrame->AlwaysEnableInput( FALSE );
+    sal_Bool bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
+    pFrame->AlwaysEnableInput( sal_False );
     if( ( ( IsModified() || bSaveNotDirty ) && bQueryDirty ) || ( DiskFileChanged( SINCE_LAST_LOAD ) && bQueryDiskChanged ) )
     {
         ToTop();
@@ -577,7 +577,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
     }
     pFrame->AlwaysEnableInput( bAlwaysEnableInput );
 
-    USHORT nReturn;
+    sal_uInt16 nReturn;
     switch( nResult )
     {
         case RET_YES:
@@ -593,11 +593,11 @@ USHORT AppWin::QuerySave( QueryBits nBits )
             OSL_FAIL("switch default where no default should be: Internal error");
             nReturn = SAVE_RES_CANCEL;
     }
-    SkipReload( FALSE );
+    SkipReload( sal_False );
     return nReturn;
 }
 
-BOOL AppWin::Close()
+sal_Bool AppWin::Close()
 {
     switch ( QuerySave( QUERY_DIRTY ) )
     {
@@ -606,21 +606,21 @@ BOOL AppWin::Close()
         {
             DockingWindow::Close();
             delete this;
-            return TRUE;
+            return sal_True;
         }
 // uncomment to avoid compiler warning
 //	break;
     case SAVE_RES_ERROR:
-        return FALSE;
+        return sal_False;
 // uncomment to avoid compiler warning
 //		break;
     case SAVE_RES_CANCEL:
-        return FALSE;
+        return sal_False;
 // uncomment to avoid compiler warning
 //		break;
     default:
         OSL_FAIL("Not Implemented in AppWin::Close");
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -630,7 +630,7 @@ void AppWin::Find()
     SttResId aResId( IDD_FIND_DIALOG );
     FindDialog aDlg( this, aResId, aFind );
     if( aDlg.Execute() ) {
-        bFind = TRUE;
+        bFind = sal_True;
         Repeat();
     }
 }
@@ -642,7 +642,7 @@ void AppWin::Replace()
     ReplaceDialog* pDlg = new ReplaceDialog
                         (this, aResId, aFind, aReplace );
     if( pDlg->Execute() ) {
-        bFind = FALSE;
+        bFind = sal_False;
         Repeat();
     }
 }
@@ -650,7 +650,7 @@ void AppWin::Replace()
 // Repeat search/replace operation
 void AppWin::Repeat()
 {
-    if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && FALSE) ) && !bFind )
+    if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && sal_False) ) && !bFind )
       pDataEdit->ReplaceSelected( aReplace );
 }
 
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index efd2dd859a..57dc9f0e4d 100644..100755
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -36,16 +36,16 @@
 #include "dataedit.hxx"
 
 #include <vector>
+typedef sal_uInt16 QueryBits;
 
-typedef USHORT QueryBits;
 #define QUERY_NONE				( QueryBits ( 0x00 ) )
 #define QUERY_DIRTY				( QueryBits ( 0x01 ) )
 #define QUERY_DISK_CHANGED		( QueryBits ( 0x02 ) )
 #define QUERY_ALL				( QUERY_DIRTY | QUERY_DISK_CHANGED )
 #define SAVE_NOT_DIRTY			( QueryBits ( 0x04 ) )
 
-#define SAVE_RES_SAVED			TRUE
-#define SAVE_RES_NOT_SAVED		FALSE
+#define SAVE_RES_SAVED			sal_True
+#define SAVE_RES_NOT_SAVED		sal_False
 #define SAVE_RES_ERROR			3
 #define SAVE_RES_CANCEL			4
 
@@ -71,67 +71,67 @@ protected:
     static short nCount;			// number of edit windows
     static String *pNoName;			// "Untitled"
     FileStat aLastAccess;			// Last access time of loaded file
-    USHORT nSkipReload;				// Sometimes there must not be a reload
-    BOOL bHasFile;					// Otherwise reload does not make sense
-    BOOL bReloadAborted;			// Is set if reload was cancelled so that we can ask again wehn closing
+    sal_uInt16 nSkipReload;				// Sometimes there must not be a reload
+    sal_Bool bHasFile;					// Otherwise reload does not make sense
+    sal_Bool bReloadAborted;			// Is set if reload was cancelled so that we can ask again wehn closing
 
     short nId;						// ID-Nummer( "Unnamed n" )
     BasicFrame* pFrame;				// Parent-Window
     String aFind;					// Search string
     String aReplace;				// Replace string
-    BOOL bFind;						// TRUE if search not replace
+    sal_Bool bFind;						// sal_True if search not replace
     void RequestHelp( const HelpEvent& );           // Help handler
     void GetFocus();				// activate
-    virtual USHORT ImplSave();		// Save file
-    USHORT nWinState;				// Maximized, Iconized or Normal
+    virtual sal_uInt16 ImplSave();		// Save file
+    sal_uInt16 nWinState;				// Maximized, Iconized or Normal
     Point nNormalPos;				// Position if normal
     Size nNormalSize;				// Size if Normal
     virtual long	PreNotify( NotifyEvent& rNEvt );
-    USHORT nWinId;
+    sal_uInt16 nWinId;
 
 public:
     TYPEINFO();
     AppWin( BasicFrame* );
     ~AppWin();
     DataEdit* pDataEdit;				// Data area
-    virtual USHORT GetLineNr()=0;		// Current line number
+    virtual sal_uInt16 GetLineNr()=0;		// Current line number
     virtual long InitMenu( Menu* );		// Init of the menu
     virtual long DeInitMenu( Menu* );	// reset to enable all shortcuts
     virtual void Command( const CommandEvent& rCEvt );	// Command handler
     virtual void Resize();
     virtual void Help();
-    virtual BOOL Load( const String& );	// Load file
+    virtual sal_Bool Load( const String& );	// Load file
     virtual void PostLoad(){}               // Set source at module
-    virtual USHORT SaveAs();                // Save file as
+    virtual sal_uInt16 SaveAs();                // Save file as
     virtual void PostSaveAs(){}
     virtual void Find();                    // find text
     virtual void Replace();                 // replace text
     virtual void Repeat();                  // repeat find/replace
-    virtual BOOL Close();                   // close window
+    virtual sal_Bool Close();                   // close window
     virtual void Activate();                // window was activated
     virtual FileType GetFileType()=0;	// returns the filetype
-    virtual BOOL ReloadAllowed(){ return TRUE; }
+    virtual sal_Bool ReloadAllowed(){ return sal_True; }
     virtual void Reload();                  // Reload after change on disk
     virtual void LoadIniFile(){;}		// (re)load ini file after change
     void CheckReload();                     // Checks and asks if reload should performed
-    BOOL DiskFileChanged( USHORT nWhat );	// Checks file for changes
-    void UpdateFileInfo( USHORT nWhat );	// Remembers last file state
-    BOOL IsSkipReload();                    // Should we test reload?
-    void SkipReload( BOOL bSkip = TRUE );
-    USHORT GetWinState(){ return nWinState; }
+    sal_Bool DiskFileChanged( sal_uInt16 nWhat );	// Checks file for changes
+    void UpdateFileInfo( sal_uInt16 nWhat );	// Remembers last file state
+    sal_Bool IsSkipReload();                    // Should we test reload?
+    void SkipReload( sal_Bool bSkip = sal_True );
+    sal_uInt16 GetWinState(){ return nWinState; }
     void Maximize();
     void Restore();
-    void Minimize( BOOL bMinimize );
-    void Cascade( USHORT nNr );
+    void Minimize( sal_Bool bMinimize );
+    void Cascade( sal_uInt16 nNr );
 
-    USHORT QuerySave( QueryBits nBits = QUERY_ALL );
-    BOOL IsModified()				{ return pDataEdit->IsModified(); }
+    sal_uInt16 QuerySave( QueryBits nBits = QUERY_ALL );
+    sal_Bool IsModified()				{ return pDataEdit->IsModified(); }
     BasicFrame* GetBasicFrame() { return pFrame; }
-    virtual void	TitleButtonClick( USHORT nButton );
+    virtual void	TitleButtonClick( sal_uInt16 nButton );
     virtual void	SetText( const XubString& rStr );
 
-    USHORT GetWinId() { return nWinId; }
-    void SetWinId( USHORT nWId ) { nWinId = nWId; }
+    sal_uInt16 GetWinId() { return nWinId; }
+    void SetWinId( sal_uInt16 nWId ) { nWinId = nWId; }
 };
 
 typedef ::std::vector< AppWin* > EditList;
diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc
index 634d86f30e..634d86f30e 100644..100755
--- a/basic/source/app/basic.hrc
+++ b/basic/source/app/basic.hrc
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index 4283e9981a..073f8cc7be 100644..100755
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -29,6 +29,7 @@
 #include "resids.hrc"
 
 ModalDialog RID_CALLDLG {
+    HelpID = "basic:ModalDialog:RID_CALLDLG";
   PosSize = MAP_SYSFONT (18,18,142,142);
   SVLook = TRUE;
   MOVEABLE = TRUE;
@@ -43,11 +44,13 @@ ModalDialog RID_CALLDLG {
     PosSize = MAP_SYSFONT (10,70,120,8);
   };
   Edit RID_RETVAL {
+      HelpID = "basic:Edit:RID_CALLDLG:RID_RETVAL";
     PosSize = MAP_SYSFONT (10,85,120,12);
     Border = TRUE;
     TabStop = TRUE;
   };
   ListBox RID_PARAMS {
+      HelpID = "basic:ListBox:RID_CALLDLG:RID_PARAMS";
     PosSize = MAP_SYSFONT (10,25,120,40);
     TabStop = TRUE;
     Border = TRUE;
@@ -61,6 +64,7 @@ ModalDialog RID_CALLDLG {
 };
 
 ModalDialog IDD_ABOUT_DIALOG {
+    HelpID = "basic:ModalDialog:IDD_ABOUT_DIALOG";
     Pos = MAP_APPFONT( 58, 17 );
     Size = MAP_APPFONT( 155, 106 );
     SVLook = TRUE;
@@ -107,6 +111,7 @@ ModalDialog IDD_ABOUT_DIALOG {
 };
 
 ModalDialog IDD_TT_ABOUT_DIALOG {
+    HelpID = "basic:ModalDialog:IDD_TT_ABOUT_DIALOG";
     Pos = MAP_APPFONT( 58, 17 );
     Size = MAP_APPFONT( 120, 81 );
     SVLook = TRUE;
@@ -138,6 +143,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
 };
 
 ModalDialog IDD_FIND_DIALOG {
+    HelpID = "basic:ModalDialog:IDD_FIND_DIALOG";
     Pos = MAP_APPFONT( 69, 30 );
     Size = MAP_APPFONT( 185, 70 );
     SVLook = TRUE;
@@ -150,6 +156,7 @@ ModalDialog IDD_FIND_DIALOG {
         TEXT[ en-US ] = "~Text";
     };
     Edit RID_FIND {
+        HelpID = "basic:Edit:IDD_FIND_DIALOG:RID_FIND";
             BORDER = TRUE;
             Pos = MAP_APPFONT( 40, 8 );
             Size = MAP_APPFONT( 135, 12 );
@@ -172,6 +179,7 @@ ModalDialog IDD_FIND_DIALOG {
 };
 
 ModalDialog IDD_REPLACE_DIALOG {
+    HelpID = "basic:ModalDialog:IDD_REPLACE_DIALOG";
     Pos = MAP_APPFONT( 69, 30 );
     Size = MAP_APPFONT( 185, 88 );
     SVLook = TRUE;
@@ -188,12 +196,14 @@ ModalDialog IDD_REPLACE_DIALOG {
         TEXT[ en-US ] = "~Replace by";
     };
     Edit RID_FIND {
+        HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_FIND";
             BORDER = TRUE;
             Pos = MAP_APPFONT( 65, 8 );
             Size = MAP_APPFONT( 110, 12 );
             TABSTOP = TRUE;
         };
     Edit RID_REPLACE {
+        HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_REPLACE";
             BORDER = TRUE;
             Pos = MAP_APPFONT( 65, 28 );
             Size = MAP_APPFONT( 110, 12 );
@@ -718,6 +728,7 @@ Menu RID_HELP {
     };
 };
 ModelessDialog IDD_PRINT_DIALOG {
+    HelpID = "basic:ModelessDialog:IDD_PRINT_DIALOG";
     Pos = MAP_APPFONT( 83, 42 );
     Size = MAP_APPFONT( 171, 94 );
     MOVEABLE = TRUE;
@@ -784,6 +795,7 @@ TabDialog IDD_OPTIONS_DLG
 
 
 TabPage RID_TP_GENERIC {
+    HelpID = "basic:TabPage:RID_TP_GENERIC";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 244, 100 );
@@ -793,6 +805,7 @@ TabPage RID_TP_GENERIC {
             Text[ en-US ] = "Area";
     };
     ComboBox RID_CB_AREA {
+        HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_AREA";
             HScroll              = TRUE;
             VScroll              = TRUE;
             AutoHScroll          = TRUE;
@@ -803,12 +816,14 @@ TabPage RID_TP_GENERIC {
             DropDown = TRUE;
         };
     PushButton RID_PB_NEW_AREA {
+        HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_AREA";
             Pos = MAP_APPFONT( 144, 12 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
             Text[ en-US ] = "New";
     };
     PushButton RID_PD_DEL_AREA {
+        HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PD_DEL_AREA";
             Pos = MAP_APPFONT( 188, 12 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -820,6 +835,7 @@ TabPage RID_TP_GENERIC {
             Text[ en-US ] = "Setting";
     };
     ComboBox RID_CB_VALUE {
+        HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_VALUE";
             HScroll              = TRUE;
             VScroll              = TRUE;
             AutoHScroll          = TRUE;
@@ -829,6 +845,7 @@ TabPage RID_TP_GENERIC {
             TabStop = TRUE;
     };
     PushButton RID_PB_SELECT_FILE {
+        HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_SELECT_FILE";
             Pos = MAP_APPFONT( 188, 48 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -837,12 +854,14 @@ TabPage RID_TP_GENERIC {
             Hide = TRUE;
     };
     PushButton RID_PB_NEW_VALUE {
+        HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_VALUE";
             Pos = MAP_APPFONT( 188, 48 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
             Text[ en-US ] = "New";
     };
     PushButton RID_PB_DEL_VALUE {
+        HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_DEL_VALUE";
             Pos = MAP_APPFONT( 188, 64 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -852,6 +871,7 @@ TabPage RID_TP_GENERIC {
 
 
 TabPage RID_TP_PROFILE {
+    HelpID = "basic:TabPage:RID_TP_PROFILE";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 244, 100 );
@@ -861,6 +881,7 @@ TabPage RID_TP_PROFILE {
             Text[ en-US ] = "Profile";
     };
     ComboBox RID_CB_PROFILE {
+        HelpID = "basic:ComboBox:RID_TP_PROFILE:RID_CB_PROFILE";
             HScroll              = TRUE;
             VScroll              = TRUE;
             AutoHScroll          = TRUE;
@@ -871,12 +892,14 @@ TabPage RID_TP_PROFILE {
             DropDown = TRUE;
         };
     PushButton RID_PB_NEW_PROFILE {
+        HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PB_NEW_PROFILE";
             Pos = MAP_APPFONT( 144, 2 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
             Text[ en-US ] = "New";
     };
     PushButton RID_PD_DEL_PROFILE {
+        HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PD_DEL_PROFILE";
             Pos = MAP_APPFONT( 188, 2 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -898,6 +921,7 @@ TabPage RID_TP_PROFILE {
             Text[ en-US ] = "Base directory";
     };
     CheckBox HID_CHECK {
+        HelpID = "basic:CheckBox:RID_TP_PROFILE:HID_CHECK";
             Pos = MAP_APPFONT( 7, 58 );
             Size = MAP_APPFONT( 86, 12 );
             Text[ en-US ] = "Default HID directory";
@@ -905,52 +929,61 @@ TabPage RID_TP_PROFILE {
             Hide = FALSE;
     };
     Edit LOG_NAME {
+        HelpID = "basic:Edit:RID_TP_PROFILE:LOG_NAME";
             Border = TRUE;
             Pos = MAP_APPFONT( 97, 26 );
             Size = MAP_APPFONT( 116, 12 );
             TabStop = TRUE;
         };
     Edit BASIS_NAME {
+        HelpID = "basic:Edit:RID_TP_PROFILE:BASIS_NAME";
             Border = TRUE;
             Pos = MAP_APPFONT( 97, 42 );
             Size = MAP_APPFONT( 116, 12 );
             TabStop = TRUE;
         };
     Edit HID_NAME {
+        HelpID = "basic:Edit:RID_TP_PROFILE:HID_NAME";
             Border = TRUE;
             Pos = MAP_APPFONT( 97, 58 );
             Size = MAP_APPFONT( 116, 12 );
             TabStop = TRUE;
         };
     PushButton LOG_SET {
+        HelpID = "basic:PushButton:RID_TP_PROFILE:LOG_SET";
             Pos = MAP_APPFONT( 217, 26 );
             Size = MAP_APPFONT( 12, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "...";
     };
     PushButton BASIS_SET {
+        HelpID = "basic:PushButton:RID_TP_PROFILE:BASIS_SET";
             Pos = MAP_APPFONT( 217, 42 );
             Size = MAP_APPFONT( 12, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "...";
     };
     PushButton HID_SET {
+        HelpID = "basic:PushButton:RID_TP_PROFILE:HID_SET";
             Pos = MAP_APPFONT( 217, 58 );
             Size = MAP_APPFONT( 12, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "...";
     };
     CheckBox CB_AUTORELOAD {
+        HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTORELOAD";
             Pos = MAP_APPFONT( 7, 74 );
             Size = MAP_APPFONT( 115, 12 );
         Text[ en-US ] = "AutoReload";
     };
     CheckBox CB_AUTOSAVE {
+        HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTOSAVE";
             Pos = MAP_APPFONT( 7, 87 );
             Size = MAP_APPFONT( 115, 12 );
         Text[ en-US ] = "Save before execute";
     };
     CheckBox CB_STOPONSYNTAXERRORS {
+        HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_STOPONSYNTAXERRORS";
             Pos = MAP_APPFONT( 132, 74 );
             Size = MAP_APPFONT( 115, 12 );
         Text[ en-US ] = "Stop on Syntax Errors";
@@ -958,6 +991,7 @@ TabPage RID_TP_PROFILE {
 };
 
 TabPage RID_TP_CRASH {
+    HelpID = "basic:TabPage:RID_TP_CRASH";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 244, 100 );
@@ -967,6 +1001,7 @@ TabPage RID_TP_CRASH {
             Text[ en-US ] = "Crashreport";
     };
     CheckBox CB_USEPROXY {
+        HelpID = "basic:CheckBox:RID_TP_CRASH:CB_USEPROXY";
             Pos = MAP_APPFONT( 8, 12 );
             Size = MAP_APPFONT( 120, 12 );
             Text[ en-US ] = "Use Proxy";
@@ -977,6 +1012,7 @@ TabPage RID_TP_CRASH {
             Text[ en-US ] = "Host";
     };
     Edit ED_CRHOST {
+        HelpID = "basic:Edit:RID_TP_CRASH:ED_CRHOST";
             Border = TRUE;
             Pos = MAP_APPFONT( 43+12, 12+13 );
             Size = MAP_APPFONT( 80, 12 );
@@ -988,6 +1024,7 @@ TabPage RID_TP_CRASH {
             Text[ en-US ] = "Port";
     };
     NumericField NF_CRPORT {
+        HelpID = "basic:NumericField:RID_TP_CRASH:NF_CRPORT";
             Border = TRUE;
             Pos = MAP_APPFONT( 43+12, 12+13+16 );
             Size = MAP_APPFONT( 40, 12 );
@@ -1001,6 +1038,7 @@ TabPage RID_TP_CRASH {
             Last = 0xffff;
         };
     CheckBox CB_ALLOWCONTACT {
+        HelpID = "basic:CheckBox:RID_TP_CRASH:CB_ALLOWCONTACT";
             Pos = MAP_APPFONT( 8, 12+13+16+16 );
             Size = MAP_APPFONT( 120, 12 );
             Text[ en-US ] = "Allow Contact";
@@ -1011,6 +1049,7 @@ TabPage RID_TP_CRASH {
             Text[ en-US ] = "EMail";
     };
     Edit ED_EMAIL {
+        HelpID = "basic:Edit:RID_TP_CRASH:ED_EMAIL";
             Border = TRUE;
             Pos = MAP_APPFONT( 43+12, 12+13+16+16+13 );
             Size = MAP_APPFONT( 80, 12 );
@@ -1020,6 +1059,7 @@ TabPage RID_TP_CRASH {
 
 
 TabPage RID_TP_MISC {
+    HelpID = "basic:TabPage:RID_TP_MISC";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 244, 100 );
@@ -1034,6 +1074,7 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "Host";
     };
     Edit ED_HOST {
+        HelpID = "basic:Edit:RID_TP_MISC:ED_HOST";
             Border = TRUE;
             Pos = MAP_APPFONT( 43, 12);
             Size = MAP_APPFONT( 80, 12 );
@@ -1045,6 +1086,7 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "Testtool Port";
     };
     NumericField NF_TTPORT {
+        HelpID = "basic:NumericField:RID_TP_MISC:NF_TTPORT";
             Border = TRUE;
             Pos = MAP_APPFONT( 191, 12);
             Size = MAP_APPFONT( 40, 12 );
@@ -1063,6 +1105,7 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "Remote UNO Port";
     };
     NumericField NF_UNOPORT {
+        HelpID = "basic:NumericField:RID_TP_MISC:NF_UNOPORT";
             Border = TRUE;
             Pos = MAP_APPFONT( 191, 12+15);
             Size = MAP_APPFONT( 40, 12 );
@@ -1087,6 +1130,7 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "Server Timeout";
     };
     TimeField SERVER_TIMEOUT {
+        HelpID = "basic:TimeField:RID_TP_MISC:SERVER_TIMEOUT";
             Border = TRUE;
             Pos = MAP_APPFONT( 83, 50 );
             Size = MAP_APPFONT( 40, 12 );
@@ -1102,6 +1146,7 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "Max LRU Files";
     };
     NumericField TF_MAX_LRU {
+        HelpID = "basic:NumericField:RID_TP_MISC:TF_MAX_LRU";
             Border = TRUE;
             Pos = MAP_APPFONT( 191, 50);
             Size = MAP_APPFONT( 40, 12 );
@@ -1118,12 +1163,14 @@ TabPage RID_TP_MISC {
             Text[ en-US ] = "OOo Program Dir";
     };
     Edit ED_PROGDIR {
+        HelpID = "basic:Edit:RID_TP_MISC:ED_PROGDIR";
             Border = TRUE;
             Pos = MAP_APPFONT( 83, 50+15 );
             Size = MAP_APPFONT( 219-83-4, 12 );
             TabStop = TRUE;
         };
     PushButton PB_PROGDIR {
+        HelpID = "basic:PushButton:RID_TP_MISC:PB_PROGDIR";
             Pos = MAP_APPFONT( 219, 50+15 );
             Size = MAP_APPFONT( 12, 12 );
             TabStop = TRUE;
@@ -1133,6 +1180,7 @@ TabPage RID_TP_MISC {
 
 
 TabPage RID_TP_FONT {
+    HelpID = "basic:TabPage:RID_TP_FONT";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 244, 100 );
@@ -1142,6 +1190,7 @@ TabPage RID_TP_FONT {
         Text[ en-US ] = "Type";
     };
     ComboBox CB_FONTNAME {
+        HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTNAME";
         Pos = MAP_APPFONT( 4, 12 );
         Size = MAP_APPFONT( 123, 12*4 );
         Sort = TRUE;
@@ -1153,6 +1202,7 @@ TabPage RID_TP_FONT {
         Text[ en-US ] = "Typeface";
     };
     ComboBox CB_FONTSTYLE {
+        HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTSTYLE";
         Pos = MAP_APPFONT( 131, 12 );
         Size = MAP_APPFONT( 65, 12*4 );
         AutoHScroll = TRUE;
@@ -1163,6 +1213,7 @@ TabPage RID_TP_FONT {
         Text[ en-US ] = "Size";
     };
     MetricBox MB_FONTSIZE {
+        HelpID = "basic:MetricBox:RID_TP_FONT:MB_FONTSIZE";
         Pos = MAP_APPFONT( 200, 12 );
         Size = MAP_APPFONT( 29, 12*4 );
         AutoHScroll = TRUE;
@@ -1178,6 +1229,7 @@ TabPage RID_TP_FONT {
 
 
 FloatingWindow IDD_DISPLAY_HID {
+    HelpID = "basic:FloatingWindow:IDD_DISPLAY_HID";
     OutputSize = TRUE;
     SVLook = TRUE;
     Size = MAP_APPFONT( 261, 160 );
@@ -1204,6 +1256,7 @@ FloatingWindow IDD_DISPLAY_HID {
         Text[ en-US ] = "Controls";
     };
     MultiListBox RID_MLB_CONTROLS {
+        HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_CONTROLS";
             Border = TRUE;
             AutoHScroll = TRUE;
             Pos = MAP_APPFONT( 4, 28 );
@@ -1216,6 +1269,7 @@ FloatingWindow IDD_DISPLAY_HID {
         Text[ en-US ] = "Slots";
     };
     MultiListBox RID_MLB_SLOTS {
+        HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_SLOTS";
             Border = TRUE;
             AutoHScroll = TRUE;
             Pos = MAP_APPFONT( 4, 132 );
@@ -1223,12 +1277,14 @@ FloatingWindow IDD_DISPLAY_HID {
             TabStop = TRUE;
         };
     PushButton RID_PB_KOPIEREN {
+        HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_KOPIEREN";
             Pos = MAP_APPFONT( 216, 28 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "Copy";
     };
     PushButton RID_PB_BENENNEN {
+        HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_BENENNEN";
             Pos = MAP_APPFONT( 216, 44 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -1236,6 +1292,7 @@ FloatingWindow IDD_DISPLAY_HID {
         Text[ en-US ] = "Name";
     };
     PushButton RID_PB_SELECTALL {
+        HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_SELECTALL";
             Pos = MAP_APPFONT( 216, 44 );
             Size = MAP_APPFONT( 40, 12 );
             TabStop = TRUE;
@@ -1356,6 +1413,7 @@ ImageList RID_IMGLST_LAYOUT
 };
 
 ModelessDialog IDD_EDIT_VAR {
+    HelpID = "basic:ModelessDialog:IDD_EDIT_VAR";
     Pos = MAP_APPFONT( 0, 0 );
     Size = MAP_APPFONT( 171, 87 );
     Moveable = TRUE;
@@ -1386,6 +1444,7 @@ ModelessDialog IDD_EDIT_VAR {
         Text[ en-US ] = "Previous contents";
     };
     RadioButton RID_RB_NEW_BOOL_T {
+        HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_T";
             Hide = TRUE;
             Pos = MAP_APPFONT( 53, 37 );
             Size = MAP_APPFONT( 40, 12 );
@@ -1393,6 +1452,7 @@ ModelessDialog IDD_EDIT_VAR {
         Text[ en-US ] = "True";
     };
     RadioButton RID_RB_NEW_BOOL_F {
+        HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_F";
             Hide = TRUE;
             Pos = MAP_APPFONT( 98, 37 );
             Size = MAP_APPFONT( 40, 12 );
@@ -1400,6 +1460,7 @@ ModelessDialog IDD_EDIT_VAR {
         Text[ en-US ] = "False";
     };
     NumericField RID_NF_NEW_INTEGER {
+        HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_INTEGER";
             Border = TRUE;
             Hide = TRUE;
             Pos = MAP_APPFONT( 53, 37 );
@@ -1414,6 +1475,7 @@ ModelessDialog IDD_EDIT_VAR {
             SpinSize = 10;
         };
     NumericField RID_NF_NEW_LONG {
+        HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_LONG";
             Border = TRUE;
             Hide = TRUE;
             Pos = MAP_APPFONT( 53, 37 );
@@ -1428,6 +1490,7 @@ ModelessDialog IDD_EDIT_VAR {
             SpinSize = 10;
         };
     Edit RID_ED_NEW_STRING {
+        HelpID = "basic:Edit:IDD_EDIT_VAR:RID_ED_NEW_STRING";
             Hide = TRUE;
             Border = TRUE;
             Pos = MAP_APPFONT( 53, 37 );
@@ -1449,6 +1512,7 @@ ModelessDialog IDD_EDIT_VAR {
 };
 
 FloatingWindow LOAD_CONF {
+    HelpID = "basic:FloatingWindow:LOAD_CONF";
     SVLook = TRUE;
     Pos = MAP_APPFONT( 66, 23 );
     Size = MAP_APPFONT( 156, 51 );
diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index 94c445dd44..9330cae2dc 100644..100755
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -64,7 +64,7 @@ xub_StrLen BasicRuntime::GetCol2()
   return pRun->nCol2;
 }
 
-BOOL BasicRuntime::IsRun()
+sal_Bool BasicRuntime::IsRun()
 {
   return pRun->IsRun();
 }
@@ -118,17 +118,17 @@ bool BasicRuntimeAccess::HasRuntime()
   return pINST && pINST->pRun != NULL;
 }
 
-USHORT BasicRuntimeAccess::GetStackEntryCount()
+sal_uInt16 BasicRuntimeAccess::GetStackEntryCount()
 {
   return GetSbData()->pErrStack->Count();
 }
 
-BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( USHORT nIndex )
+BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( sal_uInt16 nIndex )
 {
   return BasicErrorStackEntry( GetSbData()->pErrStack->GetObject( nIndex ) );
 }
 
-BOOL BasicRuntimeAccess::HasStack()
+sal_Bool BasicRuntimeAccess::HasStack()
 {
   return GetSbData()->pErrStack != NULL;
 }
@@ -139,7 +139,7 @@ void BasicRuntimeAccess::DeleteStack()
   GetSbData()->pErrStack = NULL;
 }
 
-BOOL BasicRuntimeAccess::IsRunInit()
+sal_Bool BasicRuntimeAccess::IsRunInit()
 {
   return GetSbData()->bRunInit;
 }
diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index feea22a61d..feea22a61d 100644..100755
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.hrc
diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index ba96cf55f5..ba96cf55f5 100644..100755
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.src
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index e4d69c6537..c4358a7848 100644..100755
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -57,7 +57,7 @@ BreakpointWindow::BreakpointWindow( Window *pParent )
 , nCurYOffset( 0 )
 , nMarkerPos( MARKER_NOMARKER )
 , pModule( NULL )
-, bErrorMarker( FALSE )
+, bErrorMarker( sal_False )
 {
     if ( !pImages )
         pImages = new ImageList( SttResId( RID_IMGLST_LAYOUT ) );
@@ -81,7 +81,7 @@ void BreakpointWindow::Reset()
 void BreakpointWindow::SetModule( SbModule *pMod )
 {
     pModule = pMod;
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0 ; i < pModule->GetBPCount() ; i++ )
     {
         InsertBreakpoint( pModule->GetBP( i ) );
@@ -97,13 +97,12 @@ void BreakpointWindow::SetBPsInModule()
     for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i )
     {
         Breakpoint* pBrk = BreakpointList[ i ];
-        pModule->SetBP( (USHORT)pBrk->nLine );
+        pModule->SetBP( (sal_uInt16)pBrk->nLine );
 #if OSL_DEBUG_LEVEL > 1
-        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
+        DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (sal_uInt16)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
 #endif
     }
-
-    for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+    for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
     {
         SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
         DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -146,7 +145,7 @@ void BreakpointWindow::InsertBreakpoint( sal_uInt32 nLine )
 #endif
         if ( StarBASIC::IsRunning() )
         {
-            for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+            for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
             {
                 SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
                 DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -226,7 +225,7 @@ void BreakpointWindow::LoadBreakpoints( String aFilename )
 
     for ( i = 0 ; i < aBreakpoints.GetTokenCount( ';' ) ; i++ )
     {
-        InsertBreakpoint( (USHORT)aBreakpoints.GetToken( i, ';' ).ToInt32() );
+        InsertBreakpoint( (sal_uInt16)aBreakpoints.GetToken( i, ';' ).ToInt32() );
     }
 }
 
@@ -276,7 +275,7 @@ void BreakpointWindow::Paint( const Rectangle& )
         sal_Int32 nY = nLine*nLineHeight - nCurYOffset;
         DrawImage( Point( 0, nY ) + aBmpOff, aBrk );
     }
-    ShowMarker( TRUE );
+    ShowMarker( sal_True );
 }
 
 
@@ -341,7 +340,7 @@ void BreakpointWindow::ShowMarker( bool bShow )
     aMarkerOff.X() = ( aOutSz.Width() - aMarkerSz.Width() ) / 2;
     aMarkerOff.Y() = ( nLineHeight - aMarkerSz.Height() ) / 2;
 
-    ULONG nY = nMarkerPos*nLineHeight - nCurYOffset;
+    sal_uIntPtr nY = nMarkerPos*nLineHeight - nCurYOffset;
     Point aPos( 0, nY );
     aPos += aMarkerOff;
     if ( bShow )
@@ -359,7 +358,7 @@ void BreakpointWindow::MouseButtonDown( const MouseEvent& rMEvt )
         long nLineHeight = GetTextHeight();
         long nYPos = aMousePos.Y() + nCurYOffset;
         long nLine = nYPos / nLineHeight + 1;
-        ToggleBreakpoint( sal::static_int_cast< USHORT >(nLine) );
+        ToggleBreakpoint( sal::static_int_cast< sal_uInt16 >(nLine) );
         Invalidate();
     }
 }
@@ -375,7 +374,7 @@ void BreakpointWindow::SetMarkerPos( sal_uInt32 nLine, bool bError )
 }
 
 
-void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags )
+void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
 {
     (void) nFlags; /* avoid warning about unused parameter */
     nCurYOffset -= nVertScroll;
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index 99782c06ed..f78649a0f8 100644..100755
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -72,7 +72,7 @@ protected:
 
 public:
     void            SetMarkerPos( sal_uInt32 nLine, bool bErrorMarker = false );
-    virtual void    Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags = 0 );
+    virtual void    Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 );
     long&           GetCurYOffset() 		{ return nCurYOffset; }
 };
 
diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index bf0761665f..931eddd27b 100644..100755
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -42,9 +42,9 @@ class Font;
 #define DATA_FUNC_DEF( MemberName, MemberType )									\
 public:																			\
     MemberType MemberName;														\
-    BOOL Find( const String& rStr );											\
-    BOOL Load( const String& rStr );											\
-    BOOL Save( const String& rStr );											\
+    sal_Bool Find( const String& rStr );											\
+    sal_Bool Load( const String& rStr );											\
+    sal_Bool Save( const String& rStr );											\
                                                                                 \
     void GrabFocus(){ MemberName.GrabFocus(); }									\
     void Show(){ MemberName.Show(); }											\
@@ -63,13 +63,13 @@ public:																			\
     void Redo();																\
     String GetText() const;														\
     void SetText( const String& rStr );											\
-    BOOL HasText() const;														\
+    sal_Bool HasText() const;														\
     String GetSelected();														\
     TextSelection GetSelection() const;											\
     void SetSelection( const TextSelection& rSelection );						\
-    USHORT GetLineNr() const;													\
+    sal_uInt16 GetLineNr() const;													\
     void ReplaceSelected( const String& rStr );									\
-    BOOL IsModified();															\
+    sal_Bool IsModified();															\
     void SetModifyHdl( Link l );
 
 
@@ -86,19 +86,19 @@ public:
     virtual void Undo()=0;
     virtual void Redo()=0;
 
-    virtual BOOL Find( const String& )=0;         // Find and select text
-    virtual BOOL Load( const String& )=0;         // Load text from file
-    virtual BOOL Save( const String& )=0;         // Save text to file
+    virtual sal_Bool Find( const String& )=0;         // Find and select text
+    virtual sal_Bool Load( const String& )=0;         // Load text from file
+    virtual sal_Bool Save( const String& )=0;         // Save text to file
     virtual String GetSelected()=0;
     virtual void GrabFocus()=0;
     virtual TextSelection GetSelection() const=0;
     virtual void SetSelection( const TextSelection& rSelection )=0;
-    virtual USHORT GetLineNr() const=0;
+    virtual sal_uInt16 GetLineNr() const=0;
     virtual String GetText() const=0;
     virtual void SetText( const String& rStr )=0;
-    virtual BOOL HasText() const=0;               // to avoid GetText.Len()
+    virtual sal_Bool HasText() const=0;               // to avoid GetText.Len()
     virtual void ReplaceSelected( const String& rStr )=0;
-    virtual BOOL IsModified()=0;
+    virtual sal_Bool IsModified()=0;
     virtual void SetModifyHdl( Link )=0;
     virtual void Show()=0;
     virtual void SetPosPixel( const Point& rNewPos )=0;
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index d7d800f320..cc02c091bc 100644..100755
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -95,9 +95,9 @@ IMPL_LINK_INLINE_START( FindDialog, ButtonClick, Button *, pB )
 {
     if( pB == &aOk ) {
         *pFind = aFind.GetText();
-        EndDialog( TRUE );
-    } else EndDialog( FALSE );
-    return TRUE;
+        EndDialog( sal_True );
+    } else EndDialog( sal_False );
+    return sal_True;
 }
 IMPL_LINK_INLINE_END( FindDialog, ButtonClick, Button *, pB )
 
@@ -125,9 +125,9 @@ IMPL_LINK( ReplaceDialog, ButtonClick, Button *, pB )
     if( pB == &aOk ) {
         *pFind = aFind.GetText();
         *pReplace = aReplace.GetText();
-        EndDialog( TRUE );
-    } else EndDialog( FALSE );
-    return TRUE;
+        EndDialog( sal_True );
+    } else EndDialog( sal_False );
+    return sal_True;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ void ConfEdit::Init( Config &aConf )
     aEdit.SetText( aTemp );
 }
 
-ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
 : PushButton( pParent, SttResId(nResButton) )
 , aText( pParent, SttResId(nResText) )
 , aEdit( pParent, SttResId(nResEdit) )
@@ -159,7 +159,7 @@ ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nR
     Init( aConf );
 }
 
-ConfEdit::ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
 : PushButton( pParent, SttResId(nResButton) )
 , aText( pParent )
 , aEdit( pParent, SttResId(nResEdit) )
@@ -197,7 +197,7 @@ void ConfEdit::Click()
     }
 }
 
-OptConfEdit::OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
+OptConfEdit::OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
 : ConfEdit( pParent, nResEdit, nResButton, aKN, aConf )
 , aCheck( pParent, SttResId( nResCheck ) )
 , rBase( rBaseEdit )
@@ -247,7 +247,7 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
 , aCancel( this )
 , aConfig( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) )
 {
-    aConfig.EnablePersistence( FALSE );
+    aConfig.EnablePersistence( sal_False );
     FreeResource();
     aTabCtrl.SetActivatePageHdl( LINK( this, OptionsDialog, ActivatePageHdl ) );
     aTabCtrl.SetCurPageId( RID_TP_PRO );
@@ -261,25 +261,25 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
 
 OptionsDialog::~OptionsDialog()
 {
-    for ( USHORT i = 0; i < aTabCtrl.GetPageCount(); i++ )
+    for ( sal_uInt16 i = 0; i < aTabCtrl.GetPageCount(); i++ )
         delete aTabCtrl.GetTabPage( aTabCtrl.GetPageId( i ) );
 };
 
-BOOL OptionsDialog::Close()
+sal_Bool OptionsDialog::Close()
 {
   if ( TabDialog::Close() )
   {
     delete this;
-    return TRUE;
+    return sal_True;
   }
   else
-    return FALSE;
+    return sal_False;
 }
 
 
 IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 {
-    USHORT nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 nId = pTabCtrl->GetCurPageId();
     // If TabPage was not yet created, do it
     if ( !pTabCtrl->GetTabPage( nId ) )
     {
@@ -349,7 +349,7 @@ IMPL_LINK( OptionsDialog, OKClick, Button *, pButton )
 }
 
 const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
 
 ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 : TabPage( pParent, SttResId( RID_TP_PROFILE ) )
@@ -371,7 +371,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 {
     FreeResource();
 
-    aCbProfile.EnableAutocomplete( TRUE );
+    aCbProfile.EnableAutocomplete( sal_True );
 
     aCbProfile.SetSelectHdl( LINK( this, ProfileOptions, Select ) );
 
@@ -386,7 +386,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
 void ProfileOptions::LoadData()
 {
     // collect all profiles (all groups starting with the ProfilePrefix)
-    for ( USHORT i = 0 ; i < rConf.GetGroupCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < rConf.GetGroupCount() ; i++ )
     {
         ByteString aProfile = rConf.GetGroupName( i );
         if ( aProfile.Match( ProfilePrefix ) )
@@ -507,7 +507,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
 {
     FreeResource();
 
-    aNFCRPort.SetUseThousandSep( FALSE );
+    aNFCRPort.SetUseThousandSep( sal_False );
 
     ByteString aTemp;
 
@@ -517,7 +517,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
     if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
         aCBUseProxy.Check();
     else
-        aCBUseProxy.Check( FALSE );
+        aCBUseProxy.Check( sal_False );
 
     aCBUseProxy.SetToggleHdl( LINK( this, CrashreportOptions, CheckProxy ) );
     LINK( this, CrashreportOptions, CheckProxy ).Call( NULL );  // call once to initialize
@@ -532,7 +532,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
     if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
         aCBAllowContact.Check();
     else
-        aCBAllowContact.Check( FALSE );
+        aCBAllowContact.Check( sal_False );
 
     aCBAllowContact.SetToggleHdl( LINK( this, CrashreportOptions, CheckResponse ) );
     LINK( this, CrashreportOptions, CheckResponse ).Call( NULL );  // call once to initialize
@@ -598,9 +598,9 @@ MiscOptions::MiscOptions( Window* pParent, Config &aConfig )
 {
     FreeResource();
 
-    aNFTTPort.SetUseThousandSep( FALSE );
-    aNFUNOPort.SetUseThousandSep( FALSE );
-    aTFMaxLRU.SetUseThousandSep( FALSE );
+    aNFTTPort.SetUseThousandSep( sal_False );
+    aNFUNOPort.SetUseThousandSep( sal_False );
+    aTFMaxLRU.SetUseThousandSep( sal_False );
 
     ByteString aTemp;
 
@@ -648,8 +648,8 @@ void MiscOptions::Save( Config &aConfig )
 
     aConfig.SetGroup("LRU");
     ByteString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
-    USHORT nOldMaxLRU = (USHORT)aTemp.ToInt32();
-    USHORT n;
+    sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.ToInt32();
+    sal_uInt16 n;
     for ( n = nOldMaxLRU ; n > aTFMaxLRU.GetValue() ; n-- )
         aConfig.DeleteKey( ByteString("LRU").Append( ByteString::CreateFromInt32( n ) ) );
     aConfig.WriteKey( "MaxLRU", ByteString::CreateFromInt64( aTFMaxLRU.GetValue() ) );
@@ -722,8 +722,8 @@ IMPL_LINK( FontOptions, FontSizeChanged, void*, EMPTYARG )
 void FontOptions::UpdatePreview()
 {
     Font aFont = aFontList.Get( aFontName.GetText(), aFontStyle.GetText() );
-//    ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
-    ULONG nFontSize = static_cast<ULONG>((aFontSize.GetValue() + 5) / 10);
+//    sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+    sal_uIntPtr nFontSize = static_cast<sal_uIntPtr>((aFontSize.GetValue() + 5) / 10);
     aFont.SetHeight( nFontSize );
     aFTPreview.SetFont( aFont );
     aFTPreview.SetText( aFontName.GetText() );
@@ -757,13 +757,13 @@ GenericOptions::GenericOptions( Window* pParent, Config &aConfig )
 , aPbDelValue( this, SttResId( RID_PB_DEL_VALUE ) )
 
 , nMoveButtons( 0 )
-, bShowSelectPath( FALSE )
+, bShowSelectPath( sal_False )
 {
     FreeResource();
     LoadData();
 
-    aCbArea.EnableAutocomplete( TRUE );
-    aCbValue.EnableAutocomplete( TRUE );
+    aCbArea.EnableAutocomplete( sal_True );
+    aCbValue.EnableAutocomplete( sal_True );
 
     aCbArea.SetSelectHdl( LINK( this, GenericOptions, LoadGroup ) );
 
@@ -789,7 +789,7 @@ GenericOptions::~GenericOptions()
 StringList* GenericOptions::GetAllGroups()
 {
     StringList* pGroups = new StringList();
-    for ( USHORT i = 0 ; i < aConf.GetGroupCount() ; i++ )
+    for ( sal_uInt16 i = 0 ; i < aConf.GetGroupCount() ; i++ )
     {
         String *pGroup = new String( aConf.GetGroupName( i ), RTL_TEXTENCODING_UTF8 );
         pGroups->push_back( pGroup );
@@ -826,16 +826,16 @@ void GenericOptions::ShowSelectPath( const String &rType )
     {   // Show Path button
         nMoveButtons += nDelta;
         aMoveTimer.Start();
-        bShowSelectPath = TRUE;
-        aPbSelectPath.Show( TRUE );
-        aPbSelectPath.Enable( TRUE );
+        bShowSelectPath = sal_True;
+        aPbSelectPath.Show( sal_True );
+        aPbSelectPath.Enable( sal_True );
     }
     else if ( !rType.EqualsIgnoreCaseAscii( "PATH" ) && bShowSelectPath )
     {   // Hide Path button
         nMoveButtons -= nDelta;
         aMoveTimer.Start();
-        bShowSelectPath = FALSE;
-        aPbSelectPath.Enable( FALSE );
+        bShowSelectPath = sal_False;
+        aPbSelectPath.Enable( sal_False );
     }
 }
 
@@ -888,7 +888,7 @@ IMPL_LINK( GenericOptions, LoadGroup, ComboBox*, EMPTYARG )
 
         aConf.SetGroup( aLastGroupName );
         aConf.WriteKey( C_KEY_AKTUELL, ByteString( aCurrentValue, RTL_TEXTENCODING_UTF8 ) );
-        USHORT i;
+        sal_uInt16 i;
         for ( i=0 ; i < aCbValue.GetEntryCount() ; i++ )
         {
             if ( i > 0 )
@@ -1006,16 +1006,16 @@ class TextAndWin : public DockingWindow
     Window* pFtOriginalParent;
     Window* pWinOriginalParent;
     long nSpace;	// default space
-    BOOL bAlignTop;
+    sal_Bool bAlignTop;
 
 public:
-    TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP );
+    TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP );
     ~TextAndWin();
 
     virtual void Resize();
 };
 
-TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP )
+TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP )
 : DockingWindow( pParent )
 , pFt( pFtP )
 , pWin( pWinP )
@@ -1097,8 +1097,8 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent )
 #endif
 
     pSplit = new SplitWindow( this );
-    pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), TRUE );
-    pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), FALSE );
+    pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), sal_True );
+    pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), sal_False );
 
     pSplit->SetPosPixel( aFtControls.GetPosPixel() );
     pSplit->InsertItem( 1, pControls, 70, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
@@ -1124,7 +1124,7 @@ DisplayHidDlg::~DisplayHidDlg()
 IMPL_LINK( DisplayHidDlg, CopyToClipboard, void*, EMPTYARG )
 {
     String aSammel;
-    USHORT i;
+    sal_uInt16 i;
 
     for ( i=0 ; i < aMlbControls.GetSelectEntryCount() ; i++ )
     {
@@ -1146,7 +1146,7 @@ IMPL_LINK( DisplayHidDlg, SelectAll, PushButton*, pButton )
 {
     if ( pButton->GetState() != STATE_CHECK )
     {
-        USHORT i;
+        sal_uInt16 i;
         for ( i=0 ; i < aMlbControls.GetEntryCount() ; i++ )
             aMlbControls.SelectEntryPos( i );
         for ( i=0 ; i < aMlbSlots.GetEntryCount() ; i++ )
@@ -1249,7 +1249,7 @@ void DisplayHidDlg::Resize()
     }
     else
     {
-//		SetUpdateMode( FALSE );
+//		SetUpdateMode( sal_False );
 
         // Minimum size
         Size aSize( GetOutputSizePixel() );
@@ -1305,7 +1305,7 @@ void DisplayHidDlg::Resize()
         aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() );
         aOKClose.SetPosPixel( aPos );
 
-//		SetUpdateMode( TRUE );
+//		SetUpdateMode( sal_True );
 //		Invalidate();
     }
     FloatingWindow::Resize();
@@ -1385,7 +1385,7 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
 IMPL_LINK( VarEditDialog, OKClick, Button *, pButton )
 {
     (void) pButton; /* avoid warning about unused parameter */
-    BOOL bWasError = SbxBase::IsError();	// Probably an error is thrown
+    sal_Bool bWasError = SbxBase::IsError();	// Probably an error is thrown
 
 
     SbxDataType eType = pVar->GetType();
@@ -1428,7 +1428,7 @@ SvNumberformat::
 
 
     String aContent( aEditRID_ED_NEW_STRING.GetText() );
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     switch ( eType )
     {
         case SbxBOOL:
@@ -1441,10 +1441,10 @@ SvNumberformat::
 //			pVar->PutDate( aContent );
 //			break;
         case SbxINTEGER:
-            pVar->PutInteger( (INT16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
+            pVar->PutInteger( (sal_Int16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
             break;
         case SbxLONG:
-            pVar->PutLong( static_cast<INT32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
+            pVar->PutLong( static_cast<sal_Int32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
             break;
         case SbxDOUBLE:
         case SbxSINGLE:
@@ -1465,7 +1465,7 @@ SvNumberformat::
 //	pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() );
     if ( !bWasError && SbxBase::IsError() )
     {
-        bError = TRUE;
+        bError = sal_True;
         SbxBase::ResetError();
     }
 
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 30d513a702..d8ea5e0a13 100644..100755
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -93,8 +93,8 @@ protected:
     void Init( Config &aConf );
 
 public:
-    ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
-    ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
+    ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
+    ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
     void Save( Config &aConf );
     void Reload( Config &aConf );
     void Click();
@@ -110,7 +110,7 @@ protected:
     ConfEdit& rBase;
     DECL_LINK( ToggleHdl, CheckBox* );
 public:
-    OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
+    OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
     void Reload( Config &aConf );
     DECL_LINK( BaseModifyHdl, Edit* );
 };
@@ -130,7 +130,7 @@ private:
 public:
     OptionsDialog( Window* pParent, const ResId& );
     ~OptionsDialog();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 
     DECL_LINK( ActivatePageHdl, TabControl * );
@@ -261,7 +261,7 @@ class GenericOptions : public TabPage
     PushButton aPbDelValue;
 
     int nMoveButtons;
-    BOOL bShowSelectPath;
+    sal_Bool bShowSelectPath;
     AutoTimer aMoveTimer;
     DECL_LINK( MoveButtons, AutoTimer* );
 
@@ -309,7 +309,7 @@ protected:
     DockingWindow* pSlots;
     SplitWindow *pSplit;
 
-    ULONG nDisplayMode;
+    sal_uIntPtr nDisplayMode;
 
     DECL_LINK( Select, void* );
     DECL_LINK( SelectAll, PushButton* );
diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index e62b11c0be..e62b11c0be 100644..100755
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index e8b6996ca2..227e501f5f 100644..100755
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -52,10 +52,10 @@ Version 3			Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
 #include "basmsg.hrc"
 #include "basrid.hxx"
 
-USHORT MsgEdit::nMaxLogLen = 0;
-BOOL MsgEdit::bLimitLogLen = FALSE;
-BOOL MsgEdit::bPrintLogToStdout = FALSE;
-BOOL MsgEdit::bPrintLogToStdoutSet = FALSE;
+sal_uInt16 MsgEdit::nMaxLogLen = 0;
+sal_Bool MsgEdit::bLimitLogLen = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdout = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdoutSet = sal_False;
 
 #define WARNING_PREFIX String( SttResId( S_WARNING_PREFIX ) )
 #define VERSION_STRING CUniString("File Format Version: ")
@@ -69,8 +69,8 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
 , pCurrentTestCase(NULL)
 , pCurrentAssertion( NULL )
 , pCurrentError(NULL)
-, bModified(FALSE)
-, bFileLoading(FALSE)
+, bModified(sal_False)
+, bFileLoading(sal_False)
 , nVersion(0)
 , pAppError( pParent )
 , aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
@@ -83,15 +83,15 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
 
     if ( !bPrintLogToStdoutSet )
     {
-        bPrintLogToStdoutSet = TRUE;
-        for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+        bPrintLogToStdoutSet = sal_True;
+        for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
         {
             if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-printlog") == COMPARE_EQUAL
     #ifndef UNX
               || Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("/printlog") == COMPARE_EQUAL
     #endif
               )
-                bPrintLogToStdout = TRUE;
+                bPrintLogToStdout = sal_True;
         }
     }
 }
@@ -172,11 +172,11 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
 
         if ( !bFileLoading )
         {	// Comes from Testtool and must be written immediately
-            BOOL bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
+            sal_Bool bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
 
             DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" );
             DirEntry aEntry( LogMsg->aLogFileName );
-            BOOL bNewFile = !aEntry.Exists();
+            sal_Bool bNewFile = !aEntry.Exists();
             SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE );
             if ( bNewFile )
             {
@@ -224,7 +224,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
 {
     if ( !bFileLoading && bLimitLogLen )
     {
-        USHORT nSkip = nMaxLogLen;
+        sal_uInt16 nSkip = nMaxLogLen;
         SvLBoxEntry *pRun = aEditTree.First();
         while ( nSkip-- && pRun )
             pRun = aEditTree.NextSibling( pRun );
@@ -235,7 +235,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
                 aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) );
     
             aEditTree.GetModel()->Remove( pRun );
-            bModified = TRUE;
+            bModified = sal_True;
             lModify.Call( NULL );
             Save( aLogFileName );
             pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
@@ -244,9 +244,9 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
 
     COPY_TTDEBUGDATA( LOG_RUN );
     if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) )
-        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, 0, pTTDebugData );
+        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, 0, pTTDebugData );
     else		// First file format
-        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData );	// and therefor at the end
+        pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, LIST_APPEND, pTTDebugData );	// and therefor at the end
 
     aEditTree.ShowEntry( pCurrentRun );
     pCurrentTestCase = NULL;
@@ -265,7 +265,7 @@ void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData )
         else
         {
             COPY_TTDEBUGDATA( LOG_TEST_CASE );
-            pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+            pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
             aEditTree.ShowEntry( pCurrentTestCase );
         }
     }
@@ -287,7 +287,7 @@ void MsgEdit::AddError( String aMsg, TTDebugData aDebugData )
     if ( pCurrentTestCase )
     {
         COPY_TTDEBUGDATA( LOG_ERROR );
-        pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pCurrentError );
     }
 }
@@ -298,7 +298,7 @@ void MsgEdit::AddCallStack( String aMsg, TTDebugData aDebugData )
     if ( pCurrentError )
     {
         COPY_TTDEBUGDATA( LOG_CALL_STACK );
-        aEditTree.InsertEntry( aMsg, pCurrentError, FALSE, LIST_APPEND, pTTDebugData );
+        aEditTree.InsertEntry( aMsg, pCurrentError, sal_False, LIST_APPEND, pTTDebugData );
     }
 }
 
@@ -307,16 +307,16 @@ void MsgEdit::AddMessage( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_MESSAGE );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 }
@@ -329,16 +329,16 @@ void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
     COPY_TTDEBUGDATA( LOG_WARNING );
 
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -357,16 +357,16 @@ void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_ASSERTION );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -381,18 +381,18 @@ void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_ASSERTION_STACK );
     if ( pCurrentAssertion )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -405,16 +405,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry *pThisEntry = NULL;
     COPY_TTDEBUGDATA( LOG_QA_ERROR );
     if ( pCurrentTestCase )
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
     else if ( pCurrentRun )
     {
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
     else
     {
         AddRun( aMsg, aDebugData );
-        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+        pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
         aEditTree.ShowEntry( pThisEntry );
     }
 
@@ -423,8 +423,8 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
 }
 
 /*
-    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
-    SvLBoxEntry*	GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
+    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
+    SvLBoxEntry*	GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
 
 
 
@@ -437,16 +437,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
     SvLBoxEntry*	PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
     SvLBoxEntry*	LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
 
-    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
-    SvLBoxEntry*	GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+    SvLBoxEntry*	GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
+    SvLBoxEntry*	GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
 
     SvLBoxEntry*	GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
     SvLBoxEntry*	GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
 
-    BOOL			IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
-    SvListEntry*	GetEntry( SvListEntry* pParent, ULONG nPos ) const;
-    SvListEntry*	GetEntry( ULONG nRootPos ) const;
-    SvListEntry*	GetEntryAtAbsPos( ULONG nAbsPos ) const;
+    sal_Bool			IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
+    SvListEntry*	GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const;
+    SvListEntry*	GetEntry( sal_uIntPtr nRootPos ) const;
+    SvListEntry*	GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const;
     SvListEntry*	GetParent( SvListEntry* pEntry ) const;
     SvListEntry*	GetRootLevelParent( SvListEntry* pEntry ) const;
 */
@@ -460,11 +460,11 @@ void MsgEdit::Delete()
     CHECK( pCurrentTestCase );
     CHECK( pCurrentAssertion );
     CHECK( pCurrentError );
-    bModified = TRUE;
+    bModified = sal_True;
     lModify.Call( NULL );
 }
 
-void MsgEdit::Cut(){ Copy(); Delete(); bModified = TRUE; lModify.Call( NULL ); }
+void MsgEdit::Cut(){ Copy(); Delete(); bModified = sal_True; lModify.Call( NULL ); }
 void MsgEdit::Copy(){ ::svt::OStringTransfer::CopyString( GetSelected(), &aEditTree ); }
 /**/void MsgEdit::Paste(){ Sound::Beep(); }
 void MsgEdit::Undo(){ Sound::Beep(); }
@@ -545,7 +545,7 @@ TextSelection MsgEdit::GetSelection() const
 {
     if ( aEditTree.FirstSelected() )
     {
-        ULONG nStart=0,nEnd=0;
+        sal_uIntPtr nStart=0,nEnd=0;
         nStart = aEditTree.GetModel()->GetAbsPos(aEditTree.FirstSelected() );
         if ( aEditTree.LastSelected() )
             nEnd = aEditTree.GetModel()->GetAbsPos(aEditTree.LastSelected() );
@@ -557,25 +557,25 @@ TextSelection MsgEdit::GetSelection() const
 
 void MsgEdit::SetSelection( const TextSelection& rSelection )
 {
-    ULONG nStart,nEnd;
+    sal_uIntPtr nStart,nEnd;
 
     while ( aEditTree.GetSelectionCount() )
-        aEditTree.Select( aEditTree.FirstSelected(), FALSE );
+        aEditTree.Select( aEditTree.FirstSelected(), sal_False );
 
     if ( rSelection.HasRange() )
     {
         nStart = rSelection.GetStart().GetPara();
         nEnd = rSelection.GetEnd().GetPara();
 
-        for ( ULONG i = nStart ; i <= nEnd ; i++ )
-            aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), TRUE );
+        for ( sal_uIntPtr i = nStart ; i <= nEnd ; i++ )
+            aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), sal_True );
     }
 }
 
-USHORT MsgEdit::GetLineNr() const
+sal_uInt16 MsgEdit::GetLineNr() const
 {
     if ( aEditTree.GetCurEntry() )
-        return (USHORT)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
+        return (sal_uInt16)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
     else
         return 0;
 }
@@ -587,7 +587,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
     OSL_FAIL("Not Implemented");
 }
 
-BOOL MsgEdit::IsModified(){ return bModified; }
+sal_Bool MsgEdit::IsModified(){ return bModified; }
 void MsgEdit::SetModifyHdl( Link l ){ lModify = l; }
 
 String MsgEdit::GetText() const
@@ -611,16 +611,16 @@ void MsgEdit::SetText( const String& rStr )
     OSL_FAIL("Not Implemented");
 }
 
-BOOL MsgEdit::HasText() const 
+sal_Bool MsgEdit::HasText() const 
 { 
   return aEditTree.First() != NULL; 
 }
 
 // Search from the beginning or mark start + 1
-BOOL MsgEdit::Find( const String& s )
+sal_Bool MsgEdit::Find( const String& s )
 {
     TextSelection r  = GetSelection();
-    USHORT bgn   = (USHORT) r.GetStart().GetPara() + 1;
+    sal_uInt16 bgn   = (sal_uInt16) r.GetStart().GetPara() + 1;
     if ( r.GetStart().GetPara() == 0 ) 
         bgn = 0;	// Search from the beginning
 
@@ -630,11 +630,11 @@ BOOL MsgEdit::Find( const String& s )
         if( aEditTree.GetEntryText( pEntry ).Search( s, 0 ) != STRING_NOTFOUND )
         {
             aEditTree.SetCurEntry( pEntry );
-            return TRUE;
+            return sal_True;
         }
         pEntry = aEditTree.Next( pEntry );
     }
-    return FALSE;
+    return sal_False;
 }
 
 /******************************************************************
@@ -647,17 +647,17 @@ BOOL MsgEdit::Find( const String& s )
 
 ******************************************************************/
 
-BOOL MsgEdit::Load( const String& aName )
+sal_Bool MsgEdit::Load( const String& aName )
 {
     aLogFileName = aName;
-    BOOL bOk = TRUE, bFirstLine = TRUE;
-    BOOL bLoadError = FALSE;
+    sal_Bool bOk = sal_True, bFirstLine = sal_True;
+    sal_Bool bLoadError = sal_False;
     SvFileStream aStrm( aName, STREAM_STD_READ );
     if( aStrm.IsOpen() )
     {
         aEditTree.Clear();
         String aLine;
-        bFileLoading = TRUE;  // To avoid logging to disk
+        bFileLoading = sal_True;  // To avoid logging to disk
         TTLogMsg *pLogMsg = new TTLogMsg;
         while( !aStrm.IsEof() && bOk )
         {
@@ -667,7 +667,7 @@ BOOL MsgEdit::Load( const String& aName )
                 aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 );
 
             if( aStrm.GetError() != SVSTREAM_OK )
-                bOk = FALSE;
+                bOk = sal_False;
 
 #define TOKEN( n ) aLine.GetToken( n )
 
@@ -677,9 +677,9 @@ BOOL MsgEdit::Load( const String& aName )
                 TTDebugData aDebugData;
                 aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() );
                 aDebugData.aFilename = TOKEN(1);
-                aDebugData.nLine = USHORT( TOKEN(2).ToInt32() );
-                aDebugData.nCol1 = USHORT( TOKEN(3).ToInt32() );
-                aDebugData.nCol2 = USHORT( TOKEN(4).ToInt32() );
+                aDebugData.nLine = sal_uInt16( TOKEN(2).ToInt32() );
+                aDebugData.nCol1 = sal_uInt16( TOKEN(3).ToInt32() );
+                aDebugData.nCol2 = sal_uInt16( TOKEN(4).ToInt32() );
                 aDebugData.aMsg = aLine.GetQuotedToken( 5, CUniString("\"\"") );
                 
                 // Remove leading and trailing quotes
@@ -692,13 +692,13 @@ BOOL MsgEdit::Load( const String& aName )
                 AddAnyMsg( pLogMsg );
             }
             else if ( bFirstLine && (aLine.Search( VERSION_STRING ) == 0) )
-                nVersion = USHORT( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
+                nVersion = sal_uInt16( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
             else if ( aLine.Len() )
-                bLoadError = TRUE;
+                bLoadError = sal_True;
 
-            bFirstLine = FALSE;
+            bFirstLine = sal_False;
         }
-        bFileLoading = FALSE;
+        bFileLoading = sal_False;
         delete pLogMsg;
         aStrm.Close();
         if ( nVersion < 2 && !bLoadError )
@@ -706,16 +706,16 @@ BOOL MsgEdit::Load( const String& aName )
 
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
-BOOL MsgEdit::Save( const String& aName )
+sal_Bool MsgEdit::Save( const String& aName )
 {
-    BOOL bOk = TRUE;
-    BOOL bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
+    sal_Bool bOk = sal_True;
+    sal_Bool bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
     if ( bIsText && !QueryBox( NULL, SttResId( IDS_LOSS_OF_INFORMATION ) ).Execute() )
-        return FALSE;
+        return sal_False;
     SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
     if( aStrm.IsOpen() )
     {
@@ -753,16 +753,16 @@ BOOL MsgEdit::Save( const String& aName )
             }
         }
         if( aStrm.GetError() != SVSTREAM_OK )
-            bOk = FALSE;
+            bOk = sal_False;
         else
         {
-            bModified = FALSE;
+            bModified = sal_False;
             lModify.Call( NULL );
         }
 
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
@@ -774,7 +774,7 @@ TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinSt
 //, nDeselectParent(0)
 {}
 
-BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
+sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
 {
     if ( pThisEntry && pThisEntry->GetUserData() && ((TTDebugData*)pThisEntry->GetUserData())->aFilename.Len() > 0 )
     {
@@ -810,20 +810,20 @@ BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
 
         if ( pBasicFrame->pWork && pBasicFrame->pWork->ISA(AppEdit) )
             ((AppEdit*)pBasicFrame->pWork)->Highlight( aData->nLine, aData->nCol1, aData->nCol2 );
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL TTTreeListBox::DoubleClickHdl()
+sal_Bool TTTreeListBox::DoubleClickHdl()
 {
     return JumpToSourcecode( GetHdlEntry() );
 }
 
-/*ULONG TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, BOOL bSelect )
+/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
 {
     SvLBoxEntry *pEntry = FirstChild( pParent );
-    ULONG nRet = 0;
+    sal_uIntPtr nRet = 0;
     while ( pEntry )
     {
         nRet++;
@@ -838,8 +838,8 @@ void TTTreeListBox::SelectHdl()
 {
     SvLBoxEntry* pHdlEntry = GetHdlEntry();
 
-    SelectChildren( pHdlEntry, TRUE );
-    Select( pHdlEntry, TRUE );
+    SelectChildren( pHdlEntry, sal_True );
+    Select( pHdlEntry, sal_True );
 //	InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT ));	// so that delete works correct
 }
 
@@ -849,13 +849,13 @@ void TTTreeListBox::DeselectHdl()
     if ( GetParent( pHdlEntry ) )
     {
         nDeselectParent++;
-        Select( GetParent( pHdlEntry ), FALSE );
+        Select( GetParent( pHdlEntry ), sal_False );
         nDeselectParent--;
     }
     if ( !nDeselectParent )
     {
-        SelectChildren( pHdlEntry, FALSE );
-        Select( pHdlEntry, FALSE );
+        SelectChildren( pHdlEntry, sal_False );
+        Select( pHdlEntry, sal_False );
     }
     Invalidate();
 } */
@@ -926,15 +926,15 @@ class TTLBoxString : public SvLBoxString
 {
 public:
 
-    TTLBoxString( SvLBoxEntry* pEntry, USHORT nFlags,
+    TTLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
         const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
 
-    virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+    virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
         SvLBoxEntry* pEntry);
 };
 
 
-void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
     SvLBoxEntry* pEntry )
 {
     TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry );
@@ -958,7 +958,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
         else
         {
             aFont.SetFillColor( aCol );
-            aFont.SetTransparent( FALSE );
+            aFont.SetTransparent( sal_False );
             Color aCol2( COL_BLACK );
             aFont.SetColor( aCol2 );
         }
@@ -984,7 +984,7 @@ void TTTreeListBox::InitEntry(SvLBoxEntry* pEntry,
     const String& rStr ,const Image& rImg1, const Image& rImg2,
     SvLBoxButtonKind eButtonKind )
 {
-    USHORT nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
+    sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nColToHilite );
     TTLBoxString* pStr = new TTLBoxString( pEntry, 0, pCol->GetText() );
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 7dc7117a8b..d408809acd 100644..100755
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -38,7 +38,7 @@ class AppError;
 
 #define SelectChildren SelectChilds
 
-typedef USHORT TTFeatures;			// Bitfield for features of the entries
+typedef sal_uInt16 TTFeatures;			// Bitfield for features of the entries
 #define HasNothing	TTFeatures(0x00)
 #define HasError	TTFeatures(0x01)
 #define HasWarning	TTFeatures(0x02)
@@ -50,13 +50,13 @@ class TTTreeListBox : public SvTreeListBox
 {
 protected:
 //	virtual void	Command( const CommandEvent& rCEvt );
-//	USHORT			nDeselectParent;
+//	sal_uInt16			nDeselectParent;
     BasicFrame		*pBasicFrame;
     void			InitEntry( SvLBoxEntry*, const String&, const Image&,
                                const Image&, SvLBoxButtonKind eButtonKind );
     AppError		*pAppError;
 
-    BOOL JumpToSourcecode( SvLBoxEntry *pThisEntry );
+    sal_Bool JumpToSourcecode( SvLBoxEntry *pThisEntry );
 
 public:
     TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 );
@@ -64,11 +64,11 @@ public:
 
 //	virtual void	SelectHdl();
 //	virtual void	DeselectHdl();
-    virtual BOOL	DoubleClickHdl();
+    virtual sal_Bool	DoubleClickHdl();
 
     virtual void	KeyInput( const KeyEvent& rKEvt );
 
-//	ULONG			SelectChildren( SvLBoxEntry* pParent, BOOL bSelect );
+//	sal_uIntPtr			SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
     TTFeatures		GetFeatures( SvLBoxEntry* );
 };
 
@@ -80,20 +80,20 @@ class MsgEdit : public DataEdit
     SvLBoxEntry *pCurrentTestCase;
     SvLBoxEntry *pCurrentAssertion;
     SvLBoxEntry *pCurrentError;
-    BOOL bModified;
+    sal_Bool bModified;
     Link lModify;
-    BOOL bFileLoading;		// TRUE while loading a file
+    sal_Bool bFileLoading;		// sal_True while loading a file
     String Impl_MakeText( SvLBoxEntry *pEntry ) const;
     String Impl_MakeSaveText( SvLBoxEntry *pEntry ) const;
     String Impl_MakeSaveText( TTDebugData aData ) const;
-    USHORT nVersion;		// Stores file version
+    sal_uInt16 nVersion;		// Stores file version
     AppError* pAppError;
     String aLogFileName;
 
-    static USHORT nMaxLogLen;
-    static BOOL bLimitLogLen;
-    static BOOL bPrintLogToStdout;
-    static BOOL bPrintLogToStdoutSet;   // has it been initialized yet
+    static sal_uInt16 nMaxLogLen;
+    static sal_Bool bLimitLogLen;
+    static sal_Bool bPrintLogToStdout;
+    static sal_Bool bPrintLogToStdoutSet;   // has it been initialized yet
 public:
     MsgEdit( AppError*, BasicFrame *pBF, const WinBits& );
     ~MsgEdit();
@@ -108,7 +108,7 @@ public:
     void AddAssertionStack( String aMsg, TTDebugData aDebugData );
     void AddQAError( String aMsg, TTDebugData aDebugData );
 
-    static void SetMaxLogLen( USHORT nLen ) { nMaxLogLen = nLen; bLimitLogLen = TRUE; }
+    static void SetMaxLogLen( sal_uInt16 nLen ) { nMaxLogLen = nLen; bLimitLogLen = sal_True; }
 DATA_FUNC_DEF( aEditTree, TTTreeListBox )
 };
 
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 727a1e18a4..5f1521da21 100644..100755
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(MyBasic,StarBASIC)
 class MyFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
 };
 
 static SampleObjectFac aFac1;
@@ -68,7 +68,7 @@ static MyFactory aFac2;
 static ProcessFactory aProcessFac;
 static short nInst = 0;
 
-SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr )
+SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr )
 {
     if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC )
         return new MyBasic;
@@ -152,7 +152,7 @@ void MyBasic::LoadIniFile()
 {
 }
 
-SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl )
+SbTextType MyBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl )
 {
     (void) rSymbol;       /* avoid warning about unused parameter */
     (void) bWasTTControl; /* avoid warning about unused parameter */
@@ -179,7 +179,7 @@ void MyBasic::Reset()
     CurrentError = 0;
 }
 
-BOOL MyBasic::Compile( SbModule* p )
+sal_Bool MyBasic::Compile( SbModule* p )
 {
     Reset();
     return StarBASIC::Compile( p );
@@ -215,7 +215,7 @@ BasicError* MyBasic::FirstError()
     return NULL;
 }
 
-BOOL MyBasic::ErrorHdl()
+sal_Bool MyBasic::ErrorHdl()
 {
     AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() );
     if( !pWin )
@@ -233,12 +233,12 @@ BOOL MyBasic::ErrorHdl()
             );
         nError++;
         CurrentError = aErrors.size() - 1;
-        return BOOL( nError < 20 );	// Cancel after 20 errors
+        return sal_Bool( nError < 20 );	// Cancel after 20 errors
     }
     else
     {
         ReportRuntimeError( pWin );
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -255,7 +255,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
         GetCol1(), GetCol2() ).Show();
 }
 
-void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void MyBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
 {
     (void) bDebugFindNoErrors; /* avoid warning about unused parameter */
 }
@@ -265,7 +265,7 @@ const String MyBasic::GetSpechialErrorText()
     return GetErrorText();
 }
 
-USHORT MyBasic::BreakHdl()
+sal_uInt16 MyBasic::BreakHdl()
 {
     SbModule* pMod = GetActiveModule();
     if( pMod )
@@ -299,7 +299,7 @@ USHORT MyBasic::BreakHdl()
 ***************************************************************************/
 
 BasicError::BasicError
-    ( AppBasEd* w, USHORT nE, const String& r, USHORT nL, USHORT nC1, USHORT nC2 )
+    ( AppBasEd* w, sal_uInt16 nE, const String& r, sal_uInt16 nL, sal_uInt16 nC1, sal_uInt16 nC2 )
     : aText( SttResId( IDS_ERROR1 ) )
 {
     pWin  = w;
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index a1e8347b70..fce66defbf 100644..100755
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -88,7 +88,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
     // Disable PRINT-Menu
     MenuBar* pBar = pFrame->GetMenuBar();
     Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE );
-    pFileMenu->EnableItem( RID_FILEPRINT, FALSE );
+    pFileMenu->EnableItem( RID_FILEPRINT, sal_False );
 
     mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
     mpListener->StartPage();
@@ -107,7 +107,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
     
     Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() );
     nPage = 1;
-    pFileMenu->EnableItem( RID_FILEPRINT, TRUE );
+    pFileMenu->EnableItem( RID_FILEPRINT, sal_True );
 }
 
 
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index c6b8c8e390..c6b8c8e390 100644..100755
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 91e28de22a..02d27e3a7b 100644..100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -49,9 +49,9 @@ Process::Process()
 , m_nEnvCount( 0 )
 , m_pEnvList( NULL )
 , m_aProcessName()
+, bWasGPF( sal_False )
+, bHasBeenStarted( sal_False )
 , m_pProcess( NULL )
-, bWasGPF( FALSE )
-, bHasBeenStarted( FALSE )
 {
 }
 
@@ -77,7 +77,7 @@ Process::~Process()
 }
 
 
-BOOL Process::ImplIsRunning()
+sal_Bool Process::ImplIsRunning()
 {
     if ( m_pProcess && bHasBeenStarted )
     {
@@ -85,12 +85,12 @@ BOOL Process::ImplIsRunning()
         aProcessInfo.Size = sizeof(oslProcessInfo);
         osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
         if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
-            return TRUE;
+            return sal_True;
         else
-            return FALSE;
+            return sal_False;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 long Process::ImplGetExitCode()
@@ -166,17 +166,17 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
         ::rtl::OUString aNormalizedAppPath;
         osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
         m_aProcessName = aNormalizedAppPath;;
-        bHasBeenStarted = FALSE;
+        bHasBeenStarted = sal_False;
 
     }
 }
 
-BOOL Process::Start()
+sal_Bool Process::Start()
 { // Start program
-    BOOL bSuccess=FALSE;
+    sal_Bool bSuccess=sal_False;
     if ( m_aProcessName.getLength() && !ImplIsRunning() )
     {
-        bWasGPF = FALSE;
+        bWasGPF = sal_False;
 #ifdef WNT
         sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_NOGPFAULTERRORBOX);
         try
@@ -199,7 +199,7 @@ BOOL Process::Start()
         }
         catch( ... )
         {
-            bWasGPF = TRUE;
+            bWasGPF = sal_True;
             // TODO: Output debug message !!
         }
         nErrorMode = SetErrorMode(nErrorMode);
@@ -211,17 +211,17 @@ BOOL Process::Start()
     return bSuccess;
 }
 
-ULONG Process::GetExitCode()
+sal_uIntPtr Process::GetExitCode()
 { // ExitCode of program after execution
     return ImplGetExitCode();
 }
 
-BOOL Process::IsRunning()
+sal_Bool Process::IsRunning()
 {
     return ImplIsRunning();
 }
 
-BOOL Process::WasGPF()
+sal_Bool Process::WasGPF()
 { // Did the process fail?
 #ifdef WNT
     return ImplGetExitCode() == 3221225477;
@@ -230,11 +230,11 @@ BOOL Process::WasGPF()
 #endif
 }
 
-BOOL Process::Terminate()
+sal_Bool Process::Terminate()
 {
     if ( ImplIsRunning() )
         return osl_terminateProcess(m_pProcess) == osl_Process_E_None;
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index 6d2ffee3ab..f564b0ff05 100644..100755
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -44,10 +44,10 @@
 //    none
 // 2) Methods:
 //    SetImage( Filename )
-//    BOOL Start
-//    USHORT GetExitCode
-//    BOOL IsRunning
-//    BOOL WasGPF
+//    sal_Bool Start
+//    sal_uInt16 GetExitCode
+//    sal_Bool IsRunning
+//    sal_Bool WasGPF
 
 
 // This implementation is a sample for a table driven version that
@@ -63,7 +63,7 @@
 #define _BWRITE     0x0200  // can be used as Lvaluen
 #define _LVALUE     _BWRITE 
 #define _READWRITE  0x0300  // can read and written
-#define	_OPT		0x0400	// TRUE: optional parameter
+#define	_OPT		0x0400	// sal_True: optional parameter
 #define _METHOD     0x1000  // Mask-Bit for a method
 #define _PROPERTY   0x2000  // Mask-Bit for a property
 #define _COLL       0x4000  // Mask-Bit for a collection
@@ -124,12 +124,12 @@ SbxVariable* ProcessWrapper::Find( const String& rName, SbxClassType t )
         // otherwise search
         Methods* p = pMethods;
         short nIndex = 0;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         while( p->nArgs != -1 )
         {
             if( rName.EqualsIgnoreCaseAscii( p->pName ) )
             {
-                bFound = TRUE; break;
+                bFound = sal_True; break;
             }
             nIndex += ( p->nArgs & _ARGSMASK ) + 1;
             p = pMethods + nIndex;
@@ -164,22 +164,22 @@ void ProcessWrapper::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pNotifyPar = pVar->GetParameters();
-        USHORT nIndex = (USHORT) pVar->GetUserData();
+        sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
         // No index: put through
         if( nIndex )
         {
-            ULONG t = pHint->GetId();
+            sal_uIntPtr t = pHint->GetId();
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     // Parameter-Test for methods:
-                    USHORT nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
+                    sal_uInt16 nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
                     // Element 0 is the return value
                     if( ( !pNotifyPar && nPar )
                      || ( pNotifyPar && pNotifyPar->Count() < nPar+1 ) )
@@ -207,7 +207,7 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
     {
         p++;
         String aMethodName( p->pName, RTL_TEXTENCODING_ASCII_US );
-        USHORT nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nInfoFlags |= SBX_OPTIONAL;
         pResultInfo->AddParam( aMethodName, p->eType, nInfoFlags );
@@ -221,10 +221,10 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
 
 ////////////////////////////////////////////////////////////////////////////
 
-// Properties and methods save the return value in argv[0] (Get, bPut = FALSE)
-// and store the value from argv[0] (Put, bPut = TRUE)
+// Properties and methods save the return value in argv[0] (Get, bPut = sal_False)
+// and store the value from argv[0] (Put, bPut = sal_True)
 
-void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Imagefile of the executable
     (void) pVar; /* avoid warning about unused parameter */ 
     (void) bWriteIt; /* avoid warning about unused parameter */ 
@@ -234,28 +234,28 @@ void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL b
         pProcess->SetImage(pMethodePar->Get( 1 )->GetString(), String() );
 }
 
-void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program is started
     (void) pMethodePar; /* avoid warning about unused parameter */ 
     (void) bWriteIt; /* avoid warning about unused parameter */ 
     pVar->PutBool( pProcess->Start() );
 }
 
-void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // ExitCode of the program after it was finished
     (void) pMethodePar; /* avoid warning about unused parameter */ 
     (void) bWriteIt; /* avoid warning about unused parameter */ 
     pVar->PutULong( pProcess->GetExitCode() );
 }
 
-void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program is still running
     (void) pMethodePar; /* avoid warning about unused parameter */ 
     (void) bWriteIt; /* avoid warning about unused parameter */ 
     pVar->PutBool( pProcess->IsRunning() );
 }
 
-void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
 { // Program faulted with GPF etc.
     (void) pMethodePar; /* avoid warning about unused parameter */ 
     (void) bWriteIt; /* avoid warning about unused parameter */ 
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index 9d450441de..e6b5db3fb5 100644..100755
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -43,7 +43,7 @@ using SbxVariable::GetInfo;
 public:
 #endif
     typedef void( ProcessWrapper::*pMeth )
-        ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+        ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
 #if defined ( ICC )
 private:
 #endif
@@ -57,11 +57,11 @@ private:
     static Methods aProcessMethods[];	// Method table
     Methods *pMethods;	// Current method table
 
-    void PSetImage( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PStart( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PIsRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
-    void PWasGPF( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+    void PSetImage( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PStart( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PIsRunning( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+    void PWasGPF( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
 
     // Internal members and methods
     Process *pProcess;
diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 115c88e769..115c88e769 100644..100755
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.hrc
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index f46675c4cf..9d32dea0e9 100644..100755
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -73,7 +73,7 @@ void StatusLine::SetProfileName( const String& s )
 
 IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 {
-    USHORT nFirstWinPos=0;
+    sal_uInt16 nFirstWinPos=0;
     MenuBar* pMenu = pFrame->GetMenuBar();
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
 
@@ -82,14 +82,14 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 
     nFirstWinPos += pTTB->GetItemPos( pTTB->GetCurItemId() ) / 2;
 
-    USHORT x;
+    sal_uInt16 x;
     x = pTTB->GetItemPos( pTTB->GetCurItemId() );
     x = pWinMenu->GetItemId( nFirstWinPos );
     x = pWinMenu->GetItemCount();
     AppWin* pWin = pFrame->FindWin( pWinMenu->GetItemText( pWinMenu->GetItemId( nFirstWinPos ) ).EraseAllChars( L'~' ) );
     if ( pWin )
     {
-        pWin->Minimize( FALSE );
+        pWin->Minimize( sal_False );
         pWin->ToTop();
     }
     return 0;
@@ -97,7 +97,7 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
 
 void StatusLine::LoadTaskToolBox()
 {
-    USHORT nFirstWinPos=0;
+    sal_uInt16 nFirstWinPos=0;
     MenuBar* pMenu = pFrame->GetMenuBar();
     PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
 
diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx
index e594e80d94..e594e80d94 100644..100755
--- a/basic/source/app/status.hxx
+++ b/basic/source/app/status.hxx
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index f280bc8cca..3bc51c11bc 100644..100755
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "svtmsg.hrc"
+#include "basic/svtmsg.hrc"
 
 
 // Here are included the messages of the folder /basic/source/app
diff --git a/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx
index e11efa1d74..e11efa1d74 100644..100755
--- a/basic/source/app/testbasi.cxx
+++ b/basic/source/app/testbasi.cxx
diff --git a/basic/source/app/testtool.idl b/basic/source/app/testtool.idl
index 980b165b39..980b165b39 100644..100755
--- a/basic/source/app/testtool.idl
+++ b/basic/source/app/testtool.idl
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 5157e3ecb2..26d7741ce3 100644..100755
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "testtool.hrc"
+#include "basic/testtool.hrc"
 
 
 ///////////////////////////////
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 729e3c2e98..52bcbf1034 100644..100755
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -44,19 +44,19 @@
 TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits )
 : Window( pParent, aBits )
 , pAppEdit( pParent )
-, bHighlightning( FALSE )
-, bDoSyntaxHighlight( FALSE )
-, bDelayHighlight( TRUE )
+, bHighlightning( sal_False )
+, bDoSyntaxHighlight( sal_False )
+, bDelayHighlight( sal_True )
 , nTipId( 0 )
-, bViewMoved( FALSE )
+, bViewMoved( sal_False )
 {
     pTextEngine = new TextEngine();
     pTextEngine->SetMaxTextLen( STRING_MAXLEN );
-    pTextEngine->EnableUndo( TRUE );
+    pTextEngine->EnableUndo( sal_True );
 
     pTextView = new TextView( pTextEngine, this );
     pTextEngine->InsertView( pTextView );
-    pTextEngine->SetModified( FALSE );
+    pTextEngine->SetModified( sal_False );
 
     aSyntaxIdleTimer.SetTimeout( 200 );
     aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, TextEditImp, SyntaxTimerHdl ) );
@@ -79,10 +79,10 @@ TextEditImp::~TextEditImp()
     delete pTextEngine;
 }
 
-BOOL TextEditImp::ViewMoved()
+sal_Bool TextEditImp::ViewMoved()
 {
-    BOOL bOld = bViewMoved;
-    bViewMoved = FALSE;
+    sal_Bool bOld = bViewMoved;
+    bViewMoved = sal_False;
     return bOld;
 }
 
@@ -98,7 +98,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             pAppEdit->pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() );
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
                 ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->Scroll( 0, ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->GetCurYOffset() - pTextView->GetStartDocPos().Y() );
-            bViewMoved = TRUE;
+            bViewMoved = sal_True;
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
         {
@@ -114,8 +114,8 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
         {
-            ULONG nWidth = pTextEngine->CalcTextWidth();
-            if ( (ULONG)nWidth != pAppEdit->nCurTextWidth )
+            sal_uIntPtr nWidth = pTextEngine->CalcTextWidth();
+            if ( (sal_uIntPtr)nWidth != pAppEdit->nCurTextWidth )
             {
                 pAppEdit->nCurTextWidth = nWidth;
                 if ( pAppEdit->pHScroll )
@@ -128,12 +128,12 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, TRUE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_True );
         }
         else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, FALSE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_False );
 
             // Itchy adaption for two signs at line ends instead of one (hard coded default)
             pTextEngine->SetMaxTextLen( STRING_MAXLEN - pTextEngine->GetParagraphCount() );
@@ -188,12 +188,12 @@ int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
                 ( maFontWeight == ((const TextAttribSpechial&)rAttr).maFontWeight ) );
 }
 
-void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
+void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
 {
     SbTextPortions aPortionList;
     pAppEdit->GetBasicFrame()->Basic().Highlight( rSource, aPortionList );
 
-    USHORT nCount = aPortionList.Count();
+    sal_uInt16 nCount = aPortionList.Count();
     if ( !nCount )
         return;
 
@@ -210,8 +210,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     }
 
     // here is the postprocessing for types for the TestTool
-    USHORT i;
-    BOOL bWasTTControl = FALSE;
+    sal_uInt16 i;
+    sal_Bool bWasTTControl = sal_False;
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -228,20 +228,20 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                     r.eType = pAppEdit->GetBasicFrame()->Basic().GetSymbolType( aSymbol, bWasTTControl );
 
                     if ( r.eType == TT_CONTROL )
-                        bWasTTControl = TRUE;
+                        bWasTTControl = sal_True;
                     else
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             case SB_PUNCTUATION:
                 {
                      String aPunctuation = rSource.Copy( r.nStart, r.nEnd - r.nStart +1 );
                     if ( aPunctuation.CompareToAscii( "." ) != COMPARE_EQUAL )
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             default:
-                bWasTTControl = FALSE;
+                bWasTTControl = sal_False;
         }
     }
 
@@ -271,7 +271,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                 r.nEnd = rSource.Len()-1;
         }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -280,7 +280,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
 
         SbTextType eCol = r.eType;
         Color aColor;
-        ULONG nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
+        sal_uIntPtr nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
         switch ( +eCol )
         {
             case SB_KEYWORD:
@@ -333,7 +333,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     pTextEngine->SetModified( bWasModified );
 }
 
-void TextEditImp::DoSyntaxHighlight( ULONG nPara )
+void TextEditImp::DoSyntaxHighlight( sal_uIntPtr nPara )
 {
     // Due to delayed syntax highlight it can happen that the
     // paragraph does no longer exist
@@ -355,7 +355,7 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
     {
         if ( bDelayHighlight )
         {
-            aSyntaxLineTable.Insert( nPara, (void*)(ULONG)1 );
+            aSyntaxLineTable.Insert( nPara, (void*)(sal_uIntPtr)1 );
             aSyntaxIdleTimer.Start();
         }
         else
@@ -366,32 +366,32 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
 IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
 {
     DBG_ASSERT( pTextView, "Not yet a View but Syntax-Highlight ?!" );
-    pTextEngine->SetUpdateMode( FALSE );
+    pTextEngine->SetUpdateMode( sal_False );
 
-    bHighlightning = TRUE;
-    USHORT nLine;
+    bHighlightning = sal_True;
+    sal_uInt16 nLine;
     while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
     {
-        nLine = (USHORT)aSyntaxLineTable.GetCurKey();
+        nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
         DoSyntaxHighlight( nLine );
         aSyntaxLineTable.Remove( nLine );
     }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     if ( aSyntaxLineTable.Count() > 3 ) 				// Without VDev
     {
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor( TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor( sal_True, sal_True );
     }
     else
-        pTextEngine->SetUpdateMode( TRUE );				// ! With VDev
+        pTextEngine->SetUpdateMode( sal_True );				// ! With VDev
 
-    // SetUpdateMode( TRUE ) soll kein Modify setzen
+    // SetUpdateMode( sal_True ) soll kein Modify setzen
     pTextEngine->SetModified( bWasModified );
 
     // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
     // => gute Gelegenheit, Textbreite zu ermitteln!
-    bHighlightning = FALSE;
+    bHighlightning = sal_False;
 
     if ( aSyntaxLineTable.First() )
         aImplSyntaxIdleTimer.Start();
@@ -405,7 +405,7 @@ void TextEditImp::InvalidateSyntaxHighlight()
         DoDelayedSyntaxHighlight( i );
 }
 
-void TextEditImp::SyntaxHighlight( BOOL bNew )
+void TextEditImp::SyntaxHighlight( sal_Bool bNew )
 {
     if ( ( bNew && bDoSyntaxHighlight ) || ( !bNew && !bDoSyntaxHighlight ) )
         return;
@@ -422,12 +422,12 @@ void TextEditImp::SyntaxHighlight( BOOL bNew )
     else
     {
         aSyntaxIdleTimer.Stop();
-        pTextEngine->SetUpdateMode( FALSE );
-        for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ )
+        pTextEngine->SetUpdateMode( sal_False );
+        for ( sal_uIntPtr i = 0; i < pTextEngine->GetParagraphCount(); i++ )
             pTextEngine->RemoveAttribs( i );
 
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor(TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor(sal_True, sal_True );
     }
 }
 
@@ -437,15 +437,15 @@ void TextEditImp::SetFont( const Font& rNewFont )
     pTextEngine->SetFont(rNewFont);
 }
 
-BOOL TextEditImp::IsModified()
+sal_Bool TextEditImp::IsModified()
 {
     return pTextEngine->IsModified();
 }
 
 void TextEditImp::KeyInput( const KeyEvent& rKeyEvent )
 {
-    BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
-    pTextView->GetTextEngine()->SetModified( FALSE );
+    sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+    pTextView->GetTextEngine()->SetModified( sal_False );
 
     if ( !pTextView->KeyInput( rKeyEvent ) )
         Window::KeyInput( rKeyEvent );
@@ -526,10 +526,10 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
         if ( aSuffixes.Search( aWord.GetChar(nLastChar) ) != STRING_NOTFOUND )
             aWord.Erase( nLastChar, 1 );
         // because perhaps TestTools throws an error
-        BOOL bWasError = SbxBase::IsError();
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
+        sal_Bool bWasError = SbxBase::IsError();
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_True );
         SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_False );
         DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
         if ( !bWasError && SbxBase::IsError() )
             SbxBase::ResetError();
@@ -655,8 +655,8 @@ DBG_NAME(TextEdit)
 
 TextEdit::TextEdit( AppEdit* pParent, const WinBits& aBits )
 : pBreakpointWindow( NULL )
-, bFileWasUTF8( FALSE )
-, bSaveAsUTF8( FALSE )
+, bFileWasUTF8( sal_False )
+, bSaveAsUTF8( sal_False )
 , aEdit( pParent, aBits | WB_NOHIDESELECTION )
 {
 DBG_CTOR(TextEdit,0);
@@ -665,7 +665,7 @@ DBG_CTOR(TextEdit,0);
 TextEdit::~TextEdit()
 {DBG_DTOR(TextEdit,0);}
 
-void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
+void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
 {
     if ( nLine )    // Should not occure but at 'Sub expected' in first line
         nLine--;
@@ -691,7 +691,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
     // Because nCol2 *may* point after the current statement
     // (because the next one starts there) there are space
     // that must be removed
-    BOOL bColon = FALSE;
+    sal_Bool bColon = sal_False;
 
     while ( s.GetChar( nCol2 ) == ' ' && nCol2 > nCol1 && !bColon )
     {
@@ -699,7 +699,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
         if ( s.GetChar( nCol2 ) == ':' )
         {
             nCol2--;
-            bColon = TRUE;
+            bColon = sal_True;
         }
     }
 
@@ -724,31 +724,31 @@ String TextEdit::GetSelected(){ return aEdit.pTextView->GetSelected(); }
 TextSelection TextEdit::GetSelection() const{ return aEdit.pTextView->GetSelection(); }
 void TextEdit::SetSelection( const TextSelection& rSelection ){ aEdit.pTextView->SetSelection( rSelection ); }
 
-USHORT TextEdit::GetLineNr() const
+sal_uInt16 TextEdit::GetLineNr() const
 {
-    return sal::static_int_cast< USHORT >(
+    return sal::static_int_cast< sal_uInt16 >(
         aEdit.pTextView->GetSelection().GetEnd().GetPara()+1);
 }
 
 void TextEdit::ReplaceSelected( const String& rStr ){ aEdit.pTextView->InsertText(rStr); }
-BOOL TextEdit::IsModified(){ return aEdit.IsModified(); }
+sal_Bool TextEdit::IsModified(){ return aEdit.IsModified(); }
 
 String TextEdit::GetText() const
 {
     return aEdit.pTextEngine->GetText( GetSystemLineEnd() );
 }
 
-void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( FALSE ); }
+void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( sal_False ); }
 void TextEdit::SetModifyHdl( Link l ){ aEdit.SetModifyHdl(l); }
-BOOL TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
+sal_Bool TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
 
 // Search from the beginning or at mark + 1
-BOOL TextEdit::Find( const String& s )
+sal_Bool TextEdit::Find( const String& s )
 {
     DBG_CHKTHIS(TextEdit,0);
 
     TextSelection aSelection = aEdit.pTextView->GetSelection();
-    ULONG nPara = aSelection.GetStart().GetPara();
+    sal_uIntPtr nPara = aSelection.GetStart().GetPara();
     xub_StrLen nIndex = aSelection.GetStart().GetIndex();
 
     if ( aSelection.HasRange() )
@@ -762,23 +762,23 @@ BOOL TextEdit::Find( const String& s )
         if( nIndex != STRING_NOTFOUND )
         {
             aEdit.pTextView->SetSelection( TextSelection( TextPaM( nPara, nIndex ), TextPaM( nPara, nIndex + s.Len() ) ) );
-            return TRUE;
+            return sal_True;
         }
         nIndex = 0;
         nPara++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL TextEdit::Load( const String& aName )
+sal_Bool TextEdit::Load( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_READ );
     if( aStrm.IsOpen() )
     {
         String aText, aLine, aLineBreak;
-        BOOL bIsFirstLine = TRUE;
+        sal_Bool bIsFirstLine = sal_True;
         aLineBreak += '\n';
         aLineBreak.ConvertLineEnd();
         rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
@@ -788,29 +788,29 @@ DBG_CHKTHIS(TextEdit,0);
             if ( bIsFirstLine && IsTTSignatureForUnicodeTextfile( aLine ) )
             {
                 aFileEncoding = RTL_TEXTENCODING_UTF8;
-                bFileWasUTF8 = TRUE;
+                bFileWasUTF8 = sal_True;
             }
             else
             {
                 if ( !bIsFirstLine )
                     aText += aLineBreak;
                 aText += aLine;
-                bIsFirstLine = FALSE;
+                bIsFirstLine = sal_False;
             }
             if( aStrm.GetError() != SVSTREAM_OK )
-                bOk = FALSE;
+                bOk = sal_False;
         }
         SetText( aText );
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
-BOOL TextEdit::Save( const String& aName )
+sal_Bool TextEdit::Save( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
     rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
     if( aStrm.IsOpen() )
@@ -825,10 +825,10 @@ DBG_CHKTHIS(TextEdit,0);
         aSave.ConvertLineEnd(LINEEND_LF);
         aStrm << ByteString( aSave, aFileEncoding ).GetBuffer();
         if( aStrm.GetError() != SVSTREAM_OK )
-            bOk = FALSE;
+            bOk = sal_False;
         else
-            aEdit.pTextEngine->SetModified(FALSE);
-    } else bOk = FALSE;
+            aEdit.pTextEngine->SetModified(sal_False);
+    } else bOk = sal_False;
     return bOk;
 }
 
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index de176f4a11..90e1763e72 100644..100755
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -49,7 +49,7 @@ class TextEditImp : public Window, public SfxListener
 using Window::Notify;
 
 protected:
-    void			DoSyntaxHighlight( ULONG nPara );
+    void			DoSyntaxHighlight( sal_uIntPtr nPara );
 
 
 private:
@@ -63,10 +63,10 @@ private:
 
     void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void			ImpDoHighlight( const String& rSource, ULONG nLineOff );
-    BOOL			bHighlightning;
-    BOOL			bDoSyntaxHighlight;
-    BOOL			bDelayHighlight;
+    void			ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff );
+    sal_Bool			bHighlightning;
+    sal_Bool			bDoSyntaxHighlight;
+    sal_Bool			bDelayHighlight;
 
 
     SbxBase* GetSbxAtMousePos( String &aWord );
@@ -75,12 +75,12 @@ private:
     DECL_LINK( ShowVarContents, void* );
     Point aTipPos;
     String aTipWord;
-    ULONG nTipId;
+    sal_uIntPtr nTipId;
 
     Timer HideTipTimer;
     Timer ShowTipTimer;
 
-    BOOL bViewMoved;
+    sal_Bool bViewMoved;
 
 public:
     TextEditImp( AppEdit *pParent, const WinBits& aBits );
@@ -90,7 +90,7 @@ public:
     TextView *pTextView;
 
     void SetFont( const Font& rNewFont );
-    BOOL IsModified();
+    sal_Bool IsModified();
     void SetModifyHdl( Link l ){ ModifyHdl = l; }
 
     void				KeyInput( const KeyEvent& rKeyEvent );
@@ -99,14 +99,14 @@ public:
     void				MouseButtonDown( const MouseEvent& rMouseEvent );
 //	void				MouseMove( const MouseEvent& rMouseEvent );
     void				Command( const CommandEvent& rCEvt );
-    //BOOL				Drop( const DropEvent& rEvt );
-    //BOOL				QueryDrop( DropEvent& rEvt );
+    //sal_Bool				Drop( const DropEvent& rEvt );
+    //sal_Bool				QueryDrop( DropEvent& rEvt );
 
-    BOOL				ViewMoved();
+    sal_Bool				ViewMoved();
 
     void DoDelayedSyntaxHighlight( xub_StrLen nPara );
     void InvalidateSyntaxHighlight();
-    void SyntaxHighlight( BOOL bNew );
+    void SyntaxHighlight( sal_Bool bNew );
     void BuildKontextMenu( PopupMenu *&pMenu );
 };
 
@@ -116,13 +116,13 @@ DBG_NAMEEX(TextEdit)
 class TextEdit : public DataEdit {
 
     BreakpointWindow	*pBreakpointWindow;
-    BOOL bFileWasUTF8;
-    BOOL bSaveAsUTF8;
+    sal_Bool bFileWasUTF8;
+    sal_Bool bSaveAsUTF8;
 
 public:
     TextEdit( AppEdit*, const WinBits& );
     ~TextEdit();
-    void Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+    void Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
     TextEditImp& GetTextEditImp() { return aEdit; }
 
     void				SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; }
@@ -132,7 +132,7 @@ public:
 
     virtual void BuildKontextMenu( PopupMenu *&pMenu );
 
-    void SaveAsUTF8( BOOL bUTF8 ) { bSaveAsUTF8 = bUTF8; }
+    void SaveAsUTF8( sal_Bool bUTF8 ) { bSaveAsUTF8 = bUTF8; }
 };
 
 #endif
diff --git a/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx
index cbe6e37b22..cbe6e37b22 100644..100755
--- a/basic/source/app/ttbasic.cxx
+++ b/basic/source/app/ttbasic.cxx
diff --git a/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx
index aa00588297..aa00588297 100644..100755
--- a/basic/source/app/ttbasic.hxx
+++ b/basic/source/app/ttbasic.hxx
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index dd75f7b1e0..876a7697f5 100644..100755
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "ttmsg.hrc"
+#include "basic/ttmsg.hrc"
 
 
 // Here are included the messages of the folder /basic/source/testtool
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 7c0cb01eb6..3d45f41fab 100644..100755
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -138,9 +138,17 @@ namespace basic
                 impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel );
 
         /** creates a new BasicManager instance for the given model
+
+            @param _out_rpBasicManager
+                reference to the pointer variable that will hold the new
+                BasicManager.
+
+            @param _rxDocumentModel
+                the model whose BasicManager will be created. Must not be <NULL/>.
         */
-        BasicManagerPointer
-                impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel );
+        void impl_createManagerForModel(
+                    BasicManagerPointer& _out_rpBasicManager,
+                    const Reference< XModel >& _rxDocumentModel );
 
         /** creates the application-wide BasicManager
         */
@@ -243,9 +251,17 @@ namespace basic
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
+        /*  #163556# (DR) - This function may be called recursively while
+            constructing the Basic manager and loading the Basic storage. By
+            passing the map entry received from impl_getLocationForModel() to
+            the function impl_createManagerForModel(), the new Basic manager
+            will be put immediately into the map of existing Basic managers,
+            thus a recursive call of this function will find and return it
+            without creating another instance.
+         */
         BasicManagerPointer& pBasicManager = impl_getLocationForModel( _rxDocumentModel );
         if ( pBasicManager == NULL )
-            pBasicManager = impl_createManagerForModel( _rxDocumentModel );
+            impl_createManagerForModel( pBasicManager, _rxDocumentModel );
 
         return pBasicManager;
     }
@@ -407,21 +423,21 @@ namespace basic
     }
 
     //--------------------------------------------------------------------
-    BasicManagerPointer ImplRepository::impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel )
+    void ImplRepository::impl_createManagerForModel( BasicManagerPointer& _out_rpBasicManager, const Reference< XModel >& _rxDocumentModel )
     {
         StarBASIC* pAppBasic = impl_getDefaultAppBasicLibrary();
 
-        BasicManager* pBasicManager( NULL );
+        _out_rpBasicManager = 0;
         Reference< XStorage > xStorage;
         if ( !impl_getDocumentStorage_nothrow( _rxDocumentModel, xStorage ) )
             // the document is not able to provide the storage it is based on.
-            return pBasicManager;
+            return;
 
         Reference< XPersistentLibraryContainer > xBasicLibs;
         Reference< XPersistentLibraryContainer > xDialogLibs;
         if ( !impl_getDocumentLibraryContainers_nothrow( _rxDocumentModel, xBasicLibs, xDialogLibs ) )
             // the document does not have BasicLibraries and DialogLibraries
-            return pBasicManager;
+            return;
 
         if ( xStorage.is() )
         {
@@ -432,24 +448,24 @@ namespace basic
 
             // Storage and BaseURL are only needed by binary documents!
             SotStorageRef xDummyStor = new SotStorage( ::rtl::OUString() );
-            pBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
+            _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
                                                                 pAppBasic,
-                                                                &aAppBasicDir, TRUE );
-            if ( pBasicManager->HasErrors() )
+                                                                &aAppBasicDir, sal_True );
+            if ( _out_rpBasicManager->HasErrors() )
             {
                 // handle errors
-                BasicError* pErr = pBasicManager->GetFirstError();
+                BasicError* pErr = _out_rpBasicManager->GetFirstError();
                 while ( pErr )
                 {
                     // show message to user
                     if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( pErr->GetErrorId() ) )
                     {
                         // user wants to break loading of BASIC-manager
-                        BasicManagerCleaner::deleteBasicManager( pBasicManager );
+                        BasicManagerCleaner::deleteBasicManager( _out_rpBasicManager );
                         xStorage.clear();
                         break;
                     }
-                    pErr = pBasicManager->GetNextError();
+                    pErr = _out_rpBasicManager->GetNextError();
                 }
             }
         }
@@ -460,14 +476,14 @@ namespace basic
             // create new BASIC-manager
             StarBASIC* pBasic = new StarBASIC( pAppBasic );
             pBasic->SetFlag( SBX_EXTSEARCH );
-            pBasicManager = new BasicManager( pBasic, NULL, TRUE );
+            _out_rpBasicManager = new BasicManager( pBasic, NULL, sal_True );
         }
 
         // knit the containers with the BasicManager
         LibraryContainerInfo aInfo( xBasicLibs, xDialogLibs, dynamic_cast< OldBasicPassword* >( xBasicLibs.get() ) );
         OSL_ENSURE( aInfo.mpOldBasicPassword, "ImplRepository::impl_createManagerForModel: wrong BasicLibraries implementation!" );
-        pBasicManager->SetLibraryContainerInfo( aInfo );
-        //pBasicCont->setBasicManager( pBasicManager );
+        _out_rpBasicManager->SetLibraryContainerInfo( aInfo );
+        //pBasicCont->setBasicManager( _out_rpBasicManager );
             // that's not needed anymore today. The containers will retrieve their associated
             // BasicManager from the BasicManagerRepository, when needed.
 
@@ -475,13 +491,13 @@ namespace basic
         impl_initDocLibraryContainers_nothrow( xBasicLibs, xDialogLibs );
 
         // so that also dialogs etc. could be 'qualified' addressed
-        pBasicManager->GetLib(0)->SetParent( pAppBasic );
+        _out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
 
         // global properties in the document's Basic
-        pBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+        _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
 
         // notify
-        impl_notifyCreationListeners( _rxDocumentModel, *pBasicManager );
+        impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
 
         // register as listener for this model being disposed/closed
         Reference< XComponent > xDocumentComponent( _rxDocumentModel, UNO_QUERY );
@@ -489,9 +505,14 @@ namespace basic
         startComponentListening( xDocumentComponent );
 
         // register as listener for the BasicManager being destroyed
-        StartListening( *pBasicManager );
+        StartListening( *_out_rpBasicManager );
+
+        // #i104876: Library container must not be modified just after
+        // creation. This happens as side effect when creating default
+        // "Standard" libraries and needs to be corrected here
+        xBasicLibs->setModified( sal_False );
+        xDialogLibs->setModified( sal_False );
 
-        return pBasicManager;
     }
 
     //--------------------------------------------------------------------
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 63a0708f83..8ac6e7e039 100644..100755
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -43,6 +43,8 @@
 #include <tools/diagnose_ex.h>
 #include <basic/sbmod.hxx>
 #include <basic/sbobjmod.hxx>
+#include <unotools/intlwrapper.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <basic/sbuno.hxx>
 #include <basic/basmgr.hxx>
@@ -94,15 +96,15 @@ typedef vector< BasicError* > BasErrorLst;
 #define CURR_VER		2
 
 // Version 1
-//	  ULONG 	nEndPos
-//	  USHORT 	nId
-//	  USHORT	nVer
-//	  BOOL		bDoLoad
+//	  sal_uIntPtr 	nEndPos
+//	  sal_uInt16 	nId
+//	  sal_uInt16	nVer
+//	  sal_Bool		bDoLoad
 //	  String	LibName
 //	  String	AbsStorageName
 //	  String	RelStorageName
 // Version 2
-//	+ BOOL		bReference
+//	+ sal_Bool		bReference
 
 static const char* szStdLibName = "Standard";
 static const char szBasicStorage[] = "StarBASIC";
@@ -254,7 +256,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
         }
     }
 
-    pLib->SetModified( FALSE );
+    pLib->SetModified( sal_False );
 }
 
 
@@ -312,7 +314,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
                 }
                 else
                     pLib->MakeModule32( aName, aMod );
-                pLib->SetModified( FALSE );
+                pLib->SetModified( sal_False );
             }
         }
     }
@@ -346,7 +348,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
         else
                 pLib->MakeModule32( aName, aMod );
 
-        pLib->SetModified( FALSE );
+        pLib->SetModified( sal_False );
     }
 }
 
@@ -366,8 +368,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
         StarBASIC* pLib = mpMgr->GetLib( aName );
         if( pLib )
         {
-            USHORT nLibId = mpMgr->GetLibId( aName );
-            mpMgr->RemoveLib( nLibId, FALSE );
+            sal_uInt16 nLibId = mpMgr->GetLibId( aName );
+            mpMgr->RemoveLib( nLibId, sal_False );
         }
     }
     else
@@ -377,7 +379,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
         if( pMod )
         {
             pLib->Remove( pMod );
-            pLib->SetModified( FALSE );
+            pLib->SetModified( sal_False );
         }
     }
 }
@@ -452,7 +454,7 @@ BasicError::BasicError()
     nReason 	= 0;
 }
 
-BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) :
+BasicError::BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr ) :
     aErrStr( rErrStr )
 {
     nErrorId 	= nId;
@@ -478,10 +480,10 @@ private:
     String			aRelStorageName;
     String			aPassword;
 
-    BOOL			bDoLoad;
-    BOOL			bReference;
-    BOOL			bPasswordVerified;
-    BOOL			bFoundInPath;	// Must not relativated again!
+    sal_Bool			bDoLoad;
+    sal_Bool			bReference;
+    sal_Bool			bPasswordVerified;
+    sal_Bool			bFoundInPath;	// Must not relativated again!
 
     // Lib represents library in new UNO library container
     Reference< XLibraryContainer > mxScriptCont;
@@ -490,10 +492,10 @@ public:
     BasicLibInfo();
     BasicLibInfo( const String& rStorageName );
 
-    BOOL			IsReference() const		{ return bReference; }
-    BOOL&			IsReference()			{ return bReference; }
+    sal_Bool			IsReference() const		{ return bReference; }
+    sal_Bool&			IsReference()			{ return bReference; }
 
-    BOOL			IsExtern() const 		{ return ! aStorageName.EqualsAscii(szImbedded); }
+    sal_Bool			IsExtern() const 		{ return ! aStorageName.EqualsAscii(szImbedded); }
 
     void			SetStorageName( const String& rName )	{ aStorageName = rName; }
     const String&	GetStorageName() const					{ return aStorageName; }
@@ -516,19 +518,19 @@ public:
     void			SetLibName( const String& rName )	{ aLibName = rName; }
 
     // Only temporary for Load/Save
-    BOOL			DoLoad()							{ return bDoLoad; }
+    sal_Bool			DoLoad()							{ return bDoLoad; }
 
-    BOOL			HasPassword() const 				{ return aPassword.Len() != 0; }
+    sal_Bool			HasPassword() const 				{ return aPassword.Len() != 0; }
     const String&	GetPassword() const					{ return aPassword; }
     void			SetPassword( const String& rNewPassword )
                                                         { aPassword = rNewPassword;	}
-    BOOL			IsPasswordVerified() const			{ return bPasswordVerified; }
-    void			SetPasswordVerified()				{ bPasswordVerified = TRUE; }
+    sal_Bool			IsPasswordVerified() const			{ return bPasswordVerified; }
+    void			SetPasswordVerified()				{ bPasswordVerified = sal_True; }
 
-    BOOL			IsFoundInPath() const				{ return bFoundInPath; }
-    void			SetFoundInPath( BOOL bInPath )		{ bFoundInPath = bInPath; }
+    sal_Bool			IsFoundInPath() const				{ return bFoundInPath; }
+    void			SetFoundInPath( sal_Bool bInPath )		{ bFoundInPath = bInPath; }
 
-    void 					Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo );
+    void 					Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo );
     static BasicLibInfo*	Create( SotStorageStream& rSStream );
 
     Reference< XLibraryContainer > GetLibraryContainer( void )
@@ -644,10 +646,10 @@ BasicLibInfo* BasicLibs::Remove( BasicLibInfo* LibInfo )
 
 BasicLibInfo::BasicLibInfo()
 {
-    bReference 			= FALSE;
-    bPasswordVerified 	= FALSE;
-    bDoLoad 			= FALSE;
-    bFoundInPath		= FALSE;
+    bReference 			= sal_False;
+    bPasswordVerified 	= sal_False;
+    bDoLoad 			= sal_False;
+    bFoundInPath		= sal_False;
     mxScriptCont    	= NULL;
     aStorageName 		= String::CreateFromAscii(szImbedded);
     aRelStorageName 	= String::CreateFromAscii(szImbedded);
@@ -655,20 +657,20 @@ BasicLibInfo::BasicLibInfo()
 
 BasicLibInfo::BasicLibInfo( const String& rStorageName )
 {
-    bReference 			= TRUE;
-    bPasswordVerified 	= FALSE;
-    bDoLoad 			= FALSE;
+    bReference 			= sal_True;
+    bPasswordVerified 	= sal_False;
+    bDoLoad 			= sal_False;
     mxScriptCont    	= NULL;
     aStorageName 		= rStorageName;
 }
 
-void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo )
+void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo )
 {
-    ULONG nStartPos = rSStream.Tell();
+    sal_uIntPtr nStartPos = rSStream.Tell();
     sal_uInt32 nEndPos = 0;
 
-    USHORT nId = LIBINFO_ID;
-    USHORT nVer = CURR_VER;
+    sal_uInt16 nId = LIBINFO_ID;
+    sal_uInt16 nVer = CURR_VER;
 
     rSStream << nEndPos;
     rSStream << nId;
@@ -682,7 +684,7 @@ void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStora
         aStorageName = aCurStorageName;
 
     // Load again?
-    BOOL bDoLoad_ = xLib.Is();
+    sal_Bool bDoLoad_ = xLib.Is();
     if ( bUseOldReloadInfo )
         bDoLoad_ = DoLoad();
     rSStream << bDoLoad_;
@@ -735,8 +737,8 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
     BasicLibInfo* pInfo = new BasicLibInfo;
 
     sal_uInt32 nEndPos;
-    USHORT nId;
-    USHORT nVer;
+    sal_uInt16 nId;
+    sal_uInt16 nVer;
 
     rSStream >> nEndPos;
     rSStream >> nId;
@@ -746,7 +748,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
     if( nId == LIBINFO_ID )
     {
         // Reload?
-        BOOL bDoLoad;
+        sal_Bool bDoLoad;
         rSStream >> bDoLoad;
         pInfo->bDoLoad = bDoLoad;
 
@@ -767,7 +769,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
 
         if ( nVer >= 2 )
         {
-            BOOL bReferenz;
+            sal_Bool bReferenz;
             rSStream >> bReferenz;
             pInfo->IsReference() = bReferenz;
         }
@@ -790,7 +792,7 @@ void BasicLibInfo::CalcRelStorageName( const String& rMgrStorageName )
     else
         SetRelStorageName( String() );
 }
-BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
 {
     DBG_CTOR( BasicManager, 0 );
 
@@ -827,13 +829,13 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
             xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
             pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
             xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
-            xStdLib->SetModified( FALSE );
+            xStdLib->SetModified( sal_False );
         }
         else
         {
             pStdLib->SetParent( pParentFromStdLib );
             // The other get StdLib as parent:
-            for ( USHORT nBasic = 1; nBasic < GetLibCount(); nBasic++ )
+            for ( sal_uInt16 nBasic = 1; nBasic < GetLibCount(); nBasic++ )
             {
                 StarBASIC* pBasic = GetLib( nBasic );
                 if ( pBasic )
@@ -844,7 +846,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
                 }
             }
             // Modified through insert
-            pStdLib->SetModified( FALSE );
+            pStdLib->SetModified( sal_False );
         }
 
         // #91626 Save all stream data to save it unmodified if basic isn't modified
@@ -855,12 +857,12 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
         *static_cast<SvStream*>(&xManagerStream) >> *mpImpl->mpManagerStream;
 
         SotStorageRef xBasicStorage = rStorage.OpenSotStorage
-                                ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+                                ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
         if( xBasicStorage.Is() && !xBasicStorage->GetError() )
         {
-            USHORT nLibs = GetLibCount();
+            sal_uInt16 nLibs = GetLibCount();
             mpImpl->mppLibStreams = new SvMemoryStream*[ nLibs ];
-            for( USHORT nL = 0; nL < nLibs; nL++ )
+            for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
             {
                 BasicLibInfo* pInfo = pLibs->GetObject( nL );
                 DBG_ASSERT( pInfo, "pInfo?!" );
@@ -879,7 +881,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
             LoadOldBasicManager( rStorage );
     }
 
-    bBasMgrModified = FALSE;
+    bBasMgrModified = sal_False;
 }
 
 void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
@@ -898,8 +900,8 @@ void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInf
     if ( !xLib.is() )
         return;
 
-    USHORT nModCount = pBasic->GetModules()->Count();
-    for ( USHORT nMod = 0 ; nMod < nModCount ; nMod++ )
+    sal_uInt16 nModCount = pBasic->GetModules()->Count();
+    for ( sal_uInt16 nMod = 0 ; nMod < nModCount ; nMod++ )
     {
         SbModule* pModule = (SbModule*)pBasic->GetModules()->Get( nMod );
         DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -963,14 +965,14 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
         else
         {
             // No libs? Maybe an 5.2 document already loaded
-            USHORT nLibs = GetLibCount();
-            for( USHORT nL = 0; nL < nLibs; nL++ )
+            sal_uInt16 nLibs = GetLibCount();
+            for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
             {
                 BasicLibInfo* pBasLibInfo = pLibs->GetObject( nL );
                 StarBASIC* pLib = pBasLibInfo->GetLib();
                 if( !pLib )
                 {
-                    BOOL bLoaded = ImpLoadLibary( pBasLibInfo, NULL, FALSE );
+                    sal_Bool bLoaded = ImpLoadLibary( pBasLibInfo, NULL, sal_False );
                     if( bLoaded )
                         pLib = pBasLibInfo->GetLib();
                 }
@@ -999,7 +1001,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
     SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
 }
 
-BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
 {
     DBG_CTOR( BasicManager, 0 );
     Init();
@@ -1016,8 +1018,8 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) :
     pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
 
     // Save is only necessary if basic has changed
-    xStdLib->SetModified( FALSE );
-    bBasMgrModified = FALSE;
+    xStdLib->SetModified( sal_False );
+    bBasMgrModified = sal_False;
 }
 
 BasicManager::BasicManager()
@@ -1042,7 +1044,7 @@ void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
     xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
     pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
     xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
-    xStdLib->SetModified( FALSE );
+    xStdLib->SetModified( sal_False );
 }
 
 
@@ -1057,7 +1059,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
 }
 
 
-void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadLibs )
+void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadLibs )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1095,7 +1097,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
     sal_uInt32 nEndPos;
     *xManagerStream >> nEndPos;
 
-    USHORT nLibs;
+    sal_uInt16 nLibs;
     *xManagerStream >> nLibs;
     // Plausibility!
     if( nLibs & 0xF000 )
@@ -1103,7 +1105,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
         DBG_ASSERT( !this, "BasicManager-Stream defect!" );
         return;
     }
-    for ( USHORT nL = 0; nL < nLibs; nL++ )
+    for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
     {
         BasicLibInfo* pInfo = BasicLibInfo::Create( *xManagerStream );
 
@@ -1113,7 +1115,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
         {
             INetURLObject aObj( aRealStorageName, INET_PROT_FILE );
             aObj.removeSegment();
-            bool bWasAbsolute = FALSE;
+            bool bWasAbsolute = sal_False;
             aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute );
 
             //*** TODO: Replace if still necessary
@@ -1129,7 +1131,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
                 if( aPathCFG.SearchFile( aSearchFile, SvtPathOptions::PATH_BASIC ) )
                 {
                     pInfo->SetStorageName( aSearchFile );
-                    pInfo->SetFoundInPath( TRUE );
+                    pInfo->SetFoundInPath( sal_True );
                 }
             }
         }
@@ -1192,8 +1194,8 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
     {
         String aCurStorageName( aStorName );
         INetURLObject aCurStorage( aCurStorageName, INET_PROT_FILE );
-        USHORT nLibs = aLibs.GetTokenCount( LIB_SEP );
-        for ( USHORT nLib = 0; nLib < nLibs; nLib++ )
+        sal_uInt16 nLibs = aLibs.GetTokenCount( LIB_SEP );
+        for ( sal_uInt16 nLib = 0; nLib < nLibs; nLib++ )
         {
             String aLibInfo( aLibs.GetToken( nLib, LIB_SEP ) );
             // TODO: Remove == 2
@@ -1205,7 +1207,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
 
             INetURLObject aLibRelStorage( aStorName );
             aLibRelStorage.removeSegment();
-            bool bWasAbsolute = FALSE;
+            bool bWasAbsolute = sal_False;
             aLibRelStorage = aLibRelStorage.smartRel2Abs( aLibRelStorageName, bWasAbsolute);
             DBG_ASSERT(!bWasAbsolute, "RelStorageName was absolute!" );
 
@@ -1214,14 +1216,14 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
                 xStorageRef = &rStorage;
             else
             {
-                xStorageRef = new SotStorage( FALSE, aLibAbsStorage.GetMainURL
-                    ( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+                xStorageRef = new SotStorage( sal_False, aLibAbsStorage.GetMainURL
+                    ( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
                 if ( xStorageRef->GetError() != ERRCODE_NONE )
-                    xStorageRef = new SotStorage( FALSE, aLibRelStorage.
-                    GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+                    xStorageRef = new SotStorage( sal_False, aLibRelStorage.
+                    GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
             }
             if ( xStorageRef.Is() )
-                AddLib( *xStorageRef, aLibName, FALSE );
+                AddLib( *xStorageRef, aLibName, sal_False );
             else
             {
                 StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, aStorName, ERRCODE_BUTTON_OK );
@@ -1258,8 +1260,8 @@ bool BasicManager::HasExeCode( const String& sLib )
     if ( pLib )
     {
         SbxArray* pMods = pLib->GetModules();
-        USHORT nMods = pMods ? pMods->Count() : 0;
-        for( USHORT i = 0; i < nMods; i++ )
+        sal_uInt16 nMods = pMods ? pMods->Count() : 0;
+        for( sal_uInt16 i = 0; i < nMods; i++ )
         {
             SbModule* p = (SbModule*) pMods->Get( i );
             if ( p )
@@ -1274,7 +1276,7 @@ void BasicManager::Init()
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
-    bBasMgrModified = FALSE;
+    bBasMgrModified = sal_False;
     pErrorMgr = new BasicErrorManager;
     pLibs = new BasicLibs;
     mpImpl = new BasicManagerImpl();
@@ -1289,7 +1291,7 @@ BasicLibInfo* BasicManager::CreateLibInfo()
     return pInf;
 }
 
-BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly ) const
+sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1317,10 +1319,10 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
     }
 
     if ( !xStorage.Is() )
-        xStorage = new SotStorage( FALSE, aStorageName, eStorageReadMode );
+        xStorage = new SotStorage( sal_False, aStorageName, eStorageReadMode );
 
     SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
 
     if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
     {
@@ -1338,7 +1340,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
         }
         else
         {
-            BOOL bLoaded = FALSE;
+            sal_Bool bLoaded = sal_False;
             if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 )
             {
                 if ( !bInfosOnly )
@@ -1351,7 +1353,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
                     xBasicStream->SetBufferSize( 0 );
                     StarBASICRef xStdLib = pLibInfo->GetLib();
                     xStdLib->SetName( pLibInfo->GetLibName() );
-                    xStdLib->SetModified( FALSE );
+                    xStdLib->SetModified( sal_False );
                     xStdLib->SetFlag( SBX_DONTSTORE );
                 }
                 else
@@ -1360,7 +1362,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
                     xBasicStream->Seek( STREAM_SEEK_TO_BEGIN );
                     ImplEncryptStream( *xBasicStream );
                     SbxBase::Skip( *xBasicStream );
-                    bLoaded = TRUE;
+                    bLoaded = sal_True;
                 }
             }
             if ( !bLoaded )
@@ -1387,20 +1389,20 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
             return bLoaded;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
+sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const
 {
-    ULONG nPos = rStrm.Tell();
-    UINT32 nCreator;
+    sal_uIntPtr nPos = rStrm.Tell();
+    sal_uInt32 nCreator;
     rStrm >> nCreator;
     rStrm.Seek( nPos );
-    BOOL bProtected = FALSE;
+    sal_Bool bProtected = sal_False;
     if ( nCreator != SBXCR_SBX )
     {
         // Should only be the case for encrypted Streams
-        bProtected = TRUE;
+        bProtected = sal_True;
         rStrm.SetKey( szCryptingKey );
         rStrm.RefreshBuffer();
     }
@@ -1409,11 +1411,11 @@ BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
 
 // This code is necessary to load the BASIC of Beta 1
 // TODO: Which Beta 1?
-BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
+sal_Bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
 {
-    BOOL bProtected = ImplEncryptStream( rStrm );
+    sal_Bool bProtected = ImplEncryptStream( rStrm );
     SbxBaseRef xNew = SbxBase::Load( rStrm );
-    BOOL bLoaded = FALSE;
+    sal_Bool bLoaded = sal_False;
     if( xNew.Is() )
     {
         if( xNew->IsA( TYPE(StarBASIC) ) )
@@ -1432,8 +1434,8 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
             // Fill new libray container (5.2 -> 6.0)
             copyToLibraryContainer( pNew, mpImpl->maContainerInfo );
 
-            pNew->SetModified( FALSE );
-            bLoaded = TRUE;
+            pNew->SetModified( sal_False );
+            bLoaded = sal_True;
         }
     }
     if ( bProtected )
@@ -1441,14 +1443,14 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
     return bLoaded;
 }
 
-void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
+void BasicManager::CheckModules( StarBASIC* pLib, sal_Bool bReference ) const
 {
     if ( !pLib )
         return;
 
-    BOOL bModified = pLib->IsModified();
+    sal_Bool bModified = pLib->IsModified();
 
-    for ( USHORT nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pLib->GetModules()->Get( nMod );
         DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -1461,11 +1463,11 @@ void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
     if( !bModified && bReference )
     {
         OSL_FAIL( "Per Reference eingebundene Basic-Library ist nicht compiliert!" );
-        pLib->SetModified( FALSE );
+        pLib->SetModified( sal_False );
     }
 }
 
-StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference )
+StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1483,11 +1485,11 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
     // Use original name otherwise ImpLoadLibary failes...
     pLibInfo->SetLibName( rLibName );
     // Funktioniert so aber nicht, wenn Name doppelt
-    USHORT nLibId = (USHORT) pLibs->GetPos( pLibInfo );
+    sal_uInt16 nLibId = (sal_uInt16) pLibs->GetPos( pLibInfo );
 
     // Set StorageName before load because it is compared with pCurStorage
     pLibInfo->SetStorageName( aStorageName );
-    BOOL bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
+    sal_Bool bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
 
     if ( bLoaded )
     {
@@ -1496,20 +1498,20 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
 
         if ( bReference )
         {
-            pLibInfo->GetLib()->SetModified( FALSE );	// Don't save in this case
+            pLibInfo->GetLib()->SetModified( sal_False );	// Don't save in this case
             pLibInfo->SetRelStorageName( String() );
-            pLibInfo->IsReference() = TRUE;
+            pLibInfo->IsReference() = sal_True;
         }
         else
         {
-            pLibInfo->GetLib()->SetModified( TRUE ); // Must be saved after Add!
+            pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add!
             pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage
         }
-        bBasMgrModified = TRUE;
+        bBasMgrModified = sal_True;
     }
     else
     {
-        RemoveLib( nLibId, FALSE );
+        RemoveLib( nLibId, sal_False );
         pLibInfo = 0;
     }
 
@@ -1519,7 +1521,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
         return 0;
 }
 
-BOOL BasicManager::IsReference( USHORT nLib )
+sal_Bool BasicManager::IsReference( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1528,16 +1530,16 @@ BOOL BasicManager::IsReference( USHORT nLib )
     if ( pLibInfo )
         return pLibInfo->IsReference();
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::RemoveLib( USHORT nLib )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib )
 {
     // Only pyhsical deletion if no reference
     return RemoveLib( nLib, !IsReference( nLib ) );
 }
 
-BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage )
 {
     DBG_CHKTHIS( BasicManager, 0 );
     DBG_ASSERT( nLib, "Standard-Lib cannot be removed!" );
@@ -1550,7 +1552,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
 //		String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) );
         StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK );
         pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) );
-        return FALSE;
+        return sal_False;
     }
 
     // If one of the streams cannot be opened, this is not an error,
@@ -1560,14 +1562,14 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
     {
         SotStorageRef xStorage;
         if ( !pLibInfo->IsExtern() )
-            xStorage = new SotStorage( FALSE, GetStorageName() );
+            xStorage = new SotStorage( sal_False, GetStorageName() );
         else
-            xStorage = new SotStorage( FALSE, pLibInfo->GetStorageName() );
+            xStorage = new SotStorage( sal_False, pLibInfo->GetStorageName() );
 
         if ( xStorage->IsStorage( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) ) )
         {
             SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, FALSE );
+                            ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, sal_False );
 
             if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
             {
@@ -1604,20 +1606,20 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
             }
         }
     }
-    bBasMgrModified = TRUE;
+    bBasMgrModified = sal_True;
     if ( pLibInfo->GetLib().Is() )
         GetStdLib()->Remove( pLibInfo->GetLib() );
     delete pLibs->Remove( pLibInfo );
-    return TRUE;	// Remove was successful, del unimportant
+    return sal_True;	// Remove was successful, del unimportant
 }
 
-USHORT BasicManager::GetLibCount() const
+sal_uInt16 BasicManager::GetLibCount() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
-    return (USHORT)pLibs->Count();
+    return (sal_uInt16)pLibs->Count();
 }
 
-StarBASIC* BasicManager::GetLib( USHORT nLib ) const
+StarBASIC* BasicManager::GetLib( sal_uInt16 nLib ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
     BasicLibInfo* pInf = pLibs->GetObject( nLib );
@@ -1649,7 +1651,7 @@ StarBASIC* BasicManager::GetLib( const String& rName ) const
     return 0;
 }
 
-USHORT BasicManager::GetLibId( const String& rName ) const
+sal_uInt16 BasicManager::GetLibId( const String& rName ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1657,14 +1659,14 @@ USHORT BasicManager::GetLibId( const String& rName ) const
     while ( pInf )
     {
         if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
-            return (USHORT)pLibs->GetCurPos();
+            return (sal_uInt16)pLibs->GetCurPos();
 
         pInf = pLibs->Next();
     }
     return LIB_NOTFOUND;
 }
 
-BOOL BasicManager::HasLib( const String& rName ) const
+sal_Bool BasicManager::HasLib( const String& rName ) const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1672,14 +1674,14 @@ BOOL BasicManager::HasLib( const String& rName ) const
     while ( pInf )
     {
         if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
-            return TRUE;
+            return sal_True;
 
         pInf = pLibs->Next();
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
+sal_Bool BasicManager::SetLibName( sal_uInt16 nLib, const String& rName )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1692,15 +1694,15 @@ BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
         {
             StarBASICRef xStdLib = pLibInfo->GetLib();
             xStdLib->SetName( rName );
-            xStdLib->SetModified( TRUE );
+            xStdLib->SetModified( sal_True );
         }
-        bBasMgrModified = TRUE;
-        return TRUE;
+        bBasMgrModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-String BasicManager::GetLibName( USHORT nLib )
+String BasicManager::GetLibName( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1711,11 +1713,11 @@ String BasicManager::GetLibName( USHORT nLib )
     return String();
 }
 
-BOOL BasicManager::LoadLib( USHORT nLib )
+sal_Bool BasicManager::LoadLib( sal_uInt16 nLib )
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
     DBG_ASSERT( pLibInfo, "Lib?!" );
     if ( pLibInfo )
@@ -1729,7 +1731,7 @@ BOOL BasicManager::LoadLib( USHORT nLib )
         }
         else
         {
-            bDone = ImpLoadLibary( pLibInfo, NULL, FALSE );
+            bDone = ImpLoadLibary( pLibInfo, NULL, sal_False );
             StarBASIC* pLib = GetLib( nLib );
             if ( pLib )
             {
@@ -1772,10 +1774,10 @@ StarBASIC* BasicManager::CreateLib
     {
         if( LinkTargetURL.Len() != 0 )
         {
-            SotStorageRef xStorage = new SotStorage( FALSE, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
+            SotStorageRef xStorage = new SotStorage( sal_False, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
             if( !xStorage->GetError() )
             {
-                pLib = AddLib( *xStorage, rLibName, TRUE );
+                pLib = AddLib( *xStorage, rLibName, sal_True );
             }
 
             DBG_ASSERT( pLib, "XML Import: Linked basic library could not be loaded");
@@ -1829,16 +1831,16 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
 }
 
 
-BOOL BasicManager::IsModified() const
+sal_Bool BasicManager::IsModified() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
     if ( bBasMgrModified )
-        return TRUE;
+        return sal_True;
     return IsBasicModified();
 }
 
-BOOL BasicManager::IsBasicModified() const
+sal_Bool BasicManager::IsBasicModified() const
 {
     DBG_CHKTHIS( BasicManager, 0 );
 
@@ -1846,17 +1848,17 @@ BOOL BasicManager::IsBasicModified() const
     while ( pInf )
     {
         if ( pInf->GetLib().Is() && pInf->GetLib()->IsModified() )
-            return TRUE;
+            return sal_True;
 
         pInf = pLibs->Next();
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
+void BasicManager::SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const
 {
-    USHORT nLibs = GetLibCount();
-    for ( USHORT nL = 0; nL < nLibs; nL++ )
+    sal_uInt16 nLibs = GetLibCount();
+    for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
     {
         BasicLibInfo* pInfo = pLibs->GetObject( nL );
         DBG_ASSERT( pInfo, "Info?!" );
@@ -1871,7 +1873,7 @@ void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
     }
 }
 
-BOOL BasicManager::HasErrors()
+sal_Bool BasicManager::HasErrors()
 {
     DBG_CHKTHIS( BasicManager, 0 );
     return pErrorMgr->HasErrors();
@@ -1977,6 +1979,116 @@ bool BasicManager::LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequen
     return false;
 }
 
+
+namespace
+{
+    SbMethod* lcl_queryMacro( BasicManager* i_manager, String const& i_fullyQualifiedName )
+    {
+        sal_uInt16 nLast = 0;
+        String sMacro = i_fullyQualifiedName;
+        String sLibName = sMacro.GetToken( 0, '.', nLast );
+        String sModule = sMacro.GetToken( 0, '.', nLast );
+        sMacro.Erase( 0, nLast );
+
+        IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+        const CollatorWrapper* pCollator = aIntlWrapper.getCollator();
+        sal_uInt16 nLibCount = i_manager->GetLibCount();
+        for ( sal_uInt16 nLib = 0; nLib < nLibCount; ++nLib )
+        {
+            if ( COMPARE_EQUAL == pCollator->compareString( i_manager->GetLibName( nLib ), sLibName ) )
+            {
+                StarBASIC* pLib = i_manager->GetLib( nLib );
+                if( !pLib )
+                {
+                    i_manager->LoadLib( nLib );
+                    pLib = i_manager->GetLib( nLib );
+                }
+
+                if( pLib )
+                {
+                    sal_uInt16 nModCount = pLib->GetModules()->Count();
+                    for( sal_uInt16 nMod = 0; nMod < nModCount; ++nMod )
+                    {
+                        SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod );
+                        if ( pMod && COMPARE_EQUAL == pCollator->compareString( pMod->GetName(), sModule ) )
+                        {
+                            SbMethod* pMethod = (SbMethod*)pMod->Find( sMacro, SbxCLASS_METHOD );
+                            if( pMethod )
+                                return pMethod;
+                        }
+                    }
+                }
+            }
+        }
+        return 0;
+    }
+}
+
+bool BasicManager::HasMacro( String const& i_fullyQualifiedName ) const
+{
+    return ( NULL != lcl_queryMacro( const_cast< BasicManager* >( this ), i_fullyQualifiedName ) );
+}
+
+ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, SbxArray* i_arguments, SbxValue* i_retValue )
+{
+    SbMethod* pMethod = lcl_queryMacro( this, i_fullyQualifiedName );
+    ErrCode nError = 0;
+    if ( pMethod )
+    {
+        if ( i_arguments )
+            pMethod->SetParameters( i_arguments );
+        nError = pMethod->Call( i_retValue );
+    }
+    else
+        nError = ERRCODE_BASIC_PROC_UNDEFINED;
+    return nError;
+}
+
+ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, String const& i_commaSeparatedArgs, SbxValue* i_retValue )
+{
+    SbMethod* pMethod = lcl_queryMacro( this, i_fullyQualifiedName );
+    if ( !pMethod )
+        return ERRCODE_BASIC_PROC_UNDEFINED;
+
+    // arguments must be quoted
+    String sQuotedArgs;
+    String sArgs( i_commaSeparatedArgs );
+    if ( sArgs.Len()<2 || sArgs.GetBuffer()[1] == '\"')
+        // no args or already quoted args
+        sQuotedArgs = sArgs;
+    else
+    {
+        // quote parameters
+        sArgs.Erase( 0, 1 );
+        sArgs.Erase( sArgs.Len()-1, 1 );
+
+        sQuotedArgs = '(';
+
+        sal_uInt16 nCount = sArgs.GetTokenCount(',');
+        for ( sal_uInt16 n=0; n<nCount; ++n )
+        {
+            sQuotedArgs += '\"';
+            sQuotedArgs += sArgs.GetToken( n, ',' );
+            sQuotedArgs += '\"';
+            if ( n<nCount-1 )
+                sQuotedArgs += ',';
+        }
+
+        sQuotedArgs += ')';
+    }
+
+    // add quoted arguments and do the call
+    String sCall( '[' );
+    sCall += pMethod->GetName();
+    sCall += sQuotedArgs;
+    sCall += ']';
+
+    SbxVariable* pRet = pMethod->GetParent()->Execute( sCall );
+    if ( pRet )
+        *i_retValue = *pRet;
+    return SbxBase::GetError();
+}
+
 //=====================================================================
 
 class ModuleInfo_Impl : public ModuleInfoHelper
@@ -2130,10 +2242,10 @@ Sequence< ::rtl::OUString > ModuleContainer_Impl::getElementNames()
     throw(RuntimeException)
 {
     SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL;
-    USHORT nMods = pMods ? pMods->Count() : 0;
+    sal_uInt16 nMods = pMods ? pMods->Count() : 0;
     Sequence< ::rtl::OUString > aRetSeq( nMods );
     ::rtl::OUString* pRetSeq = aRetSeq.getArray();
-    for( USHORT i = 0 ; i < nMods ; i++ )
+    for( sal_uInt16 i = 0 ; i < nMods ; i++ )
     {
         SbxVariable* pMod = pMods->Get( i );
         pRetSeq[i] = ::rtl::OUString( pMod->GetName() );
@@ -2460,10 +2572,10 @@ Any LibraryContainer_Impl::getByName( const ::rtl::OUString& aName )
 Sequence< ::rtl::OUString > LibraryContainer_Impl::getElementNames()
     throw(RuntimeException)
 {
-    USHORT nLibs = mpMgr->GetLibCount();
+    sal_uInt16 nLibs = mpMgr->GetLibCount();
     Sequence< ::rtl::OUString > aRetSeq( nLibs );
     ::rtl::OUString* pRetSeq = aRetSeq.getArray();
-    for( USHORT i = 0 ; i < nLibs ; i++ )
+    for( sal_uInt16 i = 0 ; i < nLibs ; i++ )
     {
         pRetSeq[i] = ::rtl::OUString( mpMgr->GetLibName( i ) );
     }
@@ -2500,7 +2612,7 @@ void LibraryContainer_Impl::removeByName( const ::rtl::OUString& Name )
     StarBASIC* pLib = mpMgr->GetLib( Name );
     if( !pLib )
         throw NoSuchElementException();
-    USHORT nLibId = mpMgr->GetLibId( Name );
+    sal_uInt16 nLibId = mpMgr->GetLibId( Name );
     mpMgr->RemoveLib( nLibId );
 }
 
diff --git a/basic/source/basmgr/makefile.mk b/basic/source/basmgr/makefile.mk
index e08e9cc753..615a8e8465 100644..100755
--- a/basic/source/basmgr/makefile.mk
+++ b/basic/source/basmgr/makefile.mk
@@ -39,7 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 SLOFILES= \
         $(SLO)$/basmgr.obj \
-        $(SLO)$/basicmanagerrepository.obj
+        $(SLO)$/basicmanagerrepository.obj\
+        $(SLO)$/vbahelper.obj
 
 # --- Targets -------------------------------------------------------------
 
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
new file mode 100755
index 0000000000..1ab94fa248
--- /dev/null
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+
+#include "basic/vbahelper.hxx"
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/XModel2.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
+
+namespace basic {
+namespace vba {
+
+using namespace ::com::sun::star;
+
+// ============================================================================
+
+namespace {
+
+/** Creates the global module manager needed to identify the type of documents.
+ */
+uno::Reference< frame::XModuleManager > lclCreateModuleManager()
+{
+    uno::Reference< frame::XModuleManager > xModuleManager;
+    try
+    {
+        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW );
+        xModuleManager.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ) ) ), uno::UNO_QUERY );
+    }
+    catch( uno::Exception& )
+    {
+    }
+    OSL_ENSURE( xModuleManager.is(), "::basic::vba::lclCreateModuleManager - cannot create module manager" );
+    return xModuleManager;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Returns the document service name of the specified document.
+ */
+::rtl::OUString lclIdentifyDocument( const uno::Reference< frame::XModuleManager >& rxModuleManager, const uno::Reference< frame::XModel >& rxModel )
+{
+    ::rtl::OUString aServiceName;
+    if( rxModuleManager.is() )
+    {
+        try
+        {
+            aServiceName = rxModuleManager->identify( rxModel );
+        }
+        catch( uno::Exception& )
+        {
+        }
+        OSL_ENSURE( aServiceName.getLength() > 0, "::basic::vba::lclIdentifyDocument - cannot identify document" );
+    }
+    return aServiceName;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Returns an enumeration of all open documents.
+ */
+uno::Reference< container::XEnumeration > lclCreateDocumentEnumeration()
+{
+    uno::Reference< container::XEnumeration > xEnumeration;
+    try
+    {
+        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW );
+        uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ), uno::UNO_QUERY_THROW );
+        uno::Reference< container::XEnumerationAccess > xComponentsEA( xDesktop->getComponents(), uno::UNO_SET_THROW );
+        xEnumeration = xComponentsEA->createEnumeration();
+
+    }
+    catch( uno::Exception& )
+    {
+    }
+    OSL_ENSURE( xEnumeration.is(), "::basic::vba::lclCreateDocumentEnumeration - cannot create enumeration of all documents" );
+    return xEnumeration;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Locks or unlocks the controllers of the specified document model.
+ */
+void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
+{
+    if( rxModel.is() ) try
+    {
+        if( bLockControllers )
+            rxModel->lockControllers();
+        else
+            rxModel->unlockControllers();
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
+// ----------------------------------------------------------------------------
+
+/** Enables or disables the container windows of all controllers of the
+    specified document model.
+ */
+void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
+{
+    try
+    {
+        uno::Reference< frame::XModel2 > xModel2( rxModel, uno::UNO_QUERY_THROW );
+        uno::Reference< container::XEnumeration > xControllersEnum( xModel2->getControllers(), uno::UNO_SET_THROW );
+        // iterate over all controllers
+        while( xControllersEnum->hasMoreElements() )
+        {
+            try
+            {
+                uno::Reference< frame::XController > xController( xControllersEnum->nextElement(), uno::UNO_QUERY_THROW );
+                uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
+                uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
+                xWindow->setEnable( bEnableWindows );
+            }
+            catch( uno::Exception& )
+            {
+            }
+        }
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
+// ----------------------------------------------------------------------------
+
+typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, sal_Bool );
+
+/** Implementation iterating over all documents that have the same type as the
+    specified model, and calling the passed functor.
+ */
+void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Reference< frame::XModel >& rxModel, sal_Bool bModificator )
+{
+    uno::Reference< frame::XModuleManager > xModuleManager = lclCreateModuleManager();
+    uno::Reference< container::XEnumeration > xDocumentsEnum = lclCreateDocumentEnumeration();
+    ::rtl::OUString aIdentifier = lclIdentifyDocument( xModuleManager, rxModel );
+    if( xModuleManager.is() && xDocumentsEnum.is() && (aIdentifier.getLength() > 0) )
+    {
+        // iterate over all open documents
+        while( xDocumentsEnum->hasMoreElements() )
+        {
+            try
+            {
+                uno::Reference< frame::XModel > xCurrModel( xDocumentsEnum->nextElement(), uno::UNO_QUERY_THROW );
+                ::rtl::OUString aCurrIdentifier = lclIdentifyDocument( xModuleManager, xCurrModel );
+                if( aCurrIdentifier == aIdentifier )
+                    pModifyDocumentFunc( xCurrModel, bModificator );
+            }
+            catch( uno::Exception& )
+            {
+            }
+        }
+    }
+    else
+    {
+        // no module manager, no documents enumeration, no identifier -> at least process the passed document
+        pModifyDocumentFunc( rxModel, bModificator );
+    }
+}
+
+} // namespace
+
+// ============================================================================
+
+void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
+{
+    lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers );
+}
+
+// ============================================================================
+
+void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
+{
+    lclIterateDocuments( &lclEnableContainerWindows, rxModel, bEnableWindows );
+}
+
+// ============================================================================
+
+} // namespace vba
+} // namespace basic
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 2350e92c75..5962302e34 100644..100755
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -236,7 +236,7 @@ static const char* _crlf()
 }
 
 // This method exists because we want to load the file as own segment
-BOOL SbModule::Disassemble( String& rText )
+sal_Bool SbModule::Disassemble( String& rText )
 {
     rText.Erase();
     if( pImage )
@@ -244,7 +244,7 @@ BOOL SbModule::Disassemble( String& rText )
         SbiDisas aDisas( this, pImage );
         aDisas.Disas( rText );
     }
-    return BOOL( rText.Len() != 0 );
+    return sal_Bool( rText.Len() != 0 );
 }
 
 SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
@@ -278,23 +278,23 @@ SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
     }
     nOff = 0;
     // Add the publics
-    for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
     {
         SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
         if( pMeth )
         {
-            USHORT nPos = (USHORT) (pMeth->GetId());
+            sal_uInt16 nPos = (sal_uInt16) (pMeth->GetId());
             cLabels[ nPos >> 3 ] |= ( 1 << ( nPos & 7 ) );
         }
     }
 }
 
 // Read current opcode
-BOOL SbiDisas::Fetch()
+sal_Bool SbiDisas::Fetch()
 {
     nPC = nOff;
     if( nOff >= rImg.GetCodeSize() )
-        return FALSE;
+        return sal_False;
     const unsigned char* p = (const unsigned char*)( rImg.GetCode() + nOff );
     eOp = (SbiOpcode) ( *p++ & 0xFF );
     if( eOp <= SbOP0_END )
@@ -302,29 +302,29 @@ BOOL SbiDisas::Fetch()
         nOp1 = nOp2 = 0;
         nParts = 1;
         nOff++;
-        return TRUE;
+        return sal_True;
     }
     else if( eOp <= SbOP1_END )
     {
         nOff += 5;
         if( nOff > rImg.GetCodeSize() )
-            return FALSE;
+            return sal_False;
         nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
         nParts = 2;
-        return TRUE;
+        return sal_True;
     }
     else if( eOp <= SbOP2_END )
     {
         nOff += 9;
         if( nOff > rImg.GetCodeSize() )
-            return FALSE;
+            return sal_False;
         nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
         nOp2 = *p++; nOp2 |= *p++ << 8; nOp2 |= *p++ << 16; nOp2 |= *p++ << 24;
         nParts = 3;
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 void SbiDisas::Disas( SvStream& r )
@@ -351,7 +351,7 @@ void SbiDisas::Disas( String& r )
     aText.ConvertLineEnd();
 }
 
-BOOL SbiDisas::DisasLine( String& rText )
+sal_Bool SbiDisas::DisasLine( String& rText )
 {
     char cBuf[ 100 ];
     const char* pMask[] = {
@@ -361,7 +361,7 @@ BOOL SbiDisas::DisasLine( String& rText )
         "%08" SAL_PRIXUINT32 " %02X %08X %08X " };
     rText.Erase();
     if( !Fetch() )
-        return FALSE;
+        return sal_False;
 
     // New line?
     if( eOp == _STMNT && nOp1 != nLine )
@@ -369,8 +369,8 @@ BOOL SbiDisas::DisasLine( String& rText )
         // Find line
         String aSource = rImg.aOUSource;
         nLine = nOp1;
-        USHORT n = 0;
-        USHORT l = (USHORT)nLine;
+        sal_uInt16 n = 0;
+        sal_uInt16 l = (sal_uInt16)nLine;
         while( --l ) {
             n = aSource.SearchAscii( "\n", n );
             if( n == STRING_NOTFOUND ) break;
@@ -379,16 +379,16 @@ BOOL SbiDisas::DisasLine( String& rText )
         // Show position
         if( n != STRING_NOTFOUND )
         {
-            USHORT n2 = aSource.SearchAscii( "\n", n );
+            sal_uInt16 n2 = aSource.SearchAscii( "\n", n );
             if( n2 == STRING_NOTFOUND ) n2 = aSource.Len() - n;
             String s( aSource.Copy( n, n2 - n + 1 ) );
-            BOOL bDone;
+            sal_Bool bDone;
             do {
-                bDone = TRUE;
+                bDone = sal_True;
                 n = s.Search( '\r' );
-                if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+                if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
                 n = s.Search( '\n' );
-                if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+                if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
             } while( !bDone );
 //          snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC );
 //			rText += cBuf;
@@ -404,7 +404,7 @@ BOOL SbiDisas::DisasLine( String& rText )
     {
         // Public?
         ByteString aByteMethName;
-        for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
         {
             SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
             if( pMeth )
@@ -434,7 +434,7 @@ BOOL SbiDisas::DisasLine( String& rText )
         rText += ':';
         rText.AppendAscii( _crlf() );
     }
-    snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (USHORT) eOp, nOp1, nOp2 );
+    snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (sal_uInt16) eOp, nOp1, nOp2 );
 
     String aPCodeStr;
     aPCodeStr.AppendAscii( cBuf );
@@ -454,13 +454,13 @@ BOOL SbiDisas::DisasLine( String& rText )
 
     rText += aPCodeStr;
 
-    return TRUE;
+    return sal_True;
 }
 
 // Read from StringPool
 void SbiDisas::StrOp( String& rText )
 {
-    String aStr = rImg.GetString( (USHORT)nOp1 );
+    String aStr = rImg.GetString( (sal_uInt16)nOp1 );
     ByteString aByteString( aStr, RTL_TEXTENCODING_ASCII_US );
     const char* p = aByteString.GetBuffer();
     if( p )
@@ -472,7 +472,7 @@ void SbiDisas::StrOp( String& rText )
     else
     {
         rText.AppendAscii( "?String? " );
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
     }
 }
 
@@ -526,7 +526,7 @@ void SbiDisas::ResumeOp( String& rText )
 }
 
 // print Prompt
-// FALSE/TRUE
+// sal_False/TRUE
 void SbiDisas::PromptOp( String& rText )
 {
     if( nOp1 )
@@ -558,16 +558,16 @@ void SbiDisas::CharOp( String& rText )
         rText += '\'';
     else
         rText.AppendAscii( "char " ),
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
 }
 
 // Print var: String-ID and type
 void SbiDisas::VarOp( String& rText )
 {
-    rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+    rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
     rText.AppendAscii( "\t; " );
     // The type
-    UINT32 n = nOp1;
+    sal_uInt32 n = nOp1;
     nOp1 = nOp2;
     TypeOp( rText );
     if( n & 0x8000 )
@@ -577,7 +577,7 @@ void SbiDisas::VarOp( String& rText )
 // Define variable: String-ID and type
 void SbiDisas::VarDefOp( String& rText )
 {
-    rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+    rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
     rText.AppendAscii( "\t; " );
     // The Typ
     nOp1 = nOp2;
@@ -590,7 +590,7 @@ void SbiDisas::OffOp( String& rText )
     rText += String::CreateFromInt32( nOp1 & 0x7FFF );
     rText.AppendAscii( "\t; " );
     // The type
-    UINT32 n = nOp1;
+    sal_uInt32 n = nOp1;
     nOp1 = nOp2;
     TypeOp( rText );
     if( n & 0x8000 )
@@ -618,11 +618,11 @@ void SbiDisas::TypeOp( String& rText )
     else
     {
         rText.AppendAscii( "type " );
-        rText += (USHORT)nOp1;
+        rText += (sal_uInt16)nOp1;
     }
 }
 
-// TRUE-Label, condition Opcode
+// sal_True-Label, condition Opcode
 void SbiDisas::CaseOp( String& rText )
 {
     LblOp( rText );
@@ -635,8 +635,8 @@ void SbiDisas::StmntOp( String& rText )
 {
     rText += String::CreateFromInt32( nOp1 );
     rText += ',';
-    UINT32 nCol = nOp2 & 0xFF;
-    UINT32 nFor = nOp2 / 0x100;
+    sal_uInt32 nCol = nOp2 & 0xFF;
+    sal_uInt32 nFor = nOp2 / 0x100;
     rText += String::CreateFromInt32( nCol );
     rText.AppendAscii( " (For-Level: " );
     rText += String::CreateFromInt32( nFor );
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 3e6784c836..3e6784c836 100644..100755
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 4703647b7a..6b8fdf5517 100644..100755
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -88,54 +88,6 @@ using namespace ::cppu;
 using namespace ::osl;
 
 
-
-Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
-{
-    OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
-    if ( !pBasic )
-        return NULL;
-
-    // look for the ThisComponent variable, first in the parent (which
-    // might be the document's Basic), then in the parent's parent (which might be
-    // the application Basic)
-    const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
-    SbxVariable* pThisComponent = NULL;
-
-    SbxObject* pLookup = pBasic->GetParent();
-    while ( pLookup && !pThisComponent )
-    {
-        pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
-        pLookup = pLookup->GetParent();
-    }
-    if ( !pThisComponent )
-    {
-        OSL_TRACE("Failed to get ThisComponent");
-            // the application Basic, at the latest, should have this variable
-        return NULL;
-    }
-
-    Any aThisComponent( sbxToUnoValue( pThisComponent ) );
-    Reference< frame::XModel > xModel( aThisComponent, UNO_QUERY );
-    if ( !xModel.is() )
-    {
-        // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
-        Reference< frame::XController > xController( aThisComponent, UNO_QUERY );
-        if ( xController.is() )
-            xModel = xController->getModel();
-    }
-
-    if ( !xModel.is() )
-        return NULL;
-
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE("Have model ThisComponent points to url %s",
-        ::rtl::OUStringToOString( xModel->getURL(),
-            RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-#endif
-
-    return xModel;
-}
-
 void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Reference< frame::XModel >& xModel )
 {
         OSL_TRACE("SFURL_firing_impl() processing script url %s",
@@ -346,7 +298,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
                     if( aName == aLibName )
                     {
                         // Search only in the lib, not automatically in application basic
-                        USHORT nFlags = pBasic->GetFlags();
+                        sal_uInt16 nFlags = pBasic->GetFlags();
                         pBasic->ResetFlag( SBX_GBLSEARCH );
                         pMethVar = pBasic->Find( aMacro, SbxCLASS_DONTCARE );
                         pBasic->SetFlags( nFlags );
@@ -376,7 +328,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
             {
                 SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
                 unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-                xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+                xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
             }
         }
 
@@ -486,7 +438,7 @@ Any implFindDialogLibForDialogBasic( const Any& aAnyISP, SbxObject* pBasic, Star
     return aDlgLibAny;
 }
 
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -565,7 +517,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     bool bDocDialog = false;
     StarBASIC* pFoundBasic = NULL;
     OSL_TRACE("About to try get a hold of ThisComponent");
-    Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
+    Reference< frame::XModel > xModel = StarBASIC::GetModelFromBasic( pINST->GetBasic() ) ;
     aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
     // If we found the dialog then it belongs to the Search basic
     if ( !pFoundBasic )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index ff8388ff00..12cdfc6bab 100644..100755
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -48,8 +48,8 @@ SbiImage::SbiImage()
     nLegacyCodeSize  =
     nDimBase   = 0;
     bInit	   =
-    bError	   = FALSE;
-    bFirstInit = TRUE;
+    bError	   = sal_False;
+    bFirstInit = sal_True;
     eCharSet   = gsl_getSystemTextEncoding();
 }
 
@@ -74,7 +74,7 @@ void SbiImage::Clear()
     nCodeSize  = 0;
     eCharSet   = gsl_getSystemTextEncoding();
     nDimBase   = 0;
-    bError	   = FALSE;
+    bError	   = sal_False;
 }
 
 /**************************************************************************
@@ -83,25 +83,25 @@ void SbiImage::Clear()
 *
 **************************************************************************/
 
-BOOL SbiGood( SvStream& r )
+sal_Bool SbiGood( SvStream& r )
 {
-    return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
+    return sal_Bool( !r.IsEof() && r.GetError() == SVSTREAM_OK );
 }
 
 // Open Record
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
+sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem )
 {
-    ULONG nPos = r.Tell();
-    r << nSignature << (INT32) 0 << nElem;
+    sal_uIntPtr nPos = r.Tell();
+    r << nSignature << (sal_Int32) 0 << nElem;
     return nPos;
 }
 
 // Close Record
-void SbiCloseRecord( SvStream& r, ULONG nOff )
+void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff )
 {
-    ULONG nPos = r.Tell();
+    sal_uIntPtr nPos = r.Tell();
     r.Seek( nOff + 2 );
-    r << (INT32) ( nPos - nOff - 8 );
+    r << (sal_Int32) ( nPos - nOff - 8 );
     r.Seek( nPos );
 }
 
@@ -113,40 +113,40 @@ void SbiCloseRecord( SvStream& r, ULONG nOff )
 
 // If the version number does not find, binary parts are omitted, but not
 // source, comments and name
-BOOL SbiImage::Load( SvStream& r )
+sal_Bool SbiImage::Load( SvStream& r )
 {
-    UINT32 nVersion = 0;        // Versionsnumber
+    sal_uInt32 nVersion = 0;        // Versionsnumber
     return Load( r, nVersion );
 }
-BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
+sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
 {
 
-    UINT16 nSign, nCount;
-    UINT32 nLen, nOff;
+    sal_uInt16 nSign, nCount;
+    sal_uInt32 nLen, nOff;
 
     Clear();
     // Read Master-Record
     r >> nSign >> nLen >> nCount;
-    ULONG nLast = r.Tell() + nLen;
-    UINT32 nCharSet;               // System charset
-    UINT32 lDimBase;
-    UINT16 nReserved1;
-    UINT32 nReserved2;
-    UINT32 nReserved3;
-    BOOL bBadVer = FALSE;
+    sal_uIntPtr nLast = r.Tell() + nLen;
+    sal_uInt32 nCharSet;               // System charset
+    sal_uInt32 lDimBase;
+    sal_uInt16 nReserved1;
+    sal_uInt32 nReserved2;
+    sal_uInt32 nReserved3;
+    sal_Bool bBadVer = sal_False;
     if( nSign == B_MODULE )
     {
         r >> nVersion >> nCharSet >> lDimBase
           >> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
         eCharSet = (CharSet) nCharSet;
         eCharSet = GetSOLoadTextEncoding( eCharSet );
-        bBadVer  = BOOL( nVersion > B_CURVERSION );
-        nDimBase = (USHORT) lDimBase;
+        bBadVer  = sal_Bool( nVersion > B_CURVERSION );
+        nDimBase = (sal_uInt16) lDimBase;
     }
 
     bool bLegacy = ( nVersion < B_EXT_IMG_VERSION );
 
-    ULONG nNext;
+    sal_uIntPtr nNext;
     while( ( nNext = r.Tell() ) < nLast )
     {
 
@@ -174,7 +174,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
 #ifdef EXTENDED_BINARY_MODULES
             case B_EXTSOURCE:
             {
-                for( UINT16 j = 0 ; j < nCount ; j++ )
+                for( sal_uInt16 j = 0 ; j < nCount ; j++ )
                 {
                     String aTmp;
                     r.ReadByteString( aTmp, eCharSet );
@@ -191,10 +191,10 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
                 if ( bLegacy )
                 {
                     ReleaseLegacyBuffer(); // release any previously held buffer
-                    nLegacyCodeSize = (UINT16) nCodeSize;
+                    nLegacyCodeSize = (sal_uInt16) nCodeSize;
                     pLegacyPCode = pCode;
 
-                    PCodeBuffConvertor< UINT16, UINT32 > aLegacyToNew( (BYTE*)pLegacyPCode, nLegacyCodeSize );
+                    PCodeBuffConvertor< sal_uInt16, sal_uInt32 > aLegacyToNew( (sal_uInt8*)pLegacyPCode, nLegacyCodeSize );
                     aLegacyToNew.convert();
                     pCode = (char*)aLegacyToNew.GetBuffer();
                     nCodeSize = aLegacyToNew.GetSize();
@@ -220,20 +220,20 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
                 for( i = 0; i < nStrings && SbiGood( r ); i++ )
                 {
                     r >> nOff;
-                    pStringOff[ i ] = (USHORT) nOff;
+                    pStringOff[ i ] = (sal_uInt16) nOff;
                 }
                 r >> nLen;
                 if( SbiGood( r ) )
                 {
                     delete [] pStrings;
                     pStrings = new sal_Unicode[ nLen ];
-                    nStringSize = (USHORT) nLen;
+                    nStringSize = (sal_uInt16) nLen;
 
                     char* pByteStrings = new char[ nLen ];
                     r.Read( pByteStrings, nStringSize );
                     for( short j = 0; j < nStrings; j++ )
                     {
-                        USHORT nOff2 = (USHORT) pStringOff[ j ];
+                        sal_uInt16 nOff2 = (sal_uInt16) pStringOff[ j ];
                         String aStr( pByteStrings + nOff2, eCharSet );
                         memcpy( pStrings + nOff2, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( sal_Unicode ) );
                     }
@@ -253,11 +253,11 @@ done:
     //if( eCharSet != ::GetSystemCharSet() )
         //ConvertStrings();
     if( !SbiGood( r ) )
-        bError = TRUE;
-    return BOOL( !bError );
+        bError = sal_True;
+    return sal_Bool( !bError );
 }
 
-BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
+sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
 {
     bool bLegacy = ( nVer < B_EXT_IMG_VERSION );
 
@@ -268,23 +268,23 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         SbiImage aEmptyImg;
         aEmptyImg.aName = aName;
         aEmptyImg.Save( r, B_LEGACYVERSION );	      		
-        return TRUE;
+        return sal_True;
     }
     // First of all the header
-    ULONG nStart = SbiOpenRecord( r, B_MODULE, 1 );
-    ULONG nPos;
+    sal_uIntPtr nStart = SbiOpenRecord( r, B_MODULE, 1 );
+    sal_uIntPtr nPos;
 
     eCharSet = GetSOStoreTextEncoding( eCharSet );
     if ( bLegacy )
-        r << (INT32) B_LEGACYVERSION;
+        r << (sal_Int32) B_LEGACYVERSION;
     else
-        r << (INT32) B_CURVERSION;
-    r  << (INT32) eCharSet
-      << (INT32) nDimBase
-      << (INT16) nFlags
-      << (INT16) 0
-      << (INT32) 0
-      << (INT32) 0;
+        r << (sal_Int32) B_CURVERSION;
+    r  << (sal_Int32) eCharSet
+      << (sal_Int32) nDimBase
+      << (sal_Int16) nFlags
+      << (sal_Int16) 0
+      << (sal_Int32) 0
+      << (sal_Int32) 0;
 
     // Name?
     if( aName.Len() && SbiGood( r ) )
@@ -321,9 +321,9 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         if( nLen > STRING_MAXLEN )
         {
             sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
-            UINT16 nUnitCount = UINT16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
+            sal_uInt16 nUnitCount = sal_uInt16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
             nPos = SbiOpenRecord( r, B_EXTSOURCE, nUnitCount );
-            for( UINT16 i = 0 ; i < nUnitCount ; i++ )
+            for( sal_uInt16 i = 0 ; i < nUnitCount ; i++ )
             {
                 sal_Int32 nCopyLen = 
                     (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen;
@@ -342,7 +342,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
         if ( bLegacy )
         {
             ReleaseLegacyBuffer(); // release any previously held buffer
-            PCodeBuffConvertor< UINT32, UINT16 > aNewToLegacy( (BYTE*)pCode, nCodeSize );
+            PCodeBuffConvertor< sal_uInt32, sal_uInt16 > aNewToLegacy( (sal_uInt8*)pCode, nCodeSize );
             aNewToLegacy.convert();
             pLegacyPCode = (char*)aNewToLegacy.GetBuffer();
             nLegacyCodeSize = aNewToLegacy.GetSize();
@@ -357,21 +357,21 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
     {
         nPos = SbiOpenRecord( r, B_STRINGPOOL, nStrings );
         // For every String:
-        //	UINT32 Offset of the Strings in the Stringblock
+        //	sal_uInt32 Offset of the Strings in the Stringblock
         short i;
 
         for( i = 0; i < nStrings && SbiGood( r ); i++ )
-            r << (UINT32) pStringOff[ i ];
+            r << (sal_uInt32) pStringOff[ i ];
 
         // Then the String-Block
         char* pByteStrings = new char[ nStringSize ];
         for( i = 0; i < nStrings; i++ )
         {
-            USHORT nOff = (USHORT) pStringOff[ i ];
+            sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ];
             ByteString aStr( pStrings + nOff, eCharSet );
             memcpy( pByteStrings + nOff, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( char ) );
         }
-        r << (UINT32) nStringSize;
+        r << (sal_uInt32) nStringSize;
         r.Write( pByteStrings, nStringSize );
 
         delete[] pByteStrings;
@@ -380,8 +380,8 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
     // Set overall length
     SbiCloseRecord( r, nStart );
     if( !SbiGood( r ) )
-        bError = TRUE;
-    return BOOL( !bError );
+        bError = sal_True;
+    return sal_Bool( !bError );
 }
 
 /**************************************************************************
@@ -397,15 +397,15 @@ void SbiImage::MakeStrings( short nSize )
     nStringOff = 0;
     nStringSize = 1024;
     pStrings = new sal_Unicode[ nStringSize ];
-    pStringOff = new UINT32[ nSize ];
+    pStringOff = new sal_uInt32[ nSize ];
     if( pStrings && pStringOff )
     {
         nStrings = nSize;
-        memset( pStringOff, 0, nSize * sizeof( UINT32 ) );
+        memset( pStringOff, 0, nSize * sizeof( sal_uInt32 ) );
         memset( pStrings, 0, nStringSize * sizeof( sal_Unicode ) );
     }
     else
-        bError = TRUE;
+        bError = sal_True;
 }
 
 // Add a string to StringPool. The String buffer is dynamically
@@ -413,16 +413,16 @@ void SbiImage::MakeStrings( short nSize )
 void SbiImage::AddString( const String& r )
 {
     if( nStringIdx >= nStrings )
-        bError = TRUE;
+        bError = sal_True;
     if( !bError )
     {
         xub_StrLen  len = r.Len() + 1;
-        UINT32 needed = nStringOff + len;
+        sal_uInt32 needed = nStringOff + len;
         if( needed > 0xFFFFFF00L )
-            bError = TRUE;	// out of mem!
+            bError = sal_True;	// out of mem!
         else if( needed > nStringSize )
         {
-            UINT32 nNewLen = needed + 1024;
+            sal_uInt32 nNewLen = needed + 1024;
             nNewLen &= 0xFFFFFC00;  // trim to 1K border
             if( nNewLen > 0xFFFFFF00L )
                 nNewLen = 0xFFFFFF00L;
@@ -432,10 +432,10 @@ void SbiImage::AddString( const String& r )
                 memcpy( p, pStrings, nStringSize * sizeof( sal_Unicode ) );
                 delete[] pStrings;
                 pStrings = p;
-                nStringSize = sal::static_int_cast< UINT32 >(nNewLen);
+                nStringSize = sal::static_int_cast< sal_uInt16 >(nNewLen);
             }
             else
-                bError = TRUE;
+                bError = sal_True;
         }
         if( !bError )
         {
@@ -454,7 +454,7 @@ void SbiImage::AddString( const String& r )
 // The block was fetched by the compiler from class SbBuffer and
 // is already created with new. Additionally it contains all Integers
 // in Big Endian format, so can be directly read/written.
-void SbiImage::AddCode( char* p, UINT32 s )
+void SbiImage::AddCode( char* p, sal_uInt32 s )
 {
     pCode = p;
     nCodeSize = s;
@@ -488,14 +488,14 @@ String SbiImage::GetString( short nId ) const
 {
     if( nId && nId <= nStrings )
     {
-        UINT32 nOff = pStringOff[ nId - 1 ];
+        sal_uInt32 nOff = pStringOff[ nId - 1 ];
         sal_Unicode* pStr = pStrings + nOff;
 
         // #i42467: Special treatment for vbNullChar
         if( *pStr == 0 )
         {
-            UINT32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
-            UINT32 nLen = nNextOff - nOff - 1;
+            sal_uInt32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
+            sal_uInt32 nLen = nNextOff - nOff - 1;
             if( nLen == 1 )
             {
                 // Force length 1 and make char 0 afterwards
@@ -518,14 +518,14 @@ const SbxObject* SbiImage::FindType (String aTypeName) const
     return rTypes.Is() ? (SbxObject*)rTypes->Find(aTypeName,SbxCLASS_OBJECT) : NULL;
 }
 
-UINT16 SbiImage::CalcLegacyOffset( INT32 nOffset )
+sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset )
 {
-    return SbiCodeGen::calcLegacyOffSet( (BYTE*)pCode, nOffset ) ;
+    return SbiCodeGen::calcLegacyOffSet( (sal_uInt8*)pCode, nOffset ) ;
 }
 
-UINT32 SbiImage::CalcNewOffset( INT16 nOffset )
+sal_uInt32 SbiImage::CalcNewOffset( sal_Int16 nOffset )
 {
-    return SbiCodeGen::calcNewOffSet( (BYTE*)pLegacyPCode, nOffset ) ;
+    return SbiCodeGen::calcNewOffSet( (sal_uInt8*)pLegacyPCode, nOffset ) ;
 }
 
 void  SbiImage::ReleaseLegacyBuffer()
@@ -535,11 +535,11 @@ void  SbiImage::ReleaseLegacyBuffer()
     nLegacyCodeSize = 0;
 }
 
-BOOL SbiImage::ExceedsLegacyLimits()
+sal_Bool SbiImage::ExceedsLegacyLimits()
 {
     if ( ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) > 0xFF00L ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index e00ed4674c..e00ed4674c 100644..100755
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 1094508a86..90532e1f77 100644..100755
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -94,7 +94,7 @@ SbPropertyValues::~SbPropertyValues()
 {
     _xInfo = Reference< XPropertySetInfo >();
 
-    for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
         delete _aPropVals.GetObject( n );
 }
 
@@ -113,7 +113,7 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw(
 
 //-------------------------------------------------------------------------
 
-INT32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
 {
     PropertyValue **ppPV;
     ppPV = (PropertyValue **)
@@ -134,9 +134,9 @@ void SbPropertyValues::setPropertyValue(
                     ::com::sun::star::lang::WrappedTargetException,
                     ::com::sun::star::uno::RuntimeException)
 {
-    INT32 nIndex = GetIndex_Impl( aPropertyName );
+    sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
     PropertyValue *pPropVal = _aPropVals.GetObject(
-        sal::static_int_cast< USHORT >(nIndex));
+        sal::static_int_cast< sal_uInt16 >(nIndex));
     pPropVal->Value = aValue;
 }
 
@@ -148,10 +148,10 @@ Any SbPropertyValues::getPropertyValue(
                     ::com::sun::star::lang::WrappedTargetException,
                     ::com::sun::star::uno::RuntimeException)
 {
-    INT32 nIndex = GetIndex_Impl( aPropertyName );
+    sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
     if ( nIndex != USHRT_MAX )
         return _aPropVals.GetObject(
-            sal::static_int_cast< USHORT >(nIndex))->Value;
+            sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
     return Any();
 }
 
@@ -200,7 +200,7 @@ void SbPropertyValues::removeVetoableChangeListener(
 Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
 {
     Sequence<PropertyValue> aRet( _aPropVals.Count());
-    for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
         aRet.getArray()[n] = *_aPropVals.GetObject(n);
     return aRet;
 }
@@ -232,14 +232,14 @@ PropertySetInfoImpl::PropertySetInfoImpl()
 {
 }
 
-INT32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
 {
     Property *pP;
     pP = (Property*)
             bsearch( &rPropName, _aProps.getConstArray(), _aProps.getLength(),
                       sizeof( Property ),
                       SbCompare_UString_Property_Impl );
-    return pP ? sal::static_int_cast<INT32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
+    return pP ? sal::static_int_cast<sal_Int32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
 }
 
 Sequence< Property > PropertySetInfoImpl::getProperties(void) throw()
@@ -273,7 +273,7 @@ SbPropertySetInfo::SbPropertySetInfo()
 SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
 {
     aImpl._aProps.realloc( rPropVals.Count() );
-    for ( USHORT n = 0; n < rPropVals.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < rPropVals.Count(); ++n )
     {
         Property &rProp = aImpl._aProps.getArray()[n];
         const PropertyValue &rPropVal = *rPropVals.GetObject(n);
@@ -303,7 +303,7 @@ Property SbPropertySetInfo::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }
 
-BOOL SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
@@ -324,7 +324,7 @@ SbPropertyContainer::~SbPropertyContainer()
 
 //----------------------------------------------------------------------------
 void SbPropertyContainer::addProperty(const ::rtl::OUString& Name,
-                                      INT16 Attributes,
+                                      sal_Int16 Attributes,
                                       const Any& DefaultValue)
     throw(  PropertyExistException, IllegalTypeException,
             IllegalArgumentException, RuntimeException )
@@ -354,7 +354,7 @@ Property SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }
 
-BOOL SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
@@ -376,7 +376,7 @@ void SbPropertyContainer::setPropertyValues(const Sequence< PropertyValue >& Pro
 
 //----------------------------------------------------------------------------
 
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index bbc44d69f8..1d2e1edcef 100644..100755
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -53,7 +53,10 @@
 #include "sb.hrc"
 #include <basrid.hxx>
 #include <osl/mutex.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/util/XCloseBroadcaster.hpp>
+#include <com/sun/star/util/XCloseListener.hpp>
 #include "errobject.hxx"
 #include <boost/unordered_map.hpp>
 
@@ -67,11 +70,151 @@ TYPEINIT1(StarBASIC,SbxObject)
 
 #define RTLNAME "@SBRTL"
 //  i#i68894#
+using namespace ::com::sun::star;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::lang::XMultiServiceFactory;
 
+// ============================================================================
+
+class DocBasicItem : public ::cppu::WeakImplHelper1< util::XCloseListener >
+{
+public:
+    explicit DocBasicItem( StarBASIC& rDocBasic );
+    virtual ~DocBasicItem();
+
+    inline const SbxObjectRef& getClassModules() const { return mxClassModules; }
+    inline bool isDocClosed() const { return mbDocClosed; }
+
+    void clearDependingVarsOnDelete( StarBASIC& rDeletedBasic );
+
+    void startListening();
+    void stopListening();
+
+    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
+    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
+
+private:
+    StarBASIC&      mrDocBasic;
+    SbxObjectRef    mxClassModules;
+    bool            mbDocClosed;
+    bool            mbDisposed;
+};
+
+// ----------------------------------------------------------------------------
+
+DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
+    mrDocBasic( rDocBasic ),
+    mxClassModules( new SbxObject( String() ) ),
+    mbDocClosed( false ),
+    mbDisposed( false )
+{
+}
+
+DocBasicItem::~DocBasicItem()
+{
+    stopListening();
+}
+
+void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
+{
+    mrDocBasic.implClearDependingVarsOnDelete( &rDeletedBasic );
+}
+
+void DocBasicItem::startListening()
+{
+    Any aThisComp;
+    mrDocBasic.GetUNOConstant( "ThisComponent", aThisComp );
+    Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
+    if( xCloseBC.is() )
+        try { xCloseBC->addCloseListener( this ); } catch( uno::Exception& ) {}
+}
+
+void DocBasicItem::stopListening()
+{
+    if( mbDisposed ) return;
+    mbDisposed = true;
+    Any aThisComp;
+    mrDocBasic.GetUNOConstant( "ThisComponent", aThisComp );
+    Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
+    if( xCloseBC.is() )
+        try { xCloseBC->removeCloseListener( this ); } catch( uno::Exception& ) {}
+}
+
+void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException)
+{
+}
+
+void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+{
+    stopListening();
+    mbDocClosed = true;
+}
+
+void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+{
+    stopListening();
+}
+
+// ----------------------------------------------------------------------------
+
+namespace {
+
+typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef;
+typedef boost::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap;
+    //    ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
+
+static DocBasicItemMap GaDocBasicItems;
+
+const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
+{
+    DocBasicItemMap::iterator it = GaDocBasicItems.find( pDocBasic );
+    return (it != GaDocBasicItems.end()) ? it->second.get() : 0;
+}
+
+void lclInsertDocBasicItem( StarBASIC& rDocBasic )
+{
+    DocBasicItemRef& rxDocBasicItem = GaDocBasicItems[ &rDocBasic ];
+    rxDocBasicItem.set( new DocBasicItem( rDocBasic ) );
+    rxDocBasicItem->startListening();
+}
+
+void lclRemoveDocBasicItem( StarBASIC& rDocBasic )
+{
+    DocBasicItemMap::iterator it = GaDocBasicItems.find( &rDocBasic );
+    if( it != GaDocBasicItems.end() )
+    {
+        it->second->stopListening();
+        GaDocBasicItems.erase( it );
+    }
+    DocBasicItemMap::iterator it_end = GaDocBasicItems.end();
+    for( it = GaDocBasicItems.begin(); it != it_end; ++it )
+        it->second->clearDependingVarsOnDelete( rDocBasic );
+}
+
+StarBASIC* lclGetDocBasicForModule( SbModule* pModule )
+{
+    StarBASIC* pRetBasic = NULL;
+    SbxObject* pCurParent = pModule;
+    while( pCurParent->GetParent() != NULL )
+    {
+        pCurParent = pCurParent->GetParent();
+        StarBASIC* pDocBasic = PTR_CAST( StarBASIC, pCurParent );
+        if( pDocBasic != NULL && pDocBasic->IsDocBasic() )
+        {
+            pRetBasic = pDocBasic;
+            break;
+        }
+    }
+    return pRetBasic;
+}
+
+} // namespace
+
+// ============================================================================
+
 SbxObject* StarBASIC::getVBAGlobals( )
 {
     if ( !pVBAGlobals )
@@ -113,7 +256,7 @@ SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
 // Create array for conversion SFX <-> VB error code
 struct SFX_VB_ErrorItem
 {
-    USHORT  nErrorVB;
+    sal_uInt16  nErrorVB;
     SbError nErrorSFX;
 };
 
@@ -249,7 +392,7 @@ const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
 // the Modul-relationshop. But it works only when a modul is loaded.
 // Can cause troubles with separately loaded properties!
 
-SbxBase* SbiFactory::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
 {
     if( nCreator ==  SBXCR_SBX )
     {
@@ -298,11 +441,11 @@ SbxObject* SbiFactory::CreateObject( const String& rClass )
 class SbOLEFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbOLEFactory::Create( UINT16, UINT32 )
+SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -323,11 +466,11 @@ SbxObject* SbOLEFactory::CreateObject( const String& rClassName )
 class SbFormFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbFormFactory::Create( UINT16, UINT32 )
+SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -341,7 +484,18 @@ SbxObject* SbFormFactory::CreateObject( const String& rClassName )
         {
             if( SbUserFormModule* pFormModule = PTR_CAST( SbUserFormModule, pVar->GetObject() ) )
             {
-                pFormModule->Load();
+                bool bInitState = pFormModule->getInitState();
+                if( bInitState )
+                {
+                    // Not the first instantiate, reset
+                    bool bTriggerTerminateEvent = false;
+                    pFormModule->ResetApiObj( bTriggerTerminateEvent );
+                    pFormModule->setInitState( false );
+                }
+                else
+                {
+                    pFormModule->Load();
+                }
                 return pFormModule->CreateInstance();
             }
         }
@@ -360,8 +514,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
 
     // Copy the properties, not only the reference to them
     SbxArray* pProps = pRet->GetProperties();
-    UINT32 nCount = pProps->Count32();
-    for( UINT32 i = 0 ; i < nCount ; i++ )
+    sal_uInt32 nCount = pProps->Count32();
+    for( sal_uInt32 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pVar = pProps->Get32( i );
         SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
@@ -378,18 +532,18 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
                 pDest->setHasFixedSize( pSource->hasFixedSize() );
                 if ( pSource->GetDims() && pSource->hasFixedSize() )
                 {
-                    INT32 lb = 0;
-                    INT32 ub = 0;
-                    for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
+                    sal_Int32 lb = 0;
+                    sal_Int32 ub = 0;
+                    for ( sal_Int32 j = 1 ; j <= pSource->GetDims(); ++j )
                     {
-                        pSource->GetDim32( (INT32)j, lb, ub );
+                        pSource->GetDim32( (sal_Int32)j, lb, ub );
                         pDest->AddDim32( lb, ub );
                     }
                 }
                 else
                     pDest->unoAddDim( 0, -1 ); // variant array
 
-                USHORT nSavFlags = pVar->GetFlags();
+                sal_uInt16 nSavFlags = pVar->GetFlags();
                 pNewProp->ResetFlag( SBX_FIXED );
                 // need to reset the FIXED flag
                 // when calling PutObject ( because the type will not match Object )
@@ -415,11 +569,11 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
 class SbTypeFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
-SbxBase* SbTypeFactory::Create( UINT16, UINT32 )
+SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -444,6 +598,7 @@ SbxObject* createUserTypeImpl( const String& rClassName )
     return pRetObj;
 }
 
+
 TYPEINIT1(SbClassModuleObject,SbModule)
 
 SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
@@ -463,8 +618,8 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
 
     // Copy the methods from original class module
     SbxArray* pClassMethods = pClassModule->GetMethods();
-    UINT32 nMethodCount = pClassMethods->Count32();
-    UINT32 i;
+    sal_uInt32 nMethodCount = pClassMethods->Count32();
+    sal_uInt32 i;
     for( i = 0 ; i < nMethodCount ; i++ )
     {
         SbxVariable* pVar = pClassMethods->Get32( i );
@@ -476,7 +631,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             SbMethod* pMethod = PTR_CAST(SbMethod, pVar );
             if( pMethod )
             {
-                USHORT nFlags_ = pMethod->GetFlags();
+                sal_uInt16 nFlags_ = pMethod->GetFlags();
                 pMethod->SetFlag( SBX_NO_BROADCAST );
                 SbMethod* pNewMethod = new SbMethod( *pMethod );
                 pNewMethod->ResetFlag( SBX_NO_BROADCAST );
@@ -484,7 +639,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
                 pNewMethod->pMod = this;
                 pNewMethod->SetParent( this );
                 pMethods->PutDirect( pNewMethod, i );
-                StartListening( pNewMethod->GetBroadcaster(), TRUE );
+                StartListening( pNewMethod->GetBroadcaster(), sal_True );
             }
         }
     }
@@ -522,14 +677,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
 
     // Copy the properties from original class module
     SbxArray* pClassProps = pClassModule->GetProperties();
-    UINT32 nPropertyCount = pClassProps->Count32();
+    sal_uInt32 nPropertyCount = pClassProps->Count32();
     for( i = 0 ; i < nPropertyCount ; i++ )
     {
         SbxVariable* pVar = pClassProps->Get32( i );
         SbProcedureProperty* pProcedureProp = PTR_CAST( SbProcedureProperty, pVar );
         if( pProcedureProp )
         {
-            USHORT nFlags_ = pProcedureProp->GetFlags();
+            sal_uInt16 nFlags_ = pProcedureProp->GetFlags();
             pProcedureProp->SetFlag( SBX_NO_BROADCAST );
             SbProcedureProperty* pNewProp = new SbProcedureProperty
                 ( pProcedureProp->GetName(), pProcedureProp->GetType() );
@@ -538,14 +693,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
             pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
             pProcedureProp->SetFlags( nFlags_ );
             pProps->PutDirect( pNewProp, i );
-            StartListening( pNewProp->GetBroadcaster(), TRUE );
+            StartListening( pNewProp->GetBroadcaster(), sal_True );
         }
         else
         {
             SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
             if( pProp )
             {
-                USHORT nFlags_ = pProp->GetFlags();
+                sal_uInt16 nFlags_ = pProp->GetFlags();
                 pProp->SetFlag( SBX_NO_BROADCAST );
                 SbxProperty* pNewProp = new SbxProperty( *pProp );
 
@@ -559,7 +714,6 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
                     if( pObj != NULL )
                     {
                         String aObjClass = pObj->GetClassName();
-                        (void)aObjClass;
 
                         SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pObjBase);
                         if( pClassModuleObj != NULL )
@@ -594,8 +748,12 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
 
 SbClassModuleObject::~SbClassModuleObject()
 {
+    // do not trigger termination event when document is already closed
     if( StarBASIC::IsRunning() )
-        triggerTerminateEvent();
+        if( StarBASIC* pDocBasic = lclGetDocBasicForModule( this ) )
+            if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+                if( !pDocBasicItem->isDocClosed() )
+                    triggerTerminateEvent();
 
     // Must be deleted by base class dtor because this data
     // is not owned by the SbClassModuleObject object
@@ -606,7 +764,7 @@ SbClassModuleObject::~SbClassModuleObject()
 void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                            const SfxHint& rHint, const TypeId& rHintType )
 {
-    SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+    handleProcedureProperties( rBC, rHint );
 }
 
 SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
@@ -683,8 +841,14 @@ SbClassFactory::~SbClassFactory()
 
 void SbClassFactory::AddClassModule( SbModule* pClassModule )
 {
+    SbxObjectRef xToUseClassModules = xClassModules;
+
+    if( StarBASIC* pDocBasic = lclGetDocBasicForModule( pClassModule ) )
+        if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+            xToUseClassModules = pDocBasicItem->getClassModules();
+
     SbxObject* pParent = pClassModule->GetParent();
-    xClassModules->Insert( pClassModule );
+    xToUseClassModules->Insert( pClassModule );
     pClassModule->SetParent( pParent );
 }
 
@@ -693,7 +857,7 @@ void SbClassFactory::RemoveClassModule( SbModule* pClassModule )
     xClassModules->Remove( pClassModule );
 }
 
-SbxBase* SbClassFactory::Create( UINT16, UINT32 )
+SbxBase* SbClassFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Not supported
     return NULL;
@@ -701,12 +865,19 @@ SbxBase* SbClassFactory::Create( UINT16, UINT32 )
 
 SbxObject* SbClassFactory::CreateObject( const String& rClassName )
 {
-    SbxVariable* pVar = xClassModules->Find( rClassName, SbxCLASS_DONTCARE );
+    SbxObjectRef xToUseClassModules = xClassModules;
+
+    if( SbModule* pMod = pMOD )
+        if( StarBASIC* pDocBasic = lclGetDocBasicForModule( pMod ) )
+            if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+                xToUseClassModules = pDocBasicItem->getClassModules();
+
+    SbxVariable* pVar = xToUseClassModules->Find( rClassName, SbxCLASS_OBJECT );
     SbxObject* pRet = NULL;
     if( pVar )
     {
-        SbModule* pMod = (SbModule*)pVar;
-        pRet = new SbClassModuleObject( pMod );
+        SbModule* pVarMod = (SbModule*)pVar;
+        pRet = new SbClassModuleObject( pVarMod );
     }
     return pRet;
 }
@@ -718,21 +889,19 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
     return pMod;
 }
 
-StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
+StarBASIC::StarBASIC( StarBASIC* p, sal_Bool bIsDocBasic  )
     : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
 {
     SetParent( p );
     pLibInfo = NULL;
-    bNoRtl = bBreak = FALSE;
-    bVBAEnabled = FALSE;
+    bNoRtl = bBreak = sal_False;
+    bVBAEnabled = sal_False;
     pModules = new SbxArray;
 
     if( !GetSbData()->nInst++ )
     {
         pSBFAC = new SbiFactory;
         AddFactory( pSBFAC );
-        pUNOFAC = new SbUnoFactory;
-        AddFactory( pUNOFAC );
         pTYPEFAC = new SbTypeFactory;
         AddFactory( pTYPEFAC );
         pCLASSFAC = new SbClassFactory;
@@ -741,23 +910,31 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic  )
         AddFactory( pOLEFAC );
         pFORMFAC = new SbFormFactory;
         AddFactory( pFORMFAC );
+        pUNOFAC = new SbUnoFactory;
+        AddFactory( pUNOFAC );
     }
     pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
     // Search via StarBasic is always global
     SetFlag( SBX_GBLSEARCH );
     pVBAGlobals = NULL;
-    bQuit = FALSE;
+    bQuit = sal_False;
+
+    if( bDocBasic )
+        lclInsertDocBasicItem( *this );
 }
 
 // #51727 Override SetModified so that the modified state
 // is not given to the parent
-void StarBASIC::SetModified( BOOL b )
+void StarBASIC::SetModified( sal_Bool b )
 {
     SbxBase::SetModified( b );
 }
 
 StarBASIC::~StarBASIC()
 {
+    // Needs to be first action as it can trigger events
+    disposeComVariablesForBasic( this );
+
     if( !--GetSbData()->nInst )
     {
         RemoveFactory( pSBFAC );
@@ -786,18 +963,30 @@ StarBASIC::~StarBASIC()
     }
 #endif
     }
+    else if( bDocBasic )
+    {
+        SbxError eOld = SbxBase::GetError();
+
+        lclRemoveDocBasicItem( *this );
+
+        SbxBase::ResetError();
+        if( eOld != SbxERR_OK )
+            SbxBase::SetError( eOld );
+    }
 
     // #100326 Set Parent NULL in registered listeners
     if( xUnoListeners.Is() )
     {
-        USHORT uCount = xUnoListeners->Count();
-        for( USHORT i = 0 ; i < uCount ; i++ )
+        sal_uInt16 uCount = xUnoListeners->Count();
+        for( sal_uInt16 i = 0 ; i < uCount ; i++ )
         {
             SbxVariable* pListenerObj = xUnoListeners->Get( i );
             pListenerObj->SetParent( NULL );
         }
         xUnoListeners = NULL;
     }
+
+    clearUnoMethodsForBasic( this );
 }
 
 // Override new() operator, so that everyone can create a new instance
@@ -805,7 +994,7 @@ void* StarBASIC::operator new( size_t n )
 {
     if( n < sizeof( StarBASIC ) )
     {
-//		DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" );
+//		DBG_ASSERT( sal_False, "Warnung: inkompatibler BASIC-Stand!" );
         n = sizeof( StarBASIC );
     }
     return ::operator new( n );
@@ -816,6 +1005,27 @@ void StarBASIC::operator delete( void* p )
     ::operator delete( p );
 }
 
+void StarBASIC::implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic )
+{
+    if( this != pDeletedBasic )
+    {
+        for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
+        {
+            SbModule* p = (SbModule*)pModules->Get( i );
+            p->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+        }
+    }
+
+    for( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
+    {
+        SbxVariable* pVar = pObjs->Get( nObj );
+        StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
+        if( pBasic && pBasic != pDeletedBasic )
+            pBasic->implClearDependingVarsOnDelete( pDeletedBasic );
+    }
+}
+
+
 /**************************************************************************
 *
 *    Creation/Managment of modules
@@ -860,7 +1070,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
     p->SetSource32( rSrc );
     p->SetParent( this );
     pModules->Insert( p, pModules->Count() );
-    SetModified( TRUE );
+    SetModified( sal_True );
     return p;
 }
 
@@ -870,14 +1080,14 @@ void StarBASIC::Insert( SbxVariable* pVar )
     {
         pModules->Insert( pVar, pModules->Count() );
         pVar->SetParent( this );
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
     }
     else
     {
-        BOOL bWasModified = IsModified();
+        sal_Bool bWasModified = IsModified();
         SbxObject::Insert( pVar );
         if( !bWasModified && pVar->IsSet( SBX_DONTSTORE ) )
-            SetModified( FALSE );
+            SetModified( sal_False );
     }
 }
 
@@ -895,17 +1105,17 @@ void StarBASIC::Remove( SbxVariable* pVar )
         SbxObject::Remove( pVar );
 }
 
-BOOL StarBASIC::Compile( SbModule* pMod )
+sal_Bool StarBASIC::Compile( SbModule* pMod )
 {
-    return pMod ? pMod->Compile() : FALSE;
+    return pMod ? pMod->Compile() : sal_False;
 }
 
-BOOL StarBASIC::Disassemble( SbModule* pMod, String& rText )
+sal_Bool StarBASIC::Disassemble( SbModule* pMod, String& rText )
 {
     rText.Erase();
     if( pMod )
         pMod->Disassemble( rText );
-    return BOOL( rText.Len() != 0 );
+    return sal_Bool( rText.Len() != 0 );
 }
 
 void StarBASIC::Clear()
@@ -916,7 +1126,7 @@ void StarBASIC::Clear()
 
 SbModule* StarBASIC::FindModule( const String& rName )
 {
-    for( USHORT i = 0; i < pModules->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( p->GetName().EqualsIgnoreCaseAscii( rName ) )
@@ -945,15 +1155,15 @@ struct ClassModuleRunInitItem
     {}
 };
 
-typedef boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
-    ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
-
-static ModuleInitDependencyMap* GpMIDMap = NULL;
+// Derive from unordered_map type instead of typedef
+// to allow forward declaration in sbmod.hxx
+class ModuleInitDependencyMap : public
+    boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
+                          ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
+{};
 
-void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
+void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )
 {
-    ModuleInitDependencyMap& rMIDMap = *GpMIDMap;
-
     rItem.m_bProcessing = true;
 
     //bool bAnyDependencies = true;
@@ -968,8 +1178,8 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
                 String& rStr = *it;
 
                 // Is required type a class module?
-                ModuleInitDependencyMap::iterator itFind = rMIDMap.find( rStr );
-                if( itFind != rMIDMap.end() )
+                ModuleInitDependencyMap::iterator itFind = rMap.find( rStr );
+                if( itFind != rMap.end() )
                 {
                     ClassModuleRunInitItem& rParentItem = itFind->second;
                     if( rParentItem.m_bProcessing )
@@ -980,7 +1190,7 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
                     }
 
                     if( !rParentItem.m_bRunInitDone )
-                        implProcessModuleRunInit( rParentItem );
+                        implProcessModuleRunInit( rMap, rParentItem );
                 }
             }
         }
@@ -994,8 +1204,10 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
 // Run Init-Code of all modules (including inserted libraries)
 void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 {
+    SolarMutexGuard guard;
+
     // Init own modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         if(	!pModule->IsCompiled() )
@@ -1008,8 +1220,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     // Consider required types to init in right order. Class modules
     // that are required by other modules have to be initialized first.
     ModuleInitDependencyMap aMIDMap;
-    GpMIDMap = &aMIDMap;
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         String aModuleName = pModule->GetName();
@@ -1021,12 +1232,11 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
     for( it = aMIDMap.begin() ; it != aMIDMap.end(); ++it )
     {
         ClassModuleRunInitItem& rItem = it->second;
-        SbModule::implProcessModuleRunInit( rItem );
+        SbModule::implProcessModuleRunInit( aMIDMap, rItem );
     }
-    GpMIDMap = NULL;
 
     // Call RunInit on standard modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         if( !pModule->isProxyModule() )
@@ -1035,7 +1245,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 
     // Check all objects if they are BASIC,
     // if yes initialize
-    for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1049,14 +1259,14 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
 void StarBASIC::DeInitAllModules( void )
 {
     // Deinit own modules
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
-        if( pModule->pImage )
+        if( pModule->pImage && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
             pModule->pImage->bInit = false;
     }
 
-    for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+    for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
     {
         SbxVariable* pVar = pObjs->Get( nObj );
         StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1069,13 +1279,13 @@ void StarBASIC::DeInitAllModules( void )
 void StarBASIC::ClearGlobalVars( void )
 {
     SbxArrayRef xProps( GetProperties() );
-    USHORT nPropCount = xProps->Count();
-    for ( USHORT nProp = 0 ; nProp < nPropCount ; ++nProp )
+    sal_uInt16 nPropCount = xProps->Count();
+    for ( sal_uInt16 nProp = 0 ; nProp < nPropCount ; ++nProp )
     {
         SbxBase* pVar = xProps->Get( nProp );
         pVar->Clear();
     }
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 // This implementation at first searches within the runtime library,
@@ -1106,7 +1316,7 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
     }
     // Search module
     if( !pRes )
-      for( USHORT i = 0; i < pModules->Count(); i++ )
+      for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( p->IsVisible() )
@@ -1123,12 +1333,12 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
             }
             // Only variables qualified by the Module Name e.g. Sheet1.foo
             // should work for Documant && Class type Modules
-            INT32 nType = p->GetModuleType();
+            sal_Int32 nType = p->GetModuleType();
             if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
                 continue;
             // otherwise check if the element is available
             // unset GBLSEARCH-Flag (due to Rekursion)
-            USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
+            sal_uInt16 nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
             p->ResetFlag( SBX_GBLSEARCH );
             pRes = p->Find( rName, t );
             p->SetFlag( nGblFlag );
@@ -1144,9 +1354,9 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
     return pRes;
 }
 
-BOOL StarBASIC::Call( const String& rName, SbxArray* pParam )
+sal_Bool StarBASIC::Call( const String& rName, SbxArray* pParam )
 {
-    BOOL bRes = SbxObject::Call( rName, pParam );
+    sal_Bool bRes = SbxObject::Call( rName, pParam );
     if( !bRes )
     {
         SbxError eErr = SbxBase::GetError();
@@ -1169,7 +1379,7 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName )
 
 // Preserve old interface
 SbxVariable* StarBASIC::FindVarInCurrentScopy
-( const String& rName, USHORT& rStatus )
+( const String& rName, sal_uInt16& rStatus )
 {
     rStatus = 1;              // Presumption: nothing found
     SbxVariable* pVar = NULL;
@@ -1187,7 +1397,7 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
 void StarBASIC::QuitAndExitApplication()
 {
     Stop();
-    bQuit = TRUE;
+    bQuit = sal_True;
 }
 
 void StarBASIC::Stop()
@@ -1200,9 +1410,9 @@ void StarBASIC::Stop()
     }
 }
 
-BOOL StarBASIC::IsRunning()
+sal_Bool StarBASIC::IsRunning()
 {
-    return BOOL( pINST != NULL );
+    return sal_Bool( pINST != NULL );
 }
 
 /**************************************************************************
@@ -1213,7 +1423,7 @@ BOOL StarBASIC::IsRunning()
 
 // Activation of an object. There is no need to access active objects
 // with name via BASIC. If NULL is given, everything is activated.
-void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
+void StarBASIC::ActivateObject( const String* pName, sal_Bool bActivate )
 {
     if( pName )
     {
@@ -1228,7 +1438,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
     }
     else
     {
-        for( USHORT i = 0; i < GetObjects()->Count(); i++ )
+        for( sal_uInt16 i = 0; i < GetObjects()->Count(); i++ )
         {
             SbxObject* p = (SbxObject*) GetObjects()->Get( i );
             if( bActivate )
@@ -1245,7 +1455,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
 *
 **************************************************************************/
 
-SbMethod* StarBASIC::GetActiveMethod( USHORT nLevel )
+SbMethod* StarBASIC::GetActiveMethod( sal_uInt16 nLevel )
 {
     if( pINST )
         return pINST->GetCaller( nLevel );
@@ -1261,41 +1471,41 @@ SbModule* StarBASIC::GetActiveModule()
         return pCMOD;
 }
 
-USHORT StarBASIC::BreakPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SetErrorData( 0, l, c1, c2 );
-    bBreak = TRUE;
+    bBreak = sal_True;
     if( GetSbData()->aBreakHdl.IsSet() )
-        return (USHORT) GetSbData()->aBreakHdl.Call( this );
+        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
     else
         return BreakHdl();
 }
 
-USHORT StarBASIC::StepPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::StepPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SetErrorData( 0, l, c1, c2 );
-    bBreak = FALSE;
+    bBreak = sal_False;
     if( GetSbData()->aBreakHdl.IsSet() )
-        return (USHORT) GetSbData()->aBreakHdl.Call( this );
+        return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
     else
         return BreakHdl();
 }
 
-USHORT StarBASIC::BreakHdl()
+sal_uInt16 StarBASIC::BreakHdl()
 {
-    return (USHORT) ( aBreakHdl.IsSet()
+    return (sal_uInt16) ( aBreakHdl.IsSet()
         ? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
 }
 
 // Calls for error handler and break handler
-USHORT StarBASIC::GetLine()		{ return GetSbData()->nLine; }
-USHORT StarBASIC::GetCol1()		{ return GetSbData()->nCol1; }
-USHORT StarBASIC::GetCol2()		{ return GetSbData()->nCol2; }
+sal_uInt16 StarBASIC::GetLine()		{ return GetSbData()->nLine; }
+sal_uInt16 StarBASIC::GetCol1()		{ return GetSbData()->nCol1; }
+sal_uInt16 StarBASIC::GetCol2()		{ return GetSbData()->nCol2; }
 
 // Specific to error handler
 SbError StarBASIC::GetErrorCode()		{ return GetSbData()->nCode; }
 const String& StarBASIC::GetErrorText()	{ return GetSbData()->aErrMsg; }
-BOOL StarBASIC::IsCompilerError()		{ return GetSbData()->bCompiler; }
+sal_Bool StarBASIC::IsCompilerError()		{ return GetSbData()->bCompiler; }
 void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
 {
     GetSbData()->eLanguageMode = eLanguageMode;
@@ -1322,9 +1532,9 @@ SbLanguageMode StarBASIC::GetLanguageMode()
 // binaere search by VB-Error -> SFX-Error.
 
 // Map back new error codes to old, Sbx-compatible
-USHORT StarBASIC::GetVBErrorCode( SbError nError )
+sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
 {
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
 
     if( SbiRuntime::isVBAEnabled() )
     {
@@ -1349,7 +1559,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
     
     // search loop
     const SFX_VB_ErrorItem* pErrItem;
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     do
     {
         pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1364,7 +1574,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
     return nRet;
 }
 
-SbError	StarBASIC::GetSfxFromVBError( USHORT nError )
+SbError	StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
 {
     SbError nRet = 0L;
 
@@ -1396,7 +1606,7 @@ SbError	StarBASIC::GetSfxFromVBError( USHORT nError )
         }
     }
     const SFX_VB_ErrorItem* pErrItem;
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     do
     {
         pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1416,7 +1626,7 @@ SbError	StarBASIC::GetSfxFromVBError( USHORT nError )
 
 // set Error- / Break-data
 void StarBASIC::SetErrorData
-( SbError nCode, USHORT nLine, USHORT nCol1, USHORT nCol2 )
+( SbError nCode, sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
 {
     SbiGlobals& aGlobals = *GetSbData();
     aGlobals.nCode = nCode;
@@ -1432,26 +1642,26 @@ struct BasicStringList_Impl : private Resource
 {
     ResId aResId;
 
-    BasicStringList_Impl( ResId& rErrIdP,  USHORT nId)
+    BasicStringList_Impl( ResId& rErrIdP,  sal_uInt16 nId)
         : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr() ){}
     ~BasicStringList_Impl() { FreeResource(); }
 
     String GetString(){ return String( aResId ); }
-    BOOL IsErrorTextAvailable( void )
+    sal_Bool IsErrorTextAvailable( void )
         { return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
 };
 //----------------------------------------------------------------
 
 // Flag, that prevent the activation of the SFX-Resources at a Basic error
-static BOOL bStaticSuppressSfxResource = FALSE;
+static sal_Bool bStaticSuppressSfxResource = sal_False;
 
-void StarBASIC::StaticSuppressSfxResource( BOOL bSuppress )
+void StarBASIC::StaticSuppressSfxResource( sal_Bool bSuppress )
 {
     bStaticSuppressSfxResource = bSuppress;
 }
 
 // Hack for #83750, use bStaticSuppressSfxResource as setup flag
-BOOL runsInSetup( void )
+sal_Bool runsInSetup( void )
 {
     return bStaticSuppressSfxResource;
 }
@@ -1467,11 +1677,11 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
         return;
     }
 
-    USHORT nOldID = GetVBErrorCode( nId );
+    sal_uInt16 nOldID = GetVBErrorCode( nId );
 
     // intantiate the help class
     BasResId aId( RID_BASIC_START );
-    BasicStringList_Impl aMyStringList( aId, USHORT(nId & ERRCODE_RES_MASK) );
+    BasicStringList_Impl aMyStringList( aId, sal_uInt16(nId & ERRCODE_RES_MASK) );
 
     if( aMyStringList.IsErrorTextAvailable() )
     {
@@ -1479,7 +1689,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
         String aMsg1 = aMyStringList.GetString();
         // replace argument placeholder with %s
         String aSrgStr( RTL_CONSTASCII_USTRINGPARAM("$(ARG1)") );
-        USHORT nResult = aMsg1.Search( aSrgStr );
+        sal_uInt16 nResult = aMsg1.Search( aSrgStr );
 
         if( nResult != STRING_NOTFOUND )
         {
@@ -1500,8 +1710,8 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
 
 }
 
-BOOL StarBASIC::CError
-    ( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::CError
+    ( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1511,39 +1721,39 @@ BOOL StarBASIC::CError
         // #109018 Check if running Basic is affected
         StarBASIC* pStartedBasic = pINST->GetBasic();
         if( pStartedBasic != this )
-            return FALSE;
+            return sal_False;
 
         Stop();
     }
 
     // set flag, so that GlobalRunInit notice the error
-    GetSbData()->bGlobalInitErr = TRUE;
+    GetSbData()->bGlobalInitErr = sal_True;
 
     // tinker the error message
     MakeErrorText( code, rMsg );
 
     // Implementation of the code for the string transport to SFX-Error
     if( rMsg.Len() )
-        code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+        code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
 
     SetErrorData( code, l, c1, c2 );
-    GetSbData()->bCompiler = TRUE;
-    BOOL bRet;
+    GetSbData()->bCompiler = sal_True;
+    sal_Bool bRet;
     if( GetSbData()->aErrHdl.IsSet() )
-        bRet = (BOOL) GetSbData()->aErrHdl.Call( this );
+        bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
     else
         bRet = ErrorHdl();
-    GetSbData()->bCompiler = FALSE;		// only true for error handler
+    GetSbData()->bCompiler = sal_False;		// only true for error handler
     return bRet;
 }
 
-BOOL StarBASIC::RTError
-    ( SbError code, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError
+    ( SbError code, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     return RTError( code, String(), l, c1, c2 );
 }
 
-BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1565,15 +1775,15 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
             aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
             aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
             aTmp +=  GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
-            code = (ULONG)*new StringErrorInfo( code, aTmp );
+            code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
         }
         else
-            code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+            code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
     }
 
     SetErrorData( code, l, c1, c2 );
     if( GetSbData()->aErrHdl.IsSet() )
-        return (BOOL) GetSbData()->aErrHdl.Call( this );
+        return (sal_Bool) GetSbData()->aErrHdl.Call( this );
     else
         return ErrorHdl();
 }
@@ -1618,7 +1828,7 @@ String StarBASIC::GetErrorMsg()
         return String();
 }
 
-USHORT StarBASIC::GetErl()
+sal_uInt16 StarBASIC::GetErl()
 {
     if( pINST )
         return pINST->GetErl();
@@ -1626,10 +1836,10 @@ USHORT StarBASIC::GetErl()
         return 0;
 }
 
-BOOL StarBASIC::ErrorHdl()
+sal_Bool StarBASIC::ErrorHdl()
 {
-    return (BOOL) ( aErrorHdl.IsSet()
-        ? aErrorHdl.Call( this ) : FALSE );
+    return (sal_Bool) ( aErrorHdl.IsSet()
+        ? aErrorHdl.Call( this ) : sal_False );
 }
 
 Link StarBASIC::GetGlobalErrorHdl()
@@ -1667,16 +1877,16 @@ SbxArrayRef StarBASIC::getUnoListeners( void )
 *
 **************************************************************************/
 
-BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
+sal_Bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
 {
     if( !SbxObject::LoadData( r, nVer ) )
-        return FALSE;
+        return sal_False;
 
     // #95459 Delete dialogs, otherwise endless recursion
     // in SbxVarable::GetType() if dialogs are accessed
-    USHORT nObjCount = pObjs->Count();
+    sal_uInt16 nObjCount = pObjs->Count();
     SbxVariable** ppDeleteTab = new SbxVariable*[ nObjCount ];
-    USHORT nObj;
+    sal_uInt16 nObj;
 
     for( nObj = 0 ; nObj < nObjCount ; nObj++ )
     {
@@ -1692,14 +1902,14 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
     }
     delete[] ppDeleteTab;
 
-    UINT16 nMod;
+    sal_uInt16 nMod;
     pModules->Clear();
     r >> nMod;
-    for( USHORT i = 0; i < nMod; i++ )
+    for( sal_uInt16 i = 0; i < nMod; i++ )
     {
         SbModule* pMod = (SbModule*) SbxBase::Load( r );
         if( !pMod )
-            return FALSE;
+            return sal_False;
         else if( pMod->ISA(SbJScriptModule) )
         {
             // assign Ref, so that pMod will be deleted
@@ -1722,26 +1932,26 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
     // Search via StarBASIC is at all times global
     DBG_ASSERT( IsSet( SBX_GBLSEARCH ), "Basic ohne GBLSEARCH geladen" );
     SetFlag( SBX_GBLSEARCH );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL StarBASIC::StoreData( SvStream& r ) const
+sal_Bool StarBASIC::StoreData( SvStream& r ) const
 {
     if( !SbxObject::StoreData( r ) )
-        return FALSE;
-    r << (UINT16) pModules->Count();
-    for( USHORT i = 0; i < pModules->Count(); i++ )
+        return sal_False;
+    r << (sal_uInt16) pModules->Count();
+    for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
     {
         SbModule* p = (SbModule*) pModules->Get( i );
         if( !p->Store( r ) )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL StarBASIC::LoadOldModules( SvStream& )
+sal_Bool StarBASIC::LoadOldModules( SvStream& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
@@ -1757,6 +1967,54 @@ bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::u
     return bRes;
 }
 
+Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
+{
+    OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
+    if ( !pBasic )
+        return NULL;
+
+    // look for the ThisComponent variable, first in the parent (which
+    // might be the document's Basic), then in the parent's parent (which might be
+    // the application Basic)
+    const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
+    SbxVariable* pThisComponent = NULL;
+
+    SbxObject* pLookup = pBasic->GetParent();
+    while ( pLookup && !pThisComponent )
+    {
+        pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
+        pLookup = pLookup->GetParent();
+    }
+    if ( !pThisComponent )
+    {
+        OSL_TRACE("Failed to get ThisComponent");
+            // the application Basic, at the latest, should have this variable
+        return NULL;
+    }
+
+    Any aThisComponentAny( sbxToUnoValue( pThisComponent ) );
+    Reference< frame::XModel > xModel( aThisComponentAny, UNO_QUERY );
+    if ( !xModel.is() )
+    {
+        // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
+        Reference< frame::XController > xController( aThisComponentAny, UNO_QUERY );
+        if ( xController.is() )
+            xModel = xController->getModel();
+    }
+
+    if ( !xModel.is() )
+        return NULL;
+
+#if OSL_DEBUG_LEVEL > 0
+    OSL_TRACE("Have model ThisComponent points to url %s",
+        ::rtl::OUStringToOString( xModel->getURL(),
+            RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+#endif
+
+    return xModel;
+}
+
+
 //========================================================================
 // #118116 Implementation Collection object
 
@@ -1766,7 +2024,7 @@ static const char pCountStr[]	= "Count";
 static const char pAddStr[]		= "Add";
 static const char pItemStr[]	= "Item";
 static const char pRemoveStr[]	= "Remove";
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
 
 SbxInfoRef BasicCollection::xAddInfo = NULL;
 SbxInfoRef BasicCollection::xItemInfo = NULL;
@@ -1837,10 +2095,10 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
-        BOOL bRequestInfo = BOOL( nId == SBX_HINT_INFOWANTED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
+        sal_Bool bRequestInfo = sal_Bool( nId == SBX_HINT_INFOWANTED );
         SbxVariable* pVar = p->GetVar();
         SbxArray* pArg = pVar->GetParameters();
         XubString aVarName( pVar->GetName() );
@@ -1875,9 +2133,9 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
 }
 
-INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
+sal_Int32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
 {
-    INT32 nIndex = -1;
+    sal_Int32 nIndex = -1;
     if( pIndexVar->GetType() == SbxSTRING )
         nIndex = implGetIndexForName( pIndexVar->GetString() );
     else
@@ -1885,12 +2143,12 @@ INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
     return nIndex;
 }
 
-INT32 BasicCollection::implGetIndexForName( const String& rName )
+sal_Int32 BasicCollection::implGetIndexForName( const String& rName )
 {
-    INT32 nIndex = -1;
-    INT32 nCount = xItemArray->Count32();
-    INT32 nNameHash = MakeHashCode( rName );
-    for( INT32 i = 0 ; i < nCount ; i++ )
+    sal_Int32 nIndex = -1;
+    sal_Int32 nCount = xItemArray->Count32();
+    sal_Int32 nNameHash = MakeHashCode( rName );
+    for( sal_Int32 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pVar = xItemArray->Get32( i );
         if( pVar->GetHashCode() == nNameHash &&
@@ -1905,7 +2163,7 @@ INT32 BasicCollection::implGetIndexForName( const String& rName )
 
 void BasicCollection::CollAdd( SbxArray* pPar_ )
 {
-    USHORT nCount = pPar_->Count();
+    sal_uInt16 nCount = pPar_->Count();
     if( nCount < 2 || nCount > 5 )
     {
         SetError( SbxERR_WRONG_ARGS );
@@ -1931,7 +2189,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
                     return;
                 }
                 SbxVariable* pAfter = pPar_->Get(4);
-                INT32 nAfterIndex = implGetIndex( pAfter );
+                sal_Int32 nAfterIndex = implGetIndex( pAfter );
                 if( nAfterIndex == -1 )
                 {
                     SetError( SbERR_BAD_ARGUMENT );
@@ -1941,7 +2199,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
             }
             else // if( nCount == 4 )
             {
-                INT32 nBeforeIndex = implGetIndex( pBefore );
+                sal_Int32 nBeforeIndex = implGetIndex( pBefore );
                 if( nBeforeIndex == -1 )
                 {
                     SetError( SbERR_BAD_ARGUMENT );
@@ -1990,8 +2248,8 @@ void BasicCollection::CollItem( SbxArray* pPar_ )
     }
     SbxVariable* pRes = NULL;
     SbxVariable* p = pPar_->Get( 1 );
-    INT32 nIndex = implGetIndex( p );
-    if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+    sal_Int32 nIndex = implGetIndex( p );
+    if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
         pRes = xItemArray->Get32( nIndex );
     if( !pRes )
         SetError( SbERR_BAD_ARGUMENT );
@@ -2008,8 +2266,8 @@ void BasicCollection::CollRemove( SbxArray* pPar_ )
     }
 
     SbxVariable* p = pPar_->Get( 1 );
-    INT32 nIndex = implGetIndex( p );
-    if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+    sal_Int32 nIndex = implGetIndex( p );
+    if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
         xItemArray->Remove32( nIndex );
     else
         SetError( SbERR_BAD_ARGUMENT );
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index acc2f2352a..acc2f2352a 100644..100755
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 039bdddf5f..fa9b2f3c65 100644..100755
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -62,13 +62,13 @@ SbiGlobals::SbiGlobals()
     nCode = 0;
     nLine = 0;
     nCol1 = nCol2 = 0;
-    bCompiler = FALSE;
-    bGlobalInitErr = FALSE;
-    bRunInit = FALSE;
+    bCompiler = sal_False;
+    bGlobalInitErr = sal_False;
+    bRunInit = sal_False;
     eLanguageMode = SB_LANG_BASIC;
     pErrStack = NULL;
     pTransliterationWrapper = NULL;
-    bBlockCompilerError = FALSE;
+    bBlockCompilerError = sal_False;
     pAppBasMgr = NULL;
     pMSOMacroRuntimLib = NULL;
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9dffcf2136..c66770c976 100644..100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -34,15 +34,18 @@
 #include <svl/hint.hxx>
 
 #include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/extract.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
+#include <com/sun/star/script/NativeObjectWrapper.hpp>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
@@ -60,6 +63,7 @@
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/script/XDefaultProperty.hpp>
 #include <com/sun/star/script/XDefaultMethod.hpp>
+#include <com/sun/star/script/XDirectInvocation.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/reflection/XIdlArray.hpp>
@@ -454,7 +458,7 @@ String implGetWrappedMsg( const WrappedTargetException& e )
 
 void implHandleBasicErrorException( BasicErrorException& e )
 {
-    SbError nError = StarBASIC::GetSfxFromVBError( (USHORT)e.ErrorCode );
+    SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
     StarBASIC::Error( nError, e.ErrorMessageArgument );
 }
 
@@ -480,7 +484,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
         {
             if ( aBasicError.ErrorCode != 0 )
             {
-                nError = StarBASIC::GetSfxFromVBError( (USHORT) aBasicError.ErrorCode );
+                nError = StarBASIC::GetSfxFromVBError( (sal_uInt16) aBasicError.ErrorCode );
                 if ( nError == 0 )
                 {
                     nError = (SbError) aBasicError.ErrorCode;
@@ -507,7 +511,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
         // special handling for BasicErrorException errors
         if ( aWrapped.TargetException >>= aBasicError )
         {
-            nError = StarBASIC::GetSfxFromVBError( (USHORT)aBasicError.ErrorCode );
+            nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)aBasicError.ErrorCode );
             aMessageBuf.append( aBasicError.ErrorMessageArgument );
             aExamine.clear();
             break;
@@ -552,6 +556,43 @@ static void implHandleAnyException( const Any& _rCaughtException )
     }
 }
 
+// NativeObjectWrapper handling
+struct ObjectItem
+{
+    SbxObjectRef	m_xNativeObj;
+
+    ObjectItem( void )
+    {}
+    ObjectItem( SbxObject* pNativeObj )
+        : m_xNativeObj( pNativeObj )
+    {}
+};
+static std::vector< ObjectItem >	GaNativeObjectWrapperVector;
+
+void clearNativeObjectWrapperVector( void )
+{
+    GaNativeObjectWrapperVector.clear();
+}
+
+sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
+{
+    sal_uInt32 nIndex = GaNativeObjectWrapperVector.size();
+    GaNativeObjectWrapperVector.push_back( ObjectItem( pNativeObj ) );
+    return nIndex;
+}
+
+SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
+{
+    SbxObjectRef xRetObj;
+    if( nIndex < GaNativeObjectWrapperVector.size() )
+    {
+        ObjectItem& rItem = GaNativeObjectWrapperVector[ nIndex ];
+        xRetObj = rItem.m_xNativeObj;
+    }
+    return xRetObj;
+}
+
+
 // convert from Uno to Sbx
 SbxDataType unoToSbxType( TypeClass eType )
 {
@@ -634,7 +675,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
         sal_Int32 nLen = xIdlArray->getLen( aValue );
         for ( sal_Int32 index = 0; index < nLen; ++index )
         {
-            Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
+            Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)index );
             // This detects the dimension were currently processing
             if ( dimCopy == dimension )
             {
@@ -736,6 +777,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             if( eTypeClass == TypeClass_STRUCT )
             {
                 ArrayWrapper aWrap;
+                NativeObjectWrapper aNativeObjectWrapper;
                 if ( (aValue >>= aWrap) )
                 {
                     SbxDimArray* pArray = NULL;
@@ -746,7 +788,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                     if ( pArray )
                     {
                         SbxDimArrayRef xArray = pArray;
-                        USHORT nFlags = pVar->GetFlags();
+                        sal_uInt16 nFlags = pVar->GetFlags();
                         pVar->ResetFlag( SBX_FIXED );
                         pVar->PutObject( (SbxDimArray*)xArray );
                         pVar->SetFlags( nFlags );
@@ -755,6 +797,18 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                         pVar->PutEmpty();
                     break;
                 }
+                else if ( (aValue >>= aNativeObjectWrapper) )
+                {
+                    sal_uInt32 nIndex = 0;
+                    if( (aNativeObjectWrapper.ObjectId >>= nIndex) )
+                    {
+                        SbxObject* pObj = lcl_getNativeObject( nIndex );
+                        pVar->PutObject( pObj );
+                    }
+                    else
+                        pVar->PutEmpty();
+                    break;
+                }
                 else
                 {
                     SbiInstance* pInst = pINST;
@@ -856,7 +910,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
                 for( i = 0 ; i < nLen ; i++ )
                 {
                     // convert elements
-                    Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+                    Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)i );
                     SbxVariableRef xVar = new SbxVariable( eSbxElementType );
                     unoToSbxValue( (SbxVariable*)xVar, aElementAny );
 
@@ -870,7 +924,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
             }
 
             // return the Array
-            USHORT nFlags = pVar->GetFlags();
+            sal_uInt16 nFlags = pVar->GetFlags();
             pVar->ResetFlag( SBX_FIXED );
             pVar->PutObject( (SbxDimArray*)xArray );
             pVar->SetFlags( nFlags );
@@ -1008,9 +1062,9 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
                     // this one - otherwise the whole will be considered as Any-Sequence
                     sal_Bool bNeedsInit = sal_True;
 
-                    INT32 nSize = nUpper - nLower + 1;
-                    INT32 nIdx = nLower;
-                    for( INT32 i = 0 ; i < nSize ; i++,nIdx++ )
+                    sal_Int32 nSize = nUpper - nLower + 1;
+                    sal_Int32 nIdx = nLower;
+                    for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ )
                     {
                         SbxVariableRef xVar = pArray->Get32( &nIdx );
                         Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1046,10 +1100,10 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
                 if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
                 {
                     // For this check the array's dim structure does not matter
-                    UINT32 nFlatArraySize = pArray->Count32();
+                    sal_uInt32 nFlatArraySize = pArray->Count32();
 
                     sal_Bool bNeedsInit = sal_True;
-                    for( UINT32 i = 0 ; i < nFlatArraySize ; i++ )
+                    for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
                     {
                         SbxVariableRef xVar = pArray->SbxArray::Get32( i );
                         Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1123,6 +1177,20 @@ Any sbxToUnoValueImpl( SbxVariable* pVar, bool bBlockConversionToSmallestType =
                 if( pClassModule->createCOMWrapperForIface( aRetAny, pClassModuleObj ) )
                     return aRetAny;
             }
+            if( !xObj->ISA(SbUnoObject) )
+            {
+                // Create NativeObjectWrapper to identify object in case of callbacks
+                SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+                if( pObj != NULL )
+                {
+                    NativeObjectWrapper aNativeObjectWrapper;
+                    sal_uInt32 nIndex = lcl_registerNativeObjectWrapper( pObj );
+                    aNativeObjectWrapper.ObjectId <<= nIndex;
+                    Any aRetAny;
+                    aRetAny <<= aNativeObjectWrapper;
+                    return aRetAny;
+                }
+            }
         }
     }
 
@@ -1259,6 +1327,29 @@ Any sbxToUnoValue( SbxVariable* pVar )
     return sbxToUnoValueImpl( pVar );
 }
 
+// Funktion, um einen globalen Bezeichner im
+// UnoScope zu suchen und fuer Sbx zu wrappen
+static bool implGetTypeByName( const String& rName, Type& rRetType )
+{
+    bool bSuccess = false;
+
+    Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
+    if( xTypeAccess->hasByHierarchicalName( rName ) )
+    {
+        Any aRet = xTypeAccess->getByHierarchicalName( rName );
+        Reference< XTypeDescription > xTypeDesc;
+        aRet >>= xTypeDesc;
+
+        if( xTypeDesc.is() )
+        {
+            rRetType = Type( xTypeDesc->getTypeClass(), xTypeDesc->getName() );
+            bSuccess = true;
+        }
+    }
+    return bSuccess;
+}
+
+
 // converting of Sbx to Uno with known target class
 Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty )
 {
@@ -1344,6 +1435,39 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
         }
         break;
 
+        case TypeClass_TYPE:
+        {
+            if( eBaseType == SbxOBJECT )
+            {
+                // XIdlClass?
+                Reference< XIdlClass > xIdlClass;
+
+                SbxBaseRef pObj = (SbxBase*)pVar->GetObject();
+                if( pObj && pObj->ISA(SbUnoObject) )
+                {
+                    Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+                    aUnoAny >>= xIdlClass;
+                }
+
+                if( xIdlClass.is() )
+                {
+                    ::rtl::OUString aClassName = xIdlClass->getName();
+                    Type aType( xIdlClass->getTypeClass(), aClassName.getStr() );
+                    aRetVal <<= aType;
+                }
+            }
+            else if( eBaseType == SbxSTRING )
+            {
+                // String representing type?
+                String aTypeName = pVar->GetString();
+                Type aType;
+                bool bSuccess = implGetTypeByName( aTypeName, aType );
+                if( bSuccess )
+                    aRetVal <<= aType;
+            }
+        }
+        break;
+
         /* we leave out the following types
         case TypeClass_SERVICE:         break;
         case TypeClass_CLASS:           break;
@@ -1532,7 +1656,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
     return aRetVal;
 }
 
-void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, UINT32 nParamCount )
+void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, sal_uInt32 nParamCount )
 {
     AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
     if( bOLEAutomation )
@@ -1541,7 +1665,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
     args.realloc( nParamCount );
     Any* pAnyArgs = args.getArray();
     bool bBlockConversionToSmallestType = pINST->IsCompatibility();
-    UINT32 i = 0;
+    sal_uInt32 i = 0;
     if( pArgNamesArray )
     {
         Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
@@ -1549,7 +1673,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
         Any aValAny;
         for( i = 0 ; i < nParamCount ; i++ )
         {
-            USHORT iSbx = (USHORT)(i+1);
+            sal_uInt16 iSbx = (sal_uInt16)(i+1);
 
             aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
             bBlockConversionToSmallestType );
@@ -1572,7 +1696,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
     {
         for( i = 0 ; i < nParamCount ; i++ )
         {
-            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+            pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (sal_uInt16)(i+1) ),
             bBlockConversionToSmallestType );
         }
     }
@@ -1584,9 +1708,9 @@ enum INVOKETYPE
    SetProp,
    Func
 };
-Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, UINT32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
+Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
 {
-    Sequence< INT16 > OutParamIndex;
+    Sequence< sal_Int16 > OutParamIndex;
     Sequence< Any > OutParam;
 
     Any aRetAny;
@@ -1611,30 +1735,30 @@ Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray*
             break; // should introduce an error here
 
     }
-    const INT16* pIndices = OutParamIndex.getConstArray();
-    UINT32 nLen = OutParamIndex.getLength();
+    const sal_Int16* pIndices = OutParamIndex.getConstArray();
+    sal_uInt32 nLen = OutParamIndex.getLength();
     if( nLen )
     {
         const Any* pNewValues = OutParam.getConstArray();
-        for( UINT32 j = 0 ; j < nLen ; j++ )
+        for( sal_uInt32 j = 0 ; j < nLen ; j++ )
         {
-            INT16 iTarget = pIndices[ j ];
-            if( iTarget >= (INT16)nParamCount )
+            sal_Int16 iTarget = pIndices[ j ];
+            if( iTarget >= (sal_Int16)nParamCount )
                 break;
-            unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+            unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pNewValues[ j ] );
         }
     }
     return aRetAny;
 }
 
 // Debugging help method to readout the imlemented interfaces of an object
-String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
+String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
 {
     Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 );
     static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
 
     String aRetStr;
-    for( USHORT i = 0 ; i < nRekLevel ; i++ )
+    for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ )
         aRetStr.AppendAscii( "    " );
     aRetStr += String( xClass->getName() );
     ::rtl::OUString aClassName = xClass->getName();
@@ -1653,8 +1777,8 @@ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference<
         // get the super interfaces
         Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses();
         const Reference< XIdlClass >* pClasses = aSuperClassSeq.getConstArray();
-        UINT32 nSuperIfaceCount = aSuperClassSeq.getLength();
-        for( UINT32 j = 0 ; j < nSuperIfaceCount ; j++ )
+        sal_uInt32 nSuperIfaceCount = aSuperClassSeq.getLength();
+        for( sal_uInt32 j = 0 ; j < nSuperIfaceCount ; j++ )
         {
             const Reference< XIdlClass >& rxIfaceClass = pClasses[j];
             if( !rxIfaceClass->equals( xIfaceClass ) )
@@ -1735,8 +1859,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
     {
         Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
         const Type* pTypeArray = aTypeSeq.getConstArray();
-        UINT32 nIfaceCount = aTypeSeq.getLength();
-        for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+        sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+        for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
         {
             const Type& rType = pTypeArray[j];
 
@@ -1814,8 +1938,8 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
             // get the interfaces of the implementation
             Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
             const Type* pTypeArray = aTypeSeq.getConstArray();
-            UINT32 nIfaceCount = aTypeSeq.getLength();
-            for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+            sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+            for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
             {
                 const Type& rType = pTypeArray[j];
 
@@ -1913,13 +2037,13 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
     }
 
     Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
-    UINT32 nUnoPropCount = props.getLength();
+    sal_uInt32 nUnoPropCount = props.getLength();
     const Property* pUnoProps = props.getConstArray();
 
     SbxArray* pProps = pUnoObj->GetProperties();
-    USHORT nPropCount = pProps->Count();
-    USHORT nPropsPerLine = 1 + nPropCount / 30;
-    for( USHORT i = 0; i < nPropCount; i++ )
+    sal_uInt16 nPropCount = pProps->Count();
+    sal_uInt16 nPropsPerLine = 1 + nPropCount / 30;
+    for( sal_uInt16 i = 0; i < nPropCount; i++ )
     {
         SbxVariable* pVar = pProps->Get( i );
         if( pVar )
@@ -1932,7 +2056,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
             // Is it in Uno a sequence?
             SbxDataType eType = pVar->GetFullType();
 
-            BOOL bMaybeVoid = FALSE;
+            sal_Bool bMaybeVoid = sal_False;
             if( i < nUnoPropCount )
             {
                 const Property& rProp = pUnoProps[ i ];
@@ -1942,7 +2066,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
                 if( rProp.Attributes & PropertyAttribute::MAYBEVOID )
                 {
                     eType = unoToSbxType( rProp.Type.getTypeClass() );
-                    bMaybeVoid = TRUE;
+                    bMaybeVoid = sal_True;
                 }
                 if( eType == SbxOBJECT )
                 {
@@ -1993,14 +2117,14 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
     const Reference< XIdlMethod >* pUnoMethods = methods.getConstArray();
 
     SbxArray* pMethods = pUnoObj->GetMethods();
-    USHORT nMethodCount = pMethods->Count();
+    sal_uInt16 nMethodCount = pMethods->Count();
     if( !nMethodCount )
     {
         aRet.AppendAscii( "\nNo methods found\n" );
         return aRet;
     }
-    USHORT nPropsPerLine = 1 + nMethodCount / 30;
-    for( USHORT i = 0; i < nMethodCount; i++ )
+    sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30;
+    for( sal_uInt16 i = 0; i < nMethodCount; i++ )
     {
         SbxVariable* pVar = pMethods->Get( i );
         if( pVar )
@@ -2028,12 +2152,12 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
 
             // the get-method mustn't have a parameter
             Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
-            UINT32 nParamCount = aParamsSeq.getLength();
+            sal_uInt32 nParamCount = aParamsSeq.getLength();
             const Reference< XIdlClass >* pParams = aParamsSeq.getConstArray();
 
             if( nParamCount > 0 )
             {
-                for( USHORT j = 0; j < nParamCount; j++ )
+                for( sal_uInt16 j = 0; j < nParamCount; j++ )
                 {
                     String aTypeStr = Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) );
                     aPropStr += aTypeStr;
@@ -2080,7 +2204,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             if( pHint->GetId() == SBX_HINT_DATAWANTED )
             {
                 // Test-Properties
-                INT32 nId = pProp->nId;
+                sal_Int32 nId = pProp->nId;
                 if( nId < 0 )
                 {
                     // Id == -1: Display implemented interfaces according the ClassProvider
@@ -2131,7 +2255,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     try
                     {
-                        UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+                        sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
                         sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
                         Any aRetAny;
                         if ( bCanBeConsideredAMethod && nParamCount )
@@ -2204,18 +2328,18 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             if( pHint->GetId() == SBX_HINT_DATAWANTED )
             {
                 // number of Parameter -1 because of Param0 == this
-                UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+                sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
                 Sequence<Any> args;
-                BOOL bOutParams = FALSE;
-                UINT32 i;
+                sal_Bool bOutParams = sal_False;
+                sal_uInt32 i;
 
                 if( !bInvocation && mxUnoAccess.is() )
                 {
                     // get info
                     const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
                     const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
-                    UINT32 nUnoParamCount = rInfoSeq.getLength();
-                    UINT32 nAllocParamCount = nParamCount;
+                    sal_uInt32 nUnoParamCount = rInfoSeq.getLength();
+                    sal_uInt32 nAllocParamCount = nParamCount;
 
                     // ignore surplus parameter; alternative: throw an error
                     if( nParamCount > nUnoParamCount )
@@ -2258,14 +2382,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
 
                             // ATTENTION: Don't forget for Sbx-Parameter the offset!
-                            pAnyArgs[i] = sbxToUnoValue( pParams->Get( (USHORT)(i+1) ), aType );
+                            pAnyArgs[i] = sbxToUnoValue( pParams->Get( (sal_uInt16)(i+1) ), aType );
 
                             // If it is not certain check whether the out-parameter are available.
                             if( !bOutParams )
                             {
                                 ParamMode aParamMode = rInfo.aMode;
                                 if( aParamMode != ParamMode_IN )
-                                    bOutParams = TRUE;
+                                    bOutParams = sal_True;
                             }
                         }
                     }
@@ -2277,7 +2401,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 }
 
                 // call the method
-                GetSbData()->bBlockCompilerError = TRUE;  // #106433 Block compiler errors for API calls
+                GetSbData()->bBlockCompilerError = sal_True;  // #106433 Block compiler errors for API calls
                 try
                 {
                     if( !bInvocation && mxUnoAccess.is() )
@@ -2296,13 +2420,13 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
                             const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
 
-                            UINT32 j;
+                            sal_uInt32 j;
                             for( j = 0 ; j < nParamCount ; j++ )
                             {
                                 const ParamInfo& rInfo = pParamInfos[j];
                                 ParamMode aParamMode = rInfo.aMode;
                                 if( aParamMode != ParamMode_IN )
-                                    unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+                                    unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
                             }
                         }
                     }
@@ -2310,7 +2434,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     {
                         Any aRetAny = invokeAutomationMethod( pMeth->GetName(), args, pParams, nParamCount, mxInvocation );
                         unoToSbxValue( pVar, aRetAny );
-                    }
+                        }
 
                     // remove parameter here, because this was not done anymore in unoToSbxValue()
                     // for arrays
@@ -2321,7 +2445,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     implHandleAnyException( ::cppu::getCaughtException() );
                 }
-                GetSbData()->bBlockCompilerError = FALSE;  // #106433 Unblock compiler errors
+                GetSbData()->bBlockCompilerError = sal_False;  // #106433 Unblock compiler errors
             }
         }
         else
@@ -2337,8 +2461,8 @@ Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
 
 SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
     : SbxObject( aName_ )
-    , bNeedIntrospection( TRUE )
-    , bIgnoreNativeCOMObjectMembers( FALSE )
+    , bNeedIntrospection( sal_True )
+    , bNativeCOMObject( sal_False )
 {
     static Reference< XIntrospection > xIntrospection;
 
@@ -2381,7 +2505,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
         // The remainder refers only to the introspection
         if( !xTypeProvider.is() )
         {
-            bNeedIntrospection = FALSE;
+            bNeedIntrospection = sal_False;
             return;
         }
 
@@ -2389,34 +2513,34 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
         // hiding of equally named COM symbols, e.g. XInvocation::getValue
         Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
         if( xAutomationObject.is() )
-            bIgnoreNativeCOMObjectMembers = TRUE;
+            bNativeCOMObject = sal_True;
     }
 
     maTmpUnoObj = aUnoObj_;
 
 
     //*** Define the name ***
-    BOOL bFatalError = TRUE;
+    sal_Bool bFatalError = sal_True;
 
     // Is it an interface or a struct?
-    BOOL bSetClassName = FALSE;
+    sal_Bool bSetClassName = sal_False;
     String aClassName_;
     if( eType == TypeClass_STRUCT || eType == TypeClass_EXCEPTION )
     {
         // Struct is Ok
-        bFatalError = FALSE;
+        bFatalError = sal_False;
 
         // insert the real name of the class
         if( aName_.Len() == 0 )
         {
             aClassName_ = String( aUnoObj_.getValueType().getTypeName() );
-            bSetClassName = TRUE;
+            bSetClassName = sal_True;
         }
     }
     else if( eType == TypeClass_INTERFACE )
     {
         // Interface works always through the type in the Any
-        bFatalError = FALSE;
+        bFatalError = sal_False;
 
         // Ask for the XIdlClassProvider-Interface
         Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY );
@@ -2426,14 +2550,14 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
             if( aName_.Len() == 0 )
             {
                 Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses();
-                UINT32 nLen = szClasses.getLength();
+                sal_uInt32 nLen = szClasses.getLength();
                 if( nLen )
                 {
                     const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ];
                     if( xImplClass.is() )
                     {
                         aClassName_ = String( xImplClass->getName() );
-                        bSetClassName = TRUE;
+                        bSetClassName = sal_True;
                     }
                 }
             }
@@ -2464,7 +2588,7 @@ void SbUnoObject::doIntrospection( void )
 
     if( !bNeedIntrospection )
         return;
-    bNeedIntrospection = FALSE;
+    bNeedIntrospection = sal_False;
 
     if( !xIntrospection.is() )
     {
@@ -2513,6 +2637,47 @@ void SbUnoObject::doIntrospection( void )
 // Start of a list of all SbUnoMethod-Instances
 static SbUnoMethod* pFirst = NULL;
 
+void clearUnoMethodsForBasic( StarBASIC* pBasic )
+{
+    SbUnoMethod* pMeth = pFirst;
+    while( pMeth )
+    {
+        SbxObject* pObject = dynamic_cast< SbxObject* >( pMeth->GetParent() );
+        if ( pObject )
+        { 
+            StarBASIC* pModBasic = dynamic_cast< StarBASIC* >( pObject->GetParent() );
+            if ( pModBasic == pBasic )
+            {
+                // for now the solution is to remove the method from the list and to clear it,
+                // but in case the element should be correctly transfered to another StarBASIC,
+                // we should either set module parent to NULL without clearing it, or even
+                // set the new StarBASIC as the parent of the module
+                // pObject->SetParent( NULL );
+                
+                if( pMeth == pFirst )
+                    pFirst = pMeth->pNext;
+                else if( pMeth->pPrev )
+                    pMeth->pPrev->pNext = pMeth->pNext;
+                if( pMeth->pNext )
+                    pMeth->pNext->pPrev = pMeth->pPrev;
+
+                pMeth->pPrev = NULL;
+                pMeth->pNext = NULL;
+
+                pMeth->SbxValue::Clear();
+                pObject->SbxValue::Clear();
+
+                // start from the beginning after object clearing, the cycle will end since the method is removed each time
+                pMeth = pFirst;
+            }
+            else
+                pMeth = pMeth->pNext;
+        }
+        else
+            pMeth = pMeth->pNext;
+    }
+}
+
 void clearUnoMethods( void )
 {
     SbUnoMethod* pMeth = pFirst;
@@ -2529,10 +2694,12 @@ SbUnoMethod::SbUnoMethod
     const String& aName_,
     SbxDataType eSbxType,
     Reference< XIdlMethod > xUnoMethod_,
-    bool bInvocation
+    bool bInvocation,
+    bool bDirect
 )
     : SbxMethod( aName_, eSbxType )
     , mbInvocation( bInvocation )
+    , mbDirectInvocation( bDirect )
 {
     m_xUnoMethod = xUnoMethod_;
     pParamInfoSeq = NULL;
@@ -2568,16 +2735,16 @@ SbxInfo* SbUnoMethod::GetInfo()
 
             const Sequence<ParamInfo>& rInfoSeq = getParamInfos();
             const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
-            UINT32 nParamCount = rInfoSeq.getLength();
+            sal_uInt32 nParamCount = rInfoSeq.getLength();
 
-            for( UINT32 i = 0 ; i < nParamCount ; i++ )
+            for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
             {
                 const ParamInfo& rInfo = pParamInfos[i];
                 ::rtl::OUString aParamName = rInfo.aName;
 
                 // const Reference< XIdlClass >& rxClass = rInfo.aType;
                 SbxDataType t = SbxVARIANT;
-                USHORT nFlags_ = SBX_READ;
+                sal_uInt16 nFlags_ = SBX_READ;
                 pInfo->AddParam( aParamName, t, nFlags_ );
             }
         }
@@ -2600,7 +2767,7 @@ SbUnoProperty::SbUnoProperty
     const String& aName_,
     SbxDataType eSbxType,
     const Property& aUnoProp_,
-    INT32 nId_,
+    sal_Int32 nId_,
     bool bInvocation
 )
     : SbxProperty( aName_, eSbxType )
@@ -2633,7 +2800,7 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
     if( !pRes )
     {
         ::rtl::OUString aUName( rName );
-        if( mxUnoAccess.is() && !bIgnoreNativeCOMObjectMembers )
+        if( mxUnoAccess.is() && !bNativeCOMObject )
         {
             if( mxExactName.is() )
             {
@@ -2734,6 +2901,17 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
                     QuickInsert( (SbxVariable*)xMethRef );
                     pRes = xMethRef;
                 }
+                else
+                {
+                    Reference< XDirectInvocation > xDirectInvoke( mxInvocation, UNO_QUERY );
+                    if ( xDirectInvoke.is() && xDirectInvoke->hasMember( aUName ) )
+                    {
+                        SbxVariableRef xMethRef = new SbUnoMethod( aUName, SbxVARIANT, xDummyMethod, true, true );
+                        QuickInsert( (SbxVariable*)xMethRef );
+                        pRes = xMethRef;
+                    }
+
+                }
             }
             catch( RuntimeException& e )
             {
@@ -2793,11 +2971,11 @@ void SbUnoObject::implCreateAll( void )
 
     // get instrospection
     Reference< XIntrospectionAccess > xAccess = mxUnoAccess;
-    if( !xAccess.is() || bIgnoreNativeCOMObjectMembers )
+    if( !xAccess.is() || bNativeCOMObject )
     {
         if( mxInvocation.is() )
             xAccess = mxInvocation->getIntrospection();
-        else if( bIgnoreNativeCOMObjectMembers )
+        else if( bNativeCOMObject )
             return;
     }
     if( !xAccess.is() )
@@ -2805,10 +2983,10 @@ void SbUnoObject::implCreateAll( void )
 
     // Establish properties
     Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
-    UINT32 nPropCount = props.getLength();
+    sal_uInt32 nPropCount = props.getLength();
     const Property* pProps_ = props.getConstArray();
 
-    UINT32 i;
+    sal_uInt32 i;
     for( i = 0 ; i < nPropCount ; i++ )
     {
         const Property& rProp = pProps_[ i ];
@@ -2831,7 +3009,7 @@ void SbUnoObject::implCreateAll( void )
     // Create methods
     Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods
         ( MethodConcept::ALL - MethodConcept::DANGEROUS );
-    UINT32 nMethCount = aMethodSeq.getLength();
+    sal_uInt32 nMethCount = aMethodSeq.getLength();
     const Reference< XIdlMethod >* pMethods_ = aMethodSeq.getConstArray();
     for( i = 0 ; i < nMethCount ; i++ )
     {
@@ -2891,7 +3069,7 @@ SbUnoObject* Impl_CreateUnoStruct( const String& aClassName )
 
 
 // Factory-Class to create Uno-Structs per DIM AS NEW
-SbxBase* SbUnoFactory::Create( UINT16, UINT32 )
+SbxBase* SbUnoFactory::Create( sal_uInt16, sal_uInt32 )
 {
     // Via SbxId nothing works in Uno
     return NULL;
@@ -2924,7 +3102,7 @@ void createAllObjectProperties( SbxObject* pObj )
 }
 
 
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -2949,7 +3127,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     refVar->PutObject( (SbUnoObject*)xUnoObj );
 }
 
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3003,7 +3181,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     }
 }
 
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3061,7 +3239,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar,
     }
 }
 
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3085,13 +3263,13 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL
     }
 }
 
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
 
     // We need 2 parameter minimum
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3100,7 +3278,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // variable for the return value
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // get the Uno-Object
     SbxBaseRef pObj = (SbxBase*)rPar.Get( 1 )->GetObject();
@@ -3119,7 +3297,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     if( !xCoreReflection.is() )
         return;
 
-    for( USHORT i = 2 ; i < nParCount ; i++ )
+    for( sal_uInt16 i = 2 ; i < nParCount ; i++ )
     {
         // get the name of the interface of the struct
         String aIfaceName = rPar.Get( i )->GetString();
@@ -3137,10 +3315,10 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     }
 
     // Every thing works; then return TRUE
-    refVar->PutBool( TRUE );
+    refVar->PutBool( sal_True );
 }
 
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3154,7 +3332,7 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // variable for the return value
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // get the Uno-Object
     SbxVariableRef xParam = rPar.Get( 1 );
@@ -3166,11 +3344,11 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     Any aAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
     TypeClass eType = aAny.getValueType().getTypeClass();
     if( eType == TypeClass_STRUCT )
-        refVar->PutBool( TRUE );
+        refVar->PutBool( sal_True );
 }
 
 
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -3183,7 +3361,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // variable for the return value
     SbxVariableRef refVar = rPar.Get(0);
-    refVar->PutBool( FALSE );
+    refVar->PutBool( sal_False );
 
     // get the Uno-Objects
     SbxVariableRef xParam1 = rPar.Get( 1 );
@@ -3215,7 +3393,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     //XInterfaceRef x2 = *(XInterfaceRef*)aAny2.get();
 
     if( x1 == x2 )
-        refVar->PutBool( TRUE );
+        refVar->PutBool( sal_True );
 }
 
 typedef boost::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
@@ -3488,7 +3666,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
             // Take us out as listener at once,
             // the values are all constant
             if( pRes->IsBroadcaster() )
-                EndListening( pRes->GetBroadcaster(), TRUE );
+                EndListening( pRes->GetBroadcaster(), sal_True );
         }
     }
     return pRes;
@@ -3572,14 +3750,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
         if( pUnoCtor && pHint->GetId() == SBX_HINT_DATAWANTED )
         {
             // Parameter count -1 because of Param0 == this
-            UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+            sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
             Sequence<Any> args;
-            BOOL bOutParams = FALSE;
+            sal_Bool bOutParams = sal_False;
 
             Reference< XServiceConstructorDescription > xCtor = pUnoCtor->getServiceCtorDesc();
             Sequence< Reference< XParameter > > aParameterSeq = xCtor->getParameters();
             const Reference< XParameter >* pParameterSeq = aParameterSeq.getConstArray();
-            UINT32 nUnoParamCount = aParameterSeq.getLength();
+            sal_uInt32 nUnoParamCount = aParameterSeq.getLength();
 
             // Default: Ignore not needed parameters
             bool bParameterError = false;
@@ -3597,8 +3775,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             }
 
             // Too many parameters with context as first parameter?
-            USHORT nSbxParameterOffset = 1;
-            USHORT nParameterOffsetByContext = 0;
+            sal_uInt16 nSbxParameterOffset = 1;
+            sal_uInt16 nParameterOffsetByContext = 0;
             Reference < XComponentContext > xFirstParamContext;
             if( nParamCount > nUnoParamCount )
             {
@@ -3609,8 +3787,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     nParameterOffsetByContext = 1;
             }
 
-            UINT32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
-            UINT32 nAllocParamCount = nEffectiveParamCount;
+            sal_uInt32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
+            sal_uInt32 nAllocParamCount = nEffectiveParamCount;
             if( nEffectiveParamCount > nUnoParamCount )
             {
                 if( !bRestParameterMode )
@@ -3637,9 +3815,9 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     args.realloc( nAllocParamCount );
                     Any* pAnyArgs = args.getArray();
-                    for( UINT32 i = 0 ; i < nEffectiveParamCount ; i++ )
+                    for( sal_uInt32 i = 0 ; i < nEffectiveParamCount ; i++ )
                     {
-                        USHORT iSbx = (USHORT)(i + nSbxParameterOffset + nParameterOffsetByContext);
+                        sal_uInt16 iSbx = (sal_uInt16)(i + nSbxParameterOffset + nParameterOffsetByContext);
 
                         // bRestParameterMode allows nEffectiveParamCount > nUnoParamCount
                         Reference< XParameter > xParam;
@@ -3661,7 +3839,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                             if( !bOutParams )
                             {
                                 if( xParam->isOut() )
-                                    bOutParams = TRUE;
+                                    bOutParams = sal_True;
                             }
                         }
                         else
@@ -3706,14 +3884,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                 {
                     const Any* pAnyArgs = args.getConstArray();
 
-                    for( UINT32 j = 0 ; j < nUnoParamCount ; j++ )
+                    for( sal_uInt32 j = 0 ; j < nUnoParamCount ; j++ )
                     {
                         Reference< XParameter > xParam = pParameterSeq[j];
                         if( !xParam.is() )
                             continue;
 
                         if( xParam->isOut() )
-                            unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+                            unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
                     }
                 }
             }
@@ -3798,8 +3976,8 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pParams = pVar->GetParameters();
-        UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
-        UINT32 nAllowedParamCount = 1;
+        sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
+        sal_uInt32 nAllowedParamCount = 1;
 
         Reference < XComponentContext > xContextToUse;
         if( nParamCount > 0 )
@@ -3858,7 +4036,7 @@ public:
     ~BasicAllListener_Impl();
 
     // Methods of XInterface
-    //virtual BOOL queryInterface( Uik aUik, Reference< XInterface > & rOut );
+    //virtual sal_Bool queryInterface( Uik aUik, Reference< XInterface > & rOut );
 
     // Methods of XAllListener
     virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
@@ -3904,13 +4082,13 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
                 // Create in a Basic Array
                 SbxArrayRef xSbxArray = new SbxArray( SbxVARIANT );
                 const Any * pArgs = Event.Arguments.getConstArray();
-                INT32 nCount = Event.Arguments.getLength();
-                for( INT32 i = 0; i < nCount; i++ )
+                sal_Int32 nCount = Event.Arguments.getLength();
+                for( sal_Int32 i = 0; i < nCount; i++ )
                 {
                     // Convert elements
                     SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
                     unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-                    xSbxArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+                    xSbxArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
                 }
 
                 pLib->Call( aMethodName, xSbxArray );
@@ -3922,7 +4100,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
                     if( pVar )
                     {
                         // #95792 Avoid a second call
-                        USHORT nFlags = pVar->GetFlags();
+                        sal_uInt16 nFlags = pVar->GetFlags();
                         pVar->SetFlag( SBX_NO_BROADCAST );
                         *pRet = sbxToUnoValueImpl( pVar );
                         pVar->SetFlags( nFlags );
@@ -4117,7 +4295,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const ::rtl::OUStri
 // Uno-Service erzeugen
 // 1. Parameter == Prefix-Name of the macro
 // 2. Parameter == fully qualified name of the listener
-void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 //RTLFUNC(CreateUnoListener)
 {
     (void)bWrite;
@@ -4181,7 +4359,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 //========================================================================
 // Represents the DefaultContext property of the ProcessServiceManager
 // in the Basic runtime system.
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
@@ -4209,11 +4387,13 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite
 //========================================================================
 // Creates a Basic wrapper object for a strongly typed Uno value
 // 1. parameter: Uno type as full qualified type name, e.g. "byte[]"
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 {
     (void)pBasic;
     (void)bWrite;
 
+    static String aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") );
+
     // 2 parameters needed
     if ( rPar.Count() != 3 )
     {
@@ -4225,6 +4405,41 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
     String aTypeName = rPar.Get(1)->GetString();
     SbxVariable* pVal = rPar.Get(2);
 
+    if( aTypeName == aTypeTypeString )
+    {
+        SbxDataType eBaseType = pVal->SbxValue::GetType();
+        String aValTypeName;
+        if( eBaseType == SbxSTRING )
+        {
+            aValTypeName = pVal->GetString();
+        }
+        else if( eBaseType == SbxOBJECT )
+        {
+            // XIdlClass?
+            Reference< XIdlClass > xIdlClass;
+
+            SbxBaseRef pObj = (SbxBase*)pVal->GetObject();
+            if( pObj && pObj->ISA(SbUnoObject) )
+            {
+                Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+                aUnoAny >>= xIdlClass;
+            }
+
+            if( xIdlClass.is() )
+                aValTypeName = xIdlClass->getName();
+        }
+        Type aType;
+        bool bSuccess = implGetTypeByName( aValTypeName, aType );
+        if( bSuccess )
+        {
+            Any aTypeAny( aType );
+            SbxVariableRef refVar = rPar.Get(0);
+            SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aTypeAny );
+            refVar->PutObject( xUnoAnyObject );
+        }
+        return;
+    }
+
     // Check the type
     Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
     Any aRet;
@@ -4280,14 +4495,26 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
 //==========================================================================
 
-typedef WeakImplHelper1< XInvocation > ModuleInvocationProxyHelper;
+namespace {
+class OMutexBasis
+{
+protected:
+    // this mutex is necessary for OInterfaceContainerHelper
+    ::osl::Mutex m_aMutex;
+};
+} // namespace
+
+typedef WeakImplHelper2< XInvocation, XComponent > ModuleInvocationProxyHelper;
 
-class ModuleInvocationProxy : public ModuleInvocationProxyHelper
+class ModuleInvocationProxy : public OMutexBasis,
+                              public ModuleInvocationProxyHelper
 {
     ::rtl::OUString     m_aPrefix;
     SbxObjectRef        m_xScopeObj;
     bool                m_bProxyIsClassModuleObject;
 
+    ::cppu::OInterfaceContainerHelper m_aListeners;
+
 public:
     ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
     ~ModuleInvocationProxy()
@@ -4307,11 +4534,17 @@ public:
                                  Sequence< sal_Int16 >& rOutParamIndex,
                                  Sequence< Any >& rOutParam )
         throw( CannotConvertException, InvocationTargetException );
+
+    // XComponent
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
     : m_aPrefix( aPrefix + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ) )
     , m_xScopeObj( xScopeObj )
+    , m_aListeners( m_aMutex )
 {
     m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false;
 }
@@ -4408,13 +4641,27 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
     SolarMutexGuard guard;
 
     Any aRet;
-    if( !m_xScopeObj.Is() )
+    SbxObjectRef xScopeObj = m_xScopeObj;
+    if( !xScopeObj.Is() )
         return aRet;
 
     ::rtl::OUString aFunctionName = m_aPrefix;
     aFunctionName += rFunction;
 
-    SbxVariable* p = m_xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
+    sal_Bool bSetRescheduleBack = sal_False;
+    sal_Bool bOldReschedule = sal_True;
+    SbiInstance* pInst = pINST;
+    if( pInst && pInst->IsCompatibility() )
+    {
+        bOldReschedule = pInst->IsReschedule();
+        if ( bOldReschedule )
+        {
+            pInst->EnableReschedule( sal_False );
+            bSetRescheduleBack = sal_True;
+        }
+    }
+
+    SbxVariable* p = xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
     SbMethod* pMeth = p != NULL ? PTR_CAST(SbMethod,p) : NULL;
     if( pMeth == NULL )
     {
@@ -4434,7 +4681,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
         {
             SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
             unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
-            xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+            xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
         }
     }
 
@@ -4446,11 +4693,38 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
     aRet = sbxToUnoValue( xValue );
     pMeth->SetParameters( NULL );
 
+    if( bSetRescheduleBack )
+        pInst->EnableReschedule( bOldReschedule );
+
     // TODO: OutParameter?
 
     return aRet;
 }
 
+void SAL_CALL ModuleInvocationProxy::dispose()
+    throw(RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    EventObject aEvent( (XComponent*)this );
+    m_aListeners.disposeAndClear( aEvent );
+
+    m_xScopeObj = NULL;
+}
+
+void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
+    throw (RuntimeException)
+{
+    m_aListeners.addInterface( xListener );
+}
+
+void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
+    throw (RuntimeException)
+{
+    m_aListeners.removeInterface( xListener );
+}
+
+
 Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::OUString& aVBAType,
                                            const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
 {
@@ -4480,6 +4754,97 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
     return xRet;
 }
 
+typedef std::vector< WeakReference< XComponent > >	ComponentRefVector;
+
+struct StarBasicDisposeItem
+{
+    StarBASIC*				m_pBasic;
+    SbxArrayRef				m_pRegisteredVariables;
+    ComponentRefVector		m_vComImplementsObjects;
+
+    StarBasicDisposeItem( StarBASIC* pBasic )
+        : m_pBasic( pBasic )
+    {
+        m_pRegisteredVariables = new SbxArray();
+    }
+};
+
+typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
+
+static DisposeItemVector GaDisposeItemVector;
+
+DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it;
+    for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it )
+    {
+        StarBasicDisposeItem* pItem = *it;
+        if( pItem->m_pBasic == pBasic )
+            return it;
+    }
+    return GaDisposeItemVector.end();
+}
+
+StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+    StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL;
+    if( pItem == NULL )
+    {
+        pItem = new StarBasicDisposeItem( pBasic );
+        GaDisposeItemVector.push_back( pItem );
+    }
+    return pItem;
+}
+
+void registerComponentToBeDisposedForBasic
+    ( Reference< XComponent > xComponent, StarBASIC* pBasic )
+{
+    StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+    pItem->m_vComImplementsObjects.push_back( xComponent );
+}
+
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic )
+{
+    StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+    SbxArray* pArray = pItem->m_pRegisteredVariables;
+    pArray->Put( pVar, pArray->Count() );
+}
+
+void disposeComVariablesForBasic( StarBASIC* pBasic )
+{
+    DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+    if( it != GaDisposeItemVector.end() )
+    {
+        StarBasicDisposeItem* pItem = *it;
+
+        SbxArray* pArray = pItem->m_pRegisteredVariables;
+        sal_uInt16 nCount = pArray->Count();
+        for( sal_uInt16 i = 0 ; i < nCount ; ++i )
+        {
+            SbxVariable* pVar = pArray->Get( i );
+            pVar->ClearComListener();
+        }
+
+        ComponentRefVector& rv = pItem->m_vComImplementsObjects;
+        ComponentRefVector::iterator itCRV;
+        for( itCRV = rv.begin() ; itCRV != rv.end() ; ++itCRV )
+        {
+            try
+            {
+                Reference< XComponent > xComponent( (*itCRV).get(), UNO_QUERY_THROW );
+                xComponent->dispose();
+            }
+            catch( Exception& )
+            {}
+        }
+
+        delete pItem;
+        GaDisposeItemVector.erase( it );
+    }
+}
+
+
 // Handle module implements mechanism for OLE types
 bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject )
 {
@@ -4500,8 +4865,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
     bool bSuccess = false;
 
     SbxArray* pModIfaces = pClassData->mxIfaces;
-    USHORT nCount = pModIfaces->Count();
-    for( USHORT i = 0 ; i < nCount ; ++i )
+    sal_uInt16 nCount = pModIfaces->Count();
+    for( sal_uInt16 i = 0 ; i < nCount ; ++i )
     {
         SbxVariable* pVar = pModIfaces->Get( i );
         ::rtl::OUString aIfaceName = pVar->GetName();
@@ -4533,6 +4898,23 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
 
             if( bSuccess )
             {
+                Reference< XComponent > xComponent( xProxy, UNO_QUERY );
+                if( xComponent.is() )
+                {
+                    StarBASIC* pParentBasic = NULL;
+                    SbxObject* pCurObject = this;
+                    do
+                    {
+                        SbxObject* pObjParent = pCurObject->GetParent();
+                        pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+                        pCurObject = pObjParent;
+                    }
+                    while( pParentBasic == NULL && pCurObject != NULL );
+
+                    OSL_ASSERT( pParentBasic != NULL );
+                    registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+                }
+
                 o_rRetAny <<= xRet;
                 break;
             }
@@ -4542,4 +4924,31 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
     return bSuccess;
 }
 
+
+// Due to an incorrect behavior IE returns an object instead of a string
+// in some scenarios. Calling toString at the object may correct this.
+// Helper function used in sbxvalue.cxx
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal )
+{
+    bool bSuccess = false;
+
+    SbUnoObject* pUnoObj = NULL;
+    if( pObj != NULL && (pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj)) != NULL )
+    {
+        // Only for native COM objects
+        if( pUnoObj->isNativeCOMObject() )
+        {
+            SbxVariableRef pMeth = pObj->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "toString" ) ), SbxCLASS_METHOD );
+            if ( pMeth.Is() )
+            {
+                SbxValues aRes;
+                pMeth->Get( aRes );
+                pVal->Put( aRes );
+                bSuccess = true;
+            }
+        }
+    }
+    return bSuccess;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 654fa2eeba..f01961b4a6 100644..100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -51,12 +51,16 @@
 #include <basic/basrdll.hxx>
 #include <osl/mutex.hxx>
 #include <basic/sbobjmod.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <basic/vbahelper.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <unotools/eventcfg.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/document/XVbaMethodParameter.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XEventListener.hpp>
 
 using namespace com::sun::star;
 
@@ -263,7 +267,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
     if ( pInfo )
     {
         sal_Int32 nSbxOptional = 0;
-        USHORT n = 1;
+        sal_uInt16 n = 1;
         for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
         {
             if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -287,7 +291,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
         {
             SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
             unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
-            xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+            xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
             // Enable passing by ref
             if ( xSbxVar->GetType() != SbxVARIANT )
@@ -309,7 +313,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
         if ( pInfo_ )
         {
             OutParamMap aOutParamMap;
-            for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+            for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
             {
                 const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
                 if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
@@ -407,7 +411,7 @@ SbMethodRef DocObjectWrapper::getMethod( const rtl::OUString& aName ) throw (Run
     SbMethodRef pMethod = NULL;
     if ( m_pMod )
     {
-        USHORT nSaveFlgs = m_pMod->GetFlags();
+        sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
         // Limit search to this module
         m_pMod->ResetFlag( SBX_GBLSEARCH );
         pMethod = (SbMethod*) m_pMod->SbModule::Find( aName,  SbxCLASS_METHOD );
@@ -422,7 +426,7 @@ SbPropertyRef DocObjectWrapper::getProperty( const rtl::OUString& aName ) throw
     SbPropertyRef pProperty = NULL;
     if ( m_pMod )
     {
-        USHORT nSaveFlgs = m_pMod->GetFlags();
+        sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
         // Limit search to this module.
         m_pMod->ResetFlag( SBX_GBLSEARCH );
         pProperty = (SbProperty*)m_pMod->SbModule::Find( aName,  SbxCLASS_PROPERTY );
@@ -441,11 +445,7 @@ TYPEINIT1(SbJScriptMethod,SbMethod)
 TYPEINIT1(SbObjModule,SbModule)
 TYPEINIT1(SbUserFormModule,SbObjModule)
 
-SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
-SV_IMPL_VARARR(SbiBreakpoints,USHORT)
-
-
-SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
+typedef std::vector<HighlightPortion> HighlightPortions;
 
 bool getDefaultVBAMode( StarBASIC* pb )
 {
@@ -497,30 +497,18 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
     return 0L;
 }
 
-bool UnlockControllerHack( StarBASIC* pBasic )
+void VBAUnlockDocuments( StarBASIC* pBasic )
 {
-    bool bRes = false;
     if ( pBasic && pBasic->IsDocBasic() )
     {
-        uno::Any aUnoVar;
-        ::rtl::OUString sVarName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" )) );
-        SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
+        SbUnoObject* pGlobs = dynamic_cast< SbUnoObject* >( pBasic->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ), SbxCLASS_DONTCARE ) );
         if ( pGlobs )
-            aUnoVar = pGlobs->getUnoAny();
-        uno::Reference< frame::XModel > xModel( aUnoVar, uno::UNO_QUERY);
-        if ( xModel.is() )
         {
-            try
-            {
-                xModel->unlockControllers();
-                bRes = true;
-            }
-            catch( uno::Exception& )
-            {
-            }
+            uno::Reference< frame::XModel > xModel( pGlobs->getUnoAny(), uno::UNO_QUERY );
+            ::basic::vba::lockControllersOfAllDocuments( xModel, sal_False );
+            ::basic::vba::enableContainerWindowsOfAllDocuments( xModel, sal_True );
         }
     }
-    return bRes;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -528,7 +516,7 @@ bool UnlockControllerHack( StarBASIC* pBasic )
 // A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
 // could be found from other module.
 
-SbModule::SbModule( const String& rName,  BOOL bVBACompat )
+SbModule::SbModule( const String& rName,  sal_Bool bVBACompat )
          : SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
            pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ),  pDocObject( NULL ), bIsProxyModule( false )
 {
@@ -564,9 +552,9 @@ SbModule::GetUnoModule()
     return mxWrapper;
 }
 
-BOOL SbModule::IsCompiled() const
+sal_Bool SbModule::IsCompiled() const
 {
-    return BOOL( pImage != 0 );
+    return sal_Bool( pImage != 0 );
 }
 
 const SbxObject* SbModule::FindType( String aTypeName ) const
@@ -585,12 +573,12 @@ void SbModule::StartDefinitions()
 
     // methods and properties persist, but they are invalid;
     // at least are the information under certain conditions clogged
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0; i < pMethods->Count(); i++ )
     {
         SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
         if( p )
-            p->bInvalid = TRUE;
+            p->bInvalid = sal_True;
     }
     for( i = 0; i < pProps->Count(); )
     {
@@ -616,11 +604,11 @@ SbMethod* SbModule::GetMethod( const String& rName, SbxDataType t )
         pMeth->SetParent( this );
         pMeth->SetFlags( SBX_READ );
         pMethods->Put( pMeth, pMethods->Count() );
-        StartListening( pMeth->GetBroadcaster(), TRUE );
+        StartListening( pMeth->GetBroadcaster(), sal_True );
     }
     // The method is per default valid, because it could be
     // created from the compiler (code generator) as well.
-    pMeth->bInvalid = FALSE;
+    pMeth->bInvalid = sal_False;
     pMeth->ResetFlag( SBX_FIXED );
     pMeth->SetFlag( SBX_WRITE );
     pMeth->SetType( t );
@@ -644,7 +632,7 @@ SbProperty* SbModule::GetProperty( const String& rName, SbxDataType t )
         pProp->SetFlag( SBX_READWRITE );
         pProp->SetParent( this );
         pProps->Put( pProp, pProps->Count() );
-        StartListening( pProp->GetBroadcaster(), TRUE );
+        StartListening( pProp->GetBroadcaster(), sal_True );
     }
     return pProp;
 }
@@ -662,7 +650,7 @@ SbProcedureProperty* SbModule::GetProcedureProperty
         pProp->SetFlag( SBX_READWRITE );
         pProp->SetParent( this );
         pProps->Put( pProp, pProps->Count() );
-        StartListening( pProp->GetBroadcaster(), TRUE );
+        StartListening( pProp->GetBroadcaster(), sal_True );
     }
     return pProp;
 }
@@ -681,7 +669,7 @@ SbIfaceMapperMethod* SbModule::GetIfaceMapperMethod
         pMapperMethod->SetFlags( SBX_READ );
         pMethods->Put( pMapperMethod, pMethods->Count() );
     }
-    pMapperMethod->bInvalid = FALSE;
+    pMapperMethod->bInvalid = sal_False;
     return pMapperMethod;
 }
 
@@ -694,9 +682,9 @@ TYPEINIT1(SbIfaceMapperMethod,SbMethod)
 
 // From the code generator: remove invalid entries
 
-void SbModule::EndDefinitions( BOOL bNewState )
+void SbModule::EndDefinitions( sal_Bool bNewState )
 {
-    for( USHORT i = 0; i < pMethods->Count(); )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); )
     {
         SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
         if( p )
@@ -712,7 +700,7 @@ void SbModule::EndDefinitions( BOOL bNewState )
         else
             i++;
     }
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 void SbModule::Clear()
@@ -808,12 +796,12 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                     aVals.eType = SbxVARIANT;
 
                     SbxArray* pArg = pVar->GetParameters();
-                    USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+                    sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
                     if( nVarParCount > 1 )
                     {
                         SbxArrayRef xMethParameters = new SbxArray;
                         xMethParameters->Put( pMethVar, 0 );	// Method as parameter 0
-                        for( USHORT i = 1 ; i < nVarParCount ; ++i )
+                        for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
                         {
                             SbxVariable* pPar = pArg->Get( i );
                             xMethParameters->Put( pPar, i );
@@ -895,7 +883,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
             // side effects when using name as variable implicitely
             bool bForwardToSbxObject = true;
 
-            ULONG nId = pHint->GetId();
+            sal_uIntPtr nId = pHint->GetId();
             if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
                 pVar->GetName().EqualsIgnoreCaseAscii( "name" ) )
                     bForwardToSbxObject = false;
@@ -953,7 +941,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                         aTok.SetCompatible( true );
                     else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) )
                     {
-                            BOOL bIsVBA = ( aTok.GetDbl()== 1 );
+                            sal_Bool bIsVBA = ( aTok.GetDbl()== 1 );
                             SetVBACompat( bIsVBA );
                         aTok.SetCompatible( bIsVBA );
                     }
@@ -965,7 +953,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
         SbMethod* pMeth = NULL;
         if( eEndTok != NIL )
         {
-            USHORT nLine1 = aTok.GetLine();
+            sal_uInt16 nLine1 = aTok.GetLine();
             if( aTok.Next() == SYMBOL )
             {
                 String aName_( aTok.GetSym() );
@@ -975,7 +963,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 pMeth = GetMethod( aName_, t );
                 pMeth->nLine1 = pMeth->nLine2 = nLine1;
                 // The method is for a start VALID
-                pMeth->bInvalid = FALSE;
+                pMeth->bInvalid = sal_False;
             }
             else
                 eEndTok = NIL;
@@ -995,18 +983,18 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 pMeth->nLine2 = aTok.GetLine();
         }
     }
-    EndDefinitions( TRUE );
+    EndDefinitions( sal_True );
 }
 
 void SbModule::SetComment( const String& r )
 {
     aComment = r;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
+SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine )
 {
-    for( USHORT i = 0; i < pMethods->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
     {
         SbMethod* p = (SbMethod*) pMethods->Get( i );
         if( p->GetSbxId() == SBXID_BASICMETHOD )
@@ -1020,14 +1008,14 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
 
 // Broadcast of a hint to all Basics
 
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
 {
     // Self a BASIC?
     if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
         pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
     // Then ask for the subobjects
     SbxArray* pObjs = pObj->GetObjects();
-    for( USHORT i = 0; i < pObjs->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
     {
         SbxVariable* pVar = pObjs->Get( i );
         if( pVar->IsA( TYPE(SbxObject) ) )
@@ -1035,7 +1023,7 @@ static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
     }
 }
 
-static void SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
 {
     while( pObj->GetParent() )
         pObj = pObj->GetParent();
@@ -1072,8 +1060,8 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
 
     // Go over all Sub-Basics
     SbxArray* pObjs = pBasic->GetObjects();
-    USHORT nCount = pObjs->Count();
-    for( USHORT i = 0 ; i < nCount ; i++ )
+    sal_uInt16 nCount = pObjs->Count();
+    for( sal_uInt16 i = 0 ; i < nCount ; i++ )
     {
         SbxVariable* pObjVar = pObjs->Get( i );
         StarBASIC* pSubBasic = PTR_CAST( StarBASIC, pObjVar );
@@ -1097,25 +1085,25 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
     if( ((StarBASIC*)p) != pBasic )
         ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
 }
-BOOL SbModule::IsVBACompat() const
+sal_Bool SbModule::IsVBACompat() const
 {
     return mbVBACompat;
 }
 
-void SbModule::SetVBACompat( BOOL bCompat )
+void SbModule::SetVBACompat( sal_Bool bCompat )
 {
     mbVBACompat = bCompat;
 }
 // Run a Basic-subprogram
-USHORT SbModule::Run( SbMethod* pMeth )
+sal_uInt16 SbModule::Run( SbMethod* pMeth )
 {
     OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
-    static USHORT nMaxCallLevel = 0;
+    static sal_uInt16 nMaxCallLevel = 0;
     static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
     static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
 
-    USHORT nRes = 0;
-    BOOL bDelInst = BOOL( pINST == NULL );
+    sal_uInt16 nRes = 0;
+    sal_Bool bDelInst = sal_Bool( pINST == NULL );
         bool bQuit = false;
     StarBASICRef xBasic;
     if( bDelInst )
@@ -1160,7 +1148,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
         GlobalRunInit( /* bBasicStart = */ bDelInst );
 
         // Appeared a compiler error? Then we don't launch
-        if( GetSbData()->bGlobalInitErr == FALSE )
+        if( GetSbData()->bGlobalInitErr == sal_False )
         {
             if( bDelInst )
             {
@@ -1182,7 +1170,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
             pINST->pRun = pRt;
             if ( mbVBACompat )
             {
-                pINST->EnableCompatibility( TRUE );
+                pINST->EnableCompatibility( sal_True );
             }
             while( pRt->Step() ) {}
             if( pRt->pNext )
@@ -1202,7 +1190,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
                     GetpApp()->Yield();
             }
 
-            nRes = TRUE;
+            nRes = sal_True;
             pINST->pRun = pRt->pNext;
             pINST->nCallLvl--;			// Call-Level down again
 
@@ -1214,29 +1202,30 @@ USHORT SbModule::Run( SbMethod* pMeth )
 
             delete pRt;
             pMOD = pOldMod;
-            if ( pINST->nCallLvl == 0 && IsVBACompat() )
-            {
-                // VBA always ensure screenupdating is enabled after completing
-                StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
-                if ( pBasic && pBasic->IsDocBasic() )
-                {
-                    UnlockControllerHack( pBasic );
-                }
-            }
             if( bDelInst )
             {
                 // #57841 Clear Uno-Objects, which were helt in RTL functions,
                 // at the end of the program, so that nothing were helt.
                 ClearUnoObjectsInRTL_Impl( xBasic );
 
+                clearNativeObjectWrapperVector();
+
                 DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
-                delete pINST, pINST = NULL, bDelInst = FALSE;
+                delete pINST, pINST = NULL, bDelInst = sal_False;
 
                 // #i30690
                 SolarMutexGuard aSolarGuard;
                 SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth );
 
                 GlobalRunDeInit();
+
+                // VBA always ensures screenupdating is enabled after completing
+                if ( mbVBACompat )
+                    VBAUnlockDocuments( PTR_CAST( StarBASIC, GetParent() ) );
+
+#ifdef DBG_TRACE_BASIC
+                dbg_DeInitTrace();
+#endif
             }
         }
         else
@@ -1248,10 +1237,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
         StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
     }
 
-    // VBA always ensure screenupdating is enabled after completing
     StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
-    if ( pBasic && pBasic->IsDocBasic() && !pINST )
-        UnlockControllerHack( pBasic );
     if( bDelInst )
     {
        // #57841 Clear Uno-Objects, which were helt in RTL functions,
@@ -1281,9 +1267,9 @@ void SbModule::RunInit()
      && pImage->GetFlag( SBIMG_INITCODE ) )
     {
         // Set flag, so that RunInit get activ (Testtool)
-        GetSbData()->bRunInit = TRUE;
+        GetSbData()->bRunInit = sal_True;
 
-        // BOOL bDelInst = BOOL( pINST == NULL );
+        // sal_Bool bDelInst = sal_Bool( pINST == NULL );
         // if( bDelInst )
             // pINST = new SbiInstance( (StarBASIC*) GetParent() );
         SbModule* pOldMod = pMOD;
@@ -1300,11 +1286,11 @@ void SbModule::RunInit()
         pMOD = pOldMod;
         // if( bDelInst )
             // delete pINST, pINST = NULL;
-        pImage->bInit = TRUE;
-        pImage->bFirstInit = FALSE;
+        pImage->bInit = sal_True;
+        pImage->bFirstInit = sal_False;
 
         // RunInit is not activ anymore
-        GetSbData()->bRunInit = FALSE;
+        GetSbData()->bRunInit = sal_False;
     }
 }
 
@@ -1338,7 +1324,7 @@ void SbModule::RemoveVars()
 
 void SbModule::ClearPrivateVars()
 {
-    for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+    for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
     {
         SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
         if( p )
@@ -1349,12 +1335,12 @@ void SbModule::ClearPrivateVars()
                 SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
                 if( pArray )
                 {
-                    for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+                    for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
                     {
                         SbxVariable* pj = PTR_CAST(SbxVariable,pArray->Get( j ));
                         pj->SbxValue::Clear();
                         /*
-                        USHORT nFlags = pj->GetFlags();
+                        sal_uInt16 nFlags = pj->GetFlags();
                         pj->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
                         pj->PutEmpty();
                         pj->SetFlags( nFlags );
@@ -1366,7 +1352,7 @@ void SbModule::ClearPrivateVars()
             {
                 p->SbxValue::Clear();
                 /*
-                USHORT nFlags = p->GetFlags();
+                sal_uInt16 nFlags = p->GetFlags();
                 p->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
                 p->PutEmpty();
                 p->SetFlags( nFlags );
@@ -1376,23 +1362,76 @@ void SbModule::ClearPrivateVars()
     }
 }
 
-// At first in this module, to remain 358-capable
-// (Avoid branch in sb.cxx)
+void SbModule::implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic )
+{
+    if( pVar->SbxValue::GetType() != SbxOBJECT || pVar->ISA( SbProcedureProperty ) )
+        return;
+
+    SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+    if( pObj != NULL )
+    {
+        SbxObject* p = pObj;
+
+        SbModule* pMod = PTR_CAST( SbModule, p );
+        if( pMod != NULL )
+            pMod->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+
+        while( (p = p->GetParent()) != NULL )
+        {
+            StarBASIC* pBasic = PTR_CAST( StarBASIC, p );
+            if( pBasic != NULL && pBasic == pDeletedBasic )
+            {
+                pVar->SbxValue::Clear();
+                break;
+            }
+        }
+    }
+}
+
+void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
+{
+    (void)pDeletedBasic;
+
+    for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
+    {
+        SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
+        if( p )
+        {
+            if( p->GetType() & SbxARRAY )
+            {
+                SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
+                if( pArray )
+                {
+                    for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
+                    {
+                        SbxVariable* pVar = PTR_CAST(SbxVariable,pArray->Get( j ));
+                        implClearIfVarDependsOnDeletedBasic( pVar, pDeletedBasic );
+                    }
+                }
+            }
+            else
+            {
+                implClearIfVarDependsOnDeletedBasic( p, pDeletedBasic );
+            }
+        }
+    }
+}
+
 void StarBASIC::ClearAllModuleVars( void )
 {
     // Initialise the own module
-    for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+    for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
     {
         SbModule* pModule = (SbModule*)pModules->Get( nMod );
         // Initialise only, if the startcode was already executed
-        if( pModule->pImage && pModule->pImage->bInit )
+        if( pModule->pImage && pModule->pImage->bInit && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
             pModule->ClearPrivateVars();
     }
 
 }
 
 // Execution of the init-code of all module
-void SbModule::GlobalRunInit( BOOL bBasicStart )
+void SbModule::GlobalRunInit( sal_Bool bBasicStart )
 {
     // If no Basic-Start, only initialise, if the module is not initialised
     if( !bBasicStart )
@@ -1403,7 +1442,7 @@ void SbModule::GlobalRunInit( BOOL bBasicStart )
     // With the help of this flags could be located in SbModule::Run() after the call of
     // GlobalRunInit, if at the intialising of the module
     // an error occurred. Then it will not be launched.
-    GetSbData()->bGlobalInitErr = FALSE;
+    GetSbData()->bGlobalInitErr = sal_False;
 
     // Parent of the module is a Basic
     StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
@@ -1450,15 +1489,15 @@ void SbModule::GlobalRunDeInit( void )
 // Search for the next STMNT-Command in the code. This was used from the STMNT-
 // Opcode to set the endcolumn.
 
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol ) const
 {
-    return FindNextStmnt( p, nLine, nCol, FALSE );
+    return FindNextStmnt( p, nLine, nCol, sal_False );
 }
 
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
-    BOOL bFollowJumps, const SbiImage* pImg ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol,
+    sal_Bool bFollowJumps, const SbiImage* pImg ) const
 {
-    UINT32 nPC = (UINT32) ( p - (const BYTE*) pImage->GetCode() );
+    sal_uInt32 nPC = (sal_uInt32) ( p - (const sal_uInt8*) pImage->GetCode() );
     while( nPC < pImage->GetCodeSize() )
     {
         SbiOpcode eOp = (SbiOpcode ) ( *p++ );
@@ -1466,20 +1505,20 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
         if( bFollowJumps && eOp == _JUMP && pImg )
         {
             DBG_ASSERT( pImg, "FindNextStmnt: pImg==NULL with FollowJumps option" );
-            UINT32 nOp1 = *p++; nOp1 |= *p++ << 8;
+            sal_uInt32 nOp1 = *p++; nOp1 |= *p++ << 8;
             nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
-            p = (const BYTE*) pImg->GetCode() + nOp1;
+            p = (const sal_uInt8*) pImg->GetCode() + nOp1;
         }
         else if( eOp >= SbOP1_START && eOp <= SbOP1_END )
             p += 4, nPC += 4;
         else if( eOp == _STMNT )
         {
-            UINT32 nl, nc;
+            sal_uInt32 nl, nc;
             nl = *p++; nl |= *p++ << 8;
             nl |= *p++ << 16 ; nl |= *p++ << 24;
             nc = *p++; nc |= *p++ << 8;
             nc |= *p++ << 16 ; nc |= *p++ << 24;
-            nLine = (USHORT)nl; nCol = (USHORT)nc;
+            nLine = (sal_uInt16)nl; nCol = (sal_uInt16)nc;
             return p;
         }
         else if( eOp >= SbOP2_START && eOp <= SbOP2_END )
@@ -1495,67 +1534,63 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
 
 // Test, if a line contains STMNT-Opcodes
 
-BOOL SbModule::IsBreakable( USHORT nLine ) const
+sal_Bool SbModule::IsBreakable( sal_uInt16 nLine ) const
 {
     if( !pImage )
-        return FALSE;
-    const BYTE* p = (const BYTE* ) pImage->GetCode();
-    USHORT nl, nc;
+        return sal_False;
+    const sal_uInt8* p = (const sal_uInt8* ) pImage->GetCode();
+    sal_uInt16 nl, nc;
     while( ( p = FindNextStmnt( p, nl, nc ) ) != NULL )
         if( nl == nLine )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
-USHORT SbModule::GetBPCount() const
+size_t SbModule::GetBPCount() const
 {
-    return pBreaks ? pBreaks->Count() : 0;
+    return pBreaks ? pBreaks->size() : 0;
 }
 
-USHORT SbModule::GetBP( USHORT n ) const
+sal_uInt16 SbModule::GetBP( size_t n ) const
 {
-    if( pBreaks && n < pBreaks->Count() )
-        return pBreaks->GetObject( n );
+    if( pBreaks && n < pBreaks->size() )
+        return pBreaks->operator[]( n );
     else
         return 0;
 }
 
-BOOL SbModule::IsBP( USHORT nLine ) const
+sal_Bool SbModule::IsBP( sal_uInt16 nLine ) const
 {
     if( pBreaks )
     {
-        const USHORT* p = pBreaks->GetData();
-        USHORT n = pBreaks->Count();
-        for( USHORT i = 0; i < n; i++, p++ )
+        for( size_t i = 0; i < pBreaks->size(); i++ )
         {
-            USHORT b = *p;
+            sal_uInt16 b = pBreaks->operator[]( i );
             if( b == nLine )
-                return TRUE;
+                return sal_True;
             if( b < nLine )
                 break;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbModule::SetBP( USHORT nLine )
+sal_Bool SbModule::SetBP( sal_uInt16 nLine )
 {
     if( !IsBreakable( nLine ) )
-        return FALSE;
+        return sal_False;
     if( !pBreaks )
         pBreaks = new SbiBreakpoints;
-    const USHORT* p = pBreaks->GetData();
-    USHORT n = pBreaks->Count();
-    USHORT i;
-    for( i = 0; i < n; i++, p++ )
+    size_t i;
+    for( i = 0; i < pBreaks->size(); i++ )
     {
-        USHORT b = *p;
+        sal_uInt16 b = pBreaks->operator[]( i );
         if( b == nLine )
-            return TRUE;
+            return sal_True;
         if( b < nLine )
             break;
     }
-    pBreaks->Insert( &nLine, 1, i );
+    pBreaks->insert( pBreaks->begin() + i, nLine );
 
     // #38568: Set during runtime as well here SbDEBUG_BREAK
     if( pINST && pINST->pRun )
@@ -1564,24 +1599,24 @@ BOOL SbModule::SetBP( USHORT nLine )
     return IsBreakable( nLine );
 }
 
-BOOL SbModule::ClearBP( USHORT nLine )
+sal_Bool SbModule::ClearBP( sal_uInt16 nLine )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if( pBreaks )
     {
-        const USHORT* p = pBreaks->GetData();
-        USHORT n = pBreaks->Count();
-        for( USHORT i = 0; i < n; i++, p++ )
+        for( size_t i = 0; i < pBreaks->size(); i++ )
         {
-            USHORT b = *p;
+            sal_uInt16 b = pBreaks->operator[]( i );
             if( b == nLine )
             {
-                pBreaks->Remove( i, 1 ); bRes = TRUE; break;
+                pBreaks->erase( pBreaks->begin() + i ); 
+                bRes = sal_True; 
+                break;
             }
             if( b < nLine )
                 break;
         }
-        if( !pBreaks->Count() )
+        if( pBreaks->empty() )
             delete pBreaks, pBreaks = NULL;
     }
     return bRes;
@@ -1589,7 +1624,8 @@ BOOL SbModule::ClearBP( USHORT nLine )
 
 void SbModule::ClearAllBP()
 {
-    delete pBreaks; pBreaks = NULL;
+    delete pBreaks; 
+    pBreaks = NULL;
 }
 
 void
@@ -1597,39 +1633,39 @@ SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
 {
         if ( !pImg )
             pImg = pImage;
-        for( UINT32 i = 0; i < pMethods->Count(); i++ )
+        for( sal_uInt32 i = 0; i < pMethods->Count(); i++ )
         {
-            SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (USHORT)i ) );
+            SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (sal_uInt16)i ) );
             if( pMeth )
             {
                 //fixup method start positions
                 if ( bCvtToLegacy )
                     pMeth->nStart = pImg->CalcLegacyOffset( pMeth->nStart );
                 else
-                    pMeth->nStart = pImg->CalcNewOffset( (USHORT)pMeth->nStart );
+                    pMeth->nStart = pImg->CalcNewOffset( (sal_uInt16)pMeth->nStart );
             }
         }
 
 }
 
-BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     Clear();
     if( !SbxObject::LoadData( rStrm, 1 ) )
-        return FALSE;
+        return sal_False;
     // As a precaution...
     SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
-    BYTE bImage;
+    sal_uInt8 bImage;
     rStrm >> bImage;
     if( bImage )
     {
         SbiImage* p = new SbiImage;
-        UINT32 nImgVer = 0;
+        sal_uInt32 nImgVer = 0;
 
         if( !p->Load( rStrm, nImgVer ) )
         {
             delete p;
-            return FALSE;
+            return sal_False;
         }
         // If the image is in old format, we fix up the method start offsets
         if ( nImgVer < B_EXT_IMG_VERSION )
@@ -1657,24 +1693,24 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
             delete p;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbModule::StoreData( SvStream& rStrm ) const
 {
-    BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
+    sal_Bool bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
     if ( bFixup )
         fixUpMethodStart( true );
-    BOOL bRet = SbxObject::StoreData( rStrm );
+    sal_Bool bRet = SbxObject::StoreData( rStrm );
     if ( !bRet )
-        return FALSE;
+        return sal_False;
 
     if( pImage )
     {
         pImage->aOUSource = aOUSource;
         pImage->aComment = aComment;
         pImage->aName = GetName();
-        rStrm << (BYTE) 1;
+        rStrm << (sal_uInt8) 1;
         // # PCode is saved only for legacy formats only
         // It should be noted that it probably isn't necessary
         // It would be better not to store the image ( more flexible with
@@ -1691,12 +1727,12 @@ BOOL SbModule::StoreData( SvStream& rStrm ) const
         aImg.aOUSource = aOUSource;
         aImg.aComment = aComment;
         aImg.aName = GetName();
-        rStrm << (BYTE) 1;
+        rStrm << (sal_uInt8) 1;
         return aImg.Save( rStrm );
     }
 }
 
-BOOL SbModule::ExceedsLegacyModuleSize()
+sal_Bool SbModule::ExceedsLegacyModuleSize()
 {
     if ( !IsCompiled() )
         Compile();
@@ -1753,17 +1789,17 @@ bool SbModule::HasExeCode()
 }
 
 // Store only image, no source
-BOOL SbModule::StoreBinaryData( SvStream& rStrm )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm )
 {
     return StoreBinaryData( rStrm, 0 );
 }
 
-BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRet = Compile();
+    sal_Bool bRet = Compile();
     if( bRet )
     {
-        BOOL bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
+        sal_Bool bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
 
         if ( bFixup ) // save in old image format, fix up method starts
             fixUpMethodStart( true );
@@ -1774,7 +1810,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
             pImage->aComment = aComment;
             pImage->aName = GetName();
 
-            rStrm << (BYTE) 1;
+            rStrm << (sal_uInt8) 1;
                     if ( nVer )
                         bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION );
                     else
@@ -1791,7 +1827,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
 // Called for >= OO 1.0 passwd protected libraries only
 //
 
-BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+sal_Bool SbModule::LoadBinaryData( SvStream& rStrm )
 {
     ::rtl::OUString aKeepSource = aOUSource;
     bool bRet = LoadData( rStrm, 2 );
@@ -1800,10 +1836,10 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
     return bRet;
 }
 
-BOOL SbModule::LoadCompleted()
+sal_Bool SbModule::LoadCompleted()
 {
     SbxArray* p = GetMethods();
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0; i < p->Count(); i++ )
     {
         SbMethod* q = PTR_CAST(SbMethod,p->Get( i ) );
@@ -1817,9 +1853,101 @@ BOOL SbModule::LoadCompleted()
         if( q )
             q->pMod = this;
     }
-    return TRUE;
+    return sal_True;
+}
+
+void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint )
+{
+    bool bDone = false;
+
+    const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
+    if( pHint )
+    {
+        SbxVariable* pVar = pHint->GetVar();
+        SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
+        if( pProcProperty )
+        {
+            bDone = true;
+
+            if( pHint->GetId() == SBX_HINT_DATAWANTED )
+            {
+                String aProcName;
+                aProcName.AppendAscii( "Property Get " );
+                aProcName += pProcProperty->GetName();
+
+                SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
+                if( pMeth )
+                {
+                    SbxValues aVals;
+                    aVals.eType = SbxVARIANT;
+
+                    SbxArray* pArg = pVar->GetParameters();
+                    sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+                    if( nVarParCount > 1 )
+                    {
+                        SbxArrayRef xMethParameters = new SbxArray;
+                        xMethParameters->Put( pMeth, 0 );	// Method as parameter 0
+                        for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
+                        {
+                            SbxVariable* pPar = pArg->Get( i );
+                            xMethParameters->Put( pPar, i );
+                        }
+
+                        pMeth->SetParameters( xMethParameters );
+                        pMeth->Get( aVals );
+                        pMeth->SetParameters( NULL );
+                    }
+                    else
+                    {
+                        pMeth->Get( aVals );
+                    }
+
+                    pVar->Put( aVals );
+                }
+            }
+            else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+            {
+                SbxVariable* pMeth = NULL;
+
+                bool bSet = pProcProperty->isSet();
+                if( bSet )
+                {
+                    pProcProperty->setSet( false );
+
+                    String aProcName;
+                    aProcName.AppendAscii( "Property Set " );
+                    aProcName += pProcProperty->GetName();
+                    pMeth = Find( aProcName, SbxCLASS_METHOD );
+                }
+                if( !pMeth )	// Let
+                {
+                    String aProcName;
+                    aProcName.AppendAscii( "Property Let " );
+                    aProcName += pProcProperty->GetName();
+                    pMeth = Find( aProcName, SbxCLASS_METHOD );
+                }
+
+                if( pMeth )
+                {
+                    // Setup parameters
+                    SbxArrayRef xArray = new SbxArray;
+                    xArray->Put( pMeth, 0 );	// Method as parameter 0
+                    xArray->Put( pVar, 1 );
+                    pMeth->SetParameters( xArray );
+
+                    SbxValues aVals;
+                    pMeth->Get( aVals );
+                    pMeth->SetParameters( NULL );
+                }
+            }
+        }
+    }
+
+    if( !bDone )
+        SbModule::Notify( rBC, rHint );
 }
 
+
 /////////////////////////////////////////////////////////////////////////
 // Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
 SbJScriptModule::SbJScriptModule( const String& rName )
@@ -1827,32 +1955,32 @@ SbJScriptModule::SbJScriptModule( const String& rName )
 {
 }
 
-BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     (void)nVer;
 
     Clear();
     if( !SbxObject::LoadData( rStrm, 1 ) )
-        return FALSE;
+        return sal_False;
 
     // Get the source string
     String aTmp;
     rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
     aOUSource = aTmp;
     //rStrm >> aSource;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const
 {
     if( !SbxObject::StoreData( rStrm ) )
-        return FALSE;
+        return sal_False;
 
     // Write the source string
     String aTmp = aOUSource;
     rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
     //rStrm << aSource;
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1861,7 +1989,7 @@ BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
 SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
         : SbxMethod( r, t ), pMod( p )
 {
-    bInvalid	 = TRUE;
+    bInvalid	 = sal_True;
     nStart		 =
     nDebugFlags  =
     nLine1		 =
@@ -1908,35 +2036,35 @@ SbxArray* SbMethod::GetStatics()
     return refStatics;
 }
 
-BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     if( !SbxMethod::LoadData( rStrm, 1 ) )
-        return FALSE;
-    INT16 n;
+        return sal_False;
+    sal_Int16 n;
     rStrm >> n;
-    INT16 nTempStart = (INT16)nStart;
+    sal_Int16 nTempStart = (sal_Int16)nStart;
     // nDebugFlags = n; 	// From 1996-01-16: no longer take over
     if( nVer == 2 )
         rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
     // From: 1996-07-02: HACK ue to 'Referenz could not be saved'
     SetFlag( SBX_NO_MODIFY );
     nStart = nTempStart;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbMethod::StoreData( SvStream& rStrm ) const
+sal_Bool SbMethod::StoreData( SvStream& rStrm ) const
 {
     if( !SbxMethod::StoreData( rStrm ) )
-        return FALSE;
-    rStrm << (INT16) nDebugFlags
-          << (INT16) nLine1
-          << (INT16) nLine2
-          << (INT16) nStart
-          << (BYTE)  bInvalid;
-    return TRUE;
+        return sal_False;
+    rStrm << (sal_Int16) nDebugFlags
+          << (sal_Int16) nLine1
+          << (sal_Int16) nLine2
+          << (sal_Int16) nStart
+          << (sal_uInt8)  bInvalid;
+    return sal_True;
 }
 
-void SbMethod::GetLineRange( USHORT& l1, USHORT& l2 )
+void SbMethod::GetLineRange( sal_uInt16& l1, sal_uInt16& l2 )
 {
     l1 = nLine1; l2 = nLine2;
 }
@@ -1991,7 +2119,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
 
 
 // #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( ULONG nHintId )
+void SbMethod::Broadcast( sal_uIntPtr nHintId )
 {
     if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
     {
@@ -2023,7 +2151,7 @@ void SbMethod::Broadcast( ULONG nHintId )
         pCst = pSave;
         pSave->Broadcast( SbxHint( nHintId, pThisCopy ) );
 
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         SetFlag( SBX_READWRITE );
         pCst = NULL;
         Put( pThisCopy->GetValues_Impl() );
@@ -2057,6 +2185,11 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
     else if ( mInfo.ModuleObject.is() )
         SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
 }
+
+SbObjModule::~SbObjModule()
+{
+}
+
 void
 SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
 {
@@ -2093,22 +2226,34 @@ SbObjModule::Find( const XubString& rName, SbxClassType t )
     return pVar;
 }
 
-typedef ::cppu::WeakImplHelper2< awt::XTopWindowListener, awt::XWindowListener > FormObjEventListener_BASE;
+void SbObjModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+                         const SfxHint& rHint, const TypeId& rHintType )
+{
+    SbModule::handleProcedureProperties( rBC, rHint );
+}
+
+
+typedef ::cppu::WeakImplHelper3<
+    awt::XTopWindowListener,
+    awt::XWindowListener,
+    document::XEventListener > FormObjEventListener_BASE;
 
 class FormObjEventListenerImpl : public FormObjEventListener_BASE
 {
     SbUserFormModule* mpUserForm;
     uno::Reference< lang::XComponent > mxComponent;
+    uno::Reference< frame::XModel > mxModel;
     bool mbDisposed;
     sal_Bool mbOpened;
     sal_Bool mbActivated;
     sal_Bool mbShowing;
-    FormObjEventListenerImpl(); // not defined
+
     FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
+    FormObjEventListenerImpl& operator=(const FormObjEventListenerImpl&); // not defined
 
 public:
-    FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent ) :
-        mpUserForm( pUserForm ), mxComponent( xComponent) ,
+    FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent, const uno::Reference< frame::XModel >& xModel ) :
+        mpUserForm( pUserForm ), mxComponent( xComponent), mxModel( xModel ),
         mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False )
     {
         if ( mxComponent.is() )
@@ -2125,6 +2270,15 @@ public:
             }
             catch( uno::Exception& ) {}
         }
+
+        if ( mxModel.is() )
+        {
+            try
+            {
+                uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->addEventListener( this );
+            }
+            catch( uno::Exception& ) {}
+        }
     }
 
     virtual ~FormObjEventListenerImpl()
@@ -2151,6 +2305,16 @@ public:
             catch( uno::Exception& ) {}
         }
         mxComponent.clear();
+
+        if ( mxModel.is() && !mbDisposed )
+        {
+            try
+            {
+                uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->removeEventListener( this );
+            }
+            catch( uno::Exception& ) {}
+        }
+        mxModel.clear();
     }
 
     virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
@@ -2256,13 +2420,25 @@ public:
     {
     }
 
+    virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException)
+    {
+        // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
+        if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) )
+        {
+            removeListener();
+            mbDisposed = true;
+            if ( mpUserForm )
+                mpUserForm->ResetApiObj();   // will trigger "UserForm_Terminate"
+        }
+    }
+
     virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
     {
         OSL_TRACE("** Userform/Dialog disposing");
+        removeListener();
         mbDisposed = true;
-        mxComponent.clear();
         if ( mpUserForm )
-            mpUserForm->ResetApiObj();
+            mpUserForm->ResetApiObj( false );   // pass false (too late to trigger VBA events here)
     }
 };
 
@@ -2278,9 +2454,9 @@ SbUserFormModule::~SbUserFormModule()
 {
 }
 
-void SbUserFormModule::ResetApiObj()
+void SbUserFormModule::ResetApiObj(  bool bTriggerTerminateEvent )
 {
-    if (  m_xDialog.is() ) // probably someone close the dialog window
+    if ( bTriggerTerminateEvent && m_xDialog.is() ) // probably someone close the dialog window
     {
         triggerTerminateEvent();
     }
@@ -2310,7 +2486,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
             {
                 SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
                 unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
-                xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+                xArray->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
                 // Enable passing by ref
                 if ( xSbxVar->GetType() != SbxVARIANT )
@@ -2323,7 +2499,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
 
             for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
             {
-                aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+                aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< sal_uInt16 >(i) + 1) );
             }
             pMeth->SetParameters( NULL );
         }
@@ -2392,10 +2568,10 @@ SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentMod
 {
 }
 
-BOOL SbUserFormModuleInstance::IsClass( const XubString& rName ) const
+sal_Bool SbUserFormModuleInstance::IsClass( const XubString& rName ) const
 {
-    BOOL bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
-    BOOL bRet = bParentNameMatches || SbxObject::IsClass( rName );
+    sal_Bool bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
+    sal_Bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
     return bRet;
 }
 
@@ -2466,11 +2642,12 @@ void SbUserFormModule::Unload()
 }
 
 
+void registerComponentToBeDisposedForBasic( Reference< XComponent > xComponent, StarBASIC* pBasic );
+
 void SbUserFormModule::InitObject()
 {
     try
     {
-
         String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
         SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE );
         if ( m_xModel.is() && pGlobs )
@@ -2503,11 +2680,27 @@ void SbUserFormModule::InitObject()
             aArgs[ 2 ] <<= m_xModel;
             aArgs[ 3 ] <<= sProjectName;
             pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs  ) ) );
-            uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
-            // remove old listener if it exists
-            if ( m_DialogListener.get() )
+
+            uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
+
+            // the dialog must be disposed at the end!
+            StarBASIC* pParentBasic = NULL;
+            SbxObject* pCurObject = this;
+            do
+            {
+                SbxObject* pObjParent = pCurObject->GetParent();
+                pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+                pCurObject = pObjParent;
+            }
+            while( pParentBasic == NULL && pCurObject != NULL );
+
+            OSL_ASSERT( pParentBasic != NULL );
+            registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+
+            // if old listener object exists, remove it from dialog and document model
+            if( m_DialogListener.is() )
                 m_DialogListener->removeListener();
-            m_DialogListener = new FormObjEventListenerImpl( this, xComponent );
+            m_DialogListener.set( new FormObjEventListenerImpl( this, xComponent, m_xModel ) );
 
             triggerInitializeEvent();
         }
@@ -2530,7 +2723,7 @@ SbUserFormModule::Find( const XubString& rName, SbxClassType t )
 SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
         : SbxProperty( r, t ), pMod( p )
 {
-    bInvalid = FALSE;
+    bInvalid = sal_False;
 }
 
 SbProperty::~SbProperty()
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index cd3d4e277d..3539cd2b04 100644..100755
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -33,7 +33,7 @@
 #include "buffer.hxx"
 #include <string.h>
 
-const static UINT32 UP_LIMIT=0xFFFFFF00L;
+const static sal_uInt32 UP_LIMIT=0xFFFFFF00L;
 
 // The SbiBuffer will be expanded in increments of at least 16 Bytes.
 // This is necessary, because many classes emanate from a buffer length
@@ -70,24 +70,24 @@ char* SbiBuffer::GetBuffer()
 // Test, if the buffer can contain n Bytes.
 // In case of doubt it will be enlarged
 
-BOOL SbiBuffer::Check( USHORT n )
+sal_Bool SbiBuffer::Check( sal_uInt16 n )
 {
-    if( !n ) return TRUE;
-    if( ( static_cast<UINT32>( nOff )+ n ) >  static_cast<UINT32>( nSize ) )
+    if( !n ) return sal_True;
+    if( ( static_cast<sal_uInt32>( nOff )+ n ) >  static_cast<sal_uInt32>( nSize ) )
     {
         if( nInc == 0 )
-            return FALSE;
-        USHORT nn = 0;
+            return sal_False;
+        sal_uInt16 nn = 0;
         while( nn < n ) nn = nn + nInc;
         char* p;
-        if( ( static_cast<UINT32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
+        if( ( static_cast<sal_uInt32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
         else p = new char [nSize + nn];
         if( !p )
         {
             pParser->Error( SbERR_PROG_TOO_LARGE );
             nInc = 0;
             delete[] pBuf; pBuf = NULL;
-            return FALSE;
+            return sal_False;
         }
         else
         {
@@ -98,19 +98,19 @@ BOOL SbiBuffer::Check( USHORT n )
             nSize = nSize + nn;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 // Conditioning of the buffer onto the passed Byte limit
 
-void SbiBuffer::Align( INT32 n )
+void SbiBuffer::Align( sal_Int32 n )
 {
     if( nOff % n ) {
-        UINT32 nn =( ( nOff + n ) / n ) * n;
+        sal_uInt32 nn =( ( nOff + n ) / n ) * n;
         if( nn <= UP_LIMIT )
         {
             nn = nn - nOff;
-            if( Check( static_cast<USHORT>(nn) ) )
+            if( Check( static_cast<sal_uInt16>(nn) ) )
             {
                 memset( pCur, 0, nn );
                 pCur += nn;
@@ -122,13 +122,13 @@ void SbiBuffer::Align( INT32 n )
 
 // Patch of a Location
 
-void SbiBuffer::Patch( UINT32 off, UINT32 val )
+void SbiBuffer::Patch( sal_uInt32 off, sal_uInt32 val )
 {
-    if( ( off + sizeof( UINT32 ) ) < nOff )
+    if( ( off + sizeof( sal_uInt32 ) ) < nOff )
     {
-        UINT16 val1 = static_cast<UINT16>( val & 0xFFFF );
-        UINT16 val2 = static_cast<UINT16>( val >> 16 );
-        BYTE* p = (BYTE*) pBuf + off;
+        sal_uInt16 val1 = static_cast<sal_uInt16>( val & 0xFFFF );
+        sal_uInt16 val2 = static_cast<sal_uInt16>( val >> 16 );
+        sal_uInt8* p = (sal_uInt8*) pBuf + off;
         *p++ = (char) ( val1 & 0xFF );
         *p++ = (char) ( val1 >> 8 );
         *p++ = (char) ( val2 & 0xFF );
@@ -140,18 +140,18 @@ void SbiBuffer::Patch( UINT32 off, UINT32 val )
 // establish a linkage. The beginning of the linkage is at the passed parameter,
 // the end of the linkage is 0.
 
-void SbiBuffer::Chain( UINT32 off )
+void SbiBuffer::Chain( sal_uInt32 off )
 {
     if( off && pBuf )
     {
-        BYTE *ip;
-        UINT32 i = off;
-        UINT32 val1 = (nOff & 0xFFFF);
-        UINT32 val2 = (nOff >> 16);
+        sal_uInt8 *ip;
+        sal_uInt32 i = off;
+        sal_uInt32 val1 = (nOff & 0xFFFF);
+        sal_uInt32 val2 = (nOff >> 16);
         do
         {
-            ip = (BYTE*) pBuf + i;
-            BYTE* pTmp = ip;
+            ip = (sal_uInt8*) pBuf + i;
+            sal_uInt8* pTmp = ip;
                      i =  *pTmp++; i |= *pTmp++ << 8; i |= *pTmp++ << 16; i |= *pTmp++ << 24;
 
             if( i >= nOff )
@@ -167,84 +167,84 @@ void SbiBuffer::Chain( UINT32 off )
     }
 }
 
-BOOL SbiBuffer::operator +=( INT8 n )
+sal_Bool SbiBuffer::operator +=( sal_Int8 n )
 {
     if( Check( 1 ) )
     {
-        *pCur++ = (char) n; nOff++; return TRUE;
-    } else return FALSE;
+        *pCur++ = (char) n; nOff++; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT8 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt8 n )
 {
     if( Check( 1 ) )
     {
-        *pCur++ = (char) n; nOff++; return TRUE;
-    } else return FALSE;
+        *pCur++ = (char) n; nOff++; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( INT16 n )
+sal_Bool SbiBuffer::operator +=( sal_Int16 n )
 {
     if( Check( 2 ) )
     {
         *pCur++ = (char) ( n & 0xFF );
         *pCur++ = (char) ( n >> 8 );
-        nOff += 2; return TRUE;
-    } else return FALSE;
+        nOff += 2; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT16 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt16 n )
 {
     if( Check( 2 ) )
     {
         *pCur++ = (char) ( n & 0xFF );
         *pCur++ = (char) ( n >> 8 );
-        nOff += 2; return TRUE;
-    } else return FALSE;
+        nOff += 2; return sal_True;
+    } else return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( UINT32 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt32 n )
 {
     if( Check( 4 ) )
     {
-        UINT16 n1 = static_cast<UINT16>( n & 0xFFFF );
-        UINT16 n2 = static_cast<UINT16>( n >> 16 );
+        sal_uInt16 n1 = static_cast<sal_uInt16>( n & 0xFFFF );
+        sal_uInt16 n2 = static_cast<sal_uInt16>( n >> 16 );
         if ( operator +=( n1 ) && operator +=( n2 ) )
-            return TRUE;
-        return TRUE;
+            return sal_True;
+        return sal_True;
     } 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbiBuffer::operator +=( INT32 n )
+sal_Bool SbiBuffer::operator +=( sal_Int32 n )
 {
-    return operator +=( (UINT32) n );
+    return operator +=( (sal_uInt32) n );
 }
 
 
-BOOL SbiBuffer::operator +=( const String& n )
+sal_Bool SbiBuffer::operator +=( const String& n )
 {
-    USHORT l = n.Len() + 1;
+    sal_uInt16 l = n.Len() + 1;
     if( Check( l ) )
     {
         ByteString aByteStr( n, gsl_getSystemTextEncoding() );
         memcpy( pCur, aByteStr.GetBuffer(), l );
         pCur += l;
         nOff = nOff + l;
-        return TRUE;
+        return sal_True;
     }
-    else return FALSE;
+    else return sal_False;
 }
 
-BOOL SbiBuffer::Add( const void* p, USHORT len )
+sal_Bool SbiBuffer::Add( const void* p, sal_uInt16 len )
 {
     if( Check( len ) )
     {
         memcpy( pCur, p, len );
         pCur += len;
         nOff = nOff + len;
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
 
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index d292448e17..12017abd4d 100644..100755
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -42,13 +42,13 @@ SbiCodeGen::SbiCodeGen( SbModule& r, SbiParser* p, short nInc )
          : rMod( r ), aCode( p, nInc )
 {
     pParser = p;
-    bStmnt = FALSE; 
+    bStmnt = sal_False; 
     nLine = 0;
     nCol = 0;
     nForLevel = 0;
 }
 
-UINT32 SbiCodeGen::GetPC()
+sal_uInt32 SbiCodeGen::GetPC()
 {
     return aCode.GetSize();
 }
@@ -57,7 +57,7 @@ UINT32 SbiCodeGen::GetPC()
 
 void SbiCodeGen::Statement()
 {
-    bStmnt = TRUE;
+    bStmnt = sal_True;
 
     nLine = pParser->GetLine();
     nCol  = pParser->GetCol1();
@@ -73,7 +73,7 @@ void SbiCodeGen::GenStmnt()
 {
     if( bStmnt )
     {
-        bStmnt = FALSE;
+        bStmnt = sal_False;
         Gen( _STMNT, nLine, nCol );
     }
 }
@@ -81,39 +81,39 @@ void SbiCodeGen::GenStmnt()
 // The Gen-Routines return the offset of the 1. operand,
 // so that jumps can sink their backchain there.
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
+    aCode += (sal_uInt8) eOpcode;
     return GetPC();
 }
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
-    UINT32 n = GetPC();
+    aCode += (sal_uInt8) eOpcode;
+    sal_uInt32 n = GetPC();
     aCode += nOpnd;
     return n;
 }
 
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd1, sal_uInt32 nOpnd2 )
 {
 #ifdef DBG_UTIL
     if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
         pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
 #endif
     GenStmnt();
-    aCode += (UINT8) eOpcode;
-    UINT32 n = GetPC();
+    aCode += (sal_uInt8) eOpcode;
+    sal_uInt32 n = GetPC();
     aCode += nOpnd1;
     aCode += nOpnd2;
     return n;
@@ -178,7 +178,7 @@ void SbiCodeGen::Save()
             String aProcName = pProc->GetName();
             String aIfaceProcName;
             String aIfaceName;
-            USHORT nPassCount = 1;
+            sal_uInt16 nPassCount = 1;
             if( nIfaceCount )
             {
                 int nPropPrefixFound = 
@@ -206,7 +206,7 @@ void SbiCodeGen::Save()
                 }
             }
             SbMethod* pMeth = NULL;
-            for( USHORT nPass = 0 ; nPass < nPassCount ; nPass++ )
+            for( sal_uInt16 nPass = 0 ; nPass < nPassCount ; nPass++ )
             {
                 if( nPass == 1 )
                     aProcName = aIfaceProcName;
@@ -271,7 +271,7 @@ void SbiCodeGen::Save()
                     // The parameter:
                     SbxInfo* pInfo = pMeth->GetInfo();
                     String aHelpFile, aComment;
-                    ULONG nHelpId = 0;
+                    sal_uIntPtr nHelpId = 0;
                     if( pInfo )
                     {
                         // Rescue the additional data
@@ -284,7 +284,7 @@ void SbiCodeGen::Save()
                     pInfo->SetComment( aComment );
                     SbiSymPool* pPool = &pProc->GetParams();
                     // The first element is always the value of the function!
-                    for( USHORT i = 1; i < pPool->GetSize(); i++ )
+                    for( sal_uInt16 i = 1; i < pPool->GetSize(); i++ )
                     {
                         SbiSymDef* pPar = pPool->Get( i );
                         SbxDataType t = pPar->GetType();
@@ -293,14 +293,14 @@ void SbiCodeGen::Save()
                         if( pPar->GetDims() )
                             t = (SbxDataType) ( t | SbxARRAY );
                         // #33677 hand-over an Optional-Info
-                        USHORT nFlags = SBX_READ;
+                        sal_uInt16 nFlags = SBX_READ;
                         if( pPar->IsOptional() )
                             nFlags |= SBX_OPTIONAL;
 
                         pInfo->AddParam( pPar->GetName(), t, nFlags );
 
-                        UINT32 nUserData = 0;
-                        USHORT nDefaultId = pPar->GetDefaultId();
+                        sal_uInt32 nUserData = 0;
+                        sal_uInt16 nDefaultId = pPar->GetDefaultId();
                         if( nDefaultId )
                             nUserData |= nDefaultId;
                         if( pPar->IsParamArray() )
@@ -322,14 +322,14 @@ void SbiCodeGen::Save()
 
     // The global StringPool. 0 is not occupied.
     SbiStringPool* pPool = &pParser->aGblStrings;
-    USHORT nSize = pPool->GetSize();
+    sal_uInt16 nSize = pPool->GetSize();
     p->MakeStrings( nSize );
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i <= nSize; i++ )
         p->AddString( pPool->Find( i ) );
 
     // Insert types
-    USHORT nCount = pParser->rTypeArray->Count();
+    sal_uInt16 nCount = pParser->rTypeArray->Count();
     for (i = 0; i < nCount; i++)
          p->AddType((SbxObject *)pParser->rTypeArray->Get(i));
 
@@ -352,7 +352,7 @@ class PCodeVisitor
 public:
     virtual ~PCodeVisitor();
 
-    virtual void start( BYTE* pStart ) = 0;
+    virtual void start( sal_uInt8* pStart ) = 0;
     virtual void processOpCode0( SbiOpcode eOp ) = 0; 
     virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0; 
     virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0; 
@@ -368,8 +368,8 @@ class PCodeBufferWalker
 {
 private:
     T  m_nBytes;
-    BYTE* m_pCode;
-    T readParam( BYTE*& pCode )
+    sal_uInt8* m_pCode;
+    T readParam( sal_uInt8*& pCode )
     {
         short nBytes = sizeof( T );
         T nOp1=0;
@@ -378,15 +378,15 @@ private:
         return nOp1;
     }
 public:
-    PCodeBufferWalker( BYTE* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
+    PCodeBufferWalker( sal_uInt8* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
     {
     }
     void visitBuffer( PCodeVisitor< T >& visitor )
     {
-        BYTE* pCode = m_pCode;
+        sal_uInt8* pCode = m_pCode;
         if ( !pCode )
             return;
-        BYTE* pEnd = pCode + m_nBytes;
+        sal_uInt8* pEnd = pCode + m_nBytes;
         visitor.start( m_pCode );
         T nOp1 = 0, nOp2 = 0;
         for( ; pCode < pEnd; )
@@ -428,7 +428,7 @@ class OffSetAccumulator : public PCodeVisitor< T >
 public:
     
     OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){}
-    virtual void start( BYTE* /*pStart*/ ){}
+    virtual void start( sal_uInt8* /*pStart*/ ){}
     virtual void processOpCode0( SbiOpcode /*eOp*/ ){ ++m_nNumOp0; }
     virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ){  ++m_nNumSingleParams; }
     virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) { ++m_nNumDoubleParams; }
@@ -449,18 +449,18 @@ template < class T, class S >
 
 class BufferTransformer : public PCodeVisitor< T >
 {
-    BYTE* m_pStart;
+    sal_uInt8* m_pStart;
     SbiBuffer m_ConvertedBuf;
 public:
     BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {}
-    virtual void start( BYTE* pStart ){ m_pStart = pStart; }
+    virtual void start( sal_uInt8* pStart ){ m_pStart = pStart; }
     virtual void processOpCode0( SbiOpcode eOp ) 
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
     }
     virtual void processOpCode1( SbiOpcode eOp, T nOp1 )
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
         switch( eOp )
         {
             case _JUMP:
@@ -485,7 +485,7 @@ public:
     }
     virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) 
     {
-        m_ConvertedBuf += (UINT8)eOp;
+        m_ConvertedBuf += (sal_uInt8)eOp;
         if ( eOp == _CASEIS )
                 if ( nOp1 )
                     nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
@@ -502,7 +502,7 @@ public:
     { 
         return m_ConvertedBuf;
     }
-    static S convertBufferOffSet( BYTE* pStart, T nOp1 )
+    static S convertBufferOffSet( sal_uInt8* pStart, T nOp1 )
     {
         PCodeBufferWalker< T > aBuff( pStart, nOp1);
         OffSetAccumulator< T, S > aVisitor;
@@ -511,16 +511,16 @@ public:
     }
 };
 
-UINT32 
-SbiCodeGen::calcNewOffSet( BYTE* pCode, UINT16 nOffset )
+sal_uInt32 
+SbiCodeGen::calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset )
 {
-    return BufferTransformer< UINT16, UINT32 >::convertBufferOffSet( pCode, nOffset );
+    return BufferTransformer< sal_uInt16, sal_uInt32 >::convertBufferOffSet( pCode, nOffset );
 }
 
-UINT16 
-SbiCodeGen::calcLegacyOffSet( BYTE* pCode, UINT32 nOffset )
+sal_uInt16 
+SbiCodeGen::calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset )
 {
-    return BufferTransformer< UINT32, UINT16 >::convertBufferOffSet( pCode, nOffset );
+    return BufferTransformer< sal_uInt32, sal_uInt16 >::convertBufferOffSet( pCode, nOffset );
 }
 
 template <class T, class S>
@@ -530,11 +530,11 @@ PCodeBuffConvertor<T,S>::convert()
     PCodeBufferWalker< T > aBuf( m_pStart, m_nSize );
     BufferTransformer< T, S > aTrnsfrmer;
     aBuf.visitBuffer( aTrnsfrmer );	
-    m_pCnvtdBuf = (BYTE*)aTrnsfrmer.buffer().GetBuffer();
+    m_pCnvtdBuf = (sal_uInt8*)aTrnsfrmer.buffer().GetBuffer();
     m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() );
 }
 
-template class PCodeBuffConvertor< UINT16, UINT32 >;
-template class PCodeBuffConvertor< UINT32, UINT16 >;
+template class PCodeBuffConvertor< sal_uInt16, sal_uInt32 >;
+template class PCodeBuffConvertor< sal_uInt32, sal_uInt16 >;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index c557e1ac7a..932cb25477 100644..100755
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -40,7 +40,7 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
 // Return-value: a new instance, which were inserted and then deleted.
 // Array-Indexex were returned as SbiDimList
 
-SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
+SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, sal_Bool bStatic, sal_Bool bConst )
 {
     bool bWithEvents = false;
     if( Peek() == WITHEVENTS )
@@ -75,7 +75,7 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
 // Resolving of a AS-Type-Declaration
 // The data type were inserted into the handed over variable
 
-void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
+void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
 {
     SbxDataType eType = rDef.GetType();
     if( bAsNewAlreadyParsed || Peek() == AS )
@@ -196,34 +196,34 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
 
 void SbiParser::Dim()
 {
-    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+    DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
 }
 
-void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
+void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
 {
     SbiSymPool* pOldPool = pPool;
-    BOOL bSwitchPool = FALSE;
-    BOOL bPersistantGlobal = FALSE;
+    sal_Bool bSwitchPool = sal_False;
+    sal_Bool bPersistantGlobal = sal_False;
     SbiToken eFirstTok = eCurTok;
     if( pProc && ( eCurTok == GLOBAL || eCurTok == PUBLIC || eCurTok == PRIVATE ) )
         Error( SbERR_NOT_IN_SUBR, eCurTok );
     if( eCurTok == PUBLIC || eCurTok == GLOBAL )
     {
-        bSwitchPool = TRUE;		// at the right moment switch to the global pool
+        bSwitchPool = sal_True;		// at the right moment switch to the global pool
         if( eCurTok == GLOBAL )
-            bPersistantGlobal = TRUE;
+            bPersistantGlobal = sal_True;
     }
     // behavior in VBA is that a module scope variable's lifetime is
     // tied to the document. e.g. a module scope variable is global
        if(  GetBasic()->IsDocBasic() && bVBASupportOn && !pProc )
-        bPersistantGlobal = TRUE;
+        bPersistantGlobal = sal_True;
     // PRIVATE is a synonymous for DIM
     // _CONST_?
-    BOOL bConst = FALSE;
+    sal_Bool bConst = sal_False;
     if( eCurTok == _CONST_ )
-        bConst = TRUE;
+        bConst = sal_True;
     else if( Peek() == _CONST_ )
-        Next(), bConst = TRUE;
+        Next(), bConst = sal_True;
 
     // #110004 It can also be a sub/function
     if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
@@ -244,10 +244,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = FALSE;
+                bNewGblDefs = sal_False;
             }
             Next();
-            DefProc( FALSE, bPrivate );
+            DefProc( sal_False, bPrivate );
             return;
         }
         else if( eCurTok == ENUM )
@@ -294,14 +294,14 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     SbiDimList* pDim;
 
     // From 1997-07-09, #40689, Statics -> Modul-Initialising, skip in Sub
-    UINT32 nEndOfStaticLbl = 0;
+    sal_uInt32 nEndOfStaticLbl = 0;
     if( !bVBASupportOn && bStatic )
     {
         nEndOfStaticLbl = aGen.Gen( _JUMP, 0 );
         aGen.Statement();	// catch up on static here
     }
 
-    BOOL bDefined = FALSE;
+    sal_Bool bDefined = sal_False;
     while( ( pDef = VarDecl( &pDim, bStatic, bConst ) ) != NULL )
     {
         EnableErrors();
@@ -310,12 +310,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             pPool = &aGlobals;
         SbiSymDef* pOld = pPool->Find( pDef->GetName() );
         // From 1996-03-31, #25651#, search also in the Runtime-Library
-        BOOL bRtlSym = FALSE;
+        sal_Bool bRtlSym = sal_False;
         if( !pOld )
         {
             pOld = CheckRTLForSym( pDef->GetName(), SbxVARIANT );
             if( pOld )
-                bRtlSym = TRUE;
+                bRtlSym = sal_True;
         }
         if( pOld && !(eOp == _REDIM || eOp == _REDIMP) )
         {
@@ -324,7 +324,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         }
         if( pOld )
         {
-            bDefined = TRUE;
+            bDefined = sal_True;
             // always an error at a RTL-S
             if( !bRtlSym && (eOp == _REDIM || eOp == _REDIMP) )
             {
@@ -370,17 +370,20 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                                 }
                 global:			aGen.BackChain( nGblChain );
                                 nGblChain = 0;
-                                bGblDefs = bNewGblDefs = TRUE;
+                                bGblDefs = bNewGblDefs = sal_True;
                                 break;
                 default:		eOp2 = _LOCAL;
             }
-            UINT32 nOpnd2 = sal::static_int_cast< UINT16 >( pDef->GetType() );
+            sal_uInt32 nOpnd2 = sal::static_int_cast< sal_uInt16 >( pDef->GetType() );
             if( pDef->IsWithEvents() )
                 nOpnd2 |= SBX_TYPE_WITH_EVENTS_FLAG;
 
+            if( bCompatible && pDef->IsNew() )
+                nOpnd2 |= SBX_TYPE_DIM_AS_NEW_FLAG;
+
             short nFixedStringLength = pDef->GetFixedStringLength();
             if( nFixedStringLength >= 0 )
-                nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17));		// len = all bits above 0x10000
+                nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (sal_uInt32(nFixedStringLength) << 17));		// len = all bits above 0x10000
 
             aGen.Gen( eOp2, pDef->GetId(), nOpnd2 );
         }
@@ -490,10 +493,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                 }
                 pDef->SetDims( pDim->GetDims() );
                 if( bPersistantGlobal )
-                    pDef->SetGlobal( TRUE );
+                    pDef->SetGlobal( sal_True );
                 SbiExpression aExpr( this, *pDef, pDim );
                 aExpr.Gen();
-                pDef->SetGlobal( FALSE );
+                pDef->SetGlobal( sal_False );
                 aGen.Gen( (eOp == _STATIC) ? _DIM : eOp );
             }
         }
@@ -518,7 +521,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     {
         // maintain the global chain
         nGblChain = aGen.Gen( _JUMP, 0 );
-        bGblDefs = bNewGblDefs = TRUE;
+        bGblDefs = bNewGblDefs = sal_True;
 
         // Register for Sub a jump to the end of statics
         aGen.BackChain( nEndOfStaticLbl );
@@ -531,7 +534,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
 
 void SbiParser::ReDim()
 {
-    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+    DefVar( _REDIM, (  pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
 }
 
 // ERASE array, ...
@@ -551,10 +554,10 @@ void SbiParser::Erase()
 
 void SbiParser::Type()
 {
-    DefType( FALSE );
+    DefType( sal_False );
 }
 
-void SbiParser::DefType( BOOL bPrivate )
+void SbiParser::DefType( sal_Bool bPrivate )
 {
     // TODO: Use bPrivate
     (void)bPrivate;
@@ -573,7 +576,7 @@ void SbiParser::DefType( BOOL bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim = NULL;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     while( !bDone && !IsEof() )
     {
@@ -581,7 +584,7 @@ void SbiParser::DefType( BOOL bPrivate )
         {
             case ENDTYPE :
                 pElem = NULL;
-                bDone = TRUE;
+                bDone = sal_True;
                 Next();
             break;
 
@@ -593,9 +596,9 @@ void SbiParser::DefType( BOOL bPrivate )
 
             default:
                 pDim = NULL;
-                pElem = VarDecl(&pDim,FALSE,FALSE);
+                pElem = VarDecl(&pDim,sal_False,sal_False);
                 if( !pElem )
-                    bDone = TRUE;	// Error occurred
+                    bDone = sal_True;	// Error occurred
         }
         if( pElem )
         {
@@ -616,8 +619,8 @@ void SbiParser::DefType( BOOL bPrivate )
 
                         for ( short i=0; i<pDim->GetSize();++i )
                         {
-                            INT32 ub = -1;
-                            INT32 lb = nBase;
+                            sal_Int32 ub = -1;
+                            sal_Int32 lb = nBase;
                             SbiExprNode* pNode =  pDim->Get(i)->GetExprNode();
                             ub = pNode->GetNumber();
                             if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
@@ -636,7 +639,7 @@ void SbiParser::DefType( BOOL bPrivate )
                     }
                     else
                         pArray->unoAddDim( 0, -1 ); // variant array
-                    USHORT nSavFlags = pTypeElem->GetFlags();
+                    sal_uInt16 nSavFlags = pTypeElem->GetFlags();
                     // need to reset the FIXED flag
                     // when calling PutObject ( because the type will not match Object )
                     pTypeElem->ResetFlag( SBX_FIXED );
@@ -646,7 +649,7 @@ void SbiParser::DefType( BOOL bPrivate )
                 // Nested user type?
                 if( eElemType == SbxOBJECT )
                 {
-                    USHORT nElemTypeId = pElem->GetTypeId();
+                    sal_uInt16 nElemTypeId = pElem->GetTypeId();
                     if( nElemTypeId != 0 )
                     {
                         String aTypeName( aGblStrings.Find( nElemTypeId ) );
@@ -676,10 +679,10 @@ void SbiParser::DefType( BOOL bPrivate )
 
 void SbiParser::Enum()
 {
-    DefEnum( FALSE );
+    DefEnum( sal_False );
 }
 
-void SbiParser::DefEnum( BOOL bPrivate )
+void SbiParser::DefEnum( sal_Bool bPrivate )
 {
     // Read a the new Token. It had to be a symbol
     if (!TestSymbol())
@@ -698,7 +701,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
 
     SbiSymDef* pElem;
     SbiDimList* pDim;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     // Starting with -1 to make first default value 0 after ++
     sal_Int32 nCurrentEnumValue = -1;
@@ -708,7 +711,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
         {
             case ENDENUM :
                 pElem = NULL;
-                bDone = TRUE;
+                bDone = sal_True;
                 Next();
             break;
 
@@ -721,20 +724,20 @@ void SbiParser::DefEnum( BOOL bPrivate )
             default:
             {
                 // TODO: Check existing!
-                BOOL bDefined = FALSE;
+                sal_Bool bDefined = sal_False;
 
                 pDim = NULL;
-                pElem = VarDecl( &pDim, FALSE, TRUE );
+                pElem = VarDecl( &pDim, sal_False, sal_True );
                 if( !pElem )
                 {
-                    bDone = TRUE;	// Error occurred
+                    bDone = sal_True;	// Error occurred
                     break;
                 }
                 else if( pDim )
                 {
                     delete pDim;
                     Error( SbERR_SYNTAX );
-                    bDone = TRUE;	// Error occurred
+                    bDone = sal_True;	// Error occurred
                     break;
                 }
 
@@ -764,7 +767,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
                 if( pOld )
                 {
                     Error( SbERR_VAR_DEFINED, pElem->GetName() );
-                    bDone = TRUE;	// Error occurred
+                    bDone = sal_True;	// Error occurred
                     break;
                 }
 
@@ -775,13 +778,13 @@ void SbiParser::DefEnum( BOOL bPrivate )
                     SbiOpcode eOp = _GLOBAL;
                     aGen.BackChain( nGblChain );
                     nGblChain = 0;
-                    bGblDefs = bNewGblDefs = TRUE;
+                    bGblDefs = bNewGblDefs = sal_True;
                     aGen.Gen(
                         eOp, pElem->GetId(),
-                        sal::static_int_cast< UINT16 >( pElem->GetType() ) );
+                        sal::static_int_cast< sal_uInt16 >( pElem->GetType() ) );
 
                     aVar.Gen();
-                    USHORT nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
+                    sal_uInt16 nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
                     aGen.Gen( _NUMBER, nStringId );
                     aGen.Gen( _PUTC );
                 }
@@ -812,10 +815,10 @@ void SbiParser::DefEnum( BOOL bPrivate )
 // the first Token is already read in (SUB/FUNCTION)
 // xxx Name [LIB "name"[ALIAS "name"]][(Parameter)][AS TYPE]
 
-SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
 {
-    BOOL bFunc = BOOL( eCurTok == FUNCTION );
-    BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );
+    sal_Bool bFunc = sal_Bool( eCurTok == FUNCTION );
+    sal_Bool bProp = sal_Bool( eCurTok == GET || eCurTok == SET || eCurTok == LET );
     if( !TestSymbol() ) return NULL;
     String aName( aSym );
     SbxDataType eType = eScanType;
@@ -850,7 +853,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Error( SbERR_UNEXPECTED, ALIAS );
         if( pDef->IsCdecl() )
             Error( SbERR_UNEXPECTED, _CDECL_ );
-        pDef->SetCdecl( FALSE );
+        pDef->SetCdecl( sal_False );
         pDef->GetLib().Erase();
         pDef->GetAlias().Erase();
     }
@@ -861,7 +864,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Error( SbERR_UNEXPECTED, ALIAS );
         if( pDef->IsCdecl() )
             Error( SbERR_UNEXPECTED, _CDECL_ );
-        pDef->SetCdecl( FALSE );
+        pDef->SetCdecl( sal_False );
         pDef->GetAlias().Erase();
     }
     // Brackets?
@@ -872,23 +875,23 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             Next();
         else
           for(;;) {
-            BOOL bByVal = FALSE;
-            BOOL bOptional = FALSE;
-            BOOL bParamArray = FALSE;
+            sal_Bool bByVal = sal_False;
+            sal_Bool bOptional = sal_False;
+            sal_Bool bParamArray = sal_False;
             while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
             {
-                if		( Peek() == BYVAL )		Next(), bByVal = TRUE;
-                else if	( Peek() == BYREF )		Next(), bByVal = FALSE;
-                else if	( Peek() == _OPTIONAL_ )	Next(), bOptional = TRUE;
+                if		( Peek() == BYVAL )		Next(), bByVal = sal_True;
+                else if	( Peek() == BYREF )		Next(), bByVal = sal_False;
+                else if	( Peek() == _OPTIONAL_ )	Next(), bOptional = sal_True;
             }
             if( bCompatible && Peek() == PARAMARRAY )
             {
                 if( bByVal || bOptional )
                     Error( SbERR_UNEXPECTED, PARAMARRAY );
                 Next();
-                bParamArray = TRUE;
+                bParamArray = sal_True;
             }
-            SbiSymDef* pPar = VarDecl( NULL, FALSE, FALSE );
+            SbiSymDef* pPar = VarDecl( NULL, sal_False, sal_False );
             if( !pPar )
                 break;
             if( bByVal )
@@ -901,13 +904,13 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
             SbiToken eTok = Next();
             if( eTok != COMMA && eTok != RPAREN )
             {
-                BOOL bError2 = TRUE;
+                sal_Bool bError2 = sal_True;
                 if( bOptional && bCompatible && eTok == EQ )
                 {
                     SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
                     SbxDataType eType2 = pDefaultExpr->GetType();
 
-                    USHORT nStringId;
+                    sal_uInt16 nStringId;
                     if( eType2 == SbxSTRING )
                         nStringId = aGblStrings.Add( pDefaultExpr->GetString() );
                     else
@@ -918,7 +921,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
                     eTok = Next();
                     if( eTok == COMMA || eTok == RPAREN )
-                        bError2 = FALSE;
+                        bError2 = sal_False;
                 }
                 if( bError2 )
                 {
@@ -945,10 +948,10 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
 
 void SbiParser::Declare()
 {
-    DefDeclare( FALSE );
+    DefDeclare( sal_False );
 }
 
-void SbiParser::DefDeclare( BOOL bPrivate )
+void SbiParser::DefDeclare( sal_Bool bPrivate )
 {
     Next();
     if( eCurTok != SUB && eCurTok != FUNCTION )
@@ -957,7 +960,7 @@ void SbiParser::DefDeclare( BOOL bPrivate )
     {
         bool bFunction = (eCurTok == FUNCTION);
 
-        SbiProcDef* pDef = ProcDecl( TRUE );
+        SbiProcDef* pDef = ProcDecl( sal_True );
         if( pDef )
         {
             if( !pDef->GetLib().Len() )
@@ -990,39 +993,39 @@ void SbiParser::DefDeclare( BOOL bPrivate )
                     if( bNewGblDefs && nGblChain == 0 )
                     {
                         nGblChain = aGen.Gen( _JUMP, 0 );
-                        bNewGblDefs = FALSE;
+                        bNewGblDefs = sal_False;
                     }
 
-                    USHORT nSavLine = nLine;
+                    sal_uInt16 nSavLine = nLine;
                     aGen.Statement();
                     pDef->Define();
                     pDef->SetLine1( nSavLine );
                     pDef->SetLine2( nSavLine );
 
                     SbiSymPool& rPool = pDef->GetParams();
-                    USHORT nParCount = rPool.GetSize();
+                    sal_uInt16 nParCount = rPool.GetSize();
 
                     SbxDataType eType = pDef->GetType();
                     if( bFunction )
-                        aGen.Gen( _PARAM, 0, sal::static_int_cast< UINT16 >( eType ) );
+                        aGen.Gen( _PARAM, 0, sal::static_int_cast< sal_uInt16 >( eType ) );
 
                     if( nParCount > 1 )
                     {
                         aGen.Gen( _ARGC );
 
-                        for( USHORT i = 1 ; i < nParCount ; ++i )
+                        for( sal_uInt16 i = 1 ; i < nParCount ; ++i )
                         {
                             SbiSymDef* pParDef = rPool.Get( i );
                             SbxDataType eParType = pParDef->GetType();
 
-                            aGen.Gen( _PARAM, i, sal::static_int_cast< UINT16 >( eParType ) );
+                            aGen.Gen( _PARAM, i, sal::static_int_cast< sal_uInt16 >( eParType ) );
                             aGen.Gen( _ARGV );
 
-                            USHORT nTyp = sal::static_int_cast< USHORT >( pParDef->GetType() );
+                            sal_uInt16 nTyp = sal::static_int_cast< sal_uInt16 >( pParDef->GetType() );
                             if( pParDef->IsByVal() )
                             {
                                 // Reset to avoid additional byval in call to wrapper function
-                                pParDef->SetByVal( FALSE );
+                                pParDef->SetByVal( sal_False );
                                 nTyp |= 0x8000;
                             }
                             aGen.Gen( _ARGTYP, nTyp );
@@ -1032,12 +1035,12 @@ void SbiParser::DefDeclare( BOOL bPrivate )
                     aGen.Gen( _LIB, aGblStrings.Add( pDef->GetLib() ) );
 
                     SbiOpcode eOp = pDef->IsCdecl() ? _CALLC : _CALL;
-                    USHORT nId = pDef->GetId();
+                    sal_uInt16 nId = pDef->GetId();
                     if( pDef->GetAlias().Len() )
                         nId = ( nId & 0x8000 ) | aGblStrings.Add( pDef->GetAlias() );
                     if( nParCount > 1 )
                         nId |= 0x8000;
-                    aGen.Gen( eOp, nId, sal::static_int_cast< UINT16 >( eType ) );
+                    aGen.Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( eType ) );
 
                     if( bFunction )
                         aGen.Gen( _PUT );
@@ -1079,18 +1082,18 @@ void SbiParser::Call()
 
 void SbiParser::SubFunc()
 {
-    DefProc( FALSE, FALSE );
+    DefProc( sal_False, sal_False );
 }
 
 // Read in of a procedure
 
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
 
-void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
+void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
 {
-    USHORT l1 = nLine, l2 = nLine;
-    BOOL bSub = BOOL( eCurTok == SUB );
-    BOOL bProperty = BOOL( eCurTok == PROPERTY );
+    sal_uInt16 l1 = nLine, l2 = nLine;
+    sal_Bool bSub = sal_Bool( eCurTok == SUB );
+    sal_Bool bProperty = sal_Bool( eCurTok == PROPERTY );
     PropertyMode ePropertyMode = PROPERTY_MODE_NONE;
     if( bProperty )
     {
@@ -1106,7 +1109,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     }
 
     SbiToken eExit = eCurTok;
-    SbiProcDef* pDef = ProcDecl( FALSE );
+    SbiProcDef* pDef = ProcDecl( sal_False );
     if( !pDef )
         return;
     pDef->setPropertyMode( ePropertyMode );
@@ -1160,13 +1163,13 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     if( bStatic )
         {
         if ( bVBASupportOn )
-            pProc->SetStatic( TRUE );
+            pProc->SetStatic( sal_True );
         else
             Error( SbERR_NOT_IMPLEMENTED ); // STATIC SUB ...
         }
      else
     {
-        pProc->SetStatic( FALSE );
+        pProc->SetStatic( sal_False );
         }
     // Normal case: Local variable->parameter->global variable
     pProc->GetLocals().SetParent( &pProc->GetParams() );
@@ -1191,10 +1194,10 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
 
 void SbiParser::Static()
 {
-    DefStatic( FALSE );
+    DefStatic( sal_False );
 }
 
-void SbiParser::DefStatic( BOOL bPrivate )
+void SbiParser::DefStatic( sal_Bool bPrivate )
 {
     switch( Peek() )
     {
@@ -1206,10 +1209,10 @@ void SbiParser::DefStatic( BOOL bPrivate )
             if( bNewGblDefs && nGblChain == 0 )
             {
                 nGblChain = aGen.Gen( _JUMP, 0 );
-                bNewGblDefs = FALSE;
+                bNewGblDefs = sal_False;
             }
             Next();
-            DefProc( TRUE, bPrivate );
+            DefProc( sal_True, bPrivate );
             break;
         default: {
             if( !pProc )
@@ -1217,7 +1220,7 @@ void SbiParser::DefStatic( BOOL bPrivate )
             // Reset the Pool, so that STATIC-Declarations go into the
             // global Pool
             SbiSymPool* p = pPool; pPool = &aPublics;
-            DefVar( _STATIC, TRUE );
+            DefVar( _STATIC, sal_True );
             pPool = p;
             } break;
     }
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 4113ae72ca..4ff84170f3 100644..100755
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -76,12 +76,12 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
             case SbxINTEGER: pGen->Gen( _CONST,  (short) nVal ); break;
             case SbxSTRING:  
             {
-                USHORT nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, TRUE );
+                sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, sal_True );
                 pGen->Gen( _SCONST, nStringId ); break;
             }
             default:
             {
-                USHORT nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
+                sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
                 pGen->Gen( _NUMBER, nStringId );
             }
         }
@@ -175,7 +175,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
     // The ID is either the position or the String-ID
     // If the bit Bit 0x8000 is set, the variable have
     // a parameter list.
-    USHORT nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
+    sal_uInt16 nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
     // Build a parameter list
     if( aVar.pPar && aVar.pPar->GetSize() )
     {
@@ -183,7 +183,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
         aVar.pPar->Gen();
     }
         
-    pGen->Gen( eOp, nId, sal::static_int_cast< UINT16 >( GetType() ) );
+    pGen->Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
 
     if( aVar.pvMorePar )
     {
@@ -208,7 +208,7 @@ void SbiExprList::Gen()
     {
         pParser->aGen.Gen( _ARGC );
         // From 1996-01-10: Type adjustment at DECLARE
-        USHORT nCount = 1 /*, nParAnz = 0*/;
+        sal_uInt16 nCount = 1 /*, nParAnz = 0*/;
 //		SbiSymPool* pPool = NULL;
         for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ )
         {
@@ -216,7 +216,7 @@ void SbiExprList::Gen()
             if( pExpr->GetName().Len() )
             {
                 // named arg
-                USHORT nSid = pParser->aGblStrings.Add( pExpr->GetName() );
+                sal_uInt16 nSid = pParser->aGblStrings.Add( pExpr->GetName() );
                 pParser->aGen.Gen( _ARGN, nSid );
 
                 /* TODO: Check after Declare concept change
@@ -227,7 +227,7 @@ void SbiExprList::Gen()
                     pParser->Error( SbERR_NO_NAMED_ARGS );
 
                     // Later, if Named Args at DECLARE is posible
-                    //for( USHORT i = 1 ; i < nParAnz ; i++ )
+                    //for( sal_uInt16 i = 1 ; i < nParAnz ; i++ )
                     //{
                     //	SbiSymDef* pDef = pPool->Get( i );
                     //	const String& rName = pDef->GetName();
@@ -261,7 +261,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
         pParser->aGen.Gen( _BYVAL );
     if( bBased )
     {
-        USHORT uBase = pParser->nBase;
+        sal_uInt16 uBase = pParser->nBase;
         if( pParser->IsCompatible() )
             uBase |= 0x8000;		// #109275 Flag compatiblity
         pParser->aGen.Gen( _BASED, uBase );
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 542fdaeba6..ff171eecc3 100644..100755
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -54,7 +54,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode*
     nVal	  = 0;
     eType     = SbxVARIANT;		// Nodes are always Variant
     eNodeType = SbxNODE;
-    bComposite= TRUE;
+    bComposite= sal_True;
 }
 
 SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -87,11 +87,11 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, SbxDataType t, SbiEx
     aVar.pNext= NULL;
 
     // Results of functions are at no time fixed
-    bComposite= BOOL( aVar.pDef->GetProcDef() != NULL );
+    bComposite= sal_Bool( aVar.pDef->GetProcDef() != NULL );
 }
 
 // #120061 TypeOf
-SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, sal_uInt16 nId )
 {
     BaseInit( p );
 
@@ -102,7 +102,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
 }
 
 // new <type>
-SbiExprNode::SbiExprNode( SbiParser* p, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, sal_uInt16 nId )
 {
     BaseInit( p );
 
@@ -119,8 +119,8 @@ void SbiExprNode::BaseInit( SbiParser* p )
     pLeft 		= NULL;
     pRight		= NULL;
     pWithParent = NULL;
-    bComposite	= FALSE;
-    bError	    = FALSE;
+    bComposite	= sal_False;
+    bError	    = sal_False;
 }
 
 SbiExprNode::~SbiExprNode()
@@ -175,7 +175,7 @@ SbiExprNode* SbiExprNode::GetRealNode()
 
 // This method transform the type, if it fits into the Integer range
 
-BOOL SbiExprNode::IsIntConst()
+sal_Bool SbiExprNode::IsIntConst()
 {
     if( eNodeType == SbxNUMVAL )
     {
@@ -186,29 +186,29 @@ BOOL SbiExprNode::IsIntConst()
             {
                 nVal = (double) (short) nVal;
                 eType = SbxINTEGER;
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbiExprNode::IsNumber()
+sal_Bool SbiExprNode::IsNumber()
 {
-    return BOOL( eNodeType == SbxNUMVAL );
+    return sal_Bool( eNodeType == SbxNUMVAL );
 }
 
-BOOL SbiExprNode::IsString()
+sal_Bool SbiExprNode::IsString()
 {
-    return BOOL( eNodeType == SbxSTRVAL );
+    return sal_Bool( eNodeType == SbxSTRVAL );
 }
 
-BOOL SbiExprNode::IsVariable()
+sal_Bool SbiExprNode::IsVariable()
 {
-    return BOOL( eNodeType == SbxVARVAL );
+    return sal_Bool( eNodeType == SbxVARVAL );
 }
 
-BOOL SbiExprNode::IsLvalue()
+sal_Bool SbiExprNode::IsLvalue()
 {
     return IsVariable();
 }
@@ -284,7 +284,7 @@ void SbiExprNode::FoldConstants()
                 String rr( pRight->GetString() );
                 delete pLeft; pLeft = NULL;
                 delete pRight; pRight = NULL;
-                bComposite = FALSE;
+                bComposite = sal_False;
                 if( eTok == PLUS || eTok == CAT )
                 {
                     eTok = CAT;
@@ -321,7 +321,7 @@ void SbiExprNode::FoldConstants()
                             break;
                         default:
                             pGen->GetParser()->Error( SbERR_CONVERSION );
-                            bError = TRUE;
+                            bError = sal_True;
                     }
                 }
             }
@@ -335,50 +335,50 @@ void SbiExprNode::FoldConstants()
                    || eTok == IDIV || eTok == MOD )
                 {
                     // Integer operations
-                    BOOL err = FALSE;
-                    if( nl > SbxMAXLNG ) err = TRUE, nl = SbxMAXLNG;
+                    sal_Bool err = sal_False;
+                    if( nl > SbxMAXLNG ) err = sal_True, nl = SbxMAXLNG;
                     else
-                    if( nl < SbxMINLNG ) err = TRUE, nl = SbxMINLNG;
-                    if( nr > SbxMAXLNG ) err = TRUE, nr = SbxMAXLNG;
+                    if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG;
+                    if( nr > SbxMAXLNG ) err = sal_True, nr = SbxMAXLNG;
                     else
-                    if( nr < SbxMINLNG ) err = TRUE, nr = SbxMINLNG;
+                    if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG;
                     ll = (long) nl; lr = (long) nr;
                     llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); 
                     lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); 
                     if( err )
                     {
                         pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
-                        bError = TRUE;
+                        bError = sal_True;
                     }
                 }
-                BOOL bBothInt = BOOL( pLeft->eType < SbxSINGLE
+                sal_Bool bBothInt = sal_Bool( pLeft->eType < SbxSINGLE
                                    && pRight->eType < SbxSINGLE );
                 delete pLeft; pLeft = NULL;
                 delete pRight; pRight = NULL;
                 nVal = 0;
                 eType = SbxDOUBLE;
                 eNodeType = SbxNUMVAL;
-                bComposite = FALSE;
-                BOOL bCheckType = FALSE;
+                bComposite = sal_False;
+                sal_Bool bCheckType = sal_False;
                 switch( eTok )
                 {
                     case EXPON:
                         nVal = pow( nl, nr ); break;
                     case MUL:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl * nr; break;
                     case DIV:
                         if( !nr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = nl / nr;
                         break;
                     case PLUS:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl + nr; break;
                     case MINUS:
-                        bCheckType = TRUE;
+                        bCheckType = sal_True;
                         nVal = nl - nr; break;
                     case EQ:
                         nVal = ( nl == nr ) ? SbxTRUE : SbxFALSE;
@@ -402,14 +402,14 @@ void SbiExprNode::FoldConstants()
                         if( !lr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = ll / lr;
                         eType = SbxLONG; break;
                     case MOD:
                         if( !lr )
                         {
                             pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
-                            bError = TRUE;
+                            bError = sal_True;
                         } else nVal = llMod % lrMod;
                         eType = SbxLONG; break;
                     case AND:
@@ -448,21 +448,21 @@ void SbiExprNode::FoldConstants()
         pLeft = NULL;
         eType = SbxDOUBLE;
         eNodeType = SbxNUMVAL;
-        bComposite = FALSE;
+        bComposite = sal_False;
         switch( eTok )
         {
             case NEG:
                 nVal = -nVal; break;
             case NOT: {
                 // Integer operation!
-                BOOL err = FALSE;
-                if( nVal > SbxMAXLNG ) err = TRUE, nVal = SbxMAXLNG;
+                sal_Bool err = sal_False;
+                if( nVal > SbxMAXLNG ) err = sal_True, nVal = SbxMAXLNG;
                 else
-                if( nVal < SbxMINLNG ) err = TRUE, nVal = SbxMINLNG;
+                if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG;
                 if( err )
                 {
                     pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
-                    bError = TRUE;
+                    bError = sal_True;
                 }
                 nVal = (double) ~((long) nVal);
                 eType = SbxLONG;
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index b492c794e0..6554cf24dd 100644..100755
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -43,7 +43,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
     SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo )
 {
     pParser = p;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     nParenLevel = 0;
     eCurExpr = t;
     m_eMode = eMode;
@@ -62,7 +62,7 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t )
     pParser = p;
     eCurExpr = SbOPERAND;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     pExpr = new SbiExprNode( pParser, n, t );
     pExpr->Optimize();
 }
@@ -71,7 +71,7 @@ SbiExpression::SbiExpression( SbiParser* p, const String& r )
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, r );
 }
@@ -80,7 +80,7 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprList* pPa
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, r, SbxVARIANT, pPar );
 }
@@ -89,7 +89,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiToken t )
 {
     pParser = p;
     pNext = NULL;
-    bError = bByVal = bBased = bBracket = FALSE;
+    bError = bByVal = bBased = bBracket = sal_False;
     eCurExpr = SbOPERAND;
     pExpr = new SbiExprNode( pParser, NULL, t, NULL );
 }
@@ -108,17 +108,17 @@ SbiExpression::~SbiExpression()
 // Folgen Parameter ohne Klammer? Dies kann eine Zahl, ein String,
 // ein Symbol oder auch ein Komma sein (wenn der 1. Parameter fehlt)
 
-static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
+static sal_Bool DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
 {
     if( eTok == LPAREN )
-        return TRUE;
+        return sal_True;
     // Aber nur, wenn CALL-aehnlich!
     if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
-        return FALSE;
+        return sal_False;
     if (   eTok == NUMBER || eTok == MINUS || eTok == FIXSTRING
         || eTok == SYMBOL || eTok == COMMA  || eTok == DOT || eTok == NOT || eTok == BYVAL )
     {
-        return TRUE;
+        return sal_True;
     }
     else // check for default params with reserved names ( e.g. names of tokens )
     {
@@ -126,9 +126,9 @@ static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTo
         // Urk the Next() / Peek() symantics are... weird
         tokens.Next();
         if ( tokens.Peek() == ASSIGN )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False; 	
 }
 
 // Definition eines neuen Symbols
@@ -139,7 +139,7 @@ static SbiSymDef* AddSym
 {
     SbiSymDef* pDef;
     // A= ist keine Prozedur
-    BOOL bHasType = BOOL( eTok == EQ || eTok == DOT );
+    sal_Bool bHasType = sal_Bool( eTok == EQ || eTok == DOT );
     if( ( !bHasType && eCurExpr == SbSYMBOL ) || pPar )
     {
         // Dies ist also eine Prozedur
@@ -152,14 +152,14 @@ static SbiSymDef* AddSym
 
         // Sonderbehandlung fuer Colls wie Documents(1)
         if( eCurExpr == SbSTDEXPR )
-            bHasType = TRUE;
+            bHasType = sal_True;
 
         pDef = pProc;
         pDef->SetType( bHasType ? eType : SbxEMPTY );
         if( pPar )
         {
             // Dummy-Parameter generieren
-            USHORT n = 1;
+            sal_uInt16 n = 1;
             for( short i = 0; i < pPar->GetSize(); i++ )
             {
                 String aPar = String::CreateFromAscii( "PAR" );
@@ -233,7 +233,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
         else
         {
             pParser->Error( SbERR_SYNTAX );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
 
@@ -260,18 +260,18 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
     // Es koennte ein Objektteil sein, wenn . oder ! folgt
     // Bei . muss aber die Variable bereits definiert sein; wenn pDef
     // nach der Suche NULL ist, isses ein Objekt!
-    BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM )
+    sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM )
                     && !pParser->WhiteSpace() );
     if( bObj )
     {
-        bBracket = FALSE;	// Now the bracket for the first term is obsolete
+        bBracket = sal_False;	// Now the bracket for the first term is obsolete
         if( eType == SbxVARIANT )
             eType = SbxOBJECT;
         else
         {
             // Name%. geht wirklich nicht!
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     // Suche:
@@ -331,7 +331,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
             {
                 // Wie? Erst mit AS definieren und dann einen Suffix nehmen?
                 pParser->Error( SbERR_BAD_DECLARATION, aSym );
-                bError = TRUE;
+                bError = sal_True;
             }
             else if ( eType == SbxVARIANT )
                 // Falls nix angegeben, den Typ des Eintrags nehmen
@@ -356,13 +356,13 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
             else
             {
                 pParser->Error( SbERR_BAD_DECLARATION, aSym );
-                bError = TRUE;
+                bError = sal_True;
             }
         }
     }
     SbiExprNode* pNd = new SbiExprNode( pParser, *pDef, eType );
     if( !pPar )
-        pPar = new SbiParameters( pParser,FALSE,FALSE );
+        pPar = new SbiParameters( pParser,sal_False,sal_False );
     pNd->aVar.pPar = pPar;
     pNd->aVar.pvMorePar = pvMoreParLcl;
     if( bObj )
@@ -376,9 +376,9 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
         {
             // defer error until runtime if in vba mode
             if ( !pParser->IsVBASupportOn() )
-                        {
+            {
                 pParser->Error( SbERR_BAD_DECLARATION, aSym );
-                bError = TRUE;
+                bError = sal_True;
             }
         }
         if( !bError )
@@ -404,14 +404,14 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
             eTok != XOR && eTok != EQV && eTok != IMP && eTok != IS )
         {
             pParser->Error( SbERR_VAR_EXPECTED );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     /* #118410 Allow type for Class methods and RTL object, e.g. RTL.Chr$(97)
     else
     {
         if( pParser->GetType() != SbxVARIANT )
-            pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+            pParser->Error( SbERR_SYNTAX ), bError = sal_True;
     }
     */
     if( bError )
@@ -442,7 +442,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         }
 
     }
-    BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
+    sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
     if( bObj )
     {
         if( eType == SbxVARIANT )
@@ -451,7 +451,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         {
             // Name%. geht wirklich nicht!
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
 
@@ -482,7 +482,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
         if( pDef->GetType() != SbxOBJECT )
         {
             pParser->Error( SbERR_BAD_DECLARATION, aSym );
-            bError = TRUE;
+            bError = sal_True;
         }
         if( !bError )
         {
@@ -559,7 +559,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
                 }
             }
             nParenLevel--;
-            pRes->bComposite = TRUE;
+            pRes->bComposite = sal_True;
             break;
         default:
             // Zur Zeit sind Keywords hier OK!
@@ -609,7 +609,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->TestToken( IS );
             String aDummy;
             SbiSymDef* pTypeDef = new SbiSymDef( aDummy );
-            pParser->TypeDecl( *pTypeDef, TRUE );
+            pParser->TypeDecl( *pTypeDef, sal_True );
             pNd = new SbiExprNode( pParser, pObjNode, pTypeDef->GetTypeId() );
             break;
         }
@@ -618,7 +618,7 @@ SbiExprNode* SbiExpression::Unary()
             pParser->Next();
             String aStr;
             SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-            pParser->TypeDecl( *pTypeDef, TRUE );
+            pParser->TypeDecl( *pTypeDef, sal_True );
             pNd = new SbiExprNode( pParser, pTypeDef->GetTypeId() );
             break;
         }
@@ -847,7 +847,7 @@ SbiExprNode* SbiExpression::VBA_Imp()
 
 SbiExprNode* SbiExpression::Like()
 {
-    SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Imp() : Comp();
+    SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp();
     if( m_eMode != EXPRMODE_EMPTY_PAREN )
     {
         short nCount = 0;
@@ -859,7 +859,7 @@ SbiExprNode* SbiExpression::Like()
         if( nCount > 1 && !pParser->IsVBASupportOn() )
         {
             pParser->Error( SbERR_SYNTAX );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     return pNd;
@@ -909,28 +909,28 @@ SbiConstExpression::SbiConstExpression( SbiParser* p ) : SbiExpression( p )
     }
     else
     {
-        // #40204 Spezialbehandlung fuer BOOL-Konstanten
-        BOOL bIsBool = FALSE;
+        // #40204 Spezialbehandlung fuer sal_Bool-Konstanten
+        sal_Bool bIsBool = sal_False;
         if( pExpr->eNodeType == SbxVARVAL )
         {
             SbiSymDef* pVarDef = pExpr->GetVar();
 
-            // Ist es eine BOOL-Konstante?
-            BOOL bBoolVal = FALSE;
+            // Ist es eine sal_Bool-Konstante?
+            sal_Bool bBoolVal = sal_False;
             if( pVarDef->GetName().EqualsIgnoreCaseAscii( "true" ) )
             //if( pVarDef->GetName().ICompare( "true" ) == COMPARE_EQUAL )
             {
-                bIsBool = TRUE;
-                bBoolVal = TRUE;
+                bIsBool = sal_True;
+                bBoolVal = sal_True;
             }
             else if( pVarDef->GetName().EqualsIgnoreCaseAscii( "false" ) )
             //else if( pVarDef->GetName().ICompare( "false" ) == COMPARE_EQUAL )
             {
-                bIsBool = TRUE;
-                bBoolVal = FALSE;
+                bIsBool = sal_True;
+                bBoolVal = sal_False;
             }
 
-            // Wenn es ein BOOL ist, Node austauschen
+            // Wenn es ein sal_Bool ist, Node austauschen
             if( bIsBool )
             {
                 delete pExpr;
@@ -982,7 +982,7 @@ SbiExprList::SbiExprList( SbiParser* p )
     nExpr  =
     nDim   = 0;
     bError =
-    bBracket = FALSE;
+    bBracket = sal_False;
 }
 
 SbiExprList::~SbiExprList()
@@ -1030,8 +1030,8 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
 
 // #i79918/#i80532: bConst has never been set to true
 // -> reused as bStandaloneExpression
-//SbiParameters::SbiParameters( SbiParser* p, BOOL bConst, BOOL bPar) :
-SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPar) :
+//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
+SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_Bool bPar) :
     SbiExprList( p )
 {
     if( !bPar )
@@ -1051,7 +1051,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         }
         else
         {
-            bBracket = TRUE;
+            bBracket = sal_True;
             pParser->Next();
             eTok = pParser->Peek();
         }
@@ -1075,7 +1075,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         {
             pExpr = new SbiExpression( pParser, 0, SbxEMPTY );
             //if( bConst )
-            //	pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+            //	pParser->Error( SbERR_SYNTAX ), bError = sal_True;
         }
         // Benannte Argumente: entweder .name= oder name:=
         else
@@ -1091,25 +1091,25 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
             if( bAssumeExprLParenMode )
             {
                 pExpr = new SbiExpression( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
-                bAssumeExprLParenMode = FALSE;
+                bAssumeExprLParenMode = sal_False;
 
                 SbiExprMode eModeAfter = pExpr->m_eMode;
                 if( eModeAfter == EXPRMODE_LPAREN_NOT_NEEDED )
                 {
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                 }
                 else if( eModeAfter == EXPRMODE_ARRAY_OR_OBJECT )
                 {
                     // Expression "looks" like an array assignment
                     // a(...)[(...)] = ? or a(...).b(...)
                     // RPAREN is already parsed
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                     bAssumeArrayMode = true;
                     eTok = NIL;
                 }
                 else if( eModeAfter == EXPRMODE_EMPTY_PAREN )
                 {
-                    bBracket = TRUE;
+                    bBracket = sal_True;
                     delete pExpr;
                     if( bByVal )
                         pParser->Error( SbERR_LVALUE_EXPECTED );
@@ -1135,7 +1135,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
                     pParser->Next();
                     pExpr = new SbiExpression( pParser );
                     //if( bConst )
-                    //	pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+                    //	pParser->Error( SbERR_SYNTAX ), bError = sal_True;
                 }
                 pExpr->GetName() = aName;
             }
@@ -1160,7 +1160,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
             pParser->Error( bBracket
                             ? SbERR_BAD_BRACKETS
                             : SbERR_EXPECTED, COMMA );
-            bError = TRUE;
+            bError = sal_True;
         }
         else
         {
@@ -1178,7 +1178,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
         if( !bBracket )
         {
             pParser->Error( SbERR_BAD_BRACKETS );
-            bError = TRUE;
+            bError = sal_True;
         }
     }
     nDim = nExpr;
@@ -1197,12 +1197,12 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
 
 SbiDimList::SbiDimList( SbiParser* p ) : SbiExprList( p )
 {
-    bConst = TRUE;
+    bConst = sal_True;
 
     if( pParser->Next() != LPAREN )
     {
         pParser->Error( SbERR_EXPECTED, LPAREN );
-        bError = TRUE; return;
+        bError = sal_True; return;
     }
 
     if( pParser->Peek() != RPAREN )
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 3c750dac00..239772aeb6 100644..100755
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -36,9 +36,9 @@
 
 // Test, ob ein I/O-Channel angegeben wurde
 
-BOOL SbiParser::Channel( BOOL bAlways )
+sal_Bool SbiParser::Channel( sal_Bool bAlways )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     Peek();
     if( IsHash() )
     {
@@ -47,7 +47,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
             Next();
         aExpr.Gen();
         aGen.Gen( _CHANNEL );
-        bRes = TRUE;
+        bRes = sal_True;
     }
     else if( bAlways )
         Error( SbERR_EXPECTED, "#" );
@@ -61,7 +61,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
 
 void SbiParser::Print()
 {
-    BOOL bChan = Channel();
+    sal_Bool bChan = Channel();
     // Die Ausdruecke zum Drucken:
     while( !bAbort )
     {
@@ -92,7 +92,7 @@ void SbiParser::Print()
 
 void SbiParser::Write()
 {
-    BOOL bChan = Channel();
+    sal_Bool bChan = Channel();
     // Die Ausdruecke zum Drucken:
     while( !bAbort )
     {
@@ -144,8 +144,8 @@ void SbiParser::Line()
 
 void SbiParser::LineInput()
 {
-    Channel( TRUE );
-    // BOOL bChan = Channel( TRUE );
+    Channel( sal_True );
+    // sal_Bool bChan = Channel( sal_True );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     /* AB 15.1.96: Keinen allgemeinen Ausdruck mehr zulassen
     SbiExpression* pExpr = new SbiExpression( this );
@@ -181,8 +181,8 @@ void SbiParser::LineInput()
 void SbiParser::Input()
 {
     aGen.Gen( _RESTART );
-    Channel( TRUE );
-    // BOOL bChan = Channel( TRUE );
+    Channel( sal_True );
+    // sal_Bool bChan = Channel( sal_True );
     SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
     /* ALT: Jetzt keinen allgemeinen Ausdruck mehr zulassen
     SbiExpression* pExpr = new SbiExpression( this );
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index d35d64967d..b5b13ce4e5 100644..100755
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -35,7 +35,7 @@
 
 void SbiParser::If()
 {
-    UINT32 nEndLbl;
+    sal_uInt32 nEndLbl;
     SbiToken eTok = NIL;
     // Ende-Tokens ignorieren:
     SbiExpression aCond( this );
@@ -47,8 +47,8 @@ void SbiParser::If()
         // eingefuegt werden, damit bei ELSEIF nicht erneut die Bedingung
         // ausgewertet wird. Die Tabelle nimmt alle Absprungstellen auf.
 #define JMP_TABLE_SIZE 100
-        UINT32 pnJmpToEndLbl[JMP_TABLE_SIZE];	// 100 ELSEIFs zulaessig
-        USHORT iJmp = 0;						// aktueller Tabellen-Index
+        sal_uInt32 pnJmpToEndLbl[JMP_TABLE_SIZE];	// 100 ELSEIFs zulaessig
+        sal_uInt16 iJmp = 0;						// aktueller Tabellen-Index
 
         // multiline IF
         nEndLbl = aGen.Gen( _JUMPF, 0 );
@@ -59,7 +59,7 @@ void SbiParser::If()
             eTok = Peek();
             if( IsEof() )
             {
-                Error( SbERR_BAD_BLOCK, IF ); bAbort = TRUE; return;
+                Error( SbERR_BAD_BLOCK, IF ); bAbort = sal_True; return;
             }
         }
         // ELSEIF?
@@ -68,7 +68,7 @@ void SbiParser::If()
             // #27720# Bei erfolgreichem IF/ELSEIF auf ENDIF springen
             if( iJmp >=	JMP_TABLE_SIZE )
             {
-                Error( SbERR_PROG_TOO_LARGE );	bAbort = TRUE; 	return;
+                Error( SbERR_PROG_TOO_LARGE );	bAbort = sal_True; 	return;
             }
             pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 );
 
@@ -88,14 +88,14 @@ void SbiParser::If()
                 eTok = Peek();
                 if( IsEof() )
                 {
-                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = TRUE; return;
+                    Error( SbERR_BAD_BLOCK, ELSEIF );  bAbort = sal_True; return;
                 }
             }
         }
         if( eTok == ELSE )
         {
             Next();
-            UINT32 nElseLbl = nEndLbl;
+            sal_uInt32 nElseLbl = nEndLbl;
             nEndLbl = aGen.Gen( _JUMP, 0 );
             aGen.BackChain( nElseLbl );
 
@@ -115,7 +115,7 @@ void SbiParser::If()
     else
     {
         // single line IF
-        bSingleLineIf = TRUE;
+        bSingleLineIf = sal_True;
         nEndLbl = aGen.Gen( _JUMPF, 0 );
         Push( eCurTok );
         while( !bAbort )
@@ -128,7 +128,7 @@ void SbiParser::If()
         if( eTok == ELSE )
         {
             Next();
-            UINT32 nElseLbl = nEndLbl;
+            sal_uInt32 nElseLbl = nEndLbl;
             nEndLbl = aGen.Gen( _JUMP, 0 );
             aGen.BackChain( nElseLbl );
             while( !bAbort )
@@ -139,7 +139,7 @@ void SbiParser::If()
                     break;
             }
         }
-        bSingleLineIf = FALSE;
+        bSingleLineIf = sal_False;
     }
     aGen.BackChain( nEndLbl );
 }
@@ -157,7 +157,7 @@ void SbiParser::NoIf()
 
 void SbiParser::DoLoop()
 {
-    UINT32 nStartLbl = aGen.GetPC();
+    sal_uInt32 nStartLbl = aGen.GetPC();
     OpenBlock( DO );
     SbiToken eTok = Next();
     if( IsEoln( eTok ) )
@@ -184,7 +184,7 @@ void SbiParser::DoLoop()
             SbiExpression aCond( this );
             aCond.Gen();
         }
-        UINT32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
+        sal_uInt32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
         StmntBlock( LOOP );
         TestEoln();
         aGen.Gen( _JUMP, nStartLbl );
@@ -198,9 +198,9 @@ void SbiParser::DoLoop()
 void SbiParser::While()
 {
     SbiExpression aCond( this );
-    UINT32 nStartLbl = aGen.GetPC();
+    sal_uInt32 nStartLbl = aGen.GetPC();
     aCond.Gen();
-    UINT32 nEndLbl = aGen.Gen( _JUMPF, 0 );
+    sal_uInt32 nEndLbl = aGen.Gen( _JUMPF, 0 );
     StmntBlock( WEND );
     aGen.Gen( _JUMP, nStartLbl );
     aGen.BackChain( nEndLbl );
@@ -249,9 +249,9 @@ void SbiParser::For()
         aGen.Gen( _INITFOR );
     }
 
-    UINT32 nLoop = aGen.GetPC();
+    sal_uInt32 nLoop = aGen.GetPC();
     // Test durchfuehren, evtl. Stack freigeben
-    UINT32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
+    sal_uInt32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
     OpenBlock( FOR );
     StmntBlock( NEXT );
     aGen.Gen( _NEXT );
@@ -306,7 +306,7 @@ void SbiParser::OnGoto()
 {
     SbiExpression aCond( this );
     aCond.Gen();
-    UINT32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
+    sal_uInt32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
     SbiToken eTok = Next();
     if( eTok != GOTO && eTok != GOSUB )
     {
@@ -314,13 +314,13 @@ void SbiParser::OnGoto()
         eTok = GOTO;
     }
     // Label-Tabelle einlesen:
-    UINT32 nLbl = 0;
+    sal_uInt32 nLbl = 0;
     do
     {
         Next();	// Label holen
         if( MayBeLabel() )
         {
-            UINT32 nOff = pProc->GetLabels().Reference( aSym );
+            sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
             aGen.Gen( _JUMP, nOff );
             nLbl++;
         }
@@ -340,7 +340,7 @@ void SbiParser::Goto()
     Next();
     if( MayBeLabel() )
     {
-        UINT32 nOff = pProc->GetLabels().Reference( aSym );
+        sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
         aGen.Gen( eOp, nOff );
     }
     else Error( SbERR_LABEL_EXPECTED );
@@ -353,7 +353,7 @@ void SbiParser::Return()
     Next();
     if( MayBeLabel() )
     {
-        UINT32 nOff = pProc->GetLabels().Reference( aSym );
+        sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
         aGen.Gen( _RETURN, nOff );
     }
     else aGen.Gen( _RETURN, 0 );
@@ -369,9 +369,9 @@ void SbiParser::Select()
     aCase.Gen();
     aGen.Gen( _CASE );
     TestEoln();
-    UINT32 nNextTarget = 0;
-    UINT32 nDoneTarget = 0;
-    BOOL bElse = FALSE;
+    sal_uInt32 nNextTarget = 0;
+    sal_uInt32 nDoneTarget = 0;
+    sal_Bool bElse = sal_False;
     // Die Cases einlesen:
     while( !bAbort )
     {
@@ -382,13 +382,13 @@ void SbiParser::Select()
                 aGen.BackChain( nNextTarget ), nNextTarget = 0;
             aGen.Statement();
             // Jeden Case einlesen
-            BOOL bDone = FALSE;
-            UINT32 nTrueTarget = 0;
+            sal_Bool bDone = sal_False;
+            sal_uInt32 nTrueTarget = 0;
             if( Peek() == ELSE )
             {
                 // CASE ELSE
                 Next();
-                bElse = TRUE;
+                bElse = sal_True;
             }
             else while( !bDone )
             {
@@ -407,7 +407,7 @@ void SbiParser::Select()
                     aCompare.Gen();
                     nTrueTarget = aGen.Gen(
                         _CASEIS, nTrueTarget,
-                        sal::static_int_cast< UINT16 >(
+                        sal::static_int_cast< sal_uInt16 >(
                             SbxEQ + ( eTok2 - EQ ) ) );
                 }
                 else
@@ -428,7 +428,7 @@ void SbiParser::Select()
 
                 }
                 if( Peek() == COMMA ) Next();
-                else TestEoln(), bDone = TRUE;
+                else TestEoln(), bDone = sal_True;
             }
             // Alle Cases abgearbeitet
             if( !bElse )
@@ -493,7 +493,7 @@ void SbiParser::On()
                     aGen.Gen( _STDERROR );
                 else
                 {
-                    UINT32 nOff = pProc->GetLabels().Reference( aSym );
+                    sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
                     aGen.Gen( _ERRHDL, nOff );
                 }
             }
@@ -525,7 +525,7 @@ void SbiParser::On()
 
 void SbiParser::Resume()
 {
-    UINT32 nLbl;
+    sal_uInt32 nLbl;
 
     switch( Next() )
     {
diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index 5fe64ceae0..5fe64ceae0 100644..100755
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1e8e7b2cee..39aacd7da0 100644..100755
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -36,18 +36,18 @@ struct SbiParseStack {				// "Stack" fuer Statement-Blocks
     SbiParseStack* pNext;  			// Chain
     SbiExprNode* pWithVar;			// Variable fuer WITH
     SbiToken eExitTok;				// Exit-Token
-    UINT32  nChain;					// JUMP-Chain
+    sal_uInt32  nChain;					// JUMP-Chain
 };
 
 struct SbiStatement {
     SbiToken eTok;
     void( SbiParser::*Func )();		// Verarbeitungsroutine
-    BOOL  bMain;					// TRUE: ausserhalb SUBs OK
-    BOOL  bSubr;					// TRUE: in SUBs OK
+    sal_Bool  bMain;					// sal_True: ausserhalb SUBs OK
+    sal_Bool  bSubr;					// sal_True: in SUBs OK
 };
 
-#define	Y	TRUE
-#define	N	FALSE
+#define	Y	sal_True
+#define	N	sal_False
 
 static SbiStatement StmntTable [] = {
 { ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
@@ -143,7 +143,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
     bGblDefs =
     bNewGblDefs =
     bSingleLineIf =
-    bExplicit = FALSE;
+    bExplicit = sal_False;
     bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
     OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
     pPool	 = &aPublics;
@@ -189,7 +189,7 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym, SbxDataType eType )
 
 // Globale Chainkette schliessen
 
-BOOL SbiParser::HasGlobalCode()
+sal_Bool SbiParser::HasGlobalCode()
 {
     if( bGblDefs && nGblChain )
     {
@@ -254,49 +254,49 @@ void SbiParser::Exit()
         Error( SbERR_BAD_EXIT );
 }
 
-BOOL SbiParser::TestSymbol( BOOL bKwdOk )
+sal_Bool SbiParser::TestSymbol( sal_Bool bKwdOk )
 {
     Peek();
     if( eCurTok == SYMBOL || ( bKwdOk && IsKwd( eCurTok ) ) )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
     Error( SbERR_SYMBOL_EXPECTED );
-    return FALSE;
+    return sal_False;
 }
 
 // Testen auf ein bestimmtes Token
 
-BOOL SbiParser::TestToken( SbiToken t )
+sal_Bool SbiParser::TestToken( SbiToken t )
 {
     if( Peek() == t )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
     else
     {
         Error( SbERR_EXPECTED, t );
-        return FALSE;
+        return sal_False;
     }
 }
 
 // Testen auf Komma oder EOLN
 
-BOOL SbiParser::TestComma()
+sal_Bool SbiParser::TestComma()
 {
     SbiToken eTok = Peek();
     if( IsEoln( eTok ) )
     {
         Next();
-        return FALSE;
+        return sal_False;
     }
     else if( eTok != COMMA )
     {
         Error( SbERR_EXPECTED, COMMA );
-        return FALSE;
+        return sal_False;
     }
     Next();
-    return TRUE;
+    return sal_True;
 }
 
 // Testen, ob EOLN vorliegt
@@ -322,16 +322,16 @@ void SbiParser::StmntBlock( SbiToken eEnd )
     if( IsEof() )
     {
         Error( SbERR_BAD_BLOCK, eEnd );
-        bAbort = TRUE;
+        bAbort = sal_True;
     }
 }
 
 // Die Hauptroutine. Durch wiederholten Aufrufs dieser Routine wird
-// die Quelle geparst. Returnwert FALSE bei Ende/Fehlern.
+// die Quelle geparst. Returnwert sal_False bei Ende/Fehlern.
 
-BOOL SbiParser::Parse()
+sal_Bool SbiParser::Parse()
 {
-    if( bAbort ) return FALSE;
+    if( bAbort ) return sal_False;
 
     EnableErrors();
 
@@ -347,16 +347,16 @@ BOOL SbiParser::Parse()
         // ein nGblChain vorhanden sein, daher vorher abfragen
         if( bNewGblDefs && nGblChain == 0 )
             nGblChain = aGen.Gen( _JUMP, 0 );
-        return FALSE;
+        return sal_False;
     }
 
     // Leerstatement?
     if( IsEoln( eCurTok ) )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
 
-    if( !bSingleLineIf && MayBeLabel( TRUE ) )
+    if( !bSingleLineIf && MayBeLabel( sal_True ) )
     {
         // Ist ein Label
         if( !pProc )
@@ -367,7 +367,7 @@ BOOL SbiParser::Parse()
         // Leerstatement?
         if( IsEoln( eCurTok ) )
         {
-            Next(); return TRUE;
+            Next(); return sal_True;
         }
     }
 
@@ -380,13 +380,13 @@ BOOL SbiParser::Parse()
         Next();
         if( eCurTok != NIL )
             aGen.Statement();
-        return FALSE;
+        return sal_False;
     }
 
     // Kommentar?
     if( eCurTok == REM )
     {
-        Next(); return TRUE;
+        Next(); return sal_True;
     }
 
         // In vba it's possible to do Error.foobar ( even if it results in
@@ -442,7 +442,7 @@ BOOL SbiParser::Parse()
                     ( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) )
                 {
                     nGblChain = aGen.Gen( _JUMP, 0 );
-                    bNewGblDefs = FALSE;
+                    bNewGblDefs = sal_False;
                 }
                 // Statement-Opcode bitte auch am Anfang einer Sub
                 if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
@@ -473,7 +473,7 @@ BOOL SbiParser::Parse()
     }
     // Der Parser bricht am Ende ab, das naechste Token ist noch nicht
     // geholt!
-    return TRUE;
+    return sal_True;
 }
 
 // Innerste With-Variable liefern
@@ -578,7 +578,7 @@ void SbiParser::Assign()
     SbiExpression aExpr( this );
     aLvalue.Gen();
     aExpr.Gen();
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     SbiSymDef* pDef = aLvalue.GetRealVar();
     {
         if( pDef->GetConstDef() )
@@ -609,7 +609,7 @@ void SbiParser::Set()
         Next();
         String aStr;
         SbiSymDef* pTypeDef = new SbiSymDef( aStr );
-        TypeDecl( *pTypeDef, TRUE );
+        TypeDecl( *pTypeDef, sal_True );
 
         aLvalue.Gen();
         // aGen.Gen( _CLASS, pDef->GetTypeId() | 0x8000 );
@@ -761,7 +761,7 @@ void SbiParser::EnableCompatibility()
 {
     if( !bCompatible )
         AddConstants();
-    bCompatible = TRUE; 
+    bCompatible = sal_True; 
 }
 
 // OPTION
@@ -771,7 +771,7 @@ void SbiParser::Option()
     switch( Next() )
     {
         case EXPLICIT:
-            bExplicit = TRUE; break;
+            bExplicit = sal_True; break;
         case BASE:
             if( Next() == NUMBER )
             {
@@ -794,9 +794,9 @@ void SbiParser::Option()
         {
             SbiToken eTok = Next();
             if( eTok == BINARY )
-                bText = FALSE;
+                bText = sal_False;
             else if( eTok == SYMBOL && GetSym().EqualsIgnoreCaseAscii("text") )
-                bText = TRUE;
+                bText = sal_True;
             else
                 Error( SbERR_EXPECTED, "Text/Binary" );
             break;
@@ -806,7 +806,7 @@ void SbiParser::Option()
             break;
 
         case CLASSMODULE:
-            bClassModule = TRUE; 
+            bClassModule = sal_True; 
             aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
             break;
         case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 6b98736f88..729ec8390c 100644..100755
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -32,17 +32,216 @@
 #include <basic/sbx.hxx>
 #include "sbcomp.hxx"
 #include "image.hxx"
+#include <basic/sbobjmod.hxx>
+
+// To activate tracing enable in sbtrace.hxx
+#ifdef DBG_TRACE_BASIC
+
+// Trace Settings, used if no ini file / not found in ini file
+static char		GpTraceFileNameDefault[] = "d:\\zBasic.Asm\\BasicTrace.txt";
+static char*	GpTraceFileName = GpTraceFileNameDefault;
+
+// GbTraceOn:
+// true = tracing is active, false = tracing is disabled, default = true
+// Set to false initially if you want to activate tracing on demand with
+// TraceCommand( "TraceOn" ), see below
+static bool	GbTraceOn = true;
+
+// GbIncludePCodes:
+// true = PCodes are written to trace, default = false, correspondents
+// with TraceCommand( "PCodeOn" / "PCodeOff" ), see below
+static bool	GbIncludePCodes = false;
+
+static int	GnIndentPerCallLevel = 4;
+static int	GnIndentForPCode = 2;
+
+/*
+    With trace enabled the runtime function TraceCommand
+    can be used to influence the trace functionality
+    from within the running Basic macro.
+
+    Format: TraceCommand( command as String [, param as Variant] )
+
+    Supported commands (command is NOT case sensitive):
+    TraceCommand "TraceOn"			sets GbTraceOn = true
+    TraceCommand "TraceOff"			sets GbTraceOn = false
+
+    TraceCommand "PCodeOn"			sets GbIncludePCodes = true
+    TraceCommand "PCodeOff"			sets GbIncludePCodes = false
+
+    TraceCommand "Print", aVal		writes aVal into the trace file as
+                                    long as it can be converted to string
+*/
+
+static void lcl_skipWhites( char*& rpc )
+{
+    while( *rpc == ' ' || *rpc == '\t' )
+        ++rpc;
+}
+
+inline void lcl_findNextLine( char*& rpc, char* pe )
+{
+    // Find line end
+    while( rpc < pe && *rpc != 13 && *rpc != 10 )
+        ++rpc;
+
+    // Read all
+    while( rpc < pe && (*rpc == 13 || *rpc == 10) )
+        ++rpc;
+}
+
+inline bool lcl_isAlpha( char c )
+{
+    bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+    return bRet;
+}
+
+static void lcl_ReadIniFile( const char* pIniFileName )
+{
+    const int BUF_SIZE = 1000;
+    static sal_Char TraceFileNameBuffer[BUF_SIZE];
+    sal_Char Buffer[BUF_SIZE];
+    sal_Char VarNameBuffer[BUF_SIZE];
+    sal_Char ValBuffer[BUF_SIZE];
+
+    FILE* pFile = fopen( pIniFileName ,"rb" );
+    if( pFile == NULL )
+        return;
+
+    size_t nRead = fread( Buffer, 1, BUF_SIZE, pFile );
+
+    // Scan
+    char* pc = Buffer;
+    char* pe = Buffer + nRead;
+    while( pc < pe )
+    {
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+
+        // Read variable
+        char* pVarStart = pc;
+        while( pc < pe && lcl_isAlpha( *pc ) )
+            ++pc;
+        int nVarLen = pc - pVarStart;
+        if( nVarLen == 0 )
+        {
+            lcl_findNextLine( pc, pe );
+            continue;
+        }
+        strncpy( VarNameBuffer, pVarStart, nVarLen );
+        VarNameBuffer[nVarLen] = '\0';
+
+        // Check =
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+        if( *pc != '=' )
+            continue;
+        ++pc;
+        lcl_skipWhites( pc ); if( pc == pe ) break;
+
+        // Read value
+        char* pValStart = pc;
+        while( pc < pe && *pc != 13 && *pc != 10 )
+            ++pc;
+        int nValLen = pc - pValStart;
+        if( nValLen == 0 )
+        {
+            lcl_findNextLine( pc, pe );
+            continue;
+        }
+        strncpy( ValBuffer, pValStart, nValLen );
+        ValBuffer[nValLen] = '\0';
+
+        // Match variables
+        if( strcmp( VarNameBuffer, "GpTraceFileName") == 0 )
+        {
+            strcpy( TraceFileNameBuffer, ValBuffer );
+            GpTraceFileName = TraceFileNameBuffer;
+        }
+        else
+        if( strcmp( VarNameBuffer, "GbTraceOn") == 0 )
+            GbTraceOn = (strcmp( ValBuffer, "true" ) == 0);
+        else
+        if( strcmp( VarNameBuffer, "GbIncludePCodes") == 0 )
+            GbIncludePCodes = (strcmp( ValBuffer, "true" ) == 0);
+        else
+        if( strcmp( VarNameBuffer, "GnIndentPerCallLevel") == 0 )
+            GnIndentPerCallLevel = strtol( ValBuffer, NULL, 10 );
+        else
+        if( strcmp( VarNameBuffer, "GnIndentForPCode") == 0 )
+            GnIndentForPCode = strtol( ValBuffer, NULL, 10 );
+    }
+    fclose( pFile );
+}
+            if( eType & SbxARRAY )
+
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
+{
+    (void)pBasic;
+    (void)bWrite;
+
+    if ( rPar.Count() < 2 )
+    {
+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
+        return;
+    }
+
+    String aCommand = rPar.Get(1)->GetString();
+
+    if( aCommand.EqualsIgnoreCaseAscii( "TraceOn" ) )
+        GbTraceOn = true;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "TraceOff" ) )
+        GbTraceOn = false;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "PCodeOn" ) )
+        GbIncludePCodes = true;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "PCodeOff" ) )
+        GbIncludePCodes = false;
+    else
+    if( aCommand.EqualsIgnoreCaseAscii( "Print" ) )
+    {
+        if ( rPar.Count() < 3 )
+        {
+            StarBASIC::Error( SbERR_BAD_ARGUMENT );
+            return;
+        }
+
+        SbxError eOld = SbxBase::GetError();
+        if( eOld != SbxERR_OK )
+            SbxBase::ResetError();
+
+        String aValStr = rPar.Get(2)->GetString();
+        SbxError eErr = SbxBase::GetError();
+        if( eErr != SbxERR_OK )
+        {
+            aValStr = String( RTL_CONSTASCII_USTRINGPARAM( "<ERROR converting value to String>" ) );
+            SbxBase::ResetError();
+        }
+
+        char Buffer[500];
+        const char* pValStr = OUStringToOString( rtl::OUString( aValStr ), RTL_TEXTENCODING_ASCII_US ).getStr();
+
+        sprintf( Buffer, "### TRACE_PRINT: %s ###", pValStr );
+        int nIndent = GnLastCallLvl * GnIndentPerCallLevel;
+        lcl_lineOut( GpTraceFileName, Buffer, lcl_getSpaces( nIndent ) );
+
+        if( eOld != SbxERR_OK )
+            SbxBase::SetError( eOld );
+    }
+}
+
+#endif
 
 // Diese Routine ist hier definiert, damit der Compiler als eigenes Segment
 // geladen werden kann.
 
-BOOL SbModule::Compile()
+sal_Bool SbModule::Compile()
 {
     if( pImage )
-        return TRUE;
+        return sal_True;
     StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
     if( !pBasic )
-        return FALSE;
+        return sal_False;
     SbxBase::ResetError();
     // Aktuelles Modul!
     SbModule* pOld = pCMOD;
@@ -61,13 +260,14 @@ BOOL SbModule::Compile()
 
     // Beim Compilieren eines Moduls werden die Modul-globalen
     // Variablen aller Module ungueltig
-    BOOL bRet = IsCompiled();
+    sal_Bool bRet = IsCompiled();
     if( bRet )
     {
-        pBasic->ClearAllModuleVars();
+        if( !this->ISA(SbObjModule) )
+            pBasic->ClearAllModuleVars();
         RemoveVars(); // remove 'this' Modules variables
         // clear all method statics
-        for( USHORT i = 0; i < pMethods->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
         {
             SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
             if( p )
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 152f2a0652..cc761a2723 100644..100755
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -67,9 +67,9 @@ SbiScanner::SbiScanner( const ::rtl::OUString& rBuf, StarBASIC* p ) : aBuf( rBuf
     bUsedForHilite =
     bCompatible = 
     bVBASupportOn = 
-    bPrevLineExtentsComment = FALSE;
+    bPrevLineExtentsComment = sal_False;
     bHash    =
-    bErrors  = TRUE;
+    bErrors  = sal_True;
 }
 
 SbiScanner::~SbiScanner()
@@ -91,19 +91,19 @@ void SbiScanner::GenError( SbError code )
 {
     if( GetSbData()->bBlockCompilerError )
     {
-        bAbort = TRUE;
+        bAbort = sal_True;
         return;
     }
     if( !bError && bErrors )
     {
-        BOOL bRes = TRUE;
+        sal_Bool bRes = sal_True;
         // Nur einen Fehler pro Statement reporten
-        bError = TRUE;
+        bError = sal_True;
         if( pBasic )
         {
             // Falls EXPECTED oder UNEXPECTED kommen sollte, bezieht es sich
             // immer auf das letzte Token, also die Col1 uebernehmen
-            USHORT nc = nColLock ? nSavedCol1 : nCol1;
+            sal_uInt16 nc = nColLock ? nSavedCol1 : nCol1;
             switch( code )
             {
                 case SbERR_EXPECTED:
@@ -123,16 +123,16 @@ void SbiScanner::GenError( SbError code )
         nErrors++;
 }
 
-// Falls sofort ein Doppelpunkt folgt, wird TRUE zurueckgeliefert.
+// Falls sofort ein Doppelpunkt folgt, wird sal_True zurueckgeliefert.
 // Wird von SbiTokenizer::MayBeLabel() verwendet, um einen Label zu erkennen
 
-BOOL SbiScanner::DoesColonFollow()
+sal_Bool SbiScanner::DoesColonFollow()
 {
     if( pLine && *pLine == ':' )
     {
-        pLine++; nCol++; return TRUE;
+        pLine++; nCol++; return sal_True;
     }
-    else return FALSE;
+    else return sal_False;
 }
 
 // Testen auf ein legales Suffix
@@ -144,41 +144,55 @@ static SbxDataType GetSuffixType( sal_Unicode c )
     {
         sal_uInt32 n = aSuffixesStr.Search( c );
         if( STRING_NOTFOUND != n && c != ' ' )
-            return SbxDataType( (USHORT) n + SbxINTEGER );
+            return SbxDataType( (sal_uInt16) n + SbxINTEGER );
     }
     return SbxVARIANT;
 }
 
 // Einlesen des naechsten Symbols in die Variablen aSym, nVal und eType
-// Returnwert ist FALSE bei EOF oder Fehlern
+// Returnwert ist sal_False bei EOF oder Fehlern
 #define BUF_SIZE 80
 
-BOOL SbiScanner::NextSym()
+namespace {
+
+/** Returns true, if the passed character is a white space character. */
+inline bool lclIsWhitespace( sal_Unicode cChar )
+{
+    return (cChar == ' ') || (cChar == '\t') || (cChar == '\f');
+}
+
+} // namespace
+
+sal_Bool SbiScanner::NextSym()
 {
     // Fuer den EOLN-Fall merken
-    USHORT nOldLine = nLine;
-    USHORT nOldCol1 = nCol1;
-    USHORT nOldCol2 = nCol2;
+    sal_uInt16 nOldLine = nLine;
+    sal_uInt16 nOldCol1 = nCol1;
+    sal_uInt16 nOldCol2 = nCol2;
     sal_Unicode buf[ BUF_SIZE ], *p = buf;
-    bHash = FALSE;
+    bHash = sal_False;
 
     eScanType = SbxVARIANT;
     aSym.Erase();
     bSymbol =
-    bNumber = bSpaces = FALSE;
+    bNumber = bSpaces = sal_False;
 
     // Zeile einlesen?
     if( !pLine )
     {
-        INT32 n = nBufPos;
-        INT32 nLen = aBuf.getLength();
+        sal_Int32 n = nBufPos;
+        sal_Int32 nLen = aBuf.getLength();
         if( nBufPos >= nLen )
-            return FALSE;
+            return sal_False;
         const sal_Unicode* p2 = aBuf.getStr();
         p2 += n;
         while( ( n < nLen ) && ( *p2 != '\n' ) && ( *p2 != '\r' ) )
             p2++, n++;
-        aLine = aBuf.copy( nBufPos, n - nBufPos );
+        // #163944# ignore trailing whitespace
+        sal_Int32 nCopyEndPos = n;
+        while( (nBufPos < nCopyEndPos) && lclIsWhitespace( aBuf[ nCopyEndPos - 1 ] ) )
+            --nCopyEndPos;
+        aLine = aBuf.copy( nBufPos, nCopyEndPos - nBufPos );
         if( n < nLen )
         {
             if( *p2 == '\r' && *( p2+1 ) == '\n' )
@@ -194,8 +208,8 @@ BOOL SbiScanner::NextSym()
     }
 
     // Leerstellen weg:
-    while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )
-        pLine++, nCol++, bSpaces = TRUE;
+    while( lclIsWhitespace( *pLine ) )
+        pLine++, nCol++, bSpaces = sal_True;
 
     nCol1 = nCol;
 
@@ -210,7 +224,7 @@ BOOL SbiScanner::NextSym()
     {
         pLine++;
         nCol++;
-        bHash = TRUE;
+        bHash = sal_True;
     }
 
     // Symbol? Dann Zeichen kopieren.
@@ -220,11 +234,35 @@ BOOL SbiScanner::NextSym()
         if(	*pLine == '_' && !*(pLine+1) )
         {	pLine++;
             goto eoln;	}
-        bSymbol = TRUE;
+        bSymbol = sal_True;
         short n = nCol;
         for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) || ( *pLine == '_' ) ); pLine++ )
             nCol++;
         aSym = aLine.copy( n, nCol - n );
+
+        // Special handling for "go to"
+        if( bCompatible && *pLine && aSym.EqualsIgnoreCaseAscii( "go" ) )
+        {
+            const sal_Unicode* pTestLine = pLine;
+            short nTestCol = nCol;
+            while( lclIsWhitespace( *pTestLine ) )
+            {
+                pTestLine++;
+                nTestCol++;
+            }
+
+            if( *pTestLine && *(pTestLine + 1) )
+            {
+                String aTestSym = aLine.copy( nTestCol, 2 );
+                if( aTestSym.EqualsIgnoreCaseAscii( "to" ) )
+                {
+                    aSym = String::CreateFromAscii( "goto" );
+                    pLine = pTestLine + 2;
+                    nCol = nTestCol + 2;
+                }
+            }
+        }
+
         // Abschliessendes '_' durch Space ersetzen, wenn Zeilenende folgt
         // (sonst falsche Zeilenfortsetzung)
         if(	!bUsedForHilite && !*pLine && *(pLine-1) == '_' )
@@ -256,13 +294,13 @@ BOOL SbiScanner::NextSym()
         short ndig = 0;
         short ncdig = 0;
         eScanType = SbxDOUBLE;
-        BOOL bBufOverflow = FALSE;
+        sal_Bool bBufOverflow = sal_False;
         while( strchr( "0123456789.DEde", *pLine ) && *pLine )
         {
             // AB 4.1.1996: Buffer voll? -> leer weiter scannen
             if( (p-buf) == (BUF_SIZE-1) )
             {
-                bBufOverflow = TRUE;
+                bBufOverflow = sal_True;
                 pLine++, nCol++;
                 continue;
             }
@@ -299,7 +337,7 @@ BOOL SbiScanner::NextSym()
             if (!exp) ndig++;
         }
         *p = 0;
-        aSym = p; bNumber = TRUE;
+        aSym = p; bNumber = sal_True;
         // Komma, Exponent mehrfach vorhanden?
         if( comma > 1 || exp > 1 )
         {	aError = '.';
@@ -359,10 +397,10 @@ BOOL SbiScanner::NextSym()
                 // Wird als Operator angesehen
                 pLine--; nCol--; nCol1 = nCol-1; aSym = '&'; return SYMBOL;
         }
-        bNumber = TRUE;
+        bNumber = sal_True;
         long l = 0;
         int i;
-        BOOL bBufOverflow = FALSE;
+        sal_Bool bBufOverflow = sal_False;
         while( BasicSimpleCharClass::isAlphaNumeric( *pLine & 0xFF, bCompatible ) )
         {
             sal_Unicode ch = sal::static_int_cast< sal_Unicode >(
@@ -370,7 +408,7 @@ BOOL SbiScanner::NextSym()
             pLine++; nCol++;
             // AB 4.1.1996: Buffer voll, leer weiter scannen
             if( (p-buf) == (BUF_SIZE-1) )
-                bBufOverflow = TRUE;
+                bBufOverflow = sal_True;
             else if( String( cmp ).Search( ch ) != STRING_NOTFOUND )
             //else if( strchr( cmp, ch ) )
                 *p++ = ch;
@@ -403,7 +441,7 @@ BOOL SbiScanner::NextSym()
     {
         sal_Unicode cSep = *pLine;
         if( cSep == '[' )
-            bSymbol = TRUE, cSep = ']';
+            bSymbol = sal_True, cSep = ']';
         short n = nCol+1;
         while( *pLine )
         {
@@ -423,7 +461,7 @@ BOOL SbiScanner::NextSym()
         // Doppelte Stringbegrenzer raus
         String s( cSep );
         s += cSep;
-        USHORT nIdx = 0;
+        sal_uInt16 nIdx = 0;
         do 
         {
             nIdx = aSym.Search( s, nIdx );
@@ -462,15 +500,15 @@ PrevLineCommentLbl:
     if( bPrevLineExtentsComment || (eScanType != SbxSTRING &&
         ( aSym.GetBuffer()[0] == '\'' || aSym.EqualsIgnoreCaseAscii( "REM" ) ) ) )
     {
-        bPrevLineExtentsComment = FALSE;
+        bPrevLineExtentsComment = sal_False;
         aSym = String::CreateFromAscii( "REM" );
-        USHORT nLen = String( pLine ).Len();
+        sal_uInt16 nLen = String( pLine ).Len();
         if( bCompatible && pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' ' )
-            bPrevLineExtentsComment = TRUE;
+            bPrevLineExtentsComment = sal_True;
         nCol2 = nCol2 + nLen;
         pLine = NULL;
     }
-    return TRUE;
+    return sal_True;
 
     // Sonst Zeilen-Ende: aber bitte auf '_' testen, ob die
     // Zeile nicht weitergeht!
@@ -485,7 +523,7 @@ eoln:
             //    .Method
             // ^^^  <- spaces is legal in MSO VBA
             OSL_TRACE("*** resetting bSpaces***"); 
-            bSpaces = FALSE; 
+            bSpaces = sal_False; 
         }
         return bRes;
     }
@@ -497,7 +535,7 @@ eoln:
         nCol2 = nOldCol2;
         aSym = '\n';
         nColLock = 0;
-        return TRUE;
+        return sal_True;
     }
 }
 
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index c49ec9f0d9..7799c39505 100644..100755
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -59,7 +59,7 @@ SbiStringPool::~SbiStringPool()
 
 // Suchen
 
-const String& SbiStringPool::Find( USHORT n ) const
+const String& SbiStringPool::Find( sal_uInt16 n ) const
 {
     if( !n || n > aData.Count() )
         return aEmpty;
@@ -70,10 +70,10 @@ const String& SbiStringPool::Find( USHORT n ) const
 // Hinzufuegen eines Strings. Der String wird Case-Insensitiv
 // verglichen.
 
-short SbiStringPool::Add( const String& rVal, BOOL bNoCase )
+short SbiStringPool::Add( const String& rVal, sal_Bool bNoCase )
 {
-    USHORT n = aData.Count();
-    for( USHORT i = 0; i < n; i++ )
+    sal_uInt16 n = aData.Count();
+    for( sal_uInt16 i = 0; i < n; i++ )
     {
         String* p = aData.GetObject( i );
         if( (  bNoCase && p->Equals( rVal ) )
@@ -126,7 +126,7 @@ void SbiSymPool::Clear()
 
 SbiSymDef* SbiSymPool::First()
 {
-    nCur = (USHORT) -1;
+    nCur = (sal_uInt16) -1;
     return Next();
 }
 
@@ -207,9 +207,10 @@ void SbiSymPool::Add( SbiSymDef* pDef )
 
 SbiSymDef* SbiSymPool::Find( const String& rName ) const
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    sal_uInt16 nCount = aData.Count();
+    for( sal_uInt16 i = 0; i < nCount; i++ )
     {
-        SbiSymDef* p = aData.GetObject( i );
+        SbiSymDef* p = aData.GetObject( nCount - i - 1 );
         if( ( !p->nProcId || ( p->nProcId == nProcId ) )
          && ( p->aName.EqualsIgnoreCaseAscii( rName ) ) )
             return p;
@@ -222,9 +223,9 @@ SbiSymDef* SbiSymPool::Find( const String& rName ) const
 
 // Suchen ueber ID-Nummer
 
-SbiSymDef* SbiSymPool::FindId( USHORT n ) const
+SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aData.Count(); i++ )
     {
         SbiSymDef* p = aData.GetObject( i );
         if( p->nId == n && ( !p->nProcId || ( p->nProcId == nProcId ) ) )
@@ -238,7 +239,7 @@ SbiSymDef* SbiSymPool::FindId( USHORT n ) const
 
 // Suchen ueber Position (ab 0)
 
-SbiSymDef* SbiSymPool::Get( USHORT n ) const
+SbiSymDef* SbiSymPool::Get( sal_uInt16 n ) const
 {
     if( n >= aData.Count() )
         return NULL;
@@ -246,7 +247,7 @@ SbiSymDef* SbiSymPool::Get( USHORT n ) const
         return aData.GetObject( n );
 }
 
-UINT32 SbiSymPool::Define( const String& rName )
+sal_uInt32 SbiSymPool::Define( const String& rName )
 {
     SbiSymDef* p = Find( rName );
     if( p )
@@ -258,7 +259,7 @@ UINT32 SbiSymPool::Define( const String& rName )
     return p->Define();
 }
 
-UINT32 SbiSymPool::Reference( const String& rName )
+sal_uInt32 SbiSymPool::Reference( const String& rName )
 {
     SbiSymDef* p = Find( rName );
     if( !p )
@@ -272,7 +273,7 @@ UINT32 SbiSymPool::Reference( const String& rName )
 
 void SbiSymPool::CheckRefs()
 {
-    for( USHORT i = 0; i < aData.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aData.Count(); i++ )
     {
         SbiSymDef* p = aData.GetObject( i );
         if( !p->IsDefined() )
@@ -304,7 +305,7 @@ SbiSymDef::SbiSymDef( const String& rName ) : aName( rName )
     bWithEvents =
     bByVal	 =
     bChained =
-    bGlobal  = FALSE;
+    bGlobal  = sal_False;
     pIn		 =
     pPool	 = NULL;
     nDefaultId = 0;
@@ -360,11 +361,11 @@ void SbiSymDef::SetType( SbxDataType t )
 // Es wird der Wert zurueckgeliefert, der als Operand gespeichert
 // werden soll.
 
-UINT32 SbiSymDef::Reference()
+sal_uInt32 SbiSymDef::Reference()
 {
     if( !bChained )
     {
-        UINT32 n = nChain;
+        sal_uInt32 n = nChain;
         nChain = pIn->pParser->aGen.GetOffset();
         return n;
     }
@@ -374,13 +375,13 @@ UINT32 SbiSymDef::Reference()
 // Definition eines Symbols.
 // Hier wird der Backchain aufgeloest, falls vorhanden
 
-UINT32 SbiSymDef::Define()
+sal_uInt32 SbiSymDef::Define()
 {
-    UINT32 n = pIn->pParser->aGen.GetPC();
+    sal_uInt32 n = pIn->pParser->aGen.GetPC();
     pIn->pParser->aGen.GenStmnt();
     if( nChain ) pIn->pParser->aGen.BackChain( nChain );
     nChain = n;
-    bChained = TRUE;
+    bChained = sal_True;
     return nChain;
 }
 
@@ -409,7 +410,7 @@ SbiSymScope SbiSymDef::GetScope() const
 // 3) aLabels: Labels
 
 SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
-                        BOOL bProcDecl )
+                        sal_Bool bProcDecl )
          : SbiSymDef( rName )
          , aParams( pParser->aGblStrings, SbPARAM )  // wird gedumpt
          , aLabels( pParser->aLclStrings, SbLOCAL )	 // wird nicht gedumpt
@@ -421,9 +422,9 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
     nLine1	=
     nLine2	= 0;
     mePropMode = PROPERTY_MODE_NONE;
-    bPublic = TRUE;
-    bCdecl	= FALSE;
-    bStatic = FALSE;
+    bPublic = sal_True;
+    bCdecl	= sal_False;
+    bStatic = sal_False;
     // Fuer Returnwerte ist das erste Element der Parameterliste
     // immer mit dem Namen und dem Typ der Proc definiert
     aParams.AddSym( aName );
@@ -451,7 +452,7 @@ void SbiProcDef::Match( SbiProcDef* pOld )
 {
     SbiSymDef* po, *pn=NULL;
     // Parameter 0 ist der Funktionsname
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i < aParams.GetSize(); i++ )
     {
         po = pOld->aParams.Get( i );
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index b0bb367210..597b7e2a3b 100644..100755
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -388,10 +388,10 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb )
     //if( StarBASIC::GetGlobalLanguageMode() == SB_LANG_JAVASCRIPT )
     //	pTokTable = aTokTable_Java;
     TokenTable *tp;
-    bEof = bAs = FALSE;
+    bEof = bAs = sal_False;
     eCurTok = NIL;
     ePush = NIL;
-    bEos = bKeywords = bErrorIsSymbol = TRUE;
+    bEos = bKeywords = bErrorIsSymbol = sal_True;
     if( !nToken )
         for( nToken = 0, tp = pTokTable; tp->t; nToken++, tp++ ) {}
 }
@@ -433,9 +433,9 @@ SbiToken SbiTokenizer::Peek()
 {
     if( ePush == NIL )
     {
-        USHORT nOldLine = nLine;
-        USHORT nOldCol1 = nCol1;
-        USHORT nOldCol2 = nCol2;
+        sal_uInt16 nOldLine = nLine;
+        sal_uInt16 nOldCol1 = nCol1;
+        sal_uInt16 nOldCol2 = nCol2;
         ePush = Next();
         nPLine = nLine; nLine = nOldLine;
         nPCol1 = nCol1; nCol1 = nOldCol1;
@@ -500,15 +500,15 @@ SbiToken SbiTokenizer::Next()
     // Sonst einlesen:
     if( !NextSym() )
     {
-        bEof = bEos = TRUE;
+        bEof = bEos = sal_True;
         return eCurTok = EOLN;
     }
     // Zeilenende?
     if( aSym.GetBuffer()[0] == '\n' )
     {
-        bEos = TRUE; return eCurTok = EOLN;
+        bEos = sal_True; return eCurTok = EOLN;
     }
-    bEos = FALSE;
+    bEos = sal_False;
 
     // Zahl?
     if( bNumber )
@@ -575,10 +575,10 @@ special:
     {
         // AB, 15.3.96, Spezialbehandlung fuer END, beim Peek() geht die
         // aktuelle Zeile verloren, daher alles merken und danach restaurieren
-        USHORT nOldLine = nLine;
-        USHORT nOldCol  = nCol;
-        USHORT nOldCol1 = nCol1;
-        USHORT nOldCol2 = nCol2;
+        sal_uInt16 nOldLine = nLine;
+        sal_uInt16 nOldCol  = nCol;
+        sal_uInt16 nOldCol1 = nCol1;
+        sal_uInt16 nOldCol2 = nCol2;
         String aOldSym = aSym;
         SaveLine();				// pLine im Scanner sichern
 
@@ -614,11 +614,11 @@ special:
     eCurTok = tp->t;
     // AS: Datentypen sind Keywords
     if( tp->t == AS )
-        bAs = TRUE;
+        bAs = sal_True;
     else
     {
         if( bAs )
-            bAs = FALSE;
+            bAs = sal_False;
         else if( eCurTok >= DATATYPE1 && eCurTok <= DATATYPE2 && (bErrorIsSymbol || eCurTok != _ERROR_) )
             eCurTok = SYMBOL;
     }
@@ -655,12 +655,12 @@ special:
 
 // Kann das aktuell eingelesene Token ein Label sein?
 
-BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
+sal_Bool SbiTokenizer::MayBeLabel( sal_Bool bNeedsColon )
 {
     if( eCurTok == SYMBOL || m_aTokenLabelInfo.canTokenBeLabel( eCurTok ) )
-        return bNeedsColon ? DoesColonFollow() : TRUE;
+        return bNeedsColon ? DoesColonFollow() : sal_True;
     else
-        return BOOL( eCurTok == NUMBER
+        return sal_Bool( eCurTok == NUMBER
                   && eScanType == SbxINTEGER
                   && nVal >= 0 );
 }
@@ -672,8 +672,8 @@ BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
 
 void SbiTokenizer::Hilite( SbTextPortions& rList )
 {
-    bErrors = FALSE;
-    bUsedForHilite = TRUE;
+    bErrors = sal_False;
+    bUsedForHilite = sal_True;
     SbiToken eLastTok = NIL;
     for( ;; )
     {
@@ -711,7 +711,7 @@ void SbiTokenizer::Hilite( SbTextPortions& rList )
             break;
         eLastTok = eCurTok;
     }
-    bUsedForHilite = FALSE;
+    bUsedForHilite = sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index e66fa80f21..93b133a5e8 100644..100755
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -38,27 +38,27 @@ class SbiBuffer { 					// Code/Konstanten-Puffer:
     SbiParser* pParser;				// fuer Fehlermeldungen
     char*	pBuf;					// Puffer-Pointer
     char*	pCur;					// aktueller Puffer-Pointer
-    UINT32	nOff;					// aktuelles Offset
-    UINT32	nSize;					// aktuelle Groesse
+    sal_uInt32	nOff;					// aktuelles Offset
+    sal_uInt32	nSize;					// aktuelle Groesse
     short	nInc;					// Inkrement
-    BOOL    Check( USHORT );		// Buffergroesse testen
+    sal_Bool    Check( sal_uInt16 );		// Buffergroesse testen
 public:
     SbiBuffer( SbiParser*, short );	// Inkrement
    ~SbiBuffer();
-    void Patch( UINT32, UINT32 );	// Patchen
-    void Chain( UINT32 );			// Back-Chain
-    void Align( INT32 );			// Alignment
-    BOOL Add( const void*, USHORT );// Element anfuegen
-    BOOL operator += (const String&);// Basic-String speichern
-    BOOL operator += (INT8);		// Zeichen speichern
-    BOOL operator += (INT16);		// Integer speichern
-    BOOL operator += (UINT8);		// Zeichen speichern
-    BOOL operator += (UINT16);		// Integer speichern
-    BOOL operator += (UINT32);		// Integer speichern
-    BOOL operator += (INT32);		// Integer speichern
+    void Patch( sal_uInt32, sal_uInt32 );	// Patchen
+    void Chain( sal_uInt32 );			// Back-Chain
+    void Align( sal_Int32 );			// Alignment
+    sal_Bool Add( const void*, sal_uInt16 );// Element anfuegen
+    sal_Bool operator += (const String&);// Basic-String speichern
+    sal_Bool operator += (sal_Int8);		// Zeichen speichern
+    sal_Bool operator += (sal_Int16);		// Integer speichern
+    sal_Bool operator += (sal_uInt8);		// Zeichen speichern
+    sal_Bool operator += (sal_uInt16);		// Integer speichern
+    sal_Bool operator += (sal_uInt32);		// Integer speichern
+    sal_Bool operator += (sal_Int32);		// Integer speichern
     char*  GetBuffer();				// Puffer rausgeben (selbst loeschen!)
     char*  GetBufferPtr(){ return pBuf; }
-    UINT32 GetSize()				{ return nOff; }
+    sal_uInt32 GetSize()				{ return nOff; }
 };
 
 #endif
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 3b1dd88eb7..16e5ee30a8 100644..100755
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -41,28 +41,28 @@ class SbiCodeGen { 				// Code-Erzeugung:
     SbiBuffer aCode;	  			// Code-Puffer
     short  nLine, nCol;			// Zeile, Spalte fuer Stmnt-Befehl
     short  nForLevel;			// #29955 for-Schleifen-Ebene
-    BOOL bStmnt;				// TRUE: Statement-Opcode liegt an
+    sal_Bool bStmnt;				// sal_True: Statement-Opcode liegt an
 public:
     SbiCodeGen( SbModule&, SbiParser*, short );
     SbiParser* GetParser() { return pParser; }
     SbModule& GetModule() { return rMod; }
-    UINT32 Gen( SbiOpcode );
-    UINT32 Gen( SbiOpcode, UINT32 );
-    UINT32 Gen( SbiOpcode, UINT32, UINT32 );
-    void Patch( UINT32 o, UINT32 v ){ aCode.Patch( o, v ); }
-    void BackChain( UINT32 off )	{ aCode.Chain( off );  }
+    sal_uInt32 Gen( SbiOpcode );
+    sal_uInt32 Gen( SbiOpcode, sal_uInt32 );
+    sal_uInt32 Gen( SbiOpcode, sal_uInt32, sal_uInt32 );
+    void Patch( sal_uInt32 o, sal_uInt32 v ){ aCode.Patch( o, v ); }
+    void BackChain( sal_uInt32 off )	{ aCode.Chain( off );  }
     void Statement();
     void GenStmnt();			// evtl. Statement-Opcode erzeugen
-    UINT32 GetPC();
-    UINT32 GetOffset()				{ return GetPC() + 1; }
+    sal_uInt32 GetPC();
+    sal_uInt32 GetOffset()				{ return GetPC() + 1; }
     void Save();
 
     // #29955 for-Schleifen-Ebene pflegen
     void IncForLevel( void ) { nForLevel++; }
     void DecForLevel( void ) { nForLevel--; }
 
-    static UINT32 calcNewOffSet( BYTE* pCode, UINT16 nOffset );
-    static UINT16 calcLegacyOffSet( BYTE* pCode, UINT32 nOffset );
+    static sal_uInt32 calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset );
+    static sal_uInt16 calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset );
 
 };
 
@@ -70,8 +70,8 @@ template < class T, class S >
 class PCodeBuffConvertor 
 {
     T m_nSize; // 
-    BYTE* m_pStart;
-    BYTE* m_pCnvtdBuf;
+    sal_uInt8* m_pStart;
+    sal_uInt8* m_pCnvtdBuf;
     S m_nCnvtdSize; // 
 
     //  Disable usual copying symantics and bodgy default ctor
@@ -79,11 +79,11 @@ class PCodeBuffConvertor
     PCodeBuffConvertor(const PCodeBuffConvertor& );
     PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& );
 public:
-    PCodeBuffConvertor( BYTE* pCode, T nSize ): m_nSize( nSize ),  m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
+    PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ),  m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
     S GetSize(){ return m_nCnvtdSize; }
     void convert();
     // Caller owns the buffer returned
-    BYTE* GetBuffer() { return m_pCnvtdBuf; }
+    sal_uInt8* GetBuffer() { return m_pCnvtdBuf; }
 };
 
 // #111897 PARAM_INFO flags start at 0x00010000 to not
diff --git a/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx
index b7904df3bf..b7904df3bf 100644..100755
--- a/basic/source/inc/collelem.hxx
+++ b/basic/source/inc/collelem.hxx
diff --git a/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx
index f7e463bdd2..7d7a54f55f 100644..100755
--- a/basic/source/inc/disas.hxx
+++ b/basic/source/inc/disas.hxx
@@ -38,14 +38,14 @@ class SbiDisas {
     const SbiImage& rImg;
     SbModule* pMod;
     char	 cLabels[ MAX_LABELS ];		// Bitvektor fuer Labels
-    UINT32	 nOff;					// aktuelle Position
-    UINT32   nPC;					// Position des Opcodes
+    sal_uInt32	 nOff;					// aktuelle Position
+    sal_uInt32   nPC;					// Position des Opcodes
     SbiOpcode eOp;					// Opcode
-    UINT32   nOp1, nOp2;			// Operanden
-    UINT32	 nParts;				// 1, 2 oder 3
-    UINT32	 nLine;					// aktuelle Zeile
-    BOOL 	 DisasLine( String& );
-    BOOL	 Fetch();				// naechster Opcode
+    sal_uInt32   nOp1, nOp2;			// Operanden
+    sal_uInt32	 nParts;				// 1, 2 oder 3
+    sal_uInt32	 nLine;					// aktuelle Zeile
+    sal_Bool 	 DisasLine( String& );
+    sal_Bool	 Fetch();				// naechster Opcode
 public:
     SbiDisas( SbModule*, const SbiImage* );
     void Disas( SvStream& );
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index e779a3200f..e779a3200f 100644..100755
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 1e94a3927e..1e94a3927e 100644..100755
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 7aeab031f0..74b82f5963 100644..100755
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -99,7 +99,7 @@ class SbiExprNode {                  // Operatoren (und Operanden)
     friend class SbiExpression;
     friend class SbiConstExpression;
     union {
-        USHORT nTypeStrId; 	     	// gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
+        sal_uInt16 nTypeStrId; 	     	// gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
         double nVal;                // numerischer Wert
         SbVar  aVar;                // oder Variable
     };
@@ -111,19 +111,19 @@ class SbiExprNode {                  // Operatoren (und Operanden)
     SbiNodeType  eNodeType;         // Art des Nodes
     SbxDataType eType;              // aktueller Datentyp
     SbiToken     eTok;              // Token des Operators
-    BOOL  bComposite;				// TRUE: Zusammengesetzter Ausdruck
-    BOOL  bError; 	                // TRUE: Fehlerhaft
+    sal_Bool  bComposite;				// sal_True: Zusammengesetzter Ausdruck
+    sal_Bool  bError; 	                // sal_True: Fehlerhaft
     void  FoldConstants();          // Constant Folding durchfuehren
     void  CollectBits();            // Umwandeln von Zahlen in Strings
-    BOOL  IsOperand()               // TRUE, wenn Operand
-        { return BOOL( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
-    BOOL  IsTypeOf()
-        { return BOOL( eNodeType == SbxTYPEOF ); }
-    BOOL  IsNew()
-        { return BOOL( eNodeType == SbxNEW ); }
-    BOOL  IsNumber();               // TRUE bei Zahlen
-    BOOL  IsString();               // TRUE bei Strings
-    BOOL  IsLvalue();               // TRUE, falls als Lvalue verwendbar
+    sal_Bool  IsOperand()               // sal_True, wenn Operand
+        { return sal_Bool( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
+    sal_Bool  IsTypeOf()
+        { return sal_Bool( eNodeType == SbxTYPEOF ); }
+    sal_Bool  IsNew()
+        { return sal_Bool( eNodeType == SbxNEW ); }
+    sal_Bool  IsNumber();               // sal_True bei Zahlen
+    sal_Bool  IsString();               // sal_True bei Strings
+    sal_Bool  IsLvalue();               // sal_True, falls als Lvalue verwendbar
     void  GenElement( SbiOpcode );  // Element
     void  BaseInit( SbiParser* p );	// Hilfsfunktion fuer Ctor, AB 17.12.95
 public:
@@ -132,15 +132,15 @@ public:
     SbiExprNode( SbiParser*, const String& );
     SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL );
     SbiExprNode( SbiParser*, SbiExprNode*, SbiToken, SbiExprNode* );
-    SbiExprNode( SbiParser*, SbiExprNode*, USHORT );	// #120061 TypeOf
-    SbiExprNode( SbiParser*, USHORT );					// new <type>
+    SbiExprNode( SbiParser*, SbiExprNode*, sal_uInt16 );	// #120061 TypeOf
+    SbiExprNode( SbiParser*, sal_uInt16 );					// new <type>
     virtual ~SbiExprNode();
 
-    BOOL IsValid()                  { return BOOL( !bError ); }
-    BOOL IsConstant()               // TRUE bei konstantem Operanden
-        { return BOOL( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
-    BOOL IsIntConst();              // TRUE bei Integer-Konstanten
-    BOOL IsVariable();              // TRUE, wenn Variable
+    sal_Bool IsValid()                  { return sal_Bool( !bError ); }
+    sal_Bool IsConstant()               // sal_True bei konstantem Operanden
+        { return sal_Bool( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
+    sal_Bool IsIntConst();              // sal_True bei Integer-Konstanten
+    sal_Bool IsVariable();              // sal_True, wenn Variable
 
     SbiExprNode* GetWithParent()			{ return pWithParent; }
     void SetWithParent( SbiExprNode* p )	{ pWithParent = p; }
@@ -173,11 +173,11 @@ protected:
     SbiExprNode*   pExpr;            // Der Expression-Baum
     SbiExprType	  eCurExpr;			// Art des Ausdrucks
     SbiExprMode   m_eMode;			// Expression context
-    BOOL  		  bBased;			// TRUE: einfacher DIM-Teil (+BASE)
-    BOOL          bError;           // TRUE: Fehler
-    BOOL          bByVal;           // TRUE: ByVal-Parameter
-    BOOL          bBracket;         // TRUE: Parameter list with brackets
-    USHORT        nParenLevel;
+    sal_Bool  		  bBased;			// sal_True: einfacher DIM-Teil (+BASE)
+    sal_Bool          bError;           // sal_True: Fehler
+    sal_Bool          bByVal;           // sal_True: ByVal-Parameter
+    sal_Bool          bBracket;         // sal_True: Parameter list with brackets
+    sal_uInt16        nParenLevel;
     SbiExprNode* Term( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL );
     SbiExprNode* ObjTerm( SbiSymDef& );
     SbiExprNode* Operand( bool bUsedForTypeOf = false );
@@ -206,16 +206,16 @@ public:
     SbiExpression( SbiParser*, SbiToken );        // Spezial-Expr mit Spezial-Tokens
    ~SbiExpression();
     String& GetName()               { return aArgName;            }
-    void SetBased()					{ bBased = TRUE; 			  }
-    BOOL IsBased()					{ return bBased; 			  }
-    void SetByVal()                 { bByVal = TRUE;              }
-    BOOL IsByVal()                  { return bByVal;              }
-    BOOL IsBracket()                { return bBracket;            }
-    BOOL IsValid()                  { return pExpr->IsValid();    }
-    BOOL IsConstant()               { return pExpr->IsConstant(); }
-    BOOL IsVariable()               { return pExpr->IsVariable(); }
-    BOOL IsLvalue()                 { return pExpr->IsLvalue();   }
-    BOOL IsIntConstant()            { return pExpr->IsIntConst(); }
+    void SetBased()					{ bBased = sal_True; 			  }
+    sal_Bool IsBased()					{ return bBased; 			  }
+    void SetByVal()                 { bByVal = sal_True;              }
+    sal_Bool IsByVal()                  { return bByVal;              }
+    sal_Bool IsBracket()                { return bBracket;            }
+    sal_Bool IsValid()                  { return pExpr->IsValid();    }
+    sal_Bool IsConstant()               { return pExpr->IsConstant(); }
+    sal_Bool IsVariable()               { return pExpr->IsVariable(); }
+    sal_Bool IsLvalue()                 { return pExpr->IsLvalue();   }
+    sal_Bool IsIntConstant()            { return pExpr->IsIntConst(); }
     const String& GetString()       { return pExpr->GetString();  }
     SbiSymDef* GetVar()             { return pExpr->GetVar();     }
     SbiSymDef* GetRealVar()         { return pExpr->GetRealVar(); }
@@ -243,31 +243,31 @@ protected:
     SbiExpression* pFirst;          // Expressions
     short nExpr;                    // Anzahl Expressions
     short nDim;						// Anzahl Dimensionen
-    BOOL  bError;                   // TRUE: Fehler
-    BOOL  bBracket;                 // TRUE: Klammern
+    sal_Bool  bError;                   // sal_True: Fehler
+    sal_Bool  bBracket;                 // sal_True: Klammern
 public:
     SbiExprList( SbiParser* );
     virtual ~SbiExprList();
-    BOOL  IsBracket()               { return bBracket;        }
-    BOOL  IsValid()                 { return BOOL( !bError ); }
+    sal_Bool  IsBracket()               { return bBracket;        }
+    sal_Bool  IsValid()                 { return sal_Bool( !bError ); }
     short GetSize()                 { return nExpr;           }
     short GetDims()                 { return nDim;     		  }
     SbiExpression* Get( short );
-    BOOL  Test( const SbiProcDef& );	// Parameter-Checks
+    sal_Bool  Test( const SbiProcDef& );	// Parameter-Checks
     void  Gen();                    // Code-Erzeugung
     void addExpression( SbiExpression* pExpr );
 };
 
 class SbiParameters : public SbiExprList {
 public:
-    SbiParameters( SbiParser*, BOOL bConst = FALSE, BOOL bPar = TRUE);// parsender Ctor
+    SbiParameters( SbiParser*, sal_Bool bConst = sal_False, sal_Bool bPar = sal_True);// parsender Ctor
 };
 
 class SbiDimList : public SbiExprList {
-    BOOL  bConst;                   // TRUE: Alles sind Integer-Konstanten
+    sal_Bool  bConst;                   // sal_True: Alles sind Integer-Konstanten
 public:
     SbiDimList( SbiParser* );         // Parsender Ctor
-    BOOL  IsConstant()              { return bConst; }
+    sal_Bool  IsConstant()              { return bConst; }
 };
 
 #endif
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index 7bfb1f0dd9..e20cfb36f1 100644..100755
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -58,9 +58,9 @@ class SvStream;
 // Diese Records enthalten wiederum weitere Records. Jeder Record hat
 // den folgenden Header:
 
-//  UINT16 Kennung
-//  UINT32 Laenge des Records ohne Header
-//  UINT16 Anzahl Unterelemente
+//  sal_uInt16 Kennung
+//  sal_uInt32 Laenge des Records ohne Header
+//  sal_uInt16 Anzahl Unterelemente
 
 // Alle Datei-Offsets in Records sind relativ zum Start des Moduls!
 
@@ -85,33 +85,33 @@ class SvStream;
 #endif
 
 // Ein Library Record enthaelt nur Module Records
-//  UINT16 Kennung BL
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl Module
+//  sal_uInt16 Kennung BL
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl Module
 
 // Ein Modul-Record enthaelt alle anderen Recordtypen
-//  UINT16 Kennung BM
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung BM
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
-//  UINT32 Versionsnummer
-//  UINT32 Zeichensatz
-//  UINT32 Startadresse Initialisierungscode
-//  UINT32 Startadresse Sub Main
-//  UINT32 Reserviert
-//  UINT32 Reserviert
+//  sal_uInt32 Versionsnummer
+//  sal_uInt32 Zeichensatz
+//  sal_uInt32 Startadresse Initialisierungscode
+//  sal_uInt32 Startadresse Sub Main
+//  sal_uInt32 Reserviert
+//  sal_uInt32 Reserviert
 
 // Modulname, Kommentar und Quellcode:
-//  UINT16 Kennung MN, MC oder SC
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung MN, MC oder SC
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
 //  String-Instanz
 
 // P-Code:
-//  UINT16 Kennung PC
-//  UINT32 Laenge des Records
-//  UINT16 1
+//  sal_uInt16 Kennung PC
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 1
 // Daten:
 //  Der P-Code als Bytesack
 
@@ -119,62 +119,62 @@ class SvStream;
 // Verweise auf diese Strings sind in Form eines Indexes in diesen Pool.
 
 // Liste aller Publics:
-//  UINT16 Kennung PU oder Pu
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Publics
+//  sal_uInt16 Kennung PU oder Pu
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Publics
 // Daten fuer jeden Public-Eintrag:
-//  UINT16 String-Index
-//  UINT32 Startadresse im P-Code-Image (UINT16 fuer alte Publics)
-//  UINT16 Datentyp des Returnwertes (ab Version 2)
+//  sal_uInt16 String-Index
+//  sal_uInt32 Startadresse im P-Code-Image (sal_uInt16 fuer alte Publics)
+//  sal_uInt16 Datentyp des Returnwertes (ab Version 2)
 
 // Verzeichnis der Symbol-Tabellen:
-//  UINT16 Kennung SP
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Symboltabellen
+//  sal_uInt16 Kennung SP
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Symboltabellen
 // Daten fuer jede Symboltabelle:
-//  UINT16 Stringindex des Namens
-//  UINT16 Anzahl Symbole
-//  UINT16 Scope-Kennung
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Anzahl Symbole
+//  sal_uInt16 Scope-Kennung
 
 // Symboltabelle:
-//  UINT16 Kennung SY
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Symbole
+//  sal_uInt16 Kennung SY
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Symbole
 // Daten:
-//  UINT16 Stringindex des Namens
-//  UINT16 Anzahl Symbole
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Anzahl Symbole
 // Daten fuer jedes Symbol:
-//  UINT16 Stringindex des Namens
-//  UINT16 Datentyp
-//  UINT16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
+//  sal_uInt16 Stringindex des Namens
+//  sal_uInt16 Datentyp
+//  sal_uInt16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
 
 // Stringpool:
-//  UINT16 Kennung ST
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Strings
+//  sal_uInt16 Kennung ST
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Strings
 // Daten fuer jeden String:
-//  UINT32 Offset in den Block aller Strings
+//  sal_uInt32 Offset in den Block aller Strings
 // Danach folgt der Block aller Strings, die dort als ASCIIZ-Strings liegen.
 
 // Line Ranges:
-//  UINT16 Kennung LR
-//  UINT32 Laenge des Records
-//  UINT16 Anzahl der Strings
+//  sal_uInt16 Kennung LR
+//  sal_uInt32 Laenge des Records
+//  sal_uInt16 Anzahl der Strings
 // Daten fuer jedes Public:
-//  UINT16 1. Zeile (Sub XXX)
-//  UINT16 2. Zeile (End Sub)
+//  sal_uInt16 1. Zeile (Sub XXX)
+//  sal_uInt16 2. Zeile (End Sub)
 
 // SBX-Objekte:
-// UINT16 Anzahl Objekte
+// sal_uInt16 Anzahl Objekte
 // ....   Objektdaten
 
 ////////////////////////////////////////////////////////////////////////////
 
 // Service-Routinen (in IMAGE.CXX)
 
-BOOL  SbGood( SvStream& r );
-ULONG SbOpenRecord( SvStream&, UINT16 nSignature, UINT16 nElem );
-void  SbCloseRecord( SvStream&, ULONG );
+sal_Bool  SbGood( SvStream& r );
+sal_uIntPtr SbOpenRecord( SvStream&, sal_uInt16 nSignature, sal_uInt16 nElem );
+void  SbCloseRecord( SvStream&, sal_uIntPtr );
 
 #endif
 
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index fcd1f58b57..0b42098a01 100644..100755
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -43,25 +43,25 @@ class SbiImage {
 
     SbxArrayRef    rTypes;			// User defined types
     SbxArrayRef    rEnums;			// Enum types
-    UINT32*		   pStringOff;		// StringId-Offsets
+    sal_uInt32*		   pStringOff;		// StringId-Offsets
     sal_Unicode*   pStrings;		// StringPool
     char* 		   pCode;			// Code-Image
     char* 		   pLegacyPCode;		// Code-Image
-    BOOL		   bError;			// TRUE: Fehler
-    USHORT		   nFlags;			// Flags (s.u.)
+    sal_Bool		   bError;			// sal_True: Fehler
+    sal_uInt16		   nFlags;			// Flags (s.u.)
     short		   nStrings;   		// Anzahl Strings
-    UINT32		   nStringSize;		// Groesse des String-Puffers
-    UINT32		   nCodeSize;		// Groesse des Code-Blocks
-    UINT16		   nLegacyCodeSize;		// Groesse des Code-Blocks
-    UINT16		   nDimBase;		// OPTION BASE-Wert
+    sal_uInt32		   nStringSize;		// Groesse des String-Puffers
+    sal_uInt32		   nCodeSize;		// Groesse des Code-Blocks
+    sal_uInt16		   nLegacyCodeSize;		// Groesse des Code-Blocks
+    sal_uInt16		   nDimBase;		// OPTION BASE-Wert
     rtl_TextEncoding eCharSet;		// Zeichensatz fuer Strings
                                     // temporaere Verwaltungs-Variable:
     short		   nStringIdx;		// aktueller String-Index
-    UINT32		   nStringOff;		// aktuelle Pos im Stringpuffer
+    sal_uInt32		   nStringOff;		// aktuelle Pos im Stringpuffer
                                     // Routinen fuer Compiler:
     void MakeStrings( short );		// StringPool einrichten
     void AddString( const String& );// String zufuegen
-    void AddCode( char*, UINT32 );	// Codeblock dazu
+    void AddCode( char*, sal_uInt32 );	// Codeblock dazu
     void AddType(SbxObject *);      // User-Type mit aufnehmen
     void AddEnum(SbxObject *);      // Register enum type
 
@@ -69,35 +69,35 @@ public:
     String aName;					// Makroname
     ::rtl::OUString aOUSource;		// Quellcode
     String aComment;				// Kommentar
-    BOOL   bInit;					// TRUE: Init-Code ist gelaufen
-    BOOL   bFirstInit;      		// TRUE, wenn das Image das erste mal nach
+    sal_Bool   bInit;					// sal_True: Init-Code ist gelaufen
+    sal_Bool   bFirstInit;      		// sal_True, wenn das Image das erste mal nach
                                     // dem Compilieren initialisiert wird.
     SbiImage();
    ~SbiImage();
     void Clear();					// Inhalt loeschen
-    BOOL Load( SvStream&, UINT32& nVer );		// Loads image from stream
+    sal_Bool Load( SvStream&, sal_uInt32& nVer );		// Loads image from stream
                             // nVer is set to version
                             // of image
-    BOOL Load( SvStream& );
-    BOOL Save( SvStream&, UINT32 = B_CURVERSION );
-    BOOL IsError() 					{ return bError;    }
+    sal_Bool Load( SvStream& );
+    sal_Bool Save( SvStream&, sal_uInt32 = B_CURVERSION );
+    sal_Bool IsError() 					{ return bError;    }
 
     const char* GetCode() const 	{ return pCode; 	}
-    UINT32		GetCodeSize() const	{ return nCodeSize;	}
+    sal_uInt32		GetCodeSize() const	{ return nCodeSize;	}
     ::rtl::OUString& GetSource32() 	{ return aOUSource; }
-    USHORT		GetBase() const		{ return nDimBase;	}
+    sal_uInt16		GetBase() const		{ return nDimBase;	}
     String		GetString( short nId ) const;
     //const char* GetString( short nId ) const;
     const SbxObject*  FindType (String aTypeName) const;
 
     SbxArrayRef GetEnums()			{ return rEnums; }
 
-    void		SetFlag( USHORT n )	{ nFlags |= n;		}
-    USHORT		GetFlag( USHORT n )	const { return nFlags & n; }
-    UINT16		CalcLegacyOffset( INT32 nOffset );
-    UINT32		CalcNewOffset( INT16 nOffset );
+    void		SetFlag( sal_uInt16 n )	{ nFlags |= n;		}
+    sal_uInt16		GetFlag( sal_uInt16 n )	const { return nFlags & n; }
+    sal_uInt16		CalcLegacyOffset( sal_Int32 nOffset );
+    sal_uInt32		CalcNewOffset( sal_Int16 nOffset );
     void		ReleaseLegacyBuffer();
-    BOOL		ExceedsLegacyLimits();
+    sal_Bool		ExceedsLegacyLimits();
     
 };
 
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 025ef857b4..1de16ed917 100644..100755
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -48,10 +48,10 @@ class SvStream;
 
 class SbiStream {
     SvStream* pStrm;				// der Stream
-    ULONG  nExpandOnWriteTo;		// bei Schreibzugriff, den Stream
+    sal_uIntPtr  nExpandOnWriteTo;		// bei Schreibzugriff, den Stream
                                     // bis zu dieser Groesse aufblasen
     ByteString aLine;				// aktuelle Zeile
-    ULONG  nLine;					// aktuelle Zeilennummer
+    sal_uIntPtr  nLine;					// aktuelle Zeilennummer
     short  nLen;	 				// Pufferlaenge
     short  nMode;					// Bits:
     short  nChan;					// aktueller Kanal
@@ -63,9 +63,9 @@ public:
    ~SbiStream();
     SbError Open( short, const ByteString&, short, short, short );
     SbError Close();
-    SbError Read( ByteString&, USHORT = 0, bool bForceReadingPerByte=false );
+    SbError Read( ByteString&, sal_uInt16 = 0, bool bForceReadingPerByte=false );
     SbError Read( char& );
-    SbError Write( const ByteString&, USHORT = 0 );
+    SbError Write( const ByteString&, sal_uInt16 = 0 );
 
     bool IsText() const		{ return (nMode & SBSTRM_BINARY) == 0; }
     bool IsRandom() const	{ return (nMode & SBSTRM_RANDOM) != 0; }
@@ -74,8 +74,8 @@ public:
     bool IsAppend() const	{ return (nMode & SBSTRM_APPEND) != 0; }
     short GetBlockLen() const 		   { return nLen; 			}
     short GetMode() const 			   { return nMode; 			}
-    ULONG GetLine() const			   { return nLine;			}
-    void SetExpandOnWriteTo( ULONG n ) { nExpandOnWriteTo = n;	}
+    sal_uIntPtr GetLine() const			   { return nLine;			}
+    void SetExpandOnWriteTo( sal_uIntPtr n ) { nExpandOnWriteTo = n;	}
     void ExpandFile();
     SvStream* GetStrm() 			   { return pStrm; 		   	}
 };
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 3d4a1ffc7b..3d4a1ffc7b 100644..100755
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index 4bdb3d1c0d..95f59322b1 100644..100755
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/object.hxx
@@ -59,7 +59,7 @@ using SbxVariable::GetInfo;
 public:
 #endif
     typedef void( SampleObject::*pMeth )
-        ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+        ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
 #if defined ( ICC )
 private:
 #endif
@@ -73,10 +73,10 @@ private:
     static Methods aMethods[];  // Methodentabelle
 
     // Methoden
-    void Display( SbxVariable*, SbxArray*, BOOL );
-    void Event( SbxVariable*, SbxArray*, BOOL );
-    void Square( SbxVariable*, SbxArray*, BOOL );
-    void Create( SbxVariable*, SbxArray*, BOOL );
+    void Display( SbxVariable*, SbxArray*, sal_Bool );
+    void Event( SbxVariable*, SbxArray*, sal_Bool );
+    void Square( SbxVariable*, SbxArray*, sal_Bool );
+    void Create( SbxVariable*, SbxArray*, sal_Bool );
     // Infoblock auffuellen
     SbxInfo* GetInfo( short nIdx );
     // Broadcaster Notification
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 30157a7021..30157a7021 100644..100755
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 0fcd794dae..0458dcb6a0 100644..100755
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -47,24 +47,24 @@ class SbiParser : public SbiTokenizer
     SbiProcDef* pProc;				// aktuelle Prozedur
     SbiExprNode*  pWithVar;			// aktuelle With-Variable
     SbiToken    eEndTok;   			// das Ende-Token
-    UINT32		nGblChain;			// Chainkette fuer globale DIMs
-    BOOL		bGblDefs; 			// TRUE globale Definitionen allgemein
-    BOOL		bNewGblDefs; 		// TRUE globale Definitionen vor Sub
-    BOOL		bSingleLineIf; 		// TRUE einzeiliges if-Statement
-
-    SbiSymDef*  VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration
-    SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration
-    void DefStatic( BOOL bPrivate );
-    void DefProc( BOOL bStatic, BOOL bPrivate ); // Prozedur einlesen
-    void DefVar( SbiOpcode eOp, BOOL bStatic );	// DIM/REDIM einlesen
-    void TypeDecl( SbiSymDef&, BOOL bAsNewAlreadyParsed=FALSE ); 	// AS-Deklaration
+    sal_uInt32		nGblChain;			// Chainkette fuer globale DIMs
+    sal_Bool		bGblDefs; 			// sal_True globale Definitionen allgemein
+    sal_Bool		bNewGblDefs; 		// sal_True globale Definitionen vor Sub
+    sal_Bool		bSingleLineIf; 		// sal_True einzeiliges if-Statement
+
+    SbiSymDef*  VarDecl( SbiDimList**,sal_Bool,sal_Bool );// Variablen-Deklaration
+    SbiProcDef* ProcDecl(sal_Bool bDecl);// Prozedur-Deklaration
+    void DefStatic( sal_Bool bPrivate );
+    void DefProc( sal_Bool bStatic, sal_Bool bPrivate ); // Prozedur einlesen
+    void DefVar( SbiOpcode eOp, sal_Bool bStatic );	// DIM/REDIM einlesen
+    void TypeDecl( SbiSymDef&, sal_Bool bAsNewAlreadyParsed=sal_False ); 	// AS-Deklaration
     void OpenBlock( SbiToken, SbiExprNode* = NULL );	// Block oeffnen
     void CloseBlock();				// Block aufloesen
-    BOOL Channel( BOOL=FALSE );		// Kanalnummer parsen
+    sal_Bool Channel( sal_Bool=sal_False );		// Kanalnummer parsen
     void StmntBlock( SbiToken ); 	// Statement-Block abarbeiten
-    void DefType( BOOL bPrivate );	// Parse type declaration
-    void DefEnum( BOOL bPrivate );	// Parse enum declaration
-    void DefDeclare( BOOL bPrivate );
+    void DefType( sal_Bool bPrivate );	// Parse type declaration
+    void DefEnum( sal_Bool bPrivate );	// Parse enum declaration
+    void DefDeclare( sal_Bool bPrivate );
     void EnableCompatibility();	
 public:
     SbxArrayRef	  rTypeArray;		// das Type-Array
@@ -79,26 +79,26 @@ public:
     SbiSymPool*	  pPool; 			// aktueller Pool
     SbiExprType   eCurExpr;	  		// aktueller Expr-Typ
     short		  nBase;			// OPTION BASE-Wert
-    BOOL		  bText;			// OPTION COMPARE TEXT
-    BOOL          bExplicit; 		// TRUE: OPTION EXPLICIT
-    BOOL          bClassModule;		// TRUE: OPTION ClassModule
+    sal_Bool		  bText;			// OPTION COMPARE TEXT
+    sal_Bool          bExplicit; 		// sal_True: OPTION EXPLICIT
+    sal_Bool          bClassModule;		// sal_True: OPTION ClassModule
     StringVector  aIfaceVector;		// Holds all interfaces implemented by a class module
     StringVector  aRequiredTypes;   // Types used in Dim As New <type> outside subs
     SbxDataType   eDefTypes[26];	// DEFxxx-Datentypen
 
     SbiParser( StarBASIC*, SbModule* );
-    BOOL Parse();					// die Aktion
+    sal_Bool Parse();					// die Aktion
     SbiExprNode* GetWithVar();		// Innerste With-Variable liefern
 
     // AB 31.3.1996, Symbol in Runtime-Library suchen
     SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType );
     void AddConstants( void );
 
-    BOOL HasGlobalCode();			// Globaler Code definiert?
+    sal_Bool HasGlobalCode();			// Globaler Code definiert?
 
-    BOOL TestToken( SbiToken );		// bestimmtes TOken?
-    BOOL TestSymbol( BOOL=FALSE );	// Symbol?
-    BOOL TestComma();				// Komma oder EOLN?
+    sal_Bool TestToken( SbiToken );		// bestimmtes TOken?
+    sal_Bool TestSymbol( sal_Bool=sal_False );	// Symbol?
+    sal_Bool TestComma();				// Komma oder EOLN?
     void TestEoln();				// EOLN?
 
     void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL );	// Let oder Call
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 7f88e28f99..0bfd1da194 100644..100755
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -56,7 +56,7 @@ class SbPropertyValues: 	public SbPropertyValuesHelper
     NS_UNO::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo;
 
 private:
-    INT32 					GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
+    sal_Int32 					GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
 
 public:
                             SbPropertyValues();
@@ -157,7 +157,7 @@ public:
 
     // XPropertyContainer
     virtual void SAL_CALL addProperty(	const ::rtl::OUString& Name, 
-                                        INT16 Attributes, 
+                                        sal_Int16 Attributes, 
                                         const NS_UNO::Any& DefaultValue)
         throw(  NS_BEANS::PropertyExistException, NS_BEANS::IllegalTypeException,
                 NS_LANG::IllegalArgumentException, NS_UNO::RuntimeException );
@@ -181,7 +181,7 @@ public:
 class StarBASIC;
 class SbxArray;
 
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
 
 #undef NS_BEANS
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 24af07f9c3..32dd7c34a9 100644..100755
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -103,10 +103,10 @@ struct SbiForStack { 		  		// for/next stack:
 
     // For each support
     ForType			eForType;
-    INT32			nCurCollectionIndex;
-    INT32*			pArrayCurIndices;
-    INT32*			pArrayLowerBounds;
-    INT32*			pArrayUpperBounds;
+    sal_Int32			nCurCollectionIndex;
+    sal_Int32*			pArrayCurIndices;
+    sal_Int32*			pArrayLowerBounds;
+    sal_Int32*			pArrayUpperBounds;
     Reference< XEnumeration > xEnumeration;
 
     SbiForStack( void )
@@ -124,8 +124,8 @@ struct SbiForStack { 		  		// for/next stack:
 
 struct SbiGosubStack {				// GOSUB-Stack:
     SbiGosubStack* pNext;			// Chain
-    const BYTE* pCode;				// Return-Pointer
-    USHORT nStartForLvl;			// #118235: For Level in moment of gosub
+    const sal_uInt8* pCode;				// Return-Pointer
+    sal_uInt16 nStartForLvl;			// #118235: For Level in moment of gosub
 };
 
 #define MAXRECURSION 500            // max. 500 Rekursionen
@@ -150,7 +150,7 @@ public:
 #else
     ::osl::Directory* pDir;
 #endif
-    INT16	nDirFlags;
+    sal_Int16	nDirFlags;
     short	nCurDirPos;
 
     String sFullNameToBeChecked;
@@ -192,9 +192,9 @@ class SbiInstance
 
     SbError      	nErr;     		// aktueller Fehlercode
     String		    aErrorMsg;		// letzte Error-Message fuer $ARG
-    USHORT      	nErl;			// aktuelle Fehlerzeile
-    BOOL			bReschedule;	// Flag: TRUE = Reschedule in Hauptschleife
-    BOOL			bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
+    sal_uInt16      	nErl;			// aktuelle Fehlerzeile
+    sal_Bool			bReschedule;	// Flag: sal_True = Reschedule in Hauptschleife
+    sal_Bool			bCompatibility; // Flag: sal_True = VBA runtime compatibility mode
 
     ComponentVector_t ComponentVector;
 public:
@@ -203,9 +203,9 @@ public:
 
     // #31460 Neues Konzept fuer StepInto/Over/Out,
     // Erklaerung siehe runtime.cxx bei SbiInstance::CalcBreakCallLevel()
-    USHORT	nCallLvl;				// Call-Level (wg. Rekursion)
-    USHORT	nBreakCallLvl;			// Call-Level zum Anhalten
-    void	CalcBreakCallLevel( USHORT nFlags );	// Gemaess Flags setzen
+    sal_uInt16	nCallLvl;				// Call-Level (wg. Rekursion)
+    sal_uInt16	nBreakCallLvl;			// Call-Level zum Anhalten
+    void	CalcBreakCallLevel( sal_uInt16 nFlags );	// Gemaess Flags setzen
 
     SbiInstance( StarBASIC* );
    ~SbiInstance();
@@ -222,14 +222,14 @@ public:
     SbError GetErr()				{ return nErr; }
     String	GetErrorMsg()			{ return aErrorMsg; }
     xub_StrLen GetErl()				{ return nErl; }
-    void	EnableReschedule( BOOL bEnable ) { bReschedule = bEnable; }
-    BOOL	IsReschedule( void ) { return bReschedule; }
-    void	EnableCompatibility( BOOL bEnable ) { bCompatibility = bEnable; }
-    BOOL	IsCompatibility( void ) { return bCompatibility; }
+    void	EnableReschedule( sal_Bool bEnable ) { bReschedule = bEnable; }
+    sal_Bool	IsReschedule( void ) { return bReschedule; }
+    void	EnableCompatibility( sal_Bool bEnable ) { bCompatibility = bEnable; }
+    sal_Bool	IsCompatibility( void ) { return bCompatibility; }
 
     ComponentVector_t& getComponentVector( void )  { return ComponentVector; }
 
-    SbMethod* GetCaller( USHORT );
+    SbMethod* GetCaller( sal_uInt16 );
     SbModule* GetActiveModule();
     SbxArray* GetLocals( SbMethod* );
 
@@ -269,9 +269,11 @@ struct RefSaveItem
 
 class SbiRuntime
 {
+    friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+
     typedef void( SbiRuntime::*pStep0 )();
-    typedef void( SbiRuntime::*pStep1 )( UINT32 nOp1 );
-    typedef void( SbiRuntime::*pStep2 )( UINT32 nOp1, UINT32 nOp2 );
+    typedef void( SbiRuntime::*pStep1 )( sal_uInt32 nOp1 );
+    typedef void( SbiRuntime::*pStep2 )( sal_uInt32 nOp1, sal_uInt32 nOp2 );
     static pStep0 aStep0[];         // Opcode-Tabelle Gruppe 0
     static pStep1 aStep1[];         // Opcode-Tabelle Gruppe 1
     static pStep2 aStep2[];         // Opcode-Tabelle Gruppe 2
@@ -291,15 +293,15 @@ class SbiRuntime
     SbiArgvStack*  pArgvStk;		// ARGV-Stack
     SbiGosubStack* pGosubStk;		// GOSUB stack
     SbiForStack*   pForStk;			// FOR/NEXT-Stack
-    USHORT        nExprLvl;			// Tiefe des Expr-Stacks
-    USHORT        nGosubLvl;        // Zum Vermeiden von Tot-Rekursionen
-    USHORT        nForLvl;	        // #118235: Maintain for level
-    const BYTE*   pCode;            // aktueller Code-Pointer
-    const BYTE*   pStmnt;           // Beginn des lezten Statements
-    const BYTE*   pError;           // Adresse des aktuellen Error-Handlers
-    const BYTE*   pRestart;         // Restart-Adresse
-    const BYTE*   pErrCode;         // Restart-Adresse RESUME NEXT
-    const BYTE*   pErrStmnt;        // Restart-Adresse RESUMT 0
+    sal_uInt16        nExprLvl;			// Tiefe des Expr-Stacks
+    sal_uInt16        nGosubLvl;        // Zum Vermeiden von Tot-Rekursionen
+    sal_uInt16        nForLvl;	        // #118235: Maintain for level
+    const sal_uInt8*   pCode;            // aktueller Code-Pointer
+    const sal_uInt8*   pStmnt;           // Beginn des lezten Statements
+    const sal_uInt8*   pError;           // Adresse des aktuellen Error-Handlers
+    const sal_uInt8*   pRestart;         // Restart-Adresse
+    const sal_uInt8*   pErrCode;         // Restart-Adresse RESUME NEXT
+    const sal_uInt8*   pErrStmnt;        // Restart-Adresse RESUMT 0
     String		  aLibName;			// Lib-Name fuer Declare-Call
     SbxArrayRef   refParams;        // aktuelle Prozedur-Parameter
     SbxArrayRef   refLocals;        // lokale Variable
@@ -307,14 +309,14 @@ class SbiRuntime
     // AB, 28.3.2000 #74254, Ein refSaveObj reicht nicht! Neu: pRefSaveList (s.u.)
     //SbxVariableRef refSaveObj;      // #56368 Bei StepElem Referenz sichern
     short         nArgc;            // aktueller Argc
-    BOOL          bRun;             // TRUE: Programm ist aktiv
-    BOOL          bError;           // TRUE: Fehler behandeln
-    BOOL          bInError;         // TRUE: in einem Fehler-Handler
-    BOOL          bBlocked;         // TRUE: blocked by next call level, #i48868
-    BOOL          bVBAEnabled;
-    USHORT		  nFlags;			// Debugging-Flags
+    sal_Bool          bRun;             // sal_True: Programm ist aktiv
+    sal_Bool          bError;           // sal_True: Fehler behandeln
+    sal_Bool          bInError;         // sal_True: in einem Fehler-Handler
+    sal_Bool          bBlocked;         // sal_True: blocked by next call level, #i48868
+    sal_Bool          bVBAEnabled;
+    sal_uInt16		  nFlags;			// Debugging-Flags
     SbError		  nError;           // letzter Fehler
-    USHORT		  nOps;				// Opcode-Zaehler
+    sal_uInt16		  nOps;				// Opcode-Zaehler
     sal_uInt32    m_nLastTime;
 
     RefSaveItem*  pRefSaveList;     // #74254 Temporaere Referenzen sichern
@@ -343,17 +345,17 @@ class SbiRuntime
     }
 
     SbxVariable* FindElement
-    ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
-    void SetupArgs( SbxVariable*, UINT32 );
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    void SetupArgs( SbxVariable*, sal_uInt32 );
     SbxVariable* CheckArray( SbxVariable* );
 
     void PushVar( SbxVariable* );   // Variable push
     SbxVariableRef PopVar();          // Variable pop
     SbxVariable* GetTOS( short=0 ); // Variable vom TOS holen
     void TOSMakeTemp();				// TOS in temp. Variable wandeln
-    BOOL ClearExprStack();          // Expr-Stack freigeben
+    sal_Bool ClearExprStack();          // Expr-Stack freigeben
 
-    void PushGosub( const BYTE* );  // GOSUB-Element push
+    void PushGosub( const sal_uInt8* );  // GOSUB-Element push
     void PopGosub();                // GOSUB-Element pop
     void ClearGosubStack();         // GOSUB-Stack freigeben
 
@@ -373,7 +375,7 @@ class SbiRuntime
     void SetParameters( SbxArray* );// Parameter uebernehmen
 
     // MUSS NOCH IMPLEMENTIERT WERDEN
-    void DllCall( const String&, const String&, SbxArray*, SbxDataType, BOOL );
+    void DllCall( const String&, const String&, SbxArray*, SbxDataType, sal_Bool );
 
     // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
     void DimImpl( SbxVariableRef refVar );
@@ -381,7 +383,7 @@ class SbiRuntime
     // #115829
     bool implIsClass( SbxObject* pObj, const String& aClass );
 
-    void StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt = false );
+    void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
 
     // Die nachfolgenden Routinen werden vom Single Stepper
     // gerufen und implementieren die einzelnen Opcodes
@@ -404,40 +406,40 @@ class SbiRuntime
     void StepLSET(),	StepRSET(),		StepREDIMP_ERASE(), 	StepERASE_CLEAR();
     void StepARRAYACCESS(), StepBYVAL();
     // Alle Opcodes mit einem Operanden
-    void StepLOADNC( UINT32 ),  StepLOADSC( UINT32 ),   StepLOADI( UINT32 );
-    void StepARGN( UINT32 ),	StepBASED( UINT32 ),	StepPAD( UINT32 );
-    void StepJUMP( UINT32 ),    StepJUMPT( UINT32 );
-    void StepJUMPF( UINT32 ),   StepONJUMP( UINT32 );
-    void StepGOSUB( UINT32 ),   StepRETURN( UINT32 );
-    void StepTESTFOR( UINT32 ), StepCASETO( UINT32 ),   StepERRHDL( UINT32 );
-    void StepRESUME( UINT32 ),  StepSETCLASS( UINT32 ),	StepVBASETCLASS( UINT32 ),	StepTESTCLASS( UINT32 ), StepLIB( UINT32 );
+    void StepLOADNC( sal_uInt32 ),  StepLOADSC( sal_uInt32 ),   StepLOADI( sal_uInt32 );
+    void StepARGN( sal_uInt32 ),	StepBASED( sal_uInt32 ),	StepPAD( sal_uInt32 );
+    void StepJUMP( sal_uInt32 ),    StepJUMPT( sal_uInt32 );
+    void StepJUMPF( sal_uInt32 ),   StepONJUMP( sal_uInt32 );
+    void StepGOSUB( sal_uInt32 ),   StepRETURN( sal_uInt32 );
+    void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ),   StepERRHDL( sal_uInt32 );
+    void StepRESUME( sal_uInt32 ),  StepSETCLASS( sal_uInt32 ),	StepVBASETCLASS( sal_uInt32 ),	StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
     bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true );
-    void StepCLOSE( UINT32 ),   StepPRCHAR( UINT32 ),   StepARGTYP( UINT32 );
+    void StepCLOSE( sal_uInt32 ),   StepPRCHAR( sal_uInt32 ),   StepARGTYP( sal_uInt32 );
     // Alle Opcodes mit zwei Operanden
-    void StepRTL( UINT32, UINT32 ),		StepPUBLIC( UINT32, UINT32 ),	StepPUBLIC_P( UINT32, UINT32 );
-    void StepPUBLIC_Impl( UINT32, UINT32, bool bUsedForClassModule );
-    void StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
-    void StepFIND( UINT32, UINT32 ),    StepELEM( UINT32, UINT32 );
-    void StepGLOBAL( UINT32, UINT32 ),  StepLOCAL( UINT32, UINT32 );
-    void StepPARAM( UINT32, UINT32), 	StepCREATE( UINT32, UINT32 );
-    void StepCALL( UINT32, UINT32 ),    StepCALLC( UINT32, UINT32 );
-    void StepCASEIS( UINT32, UINT32 ),  StepSTMNT( UINT32, UINT32 );
+    void StepRTL( sal_uInt32, sal_uInt32 ),		StepPUBLIC( sal_uInt32, sal_uInt32 ),	StepPUBLIC_P( sal_uInt32, sal_uInt32 );
+    void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
+    void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+    void StepFIND( sal_uInt32, sal_uInt32 ),    StepELEM( sal_uInt32, sal_uInt32 );
+    void StepGLOBAL( sal_uInt32, sal_uInt32 ),  StepLOCAL( sal_uInt32, sal_uInt32 );
+    void StepPARAM( sal_uInt32, sal_uInt32), 	StepCREATE( sal_uInt32, sal_uInt32 );
+    void StepCALL( sal_uInt32, sal_uInt32 ),    StepCALLC( sal_uInt32, sal_uInt32 );
+    void StepCASEIS( sal_uInt32, sal_uInt32 ),  StepSTMNT( sal_uInt32, sal_uInt32 );
     SbxVariable* StepSTATIC_Impl( String& aName, SbxDataType& t );
-    void StepOPEN( UINT32, UINT32 ),	StepSTATIC( UINT32, UINT32 );
-    void StepTCREATE(UINT32,UINT32),	StepDCREATE(UINT32,UINT32);
-    void StepGLOBAL_P( UINT32, UINT32 ),StepFIND_G( UINT32, UINT32 );
-    void StepDCREATE_REDIMP(UINT32,UINT32), StepDCREATE_IMPL(UINT32,UINT32);
-    void StepFIND_CM( UINT32, UINT32 );
-    void StepFIND_STATIC( UINT32, UINT32 );
-    void implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 );
+    void StepOPEN( sal_uInt32, sal_uInt32 ),	StepSTATIC( sal_uInt32, sal_uInt32 );
+    void StepTCREATE(sal_uInt32,sal_uInt32),	StepDCREATE(sal_uInt32,sal_uInt32);
+    void StepGLOBAL_P( sal_uInt32, sal_uInt32 ),StepFIND_G( sal_uInt32, sal_uInt32 );
+    void StepDCREATE_REDIMP(sal_uInt32,sal_uInt32), StepDCREATE_IMPL(sal_uInt32,sal_uInt32);
+    void StepFIND_CM( sal_uInt32, sal_uInt32 );
+    void StepFIND_STATIC( sal_uInt32, sal_uInt32 );
+    void implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 );
 public:
     void          SetVBAEnabled( bool bEnabled );
-    USHORT		GetImageFlag( USHORT n ) const;
-    USHORT		GetBase();
+    sal_uInt16		GetImageFlag( sal_uInt16 n ) const;
+    sal_uInt16		GetBase();
     xub_StrLen  nLine,nCol1,nCol2;	// aktuelle Zeile, Spaltenbereich
     SbiRuntime* pNext;               // Stack-Chain
 
-    SbiRuntime( SbModule*, SbMethod*, UINT32 );
+    SbiRuntime( SbModule*, SbMethod*, sal_uInt32 );
    ~SbiRuntime();
     void Error( SbError, bool bVBATranslationAlreadyDone = false );		// Fehler setzen, falls != 0
     void Error( SbError, const String& );       // Fehler setzen, falls != 0
@@ -445,15 +447,15 @@ public:
     void FatalError( SbError, const String& );  // Fehlerbehandlung=Standard, Fehler setzen
     static sal_Int32 translateErrorToVba( SbError nError, String& rMsg );
     void DumpPCode();
-    BOOL Step();                    // Einzelschritt (ein Opcode)
-    void Stop()     	   { bRun = FALSE;   }
-    BOOL IsRun()           { return bRun;    }
-    void block( void )	   { bBlocked = TRUE; }
-    void unblock( void )   { bBlocked = FALSE; }
+    sal_Bool Step();                    // Einzelschritt (ein Opcode)
+    void Stop()     	   { bRun = sal_False;   }
+    sal_Bool IsRun()           { return bRun;    }
+    void block( void )	   { bBlocked = sal_True; }
+    void unblock( void )   { bBlocked = sal_False; }
     SbMethod* GetMethod()  { return pMeth;   }
     SbModule* GetModule()  { return pMod;    }
-    USHORT GetDebugFlags() { return nFlags;  }
-    void SetDebugFlags( USHORT nFl ) { nFlags = nFl;  }
+    sal_uInt16 GetDebugFlags() { return nFlags;  }
+    void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl;  }
     SbMethod* GetCaller();
     SbxArray* GetLocals();
     SbxArray* GetParams();
@@ -487,12 +489,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic );
 // no DDE functionality, no DLLCALL) in basic because
 // of portal "virtual" users (portal user != UNIX user)
 // (Implemented in iosys.cxx)
-BOOL needSecurityRestrictions( void );
+sal_Bool needSecurityRestrictions( void );
 
-// Returns TRUE if UNO is available, otherwise the old
+// Returns sal_True if UNO is available, otherwise the old
 // file system implementation has to be used
 // (Implemented in iosys.cxx)
-BOOL hasUno( void );
+sal_Bool hasUno( void );
 
 // Converts possibly relative paths to absolute paths
 // according to the setting done by ChDir/ChDrive
diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx
index f1cb29a4bc..f1cb29a4bc 100644..100755
--- a/basic/source/inc/sbcomp.hxx
+++ b/basic/source/inc/sbcomp.hxx
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 6c00a999c1..c35d688e10 100644..100755
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -47,7 +47,7 @@ class SbModule;
 class SbiFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
@@ -80,7 +80,7 @@ public:
     void AddClassModule( SbModule* pClassModule );
     void RemoveClassModule( SbModule* pClassModule );
 
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 
     SbModule* FindClass( const String& rClassName );
@@ -118,14 +118,14 @@ struct SbiGlobals
     SbError			nCode;			// aktueller Fehlercode
     xub_StrLen		nLine;			// aktuelle Zeile
     xub_StrLen		nCol1,nCol2;	// aktuelle Spalten (von,bis)
-    BOOL			bCompiler;		// Flag fuer Compiler-Error
-    BOOL			bGlobalInitErr;	// Beim GlobalInit trat ein Compiler-Fehler auf
-    BOOL			bRunInit;		// TRUE, wenn RunInit vom Basic aktiv ist
+    sal_Bool			bCompiler;		// Flag fuer Compiler-Error
+    sal_Bool			bGlobalInitErr;	// Beim GlobalInit trat ein Compiler-Fehler auf
+    sal_Bool			bRunInit;		// sal_True, wenn RunInit vom Basic aktiv ist
     String			aErrMsg;		// Puffer fuer GetErrorText()
     SbLanguageMode	eLanguageMode;	// Flag fuer Visual-Basic-Script-Modus
     SbErrorStack*	pErrStack;		// Stack fuer die im Fehlerfall abgebaute SbiRuntime Kette
     ::utl::TransliterationWrapper* pTransliterationWrapper;    // For StrComp
-    BOOL			bBlockCompilerError;
+    sal_Bool			bBlockCompilerError;
     BasicManager*   pAppBasMgr;
     StarBASIC*		pMSOMacroRuntimLib;	// Lib containing MSO Macro Runtime API entry symbols
 
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index fe85699998..fe85699998 100644..100755
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index b7a754b314..9a12f373bf 100644..100755
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -37,8 +37,8 @@
 
 class SbJScriptModule : public SbModule
 {
-    virtual BOOL LoadData( SvStream&, USHORT );
-    virtual BOOL StoreData( SvStream& ) const;
+    virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+    virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
     TYPEINFO();
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
new file mode 100755
index 0000000000..bf2caf12cb
--- /dev/null
+++ b/basic/source/inc/sbtrace.hxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SBTRACE_HXX
+#define _SBTRACE_HXX
+
+//#define DBG_TRACE_BASIC
+
+#ifdef DBG_TRACE_BASIC
+void dbg_InitTrace( void );
+void dbg_DeInitTrace( void );
+void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl );
+void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false );
+void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl );
+void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
+    const String& aTraceStr_STMNT, const String& aTraceStr_PCode );
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+#endif
+
+#endif
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 02f9cb93a7..791c732756 100644..100755
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -52,8 +52,8 @@ class SbUnoObject: public SbxObject
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
-    BOOL bNeedIntrospection;
-    BOOL bIgnoreNativeCOMObjectMembers;
+    sal_Bool bNeedIntrospection;
+    sal_Bool bNativeCOMObject;
     ::com::sun::star::uno::Any maTmpUnoObj;	// Only to save obj for doIntrospection!
 
     // Hilfs-Methode zum Anlegen der dbg_-Properties
@@ -85,17 +85,22 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void )			{ return mxInvocation; }
 
     void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
+
+    bool isNativeCOMObject( void )
+        { return bNativeCOMObject; }
 };
 SV_DECL_IMPL_REF(SbUnoObject);
 
 
 // #67781 Rueckgabewerte der Uno-Methoden loeschen
 void clearUnoMethods( void );
+void clearUnoMethodsForBasic( StarBASIC* pBasic );
 
 class SbUnoMethod : public SbxMethod
 {
     friend class SbUnoObject;
     friend void clearUnoMethods( void );
+    friend void clearUnoMethodsForBasic( StarBASIC* pBasic );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod;
     ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >* pParamInfoSeq;
@@ -104,13 +109,15 @@ class SbUnoMethod : public SbxMethod
     SbUnoMethod* pPrev;
     SbUnoMethod* pNext;
 
-    bool mbInvocation;		// Method is based on invocation
+    bool mbInvocation;		 // Method is based on invocation
+    bool mbDirectInvocation; // Method should be used with XDirectInvocation interface
 
 public:
     TYPEINFO();
 
     SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
-        bool bInvocation );
+        bool bInvocation,
+        bool bDirect = false );
     virtual ~SbUnoMethod();
     virtual SbxInfo* GetInfo();
 
@@ -118,6 +125,8 @@ public:
 
     bool isInvocationBased( void )
         { return mbInvocation; }
+    bool needsDirectInvocation( void )
+        { return mbDirectInvocation; }
 };
 
 
@@ -127,7 +136,7 @@ class SbUnoProperty : public SbxProperty
 
     // Daten der Uno-Property
     ::com::sun::star::beans::Property aUnoProp;
-    INT32 nId;
+    sal_Int32 nId;
 
     bool mbInvocation;		// Property is based on invocation
 
@@ -135,7 +144,7 @@ class SbUnoProperty : public SbxProperty
 public:
     TYPEINFO();
     SbUnoProperty( const String& aName_, SbxDataType eSbxType,
-        const ::com::sun::star::beans::Property& aUnoProp_, INT32 nId_, bool bInvocation );
+        const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation );
 
     bool isInvocationBased( void )
         { return mbInvocation; }
@@ -145,7 +154,7 @@ public:
 class SbUnoFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
     virtual SbxObject* CreateObject( const String& );
 };
 
@@ -284,15 +293,18 @@ public:
 class StarBASIC;
 
 // Impl-Methoden fuer RTL
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+
+void disposeComVariablesForBasic( StarBASIC* pBasic );
+void clearNativeObjectWrapperVector( void );
 
 
 //========================================================================
@@ -309,8 +321,8 @@ class BasicCollection : public SbxObject
     virtual ~BasicCollection();
     virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
                              const SfxHint& rHint, const TypeId& rHintType );
-    INT32 implGetIndex( SbxVariable* pIndexVar );
-    INT32 implGetIndexForName( const String& rName );
+    sal_Int32 implGetIndex( SbxVariable* pIndexVar );
+    sal_Int32 implGetIndexForName( const String& rName );
     void CollAdd( SbxArray* pPar_ );
     void CollItem( SbxArray* pPar_ );
     void CollRemove( SbxArray* pPar_ );
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index aa9aa82086..684148f840 100644..100755
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -57,33 +57,33 @@ protected:
     short  nCol; 						// aktuelle Spaltennummer
     short  nErrors;						// Anzahl Fehler
     short  nColLock;					// Lock-Zaehler fuer Col1
-    INT32  nBufPos;						// aktuelle Buffer-Pos
-    USHORT nLine;						// aktuelle Zeile
-    USHORT nCol1, nCol2;				// aktuelle 1. und 2. Spalte
-    BOOL   bSymbol;						// TRUE: Symbol gescannt
-    BOOL   bNumber;						// TRUE: Zahl gescannt
-    BOOL   bSpaces;						// TRUE: Whitespace vor Token
-    BOOL   bErrors;						// TRUE: Fehler generieren
-    BOOL   bAbort;						// TRUE: abbrechen
-    BOOL   bHash;						// TRUE: # eingelesen
-    BOOL   bError;						// TRUE: Fehler generieren
-    BOOL   bUsedForHilite;				// TRUE: Nutzung fuer Highlighting
-    BOOL   bCompatible; 				// TRUE: OPTION Compatibl
-    BOOL   bVBASupportOn;				// TRUE: OPTION VBASupport 1 otherwise default False
-    BOOL   bPrevLineExtentsComment;		// TRUE: Previous line is comment and ends on "... _"
+    sal_Int32  nBufPos;						// aktuelle Buffer-Pos
+    sal_uInt16 nLine;						// aktuelle Zeile
+    sal_uInt16 nCol1, nCol2;				// aktuelle 1. und 2. Spalte
+    sal_Bool   bSymbol;						// sal_True: Symbol gescannt
+    sal_Bool   bNumber;						// sal_True: Zahl gescannt
+    sal_Bool   bSpaces;						// sal_True: Whitespace vor Token
+    sal_Bool   bErrors;						// sal_True: Fehler generieren
+    sal_Bool   bAbort;						// sal_True: abbrechen
+    sal_Bool   bHash;						// sal_True: # eingelesen
+    sal_Bool   bError;						// sal_True: Fehler generieren
+    sal_Bool   bUsedForHilite;				// sal_True: Nutzung fuer Highlighting
+    sal_Bool   bCompatible; 				// sal_True: OPTION Compatibl
+    sal_Bool   bVBASupportOn;				// sal_True: OPTION VBASupport 1 otherwise default False
+    sal_Bool   bPrevLineExtentsComment;		// sal_True: Previous line is comment and ends on "... _"
 
     void   GenError( SbError );
 public:
     SbiScanner( const ::rtl::OUString&, StarBASIC* = NULL );
    ~SbiScanner();
 
-    void  EnableErrors()   			{ bError = FALSE; }
-    BOOL  IsHash()					{ return bHash;   }
-    BOOL  IsCompatible()			{ return bCompatible; }
+    void  EnableErrors()   			{ bError = sal_False; }
+    sal_Bool  IsHash()					{ return bHash;   }
+    sal_Bool  IsCompatible()			{ return bCompatible; }
     void  SetCompatible( bool b )	{ bCompatible = b; }		// #118206
-    BOOL  IsVBASupportOn()			{ return bVBASupportOn; }
+    sal_Bool  IsVBASupportOn()			{ return bVBASupportOn; }
     void  SetVBASupportOn( bool b )	{ bVBASupportOn = b; }
-    BOOL  WhiteSpace()				{ return bSpaces; }
+    sal_Bool  WhiteSpace()				{ return bSpaces; }
     short GetErrors()				{ return nErrors; }
     short GetLine()					{ return nLine;   }
     short GetCol1()					{ return nCol1;   }
@@ -94,9 +94,9 @@ public:
     void  RestoreLine(void)			{ pLine = pSaveLine; }
     void  LockColumn();
     void  UnlockColumn();
-    BOOL  DoesColonFollow();
+    sal_Bool  DoesColonFollow();
 
-    BOOL NextSym();					// naechstes Symbol lesen
+    sal_Bool NextSym();					// naechstes Symbol lesen
     const String& GetSym()			{ return aSym;	}
     SbxDataType GetType()		   	{ return eScanType; }
     double	  GetDbl()				{ return nVal;	}
@@ -122,22 +122,22 @@ class BasicSimpleCharClass
     static LetterTable aLetterTable;
 
 public:
-    static BOOL isAlpha( sal_Unicode c, bool bCompatible )
+    static sal_Bool isAlpha( sal_Unicode c, bool bCompatible )
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') 
+        sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') 
                     || (bCompatible && aLetterTable.isLetter( c ));
         return bRet;
     }
 
-    static BOOL isDigit( sal_Unicode c )
+    static sal_Bool isDigit( sal_Unicode c )
     {
-        BOOL bRet = (c >= '0' && c <= '9');
+        sal_Bool bRet = (c >= '0' && c <= '9');
         return bRet;
     }
 
-    static BOOL isAlphaNumeric( sal_Unicode c, bool bCompatible )
+    static sal_Bool isAlphaNumeric( sal_Unicode c, bool bCompatible )
     {
-        BOOL bRet = isDigit( c ) || isAlpha( c, bCompatible );
+        sal_Bool bRet = isDigit( c ) || isAlpha( c, bCompatible );
         return bRet;
     }
 };
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 790d6249f1..33a6fa7589 100644..100755
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -44,6 +44,7 @@ namespace basic
 class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword
 {
     ::rtl::OUString maScriptLanguage;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxCodeNameAccess;
 
     // Methods to distinguish between deffirent library types
     virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName );
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 3dd28c4e35..80d563756e 100644..100755
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -46,7 +46,7 @@ class SbiStdObject : public SbxObject
 public:
     SbiStdObject( const String&, StarBASIC* );
     virtual SbxVariable* Find( const String&, SbxClassType );
-    virtual void SetModified( BOOL );
+    virtual void SetModified( sal_Bool );
 };
 
 #endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index a36fcfafb5..8e2bb5d2a8 100644..100755
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -59,12 +59,12 @@ class SbiStringPool {				// String-Pool
 public:
     SbiStringPool( SbiParser* );
    ~SbiStringPool();
-    USHORT GetSize() const { return aData.Count(); }
-    // AB 8.4.1999, Default wegen #64236 auf TRUE geaendert
-    // Wenn der Bug sauber behoben ist, wieder auf FALSE aendern.
-    short Add( const String&, BOOL=TRUE );
+    sal_uInt16 GetSize() const { return aData.Count(); }
+    // AB 8.4.1999, Default wegen #64236 auf sal_True geaendert
+    // Wenn der Bug sauber behoben ist, wieder auf sal_False aendern.
+    short Add( const String&, sal_Bool=sal_True );
     short Add( double, SbxDataType );
-    const String& Find( USHORT ) const;
+    const String& Find( sal_uInt16 ) const;
     SbiParser* GetParser() { return pParser; }
 };
 
@@ -81,8 +81,8 @@ protected:
     SbiSymPool* pParent;  			// uebergeordneter Symbol-Pool
     SbiParser*  pParser; 			// der Parser
     SbiSymScope eScope;				// Scope des Pools
-    USHORT	   nProcId;				// aktuelles ProcId fuer STATIC-Variable
-    USHORT	   nCur;				// Iterator
+    sal_uInt16	   nProcId;				// aktuelles ProcId fuer STATIC-Variable
+    sal_uInt16	   nCur;				// Iterator
 public:
     SbiSymPool( SbiStringPool&, SbiSymScope );
    ~SbiSymPool();
@@ -91,7 +91,7 @@ public:
 
     void   SetParent( SbiSymPool* p )	{ pParent = p;		}
     void   SetProcId( short n )			{ nProcId = n;		}
-    USHORT GetSize() const				{ return aData.Count(); }
+    sal_uInt16 GetSize() const				{ return aData.Count(); }
     SbiSymScope GetScope() const   		{ return eScope;	}
     void   SetScope( SbiSymScope s ) 	{ eScope = s;		}
     SbiParser* GetParser()				{ return pParser;	}
@@ -100,12 +100,12 @@ public:
     SbiProcDef* AddProc( const String& );// Prozedur hinzufuegen
     void Add( SbiSymDef* ); 			// Symbol uebernehmen
     SbiSymDef* Find( const String& ) const;// Variablenname
-    SbiSymDef* FindId( USHORT ) const;	// Variable per ID suchen
-    SbiSymDef* Get( USHORT ) const;		// Variable per Position suchen
+    SbiSymDef* FindId( sal_uInt16 ) const;	// Variable per ID suchen
+    SbiSymDef* Get( sal_uInt16 ) const;		// Variable per Position suchen
     SbiSymDef* First(), *Next();  		// Iteratoren
 
-    UINT32 Define( const String& );		// Label definieren
-    UINT32 Reference( const String& );  // Label referenzieren
+    sal_uInt32 Define( const String& );		// Label definieren
+    sal_uInt32 Reference( const String& );  // Label referenzieren
     void   CheckRefs();					// offene Referenzen suchen
 };
 
@@ -120,21 +120,21 @@ protected:
     SbiSymPool* pPool;				// Pool fuer Unterelemente
     short	   nLen;				// Stringlaenge bei STRING*n
     short	   nDims;				// Array-Dimensionen
-    USHORT	   nId;					// Symbol-Nummer
-    USHORT	   nTypeId;				// String-ID des Datentyps (Dim X AS Dytentyp)
-    USHORT	   nProcId;				// aktuelles ProcId fuer STATIC-Variable
-    USHORT	   nPos;				// Positions-Nummer
-    UINT32	   nChain;				// Backchain-Kette
-    BOOL	   bNew		: 1;		// TRUE: Dim As New...
-    BOOL	   bChained : 1;		// TRUE: Symbol ist in Code definiert
-    BOOL	   bByVal   : 1;		// TRUE: ByVal-Parameter
-    BOOL	   bOpt		: 1;		// TRUE: optionaler Parameter
-    BOOL	   bStatic  : 1;		// TRUE: STATIC-Variable
-    BOOL	   bAs		: 1;		// TRUE: Datentyp per AS XXX definiert
-    BOOL	   bGlobal	: 1;		// TRUE: Global-Variable
-    BOOL	   bParamArray : 1;		// TRUE: ParamArray parameter
-    BOOL	   bWithEvents : 1;		// TRUE: Declared WithEvents
-    USHORT	   nDefaultId;			// Symbol number of default value
+    sal_uInt16	   nId;					// Symbol-Nummer
+    sal_uInt16	   nTypeId;				// String-ID des Datentyps (Dim X AS Dytentyp)
+    sal_uInt16	   nProcId;				// aktuelles ProcId fuer STATIC-Variable
+    sal_uInt16	   nPos;				// Positions-Nummer
+    sal_uInt32	   nChain;				// Backchain-Kette
+    sal_Bool	   bNew		: 1;		// sal_True: Dim As New...
+    sal_Bool	   bChained : 1;		// sal_True: Symbol ist in Code definiert
+    sal_Bool	   bByVal   : 1;		// sal_True: ByVal-Parameter
+    sal_Bool	   bOpt		: 1;		// sal_True: optionaler Parameter
+    sal_Bool	   bStatic  : 1;		// sal_True: STATIC-Variable
+    sal_Bool	   bAs		: 1;		// sal_True: Datentyp per AS XXX definiert
+    sal_Bool	   bGlobal	: 1;		// sal_True: Global-Variable
+    sal_Bool	   bParamArray : 1;		// sal_True: ParamArray parameter
+    sal_Bool	   bWithEvents : 1;		// sal_True: Declared WithEvents
+    sal_uInt16	   nDefaultId;			// Symbol number of default value
     short      nFixedStringLength;  // String length in: Dim foo As String*Length
 public:
     SbiSymDef( const String& );
@@ -146,42 +146,42 @@ public:
     virtual void SetType( SbxDataType );
     const String& GetName();
     SbiSymScope GetScope() const;
-    USHORT	   GetProcId() const{ return nProcId;	}
-    UINT32	   GetAddr() const	{ return nChain;	}
-    USHORT	   GetId() const 	{ return nId;		}
-    USHORT	   GetTypeId() const{ return nTypeId;	}
-    void 	   SetTypeId( USHORT n ) { nTypeId = n; eType = SbxOBJECT; }
-    USHORT	   GetPos() const	{ return nPos;		}
+    sal_uInt16	   GetProcId() const{ return nProcId;	}
+    sal_uInt32	   GetAddr() const	{ return nChain;	}
+    sal_uInt16	   GetId() const 	{ return nId;		}
+    sal_uInt16	   GetTypeId() const{ return nTypeId;	}
+    void 	   SetTypeId( sal_uInt16 n ) { nTypeId = n; eType = SbxOBJECT; }
+    sal_uInt16	   GetPos() const	{ return nPos;		}
     void	   SetLen( short n ){ nLen = n;			}
     short	   GetLen() const	{ return nLen;		}
     void	   SetDims( short n ) { nDims = n;		}
     short	   GetDims() const  { return nDims;		}
-    BOOL	   IsDefined() const{ return bChained;	}
-    void	   SetOptional()   	{ bOpt = TRUE;		}
-    void	   SetParamArray() 	{ bParamArray = TRUE;		}
-    void	   SetWithEvents() 	{ bWithEvents = TRUE;		}
-    void	   SetByVal( BOOL bByVal_ = TRUE )
+    sal_Bool	   IsDefined() const{ return bChained;	}
+    void	   SetOptional()   	{ bOpt = sal_True;		}
+    void	   SetParamArray() 	{ bParamArray = sal_True;		}
+    void	   SetWithEvents() 	{ bWithEvents = sal_True;		}
+    void	   SetByVal( sal_Bool bByVal_ = sal_True )
                 { bByVal = bByVal_; }
-    void	   SetStatic( BOOL bAsStatic = TRUE )		{ bStatic = bAsStatic;	}
-    void	   SetNew()			{ bNew = TRUE;		}
-    void	   SetDefinedAs()	{ bAs = TRUE;		}
-    void	   SetGlobal(BOOL b){ bGlobal = b;	}
-    void 	   SetDefaultId( USHORT n ) { nDefaultId = n; }
-    USHORT 	   GetDefaultId( void ) { return nDefaultId; }
-    BOOL	   IsOptional() const{ return bOpt;		}
-    BOOL	   IsParamArray() const{ return bParamArray; }
-    BOOL	   IsWithEvents() const{ return bWithEvents; }
-    BOOL	   IsByVal() const	{ return bByVal;	}
-    BOOL	   IsStatic() const { return bStatic;	}
-    BOOL	   IsNew() const	{ return bNew;		}
-    BOOL	   IsDefinedAs() const { return bAs;	}
-    BOOL	   IsGlobal() const { return bGlobal;	}
+    void	   SetStatic( sal_Bool bAsStatic = sal_True )		{ bStatic = bAsStatic;	}
+    void	   SetNew()			{ bNew = sal_True;		}
+    void	   SetDefinedAs()	{ bAs = sal_True;		}
+    void	   SetGlobal(sal_Bool b){ bGlobal = b;	}
+    void 	   SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
+    sal_uInt16 	   GetDefaultId( void ) { return nDefaultId; }
+    sal_Bool	   IsOptional() const{ return bOpt;		}
+    sal_Bool	   IsParamArray() const{ return bParamArray; }
+    sal_Bool	   IsWithEvents() const{ return bWithEvents; }
+    sal_Bool	   IsByVal() const	{ return bByVal;	}
+    sal_Bool	   IsStatic() const { return bStatic;	}
+    sal_Bool	   IsNew() const	{ return bNew;		}
+    sal_Bool	   IsDefinedAs() const { return bAs;	}
+    sal_Bool	   IsGlobal() const { return bGlobal;	}
     short      GetFixedStringLength( void ) const { return nFixedStringLength; }
     void 	   SetFixedStringLength( short n ) { nFixedStringLength = n; }
 
     SbiSymPool& GetPool();
-    UINT32	   Define();		// Symbol in Code definieren
-    UINT32	   Reference();		// Symbol in Code referenzieren
+    sal_uInt32	   Define();		// Symbol in Code definieren
+    sal_uInt32	   Reference();		// Symbol in Code referenzieren
 
 private:
     SbiSymDef( const SbiSymDef& );
@@ -193,14 +193,14 @@ class SbiProcDef : public SbiSymDef {	// Prozedur-Definition (aus Basic):
     SbiSymPool aLabels;				// lokale Sprungziele
     String aLibName;				// LIB "name"
     String aAlias;					// ALIAS "name"
-    USHORT nLine1, nLine2;			// Zeilenbereich
+    sal_uInt16 nLine1, nLine2;			// Zeilenbereich
     PropertyMode mePropMode;		// Marks if this is a property procedure and which
     String maPropName;				// Property name if property procedure (!= proc name)
-    BOOL   bCdecl  : 1;				// TRUE: CDECL angegeben
-    BOOL   bPublic : 1;				// TRUE: proc ist PUBLIC
-    BOOL   mbProcDecl : 1;			// TRUE: instanciated by SbiParser::ProcDecl
+    sal_Bool   bCdecl  : 1;				// sal_True: CDECL angegeben
+    sal_Bool   bPublic : 1;				// sal_True: proc ist PUBLIC
+    sal_Bool   mbProcDecl : 1;			// sal_True: instanciated by SbiParser::ProcDecl
 public:
-    SbiProcDef( SbiParser*, const String&, BOOL bProcDecl=false );
+    SbiProcDef( SbiParser*, const String&, sal_Bool bProcDecl=false );
     virtual ~SbiProcDef();
     virtual SbiProcDef* GetProcDef();
     virtual void SetType( SbxDataType );
@@ -209,15 +209,15 @@ public:
     SbiSymPool& GetLocals() 	  	{ return GetPool();}
     String& GetLib() 	    		{ return aLibName; }
     String& GetAlias() 		  		{ return aAlias;   }
-    void SetPublic( BOOL b )		{ bPublic = b;	   }
-    BOOL IsPublic() const			{ return bPublic;  }
-    void SetCdecl( BOOL b = TRUE) 	{ bCdecl = b;      }
-    BOOL IsCdecl() const			{ return bCdecl;   }
-    BOOL IsUsedForProcDecl() const	{ return mbProcDecl; }
-    void SetLine1( USHORT n )		{ nLine1 = n;	   }
-    USHORT GetLine1() const			{ return nLine1;   }
-    void SetLine2( USHORT n )		{ nLine2 = n;	   }
-    USHORT GetLine2() const			{ return nLine2;   }
+    void SetPublic( sal_Bool b )		{ bPublic = b;	   }
+    sal_Bool IsPublic() const			{ return bPublic;  }
+    void SetCdecl( sal_Bool b = sal_True) 	{ bCdecl = b;      }
+    sal_Bool IsCdecl() const			{ return bCdecl;   }
+    sal_Bool IsUsedForProcDecl() const	{ return mbProcDecl; }
+    void SetLine1( sal_uInt16 n )		{ nLine1 = n;	   }
+    sal_uInt16 GetLine1() const			{ return nLine1;   }
+    void SetLine2( sal_uInt16 n )		{ nLine2 = n;	   }
+    sal_uInt16 GetLine2() const			{ return nLine2;   }
     PropertyMode getPropertyMode()	{ return mePropMode; }
     void setPropertyMode( PropertyMode ePropMode );
     const String& GetPropName()		{ return maPropName; }
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 333a20e10e..b329b37ddf 100644..100755
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -141,25 +141,25 @@ class SbiTokenizer : public SbiScanner {
 protected:
     SbiToken eCurTok;				// aktuelles Token
     SbiToken ePush;					// Pushback-Token
-    USHORT  nPLine, nPCol1, nPCol2; // Pushback-Location
-    BOOL bEof;						// TRUE bei Dateiende
-    BOOL bEos;						// TRUE bei Statement-Ende
-    BOOL bKeywords;					// TRUE, falls Keywords geparst werden
-    BOOL bAs;						// letztes Keyword war AS
-    BOOL bErrorIsSymbol;			// Handle Error token as Symbol, not keyword
+    sal_uInt16  nPLine, nPCol1, nPCol2; // Pushback-Location
+    sal_Bool bEof;						// sal_True bei Dateiende
+    sal_Bool bEos;						// sal_True bei Statement-Ende
+    sal_Bool bKeywords;					// sal_True, falls Keywords geparst werden
+    sal_Bool bAs;						// letztes Keyword war AS
+    sal_Bool bErrorIsSymbol;			// Handle Error token as Symbol, not keyword
 public:
     SbiTokenizer( const ::rtl::OUString&, StarBASIC* = NULL );
    ~SbiTokenizer();
 
-    inline BOOL IsEof()				{ return bEof; }
-    inline BOOL IsEos()				{ return bEos; }
+    inline sal_Bool IsEof()				{ return bEof; }
+    inline sal_Bool IsEos()				{ return bEos; }
 
     void  Push( SbiToken ); 			// Pushback eines Tokens
     const String& Symbol( SbiToken );// Rueckumwandlung
 
     SbiToken Peek();				 	// das naechste Token lesen
     SbiToken Next();				  	// Ein Token lesen
-    BOOL MayBeLabel( BOOL= FALSE );	// Kann es ein Label sein?
+    sal_Bool MayBeLabel( sal_Bool= sal_False );	// Kann es ein Label sein?
 
     void Hilite( SbTextPortions& );	// Syntax-Highlighting
 
@@ -168,14 +168,14 @@ public:
     void Error( SbError, const char* );
     void Error( SbError, String );
 
-    void Keywords( BOOL b ) { bKeywords = b; }
+    void Keywords( sal_Bool b ) { bKeywords = b; }
 
-    static BOOL IsEoln( SbiToken t )
-        { return BOOL( t == EOS || t == EOLN || t == REM ); }
-    static BOOL IsKwd( SbiToken t )
-        { return BOOL( t >= FIRSTKWD && t <= LASTKWD ); }
-    static BOOL IsExtra( SbiToken t )
-        { return BOOL( t >= FIRSTEXTRA ); }
+    static sal_Bool IsEoln( SbiToken t )
+        { return sal_Bool( t == EOS || t == EOLN || t == REM ); }
+    static sal_Bool IsKwd( SbiToken t )
+        { return sal_Bool( t >= FIRSTKWD && t <= LASTKWD ); }
+    static sal_Bool IsExtra( SbiToken t )
+        { return sal_Bool( t >= FIRSTEXTRA ); }
 };
 
 
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index affad8d499..c6deda08e5 100644..100755
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -55,8 +55,8 @@ BasicDLL::BasicDLL()
     ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
     pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale );
     pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
-    bDebugMode = FALSE;
-    bBreakEnabled = TRUE;
+    bDebugMode = sal_False;
+    bBreakEnabled = sal_True;
 }
 
 BasicDLL::~BasicDLL()
@@ -65,7 +65,7 @@ BasicDLL::~BasicDLL()
     delete pBasResMgr;
 }
 
-void BasicDLL::EnableBreak( BOOL bEnable )
+void BasicDLL::EnableBreak( sal_Bool bEnable )
 {
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -73,7 +73,7 @@ void BasicDLL::EnableBreak( BOOL bEnable )
         pThis->bBreakEnabled = bEnable;
 }
 
-void BasicDLL::SetDebugMode( BOOL bDebugMode )
+void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
 {
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -86,7 +86,7 @@ void BasicDLL::BasicBreak()
 {
     //bJustStopping: Wenn jemand wie wild x-mal STOP drueckt, aber das Basic
     // nicht schnell genug anhaelt, kommt die Box ggf. oefters...
-    static BOOL bJustStopping = FALSE;
+    static sal_Bool bJustStopping = sal_False;
 
     BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
     DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -94,11 +94,11 @@ void BasicDLL::BasicBreak()
     {
         if ( StarBASIC::IsRunning() && !bJustStopping && ( pThis->bBreakEnabled || pThis->bDebugMode ) )
         {
-            bJustStopping = TRUE;
+            bJustStopping = sal_True;
             StarBASIC::Stop();
             String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) );
             InfoBox( 0, aMessageStr ).Execute();
-            bJustStopping = FALSE;
+            bJustStopping = sal_False;
         }
     }
 }
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
new file mode 100755
index 0000000000..627f2cdaf7
--- /dev/null
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * 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 "precompiled_basic.hxx"
+#include "comenumwrapper.hxx"
+
+using namespace ::com::sun::star;
+
+::sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
+    throw ( uno::RuntimeException )
+{
+    sal_Bool bResult = sal_False;
+
+    try
+    {
+        if ( m_xInvocation.is() )
+        {
+            sal_Int32 nLength = 0;
+            bResult =
+                ( ( m_xInvocation->getValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "length" ) ) ) >>= nLength )
+                  && nLength > m_nCurInd );
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    return bResult;
+}
+
+uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
+    throw ( container::NoSuchElementException,
+            lang::WrappedTargetException,
+            uno::RuntimeException )
+{
+    try
+    {
+        if ( m_xInvocation.is() )
+        {
+            uno::Sequence< sal_Int16 > aNamedParamIndex;
+            uno::Sequence< uno::Any > aNamedParam;
+            uno::Sequence< uno::Any > aArgs( 1 );
+
+            aArgs[0] <<= m_nCurInd++;
+
+            return m_xInvocation->invoke( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "item" ) ),
+                                          aArgs,
+                                          aNamedParamIndex,
+                                          aNamedParam );
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    throw container::NoSuchElementException();
+}
+
+
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
new file mode 100755
index 0000000000..9ebe052b9d
--- /dev/null
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _COMENUMWRAPPER_HXX
+#define _COMENUMWRAPPER_HXX
+
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+
+class ComEnumerationWrapper : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > m_xInvocation;
+    sal_Int32 m_nCurInd;
+
+public:
+    ComEnumerationWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation >& xInvocation )
+    : m_xInvocation( xInvocation )
+    , m_nCurInd( 0 )
+    {
+    }
+
+    // container::XEnumeration
+    virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // _COMENUMWRAPPER_HXX
+
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 38f7fbee5c..9c048c15e2 100644..100755
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -92,12 +92,12 @@ SbiDdeControl::~SbiDdeControl()
     delete pConvList;
 }
 
-INT16 SbiDdeControl::GetFreeChannel()
+sal_Int16 SbiDdeControl::GetFreeChannel()
 {
-    INT16 nListSize = (INT16)pConvList->Count();
+    sal_Int16 nListSize = (sal_Int16)pConvList->Count();
     DdeConnection* pPtr = pConvList->First();
     pPtr = pConvList->Next(); // nullten eintrag ueberspringen
-    INT16 nChannel;
+    sal_Int16 nChannel;
     for( nChannel = 1; nChannel < nListSize; nChannel++ )
     {
         if( pPtr == DDE_FREECHANNEL )
@@ -110,7 +110,7 @@ INT16 SbiDdeControl::GetFreeChannel()
 }
 
 SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
-            INT16& rnHandle )
+            sal_Int16& rnHandle )
 {
     SbError nErr;
     DdeConnection* pConv = new DdeConnection( rService, rTopic );
@@ -122,26 +122,26 @@ SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
     }
     else
     {
-        INT16 nChannel = GetFreeChannel();
-        pConvList->Replace( pConv, (ULONG)nChannel );
+        sal_Int16 nChannel = GetFreeChannel();
+        pConvList->Replace( pConv, (sal_uIntPtr)nChannel );
         rnHandle = nChannel;
     }
     return 0;
 }
 
-SbError SbiDdeControl::Terminate( INT16 nChannel )
+SbError SbiDdeControl::Terminate( sal_Int16 nChannel )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
-    pConvList->Replace( DDE_FREECHANNEL, (ULONG)nChannel );
+    pConvList->Replace( DDE_FREECHANNEL, (sal_uIntPtr)nChannel );
     delete pConv;
     return 0L;
 }
 
 SbError SbiDdeControl::TerminateAll()
 {
-    INT16 nChannel = (INT16)pConvList->Count();
+    sal_Int16 nChannel = (sal_Int16)pConvList->Count();
     while( nChannel )
     {
         nChannel--;
@@ -155,9 +155,9 @@ SbError SbiDdeControl::TerminateAll()
     return 0;
 }
 
-SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rResult )
+SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& rResult )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
 
@@ -168,9 +168,9 @@ SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rRe
     return GetLastErr( pConv );
 }
 
-SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
+SbError SbiDdeControl::Execute( sal_Int16 nChannel, const String& rCommand )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
     DdeExecute aRequest( *pConv, rCommand, 30000 );
@@ -178,9 +178,9 @@ SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
     return GetLastErr( pConv );
 }
 
-SbError SbiDdeControl::Poke( INT16 nChannel, const String& rItem, const String& rData )
+SbError SbiDdeControl::Poke( sal_Int16 nChannel, const String& rItem, const String& rData )
 {
-    DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+    DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
     if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
         return SbERR_DDE_NO_CHANNEL;
     DdePoke aRequest( *pConv, rItem, DdeData(rData), 30000 );
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index e8dd108854..4212479817 100644..100755
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -42,7 +42,7 @@ class SbiDdeControl
 private:
     DECL_LINK( Data, DdeData* );
     SbError GetLastErr( DdeConnection* );
-    INT16 GetFreeChannel();
+    sal_Int16 GetFreeChannel();
     DdeConnections*	pConvList;
     String aData;
 
@@ -52,12 +52,12 @@ public:
     ~SbiDdeControl();
 
     SbError Initiate( const String& rService, const String& rTopic,
-                     INT16& rnHandle );
-    SbError Terminate( INT16 nChannel );
+                     sal_Int16& rnHandle );
+    SbError Terminate( sal_Int16 nChannel );
     SbError TerminateAll();
-    SbError Request( INT16 nChannel, const String& rItem, String& rResult );
-    SbError Execute( INT16 nChannel, const String& rCommand );
-    SbError Poke( INT16 nChannel, const String& rItem, const String& rData );
+    SbError Request( sal_Int16 nChannel, const String& rItem, String& rResult );
+    SbError Execute( sal_Int16 nChannel, const String& rCommand );
+    SbError Poke( sal_Int16 nChannel, const String& rItem, const String& rData );
 };
 
 #endif
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index db32b646b6..db32b646b6 100644..100755
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 87be0587bb..1a5845e10e 100644..100755
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -158,7 +158,7 @@ std::size_t alignment(SbxVariable * variable) {
                 std::size_t n = 1;
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     n = std::max(n, alignment(props->Get(i)));
                 }
                 return n;
@@ -173,9 +173,9 @@ std::size_t alignment(SbxVariable * variable) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
+        std::vector< sal_Int32 > low(dims);
         for (int i = 0; i < dims; ++i) {
-            INT32 up;
+            sal_Int32 up;
             arr->GetDim32(i + 1, low[i], up);
         }
         return alignment(arr->Get32(&low[0]));
@@ -209,7 +209,7 @@ SbError marshalStruct(
     OSL_ASSERT(variable != 0);
     SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
         GetProperties();
-    for (USHORT i = 0; i < props->Count(); ++i) {
+    for (sal_uInt16 i = 0; i < props->Count(); ++i) {
         SbError e = marshal(false, props->Get(i), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
             return e;
@@ -225,12 +225,12 @@ SbError marshalArray(
     OSL_ASSERT(variable != 0);
     SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
     int dims = arr->GetDims();
-    std::vector< INT32 > low(dims);
-    std::vector< INT32 > up(dims);
+    std::vector< sal_Int32 > low(dims);
+    std::vector< sal_Int32 > up(dims);
     for (int i = 0; i < dims; ++i) {
         arr->GetDim32(i + 1, low[i], up[i]);
     }
-    for (std::vector< INT32 > idx = low;;) {
+    for (std::vector< sal_Int32 > idx = low;;) {
         SbError e = marshal(
             false, arr->Get32(&idx[0]), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
@@ -395,7 +395,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
                         alignment(variable)));
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     data = unmarshal(props->Get(i), data);
                 }
                 break;
@@ -413,12 +413,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
-        std::vector< INT32 > up(dims);
+        std::vector< sal_Int32 > low(dims);
+        std::vector< sal_Int32 > up(dims);
         for (int i = 0; i < dims; ++i) {
             arr->GetDim32(i + 1, low[i], up[i]);
         }
-        for (std::vector< INT32 > idx = low;;) {
+        for (std::vector< sal_Int32 > idx = low;;) {
             data = unmarshal(arr->Get32(&idx[0]), data);
             int i = dims - 1;
             while (idx[i] == up[i]) {
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 64419c9e3b..b2f48bd0ab 100644..100755
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -165,7 +165,7 @@ std::size_t alignment(SbxVariable * variable) {
                 std::size_t n = 1;
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     n = std::max(n, alignment(props->Get(i)));
                 }
                 return n;
@@ -180,9 +180,9 @@ std::size_t alignment(SbxVariable * variable) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
+        std::vector< sal_Int32 > low(dims);
         for (int i = 0; i < dims; ++i) {
-            INT32 up;
+            sal_Int32 up;
             arr->GetDim32(i + 1, low[i], up);
         }
         return alignment(arr->Get32(&low[0]));
@@ -203,7 +203,8 @@ SbError marshalString(
         return e;
     }
     std::vector< char > * blob = data.newBlob();
-    blob->insert(blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1 );
+    blob->insert(
+        blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1);
     *buffer = address(*blob);
     data.unmarshalStrings.push_back(StringData(variable, *buffer, special));
     return ERRCODE_NONE;
@@ -216,7 +217,7 @@ SbError marshalStruct(
     OSL_ASSERT(variable != 0);
     SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
         GetProperties();
-    for (USHORT i = 0; i < props->Count(); ++i) {
+    for (sal_uInt16 i = 0; i < props->Count(); ++i) {
         SbError e = marshal(false, props->Get(i), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
             return e;
@@ -232,12 +233,12 @@ SbError marshalArray(
     OSL_ASSERT(variable != 0);
     SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
     int dims = arr->GetDims();
-    std::vector< INT32 > low(dims);
-    std::vector< INT32 > up(dims);
+    std::vector< sal_Int32 > low(dims);
+    std::vector< sal_Int32 > up(dims);
     for (int i = 0; i < dims; ++i) {
         arr->GetDim32(i + 1, low[i], up[i]);
     }
-    for (std::vector< INT32 > idx = low;;) {
+    for (std::vector< sal_Int32 > idx = low;;) {
         SbError e = marshal(
             false, arr->Get32(&idx[0]), false, blob, offset, data);
         if (e != ERRCODE_NONE) {
@@ -402,7 +403,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
                         alignment(variable)));
                 SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
                     GetProperties();
-                for (USHORT i = 0; i < props->Count(); ++i) {
+                for (sal_uInt16 i = 0; i < props->Count(); ++i) {
                     data = unmarshal(props->Get(i), data);
                 }
                 break;
@@ -420,12 +421,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
     } else {
         SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
         int dims = arr->GetDims();
-        std::vector< INT32 > low(dims);
-        std::vector< INT32 > up(dims);
+        std::vector< sal_Int32 > low(dims);
+        std::vector< sal_Int32 > up(dims);
         for (int i = 0; i < dims; ++i) {
             arr->GetDim32(i + 1, low[i], up[i]);
         }
-        for (std::vector< INT32 > idx = low;;) {
+        for (std::vector< sal_Int32 > idx = low;;) {
             data = unmarshal(arr->Get32(&idx[0]), data);
             int i = dims - 1;
             while (idx[i] == up[i]) {
@@ -485,7 +486,7 @@ SbError call(
             RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
         (proc.name ==
          rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
-    for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+    for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         SbError e = marshal(
             true, arguments->Get(i), special && i == 2, stack, stack.size(),
             data);
@@ -547,7 +548,7 @@ SbError call(
         OSL_ASSERT(false);
         break;
     }
-    for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+    for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
         arguments->Get(i)->ResetFlag(SBX_REFERENCE);
             //TODO: skipped for errors?!?
     }
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 1507ffe7f9..1507ffe7f9 100644..100755
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 389e5835d1..ae4562181e 100644..100755
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -161,14 +161,14 @@ RTLFUNC(InputBox)
     (void)pBasic;
     (void)bWrite;
     
-    ULONG nArgCount = rPar.Count();
+    sal_uIntPtr nArgCount = rPar.Count();
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
         String aTitle;
         String aDefault;
-        INT32 nX = -1, nY = -1;  // zentrieren
+        sal_Int32 nX = -1, nY = -1;  // zentrieren
         const String& rPrompt = rPar.Get(1)->GetString();
         if ( nArgCount > 2 && !rPar.Get(2)->IsErr() )
             aTitle = rPar.Get(2)->GetString();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e94c9a69b8..a295abc8ee 100644..100755
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -215,13 +215,13 @@ void SbiStream::MapError()
 
 
 // Hack for #83750
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
 
-BOOL needSecurityRestrictions( void )
+sal_Bool needSecurityRestrictions( void )
 {
 #ifdef _USE_UNO
-    static BOOL bNeedInit = TRUE;
-    static BOOL bRetVal = TRUE;
+    static sal_Bool bNeedInit = sal_True;
+    static sal_Bool bRetVal = sal_True;
 
     if( bNeedInit )
     {
@@ -230,11 +230,11 @@ BOOL needSecurityRestrictions( void )
         if( runsInSetup() )
         {
             // Setup is not critical
-            bRetVal = FALSE;
+            bRetVal = sal_False;
             return bRetVal;
         }
 
-        bNeedInit = FALSE;
+        bNeedInit = sal_False;
 
         // Get system user to compare to portal user
         oslSecurity aSecurity = osl_getCurrentSecurity();
@@ -243,12 +243,12 @@ BOOL needSecurityRestrictions( void )
         if( !bRet )
         {
             // No valid security! -> Secure mode!
-            return TRUE;
+            return sal_True;
         }
 
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
-            return TRUE;
+            return sal_True;
         Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
             ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )) ), UNO_QUERY );
 
@@ -263,13 +263,13 @@ BOOL needSecurityRestrictions( void )
         if( nBridgeCount == 0 )
         {
             // No bridges -> local
-            bRetVal = FALSE;
+            bRetVal = sal_False;
             return bRetVal;
         }
 
         // Iterate through all bridges to find (portal) user property
         const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray();
-        bRetVal = FALSE;	// Now only TRUE if user different from portal user is found
+        bRetVal = sal_False;	// Now only sal_True if user different from portal user is found
         sal_Int32 i;
         for( i = 0 ; i < nBridgeCount ; i++ )
         {
@@ -287,7 +287,7 @@ BOOL needSecurityRestrictions( void )
                 else
                 {
                     // Different user -> Secure mode!
-                    bRetVal = TRUE;
+                    bRetVal = sal_True;
                     break;
                 }
             }
@@ -297,27 +297,27 @@ BOOL needSecurityRestrictions( void )
 
     return bRetVal;
 #else
-    return FALSE;
+    return sal_False;
 #endif
 }
 
-// Returns TRUE if UNO is available, otherwise the old file
+// Returns sal_True if UNO is available, otherwise the old file
 // system implementation has to be used
 // #89378 New semantic: Don't just ask for UNO but for UCB
-BOOL hasUno( void )
+sal_Bool hasUno( void )
 {
 #ifdef _USE_UNO
-    static BOOL bNeedInit = TRUE;
-    static BOOL bRetVal = TRUE;
+    static sal_Bool bNeedInit = sal_True;
+    static sal_Bool bRetVal = sal_True;
 
     if( bNeedInit )
     {
-        bNeedInit = FALSE;
+        bNeedInit = sal_False;
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
         if( !xSMgr.is() )
         {
             // No service manager at all
-            bRetVal = FALSE;
+            bRetVal = sal_False;
         }
         else
         {
@@ -327,13 +327,13 @@ BOOL hasUno( void )
             if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///" )) ).is() ) )
             {
                 // No UCB
-                bRetVal = FALSE;
+                bRetVal = sal_False;
             }
         }
     }
     return bRetVal;
 #else
-    return FALSE;
+    return sal_False;
 #endif
 }
 
@@ -349,11 +349,11 @@ class OslStream : public SvStream
 public:
                     OslStream( const String& rName, short nStrmMode );
                     ~OslStream();
-    virtual ULONG	GetData( void* pData, ULONG nSize );
-    virtual ULONG	PutData( const void* pData, ULONG nSize );
-    virtual ULONG	SeekPos( ULONG nPos );
+    virtual sal_uIntPtr	GetData( void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr	PutData( const void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr	SeekPos( sal_uIntPtr nPos );
     virtual void	FlushData();
-    virtual void	SetSize( ULONG nSize );
+    virtual void	SetSize( sal_uIntPtr nSize );
 };
 
 OslStream::OslStream( const String& rName, short nStrmMode )
@@ -394,21 +394,21 @@ OslStream::~OslStream()
     maFile.close();
 }
 
-ULONG OslStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr OslStream::GetData( void* pData, sal_uIntPtr nSize )
 {
     sal_uInt64 nBytesRead = nSize;
     maFile.read( pData, nBytesRead, nBytesRead );
-    return (ULONG)nBytesRead;
+    return (sal_uIntPtr)nBytesRead;
 }
 
-ULONG OslStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize )
 {
     sal_uInt64 nBytesWritten;
     maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
-    return (ULONG)nBytesWritten;
+    return (sal_uIntPtr)nBytesWritten;
 }
 
-ULONG OslStream::SeekPos( ULONG nPos )
+sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
 {
     if( nPos == STREAM_SEEK_TO_END )
         maFile.setPos( Pos_End, 0 );
@@ -416,14 +416,14 @@ ULONG OslStream::SeekPos( ULONG nPos )
         maFile.setPos( Pos_Absolut, (sal_uInt64)nPos );
     sal_uInt64 nRealPos(0);
     maFile.getPos( nRealPos );
-    return sal::static_int_cast<ULONG>(nRealPos);
+    return sal::static_int_cast<sal_uIntPtr>(nRealPos);
 }
 
 void OslStream::FlushData()
 {
 }
 
-void OslStream::SetSize( ULONG nSize )
+void OslStream::SetSize( sal_uIntPtr nSize )
 {
     maFile.setSize( (sal_uInt64)nSize );
 }
@@ -444,17 +444,17 @@ public:
                     UCBStream( Reference< XOutputStream > & xOS );
                     UCBStream( Reference< XStream > & xS );
                     ~UCBStream();
-    virtual ULONG	GetData( void* pData, ULONG nSize );
-    virtual ULONG	PutData( const void* pData, ULONG nSize );
-    virtual ULONG	SeekPos( ULONG nPos );
+    virtual sal_uIntPtr	GetData( void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr	PutData( const void* pData, sal_uIntPtr nSize );
+    virtual sal_uIntPtr	SeekPos( sal_uIntPtr nPos );
     virtual void	FlushData();
-    virtual void	SetSize( ULONG nSize );
+    virtual void	SetSize( sal_uIntPtr nSize );
 };
 
 /*
-ULONG UCBErrorToSvStramError( ucb::IOErrorCode nError )
+sal_uIntPtr UCBErrorToSvStramError( ucb::IOErrorCode nError )
 {
-    ULONG eReturn = ERRCODE_IO_GENERAL;
+    sal_uIntPtr eReturn = ERRCODE_IO_GENERAL;
     switch( nError )
     {
         case ucb::IOErrorCode_ABORT:				eReturn = SVSTREAM_GENERALERROR; break;
@@ -525,7 +525,7 @@ UCBStream::~UCBStream()
     }
 }
 
-ULONG	UCBStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr	UCBStream::GetData( void* pData, sal_uIntPtr nSize )
 {
     try
     {
@@ -554,7 +554,7 @@ ULONG	UCBStream::GetData( void* pData, ULONG nSize )
     return 0;
 }
 
-ULONG	UCBStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr	UCBStream::PutData( const void* pData, sal_uIntPtr nSize )
 {
     try
     {
@@ -581,13 +581,13 @@ ULONG	UCBStream::PutData( const void* pData, ULONG nSize )
     return 0;
 }
 
-ULONG	UCBStream::SeekPos( ULONG nPos )
+sal_uIntPtr	UCBStream::SeekPos( sal_uIntPtr nPos )
 {
     try
     {
         if( xSeek.is() )
         {
-            ULONG nLen = sal::static_int_cast<ULONG>( xSeek->getLength() );
+            sal_uIntPtr nLen = sal::static_int_cast<sal_uIntPtr>( xSeek->getLength() );
             if( nPos > nLen )
                 nPos = nLen;
             xSeek->seek( nPos );
@@ -621,7 +621,7 @@ void	UCBStream::FlushData()
     }
 }
 
-void	UCBStream::SetSize( ULONG nSize )
+void	UCBStream::SetSize( sal_uIntPtr nSize )
 {
     (void)nSize;
 
@@ -728,7 +728,7 @@ SbError SbiStream::Close()
     return nError;
 }
 
-SbError SbiStream::Read( ByteString& rBuf, USHORT n, bool bForceReadingPerByte )
+SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerByte )
 {
     nExpandOnWriteTo = 0;
     if( !bForceReadingPerByte && IsText() )
@@ -767,10 +767,10 @@ void SbiStream::ExpandFile()
 {
     if ( nExpandOnWriteTo )
     {
-        ULONG nCur = pStrm->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nCur = pStrm->Seek(STREAM_SEEK_TO_END);
         if( nCur < nExpandOnWriteTo )
         {
-            ULONG nDiff = nExpandOnWriteTo - nCur;
+            sal_uIntPtr nDiff = nExpandOnWriteTo - nCur;
             char c = 0;
             while( nDiff-- )
                 *pStrm << c;
@@ -783,7 +783,7 @@ void SbiStream::ExpandFile()
     }
 }
 
-SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
+SbError SbiStream::Write( const ByteString& rBuf, sal_uInt16 n )
 {
     ExpandFile();
     if( IsAppend() )
@@ -794,7 +794,7 @@ SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
         aLine += rBuf;
         // Raus damit, wenn das Ende ein LF ist, aber CRLF vorher
         // strippen, da der SvStrm ein CRLF anfuegt!
-        USHORT nLineLen = aLine.Len();
+        sal_uInt16 nLineLen = aLine.Len();
         if( nLineLen && aLine.GetBuffer()[ --nLineLen ] == 0x0A )
         {
             aLine.Erase( nLineLen );
@@ -1013,8 +1013,8 @@ void SbiIoSystem::ReadCon( ByteString& rIn )
 void SbiIoSystem::WriteCon( const ByteString& rText )
 {
     aOut += rText;
-    USHORT n1 = aOut.Search( '\n' );
-    USHORT n2 = aOut.Search( '\r' );
+    sal_uInt16 n1 = aOut.Search( '\n' );
+    sal_uInt16 n2 = aOut.Search( '\r' );
     if( n1 != STRING_NOTFOUND || n2 != STRING_NOTFOUND )
     {
         if( n1 == STRING_NOTFOUND ) n1 = n2;
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index 64d9a6ff44..29969416ca 100644..100755
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS = TRUE
 
 SLOFILES=	\
     $(SLO)$/basrdll.obj	\
+    $(SLO)$/comenumwrapper.obj	\
     $(SLO)$/inputbox.obj\
     $(SLO)$/runtime.obj	\
     $(SLO)$/step0.obj	\
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 039c5d6eb8..ead771bc28 100644..100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -36,7 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <vcl/msgbox.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>
@@ -105,15 +105,10 @@ using namespace com::sun::star::script;
 
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
 #include <direct.h>   // _getdcwd get current work directory, _chdrive
 #endif
 
-#ifdef WIN
-#include <dos.h>	  // _dos_getfileattr
-#include <errno.h>
-#endif
-
 #ifdef UNX
 #include <errno.h>
 #include <unistd.h>
@@ -164,7 +159,7 @@ static CharClass& GetCharClass( void )
     return aCharClass;
 }
 
-static inline BOOL isFolder( FileStatus::Type aType )
+static inline sal_Bool isFolder( FileStatus::Type aType )
 {
     return ( aType == FileStatus::Directory || aType == FileStatus::Volume );
 }
@@ -230,8 +225,8 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
 
 
 
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 // CreateObject( class )
@@ -264,7 +259,7 @@ RTLFUNC(Error)
     {
         String aErrorMsg;
         SbError nErr = 0L;
-        INT32 nCode = 0;
+        sal_Int32 nCode = 0;
         if( rPar.Count() == 1 )
         {
             nErr = StarBASIC::GetErrBasic();
@@ -276,7 +271,7 @@ RTLFUNC(Error)
             if( nCode > 65535L )
                 StarBASIC::Error( SbERR_CONVERSION );
             else
-                nErr = StarBASIC::GetSfxFromVBError( (USHORT)nCode );
+                nErr = StarBASIC::GetSfxFromVBError( (sal_uInt16)nCode );
         }
 
         bool bVBA = SbiRuntime::isVBAEnabled();
@@ -425,7 +420,7 @@ RTLFUNC(CurDir)
     // zu ermitteln, dass eine virtuelle URL geliefert werden koennte.
 
 //	rPar.Get(0)->PutEmpty();
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
     int nCurDir = 0;  // Current dir // JSM
     if ( rPar.Count() == 2 )
     {
@@ -462,7 +457,7 @@ RTLFUNC(CurDir)
 
     int nSize = _PATH_INCR;
     char* pMem;
-    while( TRUE )
+    while( sal_True )
       {
         pMem = new char[nSize];
         if( !pMem )
@@ -499,17 +494,17 @@ RTLFUNC(ChDir) // JSM
     {
 #ifdef _ENABLE_CUR_DIR
         String aPath = rPar.Get(1)->GetString();
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
 #ifdef WNT
         // #55997 Laut MI hilft es bei File-URLs einen DirEntry zwischenzuschalten
         // #40996 Harmoniert bei Verwendung der WIN32-Funktion nicht mit getdir
         DirEntry aEntry( aPath );
         ByteString aFullPath( aEntry.GetFull(), gsl_getSystemTextEncoding() );
         if( chdir( aFullPath.GetBuffer()) )
-            bError = TRUE;
+            bError = sal_True;
 #else
         if (!DirEntry(aPath).SetCWD())
-            bError = TRUE;
+            bError = sal_True;
 #endif
         if( bError )
             StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -532,7 +527,7 @@ RTLFUNC(ChDrive) // JSM
 #ifndef UNX
         String aPar1 = rPar.Get(1)->GetString();
 
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
         if (aPar1.Len() > 0)
         {
             int nCurDrive = (int)aPar1.GetBuffer()[0]; ;
@@ -727,7 +722,7 @@ RTLFUNC(MkDir) // JSM
                             SbxArrayRef pPar = new SbxArray;
                             SbxVariableRef pVar = new SbxVariable();
                             pPar->Put( pVar, 0 );
-                            SbRtl_CurDir( pBasic, *pPar, FALSE );
+                            SbRtl_CurDir( pBasic, *pPar, sal_False );
                             String aCurPath = pPar->Get(0)->GetString();
 
                             File::getFileURLFromSystemPath( aCurPath, sCurDirURL );
@@ -920,7 +915,7 @@ RTLFUNC(FileLen)
     {
         SbxVariableRef pArg = rPar.Get( 1 );
         String aStr( pArg->GetString() );
-        INT32 nLen = 0;
+        sal_Int32 nLen = 0;
         // <-- UCB
         if( hasUno() )
         {
@@ -948,7 +943,7 @@ RTLFUNC(FileLen)
             DirectoryItem::get( getFullPathUNC( aStr ), aItem );
             FileStatus aFileStatus( FileStatusMask_FileSize );
             aItem.getFileStatus( aFileStatus );
-            nLen = (INT32)aFileStatus.getFileSize();
+            nLen = (sal_Int32)aFileStatus.getFileSize();
 #endif
         }
         rPar.Get(0)->PutLong( (long)nLen );
@@ -1002,23 +997,23 @@ RTLFUNC(InStr)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        USHORT nStartPos = 1;
+        sal_uInt16 nStartPos = 1;
 
-        USHORT nFirstStringPos = 1;
+        sal_uInt16 nFirstStringPos = 1;
         if ( nArgCount >= 3 )
         {
-            INT32 lStartPos = rPar.Get(1)->GetLong();
+            sal_Int32 lStartPos = rPar.Get(1)->GetLong();
             if( lStartPos <= 0 || lStartPos > 0xffff )
             {
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
                 lStartPos = 1;
             }
-            nStartPos = (USHORT)lStartPos;
+            nStartPos = (sal_uInt16)lStartPos;
             nFirstStringPos++;
         }
 
@@ -1028,7 +1023,7 @@ RTLFUNC(InStr)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -1037,7 +1032,7 @@ RTLFUNC(InStr)
         if ( nArgCount == 4 )
             bTextMode = rPar.Get(4)->GetInteger();
 
-        USHORT nPos;
+        sal_uInt16 nPos;
         const String& rToken = rPar.Get(nFirstStringPos+1)->GetString();
 
         // #97545 Always find empty string
@@ -1084,7 +1079,7 @@ RTLFUNC(InStrRev)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1092,7 +1087,7 @@ RTLFUNC(InStrRev)
         String aStr1 = rPar.Get(1)->GetString();
         String aToken = rPar.Get(2)->GetString();
 
-        INT32 lStartPos = -1;
+        sal_Int32 lStartPos = -1;
         if ( nArgCount >= 3 )
         {
             lStartPos = rPar.Get(3)->GetLong();
@@ -1109,7 +1104,7 @@ RTLFUNC(InStrRev)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -1118,13 +1113,13 @@ RTLFUNC(InStrRev)
         if ( nArgCount == 4 )
             bTextMode = rPar.Get(4)->GetInteger();
 
-        USHORT nStrLen = aStr1.Len();
-        USHORT nStartPos = lStartPos == -1 ? nStrLen : (USHORT)lStartPos;
+        sal_uInt16 nStrLen = aStr1.Len();
+        sal_uInt16 nStartPos = lStartPos == -1 ? nStrLen : (sal_uInt16)lStartPos;
 
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         if( nStartPos <= nStrLen )
         {
-            USHORT nTokenLen = aToken.Len();
+            sal_uInt16 nTokenLen = aToken.Len();
             if( !nTokenLen )
             {
                 // Always find empty string
@@ -1140,7 +1135,7 @@ RTLFUNC(InStrRev)
                     if( nRet == -1 )
                         nPos = 0;
                     else
-                        nPos = (USHORT)nRet + 1;
+                        nPos = (sal_uInt16)nRet + 1;
                 }
                 else
                 {
@@ -1154,7 +1149,7 @@ RTLFUNC(InStrRev)
                     if( nRet == -1 )
                         nPos = 0;
                     else
-                        nPos = (USHORT)nRet + 1;
+                        nPos = (sal_uInt16)nRet + 1;
                 }
             }
         }
@@ -1238,7 +1233,7 @@ RTLFUNC(Left)
     else
     {
         String aStr( rPar.Get(1)->GetString() );
-        INT32 lResultLen = rPar.Get(2)->GetLong();
+        sal_Int32 lResultLen = rPar.Get(2)->GetLong();
         if( lResultLen > 0xffff )
         {
             lResultLen = 0xffff;
@@ -1248,7 +1243,7 @@ RTLFUNC(Left)
             lResultLen = 0;
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         }
-        aStr.Erase( (USHORT)lResultLen );
+        aStr.Erase( (sal_uInt16)lResultLen );
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1297,7 +1292,7 @@ RTLFUNC(Mid)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1307,23 +1302,23 @@ RTLFUNC(Mid)
         // Anders als im Original kann in dieser Variante der 3. Parameter
         // nLength nicht weggelassen werden. Ist ueber bWrite schon vorgesehen.
         if( nArgCount == 4 )
-            bWrite = TRUE;
+            bWrite = sal_True;
 
         String aArgStr = rPar.Get(1)->GetString();
-        USHORT nStartPos = (USHORT)(rPar.Get(2)->GetLong() );
+        sal_uInt16 nStartPos = (sal_uInt16)(rPar.Get(2)->GetLong() );
         if ( nStartPos == 0 )
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         else
         {
             nStartPos--;
-            USHORT nLen = 0xffff;
+            sal_uInt16 nLen = 0xffff;
             bool bWriteNoLenParam = false;
             if ( nArgCount == 3 || bWrite )
             {
-                INT32 n = rPar.Get(3)->GetLong();
+                sal_Int32 n = rPar.Get(3)->GetLong();
                 if( bWrite && n == -1 )
                     bWriteNoLenParam = true;
-                nLen = (USHORT)n;
+                nLen = (sal_uInt16)n;
             }
             String aResultStr;
             if ( bWrite )
@@ -1332,7 +1327,7 @@ RTLFUNC(Mid)
                 bool bCompatibility = ( pInst && pInst->IsCompatibility() );
                 if( bCompatibility )
                 {
-                    USHORT nArgLen = aArgStr.Len();
+                    sal_uInt16 nArgLen = aArgStr.Len();
                     if( nStartPos + 1 > nArgLen )
                     {
                         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1340,8 +1335,8 @@ RTLFUNC(Mid)
                     }
 
                     String aReplaceStr = rPar.Get(4)->GetString();
-                    USHORT nReplaceStrLen = aReplaceStr.Len();
-                    USHORT nReplaceLen;
+                    sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
+                    sal_uInt16 nReplaceLen;
                     if( bWriteNoLenParam )
                     {
                         nReplaceLen = nReplaceStrLen;
@@ -1353,12 +1348,12 @@ RTLFUNC(Mid)
                             nReplaceLen = nReplaceStrLen;
                     }
 
-                    USHORT nReplaceEndPos = nStartPos + nReplaceLen;
+                    sal_uInt16 nReplaceEndPos = nStartPos + nReplaceLen;
                     if( nReplaceEndPos > nArgLen )
                         nReplaceLen -= (nReplaceEndPos - nArgLen);
 
                     aResultStr = aArgStr;
-                    USHORT nErase = nReplaceLen;
+                    sal_uInt16 nErase = nReplaceLen;
                     aResultStr.Erase( nStartPos, nErase );
                     aResultStr.Insert( aReplaceStr, 0, nReplaceLen, nStartPos );
                 }
@@ -1406,7 +1401,7 @@ RTLFUNC(Replace)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if ( nArgCount < 3 || nArgCount > 6 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1415,7 +1410,7 @@ RTLFUNC(Replace)
         String aFindStr = rPar.Get(2)->GetString();
         String aReplaceStr = rPar.Get(3)->GetString();
 
-        INT32 lStartPos = 1;
+        sal_Int32 lStartPos = 1;
         if ( nArgCount >= 4 )
         {
             if( rPar.Get(4)->GetType() != SbxEMPTY )
@@ -1427,7 +1422,7 @@ RTLFUNC(Replace)
             }
         }
 
-        INT32 lCount = -1;
+        sal_Int32 lCount = -1;
         if( nArgCount >=5 )
         {
             if( rPar.Get(5)->GetType() != SbxEMPTY )
@@ -1445,7 +1440,7 @@ RTLFUNC(Replace)
         if( bCompatibility )
         {
             SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+            bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
         }
         else
         {
@@ -1454,14 +1449,14 @@ RTLFUNC(Replace)
         if ( nArgCount == 6 )
             bTextMode = rPar.Get(6)->GetInteger();
 
-        USHORT nExpStrLen = aExpStr.Len();
-        USHORT nFindStrLen = aFindStr.Len();
-        USHORT nReplaceStrLen = aReplaceStr.Len();
+        sal_uInt16 nExpStrLen = aExpStr.Len();
+        sal_uInt16 nFindStrLen = aFindStr.Len();
+        sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
 
         if( lStartPos <= nExpStrLen )
         {
-            USHORT nPos = static_cast<USHORT>( lStartPos - 1 );
-            USHORT nCounts = 0;
+            sal_uInt16 nPos = static_cast<sal_uInt16>( lStartPos - 1 );
+            sal_uInt16 nCounts = 0;
             while( lCount == -1 || lCount > nCounts )
             {
                 String aSrcStr( aExpStr );
@@ -1483,7 +1478,7 @@ RTLFUNC(Replace)
                 }
             }
         }
-        rPar.Get(0)->PutString( aExpStr.Copy( static_cast<USHORT>(lStartPos - 1) )  );
+        rPar.Get(0)->PutString( aExpStr.Copy( static_cast<sal_uInt16>(lStartPos - 1) )  );
     }
 }
 
@@ -1497,7 +1492,7 @@ RTLFUNC(Right)
     else
     {
         const String& rStr = rPar.Get(1)->GetString();
-        INT32 lResultLen = rPar.Get(2)->GetLong();
+        sal_Int32 lResultLen = rPar.Get(2)->GetLong();
         if( lResultLen > 0xffff )
         {
             lResultLen = 0xffff;
@@ -1507,8 +1502,8 @@ RTLFUNC(Right)
             lResultLen = 0;
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
         }
-        USHORT nResultLen = (USHORT)lResultLen;
-        USHORT nStrLen = rStr.Len();
+        sal_uInt16 nResultLen = (sal_uInt16)lResultLen;
+        sal_uInt16 nStrLen = rStr.Len();
         if ( nResultLen > nStrLen )
             nResultLen = nStrLen;
         String aResultStr = rStr.Copy( nStrLen-nResultLen );
@@ -1549,7 +1544,7 @@ RTLFUNC(Sgn)
     else
     {
         double aDouble = rPar.Get(1)->GetDouble();
-        INT16 nResult = 0;
+        sal_Int16 nResult = 0;
         if ( aDouble > 0 )
             nResult = 1;
         else if ( aDouble < 0 )
@@ -1568,7 +1563,7 @@ RTLFUNC(Space)
     else
     {
         String aStr;
-        aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+        aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1583,7 +1578,7 @@ RTLFUNC(Spc)
     else
     {
         String aStr;
-        aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+        aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
         rPar.Get(0)->PutString( aStr );
     }
 }
@@ -1633,11 +1628,11 @@ RTLFUNC(Str)
                 const sal_Unicode* pBuf = aStr.GetBuffer();
 
                 bool bNeg = ( pBuf[0] == '-' );
-                USHORT iZeroSearch = 0;
+                sal_uInt16 iZeroSearch = 0;
                 if( bNeg )
                     iZeroSearch++;
 
-                USHORT iNext = iZeroSearch + 1;
+                sal_uInt16 iNext = iZeroSearch + 1;
                 if( pBuf[iZeroSearch] == '0' && nLen > iNext && pBuf[iNext] == '.' )
                 {
                     aStr.Erase( iZeroSearch, 1 );
@@ -1668,16 +1663,16 @@ RTLFUNC(StrComp)
     const String& rStr2 = rPar.Get(2)->GetString();
 
     SbiInstance* pInst = pINST;
-    INT16 nTextCompare;
+    sal_Int16 nTextCompare;
     bool bCompatibility = ( pInst && pInst->IsCompatibility() );
     if( bCompatibility )
     {
         SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
-        nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+        nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
     }
     else
     {
-        nTextCompare = TRUE;
+        nTextCompare = sal_True;
     }
     if ( rPar.Count() == 4 )
         nTextCompare = rPar.Get(3)->GetInteger();
@@ -1713,7 +1708,7 @@ RTLFUNC(StrComp)
             nRetValue = 1;
     }
 
-    rPar.Get(0)->PutInteger( sal::static_int_cast< INT16 >( nRetValue ) );
+    rPar.Get(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) );
 }
 
 RTLFUNC(String)
@@ -1727,10 +1722,10 @@ RTLFUNC(String)
     {
         String aStr;
         sal_Unicode aFiller;
-        INT32 lCount = rPar.Get(1)->GetLong();
+        sal_Int32 lCount = rPar.Get(1)->GetLong();
         if( lCount < 0 || lCount > 0xffff )
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
-        USHORT nCount = (USHORT)lCount;
+        sal_uInt16 nCount = (sal_uInt16)lCount;
         if( rPar.Get(2)->GetType() == SbxINTEGER )
             aFiller = (sal_Unicode)rPar.Get(2)->GetInteger();
         else
@@ -1788,7 +1783,7 @@ RTLFUNC(Val)
 
         String aStr( rPar.Get(1)->GetString() );
 // lt. Mikkysoft bei Kommas abbrechen!
-//		for( USHORT n=0; n < aStr.Len(); n++ )
+//		for( sal_uInt16 n=0; n < aStr.Len(); n++ )
 //			if( aStr[n] == ',' ) aStr[n] = '.';
 
         FilterWhiteSpace( aStr );
@@ -1803,7 +1798,7 @@ RTLFUNC(Val)
             if ( nRadix != 10 )
             {
                 ByteString aByteStr( aStr, gsl_getSystemTextEncoding() );
-                INT16 nlResult = (INT16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
+                sal_Int16 nlResult = (sal_Int16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
                 nResult = (double)nlResult;
             }
         }
@@ -1821,46 +1816,46 @@ RTLFUNC(Val)
 
 
 // Helper functions for date conversion
-INT16 implGetDateDay( double aDate )
+sal_Int16 implGetDateDay( double aDate )
 {
     aDate -= 2.0; // normieren: 1.1.1900 => 0.0
     Date aRefDate( 1, 1, 1900 );
     if ( aDate >= 0.0 )
     {
         aDate = floor( aDate );
-        aRefDate += (ULONG)aDate;
+        aRefDate += (sal_uIntPtr)aDate;
     }
     else
     {
         aDate = ceil( aDate );
-        aRefDate -= (ULONG)(-1.0 * aDate);
+        aRefDate -= (sal_uIntPtr)(-1.0 * aDate);
     }
 
-    INT16 nRet = (INT16)( aRefDate.GetDay() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() );
     return nRet;
 }
 
-INT16 implGetDateMonth( double aDate )
+sal_Int16 implGetDateMonth( double aDate )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long)aDate;
     nDays -= 2; // normieren: 1.1.1900 => 0.0
     aRefDate += nDays;
-    INT16 nRet = (INT16)( aRefDate.GetMonth() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetMonth() );
     return nRet;
 }
 
-INT16 implGetDateYear( double aDate )
+sal_Int16 implGetDateYear( double aDate )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long) aDate;
     nDays -= 2; // normieren: 1.1.1900 => 0.0
     aRefDate += nDays;
-    INT16 nRet = (INT16)( aRefDate.GetYear() );
+    sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
     return nRet;
 }
 
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet )
 {
     if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
         nYear += 2000;
@@ -1870,7 +1865,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
     if ((nYear < 100 || nYear > 9999) )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-        return FALSE;
+        return sal_False;
     }
     if ( !SbiRuntime::isVBAEnabled() )
     {
@@ -1878,7 +1873,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
         (nDay < 1 || nDay > 31 ) )
         {
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
-            return FALSE;
+            return sal_False;
         }
     }
     else
@@ -1893,7 +1888,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
         {
             // inacurrate around leap year, don't use days to calculate,
             // just modify the months directory
-            INT16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
+            sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
             if ( nMonth <=0 )
                 nYearAdj = ( ( nMonth -12 ) / 12 );
             aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
@@ -1910,7 +1905,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
 
     long nDiffDays = GetDayDiff( aCurDate );
     rdRet = (double)nDiffDays;
-    return TRUE;
+    return sal_True;
 }
 
 // Function to convert date to ISO 8601 date format
@@ -1944,14 +1939,14 @@ RTLFUNC(CDateFromIso)
     if ( rPar.Count() == 2 )
     {
         String aStr = rPar.Get(1)->GetString();
-        INT16 iMonthStart = aStr.Len() - 4;
+        sal_Int16 iMonthStart = aStr.Len() - 4;
         String aYearStr  = aStr.Copy( 0, iMonthStart );
         String aMonthStr = aStr.Copy( iMonthStart, 2 );
         String aDayStr   = aStr.Copy( iMonthStart+2, 2 );
 
         double dDate;
-        if( implDateSerial( (INT16)aYearStr.ToInt32(),
-            (INT16)aMonthStr.ToInt32(), (INT16)aDayStr.ToInt32(), dDate ) )
+        if( implDateSerial( (sal_Int16)aYearStr.ToInt32(),
+            (sal_Int16)aMonthStr.ToInt32(), (sal_Int16)aDayStr.ToInt32(), dDate ) )
         {
             rPar.Get(0)->PutDate( dDate );
         }
@@ -1970,9 +1965,9 @@ RTLFUNC(DateSerial)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nYear = rPar.Get(1)->GetInteger();
-    INT16 nMonth = rPar.Get(2)->GetInteger();
-    INT16 nDay = rPar.Get(3)->GetInteger();
+    sal_Int16 nYear = rPar.Get(1)->GetInteger();
+    sal_Int16 nMonth = rPar.Get(2)->GetInteger();
+    sal_Int16 nDay = rPar.Get(3)->GetInteger();
 
     double dDate;
     if( implDateSerial( nYear, nMonth, nDay, dDate ) )
@@ -1989,11 +1984,11 @@ RTLFUNC(TimeSerial)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nHour = rPar.Get(1)->GetInteger();
+    sal_Int16 nHour = rPar.Get(1)->GetInteger();
     if ( nHour == 24 )
         nHour = 0;                      // Wegen UNO DateTimes, die bis 24 Uhr gehen
-    INT16 nMinute = rPar.Get(2)->GetInteger();
-    INT16 nSecond = rPar.Get(3)->GetInteger();
+    sal_Int16 nMinute = rPar.Get(2)->GetInteger();
+    sal_Int16 nSecond = rPar.Get(3)->GetInteger();
     if ((nHour < 0 || nHour > 23)   ||
         (nMinute < 0 || nMinute > 59 )	||
         (nSecond < 0 || nSecond > 59 ))
@@ -2002,7 +1997,7 @@ RTLFUNC(TimeSerial)
         return;
     }
 
-    INT32 nSeconds = nHour;
+    sal_Int32 nSeconds = nHour;
     nSeconds *= 3600;
     nSeconds += nMinute * 60;
     nSeconds += nSecond;
@@ -2032,7 +2027,7 @@ RTLFUNC(DateValue)
         sal_uInt32 nIndex;
         double fResult;
         String aStr( rPar.Get(1)->GetString() );
-        BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
+        sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
         short nType = pFormatter->GetType( nIndex );
 
         // DateValue("February 12, 1969") raises error if the system locale is not en_US
@@ -2093,7 +2088,7 @@ RTLFUNC(TimeValue)
 
         sal_uInt32 nIndex;
         double fResult;
-        BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
+        sal_Bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
                                                    nIndex, fResult );
         short nType = pFormatter->GetType(nIndex);
         if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME))
@@ -2124,7 +2119,7 @@ RTLFUNC(Day)
         SbxVariableRef pArg = rPar.Get( 1 );
         double aDate = pArg->GetDate();
 
-        INT16 nDay = implGetDateDay( aDate );
+        sal_Int16 nDay = implGetDateDay( aDate );
         rPar.Get(0)->PutInteger( nDay );
     }
 }
@@ -2138,19 +2133,19 @@ RTLFUNC(Year)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
+        sal_Int16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
         rPar.Get(0)->PutInteger( nYear );
     }
 }
 
-INT16 implGetHour( double dDate )
+sal_Int16 implGetHour( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nHour = (INT16)(nSeconds / 3600);
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nHour = (sal_Int16)(nSeconds / 3600);
     return nHour;
 }
 
@@ -2164,20 +2159,20 @@ RTLFUNC(Hour)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nHour = implGetHour( nArg );
+        sal_Int16 nHour = implGetHour( nArg );
         rPar.Get(0)->PutInteger( nHour );
     }
 }
 
-INT16 implGetMinute( double dDate )
+sal_Int16 implGetMinute( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nTemp = (INT16)(nSeconds % 3600);
-    INT16 nMin = nTemp / 60;
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nTemp = (sal_Int16)(nSeconds % 3600);
+    sal_Int16 nMin = nTemp / 60;
     return nMin;
 }
 
@@ -2191,7 +2186,7 @@ RTLFUNC(Minute)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nMin = implGetMinute( nArg );
+        sal_Int16 nMin = implGetMinute( nArg );
         rPar.Get(0)->PutInteger( nMin );
     }
 }
@@ -2205,24 +2200,24 @@ RTLFUNC(Month)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
+        sal_Int16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
         rPar.Get(0)->PutInteger( nMonth );
     }
 }
 
-INT16 implGetSecond( double dDate )
+sal_Int16 implGetSecond( double dDate )
 {
     if( dDate < 0.0 )
         dDate *= -1.0;
     double nFrac = dDate - floor( dDate );
     nFrac *= 86400.0;
-    INT32 nSeconds = (INT32)(nFrac + 0.5);
-    INT16 nTemp = (INT16)(nSeconds / 3600);
+    sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+    sal_Int16 nTemp = (sal_Int16)(nSeconds / 3600);
     nSeconds -= nTemp * 3600;
-    nTemp = (INT16)(nSeconds / 60);
+    nTemp = (sal_Int16)(nSeconds / 60);
     nSeconds -= nTemp * 60;
 
-    INT16 nRet = (INT16)nSeconds;
+    sal_Int16 nRet = (sal_Int16)nSeconds;
     return nRet;
 }
 
@@ -2236,7 +2231,7 @@ RTLFUNC(Second)
     else
     {
         double nArg = rPar.Get(1)->GetDate();
-        INT16 nSecond = implGetSecond( nArg );
+        sal_Int16 nSecond = implGetSecond( nArg );
         rPar.Get(0)->PutInteger( nSecond );
     }
 }
@@ -2388,7 +2383,7 @@ RTLFUNC(IsArray)
     if ( rPar.Count() < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
-        rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? TRUE : FALSE );
+        rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? sal_True : sal_False );
 }
 
 RTLFUNC(IsObject)
@@ -2407,7 +2402,7 @@ RTLFUNC(IsObject)
         SbxBase::ResetError();
 
         SbUnoClass* pUnoClass;
-        BOOL bObject;
+        sal_Bool bObject;
         if( pObj &&  NULL != ( pUnoClass=PTR_CAST(SbUnoClass,pObj) ) )
         {
             bObject = pUnoClass->getUnoClass().is();
@@ -2429,14 +2424,14 @@ RTLFUNC(IsDate)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        // #46134 Nur String wird konvertiert, andere Typen ergeben FALSE
+        // #46134 Nur String wird konvertiert, andere Typen ergeben sal_False
         SbxVariableRef xArg = rPar.Get( 1 );
         SbxDataType eType = xArg->GetType();
-        BOOL bDate = FALSE;
+        sal_Bool bDate = sal_False;
 
         if( eType == SbxDATE )
         {
-            bDate = TRUE;
+            bDate = sal_True;
         }
         else if( eType == SbxSTRING )
         {
@@ -2518,12 +2513,12 @@ RTLFUNC(IsNull)
         // #51475 Wegen Uno-Objekten auch true liefern,
         // wenn der pObj-Wert NULL ist
         SbxVariableRef pArg = rPar.Get( 1 );
-        BOOL bNull = rPar.Get(1)->IsNull();
+        sal_Bool bNull = rPar.Get(1)->IsNull();
         if( !bNull && pArg->GetType() == SbxOBJECT )
         {
             SbxBase* pObj = pArg->GetObject();
             if( !pObj )
-                bNull = TRUE;
+                bNull = sal_True;
         }
         rPar.Get( 0 )->PutBool( bNull );
     }
@@ -2663,7 +2658,7 @@ inline sal_Bool implCheckWildcard( const String& rName, SbiRTLData* pRTLData )
 bool isRootDir( String aDirURLStr )
 {
     INetURLObject aDirURLObj( aDirURLStr );
-    BOOL bRoot = FALSE;
+    sal_Bool bRoot = sal_False;
 
     // Check if it's a root directory
     sal_Int32 nCount = aDirURLObj.getSegmentCount();
@@ -2671,22 +2666,22 @@ bool isRootDir( String aDirURLStr )
     // No segment means Unix root directory "file:///"
     if( nCount == 0 )
     {
-        bRoot = TRUE;
+        bRoot = sal_True;
     }
     // Exactly one segment needs further checking, because it
     // can be Unix "file:///foo/" -> no root
     // or Windows  "file:///c:/"  -> root
     else if( nCount == 1 )
     {
-        ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, TRUE,
+        ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, sal_True,
             INetURLObject::DECODE_WITH_CHARSET );
         if( aSeg1.getStr()[1] == (sal_Unicode)':' )
         {
-            bRoot = TRUE;
+            bRoot = sal_True;
         }
     }
     // More than one segments can never be root
-    // so bRoot remains FALSE
+    // so bRoot remains sal_False
 
     return bRoot;
 }
@@ -2698,7 +2693,7 @@ RTLFUNC(Dir)
 
     String aPath;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -2753,7 +2748,7 @@ RTLFUNC(Dir)
                             rPar.Get(0)->PutString( aEmptyStr );
                         }
 
-                        USHORT nFlags = 0;
+                        sal_uInt16 nFlags = 0;
                         if ( nParCount > 2 )
                             pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                         else
@@ -2767,7 +2762,7 @@ RTLFUNC(Dir)
                         // #78651 Add "." and ".." directories for VB compatibility
                         if( bIncludeFolders )
                         {
-                            BOOL bRoot = isRootDir( aDirURLStr );
+                            sal_Bool bRoot = isRootDir( aDirURLStr );
 
                             // If it's no root directory we flag the need for
                             // the "." and ".." directories by the value -2
@@ -2837,7 +2832,7 @@ RTLFUNC(Dir)
                             }
 
                             INetURLObject aURL( aFile );
-                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, TRUE,
+                            aPath = aURL.getName( INetURLObject::LAST_SEGMENT, sal_True,
                                 INetURLObject::DECODE_WITH_CHARSET );
                         }
 
@@ -2868,23 +2863,19 @@ RTLFUNC(Dir)
                     rPar.Get(0)->PutString( aEntry.GetName() );
                     return;
                 }
-                USHORT nFlags = 0;
+                sal_uInt16 nFlags = 0;
                 if ( nParCount > 2 )
                     pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                 else
                     pRTLData->nDirFlags = 0;
-                // Nur diese Bitmaske ist unter Windows erlaubt
-    #ifdef WIN
-                if( nFlags & ~0x1E )
-                    StarBASIC::Error( SbERR_BAD_ARGUMENT ), pRTLData->nDirFlags = 0;
-    #endif
+
                 // Sb_ATTR_VOLUME wird getrennt gehandelt
                 if( pRTLData->nDirFlags & Sb_ATTR_VOLUME )
                     aPath = aEntry.GetVolume();
                 else
                 {
                     // Die richtige Auswahl treffen
-                    USHORT nMode = FSYS_KIND_FILE;
+                    sal_uInt16 nMode = FSYS_KIND_FILE;
                     if( nFlags & Sb_ATTR_DIRECTORY )
                         nMode |= FSYS_KIND_DIR;
                     if( nFlags == Sb_ATTR_DIRECTORY )
@@ -2907,31 +2898,7 @@ RTLFUNC(Dir)
                     }
                     DirEntry aNextEntry=(*(pRTLData->pDir))[pRTLData->nCurDirPos++];
                     aPath = aNextEntry.GetName(); //Full();
-    #ifdef WIN
-                    aNextEntry.ToAbs();
-                    String sFull(aNextEntry.GetFull());
-                    unsigned nFlags;
-
-                    if (_dos_getfileattr( sFull.GetStr(), &nFlags ))
-                        StarBASIC::Error( SbERR_FILE_NOT_FOUND );
-                    else
-                    {
-                        INT16 nCurFlags = pRTLData->nDirFlags;
-                        if( (nCurFlags == Sb_ATTR_NORMAL)
-                          && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) )
-                            break;
-                        else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) )
-                            break;
-                        else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) )
-                            break;
-                        else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) )
-                            break;
-                        else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) )
-                            break;
-                    }
-    #else
                     break;
-    #endif
                 }
             }
             rPar.Get(0)->PutString( aPath );
@@ -2943,7 +2910,7 @@ RTLFUNC(Dir)
 
                 String aDirURL = implSetupWildcard( aFileParam, pRTLData );
 
-                USHORT nFlags = 0;
+                sal_uInt16 nFlags = 0;
                 if ( nParCount > 2 )
                     pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
                 else
@@ -2965,7 +2932,7 @@ RTLFUNC(Dir)
                 pRTLData->nCurDirPos = 0;
                 if( bIncludeFolders )
                 {
-                    BOOL bRoot = isRootDir( aDirURL );
+                    sal_Bool bRoot = isRootDir( aDirURL );
 
                     // If it's no root directory we flag the need for
                     // the "." and ".." directories by the value -2
@@ -3045,7 +3012,7 @@ RTLFUNC(GetAttr)
 
     if ( rPar.Count() == 2 )
     {
-        INT16 nFlags = 0;
+        sal_Int16 nFlags = 0;
 
         // In Windows, We want to use Windows API to get the file attributes
         // for VBA interoperability.
@@ -3062,7 +3029,7 @@ RTLFUNC(GetAttr)
             {
                 if (nRealFlags == FILE_ATTRIBUTE_NORMAL)
                     nRealFlags = 0;
-                nFlags = (INT16) (nRealFlags);
+                nFlags = (sal_Int16) (nRealFlags);
             }
             else
                 StarBASIC::Error( SbERR_FILE_NOT_FOUND );
@@ -3228,7 +3195,7 @@ RTLFUNC(EOF)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         // nChannel--;  // macht MD beim Oeffnen auch nicht
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3237,7 +3204,7 @@ RTLFUNC(EOF)
             StarBASIC::Error( SbERR_BAD_CHANNEL );
             return;
         }
-        BOOL bIsEof;
+        sal_Bool bIsEof;
         SvStream* pSvStrm = pSbStrm->GetStrm();
         if ( pSbStrm->IsText() )
         {
@@ -3268,7 +3235,7 @@ RTLFUNC(FileAttr)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
 //		nChannel--;
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3277,9 +3244,9 @@ RTLFUNC(FileAttr)
             StarBASIC::Error( SbERR_BAD_CHANNEL );
             return;
         }
-        INT16 nRet;
+        sal_Int16 nRet;
         if ( rPar.Get(2)->GetInteger() == 1 )
-            nRet = (INT16)(pSbStrm->GetMode());
+            nRet = (sal_Int16)(pSbStrm->GetMode());
         else
             nRet = 0; // System file handle not supported
 
@@ -3296,7 +3263,7 @@ RTLFUNC(Loc)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
         if ( !pSbStrm )
@@ -3305,7 +3272,7 @@ RTLFUNC(Loc)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        ULONG nPos;
+        sal_uIntPtr nPos;
         if( pSbStrm->IsRandom())
         {
             short nBlockLen = pSbStrm->GetBlockLen();
@@ -3320,7 +3287,7 @@ RTLFUNC(Loc)
             nPos = ( pSvStrm->Tell()+1 ) / 128;
         else
             nPos = pSvStrm->Tell();
-        rPar.Get(0)->PutLong( (INT32)nPos );
+        rPar.Get(0)->PutLong( (sal_Int32)nPos );
     }
 }
 
@@ -3334,7 +3301,7 @@ RTLFUNC(Lof)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        INT16 nChannel = rPar.Get(1)->GetInteger();
+        sal_Int16 nChannel = rPar.Get(1)->GetInteger();
         SbiIoSystem* pIO = pINST->GetIoSystem();
         SbiStream* pSbStrm = pIO->GetStream( nChannel );
         if ( !pSbStrm )
@@ -3343,10 +3310,10 @@ RTLFUNC(Lof)
             return;
         }
         SvStream* pSvStrm = pSbStrm->GetStrm();
-        ULONG nOldPos = pSvStrm->Tell();
-        ULONG nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+        sal_uIntPtr nOldPos = pSvStrm->Tell();
+        sal_uIntPtr nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
         pSvStrm->Seek( nOldPos );
-        rPar.Get(0)->PutLong( (INT32)nLen );
+        rPar.Get(0)->PutLong( (sal_Int32)nLen );
     }
 }
 
@@ -3363,7 +3330,7 @@ RTLFUNC(Seek)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
 //	nChannel--;
     SbiIoSystem* pIO = pINST->GetIoSystem();
     SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3376,15 +3343,15 @@ RTLFUNC(Seek)
 
     if ( nArgs == 2 )   // Seek-Function
     {
-        ULONG nPos = pStrm->Tell();
+        sal_uIntPtr nPos = pStrm->Tell();
         if( pSbStrm->IsRandom() )
             nPos = nPos / pSbStrm->GetBlockLen();
         nPos++;	// Basic zaehlt ab 1
-        rPar.Get(0)->PutLong( (INT32)nPos );
+        rPar.Get(0)->PutLong( (sal_Int32)nPos );
     }
     else                // Seek-Statement
     {
-        INT32 nPos = rPar.Get(2)->GetLong();
+        sal_Int32 nPos = rPar.Get(2)->GetLong();
         if ( nPos < 1 )
         {
             StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3394,7 +3361,7 @@ RTLFUNC(Seek)
         pSbStrm->SetExpandOnWriteTo( 0 );
         if ( pSbStrm->IsRandom() )
             nPos *= pSbStrm->GetBlockLen();
-        pStrm->Seek( (ULONG)nPos );
+        pStrm->Seek( (sal_uIntPtr)nPos );
         pSbStrm->SetExpandOnWriteTo( nPos );
     }
 }
@@ -3404,7 +3371,7 @@ RTLFUNC(Format)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if ( nArgCount < 2 || nArgCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -3428,11 +3395,11 @@ RTLFUNC(Randomize)
 
     if ( rPar.Count() > 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    INT16 nSeed;
+    sal_Int16 nSeed;
     if( rPar.Count() == 2 )
-        nSeed = (INT16)rPar.Get(1)->GetInteger();
+        nSeed = (sal_Int16)rPar.Get(1)->GetInteger();
     else
-        nSeed = (INT16)rand();
+        nSeed = (sal_Int16)rand();
     srand( nSeed );
 }
 
@@ -3453,7 +3420,7 @@ RTLFUNC(Rnd)
 
 
 //
-//  Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = FALSE ]]])
+//  Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = sal_False ]]])
 //
 //  WindowStyles (VBA-kompatibel):
 //      2 == Minimized
@@ -3477,7 +3444,7 @@ RTLFUNC(Shell)
         return;
     }
 
-    ULONG nArgCount = rPar.Count();
+    sal_uIntPtr nArgCount = rPar.Count();
     if ( nArgCount < 2 || nArgCount > 5 )
     {
         rPar.Get(0)->PutLong(0);
@@ -3499,13 +3466,13 @@ RTLFUNC(Shell)
             // Spezial-Behandlung (leere Liste) vermeiden
             aCmdLine.AppendAscii( " " );
         }
-        USHORT nLen = aCmdLine.Len();
+        sal_uInt16 nLen = aCmdLine.Len();
 
         // #55735 Wenn Parameter dabei sind, muessen die abgetrennt werden
         // #72471 Auch die einzelnen Parameter trennen
         std::list<String> aTokenList;
         String aToken;
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         sal_Unicode c;
         while( i < nLen )
         {
@@ -3519,7 +3486,7 @@ RTLFUNC(Shell)
 
             if( c == '\"' || c == '\'' )
             {
-                USHORT iFoundPos = aCmdLine.Search( c, i + 1 );
+                sal_uInt16 iFoundPos = aCmdLine.Search( c, i + 1 );
 
                 // Wenn nichts gefunden wurde, Rest kopieren
                 if( iFoundPos == STRING_NOTFOUND )
@@ -3535,9 +3502,9 @@ RTLFUNC(Shell)
             }
             else
             {
-                USHORT iFoundSpacePos = aCmdLine.Search( ' ', i );
-                USHORT iFoundTabPos = aCmdLine.Search( '\t', i );
-                USHORT iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
+                sal_uInt16 iFoundSpacePos = aCmdLine.Search( ' ', i );
+                sal_uInt16 iFoundTabPos = aCmdLine.Search( '\t', i );
+                sal_uInt16 iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
 
                 // Wenn nichts gefunden wurde, Rest kopieren
                 if( iFoundPos == STRING_NOTFOUND )
@@ -3557,7 +3524,7 @@ RTLFUNC(Shell)
         }
         // #55735 / #72471 Ende
 
-        INT16 nWinStyle = 0;
+        sal_Int16 nWinStyle = 0;
         if( nArgCount >= 3 )
         {
             nWinStyle = rPar.Get(2)->GetInteger();
@@ -3574,7 +3541,7 @@ RTLFUNC(Shell)
                 break;
             }
 
-            BOOL bSync = FALSE;
+            sal_Bool bSync = sal_False;
             if( nArgCount >= 5 )
                 bSync = rPar.Get(4)->GetBool();
             if( bSync )
@@ -3589,7 +3556,7 @@ RTLFUNC(Shell)
 
         ++iter;
 
-        USHORT nParamCount = sal::static_int_cast< USHORT >(
+        sal_uInt16 nParamCount = sal::static_int_cast< sal_uInt16 >(
             aTokenList.size() - 1 );
         rtl_uString** pParamList = NULL;
         if( nParamCount )
@@ -3605,7 +3572,7 @@ RTLFUNC(Shell)
         }
 
         oslProcess pApp;
-        BOOL bSucc = osl_executeProcess(
+        sal_Bool bSucc = osl_executeProcess(
                     aOUStrProgUNC.pData,
                     pParamList,
                     nParamCount,
@@ -3650,7 +3617,7 @@ RTLFUNC(VarType)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        rPar.Get(0)->PutInteger( (INT16)eType );
+        rPar.Get(0)->PutInteger( (sal_Int16)eType );
     }
 }
 
@@ -3700,7 +3667,7 @@ String getBasicTypeName( SbxDataType eType )
     };
 
     int nPos = ((int)eType) & 0x0FFF;
-    USHORT nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
+    sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
     if ( nPos < 0 || nPos >= nTypeNameCount )
         nPos = nTypeNameCount - 1;
     String aRetStr = String::CreateFromAscii( pTypeNames[nPos] );
@@ -3776,7 +3743,7 @@ RTLFUNC(TypeName)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
+        sal_Bool bIsArray = ( ( eType & SbxARRAY ) != 0 );
 
         String aRetStr;
         if ( SbiRuntime::isVBAEnabled() && eType == SbxOBJECT )
@@ -3799,7 +3766,7 @@ RTLFUNC(Len)
     else
     {
         const String& rStr = rPar.Get(1)->GetString();
-        rPar.Get(0)->PutLong( (INT32)rStr.Len() );
+        rPar.Get(0)->PutLong( (sal_Int32)rStr.Len() );
     }
 }
 
@@ -3825,7 +3792,7 @@ RTLFUNC(DDEInitiate)
     const String& rTopic = rPar.Get(2)->GetString();
 
     SbiDdeControl* pDDE = pINST->GetDdeControl();
-    INT16 nChannel;
+    sal_Int16 nChannel;
     SbError nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
     if( nDdeErr )
         StarBASIC::Error( nDdeErr );
@@ -3852,7 +3819,7 @@ RTLFUNC(DDETerminate)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     SbError nDdeErr = pDDE->Terminate( nChannel );
     if( nDdeErr )
@@ -3904,7 +3871,7 @@ RTLFUNC(DDERequest)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rItem = rPar.Get(2)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     String aResult;
@@ -3934,7 +3901,7 @@ RTLFUNC(DDEExecute)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rCommand = rPar.Get(2)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
     SbError nDdeErr = pDDE->Execute( nChannel, rCommand );
@@ -3961,7 +3928,7 @@ RTLFUNC(DDEPoke)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nChannel = rPar.Get(1)->GetInteger();
+    sal_Int16 nChannel = rPar.Get(1)->GetInteger();
     const String& rItem = rPar.Get(2)->GetString();
     const String& rData = rPar.Get(3)->GetString();
     SbiDdeControl* pDDE = pINST->GetDdeControl();
@@ -4001,7 +3968,7 @@ RTLFUNC(LBound)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4011,7 +3978,7 @@ RTLFUNC(LBound)
     SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
     if( pArr )
     {
-        INT32 nLower, nUpper;
+        sal_Int32 nLower, nUpper;
         short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
         if( !pArr->GetDim32( nDim, nLower, nUpper ) )
             StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -4027,7 +3994,7 @@ RTLFUNC(UBound)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4038,7 +4005,7 @@ RTLFUNC(UBound)
     SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
     if( pArr )
     {
-        INT32 nLower, nUpper;
+        sal_Int32 nLower, nUpper;
         short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
         if( !pArr->GetDim32( nDim, nLower, nUpper ) )
             StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -4060,10 +4027,10 @@ RTLFUNC(RGB)
         return;
     }
 
-    ULONG nRed	 = rPar.Get(1)->GetInteger() & 0xFF;
-    ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF;
-    ULONG nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
-    ULONG nRGB;
+    sal_uIntPtr nRed	 = rPar.Get(1)->GetInteger() & 0xFF;
+    sal_uIntPtr nGreen = rPar.Get(2)->GetInteger() & 0xFF;
+    sal_uIntPtr nBlue  = rPar.Get(3)->GetInteger() & 0xFF;
+    sal_uIntPtr nRGB;
 
     SbiInstance* pInst = pINST;
     bool bCompatibility = ( pInst && pInst->IsCompatibility() );
@@ -4083,7 +4050,7 @@ RTLFUNC(QBColor)
     (void)pBasic;
     (void)bWrite;
 
-    static const INT32 pRGB[] =
+    static const sal_Int32 pRGB[] =
     {
         0x000000,
         0x800000,
@@ -4109,13 +4076,13 @@ RTLFUNC(QBColor)
         return;
     }
 
-    INT16 nCol = rPar.Get(1)->GetInteger();
+    sal_Int16 nCol = rPar.Get(1)->GetInteger();
     if( nCol < 0 || nCol > 15 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT32 nRGB = pRGB[ nCol ];
+    sal_Int32 nRGB = pRGB[ nCol ];
     rPar.Get(0)->PutLong( nRGB );
 }
 
@@ -4125,7 +4092,7 @@ RTLFUNC(StrConv)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uIntPtr nArgCount = rPar.Count()-1;
     if( nArgCount < 2 || nArgCount > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4133,16 +4100,16 @@ RTLFUNC(StrConv)
     }
 
     String aOldStr = rPar.Get(1)->GetString();
-    INT32 nConversion = rPar.Get(2)->GetLong();
+    sal_Int32 nConversion = rPar.Get(2)->GetLong();
 
-    USHORT nLanguage = LANGUAGE_SYSTEM;
+    sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
     if( nArgCount == 3 )
     {
         // LCID not supported now
         //nLanguage = rPar.Get(3)->GetInteger();
     }
 
-    USHORT nOldLen = aOldStr.Len();
+    sal_uInt16 nOldLen = aOldStr.Len();
     if( nOldLen == 0 )
     {
         // null string,return
@@ -4150,7 +4117,7 @@ RTLFUNC(StrConv)
         return;
     }
 
-    INT32 nType = 0;
+    sal_Int32 nType = 0;
     if ( (nConversion & 0x03) == 3 ) //  vbProperCase
     {
         CharClass& rCharClass = GetCharClass();
@@ -4184,10 +4151,10 @@ RTLFUNC(StrConv)
     if ( (nConversion & 0x40) == 64 ) // vbUnicode
     {
         // convert the string to byte string, preserving unicode (2 bytes per character)
-        USHORT nSize = aNewStr.Len()*2;
+        sal_uInt16 nSize = aNewStr.Len()*2;
         const sal_Unicode* pSrc = aNewStr.GetBuffer();
         sal_Char* pChar = new sal_Char[nSize+1];
-        for( USHORT i=0; i < nSize; i++ )
+        for( sal_uInt16 i=0; i < nSize; i++ )
         {
             pChar[i] = static_cast< sal_Char >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
             if( i%2 )
@@ -4208,7 +4175,7 @@ RTLFUNC(StrConv)
         // there is no concept about default codepage in unix. so it is incorrectly in unix
         ::rtl::OString aOStr = ::rtl::OUStringToOString(aNewStr,osl_getThreadTextEncoding());
         const sal_Char* pChar = aOStr.getStr();
-        USHORT nArraySize = static_cast< USHORT >( aOStr.getLength() );
+        sal_uInt16 nArraySize = static_cast< sal_uInt16 >( aOStr.getLength() );
         SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
         bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
         if(nArraySize)
@@ -4223,7 +4190,7 @@ RTLFUNC(StrConv)
             pArray->unoAddDim( 0, -1 );
         }
 
-        for( USHORT	i=0; i< nArraySize; i++)
+        for( sal_uInt16	i=0; i< nArraySize; i++)
         {
             SbxVariable* pNew = new SbxVariable( SbxBYTE );
             pNew->PutByte(*pChar);
@@ -4236,7 +4203,7 @@ RTLFUNC(StrConv)
         }
 
         SbxVariableRef refVar = rPar.Get(0);
-        USHORT nFlags = refVar->GetFlags();
+        sal_uInt16 nFlags = refVar->GetFlags();
         refVar->ResetFlag( SBX_FIXED );
         refVar->PutObject( pArray );
         refVar->SetFlags( nFlags );
@@ -4392,17 +4359,17 @@ RTLFUNC(MsgBox)
         WB_YES_NO,          // MB_YESNO
         WB_RETRY_CANCEL     // MB_RETRYCANCEL
     };
-    static const INT16 nButtonMap[] =
+    static const sal_Int16 nButtonMap[] =
     {
-        2, // #define RET_CANCEL FALSE
-        1, // #define RET_OK     TRUE
+        2, // #define RET_CANCEL sal_False
+        1, // #define RET_OK     sal_True
         6, // #define RET_YES    2
         7, // #define RET_NO     3
         4  // #define RET_RETRY  4
     };
 
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if( nArgCount < 2 || nArgCount > 6 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4469,11 +4436,11 @@ RTLFUNC(MsgBox)
             pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );
     }
     pBox->SetText( aTitle );
-    USHORT nRet = (USHORT)pBox->Execute();
-    if( nRet == TRUE )
+    sal_uInt16 nRet = (sal_uInt16)pBox->Execute();
+    if( nRet == sal_True )
         nRet = 1;
 
-    INT16 nMappedRet;
+    sal_Int16 nMappedRet;
     if( nStyle == 2 )
     {
         nMappedRet = nRet;
@@ -4496,7 +4463,7 @@ RTLFUNC(SetAttr) // JSM
     if ( rPar.Count() == 3 )
     {
         String aStr = rPar.Get(1)->GetString();
-        INT16 nFlags = rPar.Get(2)->GetInteger();
+        sal_Int16 nFlags = rPar.Get(2)->GetInteger();
 
         // <-- UCB
         if( hasUno() )
@@ -4524,16 +4491,6 @@ RTLFUNC(SetAttr) // JSM
             // #57064 Bei virtuellen URLs den Real-Path extrahieren
             DirEntry aEntry( aStr );
             String aFile = aEntry.GetFull();
-    #ifdef WIN
-            int nErr = _dos_setfileattr( aFile.GetStr(),(unsigned ) nFlags );
-            if ( nErr )
-            {
-                if (errno == EACCES)
-                    StarBASIC::Error( SbERR_ACCESS_DENIED );
-                else
-                    StarBASIC::Error( SbERR_FILE_NOT_FOUND );
-            }
-    #endif
             ByteString aByteFile( aFile, gsl_getSystemTextEncoding() );
     #ifdef WNT
             if (!SetFileAttributes (aByteFile.GetBuffer(),(DWORD)nFlags))
@@ -4582,7 +4539,7 @@ RTLFUNC(DumpAllObjects)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nArgCount = (USHORT)rPar.Count();
+    sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
     if( nArgCount < 2 || nArgCount > 3 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else if( !pBasic )
@@ -4610,7 +4567,7 @@ RTLFUNC(FileExists)
     if ( rPar.Count() == 2 )
     {
         String aStr = rPar.Get(1)->GetString();
-        BOOL bExists = FALSE;
+        sal_Bool bExists = sal_False;
 
         // <-- UCB
         if( hasUno() )
@@ -4657,10 +4614,10 @@ RTLFUNC(Partition)
         return;
     }
 
-    INT32 nNumber = rPar.Get(1)->GetLong();
-    INT32 nStart = rPar.Get(2)->GetLong();
-    INT32 nStop = rPar.Get(3)->GetLong();
-    INT32 nInterval = rPar.Get(4)->GetLong();
+    sal_Int32 nNumber = rPar.Get(1)->GetLong();
+    sal_Int32 nStart = rPar.Get(2)->GetLong();
+    sal_Int32 nStop = rPar.Get(3)->GetLong();
+    sal_Int32 nInterval = rPar.Get(4)->GetLong();
 
     if( nStart < 0 || nStop <= nStart || nInterval < 1 )
     {
@@ -4677,9 +4634,9 @@ RTLFUNC(Partition)
     // calculate the  maximun number of characters before lowervalue and uppervalue
     ::rtl::OUString aBeforeStart = ::rtl::OUString::valueOf( nStart - 1 );
     ::rtl::OUString aAfterStop = ::rtl::OUString::valueOf( nStop + 1 );
-    INT32 nLen1 = aBeforeStart.getLength();
-    INT32 nLen2 = aAfterStop.getLength();
-    INT32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
+    sal_Int32 nLen1 = aBeforeStart.getLength();
+    sal_Int32 nLen2 = aAfterStop.getLength();
+    sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
 
     ::rtl::OUStringBuffer aRetStr( nLen * 2 + 1);
     ::rtl::OUString aLowerValue;
@@ -4694,8 +4651,8 @@ RTLFUNC(Partition)
     }
     else
     {
-        INT32 nLowerValue = nNumber;
-        INT32 nUpperValue = nLowerValue;
+        sal_Int32 nLowerValue = nNumber;
+        sal_Int32 nUpperValue = nLowerValue;
         if( nInterval > 1 )
         {
             nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
@@ -4712,14 +4669,14 @@ RTLFUNC(Partition)
     if( nLen > nLen1 )
     {
         // appending the leading spaces for the lowervalue
-        for ( INT32 i= (nLen - nLen1) ; i > 0; --i )
+        for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
             aRetStr.appendAscii(" ");
     }
     aRetStr.append( aLowerValue ).appendAscii(":");
     if( nLen > nLen2 )
     {
         // appending the leading spaces for the uppervalue
-        for ( INT32 i= (nLen - nLen2) ; i > 0; --i )
+        for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
             aRetStr.appendAscii(" ");
     }
     aRetStr.append( aUpperValue );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 36af58b98d..1c46202163 100644..100755
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -29,11 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
 
-#if defined(WIN)
-#include <string.h>
-#else
 #include <stdlib.h> // getenv
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/wrkwin.hxx>
@@ -51,10 +47,6 @@
 #include <svpm.h>
 #endif
 
-#if defined(WIN)
-#include <tools/svwin.h>
-#endif
-
 #ifndef CLK_TCK
 #define CLK_TCK CLOCKS_PER_SEC
 #endif
@@ -123,13 +115,133 @@ static Reference< XCalendar > getLocaleCalendar( void )
     return xCalendar;
 }
 
+RTLFUNC(CallByName)
+{
+    (void)pBasic;
+    (void)bWrite;
+
+    const sal_Int16 vbGet		= 2;
+    const sal_Int16 vbLet		= 4;
+    const sal_Int16 vbMethod	= 1;
+    const sal_Int16 vbSet		= 8;
+
+    // At least 3 parameter needed plus function itself -> 4
+    sal_uInt16 nParCount = rPar.Count();
+    if ( nParCount < 4 )
+    {
+        StarBASIC::Error( SbERR_BAD_ARGUMENT );
+        return;
+    }
+
+    // 1. parameter is object
+    SbxBase* pObjVar = (SbxObject*)rPar.Get(1)->GetObject();
+    SbxObject* pObj = NULL;
+    if( pObjVar )
+        pObj = PTR_CAST(SbxObject,pObjVar);
+    if( !pObj && pObjVar && pObjVar->ISA(SbxVariable) )
+    {
+        SbxBase* pObjVarObj = ((SbxVariable*)pObjVar)->GetObject();
+        pObj = PTR_CAST(SbxObject,pObjVarObj);
+    }
+    if( !pObj )
+    {
+        StarBASIC::Error( SbERR_BAD_PARAMETER );
+        return;
+    }
+
+    // 2. parameter is ProcedureName
+    String aNameStr = rPar.Get(2)->GetString();
+
+    // 3. parameter is CallType
+    sal_Int16 nCallType = rPar.Get(3)->GetInteger();
+
+    //SbxObject* pFindObj = NULL;
+    SbxVariable* pFindVar = pObj->Find( aNameStr, SbxCLASS_DONTCARE );
+    if( pFindVar == NULL )
+    {
+        StarBASIC::Error( SbERR_PROC_UNDEFINED );
+        return;
+    }
+
+    switch( nCallType )
+    {
+        case vbGet:
+            {
+                SbxValues aVals;
+                aVals.eType = SbxVARIANT;
+                pFindVar->Get( aVals );
+
+                SbxVariableRef refVar = rPar.Get(0);
+                refVar->Put( aVals );
+            }
+            break;
+        case vbLet:
+        case vbSet:
+            {
+                if ( nParCount != 5 )
+                {
+                    StarBASIC::Error( SbERR_BAD_ARGUMENT );
+                    return;
+                }
+                SbxVariableRef pValVar = rPar.Get(4);
+                if( nCallType == vbLet )
+                {
+                    SbxValues aVals;
+                    aVals.eType = SbxVARIANT;
+                    pValVar->Get( aVals );
+                    pFindVar->Put( aVals );
+                }
+                else
+                {
+                    SbxVariableRef rFindVar = pFindVar;
+                    SbiInstance* pInst = pINST;
+                    SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
+                    if( pRT != NULL )
+                        pRT->StepSET_Impl( pValVar, rFindVar, false );
+                }
+            }
+            break;
+        case vbMethod:
+            {
+                SbMethod* pMeth = PTR_CAST(SbMethod,pFindVar);
+                if( pMeth == NULL )
+                {
+                    StarBASIC::Error( SbERR_PROC_UNDEFINED );
+                    return;
+                }
+
+                // Setup parameters
+                SbxArrayRef xArray;
+                sal_uInt16 nMethParamCount = nParCount - 4;
+                if( nMethParamCount > 0 )
+                {
+                    xArray = new SbxArray;
+                    for( sal_uInt16 i = 0 ; i < nMethParamCount ; i++ )
+                    {
+                        SbxVariable* pPar = rPar.Get( i + 4 );
+                        xArray->Put( pPar, i + 1 );
+                    }
+                }
+
+                // Call method
+                SbxVariableRef refVar = rPar.Get(0);
+                if( xArray.Is() )
+                    pMeth->SetParameters( xArray );
+                pMeth->Call( refVar );
+                pMeth->SetParameters( NULL );
+            }
+            break;
+        default:
+            StarBASIC::Error( SbERR_PROC_UNDEFINED );
+    }
+}
 
 RTLFUNC(CBool) // JSM
 {
     (void)pBasic;
     (void)bWrite;
 
-    BOOL bVal = FALSE;
+    sal_Bool bVal = sal_False;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -146,7 +258,7 @@ RTLFUNC(CByte) // JSM
     (void)pBasic;
     (void)bWrite;
 
-    BYTE nByte = 0;
+    sal_uInt8 nByte = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -247,7 +359,7 @@ RTLFUNC(CInt)  // JSM
     (void)pBasic;
     (void)bWrite;
 
-    INT16 nVal = 0;
+    sal_Int16 nVal = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -264,7 +376,7 @@ RTLFUNC(CLng)  // JSM
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nVal = 0;
+    sal_Int32 nVal = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -290,7 +402,7 @@ RTLFUNC(CSng)  // JSM
             // AB #41690 , String holen
             double dVal = 0.0;
             String aScanStr = pSbxVariable->GetString();
-            SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/TRUE );
+            SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/sal_True );
             if( SbxBase::GetError() == SbxERR_OK && Error != SbxERR_OK )
                 StarBASIC::Error( Error );
             nVal = (float)dVal;
@@ -345,7 +457,7 @@ RTLFUNC(CVErr)
     (void)pBasic;
     (void)bWrite;
 
-    INT16 nErrCode = 0;
+    sal_Int16 nErrCode = 0;
     if ( rPar.Count() == 2 )
     {
         SbxVariable *pSbxVariable = rPar.Get(1);
@@ -416,10 +528,10 @@ RTLFUNC(Red)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x00FF0000;
         nRGB >>= 16;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -432,10 +544,10 @@ RTLFUNC(Green)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x0000FF00;
         nRGB >>= 8;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -448,9 +560,9 @@ RTLFUNC(Blue)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
     {
-        ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+        sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
         nRGB &= 0x000000FF;
-        rPar.Get(0)->PutInteger( (INT16)nRGB );
+        rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
     }
 }
 
@@ -460,11 +572,11 @@ RTLFUNC(Switch)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nCount = rPar.Count();
+    sal_uInt16 nCount = rPar.Count();
     if( !(nCount & 0x0001 ))
         // Anzahl der Argumente muss ungerade sein
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    USHORT nCurExpr = 1;
+    sal_uInt16 nCurExpr = 1;
     while( nCurExpr < (nCount-1) )
     {
         if( rPar.Get( nCurExpr )->GetBool())
@@ -536,6 +648,7 @@ RTLFUNC(DoEvents)
 // basic runtime pcode ( on a timed basis )
     // always return 0
     rPar.Get(0)->PutInteger( 0 );
+    Application::Reschedule( true );
 }
 
 RTLFUNC(GetGUIVersion)
@@ -559,8 +672,8 @@ RTLFUNC(Choose)
 
     if ( rPar.Count() < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
-    INT16 nIndex = rPar.Get(1)->GetInteger();
-    USHORT nCount = rPar.Count();
+    sal_Int16 nIndex = rPar.Get(1)->GetInteger();
+    sal_uInt16 nCount = rPar.Count();
     nCount--;
     if( nCount == 1 || nIndex > (nCount-1) || nIndex < 1 )
     {
@@ -592,7 +705,7 @@ RTLFUNC(GetSolarVersion)
     (void)pBasic;
     (void)bWrite;
 
-    rPar.Get(0)->PutLong( (INT32)SUPD );
+    rPar.Get(0)->PutLong( (sal_Int32)SUPD );
 }
 
 RTLFUNC(TwipsPerPixelX)
@@ -600,7 +713,7 @@ RTLFUNC(TwipsPerPixelX)
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nResult = 0;
+    sal_Int32 nResult = 0;
     Size aSize( 100,0 );
     MapMode aMap( MAP_TWIP );
     OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -617,7 +730,7 @@ RTLFUNC(TwipsPerPixelY)
     (void)pBasic;
     (void)bWrite;
 
-    INT32 nResult = 0;
+    sal_Int32 nResult = 0;
     Size aSize( 0,100 );
     MapMode aMap( MAP_TWIP );
     OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -644,7 +757,7 @@ bool IsBaseIndexOne()
     bool result = false;
     if ( pINST && pINST->pRun )
     {
-        USHORT res = pINST->pRun->GetBase();
+        sal_uInt16 res = pINST->pRun->GetBase();
         if ( res )
             result = true;
     }
@@ -657,7 +770,7 @@ RTLFUNC(Array)
     (void)bWrite;
 
     SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
-    USHORT nArraySize = rPar.Count() - 1;
+    sal_uInt16 nArraySize = rPar.Count() - 1;
 
     // Option Base zunaechst ignorieren (kennt leider nur der Compiler)
     bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
@@ -674,10 +787,10 @@ RTLFUNC(Array)
     }
 
     // Parameter ins Array uebernehmen
-    // ATTENTION: Using type USHORT for loop variable is
+    // ATTENTION: Using type sal_uInt16 for loop variable is 
     // mandatory to workaround a problem with the
     // Solaris Intel compiler optimizer! See i104354
-    for( USHORT i = 0 ; i < nArraySize ; i++ )
+    for( sal_uInt16 i = 0 ; i < nArraySize ; i++ )
     {
         SbxVariable* pVar = rPar.Get(i+1);
         SbxVariable* pNew = new SbxVariable( *pVar );
@@ -690,7 +803,7 @@ RTLFUNC(Array)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -711,12 +824,12 @@ RTLFUNC(DimArray)
     (void)bWrite;
 
     SbxDimArray * pArray = new SbxDimArray( SbxVARIANT );
-    USHORT nArrayDims = rPar.Count() - 1;
+    sal_uInt16 nArrayDims = rPar.Count() - 1;
     if( nArrayDims > 0 )
     {
-        for( USHORT i = 0; i < nArrayDims ; i++ )
+        for( sal_uInt16 i = 0; i < nArrayDims ; i++ )
         {
-            INT32 ub = rPar.Get(i+1)->GetLong();
+            sal_Int32 ub = rPar.Get(i+1)->GetLong();
             if( ub < 0 )
             {
                 StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -730,7 +843,7 @@ RTLFUNC(DimArray)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -849,12 +962,12 @@ RTLFUNC(FindPropertyObject)
 
 
 
-BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
-    BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+    sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
-    ULONG nFPos = pStrm->Tell();
+    sal_uIntPtr nFPos = pStrm->Tell();
 
-    BOOL bIsVariant = !rVar.IsFixed();
+    sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eType = rVar.GetType();
 
     switch( eType )
@@ -863,7 +976,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxCHAR:
         case SbxBYTE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxBYTE; // VarType Id
+                    *pStrm << (sal_uInt16)SbxBYTE; // VarType Id
                 *pStrm << rVar.GetByte();
                 break;
 
@@ -875,25 +988,25 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxINT:
         case SbxUINT:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxINTEGER; // VarType Id
+                    *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id
                 *pStrm << rVar.GetInteger();
                 break;
 
         case SbxLONG:
         case SbxULONG:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxLONG; // VarType Id
+                    *pStrm << (sal_uInt16)SbxLONG; // VarType Id
                 *pStrm << rVar.GetLong();
                 break;
         case SbxSALINT64:
         case SbxSALUINT64:
                 if( bIsVariant )
-                    *pStrm << (USHORT)SbxSALINT64; // VarType Id
+                    *pStrm << (sal_uInt16)SbxSALINT64; // VarType Id
                 *pStrm << (sal_uInt64)rVar.GetInt64();
                 break;
         case SbxSINGLE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)eType; // VarType Id
+                    *pStrm << (sal_uInt16)eType; // VarType Id
                 *pStrm << rVar.GetSingle();
                 break;
 
@@ -901,7 +1014,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
         case SbxCURRENCY:
         case SbxDATE:
                 if( bIsVariant )
-                    *pStrm << (USHORT)eType; // VarType Id
+                    *pStrm << (sal_uInt16)eType; // VarType Id
                 *pStrm << rVar.GetDouble();
                 break;
 
@@ -912,7 +1025,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
                 if( !bBinary || bIsArray )
                 {
                     if( bIsVariant )
-                        *pStrm << (USHORT)SbxSTRING;
+                        *pStrm << (sal_uInt16)SbxSTRING;
                     pStrm->WriteByteString( rStr, gsl_getSystemTextEncoding() );
                     //*pStrm << rStr;
                 }
@@ -929,31 +1042,31 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
 
         default:
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                return FALSE;
+                return sal_False;
     }
 
     if( nBlockLen )
         pStrm->Seek( nFPos + nBlockLen );
-    return pStrm->GetErrorCode() ? FALSE : TRUE;
+    return pStrm->GetErrorCode() ? sal_False : sal_True;
 }
 
-BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
-    BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+    sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
 {
     (void)bBinary;
     (void)bIsArray;
 
     double aDouble;
 
-    ULONG nFPos = pStrm->Tell();
+    sal_uIntPtr nFPos = pStrm->Tell();
 
-    BOOL bIsVariant = !rVar.IsFixed();
+    sal_Bool bIsVariant = !rVar.IsFixed();
     SbxDataType eVarType = rVar.GetType();
 
     SbxDataType eSrcType = eVarType;
     if( bIsVariant )
     {
-        USHORT nTemp;
+        sal_uInt16 nTemp;
         *pStrm >> nTemp;
         eSrcType = (SbxDataType)nTemp;
     }
@@ -964,7 +1077,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxCHAR:
         case SbxBYTE:
                 {
-                BYTE aByte;
+                sal_uInt8 aByte;
                 *pStrm >> aByte;
                 rVar.PutByte( aByte );
                 }
@@ -978,7 +1091,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxINT:
         case SbxUINT:
                 {
-                INT16 aInt;
+                sal_Int16 aInt;
                 *pStrm >> aInt;
                 rVar.PutInteger( aInt );
                 }
@@ -987,7 +1100,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
         case SbxLONG:
         case SbxULONG:
                 {
-                INT32 aInt;
+                sal_Int32 aInt;
                 *pStrm >> aInt;
                 rVar.PutLong( aInt );
                 }
@@ -1034,23 +1147,23 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
 
         default:
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                return FALSE;
+                return sal_False;
     }
 
     if( nBlockLen )
         pStrm->Seek( nFPos + nBlockLen );
-    return pStrm->GetErrorCode() ? FALSE : TRUE;
+    return pStrm->GetErrorCode() ? sal_False : sal_True;
 }
 
 
 // nCurDim = 1...n
-BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
-    BOOL bBinary, short nCurDim, short* pOtherDims, BOOL bWrite )
+sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+    sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
 {
     DBG_ASSERT( nCurDim > 0,"Bad Dim");
     short nLower, nUpper;
     if( !rArr.GetDim( nCurDim, nLower, nUpper ) )
-        return FALSE;
+        return sal_False;
     for( short nCur = nLower; nCur <= nUpper; nCur++ )
     {
         pOtherDims[ nCurDim-1 ] = nCur;
@@ -1059,19 +1172,19 @@ BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
         else
         {
             SbxVariable* pVar = rArr.Get( (const short*)pOtherDims );
-            BOOL bRet;
+            sal_Bool bRet;
             if( bWrite )
-                bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+                bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
             else
-                bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+                bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
             if( !bRet )
-                return FALSE;
+                return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-void PutGet( SbxArray& rPar, BOOL bPut )
+void PutGet( SbxArray& rPar, sal_Bool bPut )
 {
     // Wir brauchen 3 Parameter
     if ( rPar.Count() != 4 )
@@ -1079,9 +1192,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    INT16 nFileNo = rPar.Get(1)->GetInteger();
+    sal_Int16 nFileNo = rPar.Get(1)->GetInteger();
     SbxVariable* pVar2 = rPar.Get(2);
-    BOOL bHasRecordNo = (BOOL)(pVar2->GetType() != SbxEMPTY);
+    sal_Bool bHasRecordNo = (sal_Bool)(pVar2->GetType() != SbxEMPTY);
     long nRecordNo = pVar2->GetLong();
     if ( nFileNo < 1 || ( bHasRecordNo && nRecordNo < 1 ) )
     {
@@ -1099,7 +1212,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     }
 
     SvStream* pStrm = pSbStrm->GetStrm();
-    BOOL bRandom = pSbStrm->IsRandom();
+    sal_Bool bRandom = pSbStrm->IsRandom();
     short nBlockLen = bRandom ? pSbStrm->GetBlockLen() : 0;
 
     if( bPut )
@@ -1111,7 +1224,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     // auf die Startposition seeken
     if( bHasRecordNo )
     {
-        ULONG nFilePos = bRandom ? (ULONG)(nBlockLen*nRecordNo) : (ULONG)nRecordNo;
+        sal_uIntPtr nFilePos = bRandom ? (sal_uIntPtr)(nBlockLen*nRecordNo) : (sal_uIntPtr)nRecordNo;
         pStrm->Seek( nFilePos );
     }
 
@@ -1123,11 +1236,11 @@ void PutGet( SbxArray& rPar, BOOL bPut )
         pArr = PTR_CAST(SbxDimArray,pParObj);
     }
 
-    BOOL bRet;
+    sal_Bool bRet;
 
     if( pArr )
     {
-        ULONG nFPos = pStrm->Tell();
+        sal_uIntPtr nFPos = pStrm->Tell();
         short nDims = pArr->GetDims();
         short* pDims = new short[ nDims ];
         bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);
@@ -1138,9 +1251,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
     else
     {
         if( bPut )
-            bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+            bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
         else
-            bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+            bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
     }
     if( !bRet || pStrm->GetErrorCode() )
         StarBASIC::Error( SbERR_IO_ERROR );
@@ -1151,7 +1264,7 @@ RTLFUNC(Put)
     (void)pBasic;
     (void)bWrite;
 
-    PutGet( rPar, TRUE );
+    PutGet( rPar, sal_True );
 }
 
 RTLFUNC(Get)
@@ -1159,7 +1272,7 @@ RTLFUNC(Get)
     (void)pBasic;
     (void)bWrite;
 
-    PutGet( rPar, FALSE );
+    PutGet( rPar, sal_False );
 }
 
 RTLFUNC(Environ)
@@ -1174,46 +1287,21 @@ RTLFUNC(Environ)
     }
     String aResult;
     // sollte ANSI sein, aber unter Win16 in DLL nicht moeglich
-#if defined(WIN)
-    LPSTR lpszEnv = GetDOSEnvironment();
-    String aCompareStr( rPar.Get(1)->GetString() );
-    aCompareStr += '=';
-    const char* pCompare = aCompareStr.GetStr();
-    int nCompareLen = aCompareStr.Len();
-    while ( *lpszEnv )
-    {
-        // Es werden alle EnvString in der Form ENV=VAL 0-terminiert
-        // aneinander gehaengt.
-
-        if ( strnicmp( pCompare, lpszEnv, nCompareLen ) == 0 )
-        {
-            aResult = (const char*)(lpszEnv+nCompareLen);
-            rPar.Get(0)->PutString( aResult );
-            return;
-        }
-        lpszEnv += lstrlen( lpszEnv ) + 1; 	// Next Enviroment-String
-    }
-#else
     ByteString aByteStr( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() );
     const char* pEnvStr = getenv( aByteStr.GetBuffer() );
     if ( pEnvStr )
         aResult = String::CreateFromAscii( pEnvStr );
-#endif
     rPar.Get(0)->PutString( aResult );
 }
 
-static double GetDialogZoomFactor( BOOL bX, long nValue )
+static double GetDialogZoomFactor( sal_Bool bX, long nValue )
 {
     OutputDevice* pDevice = Application::GetDefaultDevice();
     double nResult = 0;
     if( pDevice )
     {
         Size aRefSize( nValue, nValue );
-#ifndef WIN
         Fraction aFracX( 1, 26 );
-#else
-        Fraction aFracX( 1, 23 );
-#endif
         Fraction aFracY( 1, 24 );
         MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY );
         Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap );
@@ -1246,7 +1334,7 @@ RTLFUNC(GetDialogZoomFactorX)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    rPar.Get(0)->PutDouble( GetDialogZoomFactor( TRUE, rPar.Get(1)->GetLong() ));
+    rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_True, rPar.Get(1)->GetLong() ));
 }
 
 RTLFUNC(GetDialogZoomFactorY)
@@ -1259,7 +1347,7 @@ RTLFUNC(GetDialogZoomFactorY)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
-    rPar.Get(0)->PutDouble( GetDialogZoomFactor( FALSE, rPar.Get(1)->GetLong()));
+    rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_False, rPar.Get(1)->GetLong()));
 }
 
 
@@ -1328,7 +1416,7 @@ RTLFUNC(TypeLen)
     else
     {
         SbxDataType eType = rPar.Get(1)->GetType();
-        INT16 nLen = 0;
+        sal_Int16 nLen = 0;
         switch( eType )
         {
             case SbxEMPTY:
@@ -1383,7 +1471,7 @@ RTLFUNC(TypeLen)
             case SbxLPWSTR:
             case SbxCoreSTRING:
             case SbxSTRING:
-                nLen = (INT16)rPar.Get(1)->GetString().Len();
+                nLen = (sal_Int16)rPar.Get(1)->GetString().Len();
                 break;
 
             default:
@@ -1482,7 +1570,7 @@ RTLFUNC(EqualUnoObjects)
 // Instanciate "com.sun.star.awt.UnoControlDialog" on basis
 // of a DialogLibrary entry: Convert from XML-ByteSequence
 // and attach events. Implemented in classes\eventatt.cxx
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
 
 RTLFUNC(CreateUnoDialog)
 {
@@ -1555,13 +1643,19 @@ RTLFUNC(GetDefaultContext)
     RTL_Impl_GetDefaultContext( pBasic, rPar, bWrite );
 }
 
+#ifdef DBG_TRACE_BASIC
+RTLFUNC(TraceCommand)
+{
+    RTL_Impl_TraceCommand( pBasic, rPar, bWrite );
+}
+#endif
 
 RTLFUNC(Join)
 {
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount != 3 && nParCount != 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1602,7 +1696,7 @@ RTLFUNC(Split)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount < 2 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1620,7 +1714,7 @@ RTLFUNC(Split)
         else
             aDelim = String::CreateFromAscii( " " );
 
-        INT32 nCount = -1;
+        sal_Int32 nCount = -1;
         if( nParCount == 4 )
             nCount = rPar.Get(3)->GetLong();
 
@@ -1674,7 +1768,7 @@ RTLFUNC(Split)
 
     // Array zurueckliefern
     SbxVariableRef refVar = rPar.Get(0);
-    USHORT nFlags = refVar->GetFlags();
+    sal_uInt16 nFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->PutObject( pArray );
     refVar->SetFlags( nFlags );
@@ -1687,7 +1781,7 @@ RTLFUNC(MonthName)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 2 && nParCount != 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1703,14 +1797,14 @@ RTLFUNC(MonthName)
     Sequence< CalendarItem > aMonthSeq = xCalendar->getMonths();
     sal_Int32 nMonthCount = aMonthSeq.getLength();
 
-    INT16 nVal = rPar.Get(1)->GetInteger();
+    sal_Int16 nVal = rPar.Get(1)->GetInteger();
     if( nVal < 1 || nVal > nMonthCount )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
 
-    BOOL bAbbreviate = false;
+    sal_Bool bAbbreviate = false;
     if( nParCount == 3 )
         bAbbreviate = rPar.Get(2)->GetBool();
 
@@ -1727,7 +1821,7 @@ RTLFUNC(WeekdayName)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 2 || nParCount > 4 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1742,9 +1836,9 @@ RTLFUNC(WeekdayName)
     }
 
     Sequence< CalendarItem > aDaySeq = xCalendar->getDays();
-    INT16 nDayCount = (INT16)aDaySeq.getLength();
-    INT16 nDay = rPar.Get(1)->GetInteger();
-    INT16 nFirstDay = 0;
+    sal_Int16 nDayCount = (sal_Int16)aDaySeq.getLength();
+    sal_Int16 nDay = rPar.Get(1)->GetInteger();
+    sal_Int16 nFirstDay = 0;
     if( nParCount == 4 )
     {
         nFirstDay = rPar.Get(3)->GetInteger();
@@ -1755,7 +1849,7 @@ RTLFUNC(WeekdayName)
         }
     }
     if( nFirstDay == 0 )
-        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
 
     nDay = 1 + (nDay + nDayCount + nFirstDay - 2) % nDayCount;
     if( nDay < 1 || nDay > nDayCount )
@@ -1764,7 +1858,7 @@ RTLFUNC(WeekdayName)
         return;
     }
 
-    BOOL bAbbreviate = false;
+    sal_Bool bAbbreviate = false;
     if( nParCount >= 3 )
     {
         SbxVariable* pPar2 = rPar.Get(2);
@@ -1779,16 +1873,16 @@ RTLFUNC(WeekdayName)
     rPar.Get(0)->PutString( String(aRetStr) );
 }
 
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 )
 {
     Date aRefDate( 1,1,1900 );
     long nDays = (long) aDate;
     nDays -= 2;	// normieren: 1.1.1900 => 0
     aRefDate += nDays;
     DayOfWeek aDay = aRefDate.GetDayOfWeek();
-    INT16 nDay;
+    sal_Int16 nDay;
     if ( aDay != SUNDAY )
-        nDay = (INT16)aDay + 2;
+        nDay = (sal_Int16)aDay + 2;
     else
         nDay = 1;	// 1==Sonntag
 
@@ -1808,7 +1902,7 @@ INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay
                 StarBASIC::Error( SbERR_INTERNAL_ERROR );
                 return 0;
             }
-            nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+            nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
         }
         nDay = 1 + (nDay + 7 - nFirstDay) % 7;
     }
@@ -1820,7 +1914,7 @@ RTLFUNC(Weekday)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if ( nParCount < 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
     else
@@ -1828,13 +1922,13 @@ RTLFUNC(Weekday)
         double aDate = rPar.Get(1)->GetDate();
 
         bool bFirstDay = false;
-        INT16 nFirstDay = 0;
+        sal_Int16 nFirstDay = 0;
         if ( nParCount > 2 )
         {
             nFirstDay = rPar.Get(2)->GetInteger();
             bFirstDay = true;
         }
-        INT16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
+        sal_Int16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
         rPar.Get(0)->PutInteger( nDay );
     }
 }
@@ -1888,7 +1982,7 @@ static IntervalInfo pIntervalTable[] =
 IntervalInfo* getIntervalInfo( const String& rStringCode )
 {
     IntervalInfo* pInfo = NULL;
-    INT16 i = 0;
+    sal_Int16 i = 0;
     while( (pInfo = pIntervalTable + i)->mpStringCode != NULL )
     {
         if( rStringCode.EqualsIgnoreCaseAscii( pInfo->mpStringCode ) )
@@ -1899,30 +1993,30 @@ IntervalInfo* getIntervalInfo( const String& rStringCode )
 }
 
 // From methods.cxx
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
-INT16 implGetDateDay( double aDate );
-INT16 implGetDateMonth( double aDate );
-INT16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
+sal_Int16 implGetDateDay( double aDate );
+sal_Int16 implGetDateMonth( double aDate );
+sal_Int16 implGetDateYear( double aDate );
 
-INT16 implGetHour( double dDate );
-INT16 implGetMinute( double dDate );
-INT16 implGetSecond( double dDate );
+sal_Int16 implGetHour( double dDate );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetSecond( double dDate );
 
 
-inline void implGetDayMonthYear( INT16& rnYear, INT16& rnMonth, INT16& rnDay, double dDate )
+inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
 {
     rnDay   = implGetDateDay( dDate );
     rnMonth = implGetDateMonth( dDate );
     rnYear  = implGetDateYear( dDate );
 }
 
-inline INT16 limitToINT16( INT32 n32 )
+inline sal_Int16 limitToINT16( sal_Int32 n32 )
 {
     if( n32 > 32767 )
         n32 = 32767;
     else if( n32 < -32768 )
         n32 = -32768;
-    return (INT16)n32;
+    return (sal_Int16)n32;
 }
 
 RTLFUNC(DateAdd)
@@ -1930,7 +2024,7 @@ RTLFUNC(DateAdd)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 4 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1945,7 +2039,7 @@ RTLFUNC(DateAdd)
         return;
     }
 
-    INT32 lNumber = rPar.Get(2)->GetLong();
+    sal_Int32 lNumber = rPar.Get(2)->GetLong();
     double dDate = rPar.Get(3)->GetDate();
     double dNewDate = 0;
     if( pInfo->mbSimple )
@@ -1958,15 +2052,15 @@ RTLFUNC(DateAdd)
         // Keep hours, minutes, seconds
         double dHoursMinutesSeconds = dDate - floor( dDate );
 
-        BOOL bOk = TRUE;
-        INT16 nYear, nMonth, nDay;
-        INT16 nTargetYear16 = 0, nTargetMonth = 0;
+        sal_Bool bOk = sal_True;
+        sal_Int16 nYear, nMonth, nDay;
+        sal_Int16 nTargetYear16 = 0, nTargetMonth = 0;
         implGetDayMonthYear( nYear, nMonth, nDay, dDate );
         switch( pInfo->meInterval )
         {
             case INTERVAL_YYYY:
             {
-                INT32 nTargetYear = lNumber + nYear;
+                sal_Int32 nTargetYear = lNumber + nYear;
                 nTargetYear16 = limitToINT16( nTargetYear );
                 nTargetMonth = nMonth;
                 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -1978,20 +2072,20 @@ RTLFUNC(DateAdd)
                 bool bNeg = (lNumber < 0);
                 if( bNeg )
                     lNumber = -lNumber;
-                INT32 nYearsAdd;
-                INT16 nMonthAdd;
+                sal_Int32 nYearsAdd;
+                sal_Int16 nMonthAdd;
                 if( pInfo->meInterval == INTERVAL_Q )
                 {
                     nYearsAdd = lNumber / 4;
-                    nMonthAdd = (INT16)( 3 * (lNumber % 4) );
+                    nMonthAdd = (sal_Int16)( 3 * (lNumber % 4) );
                 }
                 else
                 {
                     nYearsAdd = lNumber / 12;
-                    nMonthAdd = (INT16)( lNumber % 12 );
+                    nMonthAdd = (sal_Int16)( lNumber % 12 );
                 }
 
-                INT32 nTargetYear;
+                sal_Int32 nTargetYear;
                 if( bNeg )
                 {
                     nTargetMonth = nMonth - nMonthAdd;
@@ -2000,7 +2094,7 @@ RTLFUNC(DateAdd)
                         nTargetMonth += 12;
                         nYearsAdd++;
                     }
-                    nTargetYear = (INT32)nYear - nYearsAdd;
+                    nTargetYear = (sal_Int32)nYear - nYearsAdd;
                 }
                 else
                 {
@@ -2010,7 +2104,7 @@ RTLFUNC(DateAdd)
                         nTargetMonth -= 12;
                         nYearsAdd++;
                     }
-                    nTargetYear = (INT32)nYear + nYearsAdd;
+                    nTargetYear = (sal_Int32)nYear + nYearsAdd;
                 }
                 nTargetYear16 = limitToINT16( nTargetYear );
                 bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2022,14 +2116,14 @@ RTLFUNC(DateAdd)
         if( bOk )
         {
             // Overflow?
-            INT16 nNewYear, nNewMonth, nNewDay;
+            sal_Int16 nNewYear, nNewMonth, nNewDay;
             implGetDayMonthYear( nNewYear, nNewMonth, nNewDay, dNewDate );
             if( nNewYear > 9999 || nNewYear < 100 )
             {
                 StarBASIC::Error( SbERR_BAD_ARGUMENT );
                 return;
             }
-            INT16 nCorrectionDay = nDay;
+            sal_Int16 nCorrectionDay = nDay;
             while( nNewMonth > nTargetMonth )
             {
                 nCorrectionDay--;
@@ -2055,7 +2149,7 @@ RTLFUNC(DateDiff)
 
     // DateDiff(interval, date1, date2[, firstdayofweek[, firstweekofyear]])
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 4 || nParCount > 6 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2078,30 +2172,30 @@ RTLFUNC(DateDiff)
     {
         case INTERVAL_YYYY:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
             dRet = nYear2 - nYear1;
             break;
         }
         case INTERVAL_Q:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
-            INT16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
-            INT16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
-            INT16 nQGes1 = 4 * nYear1 + nQ1;
-            INT16 nQGes2 = 4 * nYear2 + nQ2;
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
+            sal_Int16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
+            sal_Int16 nQGes1 = 4 * nYear1 + nQ1;
+            sal_Int16 nQGes2 = 4 * nYear2 + nQ2;
             dRet = nQGes2 - nQGes1;
             break;
         }
         case INTERVAL_M:
         {
-            INT16 nYear1 = implGetDateYear( dDate1 );
-            INT16 nYear2 = implGetDateYear( dDate2 );
-            INT16 nMonth1 = implGetDateMonth( dDate1 );
-            INT16 nMonth2 = implGetDateMonth( dDate2 );
-            INT16 nMonthGes1 = 12 * nYear1 + nMonth1;
-            INT16 nMonthGes2 = 12 * nYear2 + nMonth2;
+            sal_Int16 nYear1 = implGetDateYear( dDate1 );
+            sal_Int16 nYear2 = implGetDateYear( dDate2 );
+            sal_Int16 nMonth1 = implGetDateMonth( dDate1 );
+            sal_Int16 nMonth2 = implGetDateMonth( dDate2 );
+            sal_Int16 nMonthGes1 = 12 * nYear1 + nMonth1;
+            sal_Int16 nMonthGes2 = 12 * nYear2 + nMonth2;
             dRet = nMonthGes2 - nMonthGes1;
             break;
         }
@@ -2120,7 +2214,7 @@ RTLFUNC(DateDiff)
             double dDays2 = floor( dDate2 );
             if( pInfo->meInterval == INTERVAL_WW )
             {
-                INT16 nFirstDay = 1;	// Default
+                sal_Int16 nFirstDay = 1;	// Default
                 if( nParCount >= 5 )
                 {
                     nFirstDay = rPar.Get(4)->GetInteger();
@@ -2137,17 +2231,17 @@ RTLFUNC(DateDiff)
                             StarBASIC::Error( SbERR_INTERNAL_ERROR );
                             return;
                         }
-                        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+                        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
                     }
                 }
-                INT16 nDay1 = implGetWeekDay( dDate1 );
-                INT16 nDay1_Diff = nDay1 - nFirstDay;
+                sal_Int16 nDay1 = implGetWeekDay( dDate1 );
+                sal_Int16 nDay1_Diff = nDay1 - nFirstDay;
                 if( nDay1_Diff < 0 )
                     nDay1_Diff += 7;
                 dDays1 -= nDay1_Diff;
 
-                INT16 nDay2 = implGetWeekDay( dDate2 );
-                INT16 nDay2_Diff = nDay2 - nFirstDay;
+                sal_Int16 nDay2 = implGetWeekDay( dDate2 );
+                sal_Int16 nDay2_Diff = nDay2 - nFirstDay;
                 if( nDay2_Diff < 0 )
                     nDay2_Diff += 7;
                 dDays2 -= nDay2_Diff;
@@ -2182,7 +2276,7 @@ RTLFUNC(DateDiff)
 }
 
 double implGetDateOfFirstDayInFirstWeek
-    ( INT16 nYear, INT16& nFirstDay, INT16& nFirstWeek, bool* pbError = NULL )
+    ( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = NULL )
 {
     SbError nError = 0;
     if( nFirstDay < 0 || nFirstDay > 7 )
@@ -2208,9 +2302,9 @@ double implGetDateOfFirstDayInFirstWeek
     }
 
     if( nFirstDay == 0 )
-        nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+        nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
 
-    INT16 nFirstWeekMinDays = 0;	// Not used for vbFirstJan1 = default
+    sal_Int16 nFirstWeekMinDays = 0;	// Not used for vbFirstJan1 = default
     if( nFirstWeek == 0 )
     {
         nFirstWeekMinDays =	xCalendar->getMinimumNumberOfDaysForFirstWeek();
@@ -2233,14 +2327,14 @@ double implGetDateOfFirstDayInFirstWeek
     implDateSerial( nYear, 1, 1, dBaseDate );
     double dRetDate = dBaseDate;
 
-    INT16 nWeekDay0101 = implGetWeekDay( dBaseDate );
-    INT16 nDayDiff = nWeekDay0101 - nFirstDay;
+    sal_Int16 nWeekDay0101 = implGetWeekDay( dBaseDate );
+    sal_Int16 nDayDiff = nWeekDay0101 - nFirstDay;
     if( nDayDiff < 0 )
         nDayDiff += 7;
 
     if( nFirstWeekMinDays )
     {
-        INT16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
+        sal_Int16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
         if( nThisWeeksDaysInYearCount < nFirstWeekMinDays )
             nDayDiff -= 7;
     }
@@ -2255,7 +2349,7 @@ RTLFUNC(DatePart)
 
     // DatePart(interval, date[,firstdayofweek[, firstweekofyear]])
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 3 || nParCount > 5 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2272,7 +2366,7 @@ RTLFUNC(DatePart)
 
     double dDate = rPar.Get(2)->GetDate();
 
-    INT32 nRet = 0;
+    sal_Int32 nRet = 0;
     switch( pInfo->meInterval )
     {
         case INTERVAL_YYYY:
@@ -2292,10 +2386,10 @@ RTLFUNC(DatePart)
         }
         case INTERVAL_Y:
         {
-            INT16 nYear = implGetDateYear( dDate );
+            sal_Int16 nYear = implGetDateYear( dDate );
             double dBaseDate;
             implDateSerial( nYear, 1, 1, dBaseDate );
-            nRet = 1 + INT32( dDate - dBaseDate );
+            nRet = 1 + sal_Int32( dDate - dBaseDate );
             break;
         }
         case INTERVAL_D:
@@ -2306,7 +2400,7 @@ RTLFUNC(DatePart)
         case INTERVAL_W:
         {
             bool bFirstDay = false;
-            INT16 nFirstDay = 1;	// Default
+            sal_Int16 nFirstDay = 1;	// Default
             if( nParCount >= 4 )
             {
                 nFirstDay = rPar.Get(3)->GetInteger();
@@ -2317,15 +2411,15 @@ RTLFUNC(DatePart)
         }
         case INTERVAL_WW:
         {
-            INT16 nFirstDay = 1;	// Default
+            sal_Int16 nFirstDay = 1;	// Default
             if( nParCount >= 4 )
                 nFirstDay = rPar.Get(3)->GetInteger();
 
-            INT16 nFirstWeek = 1;	// Default
+            sal_Int16 nFirstWeek = 1;	// Default
             if( nParCount == 5 )
                 nFirstWeek = rPar.Get(4)->GetInteger();
 
-            INT16 nYear = implGetDateYear( dDate );
+            sal_Int16 nYear = implGetDateYear( dDate );
             bool bError = false;
             double dYearFirstDay = implGetDateOfFirstDayInFirstWeek( nYear, nFirstDay, nFirstWeek, &bError );
             if( !bError )
@@ -2345,7 +2439,7 @@ RTLFUNC(DatePart)
 
                 // Calculate week
                 double dDiff = dDate - dYearFirstDay;
-                nRet = 1 + INT32( dDiff / 7 );
+                nRet = 1 + sal_Int32( dDiff / 7 );
             }
             break;
         }
@@ -2376,7 +2470,7 @@ RTLFUNC(FormatDateTime)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount < 2 || nParCount > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2384,7 +2478,7 @@ RTLFUNC(FormatDateTime)
     }
 
     double dDate = rPar.Get(1)->GetDate();
-    INT16 nNamedFormat = 0;
+    sal_Int16 nNamedFormat = 0;
     if( nParCount > 2 )
     {
         nNamedFormat = rPar.Get(2)->GetInteger();
@@ -2434,7 +2528,7 @@ RTLFUNC(FormatDateTime)
             }
 
             LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
-            ULONG nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
+            sal_uIntPtr nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
             Color* pCol;
             pFormatter->GetOutputString( dDate, nIndex, aRetStr, &pCol );
 
@@ -2479,7 +2573,7 @@ RTLFUNC(Round)
     (void)pBasic;
     (void)bWrite;
 
-    USHORT nParCount = rPar.Count();
+    sal_uInt16 nParCount = rPar.Count();
     if( nParCount != 2 && nParCount != 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2498,7 +2592,7 @@ RTLFUNC(Round)
             dVal = -dVal;
         }
 
-        INT16 numdecimalplaces = 0;
+        sal_Int16 numdecimalplaces = 0;
         if( nParCount == 3 )
         {
             numdecimalplaces = rPar.Get(2)->GetInteger();
@@ -2557,7 +2651,7 @@ RTLFUNC(SYD)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 4 )
     {
@@ -2581,7 +2675,7 @@ RTLFUNC(SLN)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 )
     {
@@ -2604,7 +2698,7 @@ RTLFUNC(Pmt)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 || nArgCount > 5 )
     {
@@ -2649,7 +2743,7 @@ RTLFUNC(PPmt)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 4 || nArgCount > 6 )
     {
@@ -2696,7 +2790,7 @@ RTLFUNC(PV)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 || nArgCount > 5 )
     {
@@ -2741,7 +2835,7 @@ RTLFUNC(NPV)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 1 || nArgCount > 2 )
     {
@@ -2769,7 +2863,7 @@ RTLFUNC(NPer)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 || nArgCount > 5 )
     {
@@ -2814,7 +2908,7 @@ RTLFUNC(MIRR)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 )
     {
@@ -2845,7 +2939,7 @@ RTLFUNC(IRR)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 1 || nArgCount > 2 )
     {
@@ -2882,7 +2976,7 @@ RTLFUNC(IPmt)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 4 || nArgCount > 6 )
     {
@@ -2929,7 +3023,7 @@ RTLFUNC(FV)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 || nArgCount > 5 )
     {
@@ -2974,7 +3068,7 @@ RTLFUNC(DDB)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 4 || nArgCount > 5 )
     {
@@ -3013,7 +3107,7 @@ RTLFUNC(Rate)
     (void)pBasic;
     (void)bWrite;
 
-    ULONG nArgCount = rPar.Count()-1;
+    sal_uLong nArgCount = rPar.Count()-1;
 
     if ( nArgCount < 3 || nArgCount > 6 )
     {
@@ -3096,7 +3190,7 @@ RTLFUNC(CompatibilityMode)
     (void)bWrite;
 
     bool bEnabled = false;
-    USHORT nCount = rPar.Count();
+    sal_uInt16 nCount = rPar.Count();
     if ( nCount != 1 && nCount != 2 )
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
 
@@ -3123,8 +3217,8 @@ RTLFUNC(Input)
         return;
     }
 
-    USHORT nByteCount  = rPar.Get(1)->GetUShort();
-    INT16  nFileNumber = rPar.Get(2)->GetInteger();
+    sal_uInt16 nByteCount  = rPar.Get(1)->GetUShort();
+    sal_Int16  nFileNumber = rPar.Get(2)->GetInteger();
 
     SbiIoSystem* pIosys = pINST->GetIoSystem();
     SbiStream* pSbStrm = pIosys->GetStream( nFileNumber );
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 44f87c16fb..706858c333 100644..100755
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -35,8 +35,8 @@
 #include "errobject.hxx"
 
 
-// Properties und Methoden legen beim Get (bWrite = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bWrite = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bWrite = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bWrite = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 RTLFUNC(Erl)
@@ -60,9 +60,9 @@ RTLFUNC(Err)
     {
         if( bWrite )
         {
-            INT32 nVal = rPar.Get( 0 )->GetLong();
+            sal_Int32 nVal = rPar.Get( 0 )->GetLong();
             if( nVal <= 65535L )
-                StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+                StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) );
         }
         else
             rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
@@ -74,7 +74,7 @@ RTLFUNC(False)
     (void)pBasic;
     (void)bWrite;
     
-    rPar.Get(0)->PutBool( FALSE );
+    rPar.Get(0)->PutBool( sal_False );
 }
 
 RTLFUNC(Empty)
@@ -115,7 +115,7 @@ RTLFUNC(True)
     (void)pBasic;
     (void)bWrite;
     
-    rPar.Get( 0 )->PutBool( TRUE );
+    rPar.Get( 0 )->PutBool( sal_True );
 }
 
 RTLFUNC(ATTR_NORMAL)
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index 10b866c827..90d31ffd81 100644..100755
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -27,11 +27,12 @@
  ************************************************************************/
 
 #include <basic/sbstar.hxx>
+#include "sbtrace.hxx"
 
-#define	RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+#define	RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
 #define	RTLNAME( name ) &SbRtl_##name
 
-typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, BOOL bWrite );
+typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, sal_Bool bWrite );
 
 // Properties
 
@@ -285,6 +286,7 @@ extern RTLFUNC(AboutStarBasic);
 extern RTLFUNC(LoadPicture);
 extern RTLFUNC(SavePicture);
 
+extern RTLFUNC(CallByName);
 extern RTLFUNC(CBool); // JSM
 extern RTLFUNC(CByte); // JSM
 extern RTLFUNC(CCur); // JSM
@@ -360,6 +362,10 @@ extern RTLFUNC(CDec);
 
 extern RTLFUNC(Partition); // Fong
 
+#ifdef DBG_TRACE_BASIC
+extern RTLFUNC(TraceCommand);
+#endif
+
 extern double Now_Impl();
 extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
 
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 2cb8b5d22c..468e9f28ff 100644..100755
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -46,6 +46,8 @@
 #include "sbunoobj.hxx"
 #include "errobject.hxx"
 
+#include "comenumwrapper.hxx"
+
 SbxVariable* getDefaultProp( SbxVariable* pRef );
 
 using namespace ::com::sun::star;
@@ -60,13 +62,13 @@ bool SbiRuntime::isVBAEnabled()
 }
 
 // #91147 Global reschedule flag
-static BOOL bStaticGlobalEnableReschedule = TRUE;
+static sal_Bool bStaticGlobalEnableReschedule = sal_True;
 
-void StarBASIC::StaticEnableReschedule( BOOL bReschedule )
+void StarBASIC::StaticEnableReschedule( sal_Bool bReschedule )
 {
     bStaticGlobalEnableReschedule = bReschedule;
 }
-void StarBASIC::SetVBAEnabled( BOOL bEnabled )
+void StarBASIC::SetVBAEnabled( sal_Bool bEnabled )
 {
     if ( bDocBasic )
     {
@@ -74,15 +76,15 @@ void StarBASIC::SetVBAEnabled( BOOL bEnabled )
     }
 }
 
-BOOL StarBASIC::isVBAEnabled()
+sal_Bool StarBASIC::isVBAEnabled()
 {
     if ( bDocBasic )
     {
         if( SbiRuntime::isVBAEnabled() )
-            return TRUE;
+            return sal_True;
         return bVBAEnabled;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -254,12 +256,12 @@ SbiRTLData::~SbiRTLData()
 // (siehe auch step2.cxx, SbiRuntime::StepSTMNT() )
 
 // Hilfsfunktion, um den BreakCallLevel gemaess der der Debug-Flags zu ermitteln
-void SbiInstance::CalcBreakCallLevel( USHORT nFlags )
+void SbiInstance::CalcBreakCallLevel( sal_uInt16 nFlags )
 {
     // Break-Flag wegfiltern
-    nFlags &= ~((USHORT)SbDEBUG_BREAK);
+    nFlags &= ~((sal_uInt16)SbDEBUG_BREAK);
 
-    USHORT nRet;
+    sal_uInt16 nRet;
     switch( nFlags )
     {
         case SbDEBUG_STEPINTO:
@@ -292,8 +294,8 @@ SbiInstance::SbiInstance( StarBASIC* p )
     nBreakCallLvl = 0;
     nErr	 =
     nErl	 = 0;
-    bReschedule = TRUE;
-    bCompatibility = FALSE;
+    bReschedule = sal_True;
+    bCompatibility = sal_False;
 }
 
 SbiInstance::~SbiInstance()
@@ -451,7 +453,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 {
     if( !bWatchMode )
     {
-        SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+        SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
         if ( !n )
             n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
 
@@ -465,7 +467,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 
 void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const String& rMsg )
 {
-    SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+    SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
     if( !n )
         n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
 
@@ -516,7 +518,7 @@ SbModule* SbiInstance::GetActiveModule()
         return NULL;
 }
 
-SbMethod* SbiInstance::GetCaller( USHORT nLevel )
+SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel )
 {
     SbiRuntime* p = pRun;
     while( nLevel-- && p )
@@ -544,7 +546,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
 
 // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes)
 
-SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
+SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
          : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ),
            pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), mpExtCaller(0), m_nLastTime(0)
 {
@@ -559,11 +561,11 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
     pRestart  = NULL;
     pNext     = NULL;
     pCode     =
-    pStmnt    = (const BYTE* ) pImg->GetCode() + nStart;
+    pStmnt    = (const sal_uInt8* ) pImg->GetCode() + nStart;
     bRun      =
-    bError    = TRUE;
-    bInError  = FALSE;
-    bBlocked  = FALSE;
+    bError    = sal_True;
+    bInError  = sal_False;
+    bBlocked  = sal_False;
     nLine	  = 0;
     nCol1	  = 0;
     nCol2	  = 0;
@@ -623,10 +625,10 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
     refParams->Put( pMeth, 0 );
 
     SbxInfo* pInfo = pMeth ? pMeth->GetInfo() : NULL;
-    USHORT nParamCount = pParams ? pParams->Count() : 1;
+    sal_uInt16 nParamCount = pParams ? pParams->Count() : 1;
     if( nParamCount > 1 )
     {
-        for( USHORT i = 1 ; i < nParamCount ; i++ )
+        for( sal_uInt16 i = 1 ; i < nParamCount ; i++ )
         {
             const SbxParamInfo* p = pInfo ? pInfo->GetParam( i ) : NULL;
 
@@ -634,9 +636,9 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
             if( p && (p->nUserData & PARAM_INFO_PARAMARRAY) != 0 )
             {
                 SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
-                USHORT nParamArrayParamCount = nParamCount - i;
+                sal_uInt16 nParamArrayParamCount = nParamCount - i;
                 pArray->unoAddDim( 0, nParamArrayParamCount - 1 );
-                for( USHORT j = i ; j < nParamCount ; j++ )
+                for( sal_uInt16 j = i ; j < nParamCount ; j++ )
                 {
                     SbxVariable* v = pParams->Get( j );
                     short nDimIndex = j - i;
@@ -654,16 +656,16 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
 
             SbxVariable* v = pParams->Get( i );
             // Methoden sind immer byval!
-            BOOL bByVal = v->IsA( TYPE(SbxMethod) );
+            sal_Bool bByVal = v->IsA( TYPE(SbxMethod) );
             SbxDataType t = v->GetType();
             if( p )
             {
-                bByVal |= BOOL( ( p->eType & SbxBYREF ) == 0 );
+                bByVal |= sal_Bool( ( p->eType & SbxBYREF ) == 0 );
                 t = (SbxDataType) ( p->eType & 0x0FFF );
 
                 if( !bByVal && t != SbxVARIANT &&
                     (!v->IsFixed() || (SbxDataType)(v->GetType() & 0x0FFF ) != t) )
-                        bByVal = TRUE;
+                        bByVal = sal_True;
             }
             if( bByVal )
             {
@@ -709,7 +711,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
 
 // Einen P-Code ausfuehren
 
-BOOL SbiRuntime::Step()
+sal_Bool SbiRuntime::Step()
 {
     if( bRun )
     {
@@ -732,7 +734,7 @@ BOOL SbiRuntime::Step()
         }
 
         SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
-        UINT32 nOp1, nOp2;
+        sal_uInt32 nOp1, nOp2;
         if( eOp <= SbOP0_END )
         {
             (this->*( aStep0[ eOp ] ) )();
@@ -782,7 +784,7 @@ BOOL SbiRuntime::Step()
             // Im Error Handler? Dann Std-Error
             if ( !bInError )
             {
-                bInError = TRUE;
+                bInError = sal_True;
 
                 if( !bError )			// On Error Resume Next
                     StepRESUME( 1 );
@@ -807,7 +809,7 @@ BOOL SbiRuntime::Step()
                 while( NULL != (pRt = pRt->pNext) )
                 {
                     // Gibt es einen Error-Handler?
-                    if( pRt->bError == FALSE || pRt->pError != NULL )
+                    if( pRt->bError == sal_False || pRt->pError != NULL )
                     {
                         pRtErrHdl = pRt;
                         break;
@@ -830,7 +832,7 @@ BOOL SbiRuntime::Step()
                         // Fehler setzen
                         pRt->nError = err;
                         if( pRt != pRtErrHdl )
-                            pRt->bRun = FALSE;
+                            pRt->bRun = sal_False;
 
                         // In Error-Stack eintragen
                         SbErrorStackEntry *pEntry = new SbErrorStackEntry
@@ -882,11 +884,12 @@ void SbiRuntime::Error( SbError _errCode, const String& _details )
 {
     if ( _errCode )
     {
-        OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
+        // Not correct for class module usage, remove for now
+        //OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
         if ( pInst->pRun == this )
         {
             pInst->Error( _errCode, _details );
-            OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
+            //OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
         }
         else
         {
@@ -918,7 +921,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
     {
         // TEST, has to be vb here always
 #ifdef DBG_UTIL
-        SbError nTmp = StarBASIC::GetSfxFromVBError( (USHORT)nError );
+        SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
         DBG_ASSERT( nTmp, "No VB error!" );
 #endif
 
@@ -928,7 +931,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
             rMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
     }
     // no num? most likely then it *is* really a vba err
-    USHORT nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
+    sal_uInt16 nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
     sal_Int32 nVBAErrorNumber = ( nVBErrorCode == 0 ) ? nError : nVBErrorCode;
     return nVBAErrorNumber;
 }
@@ -989,7 +992,7 @@ SbxVariableRef SbiRuntime::PopVar()
     return xVar;
 }
 
-BOOL SbiRuntime::ClearExprStack()
+sal_Bool SbiRuntime::ClearExprStack()
 {
     // Achtung: Clear() reicht nicht, da Methods geloescht werden muessen
     while ( nExprLvl )
@@ -997,7 +1000,7 @@ BOOL SbiRuntime::ClearExprStack()
         PopVar();
     }
     refExprStk->Clear();
-    return FALSE;
+    return sal_False;
 }
 
 // Variable auf dem Expression-Stack holen, ohne sie zu entfernen
@@ -1013,7 +1016,7 @@ SbxVariable* SbiRuntime::GetTOS( short n )
         return new SbxVariable;
     }
 #endif
-    return refExprStk->Get( (USHORT) n );
+    return refExprStk->Get( (sal_uInt16) n );
 }
 
 // Sicherstellen, dass TOS eine temporaere Variable ist
@@ -1048,7 +1051,7 @@ void SbiRuntime::TOSMakeTemp()
 }
 
 // Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
-void SbiRuntime::PushGosub( const BYTE* pc )
+void SbiRuntime::PushGosub( const sal_uInt8* pc )
 {
     if( ++nGosubLvl > MAXRECURSION )
         StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
@@ -1185,6 +1188,23 @@ void SbiRuntime::PushForEach()
             p->xEnumeration = xEnumerationAccess->createEnumeration();
             p->eForType = FOR_EACH_XENUMERATION;
         }
+        else if ( isVBAEnabled() && pUnoObj->isNativeCOMObject() )
+        {
+            uno::Reference< script::XInvocation > xInvocation;
+            if ( ( aAny >>= xInvocation ) && xInvocation.is() )
+            {
+                try
+                {
+                    p->xEnumeration = new ComEnumerationWrapper( xInvocation );
+                    p->eForType = FOR_EACH_XENUMERATION;
+                }
+                catch( uno::Exception& )
+                {}
+            }
+
+            if ( !p->xEnumeration.is() )
+                bError_ = true;
+        }
         else
         {
             bError_ = true;
@@ -1238,7 +1258,7 @@ void SbiRuntime::DllCall
       const String& aDLLName,	// Name der DLL
       SbxArray* pArgs,			// Parameter (ab Index 1, kann NULL sein)
       SbxDataType eResType,		// Returnwert
-      BOOL bCDecl )				// TRUE: nach C-Konventionen
+      sal_Bool bCDecl )				// sal_True: nach C-Konventionen
 {
     // No DllCall for "virtual" portal users
     if( needSecurityRestrictions() )
@@ -1265,13 +1285,13 @@ void SbiRuntime::DllCall
         Error( nErr );
     PushVar( pRes );
 }
-USHORT
-SbiRuntime::GetImageFlag( USHORT n ) const
+
+sal_uInt16 SbiRuntime::GetImageFlag( sal_uInt16 n ) const
 {
     return pImg->GetFlag( n );
 }
-USHORT
-SbiRuntime::GetBase()
+
+sal_uInt16 SbiRuntime::GetBase()
 {
     return pImg->GetBase();
 }
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 9332a931a8..852d628377 100644..100755
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -68,7 +68,7 @@ struct Methods {
     SbxDataType eType;      // Datentyp
     short       nArgs;      // Argumente und Flags
     RtlCall     pFunc;      // Function Pointer
-    USHORT		nHash;		// Hashcode
+    sal_uInt16		nHash;		// Hashcode
 };
 
 struct StringHashCode
@@ -135,6 +135,10 @@ static Methods aMethods[] = {
 { "Blue",        SbxINTEGER,   1 | _FUNCTION, RTLNAME(Blue),0               },
   { "RGB-Value",     SbxLONG, 0,NULL,0 },
 
+{ "CallByName",     SbxVARIANT,	  3 | _FUNCTION, RTLNAME(CallByName),0 },
+  { "Object",		SbxOBJECT,  0,NULL,0 },
+  { "ProcedureName",SbxSTRING,  0,NULL,0 },
+  { "CallType",     SbxINTEGER, 0,NULL,0 },
 { "CBool",          SbxBOOL,      1 | _FUNCTION, RTLNAME(CBool),0           },
   { "expression",   SbxVARIANT, 0,NULL,0 },
 { "CByte",          SbxBYTE,      1 | _FUNCTION, RTLNAME(CByte),0           },
@@ -645,6 +649,10 @@ static Methods aMethods[] = {
 { "TimeValue",      SbxDATE,      1 | _FUNCTION, RTLNAME(TimeValue),0       },
   { "String",       SbxSTRING, 0,NULL,0 },
 { "TOGGLE",   		SbxINTEGER,       _CPROP,    RTLNAME(TOGGLE),0      	},
+#ifdef DBG_TRACE_BASIC
+{ "TraceCommand",   SbxNULL,	  1 | _FUNCTION, RTLNAME(TraceCommand),0 },
+  { "Command",		SbxSTRING,  0,NULL,0 },
+#endif
 { "Trim",           SbxSTRING,    1 | _FUNCTION, RTLNAME(Trim),0            },
   { "String",       SbxSTRING, 0,NULL,0 },
 { "True",           SbxBOOL,          _CPROP,    RTLNAME(True),0            },
@@ -780,11 +788,11 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
     if( !pVar )
     {
         // sonst suchen
-        USHORT nHash_ = SbxVariable::MakeHashCode( rName );
+        sal_uInt16 nHash_ = SbxVariable::MakeHashCode( rName );
         Methods* p = aMethods;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         short nIndex = 0;
-        USHORT nSrchMask = _TYPEMASK;
+        sal_uInt16 nSrchMask = _TYPEMASK;
         switch( t )
         {
             case SbxCLASS_METHOD:	nSrchMask = _METHOD; break;
@@ -799,14 +807,14 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
              && ( rName.EqualsIgnoreCaseAscii( p->pName ) ) )
             {
                 SbiInstance* pInst = pINST;
-                bFound = TRUE;
+                bFound = sal_True;
                 if( p->nArgs & _COMPTMASK )
                 {
                     if( !pInst || !pInst->IsCompatibility() )
-                        bFound = FALSE;
+                        bFound = sal_False;
                 }
                 if ( pInst && pInst->IsCompatibility() && VBABlackListQuery::isBlackListed( rName ) )
-                            bFound = FALSE;
+                            bFound = sal_False;
                 break;
             }
             nIndex += ( p->nArgs & _ARGSMASK ) + 1;
@@ -834,8 +842,8 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
     return pVar;
 }
 
-// SetModified muß bei der RTL abgklemmt werden
-void SbiStdObject::SetModified( BOOL )
+// SetModified mu� bei der RTL abgklemmt werden
+void SbiStdObject::SetModified( sal_Bool )
 {
 }
 
@@ -850,17 +858,17 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        ULONG t = pHint->GetId();
-        USHORT nCallId = (USHORT) pVar->GetUserData();
+        sal_uIntPtr t = pHint->GetId();
+        sal_uInt16 nCallId = (sal_uInt16) pVar->GetUserData();
         if( nCallId )
         {
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     RtlCall p = (RtlCall) aMethods[ nCallId-1 ].pFunc;
@@ -895,7 +903,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
     {
         p++;
         String aName_ = String::CreateFromAscii( p->pName );
-        USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nFlags_ |= SBX_OPTIONAL;
         pInfo_->AddParam( aName_, p->eType, nFlags_ );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 58f2c047d8..1ef48bb6e8 100644..100755
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -72,7 +72,7 @@ SbxObject* SbStdFactory::CreateObject( const String& rClassName )
 
 
 
-void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -81,7 +81,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     }
 
     GraphicType eType = aGraphic.GetType();
-    INT16 nType = 0;
+    sal_Int16 nType = 0;
 
     if( eType == GRAPHIC_BITMAP )
         nType = 1;
@@ -93,7 +93,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
 }
 
 
-void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -105,10 +105,10 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     aSize =	GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
     aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
 
-    pVar->PutInteger( (INT16)aSize.Width() );
+    pVar->PutInteger( (sal_Int16)aSize.Width() );
 }
 
-void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
     {
@@ -120,7 +120,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
     aSize =	GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
     aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
 
-    pVar->PutInteger( (INT16)aSize.Height() );
+    pVar->PutInteger( (sal_Int16)aSize.Height() );
 }
 
 
@@ -170,8 +170,8 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar 	= pHint->GetVar();
         SbxArray*    pPar_ 	= pVar->GetParameters();
-        USHORT       nWhich	= (USHORT)pVar->GetUserData();
-        BOOL		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich	= (sal_uInt16)pVar->GetUserData();
+        sal_Bool		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Propteries
         switch( nWhich )
@@ -187,7 +187,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
 //-----------------------------------------------------------------------------
 
-void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetBold( pVar->GetBool() );
@@ -195,7 +195,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsBold() );
 }
 
-void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetItalic( pVar->GetBool() );
@@ -203,7 +203,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsItalic() );
 }
 
-void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetStrikeThrough( pVar->GetBool() );
@@ -211,7 +211,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsStrikeThrough() );
 }
 
-void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetUnderline( pVar->GetBool() );
@@ -219,15 +219,15 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
         pVar->PutBool( IsUnderline() );
 }
 
-void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
-        SetSize( (USHORT)pVar->GetInteger() );
+        SetSize( (sal_uInt16)pVar->GetInteger() );
     else
-        pVar->PutInteger( (INT16)GetSize() );
+        pVar->PutInteger( (sal_Int16)GetSize() );
 }
 
-void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
 {
     if( bWrite )
         SetFontName( pVar->GetString() );
@@ -292,8 +292,8 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar 	= pHint->GetVar();
         SbxArray*    pPar_ 	= pVar->GetParameters();
-        USHORT       nWhich	= (USHORT)pVar->GetUserData();
-        BOOL		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich	= (sal_uInt16)pVar->GetUserData();
+        sal_Bool		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Propteries
         switch( nWhich )
@@ -349,7 +349,7 @@ sal_Bool TransferableHelperImpl::GetData( const ::com::sun::star::datatransfer::
 }
 */
 
-void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     if( pPar_ && (pPar_->Count() > 1) )
     {
@@ -360,7 +360,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
     //Clipboard::Clear();
 }
 
-void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
     
@@ -370,7 +370,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(1)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -393,7 +393,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     */
 }
 
-void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     if( !pPar_ || (pPar_->Count() != 2) )
     {
@@ -401,18 +401,18 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(1)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
         return;
     }
 
-    pVar->PutBool( FALSE );
+    pVar->PutBool( sal_False );
     //pVar->PutBool( Clipboard::HasFormat( nFormat ) );
 }
 
-void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     if( pPar_ && (pPar_->Count() > 1) )
     {
@@ -424,7 +424,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     //pVar->PutString( Clipboard::PasteString() );
 }
 
-void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
     
@@ -434,7 +434,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
         return;
     }
 
-    USHORT nFormat = pPar_->Get(2)->GetInteger();
+    sal_uInt16 nFormat = pPar_->Get(2)->GetInteger();
     if( !nFormat  || nFormat > 3 )
     {
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -458,7 +458,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
     */
 }
 
-void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     (void)pVar;
     
@@ -531,8 +531,8 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
 
         SbxVariable* pVar 	= pHint->GetVar();
         SbxArray*    pPar_ 	= pVar->GetParameters();
-        USHORT       nWhich	= (USHORT)pVar->GetUserData();
-        BOOL		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+        sal_uInt16       nWhich	= (sal_uInt16)pVar->GetUserData();
+        sal_Bool		 bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
 
         // Methods
         switch( nWhich )
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 7503832cc2..293fa796a9 100644..100755
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -48,6 +48,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
                                            const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
 
 #include <algorithm>
+#include <boost/unordered_map.hpp>
 
 // for a patch forward declaring these methods below makes sense
 // but, #FIXME lets really just move the methods to the top
@@ -121,7 +122,6 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         }
 
     }
-#ifndef WIN
     static SbxVariable* pTRUE = NULL;
     static SbxVariable* pFALSE = NULL;
     static SbxVariable* pNULL = NULL;
@@ -143,7 +143,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         if( !pTRUE )
         {
             pTRUE = new SbxVariable;
-            pTRUE->PutBool( TRUE );
+            pTRUE->PutBool( sal_True );
             pTRUE->AddRef();
         }
         PushVar( pTRUE );
@@ -153,22 +153,11 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
         if( !pFALSE )
         {
             pFALSE = new SbxVariable;
-            pFALSE->PutBool( FALSE );
+            pFALSE->PutBool( sal_False );
             pFALSE->AddRef();
         }
         PushVar( pFALSE );
     }
-#else
-    SbxVariable* pRes = new SbxVariable;
-    if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )
-        pRes->PutNull();
-    else
-    {
-        BOOL bRes = p2->Compare( eOp, *p1 );
-        pRes->PutBool( bRes );
-    }
-    PushVar( pRes );
-#endif
 }
 
 void SbiRuntime::StepEXP()		{ StepArith( SbxEXP );		}
@@ -327,7 +316,7 @@ void SbiRuntime::StepIS()
         eType2 = refVar2->GetType();
     }
 
-    BOOL bRes = BOOL( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
+    sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
     if ( bVBAEnabled  && !bRes )
         Error( SbERR_INVALID_USAGE_OBJECT );
     bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() );
@@ -386,11 +375,11 @@ void SbiRuntime::StepPUT()
     SbxVariableRef refVal = PopVar();
     SbxVariableRef refVar = PopVar();
     // Store auf die eigene Methode (innerhalb einer Function)?
-    BOOL bFlagsChanged = FALSE;
-    USHORT n = 0;
+    sal_Bool bFlagsChanged = sal_False;
+    sal_uInt16 n = 0;
     if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
     {
-        bFlagsChanged = TRUE;
+        bFlagsChanged = sal_True;
         n = refVar->GetFlags();
         refVar->SetFlag( SBX_WRITE );
     }
@@ -426,9 +415,54 @@ void SbiRuntime::StepPUT()
 }
 
 
+// VBA Dim As New behavior handling, save init object information
+struct DimAsNewRecoverItem
+{
+    String			m_aObjClass;
+    String			m_aObjName;
+    SbxObject*		m_pObjParent;
+    SbModule*		m_pClassModule;
+
+    DimAsNewRecoverItem( void )
+        : m_pObjParent( NULL )
+        , m_pClassModule( NULL )
+    {}
+
+    DimAsNewRecoverItem( const String& rObjClass, const String& rObjName,
+        SbxObject* pObjParent, SbModule* pClassModule )
+            : m_aObjClass( rObjClass )
+            , m_aObjName( rObjName )
+            , m_pObjParent( pObjParent )
+            , m_pClassModule( pClassModule )
+    {}
+
+};
+
+
+struct SbxVariablePtrHash
+{
+    size_t operator()( SbxVariable* pVar ) const
+        { return (size_t)pVar; }
+};
+
+typedef boost::unordered_map< SbxVariable*, DimAsNewRecoverItem,
+                              SbxVariablePtrHash >  DimAsNewRecoverHash;
+
+static DimAsNewRecoverHash		GaDimAsNewRecoverHash;
+
+void removeDimAsNewRecoverItem( SbxVariable* pVar )
+{
+    DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( pVar );
+    if( it != GaDimAsNewRecoverHash.end() )
+        GaDimAsNewRecoverHash.erase( it );
+}
+
+
 // Speichern Objektvariable
 // Nicht-Objekt-Variable fuehren zu Fehlern
 
+static const char pCollectionStr[] = "Collection";
+
 void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bHandleDefaultProp )
 {
     // #67733 Typen mit Array-Flag sind auch ok
@@ -478,11 +512,11 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        BOOL bFlagsChanged = FALSE;
-        USHORT n = 0;
+        sal_Bool bFlagsChanged = sal_False;
+        sal_uInt16 n = 0;
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
         {
-            bFlagsChanged = TRUE;
+            bFlagsChanged = sal_True;
             n = refVar->GetFlags();
             refVar->SetFlag( SBX_WRITE );
         }
@@ -531,8 +565,14 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
             }
         }
 
+        // Handle Dim As New
+        sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+        SbxBaseRef xPrevVarObj;
+        if( bDimAsNew )
+            xPrevVarObj = refVar->GetObject();
+
         // Handle withevents
-        BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
+        sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
         if ( bWithEvents )
         {
             Reference< XInterface > xComListener;
@@ -549,7 +589,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
                 xComListener = createComListener( aControlAny, aVBAType, aPrefix, xScopeObj );
 
                 refVal->SetDeclareClassName( aDeclareClassName );
-                refVal->SetComListener( xComListener );		// Hold reference
+                refVal->SetComListener( xComListener, &rBasic );		// Hold reference
             }
 
             *refVar = *refVal;
@@ -559,6 +599,68 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
             *refVar = *refVal;
         }
 
+        if ( bDimAsNew )
+        {
+            if( !refVar->ISA(SbxObject) )
+            {
+                SbxBase* pValObjBase = refVal->GetObject();
+                if( pValObjBase == NULL )
+                {
+                    if( xPrevVarObj.Is() )
+                    {
+                        // Object is overwritten with NULL, instantiate init object
+                        DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( refVar );
+                        if( it != GaDimAsNewRecoverHash.end() )
+                        {
+                            const DimAsNewRecoverItem& rItem = it->second;
+                            if( rItem.m_pClassModule != NULL )
+                            {
+                                SbClassModuleObject* pNewObj = new SbClassModuleObject( rItem.m_pClassModule );
+                                pNewObj->SetName( rItem.m_aObjName );
+                                pNewObj->SetParent( rItem.m_pObjParent );
+                                refVar->PutObject( pNewObj );
+                            }
+                            else if( rItem.m_aObjClass.EqualsIgnoreCaseAscii( pCollectionStr ) )
+                            {
+                                BasicCollection* pNewCollection = new BasicCollection( String( RTL_CONSTASCII_USTRINGPARAM(pCollectionStr) ) );
+                                pNewCollection->SetName( rItem.m_aObjName );
+                                pNewCollection->SetParent( rItem.m_pObjParent );
+                                refVar->PutObject( pNewCollection );
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // Does old value exist?
+                    bool bFirstInit = !xPrevVarObj.Is();
+                    if( bFirstInit )
+                    {
+                        // Store information to instantiate object later
+                        SbxObject* pValObj = PTR_CAST(SbxObject,pValObjBase);
+                        if( pValObj != NULL )
+                        {
+                            String aObjClass = pValObj->GetClassName();
+
+                            SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pValObjBase);
+                            if( pClassModuleObj != NULL )
+                            {
+                                SbModule* pClassModule = pClassModuleObj->getClassModule();
+                                GaDimAsNewRecoverHash[refVar] =
+                                    DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), pClassModule );
+                            }
+                            else if( aObjClass.EqualsIgnoreCaseAscii( "Collection" ) )
+                            {
+                                GaDimAsNewRecoverHash[refVar] =
+                                    DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), NULL );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
         // lhs is a property who's value is currently (Empty e.g. no broadcast yet)
         // in this case if there is a default prop involved the value of the
         // default property may infact be void so the type will also be SbxEMPTY
@@ -599,14 +701,14 @@ void SbiRuntime::StepLSET()
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        USHORT n = refVar->GetFlags();
+        sal_uInt16 n = refVar->GetFlags();
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
             refVar->SetFlag( SBX_WRITE );
         String aRefVarString = refVar->GetString();
         String aRefValString = refVal->GetString();
 
-        USHORT nVarStrLen = aRefVarString.Len();
-        USHORT nValStrLen = aRefValString.Len();
+        sal_uInt16 nVarStrLen = aRefVarString.Len();
+        sal_uInt16 nValStrLen = aRefValString.Len();
         String aNewStr;
         if( nVarStrLen > nValStrLen )
         {
@@ -635,14 +737,14 @@ void SbiRuntime::StepRSET()
     else
     {
         // Store auf die eigene Methode (innerhalb einer Function)?
-        USHORT n = refVar->GetFlags();
+        sal_uInt16 n = refVar->GetFlags();
         if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
             refVar->SetFlag( SBX_WRITE );
         String aRefVarString = refVar->GetString();
         String aRefValString = refVal->GetString();
 
-        USHORT nPos = 0;
-        USHORT nVarStrLen = aRefVarString.Len();
+        sal_uInt16 nPos = 0;
+        sal_uInt16 nVarStrLen = aRefVarString.Len();
         if( nVarStrLen > aRefValString.Len() )
         {
             aRefVarString.Fill(nVarStrLen,' ');
@@ -703,10 +805,10 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
         // AB 2.4.1996, auch Arrays ohne Dimensionsangaben zulassen (VB-komp.)
         if( pDims )
         {
-            for( USHORT i = 1; i < pDims->Count(); )
+            for( sal_uInt16 i = 1; i < pDims->Count(); )
             {
-                INT32 lb = pDims->Get( i++ )->GetLong();
-                INT32 ub = pDims->Get( i++ )->GetLong();
+                sal_Int32 lb = pDims->Get( i++ )->GetLong();
+                sal_Int32 ub = pDims->Get( i++ )->GetLong();
                 if( ub < lb )
                     Error( SbERR_OUT_OF_RANGE ), ub = lb;
                 pArray->AddDim32( lb, ub );
@@ -720,7 +822,7 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
             // Uno-Sequences der Laenge 0 eine Dimension anlegen
             pArray->unoAddDim( 0, -1 );
         }
-        USHORT nSavFlags = refVar->GetFlags();
+        sal_uInt16 nSavFlags = refVar->GetFlags();
         refVar->ResetFlag( SBX_FIXED );
         refVar->PutObject( pArray );
         refVar->SetFlags( nSavFlags );
@@ -782,7 +884,7 @@ void SbiRuntime::StepREDIMP()
             short nDimsNew = pNewArray->GetDims();
             short nDimsOld = pOldArray->GetDims();
             short nDims = nDimsNew;
-            BOOL bRangeError = FALSE;
+            sal_Bool bRangeError = sal_False;
 
             // Store dims to use them for copying later
             sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -791,7 +893,7 @@ void SbiRuntime::StepREDIMP()
 
             if( nDimsOld != nDimsNew )
             {
-                bRangeError = TRUE;
+                bRangeError = sal_True;
             }
             else
             {
@@ -808,7 +910,7 @@ void SbiRuntime::StepREDIMP()
                     // All bounds but the last have to be the same
                     if( i < nDims && ( lBoundNew != lBoundOld || uBoundNew != uBoundOld ) )
                     {
-                        bRangeError = TRUE;
+                        bRangeError = sal_True;
                         break;
                     }
                     else
@@ -877,7 +979,7 @@ void SbiRuntime::StepREDIMP_ERASE()
 
 void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
 {
-    USHORT nSavFlags = refVar->GetFlags();
+    sal_uInt16 nSavFlags = refVar->GetFlags();
     refVar->ResetFlag( SBX_FIXED );
     refVar->SetType( SbxDataType(eType & 0x0FFF) );
     refVar->SetFlags( nSavFlags );
@@ -1046,7 +1148,7 @@ void SbiRuntime::StepINPUT()
         // zu fuellen, dann mit einem Stringwert
         if( !pVar->IsFixed() || pVar->IsNumeric() )
         {
-            USHORT nLen = 0;
+            sal_uInt16 nLen = 0;
             if( !pVar->Scan( s, &nLen ) )
             {
                 err = SbxBase::GetError();
@@ -1169,7 +1271,7 @@ void SbiRuntime::StepENDCASE()
 
 void SbiRuntime::StepSTDERROR()
 {
-    pError = NULL; bError = TRUE;
+    pError = NULL; bError = sal_True;
     pInst->aErrorMsg = String();
     pInst->nErr = 0L;
     pInst->nErl = 0;
@@ -1184,14 +1286,14 @@ void SbiRuntime::StepNOERROR()
     pInst->nErl = 0;
     nError = 0L;
     SbxErrObject::getUnoErrObject()->Clear();
-    bError = FALSE;
+    bError = sal_False;
 }
 
 // UP verlassen
 
 void SbiRuntime::StepLEAVE()
 {
-    bRun = FALSE;
+    bRun = sal_False;
         // If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
     if ( bInError && pError )
         SbxErrObject::getUnoErrObject()->Clear();
@@ -1326,7 +1428,7 @@ void SbiRuntime::StepEMPTY()
 void SbiRuntime::StepERROR()
 {
     SbxVariableRef refCode = PopVar();
-    USHORT n = refCode->GetUShort();
+    sal_uInt16 n = refCode->GetUShort();
     SbError error = StarBASIC::GetSfxFromVBError( n );
     if ( bVBAEnabled )
         pInst->Error( error );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index a619a01b3d..109a694552 100644..100755
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -44,14 +44,14 @@ bool checkUnoObjectType( SbUnoObject* refVal,
 
 // Laden einer numerischen Konstanten (+ID)
 
-void SbiRuntime::StepLOADNC( UINT32 nOp1 )
+void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable( SbxDOUBLE );
 
     // #57844 Lokalisierte Funktion benutzen
     String aStr = pImg->GetString( static_cast<short>( nOp1 ) );
     // Auch , zulassen !!!
-    USHORT iComma = aStr.Search( ',' );
+    sal_uInt16 iComma = aStr.Search( ',' );
     if( iComma != STRING_NOTFOUND )
     {
         String aStr1 = aStr.Copy( 0, iComma );
@@ -68,7 +68,7 @@ void SbiRuntime::StepLOADNC( UINT32 nOp1 )
 
 // Laden einer Stringkonstanten (+ID)
 
-void SbiRuntime::StepLOADSC( UINT32 nOp1 )
+void SbiRuntime::StepLOADSC( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable;
     p->PutString( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -77,16 +77,16 @@ void SbiRuntime::StepLOADSC( UINT32 nOp1 )
 
 // Immediate Load (+Wert)
 
-void SbiRuntime::StepLOADI( UINT32 nOp1 )
+void SbiRuntime::StepLOADI( sal_uInt32 nOp1 )
 {
     SbxVariable* p = new SbxVariable;
-    p->PutInteger( static_cast<INT16>( nOp1 ) );
+    p->PutInteger( static_cast<sal_Int16>( nOp1 ) );
     PushVar( p );
 }
 
 // Speichern eines named Arguments in Argv (+Arg-Nr ab 1!)
 
-void SbiRuntime::StepARGN( UINT32 nOp1 )
+void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
 {
     if( !refArgv )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -110,18 +110,18 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
 
 // Konvertierung des Typs eines Arguments in Argv fuer DECLARE-Fkt. (+Typ)
 
-void SbiRuntime::StepARGTYP( UINT32 nOp1 )
+void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 )
 {
     if( !refArgv )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
     else
     {
-        BOOL bByVal = (nOp1 & 0x8000) != 0;			// Ist BYVAL verlangt?
+        sal_Bool bByVal = (nOp1 & 0x8000) != 0;			// Ist BYVAL verlangt?
         SbxDataType t = (SbxDataType) (nOp1 & 0x7FFF);
         SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 );	// letztes Arg
 
-        // BYVAL prüfen
-        if( pVar->GetRefCount() > 2 )		// 2 ist normal für BYVAL
+        // BYVAL pr�fen
+        if( pVar->GetRefCount() > 2 )		// 2 ist normal f�r BYVAL
         {
             // Parameter ist eine Referenz
             if( bByVal )
@@ -132,7 +132,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
                 refExprStk->Put( pVar, refArgv->Count() - 1 );
             }
             else
-                pVar->SetFlag( SBX_REFERENCE );		// Ref-Flag für DllMgr
+                pVar->SetFlag( SBX_REFERENCE );		// Ref-Flag f�r DllMgr
         }
         else
         {
@@ -155,7 +155,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
 
 // String auf feste Laenge bringen (+Laenge)
 
-void SbiRuntime::StepPAD( UINT32 nOp1 )
+void SbiRuntime::StepPAD( sal_uInt32 nOp1 )
 {
     SbxVariable* p = GetTOS();
     String& s = (String&)(const String&) *p;
@@ -167,20 +167,20 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
 
 // Sprung (+Target)
 
-void SbiRuntime::StepJUMP( UINT32 nOp1 )
+void SbiRuntime::StepJUMP( sal_uInt32 nOp1 )
 {
 #ifdef DBG_UTIL
     // #QUESTION shouln't this be
-    // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
+    // if( (sal_uInt8*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
     if( nOp1 >= pImg->GetCodeSize() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
 #endif
-    pCode = (const BYTE*) pImg->GetCode() + nOp1;
+    pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
 }
 
 // TOS auswerten, bedingter Sprung (+Target)
 
-void SbiRuntime::StepJUMPT( UINT32 nOp1 )
+void SbiRuntime::StepJUMPT( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
     if( p->GetBool() )
@@ -189,7 +189,7 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
 
 // TOS auswerten, bedingter Sprung (+Target)
 
-void SbiRuntime::StepJUMPF( UINT32 nOp1 )
+void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
     // In a test e.g. If Null then
@@ -206,36 +206,36 @@ void SbiRuntime::StepJUMPF( UINT32 nOp1 )
 // ...
 //Falls im Operanden 0x8000 gesetzt ist, Returnadresse pushen (ON..GOSUB)
 
-void SbiRuntime::StepONJUMP( UINT32 nOp1 )
+void SbiRuntime::StepONJUMP( sal_uInt32 nOp1 )
 {
     SbxVariableRef p = PopVar();
-    INT16 n = p->GetInteger();
+    sal_Int16 n = p->GetInteger();
     if( nOp1 & 0x8000 )
     {
         nOp1 &= 0x7FFF;
         //PushGosub( pCode + 3 * nOp1 );
         PushGosub( pCode + 5 * nOp1 );
     }
-    if( n < 1 || static_cast<UINT32>(n) > nOp1 )
-        n = static_cast<INT16>( nOp1 + 1 );
-    //nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
-    nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
+    if( n < 1 || static_cast<sal_uInt32>(n) > nOp1 )
+        n = static_cast<sal_Int16>( nOp1 + 1 );
+    //nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
+    nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
     StepJUMP( nOp1 );
 }
 
 // UP-Aufruf (+Target)
 
-void SbiRuntime::StepGOSUB( UINT32 nOp1 )
+void SbiRuntime::StepGOSUB( sal_uInt32 nOp1 )
 {
     PushGosub( pCode );
     if( nOp1 >= pImg->GetCodeSize() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
-    pCode = (const BYTE*) pImg->GetCode() + nOp1;
+    pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
 }
 
 // UP-Return (+0 oder Target)
 
-void SbiRuntime::StepRETURN( UINT32 nOp1 )
+void SbiRuntime::StepRETURN( sal_uInt32 nOp1 )
 {
     PopGosub();
     if( nOp1 )
@@ -244,7 +244,7 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 )
 
 // FOR-Variable testen (+Endlabel)
 
-void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
+void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
 {
     if( !pForStk )
     {
@@ -307,7 +307,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
         {
             BasicCollection* pCollection = (BasicCollection*)(SbxVariable*)pForStk->refEnd;
             SbxArrayRef xItemArray = pCollection->xItemArray;
-            INT32 nCount = xItemArray->Count32();
+            sal_Int32 nCount = xItemArray->Count32();
             if( pForStk->nCurCollectionIndex < nCount )
             {
                 SbxVariable* pRes = xItemArray->Get32( pForStk->nCurCollectionIndex );
@@ -346,7 +346,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
 
 // Tos+1 <= Tos+2 <= Tos, 2xremove (+Target)
 
-void SbiRuntime::StepCASETO( UINT32 nOp1 )
+void SbiRuntime::StepCASETO( sal_uInt32 nOp1 )
 {
     if( !refCaseStk || !refCaseStk->Count() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -362,9 +362,9 @@ void SbiRuntime::StepCASETO( UINT32 nOp1 )
 
 // Fehler-Handler
 
-void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+void SbiRuntime::StepERRHDL( sal_uInt32 nOp1 )
 {
-    const BYTE* p = pCode;
+    const sal_uInt8* p = pCode;
     StepJUMP( nOp1 );
     pError = pCode;
     pCode = p;
@@ -377,7 +377,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
 
 // Resume nach Fehlern (+0=statement, 1=next or Label)
 
-void SbiRuntime::StepRESUME( UINT32 nOp1 )
+void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
 {
     // AB #32714 Resume ohne Error? -> Fehler
     if( !bInError )
@@ -388,8 +388,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     if( nOp1 )
     {
         // Code-Zeiger auf naechstes Statement setzen
-        USHORT n1, n2;
-        pCode = pMod->FindNextStmnt( pErrCode, n1, n2, TRUE, pImg );
+        sal_uInt16 n1, n2;
+        pCode = pMod->FindNextStmnt( pErrCode, n1, n2, sal_True, pImg );
     }
     else
         pCode = pErrStmnt;
@@ -402,7 +402,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
     pInst->nErr = 0;
     pInst->nErl = 0;
     nError = 0;
-    bInError = FALSE;
+    bInError = sal_False;
 
     // Error-Stack loeschen
     SbErrorStack*& rErrStack = GetSbData()->pErrStack;
@@ -411,7 +411,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
 }
 
 // Kanal schliessen (+Kanal, 0=Alle)
-void SbiRuntime::StepCLOSE( UINT32 nOp1 )
+void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 )
 {
     SbError err;
     if( !nOp1 )
@@ -430,7 +430,7 @@ void SbiRuntime::StepCLOSE( UINT32 nOp1 )
 
 // Zeichen ausgeben (+char)
 
-void SbiRuntime::StepPRCHAR( UINT32 nOp1 )
+void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
 {
     ByteString s( (char) nOp1 );
     pIosys->Write( s );
@@ -521,7 +521,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal,
     return bOk;
 }
 
-void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
+void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt )
 {
     SbxVariableRef refVal = PopVar();
     SbxVariableRef refVar = PopVar();
@@ -532,17 +532,17 @@ void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
         StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt prop for a "proper" set
 }
 
-void SbiRuntime::StepVBASETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepVBASETCLASS( sal_uInt32 nOp1 )
 {
     StepSETCLASS_impl( nOp1, false );
 }
 
-void SbiRuntime::StepSETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepSETCLASS( sal_uInt32 nOp1 )
 {
     StepSETCLASS_impl( nOp1, true );
 }
 
-void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
+void SbiRuntime::StepTESTCLASS( sal_uInt32 nOp1 )
 {
     SbxVariableRef xObjVal = PopVar();
     String aClass( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -556,7 +556,7 @@ void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
 
 // Library fuer anschliessenden Declare-Call definieren
 
-void SbiRuntime::StepLIB( UINT32 nOp1 )
+void SbiRuntime::StepLIB( sal_uInt32 nOp1 )
 {
     aLibName = pImg->GetString( static_cast<short>( nOp1 ) );
 }
@@ -565,14 +565,14 @@ void SbiRuntime::StepLIB( UINT32 nOp1 )
 // Dieser Opcode wird vor DIM/REDIM-Anweisungen gepusht,
 // wenn nur ein Index angegeben wurde.
 
-void SbiRuntime::StepBASED( UINT32 nOp1 )
+void SbiRuntime::StepBASED( sal_uInt32 nOp1 )
 {
     SbxVariable* p1 = new SbxVariable;
     SbxVariableRef x2 = PopVar();
 
     // #109275 Check compatiblity mode
     bool bCompatible = ((nOp1 & 0x8000) != 0);
-    USHORT uBase = static_cast<USHORT>(nOp1 & 1);		// Can only be 0 or 1
+    sal_uInt16 uBase = static_cast<sal_uInt16>(nOp1 & 1);		// Can only be 0 or 1
     p1->PutInteger( uBase );
     if( !bCompatible )
         x2->Compute( SbxPLUS, *p1 );
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index c244642009..f7e316d56b 100644..100755
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -57,7 +57,7 @@ SbxVariable* getVBAConstant( const String& rName );
 // 0x8000 - Argv ist belegt
 
 SbxVariable* SbiRuntime::FindElement
-    ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+    ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
 {
     bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
     if( bIsVBAInterOp )
@@ -75,7 +75,7 @@ SbxVariable* SbiRuntime::FindElement
     }
     else
     {
-        BOOL bFatalError = FALSE;
+        sal_Bool bFatalError = sal_False;
         SbxDataType t = (SbxDataType) nOp2;
         String aName( pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) ) );
         // Hacky capture of Evaluate [] syntax
@@ -108,8 +108,8 @@ SbxVariable* SbiRuntime::FindElement
         if( !pElem )
         {
             // Die RTL brauchen wir nicht mehr zu durchsuchen!
-            BOOL bSave = rBasic.bNoRtl;
-            rBasic.bNoRtl = TRUE;
+            sal_Bool bSave = rBasic.bNoRtl;
+            rBasic.bNoRtl = sal_True;
             pElem = pObj->Find( aName, SbxCLASS_DONTCARE );
 
             // #110004, #112015: Make private really private
@@ -142,15 +142,19 @@ SbxVariable* SbiRuntime::FindElement
                     else
                         pElem = VBAConstantHelper::instance().getVBAConstant( aName );
                 }
-                // #72382 VORSICHT! Liefert jetzt wegen unbekannten
-                // Modulen IMMER ein Ergebnis!
-                SbUnoClass* pUnoClass = findUnoClass( aName );
-                if( pUnoClass )
+
+                if( !pElem )
                 {
-                    pElem = new SbxVariable( t );
-                    SbxValues aRes( SbxOBJECT );
-                    aRes.pObj = pUnoClass;
-                    pElem->SbxVariable::Put( aRes );
+                    // #72382 VORSICHT! Liefert jetzt wegen unbekannten
+                    // Modulen IMMER ein Ergebnis!
+                    SbUnoClass* pUnoClass = findUnoClass( aName );
+                    if( pUnoClass )
+                    {
+                        pElem = new SbxVariable( t );
+                        SbxValues aRes( SbxOBJECT );
+                        aRes.pObj = pUnoClass;
+                        pElem->SbxVariable::Put( aRes );
+                    }
                 }
 
                 // #62939 Wenn eine Uno-Klasse gefunden wurde, muss
@@ -176,14 +180,14 @@ SbxVariable* SbiRuntime::FindElement
                 // Nicht da und nicht im Objekt?
                 // Hat das Ding Parameter, nicht einrichten!
                 if( nOp1 & 0x8000 )
-                    bFatalError = TRUE;
+                    bFatalError = sal_True;
                     // ALT: StarBASIC::FatalError( nNotFound );
 
                 // Sonst, falls keine Parameter sind, anderen Error Code verwenden
                 if( !bLocal || pImg->GetFlag( SBIMG_EXPLICIT ) )
                 {
                     // #39108 Bei explizit und als ELEM immer ein Fatal Error
-                    bFatalError = TRUE;
+                    bFatalError = sal_True;
 
                     // Falls keine Parameter sind, anderen Error Code verwenden
                     if( !( nOp1 & 0x8000 ) && nNotFound == SbERR_PROC_UNDEFINED )
@@ -228,19 +232,19 @@ SbxVariable* SbiRuntime::FindElement
         {
             // Soll der Typ konvertiert werden?
             SbxDataType t2 = pElem->GetType();
-            BOOL bSet = FALSE;
+            sal_Bool bSet = sal_False;
             if( !( pElem->GetFlags() & SBX_FIXED ) )
             {
                 if( t != SbxVARIANT && t != t2 &&
                     t >= SbxINTEGER && t <= SbxSTRING )
-                    pElem->SetType( t ), bSet = TRUE;
+                    pElem->SetType( t ), bSet = sal_True;
             }
             // pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
             SbxVariableRef refTemp = pElem;
 
             // Moegliche Reste vom letzten Aufruf der SbxMethod beseitigen
             // Vorher Schreiben freigeben, damit kein Error gesetzt wird.
-            USHORT nSavFlags = pElem->GetFlags();
+            sal_uInt16 nSavFlags = pElem->GetFlags();
             pElem->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST );
             pElem->SbxValue::Clear();
             pElem->SetFlags( nSavFlags );
@@ -309,8 +313,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
         SbxInfo* pInfo = pMeth->GetInfo();
         if( pInfo && refParams )
         {
-            USHORT nParamCount = refParams->Count();
-            USHORT j = 1;
+            sal_uInt16 nParamCount = refParams->Count();
+            sal_uInt16 j = 1;
             const SbxParamInfo* pParam = pInfo->GetParam( j );
             while( pParam )
             {
@@ -337,8 +341,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
     if( !pElem )
     {
         // RTL nicht durchsuchen!
-        BOOL bSave = rBasic.bNoRtl;
-        rBasic.bNoRtl = TRUE;
+        sal_Bool bSave = rBasic.bNoRtl;
+        rBasic.bNoRtl = sal_True;
         pElem = pMod->Find( rName, SbxCLASS_DONTCARE );
         rBasic.bNoRtl = bSave;
     }
@@ -350,20 +354,20 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
 // Dabei auch die Argumente umsetzen, falls benannte Parameter
 // verwendet wurden
 
-void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
+void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
 {
     if( nOp1 & 0x8000 )
     {
         if( !refArgv )
             StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
-        BOOL bHasNamed = FALSE;
-        USHORT i;
-        USHORT nArgCount = refArgv->Count();
+        sal_Bool bHasNamed = sal_False;
+        sal_uInt16 i;
+        sal_uInt16 nArgCount = refArgv->Count();
         for( i = 1 ; i < nArgCount ; i++ )
         {
             if( refArgv->GetAlias( i ).Len() )
             {
-                bHasNamed = TRUE; break;
+                bHasNamed = sal_True; break;
             }
         }
         if( bHasNamed )
@@ -390,7 +394,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                         {
                             bError_ = false;
 
-                            USHORT nCurPar = 1;
+                            sal_uInt16 nCurPar = 1;
                             AutomationNamedArgsSbxArray* pArg =
                                 new AutomationNamedArgsSbxArray( nArgCount );
                             ::rtl::OUString* pNames = pArg->getNames().getArray();
@@ -406,12 +410,40 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                         }
                     }
                 }
+                else if( bVBAEnabled && p->GetType() == SbxOBJECT && (!p->ISA(SbxMethod) || !p->IsBroadcaster()) )
+                {
+                    // Check for default method with named parameters
+                    SbxBaseRef pObj = (SbxBase*)p->GetObject();
+                    if( pObj && pObj->ISA(SbUnoObject) )
+                    {
+                        SbUnoObject* pUnoObj = (SbUnoObject*)(SbxBase*)pObj;
+                        Any aAny = pUnoObj->getUnoAny();
+
+                        if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
+                        {
+                            Reference< XInterface > x = *(Reference< XInterface >*)aAny.getValue();
+                            Reference< XDefaultMethod > xDfltMethod( x, UNO_QUERY );
+
+                            rtl::OUString sDefaultMethod;
+                            if ( xDfltMethod.is() )
+                                sDefaultMethod = xDfltMethod->getDefaultMethodName();
+                            if ( sDefaultMethod.getLength() )
+                            {
+                                SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
+                                if( meth != NULL )
+                                    pInfo = meth->GetInfo();
+                                if( pInfo )
+                                    bError_ = false;
+                            }
+                        }
+                    }
+                }
                 if( bError_ )
                     Error( SbERR_NO_NAMED_ARGS );
             }
             else
             {
-                USHORT nCurPar = 1;
+                sal_uInt16 nCurPar = 1;
                 SbxArray* pArg = new SbxArray;
                 for( i = 1 ; i < nArgCount ; i++ )
                 {
@@ -420,7 +452,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
                     if( rName.Len() )
                     {
                         // nCurPar wird auf den gefundenen Parameter gesetzt
-                        USHORT j = 1;
+                        sal_uInt16 j = 1;
                         const SbxParamInfo* pParam = pInfo->GetParam( j );
                         while( pParam )
                         {
@@ -511,7 +543,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                             // Haben wir Index-Access?
                             if( xIndexAccess.is() )
                             {
-                                UINT32 nParamCount = (UINT32)pPar->Count() - 1;
+                                sal_uInt32 nParamCount = (sal_uInt32)pPar->Count() - 1;
                                 if( nParamCount != 1 )
                                 {
                                     StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -519,7 +551,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                                 }
 
                                 // Index holen
-                                INT32 nIndex = pPar->Get( 1 )->GetLong();
+                                sal_Int32 nIndex = pPar->Get( 1 )->GetLong();
                                 Reference< XInterface > xRet;
                                 try
                                 {
@@ -588,6 +620,12 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
                     pCol->CollItem( pPar );
                 }
             }
+            else if( bVBAEnabled )	// !pObj
+            {
+                SbxArray* pParam = pElem->GetParameters();
+                if( pParam != NULL )
+                    Error( SbERR_NO_OBJECT );
+            }
         }
     }
 
@@ -596,13 +634,13 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
 
 // Laden eines Elements aus der Runtime-Library (+StringID+Typ)
 
-void SbiRuntime::StepRTL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, FALSE ) );
+    PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_False ) );
 }
 
 void
-SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
 {
     if( !refLocals )
         refLocals = new SbxArray;
@@ -610,34 +648,34 @@ SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nN
 }
 // Laden einer lokalen/globalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepFIND( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
 }
 
 // Search inside a class module (CM) to enable global search in time
-void SbiRuntime::StepFIND_CM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
 
     SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pMod);
     if( pClassModuleObject )
         pMod->SetFlag( SBX_GBLSEARCH );
 
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
 
     if( pClassModuleObject )
         pMod->ResetFlag( SBX_GBLSEARCH );
 }
 
-void SbiRuntime::StepFIND_STATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE, TRUE );
+    StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True, sal_True );
 }
 
 // Laden eines Objekt-Elements (+StringID+Typ)
 // Das Objekt liegt auf TOS
 
-void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepELEM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Liegt auf dem TOS ein Objekt?
     SbxVariableRef pObjVar = PopVar();
@@ -656,7 +694,7 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
     if( pObj )
         SaveRef( (SbxVariable*)pObj );
 
-    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, FALSE ) );
+    PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, sal_False ) );
 }
 
 // Laden eines Parameters (+Offset+Typ)
@@ -664,17 +702,17 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
 // Der Datentyp SbxEMPTY zeigt an, daa kein Parameter angegeben ist.
 // Get( 0 ) darf EMPTY sein
 
-void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
-    USHORT i = static_cast<USHORT>( nOp1 & 0x7FFF );
+    sal_uInt16 i = static_cast<sal_uInt16>( nOp1 & 0x7FFF );
     SbxDataType t = (SbxDataType) nOp2;
     SbxVariable* p;
 
     // #57915 Missing sauberer loesen
-    USHORT nParamCount = refParams->Count();
+    sal_uInt16 nParamCount = refParams->Count();
     if( i >= nParamCount )
     {
-        INT16 iLoop = i;
+        sal_Int16 iLoop = i;
         while( iLoop >= nParamCount )
         {
             p = new SbxVariable();
@@ -700,7 +738,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
     //if( p->GetType() == SbxEMPTY && ( i ) )
     {
         // Wenn ein Parameter fehlt, kann er OPTIONAL sein
-        BOOL bOpt = FALSE;
+        sal_Bool bOpt = sal_False;
         if( pMeth )
         {
             SbxInfo* pInfo = pMeth->GetInfo();
@@ -710,7 +748,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
                 if( pParam && ( (pParam->nFlags & SBX_OPTIONAL) != 0 ) )
                 {
                     // Default value?
-                    USHORT nDefaultId = sal::static_int_cast< USHORT >(
+                    sal_uInt16 nDefaultId = sal::static_int_cast< sal_uInt16 >(
                         pParam->nUserData & 0xffff );
                     if( nDefaultId > 0 )
                     {
@@ -719,11 +757,11 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
                         p->PutString( aDefaultStr );
                         refParams->Put( p, i );
                     }
-                    bOpt = TRUE;
+                    bOpt = sal_True;
                 }
             }
         }
-        if( bOpt == FALSE )
+        if( bOpt == sal_False )
             Error( SbERR_NOT_OPTIONAL );
     }
     else if( t != SbxVARIANT && (SbxDataType)(p->GetType() & 0x0FFF ) != t )
@@ -741,7 +779,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
 
 // Case-Test (+True-Target+Test-Opcode)
 
-void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( !refCaseStk || !refCaseStk->Count() )
         StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -757,13 +795,13 @@ void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
 // Aufruf einer DLL-Prozedur (+StringID+Typ)
 // Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
 
-void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, FALSE );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_False );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
@@ -772,13 +810,13 @@ void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
 // Aufruf einer DLL-Prozedur nach CDecl (+StringID+Typ)
 // Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
 
-void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALLC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
     SbxArray* pArgs = NULL;
     if( nOp1 & 0x8000 )
         pArgs = refArgv;
-    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, TRUE );
+    DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_True );
     aLibName = String();
     if( nOp1 & 0x8000 )
         PopArgv();
@@ -787,14 +825,14 @@ void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
 
 // Beginn eines Statements (+Line+Col)
 
-void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Wenn der Expr-Stack am Anfang einen Statements eine Variable enthaelt,
     // hat ein Trottel X als Funktion aufgerufen, obwohl es eine Variable ist!
-    BOOL bFatalExpr = FALSE;
+    sal_Bool bFatalExpr = sal_False;
     String sUnknownMethodName;
     if( nExprLvl > 1 )
-        bFatalExpr = TRUE;
+        bFatalExpr = sal_True;
     else if( nExprLvl )
     {
         SbxVariable* p = refExprStk->Get( 0 );
@@ -802,7 +840,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
          && refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) )
         {
             sUnknownMethodName = p->GetName();
-            bFatalExpr = TRUE;
+            bFatalExpr = sal_True;
         }
     }
     // Der Expr-Stack ist nun nicht mehr notwendig
@@ -822,7 +860,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
         return;
     }
     pStmnt = pCode - 9;
-    USHORT nOld = nLine;
+    sal_uInt16 nOld = nLine;
     nLine = static_cast<short>( nOp1 );
 
     // #29955 & 0xFF, um for-Schleifen-Ebene wegzufiltern
@@ -834,8 +872,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     // around the final column of this statement to set
 
     nCol2 = 0xffff;
-    USHORT n1, n2;
-    const BYTE* p = pMod->FindNextStmnt( pCode, n1, n2 );
+    sal_uInt16 n1, n2;
+    const sal_uInt8* p = pMod->FindNextStmnt( pCode, n1, n2 );
     if( p )
     {
         if( n1 == nOp1 )
@@ -848,8 +886,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     // #29955 for-Schleifen-Ebene korrigieren, #67452 NICHT im Error-Handler sonst Chaos
     if( !bInError )
     {
-        // (Bei Sprüngen aus Schleifen tritt hier eine Differenz auf)
-        USHORT nExspectedForLevel = static_cast<USHORT>( nOp2 / 0x100 );
+        // (Bei Spr�ngen aus Schleifen tritt hier eine Differenz auf)
+        sal_uInt16 nExspectedForLevel = static_cast<sal_uInt16>( nOp2 / 0x100 );
         if( pGosubStk )
             nExspectedForLevel = nExspectedForLevel + pGosubStk->nStartForLvl;
 
@@ -860,12 +898,12 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     }
 
     // 16.10.96: #31460 Neues Konzept fuer StepInto/Over/Out
-    // Erklärung siehe bei _ImplGetBreakCallLevel.
+    // Erkl�rung siehe bei _ImplGetBreakCallLevel.
     if( pInst->nCallLvl <= pInst->nBreakCallLvl )
     //if( nFlags & SbDEBUG_STEPINTO )
     {
         StarBASIC* pStepBasic = GetCurrentBasic( &rBasic );
-        USHORT nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
+        sal_uInt16 nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
 
         // Neuen BreakCallLevel ermitteln
         pInst->CalcBreakCallLevel( nNewFlags );
@@ -874,10 +912,10 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
     // Breakpoints nur bei STMNT-Befehlen in neuer Zeile!
     else if( ( nOp1 != nOld )
         && ( nFlags & SbDEBUG_BREAK )
-        && pMod->IsBP( static_cast<USHORT>( nOp1 ) ) )
+        && pMod->IsBP( static_cast<sal_uInt16>( nOp1 ) ) )
     {
         StarBASIC* pBreakBasic = GetCurrentBasic( &rBasic );
-        USHORT nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
+        sal_uInt16 nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
 
         // Neuen BreakCallLevel ermitteln
         pInst->CalcBreakCallLevel( nNewFlags );
@@ -892,7 +930,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
 //        Kanalnummer
 //        Dateiname
 
-void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     SbxVariableRef pName = PopVar();
     SbxVariableRef pChan = PopVar();
@@ -907,7 +945,7 @@ void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
 
 // Objekt kreieren (+StringID+StringID)
 
-void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
     SbxObject *pObj = SbxBase::CreateObject( aClass );
@@ -925,12 +963,12 @@ void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
     }
 }
 
-void SbiRuntime::StepDCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepDCREATE_IMPL( nOp1, nOp2 );
 }
 
-void SbiRuntime::StepDCREATE_REDIMP( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_REDIMP( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepDCREATE_IMPL( nOp1, nOp2 );
 }
@@ -957,7 +995,7 @@ void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, s
 }
 
 // #56204 Objekt-Array kreieren (+StringID+StringID), DCREATE == Dim-Create
-void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     SbxVariableRef refVar = PopVar();
 
@@ -979,11 +1017,11 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
 
         // Dimensionen auswerten
         short nDims = pArray->GetDims();
-        INT32 nTotalSize = 0;
+        sal_Int32 nTotalSize = 0;
 
         // es muss ein eindimensionales Array sein
-        INT32 nLower, nUpper, nSize;
-        INT32 i;
+        sal_Int32 nLower, nUpper, nSize;
+        sal_Int32 i;
         for( i = 0 ; i < nDims ; i++ )
         {
             pArray->GetDim32( i+1, nLower, nUpper );
@@ -1021,7 +1059,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
         short nDimsNew = pArray->GetDims();
         short nDimsOld = pOldArray->GetDims();
         short nDims = nDimsNew;
-        BOOL bRangeError = FALSE;
+        sal_Bool bRangeError = sal_False;
 
         // Store dims to use them for copying later
         sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -1029,7 +1067,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
         sal_Int32* pActualIndices = new sal_Int32[nDims];
         if( nDimsOld != nDimsNew )
         {
-            bRangeError = TRUE;
+            bRangeError = sal_True;
         }
         else
         {
@@ -1072,7 +1110,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
 
 SbxObject* createUserTypeImpl( const String& rClassName );	// sb.cxx
 
-void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepTCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
@@ -1086,17 +1124,29 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
     PushVar( pNew );
 }
 
-void SbiRuntime::implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 )
+void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 )
 {
-    USHORT nCount = static_cast<USHORT>( nOp2 >> 17 );		// len = all bits above 0x10000
-    String aStr;
-    aStr.Fill( nCount, 0 );
-    pStrVar->PutString( aStr );
+    bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
+    if( bWithEvents )
+        pVar->SetFlag( SBX_WITH_EVENTS );
+
+    bool bDimAsNew = ((nOp2 & SBX_TYPE_DIM_AS_NEW_FLAG) != 0);
+    if( bDimAsNew )
+        pVar->SetFlag( SBX_DIM_AS_NEW );
+
+    bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
+    if( bFixedString )
+    {
+        sal_uInt16 nCount = static_cast<sal_uInt16>( nOp2 >> 17 );		// len = all bits above 0x10000
+        String aStr;
+        aStr.Fill( nCount, 0 );
+        pVar->PutString( aStr );
+    }
 }
 
 // Einrichten einer lokalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( !refLocals.Is() )
         refLocals = new SbxArray;
@@ -1106,23 +1156,18 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
         SbxDataType t = (SbxDataType)(nOp2 & 0xffff);
         SbxVariable* p = new SbxVariable( t );
         p->SetName( aName );
-        bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
-        if( bWithEvents )
-            p->SetFlag( SBX_WITH_EVENTS );
-        bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
-        if( bFixedString )
-            implCreateFixedString( p, nOp2 );
+        implHandleSbxFlags( p, t, nOp2 );
         refLocals->Put( p, refLocals->Count() );
     }
 }
 
 // Einrichten einer modulglobalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassModule )
+void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedForClassModule )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);;
-    BOOL bFlag = pMod->IsSet( SBX_NO_MODIFY );
+    sal_Bool bFlag = pMod->IsSet( SBX_NO_MODIFY );
     pMod->SetFlag( SBX_NO_MODIFY );
     SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY );
     if( p.Is() )
@@ -1138,21 +1183,16 @@ void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassMo
         // AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
         pProp->SetFlag( SBX_NO_MODIFY);
 
-        bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
-        if( bWithEvents )
-            pProp->SetFlag( SBX_WITH_EVENTS );
-        bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
-        if( bFixedString )
-            implCreateFixedString( p, nOp2 );
+        implHandleSbxFlags( pProp, t, nOp2 );
     }
 }
 
-void SbiRuntime::StepPUBLIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     StepPUBLIC_Impl( nOp1, nOp2, false );
 }
 
-void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     // Creates module variable that isn't reinitialised when
     // between invocations ( for VBASupport & document basic only )
@@ -1165,7 +1205,7 @@ void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
 
 // Einrichten einer globalen Variablen (+StringID+Typ)
 
-void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
         StepPUBLIC_Impl( nOp1, nOp2, true );
@@ -1183,7 +1223,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
         pMod->AddVarName( aName );
     }
 
-    BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
+    sal_Bool bFlag = pStorage->IsSet( SBX_NO_MODIFY );
     rBasic.SetFlag( SBX_NO_MODIFY );
     SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
     if( p.Is() )
@@ -1203,7 +1243,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
 // Creates global variable that isn't reinitialised when
 // basic is restarted, P=PERSIST (+StringID+Typ)
 
-void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pMod->pImage->bFirstInit )
     {
@@ -1215,7 +1255,7 @@ void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
 // Searches for global variable, behavior depends on the fact
 // if the variable is initialised for the first time
 
-void SbiRuntime::StepFIND_G( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_G( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     if( pMod->pImage->bFirstInit )
     {
@@ -1253,7 +1293,7 @@ SbxVariable* SbiRuntime::StepSTATIC_Impl( String& aName, SbxDataType& t )
     return p;
 }
 // Einrichten einer statischen Variablen (+StringID+Typ)
-void SbiRuntime::StepSTATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
     SbxDataType t = (SbxDataType) nOp2;
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
index 8c332c1a8c..8c332c1a8c 100644..100755
--- a/basic/source/runtime/wnt-mingw.s
+++ b/basic/source/runtime/wnt-mingw.s
diff --git a/basic/source/runtime/wnt-x86.asm b/basic/source/runtime/wnt-x86.asm
index 2a8710e342..2a8710e342 100644..100755
--- a/basic/source/runtime/wnt-x86.asm
+++ b/basic/source/runtime/wnt-x86.asm
diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx
index b88dc3bcbb..5c42b262bf 100644..100755
--- a/basic/source/sample/collelem.cxx
+++ b/basic/source/sample/collelem.cxx
@@ -56,7 +56,7 @@ void SampleElement::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        ULONG t = pHint->GetId();
+        sal_uIntPtr t = pHint->GetId();
         if( t == SBX_HINT_DATAWANTED &&	pVar->GetUserData() == 0x12345678 )
         {
             // Die Say-Methode:
diff --git a/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index 5261f13cfe..5261f13cfe 100644..100755
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index c1c78684ed..7fd625e21c 100644..100755
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -74,7 +74,7 @@
 #define _BWRITE     0x0200  // kann as Lvalue verwendet werden
 #define _LVALUE     _BWRITE  // kann as Lvalue verwendet werden
 #define _READWRITE  0x0300  // beides
-#define	_OPT		0x0400	// TRUE: optionaler Parameter
+#define	_OPT		0x0400	// sal_True: optionaler Parameter
 #define _METHOD     0x1000  // Masken-Bit fuer eine Methode
 #define _PROPERTY   0x2000  // Masken-Bit fuer eine Property
 #define _COLL       0x4000  // Masken-Bit fuer eine Collection
@@ -130,12 +130,12 @@ SbxVariable* SampleObject::Find( const String& rName, SbxClassType t )
         // sonst suchen
         Methods* p = aMethods;
         short nIndex = 0;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         while( p->nArgs != -1 )
         {
             if( rName.EqualsIgnoreCaseAscii( p->pName ) )
             {
-                bFound = TRUE; break;
+                bFound = sal_True; break;
             }
             nIndex += ( p->nArgs & _ARGSMASK ) + 1;
             p = aMethods + nIndex;
@@ -172,22 +172,22 @@ void SampleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
     {
         SbxVariable* pVar = pHint->GetVar();
         SbxArray* pPar_ = pVar->GetParameters();
-        USHORT nIndex = (USHORT) pVar->GetUserData();
+        sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
         // kein Index: weiterreichen!
         if( nIndex )
         {
-            ULONG t = pHint->GetId();
+            sal_uIntPtr t = pHint->GetId();
             if( t == SBX_HINT_INFOWANTED )
                 pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
             else
             {
-                BOOL bWrite = FALSE;
+                sal_Bool bWrite = sal_False;
                 if( t == SBX_HINT_DATACHANGED )
-                    bWrite = TRUE;
+                    bWrite = sal_True;
                 if( t == SBX_HINT_DATAWANTED || bWrite )
                 {
                     // Parameter-Test fuer Methoden:
-                    USHORT nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
+                    sal_uInt16 nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
                     // Element 0 ist der Returnwert
                     if( ( !pPar_ && nPar )
                      || ( pPar_->Count() != nPar+1 ) )
@@ -217,7 +217,7 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
     {
         p++;
         String aName_ = String::CreateFromAscii( p->pName );
-        USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+        sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
             nFlags_ |= SBX_OPTIONAL;
         pInfo_->AddParam( aName_, p->eType, nFlags_ );
@@ -227,13 +227,13 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
 
 ////////////////////////////////////////////////////////////////////////////
 
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
 // Element 0 gespeichert.
 
 // Die Methoden:
 
-void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Display( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     // GetString() loest u.U. auch einen Error aus!
     String s( pPar_->Get( 1 )->GetString() );
@@ -241,7 +241,7 @@ void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
         InfoBox( NULL, s ).Execute();
 }
 
-void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     double n = pPar_->Get( 1 )->GetDouble();
     pVar->PutDouble( n * n );
@@ -249,14 +249,14 @@ void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
 
 // Callback nach BASIC:
 
-void SampleObject::Event( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Event( SbxVariable*, SbxArray* pPar_, sal_Bool )
 {
     Call( pPar_->Get( 1 )->GetString(), NULL );
 }
 
 // Neues Element anlegen
 
-void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
 {
     pVar->PutObject(
         MakeObject( pPar_->Get( 1 )->GetString(), String( RTL_CONSTASCII_USTRINGPARAM("SampleElement") ) ) );
diff --git a/basic/source/sample/sample.bas b/basic/source/sample/sample.bas
index d0e416871a..d0e416871a 100644..100755
--- a/basic/source/sample/sample.bas
+++ b/basic/source/sample/sample.bas
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 7c0e8d102a..7c0e8d102a 100644..100755
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
diff --git a/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index 332c6a0d42..332c6a0d42 100644..100755
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 200c10018c..332bc28a65 100644..100755
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -36,8 +36,8 @@ using namespace std;
 
 struct SbxDim {                 // an array-dimension:
     SbxDim* pNext;              // Link
-    INT32 nLbound, nUbound;     // Limitations
-    INT32 nSize;                // Number of elements
+    sal_Int32 nLbound, nUbound; // Limitations
+    sal_Int32 nSize;            // Number of elements
 };
 
 class SbxVarEntry : public SbxVariableRef {
@@ -89,7 +89,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray )
         eType = rArray.eType;
         Clear();
         SbxVarRefs* pSrc = rArray.pData;
-        for( UINT32 i = 0; i < pSrc->size(); i++ )
+        for( sal_uInt32 i = 0; i < pSrc->size(); i++ )
         {
             SbxVarEntryPtr pSrcRef = (*pSrc)[i];
             const SbxVariable* pSrc_ = *pSrcRef;
@@ -127,8 +127,8 @@ SbxClassType SbxArray::GetClass() const
 
 void SbxArray::Clear()
 {
-    UINT32 nSize = pData->size();
-    for( UINT32 i = 0 ; i < nSize ; i++ )
+    sal_uInt32 nSize = pData->size();
+    for( sal_uInt32 i = 0 ; i < nSize ; i++ )
     {
         SbxVarEntry* pEntry = (*pData)[i];
         delete pEntry;
@@ -136,19 +136,19 @@ void SbxArray::Clear()
     pData->clear();
 }
 
-UINT32 SbxArray::Count32() const
+sal_uInt32 SbxArray::Count32() const
 {
     return pData->size();
 }
 
-USHORT SbxArray::Count() const
+sal_uInt16 SbxArray::Count() const
 {
-    UINT32 nCount = pData->size();
+    sal_uInt32 nCount = pData->size();
     DBG_ASSERT( nCount <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
-    return (USHORT)nCount;
+    return (sal_uInt16)nCount;
 }
 
-SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
+SbxVariableRef& SbxArray::GetRef32( sal_uInt32 nIdx )
 {
     // If necessary extend the array
     DBG_ASSERT( nIdx <= SBX_MAXINDEX32, "SBX: Array-Index > SBX_MAXINDEX32" );
@@ -166,7 +166,7 @@ SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
     return *((*pData)[nIdx]);
 }
 
-SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
+SbxVariableRef& SbxArray::GetRef( sal_uInt16 nIdx )
 {
     // If necessary extend the array
     DBG_ASSERT( nIdx <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
@@ -184,7 +184,7 @@ SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
     return *((*pData)[nIdx]);
 }
 
-SbxVariable* SbxArray::Get32( UINT32 nIdx )
+SbxVariable* SbxArray::Get32( sal_uInt32 nIdx )
 {
     if( !CanRead() )
     {
@@ -203,7 +203,7 @@ SbxVariable* SbxArray::Get32( UINT32 nIdx )
     return rRef;
 }
 
-SbxVariable* SbxArray::Get( USHORT nIdx )
+SbxVariable* SbxArray::Get( sal_uInt16 nIdx )
 {
     if( !CanRead() )
     {
@@ -222,7 +222,7 @@ SbxVariable* SbxArray::Get( USHORT nIdx )
     return rRef;
 }
 
-void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Put32( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -242,7 +242,7 @@ void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
     }
 }
 
-void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Put( SbxVariable* pVar, sal_uInt16 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -262,7 +262,7 @@ void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
     }
 }
 
-const XubString& SbxArray::GetAlias( USHORT nIdx )
+const XubString& SbxArray::GetAlias( sal_uInt16 nIdx )
 {
     if( !CanRead() )
     {
@@ -281,7 +281,7 @@ const XubString& SbxArray::GetAlias( USHORT nIdx )
     return *rRef.pAlias;
 }
 
-void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
+void SbxArray::PutAlias( const XubString& rAlias, sal_uInt16 nIdx )
 {
     if( !CanWrite() )
         SetError( SbxERR_PROP_READONLY );
@@ -295,7 +295,7 @@ void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
     }
 }
 
-void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Insert32( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     DBG_ASSERT( pData->size() <= SBX_MAXINDEX32, "SBX: Array wird zu gross" );
     if( pData->size() > SBX_MAXINDEX32 )
@@ -318,7 +318,7 @@ void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
     SetFlag( SBX_MODIFIED );
 }
 
-void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx )
 {
     DBG_ASSERT( pData->size() <= 0x3FF0, "SBX: Array wird zu gross" );
     if( pData->size() > 0x3FF0 )
@@ -326,7 +326,7 @@ void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
     Insert32( pVar, nIdx );
 }
 
-void SbxArray::Remove32( UINT32 nIdx )
+void SbxArray::Remove32( sal_uInt32 nIdx )
 {
     if( nIdx < pData->size() )
     {
@@ -337,7 +337,7 @@ void SbxArray::Remove32( UINT32 nIdx )
     }
 }
 
-void SbxArray::Remove( USHORT nIdx )
+void SbxArray::Remove( sal_uInt16 nIdx )
 {
     if( nIdx < pData->size() )
     {
@@ -352,7 +352,7 @@ void SbxArray::Remove( SbxVariable* pVar )
 {
     if( pVar )
     {
-        for( UINT32 i = 0; i < pData->size(); i++ )
+        for( sal_uInt32 i = 0; i < pData->size(); i++ )
         {
             SbxVariableRef* pRef = (*pData)[i];
             // SbxVariableRef* pRef = pData->GetObject( i );
@@ -371,8 +371,8 @@ void SbxArray::Merge( SbxArray* p )
 {
     if( p )
     {
-        UINT32 nSize = p->Count();
-        for( UINT32 i = 0; i < nSize; i++ )
+        sal_uInt32 nSize = p->Count();
+        for( sal_uInt32 i = 0; i < nSize; i++ )
         {
             SbxVarEntryPtr pRef1 = (*(p->pData))[i];
             // Is the element by name already inside?
@@ -381,8 +381,8 @@ void SbxArray::Merge( SbxArray* p )
             if( pVar )
             {
                 XubString aName = pVar->GetName();
-                USHORT nHash = pVar->GetHashCode();
-                for( UINT32 j = 0; j < pData->size(); j++ )
+                sal_uInt16 nHash = pVar->GetHashCode();
+                for( sal_uInt32 j = 0; j < pData->size(); j++ )
                 {
                     SbxVariableRef* pRef2 = (*pData)[j];
                     if( (*pRef2)->GetHashCode() == nHash
@@ -409,10 +409,10 @@ void SbxArray::Merge( SbxArray* p )
 // Search of an element via the user data. If the element is
 // object, it will also be scanned.
 
-SbxVariable* SbxArray::FindUserData( UINT32 nData )
+SbxVariable* SbxArray::FindUserData( sal_uInt32 nData )
 {
     SbxVariable* p = NULL;
-    for( UINT32 i = 0; i < pData->size(); i++ )
+    for( sal_uInt32 i = 0; i < pData->size(); i++ )
     {
         SbxVariableRef* pRef = (*pData)[i];
         SbxVariable* pVar = *pRef;
@@ -432,7 +432,7 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
                     case SbxCLASS_OBJECT:
                     {
                         // Objects are not allowed to scan their parent.
-                        USHORT nOld = pVar->GetFlags();
+                        sal_uInt16 nOld = pVar->GetFlags();
                         pVar->ResetFlag( SBX_GBLSEARCH );
                         p = ((SbxObject*) pVar)->FindUserData( nData );
                         pVar->SetFlags( nOld );
@@ -460,19 +460,19 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
 SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
 {
     SbxVariable* p = NULL;
-    UINT32 nCount = pData->size();
+    sal_uInt32 nCount = pData->size();
     if( !nCount )
         return NULL;
-    BOOL bExtSearch = IsSet( SBX_EXTSEARCH );
-    USHORT nHash = SbxVariable::MakeHashCode( rName );
-    for( UINT32 i = 0; i < nCount; i++ )
+    sal_Bool bExtSearch = IsSet( SBX_EXTSEARCH );
+    sal_uInt16 nHash = SbxVariable::MakeHashCode( rName );
+    for( sal_uInt32 i = 0; i < nCount; i++ )
     {
         SbxVariableRef* pRef = (*pData)[i];
         SbxVariable* pVar = *pRef;
         if( pVar && pVar->IsVisible() )
         {
             // The very secure search works as well, if there is no hashcode!
-            USHORT nVarHash = pVar->GetHashCode();
+            sal_uInt16 nVarHash = pVar->GetHashCode();
             if( ( !nVarHash || nVarHash == nHash )
                 && ( t == SbxCLASS_DONTCARE || pVar->GetClass() == t )
                 && ( pVar->GetName().EqualsIgnoreCaseAscii( rName ) ) )
@@ -489,7 +489,7 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
                     case SbxCLASS_OBJECT:
                     {
                         // Objects are not allowed to scan their parent.
-                        USHORT nOld = pVar->GetFlags();
+                        sal_uInt16 nOld = pVar->GetFlags();
                         pVar->ResetFlag( SBX_GBLSEARCH );
                         p = ((SbxObject*) pVar)->Find( rName, t );
                         pVar->SetFlags( nOld );
@@ -511,18 +511,18 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
     return p;
 }
 
-BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    UINT16 nElem;
+    sal_uInt16 nElem;
     Clear();
-    BOOL bRes = TRUE;
-    USHORT f = nFlags;
+    sal_Bool bRes = sal_True;
+    sal_uInt16 f = nFlags;
     nFlags |= SBX_WRITE;
     rStrm >> nElem;
     nElem &= 0x7FFF;
-    for( UINT32 n = 0; n < nElem; n++ )
+    for( sal_uInt32 n = 0; n < nElem; n++ )
     {
-        UINT16 nIdx;
+        sal_uInt16 nIdx;
         rStrm >> nIdx;
         SbxVariable* pVar = (SbxVariable*) Load( rStrm );
         if( pVar )
@@ -532,7 +532,7 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
         }
         else
         {
-            bRes = FALSE; break;
+            bRes = sal_False; break;
         }
     }
     if( bRes )
@@ -541,10 +541,10 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
     return bRes;
 }
 
-BOOL SbxArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxArray::StoreData( SvStream& rStrm ) const
 {
-    UINT32 nElem = 0;
-    UINT32 n;
+    sal_uInt32 nElem = 0;
+    sal_uInt32 n;
     // Which elements are even defined?
     for( n = 0; n < pData->size(); n++ )
     {
@@ -553,23 +553,23 @@ BOOL SbxArray::StoreData( SvStream& rStrm ) const
         if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
             nElem++;
     }
-    rStrm << (UINT16) nElem;
+    rStrm << (sal_uInt16) nElem;
     for( n = 0; n < pData->size(); n++ )
     {
         SbxVariableRef* pRef = (*pData)[n];
         SbxVariable* p = *pRef;
         if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
         {
-            rStrm << (UINT16) n;
+            rStrm << (sal_uInt16) n;
             if( !p->Store( rStrm ) )
-                return FALSE;
+                return sal_False;
         }
     }
     return StorePrivateData( rStrm );
 }
 
 // #100883 Method to set method directly to parameter array
-void SbxArray::PutDirect( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::PutDirect( SbxVariable* pVar, sal_uInt32 nIdx )
 {
     SbxVariableRef& rRef = GetRef32( nIdx );
     rRef = pVar;
@@ -632,7 +632,7 @@ void SbxDimArray::Clear()
 
 // Add a dimension
 
-void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
+void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, sal_Bool bAllowSize0 )
 {
     SbxError eRes = SbxERR_OK;
     if( ub < lb && !bAllowSize0 )
@@ -656,51 +656,51 @@ void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
 
 void SbxDimArray::AddDim( short lb, short ub )
 {
-    AddDimImpl32( lb, ub, FALSE );
+    AddDimImpl32( lb, ub, sal_False );
 }
 
 void SbxDimArray::unoAddDim( short lb, short ub )
 {
-    AddDimImpl32( lb, ub, TRUE );
+    AddDimImpl32( lb, ub, sal_True );
 }
 
-void SbxDimArray::AddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::AddDim32( sal_Int32 lb, sal_Int32 ub )
 {
-    AddDimImpl32( lb, ub, FALSE );
+    AddDimImpl32( lb, ub, sal_False );
 }
 
-void SbxDimArray::unoAddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::unoAddDim32( sal_Int32 lb, sal_Int32 ub )
 {
-    AddDimImpl32( lb, ub, TRUE );
+    AddDimImpl32( lb, ub, sal_True );
 }
 
 
 // Readout dimension data
 
-BOOL SbxDimArray::GetDim32( INT32 n, INT32& rlb, INT32& rub ) const
+sal_Bool SbxDimArray::GetDim32( sal_Int32 n, sal_Int32& rlb, sal_Int32& rub ) const
 {
     if( n < 1 || n > nDim )
     {
-        SetError( SbxERR_BOUNDS ); rub = rlb = 0; return FALSE;
+        SetError( SbxERR_BOUNDS ); rub = rlb = 0; return sal_False;
     }
     SbxDim* p = pFirst;
     while( --n )
         p = p->pNext;
     rub = p->nUbound;
     rlb = p->nLbound;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
+sal_Bool SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
 {
-    INT32 rlb32, rub32;
-    BOOL bRet = GetDim32( n, rlb32, rub32 );
+    sal_Int32 rlb32, rub32;
+    sal_Bool bRet = GetDim32( n, rlb32, rub32 );
     if( bRet )
     {
         if( rlb32 < -SBX_MAXINDEX || rub32 > SBX_MAXINDEX )
         {
             SetError( SbxERR_BOUNDS );
-            return FALSE;
+            return sal_False;
         }
         rub = (short)rub32;
         rlb = (short)rlb32;
@@ -710,15 +710,15 @@ BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
 
 // Element-Ptr with the help of an index list
 
-UINT32 SbxDimArray::Offset32( const INT32* pIdx )
+sal_uInt32 SbxDimArray::Offset32( const sal_Int32* pIdx )
 {
-    UINT32 nPos = 0;
+    sal_uInt32 nPos = 0;
     for( SbxDim* p = pFirst; p; p = p->pNext )
     {
-        INT32 nIdx = *pIdx++;
+        sal_Int32 nIdx = *pIdx++;
         if( nIdx < p->nLbound || nIdx > p->nUbound )
         {
-            nPos = (UINT32)SBX_MAXINDEX32 + 1; break;
+            nPos = (sal_uInt32)SBX_MAXINDEX32 + 1; break;
         }
         nPos = nPos * p->nSize + nIdx - p->nLbound;
     }
@@ -729,7 +729,7 @@ UINT32 SbxDimArray::Offset32( const INT32* pIdx )
     return nPos;
 }
 
-USHORT SbxDimArray::Offset( const short* pIdx )
+sal_uInt16 SbxDimArray::Offset( const short* pIdx )
 {
     long nPos = 0;
     for( SbxDim* p = pFirst; p; p = p->pNext )
@@ -745,7 +745,7 @@ USHORT SbxDimArray::Offset( const short* pIdx )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
-    return (USHORT) nPos;
+    return (sal_uInt16) nPos;
 }
 
 SbxVariableRef& SbxDimArray::GetRef( const short* pIdx )
@@ -763,17 +763,17 @@ void SbxDimArray::Put( SbxVariable* p, const short* pIdx  )
     SbxArray::Put( p, Offset( pIdx ) );
 }
 
-SbxVariableRef& SbxDimArray::GetRef32( const INT32* pIdx )
+SbxVariableRef& SbxDimArray::GetRef32( const sal_Int32* pIdx )
 {
     return SbxArray::GetRef32( Offset32( pIdx ) );
 }
 
-SbxVariable* SbxDimArray::Get32( const INT32* pIdx )
+SbxVariable* SbxDimArray::Get32( const sal_Int32* pIdx )
 {
     return SbxArray::Get32( Offset32( pIdx ) );
 }
 
-void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx  )
+void SbxDimArray::Put32( SbxVariable* p, const sal_Int32* pIdx  )
 {
     SbxArray::Put32( p, Offset32( pIdx ) );
 }
@@ -781,38 +781,38 @@ void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx  )
 
 // Element-Number with the help of Parameter-Array
 
-UINT32 SbxDimArray::Offset32( SbxArray* pPar )
+sal_uInt32 SbxDimArray::Offset32( SbxArray* pPar )
 {
     if( nDim == 0 || !pPar || ( ( nDim != ( pPar->Count() - 1 ) ) && SbiRuntime::isVBAEnabled() ) )
     {
         SetError( SbxERR_BOUNDS ); return 0;
     }
-    UINT32 nPos = 0;
-    USHORT nOff = 1;	// Non element 0!
+    sal_uInt32 nPos = 0;
+    sal_uInt16 nOff = 1;	// Non element 0!
     for( SbxDim* p = pFirst; p && !IsError(); p = p->pNext )
     {
-        INT32 nIdx = pPar->Get( nOff++ )->GetLong();
+        sal_Int32 nIdx = pPar->Get( nOff++ )->GetLong();
         if( nIdx < p->nLbound || nIdx > p->nUbound )
         {
-            nPos = (UINT32) SBX_MAXINDEX32+1; break;
+            nPos = (sal_uInt32) SBX_MAXINDEX32+1; break;
         }
         nPos = nPos * p->nSize + nIdx - p->nLbound;
     }
-    if( nPos > (UINT32) SBX_MAXINDEX32 )
+    if( nPos > (sal_uInt32) SBX_MAXINDEX32 )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
     return nPos;
 }
 
-USHORT SbxDimArray::Offset( SbxArray* pPar )
+sal_uInt16 SbxDimArray::Offset( SbxArray* pPar )
 {
-    UINT32 nPos = Offset32( pPar );
+    sal_uInt32 nPos = Offset32( pPar );
     if( nPos > (long) SBX_MAXINDEX )
     {
         SetError( SbxERR_BOUNDS ); nPos = 0;
     }
-    return (USHORT) nPos;
+    return (sal_uInt16) nPos;
 }
 
 SbxVariableRef& SbxDimArray::GetRef( SbxArray* pPar )
@@ -830,27 +830,27 @@ void SbxDimArray::Put( SbxVariable* p, SbxArray* pPar  )
     SbxArray::Put32( p, Offset32( pPar ) );
 }
 
-BOOL SbxDimArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     short nDimension;
     rStrm >> nDimension;
     for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
     {
-        INT16 lb, ub;
+        sal_Int16 lb, ub;
         rStrm >> lb >> ub;
         AddDim( lb, ub );
     }
     return SbxArray::LoadData( rStrm, nVer );
 }
 
-BOOL SbxDimArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxDimArray::StoreData( SvStream& rStrm ) const
 {
-    rStrm << (INT16) nDim;
+    rStrm << (sal_Int16) nDim;
     for( short i = 0; i < nDim; i++ )
     {
         short lb, ub;
         GetDim( i, lb, ub );
-        rStrm << (INT16) lb << (INT16) ub;
+        rStrm << (sal_Int16) lb << (sal_Int16) ub;
     }
     return SbxArray::StoreData( rStrm );
 }
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index c1cda87577..099b38f6b1 100644..100755
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -109,13 +109,13 @@ void SbxBase::Clear()
     DBG_CHKTHIS( SbxBase, 0 );
 }
 
-BOOL SbxBase::IsFixed() const
+sal_Bool SbxBase::IsFixed() const
 {
     DBG_CHKTHIS( SbxBase, 0 );
     return IsSet( SBX_FIXED );
 }
 
-void SbxBase::SetModified( BOOL b )
+void SbxBase::SetModified( sal_Bool b )
 {
     DBG_CHKTHIS( SbxBase, 0 );
     if( IsSet( SBX_NO_MODIFY ) )
@@ -138,9 +138,9 @@ void SbxBase::SetError( SbxError e )
         p->eSbxError = e;
 }
 
-BOOL SbxBase::IsError()
+sal_Bool SbxBase::IsError()
 {
-    return BOOL( GetSbxData_Impl()->eSbxError != SbxERR_OK );
+    return sal_Bool( GetSbxData_Impl()->eSbxError != SbxERR_OK );
 }
 
 void SbxBase::ResetError()
@@ -154,7 +154,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
     const SbxFactory* pTemp = pFac;
 
     // From 1996-03-06: take the HandleLast-Flag into account
-    USHORT nPos = p->aFacs.Count();		// Insert-Position
+    sal_uInt16 nPos = p->aFacs.Count(); // Insert position
     if( !pFac->IsHandleLast() )			// Only if not self HandleLast
     {
         // Rank new factory in front of factories with HandleLast
@@ -168,7 +168,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
 void SbxBase::RemoveFactory( SbxFactory* pFac )
 {
     SbxAppData* p = GetSbxData_Impl();
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         if( p->aFacs.GetObject( i ) == pFac )
         {
@@ -178,7 +178,7 @@ void SbxBase::RemoveFactory( SbxFactory* pFac )
 }
 
 
-SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
 {
     // #91626: Hack to skip old Basic dialogs
     // Problem: There does not exist a factory any more,
@@ -204,7 +204,7 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
     // Unknown type: go over the factories!
     SbxAppData* p = GetSbxData_Impl();
     SbxBase* pNew = NULL;
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         SbxFactory* pFac = p->aFacs.GetObject( i );
         pNew = pFac->Create( nSbxId, nCreator );
@@ -226,7 +226,7 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
 {
     SbxAppData* p = GetSbxData_Impl();
     SbxObject* pNew = NULL;
-    for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
     {
         pNew = p->aFacs.GetObject( i )->CreateObject( rClass );
         if( pNew )
@@ -244,15 +244,15 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
     return pNew;
 }
 
-static BOOL bStaticEnableBroadcasting = TRUE;
+static sal_Bool bStaticEnableBroadcasting = sal_True;
 
 // Sbx-Solution in exchange for SfxBroadcaster::Enable()
-void SbxBase::StaticEnableBroadcasting( BOOL bEnable )
+void SbxBase::StaticEnableBroadcasting( sal_Bool bEnable )
 {
     bStaticEnableBroadcasting = bEnable;
 }
 
-BOOL SbxBase::StaticIsEnabledBroadcasting( void )
+sal_Bool SbxBase::StaticIsEnabledBroadcasting( void )
 {
     return bStaticEnableBroadcasting;
 }
@@ -260,15 +260,15 @@ BOOL SbxBase::StaticIsEnabledBroadcasting( void )
 
 SbxBase* SbxBase::Load( SvStream& rStrm )
 {
-    UINT16 nSbxId, nFlags, nVer;
-    UINT32 nCreator, nSize;
+    sal_uInt16 nSbxId, nFlags, nVer;
+    sal_uInt32 nCreator, nSize;
     rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
 
     // Correcting a foolishness of mine:
     if( nFlags & SBX_RESERVED )
         nFlags = ( nFlags & ~SBX_RESERVED ) | SBX_GBLSEARCH;
 
-    ULONG nOldPos = rStrm.Tell();
+    sal_uIntPtr nOldPos = rStrm.Tell();
     rStrm >> nSize;
     SbxBase* p = Create( nSbxId, nCreator );
     if( p )
@@ -276,7 +276,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
         p->nFlags = nFlags;
         if( p->LoadData( rStrm, nVer ) )
         {
-            ULONG nNewPos = rStrm.Tell();
+            sal_uIntPtr nNewPos = rStrm.Tell();
             nOldPos += nSize;
             DBG_ASSERT( nOldPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
             if( nOldPos != nNewPos )
@@ -304,81 +304,81 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
 // Skip the Sbx-Object inside the stream
 void SbxBase::Skip( SvStream& rStrm )
 {
-    UINT16 nSbxId, nFlags, nVer;
-    UINT32 nCreator, nSize;
+    sal_uInt16 nSbxId, nFlags, nVer;
+    sal_uInt32 nCreator, nSize;
     rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
 
-    ULONG nStartPos = rStrm.Tell();
+    sal_uIntPtr nStartPos = rStrm.Tell();
     rStrm >> nSize;
 
     rStrm.Seek( nStartPos + nSize );
 }
 
-BOOL SbxBase::Store( SvStream& rStrm )
+sal_Bool SbxBase::Store( SvStream& rStrm )
 {
     DBG_CHKTHIS( SbxBase, 0 );
     if( !( nFlags & SBX_DONTSTORE ) )
     {
-        rStrm << (UINT32) GetCreator()
-              << (UINT16) GetSbxId()
-              << (UINT16) GetFlags()
-              << (UINT16) GetVersion();
-        ULONG nOldPos = rStrm.Tell();
-        rStrm << (UINT32) 0L;
-        BOOL bRes = StoreData( rStrm );
-        ULONG nNewPos = rStrm.Tell();
+        rStrm << (sal_uInt32) GetCreator()
+              << (sal_uInt16) GetSbxId()
+              << (sal_uInt16) GetFlags()
+              << (sal_uInt16) GetVersion();
+        sal_uIntPtr nOldPos = rStrm.Tell();
+        rStrm << (sal_uInt32) 0L;
+        sal_Bool bRes = StoreData( rStrm );
+        sal_uIntPtr nNewPos = rStrm.Tell();
         rStrm.Seek( nOldPos );
-        rStrm << (UINT32) ( nNewPos - nOldPos );
+        rStrm << (sal_uInt32) ( nNewPos - nOldPos );
         rStrm.Seek( nNewPos );
         if( rStrm.GetError() != SVSTREAM_OK )
-            bRes = FALSE;
+            bRes = sal_False;
         if( bRes )
             bRes = StoreCompleted();
         return bRes;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL SbxBase::LoadData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadData( SvStream&, sal_uInt16 )
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbxBase::StoreData( SvStream& ) const
+sal_Bool SbxBase::StoreData( SvStream& ) const
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SbxBase::LoadPrivateData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadPrivateData( SvStream&, sal_uInt16 )
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::StorePrivateData( SvStream& ) const
+sal_Bool SbxBase::StorePrivateData( SvStream& ) const
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::LoadCompleted()
+sal_Bool SbxBase::LoadCompleted()
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxBase::StoreCompleted()
+sal_Bool SbxBase::StoreCompleted()
 {
     DBG_CHKTHIS( SbxBase, 0 );
-    return TRUE;
+    return sal_True;
 }
 
 //////////////////////////////// SbxFactory ////////////////////////////////
 
-SbxBase* SbxFactory::Create( UINT16, UINT32 )
+SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 )
 {
     return NULL;
 }
@@ -394,7 +394,7 @@ SbxInfo::~SbxInfo()
 {}
 
 void SbxInfo::AddParam
-        ( const XubString& rName, SbxDataType eType, USHORT nFlags )
+        ( const XubString& rName, SbxDataType eType, sal_uInt16 nFlags )
 {
     const SbxParamInfo* p = new SbxParamInfo( rName, eType, nFlags );
     aParams.Insert( p, aParams.Count() );
@@ -407,7 +407,7 @@ void SbxInfo::AddParam( const SbxParamInfo& r )
     aParams.Insert( p, aParams.Count() );
 }
 
-const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
+const SbxParamInfo* SbxInfo::GetParam( sal_uInt16 n ) const
 {
     if( n < 1 || n > aParams.Count() )
         return NULL;
@@ -415,18 +415,18 @@ const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
         return aParams.GetObject( n-1 );
 }
 
-BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     aParams.Remove( 0, aParams.Count() );
-    UINT16 nParam;
+    sal_uInt16 nParam;
     rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US );
     rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
     rStrm >> nHelpId >> nParam;
     while( nParam-- )
     {
         XubString aName;
-        UINT16 nType, nFlags;
-        UINT32 nUserData = 0;
+        sal_uInt16 nType, nFlags;
+        sal_uInt32 nUserData = 0;
         rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US );
         rStrm >> nType >> nFlags;
         if( nVer > 1 )
@@ -435,23 +435,23 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
         SbxParamInfo* p = aParams.GetObject( aParams.Count() - 1 );
         p->nUserData = nUserData;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxInfo::StoreData( SvStream& rStrm ) const
+sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const
 {
     rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US );
     rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
     rStrm << nHelpId << aParams.Count();
-    for( USHORT i = 0; i < aParams.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aParams.Count(); i++ )
     {
         SbxParamInfo* p = aParams.GetObject( i );
         rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US );
-        rStrm << (UINT16) p->eType
-              << (UINT16) p->nFlags
-              << (UINT32) p->nUserData;
+        rStrm << (sal_uInt16) p->eType
+              << (sal_uInt16) p->nFlags
+              << (sal_uInt32) p->nUserData;
     }
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 5c6657b874..e0efbec32b 100644..100755
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -86,15 +86,15 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
                 else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
                 {
                     // Jetzt kann es noch in eine Zahl konvertierbar sein
-                    BOOL bError = TRUE;
+                    sal_Bool bError = sal_True;
                     double n;
                     SbxDataType t;
-                    USHORT nLen = 0;
+                    sal_uInt16 nLen = 0;
                     if( ImpScan( *p->pOUString, n, t, &nLen ) == SbxERR_OK )
                     {
                         if( nLen == p->pOUString->getLength() )
                         {
-                            bError = FALSE;
+                            bError = sal_False;
                             if( n != 0.0 )
                                 nRes = SbxTRUE;
                         }
@@ -146,7 +146,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
     return nRes;
 }
 
-void ImpPutBool( SbxValues* p, INT16 n )
+void ImpPutBool( SbxValues* p, sal_Int16 n )
 {
     if( n )
         n = SbxTRUE;
@@ -155,17 +155,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxCHAR:
             p->nChar = (xub_Unicode) n; break;
         case SbxUINT:
-            p->nByte = (BYTE) n; break;
+            p->nByte = (sal_uInt8) n; break;
         case SbxINTEGER:
         case SbxBOOL:
             p->nInteger = n; break;
         case SbxLONG:
             p->nLong = n; break;
         case SbxULONG:
-            p->nULong = (UINT32) n; break;
+            p->nULong = (sal_uInt32) n; break;
         case SbxERROR:
         case SbxUSHORT:
-            p->nUShort = (UINT16) n; break;
+            p->nUShort = (sal_uInt16) n; break;
         case SbxSINGLE:
             p->nSingle = n; break;
         case SbxDATE:
@@ -178,7 +178,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
             p->uInt64 = (sal_uInt64) n; break;
         case SbxDECIMAL:
         case SbxBYREF | SbxDECIMAL:
-            ImpCreateDecimal( p )->setInt( (INT16)n );
+            ImpCreateDecimal( p )->setInt( (sal_Int16)n );
             break;
 
         case SbxBYREF | SbxSTRING:
@@ -194,7 +194,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
         {
             SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
             if( pVal )
-                pVal->PutBool( BOOL( n != 0 ) );
+                pVal->PutBool( sal_Bool( n != 0 ) );
             else
                 SbxBase::SetError( SbxERR_NO_OBJECT );
             break;
@@ -202,17 +202,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
         case SbxBYREF | SbxCHAR:
             *p->pChar = (xub_Unicode) n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             *p->pLong = n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = n; break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index 2c194f564c..a3cf94e160 100644..100755
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -32,10 +32,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-BYTE ImpGetByte( const SbxValues* p )
+sal_uInt8 ImpGetByte( const SbxValues* p )
 {
     SbxValues aTmp;
-    BYTE nRes;
+    sal_uInt8 nRes;
 start:
     switch( +p->eType )
     {
@@ -49,10 +49,10 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nChar;
+                nRes = (sal_uInt8) p->nChar;
             break;
         case SbxBYTE:
-            nRes = (BYTE) p->nByte;	break;
+            nRes = (sal_uInt8) p->nByte;	break;
         case SbxINTEGER:
         case SbxBOOL:
             if( p->nInteger > SbxMAXBYTE )
@@ -64,16 +64,16 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nInteger;
+                nRes = (sal_uInt8) p->nInteger;
             break;
         case SbxERROR:
         case SbxUSHORT:
-            if( p->nUShort > (USHORT) SbxMAXBYTE )
+            if( p->nUShort > (sal_uInt16) SbxMAXBYTE )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nUShort;
+                nRes = (sal_uInt8) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXBYTE )
@@ -85,7 +85,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) p->nLong;
+                nRes = (sal_uInt8) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXBYTE )
@@ -93,7 +93,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->nULong;
+                nRes = (sal_uInt8) p->nULong;
             break;
         case SbxCURRENCY:
         case SbxSALINT64:
@@ -110,7 +110,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) val;
+                nRes = (sal_uInt8) val;
             break;
         }
         case SbxSALUINT64:
@@ -119,7 +119,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
             }
             else
-                nRes = (BYTE) p->uInt64;
+                nRes = (sal_uInt8) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXBYTE )
@@ -131,7 +131,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( p->nSingle );
+                nRes = (sal_uInt8) ImpRound( p->nSingle );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -157,7 +157,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -180,7 +180,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (BYTE) ( d + 0.5 );
+                    nRes = (sal_uInt8) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -231,7 +231,7 @@ start:
     return nRes;
 }
 
-void ImpPutByte( SbxValues* p, BYTE n )
+void ImpPutByte( SbxValues* p, sal_uInt8 n )
 {
     switch( +p->eType )
     {
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 322f95cf43..14e422bd9c 100644..100755
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -145,7 +145,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
             }
             else
-                nRes = (BYTE) ImpRound( dVal );
+                nRes = (sal_uInt8) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -276,17 +276,17 @@ start:
         case SbxBYREF | SbxCHAR:
             *p->pChar = n; break;
         case SbxBYREF | SbxBYTE:
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             *p->pInteger = n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = (float) n; break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 5bc2e08f30..3c44bcfa6e 100644..100755
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -42,7 +42,7 @@ static const char* pCount;
 static const char* pAdd;
 static const char* pItem;
 static const char* pRemove;
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -62,7 +62,7 @@ SbxCollection::SbxCollection( const XubString& rClass )
     }
     Initialize();
     // For Access on itself
-    StartListening( GetBroadcaster(), TRUE );
+    StartListening( GetBroadcaster(), sal_True );
 }
 
 SbxCollection::SbxCollection( const SbxCollection& rColl )
@@ -102,7 +102,7 @@ void SbxCollection::Initialize()
     p->SetFlag( SBX_DONTSTORE );
 }
 
-SbxVariable* SbxCollection::FindUserData( UINT32 nData )
+SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData )
 {
     if( GetParameters() )
     {
@@ -130,9 +130,9 @@ void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
         SbxVariable* pVar = p->GetVar();
         SbxArray* pArg = pVar->GetParameters();
         if( bRead || bWrite )
@@ -192,7 +192,7 @@ void SbxCollection::CollItem( SbxArray* pPar_ )
         {
             short n = p->GetInteger();
             if( n >= 1 && n <= (short) pObjs->Count() )
-                pRes = pObjs->Get( (USHORT) n - 1 );
+                pRes = pObjs->Get( (sal_uInt16) n - 1 );
         }
         if( !pRes )
             SetError( SbxERR_BAD_INDEX );
@@ -212,13 +212,13 @@ void SbxCollection::CollRemove( SbxArray* pPar_ )
         if( n < 1 || n > (short) pObjs->Count() )
             SetError( SbxERR_BAD_INDEX );
         else
-            Remove( pObjs->Get( (USHORT) n - 1 ) );
+            Remove( pObjs->Get( (sal_uInt16) n - 1 ) );
     }
 }
 
-BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRes = SbxObject::LoadData( rStrm, nVer );
+    sal_Bool bRes = SbxObject::LoadData( rStrm, nVer );
     Initialize();
     return bRes;
 }
@@ -226,7 +226,7 @@ BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
 /////////////////////////////////////////////////////////////////////////
 
 SbxStdCollection::SbxStdCollection
-                    ( const XubString& rClass, const XubString& rElem, BOOL b )
+                    ( const XubString& rClass, const XubString& rElem, sal_Bool b )
                   : SbxCollection( rClass ), aElemClass( rElem ),
                     bAddRemoveOk( b )
 {}
@@ -278,9 +278,9 @@ void SbxStdCollection::CollRemove( SbxArray* pPar_ )
         SbxCollection::CollRemove( pPar_ );
 }
 
-BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
+    sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer );
     if( bRes )
     {
         rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
@@ -289,9 +289,9 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
     return bRes;
 }
 
-BOOL SbxStdCollection::StoreData( SvStream& rStrm ) const
+sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const
 {
-    BOOL bRes = SbxCollection::StoreData( rStrm );
+    sal_Bool bRes = SbxCollection::StoreData( rStrm );
     if( bRes )
     {
         rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 8f423452ab..bbce15e0be 100644..100755
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -34,19 +34,19 @@
 class SbxArray;
 
 // SBXSCAN.CXX
-extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString=FALSE );
+extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString=sal_False );
 extern SbxError ImpScan
-    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, USHORT* pLen,
-      BOOL bAllowIntntl=FALSE, BOOL bOnlyIntntl=FALSE );
+    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, sal_uInt16* pLen,
+      sal_Bool bAllowIntntl=sal_False, sal_Bool bOnlyIntntl=sal_False );
 
 // with advanced evaluation (International, "TRUE"/"FALSE")
-extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
+extern sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
 
 // SBXINT.CXX
 
 double 	    ImpRound( double );
-INT16 	    ImpGetInteger( const SbxValues* );
-void        ImpPutInteger( SbxValues*, INT16 );
+sal_Int16 	    ImpGetInteger( const SbxValues* );
+void        ImpPutInteger( SbxValues*, sal_Int16 );
 
 sal_Int64 	ImpGetInt64( const SbxValues* );
 void        ImpPutInt64( SbxValues*, sal_Int64 );
@@ -60,8 +60,8 @@ double      ImpSalUInt64ToDouble( sal_uInt64 n );
 
 // SBXLNG.CXX
 
-INT32 	ImpGetLong( const SbxValues* );
-void    ImpPutLong( SbxValues*, INT32 );
+sal_Int32 	ImpGetLong( const SbxValues* );
+void    ImpPutLong( SbxValues*, sal_Int32 );
 
 // SBXSNG.CXX
 
@@ -71,7 +71,7 @@ void    ImpPutSingle( SbxValues*, float );
 // SBXDBL.CXX
 
 double 	ImpGetDouble( const SbxValues* );
-void    ImpPutDouble( SbxValues*, double, BOOL bCoreString=FALSE );
+void    ImpPutDouble( SbxValues*, double, sal_Bool bCoreString=sal_False );
 
 // SBXCURR.CXX
 
@@ -110,23 +110,23 @@ sal_Unicode ImpGetChar( const SbxValues* );
 void        ImpPutChar( SbxValues*, sal_Unicode );
 
 // SBXBYTE.CXX
-BYTE 	ImpGetByte( const SbxValues* );
-void    ImpPutByte( SbxValues*, BYTE );
+sal_uInt8 	ImpGetByte( const SbxValues* );
+void    ImpPutByte( SbxValues*, sal_uInt8 );
 
 // SBXUINT.CXX
 
-UINT16 	ImpGetUShort( const SbxValues* );
-void    ImpPutUShort( SbxValues*, UINT16 );
+sal_uInt16 	ImpGetUShort( const SbxValues* );
+void    ImpPutUShort( SbxValues*, sal_uInt16 );
 
 // SBXULNG.CXX
 
-UINT32 	ImpGetULong( const SbxValues* );
-void    ImpPutULong( SbxValues*, UINT32 );
+sal_uInt32 	ImpGetULong( const SbxValues* );
+void    ImpPutULong( SbxValues*, sal_uInt32 );
 
 // SBXBOOL.CXX
 
 enum SbxBOOL ImpGetBool( const SbxValues* );
-void         ImpPutBool( SbxValues*, INT16 );
+void    ImpPutBool( SbxValues*, sal_Int16 );
 
 // ByteArray <--> String
 SbxArray* StringToByteArray(const ::rtl::OUString& rStr);
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index de80ea281b..0ea500bb0b 100644..100755
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -474,7 +474,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
             }
-            *p->pByte = (BYTE) val; break;
+            *p->pByte = (sal_uInt8) val; break;
         }
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
@@ -488,7 +488,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = SbxMININT;
             }
-            *p->pInteger = (INT16) val; break;
+            *p->pInteger = (sal_uInt16) val; break;
         }
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
@@ -502,7 +502,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
             }
-            *p->pUShort = (UINT16) val; break;
+            *p->pUShort = (sal_uInt16) val; break;
         }
         case SbxBYREF | SbxLONG:
         {
@@ -515,7 +515,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = SbxMINLNG;
             }
-            *p->pLong = (INT32) val; break;
+            *p->pLong = (sal_Int32) val; break;
         }
         case SbxBYREF | SbxULONG:
         {
@@ -528,7 +528,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
             }
-            *p->pULong = (UINT32) val;
+            *p->pULong = (sal_uInt32) val; break;
             break;
         }
         case SbxBYREF | SbxCURRENCY:
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 5f9bcaeb06..afde12a7aa 100644..100755
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -122,13 +122,13 @@ double ImpGetDate( const SbxValues* p )
 
                 pFormatter->PutandConvertEntry( aStr, nCheckPos,	nType,
                     nIndex, LANGUAGE_GERMAN, eLangType );
-                BOOL bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
+                sal_Bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
                 if ( bSuccess )
                 {
                     short nType_ = pFormatter->GetType( nIndex );
                     if(!(nType_ & (	NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE |
                                     NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED )))
-                        bSuccess = FALSE;
+                        bSuccess = sal_False;
                 }
 
                 if ( !bSuccess )
@@ -317,7 +317,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -328,7 +328,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -339,7 +339,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -349,7 +349,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -359,7 +359,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             if( n > SbxMAXSNG )
             {
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 045349a11b..10e24d0584 100644..100755
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -141,7 +141,7 @@ double ImpGetDouble( const SbxValues* p )
     return nRes;
 }
 
-void ImpPutDouble( SbxValues* p, double n, BOOL bCoreString )
+void ImpPutDouble( SbxValues* p, double n, sal_Bool bCoreString )
 {
     SbxValues aTmp;
 start:
@@ -232,7 +232,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -243,7 +243,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -254,7 +254,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -264,7 +264,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -274,7 +274,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             if( n > SbxMAXSNG )
             {
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index d53c529707..b727769b62 100644..100755
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -155,32 +155,32 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
 
 void SbxDecimal::setChar( sal_Unicode val )
 {
-    VarDecFromUI2( (USHORT)val, &maDec );
+    VarDecFromUI2( (sal_uInt16)val, &maDec );
 }
 
-void SbxDecimal::setByte( BYTE val )
+void SbxDecimal::setByte( sal_uInt8 val )
 {
-    VarDecFromUI1( (BYTE)val, &maDec );
+    VarDecFromUI1( (sal_uInt8)val, &maDec );
 }
 
-void SbxDecimal::setShort( INT16 val )
+void SbxDecimal::setShort( sal_Int16 val )
 {
     VarDecFromI2( (short)val, &maDec );
 }
 
-void SbxDecimal::setLong( INT32 val )
+void SbxDecimal::setLong( sal_Int32 val )
 {
     VarDecFromI4( (long)val, &maDec );
 }
 
-void SbxDecimal::setUShort( UINT16 val )
+void SbxDecimal::setUShort( sal_uInt16 val )
 {
-    VarDecFromUI2( (USHORT)val, &maDec );
+    VarDecFromUI2( (sal_uInt16)val, &maDec );
 }
 
-void SbxDecimal::setULong( UINT32 val )
+void SbxDecimal::setULong( sal_uInt32 val )
 {
-    VarDecFromUI4( (ULONG)val, &maDec );
+    VarDecFromUI4( (sal_uIntPtr)val, &maDec );
 }
 
 bool SbxDecimal::setSingle( float val )
@@ -197,12 +197,12 @@ bool SbxDecimal::setDouble( double val )
 
 void SbxDecimal::setInt( int val )
 {
-    setLong( (INT32)val );
+    setLong( (sal_Int32)val );
 }
 
 void SbxDecimal::setUInt( unsigned int val )
 {
-    setULong( (UINT32)val );
+    setULong( (sal_uInt32)val );
 }
 
 // sbxscan.cxx
@@ -258,31 +258,31 @@ bool SbxDecimal::getChar( sal_Unicode& rVal )
     return bRet;
 }
 
-bool SbxDecimal::getByte( BYTE& rVal )
+bool SbxDecimal::getByte( sal_uInt8& rVal )
 {
     bool bRet = ( VarUI1FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getShort( INT16& rVal )
+bool SbxDecimal::getShort( sal_Int16& rVal )
 {
     bool bRet = ( VarI2FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getLong( INT32& rVal )
+bool SbxDecimal::getLong( sal_Int32& rVal )
 {
     bool bRet = ( VarI4FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getUShort( UINT16& rVal )
+bool SbxDecimal::getUShort( sal_uInt16& rVal )
 {
     bool bRet = ( VarUI2FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
 }
 
-bool SbxDecimal::getULong( UINT32& rVal )
+bool SbxDecimal::getULong( sal_uInt32& rVal )
 {
     bool bRet = ( VarUI4FromDec( &maDec, &rVal ) == S_OK );
     return bRet;
@@ -302,7 +302,7 @@ bool SbxDecimal::getDouble( double& rVal )
 
 bool SbxDecimal::getInt( int& rVal )
 {
-    INT32 TmpVal;
+    sal_Int32 TmpVal;
     bool bRet = getLong( TmpVal );
     rVal = TmpVal;
     return bRet;
@@ -310,7 +310,7 @@ bool SbxDecimal::getInt( int& rVal )
 
 bool SbxDecimal::getUInt( unsigned int& rVal )
 {
-    UINT32 TmpVal;
+    sal_uInt32 TmpVal;
     bool bRet = getULong( TmpVal );
     rVal = TmpVal;
     return bRet;
@@ -361,11 +361,11 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
 }
 
 void SbxDecimal::setChar( sal_Unicode val )		{ (void)val; }
-void SbxDecimal::setByte( BYTE val )			{ (void)val; }
-void SbxDecimal::setShort( INT16 val )			{ (void)val; }
-void SbxDecimal::setLong( INT32 val )			{ (void)val; }
-void SbxDecimal::setUShort( UINT16 val )		{ (void)val; }
-void SbxDecimal::setULong( UINT32 val )			{ (void)val; }
+void SbxDecimal::setByte( sal_uInt8 val )			{ (void)val; }
+void SbxDecimal::setShort( sal_Int16 val )			{ (void)val; }
+void SbxDecimal::setLong( sal_Int32 val )			{ (void)val; }
+void SbxDecimal::setUShort( sal_uInt16 val )		{ (void)val; }
+void SbxDecimal::setULong( sal_uInt32 val )			{ (void)val; }
 bool SbxDecimal::setSingle( float val )			{ (void)val; return false; }
 bool SbxDecimal::setDouble( double val )		{ (void)val; return false; }
 void SbxDecimal::setInt( int val )				{ (void)val; }
@@ -373,11 +373,11 @@ void SbxDecimal::setUInt( unsigned int val )	{ (void)val; }
 bool SbxDecimal::setString( ::rtl::OUString* pOUString )	{ (void)pOUString;  return false; }
 
 bool SbxDecimal::getChar( sal_Unicode& rVal )	{ (void)rVal; return false; }
-bool SbxDecimal::getByte( BYTE& rVal )			{ (void)rVal; return false; }
-bool SbxDecimal::getShort( INT16& rVal )		{ (void)rVal; return false; }
-bool SbxDecimal::getLong( INT32& rVal )			{ (void)rVal; return false; }
-bool SbxDecimal::getUShort( UINT16& rVal )		{ (void)rVal; return false; }
-bool SbxDecimal::getULong( UINT32& rVal )		{ (void)rVal; return false; }
+bool SbxDecimal::getByte( sal_uInt8& rVal )			{ (void)rVal; return false; }
+bool SbxDecimal::getShort( sal_Int16& rVal )		{ (void)rVal; return false; }
+bool SbxDecimal::getLong( sal_Int32& rVal )			{ (void)rVal; return false; }
+bool SbxDecimal::getUShort( sal_uInt16& rVal )		{ (void)rVal; return false; }
+bool SbxDecimal::getULong( sal_uInt32& rVal )		{ (void)rVal; return false; }
 bool SbxDecimal::getSingle( float& rVal )		{ (void)rVal; return false; }
 bool SbxDecimal::getDouble( double& rVal )		{ (void)rVal; return false; }
 bool SbxDecimal::getInt( int& rVal )			{ (void)rVal; return false; }
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index cbe93dd420..69ca70797a 100644..100755
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -62,7 +62,7 @@ class SbxDecimal
 #ifdef WIN32
     DECIMAL		maDec;
 #endif
-    INT32		mnRefCount;
+    sal_Int32		mnRefCount;
 
 public:
     SbxDecimal( void );
@@ -77,11 +77,11 @@ public:
     void fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
 
     void setChar( sal_Unicode val );
-    void setByte( BYTE val );
-    void setShort( INT16 val );
-    void setLong( INT32 val );
-    void setUShort( UINT16 val );
-    void setULong( UINT32 val );
+    void setByte( sal_uInt8 val );
+    void setShort( sal_Int16 val );
+    void setLong( sal_Int32 val );
+    void setUShort( sal_uInt16 val );
+    void setULong( sal_uInt32 val );
     bool setSingle( float val );
     bool setDouble( double val );
     void setInt( int val );
@@ -98,11 +98,11 @@ public:
     }
 
     bool getChar( sal_Unicode& rVal );
-    bool getByte( BYTE& rVal );
-    bool getShort( INT16& rVal );
-    bool getLong( INT32& rVal );
-    bool getUShort( UINT16& rVal );
-    bool getULong( UINT32& rVal );
+    bool getByte( sal_uInt8& rVal );
+    bool getShort( sal_Int16& rVal );
+    bool getLong( sal_Int32& rVal );
+    bool getUShort( sal_uInt16& rVal );
+    bool getULong( sal_uInt32& rVal );
     bool getSingle( float& rVal );
     bool getDouble( double& rVal );
     bool getInt( int& rVal );
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 0235bc5ce2..aee53b92fa 100644..100755
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -36,21 +36,21 @@
 class SbxSimpleCharClass
 {
 public:
-    BOOL isAlpha( sal_Unicode c ) const
+    sal_Bool isAlpha( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+        sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
         return bRet;
     }
 
-    BOOL isDigit( sal_Unicode c ) const
+    sal_Bool isDigit( sal_Unicode c ) const
     {
-        BOOL bRet = (c >= '0' && c <= '9');
+        sal_Bool bRet = (c >= '0' && c <= '9');
         return bRet;
     }
 
-    BOOL isAlphaNumeric( sal_Unicode c ) const
+    sal_Bool isAlphaNumeric( sal_Unicode c ) const
     {
-        BOOL bRet = isDigit( c ) || isAlpha( c );
+        sal_Bool bRet = isDigit( c ) || isAlpha( c );
         return bRet;
     }
 };
@@ -72,7 +72,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
 
 static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
 {
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     // Did we have a nonstandard symbol?
     if( *p == '[' )
     {
@@ -142,7 +142,7 @@ static SbxVariable* QualifiedName
 // a function (with optional parameters).
 
 static SbxVariable* Operand
-    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, BOOL bVar )
+    ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, sal_Bool bVar )
 {
     static SbxSimpleCharClass aCharClass;
 
@@ -154,7 +154,7 @@ static SbxVariable* Operand
      || *p == '&' ) )
     {
         // A number could be scanned in directly!
-        USHORT nLen;
+        sal_uInt16 nLen;
         if( !refVar->Scan( XubString( p ), &nLen ) )
             refVar.Clear();
         else
@@ -192,12 +192,12 @@ static SbxVariable* Operand
 static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, FALSE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_False ) );
     p = SkipWhitespace( p );
     while( refVar.Is() && ( *p == '*' || *p == '/' ) )
     {
         xub_Unicode cOp = *p++;
-        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, FALSE ) );
+        SbxVariableRef refVar2( Operand( pObj, pGbl, &p, sal_False ) );
         if( refVar2.Is() )
         {
             // temporary variable!
@@ -256,7 +256,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico
 static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
 {
     const xub_Unicode* p = *ppBuf;
-    SbxVariableRef refVar( Operand( pObj, pGbl, &p, TRUE ) );
+    SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_True ) );
     p = SkipWhitespace( p );
     if( refVar.Is() )
     {
@@ -304,7 +304,7 @@ static SbxVariable* Element
     SbxVariableRef refVar;
     if( aSym.Len() )
     {
-        USHORT nOld = pObj->GetFlags();
+        sal_uInt16 nOld = pObj->GetFlags();
         if( pObj == pGbl )
             pObj->SetFlag( SBX_GBLSEARCH );
         refVar = pObj->Find( aSym, t );
@@ -318,7 +318,7 @@ static SbxVariable* Element
             {
                 p++;
                 SbxArrayRef refPar = new SbxArray;
-                USHORT nArg = 0;
+                sal_uInt16 nArg = 0;
                 // We are once relaxed and accept as well
                 // the line- or commandend as delimiter
                 // Search parameter always global!
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 33c6ae3c4a..42658a23e6 100644..100755
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -152,7 +152,7 @@ void SbxBasicFormater::ShowError( char * sErrMsg )
 // um eine Position zu gr"osseren Indizes, d.h. es wird Platz f"ur
 // ein neues (einzuf"ugendes) Zeichen geschafft.
 // ACHTUNG: der String MUSS gross genug sein !
-inline void SbxBasicFormater::ShiftString( String& sStrg, USHORT nStartPos )
+inline void SbxBasicFormater::ShiftString( String& sStrg, sal_uInt16 nStartPos )
 {
     sStrg.Erase( nStartPos,1 );
 }
@@ -175,7 +175,7 @@ void SbxBasicFormater::AppendDigit( String& sStrg, short nDigit )
 // verschiebt den Dezimal-Punkt um eine Stelle nach links
 void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
 {
-    USHORT nPos = sStrg.Search( cDecPoint );
+    sal_uInt16 nPos = sStrg.Search( cDecPoint );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -189,13 +189,13 @@ void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
 // es wird ein Flag zur"uckgeliefert, falls ein Overflow auftrat,
 // d.h. 99.99 --> 100.00, d.h. ein Gr"ossenordung ge"andert wurde
 // (geschieht beim Runden einer 9).
-void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow )
+void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow )
 {
     // wurde ggf ein falscher Index uebergeben --> Aufruf ignorieren
     if( nPos<0 )
         return;
 
-    bOverflow = FALSE;
+    bOverflow = sal_False;
     // "uberspringe den Dezimalpunkt und Tausender-Trennzeichen
     sal_Unicode c = sStrg.GetChar( nPos );
     if( nPos>0 && (c == cDecPoint || c == cThousandSep) )
@@ -219,7 +219,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
         ShiftString( sStrg,0 );
         // f"uhrende 1 einf"ugen: z.B. 99.99 f"ur 0.0
         sStrg.SetChar( 0, '1' );
-        bOverflow = TRUE;
+        bOverflow = sal_True;
     }
     else
     {
@@ -244,7 +244,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
             ShiftString( sStrg,nPos+1 );
             // f"uhrende 1 einf"ugen
             sStrg.SetChar( nPos+1, '1' );
-            bOverflow = TRUE;
+            bOverflow = sal_True;
         }
     }
 }
@@ -252,7 +252,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
 // rundet in einem String die Ziffer an der angegebenen Stelle
 void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos )
 {
-    BOOL bOverflow;
+    sal_Bool bOverflow;
 
     StrRoundDigit( sStrg,nPos,bOverflow );
 }
@@ -303,7 +303,7 @@ void SbxBasicFormater::InitExp( double _dNewExp )
 
 // bestimmt die Ziffer an der angegebenen Stelle (gedacht zur Anwendung im
 // Scan-Durchlauf)
-short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit )
 {
     // Versuch eine gr"ossere Ziffer zu lesen,
     // z.B. Stelle 4 in 1.234,
@@ -313,18 +313,18 @@ short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
         return _NO_DIGIT;
     // bestimme den Index der Stelle in dem Number-String:
     // "uberlese das Vorzeichen
-    USHORT no = 1;
+    sal_uInt16 no = 1;
     // falls notwendig den Dezimal-Punkt "uberlesen:
     if( nPos<nNumExp )
         no++;
     no += nNumExp-nPos;
     // Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
     if( nPos==nNumExp )
-        bFoundFirstDigit = TRUE;
+        bFoundFirstDigit = sal_True;
     return (short)(sSciNumStrg.GetChar( no ) - ASCII_0);
 }
 
-short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit )
 {
     // ist die abgefragte Stelle zu gross f"ur den Exponenten ?
     if( nPos>nExpExp )
@@ -332,11 +332,11 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
 
     // bestimme den Index der Stelle in dem Number-String:
     // "uberlese das Vorzeichen
-    USHORT no = 1;
+    sal_uInt16 no = 1;
     no += nExpExp-nPos;
     // Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
     if( nPos==nExpExp )
-        bFoundFirstDigit = TRUE;
+        bFoundFirstDigit = sal_True;
     return (short)(sNumExpStrg.GetChar( no ) - ASCII_0);
 }
 
@@ -344,7 +344,7 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
 // Zahl ggf. NICHT normiert (z.B. 1.2345e-03) dargestellt werden soll,
 // sondern eventuell 123.345e-3 !
 short SbxBasicFormater::GetDigitAtPosExpScan( double dNewExponent, short nPos,
-                                              BOOL& bFoundFirstDigit )
+                                              sal_Bool& bFoundFirstDigit )
 {
     // neuer Exponent wurde "ubergeben, aktualisiere
     // die tempor"aren Klassen-Variablen
@@ -382,7 +382,7 @@ TODO: ggf einen 'intelligenten' Peek-Parser um Rundungsfehler bei
 //
 // ACHTUNG: anscheinend gibt es manchmal noch Probleme mit Rundungs-Fehlern!
 short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
-                                double& dNextNumber, BOOL& bFoundFirstDigit )
+                                double& dNextNumber, sal_Bool& bFoundFirstDigit )
 // ACHTUNG: nPos kann auch negativ werden, f"ur Stellen nach dem Dezimal-Punkt
 {
     double dDigit;
@@ -399,7 +399,7 @@ short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
     if( nMaxDigit<nPos && !bFoundFirstDigit && nPos>=0 )
         return _NO_DIGIT;
     // Ziffer gefunden, setze Flag:
-    bFoundFirstDigit = TRUE;
+    bFoundFirstDigit = sal_True;
     for( short i=nMaxDigit; i>=nPos; i-- )
     {
         double dI = (double)i;
@@ -431,14 +431,14 @@ short SbxBasicFormater::RoundDigit( double dNumber )
 // und liefert diesen zur"uck.
 // Somit wird ein neuer String erzeugt, der vom Aufrufer wieder freigegeben
 // werden muss
-String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;		// default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;		// default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
-        bFound = TRUE;
+        bFound = sal_True;
         // der Format-String f"ur die positiven Zahlen ist alles
         // vor dem ersten ';'
         return sFormatStrg.Copy( 0,nPos );
@@ -450,10 +450,10 @@ String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & b
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;		// default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;		// default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -463,7 +463,7 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
         String sTempStrg = sFormatStrg.Copy( nPos+1 );
         // und suche darin ggf. ein weiteres ';'
         nPos = sTempStrg.Search( FORMAT_SEPARATOR );
-        bFound = TRUE;
+        bFound = sal_True;
         if( nPos==STRING_NOTFOUND )
             // keins gefunden, liefere alles...
             return sTempStrg;
@@ -477,10 +477,10 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;		// default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;		// default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -492,7 +492,7 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
         nPos = sTempStrg.Search( FORMAT_SEPARATOR );
         if( nPos!=STRING_NOTFOUND )
         {
-            bFound = TRUE;
+            bFound = sal_True;
             sTempStrg = sTempStrg.Copy( nPos+1 );
             nPos = sTempStrg.Search( FORMAT_SEPARATOR );
             if( nPos==STRING_NOTFOUND )
@@ -509,10 +509,10 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
 }
 
 // siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound )
 {
-    bFound = FALSE;		// default...
-    USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+    bFound = sal_False;		// default...
+    sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
 
     if( nPos!=STRING_NOTFOUND )
     {
@@ -529,7 +529,7 @@ String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL &
             nPos = sTempStrg.Search( FORMAT_SEPARATOR );
             if( nPos!=STRING_NOTFOUND )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 return sTempStrg.Copy( nPos+1 );
             }
         }
@@ -546,11 +546,11 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
                 short& nNoOfOptionalDigitsLeft,
                 short& nNoOfExponentDigits, short& nNoOfOptionalExponentDigits,
-                BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
-                BOOL& bGenerateThousandSeparator,
+                sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+                sal_Bool& bGenerateThousandSeparator,
                 short& nMultipleThousandSeparators )
 {
-    USHORT nLen;
+    sal_uInt16 nLen;
     short nState = 0;
 
     nLen = sFormatStrg.Len();
@@ -560,9 +560,9 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
     nNoOfOptionalDigitsLeft = 0;
     nNoOfExponentDigits = 0;
     nNoOfOptionalExponentDigits = 0;
-    bPercent = FALSE;
-    bCurrency = FALSE;
-    bScientific = FALSE;
+    bPercent = sal_False;
+    bCurrency = sal_False;
+    bScientific = sal_False;
     // ab 11.7.97: sobald ein Komma in dem Format String gefunden wird,
     // werden alle 3 Zehnerpotenzen markiert (d.h. tausender, milionen, ...)
     // bisher wurde nur an den gesetzten Position ein Tausender-Separator
@@ -571,7 +571,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
     bGenerateThousandSeparator = sFormatStrg.Search( ',' ) != STRING_NOTFOUND;
     nMultipleThousandSeparators = 0;
     // und untersuche den Format-String nach den gew"unschten Informationen
-    for( USHORT i=0; i<nLen; i++ )
+    for( sal_uInt16 i=0; i<nLen; i++ )
     {
         sal_Unicode c = sFormatStrg.GetChar( i );
         switch( c ) {
@@ -614,7 +614,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                     return -1;	// ERROR: zu viele Dezimal-Punkte
                 break;
             case '%':
-                bPercent = TRUE;
+                bPercent = sal_True;
                 /* old:
                 bPercent++;
                 if( bPercent>1 )
@@ -622,7 +622,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 */
                 break;
             case '(':
-                bCurrency = TRUE;
+                bCurrency = sal_True;
                 break;
             case ',':
             {
@@ -638,7 +638,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 if( nNoOfDigitsLeft > 0 || nNoOfDigitsRight > 0 )
                 {
                      nState = -1;	// breche jetzt das Z"ahlen der Stellen ab
-                    bScientific = TRUE;
+                    bScientific = sal_True;
                 }
                 /* old:
                 bScientific++;
@@ -653,7 +653,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
                 i++;
                 break;
             case CREATE_1000SEP_CHAR:
-                bGenerateThousandSeparator = TRUE;
+                bGenerateThousandSeparator = sal_True;
                 break;
         }
     }
@@ -664,12 +664,12 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
 // erzeugt werden soll
 void SbxBasicFormater::ScanFormatString( double dNumber,
                                 const String& sFormatStrg, String& sReturnStrg,
-                                BOOL bCreateSign )
+                                sal_Bool bCreateSign )
 {
     short 	/*nErr,*/nNoOfDigitsLeft,nNoOfDigitsRight,nNoOfOptionalDigitsLeft,
             nNoOfExponentDigits,nNoOfOptionalExponentDigits,
             nMultipleThousandSeparators;
-    BOOL 	bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
+    sal_Bool 	bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
 
     // Initialisiere den Return-String
     sReturnStrg = String();
@@ -720,12 +720,12 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
         double dExponent;
         short i,nLen;
         short nState,nDigitPos,nExponentPos,nMaxDigit,nMaxExponentDigit;
-        BOOL bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
+        sal_Bool bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
              bIsNegative,bZeroSpaceOn, bSignHappend,bDigitPosNegative;
 
         // Initialisierung der Arbeits-Variablen
-        bSignHappend = FALSE;
-        bFoundFirstDigit = FALSE;
+        bSignHappend = sal_False;
+        bFoundFirstDigit = sal_False;
         bIsNegative = dNumber<0.0;
         nLen = sFormatStrg.Len();
         dExponent = get_number_of_digits( dNumber );
@@ -749,8 +749,8 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
             // hier ben"otigt man keine Exponent-Daten !
             bDigitPosNegative = (nDigitPos < 0);
         }
-        bFirstDigit = TRUE;
-        bFirstExponentDigit = TRUE;
+        bFirstDigit = sal_True;
+        bFirstExponentDigit = sal_True;
         nState = 0; // 0 --> Mantisse; 1 --> Exponent
         bZeroSpaceOn = 0;
 
@@ -780,14 +780,14 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                     // Behandlung der Mantisse
                         if( bFirstDigit )
                         {
-                            //org:bFirstDigit = FALSE;
+                            //org:bFirstDigit = sal_False;
                             // ggf. Vorzeichen erzeugen
                             // Bem.: bei bCurrency soll das negative
                             //       Vorzeichen durch () angezeigt werden
                             if( bIsNegative && !bCreateSign/*!bCurrency*/ && !bSignHappend )
                             {
                                 // nur einmal ein Vorzeichen ausgeben
-                                bSignHappend = TRUE;
+                                bSignHappend = sal_True;
                                 StrAppendChar( sReturnStrg,'-' );
                             }
                             // hier jetzt "uberz"ahlige Stellen ausgeben,
@@ -805,7 +805,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                                     // wurde wirklich eine Ziffer eingefuegt ?
                                     if( nTempDigit!=_NO_DIGIT )
                                         // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                                        bFirstDigit = FALSE;
+                                        bFirstDigit = sal_False;
                                     // muss ggf. ein Tausender-Trennzeichen erzeugt werden?
                                     if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && j>0 && (j % 3 == 0) )
                                         StrAppendChar( sReturnStrg,cThousandSep );
@@ -817,7 +817,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                         {
                             AppendDigit( sReturnStrg,0 );		// Ja
                             // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                            bFirstDigit = FALSE;
+                            bFirstDigit = sal_False;
                             bZeroSpaceOn = 1;
                             // BEM.: bei Visual-Basic schaltet die erste 0 f"ur alle
                             //       nachfolgenden # (bis zum Dezimal-Punkt) die 0 ein,
@@ -837,7 +837,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                             // wurde wirklich eine Ziffer eingefuegt ?
                             if( nTempDigit!=_NO_DIGIT )
                                 // jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
-                                bFirstDigit = FALSE;
+                                bFirstDigit = sal_False;
                             // muss ggf. ein Tausender-Trennzeichen erzeugt werden?
                             if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && nDigitPos>0 && (nDigitPos % 3 == 0) )
                                 StrAppendChar( sReturnStrg,cThousandSep );
@@ -851,7 +851,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                         if( bFirstExponentDigit )
                         {
                             // Vorzeichen wurde schon bei e/E ausgegeben
-                            bFirstExponentDigit = FALSE;
+                            bFirstExponentDigit = sal_False;
                             if( nMaxExponentDigit>nExponentPos )
                             // hier jetzt "uberz"ahlige Stellen ausgeben,
                             // d.h. vom Format-String nicht erfasste Stellen
@@ -912,7 +912,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
                             break;
                         }
 
-                        BOOL bOverflow = FALSE;
+                        sal_Bool bOverflow = sal_False;
 #ifdef _with_sprintf
                         short nNextDigit = GetDigitAtPosScan( nDigitPos,bFoundFirstDigit );
 #else
@@ -1046,7 +1046,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
 
 String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
 {
-    BOOL bNullFormatFound;
+    sal_Bool bNullFormatFound;
     String sNullFormatStrg = GetNullFormatString( sFormatStrg,bNullFormatFound );
 
     if( bNullFormatFound )
@@ -1058,7 +1058,7 @@ String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
 
 String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
 {
-    BOOL bPosFormatFound,bNegFormatFound,b0FormatFound;
+    sal_Bool bPosFormatFound,bNegFormatFound,b0FormatFound;
 
     // analysiere Format-String auf vordefinierte Formate:
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
@@ -1107,7 +1107,7 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
             // verwende String fuer positive Werte
             sTempStrg = sPosFormatStrg;
         }
-        ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/FALSE );
+        ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/sal_False );
     }
     else
     {
@@ -1136,33 +1136,33 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
         {
             ScanFormatString( dNumber,
                     (/*sPosFormatStrg!=EMPTYFORMATSTRING*/bPosFormatFound ? sPosFormatStrg : sFormatStrg),
-                    sReturnStrg,/*bCreateSign=*/FALSE );
+                    sReturnStrg,/*bCreateSign=*/sal_False );
         }
     }
     return sReturnStrg;
 }
 
-BOOL SbxBasicFormater::isBasicFormat( String sFormatStrg )
+sal_Bool SbxBasicFormater::isBasicFormat( String sFormatStrg )
 {
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_CURRENCY ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_FIXED ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_STANDARD ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_PERCENT ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_SCIENTIFIC ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_YESNO ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_TRUEFALSE ) )
-        return TRUE;
+        return sal_True;
     if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_ONOFF ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 67f89328bf..558f971c72 100644..100755
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -37,10 +37,10 @@ double ImpRound( double d )
     return d + ( d < 0 ? -0.5 : 0.5 );
 }
 
-INT16 ImpGetInteger( const SbxValues* p )
+sal_Int16 ImpGetInteger( const SbxValues* p )
 {
     SbxValues aTmp;
-    INT16 nRes;
+    sal_Int16 nRes;
 start:
     switch( +p->eType )
     {
@@ -57,12 +57,12 @@ start:
             nRes = p->nInteger; break;
         case SbxERROR:
         case SbxUSHORT:
-            if( p->nUShort > (USHORT) SbxMAXINT )
+            if( p->nUShort > (sal_uInt16) SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->nUShort;
+                nRes = (sal_Int16) p->nUShort;
             break;
         case SbxLONG:
             if( p->nLong > SbxMAXINT )
@@ -74,7 +74,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) p->nLong;
+                nRes = (sal_Int16) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXINT )
@@ -82,7 +82,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->nULong;
+                nRes = (sal_Int16) p->nULong;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXINT )
@@ -94,7 +94,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) ImpRound( p->nSingle );
+                nRes = (sal_Int16) ImpRound( p->nSingle );
             break;
         case SbxCURRENCY:
             {
@@ -109,7 +109,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
                 }
                 else
-                    nRes = (INT16) (tstVal);
+                    nRes = (sal_Int16) (tstVal);
                 break;
             }
         case SbxSALINT64:
@@ -122,7 +122,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) p->nInt64;
+                nRes = (sal_Int16) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXINT )
@@ -130,7 +130,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
             }
             else
-                nRes = (INT16) p->uInt64;
+                nRes = (sal_Int16) p->uInt64;
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -155,7 +155,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
             }
             else
-                nRes = (INT16) ImpRound( dVal );
+                nRes = (sal_Int16) ImpRound( dVal );
             break;
             }
         case SbxLPSTR:
@@ -178,7 +178,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
                 }
                 else
-                    nRes = (INT16) ImpRound( d );
+                    nRes = (sal_Int16) ImpRound( d );
             }
             break;
         case SbxOBJECT:
@@ -229,7 +229,7 @@ start:
     return nRes;
 }
 
-void ImpPutInteger( SbxValues* p, INT16 n )
+void ImpPutInteger( SbxValues* p, sal_Int16 n )
 {
     SbxValues aTmp;
 start:
@@ -302,7 +302,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             *p->pInteger = n; break;
@@ -312,15 +312,15 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n < 0 )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxCURRENCY:
             *p->pnInt64 = n * CURRENCY_FACTOR; break;
         case SbxBYREF | SbxSALINT64:
@@ -587,7 +587,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -598,7 +598,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -609,7 +609,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
@@ -619,7 +619,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
@@ -629,7 +629,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pSingle = (float) n; break;
         case SbxBYREF | SbxDATE:
@@ -857,33 +857,33 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             if( n > SbxMAXULNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXULNG;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSINGLE:
             *p->pDouble = (float)ImpSalUInt64ToDouble( n ); break;
         case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 6fb566d8ad..654bc86dd0 100644..100755
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -32,10 +32,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-INT32 ImpGetLong( const SbxValues* p )
+sal_Int32 ImpGetLong( const SbxValues* p )
 {
     SbxValues aTmp;
-    INT32 nRes;
+    sal_Int32 nRes;
 start:
     switch( +p->eType )
     {
@@ -61,7 +61,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXLNG;
             }
             else
-                nRes = (INT32) p->nULong;
+                nRes = (sal_Int32) p->nULong;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXLNG )
@@ -73,7 +73,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
             }
             else
-                nRes = (INT32) ImpRound( p->nSingle );
+                nRes = (sal_Int32) ImpRound( p->nSingle );
             break;
         case SbxSALINT64:
             nRes = p->nInt64;
@@ -84,7 +84,7 @@ start:
         case SbxCURRENCY:
         {
             sal_Int64  tstVal = p->nInt64 / CURRENCY_FACTOR;
-            nRes = (INT32) (tstVal);
+            nRes = (sal_Int32) (tstVal);
             if( tstVal < SbxMINLNG || SbxMAXLNG < tstVal )  SbxBase::SetError( SbxERR_OVERFLOW );
             if( SbxMAXLNG < tstVal ) nRes = SbxMAXLNG;
             if( tstVal < SbxMINLNG ) nRes = SbxMINLNG;
@@ -114,7 +114,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
             }
             else
-                nRes = (INT32) ImpRound( dVal );
+                nRes = (sal_Int32) ImpRound( dVal );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -137,7 +137,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
                 }
                 else
-                    nRes = (INT32) ImpRound( d );
+                    nRes = (sal_Int32) ImpRound( d );
             }
             break;
         case SbxOBJECT:
@@ -189,7 +189,7 @@ start:
     return nRes;
 }
 
-void ImpPutLong( SbxValues* p, INT32 n )
+void ImpPutLong( SbxValues* p, sal_Int32 n )
 {
     SbxValues aTmp;
 
@@ -267,7 +267,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -278,7 +278,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -289,7 +289,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             *p->pLong = n; break;
         case SbxBYREF | SbxULONG:
@@ -297,7 +297,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pULong = (UINT32) n; break;
+            *p->pULong = (sal_uInt32) n; break;
         case SbxBYREF | SbxSALINT64:
             *p->pnInt64 = n; break;
         case SbxBYREF | SbxSALUINT64:
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
index c2eeaeff7d..c2eeaeff7d 100644..100755
--- a/basic/source/sbx/sbxmstrm.cxx
+++ b/basic/source/sbx/sbxmstrm.cxx
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index bbac334f69..99516aab66 100644..100755
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -41,7 +41,7 @@ TYPEINIT2(SbxObject,SbxVariable,SfxListener)
 static const char* pNameProp;				// Name-Property
 static const char* pParentProp;				// Parent-Property
 
-static USHORT nNameHash = 0, nParentHash = 0;
+static sal_uInt16 nNameHash = 0, nParentHash = 0;
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -86,18 +86,18 @@ SbxObject& SbxObject::operator=( const SbxObject& r )
         pDfltProp  = r.pDfltProp;
         SetName( r.GetName() );
         SetFlags( r.GetFlags() );
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
     return *this;
 }
 
 static void CheckParentsOnDelete( SbxObject* pObj, SbxArray* p )
 {
-    for( USHORT i = 0; i < p->Count(); i++ )
+    for( sal_uInt16 i = 0; i < p->Count(); i++ )
     {
         SbxVariableRef& rRef = p->GetRef( i );
         if( rRef->IsBroadcaster() )
-            pObj->EndListening( rRef->GetBroadcaster(), TRUE );
+            pObj->EndListening( rRef->GetBroadcaster(), sal_True );
         // Did the element have more then one reference and still a Listener?
         if( rRef->GetRefCount() > 1 )
         {
@@ -112,6 +112,9 @@ SbxObject::~SbxObject()
     CheckParentsOnDelete( this, pProps );
     CheckParentsOnDelete( this, pMethods );
     CheckParentsOnDelete( this, pObjs );
+
+    // avoid handling in ~SbxVariable as SBX_DIM_AS_NEW == SBX_GBLSEARCH
+    ResetFlag( SBX_DIM_AS_NEW );
 }
 
 SbxDataType SbxObject::GetType() const
@@ -136,7 +139,7 @@ void SbxObject::Clear()
     p->ResetFlag( SBX_WRITE );
     p->SetFlag( SBX_DONTSTORE );
     pDfltProp  = NULL;
-    SetModified( FALSE );
+    SetModified( sal_False );
 }
 
 void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
@@ -145,14 +148,14 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     const SbxHint* p = PTR_CAST(SbxHint,&rHint);
     if( p )
     {
-        ULONG nId = p->GetId();
-        BOOL bRead  = BOOL( nId == SBX_HINT_DATAWANTED );
-        BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+        sal_uIntPtr nId = p->GetId();
+        sal_Bool bRead  = sal_Bool( nId == SBX_HINT_DATAWANTED );
+        sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
         SbxVariable* pVar = p->GetVar();
         if( bRead || bWrite )
         {
             XubString aVarName( pVar->GetName() );
-            USHORT nHash_ = MakeHashCode( aVarName );
+            sal_uInt16 nHash_ = MakeHashCode( aVarName );
             if( nHash_ == nNameHash
              && aVarName.EqualsIgnoreCaseAscii( pNameProp ) )
             {
@@ -173,12 +176,12 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     }
 }
 
-BOOL SbxObject::IsClass( const XubString& rName ) const
+sal_Bool SbxObject::IsClass( const XubString& rName ) const
 {
-    return BOOL( aClassName.EqualsIgnoreCaseAscii( rName ) );
+    return sal_Bool( aClassName.EqualsIgnoreCaseAscii( rName ) );
 }
 
-SbxVariable* SbxObject::FindUserData( UINT32 nData )
+SbxVariable* SbxObject::FindUserData( sal_uInt32 nData )
 {
     if( !GetAll( SbxCLASS_DONTCARE ) )
         return NULL;
@@ -195,10 +198,10 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
         while( !pRes && pCur->pParent )
         {
             // I myself was already searched through!
-            USHORT nOwn = pCur->GetFlags();
+            sal_uInt16 nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
             // I search already global!
-            USHORT nPar = pCur->pParent->GetFlags();
+            sal_uInt16 nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->FindUserData( nData );
             pCur->SetFlags( nOwn );
@@ -212,7 +215,7 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
 SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
 {
 #ifdef DBG_UTIL
-    static USHORT nLvl = 0;
+    static sal_uInt16 nLvl = 0;
     static const char* pCls[] =
     { "DontCare","Array","Value","Variable","Method","Property","Object" };
     ByteString aNameStr1( (const UniString&)rName, RTL_TEXTENCODING_ASCII_US );
@@ -262,10 +265,10 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
         while( !pRes && pCur->pParent )
         {
             // I myself was already searched through!
-            USHORT nOwn = pCur->GetFlags();
+            sal_uInt16 nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
             // I search already global!
-            USHORT nPar = pCur->pParent->GetFlags();
+            sal_uInt16 nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->Find( rName, t );
             pCur->SetFlags( nOwn );
@@ -290,7 +293,7 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
 // The whole thing recursive, because Call() might be overloaded
 // Qualified names are allowed
 
-BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
+sal_Bool SbxObject::Call( const XubString& rName, SbxArray* pParam )
 {
     SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE);
     if( pMeth && pMeth->ISA(SbxMethod) )
@@ -300,10 +303,10 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
             pMeth->SetParameters( pParam );
         pMeth->Broadcast( SBX_HINT_DATAWANTED );
         pMeth->SetParameters( NULL );
-        return TRUE;
+        return sal_True;
     }
     SetError( SbxERR_NO_METHOD );
-    return FALSE;
+    return sal_False;
 }
 
 SbxProperty* SbxObject::GetDfltProperty()
@@ -321,14 +324,14 @@ void SbxObject::SetDfltProperty( const XubString& rName )
     if ( rName != aDfltPropName )
         pDfltProp = NULL;
     aDfltPropName = rName;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 void SbxObject::SetDfltProperty( SbxProperty* p )
 {
     if( p )
     {
-        USHORT n;
+        sal_uInt16 n;
         SbxArray* pArray = FindVar( p, n );
         pArray->Put( p, n );
         if( p->GetParent() != this )
@@ -336,14 +339,14 @@ void SbxObject::SetDfltProperty( SbxProperty* p )
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
     pDfltProp = p;
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 // Search of a already available variable. If she was located,
 // the index will be set, elsewise will be delivered the Count of the Array.
 // In any case it will be delivered the correct Array.
 
-SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
 {
     SbxArray* pArray = NULL;
     if( pVar ) switch( pVar->GetClass() )
@@ -362,7 +365,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
         pArray->ResetFlag( SBX_EXTSEARCH );
         SbxVariable* pOld = pArray->Find( pVar->GetName(), pVar->GetClass() );
         if( pOld )
-          for( USHORT i = 0; i < pArray->Count(); i++ )
+          for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
         {
             SbxVariableRef& rRef = pArray->GetRef( i );
             if( (SbxVariable*) rRef == pOld )
@@ -432,9 +435,9 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
     }
     pVar->SetParent( this );
     pArray->Put( pVar, pArray->Count() );
-    SetModified( TRUE );
+    SetModified( sal_True );
     // The object listen always
-    StartListening( pVar->GetBroadcaster(), TRUE );
+    StartListening( pVar->GetBroadcaster(), sal_True );
     Broadcast( SBX_HINT_OBJECTCHANGED );
     return pVar;
 }
@@ -470,9 +473,9 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
         pVar->SetName( rName );
         pVar->SetParent( this );
         pObjs->Put( pVar, pObjs->Count() );
-        SetModified( TRUE );
+        SetModified( sal_True );
         // The object listen always
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
     return pVar;
@@ -480,7 +483,7 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
 
 void SbxObject::Insert( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray )
     {
@@ -512,7 +515,7 @@ void SbxObject::Insert( SbxVariable* pVar )
                 }
 #endif
 */
-                EndListening( pOld->GetBroadcaster(), TRUE );
+                EndListening( pOld->GetBroadcaster(), sal_True );
                 if( pVar->GetClass() == SbxCLASS_PROPERTY )
                 {
                     if( pOld == pDfltProp )
@@ -520,11 +523,11 @@ void SbxObject::Insert( SbxVariable* pVar )
                 }
             }
         }
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, nIdx );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
 #ifdef DBG_UTIL
     static const char* pCls[] =
@@ -561,11 +564,11 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
     }
     if( pArray )
     {
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, pArray->Count() );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
 #ifdef DBG_UTIL
     static const char* pCls[] =
     { "DontCare","Array","Value","Variable","Method","Property","Object" };
@@ -600,11 +603,11 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar )
     }
     if( pArray )
     {
-        StartListening( pVar->GetBroadcaster(), TRUE );
+        StartListening( pVar->GetBroadcaster(), sal_True );
         pArray->Put( pVar, pArray->Count() );
         if( pVar->GetParent() != this )
             pVar->SetParent( this );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
@@ -616,7 +619,7 @@ void SbxObject::Remove( const XubString& rName, SbxClassType t )
 
 void SbxObject::Remove( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray && nIdx < pArray->Count() )
     {
@@ -629,13 +632,13 @@ void SbxObject::Remove( SbxVariable* pVar )
 #endif
         SbxVariableRef pVar_ = pArray->Get( nIdx );
         if( pVar_->IsBroadcaster() )
-            EndListening( pVar_->GetBroadcaster(), TRUE );
+            EndListening( pVar_->GetBroadcaster(), sal_True );
         if( (SbxVariable*) pVar_ == pDfltProp )
             pDfltProp = NULL;
         pArray->Remove( nIdx );
         if( pVar_->GetParent() == this )
             pVar_->SetParent( NULL );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
@@ -643,26 +646,26 @@ void SbxObject::Remove( SbxVariable* pVar )
 // From 1997-03-23, cleanup per Pointer for Controls (double names!)
 void SbxObject::VCPtrRemove( SbxVariable* pVar )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     // New FindVar-Method, otherwise identical with the normal method
     SbxArray* pArray = VCPtrFindVar( pVar, nIdx );
     if( pArray && nIdx < pArray->Count() )
     {
         SbxVariableRef xVar = pArray->Get( nIdx );
         if( xVar->IsBroadcaster() )
-            EndListening( xVar->GetBroadcaster(), TRUE );
+            EndListening( xVar->GetBroadcaster(), sal_True );
         if( (SbxVariable*) xVar == pDfltProp )
             pDfltProp = NULL;
         pArray->Remove( nIdx );
         if( xVar->GetParent() == this )
             xVar->SetParent( NULL );
-        SetModified( TRUE );
+        SetModified( sal_True );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
 }
 
 // From 1997-03-23, associated special method, search only by Pointer
-SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
 {
     SbxArray* pArray = NULL;
     if( pVar ) switch( pVar->GetClass() )
@@ -677,7 +680,7 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
     if( pArray )
     {
         nArrayIdx = pArray->Count();
-        for( USHORT i = 0; i < pArray->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
         {
             SbxVariableRef& rRef = pArray->GetRef( i );
             if( (SbxVariable*) rRef == pVar )
@@ -691,9 +694,9 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
 
 
 
-void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
+void SbxObject::SetPos( SbxVariable* pVar, sal_uInt16 nPos )
 {
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray )
     {
@@ -706,41 +709,41 @@ void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
             pArray->Insert( refVar, nPos );
         }
     }
-//	SetModified( TRUE );
+//	SetModified( sal_True );
 //	Broadcast( SBX_HINT_OBJECTCHANGED );
 }
 
-static BOOL LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
+static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
 {
     SbxArrayRef p = (SbxArray*) SbxBase::Load( rStrm );
     if( !p.Is() )
-        return FALSE;
-    for( USHORT i = 0; i < p->Count(); i++ )
+        return sal_False;
+    for( sal_uInt16 i = 0; i < p->Count(); i++ )
     {
         SbxVariableRef& r = p->GetRef( i );
         SbxVariable* pVar = r;
         if( pVar )
         {
             pVar->SetParent( pThis );
-            pThis->StartListening( pVar->GetBroadcaster(), TRUE );
+            pThis->StartListening( pVar->GetBroadcaster(), sal_True );
         }
     }
     pArray->Merge( p );
-    return TRUE;
+    return sal_True;
 }
 
 // The load of an object is additive!
 
-BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
     // Help for the read in of old objects: just TRUE back,
     // LoadPrivateData() had to set the default status up
     if( !nVer )
-        return TRUE;
+        return sal_True;
 
     pDfltProp = NULL;
     if( !SbxVariable::LoadData( rStrm, nVer ) )
-        return FALSE;
+        return sal_False;
     // If  it contains no alien object, insert ourselves
     if( aData.eType == SbxOBJECT && !aData.pObj )
         aData.pObj = this;
@@ -748,11 +751,11 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
     XubString aDfltProp;
     rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
-    ULONG nPos = rStrm.Tell();
+    sal_uIntPtr nPos = rStrm.Tell();
     rStrm >> nSize;
     if( !LoadPrivateData( rStrm, nVer ) )
-        return FALSE;
-    ULONG nNewPos = rStrm.Tell();
+        return sal_False;
+    sal_uIntPtr nNewPos = rStrm.Tell();
     nPos += nSize;
     DBG_ASSERT( nPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
     if( nPos != nNewPos )
@@ -760,39 +763,39 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
     if( !LoadArray( rStrm, this, pMethods )
      || !LoadArray( rStrm, this, pProps )
      || !LoadArray( rStrm, this, pObjs ) )
-        return FALSE;
+        return sal_False;
     // Set properties
     if( aDfltProp.Len() )
         pDfltProp = (SbxProperty*) pProps->Find( aDfltProp, SbxCLASS_PROPERTY );
-    SetModified( FALSE );
-    return TRUE;
+    SetModified( sal_False );
+    return sal_True;
 }
 
-BOOL SbxObject::StoreData( SvStream& rStrm ) const
+sal_Bool SbxObject::StoreData( SvStream& rStrm ) const
 {
     if( !SbxVariable::StoreData( rStrm ) )
-        return FALSE;
+        return sal_False;
     XubString aDfltProp;
     if( pDfltProp )
         aDfltProp = pDfltProp->GetName();
     rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
-    ULONG nPos = rStrm.Tell();
-    rStrm << (UINT32) 0L;
+    sal_uIntPtr nPos = rStrm.Tell();
+    rStrm << (sal_uInt32) 0L;
     if( !StorePrivateData( rStrm ) )
-        return FALSE;
-    ULONG nNew = rStrm.Tell();
+        return sal_False;
+    sal_uIntPtr nNew = rStrm.Tell();
     rStrm.Seek( nPos );
-    rStrm << (UINT32) ( nNew - nPos );
+    rStrm << (sal_uInt32) ( nNew - nPos );
     rStrm.Seek( nNew );
     if( !pMethods->Store( rStrm ) )
-        return FALSE;
+        return sal_False;
     if( !pProps->Store( rStrm ) )
-        return FALSE;
+        return sal_False;
     if( !pObjs->Store( rStrm ) )
-        return FALSE;
-    ((SbxObject*) this)->SetModified( FALSE );
-    return TRUE;
+        return sal_False;
+    ((SbxObject*) this)->SetModified( sal_False );
+    return sal_True;
 }
 
 XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
@@ -802,7 +805,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
     XubString aSource;
     SbxArrayRef xProps( GetProperties() );
     bool bLineFeed = false;
-    for ( USHORT nProp = 0; nProp < xProps->Count(); ++nProp )
+    for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp )
     {
         SbxPropertyRef xProp = (SbxProperty*) xProps->Get(nProp);
         XubString aPropName( xProp->GetName() );
@@ -850,7 +853,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
     return aSource;
 }
 
-static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
+static sal_Bool CollectAttrs( const SbxBase* p, XubString& rRes )
 {
     XubString aAttrs;
     if( p->IsHidden() )
@@ -878,19 +881,19 @@ static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
         rRes.AssignAscii( " (" );
         rRes += aAttrs;
         rRes += ')';
-        return TRUE;
+        return sal_True;
     }
     else
     {
         rRes.Erase();
-        return FALSE;
+        return sal_False;
     }
 }
 
-void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
+void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     // Shifting
-    static USHORT nLevel = 0;
+    static sal_uInt16 nLevel = 0;
     if ( nLevel > 10 )
     {
         rStrm << "<too deep>" << endl;
@@ -898,7 +901,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     }
     ++nLevel;
     String aIndent;
-    for ( USHORT n = 1; n < nLevel; ++n )
+    for ( sal_uInt16 n = 1; n < nLevel; ++n )
         aIndent.AppendAscii( "    " );
 
     // if necessary complete the object
@@ -909,7 +912,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     ByteString aNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
     ByteString aClassNameStr( (const UniString&)aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm << "Object( "
-          << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=='"
+          << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=='"
           << ( aNameStr.Len() ? aNameStr.GetBuffer() : "<unnamed>" ) << "', "
           << "of class '" << aClassNameStr.GetBuffer() << "', "
           << "counts "
@@ -919,7 +922,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     {
         ByteString aParentNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
         rStrm << "in parent "
-              << ByteString::CreateFromInt64( (ULONG) GetParent() ).GetBuffer()
+              << ByteString::CreateFromInt64( (sal_uIntPtr) GetParent() ).GetBuffer()
               << "=='" << ( aParentNameStr.Len() ? aParentNameStr.GetBuffer() : "<unnamed>" ) << "'";
     }
     else
@@ -938,7 +941,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
 
     // Methods
     rStrm << aIndentNameStr.GetBuffer() << "- Methods:" << endl;
-    for( USHORT i = 0; i < pMethods->Count(); i++ )
+    for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
     {
         SbxVariableRef& r = pMethods->GetRef( i );
         SbxVariable* pVar = r;
@@ -971,7 +974,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     // Properties
     rStrm << aIndentNameStr.GetBuffer() << "- Properties:" << endl;
     {
-        for( USHORT i = 0; i < pProps->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pProps->Count(); i++ )
         {
             SbxVariableRef& r = pProps->GetRef( i );
             SbxVariable* pVar = r;
@@ -1005,7 +1008,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     // Objects
     rStrm << aIndentNameStr.GetBuffer() << "- Objects:" << endl;
     {
-        for( USHORT i = 0; i < pObjs->Count(); i++ )
+        for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
         {
             SbxVariableRef& r = pObjs->GetRef( i );
             SbxVariable* pVar = r;
@@ -1029,7 +1032,7 @@ SvDispatch* SbxObject::GetSvDispatch()
     return NULL;
 }
 
-BOOL SbxMethod::Run( SbxValues* pValues )
+sal_Bool SbxMethod::Run( SbxValues* pValues )
 {
     SbxValues aRes;
     if( !pValues )
@@ -1048,7 +1051,7 @@ SbxClassType SbxProperty::GetClass() const
     return SbxCLASS_PROPERTY;
 }
 
-void SbxObject::GarbageCollection( ULONG /*nObjects*/ )
+void SbxObject::GarbageCollection( sal_uIntPtr /* nObjects */ )
 
 /*	[Description]
 
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index 612911aaad..1db3372b9e 100644..100755
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -81,12 +81,12 @@ static const char* pSbxRes[] = {
     "True"
 };
 
-const char* GetSbxRes( USHORT nId )
+const char* GetSbxRes( sal_uInt16 nId )
 {
     return ( ( nId > SBXRES_MAX ) ? "???" : pSbxRes[ nId ] );
 }
 
-SbxRes::SbxRes( USHORT nId )
+SbxRes::SbxRes( sal_uInt16 nId )
     : ::rtl::OUString( ::rtl::OUString::createFromAscii( GetSbxRes( nId ) ) )
 {}
 
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index eb2e202665..483302da95 100644..100755
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -79,10 +79,10 @@
 class SbxRes : public ::rtl::OUString
 {
 public:
-    SbxRes( USHORT );
+    SbxRes( sal_uInt16 );
 };
 
-const char* GetSbxRes( USHORT );
+const char* GetSbxRes( sal_uInt16 );
 
 
 #endif
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index c18e271df0..fcb1e6966b 100644..100755
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -71,7 +71,7 @@ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep )
 // Fixed ist und das ganze nicht hineinpasst!
 
 SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType,
-                  USHORT* pLen, BOOL bAllowIntntl, BOOL bOnlyIntntl )
+                  sal_uInt16* pLen, sal_Bool bAllowIntntl, sal_Bool bOnlyIntntl )
 {
     ::rtl::OString aBStr( ::rtl::OUStringToOString( rWSrc, RTL_TEXTENCODING_ASCII_US ) );
 
@@ -102,15 +102,15 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
     const char* pStart = aBStr.getStr();
     const char* p = pStart;
     char buf[ 80 ], *q = buf;
-    BOOL bRes = TRUE;
-    BOOL bMinus = FALSE;
+    sal_Bool bRes = sal_True;
+    sal_Bool bMinus = sal_False;
     nVal = 0;
     SbxDataType eScanType = SbxSINGLE;
     // Whitespace wech
     while( *p &&( *p == ' ' || *p == '\t' ) ) p++;
     // Zahl? Dann einlesen und konvertieren.
     if( *p == '-' )
-        p++, bMinus = TRUE;
+        p++, bMinus = sal_True;
     if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma ||
             *p == cIntntl1000) && isdigit( *(p+1 ) ) ) )
     {
@@ -171,7 +171,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         *q = 0;
         // Komma, Exponent mehrfach vorhanden?
         if( comma > 1 || exp > 1 )
-            bRes = FALSE;
+            bRes = sal_False;
         // Kann auf Integer gefaltet werden?
         if( !comma && !exp )
         {
@@ -203,7 +203,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         {
             case 'O': cmp = "01234567"; base = 8; ndig = 11; break;
             case 'H': break;
-            default : bRes = FALSE;
+            default : bRes = sal_False;
         }
         long l = 0;
         int i;
@@ -212,7 +212,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
             char ch = sal::static_int_cast< char >( toupper( *p ) );
             p++;
             if( strchr( cmp, ch ) ) *q++ = ch;
-            else bRes = FALSE;
+            else bRes = sal_False;
         }
         *q = 0;
         for( q = buf; *q; q++ )
@@ -221,7 +221,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
             if( i > 9 ) i -= 7;
             l =( l * base ) + i;
             if( !ndig-- )
-                bRes = FALSE;
+                bRes = sal_False;
         }
         if( *p == '&' ) p++;
         nVal = (double) l;
@@ -234,7 +234,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
         return SbxERR_CONVERSION;
     }
     if( pLen )
-        *pLen = (USHORT) ( p - pStart );
+        *pLen = (sal_uInt16) ( p - pStart );
     if( !bRes )
         return SbxERR_CONVERSION;
     if( bMinus )
@@ -244,12 +244,12 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
 }
 
 // Schnittstelle fuer CDbl im Basic
-SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle )
+SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle )
 {
     SbxDataType t;
-    USHORT nLen = 0;
+    sal_uInt16 nLen = 0;
     SbxError nRetError = ImpScan( rSrc, nVal, t, &nLen,
-        /*bAllowIntntl*/FALSE, /*bOnlyIntntl*/TRUE );
+        /*bAllowIntntl*/sal_False, /*bOnlyIntntl*/sal_True );
     // Komplett gelesen?
     if( nRetError == SbxERR_OK && nLen != rSrc.Len() )
         nRetError = SbxERR_CONVERSION;
@@ -270,20 +270,20 @@ static double roundArray[] = {
 
 /***************************************************************************
 |*
-|*	void myftoa( double, char *, short, short, BOOL, BOOL )
+|*	void myftoa( double, char *, short, short, sal_Bool, sal_Bool )
 |*
 |*	Beschreibung:		Konversion double --> ASCII
 |*	Parameter:			double				die Zahl.
 |*						char *				der Zielpuffer
 |*						short				Anzahl Nachkommastellen
 |*						short				Weite des Exponenten( 0=kein E )
-|*						BOOL				TRUE: mit 1000er Punkten
-|*						BOOL				TRUE: formatfreie Ausgabe
+|*						sal_Bool				sal_True: mit 1000er Punkten
+|*						sal_Bool				sal_True: formatfreie Ausgabe
 |*
 ***************************************************************************/
 
 static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
-                    BOOL bPt, BOOL bFix, sal_Unicode cForceThousandSep = 0 )
+                    sal_Bool bPt, sal_Bool bFix, sal_Unicode cForceThousandSep = 0 )
 {
 
     short nExp = 0;						// Exponent
@@ -391,7 +391,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
 #pragma warning(disable: 4748) // "... because optimizations are disabled ..."
 #endif
 
-void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString )
+void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString )
 {
     char *q;
     char cBuf[ 40 ], *p = cBuf;
@@ -407,7 +407,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
     }
     double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
     myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum >= dMaxNumWithoutExp ) ) ? 4:0,
-        FALSE, TRUE, cDecimalSep );
+        sal_False, sal_True, cDecimalSep );
     // Trailing Zeroes weg:
     for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
     q = p; p--;
@@ -422,13 +422,13 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
 #pragma optimize( "", on )
 #endif
 
-BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
+sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
 {
     // Merken, ob ueberhaupt was geaendert wurde
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     ::rtl::OUString aNewString;
 
-    // Nur Spezial-Fälle behandeln, als Default tun wir nichts
+    // Nur Spezial-F�lle behandeln, als Default tun wir nichts
     switch( eTargetType )
     {
         // Bei Fliesskomma International beruecksichtigen
@@ -451,25 +451,25 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
                 {
                     sal_Unicode* pStr = (sal_Unicode*)aNewString.getStr();
                     pStr[nPos] = (sal_Unicode)'.';
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                 }
             }
             break;
         }
 
-        // Bei BOOL TRUE und FALSE als String pruefen
+        // Bei sal_Bool sal_True und sal_False als String pruefen
         case SbxBOOL:
         {
             if( rSrc.equalsIgnoreAsciiCaseAscii( "true" ) )
             {
                 aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxTRUE );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
             else
             if( rSrc.equalsIgnoreAsciiCaseAscii( "false" ) )
             {
                 aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxFALSE );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
             break;
         }
@@ -490,7 +490,7 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
 // lasse diesen Code vorl"aufig drin, zum 'abgucken'
 // der bisherigen Implementation
 
-static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
+static sal_uInt16 printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
 {
     const String& rFmt = rWFmt;
     char	cFill  = ' ';			// Fuellzeichen
@@ -499,10 +499,10 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
     short	nPrec  = 0;				// Anzahl Nachkommastellen
     short	nWidth = 0;				// Zahlenweite gesamnt
     short	nLen;					// Laenge konvertierte Zahl
-    BOOL	bPoint = FALSE;			// TRUE: mit 1000er Kommas
-    BOOL	bTrail = FALSE;			// TRUE, wenn folgendes Minus
-    BOOL	bSign  = FALSE;			// TRUE: immer mit Vorzeichen
-    BOOL	bNeg   = FALSE;			// TRUE: Zahl ist negativ
+    sal_Bool	bPoint = sal_False;			// sal_True: mit 1000er Kommas
+    sal_Bool	bTrail = sal_False;			// sal_True, wenn folgendes Minus
+    sal_Bool	bSign  = sal_False;			// sal_True: immer mit Vorzeichen
+    sal_Bool	bNeg   = sal_False;			// sal_True: Zahl ist negativ
     char	cBuf [1024];			// Zahlenpuffer
     char  * p;
     const char* pFmt = rFmt;
@@ -518,7 +518,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         case 0:
             break;
         case '+':
-            bSign = TRUE; nWidth++; break;
+            bSign = sal_True; nWidth++; break;
         case '*':
             nWidth++; cFill = '*';
             if( *pFmt == '$' ) nWidth++, pFmt++, cPre = '$';
@@ -537,7 +537,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         // 1000er Kommas?
         if( *pFmt == ',' )
         {
-            nWidth++; pFmt++; bPoint = TRUE;
+            nWidth++; pFmt++; bPoint = sal_True;
         } else break;
     }
     // Nachkomma:
@@ -551,14 +551,14 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
         pFmt++, nExpDig++, nWidth++;
     // Folgendes Minus:
     if( !bSign && *pFmt == '-' )
-        pFmt++, bTrail = TRUE;
+        pFmt++, bTrail = sal_True;
 
     // Zahl konvertieren:
     if( nPrec > 15 ) nPrec = 15;
-    if( nNum < 0.0 ) nNum = -nNum, bNeg = TRUE;
+    if( nNum < 0.0 ) nNum = -nNum, bNeg = sal_True;
     p = cBuf;
     if( bSign ) *p++ = bNeg ? '-' : '+';
-    myftoa( nNum, p, nPrec, nExpDig, bPoint, FALSE );
+    myftoa( nNum, p, nPrec, nExpDig, bPoint, sal_False );
     nLen = strlen( cBuf );
 
     // Ueberlauf?
@@ -573,12 +573,12 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
     if( bTrail )
         rRes += bNeg ? '-' : ' ';
 
-    return (USHORT) ( pFmt - (const char*) rFmt );
+    return (sal_uInt16) ( pFmt - (const char*) rFmt );
 }
 
 #endif //_old_format_code_
 
-static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
+static sal_uInt16 printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
 {
     const xub_Unicode* pStr = rStr.GetBuffer();
     const xub_Unicode* pFmtStart = rFmt.GetBuffer();
@@ -603,12 +603,12 @@ static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubStri
             rRes = rStr;
             break;
     }
-    return (USHORT) ( pFmt - pFmtStart );
+    return (sal_uInt16) ( pFmt - pFmtStart );
 }
 
 /////////////////////////////////////////////////////////////////////////
 
-BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
+sal_Bool SbxValue::Scan( const XubString& rSrc, sal_uInt16* pLen )
 {
     SbxError eRes = SbxERR_OK;
     if( !CanWrite() )
@@ -627,10 +627,10 @@ BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
     }
     if( eRes )
     {
-        SetError( eRes ); return FALSE;
+        SetError( eRes ); return sal_False;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 
@@ -648,7 +648,7 @@ ResMgr* implGetResMgr( void )
 class SbxValueFormatResId : public ResId
 {
 public:
-    SbxValueFormatResId( USHORT nId )
+    SbxValueFormatResId( sal_uInt16 nId )
         : ResId( nId, *implGetResMgr() )
     {}
 };
@@ -693,7 +693,7 @@ static VbaFormatInfo pFormatInfoTable[] =
 VbaFormatInfo* getFormatInfo( const String& rFmt )
 {
     VbaFormatInfo* pInfo = NULL;
-    INT16 i = 0;
+    sal_Int16 i = 0;
     while( (pInfo = pFormatInfoTable + i )->mpVbaFormat != NULL )
     {
         if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) )
@@ -713,11 +713,11 @@ VbaFormatInfo* getFormatInfo( const String& rFmt )
 #define VBAFORMAT_UPPERCASE  		">"
 
 // From methods1.cxx
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 );
 // from methods.cxx
-INT16 implGetMinute( double dDate );
-INT16 implGetDateYear( double aDate );
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
 
 void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
 {
@@ -751,7 +751,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
         double nNumber;
         Color* pCol;
 
-        BOOL bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
+        sal_Bool bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
 
         // number format, use SvNumberFormatter to handle it.
         if( bSuccess )
@@ -804,7 +804,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_N )
                     || aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ))
             {
-                INT32 nMin = implGetMinute( nNumber );
+                sal_Int32 nMin = implGetMinute( nNumber );
                 if( nMin < 10 && aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ) )
                 {
                     // Minute in two digits
@@ -819,15 +819,15 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_W ))
             {
-                INT32 nWeekDay = implGetWeekDay( nNumber );
+                sal_Int32 nWeekDay = implGetWeekDay( nNumber );
                 rRes = String::CreateFromInt32( nWeekDay );
             }
             else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_Y ))
             {
-                INT16 nYear = implGetDateYear( nNumber );
+                sal_Int16 nYear = implGetDateYear( nNumber );
                 double dBaseDate;
                 implDateSerial( nYear, 1, 1, dBaseDate );
-                INT32 nYear32 = 1 + INT32( nNumber - dBaseDate );
+                sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
                 rRes = String::CreateFromInt32( nYear32 );
             }
             else
@@ -948,7 +948,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
                 // #45355 wenn es numerisch ist, muss gewandelt werden
                 if( IsNumericRTL() )
                 {
-                    ScanNumIntnl( GetString(), d, /*bSingle*/FALSE );
+                    ScanNumIntnl( GetString(), d, /*bSingle*/sal_False );
                     goto cvt2;
                 }
                 else
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 04eae155af..5c7f0c74a1 100644..100755
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -260,7 +260,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
@@ -271,7 +271,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
@@ -282,10 +282,10 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
         {
-            INT32 i;
+            sal_Int32 i;
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXLNG;
@@ -296,13 +296,13 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< INT32 >(n);
+                i = sal::static_int_cast< sal_Int32 >(n);
             }
             *p->pLong = i; break;
         }
         case SbxBYREF | SbxULONG:
         {
-            UINT32 i;
+            sal_uInt32 i;
             if( n > SbxMAXULNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXULNG;
@@ -313,7 +313,7 @@ start:
             }
             else
             {
-                i = sal::static_int_cast< UINT32 >(n);
+                i = sal::static_int_cast< sal_uInt32 >(n);
             }
             *p->pULong = i; break;
         }
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index 513e25f5fe..4ac819c717 100644..100755
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -148,9 +148,9 @@
         XubString aRes;
         aTmp.eType = SbxSTRING;
         if( p->eType == SbxDOUBLE )
-            ImpPutDouble( &aTmp, p->nDouble, TRUE );    // true = bCoreString
+            ImpPutDouble( &aTmp, p->nDouble, sal_True );    // true = bCoreString
         else
-            ImpPutDouble( &aTmp, *p->pDouble, TRUE );   // true = bCoreString
+            ImpPutDouble( &aTmp, *p->pDouble, sal_True );   // true = bCoreString
         return aRes;
     }
     else
@@ -228,7 +228,7 @@ void ImpPutString( SbxValues* p, const ::rtl::OUString* n )
         case SbxBYREF | SbxINTEGER:
             *p->pInteger = ImpGetInteger( p ); break;
         case SbxBYREF | SbxBOOL:
-            *p->pUShort = sal::static_int_cast< UINT16 >( ImpGetBool( p ) );
+            *p->pUShort = sal::static_int_cast< sal_uInt16 >( ImpGetBool( p ) );
             break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
@@ -275,10 +275,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
         pArray->unoAddDim( 0, -1 );
     }
 
-    for( USHORT	i=0; i< nArraySize; i++)
+    for( sal_uInt16	i=0; i< nArraySize; i++)
     {
         SbxVariable* pNew = new SbxVariable( SbxBYTE );
-        BYTE aByte = static_cast< BYTE >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
+        sal_uInt8 aByte = static_cast< sal_uInt8 >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
         pNew->PutByte( aByte );
         pNew->SetFlag( SBX_WRITE );
         pArray->Put( pNew, i );	
@@ -291,10 +291,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
 // Convert an array of bytes to string (2bytes per character)
 ::rtl::OUString ByteArrayToString(SbxArray* pArr)
 {
-    USHORT nCount = pArr->Count();
+    sal_uInt16 nCount = pArr->Count();
     ::rtl::OUStringBuffer aStrBuf;
     sal_Unicode aChar = 0;
-    for( USHORT i = 0 ; i < nCount ; i++ )
+    for( sal_uInt16 i = 0 ; i < nCount ; i++ )
     {
         sal_Unicode aTempChar = pArr->Get(i)->GetByte();
         if( i%2 )
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index e7cde92520..4a368c0ec6 100644..100755
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -32,10 +32,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-UINT16 ImpGetUShort( const SbxValues* p )
+sal_uInt16 ImpGetUShort( const SbxValues* p )
 {
     SbxValues aTmp;
-    UINT16 nRes;
+    sal_uInt16 nRes;
 start:
     switch( +p->eType )
     {
@@ -71,7 +71,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nLong;
+                nRes = (sal_uInt16) p->nLong;
             break;
         case SbxULONG:
             if( p->nULong > SbxMAXUINT )
@@ -79,7 +79,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->nULong;
+                nRes = (sal_uInt16) p->nULong;
             break;
         case SbxCURRENCY:
             if( p->nInt64 / CURRENCY_FACTOR > SbxMAXUINT )
@@ -91,7 +91,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) (p->nInt64 / CURRENCY_FACTOR);
+                nRes = (sal_uInt16) (p->nInt64 / CURRENCY_FACTOR);
             break;
         case SbxSALINT64:
             if( p->nInt64 > SbxMAXUINT )
@@ -103,7 +103,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) p->nInt64;
+                nRes = (sal_uInt16) p->nInt64;
             break;
         case SbxSALUINT64:
             if( p->uInt64 > SbxMAXUINT )
@@ -111,7 +111,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
             }
             else
-                nRes = (UINT16) p->uInt64;
+                nRes = (sal_uInt16) p->uInt64;
             break;
         case SbxSINGLE:
             if( p->nSingle > SbxMAXUINT )
@@ -123,7 +123,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( p->nSingle + 0.5 );
+                nRes = (sal_uInt16) ( p->nSingle + 0.5 );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -149,7 +149,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT16) ( dVal + 0.5 );
+                nRes = (sal_uInt16) ( dVal + 0.5 );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -172,7 +172,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (UINT16) ( d + 0.5 );
+                    nRes = (sal_uInt16) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -223,7 +223,7 @@ start:
     return nRes;
 }
 
-void ImpPutUShort( SbxValues* p, UINT16 n )
+void ImpPutUShort( SbxValues* p, sal_uInt16 n )
 {
     SbxValues aTmp;
 
@@ -289,14 +289,14 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             *p->pUShort = n; break;
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index 687ecd8072..d1d876324d 100644..100755
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -32,10 +32,10 @@
 #include <basic/sbx.hxx>
 #include "sbxconv.hxx"
 
-UINT32 ImpGetULong( const SbxValues* p )
+sal_uInt32 ImpGetULong( const SbxValues* p )
 {
     SbxValues aTmp;
-    UINT32 nRes;
+    sal_uInt32 nRes;
 start:
     switch( +p->eType )
     {
@@ -81,7 +81,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT32) ( p->nSingle + 0.5 );
+                nRes = (sal_uInt32) ( p->nSingle + 0.5 );
             break;
         case SbxDATE:
         case SbxDOUBLE:
@@ -116,7 +116,7 @@ start:
                 SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
             }
             else
-                nRes = (UINT32) ( dVal + 0.5 );
+                nRes = (sal_uInt32) ( dVal + 0.5 );
             break;
             }
         case SbxBYREF | SbxSTRING:
@@ -139,7 +139,7 @@ start:
                     SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
                 }
                 else
-                    nRes = (UINT32) ( d + 0.5 );
+                    nRes = (sal_uInt32) ( d + 0.5 );
             }
             break;
         case SbxOBJECT:
@@ -190,7 +190,7 @@ start:
     return nRes;
 }
 
-void ImpPutULong( SbxValues* p, UINT32 n )
+void ImpPutULong( SbxValues* p, sal_uInt32 n )
 {
     SbxValues aTmp;
 start:
@@ -257,27 +257,27 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
             }
-            *p->pByte = (BYTE) n; break;
+            *p->pByte = (sal_uInt8) n; break;
         case SbxBYREF | SbxINTEGER:
         case SbxBYREF | SbxBOOL:
             if( n > SbxMAXINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
             }
-            *p->pInteger = (INT16) n; break;
+            *p->pInteger = (sal_Int16) n; break;
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT:
             if( n > SbxMAXUINT )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
             }
-            *p->pUShort = (UINT16) n; break;
+            *p->pUShort = (sal_uInt16) n; break;
         case SbxBYREF | SbxLONG:
             if( n > SbxMAXLNG )
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
             }
-            *p->pLong = (INT32) n; break;
+            *p->pLong = (sal_Int32) n; break;
         case SbxBYREF | SbxULONG:
             *p->pULong = n; break;
         case SbxBYREF | SbxSINGLE:
diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
new file mode 100755
index 0000000000..443089a123
--- /dev/null
+++ b/basic/source/sbx/sbxvals.cxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+
+#define _TLBIGINT_INT64
+#include <tools/bigint.hxx>
+#include <basic/sbx.hxx>
+
+///////////////////////////// BigInt/Currency //////////////////////////////
+
+SbxValues::SbxValues( const BigInt &rBig ) : eType(SbxCURRENCY)
+{
+    rBig.INT64( &nLong64 );
+}
+
+//TODO:  BigInt is TOOLS_DLLPUBLIC, and its four member functions only declared
+// and defined within basic (#define _TLBIGINT_INT64) are a bad hack that causes
+// "warning C4273: 'function' : inconsistent dll linkage" on MSC; this whole
+// mess should be cleaned up properly (e.g., by completely removing Sbx[U]INT64
+// and using sal_[u]Int64 instead):
+#if defined _MSC_VER
+#pragma warning(disable: 4273)
+#endif
+
+sal_Bool BigInt::INT64( SbxINT64 *p ) const
+{
+    if( bIsBig ) {
+        if( nLen > 4 || (nNum[3] & 0x8000) )
+            return sal_False;
+
+        p->nLow  = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+        p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
+        if( bIsNeg )
+            p->CHS();
+    }
+    else
+        p->Set( (sal_Int32)nVal );
+
+    return sal_True;
+}
+
+BigInt::BigInt( const SbxINT64 &r )
+{
+    BigInt a10000 = 0x10000;
+
+    *this = r.nHigh;
+    if( r.nHigh )
+        *this *= a10000;
+    *this += (sal_uInt16)(r.nLow >> 16);
+    *this *= a10000;
+    *this += (sal_uInt16)r.nLow;
+}
+
+sal_Bool BigInt::UINT64( SbxUINT64 *p ) const
+{
+    if( bIsBig ) {
+        if( bIsNeg || nLen > 4 )
+            return sal_False;
+
+        p->nLow  = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+        p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
+    }
+    else {
+        if( nVal < 0 )
+            return sal_False;
+
+        p->Set( (sal_uInt32)nVal );
+    }
+
+    return sal_True;
+}
+
+BigInt::BigInt( const SbxUINT64 &r )
+{
+    BigInt a10000 = 0x10000;
+
+    *this = BigInt(r.nHigh);
+    if( r.nHigh )
+        *this *= a10000;
+    *this += (sal_uInt16)(r.nLow >> 16);
+    *this *= a10000;
+    *this += (sal_uInt16)r.nLow;
+}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index df4c109502..a4aa27d2c8 100644..100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -62,7 +62,7 @@ int matherr( struct _exception* p )
 #endif
         default:		SbxBase::SetError( SbxERR_NOTIMP ); break;
     }
-    return TRUE;
+    return sal_True;
 }
 #endif
 
@@ -87,21 +87,21 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
     if( p )
     switch( t & 0x0FFF )
     {
-        case SbxINTEGER:	n |= SbxBYREF; aData.pInteger = (INT16*) p; break;
+        case SbxINTEGER:	n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
         case SbxSALUINT64:	n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
         case SbxSALINT64:
         case SbxCURRENCY:	n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
-        case SbxLONG:		n |= SbxBYREF; aData.pLong = (INT32*) p; break;
+        case SbxLONG:		n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
         case SbxSINGLE:		n |= SbxBYREF; aData.pSingle = (float*) p; break;
         case SbxDATE:
         case SbxDOUBLE:		n |= SbxBYREF; aData.pDouble = (double*) p; break;
         case SbxSTRING:		n |= SbxBYREF; aData.pOUString = (::rtl::OUString*) p; break;
         case SbxERROR:
         case SbxUSHORT:
-        case SbxBOOL:		n |= SbxBYREF; aData.pUShort = (UINT16*) p; break;
-        case SbxULONG:		n |= SbxBYREF; aData.pULong = (UINT32*) p; break;
+        case SbxBOOL:		n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
+        case SbxULONG:		n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
         case SbxCHAR:		n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
-        case SbxBYTE:		n |= SbxBYREF; aData.pByte = (BYTE*) p; break;
+        case SbxBYTE:		n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
         case SbxINT:		n |= SbxBYREF; aData.pInt = (int*) p; break;
         case SbxOBJECT:
             aData.pObj = (SbxBase*) p;
@@ -222,8 +222,8 @@ SbxValue::~SbxValue()
         {
             HACK(nicht bei Parent-Prop - sonst CyclicRef)
             SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-            BOOL bParentProp = pThisVar && 5345 ==
-            ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+            sal_Bool bParentProp = pThisVar && 5345 ==
+            ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
             if ( !bParentProp )
                 aData.pObj->ReleaseRef();
         }
@@ -253,8 +253,8 @@ void SbxValue::Clear()
                 {
                     HACK(nicht bei Parent-Prop - sonst CyclicRef)
                     SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                    BOOL bParentProp = pThisVar && 5345 ==
-                    ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+                    sal_Bool bParentProp = pThisVar && 5345 ==
+                    ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
                     if ( !bParentProp )
                         aData.pObj->ReleaseRef();
                 }
@@ -279,7 +279,7 @@ void SbxValue::Clear()
 
 // Dummy
 
-void SbxValue::Broadcast( ULONG )
+void SbxValue::Broadcast( sal_uIntPtr )
 {}
 
 //////////////////////////// Readout data //////////////////////////////
@@ -291,11 +291,13 @@ void SbxValue::Broadcast( ULONG )
 
 SbxValue* SbxValue::TheRealValue() const
 {
-    return TheRealValue( TRUE );
+    return TheRealValue( sal_True );
 }
 
 // #55226 ship additional information
-SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );	// sbunoobj.cxx
+
+SbxValue* SbxValue::TheRealValue( sal_Bool bObjInObjError ) const
 {
     SbxValue* p = (SbxValue*) this;
     for( ;; )
@@ -320,8 +322,12 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
                     ((SbxValue*) pObj)->aData.eType == SbxOBJECT &&
                     ((SbxValue*) pObj)->aData.pObj == pObj )
                 {
-                    SetError( SbxERR_BAD_PROP_VALUE );
-                    p = NULL;
+                    bool bSuccess = handleToStringForCOMObjects( pObj, p );
+                    if( !bSuccess )
+                    {
+                        SetError( SbxERR_BAD_PROP_VALUE );
+                        p = NULL;
+                    }
                 }
                 else if( pDflt )
                     p = pDflt;
@@ -364,9 +370,9 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
     return p;
 }
 
-BOOL SbxValue::Get( SbxValues& rRes ) const
+sal_Bool SbxValue::Get( SbxValues& rRes ) const
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -401,7 +407,7 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
                 case SbxDECIMAL: rRes.pDecimal = ImpGetDecimal( &p->aData ); break;
                 case SbxDATE:	 rRes.nDouble = ImpGetDate( &p->aData ); break;
                 case SbxBOOL:
-                    rRes.nUShort = sal::static_int_cast< UINT16 >(
+                    rRes.nUShort = sal::static_int_cast< sal_uInt16 >(
                         ImpGetBool( &p->aData ) );
                     break;
                 case SbxCHAR:	 rRes.nChar = ImpGetChar( &p->aData ); break;
@@ -456,18 +462,18 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
     }
     if( !IsError() )
     {
-        bRes = TRUE;
+        bRes = sal_True;
         if( eOld != SbxERR_OK )
             SetError( eOld );
     }
     return bRes;
 }
 
-BOOL SbxValue::GetNoBroadcast( SbxValues& rRes )
+sal_Bool SbxValue::GetNoBroadcast( SbxValues& rRes )
 {
-    USHORT nFlags_ = GetFlags();
+    sal_uInt16 nFlags_ = GetFlags();
     SetFlag( SBX_NO_BROADCAST );
-    BOOL bRes = Get( rRes );
+    sal_Bool bRes = Get( rRes );
     SetFlags( nFlags_ );
     return bRes;
 }
@@ -507,7 +513,7 @@ const XubString& SbxValue::GetCoreString() const
     return aResult;
 }
 
-BOOL SbxValue::HasObject() const
+sal_Bool SbxValue::HasObject() const
 {
     ErrCode eErr = GetError();
     SbxValues aRes;
@@ -517,31 +523,31 @@ BOOL SbxValue::HasObject() const
     return 0 != aRes.pObj;
 }
 
-BOOL SbxValue::GetBool() const
+sal_Bool SbxValue::GetBool() const
 {
     SbxValues aRes;
     aRes.eType = SbxBOOL;
     Get( aRes );
-    return BOOL( aRes.nUShort != 0 );
+    return sal_Bool( aRes.nUShort != 0 );
 }
 
 #define GET( g, e, t, m ) \
 t SbxValue::g() const { SbxValues aRes(e); Get( aRes ); return aRes.m; }
 
-GET( GetByte,     SbxBYTE,       BYTE,          nByte )
+GET( GetByte,     SbxBYTE,       sal_uInt8,     nByte )
 GET( GetChar,     SbxCHAR,       xub_Unicode,   nChar )
 GET( GetCurrency, SbxCURRENCY,   sal_Int64,     nInt64 )
 GET( GetDate,     SbxDATE,       double,        nDouble )
 GET( GetData,     SbxDATAOBJECT, void*,         pData )
 GET( GetDouble,   SbxDOUBLE,     double,        nDouble )
-GET( GetErr,      SbxERROR,      UINT16,        nUShort )
+GET( GetErr,      SbxERROR,      sal_uInt16,    nUShort )
 GET( GetInt,      SbxINT,        int,           nInt )
-GET( GetInteger,  SbxINTEGER,    INT16,         nInteger )
-GET( GetLong,     SbxLONG,       INT32,         nLong )
+GET( GetInteger,  SbxINTEGER,    sal_Int16,     nInteger )
+GET( GetLong,     SbxLONG,       sal_Int32,     nLong )
 GET( GetObject,   SbxOBJECT,     SbxBase*,      pObj )
 GET( GetSingle,   SbxSINGLE,     float,         nSingle )
-GET( GetULong,    SbxULONG,      UINT32,        nULong )
-GET( GetUShort,   SbxUSHORT,     UINT16,        nUShort )
+GET( GetULong,    SbxULONG,      sal_uInt32,    nULong )
+GET( GetUShort,   SbxUSHORT,     sal_uInt16,    nUShort )
 GET( GetInt64,    SbxSALINT64,   sal_Int64,     nInt64 )
 GET( GetUInt64,   SbxSALUINT64,  sal_uInt64,    uInt64 )
 GET( GetDecimal,  SbxDECIMAL,    SbxDecimal*,   pDecimal )
@@ -549,9 +555,9 @@ GET( GetDecimal,  SbxDECIMAL,    SbxDecimal*,   pDecimal )
 
 //////////////////////////// Write data /////////////////////////////
 
-BOOL SbxValue::Put( const SbxValues& rVal )
+sal_Bool SbxValue::Put( const SbxValues& rVal )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -565,7 +571,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
         // the real values
         SbxValue* p = this;
         if( rVal.eType != SbxOBJECT )
-            p = TheRealValue( FALSE );	// #55226 Don't allow an error here
+            p = TheRealValue( sal_False );	// Don't allow an error here
         if( p )
         {
             if( !p->CanWrite() )
@@ -594,16 +600,16 @@ BOOL SbxValue::Put( const SbxValues& rVal )
                 case SbxSTRING:		ImpPutString( &p->aData, rVal.pOUString ); break;
                 case SbxINT:
 #if SAL_TYPES_SIZEOFINT == 2
-                    ImpPutInteger( &p->aData, (INT16) rVal.nInt );
+                    ImpPutInteger( &p->aData, (sal_Int16) rVal.nInt );
 #else
-                    ImpPutLong( &p->aData, (INT32) rVal.nInt );
+                    ImpPutLong( &p->aData, (sal_Int32) rVal.nInt );
 #endif
                     break;
                 case SbxUINT:
 #if SAL_TYPES_SIZEOFINT == 2
-                    ImpPutUShort( &p->aData, (UINT16) rVal.nUInt );
+                    ImpPutUShort( &p->aData, (sal_uInt16) rVal.nUInt );
 #else
-                    ImpPutULong( &p->aData, (UINT32) rVal.nUInt );
+                    ImpPutULong( &p->aData, (sal_uInt32) rVal.nUInt );
 #endif
                     break;
                 case SbxOBJECT:
@@ -628,8 +634,8 @@ BOOL SbxValue::Put( const SbxValues& rVal )
                             }
                             HACK(nicht bei Parent-Prop - sonst CyclicRef)
                             SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                            BOOL bParentProp = pThisVar && 5345 ==
-                                    ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+                            sal_Bool bParentProp = pThisVar && 5345 ==
+                                    ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
                             if ( !bParentProp )
                                 p->aData.pObj->AddRef();
                         }
@@ -649,11 +655,11 @@ BOOL SbxValue::Put( const SbxValues& rVal )
             }
             if( !IsError() )
             {
-                p->SetModified( TRUE );
+                p->SetModified( sal_True );
                 p->Broadcast( SBX_HINT_DATACHANGED );
                 if( eOld != SbxERR_OK )
                     SetError( eOld );
-                bRes = TRUE;
+                bRes = sal_True;
             }
         }
     }
@@ -667,7 +673,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
 // if Float were declared with ',' as the decimal seperator or BOOl
 // explicit with "TRUE" or "FALSE".
 // Implementation in ImpConvStringExt (SBXSCAN.CXX)
-BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutStringExt( const ::rtl::OUString& r )
 {
     // Copy; if it is Unicode convert it immediately
     ::rtl::OUString aStr( r );
@@ -682,7 +688,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
 
     // Only if really something was converted, take the copy,
     // elsewise take the original (Unicode remain)
-    BOOL bRet;
+    sal_Bool bRet;
     if( ImpConvStringExt( aStr, eTargetType ) )
         aRes.pOUString = (::rtl::OUString*)&aStr;
     else
@@ -690,7 +696,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
 
     // #34939: Set a Fixed-Flag at Strings. which contain a number, and
     // if this has a Num-Type, so that the type will not be changed
-    USHORT nFlags_ = GetFlags();
+    sal_uInt16 nFlags_ = GetFlags();
     if( ( eTargetType >= SbxINTEGER && eTargetType <= SbxCURRENCY ) ||
         ( eTargetType >= SbxCHAR && eTargetType <= SbxUINT ) ||
         eTargetType == SbxBOOL )
@@ -702,7 +708,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
     }
 
     Put( aRes );
-    bRet = BOOL( !IsError() );
+    bRet = sal_Bool( !IsError() );
 
     // If it throwed an error with FIXED, set it back
     // (UI-Action should not cast an error, but only fail)
@@ -713,102 +719,102 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
     return bRet;
 }
 
-BOOL SbxValue::PutString( const xub_Unicode* p )
+sal_Bool SbxValue::PutString( const xub_Unicode* p )
 {
     ::rtl::OUString aVal( p );
     SbxValues aRes;
     aRes.eType = SbxSTRING;
     aRes.pOUString = &aVal;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutBool( BOOL b )
+sal_Bool SbxValue::PutBool( sal_Bool b )
 {
     SbxValues aRes;
     aRes.eType = SbxBOOL;
-    aRes.nUShort = sal::static_int_cast< UINT16 >(b ? SbxTRUE : SbxFALSE);
+    aRes.nUShort = sal::static_int_cast< sal_uInt16 >(b ? SbxTRUE : SbxFALSE);
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutEmpty()
+sal_Bool SbxValue::PutEmpty()
 {
-    BOOL bRet = SetType( SbxEMPTY );
-        SetModified( TRUE );
+    sal_Bool bRet = SetType( SbxEMPTY );
+        SetModified( sal_True );
     return bRet;
 }
 
-BOOL SbxValue::PutNull()
+sal_Bool SbxValue::PutNull()
 {
-    BOOL bRet = SetType( SbxNULL );
+    sal_Bool bRet = SetType( SbxNULL );
     if( bRet )
-        SetModified( TRUE );
+        SetModified( sal_True );
     return bRet;
 }
 
 
 // Special decimal methods
-BOOL SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
+sal_Bool SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
 {
     SbxValue::Clear();
     aData.pDecimal = new SbxDecimal( rAutomationDec );
     aData.pDecimal->addRef();
     aData.eType = SbxDECIMAL;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::fillAutomationDecimal
+sal_Bool SbxValue::fillAutomationDecimal
     ( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
 {
     SbxDecimal* pDecimal = GetDecimal();
     if( pDecimal != NULL )
     {
         pDecimal->fillAutomationDecimal( rAutomationDec );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL SbxValue::PutpChar( const xub_Unicode* p )
+sal_Bool SbxValue::PutpChar( const xub_Unicode* p )
 {
     ::rtl::OUString aVal( p );
     SbxValues aRes;
     aRes.eType = SbxLPSTR;
     aRes.pOUString = &aVal;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
-BOOL SbxValue::PutString( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutString( const ::rtl::OUString& r )
 {
     SbxValues aRes;
     aRes.eType = SbxSTRING;
     aRes.pOUString = (::rtl::OUString*) &r;
     Put( aRes );
-    return BOOL( !IsError() );
+    return sal_Bool( !IsError() );
 }
 
 
 #define PUT( p, e, t, m ) \
-BOOL SbxValue::p( t n ) \
-{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return BOOL( !IsError() ); }
+sal_Bool SbxValue::p( t n ) \
+{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return sal_Bool( !IsError() ); }
 
-PUT( PutByte,     SbxBYTE,       BYTE,             nByte )
+PUT( PutByte,     SbxBYTE,       sal_uInt8,             nByte )
 PUT( PutChar,     SbxCHAR,       sal_Unicode,      nChar )
 PUT( PutCurrency, SbxCURRENCY,   const sal_Int64&, nInt64 )
 PUT( PutDate,     SbxDATE,       double,           nDouble )
 PUT( PutData,     SbxDATAOBJECT, void*,            pData )
 PUT( PutDouble,   SbxDOUBLE,     double,           nDouble )
-PUT( PutErr,      SbxERROR,      UINT16,           nUShort )
+PUT( PutErr,      SbxERROR,      sal_uInt16,           nUShort )
 PUT( PutInt,      SbxINT,        int,              nInt )
-PUT( PutInteger,  SbxINTEGER,    INT16,            nInteger )
-PUT( PutLong,     SbxLONG,       INT32,            nLong )
+PUT( PutInteger,  SbxINTEGER,    sal_Int16,            nInteger )
+PUT( PutLong,     SbxLONG,       sal_Int32,            nLong )
 PUT( PutObject,   SbxOBJECT,     SbxBase*,         pObj )
 PUT( PutSingle,   SbxSINGLE,     float,            nSingle )
-PUT( PutULong,    SbxULONG,      UINT32,           nULong )
-PUT( PutUShort,   SbxUSHORT,     UINT16,           nUShort )
+PUT( PutULong,    SbxULONG,      sal_uInt32,           nULong )
+PUT( PutUShort,   SbxUSHORT,     sal_uInt16,           nUShort )
 PUT( PutInt64,    SbxSALINT64,   sal_Int64,        nInt64 )
 PUT( PutUInt64,   SbxSALUINT64,  sal_uInt64,       uInt64 )
 PUT( PutDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
@@ -816,7 +822,7 @@ PUT( PutDecimal,  SbxDECIMAL,    SbxDecimal*,      pDecimal )
 
 ////////////////////////// Setting of the data type ///////////////////////////
 
-BOOL SbxValue::IsFixed() const
+sal_Bool SbxValue::IsFixed() const
 {
     return ( (GetFlags() & SBX_FIXED) | (aData.eType & SbxBYREF) ) != 0;
 }
@@ -825,22 +831,22 @@ BOOL SbxValue::IsFixed() const
 // or if it contains a complete convertible String
 
 // #41692, implement it for RTL and Basic-Core seperably
-BOOL SbxValue::IsNumeric() const
+sal_Bool SbxValue::IsNumeric() const
 {
-    return ImpIsNumeric( /*bOnlyIntntl*/FALSE );
+    return ImpIsNumeric( /*bOnlyIntntl*/sal_False );
 }
 
-BOOL SbxValue::IsNumericRTL() const
+sal_Bool SbxValue::IsNumericRTL() const
 {
-    return ImpIsNumeric( /*bOnlyIntntl*/TRUE );
+    return ImpIsNumeric( /*bOnlyIntntl*/sal_True );
 }
 
-BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
+sal_Bool SbxValue::ImpIsNumeric( sal_Bool bOnlyIntntl ) const
 {
 
     if( !CanRead() )
     {
-        SetError( SbxERR_PROP_WRITEONLY ); return FALSE;
+        SetError( SbxERR_PROP_WRITEONLY ); return sal_False;
     }
     // Test downcast!!!
     if( this->ISA(SbxVariable) )
@@ -853,14 +859,14 @@ BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
             ::rtl::OUString s( *aData.pOUString );
             double n;
             SbxDataType t2;
-            USHORT nLen = 0;
-            if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/FALSE, bOnlyIntntl ) == SbxERR_OK )
-                return BOOL( nLen == s.getLength() );
+            sal_uInt16 nLen = 0;
+            if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/sal_False, bOnlyIntntl ) == SbxERR_OK )
+                return sal_Bool( nLen == s.getLength() );
         }
-        return FALSE;
+        return sal_False;
     }
     else
-        return BOOL( t == SbxEMPTY
+        return sal_Bool( t == SbxEMPTY
             || ( t >= SbxINTEGER && t <= SbxCURRENCY )
             || ( t >= SbxCHAR && t <= SbxUINT ) );
 }
@@ -880,19 +886,19 @@ SbxDataType SbxValue::GetFullType() const
     return aData.eType;
 }
 
-BOOL SbxValue::SetType( SbxDataType t )
+sal_Bool SbxValue::SetType( SbxDataType t )
 {
     DBG_ASSERT( !( t & 0xF000 ), "Setzen von BYREF|ARRAY verboten!" );
     if( ( t == SbxEMPTY && aData.eType == SbxVOID )
      || ( aData.eType == SbxEMPTY && t == SbxVOID ) )
-        return TRUE;
+        return sal_True;
     if( ( t & 0x0FFF ) == SbxVARIANT )
     {
         // Trial to set the data type to Variant
         ResetFlag( SBX_FIXED );
         if( IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         t = SbxEMPTY;
     }
@@ -900,7 +906,7 @@ BOOL SbxValue::SetType( SbxDataType t )
     {
         if( !CanWrite() || IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         else
         {
@@ -915,12 +921,12 @@ BOOL SbxValue::SetType( SbxDataType t )
                     {
                         HACK(nicht bei Parent-Prop - sonst CyclicRef)
                         SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
-                        UINT16 nSlotId = pThisVar
-                                    ? ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) )
+                        sal_uInt16 nSlotId = pThisVar
+                                    ? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
                                     : 0;
                         DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == UniString::CreateFromAscii( "Parent" ),
                                     "SID_PARENTOBJECT heisst nicht 'Parent'" );
-                        BOOL bParentProp = 5345 == nSlotId;
+                        sal_Bool bParentProp = 5345 == nSlotId;
                         if ( !bParentProp )
                             aData.pObj->ReleaseRef();
                     }
@@ -932,31 +938,31 @@ BOOL SbxValue::SetType( SbxDataType t )
             aData.eType = t;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::Convert( SbxDataType eTo )
+sal_Bool SbxValue::Convert( SbxDataType eTo )
 {
     eTo = SbxDataType( eTo & 0x0FFF );
     if( ( aData.eType & 0x0FFF ) == eTo )
-        return TRUE;
+        return sal_True;
     if( !CanWrite() )
-        return FALSE;
+        return sal_False;
     if( eTo == SbxVARIANT )
     {
         // Trial to set the data type to Variant
         ResetFlag( SBX_FIXED );
         if( IsFixed() )
         {
-            SetError( SbxERR_CONVERSION ); return FALSE;
+            SetError( SbxERR_CONVERSION ); return sal_False;
         }
         else
-            return TRUE;
+            return sal_True;
     }
     // Converting from zero doesn't work. Once zero, always zero!
     if( aData.eType == SbxNULL )
     {
-        SetError( SbxERR_CONVERSION ); return FALSE;
+        SetError( SbxERR_CONVERSION ); return sal_False;
     }
 
     // Conversion of the data:
@@ -970,17 +976,17 @@ BOOL SbxValue::Convert( SbxDataType eTo )
         {
             SetType( eTo );
             Put( aNew );
-            SetModified( TRUE );
+            SetModified( sal_True );
         }
         Broadcast( SBX_HINT_CONVERTED );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 ////////////////////////////////// Calculating /////////////////////////////////
 
-BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
+sal_Bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
 {
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 
@@ -1334,7 +1340,7 @@ Lbl_OpIsDouble:
     }
 Lbl_OpIsEmpty:
 
-    BOOL bRes = BOOL( !IsError() );
+    sal_Bool bRes = sal_Bool( !IsError() );
     if( bRes && eOld != SbxERR_OK )
         SetError( eOld );
     return bRes;
@@ -1342,11 +1348,11 @@ Lbl_OpIsEmpty:
 
 // The comparison routine deliver TRUE or FALSE.
 
-BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
+sal_Bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
 {
     bool bVBAInterop =  SbiRuntime::isVBAEnabled();
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     SbxError eOld = GetError();
     if( eOld != SbxERR_OK )
         ResetError();
@@ -1354,24 +1360,24 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
         SetError( SbxERR_PROP_WRITEONLY );
     else if( GetType() == SbxNULL && rOp.GetType() == SbxNULL && !bVBAInterop )
     {
-        bRes = TRUE;
+        bRes = sal_True;
     }
     else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
-        bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
+        bRes = !bVBAInterop ? sal_True : ( eOp == SbxEQ ? sal_True : sal_False );
     // Special rule 1: If an operand is zero, the result is FALSE
     else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
-        bRes = FALSE;
+        bRes = sal_False;
     // Special rule 2: If both are variant and one is numeric
     // and the other is a String, num is < str
     else if( !IsFixed() && !rOp.IsFixed()
      && ( rOp.GetType() == SbxSTRING && GetType() != SbxSTRING && IsNumeric() ) && !bVBAInterop
     )
-        bRes = BOOL( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
+        bRes = sal_Bool( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
     else if( !IsFixed() && !rOp.IsFixed()
      && ( GetType() == SbxSTRING && rOp.GetType() != SbxSTRING && rOp.IsNumeric() )
 && !bVBAInterop
     )
-        bRes = BOOL( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
+        bRes = sal_Bool( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
     else
     {
         SbxValues aL, aR;
@@ -1383,17 +1389,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
             if( Get( aL ) && rOp.Get( aR ) ) switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( *aL.pOUString == *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString == *aR.pOUString ); break;
                 case SbxNE:
-                    bRes = BOOL( *aL.pOUString != *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString != *aR.pOUString ); break;
                 case SbxLT:
-                    bRes = BOOL( *aL.pOUString <  *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString <  *aR.pOUString ); break;
                 case SbxGT:
-                    bRes = BOOL( *aL.pOUString >  *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString >  *aR.pOUString ); break;
                 case SbxLE:
-                    bRes = BOOL( *aL.pOUString <= *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString <= *aR.pOUString ); break;
                 case SbxGE:
-                    bRes = BOOL( *aL.pOUString >= *aR.pOUString ); break;
+                    bRes = sal_Bool( *aL.pOUString >= *aR.pOUString ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1407,17 +1413,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
               switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( aL.nSingle == aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle == aR.nSingle ); break;
                 case SbxNE:
-                    bRes = BOOL( aL.nSingle != aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle != aR.nSingle ); break;
                 case SbxLT:
-                    bRes = BOOL( aL.nSingle <  aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle <  aR.nSingle ); break;
                 case SbxGT:
-                    bRes = BOOL( aL.nSingle >  aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle >  aR.nSingle ); break;
                 case SbxLE:
-                    bRes = BOOL( aL.nSingle <= aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle <= aR.nSingle ); break;
                 case SbxGE:
-                    bRes = BOOL( aL.nSingle >= aR.nSingle ); break;
+                    bRes = sal_Bool( aL.nSingle >= aR.nSingle ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1433,17 +1439,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
                 switch( eOp )
                 {
                     case SbxEQ:
-                        bRes = BOOL( eRes == SbxDecimal::EQ ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::EQ ); break;
                     case SbxNE:
-                        bRes = BOOL( eRes != SbxDecimal::EQ ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::EQ ); break;
                     case SbxLT:
-                        bRes = BOOL( eRes == SbxDecimal::LT ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::LT ); break;
                     case SbxGT:
-                        bRes = BOOL( eRes == SbxDecimal::GT ); break;
+                        bRes = sal_Bool( eRes == SbxDecimal::GT ); break;
                     case SbxLE:
-                        bRes = BOOL( eRes != SbxDecimal::GT ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::GT ); break;
                     case SbxGE:
-                        bRes = BOOL( eRes != SbxDecimal::LT ); break;
+                        bRes = sal_Bool( eRes != SbxDecimal::LT ); break;
                     default:
                         SetError( SbxERR_NOTIMP );
                 }
@@ -1466,17 +1472,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
               switch( eOp )
             {
                 case SbxEQ:
-                    bRes = BOOL( aL.nDouble == aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble == aR.nDouble ); break;
                 case SbxNE:
-                    bRes = BOOL( aL.nDouble != aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble != aR.nDouble ); break;
                 case SbxLT:
-                    bRes = BOOL( aL.nDouble <  aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble <  aR.nDouble ); break;
                 case SbxGT:
-                    bRes = BOOL( aL.nDouble >  aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble >  aR.nDouble ); break;
                 case SbxLE:
-                    bRes = BOOL( aL.nDouble <= aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble <= aR.nDouble ); break;
                 case SbxGE:
-                    bRes = BOOL( aL.nDouble >= aR.nDouble ); break;
+                    bRes = sal_Bool( aL.nDouble >= aR.nDouble ); break;
                 default:
                     SetError( SbxERR_NOTIMP );
             }
@@ -1488,7 +1494,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
                 if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
                 {
                     ResetError();
-                    bRes = FALSE;
+                    bRes = sal_False;
                 }
             }
         }
@@ -1500,12 +1506,12 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
 
 ///////////////////////////// Reading/Writing ////////////////////////////
 
-BOOL SbxValue::LoadData( SvStream& r, USHORT )
+sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
 {
     // #TODO see if these types are really dumped to any stream
     // more than likely this is functionality used in the binfilter alone
     SbxValue::Clear();
-    UINT16 nType;
+    sal_uInt16 nType;
     r >> nType;
     aData.eType = SbxDataType( nType );
     switch( nType )
@@ -1525,7 +1531,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
             {
                 aData.nSingle = 0.0F;
-                return FALSE;
+                return sal_False;
             }
             aData.nSingle = (float) d;
             break;
@@ -1540,7 +1546,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
             {
                 aData.nDouble = 0.0;
-                return FALSE;
+                return sal_False;
             }
             break;
         }
@@ -1576,7 +1582,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             r >> aData.nUShort; break;
         case SbxOBJECT:
         {
-            BYTE nMode;
+            sal_uInt8 nMode;
             r >> nMode;
             switch( nMode )
             {
@@ -1585,7 +1591,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
                     break;
                 case 1:
                     aData.pObj = SbxBase::Load( r );
-                    return BOOL( aData.pObj != NULL );
+                    return sal_Bool( aData.pObj != NULL );
                 case 2:
                     aData.pObj = this;
                     break;
@@ -1605,7 +1611,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             r >> aData.nULong; break;
         case SbxINT:
         {
-            BYTE n;
+            sal_uInt8 n;
             r >> n;
             // Match the Int on this system?
             if( n > SAL_TYPES_SIZEOFINT )
@@ -1616,7 +1622,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
         }
         case SbxUINT:
         {
-            BYTE n;
+            sal_uInt8 n;
             r >> n;
             // Match the UInt on this system?
             if( n > SAL_TYPES_SIZEOFINT )
@@ -1641,14 +1647,14 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
             ResetFlag(SBX_FIXED);
             aData.eType = SbxNULL;
             DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SbxValue::StoreData( SvStream& r ) const
+sal_Bool SbxValue::StoreData( SvStream& r ) const
 {
-    UINT16 nType = sal::static_int_cast< UINT16 >(aData.eType);
+    sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(aData.eType);
     r << nType;
     switch( nType & 0x0FFF )
     {
@@ -1699,14 +1705,14 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             {
                 if( PTR_CAST(SbxValue,aData.pObj) != this )
                 {
-                    r << (BYTE) 1;
+                    r << (sal_uInt8) 1;
                     return aData.pObj->Store( r );
                 }
                 else
-                    r << (BYTE) 2;
+                    r << (sal_uInt8) 2;
             }
             else
-                r << (BYTE) 0;
+                r << (sal_uInt8) 0;
             break;
         case SbxCHAR:
         {
@@ -1720,13 +1726,13 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             r << aData.nULong; break;
         case SbxINT:
         {
-            BYTE n = SAL_TYPES_SIZEOFINT;
+            sal_uInt8 n = SAL_TYPES_SIZEOFINT;
             r << n << (sal_Int32)aData.nInt;
             break;
         }
         case SbxUINT:
         {
-            BYTE n = SAL_TYPES_SIZEOFINT;
+            sal_uInt8 n = SAL_TYPES_SIZEOFINT;
             r << n << (sal_uInt32)aData.nUInt;
             break;
         }
@@ -1743,9 +1749,9 @@ BOOL SbxValue::StoreData( SvStream& r ) const
             break;
         default:
             DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 32c2d59474..4f43e23bc0 100644..100755
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -47,9 +47,9 @@ using namespace com::sun::star::uno;
 TYPEINIT1(SbxVariable,SbxValue)
 TYPEINIT1(SbxHint,SfxSimpleHint)
 
-extern UINT32 nVarCreator;			// in SBXBASE.CXX, fuer LoadData()
+extern sal_uInt32 nVarCreator;			// in SBXBASE.CXX, fuer LoadData()
 #ifdef DBG_UTIL
-static ULONG nVar = 0;
+static sal_uIntPtr nVar = 0;
 #endif
 
 ///////////////////////////// SbxVariableImpl ////////////////////////////
@@ -59,13 +59,17 @@ class SbxVariableImpl
     friend class SbxVariable;
     String						m_aDeclareClassName;
     Reference< XInterface >		m_xComListener;
+    StarBASIC*					m_pComListenerParentBasic;
 
     SbxVariableImpl( void )
+        : m_pComListenerParentBasic( NULL )
     {}
     SbxVariableImpl( const SbxVariableImpl& r )
         : m_aDeclareClassName( r.m_aDeclareClassName )
         , m_xComListener( r.m_xComListener )
-    {}
+        , m_pComListenerParentBasic( r.m_pComListenerParentBasic )
+    {
+    }
 };
 
 
@@ -83,12 +87,18 @@ SbxVariable::SbxVariable() : SbxValue()
 #endif
 }
 
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
+
 SbxVariable::SbxVariable( const SbxVariable& r )
            : SvRefBase( r ), SbxValue( r ), mpPar( r.mpPar ), pInfo( r.pInfo )
 {
     mpSbxVariableImpl = NULL;
     if( r.mpSbxVariableImpl != NULL )
+    {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+        if( mpSbxVariableImpl->m_xComListener.is() )
+            registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+    }
     pCst = NULL;
     if( r.CanRead() )
     {
@@ -123,6 +133,8 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
 #endif
 }
 
+void removeDimAsNewRecoverItem( SbxVariable* pVar );
+
 SbxVariable::~SbxVariable()
 {
 #ifdef DBG_UTIL
@@ -132,6 +144,8 @@ SbxVariable::~SbxVariable()
     if ( maName.EqualsAscii( aCellsStr ) )
         maName.AssignAscii( aCellsStr, sizeof( aCellsStr )-1 );
 #endif
+    if( IsSet( SBX_DIM_AS_NEW ))
+        removeDimAsNewRecoverItem( this );
     delete mpSbxVariableImpl;
     delete pCst;
 }
@@ -148,7 +162,7 @@ SfxBroadcaster& SbxVariable::GetBroadcaster()
 // Perhaps some day one could cut the parameter 0.
 // then the copying will be dropped ...
 
-void SbxVariable::Broadcast( ULONG nHintId )
+void SbxVariable::Broadcast( sal_uIntPtr nHintId )
 {
     if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
     {
@@ -163,7 +177,7 @@ void SbxVariable::Broadcast( ULONG nHintId )
         // Avoid further broadcasting
         SfxBroadcaster* pSave = pCst;
         pCst = NULL;
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         SetFlag( SBX_READWRITE );
         if( mpPar.Is() )
             // Register this as element 0, but don't change over the parent!
@@ -181,7 +195,7 @@ SbxInfo* SbxVariable::GetInfo()
     {
         Broadcast( SBX_HINT_INFOWANTED );
         if( pInfo.Is() )
-            SetModified( TRUE );
+            SetModified( sal_True );
     }
     return pInfo;
 }
@@ -228,7 +242,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
             aTmp += cType;
     }
     aTmp += '(';
-    for( USHORT i = 0; i < pInfo->aParams.Count(); i++ )
+    for( sal_uInt16 i = 0; i < pInfo->aParams.Count(); i++ )
     {
         const SbxParamInfo* q = pInfo->aParams.GetObject( i );
         int nt = q->eType & 0x0FFF;
@@ -262,7 +276,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
                 aTmp += String( SbxRes( STRING_AS ) );
                 if( nt < 32 )
                     aTmp += String( SbxRes(
-                        sal::static_int_cast< USHORT >( STRING_TYPES + nt ) ) );
+                        sal::static_int_cast< sal_uInt16 >( STRING_TYPES + nt ) ) );
                 else
                     aTmp += String( SbxRes( STRING_ANY ) );
             }
@@ -275,7 +289,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
         aTmp += String( SbxRes( STRING_AS ) );
         if( et < 32 )
             aTmp += String( SbxRes(
-                sal::static_int_cast< USHORT >( STRING_TYPES + et ) ) );
+                sal::static_int_cast< sal_uInt16 >( STRING_TYPES + et ) ) );
         else
             aTmp += String( SbxRes( STRING_ANY ) );
     }
@@ -285,21 +299,21 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
 
 // Create a simple hashcode: the first six characters were evaluated.
 
-USHORT SbxVariable::MakeHashCode( const XubString& rName )
+sal_uInt16 SbxVariable::MakeHashCode( const XubString& rName )
 {
-    USHORT n = 0;
-    USHORT nLen = rName.Len();
+    sal_uInt16 n = 0;
+    sal_uInt16 nLen = rName.Len();
     if( nLen > 6 )
         nLen = 6;
     const xub_Unicode* p = rName.GetBuffer();
     while( nLen-- )
     {
-        BYTE c = (BYTE)*p;
+        sal_uInt8 c = (sal_uInt8)*p;
         p++;
         // If we have a commen sigen break!!
         if( c >= 0x80 )
             return 0;
-        n = sal::static_int_cast< USHORT >( ( n << 3 ) + toupper( c ) );
+        n = sal::static_int_cast< sal_uInt16 >( ( n << 3 ) + toupper( c ) );
     }
     return n;
 }
@@ -311,7 +325,11 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r )
     SbxValue::operator=( r );
     delete mpSbxVariableImpl;
     if( r.mpSbxVariableImpl != NULL )
+    {
         mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+        if( mpSbxVariableImpl->m_xComListener.is() )
+            registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+    }
     else
         mpSbxVariableImpl = NULL;
     return *this;
@@ -334,7 +352,7 @@ SbxClassType SbxVariable::GetClass() const
     return SbxCLASS_VARIABLE;
 }
 
-void SbxVariable::SetModified( BOOL b )
+void SbxVariable::SetModified( sal_Bool b )
 {
     if( IsSet( SBX_NO_MODIFY ) )
         return;
@@ -350,11 +368,11 @@ void SbxVariable::SetParent( SbxObject* p )
     if ( p && ISA(SbxObject) )
     {
         // then this had to be a child of the new parent
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SbxArray *pChilds = p->GetObjects();
         if ( pChilds )
         {
-            for ( USHORT nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
+            for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
                 bFound = ( this == pChilds->Get(nIdx) );
         }
         if ( !bFound )
@@ -392,26 +410,35 @@ void SbxVariable::SetDeclareClassName( const String& rDeclareClassName )
     pImpl->m_aDeclareClassName = rDeclareClassName;
 }
 
-void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener )
+void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+                                  StarBASIC* pParentBasic )
 {
     SbxVariableImpl* pImpl = getImpl();
     pImpl->m_xComListener = xComListener;
+    pImpl->m_pComListenerParentBasic = pParentBasic;
+    registerComListenerVariableForBasic( this, pParentBasic );
+}
+
+void SbxVariable::ClearComListener( void )
+{
+    SbxVariableImpl* pImpl = getImpl();
+    pImpl->m_xComListener.clear();
 }
 
 
 ////////////////////////////// Loading/Saving /////////////////////////////
 
-BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
 {
-    UINT16 nType;
-    BYTE cMark;
+    sal_uInt16 nType;
+    sal_uInt8 cMark;
     rStrm >> cMark;
     if( cMark == 0xFF )
     {
         if( !SbxValue::LoadData( rStrm, nVer ) )
-            return FALSE;
+            return sal_False;
         rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
-        UINT32 nTemp;
+        sal_uInt32 nTemp;
         rStrm >> nTemp;
         nUserData = nTemp;
     }
@@ -420,7 +447,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
         rStrm.SeekRel( -1L );
         rStrm >> nType;
         rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
-        UINT32 nTemp;
+        sal_uInt32 nTemp;
         rStrm >> nTemp;
         nUserData = nTemp;
         // correction: old methods have instead of SbxNULL now SbxEMPTY
@@ -448,7 +475,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
                 if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
                 {
                     aTmp.nSingle = 0;
-                    return FALSE;
+                    return sal_False;
                 }
                 aTmp.nSingle = (float) d;
                 break;
@@ -462,7 +489,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
                 if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK )
                 {
                     aTmp.nDouble = 0;
-                    return FALSE;
+                    return sal_False;
                 }
                 break;
             }
@@ -476,11 +503,11 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
             default:
                 aData.eType = SbxNULL;
                 DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
-                return FALSE;
+                return sal_False;
         }
         // putt value
         if( nType != SbxNULL && nType != SbxEMPTY && !Put( aTmp ) )
-            return FALSE;
+            return sal_False;
     }
     rStrm >> cMark;
     // cMark is also a version number!
@@ -489,29 +516,29 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
     if( cMark )
     {
         if( cMark > 2 )
-            return FALSE;
+            return sal_False;
         pInfo = new SbxInfo;
-        pInfo->LoadData( rStrm, (USHORT) cMark );
+        pInfo->LoadData( rStrm, (sal_uInt16) cMark );
     }
     // Load private data only, if it is a SbxVariable
     if( GetClass() == SbxCLASS_VARIABLE && !LoadPrivateData( rStrm, nVer ) )
-        return FALSE;
+        return sal_False;
     ((SbxVariable*) this)->Broadcast( SBX_HINT_DATACHANGED );
     nHash =  MakeHashCode( maName );
-    SetModified( TRUE );
-    return TRUE;
+    SetModified( sal_True );
+    return sal_True;
 }
 
-BOOL SbxVariable::StoreData( SvStream& rStrm ) const
+sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
 {
-    rStrm << (BYTE) 0xFF;		// Marker
-    BOOL bValStore;
+    rStrm << (sal_uInt8) 0xFF;		// Marker
+    sal_Bool bValStore;
     if( this->IsA( TYPE(SbxMethod) ) )
     {
         // #50200 Avoid that objects , which during the runtime
         // as return-value are saved in the method as a value were saved
         SbxVariable* pThis = (SbxVariable*)this;
-        USHORT nSaveFlags = GetFlags();
+        sal_uInt16 nSaveFlags = GetFlags();
         pThis->SetFlag( SBX_WRITE );
         pThis->SbxValue::Clear();
         pThis->SetFlags( nSaveFlags );
@@ -525,23 +552,23 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
     else
         bValStore = SbxValue::StoreData( rStrm );
     if( !bValStore )
-        return FALSE;
+        return sal_False;
     // if( !SbxValue::StoreData( rStrm ) )
-        // return FALSE;
+        // return sal_False;
     rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US );
-    rStrm << (UINT32)nUserData;
+    rStrm << (sal_uInt32)nUserData;
     if( pInfo.Is() )
     {
-        rStrm << (BYTE) 2;		// Version 2: with UserData!
+        rStrm << (sal_uInt8) 2;		// Version 2: with UserData!
         pInfo->StoreData( rStrm );
     }
     else
-        rStrm << (BYTE) 0;
+        rStrm << (sal_uInt8) 0;
     // Save private data only, if it is a SbxVariable
     if( GetClass() == SbxCLASS_VARIABLE )
         return StorePrivateData( rStrm );
     else
-        return TRUE;
+        return sal_True;
 }
 
 ////////////////////////////// SbxInfo ///////////////////////////////////
@@ -549,7 +576,7 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
 SbxInfo::SbxInfo() : aHelpFile(), nHelpId( 0 ), aParams()
 {}
 
-SbxInfo::SbxInfo( const String& r, UINT32 n )
+SbxInfo::SbxInfo( const String& r, sal_uInt32 n )
        : aHelpFile( r ), nHelpId( n ), aParams()
 {}
 
@@ -582,7 +609,7 @@ SbxAlias::~SbxAlias()
         EndListening( xAlias->GetBroadcaster() );
 }
 
-void SbxAlias::Broadcast( ULONG nHt )
+void SbxAlias::Broadcast( sal_uIntPtr nHt )
 {
     if( xAlias.Is() && StaticIsEnabledBroadcasting() )
     {
@@ -612,11 +639,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
     }
 }
 
-void SbxVariable::Dump( SvStream& rStrm, BOOL bFill )
+void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
 {
     ByteString aBNameStr( (const UniString&)GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US );
     rStrm << "Variable( "
-          << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=="
+          << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=="
           << aBNameStr.GetBuffer();
     ByteString aBParentNameStr( (const UniString&)GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US );
     if ( GetParent() )
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index a2c8752250..51e23c39f0 100644..100755
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement(
 
     if (! xSMgr.is())
     {
-        return FALSE;
+        return sal_False;
     }
 
     Reference< xml::sax::XParser > xParser(
@@ -166,7 +166,7 @@ bool writeOasis2OOoLibraryElement(
 
     if ( !xParser.is() || !xWriter.is() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Sequence<Any> aArgs( 1 );
@@ -187,7 +187,7 @@ bool writeOasis2OOoLibraryElement(
 
     xParser->parseStream( source );
 
-    return TRUE;
+    return sal_True;
 }
 
 void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
@@ -206,13 +206,13 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
 
     Reference< XInputStream > xInput( xISP->createInputStream() );
 
-    bool bComplete = FALSE;
+    bool bComplete = sal_False;
     if ( mbOasis2OOoFormat )
     {
         bComplete = writeOasis2OOoLibraryElement( xInput, xOutput );
     }
 
-    if ( bComplete == FALSE )
+    if ( bComplete == sal_False )
     {
         Sequence< sal_Int8 > bytes;
         sal_Int32 nRead = xInput->readBytes( bytes, xInput->available() );
@@ -280,7 +280,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
         {
             // if we cannot get the version then the
             // Oasis2OOoTransformer will not be used
-            OSL_ASSERT(FALSE);
+            OSL_ASSERT(sal_False);
         }
     }
 
@@ -411,7 +411,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
     {
         OSL_ENSURE( 0, "Parsing error\n" );
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
         return aRetAny;
     }
diff --git a/basic/source/uno/makefile.mk b/basic/source/uno/makefile.mk
index 52e7f7004c..52e7f7004c 100644..100755
--- a/basic/source/uno/makefile.mk
+++ b/basic/source/uno/makefile.mk
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index 2f61374e99..eac3ac2ff9 100644..100755
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -28,9 +28,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
 using namespace com::sun::star;
@@ -46,8 +46,8 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 
     m_aRequest <<= aReq;	
 
-    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY );	
-    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY );	
+    m_xAbort.set( uno::Reference< task::XInteractionAbort >(new comphelper::OInteractionAbort), uno::UNO_QUERY );    
+    m_xApprove.set( uno::Reference< task::XInteractionApprove >(new comphelper::OInteractionApprove ), uno::UNO_QUERY ); 
     m_lContinuations.realloc( 2 );
     m_lContinuations[0] =  m_xApprove;
     m_lContinuations[1] = m_xAbort;
@@ -56,15 +56,15 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
 sal_Bool 
 ModuleSizeExceeded::isAbort() const 
 { 
-    framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() );
+    return pBase->wasSelected();
 }
 
 sal_Bool 
 ModuleSizeExceeded::isApprove() const 
 {
-    framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() );
-    return pBase->isSelected();
+    comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() );
+    return pBase->wasSelected();
 }
 
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index b91840de39..580a6288b4 100644..100755
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -738,7 +738,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                 if( nPass == 0 )
                 {
                     SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -760,7 +760,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                 {
                     xInput.clear();
                     SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -1489,7 +1489,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                         throw;
 
                     SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aElementPath );
-                    ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                    sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                     ErrorHandler::HandleError( nErrorCode );
                 }
             }
@@ -1601,7 +1601,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
                 throw;
 
             SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
     }
@@ -1676,7 +1676,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile(  SfxLibrary* pLib,
             if( !GbMigrationSuppressErrors )
             {
                 SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-                ULONG nErrorCode = ERRCODE_IO_GENERAL;
+                sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
                 ErrorHandler::HandleError( nErrorCode );
             }
         }
@@ -1700,7 +1700,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile(  SfxLibrary* pLib,
     {
         OSL_ENSURE( 0, "Parsing error\n" );
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
         return sal_False;
     }
@@ -2029,7 +2029,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
         }
         catch( uno::Exception& )
         {
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
     }
@@ -2051,7 +2051,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
         {
             xOut.clear();
             SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
-            ULONG nErrorCode = ERRCODE_IO_GENERAL;
+            sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
             ErrorHandler::HandleError( nErrorCode );
         }
 
@@ -2081,7 +2081,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     catch( uno::Exception& )
     {
         OSL_ENSURE( sal_False, "Problem during storing of libraries!\n" );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
     }
 }
@@ -2808,19 +2808,37 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
 
 void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
 {
-    BasicManager* pBasMgr = getBasicManager();
-    if( pBasMgr )
+    /*  The member variable mbVBACompat must be set first, the following call
+        to getBasicManager() may call getVBACompatibilityMode() which returns
+        this value. */
+    mbVBACompat = _vbacompatmodeon;
+    if( BasicManager* pBasMgr = getBasicManager() )
     {
         // get the standard library
-        String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-                if ( pBasMgr->GetName().Len() )
-                    aLibName = pBasMgr->GetName();
+        String aLibName = pBasMgr->GetName();
+        if ( aLibName.Len() == 0 )
+            aLibName = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
 
-        StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
-        if( pBasic )
+        if( StarBASIC* pBasic = pBasMgr->GetLib( aLibName ) )
             pBasic->SetVBAEnabled( _vbacompatmodeon );
+
+        /*  If in VBA compatibility mode, force creation of the VBA Globals
+            object. Each application will create an instance of its own
+            implementation and store it in its Basic manager. Implementations
+            will do all necessary additional initialization, such as
+            registering the global "This***Doc" UNO constant, starting the
+            document events processor etc.
+         */
+        if( mbVBACompat ) try
+        {
+            Reference< frame::XModel > xModel( mxOwnerDocument );   // weak-ref -> ref
+            Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+        }
+        catch( Exception& )
+        {
+        }
     }
-        mbVBACompat = _vbacompatmodeon;
 }
 
 void SAL_CALL SfxLibraryContainer::setProjectName( const ::rtl::OUString& _projectname ) throw (RuntimeException)
diff --git a/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx
index f054225a8b..f054225a8b 100644..100755
--- a/basic/source/uno/sbmodule.cxx
+++ b/basic/source/uno/sbmodule.cxx
diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx
index 64e9f16c2c..64e9f16c2c 100644..100755
--- a/basic/source/uno/sbmodule.hxx
+++ b/basic/source/uno/sbmodule.hxx
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index 77361efb40..77361efb40 100644..100755
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 797bb7acff..d2eee505ad 100644..100755
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -61,7 +61,7 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/basicmanagerrepository.hxx>
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
 #include <xmlscript/xmlmod_imexp.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/util/VetoException.hpp>
@@ -82,7 +82,7 @@ using namespace com::sun::star;
 using namespace cppu;
 using namespace osl;
 
-using com::sun::star::uno::Reference;
+using ::rtl::OUString;
 
 using ::rtl::OUString;
 
@@ -300,7 +300,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
     catch( Exception& )
     {
         SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
-        ULONG nErrorCode = ERRCODE_IO_GENERAL;
+        sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
         ErrorHandler::HandleError( nErrorCode );
     }
 
@@ -311,24 +311,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
     // aMod.aName ignored
     if( aMod.aModuleType.getLength() > 0 )
     {
-        if( !getVBACompatibilityMode() )
+        /*  If in VBA compatibility mode, force creation of the VBA Globals
+            object. Each application will create an instance of its own
+            implementation and store it in its Basic manager. Implementations
+            will do all necessary additional initialization, such as
+            registering the global "This***Doc" UNO constant, starting the
+            document events processor etc.
+         */
+        if( getVBACompatibilityMode() ) try
+        {
+            Reference< frame::XModel > xModel( mxOwnerDocument );   // weak-ref -> ref
+            Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+        }
+        catch( Exception& )
         {
-            setVBACompatibilityMode( sal_True );
-
-            Any aGlobs;
-            Sequence< Any > aArgs(1);
-            Reference<frame::XModel > xModel( mxOwnerDocument );
-            aArgs[ 0 ] <<= xModel;
-
-            BasicManager* pBasicMgr = getBasicManager();
-            if( pBasicMgr )
-            {
-                aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
-                pBasicMgr->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-            }
-            pBasicMgr = BasicManagerRepository::getApplicationBasicManager( sal_False );
-            if( pBasicMgr )
-                pBasicMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[0] );
         }
 
         script::ModuleInfo aModInfo;
@@ -353,25 +350,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
                     RTL_CONSTASCII_STRINGPARAM("document") ))
         {
             aModInfo.ModuleType = ModuleType::DOCUMENT;
-            Reference<frame::XModel > xModel( mxOwnerDocument );
-            Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY);
-            Reference< container::XNameAccess > xVBACodeNameAccess;
-            if( xSF.is() )
+
+            // #163691# use the same codename access instance for all document modules
+            if( !mxCodeNameAccess.is() ) try
             {
-                try
-                {
-                    xVBACodeNameAccess.set( xSF->createInstance( 
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( 
-                            "ooo.vba.VBAObjectModuleObjectProvider"))), 
-                        UNO_QUERY );
-                }
-                catch(uno::Exception&) {}
+                Reference<frame::XModel > xModel( mxOwnerDocument );
+                Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY_THROW );
+                mxCodeNameAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider" ) ) ), UNO_QUERY );
             }
-            if( xVBACodeNameAccess.is() )
+            catch( Exception& ) {}
+
+            if( mxCodeNameAccess.is() )
             {
                 try
                 {
-                    aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY );    
+                    aModInfo.ModuleObject.set( mxCodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
                 }
                 catch(uno::Exception&)
                 {
@@ -661,7 +654,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                         throw uno::RuntimeException();
 
                     SvMemoryStream aMemStream;
-                    /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+                    /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
 
                     sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                     Sequence< sal_Int8 > aBinSeq( nSize );
@@ -802,7 +795,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                                             embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
 
                         SvMemoryStream aMemStream;
-                        /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+                        /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
 
                         sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
                         Sequence< sal_Int8 > aBinSeq( nSize );
@@ -959,7 +952,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                 if( !pMod )
                 {
                     pMod = pBasicLib->MakeModule( aElementName, String() );
-                    pBasicLib->SetModified( FALSE );
+                    pBasicLib->SetModified( sal_False );
                 }
 
                 //OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
@@ -981,7 +974,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                         throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nError );
                     }
 
-                    /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+                    /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
                     // TODO: Check return value
 
                     delete pStream;
@@ -1071,7 +1064,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                         if( !pMod )
                         {
                             pMod = pBasicLib->MakeModule( aElementName, String() );
-                            pBasicLib->SetModified( FALSE );
+                            pBasicLib->SetModified( sal_False );
                         }
 
                         try {
@@ -1090,7 +1083,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                                                                     nError );
                             }
 
-                            /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+                            /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
                             // TODO: Check return value
 
                             delete pStream;
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 534b8a25bd..635b293698 100644..100755
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -137,4 +137,10 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
 $(SRS)$/basic.srs:
     $(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs + $(SRS)$/sbx.srs > $@
 
+ALLTAR : $(MISC)/sb.component
 
+$(MISC)/sb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sb.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sb.component
diff --git a/basic/util/sb.component b/basic/util/sb.component
new file mode 100755
index 0000000000..4687bd1e7d
--- /dev/null
+++ b/basic/util/sb.component
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
+    <service name="com.sun.star.script.DialogLibraryContainer"/>
+    <service name="com.sun.star.script.DocumentDialogLibraryContainer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.ScriptLibraryContainer">
+    <service name="com.sun.star.script.DocumentScriptLibraryContainer"/>
+    <service name="com.sun.star.script.ScriptLibraryContainer"/>
+  </implementation>
+</component>
diff --git a/basic/win/res/basic.ico b/basic/win/res/basic.ico
index c453a0fa98..c453a0fa98 100644..100755
--- a/basic/win/res/basic.ico
+++ b/basic/win/res/basic.ico
diff --git a/basic/win/res/testtool.ico b/basic/win/res/testtool.ico
index db880c8678..db880c8678 100644..100755
--- a/basic/win/res/testtool.ico
+++ b/basic/win/res/testtool.ico
diff --git a/basic/win/res/work.ico b/basic/win/res/work.ico
index 43e3b5b3df..43e3b5b3df 100644..100755
--- a/basic/win/res/work.ico
+++ b/basic/win/res/work.ico
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
new file mode 100755
index 0000000000..824966b23e
--- /dev/null
+++ b/basic/workben/mgrtest.cxx
@@ -0,0 +1,591 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/sound.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbx.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/basrdll.hxx>
+
+//#include <sv.hxx>
+//#include <basic.hxx>
+//#include <sostor.hxx>
+
+// Defines for ToolBox-Id's
+#define TB_NEW				1
+#define TB_OPENSTORAGE		2
+#define TB_SAVESTORAGE		3
+#define TB_ORG				4
+#define TB_CREATELIB1		10
+#define TB_CREATELIB2		11
+#define TB_CREATELIB3		12
+#define TB_LOADLIB1			20
+#define TB_LOADLIB2			21
+#define TB_LOADLIB3			22
+#define TB_STORELIBX		30
+#define TB_UNLOADX			31
+#define TB_LOADX			32
+#define TB_EXECX			33
+#define TB_REMOVEX			34
+#define TB_REMOVEDELX		35
+
+#define TB_LIB0				40
+#define TB_LIB1				41
+#define TB_LIB2				42
+#define TB_LIB3				43
+
+const char* pLib1Str = "Lib1";
+const char* pLib2Str = "Lib2";
+const char* pLib3Str = "Lib3";
+
+// Test-Application
+class TestApp : public Application
+{
+public:
+    virtual void Main( void );
+    virtual void Main( int, char*[] );
+};
+
+// Test-Window with a ToolBox to choose a test from
+// and the typically used virtual methods
+class TestWindow : public WorkWindow
+{
+private:
+    ToolBox 		aToolBox;
+    BasicManager*	pBasMgr;
+
+    void			CheckError();
+    sal_uInt16			nLibX;
+    DECL_LINK( BasicErrorHdl, StarBASIC * );
+
+
+public:
+                    TestWindow();
+                    ~TestWindow();
+
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+
+    DECL_LINK( TBSelect, ToolBox * );
+    void			UpdateToolBox();
+    void			ShowInfo();
+};
+
+TestWindow::~TestWindow()
+{
+}
+
+TestWindow::TestWindow() :
+    WorkWindow( NULL, WB_APP | WB_STDWORK | WB_3DLOOK | WB_CLIPCHILDREN ) ,
+    aToolBox( this, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_LINESPACING ) )
+{
+    nLibX = 0;
+
+    aToolBox.SetButtonType( BUTTON_TEXT );
+    aToolBox.SetLineCount( 2 );
+    aToolBox.SetPosPixel( Point( 0, 0 ) );
+    aToolBox.SetSelectHdl( LINK( this, TestWindow, TBSelect ) );
+
+    Font aFont;
+    aFont.SetName( "Helv" );
+    aFont.SetSize( Size( 0, 6 ) );
+    aFont.SetPitch( PITCH_VARIABLE );
+    aFont.SetFamily( FAMILY_SWISS );
+    aFont.SetTransparent( sal_True );
+    aFont.SetAlign( ALIGN_TOP );
+    aToolBox.SetFont( aFont );
+    SetFont( aFont );
+
+    aToolBox.InsertItem( TB_NEW, "New" );
+    aToolBox.SetHelpText( TB_NEW, "New BasicManager" );
+    aToolBox.InsertItem( TB_OPENSTORAGE, "Load" );
+    aToolBox.SetHelpText( TB_OPENSTORAGE, "Load Storage D:\\MYSTORE.SVS" );
+    aToolBox.InsertItem( TB_SAVESTORAGE, "Save" );
+    aToolBox.SetHelpText( TB_SAVESTORAGE, "Save Storage D:\\MYSTORE.SVS" );
+
+    aToolBox.InsertSeparator();
+
+    aToolBox.InsertItem( TB_ORG, "Verwalten" );
+    aToolBox.SetHelpText( TB_ORG, "Libaries verwalten" );
+
+    aToolBox.InsertSeparator();
+
+    aToolBox.InsertItem( TB_LIB0, "0" );
+    aToolBox.SetHelpText( TB_LIB0, "Aktuelle Lib: STANDARD" );
+    aToolBox.InsertItem( TB_LIB1, "1" );
+    aToolBox.SetHelpText( TB_LIB1, "Aktuelle Lib: 1" );
+    aToolBox.InsertItem( TB_LIB2, "2" );
+    aToolBox.SetHelpText( TB_LIB2, "Aktuelle Lib: 2" );
+    aToolBox.InsertItem( TB_LIB3, "3" );
+    aToolBox.SetHelpText( TB_LIB3, "Aktuelle Lib: 3" );
+
+    aToolBox.InsertBreak();
+    aToolBox.InsertItem( TB_CREATELIB1, "CreateLib1" );
+    aToolBox.SetHelpText( TB_CREATELIB1, "Create Libary LIB1" );
+    aToolBox.InsertItem( TB_CREATELIB2, "CreateLib2" );
+    aToolBox.SetHelpText( TB_CREATELIB2, "Create Libary LIB2" );
+    aToolBox.InsertItem( TB_CREATELIB3, "CreateLib3" );
+    aToolBox.SetHelpText( TB_CREATELIB3, "Create Libary LIB3" );
+
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_LOADLIB1, "LoadLib1" );
+    aToolBox.SetHelpText( TB_LOADLIB1, "Load Libary LIB1" );
+    aToolBox.InsertItem( TB_LOADLIB2, "LoadLib2" );
+    aToolBox.SetHelpText( TB_LOADLIB2, "Load Libary LIB2" );
+    aToolBox.InsertItem( TB_LOADLIB3, "LoadLib3" );
+    aToolBox.SetHelpText( TB_LOADLIB3, "Load Libary LIB3" );
+
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_STORELIBX, "StoreLibX" );
+    aToolBox.SetHelpText( TB_STORELIBX, "Store Libary LIBX" );
+    aToolBox.InsertItem( TB_UNLOADX, "UnloadX" );
+    aToolBox.SetHelpText( TB_UNLOADX, "Unload Libary LIBX" );
+    aToolBox.InsertItem( TB_LOADX, "LoadX" );
+    aToolBox.SetHelpText( TB_LOADX, "Load Libary LIBX" );
+    aToolBox.InsertItem( TB_EXECX, "ExecX" );
+    aToolBox.SetHelpText( TB_EXECX, "Execute 'Libary' LIBX" );
+    aToolBox.InsertItem( TB_REMOVEX, "RemoveX" );
+    aToolBox.SetHelpText( TB_REMOVEX, "Remove Libary LIBX" );
+    aToolBox.InsertItem( TB_REMOVEDELX, "RemDelX" );
+    aToolBox.SetHelpText( TB_REMOVEDELX, "Remove and delete Libary LIBX" );
+
+    pBasMgr = 0;
+
+    Show();
+    UpdateToolBox();
+    aToolBox.Show();
+}
+void TestWindow::ShowInfo()
+{
+    Invalidate();
+    Update();
+    long nH = GetTextSize( "X" ).Height();
+    if ( pBasMgr )
+    {
+        Point aPos( 10, aToolBox.GetSizePixel().Height()+5 );
+        for ( sal_uInt16 nLib = 0; nLib < pBasMgr->GetLibCount(); nLib++ )
+        {
+            String aOutStr( nLib );
+            aOutStr +=": ";
+            StarBASIC* pL = pBasMgr->GetLib( nLib );
+            aOutStr += '[';
+            aOutStr += pBasMgr->GetLibName( nLib );
+            aOutStr += "]<";
+            if ( pL )
+                aOutStr += pL->GetName();
+            else
+                aOutStr += "NoLoaded";
+            aOutStr += ">, Storage='";
+            aOutStr += pBasMgr->GetLibStorageName( nLib );
+            aOutStr += "', bLoaded=";
+            aOutStr += (sal_uInt16)pBasMgr->IsLibLoaded( nLib );
+            DrawText( aPos, aOutStr );
+            aPos.Y() += nH;
+        }
+    }
+}
+
+void TestWindow::UpdateToolBox()
+{
+    // View of some buttons as checked or disabled if
+    // wished by tests
+    aToolBox.EnableItem( TB_ORG, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+    aToolBox.EnableItem( TB_CREATELIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_CREATELIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_CREATELIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+    aToolBox.EnableItem( TB_LOADLIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADLIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADLIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+    aToolBox.EnableItem( TB_STORELIBX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_EXECX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_UNLOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_LOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_REMOVEX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+    aToolBox.EnableItem( TB_REMOVEDELX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+    aToolBox.CheckItem( TB_LIB0, nLibX == 0 );
+    aToolBox.CheckItem( TB_LIB1, nLibX == 1 );
+    aToolBox.CheckItem( TB_LIB2, nLibX == 2 );
+    aToolBox.CheckItem( TB_LIB3, nLibX == 3 );
+}
+
+IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
+{
+    sal_uInt16 nId = aToolBox.GetCurItemId();
+    sal_Bool bChecked = aToolBox.IsItemChecked( nId );
+    switch ( nId )
+    {
+        case TB_NEW:
+        {
+            delete pBasMgr;
+            pBasMgr = new BasicManager( new StarBASIC );
+            pBasMgr->SetStorageName( "d:\\mystore.svs" );
+        }
+        break;
+        case TB_OPENSTORAGE:
+        {
+            delete pBasMgr;
+            SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs", STREAM_READ | STREAM_SHARE_DENYWRITE );
+            DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
+            pBasMgr = new BasicManager( *xStorage );
+        }
+        break;
+        case TB_SAVESTORAGE:
+        {
+            if ( pBasMgr)
+            {
+                SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+                DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
+                pBasMgr->Store( *xStorage );
+            }
+        }
+        break;
+        case TB_ORG:
+        {
+            if ( pBasMgr)
+            {
+                InfoBox( 0, "Organisieren..." ).Execute();
+            }
+        }
+        break;
+        case TB_CREATELIB1:
+        {
+            if ( pBasMgr )
+            {
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib1Str ) );
+                if ( nLib != LIB_NOTFOUND )
+                {
+                    pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
+                    StarBASIC* pLib = pBasMgr->GetLib( pLib1Str );
+                    DBG_ASSERT( pLib, "Lib?!" );
+                    String aSource( "Sub SubInLib1Mod1\nprint\"XXX\"\nEnd Sub");
+                    SbModule* pM = pLib->MakeModule( "ModLib1", aSource  );
+                    DBG_ASSERT( pM, "Modul?" );
+                    pLib->Compile( pM );
+                }
+                else
+                    InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+            }
+        }
+        break;
+        case TB_CREATELIB2:
+        {
+            if ( pBasMgr )
+            {
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib2Str ) );
+                if ( nLib != LIB_NOTFOUND )
+                {
+                    pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
+                    StarBASIC* pLib = pBasMgr->GetLib( pLib2Str );
+                    DBG_ASSERT( pLib, "Lib?!" );
+                    SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub SubInLib2\n print \"Tralala\" \nEnd Sub\n" );
+                    pLib->Compile( pM );
+                }
+                else
+                    InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+            }
+        }
+        break;
+        case TB_CREATELIB3:
+        {
+            if ( pBasMgr )
+            {
+                // liegt in einem anderen Storage !!!
+                sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib3Str ) );
+                if ( nLib != LIB_NOTFOUND )
+                {
+                    pBasMgr->SetLibStorageName( nLib, "d:\\mystore2.svs" );
+                    StarBASIC* pLib = pBasMgr->GetLib( pLib3Str );
+                    DBG_ASSERT( pLib, "Lib?!" );
+                    SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub XYZInLib3\n print \"?!\" \nEnd Sub\n" );
+                    pLib->Compile( pM );
+                }
+                else
+                    InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+            }
+        }
+        break;
+        case TB_LOADLIB1:
+        {
+            if ( pBasMgr )
+            {
+                SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+                if ( !pBasMgr->AddLib( *xStorage, pLib1Str, sal_False ) )
+                    Sound::Beep();
+            }
+        }
+        break;
+        case TB_LOADLIB2:
+        {
+            if ( pBasMgr )
+            {
+                SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+                if ( !pBasMgr->AddLib( *xStorage, pLib2Str, sal_False ) )
+                    Sound::Beep();
+            }
+        }
+        break;
+        case TB_LOADLIB3:
+        {
+            if ( pBasMgr )
+            {
+                // liegt in einem anderen Storage !!!
+                SvStorageRef xStorage = new SvStorage( "d:\\mystore2.svs" );
+                if ( !pBasMgr->AddLib( *xStorage, pLib3Str, sal_False ) )
+                    Sound::Beep();
+            }
+        }
+        break;
+        case TB_STORELIBX:
+        {
+            if ( pBasMgr )
+                pBasMgr->StoreLib( nLibX );
+        }
+        break;
+        case TB_UNLOADX:
+        {
+            if ( pBasMgr )
+                pBasMgr->UnloadLib( nLibX );
+        }
+        break;
+        case TB_LOADX:
+        {
+            if ( pBasMgr )
+                pBasMgr->LoadLib( nLibX );
+        }
+        break;
+        case TB_REMOVEX:
+        {
+            if ( pBasMgr )
+                pBasMgr->RemoveLib( nLibX, sal_False );
+        }
+        break;
+        case TB_REMOVEDELX:
+        {
+            if ( pBasMgr )
+                pBasMgr->RemoveLib( nLibX, sal_True );
+        }
+        break;
+        case TB_EXECX:
+        {
+            if ( pBasMgr )
+            {
+                StarBASIC* pBasic = pBasMgr->GetLib( nLibX );
+                if ( pBasic && pBasic->GetModules()->Count() )
+                {
+                    pBasic->SetErrorHdl( LINK( this, TestWindow, BasicErrorHdl ) );
+
+                    SbModule* pMod = (SbModule*)pBasic->GetModules()->Get( 0 );
+                    if ( pMod && pMod->GetMethods()->Count() )
+                        pMod->GetMethods()->Get(0)->GetInteger();
+                }
+            }
+        }
+        break;
+
+        case TB_LIB0:	nLibX = 0;
+        break;
+        case TB_LIB1:	nLibX = 1;
+        break;
+        case TB_LIB2:	nLibX = 2;
+        break;
+        case TB_LIB3:	nLibX = 3;
+        break;
+    }
+
+    UpdateToolBox();
+    CheckError();
+    ShowInfo();
+    return 0;
+}
+
+void TestWindow::CheckError()
+{
+     if ( pBasMgr )
+     {
+        BasicError* pError = pBasMgr->GetFirstError();
+        while ( pError )
+        {
+            String aErrorStr;
+            String aReasonStr;
+            switch ( pError->GetErrorId() )
+            {
+                case BASERR_ID_STDLIBOPEN:
+                    aErrorStr = "Standard-Lib konnte nicht geoffnet werden.";
+                break;
+                case BASERR_ID_STDLIBSAVE:
+                    aErrorStr = "Standard-Lib konnte nicht gespeichert werden.";
+                break;
+                case BASERR_ID_LIBLOAD:
+                    aErrorStr = "Lib konnte nicht geoffnet werden.";
+                break;
+                case BASERR_ID_LIBCREATE:
+                    aErrorStr = "Lib konnte nicht erzeugt werden.";
+                break;
+                case BASERR_ID_LIBSAVE:
+                    aErrorStr = "Lib konnte nicht gespeichert werden.";
+                break;
+                case BASERR_ID_MGROPEN:
+                    aErrorStr = "Manager konnte nicht geladen werden.";
+                break;
+                case BASERR_ID_MGRSAVE:
+                    aErrorStr = "Manager konnte nicht gespeichert werden.";
+                break;
+                case BASERR_ID_UNLOADLIB:
+                    aErrorStr = "Libary konnte nicht entladen werden.";
+                break;
+                case BASERR_ID_REMOVELIB:
+                    aErrorStr = "Libary konnte nicht entfernt werden.";
+                break;
+                default:
+                    aErrorStr = "Unbekannter Fehler!";
+            }
+
+            switch ( pError->GetReason() )
+            {
+                case BASERR_REASON_OPENSTORAGE:
+                    aReasonStr = "Der Storage konnte nicht geoeffnet werden";
+                break;
+                case BASERR_REASON_OPENLIBSTORAGE:
+                    aReasonStr = "Der Lib-Storage konnte nicht geoeffnet werden";
+                break;
+                case BASERR_REASON_OPENMGRSTREAM:
+                    aReasonStr = "Der Manager-Stream konnte nicht geoeffnet werden";
+                break;
+                case BASERR_REASON_OPENLIBSTREAM:
+                    aReasonStr = "Der Basic-Stream konnte nicht geoeffnet werden";
+                break;
+                case BASERR_REASON_STDLIB:
+                    aReasonStr = "STANDARD-Lib";
+                break;
+                case BASERR_REASON_BASICLOADERROR:
+                    aReasonStr = "Fehler beim Laden des Basics";
+                default:
+                    aReasonStr = " - ";
+            }
+
+            String aErr( aErrorStr );
+            aErr += "\nGrund: ";
+            aErr += aReasonStr;
+            InfoBox( 0, aErr ).Execute();
+
+            pError = pBasMgr->GetNextError();
+        }
+        pBasMgr->ClearErrors();
+     }
+}
+
+void __EXPORT TestWindow::Paint( const Rectangle& rRec )
+{
+}
+
+void __EXPORT TestWindow::Resize()
+{
+    Size aTBSz = aToolBox.CalcWindowSizePixel();
+    aToolBox.SetSizePixel( Size( GetOutputSizePixel().Width(), aTBSz.Height()) );
+    Invalidate();
+    ShowInfo();
+}
+
+void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
+{
+    char nCharCode = rKEvt.GetCharCode();
+    sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+
+    // Nur bei Alt-Return
+    if ( ( nCode == KEY_RETURN ) && rKEvt.GetKeyCode().IsMod2() )
+        ;
+    else
+        WorkWindow::KeyInput( rKEvt );
+
+    UpdateToolBox();
+}
+
+void __EXPORT TestWindow::MouseMove( const MouseEvent& rMEvt )
+{
+}
+
+void __EXPORT TestWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    ShowInfo();
+}
+
+void __EXPORT TestWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    UpdateToolBox();
+}
+
+IMPL_LINK( TestWindow, BasicErrorHdl, StarBASIC *, pBasic )
+{
+    String aErrorText( pBasic->GetErrorText() );
+
+    String aErrorTextPrefix;
+    if( pBasic->IsCompilerError() )
+    {
+        aErrorTextPrefix = "Compilererror: ";
+    }
+    else
+    {
+        aErrorTextPrefix = "Runtimeerror: ";
+        aErrorTextPrefix += pBasic->GetErrorCode();
+        aErrorTextPrefix += " ";
+    }
+
+    InfoBox( 0, String( aErrorTextPrefix + aErrorText ) ).Execute();
+    return 0;
+}
+
+void __EXPORT TestApp::Main( void )
+{
+    Main( 0, NULL );
+}
+
+void __EXPORT TestApp::Main( int, char*[] )
+{
+    BasicDLL aBasiDLL;
+    SvFactory::Init();
+    EnableSVLook();
+    TestWindow aWindow;
+    Execute();
+    SvFactory::DeInit();
+}
+
+
+TestApp aTestApp;
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 3dd2fc4d48..3dd2fc4d48 100644..100755
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
diff --git a/configmgr/inc/pch/precompiled_configmgr.cxx b/configmgr/inc/pch/precompiled_configmgr.cxx
index b06c3f4384..b06c3f4384 100644..100755
--- a/configmgr/inc/pch/precompiled_configmgr.cxx
+++ b/configmgr/inc/pch/precompiled_configmgr.cxx
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index af05be7c03..af05be7c03 100644..100755
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 3999f6460c..6043290f09 100644..100755
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL
 cg configmgr\inc nmake - all cg_inc NULL
 cg configmgr\source nmake - all cg_source cg_inc NULL
 cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index 17ccdbe86a..34b6cf3e00 100644..100755
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,3 +1,4 @@
 ..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll
 ..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib
 ..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so
+..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 027aa599b6..027aa599b6 100644..100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index fdb82f172c..fdb82f172c 100644..100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
diff --git a/configmgr/qa/unit/no_localization b/configmgr/qa/unit/no_localization
index e69de29bb2..e69de29bb2 100644..100755
--- a/configmgr/qa/unit/no_localization
+++ b/configmgr/qa/unit/no_localization
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index fe8d29e9ef..fe8d29e9ef 100644..100755
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
diff --git a/configmgr/qa/unit/urebootstrap.ini b/configmgr/qa/unit/urebootstrap.ini
index c413645d0f..c413645d0f 100644..100755
--- a/configmgr/qa/unit/urebootstrap.ini
+++ b/configmgr/qa/unit/urebootstrap.ini
diff --git a/configmgr/qa/unit/version.map b/configmgr/qa/unit/version.map
index 6b30413b89..6b30413b89 100644..100755
--- a/configmgr/qa/unit/version.map
+++ b/configmgr/qa/unit/version.map
diff --git a/configmgr/qa/unoapi/Test.java b/configmgr/qa/unoapi/Test.java
index 4d1f5a3c4b..4d1f5a3c4b 100644..100755
--- a/configmgr/qa/unoapi/Test.java
+++ b/configmgr/qa/unoapi/Test.java
diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk
index 252e4a0d9a..252e4a0d9a 100644..100755
--- a/configmgr/qa/unoapi/makefile.mk
+++ b/configmgr/qa/unoapi/makefile.mk
diff --git a/configmgr/qa/unoapi/module.sce b/configmgr/qa/unoapi/module.sce
index d9b1c8b540..d9b1c8b540 100644..100755
--- a/configmgr/qa/unoapi/module.sce
+++ b/configmgr/qa/unoapi/module.sce
diff --git a/configmgr/source/README b/configmgr/source/README
index b00990d1ee..f26c68ecf7 100644..100755
--- a/configmgr/source/README
+++ b/configmgr/source/README
@@ -51,16 +51,13 @@ propertynode.cxx
 setnode.cxx
  Internal representations of data nodes.
 
-pad.cxx
 parsemanager.cxx
 parser.hxx
-span.hxx
 valueparser.cxx
 xcdparser.cxx
 xcsparser.cxx
 xcuparser.cxx
 xmldata.cxx
-xmlreader.cxx
  XML file reading.
 
 modifications.cxx
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7fcd7a1c34..ef7ba869cf 100644..100755
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -912,7 +912,8 @@ rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
     OSL_ASSERT(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.Access" ) );
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("org.openoffice-configmgr::Access"));
 }
 
 sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
@@ -1995,45 +1996,83 @@ rtl::Reference< ChildAccess > Access::getUnmodifiedChild(
 }
 
 rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
-    rtl::OUString name;
-    bool setElement;
-    rtl::OUString templateName;
-    sal_Int32 i = Data::parseSegment(
-        path, 0, &name, &setElement, &templateName);
-    if (i == -1 || (i != path.getLength() && path[i] != '/')) {
-        return rtl::Reference< ChildAccess >();
-    }
-    rtl::Reference< ChildAccess > child(getChild(name));
-    if (!child.is()) {
-        return rtl::Reference< ChildAccess >();
-    }
-    if (setElement) {
-        rtl::Reference< Node > p(getNode());
-        switch (p->kind()) {
-        case Node::KIND_LOCALIZED_PROPERTY:
-            if (!Components::allLocales(getRootAccess()->getLocale()) ||
-                templateName.getLength() != 0)
-            {
+    sal_Int32 i = 0;
+    // For backwards compatibility, allow absolute paths where meaningful:
+    if (path.getLength() != 0 && path[0] == '/') {
+        ++i;
+        if (!getRootAccess().is()) {
+            return rtl::Reference< ChildAccess >();
+        }
+        Path abs(getAbsolutePath());
+        for (Path::iterator j(abs.begin()); j != abs.end(); ++j) {
+            rtl::OUString name1;
+            bool setElement1;
+            rtl::OUString templateName1;
+            i = Data::parseSegment(
+                path, i, &name1, &setElement1, &templateName1);
+            if (i == -1 || (i != path.getLength() && path[i] != '/')) {
                 return rtl::Reference< ChildAccess >();
             }
-            break;
-        case Node::KIND_SET:
-            if (templateName.getLength() != 0 &&
-                !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
-                    templateName))
+            rtl::OUString name2;
+            bool setElement2;
+            rtl::OUString templateName2;
+            Data::parseSegment(*j, 0, &name2, &setElement2, &templateName2);
+            if (name1 != name2 || setElement1 != setElement2 ||
+                (setElement1 &&
+                 !Data::equalTemplateNames(templateName1, templateName2)))
             {
                 return rtl::Reference< ChildAccess >();
             }
-            break;
-        default:
+            if (i != path.getLength()) {
+                ++i;
+            }
+        }
+    }
+    for (rtl::Reference< Access > parent(this);;) {
+        rtl::OUString name;
+        bool setElement;
+        rtl::OUString templateName;
+        i = Data::parseSegment(path, i, &name, &setElement, &templateName);
+        if (i == -1 || (i != path.getLength() && path[i] != '/')) {
             return rtl::Reference< ChildAccess >();
         }
+        rtl::Reference< ChildAccess > child(parent->getChild(name));
+        if (!child.is()) {
+            return rtl::Reference< ChildAccess >();
+        }
+        if (setElement) {
+            rtl::Reference< Node > p(parent->getNode());
+            switch (p->kind()) {
+            case Node::KIND_LOCALIZED_PROPERTY:
+                if (!Components::allLocales(getRootAccess()->getLocale()) ||
+                    templateName.getLength() != 0)
+                {
+                    return rtl::Reference< ChildAccess >();
+                }
+                break;
+            case Node::KIND_SET:
+                if (templateName.getLength() != 0 &&
+                    !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
+                        templateName))
+                {
+                    return rtl::Reference< ChildAccess >();
+                }
+                break;
+            default:
+                return rtl::Reference< ChildAccess >();
+            }
+        }
+        // For backwards compatibility, ignore a final slash after non-value
+        // nodes:
+        if (child->isValue()) {
+            return i == path.getLength()
+                ? child : rtl::Reference< ChildAccess >();
+        } else if (i >= path.getLength() - 1) {
+            return child;
+        }
+        ++i;
+        parent = child.get();
     }
-    // For backwards compatibility, ignore a final slash after non-value nodes:
-    return child->isValue()
-        ? (i == path.getLength() ? child : rtl::Reference< ChildAccess >())
-        : (i >= path.getLength() - 1
-           ? child : child->getSubChild(path.copy(i + 1)));
 }
 
 bool Access::setChildProperty(
@@ -2091,9 +2130,8 @@ css::beans::Property Access::asProperty() {
     default:
         type = cppu::UnoType< css::uno::XInterface >::get(); //TODO: correct?
         nillable = false;
-        removable = false;
-        if ( getParentNode() != NULL )
-            removable = getParentNode()->kind() == Node::KIND_SET;
+        rtl::Reference< Node > parent(getParentNode());
+        removable = parent.is() && parent->kind() == Node::KIND_SET;
         break;
     }
     return css::beans::Property(
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index bf314f2f6a..bf314f2f6a 100644..100755
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
diff --git a/configmgr/source/additions.hxx b/configmgr/source/additions.hxx
index 5278dec299..5278dec299 100644..100755
--- a/configmgr/source/additions.hxx
+++ b/configmgr/source/additions.hxx
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 8634dfa08b..8634dfa08b 100644..100755
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index 75db85ec01..75db85ec01 100644..100755
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 3d9c40bc07..3d9c40bc07 100644..100755
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 77fd5190aa..77fd5190aa 100644..100755
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 44c2d32a92..108e08fa7a 100644..100755
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -217,7 +217,7 @@ void Components::WriteThread::run() {
     reference_->clear();
 }
 
-void Components::initSingleton(
+Components & Components::getSingleton(
     css::uno::Reference< css::uno::XComponentContext > const & context)
 {
     OSL_ASSERT(context.is());
@@ -226,10 +226,6 @@ void Components::initSingleton(
         singleton = &theSingleton;
         singletonCreated = true;
     }
-}
-
-Components & Components::getSingleton() {
-    OSL_ASSERT(singletonCreated);
     if (singleton == 0) {
         throw css::uno::RuntimeException(
             rtl::OUString(
@@ -869,7 +865,7 @@ void Components::parseModificationLayer() {
             "configmgr user registrymodifications.xcu does not (yet) exist");
         // Migrate old user layer data (can be removed once migration is no
         // longer relevant, probably OOo 4; also see hack for xsi namespace in
-        // XmlReader constructor):
+        // xmlreader::XmlReader::registerNamespaceIri):
         parseFiles(
             Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
             &parseXcuFile,
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index e810c6aee2..9d216e1bb9 100644..100755
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -67,12 +67,10 @@ class RootAccess;
 
 class Components: private boost::noncopyable {
 public:
-    static void initSingleton(
+    static Components & getSingleton(
         com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
             const & context);
 
-    static Components & getSingleton();
-
     static bool allLocales(rtl::OUString const & locale);
 
     rtl::Reference< Node > resolvePathRepresentation(
diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component
new file mode 100755
index 0000000000..6ed5125700
--- /dev/null
+++ b/configmgr/source/configmgr.component
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.ConfigurationProvider">
+    <service name="com.sun.star.configuration.ConfigurationProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.configuration.ConfigurationRegistry">
+    <service name="com.sun.star.configuration.ConfigurationRegistry"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.configuration.DefaultProvider">
+    <service name="com.sun.star.configuration.DefaultProvider"/>
+    <singleton name="com.sun.star.configuration.theDefaultProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.configuration.Update">
+    <service name="com.sun.star.configuration.Update_Service"/>
+    <singleton name="com.sun.star.configuration.Update"/>
+  </implementation>
+</component>
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index cccb74658c..6b8d967e92 100644..100755
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -56,7 +56,7 @@
 #include "cppu/unotype.hxx"
 #include "cppuhelper/compbase5.hxx"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/diagnose.h"
@@ -129,7 +129,6 @@ private:
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException)
     { return configuration_provider::getSupportedServiceNames(); }
-        //TODO: DefaultProvider?
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
         rtl::OUString const & aServiceSpecifier)
@@ -279,8 +278,7 @@ Service::createInstanceWithArguments(
             static_cast< cppu::OWeakObject * >(this));
     }
     osl::MutexGuard guard(*lock_);
-    Components::initSingleton(context_);
-    Components & components = Components::getSingleton();
+    Components & components = Components::getSingleton(context_);
     rtl::Reference< RootAccess > root(
         new RootAccess(components, nodepath, locale, update));
     if (root->isValue()) {
@@ -391,14 +389,14 @@ void Service::flushModifications() const {
     Components * components;
     {
         osl::MutexGuard guard(*lock_);
-        Components::initSingleton(context_);
-        components = &Components::getSingleton();
+        components = &Components::getSingleton(context_);
     }
     components->flushModifications();
 }
 
 class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    public cppu::WeakImplHelper2<
+        css::lang::XSingleComponentFactory, css::lang::XServiceInfo >,
     private boost::noncopyable
 {
 public:
@@ -417,6 +415,18 @@ private:
         css::uno::Sequence< css::uno::Any > const & Arguments,
         css::uno::Reference< css::uno::XComponentContext > const & Context)
         throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return configuration_provider::getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return configuration_provider::getSupportedServiceNames(); }
 };
 
 css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index a55e99809d..a55e99809d 100644..100755
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index f4fe588d01..a46d5ceb2e 100644..100755
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -37,7 +37,6 @@
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
 #include "com/sun/star/registry/InvalidRegistryException.hpp"
 #include "com/sun/star/registry/InvalidValueException.hpp"
 #include "com/sun/star/registry/MergeConflictException.hpp"
@@ -57,13 +56,11 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/XFlushable.hpp"
 #include "cppu/unotype.hxx"
-#include "cppuhelper/factory.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase3.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/diagnose.h"
 #include "osl/mutex.hxx"
-#include "rtl/unload.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
@@ -878,53 +875,12 @@ rtl::OUString RegistryKey::getResolvedName(rtl::OUString const & aKeyName)
     return aKeyName;
 }
 
-class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
-    private boost::noncopyable
-{
-public:
-    Factory() {}
-
-private:
-    virtual ~Factory() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
-    css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
-{
-    return createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any >(), Context);
 }
 
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
-    css::uno::Sequence< css::uno::Any > const & Arguments,
-    css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+css::uno::Reference< css::uno::XInterface > create(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
 {
-    if (Arguments.getLength() != 0) {
-        throw css::uno::Exception(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.configuration.ConfigurationRegistry must be"
-                    " instantiated without arguments")),
-            static_cast< cppu::OWeakObject * >(this));
-    }
-    return static_cast< cppu::OWeakObject * >(new Service(Context));
-}
-
+    return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
 rtl::OUString getImplementationName() {
@@ -940,14 +896,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
-css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(())
-{
-    return new Factory;
-}
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
index 459fcc4535..fdba8f51e5 100644..100755
--- a/configmgr/source/configurationregistry.hxx
+++ b/configmgr/source/configurationregistry.hxx
@@ -31,28 +31,28 @@
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
 #include "sal/types.h"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class XComponentContext;
+        class XInterface;
+    }
+} } }
 namespace rtl { class OUString; }
 
 namespace configmgr { namespace configuration_registry {
 
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        const & context);
+
 rtl::OUString SAL_CALL getImplementationName();
 
 com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames();
 
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(());
-
 } }
 
 #endif
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 989f543b19..989f543b19 100644..100755
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index f60ecfa1e8..f60ecfa1e8 100644..100755
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 16cf66df0d..6e65301e8c 100644..100755
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -29,25 +29,16 @@
 #include "precompiled_configmgr.hxx"
 #include "sal/config.h"
 
-#include "boost/noncopyable.hpp"
-#include "boost/shared_ptr.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/weak.hxx"
-#include "sal/types.h"
-#include "rtl/unload.h"
+#include "osl/mutex.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
 #include "configurationprovider.hxx"
+#include "defaultprovider.hxx"
 #include "lock.hxx"
 
 namespace configmgr { namespace default_provider {
@@ -56,63 +47,15 @@ namespace {
 
 namespace css = com::sun::star;
 
-class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
-    private boost::noncopyable
+css::uno::Reference< css::uno::XInterface > create(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
 {
-public:
-    Factory()
-    {
-        lock_ = lock();
-    }
-
-private:
-    virtual ~Factory() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-
-    boost::shared_ptr<osl::Mutex> lock_;
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
-    css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
-{
-    return createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any >(), Context);
-}
-
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
-    css::uno::Sequence< css::uno::Any > const & Arguments,
-    css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
-{
-    if (Arguments.getLength() != 0) {
-        throw css::uno::Exception(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.configuration.DefaultProvider must be"
-                    " instantiated without arguments")),
-            static_cast< cppu::OWeakObject * >(this));
-    }
     osl::MutexGuard guard(*lock_);
     static css::uno::Reference< css::uno::XInterface > singleton(
-        configuration_provider::createDefault(Context));
+        configuration_provider::createDefault(context));
     return singleton;
 }
 
-}
-
 rtl::OUString getImplementationName() {
     return rtl::OUString(
         RTL_CONSTASCII_USTRINGPARAM(
@@ -126,15 +69,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
-css::uno::Reference< css::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(())
-{
-    return new Factory;
-}
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index 5202148fa3..1dbc44d525 100644..100755
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -33,28 +33,28 @@
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
 #include "sal/types.h"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class XComponentContext;
+        class XInterface;
+    }
+} } }
 namespace rtl { class OUString; }
 
 namespace configmgr { namespace default_provider {
 
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        const & context);
+
 rtl::OUString SAL_CALL getImplementationName();
 
 com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames();
 
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(());
-
 } }
 
 #endif
diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx
index fa56afa1a2..fa56afa1a2 100644..100755
--- a/configmgr/source/groupnode.cxx
+++ b/configmgr/source/groupnode.cxx
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index 02f1679998..02f1679998 100644..100755
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
index c03f552de1..c03f552de1 100644..100755
--- a/configmgr/source/localizedpropertynode.cxx
+++ b/configmgr/source/localizedpropertynode.cxx
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index bbe934e36b..bbe934e36b 100644..100755
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index ac6346f092..ac6346f092 100644..100755
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 23139bec40..23139bec40 100644..100755
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
index 3950a2d5e3..3950a2d5e3 100644..100755
--- a/configmgr/source/lock.cxx
+++ b/configmgr/source/lock.cxx
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
index b37e83a44e..b37e83a44e 100644..100755
--- a/configmgr/source/lock.hxx
+++ b/configmgr/source/lock.hxx
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
index 777fed3323..94747d9dd8 100644..100755
--- a/configmgr/source/makefile.mk
+++ b/configmgr/source/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES = \
     $(SLO)/modifications.obj \
     $(SLO)/node.obj \
     $(SLO)/nodemap.obj \
-    $(SLO)/pad.obj \
     $(SLO)/parsemanager.obj \
     $(SLO)/partial.obj \
     $(SLO)/propertynode.obj \
@@ -66,8 +65,7 @@ SLOFILES = \
     $(SLO)/xcdparser.obj \
     $(SLO)/xcsparser.obj \
     $(SLO)/xcuparser.obj \
-    $(SLO)/xmldata.obj \
-    $(SLO)/xmlreader.obj
+    $(SLO)/xmldata.obj
 
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1OBJS = $(SLOFILES)
@@ -76,9 +74,18 @@ SHL1STDLIBS = \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(SALHELPERLIB) \
-    $(SALLIB)
+    $(SALLIB) \
+    $(XMLREADERLIB)
 SHL1TARGET = configmgr.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/configmgr.component
+
+$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        configmgr.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt configmgr.component
diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx
index e83d4a501a..e83d4a501a 100644..100755
--- a/configmgr/source/modifications.cxx
+++ b/configmgr/source/modifications.cxx
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index fa4f08a157..fa4f08a157 100644..100755
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 69f53e28b1..58d13c4fee 100644..100755
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -102,10 +102,6 @@ Node::~Node() {}
 
 void Node::clear() {}
 
-rtl::Reference< Node > Node::findMember(rtl::OUString const &) {
-    return rtl::Reference< Node >();
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 27eea9c464..932d11cf37 100644..100755
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -32,11 +32,12 @@
 #include "sal/config.h"
 
 #include "rtl/ref.hxx"
-#include "rtl/ustring.hxx"
 #include "salhelper/simplereferenceobject.hxx"
 
 #include "nodemap.hxx"
 
+namespace rtl { class OUString; }
+
 namespace configmgr {
 
 class Node: public salhelper::SimpleReferenceObject {
@@ -70,8 +71,6 @@ protected:
     virtual ~Node();
     virtual void clear();
 
-    virtual rtl::Reference< Node > findMember(rtl::OUString const & name);
-
     int layer_;
     int finalized_;
 };
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index 432aa64e79..432aa64e79 100644..100755
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index 5e9e501e9f..5e9e501e9f 100644..100755
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
diff --git a/configmgr/source/pad.cxx b/configmgr/source/pad.cxx
index 68a92b5aa7..68a92b5aa7 100644..100755
--- a/configmgr/source/pad.cxx
+++ b/configmgr/source/pad.cxx
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index b6fe53f171..d5a2d2ddd5 100644..100755
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -33,10 +33,11 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "osl/diagnose.h"
 #include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "parsemanager.hxx"
 #include "parser.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -53,28 +54,42 @@ ParseManager::ParseManager(
     reader_(url), parser_(parser)
 {
     OSL_ASSERT(parser.is());
+    int id;
+    id = reader_.registerNamespaceIri(
+        xmlreader::Span(
+            RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry")));
+    OSL_ASSERT(id == NAMESPACE_OOR);
+    id = reader_.registerNamespaceIri(
+        xmlreader::Span(
+            RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema")));
+    OSL_ASSERT(id == NAMESPACE_XS);
+    id = reader_.registerNamespaceIri(
+        xmlreader::Span(
+            RTL_CONSTASCII_STRINGPARAM(
+                "http://www.w3.org/2001/XMLSchema-instance")));
+    OSL_ASSERT(id == NAMESPACE_XSI);
 }
 
 bool ParseManager::parse() {
     for (;;) {
         switch (itemData_.is()
-                ? XmlReader::RESULT_BEGIN
+                ? xmlreader::XmlReader::RESULT_BEGIN
                 : reader_.nextItem(
-                    parser_->getTextMode(), &itemData_, &itemNamespace_))
+                    parser_->getTextMode(), &itemData_, &itemNamespaceId_))
         {
-        case XmlReader::RESULT_BEGIN:
-            if (!parser_->startElement(reader_, itemNamespace_, itemData_))
+        case xmlreader::XmlReader::RESULT_BEGIN:
+            if (!parser_->startElement(reader_, itemNamespaceId_, itemData_))
             {
                 return false;
             }
             break;
-        case XmlReader::RESULT_END:
+        case xmlreader::XmlReader::RESULT_END:
             parser_->endElement(reader_);
             break;
-        case XmlReader::RESULT_TEXT:
+        case xmlreader::XmlReader::RESULT_TEXT:
             parser_->characters(itemData_);
             break;
-        case XmlReader::RESULT_DONE:
+        case xmlreader::XmlReader::RESULT_DONE:
             return true;
         }
         itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 47719fce8a..a6a238b0a0 100644..100755
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -36,9 +36,8 @@
 #include "rtl/ref.hxx"
 #include "sal/types.h"
 #include "salhelper/simplereferenceobject.hxx"
-
-#include "span.hxx"
-#include "xmlreader.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 namespace rtl { class OUString; }
 
@@ -56,13 +55,15 @@ public:
 
     bool parse();
 
+    enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
+
 private:
     virtual ~ParseManager();
 
-    XmlReader reader_;
+    xmlreader::XmlReader reader_;
     rtl::Reference< Parser > parser_;
-    Span itemData_;
-    XmlReader::Namespace itemNamespace_;
+    xmlreader::Span itemData_;
+    int itemNamespaceId_;
 };
 
 }
diff --git a/configmgr/source/parser.hxx b/configmgr/source/parser.hxx
index 0c2435ed19..a7151b71c6 100644..100755
--- a/configmgr/source/parser.hxx
+++ b/configmgr/source/parser.hxx
@@ -34,23 +34,23 @@
 #include <memory>
 
 #include "salhelper/simplereferenceobject.hxx"
+#include "xmlreader/xmlreader.hxx"
 
-#include "xmlreader.hxx"
+namespace xmlreader { struct Span; }
 
 namespace configmgr {
 
-struct Span;
-
 class Parser: public salhelper::SimpleReferenceObject {
 public:
-    virtual XmlReader::Text getTextMode() = 0;
+    virtual xmlreader::XmlReader::Text getTextMode() = 0;
 
     virtual bool startElement(
-        XmlReader & reader, XmlReader::Namespace ns, Span const & name) = 0;
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
+        = 0;
 
-    virtual void endElement(XmlReader const & reader) = 0;
+    virtual void endElement(xmlreader::XmlReader const & reader) = 0;
 
-    virtual void characters(Span const & text) = 0;
+    virtual void characters(xmlreader::Span const & text) = 0;
 
 protected:
     Parser() {}
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index f3f91a4c05..f3f91a4c05 100644..100755
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index 135aa5d663..135aa5d663 100644..100755
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
diff --git a/configmgr/source/path.hxx b/configmgr/source/path.hxx
index 2de401099d..2de401099d 100644..100755
--- a/configmgr/source/path.hxx
+++ b/configmgr/source/path.hxx
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 8e2eec660d..8e2eec660d 100644..100755
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 6e0edc895f..6e0edc895f 100644..100755
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index ef5982e3a5..ef5982e3a5 100644..100755
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index c1751210c5..c1751210c5 100644..100755
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 6dc4b92c8b..d274cd8973 100644..100755
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -29,17 +29,14 @@
 #include "precompiled_configmgr.hxx"
 #include "sal/config.h"
 
-#include "com/sun/star/registry/XRegistryKey.hpp"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "osl/diagnose.h"
 #include "uno/lbnames.h"
-#include "rtl/textenc.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
 #include "sal/types.h"
 
 #include "configurationprovider.hxx"
@@ -63,15 +60,17 @@ static cppu::ImplementationEntry const services[] = {
     { &dummy, &configmgr::configuration_provider::getImplementationName,
       &configmgr::configuration_provider::getSupportedServiceNames,
       &configmgr::configuration_provider::createFactory, 0, 0 },
-    { &dummy, &configmgr::default_provider::getImplementationName,
+    { &configmgr::default_provider::create,
+      &configmgr::default_provider::getImplementationName,
       &configmgr::default_provider::getSupportedServiceNames,
-      &configmgr::default_provider::createFactory, 0, 0 },
-    { &dummy, &configmgr::configuration_registry::getImplementationName,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &configmgr::configuration_registry::create,
+      &configmgr::configuration_registry::getImplementationName,
       &configmgr::configuration_registry::getSupportedServiceNames,
-      &configmgr::configuration_registry::createFactory, 0, 0 },
-    { &dummy, &configmgr::update::getImplementationName,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &configmgr::update::create, &configmgr::update::getImplementationName,
       &configmgr::update::getSupportedServiceNames,
-      &configmgr::update::createFactory, 0, 0 },
+      &cppu::createSingleComponentFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 }
 };
 
@@ -91,48 +90,4 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
-        return false;
-    }
-    try {
-        css::uno::Reference< css::registry::XRegistryKey >(
-            (css::uno::Reference< css::registry::XRegistryKey >(
-                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
-             createKey(
-                 rtl::OUString(
-                     RTL_CONSTASCII_USTRINGPARAM(
-                         "/com.sun.star.comp.configuration.DefaultProvider/UNO/"
-                         "SINGLETONS/"
-                         "com.sun.star.configuration.theDefaultProvider")))),
-            css::uno::UNO_SET_THROW)->
-            setStringValue(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.configuration.DefaultProvider")));
-        css::uno::Reference< css::registry::XRegistryKey >(
-            (css::uno::Reference< css::registry::XRegistryKey >(
-                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
-             createKey(
-                 rtl::OUString(
-                     RTL_CONSTASCII_USTRINGPARAM(
-                         "/com.sun.star.comp.configuration.Update/UNO/"
-                         "SINGLETONS/com.sun.star.configuration.Update")))),
-            css::uno::UNO_SET_THROW)->
-            setStringValue(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.configuration.Update_Service")));
-    } catch (css::uno::Exception & e) {
-        (void) e;
-        OSL_TRACE(
-            "configmgr component_writeInfo exception: %s",
-            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
-        return false;
-    }
-    return true;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
index 52b117bb01..52b117bb01 100644..100755
--- a/configmgr/source/setnode.cxx
+++ b/configmgr/source/setnode.cxx
diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx
index 00bcab2a55..00bcab2a55 100644..100755
--- a/configmgr/source/setnode.hxx
+++ b/configmgr/source/setnode.hxx
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index b3bfd72d3e..b3bfd72d3e 100644..100755
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx
index 91e335de1e..91e335de1e 100644..100755
--- a/configmgr/source/type.hxx
+++ b/configmgr/source/type.hxx
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 7208eb3f8c..d63ff05841 100644..100755
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -34,20 +34,15 @@
 #include "boost/noncopyable.hpp"
 #include "boost/shared_ptr.hpp"
 #include "com/sun/star/configuration/XUpdate.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
-#include "cppuhelper/factory.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
-#include "rtl/unload.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
@@ -78,8 +73,10 @@ class Service:
     private boost::noncopyable
 {
 public:
-    Service()
+    Service(css::uno::Reference< css::uno::XComponentContext > const context):
+        context_(context)
     {
+        OSL_ASSERT(context.is());
         lock_ = lock();
     }
 
@@ -104,6 +101,7 @@ private:
         throw (css::uno::RuntimeException);
 
     boost::shared_ptr<osl::Mutex> lock_;
+    css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
 void Service::insertExtensionXcsFile(
@@ -111,7 +109,7 @@ void Service::insertExtensionXcsFile(
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(*lock_);
-    Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
+    Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri);
 }
 
 void Service::insertExtensionXcuFile(
@@ -121,10 +119,10 @@ void Service::insertExtensionXcuFile(
     Broadcaster bc;
     {
         osl::MutexGuard g(*lock_);
+        Components & components = Components::getSingleton(context_);
         Modifications mods;
-        Components::getSingleton().insertExtensionXcuFile(
-            shared, fileUri, &mods);
-        Components::getSingleton().initGlobalBroadcaster(
+        components.insertExtensionXcuFile(shared, fileUri, &mods);
+        components.initGlobalBroadcaster(
             mods, rtl::Reference< RootAccess >(), &bc);
     }
     bc.send();
@@ -136,9 +134,10 @@ void Service::removeExtensionXcuFile(rtl::OUString const & fileUri)
     Broadcaster bc;
     {
         osl::MutexGuard g(*lock_);
+        Components & components = Components::getSingleton(context_);
         Modifications mods;
-        Components::getSingleton().removeExtensionXcuFile(fileUri, &mods);
-        Components::getSingleton().initGlobalBroadcaster(
+        components.removeExtensionXcuFile(fileUri, &mods);
+        components.initGlobalBroadcaster(
             mods, rtl::Reference< RootAccess >(), &bc);
     }
     bc.send();
@@ -153,62 +152,22 @@ void Service::insertModificationXcuFile(
     Broadcaster bc;
     {
         osl::MutexGuard g(*lock_);
+        Components & components = Components::getSingleton(context_);
         Modifications mods;
-        Components::getSingleton().insertModificationXcuFile(
+        components.insertModificationXcuFile(
             fileUri, seqToSet(includedPaths), seqToSet(excludedPaths), &mods);
-        Components::getSingleton().initGlobalBroadcaster(
+        components.initGlobalBroadcaster(
             mods, rtl::Reference< RootAccess >(), &bc);
     }
     bc.send();
 }
 
-class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
-    private boost::noncopyable
-{
-public:
-    Factory() {}
-
-private:
-    virtual ~Factory() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
-    css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
-{
-    return createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any >(), Context);
 }
 
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
-    css::uno::Sequence< css::uno::Any > const & Arguments,
-    css::uno::Reference< css::uno::XComponentContext > const &)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+css::uno::Reference< css::uno::XInterface > create(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
 {
-    if (Arguments.getLength() != 0) {
-        throw css::uno::Exception(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.comp.configuration.Update must be"
-                    " instantiated without arguments")),
-            static_cast< cppu::OWeakObject * >(this));
-    }
-    return static_cast< cppu::OWeakObject * >(new Service);
-}
-
+    return static_cast< cppu::OWeakObject * >(new Service(context));
 }
 
 rtl::OUString getImplementationName() {
@@ -223,14 +182,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
     return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
-css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(())
-{
-    return new Factory;
-}
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
index 77b7affb48..3e423679d3 100644..100755
--- a/configmgr/source/update.hxx
+++ b/configmgr/source/update.hxx
@@ -33,28 +33,28 @@
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
 #include "sal/types.h"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class XComponentContext;
+        class XInterface;
+    }
+} } }
 namespace rtl { class OUString; }
 
 namespace configmgr { namespace update {
 
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        const &);
+
 rtl::OUString SAL_CALL getImplementationName();
 
 com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
 getSupportedServiceNames();
 
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(());
-
 } }
 
 #endif
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 03201d26f9..8488531019 100644..100755
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -41,16 +41,17 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "localizedvaluenode.hxx"
 #include "node.hxx"
 #include "nodemap.hxx"
+#include "parsemanager.hxx"
 #include "propertynode.hxx"
-#include "span.hxx"
 #include "type.hxx"
 #include "valueparser.hxx"
 #include "xmldata.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -75,7 +76,7 @@ bool parseHexDigit(char c, int * value) {
     return false;
 }
 
-bool parseValue(Span const & text, sal_Bool * value) {
+bool parseValue(xmlreader::Span const & text, sal_Bool * value) {
     OSL_ASSERT(text.is() && value != 0);
     if (text.equals(RTL_CONSTASCII_STRINGPARAM("true")) ||
         text.equals(RTL_CONSTASCII_STRINGPARAM("1")))
@@ -92,7 +93,7 @@ bool parseValue(Span const & text, sal_Bool * value) {
     return false;
 }
 
-bool parseValue(Span const & text, sal_Int16 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int16 * value) {
     OSL_ASSERT(text.is() && value != 0);
     // For backwards compatibility, support hexadecimal values:
     sal_Int32 n =
@@ -111,7 +112,7 @@ bool parseValue(Span const & text, sal_Int16 * value) {
     return false;
 }
 
-bool parseValue(Span const & text, sal_Int32 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int32 * value) {
     OSL_ASSERT(text.is() && value != 0);
     // For backwards compatibility, support hexadecimal values:
     *value =
@@ -126,7 +127,7 @@ bool parseValue(Span const & text, sal_Int32 * value) {
     return true;
 }
 
-bool parseValue(Span const & text, sal_Int64 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int64 * value) {
     OSL_ASSERT(text.is() && value != 0);
     // For backwards compatibility, support hexadecimal values:
     *value =
@@ -141,20 +142,22 @@ bool parseValue(Span const & text, sal_Int64 * value) {
     return true;
 }
 
-bool parseValue(Span const & text, double * value) {
+bool parseValue(xmlreader::Span const & text, double * value) {
     OSL_ASSERT(text.is() && value != 0);
     *value = rtl::OString(text.begin, text.length).toDouble();
         //TODO: check valid lexical representation
     return true;
 }
 
-bool parseValue(Span const & text, rtl::OUString * value) {
+bool parseValue(xmlreader::Span const & text, rtl::OUString * value) {
     OSL_ASSERT(text.is() && value != 0);
-    *value = xmldata::convertFromUtf8(text);
+    *value = text.convertFromUtf8();
     return true;
 }
 
-bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) {
+bool parseValue(
+    xmlreader::Span const & text, css::uno::Sequence< sal_Int8 > * value)
+{
     OSL_ASSERT(text.is() && value != 0);
     if ((text.length & 1) != 0) {
         return false;
@@ -174,7 +177,9 @@ bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) {
     return true;
 }
 
-template< typename T > css::uno::Any parseSingleValue(Span const & text) {
+template< typename T > css::uno::Any parseSingleValue(
+    xmlreader::Span const & text)
+{
     T val;
     if (!parseValue(text, &val)) {
         throw css::uno::RuntimeException(
@@ -185,21 +190,23 @@ template< typename T > css::uno::Any parseSingleValue(Span const & text) {
 }
 
 template< typename T > css::uno::Any parseListValue(
-    rtl::OString const & separator, Span const & text)
+    rtl::OString const & separator, xmlreader::Span const & text)
 {
     comphelper::SequenceAsVector< T > seq;
-    Span sep;
+    xmlreader::Span sep;
     if (separator.getLength() == 0) {
-        sep = Span(RTL_CONSTASCII_STRINGPARAM(" "));
+        sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
     } else {
-        sep = Span(separator.getStr(), separator.getLength());
+        sep = xmlreader::Span(separator.getStr(), separator.getLength());
     }
     if (text.length != 0) {
-        for (Span t(text);;) {
+        for (xmlreader::Span t(text);;) {
             sal_Int32 i = rtl_str_indexOfStr_WithLength(
                 t.begin, t.length, sep.begin, sep.length);
             T val;
-            if (!parseValue(Span(t.begin, i == -1 ? t.length : i), &val)) {
+            if (!parseValue(
+                    xmlreader::Span(t.begin, i == -1 ? t.length : i), &val))
+            {
                 throw css::uno::RuntimeException(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
                     css::uno::Reference< css::uno::XInterface >());
@@ -216,7 +223,7 @@ template< typename T > css::uno::Any parseListValue(
 }
 
 css::uno::Any parseValue(
-    rtl::OString const & separator, Span const & text, Type type)
+    rtl::OString const & separator, xmlreader::Span const & text, Type type)
 {
     switch (type) {
     case TYPE_ANY:
@@ -267,7 +274,7 @@ ValueParser::ValueParser(int layer): layer_(layer) {}
 
 ValueParser::~ValueParser() {}
 
-XmlReader::Text ValueParser::getTextMode() const {
+xmlreader::XmlReader::Text ValueParser::getTextMode() const {
     if (node_.is()) {
         switch (state_) {
         case STATE_TEXT:
@@ -279,23 +286,24 @@ XmlReader::Text ValueParser::getTextMode() const {
             return
                 (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
                  separator_.getLength() != 0)
-                ? XmlReader::TEXT_RAW : XmlReader::TEXT_NORMALIZED;
+                ? xmlreader::XmlReader::TEXT_RAW
+                : xmlreader::XmlReader::TEXT_NORMALIZED;
         default:
             break;
         }
     }
-    return XmlReader::TEXT_NONE;
+    return xmlreader::XmlReader::TEXT_NONE;
 }
 
 bool ValueParser::startElement(
-    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
     if (!node_.is()) {
         return false;
     }
     switch (state_) {
     case STATE_TEXT:
-        if (ns == XmlReader::NAMESPACE_NONE &&
+        if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
             isListType(type_) && separator_.getLength() == 0)
         {
@@ -307,18 +315,18 @@ bool ValueParser::startElement(
         }
         // fall through
     case STATE_IT:
-        if (ns == XmlReader::NAMESPACE_NONE &&
+        if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("unicode")) &&
             (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST))
         {
             sal_Int32 scalar = -1;
             for (;;) {
-                XmlReader::Namespace attrNs;
-                Span attrLn;
-                if (!reader.nextAttribute(&attrNs, &attrLn)) {
+                int attrNsId;
+                xmlreader::Span attrLn;
+                if (!reader.nextAttribute(&attrNsId, &attrLn)) {
                     break;
                 }
-                if (attrNs == XmlReader::NAMESPACE_OOR &&
+                if (attrNsId == ParseManager::NAMESPACE_OOR &&
                     attrLn.equals(RTL_CONSTASCII_STRINGPARAM("scalar")))
                 {
                     if (!parseValue(reader.getAttributeValue(true), &scalar)) {
@@ -353,7 +361,7 @@ bool ValueParser::startElement(
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
-         xmldata::convertFromUtf8(name) +
+         name.convertFromUtf8() +
          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
         css::uno::Reference< css::uno::XInterface >());
 }
@@ -440,7 +448,7 @@ bool ValueParser::endElement() {
     return true;
 }
 
-void ValueParser::characters(Span const & text) {
+void ValueParser::characters(xmlreader::Span const & text) {
     if (node_.is()) {
         OSL_ASSERT(state_ == STATE_TEXT || state_ == STATE_IT);
         pad_.add(text.begin, text.length);
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 66f3fafd82..a3ee2310ea 100644..100755
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -37,19 +37,19 @@
 #include "rtl/ref.hxx"
 #include "rtl/string.hxx"
 #include "rtl/ustring.hxx"
+#include "xmlreader/pad.hxx"
+#include "xmlreader/xmlreader.hxx"
 
-#include "pad.hxx"
 #include "type.hxx"
-#include "xmlreader.hxx"
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any;
 } } } }
+namespace xmlreader { struct Span; }
 
 namespace configmgr {
 
 class Node;
-struct Span;
 
 class ValueParser: private boost::noncopyable {
 public:
@@ -57,14 +57,14 @@ public:
 
     ~ValueParser();
 
-    XmlReader::Text getTextMode() const;
+    xmlreader::XmlReader::Text getTextMode() const;
 
     bool startElement(
-        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
 
     bool endElement();
 
-    void characters(Span const & text);
+    void characters(xmlreader::Span const & text);
 
     void start(
         rtl::Reference< Node > const & property,
@@ -84,7 +84,7 @@ private:
     rtl::Reference< Node > node_;
     rtl::OUString localizedName_;
     State state_;
-    Pad pad_;
+    xmlreader::Pad pad_;
     std::vector< com::sun::star::uno::Any > items_;
 };
 
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 7e01aabeb5..fcb1129bba 100644..100755
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -46,6 +46,7 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "xmlreader/span.hxx"
 
 #include "data.hxx"
 #include "groupnode.hxx"
@@ -55,7 +56,6 @@
 #include "node.hxx"
 #include "nodemap.hxx"
 #include "propertynode.hxx"
-#include "span.hxx"
 #include "type.hxx"
 #include "writemodfile.hxx"
 
@@ -342,22 +342,23 @@ void writeNode(
     rtl::Reference< Node > const & parent, rtl::OUString const & name,
     rtl::Reference< Node > const & node)
 {
-    static Span const typeNames[] = {
-        Span(), Span(), Span(), // TYPE_ERROR, TYPE_NIL, TYPE_ANY
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:short")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:int")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:long")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:double")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:string")),
-        Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")),
-        Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) };
+    static xmlreader::Span const typeNames[] = {
+        xmlreader::Span(), xmlreader::Span(), xmlreader::Span(),
+            // TYPE_ERROR, TYPE_NIL, TYPE_ANY
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:short")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:int")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:long")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:double")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:string")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")),
+        xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) };
     switch (node->kind()) {
     case Node::KIND_PROPERTY:
         {
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index 0277bacdc4..0277bacdc4 100644..100755
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 06bb88858d..7c2e21d6c6 100644..100755
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -38,13 +38,14 @@
 #include "rtl/string.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
-#include "span.hxx"
+#include "parsemanager.hxx"
 #include "xcdparser.hxx"
 #include "xcsparser.hxx"
 #include "xcuparser.hxx"
 #include "xmldata.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -60,22 +61,22 @@ XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data & data):
 
 XcdParser::~XcdParser() {}
 
-XmlReader::Text XcdParser::getTextMode() {
+xmlreader::XmlReader::Text XcdParser::getTextMode() {
     return nestedParser_.is()
-        ? nestedParser_->getTextMode() : XmlReader::TEXT_NONE;
+        ? nestedParser_->getTextMode() : xmlreader::XmlReader::TEXT_NONE;
 }
 
 bool XcdParser::startElement(
-    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
     if (nestedParser_.is()) {
         OSL_ASSERT(nesting_ != LONG_MAX);
         ++nesting_;
-        return nestedParser_->startElement(reader, ns, name);
+        return nestedParser_->startElement(reader, nsId, name);
     }
     switch (state_) {
     case STATE_START:
-        if (ns == XmlReader::NAMESPACE_OOR &&
+        if (nsId == ParseManager::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("data")))
         {
             state_ = STATE_DEPENDENCIES;
@@ -83,18 +84,19 @@ bool XcdParser::startElement(
         }
         break;
     case STATE_DEPENDENCIES:
-        if (ns == XmlReader::NAMESPACE_NONE &&
+        if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("dependency")))
         {
             if (dependency_.getLength() == 0) {
-                Span attrFile;
+                xmlreader::Span attrFile;
                 for (;;) {
-                    XmlReader::Namespace attrNs;
-                    Span attrLn;
-                    if (!reader.nextAttribute(&attrNs, &attrLn)) {
+                    int attrNsId;
+                    xmlreader::Span attrLn;
+                    if (!reader.nextAttribute(&attrNsId, &attrLn)) {
                         break;
                     }
-                    if (attrNs == XmlReader::NAMESPACE_NONE && //TODO: _OOR
+                    if (attrNsId == xmlreader::XmlReader::NAMESPACE_NONE &&
+                            //TODO: _OOR
                         attrLn.equals(RTL_CONSTASCII_STRINGPARAM("file")))
                     {
                         attrFile = reader.getAttributeValue(false);
@@ -108,7 +110,7 @@ bool XcdParser::startElement(
                          reader.getUrl()),
                         css::uno::Reference< css::uno::XInterface >());
                 }
-                dependency_ = xmldata::convertFromUtf8(attrFile);
+                dependency_ = attrFile.convertFromUtf8();
                 if (dependency_.getLength() == 0) {
                     throw css::uno::RuntimeException(
                         (rtl::OUString(
@@ -128,19 +130,19 @@ bool XcdParser::startElement(
         state_ = STATE_COMPONENTS;
         // fall through
     case STATE_COMPONENTS:
-        if (ns == XmlReader::NAMESPACE_OOR &&
+        if (nsId == ParseManager::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema")))
         {
             nestedParser_ = new XcsParser(layer_, data_);
             nesting_ = 1;
-            return nestedParser_->startElement(reader, ns, name);
+            return nestedParser_->startElement(reader, nsId, name);
         }
-        if (ns == XmlReader::NAMESPACE_OOR &&
+        if (nsId == ParseManager::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
         {
             nestedParser_ = new XcuParser(layer_ + 1, data_, 0, 0, 0);
             nesting_ = 1;
-            return nestedParser_->startElement(reader, ns, name);
+            return nestedParser_->startElement(reader, nsId, name);
         }
         break;
     default: // STATE_DEPENDENCY
@@ -149,12 +151,12 @@ bool XcdParser::startElement(
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
-         xmldata::convertFromUtf8(name) +
+         name.convertFromUtf8() +
          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
         css::uno::Reference< css::uno::XInterface >());
 }
 
-void XcdParser::endElement(XmlReader const & reader) {
+void XcdParser::endElement(xmlreader::XmlReader const & reader) {
     if (nestedParser_.is()) {
         nestedParser_->endElement(reader);
         if (--nesting_ == 0) {
@@ -175,7 +177,7 @@ void XcdParser::endElement(XmlReader const & reader) {
     }
 }
 
-void XcdParser::characters(Span const & text) {
+void XcdParser::characters(xmlreader::Span const & text) {
     if (nestedParser_.is()) {
         nestedParser_->characters(text);
     }
diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx
index a57646a537..6e98160dfe 100644..100755
--- a/configmgr/source/xcdparser.hxx
+++ b/configmgr/source/xcdparser.hxx
@@ -35,14 +35,15 @@
 
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "parser.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
 
 namespace configmgr {
 
 struct Data;
-struct Span;
 
 class XcdParser: public Parser {
 public:
@@ -53,14 +54,14 @@ public:
 private:
     virtual ~XcdParser();
 
-    virtual XmlReader::Text getTextMode();
+    virtual xmlreader::XmlReader::Text getTextMode();
 
     virtual bool startElement(
-        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
 
-    virtual void endElement(XmlReader const & reader);
+    virtual void endElement(xmlreader::XmlReader const & reader);
 
-    virtual void characters(Span const & text);
+    virtual void characters(xmlreader::Span const & text);
 
     enum State {
         STATE_START, STATE_DEPENDENCIES, STATE_DEPENDENCY, STATE_COMPONENTS };
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 7d28718ff8..c558bd9864 100644..100755
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -42,18 +42,19 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "data.hxx"
 #include "localizedpropertynode.hxx"
 #include "groupnode.hxx"
 #include "node.hxx"
 #include "nodemap.hxx"
+#include "parsemanager.hxx"
 #include "propertynode.hxx"
 #include "setnode.hxx"
-#include "span.hxx"
 #include "xcsparser.hxx"
 #include "xmldata.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -126,18 +127,18 @@ XcsParser::XcsParser(int layer, Data & data):
 
 XcsParser::~XcsParser() {}
 
-XmlReader::Text XcsParser::getTextMode() {
+xmlreader::XmlReader::Text XcsParser::getTextMode() {
     return valueParser_.getTextMode();
 }
 
 bool XcsParser::startElement(
-    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
-    if (valueParser_.startElement(reader, ns, name)) {
+    if (valueParser_.startElement(reader, nsId, name)) {
         return true;
     }
     if (state_ == STATE_START) {
-        if (ns == XmlReader::NAMESPACE_OOR &&
+        if (nsId == ParseManager::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) {
             handleComponentSchema(reader);
             state_ = STATE_COMPONENT_SCHEMA;
@@ -149,7 +150,7 @@ bool XcsParser::startElement(
         // prop constraints; accepting all four at illegal places (and with
         // illegal content):
         if (ignoring_ > 0 ||
-            (ns == XmlReader::NAMESPACE_NONE &&
+            (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
              (name.equals(RTL_CONSTASCII_STRINGPARAM("info")) ||
               name.equals(RTL_CONSTASCII_STRINGPARAM("import")) ||
               name.equals(RTL_CONSTASCII_STRINGPARAM("uses")) ||
@@ -161,7 +162,7 @@ bool XcsParser::startElement(
         }
         switch (state_) {
         case STATE_COMPONENT_SCHEMA:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("templates")))
             {
                 state_ = STATE_TEMPLATES;
@@ -169,7 +170,7 @@ bool XcsParser::startElement(
             }
             // fall through
         case STATE_TEMPLATES_DONE:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("component")))
             {
                 state_ = STATE_COMPONENT;
@@ -184,13 +185,13 @@ bool XcsParser::startElement(
             break;
         case STATE_TEMPLATES:
             if (elements_.empty()) {
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
                 {
                     handleGroup(reader, true);
                     return true;
                 }
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
                 {
                     handleSet(reader, true);
@@ -204,7 +205,7 @@ bool XcsParser::startElement(
             switch (elements_.top().node->kind()) {
             case Node::KIND_PROPERTY:
             case Node::KIND_LOCALIZED_PROPERTY:
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
                 {
                     handlePropValue(reader, elements_.top().node);
@@ -212,25 +213,25 @@ bool XcsParser::startElement(
                 }
                 break;
             case Node::KIND_GROUP:
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
                 {
                     handleProp(reader);
                     return true;
                 }
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("node-ref")))
                 {
                     handleNodeRef(reader);
                     return true;
                 }
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
                 {
                     handleGroup(reader, false);
                     return true;
                 }
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
                 {
                     handleSet(reader, false);
@@ -238,7 +239,7 @@ bool XcsParser::startElement(
                 }
                 break;
             case Node::KIND_SET:
-                if (ns == XmlReader::NAMESPACE_NONE &&
+                if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                     name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
                 {
                     handleSetItem(
@@ -261,12 +262,12 @@ bool XcsParser::startElement(
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
-         xmldata::convertFromUtf8(name) +
+         name.convertFromUtf8() +
          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
         css::uno::Reference< css::uno::XInterface >());
 }
 
-void XcsParser::endElement(XmlReader const & reader) {
+void XcsParser::endElement(xmlreader::XmlReader const & reader) {
     if (valueParser_.endElement()) {
         return;
     }
@@ -343,23 +344,23 @@ void XcsParser::endElement(XmlReader const & reader) {
     }
 }
 
-void XcsParser::characters(Span const & text) {
+void XcsParser::characters(xmlreader::Span const & text) {
     valueParser_.characters(text);
 }
 
-void XcsParser::handleComponentSchema(XmlReader & reader) {
+void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
     //TODO: oor:version, xml:lang attributes
     rtl::OStringBuffer buf;
     buf.append('.');
     bool hasPackage = false;
     bool hasName = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
         {
             if (hasPackage) {
@@ -372,9 +373,9 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             hasPackage = true;
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             buf.insert(0, s.begin, s.length);
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             if (hasName) {
@@ -386,7 +387,7 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             hasName = true;
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             buf.append(s.begin, s.length);
         }
     }
@@ -406,38 +407,36 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
-    componentName_ = xmldata::convertFromUtf8(
-        Span(buf.getStr(), buf.getLength()));
+    componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()).
+        convertFromUtf8();
 }
 
-void XcsParser::handleNodeRef(XmlReader & reader) {
+void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
     bool hasName = false;
     rtl::OUString name;
     rtl::OUString component(componentName_);
     bool hasNodeType = false;
     rtl::OUString nodeType;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
         {
-            component = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            component = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
         {
             hasNodeType = true;
-            nodeType = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
+            nodeType = reader.getAttributeValue(false).convertFromUtf8();
         }
     }
     if (!hasName) {
@@ -466,33 +465,33 @@ void XcsParser::handleNodeRef(XmlReader & reader) {
     elements_.push(Element(node, name));
 }
 
-void XcsParser::handleProp(XmlReader & reader) {
+void XcsParser::handleProp(xmlreader::XmlReader & reader) {
     bool hasName = false;
     rtl::OUString name;
     valueParser_.type_ = TYPE_ERROR;
     bool localized = false;
     bool nillable = true;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
         {
             valueParser_.type_ = xmldata::parseType(
                 reader, reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("localized")))
         {
             localized = xmldata::parseBoolean(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nillable")))
         {
             nillable = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -526,16 +525,16 @@ void XcsParser::handleProp(XmlReader & reader) {
 }
 
 void XcsParser::handlePropValue(
-    XmlReader & reader, rtl::Reference< Node > const & property)
+    xmlreader::XmlReader & reader, rtl::Reference< Node > const & property)
 {
-    Span attrSeparator;
+    xmlreader::Span attrSeparator;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
         {
             attrSeparator = reader.getAttributeValue(false);
@@ -554,22 +553,22 @@ void XcsParser::handlePropValue(
     valueParser_.start(property);
 }
 
-void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) {
+void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
     bool hasName = false;
     rtl::OUString name;
     bool extensible = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("extensible")))
         {
             extensible = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -593,34 +592,32 @@ void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) {
             name));
 }
 
-void XcsParser::handleSet(XmlReader & reader, bool isTemplate) {
+void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
     bool hasName = false;
     rtl::OUString name;
     rtl::OUString component(componentName_);
     bool hasNodeType = false;
     rtl::OUString nodeType;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
         {
-            component = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            component = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
         {
             hasNodeType = true;
-            nodeType = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
+            nodeType = reader.getAttributeValue(false).convertFromUtf8();
         }
     }
     if (!hasName) {
@@ -643,27 +640,25 @@ void XcsParser::handleSet(XmlReader & reader, bool isTemplate) {
             name));
 }
 
-void XcsParser::handleSetItem(XmlReader & reader, SetNode * set) {
+void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) {
     rtl::OUString component(componentName_);
     bool hasNodeType = false;
     rtl::OUString nodeType;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
         {
-            component = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            component = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
         {
             hasNodeType = true;
-            nodeType = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
+            nodeType = reader.getAttributeValue(false).convertFromUtf8();
         }
     }
     set->getAdditionalTemplateNames().push_back(
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
index 43d65a93b4..c259a02eae 100644..100755
--- a/configmgr/source/xcsparser.hxx
+++ b/configmgr/source/xcsparser.hxx
@@ -35,17 +35,18 @@
 
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "node.hxx"
 #include "parser.hxx"
 #include "valueparser.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
 
 namespace configmgr {
 
 class SetNode;
 struct Data;
-struct Span;
 
 class XcsParser: public Parser {
 public:
@@ -54,29 +55,29 @@ public:
 private:
     virtual ~XcsParser();
 
-    virtual XmlReader::Text getTextMode();
+    virtual xmlreader::XmlReader::Text getTextMode();
 
     virtual bool startElement(
-        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
 
-    virtual void endElement(XmlReader const & reader);
+    virtual void endElement(xmlreader::XmlReader const & reader);
 
-    virtual void characters(Span const & text);
+    virtual void characters(xmlreader::Span const & text);
 
-    void handleComponentSchema(XmlReader & reader);
+    void handleComponentSchema(xmlreader::XmlReader & reader);
 
-    void handleNodeRef(XmlReader & reader);
+    void handleNodeRef(xmlreader::XmlReader & reader);
 
-    void handleProp(XmlReader & reader);
+    void handleProp(xmlreader::XmlReader & reader);
 
     void handlePropValue(
-        XmlReader & reader, rtl::Reference< Node > const & property);
+        xmlreader::XmlReader & reader, rtl::Reference< Node > const & property);
 
-    void handleGroup(XmlReader & reader, bool isTemplate);
+    void handleGroup(xmlreader::XmlReader & reader, bool isTemplate);
 
-    void handleSet(XmlReader & reader, bool isTemplate);
+    void handleSet(xmlreader::XmlReader & reader, bool isTemplate);
 
-    void handleSetItem(XmlReader & reader, SetNode * set);
+    void handleSetItem(xmlreader::XmlReader & reader, SetNode * set);
 
     enum State {
         STATE_START, STATE_COMPONENT_SCHEMA, STATE_TEMPLATES,
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 44eb445333..3a81ea4e36 100644..100755
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -42,6 +42,8 @@
 #include "rtl/string.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "data.hxx"
 #include "localizedpropertynode.hxx"
@@ -50,14 +52,13 @@
 #include "modifications.hxx"
 #include "node.hxx"
 #include "nodemap.hxx"
+#include "parsemanager.hxx"
 #include "partial.hxx"
 #include "path.hxx"
 #include "propertynode.hxx"
 #include "setnode.hxx"
-#include "span.hxx"
 #include "xcuparser.hxx"
 #include "xmldata.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -80,22 +81,22 @@ XcuParser::XcuParser(
 
 XcuParser::~XcuParser() {}
 
-XmlReader::Text XcuParser::getTextMode() {
+xmlreader::XmlReader::Text XcuParser::getTextMode() {
     return valueParser_.getTextMode();
 }
 
 bool XcuParser::startElement(
-    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+    xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
 {
-    if (valueParser_.startElement(reader, ns, name)) {
+    if (valueParser_.startElement(reader, nsId, name)) {
         return true;
     }
     if (state_.empty()) {
-        if (ns == XmlReader::NAMESPACE_OOR &&
+        if (nsId == ParseManager::NAMESPACE_OOR &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
         {
             handleComponentData(reader);
-        } else if (ns == XmlReader::NAMESPACE_OOR &&
+        } else if (nsId == ParseManager::NAMESPACE_OOR &&
                    name.equals(RTL_CONSTASCII_STRINGPARAM("items")))
         {
             state_.push(State(rtl::Reference< Node >(), false));
@@ -103,7 +104,7 @@ bool XcuParser::startElement(
             throw css::uno::RuntimeException(
                 (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("bad root element <")) +
-                 xmldata::convertFromUtf8(name) +
+                 name.convertFromUtf8() +
                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                  reader.getUrl()),
                 css::uno::Reference< css::uno::XInterface >());
@@ -111,7 +112,7 @@ bool XcuParser::startElement(
     } else if (state_.top().ignore) {
         state_.push(State(false));
     } else if (!state_.top().node.is()) {
-        if (ns == XmlReader::NAMESPACE_NONE &&
+        if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
             name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
         {
             handleItem(reader);
@@ -119,7 +120,7 @@ bool XcuParser::startElement(
             throw css::uno::RuntimeException(
                 (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("bad items node member <")) +
-                 xmldata::convertFromUtf8(name) +
+                 name.convertFromUtf8() +
                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                  reader.getUrl()),
                 css::uno::Reference< css::uno::XInterface >());
@@ -127,7 +128,7 @@ bool XcuParser::startElement(
     } else {
         switch (state_.top().node->kind()) {
         case Node::KIND_PROPERTY:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
             {
                 handlePropValue(
@@ -138,14 +139,14 @@ bool XcuParser::startElement(
                     (rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM(
                             "bad property node member <")) +
-                     xmldata::convertFromUtf8(name) +
+                     name.convertFromUtf8() +
                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
             break;
         case Node::KIND_LOCALIZED_PROPERTY:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
             {
                 handleLocpropValue(
@@ -157,7 +158,7 @@ bool XcuParser::startElement(
                     (rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM(
                             "bad localized property node member <")) +
-                     xmldata::convertFromUtf8(name) +
+                     name.convertFromUtf8() +
                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
@@ -166,18 +167,18 @@ bool XcuParser::startElement(
         case Node::KIND_LOCALIZED_VALUE:
             throw css::uno::RuntimeException(
                 (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
-                 xmldata::convertFromUtf8(name) +
+                 name.convertFromUtf8() +
                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                  reader.getUrl()),
                 css::uno::Reference< css::uno::XInterface >());
         case Node::KIND_GROUP:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
             {
                 handleGroupProp(
                     reader,
                     dynamic_cast< GroupNode * >(state_.top().node.get()));
-            } else if (ns == XmlReader::NAMESPACE_NONE &&
+            } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                        name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
             {
                 handleGroupNode(reader, state_.top().node);
@@ -186,19 +187,19 @@ bool XcuParser::startElement(
                     (rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM(
                             "bad group node member <")) +
-                     xmldata::convertFromUtf8(name) +
+                     name.convertFromUtf8() +
                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
             break;
         case Node::KIND_SET:
-            if (ns == XmlReader::NAMESPACE_NONE &&
+            if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                 name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
             {
                 handleSetNode(
                     reader, dynamic_cast< SetNode * >(state_.top().node.get()));
-            } else if (ns == XmlReader::NAMESPACE_NONE &&
+            } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
                        name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
             {
                 OSL_TRACE(
@@ -210,7 +211,7 @@ bool XcuParser::startElement(
                 throw css::uno::RuntimeException(
                     (rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM("bad set node member <")) +
-                     xmldata::convertFromUtf8(name) +
+                     name.convertFromUtf8() +
                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
@@ -221,7 +222,7 @@ bool XcuParser::startElement(
     return true;
 }
 
-void XcuParser::endElement(XmlReader const &) {
+void XcuParser::endElement(xmlreader::XmlReader const &) {
     if (valueParser_.endElement()) {
         return;
     }
@@ -246,11 +247,11 @@ void XcuParser::endElement(XmlReader const &) {
     }
 }
 
-void XcuParser::characters(Span const & text) {
+void XcuParser::characters(xmlreader::Span const & text) {
     valueParser_.characters(text);
 }
 
-XcuParser::Operation XcuParser::parseOperation(Span const & text) {
+XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
     OSL_ASSERT(text.is());
     if (text.equals(RTL_CONSTASCII_STRINGPARAM("modify"))) {
         return OPERATION_MODIFY;
@@ -266,11 +267,11 @@ XcuParser::Operation XcuParser::parseOperation(Span const & text) {
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid op ")) +
-         xmldata::convertFromUtf8(text)),
+         text.convertFromUtf8()),
         css::uno::Reference< css::uno::XInterface >());
 }
 
-void XcuParser::handleComponentData(XmlReader & reader) {
+void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
     rtl::OStringBuffer buf;
     buf.append('.');
     bool hasPackage = false;
@@ -278,12 +279,12 @@ void XcuParser::handleComponentData(XmlReader & reader) {
     Operation op = OPERATION_MODIFY;
     bool finalized = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
         {
             if (hasPackage) {
@@ -296,9 +297,9 @@ void XcuParser::handleComponentData(XmlReader & reader) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             hasPackage = true;
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             buf.insert(0, s.begin, s.length);
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             if (hasName) {
@@ -310,13 +311,13 @@ void XcuParser::handleComponentData(XmlReader & reader) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             hasName = true;
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             buf.append(s.begin, s.length);
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
             op = parseOperation(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
         {
             finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -338,8 +339,8 @@ void XcuParser::handleComponentData(XmlReader & reader) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
-    componentName_ = xmldata::convertFromUtf8(
-        Span(buf.getStr(), buf.getLength()));
+    componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()).
+        convertFromUtf8();
     if (trackPath_) {
         OSL_ASSERT(path_.empty());
         path_.push_back(componentName_);
@@ -381,15 +382,15 @@ void XcuParser::handleComponentData(XmlReader & reader) {
     state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
 }
 
-void XcuParser::handleItem(XmlReader & reader) {
-    Span attrPath;
+void XcuParser::handleItem(xmlreader::XmlReader & reader) {
+    xmlreader::Span attrPath;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("path")))
         {
             attrPath = reader.getAttributeValue(false);
@@ -402,7 +403,7 @@ void XcuParser::handleItem(XmlReader & reader) {
              reader.getUrl()),
             css::uno::Reference< css::uno::XInterface >());
     }
-    rtl::OUString path(xmldata::convertFromUtf8(attrPath));
+    rtl::OUString path(attrPath.convertFromUtf8());
     int finalizedLayer;
     rtl::Reference< Node > node(
         data_.resolvePathRepresentation(
@@ -447,21 +448,23 @@ void XcuParser::handleItem(XmlReader & reader) {
     state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
 }
 
-void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
+void XcuParser::handlePropValue(
+    xmlreader::XmlReader & reader, PropertyNode * prop)
+ {
     bool nil = false;
     rtl::OString separator;
     rtl::OUString external;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_XSI &&
+        if (attrNsId == ParseManager::NAMESPACE_XSI &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
         {
             nil = xmldata::parseBoolean(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
         {
             Type type = xmldata::parseType(
@@ -474,10 +477,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             valueParser_.type_ = type;
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
         {
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             if (s.length == 0) {
                 throw css::uno::RuntimeException(
                     (rtl::OUString(
@@ -487,10 +490,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
                     css::uno::Reference< css::uno::XInterface >());
             }
             separator = rtl::OString(s.begin, s.length);
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
         {
-            external = xmldata::convertFromUtf8(reader.getAttributeValue(true));
+            external = reader.getAttributeValue(true).convertFromUtf8();
             if (external.getLength() == 0) {
                 throw css::uno::RuntimeException(
                     (rtl::OUString(
@@ -530,27 +533,27 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
 }
 
 void XcuParser::handleLocpropValue(
-    XmlReader & reader, LocalizedPropertyNode * locprop)
+    xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop)
 {
     rtl::OUString name;
     bool nil = false;
     rtl::OString separator;
     Operation op = OPERATION_FUSE;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_XML &&
+        if (attrNsId == xmlreader::XmlReader::NAMESPACE_XML &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("lang")))
         {
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_XSI &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_XSI &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
         {
             nil = xmldata::parseBoolean(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
         {
             Type type = xmldata::parseType(
@@ -563,10 +566,10 @@ void XcuParser::handleLocpropValue(
                     css::uno::Reference< css::uno::XInterface >());
             }
             valueParser_.type_ = type;
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
         {
-            Span s(reader.getAttributeValue(false));
+            xmlreader::Span s(reader.getAttributeValue(false));
             if (s.length == 0) {
                 throw css::uno::RuntimeException(
                     (rtl::OUString(
@@ -576,7 +579,7 @@ void XcuParser::handleLocpropValue(
                     css::uno::Reference< css::uno::XInterface >());
             }
             separator = rtl::OString(s.begin, s.length);
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
             op = parseOperation(reader.getAttributeValue(true));
@@ -652,32 +655,34 @@ void XcuParser::handleLocpropValue(
     }
 }
 
-void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
+void XcuParser::handleGroupProp(
+    xmlreader::XmlReader & reader, GroupNode * group)
+{
     bool hasName = false;
     rtl::OUString name;
     Type type = TYPE_ERROR;
     Operation op = OPERATION_MODIFY;
     bool finalized = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
         {
             type = xmldata::parseType(reader, reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
             op = parseOperation(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
         {
             finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -727,8 +732,8 @@ void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
 }
 
 void XcuParser::handleUnknownGroupProp(
-    XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
-    Type type, Operation operation, bool finalized)
+    xmlreader::XmlReader const & reader, GroupNode * group,
+    rtl::OUString const & name, Type type, Operation operation, bool finalized)
 {
     switch (operation) {
     case OPERATION_REPLACE:
@@ -768,7 +773,7 @@ void XcuParser::handleUnknownGroupProp(
 }
 
 void XcuParser::handlePlainGroupProp(
-    XmlReader const & reader, GroupNode * group,
+    xmlreader::XmlReader const & reader, GroupNode * group,
     NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
     Type type, Operation operation, bool finalized)
 {
@@ -822,7 +827,7 @@ void XcuParser::handlePlainGroupProp(
 }
 
 void XcuParser::handleLocalizedGroupProp(
-    XmlReader const & reader, LocalizedPropertyNode * property,
+    xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
     rtl::OUString const & name, Type type, Operation operation, bool finalized)
 {
     if (property->getLayer() > valueParser_.getLayer()) {
@@ -880,28 +885,28 @@ void XcuParser::handleLocalizedGroupProp(
 }
 
 void XcuParser::handleGroupNode(
-    XmlReader & reader, rtl::Reference< Node > const & group)
+    xmlreader::XmlReader & reader, rtl::Reference< Node > const & group)
 {
     bool hasName = false;
     rtl::OUString name;
     Operation op = OPERATION_MODIFY;
     bool finalized = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
             op = parseOperation(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
         {
             finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -951,7 +956,7 @@ void XcuParser::handleGroupNode(
             state_.top().locked || finalizedLayer < valueParser_.getLayer()));
 }
 
-void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
+void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
     bool hasName = false;
     rtl::OUString name;
     rtl::OUString component(componentName_);
@@ -961,36 +966,34 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
     bool finalized = false;
     bool mandatory = false;
     for (;;) {
-        XmlReader::Namespace attrNs;
-        Span attrLn;
-        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+        int attrNsId;
+        xmlreader::Span attrLn;
+        if (!reader.nextAttribute(&attrNsId, &attrLn)) {
             break;
         }
-        if (attrNs == XmlReader::NAMESPACE_OOR &&
+        if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
         {
             hasName = true;
-            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            name = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
         {
-            component = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            component = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
         {
             hasNodeType = true;
-            nodeType = xmldata::convertFromUtf8(
-                reader.getAttributeValue(false));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            nodeType = reader.getAttributeValue(false).convertFromUtf8();
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
             op = parseOperation(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
         {
             finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
-        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+        } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("mandatory")))
         {
             mandatory = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -1097,17 +1100,25 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
         }
         break;
     case OPERATION_REMOVE:
-        // Ignore removal of unknown members, members finalized in a lower
-        // layer, and members made mandatory in this or a lower layer:
-        if (i != set->getMembers().end() && !state_.top().locked &&
-            finalizedLayer >= valueParser_.getLayer() &&
-            mandatoryLayer > valueParser_.getLayer())
         {
-            set->getMembers().erase(i);
+            // Ignore removal of unknown members, members finalized in a lower
+            // layer, and members made mandatory in this or a lower layer;
+            // forget about user-layer removals that no longer remove anything
+            // (so that paired additions/removals in the user layer do not grow
+            // registrymodifications.xcu unbounded):
+            bool known = i != set->getMembers().end();
+            if (known && !state_.top().locked &&
+                finalizedLayer >= valueParser_.getLayer() &&
+                mandatoryLayer > valueParser_.getLayer())
+            {
+                set->getMembers().erase(i);
+            }
+            state_.push(State(true));
+            if (known) {
+                recordModification(false);
+            }
+            break;
         }
-        state_.push(State(true));
-        recordModification(false);
-        break;
     }
 }
 
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
index e4d91d3093..dda51d254f 100644..100755
--- a/configmgr/source/xcuparser.hxx
+++ b/configmgr/source/xcuparser.hxx
@@ -35,6 +35,7 @@
 
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "additions.hxx"
 #include "node.hxx"
@@ -44,7 +45,8 @@
 #include "type.hxx"
 #include "valueparser.hxx"
 #include "xmldata.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
 
 namespace configmgr {
 
@@ -55,7 +57,6 @@ class Partial;
 class PropertyNode;
 class SetNode;
 struct Data;
-struct Span;
 
 class XcuParser: public Parser {
 public:
@@ -66,49 +67,50 @@ public:
 private:
     virtual ~XcuParser();
 
-    virtual XmlReader::Text getTextMode();
+    virtual xmlreader::XmlReader::Text getTextMode();
 
     virtual bool startElement(
-        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+        xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
 
-    virtual void endElement(XmlReader const & reader);
+    virtual void endElement(xmlreader::XmlReader const & reader);
 
-    virtual void characters(Span const & span);
+    virtual void characters(xmlreader::Span const & span);
 
     enum Operation {
         OPERATION_MODIFY, OPERATION_REPLACE, OPERATION_FUSE, OPERATION_REMOVE };
 
-    static Operation parseOperation(Span const & text);
+    static Operation parseOperation(xmlreader::Span const & text);
 
-    void handleComponentData(XmlReader & reader);
+    void handleComponentData(xmlreader::XmlReader & reader);
 
-    void handleItem(XmlReader & reader);
+    void handleItem(xmlreader::XmlReader & reader);
 
-    void handlePropValue(XmlReader & reader, PropertyNode * prop);
+    void handlePropValue(xmlreader::XmlReader & reader, PropertyNode * prop);
 
     void handleLocpropValue(
-        XmlReader & reader, LocalizedPropertyNode * locprop);
+        xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop);
 
-    void handleGroupProp(XmlReader & reader, GroupNode * group);
+    void handleGroupProp(xmlreader::XmlReader & reader, GroupNode * group);
 
     void handleUnknownGroupProp(
-        XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
-        Type type, Operation operation, bool finalized);
+        xmlreader::XmlReader const & reader, GroupNode * group,
+        rtl::OUString const & name, Type type, Operation operation,
+        bool finalized);
 
     void handlePlainGroupProp(
-        XmlReader const & reader, GroupNode * group,
+        xmlreader::XmlReader const & reader, GroupNode * group,
         NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
         Type type, Operation operation, bool finalized);
 
     void handleLocalizedGroupProp(
-        XmlReader const & reader, LocalizedPropertyNode * property,
+        xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
         rtl::OUString const & name, Type type, Operation operation,
         bool finalized);
 
     void handleGroupNode(
-        XmlReader & reader, rtl::Reference< Node > const & group);
+        xmlreader::XmlReader & reader, rtl::Reference< Node > const & group);
 
-    void handleSetNode(XmlReader & reader, SetNode * set);
+    void handleSetNode(xmlreader::XmlReader & reader, SetNode * set);
 
     void recordModification(bool addition);
 
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 07cbd6f2c8..5120506bfb 100644..100755
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -41,12 +41,12 @@
 #include "rtl/ref.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/string.h"
-#include "rtl/textcvt.h"
-#include "rtl/textenc.h"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
 
 #include "data.hxx"
 #include "groupnode.hxx"
@@ -58,9 +58,7 @@
 #include "parser.hxx"
 #include "propertynode.hxx"
 #include "setnode.hxx"
-#include "span.hxx"
 #include "type.hxx"
-#include "xmlreader.hxx"
 
 namespace configmgr {
 
@@ -72,90 +70,88 @@ namespace css = com::sun::star;
 
 }
 
-rtl::OUString convertFromUtf8(Span const & text) {
-    OSL_ASSERT(text.is());
-    rtl_uString * s = 0;
-    if (!rtl_convertStringToUString(
-            &s, text.begin, text.length, RTL_TEXTENCODING_UTF8,
-            (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
-             RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
-             RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
-    {
-        throw css::uno::RuntimeException(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("cannot convert from UTF-8")),
-            css::uno::Reference< css::uno::XInterface >());
-    }
-    return rtl::OUString(s, SAL_NO_ACQUIRE);
-}
-
-Type parseType(XmlReader const & reader, Span const & text) {
+Type parseType(
+    xmlreader::XmlReader const & reader, xmlreader::Span const & text)
+{
     OSL_ASSERT(text.is());
     sal_Int32 i = rtl_str_indexOfChar_WithLength(text.begin, text.length, ':');
     if (i >= 0) {
-        switch (reader.getNamespace(Span(text.begin, i))) {
-        case XmlReader::NAMESPACE_OOR:
-            if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                    RTL_CONSTASCII_STRINGPARAM("any")))
+        switch (reader.getNamespaceId(xmlreader::Span(text.begin, i))) {
+        case ParseManager::NAMESPACE_OOR:
+            if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
+                equals(RTL_CONSTASCII_STRINGPARAM("any")))
             {
                 return TYPE_ANY;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("boolean-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("boolean-list")))
             {
                 return TYPE_BOOLEAN_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("short-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("short-list")))
             {
                 return TYPE_SHORT_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("int-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("int-list")))
             {
                 return TYPE_INT_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("long-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("long-list")))
             {
                 return TYPE_LONG_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("double-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("double-list")))
             {
                 return TYPE_DOUBLE_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("string-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("string-list")))
             {
                 return TYPE_STRING_LIST;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("hexBinary-list")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("hexBinary-list")))
             {
                 return TYPE_HEXBINARY_LIST;
             }
             break;
-        case XmlReader::NAMESPACE_XS:
-            if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                    RTL_CONSTASCII_STRINGPARAM("boolean")))
+        case ParseManager::NAMESPACE_XS:
+            if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
+                equals(RTL_CONSTASCII_STRINGPARAM("boolean")))
             {
                 return TYPE_BOOLEAN;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("short")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("short")))
             {
                 return TYPE_SHORT;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("int")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("int")))
             {
                 return TYPE_INT;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("long")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("long")))
             {
                 return TYPE_LONG;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("double")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("double")))
             {
                 return TYPE_DOUBLE;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("string")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("string")))
             {
                 return TYPE_STRING;
-            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
-                           RTL_CONSTASCII_STRINGPARAM("hexBinary")))
+            } else if (xmlreader::Span(
+                           text.begin + i + 1, text.length - (i + 1)).
+                       equals(RTL_CONSTASCII_STRINGPARAM("hexBinary")))
             {
                 return TYPE_HEXBINARY;
             }
@@ -166,11 +162,11 @@ Type parseType(XmlReader const & reader, Span const & text) {
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid type ")) +
-         convertFromUtf8(text)),
+         text.convertFromUtf8()),
         css::uno::Reference< css::uno::XInterface >());
 }
 
-bool parseBoolean(Span const & text) {
+bool parseBoolean(xmlreader::Span const & text) {
     OSL_ASSERT(text.is());
     if (text.equals(RTL_CONSTASCII_STRINGPARAM("true"))) {
         return true;
@@ -180,7 +176,7 @@ bool parseBoolean(Span const & text) {
     }
     throw css::uno::RuntimeException(
         (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid boolean ")) +
-         convertFromUtf8(text)),
+         text.convertFromUtf8()),
         css::uno::Reference< css::uno::XInterface >());
 }
 
diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx
index 36034f3f96..2b35adaae4 100644..100755
--- a/configmgr/source/xmldata.hxx
+++ b/configmgr/source/xmldata.hxx
@@ -34,19 +34,19 @@
 #include "type.hxx"
 
 namespace rtl { class OUString; }
+namespace xmlreader {
+    class XmlReader;
+    struct Span;
+}
 
 namespace configmgr {
 
-class XmlReader;
-struct Span;
-
 namespace xmldata {
 
-rtl::OUString convertFromUtf8(Span const & text);
-
-Type parseType(XmlReader const & reader, Span const & text);
+Type parseType(
+    xmlreader::XmlReader const & reader, xmlreader::Span const & text);
 
-bool parseBoolean(Span const & text);
+bool parseBoolean(xmlreader::Span const & text);
 
 rtl::OUString parseTemplateReference(
     rtl::OUString const & component, bool hasNodeType,
diff --git a/configmgr/source/xmlreader.cxx b/configmgr/source/xmlreader.cxx
index 49963ca318..49963ca318 100644..100755
--- a/configmgr/source/xmlreader.cxx
+++ b/configmgr/source/xmlreader.cxx
diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx
index c5436fea81..c5436fea81 100644..100755
--- a/configmgr/source/xmlreader.hxx
+++ b/configmgr/source/xmlreader.hxx
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
index a10f07dbc4..a10f07dbc4 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index 214f8fd5ec..214f8fd5ec 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 11ab3e61c5..11ab3e61c5 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
index 4f7b3d04dc..4f7b3d04dc 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index 6e2bc1099d..6e2bc1099d 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 8a1af51919..8a1af51919 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 536e72d0c8..536e72d0c8 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
index f72d397ba8..f72d397ba8 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index a95ef2ac5d..a95ef2ac5d 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index ce9581b934..ce9581b934 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
diff --git a/connectivity/dbtools.pmk b/connectivity/dbtools.pmk
index df10209932..df10209932 100644..100755
--- a/connectivity/dbtools.pmk
+++ b/connectivity/dbtools.pmk
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx
index f524a34a0c..f524a34a0c 100644..100755
--- a/connectivity/inc/connectivity/BlobHelper.hxx
+++ b/connectivity/inc/connectivity/BlobHelper.hxx
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index 494db79b06..494db79b06 100644..100755
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index 8172d29f48..8172d29f48 100644..100755
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
index caa05b1e74..caa05b1e74 100644..100755
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ b/connectivity/inc/connectivity/DateConversion.hxx
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index 6b2e26520f..6b2e26520f 100644..100755
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 65d86eddd3..65d86eddd3 100644..100755
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index 9d20b4f863..9d20b4f863 100644..100755
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index f929085a5e..16e013237d 100644..100755
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -126,15 +126,27 @@ namespace connectivity
         class OOO_DLLPUBLIC_DBTOOLS OOrderColumn :
             public OOrderColumn_BASE, public OOrderColumn_PROP
         {
-            sal_Bool		m_bAscending;
-            sal_Bool		m_bOrder;
+            const   sal_Bool        m_bAscending;
+            const   ::rtl::OUString m_sTableName;
+
         protected:
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
 
             virtual ~OOrderColumn();
         public:
-            OOrderColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase,sal_Bool _bAscending);
+            OOrderColumn(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+                const ::rtl::OUString& i_rOriginatingTableName,
+                sal_Bool _bCase,
+                sal_Bool _bAscending
+            );
+
+            OOrderColumn(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+                sal_Bool _bCase,
+                sal_Bool _bAscending
+            );
 
             virtual void construct();
 
diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx
index 17218ccf67..17218ccf67 100644..100755
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/connectivity/ParameterCont.hxx
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx
index 14d3dcf5f4..14d3dcf5f4 100644..100755
--- a/connectivity/inc/connectivity/SQLStatementHelper.hxx
+++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index 4dce682657..4dce682657 100644..100755
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index e325d0854e..e325d0854e 100644..100755
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 4ce05eab83..4ce05eab83 100644..100755
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 57214197a4..57214197a4 100644..100755
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index e22e71d05f..e22e71d05f 100644..100755
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index cdbaae2618..cdbaae2618 100644..100755
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index 1c4a36295d..1c4a36295d 100644..100755
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index b79cb8e2e9..b79cb8e2e9 100644..100755
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index bcd67a94af..bcd67a94af 100644..100755
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx
index 0c92da7270..0c92da7270 100644..100755
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/connectivity/inc/connectivity/conncleanup.hxx
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index 015d441a5d..015d441a5d 100644..100755
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index 851a65fe8a..e52294ba02 100644..100755
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -99,17 +99,18 @@ namespace dbtools
                              const double& rValue,
                              sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException);
 
-        static double getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& xVariant, const ::com::sun::star::util::Date& rNullDate,
-                                    sal_Int16 nKeyType);
+        static double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& xVariant, const ::com::sun::star::util::Date& rNullDate );
 
         // get the columnvalue as string with a default format given by the column or a default format
         // for the type
-        static ::rtl::OUString getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+        static ::rtl::OUString getFormattedValue(
+                                        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
                                         const ::com::sun::star::lang::Locale& _rLocale,
                                         const ::com::sun::star::util::Date& rNullDate);
 
-        static ::rtl::OUString getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
+        static ::rtl::OUString getFormattedValue(
+                                        const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
                                         const ::com::sun::star::util::Date& rNullDate,
                                         sal_Int32 nKey,
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index 1da9f273aa..1da9f273aa 100644..100755
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index f50e15c421..f50e15c421 100644..100755
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index a22e489724..a22e489724 100644..100755
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
index 290744307d..290744307d 100644..100755
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index 3d720a1a21..a39e57ac35 100644..100755
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -34,7 +34,8 @@
 #include <com/sun/star/sdb/XSQLQueryComposer.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 /** === end UNO includes === **/
-#include <rtl/ustring.hxx>
+
+#include <rtl/ustrbuf.hxx>
 
 #include <vector>
 #include "connectivity/dbtoolsdllapi.hxx"
@@ -112,10 +113,10 @@ namespace dbtools
 
         /** appends one filter component to the statement in our composer
         */
-        void    appendFilterComponent( ::rtl::OUString& /* [inout] */ _rAppendTo, const ::rtl::OUString& _rComponent ) const;
+        void    appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const;
 
         /// checks whether there is only one (or even no) non-empty filter component
-        bool    isThereAtMostOneComponent( ::rtl::OUString& _rOnlyComponent ) const;
+        bool    isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const;
 
         /// returns the index of the first filter component which should be considered when building the composed filter
         inline  sal_Int32   getFirstApplicableFilterIndex() const
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index db7cbf5643..db7cbf5643 100644..100755
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 741d95d5f6..741d95d5f6 100644..100755
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index 962d351331..962d351331 100644..100755
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index 7c04fd352f..7c04fd352f 100644..100755
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
index 845d0f9db1..845d0f9db1 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 0f514fcbf2..0f514fcbf2 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 2ab4d895e1..2ab4d895e1 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 9a5948f862..9a5948f862 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index 99e4bdf212..99e4bdf212 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 55a6cf6f9d..55a6cf6f9d 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 34a86d370b..34a86d370b 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index 97cfacbc45..97cfacbc45 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index a6772d322b..a6772d322b 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index e68e8e5352..e68e8e5352 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index ae14d06f39..ae14d06f39 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
index 5f6264a9eb..5f6264a9eb 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index 8cb0ec4d9b..8cb0ec4d9b 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 33617ff9c7..33617ff9c7 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index afccfc9381..afccfc9381 100644..100755
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 0593aa11e1..0593aa11e1 100644..100755
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index ba9e029133..ba9e029133 100644..100755
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 531f1acbce..531f1acbce 100644..100755
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx
index 42765e9ae3..42765e9ae3 100644..100755
--- a/connectivity/inc/connectivity/standardsqlstate.hxx
+++ b/connectivity/inc/connectivity/standardsqlstate.hxx
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index 37c3ab69d0..37c3ab69d0 100644..100755
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index 1760a9c835..9bbb57e433 100644..100755
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -257,17 +257,16 @@ namespace connectivity
 
             virtual double getValue(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
-                const ::com::sun::star::util::Date& rNullDate,
-                sal_Int16 nKeyType) const = 0;
+                const ::com::sun::star::util::Date& rNullDate ) const = 0;
 
-            virtual ::rtl::OUString getValue(
+            virtual ::rtl::OUString getFormattedValue(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
                 const ::com::sun::star::util::Date& _rNullDate,
                 sal_Int32 _nKey,
                 sal_Int16 _nKeyType) const = 0;
 
-            virtual ::rtl::OUString getValue(
+            virtual ::rtl::OUString getFormattedValue(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
                 const ::com::sun::star::lang::Locale& _rLocale,
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index 0836400278..0836400278 100644..100755
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 51a3f225b3..51a3f225b3 100644..100755
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/inc/makefile.mk
diff --git a/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx
index f89074e28c..f89074e28c 100644..100755
--- a/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/connectivity/inc/pch/precompiled_connectivity.cxx
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index 00686e5020..00686e5020 100644..100755
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 3998ac8253..796e50455d 100644..100755
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    shell  l10n comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  L10N:l10n comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
@@ -28,5 +28,5 @@ cn  connectivity\source\parse                       nmake   -   all cn_parse cn_
 cn  connectivity\source\simpledbt                   nmake   -   all cn_simpledbt cn_cmtools cn_inc NULL
 cn  connectivity\source\dbtools                     nmake   -   all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
 cn  connectivity\qa\connectivity\tools              nmake   -   all cn_qa_tools cn_inc NULL
+cn  connectivity\qa                                 nmake   -   all cn_qa cn_inc NULL
 cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
-
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index e116ee5740..22bffa6382 100644..100755
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -2,6 +2,7 @@
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
 ..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -31,3 +32,20 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
 ..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
 ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
 ..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
+..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component
+..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component
+..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component
+..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
+..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
+..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
+..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
+..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
+..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
+..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
+..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
+..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
+..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
+..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
+..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
+..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
+..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
diff --git a/connectivity/qa/drivers/dbase/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java
index a12a6a4cdd..f2e998156c 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseDriverTest.java
+++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java
@@ -24,36 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity;
 
-import com.sun.star.sdbc.*;
+import complex.connectivity.dbase.DBaseDateFunctions;
+import complex.connectivity.dbase.DBaseStringFunctions;
+import complex.connectivity.dbase.DBaseSqlTests;
+import complex.connectivity.dbase.DBaseNumericFunctions;
 import com.sun.star.lang.XMultiServiceFactory;
 import complexlib.ComplexTestCase;
-import java.util.*;
-import java.io.*;
 import share.LogWriter;
-//import complex.connectivity.DBaseStringFunctions;
 
-public class DBaseDriverTest extends ComplexTestCase
+public class DBaseDriverTest extends ComplexTestCase implements TestCase
 {
-
-    private static Properties props = new Properties();
-    private XDriver m_xDiver;
-    private String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
-
-    static
-    {
-        try
-        {
-            String propsFile = "test.properties";
-            props.load(new FileInputStream(propsFile));
-        }
-        catch (Exception ex)
-        {
-            throw new RuntimeException(ex);
-        }
-    }
-
     public String[] getTestMethodNames()
     {
         return new String[]
@@ -62,19 +44,21 @@ public class DBaseDriverTest extends ComplexTestCase
                 };
     }
 
+    @Override
     public String getTestObjectName()
     {
         return "DBaseDriverTest";
     }
 
-    public void assure2(String s, boolean b)
+    @Override
+    public void assure( final String i_message, final boolean i_condition )
     {
-        assure(s, b);
+        super.assure( i_message, i_condition );
     }
 
     public LogWriter getLog()
     {
-        return log;
+        return ComplexTestCase.log;
     }
 
     public void Functions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
diff --git a/connectivity/qa/complex/connectivity/FlatFileAccess.java b/connectivity/qa/complex/connectivity/FlatFileAccess.java
new file mode 100755
index 0000000000..3f04816848
--- /dev/null
+++ b/connectivity/qa/complex/connectivity/FlatFileAccess.java
@@ -0,0 +1,237 @@
+package complex.connectivity;
+
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.CommandType;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.util.Date;
+import complexlib.ComplexTestCase;
+import connectivity.tools.CsvDatabase;
+import connectivity.tools.RowSet;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FlatFileAccess extends ComplexTestCase
+{
+    public FlatFileAccess()
+    {
+        super();
+    }
+
+    @Override
+    public String[] getTestMethodNames()
+    {
+        return new String[] {
+            "testBasicAccess",
+            "testCalendarFunctions",
+            "testSortingByFunction"
+        };
+    }
+
+    @Override
+    public String getTestObjectName()
+    {
+        return "FlatFileAccess";
+    }
+
+    public void before() throws Exception
+    {
+        m_database = new CsvDatabase( (XMultiServiceFactory)param.getMSF() );
+
+        // proper settings
+        final XPropertySet dataSourceSettings = m_database.getDataSource().geSettings();
+        dataSourceSettings.setPropertyValue( "Extension", "csv" );
+        dataSourceSettings.setPropertyValue( "HeaderLine", Boolean.TRUE );
+        dataSourceSettings.setPropertyValue( "FieldDelimiter", " " );
+        m_database.store();
+
+        // write the table(s) for our test
+        final String tableLocation = m_database.getTableFileLocation().getAbsolutePath();
+        final PrintWriter tableWriter = new PrintWriter( new FileOutputStream( tableLocation + File.separatorChar + "dates.csv", false ) );
+        tableWriter.println( "ID date" );
+        tableWriter.println( "1 2013-01-01" );
+        tableWriter.println( "2 2012-02-02" );
+        tableWriter.println( "3 2011-03-03" );
+        tableWriter.close();
+    }
+
+    public void after()
+    {
+    }
+
+    private class EqualityDate extends Date
+    {
+        EqualityDate( short i_day, short i_month, short i_year )
+        {
+            super( i_day, i_month, i_year );
+        }
+
+        EqualityDate( Date i_date )
+        {
+            super( i_date.Day, i_date.Month, i_date.Year );
+        }
+
+        @Override
+        public boolean equals( Object i_compare )
+        {
+            if ( !( i_compare instanceof Date ) )
+                return false;
+            return  Day   == ((Date)i_compare).Day
+                &&  Month == ((Date)i_compare).Month
+                &&  Year  == ((Date)i_compare).Year;
+        }
+    }
+
+    /**
+     * ensures simple SELECTs from our table(s) work, and deliver the expected results
+     */
+    public void testBasicAccess()
+    {
+        testRowSetResults(
+            "SELECT * FROM \"dates\"",
+            new RowSetIntGetter(1),
+            new Integer[] { 1, 2, 3 },
+            "simple select", "wrong IDs"
+        );
+
+        testRowSetResults(
+            "SELECT * FROM \"dates\"",
+            new RowSetDateGetter( 2 ),
+            new EqualityDate[] { new EqualityDate( (short)1, (short)1, (short)2013 ),
+                                 new EqualityDate( (short)2, (short)2, (short)2012 ),
+                                 new EqualityDate( (short)3, (short)3, (short)2011 )
+            },
+            "simple select", "wrong dates"
+        );
+        testRowSetResults(
+            "SELECT \"date\", \"ID\" FROM \"dates\" ORDER BY \"ID\" DESC",
+            new RowSetIntGetter( 2 ),
+            new Integer[] { 3, 2, 1 },
+            "explicit column selection, sorted by IDs", "wrong IDs"
+        );
+        testRowSetResults(
+            "SELECT * FROM \"dates\" ORDER BY \"date\"",
+            new RowSetIntGetter( 1 ),
+            new Integer[] { 3, 2, 1 },
+            "sorted by date", "wrong IDs"
+        );
+    }
+
+    /**
+     * ensures the basic functionality for selecting calendar functions from a CSV table - this is a prerequisite for
+     * later tests.
+     */
+    public void testCalendarFunctions()
+    {
+        // simple check for proper results of the calendar functions (DATE/MONTH)
+        // The * at the first position is crucial here - there was code which wrongly calculated
+        // column positions of function columns when * was present in the statement
+        testRowSetResults(
+            "SELECT \"dates\".*, YEAR( \"date\" ) FROM \"dates\"",
+            new RowSetIntGetter( 3 ),
+            new Integer[] { 2013, 2012, 2011 },
+            "YEAR function", "wrong calculated years"
+        );
+        testRowSetResults(
+            "SELECT \"dates\".*, MONTH( \"date\" ) FROM \"dates\"",
+            new RowSetIntGetter( 3 ),
+            new Integer[] { 1, 2, 3 },
+            "MONTH function", "wrong calculated months"
+        );
+    }
+
+    /**
+     * ensures that sorting by a function column works
+     */
+    public void testSortingByFunction()
+    {
+        // most simple case: select a function, and sort by it
+        testRowSetResults(
+            "SELECT YEAR( \"date\" ) AS \"year\" FROM \"dates\" ORDER BY \"year\"",
+            new RowSetIntGetter(1),
+            new Integer[] { 2011, 2012, 2013 },
+            "single YEAR selection, sorted by years", "wrong calculated years"
+        );
+        // somewhat more "difficult" (this used to crash): Select all columns, plus a function, so the calculated
+        // column has a position greater than column count
+        testRowSetResults(
+            "SELECT \"dates\".*, YEAR( \"date\" ) AS \"year\" FROM \"dates\" ORDER BY \"year\" DESC",
+            new RowSetIntGetter(3),
+            new Integer[] { 2013, 2012, 2011 },
+            "extended YEAR selection, sorted by years", "wrong calculated years"
+        );
+    }
+
+    private interface RowSetValueGetter
+    {
+        public Object getValue( final RowSet i_rowSet ) throws SQLException;
+    }
+
+    private abstract class RowSetColumnValueGetter implements RowSetValueGetter
+    {
+        RowSetColumnValueGetter( final int i_columnIndex )
+        {
+            m_columnIndex = i_columnIndex;
+        }
+
+        protected final int m_columnIndex;
+    }
+
+    private class RowSetIntGetter extends RowSetColumnValueGetter
+    {
+        RowSetIntGetter( final int i_columnIndex )
+        {
+            super( i_columnIndex );
+        }
+
+        public Object getValue( final RowSet i_rowSet ) throws SQLException
+        {
+            return i_rowSet.getInt( m_columnIndex );
+        }
+    }
+
+    private class RowSetDateGetter extends RowSetColumnValueGetter
+    {
+        RowSetDateGetter( final int i_columnIndex )
+        {
+            super( i_columnIndex );
+        }
+
+        public Object getValue( final RowSet i_rowSet ) throws SQLException
+        {
+            return i_rowSet.getDate( m_columnIndex );
+        }
+    }
+
+    private <T> void testRowSetResults( String i_command, RowSetValueGetter i_getter,
+        T[] i_expectedValues, String i_context, String i_failureDesc )
+    {
+        RowSet rowSet = null;
+        try
+        {
+            rowSet = m_database.createRowSet( CommandType.COMMAND, i_command );
+            rowSet.execute();
+
+            List< T > values = new ArrayList< T >();
+            while ( rowSet.next() )
+            {
+                values.add( (T)i_getter.getValue( rowSet ) );
+            }
+            assureEquals( i_context + ": " + i_failureDesc, i_expectedValues, values.toArray(), true );
+        }
+        catch( final SQLException e )
+        {
+            failed( i_context + ": caught an exception: " + e.toString(), false );
+        }
+        finally
+        {
+            if ( rowSet != null )
+                rowSet.dispose();
+        }
+    }
+
+    private CsvDatabase m_database = null;
+}
diff --git a/connectivity/qa/drivers/hsqldb/DriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index be9fa42e09..bbec489b31 100644..100755
--- a/connectivity/qa/drivers/hsqldb/DriverTest.java
+++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -24,63 +24,50 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.hsqldb;
+package complex.connectivity;
 
-import com.sun.star.awt.XWindow;
+import complex.connectivity.hsqldb.TestCacheSize;
 import com.sun.star.frame.XModel;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XCloseable;
-import com.sun.star.sdbc.*;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.sdbc.XDataSource;
 import com.sun.star.frame.XStorable;
 
 import com.sun.star.lang.*;
 import com.sun.star.document.XDocumentSubStorageSupplier;
 import complexlib.ComplexTestCase;
 
-import java.io.PrintWriter;
  
-import util.utils;
-import java.util.*;
-import java.io.*;
-import org.hsqldb.jdbcDriver;
-import qa.drivers.hsqldb.DatabaseMetaData;
 import org.hsqldb.lib.StopWatch;
-import com.sun.star.sdbc.*;
-import com.sun.star.container.XNameAccess;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.PropertyState;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.embed.XStorage;
+import com.sun.star.sdbc.XDataSource;
+import com.sun.star.sdbc.XDriver;
+import connectivity.tools.HsqlDatabase;
 
-public class DriverTest extends ComplexTestCase {
+public class HsqlDriverTest extends ComplexTestCase {
 
     
     public String[] getTestMethodNames() {
         return new String[] { "test" };
     }
 
+    @Override
     public String getTestObjectName() {
         return "DriverTest";
     }
     
     public void assurePublic(String sMessage,boolean check){
-        addResult(sMessage,check);
+        super.assure(sMessage,check);
     }
 
     public void test(){
-        mThreadTimeOut = 10000000;
         XDataSource ds = null;
         System.gc();
         try {
-            XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdb.DatabaseContext"));
-            ds = (XDataSource)UnoRuntime.queryInterface(XDataSource.class,xNameAccess.getByName("file:///g:/test.odb"));
+            HsqlDatabase database = new HsqlDatabase( (XMultiServiceFactory)param.getMSF() );
+            ds = database.getDataSource().getXDataSource();
         } catch(Exception ex) {
-                throw new RuntimeException("factory: unable to construct data source" );
+            throw new RuntimeException("factory: unable to construct data source" );
         }
         
         try{
@@ -141,7 +128,6 @@ public class DriverTest extends ComplexTestCase {
         }catch(Exception e){}
     }
     public void test2(){
-        mThreadTimeOut = 10000000;
         System.gc();
        
         com.sun.star.beans.PropertyValue[] info = null;
@@ -149,7 +135,7 @@ public class DriverTest extends ComplexTestCase {
         try{
             info = new com.sun.star.beans.PropertyValue[]{
                 new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE)
-                ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0,new Boolean(false),PropertyState.DIRECT_VALUE)
+                ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE)
             };        
             drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
             TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv);
diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index 27e88d77e8..7fbdfa5ffd 100644..100755
--- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -40,7 +40,7 @@ import com.sun.star.sdbc.XRow;
 import com.sun.star.uno.UnoRuntime;
 import complexlib.ComplexTestCase;
 
-public class LongVarCharTest extends ComplexTestCase
+public class JdbcLongVarCharTest extends ComplexTestCase
 {
 
     public String[] getTestMethodNames()
@@ -51,6 +51,7 @@ public class LongVarCharTest extends ComplexTestCase
                 };
     }
 
+    @Override
     public String getTestObjectName()
     {
         return "LongVarCharTest";
diff --git a/connectivity/qa/complex/connectivity/SubTestCase.java b/connectivity/qa/complex/connectivity/SubTestCase.java
new file mode 100755
index 0000000000..1c2e685c59
--- /dev/null
+++ b/connectivity/qa/complex/connectivity/SubTestCase.java
@@ -0,0 +1,23 @@
+package complex.connectivity;
+
+import share.LogWriter;
+
+public class SubTestCase implements TestCase
+{
+    protected SubTestCase( final TestCase i_parentTestCase )
+    {
+        m_parentTestCase = i_parentTestCase;
+    }
+
+    public void assure( String i_message, boolean i_condition )
+    {
+        m_parentTestCase.assure( i_message, i_condition );
+    }
+
+    public LogWriter getLog()
+    {
+        return m_parentTestCase.getLog();
+    }
+
+    private final TestCase m_parentTestCase;
+}
diff --git a/sfx2/source/config/config.src b/connectivity/qa/complex/connectivity/TestCase.java
index 515dbca26d..bae5fcdcb4 100644..100755
--- a/sfx2/source/config/config.src
+++ b/connectivity/qa/complex/connectivity/TestCase.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -24,10 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+package complex.connectivity;
 
-#include <sfx2/sfx.hrc>
+import share.LogWriter;
 
-String STR_FILTERNAME_CFG
+public interface TestCase
 {
-    Text [ en-US ] = "Configuration" ;
-};
+    public void assure( final String i_message, final boolean i_condition );
+    public LogWriter getLog();
+}
diff --git a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
index 52605d324f..1ab75985af 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
@@ -24,30 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.sdbc.*;
 import com.sun.star.beans.XPropertySet;
 
 import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.TestCase;
+import complex.connectivity.SubTestCase;
 
-public class DBaseDateFunctions
+public class DBaseDateFunctions extends SubTestCase
 {
 
     private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
     private final XMultiServiceFactory m_xORB;
-    private final DBaseDriverTest testcase;
 
-    public DBaseDateFunctions(final XMultiServiceFactory _xORB, final DBaseDriverTest _testcase)
+    public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
     {
+        super( i_testCase );
         m_xORB = _xORB;
-        testcase = _testcase;
-    }
-
-    private void assure(final String s, final boolean b)
-    {
-        testcase.assure2(s, b);
     }
 
     public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -55,7 +51,7 @@ public class DBaseDateFunctions
         final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
                 m_xORB.createInstance("com.sun.star.sdb.RowSet"));
 
-        testcase.getLog().println("starting DateTime function test!");
+        getLog().println("starting DateTime function test!");
         // set the properties needed to connect to a database
         final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
         xProp.setPropertyValue("DataSourceName", "Bibliography");
@@ -289,21 +285,21 @@ public class DBaseDateFunctions
     {
         final XRow row = execute(xRowRes, "CURDATE() ");
         final com.sun.star.util.Date aDate = row.getDate(1);
-        testcase.getLog().println("CURDATE() is '" + aDate.Year + "-" + aDate.Month + "-" + aDate.Day + "'");
+        getLog().println("CURDATE() is '" + aDate.Year + "-" + aDate.Month + "-" + aDate.Day + "'");
     }
 
     private void curtime(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
     {
         final XRow row = execute(xRowRes, "CURTIME() ");
         final com.sun.star.util.Time aTime = row.getTime(1);
-        testcase.getLog().println("CURTIME() is '" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
+        getLog().println("CURTIME() is '" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
     }
 
     private void now(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
     {
         final XRow row = execute(xRowRes, "NOW() ");
         final com.sun.star.util.DateTime aTime = row.getTimestamp(1);
-        testcase.getLog().println("NOW() is '" + aTime.Year + "-" + aTime.Month + "-" + aTime.Day + "'");
-        testcase.getLog().println("'" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
+        getLog().println("NOW() is '" + aTime.Year + "-" + aTime.Month + "-" + aTime.Day + "'");
+        getLog().println("'" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
     }
 }
diff --git a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
index 2a32179da0..e783b2fedf 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
@@ -24,30 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.sdbc.*;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.SubTestCase;
+import complex.connectivity.TestCase;
 
 
-public class DBaseNumericFunctions
+public class DBaseNumericFunctions extends SubTestCase
 {
-
     private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
     private final XMultiServiceFactory m_xORB;
-    private final DBaseDriverTest testcase;
 
-    public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final DBaseDriverTest _testcase)
+    public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
     {
+        super( i_testCase );
         m_xORB = _xORB;
-        testcase = _testcase;
-    }
-
-    private void assure(final String s, final boolean b)
-    {
-        testcase.assure2(s, b);
     }
 
     public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -55,7 +50,7 @@ public class DBaseNumericFunctions
         final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
                 m_xORB.createInstance("com.sun.star.sdb.RowSet"));
 
-        testcase.getLog().println("starting Numeric function test");
+        getLog().println("starting Numeric function test");
         // set the properties needed to connect to a database
         final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
         xProp.setPropertyValue("DataSourceName", "Bibliography");
diff --git a/connectivity/qa/drivers/dbase/DBaseSqlTests.java b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
index 37fca35439..8f6c26b044 100755
--- a/connectivity/qa/drivers/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
@@ -24,27 +24,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.sdbc.*;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.TestCase;
+import complex.connectivity.SubTestCase;
 
-public class DBaseSqlTests
+public class DBaseSqlTests extends SubTestCase
 {
     private final XMultiServiceFactory m_xORB;
-    private final DBaseDriverTest testcase;
 
-    public DBaseSqlTests(final XMultiServiceFactory _xORB,final DBaseDriverTest _testcase)
+    public DBaseSqlTests(final XMultiServiceFactory _xORB,final TestCase i_testCase)
     {
+        super( i_testCase );
         m_xORB = _xORB;
-        testcase = _testcase;
-    }
-
-    private void assure(final String s,final boolean b)
-    {
-        testcase.assure2(s, b);
     }
 
     public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -52,7 +48,7 @@ public class DBaseSqlTests
         final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
                 m_xORB.createInstance("com.sun.star.sdb.RowSet"));
 
-        testcase.getLog().println("starting SQL test");
+        getLog().println("starting SQL test");
         // set the properties needed to connect to a database
         final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
         xProp.setPropertyValue("DataSourceName", "Bibliography");
@@ -88,7 +84,7 @@ public class DBaseSqlTests
         }
         catch(SQLException e)
         {
-            testcase.getLog().println(sql + " Error: " + e.getMessage());
+            getLog().println(sql + " Error: " + e.getMessage());
         }
     }
 
diff --git a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
index 1cc576b1e7..7029afa8f2 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
@@ -24,28 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.sdbc.*;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.SubTestCase;
+import complex.connectivity.TestCase;
 
-public class DBaseStringFunctions
+public class DBaseStringFunctions extends SubTestCase
 {
     private String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
     private final XMultiServiceFactory m_xORB;
-    private final DBaseDriverTest testcase;
 
-    public DBaseStringFunctions(final XMultiServiceFactory _xORB,final DBaseDriverTest _testcase)
+    public DBaseStringFunctions(final XMultiServiceFactory _xORB,final TestCase i_testCase)
     {
+        super( i_testCase );
         m_xORB = _xORB;
-        testcase = _testcase;
-    }
-
-    private void assure(final String s,final boolean b)
-    {
-        testcase.assure2(s, b);
     }
 
     public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -53,7 +49,7 @@ public class DBaseStringFunctions
         final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
                 m_xORB.createInstance("com.sun.star.sdb.RowSet"));
 
-        testcase.getLog().println("starting String function test");
+        getLog().println("starting String function test");
         // set the properties needed to connect to a database
         final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
         xProp.setPropertyValue("DataSourceName", "Bibliography");
diff --git a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index cd0bd2936d..359491c822 100644..100755
--- a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -8,21 +8,19 @@
  *
  * @author  oj93728
  */
-package qa.drivers.hsqldb;
+package complex.connectivity.hsqldb;
+import complex.connectivity.HsqlDriverTest;
 import java.sql.*;
-import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
 import java.lang.reflect.Method;
-import qa.drivers.hsqldb.DriverTest;
 
 
 public class DatabaseMetaData {
     
     private java.sql.DatabaseMetaData m_xMD;
-    private DriverTest m_TestCase;
+    private HsqlDriverTest m_TestCase;
     
     /** Creates a new instance of DatabaseMetaData */
-    public DatabaseMetaData(DriverTest _testCase,java.sql.DatabaseMetaData _xmd) {
+    public DatabaseMetaData(HsqlDriverTest _testCase,java.sql.DatabaseMetaData _xmd) {
         m_TestCase = _testCase;
         m_xMD = _xmd;
     }
diff --git a/connectivity/qa/drivers/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index f557d470c8..54abbeb3b4 100644..100755
--- a/connectivity/qa/drivers/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -29,24 +29,16 @@
  */
 
 
-package qa.drivers.hsqldb;
+package complex.connectivity.hsqldb;
 
-import java.io.*;
 
 
 import org.hsqldb.lib.StopWatch;
-import org.hsqldb.lib.FileAccess;
 
 import java.util.Random;
 import com.sun.star.lang.*;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.PropertyState;
-import com.sun.star.container.XNameAccess;
 import com.sun.star.sdbc.*;
-import com.sun.star.document.XDocumentSubStorageSupplier;
-import com.sun.star.embed.XStorage;
-import com.sun.star.frame.XStorable;
 
 /**
  * Test large cached tables by setting up a cached table of 100000 records
@@ -123,17 +115,17 @@ public class TestCacheSize {
     XDriver drv;
     com.sun.star.beans.PropertyValue[] info;
     
-    TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
+    public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
         servicefactory = _xmulti;
         drv = _drv;
         info = _info;
     }
 
-    void setURL(String _url){
+    public void setURL(String _url){
         url = _url;
     }
     
-    protected void setUp() {
+    public void setUp() {
         
         user     = "sa";
         password = "";
@@ -406,9 +398,9 @@ public class TestCacheSize {
                            + (i * 1000 / (sw.elapsedTime() + 1)));
     }
 
-    protected void tearDown() {}
+    public void tearDown() {}
 
-    protected void checkResults() {
+    public void checkResults() {
 
         try {
             StopWatch sw = new StopWatch();
diff --git a/connectivity/qa/connectivity/makefile.mk b/connectivity/qa/connectivity/makefile.mk
deleted file mode 100644
index 785f20692d..0000000000
--- a/connectivity/qa/connectivity/makefile.mk
+++ /dev/null
@@ -1,65 +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 = ..$/..
-TARGET  = GeneralTest
-PRJNAME = connectivity
-PACKAGE = complex$/connectivity
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       =\
-        $(TARGET).java
-        
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-
-run:
-    java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.connectivity.$(TARGET)
-
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 0137dbc9ab..738a348840 100755
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -47,18 +47,6 @@ import java.io.File;
  */
 public abstract class AbstractDatabase implements DatabaseAccess
 {
-    // the service factory
-
-    protected final XMultiServiceFactory m_orb;
-    // the URL of the temporary file used for the database document
-    protected String m_databaseDocumentFile;
-    // the database document
-    protected XOfficeDatabaseDocument m_databaseDocument;
-    // the data source belonging to the database document
-    protected DataSource m_dataSource;
-    // the default connection
-    protected Connection    m_connection;
-
     public AbstractDatabase(final XMultiServiceFactory orb) throws Exception
     {
         m_orb = orb;
@@ -75,7 +63,6 @@ public abstract class AbstractDatabase implements DatabaseAccess
      *
      * Multiple calls to this method return the same connection. The DbaseDatabase object keeps
      * the ownership of the connection, so you don't need to (and should not) dispose/close it.
-     *
      */
     public Connection defaultConnection() throws SQLException
     {
@@ -219,4 +206,15 @@ public abstract class AbstractDatabase implements DatabaseAccess
         closeAndDelete();
         super.finalize();
     }
+
+    // the service factory
+    protected final XMultiServiceFactory m_orb;
+    // the URL of the temporary file used for the database document
+    protected String m_databaseDocumentFile;
+    // the database document
+    protected XOfficeDatabaseDocument m_databaseDocument;
+    // the data source belonging to the database document
+    protected DataSource m_dataSource;
+    // the default connection
+    protected Connection    m_connection;
 }
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index aa5811e746..aa5811e746 100644..100755
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
diff --git a/connectivity/qa/connectivity/tools/CsvDatabase.java b/connectivity/qa/connectivity/tools/CsvDatabase.java
new file mode 100755
index 0000000000..f9f16a7182
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/CsvDatabase.java
@@ -0,0 +1,18 @@
+package connectivity.tools;
+
+import com.sun.star.lang.XMultiServiceFactory;
+
+public class CsvDatabase extends FlatFileDatabase
+{
+    // --------------------------------------------------------------------------------------------------------
+    public CsvDatabase( final XMultiServiceFactory i_orb ) throws Exception
+    {
+        super( i_orb, "flat" );
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    protected CsvDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
+    {
+        super( i_orb, i_existingDocumentURL, "flat" );
+    }
+}
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 3c2d2ff5c2..a692ae0d81 100644..100755
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -69,6 +69,14 @@ public class DataSource
         return m_dataSource;
     }
 
+    /**
+     * retrieves the data source's settings
+     */
+    public XPropertySet geSettings()
+    {
+        return UnoRuntime.queryInterface( XPropertySet.class, impl_getPropertyValue( "Settings" ) );
+    }
+
     /** creates a query with a given name and SQL command
      */
     public void createQuery(final String _name, final String _sqlCommand) throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
@@ -121,25 +129,35 @@ public class DataSource
         return suppQueries.getQueryDefinitions();
     }
 
-    /** returns the name of the data source
-     * 
-     * If a data source is registered at the database context, the name is the registration
-     * name. Otherwise, its the URL which the respective database document is based on.
-     * 
-     * Note that the above definition is from the UNO API, not from this wrapper here.
+    /**
+     * retrieves a property value from the data source
+     * @param i_propertyName
+     *      the name of the property whose value is to be returned.
      */
-    public String getName()
+    private Object impl_getPropertyValue( final String i_propertyName )
     {
-        String name = null;
+        Object propertyValue = null;
         try
         {
             final XPropertySet dataSourceProps = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource );
-            name = (String) dataSourceProps.getPropertyValue("Name");
+            propertyValue = dataSourceProps.getPropertyValue( i_propertyName );
         }
         catch (Exception ex)
         {
             Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
         }
-        return name;
+        return propertyValue;
+    }
+
+    /** returns the name of the data source
+     * 
+     * If a data source is registered at the database context, the name is the registration
+     * name. Otherwise, its the URL which the respective database document is based on.
+     * 
+     * Note that the above definition is from the UNO API, not from this wrapper here.
+     */
+    public String getName()
+    {
+        return (String)impl_getPropertyValue( "Name" );
     }
 };
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index 63c8acb118..19a44132ad 100755
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -1,98 +1,18 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
 package connectivity.tools;
 
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.frame.XStorable;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sdb.XOfficeDatabaseDocument;
-import com.sun.star.sdbc.SQLException;
-import com.sun.star.uno.UnoRuntime;
 
-import helper.URLHelper;
-import java.io.File;
-
-/**
- *
- * @author Ocke
- */
-public class DbaseDatabase extends AbstractDatabase
+public class DbaseDatabase extends FlatFileDatabase
 {
     // --------------------------------------------------------------------------------------------------------
-
-    public DbaseDatabase(final XMultiServiceFactory orb) throws Exception
+    public DbaseDatabase( final XMultiServiceFactory i_orb ) throws Exception
     {
-        super(orb);
-        createDBDocument();
+        super( i_orb, "dbase" );
     }
 
     // --------------------------------------------------------------------------------------------------------
-    public DbaseDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL) throws Exception
-    {
-        super(orb, _existingDocumentURL);
-    }
-
-    /** creates an empty database document in a temporary location
-     */
-    private void createDBDocument() throws Exception
-    {
-        final File documentFile = File.createTempFile("dbase", ".odb");
-        if ( documentFile.exists() )
-            documentFile.delete();
-        final File subPath = new File(documentFile.getParent() + File.separator + documentFile.getName().replaceAll(".odb", "") + File.separator );
-        subPath.mkdir();
-        //subPath.deleteOnExit();
-        m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
-        final String path = URLHelper.getFileURLFromSystemPath(subPath.getPath());
-
-        m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
-                XOfficeDatabaseDocument.class, m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
-        m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
-
-        final XPropertySet dsProperties = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
-        dsProperties.setPropertyValue("URL", "sdbc:dbase:" + path);
-
-        final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
-        storable.storeAsURL(m_databaseDocumentFile, new PropertyValue[]
-                {
-                });
-    }
-
-    /** drops the table with a given name
-
-    @param _name
-    the name of the table to drop
-    @param _ifExists
-    TRUE if it should be dropped only when it exists.
-     */
-    public void dropTable(final String _name,final boolean _ifExists) throws SQLException
+    protected DbaseDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
     {
-        String dropStatement = "DROP TABLE \"" + _name;
-        executeSQL(dropStatement);
+        super( i_orb, i_existingDocumentURL, "dbase" );
     }
 }
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
new file mode 100755
index 0000000000..b0eca7c414
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+package connectivity.tools;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.uno.UnoRuntime;
+
+import helper.URLHelper;
+import java.io.File;
+
+class FlatFileDatabase extends AbstractDatabase
+{
+    // --------------------------------------------------------------------------------------------------------
+    protected FlatFileDatabase( final XMultiServiceFactory i_orb, final String i_urlSubScheme ) throws Exception
+    {
+        super(i_orb);
+        m_urlSubScheme = i_urlSubScheme;
+        createDBDocument();
+    }
+
+    // --------------------------------------------------------------------------------------------------------
+    protected FlatFileDatabase(final XMultiServiceFactory i_orb, final String i_existingDocumentURL,
+        final String i_urlSubScheme ) throws Exception
+    {
+        super( i_orb, i_existingDocumentURL );
+        m_urlSubScheme = i_urlSubScheme;
+
+        final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+        final String url = (String)dsProperties.getPropertyValue( "URL" );
+        final String expectedURLPrefix = "sdbc:" + m_urlSubScheme + ":";
+        if ( !url.startsWith( expectedURLPrefix ) )
+            throw new IllegalArgumentException( i_existingDocumentURL + " is of wrong type" );
+
+        final String location = url.substring( expectedURLPrefix.length() );
+        m_tableFileLocation = new File( location );
+        if ( m_tableFileLocation.isDirectory() )
+            throw new IllegalArgumentException( "unsupported table file location (must be a folder)" );
+    }
+
+    /**
+     * returns a {@link File} which represents the folder where the database's table files reside.
+     */
+    public File getTableFileLocation()
+    {
+        return m_tableFileLocation;
+    }
+
+    /** creates an empty database document in a temporary location
+     */
+    private void createDBDocument() throws Exception
+    {
+        final File documentFile = File.createTempFile( m_urlSubScheme, ".odb" );
+        if ( documentFile.exists() )
+            documentFile.delete();
+        m_tableFileLocation = new File(documentFile.getParent() + File.separator + documentFile.getName().replace(".odb", "") + File.separator );
+        m_tableFileLocation.mkdir();
+        //subPath.deleteOnExit();
+        m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
+        final String path = URLHelper.getFileURLFromSystemPath( m_tableFileLocation.getPath() );
+
+        m_databaseDocument = UnoRuntime.queryInterface( XOfficeDatabaseDocument.class,
+            m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
+        m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+
+        final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+        dsProperties.setPropertyValue("URL", "sdbc:" + m_urlSubScheme + ":" + path);
+
+        final XStorable storable = UnoRuntime.queryInterface( XStorable.class, m_databaseDocument );
+        storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[] { } );
+    }
+
+    /** drops the table with a given name
+
+    @param _name
+    the name of the table to drop
+    @param _ifExists
+    TRUE if it should be dropped only when it exists.
+     */
+    public void dropTable(final String _name,final boolean _ifExists) throws SQLException
+    {
+        String dropStatement = "DROP TABLE \"" + _name;
+        executeSQL(dropStatement);
+    }
+
+    final String    m_urlSubScheme;
+    File            m_tableFileLocation = null;
+}
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 824f7ebd2f..824f7ebd2f 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index d39a322f2f..d39a322f2f 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index b4d1f656dc..b4d1f656dc 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java
index 4ca3ca0ef2..4ca3ca0ef2 100644..100755
--- a/connectivity/qa/connectivity/tools/QueryDefinition.java
+++ b/connectivity/qa/connectivity/tools/QueryDefinition.java
diff --git a/connectivity/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java
index 7581804e33..4ad99a9c9b 100644..100755
--- a/connectivity/qa/connectivity/tools/RowSet.java
+++ b/connectivity/qa/connectivity/tools/RowSet.java
@@ -31,6 +31,7 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.io.XInputStream;
+import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XArray;
@@ -48,7 +49,6 @@ import com.sun.star.util.Time;
 
 public class RowSet implements XRowSet, XRow
 {
-    private XMultiServiceFactory    m_orb;
     private XRowSet                 m_rowSet;
     private XRow                    m_row;
     private XPropertySet            m_rowSetProps;
@@ -57,14 +57,13 @@ public class RowSet implements XRowSet, XRow
     {
         try
         {
-            m_rowSetProps = (XPropertySet)UnoRuntime.queryInterface(
-                XPropertySet.class, _orb.createInstance("com.sun.star.sdb.RowSet") );
+            m_rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, _orb.createInstance( "com.sun.star.sdb.RowSet" ) );
             m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource );
             m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) );
             m_rowSetProps.setPropertyValue( "Command", _command );
 
-            m_rowSet = (XRowSet)UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
-            m_row = (XRow)UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
+            m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
+            m_row = UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
         }
         catch ( Exception e )
         {
@@ -289,4 +288,12 @@ public class RowSet implements XRowSet, XRow
     {
         return m_row.getArray(i);
     }
+
+    public void dispose()
+    {
+        if ( m_rowSet == null )
+            return;
+        XComponent rowSetComp = UnoRuntime.queryInterface( XComponent.class, m_rowSet );
+        rowSetComp.dispose();
+    }
 };
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 07490532a1..d77da7f1b9 100644..100755
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -42,15 +42,11 @@ all:
 
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
 JAVAFILES       := $(shell @$(FIND) . -name "*.java")
-JAVACLASSFILES	:= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:d)$(i:b).class)
 
 #----- make a jar from compiled files ------------------------------
 
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+JARCLASSDIRS = $(PACKAGE)
+JARTARGET    = $(TARGET).jar
 
 # --- Targets ------------------------------------------------------
 
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
index aac120fb1e..aac120fb1e 100644..100755
--- a/connectivity/qa/connectivity/tools/sdb/Connection.java
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
diff --git a/connectivity/qa/drivers/dbase/.nbattrs b/connectivity/qa/drivers/dbase/.nbattrs
deleted file mode 100644
index 1ea7ed0bd8..0000000000
--- a/connectivity/qa/drivers/dbase/.nbattrs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE attributes PUBLIC "-//NetBeans//DTD DefaultAttributes 1.0//EN" "http://www.netbeans.org/dtds/attributes-1_0.dtd">
-<attributes version="1.0">
-    <fileobject name="DBaseDriverTest.java">
-        <attr name="class_dependency_complexlib.ComplexTestCase" stringvalue="DBaseDriverTest"/>
-    </fileobject>
-    <fileobject name="makefile.mk">
-        <attr name="org.netbeans.modules.text.IsTextFile" boolvalue="true"/>
-    </fileobject>
-</attributes>
diff --git a/connectivity/qa/drivers/dbase/makefile.mk b/connectivity/qa/drivers/dbase/makefile.mk
deleted file mode 100644
index d71670d674..0000000000
--- a/connectivity/qa/drivers/dbase/makefile.mk
+++ /dev/null
@@ -1,64 +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 = ..$/..$/..
-TARGET  = DBaseDriverTest
-PRJNAME = connectivity
-PACKAGE = qa$/drivers$/dbase
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       =\
-        DBaseDateFunctions.java\
-        DBaseDriverTest.java\
-        DBaseNumericFunctions.java\
-        DBaseStringFunctions.java\
-        DBaseSqlTests.java
-        
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-run: $(CLASSDIR)$/$(JARTARGET)
-    java -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar" org.openoffice.Runner -TestBase java_complex -o qa.drivers.dbase.$(TARGET)
-
diff --git a/connectivity/qa/drivers/dbase/test.properties b/connectivity/qa/drivers/dbase/test.properties
deleted file mode 100644
index c26879f480..0000000000
--- a/connectivity/qa/drivers/dbase/test.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# x-no-translate
-Driver=org.openoffice.comp.drivers.MySQL.Driver
-user=testuser
-password=
-URL=sdbc:mysql:odbc:MYSQL fs-11110 TESTUSER
diff --git a/connectivity/qa/drivers/jdbc/makefile.mk b/connectivity/qa/makefile.mk
index e9f03ce1be..ee41cab635 100644..100755
--- a/connectivity/qa/drivers/jdbc/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -25,42 +25,48 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = LongVarCharTest
+PRJ = ..
+TARGET  = ConnectivityComplexTests
 PRJNAME = connectivity
-PACKAGE = complex$/connectivity
+PACKAGE = complex/connectivity
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
 
-
 #----- compile .java files -----------------------------------------
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       =\
-        LongVarCharTest.java
-        
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+JAVAFILES       :=  $(shell @$(FIND) complex -name "*.java")
 
 #----- make a jar from compiled files ------------------------------
 
-MAXLINELENGTH = 100000
+JARCLASSDIRS = $(PACKAGE)
+JARTARGET    = $(TARGET).jar
+
+# --- Runner Settings ----------------------------------------------
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+# classpath and argument list
+RUNNER_CLASSPATH = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar"
+RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex
 
 # --- Targets ------------------------------------------------------
 
 .IF "$(depend)" == ""
 ALL :   ALLTAR
+    @echo -----------------------------------------------------
+    @echo - do a 'dmake show_targets' to show available targets
+    @echo -----------------------------------------------------
 .ELSE
 ALL: 	ALLDEP
 .ENDIF
 
 .INCLUDE :  target.mk
 
+show_targets:
+    +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
-run:
-    java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.connectivity.$(TARGET)
+run: $(CLASSDIR)$/$(JARTARGET)
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce scenarios.sce
 
+run_%: $(CLASSDIR)$/$(JARTARGET)
+    +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
diff --git a/connectivity/qa/scenarios.sce b/connectivity/qa/scenarios.sce
new file mode 100755
index 0000000000..c085f11bd7
--- /dev/null
+++ b/connectivity/qa/scenarios.sce
@@ -0,0 +1,4 @@
+-o complex.connectivity.DBaseDriverTest
+-o complex.connectivity.HsqlDriverTest
+#-o complex.connectivity.JdbcLongVarCharTest
+-o complex.connectivity.FlatFileAccess
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 047a30b39d..047a30b39d 100644..100755
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index 7de16e76d2..7de16e76d2 100644..100755
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 237955874c..237955874c 100644..100755
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 591429eebb..591429eebb 100644..100755
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index bdda256851..813efd530b 100644..100755
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -44,6 +44,7 @@
 #include "diagnose_ex.h"
 #include <comphelper/numbers.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
 
 
 using namespace ::connectivity;
@@ -364,56 +365,59 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
 }
 
 //------------------------------------------------------------------------------
-double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
-                                  const Date& rNullDate,
-                                  sal_Int16 nKeyType)
+double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const Date& i_relativeToNullDate )
 {
     try
     {
-        switch (nKeyType & ~NumberFormat::DEFINED)
+        const Reference< XPropertySet > xProp( i_column, UNO_QUERY_THROW );
+
+        const sal_Int32 nColumnType = ::comphelper::getINT32( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TYPE ) ) );
+        switch ( nColumnType )
         {
-            case NumberFormat::DATE:
-                return toDouble( xVariant->getDate(), rNullDate);
-            case NumberFormat::DATETIME:
-                return toDouble(xVariant->getTimestamp(),rNullDate);
-            case NumberFormat::TIME:
-                return toDouble(xVariant->getTime());
-            default:
+        case DataType::DATE:
+            return toDouble( i_column->getDate(), i_relativeToNullDate );
+
+        case DataType::TIME:
+            return toDouble( i_column->getTime() );
+
+        case DataType::TIMESTAMP:
+            return toDouble( i_column->getTimestamp(), i_relativeToNullDate );
+
+        default:
             {
-                Reference<XPropertySet> xProp(xVariant,UNO_QUERY);
-                if (	xProp.is()
-                    &&	xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))
-                    && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) )
+                sal_Bool bIsSigned = sal_True;
+                OSL_VERIFY( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ISSIGNED ) ) >>= bIsSigned );
+                if ( !bIsSigned )
                 {
-                    switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+                    switch ( nColumnType)
                     {
                         case DataType::TINYINT:
-                            return static_cast<double>(static_cast<sal_uInt8>(xVariant->getByte()));
+                            return static_cast<double>(static_cast<sal_uInt8>(i_column->getByte()));
                         case DataType::SMALLINT:
-                            return static_cast<double>(static_cast<sal_uInt16>(xVariant->getShort()));
+                            return static_cast<double>(static_cast<sal_uInt16>(i_column->getShort()));
                         case DataType::INTEGER:
-                            return static_cast<double>(static_cast<sal_uInt32>(xVariant->getInt()));
+                            return static_cast<double>(static_cast<sal_uInt32>(i_column->getInt()));
                         case DataType::BIGINT:
-                            return static_cast<double>(static_cast<sal_uInt64>(xVariant->getLong()));
+                            return static_cast<double>(static_cast<sal_uInt64>(i_column->getLong()));
                     }
                 }
-
-                return xVariant->getDouble();
             }
+            return i_column->getDouble();
         }
     }
-    catch(const Exception& )
+    catch( const Exception& )
     {
+        DBG_UNHANDLED_EXCEPTION();
         return 0.0;
     }
 }
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference< XPropertySet>& _xColumn,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
                                            const Reference<XNumberFormatter>& _xFormatter,
                                            const ::com::sun::star::lang::Locale& _rLocale,
                                            const Date& _rNullDate)
 {
-    OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getValue: invalid arg !");
+    OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !");
     if (!_xColumn.is() || !_xFormatter.is())
         return ::rtl::OUString();
 
@@ -424,7 +428,7 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
     }
     catch (const Exception& )
     {
-        OSL_ENSURE(false, "DBTypeConversion::getValue: caught an exception while asking for the format key!");
+        OSL_ENSURE(false, "DBTypeConversion::getFormattedValue: caught an exception while asking for the format key!");
     }
 
     if (!nKey)
@@ -440,11 +444,11 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
 
     sal_Int16 nKeyType = getNumberFormatType(_xFormatter, nKey) & ~NumberFormat::DEFINED;
 
-    return DBTypeConversion::getValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
+    return DBTypeConversion::getFormattedValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
                                    const Reference<XNumberFormatter>& xFormatter,
                                    const Date& rNullDate,
                                    sal_Int32 nKey,
@@ -461,23 +465,20 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
                 case NumberFormat::DATETIME:
                 {
                     // get a value which represents the given date, relative to the given null date
-                    double fValue = getValue(xVariant, rNullDate, nKeyType);
+                    double fValue = getValue( xVariant, rNullDate );
                     if ( !xVariant->wasNull() )
                     {
                          // get the null date of the formatter
                          Date aFormatterNullDate( rNullDate );
                          try
                          {
-                             Reference< XPropertySet > xFormatterSettings;
-                             Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier( ) );
-                             if ( xSupplier.is() )
-                                 xFormatterSettings = xSupplier->getNumberFormatSettings();
-                             if ( xFormatterSettings.is() )
-                                 xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate;
+                             Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
+                             Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
+                             OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate );
                          }
                          catch( const Exception& )
                          {
-                            OSL_ENSURE( sal_False, "DBTypeConversion::getValue: caught an exception while retrieving the formatter's NullDate!" );
+                            DBG_UNHANDLED_EXCEPTION();
                          }
                          // get a value which represents the given date, relative to the null date of the formatter
                          fValue -= toDays( rNullDate, aFormatterNullDate );
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index 12564203dd..12564203dd 100644..100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index b308f85109..b7bc90485c 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -901,11 +901,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
 }
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* serviceManager, com::sun::star::registry::XRegistryKey* registryKey)
-{
-    return cppu::component_writeInfoHelper(serviceManager, registryKey, entries);
-}
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey)
 {
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 5d86317f88..5d86317f88 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 45f171e081..80cabb15ef 100644..100755
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -33,7 +33,7 @@
 #include "connectivity/FValue.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <connectivity/dbconversion.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
@@ -1754,7 +1754,7 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
 
 }
 // -----------------------------------------------------------------------------
-::com::sun::star::util::Date ORowSetValue::getDate()		const
+::com::sun::star::util::Date ORowSetValue::getDate() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDate" );
     ::com::sun::star::util::Date aValue;
@@ -1769,8 +1769,6 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
                 break;
             case DataType::DECIMAL:
             case DataType::NUMERIC:
-                aValue = DBTypeConversion::toDate((double)*this);
-                break;
             case DataType::FLOAT:
             case DataType::DOUBLE:
             case DataType::REAL:
@@ -1788,12 +1786,28 @@ Sequence<sal_Int8>	ORowSetValue::getSequence() const
                     aValue.Year		= pDateTime->Year;
                 }
                 break;
+            case DataType::BIT:
+            case DataType::BOOLEAN:
+            case DataType::TINYINT:
+            case DataType::SMALLINT:
+            case DataType::INTEGER:
+            case DataType::BIGINT:
+                aValue = DBTypeConversion::toDate( double( sal_Int64( *this ) ) );
+                break;
+
+            case DataType::BLOB:
+            case DataType::CLOB:
+            case DataType::OBJECT:
             default:
-                {
-                    Any aAnyValue = getAny();
-                    aAnyValue >>= aValue;
-                    break;
-                }
+                OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" );
+                // NO break!
+
+            case DataType::BINARY:
+            case DataType::VARBINARY:
+            case DataType::LONGVARBINARY:
+            case DataType::TIME:
+                aValue = DBTypeConversion::toDate( (double)0 );
+                break;
         }
     }
     return aValue;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 6f6501f32a..6f6501f32a 100644..100755
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 590cfb6489..590cfb6489 100644..100755
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 20e6c6b2ac..20e6c6b2ac 100644..100755
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index b0747dfae2..b0747dfae2 100644..100755
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 407cdc8fb0..407cdc8fb0 100644..100755
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 91cf307320..91cf307320 100644..100755
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index a0ce77e192..a0ce77e192 100644..100755
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 2f08a778c0..2f08a778c0 100644..100755
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 93f46ee661..93f46ee661 100644..100755
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 8dda6eae08..8dda6eae08 100644..100755
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 1bfd8d111d..1bfd8d111d 100644..100755
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 4cbceb03e8..4cbceb03e8 100644..100755
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 49817b4d33..e30d386cc1 100644..100755
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -155,10 +155,15 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
             bDone = sal_False;
     }
 
-    if(bDataFound && bDone )
+    if(bDataFound && bDone)
     {
         const sal_Int32 nDriverPos = m_pHelper->getDriverPos();
-        if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
+        if ( m_bDeletedVisible )
+        {
+            if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() )
+                m_aBookmarksPositions.push_back(nDriverPos);
+        }
+        else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
             m_aBookmarksPositions.push_back(nDriverPos);
         /*sal_Int32 nDriverPos = m_pHelper->getDriverPos();
         if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end())
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index afc01259b1..afc01259b1 100644..100755
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 3462579f50..3462579f50 100644..100755
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index b88ded8ee1..b88ded8ee1 100644..100755
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index bee593f447..bee593f447 100644..100755
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index bc05694898..bc05694898 100644..100755
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index b48aa40e92..b48aa40e92 100644..100755
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 04483aa9e9..04483aa9e9 100644..100755
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index eedf85aba9..e70400a3ed 100644..100755
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -260,7 +260,7 @@ Reference< XDataSource> getDataSource_allowException(
             const ::rtl::OUString& _rsTitleOrPath,
             const Reference< XMultiServiceFactory >& _rxFactory )
 {
-    OSL_ENSURE( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !" );
+    ENSURE_OR_RETURN( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !", NULL );
 
     Reference< XNameAccess> xDatabaseContext(
         _rxFactory->createInstance(
@@ -280,8 +280,9 @@ Reference< XDataSource > getDataSource(
     {
         xDS = getDataSource_allowException( _rsTitleOrPath, _rxFactory );
     }
-    catch(Exception)
+    catch( const Exception& )
     {
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return xDS;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 67e511454c..ab4fbacdb1 100644..100755
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -586,7 +586,6 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
     try
     {
         const Reference< XPropertySet> xDataSourceProperties( findDataSource( _xChild ), UNO_QUERY );
-        OSL_ENSURE( xDataSourceProperties.is(), "getDataSourceSetting: invalid data source object!" );
         if ( !xDataSourceProperties.is() )
             return false;
 
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 9a01ecf275..e3b71a19bb 100644..100755
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -36,6 +36,8 @@
 #include "TConnection.hxx"
 #include <osl/diagnose.h>
 #include "connectivity/dbtools.hxx"
+#include <tools/diagnose_ex.h>
+#include <rtl/ustrbuf.hxx>
 
 //........................................................................
 namespace dbtools
@@ -93,7 +95,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FilterManager::setFilterComponent: setting the filter failed!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -114,44 +116,30 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FilterManager::setApplyPublicFilter: setting the filter failed!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
     //--------------------------------------------------------------------
-    namespace
+    void FilterManager::appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const
     {
-        void    lcl_ensureBracketed( ::rtl::OUString& /* [inout] */ _rExpression )
+        if ( io_appendTo.getLength() > 0 )
         {
-            OSL_ENSURE( _rExpression.getLength(), "lcl_ensureBracketed: expression is empty!" );
-            if ( _rExpression.getLength() )
-            {
-                if ( ( _rExpression.getStr()[0] != '(' ) || ( _rExpression.getStr()[ _rExpression.getLength() - 1 ] != ')' ) )
-                {
-                    ::rtl::OUString sComposed( RTL_CONSTASCII_USTRINGPARAM( "(" ) );
-                    sComposed += _rExpression;
-                    sComposed += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
-                    _rExpression = sComposed;
-                }
-            }
+            io_appendTo.insert( 0, sal_Unicode( '(' ) );
+            io_appendTo.insert( 1, sal_Unicode( ' ' ) );
+            io_appendTo.appendAscii( " ) AND " );
         }
-    }
-    //--------------------------------------------------------------------
-    void FilterManager::appendFilterComponent( ::rtl::OUString& /* [inout] */ _rAppendTo, const ::rtl::OUString& _rComponent ) const
-    {
-        if ( _rAppendTo.getLength() )
-            _rAppendTo += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " AND " ) );
 
-        ::rtl::OUString sComponent( _rComponent );
-        lcl_ensureBracketed( sComponent );
-        _rAppendTo += sComponent;
+        io_appendTo.appendAscii( "( " );
+        io_appendTo.append( i_component );
+        io_appendTo.appendAscii( " )" );
     }
 
     //--------------------------------------------------------------------
-    bool FilterManager::isThereAtMostOneComponent( ::rtl::OUString& _rOnlyComponent ) const
+    bool FilterManager::isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const
     {
         sal_Int32 nOnlyNonEmpty = -1;
-    sal_Int32 i;
+        sal_Int32 i;
         for ( i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
         {
             if ( m_aFilterComponents[ i ].getLength() )
@@ -165,14 +153,14 @@ namespace dbtools
         }
         if ( nOnlyNonEmpty == -1 )
         {
-            _rOnlyComponent = ::rtl::OUString();
+            o_singleComponent.makeStringAndClear();
             return true;
         }
 
         if ( i == FC_COMPONENT_COUNT )
         {
             // we found only one non-empty filter component
-            _rOnlyComponent = m_aFilterComponents[ nOnlyNonEmpty ];
+            o_singleComponent = m_aFilterComponents[ nOnlyNonEmpty ];
             return true;
         }
         return false;
@@ -181,17 +169,17 @@ namespace dbtools
     //--------------------------------------------------------------------
     ::rtl::OUString FilterManager::getComposedFilter( ) const
     {
-        ::rtl::OUString sComposedFilter;
+        ::rtl::OUStringBuffer aComposedFilter;
 
         // if we have only one non-empty component, then there's no need to compose anything
-        if ( isThereAtMostOneComponent( sComposedFilter ) )
-            return sComposedFilter;
-
-        // append the single components
-        for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
-            appendFilterComponent( sComposedFilter, m_aFilterComponents[ i ] );
+        if ( !isThereAtMostOneComponent( aComposedFilter ) )
+        {
+            // append the single components
+            for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
+                appendFilterComponent( aComposedFilter, m_aFilterComponents[ i ] );
+        }
 
-        return sComposedFilter;
+        return aComposedFilter.makeStringAndClear();
     }
 
 //........................................................................
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 9686ca9107..141a59b6bf 100644..100755
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -328,7 +328,7 @@ namespace dbtools
         {
             if ( m_pData->m_bNumericField )
             {
-                sStringValue = DBTypeConversion::getValue(
+                sStringValue = DBTypeConversion::getFormattedValue(
                     m_pData->m_xColumn, m_pData->m_xFormatter, m_pData->m_aNullDate, m_pData->m_nFormatKey, m_pData->m_nKeyType
                 );
             }
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cab2160922..cab2160922 100644..100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 58c191f4fb..58c191f4fb 100644..100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index f757334935..f757334935 100644..100755
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 3cab4cca33..3cab4cca33 100644..100755
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index ed591162e9..ed591162e9 100644..100755
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 11cf19a823..11cf19a823 100644..100755
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 3300f9f57b..3300f9f57b 100644..100755
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 407f08596d..407f08596d 100644..100755
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index a1836f2388..a1836f2388 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index fc608ea143..fc608ea143 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index f2222fee42..f2222fee42 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 2d29588689..2d29588689 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 266002c35e..266002c35e 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index ae5e9b45f6..ae5e9b45f6 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 892869c1c0..892869c1c0 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 81ccb18ff2..81ccb18ff2 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index c6344c04bb..c6344c04bb 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 17104ae92c..17104ae92c 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 7b4c6a63fa..5465d23acd 100644..100755
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -51,35 +51,6 @@ extern "C"
 }
 
 //---------------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
-    ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
-    sMainKeyName += OPoolCollection::getImplementationName_Static();
-    sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    try
-    {
-        Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
-        if (!xMainKey.is())
-            return sal_False;
-
-        Sequence< ::rtl::OUString > sServices = OPoolCollection::getSupportedServiceNames_Static();
-        const ::rtl::OUString* pServices = sServices.getConstArray();
-        for (sal_Int32 i=0; i<sServices.getLength(); ++i, ++pServices)
-            xMainKey->createKey(*pServices);
-    }
-    catch(InvalidRegistryException&)
-    {
-        return sal_False;
-    }
-    catch(InvalidValueException&)
-    {
-        return sal_False;
-    }
-    return sal_True;
-}
-
-//---------------------------------------------------------------------------------------
 void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/cpool/dbpool.xml b/connectivity/source/cpool/dbpool.xml
index 4916954bbb..4916954bbb 100644..100755
--- a/connectivity/source/cpool/dbpool.xml
+++ b/connectivity/source/cpool/dbpool.xml
diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component
new file mode 100755
index 0000000000..2fa8a14495
--- /dev/null
+++ b/connectivity/source/cpool/dbpool2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.sdbc.OConnectionPool">
+    <service name="com.sun.star.sdbc.ConnectionPool"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/cpool/exports.dxp
+++ b/connectivity/source/cpool/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 393a797d2c..45ec3727ea 100644..100755
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -78,4 +78,10 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/dbpool2.component
 
+$(MISC)/dbpool2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbpool2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbpool2.component
diff --git a/connectivity/source/dbtools/dbt.xml b/connectivity/source/dbtools/dbt.xml
index e2f8c8921c..e2f8c8921c 100644..100755
--- a/connectivity/source/dbtools/dbt.xml
+++ b/connectivity/source/dbtools/dbt.xml
diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component
new file mode 100755
index 0000000000..08be953bb9
--- /dev/null
+++ b/connectivity/source/dbtools/dbtools.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet">
+    <service name="com.sun.star.sdbc.ResultSet"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.helper.ParameterSubstitution">
+    <service name="com.sun.star.sdb.ParameterSubstitution"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/dbtools/exports.dxp
+++ b/connectivity/source/dbtools/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 294c9a02f3..90237153de 100644..100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -94,3 +94,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo _TI				>$@
     @echo _real				>>$@
 
+
+ALLTAR : $(MISC)/dbtools.component
+
+$(MISC)/dbtools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbtools.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbtools.component
diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index bae14af719..bae14af719 100644..100755
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index aa62a6a4d8..aa62a6a4d8 100644..100755
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 9aae67312c..9aae67312c 100644..100755
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index d1a9b96e98..d1a9b96e98 100644..100755
--- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 8c35b177f7..0586d8f034 100644..100755
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -66,9 +66,7 @@
 #include <memory>
 #include <sys/stat.h>
 
-#if defined(MAC)
-const char sNewLine = '\015';
-#elif defined(UNX)
+#if defined(UNX)
 const char sNewLine = '\012';
 #else
 const char sNewLine[] = "\015\012"; // \015\012 and not \n
@@ -873,7 +871,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
         if(UCBContentHelper::Exists(sTemp))
             UCBContentHelper::Kill(sTemp);
 
-#if !(defined(WIN) || defined(WNT))
+#if !(defined(WNT))
         sTemp = sDBConfig;
         sTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diag"));
         if(!UCBContentHelper::IsFolder(sTemp))
@@ -895,7 +893,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
 void ODriver::clearDatabase(const ::rtl::OUString& sDBName)
 { // stop the database
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     ::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop"));
     const sal_uInt32 nArgsCount = 2;
     rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData };
@@ -944,7 +942,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KERNELTRACESIZE")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")));
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOG_QUEUE_PAGES")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")));
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OPMSG1")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")));
 #endif
 
@@ -1012,7 +1010,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)	<< "x_param"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1023,7 +1021,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
                         << ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
                         << " "
                         << ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
-#if (defined(WIN) || defined(WNT))
+#if defined(WNT)
 #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
                         << " >> %DBWORK%\\create.log 2>&1"
 #endif
@@ -1079,7 +1077,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
     rtl_uString* pArgs[nArgsCount] = { sDBName.pData, rWhat.pData, rHow.pData  };
 
     ::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam"));
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
 
@@ -1146,7 +1144,7 @@ OSL_TRACE("CreateFile %d",_nSize);
 int ODriver::X_START(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1191,7 +1189,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
 int ODriver::X_STOP(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1243,7 +1241,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)	<<
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                             "xutil.exe"
 #else
                             "utility"
@@ -1301,7 +1299,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)	<< "xload"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1375,7 +1373,7 @@ void ODriver::fillEnvironmentVariables()
 ::rtl::OUString ODriver::generateInitFile() const
 {
     String sExt;
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     sExt = String::CreateFromAscii(".sh");
 #else
     sExt = String::CreateFromAscii(".bat");
@@ -1383,13 +1381,13 @@ void ODriver::fillEnvironmentVariables()
 
     String sWorkUrl(m_sDbWorkURL);
     ::utl::TempFile aCmdFile(String::CreateFromAscii("Init"),&sExt,&sWorkUrl);
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     String sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
     chmod(ByteString(sPhysicalPath,gsl_getSystemTextEncoding()).GetBuffer(),S_IRUSR|S_IWUSR|S_IXUSR);
 #endif
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE);
     (*pFileStream)	<< "#!/bin/sh"
                     << sNewLine
@@ -1499,7 +1497,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)	<< "x_cons"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1586,7 +1584,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)	<< "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1640,7 +1638,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)	<< "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1726,7 +1724,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
 // -----------------------------------------------------------------------------
 void ODriver::installSystemTables(	const TDatabaseStruct& _aInfo)
 {
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     //	xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind
     ::rtl::OUString aBatch =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b "));
     ::rtl::OUString sTemp2 = m_sDbRootURL	+ m_sDelimit
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index 351c47bf22..ab64f99c31 100644..100755
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -130,7 +130,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
     }
     const sal_Char* pLibraryAsciiName = NULL;
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     pLibraryAsciiName = "SQLOD32.DLL";
 #elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
     pLibraryAsciiName = "odbclib.so";
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 1421771056..1421771056 100644..100755
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 46256b20d5..46256b20d5 100644..100755
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index 00d61dd1c0..00d61dd1c0 100644..100755
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 059ba4fe47..059ba4fe47 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index 62563cbd2b..62563cbd2b 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index d6a6586f10..d6a6586f10 100644..100755
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index a25b760c3e..a25b760c3e 100644..100755
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 96212030c9..96212030c9 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index fe1eba559a..fe1eba559a 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index f4e399cc3c..f4e399cc3c 100644..100755
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index 3f9ad2edde..3f9ad2edde 100644..100755
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index 302e9b4e8f..302e9b4e8f 100644..100755
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 98d61e4f43..98d61e4f43 100644..100755
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 995a4f8739..995a4f8739 100644..100755
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index f15ff861be..f15ff861be 100644..100755
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index 2c7cf7f609..5b4e3be456 100644..100755
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "adabas/BDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::adabas;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/adabas/adabas.component b/connectivity/source/drivers/adabas/adabas.component
new file mode 100755
index 0000000000..3c359c3d02
--- /dev/null
+++ b/connectivity/source/drivers/adabas/adabas.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbcx.adabas.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map
index 2ce9f11141..f64c44c13f 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.mxp.map
+++ b/connectivity/source/drivers/adabas/adabas.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/adabas/adabas.xml b/connectivity/source/drivers/adabas/adabas.xml
index a4736d0dfd..a4736d0dfd 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.xml
+++ b/connectivity/source/drivers/adabas/adabas.xml
diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/adabas/exports.dxp
+++ b/connectivity/source/drivers/adabas/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index b5d9903f27..bfc6a3dcfa 100644..100755
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -104,3 +104,11 @@ DEF1EXPORTFILE=	exports.dxp
 
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/adabas.component
+
+$(MISC)/adabas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        adabas.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt adabas.component
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index feb29ec8d9..feb29ec8d9 100644..100755
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index f6390431b6..0f3e70c0f1 100644..100755
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -80,7 +80,7 @@ void OCatalog::refreshTables()
     if(m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshViews()
@@ -93,7 +93,7 @@ void OCatalog::refreshViews()
     if(m_pViews)
         m_pViews->reFill(aVector);
     else
-        m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshGroups()
@@ -106,7 +106,7 @@ void OCatalog::refreshGroups()
     if(m_pGroups)
         m_pGroups->reFill(aVector);
     else
-        m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshUsers()
@@ -119,7 +119,7 @@ void OCatalog::refreshUsers()
     if(m_pUsers)
         m_pUsers->reFill(aVector);
     else
-        m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index d2b7b1dfee..d2b7b1dfee 100644..100755
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index b835184b36..c3187fd196 100644..100755
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -73,8 +73,14 @@ Reference< XPropertySet > OColumns::createDescriptor()
 sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoColumn* pColumn = NULL;
+    Reference< XPropertySet > xColumn;
     if ( !getImplementation( pColumn, descriptor ) || pColumn == NULL )
-        m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+    {
+        // m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+        pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection);
+        xColumn = pColumn;
+        ::comphelper::copyProperties(descriptor,xColumn);
+    }
 
     WpADOColumn aColumn = pColumn->getColumnImpl();
 
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 02bcf20d66..02bcf20d66 100644..100755
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index c714660c97..c714660c97 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 19fd82b111..19fd82b111 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 6b67bfa6b8..6b67bfa6b8 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index e39ea65ead..e39ea65ead 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 8562195c49..83a2bcdee1 100644..100755
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -166,6 +166,37 @@ void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl)
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
+    if ( acceptsURL(url) )
+    {
+        ::std::vector< DriverPropertyInfo > aDriverInfo;
+
+        Sequence< ::rtl::OUString > aBooleanValues(2);
+        aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
+        aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver."))
+                ,sal_False
+                ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) )
+                ,aBooleanValues)
+        );
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format."))
+                ,sal_False
+                ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) )
+                ,aBooleanValues)
+        );
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated."))
+                ,sal_False
+                ,::rtl::OUString( )
+                ,Sequence< ::rtl::OUString > ())
+        );
+        return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
+    }
     return Sequence< DriverPropertyInfo >();
 }
 // --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index d02204b1ec..d02204b1ec 100644..100755
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 269a315daa..269a315daa 100644..100755
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 906d03fb23..906d03fb23 100644..100755
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 7b645e6223..7b645e6223 100644..100755
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 6407881fd4..6407881fd4 100644..100755
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx
index ff0bb3cafd..ff0bb3cafd 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumn.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumn.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx
index f7449bf1a3..f7449bf1a3 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumns.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumns.cxx
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index cfdd4a82d8..cfdd4a82d8 100644..100755
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 5b7056c584..5b7056c584 100644..100755
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 366ac23c4a..366ac23c4a 100644..100755
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 66def0a9cb..66def0a9cb 100644..100755
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2708607e8e..2708607e8e 100644..100755
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index a4fadaa02b..a4fadaa02b 100644..100755
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index c9872c4bc7..c9872c4bc7 100644..100755
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 350f0362ab..350f0362ab 100644..100755
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index e1abe6f2c9..e1abe6f2c9 100644..100755
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index a5bc0d5491..a5bc0d5491 100644..100755
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index bf99464dfa..bf99464dfa 100644..100755
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index c22e7e2c90..c22e7e2c90 100644..100755
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 206c9c2aa4..68600ba2d7 100644..100755
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "ado/ADriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::ado;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,26 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, that must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -117,31 +95,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 47886990a6..47886990a6 100644..100755
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component
new file mode 100755
index 0000000000..1962a6b710
--- /dev/null
+++ b/connectivity/source/drivers/ado/ado.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.ado.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index 3f822de5f7..d7ea2c4d78 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -164,6 +164,11 @@
             <value>false</value>
           </prop>
         </node>
+        <node oor:name="TypeInfoSettings" oor:op="replace">
+          <prop oor:name="Value" oor:type="oor:string-list">
+            <value oor:separator=",">Column(2) = 16,Column(3) = 1</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
diff --git a/connectivity/source/drivers/ado/ado.xml b/connectivity/source/drivers/ado/ado.xml
index 2be460df8f..2be460df8f 100644..100755
--- a/connectivity/source/drivers/ado/ado.xml
+++ b/connectivity/source/drivers/ado/ado.xml
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h
index 459fa29489..459fa29489 100644..100755
--- a/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_post_sys_include.h
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h
index b1ac0e3e51..b1ac0e3e51 100644..100755
--- a/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index ad6c2e915e..0cd39004a7 100644..100755
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -106,7 +106,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType)
         case adDBTime:				nType = DataType::TIME;			break;
         case adDate:
         case adDBTimeStamp:			nType = DataType::TIMESTAMP;	break;
-        case adBoolean:				nType = DataType::BIT;			break;
+        case adBoolean:				nType = DataType::BOOLEAN;		break;
 //		case adArray:				nType = DataType::ARRAY;		break;
         case adBinary:				nType = DataType::BINARY;		break;
         case adGUID:				nType = DataType::OBJECT;		break;
@@ -152,6 +152,7 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
         case DataType::DATE:			return isJetEngine(_nJetEngine) ? adDate : adDBDate;			break;
         case DataType::TIME:			return adDBTime;			break;
         case DataType::TIMESTAMP:		return isJetEngine(_nJetEngine) ? adDate : adDBTimeStamp;		break;
+        case DataType::BOOLEAN:
         case DataType::BIT:				return adBoolean;			break;
         case DataType::BINARY:			return adBinary;			break;
         case DataType::VARCHAR:			return adVarWChar;			break;
diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/ado/exports.dxp
+++ b/connectivity/source/drivers/ado/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 77a3147d54..02b72a7e7a 100644..100755
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -110,3 +110,11 @@ dummy:
 # --- Targets ----------------------------------
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/ado.component
+
+$(MISC)/ado.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ado.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ado.component
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 985a3b21df..985a3b21df 100644..100755
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index e3d7bcaa44..e3d7bcaa44 100644..100755
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 44f6f89928..44f6f89928 100644..100755
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index c25d533d57..c25d533d57 100644..100755
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 4317829cf9..4317829cf9 100644..100755
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index 13487b5067..13487b5067 100644..100755
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 4429ec9950..4429ec9950 100644..100755
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index 9bdc780c82..9bdc780c82 100644..100755
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 12f2cc36c9..64efd5f09e 100644..100755
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -467,8 +467,8 @@ void OCalcTable::fillColumns()
     String aStrFieldName;
     aStrFieldName.AssignAscii("Column");
     ::rtl::OUString aTypeName;
-    ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
-    const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
+    const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
 
     for (sal_Int32 i = 0; i < m_nDataCols; i++)
     {
@@ -826,12 +826,12 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::fetchRow" );
     // read the bookmark
 
-    BOOL bIsCurRecordDeleted = sal_False;
+    sal_Bool bIsCurRecordDeleted = sal_False;
     _rRow->setDeleted(bIsCurRecordDeleted);
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     // fields
 
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 2cee66ace7..2cee66ace7 100644..100755
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml
index 31a73e8bdd..31a73e8bdd 100644..100755
--- a/connectivity/source/drivers/calc/CalcDriver.xml
+++ b/connectivity/source/drivers/calc/CalcDriver.xml
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 6fe2f9b873..25a285d5bd 100644..100755
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "calc/CDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::calc;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
new file mode 100755
index 0000000000..be949f70de
--- /dev/null
+++ b/connectivity/source/drivers/calc/calc.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.calc.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/calc/exports.dxp
+++ b/connectivity/source/drivers/calc/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 8b5958f307..d36438a277 100644..100755
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -87,3 +87,13 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+
+
+ALLTAR : $(MISC)/calc.component
+
+$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        calc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt calc.component
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 3e5f2b8bde..3e5f2b8bde 100644..100755
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 5ac5414163..9a21d955ae 100644..100755
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -115,7 +115,7 @@ OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
                 if (pIter)
                 {
                     pEvaluateSet = new OEvaluateSet();
-                    ULONG nRec = pIter->First();
+                    sal_uIntPtr nRec = pIter->First();
                     while (nRec != NODE_NOTFOUND)
                     {
                         (*pEvaluateSet)[nRec] = nRec;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index 6f2fb95d5b..6f2fb95d5b 100644..100755
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index e2dc2e30b8..e2dc2e30b8 100644..100755
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 004875c606..004875c606 100644..100755
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 27b802c53f..27b802c53f 100644..100755
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 14d7f22d45..600a712b01 100644..100755
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -68,7 +68,7 @@ using namespace com::sun::star::lang;
 
 IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index");
 // -------------------------------------------------------------------------
-ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()*/)
+ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
     ,m_pFileStream(NULL)
     ,m_nCurNode(NODE_NOTFOUND)
     ,m_pTable(_pTable)
@@ -144,7 +144,7 @@ ONDXPagePtr ODbaseIndex::getRoot()
     {
         m_nRootPage = m_aHeader.db_rootpage;
         m_nPageCount = m_aHeader.db_pagecount;
-        m_aRoot = CreatePage(m_nRootPage,NULL,TRUE);
+        m_aRoot = CreatePage(m_nRootPage,NULL,sal_True);
     }
     return m_aRoot;
 }
@@ -186,7 +186,7 @@ OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
     return new OIndexIterator(this, pOp, pOperand);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     // Search a specific value in Index
@@ -208,13 +208,13 @@ BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
     catch (Exception&)
     {
         OSL_ASSERT(0);
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -225,7 +225,7 @@ BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -234,35 +234,35 @@ BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Does the value already exist
     // Use Find() always to determine the actual leaf
     if (!ConvertToKey(&aKey, nRec, rValue) || (getRoot()->Find(aKey) && isUnique()))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // insert in the current leaf
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 
-    BOOL bResult = m_aCurLeaf->Insert(aNewNode);
+    sal_Bool bResult = m_aCurLeaf->Insert(aNewNode);
     Release(bResult);
 
     return bResult;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
+sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
                          const ORowSetValue& rNewValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rNewValue) || (isUnique() && getRoot()->Find(aKey)))
-        return FALSE;
+        return sal_False;
     else
         return Delete(nRec, rOldValue) && Insert(nRec,rNewValue);
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -270,13 +270,13 @@ BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Always use Find() to determine the actual leaf
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rValue) || !getRoot()->Find(aKey))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // insert in the current leaf
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 #if OSL_DEBUG_LEVEL > 1
     m_aRoot->PrintPage();
 #endif
@@ -290,10 +290,10 @@ void ODbaseIndex::Collect(ONDXPage* pPage)
         m_aCollector.push_back(pPage);
 }
 //------------------------------------------------------------------
-void ODbaseIndex::Release(BOOL bSave)
+void ODbaseIndex::Release(sal_Bool bSave)
 {
     // Release the Index-recources
-    m_bUseCollector = FALSE;
+    m_bUseCollector = sal_False;
 
     if (m_aCurLeaf.Is())
     {
@@ -308,7 +308,7 @@ void ODbaseIndex::Release(BOOL bSave)
         m_aRoot.Clear();
     }
     // Release all references, before the FileStream will be closed
-    for (ULONG i = 0; i < m_aCollector.size(); i++)
+    for (sal_uIntPtr i = 0; i < m_aCollector.size(); i++)
         m_aCollector[i]->QueryDelete();
 
     m_aCollector.clear();
@@ -336,7 +336,7 @@ void ODbaseIndex::closeImpl()
     }
 }
 //------------------------------------------------------------------
-ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, BOOL bLoad)
+ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bool bLoad)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
 
@@ -401,14 +401,14 @@ void ODbaseIndex::createINFEntry()
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
 
-    USHORT nSuffix = aInfFile.GetKeyCount();
+    sal_uInt16 nSuffix = aInfFile.GetKeyCount();
     ByteString aNewEntry,aKeyName;
-    BOOL bCase = isCaseSensitive();
+    sal_Bool bCase = isCaseSensitive();
     while (!aNewEntry.Len())
     {
         aNewEntry = "NDX";
         aNewEntry += ByteString::CreateFromInt32(++nSuffix);
-        for (USHORT i = 0; i < aInfFile.GetKeyCount(); i++)
+        for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
             if (bCase ? aKeyName == aNewEntry : aKeyName.EqualsIgnoreCaseAscii(aNewEntry))
@@ -421,7 +421,7 @@ void ODbaseIndex::createINFEntry()
     aInfFile.WriteKey(aNewEntry,ByteString(sEntry,m_pTable->getConnection()->getTextEncoding()));
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseIndex::DropImpl()
+sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
 
@@ -444,13 +444,13 @@ BOOL ODbaseIndex::DropImpl()
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
-    USHORT nKeyCnt = aInfFile.GetKeyCount();
+    sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
     ByteString aKeyName;
     String sEntry = m_Name;
     sEntry += String::CreateFromAscii(".ndx");
 
     // delete entries from the inf file
-    for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+    for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
     {
         // References the Key to an Index-file?
         aKeyName = aInfFile.GetKeyName( nKey );
@@ -463,7 +463,7 @@ BOOL ODbaseIndex::DropImpl()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
@@ -474,7 +474,7 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
     m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::CreateImpl()
+sal_Bool ODbaseIndex::CreateImpl()
 {
     // Create the Index
     const ::rtl::OUString sFile = getCompletePath();
@@ -556,7 +556,7 @@ BOOL ODbaseIndex::CreateImpl()
     xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
 
     m_aHeader.db_keytype = (nType == DataType::VARCHAR || nType == DataType::CHAR) ? 0 : 1;
-    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (USHORT)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (sal_uInt16)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
     m_aHeader.db_keylen = (( m_aHeader.db_keylen - 1) / 4 + 1) * 4;
     m_aHeader.db_maxkeys = (PAGE_SIZE - 4) / (8 + m_aHeader.db_keylen);
     if ( m_aHeader.db_maxkeys < 3 )
@@ -567,7 +567,7 @@ BOOL ODbaseIndex::CreateImpl()
     m_pFileStream->SetStreamSize(PAGE_SIZE);
 
     ByteString aCol(aName,m_pTable->getConnection()->getTextEncoding());
-    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((USHORT)sizeof(m_aHeader.db_name), aCol.Len()));
+    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((sal_uInt16)sizeof(m_aHeader.db_name), aCol.Len()));
     m_aHeader.db_unique  = m_IsUnique ? 1: 0;
     m_aHeader.db_keyrec  = m_aHeader.db_keylen + 8;
 
@@ -577,9 +577,9 @@ BOOL ODbaseIndex::CreateImpl()
     m_nPageCount = 2;
 
     m_aCurLeaf = m_aRoot = CreatePage(m_nRootPage);
-    m_aRoot->SetModified(TRUE);
+    m_aRoot->SetModified(sal_True);
 
-    m_bUseCollector = TRUE;
+    m_bUseCollector = sal_True;
 
     sal_Int32 nRowsLeft = 0;
     Reference<XRow> xRow(xSet,UNO_QUERY);
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index b10780bfc6..b2f22c7e96 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
                                                     ,sal_False
                                                     ,sal_False
                                                     ,sal_False
-                                                    ,pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                                                    ,pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 
     return xRet;
 }
@@ -83,7 +83,7 @@ void ODbaseIndexColumns::impl_refresh() throw(RuntimeException)
 // -------------------------------------------------------------------------
 Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
 {
-    return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+    return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index e6ec2edba4..ed3020ba12 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -46,20 +46,20 @@ OIndexIterator::~OIndexIterator()
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::First()
+sal_uIntPtr OIndexIterator::First()
 {
-    return Find(TRUE);
+    return Find(sal_True);
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::Next()
+sal_uIntPtr OIndexIterator::Next()
 {
-    return Find(FALSE);
+    return Find(sal_False);
 }
 //------------------------------------------------------------------
-ULONG OIndexIterator::Find(BOOL bFirst)
+sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
 {
-    ULONG nRes = STRING_NOTFOUND;
+    sal_uIntPtr nRes = STRING_NOTFOUND;
 
     if (bFirst)
     {
@@ -103,7 +103,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     // '<='-condition are saved. this is considered for inserts.
     //	ONDXIndex* m_pIndex = GetNDXIndex();
     OOp_COMPARE aTempOp(SQLFilterOperator::GREATER);
-    USHORT i = 0;
+    sal_uInt16 i = 0;
 
     if (pPage->IsLeaf())
     {
@@ -141,7 +141,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetCompare(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
 {
     ONDXKey* pKey = NULL;
     sal_Int32 ePredicateType = PTR_CAST(file::OOp_COMPARE,m_pOperator)->getPredicateType();
@@ -211,7 +211,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetLike(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
 {
     if (bFirst)
     {
@@ -231,7 +231,7 @@ ULONG OIndexIterator::GetLike(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
 {
     if (bFirst)
     {
@@ -253,15 +253,15 @@ ULONG OIndexIterator::GetNull(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNotNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
 {
     ONDXKey* pKey;
     if (bFirst)
     {
         // erst alle NULL werte abklappern
-        for (ULONG nRec = GetNull(bFirst);
+        for (sal_uIntPtr nRec = GetNull(bFirst);
              nRec != STRING_NOTFOUND;
-             nRec = GetNull(FALSE))
+             nRec = GetNull(sal_False))
                  ;
         pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : NULL;
     }
@@ -283,7 +283,7 @@ ONDXKey* OIndexIterator::GetNextKey()
             ONDXPage* pParentPage = pPage->GetParent();
             if (pParentPage)
             {
-                USHORT nPos = pParentPage->Search(pPage);
+                sal_uInt16 nPos = pParentPage->Search(pPage);
                 if (nPos != pParentPage->Count() - 1)
                 {	// page found 
                     pPage = (*pParentPage)[nPos+1].GetChild(m_pIndex,pParentPage);
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index b5be60ff22..b5be60ff22 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 95bc3f756b..242627d1ee 100644..100755
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -91,7 +91,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
         OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
         sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
 
-        ULONG nLen = m_pFileStream->Seek(nPos);
+        sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
         if (m_pFileStream->GetError() != ERRCODE_NONE)
             goto Error;
 
@@ -127,10 +127,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    bool bIsText = true;
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
     switch (m_aMemoHeader.db_typ)
@@ -141,13 +141,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;			// to prevent a random value
-            BOOL bReady = sal_False;
+            bool bReady = false;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -169,14 +169,14 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             // Foxpro stores text and binary data
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
-                if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+                if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
                 {
                     return sal_False;
                 }
 
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
                 return sal_False;
             }
@@ -215,7 +215,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -228,11 +228,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer		= new BYTE[m_nBufferSize+1];
+        m_pBuffer		= new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
@@ -268,7 +268,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -301,7 +301,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -315,7 +315,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -336,7 +336,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXKey::IsText" );
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
@@ -364,7 +364,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -441,15 +441,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * 512);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -458,7 +458,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Page does not yet exist
-    ULONG nSize = (rPage.GetPagePos() + 1) * 512;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * 512;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -466,27 +466,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[512];
         memset(aEmptyData,0x00,512);
-        rStream.Write((BYTE*)aEmptyData,512);
+        rStream.Write((sal_uInt8*)aEmptyData,512);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % 512;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % 512;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nSize = nBufferSize - nTell;
         char* pEmptyData = new char[nSize];
         memset(pEmptyData,0x00,nSize);
-        rStream.Write((BYTE*)pEmptyData,nSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -501,7 +501,7 @@ void ONDXPage::PrintPage()
     DBG_TRACE4("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -526,7 +526,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -537,18 +537,18 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::IsFull" );
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
     // binary search afterwards
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -557,10 +557,10 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -577,7 +577,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -586,34 +586,34 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Remove" );
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 67f7c36941..67f7c36941 100644..100755
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index d055bdb6b3..d055bdb6b3 100644..100755
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index 9e0e5ddfc8..9e0e5ddfc8 100644..100755
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index aa94c520d4..23dd195304 100644..100755
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -208,12 +208,12 @@ void ODbaseTable::readHeader()
     m_pFileStream->RefreshBuffer(); // Make sure, that the header information actually is read again
     m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
 
-    BYTE nType=0;
+    sal_uInt8 nType=0;
     (*m_pFileStream) >> nType;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
-    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
     (*m_pFileStream) >> m_aHeader.db_anz;
@@ -225,7 +225,7 @@ void ODbaseTable::readHeader()
     (*m_pFileStream) >> m_aHeader.db_slng;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
-    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
@@ -319,7 +319,7 @@ void ODbaseTable::fillColumns()
     aStrFieldName.AssignAscii("Column");
     ::rtl::OUString aTypeName;
     static const ::rtl::OUString sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
-    const sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
 
     sal_Int32 i = 0;
@@ -528,7 +528,7 @@ void ODbaseTable::construct()
         }
         fillColumns();
 
-        UINT32 nFileSize = lcl_getFileSize(*m_pFileStream);
+        sal_uInt32 nFileSize = lcl_getFileSize(*m_pFileStream);
         m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
         if ( m_aHeader.db_anz == 0 && ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng) > 0) // seems to be empty or someone wrote bullshit into the dbase file
             m_aHeader.db_anz = ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng);
@@ -556,7 +556,7 @@ void ODbaseTable::construct()
     }
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemoHeader()
+sal_Bool ODbaseTable::ReadMemoHeader()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemoHeader" );
     m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
@@ -580,7 +580,7 @@ BOOL ODbaseTable::ReadMemoHeader()
                 m_pMemoStream->Seek(m_aMemoHeader.db_size);
                 m_pMemoStream->Read(sHeader,4);
 
-                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
                     m_aMemoHeader.db_typ  = MemodBaseIII;
                 else
                     m_aMemoHeader.db_typ  = MemodBaseIV;
@@ -603,7 +603,7 @@ BOOL ODbaseTable::ReadMemoHeader()
             OSL_ENSURE( false, "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
             break;
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
@@ -679,11 +679,11 @@ void ODbaseTable::refreshIndexes()
         aURL.setExtension(String::CreateFromAscii("inf"));
         Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
         aInfFile.SetGroup(dBASE_III_GROUP);
-        USHORT nKeyCnt = aInfFile.GetKeyCount();
+        sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
         ByteString aKeyName;
         ByteString aIndexName;
 
-        for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+        for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
         {
             // Refences the key an index-file?
             aKeyName = aInfFile.GetKeyName( nKey );
@@ -786,7 +786,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::fetchRow" );
     // Read the data
-    BOOL bIsCurRecordDeleted = ((char)m_pBuffer[0] == '*') ? TRUE : sal_False;
+    bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
 
     // only read the bookmark
 
@@ -795,7 +795,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     sal_Size nByteOffset = 1;
     // Fields:
@@ -968,13 +968,13 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
                 break;
                 case DataType::BIT:
                 {
-                    BOOL b;
+                    sal_Bool b;
                     switch (* ((const char *)pData))
                     {
                         case 'T':
                         case 'Y':
-                        case 'J':	b = TRUE; break;
-                        default: 	b = FALSE; break;
+                        case 'J':	b = sal_True; break;
+                        default: 	b = sal_False; break;
                     }
                     *(_rRow->get())[i] = b;
                 }
@@ -1019,7 +1019,7 @@ void ODbaseTable::FileClose()
     ODbaseTable_BASE::FileClose();
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseTable::CreateImpl()
+sal_Bool ODbaseTable::CreateImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
     OSL_ENSURE(!m_pFileStream, "SequenceError");
@@ -1068,7 +1068,7 @@ BOOL ODbaseTable::CreateImpl()
     {
     }
 
-    BOOL bMemoFile = sal_False;
+    sal_Bool bMemoFile = sal_False;
 
     sal_Bool bOk = CreateFile(aURL, bMemoFile);
 
@@ -1131,7 +1131,7 @@ BOOL ODbaseTable::CreateImpl()
     else
         m_aHeader.db_typ = dBaseIII;
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
@@ -1154,7 +1154,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
 }
 //------------------------------------------------------------------
 // creates in principle dBase IV file format
-BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
+sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateFile" );
     bCreateMemo = sal_False;
@@ -1165,7 +1165,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     if (!m_pFileStream)
         return sal_False;
 
-    BYTE nDbaseType = dBaseIII;
+    sal_uInt8 nDbaseType = dBaseIII;
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
     Reference<XPropertySet> xCol;
     const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
@@ -1207,19 +1207,19 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     memset(aBuffer,0,sizeof(aBuffer));
 
     m_pFileStream->Seek(0L);
-    (*m_pFileStream) << (BYTE) nDbaseType;                              // dBase format
-    (*m_pFileStream) << (BYTE) (aDate.GetYear() % 100);                 // current date
+    (*m_pFileStream) << (sal_uInt8) nDbaseType;                              // dBase format
+    (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100);                 // current date
 
 
-    (*m_pFileStream) << (BYTE) aDate.GetMonth();
-    (*m_pFileStream) << (BYTE) aDate.GetDay();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetMonth();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetDay();
     (*m_pFileStream) << 0L;                                             // number of data records
-    (*m_pFileStream) << (USHORT)((m_pColumns->getCount()+1) * 32 + 1);  // header information,
+    (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1);  // header information,
                                                                         // pColumns contains always an additional column
-    (*m_pFileStream) << (USHORT) 0;                                     // record length will be determined later 
+    (*m_pFileStream) << (sal_uInt16) 0;                                     // record length will be determined later 
     m_pFileStream->Write(aBuffer, 20);
 
-    USHORT nRecLength = 1;                                              // Length 1 for deleted flag
+    sal_uInt16 nRecLength = 1;                                              // Length 1 for deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
     ::rtl::OUString aName;
     const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
@@ -1312,9 +1312,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     {
                         throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
                     }
-                    (*m_pFileStream) << (BYTE) Min((unsigned)nPrecision, 255U);      // field length
-                    nRecLength = nRecLength + (USHORT)::std::min((USHORT)nPrecision, (USHORT)255UL);
-                    (*m_pFileStream) << (BYTE)0;                                                                // decimals
+                    (*m_pFileStream) << (sal_uInt8) Min((unsigned)nPrecision, 255U);      // field length
+                    nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
+                    (*m_pFileStream) << (sal_uInt8)0;                                                                // decimals
                     break;
                 case 'F':
                 case 'N':
@@ -1326,41 +1326,41 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     }
                     if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency will be treated separately
                     {
-                        (*m_pFileStream) << (BYTE)10;          // standard length
-                        (*m_pFileStream) << (BYTE)4;
+                        (*m_pFileStream) << (sal_uInt8)10;          // standard length
+                        (*m_pFileStream) << (sal_uInt8)4;
                         nRecLength += 10;
                     }
                     else
                     {
                         sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale);
 
-                        (*m_pFileStream) << (BYTE)( nPrec);
-                        (*m_pFileStream) << (BYTE)nScale;
-                        nRecLength += (USHORT)nPrec;
+                        (*m_pFileStream) << (sal_uInt8)( nPrec);
+                        (*m_pFileStream) << (sal_uInt8)nScale;
+                        nRecLength += (sal_uInt16)nPrec;
                     }
                     break;
                 case 'L':
-                    (*m_pFileStream) << (BYTE)1;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)1;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     ++nRecLength;
                     break;
                 case 'I':
-                    (*m_pFileStream) << (BYTE)4;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)4;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 4;
                     break;
                 case 'Y':
                 case 'B':
                 case 'T':
                 case 'D':
-                    (*m_pFileStream) << (BYTE)8;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)8;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 8;
                     break;
                 case 'M':
-                    bCreateMemo = TRUE;
-                    (*m_pFileStream) << (BYTE)10;
-                    (*m_pFileStream) << (BYTE)0;
+                    bCreateMemo = sal_True;
+                    (*m_pFileStream) << (sal_uInt8)10;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 10;
                     if ( bBinary )
                         aBuffer[0] = 0x06;
@@ -1372,7 +1372,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
             aBuffer[0] = 0x00;
         }
 
-        (*m_pFileStream) << (BYTE)FIELD_DESCRIPTOR_TERMINATOR;              // end of header
+        (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR;              // end of header
         (*m_pFileStream) << (char)DBF_EOL;
         m_pFileStream->Seek(10L);
         (*m_pFileStream) << nRecLength;                                     // set record length afterwards
@@ -1381,9 +1381,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         {
             m_pFileStream->Seek(0L);
             if (nDbaseType == VisualFoxPro)
-                (*m_pFileStream) << (BYTE) FoxProMemo;
+                (*m_pFileStream) << (sal_uInt8) FoxProMemo;
             else
-                (*m_pFileStream) << (BYTE) dBaseIIIMemo;
+                (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo;
         } // if (bCreateMemo)
     }
     catch ( const Exception& e )
@@ -1398,12 +1398,12 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         catch(const Exception&) { }
         throw;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
 // creates in principle dBase III file format
-BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
+sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateMemoFile" );
     // filehandling macro for table creation
@@ -1415,16 +1415,8 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     char aBuffer[512];              // write buffer
     memset(aBuffer,0,sizeof(aBuffer));
 
-#ifdef WIN
-    m_pMemoStream->Seek(0L);
-    for (UINT16 i = 0; i < 512; i++)
-    {
-        (*m_pMemoStream) << BYTE(0);
-    }
-#else
     m_pMemoStream->SetFiller('\0');
     m_pMemoStream->SetStreamSize(512);
-#endif
 
     m_pMemoStream->Seek(0L);
     (*m_pMemoStream) << long(1);                  // pointer to the first free block
@@ -1432,16 +1424,16 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     m_pMemoStream->Flush();
     delete m_pMemoStream;
     m_pMemoStream = NULL;
-    return TRUE;
+    return sal_True;
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
     INetURLObject aURL;
     aURL.SetURL(_sUrl);
 
-    BOOL bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
+    sal_Bool bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
 
     if(bDropped)
     {
@@ -1484,7 +1476,7 @@ BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFie
     return bDropped;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::DropImpl()
+sal_Bool ODbaseTable::DropImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DropImpl" );
     FileClose();
@@ -1492,7 +1484,7 @@ BOOL ODbaseTable::DropImpl()
     if(!m_pIndexes)
         refreshIndexes(); // look for indexes which must be deleted as well
 
-    BOOL bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
+    sal_Bool bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
     if(!bDropped)
     {// we couldn't drop the table so we have to reopen it
         construct();
@@ -1503,7 +1495,7 @@ BOOL ODbaseTable::DropImpl()
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::InsertRow" );
     // fill buffer with blanks
@@ -1513,13 +1505,13 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 
     // Copy new row completely:
     // ... and add at the end as new Record:
-    UINT32 nTempPos = m_nFilePos;
+    sal_uInt32 nTempPos = m_nFilePos;
 
-    m_nFilePos = (ULONG)m_aHeader.db_anz + 1;
-    BOOL bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
+    m_nFilePos = (sal_uIntPtr)m_aHeader.db_anz + 1;
+    sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
     if ( bInsertRow )
     {
-        UINT32 nFileSize = 0, nMemoFileSize = 0;
+        sal_uInt32 nFileSize = 0, nMemoFileSize = 0;
 
         nFileSize = lcl_getFileSize(*m_pFileStream);		
 
@@ -1561,7 +1553,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateRow" );
     // fill buffer with blanks
@@ -1572,7 +1564,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
     m_pFileStream->Seek(nPos);
     m_pFileStream->Read((char*)m_pBuffer, m_aHeader.db_slng);
 
-    UINT32 nMemoFileSize( 0 );
+    sal_uInt32 nMemoFileSize( 0 );
     if (HasMemoFields() && m_pMemoStream)
     {
         m_pMemoStream->Seek(STREAM_SEEK_TO_END);
@@ -1591,7 +1583,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
+sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DeleteRow" );
     // Set the Delete-Flag (be it set or not):
@@ -1601,13 +1593,13 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 
     OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
 
-    if (!fetchRow(aRow,_rCols,TRUE,TRUE))
+    if (!fetchRow(aRow,_rCols,sal_True,sal_True))
         return sal_False;
 
     Reference<XPropertySet> xCol;
     ::rtl::OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
-    for (USHORT i = 0; i < m_pColumns->getCount(); i++)
+    for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
     {
         Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
         if (xIndex.is())
@@ -1639,7 +1631,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
     }
 
     m_pFileStream->Seek(nFilePos);
-    (*m_pFileStream) << (BYTE)'*'; // mark the row in the table as deleted
+    (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted
     m_pFileStream->Flush();
     return sal_True;
 }
@@ -1679,18 +1671,18 @@ double toDouble(const ByteString& rString)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateBuffer" );
     OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
     if ( !m_pBuffer )
-        return FALSE;
+        return sal_False;
     sal_Int32 nByteOffset  = 1;
 
     // Update fields:
     Reference<XPropertySet> xCol;
     Reference<XPropertySet> xIndex;
-    USHORT i;
+    sal_uInt16 i;
     ::rtl::OUString aColName;
     const sal_Int32 nColumnCount = m_pColumns->getCount();
     ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
@@ -1956,7 +1948,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                     char cNext = pData[nLen]; // Mark's scratch and replaced by 0
                     pData[nLen] = '\0';		  // This is because the buffer is always a sign of greater ...
 
-                    ULONG nBlockNo = strtol((const char *)pData,NULL,10);	// Block number read
+                    sal_uIntPtr nBlockNo = strtol((const char *)pData,NULL,10);	// Block number read
 
                     // Next initial character restore again:
                     pData[nLen] = cNext;
@@ -2012,14 +2004,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
 }
 
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
+sal_Bool ODbaseTable::WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
     // if the BlockNo 0 is given, the block will be appended at the end
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     ::rtl::OString aStr;
     ::com::sun::star::uno::Sequence<sal_Int8> aValue;
-    BYTE nHeader[4];
+    sal_uInt8 nHeader[4];
     const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
     if ( bBinary )
     {
@@ -2032,7 +2024,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     }
 
     // append or overwrite
-    BOOL bAppend = rBlockNr == 0;
+    sal_Bool bAppend = rBlockNr == 0;
 
     if (!bAppend)
     {
@@ -2049,7 +2041,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                 m_pMemoStream->SeekRel(4L);
                 m_pMemoStream->Read(sHeader,4);
 
-                ULONG nOldSize;
+                sal_uIntPtr nOldSize;
                 if (m_aMemoHeader.db_typ == MemoFoxPro)
                     nOldSize = ((((unsigned char)sHeader[0]) * 256 +
                                  (unsigned char)sHeader[1]) * 256 +
@@ -2062,7 +2054,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                                  (unsigned char)sHeader[0]  - 8;
 
                 // fits the new length in the used blocks
-                ULONG nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
+                sal_uIntPtr nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
                       nOldUsedBlocks = ((nOldSize + 8) / m_aMemoHeader.db_size) + (((nOldSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0);
                 bAppend = nUsedBlocks > nOldUsedBlocks;
             }
@@ -2071,7 +2063,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
 
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         // fill last block
         rBlockNr = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
@@ -2096,30 +2088,30 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
         case MemodBaseIV: // dBase IV-Memofeld with length
         {
             if ( MemodBaseIV == m_aMemoHeader.db_typ )
-                (*m_pMemoStream) << (BYTE)0xFF
-                                 << (BYTE)0xFF
-                                 << (BYTE)0x08;
+                (*m_pMemoStream) << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0x08;
             else
-                (*m_pMemoStream) << (BYTE)0x00
-                                 << (BYTE)0x00
-                                 << (BYTE)0x00;
+                (*m_pMemoStream) << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00;
 
-            UINT32 nWriteSize = nSize;
+            sal_uInt32 nWriteSize = nSize;
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
                 if ( bBinary )
-                    (*m_pMemoStream) << (BYTE) 0x00; // Picture
+                    (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture
                 else
-                    (*m_pMemoStream) << (BYTE) 0x01; // Memo
+                    (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo
                 for (int i = 4; i > 0; nWriteSize >>= 8)
-                    nHeader[--i] = (BYTE) (nWriteSize % 256);
+                    nHeader[--i] = (sal_uInt8) (nWriteSize % 256);
             }
             else
             {
-                (*m_pMemoStream) << (BYTE) 0x00;
+                (*m_pMemoStream) << (sal_uInt8) 0x00;
                 nWriteSize += 8;
                 for (int i = 0; i < 4; nWriteSize >>= 8)
-                    nHeader[i++] = (BYTE) (nWriteSize % 256);
+                    nHeader[i++] = (sal_uInt8) (nWriteSize % 256);
             }
 
             m_pMemoStream->Write(nHeader,4);
@@ -2135,7 +2127,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     // Write the new block number
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
         // Write the new block number
@@ -2192,7 +2184,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         if(xOldColumn.is())
             xCopyColumn = xOldColumn->createDataDescriptor();
         else
-            xCopyColumn = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+            xCopyColumn = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 
         ::comphelper::copyProperties(descriptor,xCopyColumn);
 
@@ -2217,7 +2209,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
             if(xColumn.is())
                 xCpy = xColumn->createDataDescriptor();
             else
-                xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
             ::comphelper::copyProperties(xProp,xCpy);
             xAppend->appendByDescriptor(xCpy);
         }
@@ -2233,7 +2225,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
             if(xColumn.is())
                 xCpy = xColumn->createDataDescriptor();
             else
-                xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
             ::comphelper::copyProperties(xProp,xCpy);
             xAppend->appendByDescriptor(xCpy);
         }
@@ -2374,7 +2366,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
     pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         // copy the structure
         for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
         {
@@ -2407,7 +2399,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         ::dbtools::throwGenericSQLException( sError, *this );
     }
 
-    BOOL bAlreadyDroped = FALSE;
+    sal_Bool bAlreadyDroped = sal_False;
     try
     {
         pNewTable->construct();
@@ -2416,7 +2408,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         // drop the old table
         if(DropImpl())
         {
-            bAlreadyDroped = TRUE;
+            bAlreadyDroped = sal_True;
             pNewTable->renameImpl(m_Name);
             // release the temp file
         }
@@ -2447,7 +2439,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         // copy the structure
         for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
         {
@@ -2680,10 +2672,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    bool bIsText = true;
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
     switch (m_aMemoHeader.db_typ)
@@ -2694,13 +2686,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;			// avoid random value
-            BOOL bReady = sal_False;
+            sal_Bool bReady = sal_False;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -2724,7 +2716,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             {
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
                 return sal_False;
             }
@@ -2773,7 +2765,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -2786,11 +2778,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer		= new BYTE[m_nBufferSize+1];
+        m_pBuffer		= new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 7c4b452e87..7c4b452e87 100644..100755
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 827bf4f13d..fc2076b14e 100644..100755
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "dbase/DDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::dbase;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component
new file mode 100755
index 0000000000..7f913f0836
--- /dev/null
+++ b/connectivity/source/drivers/dbase/dbase.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map
index c5b4377b04..87eccc45b6 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.mxp.map
+++ b/connectivity/source/drivers/dbase/dbase.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/dbase/dbase.xml b/connectivity/source/drivers/dbase/dbase.xml
index e378fcd5fd..e378fcd5fd 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.xml
+++ b/connectivity/source/drivers/dbase/dbase.xml
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 66c248540b..118e072781 100644..100755
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -43,19 +43,19 @@ using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::sdbc;
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(UINT32 nRec)
+ONDXKey::ONDXKey(sal_uInt32 nRec)
     :nRecord(nRec)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
     : ONDXKey_BASE(eType)
     , nRecord(nRec)
     , xValue(rVal)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
 {
@@ -66,7 +66,8 @@ ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
     }
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+
+ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
      ,nRecord(nRec)
      ,xValue(aVal)
@@ -79,7 +80,7 @@ ONDXKey::ONDXKey(double aVal, UINT32 nRec)
 //==================================================================
 ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
            :nPagePos(nPos)
-           ,bModified(FALSE)
+           ,bModified(sal_False)
            ,nCount(0)
            ,aParent(pParent)
            ,rIndex(rInd)
@@ -101,16 +102,16 @@ void ONDXPage::QueryDelete()
     if (IsModified() && rIndex.m_pFileStream)
         (*rIndex.m_pFileStream) << *this;
 
-    bModified = FALSE;
+    bModified = sal_False;
     if (rIndex.UseCollector())
     {
         if (aChild.Is())
-            aChild->Release(FALSE);
+            aChild->Release(sal_False);
 
-        for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+        for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
         {
             if (ppNodes[i].GetChild().Is())
-                ppNodes[i].GetChild()->Release(FALSE);
+                ppNodes[i].GetChild()->Release(sal_False);
 
             ppNodes[i] = ONDXNode();
         }
@@ -134,10 +135,10 @@ ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
+sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
 {
     // searches the position for the given key in a page
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
@@ -145,17 +146,17 @@ USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Find(const ONDXKey& rKey)
+sal_Bool ONDXPage::Find(const ONDXKey& rKey)
 {
     // searches the given key
     // Speciality: At the end of the method
     // the actual page and the position of the node, fulfilling the '<=' condition, are saved
     // This is considered at insert.
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
 
     if (!IsLeaf())
     {
@@ -167,7 +168,7 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
     {
         rIndex.m_aCurLeaf = this;
         rIndex.m_nCurNode = i - 1;
-        bResult = FALSE;
+        bResult = sal_False;
     }
     else
     {
@@ -179,14 +180,14 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
+sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 {
     // When creating an index there can be multiple nodes added,
     // these are sorted ascending 
-    BOOL bAppend = nRowsLeft > 0;
+    sal_Bool bAppend = nRowsLeft > 0;
     if (IsFull())
     {
-        BOOL bResult = TRUE;
+        sal_Bool bResult = sal_True;
         ONDXNode aSplitNode;
         if (bAppend)
             aSplitNode = rNode;
@@ -206,7 +207,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
                 }
                 else  // Position unbekannt
                 {
-                    USHORT nPos = NODE_NOTFOUND;
+                    sal_uInt16 nPos = NODE_NOTFOUND;
                     while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
 
                     --nCount;	// (otherwise we might get Assertions and GPFs - 60593)
@@ -289,7 +290,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
         }
         else
         {
-            USHORT nNodePos = FindPos(rNode.GetKey());
+            sal_uInt16 nNodePos = FindPos(rNode.GetKey());
             if (IsLeaf())
                 rIndex.m_nCurNode = nNodePos;
 
@@ -299,17 +300,17 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
+sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
 {
-    USHORT nMaxCount = rIndex.getHeader().db_maxkeys;
+    sal_uInt16 nMaxCount = rIndex.getHeader().db_maxkeys;
     if (nPos >= nMaxCount)
-        return FALSE;
+        return sal_False;
 
     if (nCount)
     {
         ++nCount;
         // shift right
-        for (USHORT i = std::min((USHORT)(nMaxCount-1), (USHORT)(nCount-1)); nPos < i; --i)
+        for (sal_uInt16 i = std::min((sal_uInt16)(nMaxCount-1), (sal_uInt16)(nCount-1)); nPos < i; --i)
             (*this)[i] = (*this)[i-1];
     }
     else
@@ -325,19 +326,19 @@ BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
         rNode.GetChild()->SetParent(this);
     }
 
-    bModified = TRUE;
+    bModified = sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Append(ONDXNode& rNode)
+sal_Bool ONDXPage::Append(ONDXNode& rNode)
 {
     DBG_ASSERT(!IsFull(), "kein Append moeglich");
     return Insert(nCount, rNode);
 }
 //------------------------------------------------------------------
-void ONDXPage::Release(BOOL bSave)
+void ONDXPage::Release(sal_Bool bSave)
 {
     // free pages
     if (aChild.Is())
@@ -346,7 +347,7 @@ void ONDXPage::Release(BOOL bSave)
     // free pointer
     aChild.Clear();
 
-    for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+    for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
     {
         if (ppNodes[i].GetChild())
             ppNodes[i].GetChild()->Release(bSave);
@@ -356,7 +357,7 @@ void ONDXPage::Release(BOOL bSave)
     aParent = NULL;
 }
 //------------------------------------------------------------------
-void ONDXPage::ReleaseFull(BOOL bSave)
+void ONDXPage::ReleaseFull(sal_Bool bSave)
 {
     ONDXPagePtr aTempParent = aParent;
     Release(bSave);
@@ -365,7 +366,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     {
         // Free pages not needed, there will be no reference anymore to the pages
         // afterwards 'this' can't be valid anymore!!!
-        USHORT nParentPos = aTempParent->Search(this);
+        sal_uInt16 nParentPos = aTempParent->Search(this);
         if (nParentPos != NODE_NOTFOUND)
             (*aTempParent)[nParentPos].GetChild().Clear();
         else
@@ -373,7 +374,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     }
 }
 //------------------------------------------------------------------
-BOOL ONDXPage::Delete(USHORT nNodePos)
+sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
 {
     if (IsLeaf())
     {
@@ -396,7 +397,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     if (HasParent() && nCount < (rIndex.GetMaxNodes() / 2))
     {
         // determine, which node points to the page
-        USHORT nParentNodePos = aParent->Search(this);
+        sal_uInt16 nParentNodePos = aParent->Search(this);
         // last element on parent-page -> merge with secondlast page
         if (nParentNodePos == (aParent->Count() - 1))
         {
@@ -419,7 +420,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     else if (IsRoot())
         // make sure that the position of the root is kept
         rIndex.SetRootPos(nPagePos);
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -440,7 +441,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     ONDXNode aResultNode;
     if (IsLeaf())
     {
-        for (USHORT i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         // this node contains a key that already exists in the tree and must be replaced
@@ -454,7 +455,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     }
     else
     {
-        for (USHORT i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         aResultNode = (*this)[(nCount + 1) / 2];
@@ -469,31 +470,31 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     // inner nodes have no record number
     if (rIndex.isUnique())
         aResultNode.GetKey().ResetRecord();
-    bModified = TRUE;
+    bModified = sal_True;
     return aResultNode;
 }
 
 //------------------------------------------------------------------
-void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
+void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
 {
     DBG_ASSERT(HasParent(), "kein Vater vorhanden");
     DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau");
 
     /*	Merge 2 pages	*/
     ONDXNode aResultNode;
-    USHORT nMaxNodes = rIndex.GetMaxNodes(),
+    sal_uInt16 nMaxNodes = rIndex.GetMaxNodes(),
            nMaxNodes_2 = nMaxNodes / 2;
 
     // Determine if page is right or left neighbour
-    BOOL	bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, if xPage is the right page
-    USHORT	nNewCount = (*xPage).Count() + Count();
+    sal_Bool	bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // sal_True, wenn xPage die rechte Seite ist
+    sal_uInt16	nNewCount = (*xPage).Count() + Count();
 
     if (IsLeaf())
     {
         // Condition for merge
         if (nNewCount < (nMaxNodes_2 * 2))
         {
-            USHORT nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
+            sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
             if (bRight)
             {
                 DBG_ASSERT(&xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
@@ -518,7 +519,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                     (*aParent)[nParentNodePos-1].SetChild(this,aParent);
                 else // or set as right node
                     aParent->SetChild(this);
-                aParent->SetModified(TRUE);
+                aParent->SetModified(sal_True);
 
             }
 
@@ -532,12 +533,12 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else
                 aParent->SearchAndReplace((*this)[nLastNode].GetKey(),(*this)[nCount-1].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull(); // is not needed anymore
         }
         // balance the elements	  nNewCount >= (nMaxNodes_2 * 2)
@@ -580,7 +581,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // Parent node will be integrated; is initialized with Child from xPage
                 (*aParent)[nParentNodePos].SetChild(xPage->GetChild(),aParent);
                 Append((*aParent)[nParentNodePos]);
-                for (USHORT i = 0 ; i < xPage->Count(); i++)
+                for (sal_uInt16 i = 0 ; i < xPage->Count(); i++)
                     Append((*xPage)[i]);
             }
             else
@@ -604,7 +605,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
 
             // afterwards parent node will be reset
             (*aParent)[nParentNodePos].SetChild();
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
 
             if(aParent->IsRoot() && aParent->Count() == 1)
             {
@@ -613,7 +614,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else if(nParentNodePos)
                 // replace the node value
@@ -621,7 +622,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // thats why the node must be updated here
                 aParent->SearchAndReplace((*aParent)[nParentNodePos-1].GetKey(),(*aParent)[nParentNodePos].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull();
         }
         // balance the elements
@@ -652,7 +653,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 (*aParent)[nParentNodePos].SetChild(this,aParent);
 
             }
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
         }
     }
 }
@@ -674,7 +675,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -706,7 +707,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -720,7 +721,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -740,7 +741,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
 }
@@ -766,7 +767,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -839,15 +840,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -856,7 +857,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Page doesn't exist yet
-    ULONG nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -864,27 +865,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[PAGE_SIZE];
         memset(aEmptyData,0x00,PAGE_SIZE);
-        rStream.Write((BYTE*)aEmptyData,PAGE_SIZE);
+        rStream.Write((sal_uInt8*)aEmptyData,PAGE_SIZE);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % PAGE_SIZE;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nRemainSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % PAGE_SIZE;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nRemainSize = nBufferSize - nTell;
         char* pEmptyData = new char[nRemainSize];
         memset(pEmptyData,0x00,nRemainSize);
-        rStream.Write((BYTE*)pEmptyData,nRemainSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nRemainSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -898,7 +899,7 @@ void ONDXPage::PrintPage()
     DBG_TRACE4("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -923,7 +924,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -934,16 +935,16 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     // binary search later
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -952,9 +953,9 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -970,7 +971,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -979,33 +980,33 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/dbase/exports.dxp
+++ b/connectivity/source/drivers/dbase/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 1aac0b0b1e..5c3344b1da 100644..100755
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -127,3 +127,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/dbase.component
+
+$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbase.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbase.component
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index 638b359a89..638b359a89 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index 589063d37e..589063d37e 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index fa627eab64..fa627eab64 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 9e870b6627..9e870b6627 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index d7a103fd6d..d7a103fd6d 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 3f146b2a96..3f146b2a96 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 7777fb2570..7777fb2570 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index 3c82d3f5e3..3c82d3f5e3 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index cee8b601aa..cee8b601aa 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 86bbd94b2c..86bbd94b2c 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index 0bcc612ad7..0bcc612ad7 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index a447a215c8..a447a215c8 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index 042227947a..042227947a 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index 8b9e2b11ab..8b9e2b11ab 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 88f07317ee..88f07317ee 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index aebacca7d2..aebacca7d2 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index d9f58f24ec..b8f88e9057 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -106,7 +106,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
     m_aPrecisions.reserve(nFieldCount);
     m_aScales.reserve(nFieldCount);
 
-    sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -124,11 +124,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         aColumnName += String::CreateFromInt32(i+1);
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -136,7 +136,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -148,11 +148,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -162,7 +162,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -174,7 +174,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // Is the delimiter given correctly?
@@ -187,7 +187,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index e91068c30d..73d952b638 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -64,7 +64,7 @@ namespace connectivity
 
         private:
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
 
             sal_Bool fetchRow(OValueRow _rRow,const OSQLColumns& _rCols);
             sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition);
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index 58f0e15af9..120d6bfd98 100644..100755
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -41,20 +41,20 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
         return 0;
 
     xub_StrLen nTokCount = 1;
-    BOOL bStart = TRUE;		// Are we on the fist character of the token?
-    BOOL bInString = FALSE;	// Are we within a (cStrDel delimited) string?
+    sal_Bool bStart = sal_True;		// Are we on the fist character of the token?
+    sal_Bool bInString = sal_False;	// Are we within a (cStrDel delimited) string?
 
     // Search for the first not-matching character (search ends at the end of string)
     for( xub_StrLen i = 0; i < Len(); i++ )
     {
         if (bStart)
         {
-            bStart = FALSE;
+            bStart = sal_False;
             // First character a string delimiter?
             if ((*this).GetChar(i) == cStrDel)
             {
-                bInString = TRUE;	// then we are within a string!
-                continue;		// read next character!
+                bInString = sal_True;	// then we are within a string!
+                continue;			// read next character!
             }
         }
 
@@ -70,7 +70,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
                 else
                 {
                     // end of String
-                    bInString = FALSE;
+                    bInString = sal_False;
                 }
             }
         } else {
@@ -78,7 +78,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
             if ( (*this).GetChar(i) == cTok )
             {
                 nTokCount++;
-                bStart = TRUE;
+                bStart = sal_True;
             }
         }
     }
@@ -94,7 +94,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
     xub_StrLen nLen = Len();
     if ( nLen )
     {
-        BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel);	// are we within a (cStrDel delimited) String?
+        sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel);	// are we within a (cStrDel delimited) String?
 
         // Is the first character a String-Delimiter?
         if (bInString )
@@ -116,7 +116,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
                     else
                     {
                         // end of String
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
                 else
@@ -151,7 +151,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index 3c04d4b38c..3c04d4b38c 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 13671dee9c..13671dee9c 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 3abd4a12c3..3abd4a12c3 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index 35d4dcd491..35d4dcd491 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index 45c10f7365..3ea2a455e1 100644..100755
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "LDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::evoab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            OEvoabDriver::getImplementationName_Static(),
-            OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index 0e29bcf1cb..0e29bcf1cb 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index e2454dc2a5..e2454dc2a5 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 32fbf1170c..deab8caced 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -115,7 +115,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     m_aPrecisions.reserve(nFieldCount);
     m_aScales.reserve(nFieldCount);
 
-    sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -141,11 +141,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         //OSL_TRACE("OEvoabTable::aColumnName = %s\n", ((OUtoCStr(::rtl::OUString(aColumnName))) ? (OUtoCStr(::rtl::OUString(aColumnName))):("NULL")) );
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -155,7 +155,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -169,11 +169,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -183,7 +183,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -195,7 +195,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // is the delimiter given correctly
@@ -208,7 +208,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
@@ -510,7 +510,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
     // Fields:
@@ -669,7 +669,7 @@ sal_Bool OEvoabTable::setColumnAliases()
             aColumnFinalName = aColumnReadName;
         sColumnFinalName = aColumnFinalName;
 
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         ::rtl::OUString aTypeName;
         aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
         sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(),
@@ -695,7 +695,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index f9659a927c..f9659a927c 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 41fbf8f7a0..41fbf8f7a0 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index c91957aa9b..c91957aa9b 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
diff --git a/connectivity/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml
index 669eb109ad..669eb109ad 100644..100755
--- a/connectivity/source/drivers/evoab/evoab.xml
+++ b/connectivity/source/drivers/evoab/evoab.xml
diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ b/connectivity/source/drivers/evoab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 82e0ce4b70..82e0ce4b70 100644..100755
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 1767ec1bcf..1767ec1bcf 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
index c089fda927..c089fda927 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index d1cc91b842..d1cc91b842 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index b08b4e46a1..b08b4e46a1 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 53818b7507..53818b7507 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index 34c01e911f..34c01e911f 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index f056f61719..f056f61719 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 2b25b76013..2b25b76013 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 5fa7050c1e..5fa7050c1e 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index a0fe1788e2..a0fe1788e2 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx
index 92e360425b..92e360425b 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/connectivity/source/drivers/evoab2/NDebug.cxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx
index 77f7269c82..77f7269c82 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ b/connectivity/source/drivers/evoab2/NDebug.hxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index ae34a7e771..ae34a7e771 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index c8917bffa6..c8917bffa6 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 1aadfbf031..1aadfbf031 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index af0e56729f..af0e56729f 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index f59a420894..f59a420894 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 0ffe5a7e5b..0ffe5a7e5b 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 335b44418c..335b44418c 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 6906549dec..6906549dec 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 75b2beb1f9..25e947386d 100644..100755
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -36,7 +36,6 @@ using namespace connectivity::evoab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            OEvoabDriver::getImplementationName_Static(),
-            OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index a73a241113..a73a241113 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index b5adfeb0a7..b5adfeb0a7 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 30807ab4f5..30807ab4f5 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 169191d630..169191d630 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index a883d823a8..a883d823a8 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index 001454a18d..001454a18d 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component
new file mode 100755
index 0000000000..a99719388d
--- /dev/null
+++ b/connectivity/source/drivers/evoab2/evoab.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml
index fbf309cbf0..fbf309cbf0 100644..100755
--- a/connectivity/source/drivers/evoab2/evoab.xml
+++ b/connectivity/source/drivers/evoab2/evoab.xml
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 474e001e09..6f61762a0c 100644..100755
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -111,3 +111,11 @@ DEF1NAME=	$(SHL1TARGET)
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/evoab.component
+
+$(MISC)/evoab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        evoab.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt evoab.component
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index ad4430cb88..ad4430cb88 100644..100755
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index fb25c29700..ae1d119011 100644..100755
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -73,7 +73,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                                             sal_False,
                                             sal_False,
                                             sal_False,
-                                            m_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                                            m_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
                 xRet = pRet;
                 break;
             }
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 6d7ee212fb..6d7ee212fb 100644..100755
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 778e7e0039..778e7e0039 100644..100755
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index a7a1bcc4d7..a7a1bcc4d7 100644..100755
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 363c29cef5..363c29cef5 100644..100755
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 34317087e2..93e7cb4b2a 100644..100755
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -101,16 +101,16 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     }
 
     // Further descend in Parse Tree
-    for (UINT32 i = 0; i < pParseNode->count(); i++)
+    for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 // -----------------------------------------------------------------------------
 OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::GetOrderbyKeyValue" );
-    UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
+    sal_uInt32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
 
-    OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
+    OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
 
     ::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
     for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 7800eb6b68..7800eb6b68 100644..100755
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 1d507cdae6..9b797fb483 100644..100755
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -479,7 +479,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
         *((m_aParameterRow->get())[parameterIndex]) = x;
 }
 // -----------------------------------------------------------------------------
-UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::AddParameter" );
     OSL_UNUSED( pParameter );
@@ -493,7 +493,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     ::rtl::OUString sParameterName;
     // set up Parameter-Column:
     sal_Int32 eType = DataType::VARCHAR;
-    UINT32 nPrecision = 255;
+    sal_uInt32 nPrecision = 255;
     sal_Int32 nScale = 0;
     sal_Int32 nNullable = ColumnValue::NULLABLE;
 
@@ -577,13 +577,13 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
     if (!m_xParamColumns->get().empty())
     {
         // begin with AssignValues
-        USHORT nParaCount=0; // gives the current number of previously set Parameters
+        sal_uInt16 nParaCount=0; // gives the current number of previously set Parameters
 
         // search for parameters to be substituted:
         size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 is important for the Criteria
         for (size_t j = 1; j < nCount; j++)
         {
-            UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
+            sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j);
             if (nParameter == SQL_NO_PARAMETER)
                 continue;	// this AssignValue is no Parameter
 
@@ -627,7 +627,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
     if(nParameter == -1)
         nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
     // Save number of parameter in the variable:
-    SetAssignValue(_sColumnName, String(), TRUE, nParameter);
+    SetAssignValue(_sColumnName, String(), sal_True, nParameter);
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 0eec6676b7..59bfc070bf 100644..100755
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -76,11 +76,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
 // Maximal number of Rows, that can be processed being sorted with ORDER BY:
-#if defined (WIN)
-#define MAX_KEYSET_SIZE 0x3ff0	// Somewhat less than a Segment, so there is still room for Memory-Debug-Information
-#else
 #define MAX_KEYSET_SIZE 0x40000 // 256K
-#endif
 
 namespace
 {
@@ -143,7 +139,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator&	_aSQLIterat
 
     m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
     construct();
-    m_aSkipDeletedSet.SetDeleted(m_bShowDeleted);
+    m_aSkipDeletedSet.SetDeletedVisible(m_bShowDeleted);
     osl_decrementInterlockedCount( &m_refCount );
 }
 
@@ -648,7 +644,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     // we know that we append new rows at the end
     // so we have to know where the end is
     m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
-    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, TRUE, m_xColsIdx);
+    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, sal_True, m_xColsIdx);
     if(m_bRowInserted && m_pFileSet.is())
     {
         sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -904,20 +900,20 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
 }
 
 //------------------------------------------------------------------
-BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                               INT32 nFirstOffset,
-                               BOOL bEvaluate,
-                               BOOL bRetrieveData)
+sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                               sal_Int32 nFirstOffset,
+                               sal_Bool bEvaluate,
+                               sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::ExecuteRow" );
     OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
 
     // For further Fetch-Operations this information may possibly be changed ...
     IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
-    INT32  nOffset = nFirstOffset;
+    sal_Int32  nOffset = nFirstOffset;
 
     const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
-    BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
+    sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
 again:
 
     // protect from reading over the end when someboby is inserting while we are reading
@@ -940,8 +936,13 @@ again:
     {
         m_pTable->fetchRow(m_aEvaluateRow, rTableCols, sal_True,bRetrieveData || bHasRestriction);
 
-        if ((!m_bShowDeleted && m_aEvaluateRow->isDeleted())
-            || (bHasRestriction && !m_pSQLAnalyzer->evaluateRestriction()))
+        if  (   (   !m_bShowDeleted
+                &&  m_aEvaluateRow->isDeleted()
+                )
+            ||  (   bHasRestriction
+                &&  !m_pSQLAnalyzer->evaluateRestriction()
+                )
+            )
         {												 // Evaluate the next record
             // delete current row in Keyset
             if (m_pEvaluationKeySet)
@@ -988,12 +989,14 @@ again:
 
     // Evaluate may only be set,
     // if the Keyset will be constructed further
-    if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() &&
-        (m_pFileSet.is() || m_pSortIndex) && bEvaluate)
+    if  (   ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+        &&  !isCount()
+        &&  bEvaluate
+        )
     {
         if (m_pSortIndex)
         {
-            OKeyValue* pKeyValue = GetOrderbyKeyValue(m_aEvaluateRow);
+            OKeyValue* pKeyValue = GetOrderbyKeyValue( m_aSelectRow );
             m_pSortIndex->AddKeyValue(pKeyValue);
         }
         else if (m_pFileSet.is())
@@ -1008,7 +1011,7 @@ again:
         if (bEvaluate)
         {
             // read the actual result-row
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
         }
 
         if (bOK)
@@ -1023,7 +1026,7 @@ again:
         sal_Bool bOK = sal_True;
         if (bEvaluate)
         {
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
         }
         if (bOK)
         {
@@ -1035,13 +1038,13 @@ again:
 }
 
 //-------------------------------------------------------------------
-BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData)
+sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::Move" );
 
 //IgnoreDeletedRows:
 //
-    INT32 nTempPos = m_nRowPos;
+    sal_Int32 nTempPos = m_nRowPos;
 
     if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
         !isCount())
@@ -1049,7 +1052,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
         if (!m_pFileSet.is()) //no Index available
         {
             // Normal FETCH
-            ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
+            ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData);
 
             // now set the bookmark for outside this is the logical pos  and not the file pos
             *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1086,16 +1089,16 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
             // The FileCursor is outside of the valid range, if:
             // a.) m_nRowPos < 1
             // b.) a KeySet exists and m_nRowPos > m_pFileSet->size()
-            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() ))
+            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
             {
                 goto Error;
             }
             else
             {
-                if (m_nRowPos < (INT32)m_pFileSet->get().size())
+                if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
                 {
                     // Fetch via Index
-                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData);
+                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData);
 
                     // now set the bookmark for outside
                     *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1114,25 +1117,25 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                     }
                     sal_Bool bOK = sal_True;
                     // Determine the number of further Fetches
-                    while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size())
+                    while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size())
                     {
                         if (m_pEvaluationKeySet)
                         {
-                            if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size())
+                            if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size())
                                 return sal_False;
                             else if (m_nRowPos == 0)
                             {
                                 m_aEvaluateIter = m_pEvaluationKeySet->begin();
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                             else
                             {
                                 ++m_aEvaluateIter;
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                         }
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE, FALSE);//bRetrieveData);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData);
                     }
 
                     if (bOK)
@@ -1280,8 +1283,8 @@ void OResultSet::sortRows()
     ::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin();
     for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i)
     {
-        OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index");
-        switch ((*(m_aRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
+        OSL_ENSURE((sal_Int32)m_aSelectRow->get().size() > *aOrderByIter,"Invalid Index");
+        switch ((*(m_aSelectRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
         {
             case DataType::CHAR:
             case DataType::VARCHAR:
@@ -1310,7 +1313,7 @@ void OResultSet::sortRows()
                 OSL_FAIL("OFILECursor::Execute: Datentyp nicht implementiert");
                 break;
         }
-        (m_aEvaluateRow->get())[*aOrderByIter]->setBound(sal_True);
+        (m_aSelectRow->get())[*aOrderByIter]->setBound(sal_True);
     }
     
     m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending);
@@ -1321,14 +1324,19 @@ void OResultSet::sortRows()
             
         while (m_aEvaluateIter != m_pEvaluationKeySet->end())
         {
-            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
             ++m_aEvaluateIter;
         }
     }
     else
     {
-        while (ExecuteRow(IResultSetHelper::NEXT,1,TRUE))
+        while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) )
         {
+            m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() );
+            if ( m_pSQLAnalyzer->hasFunctions() )
+                m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping );
+            const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue();
+            ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False );
         }
     }
     
@@ -1342,7 +1350,7 @@ void OResultSet::sortRows()
 
 
 // -------------------------------------------------------------------------
-BOOL OResultSet::OpenImpl()
+sal_Bool OResultSet::OpenImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OpenImpl" );
     OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
@@ -1410,9 +1418,9 @@ BOOL OResultSet::OpenImpl()
                     while (bOK)
                     {
                         if (m_pEvaluationKeySet)
-                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                         if (bOK)
                         {
@@ -1432,8 +1440,8 @@ BOOL OResultSet::OpenImpl()
             }
             else
             {
-                BOOL bDistinct = FALSE;
-                BOOL bWasSorted = FALSE;
+                sal_Bool bDistinct = sal_False;
+                sal_Bool bWasSorted = sal_False;
                 OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
                 ::std::vector<sal_Int32>				aOrderbyColumnNumberSave;
                 ::std::vector<TAscendingOrder>          aOrderbyAscendingSave;
@@ -1446,14 +1454,14 @@ BOOL OResultSet::OpenImpl()
                         aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;
                         m_aOrderbyColumnNumber.clear();
                         aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end());
-                        bWasSorted = TRUE;
+                        bWasSorted = sal_True;
                     }
                     
                     // the first column is the bookmark column
                     ::std::vector<sal_Int32>::iterator aColStart = (m_aColMapping.begin()+1);
                     ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
                     m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC);
-                    bDistinct = TRUE;
+                    bDistinct = sal_True;
                 }
 
                 if (IsSorted())
@@ -1490,15 +1498,15 @@ BOOL OResultSet::OpenImpl()
                     if (nMaxRow)
                     {
     #if OSL_DEBUG_LEVEL > 1
-                        INT32 nFound=0;
+                        sal_Int32 nFound=0;
     #endif
-                        INT32 nPos;
-                        INT32 nKey;
+                        sal_Int32 nPos;
+                        sal_Int32 nKey;
                         
                         for( size_t j = nMaxRow-1; j > 0; --j)
                         {
                             nPos = (m_pFileSet->get())[j]; 
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             { // copy row values
                                 OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin();
@@ -1511,7 +1519,7 @@ BOOL OResultSet::OpenImpl()
 
                             // compare with next row
                             nKey = (m_pFileSet->get())[j-1];
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin();
                             OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin();
@@ -1574,9 +1582,9 @@ BOOL OResultSet::OpenImpl()
                 while (bOK)
                 {
                     if (m_pEvaluationKeySet)
-                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                     else
-                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                     if (bOK)
                     {
@@ -1598,7 +1606,7 @@ BOOL OResultSet::OpenImpl()
             m_nRowCountResult = 0;
 
             OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
-            if(!m_pTable->InsertRow(*m_aAssignValues, TRUE,m_xColsIdx))
+            if(!m_pTable->InsertRow(*m_aAssignValues, sal_True,m_xColsIdx))
             {
                 m_nFilePos  = 0;
                 return sal_False;
@@ -1652,7 +1660,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                                    ::std::vector<sal_Int32>& _rColMapping)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::setBoundedColumns" );
-    ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+    ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
 
     Reference<XPropertySet> xTableColumn;
     ::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index fc45a15afb..fc45a15afb 100644..100755
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 161e210c8a..78232769c2 100644..100755
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -442,19 +442,12 @@ void OStatement_Base::setOrderbyColumn(	OSQLParseNode* pColumnRef,
         return;
     // Everything tested and we have the name of the Column.
     // What number is the Column?
-    try
-    {
-        m_aOrderbyColumnNumber.push_back(xColLocate->findColumn(aColumnName));
-    }
-    catch(Exception)
-    {
-        ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
-        ::comphelper::UStringMixEqual aCase;
-        OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
-        if ( aFind == aSelectColumns->get().end() )
-            throw SQLException();
-        m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
-    }
+    ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
+    ::comphelper::UStringMixEqual aCase;
+    OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
+    if ( aFind == aSelectColumns->get().end() )
+        throw SQLException();
+    m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
 
     // Ascending or Descending?
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
@@ -740,7 +733,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
     else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL))
     {
         // set NULL
-        SetAssignValue(aColumnName, String(), TRUE);
+        SetAssignValue(aColumnName, String(), sal_True);
     }
     else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter))
         parseParamterElem(aColumnName,pRow_Value_Constructor_Elem);
@@ -752,8 +745,8 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
 //------------------------------------------------------------------
 void OStatement_Base::SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull,
-                                   UINT32 nParameter)
+                                   sal_Bool bSetNull,
+                                   sal_uInt32 nParameter)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
     Reference<XPropertySet> xCol;
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index 490d9c7bef..490d9c7bef 100644..100755
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index bf4bb889d8..f686ecab56 100644..100755
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::container;
 
 DBG_NAME( file_OFileTable )
 OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
-: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers())
+: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
                 ,m_pConnection(_pConnection)
                 ,m_pFileStream(NULL)
                 ,m_nFilePos(0)
@@ -73,7 +73,7 @@ OFileTable::OFileTable(	sdbcx::OCollection* _pTables,OConnection* _pConnection,
                     const ::rtl::OUString& _Description ,
                     const ::rtl::OUString& _SchemaName,
                     const ::rtl::OUString& _CatalogName
-                ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers(),
+                ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
                                   _Name,
                                   _Type,
                                   _Description,
@@ -205,19 +205,19 @@ void SAL_CALL OFileTable::release() throw()
     OTable_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::InsertRow(OValueRefVector& /*rRow*/, BOOL /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::InsertRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
+sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::DeleteRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::UpdateRow" );
     return sal_False;
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index c56cf59a66..c56cf59a66 100644..100755
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index ef73134773..5a0102c38e 100644..100755
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -104,7 +104,26 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
                     m_pConnection->throwGenericSQLException(STR_QUERY_COMPLEX_COUNT,NULL);
                 }
                 else
-                    m_aSelectionEvaluations.push_back( TPredicates() );
+                {
+                    if  (   SQL_ISPUNCTUATION( pColumnRef, "*" )
+                        ||  (   SQL_ISRULE( pColumnRef, column_ref )
+                            &&  ( pColumnRef->count() == 3 )
+                            &&  ( pColumnRef->getChild(0)->getNodeType() == SQL_NODE_NAME )
+                            &&  SQL_ISPUNCTUATION( pColumnRef->getChild(1), "." )
+                            &&  SQL_ISRULE( pColumnRef->getChild(2), column_val )
+                            &&  SQL_ISPUNCTUATION( pColumnRef->getChild(2)->getChild(0), "*" )
+                            )
+                        )
+                    {
+                        // push one element for each column of our table
+                        const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() );
+                        const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() );
+                        for ( sal_Int32 j=0; j<aColumnNames.getLength(); ++j )
+                            m_aSelectionEvaluations.push_back( TPredicates() );
+                    }
+                    else
+                        m_aSelectionEvaluations.push_back( TPredicates() );
+                }
             }
         }
     }
@@ -264,12 +283,12 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
     return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasRestriction() const
+sal_Bool OSQLAnalyzer::hasRestriction() const
 {
     return m_aCompiler->hasCode();
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasFunctions() const
+sal_Bool OSQLAnalyzer::hasFunctions() const
 {
     if ( m_bSelectionFirstTime )
     {
@@ -290,11 +309,12 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
     {
         if ( aIter->second.is() )
         {
-            sal_Int32	map = nPos;
             // the first column (index 0) is for convenience only. The first real select column is no 1.
-            if ( (nPos > 0) && (nPos < static_cast<sal_Int32>(_rColumnMapping.size())) )
+            sal_Int32	map = nPos;
+            if ( nPos < static_cast< sal_Int32 >( _rColumnMapping.size() ) )
                 map = _rColumnMapping[nPos];
-            aIter->second->startSelection((_pRow->get())[map]);
+            if ( map > 0 )
+                aIter->second->startSelection( (_pRow->get())[map] );
         }
     }
 }
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index db458015e2..ad8662c7d0 100644..100755
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -349,7 +349,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
         case DataType::LONGVARCHAR:
         {
             rtl::OUString sLH = aLH, sRH = aRH;
-            INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
+            sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
                 (
                  sLH.pData->buffer,
                  sLH.pData->length,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 739804b961..f95fb343c0 100644..100755
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,7 @@ DBG_NAME(OPredicateCompiler)
 OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs)
                      : m_pAnalyzer(pAnalyzer)
                      , m_nParamCounter(0)
-                     , m_bORCondition(FALSE)
+                     , m_bORCondition(sal_False)
 {
     DBG_CTOR(OPredicateCompiler,NULL);
 }
diff --git a/connectivity/source/drivers/file/file.xml b/connectivity/source/drivers/file/file.xml
index b3b681c305..b3b681c305 100644..100755
--- a/connectivity/source/drivers/file/file.xml
+++ b/connectivity/source/drivers/file/file.xml
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 41f061de80..41f061de80 100644..100755
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 5306accc8a..c71afa3d41 100644..100755
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -45,8 +45,8 @@ namespace connectivity
             return 0;
 
         xub_StrLen nTokCount = 1;
-        BOOL bStart = TRUE;		// Are we on the first character in the Token?
-        BOOL bInString = FALSE;	// Are we WITHIN a (cStrDel delimited) String?
+        sal_Bool bStart = sal_True;		// Are we on the first character in the Token?
+        sal_Bool bInString = sal_False;	// Are we WITHIN a (cStrDel delimited) String?
 
         // Search for String-end after the first not matching character
         for( xub_StrLen i = 0; i < nLen; ++i )
@@ -54,11 +54,11 @@ namespace connectivity
             const sal_Unicode cChar = m_sString.GetChar(i);
             if (bStart)
             {
-                bStart = FALSE;
+                bStart = sal_False;
                 // First character a String-Delimiter?
                 if ( cChar == cStrDel )
                 {
-                    bInString = TRUE;	// then we are now WITHIN the string!
+                    bInString = sal_True;	// then we are now WITHIN the string!
                     continue;			// skip this character!
                 }
             }
@@ -76,7 +76,7 @@ namespace connectivity
                     else
                     {
                         // String-End
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
             } // if (bInString) 
@@ -86,7 +86,7 @@ namespace connectivity
                 if ( cChar == cTok )
                 {
                     ++nTokCount;
-                    bStart = TRUE;
+                    bStart = sal_True;
                 }
             }
         }
@@ -103,7 +103,7 @@ namespace connectivity
         const xub_StrLen nLen = m_sString.Len();
         if ( nLen )
         {
-            BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);	// are we WITHIN a (cStrDel delimited) String?
+            sal_Bool bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);	// are we WITHIN a (cStrDel delimited) String?
 
             // First character a String-Delimiter?
             if (bInString )
@@ -132,7 +132,7 @@ namespace connectivity
                         else
                         {
                             //end of String
-                            bInString = FALSE;
+                            bInString = sal_False;
                             *pData = 0;
                         }
                     }
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index f82eb7de00..f82eb7de00 100644..100755
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 7fdbeca25c..7fdbeca25c 100644..100755
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 0097e075ef..fa1abf048a 100644..100755
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -53,6 +53,7 @@ using namespace ::com::sun::star::lang;
 
 // --------------------------------------------------------------------------------
 OFlatConnection::OFlatConnection(ODriver*	_pDriver) : OConnection(_pDriver)
+    ,m_nMaxRowsToScan(50)
     ,m_bHeaderLine(sal_True)
     ,m_cFieldDelimiter(';')
     ,m_cStringDelimiter('"')
@@ -105,10 +106,15 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cThousandDelimiter = aVal.toChar();
         }
+        else if ( !pBegin->Name.compareToAscii("MaxRowScan") )
+        {
+            pBegin->Value >>= m_nMaxRowsToScan;
+        }
     }
 
     osl_decrementInterlockedCount( &m_refCount );
     OConnection::construct(url,info);
+    m_bShowDeleted = sal_True; // we do not supported rows for this type 
 }
 // --------------------------------------------------------------------------------
 Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 85d65153d4..85d65153d4 100644..100755
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 48560bfb46..48560bfb46 100644..100755
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 601aadbb7b..601aadbb7b 100644..100755
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 94d47c3002..94d47c3002 100644..100755
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index 6dd16a00b6..6dd16a00b6 100644..100755
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 36e4e29edf..14bf8ee5fe 100644..100755
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
 void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::fillColumns" );
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OFlatConnection* pConnection = (OFlatConnection*)m_pConnection;
@@ -114,11 +114,11 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     m_aScales.clear();
     // reserve some space
     m_aColumns->get().reserve(nFieldCount+1);
-    m_aTypes.reserve(nFieldCount+1);
-    m_aPrecisions.reserve(nFieldCount+1);
-    m_aScales.reserve(nFieldCount+1);
+    m_aTypes.assign(nFieldCount+1,DataType::SQLNULL);
+    m_aPrecisions.assign(nFieldCount+1,-1);
+    m_aScales.assign(nFieldCount+1,-1);
 
-    const sal_Bool bCase = m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    const sal_Bool bCase = m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     const sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -126,106 +126,186 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     String aColumnName;
     ::rtl::OUString aTypeName;
     ::comphelper::UStringMixEqual aCase(bCase);
-    xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
-    xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
-    xub_StrLen nStartPosFirstLine2 = 0;
-    for (xub_StrLen i = 0; i < nFieldCount; i++)
+    ::std::vector<String> aColumnNames,m_aTypeNames;
+    m_aTypeNames.resize(nFieldCount);
+    const sal_Int32 nMaxRowsToScan = pConnection->getMaxRowsToScan();
+    sal_Int32 nRowCount = 0;
+    do
     {
-        if ( bHasHeaderLine )
+        xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
+        xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
+        xub_StrLen nStartPosFirstLine2 = 0;
+        for (xub_StrLen i = 0; i < nFieldCount; i++)
         {
-            aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
-            if ( !aColumnName.Len() )
+            if ( nRowCount == 0)
             {
-                aColumnName = 'C';
-                aColumnName += String::CreateFromInt32(i+1);
+                if ( bHasHeaderLine )
+                {
+                    aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
+                    if ( !aColumnName.Len() )
+                    {
+                        aColumnName = 'C';
+                        aColumnName += String::CreateFromInt32(i+1);
+                    }
+                }
+                else
+                {
+                    // no column name so ...
+                    aColumnName = 'C';
+                    aColumnName += String::CreateFromInt32(i+1);
+                }
+                aColumnNames.push_back(aColumnName);
             }
+            impl_fillColumnInfo_nothrow(aFirstLine,nStartPosFirstLine,nStartPosFirstLine2,m_aTypes[i],m_aPrecisions[i],m_aScales[i],m_aTypeNames[i],cDecimalDelimiter,cThousandDelimiter,aCharClass);
         }
-        else
+        ++nRowCount;
+    }
+    while(nRowCount < nMaxRowsToScan && m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding));
+
+    for (xub_StrLen i = 0; i < nFieldCount; i++)
+    {
+        // check if the columname already exists
+        String aAlias(aColumnNames[i]);
+        OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+        sal_Int32 nExprCnt = 0;
+        while(aFind != m_aColumns->get().end())
         {
-            // no column name so ...
-            aColumnName = 'C';
-            aColumnName += String::CreateFromInt32(i+1);
+            (aAlias = aColumnNames[i]) += String::CreateFromInt32(++nExprCnt);
+            aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
-        sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],::rtl::OUString(),::rtl::OUString(),
+                                                ColumnValue::NULLABLE,
+                                                m_aPrecisions[i],
+                                                m_aScales[i],
+                                                m_aTypes[i],
+                                                sal_False,
+                                                sal_False,
+                                                sal_False,
+                                                bCase);
+        Reference< XPropertySet> xCol = pColumn;
+        m_aColumns->get().push_back(xCol);
+    }
+    m_pFileStream->Seek(m_nStartRowFilePos);
+}
+void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+                                             ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+                                             ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass&  aCharClass)
+{
+    if ( io_nType != DataType::VARCHAR )
+    {
+        sal_Bool bNumeric = io_nType == DataType::SQLNULL || io_nType == DataType::DOUBLE || io_nType == DataType::DECIMAL || io_nType == DataType::INTEGER;
+        sal_uLong  nIndex = 0;
 
-        // first without fielddelimiter
-        String aField;
-        aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
-        if (aField.Len() == 0 ||
-            (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+        if ( bNumeric )
         {
-            bNumeric = FALSE;
-            if ( m_cStringDelimiter != '\0' )
-                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
-            else
-                nStartPosFirstLine2 = nStartPosFirstLine;
-        }
-        else
-        {
-            String aField2;
-            if ( m_cStringDelimiter != '\0' )
-                aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
-            else
-                aField2 = aField;
-
-            if (aField2.Len() == 0)
+            // first without fielddelimiter
+            String aField;
+            aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+            if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    nStartPosFirstLine2 = nStartPosFirstLine;
             }
             else
             {
-                bNumeric = TRUE;
-                xub_StrLen nDot = 0;
-                xub_StrLen nDecimalDelCount = 0;
-                for (xub_StrLen j = 0; j < aField2.Len(); j++)
+                String aField2;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    aField2 = aField;
+
+                if (aField2.Len() == 0)
                 {
-                    const sal_Unicode c = aField2.GetChar(j);
-                    // just digits, decimal- and thousands-delimiter?
-                    if ( ( !cDecimalDelimiter  || c != cDecimalDelimiter )  &&
-                         ( !cThousandDelimiter || c != cThousandDelimiter ) &&
-                        !aCharClass.isDigit(aField2,j)                      &&
-                        ( j != 0 || (c != '+' && c != '-' ) ) )
-                    {
-                        bNumeric = FALSE;
-                        break;
-                    }
-                    if (cDecimalDelimiter && c == cDecimalDelimiter)
-                    {
-                        nPrecision = 15; // we have an decimal value
-                        nScale = 2;
-                        ++nDecimalDelCount;
-                    } // if (cDecimalDelimiter && c == cDecimalDelimiter)
-                    if ( c == '.' )
-                        ++nDot;
+                    bNumeric = sal_False;
                 }
-
-                if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
-                if (bNumeric && cThousandDelimiter)
+                else
                 {
-                    // is the delimiter correctly given?
-                    const String aValue = aField2.GetToken(0,cDecimalDelimiter);
-                    for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+                    bNumeric = sal_True;
+                    xub_StrLen nDot = 0;
+                    xub_StrLen nDecimalDelCount = 0;
+                    xub_StrLen nSpaceCount = 0;
+                    for (xub_StrLen j = 0; j < aField2.Len(); j++)
                     {
-                        const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
-                        // just digits, decimal- and thousands-delimiter?
-                        if (c == cThousandDelimiter && j)
+                        const sal_Unicode c = aField2.GetChar(j);
+                        if ( j == nSpaceCount && m_cFieldDelimiter != 32 && c == 32 )
+                        {
+                            ++nSpaceCount;
                             continue;
-                        else
+                        }
+                        // just digits, decimal- and thousands-delimiter?
+                        if ( ( !cDecimalDelimiter  || c != cDecimalDelimiter )  &&
+                             ( !cThousandDelimiter || c != cThousandDelimiter ) &&
+                            !aCharClass.isDigit(aField2,j)                      &&
+                            ( j != 0 || (c != '+' && c != '-' ) ) )
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
+                        if (cDecimalDelimiter && c == cDecimalDelimiter)
+                        {
+                            io_nPrecisions = 15; // we have an decimal value
+                            io_nScales = 2;
+                            ++nDecimalDelCount;
+                        } // if (cDecimalDelimiter && c == cDecimalDelimiter)
+                        if ( c == '.' )
+                            ++nDot;
                     }
-                }
 
-                // now it still can be a Date-field
-                if (!bNumeric)
+                    if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
+                        bNumeric = sal_False;
+                    if (bNumeric && cThousandDelimiter)
+                    {
+                        // Is the delimiter correct?
+                        const String aValue = aField2.GetToken(0,cDecimalDelimiter);
+                        for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+                        {
+                            const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
+                            // just digits, decimal- and thousands-delimiter?
+                            if (c == cThousandDelimiter && j)
+                                continue;
+                            else
+                            {
+                                bNumeric = sal_False;
+                                break;
+                            }
+                        }
+                    }
+
+                    // now also check for a date field
+                    if (!bNumeric)
+                    {
+                        try
+                        {
+                            nIndex = m_xNumberFormatter->detectNumberFormat(::com::sun::star::util::NumberFormat::ALL,aField2);
+                        }
+                        catch(Exception&)
+                        {
+                        }
+                    }
+                }
+            }
+        }
+        else if ( io_nType == DataType::DATE || io_nType == DataType::TIMESTAMP || io_nType == DataType::TIME)
+        {
+            String aField;
+            aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+            if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+            {
+            }
+            else
+            {
+                String aField2;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    aField2 = aField;
+                if (aField2.Len() )
                 {
                     try
                     {
@@ -243,87 +323,83 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         {
             if (cDecimalDelimiter)
             {
-                if(nPrecision)
+                if(io_nPrecisions)
                 {
-                    eType = DataType::DECIMAL;
+                    io_nType = DataType::DECIMAL;
                     static const ::rtl::OUString s_sDECIMAL(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
-                    aTypeName = s_sDECIMAL;
+                    o_sTypeName = s_sDECIMAL;
                 }
                 else
                 {
-                    eType = DataType::DOUBLE;
+                    io_nType = DataType::DOUBLE;
                     static const ::rtl::OUString s_sDOUBLE(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
-                    aTypeName = s_sDOUBLE;
+                    o_sTypeName = s_sDOUBLE;
                 }
             }
             else
-                eType = DataType::INTEGER;
+            {
+                io_nType = DataType::INTEGER;
+                io_nPrecisions = 0;
+                io_nScales = 0;
+            }
             nFlags = ColumnSearch::BASIC;
         }
         else
         {
-
             switch (comphelper::getNumberFormatType(m_xNumberFormatter,nIndex))
             {
                 case NUMBERFORMAT_DATE:
-                    eType = DataType::DATE;
+                    io_nType = DataType::DATE;
                     {
                         static const ::rtl::OUString s_sDATE(RTL_CONSTASCII_USTRINGPARAM("DATE"));
-                        aTypeName = s_sDATE;
+                        o_sTypeName = s_sDATE;
                     }
                     break;
                 case NUMBERFORMAT_DATETIME:
-                    eType = DataType::TIMESTAMP;
+                    io_nType = DataType::TIMESTAMP;
                     {
                         static const ::rtl::OUString s_sTIMESTAMP(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
-                        aTypeName = s_sTIMESTAMP;
+                        o_sTypeName = s_sTIMESTAMP;
                     }
                     break;
                 case NUMBERFORMAT_TIME:
-                    eType = DataType::TIME;
+                    io_nType = DataType::TIME;
                     {
                         static const ::rtl::OUString s_sTIME(RTL_CONSTASCII_USTRINGPARAM("TIME"));
-                        aTypeName = s_sTIME;
+                        o_sTypeName = s_sTIME;
                     }
                     break;
                 default:
-                    eType = DataType::VARCHAR;
-                    nPrecision = 0;	// nyi: Data can be longer!
-                    nScale = 0;
+                    io_nType = DataType::VARCHAR;
+                    io_nPrecisions = 0;	// nyi: Data can be longer!
+                    io_nScales = 0;
                     {
                         static const ::rtl::OUString s_sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
-                        aTypeName = s_sVARCHAR;
+                        o_sTypeName = s_sVARCHAR;
                     }
             };
             nFlags |= ColumnSearch::CHAR;
         }
-
-        // check if the columname already exists
-        String aAlias(aColumnName);
-        OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
-        sal_Int32 nExprCnt = 0;
-        while(aFind != m_aColumns->get().end())
+    }
+    else
+    {
+        String aField;
+        aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+        if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
         {
-            (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt);
-            aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+            else
+                nStartPosFirstLine2 = nStartPosFirstLine;
+        }
+        else
+        {
+            String aField2;
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
         }
-
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(),::rtl::OUString(),
-                                                ColumnValue::NULLABLE,
-                                                nPrecision,
-                                                nScale,
-                                                eType,
-                                                sal_False,
-                                                sal_False,
-                                                sal_False,
-                                                bCase);
-        Reference< XPropertySet> xCol = pColumn;
-        m_aColumns->get().push_back(xCol);
-        m_aTypes.push_back(eType);
-        m_aPrecisions.push_back(nPrecision);
-        m_aScales.push_back(nScale);
     }
-    m_pFileStream->Seek(m_nStartRowFilePos);
 }
 // -------------------------------------------------------------------------
 OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
@@ -531,7 +607,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
     if ( m_bNeedToReadLine )
     {        
         sal_Int32 nCurrentPos = 0;
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index e709141b52..e709141b52 100644..100755
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index add587953e..a8cddebadf 100644..100755
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "flat/EDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::flat;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/flat/exports.dxp
+++ b/connectivity/source/drivers/flat/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component
new file mode 100755
index 0000000000..fe8b79ee73
--- /dev/null
+++ b/connectivity/source/drivers/flat/flat.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.flat.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map
index 54a8532f78..2737c61b5a 100644..100755
--- a/connectivity/source/drivers/flat/flat.mxp.map
+++ b/connectivity/source/drivers/flat/flat.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu
index ed29028ea9..ba43121844 100755
--- a/connectivity/source/drivers/flat/flat.xcu
+++ b/connectivity/source/drivers/flat/flat.xcu
@@ -75,8 +75,18 @@
             <value>false</value>
           </prop>
         </node>
+        <node oor:name="MaxRowScan" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:int">
+            <value>100</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
+        <node oor:name="MaxRowScan" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
diff --git a/connectivity/source/drivers/flat/flat.xml b/connectivity/source/drivers/flat/flat.xml
index 77b45c48da..77b45c48da 100644..100755
--- a/connectivity/source/drivers/flat/flat.xml
+++ b/connectivity/source/drivers/flat/flat.xml
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index da801c44a8..0fe857919d 100644..100755
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -105,3 +105,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/flat.component
+
+$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        flat.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt flat.component
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 7c7d66fc00..7c7d66fc00 100644..100755
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 8c7b58c33d..8c7b58c33d 100644..100755
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 34888d13d1..34888d13d1 100644..100755
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 753faa9e26..7b27d98042 100644..100755
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -276,22 +276,38 @@ namespace connectivity
                             if ( pStream.get() )
                             {
                                 ByteString sLine;
+                                ByteString sVersionString;
                                 while ( pStream->ReadLine(sLine) )
                                 {
-                                    if ( sLine.Equals("version=",0,sizeof("version=")-1) )
+                                    if ( sLine.Len() == 0 )
+                                        continue;
+                                    const ByteString sIniKey = sLine.GetToken( 0, '=' );
+                                    const ByteString sValue = sLine.GetToken( 1, '=' );
+                                    if ( sIniKey.Equals( "hsqldb.compatible_version" ) )
                                     {
-                                        sLine = sLine.GetToken(1,'=');
-                                        const sal_Int32 nMajor = sLine.GetToken(0,'.').ToInt32();
-                                        const sal_Int32 nMinor = sLine.GetToken(1,'.').ToInt32();
-                                        const sal_Int32 nMicro = sLine.GetToken(2,'.').ToInt32();
-                                        if ( 	 nMajor > 1 
-                                            || ( nMajor == 1 && nMinor > 8 )
-                                            || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+                                        sVersionString = sValue;
+                                    }
+                                    else
+                                    {
+                                        if  (   sIniKey.Equals( "version" )
+                                            &&  ( sVersionString.Len() == 0 )
+                                            )
                                         {
-                                            ::connectivity::SharedResources aResources;
-                                            sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
+                                            sVersionString = sValue;
                                         }
-                                        break;
+                                    }
+                                }
+                                if ( sVersionString.Len() )
+                                {
+                                    const sal_Int32 nMajor = sVersionString.GetToken(0,'.').ToInt32();
+                                    const sal_Int32 nMinor = sVersionString.GetToken(1,'.').ToInt32();
+                                    const sal_Int32 nMicro = sVersionString.GetToken(2,'.').ToInt32();
+                                    if ( 	 nMajor > 1 
+                                        || ( nMajor == 1 && nMinor > 8 )
+                                        || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+                                    {
+                                        ::connectivity::SharedResources aResources;
+                                        sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
                                     }
                                 }
                             }
diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx
index f13dc3be28..f13dc3be28 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorage.hxx
+++ b/connectivity/source/drivers/hsqldb/HStorage.hxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index b4a898275b..b4a898275b 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 01bbc8131e..3760477087 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -138,7 +138,7 @@ namespace connectivity
         ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL)
         {
             ::rtl::OUString sRet = _sURL;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
             sal_Int32 nIndex = sRet.lastIndexOf('\\');
 #else
             sal_Int32 nIndex = sRet.lastIndexOf('/');
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 732737eaf8..732737eaf8 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 0e0725af27..0e0725af27 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index b2f23d8d51..b2f23d8d51 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 681985951e..681985951e 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 8f35c9246a..8f35c9246a 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index a968a0ca0d..a968a0ca0d 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 9816e56c4f..9816e56c4f 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 1596ee7025..1596ee7025 100644..100755
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 55b51f66fc..55b51f66fc 100644..100755
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 04c6b3bf8b..98eacbb5bb 100644..100755
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -31,13 +31,11 @@
 
 #include "hsqldb/HDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::hsqldb;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -120,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriverDelegator::getImplementationName_Static(),
-            ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 532d7ca0de..532d7ca0de 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index be64f013d7..be64f013d7 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 36ec342e32..36ec342e32 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 111e1da186..111e1da186 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index f10ae77d4e..f10ae77d4e 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp
index 7ff56f4f99..3efc73741d 100644..100755
--- a/connectivity/source/drivers/hsqldb/exports.dxp
+++ b/connectivity/source/drivers/hsqldb/exports.dxp
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component
new file mode 100755
index 0000000000..eb8ae477e7
--- /dev/null
+++ b/connectivity/source/drivers/hsqldb/hsqldb.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map
index a13f907752..c1d8320d19 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.map
+++ b/connectivity/source/drivers/hsqldb/hsqldb.map
@@ -1,7 +1,6 @@
 UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII;
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml
index f8e5c61af6..f8e5c61af6 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.xml
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xml
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index e17ffb5e99..e17ffb5e99 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 27166edf26..27166edf26 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 21274e8d42..6e400696fa 100644..100755
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -103,6 +103,7 @@ SHL1STDLIBS=\
 
 
 SHL1DEPN=
+SHL1CREATEJNILIB=TRUE
 SHL1IMPLIB=	i$(HSQLDB_TARGET)
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
@@ -115,3 +116,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/hsqldb.component
+
+$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        hsqldb.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt hsqldb.component
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 77b2492b9f..77b2492b9f 100644..100755
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index a0d9fd73a8..a0d9fd73a8 100644..100755
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index cc41160b28..cc41160b28 100644..100755
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 910b64347d..910b64347d 100644..100755
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index b122ad593d..b122ad593d 100644..100755
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 6cc5a4573f..6cc5a4573f 100644..100755
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index c50d4bdc9e..c50d4bdc9e 100644..100755
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index da1802f710..da1802f710 100644..100755
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 256c08fd36..256c08fd36 100644..100755
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index a2c05a67bf..a2c05a67bf 100644..100755
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index f64e9cc4f7..f64e9cc4f7 100644..100755
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 09e0624d54..09e0624d54 100644..100755
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 33e8acc3a4..33e8acc3a4 100644..100755
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index a724a07de1..a724a07de1 100644..100755
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 9621b33410..9621b33410 100644..100755
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 8decaa3751..8decaa3751 100644..100755
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index b5847ba21e..b5847ba21e 100644..100755
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index a78d8fe3de..a78d8fe3de 100644..100755
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 5c112dd70e..5c112dd70e 100644..100755
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 9998b6c87d..9998b6c87d 100644..100755
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index ad49a24f76..ad49a24f76 100644..100755
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index afb8647abf..afb8647abf 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 15ce6fe408..15ce6fe408 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 26c94f5c2f..26c94f5c2f 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index ac01b0e2f3..ac01b0e2f3 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index a2155054f1..a2155054f1 100644..100755
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 0ae5b66b6b..0ae5b66b6b 100644..100755
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 0eee1d5a5a..0eee1d5a5a 100644..100755
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ b/connectivity/source/drivers/jdbc/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component
new file mode 100755
index 0000000000..5d7db4690b
--- /dev/null
+++ b/connectivity/source/drivers/jdbc/jdbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.JDBCDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map
index a4457e2478..e02823e8c4 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/jdbc/jdbc.xml b/connectivity/source/drivers/jdbc/jdbc.xml
index 8fe04eb8a5..8fe04eb8a5 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.xml
+++ b/connectivity/source/drivers/jdbc/jdbc.xml
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 817c5d7e3b..aebe76b6fc 100644..100755
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -35,7 +35,6 @@ using namespace connectivity;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -48,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pModCount
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -123,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            java_sql_Driver::getImplementationName_Static(),
-            java_sql_Driver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index d676945f17..befdc73d7b 100644..100755
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -110,3 +110,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/jdbc.component
+
+$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        jdbc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt jdbc.component
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 0de33802e1..0de33802e1 100644..100755
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index 44d95d1e85..44d95d1e85 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index b24a0a92db..b24a0a92db 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 4fd9ca7cb9..4fd9ca7cb9 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index c31f0e1659..c31f0e1659 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index d612eed46a..d612eed46a 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index df49547820..df49547820 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 7264f60862..7264f60862 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index c1f3963561..c1f3963561 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 8210ba211c..8210ba211c 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 00b0bb6414..00b0bb6414 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index e05cea5eaf..e05cea5eaf 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index aa2d1f252b..aa2d1f252b 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index d82ca654d7..d82ca654d7 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index 876afb1719..876afb1719 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 1c1b8f35dc..1c1b8f35dc 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 209f9a1d6c..209f9a1d6c 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 567f3fbaf5..567f3fbaf5 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 5bf1dd2495..5bf1dd2495 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 1819f49785..b385ba7393 100644..100755
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -31,13 +31,11 @@
 
 #include "KDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::kab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void*,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            KabDriver::getImplementationName_Static(),
-            KabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "KAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 655e8ae656..655e8ae656 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 044c473ee1..044c473ee1 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index 20247273a5..20247273a5 100644..100755
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index 2b640e4cdb..2b640e4cdb 100644..100755
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 31d66547bd..31d66547bd 100644..100755
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index 438458c8e3..438458c8e3 100644..100755
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/kab/exports.dxp
+++ b/connectivity/source/drivers/kab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml
index 115b9f5522..115b9f5522 100644..100755
--- a/connectivity/source/drivers/kab/kab.xml
+++ b/connectivity/source/drivers/kab/kab.xml
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
new file mode 100755
index 0000000000..77227501d3
--- /dev/null
+++ b/connectivity/source/drivers/kab/kab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.kab.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/kab/kabdrv.map b/connectivity/source/drivers/kab/kabdrv.map
index 5de866f2e5..5de866f2e5 100644..100755
--- a/connectivity/source/drivers/kab/kabdrv.map
+++ b/connectivity/source/drivers/kab/kabdrv.map
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 2ecdead169..2ecdead169 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index 41873bd420..41873bd420 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index cf1632b3cd..cf1632b3cd 100644..100755
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 2e628cd413..2e628cd413 100644..100755
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index e10d2cfeee..e10d2cfeee 100644..100755
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index d6df56d383..d6df56d383 100644..100755
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 98bedf66ed..13d4857c91 100644..100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=$(KDE_CFLAGS)
 
 .IF "$(KDE_ROOT)"!=""
 EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
+.ENDIF
 .ENDIF
 
 # === KAB base library ==========================
@@ -136,3 +139,11 @@ dummy:
 
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/kab1.component
+
+$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        kab1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt kab1.component
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 1f7d0a6b18..1f7d0a6b18 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 2aefbd8d9e..2aefbd8d9e 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index bd9342b4bd..bd9342b4bd 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index 52e4e7782f..52e4e7782f 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 0d78b45969..0d78b45969 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index 1d75c8b585..1d75c8b585 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index 4841430a07..4841430a07 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 65ece28448..65ece28448 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 17b2758534..17b2758534 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 852cd32c7d..852cd32c7d 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 3e19b56514..3e19b56514 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index c21715ec09..c21715ec09 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index 6f0dabf45b..6f0dabf45b 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx
index 1f09ac0d09..1f09ac0d09 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 39fb28c62c..39fb28c62c 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index f24b593a9b..f24b593a9b 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 19d9c5f9de..19d9c5f9de 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 0fb1b6e92d..0fb1b6e92d 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index bb6eb60661..bb6eb60661 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index aa47f8377b..aa47f8377b 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index ec82ba5594..ec82ba5594 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 0ac946b5c0..0ac946b5c0 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 851052aa59..851052aa59 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 029aa6c13a..029aa6c13a 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 064065213c..064065213c 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 2140a03b30..2140a03b30 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 3b4c93a9bd..144eb9ac5c 100644..100755
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -31,13 +31,11 @@
 
 #include "MacabDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::macab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void*,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            MacabDriver::getImplementationName_Static(),
-            MacabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "MACAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index fa2654131f..fa2654131f 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 0eda7b05f5..0eda7b05f5 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index ab4ff29d65..ab4ff29d65 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 39f113368e..39f113368e 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 1d839f40f9..1d839f40f9 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 17422ce862..17422ce862 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp
index 9630d7e067..f0e1c69934 100755
--- a/connectivity/source/drivers/macab/exports.dxp
+++ b/connectivity/source/drivers/macab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component
new file mode 100755
index 0000000000..0a120c0418
--- /dev/null
+++ b/connectivity/source/drivers/macab/macab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.macab.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 3faf0aa261..3faf0aa261 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 29f27bc52f..29f27bc52f 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index fa8ba7a1ab..fa8ba7a1ab 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index bad4bc8133..bad4bc8133 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 237a7e4456..237a7e4456 100644..100755
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 31ffede390..b2e8db65dc 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -128,3 +128,11 @@ dummy:
 
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/macab1.component
+
+$(MISC)/macab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        macab1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt macab1.component
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 4cf7492772..4cf7492772 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx
index cc57748fe1..cc57748fe1 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 72a35ef63d..72a35ef63d 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index 4aa9c07d7f..4aa9c07d7f 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index 9e81cfdc0b..9e81cfdc0b 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx
index ffa11ed4af..ffa11ed4af 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.hxx
+++ b/connectivity/source/drivers/mozab/MColumns.hxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index cc240d0be9..cc240d0be9 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx
index 7b66797a1f..7b66797a1f 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index c91bb01d00..c91bb01d00 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 4ec99a1294..4ec99a1294 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index 161d0bced0..161d0bced0 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 89f908367d..89f908367d 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 6ca30dadf8..4610625926 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -251,7 +251,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
         const sal_Char* pScheme;
     } aSchemeMap[] =
     {
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
         { Outlook,          "outlook" },
         { OutlookExpress,   "outlookexp" },
 #endif
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index 5684486b39..5684486b39 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
index 94f15db36b..94f15db36b 100644..100755
--- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index c221684cbb..c221684cbb 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index cf2dd1986e..cf2dd1986e 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index e6cd5f0474..accabc81ca 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -898,8 +898,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
         OSQLParseNode *pOptEscape;
         const OSQLParseNode* pPart2 = parseTree->getChild(1);
         pColumn     = parseTree->getChild(0);                        // Match Item
-        pAtom       = pPart2->getChild(parseTree->count()-2);     // Match String
-        pOptEscape  = pPart2->getChild(parseTree->count()-1);     // Opt Escape Rule
+        pAtom       = pPart2->getChild(pPart2->count()-2);     // Match String
+        pOptEscape  = pPart2->getChild(pPart2->count()-1);     // Opt Escape Rule
         (void)pOptEscape;
         const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
 
@@ -1373,7 +1373,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
                                    const Reference<XDatabaseMetaData>& _xMetaData,
                                    ::std::vector<sal_Int32>& _rColMapping)
 {
-    ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+    ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
 
     Reference<XPropertySet> xTableColumn;
     ::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index 7f0f93985d..7f0f93985d 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index 170cf18e24..170cf18e24 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index 134089fb40..134089fb40 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 41c9079914..b9867f2dbf 100644..100755
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -40,7 +40,6 @@ using namespace connectivity::mozab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::mozilla::XMozillaBootstrap;
@@ -54,31 +53,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -128,37 +102,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-
-        REGISTER_PROVIDER(
-            MozabDriver::getImplementationName_Static(),
-            MozabDriver::getSupportedServiceNames_Static(), xKey);
-
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-        REGISTER_PROVIDER(
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
-             aSNS, xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
 typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index e00ab8db2a..e00ab8db2a 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index de1a75d68f..de1a75d68f 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index d122794a64..d122794a64 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index 7f1826257f..7f1826257f 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index ebc913845e..ebc913845e 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx
index 437bbbe6c5..437bbbe6c5 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.hxx
+++ b/connectivity/source/drivers/mozab/MTables.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index a5517ac9e8..384a7508cb 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -239,7 +239,6 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 #include <cppuhelper/factory.hxx>
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -252,50 +251,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const ::rtl::OUString& aServiceImplName,
-        const Sequence< ::rtl::OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    ::rtl::OUString aMainKeyName;
-    aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-        REGISTER_PROVIDER(
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
-             aSNS, xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
 static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
         MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index d605d4bb0a..d605d4bb0a 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index e9589a0582..e9589a0582 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index a3a52f68e8..a3a52f68e8 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index b334bf6a85..b334bf6a85 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 6cab8e3193..6cab8e3193 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 1cffe198ba..1cffe198ba 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index bfc141cc58..bfc141cc58 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index a711b42230..a711b42230 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 37939c4acc..37939c4acc 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index ef6a88917b..ef6a88917b 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 2efe916233..2efe916233 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index f689c285ac..2ae687fdc1 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -144,8 +144,8 @@ namespace connectivity
 
         sal_Int32 ProfileAccess::LoadProductsInfo()
         {
-			//load SeaMonkey 2 profiles to m_ProductProfileList
-			sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Mozilla);
+            //load SeaMonkey 2 profiles to m_ProductProfileList
+            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Mozilla);
 
             //load thunderbird profiles to m_ProductProfileList
             count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 5a9e61ebf8..5a9e61ebf8 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 2978c16fa1..2978c16fa1 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 5cbc352684..5cbc352684 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index 6461215532..6461215532 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 093e2d157c..093e2d157c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 6a4172da20..b44436e488 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -78,6 +78,14 @@ SHL1STDLIBS=\
         $(SALLIB)        \
         $(COMPHELPERLIB)
 
+ALLTAR : $(MISC)/mozbootstrap.component
+
+$(MISC)/mozbootstrap.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+
 .ELSE
 SLOFILES += \
     $(SLO)$/MNSInit.obj			            \
@@ -90,4 +98,3 @@ SLOFILES += \
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
-
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
new file mode 100755
index 0000000000..5da158924a
--- /dev/null
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+    <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index e34bc21913..e34bc21913 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 4d65bc3cb5..4d65bc3cb5 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index 4bb836ed13..4bb836ed13 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index 03198dcab8..03198dcab8 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 1579b16947..1579b16947 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
index a33bd622ac..a33bd622ac 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
index 792e8a34f4..792e8a34f4 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/mozab/exports.dxp
+++ b/connectivity/source/drivers/mozab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 5ebc146e8e..1928961b04 100644..100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -184,3 +184,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk
     @echo _TI				>$@
     @echo _real				>>$@
 
+
+ALLTAR : $(MISC)/mozab.component
+
+$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mozab.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mozab.component
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index c984f121a2..c984f121a2 100644..100755
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component
new file mode 100755
index 0000000000..70f5da3bfe
--- /dev/null
+++ b/connectivity/source/drivers/mozab/mozab.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+    <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdbc.MozabDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml
index 33e9219a16..33e9219a16 100644..100755
--- a/connectivity/source/drivers/mozab/mozab.xml
+++ b/connectivity/source/drivers/mozab/mozab.xml
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
index a431a07377..a431a07377 100644..100755
--- a/connectivity/source/drivers/mozab/mozabdrv.map
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 2e08d7754b..2e08d7754b 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 103903ac36..103903ac36 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index d6bfe02b23..d6bfe02b23 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 772390abc2..772390abc2 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index 54461bfc22..54461bfc22 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
index de53040895..de53040895 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 4dd1c511f1..4dd1c511f1 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 02cdcea1fe..02cdcea1fe 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 85d6337381..85d6337381 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index 6c2a2f5bc2..6c2a2f5bc2 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 16a27c7702..16a27c7702 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index 38310179d7..38310179d7 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 46651383c4..46651383c4 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index e3828a5d04..e3828a5d04 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 0495bf3cd6..0495bf3cd6 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 4ea4daf8fa..4ea4daf8fa 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 3d81453f06..3d81453f06 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 42517f5515..42517f5515 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index 55c1246d43..55c1246d43 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index cf365e1008..cf365e1008 100644..100755
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index 4da60543cb..e518d820dc 100644..100755
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -26,13 +26,6 @@
  *
  ************************************************************************/
 
-#ifndef BOOL
-# define MOZ_BOOL
-
-# define BOOL mozBOOL
-# define Bool mozBooL
-#endif
-
 // Turn off DEBUG Assertions
 #ifdef _DEBUG
     #define _DEBUG_WAS_DEFINED _DEBUG
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 3aeff3344a..3aeff3344a 100644..100755
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index effe4d3653..effe4d3653 100644..100755
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 40b1e171a2..40b1e171a2 100644..100755
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index a9c97aaeea..a9c97aaeea 100644..100755
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index aac4f5c3f3..aac4f5c3f3 100644..100755
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 50949d5cab..50949d5cab 100644..100755
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index 17b46179c9..17b46179c9 100644..100755
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 8184a7af1d..8184a7af1d 100644..100755
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index 508c4ed377..bb4bdf6a47 100644..100755
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "mysql/YDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::mysql;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriverDelegator::getImplementationName_Static(),
-            ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/drivers/mysql/exports.dxp
+++ b/connectivity/source/drivers/mysql/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index fbb68321cb..453f4b652f 100644..100755
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -82,3 +82,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/mysql.component
+
+$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mysql.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mysql.component
diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component
new file mode 100755
index 0000000000..ced2297fa0
--- /dev/null
+++ b/connectivity/source/drivers/mysql/mysql.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.comp.drivers.MySQL.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mysql/mysql.xml b/connectivity/source/drivers/mysql/mysql.xml
index 93cb83d0ab..93cb83d0ab 100644..100755
--- a/connectivity/source/drivers/mysql/mysql.xml
+++ b/connectivity/source/drivers/mysql/mysql.xml
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 86f173a395..e81bdd906e 100644..100755
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -110,10 +110,6 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
     
     if (bLoaded) 
         return sal_True;
-#ifdef WIN
-    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC.DLL"));
-    
-#endif
 #ifdef WNT
     _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC32.DLL"));
 #endif
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 8dd9ab3bfd..8dd9ab3bfd 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index 9b1939335a..9b1939335a 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index a13837224b..6d701b87c5 100644..100755
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -77,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/odbc.component
+
+$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        odbc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt odbc.component
diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component
new file mode 100755
index 0000000000..d4e6bc127d
--- /dev/null
+++ b/connectivity/source/drivers/odbc/odbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.ODBCDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/odbc/odbc.xml b/connectivity/source/drivers/odbc/odbc.xml
index eae2d3f3e1..eae2d3f3e1 100644..100755
--- a/connectivity/source/drivers/odbc/odbc.xml
+++ b/connectivity/source/drivers/odbc/odbc.xml
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 15d39337b3..93a1ccbce1 100644..100755
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -31,13 +31,11 @@
 #include "ORealDriver.hxx"
 #include "odbc/ODriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::odbc;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -125,31 +98,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODBCDriver::getImplementationName_Static(),
-            ODBCDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 3a9a50dbb8..3a9a50dbb8 100644..100755
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index c374447c6f..c374447c6f 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index ae87bedb98..ae87bedb98 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 7be1cf3bba..7be1cf3bba 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 233e95cca0..233e95cca0 100644..100755
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 8abf895edc..8abf895edc 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index af21829918..af21829918 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 3bb74f80c3..3bb74f80c3 100644..100755
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index a8dbb74d90..a8dbb74d90 100644..100755
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 85e96ea857..85e96ea857 100644..100755
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index ff48a26c56..ff48a26c56 100644..100755
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 1d495aee63..1d495aee63 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 06be3a5521..06be3a5521 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index a03750d908..a03750d908 100644..100755
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index 947f1e4b2d..947f1e4b2d 100644..100755
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 5dc25cea17..5dc25cea17 100644..100755
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index f62137a36d..f62137a36d 100644..100755
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index bccad9ab06..bccad9ab06 100644..100755
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index d4efc56186..d4efc56186 100644..100755
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index d6b0dae8b6..d6b0dae8b6 100644..100755
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 4e9bb50586..4e9bb50586 100644..100755
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index 23e47cf565..23e47cf565 100644..100755
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx
index 8480dd9ab9..8480dd9ab9 100644..100755
--- a/connectivity/source/inc/TResultSetHelper.hxx
+++ b/connectivity/source/inc/TResultSetHelper.hxx
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 48e0b9b3d1..8bee3576a9 100644..100755
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -99,7 +99,7 @@ namespace connectivity
             @return the last position
         */
         inline sal_Int32	getLastPosition() const { return m_aBookmarksPositions.size(); }
-        inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
+        inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
     };
 }
 #endif // CONNECTIVITY_SKIPDELETEDSSET_HXX
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 062946ac8d..062946ac8d 100644..100755
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx
index 8ac78d4924..8ac78d4924 100644..100755
--- a/connectivity/source/inc/UStringDescription_Impl.hxx
+++ b/connectivity/source/inc/UStringDescription_Impl.hxx
diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx
index 1480e078d4..1480e078d4 100644..100755
--- a/connectivity/source/inc/adabas/BCatalog.hxx
+++ b/connectivity/source/inc/adabas/BCatalog.hxx
diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx
index a310e1a4f6..a310e1a4f6 100644..100755
--- a/connectivity/source/inc/adabas/BColumn.hxx
+++ b/connectivity/source/inc/adabas/BColumn.hxx
diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx
index 060569d839..060569d839 100644..100755
--- a/connectivity/source/inc/adabas/BColumns.hxx
+++ b/connectivity/source/inc/adabas/BColumns.hxx
diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index 5ecdde267f..5ecdde267f 100644..100755
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
diff --git a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
index 9c2ba7edfe..9c2ba7edfe 100644..100755
--- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
+++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 0b06028b9e..0b06028b9e 100644..100755
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx
index 3f79fd7459..3f79fd7459 100644..100755
--- a/connectivity/source/inc/adabas/BGroup.hxx
+++ b/connectivity/source/inc/adabas/BGroup.hxx
diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx
index 832613e7e8..832613e7e8 100644..100755
--- a/connectivity/source/inc/adabas/BGroups.hxx
+++ b/connectivity/source/inc/adabas/BGroups.hxx
diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx
index 74e52681f1..74e52681f1 100644..100755
--- a/connectivity/source/inc/adabas/BIndex.hxx
+++ b/connectivity/source/inc/adabas/BIndex.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx
index 45fa0146f2..45fa0146f2 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumn.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumn.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx
index 8ed56e03d2..8ed56e03d2 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumns.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumns.hxx
diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx
index be9a975d87..be9a975d87 100644..100755
--- a/connectivity/source/inc/adabas/BIndexes.hxx
+++ b/connectivity/source/inc/adabas/BIndexes.hxx
diff --git a/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx
index 155186067b..155186067b 100644..100755
--- a/connectivity/source/inc/adabas/BKeys.hxx
+++ b/connectivity/source/inc/adabas/BKeys.hxx
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index cbe73c0bd9..cbe73c0bd9 100644..100755
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index 64f5932d9f..64f5932d9f 100644..100755
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 16a4cdeab6..16a4cdeab6 100644..100755
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 67f7a954c2..67f7a954c2 100644..100755
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx
index 520627b080..520627b080 100644..100755
--- a/connectivity/source/inc/adabas/BTable.hxx
+++ b/connectivity/source/inc/adabas/BTable.hxx
diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx
index cd80f95e9c..cd80f95e9c 100644..100755
--- a/connectivity/source/inc/adabas/BTables.hxx
+++ b/connectivity/source/inc/adabas/BTables.hxx
diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx
index bff6c6b5f1..bff6c6b5f1 100644..100755
--- a/connectivity/source/inc/adabas/BUser.hxx
+++ b/connectivity/source/inc/adabas/BUser.hxx
diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx
index 9a6b771302..9a6b771302 100644..100755
--- a/connectivity/source/inc/adabas/BUsers.hxx
+++ b/connectivity/source/inc/adabas/BUsers.hxx
diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx
index 51df106960..51df106960 100644..100755
--- a/connectivity/source/inc/adabas/BViews.hxx
+++ b/connectivity/source/inc/adabas/BViews.hxx
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 25e41f4bb7..25e41f4bb7 100644..100755
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 7fb8f30f5f..7fb8f30f5f 100644..100755
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 6716921fcf..6716921fcf 100644..100755
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index 62a2b101e8..62a2b101e8 100644..100755
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index 4486a57271..4486a57271 100644..100755
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index aa170e87a2..aa170e87a2 100644..100755
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 2e8dab649f..2e8dab649f 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index fd0d477073..fd0d477073 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 0f43f47826..0f43f47826 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index c8ff6e06da..c8ff6e06da 100644..100755
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 82401b55ef..82401b55ef 100644..100755
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index b204a7115c..b204a7115c 100644..100755
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index 77a994d739..77a994d739 100644..100755
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx
index ddf9e3ebfd..ddf9e3ebfd 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumn.hxx
+++ b/connectivity/source/inc/ado/AIndexColumn.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx
index e7f667bd7d..e7f667bd7d 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumns.hxx
+++ b/connectivity/source/inc/ado/AIndexColumns.hxx
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index 454ac64935..454ac64935 100644..100755
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index 8c37ff532b..8c37ff532b 100644..100755
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx
index 64f20668a2..64f20668a2 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumn.hxx
+++ b/connectivity/source/inc/ado/AKeyColumn.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx
index 0041d6c578..0041d6c578 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumns.hxx
+++ b/connectivity/source/inc/ado/AKeyColumns.hxx
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 24f7539487..24f7539487 100644..100755
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index b1f9e5480c..b1f9e5480c 100644..100755
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index b71730a0a0..b71730a0a0 100644..100755
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 16c118a1b0..16c118a1b0 100644..100755
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 91f873b468..91f873b468 100644..100755
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index 6c5e1b16bb..6c5e1b16bb 100644..100755
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index ac2e0b9407..ac2e0b9407 100644..100755
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 8595c075e9..8595c075e9 100644..100755
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index 77aa4504bf..77aa4504bf 100644..100755
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 8ec340608c..8ec340608c 100644..100755
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 27a7bebb36..27a7bebb36 100644..100755
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 7efda7a2f0..7efda7a2f0 100644..100755
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index fe582e1e39..fe582e1e39 100644..100755
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 63c6d4ac8e..63c6d4ac8e 100644..100755
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index aaab885eca..aaab885eca 100644..100755
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 1cc25e25bd..1cc25e25bd 100644..100755
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index 4245ef5b31..4245ef5b31 100644..100755
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index 1847adfeae..1847adfeae 100644..100755
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 50b70954e4..50b70954e4 100644..100755
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 7c94004230..7c94004230 100644..100755
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index c96bcebc69..c96bcebc69 100644..100755
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index 8744c61414..8744c61414 100644..100755
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index d5b21d3e6a..d5b21d3e6a 100644..100755
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx
index 73e83f518c..73e83f518c 100644..100755
--- a/connectivity/source/inc/calc/CColumns.hxx
+++ b/connectivity/source/inc/calc/CColumns.hxx
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index 94391b98a5..94391b98a5 100644..100755
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index 93e706d9aa..93e706d9aa 100644..100755
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index c88cf742b6..c88cf742b6 100644..100755
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx
index 7166b7ff5f..7166b7ff5f 100644..100755
--- a/connectivity/source/inc/calc/CPreparedStatement.hxx
+++ b/connectivity/source/inc/calc/CPreparedStatement.hxx
diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index 171069a014..171069a014 100644..100755
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx
index d919c457e9..d919c457e9 100644..100755
--- a/connectivity/source/inc/calc/CStatement.hxx
+++ b/connectivity/source/inc/calc/CStatement.hxx
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 8e907b6d37..8e907b6d37 100644..100755
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 5ba872b98c..5ba872b98c 100644..100755
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index 6814277ba0..6814277ba0 100644..100755
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index c5a0d66790..c5a0d66790 100644..100755
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index 1595441002..1595441002 100644..100755
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 97c1ca32f0..97c1ca32f0 100644..100755
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index 1c661bcecc..1c661bcecc 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 12fc3ebced..12fc3ebced 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 3a8adf9b93..3a8adf9b93 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index a4ac77d24a..a4ac77d24a 100644..100755
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index c241dce433..0576e84085 100644..100755
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -84,13 +84,13 @@ namespace connectivity
             ONDXPageList    m_aCollector;                   // Pool von nicht mehr benoetigten Seiten
             ONDXPagePtr		m_aRoot,						// Wurzel des b+ Baums
                             m_aCurLeaf;					// aktuelles Blatt
-            USHORT			m_nCurNode;					// Position des aktuellen Knoten
+            sal_uInt16			m_nCurNode;					// Position des aktuellen Knoten
 
             sal_uInt32			m_nPageCount,
                             m_nRootPage;
 
             ODbaseTable*	m_pTable;
-            BOOL			m_bUseCollector : 1;						// Verwenden des GarbageCollectors
+            sal_Bool			m_bUseCollector : 1;						// Verwenden des GarbageCollectors
 
             ::rtl::OUString getCompletePath();
             void closeImpl();
@@ -124,31 +124,31 @@ namespace connectivity
             sal_uInt32 GetRootPos()					{return m_nRootPage;}
             sal_uInt32 GetPageCount()				{return m_nPageCount;}
 
-            BOOL IsText() const					{return m_aHeader.db_keytype == 0;}
-            USHORT GetMaxNodes() const			{return m_aHeader.db_maxkeys;}
+            sal_Bool IsText() const					{return m_aHeader.db_keytype == 0;}
+            sal_uInt16 GetMaxNodes() const			{return m_aHeader.db_maxkeys;}
 
-            virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
-            virtual BOOL Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+            virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
 
             void createINFEntry();
-            BOOL CreateImpl();
-            BOOL DropImpl();
+            sal_Bool CreateImpl();
+            sal_Bool DropImpl();
 
             DECLARE_SERVICE_INFO();
         protected:
 
-            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, BOOL bLoad = FALSE);
+            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False);
             void Collect(ONDXPage*);
             ONDXPagePtr getRoot();
 
             sal_Bool isUnique() const { return m_IsUnique; }
-            BOOL UseCollector() const {return m_bUseCollector;}
+            sal_Bool UseCollector() const {return m_bUseCollector;}
             // Tree operationen
             void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
-            void Release(BOOL bSave = TRUE);
-            BOOL ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
+            void Release(sal_Bool bSave = sal_True);
+            sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
         };
 
         SvStream& operator << (SvStream &rStream, ODbaseIndex&);
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index d967cd878d..247c878580 100644..100755
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -49,7 +49,7 @@ namespace connectivity
             ODbaseIndexColumns(	ODbaseIndex* _pIndex,
                                 ::osl::Mutex& _rMutex,
                                 const TStringVector &_rVector)
-                        : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                        : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                         , m_pIndex(_pIndex)
             {}
 
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index cbc520a7e7..81ff212d4d 100644..100755
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -48,14 +48,14 @@ namespace connectivity
             ODbaseIndex*			m_pIndex;
             ONDXPagePtr				m_aRoot,
                                     m_aCurLeaf;
-            USHORT					m_nCurNode;
+            sal_uInt16					m_nCurNode;
 
         protected:
-            ULONG Find(BOOL bFirst);
-            ULONG GetCompare(BOOL bFirst);
-            ULONG GetLike(BOOL bFirst);
-            ULONG GetNull(BOOL bFirst);
-            ULONG GetNotNull(BOOL bFirst);
+            sal_uIntPtr Find(sal_Bool bFirst);
+            sal_uIntPtr GetCompare(sal_Bool bFirst);
+            sal_uIntPtr GetLike(sal_Bool bFirst);
+            sal_uIntPtr GetNull(sal_Bool bFirst);
+            sal_uIntPtr GetNotNull(sal_Bool bFirst);
 
             ONDXKey* GetFirstKey(ONDXPage* pPage,
                                 const file::OOperand& rKey);
@@ -76,8 +76,8 @@ namespace connectivity
             }
 
             virtual ~OIndexIterator();
-            ULONG First();
-            ULONG Next();
+            sal_uIntPtr First();
+            sal_uIntPtr Next();
 
         };
     }
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 7de170c1ca..2e693765ca 100644..100755
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -31,9 +31,7 @@
 
 #include <rtl/ref.hxx>
 #include <tools/stream.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 
 #endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index a2eab66974..c29130d840 100644..100755
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -51,7 +51,7 @@ namespace connectivity
             virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
         public:
             ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex,
-                const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 , m_pTable(_pTable)
             {}
 
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index beaec2e58e..beaec2e58e 100644..100755
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index 9b2837916c..9b2837916c 100644..100755
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index edb8c0310c..edb8c0310c 100644..100755
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 53d89af63a..7f5e59bf6c 100644..100755
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -69,26 +69,26 @@ namespace connectivity
         private:
             struct DBFHeader {                       /* Kopfsatz-Struktur            */
                                 DBFType	db_typ;		                    /* Dateityp						*/
-                                BYTE    db_aedat[3];                    /* Datum der letzen Aenderung   */
+                                sal_uInt8    db_aedat[3];                    /* Datum der letzen Aenderung   */
                                                                         /* JJ MM TT                     */
                                 sal_uInt32   db_anz;                         /* Anzahl der Saetze            */
-                                USHORT  db_kopf;                        /* laenge Kopfsatz-Struktur     */
-                                USHORT  db_slng;                        /* laenge der Daten-Saetze      */
-                                BYTE    db_frei[20];                    /* reserviert                   */
+                                sal_uInt16  db_kopf;                        /* laenge Kopfsatz-Struktur     */
+                                sal_uInt16  db_slng;                        /* laenge der Daten-Saetze      */
+                                sal_uInt8    db_frei[20];                    /* reserviert                   */
                             };
             struct DBFColumn {                       /* Feldbezeichner               */
-                                BYTE    db_fnm[11];                     /* Feldname                     */
-                                BYTE    db_typ;                         /* Feldtyp                      */
-                                UINT32  db_adr;                         /* Feldadresse                  */
-                                BYTE    db_flng;                        /* Feldlaenge                   */
-                                BYTE    db_dez;                         /* Dezimalstellen fuer N        */
-                                BYTE    db_frei2[14];                   /* reserviert                   */
+                                sal_uInt8    db_fnm[11];                     /* Feldname                     */
+                                sal_uInt8    db_typ;                         /* Feldtyp                      */
+                                sal_uInt32  db_adr;                         /* Feldadresse                  */
+                                sal_uInt8    db_flng;                        /* Feldlaenge                   */
+                                sal_uInt8    db_dez;                         /* Dezimalstellen fuer N        */
+                                sal_uInt8    db_frei2[14];                   /* reserviert                   */
                             };
             struct DBFMemoHeader
                             {
                                 DBFMemoType	db_typ;						/* Dateityp						*/
-                                UINT32  db_next;                        /* naechster freier Block       */
-                                USHORT  db_size;                        /* Blockgroesse: dBase 3 fest   */
+                                sal_uInt32  db_next;                        /* naechster freier Block       */
+                                sal_uInt16  db_size;                        /* Blockgroesse: dBase 3 fest   */
                             };
 
             ::std::vector<sal_Int32> m_aTypes;		// holds all type for columns just to avoid to ask the propertyset
@@ -108,15 +108,15 @@ namespace connectivity
             void fillColumns();
             String createTempFile();
             void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
-            BOOL CreateMemoFile(const INetURLObject& aFile);
-            BOOL HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
-            BOOL ReadMemoHeader();
-            BOOL ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable);
-
-            BOOL WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr);
-            BOOL WriteBuffer();
-            BOOL UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
+            sal_Bool CreateMemoFile(const INetURLObject& aFile);
+            sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
+            sal_Bool ReadMemoHeader();
+            sal_Bool ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable);
+
+            sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
+            sal_Bool WriteBuffer();
+            sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
             void AllocBuffer();
 
@@ -162,19 +162,19 @@ namespace connectivity
             // XRename
             virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
 
-            BOOL	DropImpl();
-            BOOL	CreateImpl();
+            sal_Bool	DropImpl();
+            sal_Bool	CreateImpl();
 
 
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
 
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
 
             static String	getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL );
-            static BOOL		Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
+            static sal_Bool		Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
 
             virtual void refreshHeader();
 
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 29f10222d9..29f10222d9 100644..100755
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 41c78aecc7..af5284ca28 100644..100755
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -51,14 +51,14 @@ namespace connectivity
         class ONDXKey : public ONDXKey_BASE
         {
             friend class ONDXNode;
-            UINT32			nRecord;				/* Satzzeiger				*/
+            sal_uInt32			nRecord;				/* Satzzeiger				*/
             ORowSetValue	xValue;					/* Schluesselwert			*/
 
         public:
-            ONDXKey(UINT32 nRec=0);
-            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec);
-            ONDXKey(const rtl::OUString& aStr, UINT32 nRec = 0);
-            ONDXKey(double aVal, UINT32 nRec = 0);
+            ONDXKey(sal_uInt32 nRec=0);
+            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
+            ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0);
+            ONDXKey(double aVal, sal_uInt32 nRec = 0);
 
             inline ONDXKey(const ONDXKey& rKey);
 
@@ -67,21 +67,21 @@ namespace connectivity
 
             virtual const ORowSetValue& getValue() const;
 
-            UINT32 GetRecord() const		{ return nRecord;	}
-            void setRecord(UINT32 _nRec)	{ nRecord = _nRec;	}
+            sal_uInt32 GetRecord() const		{ return nRecord;	}
+            void setRecord(sal_uInt32 _nRec)	{ nRecord = _nRec;	}
             void   ResetRecord()			{ nRecord = 0;		}
 
-            BOOL operator == (const ONDXKey& rKey) const;
-            BOOL operator != (const ONDXKey& rKey) const;
-            BOOL operator <	 (const ONDXKey& rKey) const;
-            BOOL operator <= (const ONDXKey& rKey) const;
-            BOOL operator >  (const ONDXKey& rKey) const;
-            BOOL operator >= (const ONDXKey& rKey) const;
+            sal_Bool operator == (const ONDXKey& rKey) const;
+            sal_Bool operator != (const ONDXKey& rKey) const;
+            sal_Bool operator <	 (const ONDXKey& rKey) const;
+            sal_Bool operator <= (const ONDXKey& rKey) const;
+            sal_Bool operator >  (const ONDXKey& rKey) const;
+            sal_Bool operator >= (const ONDXKey& rKey) const;
 
-            BOOL Load (SvFileStream& rStream, BOOL bText);
-            BOOL Write(SvFileStream& rStream, BOOL bText);
+            sal_Bool Load (SvFileStream& rStream, sal_Bool bText);
+            sal_Bool Write(SvFileStream& rStream, sal_Bool bText);
 
-            static BOOL IsText(sal_Int32 eType);
+            static sal_Bool IsText(sal_Int32 eType);
 
         private:
             StringCompare Compare(const ONDXKey& rKey) const;
@@ -101,18 +101,18 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-            UINT32	nPagePos;		// Position in der Indexdatei
+            sal_uInt32	nPagePos;		// Position in der Indexdatei
 
         public:
-            ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+            ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
             ONDXPagePtr(const ONDXPagePtr& rRef);
             ONDXPagePtr(ONDXPage* pRefPage);
 
             ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
             ONDXPagePtr& operator=(ONDXPage* pPageRef);
 
-            UINT32 GetPagePos() const {return nPagePos;}
-            BOOL HasPage() const {return nPagePos != 0;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
+            sal_Bool HasPage() const {return nPagePos != 0;}
             //	sal_Bool Is() const { return isValid(); }
         };
         //==================================================================
@@ -125,9 +125,9 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPage&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPage&);
 
-            UINT32		nPagePos;				// Position in der Indexdatei
-            BOOL		bModified : 1;
-            USHORT		nCount;
+            sal_uInt32		nPagePos;				// Position in der Indexdatei
+            sal_Bool		bModified : 1;
+            sal_uInt16		nCount;
 
             ONDXPagePtr	aParent,			// VaterSeite
                         aChild;				// Zeiger auf rechte ChildPage
@@ -136,33 +136,33 @@ namespace connectivity
 
         public:
             // Knoten Operationen
-            USHORT	Count() const {return nCount;}
+            sal_uInt16	Count() const {return nCount;}
 
-            BOOL	Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
-            BOOL	Insert(USHORT nIndex, ONDXNode& rNode);
-            BOOL	Append(ONDXNode& rNode);
-            BOOL	Delete(USHORT);
-            void	Remove(USHORT);
-            void	Release(BOOL bSave = TRUE);
-            void	ReleaseFull(BOOL bSave = TRUE);
+            sal_Bool	Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
+            sal_Bool	Insert(sal_uInt16 nIndex, ONDXNode& rNode);
+            sal_Bool	Append(ONDXNode& rNode);
+            sal_Bool	Delete(sal_uInt16);
+            void	Remove(sal_uInt16);
+            void	Release(sal_Bool bSave = sal_True);
+            void	ReleaseFull(sal_Bool bSave = sal_True);
 
             // Aufteilen und Zerlegen
             ONDXNode Split(ONDXPage& rPage);
-            void Merge(USHORT nParentNodePos, ONDXPagePtr xPage);
+            void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
 
             // Zugriffsoperationen
-            ONDXNode& operator[] (USHORT nPos);
-            const ONDXNode& operator[] (USHORT nPos) const;
+            ONDXNode& operator[] (sal_uInt16 nPos);
+            const ONDXNode& operator[] (sal_uInt16 nPos) const;
 
-            BOOL IsRoot() const;
-            BOOL IsLeaf() const;
-            BOOL IsModified() const;
-            BOOL HasParent();
-            BOOL HasChild() const;
+            sal_Bool IsRoot() const;
+            sal_Bool IsLeaf() const;
+            sal_Bool IsModified() const;
+            sal_Bool HasParent();
+            sal_Bool HasChild() const;
 
-            BOOL IsFull() const;
+            sal_Bool IsFull() const;
 
-            UINT32 GetPagePos() const {return nPagePos;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
             ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
 
             // Parent braucht nicht nachgeladen zu werden
@@ -174,8 +174,8 @@ namespace connectivity
             void SetChild(ONDXPagePtr aCh);
             void SetParent(ONDXPagePtr aPa);
 
-            USHORT Search(const ONDXKey& rSearch);
-            USHORT Search(const ONDXPage* pPage);
+            sal_uInt16 Search(const ONDXKey& rSearch);
+            sal_uInt16 Search(const ONDXPage* pPage);
             void   SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
 
         protected:
@@ -184,11 +184,11 @@ namespace connectivity
 
             virtual void QueryDelete();
 
-            void SetModified(BOOL bMod) {bModified = bMod;}
-            void SetPagePos(UINT32 nPage) {nPagePos = nPage;}
+            void SetModified(sal_Bool bMod) {bModified = bMod;}
+            void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
 
-            BOOL Find(const ONDXKey&);	// rek. Abstieg
-            USHORT FindPos(const ONDXKey& rKey) const;
+            sal_Bool Find(const ONDXKey&);	// rek. Abstieg
+            sal_uInt16 FindPos(const ONDXKey& rKey) const;
 
 #if OSL_DEBUG_LEVEL > 1
             void PrintPage();
@@ -200,11 +200,11 @@ namespace connectivity
         SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
         SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-        inline BOOL ONDXPage::IsRoot() const {return !aParent.Is();}
-        inline BOOL ONDXPage::IsLeaf() const {return !aChild.HasPage();}
-        inline BOOL ONDXPage::IsModified() const {return bModified;}
-        inline BOOL ONDXPage::HasParent() {return aParent.Is();}
-        inline BOOL ONDXPage::HasChild() const {return aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
+        inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsModified() const {return bModified;}
+        inline sal_Bool ONDXPage::HasParent() {return aParent.Is();}
+        inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();}
         inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
 
         inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -240,7 +240,7 @@ namespace connectivity
                        :aChild(aPagePtr),aKey(rKey) {}
 
             // verweist der Knoten auf eine Seite
-            BOOL			HasChild() const {return aChild.HasPage();}
+            sal_Bool			HasChild() const {return aChild.HasPage();}
             // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
             ONDXPagePtr&	GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
 
@@ -257,14 +257,14 @@ namespace connectivity
         //==================================================================
         // inline implementation
         //==================================================================
-//		inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+//		inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
 //			: ONDXKey_BASE(eType)
 //			, nRecord(nRec),xValue(rVal)
 //		{
 //		}
 
 
-//		inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+//		inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
 //					: ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
 //					 ,nRecord(nRec)
 //		{
@@ -272,14 +272,14 @@ namespace connectivity
 //				xValue = aStr;
 //		}
 
-//		inline ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+//		inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
 //					 : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
 //					 ,nRecord(nRec)
 //					 ,xValue(aVal)
 //		{
 //		}
 
-//		inline ONDXKey::ONDXKey(UINT32 nRec)
+//		inline ONDXKey::ONDXKey(sal_uInt32 nRec)
 //					 :nRecord(nRec)
 //		{
 //		}
@@ -302,29 +302,29 @@ namespace connectivity
             return *this;
         }
 
-        inline BOOL ONDXKey::operator == (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const
         {
             if(&rKey == this)
                 return sal_True;
             return Compare(rKey) == COMPARE_EQUAL;
         }
-        inline BOOL ONDXKey::operator != (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const
         {
             return !operator== (rKey);
         }
-        inline BOOL ONDXKey::operator <  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_LESS;
         }
-        inline BOOL ONDXKey::operator >  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_GREATER;
         }
-        inline BOOL ONDXKey::operator <= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const
         {
             return !operator > (rKey);
         }
-        inline BOOL ONDXKey::operator >= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const
         {
             return !operator< (rKey);
         }
diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h
index 5ce8b47b78..5ce8b47b78 100644..100755
--- a/connectivity/source/inc/diagnose_ex.h
+++ b/connectivity/source/inc/diagnose_ex.h
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index 2886762deb..2886762deb 100644..100755
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 409b184b08..45032d2324 100644..100755
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -50,7 +50,7 @@ namespace connectivity
             OColumns(	OFileTable* _pTable,
                         ::osl::Mutex& _rMutex,
                         const TStringVector &_rVector
-                    ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                    ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_pTable(_pTable)
             {}
         };
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 612c8a471e..612c8a471e 100644..100755
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index aea33e0709..aea33e0709 100644..100755
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 0551d3fd4d..0551d3fd4d 100644..100755
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 4cf15e8d86..4cf15e8d86 100644..100755
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index a76e988a5f..a76e988a5f 100644..100755
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 54bc1f7293..b85f23f54d 100644..100755
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -68,7 +68,7 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, 
+            sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, 
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
             void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 3e82fa6e5f..4fe81494e5 100644..100755
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -151,13 +151,13 @@ namespace connectivity
             void construct();
             sal_Bool evaluate();
 
-            BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                                INT32 nOffset = 1,
-                                BOOL bEvaluate = TRUE,
-                                BOOL bRetrieveData = TRUE);
+            sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                                sal_Int32 nOffset = 1,
+                                sal_Bool bEvaluate = sal_True,
+                                sal_Bool bRetrieveData = sal_True);
 
             OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
-            BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
+            sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
 
             // return true when the select statement is "select count(*) from table"
             inline sal_Bool isCount() const { return m_bIsCount; }
@@ -172,7 +172,7 @@ namespace connectivity
 
             using OResultSet_BASE::rBHelper;
 
-            BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData);
+            sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData);
             virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex);
 
             // OPropertyArrayUsageHelper
@@ -285,7 +285,7 @@ namespace connectivity
 
             // special methods
             inline sal_Int32 mapColumn(sal_Int32	column);
-            virtual BOOL OpenImpl();
+            virtual sal_Bool OpenImpl();
             virtual void doTableSpecials(const OSQLTable& _xTable);
 
             inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 35dfde4012..35dfde4012 100644..100755
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index bee5efef19..b4f3e71b03 100644..100755
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -135,8 +135,8 @@ namespace connectivity
             void GetAssignValues();
             void SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull = FALSE,
-                                   UINT32 nParameter=SQL_NO_PARAMETER);
+                                   sal_Bool bSetNull = sal_False,
+                                   sal_uInt32 nParameter=SQL_NO_PARAMETER);
             void ParseAssignValues(	const ::std::vector< String>& aColumnNameList,
                                     connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex);
 
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index 8821d29aee..8821d29aee 100644..100755
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index d9a9d395cc..afb95ec49a 100644..100755
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -86,9 +86,9 @@ namespace connectivity
             virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
 
             ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
             // refresh the header of file based tables to see changes done by someone 
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index f2aa5c9f48..4c649f3946 100644..100755
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -47,7 +47,7 @@ namespace connectivity
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         public:
             OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
-                const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_xMetaData(_rMetaData)
             {}
 
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index c6f45df023..1731ac829d 100644..100755
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -82,9 +82,9 @@ namespace connectivity
             void dispose();
             void start(OSQLParseNode* pSQLParseNode);
             void clean();
-            virtual BOOL hasRestriction() const;
-            virtual BOOL hasFunctions() const;
-            inline BOOL evaluateRestriction()	{ return m_aInterpreter->start(); }
+            virtual sal_Bool hasRestriction() const;
+            virtual sal_Bool hasFunctions() const;
+            inline sal_Bool evaluateRestriction()	{ return m_aInterpreter->start(); }
             void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
             void setOrigColumns(const OFileColumns& rCols);
             virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index f52c95690e..f52c95690e 100644..100755
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index be00efaac1..ed0f7586b1 100644..100755
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -110,7 +110,7 @@ namespace connectivity
 
             inline void startSelection(ORowSetValueDecoratorRef& _rVal) 
             { 
-                return evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
+                evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
             }
 
             
diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx
index 5c8e3d878e..5c8e3d878e 100644..100755
--- a/connectivity/source/inc/file/filedllapi.hxx
+++ b/connectivity/source/inc/file/filedllapi.hxx
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 4bcf6e5a0f..4bcf6e5a0f 100644..100755
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 600b793047..600b793047 100644..100755
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index 93f2197349..93f2197349 100644..100755
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index e70da81520..7e93db0e62 100644..100755
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -39,6 +39,7 @@ namespace connectivity
         class OFlatConnection : public file::OConnection
         {
         private:
+            sal_Int32   m_nMaxRowsToScan;
             sal_Bool	m_bHeaderLine; 			// column names in first row
             sal_Unicode	m_cFieldDelimiter;		// look at the name
             sal_Unicode	m_cStringDelimiter;		// delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter
@@ -56,6 +57,7 @@ namespace connectivity
             inline sal_Unicode	getStringDelimiter()	const { return m_cStringDelimiter;	}
             inline sal_Unicode	getDecimalDelimiter()	const { return m_cDecimalDelimiter; }
             inline sal_Unicode	getThousandDelimiter()	const { return m_cThousandDelimiter;}
+            inline sal_Int32	getMaxRowsToScan()	    const { return m_nMaxRowsToScan;}
             // XServiceInfo
             DECLARE_SERVICE_INFO();
 
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index c4d0bce60a..c4d0bce60a 100644..100755
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 794b4c5da1..794b4c5da1 100644..100755
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index 4304be59f6..4304be59f6 100644..100755
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index 1d0e2eab1a..1d0e2eab1a 100644..100755
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index 018b204aae..018b204aae 100644..100755
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 9702070c23..912f11845e 100644..100755
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -34,6 +34,7 @@
 #include "connectivity/CommonTools.hxx"
 #include <tools/urlobj.hxx>
 #include "file/quotedstring.hxx"
+#include <unotools/syslocale.hxx>
 
 namespace connectivity
 {
@@ -66,8 +67,11 @@ namespace connectivity
             bool                            m_bNeedToReadLine;
         private:					
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
             sal_Bool readLine(sal_Int32& _rnCurrentPos);
+            void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+                                             ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+                                             ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass& aCharClass);
         public:
             virtual void refreshColumns();
 
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index 75db907662..75db907662 100644..100755
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 71282008b6..71282008b6 100644..100755
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index 637ea8f2c2..637ea8f2c2 100644..100755
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 5c86cf9dee..5c86cf9dee 100644..100755
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index b75c92c464..b75c92c464 100644..100755
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
index 01d42a8f38..01d42a8f38 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.h
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index b543e09d5c..b543e09d5c 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index ee27fff089..ee27fff089 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index a59f5b9b31..a59f5b9b31 100644..100755
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index baec755042..baec755042 100644..100755
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index 2c1b8f4d5f..2c1b8f4d5f 100644..100755
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index d5201c63e8..d5201c63e8 100644..100755
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 10bfa31eb2..10bfa31eb2 100644..100755
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 51117c9914..51117c9914 100644..100755
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index ee2f61e6ab..ee2f61e6ab 100644..100755
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
index c99a16f6df..c99a16f6df 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 2c635de5a1..2c635de5a1 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 3009dc5992..3009dc5992 100644..100755
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index f1f49f0af8..f1f49f0af8 100644..100755
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index b6db5de516..b6db5de516 100644..100755
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 6f499ced88..6f499ced88 100644..100755
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 5fdb5a5abb..5fdb5a5abb 100644..100755
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 74235ff5d3..74235ff5d3 100644..100755
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 4c036bdf18..4c036bdf18 100644..100755
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index b0ce998314..b0ce998314 100644..100755
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 2eb76b5aef..2eb76b5aef 100644..100755
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index fe3fa4c254..fe3fa4c254 100644..100755
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index f39664e77b..f39664e77b 100644..100755
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 9915adbea7..9915adbea7 100644..100755
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 39f02eca41..39f02eca41 100644..100755
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index b3e6d4ffa0..b3e6d4ffa0 100644..100755
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index 754b38b09e..754b38b09e 100644..100755
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 00fd44c6fb..00fd44c6fb 100644..100755
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 01265210c3..01265210c3 100644..100755
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 211e950a88..211e950a88 100644..100755
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 74bddcd5b9..74bddcd5b9 100644..100755
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index e0bd590cc1..e0bd590cc1 100644..100755
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 508429c301..508429c301 100644..100755
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 0e6955aa71..0e6955aa71 100644..100755
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 39f232c8d5..39f232c8d5 100644..100755
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index f27789f6df..f27789f6df 100644..100755
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index d4479be3bb..d4479be3bb 100644..100755
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 5764fec3cf..5764fec3cf 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index c0f43cbb8d..c0f43cbb8d 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 6ff404cbef..6ff404cbef 100644..100755
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index 8026d0ac5f..8026d0ac5f 100644..100755
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index b9780c34c5..b9780c34c5 100644..100755
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index eec4b99c0f..eec4b99c0f 100644..100755
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index 7c8c7a9811..7c8c7a9811 100644..100755
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index b3de8690c5..b3de8690c5 100644..100755
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index e07fce0cd3..e07fce0cd3 100644..100755
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index a9573a35d5..a9573a35d5 100644..100755
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index ab523896f6..ab523896f6 100644..100755
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 8c718f9b06..8c718f9b06 100644..100755
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 72d654137c..72d654137c 100644..100755
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index bdc0ee8b1e..bdc0ee8b1e 100644..100755
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index 59c5189122..59c5189122 100644..100755
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index fdd95845eb..fdd95845eb 100644..100755
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 5817aac107..5817aac107 100644..100755
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 4b6f6b1081..4b6f6b1081 100644..100755
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index ab4eddfa53..ab4eddfa53 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 8851f1f56e..8851f1f56e 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
index 29a56fe4c4..29a56fe4c4 100644..100755
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ b/connectivity/source/inc/odbc/ODefs3.hxx
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index abdf594964..abdf594964 100644..100755
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 16edba2427..eefbd7bd7b 100644..100755
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -30,7 +30,7 @@
 #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
 #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index 6e53f332b5..6e53f332b5 100644..100755
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 1e8362834b..1e8362834b 100644..100755
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 7a9b399694..7a9b399694 100644..100755
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 86e2441d38..86e2441d38 100644..100755
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 97a1254e18..97a1254e18 100644..100755
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index e493cec454..e493cec454 100644..100755
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
index 31ac8636e6..31ac8636e6 100644..100755
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index eaa2f3e08b..eaa2f3e08b 100644..100755
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
index edceb2658c..edceb2658c 100644..100755
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ b/connectivity/source/inc/resource/adabas_res.hrc
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index 115936ea37..115936ea37 100644..100755
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.hrc
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index fbb86e5fa4..fbb86e5fa4 100644..100755
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index 543231c4e1..543231c4e1 100644..100755
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 45f8399259..45f8399259 100644..100755
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index 698f31dd7a..698f31dd7a 100644..100755
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index 73f6214c24..73f6214c24 100644..100755
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.hrc
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index b5b7b98073..b5b7b98073 100644..100755
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.hrc
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index c2b1f07769..c2b1f07769 100644..100755
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index e12e91516a..e12e91516a 100644..100755
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.hrc
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index 789d4a832d..789d4a832d 100644..100755
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.hrc
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index fca426111c..fca426111c 100644..100755
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.hrc
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 30aaa791f7..30aaa791f7 100644..100755
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index ae6a770ce5..ae6a770ce5 100644..100755
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 6456711f3a..6456711f3a 100644..100755
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/connectivity/source/manager/exports.dxp
+++ b/connectivity/source/manager/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index 52ec191ec8..4880407952 100644..100755
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -76,4 +76,10 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/sdbc2.component
 
+$(MISC)/sdbc2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdbc2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdbc2.component
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index fccc363efc..fccc363efc 100644..100755
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index ec6f38645b..ec6f38645b 100644..100755
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 383bef3a9a..6fbebf55e0 100644..100755
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -37,7 +37,6 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 
 //==========================================================================
 //= registration
@@ -52,38 +51,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
 }
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
-
-
-    sal_Bool bReturn = sal_False;
-
-    try
-    {
-        ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
-        sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static();
-        sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-        Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
-        if (xMainKey.is())
-        {
-            Sequence< ::rtl::OUString > sServices(::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static());
-            const ::rtl::OUString* pBegin = sServices.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + sServices.getLength();
-            for (;pBegin != pEnd ; ++pBegin)
-                xMainKey->createKey(*pBegin);
-            bReturn = sal_True;
-        }
-    }
-    catch(InvalidRegistryException&)
-    {
-    }
-    catch(InvalidValueException&)
-    {
-    }
-    return bReturn;
-}
-
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map
index 14e33ebafb..431725adbb 100644..100755
--- a/connectivity/source/manager/sdbc.mxp.map
+++ b/connectivity/source/manager/sdbc.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component
new file mode 100755
index 0000000000..6cce2b1d9f
--- /dev/null
+++ b/connectivity/source/manager/sdbc2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager">
+    <service name="com.sun.star.sdbc.DriverManager"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index eb5cf9f9e9..ea19cf8bef 100644..100755
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -32,7 +32,9 @@
 #include "connectivity/PColumn.hxx"
 #include "connectivity/dbtools.hxx"
 #include "TConnection.hxx"
+
 #include <comphelper/types.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -152,7 +154,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
         _rxResMetaData->getColumnType( _nColumnPos ),
         _rxResMetaData->isAutoIncrement( _nColumnPos ),
         _rxResMetaData->isCurrency( _nColumnPos ),
-        _rxDBMetaData->storesMixedCaseQuotedIdentifiers()
+        _rxDBMetaData->supportsMixedCaseQuotedIdentifiers()
     );
     pColumn->setTableName(  ::dbtools::composeTableName( _rxDBMetaData,
         _rxResMetaData->getCatalogName( _nColumnPos ),
@@ -190,38 +192,85 @@ void OParseColumn::construct()
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper()
 {
-    OSL_ENSURE( !isNew(), "OParseColumn::OOrderColumn: a *new* OrderColumn?" );
+    OSL_ENSURE( !isNew(), "OParseColumn::getInfoHelper: a *new* ParseColumn?" );
     return *OParseColumn_PROP::getArrayHelper();
 }
+
 // -----------------------------------------------------------------------------
-OOrderColumn::OOrderColumn(	const Reference<XPropertySet>& _xColumn
-                                     ,sal_Bool	_bCase
-                                     ,sal_Bool _bAscending)
-    : connectivity::sdbcx::OColumn(	getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
-                                ,	getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
-                                ,	getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
-                                ,	getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
-                                ,	getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
-                                ,	getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
-                                ,	getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
-                                ,	getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
-                                ,	getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)))
-                                ,	sal_False
-                                ,	getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))
-                                ,	_bCase
-                                )
-    , m_bAscending(_bAscending)
+namespace
+{
+    ::rtl::OUString lcl_getColumnTableName( const Reference< XPropertySet >& i_parseColumn )
+    {
+        ::rtl::OUString sColumnTableName;
+        try
+        {
+            OSL_VERIFY( i_parseColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TABLENAME ) ) >>= sColumnTableName );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sColumnTableName;
+    }
+}
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn(	const Reference<XPropertySet>& _xColumn, const ::rtl::OUString& i_rOriginatingTableName,
+                            sal_Bool	_bCase, sal_Bool _bAscending )
+    : connectivity::sdbcx::OColumn(
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+        sal_False,
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+        _bCase
+    )
+    ,m_bAscending(_bAscending)
+    ,m_sTableName( i_rOriginatingTableName )
 {
     construct();
 }
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn(	const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending )
+    : connectivity::sdbcx::OColumn(
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+        sal_False,
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+        _bCase
+    )
+    ,m_bAscending(_bAscending)
+    ,m_sTableName( lcl_getColumnTableName( _xColumn ) )
+{
+    construct();
+}
+
 // -------------------------------------------------------------------------
 OOrderColumn::~OOrderColumn()
 {
 }
+
 // -------------------------------------------------------------------------
 void OOrderColumn::construct()
 {
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending,		::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
+        PropertyAttribute::READONLY,  const_cast< sal_Bool* >( &m_bAscending ),    ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),   PROPERTY_ID_TABLENAME, 
+        PropertyAttribute::READONLY,  const_cast< ::rtl::OUString* >( &m_sTableName ),  ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
 }
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
@@ -231,17 +280,14 @@ void OOrderColumn::construct()
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper()
 {
-    OSL_ENSURE( !isNew(), "OOrderColumn::OOrderColumn: a *new* OrderColumn?" );
+    OSL_ENSURE( !isNew(), "OOrderColumn::getInfoHelper: a *new* OrderColumn?" );
     return *OOrderColumn_PROP::getArrayHelper();
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
-    if ( m_bOrder )
-        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
-    else
-        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
 
     return aSupported;
 }
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index a6c84f72a0..a6c84f72a0 100644..100755
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index 510fbb2fc2..510fbb2fc2 100644..100755
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 498f9aad90..498f9aad90 100644..100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 8a4f5e5779..8a4f5e5779 100644..100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index a44fb41adf..c45bf50211 100644..100755
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -94,7 +94,7 @@ namespace connectivity
             OSL_PRECOND( m_xConnection.is(), "OSQLParseTreeIteratorImpl::OSQLParseTreeIteratorImpl: invalid connection!" );
             m_xDatabaseMetaData = m_xConnection->getMetaData();
 
-            m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->storesMixedCaseQuotedIdentifiers();
+            m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->supportsMixedCaseQuotedIdentifiers();
             m_pTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
             m_pSubTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
 
@@ -1911,12 +1911,12 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setOrderByColumnName" );
     Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false );
     if ( xColumn.is() )
-        m_aOrderColumns->get().push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending));
+        m_aOrderColumns->get().push_back(new OOrderColumn( xColumn, rTableRange, isCaseSensitive(), bAscending ) );
     else 
     {
         sal_Int32 nId = rColumnName.toInt32();
         if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) )
-            m_aOrderColumns->get().push_back(new OOrderColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive(),bAscending));
+            m_aOrderColumns->get().push_back( new OOrderColumn( ( m_aSelectColumns->get() )[nId-1], isCaseSensitive(), bAscending ) );
     }
 
 #ifdef SQL_TEST_PARSETREEITERATOR
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index ba32a91bab..ba32a91bab 100644..100755
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
diff --git a/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx
index 932f74fa86..932f74fa86 100644..100755
--- a/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/connectivity/source/parse/wrap_sqlbison.cxx
diff --git a/connectivity/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx
index 31007e1fce..31007e1fce 100644..100755
--- a/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/connectivity/source/parse/wrap_sqlflex.cxx
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
index ed1211d897..ed1211d897 100644..100755
--- a/connectivity/source/resource/conn_error_message.src
+++ b/connectivity/source/resource/conn_error_message.src
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index 5c380c880e..5c380c880e 100644..100755
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.src
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 9772787cb6..9772787cb6 100644..100755
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk
index b4944187dc..b4944187dc 100644..100755
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 4910b8c78e..4910b8c78e 100644..100755
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 4c5c687feb..4c5c687feb 100644..100755
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 52b3fa9bb0..52b3fa9bb0 100644..100755
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index f040832cbf..f040832cbf 100644..100755
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 4f4b29bfae..4f4b29bfae 100644..100755
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 6ed9588ca9..6ed9588ca9 100644..100755
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index ac91069360..ac91069360 100644..100755
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index bc5859c8bc..bc5859c8bc 100644..100755
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 7b3cba8d4f..7b3cba8d4f 100644..100755
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 89d079a0b5..89d079a0b5 100644..100755
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 315e21b517..315e21b517 100644..100755
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 318bf33097..318bf33097 100644..100755
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index e9ffec7c92..e9ffec7c92 100644..100755
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index c036e83db5..c036e83db5 100644..100755
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index c428fbb9db..c428fbb9db 100644..100755
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index ee243f116a..ee243f116a 100644..100755
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index bbf11f8dd0..bbf11f8dd0 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index 1f49192a52..1f49192a52 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 96bce967d3..96bce967d3 100644..100755
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index ba73172ad1..ba73172ad1 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index a72244a8d5..a72244a8d5 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index f722e8d775..f722e8d775 100644..100755
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index d5edd28ddf..d5edd28ddf 100644..100755
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 6bb2a5bae2..6bb2a5bae2 100644..100755
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 41b937c5a5..41b937c5a5 100644..100755
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index d5e2fd5fb9..fae81d824e 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_connectivity.hxx"
 #include <connectivity/virtualdbtools.hxx>
 #include "staticdbtools_s.hxx"
-#include <connectivity/dbconversion.hxx>
+#include "connectivity/dbconversion.hxx"
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
 
@@ -62,23 +62,23 @@ namespace connectivity
     }
 
     //----------------------------------------------------------------
-    double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate, sal_Int16 nKeyType) const
+    double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate ) const
     {
-        return ::dbtools::DBTypeConversion::getValue(_rxVariant, rNullDate, nKeyType);
+        return ::dbtools::DBTypeConversion::getValue( _rxVariant, rNullDate );
     }
 
     //----------------------------------------------------------------
-    ::rtl::OUString ODataAccessStaticTools::getValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
+    ::rtl::OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
         const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const
     {
-        return ::dbtools::DBTypeConversion::getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
+        return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
     }
 
     //----------------------------------------------------------------
-    ::rtl::OUString ODataAccessStaticTools::getValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
+    ::rtl::OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
         const Locale& _rLocale, const Date& _rNullDate ) const
     {
-        return ::dbtools::DBTypeConversion::getValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
+        return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
     }
 
     //----------------------------------------------------------------
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index ea2a0e494d..7949312fcf 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -55,11 +55,10 @@ namespace connectivity
         // ------------------------------------------------
         virtual double getValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
-            const ::com::sun::star::util::Date& rNullDate,
-            sal_Int16 nKeyType) const;
+            const ::com::sun::star::util::Date& rNullDate ) const;
 
         // ------------------------------------------------
-        virtual ::rtl::OUString getValue(
+        virtual ::rtl::OUString getFormattedValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
             const ::com::sun::star::util::Date& _rNullDate,
@@ -67,7 +66,7 @@ namespace connectivity
             sal_Int16 _nKeyType) const;
 
         // ------------------------------------------------
-        virtual ::rtl::OUString getValue(
+        virtual ::rtl::OUString getFormattedValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
             const ::com::sun::star::lang::Locale& _rLocale,
diff --git a/connectivity/version.mk b/connectivity/version.mk
index fd2235cfd1..fd2235cfd1 100644..100755
--- a/connectivity/version.mk
+++ b/connectivity/version.mk
diff --git a/connectivity/workben/TT/StartTest.class b/connectivity/workben/TT/StartTest.class
index 28791c43eb..28791c43eb 100644..100755
--- a/connectivity/workben/TT/StartTest.class
+++ b/connectivity/workben/TT/StartTest.class
diff --git a/connectivity/workben/TT/StartTest.java b/connectivity/workben/TT/StartTest.java
index 827e85d2f2..827e85d2f2 100644..100755
--- a/connectivity/workben/TT/StartTest.java
+++ b/connectivity/workben/TT/StartTest.java
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index cc7dccbae9..cc7dccbae9 100644..100755
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index d9ee3d0ded..d9ee3d0ded 100644..100755
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 53cf1c6a88..53cf1c6a88 100644..100755
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
index 220fa91b75..220fa91b75 100644..100755
--- a/connectivity/workben/little/makefile.mk
+++ b/connectivity/workben/little/makefile.mk
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index 3bf62a4e12..3bf62a4e12 100644..100755
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
diff --git a/connectivity/workben/skeleton/how_to_write_a_driver.txt b/connectivity/workben/skeleton/how_to_write_a_driver.txt
index f76c1209e3..f76c1209e3 100644..100755
--- a/connectivity/workben/skeleton/how_to_write_a_driver.txt
+++ b/connectivity/workben/skeleton/how_to_write_a_driver.txt
diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx
index d685577634..d685577634 100644..100755
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ b/connectivity/workben/testmoz/initUNO.cxx
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index cb5531264e..cb5531264e 100644..100755
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index 7d906a2be4..7d906a2be4 100644..100755
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 4a76ce79fa..4a76ce79fa 100644..100755
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index a9ff1b58ba..e50fe66948 100644..100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -63,6 +63,8 @@ class Desktop : public Application
 {
     friend class UserInstall;
 
+    void doShutdown();
+
     public:
         enum BootstrapError
         {
@@ -88,11 +90,11 @@ class Desktop : public Application
         virtual void			Init();
         virtual void			InitFinished();
         virtual void			DeInit();
-        virtual BOOL			QueryExit();
-        virtual USHORT			Exception(USHORT nError);
+        virtual sal_Bool			QueryExit();
+        virtual sal_uInt16			Exception(sal_uInt16 nError);
         virtual void			SystemSettingsChanging( AllSettings& rSettings, Window* pFrame );
         virtual void			AppEvent( const ApplicationEvent& rAppEvent );
-
+        
         DECL_LINK(          OpenClients_Impl, void* );
 
         static void				OpenClients();
@@ -161,7 +163,7 @@ class Desktop : public Application
         void					StartSetup( const ::rtl::OUString& aParameters );
 
         // Get a resource message string securely e.g. if resource cannot be retrieved return aFaultBackMsg
-        ::rtl::OUString			GetMsgString( USHORT nId, const ::rtl::OUString& aFaultBackMsg );
+        ::rtl::OUString			GetMsgString( sal_uInt16 nId, const ::rtl::OUString& aFaultBackMsg );
 
         // Create a error message depending on bootstrap failure code and an optional file url
         ::rtl::OUString			CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
@@ -200,7 +202,7 @@ class Desktop : public Application
         sal_Bool						m_bMinimized;
         sal_Bool						m_bInvisible;
         bool                            m_bServicesRegistered;
-        USHORT							m_nAppEvents;
+        sal_uInt16							m_nAppEvents;
         BootstrapError					m_aBootstrapError;
         BootstrapStatus                 m_aBootstrapStatus;
 
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 65131af453..65131af453 100644..100755
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
diff --git a/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
index 8715d81427..8715d81427 100644..100755
--- a/desktop/inc/makefile.mk
+++ b/desktop/inc/makefile.mk
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
index 3319d8d771..3319d8d771 100644..100755
--- a/desktop/inc/migration.hxx
+++ b/desktop/inc/migration.hxx
diff --git a/desktop/inc/pch/precompiled_desktop.cxx b/desktop/inc/pch/precompiled_desktop.cxx
index c75a09a317..c75a09a317 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.cxx
+++ b/desktop/inc/pch/precompiled_desktop.cxx
diff --git a/desktop/inc/pch/precompiled_desktop.hxx b/desktop/inc/pch/precompiled_desktop.hxx
index 023fa49379..023fa49379 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.hxx
+++ b/desktop/inc/pch/precompiled_desktop.hxx
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index 33bd34a6d0..33bd34a6d0 100644..100755
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
diff --git a/desktop/os2/source/applauncher/launcher.hxx b/desktop/os2/source/applauncher/launcher.hxx
index 1f1c1be968..1f1c1be968 100644..100755
--- a/desktop/os2/source/applauncher/launcher.hxx
+++ b/desktop/os2/source/applauncher/launcher.hxx
diff --git a/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk
index bf71b57c2f..bf71b57c2f 100644..100755
--- a/desktop/os2/source/applauncher/makefile.mk
+++ b/desktop/os2/source/applauncher/makefile.mk
diff --git a/desktop/os2/source/applauncher/officeloader.cxx b/desktop/os2/source/applauncher/officeloader.cxx
index f3124acdcf..f3124acdcf 100644..100755
--- a/desktop/os2/source/applauncher/officeloader.cxx
+++ b/desktop/os2/source/applauncher/officeloader.cxx
diff --git a/desktop/os2/source/applauncher/quickstart.cxx b/desktop/os2/source/applauncher/quickstart.cxx
index b67389272f..b67389272f 100644..100755
--- a/desktop/os2/source/applauncher/quickstart.cxx
+++ b/desktop/os2/source/applauncher/quickstart.cxx
diff --git a/desktop/os2/source/applauncher/sbase.cxx b/desktop/os2/source/applauncher/sbase.cxx
index ed3e7cceb3..ed3e7cceb3 100644..100755
--- a/desktop/os2/source/applauncher/sbase.cxx
+++ b/desktop/os2/source/applauncher/sbase.cxx
diff --git a/desktop/os2/source/applauncher/scalc.cxx b/desktop/os2/source/applauncher/scalc.cxx
index 854f34e7f6..854f34e7f6 100644..100755
--- a/desktop/os2/source/applauncher/scalc.cxx
+++ b/desktop/os2/source/applauncher/scalc.cxx
diff --git a/desktop/os2/source/applauncher/sdraw.cxx b/desktop/os2/source/applauncher/sdraw.cxx
index b3f4bcff30..b3f4bcff30 100644..100755
--- a/desktop/os2/source/applauncher/sdraw.cxx
+++ b/desktop/os2/source/applauncher/sdraw.cxx
diff --git a/desktop/os2/source/applauncher/simpress.cxx b/desktop/os2/source/applauncher/simpress.cxx
index f4cf9575eb..f4cf9575eb 100644..100755
--- a/desktop/os2/source/applauncher/simpress.cxx
+++ b/desktop/os2/source/applauncher/simpress.cxx
diff --git a/desktop/os2/source/applauncher/smath.cxx b/desktop/os2/source/applauncher/smath.cxx
index d93b15d345..d93b15d345 100644..100755
--- a/desktop/os2/source/applauncher/smath.cxx
+++ b/desktop/os2/source/applauncher/smath.cxx
diff --git a/desktop/os2/source/applauncher/swriter.cxx b/desktop/os2/source/applauncher/swriter.cxx
index 4fc857cf2e..4fc857cf2e 100644..100755
--- a/desktop/os2/source/applauncher/swriter.cxx
+++ b/desktop/os2/source/applauncher/swriter.cxx
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 90f96d0176..a13732bc64 100644..100755
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
+dt      desktop :    L10N:l10n sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
@@ -43,3 +43,7 @@ dt  desktop\registry\data\org\openoffice\Office                     nmake   -  a
 dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  all sn_svctagres NULL
 dt  desktop\source\registration\com\sun\star\servicetag             nmake   -  all sn_svctag NULL
 dt  desktop\source\registration\com\sun\star\registration           nmake   -  all sn_regjob sn_svctag NULL
+dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
+dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
+dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
+dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 6251de274a..442303258f 100644..100755
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -135,3 +135,11 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
 
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
 ..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
+..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component
+..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component
+..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component
+..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component
+..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component
+..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component
+..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component
+..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index e6b65d551f..16223914e7 100644..100755
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -35,20 +35,22 @@ ENABLE_EXCEPTIONS := TRUE
 .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
+
+# TODO:  On Windows, test_dp_version.cxx fails due to BOOL redefinition between
+# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this
+# hack to temporarily disable PCH will become unnecessary with the fix for issue
+# 112600:
+CFLAGSCXX += -DDISABLE_PCH_HACK
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_dp_version.obj
 SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
+SHL1RPATH = NONE
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN)
+.INCLUDE : _cppunit.mk
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index d5f2d5b413..c6c5372f21 100644..100755
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -33,7 +33,10 @@
 
 #include <cstddef>
 
-#include "testshl/simpleheader.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 
@@ -84,10 +87,10 @@ void Test::test() {
     }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map
index f313c44bd7..0dbbcc5a73 100644..100755
--- a/desktop/qa/deployment_misc/version.map
+++ b/desktop/qa/deployment_misc/version.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/desktop/registry/data/org/openoffice/Office/Jobs.xcu b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
index f0d2783833..f0d2783833 100644..100755
--- a/desktop/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
diff --git a/desktop/registry/data/org/openoffice/Office/makefile.mk b/desktop/registry/data/org/openoffice/Office/makefile.mk
index 2ad8441ea3..2ad8441ea3 100644..100755
--- a/desktop/registry/data/org/openoffice/Office/makefile.mk
+++ b/desktop/registry/data/org/openoffice/Office/makefile.mk
diff --git a/desktop/scripts/basis-link b/desktop/scripts/basis-link
index 3af84201e0..3af84201e0 100644..100755
--- a/desktop/scripts/basis-link
+++ b/desktop/scripts/basis-link
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
index 5c412f8187..5c412f8187 100644..100755
--- a/desktop/scripts/makefile.mk
+++ b/desktop/scripts/makefile.mk
diff --git a/desktop/scripts/mozwrapper.sh b/desktop/scripts/mozwrapper.sh
index 89b6415358..89b6415358 100644..100755
--- a/desktop/scripts/mozwrapper.sh
+++ b/desktop/scripts/mozwrapper.sh
diff --git a/desktop/scripts/odf-basis-link b/desktop/scripts/odf-basis-link
index 3af84201e0..3af84201e0 100644..100755
--- a/desktop/scripts/odf-basis-link
+++ b/desktop/scripts/odf-basis-link
diff --git a/desktop/scripts/sbase.sh b/desktop/scripts/sbase.sh
index e3a8ed07d5..e3a8ed07d5 100644..100755
--- a/desktop/scripts/sbase.sh
+++ b/desktop/scripts/sbase.sh
diff --git a/desktop/scripts/scalc.sh b/desktop/scripts/scalc.sh
index c9c3cde39e..c9c3cde39e 100644..100755
--- a/desktop/scripts/scalc.sh
+++ b/desktop/scripts/scalc.sh
diff --git a/desktop/scripts/sdraw.sh b/desktop/scripts/sdraw.sh
index 4131a2505f..4131a2505f 100644..100755
--- a/desktop/scripts/sdraw.sh
+++ b/desktop/scripts/sdraw.sh
diff --git a/desktop/scripts/simpress.sh b/desktop/scripts/simpress.sh
index d78ea14207..d78ea14207 100644..100755
--- a/desktop/scripts/simpress.sh
+++ b/desktop/scripts/simpress.sh
diff --git a/desktop/scripts/smaster.sh b/desktop/scripts/smaster.sh
index ed9b09d512..ed9b09d512 100644..100755
--- a/desktop/scripts/smaster.sh
+++ b/desktop/scripts/smaster.sh
diff --git a/desktop/scripts/smath.sh b/desktop/scripts/smath.sh
index 454fa135ff..454fa135ff 100644..100755
--- a/desktop/scripts/smath.sh
+++ b/desktop/scripts/smath.sh
diff --git a/desktop/scripts/so-basis-link b/desktop/scripts/so-basis-link
index 3af84201e0..3af84201e0 100644..100755
--- a/desktop/scripts/so-basis-link
+++ b/desktop/scripts/so-basis-link
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index caa975c2b2..8e16ed1be8 100644..100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -43,15 +43,14 @@ export SAL_ENABLE_FILE_LOCKING
 #@# export JITC_PROCESSOR_TYPE=6
 
 # resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
-    sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
-    cd "`dirname "$0"`"
-    cd "`dirname "$sd_script"`"
-else
-    cd "`dirname "$0"`"
-fi
+sd_cwd=`pwd`
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+    cd "`dirname "$sd_res"`"
+    sd_basename=`basename "$sd_res"`
+    sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
 sd_prog=`pwd`
 cd "$sd_cwd"
 
diff --git a/desktop/scripts/sweb.sh b/desktop/scripts/sweb.sh
index a365392584..a365392584 100644..100755
--- a/desktop/scripts/sweb.sh
+++ b/desktop/scripts/sweb.sh
diff --git a/desktop/scripts/swriter.sh b/desktop/scripts/swriter.sh
index 3fa48c0d3e..3fa48c0d3e 100644..100755
--- a/desktop/scripts/swriter.sh
+++ b/desktop/scripts/swriter.sh
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 3af17625a6..9fc80b5f32 100644..100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -29,14 +29,13 @@
 set -e
 
 # resolve installation directory
-if [ -h "$0" ] ; then
-    sd_basename=`basename "$0"`
-    sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
-    cd "`dirname "$0"`"
-    cd "`dirname "$sd_script"`"
-else
-    cd "`dirname "$0"`"
-fi
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+    cd "`dirname "$sd_res"`"
+    sd_basename=`basename "$sd_res"`
+    sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
 sd_prog=`pwd`
 
 case $1 in
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 9e2ee788ee..07811c5a5e 100644..100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -31,15 +31,14 @@ SAL_ENABLE_FILE_LOCKING=1
 export SAL_ENABLE_FILE_LOCKING
 
 # resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
-    sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` 
-    cd "`dirname "$0"`"
-    cd "`dirname "$sd_script"`"
-else
-    cd "`dirname "$0"`"
-fi
+sd_cwd=`pwd`
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+    cd "`dirname "$sd_res"`"
+    sd_basename=`basename "$sd_res"`
+    sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
 sd_prog=`pwd`
 cd "$sd_cwd"
 
@@ -65,16 +64,27 @@ esac
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
+#Recognize the "sync" option. sync must be applied without any other
+#options except bootstrap variables or the verbose option
 for arg in $@
 do
   case "$arg" in
        -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
+       sync) OPTSYNC=true;;
+       -v) VERBOSE=true;;
+       --verbose) VERBOSE=true;;	  
+       *) OPTOTHER=$arg;;
   esac
 done
 
+if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ] 
+then
+    JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+fi
+
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
     if [ -n "$my_path" ] ; then
         sd_platform=`uname -s`
@@ -100,6 +110,6 @@ unset XENVIRONMENT
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
 # execute binary
-exec "$sd_prog/unopkg.bin" "$@" \
+exec "$sd_prog/unopkg.bin" "$@"  "$JVMFWKPARAMS" \
     "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
 
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
index dd0ecb6115..dd0ecb6115 100644..100755
--- a/desktop/scripts/ure-link
+++ b/desktop/scripts/ure-link
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5cf0e9505f..e9859cbe53 100644..100755
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -117,6 +117,7 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/signal.h>
+#include <osl/thread.hxx>
 #include <rtl/uuid.h>
 #include <rtl/uri.hxx>
 #include <unotools/pathoptions.hxx>
@@ -189,6 +190,7 @@ namespace desktop
 static oslSignalHandler pSignalHandler = 0;
 static sal_Bool _bCrashReporterEnabled = sal_True;
 
+static ::rtl::OUString getBrandSharePreregBundledPathURL();
 // ----------------------------------------------------------------------------
 
 ResMgr* Desktop::GetDesktopResManager()
@@ -227,7 +229,7 @@ ResMgr* Desktop::GetDesktopResManager()
 // Get a message string securely. There is a fallback string if the resource
 // is not available.
 
-OUString Desktop::GetMsgString( USHORT nId, const OUString& aFaultBackMsg )
+OUString Desktop::GetMsgString( sal_uInt16 nId, const OUString& aFaultBackMsg )
 {
     ResMgr* resMgr = GetDesktopResManager();
     if ( !resMgr )
@@ -323,10 +325,8 @@ CommandLineArgs* Desktop::GetCommandLineArgs()
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
         if ( !pArgs )
-    {
             pArgs = new CommandLineArgs;
     }
-    }
 
     return pArgs;
 }
@@ -555,6 +555,44 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
 
     return aTmp.makeStringAndClear();
 }
+//Checks if the argument src is the folder of the help or configuration
+//backend in the prereg folder        
+static bool excludeTmpFilesAndFolders(const rtl::OUString & src)
+{
+    const char helpBackend[] = "com.sun.star.comp.deployment.help.PackageRegistryBackend";
+    const char configBackend[] = "com.sun.star.comp.deployment.configuration.PackageRegistryBackend";
+    if (src.endsWithAsciiL(helpBackend, sizeof(helpBackend) - 1 )
+        || src.endsWithAsciiL(configBackend, sizeof(configBackend) - 1))
+    {
+        return true;
+    }
+    return false;
+}
+
+//If we are about to copy the contents of some special folder as determined
+//by excludeTmpFilesAndFolders, then we omit those files or folders with a name
+//derived from temporary folders.
+static bool isExcludedFileOrFolder( const rtl::OUString & name)
+{
+    char const * allowed[] = {
+        "backenddb.xml",
+        "configmgr.ini",
+        "registered_packages.db"
+    };
+
+    const unsigned int size = sizeof(allowed) / sizeof (char const *);
+    bool bExclude = true;
+    for (unsigned int i= 0; i < size; i ++)
+    {
+        ::rtl::OUString allowedName = ::rtl::OUString::createFromAscii(allowed[i]);
+        if (allowedName.equals(name))
+        {
+            bExclude = false;
+            break;
+        }
+    }
+    return bExclude;
+}
 
 static osl::FileBase::RC copy_bundled_recursive( 
     const rtl::OUString& srcUnqPath,
@@ -577,6 +615,7 @@ throw()
             err = osl::FileBase::E_None;
 
             osl::Directory aDir( srcUnqPath );
+            bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath);
             if (aDir.open() == osl::FileBase::E_None)
             {
                 sal_Int32 n_Mask = FileStatusMask_FileURL |
@@ -612,7 +651,12 @@ throw()
 
                         // Special treatment for "lastsychronized" file. Must not be
                         // copied from the bundled folder!
-                        if ( IsDoc && aFileName.equalsAscii( pLastSyncFileName ))
+                        //Also do not copy *.tmp files and *.tmp_ folders. This affects the files/folders
+                        //from the help and configuration backend
+                        if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName ) 
+                                       || bExcludeFiles && isExcludedFileOrFolder(aFileName)))
+                            bFilter = true;
+                        else if (!IsDoc && bExcludeFiles && isExcludedFileOrFolder(aFileName))
                             bFilter = true;
                     }
                     
@@ -765,7 +809,7 @@ void Desktop::DeInit()
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::DeInit" );
 }
 
-BOOL Desktop::QueryExit()
+sal_Bool Desktop::QueryExit()
 {
     try
     {
@@ -791,7 +835,7 @@ BOOL Desktop::QueryExit()
         xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
     }
 
-    BOOL bExit = ( !xDesktop.is() || xDesktop->terminate() );
+    sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() );
 
 
     if ( !bExit && xPropertySet.is() )
@@ -1378,10 +1422,10 @@ void restartOnMac(bool passArguments) {
 
 }
 
-USHORT Desktop::Exception(USHORT nError)
+sal_uInt16 Desktop::Exception(sal_uInt16 nError)
 {
     // protect against recursive calls
-    static BOOL bInException = FALSE;
+    static sal_Bool bInException = sal_False;
 
     sal_uInt16 nOldMode = Application::GetSystemWindowMode();
     Application::SetSystemWindowMode( nOldMode & ~SYSTEMWINDOW_MODE_NOAUTOMODE );
@@ -1393,7 +1437,7 @@ USHORT Desktop::Exception(USHORT nError)
         Application::Abort( aDoubleExceptionString );
     }
 
-    bInException = TRUE;
+    bInException = sal_True;
     CommandLineArgs* pArgs = GetCommandLineArgs();
 
     // save all modified documents ... if it's allowed doing so.
@@ -1479,8 +1523,26 @@ namespace {
     }
 }
 
-int Desktop::Main()
+struct ExecuteGlobals
+{
+    Reference < css::document::XEventListener > xGlobalBroadcaster;
+    sal_Bool bRestartRequested;
+    sal_Bool bUseSystemFileDialog;
+    std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
+    std::auto_ptr<SvtPathOptions> pPathOptions;
+
+    ExecuteGlobals()
+    : bRestartRequested( sal_False )
+    , bUseSystemFileDialog( sal_True )
+    {}	
+};
+
+static ExecuteGlobals* pExecGlobals = NULL;
+
+void Desktop::Main()
 {
+    pExecGlobals = new ExecuteGlobals();
+    
     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
 
     // Remember current context object
@@ -1539,14 +1601,8 @@ int Desktop::Main()
     Reference< XMultiServiceFactory > xSMgr =
         ::comphelper::getProcessServiceFactory();
 
-    std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
-    std::auto_ptr<SvtPathOptions> pPathOptions;
-
     Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
-    sal_Bool bRestartRequested( sal_False );
-    sal_Bool bUseSystemFileDialog(sal_True);
-    int		 nAcquireCount( 0 );
-    Reference < css::document::XEventListener > xGlobalBroadcaster;
+    int         nAcquireCount( 0 );
     try
     {
         RegisterServices( xSMgr );
@@ -1574,7 +1630,7 @@ int Desktop::Main()
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
         if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
         {
-            BOOL bQuitApp;
+            sal_Bool bQuitApp;
 
             if( !InitAccessBridge( true, bQuitApp ) )
                 if( bQuitApp )
@@ -1604,12 +1660,8 @@ int Desktop::Main()
         // create title string
         sal_Bool bCheckOk = sal_False;
         ::com::sun::star::lang::Locale aLocale;
-        ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "iso", aLocale );
-        if ( !pLabelResMgr )
-        {
-            // no "iso" resource -> search for "ooo" resource
-            pLabelResMgr = ResMgr::SearchCreateResMgr( "ooo", aLocale);
-        }
+        String aMgrName = String::CreateFromAscii( "ofa" );
+        ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale );
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
 
@@ -1633,7 +1685,7 @@ int Desktop::Main()
         SetDisplayName( aTitle );
         SetSplashScreenProgress(35);
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create SvtPathOptions and SvtLanguageOptions" );
-        pPathOptions.reset( new SvtPathOptions);
+        pExecGlobals->pPathOptions.reset( new SvtPathOptions);
         SetSplashScreenProgress(40);
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
 
@@ -1650,7 +1702,7 @@ int Desktop::Main()
         }
 
         // create service for loadin SFX (still needed in startup)
-        xGlobalBroadcaster = Reference < css::document::XEventListener >
+        pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
             ( xSMgr->createInstance(
             DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
 
@@ -1677,16 +1729,17 @@ int Desktop::Main()
         Migration::migrateSettingsIfNecessary();
 
         // keep a language options instance...
-        pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
+        pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
 
-        if (xGlobalBroadcaster.is())
+        if (pExecGlobals->xGlobalBroadcaster.is())
         {
             css::document::EventObject aEvent;
             aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnStartApp"));
-            xGlobalBroadcaster->notifyEvent(aEvent);
+            pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
         }
 
         SetSplashScreenProgress(50);
+
         // Backing Component
         sal_Bool bCrashed            = sal_False;
         sal_Bool bExistsRecoveryData = sal_False;
@@ -1702,7 +1755,7 @@ int Desktop::Main()
         }
 
         // check whether the shutdown is caused by restart
-        bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+        pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
 
         if ( pCmdLineArgs->IsHeadless() )
         {
@@ -1710,43 +1763,38 @@ int Desktop::Main()
             // headless mode relies on Application::EnableHeadlessMode()
             // which does only work for VCL dialogs!!
             SvtMiscOptions aMiscOptions;
-            bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
+            pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
             aMiscOptions.SetUseSystemFileDialog( sal_False );
         }
 
-        if ( !bRestartRequested )
+        if ( !pExecGlobals->bRestartRequested )
         {
-            if (
-                (pCmdLineArgs->IsEmptyOrAcceptOnly()                                   ) &&
+            if ((!pCmdLineArgs->WantsToLoadDocument()                                  ) &&
                 (SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
                 (!bExistsRecoveryData                                                  ) &&
                 (!bExistsSessionData                                                   ) &&
-                (!Application::AnyInput( INPUT_APPEVENT )                              )
-               )
+                (!Application::AnyInput( INPUT_APPEVENT )                              ))
             {
-                RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
-                Reference< XFrame > xDesktopFrame( xSMgr->createInstance(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
-                if (xDesktopFrame.is())
-                {
-                    SetSplashScreenProgress(60);
-                    Reference< XFrame > xBackingFrame;
-                    Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
-
-                    xBackingFrame = xDesktopFrame->findFrame(OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0);
-                    if (xBackingFrame.is())
-                        xContainerWindow = xBackingFrame->getContainerWindow();
-                    if (xContainerWindow.is())
-                    {
-                        SetDocumentExtendedStyle(xContainerWindow);
-                        SetSplashScreenProgress(75);
-                        Sequence< Any > lArgs(1);
-                        lArgs[0] <<= xContainerWindow;
-
-                        Reference< XController > xBackingComp(
-                            xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs),
-                            UNO_QUERY);
-                        SetSplashScreenProgress(80);
+                 RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
+                 Reference< XFrame > xDesktopFrame( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+                 if (xDesktopFrame.is())
+                 {
+                   SetSplashScreenProgress(60);
+                   Reference< XFrame > xBackingFrame;
+                   Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
+
+                   xBackingFrame = xDesktopFrame->findFrame(OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0);
+                   if (xBackingFrame.is())
+                       xContainerWindow = xBackingFrame->getContainerWindow();
+                   if (xContainerWindow.is())
+                   {
+                       SetDocumentExtendedStyle(xContainerWindow);
+                       SetSplashScreenProgress(75);
+                       Sequence< Any > lArgs(1);
+                       lArgs[0] <<= xContainerWindow;
+
+                       Reference< XController > xBackingComp(
+                           xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs), UNO_QUERY);
                         if (xBackingComp.is())
                         {
                             Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
@@ -1788,10 +1836,9 @@ int Desktop::Main()
     aOptions.SetVCLSettings();
     SetSplashScreenProgress(60);
 
-    if ( !bRestartRequested )
+    if ( !pExecGlobals->bRestartRequested )
     {
         Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
-
         sal_Bool bTerminateRequested = sal_False;
 
         // Preload function depends on an initialized sfx application!
@@ -1847,9 +1894,9 @@ int Desktop::Main()
                 new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) );
 
             // check whether the shutdown is caused by restart just before entering the Execute
-            bRestartRequested = bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+            pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
 
-            if ( !bRestartRequested )
+            if ( !pExecGlobals->bRestartRequested )
             {
                 // if this run of the office is triggered by restart, some additional actions should be done
                 DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
@@ -1868,44 +1915,57 @@ int Desktop::Main()
             FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
         }
     }
+    // CAUTION: you do not necessarily get here e.g. on the Mac.
+    // please put all deinitialization code into doShutdown
+    doShutdown();
+}
+
+void Desktop::doShutdown()
+{
+    if( ! pExecGlobals )
+        return;
     
-    if ( bRestartRequested )
+    if ( pExecGlobals->bRestartRequested )
         SetRestartState();
 
-    if (xGlobalBroadcaster.is())
+    if (pExecGlobals->xGlobalBroadcaster.is())
     {
         css::document::EventObject aEvent;
         aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnCloseApp"));
-        xGlobalBroadcaster->notifyEvent(aEvent);
+        pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
     }
 
-    delete pResMgr;
+    delete pResMgr, pResMgr = NULL;
     // Restore old value
+    CommandLineArgs* pCmdLineArgs = GetCommandLineArgs();
     if ( pCmdLineArgs->IsHeadless() )
-        SvtMiscOptions().SetUseSystemFileDialog( bUseSystemFileDialog );
+        SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
 
     // remove temp directory
     RemoveTemporaryDirectory();
     FlushConfiguration();
     // The acceptors in the AcceptorMap must be released (in DeregisterServices)
     // with the solar mutex unlocked, to avoid deadlock:
-    nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
     DeregisterServices();
     Application::AcquireSolarMutex(nAcquireCount);
     tools::DeInitTestToolLib();
     // be sure that path/language options gets destroyed before
     // UCB is deinitialized
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> dispose path/language options" );
-    pLanguageOptions.reset( 0 );
-    pPathOptions.reset( 0 );
+    pExecGlobals->pLanguageOptions.reset( 0 );
+    pExecGlobals->pPathOptions.reset( 0 );
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- dispose path/language options" );
 
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> deinit ucb" );
     ::ucbhelper::ContentBroker::deinitialize();
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- deinit ucb" );
+    
+    sal_Bool bRR = pExecGlobals->bRestartRequested;
+    delete pExecGlobals, pExecGlobals = NULL;
 
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::Main" );
-    if ( bRestartRequested )
+    if ( bRR )
     {
         restartOnMac(true);
         if ( m_rSplashScreen.is() )
@@ -2037,9 +2097,9 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
         // unfortunately this broke the QUARTZ behavior which is to always run
         // in quickstart mode since Mac applications do not usually quit
         // when the last document closes
-        #ifndef QUARTZ
+        //#ifndef QUARTZ
         if ( bQuickstart )
-        #endif
+        //#endif
         {
             Sequence< Any > aSeq( 1 );
             aSeq[0] <<= bQuickstart;
@@ -2093,18 +2153,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
 
     SvtMenuOptions aMenuOpt;
     hStyleSettings.SetUseImagesInMenus(aMenuOpt.GetMenuIconsState());
-
-    sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
-    nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
-    if( aAppearanceCfg.IsSingleLineTabCtrl() )
-        nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
-
-    nTabStyle &= ~STYLE_TABCONTROL_COLOR;
-    if( aAppearanceCfg.IsColoredTabCtrl() )
-        nTabStyle |= STYLE_TABCONTROL_COLOR;
-
-    hStyleSettings.SetTabControlStyle(nTabStyle);
-
     hStyleSettings.SetDragFullOptions( nDragFullOptions );
     rSettings.SetStyleSettings ( hStyleSettings );
 }
@@ -2141,9 +2189,7 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
     OfficeIPCThread::SetReady();
 
     CloseSplashScreen();
-
     CheckFirstRun( );
-
     EnableOleAutomation();
 
     if (getenv ("OOO_EXIT_POST_STARTUP"))
@@ -2536,7 +2582,7 @@ void Desktop::OpenClients()
     // check if a document has been recovered - if there is one of if a document was loaded by cmdline, no default document
     // should be created
     Reference < XComponent > xFirst;
-    BOOL bLoaded = FALSE;
+    sal_Bool bLoaded = sal_False;
 
     CommandLineArgs* pArgs = GetCommandLineArgs();
     SvtInternalOptions  aInternalOptions;
@@ -2580,8 +2626,6 @@ void Desktop::OpenClients()
             aHelpURLBuffer.appendAscii("&System=UNX");
 #elif defined WNT
             aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined MAC
-            aHelpURLBuffer.appendAscii("&System=MAC");
 #elif defined OS2
             aHelpURLBuffer.appendAscii("&System=OS2");
 #endif
@@ -2687,7 +2731,7 @@ void Desktop::OpenClients()
                     bCrashed           ,
                     bExistsRecoveryData);
                 /* TODO we cant be shure, that at least one document could be recovered here successfully
-                    So we set bLoaded=TRUE to supress opening of the default document.
+                    So we set bLoaded=sal_True to supress opening of the default document.
                     But we should make it more safe. Otherwhise we have an office without an UI ...
                     ...
                     May be we can check the desktop if some documents are existing there.
@@ -3113,6 +3157,13 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
         catch(const css::uno::Exception&)
         {}
     }
+    else if( rAppEvent.GetEvent() == "PRIVATE:DOSHUTDOWN" )
+    {
+        Desktop* pD = dynamic_cast<Desktop*>(GetpApp());
+        OSL_ENSURE( pD, "no desktop ?!?" );
+        if( pD )
+            pD->doShutdown();
+    }
 }
 
 void Desktop::OpenSplashScreen()
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 4ab37b7a3e..4ab37b7a3e 100644..100755
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 39967e93f8..39967e93f8 100644..100755
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
diff --git a/desktop/source/app/appinit.hxx b/desktop/source/app/appinit.hxx
index 01aa78857b..01aa78857b 100644..100755
--- a/desktop/source/app/appinit.hxx
+++ b/desktop/source/app/appinit.hxx
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 06264c37d8..06264c37d8 100644..100755
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
index 2dad7b5d71..2dad7b5d71 100644..100755
--- a/desktop/source/app/appsys.hxx
+++ b/desktop/source/app/appsys.hxx
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 20bad6f450..20bad6f450 100644..100755
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index 52f6c6d526..52f6c6d526 100644..100755
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
index f37d5ee7ea..f37d5ee7ea 100644..100755
--- a/desktop/source/app/checkinstall.hxx
+++ b/desktop/source/app/checkinstall.hxx
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 0c3fcfdfba..c349a39ab9 100644..100755
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -146,20 +146,21 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
         UNO_QUERY);
 
     // parse command line arguments
-    sal_Bool	bPrintEvent		= sal_False;
-    sal_Bool	bOpenEvent		= sal_True;
-    sal_Bool	bViewEvent		= sal_False;
-    sal_Bool	bStartEvent		= sal_False;
-    sal_Bool	bPrintToEvent	= sal_False;
-    sal_Bool	bPrinterName	= sal_False;
-    sal_Bool	bForceOpenEvent	= sal_False;
-    sal_Bool	bForceNewEvent	= sal_False;
-    sal_Bool 	bDisplaySpec	= sal_False;
-    sal_Bool    bConversionEvent= sal_False;
-    sal_Bool    bConversionParamsEvent= sal_False;
-    sal_Bool    bBatchPrintEvent= sal_False;
-    sal_Bool    bBatchPrinterNameEvent= sal_False;
-    sal_Bool    bConversionOutEvent   = sal_False;
+    bool bOpenEvent(true);
+    bool bPrintEvent(false);
+    bool bViewEvent(false);
+    bool bStartEvent(false);
+    bool bPrintToEvent(false);
+    bool bPrinterName(false);
+    bool bForceOpenEvent(false);
+    bool bForceNewEvent(false);
+    bool bDisplaySpec(false);
+    bool bOpenDoc(false);
+    bool bConversionEvent(false);
+    bool bConversionParamsEvent(false);
+    bool bBatchPrintEvent(false);
+    bool bBatchPrinterNameEvent(false);
+    bool bConversionOutEvent(false);
 
     m_eArgumentCount = NONE;
 
@@ -191,119 +192,119 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                     if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-n")))
                     {
                         // force new documents based on the following documents
-                        bForceNewEvent	= sal_True;
-                        bOpenEvent		= sal_False;
-                        bForceOpenEvent	= sal_False;
-                        bPrintToEvent	= sal_False;
-                        bPrintEvent		= sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
-                     }
-                    else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-o")))
-                    {
-                        // force open documents regards if they are templates or not
-                        bForceOpenEvent = sal_True;
-                        bOpenEvent		= sal_False;
-                        bForceNewEvent	= sal_False;
-                        bPrintToEvent	= sal_False;
-                        bPrintEvent		= sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
-                     }
-                    else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pt")))
+                        bForceNewEvent  = true;
+                        bOpenEvent      = false;
+                        bForceOpenEvent = false;
+                        bPrintToEvent   = false;
+                        bPrintEvent     = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
+                    }
+                    else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-o" )))
                     {
-                        // Print to special printer
-                        bPrintToEvent	= sal_True;
-                        bPrinterName	= sal_True;
-                        bPrintEvent		= sal_False;
-                        bOpenEvent		= sal_False;
-                        bForceNewEvent	= sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
-                         bForceOpenEvent = sal_False;
+                        // force open documents regardless if they are templates or not
+                        bForceOpenEvent = true;
+                        bOpenEvent      = false;
+                        bForceNewEvent  = false;
+                        bPrintToEvent   = false;
+                        bPrintEvent     = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
                     }
-                    else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-p")))
+                    else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-pt" )))
                     {
+                        // Print to special printer
+                        bPrintToEvent   = true;
+                        bPrinterName    = true;
+                        bPrintEvent     = false;
+                        bOpenEvent      = false;
+                        bForceNewEvent  = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
+                        bForceOpenEvent = false;
+                   }
+                   else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-p" )))
+                   {
                         // Print to default printer
-                        bPrintEvent		= sal_True;
-                        bPrintToEvent	= sal_False;
-                        bOpenEvent		= sal_False;
-                        bForceNewEvent	= sal_False;
-                        bForceOpenEvent = sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
-                     }
-                    else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("view")))
-                    {
+                        bPrintEvent     = true;
+                        bPrintToEvent   = false;
+                        bOpenEvent      = false;
+                        bForceNewEvent  = false;
+                        bForceOpenEvent = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
+                   }
+                   else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" )))
+                   {
                         // open in viewmode
-                        bOpenEvent      = sal_False;
-                        bPrintEvent     = sal_False;
-                        bPrintToEvent   = sal_False;
-                        bForceNewEvent  = sal_False;
-                        bForceOpenEvent = sal_False;
-                        bViewEvent      = sal_True;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
-                     }
-                    else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("show")))
-                    {
+                        bOpenEvent      = false;
+                        bPrintEvent     = false;
+                        bPrintToEvent   = false;
+                        bForceNewEvent  = false;
+                        bForceOpenEvent = false;
+                        bViewEvent      = true; 
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
+                   }
+                   else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" )))
+                   {
                         // open in viewmode
-                        bOpenEvent      = sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_True;
-                        bPrintEvent     = sal_False;
-                        bPrintToEvent   = sal_False;
-                        bForceNewEvent  = sal_False;
-                        bForceOpenEvent = sal_False;
-                        bDisplaySpec	= sal_False;
+                        bOpenEvent      = false;
+                        bViewEvent      = false;
+                        bStartEvent     = true;
+                        bPrintEvent     = false;
+                        bPrintToEvent   = false;
+                        bForceNewEvent  = false;
+                        bForceOpenEvent = false;
+                        bDisplaySpec    = false;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("display")))
                     {
                         // set display
-                        bOpenEvent      = sal_False;
-                           bPrintEvent     = sal_False;
-                        bForceOpenEvent = sal_False;
-                        bPrintToEvent   = sal_False;
-                        bForceNewEvent  = sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_True;
+                        bOpenEvent      = false;
+                        bPrintEvent     = false;
+                        bForceOpenEvent = false;
+                        bPrintToEvent   = false;
+                        bForceNewEvent  = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = true;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("language")))
                     {
-                        bOpenEvent      = sal_False;
-                           bPrintEvent     = sal_False;
-                        bForceOpenEvent = sal_False;
-                        bPrintToEvent   = sal_False;
-                        bForceNewEvent  = sal_False;
-                        bViewEvent      = sal_False;
-                        bStartEvent     = sal_False;
-                        bDisplaySpec	= sal_False;
+                        bOpenEvent      = false;
+                        bPrintEvent     = false;
+                        bForceOpenEvent = false;
+                        bPrintToEvent   = false;
+                        bForceNewEvent  = false;
+                        bViewEvent      = false;
+                        bStartEvent     = false;
+                        bDisplaySpec    = false;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("convert-to")))
                     {
-                        bOpenEvent = sal_False;
-                        bConversionEvent = sal_True;
-                        bConversionParamsEvent = sal_True;
+                        bOpenEvent = false;
+                        bConversionEvent = true;
+                        bConversionParamsEvent = true;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("print-to-file")))
                     {
-                        bOpenEvent = sal_False;
-                        bBatchPrintEvent = sal_True;
+                        bOpenEvent = false;
+                        bBatchPrintEvent = true;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("printer-name")) &&
                               bBatchPrintEvent )
                     {
-                        bBatchPrinterNameEvent = sal_True;
+                        bBatchPrinterNameEvent = true;
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("outdir")) &&
                               (bConversionEvent || bBatchPrintEvent) )
                     {
-                        bConversionOutEvent = sal_True;
+                        bConversionOutEvent = true;
                     }
                 }
                 else
@@ -312,24 +313,24 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                     {
                         // first argument after "-pt" this must be the printer name
                         AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArg );
-                        bPrinterName = sal_False;
+                        bPrinterName = false;
                     }
                     else if ( bConversionParamsEvent && bConversionEvent )
                     {
                         // first argument must be the the params
                         AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONPARAMS, aArg );
-                        bConversionParamsEvent = sal_False;
+                        bConversionParamsEvent = false;
                     }
                     else if ( bBatchPrinterNameEvent && bBatchPrintEvent )
                     {
                         // first argument is the printer name
                         AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArg );
-                        bBatchPrinterNameEvent = sal_False;
+                        bBatchPrinterNameEvent = false;
                     }
                     else if ( (bConversionEvent || bBatchPrintEvent) && bConversionOutEvent )
                     {
                         AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONOUT, aArg );
-                        bConversionOutEvent = sal_False;
+                        bConversionOutEvent = false;
                     }
                     else
                     {
@@ -344,23 +345,45 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                         }
                         // handle this argument as a filename
                         if ( bOpenEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bViewEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_VIEWLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bStartEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_STARTLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bPrintEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_PRINTLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bPrintToEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_PRINTTOLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bForceNewEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_FORCENEWLIST, aArg );
+                            bOpenDoc = true;
+                        }
                         else if ( bForceOpenEvent )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_FORCEOPENLIST, aArg );
-                        else if ( bDisplaySpec ){
+                            bOpenDoc = true;
+                        }
+                        else if ( bDisplaySpec )
+                        {
                             AddStringListParam_Impl( CMD_STRINGPARAM_DISPLAY, aArg );
-                            bDisplaySpec = sal_False; // only one display, not a list
-                            bOpenEvent = sal_True;    // set back to standard
+                            bDisplaySpec = false; // only one display, not a lsit
+                            bOpenEvent = true;    // set back to standard
                         }
                         else if ( bConversionEvent || bBatchPrintEvent )
                             AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONLIST, aArg );
@@ -369,6 +392,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
             }
         }
     }
+
+    if ( bOpenDoc )
+        m_bDocumentArgs = true;
 }
 
 void CommandLineArgs::AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam )
@@ -509,7 +535,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
     {
         AddStringListParam_Impl( CMD_STRINGPARAM_SPLASHPIPE, oArg.copy(RTL_CONSTASCII_LENGTH("splash-pipe=")) );
     }
-    #ifdef MACOSX
+#ifdef MACOSX
     /* #i84053# ignore -psn on Mac
        Platform dependent #ifdef here is ugly, however this is currently
        the only platform dependent parameter. Should more appear
@@ -520,7 +546,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
         SetBoolParam_Impl( CMD_BOOLPARAM_PSN, sal_True );
         return sal_True;
     }
-    #endif
+#endif
     else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
     {
         AddStringListParam_Impl( CMD_STRINGPARAM_INFILTER, oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")) );
@@ -565,48 +591,56 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_WRITER, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "calc" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_CALC );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_CALC, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "draw" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_DRAW );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_DRAW, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "impress" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_IMPRESS );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_IMPRESS, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "base" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_BASE );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_BASE, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "global" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_GLOBAL );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_GLOBAL, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "math" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_MATH );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_MATH, sal_True );
+        m_bDocumentArgs = true;
     }
     else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "web" )) == sal_True )
     {
         sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WEB );
         if ( !bAlreadySet )
             SetBoolParam_Impl( CMD_BOOLPARAM_WEB, sal_True );
+        m_bDocumentArgs = true;
     }
     else
         return sal_False;
@@ -635,12 +669,12 @@ sal_Bool CommandLineArgs::CheckGroupMembers( GroupParamId nGroupId, BoolParam nE
 void CommandLineArgs::ResetParamValues()
 {
     int i;
-
     for ( i = 0; i < CMD_BOOLPARAM_COUNT; i++ )
         m_aBoolParams[i] = sal_False;
     for ( i = 0; i < CMD_STRINGPARAM_COUNT; i++ )
         m_aStrSetParams[i] = sal_False;
     m_eArgumentCount = NONE;
+    m_bDocumentArgs  = false;
 }
 
 void CommandLineArgs::SetBoolParam( BoolParam eParam, sal_Bool bNewValue )
@@ -963,6 +997,12 @@ sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const
            ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] );
 }
 
+sal_Bool CommandLineArgs::WantsToLoadDocument() const
+{
+    osl::MutexGuard  aMutexGuard( m_aMutex );
+    return m_bDocumentArgs;
+}
+
 } // namespace desktop
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index e670ccc2c4..c983ab274f 100644..100755
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -39,7 +39,7 @@ namespace desktop
 class CommandLineArgs
 {
     public:
-        enum BoolParam	// must be zero based!
+        enum BoolParam // must be zero based!
         {
             CMD_BOOLPARAM_MINIMIZED = 0,
             CMD_BOOLPARAM_INVISIBLE,
@@ -99,7 +99,7 @@ class CommandLineArgs
             CMD_STRINGPARAM_INFILTER,
             CMD_STRINGPARAM_DISPLAY,
             CMD_STRINGPARAM_LANGUAGE,
-            CMD_STRINGPARAM_COUNT			// must be last element!
+            CMD_STRINGPARAM_COUNT // must be last element!
         };
 
         enum GroupParamId
@@ -108,7 +108,8 @@ class CommandLineArgs
             CMD_GRPID_COUNT
         };
 
-        struct Supplier {
+        struct Supplier
+        {
             // Thrown from constructors and next:
             class Exception {
             public:
@@ -129,7 +130,7 @@ class CommandLineArgs
         boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; }
 
         // generic methods to access parameter
-        void					SetBoolParam( BoolParam eParam, sal_Bool bNewValue );
+        void     SetBoolParam( BoolParam eParam, sal_Bool bNewValue );
 
         const rtl::OUString&    GetStringParam( StringParam eParam ) const;
 
@@ -164,6 +165,7 @@ class CommandLineArgs
         sal_Bool				IsWeb() const;
         sal_Bool                IsVersion() const;
         sal_Bool				HasModuleParam() const;
+        sal_Bool				WantsToLoadDocument() const;
 
         // Access to string parameters
         sal_Bool				GetPortalConnectString( ::rtl::OUString& rPara) const;
@@ -184,17 +186,17 @@ class CommandLineArgs
         sal_Bool                GetConversionOut( ::rtl::OUString& rPara ) const;
 
         // Special analyzed states (does not match directly to a command line parameter!)
-        sal_Bool                IsPrinting() const;
-        sal_Bool                IsEmpty() const;
-        sal_Bool                IsEmptyOrAcceptOnly() const;
+        sal_Bool IsPrinting() const;
+        sal_Bool IsEmpty() const;
+        sal_Bool IsEmptyOrAcceptOnly() const;
 
     private:
         enum Count { NONE, ONE, MANY };
 
         struct GroupDefinition
         {
-            sal_Int32	nCount;
-            BoolParam*	pGroupMembers;
+            sal_Int32  nCount;
+            BoolParam* pGroupMembers;
         };
 
         // no copy and operator=
@@ -206,18 +208,19 @@ class CommandLineArgs
         void					ResetParamValues();
         sal_Bool				CheckGroupMembers( GroupParamId nGroup, BoolParam nExcludeMember ) const;
 
-        void					AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam );
-        void					SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue );
+        void     AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam );
+        void     SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue );
 
         boost::optional< rtl::OUString > m_cwdUrl;
-        sal_Bool				m_aBoolParams[ CMD_BOOLPARAM_COUNT ];		// Stores boolean parameters
-        rtl::OUString			m_aStrParams[ CMD_STRINGPARAM_COUNT ];		// Stores string parameters
-        sal_Bool				m_aStrSetParams[ CMD_STRINGPARAM_COUNT ];	// Stores if string parameters are provided on cmdline
-        Count                   m_eArgumentCount;                           // Number of Args
-        mutable ::osl::Mutex	m_aMutex;
+        sal_Bool                         m_aBoolParams[ CMD_BOOLPARAM_COUNT ];     // Stores boolean parameters
+        rtl::OUString                    m_aStrParams[ CMD_STRINGPARAM_COUNT ];    // Stores string parameters
+        sal_Bool                         m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline
+        Count                            m_eArgumentCount;                         // Number of Args
+        bool                             m_bDocumentArgs;                          // A document creation/open/load arg is used
+        mutable ::osl::Mutex             m_aMutex;
 
         // static definition for groups where only one member can be true
-        static GroupDefinition	m_pGroupDefinitions[ CMD_GRPID_COUNT ];
+        static GroupDefinition  m_pGroupDefinitions[ CMD_GRPID_COUNT ];
 };
 
 }
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 6a09755a7b..6a09755a7b 100644..100755
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 2036d64678..2036d64678 100644..100755
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 4da030c453..782bbd12b5 100644..100755
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -81,7 +81,7 @@ typedef uno::Reference< lang::XMultiServiceFactory > ConfigurationProvider;
 // Get a message string securely. There is a fallback string if the resource
 // is not available. Adapted from Desktop::GetMsgString()
 
-OUString getMsgString( USHORT nId, char const * aFallBackMsg )
+OUString getMsgString( sal_uInt16 nId, char const * aFallBackMsg )
 {
     ResMgr* pResMgr = Desktop::GetDesktopResManager();
     if ( !pResMgr || !nId )
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index 8254f41118..8254f41118 100644..100755
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index b35aa2cee9..b35aa2cee9 100644..100755
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index a94966855e..a94966855e 100644..100755
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 035318b4d7..035318b4d7 100644..100755
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index e333c44181..10411e5adb 100644..100755
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -159,6 +159,7 @@ InfoBox INFOBOX_CMDLINEHELP
 
 ModalDialog DLG_CMDLINEHELP
 {
+    HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP";
     Text = "Help Message...";
     Size = MAP_APPFONT(250, 365);
     Border = True;
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index a6b29a092d..a6b29a092d 100644..100755
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index f0ac41c87a..f0ac41c87a 100644..100755
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index 347ee542a3..b817738772 100644..100755
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -37,7 +37,7 @@
 namespace desktop
 {
 
-DesktopResId::DesktopResId( USHORT nId ) :
+DesktopResId::DesktopResId( sal_uInt16 nId ) :
     ResId( nId, *Desktop::GetDesktopResManager() )
 {
 }
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index 689a0f11da..2a517c9f29 100644..100755
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -37,7 +37,7 @@ namespace desktop
 class DesktopResId : public ResId
 {
     public:
-        DesktopResId( USHORT nId );
+        DesktopResId( sal_uInt16 nId );
 };
 
 }
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 04a8645d7b..04a8645d7b 100644..100755
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index a787c1e069..a787c1e069 100644..100755
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/desktop/source/app/exports.dxp
+++ b/desktop/source/app/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index b775bf2942..b775bf2942 100644..100755
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 6db4f5bc24..6db4f5bc24 100644..100755
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index c2b2b1b0ec..c2b2b1b0ec 100644..100755
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index 0d286e13ca..0d286e13ca 100644..100755
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index 9f61c563fd..9f61c563fd 100644..100755
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index 198e42a0ca..198e42a0ca 100644..100755
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index e7c30a2ca7..e7c30a2ca7 100644..100755
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 6830361cf4..e1a42dbc4f 100644..100755
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -844,8 +844,6 @@ void SAL_CALL OfficeIPCThread::run()
                     aHelpURLBuffer.appendAscii("&System=UNX");
 #elif defined WNT
                     aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined MAC
-                    aHelpURLBuffer.appendAscii("&System=MAC");
 #elif defined OS2
                     aHelpURLBuffer.appendAscii("&System=OS2");
 #endif
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index f075aec313..e72db07e05 100644..100755
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -123,7 +123,7 @@ class OfficeIPCThread : public osl::Thread
     static void					RequestsCompleted( int n = 1 );
     static sal_Bool				ExecuteCmdLineRequests( ProcessDocumentsRequest& );
 
-    // return FALSE if second office
+    // return sal_False if second office
     static Status				EnableOfficeIPCThread();
     static void					DisableOfficeIPCThread();
     // start dispatching events...
diff --git a/desktop/source/app/omutexmember.hxx b/desktop/source/app/omutexmember.hxx
index 4e33e1313d..4e33e1313d 100644..100755
--- a/desktop/source/app/omutexmember.hxx
+++ b/desktop/source/app/omutexmember.hxx
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 1e640c58ae..1e640c58ae 100644..100755
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index 5b07bb4684..5b07bb4684 100644..100755
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index c80ade88e9..c80ade88e9 100644..100755
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 67b4f0081a..67b4f0081a 100644..100755
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map
index ad52c57cc1..ad52c57cc1 100644..100755
--- a/desktop/source/app/version.map
+++ b/desktop/source/app/version.map
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
new file mode 100755
index 0000000000..11385c7aa8
--- /dev/null
+++ b/desktop/source/deployment/deployment.component
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.deployment.ExtensionManager">
+    <service name="com.sun.star.comp.deployment.ExtensionManager"/>
+    <singleton name="com.sun.star.deployment.ExtensionManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.PackageInformationProvider">
+    <service name="com.sun.star.comp.deployment.PackageInformationProvider"/>
+    <singleton name="com.sun.star.deployment.PackageInformationProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.PackageManagerFactory">
+    <service name="com.sun.star.comp.deployment.PackageManagerFactory"/>
+    <singleton name="com.sun.star.deployment.thePackageManagerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.ProgressLog">
+    <service name="com.sun.star.comp.deployment.ProgressLog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.component.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.configuration.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.executable.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.help.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.script.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.sfwk.PackageRegistryBackend">
+    <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+  </implementation>
+</component>
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index bb58770c4c..bb58770c4c 100644..100755
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 3ced8d3d1e..3ced8d3d1e 100644..100755
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index 36e7163f28..b9a8185b2d 100644..100755
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -93,27 +93,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    lang::XMultiServiceFactory * pServiceManager,
-    registry::XRegistryKey * pRegistryKey )
-{
-    return component_writeInfoHelper(
-        pServiceManager, pRegistryKey,
-        dp_registry::backend::configuration::serviceDecl,
-        dp_registry::backend::component::serviceDecl,
-        dp_registry::backend::help::serviceDecl,
-        dp_registry::backend::script::serviceDecl,
-        dp_registry::backend::sfwk::serviceDecl,    
-        dp_registry::backend::executable::serviceDecl,
-        dp_manager::factory::serviceDecl,
-        dp_log::serviceDecl,
-        dp_info::serviceDecl,
-        dp_manager::serviceDecl) &&
-        dp_manager::factory::singleton_entries( pRegistryKey ) &&
-        dp_info::singleton_entries( pRegistryKey ) &&
-        dp_manager::singleton_entries( pRegistryKey);
-}
-
 void * SAL_CALL component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 8bd219c1ed..8bd219c1ed 100644..100755
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
new file mode 100755
index 0000000000..d613f482e7
--- /dev/null
+++ b/desktop/source/deployment/gui/deploymentgui.component
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.deployment.ui.LicenseDialog">
+    <service name="com.sun.star.deployment.ui.LicenseDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.ui.PackageManagerDialog">
+    <service name="com.sun.star.deployment.ui.PackageManagerDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.deployment.ui.UpdateRequiredDialog">
+    <service name="com.sun.star.deployment.ui.UpdateRequiredDialog"/>
+  </implementation>
+</component>
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 0291ce5802..4091e89f53 100644..100755
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -61,7 +61,7 @@ void DescriptionEdit::Init()
     // read-only
     SetReadOnly();
     // no cursor
-    EnableCursor( FALSE );
+    EnableCursor( sal_False );
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index 27e36e14a0..27e36e14a0 100644..100755
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 043a86f1af..043a86f1af 100644..100755
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 6ec110001f..c1a40828bb 100644..100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -125,6 +125,11 @@
 #define RID_DLG_UPDATE_RELEASENOTES_LINK    29
 #define RID_DLG_UPDATE_NOUPDATE             30
 #define RID_DLG_UPDATE_VERSION              31
+#define RID_DLG_UPDATE_IGNORE               32
+#define RID_DLG_UPDATE_ENABLE               33
+#define RID_DLG_UPDATE_IGNORE_ALL           34
+#define RID_DLG_UPDATE_IGNORED_UPDATE       35
+
 
 
 #define RID_DLG_UPDATEINSTALL                  (RID_DEPLOYMENT_GUI_START + 20)
@@ -157,6 +162,7 @@
 #define RID_STR_NO_ADMIN_PRIVILEGE             (RID_DEPLOYMENT_GUI_START+95)
 #define RID_STR_ERROR_MISSING_DEPENDENCIES     (RID_DEPLOYMENT_GUI_START+96)
 #define RID_STR_ERROR_MISSING_LICENSE          (RID_DEPLOYMENT_GUI_START+97)
+#define RID_STR_SHOW_LICENSE_CMD               (RID_DEPLOYMENT_GUI_START+98)
 
 #define WARNINGBOX_CONCURRENTINSTANCE          (RID_DEPLOYMENT_GUI_START+100)
 
@@ -166,6 +172,7 @@
 #define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+104)
 #define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+105)
 #define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
+#define RID_DLG_SHOW_LICENSE					(RID_DEPLOYMENT_GUI_START+107)
 
 #define RID_DLG_LICENSE							RID_DEPLOYMENT_LICENSE_START
 
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index 548cdb3b7f..fae0f3022a 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -59,7 +59,7 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
         if ( nId == TEXT_HINT_VIEWSCROLLED )
         {   
             ScrollBar*  pScroll = GetVScrollBar();
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index ddec1e81ae..ddec1e81ae 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index b002bf2408..b002bf2408 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 694f764d5e..694f764d5e 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 72f8334d38..72f8334d38 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index 80b584f894..1e5d273943 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -34,6 +34,7 @@
 #define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT)
 
 ModalDialog RID_DLG_DEPENDENCIES {
+    HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES";
     Size = MAP_APPFONT(
         (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
          RSC_SP_DLG_INNERBORDER_RIGHT),
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_DEPENDENCIES {
         NoLabel = TRUE;
     };
     ListBox RID_DLG_DEPENDENCIES_LIST {
+        HelpID = "desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST";
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT,
             (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 94fdf87b0f..12b6acb847 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -125,6 +125,11 @@ String RID_STR_ERROR_MISSING_LICENSE
     Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n";
 };
 
+String RID_STR_SHOW_LICENSE_CMD
+{
+    Text [ en-US ] = "Show license";
+};
+
 // Dialog layout
 // ---------------------------------------------------
 //	row 1 | multi line edit
@@ -175,6 +180,7 @@ String RID_STR_ERROR_MISSING_LICENSE
 
 ModalDialog RID_DLG_LICENSE
 {
+    HelpID = "desktop:ModalDialog:RID_DLG_LICENSE";
     Text [ en-US ] = "Extension Software License Agreement";
 
     Size = MAP_APPFONT(LIC_DLG_WIDTH, LIC_DLG_HEIGHT);
@@ -186,6 +192,7 @@ ModalDialog RID_DLG_LICENSE
 
     MultiLineEdit ML_LICENSE
     {
+        HelpID = "desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE";
         Pos = MAP_APPFONT(COL1_X, ROW1_Y);
         Size = MAP_APPFONT(BODYWIDTH, ROW1_HEIGHT);
         Border = TRUE;
@@ -240,6 +247,7 @@ ModalDialog RID_DLG_LICENSE
 
     PushButton PB_LICENSE_DOWN
     {
+        HelpID = "desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN";
         TabStop = TRUE ;
         Pos = MAP_APPFONT(COL5_X , ROW3_Y) ;
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ;
@@ -295,6 +303,35 @@ ModalDialog RID_DLG_LICENSE
     
 };
 
+ModalDialog RID_DLG_SHOW_LICENSE
+{
+    Text [ en-US ] = "Extension Software License Agreement";
+    Size = MAP_APPFONT( 300, 200 );
+    OutputSize = TRUE;
+    SVLook = TRUE;
+    Moveable = TRUE;
+    Closeable = TRUE;
+    Sizeable = TRUE;
+
+    MultiLineEdit ML_LICENSE
+    {
+        Pos = MAP_APPFONT( 5, 5 );
+        Size = MAP_APPFONT( 300 - 10, 200 - 15 - RSC_CD_PUSHBUTTON_HEIGHT );
+        Border = TRUE;
+        VScroll = TRUE;
+        ReadOnly = TRUE;
+    };
+
+    OKButton RID_EM_BTN_CLOSE
+    {
+        TabStop = TRUE;
+        DefButton = TRUE;
+        Text [ en-US ] = "Close";
+        Pos = MAP_APPFONT( (300-RSC_CD_PUSHBUTTON_WIDTH)/2, 200 - 5 - RSC_CD_PUSHBUTTON_HEIGHT );
+        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+    };
+};
+
 
 
 WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 9b23ed5c15..265936f3cd 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -40,8 +40,10 @@
 #include "dp_gui_theextmgr.hxx"
 #include "dp_gui_extensioncmdqueue.hxx"
 #include "dp_misc.h"
+#include "dp_ucb.h"
 #include "dp_update.hxx"
 #include "dp_identifier.hxx"
+#include "dp_descriptioninfoset.hxx"
 
 #include "vcl/ctrl.hxx"
 #include "vcl/menu.hxx"
@@ -119,7 +121,8 @@ enum MENU_COMMAND
     CMD_REMOVE  = 1,
     CMD_ENABLE,
     CMD_DISABLE,
-    CMD_UPDATE
+    CMD_UPDATE,
+    CMD_SHOW_LICENSE
 };
 
 class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
@@ -225,13 +228,10 @@ const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const
 // -----------------------------------------------------------------------
 void ExtBoxWithBtns_Impl::RecalcAll()
 {
-    ExtensionBox_Impl::RecalcAll();
-
     const sal_Int32 nActive = getSelIndex();
 
     if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
     {
-        SetButtonPos( GetEntryRect( nActive ) );
         SetButtonStatus( GetEntryData( nActive) );
     }
     else
@@ -240,6 +240,11 @@ void ExtBoxWithBtns_Impl::RecalcAll()
         m_pEnableBtn->Hide();
         m_pRemoveBtn->Hide();
     }
+
+    ExtensionBox_Impl::RecalcAll();
+
+    if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
+        SetButtonPos( GetEntryRect( nActive ) );
 }
 
 
@@ -364,28 +369,29 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
 // -----------------------------------------------------------------------
 MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos )
 {
-    if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) )
-    {
-        if ( ! GetEntryData( nPos )->m_bLocked )
-        {
-            PopupMenu aPopup;
-
-            aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+    if ( nPos >= (long) getItemCount() )
+        return CMD_NONE;
 
-            if ( GetEntryData( nPos )->m_bUser )
-            {
-                if ( GetEntryData( nPos )->m_eState == REGISTERED )
-                    aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
-                else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
-                    aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
-            }
+    PopupMenu aPopup;
 
-            aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
+    aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
 
-            return (MENU_COMMAND) aPopup.Execute( this, rPos );
+    if ( ! GetEntryData( nPos )->m_bLocked )
+    {
+        if ( GetEntryData( nPos )->m_bUser )
+        {
+            if ( GetEntryData( nPos )->m_eState == REGISTERED )
+                aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+            else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
+                aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
         }
+        aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
     }
-    return CMD_NONE;
+
+    if ( GetEntryData( nPos )->m_sLicenseText.Len() )
+        aPopup.InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) );
+
+    return (MENU_COMMAND) aPopup.Execute( this, rPos );
 }
 
 //------------------------------------------------------------------------------
@@ -410,6 +416,12 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
                                 break;
             case CMD_REMOVE:    m_pParent->removePackage( GetEntryData( nPos )->m_xPackage );
                                 break;
+            case CMD_SHOW_LICENSE:
+                {
+                    ShowLicenseDialog aLicenseDlg( m_pParent, GetEntryData( nPos )->m_xPackage );
+                    aLicenseDlg.Execute();
+                    break;
+                }
         }
     }
     else if ( rMEvt.IsLeft() )
@@ -431,7 +443,7 @@ long ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
             bHandled = HandleTabKey( aKeyCode.IsShift() );
@@ -558,14 +570,14 @@ DialogHelper::~DialogHelper()
 }
 
 //------------------------------------------------------------------------------
-ResId DialogHelper::getResId( USHORT nId )
+ResId DialogHelper::getResId( sal_uInt16 nId )
 {
     const SolarMutexGuard guard;
     return ResId( nId, *DeploymentGuiResMgr::get() );
 }
 
 //------------------------------------------------------------------------------
-String DialogHelper::getResourceString( USHORT id )
+String DialogHelper::getResourceString( sal_uInt16 id )
 {
     // init with non-acquired solar mutex:
     BrandName::get();
@@ -589,7 +601,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
 //------------------------------------------------------------------------------
 bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
                                               Window *pParent,
-                                              const USHORT nResID,
+                                              const sal_uInt16 nResID,
                                               bool &bHadWarning )
 {
     if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
@@ -658,8 +670,8 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
     sMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
     aQuery.SetMessText( sMsgText );
 
-    USHORT nYesBtnID = aQuery.GetButtonId( 0 );
-    USHORT nNoBtnID = aQuery.GetButtonId( 1 );
+    sal_uInt16 nYesBtnID = aQuery.GetButtonId( 0 );
+    sal_uInt16 nNoBtnID = aQuery.GetButtonId( 1 );
 
     if ( nYesBtnID != BUTTONDIALOG_BUTTON_NOTFOUND )
         aQuery.SetButtonText( nYesBtnID, getResourceString( RID_STR_INSTALL_FOR_ME ) );
@@ -1106,7 +1118,7 @@ IMPL_LINK( ExtMgrDialog, TimeOutHdl, Timer*, EMPTYARG )
         }
 
         if ( m_aProgressBar.IsVisible() )
-            m_aProgressBar.SetValue( (USHORT) m_nProgress );
+            m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
 
         m_aTimeoutTimer.Start();
     }
@@ -1158,7 +1170,7 @@ void ExtMgrDialog::Resize()
         Rectangle aNativeControlRegion, aNativeContentRegion;
         if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) != sal_False )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
@@ -1195,7 +1207,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
         {
@@ -1222,7 +1234,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
 }
 
 //------------------------------------------------------------------------------
-BOOL ExtMgrDialog::Close()
+sal_Bool ExtMgrDialog::Close()
 {
     bool bRet = m_pManager->queryTermination();
     if ( bRet )
@@ -1544,7 +1556,7 @@ IMPL_LINK( UpdateRequiredDialog, TimeOutHdl, Timer*, EMPTYARG )
         }
 
         if ( m_aProgressBar.IsVisible() )
-            m_aProgressBar.SetValue( (USHORT) m_nProgress );
+            m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
 
         m_aTimeoutTimer.Start();
     }
@@ -1602,7 +1614,7 @@ void UpdateRequiredDialog::Resize()
         Rectangle aNativeControlRegion, aNativeContentRegion;
         if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) != sal_False )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
@@ -1640,7 +1652,7 @@ short UpdateRequiredDialog::Execute()
 
 //------------------------------------------------------------------------------
 // VCL::Dialog
-BOOL UpdateRequiredDialog::Close()
+sal_Bool UpdateRequiredDialog::Close()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1746,6 +1758,42 @@ void UpdateRequiredDialog::disableAllEntries()
         m_aCloseBtn.SetText( m_sCloseText );
 }
 
+//------------------------------------------------------------------------------
+//                             ShowLicenseDialog
+//------------------------------------------------------------------------------
+ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
+                                      const uno::Reference< deployment::XPackage > &xPackage ) :
+    ModalDialog( pParent, DialogHelper::getResId( RID_DLG_SHOW_LICENSE ) ),
+    m_aLicenseText( this, DialogHelper::getResId( ML_LICENSE ) ),
+    m_aCloseBtn( this,    DialogHelper::getResId( RID_EM_BTN_CLOSE ) )
+{
+    FreeResource();
+
+    OUString aText = xPackage->getLicenseText();
+    m_aLicenseText.SetText( aText );
+}
+
+//------------------------------------------------------------------------------
+ShowLicenseDialog::~ShowLicenseDialog()
+{}
+
+//------------------------------------------------------------------------------
+void ShowLicenseDialog::Resize()
+{
+    Size aTotalSize( GetOutputSizePixel() );
+    Size aTextSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT,
+                    aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 2*RSC_SP_DLG_INNERBORDER_BOTTOM
+                                        - m_aCloseBtn.GetSizePixel().Height() );
+
+    m_aLicenseText.SetPosSizePixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ),
+                                    aTextSize );
+
+    Point aBtnPos( (aTotalSize.Width() - m_aCloseBtn.GetSizePixel().Width())/2,
+                    aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM
+                                        - m_aCloseBtn.GetSizePixel().Height() );
+    m_aCloseBtn.SetPosPixel( aBtnPos );
+}
+
 //=================================================================================
 // UpdateRequiredDialogService
 //=================================================================================
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 9ca13418d7..03b8839d23 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -36,6 +36,7 @@
 
 #include "svtools/fixedhyper.hxx"
 #include "svtools/prgsbar.hxx"
+#include "svtools/svmedit.hxx"
 
 #include "osl/conditn.hxx"
 #include "osl/mutex.hxx"
@@ -63,7 +64,7 @@ class DialogHelper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
     Dialog*         m_pVCLWindow;
-    ULONG           m_nEventID;
+    sal_uLong           m_nEventID;
     bool            m_bIsBusy;
 
 public:
@@ -88,12 +89,12 @@ public:
     virtual void    prepareChecking() = 0;
     virtual void    checkEntries() = 0;
 
-    static ResId    getResId( USHORT nId );
-    static String   getResourceString( USHORT id );
+    static ResId    getResId( sal_uInt16 nId );
+    static String   getResourceString( sal_uInt16 id );
     static bool     IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &);
     static bool     continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
                                                Window *pParent,
-                                               const USHORT nResID,
+                                               const sal_uInt16 nResID,
                                                bool &bHadWarning );
 
     void            setBusy( const bool bBusy ) { m_bIsBusy = bBusy; }
@@ -149,7 +150,7 @@ public:
 
     virtual void    Resize();
     virtual long    Notify( NotifyEvent& rNEvt );
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
     virtual void    showProgress( bool bStart );
     virtual void    updateProgress( const ::rtl::OUString &rText,
@@ -221,7 +222,7 @@ public:
 
     virtual short	Execute();
     virtual void    Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
     virtual void    showProgress( bool bStart );
     virtual void    updateProgress( const ::rtl::OUString &rText,
@@ -246,6 +247,20 @@ public:
 };
 
 //==============================================================================
+class ShowLicenseDialog : public ModalDialog
+{
+    MultiLineEdit   m_aLicenseText;
+    OKButton        m_aCloseBtn;
+
+public:
+                    ShowLicenseDialog( Window * pParent,
+                                       const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    virtual        ~ShowLicenseDialog();
+
+    virtual void    Resize();
+};
+
+//==============================================================================
 class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XExecutableDialog >
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 5c5fc24608..296928abfb 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -43,6 +43,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
 
     PushButton RID_EM_BTN_ADD
     {
+        HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD";
         TabStop = TRUE;
         Text [ en-US ] = "~Add...";
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -50,6 +51,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
 
     PushButton RID_EM_BTN_CHECK_UPDATES
     {
+        HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES";
         TabStop = TRUE;
         Text [ en-US ] = "Check for ~Updates...";
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -131,6 +133,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
 
     PushButton RID_EM_BTN_CHECK_UPDATES
     {
+        HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CHECK_UPDATES";
         TabStop = TRUE;
         Text [ en-US ] = "Check for ~Updates...";
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -138,6 +141,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
 
     PushButton RID_EM_BTN_CLOSE
     {
+        HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CLOSE";
         TabStop = TRUE;
         DefButton = TRUE;
         Text [ en-US ] = "Disable all";
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d102a7edc9..d102a7edc9 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 8794c51132..8794c51132 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3f0e45d38c..1d7f968423 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -77,6 +77,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
         m_sTitle = xPackage->getDisplayName();
         m_sVersion = xPackage->getVersion();
         m_sDescription = xPackage->getDescription();
+    m_sLicenseText = xPackage->getLicenseText();
 
         beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
         m_sPublisher = aInfo.First;
@@ -707,7 +708,7 @@ bool ExtensionBox_Impl::HandleTabKey( bool )
 }
 
 // -----------------------------------------------------------------------
-bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )
+bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
 {
     if ( m_vEntries.empty() )
         return true;
@@ -872,7 +873,7 @@ long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
             bHandled = HandleTabKey( aKeyCode.IsShift() );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 7cdaa7483e..9dbbb7d337 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -82,6 +82,7 @@ struct Entry_Impl
     String          m_sPublisher;
     String          m_sPublisherURL;
     String          m_sErrorText;
+    String          m_sLicenseText;
     Image           m_aIcon;
     Image           m_aIconHC;
     svt::FixedHyperlink *m_pPublisher;
@@ -166,7 +167,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     void            SetupScrollBar();
     void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );
     bool            HandleTabKey( bool bReverse );
-    bool            HandleCursorKey( USHORT nKeyCode );
+    bool            HandleCursorKey( sal_uInt16 nKeyCode );
     bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
     void            DeleteRemoved();
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index dce92cba4c..b1ec3a43df 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -358,14 +358,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    lang::XMultiServiceFactory * pServiceManager,
-    registry::XRegistryKey * pRegistryKey )
-{
-    return component_writeInfoHelper(
-        pServiceManager, pRegistryKey, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
-}
-
 void * SAL_CALL component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index af3a0bd5b9..dcee2863cd 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -55,7 +55,7 @@ struct BrandName : public ::rtl::StaticWithInit<const ::rtl::OUString, BrandName
 class DpGuiResId : public ResId
 {
 public:
-    DpGuiResId( USHORT nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
+    DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 564580c520..5e1099ef19 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -166,7 +166,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
 }
 
 //------------------------------------------------------------------------------
-void TheExtensionManager::ToTop( USHORT nFlags )
+void TheExtensionManager::ToTop( sal_uInt16 nFlags )
 {
     const SolarMutexGuard guard;
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 13ba06d0b3..6b1deb7ba9 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -87,7 +87,7 @@ public:
 
     void SetText( const ::rtl::OUString &rTitle );
     void Show();
-    void ToTop( USHORT nFlags );
+    void ToTop( sal_uInt16 nFlags );
     bool Close();
     bool isVisible();
 
diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx
index 3bf0ff0d6c..3bf0ff0d6c 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_thread.cxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx
index eb4fe43c94..eb4fe43c94 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_thread.hxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 314f449358..3a43dce5d6 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -29,6 +29,7 @@
 #define INCLUDED_DP_GUI_UPDATEDATA_HXX
 
 #include "sal/config.h"
+#include "tools/solar.h"
 #include "rtl/ustring.hxx"
 #include "com/sun/star/uno/Reference.hxx"
 
@@ -81,6 +82,10 @@ struct UpdateData
     //are to be ignored.
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage >
     aUpdateSource;
+    
+    // ID to find this entry in the update listbox
+    sal_uInt16  m_nID;
+    bool    m_bIgnored;
 };
 }
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index df1744fa5c..8b73e6bae8 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -44,14 +44,15 @@
 #include "com/sun/star/awt/WindowAttribute.hpp"
 #include "com/sun/star/awt/WindowClass.hpp"
 #include "com/sun/star/awt/WindowDescriptor.hpp"
-#include "com/sun/star/awt/XThrobber.hpp"
 #include "com/sun/star/awt/XToolkit.hpp"
 #include "com/sun/star/awt/XWindow.hpp"
 #include "com/sun/star/awt/XWindowPeer.hpp"
 #include "com/sun/star/beans/NamedValue.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
 #include "com/sun/star/deployment/DeploymentException.hpp"
 #include "com/sun/star/deployment/UpdateInformationProvider.hpp"
 #include "com/sun/star/deployment/XPackage.hpp"
@@ -63,6 +64,7 @@
 #include "com/sun/star/frame/XDispatchProvider.hpp"
 #include "com/sun/star/lang/IllegalArgumentException.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
 #include "com/sun/star/system/SystemShellExecuteFlags.hpp"
 #include "com/sun/star/system/XSystemShellExecute.hpp"
 #include "com/sun/star/task/XAbortChannel.hpp"
@@ -77,6 +79,7 @@
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
 #include "com/sun/star/util/XURLTransformer.hpp"
 #include "com/sun/star/xml/dom/XElement.hpp"
 #include "com/sun/star/xml/dom/XNode.hpp"
@@ -129,16 +132,23 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
-namespace css = ::com::sun::star;
-
+using namespace ::com::sun::star;
 using dp_gui::UpdateDialog;
 
 namespace {
 
 static sal_Unicode const LF = 0x000A;
 static sal_Unicode const CR = 0x000D;
+static const sal_uInt16 CMD_ENABLE_UPDATE = 1;
+static const sal_uInt16 CMD_IGNORE_UPDATE = 2;
+static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3;
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+#define IGNORED_UPDATES     OUSTR("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates")
+#define PROPERTY_VERSION    OUSTR("Version")
 
-enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, GENERAL_ERROR, SPECIFIC_ERROR };
+enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR };
 
 rtl::OUString confineToParagraph(rtl::OUString const & text) {
     // Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit.
@@ -151,86 +161,64 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) {
 
 struct UpdateDialog::DisabledUpdate {
     rtl::OUString name;
-    css::uno::Sequence< rtl::OUString > unsatisfiedDependencies;
+    uno::Sequence< rtl::OUString > unsatisfiedDependencies;
     // We also want to show release notes and publisher for disabled updates
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo;
+    sal_uInt16 m_nID;
 };
 
 struct UpdateDialog::SpecificError {
     rtl::OUString name;
     rtl::OUString message;
+    sal_uInt16 m_nID;
 };
 
-union UpdateDialog::IndexUnion{
-    std::vector< dp_gui::UpdateData >::size_type enabledUpdate;
-    std::vector< UpdateDialog::DisabledUpdate >::size_type disabledUpdate;
-    std::vector< rtl::OUString >::size_type generalError;
-    std::vector< UpdateDialog::SpecificError >::size_type specificError;
-};
-
-struct UpdateDialog::Index {
-    static std::auto_ptr< UpdateDialog::Index const > newEnabledUpdate(
-        std::vector< dp_gui::UpdateData >::size_type n);
-
-    static std::auto_ptr< UpdateDialog::Index const > newDisabledUpdate(
-        std::vector< UpdateDialog::DisabledUpdate >::size_type n);
+//------------------------------------------------------------------------------
+struct UpdateDialog::IgnoredUpdate {
+    rtl::OUString sExtensionID;
+    rtl::OUString sVersion;
+    bool          bRemoved;
 
-    static std::auto_ptr< UpdateDialog::Index const > newGeneralError(
-        std::vector< rtl::OUString >::size_type n);
-
-    static std::auto_ptr< UpdateDialog::Index const > newSpecificError(
-        std::vector< UpdateDialog::SpecificError >::size_type n);
-
-    Kind kind;
-    IndexUnion index;
-
-private:
-    explicit Index(Kind theKind);
+    IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion );
 };
 
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newEnabledUpdate(
-    std::vector< dp_gui::UpdateData >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(ENABLED_UPDATE);
-    p->index.enabledUpdate = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
-
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newDisabledUpdate(
-    std::vector< UpdateDialog::DisabledUpdate >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(DISABLED_UPDATE);
-    p->index.disabledUpdate = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+//------------------------------------------------------------------------------
+UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ):
+    sExtensionID( rExtensionID ),
+    sVersion( rVersion ),
+    bRemoved( false )
+{}
 
-std::auto_ptr< UpdateDialog::Index const > UpdateDialog::Index::newGeneralError(
-    std::vector< rtl::OUString >::size_type n)
+//------------------------------------------------------------------------------
+struct UpdateDialog::Index
 {
-    UpdateDialog::Index * p = new UpdateDialog::Index(GENERAL_ERROR);
-    p->index.generalError = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+    Kind          m_eKind;
+    bool          m_bIgnored; 
+    sal_uInt16        m_nID;
+    sal_uInt16        m_nIndex;
+    rtl::OUString m_aName;
 
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newSpecificError(
-    std::vector< UpdateDialog::SpecificError >::size_type n)
-{
-    UpdateDialog::Index * p = new UpdateDialog::Index(SPECIFIC_ERROR);
-    p->index.specificError = n;
-    return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+    Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName );
+};
 
-UpdateDialog::Index::Index(Kind theKind): kind(theKind) {}
+//------------------------------------------------------------------------------
+UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ):
+    m_eKind( theKind ),
+    m_bIgnored( false ),
+    m_nID( nID ), 
+    m_nIndex( nIndex ),
+    m_aName( rName )
+{}
 
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 class UpdateDialog::Thread: public dp_gui::Thread {
 public:
     Thread(
-        css::uno::Reference< css::uno::XComponentContext > const & context,
+        uno::Reference< uno::XComponentContext > const & context,
         UpdateDialog & dialog,
-        const std::vector< css::uno::Reference< css::deployment::XPackage >  > & vExtensionList);
+        const std::vector< uno::Reference< deployment::XPackage >  > & vExtensionList);
 
     void stop();
 
@@ -243,13 +231,13 @@ private:
     virtual void execute();
 
     void handleSpecificError(
-        css::uno::Reference< css::deployment::XPackage > const & package,
-        css::uno::Any const & exception) const;
+        uno::Reference< deployment::XPackage > const & package,
+        uno::Any const & exception) const;
 
-    css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
+    uno::Sequence< uno::Reference< xml::dom::XElement > >
     getUpdateInformation(
-        css::uno::Reference< css::deployment::XPackage > const & package,
-        css::uno::Sequence< rtl::OUString > const & urls,
+        uno::Reference< deployment::XPackage > const & package,
+        uno::Sequence< rtl::OUString > const & urls,
         rtl::OUString const & identifier) const;
 
     ::rtl::OUString getUpdateDisplayString(
@@ -261,40 +249,40 @@ private:
         dp_gui::UpdateData & out_data) const;
 
     bool update(
-    UpdateDialog::DisabledUpdate const & du,
-    dp_gui::UpdateData const & data) const;
-    
-    css::uno::Reference< css::uno::XComponentContext > m_context;
+        UpdateDialog::DisabledUpdate & du,
+        dp_gui::UpdateData & data) const;
+
+    uno::Reference< uno::XComponentContext > m_context;
     UpdateDialog & m_dialog;
-    std::vector< css::uno::Reference< css::deployment::XPackage > > m_vExtensionList;
-    css::uno::Reference< css::deployment::XUpdateInformationProvider > m_updateInformation;
-    css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHdl;
+    std::vector< uno::Reference< deployment::XPackage > > m_vExtensionList;
+    uno::Reference< deployment::XUpdateInformationProvider > m_updateInformation;
+    uno::Reference< task::XInteractionHandler > m_xInteractionHdl;
 
     // guarded by Application::GetSolarMutex():
-    css::uno::Reference< css::task::XAbortChannel > m_abort;
+    uno::Reference< task::XAbortChannel > m_abort;
     bool m_stop;
 };
 
 UpdateDialog::Thread::Thread(
-    css::uno::Reference< css::uno::XComponentContext > const & context,
+    uno::Reference< uno::XComponentContext > const & context,
     UpdateDialog & dialog,
-    const std::vector< css::uno::Reference< css::deployment::XPackage > > &vExtensionList):
+    const std::vector< uno::Reference< deployment::XPackage > > &vExtensionList):
     m_context(context),
     m_dialog(dialog),
     m_vExtensionList(vExtensionList),
     m_updateInformation(
-        css::deployment::UpdateInformationProvider::create(context)),
+        deployment::UpdateInformationProvider::create(context)),
     m_stop(false)
 {
     if( m_context.is() )
     {
-        css::uno::Reference< css::lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
 
         if( xServiceManager.is() )
         {
-            m_xInteractionHdl = css::uno::Reference< css::task::XInteractionHandler > (
+            m_xInteractionHdl = uno::Reference< task::XInteractionHandler > (
                                 xServiceManager->createInstanceWithContext( OUSTR( "com.sun.star.task.InteractionHandler" ), m_context),
-                                css::uno::UNO_QUERY );
+                                uno::UNO_QUERY );
             if ( m_xInteractionHdl.is() )
                 m_updateInformation->setInteractionHandler( m_xInteractionHdl );
         }
@@ -302,7 +290,7 @@ UpdateDialog::Thread::Thread(
 }
 
 void UpdateDialog::Thread::stop() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
+    uno::Reference< task::XAbortChannel > abort;
     {
         SolarMutexGuard g;
         abort = m_abort;
@@ -317,7 +305,7 @@ void UpdateDialog::Thread::stop() {
 UpdateDialog::Thread::~Thread()
 {
     if ( m_xInteractionHdl.is() )
-        m_updateInformation->setInteractionHandler( css::uno::Reference< css::task::XInteractionHandler > () );
+        m_updateInformation->setInteractionHandler( uno::Reference< task::XInteractionHandler > () );
 }
 
 void UpdateDialog::Thread::execute()
@@ -328,16 +316,16 @@ void UpdateDialog::Thread::execute()
             return;
         }
     }
-    css::uno::Reference<css::deployment::XExtensionManager> extMgr =
-        css::deployment::ExtensionManager::get(m_context);
+    uno::Reference<deployment::XExtensionManager> extMgr =
+        deployment::ExtensionManager::get(m_context);
     
-    std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>, css::uno::Any > > errors;
+    std::vector<std::pair<uno::Reference<deployment::XPackage>, uno::Any > > errors;
 
     dp_misc::UpdateInfoMap updateInfoMap = dp_misc::getOnlineUpdateInfos(
         m_context, extMgr, m_updateInformation, &m_vExtensionList, errors);
 
-    typedef std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>,
-        css::uno::Any> >::const_iterator ITERROR;
+    typedef std::vector<std::pair<uno::Reference<deployment::XPackage>,
+        uno::Any> >::const_iterator ITERROR;
     for (ITERROR ite = errors.begin(); ite != errors.end(); ++ite )
         handleSpecificError(ite->first, ite->second);
 
@@ -356,13 +344,17 @@ void UpdateDialog::Thread::execute()
         rtl::OUString sVersionUser;
         rtl::OUString sVersionShared;
         rtl::OUString sVersionBundled;
-        css::uno::Sequence< css::uno::Reference< css::deployment::XPackage> > extensions;
+        uno::Sequence< uno::Reference< deployment::XPackage> > extensions;
         try {
             extensions = extMgr->getExtensionsWithSameIdentifier(
                 dp_misc::getIdentifier(info.extension), info.extension->getName(),
-                css::uno::Reference<css::ucb::XCommandEnvironment>());
-        } catch (css::lang::IllegalArgumentException& ) {
+                uno::Reference<ucb::XCommandEnvironment>());
+        } catch (lang::IllegalArgumentException& ) {
+            OSL_ASSERT(0);
+            continue;
+        } catch (css::ucb::CommandFailedException& ) {
             OSL_ASSERT(0);
+            continue;
         }
         OSL_ASSERT(extensions.getLength() == 3);
         if (extensions[0].is() )
@@ -379,7 +371,7 @@ void UpdateDialog::Thread::execute()
         dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension(
             bSharedReadOnly, sVersionShared, sVersionBundled, sOnlineVersion);
 
-        css::uno::Reference<css::deployment::XPackage> updateSource;
+        uno::Reference<deployment::XPackage> updateSource;
         if (sourceUser != dp_misc::UPDATE_SOURCE_NONE)
         {
             if (sourceUser == dp_misc::UPDATE_SOURCE_SHARED)
@@ -418,13 +410,13 @@ void UpdateDialog::Thread::execute()
 
 //Parameter package can be null
 void UpdateDialog::Thread::handleSpecificError(
-    css::uno::Reference< css::deployment::XPackage > const & package,
-    css::uno::Any const & exception) const
+    uno::Reference< deployment::XPackage > const & package,
+    uno::Any const & exception) const
 {
     UpdateDialog::SpecificError data;
     if (package.is())
         data.name = package->getDisplayName();
-    css::uno::Exception e;
+    uno::Exception e;
     if (exception >>= e) {
         data.message = e.Message;
     }
@@ -466,7 +458,7 @@ void UpdateDialog::Thread::handleSpecificError(
 /** out_data will only be filled if all dependencies are ok.
  */
 void UpdateDialog::Thread::prepareUpdateData(
-    css::uno::Reference< css::xml::dom::XNode > const & updateInfo,
+    uno::Reference< xml::dom::XNode > const & updateInfo,
     UpdateDialog::DisabledUpdate & out_du,
     dp_gui::UpdateData & out_data) const
 {
@@ -474,7 +466,7 @@ void UpdateDialog::Thread::prepareUpdateData(
         return;
     dp_misc::DescriptionInfoset infoset(m_context, updateInfo);
     OSL_ASSERT(infoset.getVersion().getLength() != 0);
-    css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > > ds(
+    uno::Sequence< uno::Reference< xml::dom::XElement > > ds(
         dp_misc::Dependencies::check(infoset));
 
     out_du.aUpdateInfo = updateInfo;
@@ -497,8 +489,8 @@ void UpdateDialog::Thread::prepareUpdateData(
 }
 
 bool UpdateDialog::Thread::update(
-    UpdateDialog::DisabledUpdate const & du,
-    dp_gui::UpdateData const & data) const
+    UpdateDialog::DisabledUpdate & du,
+    dp_gui::UpdateData & data) const
 {
     bool ret = false;
     if (du.unsatisfiedDependencies.getLength() == 0)
@@ -520,13 +512,14 @@ bool UpdateDialog::Thread::update(
 
 // UpdateDialog ----------------------------------------------------------
 UpdateDialog::UpdateDialog(
-    css::uno::Reference< css::uno::XComponentContext > const & context,
+    uno::Reference< uno::XComponentContext > const & context,
     Window * parent,
-    const std::vector<css::uno::Reference< css::deployment::XPackage > > &vExtensionList,
+    const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList,
     std::vector< dp_gui::UpdateData > * updateData):
     ModalDialog(parent,DpGuiResId(RID_DLG_UPDATE)),
     m_context(context),
     m_checking(this, DpGuiResId(RID_DLG_UPDATE_CHECKING)),
+    m_throbber(this, DpGuiResId(RID_DLG_UPDATE_THROBBER)),
     m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)),
     m_updates(
         *this, DpGuiResId(RID_DLG_UPDATE_UPDATES),
@@ -541,7 +534,7 @@ UpdateDialog::UpdateDialog(
     m_line(this, DpGuiResId(RID_DLG_UPDATE_LINE)),
     m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
     m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
-    m_cancel(this, DpGuiResId(RID_DLG_UPDATE_CANCEL)),
+    m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)),
     m_error(String(DpGuiResId(RID_DLG_UPDATE_ERROR))),
     m_none(String(DpGuiResId(RID_DLG_UPDATE_NONE))),
     m_noInstallable(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
@@ -553,105 +546,116 @@ UpdateDialog::UpdateDialog(
     m_noDependencyCurVer(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
     m_browserbased(String(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
     m_version(String(DpGuiResId(RID_DLG_UPDATE_VERSION))),
+    m_ignoredUpdate(String(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
     m_updateData(*updateData),
     m_thread(
         new UpdateDialog::Thread(
             context, *this, vExtensionList)),
     m_nFirstLineDelta(0),
-    m_nOneLineMissing(0)
+    m_nOneLineMissing(0),
+    m_nLastID(1),
+    m_bModified( false )
     // TODO: check!
 //    ,
 //    m_extensionManagerDialog(extensionManagerDialog)
 {
     OSL_ASSERT(updateData != NULL);
 
-    m_xExtensionManager = css::deployment::ExtensionManager::get( context );
+    m_xExtensionManager = deployment::ExtensionManager::get( context );
 
-    css::uno::Reference< css::awt::XToolkit > toolkit;
+    uno::Reference< awt::XToolkit > toolkit;
     try {
-        toolkit = css::uno::Reference< css::awt::XToolkit >(
-            (css::uno::Reference< css::lang::XMultiComponentFactory >(
+        toolkit = uno::Reference< awt::XToolkit >(
+            (uno::Reference< lang::XMultiComponentFactory >(
                 m_context->getServiceManager(),
-                css::uno::UNO_QUERY_THROW)->
+                uno::UNO_QUERY_THROW)->
              createInstanceWithContext(
                  rtl::OUString(
                      RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")),
                  m_context)),
-            css::uno::UNO_QUERY_THROW);
-    } catch (css::uno::RuntimeException &) {
+            uno::UNO_QUERY_THROW);
+    } catch (uno::RuntimeException &) {
         throw;
-    } catch (css::uno::Exception & e) {
-        throw css::uno::RuntimeException(e.Message, e.Context);
-    }
-    Control c(this, DpGuiResId(RID_DLG_UPDATE_THROBBER));
-    Point pos(c.GetPosPixel());
-    Size size(c.GetSizePixel());
-    try {
-        m_throbber = css::uno::Reference< css::awt::XThrobber >(
-            toolkit->createWindow(
-                css::awt::WindowDescriptor(
-                    css::awt::WindowClass_SIMPLE,
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber")),
-                    GetComponentInterface(), 0,
-                    css::awt::Rectangle(
-                        pos.X(), pos.Y(), size.Width(), size.Height()),
-                    css::awt::WindowAttribute::SHOW)),
-            css::uno::UNO_QUERY_THROW);
-    } catch (css::lang::IllegalArgumentException & e) {
-        throw css::uno::RuntimeException(e.Message, e.Context);
+    } catch (uno::Exception & e) {
+        throw uno::RuntimeException(e.Message, e.Context);
     }
     m_updates.SetSelectHdl(LINK(this, UpdateDialog, selectionHandler));
     m_all.SetToggleHdl(LINK(this, UpdateDialog, allHandler));
     m_ok.SetClickHdl(LINK(this, UpdateDialog, okHandler));
-    m_cancel.SetClickHdl(LINK(this, UpdateDialog, cancelHandler));
+    m_close.SetClickHdl(LINK(this, UpdateDialog, closeHandler));
     if ( ! dp_misc::office_is_running())
         m_help.Disable();
     FreeResource();
 
     initDescription();
+    getIgnoredUpdates();
 }
 
-UpdateDialog::~UpdateDialog() {
-    for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
-        delete static_cast< UpdateDialog::Index const * >(
-            m_updates.GetEntryData(i));
+//------------------------------------------------------------------------------
+UpdateDialog::~UpdateDialog()
+{
+    storeIgnoredUpdates();
+
+    for ( std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() ); i != m_ListboxEntries.end(); ++i )
+    {
+        delete (*i);
+    }
+    for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+    {
+        delete (*i);
     }
 }
 
-BOOL UpdateDialog::Close() {
+//------------------------------------------------------------------------------
+sal_Bool UpdateDialog::Close() {
     m_thread->stop();
     return ModalDialog::Close();
 }
 
 short UpdateDialog::Execute() {
-    m_throbber->start();
+    m_throbber.start();
     m_thread->launch();
     return ModalDialog::Execute();
 }
 
-UpdateDialog::CheckListBox::CheckListBox(
-    UpdateDialog & dialog, ResId const & resource,
-    Image const & normalStaticImage):
-    SvxCheckListBox(
-        &dialog, resource, normalStaticImage),
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
+                                          Image const & normalStaticImage ):
+    SvxCheckListBox( &dialog, resource, normalStaticImage ),
+    m_ignoreUpdate( String( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
+    m_ignoreAllUpdates( String( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
+    m_enableUpdate( String( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
     m_dialog(dialog)
 {}
 
+//------------------------------------------------------------------------------
 UpdateDialog::CheckListBox::~CheckListBox() {}
 
-USHORT UpdateDialog::CheckListBox::getItemCount() const {
-    ULONG i = GetEntryCount();
-    OSL_ASSERT(i <= std::numeric_limits< USHORT >::max());
-    return sal::static_int_cast< USHORT >(i);
+//------------------------------------------------------------------------------
+sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
+    sal_uLong i = GetEntryCount();
+    OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max());
+    return sal::static_int_cast< sal_uInt16 >(i);
 }
 
-void UpdateDialog::CheckListBox::MouseButtonDown(MouseEvent const & event) {
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event )
+{
     // When clicking on a selected entry in an SvxCheckListBox, the entry's
     // checkbox is toggled on mouse button down:
-    SvxCheckListBox::MouseButtonDown(event);
+    SvxCheckListBox::MouseButtonDown( event );
+
+    if ( event.IsRight() )
+    {
+        handlePopupMenu( event.GetPosPixel() );
+    }
+
     m_dialog.enableOk();
 }
 
+//------------------------------------------------------------------------------
 void UpdateDialog::CheckListBox::MouseButtonUp(MouseEvent const & event) {
     // When clicking on an entry's checkbox in an SvxCheckListBox, the entry's
     // checkbox is toggled on mouse button up:
@@ -664,25 +668,82 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) {
     m_dialog.enableOk();
 }
 
-void UpdateDialog::insertItem(
-    rtl::OUString const & name, USHORT position,
-    std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
+{
+    SvListEntry *pData = GetEntry( rPos );
+
+    if ( pData )
+    {
+        sal_uInt16 nEntryPos = GetSelectEntryPos();
+        UpdateDialog::Index * p = static_cast< UpdateDialog::Index * >( GetEntryData( nEntryPos ) );
+
+        if ( ( p->m_eKind == ENABLED_UPDATE ) || ( p->m_eKind == DISABLED_UPDATE ) )
+        {
+            PopupMenu aPopup;
+
+            if ( p->m_bIgnored )
+                aPopup.InsertItem( CMD_ENABLE_UPDATE, m_enableUpdate );
+            else
+            {
+                aPopup.InsertItem( CMD_IGNORE_UPDATE, m_ignoreUpdate );
+                aPopup.InsertItem( CMD_IGNORE_ALL_UPDATES, m_ignoreAllUpdates );
+            }
+
+            sal_uInt16 aCmd = aPopup.Execute( this, rPos );
+            if ( ( aCmd == CMD_IGNORE_UPDATE ) || ( aCmd == CMD_IGNORE_ALL_UPDATES ) )
+            {
+                p->m_bIgnored = true;
+                if ( p->m_eKind == ENABLED_UPDATE )
+                {
+                    RemoveEntry( nEntryPos );
+                    m_dialog.addAdditional( p, SvLBoxButtonKind_disabledCheckbox );
+                }
+                if ( aCmd == CMD_IGNORE_UPDATE )
+                    m_dialog.setIgnoredUpdate( p, true, false );
+                else
+                    m_dialog.setIgnoredUpdate( p, true, true );
+                // TODO: reselect entry to display new description!
+            }
+            else if ( aCmd == CMD_ENABLE_UPDATE )
+            {
+                p->m_bIgnored = false;
+                if ( p->m_eKind == ENABLED_UPDATE )
+                {
+                    RemoveEntry( nEntryPos );
+                    m_dialog.insertItem( p, SvLBoxButtonKind_enabledCheckbox );
+                }
+                m_dialog.setIgnoredUpdate( p, false, false );
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
 {
-    m_updates.InsertEntry(
-        name, position,
-        const_cast< void * >(static_cast< void const * >(index.release())),
-        kind);
-        //TODO #i72487#: UpdateDialog::Index potentially leaks as the exception
-        // behavior of SvxCheckListBox::InsertEntry is unspecified
+    m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind );
+
+    for ( sal_uInt16 i = m_updates.getItemCount(); i != 0 ; )
+    {
+        i -= 1;
+        UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData( i ) );
+        if ( p == pEntry )
+            return i;
+    }
+    OSL_ASSERT(0);
+    return 0;
 }
 
-void UpdateDialog::addAdditional(
-    rtl::OUString const & name, USHORT position,
-    std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind kind )
 {
     m_all.Enable();
-    if (m_all.IsChecked()) {
-        insertItem(name, position, index, kind);
+    if (m_all.IsChecked())
+    {
+        insertItem( index, kind );
         m_update.Enable();
         m_updates.Enable();
         m_description.Enable();
@@ -690,60 +751,80 @@ void UpdateDialog::addAdditional(
     }
 }
 
-void UpdateDialog::addEnabledUpdate(
-    rtl::OUString const & name, dp_gui::UpdateData const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
+                                     dp_gui::UpdateData & data )
 {
-    std::vector< dp_gui::UpdateData >::size_type n = m_enabledUpdates.size();
-    m_enabledUpdates.push_back(data);
-    insertItem(
-        name, sal::static_int_cast< USHORT >(n),
-        UpdateDialog::Index::newEnabledUpdate(n),
-        SvLBoxButtonKind_enabledCheckbox);
-        // position overflow is rather harmless
-    m_updates.CheckEntryPos(sal::static_int_cast< USHORT >(n));
-        //TODO #i72487#: fragile computation; insertItem should instead return
-        // pos
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, m_nLastID, nIndex, name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_enabledUpdates.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    if ( ! isIgnoredUpdate( pEntry ) )
+    {
+        sal_uInt16 nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
+        m_updates.CheckEntryPos( nPos );
+    }
+    else
+        addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
+
     m_update.Enable();
     m_updates.Enable();
     m_description.Enable();
     m_descriptions.Enable();
 }
 
-void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
 {
-    std::vector< UpdateDialog::DisabledUpdate >::size_type n =
-        m_disabledUpdates.size();
-    m_disabledUpdates.push_back(data);
-    addAdditional(
-        data.name, sal::static_int_cast< USHORT >(m_enabledUpdates.size() + n),
-        UpdateDialog::Index::newDisabledUpdate(n),
-        SvLBoxButtonKind_disabledCheckbox);
-        // position overflow is rather harmless
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_disabledUpdates.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    isIgnoredUpdate( pEntry );
+    addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
 }
 
-void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
-    std::vector< UpdateDialog::SpecificError >::size_type n =
-        m_specificErrors.size();
-    m_specificErrors.push_back(data);
-    addAdditional(
-        data.name, LISTBOX_APPEND, UpdateDialog::Index::newSpecificError(n),
-        SvLBoxButtonKind_staticImage);
+//------------------------------------------------------------------------------
+void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
+{
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
+    UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+    data.m_nID = m_nLastID;
+    m_nLastID += 1;
+
+    m_specificErrors.push_back( data );
+    m_ListboxEntries.push_back( pEntry );
+
+    addAdditional( pEntry, SvLBoxButtonKind_staticImage);
 }
 
 void UpdateDialog::checkingDone() {
     m_checking.Hide();
-    m_throbber->stop();
-    css::uno::Reference< css::awt::XWindow >(
-        m_throbber, css::uno::UNO_QUERY_THROW)->setVisible(false);
+    m_throbber.stop();
+    m_throbber.Hide();
     if (m_updates.getItemCount() == 0)
     {
         clearDescription();
         m_description.Enable();
         m_descriptions.Enable();
-        showDescription(
-            ( m_disabledUpdates.empty() && m_generalErrors.empty() && m_specificErrors.empty() )
-                ? m_none : m_noInstallable, false );
+
+        if ( m_disabledUpdates.empty() && m_specificErrors.empty() && m_ignoredUpdates.empty() )
+            showDescription( m_none, false );
+        else
+            showDescription( m_noInstallable, false );
     }
+
     enableOk();
 }
 
@@ -755,7 +836,7 @@ void UpdateDialog::enableOk() {
 
 // *********************************************************************************
 void UpdateDialog::createNotifyJob( bool bPrepareOnly,
-    css::uno::Sequence< css::uno::Sequence< rtl::OUString > > &rItemList )
+    uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList )
 {
     if ( !dp_misc::office_is_running() )
         return;
@@ -763,51 +844,51 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly,
     // notify update check job
     try
     {
-        css::uno::Reference< css::lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-        css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
+        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+        uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
             xFactory->createInstance( OUSTR( "com.sun.star.configuration.ConfigurationProvider" )),
-            css::uno::UNO_QUERY_THROW);
+            uno::UNO_QUERY_THROW);
 
-        css::beans::PropertyValue aProperty;
+        beans::PropertyValue aProperty;
         aProperty.Name  = OUSTR( "nodepath" );
-        aProperty.Value = css::uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
+        aProperty.Value = uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
 
-        css::uno::Sequence< css::uno::Any > aArgumentList( 1 );
-        aArgumentList[0] = css::uno::makeAny( aProperty );
+        uno::Sequence< uno::Any > aArgumentList( 1 );
+        aArgumentList[0] = uno::makeAny( aProperty );
 
-        css::uno::Reference< css::container::XNameAccess > xNameAccess(
+        uno::Reference< container::XNameAccess > xNameAccess(
             xConfigProvider->createInstanceWithArguments(
                 OUSTR("com.sun.star.configuration.ConfigurationAccess"), aArgumentList ),
-            css::uno::UNO_QUERY_THROW );
+            uno::UNO_QUERY_THROW );
 
-        css::util::URL aURL;
+        util::URL aURL;
         xNameAccess->getByName(OUSTR("URL")) >>= aURL.Complete;
 
-        css::uno::Reference < css::util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
-            css::uno::UNO_QUERY_THROW );
+        uno::Reference < util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
+            uno::UNO_QUERY_THROW );
 
         xTransformer->parseStrict(aURL);
 
-        css::uno::Reference < css::frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
-            css::uno::UNO_QUERY_THROW );
-        css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
-            css::uno::UNO_QUERY_THROW );
-        css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
+        uno::Reference < frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
+            uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
+            uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
 
         if( xDispatch.is() )
         {
-            css::uno::Sequence< css::beans::PropertyValue > aPropList(2);
+            uno::Sequence< beans::PropertyValue > aPropList(2);
             aProperty.Name  = OUSTR( "updateList" );
-            aProperty.Value = css::uno::makeAny( rItemList );
+            aProperty.Value = uno::makeAny( rItemList );
             aPropList[0] = aProperty;
             aProperty.Name  = OUSTR( "prepareOnly" );
-            aProperty.Value = css::uno::makeAny( bPrepareOnly );
+            aProperty.Value = uno::makeAny( bPrepareOnly );
             aPropList[1] = aProperty;
 
             xDispatch->dispatch(aURL, aPropList );
         }
     }
-    catch( const css::uno::Exception& e )
+    catch( const uno::Exception& e )
     {
         dp_misc::TRACE( OUSTR("Caught exception: ") 
             + e.Message + OUSTR("\n thread terminated.\n\n"));
@@ -820,26 +901,26 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
     if ( !dp_misc::office_is_running() )
         return;
 
-    css::uno::Sequence< css::uno::Sequence< rtl::OUString > > aItemList;
+    uno::Sequence< uno::Sequence< rtl::OUString > > aItemList;
 
     if ( ! bRecheckOnly )
     {
         sal_Int32 nCount = 0;
         for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i )
         {
-            css::uno::Sequence< rtl::OUString > aItem(2);
+            uno::Sequence< rtl::OUString > aItem(2);
            
             UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i));
     
-            if ( p->kind == ENABLED_UPDATE )
+            if ( p->m_eKind == ENABLED_UPDATE )
             {
-                dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->index.enabledUpdate ];
+                dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->m_nIndex ];
                 aItem[0] = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
     
                 dp_misc::DescriptionInfoset aInfoset( m_context, aUpdData.aUpdateInfo );
                 aItem[1] = aInfoset.getVersion();
             }
-            else if ( p->kind == DISABLED_UPDATE )
+            else if ( p->m_eKind == DISABLED_UPDATE )
                 continue;
             else
                 continue;
@@ -849,6 +930,8 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
             nCount += 1;
         }
     }
+
+    storeIgnoredUpdates();
     createNotifyJob( bPrepareOnly, aItemList );
 }
 
@@ -922,17 +1005,17 @@ void UpdateDialog::clearDescription()
     m_descriptions.SetPosSizePixel( m_aFirstLinePos, m_aFirstLineSize );
 }
 
-bool UpdateDialog::showDescription(css::uno::Reference< css::xml::dom::XNode > const & aUpdateInfo)
+bool UpdateDialog::showDescription(uno::Reference< xml::dom::XNode > const & aUpdateInfo)
 {
     dp_misc::DescriptionInfoset infoset(m_context, aUpdateInfo);
     return showDescription(infoset.getLocalizedPublisherNameAndURL(),
                            infoset.getLocalizedReleaseNotesURL());
 }
 
-bool UpdateDialog::showDescription(css::uno::Reference< css::deployment::XPackage > const & aExtension)
+bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const & aExtension)
 {
     OSL_ASSERT(aExtension.is());
-    css::beans::StringPair pubInfo = aExtension->getPublisherInfo();
+    beans::StringPair pubInfo = aExtension->getPublisherInfo();
     return showDescription(std::make_pair(pubInfo.First, pubInfo.Second),
                            OUSTR(""));
 }
@@ -995,6 +1078,163 @@ bool UpdateDialog::showDescription( const String& rDescription, bool bWithPublis
     return true;
 }
 
+//------------------------------------------------------------------------------
+void UpdateDialog::getIgnoredUpdates()
+{
+    uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+        OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW);
+    beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+    uno::Sequence< uno::Any > args(1);
+    args[0] <<= aValue;
+
+    uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( OUSTR("com.sun.star.configuration.ConfigurationAccess"), args), uno::UNO_QUERY_THROW );
+    uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+
+    for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
+    {
+        ::rtl::OUString aIdentifier = aElementNames[i];
+        ::rtl::OUString aVersion;
+
+        uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+        aPropValue >>= aVersion;
+        IgnoredUpdate *pData = new IgnoredUpdate( aIdentifier, aVersion );
+        m_ignoredUpdates.push_back( pData );
+    }
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::storeIgnoredUpdates()
+{
+    if ( m_bModified && ( m_ignoredUpdates.size() != 0 ) )
+    {
+        uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+            OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW );
+        beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+        uno::Sequence< uno::Any > args(1);
+        args[0] <<= aValue;
+
+        uno::Reference< container::XNameContainer > xNameContainer( xConfig->createInstanceWithArguments(
+            OUSTR("com.sun.star.configuration.ConfigurationUpdateAccess"), args ), uno::UNO_QUERY_THROW );
+
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( xNameContainer->hasByName( (*i)->sExtensionID ) )
+            {
+                if ( (*i)->bRemoved )
+                    xNameContainer->removeByName( (*i)->sExtensionID );
+                else
+                    uno::Reference< beans::XPropertySet >( xNameContainer->getByName( (*i)->sExtensionID ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+            }
+            else if ( ! (*i)->bRemoved )
+            {
+                uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( xNameContainer, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+                elem->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+                xNameContainer->insertByName( (*i)->sExtensionID, uno::Any( elem ) );
+            }
+        }
+    
+        uno::Reference< util::XChangesBatch > xChangesBatch( xNameContainer, uno::UNO_QUERY );
+        if ( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+            xChangesBatch->commitChanges();
+    }
+
+    m_bModified = false;
+}
+
+//------------------------------------------------------------------------------
+bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
+{
+    bool bIsIgnored = false;
+
+    if ( m_ignoredUpdates.size() != 0 )
+    {
+        rtl::OUString aExtensionID;
+        rtl::OUString aVersion;
+
+        if ( index->m_eKind == ENABLED_UPDATE )
+        {
+            dp_gui::UpdateData aUpdData = m_enabledUpdates[ index->m_nIndex ];
+            aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+            aVersion = aUpdData.updateVersion;
+        }
+        else if ( index->m_eKind == DISABLED_UPDATE )
+        {
+            DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ];
+            dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+            ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+            if ( aID )
+                aExtensionID = *aID;
+            aVersion = aInfoset.getVersion();
+        }
+
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( (*i)->sExtensionID == aExtensionID )
+            {
+                if ( ( (*i)->sVersion.getLength() == 0 ) || ( (*i)->sVersion == aVersion ) )
+                {
+                    bIsIgnored = true;
+                    index->m_bIgnored = true;
+                }
+                else // when we find another update of an ignored version, we will remove the old one to keep the ignored list small
+                    (*i)->bRemoved = true;
+                break;
+            }
+        }
+    }
+
+    return bIsIgnored;
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll )
+{
+    rtl::OUString aExtensionID;
+    rtl::OUString aVersion;
+
+    m_bModified = true;
+
+    if ( pIndex->m_eKind == ENABLED_UPDATE )
+    {
+        dp_gui::UpdateData aUpdData = m_enabledUpdates[ pIndex->m_nIndex ];
+        aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+        if ( !bIgnoreAll )
+            aVersion = aUpdData.updateVersion;
+    }
+    else if ( pIndex->m_eKind == DISABLED_UPDATE )
+    {
+        DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ];
+        dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+        ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+        if ( aID )
+            aExtensionID = *aID;
+        if ( !bIgnoreAll )
+            aVersion = aInfoset.getVersion();
+    }
+
+    if ( aExtensionID.getLength() )
+    {
+        bool bFound = false;
+        for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+        {
+            if ( (*i)->sExtensionID == aExtensionID )
+            {
+                (*i)->sVersion = aVersion;
+                (*i)->bRemoved = !bIgnore;
+                bFound = true;
+                break;
+            }
+        }
+        if ( bIgnore && !bFound )
+        {
+            IgnoredUpdate *pData = new IgnoredUpdate( aExtensionID, aVersion );
+            m_ignoredUpdates.push_back( pData );
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+
 IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
 {
     rtl::OUStringBuffer b;
@@ -1003,38 +1243,32 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
         m_updates.GetEntryData(m_updates.GetSelectEntryPos()));
     clearDescription();
 
-    if (p != NULL)
+    if ( p != NULL )
     {
-        //When the index is greater or equal than the amount of enabled updates then the "Show all"
-        //button is probably checked. Then we show first all enabled and then the disabled 
-        //updates. 
-        USHORT pos = m_updates.GetSelectEntryPos();
-        const std::vector< dp_gui::UpdateData >::size_type sizeEnabled = 
-            m_enabledUpdates.size();
-        const std::vector< UpdateDialog::DisabledUpdate >::size_type sizeDisabled =
-            m_disabledUpdates.size();
-        if (pos < sizeEnabled)
-        {
-            if (m_enabledUpdates[pos].aUpdateSource.is())
-                bInserted = showDescription(m_enabledUpdates[pos].aUpdateSource);
-            else
-                bInserted = showDescription(m_enabledUpdates[pos].aUpdateInfo);
-        }
-        else if (pos >= sizeEnabled 
-            && pos < (sizeEnabled + sizeDisabled))
-            bInserted = showDescription(m_disabledUpdates[pos - sizeEnabled].aUpdateInfo);
+        sal_uInt16 pos = p->m_nIndex;
 
-        switch (p->kind)
+        switch (p->m_eKind)
         {
             case ENABLED_UPDATE:
             {
-                b.append(m_noDescription);
+                if ( m_enabledUpdates[ pos ].aUpdateSource.is() )
+                    bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateSource );
+                else
+                    bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateInfo );
+
+                if ( p->m_bIgnored )
+                    b.append( m_ignoredUpdate );
+
                 break;
             }
             case DISABLED_UPDATE:
             {
-                UpdateDialog::DisabledUpdate & data = m_disabledUpdates[
-                    p->index.disabledUpdate];
+                bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo );
+
+                if ( p->m_bIgnored )
+                    b.append( m_ignoredUpdate );
+
+                UpdateDialog::DisabledUpdate & data = m_disabledUpdates[ pos ];
                 if (data.unsatisfiedDependencies.getLength() != 0)
                 {
                     // create error string for version mismatch
@@ -1078,23 +1312,12 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
                 }
                 break;
             }
-            case GENERAL_ERROR:
-            {
-                rtl::OUString & msg = m_generalErrors[p->index.generalError];
-                b.append(m_failure);
-                b.append(LF);
-                b.append(msg.getLength() == 0 ? m_unknownError : msg);
-                break;
-            }
             case SPECIFIC_ERROR:
             {
-                UpdateDialog::SpecificError & data = m_specificErrors[
-                    p->index.specificError];
+                UpdateDialog::SpecificError & data = m_specificErrors[ pos ];
                 b.append(m_failure);
                 b.append(LF);
-                b.append(
-                    data.message.getLength() == 0
-                    ? m_unknownError : data.message);
+                b.append( data.message.getLength() == 0 ? m_unknownError : data.message );
                 break;
             }
             default:
@@ -1103,56 +1326,37 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
         }
     }
 
+    if ( b.getLength() == 0 )
+        b.append( m_noDescription );
+
     showDescription( b.makeStringAndClear(), bInserted );
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) {
-    if (m_all.IsChecked()) {
+IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
+{
+    if (m_all.IsChecked())
+    {
         m_update.Enable();
         m_updates.Enable();
         m_description.Enable();
         m_descriptions.Enable();
-        std::vector< UpdateDialog::DisabledUpdate >::size_type n1 = 0;
-        for (std::vector< UpdateDialog::DisabledUpdate >::iterator i(
-                 m_disabledUpdates.begin());
-             i != m_disabledUpdates.end(); ++i)
-        {
-            insertItem(
-                i->name, LISTBOX_APPEND,
-                UpdateDialog::Index::newDisabledUpdate(n1++),
-                SvLBoxButtonKind_disabledCheckbox);
-        }
-        std::vector< rtl::OUString >::size_type n2 = 0;
-        for (std::vector< rtl::OUString >::iterator i(m_generalErrors.begin());
-             i != m_generalErrors.end(); ++i)
+
+        for (std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() );
+             i != m_ListboxEntries.end(); ++i )
         {
-            insertItem(
-                m_error, LISTBOX_APPEND,
-                UpdateDialog::Index::newGeneralError(n2++),
-                SvLBoxButtonKind_staticImage);
+            if ( (*i)->m_bIgnored || ( (*i)->m_eKind != ENABLED_UPDATE ) )
+                insertItem( (*i), SvLBoxButtonKind_disabledCheckbox );
         }
-        std::vector< UpdateDialog::SpecificError >::size_type n3 = 0;
-        for (std::vector< UpdateDialog::SpecificError >::iterator i(
-                 m_specificErrors.begin());
-             i != m_specificErrors.end(); ++i)
+    }
+    else
+    {
+        for ( sal_uInt16 i = 0; i < m_updates.getItemCount(); )
         {
-            insertItem(
-                i->name, LISTBOX_APPEND,
-                UpdateDialog::Index::newSpecificError(n3++),
-                SvLBoxButtonKind_staticImage);
-        }
-    } else {
-        for (USHORT i = 0; i < m_updates.getItemCount();) {
-            UpdateDialog::Index const * p =
-                static_cast< UpdateDialog::Index const * >(
-                    m_updates.GetEntryData(i));
-            if (p->kind != ENABLED_UPDATE) {
+            UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(i) );
+            if ( p->m_bIgnored || ( p->m_eKind != ENABLED_UPDATE ) )
+            {
                 m_updates.RemoveEntry(i);
-                    //TODO #i72487#: UpdateDialog::Index potentially leaks as
-                    // SvxCheckListBox::RemoveEntry's exception behavior is
-                    // unspecified
-                delete p;
             } else {
                 ++i;
             }
@@ -1185,12 +1389,12 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
     }
 
     
-    for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
+    for (sal_uInt16 i = 0; i < m_updates.getItemCount(); ++i) {
         UpdateDialog::Index const * p =
             static_cast< UpdateDialog::Index const * >(
                 m_updates.GetEntryData(i));
-        if (p->kind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
-            m_updateData.push_back(m_enabledUpdates[p->index.enabledUpdate]);
+        if (p->m_eKind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
+            m_updateData.push_back( m_enabledUpdates[ p->m_nIndex ] );
         }
     }
 
@@ -1198,7 +1402,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, cancelHandler, void *, EMPTYARG) {
+IMPL_LINK(UpdateDialog, closeHandler, void *, EMPTYARG) {
     m_thread->stop();
     EndDialog(RET_CANCEL);
     return 0;
@@ -1214,15 +1418,15 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
 
     try
     {
-        css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+        uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
             m_context->getServiceManager()->createInstanceWithContext(
                 OUSTR( "com.sun.star.system.SystemShellExecute" ),
-                m_context), css::uno::UNO_QUERY_THROW);
-        //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
+                m_context), uno::UNO_QUERY_THROW);
+        //throws lang::IllegalArgumentException, system::SystemShellExecuteException
         xSystemShellExecute->execute(
-            sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS);
+                                     sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
     }
-    catch (css::uno::Exception& )
+    catch (uno::Exception& )
     {
     }
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 7fde4f7724..d8fc455600 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -45,6 +45,7 @@
 #include "vcl/dialog.hxx"
 #include "vcl/fixed.hxx"
 #include <svtools/fixedhyper.hxx>
+#include <vcl/throbber.hxx>
 
 #include "descedit.hxx"
 #include "dp_gui_updatedata.hxx"
@@ -58,7 +59,6 @@ class ResId;
 class Window;
 
 namespace com { namespace sun { namespace star {
-    namespace awt { class XThrobber; }
     namespace deployment { class XExtensionManager;
                            class XPackage; }
     namespace uno { class XComponentContext; }
@@ -97,7 +97,7 @@ public:
 
     ~UpdateDialog();
 
-    virtual BOOL Close();
+    virtual sal_Bool Close();
 
     virtual short Execute();
 
@@ -111,8 +111,7 @@ private:
     
     struct DisabledUpdate;
     struct SpecificError;
-    union IndexUnion;
-    friend union IndexUnion;
+    struct IgnoredUpdate;
     struct Index;
     friend struct Index;
     class Thread;
@@ -126,44 +125,43 @@ private:
 
         virtual ~CheckListBox();
 
-        USHORT getItemCount() const;
+        sal_uInt16 getItemCount() const;
 
     private:
         CheckListBox(UpdateDialog::CheckListBox &); // not defined
         void operator =(UpdateDialog::CheckListBox &); // not defined
 
         virtual void MouseButtonDown(MouseEvent const & event);
-
         virtual void MouseButtonUp(MouseEvent const & event);
-
         virtual void KeyInput(KeyEvent const & event);
 
+        void handlePopupMenu( const Point &rPos );
+
+        rtl::OUString m_ignoreUpdate;
+        rtl::OUString m_ignoreAllUpdates;
+        rtl::OUString m_enableUpdate;
         UpdateDialog & m_dialog;
     };
 
 
     friend class CheckListBox;
 
-    void insertItem(
-        rtl::OUString const & name, USHORT position,
-        std::auto_ptr< UpdateDialog::Index const > index,
-        SvLBoxButtonKind kind);
+    sal_uInt16 insertItem( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+    void addAdditional( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+    bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
+    void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll );
 
-    void addAdditional(
-        rtl::OUString const & name, USHORT position,
-        std::auto_ptr< UpdateDialog::Index const > index,
-        SvLBoxButtonKind kind);
-
-    void addEnabledUpdate(
-        rtl::OUString const & name, dp_gui::UpdateData const & data);
-
-    void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-    void addSpecificError(UpdateDialog::SpecificError const & data);
+    void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data );
+    void addDisabledUpdate( UpdateDialog::DisabledUpdate & data );
+    void addSpecificError( UpdateDialog::SpecificError & data );
 
     void checkingDone();
 
     void enableOk();
 
+    void getIgnoredUpdates();
+    void storeIgnoredUpdates();
+
     void initDescription();
     void clearDescription();
     bool showDescription(::com::sun::star::uno::Reference<
@@ -178,13 +176,13 @@ private:
     DECL_LINK(selectionHandler, void *);
     DECL_LINK(allHandler, void *);
     DECL_LINK(okHandler, void *);
-    DECL_LINK(cancelHandler, void *);
+    DECL_LINK(closeHandler, void *);
     DECL_LINK(hyperlink_clicked, svt::FixedHyperlink *);
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
         m_context;
     FixedText m_checking;
-    com::sun::star::uno::Reference< com::sun::star::awt::XThrobber > m_throbber;
+    Throbber m_throbber;
     FixedText m_update;
     UpdateDialog::CheckListBox m_updates;
     CheckBox m_all;
@@ -197,7 +195,7 @@ private:
     FixedLine m_line;
     HelpButton m_help;
     PushButton m_ok;
-    CancelButton m_cancel;
+    PushButton m_close;
     rtl::OUString m_error;
     rtl::OUString m_none;
     rtl::OUString m_noInstallable;
@@ -209,18 +207,22 @@ private:
     rtl::OUString m_noDependencyCurVer;
     rtl::OUString m_browserbased;
     rtl::OUString m_version;
+    rtl::OUString m_ignoredUpdate;
     std::vector< dp_gui::UpdateData > m_enabledUpdates;
     std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates;
-    std::vector< rtl::OUString > m_generalErrors;
     std::vector< UpdateDialog::SpecificError > m_specificErrors;
+    std::vector< UpdateDialog::IgnoredUpdate* > m_ignoredUpdates;
+    std::vector< Index* > m_ListboxEntries;
     std::vector< dp_gui::UpdateData > & m_updateData;
     rtl::Reference< UpdateDialog::Thread > m_thread;
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
 
-    Point m_aFirstLinePos;
-    Size m_aFirstLineSize;
-    long m_nFirstLineDelta;
-    long m_nOneLineMissing;
+    Point   m_aFirstLinePos;
+    Size    m_aFirstLineSize;
+    long    m_nFirstLineDelta;
+    long    m_nOneLineMissing;
+    sal_uInt16  m_nLastID;
+    bool    m_bModified;
 };
 
 }
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index a7fb03a9b7..c8f7a26c1e 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -60,11 +60,11 @@ ModalDialog RID_DLG_UPDATE {
         Right = TRUE;
         NoLabel = TRUE;
     };
-    Control RID_DLG_UPDATE_THROBBER {
+    FixedImage RID_DLG_UPDATE_THROBBER {
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_FIXEDTEXT_HEIGHT,
             RSC_SP_DLG_INNERBORDER_TOP);
-        Size = MAP_APPFONT(RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT);
+        Size = MAP_APPFONT(RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT + 1);
     };
     FixedText RID_DLG_UPDATE_UPDATE {
         Disable = TRUE;
@@ -86,6 +86,7 @@ ModalDialog RID_DLG_UPDATE {
         TabStop = TRUE;
     };
     CheckBox RID_DLG_UPDATE_ALL {
+        HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL";
         Disable = TRUE;
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT,
@@ -150,6 +151,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "Release Notes";
     };
     MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS {
+        HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS";
         Disable = TRUE;
         Border = TRUE;
         Pos = MAP_APPFONT(
@@ -183,6 +185,7 @@ ModalDialog RID_DLG_UPDATE {
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
     };
     PushButton RID_DLG_UPDATE_OK {
+        HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK";
         Disable = TRUE;
         Pos = MAP_APPFONT(
             (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH -
@@ -196,7 +199,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "~Install";
         DefButton = TRUE;
     };
-    CancelButton RID_DLG_UPDATE_CANCEL {
+    PushButton RID_DLG_UPDATE_CLOSE {
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH,
             (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
@@ -205,6 +208,7 @@ ModalDialog RID_DLG_UPDATE {
              RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
              RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
         Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
+        Text[en-US] = "Close";
     };
 
     Image RID_DLG_UPDATE_NORMALALERT {
@@ -219,7 +223,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "No new updates are available.";
     };
     String RID_DLG_UPDATE_NOINSTALLABLE {
-        Text[en-US] = "No installable updates are available. To see all updates, mark the check box 'Show all updates'.";
+        Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.";
     };
     String RID_DLG_UPDATE_FAILURE {
         Text[en-US] = "An error occurred:";
@@ -228,7 +232,7 @@ ModalDialog RID_DLG_UPDATE {
         Text[en-US] = "Unknown error.";
     };
     String RID_DLG_UPDATE_NODESCRIPTION {
-        Text[en-US] = "No descriptions available for this extension.";
+        Text[en-US] = "No more details are available for this update.";
     };
     String RID_DLG_UPDATE_NOINSTALL {
         Text[en-US] = "The extension cannot be updated because:";
@@ -242,10 +246,21 @@ ModalDialog RID_DLG_UPDATE {
     String RID_DLG_UPDATE_BROWSERBASED {
         Text[en-US] = "browser based update";
     };
-    
     String RID_DLG_UPDATE_VERSION {
         Text[en-US] = "Version";
     };
+    String RID_DLG_UPDATE_IGNORE {
+        Text[en-US] = "Ignore this Update";
+    };
+    String RID_DLG_UPDATE_IGNORE_ALL {
+        Text[en-US] = "Ignore all Updates";
+    };
+    String RID_DLG_UPDATE_ENABLE {
+        Text[en-US] = "Enable Updates";
+    };
+    String RID_DLG_UPDATE_IGNORED_UPDATE {
+        Text[en-US] = "This update will be ignored.\n";
+    };
 };
 
 WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8f26b574ac..4130470877 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -262,14 +262,14 @@ UpdateInstallDialog::UpdateInstallDialog(
     m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx );
 
     m_cancel.SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler));
-    m_mle_info.EnableCursor(FALSE);
+    m_mle_info.EnableCursor(sal_False);
     if ( ! dp_misc::office_is_running())
         m_help.Disable();
 }
 
 UpdateInstallDialog::~UpdateInstallDialog() {}
 
-BOOL UpdateInstallDialog::Close() 
+sal_Bool UpdateInstallDialog::Close() 
 {
     m_thread->stop();
     return ModalDialog::Close();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index a23488bfbf..390e55f9d0 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -80,7 +80,7 @@ public:
 
     ~UpdateInstallDialog();
 
-    BOOL Close();
+    sal_Bool Close();
     virtual short Execute();
 
 private:
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 7c43817754..a3ded83be1 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -90,6 +90,7 @@ ModalDialog RID_DLG_UPDATEINSTALL {
     };
 
     MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO {
+        HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO";
         Pos = MAP_APPFONT(
             RSC_SP_DLG_INNERBORDER_LEFT,
             RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT  +
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index cc6edc0ad7..cc6edc0ad7 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index c835c11abb..907fb66890 100644..100755
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -63,7 +63,7 @@ namespace dp_gui {
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -73,9 +73,9 @@ public:
 
     void ScrollDown( ScrollType eScroll );
 
-    BOOL IsEndReached() const;
-    BOOL EndReached() const { return mbEndReached; }
-    void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+    sal_Bool IsEndReached() const;
+    sal_Bool EndReached() const { return mbEndReached; }
+    void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
 
     void SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
     const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -146,20 +146,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
         pScroll->DoScrollAction( eScroll );
 }
 
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
 {
-    BOOL bEndReached;
+    sal_Bool bEndReached;
 
     ExtTextView*    pView = GetTextView();
     ExtTextEngine*  pEdit = GetTextEngine();
-    ULONG           nHeight = pEdit->GetTextHeight();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
     Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
     Point           aBottom( 0, aOutSize.Height() );
 
-    if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
-        bEndReached = TRUE;
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
     else
-        bEndReached = FALSE;
+        bEndReached = sal_False;
 
     return bEndReached;
 }
@@ -168,8 +168,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        BOOL    bLastVal = EndReached();
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
 
         if ( nId == TEXT_HINT_PARAINSERTED )
         {
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index ec63ffbfbb..ec63ffbfbb 100644..100755
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 509761c5b1..73ca837925 100644..100755
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -103,3 +103,11 @@ RESLIB1IMAGES=	$(PRJ)$/res
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/deploymentgui.component
+
+$(MISC)/deploymentgui.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 3fa3d22679..3fa3d22679 100644..100755
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index f31d5f3084..f31d5f3084 100644..100755
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 78b824c87a..78b824c87a 100644..100755
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index f7b6b1f120..f7b6b1f120 100644..100755
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 3aca761c2d..3aca761c2d 100644..100755
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index bbf6d5274b..bbf6d5274b 100644..100755
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 829a6bb96b..829a6bb96b 100644..100755
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index bc2cee1df2..bc2cee1df2 100644..100755
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index 8af038413a..8af038413a 100644..100755
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index f9773efa1a..f9773efa1a 100644..100755
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 96fd049207..bd3a4fac82 100644..100755
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -40,12 +40,12 @@
 namespace dp_misc {
 
 //==============================================================================
-ResId getResId( USHORT id );
+ResId getResId( sal_uInt16 id );
 
 //==============================================================================
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( USHORT id );
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( sal_uInt16 id );
 
-template <typename Unique, USHORT id>
+template <typename Unique, sal_uInt16 id>
 struct StaticResourceString :
         public ::rtl::StaticWithInit<const ::rtl::OUString, Unique> {
     const ::rtl::OUString operator () () { return getResourceString(id); }
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index c2fcdcd7e0..c2fcdcd7e0 100644..100755
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 6d0c790263..6d0c790263 100644..100755
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index c3491a7451..c3491a7451 100644..100755
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index 376df332fb..376df332fb 100644..100755
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index ce494b4496..877379ad73 100644..100755
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -109,3 +109,11 @@ RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/deployment.component
+
+$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        deployment.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt deployment.component
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 94a16f6230..94a16f6230 100644..100755
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 569e4b7852..569e4b7852 100644..100755
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 78448cfa17..78448cfa17 100644..100755
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 59349c469a..59349c469a 100644..100755
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 1b84fea78f..bcaa123e76 100644..100755
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -178,13 +178,9 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
     ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >(getMutex()),
     m_xContext( xContext )
 {
-    Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
-        deploy::thePackageManagerFactory::get(m_xContext));
-    m_userRepository = xPackageManagerFactory->getPackageManager(OUSTR("user"));
-    m_sharedRepository = xPackageManagerFactory->getPackageManager(OUSTR("shared"));
-    m_bundledRepository = xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
-    m_tmpRepository =  xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
-
+    m_xPackageManagerFactory = deploy::thePackageManagerFactory::get(m_xContext);
+    OSL_ASSERT(m_xPackageManagerFactory.is());
+    
     m_repositoryNames.push_back(OUSTR("user"));
     m_repositoryNames.push_back(OUSTR("shared"));
     m_repositoryNames.push_back(OUSTR("bundled"));
@@ -196,6 +192,23 @@ ExtensionManager::~ExtensionManager()
 {
 }
 
+Reference<deploy::XPackageManager> ExtensionManager::getUserRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("user"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getSharedRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("shared"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getBundledRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
+}
+Reference<deploy::XPackageManager>  ExtensionManager::getTmpRepository()
+{
+    return m_xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+}
+
 Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
     throw (uno::RuntimeException)
 {
@@ -208,11 +221,11 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository)
 {
     Reference<deploy::XPackageManager> xPackageManager;
     if (repository.equals(OUSTR("user")))
-        xPackageManager = m_userRepository;
+        xPackageManager = getUserRepository();
     else if (repository.equals(OUSTR("shared")))
-        xPackageManager = m_sharedRepository;
+        xPackageManager = getSharedRepository();
     else if (repository.equals(OUSTR("bundled")))
-        xPackageManager = m_bundledRepository;
+        xPackageManager = getBundledRepository();
     else
         throw lang::IllegalArgumentException(
             OUSTR("No valid repository name provided."),
@@ -281,7 +294,7 @@ void ExtensionManager::addExtensionsToMap(
 {
     ::std::list<Reference<deploy::XPackage> > extensionList;
     Reference<deploy::XPackageManager> lRepos[] = {
-        m_userRepository, m_sharedRepository, m_bundledRepository };
+          getUserRepository(), getSharedRepository(), getBundledRepository() };
     for (int i(0); i != SAL_N_ELEMENTS(lRepos); ++i)
     {
         Reference<deploy::XPackage> xPackage;
@@ -492,7 +505,7 @@ Reference<deploy::XPackage> ExtensionManager::backupExtension(
 
     if (xOldExtension.is())
     {
-        xBackup = m_tmpRepository->addPackage(
+        xBackup = getTmpRepository()->addPackage(
             xOldExtension->getURL(), uno::Sequence<beans::NamedValue>(),
             OUString(), Reference<task::XAbortChannel>(), tmpCmdEnv);
 
@@ -513,7 +526,7 @@ uno::Sequence< Reference<deploy::XPackageTypeInfo> >
 ExtensionManager::getSupportedPackageTypes()
     throw (uno::RuntimeException)
 {
-    return m_userRepository->getSupportedPackageTypes();
+    return getUserRepository()->getSupportedPackageTypes();
 }
 //Do some necessary checks and user interaction. This function does not
 //aquire the extension manager mutex and that mutex must not be aquired
@@ -633,9 +646,9 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
     //Determine the repository to use
     Reference<deploy::XPackageManager> xPackageManager;
     if (repository.equals(OUSTR("user")))
-        xPackageManager = m_userRepository;
+        xPackageManager = getUserRepository();
     else if (repository.equals(OUSTR("shared")))
-        xPackageManager = m_sharedRepository;
+        xPackageManager = getSharedRepository();
     else
         throw lang::IllegalArgumentException(
             OUSTR("No valid repository name provided."),
@@ -648,7 +661,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
         getTempExtension(url, xAbortChannel, xCmdEnv);
     //Make sure the extension is removed from the tmp repository in case
     //of an exception
-    ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, m_tmpRepository);
+    ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, getTmpRepository());
     const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension);
     const OUString sFileName = xTmpExtension->getName();
     Reference<deploy::XPackage> xOldExtension;
@@ -692,8 +705,8 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
                         //the xTmpExtension
                         //no command environment supplied, only this class shall interact
                         //with the user!
-                        xExtensionBackup = m_tmpRepository->importExtension(
-                            xOldExtension, Reference<task::XAbortChannel>(),
+                        xExtensionBackup = getTmpRepository()->importExtension(
+                            xOldExtension, Reference<task::XAbortChannel>(), 
                             Reference<ucb::XCommandEnvironment>());
                         tmpExtensionRemoveGuard.reset(xExtensionBackup);
                         //xTmpExtension will later be used to check the dependencies
@@ -845,9 +858,9 @@ void ExtensionManager::removeExtension(
     {
 //Determine the repository to use
         if (repository.equals(OUSTR("user")))
-            xPackageManager = m_userRepository;
+            xPackageManager = getUserRepository();
         else if (repository.equals(OUSTR("shared")))
-            xPackageManager = m_sharedRepository;
+            xPackageManager = getSharedRepository();
         else
             throw lang::IllegalArgumentException(
                 OUSTR("No valid repository name provided."),
@@ -906,8 +919,8 @@ void ExtensionManager::removeExtension(
                     identifier, fileName, bUserDisabled, false,
                     Reference<task::XAbortChannel>(),
                     tmpCmdEnv);
-
-                m_tmpRepository->removePackage(
+                
+                getTmpRepository()->removePackage(
                     dp_misc::getIdentifier(xExtensionBackup),
                     xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
                 fireModified();
@@ -920,7 +933,7 @@ void ExtensionManager::removeExtension(
     }
 
     if (xExtensionBackup.is())
-        m_tmpRepository->removePackage(
+        getTmpRepository()->removePackage(
             dp_misc::getIdentifier(xExtensionBackup),
             xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
 }
@@ -1147,13 +1160,13 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
         id2extensions mapExt;
 
         uno::Sequence<Reference<deploy::XPackage> > userExt =
-            m_userRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getUserRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, userExt, OUSTR("user"));
         uno::Sequence<Reference<deploy::XPackage> > sharedExt =
-            m_sharedRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getSharedRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, sharedExt, OUSTR("shared"));
         uno::Sequence<Reference<deploy::XPackage> > bundledExt =
-            m_bundledRepository->getDeployedPackages(xAbort, xCmdEnv);
+            getBundledRepository()->getDeployedPackages(xAbort, xCmdEnv);
         addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
 
         //copy the values of the map to a vector for sorting
@@ -1223,7 +1236,7 @@ void ExtensionManager::reinstallDeployedExtensions(
                 const OUString id =  dp_misc::getIdentifier(extensions[ pos ]);
                 const OUString fileName = extensions[ pos ]->getName();
                 OSL_ASSERT(id.getLength());
-                activateExtension(id, fileName, false, false, xAbortChannel, xCmdEnv );
+                activateExtension(id, fileName, false, true, xAbortChannel, xCmdEnv );
             }
             catch (lang::DisposedException &)
             {
@@ -1247,6 +1260,64 @@ void ExtensionManager::reinstallDeployedExtensions(
     }
 }
 
+/** Works on the bundled repository. That is using the variables
+    BUNDLED_EXTENSIONS and BUNDLED_EXTENSIONS_USER.
+ */
+void ExtensionManager::synchronizeBundledPrereg(
+    Reference<task::XAbortChannel> const & xAbortChannel,
+    Reference<ucb::XCommandEnvironment> const & xCmdEnv )
+    throw (deploy::DeploymentException,
+           uno::RuntimeException)
+{
+    try
+    {
+        String sSynchronizingBundled(StrSyncRepository::get());
+        sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
+        dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
+
+        Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
+            deploy::thePackageManagerFactory::get(m_xContext));
+
+        Reference<deploy::XPackageManager> xMgr =
+            xPackageManagerFactory->getPackageManager(OUSTR("bundled_prereg"));
+        xMgr->synchronize(xAbortChannel, xCmdEnv);
+        progressBundled.update(OUSTR("\n\n"));
+
+        uno::Sequence<Reference<deploy::XPackage> > extensions = xMgr->getDeployedPackages(
+            xAbortChannel, xCmdEnv);
+        try
+        {
+            for (sal_Int32 i = 0; i < extensions.getLength(); i++)
+            {
+                extensions[i]->registerPackage(true, xAbortChannel, xCmdEnv);
+            }
+        }
+        catch (...)
+        {
+            OSL_ASSERT(0);
+        }
+        OUString lastSyncBundled(RTL_CONSTASCII_USTRINGPARAM(
+                                     "$BUNDLED_EXTENSIONS_PREREG/lastsynchronized"));
+        writeLastModified(lastSyncBundled, xCmdEnv);
+
+    } catch (deploy::DeploymentException& ) {
+        throw;
+    } catch (ucb::CommandFailedException & ) {
+        throw;
+    } catch (ucb::CommandAbortedException & ) {
+        throw;
+    } catch (lang::IllegalArgumentException &) {
+        throw;
+    } catch (uno::RuntimeException &) {
+        throw;
+    } catch (...) {
+        uno::Any exc = ::cppu::getCaughtException();
+        throw deploy::DeploymentException(
+            OUSTR("Extension Manager: exception in synchronize"),
+            static_cast<OWeakObject*>(this), exc);
+    }
+}
+
 sal_Bool ExtensionManager::synchronize(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1264,13 +1335,13 @@ sal_Bool ExtensionManager::synchronize(
         String sSynchronizingShared(StrSyncRepository::get());
         sSynchronizingShared.SearchAndReplaceAllAscii( "%NAME", OUSTR("shared"));
         dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
-        bModified = m_sharedRepository->synchronize(xAbortChannel, xCmdEnv);
+        bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv);
         progressShared.update(OUSTR("\n\n"));
 
         String sSynchronizingBundled(StrSyncRepository::get());
         sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
         dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
-        bModified |= m_bundledRepository->synchronize(xAbortChannel, xCmdEnv);
+        bModified |= getBundledRepository()->synchronize(xAbortChannel, xCmdEnv);
         progressBundled.update(OUSTR("\n\n"));
 
         //Always determine the active extension. This is necessary for the
@@ -1397,7 +1468,7 @@ Reference<deploy::XPackage> ExtensionManager::getTempExtension(
 
 {
     Reference<ucb::XCommandEnvironment> tmpCmdEnvA(new TmpRepositoryCommandEnv());
-    Reference<deploy::XPackage> xTmpPackage = m_tmpRepository->addPackage(
+    Reference<deploy::XPackage> xTmpPackage = getTmpRepository()->addPackage(
         url, uno::Sequence<beans::NamedValue>(),OUString(), xAbortChannel, tmpCmdEnvA);
     if (!xTmpPackage.is())
     {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 6bb8fa6e63..7adcf0a201 100644..100755
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -200,6 +200,12 @@ public:
                css::lang::IllegalArgumentException,
                css::uno::RuntimeException);
 
+    virtual void SAL_CALL synchronizeBundledPrereg(
+        css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
+        throw (css::deployment::DeploymentException,
+               css::uno::RuntimeException);
+
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
     getExtensionsWithUnacceptedLicenses(
         ::rtl::OUString const & repository,
@@ -224,12 +230,8 @@ private:
     };
 
     css::uno::Reference< css::uno::XComponentContext> m_xContext;
-
-    css::uno::Reference<css::deployment::XPackageManager> m_userRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_sharedRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository;
-    css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository;
-
+    css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
+    
     //only to be used within addExtension
     ::osl::Mutex m_addMutex;
     /* contains the names of all repositories (except tmp) in order of there
@@ -238,6 +240,11 @@ private:
      */
     ::std::list< ::rtl::OUString > m_repositoryNames;
 
+    css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getBundledRepository();
+    css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
+
     bool isUserDisabled(::rtl::OUString const & identifier,
                         ::rtl::OUString const & filename);
 
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 323e3e4fed..9b8c5be6cc 100644..100755
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -41,9 +41,8 @@
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/registry/XRegistryKey.hpp"
 #include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
 #include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
 #include "com/sun/star/xml/dom/XElement.hpp"
 #include "com/sun/star/xml/dom/XNode.hpp"
 
@@ -72,9 +71,8 @@ namespace xml = com::sun::star::xml ;
 namespace dp_info {
 
 class PackageInformationProvider : 
-    public ::cppu::WeakImplHelper3< deployment::XPackageInformationProvider, 
-                                    css_ucb::XCommandEnvironment,
-                                    task::XInteractionHandler >
+        public ::cppu::WeakImplHelper1< deployment::XPackageInformationProvider >
+                                  
 {
     public:
                  PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
@@ -83,16 +81,6 @@ class PackageInformationProvider :
     static uno::Sequence< rtl::OUString > getServiceNames();
     static rtl::OUString getImplName();
 
-    // XInteractionHandler
-    virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& Request )
-                                throw( uno::RuntimeException );
-    // XCommandEnvironment
-    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw ( uno::RuntimeException ) { return static_cast<task::XInteractionHandler*>(this); };
-
-    virtual uno::Reference< css_ucb::XProgressHandler > SAL_CALL getProgressHandler()
-        throw ( uno::RuntimeException ) { return uno::Reference< css_ucb::XProgressHandler >(); }; 
-        
     // XPackageInformationProvider
     virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId )
         throw ( uno::RuntimeException );
@@ -126,17 +114,6 @@ PackageInformationProvider::~PackageInformationProvider()
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL PackageInformationProvider::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
-    throw (uno::RuntimeException)
-{
-    uno::Sequence< uno::Reference< task::XInteractionContinuation > > xContinuations = rRequest->getContinuations();
-    if ( xContinuations.getLength() == 1 )
-    {
-        xContinuations[0]->select();
-    }
-}
-
-//------------------------------------------------------------------------------
 rtl::OUString PackageInformationProvider::getPackageLocation(
     const rtl::OUString & repository,
     const rtl::OUString& _rExtensionId )
@@ -151,7 +128,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation(
                 xManager->getDeployedExtensions(
                     repository,
                     uno::Reference< task::XAbortChannel >(),
-                    static_cast < XCommandEnvironment *> (this) ) );
+                    uno::Reference< css_ucb::XCommandEnvironment > () ) );
 
         for ( int pos = packages.getLength(); pos--; )
         {
@@ -321,7 +298,7 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi
     const uno::Sequence< uno::Sequence< uno::Reference<deployment::XPackage > > >
         allExt =  mgr->getAllExtensions(
             uno::Reference< task::XAbortChannel >(),
-            static_cast < XCommandEnvironment *> (this) );
+            uno::Reference< css_ucb::XCommandEnvironment > () );
     
     uno::Sequence< uno::Sequence< rtl::OUString > > retList;
     
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index ff1ec5591b..aab3dddb00 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -371,6 +371,24 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
         //No stamp file. We assume that bundled is always readonly. It must not be 
         //modified from ExtensionManager but only by the installer
     }
+    else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") )) {
+        //This is a bundled repository but the registration data
+        //is in the brand layer: share/prereg
+        //It is special because the registration data are copied at the first startup
+        //into the user installation. The processed help and xcu files are not
+        //copied. Instead the backenddb.xml for the help backend references the help
+        //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The
+        //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file
+        //which contain the replacement for %origin%.
+        that->m_activePackages = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
+        that->m_registrationData = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG");
+        that->m_registryCache = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry");
+        logFile = OUSTR(
+            "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
+    }
     else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) {
         that->m_activePackages = OUSTR(
             "vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
@@ -950,6 +968,8 @@ void PackageManagerImpl::removePackage(
                 contentRemoved.writeStream( xData, true /* replace existing */ );
             }
             m_activePackagesDB->erase( id, fileName ); // to be removed upon next start
+            //remove any cached data hold by the backend
+            m_xRegistry->packageRemoved(xPackage->getURL(), xPackage->getPackageType()->getMediaType());
         }
         try_dispose( xPackage );
 
@@ -990,7 +1010,8 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
     //The bundled extensions are not contained in an additional folder
     //with a unique name. data.temporaryName contains already the
     //UTF8 encoded folder name. See PackageManagerImpl::synchronize
-    if (!m_context.equals(OUSTR("bundled")))
+    if (!m_context.equals(OUSTR("bundled")) 
+        && !m_context.equals(OUSTR("bundled_prereg")))
     {
         buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") );
         buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar,
@@ -1342,6 +1363,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
     Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
 { 
     bool bModified = false;
+    OSL_ASSERT(!m_context.equals(OUSTR("user")));
+
     ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
     //check if the folder exist at all. The shared extension folder
     //may not exist for a normal user.
@@ -1367,8 +1390,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
             //The temporary folders of user and shared have an '_' at then end.
             //But the name in ActivePackages.temporaryName is saved without.
             OUString title2 = title;
-            bool bNotBundled = !m_context.equals(OUSTR("bundled"));
-            if (bNotBundled)
+            bool bShared = m_context.equals(OUSTR("shared"));
+            if (bShared)
             {
                 OSL_ASSERT(title2[title2.getLength() -1] == '_');
                 title2 = title2.copy(0, title2.getLength() -1);
@@ -1390,7 +1413,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                 // an added extension
                 OUString url(m_activePackages_expanded + OUSTR("/") + titleEncoded);
                 OUString sExtFolder;
-                if (bNotBundled) //that is, shared
+                if (bShared) //that is, shared
                 {
                     //Check if the extension was not "deleted" already which is indicated
                     //by a xxx.tmpremoved file
@@ -1412,7 +1435,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                     ActivePackages::Data dbData;
 
                     dbData.temporaryName = titleEncoded;
-                    if (bNotBundled)
+                    if (bShared)
                         dbData.fileName = sExtFolder;
                     else
                         dbData.fileName = title;
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index fa4a9078ac..fa4a9078ac 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index 3dd89f57cf..3dd89f57cf 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
index 7430a8cab0..7430a8cab0 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.src
+++ b/desktop/source/deployment/manager/dp_manager.src
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 707a061392..707a061392 100644..100755
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index 6477c5aad0..6477c5aad0 100644..100755
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index 70f6d9f62f..70f6d9f62f 100644..100755
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 4dc6405e34..4dc6405e34 100644..100755
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index ce403181ab..ce403181ab 100644..100755
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 5c945df6b2..5c945df6b2 100644..100755
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 6444193a77..6444193a77 100644..100755
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index f9fb809b51..f9fb809b51 100644..100755
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 57cc3bf2e7..57cc3bf2e7 100644..100755
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 520b2a5699..520b2a5699 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc
index e5d749fc62..e5d749fc62 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.hrc
+++ b/desktop/source/deployment/misc/dp_misc.hrc
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 4c36644ec2..a6d1441d2a 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -32,7 +32,7 @@ String RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN {
 };
 
 String RID_DEPLYOMENT_DEPENDENCIES_MIN {
-    Text[en-US] = "Extensions requires at least %PRODUCTNAME %VERSION";
+    Text[en-US] = "Extension requires at least %PRODUCTNAME %VERSION";
 };
 
 String RID_DEPLYOMENT_DEPENDENCIES_MAX {
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index b86e6508e5..b86e6508e5 100644..100755
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index eb92eabba3..c8c57ac01d 100644..100755
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -72,14 +72,14 @@ osl::Mutex s_mutex;
 } // anon namespace
 
 //==============================================================================
-ResId getResId( USHORT id )
+ResId getResId( sal_uInt16 id )
 {
     const osl::MutexGuard guard( s_mutex );
     return ResId( id, *DeploymentResMgr::get() );
 }
 
 //==============================================================================
-String getResourceString( USHORT id )
+String getResourceString( sal_uInt16 id )
 {
     const osl::MutexGuard guard( s_mutex );
     String ret( ResId( id, *DeploymentResMgr::get() ) );
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index cbfde03cc8..cbfde03cc8 100644..100755
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index b22c4c5a60..b22c4c5a60 100644..100755
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index c999d32cc2..c999d32cc2 100644..100755
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index 3e4bd68cb4..3e4bd68cb4 100644..100755
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 09f06638ec..b103fe46ef 100644..100755
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -83,26 +83,29 @@ OUString ComponentBackendDb::getKeyElementName()
 void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
 {
     try{
-        Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
-        writeSimpleElement(OUSTR("java-type-library"),
-                           OUString::valueOf((sal_Bool) data.javaTypeLibrary),
-                           componentNode);
-                           
-        writeSimpleList(
-            data.implementationNames,
-            OUSTR("implementation-names"),
-            OUSTR("name"),
-            componentNode);
-
-        writeVectorOfPair(
-            data.singletons,
-            OUSTR("singletons"),
-            OUSTR("item"),
-            OUSTR("key"),
-            OUSTR("value"),
-            componentNode);
-        
-        save();
+        if (!activateEntry(url))
+        {
+            Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
+            writeSimpleElement(OUSTR("java-type-library"),
+                               OUString::valueOf((sal_Bool) data.javaTypeLibrary),
+                               componentNode);
+            
+            writeSimpleList(
+                data.implementationNames,
+                OUSTR("implementation-names"),
+                OUSTR("name"),
+                componentNode);
+            
+            writeVectorOfPair(
+                data.singletons,
+                OUSTR("singletons"),
+                OUSTR("item"),
+                OUSTR("key"),
+                OUSTR("value"),
+                componentNode);
+            
+            save();
+        }
     }
     catch(css::uno::Exception &)
     {
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 8af1ad6396..8af1ad6396 100644..100755
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index bd26a2c1a9..d5633f0995 100644..100755
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -66,6 +66,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using ::rtl::OUString;
+namespace css = com::sun::star;
 
 namespace dp_registry {
 namespace backend {
@@ -122,14 +123,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         BackendImpl * getMyBackend() const;
 
         const OUString m_loader;
-        ComponentBackendDb::Data m_registeredComponentsDb;
-        
+
         enum reg {
             REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED, REG_MAYBE_REGISTERED
         } m_registered;
         
-        Reference<loader::XImplementationLoader> getComponentInfo(
-            t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+        void getComponentInfo(
+            ComponentBackendDb::Data * data,
+            std::vector< css::uno::Reference< css::uno::XInterface > > *
+                factories,
             Reference<XComponentContext> const & xContext );
         
         virtual void SAL_CALL disposing();
@@ -161,7 +163,31 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             OUString const & identifier);
     };
     friend class ComponentPackageImpl;
-    
+
+    class ComponentsPackageImpl : public ::dp_registry::backend::Package
+    {
+        BackendImpl * getMyBackend() const;
+
+        // Package
+        virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
+            ::osl::ResettableMutexGuard & guard,
+            ::rtl::Reference<AbortChannel> const & abortChannel,
+            Reference<XCommandEnvironment> const & xCmdEnv );
+        virtual void processPackage_(
+            ::osl::ResettableMutexGuard & guard,
+            bool registerPackage,
+            bool startup,
+            ::rtl::Reference<AbortChannel> const & abortChannel,
+            Reference<XCommandEnvironment> const & xCmdEnv );
+    public:
+        ComponentsPackageImpl(
+            ::rtl::Reference<PackageRegistryBackend> const & myBackend,
+            OUString const & url, OUString const & name,
+            Reference<deployment::XPackageTypeInfo> const & xPackageType,
+            bool bRemoved, OUString const & identifier);
+    };
+    friend class ComponentsPackageImpl;
+
     class TypelibraryPackageImpl : public ::dp_registry::backend::Package
     {
         BackendImpl * getMyBackend() const;
@@ -231,8 +257,20 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     
     t_stringlist m_jar_typelibs;
     t_stringlist m_rdb_typelibs;
-    t_stringlist & getTypelibs( bool jar ) {
-        return jar ? m_jar_typelibs : m_rdb_typelibs;
+    t_stringlist m_components;
+
+    enum RcItem { RCITEM_JAR_TYPELIB, RCITEM_RDB_TYPELIB, RCITEM_COMPONENTS };
+
+    t_stringlist & getRcItemList( RcItem kind ) {
+        switch (kind)
+        {
+        case RCITEM_JAR_TYPELIB:
+            return m_jar_typelibs;
+        case RCITEM_RDB_TYPELIB:
+            return m_rdb_typelibs;
+        default: // case RCITEM_COMPONENTS
+            return m_components;
+        }
     }
     
     bool m_unorc_inited;
@@ -254,6 +292,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xPythonComponentTypeInfo;
+    const Reference<deployment::XPackageTypeInfo> m_xComponentsTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xRDBTypelibTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xJavaTypelibTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
@@ -268,8 +307,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     std::auto_ptr<ComponentBackendDb> m_backendDb;
 
     void addDataToDb(OUString const & url, ComponentBackendDb::Data const & data);
-    void deleteDataFromDb(OUString const & url);
     ComponentBackendDb::Data readDataFromDb(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
 
 
     //These rdbs are for writing new service entries. The rdb files are copies 
@@ -291,14 +330,32 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         OUString const & id, Reference<XInterface> const & xObject );
     void releaseObject( OUString const & id );
     
-    bool addToUnoRc( bool jarFile, OUString const & url,
+    bool addToUnoRc( RcItem kind, OUString const & url,
                      Reference<XCommandEnvironment> const & xCmdEnv );
-    bool removeFromUnoRc( bool jarFile, OUString const & url,
+    bool removeFromUnoRc( RcItem kind, OUString const & url,
                           Reference<XCommandEnvironment> const & xCmdEnv );
-    bool hasInUnoRc( bool jarFile, OUString const & url );
+    bool hasInUnoRc( RcItem kind, OUString const & url );
+
+    css::uno::Reference< css::registry::XRegistryKey > openRegistryKey(
+        css::uno::Reference< css::registry::XRegistryKey > const & base,
+        rtl::OUString const & path);
+
+    void extractComponentData(
+        css::uno::Reference< css::uno::XComponentContext > const & context,
+        css::uno::Reference< css::registry::XRegistryKey > const & registry,
+        ComponentBackendDb::Data * data,
+        std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+        css::uno::Reference< css::loader::XImplementationLoader > const *
+            componentLoader,
+        rtl::OUString const * componentUrl);
+
+    void componentLiveInsertion(
+        ComponentBackendDb::Data const & data,
+        std::vector< css::uno::Reference< css::uno::XInterface > > const &
+            factories);
+
+    void componentLiveRemoval(ComponentBackendDb::Data const & data);
 
-    
-    
 public:
     BackendImpl( Sequence<Any> const & args,
                  Reference<XComponentContext> const & xComponentContext );
@@ -307,6 +364,10 @@ public:
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
 
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
+
     using PackageRegistryBackend::disposing;
 
     //Will be called from ComponentPackageImpl
@@ -328,13 +389,7 @@ BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
                xPackageType, bRemoved, identifier),
       m_loader( loader ),
       m_registered( REG_UNINIT )
-{
-    if (bRemoved)
-    {
-        m_registeredComponentsDb = getMyBackend()->readDataFromDb(url);
-    }
-}
-
+{}
 
 const Reference<registry::XSimpleRegistry>
 BackendImpl::ComponentPackageImpl::getRDB() const
@@ -570,6 +625,12 @@ BackendImpl::BackendImpl(
                                       getResourceString(
                                           RID_STR_PYTHON_COMPONENT),
                                       RID_IMG_COMPONENT ) ),
+      m_xComponentsTypeInfo( new Package::TypeInfo(
+                                 OUSTR("application/"
+                                       "vnd.sun.star.uno-components"),
+                                 OUSTR("*.components"),
+                                 getResourceString(RID_STR_COMPONENTS),
+                                 RID_IMG_COMPONENT ) ),
       m_xRDBTypelibTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.uno-typelibrary;"
@@ -589,8 +650,9 @@ BackendImpl::BackendImpl(
     m_typeInfos[ 0 ] = m_xDynComponentTypeInfo;
     m_typeInfos[ 1 ] = m_xJavaComponentTypeInfo;
     m_typeInfos[ 2 ] = m_xPythonComponentTypeInfo;
-    m_typeInfos[ 3 ] = m_xRDBTypelibTypeInfo;
-    m_typeInfos[ 4 ] = m_xJavaTypelibTypeInfo;
+    m_typeInfos[ 3 ] = m_xComponentsTypeInfo;
+    m_typeInfos[ 4 ] = m_xRDBTypelibTypeInfo;
+    m_typeInfos[ 5 ] = m_xJavaTypelibTypeInfo;
     
     const Reference<XCommandEnvironment> xCmdEnv;
     
@@ -632,12 +694,6 @@ void BackendImpl::addDataToDb(
         m_backendDb->addEntry(url, data);
 }
 
-void BackendImpl::deleteDataFromDb(OUString const & url)
-{
-    if (m_backendDb.get())
-        m_backendDb->removeEntry(url);
-}
-
 ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
 {
     ComponentBackendDb::Data data;
@@ -646,6 +702,12 @@ ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
     return data;
 }
 
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+    if (m_backendDb.get())
+        m_backendDb->revokeEntry(url);
+}
+
 // XPackageRegistry
 //______________________________________________________________________________
 Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -654,6 +716,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
     return m_typeInfos;
 }
 
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
+
 // PackageRegistryBackend
 //______________________________________________________________________________
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -769,6 +839,17 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
                 }
             }
             else if (subType.EqualsIgnoreCaseAscii(
+                         "vnd.sun.star.uno-components"))
+            {
+                INetContentTypeParameter const * param = params.find(
+                    ByteString("platform") );
+                if (param == 0 || platform_fits( param->m_sValue )) {
+                    return new BackendImpl::ComponentsPackageImpl(
+                        this, url, name, m_xComponentsTypeInfo, bRemoved,
+                        identifier);
+                }
+            }
+            else if (subType.EqualsIgnoreCaseAscii(
                          "vnd.sun.star.uno-typelibrary"))
             {
                 INetContentTypeParameter const * param = params.find(
@@ -861,11 +942,50 @@ void BackendImpl::unorc_verify_init(
                 while (index >= 0);
             }
             if (readLine( &line, OUSTR("UNO_SERVICES="), ucb_content,
-                          RTL_TEXTENCODING_UTF8 )) {
-                sal_Int32 start = sizeof ("UNO_SERVICES=?$ORIGIN/") - 1;
-                sal_Int32 sep = line.indexOf( ' ', start );
-                OSL_ASSERT( sep > 0 );
-                m_commonRDB_RO = line.copy( start, sep - start );
+                          RTL_TEXTENCODING_UTF8 ))
+            {
+                // The UNO_SERVICES line always has the BNF form
+                //  "UNO_SERVICES="
+                //  ("?$ORIGIN/" <common-rdb>)?                        -- first
+                //  "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}"?       -- second
+                //  ("?" ("BUNDLED_EXTENSIONS" |                       -- third
+                //   "UNO_SHARED_PACKAGES_CACHE" | "UNO_USER_PACKAGES_CACHE")
+                //   ...)*
+                // so can unambiguously be split into its thre parts:
+                int state = 1;
+                for (sal_Int32 i = RTL_CONSTASCII_LENGTH("UNO_SERVICES=");
+                     i >= 0;)
+                {
+                    rtl::OUString token(line.getToken(0, ' ', i));
+                    if (token.getLength() != 0)
+                    {
+                        if (state == 1 &&
+                            token.matchAsciiL(
+                                RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/")))
+                        {
+                            m_commonRDB_RO = token.copy(
+                                RTL_CONSTASCII_LENGTH("?$ORIGIN/"));
+                            state = 2;
+                        }
+                        else if (state <= 2 &&
+                                 token.equalsAsciiL(
+                                     RTL_CONSTASCII_STRINGPARAM(
+                                         "${$ORIGIN/${_OS}_${_ARCH}rc:"
+                                         "UNO_SERVICES}")))
+                        {
+                            state = 3;
+                        }
+                        else
+                        {
+                            if (token[0] == '?')
+                            {
+                                token = token.copy(1);
+                            }
+                            m_components.push_back(token);
+                            state = 3;
+                        }
+                    }
+                }
             }
             
             // native rc:
@@ -941,16 +1061,27 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
     OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO);
     OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO);
 
-    if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0)
+    if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0 ||
+        !m_components.empty())
     {
-        buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=?$ORIGIN/") );
-        buf.append( ::rtl::OUStringToOString(
-                        sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+        buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=") );
+        bool space = false;
+        if (sCommonRDB.getLength() > 0)
+        {
+            buf.append( RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/") );
+            buf.append( ::rtl::OUStringToOString(
+                            sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+            space = true;
+        }
         if (sNativeRDB.getLength() > 0)
         {
+            if (space)
+            {
+                buf.append(' ');
+            }
             buf.append( RTL_CONSTASCII_STRINGPARAM(
-                            " ${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
-            buf.append(LF);
+                            "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
+            space = true;
             
             // write native rc:
             ::rtl::OStringBuffer buf2;
@@ -972,6 +1103,18 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
                 xCmdEnv );
             ucb_content.writeStream( xData, true /* replace existing */ );
         }
+        for (t_stringlist::iterator i(m_components.begin());
+             i != m_components.end(); ++i)
+        {
+            if (space)
+            {
+                buf.append(' ');
+            }
+            buf.append('?');
+            buf.append(rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
+            space = true;
+        }
+        buf.append(LF);
     }
     
     // write unorc:
@@ -988,13 +1131,13 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
 }
 
 //______________________________________________________________________________
-bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
+bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
                               Reference<XCommandEnvironment> const & xCmdEnv )
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    t_stringlist & rSet = getTypelibs(jarFile);
+    t_stringlist & rSet = getRcItemList(kind);
     if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
         rSet.push_front( rcterm ); // prepend to list, thus overriding
         // write immediately:
@@ -1008,13 +1151,13 @@ bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
 
 //______________________________________________________________________________
 bool BackendImpl::removeFromUnoRc(
-    bool jarFile, OUString const & url_,
+    RcItem kind, OUString const & url_,
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    getTypelibs(jarFile).remove( rcterm );
+    getRcItemList(kind).remove( rcterm );
     // write immediately:
     m_unorc_modified = true;
     unorc_flush( xCmdEnv );
@@ -1023,22 +1166,215 @@ bool BackendImpl::removeFromUnoRc(
 
 //______________________________________________________________________________
 bool BackendImpl::hasInUnoRc(
-    bool jarFile, OUString const & url_ )
+    RcItem kind, OUString const & url_ )
 {   
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
-    t_stringlist const & rSet = getTypelibs(jarFile);
+    t_stringlist const & rSet = getRcItemList(kind);
     return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
 }
 
+css::uno::Reference< css::registry::XRegistryKey > BackendImpl::openRegistryKey(
+    css::uno::Reference< css::registry::XRegistryKey > const & base,
+    rtl::OUString const & path)
+{
+    OSL_ASSERT(base.is());
+    css::uno::Reference< css::registry::XRegistryKey > key(base->openKey(path));
+    if (!key.is()) {
+        throw css::deployment::DeploymentException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("missing registry entry ")) +
+             path + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" under ")) +
+             base->getKeyName()),
+            static_cast< OWeakObject * >(this), Any());
+    }
+    return key;
+}
+
+void BackendImpl::extractComponentData(
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    css::uno::Reference< css::registry::XRegistryKey > const & registry,
+    ComponentBackendDb::Data * data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+    css::uno::Reference< css::loader::XImplementationLoader > const *
+        componentLoader,
+    rtl::OUString const * componentUrl)
+{
+    OSL_ASSERT(context.is() && registry.is() && data != 0 && factories != 0);
+    rtl::OUString registryName(registry->getKeyName());
+    sal_Int32 prefix = registryName.getLength();
+    if (!registryName.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) {
+        prefix += RTL_CONSTASCII_LENGTH("/");
+    }
+    css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+        keys(registry->openKeys());
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    for (sal_Int32 i = 0; i < keys.getLength(); ++i) {
+        rtl::OUString name(keys[i]->getKeyName().copy(prefix));
+        data->implementationNames.push_back(name);
+        css::uno::Reference< css::registry::XRegistryKey > singletons(
+            keys[i]->openKey(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SINGLETONS"))));
+        if (singletons.is()) {
+            sal_Int32 prefix2 = keys[i]->getKeyName().getLength() +
+                RTL_CONSTASCII_LENGTH("/UNO/SINGLETONS/");
+            css::uno::Sequence<
+                css::uno::Reference< css::registry::XRegistryKey > >
+                singletonKeys(singletons->openKeys());
+            for (sal_Int32 j = 0; j < singletonKeys.getLength(); ++j) {
+                data->singletons.push_back(
+                    std::pair< rtl::OUString, rtl::OUString >(
+                        singletonKeys[j]->getKeyName().copy(prefix2), name));
+            }
+        }
+        css::uno::Reference< css::loader::XImplementationLoader > loader;
+        if (componentLoader == 0) {
+            rtl::OUString activator(
+                openRegistryKey(
+                    keys[i],
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")))->
+                getAsciiValue());
+            loader.set(
+                smgr->createInstanceWithContext(activator, context),
+                css::uno::UNO_QUERY);
+            if (!loader.is()) {
+                throw css::deployment::DeploymentException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "cannot instantiate loader ")) +
+                     activator),
+                    static_cast< OWeakObject * >(this), Any());
+            }
+        } else {
+            OSL_ASSERT(componentLoader->is());
+            loader = *componentLoader;
+        }
+        factories->push_back(
+            loader->activate(
+                name, rtl::OUString(),
+                (componentUrl == 0
+                 ? (openRegistryKey(
+                        keys[i],
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION")))->
+                    getAsciiValue())
+                 : *componentUrl),
+                keys[i]));
+    }
+}
+
+void BackendImpl::componentLiveInsertion(
+    ComponentBackendDb::Data const & data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > const &
+        factories)
+{
+    css::uno::Reference< css::container::XSet > set(
+        getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    std::vector< css::uno::Reference< css::uno::XInterface > >::const_iterator
+        factory(factories.begin());
+    for (t_stringlist::const_iterator i(data.implementationNames.begin());
+         i != data.implementationNames.end(); ++i)
+    {
+        try {
+            set->insert(css::uno::Any(*factory++));
+        } catch (container::ElementExistException &) {
+            OSL_TRACE(
+                "implementation %s already registered",
+                rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr());
+        }
+    }
+    if (!data.singletons.empty()) {
+        css::uno::Reference< css::container::XNameContainer >
+            rootContext(
+                getComponentContext()->getValueByName(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+                css::uno::UNO_QUERY);
+        if (rootContext.is()) {
+            for (t_stringpairvec::const_iterator i(data.singletons.begin());
+                 i != data.singletons.end(); ++i)
+            {
+                rtl::OUString name(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+                    i->first);
+                try {
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+                } catch (container::NoSuchElementException &) {}
+                try {
+                    rootContext->insertByName(
+                        (name +
+                         rtl::OUString(
+                             RTL_CONSTASCII_USTRINGPARAM("/service"))),
+                        css::uno::Any(i->second));
+                } catch (container::ElementExistException &) {
+                    rootContext->replaceByName(
+                        (name +
+                         rtl::OUString(
+                             RTL_CONSTASCII_USTRINGPARAM("/service"))),
+                        css::uno::Any(i->second));
+                }
+                try {
+                    rootContext->insertByName(name, css::uno::Any());
+                } catch (container::ElementExistException &) {
+                    OSL_TRACE(
+                        "singleton %s already registered",
+                        rtl::OUStringToOString(
+                            i->first, RTL_TEXTENCODING_UTF8).getStr());
+                    rootContext->replaceByName(name, css::uno::Any());
+                }
+            }
+        }
+    }
+}
+
+void BackendImpl::componentLiveRemoval(ComponentBackendDb::Data const & data) {
+    css::uno::Reference< css::container::XSet > set(
+        getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+    for (t_stringlist::const_iterator i(data.implementationNames.begin());
+         i != data.implementationNames.end(); ++i)
+    {
+        try {
+            set->remove(css::uno::Any(*i));
+        } catch (css::container::NoSuchElementException &) {
+            // ignore if factory has not been live deployed
+        }
+    }
+    if (!data.singletons.empty()) {
+        css::uno::Reference< css::container::XNameContainer > rootContext(
+            getComponentContext()->getValueByName(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+            css::uno::UNO_QUERY);
+        if (rootContext.is()) {
+            for (t_stringpairvec::const_iterator i(data.singletons.begin());
+                 i != data.singletons.end(); ++i)
+            {
+                rtl::OUString name(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+                    i->first);
+                try {
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+                    rootContext->removeByName(
+                        name +
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/service")));
+                    rootContext->removeByName(name);
+                } catch (container::NoSuchElementException &) {}
+            }
+        }
+    }
+}
+
 //______________________________________________________________________________
 void BackendImpl::releaseObject( OUString const & id )
 {
     const ::osl::MutexGuard guard( getMutex() );
-    if ( m_backendObjects.erase( id ) != 1 )
-    {
-        OSL_ASSERT( false );
-    }
+    m_backendObjects.erase( id );
 }
 
 //______________________________________________________________________________
@@ -1121,66 +1457,45 @@ Reference<XComponentContext> raise_uno_process(
 }
 
 //------------------------------------------------------------------------------
-Reference<loader::XImplementationLoader>
-BackendImpl::ComponentPackageImpl::getComponentInfo(
-    t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+void BackendImpl::ComponentPackageImpl::getComponentInfo(
+    ComponentBackendDb::Data * data,
+    std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
     Reference<XComponentContext> const & xContext )
 {
     const Reference<loader::XImplementationLoader> xLoader(
         xContext->getServiceManager()->createInstanceWithContext(
             m_loader, xContext ), UNO_QUERY );
     if (! xLoader.is())
-        return Reference<loader::XImplementationLoader>();
+    {
+        throw css::deployment::DeploymentException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot instantiate loader ")) +
+             m_loader),
+            static_cast< OWeakObject * >(this), Any());
+    }
     
     // HACK: highly dependent on stoc/source/servicemanager
     //       and stoc/source/implreg implementation which rely on the same
     //       services.rdb format!
-    
+    //       .../UNO/LOCATION and .../UNO/ACTIVATOR appear not to be written by
+    //       writeRegistryInfo, however, but are knwon, fixed values here, so
+    //       can be passed into extractComponentData
+    rtl::OUString url(getURL());
     const Reference<registry::XSimpleRegistry> xMemReg(
         xContext->getServiceManager()->createInstanceWithContext(
             OUSTR("com.sun.star.registry.SimpleRegistry"), xContext ),
         UNO_QUERY_THROW );
     xMemReg->open( OUString() /* in mem */, false, true );
-    xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), getURL() );
-    
-    const Sequence< Reference<registry::XRegistryKey> > keys(
-        xMemReg->getRootKey()->openKeys() );
-    for ( sal_Int32 pos = keys.getLength(); pos--; )
-    {
-        Reference<registry::XRegistryKey> const & xImplKey = keys[ pos ];
-        const OUString implName(
-            xImplKey->getKeyName().copy( 1 /*leading slash*/ ) );
-        
-        // check for singletons:
-        const Reference<registry::XRegistryKey> xSingletonKey(
-            xImplKey->openKey( OUSTR("UNO/SINGLETONS") ) );
-        if (xSingletonKey.is() && xSingletonKey->isValid())
-        {
-            const Sequence< Reference<registry::XRegistryKey> > singletonKeys(
-                xSingletonKey->openKeys() );
-            for ( sal_Int32 i = singletonKeys.getLength(); i--; )
-            {
-                Reference<registry::XRegistryKey> const & xSingleton =
-                    singletonKeys[ i ];
-                pSingletons->push_back(
-                    ::std::pair<OUString, OUString>(
-                        xSingleton->getKeyName().copy(
-                            implName.getLength() +
-                            sizeof ("//UNO/SINGLETONS/") - 1 ),
-                        xSingleton->getStringValue() ) );
-            }
-        }
-        else
-        {
-            pImplNames->push_back( implName );
-        }
-    }
-    
-    return xLoader;
+    xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), url );
+    getMyBackend()->extractComponentData(
+        xContext, xMemReg->getRootKey(), data, factories, &xLoader, &url);
 }
 
 // Package
 //______________________________________________________________________________
+//We could use here BackendImpl::hasActiveEntry. However, this check is just as well.
+//And it also shows the problem if another extension has overwritten an implementation
+//entry, because it contains the same service implementation
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::ComponentPackageImpl::isRegistered_(
     ::osl::ResettableMutexGuard &,
@@ -1266,224 +1581,75 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
     ::rtl::Reference<AbortChannel> const & abortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
-    BackendImpl * that = getMyBackend();  
-    
- 
-    const bool java = m_loader.equalsAsciiL(
-        RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2") );
-    const OUString url( getURL() );
-    bool isJavaTypelib;
-    if (m_bRemoved)
-        isJavaTypelib = m_registeredComponentsDb.javaTypeLibrary;
-    else
-        isJavaTypelib = java &&
-            !jarManifestHeaderPresent( url, OUSTR("UNO-Type-Path"), xCmdEnv );
-
-    ComponentBackendDb::Data data;
-    data.javaTypeLibrary = isJavaTypelib;
-    if (doRegisterPackage)
-    {        
-        Reference <uno::XComponentContext> context(that->getComponentContext());
-        if (! startup)
-        {
-            context.set(
-                that->getObject( url ), UNO_QUERY );
-            
-            if (! context.is()) {
+    BackendImpl * that = getMyBackend();
+    rtl::OUString url(getURL());
+    if (doRegisterPackage) {
+        ComponentBackendDb::Data data;
+        css::uno::Reference< css::uno::XComponentContext > context;
+        if (startup) {
+            context = that->getComponentContext();
+        } else {
+            context.set(that->getObject(url), css::uno::UNO_QUERY);
+            if (!context.is()) {
                 context.set(
-                    that->insertObject( url, raise_uno_process(
-                                            that->getComponentContext(),
-                                            abortChannel ) ),
-                    UNO_QUERY_THROW );
+                    that->insertObject(
+                        url,
+                        raise_uno_process(
+                            that->getComponentContext(), abortChannel)),
+                    css::uno::UNO_QUERY_THROW);
             }
         }
-        
-        const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() );
-        const Reference<registry::XImplementationRegistration> xImplReg(
+        css::uno::Reference< css::registry::XImplementationRegistration>(
             context->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.registry.ImplementationRegistration"),
-                context ), UNO_QUERY_THROW );
-
-        xImplReg->registerImplementation( m_loader, url, xServicesRDB );
-        //only write to unorc if registration was successful.
-        //It may fail if there is no suitable java.
-        if (isJavaTypelib)
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.registry.ImplementationRegistration")),
+                context),
+            css::uno::UNO_QUERY_THROW)->registerImplementation(
+                m_loader, url, getRDB());
+        // Only write to unorc after successful registration; it may fail if
+        // there is no suitable java
+        if (m_loader.equalsAsciiL(
+                RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2")) &&
+            !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv))
         {
-            that->addToUnoRc( java, url, xCmdEnv );
+            that->addToUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
             data.javaTypeLibrary = true;
         }
-
-        t_stringlist implNames;
-        t_stringpairvec singletons;
-         const Reference<loader::XImplementationLoader> xLoader(
-            getComponentInfo( &implNames, &singletons, context ) );
-        data.implementationNames = implNames;
-        data.singletons = singletons;
-
-        if (!startup)
-        {
-            // factories live insertion:
-            const Reference<container::XSet> xSet(
-                that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
-            for ( t_stringlist::const_iterator iPos( implNames.begin() );
-                  iPos != implNames.end(); ++iPos )
-            {
-                checkAborted( abortChannel );    
-                OUString const & implName = *iPos;
-                // activate factory:
-                const Reference<XInterface> xFactory(
-                    xLoader->activate(
-                        implName, OUString(), url,
-                        xServicesRDB->getRootKey()->openKey(
-                            OUSTR("/IMPLEMENTATIONS/") + implName ) ) );
-                try {
-                    xSet->insert( Any(xFactory) );
-                } // ignore if factory has already been inserted:
-                catch (container::ElementExistException &) {
-                    OSL_ENSURE( 0, "### factory already registered?" );
-                }
-            }
-        
-            if (! singletons.empty())
-            {
-                // singletons live insertion:
-                const Reference<container::XNameContainer> xRootContext(
-                    that->getComponentContext()->getValueByName(
-                        OUSTR("_root") ), UNO_QUERY );
-                if (xRootContext.is())
-                {
-                    for ( t_stringpairvec::const_iterator iPos(
-                              singletons.begin() );
-                          iPos != singletons.end(); ++iPos )
-                    {
-                        ::std::pair<OUString, OUString> const & sp = *iPos;
-                        const OUString name( OUSTR("/singletons/") + sp.first );
-                        // assure no arguments:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/arguments"));
-                        } catch (container::NoSuchElementException &) {}
-                        // used service:
-                        try {
-                            xRootContext->insertByName(
-                                name + OUSTR("/service"), Any(sp.second) );
-                        } catch (container::ElementExistException &) {
-                            xRootContext->replaceByName(
-                                name + OUSTR("/service"), Any(sp.second) );
-                        }
-                        // singleton entry:
-                        try {
-                            xRootContext->insertByName( name, Any() );
-                        } catch (container::ElementExistException & exc) {
-                            (void) exc; // avoid warnings
-                            OSL_ENSURE(
-                                0, OUStringToOString(
-                                    exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-                            xRootContext->replaceByName( name, Any() );
-                        }
-                    }
-                }
-            }
+        std::vector< css::uno::Reference< css::uno::XInterface > > factories;
+        getComponentInfo(&data, &factories, context);
+        if (!startup) {
+            that->componentLiveInsertion(data, factories);
         }
-        
         m_registered = REG_REGISTERED;
-        getMyBackend()->addDataToDb(url, data);
-    }
-    else // revokePackage()
-    {
-        // set to VOID during revocation process:
+        that->addDataToDb(url, data);
+    } else { // revoke
         m_registered = REG_VOID;
-
-        //get the remote context. If it does not exist then use the local one
-        Reference<XComponentContext> xContext(
-            that->getObject( url ), UNO_QUERY );
-        bool bRemoteContext = false;
-        if (!xContext.is())
-            xContext = that->getComponentContext();
-        else
-            bRemoteContext = true;
-        
-        t_stringlist implNames;
-        t_stringpairvec singletons;
-        if (m_bRemoved)
-        {
-            implNames = m_registeredComponentsDb.implementationNames;
-            singletons = m_registeredComponentsDb.singletons;
+        ComponentBackendDb::Data data(that->readDataFromDb(url));
+        css::uno::Reference< css::uno::XComponentContext > context(
+            that->getObject(url), css::uno::UNO_QUERY);
+        bool remoteContext = context.is();
+        if (!remoteContext) {
+            context = that->getComponentContext();
         }
-        else
-        {
-            getComponentInfo( &implNames, &singletons, xContext );
+        if (!startup) {
+            that->componentLiveRemoval(data);
         }
-
-        if (!startup)
-        {
-            // factories live removal:
-            const Reference<container::XSet> xSet(
-                that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
-            for ( t_stringlist::const_iterator iPos( implNames.begin() );
-                  iPos != implNames.end(); ++iPos )
-            {
-                OUString const & implName = *iPos;
-                try {
-                    xSet->remove( Any(implName) );
-                } // ignore if factory has not been live deployed:
-                catch (container::NoSuchElementException &) {
-                }
-            }
-        
-            if (! singletons.empty())
-            {
-                // singletons live removal:
-                const Reference<container::XNameContainer> xRootContext(
-                    that->getComponentContext()->getValueByName(
-                        OUSTR("_root") ), UNO_QUERY );
-                if (xRootContext.is())
-                {
-                    for ( t_stringpairvec::const_iterator iPos(
-                              singletons.begin() );
-                          iPos != singletons.end(); ++iPos )
-                    {
-                        ::std::pair<OUString, OUString> const & sp = *iPos;
-                        const OUString name( OUSTR("/singletons/") + sp.first );
-                        // arguments:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/arguments"));
-                        }
-                        catch (container::NoSuchElementException &) {}
-                        // used service:
-                        try {
-                            xRootContext->removeByName( name + OUSTR("/service") );
-                        }
-                        catch (container::NoSuchElementException &) {}
-                        // singleton entry:
-                        try {
-                            xRootContext->removeByName( name );
-                        }
-                        catch (container::NoSuchElementException & exc) {
-                            (void) exc; // avoid warnings
-                            OSL_ENSURE(
-                                0, OUStringToOString(
-                                    exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-                        }
-                    }
-                }
-            }
+        css::uno::Reference< css::registry::XImplementationRegistration >(
+            context->getServiceManager()->createInstanceWithContext(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.registry.ImplementationRegistration")),
+                context),
+            css::uno::UNO_QUERY_THROW)->revokeImplementation(url, getRDB());
+        if (data.javaTypeLibrary) {
+            that->removeFromUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
+        }
+        if (remoteContext) {
+            that->releaseObject(url);
         }
-        
-        const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() );
-        const Reference<registry::XImplementationRegistration> xImplReg(
-            xContext->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.registry.ImplementationRegistration"),
-                xContext ), UNO_QUERY_THROW );
-        xImplReg->revokeImplementation( url, xServicesRDB );
-        
-        if (isJavaTypelib)
-            that->removeFromUnoRc( java, url, xCmdEnv );
-        
-        if (bRemoteContext)
-            that->releaseObject( url );
-        
         m_registered = REG_NOT_REGISTERED;
-        getMyBackend()->deleteDataFromDb(url);
+        getMyBackend()->revokeEntryFromDb(url);
     }
 }
 
@@ -1525,7 +1691,8 @@ BackendImpl::TypelibraryPackageImpl::isRegistered_(
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
         true /* IsPresent */,
         beans::Ambiguous<sal_Bool>(
-            that->hasInUnoRc( m_jarFile, getURL() ),
+            that->hasInUnoRc(
+                m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB, getURL() ),
             false /* IsAmbiguous */ ) );
 }
 
@@ -1591,11 +1758,13 @@ void BackendImpl::TypelibraryPackageImpl::processPackage_(
             }
         }
         
-        that->addToUnoRc( m_jarFile, url, xCmdEnv );
+        that->addToUnoRc( m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB,
+                          url, xCmdEnv );
     }
     else // revokePackage()
     {   
-        that->removeFromUnoRc( m_jarFile, url, xCmdEnv );
+        that->removeFromUnoRc(
+            m_jarFile ? RCITEM_JAR_TYPELIB : RCITEM_RDB_TYPELIB, url, xCmdEnv );
         
         // revoking types at runtime, possible, sensible?
         if (!m_xTDprov.is())
@@ -1719,6 +1888,98 @@ BackendImpl::OtherPlatformPackageImpl::processPackage_(
     getMyBackend()->deleteDataFromDb(aURL);
 }
 
+BackendImpl * BackendImpl::ComponentsPackageImpl::getMyBackend() const
+{
+    BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
+    if (NULL == pBackend)
+    {
+        //Throws a DisposedException
+        check();
+        //We should never get here...
+        throw RuntimeException(
+            OUSTR("Failed to get the BackendImpl"),
+            static_cast<OWeakObject*>(const_cast<ComponentsPackageImpl *>(this)));
+    }
+    return pBackend;
+}
+
+beans::Optional< beans::Ambiguous<sal_Bool> >
+BackendImpl::ComponentsPackageImpl::isRegistered_(
+    ::osl::ResettableMutexGuard &,
+    ::rtl::Reference<AbortChannel> const &,
+    Reference<XCommandEnvironment> const & )
+{
+    return beans::Optional< beans::Ambiguous<sal_Bool> >(
+        true,
+        beans::Ambiguous<sal_Bool>(
+            getMyBackend()->hasInUnoRc(RCITEM_COMPONENTS, getURL()), false));
+}
+
+void BackendImpl::ComponentsPackageImpl::processPackage_(
+    ::osl::ResettableMutexGuard &,
+    bool doRegisterPackage,
+    bool startup,
+    ::rtl::Reference<AbortChannel> const & abortChannel,
+    Reference<XCommandEnvironment> const & xCmdEnv )
+{
+    BackendImpl * that = getMyBackend();
+    rtl::OUString url(getURL());
+    if (doRegisterPackage) {
+        ComponentBackendDb::Data data;
+        data.javaTypeLibrary = false;
+        std::vector< css::uno::Reference< css::uno::XInterface > > factories;
+        css::uno::Reference< css::uno::XComponentContext > context(
+            that->getObject(url), css::uno::UNO_QUERY);
+        if (!context.is()) {
+            context.set(
+                that->insertObject(
+                    url,
+                    raise_uno_process(
+                        that->getComponentContext(), abortChannel)),
+                css::uno::UNO_QUERY_THROW);
+        }
+        css::uno::Reference< css::registry::XSimpleRegistry > registry(
+            css::uno::Reference< css::lang::XMultiComponentFactory >(
+                that->getComponentContext()->getServiceManager(),
+                css::uno::UNO_SET_THROW)->createInstanceWithContext(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.SimpleRegistry")),
+                    that->getComponentContext()),
+            css::uno::UNO_QUERY_THROW);
+        registry->open(expandUnoRcUrl(url), true, false);
+        getMyBackend()->extractComponentData(
+            context,
+            that->openRegistryKey(
+                registry->getRootKey(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IMPLEMENTATIONS"))),
+            &data, &factories, 0, 0);
+        registry->close();
+        if (!startup) {
+            that->componentLiveInsertion(data, factories);
+        }
+        that->addDataToDb(url, data);
+        that->addToUnoRc(RCITEM_COMPONENTS, url, xCmdEnv);
+    } else { // revoke
+        that->removeFromUnoRc(RCITEM_COMPONENTS, url, xCmdEnv);
+        if (!startup) {
+            that->componentLiveRemoval(that->readDataFromDb(url));
+        }
+        that->releaseObject(url);
+        that->revokeEntryFromDb(url);
+    }
+}
+
+BackendImpl::ComponentsPackageImpl::ComponentsPackageImpl(
+    ::rtl::Reference<PackageRegistryBackend> const & myBackend,
+    OUString const & url, OUString const & name,
+    Reference<deployment::XPackageTypeInfo> const & xPackageType,
+    bool bRemoved, OUString const & identifier)
+    : Package( myBackend, url, name, name /* display-name */,
+               xPackageType, bRemoved, identifier)
+{}
+>>>>>>> ooo/DEV300_m101
+
 } // anon namespace
 
 namespace sdecl = comphelper::service_decl;
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index 5e9993ab12..82bb55068d 100644..100755
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -33,6 +33,7 @@
 #define RID_STR_DYN_COMPONENT                (RID_DEPLOYMENT_COMPONENT_START+10)
 #define RID_STR_JAVA_COMPONENT               (RID_DEPLOYMENT_COMPONENT_START+11)
 #define RID_STR_PYTHON_COMPONENT             (RID_DEPLOYMENT_COMPONENT_START+12)
+#define RID_STR_COMPONENTS                   (RID_DEPLOYMENT_COMPONENT_START+13)
 #define RID_STR_RDB_TYPELIB                  (RID_DEPLOYMENT_COMPONENT_START+20)
 #define RID_STR_JAVA_TYPELIB                 (RID_DEPLOYMENT_COMPONENT_START+21)
 
diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
index 52dfa568eb..1b2a7c3641 100644..100755
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ b/desktop/source/deployment/registry/component/dp_component.src
@@ -42,6 +42,11 @@ String RID_STR_PYTHON_COMPONENT
     Text [ en-US ] = "UNO Python Component";
 };
 
+String RID_STR_COMPONENTS
+{
+    Text [ en-US ] = "UNO Components";
+};
+
 String RID_STR_RDB_TYPELIB
 {
     Text [ en-US ] = "UNO RDB Type Library";
diff --git a/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk
index b7ee5c203c..b7ee5c203c 100644..100755
--- a/desktop/source/deployment/registry/component/makefile.mk
+++ b/desktop/source/deployment/registry/component/makefile.mk
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 88f5279d61..ecb9859769 100644..100755
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -132,15 +132,21 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     void configmgrini_verify_init(
         Reference<XCommandEnvironment> const & xCmdEnv );
     void configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv );
-    
-    bool addToConfigmgrIni( bool isSchema, OUString const & url,
+
+    /* The paramter isURL is false in the case of adding the conf:ini-entry
+       value from the backend db. This entry already contains the path as it
+       is used in the configmgr.ini.
+     */
+    bool addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url,
                      Reference<XCommandEnvironment> const & xCmdEnv );
     bool removeFromConfigmgrIni( bool isSchema, OUString const & url,
                           Reference<XCommandEnvironment> const & xCmdEnv );
     
     void addDataToDb(OUString const & url, ConfigurationBackendDb::Data const & data);
     ::boost::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url);
-    OUString deleteDataFromDb(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
+    bool hasActiveEntry(OUString const & url);
+    bool activateEntry(OUString const & url);
 
 public:
     BackendImpl( Sequence<Any> const & args,
@@ -149,6 +155,9 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
 
     using PackageRegistryBackend::disposing;
 };
@@ -240,20 +249,28 @@ void BackendImpl::addDataToDb(
     return data;
 }
 
-OUString BackendImpl::deleteDataFromDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
 {
-    OUString url2(url);
-    if (m_backendDb.get()) {
-        boost::optional< ConfigurationBackendDb::Data > data(
-            m_backendDb->getEntry(url));
-        if (data) {
-            url2 = expandUnoRcTerm(data->iniEntry);
-        }
-        m_backendDb->removeEntry(url);
-    }
-    return url2;
+    if (m_backendDb.get())
+        m_backendDb->revokeEntry(url);
+}
+
+bool BackendImpl::hasActiveEntry(OUString const & url)
+{
+    if (m_backendDb.get())
+        return m_backendDb->hasActiveEntry(url);
+    return false;
+}
+
+bool BackendImpl::activateEntry(OUString const & url)
+{
+    if (m_backendDb.get())
+        return m_backendDb->activateEntry(url);
+    return false;
 }
 
+
+
 // XPackageRegistry
 //______________________________________________________________________________
 Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -261,6 +278,13 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
     return m_typeInfos;
 }
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
 
 // PackageRegistryBackend
 //______________________________________________________________________________
@@ -447,10 +471,10 @@ void BackendImpl::configmgrini_flush(
 }
 
 //______________________________________________________________________________
-bool BackendImpl::addToConfigmgrIni( bool isSchema, OUString const & url_,
+bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_,
                               Reference<XCommandEnvironment> const & xCmdEnv )
 {
-    const OUString rcterm( dp_misc::makeRcTerm(url_) );
+    const OUString rcterm( isURL ? dp_misc::makeRcTerm(url_) : url_ );
     const ::osl::MutexGuard guard( getMutex() );
     configmgrini_verify_init( xCmdEnv );
     t_stringlist & rSet = getFiles(isSchema);
@@ -499,6 +523,7 @@ bool BackendImpl::removeFromConfigmgrIni(
 
 // Package
 //______________________________________________________________________________
+
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
 {
     BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
@@ -524,7 +549,7 @@ BackendImpl::PackageImpl::isRegistered_(
     const rtl::OUString url(getURL());
 
     bool bReg = false;
-    if (that->readDataFromDb(getURL()))
+    if (that->hasActiveEntry(getURL()))
         bReg = true;
     if (!bReg)
         //fallback for user extension registered in berkeley DB
@@ -667,38 +692,48 @@ void BackendImpl::PackageImpl::processPackage_(
     
     if (doRegisterPackage)
     {
-        ConfigurationBackendDb::Data data;
-        if (!m_isSchema)
+        if (getMyBackend()->activateEntry(getURL()))
         {
-            const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
-            bool out_replaced = false;
-            url = replaceOrigin(url, sModFolder, xCmdEnv, out_replaced);
-            if (out_replaced)
-                data.dataUrl = sModFolder;
-            else
-                deleteTempFolder(sModFolder);
+            ::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+            OSL_ASSERT(data);
+            that->addToConfigmgrIni( m_isSchema, false, data->iniEntry, xCmdEnv );
         }
-        //No need for live-deployment for bundled extension, because OOo
-        //restarts after installation
-        if (that->m_eContext != CONTEXT_BUNDLED
-            && !startup)
+        else
         {
-            if (m_isSchema)
+            ConfigurationBackendDb::Data data;
+            if (!m_isSchema)
             {
-                com::sun::star::configuration::Update::get(
-                    that->m_xComponentContext)->insertExtensionXcsFile(
-                        that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+                const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
+                bool out_replaced = false;
+                url = replaceOrigin(url, sModFolder, xCmdEnv, out_replaced);
+                if (out_replaced)
+                    data.dataUrl = sModFolder;
+                else
+                    deleteTempFolder(sModFolder);
             }
-            else
+            //No need for live-deployment for bundled extension, because OOo
+            //restarts after installation
+            if (that->m_eContext != CONTEXT_BUNDLED
+                && that->m_eContext != CONTEXT_BUNDLED_PREREG
+                && !startup)
             {
-                com::sun::star::configuration::Update::get(
-                    that->m_xComponentContext)->insertExtensionXcuFile(
-                        that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+                if (m_isSchema)
+                {
+                    com::sun::star::configuration::Update::get(
+                        that->m_xComponentContext)->insertExtensionXcsFile(
+                            that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+                }
+                else
+                {
+                    com::sun::star::configuration::Update::get(
+                        that->m_xComponentContext)->insertExtensionXcuFile(
+                            that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+                }
             }
+            that->addToConfigmgrIni( m_isSchema, true, url, xCmdEnv );
+            data.iniEntry = dp_misc::makeRcTerm(url);
+            that->addDataToDb(getURL(), data);
         }
-        that->addToConfigmgrIni( m_isSchema, url, xCmdEnv );
-        data.iniEntry = dp_misc::makeRcTerm(url);
-        that->addDataToDb(getURL(), data);
     }
     else // revoke
     {
@@ -731,7 +766,7 @@ void BackendImpl::PackageImpl::processPackage_(
                        else
                            deleteTempFolder(sModFolder);
                    }
-                   that->addToConfigmgrIni(schema, url_replaced, xCmdEnv);
+                   that->addToConfigmgrIni(schema, true, url_replaced, xCmdEnv);
                    data.iniEntry = dp_misc::makeRcTerm(url_replaced);
                    that->addDataToDb(url2, data);
                 }
@@ -749,12 +784,17 @@ void BackendImpl::PackageImpl::processPackage_(
                 OSL_ASSERT(0);
             }
         }
-        url = that->deleteDataFromDb(url);
-        if (!m_isSchema) {
+        
+        ::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+        //If an xcu file was life deployed then always a data entry is written.
+        //If the xcu file was already in the configmr.ini then there is also
+        //a data entry
+        if (!m_isSchema && data)
+        {
             com::sun::star::configuration::Update::get(
-                that->m_xComponentContext)->removeExtensionXcuFile(
-                    expandUnoRcUrl(url));
+                that->m_xComponentContext)->removeExtensionXcuFile(expandUnoRcTerm(data->iniEntry));
         }
+        that->revokeEntryFromDb(url);
     }
 } 
 
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 479f50e20b..479f50e20b 100644..100755
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src
index 3570eaf28f..3570eaf28f 100644..100755
--- a/desktop/source/deployment/registry/configuration/dp_configuration.src
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.src
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 9c0807de06..ecc09cb669 100644..100755
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -84,12 +84,15 @@ OUString ConfigurationBackendDb::getKeyElementName()
 void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
 {
     try{
-        Reference<css::xml::dom::XNode> helpNode
-            = writeKeyElement(url);
-
-        writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
-        writeSimpleElement(OUSTR("ini-entry"), data.iniEntry, helpNode);
-        save();
+        if (!activateEntry(url))
+        {        
+            Reference<css::xml::dom::XNode> helpNode
+                = writeKeyElement(url);
+            
+            writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
+            writeSimpleElement(OUSTR("ini-entry"), data.iniEntry, helpNode);
+            save();
+        }
     }
     catch (css::deployment::DeploymentException& )
     {
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index a652184aec..a652184aec 100644..100755
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index 9bcbd50d42..9bcbd50d42 100644..100755
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index fc2f5781e4..fe5c272480 100644..100755
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -40,6 +40,7 @@
 #include "ucbhelper/content.hxx"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
+#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
 #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
 #include "com/sun/star/ucb/IOErrorCode.hpp"
 #include "com/sun/star/beans/StringPair.hpp"
@@ -100,6 +101,8 @@ PackageRegistryBackend::PackageRegistryBackend(
         m_eContext = CONTEXT_BUNDLED;
     else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") ))
         m_eContext = CONTEXT_TMP;
+    else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") ))
+        m_eContext = CONTEXT_BUNDLED_PREREG;
     else if (m_context.matchIgnoreAsciiCaseAsciiL(
                  RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") ))
         m_eContext = CONTEXT_DOCUMENT;
@@ -524,6 +527,15 @@ OUString Package::getDescription() throw (
 }
 
 //______________________________________________________________________________
+OUString Package::getLicenseText() throw (
+    deployment::ExtensionRemovedException,RuntimeException)
+{
+    if (m_bRemoved)
+        throw deployment::ExtensionRemovedException();
+    return OUString();
+}
+
+//______________________________________________________________________________
 Sequence<OUString> Package::getUpdateInformationURLs() throw (
     deployment::ExtensionRemovedException, RuntimeException)
 {
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index dabb414809..8f7c0265b8 100644..100755
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -188,6 +188,74 @@ void BackendDb::removeEntry(::rtl::OUString const & url)
     removeElement(sExpression.makeStringAndClear());
 }
 
+void BackendDb::revokeEntry(::rtl::OUString const & url)
+{
+    try
+    {
+        Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+        if (entry.is())
+        {
+            entry->setAttribute(OUSTR("revoked"), OUSTR("true"));
+            save();
+        }
+    }
+    catch(css::uno::Exception &)
+    {
+        Any exc( ::cppu::getCaughtException() );
+        throw css::deployment::DeploymentException(
+            OUSTR("Extension Manager: failed to revoke data entry in backend db: ") +
+            m_urlDb, 0, exc);
+    }
+}
+
+bool BackendDb::activateEntry(::rtl::OUString const & url)
+{
+    try
+    {
+        bool ret = false;
+        Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+        if (entry.is())
+        {
+            //no attribute "active" means it is active, that is, registered.
+            entry->removeAttribute(OUSTR("revoked"));
+            save();
+            ret = true;
+        }
+        return ret;
+    }
+    catch(css::uno::Exception &)
+    {
+        Any exc( ::cppu::getCaughtException() );
+        throw css::deployment::DeploymentException(
+            OUSTR("Extension Manager: failed to revoke data entry in backend db: ") +
+            m_urlDb, 0, exc);
+    }
+}
+
+bool BackendDb::hasActiveEntry(::rtl::OUString const & url)
+{
+    try
+    {
+        bool ret = false;
+        Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+        if (entry.is())
+        {
+            OUString sActive = entry->getAttribute(OUSTR("revoked"));
+            if (!sActive.equals(OUSTR("true")))
+                ret = true;
+        }
+        return ret;
+
+    }
+    catch(css::uno::Exception &)
+    {
+        Any exc( ::cppu::getCaughtException() );
+        throw css::deployment::DeploymentException(
+            OUSTR("Extension Manager: failed to determine an active entry in backend db: ") +
+            m_urlDb, 0, exc);
+    }
+}
+
 Reference<css::xml::dom::XNode> BackendDb::getKeyElement(
     ::rtl::OUString const & url)
 {
@@ -575,32 +643,34 @@ RegisteredDb::RegisteredDb(
 void RegisteredDb::addEntry(::rtl::OUString const & url)
 {
     try{
-
-        const OUString sNameSpace = getDbNSName();
-        const OUString sPrefix = getNSPrefix();
-        const OUString sEntry = getKeyElementName();
-        
-        Reference<css::xml::dom::XDocument> doc = getDocument();
-        Reference<css::xml::dom::XNode> root = doc->getFirstChild();
-
+        if (!activateEntry(url))
+        {
+            const OUString sNameSpace = getDbNSName();
+            const OUString sPrefix = getNSPrefix();
+            const OUString sEntry = getKeyElementName();
+            
+            Reference<css::xml::dom::XDocument> doc = getDocument();
+            Reference<css::xml::dom::XNode> root = doc->getFirstChild();
+            
 #if    OSL_DEBUG_LEVEL > 0        
-        //There must not be yet an entry with the same url
-        OUString sExpression(
-            sPrefix + OUSTR(":") + sEntry + OUSTR("[@url = \"") + url + OUSTR("\"]"));
-        Reference<css::xml::dom::XNode> _extensionNode =
-            getXPathAPI()->selectSingleNode(root, sExpression);
-        OSL_ASSERT(! _extensionNode.is());
+            //There must not be yet an entry with the same url
+            OUString sExpression(
+                sPrefix + OUSTR(":") + sEntry + OUSTR("[@url = \"") + url + OUSTR("\"]"));
+            Reference<css::xml::dom::XNode> _extensionNode =
+                getXPathAPI()->selectSingleNode(root, sExpression);
+            OSL_ASSERT(! _extensionNode.is());
 #endif
-        Reference<css::xml::dom::XElement> helpElement(
-            doc->createElementNS(sNameSpace, sPrefix +  OUSTR(":") + sEntry));
-
-        helpElement->setAttribute(OUSTR("url"), url);
-
-        Reference<css::xml::dom::XNode> helpNode(
-            helpElement, UNO_QUERY_THROW);
-        root->appendChild(helpNode);
-        
-        save();
+            Reference<css::xml::dom::XElement> helpElement(
+                doc->createElementNS(sNameSpace, sPrefix +  OUSTR(":") + sEntry));
+            
+            helpElement->setAttribute(OUSTR("url"), url);
+            
+            Reference<css::xml::dom::XNode> helpNode(
+                helpElement, UNO_QUERY_THROW);
+            root->appendChild(helpNode);
+            
+            save();
+        }
     }
     catch(css::uno::Exception &)
     {
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 26cf6d7217..9c2b8cb3a3 100644..100755
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -136,6 +136,10 @@ public:
                lang::IllegalArgumentException, RuntimeException);
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+                throw (deployment::DeploymentException,
+                RuntimeException);
+
 };
 
 //______________________________________________________________________________
@@ -186,6 +190,20 @@ OUString normalizeMediaType( OUString const & mediaType )
 
 //______________________________________________________________________________
 
+void PackageRegistryImpl::packageRemoved(
+    ::rtl::OUString const & url, ::rtl::OUString const & mediaType)
+    throw (css::deployment::DeploymentException,
+           css::uno::RuntimeException)
+{
+    const t_string2registry::const_iterator i = 
+        m_mediaType2backend.find(mediaType);
+
+    if (i != m_mediaType2backend.end())
+    {
+        i->second->packageRemoved(url, mediaType);
+    }
+}
+
 void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src
index 1658e4bdcc..1658e4bdcc 100644..100755
--- a/desktop/source/deployment/registry/dp_registry.src
+++ b/desktop/source/deployment/registry/dp_registry.src
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 4ed1ea282f..f7deac5f47 100644..100755
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -72,6 +72,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 
         bool getFileAttributes(sal_uInt64& out_Attributes);
         bool isUrlTargetInExtension();
+        
     public:
         inline ExecutablePackageImpl(
             ::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -93,8 +94,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv );
 
     void addDataToDb(OUString const & url);
-    bool isRegisteredInDb(OUString const & url);
-    void deleteDataFromDb(OUString const & url);
+    bool hasActiveEntry(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
 
     Reference<deployment::XPackageTypeInfo> m_xExecutableTypeInfo;
     std::auto_ptr<ExecutableBackendDb> m_backendDb;
@@ -105,6 +106,9 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
 
     using PackageRegistryBackend::disposing;
 };
@@ -134,20 +138,20 @@ void BackendImpl::addDataToDb(OUString const & url)
         m_backendDb->addEntry(url);
 }
 
-bool BackendImpl::isRegisteredInDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
 {
-    bool ret = false;
     if (m_backendDb.get())
-        ret = m_backendDb->getEntry(url);
-    return ret;
+        m_backendDb->revokeEntry(url);
 }
 
-void BackendImpl::deleteDataFromDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
 {
     if (m_backendDb.get())
-        m_backendDb->removeEntry(url);
+        return m_backendDb->hasActiveEntry(url);
+    return false;
 }
 
+
 // XPackageRegistry
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
@@ -156,6 +160,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
         & m_xExecutableTypeInfo, 1);
 }
 
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
+
 // PackageRegistryBackend
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
@@ -217,7 +229,7 @@ BackendImpl::ExecutablePackageImpl::isRegistered_(
     ::rtl::Reference<dp_misc::AbortChannel> const &,
     Reference<XCommandEnvironment> const & )
 {
-    bool registered = getMyBackend()->isRegisteredInDb(getURL());
+    bool registered = getMyBackend()->hasActiveEntry(getURL());
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
             sal_True /* IsPresent */,
                 beans::Ambiguous<sal_Bool>(
@@ -248,7 +260,8 @@ void BackendImpl::ExecutablePackageImpl::processPackage_(
             else if (getMyBackend()->m_context.equals(OUSTR("shared")))
                 attributes |= (osl_File_Attribute_OwnExe | osl_File_Attribute_GrpExe
                                | osl_File_Attribute_OthExe);
-            else if (!getMyBackend()->m_context.equals(OUSTR("bundled")))
+            else if (!getMyBackend()->m_context.equals(OUSTR("bundled"))
+                && !getMyBackend()->m_context.equals(OUSTR("bundled_prereg")))
                 //Bundled extension are required to be in the properly 
                 //installed. That is an executable must have the right flags
                 OSL_ASSERT(0);
@@ -261,7 +274,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_(
     }
     else
     {
-        getMyBackend()->deleteDataFromDb(getURL());
+        getMyBackend()->revokeEntryFromDb(getURL());
     }
 }
 
@@ -277,7 +290,8 @@ bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension()
         sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_USER_PACKAGES_CACHE"));
     else if (getMyBackend()->m_context.equals(OUSTR("shared")))
         sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_SHARED_PACKAGES_CACHE"));
-    else if (getMyBackend()->m_context.equals(OUSTR("bundled"))) 
+    else if (getMyBackend()->m_context.equals(OUSTR("bundled"))
+        || getMyBackend()->m_context.equals(OUSTR("bundled_prereg"))) 
         sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$BUNDLED_EXTENSIONS"));
     else
         OSL_ASSERT(0);
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index 56a9645974..56a9645974 100644..100755
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 4255319119..4255319119 100644..100755
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
diff --git a/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk
index 81b2baa44e..81b2baa44e 100644..100755
--- a/desktop/source/deployment/registry/executable/makefile.mk
+++ b/desktop/source/deployment/registry/executable/makefile.mk
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 58207e50cb..22eb4cf8aa 100644..100755
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -81,7 +81,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             ::rtl::Reference<AbortChannel> const & abortChannel,
             Reference<XCommandEnvironment> const & xCmdEnv );
 
-        bool extensionContainsCompiledHelp();
+
     public:
         PackageImpl(
             ::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -89,6 +89,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             Reference<deployment::XPackageTypeInfo> const & xPackageType,
             bool bRemoved, OUString const & identifier);
 
+        bool extensionContainsCompiledHelp();
+        
         //XPackage
         virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL()
             throw (deployment::ExtensionRemovedException, css::uno::RuntimeException);
@@ -101,14 +103,16 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         sal_Bool bRemoved, OUString const & identifier,
         Reference<XCommandEnvironment> const & xCmdEnv );
 
-    void implProcessHelp( Reference< deployment::XPackage > xPackage, bool doRegisterPackage,
-                          bool compiledHelp, Reference<ucb::XCommandEnvironment> const & xCmdEnv);
+    void implProcessHelp( PackageImpl * package, bool doRegisterPackage,
+                          Reference<ucb::XCommandEnvironment> const & xCmdEnv);
     void implCollectXhpFiles( const rtl::OUString& aDir,
         std::vector< rtl::OUString >& o_rXhpFileVector );
 
     void addDataToDb(OUString const & url, HelpBackendDb::Data const & data);
     ::boost::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url);
-    void deleteDataFromDb(OUString const & url);
+    bool hasActiveEntry(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
+    bool activateEntry(OUString const & url);
 
     Reference< ucb::XSimpleFileAccess > getFileAccess( void );
     Reference< ucb::XSimpleFileAccess > m_xSFA;
@@ -124,6 +128,10 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
         getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
+
 };
 
 //______________________________________________________________________________
@@ -163,6 +171,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
     return m_typeInfos;
 }
 
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
+
 // PackageRegistryBackend
 //______________________________________________________________________________
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -221,12 +237,27 @@ void BackendImpl::addDataToDb(
     return data;
 }
 
-void BackendImpl::deleteDataFromDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
 {
     if (m_backendDb.get())
-        m_backendDb->removeEntry(url);
+        return m_backendDb->hasActiveEntry(url);
+    return false;
+}
+
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+    if (m_backendDb.get())
+        m_backendDb->revokeEntry(url);
 }
 
+bool BackendImpl::activateEntry(OUString const & url)
+{
+    if (m_backendDb.get())
+        return m_backendDb->activateEntry(url);
+    return false;
+}
+
+
 //##############################################################################
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -254,7 +285,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     return pBackend;
 }
 
-bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
+bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() 
 {
     bool bCompiled = true;
     rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL());
@@ -304,6 +335,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
     }
     return bCompiled;
 }
+
 //______________________________________________________________________________
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::PackageImpl::isRegistered_(
@@ -314,7 +346,7 @@ BackendImpl::PackageImpl::isRegistered_(
     BackendImpl * that = getMyBackend();
 
     bool bReg = false;
-    if (that->readDataFromDb(getURL()))
+    if (that->hasActiveEntry(getURL()))
         bReg = true;
 
     return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) );
@@ -333,9 +365,7 @@ void BackendImpl::PackageImpl::processPackage_(
     (void)xCmdEnv;
 
     BackendImpl* that = getMyBackend();
-    Reference< deployment::XPackage > xThisPackage( this );
-    that->implProcessHelp( xThisPackage, doRegisterPackage,
-                           extensionContainsCompiledHelp(), xCmdEnv);
+    that->implProcessHelp( this, doRegisterPackage, xCmdEnv);
 }
 
 beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
@@ -347,8 +377,8 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
 
     ::boost::optional<HelpBackendDb::Data> data =
           getMyBackend()->readDataFromDb(getURL());
-
-    if (data)
+    
+    if (data && getMyBackend()->hasActiveEntry(getURL()))
         return beans::Optional<OUString>(true, data->dataUrl);
 
     return beans::Optional<OUString>(true, OUString());
@@ -359,224 +389,226 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
 static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
 static rtl::OUString aHelpStr(RTL_CONSTASCII_USTRINGPARAM("help"));
 
-void BackendImpl::implProcessHelp
-( Reference< deployment::XPackage > xPackage, bool doRegisterPackage, bool compiledHelp,
-  Reference<ucb::XCommandEnvironment> const & xCmdEnv)
+void BackendImpl::implProcessHelp(
+    PackageImpl * package, bool doRegisterPackage,
+    Reference<ucb::XCommandEnvironment> const & xCmdEnv)
 {
+    Reference< deployment::XPackage > xPackage(package);
     OSL_ASSERT(xPackage.is());
     if (doRegisterPackage)
     {
-        HelpBackendDb::Data data;
-
-        if (compiledHelp)
+        //revive already processed help if possible
+        if ( !activateEntry(xPackage->getURL()))
         {
+            HelpBackendDb::Data data;
             data.dataUrl = xPackage->getURL();
-        }
-        else
-        {
-            const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
-            data.dataUrl = sHelpFolder;
-
-            Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
-            rtl::OUString aHelpURL = xPackage->getURL();
-            rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
-            rtl::OUString aName = xPackage->getName();
-            if( !xSFA->isFolder( aExpandedHelpURL ) )
-            {
-                rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
-                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No help folder" ));
-                OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
-                throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
-                                                       makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
-            }
-
-            Reference<XComponentContext> const & xContext = getComponentContext();
-            Reference< script::XInvocation > xInvocation;
-            if( xContext.is() )
+            if (!package->extensionContainsCompiledHelp())
             {
-                try
-                {
-                    xInvocation = Reference< script::XInvocation >(
-                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                                                                      "com.sun.star.help.HelpIndexer" )), xContext ) , UNO_QUERY );
-                }
-                catch (Exception &)
+                const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
+                data.dataUrl = sHelpFolder;
+                
+                Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
+                rtl::OUString aHelpURL = xPackage->getURL();
+                rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
+                rtl::OUString aName = xPackage->getName();
+                if( !xSFA->isFolder( aExpandedHelpURL ) )
                 {
-                    // i98680: Survive missing lucene
+                    rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
+                    aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No help folder" ));
+                    OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+                    throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+                                                           makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
                 }
-            }
-
-            // Scan languages
-            Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
-            sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
-            const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
-            for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
-            {
-                rtl::OUString aLangURL = pSeq[iLang];
-                if( xSFA->isFolder( aLangURL ) )
+                
+                Reference<XComponentContext> const & xContext = getComponentContext();
+                Reference< script::XInvocation > xInvocation;
+                if( xContext.is() )
                 {
-                    std::vector< rtl::OUString > aXhpFileVector;
-
-                    // calculate jar file URL
-                    sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/');
-                    // for example "/en"
-                    OUString langFolderURLSegment(
-                        aLangURL.copy(
-                            indexStartSegment + 1, aLangURL.getLength() - indexStartSegment - 1));
-
-                    //create the folder in the "temporary folder"
-                    ::ucbhelper::Content langFolderContent;
-                    const OUString langFolderDest = makeURL(sHelpFolder, langFolderURLSegment);
-                    const OUString langFolderDestExpanded = ::dp_misc::expandUnoRcUrl(langFolderDest);
-                    ::dp_misc::create_folder(
-                        &langFolderContent,
-                        langFolderDest, xCmdEnv);
-
-                    rtl::OUString aJarFile(
-                        makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr +
-                                OUSTR(".jar")));
-                    aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile);
-
-                    rtl::OUString aEncodedJarFilePath = rtl::Uri::encode(
-                        aJarFile, rtl_UriCharClassPchar,
-                        rtl_UriEncodeIgnoreEscapes,
-                        RTL_TEXTENCODING_UTF8 );
-                    rtl::OUString aDestBasePath(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.pkg://" ));
-                    aDestBasePath += aEncodedJarFilePath;
-                    aDestBasePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
-
-                    sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
-
-                    Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
-                    sal_Int32 nSubLangCount = aSubLangSeq.getLength();
-                    const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
-                    for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
+                    try
                     {
-                        rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
-                        if( !xSFA->isFolder( aSubFolderURL ) )
-                            continue;
-
-                        implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
-
-                        // Copy to package (later: move?)
-                        rtl::OUString aDestPath = aDestBasePath;
-                        rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
-                        aDestPath += aPureFolderName;
-                        xSFA->copy( aSubFolderURL, aDestPath );
-                    }
-
-                    // Call compiler
-                    sal_Int32 nXhpFileCount = aXhpFileVector.size();
-                    rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
-                    for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
-                    {
-                        rtl::OUString aXhpFile = aXhpFileVector[iXhp];
-                        rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
-                        pXhpFiles[iXhp] = aXhpRelFile;
+                        xInvocation = Reference< script::XInvocation >( 
+                            xContext->getServiceManager()->createInstanceWithContext( 
+                                rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.help.HelpIndexer" )), xContext ) , UNO_QUERY );
                     }
-
-                    rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
-                    rtl::OUString aOfficeHelpPathFileURL;
-                    ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
-
-                    HelpProcessingErrorInfo aErrorInfo;
-                    bool bSuccess = compileExtensionHelp(
-                        aOfficeHelpPathFileURL, aHelpStr, aLangURL,
-                        nXhpFileCount, pXhpFiles,
-                        langFolderDestExpanded, aErrorInfo );
-
-                    if( bSuccess && xInvocation.is() )
+                    catch (Exception &)
                     {
-                        Sequence<uno::Any> aParamsSeq( 6 );
-
-                        aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
-
-                        rtl::OUString aLang;
-                        sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
-                        if( nLastSlash != -1 )
-                            aLang = aLangURL.copy( nLastSlash + 1 );
-                        else
-                            aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
-                        aParamsSeq[1] = uno::makeAny( aLang );
-
-                        aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" )) );
-                        aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" )) );
-
-                        aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" )) );
-                        rtl::OUString aSystemPath;
-                        osl::FileBase::getSystemPathFromFileURL(
-                            langFolderDestExpanded, aSystemPath );
-                        aParamsSeq[5] = uno::makeAny( aSystemPath );
-
-                        Sequence< sal_Int16 > aOutParamIndex;
-                        Sequence< uno::Any > aOutParam;
-                        uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
-                                                             aParamsSeq, aOutParamIndex, aOutParam );
+                        // i98680: Survive missing lucene
                     }
-
-                    if( !bSuccess )
+                }
+                
+                // Scan languages
+                Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
+                sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
+                const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
+                for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
+                {
+                    rtl::OUString aLangURL = pSeq[iLang];
+                    if( xSFA->isFolder( aLangURL ) )
                     {
-                        USHORT nErrStrId = 0;
-                        switch( aErrorInfo.m_eErrorClass )
+                        std::vector< rtl::OUString > aXhpFileVector;
+                        
+                        // calculate jar file URL
+                        sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/');
+                        // for example "/en"
+                        OUString langFolderURLSegment(
+                            aLangURL.copy(
+                                indexStartSegment + 1, aLangURL.getLength() - indexStartSegment - 1));
+                        
+                        //create the folder in the "temporary folder"
+                        ::ucbhelper::Content langFolderContent;
+                        const OUString langFolderDest = makeURL(sHelpFolder, langFolderURLSegment);
+                        const OUString langFolderDestExpanded = ::dp_misc::expandUnoRcUrl(langFolderDest);
+                        ::dp_misc::create_folder(
+                            &langFolderContent,
+                            langFolderDest, xCmdEnv);
+                        
+                        rtl::OUString aJarFile(
+                            makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr +
+                                    OUSTR(".jar")));
+                        aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile);
+                        
+                        rtl::OUString aEncodedJarFilePath = rtl::Uri::encode(
+                            aJarFile, rtl_UriCharClassPchar,
+                            rtl_UriEncodeIgnoreEscapes,
+                            RTL_TEXTENCODING_UTF8 );
+                        rtl::OUString aDestBasePath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.zip://" ));
+                        aDestBasePath += aEncodedJarFilePath;
+                        aDestBasePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
+                        
+                        sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
+                        
+                        Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
+                        sal_Int32 nSubLangCount = aSubLangSeq.getLength();
+                        const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
+                        for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
+                        {
+                            rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
+                            if( !xSFA->isFolder( aSubFolderURL ) )
+                                continue;
+                            
+                            implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
+                            
+                            // Copy to package (later: move?)
+                            rtl::OUString aDestPath = aDestBasePath;
+                            rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
+                            aDestPath += aPureFolderName;
+                            xSFA->copy( aSubFolderURL, aDestPath );
+                        }
+                        
+                        // Call compiler
+                        sal_Int32 nXhpFileCount = aXhpFileVector.size();
+                        rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
+                        for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
+                        {
+                            rtl::OUString aXhpFile = aXhpFileVector[iXhp];
+                            rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
+                            pXhpFiles[iXhp] = aXhpRelFile;
+                        }
+                        
+                        rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+                        rtl::OUString aOfficeHelpPathFileURL;
+                        ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); 
+                        
+                        HelpProcessingErrorInfo aErrorInfo;
+                        bool bSuccess = compileExtensionHelp(
+                            aOfficeHelpPathFileURL, aHelpStr, aLangURL,
+                            nXhpFileCount, pXhpFiles,
+                            langFolderDestExpanded, aErrorInfo );
+                        
+                        if( bSuccess && xInvocation.is() )
                         {
-                        case HELPPROCESSING_GENERAL_ERROR:
-                        case HELPPROCESSING_INTERNAL_ERROR:		nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
-                        case HELPPROCESSING_XMLPARSING_ERROR:	nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
-                        default: ;
-                        };
-
-                        rtl::OUString aErrStr;
-                        if( nErrStrId != 0 )
+                            Sequence<uno::Any> aParamsSeq( 6 );
+                            
+                            aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" ) ));
+                            
+                            rtl::OUString aLang;
+                            sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
+                            if( nLastSlash != -1 )
+                                aLang = aLangURL.copy( nLastSlash + 1 );
+                            else
+                                aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
+                            aParamsSeq[1] = uno::makeAny( aLang );
+                            
+                            aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" ) ));
+                            aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" ) ));
+                            
+                            aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" ) ));
+                            rtl::OUString aSystemPath;
+                            osl::FileBase::getSystemPathFromFileURL(
+                                langFolderDestExpanded, aSystemPath );
+                            aParamsSeq[5] = uno::makeAny( aSystemPath );
+                            
+                            Sequence< sal_Int16 > aOutParamIndex;
+                            Sequence< uno::Any > aOutParam;
+                            uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
+                                                                 aParamsSeq, aOutParamIndex, aOutParam );
+                        }
+                        
+                        if( !bSuccess )
                         {
-                            aErrStr = getResourceString( nErrStrId );
-
-                            // Remoce CR/LF
-                            rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
-                            sal_Unicode nCR = 13, nLF = 10;
-                            sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
-                            sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
-                            sal_Int32 nCopy;
-                            if( nSearchCR != -1 || nSearchLF != -1 )
+                            sal_uInt16 nErrStrId = 0;
+                            switch( aErrorInfo.m_eErrorClass )
                             {
-                                if( nSearchCR == -1 )
-                                    nCopy = nSearchLF;
-                                else if( nSearchLF == -1 )
-                                    nCopy = nSearchCR;
-                                else
-                                    nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
-
-                                aErrMsg = aErrMsg.copy( 0, nCopy );
-                            }
-                            aErrStr += aErrMsg;
-                            if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
+                            case HELPPROCESSING_GENERAL_ERROR:
+                            case HELPPROCESSING_INTERNAL_ERROR:		nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
+                            case HELPPROCESSING_XMLPARSING_ERROR:	nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
+                            default: ;
+                            };
+                            
+                            rtl::OUString aErrStr;
+                            if( nErrStrId != 0 )
                             {
-                                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " in " ));
-
-                                rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
-                                                                               rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
-                                aErrStr += aDecodedFile;
-                                if( aErrorInfo.m_nXMLParsingLine != -1 )
+                                aErrStr = getResourceString( nErrStrId );
+                                
+                                // Remoce CR/LF
+                                rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
+                                sal_Unicode nCR = 13, nLF = 10;
+                                sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
+                                sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
+                                sal_Int32 nCopy;
+                                if( nSearchCR != -1 || nSearchLF != -1 )
                                 {
-                                    aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ", line " ));
-                                    aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
+                                    if( nSearchCR == -1 )
+                                        nCopy = nSearchLF;
+                                    else if( nSearchLF == -1 )
+                                        nCopy = nSearchCR;
+                                    else
+                                        nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
+                                    
+                                    aErrMsg = aErrMsg.copy( 0, nCopy );
+                                }
+                                aErrStr += aErrMsg;
+                                if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
+                                {
+                                    aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " in " ));
+                                    
+                                    rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
+                                                                                   rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
+                                    aErrStr += aDecodedFile;
+                                    if( aErrorInfo.m_nXMLParsingLine != -1 )
+                                    {
+                                        aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ", line " ));
+                                        aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
+                                    }
                                 }
                             }
+                            
+                            OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+                            throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+                                                                   makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
                         }
-
-                        OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
-                        throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
-                                                               makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
                     }
                 }
             }
+                //Writing the data entry replaces writing the flag file. If we got to this
+                //point the registration was successful.
+            addDataToDb(xPackage->getURL(), data);
         }
-        //Writing the data entry replaces writing the flag file. If we got to this
-        //point the registration was successful.
-        addDataToDb(xPackage->getURL(), data);
     } //if (doRegisterPackage)
     else
     {
-        deleteDataFromDb(xPackage->getURL());
+        revokeEntryFromDb(xPackage->getURL());
     }
 }
 
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 451144813f..451144813f 100644..100755
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.hrc
diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src
index 6cb9b023e6..6cb9b023e6 100644..100755
--- a/desktop/source/deployment/registry/help/dp_help.src
+++ b/desktop/source/deployment/registry/help/dp_help.src
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index b18243b8a7..45aa70934c 100644..100755
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -84,11 +84,14 @@ OUString HelpBackendDb::getKeyElementName()
 void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
 {
     try{
-        Reference<css::xml::dom::XNode> helpNode
-            = writeKeyElement(url);
-
-        writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
-        save();
+        if (!activateEntry(url))
+        {
+            Reference<css::xml::dom::XNode> helpNode
+                = writeKeyElement(url);
+            
+            writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
+            save();
+        }
     }
     catch (css::deployment::DeploymentException& )
     {
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 4a2eb8ec59..4bfa93204c 100644..100755
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -77,6 +77,8 @@ public:
     void addEntry(::rtl::OUString const & url, Data const & data);
 
     ::boost::optional<Data> getEntry(::rtl::OUString const & url);
+    //must also return the data urls for entries with @activ="false". That is,
+    //those are currently revoked.
     ::std::list< ::rtl::OUString> getAllDataUrls();
 
 };
diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index d4934f71a4..d4934f71a4 100644..100755
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/help/makefile.mk
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 5d8c60e4fb..656f81ff6d 100644..100755
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -237,6 +237,9 @@ public:
     virtual ::rtl::OUString SAL_CALL getDescription()
         throw (css::deployment::ExtensionRemovedException,
                css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getLicenseText()
+        throw (css::deployment::ExtensionRemovedException,
+               css::uno::RuntimeException);
     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
     getUpdateInformationURLs()
         throw (css::deployment::ExtensionRemovedException,
@@ -294,9 +297,9 @@ protected:
 
     ::rtl::OUString m_context;
     // currently only for library containers:
-    enum context {
+    enum {
         CONTEXT_UNKNOWN,
-        CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP,
+        CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP, CONTEXT_BUNDLED_PREREG,
         CONTEXT_DOCUMENT
     } m_eContext;
     bool m_readOnly;
@@ -341,6 +344,18 @@ protected:
     */
     static void deleteTempFolder(
         ::rtl::OUString const & folderUrl);
+    
+    ::rtl::OUString getSharedRegistrationDataURL(
+        css::uno::Reference<css::deployment::XPackage> const & extension,
+        css::uno::Reference<css::deployment::XPackage> const & item);
+
+    /* The backends must implement this function, which is called
+       from XPackageRegistry::packageRemoved (also implemented here).
+       This ensure that the backends clean up their registration data
+       when an extension was removed.
+    */
+//    virtual void deleteDbEntry( ::rtl::OUString const & url) = 0;
+        
         
 
 public:
@@ -370,6 +385,12 @@ public:
                css::deployment::InvalidRemovedParameterException,
                css::ucb::CommandFailedException,
                css::lang::IllegalArgumentException, css::uno::RuntimeException);
+
+//     virtual void SAL_CALL packageRemoved(
+//         ::rtl::OUString const & url, ::rtl::OUString const & mediaType)
+//         throw (css::deployment::DeploymentException,
+//                css::uno::RuntimeException);
+
 };
 
 }
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index 12a9d14086..2deb1c6e56 100644..100755
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -146,6 +146,18 @@ public:
     virtual ~BackendDb() {};
 
     void removeEntry(::rtl::OUString const & url);
+
+    /* This is called to write the "revoked" attribute to the entry.
+       This is done when XPackage::revokePackage is called.
+    */
+    void revokeEntry(::rtl::OUString const & url);
+
+    /* returns false if the entry does not exist yet.
+     */
+    bool activateEntry(::rtl::OUString const & url);
+
+    bool hasActiveEntry(::rtl::OUString const & url);
+    
 };
 
 class RegisteredDb: public BackendDb
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index 7f8124b78d..7f8124b78d 100644..100755
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.hrc
diff --git a/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk
index e45cec272c..e45cec272c 100644..100755
--- a/desktop/source/deployment/registry/makefile.mk
+++ b/desktop/source/deployment/registry/makefile.mk
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 9da7756929..5f20628dc9 100644..100755
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -82,15 +82,19 @@ OUString ExtensionBackendDb::getKeyElementName()
 void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
 {
     try{
-        Reference<css::xml::dom::XNode> extensionNodeNode = writeKeyElement(url);
-        writeVectorOfPair(
-            data.items,
-            OUSTR("extension-items"),
-            OUSTR("item"),
-            OUSTR("url"),
-            OUSTR("media-type"),
-            extensionNodeNode);
-        save();
+        //reactive revoked entry if possible.
+        if (!activateEntry(url))
+        {
+            Reference<css::xml::dom::XNode> extensionNodeNode = writeKeyElement(url);
+            writeVectorOfPair(
+                data.items,
+                OUSTR("extension-items"),
+                OUSTR("item"),
+                OUSTR("url"),
+                OUSTR("media-type"),
+                extensionNodeNode);
+            save();
+        }
     }
     catch(css::uno::Exception &)
     {
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index f25203193a..f25203193a 100644..100755
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 3444aac638..a3d835a27a 100644..100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -191,6 +191,9 @@ class BackendImpl : public ImplBaseT
         virtual OUString SAL_CALL getDescription()
             throw (deployment::ExtensionRemovedException, RuntimeException);
 
+        virtual OUString SAL_CALL getLicenseText()
+            throw (deployment::ExtensionRemovedException, RuntimeException);
+
         virtual void SAL_CALL exportTo(
             OUString const & destFolderURL, OUString const & newTitle,
             sal_Int32 nameClashAction,
@@ -248,7 +251,7 @@ class BackendImpl : public ImplBaseT
 
     void addDataToDb(OUString const & url, ExtensionBackendDb::Data const & data);
     ExtensionBackendDb::Data readDataFromDb(OUString const & url);
-    void deleteDataFromDb(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
     
     // PackageRegistryBackend
     virtual Reference<deployment::XPackage> bindPackage_(
@@ -274,7 +277,10 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
-
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
+    
     using ImplBaseT::disposing;
 };
 
@@ -356,6 +362,21 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
     return m_typeInfos;
 }
 
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    //Notify the backend responsible for processing the different media
+    //types that this extension was removed.
+    ExtensionBackendDb::Data data = readDataFromDb(url);
+    for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); i++)
+    {
+        m_xRootRegistry->packageRemoved(i->first, i->second);
+    }
+
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
 
 
 // PackageRegistryBackend
@@ -456,10 +477,10 @@ ExtensionBackendDb::Data BackendImpl::readDataFromDb(
     return data;
 }
 
-void BackendImpl::deleteDataFromDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
 {
     if (m_backendDb.get())
-        m_backendDb->removeEntry(url);
+        m_backendDb->revokeEntry(url);
 }
 
 
@@ -965,7 +986,7 @@ void BackendImpl::PackageImpl::processPackage_(
                 // selected
             }
         }
-        getMyBackend()->deleteDataFromDb(getURL());
+        getMyBackend()->revokeEntryFromDb(getURL());
     }
 }
 
@@ -998,6 +1019,31 @@ OUString BackendImpl::PackageImpl::getDescription()
 }
 
 //______________________________________________________________________________
+OUString BackendImpl::PackageImpl::getLicenseText()
+    throw (deployment::ExtensionRemovedException, RuntimeException)
+{
+    if (m_bRemoved)
+        throw deployment::ExtensionRemovedException();    
+
+    OUString sLicense;
+    DescriptionInfoset aInfo = getDescriptionInfoset();
+
+    ::boost::optional< SimpleLicenseAttributes > aSimplLicAttr = aInfo.getSimpleLicenseAttributes();
+    if ( aSimplLicAttr )
+    {
+        OUString aLicenseURL = aInfo.getLocalizedLicenseURL();
+
+        if ( aLicenseURL.getLength() )
+        {
+            OUString aFullURL = m_url_expanded + OUSTR("/") + aLicenseURL;
+               sLicense = getTextFromURL( Reference< ucb::XCommandEnvironment >(), aFullURL);
+           }
+    }
+
+     return sLicense;
+}
+
+//______________________________________________________________________________
 void BackendImpl::PackageImpl::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv )
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index 0b258a58cd..0b258a58cd 100644..100755
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.hrc
diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src
index 056a17cb06..056a17cb06 100644..100755
--- a/desktop/source/deployment/registry/package/dp_package.src
+++ b/desktop/source/deployment/registry/package/dp_package.src
diff --git a/desktop/source/deployment/registry/package/makefile.mk b/desktop/source/deployment/registry/package/makefile.mk
index 203ce176d2..203ce176d2 100644..100755
--- a/desktop/source/deployment/registry/package/makefile.mk
+++ b/desktop/source/deployment/registry/package/makefile.mk
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index ccc2b29874..ccc2b29874 100644..100755
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 009846a3c0..009846a3c0 100644..100755
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 8a338073e0..f9266bfc6f 100644..100755
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -100,8 +100,8 @@ class BackendImpl : public t_helper
         Reference<XCommandEnvironment> const & xCmdEnv );
     
     void addDataToDb(OUString const & url);
-    void deleteDataFromDb(OUString const & url);
-    bool isRegisteredInDb(OUString const & url);
+    bool hasActiveEntry(OUString const & url);
+    void revokeEntryFromDb(OUString const & url);
 
     const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo;
@@ -117,6 +117,10 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
+
 };
 
 //______________________________________________________________________________
@@ -185,18 +189,11 @@ void BackendImpl::addDataToDb(OUString const & url)
         m_backendDb->addEntry(url);
 }
 
-bool BackendImpl::isRegisteredInDb(OUString const & url)
-{
-    bool registered = false;
-    if (m_backendDb.get())
-        registered = m_backendDb->getEntry(url);
-    return registered;
-}
-
-void BackendImpl::deleteDataFromDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
 {
     if (m_backendDb.get())
-        m_backendDb->removeEntry(url);
+        return m_backendDb->hasActiveEntry(url);
+    return false;
 }
 
 // XUpdatable
@@ -213,6 +210,19 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
     return m_typeInfos;
 }
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+    if (m_backendDb.get())
+        m_backendDb->revokeEntry(url);
+}
+
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+    if (m_backendDb.get())
+        m_backendDb->removeEntry(url);
+}
 
 // PackageRegistryBackend
 //______________________________________________________________________________
@@ -313,7 +323,7 @@ BackendImpl::PackageImpl::isRegistered_(
     BackendImpl * that = getMyBackend();
     Reference< deployment::XPackage > xThisPackage( this );
 
-    bool registered = that->isRegisteredInDb(getURL());
+    bool registered = that->hasActiveEntry(getURL());
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
         true /* IsPresent */,
         beans::Ambiguous<sal_Bool>( registered, false /* IsAmbiguous */ ) );
@@ -410,7 +420,7 @@ void BackendImpl::PackageImpl::processPackage_(
                     xComponentContext ), UNO_QUERY_THROW );
         }
     }
-    bool bRegistered = getMyBackend()->isRegisteredInDb(getURL());
+    bool bRegistered = getMyBackend()->hasActiveEntry(getURL());
     if( !doRegisterPackage )
     {
         //We cannot just call removeLibrary(name) because this could remove a
@@ -431,7 +441,7 @@ void BackendImpl::PackageImpl::processPackage_(
                 lcl_maybeRemoveScript(bScript, m_name, m_scriptURL, xScriptLibs);
                 lcl_maybeRemoveScript(bDialog, m_dialogName, m_dialogURL, xDialogLibs);
             }            
-            getMyBackend()->deleteDataFromDb(getURL());
+            getMyBackend()->revokeEntryFromDb(getURL());
             return;
         }
     }
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index f5b52f1b1f..f5b52f1b1f 100644..100755
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
index 21e0cfdcc9..21e0cfdcc9 100644..100755
--- a/desktop/source/deployment/registry/script/dp_script.src
+++ b/desktop/source/deployment/registry/script/dp_script.src
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 436ea3ce5f..436ea3ce5f 100644..100755
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index 63015ab1e4..63015ab1e4 100644..100755
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
diff --git a/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk
index 708def3580..708def3580 100644..100755
--- a/desktop/source/deployment/registry/script/makefile.mk
+++ b/desktop/source/deployment/registry/script/makefile.mk
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 4ac316e785..4ac316e785 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 6d2dc52006..6d2dc52006 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 59b1c9b98f..9518e72b99 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -89,6 +89,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             OUString const & identifier);
         // XPackage
         virtual OUString SAL_CALL getDescription() throw (RuntimeException);
+        virtual OUString SAL_CALL getLicenseText() throw (RuntimeException);
     };
     friend class PackageImpl;
     
@@ -99,6 +100,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         Reference<XCommandEnvironment> const & xCmdEnv );
 
     const Reference<deployment::XPackageTypeInfo> m_xTypeInfo;
+
     
 public:
     BackendImpl(
@@ -108,6 +110,9 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException);
 };
 
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
@@ -134,6 +139,12 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
 }
 
 //______________________________________________________________________________
+OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException)
+{
+    return Package::getDescription();
+}
+
+//______________________________________________________________________________
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<BackendImpl> const & myBackend,
     OUString const & url, OUString const & libType, bool bRemoved,
@@ -175,6 +186,8 @@ BackendImpl::BackendImpl(
     }
 }
 
+
+
 // XPackageRegistry
 //______________________________________________________________________________
 Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -183,6 +196,12 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
     return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1);
 }
 
+void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/)
+        throw (deployment::DeploymentException,
+               uno::RuntimeException)
+{
+}
+
 // PackageRegistryBackend
 //______________________________________________________________________________
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -295,6 +314,11 @@ void BackendImpl::PackageImpl:: initPackageHandler()
     {
         aContext  <<= OUSTR("bundled");
     }
+    else if ( that->m_eContext == CONTEXT_BUNDLED_PREREG )
+    {
+        aContext  <<= OUSTR("bundled_prereg");
+    }
+
     else
     {
         OSL_ASSERT( 0 );
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index ed164251cc..ed164251cc 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
index 32a5072401..32a5072401 100644..100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
diff --git a/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk
index a052296d5c..a052296d5c 100644..100755
--- a/desktop/source/deployment/registry/sfwk/makefile.mk
+++ b/desktop/source/deployment/registry/sfwk/makefile.mk
diff --git a/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk
index 82b41766b2..82b41766b2 100644..100755
--- a/desktop/source/deployment/target.pmk
+++ b/desktop/source/deployment/target.pmk
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index 06b39cd2d0..06b39cd2d0 100644..100755
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index b40b505af2..b40b505af2 100644..100755
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.src
diff --git a/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx
index 441cc06a1b..441cc06a1b 100644..100755
--- a/desktop/source/inc/exithelper.hxx
+++ b/desktop/source/inc/exithelper.hxx
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 2435467f76..facdc1f410 100644..100755
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -28,51 +28,40 @@
 #if ! defined INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
-#include "svl/solar.hrc"
+#define HID_PACKAGE_MANAGER                                "DESKTOP_HID_PACKAGE_MANAGER"
+#define HID_PACKAGE_MANAGER_TREELISTBOX                    "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX"
+#define HID_PACKAGE_MANAGER_PROGRESS                       "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS"
+#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL                "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL"
+#define HID_PACKAGE_MANAGER_MENU_ITEM                      "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM"
 
-#define HID_GLOBAL_FALLBACK                         0xFFFFFFFF
+#define HID_FIRSTSTART_DIALOG                              "DESKTOP_HID_FIRSTSTART_DIALOG"
+#define HID_FIRSTSTART_WELCOME                             "DESKTOP_HID_FIRSTSTART_WELCOME"
+#define HID_FIRSTSTART_LICENSE                             "DESKTOP_HID_FIRSTSTART_LICENSE"
+#define HID_FIRSTSTART_MIGRATION                           "DESKTOP_HID_FIRSTSTART_MIGRATION"
+#define HID_FIRSTSTART_REGISTRATION                        "DESKTOP_HID_FIRSTSTART_REGISTRATION"
+#define HID_FIRSTSTART_USER                                "DESKTOP_HID_FIRSTSTART_USER"
+#define HID_FIRSTSTART_PREV                                "DESKTOP_HID_FIRSTSTART_PREV"
+#define HID_FIRSTSTART_NEXT                                "DESKTOP_HID_FIRSTSTART_NEXT"
+#define HID_FIRSTSTART_CANCEL                              "DESKTOP_HID_FIRSTSTART_CANCEL"
+#define HID_FIRSTSTART_FINISH                              "DESKTOP_HID_FIRSTSTART_FINISH"
+#define UID_FIRSTSTART_HELP                                "DESKTOP_UID_FIRSTSTART_HELP"
+#define UID_BTN_LICENSE_ACCEPT                             "DESKTOP_UID_BTN_LICENSE_ACCEPT"
+#define HID_FIRSTSTART_UPDATE_CHECK                        "DESKTOP_HID_FIRSTSTART_UPDATE_CHECK"
+#define HID_DEPLOYMENT_GUI_UPDATE                          "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE"
+#define HID_DEPLOYMENT_GUI_UPDATEINSTALL                   "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL"
+#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER                "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER"
+#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES             "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES"
+#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES        "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES"
 
-#define HID_PACKAGE_MANAGER                         (HID_DESKTOP_START +   0)
-#define HID_PACKAGE_MANAGER_TREELISTBOX             (HID_DESKTOP_START +   1)
-#define HID_PACKAGE_MANAGER_PROGRESS                (HID_DESKTOP_START +   2)
-#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL         (HID_DESKTOP_START +   3)
-#define HID_PACKAGE_MANAGER_MENU_ITEM               (HID_DESKTOP_START +   4)
+#define HID_EXTENSION_MANAGER_LISTBOX                      "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX"
+#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS              "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS"
+#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE               "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE              "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE               "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE"
 
-#define HID_FIRSTSTART_DIALOG                       (HID_DESKTOP_START +   5)
-#define HID_FIRSTSTART_WELCOME                      (HID_DESKTOP_START +   6)
-#define HID_FIRSTSTART_LICENSE                      (HID_DESKTOP_START +   7)
-#define HID_FIRSTSTART_MIGRATION                    (HID_DESKTOP_START +   8)
-#define HID_FIRSTSTART_REGISTRATION                 (HID_DESKTOP_START +   9)
-#define HID_FIRSTSTART_USER                         (HID_DESKTOP_START +  10)
-#define HID_FIRSTSTART_PREV                         (HID_DESKTOP_START +  11)
-#define HID_FIRSTSTART_NEXT                         (HID_DESKTOP_START +  12)
-#define HID_FIRSTSTART_CANCEL                       (HID_DESKTOP_START +  13)
-#define HID_FIRSTSTART_FINISH                       (HID_DESKTOP_START +  14)
-#define UID_FIRSTSTART_HELP                         (HID_DESKTOP_START +  15)
-#define UID_BTN_LICENSE_ACCEPT						(HID_DESKTOP_START +  16)
-#define HID_FIRSTSTART_UPDATE_CHECK                 (HID_DESKTOP_START +  17)
-#define HID_DEPLOYMENT_GUI_UPDATE                   (HID_DESKTOP_START +  18)
-#define HID_DEPLOYMENT_GUI_UPDATEINSTALL            (HID_DESKTOP_START +  19)
-#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER         (HID_DESKTOP_START +  20)
-#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES      (HID_DESKTOP_START +  21)
-#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES (HID_DESKTOP_START +  22)
+#define HID_EXTENSION_DEPENDENCIES                         "DESKTOP_HID_EXTENSION_DEPENDENCIES"
 
-#define HID_EXTENSION_MANAGER_LISTBOX               (HID_DESKTOP_START +  23)
-#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS       (HID_DESKTOP_START +  24)
-#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE        (HID_DESKTOP_START +  25)
-#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE       (HID_DESKTOP_START +  26)
-#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE        (HID_DESKTOP_START +  27)
-
-#define HID_EXTENSION_DEPENDENCIES                  (HID_DESKTOP_START +  28)
-
-#define HID_PACKAGE_MANAGER_UPD_REQ                 (HID_DESKTOP_START +  29)
-
-#define ACT_DESKTOP_HID_END HID_PACKAGE_MANAGER_UPD_REQ
-
-// check bounds:
-#if ACT_DESKTOP_HID_END > HID_DESKTOP_END
-#error Resource overflow in #line, #file
-#endif
+#define HID_PACKAGE_MANAGER_UPD_REQ                        "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ"
 
 #endif
 
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index b20b4c5797..b20b4c5797 100644..100755
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index e755dda19b..e755dda19b 100644..100755
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index a4619b4c8d..a4619b4c8d 100644..100755
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
new file mode 100755
index 0000000000..291ec4d8b8
--- /dev/null
+++ b/desktop/source/migration/pages.cxx
@@ -0,0 +1,671 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_desktop.hxx"
+
+#include "pages.hxx"
+#include "wizard.hrc"
+#include "wizard.hxx"
+#include "migration.hxx"
+#include <vcl/msgbox.hxx>
+#include <vcl/mnemonic.hxx>
+#include <vos/security.hxx>
+#include <app.hxx>
+#include <rtl/ustring.hxx>
+#include <osl/file.hxx>
+#include <unotools/bootstrap.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/regoptions.hxx>
+#include <unotools/useroptions.hxx>
+#include <sfx2/basedlgs.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/beans/XMaterialHolder.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/task/XJobExecutor.hpp>
+#include <comphelper/configurationhelper.hxx>
+#include <rtl/bootstrap.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/file.hxx>
+#include <osl/thread.hxx>
+#include <unotools/bootstrap.hxx>
+#include <tools/config.hxx>
+
+using namespace rtl;
+using namespace osl;
+using namespace utl;
+using namespace svt;
+using namespace com::sun::star;
+using namespace com::sun::star::frame;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::util;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
+
+#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+namespace desktop {
+
+static void _setBold(FixedText& ft)
+{
+    Font f = ft.GetControlFont();
+    f.SetWeight(WEIGHT_BOLD);
+    ft.SetControlFont(f);
+}
+
+WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_Bool bLicenseNeedsAcceptance )
+    : OWizardPage(parent, resid)
+    , m_ftHead(this, WizardResId(FT_WELCOME_HEADER))
+    , m_ftBody(this, WizardResId(FT_WELCOME_BODY))
+    , m_pParent(parent)
+    , m_bLicenseNeedsAcceptance( bLicenseNeedsAcceptance )
+    , bIsEvalVersion(false)
+    , bNoEvalText(false)
+{
+    FreeResource();
+
+    _setBold(m_ftHead);
+
+    checkEval();
+
+    // check for migration
+    if (Migration::checkMigration())
+    {
+        String aText(WizardResId(STR_WELCOME_MIGRATION));
+        // replace %OLDPRODUCT with found version name
+        aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLD_VERSION"), Migration::getOldVersionName());
+        m_ftBody.SetText( aText );
+    }
+    else if ( ! m_bLicenseNeedsAcceptance )
+    {
+        String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
+        m_ftBody.SetText( aText );
+    }
+}
+
+
+void WelcomePage::checkEval()
+{
+    Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+    Reference< XMaterialHolder > xHolder(xFactory->createInstance(
+        OUString::createFromAscii("com.sun.star.tab.tabreg")), UNO_QUERY);
+    if (xHolder.is()) {
+        Any aData = xHolder->getMaterial();
+        Sequence < NamedValue > aSeq;
+        if (aData >>= aSeq) {
+            bIsEvalVersion = true;
+            for (int i=0; i< aSeq.getLength(); i++) {
+                if (aSeq[i].Name.equalsAscii("NoEvalText")) {
+                    aSeq[i].Value >>= bNoEvalText;
+                }
+            }
+        }
+    }
+}
+
+
+void WelcomePage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    // this page has no controls, so forwarding to default
+    // button (next) won't work if we grap focus
+    // GrabFocus();
+}
+
+LicensePage::LicensePage( svt::OWizardMachine* parent, const ResId& resid, const rtl::OUString &rLicensePath )
+    : OWizardPage(parent, resid)
+    , m_pParent(parent)
+    , m_ftHead(this, WizardResId(FT_LICENSE_HEADER))
+    , m_ftBody1(this, WizardResId(FT_LICENSE_BODY_1))
+    , m_ftBody1Txt(this, WizardResId(FT_LICENSE_BODY_1_TXT))
+    , m_ftBody2(this, WizardResId(FT_LICENSE_BODY_2))
+    , m_ftBody2Txt(this, WizardResId(FT_LICENSE_BODY_2_TXT))
+    , m_mlLicense(this, WizardResId(ML_LICENSE))
+    , m_pbDown(this, WizardResId(PB_LICENSE_DOWN))
+    , m_bLicenseRead(sal_False)
+{
+    FreeResource();
+
+    _setBold(m_ftHead);
+
+    m_mlLicense.SetEndReachedHdl( LINK(this, LicensePage, EndReachedHdl) );
+    m_mlLicense.SetScrolledHdl( LINK(this, LicensePage, ScrolledHdl) );
+    m_pbDown.SetClickHdl( LINK(this, LicensePage, PageDownHdl) );
+
+    // We want a automatic repeating page down button
+    WinBits aStyle = m_pbDown.GetStyle();
+    aStyle |= WB_REPEAT;
+    m_pbDown.SetStyle( aStyle );
+
+    // replace %PAGEDOWN in text2 with button text
+    String aText = m_ftBody1Txt.GetText();
+    aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"),
+        MnemonicGenerator::EraseAllMnemonicChars(m_pbDown.GetText()));
+
+    m_ftBody1Txt.SetText( aText );
+
+    // load license text
+    File aLicenseFile(rLicensePath);
+    if ( aLicenseFile.open(OpenFlag_Read) == FileBase::E_None)
+    {
+        DirectoryItem d;
+        DirectoryItem::get(rLicensePath, d);
+        FileStatus fs(FileStatusMask_FileSize);
+        d.getFileStatus(fs);
+        sal_uInt64 nBytesRead = 0;
+        sal_uInt64 nPosition = 0;
+        sal_uInt32 nBytes = (sal_uInt32)fs.getFileSize();
+        sal_Char *pBuffer = new sal_Char[nBytes];
+        // FileBase RC r = FileBase::E_None;
+        while (aLicenseFile.read(pBuffer+nPosition, nBytes-nPosition, nBytesRead) == FileBase::E_None
+            && nPosition + nBytesRead < nBytes)
+        {
+            nPosition += nBytesRead;
+        }
+        OUString aLicenseString(pBuffer, nBytes, RTL_TEXTENCODING_UTF8,
+                OSTRING_TO_OUSTRING_CVTFLAGS | RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE);
+        delete[] pBuffer;
+        m_mlLicense.SetText(aLicenseString);
+
+    }
+}
+
+void LicensePage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    m_bLicenseRead = m_mlLicense.IsEndReached();
+    m_pbDown.GrabFocus();
+    updateDialogTravelUI();
+}
+
+bool LicensePage::canAdvance() const
+{
+    if (m_mlLicense.IsEndReached())
+        const_cast< LicensePage* >( this )->m_pbDown.Disable();
+    else
+        const_cast< LicensePage* >( this )->m_pbDown.Enable();
+
+    return m_bLicenseRead;
+}
+
+IMPL_LINK( LicensePage, PageDownHdl, PushButton *, EMPTYARG )
+{
+    m_mlLicense.ScrollDown( SCROLL_PAGEDOWN );
+    return 0;
+}
+
+IMPL_LINK( LicensePage, EndReachedHdl, LicenseView *, EMPTYARG )
+{
+    m_bLicenseRead = sal_True;
+    updateDialogTravelUI();
+    return 0;
+}
+
+IMPL_LINK( LicensePage, ScrolledHdl, LicenseView *, EMPTYARG )
+{
+    updateDialogTravelUI();
+    return 0;
+}
+
+
+LicenseView::LicenseView( Window* pParent, const ResId& rResId )
+    : MultiLineEdit( pParent, rResId )
+{
+    SetLeftMargin( 5 );
+    mbEndReached = IsEndReached();
+    StartListening( *GetTextEngine() );
+}
+
+LicenseView::~LicenseView()
+{
+    maEndReachedHdl = Link();
+    maScrolledHdl   = Link();
+    EndListeningAll();
+}
+
+void LicenseView::ScrollDown( ScrollType eScroll )
+{
+    ScrollBar*  pScroll = GetVScrollBar();
+    if ( pScroll )
+        pScroll->DoScrollAction( eScroll );
+}
+
+sal_Bool LicenseView::IsEndReached() const
+{
+    sal_Bool bEndReached;
+
+    ExtTextView*    pView = GetTextView();
+    ExtTextEngine*  pEdit = GetTextEngine();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
+    Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
+    Point           aBottom( 0, aOutSize.Height() );
+
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
+    else
+        bEndReached = sal_False;
+
+    return bEndReached;
+}
+
+void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
+{
+    if ( rHint.IsA( TYPE(TextHint) ) )
+    {
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
+
+        if ( nId == TEXT_HINT_PARAINSERTED )
+        {
+            if ( bLastVal )
+                mbEndReached = IsEndReached();
+        }
+        else if ( nId == TEXT_HINT_VIEWSCROLLED )
+        {
+            if ( ! mbEndReached )
+                mbEndReached = IsEndReached();
+            maScrolledHdl.Call( this );
+        }
+
+        if ( EndReached() && !bLastVal )
+        {
+            maEndReachedHdl.Call( this );
+        }
+    }
+}
+
+
+
+// -------------------------------------------------------------------
+
+class MigrationThread : public ::osl::Thread
+{
+    public:
+        MigrationThread();
+        
+        virtual void SAL_CALL run();
+        virtual void SAL_CALL onTerminated(); 
+};
+
+MigrationThread::MigrationThread()
+{
+}
+
+void MigrationThread::run()
+{
+    try
+    {
+        Migration::doMigration();
+    }
+    catch ( uno::Exception& )
+    {
+    }
+}
+
+void MigrationThread::onTerminated()
+{
+}
+
+// -------------------------------------------------------------------
+
+MigrationPage::MigrationPage( 
+    svt::OWizardMachine* parent, 
+    const ResId& resid, Throbber& i_throbber )
+    : OWizardPage(parent, resid)
+    , m_ftHead(this, WizardResId(FT_MIGRATION_HEADER))
+    , m_ftBody(this, WizardResId(FT_MIGRATION_BODY))
+    , m_cbMigration(this, WizardResId(CB_MIGRATION))
+    , m_rThrobber(i_throbber)
+    , m_bMigrationDone(sal_False)
+{
+    FreeResource();
+    _setBold(m_ftHead);
+
+    // replace %OLDPRODUCT with found version name
+    String aText = m_ftBody.GetText();
+    aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLDPRODUCT"), Migration::getOldVersionName());
+    m_ftBody.SetText( aText );
+}
+
+sal_Bool MigrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
+{
+    if (_eReason == svt::WizardTypes::eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
+    {
+        GetParent()->EnterWait();
+        FirstStartWizard* pWizard = dynamic_cast< FirstStartWizard* >( GetParent() );
+        if ( pWizard )
+            pWizard->DisableButtonsWhileMigration();
+        
+        m_rThrobber.Show();
+        m_rThrobber.start();
+        MigrationThread* pMigThread = new MigrationThread();
+        pMigThread->create();
+        
+        while ( pMigThread->isRunning() )
+        {
+            Application::Reschedule();
+        }
+        
+        m_rThrobber.stop();
+        GetParent()->LeaveWait();
+        // Next state will enable buttons - so no EnableButtons necessary!
+        m_rThrobber.Hide();
+        pMigThread->join();
+        delete pMigThread;
+        m_bMigrationDone = sal_True;
+    }
+    else
+        Migration::cancelMigration();
+    return sal_True;
+}
+
+void MigrationPage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    GrabFocus();
+}
+
+UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
+    : OWizardPage(parent, resid)
+    , m_ftHead(this, WizardResId(FT_USER_HEADER))
+    , m_ftBody(this, WizardResId(FT_USER_BODY))
+    , m_ftFirst(this, WizardResId(FT_USER_FIRST))
+    , m_edFirst(this, WizardResId(ED_USER_FIRST))
+    , m_ftLast(this, WizardResId(FT_USER_LAST))
+    , m_edLast(this, WizardResId(ED_USER_LAST))
+    , m_ftInitials(this, WizardResId(FT_USER_INITIALS))
+    , m_edInitials(this, WizardResId(ED_USER_INITIALS))
+    , m_ftFather(this, WizardResId(FT_USER_FATHER))
+    , m_edFather(this, WizardResId(ED_USER_FATHER))
+    , m_lang(Application::GetSettings().GetUILanguage())
+{
+    FreeResource();
+    _setBold(m_ftHead);
+
+    // check whether this is a russian version. otherwise
+    // we'll hide the 'Fathers name' field
+    SvtUserOptions aUserOpt;
+    m_edFirst.SetText(aUserOpt.GetFirstName());
+    m_edLast.SetText(aUserOpt.GetLastName());
+#if 0
+    rtl::OUString aUserName;
+    vos::OSecurity().getUserName( aUserName );
+       aUserOpt.SetID( aUserName );
+#endif
+
+    m_edInitials.SetText(aUserOpt.GetID());
+    if (m_lang == LANGUAGE_RUSSIAN)
+    {
+        m_ftFather.Show();
+        m_edFather.Show();
+        m_edFather.SetText(aUserOpt.GetFathersName());
+    }
+}
+
+sal_Bool UserPage::commitPage( svt::WizardTypes::CommitPageReason )
+{
+    SvtUserOptions aUserOpt;
+    aUserOpt.SetFirstName(m_edFirst.GetText());
+    aUserOpt.SetLastName(m_edLast.GetText());
+    aUserOpt.SetID( m_edInitials.GetText());
+
+    if (m_lang == LANGUAGE_RUSSIAN)
+        aUserOpt.SetFathersName(m_edFather.GetText());
+
+    return sal_True;
+}
+
+void UserPage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    GrabFocus();
+}
+
+// -------------------------------------------------------------------
+UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid)
+    : OWizardPage(parent, resid)
+    , m_ftHead(this, WizardResId(FT_UPDATE_CHECK_HEADER))
+    , m_ftBody(this, WizardResId(FT_UPDATE_CHECK_BODY))
+    , m_cbUpdateCheck(this, WizardResId(CB_UPDATE_CHECK))
+{
+    FreeResource();
+    _setBold(m_ftHead);
+}
+
+sal_Bool UpdateCheckPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
+{
+    if ( _eReason == svt::WizardTypes::eTravelForward )
+    {
+        try {
+            Reference < XNameReplace > xUpdateAccess;
+            Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+
+            xUpdateAccess = Reference < XNameReplace >(
+                xFactory->createInstance( UNISTRING( "com.sun.star.setup.UpdateCheckConfig" ) ), UNO_QUERY_THROW );
+
+            if ( !xUpdateAccess.is() )
+                return sal_False;
+
+            sal_Bool bAutoUpdChk = m_cbUpdateCheck.IsChecked();
+            xUpdateAccess->replaceByName( UNISTRING("AutoCheckEnabled"), makeAny( bAutoUpdChk ) );
+
+            Reference< XChangesBatch > xChangesBatch( xUpdateAccess, UNO_QUERY);
+            if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+                xChangesBatch->commitChanges();
+        } catch (RuntimeException)
+        {
+        }
+    }
+
+    return sal_True;
+}
+
+void UpdateCheckPage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    GrabFocus();
+}
+
+// -------------------------------------------------------------------
+RegistrationPage::RegistrationPage( Window* pParent, const ResId& rResid )
+    : OWizardPage( pParent, rResid )
+    , m_ftHeader(this, WizardResId(FT_REGISTRATION_HEADER))
+    , m_ftBody(this, WizardResId(FT_REGISTRATION_BODY))
+    , m_rbNow(this, WizardResId(RB_REGISTRATION_NOW))
+    , m_rbLater(this, WizardResId(RB_REGISTRATION_LATER))
+    , m_rbNever(this, WizardResId(RB_REGISTRATION_NEVER))
+    , m_flSeparator(this, WizardResId(FL_REGISTRATION))
+    , m_ftEnd(this, WizardResId(FT_REGISTRATION_END))
+    , m_bNeverVisible( sal_True )
+{
+    FreeResource();
+
+    // another text for OOo
+    sal_Int32 nOpenSourceContext = 0;
+    try
+    {
+        ::utl::ConfigManager::GetDirectConfigProperty(
+            ::utl::ConfigManager::OPENSOURCECONTEXT ) >>= nOpenSourceContext;
+    }
+    catch( Exception& )
+    {
+        DBG_ERRORFILE( "RegistrationPage::RegistrationPage(): error while getting open source context" );
+    }
+
+    if ( nOpenSourceContext > 0 )
+    {
+        String sBodyText( WizardResId( STR_REGISTRATION_OOO ) );
+        m_ftBody.SetText( sBodyText );
+    }
+
+    // calculate height of body text and rearrange the buttons
+    Size aSize = m_ftBody.GetSizePixel();
+    Size aMinSize = m_ftBody.CalcMinimumSize( aSize.Width() );
+    long nTxtH = aMinSize.Height();
+    long nCtrlH = aSize.Height();
+    long nDelta = ( nCtrlH - nTxtH );
+    aSize.Height() -= nDelta;
+    m_ftBody.SetSizePixel( aSize );
+    Window* pWins[] = { &m_rbNow, &m_rbLater, &m_rbNever };
+    Window** pCurrent = pWins;
+    for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i, ++pCurrent )
+    {
+        Point aNewPos = (*pCurrent)->GetPosPixel();
+        aNewPos.Y() -= nDelta;
+        (*pCurrent)->SetPosPixel( aNewPos );
+    }
+
+    _setBold(m_ftHeader);
+    impl_retrieveConfigurationData();
+    updateButtonStates();
+}
+
+bool RegistrationPage::canAdvance() const
+{
+    return false;
+}
+
+void RegistrationPage::ActivatePage()
+{
+    OWizardPage::ActivatePage();
+    GrabFocus();
+}
+
+void RegistrationPage::impl_retrieveConfigurationData()
+{
+    static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.FirstStartWizard");
+    static ::rtl::OUString PATH    = ::rtl::OUString::createFromAscii("TabPages/Registration/RegistrationOptions/NeverButton");
+    static ::rtl::OUString KEY     = ::rtl::OUString::createFromAscii("Visible");
+
+    ::com::sun::star::uno::Any aValue;
+    try
+    {
+        aValue = ::comphelper::ConfigurationHelper::readDirectKey(
+                                ::comphelper::getProcessServiceFactory(),
+                                PACKAGE,
+                                PATH,
+                                KEY,
+                                ::comphelper::ConfigurationHelper::E_READONLY);
+    }
+    catch(const ::com::sun::star::uno::Exception&)
+        { aValue.clear(); }
+
+    aValue >>= m_bNeverVisible;
+}
+
+void RegistrationPage::updateButtonStates()
+{
+    m_rbNever.Show( m_bNeverVisible );
+}
+
+sal_Bool RegistrationPage::commitPage( svt::WizardTypes::CommitPageReason _eReason )
+{
+    if ( _eReason == svt::WizardTypes::eFinish )
+    {
+        ::utl::RegOptions aOptions;
+        rtl::OUString aEvent;
+
+        if ( m_rbNow.IsChecked())
+        {
+            aEvent = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RegistrationRequired" ) );
+        }
+        else if (m_rbLater.IsChecked())
+        {
+            aOptions.activateReminder(7);
+            // avtivate a reminder job...
+        }
+        // aOptions.markSessionDone();
+
+        try
+        {
+            // create the Desktop component which can load components
+            Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+            if( xFactory.is() )
+            {
+                Reference< com::sun::star::task::XJobExecutor > xProductRegistration(
+                    xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.setup.ProductRegistration" ) ) ),
+                    UNO_QUERY_THROW );
+
+                 // tell it that the user wants to register
+                 xProductRegistration->trigger( aEvent );
+            }
+        }
+        catch( const Exception& )
+        {
+        }
+    }
+    return sal_True;
+}
+
+RegistrationPage::RegistrationMode RegistrationPage::getRegistrationMode() const
+{
+    RegistrationPage::RegistrationMode eMode = rmNow;
+    if ( m_rbLater.IsChecked() )
+        eMode = rmLater;
+    else if ( m_rbNever.IsChecked() )
+        eMode = rmNever;
+    return eMode;
+}
+
+void RegistrationPage::prepareSingleMode()
+{
+    // remove wizard text (hide and cut)
+    m_flSeparator.Hide();
+    m_ftEnd.Hide();
+    Size aNewSize = GetSizePixel();
+    aNewSize.Height() -= ( aNewSize.Height() - m_flSeparator.GetPosPixel().Y() );
+    SetSizePixel( aNewSize );
+}
+
+bool RegistrationPage::hasReminderDateCome()
+{
+    return ::utl::RegOptions().hasReminderDateCome();
+}
+
+void RegistrationPage::executeSingleMode()
+{
+    // opens the page in a single tabdialog
+    SfxSingleTabDialog aSingleDlg( NULL, TP_REGISTRATION );
+    RegistrationPage* pPage = new RegistrationPage( &aSingleDlg, WizardResId( TP_REGISTRATION ) );
+    pPage->prepareSingleMode();
+    aSingleDlg.SetPage( pPage );
+    aSingleDlg.SetText( pPage->getSingleModeTitle() );
+    aSingleDlg.Execute();
+    // the registration modes "Now" and "Later" are handled by the page
+    RegistrationPage::RegistrationMode eMode = pPage->getRegistrationMode();
+    if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
+        pPage->commitPage( WizardTypes::eFinish );
+    if ( eMode != RegistrationPage::rmLater )
+        ::utl::RegOptions().removeReminder();
+}
+
+} // namespace desktop
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
new file mode 100755
index 0000000000..2f6c2d31a5
--- /dev/null
+++ b/desktop/source/migration/pages.hxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _PAGES_HXX_
+#define _PAGES_HXX_
+
+#include <vcl/tabpage.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/throbber.hxx>
+#include <svtools/wizardmachine.hxx>
+#include <svtools/svmedit.hxx>
+#include <svl/lstner.hxx>
+#include <svtools/xtextedt.hxx>
+
+namespace desktop
+{
+class WelcomePage : public svt::OWizardPage
+{
+private:
+    FixedText m_ftHead;
+    FixedText m_ftBody;
+    svt::OWizardMachine *m_pParent;
+    sal_Bool m_bLicenseNeedsAcceptance;
+    enum OEMType
+    {
+        OEM_NONE, OEM_NORMAL, OEM_EXTENDED
+    };
+    bool bIsEvalVersion;
+    bool bNoEvalText;
+    void checkEval();
+
+
+public:
+    WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_Bool bLicenseNeedsAcceptance );
+protected:
+    virtual void ActivatePage();
+};
+
+class LicenseView : public MultiLineEdit, public SfxListener
+{
+    sal_Bool            mbEndReached;
+    Link            maEndReachedHdl;
+    Link            maScrolledHdl;
+
+public:
+    LicenseView( Window* pParent, const ResId& rResId );
+    ~LicenseView();
+
+    void ScrollDown( ScrollType eScroll );
+
+    sal_Bool IsEndReached() const;
+    sal_Bool EndReached() const { return mbEndReached; }
+    void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
+
+    void SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
+    const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
+
+    void SetScrolledHdl( const Link& rHdl )  { maScrolledHdl = rHdl; }
+    const Link& GetScrolledHdl() const { return maScrolledHdl; }
+
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+
+protected:
+    using MultiLineEdit::Notify;
+};
+
+class LicensePage : public svt::OWizardPage
+{
+private:
+    svt::OWizardMachine *m_pParent;
+    FixedText m_ftHead;
+    FixedText m_ftBody1;
+    FixedText m_ftBody1Txt;
+    FixedText m_ftBody2;
+    FixedText m_ftBody2Txt;
+    LicenseView m_mlLicense;
+    PushButton m_pbDown;
+    sal_Bool m_bLicenseRead;
+public:
+    LicensePage( svt::OWizardMachine* parent, const ResId& resid, const rtl::OUString &rLicensePath );
+private:
+    DECL_LINK(PageDownHdl, PushButton*);
+    DECL_LINK(EndReachedHdl, LicenseView*);
+    DECL_LINK(ScrolledHdl, LicenseView*);
+protected:
+    virtual bool canAdvance() const;
+    virtual void ActivatePage();
+};
+
+class MigrationPage : public svt::OWizardPage
+{
+private:
+    FixedText m_ftHead;
+    FixedText m_ftBody;
+    CheckBox  m_cbMigration;
+    Throbber& m_rThrobber;
+    sal_Bool m_bMigrationDone;
+public:
+    MigrationPage( svt::OWizardMachine* parent, const ResId& resid, Throbber& i_throbber );
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
+
+protected:
+    virtual void ActivatePage();
+};
+
+class UserPage : public svt::OWizardPage
+{
+private:
+    FixedText m_ftHead;
+    FixedText m_ftBody;
+    FixedText m_ftFirst;
+    Edit m_edFirst;
+    FixedText m_ftLast;
+    Edit m_edLast;
+    FixedText m_ftInitials;
+    Edit m_edInitials;
+    FixedText m_ftFather;
+    Edit m_edFather;
+    LanguageType m_lang;
+
+public:
+    UserPage( svt::OWizardMachine* parent, const ResId& resid);
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
+protected:
+    virtual void ActivatePage();
+};
+
+class UpdateCheckPage : public svt::OWizardPage
+{
+private:
+    FixedText m_ftHead;
+    FixedText m_ftBody;
+    CheckBox m_cbUpdateCheck;
+public:
+    UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resid);
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
+
+protected:
+    virtual void ActivatePage();
+};
+
+
+class RegistrationPage : public svt::OWizardPage
+{
+private:
+    FixedText   m_ftHeader;
+    FixedText   m_ftBody;
+    RadioButton m_rbNow;
+    RadioButton m_rbLater;
+    RadioButton m_rbNever;
+    FixedLine   m_flSeparator;
+    FixedText   m_ftEnd;
+
+    sal_Bool    m_bNeverVisible;
+
+    void updateButtonStates();
+    void impl_retrieveConfigurationData();
+
+protected:
+    virtual bool canAdvance() const;
+    virtual void ActivatePage();
+
+    virtual sal_Bool commitPage( svt::WizardTypes::CommitPageReason _eReason );
+
+public:
+    RegistrationPage( Window* parent, const ResId& resid);
+
+    enum RegistrationMode
+    {
+        rmNow,      // register now
+        rmLater,    // register later
+        rmNever     // register never
+    };
+
+    RegistrationMode    getRegistrationMode() const;
+    void                prepareSingleMode();
+    inline String       getSingleModeTitle() const { return m_ftHeader.GetText(); }
+
+    static bool         hasReminderDateCome();
+    static void         executeSingleMode();
+};
+
+} // namespace desktop
+
+#endif // #ifndef _PAGES_HXX_
+
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 4b12969dbe..4b12969dbe 100644..100755
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
diff --git a/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx
index 9a8aef32cd..9a8aef32cd 100644..100755
--- a/desktop/source/migration/services/autocorrmigration.hxx
+++ b/desktop/source/migration/services/autocorrmigration.hxx
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index fa3fa81fa4..fa3fa81fa4 100644..100755
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 131092748a..131092748a 100644..100755
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index 261cf26665..02ff514a0b 100644..100755
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -67,13 +67,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, entries );
-}
-
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx
index 771c161879..9ffc255de5 100644..100755
--- a/desktop/source/migration/services/cexportsoo3.cxx
+++ b/desktop/source/migration/services/cexportsoo3.cxx
@@ -52,13 +52,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, entries );
-}
-
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/desktop/source/migration/services/cppumaker.mk b/desktop/source/migration/services/cppumaker.mk
index 5ab16ed1e3..5ab16ed1e3 100644..100755
--- a/desktop/source/migration/services/cppumaker.mk
+++ b/desktop/source/migration/services/cppumaker.mk
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 3e756bf451..3e756bf451 100644..100755
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 96e459521d..96e459521d 100644..100755
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 35f21ba99d..718ac0387c 100644..100755
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -87,7 +87,7 @@ DEF1NAME=$(SHL1TARGET)
 
 COMP2TYPELIST = migrationoo3
 SHL2TARGET=migrationoo3.uno
-SHL2VERSIONMAP = migrationoo3.map
+SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL2OBJS= \
         $(SLO)$/cexportsoo3.obj \
@@ -116,3 +116,18 @@ DEF2NAME=$(SHL2TARGET)
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/migrationoo3.component
+
+$(MISC)/migrationoo3.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component
+
+ALLTAR : $(MISC)/migrationoo2.component
+
+$(MISC)/migrationoo2.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component
diff --git a/desktop/source/migration/services/migrationoo2.component b/desktop/source/migration/services/migrationoo2.component
new file mode 100755
index 0000000000..2b21ab123b
--- /dev/null
+++ b/desktop/source/migration/services/migrationoo2.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.desktop.migration.Basic">
+    <service name="com.sun.star.migration.Basic"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.desktop.migration.Wordbooks">
+    <service name="com.sun.star.migration.Wordbooks"/>
+  </implementation>
+</component>
diff --git a/desktop/source/migration/services/migrationoo2.xml b/desktop/source/migration/services/migrationoo2.xml
index 0c77badebc..0c77badebc 100644..100755
--- a/desktop/source/migration/services/migrationoo2.xml
+++ b/desktop/source/migration/services/migrationoo2.xml
diff --git a/desktop/source/migration/services/migrationoo3.component b/desktop/source/migration/services/migrationoo3.component
new file mode 100755
index 0000000000..380c389ab7
--- /dev/null
+++ b/desktop/source/migration/services/migrationoo3.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.desktop.migration.OOo3Extensions">
+    <service name="com.sun.star.migration.Extensions"/>
+  </implementation>
+</component>
diff --git a/desktop/source/migration/services/migrationoo3.map b/desktop/source/migration/services/migrationoo3.map
deleted file mode 100644
index ac2c3750bf..0000000000
--- a/desktop/source/migration/services/migrationoo3.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index a8f7babef9..a8f7babef9 100644..100755
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index bf61dbb1b1..bd8c27e0c3 100644..100755
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -293,7 +293,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                     utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                     xub_StrLen start = 0;
-                    xub_StrLen end   = static_cast<USHORT>(aExtIdentifier.getLength());
+                    xub_StrLen end   = static_cast<sal_uInt16>(aExtIdentifier.getLength());
                     if (ts.SearchFrwrd(aExtIdentifier, &start, &end))
                         return false;
                 }
@@ -318,7 +318,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                 utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                 xub_StrLen start = 0;
-                xub_StrLen end   = static_cast<USHORT>(sDescriptionXmlURL.getLength());
+                xub_StrLen end   = static_cast<sal_uInt16>(sDescriptionXmlURL.getLength());
                 if (ts.SearchFrwrd(sDescriptionXmlURL, &start, &end))
                     return false;
             }
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 0843707fb6..0843707fb6 100644..100755
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 4900c02755..3f1a79d1c6 100644..100755
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -177,7 +177,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
                 bRet = true;
             else
             {
-                USHORT nLen;
+                sal_uInt16 nLen;
                 pStream->Seek (nSniffPos);
                 *pStream >> nLen;
                 if ( nLen < MAX_HEADER_LENGTH )
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 8b04417dba..8b04417dba 100644..100755
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
new file mode 100755
index 0000000000..47f3fcda50
--- /dev/null
+++ b/desktop/source/migration/wizard.cxx
@@ -0,0 +1,603 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_desktop.hxx"
+
+#include <migration.hxx>
+#include "wizard.hxx"
+#include "wizard.hrc"
+#include "pages.hxx"
+#include "app.hxx"
+
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/bootstrap.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <tools/date.hxx>
+#include <tools/time.hxx>
+#include <tools/datetime.hxx>
+#include <osl/file.hxx>
+#include <osl/time.h>
+#include <osl/module.hxx>
+#include <unotools/bootstrap.hxx>
+#include <vcl/msgbox.hxx>
+
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/util/XChangesBatch.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/awt/WindowDescriptor.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+
+using namespace svt;
+using namespace rtl;
+using namespace osl;
+using namespace utl;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::util;
+using namespace com::sun::star::container;
+
+#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+namespace desktop
+{
+
+const FirstStartWizard::WizardState FirstStartWizard::STATE_WELCOME      = 0;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_LICENSE      = 1;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_MIGRATION    = 2;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_USER         = 3;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_UPDATE_CHECK = 4;
+const FirstStartWizard::WizardState FirstStartWizard::STATE_REGISTRATION = 5;
+
+static sal_Int32 getBuildId()
+{
+    ::rtl::OUString aDefault;
+    ::rtl::OUString aBuildIdData = utl::Bootstrap::getBuildIdData( aDefault );
+    sal_Int32 nBuildId( 0 );
+    sal_Int32 nIndex1 = aBuildIdData.indexOf(':');
+    sal_Int32 nIndex2 = aBuildIdData.indexOf(')');
+    if (( nIndex1 > 0 ) && ( nIndex2 > 0 ) && ( nIndex2-1 > nIndex1+1 ))
+    {
+        ::rtl::OUString aBuildId = aBuildIdData.copy( nIndex1+1, nIndex2-nIndex1-1 );
+        nBuildId = aBuildId.toInt32();
+    }
+    return nBuildId;
+}
+
+WizardResId::WizardResId( sal_uInt16 nId ) :
+    ResId( nId, *FirstStartWizard::GetResManager() )
+{
+}
+
+ResMgr *FirstStartWizard::pResMgr = 0;
+
+ResMgr *FirstStartWizard::GetResManager()
+{
+    if ( !FirstStartWizard::pResMgr )
+    {
+        String aMgrName = String::CreateFromAscii( "dkt" );
+        FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString( aMgrName, RTL_TEXTENCODING_UTF8 ));
+    }
+    return FirstStartWizard::pResMgr;
+}
+
+FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAcceptance, const rtl::OUString &rLicensePath )
+    :RoadmapWizard( pParent, WizardResId(DLG_FIRSTSTART_WIZARD),
+        WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP)
+    ,m_bOverride(sal_False)
+    ,m_aDefaultPath(0)
+    ,m_aMigrationPath(0)
+    ,m_bDone(sal_False)
+    ,m_bLicenseNeedsAcceptance( bLicenseNeedsAcceptance )
+    ,m_bLicenseWasAccepted(sal_False)
+    ,m_bAutomaticUpdChk(sal_True)
+    ,m_aThrobber(this, WizardResId(CTRL_THROBBER))
+    ,m_aLicensePath( rLicensePath )
+{
+    FreeResource();
+    // ---
+//	enableState(STATE_USER, sal_False);
+//  enableState(STATE_REGISTRATION, sal_False);
+
+    Size aTPSize(TP_WIDTH, TP_HEIGHT);
+    SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT));
+
+    //set help id
+    m_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV);
+    m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT);
+    m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL);
+    m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH);
+    // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP);
+    m_pHelp->Hide();
+    m_pHelp->Disable();
+    
+    // save button lables
+    m_sNext = m_pNextPage->GetText();
+    m_sCancel = m_pCancel->GetText();
+
+    // save cancel click handler
+    m_lnkCancel = m_pCancel->GetClickHdl();
+
+    m_aDefaultPath = defineWizardPagesDependingFromContext();
+    activatePath(m_aDefaultPath, sal_True);
+
+    ActivatePage();
+
+    // set text of finish putton:
+    m_pFinish->SetText(String(WizardResId(STR_FINISH)));
+    // disable "finish button"
+    enableButtons(WZB_FINISH, sal_False);
+    defaultButton(WZB_NEXT);
+}
+
+void FirstStartWizard::DisableButtonsWhileMigration()
+{
+    enableButtons(0xff, sal_False);
+}
+
+::svt::RoadmapWizardTypes::PathId FirstStartWizard::defineWizardPagesDependingFromContext()
+{
+    ::svt::RoadmapWizardTypes::PathId aDefaultPath = 0;
+
+    sal_Bool bPage_Welcome      = sal_True;
+    sal_Bool bPage_License      = sal_True;
+    sal_Bool bPage_Migration    = sal_True;
+    sal_Bool bPage_User         = sal_True;
+    sal_Bool bPage_UpdateCheck  = sal_True;
+    sal_Bool bPage_Registration = sal_True;
+
+    bPage_License     = m_bLicenseNeedsAcceptance;
+    bPage_Migration   = Migration::checkMigration();
+    bPage_UpdateCheck = showOnlineUpdatePage();
+
+    WizardPath aPath;
+    if (bPage_Welcome)
+        aPath.push_back(STATE_WELCOME);
+    if (bPage_License)
+        aPath.push_back(STATE_LICENSE);
+    if (bPage_Migration)
+        aPath.push_back(STATE_MIGRATION);
+    if (bPage_User)
+        aPath.push_back(STATE_USER);
+    if (bPage_UpdateCheck)
+        aPath.push_back(STATE_UPDATE_CHECK);
+    if (bPage_Registration)
+        aPath.push_back(STATE_REGISTRATION);
+    
+    declarePath(aDefaultPath, aPath);
+
+    // a) If license must be accepted by the user, all direct links
+    //    to wizard tab pages must be disabled. Because such pages
+    //	  should be accessible only in case license was accepted !
+    // b) But if no license should be shown at all ...
+    //    such direct links can be enabled by default.
+    sal_Bool bAllowDirectLink = ( ! bPage_License);
+
+    if (bPage_User)
+        enableState(STATE_USER, bAllowDirectLink);
+    if (bPage_UpdateCheck)
+        enableState(STATE_UPDATE_CHECK, bAllowDirectLink);
+    if (bPage_Migration)
+        enableState(STATE_MIGRATION, bAllowDirectLink);
+    if (bPage_Registration)
+        enableState(STATE_REGISTRATION, bAllowDirectLink);
+
+    return aDefaultPath;
+}
+
+// catch F1 and disable help
+long FirstStartWizard::PreNotify( NotifyEvent& rNEvt )
+{
+    if( rNEvt.GetType() == EVENT_KEYINPUT )
+    {
+        const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode();
+        if( rKey.GetCode() == KEY_F1 && ! rKey.GetModifier() )
+            return sal_True;
+    }
+    return RoadmapWizard::PreNotify(rNEvt);        
+}
+
+
+void FirstStartWizard::enterState(WizardState _nState)
+{
+    RoadmapWizard::enterState(_nState);
+    // default state
+    // all on
+    enableButtons(0xff, sal_True);
+    // finish off
+    enableButtons(WZB_FINISH, sal_False);
+    // default text
+    m_pCancel->SetText(m_sCancel);
+    m_pCancel->SetClickHdl(m_lnkCancel);
+    m_pNextPage->SetText(m_sNext);
+
+    // default
+    defaultButton(WZB_NEXT);
+
+    // specialized state
+    switch (_nState)
+    {     
+    case STATE_WELCOME:
+        enableButtons(WZB_PREVIOUS, sal_False);
+        break;
+    case STATE_LICENSE:
+        m_pCancel->SetText(String(WizardResId(STR_LICENSE_DECLINE)));
+        m_pNextPage->SetText(String(WizardResId(STR_LICENSE_ACCEPT)));
+        enableButtons(WZB_NEXT, sal_False);
+        // attach warning dialog to cancel/decline button        
+        m_pCancel->SetClickHdl( LINK(this, FirstStartWizard, DeclineHdl) );
+        break;
+    case STATE_REGISTRATION:
+        enableButtons(WZB_NEXT, sal_False); 
+        enableButtons(WZB_FINISH, sal_True);
+        defaultButton(WZB_FINISH);
+        break;
+    }
+
+    // focus
+        
+}
+
+IMPL_LINK( FirstStartWizard, DeclineHdl, PushButton *, EMPTYARG )
+{
+    QueryBox aBox(this, WizardResId(QB_ASK_DECLINE));
+    sal_Int32 ret = aBox.Execute();
+    if ( ret == BUTTON_OK || ret == BUTTON_YES)
+    {
+        Close();
+        return sal_False;
+    }
+    else
+        return sal_True;
+}
+
+
+TabPage* FirstStartWizard::createPage(WizardState _nState)
+{
+    TabPage *pTabPage = 0;
+    switch (_nState)
+    {
+    case STATE_WELCOME:
+        pTabPage = new WelcomePage(this, WizardResId(TP_WELCOME), m_bLicenseNeedsAcceptance);
+        break;
+    case STATE_LICENSE:
+        pTabPage = new LicensePage(this, WizardResId(TP_LICENSE), m_aLicensePath);
+        break;
+    case STATE_MIGRATION:
+        pTabPage = new MigrationPage(this, WizardResId(TP_MIGRATION), m_aThrobber);
+        break;
+    case STATE_USER:
+        pTabPage = new UserPage(this, WizardResId(TP_USER));
+        break;
+    case STATE_UPDATE_CHECK:
+        pTabPage = new UpdateCheckPage(this, WizardResId(TP_UPDATE_CHECK));
+        break;
+    case STATE_REGISTRATION:
+        pTabPage = new RegistrationPage(this, WizardResId(TP_REGISTRATION));
+        break;
+    }
+    pTabPage->Show();
+
+    return pTabPage;
+}
+
+String FirstStartWizard::getStateDisplayName( WizardState _nState ) const
+{
+    String sName;
+    switch(_nState)
+    {
+    case STATE_WELCOME:
+        sName = String(WizardResId(STR_STATE_WELCOME));
+        break;
+    case STATE_LICENSE:
+        sName = String(WizardResId(STR_STATE_LICENSE));
+        break;
+    case STATE_MIGRATION:
+        sName = String(WizardResId(STR_STATE_MIGRATION));
+        break;
+    case STATE_USER:
+        sName = String(WizardResId(STR_STATE_USER));
+        break;
+    case STATE_UPDATE_CHECK:
+        sName = String(WizardResId(STR_STATE_UPDATE_CHECK));
+        break;
+    case STATE_REGISTRATION:
+        sName = String(WizardResId(STR_STATE_REGISTRATION));
+        break;
+    }
+    return sName;
+}
+
+sal_Bool FirstStartWizard::prepareLeaveCurrentState( CommitPageReason _eReason )
+{
+    // the license acceptance is handled here, because it needs to change the state
+    // of the roadmap wizard which the page implementation does not know.
+    if (
+        (_eReason              == eTravelForward) &&
+        (getCurrentState()     == STATE_LICENSE ) &&
+        (m_bLicenseWasAccepted == sal_False     )
+       )
+    {
+        if (Migration::checkMigration())
+            enableState(FirstStartWizard::STATE_MIGRATION, sal_True);
+        if ( showOnlineUpdatePage() )
+            enableState(FirstStartWizard::STATE_UPDATE_CHECK, sal_True);
+        enableState(FirstStartWizard::STATE_USER, sal_True);
+        enableState(FirstStartWizard::STATE_REGISTRATION, sal_True);
+
+        storeAcceptDate();
+        m_bLicenseWasAccepted = sal_True;        
+    }
+
+    return svt::RoadmapWizard::prepareLeaveCurrentState(_eReason);
+}
+
+sal_Bool FirstStartWizard::leaveState(WizardState)
+{    
+    if (( getCurrentState() == STATE_MIGRATION ) && m_bLicenseWasAccepted )
+    {
+        // Store accept date and patch level now as it has been 
+        // overwritten by the migration process!
+        storeAcceptDate();
+        setPatchLevel();
+    }
+
+    return sal_True;
+}
+
+sal_Bool FirstStartWizard::onFinish()
+{
+    // return sal_True;
+    if ( svt::RoadmapWizard::onFinish() )
+    {
+#ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments.
+        enableQuickstart();
+#endif
+        disableWizard();
+        return sal_True;
+    } 
+    else
+        return sal_False;
+}
+
+short FirstStartWizard::Execute()
+{
+    return svt::RoadmapWizard::Execute();
+}
+
+static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
+{
+    OStringBuffer aDateTimeString;
+    aDateTimeString.append((sal_Int32)aDateTime.GetYear());
+    aDateTimeString.append("-");
+    if (aDateTime.GetMonth()<10) aDateTimeString.append("0");
+    aDateTimeString.append((sal_Int32)aDateTime.GetMonth());
+    aDateTimeString.append("-");
+    if (aDateTime.GetDay()<10) aDateTimeString.append("0");
+    aDateTimeString.append((sal_Int32)aDateTime.GetDay());
+    aDateTimeString.append("T");
+    if (aDateTime.GetHour()<10) aDateTimeString.append("0");
+    aDateTimeString.append((sal_Int32)aDateTime.GetHour());
+    aDateTimeString.append(":");
+    if (aDateTime.GetMin()<10) aDateTimeString.append("0");
+    aDateTimeString.append((sal_Int32)aDateTime.GetMin());
+    aDateTimeString.append(":");
+    if (aDateTime.GetSec()<10) aDateTimeString.append("0");
+    aDateTimeString.append((sal_Int32)aDateTime.GetSec());
+    if (bUTC) aDateTimeString.append("Z");
+
+    return OStringToOUString(aDateTimeString.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
+}
+
+static OUString _getCurrentDateString()
+{
+    OUString aString;
+    return _makeDateTimeString(DateTime());   
+}
+
+
+static const OUString sConfigSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) );
+static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
+static const OUString sReadSrvc  ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ) );
+
+void FirstStartWizard::storeAcceptDate()
+{
+
+    try {
+        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        // get configuration provider
+        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
+        xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+        Sequence< Any > theArgs(1);
+        NamedValue v(OUString::createFromAscii("NodePath"), 
+            makeAny(OUString::createFromAscii("org.openoffice.Setup/Office")));
+        theArgs[0] <<= v;
+        Reference< XPropertySet > pset = Reference< XPropertySet >(
+            theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
+        Any result = pset->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
+
+        OUString aAcceptDate = _getCurrentDateString();
+        pset->setPropertyValue(OUString::createFromAscii("LicenseAcceptDate"), makeAny(aAcceptDate));
+        Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
+
+        // since the license is accepted the local user registry can be cleaned if required
+        cleanOldOfficeRegKeys();
+    } catch (const Exception&)
+    {
+    }
+
+}
+
+void FirstStartWizard::setPatchLevel()
+{
+    try {
+        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        // get configuration provider
+        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
+        xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+        Sequence< Any > theArgs(1);
+        NamedValue v(OUString::createFromAscii("NodePath"), 
+            makeAny(OUString::createFromAscii("org.openoffice.Office.Common/Help/Registration")));
+        theArgs[0] <<= v;
+        Reference< XPropertySet > pset = Reference< XPropertySet >(
+            theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
+        Any result = pset->getPropertyValue(OUString::createFromAscii("ReminderDate"));
+
+        OUString aPatchLevel( RTL_CONSTASCII_USTRINGPARAM( "Patch" ));
+        aPatchLevel += OUString::valueOf( getBuildId(), 10 );
+        pset->setPropertyValue(OUString::createFromAscii("ReminderDate"), makeAny(aPatchLevel));
+        Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
+    } catch (const Exception&)
+    {
+    }
+}
+
+#ifdef WNT
+typedef int ( __stdcall * CleanCurUserRegProc ) ( wchar_t* );
+#endif
+
+void FirstStartWizard::cleanOldOfficeRegKeys()
+{
+#ifdef WNT
+    // after the wizard is completed clean OOo1.1.x entries in the current user registry if required
+    // issue i47658
+
+    OUString aBaseLocationPath;
+    OUString aSharedLocationPath;
+    OUString aInstallMode;
+
+    ::utl::Bootstrap::PathStatus aBaseLocateResult = 
+        ::utl::Bootstrap::locateBaseInstallation( aBaseLocationPath );
+    ::utl::Bootstrap::PathStatus aSharedLocateResult = 
+        ::utl::Bootstrap::locateSharedData( aSharedLocationPath );
+    aInstallMode = ::utl::Bootstrap::getAllUsersValue( ::rtl::OUString() );
+
+    // TODO: replace the checking for install mode
+    if ( aBaseLocateResult == ::utl::Bootstrap::PATH_EXISTS && aSharedLocateResult == ::utl::Bootstrap::PATH_EXISTS
+      && aInstallMode.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ) ) ) )
+    {
+        ::rtl::OUString aDeregCompletePath =
+                    aBaseLocationPath + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/regcleanold.dll" ) );
+        ::rtl::OUString aExecCompletePath =
+                    aSharedLocationPath + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/regdeinstall/userdeinst.exe" ) );
+
+        osl::Module aCleanModule( aDeregCompletePath );
+        CleanCurUserRegProc pNativeProc = ( CleanCurUserRegProc )(
+                    aCleanModule.getFunctionSymbol(
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CleanCurUserOldSystemRegistry" ) ) ) );
+
+        if( pNativeProc!=NULL )
+        {
+            ::rtl::OUString aExecCompleteSysPath;
+            if ( osl::File::getSystemPathFromFileURL( aExecCompletePath, aExecCompleteSysPath ) == FileBase::E_None
+              && aExecCompleteSysPath.getLength() )
+            {
+                ( *pNativeProc )( (wchar_t*)( aExecCompleteSysPath.getStr() ) );
+            }
+        }
+    }
+#endif
+}
+
+void FirstStartWizard::disableWizard()
+{
+
+    try {
+        Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+        // get configuration provider
+        Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
+        xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
+        Sequence< Any > theArgs(1);
+        NamedValue v(OUString::createFromAscii("NodePath"), 
+            makeAny(OUString::createFromAscii("org.openoffice.Setup/Office")));
+        theArgs[0] <<= v;
+        Reference< XPropertySet > pset = Reference< XPropertySet >(
+            theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
+        pset->setPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"), makeAny(sal_True));
+        Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
+    } catch (const Exception&)
+    {
+    }
+
+}
+
+
+void FirstStartWizard::enableQuickstart()
+{
+    sal_Bool bQuickstart( sal_True );
+    sal_Bool bAutostart( sal_True );
+    Sequence< Any > aSeq( 2 );
+    aSeq[0] <<= bQuickstart;
+    aSeq[1] <<= bAutostart;
+
+    Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
+        OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
+    if ( xQuickstart.is() )
+        xQuickstart->initialize( aSeq );
+
+}
+
+sal_Bool FirstStartWizard::showOnlineUpdatePage()
+{
+    try {
+        Reference < XNameReplace > xUpdateAccess;
+        Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+
+        xUpdateAccess = Reference < XNameReplace >(
+            xFactory->createInstance( UNISTRING( "com.sun.star.setup.UpdateCheckConfig" ) ), UNO_QUERY_THROW );   
+
+        if ( xUpdateAccess.is() )
+        {
+            sal_Bool bAutoUpdChk = sal_False;
+            Any result = xUpdateAccess->getByName( UNISTRING( "AutoCheckEnabled" ) );
+            result >>= bAutoUpdChk;
+            if ( bAutoUpdChk == sal_False )
+                return sal_True;
+            else
+                return sal_False;
+        }
+    } catch (const Exception&)
+    {
+    }
+    return sal_False;
+}
+
+}
diff --git a/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
new file mode 100755
index 0000000000..8ba9c89d7e
--- /dev/null
+++ b/desktop/source/migration/wizard.hrc
@@ -0,0 +1,100 @@
+/*************************************************************************
+ *
+ * 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 "desktop.hrc"
+#include "helpid.hrc"
+
+#define TP_WIDTH    220
+#define TP_HEIGHT   205
+
+#define DLG_FIRSTSTART_WIZARD   RID_FIRSTSTSTART_START+1
+    // FREE
+#define TP_WELCOME              RID_FIRSTSTSTART_START+3
+#define TP_REGISTRATION         RID_FIRSTSTSTART_START+4
+#define TP_MIGRATION            RID_FIRSTSTSTART_START+5
+#define TP_USER					RID_FIRSTSTSTART_START+6
+#define TP_LICENSE              RID_FIRSTSTSTART_START+7
+#define TP_UPDATE_CHECK         RID_FIRSTSTSTART_START+8
+#define ERRBOX_REG_NOSYSBROWSER RID_FIRSTSTSTART_START+29
+#define QB_ASK_DECLINE          RID_FIRSTSTSTART_START+30
+
+// local resIDs
+
+#define FT_WELCOME_HEADER       1
+#define FT_WELCOME_BODY         2
+#define FT_LICENSE_HEADER       1
+#define FT_LICENSE_BODY_1       2
+#define FT_LICENSE_BODY_1_TXT   3
+#define FT_LICENSE_BODY_2       4
+#define FT_LICENSE_BODY_2_TXT   5
+#define ML_LICENSE              6
+#define PB_LICENSE_DOWN         7
+#define FT_MIGRATION_HEADER     1
+#define FT_MIGRATION_BODY       2
+#define CB_MIGRATION            3
+#define FT_UPDATE_CHECK_HEADER  1
+#define FT_UPDATE_CHECK_BODY    2
+#define CB_UPDATE_CHECK         3
+#define FT_REGISTRATION_HEADER  1
+#define FT_REGISTRATION_BODY    2
+#define FL_REGISTRATION         3
+#define FT_REGISTRATION_END     4
+#define RB_REGISTRATION_NOW     5
+#define RB_REGISTRATION_LATER   6
+#define RB_REGISTRATION_NEVER   7
+#define RB_REGISTRATION_REG     8
+#define IMG_REGISTRATION        9
+#define FT_USER_HEADER			10
+#define FT_USER_BODY			11
+#define FT_USER_FIRST			12
+#define FT_USER_LAST			13
+#define FT_USER_FATHER			14
+#define FT_USER_INITIALS		15
+#define ED_USER_FIRST			16
+#define ED_USER_LAST			17
+#define ED_USER_FATHER			18
+#define ED_USER_INITIALS		19
+#define TR_WAITING				20
+#define CTRL_THROBBER           21
+
+// global strings
+#define STR_STATE_WELCOME           RID_FIRSTSTSTART_START+100
+#define STR_STATE_LICENSE           RID_FIRSTSTSTART_START+101
+#define STR_STATE_MIGRATION         RID_FIRSTSTSTART_START+102
+#define STR_STATE_REGISTRATION      RID_FIRSTSTSTART_START+103
+#define STR_WELCOME_MIGRATION       RID_FIRSTSTSTART_START+104
+// FREE                             RID_FIRSTSTSTART_START+105
+// FREE                             RID_FIRSTSTSTART_START+106
+#define STR_LICENSE_ACCEPT          RID_FIRSTSTSTART_START+107
+#define STR_LICENSE_DECLINE         RID_FIRSTSTSTART_START+108
+#define STR_FINISH                  RID_FIRSTSTSTART_START+109
+#define STR_STATE_USER              RID_FIRSTSTSTART_START+110
+// FREE                             RID_FIRSTSTSTART_START+111
+#define STR_STATE_UPDATE_CHECK      RID_FIRSTSTSTART_START+112
+#define STR_WELCOME_WITHOUT_LICENSE RID_FIRSTSTSTART_START+113
+#define STR_REGISTRATION_OOO        RID_FIRSTSTSTART_START+114
+
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
new file mode 100755
index 0000000000..7a9681a30f
--- /dev/null
+++ b/desktop/source/migration/wizard.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _WIZARD_HXX_
+#define _WIZARD_HXX_
+
+#include <rtl/ustring.hxx>
+#include <svtools/roadmapwizard.hxx>
+#include <vcl/throbber.hxx>
+#include <tools/resid.hxx>
+
+namespace desktop
+{
+
+class WizardResId : public ResId
+{
+public:
+    WizardResId( sal_uInt16 nId );
+};
+
+class FirstStartWizard : public svt::RoadmapWizard
+{
+
+public:
+    static const WizardState STATE_WELCOME;
+    static const WizardState STATE_LICENSE;
+    static const WizardState STATE_MIGRATION;
+    static const WizardState STATE_USER;
+    static const WizardState STATE_UPDATE_CHECK;
+    static const WizardState STATE_REGISTRATION;
+
+    static ResMgr* pResMgr;
+    static ResMgr* GetResManager();
+
+    FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAcceptance, const rtl::OUString &rLicensePath );
+
+    virtual short Execute();
+    virtual long PreNotify( NotifyEvent& rNEvt );
+
+    void DisableButtonsWhileMigration();
+
+private:
+    sal_Bool m_bOverride;
+    WizardState _currentState;
+    ::svt::RoadmapWizardTypes::PathId m_aDefaultPath;
+    ::svt::RoadmapWizardTypes::PathId m_aMigrationPath;
+    String m_sNext;
+    String m_sCancel;
+    sal_Bool m_bDone;
+    sal_Bool m_bLicenseNeedsAcceptance;
+    sal_Bool m_bLicenseWasAccepted;
+    sal_Bool m_bAutomaticUpdChk;
+    Link m_lnkCancel;
+    Throbber  m_aThrobber;
+
+    rtl::OUString m_aLicensePath;
+
+    void storeAcceptDate();
+    void setPatchLevel();
+    void disableWizard();
+    void enableQuickstart();
+
+    DECL_LINK(DeclineHdl, PushButton*);
+
+    void cleanOldOfficeRegKeys();
+    sal_Bool showOnlineUpdatePage();
+    ::svt::RoadmapWizardTypes::PathId defineWizardPagesDependingFromContext();
+
+protected:
+    // from svt::WizardMachine
+    virtual TabPage* createPage(WizardState _nState);
+    virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
+    virtual	sal_Bool leaveState(WizardState _nState );
+    virtual sal_Bool onFinish();
+    virtual void     enterState(WizardState _nState);
+    
+    // from svt::RoadmapWizard
+    virtual String       getStateDisplayName( WizardState _nState ) const;
+};
+}
+#endif
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
new file mode 100755
index 0000000000..4f98ce91bb
--- /dev/null
+++ b/desktop/source/migration/wizard.src
@@ -0,0 +1,442 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+ /*
+  * encoding for resources: windows-1252
+  */
+
+#include "wizard.hrc"
+#include <svtools/controldims.hrc>
+
+ModalDialog DLG_FIRSTSTART_WIZARD
+{
+    Text [ en-US ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION";
+
+    OutputSize		= TRUE ;
+    SVLook			= TRUE ;
+    Moveable		= TRUE ;
+    Closeable		= TRUE ;
+    Hide			= TRUE;
+    HelpID          = HID_FIRSTSTART_DIALOG;
+
+    FixedImage CTRL_THROBBER
+    {
+        Pos = MAP_APPFONT( 5, 210 );
+        Size = MAP_APPFONT( 11, 11 );
+        Hide = TRUE;
+    };
+};
+
+String STR_STATE_WELCOME
+{
+    Text [ en-US ] = "Welcome";
+};
+String STR_STATE_LICENSE
+{
+    Text [ en-US ] = "License Agreement";
+};
+String STR_STATE_MIGRATION
+{
+    Text [ en-US ] = "Personal Data";
+};
+String STR_STATE_USER
+{
+    Text [ en-US ] = "User name";
+};
+
+String STR_STATE_UPDATE_CHECK
+{
+    Text [ en-US ] = "Online Update";
+};
+
+String STR_STATE_REGISTRATION
+{
+    Text [ en-US ] = "Registration";
+};
+
+String STR_WELCOME_MIGRATION
+{
+    Text [ en-US ] = "This wizard will guide you through the license agreement, the transfer of user data from %OLD_VERSION and the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
+
+};
+
+String STR_WELCOME_WITHOUT_LICENSE
+{
+    Text [ en-US ] = "This wizard will guide you through the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
+};
+
+String STR_FINISH
+{
+    Text [ en-US ] = "~Finish";
+};
+
+String STR_REGISTRATION_OOO
+{
+    Text [ en-US ] = "You now have the opportunity to support and contribute to the fastest growing open source community in the world.\n\nHelp us prove that %PRODUCTNAME has already gained significant market share by registering.\n\nRegistering is voluntary and without obligation.";
+};
+
+ErrorBox ERRBOX_REG_NOSYSBROWSER
+{
+    BUTTONS = WB_OK ;
+    DEFBUTTON = WB_DEF_OK ;
+
+    Message [ en-US ] = "An error occurred in starting the web browser.\nPlease check the %PRODUCTNAME and web browser settings.";
+};
+
+QueryBox QB_ASK_DECLINE
+{
+    Buttons = WB_YES_NO;
+    DefButton = WB_DEF_NO;
+
+    Message [ en-US ] = "Do you really want to decline?";
+};
+
+
+#define ROWHEIGHT 8
+#define MARGINLEFT 10
+#define MARGINRIGHT 10
+#define BODYWIDTH TP_WIDTH-MARGINLEFT-MARGINRIGHT
+#define MARGINTOP 10
+#define MARGINBOTTOM 2
+#define BODYHEIGHT TP_HEIGHT-MARGINTOP-MARGINBOTTOM
+#define INDENT 10
+#define INDENT2 12
+
+TabPage TP_WELCOME
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID          = HID_FIRSTSTART_WELCOME;
+    // bold fixedtext for header
+    FixedText FT_WELCOME_HEADER
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINRIGHT, MARGINTOP);
+        Size = MAP_APPFONT( BODYWIDTH, ROWHEIGHT );
+        Text [ en-US ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION";
+    };
+    FixedText FT_WELCOME_BODY
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP + 2*ROWHEIGHT);
+        Size = MAP_APPFONT( BODYWIDTH, BODYHEIGHT-MARGINTOP - 2*ROWHEIGHT );
+        WordBreak = TRUE;
+        Text [ en-US ] = "This wizard will guide you through the license agreement and the registration of %PRODUCTNAME.\n\nClick 'Next' to continue.";
+    };
+};
+
+TabPage TP_LICENSE
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID          = HID_FIRSTSTART_LICENSE;
+    FixedText FT_LICENSE_HEADER
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP);
+        Size = MAP_APPFONT( BODYWIDTH, ROWHEIGHT );
+        NoLabel = TRUE;
+        Text [ en-US ] = "Please follow these steps to accept the license";
+    };
+    FixedText FT_LICENSE_BODY_1
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP + 2*ROWHEIGHT);
+        Size = MAP_APPFONT( INDENT, ROWHEIGHT );
+        NoLabel = TRUE;
+        Text [ en-US ] = "1.";
+    };
+    FixedText FT_LICENSE_BODY_1_TXT
+    {
+        Pos = MAP_APPFONT(MARGINLEFT+INDENT, MARGINTOP +2*ROWHEIGHT);
+        Size = MAP_APPFONT( BODYWIDTH-INDENT, 3*ROWHEIGHT);
+        WordBreak = TRUE;
+        NoLabel = TRUE;
+        Text [ en-US ] = "View the complete License Agreement. Please use the scrollbar or the '%PAGEDOWN' button in this dialog to view the entire license text.";
+    };
+    FixedText FT_LICENSE_BODY_2
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP + 5*ROWHEIGHT);
+        Size = MAP_APPFONT(INDENT, ROWHEIGHT );
+        NoLabel = TRUE;
+        Text [ en-US ] = "2.";
+    };
+    FixedText FT_LICENSE_BODY_2_TXT
+    {
+        Pos = MAP_APPFONT(MARGINLEFT+INDENT, MARGINTOP + 5*ROWHEIGHT);
+        Size = MAP_APPFONT( BODYWIDTH-INDENT, 2*ROWHEIGHT);
+        WordBreak = TRUE;
+        NoLabel = TRUE;
+        Text [ en-US ] = "Click 'Accept' to accept the terms of the Agreement.";
+    };
+    MultiLineEdit ML_LICENSE
+    {
+        HelpID = "desktop:MultiLineEdit:TP_LICENSE:ML_LICENSE";
+        PosSize = MAP_APPFONT (MARGINLEFT+INDENT, MARGINTOP + 8*ROWHEIGHT, BODYWIDTH-INDENT , BODYHEIGHT - 8*ROWHEIGHT - 20-2*MARGINBOTTOM) ;
+        Border = TRUE;
+        VScroll = TRUE;
+        ReadOnly = TRUE;
+    };
+    PushButton PB_LICENSE_DOWN
+    {
+        HelpID = "desktop:PushButton:TP_LICENSE:PB_LICENSE_DOWN";
+        TabStop = TRUE ;
+        Pos = MAP_APPFONT ( TP_WIDTH-MARGINRIGHT-50 , TP_HEIGHT-MARGINBOTTOM-18 ) ;
+        Size = MAP_APPFONT ( 50, 15 ) ;
+        Text [ en-US ] = "Scroll Do~wn";
+    };
+};
+
+String STR_LICENSE_ACCEPT
+{
+    Text [ en-US ] = "~Accept";
+};
+String STR_LICENSE_DECLINE
+{
+    Text [ en-US ] = "~Decline";
+};
+
+
+TabPage TP_MIGRATION
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID          = HID_FIRSTSTART_MIGRATION;
+
+    FixedText FT_MIGRATION_HEADER
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP);
+        Size = MAP_APPFONT( BODYWIDTH, ROWHEIGHT );
+        Text [ en-US ] = "Transfer personal data";
+
+    };
+
+    FixedText FT_MIGRATION_BODY
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*2);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*8);
+        WordBreak = TRUE;
+        Text [ en-US ] = "Most personal data from %OLDPRODUCT installation can be reused in %PRODUCTNAME %PRODUCTVERSION.\n\nIf you do not want to reuse any settings in %PRODUCTNAME %PRODUCTVERSION, unmark the check box.";
+
+    };
+
+    CheckBox CB_MIGRATION
+    {
+        HelpID = "desktop:CheckBox:TP_MIGRATION:CB_MIGRATION";
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2);
+        Check = TRUE;
+        Text [ en-US ] = "Transfer personal data";
+    };
+};
+
+TabPage TP_UPDATE_CHECK
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID          = HID_FIRSTSTART_UPDATE_CHECK;
+
+    FixedText FT_UPDATE_CHECK_HEADER
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP);
+        Size = MAP_APPFONT( BODYWIDTH, ROWHEIGHT );
+        Text [ en-US ] = "Online Update";
+
+    };
+
+    FixedText FT_UPDATE_CHECK_BODY
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*2);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*8);
+        WordBreak = TRUE;
+        Text [ en-US ] = "%PRODUCTNAME searches automatically at regular intervals for new versions.\nIn doing so online update does not transfer personal data.\nAs soon as a new version is available, you will be notified.\n\nYou can configure this feature at Tools / Options... / %PRODUCTNAME / Online Update.";
+
+    };
+
+    CheckBox CB_UPDATE_CHECK
+    {
+        HelpID = "desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK";
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2);
+        Check = TRUE;
+        Text [ en-US ] = "~Check for updates automatically";
+    };
+};
+
+#define USERINDENT 40
+#define EDHEIGHT 12
+#define INITIALSWIDTH 50
+#define FTADD 2
+
+TabPage TP_USER
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID = HID_FIRSTSTART_USER;
+
+    FixedText FT_USER_HEADER
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP);
+        Size = MAP_APPFONT( BODYWIDTH, ROWHEIGHT );
+        Text [ en-US ] = "Provide your full name and initials below";
+
+    };
+
+    FixedText FT_USER_BODY
+    {
+        NoLabel = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*2);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*3);
+        WordBreak = TRUE;
+        Text [ en-US ] = "The user name will be used in the document properties, templates and when you record changes made to documents.";
+    };
+
+
+    FixedText FT_USER_FIRST
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*7+FTADD);
+        Size = MAP_APPFONT(USERINDENT, ROWHEIGHT);
+        Text [ en-US ] = "~First name";
+    };
+    Edit ED_USER_FIRST
+    {
+        HelpID = "desktop:Edit:TP_USER:ED_USER_FIRST";
+        Border = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*7);
+        Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT);
+    };
+    FixedText FT_USER_LAST
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*9+FTADD);
+        Size = MAP_APPFONT(USERINDENT, ROWHEIGHT);
+        Text [ en-US ] = "~Last name";
+    };
+    Edit ED_USER_LAST
+    {
+        HelpID = "desktop:Edit:TP_USER:ED_USER_LAST";
+        Border = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*9);
+        Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT);
+    };
+    FixedText FT_USER_INITIALS
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*11+FTADD);
+        Size = MAP_APPFONT(USERINDENT, ROWHEIGHT);
+        Text [ en-US ] = "~Initials";
+    };
+    Edit ED_USER_INITIALS
+    {
+        HelpID = "desktop:Edit:TP_USER:ED_USER_INITIALS";
+        Border = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*11);
+        Size = MAP_APPFONT(INITIALSWIDTH, EDHEIGHT);
+    };
+
+    FixedText FT_USER_FATHER
+    {
+        Hide = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT+USERINDENT+INITIALSWIDTH+10, MARGINTOP+ROWHEIGHT*11+FTADD);
+        Size = MAP_APPFONT(USERINDENT, ROWHEIGHT);
+        Text [ en-US ] = "~Father's name";
+    };
+    Edit ED_USER_FATHER
+    {
+        HelpID = "desktop:Edit:TP_USER:ED_USER_FATHER";
+        Border = TRUE;
+        Hide = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT+USERINDENT*2+INITIALSWIDTH+10, MARGINTOP+ROWHEIGHT*11);
+        Size = MAP_APPFONT(BODYWIDTH-10-USERINDENT*2-INITIALSWIDTH, EDHEIGHT);
+    };
+};
+
+#define RB_HEIGHT   (RSC_CD_CHECKBOX_HEIGHT+RSC_SP_GRP_SPACE_Y)
+
+TabPage TP_REGISTRATION
+{
+    SVLook = TRUE ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT(TP_WIDTH, TP_HEIGHT);
+    HelpID = HID_FIRSTSTART_REGISTRATION;
+    FixedText FT_REGISTRATION_HEADER
+    {
+        NoLabel = TRUE;
+        Text [ en-US ] = "%PRODUCTNAME Registration";
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINRIGHT);
+        Size = MAP_APPFONT(BODYWIDTH, MARGINRIGHT);
+    };
+    FixedText FT_REGISTRATION_BODY
+    {
+        NoLabel = TRUE;
+        Text [ en-US ] = "You now have the opportunity to register as a %PRODUCTNAME user. Registration is voluntary and is without obligation.\n\nIf you register, we can inform you about new developments concerning this product.";
+        WordBreak = TRUE;
+        Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*2);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*8);
+    };
+    RadioButton RB_REGISTRATION_NOW
+    {
+        HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW";
+        Text [ en-US ] = "I want to register ~now";
+        Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2);
+        Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
+        Check = TRUE;
+    };
+    RadioButton RB_REGISTRATION_LATER
+    {
+        HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER";
+        Text [ en-US ] = "I want to register ~later";
+        Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT);
+        Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
+    };
+    RadioButton RB_REGISTRATION_NEVER
+    {
+        HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER";
+        Text [ en-US ] = "I do not want to ~register";
+        Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT*2);
+        Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
+    };
+    FixedLine FL_REGISTRATION
+    {
+        Pos = MAP_APPFONT(MARGINLEFT, TP_HEIGHT-MARGINBOTTOM-ROWHEIGHT*6);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT);
+    };
+    FixedText FT_REGISTRATION_END
+    {
+        NoLabel = TRUE;
+        Text [ en-US ] = "We hope you enjoy working with %PRODUCTNAME.\n\nTo exit the wizard, click 'Finish'.";
+        Pos = MAP_APPFONT(MARGINLEFT, TP_HEIGHT-MARGINBOTTOM-ROWHEIGHT*4);
+        Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*4);
+    };
+};
+
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index c33a3b9167..0b9f33ada3 100644..100755
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -303,23 +303,6 @@ component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, u
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
-    Reference< XMultiServiceFactory > xMan(reinterpret_cast< XMultiServiceFactory* >(pServiceManager));
-    Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey* >(pRegistryKey));
-
-    // register service
-    ::rtl::OUString aTempStr;
-    ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += Acceptor::impl_getImplementationName();
-    aImpl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    Reference< XRegistryKey > xNewKey = xKey->createKey(aImpl);
-    xNewKey->createKey(Acceptor::impl_getSupportedServiceNames()[0]);
-
-    return sal_True;
-}
-
 void * SAL_CALL
 component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
 {
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 4096b3e63c..4096b3e63c 100644..100755
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
index c2d53930b5..809c28414b 100644..100755
--- a/desktop/source/offacc/makefile.mk
+++ b/desktop/source/offacc/makefile.mk
@@ -60,3 +60,11 @@ SHL1STDLIBS=	\
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/offacc.component
+
+$(MISC)/offacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        offacc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt offacc.component
diff --git a/desktop/source/offacc/offacc.component b/desktop/source/offacc/offacc.component
new file mode 100755
index 0000000000..6f0d4a97a2
--- /dev/null
+++ b/desktop/source/offacc/offacc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.office.comp.Acceptor">
+    <service name="com.sun.star.office.Acceptor"/>
+  </implementation>
+</component>
diff --git a/desktop/source/pagein/file_image.h b/desktop/source/pagein/file_image.h
index 4234140027..4234140027 100644..100755
--- a/desktop/source/pagein/file_image.h
+++ b/desktop/source/pagein/file_image.h
diff --git a/desktop/source/pagein/file_image_unx.c b/desktop/source/pagein/file_image_unx.c
index 41d60e8035..41d60e8035 100644..100755
--- a/desktop/source/pagein/file_image_unx.c
+++ b/desktop/source/pagein/file_image_unx.c
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 09248d4f94..09248d4f94 100644..100755
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c
index 15623bfd8d..15623bfd8d 100644..100755
--- a/desktop/source/pagein/pagein.c
+++ b/desktop/source/pagein/pagein.c
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 8384f1b243..8384f1b243 100644..100755
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 06c8f83988..d81e1694f3 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -380,7 +380,12 @@ extern "C" int unopkg_main()
         }
         else if (subCommand.equals(OUSTR("sync")))
         {
-            //sync is private!!!! Only for bundled extensions!!!
+            //sync is private!!!! Only to be called from setup!!!
+            //The UserInstallation is diverted to the prereg folder. But only
+            //the lock file is written! This requires that
+            //-env:UNO_JAVA_JFW_INSTALL_DATA is passed to javaldx and unopkg otherwise the
+            //javasettings file is written to the prereg folder. 
+            //
             //For performance reasons unopkg sync is called during the setup and
             //creates the registration data for the repository of the bundled
             //extensions. It is then copied to the user installation during
@@ -395,11 +400,22 @@ extern "C" int unopkg_main()
             //$BUNDLED_EXTENSIONS_USER
             if (hasNoFolder(OUSTR("$BRAND_BASE_DIR/share/extensions")))
             {
-                removeFolder(OUSTR("$BUNDLED_EXTENSIONS_USER"));
+                removeFolder(OUSTR("$BUNDLED_EXTENSIONS_PREREG"));
                 //return otherwise we create the registration data again
                 return 0;
             }
-            
+            //redirect the UserInstallation, so we do not create a
+            //user installation for the admin and we also do not need
+            //to call unopkg with -env:UserInstallation
+            ::rtl::Bootstrap::set(OUSTR("UserInstallation"),
+                                  OUSTR("$BUNDLED_EXTENSIONS_PREREG/.."));
+            //Setting UNO_JAVA_JFW_INSTALL_DATA causes the javasettings to be written
+            //in the office installation. We do not want to create the user data folder
+            //for the admin. The value must also be set in the unopkg script (Linux, etc.)
+            //when calling javaldx
+            ::rtl::Bootstrap::set(OUSTR("UNO_JAVA_JFW_INSTALL_DATA"),
+                                  OUSTR("$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml"));
+
         }
 
         xComponentContext = getUNO(
@@ -418,6 +434,7 @@ extern "C" int unopkg_main()
         //prevent the deletion of the registry data folder
         //synching is done in XExtensionManager.reinstall
         if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
+            && ! subCommand.equals(OUSTR("sync"))
             && ! dp_misc::office_is_running())
             dp_misc::syncRepositories(xCmdEnv);
 
@@ -612,12 +629,15 @@ extern "C" int unopkg_main()
         }
         else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("sync")))
         {
-            //This sub command may be removed later and is only there to have a
-            //possibility to start extension synching without any output.
-            //This is just here so we do not get an error, because of an unknown
-            //sub-command. We do synching before
-            //the sub-commands are processed.
-            
+            if (! dp_misc::office_is_running())
+            {
+                xExtensionManager->synchronizeBundledPrereg(
+                    Reference<task::XAbortChannel>(), xCmdEnv);
+            }
+            else
+            {
+                dp_misc::writeConsoleError(OUSTR("\nError: office is running"));
+            }            
         }
         else
         {
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index c6d26b1df1..c6d26b1df1 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c
index 1d5b31d03f..1d5b31d03f 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_main.c
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.c
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h
index 694cc41558..694cc41558 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_main.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.h
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index e55b1c0abe..ee05e37a2d 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -629,7 +629,7 @@ void removeFolder(OUString const & folderUrl)
         dir.close();
         ::osl::Directory::remove(url);
     }
-    else
+    else if (rc != osl::File::E_NOENT)
     {
         dp_misc::writeConsole(
             OUSTR("unopkg: Error while removing ") + url + OUSTR("\n"));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 232fbf8f52..cc25e934d6 100644..100755
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -161,7 +161,7 @@ public:
     {
         m_bDeinitUCB = true;
     }
-
+            
 };
 
 //==============================================================================
diff --git a/desktop/source/pkgchk/unopkg/version.map b/desktop/source/pkgchk/unopkg/version.map
index 8591bb3b58..8591bb3b58 100644..100755
--- a/desktop/source/pkgchk/unopkg/version.map
+++ b/desktop/source/pkgchk/unopkg/version.map
diff --git a/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java
index 3a2cad1923..d00ed1dde3 100644..100755
--- a/desktop/source/registration/com/sun/star/registration/Registration.java
+++ b/desktop/source/registration/com/sun/star/registration/Registration.java
@@ -63,10 +63,6 @@ public class Registration {
         return xSingleServiceFactory;
     }
 
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-        return FactoryHelper.writeRegistryServiceInfo(Registration.class.getName(), _serviceName, regKey);
-    }
-
     static final String _serviceName = "com.sun.star.comp.framework.DoRegistrationJob";
 
     static public class _Registration implements XJob {
diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk
index 9784166eb9..8598022562 100644..100755
--- a/desktop/source/registration/com/sun/star/registration/makefile.mk
+++ b/desktop/source/registration/com/sun/star/registration/makefile.mk
@@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE      = manifest
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/productregistration.jar.component
+
+$(MISC)/productregistration.jar.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)productregistration.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.jar.component
diff --git a/desktop/source/registration/com/sun/star/registration/manifest b/desktop/source/registration/com/sun/star/registration/manifest
index 952aaa804e..952aaa804e 100644..100755
--- a/desktop/source/registration/com/sun/star/registration/manifest
+++ b/desktop/source/registration/com/sun/star/registration/manifest
diff --git a/desktop/source/registration/com/sun/star/registration/productregistration.jar.component b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component
new file mode 100755
index 0000000000..c022a98ae0
--- /dev/null
+++ b/desktop/source/registration/com/sun/star/registration/productregistration.jar.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.registration.Registration">
+    <service name="com.sun.star.comp.framework.DoRegistrationJob"/>
+  </implementation>
+</component>
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index c475b75dd3..c475b75dd3 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index 41d328ca08..41d328ca08 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index f81d935891..f81d935891 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index 9323e5de7e..9323e5de7e 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
index 4bfa1aa16a..4bfa1aa16a 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java
index d1b7607197..d1b7607197 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/Registry.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
index cbaf44e1d0..cbaf44e1d0 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/ServiceTag.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
index 8378c78e76..8378c78e76 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
index a9c094d1af..a9c094d1af 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
index 9b9c7595ac..9b9c7595ac 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SunConnection.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
index 0f03d0d621..0f03d0d621 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index 013c1251bc..013c1251bc 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
index a6d41e07b3..a6d41e07b3 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
+++ b/desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/Util.java b/desktop/source/registration/com/sun/star/servicetag/Util.java
index c1cb14f7c2..c1cb14f7c2 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/Util.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Util.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
index fd500a8ac8..fd500a8ac8 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java
diff --git a/desktop/source/registration/com/sun/star/servicetag/makefile.mk b/desktop/source/registration/com/sun/star/servicetag/makefile.mk
index 7849646529..7849646529 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/makefile.mk
+++ b/desktop/source/registration/com/sun/star/servicetag/makefile.mk
diff --git a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
index 6681a563a0..6681a563a0 100644..100755
--- a/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
+++ b/desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index aa113b4caf..aa113b4caf 100644..100755
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
diff --git a/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx
index a34cc65253..a34cc65253 100644..100755
--- a/desktop/source/so_comp/evaluation.hxx
+++ b/desktop/source/so_comp/evaluation.hxx
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
index 5016489425..4d8d479b96 100644..100755
--- a/desktop/source/so_comp/makefile.mk
+++ b/desktop/source/so_comp/makefile.mk
@@ -70,3 +70,10 @@ SHL1STDLIBS= \
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/socomp.component
+
+$(MISC)/socomp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        socomp.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt socomp.component
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index d50bab209c..d50bab209c 100644..100755
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
diff --git a/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx
index 26c1f0943d..26c1f0943d 100644..100755
--- a/desktop/source/so_comp/oemjob.hxx
+++ b/desktop/source/so_comp/oemjob.hxx
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index 177b5fb3ff..439b73364d 100644..100755
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/services.cxx
@@ -101,33 +101,7 @@ component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL
-component_writeInfo(
-    void* pServiceManager,
-    void* pRegistryKey)
-{
-    Reference<XMultiServiceFactory> xMan(
-        reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-    Reference<XRegistryKey> xKey(
-        reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
-
-    // iterate over service names and register them...
-    OUString aImpl;
-    const char* pServiceName = NULL;
-    const char* pImplName = NULL;
-    for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
-        pServiceName= pServices[i];
-        pImplName = pImplementations[i];
-        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
-              + OUString::createFromAscii(pImplName)
-              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-        Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
-        xNewKey->createKey(OUString::createFromAscii(pServiceName));
-    }
-    return sal_True;
-}
-
-void* SAL_CALL
+void* SAL_CALL 
 component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
diff --git a/desktop/source/so_comp/socomp.component b/desktop/source/so_comp/socomp.component
new file mode 100755
index 0000000000..a53035223c
--- /dev/null
+++ b/desktop/source/so_comp/socomp.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.desktop.Evaluation">
+    <service name="com.sun.star.office.Evaluation"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.desktop.OEMPreloadJob">
+    <service name="com.sun.star.office.OEMPreloadJob"/>
+  </implementation>
+</component>
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 351b055435..8db499d7c9 100644..100755
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -70,3 +70,11 @@ SHL1STDLIBS= \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/spl.component
+
+$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        spl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt spl.component
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index d79adf8725..39fd09774e 100644..100755
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -92,33 +92,7 @@ component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL
-component_writeInfo(
-    void* pServiceManager,
-    void* pRegistryKey)
-{
-    Reference<XMultiServiceFactory> xMan(
-        reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
-    Reference<XRegistryKey> xKey(
-        reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
-
-    // iterate over service names and register them...
-    OUString aImpl;
-    const char* pServiceName = NULL;
-    const char* pImplName = NULL;
-    for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
-        pServiceName= pServices[i];
-        pImplName = pImplementations[i];
-        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
-              + OUString::createFromAscii(pImplName)
-              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-        Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
-        xNewKey->createKey(OUString::createFromAscii(pServiceName));
-    }
-    return sal_True;
-}
-
-void* SAL_CALL
+void* SAL_CALL 
 component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
diff --git a/desktop/source/splash/spl.component b/desktop/source/splash/spl.component
new file mode 100755
index 0000000000..2caecf5c0e
--- /dev/null
+++ b/desktop/source/splash/spl.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.desktop.FirstStart">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.office.comp.SplashScreen">
+    <service name="com.sun.star.office.SplashScreen"/>
+  </implementation>
+</component>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f8bbc3db7e..339155b174 100644..100755
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -102,7 +102,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
         _bProgressEnd = sal_False;
         SolarMutexGuard aSolarGuard;
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         Paint(Rectangle());
         Flush();
@@ -129,7 +129,7 @@ void SAL_CALL SplashScreen::reset()
     if (_bVisible && !_bProgressEnd )
     {
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         updateStatus();
     }
@@ -146,7 +146,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
         if (_bVisible && !_bProgressEnd)
         {
             if ( _eBitmapMode == BM_FULLSCREEN )
-                ShowFullScreenMode( TRUE );
+                ShowFullScreenMode( sal_True );
             Show();
             updateStatus();
         }
@@ -162,7 +162,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
     SolarMutexGuard aSolarGuard;
     if (_bVisible && !_bProgressEnd) {
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         if (nValue >= _iMax) _iProgress = _iMax;
     else _iProgress = nValue;
@@ -319,36 +319,36 @@ void SplashScreen::loadConfig()
 
     if ( sProgressFrameColor.getLength() )
     {
-        UINT8 nRed = 0;
+        sal_uInt8 nRed = 0;
         sal_Int32 idx = 0;
         sal_Int32 temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32();
         if ( idx != -1 )
         {
-            nRed = static_cast< UINT8 >( temp );
+            nRed = static_cast< sal_uInt8 >( temp );
             temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32();
         }
         if ( idx != -1 )
         {
-            UINT8 nGreen = static_cast< UINT8 >( temp );
-            UINT8 nBlue = static_cast< UINT8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() );
+            sal_uInt8 nGreen = static_cast< sal_uInt8 >( temp );
+            sal_uInt8 nBlue = static_cast< sal_uInt8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() );
             _cProgressFrameColor = Color( nRed, nGreen, nBlue );
         }
     }
 
     if ( sProgressBarColor.getLength() )
     {
-        UINT8 nRed = 0;
+        sal_uInt8 nRed = 0;
         sal_Int32 idx = 0;
         sal_Int32 temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32();
         if ( idx != -1 )
         {
-            nRed = static_cast< UINT8 >( temp );
+            nRed = static_cast< sal_uInt8 >( temp );
             temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32();
         }
         if ( idx != -1 )
         {
-            UINT8 nGreen = static_cast< UINT8 >( temp );
-            UINT8 nBlue = static_cast< UINT8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() );
+            sal_uInt8 nGreen = static_cast< sal_uInt8 >( temp );
+            sal_uInt8 nBlue = static_cast< sal_uInt8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() );
             _cProgressBarColor = Color( nRed, nGreen, nBlue );
         }
     }
@@ -500,7 +500,7 @@ void SplashScreen::Paint( const Rectangle&)
     if(!_bVisible) return;
 
     //native drawing
-    BOOL bNativeOK = FALSE;
+    sal_Bool bNativeOK = sal_False;
     
     // in case of native controls we need to draw directly to the window
     if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) )
@@ -521,7 +521,7 @@ void SplashScreen::Paint( const Rectangle&)
         }
         
         if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect,
-                                            CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE ) 
+                                            CTRL_STATE_ENABLED, aValue, _sProgressText )) != sal_False ) 
         {
             return;
         }
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index c7c3ff5b52..c7c3ff5b52 100644..100755
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
diff --git a/desktop/test/deployment/active/Addons.xcu b/desktop/test/deployment/active/Addons.xcu
new file mode 100755
index 0000000000..cc75f2ab8f
--- /dev/null
+++ b/desktop/test/deployment/active/Addons.xcu
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="Addons">
+  <node o:name="AddonUI">
+    <node o:name="OfficeMenuBar">
+      <node o:name="org.openoffice.test.desktop.deployment.active"
+          o:op="replace">
+        <prop o:name="Title" xml:lang="en-US">
+          <value>active</value>
+        </prop>
+        <node o:name="Submenu">
+          <node o:name="1" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_native:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>native</value>
+            </prop>
+          </node>
+          <node o:name="2" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_java:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>java</value>
+            </prop>
+          </node>
+          <node o:name="3" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.active_python:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>python</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/active/Dispatch.java b/desktop/test/deployment/active/Dispatch.java
new file mode 100755
index 0000000000..25443f96e0
--- /dev/null
+++ b/desktop/test/deployment/active/Dispatch.java
@@ -0,0 +1,101 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XMessageBox;
+import com.sun.star.awt.XMessageBoxFactory;
+import com.sun.star.awt.XWindowPeer;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XStatusListener;
+import com.sun.star.lang.WrappedTargetRuntimeException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
+{
+    public Dispatch(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return false; //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public void dispatch(URL URL, PropertyValue[] Arguments) {
+        try {
+            XMultiComponentFactory smgr = UnoRuntime.queryInterface(
+                XMultiComponentFactory.class, context.getServiceManager());
+            XMessageBox box = UnoRuntime.queryInterface(
+                XMessageBoxFactory.class,
+                smgr.createInstanceWithContext(
+                    "com.sun.star.awt.Toolkit", context)).
+                createMessageBox(
+                    UnoRuntime.queryInterface(
+                        XWindowPeer.class,
+                        (UnoRuntime.queryInterface(
+                            XDesktop.class,
+                            smgr.createInstanceWithContext(
+                                "com.sun.star.frame.Desktop", context)).
+                         getCurrentFrame().getComponentWindow())),
+                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    "active", "java");
+            box.execute();
+            UnoRuntime.queryInterface(XComponent.class, box).dispose();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            throw e;
+        } catch (com.sun.star.uno.Exception e) {
+            throw new WrappedTargetRuntimeException(
+                "wrapped: " + e.getMessage(), this, e);
+        }
+    }
+
+    public void addStatusListener(XStatusListener Control, URL URL) {}
+
+    public void removeStatusListener(XStatusListener Control, URL URL) {}
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.active_java_singleton";
+
+    static final String[] serviceNames = new String[0];
+}
diff --git a/desktop/test/deployment/active/MANIFEST.MF b/desktop/test/deployment/active/MANIFEST.MF
new file mode 100755
index 0000000000..63480874dd
--- /dev/null
+++ b/desktop/test/deployment/active/MANIFEST.MF
@@ -0,0 +1,3 @@
+Sealed: true
+RegistrationClassName: com.sun.star.comp.test.deployment.active_java.Services
+UNO-Type-Path: 
diff --git a/desktop/test/deployment/active/ProtocolHandler.xcu b/desktop/test/deployment/active/ProtocolHandler.xcu
new file mode 100755
index 0000000000..017bdea72b
--- /dev/null
+++ b/desktop/test/deployment/active/ProtocolHandler.xcu
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="ProtocolHandler">
+  <node o:name="HandlerSet">
+    <node o:name="com.sun.star.test.deployment.active_native" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_native:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.active_java" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_java:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.active_python" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.active_python:*</value>
+      </prop>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/active/Provider.java b/desktop/test/deployment/active/Provider.java
new file mode 100755
index 0000000000..df31979f4b
--- /dev/null
+++ b/desktop/test/deployment/active/Provider.java
@@ -0,0 +1,81 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Provider extends WeakBase
+    implements XServiceInfo, XDispatchProvider
+{
+    public Provider(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return ServiceName.equals(getSupportedServiceNames()[0]); //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public XDispatch queryDispatch(
+        URL URL, String TargetFrameName, int SearchFlags)
+    {
+        return UnoRuntime.queryInterface(
+            XDispatch.class,
+            context.getValueByName(
+                "/singletons/" +
+                "com.sun.star.test.deployment.active_java_singleton"));
+    }
+
+    public XDispatch[] queryDispatches(DispatchDescriptor[] Requests) {
+        XDispatch[] s = new XDispatch[Requests.length];
+        for (int i = 0; i < s.length; ++i) {
+            s[i] = queryDispatch(
+                Requests[i].FeatureURL, Requests[i].FrameName,
+                Requests[i].SearchFlags);
+        }
+        return s;
+    }
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.active_java";
+
+    static final String[] serviceNames = new String[] {
+        "com.sun.star.test.deployment.active_java" };
+}
diff --git a/desktop/test/deployment/active/Services.java b/desktop/test/deployment/active/Services.java
new file mode 100755
index 0000000000..4ea19f4b7a
--- /dev/null
+++ b/desktop/test/deployment/active/Services.java
@@ -0,0 +1,72 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.active_java;
+
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.registry.InvalidRegistryException;
+import com.sun.star.registry.XRegistryKey;
+
+public final class Services {
+    private Services() {}
+
+    public static XSingleComponentFactory __getComponentFactory(
+        String implementation)
+    {
+        if (implementation.equals(Dispatch.implementationName)) {
+            return Factory.createComponentFactory(
+                Dispatch.class, Dispatch.implementationName,
+                Dispatch.serviceNames);
+        } else if (implementation.equals(Provider.implementationName)) {
+            return Factory.createComponentFactory(
+                Provider.class, Provider.implementationName,
+                Provider.serviceNames);
+        } else {
+            return null;
+        }
+    }
+
+    public static boolean __writeRegistryServiceInfo(XRegistryKey key) {
+        if (!(Factory.writeRegistryServiceInfo(
+                  Dispatch.implementationName, Dispatch.serviceNames, key) &&
+              Factory.writeRegistryServiceInfo(
+                  Provider.implementationName, Provider.serviceNames, key)))
+        {
+            return false;
+        }
+        try {
+            key.
+                createKey(
+                    "/" + Dispatch.implementationName +
+                    "/UNO/SINGLETONS/" +
+                    "com.sun.star.test.deployment.active_java_singleton").
+                setStringValue(Dispatch.implementationName);
+        } catch (InvalidRegistryException e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
new file mode 100755
index 0000000000..a34d8de88a
--- /dev/null
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -0,0 +1,320 @@
+/*************************************************************************
+*
+* 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 "precompiled_desktop.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/awt/MessageBoxButtons.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/XMessageBox.hpp"
+#include "com/sun/star/awt/XMessageBoxFactory.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/lbnames.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Provider:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
+
+private:
+    Provider(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Provider() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+        css::util::URL const &, rtl::OUString const &, sal_Int32)
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+    SAL_CALL queryDispatches(
+        css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+        throw (css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Provider::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.active_native"));
+}
+
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+{
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.test.deployment.active_native"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
+    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::frame::XDispatch > dispatch;
+    if (!(context_->getValueByName(
+              rtl::OUString(
+                  RTL_CONSTASCII_USTRINGPARAM(
+                      "/singletons/com.sun.star.test.deployment."
+                      "active_native_singleton"))) >>=
+          dispatch) ||
+        !dispatch.is())
+    {
+        throw css::uno::DeploymentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "component context fails to supply singleton"
+                    " com.sun.star.test.deployment.active_native_singleton of"
+                    " type com.sun.star.frame.XDispatch")),
+            context_);
+    }
+    return dispatch;
+}
+
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+Provider::queryDispatches(
+    css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
+        Requests.getLength());
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
+        s[i] = queryDispatch(
+            Requests[i].FeatureURL, Requests[i].FrameName,
+            Requests[i].SearchFlags);
+    }
+    return s;
+}
+
+class Dispatch:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatch >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames()
+    { return css::uno::Sequence< rtl::OUString >(); }
+
+private:
+    Dispatch(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Dispatch() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
+        throw (css::uno::RuntimeException)
+    { return false; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual void SAL_CALL dispatch(
+        css::util::URL const &,
+        css::uno::Sequence< css::beans::PropertyValue > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Dispatch::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.active_native_singleton"));
+}
+
+void Dispatch::dispatch(
+    css::util::URL const &,
+    css::uno::Sequence< css::beans::PropertyValue > const &)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context_->getServiceManager(), css::uno::UNO_SET_THROW);
+    css::uno::Reference< css::awt::XMessageBox > box(
+        css::uno::Reference< css::awt::XMessageBoxFactory >(
+            smgr->createInstanceWithContext(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                  "com.sun.star.awt.Toolkit")), context_),
+            css::uno::UNO_QUERY_THROW)->createMessageBox(
+                css::uno::Reference< css::awt::XWindowPeer >(
+                    css::uno::Reference< css::frame::XFrame >(
+                        css::uno::Reference< css::frame::XDesktop >(
+                            smgr->createInstanceWithContext(
+                                rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.frame.Desktop")),
+                                context_),
+                            css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
+                        css::uno::UNO_SET_THROW)->getComponentWindow(),
+                    css::uno::UNO_QUERY_THROW),
+                css::awt::Rectangle(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxButtons::BUTTONS_OK,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("active")),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
+        css::uno::UNO_SET_THROW);
+    box->execute();
+    css::uno::Reference< css::lang::XComponent >(
+        box, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &Provider::static_create, &Provider::static_getImplementationName,
+      &Provider::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &Dispatch::static_create, &Dispatch::static_getImplementationName,
+      &Dispatch::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+extern "C" sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
+        return false;
+    }
+    try {
+        css::uno::Reference< css::registry::XRegistryKey >(
+            (css::uno::Reference< css::registry::XRegistryKey >(
+                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
+             createKey(
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                 Dispatch::static_getImplementationName() +
+                 rtl::OUString(
+                     RTL_CONSTASCII_USTRINGPARAM(
+                         "/UNO/SINGLETONS/com.sun.star.test.deployment."
+                         "active_native_singleton")))),
+            css::uno::UNO_SET_THROW)->
+            setStringValue(Dispatch::static_getImplementationName());
+    } catch (css::uno::Exception & e) {
+        (void) e;
+        OSL_TRACE(
+            "active_native component_writeInfo exception: %s",
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        return false;
+    }
+    return true;
+}
diff --git a/desktop/test/deployment/active/active_python.py b/desktop/test/deployment/active/active_python.py
new file mode 100755
index 0000000000..8ba0947b6b
--- /dev/null
+++ b/desktop/test/deployment/active/active_python.py
@@ -0,0 +1,120 @@
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+import uno
+import unohelper
+
+from com.sun.star.awt import Rectangle
+from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.frame import XDispatch, XDispatchProvider
+from com.sun.star.lang import XServiceInfo
+from com.sun.star.registry import InvalidRegistryException
+
+class Provider(unohelper.Base, XServiceInfo, XDispatchProvider):
+    implementationName = "com.sun.star.comp.test.deployment.active_python"
+
+    serviceNames = ("com.sun.star.test.deployment.active_python",)
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def queryDispatch(self, URL, TargetFrame, SearchFlags):
+        return self.context.getValueByName( \
+            "/singletons/com.sun.star.test.deployment.active_python_singleton")
+
+    def queryDispatches(self, Requests):
+        tuple( \
+            self.queryDispatch(i.FeatureURL, i.FrameName, i.SearchFlags) \
+                for i in Requests)
+
+class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
+    implementationName = \
+        "com.sun.star.comp.test.deployment.active_python_singleton"
+
+    serviceNames = ()
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def dispatch(self, URL, Arguments):
+        smgr = self.context.getServiceManager()
+        box = smgr.createInstanceWithContext( \
+            "com.sun.star.awt.Toolkit", self.context).createMessageBox( \
+                smgr.createInstanceWithContext( \
+                    "com.sun.star.frame.Desktop", self.context). \
+                    getCurrentFrame().getComponentWindow(), \
+                Rectangle(), "infobox", BUTTONS_OK, "active", "python")
+        box.execute();
+        box.dispose();
+
+    def addStatusListener(self, Control, URL):
+        pass
+
+    def removeStatusListener(self, Control, URL):
+        pass
+
+def getComponentFactory(implementationName, smgr, regKey):
+    if implementationName == Provider.implementationName:
+        return unohelper.createSingleServiceFactory( \
+            Provider, Provider.implementationName, Provider.serviceNames)
+    elif implementationName == Dispatch.implementationName:
+        return unohelper.createSingleServiceFactory( \
+            Dispatch, Dispatch.implementationName, Dispatch.serviceNames)
+    else:
+        return None
+
+def writeRegistryInfo(smgr, regKey):
+    try:
+        for i in (Provider, Dispatch):
+            key = regKey.createKey("/" + i.implementationName + "/UNO")
+            for j in i.serviceNames:
+                key.createKey("/SERVICES/" + j);
+        regKey.createKey( \
+            "/" + Dispatch.implementationName + "/UNO/SINGLETONS/" \
+                "com.sun.star.test.deployment.active_python_singleton"). \
+            setStringValue(Dispatch.implementationName)
+    except InvalidRegistryException:
+        return False
+    return True
diff --git a/desktop/test/deployment/active/description.xml b/desktop/test/deployment/active/description.xml
new file mode 100755
index 0000000000..fd7049e0cc
--- /dev/null
+++ b/desktop/test/deployment/active/description.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
+  <d:identifier
+      value="org.openoffice/framework/desktop/test/deployment/active"/>
+  <d:version value="1"/>
+  <d:dependencies>
+    <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 3.4" value="3.4"/>
+  </d:dependencies>
+</d:description>
diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk
new file mode 100755
index 0000000000..5511a39c8b
--- /dev/null
+++ b/desktop/test/deployment/active/makefile.mk
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# 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 = desktop
+TARGET = test_deployment_active
+
+ENABLE_EXCEPTIONS = TRUE
+
+PACKAGE = com/sun/star/comp/test/deployment/active_java
+JAVAFILES = Dispatch.java Provider.java Services.java
+JARFILES = juh.jar ridl.jar unoil.jar
+
+.INCLUDE: settings.mk
+
+DLLPRE =
+
+SLOFILES = $(SHL1OBJS)
+
+SHL1TARGET = active_native.uno
+SHL1OBJS = $(SLO)/active_native.obj
+SHL1RPATH = OXT
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
+SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/active.oxt
+
+$(MISC)/active.oxt : manifest.xml description.xml Addons.xcu \
+        ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET)/active_java.jar \
+        active_python.py
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/active.oxt-zip
+    $(MKDIR) $(MISC)/$(TARGET)/active.oxt-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/active.oxt-zip/META-INF
+    $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' \
+        -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
+        > $(MISC)/$(TARGET)/active.oxt-zip/META-INF/manifest.xml
+    $(COPY) description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/active_java.jar active_python.py \
+        $(MISC)/$(TARGET)/active.oxt-zip/
+    cd $(MISC)/$(TARGET)/active.oxt-zip && zip ../../active.oxt \
+        META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
+        $(SHL1TARGETN:f) active_java.jar active_python.py
+
+$(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET)
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/active_java.jar-zip
+    $(MKDIR) $(MISC)/$(TARGET)/active_java.jar-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/active_java.jar-zip/META-INF \
+        $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)
+    $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/active_java.jar-zip/META-INF/
+    $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \
+        $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/
+    cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \
+        META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
diff --git a/desktop/test/deployment/active/manifest.xml b/desktop/test/deployment/active/manifest.xml
new file mode 100755
index 0000000000..4f07669666
--- /dev/null
+++ b/desktop/test/deployment/active/manifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="Addons.xcu"/>
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="ProtocolHandler.xcu"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=native;platform=@PLATFORM@"
+      m:full-path="@PATH@"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=Java"
+      m:full-path="active_java.jar"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-component;type=Python"
+      m:full-path="active_python.py"/>
+</m:manifest>
diff --git a/desktop/test/deployment/boxt/Addons.xcu b/desktop/test/deployment/boxt/Addons.xcu
index 3df7e2de27..3df7e2de27 100644..100755
--- a/desktop/test/deployment/boxt/Addons.xcu
+++ b/desktop/test/deployment/boxt/Addons.xcu
diff --git a/desktop/test/deployment/boxt/ProtocolHandler.xcu b/desktop/test/deployment/boxt/ProtocolHandler.xcu
index fe448aedbe..fe448aedbe 100644..100755
--- a/desktop/test/deployment/boxt/ProtocolHandler.xcu
+++ b/desktop/test/deployment/boxt/ProtocolHandler.xcu
diff --git a/desktop/test/deployment/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx
index a2fb2c43cb..f0b706bc64 100644..100755
--- a/desktop/test/deployment/boxt/boxt.cxx
+++ b/desktop/test/deployment/boxt/boxt.cxx
@@ -36,8 +36,6 @@
 #include "com/sun/star/frame/XDispatchProvider.hpp"
 #include "com/sun/star/frame/XStatusListener.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Exception.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -46,7 +44,6 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "com/sun/star/util/URL.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/implbase3.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
@@ -62,21 +59,6 @@ namespace {
 
 namespace css = com::sun::star;
 
-namespace service {
-
-rtl::OUString getImplementationName() {
-    return rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
-}
-
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    rtl::OUString name(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
-}
-
-}
-
 class Service:
     public cppu::WeakImplHelper3<
         css::lang::XServiceInfo, css::frame::XDispatchProvider,
@@ -84,14 +66,24 @@ class Service:
     private boost::noncopyable
 {
 public:
-    Service() {}
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const &)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Service); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
 
 private:
+    Service() {}
+
     virtual ~Service() {}
 
     virtual rtl::OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException)
-    { return service::getImplementationName(); }
+    { return static_getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
         throw (css::uno::RuntimeException)
@@ -99,7 +91,7 @@ private:
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException)
-    { return service::getSupportedServiceNames(); }
+    { return static_getSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
         css::util::URL const &, rtl::OUString const &, sal_Int32)
@@ -129,6 +121,17 @@ private:
     {}
 };
 
+rtl::OUString Service::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
+}
+
+css::uno::Sequence< rtl::OUString > Service::static_getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
 Service::queryDispatches(
     css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
@@ -156,61 +159,10 @@ void Service::dispatch(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")));
 }
 
-class Factory:
-    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
-    private boost::noncopyable
-{
-public:
-    Factory() {}
-
-private:
-    virtual ~Factory() {}
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const &)
-        throw (css::uno::Exception, css::uno::RuntimeException)
-    { return static_cast< cppu::OWeakObject * >(new Service); }
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const &,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException)
-    { return createInstanceWithContext(Context); }
-};
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
-    css::uno::Reference< css::uno::XComponentContext > const &)
-    SAL_THROW((css::uno::Exception))
-{
-    OSL_ASSERT(false);
-    return css::uno::Reference< css::uno::XInterface >();
-}
-
-rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.test.deployment.boxt"));
-}
-
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
-    rtl::OUString name(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.deployment.boxt"));
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
-}
-
-css::uno::Reference< css::lang::XSingleComponentFactory > SAL_CALL
-createFactory(
-    cppu::ComponentFactoryFunc, rtl::OUString const &,
-    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(())
-{
-    return new Factory;
-}
-
 static cppu::ImplementationEntry const services[] = {
-    { &dummy, &service::getImplementationName,
-      &service::getSupportedServiceNames, &createFactory, 0, 0 },
+    { &Service::static_create, &Service::static_getImplementationName,
+      &Service::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
     { 0, 0, 0, 0, 0, 0 }
 };
 
diff --git a/desktop/test/deployment/boxt/description.xml b/desktop/test/deployment/boxt/description.xml
index 5a67bf3e94..5a67bf3e94 100644..100755
--- a/desktop/test/deployment/boxt/description.xml
+++ b/desktop/test/deployment/boxt/description.xml
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk
index 11d736448d..88e72aef4a 100644..100755
--- a/desktop/test/deployment/boxt/makefile.mk
+++ b/desktop/test/deployment/boxt/makefile.mk
@@ -46,7 +46,7 @@ SHL1OBJS = $(SLO)/boxt.obj
 SHL1RPATH = BOXT
 SHL1STDLIBS = \
     $(CPPUHELPERLIB) $(CPPULIB) $(MSFILTERLIB) $(SALLIB) $(TOOLSLIB) $(VCLLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk
diff --git a/desktop/test/deployment/boxt/manifest.xml b/desktop/test/deployment/boxt/manifest.xml
index 73ebfc306e..73ebfc306e 100644..100755
--- a/desktop/test/deployment/boxt/manifest.xml
+++ b/desktop/test/deployment/boxt/manifest.xml
diff --git a/desktop/test/deployment/dependencies/broken-dependency.oxt b/desktop/test/deployment/dependencies/broken-dependency.oxt
index 11bab0a950..11bab0a950 100644..100755
--- a/desktop/test/deployment/dependencies/broken-dependency.oxt
+++ b/desktop/test/deployment/dependencies/broken-dependency.oxt
diff --git a/desktop/test/deployment/dependencies/double-dependencies.oxt b/desktop/test/deployment/dependencies/double-dependencies.oxt
index 055c27ea53..055c27ea53 100644..100755
--- a/desktop/test/deployment/dependencies/double-dependencies.oxt
+++ b/desktop/test/deployment/dependencies/double-dependencies.oxt
diff --git a/desktop/test/deployment/dependencies/empty-dependencies.oxt b/desktop/test/deployment/dependencies/empty-dependencies.oxt
index ebb18dcbf5..ebb18dcbf5 100644..100755
--- a/desktop/test/deployment/dependencies/empty-dependencies.oxt
+++ b/desktop/test/deployment/dependencies/empty-dependencies.oxt
diff --git a/desktop/test/deployment/dependencies/funny-dependency.oxt b/desktop/test/deployment/dependencies/funny-dependency.oxt
index 9b683e6d1e..9b683e6d1e 100644..100755
--- a/desktop/test/deployment/dependencies/funny-dependency.oxt
+++ b/desktop/test/deployment/dependencies/funny-dependency.oxt
diff --git a/desktop/test/deployment/dependencies/license-dependency.oxt b/desktop/test/deployment/dependencies/license-dependency.oxt
index b01da4b5ca..b01da4b5ca 100644..100755
--- a/desktop/test/deployment/dependencies/license-dependency.oxt
+++ b/desktop/test/deployment/dependencies/license-dependency.oxt
diff --git a/desktop/test/deployment/dependencies/many-dependencies.oxt b/desktop/test/deployment/dependencies/many-dependencies.oxt
index 3675681437..3675681437 100644..100755
--- a/desktop/test/deployment/dependencies/many-dependencies.oxt
+++ b/desktop/test/deployment/dependencies/many-dependencies.oxt
diff --git a/desktop/test/deployment/dependencies/minattr22.oxt b/desktop/test/deployment/dependencies/minattr22.oxt
index a6c8e3758c..a6c8e3758c 100644..100755
--- a/desktop/test/deployment/dependencies/minattr22.oxt
+++ b/desktop/test/deployment/dependencies/minattr22.oxt
diff --git a/desktop/test/deployment/dependencies/minattr23.oxt b/desktop/test/deployment/dependencies/minattr23.oxt
index 83d17938c4..83d17938c4 100644..100755
--- a/desktop/test/deployment/dependencies/minattr23.oxt
+++ b/desktop/test/deployment/dependencies/minattr23.oxt
diff --git a/desktop/test/deployment/dependencies/minattr24.oxt b/desktop/test/deployment/dependencies/minattr24.oxt
index 00f053f487..00f053f487 100644..100755
--- a/desktop/test/deployment/dependencies/minattr24.oxt
+++ b/desktop/test/deployment/dependencies/minattr24.oxt
diff --git a/desktop/test/deployment/dependencies/no-dependencies.oxt b/desktop/test/deployment/dependencies/no-dependencies.oxt
index 6487eb66ae..6487eb66ae 100644..100755
--- a/desktop/test/deployment/dependencies/no-dependencies.oxt
+++ b/desktop/test/deployment/dependencies/no-dependencies.oxt
diff --git a/desktop/test/deployment/dependencies/no-description.oxt b/desktop/test/deployment/dependencies/no-description.oxt
index 1e6579cd7d..1e6579cd7d 100644..100755
--- a/desktop/test/deployment/dependencies/no-description.oxt
+++ b/desktop/test/deployment/dependencies/no-description.oxt
diff --git a/desktop/test/deployment/dependencies/readme.txt b/desktop/test/deployment/dependencies/readme.txt
index a99fade002..a99fade002 100644..100755
--- a/desktop/test/deployment/dependencies/readme.txt
+++ b/desktop/test/deployment/dependencies/readme.txt
diff --git a/desktop/test/deployment/dependencies/unknown-dependency.oxt b/desktop/test/deployment/dependencies/unknown-dependency.oxt
index 7c2a22c6d5..7c2a22c6d5 100644..100755
--- a/desktop/test/deployment/dependencies/unknown-dependency.oxt
+++ b/desktop/test/deployment/dependencies/unknown-dependency.oxt
diff --git a/desktop/test/deployment/dependencies/version10000.oxt b/desktop/test/deployment/dependencies/version10000.oxt
index c15b7a117c..c15b7a117c 100644..100755
--- a/desktop/test/deployment/dependencies/version10000.oxt
+++ b/desktop/test/deployment/dependencies/version10000.oxt
diff --git a/desktop/test/deployment/dependencies/version21.oxt b/desktop/test/deployment/dependencies/version21.oxt
index 922b279555..922b279555 100644..100755
--- a/desktop/test/deployment/dependencies/version21.oxt
+++ b/desktop/test/deployment/dependencies/version21.oxt
diff --git a/desktop/test/deployment/dependencies/version21ns.oxt b/desktop/test/deployment/dependencies/version21ns.oxt
index 5efb2ed902..5efb2ed902 100644..100755
--- a/desktop/test/deployment/dependencies/version21ns.oxt
+++ b/desktop/test/deployment/dependencies/version21ns.oxt
diff --git a/desktop/test/deployment/dependencies/version21other.oxt b/desktop/test/deployment/dependencies/version21other.oxt
index d88a8155af..d88a8155af 100644..100755
--- a/desktop/test/deployment/dependencies/version21other.oxt
+++ b/desktop/test/deployment/dependencies/version21other.oxt
diff --git a/desktop/test/deployment/dependencies/version22.oxt b/desktop/test/deployment/dependencies/version22.oxt
index 4c8a207b68..4c8a207b68 100644..100755
--- a/desktop/test/deployment/dependencies/version22.oxt
+++ b/desktop/test/deployment/dependencies/version22.oxt
diff --git a/desktop/test/deployment/dependencies/version23.oxt b/desktop/test/deployment/dependencies/version23.oxt
index 6c08d2949c..6c08d2949c 100644..100755
--- a/desktop/test/deployment/dependencies/version23.oxt
+++ b/desktop/test/deployment/dependencies/version23.oxt
diff --git a/desktop/test/deployment/dependencies/versionempty.oxt b/desktop/test/deployment/dependencies/versionempty.oxt
index a06bb01294..a06bb01294 100644..100755
--- a/desktop/test/deployment/dependencies/versionempty.oxt
+++ b/desktop/test/deployment/dependencies/versionempty.oxt
diff --git a/desktop/test/deployment/dependencies/versionnone.oxt b/desktop/test/deployment/dependencies/versionnone.oxt
index ace2a11651..ace2a11651 100644..100755
--- a/desktop/test/deployment/dependencies/versionnone.oxt
+++ b/desktop/test/deployment/dependencies/versionnone.oxt
diff --git a/desktop/test/deployment/description/desc1.oxt b/desktop/test/deployment/description/desc1.oxt
index e447fd6eae..e447fd6eae 100644..100755
--- a/desktop/test/deployment/description/desc1.oxt
+++ b/desktop/test/deployment/description/desc1.oxt
diff --git a/desktop/test/deployment/description/desc2.oxt b/desktop/test/deployment/description/desc2.oxt
index 8df2f33fa6..8df2f33fa6 100644..100755
--- a/desktop/test/deployment/description/desc2.oxt
+++ b/desktop/test/deployment/description/desc2.oxt
diff --git a/desktop/test/deployment/description/desc3.oxt b/desktop/test/deployment/description/desc3.oxt
index fbd1136b03..fbd1136b03 100644..100755
--- a/desktop/test/deployment/description/desc3.oxt
+++ b/desktop/test/deployment/description/desc3.oxt
diff --git a/desktop/test/deployment/description/desc4.oxt b/desktop/test/deployment/description/desc4.oxt
index 0c97f5fd44..0c97f5fd44 100644..100755
--- a/desktop/test/deployment/description/desc4.oxt
+++ b/desktop/test/deployment/description/desc4.oxt
diff --git a/desktop/test/deployment/description/desc5.oxt b/desktop/test/deployment/description/desc5.oxt
index 8110073499..8110073499 100644..100755
--- a/desktop/test/deployment/description/desc5.oxt
+++ b/desktop/test/deployment/description/desc5.oxt
diff --git a/desktop/test/deployment/display_name/name1.oxt b/desktop/test/deployment/display_name/name1.oxt
index 5a53690d69..5a53690d69 100644..100755
--- a/desktop/test/deployment/display_name/name1.oxt
+++ b/desktop/test/deployment/display_name/name1.oxt
diff --git a/desktop/test/deployment/display_name/name2.oxt b/desktop/test/deployment/display_name/name2.oxt
index f6cbcae3bc..f6cbcae3bc 100644..100755
--- a/desktop/test/deployment/display_name/name2.oxt
+++ b/desktop/test/deployment/display_name/name2.oxt
diff --git a/desktop/test/deployment/display_name/name3.oxt b/desktop/test/deployment/display_name/name3.oxt
index 8df750ce62..8df750ce62 100644..100755
--- a/desktop/test/deployment/display_name/name3.oxt
+++ b/desktop/test/deployment/display_name/name3.oxt
diff --git a/desktop/test/deployment/display_name/name4.oxt b/desktop/test/deployment/display_name/name4.oxt
index 6ce4822e37..6ce4822e37 100644..100755
--- a/desktop/test/deployment/display_name/name4.oxt
+++ b/desktop/test/deployment/display_name/name4.oxt
diff --git a/desktop/test/deployment/display_name/name5.oxt b/desktop/test/deployment/display_name/name5.oxt
index 56973be781..56973be781 100644..100755
--- a/desktop/test/deployment/display_name/name5.oxt
+++ b/desktop/test/deployment/display_name/name5.oxt
diff --git a/desktop/test/deployment/display_name/readme.txt b/desktop/test/deployment/display_name/readme.txt
index 23173bde63..23173bde63 100644..100755
--- a/desktop/test/deployment/display_name/readme.txt
+++ b/desktop/test/deployment/display_name/readme.txt
diff --git a/desktop/test/deployment/executable_content/build/hello.c b/desktop/test/deployment/executable_content/build/hello.c
index e5f41dc651..e5f41dc651 100644..100755
--- a/desktop/test/deployment/executable_content/build/hello.c
+++ b/desktop/test/deployment/executable_content/build/hello.c
diff --git a/desktop/test/deployment/executable_content/build/makefile.mk b/desktop/test/deployment/executable_content/build/makefile.mk
index 038051c974..038051c974 100644..100755
--- a/desktop/test/deployment/executable_content/build/makefile.mk
+++ b/desktop/test/deployment/executable_content/build/makefile.mk
diff --git a/desktop/test/deployment/executable_content/build/readme.txt b/desktop/test/deployment/executable_content/build/readme.txt
index 4f956e573e..4f956e573e 100644..100755
--- a/desktop/test/deployment/executable_content/build/readme.txt
+++ b/desktop/test/deployment/executable_content/build/readme.txt
diff --git a/desktop/test/deployment/executable_content/hello.oxt b/desktop/test/deployment/executable_content/hello.oxt
index 97d6d14a31..97d6d14a31 100644..100755
--- a/desktop/test/deployment/executable_content/hello.oxt
+++ b/desktop/test/deployment/executable_content/hello.oxt
diff --git a/desktop/test/deployment/executable_content/readme.txt b/desktop/test/deployment/executable_content/readme.txt
index ad3c01097e..ad3c01097e 100644..100755
--- a/desktop/test/deployment/executable_content/readme.txt
+++ b/desktop/test/deployment/executable_content/readme.txt
diff --git a/desktop/test/deployment/identifier/explicit/identifier.oxt b/desktop/test/deployment/identifier/explicit/identifier.oxt
index 3851e291c9..3851e291c9 100644..100755
--- a/desktop/test/deployment/identifier/explicit/identifier.oxt
+++ b/desktop/test/deployment/identifier/explicit/identifier.oxt
diff --git a/desktop/test/deployment/identifier/legacy/identifier.oxt b/desktop/test/deployment/identifier/legacy/identifier.oxt
index df8bb84492..df8bb84492 100644..100755
--- a/desktop/test/deployment/identifier/legacy/identifier.oxt
+++ b/desktop/test/deployment/identifier/legacy/identifier.oxt
diff --git a/desktop/test/deployment/identifier/readme.txt b/desktop/test/deployment/identifier/readme.txt
index 8a791c586a..8a791c586a 100644..100755
--- a/desktop/test/deployment/identifier/readme.txt
+++ b/desktop/test/deployment/identifier/readme.txt
diff --git a/desktop/test/deployment/locationtest/LocationTest.idl b/desktop/test/deployment/locationtest/LocationTest.idl
index 43beaac0a3..43beaac0a3 100644..100755
--- a/desktop/test/deployment/locationtest/LocationTest.idl
+++ b/desktop/test/deployment/locationtest/LocationTest.idl
diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java
index b16d494551..b16d494551 100644..100755
--- a/desktop/test/deployment/locationtest/LocationTest.java
+++ b/desktop/test/deployment/locationtest/LocationTest.java
diff --git a/desktop/test/deployment/locationtest/LocationTest.odt b/desktop/test/deployment/locationtest/LocationTest.odt
index 8e1aa70078..8e1aa70078 100644..100755
--- a/desktop/test/deployment/locationtest/LocationTest.odt
+++ b/desktop/test/deployment/locationtest/LocationTest.odt
diff --git a/desktop/test/deployment/locationtest/MANIFEST.MF b/desktop/test/deployment/locationtest/MANIFEST.MF
index a2fa8c34b7..a2fa8c34b7 100644..100755
--- a/desktop/test/deployment/locationtest/MANIFEST.MF
+++ b/desktop/test/deployment/locationtest/MANIFEST.MF
diff --git a/desktop/test/deployment/locationtest/delzip b/desktop/test/deployment/locationtest/delzip
index 636fda90bf..636fda90bf 100644..100755
--- a/desktop/test/deployment/locationtest/delzip
+++ b/desktop/test/deployment/locationtest/delzip
diff --git a/desktop/test/deployment/locationtest/description.xml b/desktop/test/deployment/locationtest/description.xml
index 54e45537b0..54e45537b0 100644..100755
--- a/desktop/test/deployment/locationtest/description.xml
+++ b/desktop/test/deployment/locationtest/description.xml
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index 8fe1897919..24be56c28d 100644..100755
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -80,5 +80,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr
     $(COPY)  description.xml $(MISC)$/$(TARGET)$/description.xml	
     $(TOUCH) $@
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
diff --git a/desktop/test/deployment/locationtest/manifest.xml b/desktop/test/deployment/locationtest/manifest.xml
index 3dd6460faf..3dd6460faf 100644..100755
--- a/desktop/test/deployment/locationtest/manifest.xml
+++ b/desktop/test/deployment/locationtest/manifest.xml
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF
index fba55a6e0d..fba55a6e0d 100644..100755
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index bd8e40826c..bd8e40826c 100644..100755
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
index 662fffce40..662fffce40 100644..100755
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
diff --git a/desktop/test/deployment/options/leaf1.oxt b/desktop/test/deployment/options/leaf1.oxt
index 9c3ff86985..9c3ff86985 100644..100755
--- a/desktop/test/deployment/options/leaf1.oxt
+++ b/desktop/test/deployment/options/leaf1.oxt
diff --git a/desktop/test/deployment/options/leaf1mod.oxt b/desktop/test/deployment/options/leaf1mod.oxt
index d5d9fe6896..d5d9fe6896 100644..100755
--- a/desktop/test/deployment/options/leaf1mod.oxt
+++ b/desktop/test/deployment/options/leaf1mod.oxt
diff --git a/desktop/test/deployment/options/leaf2.oxt b/desktop/test/deployment/options/leaf2.oxt
index b95628900c..b95628900c 100644..100755
--- a/desktop/test/deployment/options/leaf2.oxt
+++ b/desktop/test/deployment/options/leaf2.oxt
diff --git a/desktop/test/deployment/options/leaves1.oxt b/desktop/test/deployment/options/leaves1.oxt
index 037389a018..037389a018 100644..100755
--- a/desktop/test/deployment/options/leaves1.oxt
+++ b/desktop/test/deployment/options/leaves1.oxt
diff --git a/desktop/test/deployment/options/leaves2.oxt b/desktop/test/deployment/options/leaves2.oxt
index 531b385663..531b385663 100644..100755
--- a/desktop/test/deployment/options/leaves2.oxt
+++ b/desktop/test/deployment/options/leaves2.oxt
diff --git a/desktop/test/deployment/options/leaves3.oxt b/desktop/test/deployment/options/leaves3.oxt
index f5bb0f2262..f5bb0f2262 100644..100755
--- a/desktop/test/deployment/options/leaves3.oxt
+++ b/desktop/test/deployment/options/leaves3.oxt
diff --git a/desktop/test/deployment/options/modules1.oxt b/desktop/test/deployment/options/modules1.oxt
index bae652ffbc..bae652ffbc 100644..100755
--- a/desktop/test/deployment/options/modules1.oxt
+++ b/desktop/test/deployment/options/modules1.oxt
diff --git a/desktop/test/deployment/options/modules2.oxt b/desktop/test/deployment/options/modules2.oxt
index d6d7956d45..d6d7956d45 100644..100755
--- a/desktop/test/deployment/options/modules2.oxt
+++ b/desktop/test/deployment/options/modules2.oxt
diff --git a/desktop/test/deployment/options/nodes1.oxt b/desktop/test/deployment/options/nodes1.oxt
index b1dfa18d3e..b1dfa18d3e 100644..100755
--- a/desktop/test/deployment/options/nodes1.oxt
+++ b/desktop/test/deployment/options/nodes1.oxt
diff --git a/desktop/test/deployment/options/nodes2.oxt b/desktop/test/deployment/options/nodes2.oxt
index a35cfaba9d..a35cfaba9d 100644..100755
--- a/desktop/test/deployment/options/nodes2.oxt
+++ b/desktop/test/deployment/options/nodes2.oxt
diff --git a/desktop/test/deployment/options/nodes3.oxt b/desktop/test/deployment/options/nodes3.oxt
index db0bc49da5..db0bc49da5 100644..100755
--- a/desktop/test/deployment/options/nodes3.oxt
+++ b/desktop/test/deployment/options/nodes3.oxt
diff --git a/desktop/test/deployment/options/nodes4.oxt b/desktop/test/deployment/options/nodes4.oxt
index fe0550fdc6..fe0550fdc6 100644..100755
--- a/desktop/test/deployment/options/nodes4.oxt
+++ b/desktop/test/deployment/options/nodes4.oxt
diff --git a/desktop/test/deployment/options/nodes5.oxt b/desktop/test/deployment/options/nodes5.oxt
index 893e9ee3e2..893e9ee3e2 100644..100755
--- a/desktop/test/deployment/options/nodes5.oxt
+++ b/desktop/test/deployment/options/nodes5.oxt
diff --git a/desktop/test/deployment/options/readme.txt b/desktop/test/deployment/options/readme.txt
index 9879a72cef..9879a72cef 100644..100755
--- a/desktop/test/deployment/options/readme.txt
+++ b/desktop/test/deployment/options/readme.txt
diff --git a/desktop/test/deployment/passive/Addons.xcu b/desktop/test/deployment/passive/Addons.xcu
new file mode 100755
index 0000000000..61578d7426
--- /dev/null
+++ b/desktop/test/deployment/passive/Addons.xcu
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="Addons">
+  <node o:name="AddonUI">
+    <node o:name="OfficeMenuBar">
+      <node o:name="org.openoffice.test.desktop.deployment.passive"
+          o:op="replace">
+        <prop o:name="Title" xml:lang="en-US">
+          <value>passive</value>
+        </prop>
+        <node o:name="Submenu">
+          <node o:name="1" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_native:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>native</value>
+            </prop>
+          </node>
+          <node o:name="2" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_java:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>java</value>
+            </prop>
+          </node>
+          <node o:name="3" o:op="replace">
+            <prop o:name="URL">
+              <value>vnd.org.openoffice.test.desktop.deployment.passive_python:</value>
+            </prop>
+            <prop o:name="Title" xml:lang="en-US">
+              <value>python</value>
+            </prop>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/passive/Dispatch.java b/desktop/test/deployment/passive/Dispatch.java
new file mode 100755
index 0000000000..295f34d599
--- /dev/null
+++ b/desktop/test/deployment/passive/Dispatch.java
@@ -0,0 +1,101 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XMessageBox;
+import com.sun.star.awt.XMessageBoxFactory;
+import com.sun.star.awt.XWindowPeer;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XStatusListener;
+import com.sun.star.lang.WrappedTargetRuntimeException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Dispatch extends WeakBase implements XServiceInfo, XDispatch
+{
+    public Dispatch(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return false; //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public void dispatch(URL URL, PropertyValue[] Arguments) {
+        try {
+            XMultiComponentFactory smgr = UnoRuntime.queryInterface(
+                XMultiComponentFactory.class, context.getServiceManager());
+            XMessageBox box = UnoRuntime.queryInterface(
+                XMessageBoxFactory.class,
+                smgr.createInstanceWithContext(
+                    "com.sun.star.awt.Toolkit", context)).
+                createMessageBox(
+                    UnoRuntime.queryInterface(
+                        XWindowPeer.class,
+                        (UnoRuntime.queryInterface(
+                            XDesktop.class,
+                            smgr.createInstanceWithContext(
+                                "com.sun.star.frame.Desktop", context)).
+                         getCurrentFrame().getComponentWindow())),
+                    new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+                    "passive", "java");
+            box.execute();
+            UnoRuntime.queryInterface(XComponent.class, box).dispose();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            throw e;
+        } catch (com.sun.star.uno.Exception e) {
+            throw new WrappedTargetRuntimeException(
+                "wrapped: " + e.getMessage(), this, e);
+        }
+    }
+
+    public void addStatusListener(XStatusListener Control, URL URL) {}
+
+    public void removeStatusListener(XStatusListener Control, URL URL) {}
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.passive_java_singleton";
+
+    static final String[] serviceNames = new String[0];
+}
diff --git a/desktop/test/deployment/passive/MANIFEST.MF b/desktop/test/deployment/passive/MANIFEST.MF
new file mode 100755
index 0000000000..45a04bf263
--- /dev/null
+++ b/desktop/test/deployment/passive/MANIFEST.MF
@@ -0,0 +1,3 @@
+Sealed: true
+RegistrationClassName: com.sun.star.comp.test.deployment.passive_java.Services
+UNO-Type-Path: 
diff --git a/desktop/test/deployment/passive/ProtocolHandler.xcu b/desktop/test/deployment/passive/ProtocolHandler.xcu
new file mode 100755
index 0000000000..bc0355be41
--- /dev/null
+++ b/desktop/test/deployment/passive/ProtocolHandler.xcu
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<o:component-data xmlns:o="http://openoffice.org/2001/registry"
+    o:package="org.openoffice.Office" o:name="ProtocolHandler">
+  <node o:name="HandlerSet">
+    <node o:name="com.sun.star.test.deployment.passive_native" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_native:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.passive_java" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_java:*</value>
+      </prop>
+    </node>
+    <node o:name="com.sun.star.test.deployment.passive_python" o:op="replace">
+      <prop o:name="Protocols">
+        <value>vnd.org.openoffice.test.desktop.deployment.passive_python:*</value>
+      </prop>
+    </node>
+  </node>
+</o:component-data>
diff --git a/desktop/test/deployment/passive/Provider.java b/desktop/test/deployment/passive/Provider.java
new file mode 100755
index 0000000000..6f74ed9eb8
--- /dev/null
+++ b/desktop/test/deployment/passive/Provider.java
@@ -0,0 +1,81 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.frame.DispatchDescriptor;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lib.uno.helper.WeakBase;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.URL;
+
+public final class Provider extends WeakBase
+    implements XServiceInfo, XDispatchProvider
+{
+    public Provider(XComponentContext context) {
+        this.context = context;
+    }
+
+    public String getImplementationName() { return implementationName; }
+
+    public boolean supportsService(String ServiceName) {
+        return ServiceName.equals(getSupportedServiceNames()[0]); //TODO
+    }
+
+    public String[] getSupportedServiceNames() {
+        return serviceNames;
+    }
+
+    public XDispatch queryDispatch(
+        URL URL, String TargetFrameName, int SearchFlags)
+    {
+        return UnoRuntime.queryInterface(
+            XDispatch.class,
+            context.getValueByName(
+                "/singletons/" +
+                "com.sun.star.test.deployment.passive_java_singleton"));
+    }
+
+    public XDispatch[] queryDispatches(DispatchDescriptor[] Requests) {
+        XDispatch[] s = new XDispatch[Requests.length];
+        for (int i = 0; i < s.length; ++i) {
+            s[i] = queryDispatch(
+                Requests[i].FeatureURL, Requests[i].FrameName,
+                Requests[i].SearchFlags);
+        }
+        return s;
+    }
+
+    private final XComponentContext context;
+
+    static final String implementationName =
+        "com.sun.star.comp.test.deployment.passive_java";
+
+    static final String[] serviceNames = new String[] {
+        "com.sun.star.test.deployment.passive_java" };
+}
diff --git a/desktop/test/deployment/passive/Services.java b/desktop/test/deployment/passive/Services.java
new file mode 100755
index 0000000000..799df3e702
--- /dev/null
+++ b/desktop/test/deployment/passive/Services.java
@@ -0,0 +1,49 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package com.sun.star.comp.test.deployment.passive_java;
+
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lib.uno.helper.Factory;
+
+public final class Services {
+    private Services() {}
+
+    public static XSingleComponentFactory __getComponentFactory(
+        String implementation)
+    {
+        if (implementation.equals(Dispatch.implementationName)) {
+            return Factory.createComponentFactory(
+                Dispatch.class, Dispatch.implementationName,
+                Dispatch.serviceNames);
+        } else if (implementation.equals(Provider.implementationName)) {
+            return Factory.createComponentFactory(
+                Provider.class, Provider.implementationName,
+                Provider.serviceNames);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/desktop/test/deployment/passive/description.xml b/desktop/test/deployment/passive/description.xml
new file mode 100755
index 0000000000..468dfa065f
--- /dev/null
+++ b/desktop/test/deployment/passive/description.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006">
+  <d:identifier
+      value="org.openoffice/framework/desktop/test/deployment/passive"/>
+  <d:version value="1"/>
+  <d:dependencies>
+    <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 3.4" value="3.4"/>
+  </d:dependencies>
+</d:description>
diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
new file mode 100755
index 0000000000..019e5dcab8
--- /dev/null
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -0,0 +1,136 @@
+#*************************************************************************
+#
+# 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 = desktop
+TARGET = test_deployment_passive
+
+ENABLE_EXCEPTIONS = TRUE
+
+PACKAGE = com/sun/star/comp/test/deployment/passive_java
+JAVAFILES = Dispatch.java Provider.java Services.java
+JARFILES = juh.jar ridl.jar unoil.jar
+
+my_platform_components = passive_native
+my_generic_components = passive_java passive_python
+
+.INCLUDE: settings.mk
+
+DLLPRE =
+
+SLOFILES = $(SHL1OBJS)
+
+SHL1TARGET = passive_native.uno
+SHL1OBJS = $(SLO)/passive_native.obj
+SHL1RPATH = OXT
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/passive.oxt
+
+$(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
+        ProtocolHandler.xcu $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/passive_java.jar passive_python.py
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/passive.oxt-zip
+    $(MKDIR) $(MISC)/$(TARGET)/passive.oxt-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/passive.oxt-zip/META-INF
+    $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
+        > $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/manifest.xml
+    $(COPY) description.xml Addons.xcu ProtocolHandler.xcu \
+        $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/passive_java.jar passive_python.py \
+        $(MISC)/$(TARGET)/passive.oxt-zip/
+    cd $(MISC)/$(TARGET)/passive.oxt-zip && zip ../../passive.oxt \
+        META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
+        platform.components generic.components $(SHL1TARGETN:f) \
+        passive_java.jar passive_python.py
+
+$(MISC)/$(TARGET)/platform.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/platform.components.input \
+        $(my_platform_components:^"$(MISC)/$(TARGET)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/platform.components.input
+
+$(MISC)/$(TARGET)/platform.components.input :
+    $(MKDIRHIER) $(@:d)
+    echo '<list>' \
+        '$(my_platform_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
+
+$(MISC)/$(TARGET)/generic.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input \
+        $(my_generic_components:^"$(MISC)/$(TARGET)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input
+
+$(MISC)/$(TARGET)/generic.components.input :
+    $(MKDIRHIER) $(@:d)
+    echo '<list>' \
+        '$(my_generic_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
+
+$(MISC)/$(TARGET)/passive_native.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_native.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_native.component
+
+$(MISC)/$(TARGET)/passive_java.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_java.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)passive_java.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_java.component
+
+$(MISC)/$(TARGET)/passive_python.component : \
+        $(SOLARENV)/bin/createcomponent.xslt passive_python.component
+    $(MKDIRHIER) $(@:d)
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_EXTENSION)passive_python.py' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt passive_python.component
+
+$(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET)
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(RM) -r $(MISC)/$(TARGET)/passive_java.jar-zip
+    $(MKDIR) $(MISC)/$(TARGET)/passive_java.jar-zip
+    $(MKDIRHIER) $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF \
+        $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)
+    $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF/
+    $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \
+        $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/
+    cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \
+        META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
diff --git a/desktop/test/deployment/passive/manifest.xml b/desktop/test/deployment/passive/manifest.xml
new file mode 100755
index 0000000000..5b8ac8419b
--- /dev/null
+++ b/desktop/test/deployment/passive/manifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<m:manifest xmlns:m="http://openoffice.org/2001/manifest">
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="Addons.xcu"/>
+  <m:file-entry m:media-type="application/vnd.sun.star.configuration-data"
+      m:full-path="ProtocolHandler.xcu"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+      m:full-path="platform.components"/>
+  <m:file-entry
+      m:media-type="application/vnd.sun.star.uno-components"
+      m:full-path="generic.components"/>
+</m:manifest>
diff --git a/desktop/test/deployment/passive/passive_java.component b/desktop/test/deployment/passive/passive_java.component
new file mode 100755
index 0000000000..74be57177d
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_java.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_java">
+    <service name="com.sun.star.test.deployment.passive_java"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_java_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_java_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_native.component b/desktop/test/deployment/passive/passive_native.component
new file mode 100755
index 0000000000..c14fd7ff00
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_native.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_native">
+    <service name="com.sun.star.test.deployment.passive_native"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_native_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_native_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
new file mode 100755
index 0000000000..39101257ad
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -0,0 +1,289 @@
+/*************************************************************************
+*
+* 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 "precompiled_desktop.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/awt/MessageBoxButtons.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/XMessageBox.hpp"
+#include "com/sun/star/awt/XMessageBoxFactory.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/lbnames.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Provider:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatchProvider >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames();
+
+private:
+    Provider(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Provider() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+        css::util::URL const &, rtl::OUString const &, sal_Int32)
+        throw (css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+    SAL_CALL queryDispatches(
+        css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+        throw (css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Provider::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.passive_native"));
+}
+
+css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+{
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.test.deployment.passive_native"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
+    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::frame::XDispatch > dispatch;
+    if (!(context_->getValueByName(
+              rtl::OUString(
+                  RTL_CONSTASCII_USTRINGPARAM(
+                      "/singletons/com.sun.star.test.deployment."
+                      "passive_native_singleton"))) >>=
+          dispatch) ||
+        !dispatch.is())
+    {
+        throw css::uno::DeploymentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "component context fails to supply singleton"
+                    " com.sun.star.test.deployment.passive_native_singleton of"
+                    " type com.sun.star.frame.XDispatch")),
+            context_);
+    }
+    return dispatch;
+}
+
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
+Provider::queryDispatches(
+    css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
+        Requests.getLength());
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
+        s[i] = queryDispatch(
+            Requests[i].FeatureURL, Requests[i].FrameName,
+            Requests[i].SearchFlags);
+    }
+    return s;
+}
+
+class Dispatch:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::frame::XDispatch >,
+    private boost::noncopyable
+{
+public:
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create(
+        css::uno::Reference< css::uno::XComponentContext > const & xContext)
+        SAL_THROW((css::uno::Exception))
+    { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
+
+    static rtl::OUString SAL_CALL static_getImplementationName();
+
+    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static_getSupportedServiceNames()
+    { return css::uno::Sequence< rtl::OUString >(); }
+
+private:
+    Dispatch(
+        css::uno::Reference< css::uno::XComponentContext > const & context):
+        context_(context) { OSL_ASSERT(context.is()); }
+
+    virtual ~Dispatch() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return static_getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
+        throw (css::uno::RuntimeException)
+    { return false; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return static_getSupportedServiceNames(); }
+
+    virtual void SAL_CALL dispatch(
+        css::util::URL const &,
+        css::uno::Sequence< css::beans::PropertyValue > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeStatusListener(
+        css::uno::Reference< css::frame::XStatusListener > const &,
+        css::util::URL const &)
+        throw (css::uno::RuntimeException)
+    {}
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+};
+
+rtl::OUString Dispatch::static_getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.test.deployment.passive_native_singleton"));
+}
+
+void Dispatch::dispatch(
+    css::util::URL const &,
+    css::uno::Sequence< css::beans::PropertyValue > const &)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+        context_->getServiceManager(), css::uno::UNO_SET_THROW);
+    css::uno::Reference< css::awt::XMessageBox > box(
+        css::uno::Reference< css::awt::XMessageBoxFactory >(
+            smgr->createInstanceWithContext(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                  "com.sun.star.awt.Toolkit")), context_),
+            css::uno::UNO_QUERY_THROW)->createMessageBox(
+                css::uno::Reference< css::awt::XWindowPeer >(
+                    css::uno::Reference< css::frame::XFrame >(
+                        css::uno::Reference< css::frame::XDesktop >(
+                            smgr->createInstanceWithContext(
+                                rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.frame.Desktop")),
+                                context_),
+                            css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
+                        css::uno::UNO_SET_THROW)->getComponentWindow(),
+                    css::uno::UNO_QUERY_THROW),
+                css::awt::Rectangle(),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+                css::awt::MessageBoxButtons::BUTTONS_OK,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passive")),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
+        css::uno::UNO_SET_THROW);
+    box->execute();
+    css::uno::Reference< css::lang::XComponent >(
+        box, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &Provider::static_create, &Provider::static_getImplementationName,
+      &Provider::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { &Dispatch::static_create, &Dispatch::static_getImplementationName,
+      &Dispatch::static_getSupportedServiceNames,
+      &cppu::createSingleComponentFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
diff --git a/desktop/test/deployment/passive/passive_python.component b/desktop/test/deployment/passive/passive_python.component
new file mode 100755
index 0000000000..ea7a1992b5
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_python.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Python"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.test.deployment.passive_python">
+    <service name="com.sun.star.test.deployment.passive_python"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.test.deployment.passive_python_singleton">
+    <singleton name="com.sun.star.test.deployment.passive_python_singleton"/>
+  </implementation>
+</component>
diff --git a/desktop/test/deployment/passive/passive_python.py b/desktop/test/deployment/passive/passive_python.py
new file mode 100755
index 0000000000..dda68cccdb
--- /dev/null
+++ b/desktop/test/deployment/passive/passive_python.py
@@ -0,0 +1,101 @@
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+import uno
+import unohelper
+
+from com.sun.star.awt import Rectangle
+from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.frame import XDispatch, XDispatchProvider
+from com.sun.star.lang import XServiceInfo
+
+class Provider(unohelper.Base, XServiceInfo, XDispatchProvider):
+    implementationName = "com.sun.star.comp.test.deployment.passive_python"
+
+    serviceNames = ("com.sun.star.test.deployment.passive_python",)
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def queryDispatch(self, URL, TargetFrame, SearchFlags):
+        return self.context.getValueByName( \
+            "/singletons/com.sun.star.test.deployment.passive_python_singleton")
+
+    def queryDispatches(self, Requests):
+        tuple( \
+            self.queryDispatch(i.FeatureURL, i.FrameName, i.SearchFlags) \
+                for i in Requests)
+
+class Dispatch(unohelper.Base, XServiceInfo, XDispatch):
+    implementationName = \
+        "com.sun.star.comp.test.deployment.passive_python_singleton"
+
+    serviceNames = ()
+
+    def __init__(self, context):
+        self.context = context
+
+    def getImplementationName(self):
+        return self.implementationName
+
+    def supportsService(self, ServiceName):
+        return ServiceName in self.serviceNames
+
+    def getSupportedServiceNames(self):
+        return self.serviceNames
+
+    def dispatch(self, URL, Arguments):
+        smgr = self.context.getServiceManager()
+        box = smgr.createInstanceWithContext( \
+            "com.sun.star.awt.Toolkit", self.context).createMessageBox( \
+                smgr.createInstanceWithContext( \
+                    "com.sun.star.frame.Desktop", self.context). \
+                    getCurrentFrame().getComponentWindow(), \
+                Rectangle(), "infobox", BUTTONS_OK, "passive", "python")
+        box.execute();
+        box.dispose();
+
+    def addStatusListener(self, Control, URL):
+        pass
+
+    def removeStatusListener(self, Control, URL):
+        pass
+
+g_ImplementationHelper = unohelper.ImplementationHelper()
+g_ImplementationHelper.addImplementation( \
+    Provider, Provider.implementationName, Provider.serviceNames)
+g_ImplementationHelper.addImplementation( \
+    Dispatch, Dispatch.implementationName, Dispatch.serviceNames)
diff --git a/desktop/test/deployment/simple_license/BadDesc.oxt b/desktop/test/deployment/simple_license/BadDesc.oxt
index 436778d54d..436778d54d 100644..100755
--- a/desktop/test/deployment/simple_license/BadDesc.oxt
+++ b/desktop/test/deployment/simple_license/BadDesc.oxt
diff --git a/desktop/test/deployment/simple_license/BadNamespace.oxt b/desktop/test/deployment/simple_license/BadNamespace.oxt
index e439c9e171..e439c9e171 100644..100755
--- a/desktop/test/deployment/simple_license/BadNamespace.oxt
+++ b/desktop/test/deployment/simple_license/BadNamespace.oxt
diff --git a/desktop/test/deployment/simple_license/BadRoot.oxt b/desktop/test/deployment/simple_license/BadRoot.oxt
index 1f6c60c992..1f6c60c992 100644..100755
--- a/desktop/test/deployment/simple_license/BadRoot.oxt
+++ b/desktop/test/deployment/simple_license/BadRoot.oxt
diff --git a/desktop/test/deployment/simple_license/Locale1.oxt b/desktop/test/deployment/simple_license/Locale1.oxt
index 51ecb5c75c..51ecb5c75c 100644..100755
--- a/desktop/test/deployment/simple_license/Locale1.oxt
+++ b/desktop/test/deployment/simple_license/Locale1.oxt
diff --git a/desktop/test/deployment/simple_license/Locale2.oxt b/desktop/test/deployment/simple_license/Locale2.oxt
index bb6b236a5d..bb6b236a5d 100644..100755
--- a/desktop/test/deployment/simple_license/Locale2.oxt
+++ b/desktop/test/deployment/simple_license/Locale2.oxt
diff --git a/desktop/test/deployment/simple_license/Locale3.oxt b/desktop/test/deployment/simple_license/Locale3.oxt
index 56bfedc240..56bfedc240 100644..100755
--- a/desktop/test/deployment/simple_license/Locale3.oxt
+++ b/desktop/test/deployment/simple_license/Locale3.oxt
diff --git a/desktop/test/deployment/simple_license/Locale4.oxt b/desktop/test/deployment/simple_license/Locale4.oxt
index 9a465bc7cf..9a465bc7cf 100644..100755
--- a/desktop/test/deployment/simple_license/Locale4.oxt
+++ b/desktop/test/deployment/simple_license/Locale4.oxt
diff --git a/desktop/test/deployment/simple_license/Locale5.oxt b/desktop/test/deployment/simple_license/Locale5.oxt
index ce16830c13..ce16830c13 100644..100755
--- a/desktop/test/deployment/simple_license/Locale5.oxt
+++ b/desktop/test/deployment/simple_license/Locale5.oxt
diff --git a/desktop/test/deployment/simple_license/Locale6.oxt b/desktop/test/deployment/simple_license/Locale6.oxt
index 770d32506e..770d32506e 100644..100755
--- a/desktop/test/deployment/simple_license/Locale6.oxt
+++ b/desktop/test/deployment/simple_license/Locale6.oxt
diff --git a/desktop/test/deployment/simple_license/LongLic.oxt b/desktop/test/deployment/simple_license/LongLic.oxt
index a0a49daeba..a0a49daeba 100644..100755
--- a/desktop/test/deployment/simple_license/LongLic.oxt
+++ b/desktop/test/deployment/simple_license/LongLic.oxt
diff --git a/desktop/test/deployment/simple_license/MissingLic.oxt b/desktop/test/deployment/simple_license/MissingLic.oxt
index 04d58fd117..04d58fd117 100644..100755
--- a/desktop/test/deployment/simple_license/MissingLic.oxt
+++ b/desktop/test/deployment/simple_license/MissingLic.oxt
diff --git a/desktop/test/deployment/simple_license/MissingLicRef.oxt b/desktop/test/deployment/simple_license/MissingLicRef.oxt
index 01c9d19a28..01c9d19a28 100644..100755
--- a/desktop/test/deployment/simple_license/MissingLicRef.oxt
+++ b/desktop/test/deployment/simple_license/MissingLicRef.oxt
diff --git a/desktop/test/deployment/simple_license/NoDefLang.oxt b/desktop/test/deployment/simple_license/NoDefLang.oxt
index 3eadd5254c..3eadd5254c 100644..100755
--- a/desktop/test/deployment/simple_license/NoDefLang.oxt
+++ b/desktop/test/deployment/simple_license/NoDefLang.oxt
diff --git a/desktop/test/deployment/simple_license/NoDesc.oxt b/desktop/test/deployment/simple_license/NoDesc.oxt
index ac83dac97e..ac83dac97e 100644..100755
--- a/desktop/test/deployment/simple_license/NoDesc.oxt
+++ b/desktop/test/deployment/simple_license/NoDesc.oxt
diff --git a/desktop/test/deployment/simple_license/NoLang.oxt b/desktop/test/deployment/simple_license/NoLang.oxt
index a4f3dd43a0..a4f3dd43a0 100644..100755
--- a/desktop/test/deployment/simple_license/NoLang.oxt
+++ b/desktop/test/deployment/simple_license/NoLang.oxt
diff --git a/desktop/test/deployment/simple_license/Prefix.oxt b/desktop/test/deployment/simple_license/Prefix.oxt
index 3e09b8d804..3e09b8d804 100644..100755
--- a/desktop/test/deployment/simple_license/Prefix.oxt
+++ b/desktop/test/deployment/simple_license/Prefix.oxt
diff --git a/desktop/test/deployment/simple_license/ShortLicense.oxt b/desktop/test/deployment/simple_license/ShortLicense.oxt
index efcfdc98e1..efcfdc98e1 100644..100755
--- a/desktop/test/deployment/simple_license/ShortLicense.oxt
+++ b/desktop/test/deployment/simple_license/ShortLicense.oxt
diff --git a/desktop/test/deployment/simple_license/ShortLicenseShared.oxt b/desktop/test/deployment/simple_license/ShortLicenseShared.oxt
index 775559a2c7..775559a2c7 100644..100755
--- a/desktop/test/deployment/simple_license/ShortLicenseShared.oxt
+++ b/desktop/test/deployment/simple_license/ShortLicenseShared.oxt
diff --git a/desktop/test/deployment/simple_license/tests_simple_license.odt b/desktop/test/deployment/simple_license/tests_simple_license.odt
index b0c86e11c6..b0c86e11c6 100644..100755
--- a/desktop/test/deployment/simple_license/tests_simple_license.odt
+++ b/desktop/test/deployment/simple_license/tests_simple_license.odt
diff --git a/desktop/test/deployment/update/changing_display_name/change1.oxt b/desktop/test/deployment/update/changing_display_name/change1.oxt
index c919129ab6..c919129ab6 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/change1.oxt
+++ b/desktop/test/deployment/update/changing_display_name/change1.oxt
diff --git a/desktop/test/deployment/update/changing_display_name/change1_mod.oxt b/desktop/test/deployment/update/changing_display_name/change1_mod.oxt
index 5ab99d7bf2..5ab99d7bf2 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/change1_mod.oxt
+++ b/desktop/test/deployment/update/changing_display_name/change1_mod.oxt
diff --git a/desktop/test/deployment/update/changing_display_name/readme.txt b/desktop/test/deployment/update/changing_display_name/readme.txt
index 905f0be9a9..905f0be9a9 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/readme.txt
+++ b/desktop/test/deployment/update/changing_display_name/readme.txt
diff --git a/desktop/test/deployment/update/changing_display_name/update1/change1.oxt b/desktop/test/deployment/update/changing_display_name/update1/change1.oxt
index ef034f9445..ef034f9445 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/update1/change1.oxt
+++ b/desktop/test/deployment/update/changing_display_name/update1/change1.oxt
diff --git a/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml b/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
index 29aee72fa1..29aee72fa1 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
+++ b/desktop/test/deployment/update/changing_display_name/update1/change1.update.xml
diff --git a/desktop/test/deployment/update/changing_display_name/update2/change1.oxt b/desktop/test/deployment/update/changing_display_name/update2/change1.oxt
index 551f5a3f48..551f5a3f48 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/update2/change1.oxt
+++ b/desktop/test/deployment/update/changing_display_name/update2/change1.oxt
diff --git a/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml b/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
index 1e2ee11e9f..1e2ee11e9f 100644..100755
--- a/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
+++ b/desktop/test/deployment/update/changing_display_name/update2/change1.update.xml
diff --git a/desktop/test/deployment/update/default_url/default1.oxt b/desktop/test/deployment/update/default_url/default1.oxt
index 3fa8c9f08f..3fa8c9f08f 100644..100755
--- a/desktop/test/deployment/update/default_url/default1.oxt
+++ b/desktop/test/deployment/update/default_url/default1.oxt
diff --git a/desktop/test/deployment/update/default_url/default2.oxt b/desktop/test/deployment/update/default_url/default2.oxt
index d54ce88c51..d54ce88c51 100644..100755
--- a/desktop/test/deployment/update/default_url/default2.oxt
+++ b/desktop/test/deployment/update/default_url/default2.oxt
diff --git a/desktop/test/deployment/update/default_url/readme.txt b/desktop/test/deployment/update/default_url/readme.txt
index 4ae7936bfc..4ae7936bfc 100644..100755
--- a/desktop/test/deployment/update/default_url/readme.txt
+++ b/desktop/test/deployment/update/default_url/readme.txt
diff --git a/desktop/test/deployment/update/default_url/update/default1.oxt b/desktop/test/deployment/update/default_url/update/default1.oxt
index 198395c76e..198395c76e 100644..100755
--- a/desktop/test/deployment/update/default_url/update/default1.oxt
+++ b/desktop/test/deployment/update/default_url/update/default1.oxt
diff --git a/desktop/test/deployment/update/default_url/update/default1.update.xml b/desktop/test/deployment/update/default_url/update/default1.update.xml
index 0351d23e68..0351d23e68 100644..100755
--- a/desktop/test/deployment/update/default_url/update/default1.update.xml
+++ b/desktop/test/deployment/update/default_url/update/default1.update.xml
diff --git a/desktop/test/deployment/update/default_url/update/default2.oxt b/desktop/test/deployment/update/default_url/update/default2.oxt
index 198395c76e..198395c76e 100644..100755
--- a/desktop/test/deployment/update/default_url/update/default2.oxt
+++ b/desktop/test/deployment/update/default_url/update/default2.oxt
diff --git a/desktop/test/deployment/update/default_url/update/default2.update.xml b/desktop/test/deployment/update/default_url/update/default2.update.xml
index 8bf00b2e22..8bf00b2e22 100644..100755
--- a/desktop/test/deployment/update/default_url/update/default2.update.xml
+++ b/desktop/test/deployment/update/default_url/update/default2.update.xml
diff --git a/desktop/test/deployment/update/default_url/update/feed1.xml b/desktop/test/deployment/update/default_url/update/feed1.xml
index b504b7b4b0..b504b7b4b0 100644..100755
--- a/desktop/test/deployment/update/default_url/update/feed1.xml
+++ b/desktop/test/deployment/update/default_url/update/feed1.xml
diff --git a/desktop/test/deployment/update/defect/fail1.oxt b/desktop/test/deployment/update/defect/fail1.oxt
index 5b5cdba2cd..5b5cdba2cd 100644..100755
--- a/desktop/test/deployment/update/defect/fail1.oxt
+++ b/desktop/test/deployment/update/defect/fail1.oxt
diff --git a/desktop/test/deployment/update/defect/fail2.oxt b/desktop/test/deployment/update/defect/fail2.oxt
index 61b0306f09..61b0306f09 100644..100755
--- a/desktop/test/deployment/update/defect/fail2.oxt
+++ b/desktop/test/deployment/update/defect/fail2.oxt
diff --git a/desktop/test/deployment/update/defect/fail3.oxt b/desktop/test/deployment/update/defect/fail3.oxt
index 9da26d48a6..9da26d48a6 100644..100755
--- a/desktop/test/deployment/update/defect/fail3.oxt
+++ b/desktop/test/deployment/update/defect/fail3.oxt
diff --git a/desktop/test/deployment/update/defect/fail4.oxt b/desktop/test/deployment/update/defect/fail4.oxt
index 66b87caa14..66b87caa14 100644..100755
--- a/desktop/test/deployment/update/defect/fail4.oxt
+++ b/desktop/test/deployment/update/defect/fail4.oxt
diff --git a/desktop/test/deployment/update/defect/info1.oxt b/desktop/test/deployment/update/defect/info1.oxt
index 9ffd373fa1..9ffd373fa1 100644..100755
--- a/desktop/test/deployment/update/defect/info1.oxt
+++ b/desktop/test/deployment/update/defect/info1.oxt
diff --git a/desktop/test/deployment/update/defect/info2.oxt b/desktop/test/deployment/update/defect/info2.oxt
index 229a52c3bc..229a52c3bc 100644..100755
--- a/desktop/test/deployment/update/defect/info2.oxt
+++ b/desktop/test/deployment/update/defect/info2.oxt
diff --git a/desktop/test/deployment/update/defect/info3.oxt b/desktop/test/deployment/update/defect/info3.oxt
index b702f3e004..b702f3e004 100644..100755
--- a/desktop/test/deployment/update/defect/info3.oxt
+++ b/desktop/test/deployment/update/defect/info3.oxt
diff --git a/desktop/test/deployment/update/defect/readme.txt b/desktop/test/deployment/update/defect/readme.txt
index 5e8322f5cf..5e8322f5cf 100644..100755
--- a/desktop/test/deployment/update/defect/readme.txt
+++ b/desktop/test/deployment/update/defect/readme.txt
diff --git a/desktop/test/deployment/update/defect/update/fail1.oxt b/desktop/test/deployment/update/defect/update/fail1.oxt
index dbcc7cd73e..dbcc7cd73e 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail1.oxt
+++ b/desktop/test/deployment/update/defect/update/fail1.oxt
diff --git a/desktop/test/deployment/update/defect/update/fail1.update.xml b/desktop/test/deployment/update/defect/update/fail1.update.xml
index 69cb73c4f1..69cb73c4f1 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail1.update.xml
+++ b/desktop/test/deployment/update/defect/update/fail1.update.xml
diff --git a/desktop/test/deployment/update/defect/update/fail2.oxt b/desktop/test/deployment/update/defect/update/fail2.oxt
index 6df0c3cf99..6df0c3cf99 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail2.oxt
+++ b/desktop/test/deployment/update/defect/update/fail2.oxt
diff --git a/desktop/test/deployment/update/defect/update/fail2.update.xml b/desktop/test/deployment/update/defect/update/fail2.update.xml
index 8b235acd9b..8b235acd9b 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail2.update.xml
+++ b/desktop/test/deployment/update/defect/update/fail2.update.xml
diff --git a/desktop/test/deployment/update/defect/update/fail3.oxt b/desktop/test/deployment/update/defect/update/fail3.oxt
index 2d340f4144..2d340f4144 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail3.oxt
+++ b/desktop/test/deployment/update/defect/update/fail3.oxt
diff --git a/desktop/test/deployment/update/defect/update/fail3.update.xml b/desktop/test/deployment/update/defect/update/fail3.update.xml
index 60a2999210..60a2999210 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail3.update.xml
+++ b/desktop/test/deployment/update/defect/update/fail3.update.xml
diff --git a/desktop/test/deployment/update/defect/update/fail4.oxt b/desktop/test/deployment/update/defect/update/fail4.oxt
index e69de29bb2..e69de29bb2 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail4.oxt
+++ b/desktop/test/deployment/update/defect/update/fail4.oxt
diff --git a/desktop/test/deployment/update/defect/update/fail4.update.xml b/desktop/test/deployment/update/defect/update/fail4.update.xml
index 81775a7257..81775a7257 100644..100755
--- a/desktop/test/deployment/update/defect/update/fail4.update.xml
+++ b/desktop/test/deployment/update/defect/update/fail4.update.xml
diff --git a/desktop/test/deployment/update/defect/update/info1.update.xml b/desktop/test/deployment/update/defect/update/info1.update.xml
index e69de29bb2..e69de29bb2 100644..100755
--- a/desktop/test/deployment/update/defect/update/info1.update.xml
+++ b/desktop/test/deployment/update/defect/update/info1.update.xml
diff --git a/desktop/test/deployment/update/defect/update/info2.update.xml b/desktop/test/deployment/update/defect/update/info2.update.xml
index 1446608022..1446608022 100644..100755
--- a/desktop/test/deployment/update/defect/update/info2.update.xml
+++ b/desktop/test/deployment/update/defect/update/info2.update.xml
diff --git a/desktop/test/deployment/update/defect/update/info3.oxt b/desktop/test/deployment/update/defect/update/info3.oxt
index 60debac57c..60debac57c 100644..100755
--- a/desktop/test/deployment/update/defect/update/info3.oxt
+++ b/desktop/test/deployment/update/defect/update/info3.oxt
diff --git a/desktop/test/deployment/update/defect/update/info3.update.xml b/desktop/test/deployment/update/defect/update/info3.update.xml
index 35106ea29a..35106ea29a 100644..100755
--- a/desktop/test/deployment/update/defect/update/info3.update.xml
+++ b/desktop/test/deployment/update/defect/update/info3.update.xml
diff --git a/desktop/test/deployment/update/dependencies/publisher_en.html b/desktop/test/deployment/update/dependencies/publisher_en.html
index 37dbc2b9d6..37dbc2b9d6 100644..100755
--- a/desktop/test/deployment/update/dependencies/publisher_en.html
+++ b/desktop/test/deployment/update/dependencies/publisher_en.html
diff --git a/desktop/test/deployment/update/dependencies/readme.txt b/desktop/test/deployment/update/dependencies/readme.txt
index 3c71da2488..3c71da2488 100644..100755
--- a/desktop/test/deployment/update/dependencies/readme.txt
+++ b/desktop/test/deployment/update/dependencies/readme.txt
diff --git a/desktop/test/deployment/update/dependencies/release-notes_en.html b/desktop/test/deployment/update/dependencies/release-notes_en.html
index 0971f78d14..0971f78d14 100644..100755
--- a/desktop/test/deployment/update/dependencies/release-notes_en.html
+++ b/desktop/test/deployment/update/dependencies/release-notes_en.html
diff --git a/desktop/test/deployment/update/dependencies/update-dependencies.oxt b/desktop/test/deployment/update/dependencies/update-dependencies.oxt
index 513b25d207..513b25d207 100644..100755
--- a/desktop/test/deployment/update/dependencies/update-dependencies.oxt
+++ b/desktop/test/deployment/update/dependencies/update-dependencies.oxt
diff --git a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
index 51a631a8eb..51a631a8eb 100644..100755
--- a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
+++ b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
diff --git a/desktop/test/deployment/update/license/lic1.oxt b/desktop/test/deployment/update/license/lic1.oxt
index 43bfe3b77b..43bfe3b77b 100644..100755
--- a/desktop/test/deployment/update/license/lic1.oxt
+++ b/desktop/test/deployment/update/license/lic1.oxt
diff --git a/desktop/test/deployment/update/license/lic2.oxt b/desktop/test/deployment/update/license/lic2.oxt
index 266a45e9a8..266a45e9a8 100644..100755
--- a/desktop/test/deployment/update/license/lic2.oxt
+++ b/desktop/test/deployment/update/license/lic2.oxt
diff --git a/desktop/test/deployment/update/license/lic3.oxt b/desktop/test/deployment/update/license/lic3.oxt
index 3f1b989600..3f1b989600 100644..100755
--- a/desktop/test/deployment/update/license/lic3.oxt
+++ b/desktop/test/deployment/update/license/lic3.oxt
diff --git a/desktop/test/deployment/update/license/readme.txt b/desktop/test/deployment/update/license/readme.txt
index 03123d2c58..03123d2c58 100644..100755
--- a/desktop/test/deployment/update/license/readme.txt
+++ b/desktop/test/deployment/update/license/readme.txt
diff --git a/desktop/test/deployment/update/license/update/lic1.oxt b/desktop/test/deployment/update/license/update/lic1.oxt
index cc91e1ff16..cc91e1ff16 100644..100755
--- a/desktop/test/deployment/update/license/update/lic1.oxt
+++ b/desktop/test/deployment/update/license/update/lic1.oxt
diff --git a/desktop/test/deployment/update/license/update/lic1.update.xml b/desktop/test/deployment/update/license/update/lic1.update.xml
index 6c60375905..6c60375905 100644..100755
--- a/desktop/test/deployment/update/license/update/lic1.update.xml
+++ b/desktop/test/deployment/update/license/update/lic1.update.xml
diff --git a/desktop/test/deployment/update/license/update/lic2.oxt b/desktop/test/deployment/update/license/update/lic2.oxt
index 3510007924..3510007924 100644..100755
--- a/desktop/test/deployment/update/license/update/lic2.oxt
+++ b/desktop/test/deployment/update/license/update/lic2.oxt
diff --git a/desktop/test/deployment/update/license/update/lic2.update.xml b/desktop/test/deployment/update/license/update/lic2.update.xml
index 6e284e9def..6e284e9def 100644..100755
--- a/desktop/test/deployment/update/license/update/lic2.update.xml
+++ b/desktop/test/deployment/update/license/update/lic2.update.xml
diff --git a/desktop/test/deployment/update/license/update/lic3.oxt b/desktop/test/deployment/update/license/update/lic3.oxt
index 6ac6e0fd0f..6ac6e0fd0f 100644..100755
--- a/desktop/test/deployment/update/license/update/lic3.oxt
+++ b/desktop/test/deployment/update/license/update/lic3.oxt
diff --git a/desktop/test/deployment/update/license/update/lic3.update.xml b/desktop/test/deployment/update/license/update/lic3.update.xml
index b6f55bca20..b6f55bca20 100644..100755
--- a/desktop/test/deployment/update/license/update/lic3.update.xml
+++ b/desktop/test/deployment/update/license/update/lic3.update.xml
diff --git a/desktop/test/deployment/update/platform/all1.oxt b/desktop/test/deployment/update/platform/all1.oxt
index ad9662a7c2..ad9662a7c2 100644..100755
--- a/desktop/test/deployment/update/platform/all1.oxt
+++ b/desktop/test/deployment/update/platform/all1.oxt
diff --git a/desktop/test/deployment/update/platform/all2.oxt b/desktop/test/deployment/update/platform/all2.oxt
index 632d11b429..632d11b429 100644..100755
--- a/desktop/test/deployment/update/platform/all2.oxt
+++ b/desktop/test/deployment/update/platform/all2.oxt
diff --git a/desktop/test/deployment/update/platform/all3.oxt b/desktop/test/deployment/update/platform/all3.oxt
index ab781552a5..ab781552a5 100644..100755
--- a/desktop/test/deployment/update/platform/all3.oxt
+++ b/desktop/test/deployment/update/platform/all3.oxt
diff --git a/desktop/test/deployment/update/platform/freebsd_x86.oxt b/desktop/test/deployment/update/platform/freebsd_x86.oxt
index 338f5761de..338f5761de 100644..100755
--- a/desktop/test/deployment/update/platform/freebsd_x86.oxt
+++ b/desktop/test/deployment/update/platform/freebsd_x86.oxt
diff --git a/desktop/test/deployment/update/platform/freebsd_x86_64.oxt b/desktop/test/deployment/update/platform/freebsd_x86_64.oxt
index 39fee6de1a..39fee6de1a 100644..100755
--- a/desktop/test/deployment/update/platform/freebsd_x86_64.oxt
+++ b/desktop/test/deployment/update/platform/freebsd_x86_64.oxt
diff --git a/desktop/test/deployment/update/platform/invalid1.oxt b/desktop/test/deployment/update/platform/invalid1.oxt
index 13d709f438..13d709f438 100644..100755
--- a/desktop/test/deployment/update/platform/invalid1.oxt
+++ b/desktop/test/deployment/update/platform/invalid1.oxt
diff --git a/desktop/test/deployment/update/platform/invalid2.oxt b/desktop/test/deployment/update/platform/invalid2.oxt
index f14257191b..f14257191b 100644..100755
--- a/desktop/test/deployment/update/platform/invalid2.oxt
+++ b/desktop/test/deployment/update/platform/invalid2.oxt
diff --git a/desktop/test/deployment/update/platform/invalid3.oxt b/desktop/test/deployment/update/platform/invalid3.oxt
index cadffa4f2a..cadffa4f2a 100644..100755
--- a/desktop/test/deployment/update/platform/invalid3.oxt
+++ b/desktop/test/deployment/update/platform/invalid3.oxt
diff --git a/desktop/test/deployment/update/platform/linux_arm_eabi.oxt b/desktop/test/deployment/update/platform/linux_arm_eabi.oxt
index 9c504e841b..9c504e841b 100644..100755
--- a/desktop/test/deployment/update/platform/linux_arm_eabi.oxt
+++ b/desktop/test/deployment/update/platform/linux_arm_eabi.oxt
diff --git a/desktop/test/deployment/update/platform/linux_arm_oabi.oxt b/desktop/test/deployment/update/platform/linux_arm_oabi.oxt
index f2c987f645..f2c987f645 100644..100755
--- a/desktop/test/deployment/update/platform/linux_arm_oabi.oxt
+++ b/desktop/test/deployment/update/platform/linux_arm_oabi.oxt
diff --git a/desktop/test/deployment/update/platform/linux_ia64.oxt b/desktop/test/deployment/update/platform/linux_ia64.oxt
index f579a18ab9..f579a18ab9 100644..100755
--- a/desktop/test/deployment/update/platform/linux_ia64.oxt
+++ b/desktop/test/deployment/update/platform/linux_ia64.oxt
diff --git a/desktop/test/deployment/update/platform/linux_mips_eb.oxt b/desktop/test/deployment/update/platform/linux_mips_eb.oxt
index bf0bd94233..bf0bd94233 100644..100755
--- a/desktop/test/deployment/update/platform/linux_mips_eb.oxt
+++ b/desktop/test/deployment/update/platform/linux_mips_eb.oxt
diff --git a/desktop/test/deployment/update/platform/linux_mips_el.oxt b/desktop/test/deployment/update/platform/linux_mips_el.oxt
index 6bd5644683..6bd5644683 100644..100755
--- a/desktop/test/deployment/update/platform/linux_mips_el.oxt
+++ b/desktop/test/deployment/update/platform/linux_mips_el.oxt
diff --git a/desktop/test/deployment/update/platform/linux_powerpc.oxt b/desktop/test/deployment/update/platform/linux_powerpc.oxt
index e301a3fb3a..e301a3fb3a 100644..100755
--- a/desktop/test/deployment/update/platform/linux_powerpc.oxt
+++ b/desktop/test/deployment/update/platform/linux_powerpc.oxt
diff --git a/desktop/test/deployment/update/platform/linux_powerpc64.oxt b/desktop/test/deployment/update/platform/linux_powerpc64.oxt
index e5f3ae0639..e5f3ae0639 100644..100755
--- a/desktop/test/deployment/update/platform/linux_powerpc64.oxt
+++ b/desktop/test/deployment/update/platform/linux_powerpc64.oxt
diff --git a/desktop/test/deployment/update/platform/linux_s390.oxt b/desktop/test/deployment/update/platform/linux_s390.oxt
index 199702ebf0..199702ebf0 100644..100755
--- a/desktop/test/deployment/update/platform/linux_s390.oxt
+++ b/desktop/test/deployment/update/platform/linux_s390.oxt
diff --git a/desktop/test/deployment/update/platform/linux_s390x.oxt b/desktop/test/deployment/update/platform/linux_s390x.oxt
index 2ed250833f..2ed250833f 100644..100755
--- a/desktop/test/deployment/update/platform/linux_s390x.oxt
+++ b/desktop/test/deployment/update/platform/linux_s390x.oxt
diff --git a/desktop/test/deployment/update/platform/linux_sparc.oxt b/desktop/test/deployment/update/platform/linux_sparc.oxt
index 53dfc71e0c..53dfc71e0c 100644..100755
--- a/desktop/test/deployment/update/platform/linux_sparc.oxt
+++ b/desktop/test/deployment/update/platform/linux_sparc.oxt
diff --git a/desktop/test/deployment/update/platform/linux_x86.oxt b/desktop/test/deployment/update/platform/linux_x86.oxt
index 8379539cad..8379539cad 100644..100755
--- a/desktop/test/deployment/update/platform/linux_x86.oxt
+++ b/desktop/test/deployment/update/platform/linux_x86.oxt
diff --git a/desktop/test/deployment/update/platform/linux_x86_64.oxt b/desktop/test/deployment/update/platform/linux_x86_64.oxt
index 0fb1822752..0fb1822752 100644..100755
--- a/desktop/test/deployment/update/platform/linux_x86_64.oxt
+++ b/desktop/test/deployment/update/platform/linux_x86_64.oxt
diff --git a/desktop/test/deployment/update/platform/macosx_powerpc.oxt b/desktop/test/deployment/update/platform/macosx_powerpc.oxt
index 7c14634712..7c14634712 100644..100755
--- a/desktop/test/deployment/update/platform/macosx_powerpc.oxt
+++ b/desktop/test/deployment/update/platform/macosx_powerpc.oxt
diff --git a/desktop/test/deployment/update/platform/macosx_x86.oxt b/desktop/test/deployment/update/platform/macosx_x86.oxt
index a20aadfeff..a20aadfeff 100644..100755
--- a/desktop/test/deployment/update/platform/macosx_x86.oxt
+++ b/desktop/test/deployment/update/platform/macosx_x86.oxt
diff --git a/desktop/test/deployment/update/platform/mul1.oxt b/desktop/test/deployment/update/platform/mul1.oxt
index b3b555969b..b3b555969b 100644..100755
--- a/desktop/test/deployment/update/platform/mul1.oxt
+++ b/desktop/test/deployment/update/platform/mul1.oxt
diff --git a/desktop/test/deployment/update/platform/os2_x86.oxt b/desktop/test/deployment/update/platform/os2_x86.oxt
index 1c7fd40bef..1c7fd40bef 100644..100755
--- a/desktop/test/deployment/update/platform/os2_x86.oxt
+++ b/desktop/test/deployment/update/platform/os2_x86.oxt
diff --git a/desktop/test/deployment/update/platform/readme.txt b/desktop/test/deployment/update/platform/readme.txt
index 2ab102a27d..2ab102a27d 100644..100755
--- a/desktop/test/deployment/update/platform/readme.txt
+++ b/desktop/test/deployment/update/platform/readme.txt
diff --git a/desktop/test/deployment/update/platform/solaris_sparc.oxt b/desktop/test/deployment/update/platform/solaris_sparc.oxt
index a61f81f439..a61f81f439 100644..100755
--- a/desktop/test/deployment/update/platform/solaris_sparc.oxt
+++ b/desktop/test/deployment/update/platform/solaris_sparc.oxt
diff --git a/desktop/test/deployment/update/platform/solaris_x86.oxt b/desktop/test/deployment/update/platform/solaris_x86.oxt
index 44d43df691..44d43df691 100644..100755
--- a/desktop/test/deployment/update/platform/solaris_x86.oxt
+++ b/desktop/test/deployment/update/platform/solaris_x86.oxt
diff --git a/desktop/test/deployment/update/platform/windows_x86.oxt b/desktop/test/deployment/update/platform/windows_x86.oxt
index c66a9b1418..c66a9b1418 100644..100755
--- a/desktop/test/deployment/update/platform/windows_x86.oxt
+++ b/desktop/test/deployment/update/platform/windows_x86.oxt
diff --git a/desktop/test/deployment/update/publisher/pub1.oxt b/desktop/test/deployment/update/publisher/pub1.oxt
index c44ee9f3bc..c44ee9f3bc 100644..100755
--- a/desktop/test/deployment/update/publisher/pub1.oxt
+++ b/desktop/test/deployment/update/publisher/pub1.oxt
diff --git a/desktop/test/deployment/update/publisher/pub10.oxt b/desktop/test/deployment/update/publisher/pub10.oxt
index 1e7410ec1b..1e7410ec1b 100644..100755
--- a/desktop/test/deployment/update/publisher/pub10.oxt
+++ b/desktop/test/deployment/update/publisher/pub10.oxt
diff --git a/desktop/test/deployment/update/publisher/pub11.oxt b/desktop/test/deployment/update/publisher/pub11.oxt
index ef7fbca5e6..ef7fbca5e6 100644..100755
--- a/desktop/test/deployment/update/publisher/pub11.oxt
+++ b/desktop/test/deployment/update/publisher/pub11.oxt
diff --git a/desktop/test/deployment/update/publisher/pub2.oxt b/desktop/test/deployment/update/publisher/pub2.oxt
index 438bcae830..438bcae830 100644..100755
--- a/desktop/test/deployment/update/publisher/pub2.oxt
+++ b/desktop/test/deployment/update/publisher/pub2.oxt
diff --git a/desktop/test/deployment/update/publisher/pub3.oxt b/desktop/test/deployment/update/publisher/pub3.oxt
index 62fd69f559..62fd69f559 100644..100755
--- a/desktop/test/deployment/update/publisher/pub3.oxt
+++ b/desktop/test/deployment/update/publisher/pub3.oxt
diff --git a/desktop/test/deployment/update/publisher/pub4.oxt b/desktop/test/deployment/update/publisher/pub4.oxt
index 4f6224f780..4f6224f780 100644..100755
--- a/desktop/test/deployment/update/publisher/pub4.oxt
+++ b/desktop/test/deployment/update/publisher/pub4.oxt
diff --git a/desktop/test/deployment/update/publisher/pub5.oxt b/desktop/test/deployment/update/publisher/pub5.oxt
index 1774e6cd35..1774e6cd35 100644..100755
--- a/desktop/test/deployment/update/publisher/pub5.oxt
+++ b/desktop/test/deployment/update/publisher/pub5.oxt
diff --git a/desktop/test/deployment/update/publisher/pub6.oxt b/desktop/test/deployment/update/publisher/pub6.oxt
index 791a37f8e7..791a37f8e7 100644..100755
--- a/desktop/test/deployment/update/publisher/pub6.oxt
+++ b/desktop/test/deployment/update/publisher/pub6.oxt
diff --git a/desktop/test/deployment/update/publisher/pub7.oxt b/desktop/test/deployment/update/publisher/pub7.oxt
index 96e96887d0..96e96887d0 100644..100755
--- a/desktop/test/deployment/update/publisher/pub7.oxt
+++ b/desktop/test/deployment/update/publisher/pub7.oxt
diff --git a/desktop/test/deployment/update/publisher/pub8.oxt b/desktop/test/deployment/update/publisher/pub8.oxt
index dc9f0ce34d..dc9f0ce34d 100644..100755
--- a/desktop/test/deployment/update/publisher/pub8.oxt
+++ b/desktop/test/deployment/update/publisher/pub8.oxt
diff --git a/desktop/test/deployment/update/publisher/pub9.oxt b/desktop/test/deployment/update/publisher/pub9.oxt
index 5e8ba9ebc1..5e8ba9ebc1 100644..100755
--- a/desktop/test/deployment/update/publisher/pub9.oxt
+++ b/desktop/test/deployment/update/publisher/pub9.oxt
diff --git a/desktop/test/deployment/update/publisher/publisher_de-DE-altmark.html b/desktop/test/deployment/update/publisher/publisher_de-DE-altmark.html
index c770b914ad..c770b914ad 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_de-DE-altmark.html
+++ b/desktop/test/deployment/update/publisher/publisher_de-DE-altmark.html
diff --git a/desktop/test/deployment/update/publisher/publisher_de-DE.html b/desktop/test/deployment/update/publisher/publisher_de-DE.html
index b06ed7088f..b06ed7088f 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_de-DE.html
+++ b/desktop/test/deployment/update/publisher/publisher_de-DE.html
diff --git a/desktop/test/deployment/update/publisher/publisher_de.html b/desktop/test/deployment/update/publisher/publisher_de.html
index 4cba9f423d..4cba9f423d 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_de.html
+++ b/desktop/test/deployment/update/publisher/publisher_de.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en-GB.html b/desktop/test/deployment/update/publisher/publisher_en-GB.html
index c73cf6219b..c73cf6219b 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en-GB.html
+++ b/desktop/test/deployment/update/publisher/publisher_en-GB.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en-US-region1.html b/desktop/test/deployment/update/publisher/publisher_en-US-region1.html
index 68beac7248..68beac7248 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en-US-region1.html
+++ b/desktop/test/deployment/update/publisher/publisher_en-US-region1.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en-US-region2.html b/desktop/test/deployment/update/publisher/publisher_en-US-region2.html
index 501adb6596..501adb6596 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en-US-region2.html
+++ b/desktop/test/deployment/update/publisher/publisher_en-US-region2.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en-US.html b/desktop/test/deployment/update/publisher/publisher_en-US.html
index fd25751503..fd25751503 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en-US.html
+++ b/desktop/test/deployment/update/publisher/publisher_en-US.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en-region3.html b/desktop/test/deployment/update/publisher/publisher_en-region3.html
index b9fdc9d657..b9fdc9d657 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en-region3.html
+++ b/desktop/test/deployment/update/publisher/publisher_en-region3.html
diff --git a/desktop/test/deployment/update/publisher/publisher_en.html b/desktop/test/deployment/update/publisher/publisher_en.html
index 416ab81243..416ab81243 100644..100755
--- a/desktop/test/deployment/update/publisher/publisher_en.html
+++ b/desktop/test/deployment/update/publisher/publisher_en.html
diff --git a/desktop/test/deployment/update/publisher/readme.txt b/desktop/test/deployment/update/publisher/readme.txt
index 1a659d8e87..1a659d8e87 100644..100755
--- a/desktop/test/deployment/update/publisher/readme.txt
+++ b/desktop/test/deployment/update/publisher/readme.txt
diff --git a/desktop/test/deployment/update/publisher/release-notes_de-DE-altmark.html b/desktop/test/deployment/update/publisher/release-notes_de-DE-altmark.html
index 81b38a9f5b..81b38a9f5b 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_de-DE-altmark.html
+++ b/desktop/test/deployment/update/publisher/release-notes_de-DE-altmark.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_de-DE.html b/desktop/test/deployment/update/publisher/release-notes_de-DE.html
index f8f0121f02..f8f0121f02 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_de-DE.html
+++ b/desktop/test/deployment/update/publisher/release-notes_de-DE.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_de.html b/desktop/test/deployment/update/publisher/release-notes_de.html
index a9e1dc3647..a9e1dc3647 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_de.html
+++ b/desktop/test/deployment/update/publisher/release-notes_de.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en-GB.html b/desktop/test/deployment/update/publisher/release-notes_en-GB.html
index ca72ec1b9c..ca72ec1b9c 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en-GB.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en-GB.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en-US-region1.html b/desktop/test/deployment/update/publisher/release-notes_en-US-region1.html
index 0e6f99ce4c..0e6f99ce4c 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en-US-region1.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en-US-region1.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en-US-region2.html b/desktop/test/deployment/update/publisher/release-notes_en-US-region2.html
index 597bca0ebe..597bca0ebe 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en-US-region2.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en-US-region2.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en-US.html b/desktop/test/deployment/update/publisher/release-notes_en-US.html
index 7f9d73e338..7f9d73e338 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en-US.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en-US.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en-region3.html b/desktop/test/deployment/update/publisher/release-notes_en-region3.html
index 5d62c7bcb4..5d62c7bcb4 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en-region3.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en-region3.html
diff --git a/desktop/test/deployment/update/publisher/release-notes_en.html b/desktop/test/deployment/update/publisher/release-notes_en.html
index d02e4f3330..d02e4f3330 100644..100755
--- a/desktop/test/deployment/update/publisher/release-notes_en.html
+++ b/desktop/test/deployment/update/publisher/release-notes_en.html
diff --git a/desktop/test/deployment/update/publisher/update/pub1.oxt b/desktop/test/deployment/update/publisher/update/pub1.oxt
index cd04a58d55..cd04a58d55 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub1.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub1.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub1.update.xml b/desktop/test/deployment/update/publisher/update/pub1.update.xml
index 65ca88e5b7..65ca88e5b7 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub1.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub1.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub10.oxt b/desktop/test/deployment/update/publisher/update/pub10.oxt
index 501a843381..501a843381 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub10.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub10.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub11.oxt b/desktop/test/deployment/update/publisher/update/pub11.oxt
index 692c0401f4..692c0401f4 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub11.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub11.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub2.oxt b/desktop/test/deployment/update/publisher/update/pub2.oxt
index 2a0bd6c21f..2a0bd6c21f 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub2.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub2.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub2.update.xml b/desktop/test/deployment/update/publisher/update/pub2.update.xml
index 35415fc87d..35415fc87d 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub2.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub2.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub3.oxt b/desktop/test/deployment/update/publisher/update/pub3.oxt
index 60675fc4d2..60675fc4d2 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub3.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub3.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub3.update.xml b/desktop/test/deployment/update/publisher/update/pub3.update.xml
index f15a4c525a..f15a4c525a 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub3.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub3.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub4.oxt b/desktop/test/deployment/update/publisher/update/pub4.oxt
index 19f7b7991b..19f7b7991b 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub4.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub4.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub4.update.xml b/desktop/test/deployment/update/publisher/update/pub4.update.xml
index 9c46b6eb3d..9c46b6eb3d 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub4.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub4.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub5.oxt b/desktop/test/deployment/update/publisher/update/pub5.oxt
index afc632d570..afc632d570 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub5.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub5.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub5.update.xml b/desktop/test/deployment/update/publisher/update/pub5.update.xml
index dd47e95403..dd47e95403 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub5.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub5.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub6.oxt b/desktop/test/deployment/update/publisher/update/pub6.oxt
index a68b445b8a..a68b445b8a 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub6.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub6.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub6.update.xml b/desktop/test/deployment/update/publisher/update/pub6.update.xml
index 5d4adc7a16..5d4adc7a16 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub6.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub6.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub7.oxt b/desktop/test/deployment/update/publisher/update/pub7.oxt
index 1b4bee0442..1b4bee0442 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub7.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub7.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub7.update.xml b/desktop/test/deployment/update/publisher/update/pub7.update.xml
index cf61bc092d..cf61bc092d 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub7.update.xml
+++ b/desktop/test/deployment/update/publisher/update/pub7.update.xml
diff --git a/desktop/test/deployment/update/publisher/update/pub8.oxt b/desktop/test/deployment/update/publisher/update/pub8.oxt
index 5688ab9d24..5688ab9d24 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub8.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub8.oxt
diff --git a/desktop/test/deployment/update/publisher/update/pub9.oxt b/desktop/test/deployment/update/publisher/update/pub9.oxt
index 752cfbbcf0..752cfbbcf0 100644..100755
--- a/desktop/test/deployment/update/publisher/update/pub9.oxt
+++ b/desktop/test/deployment/update/publisher/update/pub9.oxt
diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt
index b3fd9126ca..b3fd9126ca 100644..100755
--- a/desktop/test/deployment/update/readme.txt
+++ b/desktop/test/deployment/update/readme.txt
diff --git a/desktop/test/deployment/update/simple/plain1.oxt b/desktop/test/deployment/update/simple/plain1.oxt
index 6256f99d5e..6256f99d5e 100644..100755
--- a/desktop/test/deployment/update/simple/plain1.oxt
+++ b/desktop/test/deployment/update/simple/plain1.oxt
diff --git a/desktop/test/deployment/update/simple/plain2.oxt b/desktop/test/deployment/update/simple/plain2.oxt
index 03249c2777..03249c2777 100644..100755
--- a/desktop/test/deployment/update/simple/plain2.oxt
+++ b/desktop/test/deployment/update/simple/plain2.oxt
diff --git a/desktop/test/deployment/update/simple/plain3.oxt b/desktop/test/deployment/update/simple/plain3.oxt
index 64838932d1..64838932d1 100644..100755
--- a/desktop/test/deployment/update/simple/plain3.oxt
+++ b/desktop/test/deployment/update/simple/plain3.oxt
diff --git a/desktop/test/deployment/update/simple/readme.txt b/desktop/test/deployment/update/simple/readme.txt
index 34ad6bedab..34ad6bedab 100644..100755
--- a/desktop/test/deployment/update/simple/readme.txt
+++ b/desktop/test/deployment/update/simple/readme.txt
diff --git a/desktop/test/deployment/update/simple/update/plain1.oxt b/desktop/test/deployment/update/simple/update/plain1.oxt
index d73362e873..d73362e873 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain1.oxt
+++ b/desktop/test/deployment/update/simple/update/plain1.oxt
diff --git a/desktop/test/deployment/update/simple/update/plain1.update.xml b/desktop/test/deployment/update/simple/update/plain1.update.xml
index 5ee57aacb8..5ee57aacb8 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain1.update.xml
+++ b/desktop/test/deployment/update/simple/update/plain1.update.xml
diff --git a/desktop/test/deployment/update/simple/update/plain2.oxt b/desktop/test/deployment/update/simple/update/plain2.oxt
index 3dc02aa97a..3dc02aa97a 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain2.oxt
+++ b/desktop/test/deployment/update/simple/update/plain2.oxt
diff --git a/desktop/test/deployment/update/simple/update/plain2.update.xml b/desktop/test/deployment/update/simple/update/plain2.update.xml
index e572908df6..e572908df6 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain2.update.xml
+++ b/desktop/test/deployment/update/simple/update/plain2.update.xml
diff --git a/desktop/test/deployment/update/simple/update/plain3.oxt b/desktop/test/deployment/update/simple/update/plain3.oxt
index 575152403b..575152403b 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain3.oxt
+++ b/desktop/test/deployment/update/simple/update/plain3.oxt
diff --git a/desktop/test/deployment/update/simple/update/plain3.update.xml b/desktop/test/deployment/update/simple/update/plain3.update.xml
index 038bebef02..038bebef02 100644..100755
--- a/desktop/test/deployment/update/simple/update/plain3.update.xml
+++ b/desktop/test/deployment/update/simple/update/plain3.update.xml
diff --git a/desktop/test/deployment/update/updatefeed/feed1.oxt b/desktop/test/deployment/update/updatefeed/feed1.oxt
index b1b11eccea..b1b11eccea 100644..100755
--- a/desktop/test/deployment/update/updatefeed/feed1.oxt
+++ b/desktop/test/deployment/update/updatefeed/feed1.oxt
diff --git a/desktop/test/deployment/update/updatefeed/feed2.oxt b/desktop/test/deployment/update/updatefeed/feed2.oxt
index 47dca1676c..47dca1676c 100644..100755
--- a/desktop/test/deployment/update/updatefeed/feed2.oxt
+++ b/desktop/test/deployment/update/updatefeed/feed2.oxt
diff --git a/desktop/test/deployment/update/updatefeed/update/feed1.oxt b/desktop/test/deployment/update/updatefeed/update/feed1.oxt
index 82bb9665ae..82bb9665ae 100644..100755
--- a/desktop/test/deployment/update/updatefeed/update/feed1.oxt
+++ b/desktop/test/deployment/update/updatefeed/update/feed1.oxt
diff --git a/desktop/test/deployment/update/updatefeed/update/feed1.update.xml b/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
index ebf421dbfd..ebf421dbfd 100644..100755
--- a/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
+++ b/desktop/test/deployment/update/updatefeed/update/feed1.update.xml
diff --git a/desktop/test/deployment/update/updatefeed/update/feed1.xml b/desktop/test/deployment/update/updatefeed/update/feed1.xml
index 1c31851d8c..1c31851d8c 100644..100755
--- a/desktop/test/deployment/update/updatefeed/update/feed1.xml
+++ b/desktop/test/deployment/update/updatefeed/update/feed1.xml
diff --git a/desktop/test/deployment/update/updatefeed/update/feed2.oxt b/desktop/test/deployment/update/updatefeed/update/feed2.oxt
index 9c867ae4a8..9c867ae4a8 100644..100755
--- a/desktop/test/deployment/update/updatefeed/update/feed2.oxt
+++ b/desktop/test/deployment/update/updatefeed/update/feed2.oxt
diff --git a/desktop/test/deployment/update/updatefeed/update/feed2.update.xml b/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
index 7a554b30c4..7a554b30c4 100644..100755
--- a/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
+++ b/desktop/test/deployment/update/updatefeed/update/feed2.update.xml
diff --git a/desktop/test/deployment/update/updateinfocreation/build/description.xml b/desktop/test/deployment/update/updateinfocreation/build/description.xml
index a175c3232a..a175c3232a 100644..100755
--- a/desktop/test/deployment/update/updateinfocreation/build/description.xml
+++ b/desktop/test/deployment/update/updateinfocreation/build/description.xml
diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
index 6af3928279..b0479c942b 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
+++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
@@ -84,5 +84,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr
     $(GNUCOPY) -u description.xml $(MISC)$/$(TARGET)$/description.xml	
     $(TOUCH) $@
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
diff --git a/desktop/test/deployment/update/updateinfocreation/readme.txt b/desktop/test/deployment/update/updateinfocreation/readme.txt
index c4fc059053..c4fc059053 100644..100755
--- a/desktop/test/deployment/update/updateinfocreation/readme.txt
+++ b/desktop/test/deployment/update/updateinfocreation/readme.txt
diff --git a/desktop/test/deployment/update/updateinfocreation/update/updateinfo.oxt b/desktop/test/deployment/update/updateinfocreation/update/updateinfo.oxt
index 52ddd3158e..52ddd3158e 100644..100755
--- a/desktop/test/deployment/update/updateinfocreation/update/updateinfo.oxt
+++ b/desktop/test/deployment/update/updateinfocreation/update/updateinfo.oxt
diff --git a/desktop/test/deployment/update/updateinfocreation/updateinfo.oxt b/desktop/test/deployment/update/updateinfocreation/updateinfo.oxt
index 43ac7003bc..43ac7003bc 100644..100755
--- a/desktop/test/deployment/update/updateinfocreation/updateinfo.oxt
+++ b/desktop/test/deployment/update/updateinfocreation/updateinfo.oxt
diff --git a/desktop/test/deployment/update/website_update/readme.txt b/desktop/test/deployment/update/website_update/readme.txt
index 4ae5ddd918..4ae5ddd918 100644..100755
--- a/desktop/test/deployment/update/website_update/readme.txt
+++ b/desktop/test/deployment/update/website_update/readme.txt
diff --git a/desktop/test/deployment/update/website_update/update/web1.oxt b/desktop/test/deployment/update/website_update/update/web1.oxt
index 157d5d952c..157d5d952c 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1.oxt
+++ b/desktop/test/deployment/update/website_update/update/web1.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web1.update.xml b/desktop/test/deployment/update/website_update/update/web1.update.xml
index 1355851073..1355851073 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1.update.xml
+++ b/desktop/test/deployment/update/website_update/update/web1.update.xml
diff --git a/desktop/test/deployment/update/website_update/update/web1_de-DE-altmark.html b/desktop/test/deployment/update/website_update/update/web1_de-DE-altmark.html
index ffed5a52e8..ffed5a52e8 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_de-DE-altmark.html
+++ b/desktop/test/deployment/update/website_update/update/web1_de-DE-altmark.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_de-DE.html b/desktop/test/deployment/update/website_update/update/web1_de-DE.html
index 33fb7f2ec8..33fb7f2ec8 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_de-DE.html
+++ b/desktop/test/deployment/update/website_update/update/web1_de-DE.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_de.html b/desktop/test/deployment/update/website_update/update/web1_de.html
index 31a53b91db..31a53b91db 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_de.html
+++ b/desktop/test/deployment/update/website_update/update/web1_de.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en-GB.html b/desktop/test/deployment/update/website_update/update/web1_en-GB.html
index c46328a821..c46328a821 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en-GB.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en-GB.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en-US-region1.html b/desktop/test/deployment/update/website_update/update/web1_en-US-region1.html
index 80b41823b7..80b41823b7 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en-US-region1.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en-US-region1.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en-US-region2.html b/desktop/test/deployment/update/website_update/update/web1_en-US-region2.html
index 1a501f520d..1a501f520d 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en-US-region2.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en-US-region2.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en-US.html b/desktop/test/deployment/update/website_update/update/web1_en-US.html
index f861b09c01..f861b09c01 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en-US.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en-US.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en-region3.html b/desktop/test/deployment/update/website_update/update/web1_en-region3.html
index f55bcbe381..f55bcbe381 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en-region3.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en-region3.html
diff --git a/desktop/test/deployment/update/website_update/update/web1_en.html b/desktop/test/deployment/update/website_update/update/web1_en.html
index a0b422ebf2..a0b422ebf2 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web1_en.html
+++ b/desktop/test/deployment/update/website_update/update/web1_en.html
diff --git a/desktop/test/deployment/update/website_update/update/web2.oxt b/desktop/test/deployment/update/website_update/update/web2.oxt
index 3a13e81143..3a13e81143 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web2.oxt
+++ b/desktop/test/deployment/update/website_update/update/web2.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web2.update.xml b/desktop/test/deployment/update/website_update/update/web2.update.xml
index 23343ecede..23343ecede 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web2.update.xml
+++ b/desktop/test/deployment/update/website_update/update/web2.update.xml
diff --git a/desktop/test/deployment/update/website_update/update/web3.oxt b/desktop/test/deployment/update/website_update/update/web3.oxt
index b3214a4e69..b3214a4e69 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web3.oxt
+++ b/desktop/test/deployment/update/website_update/update/web3.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web3.update.xml b/desktop/test/deployment/update/website_update/update/web3.update.xml
index 0958b497f8..0958b497f8 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web3.update.xml
+++ b/desktop/test/deployment/update/website_update/update/web3.update.xml
diff --git a/desktop/test/deployment/update/website_update/update/web4.oxt b/desktop/test/deployment/update/website_update/update/web4.oxt
index 93766fd44f..93766fd44f 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web4.oxt
+++ b/desktop/test/deployment/update/website_update/update/web4.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web4.update.xml b/desktop/test/deployment/update/website_update/update/web4.update.xml
index ddff6eb0a9..ddff6eb0a9 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web4.update.xml
+++ b/desktop/test/deployment/update/website_update/update/web4.update.xml
diff --git a/desktop/test/deployment/update/website_update/update/web5.oxt b/desktop/test/deployment/update/website_update/update/web5.oxt
index 1ae8f01b19..1ae8f01b19 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web5.oxt
+++ b/desktop/test/deployment/update/website_update/update/web5.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web5.update.xml b/desktop/test/deployment/update/website_update/update/web5.update.xml
index 28a61e14de..28a61e14de 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web5.update.xml
+++ b/desktop/test/deployment/update/website_update/update/web5.update.xml
diff --git a/desktop/test/deployment/update/website_update/update/web6.oxt b/desktop/test/deployment/update/website_update/update/web6.oxt
index 8bc16fb2c7..8bc16fb2c7 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web6.oxt
+++ b/desktop/test/deployment/update/website_update/update/web6.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web6/description.xml b/desktop/test/deployment/update/website_update/update/web6/description.xml
index 294661b6fc..294661b6fc 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web6/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web6/description.xml
diff --git a/desktop/test/deployment/update/website_update/update/web6/readme.txt b/desktop/test/deployment/update/website_update/update/web6/readme.txt
index 7a1ba06efa..7a1ba06efa 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web6/readme.txt
+++ b/desktop/test/deployment/update/website_update/update/web6/readme.txt
diff --git a/desktop/test/deployment/update/website_update/update/web7.oxt b/desktop/test/deployment/update/website_update/update/web7.oxt
index 4d6220a48a..4d6220a48a 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web7.oxt
+++ b/desktop/test/deployment/update/website_update/update/web7.oxt
diff --git a/desktop/test/deployment/update/website_update/update/web7/description.xml b/desktop/test/deployment/update/website_update/update/web7/description.xml
index 8fcaf9278c..8fcaf9278c 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web7/description.xml
+++ b/desktop/test/deployment/update/website_update/update/web7/description.xml
diff --git a/desktop/test/deployment/update/website_update/update/web7/readme.txt b/desktop/test/deployment/update/website_update/update/web7/readme.txt
index 8a6721b8e8..8a6721b8e8 100644..100755
--- a/desktop/test/deployment/update/website_update/update/web7/readme.txt
+++ b/desktop/test/deployment/update/website_update/update/web7/readme.txt
diff --git a/desktop/test/deployment/update/website_update/web1.oxt b/desktop/test/deployment/update/website_update/web1.oxt
index 7c17586e04..7c17586e04 100644..100755
--- a/desktop/test/deployment/update/website_update/web1.oxt
+++ b/desktop/test/deployment/update/website_update/web1.oxt
diff --git a/desktop/test/deployment/update/website_update/web2.oxt b/desktop/test/deployment/update/website_update/web2.oxt
index 705e70a753..705e70a753 100644..100755
--- a/desktop/test/deployment/update/website_update/web2.oxt
+++ b/desktop/test/deployment/update/website_update/web2.oxt
diff --git a/desktop/test/deployment/update/website_update/web3.oxt b/desktop/test/deployment/update/website_update/web3.oxt
index 4e63a75f0c..4e63a75f0c 100644..100755
--- a/desktop/test/deployment/update/website_update/web3.oxt
+++ b/desktop/test/deployment/update/website_update/web3.oxt
diff --git a/desktop/test/deployment/update/website_update/web4.oxt b/desktop/test/deployment/update/website_update/web4.oxt
index e66513e683..e66513e683 100644..100755
--- a/desktop/test/deployment/update/website_update/web4.oxt
+++ b/desktop/test/deployment/update/website_update/web4.oxt
diff --git a/desktop/test/deployment/update/website_update/web5.oxt b/desktop/test/deployment/update/website_update/web5.oxt
index 65b02db934..65b02db934 100644..100755
--- a/desktop/test/deployment/update/website_update/web5.oxt
+++ b/desktop/test/deployment/update/website_update/web5.oxt
diff --git a/desktop/test/deployment/update/website_update/web6.oxt b/desktop/test/deployment/update/website_update/web6.oxt
index 98416edfa5..98416edfa5 100644..100755
--- a/desktop/test/deployment/update/website_update/web6.oxt
+++ b/desktop/test/deployment/update/website_update/web6.oxt
diff --git a/desktop/test/deployment/update/website_update/web7.oxt b/desktop/test/deployment/update/website_update/web7.oxt
index 31ba45f032..31ba45f032 100644..100755
--- a/desktop/test/deployment/update/website_update/web7.oxt
+++ b/desktop/test/deployment/update/website_update/web7.oxt
diff --git a/desktop/test/deployment/update/wrong_url/readme.txt b/desktop/test/deployment/update/wrong_url/readme.txt
index cc2459763c..cc2459763c 100644..100755
--- a/desktop/test/deployment/update/wrong_url/readme.txt
+++ b/desktop/test/deployment/update/wrong_url/readme.txt
diff --git a/desktop/test/deployment/update/wrong_url/update/url1.oxt b/desktop/test/deployment/update/wrong_url/update/url1.oxt
index 479b546c84..479b546c84 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/url1.oxt
+++ b/desktop/test/deployment/update/wrong_url/update/url1.oxt
diff --git a/desktop/test/deployment/update/wrong_url/update/url1.update.xml b/desktop/test/deployment/update/wrong_url/update/url1.update.xml
index a50dec4cd5..a50dec4cd5 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/url1.update.xml
+++ b/desktop/test/deployment/update/wrong_url/update/url1.update.xml
diff --git a/desktop/test/deployment/update/wrong_url/update/url2.oxt b/desktop/test/deployment/update/wrong_url/update/url2.oxt
index ec2c5c6528..ec2c5c6528 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/url2.oxt
+++ b/desktop/test/deployment/update/wrong_url/update/url2.oxt
diff --git a/desktop/test/deployment/update/wrong_url/update/url2.update.xml b/desktop/test/deployment/update/wrong_url/update/url2.update.xml
index 13757c8257..13757c8257 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/url2.update.xml
+++ b/desktop/test/deployment/update/wrong_url/update/url2.update.xml
diff --git a/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml b/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
index b2b62a3be3..b2b62a3be3 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
+++ b/desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml
diff --git a/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml b/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
index cb01718765..cb01718765 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
+++ b/desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml
diff --git a/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml b/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
index 6ce027763d..6ce027763d 100644..100755
--- a/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
+++ b/desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml
diff --git a/desktop/test/deployment/update/wrong_url/url1.oxt b/desktop/test/deployment/update/wrong_url/url1.oxt
index 41d8522fbb..41d8522fbb 100644..100755
--- a/desktop/test/deployment/update/wrong_url/url1.oxt
+++ b/desktop/test/deployment/update/wrong_url/url1.oxt
diff --git a/desktop/test/deployment/update/wrong_url/url2.oxt b/desktop/test/deployment/update/wrong_url/url2.oxt
index d68e45e5e5..d68e45e5e5 100644..100755
--- a/desktop/test/deployment/update/wrong_url/url2.oxt
+++ b/desktop/test/deployment/update/wrong_url/url2.oxt
diff --git a/desktop/test/deployment/update/wrong_url/url3.oxt b/desktop/test/deployment/update/wrong_url/url3.oxt
index 80f93b74d1..80f93b74d1 100644..100755
--- a/desktop/test/deployment/update/wrong_url/url3.oxt
+++ b/desktop/test/deployment/update/wrong_url/url3.oxt
diff --git a/desktop/test/deployment/update/wrong_url/wrongdownload1.oxt b/desktop/test/deployment/update/wrong_url/wrongdownload1.oxt
index 535ae331a9..535ae331a9 100644..100755
--- a/desktop/test/deployment/update/wrong_url/wrongdownload1.oxt
+++ b/desktop/test/deployment/update/wrong_url/wrongdownload1.oxt
diff --git a/desktop/test/deployment/update/wrong_url/wrongdownload2.oxt b/desktop/test/deployment/update/wrong_url/wrongdownload2.oxt
index aafe2c2467..aafe2c2467 100644..100755
--- a/desktop/test/deployment/update/wrong_url/wrongdownload2.oxt
+++ b/desktop/test/deployment/update/wrong_url/wrongdownload2.oxt
diff --git a/desktop/test/deployment/update/wrong_url/wrongdownload3.oxt b/desktop/test/deployment/update/wrong_url/wrongdownload3.oxt
index fbdac925a2..fbdac925a2 100644..100755
--- a/desktop/test/deployment/update/wrong_url/wrongdownload3.oxt
+++ b/desktop/test/deployment/update/wrong_url/wrongdownload3.oxt
diff --git a/desktop/test/deployment/version/readme.txt b/desktop/test/deployment/version/readme.txt
index c2ba28afd9..c2ba28afd9 100644..100755
--- a/desktop/test/deployment/version/readme.txt
+++ b/desktop/test/deployment/version/readme.txt
diff --git a/desktop/test/deployment/version/version_0.0/dependency.oxt b/desktop/test/deployment/version/version_0.0/dependency.oxt
index 30c8432251..30c8432251 100644..100755
--- a/desktop/test/deployment/version/version_0.0/dependency.oxt
+++ b/desktop/test/deployment/version/version_0.0/dependency.oxt
diff --git a/desktop/test/deployment/version/version_0.0/license.oxt b/desktop/test/deployment/version/version_0.0/license.oxt
index b994ff71b7..b994ff71b7 100644..100755
--- a/desktop/test/deployment/version/version_0.0/license.oxt
+++ b/desktop/test/deployment/version/version_0.0/license.oxt
diff --git a/desktop/test/deployment/version/version_0.0/plain.oxt b/desktop/test/deployment/version/version_0.0/plain.oxt
index f156014eb8..f156014eb8 100644..100755
--- a/desktop/test/deployment/version/version_0.0/plain.oxt
+++ b/desktop/test/deployment/version/version_0.0/plain.oxt
diff --git a/desktop/test/deployment/version/version_1.02.4.7.0/dependency.oxt b/desktop/test/deployment/version/version_1.02.4.7.0/dependency.oxt
index 4d75f70762..4d75f70762 100644..100755
--- a/desktop/test/deployment/version/version_1.02.4.7.0/dependency.oxt
+++ b/desktop/test/deployment/version/version_1.02.4.7.0/dependency.oxt
diff --git a/desktop/test/deployment/version/version_1.02.4.7.0/license.oxt b/desktop/test/deployment/version/version_1.02.4.7.0/license.oxt
index 40938b7543..40938b7543 100644..100755
--- a/desktop/test/deployment/version/version_1.02.4.7.0/license.oxt
+++ b/desktop/test/deployment/version/version_1.02.4.7.0/license.oxt
diff --git a/desktop/test/deployment/version/version_1.02.4.7.0/plain.oxt b/desktop/test/deployment/version/version_1.02.4.7.0/plain.oxt
index 521a2b6c77..521a2b6c77 100644..100755
--- a/desktop/test/deployment/version/version_1.02.4.7.0/plain.oxt
+++ b/desktop/test/deployment/version/version_1.02.4.7.0/plain.oxt
diff --git a/desktop/test/deployment/version/version_1.2.15.3/dependency.oxt b/desktop/test/deployment/version/version_1.2.15.3/dependency.oxt
index 6f2a301f3b..6f2a301f3b 100644..100755
--- a/desktop/test/deployment/version/version_1.2.15.3/dependency.oxt
+++ b/desktop/test/deployment/version/version_1.2.15.3/dependency.oxt
diff --git a/desktop/test/deployment/version/version_1.2.15.3/license.oxt b/desktop/test/deployment/version/version_1.2.15.3/license.oxt
index 2e2a875750..2e2a875750 100644..100755
--- a/desktop/test/deployment/version/version_1.2.15.3/license.oxt
+++ b/desktop/test/deployment/version/version_1.2.15.3/license.oxt
diff --git a/desktop/test/deployment/version/version_1.2.15.3/plain.oxt b/desktop/test/deployment/version/version_1.2.15.3/plain.oxt
index 000f3a144f..000f3a144f 100644..100755
--- a/desktop/test/deployment/version/version_1.2.15.3/plain.oxt
+++ b/desktop/test/deployment/version/version_1.2.15.3/plain.oxt
diff --git a/desktop/test/deployment/version/version_1.2.3/dependency.oxt b/desktop/test/deployment/version/version_1.2.3/dependency.oxt
index c296634587..c296634587 100644..100755
--- a/desktop/test/deployment/version/version_1.2.3/dependency.oxt
+++ b/desktop/test/deployment/version/version_1.2.3/dependency.oxt
diff --git a/desktop/test/deployment/version/version_1.2.3/license.oxt b/desktop/test/deployment/version/version_1.2.3/license.oxt
index 9cd80e9911..9cd80e9911 100644..100755
--- a/desktop/test/deployment/version/version_1.2.3/license.oxt
+++ b/desktop/test/deployment/version/version_1.2.3/license.oxt
diff --git a/desktop/test/deployment/version/version_1.2.3/plain.oxt b/desktop/test/deployment/version/version_1.2.3/plain.oxt
index e34264591c..e34264591c 100644..100755
--- a/desktop/test/deployment/version/version_1.2.3/plain.oxt
+++ b/desktop/test/deployment/version/version_1.2.3/plain.oxt
diff --git a/desktop/test/deployment/version/version_1.2.4.7/dependency.oxt b/desktop/test/deployment/version/version_1.2.4.7/dependency.oxt
index 53089e76b0..53089e76b0 100644..100755
--- a/desktop/test/deployment/version/version_1.2.4.7/dependency.oxt
+++ b/desktop/test/deployment/version/version_1.2.4.7/dependency.oxt
diff --git a/desktop/test/deployment/version/version_1.2.4.7/license.oxt b/desktop/test/deployment/version/version_1.2.4.7/license.oxt
index e283508d34..e283508d34 100644..100755
--- a/desktop/test/deployment/version/version_1.2.4.7/license.oxt
+++ b/desktop/test/deployment/version/version_1.2.4.7/license.oxt
diff --git a/desktop/test/deployment/version/version_1.2.4.7/plain.oxt b/desktop/test/deployment/version/version_1.2.4.7/plain.oxt
index d63c79a734..d63c79a734 100644..100755
--- a/desktop/test/deployment/version/version_1.2.4.7/plain.oxt
+++ b/desktop/test/deployment/version/version_1.2.4.7/plain.oxt
diff --git a/desktop/test/deployment/version/version_badelement/dependency.oxt b/desktop/test/deployment/version/version_badelement/dependency.oxt
index 3cb8faa2e7..3cb8faa2e7 100644..100755
--- a/desktop/test/deployment/version/version_badelement/dependency.oxt
+++ b/desktop/test/deployment/version/version_badelement/dependency.oxt
diff --git a/desktop/test/deployment/version/version_badelement/license.oxt b/desktop/test/deployment/version/version_badelement/license.oxt
index 7b2b7730ec..7b2b7730ec 100644..100755
--- a/desktop/test/deployment/version/version_badelement/license.oxt
+++ b/desktop/test/deployment/version/version_badelement/license.oxt
diff --git a/desktop/test/deployment/version/version_badelement/plain.oxt b/desktop/test/deployment/version/version_badelement/plain.oxt
index 62267c212f..62267c212f 100644..100755
--- a/desktop/test/deployment/version/version_badelement/plain.oxt
+++ b/desktop/test/deployment/version/version_badelement/plain.oxt
diff --git a/desktop/test/deployment/version/version_badvalue/dependency.oxt b/desktop/test/deployment/version/version_badvalue/dependency.oxt
index 7d81033654..7d81033654 100644..100755
--- a/desktop/test/deployment/version/version_badvalue/dependency.oxt
+++ b/desktop/test/deployment/version/version_badvalue/dependency.oxt
diff --git a/desktop/test/deployment/version/version_badvalue/license.oxt b/desktop/test/deployment/version/version_badvalue/license.oxt
index b97723ebb0..b97723ebb0 100644..100755
--- a/desktop/test/deployment/version/version_badvalue/license.oxt
+++ b/desktop/test/deployment/version/version_badvalue/license.oxt
diff --git a/desktop/test/deployment/version/version_badvalue/plain.oxt b/desktop/test/deployment/version/version_badvalue/plain.oxt
index f9964ed8f0..f9964ed8f0 100644..100755
--- a/desktop/test/deployment/version/version_badvalue/plain.oxt
+++ b/desktop/test/deployment/version/version_badvalue/plain.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_0.0/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_0.0/dependency.oxt
index f156014eb8..f156014eb8 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_0.0/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_0.0/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_1.02.4.7.0/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_1.02.4.7.0/dependency.oxt
index 521a2b6c77..521a2b6c77 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_1.02.4.7.0/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_1.02.4.7.0/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_1.2.15.3/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_1.2.15.3/dependency.oxt
index 000f3a144f..000f3a144f 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_1.2.15.3/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_1.2.15.3/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_1.2.3/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_1.2.3/dependency.oxt
index e34264591c..e34264591c 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_1.2.3/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_1.2.3/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_1.2.4.7/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_1.2.4.7/dependency.oxt
index d63c79a734..d63c79a734 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_1.2.4.7/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_1.2.4.7/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_badelement/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_badelement/dependency.oxt
index 62267c212f..62267c212f 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_badelement/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_badelement/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_badvalue/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_badvalue/dependency.oxt
index f9964ed8f0..f9964ed8f0 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_badvalue/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_badvalue/dependency.oxt
diff --git a/desktop/test/deployment/version/version_nodependencies_none/dependency.oxt b/desktop/test/deployment/version/version_nodependencies_none/dependency.oxt
index fc227b099e..fc227b099e 100644..100755
--- a/desktop/test/deployment/version/version_nodependencies_none/dependency.oxt
+++ b/desktop/test/deployment/version/version_nodependencies_none/dependency.oxt
diff --git a/desktop/test/deployment/version/version_none/dependency.oxt b/desktop/test/deployment/version/version_none/dependency.oxt
index 36a1854bf5..36a1854bf5 100644..100755
--- a/desktop/test/deployment/version/version_none/dependency.oxt
+++ b/desktop/test/deployment/version/version_none/dependency.oxt
diff --git a/desktop/test/deployment/version/version_none/license.oxt b/desktop/test/deployment/version/version_none/license.oxt
index 1564c089b0..1564c089b0 100644..100755
--- a/desktop/test/deployment/version/version_none/license.oxt
+++ b/desktop/test/deployment/version/version_none/license.oxt
diff --git a/desktop/test/deployment/version/version_none/plain.oxt b/desktop/test/deployment/version/version_none/plain.oxt
index fc227b099e..fc227b099e 100644..100755
--- a/desktop/test/deployment/version/version_none/plain.oxt
+++ b/desktop/test/deployment/version/version_none/plain.oxt
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 494477a0c4..494477a0c4 100644..100755
--- a/desktop/unx/source/makefile.mk
+++ b/desktop/unx/source/makefile.mk
diff --git a/desktop/unx/source/officeloader/makefile.mk b/desktop/unx/source/officeloader/makefile.mk
index 050da981e8..050da981e8 100644..100755
--- a/desktop/unx/source/officeloader/makefile.mk
+++ b/desktop/unx/source/officeloader/makefile.mk
diff --git a/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx
index 39f0014f76..39f0014f76 100644..100755
--- a/desktop/unx/source/officeloader/officeloader.cxx
+++ b/desktop/unx/source/officeloader/officeloader.cxx
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 4aa562269a..4aa562269a 100644..100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h
index 537034c6ef..537034c6ef 100644..100755
--- a/desktop/unx/source/splashx.h
+++ b/desktop/unx/source/splashx.h
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d7820339c3..d7820339c3 100644..100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
diff --git a/desktop/unx/splash/exports.map b/desktop/unx/splash/exports.map
index ba501f9ae0..ba501f9ae0 100644..100755
--- a/desktop/unx/splash/exports.map
+++ b/desktop/unx/splash/exports.map
diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
index d182173de1..d182173de1 100644..100755
--- a/desktop/unx/splash/makefile.mk
+++ b/desktop/unx/splash/makefile.mk
diff --git a/desktop/unx/splash/services_unxsplash.cxx b/desktop/unx/splash/services_unxsplash.cxx
index d370b452b4..d370b452b4 100644..100755
--- a/desktop/unx/splash/services_unxsplash.cxx
+++ b/desktop/unx/splash/services_unxsplash.cxx
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index f51e22a7c1..f51e22a7c1 100644..100755
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx
index abe5a8cac2..abe5a8cac2 100644..100755
--- a/desktop/unx/splash/unxsplash.hxx
+++ b/desktop/unx/splash/unxsplash.hxx
diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src
index 0ab7ca9f8d..0ab7ca9f8d 100644..100755
--- a/desktop/util/hidother.src
+++ b/desktop/util/hidother.src
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index df2fe688b9..df2fe688b9 100644..100755
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 5412f5fb2f..5412f5fb2f 100644..100755
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index 8bc39767f0..17af681855 100644..100755
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -25,21 +25,7 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      3
-//#define VERVARIANT    0
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
-
-#define VER_DAY         1
-#define VER_MONTH       1
-#define VER_YEAR        2010
+#include "version.hrc"
 
 // -----------------------------------------------------------------------
 
diff --git a/desktop/util/soffice.ico b/desktop/util/soffice.ico
index 88ccf5e5a6..88ccf5e5a6 100644..100755
--- a/desktop/util/soffice.ico
+++ b/desktop/util/soffice.ico
diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest
index d3bd0c101f..d3bd0c101f 100644..100755
--- a/desktop/util/template.manifest
+++ b/desktop/util/template.manifest
diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index dd50c351a9..dd50c351a9 100644..100755
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
diff --git a/desktop/win32/source/applauncher/launcher.hxx b/desktop/win32/source/applauncher/launcher.hxx
index 444789c96a..444789c96a 100644..100755
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index f0f5743f38..f0f5743f38 100644..100755
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index 02f240cce9..02f240cce9 100644..100755
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
diff --git a/desktop/win32/source/applauncher/sbase.cxx b/desktop/win32/source/applauncher/sbase.cxx
index df940d0267..df940d0267 100644..100755
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
diff --git a/desktop/win32/source/applauncher/scalc.cxx b/desktop/win32/source/applauncher/scalc.cxx
index ed741c28e0..ed741c28e0 100644..100755
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
diff --git a/desktop/win32/source/applauncher/sdraw.cxx b/desktop/win32/source/applauncher/sdraw.cxx
index c8aa2f62f8..c8aa2f62f8 100644..100755
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
diff --git a/desktop/win32/source/applauncher/simpress.cxx b/desktop/win32/source/applauncher/simpress.cxx
index 6160827922..6160827922 100644..100755
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
diff --git a/desktop/win32/source/applauncher/smath.cxx b/desktop/win32/source/applauncher/smath.cxx
index cec6bbdca1..cec6bbdca1 100644..100755
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
diff --git a/desktop/win32/source/applauncher/sweb.cxx b/desktop/win32/source/applauncher/sweb.cxx
index 578239dd1a..578239dd1a 100644..100755
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
diff --git a/desktop/win32/source/applauncher/swriter.cxx b/desktop/win32/source/applauncher/swriter.cxx
index 5235e5b7b2..5235e5b7b2 100644..100755
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
index afb58f3a37..afb58f3a37 100644..100755
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index 436003c770..436003c770 100644..100755
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
diff --git a/desktop/win32/source/extendloaderenvironment.hxx b/desktop/win32/source/extendloaderenvironment.hxx
index 2c1207a0db..2c1207a0db 100644..100755
--- a/desktop/win32/source/extendloaderenvironment.hxx
+++ b/desktop/win32/source/extendloaderenvironment.hxx
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index ac84ed3510..ac84ed3510 100644..100755
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index 5bb1c523ff..5bb1c523ff 100644..100755
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
diff --git a/desktop/win32/source/guistdio/guistdio.cxx b/desktop/win32/source/guistdio/guistdio.cxx
index 7ebf4cb120..7ebf4cb120 100644..100755
--- a/desktop/win32/source/guistdio/guistdio.cxx
+++ b/desktop/win32/source/guistdio/guistdio.cxx
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 05d462d231..05d462d231 100644..100755
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
index 660a48bcdc..660a48bcdc 100644..100755
--- a/desktop/win32/source/guistdio/makefile.mk
+++ b/desktop/win32/source/guistdio/makefile.mk
diff --git a/desktop/win32/source/guistdio/unopkgio.cxx b/desktop/win32/source/guistdio/unopkgio.cxx
index af99179c5f..af99179c5f 100644..100755
--- a/desktop/win32/source/guistdio/unopkgio.cxx
+++ b/desktop/win32/source/guistdio/unopkgio.cxx
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
index 11e4b9e400..11e4b9e400 100644..100755
--- a/desktop/win32/source/lwrapa.cxx
+++ b/desktop/win32/source/lwrapa.cxx
diff --git a/desktop/win32/source/lwrapw.cxx b/desktop/win32/source/lwrapw.cxx
index 6a9b72ca30..6a9b72ca30 100644..100755
--- a/desktop/win32/source/lwrapw.cxx
+++ b/desktop/win32/source/lwrapw.cxx
diff --git a/desktop/win32/source/main.h b/desktop/win32/source/main.h
index 9e72fb9c3e..9e72fb9c3e 100644..100755
--- a/desktop/win32/source/main.h
+++ b/desktop/win32/source/main.h
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index 564ba319eb..564ba319eb 100644..100755
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/source/makefile.mk
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 5609dea250..5609dea250 100644..100755
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index cce56b05a6..cce56b05a6 100644..100755
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
diff --git a/desktop/win32/source/rebase/Resource.h b/desktop/win32/source/rebase/Resource.h
index 8c892111c9..8c892111c9 100644..100755
--- a/desktop/win32/source/rebase/Resource.h
+++ b/desktop/win32/source/rebase/Resource.h
diff --git a/desktop/win32/source/rebase/makefile.mk b/desktop/win32/source/rebase/makefile.mk
index 724ea0edf4..724ea0edf4 100644..100755
--- a/desktop/win32/source/rebase/makefile.mk
+++ b/desktop/win32/source/rebase/makefile.mk
diff --git a/desktop/win32/source/rebase/rcfooter.txt b/desktop/win32/source/rebase/rcfooter.txt
index 3237729437..3237729437 100644..100755
--- a/desktop/win32/source/rebase/rcfooter.txt
+++ b/desktop/win32/source/rebase/rcfooter.txt
diff --git a/desktop/win32/source/rebase/rcheader.txt b/desktop/win32/source/rebase/rcheader.txt
index 56afc53779..56afc53779 100644..100755
--- a/desktop/win32/source/rebase/rcheader.txt
+++ b/desktop/win32/source/rebase/rcheader.txt
diff --git a/desktop/win32/source/rebase/rctmpl.txt b/desktop/win32/source/rebase/rctmpl.txt
index 97a2775e9b..97a2775e9b 100644..100755
--- a/desktop/win32/source/rebase/rctmpl.txt
+++ b/desktop/win32/source/rebase/rctmpl.txt
diff --git a/desktop/win32/source/rebase/rebase.cxx b/desktop/win32/source/rebase/rebase.cxx
index e712c8d548..e712c8d548 100644..100755
--- a/desktop/win32/source/rebase/rebase.cxx
+++ b/desktop/win32/source/rebase/rebase.cxx
diff --git a/desktop/win32/source/rebase/rebasegui.cxx b/desktop/win32/source/rebase/rebasegui.cxx
index e1bb148c2b..e1bb148c2b 100644..100755
--- a/desktop/win32/source/rebase/rebasegui.cxx
+++ b/desktop/win32/source/rebase/rebasegui.cxx
diff --git a/desktop/win32/source/rebase/rebasegui.ulf b/desktop/win32/source/rebase/rebasegui.ulf
index ee6b6e828a..ee6b6e828a 100644..100755
--- a/desktop/win32/source/rebase/rebasegui.ulf
+++ b/desktop/win32/source/rebase/rebasegui.ulf
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
index 4d1f599f01..4d1f599f01 100644..100755
--- a/desktop/win32/source/rwrapa.cxx
+++ b/desktop/win32/source/rwrapa.cxx
diff --git a/desktop/win32/source/rwrapw.cxx b/desktop/win32/source/rwrapw.cxx
index d4912990e4..d4912990e4 100644..100755
--- a/desktop/win32/source/rwrapw.cxx
+++ b/desktop/win32/source/rwrapw.cxx
diff --git a/desktop/win32/source/setup/Resource.h b/desktop/win32/source/setup/Resource.h
index 2f075004d6..2f075004d6 100644..100755
--- a/desktop/win32/source/setup/Resource.h
+++ b/desktop/win32/source/setup/Resource.h
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index f0c6e0e955..f0c6e0e955 100644..100755
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
diff --git a/desktop/win32/source/setup/rcfooter.txt b/desktop/win32/source/setup/rcfooter.txt
index 3237729437..3237729437 100644..100755
--- a/desktop/win32/source/setup/rcfooter.txt
+++ b/desktop/win32/source/setup/rcfooter.txt
diff --git a/desktop/win32/source/setup/rcheader.txt b/desktop/win32/source/setup/rcheader.txt
index 9a59ad7f64..9a59ad7f64 100644..100755
--- a/desktop/win32/source/setup/rcheader.txt
+++ b/desktop/win32/source/setup/rcheader.txt
diff --git a/desktop/win32/source/setup/rctmpl.txt b/desktop/win32/source/setup/rctmpl.txt
index 59f454f70c..59f454f70c 100644..100755
--- a/desktop/win32/source/setup/rctmpl.txt
+++ b/desktop/win32/source/setup/rctmpl.txt
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 69d09a47f6..69d09a47f6 100644..100755
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx
index c3bb71cb3f..c3bb71cb3f 100644..100755
--- a/desktop/win32/source/setup/setup.hxx
+++ b/desktop/win32/source/setup/setup.hxx
diff --git a/desktop/win32/source/setup/setup.ico b/desktop/win32/source/setup/setup.ico
index 2a7ebda53a..2a7ebda53a 100644..100755
--- a/desktop/win32/source/setup/setup.ico
+++ b/desktop/win32/source/setup/setup.ico
diff --git a/desktop/win32/source/setup/setup.ulf b/desktop/win32/source/setup/setup.ulf
index 85d43f43aa..85d43f43aa 100644..100755
--- a/desktop/win32/source/setup/setup.ulf
+++ b/desktop/win32/source/setup/setup.ulf
diff --git a/desktop/win32/source/setup/setup_a.cxx b/desktop/win32/source/setup/setup_a.cxx
index b3cb31bea4..b3cb31bea4 100644..100755
--- a/desktop/win32/source/setup/setup_a.cxx
+++ b/desktop/win32/source/setup/setup_a.cxx
diff --git a/desktop/win32/source/setup/setup_help.hxx b/desktop/win32/source/setup/setup_help.hxx
index f37daa5be3..f37daa5be3 100644..100755
--- a/desktop/win32/source/setup/setup_help.hxx
+++ b/desktop/win32/source/setup/setup_help.hxx
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index 4e4447352e..4e4447352e 100644..100755
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index f966e6ae03..f966e6ae03 100644..100755
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
diff --git a/desktop/win32/source/setup/setup_w.cxx b/desktop/win32/source/setup/setup_w.cxx
index d123eeb350..d123eeb350 100644..100755
--- a/desktop/win32/source/setup/setup_w.cxx
+++ b/desktop/win32/source/setup/setup_w.cxx
diff --git a/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index b7020f09c5..b7020f09c5 100644..100755
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 6ec5727a36..6ec5727a36 100644..100755
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
diff --git a/desktop/win32/source/wrapper.h b/desktop/win32/source/wrapper.h
index 6ccf063b36..6ccf063b36 100644..100755
--- a/desktop/win32/source/wrapper.h
+++ b/desktop/win32/source/wrapper.h
diff --git a/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
index c9a2129922..c9a2129922 100644..100755
--- a/desktop/win32/source/wrappera.cxx
+++ b/desktop/win32/source/wrappera.cxx
diff --git a/desktop/win32/source/wrapperw.cxx b/desktop/win32/source/wrapperw.cxx
index e6927ab820..e6927ab820 100644..100755
--- a/desktop/win32/source/wrapperw.cxx
+++ b/desktop/win32/source/wrapperw.cxx
diff --git a/desktop/zipintro/delzip b/desktop/zipintro/delzip
index 8b13789179..8b13789179 100644..100755
--- a/desktop/zipintro/delzip
+++ b/desktop/zipintro/delzip
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index cdc547fcc5..cdc547fcc5 100644..100755
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
index e50c0f93bf..e50c0f93bf 100644..100755
--- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
+++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index fe6be1eb32..fe6be1eb32 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
index 771a077f58..771a077f58 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
index 4fc5c3ca17..4fc5c3ca17 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
index 9ba55aad26..9ba55aad26 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
index 64112d9643..64112d9643 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
index 1a16b4ef0f..1a16b4ef0f 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
index e65c31ebde..e65c31ebde 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
index d335e6295c..d335e6295c 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
index f011e232e5..f011e232e5 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
index 575ebf147c..575ebf147c 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
index dd7bacfc83..dd7bacfc83 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx
index a6497e372c..a6497e372c 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx
index 2397aa76c3..2397aa76c3 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx
index 8d63c0a168..8d63c0a168 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx
index 48d65e0060..48d65e0060 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx
index 44e964a53f..44e964a53f 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
index 4d72d9174d..4d72d9174d 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
index 4578a8fe24..4578a8fe24 100644..100755
--- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
index b71a57b4fd..b71a57b4fd 100644..100755
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
index 3f720a72d3..3f720a72d3 100644..100755
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
index d3fa3076cf..d3fa3076cf 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index fb4806d05c..fb4806d05c 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
index b67bdb9e66..b67bdb9e66 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index 6a8295a326..6a8295a326 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 7d50da4444..7d50da4444 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
index caa2add123..caa2add123 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
index e7079d3580..e7079d3580 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
index cf56b33592..cf56b33592 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
new file mode 100755
index 0000000000..19646d4822
--- /dev/null
+++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
@@ -0,0 +1,128 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
+#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
+
+#include <drawinglayer/primitive2d/primitivetools2d.hxx>
+#include <vcl/bitmapex.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+// DiscreteShadowPrimitive2D class
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        /** DiscreteShadow data class
+
+         */
+        class DiscreteShadow
+        {
+        private:
+            /// the original shadow BitmapEx in a special form
+            BitmapEx					maBitmapEx;
+
+            /// buffered extracted parts of CombinedShadow for easier usage
+            BitmapEx					maTopLeft;
+            BitmapEx					maTop;
+            BitmapEx					maTopRight;
+            BitmapEx					maRight;
+            BitmapEx					maBottomRight;
+            BitmapEx					maBottom;
+            BitmapEx					maBottomLeft;
+            BitmapEx					maLeft;
+
+        public:
+            /// constructor
+            DiscreteShadow(const BitmapEx& rBitmapEx);
+
+            /// data read access
+            const BitmapEx& getBitmapEx() const { return maBitmapEx; }
+
+            /// compare operator
+            bool operator==(const DiscreteShadow& rCompare) const
+            {
+                return getBitmapEx() == rCompare.getBitmapEx();
+            }
+
+            /// helper accesses which create on-demand needed segments
+            const BitmapEx& getTopLeft() const;
+            const BitmapEx& getTop() const;
+            const BitmapEx& getTopRight() const;
+            const BitmapEx& getRight() const;
+            const BitmapEx& getBottomRight() const;
+            const BitmapEx& getBottom() const;
+            const BitmapEx& getBottomLeft() const;
+            const BitmapEx& getLeft() const;
+        };
+
+        /** DiscreteShadowPrimitive2D class
+
+         */
+        class DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D
+        {
+        private:
+            // the object transformation of the rectangular object
+            basegfx::B2DHomMatrix		maTransform;
+
+            // the bitmap shadow data
+            DiscreteShadow				maDiscreteShadow;
+
+        protected:
+            /// create local decomposition
+            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+
+        public:
+            /// constructor
+            DiscreteShadowPrimitive2D(
+                const basegfx::B2DHomMatrix& rTransform,
+                const DiscreteShadow& rDiscreteShadow);
+
+            /// data read access
+            const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
+            const DiscreteShadow& getDiscreteShadow() const { return maDiscreteShadow; }
+
+            /// compare operator
+            virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
+
+            /// get range
+            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
+
+            /// provide unique ID
+            DeclPrimitrive2DIDBlock()
+        };
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 8bd1719a1d..7fe52b7d88 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -94,14 +94,16 @@
 #define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D				(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
 #define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D				(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51)
 #define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52)
-#define PRIMITIVE2D_ID_INVERTPRIMITIVE2D                    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53)
-#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54)
-#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55)
-#define PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D                  (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 56)
-#define PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 57)
-#define PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D     (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 58)
-#define PRIMITIVE2D_ID_EPSPRIMITIVE2D						(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59)
-#define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D            (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60)
+#define PRIMITIVE2D_ID_HITTESTPRIMITIVE2D                   (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53)
+#define PRIMITIVE2D_ID_INVERTPRIMITIVE2D                    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 54)
+#define PRIMITIVE2D_ID_DISCRETEBITMAPPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 55)
+#define PRIMITIVE2D_ID_WALLPAPERBITMAPPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 56)
+#define PRIMITIVE2D_ID_TEXTLINEPRIMITIVE2D                  (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 57)
+#define PRIMITIVE2D_ID_TEXTCHARACTERSTRIKEOUTPRIMITIVE2D    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 58)
+#define PRIMITIVE2D_ID_TEXTGEOMETRYSTRIKEOUTPRIMITIVE2D     (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 59)
+#define PRIMITIVE2D_ID_EPSPRIMITIVE2D						(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60)
+#define PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 61)
+#define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D            (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 62)
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index 224a730a85..224a730a85 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
index a9e90e5d01..a9e90e5d01 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
index 0b856c2c7d..0b856c2c7d 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index a1f0eca549..a1f0eca549 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index 9b35b9bb58..9b35b9bb58 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 10a4bde7be..10a4bde7be 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
index 564d5d09a2..564d5d09a2 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
index ffcfc72699..ffcfc72699 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
index 4422cb3e94..4422cb3e94 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
index ec6096c4a2..ec6096c4a2 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
index 224092e1ac..224092e1ac 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index 8c355875d2..8c355875d2 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
index ff17956a83..ff17956a83 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 375cdc7340..375cdc7340 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
index 6dce360529..6dce360529 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index 15415bc20d..15415bc20d 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index 578fb07022..578fb07022 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 88c2f05548..88c2f05548 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 550852250f..550852250f 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index f5b35344b5..f5b35344b5 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
index 5046faaa6f..5046faaa6f 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
index f12f030742..f12f030742 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
index a143aef0d6..a143aef0d6 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 98d78c31bf..98d78c31bf 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index a387b4468f..a387b4468f 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 1ade2f0a76..1ade2f0a76 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 988fa4f585..988fa4f585 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
index 9622e78d91..9622e78d91 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 71d7e1ec7c..71d7e1ec7c 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
index 159f330500..159f330500 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
index cef58307d5..cef58307d5 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index b7a805e2a8..b7a805e2a8 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index 478c65ec57..478c65ec57 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
index 0e80da9025..0e80da9025 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx
index 9afa8b0224..9afa8b0224 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
index 3e8f727c0d..3e8f727c0d 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index 60ef801f5b..60ef801f5b 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index b8143c91b4..b8143c91b4 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
index 3d3cf4aae0..3d3cf4aae0 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
index 2f6aeb8c93..2f6aeb8c93 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
index a51bae2d52..a51bae2d52 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
index ef5e09cc68..ef5e09cc68 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
index 475acf5d80..475acf5d80 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
index 1f142c0742..1f142c0742 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
index eba60a18c7..eba60a18c7 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
index b353ad0579..b353ad0579 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
index 440d07ef84..440d07ef84 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
index 731ed34720..731ed34720 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
index a46b101b4c..a46b101b4c 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index e69af0871b..e69af0871b 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index 008d56ab1b..008d56ab1b 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index a6bce8fb07..a6bce8fb07 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
index 51455ba3e7..51455ba3e7 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
index 5076c2c30e..5076c2c30e 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
index add82da4f1..add82da4f1 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
index 416cb85d1b..416cb85d1b 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
index f4d7237569..f4d7237569 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
index 15764ee733..15764ee733 100644..100755
--- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index 885a3a4775..885a3a4775 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
index 8a74992cf4..8a74992cf4 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
index 82708f4a7c..82708f4a7c 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
index 000048c56c..000048c56c 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
index c02aeb4269..c02aeb4269 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index 094dc72a05..094dc72a05 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index ce3ddb589e..ce3ddb589e 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
index ca9eb5bcc7..ca9eb5bcc7 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index 741d09a0b6..741d09a0b6 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
index 90978cc1f3..90978cc1f3 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
index c5388002c3..c5388002c3 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
index 28f67efe35..28f67efe35 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
index 968434ce05..968434ce05 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
index 60f6ebf909..60f6ebf909 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 06724deef0..06724deef0 100644..100755
--- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx
index 0b40ad7da7..0b40ad7da7 100644..100755
--- a/drawinglayer/inc/drawinglayer/texture/texture.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx
diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
index 87bd326b52..87bd326b52 100644..100755
--- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
diff --git a/drawinglayer/inc/makefile.mk b/drawinglayer/inc/makefile.mk
index ebfd726939..ebfd726939 100644..100755
--- a/drawinglayer/inc/makefile.mk
+++ b/drawinglayer/inc/makefile.mk
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
index e86aca2cf3..e86aca2cf3 100644..100755
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index 72f6f137b8..72f6f137b8 100644..100755
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst
index d685c262e3..d685c262e3 100644..100755
--- a/drawinglayer/prj/build.lst
+++ b/drawinglayer/prj/build.lst
diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst
index e863e47a3b..54f087d317 100644..100755
--- a/drawinglayer/prj/d.lst
+++ b/drawinglayer/prj/d.lst
@@ -16,6 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive2d
 ..\inc\drawinglayer\primitive2d\borderlineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\borderlineprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\chartprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\chartprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\controlprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\controlprimitive2d.hxx
+..\inc\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx
+..\inc\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\embedded3dprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\embedded3dprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx
 ..\inc\drawinglayer\primitive2d\fillgradientprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillgradientprimitive2d.hxx
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index 856005cb92..856005cb92 100644..100755
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
diff --git a/drawinglayer/source/animation/makefile.mk b/drawinglayer/source/animation/makefile.mk
index 07f64fab65..07f64fab65 100644..100755
--- a/drawinglayer/source/animation/makefile.mk
+++ b/drawinglayer/source/animation/makefile.mk
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index 807564da2a..807564da2a 100644..100755
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx
index a67ea41119..a67ea41119 100644..100755
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx
index e3f0070507..e3f0070507 100644..100755
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 7ec5dfd8e8..7ec5dfd8e8 100644..100755
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index 30646cc692..30646cc692 100644..100755
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index 615aef0cab..615aef0cab 100644..100755
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
diff --git a/drawinglayer/source/attribute/makefile.mk b/drawinglayer/source/attribute/makefile.mk
index 32cef7c7b4..32cef7c7b4 100644..100755
--- a/drawinglayer/source/attribute/makefile.mk
+++ b/drawinglayer/source/attribute/makefile.mk
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index 71486765ea..71486765ea 100644..100755
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index a5daed92ad..a5daed92ad 100644..100755
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx
index 0f72925676..0f72925676 100644..100755
--- a/drawinglayer/source/attribute/sdrfillattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillattribute.cxx
diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
index 3ef2c572a6..3ef2c572a6 100644..100755
--- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
index 7252ed7f9d..7252ed7f9d 100644..100755
--- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
index ba742a2a88..ba742a2a88 100644..100755
--- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index ac36188a3f..ac36188a3f 100644..100755
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
index 8a9a16f120..8a9a16f120 100644..100755
--- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index 2f9e4baca4..2f9e4baca4 100644..100755
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
index c66eda2bb9..c66eda2bb9 100644..100755
--- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx
index 54b3b0eb64..54b3b0eb64 100644..100755
--- a/drawinglayer/source/attribute/sdrshadowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index ca8fe9c9cd..ca8fe9c9cd 100644..100755
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
diff --git a/drawinglayer/source/geometry/makefile.mk b/drawinglayer/source/geometry/makefile.mk
index b885221660..b885221660 100644..100755
--- a/drawinglayer/source/geometry/makefile.mk
+++ b/drawinglayer/source/geometry/makefile.mk
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 93757e2006..93757e2006 100644..100755
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index ef2fa0da09..ef2fa0da09 100644..100755
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 75544c0079..75544c0079 100644..100755
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index fd73f52ccf..fd73f52ccf 100644..100755
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index f655fec229..f655fec229 100644..100755
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index 3efbd0de02..3efbd0de02 100644..100755
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index cb026ccf6c..cb026ccf6c 100644..100755
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/chartprimitive2d.cxx b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
index 23957295df..23957295df 100644..100755
--- a/drawinglayer/source/primitive2d/chartprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 483f797a1e..483f797a1e 100644..100755
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index a00a1e47f9..a00a1e47f9 100644..100755
--- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
new file mode 100755
index 0000000000..17578b5e52
--- /dev/null
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -0,0 +1,339 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_drawinglayer.hxx"
+
+#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
+#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        DiscreteShadow::DiscreteShadow(const BitmapEx& rBitmapEx)
+        :	maBitmapEx(rBitmapEx),
+            maTopLeft(),
+            maTop(),
+            maTopRight(),
+            maRight(),
+            maBottomRight(),
+            maBottom(),
+            maBottomLeft(),
+            maLeft()
+        {
+            const Size& rBitmapSize = getBitmapEx().GetSizePixel();
+
+            if(rBitmapSize.Width() != rBitmapSize.Height() || rBitmapSize.Width() < 7)
+            {
+                OSL_ENSURE(false, "DiscreteShadowPrimitive2D: wrong bitmap format (!)");
+                maBitmapEx = BitmapEx();
+            }
+        }
+
+        const BitmapEx& DiscreteShadow::getTopLeft() const
+        {
+            if(maTopLeft.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maTopLeft = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maTopLeft.Crop(
+                    Rectangle(Point(0,0),Size(nQuarter*2+1,nQuarter*2+1)));
+            }
+
+            return maTopLeft;
+        }
+
+        const BitmapEx& DiscreteShadow::getTop() const
+        {
+            if(maTop.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maTop = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maTop.Crop(
+                    Rectangle(Point(nQuarter*2+1,0),Size(1,nQuarter+1)));
+            }
+
+            return maTop;
+        }
+
+        const BitmapEx& DiscreteShadow::getTopRight() const
+        {
+            if(maTopRight.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maTopRight = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maTopRight.Crop(
+                    Rectangle(Point(nQuarter*2+2,0),Size(nQuarter*2+1,nQuarter*2+1)));
+            }
+
+            return maTopRight;
+        }
+
+        const BitmapEx& DiscreteShadow::getRight() const
+        {
+            if(maRight.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maRight = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maRight.Crop(
+                    Rectangle(Point(nQuarter*3+2,nQuarter*2+1),Size(nQuarter+1,1)));
+            }
+
+            return maRight;
+        }
+
+        const BitmapEx& DiscreteShadow::getBottomRight() const
+        {
+            if(maBottomRight.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maBottomRight = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maBottomRight.Crop(
+                    Rectangle(Point(nQuarter*2+2,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+            }
+
+            return maBottomRight;
+        }
+
+        const BitmapEx& DiscreteShadow::getBottom() const
+        {
+            if(maBottom.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maBottom = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maBottom.Crop(
+                    Rectangle(Point(nQuarter*2+1,nQuarter*3+2),Size(1,nQuarter+1)));
+            }
+
+            return maBottom;
+        }
+
+        const BitmapEx& DiscreteShadow::getBottomLeft() const
+        {
+            if(maBottomLeft.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maBottomLeft = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maBottomLeft.Crop(
+                    Rectangle(Point(0,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+            }
+
+            return maBottomLeft;
+        }
+
+        const BitmapEx& DiscreteShadow::getLeft() const
+        {
+            if(maLeft.IsEmpty())
+            {
+                const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const_cast< DiscreteShadow* >(this)->maLeft = getBitmapEx();
+                const_cast< DiscreteShadow* >(this)->maLeft.Crop(
+                    Rectangle(Point(0,nQuarter*2+1),Size(nQuarter+1,1)));
+            }
+
+            return maLeft;
+        }
+
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace drawinglayer
+{
+    namespace primitive2d
+    {
+        Primitive2DSequence DiscreteShadowPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        {
+            Primitive2DSequence xRetval;
+            
+            if(!getDiscreteShadow().getBitmapEx().IsEmpty())
+            {
+                const sal_Int32 nQuarter((getDiscreteShadow().getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const basegfx::B2DVector aScale(getTransform() * basegfx::B2DVector(1.0, 1.0));
+                const double fSingleX(getDiscreteUnit() / aScale.getX());
+                const double fSingleY(getDiscreteUnit() / aScale.getY());
+                const double fBorderX(fSingleX * nQuarter);
+                const double fBorderY(fSingleY * nQuarter);
+                const double fBigLenX((fBorderX * 2.0) + fSingleX);
+                const double fBigLenY((fBorderY * 2.0) + fSingleY);
+
+                xRetval.realloc(8);
+
+                // TopLeft
+                xRetval[0] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getTopLeft(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBigLenX, 
+                            fBigLenY,
+                            -fBorderX, 
+                            -fBorderY)));
+
+                // Top
+                xRetval[1] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getTop(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            1.0 - (2.0 * fBorderX) - fSingleX, 
+                            fBorderY + fSingleY,
+                            fBorderX + fSingleX, 
+                            -fBorderY)));
+
+                // TopRight
+                xRetval[2] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getTopRight(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBigLenX, 
+                            fBigLenY,
+                            1.0 - fBorderX, 
+                            -fBorderY)));
+                
+                // Right
+                xRetval[3] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getRight(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBorderX + fSingleX, 
+                            1.0 - (2.0 * fBorderY) - fSingleY,
+                            1.0, 
+                            fBorderY + fSingleY)));
+
+                // BottomRight
+                xRetval[4] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getBottomRight(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBigLenX, 
+                            fBigLenY,
+                            1.0 - fBorderX, 
+                            1.0 - fBorderY)));
+
+                // Bottom
+                xRetval[5] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getBottom(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            1.0 - (2.0 * fBorderX) - fSingleX, 
+                            fBorderY + fSingleY,
+                            fBorderX + fSingleX,
+                            1.0)));
+
+                // BottomLeft
+                xRetval[6] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getBottomLeft(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBigLenX, 
+                            fBigLenY,
+                            -fBorderX, 
+                            1.0 - fBorderY)));
+
+                // Left
+                xRetval[7] = Primitive2DReference(
+                    new BitmapPrimitive2D(
+                        getDiscreteShadow().getLeft(),
+                        basegfx::tools::createScaleTranslateB2DHomMatrix(
+                            fBorderX + fSingleX, 
+                            1.0 - (2.0 * fBorderY) - fSingleY,
+                            -fBorderX, 
+                            fBorderY + fSingleY)));
+
+                // put all in object transformation to get to target positions
+                const Primitive2DReference xTransformed(
+                    new TransformPrimitive2D(
+                        getTransform(),
+                        xRetval));
+
+                xRetval = Primitive2DSequence(&xTransformed, 1);
+            }
+
+            return xRetval;
+        }
+
+        DiscreteShadowPrimitive2D::DiscreteShadowPrimitive2D(
+            const basegfx::B2DHomMatrix& rTransform,
+            const DiscreteShadow& rDiscreteShadow)
+        :   DiscreteMetricDependentPrimitive2D(),
+            maTransform(rTransform),
+            maDiscreteShadow(rDiscreteShadow)
+        {
+        }
+
+        bool DiscreteShadowPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
+        {
+            if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive))
+            {
+                const DiscreteShadowPrimitive2D& rCompare = (DiscreteShadowPrimitive2D&)rPrimitive;
+
+                return (getTransform() == rCompare.getTransform()
+                    && getDiscreteShadow() == rCompare.getDiscreteShadow());
+            }
+
+            return false;
+        }
+
+        basegfx::B2DRange DiscreteShadowPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
+        {
+            if(getDiscreteShadow().getBitmapEx().IsEmpty())
+            {
+                // no graphics without valid bitmap definition
+                return basegfx::B2DRange();
+            }
+            else
+            {
+                // prepare normal objectrange
+                basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0);
+                aRetval.transform(getTransform());
+
+                // extract discrete shadow size and grow
+                const basegfx::B2DVector aScale(rViewInformation.getViewTransformation() * basegfx::B2DVector(1.0, 1.0));
+                const sal_Int32 nQuarter((getDiscreteShadow().getBitmapEx().GetSizePixel().Width() - 3) >> 2);
+                const double fGrowX((1.0 / aScale.getX()) * nQuarter);
+                const double fGrowY((1.0 / aScale.getY()) * nQuarter);
+                aRetval.grow(std::max(fGrowX, fGrowY));
+                
+                return aRetval;
+            }
+        }
+
+        // provide unique ID
+        ImplPrimitrive2DIDBlock(DiscreteShadowPrimitive2D, PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D)
+
+    } // end of namespace primitive2d
+} // end of namespace drawinglayer
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index e2e2b3bd21..e2e2b3bd21 100644..100755
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index eba693ddc0..eba693ddc0 100644..100755
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
index 8a4d70b959..8a4d70b959 100644..100755
--- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index b75f9a6e0d..b75f9a6e0d 100644..100755
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 1e0e9fdff9..1e0e9fdff9 100644..100755
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 6447d78bcf..6447d78bcf 100644..100755
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 6c0fd1948a..6c0fd1948a 100644..100755
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index abb6989a57..abb6989a57 100644..100755
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 45559b7c1b..45559b7c1b 100644..100755
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
index ab9e56b2e1..ab9e56b2e1 100644..100755
--- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index dc1f10fbc0..dc1f10fbc0 100644..100755
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk
index bca5805ae6..720769a0ef 100644..100755
--- a/drawinglayer/source/primitive2d/makefile.mk
+++ b/drawinglayer/source/primitive2d/makefile.mk
@@ -46,6 +46,7 @@ SLOFILES= \
         $(SLO)$/chartprimitive2d.obj				\
         $(SLO)$/controlprimitive2d.obj				\
         $(SLO)$/discretebitmapprimitive2d.obj		\
+        $(SLO)$/discreteshadowprimitive2d.obj		\
         $(SLO)$/embedded3dprimitive2d.obj			\
         $(SLO)$/epsprimitive2d.obj					\
         $(SLO)$/fillbitmapprimitive2d.obj			\
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index 5aa3beebd0..5aa3beebd0 100644..100755
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index ab1d36f3cc..ab1d36f3cc 100644..100755
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 4c69061e81..4c69061e81 100644..100755
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index ffb90a5700..ffb90a5700 100644..100755
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index d43403be14..d43403be14 100644..100755
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index e28f5debcb..e28f5debcb 100644..100755
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index df508d4a63..df508d4a63 100644..100755
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 79a280f00d..79a280f00d 100644..100755
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 98966c70a3..98966c70a3 100644..100755
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 03425a2ead..03425a2ead 100644..100755
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index f9959744c2..f9959744c2 100644..100755
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
index bde27c4796..bde27c4796 100644..100755
--- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
+++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index c0d436964e..c0d436964e 100644..100755
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 4e26a06e02..4e26a06e02 100644..100755
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 6b5c4aab0f..6b5c4aab0f 100644..100755
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index cf29d00e3b..cf29d00e3b 100644..100755
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
index 5247d4404e..5247d4404e 100644..100755
--- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index 896b37252f..896b37252f 100644..100755
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index c3435333a3..f4f3077fe0 100644..100755
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -403,7 +403,7 @@ namespace drawinglayer
             // define various other FontAttribute
             aRetval.SetAlign(ALIGN_BASELINE);
             aRetval.SetCharSet(rFontAttribute.getSymbol() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE);
-            aRetval.SetVertical(rFontAttribute.getVertical() ? TRUE : FALSE);
+            aRetval.SetVertical(rFontAttribute.getVertical() ? sal_True : sal_False);
             aRetval.SetWeight(static_cast<FontWeight>(rFontAttribute.getWeight()));
             aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
             aRetval.SetOutline(rFontAttribute.getOutline());
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index f04021c77f..f04021c77f 100644..100755
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 131249c627..131249c627 100644..100755
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index c278ba7494..c278ba7494 100644..100755
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index f8ad7e2e36..f8ad7e2e36 100644..100755
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
index c62699e070..c62699e070 100644..100755
--- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
index cedb90b188..cedb90b188 100644..100755
--- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index 625cd5db13..625cd5db13 100644..100755
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
index 2e38ed8bed..2e38ed8bed 100644..100755
--- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 022cd65d5a..022cd65d5a 100644..100755
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index 56b0dde494..56b0dde494 100644..100755
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 519d2f8330..519d2f8330 100644..100755
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
index 0cf95b2ac8..0cf95b2ac8 100644..100755
--- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/makefile.mk b/drawinglayer/source/primitive3d/makefile.mk
index afad990c0e..afad990c0e 100644..100755
--- a/drawinglayer/source/primitive3d/makefile.mk
+++ b/drawinglayer/source/primitive3d/makefile.mk
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index 8a5c98be4d..8a5c98be4d 100644..100755
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 1ecc2ab49e..1ecc2ab49e 100644..100755
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index dcc63dd1c3..dcc63dd1c3 100644..100755
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 4066dfe163..4066dfe163 100644..100755
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 287bc4e43e..287bc4e43e 100644..100755
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index a75772cf9c..a75772cf9c 100644..100755
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 8d52439781..8d52439781 100644..100755
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index fd26f5e36b..fd26f5e36b 100644..100755
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index dcb5409ae9..dcb5409ae9 100644..100755
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 46b3225c29..46b3225c29 100644..100755
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index 19f436da86..19f436da86 100644..100755
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index b69bde3e5a..b69bde3e5a 100644..100755
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index 02818c74af..02818c74af 100644..100755
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
index 1285549380..1285549380 100644..100755
--- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
index a452c28c53..a452c28c53 100644..100755
--- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index 7dce36b364..7dce36b364 100644..100755
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index e6311ab98c..e6311ab98c 100644..100755
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index b7089f23eb..b7089f23eb 100644..100755
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index a3a24767c1..a3a24767c1 100644..100755
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.hxx b/drawinglayer/source/processor2d/helperchartrenderer.hxx
index 0f1da6e515..0f1da6e515 100644..100755
--- a/drawinglayer/source/processor2d/helperchartrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.hxx
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
index a1be549911..a1be549911 100644..100755
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
index cdc572dba0..cdc572dba0 100644..100755
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 8f3ad7acb1..8f3ad7acb1 100644..100755
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
index 2eb35597f2..2eb35597f2 100644..100755
--- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
+++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk
index ec7b8aef64..ec7b8aef64 100644..100755
--- a/drawinglayer/source/processor2d/makefile.mk
+++ b/drawinglayer/source/processor2d/makefile.mk
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index 111a6392c5..111a6392c5 100644..100755
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index db25b4204c..75ace24df6 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -85,15 +85,18 @@ namespace drawinglayer
             aOutlineRange.transform(aSimpleObjectMatrix);
         }
 
-        // prepare dest coor
-        const Rectangle aDestRectPixel(
-            basegfx::fround(aOutlineRange.getMinX()), basegfx::fround(aOutlineRange.getMinY()),
-            basegfx::fround(aOutlineRange.getMaxX()), basegfx::fround(aOutlineRange.getMaxY()));
+        // prepare dest coordinates
+        const Point	aPoint(
+                basegfx::fround(aOutlineRange.getMinX()), 
+                basegfx::fround(aOutlineRange.getMinY()));
+        const Size aSize(
+                basegfx::fround(aOutlineRange.getWidth()),
+                basegfx::fround(aOutlineRange.getHeight()));
 
         // paint it using GraphicManager
         Graphic aGraphic(rBitmapEx);
         GraphicObject aGraphicObject(aGraphic);
-        aGraphicObject.Draw(&rOutDev, aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), &aAttributes);
+        aGraphicObject.Draw(&rOutDev, aPoint, aSize, &aAttributes);
     }
 
     void RenderBitmapPrimitive2D_BitmapEx(
@@ -107,9 +110,13 @@ namespace drawinglayer
         // prepare dest coor. Necessary to expand since vcl's DrawBitmapEx draws one pix less
         basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
         aOutlineRange.transform(rTransform);
-        const Rectangle aDestRectPixel(
-            basegfx::fround(aOutlineRange.getMinX()), basegfx::fround(aOutlineRange.getMinY()),
-            basegfx::fround(aOutlineRange.getMaxX()), basegfx::fround(aOutlineRange.getMaxY()));
+        // prepare dest coordinates
+        const Point	aPoint(
+                basegfx::fround(aOutlineRange.getMinX()), 
+                basegfx::fround(aOutlineRange.getMinY()));
+        const Size aSize(
+                basegfx::fround(aOutlineRange.getWidth()),
+                basegfx::fround(aOutlineRange.getHeight()));
 
         // decompose matrix to check for shear, rotate and mirroring
         basegfx::B2DVector aScale, aTranslate;
@@ -135,7 +142,7 @@ namespace drawinglayer
         }
 
         // draw bitmap
-        rOutDev.DrawBitmapEx(aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), aContent);
+        rOutDev.DrawBitmapEx(aPoint, aSize, aContent);
     }
 
     void RenderBitmapPrimitive2D_self(
@@ -147,8 +154,10 @@ namespace drawinglayer
         basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
         aOutlineRange.transform(rTransform);
         const Rectangle aDestRectLogic(
-            basegfx::fround(aOutlineRange.getMinX()), basegfx::fround(aOutlineRange.getMinY()),
-            basegfx::fround(aOutlineRange.getMaxX()), basegfx::fround(aOutlineRange.getMaxY()));
+            basegfx::fround(aOutlineRange.getMinX()), 
+            basegfx::fround(aOutlineRange.getMinY()),
+            basegfx::fround(aOutlineRange.getMaxX()),
+            basegfx::fround(aOutlineRange.getMaxY()));
         const Rectangle aDestRectPixel(rOutDev.LogicToPixel(aDestRectLogic));
 
         // #i96708# check if Metafile is recorded
@@ -162,18 +171,19 @@ namespace drawinglayer
 
         if(!aCroppedRectPixel.IsEmpty())
         {
-            // as maximum for destination, orientate at SourceSizePixel, but
+            // as maximum for destination, orientate at aOutputRectPixel, but
             // take a rotation of 45 degrees (sqrt(2)) as maximum expansion into account
             const Size aSourceSizePixel(rBitmapEx.GetSizePixel());
             const double fMaximumArea(
-                (double)aSourceSizePixel.getWidth() * 
-                (double)aSourceSizePixel.getHeight() *
+                (double)aOutputRectPixel.getWidth() * 
+                (double)aOutputRectPixel.getHeight() *
                 1.4142136); // 1.4142136 taken as sqrt(2.0)
 
             // test if discrete view size (pixel) maybe too big and limit it
             const double fArea(aCroppedRectPixel.getWidth() * aCroppedRectPixel.getHeight());
             const bool bNeedToReduce(fArea > fMaximumArea);
             double fReduceFactor(1.0);
+            const Size aDestSizePixel(aCroppedRectPixel.GetSize());
 
             if(bNeedToReduce)
             {
@@ -220,11 +230,6 @@ namespace drawinglayer
             if(bNeedToReduce)
             {
                 // paint in target size
-                const double fFactor(1.0 / fReduceFactor);
-                const Size aDestSizePixel(
-                    basegfx::fround(aCroppedRectPixel.getWidth() * fFactor),
-                    basegfx::fround(aCroppedRectPixel.getHeight() * fFactor));
-
                 if(bRecordToMetaFile)
                 {
                     rOutDev.DrawBitmapEx(
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
index 674c578cbf..674c578cbf 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
index 0676aabc04..0676aabc04 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
index 4362ea66e5..4362ea66e5 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index e3bec6802c..e3bec6802c 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
index 21cf3f4fb6..21cf3f4fb6 100644..100755
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx
index 46786d72f3..46786d72f3 100644..100755
--- a/drawinglayer/source/processor2d/vclhelpergradient.cxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.hxx b/drawinglayer/source/processor2d/vclhelpergradient.hxx
index c47c27829a..c47c27829a 100644..100755
--- a/drawinglayer/source/processor2d/vclhelpergradient.hxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.hxx
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index cf6abfe592..a5aa2831c7 100644..100755
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -356,7 +356,7 @@ namespace drawinglayer
                 SvMemoryStream aMemStm;
                 
                 aMemStm << *pSvtGraphicFill;
-                mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
+                mpMetaFile->AddAction(new MetaCommentAction("XPATHFILL_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
                 mnSvtGraphicFillCount++;
             }
         }
@@ -509,7 +509,7 @@ namespace drawinglayer
                 SvMemoryStream aMemStm;
                 
                 aMemStm << *pSvtGraphicStroke;
-                mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const BYTE* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
+                mpMetaFile->AddAction(new MetaCommentAction("XPATHSTROKE_SEQ_BEGIN", 0, static_cast< const sal_uInt8* >(aMemStm.GetData()), aMemStm.Seek(STREAM_SEEK_TO_END)));
                 mnSvtGraphicStrokeCount++;
             }
         }
@@ -965,7 +965,7 @@ namespace drawinglayer
                         {
                             const rtl::OUString& rURL = rFieldPrimitive.getString();
                             const String aOldString(rURL);
-                            mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const BYTE* >(aOldString.GetBuffer()), 2 * aOldString.Len()));
+                            mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const sal_uInt8* >(aOldString.GetBuffer()), 2 * aOldString.Len()));
                             break;
                         }
                     }
@@ -1391,13 +1391,13 @@ namespace drawinglayer
                     if(rFillHatchAttribute.isFillBackground())
                     {
                         // with fixing #i111954# (see below) the possible background
-                        // fill of a hatched object was lost.Generate a background fill
+                        // fill of a hatched object was lost.Generate a background fill 
                         // primitive and render it
                         const primitive2d::Primitive2DReference xBackground(
                             new primitive2d::PolyPolygonColorPrimitive2D(
-                                aLocalPolyPolygon,
+                                aLocalPolyPolygon, 
                                 rHatchCandidate.getBackgroundColor()));
-
+                        
                         process(primitive2d::Primitive2DSequence(&xBackground, 1));
                     }
 
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 402b4ef3f6..402b4ef3f6 100644..100755
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 5efa94ee78..5efa94ee78 100644..100755
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index 9636c6b295..9636c6b295 100644..100755
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
index 2b1f67e94a..2b1f67e94a 100644..100755
--- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 8768d25dc3..8768d25dc3 100644..100755
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 7a422bc8d8..7a422bc8d8 100644..100755
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
diff --git a/drawinglayer/source/processor3d/makefile.mk b/drawinglayer/source/processor3d/makefile.mk
index 6b739b6e3d..6b739b6e3d 100644..100755
--- a/drawinglayer/source/processor3d/makefile.mk
+++ b/drawinglayer/source/processor3d/makefile.mk
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 2a71d97a29..2a71d97a29 100644..100755
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index b210d64c98..b210d64c98 100644..100755
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
diff --git a/drawinglayer/source/texture/makefile.mk b/drawinglayer/source/texture/makefile.mk
index d0cf722afc..d0cf722afc 100644..100755
--- a/drawinglayer/source/texture/makefile.mk
+++ b/drawinglayer/source/texture/makefile.mk
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index f3b2db62ad..f3b2db62ad 100644..100755
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index f93e85fd91..f93e85fd91 100644..100755
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
diff --git a/drawinglayer/util/drawinglayer.flt b/drawinglayer/util/drawinglayer.flt
index 28a1dd1b65..28a1dd1b65 100644..100755
--- a/drawinglayer/util/drawinglayer.flt
+++ b/drawinglayer/util/drawinglayer.flt
diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk
index 3de5c47603..3de5c47603 100644..100755
--- a/drawinglayer/util/makefile.mk
+++ b/drawinglayer/util/makefile.mk
diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/editeng/AllLangResTarget_editeng.mk
index be761c54fa..e2bd16e488 100644..100755
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/editeng/AllLangResTarget_editeng.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,25 +24,27 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ = ..$/..$/..$/..
-TARGET  = checkdispatchapi
-PRJNAME = framework
-PACKAGE = complex$/dispatches$/helper
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,editeng))
 
+$(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx))
 
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  Generator.jar OOoRunner.jar
-JAVAFILES       = Interceptor.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
+$(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res))
+$(eval $(call gb_SrsTarget_SrsTarget,editeng/res))
 
+$(eval $(call gb_SrsTarget_set_include,editeng/res,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/editeng/inc \
+))
 
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,editeng/res,\
+    editeng/source/accessibility/accessibility.src \
+    editeng/source/editeng/editeng.src \
+    editeng/source/items/page.src \
+    editeng/source/items/svxitems.src \
+    editeng/source/misc/lingu.src \
+    editeng/source/outliner/outliner.src \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
new file mode 100755
index 0000000000..9213abedd3
--- /dev/null
+++ b/editeng/Library_editeng.mk
@@ -0,0 +1,167 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,editeng))
+
+$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng))
+
+$(eval $(call gb_Library_set_include,editeng,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/editeng/inc/pch \
+    -I$(SRCDIR)/editeng/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,editeng,\
+    $$(DEFS) \
+    -DEDITENG_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(EDITDEBUG)),)
+$(eval $(call gb_Library_set_defs,editeng,\
+    $$(DEFS) \
+    -DEDITDEBUG \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,editeng,\
+    editeng/inc/pch/precompiled_editeng \
+    editeng/source/accessibility/AccessibleComponentBase \
+    editeng/source/accessibility/AccessibleContextBase \
+    editeng/source/accessibility/AccessibleEditableTextPara \
+    editeng/source/accessibility/AccessibleHyperlink \
+    editeng/source/accessibility/AccessibleImageBullet \
+    editeng/source/accessibility/AccessibleParaManager \
+    editeng/source/accessibility/AccessibleSelectionBase \
+    editeng/source/accessibility/AccessibleStaticTextBase \
+    editeng/source/accessibility/AccessibleStringWrap \
+    editeng/source/editeng/editattr \
+    editeng/source/editeng/editdbg \
+    editeng/source/editeng/editdoc \
+    editeng/source/editeng/editdoc2 \
+    editeng/source/editeng/editeng \
+    editeng/source/editeng/editobj \
+    editeng/source/editeng/editsel \
+    editeng/source/editeng/editundo \
+    editeng/source/editeng/editview \
+    editeng/source/editeng/edtspell \
+    editeng/source/editeng/eehtml \
+    editeng/source/editeng/eeng_pch \
+    editeng/source/editeng/eeobj \
+    editeng/source/editeng/eerdll \
+    editeng/source/editeng/eertfpar \
+    editeng/source/editeng/impedit \
+    editeng/source/editeng/impedit2 \
+    editeng/source/editeng/impedit3 \
+    editeng/source/editeng/impedit4 \
+    editeng/source/editeng/impedit5 \
+    editeng/source/editeng/textconv \
+    editeng/source/items/bulitem \
+    editeng/source/items/charhiddenitem \
+    editeng/source/items/flditem \
+    editeng/source/items/frmitems \
+    editeng/source/items/itemtype \
+    editeng/source/items/numitem \
+    editeng/source/items/optitems \
+    editeng/source/items/paperinf \
+    editeng/source/items/paraitem \
+    editeng/source/items/svdfield \
+    editeng/source/items/svxfont \
+    editeng/source/items/textitem \
+    editeng/source/items/writingmodeitem \
+    editeng/source/items/xmlcnitm \
+    editeng/source/misc/acorrcfg \
+    editeng/source/misc/edtdlg \
+    editeng/source/misc/forbiddencharacterstable \
+    editeng/source/misc/hangulhanja \
+    editeng/source/misc/splwrap \
+    editeng/source/misc/svxacorr \
+    editeng/source/misc/SvXMLAutoCorrectExport \
+    editeng/source/misc/SvXMLAutoCorrectImport \
+    editeng/source/misc/swafopt \
+    editeng/source/misc/txtrange \
+    editeng/source/misc/unolingu \
+    editeng/source/outliner/outleeng \
+    editeng/source/outliner/outlin2 \
+    editeng/source/outliner/outliner \
+    editeng/source/outliner/outlobj \
+    editeng/source/outliner/outlundo \
+    editeng/source/outliner/outlvw \
+    editeng/source/outliner/outl_pch \
+    editeng/source/outliner/paralist \
+    editeng/source/rtf/rtfgrf \
+    editeng/source/rtf/rtfitem \
+    editeng/source/rtf/svxrtf \
+    editeng/source/uno/unoedhlp \
+    editeng/source/uno/unoedprx \
+    editeng/source/uno/unoedsrc \
+    editeng/source/uno/unofdesc \
+    editeng/source/uno/unofield \
+    editeng/source/uno/UnoForbiddenCharsTable \
+    editeng/source/uno/unofored \
+    editeng/source/uno/unoforou \
+    editeng/source/uno/unoipset \
+    editeng/source/uno/unonrule \
+    editeng/source/uno/unopracc \
+    editeng/source/uno/unotext \
+    editeng/source/uno/unotext2 \
+    editeng/source/uno/unoviwed \
+    editeng/source/uno/unoviwou \
+    editeng/source/xml/xmltxtexp \
+    editeng/source/xml/xmltxtimp \
+))
+
+# add libraries to be linked to editeng; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,editeng,\
+    xo \
+    basegfx \
+    lng \
+    svt \
+    tk \
+    vcl \
+    svl \
+    stl \
+    sot \
+    utl \
+    tl \
+    comphelper \
+    ucbhelper \
+    cppuhelper \
+    cppu \
+    vos3 \
+    sal \
+    icuuc \
+    i18nisolang1 \
+    i18npaper \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/svx/util/makefile.pmk b/editeng/Makefile
index e0fffdb1fd..a79aff8310 100644..100755
--- a/svx/util/makefile.pmk
+++ b/editeng/Makefile
@@ -25,19 +25,14 @@
 #
 #*************************************************************************
 
-# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h)
-CDEFS += -DSVX_DLLIMPLEMENTATION
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
-.ENDIF
-
-VISIBILITY_HIDDEN=TRUE
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/inc/makefile.mk b/editeng/Module_editeng.mk
index c445026b8d..4a5dbcf306 100644..100755
--- a/editeng/inc/makefile.mk
+++ b/editeng/Module_editeng.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,24 +25,21 @@
 #
 #*************************************************************************
 
-PRJ=..
+$(eval $(call gb_Module_Module,editeng))
 
-PRJNAME=editeng
-TARGET=inc
+$(eval $(call gb_Module_add_targets,editeng,\
+    AllLangResTarget_editeng \
+    Library_editeng \
+    Package_inc \
+))
 
-# --- Settings -----------------------------------------------------
+# add any runtime tests (unit tests) here
+# remove if no tests
+$(eval $(call gb_Module_add_check_targets,editeng,\
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+# add any subsequent checks (e.g. complex tests) here
+$(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
new file mode 100755
index 0000000000..d0c984a78a
--- /dev/null
+++ b/editeng/Package_inc.mk
@@ -0,0 +1,154 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,editeng_inc,$(SRCDIR)/editeng/inc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleComponentBase.hxx,editeng/AccessibleComponentBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleContextBase.hxx,editeng/AccessibleContextBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleEditableTextPara.hxx,editeng/AccessibleEditableTextPara.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleImageBullet.hxx,editeng/AccessibleImageBullet.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleParaManager.hxx,editeng/AccessibleParaManager.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBase.hxx,editeng/AccessibleSelectionBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjitem.hxx,editeng/adjitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/akrnitem.hxx,editeng/akrnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blnkitem.hxx,editeng/blnkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bolnitem.hxx,editeng/bolnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brkitem.hxx,editeng/brkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brshitem.hxx,editeng/brshitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulitem.hxx,editeng/bulitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cntritem.hxx,editeng/cntritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crsditem.hxx,editeng/crsditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cscoitem.hxx,editeng/cscoitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editerr.hxx,editeng/editerr.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editids.hrc,editeng/editids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editobj.hxx,editeng/editobj.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editrids.hrc,editeng/editrids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editstat.hxx,editeng/editstat.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editund2.hxx,editeng/editund2.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editview.hxx,editeng/editview.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/edtdlg.hxx,editeng/edtdlg.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eedata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphitem.hxx,editeng/emphitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escpitem.hxx,editeng/escpitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flstitem.hxx,editeng/flstitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fontitem.hxx,editeng/fontitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddencharacterstable.hxx,editeng/forbiddencharacterstable.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddenruleitem.hxx,editeng/forbiddenruleitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdir.hxx,editeng/frmdir.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng/frmdiritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyznitem.hxx,editeng/hyznitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/kernitem.hxx,editeng/kernitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/langitem.hxx,editeng/langitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lcolitem.hxx,editeng/lcolitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lrspitem.hxx,editeng/lrspitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lspcitem.hxx,editeng/lspcitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/measfld.hxx,editeng/measfld.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/memberids.hrc,editeng/memberids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/mutxhelp.hxx,editeng/mutxhelp.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nhypitem.hxx,editeng/nhypitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nlbkitem.hxx,editeng/nlbkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numdef.hxx,editeng/numdef.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numitem.hxx,editeng/numitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/opaqitem.hxx,editeng/opaqitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/optitems.hxx,editeng/optitems.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/orphitem.hxx,editeng/orphitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outliner.hxx,editeng/outliner.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outlobj.hxx,editeng/outlobj.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paperinf.hxx,editeng/paperinf.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paragraphdata.hxx,editeng/paragraphdata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paravertalignitem.hxx,editeng/paravertalignitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pbinitem.hxx,editeng/pbinitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pgrditem.hxx,editeng/pgrditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pmdlitem.hxx,editeng/pmdlitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/postitem.hxx,editeng/postitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prntitem.hxx,editeng/prntitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/protitem.hxx,editeng/protitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prszitem.hxx,editeng/prszitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scriptspaceitem.hxx,editeng/scriptspaceitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scripttypeitem.hxx,editeng/scripttypeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shaditem.hxx,editeng/shaditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shdditem.hxx,editeng/shdditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/sizeitem.hxx,editeng/sizeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/SpellPortions.hxx,editeng/SpellPortions.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/spltitem.hxx,editeng/spltitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/splwrap.hxx,editeng/splwrap.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxacorr.hxx,editeng/svxacorr.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxenum.hxx,editeng/svxenum.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxfont.hxx,editeng/svxfont.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxrtf.hxx,editeng/svxrtf.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/swafopt.hxx,editeng/swafopt.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/tstpitem.hxx,editeng/tstpitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/twolinesitem.hxx,editeng/twolinesitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/txtrange.hxx,editeng/txtrange.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/udlnitem.hxx,editeng/udlnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/ulspitem.hxx,editeng/ulspitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedhlp.hxx,editeng/unoedhlp.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedprx.hxx,editeng/unoedprx.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedsrc.hxx,editeng/unoedsrc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofdesc.hxx,editeng/unofdesc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofield.hxx,editeng/unofield.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/UnoForbiddenCharsTable.hxx,editeng/UnoForbiddenCharsTable.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofored.hxx,editeng/unofored.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoforou.hxx,editeng/unoforou.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoipset.hxx,editeng/unoipset.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unolingu.hxx,editeng/unolingu.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unonrule.hxx,editeng/unonrule.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unopracc.hxx,editeng/unopracc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoprnms.hxx,editeng/unoprnms.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unotext.hxx,editeng/unotext.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwed.hxx,editeng/unoviwed.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwou.hxx,editeng/unoviwou.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wghtitem.hxx,editeng/wghtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/widwitem.hxx,editeng/widwitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/writingmodeitem.hxx,editeng/writingmodeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wrlmitem.hxx,editeng/wrlmitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/xmlcnitm.hxx,editeng/xmlcnitm.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc
index 66fcf0cb92..66fcf0cb92 100644..100755
--- a/editeng/inc/editeng.hrc
+++ b/editeng/inc/editeng.hrc
diff --git a/editeng/inc/editeng/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx
index d2b41b9f63..d2b41b9f63 100644..100755
--- a/editeng/inc/editeng/AccessibleComponentBase.hxx
+++ b/editeng/inc/editeng/AccessibleComponentBase.hxx
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index a9e3c321d4..4c0552d91b 100644..100755
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -345,8 +345,8 @@ protected:
     /** Check whether or not the object has been disposed (or is in the
         state of beeing disposed). 
 
-        @return sal_True, if the object is disposed or in the course
-        of being disposed. Otherwise, sal_False is returned.
+        @return TRUE, if the object is disposed or in the course
+        of being disposed. Otherwise, FALSE is returned.
     */
     sal_Bool IsDisposed (void);
 
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index 365290ac80..385633dfa3 100644..100755
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -320,7 +320,7 @@ namespace accessibility
 
             @return sal_False, if the method was not able to determine the range
          */
-        sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex );
+        sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex );
 
         // syntactic sugar for FireEvent
         void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
@@ -353,13 +353,13 @@ namespace accessibility
         // Get text from forwarder
         String GetText( sal_Int32 nIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
         String GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-        USHORT GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException));
+        sal_uInt16 GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException));
 
         /** Get the current selection of this paragraph
 
             @return sal_False, if nothing in this paragraph is selected
          */
-        sal_Bool GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+        sal_Bool GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((::com::sun::star::uno::RuntimeException));
 
         /** create selection from Accessible selection.
 
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index 444917fede..444917fede 100644..100755
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx
index e3c538ba6a..e3c538ba6a 100644..100755
--- a/editeng/inc/editeng/AccessibleParaManager.hxx
+++ b/editeng/inc/editeng/AccessibleParaManager.hxx
diff --git a/editeng/inc/editeng/AccessibleSelectionBase.hxx b/editeng/inc/editeng/AccessibleSelectionBase.hxx
index fd39bd960a..fd39bd960a 100644..100755
--- a/editeng/inc/editeng/AccessibleSelectionBase.hxx
+++ b/editeng/inc/editeng/AccessibleSelectionBase.hxx
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index 4edc38ced9..4edc38ced9 100644..100755
--- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
diff --git a/editeng/inc/editeng/AccessibleStringWrap.hxx b/editeng/inc/editeng/AccessibleStringWrap.hxx
index b833e091ba..b833e091ba 100644..100755
--- a/editeng/inc/editeng/AccessibleStringWrap.hxx
+++ b/editeng/inc/editeng/AccessibleStringWrap.hxx
diff --git a/editeng/inc/editeng/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx
index e13aed8a26..e13aed8a26 100644..100755
--- a/editeng/inc/editeng/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index f34e2d260e..f34e2d260e 100644..100755
--- a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
diff --git a/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index f9d62672d8..f9d62672d8 100644..100755
--- a/editeng/inc/editeng/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index b2d9394ad5..ad4bf30393 100644..100755
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -47,45 +47,45 @@ namespace rtl
 [Description]
 This item describes the row orientation.
 */
-#define	ADJUST_LASTBLOCK_VERSION		((USHORT)0x0001)
+#define	ADJUST_LASTBLOCK_VERSION		((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
 {
-    BOOL    bLeft      : 1;
-    BOOL    bRight     : 1;
-    BOOL    bCenter    : 1;
-    BOOL    bBlock     : 1;
+    sal_Bool    bLeft      : 1;
+    sal_Bool    bRight     : 1;
+    sal_Bool    bCenter    : 1;
+    sal_Bool    bBlock     : 1;
 
     // only activ when bBlock
-    BOOL    bOneBlock : 1;
-    BOOL    bLastCenter : 1;
-    BOOL    bLastBlock : 1;
+    sal_Bool    bOneBlock : 1;
+    sal_Bool    bLastCenter : 1;
+    sal_Bool    bLastBlock : 1;
 
     friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
 public:
     TYPEINFO();
 
     SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
-                   const USHORT nId );
+                   const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT			 GetValueCount() const;
-    virtual String			 GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT			 GetEnumValue() const;
-    virtual void			 SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16			 GetValueCount() const;
+    virtual String			 GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16			 GetEnumValue() const;
+    virtual void			 SetEnumValue( sal_uInt16 nNewVal );
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
 
     inline void SetOneWord( const SvxAdjust eType )
     {
diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index 6b3972e5bf..47860ddd1a 100644..100755
--- a/editeng/inc/editeng/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -51,13 +51,13 @@ class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxAutoKernItem( const BOOL bAutoKern /*= FALSE*/,
-                     const USHORT nId );
+    SvxAutoKernItem( const sal_Bool bAutoKern /*= sal_False*/,
+                     const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index 6b96d2de44..2384a48892 100644..100755
--- a/editeng/inc/editeng/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -52,12 +52,12 @@ class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxBlinkItem( const BOOL bBlink /*= FALSE*/, const USHORT nId  );
+    SvxBlinkItem( const sal_Bool bBlink /*= sal_False*/, const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index c523705d9b..aa6bcbf6a1 100644..100755
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -52,13 +52,13 @@ class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxLineItem( const USHORT nId );
+    SvxLineItem( const sal_uInt16 nId );
     SvxLineItem( const SvxLineItem& rCpy );
     ~SvxLineItem();
     SvxLineItem &operator=( const SvxLineItem& rLine );
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index ecaf3ce93f..9acb60e24a 100644..100755
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -102,37 +102,37 @@ class EDITENG_DLLPUBLIC SvxBorderLine
 {
 protected:
     Color  aColor;
-    USHORT nOutWidth;
-    USHORT nInWidth;
-    USHORT nDistance;
     SvxBorderStyle   m_nStyle;
+    sal_uInt16 nOutWidth;
+    sal_uInt16 nInWidth;
+    sal_uInt16 nDistance;
 
 public:
-    SvxBorderLine( const Color *pCol = 0, USHORT nOut = 0, USHORT nIn = 0, USHORT nDist = 0,
-           SvxBorderStyle nStyle = SOLID );
+    SvxBorderLine( const Color *pCol = 0, sal_uInt16 nOut = 0, sal_uInt16 nIn = 0, sal_uInt16 nDist = 0,
+                   SvxBorderStyle nStyle = SOLID );
     SvxBorderLine( const SvxBorderLine& r );
 
     SvxBorderLine& operator=( const SvxBorderLine& r );
 
     const Color&	GetColor() const { return aColor; }
-    USHORT 			GetOutWidth() const { return nOutWidth; }
-    USHORT 			GetInWidth() const { return nInWidth; }
-    USHORT 			GetDistance() const { return nDistance; }
+    sal_uInt16 			GetOutWidth() const { return nOutWidth; }
+    sal_uInt16 			GetInWidth() const { return nInWidth; }
+    sal_uInt16 			GetDistance() const { return nDistance; }
 
     SvxBorderStyle  GetStyle() const { return m_nStyle; }
 
     void 			SetColor( const Color &rColor ) { aColor = rColor; }
-    void			SetOutWidth( USHORT nNew ) { nOutWidth = nNew; }
-    void			SetInWidth( USHORT nNew ) { nInWidth = nNew;  }
-    void			SetDistance( USHORT nNew ) { nDistance = nNew; }
     void            SetStyle( SvxBorderStyle nNew ) { m_nStyle = nNew; }
+    void			SetOutWidth( sal_uInt16 nNew ) { nOutWidth = nNew; }
+    void			SetInWidth( sal_uInt16 nNew ) { nInWidth = nNew;  }
+    void			SetDistance( sal_uInt16 nNew ) { nDistance = nNew; }
     void			ScaleMetrics( long nMult, long nDiv );
 
-    BOOL			operator==( const SvxBorderLine &rCmp ) const;
+    sal_Bool			operator==( const SvxBorderLine &rCmp ) const;
 
     String          GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit,
                                     const IntlWrapper* pIntl,
-                                    BOOL bMetricStr = FALSE ) const;
+                                    sal_Bool bMetricStr = sal_False ) const;
 
     bool			HasPriority( const SvxBorderLine& rOtherLine ) const;
 
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 68f34db2b4..eb3cbc1ec6 100644..100755
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -43,12 +43,12 @@ namespace rtl { class OUString; }
     (all four edges and the inward distance)
 */
 
-#define BOX_LINE_TOP	((USHORT)0)
-#define BOX_LINE_BOTTOM	((USHORT)1)
-#define BOX_LINE_LEFT	((USHORT)2)
-#define BOX_LINE_RIGHT	((USHORT)3)
+#define BOX_LINE_TOP	((sal_uInt16)0)
+#define BOX_LINE_BOTTOM	((sal_uInt16)1)
+#define BOX_LINE_LEFT	((sal_uInt16)2)
+#define BOX_LINE_RIGHT	((sal_uInt16)3)
 
-#define BOX_4DISTS_VERSION ((USHORT)1)
+#define BOX_4DISTS_VERSION ((sal_uInt16)1)
 
 class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 {
@@ -56,7 +56,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
                    *pBottom,
                    *pLeft,
                    *pRight;
-    USHORT			nTopDist,
+    sal_uInt16			nTopDist,
                     nBottomDist,
                     nLeftDist,
                     nRightDist;
@@ -64,15 +64,15 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxBoxItem( const USHORT nId );
+    SvxBoxItem( const sal_uInt16 nId );
     SvxBoxItem( const SvxBoxItem &rCpy );
     ~SvxBoxItem();
     SvxBoxItem &operator=( const SvxBoxItem& rBox );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -80,9 +80,9 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual bool             ScaleMetrics( long nMult, long nDiv );
     virtual	bool             HasMetrics() const;
@@ -92,26 +92,26 @@ public:
     const	SvxBorderLine* GetLeft()   const { return pLeft; }
     const	SvxBorderLine* GetRight()  const { return pRight; }
 
-    const	SvxBorderLine* GetLine( USHORT nLine ) const;
+    const	SvxBorderLine* GetLine( sal_uInt16 nLine ) const;
 
         //The Pointers are being copied!
-    void	SetLine( const SvxBorderLine* pNew, USHORT nLine );
+    void	SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine );
 
-    USHORT	GetDistance( USHORT nLine ) const;
-    USHORT	GetDistance() const;
+    sal_uInt16	GetDistance( sal_uInt16 nLine ) const;
+    sal_uInt16	GetDistance() const;
 
-    void 	SetDistance( USHORT nNew, USHORT nLine );
-    inline void SetDistance( USHORT nNew );
+    void 	SetDistance( sal_uInt16 nNew, sal_uInt16 nLine );
+    inline void SetDistance( sal_uInt16 nNew );
 
         // Line width plus Space plus inward distance
         //bIgnoreLine = TRUE -> Also return distance, when no Line is set
-    USHORT 	CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const;
-    static com::sun::star::table::BorderLine2 SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert );
+    sal_uInt16 	CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine = sal_False ) const;
+    static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert );
     static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
     static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
 };
 
-inline void SvxBoxItem::SetDistance( USHORT nNew )
+inline void SvxBoxItem::SetDistance( sal_uInt16 nNew )
 {
     nTopDist = nBottomDist = nLeftDist = nRightDist = nNew;
 }
@@ -126,8 +126,8 @@ inline void SvxBoxItem::SetDistance( USHORT nNew )
     transported the borderline for the inner horizontal and vertical lines.
 */
 
-#define BOXINFO_LINE_HORI	((USHORT)0)
-#define BOXINFO_LINE_VERT	((USHORT)1)
+#define BOXINFO_LINE_HORI	((sal_uInt16)0)
+#define BOXINFO_LINE_VERT	((sal_uInt16)1)
 
 #define VALID_TOP			0x01
 #define VALID_BOTTOM		0x02
@@ -156,25 +156,25 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
      forth to the dialogue.
     */
 
-    BOOL	bDist      :1;  // TRUE, Unlock Distance.
-    BOOL	bMinDist   :1;  // TRUE, Going below minimum Distance is prohibited
+    sal_Bool	bDist      :1;  // TRUE, Unlock Distance.
+    sal_Bool	bMinDist   :1;  // TRUE, Going below minimum Distance is prohibited
 
-    BYTE	nValidFlags;	// 0000 0000
-                            // ³³³³ ³³³ÀÄ VALID_TOP
-                            // ³³³³ ³³ÀÄÄ VALID_BOTTOM
-                            // ³³³³ ³ÀÄÄÄ VALID_LEFT
-                            // ³³³³ ÀÄÄÄÄ VALID_RIGHT
-                            // ³³³ÀÄÄÄÄÄÄ VALID_HORI
-                            // ³³ÀÄÄÄÄÄÄÄ VALID_VERT
-                            // ³ÀÄÄÄÄÄÄÄÄ VALID_DIST
-                            // ÀÄÄÄÄÄÄÄÄÄ VALID_DISABLE
+    sal_uInt8	nValidFlags;	// 0000 0000
+                            // ³³³³ ³³³ÀÄ VALID_TOP
+                            // ³³³³ ³³ÀÄÄ VALID_BOTTOM
+                            // ³³³³ ³ÀÄÄÄ VALID_LEFT
+                            // ³³³³ ÀÄÄÄÄ VALID_RIGHT
+                            // ³³³ÀÄÄÄÄÄÄ VALID_HORI
+                            // ³³ÀÄÄÄÄÄÄÄ VALID_VERT
+                            // ³ÀÄÄÄÄÄÄÄÄ VALID_DIST
+                            // ÀÄÄÄÄÄÄÄÄÄ VALID_DISABLE
 
-    USHORT	nDefDist;       // The default or minimum distance.
+    sal_uInt16	nDefDist;       // The default or minimum distance.
 
 public:
     TYPEINFO();
 
-    SvxBoxInfoItem( const USHORT nId );
+    SvxBoxInfoItem( const sal_uInt16 nId );
     SvxBoxInfoItem( const SvxBoxInfoItem &rCpy );
     ~SvxBoxInfoItem();
     SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy );
@@ -185,39 +185,39 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
-    virtual bool            ScaleMetrics( long nMult, long nDiv );
-    virtual	bool            HasMetrics() const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual int				 ScaleMetrics( long nMult, long nDiv );
+    virtual	int				 HasMetrics() const;
 
     const SvxBorderLine*	GetHori() const { return pHori; }
     const SvxBorderLine*	GetVert() const { return pVert; }
 
         //The Pointers are being copied!
-    void					SetLine( const SvxBorderLine* pNew, USHORT nLine );
+    void					SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine );
 
-    BOOL    IsTable() const             { return mbEnableHor && mbEnableVer; }
-    void    SetTable( BOOL bNew )       { mbEnableHor = mbEnableVer = bNew; }
+    sal_Bool    IsTable() const             { return mbEnableHor && mbEnableVer; }
+    void    SetTable( sal_Bool bNew )       { mbEnableHor = mbEnableVer = bNew; }
 
     inline bool         IsHorEnabled() const { return mbEnableHor; }
     inline void         EnableHor( bool bEnable ) { mbEnableHor = bEnable; }
     inline bool         IsVerEnabled() const { return mbEnableVer; }
     inline void         EnableVer( bool bEnable ) { mbEnableVer = bEnable; }
 
-    BOOL 	IsDist() const				{ return bDist; }
-    void 	SetDist( BOOL bNew )		{ bDist = bNew; }
-    BOOL 	IsMinDist() const			{ return bMinDist; }
-    void 	SetMinDist( BOOL bNew )		{ bMinDist = bNew; }
-    USHORT	GetDefDist() const			{ return nDefDist; }
-    void 	SetDefDist( USHORT nNew )	{ nDefDist = nNew; }
+    sal_Bool 	IsDist() const				{ return bDist; }
+    void 	SetDist( sal_Bool bNew )		{ bDist = bNew; }
+    sal_Bool 	IsMinDist() const			{ return bMinDist; }
+    void 	SetMinDist( sal_Bool bNew )		{ bMinDist = bNew; }
+    sal_uInt16	GetDefDist() const			{ return nDefDist; }
+    void 	SetDefDist( sal_uInt16 nNew )	{ nDefDist = nNew; }
 
-    BOOL					IsValid( BYTE nValid ) const
+    sal_Bool					IsValid( sal_uInt8 nValid ) const
                                 { return ( nValidFlags & nValid ) == nValid; }
-    void 					SetValid( BYTE nValid, BOOL bValid = TRUE )
+    void 					SetValid( sal_uInt8 nValid, sal_Bool bValid = sal_True )
                                 { bValid ? ( nValidFlags |= nValid )
                                          : ( nValidFlags &= ~nValid ); }
     void					ResetFlags();
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 244bafc0b3..bb697fa305 100644..100755
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -46,7 +46,7 @@ namespace rtl
     This item Describes a wrap-attribute
     Automatic?, Page or column break, before or after?
 */
-#define	FMTBREAK_NOAUTO	((USHORT)0x0001)
+#define	FMTBREAK_NOAUTO	((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
 {
@@ -54,39 +54,39 @@ public:
     TYPEINFO();
 
     inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
-                            const USHORT nWhich );
+                            const sal_uInt16 nWhich );
     inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
     inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual String			 GetValueTextByPos( USHORT nPos ) const;
+    virtual String			 GetValueTextByPos( sal_uInt16 nPos ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
-    virtual SfxPoolItem*	 Create( SvStream&, USHORT ) const;
-    virtual USHORT			 GetValueCount() const;
+    virtual SvStream&		 Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual SfxPoolItem*	 Create( SvStream&, sal_uInt16 ) const;
+    virtual sal_uInt16			 GetValueCount() const;
 
     // MS VC4.0 messes things up
-    void			 SetValue( USHORT nNewVal )
+    void			 SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
     SvxBreak			 GetBreak() const { return SvxBreak( GetValue() ); }
     void					 SetBreak( const SvxBreak eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 
 inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
-                                         const USHORT _nWhich ) :
-    SfxEnumItem( _nWhich, (USHORT)eBreak )
+                                         const sal_uInt16 _nWhich ) :
+    SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
 {}
 
 inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 025c39161e..3fe014ab3d 100644..100755
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -45,7 +45,7 @@ namespace rtl
     class OUString;
 }
 
-#define	BRUSH_GRAPHIC_VERSION	((USHORT)0x0001)
+#define	BRUSH_GRAPHIC_VERSION	((sal_uInt16)0x0001)
 
 enum SvxGraphicPosition
 {
@@ -67,28 +67,28 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
     String*				pStrLink;
     String*				pStrFilter;
     SvxGraphicPosition	eGraphicPos;
-    BOOL				bLoadAgain;
+    sal_Bool				bLoadAgain;
 
     void        ApplyGraphicTransparency_Impl();
     DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *);
     // wird nur von Create benutzt
     SvxBrushItem( SvStream& rStrm,
-                  USHORT nVersion, USHORT nWhich  );
+                  sal_uInt16 nVersion, sal_uInt16 nWhich  );
 
 public:
     TYPEINFO();
 
-    SvxBrushItem( USHORT nWhich );
-    SvxBrushItem( const Color& rColor, USHORT nWhich  );
+    SvxBrushItem( sal_uInt16 nWhich );
+    SvxBrushItem( const Color& rColor, sal_uInt16 nWhich  );
 
     SvxBrushItem( const Graphic& rGraphic,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const GraphicObject& rGraphicObj,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const String& rLink, const String& rFilter,
-                  SvxGraphicPosition ePos, USHORT nWhich );
+                  SvxGraphicPosition ePos, sal_uInt16 nWhich );
     SvxBrushItem( const SvxBrushItem& );
-    SvxBrushItem( const CntWallpaperItem&, USHORT nWhich );
+    SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich );
 
     ~SvxBrushItem();
 
@@ -100,13 +100,13 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	 Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&		 Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
 
     const Color& 	GetColor() const 				{ return aColor; }
     Color& 			GetColor()  					{ return aColor; }
diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 36e31e48a2..94e11dd072 100644..100755
--- a/editeng/inc/editeng/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -76,13 +76,13 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
     GraphicObject*  pGraphicObject;
     String          aPrevText;
     String          aFollowText;
-    USHORT          nStart;
-    USHORT          nStyle;
+    sal_uInt16          nStart;
+    sal_uInt16          nStyle;
     long            nWidth;
-    USHORT          nScale;
+    sal_uInt16          nScale;
     sal_Unicode     cSymbol;
-    BYTE            nJustify;
-    USHORT          nValidMask; // Only temporary for GetAttribs / setAttribs,
+    sal_uInt8       nJustify;
+    sal_uInt16      nValidMask; // Only temporary for GetAttribs / setAttribs,
                                 // because of the large Bullets
 
 #ifdef _SVX_BULITEM_CXX
@@ -93,30 +93,30 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxBulletItem( USHORT nWhich = 0 );
-    SvxBulletItem( BYTE nStyle, const Font& rFont, USHORT nStart = 0, USHORT nWhich = 0 );
-    SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, USHORT nWhich=0 );
-    SvxBulletItem( const Bitmap&, USHORT nWhich = 0 );
-    SvxBulletItem( const GraphicObject&, USHORT nWhich = 0 );
-    SvxBulletItem( SvStream& rStrm, USHORT nWhich = 0 );
+    SvxBulletItem( sal_uInt16 nWhich = 0 );
+    SvxBulletItem( sal_uInt8 nStyle, const Font& rFont, sal_uInt16 nStart = 0, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, sal_uInt16 nWhich=0 );
+    SvxBulletItem( const Bitmap&, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( const GraphicObject&, sal_uInt16 nWhich = 0 );
+    SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 );
     SvxBulletItem( const SvxBulletItem& );
     ~SvxBulletItem();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream & , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream & , sal_uInt16 nItemVersion ) const;
 
     String              GetFullText() const;
     sal_Unicode         GetSymbol() const { return cSymbol; }
     String              GetPrevText() const { return aPrevText; }
     String              GetFollowText() const { return aFollowText; }
 
-    USHORT              GetStart() const { return nStart; }
+    sal_uInt16              GetStart() const { return nStart; }
     long                GetWidth() const { return nWidth; }
-    USHORT              GetStyle() const { return nStyle; }
-    BYTE                GetJustification() const { return nJustify; }
+    sal_uInt16              GetStyle() const { return nStyle; }
+    sal_uInt8                GetJustification() const { return nJustify; }
     Font                GetFont() const { return aFont; }
-    USHORT              GetScale() const { return nScale; }
+    sal_uInt16              GetScale() const { return nScale; }
 
     Bitmap              GetBitmap() const;
     void                SetBitmap( const Bitmap& rBmp );
@@ -128,14 +128,14 @@ public:
     void                SetPrevText( const String& rStr) { aPrevText = rStr;}
     void                SetFollowText(const String& rStr) { aFollowText=rStr;}
 
-    void                SetStart( USHORT nNew ) { nStart = nNew; }
+    void                SetStart( sal_uInt16 nNew ) { nStart = nNew; }
     void                SetWidth( long nNew ) { nWidth = nNew; }
-    void                SetStyle( USHORT nNew ) { nStyle = nNew; }
-    void                SetJustification( BYTE nNew ) { nJustify = nNew; }
+    void                SetStyle( sal_uInt16 nNew ) { nStyle = nNew; }
+    void                SetJustification( sal_uInt8 nNew ) { nJustify = nNew; }
     void                SetFont( const Font& rNew) { aFont = rNew; }
-    void                SetScale( USHORT nNew ) { nScale = nNew; }
+    void                SetScale( sal_uInt16 nNew ) { nScale = nNew; }
 
-    virtual USHORT      GetVersion(USHORT nFileVersion) const;
+    virtual sal_uInt16      GetVersion(sal_uInt16 nFileVersion) const;
     virtual int         operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -143,12 +143,12 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     static void         StoreFont( SvStream&, const Font& );
-    static Font         CreateFont( SvStream&, USHORT nVer );
+    static Font         CreateFont( SvStream&, sal_uInt16 nVer );
 
-    USHORT&             GetValidMask()                  { return nValidMask;    }
-    USHORT              GetValidMask() const            { return nValidMask;    }
-    USHORT              IsValid( USHORT nFlag ) const   { return nValidMask & nFlag; }
-    void                SetValid( USHORT nFlag, BOOL bValid )
+    sal_uInt16&             GetValidMask()                  { return nValidMask;    }
+    sal_uInt16              GetValidMask() const            { return nValidMask;    }
+    sal_uInt16              IsValid( sal_uInt16 nFlag ) const   { return nValidMask & nFlag; }
+    void                SetValid( sal_uInt16 nFlag, sal_Bool bValid )
                         {
                             if ( bValid )
                                 nValidMask |= nFlag;
diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index 1f7d52e743..2ae454368d 100644..100755
--- a/editeng/inc/editeng/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxCharHiddenItem( const BOOL bHidden /*= FALSE*/, const USHORT nId );
+    SvxCharHiddenItem( const sal_Bool bHidden /*= sal_False*/, const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 148e8590d0..d32f3b4aeb 100644..100755
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -51,12 +51,12 @@ public:
                        const sal_uInt16 nId );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream& 		Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream& 		Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-     virtual USHORT			GetValueCount() const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+     virtual sal_uInt16			GetValueCount() const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,10 +64,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
     {
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index f085beb2fe..4e9e0ab44f 100644..100755
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -55,9 +55,9 @@ public:
                        const sal_uInt16 nId );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream& 		Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream& 		Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,10 +65,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
     {
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index 6c6e0db5b5..19967f6a23 100644..100755
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -52,9 +52,9 @@ public:
                             const sal_uInt16 nId );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store( SvStream& , USHORT nItemVersion ) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store( SvStream& , sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -62,10 +62,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool     PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool     QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
     {
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 791f7a2b1c..f4b747747b 100644..100755
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
 
     SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/,
-                    const USHORT nId );
+                    const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,13 +62,13 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
     // MS VC4.0 kommt durcheinander
-    void			 		SetValue( USHORT nNewVal )
+    void			 		SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
 
     inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
@@ -81,9 +81,9 @@ public:
     SvxCaseMap 				GetCaseMap() const
                                 { return (SvxCaseMap)GetValue(); }
     void 					SetCaseMap( SvxCaseMap eNew )
-                                { SetValue( (USHORT)eNew ); }
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+                                { SetValue( (sal_uInt16)eNew ); }
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index 6c539d1f0a..b3ea8892d6 100644..100755
--- a/editeng/inc/editeng/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -44,13 +44,13 @@ class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxContourItem( const BOOL bContoured /*= FALSE*/,
-                    const USHORT nId );
+    SvxContourItem( const sal_Bool bContoured /*= sal_False*/,
+                    const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index 24041ba57c..6d0373f122 100644..100755
--- a/editeng/inc/editeng/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -57,17 +57,17 @@ private:
 public:
     TYPEINFO();
 
-    SvxColorItem( const USHORT nId );
-    SvxColorItem( const Color& aColor, const USHORT nId  );
-    SvxColorItem( SvStream& rStrm, const USHORT nId  );
+    SvxColorItem( const sal_uInt16 nId );
+    SvxColorItem( const Color& aColor, const sal_uInt16 nId  );
+    SvxColorItem( SvStream& rStrm, const sal_uInt16 nId  );
     SvxColorItem( const SvxColorItem& rCopy );
     ~SvxColorItem();
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual	bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -75,8 +75,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline SvxColorItem& operator=(const SvxColorItem& rColor)
     {
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index a7264df3d3..2d67e5288a 100644..100755
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,20 +61,20 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16      GetValueCount() const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     // MS VC4.0 messes things up
-    void			 		SetValue( USHORT nNewVal )
+    void			 		SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
 
     virtual int 			HasBoolValue() const;
-    virtual BOOL			GetBoolValue() const;
-    virtual void			SetBoolValue( BOOL bVal );
+    virtual sal_Bool			GetBoolValue() const;
+    virtual void			SetBoolValue( sal_Bool bVal );
 
     inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross)
         {
@@ -86,7 +86,7 @@ public:
     FontStrikeout 			GetStrikeout() const
                                 { return (FontStrikeout)GetValue(); }
     void 					SetStrikeout( FontStrikeout eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_CRSDITEM_HXX
diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index b286f3429a..41067ffe93 100644..100755
--- a/editeng/inc/editeng/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -47,9 +47,9 @@ class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
 public:
     TYPEINFO();
 
-    SvxCharSetColorItem( const USHORT nId  );
+    SvxCharSetColorItem( const sal_uInt16 nId  );
     SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -58,8 +58,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline rtl_TextEncoding&	GetCharSet() { return eFrom; }
     inline rtl_TextEncoding 	GetCharSet() const { return eFrom; }
diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index 7921c3cd83..f5ef746005 100644..100755
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -110,7 +110,7 @@ class SfxStyleSheet;
 
 struct EPosition
 {
-    USHORT		nPara;
+    sal_uInt16		nPara;
     xub_StrLen	nIndex;
 
     EPosition() :
@@ -119,7 +119,7 @@ struct EPosition
     {
     }
 
-    EPosition( USHORT nPara_, xub_StrLen nPos_ ) :
+    EPosition( sal_uInt16 nPara_, xub_StrLen nPos_ ) :
         nPara( nPara_ ),
         nIndex( nPos_ )
     {
@@ -128,14 +128,14 @@ struct EPosition
 
 struct ESelection
 {
-    USHORT		nStartPara;
+    sal_uInt16		nStartPara;
     xub_StrLen	nStartPos;
-    USHORT		nEndPara;
+    sal_uInt16		nEndPara;
     xub_StrLen	nEndPos;
 
     ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {}
 
-    ESelection( USHORT nStPara, xub_StrLen nStPos, USHORT nEPara, xub_StrLen nEPos ) :
+    ESelection( sal_uInt16 nStPara, xub_StrLen nStPos, sal_uInt16 nEPara, xub_StrLen nEPos ) :
         nStartPara( nStPara ),
         nStartPos( nStPos ),
         nEndPara( nEPara ),
@@ -143,7 +143,7 @@ struct ESelection
     {
     }
 
-    ESelection( USHORT nPara, xub_StrLen nPos ) :
+    ESelection( sal_uInt16 nPara, xub_StrLen nPos ) :
         nStartPara( nPara ),
         nStartPos( nPos ),
         nEndPara( nPara ),
@@ -152,14 +152,14 @@ struct ESelection
     }
 
     void	Adjust();
-    BOOL    IsEqual( const ESelection& rS ) const;
-    BOOL    IsLess( const ESelection& rS ) const;
-    BOOL    IsGreater( const ESelection& rS ) const;
-    BOOL    IsZero() const;
-    BOOL	HasRange() const;
+    sal_Bool    IsEqual( const ESelection& rS ) const;
+    sal_Bool    IsLess( const ESelection& rS ) const;
+    sal_Bool    IsGreater( const ESelection& rS ) const;
+    sal_Bool    IsZero() const;
+    sal_Bool	HasRange() const;
 };
 
-inline BOOL ESelection::HasRange() const
+inline sal_Bool ESelection::HasRange() const
 {
     return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos );
 }
@@ -225,7 +225,7 @@ struct EDITENG_DLLPUBLIC EFieldInfo
     EPosition       aPosition;
 
     EFieldInfo();
-    EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos );
+    EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos );
     ~EFieldInfo();
 
     EFieldInfo( const EFieldInfo& );
@@ -283,24 +283,24 @@ struct ParagraphInfos
         , nFirstLineMaxAscent( 0 )
         , bValid( 0 )
         {}
-    USHORT	nParaHeight;
-    USHORT	nLines;
+    sal_uInt16	nParaHeight;
+    sal_uInt16	nLines;
 
-    USHORT	nFirstLineStartX;
+    sal_uInt16	nFirstLineStartX;
 
-    USHORT	nFirstLineOffset;
-    USHORT	nFirstLineHeight;
-    USHORT	nFirstLineTextHeight;
-    USHORT	nFirstLineMaxAscent;
+    sal_uInt16	nFirstLineOffset;
+    sal_uInt16	nFirstLineHeight;
+    sal_uInt16	nFirstLineTextHeight;
+    sal_uInt16	nFirstLineMaxAscent;
 
-    BOOL	bValid;	// A query during formatting is not valid!
+    sal_Bool	bValid;	// A query during formatting is not valid!
 };
 
 struct EECharAttrib
 {
     const SfxPoolItem*	pAttr;
 
-    USHORT				nPara;
+    sal_uInt16				nPara;
     xub_StrLen			nStart;
     xub_StrLen			nEnd;
 };
@@ -309,11 +309,11 @@ SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUB
 
 struct MoveParagraphsInfo
 {
-    USHORT  nStartPara;
-    USHORT  nEndPara;
-    USHORT  nDestPara;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
+    sal_uInt16  nDestPara;
 
-    MoveParagraphsInfo( USHORT nS, USHORT nE, USHORT nD )
+    MoveParagraphsInfo( sal_uInt16 nS, sal_uInt16 nE, sal_uInt16 nD )
         { nStartPara = nS; nEndPara = nE; nDestPara = nD; }
 };
 
@@ -322,9 +322,9 @@ struct MoveParagraphsInfo
 
 struct PasteOrDropInfos
 {
-    USHORT  nAction;
-    USHORT  nStartPara;
-    USHORT  nEndPara;
+    sal_uInt16  nAction;
+    sal_uInt16  nStartPara;
+    sal_uInt16  nEndPara;
 
     PasteOrDropInfos() : nAction(0), nStartPara(0xFFFF), nEndPara(0xFFFF)  {}
 };
@@ -377,10 +377,10 @@ struct EENotify
     EditEngine*     pEditEngine;
     EditView*       pEditView;
 
-    USHORT          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
+    sal_uInt16          nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED
 
-    USHORT          nParam1;
-    USHORT          nParam2;
+    sal_uInt16          nParam1;
+    sal_uInt16          nParam2;
 
     EENotify( EENotifyType eType )
         { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; }
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 000003d0de..b1a2e18b78 100644..100755
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -34,7 +34,6 @@ class EditView;
 class OutputDevice;
 class EditUndo;
 class SvxFont;
-class SfxUndoManager;
 class SfxItemPool;
 class SfxStyleSheet;
 class String;
@@ -85,6 +84,9 @@ namespace svx{
 struct SpellPortion;
 typedef std::vector<SpellPortion> SpellPortions;
 }
+namespace svl{
+class IUndoManager;
+}
 
 namespace basegfx { class B2DPolyPolygon; }
 #include <rsc/rscsfx.hxx>
@@ -122,7 +124,7 @@ private:
 
                     EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
     EDITENG_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
-    EDITENG_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
+    EDITENG_DLLPRIVATE sal_Bool	PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
 
 protected:
 
@@ -133,8 +135,8 @@ public:
 
     const SfxItemSet& 	GetEmptyItemSet();
 
-    void			SetDefTab( USHORT nDefTab );
-    USHORT			GetDefTab() const;
+    void			SetDefTab( sal_uInt16 nDefTab );
+    sal_uInt16			GetDefTab() const;
 
     void			SetRefDevice( OutputDevice* pRefDef );
     OutputDevice*	GetRefDevice() const;
@@ -142,51 +144,51 @@ public:
     void			SetRefMapMode( const MapMode& rMapMode );
     MapMode			GetRefMapMode();
 
-    void			SetUpdateMode( BOOL bUpdate );
-    BOOL			GetUpdateMode() const;
+    void			SetUpdateMode( sal_Bool bUpdate );
+    sal_Bool			GetUpdateMode() const;
 
     void			SetBackgroundColor( const Color& rColor );
     Color			GetBackgroundColor() const;
     Color			GetAutoColor() const;
-    void            EnableAutoColor( BOOL b );
-    BOOL            IsAutoColorEnabled() const;
-    void            ForceAutoColor( BOOL b );
-    BOOL            IsForceAutoColor() const;
+    void            EnableAutoColor( sal_Bool b );
+    sal_Bool            IsAutoColorEnabled() const;
+    void            ForceAutoColor( sal_Bool b );
+    sal_Bool            IsForceAutoColor() const;
 
-    void			InsertView( EditView* pEditView, USHORT nIndex = EE_APPEND );
+    void			InsertView( EditView* pEditView, sal_uInt16 nIndex = EE_APPEND );
     EditView*		RemoveView( EditView* pEditView );
-    EditView*		RemoveView( USHORT nIndex = EE_APPEND );
-    EditView*		GetView( USHORT nIndex = 0 ) const;
-    USHORT			GetViewCount() const;
-    BOOL			HasView( EditView* pView ) const;
+    EditView*		RemoveView( sal_uInt16 nIndex = EE_APPEND );
+    EditView*		GetView( sal_uInt16 nIndex = 0 ) const;
+    sal_uInt16			GetViewCount() const;
+    sal_Bool			HasView( EditView* pView ) const;
     EditView*		GetActiveView() const;
     void			SetActiveView( EditView* pView );
 
     void			SetPaperSize( const Size& rSize );
     const Size&		GetPaperSize() const;
 
-    void			SetVertical( BOOL bVertical );
-    BOOL			IsVertical() const;
+    void			SetVertical( sal_Bool bVertical );
+    sal_Bool			IsVertical() const;
 
-    void			SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL			IsFixedCellHeight() const;
+    void			SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool			IsFixedCellHeight() const;
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const;
 
-    USHORT			GetScriptType( const ESelection& rSelection ) const;
-    LanguageType    GetLanguage( USHORT nPara, USHORT nPos ) const;
+    sal_uInt16			GetScriptType( const ESelection& rSelection ) const;
+    LanguageType    GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const;
 
     void 			TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode );
 
-    void            SetAsianCompressionMode( USHORT nCompression );
-    USHORT          GetAsianCompressionMode() const;
+    void            SetAsianCompressionMode( sal_uInt16 nCompression );
+    sal_uInt16          GetAsianCompressionMode() const;
 
-    void            SetKernAsianPunctuation( BOOL bEnabled );
-    BOOL            IsKernAsianPunctuation() const;
+    void            SetKernAsianPunctuation( sal_Bool bEnabled );
+    sal_Bool            IsKernAsianPunctuation() const;
 
-    void            SetAddExtLeading( BOOL b );
-    BOOL            IsAddExtLeading() const;
+    void            SetAddExtLeading( sal_Bool b );
+    sal_Bool            IsAddExtLeading() const;
 
     void				SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon );
     void				SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
@@ -205,106 +207,107 @@ public:
     sal_uInt32		GetTextHeight() const;
     sal_uInt32		CalcTextWidth();
 
-    String 			GetText( USHORT nParagraph ) const;
-    xub_StrLen		GetTextLen( USHORT nParagraph ) const;
-    sal_uInt32		GetTextHeight( USHORT nParagraph ) const;
+    String 			GetText( sal_uInt16 nParagraph ) const;
+    xub_StrLen		GetTextLen( sal_uInt16 nParagraph ) const;
+    sal_uInt32		GetTextHeight( sal_uInt16 nParagraph ) const;
 
-    USHORT 			GetParagraphCount() const;
+    sal_uInt16 			GetParagraphCount() const;
 
-    USHORT			GetLineCount( USHORT nParagraph ) const;
-    xub_StrLen		GetLineLen( USHORT nParagraph, USHORT nLine ) const;
-    void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
-    sal_uInt32		GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
-    USHORT			GetFirstLineOffset( USHORT nParagraph );
-    ParagraphInfos 	GetParagraphInfos( USHORT nPara );
-    USHORT			FindParagraph( long nDocPosY );
+    sal_uInt16			GetLineCount( sal_uInt16 nParagraph ) const;
+    xub_StrLen		GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    sal_uInt32		GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine = 0 );
+    sal_uInt16			GetFirstLineOffset( sal_uInt16 nParagraph );
+    ParagraphInfos 	GetParagraphInfos( sal_uInt16 nPara );
+    sal_uInt16			FindParagraph( long nDocPosY );
     EPosition       FindDocPosition( const Point& rDocPos ) const;
     Rectangle       GetCharacterBounds( const EPosition& rPos ) const;
 
-    String			GetWord( USHORT nPara, xub_StrLen nIndex );
+    String			GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
 
-    ESelection      GetWord( const ESelection& rSelection, USHORT nWordType ) const;
-    ESelection      WordLeft( const ESelection& rSelection, USHORT nWordType  ) const;
-    ESelection      WordRight( const ESelection& rSelection, USHORT nWordType  ) const;
-    ESelection      CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
-    ESelection      CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const;
+    ESelection      GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const;
+    ESelection      WordLeft( const ESelection& rSelection, sal_uInt16 nWordType  ) const;
+    ESelection      WordRight( const ESelection& rSelection, sal_uInt16 nWordType  ) const;
+    ESelection      CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
+    ESelection      CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
     ESelection      SelectSentence( const ESelection& rCurSel ) const;
 
     void			Clear();
     void			SetText( const String& rStr );
 
     EditTextObject*	CreateTextObject();
-    EditTextObject*	CreateTextObject( USHORT nPara, USHORT nParas = 1 );
+    EditTextObject*	CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 );
     EditTextObject*	CreateTextObject( const ESelection& rESelection );
     void			SetText( const EditTextObject& rTextObject );
 
-    void			RemoveParagraph( USHORT nPara );
-    void			InsertParagraph( USHORT nPara, const EditTextObject& rTxtObj );
-    void			InsertParagraph( USHORT nPara, const String& rText);
+    void			RemoveParagraph( sal_uInt16 nPara );
+    void			InsertParagraph( sal_uInt16 nPara, const EditTextObject& rTxtObj );
+    void			InsertParagraph( sal_uInt16 nPara, const String& rText);
 
-    void			SetText( USHORT nPara, const EditTextObject& rTxtObj );
-    void			SetText( USHORT nPara, const String& rText);
+    void			SetText( sal_uInt16 nPara, const EditTextObject& rTxtObj );
+    void			SetText( sal_uInt16 nPara, const String& rText);
 
-    virtual void                SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
-    virtual const SfxItemSet&	GetParaAttribs( USHORT nPara ) const;
+    virtual void                SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
+    virtual const SfxItemSet&	GetParaAttribs( sal_uInt16 nPara ) const;
 
-    void				GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    void				GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    SfxItemSet          GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const;
-    SfxItemSet			GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All );
+    SfxItemSet          GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+    SfxItemSet			GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All );
 
-    BOOL				HasParaAttrib( USHORT nPara, USHORT nWhich ) const;
-    const SfxPoolItem&	GetParaAttrib( USHORT nPara, USHORT nWhich );
+    sal_Bool				HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
+    const SfxPoolItem&	GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich );
 
-    Font			GetStandardFont( USHORT nPara );
-    SvxFont			GetStandardSvxFont( USHORT nPara );
+    Font			GetStandardFont( sal_uInt16 nPara );
+    SvxFont			GetStandardSvxFont( sal_uInt16 nPara );
 
     void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
 
-    void			ShowParagraph( USHORT nParagraph, BOOL bShow = TRUE );
-    BOOL			IsParagraphVisible( USHORT nParagraph );
+    void			ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow = sal_True );
+    sal_Bool			IsParagraphVisible( sal_uInt16 nParagraph );
 
-    SfxUndoManager&	GetUndoManager();
-    void			UndoActionStart( USHORT nId );
-    void			UndoActionEnd( USHORT nId );
-    BOOL			IsInUndo();
+    ::svl::IUndoManager&
+                    GetUndoManager();
+    void			UndoActionStart( sal_uInt16 nId );
+    void			UndoActionEnd( sal_uInt16 nId );
+    sal_Bool		IsInUndo();
 
-    void			EnableUndo( BOOL bEnable );
-    BOOL			IsUndoEnabled();
+    void			EnableUndo( sal_Bool bEnable );
+    sal_Bool			IsUndoEnabled();
 
     /** returns the value last used for bTryMerge while calling ImpEditEngine::InsertUndo
         This is currently used in a bad but needed hack to get undo actions merged in the
         OutlineView in impress. Do not use it unless you want to sell your soul too! */
-    BOOL			HasTriedMergeOnLastAddUndo() const;
+    sal_Bool			HasTriedMergeOnLastAddUndo() const;
 
     void			ClearModifyFlag();
     void			SetModified();
-    BOOL			IsModified() const;
+    sal_Bool			IsModified() const;
 
     void			SetModifyHdl( const Link& rLink );
     Link			GetModifyHdl() const;
 
-    BOOL			IsInSelectionMode() const;
+    sal_Bool			IsInSelectionMode() const;
     void			StopSelectionMode();
 
     void			StripPortions();
-    void			GetPortions( USHORT nPara, SvUShorts& rList );
+    void			GetPortions( sal_uInt16 nPara, SvUShorts& rList );
 
-    long 			GetFirstLineStartX( USHORT nParagraph );
-    Point			GetDocPosTopLeft( USHORT nParagraph );
+    long 			GetFirstLineStartX( sal_uInt16 nParagraph );
+    Point			GetDocPosTopLeft( sal_uInt16 nParagraph );
     Point			GetDocPos( const Point& rPaperPos ) const;
-    BOOL			IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 );
+    sal_Bool			IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
 
     // StartDocPos corrresponds to VisArea.TopLeft().
     void			Draw( OutputDevice* pOutDev, const Rectangle& rOutRect );
     void			Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos );
-    void			Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, BOOL bClip );
+    void			Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, sal_Bool bClip );
     void			Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
 
-//  ULONG: Error code of the stream. 
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG			Write( SvStream& rOutput, EETextFormat );
+//  sal_uInt32: Error code of the stream. 
+        sal_uLong               Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong		Write( SvStream& rOutput, EETextFormat );
 
     void			SetStatusEventHdl( const Link& rLink );
     Link			GetStatusEventHdl() const;
@@ -316,25 +319,25 @@ public:
     Link			GetImportHdl() const;
 
     // Do not evaluate font formatting => For Outliner
-    BOOL			IsFlatMode() const;
-    void			SetFlatMode( BOOL bFlat );
+    sal_Bool			IsFlatMode() const;
+    void			SetFlatMode( sal_Bool bFlat );
 
     void			SetControlWord( sal_uInt32 nWord );
     sal_uInt32		GetControlWord() const;
 
     void			QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
-    void 			QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
+    void 			QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
     void			QuickMarkInvalid( const ESelection& rSel );
-    void 			QuickFormatDoc( BOOL bFull = FALSE );
+    void 			QuickFormatDoc( sal_Bool bFull = sal_False );
     void 			QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
     void 			QuickInsertLineBreak( const ESelection& rSel );
     void			QuickInsertText( const String& rText, const ESelection& rSel );
     void			QuickDelete( const ESelection& rSel );
-    void			QuickMarkToBeRepainted( USHORT nPara );
+    void			QuickMarkToBeRepainted( sal_uInt16 nPara );
 
-    void			SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 );
-    void			GetGlobalCharStretching( USHORT& rX, USHORT& rY );
-    void			DoStretchChars( USHORT nX, USHORT nY );
+    void			SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 );
+    void			GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+    void			DoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
 
     void			SetEditTextObjectPool( SfxItemPool* pPool );
     SfxItemPool* 	GetEditTextObjectPool() const;
@@ -342,8 +345,8 @@ public:
     void				SetStyleSheetPool( SfxStyleSheetPool* pSPool );
     SfxStyleSheetPool*	GetStyleSheetPool();
 
-    void				SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle );
-    SfxStyleSheet*		GetStyleSheet( USHORT nPara ) const;
+    void				SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle );
+    SfxStyleSheet*		GetStyleSheet( sal_uInt16 nPara ) const;
 
     void			SetWordDelimiters( const String& rDelimiters );
     String			GetWordDelimiters() const;
@@ -351,11 +354,11 @@ public:
     void			SetGroupChars( const String& rChars );
     String			GetGroupChars() const;
 
-    void			EnablePasteSpecial( BOOL bEnable );
-    BOOL			IsPasteSpecialEnabled() const;
+    void			EnablePasteSpecial( sal_Bool bEnable );
+    sal_Bool			IsPasteSpecialEnabled() const;
 
-    void			EnableIdleFormatter( BOOL bEnable );
-    BOOL			IsIdleFormatterEnabled() const;
+    void			EnableIdleFormatter( sal_Bool bEnable );
+    sal_Bool			IsIdleFormatterEnabled() const;
 
     void			EraseVirtualDevice();
 
@@ -376,16 +379,16 @@ public:
     void 			SetDefaultLanguage( LanguageType eLang );
     LanguageType	GetDefaultLanguage() const;
 
-    BOOL			HasOnlineSpellErrors() const;
+    sal_Bool			HasOnlineSpellErrors() const;
     void			CompleteOnlineSpelling();
 
-    void			SetBigTextObjectStart( USHORT nStartAtPortionCount );
-    USHORT			GetBigTextObjectStart() const;
-    BOOL			ShouldCreateBigTextObject() const;
+    void			SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount );
+    sal_uInt16			GetBigTextObjectStart() const;
+    sal_Bool			ShouldCreateBigTextObject() const;
 
     // For fast Pre-Test without view:
     EESpellState	HasSpellErrors();
-    BOOL			HasText( const SvxSearchItem& rSearchItem );
+    sal_Bool			HasText( const SvxSearchItem& rSearchItem );
 
     //initialize sentence spelling
     void            StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc);
@@ -400,15 +403,15 @@ public:
 
     // for text conversion (see also HasSpellErrors)
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
-    virtual BOOL    ConvertNextDocument();
+    virtual sal_Bool    ConvertNextDocument();
 
-    BOOL			UpdateFields();
-    void 			RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL );
+    sal_Bool			UpdateFields();
+    void 			RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL );
 
-    USHORT          GetFieldCount( USHORT nPara ) const;
-    EFieldInfo      GetFieldInfo( USHORT nPara, USHORT nField ) const;
+    sal_uInt16          GetFieldCount( sal_uInt16 nPara ) const;
+    EFieldInfo      GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
 
-    BOOL            IsRightToLeft( USHORT nPara ) const;
+    sal_Bool            IsRightToLeft( sal_uInt16 nPara ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
                     CreateTransferable( const ESelection& rSelection ) const;
@@ -419,17 +422,17 @@ public:
     void            SetBeginPasteOrDropHdl( const Link& rLink );
     void            SetEndPasteOrDropHdl( const Link& rLink );
 
-    virtual void	PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
-    virtual	void	ParagraphInserted( USHORT nNewParagraph );
-    virtual	void	ParagraphDeleted( USHORT nDeletedParagraph );
-    virtual void    ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph );
-    virtual	void	ParaAttribsChanged( USHORT nParagraph );
+    virtual void	PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+    virtual	void	ParagraphInserted( sal_uInt16 nNewParagraph );
+    virtual	void	ParagraphDeleted( sal_uInt16 nDeletedParagraph );
+    virtual void    ParagraphConnected( sal_uInt16 nLeftParagraph, sal_uInt16 nRightParagraph );
+    virtual	void	ParaAttribsChanged( sal_uInt16 nParagraph );
     virtual	void	StyleSheetChanged( SfxStyleSheet* pStyle );
-    virtual	void	ParagraphHeightChanged( USHORT nPara );
+    virtual	void	ParagraphHeightChanged( sal_uInt16 nPara );
 
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,
-        const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,
+        const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -441,39 +444,38 @@ public:
 
     virtual void DrawingTab(
         const Point& rStartPos, long nWidth, const String& rChar,
-        const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+        const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         bool bEndOfLine,
         bool bEndOfParagraph,
         const Color& rOverlineColor,
         const Color& rTextLineColor);
-
-    virtual String	GetUndoComment( USHORT nUndoId ) const;
-    virtual BOOL	FormattingParagraph( USHORT nPara );
-    virtual BOOL	SpellNextDocument();
-    virtual void 	FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual void	FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual String	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual String	GetUndoComment( sal_uInt16 nUndoId ) const;
+    virtual sal_Bool	FormattingParagraph( sal_uInt16 nPara );
+    virtual sal_Bool	SpellNextDocument();
+    virtual void 	FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual void	FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual String	CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
 
     // to be overloaded if access to bullet information needs to be provided
-    virtual const SvxNumberFormat * GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat * GetNumberFormat( sal_uInt16 nPara ) const;
 
-    virtual Rectangle GetBulletArea( USHORT nPara );
+    virtual Rectangle GetBulletArea( sal_uInt16 nPara );
 
-    static SfxItemPool*	CreatePool( BOOL bLoadRefCounts = TRUE );
+    static SfxItemPool*	CreatePool( sal_Bool bLoadRefCounts = sal_True );
     static SfxItemPool&	GetGlobalItemPool();
     static sal_uInt32	RegisterClipboardFormatName();
-    static BOOL		DoesKeyChangeText( const KeyEvent& rKeyEvent );
-    static BOOL		DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
-    static BOOL		IsSimpleCharInput( const KeyEvent& rKeyEvent );
-    static USHORT	GetAvailableSearchOptions();
+    static sal_Bool		DoesKeyChangeText( const KeyEvent& rKeyEvent );
+    static sal_Bool		DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
+    static sal_Bool		IsSimpleCharInput( const KeyEvent& rKeyEvent );
+    static sal_uInt16	GetAvailableSearchOptions();
     static void		SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont );
     static void		SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont );
     static Font		CreateFontFromItemSet( const SfxItemSet& rItemSet );
-    static Font		CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType );
+    static Font		CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType );
     static SvxFont	CreateSvxFontFromItemSet( const SfxItemSet& rItemSet );
-    static void		ImportBulletItem( SvxNumBulletItem& rNumBullet, USHORT nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
-    static BOOL 	IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
-    static BOOL     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
+    static void		ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
+    static sal_Bool 	IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
+    static sal_Bool     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
 
     /** sets a link that is called at the beginning of a drag operation at an edit view */
     void			SetBeginDropHdl( const Link& rLink );
@@ -484,8 +486,8 @@ public:
     Link			GetEndDropHdl() const;
 
     /// specifies if auto-correction should capitalize the first word or not (default is on)
-    void            SetFirstWordCapitalization( BOOL bCapitalize );
-    BOOL            IsFirstWordCapitalization() const;
+    void            SetFirstWordCapitalization( sal_Bool bCapitalize );
+    sal_Bool            IsFirstWordCapitalization() const;
 };
 
 #endif // _MyEDITENG_HXX
diff --git a/editeng/inc/editeng/editengdllapi.h b/editeng/inc/editeng/editengdllapi.h
index 6e916385ac..6e916385ac 100644..100755
--- a/editeng/inc/editeng/editengdllapi.h
+++ b/editeng/inc/editeng/editengdllapi.h
diff --git a/editeng/inc/editeng/editerr.hxx b/editeng/inc/editeng/editerr.hxx
index cb1968bb0f..cb1968bb0f 100644..100755
--- a/editeng/inc/editeng/editerr.hxx
+++ b/editeng/inc/editeng/editerr.hxx
diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc
index d48a6f3108..d48a6f3108 100644..100755
--- a/editeng/inc/editeng/editids.hrc
+++ b/editeng/inc/editeng/editids.hrc
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index a4741bf65a..3ac253c630 100644..100755
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -49,11 +49,11 @@ class EECharAttribArray;
 class EDITENG_DLLPUBLIC EditTextObject
 {
 private:
-    USHORT				nWhich;
+    sal_uInt16				nWhich;
     EDITENG_DLLPRIVATE EditTextObject&		operator=( const EditTextObject& );
 
 protected:
-                        EditTextObject( USHORT nWhich );
+                        EditTextObject( sal_uInt16 nWhich );
                         EditTextObject( const EditTextObject& r );
 
     virtual void		StoreData( SvStream& rOStream ) const;
@@ -62,59 +62,59 @@ protected:
 public:
     virtual				~EditTextObject();
 
-    USHORT				Which() const { return nWhich; }
+    sal_uInt16				Which() const { return nWhich; }
 
-    virtual USHORT		GetUserType() const;  // For OutlinerMode, it can however not save in compatible format
-    virtual void		SetUserType( USHORT n );
+    virtual sal_uInt16		GetUserType() const;	// For OutlinerMode, it can however not save in compatible format
+    virtual void		SetUserType( sal_uInt16 n );
 
-    virtual ULONG		GetObjectSettings() const;
-    virtual void		SetObjectSettings( ULONG n );
+    virtual sal_uLong		GetObjectSettings() const;
+    virtual void		SetObjectSettings( sal_uLong n );
 
-    virtual	BOOL		IsVertical() const;
-    virtual	void		SetVertical( BOOL bVertical );
+    virtual	sal_Bool		IsVertical() const;
+    virtual	void		SetVertical( sal_Bool bVertical );
 
-    virtual USHORT		GetScriptType() const;
+    virtual sal_uInt16		GetScriptType() const;
 
-    virtual USHORT		GetVersion() const;	// As long as the outliner does not store any record length.
+    virtual sal_uInt16		GetVersion() const;	// As long as the outliner does not store any record length.
 
     virtual EditTextObject*	Clone() const = 0;
 
-    BOOL					Store( SvStream& rOStream ) const;
+    sal_Bool					Store( SvStream& rOStream ) const;
     static EditTextObject*	Create( SvStream& rIStream,
                                 SfxItemPool* pGlobalTextObjectPool = 0 );
     void					Skip( SvStream& rIStream );
 
-    virtual USHORT		GetParagraphCount() const;
+    virtual sal_uInt16		GetParagraphCount() const;
 
-    virtual XubString	GetText( USHORT nParagraph ) const;
-    virtual void		Insert( const EditTextObject& rObj, USHORT nPara );
-    virtual void		RemoveParagraph( USHORT nPara );
-    virtual EditTextObject*	CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const;
+    virtual XubString	GetText( sal_uInt16 nParagraph ) const;
+    virtual void		Insert( const EditTextObject& rObj, sal_uInt16 nPara );
+    virtual void		RemoveParagraph( sal_uInt16 nPara );
+    virtual EditTextObject*	CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 ) const;
 
-    virtual BOOL		HasPortionInfo() const;
+    virtual sal_Bool		HasPortionInfo() const;
     virtual void		ClearPortionInfo();
 
-    virtual BOOL		HasOnlineSpellErrors() const;
+    virtual sal_Bool		HasOnlineSpellErrors() const;
 
-    virtual BOOL		HasCharAttribs( USHORT nWhich = 0 ) const;
-    virtual	void		GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    virtual sal_Bool		HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
+    virtual	void		GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    virtual BOOL		RemoveCharAttribs( USHORT nWhich = 0 );
-    virtual BOOL		RemoveParaAttribs( USHORT nWhich = 0 );
+    virtual sal_Bool		RemoveCharAttribs( sal_uInt16 nWhich = 0 );
+    virtual sal_Bool		RemoveParaAttribs( sal_uInt16 nWhich = 0 );
 
-    virtual	void		MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END );
+    virtual	void		MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart = EE_CHAR_START, sal_uInt16 nEnd = EE_CHAR_END );
 
-    virtual BOOL		IsFieldObject() const;
+    virtual sal_Bool		IsFieldObject() const;
     virtual const SvxFieldItem*	GetField() const;
-    virtual BOOL		HasField( TypeId aType = NULL ) const;
+    virtual sal_Bool		HasField( TypeId aType = NULL ) const;
 
-    virtual SfxItemSet	GetParaAttribs( USHORT nPara ) const;
-    virtual void		SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs );
+    virtual SfxItemSet	GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void		SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs );
 
-    virtual BOOL		HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
-    virtual void		GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
-    virtual void		SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
-    virtual BOOL		ChangeStyleSheets( 	const XubString& rOldName, SfxStyleFamily eOldFamily,
+    virtual sal_Bool		HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
+    virtual void		GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
+    virtual void		SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& eFamily );
+    virtual sal_Bool		ChangeStyleSheets( 	const XubString& rOldName, SfxStyleFamily eOldFamily,
                                             const XubString& rNewName, SfxStyleFamily eNewFamily );
     virtual void		ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
 
diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
index 00901b0feb..47350b3751 100644..100755
--- a/editeng/inc/editeng/editrids.hrc
+++ b/editeng/inc/editeng/editrids.hrc
@@ -237,45 +237,6 @@
 #define RID_SVXITEMS_WEIGHT_ULTRABOLD		(RID_EDIT_START + 167)
 #define RID_SVXITEMS_WEIGHT_BLACK			(RID_EDIT_START + 168)
 
-// paper formats
-#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 169)
-#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 170)	
-#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 171)	
-#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 172)	
-#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 173)	
-#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 174)	
-#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 175)	
-#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 176)	
-#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 177)	
-#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 178)	
-#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 179)	
-#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 180)	
-#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 181)	
-#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 182)	
-#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 183)	
-#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 184)	
-#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 185)	
-#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 186)	
-#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 187)	
-#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 188)	
-#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 189)	
-#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 190)	
-#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 191)	
-#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 192)	
-#define RID_SVXSTR_PAPER_LEGAL2				(RID_SVX_START + 193)	
-#define RID_SVXSTR_PAPER_MONARCH			(RID_SVX_START + 194)	
-#define RID_SVXSTR_PAPER_COM675				(RID_SVX_START + 195)	
-#define RID_SVXSTR_PAPER_COM9				(RID_SVX_START + 196)	
-#define RID_SVXSTR_PAPER_COM10				(RID_SVX_START + 197)	
-#define RID_SVXSTR_PAPER_COM11				(RID_SVX_START + 198)	
-#define RID_SVXSTR_PAPER_COM12				(RID_SVX_START + 199)	
-#define RID_SVXSTR_PAPER_KAI16				(RID_SVX_START + 200)	
-#define RID_SVXSTR_PAPER_KAI32				(RID_SVX_START + 201)	
-#define RID_SVXSTR_PAPER_KAI32BIG			(RID_SVX_START + 202)	
-#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 203)	
-#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 204)	
-#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 205)	
-
 // enum FontItalic -------------------------------------------------------
 #define RID_SVXITEMS_ITALIC_BEGIN			(RID_EDIT_START + 206)
 #define RID_SVXITEMS_ITALIC_NONE			(RID_EDIT_START + 206)
diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index 2b56c06b98..e554f721ff 100644..100755
--- a/editeng/inc/editeng/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@@ -89,7 +89,7 @@
     EE_STAT_CRSRLEFTPARA at the time cursor movement and the enter.
 */
 
-inline void SetFlags( ULONG& rBits, const ULONG nMask, bool bOn )
+inline void SetFlags( sal_uLong& rBits, const sal_uInt32 nMask, bool bOn )
 {
     if ( bOn )
         rBits |= nMask;
@@ -100,25 +100,25 @@ inline void SetFlags( ULONG& rBits, const ULONG nMask, bool bOn )
 class EditStatus
 {
 protected:
-    ULONG	nStatusBits;
-    ULONG	nControlBits;
-    USHORT	nPrevPara;					// for EE_STAT_CRSRLEFTPARA
+    sal_uLong	nStatusBits;
+    sal_uLong	nControlBits;
+    sal_uInt16	nPrevPara;					// for EE_STAT_CRSRLEFTPARA
 
 public:
             EditStatus()				{ nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; }
 
     void	Clear() 					{ nStatusBits = 0; }
-    void	SetControlBits( ULONG nMask, bool bOn )
+    void	SetControlBits( sal_uLong nMask, bool bOn )
                 { SetFlags( nControlBits, nMask, bOn ); }
 
-    ULONG	GetStatusWord() const		{ return nStatusBits; }
-    ULONG&	GetStatusWord() 			{ return nStatusBits; }
+    sal_uLong	GetStatusWord() const		{ return nStatusBits; }
+    sal_uLong&	GetStatusWord() 			{ return nStatusBits; }
 
-    ULONG	GetControlWord() const		{ return nControlBits; }
-    ULONG&	GetControlWord() 			{ return nControlBits; }
+    sal_uLong	GetControlWord() const		{ return nControlBits; }
+    sal_uLong&	GetControlWord() 			{ return nControlBits; }
 
-    USHORT	GetPrevParagraph() const	{ return nPrevPara; }
-    USHORT&	GetPrevParagraph() 			{ return nPrevPara; }
+    sal_uInt16	GetPrevParagraph() const	{ return nPrevPara; }
+    sal_uInt16&	GetPrevParagraph() 			{ return nPrevPara; }
 };
 
 #define SPELLCMD_IGNOREWORD			0x0001
@@ -129,18 +129,18 @@ public:
 
 struct SpellCallbackInfo
 {
-    USHORT		    nCommand;
+    sal_uInt16		    nCommand;
     String		    aWord;
     LanguageType    eLanguage;
 
-    SpellCallbackInfo( USHORT nCMD, const String& rWord )
+    SpellCallbackInfo( sal_uInt16 nCMD, const String& rWord )
     : aWord( rWord )
     {
         nCommand = nCMD;
         eLanguage = LANGUAGE_DONTKNOW;
     }
 
-    SpellCallbackInfo( USHORT nCMD, LanguageType eLang )
+    SpellCallbackInfo( sal_uInt16 nCMD, LanguageType eLang )
     {
         nCommand = nCMD;
         eLanguage = eLang;
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index a4c7917ec8..09e95e1a3d 100644..100755
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -34,7 +34,7 @@
 
 class ImpEditEngine;
 
-class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPRIVATE EditUndoManager : public SfxUndoManager
 {
     using SfxUndoManager::Undo;
     using SfxUndoManager::Redo;
@@ -44,8 +44,8 @@ private:
 public:
                     EditUndoManager( ImpEditEngine* pImpEE );
 
-    virtual BOOL	Undo( USHORT nCount=1 );
-    virtual BOOL	Redo( USHORT nCount=1 );
+    virtual sal_Bool Undo();
+    virtual sal_Bool Redo();
 };
 
 // -----------------------------------------------------------------------
@@ -54,12 +54,12 @@ public:
 class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
 {
 private:
-    USHORT 			nId;
+    sal_uInt16 			nId;
     ImpEditEngine*	pImpEE;
 
 public:
                     TYPEINFO();
-                    EditUndo( USHORT nI, ImpEditEngine* pImpEE );
+                    EditUndo( sal_uInt16 nI, ImpEditEngine* pImpEE );
     virtual 		~EditUndo();
 
     ImpEditEngine*	GetImpEditEngine() const	{ return pImpEE; }
@@ -67,9 +67,9 @@ public:
     virtual void	Undo() 		= 0;
     virtual void	Redo()		= 0;
 
-    virtual BOOL	CanRepeat(SfxRepeatTarget&) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget&) const;
     virtual String	GetComment() const;
-    virtual USHORT	GetId() const;
+    virtual sal_uInt16	GetId() const;
 };
 
 #endif	// _EDITUND2_HXX
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index e709630f17..304187d595 100644..100755
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -98,33 +98,33 @@ public:
 
     void			Paint( const Rectangle& rRect );
     void			Invalidate();
-    Pair			Scroll( long nHorzScroll, long nVertScroll, BYTE nRangeCheck = RGCHK_NEG );
+    Pair			Scroll( long nHorzScroll, long nVertScroll, sal_uInt8 nRangeCheck = RGCHK_NEG );
 
-    void			ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE );
+    void			ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True );
     void			HideCursor();
 
     EESelectionMode	GetSelectionMode() const;
     void			SetSelectionMode( EESelectionMode eMode );
 
-    void			SetReadOnly( BOOL bReadOnly );
-    BOOL			IsReadOnly() const;
+    void			SetReadOnly( sal_Bool bReadOnly );
+    sal_Bool			IsReadOnly() const;
 
-    BOOL			HasSelection() const;
+    sal_Bool			HasSelection() const;
     ESelection		GetSelection() const;
     void			SetSelection( const ESelection& rNewSel );
-    BOOL            SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
+    sal_Bool            SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
 
     void			IndentBlock();
     void			UnindentBlock();
 
-    BOOL			IsInsertMode() const;
-    void			SetInsertMode( BOOL bInsert );
+    sal_Bool			IsInsertMode() const;
+    void			SetInsertMode( sal_Bool bInsert );
 
     void			ReplaceSelected( const String& rStr );
     String			GetSelected();
     void			DeleteSelected();
 
-    USHORT			GetSelectedScriptType() const;
+    sal_uInt16			GetSelectedScriptType() const;
 
                         // VisArea position of the Output window.
                         // A size change also affects the VisArea
@@ -142,17 +142,17 @@ public:
     void			SetCursor( const Cursor& rCursor );
     Cursor*			GetCursor() const;
 
-    void			InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void			InsertText( const String& rNew, sal_Bool bSelect = sal_False );
 
-    BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+    sal_Bool			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
 
-    BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
-    BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
-    BOOL			MouseMove( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseButtonUp( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseButtonDown( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseMove( const MouseEvent& rMouseEvent );
     void			Command( const CommandEvent& rCEvt );
 
-    BOOL            Drop( const DropEvent& rEvt );
-    BOOL    		QueryDrop( DropEvent& rEvt );
+    sal_Bool            Drop( const DropEvent& rEvt );
+    sal_Bool    		QueryDrop( DropEvent& rEvt );
     ESelection		GetDropPos();
 
     void			Cut();
@@ -160,28 +160,28 @@ public:
     void            Paste();
     void            PasteSpecial();
 
-    void			EnablePaste( BOOL bEnable );
-    BOOL			IsPasteEnabled() const;
+    void			EnablePaste( sal_Bool bEnable );
+    sal_Bool			IsPasteEnabled() const;
 
     void			Undo();
     void			Redo();
 
-    // especially for Olli
-    USHORT			GetParagraph( const Point& rMousePosPixel );
-    Point			GetWindowPosTopLeft( USHORT nParagraph );
-    void			MoveParagraphs( Range aParagraphs, USHORT nNewPos );
+    // especially for Oliver Specht
+    sal_uInt16			GetParagraph( const Point& rMousePosPixel );
+    Point			GetWindowPosTopLeft( sal_uInt16 nParagraph );
+    void			MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos );
     void            MoveParagraphs( long nDiff );
 
     const SfxItemSet& 	GetEmptyItemSet();
     SfxItemSet			GetAttribs();
     void				SetAttribs( const SfxItemSet& rSet );
-    void				SetParaAttribs( const SfxItemSet& rSet, USHORT nPara );
-    void                RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 );
-    void 				RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
-    void                RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs = FALSE );
+    void				SetParaAttribs( const SfxItemSet& rSet, sal_uInt16 nPara );
+    void                RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0 );
+    void 				RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
+    void                RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False );
 
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG			Write( SvStream& rOutput, EETextFormat eFormat );
+    sal_uLong           Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong			Write( SvStream& rOutput, EETextFormat eFormat );
 
     void 			SetBackgroundColor( const Color& rColor );
     Color			GetBackgroundColor() const;
@@ -191,12 +191,12 @@ public:
 
     EditTextObject*	CreateTextObject();
     void			InsertText( const EditTextObject& rTextObject );
-    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, BOOL bUseSpecial );
+    void            InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, sal_Bool bUseSpecial );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetTransferable();
 
     // An EditView, so that when TRUE the update will be free from flickering:
-    void			SetEditEngineUpdateMode( BOOL bUpdate );
+    void			SetEditEngineUpdateMode( sal_Bool bUpdate );
     void			ForceUpdate();
 
     SfxStyleSheet*	GetStyleSheet() const;
@@ -205,37 +205,37 @@ public:
     void			SetAnchorMode( EVAnchorMode eMode );
     EVAnchorMode	GetAnchorMode() const;
 
-    BOOL			MatchGroup();
+    sal_Bool			MatchGroup();
 
     void			CompleteAutoCorrect( Window* pFrameWin = NULL );
 
-    EESpellState	StartSpeller( BOOL bMultipleDoc = FALSE );
+    EESpellState	StartSpeller( sal_Bool bMultipleDoc = sal_False );
     EESpellState	StartThesaurus();
-    USHORT			StartSearchAndReplace( const SvxSearchItem& rSearchItem );
+    sal_uInt16			StartSearchAndReplace( const SvxSearchItem& rSearchItem );
 
     // for text conversion
-    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc );
+    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
 
     void			TransliterateText( sal_Int32 nTransliterationMode );
 
-    BOOL			IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE );
-    BOOL			IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE );
+    sal_Bool			IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool			IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
     void			SpellIgnoreWord();
     void			ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 
     void 				InsertField( const SvxFieldItem& rFld );
     const SvxFieldItem*	GetFieldUnderMousePointer() const;
-    const SvxFieldItem*	GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const;
-    const SvxFieldItem*	GetField( const Point& rPos, USHORT* pnPara = NULL, xub_StrLen* pnPos = NULL ) const;
+    const SvxFieldItem*	GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
+    const SvxFieldItem*	GetField( const Point& rPos, sal_uInt16* pnPara = NULL, xub_StrLen* pnPos = NULL ) const;
 
     const SvxFieldItem*	GetFieldAtSelection() const;
 
     String			GetWordUnderMousePointer() const;
     String			GetWordUnderMousePointer( Rectangle& rWordRect ) const;
 
-    void			SetInvalidateMore( USHORT nPixel );
-    USHORT			GetInvalidateMore() const;
+    void			SetInvalidateMore( sal_uInt16 nPixel );
+    sal_uInt16			GetInvalidateMore() const;
 
     // grows or shrinks the font height for the current selection
     void            ChangeFontSize( bool bGrow, const FontList* pList );
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
index 8e586b5600..8e586b5600 100644..100755
--- a/editeng/inc/editeng/edtdlg.hxx
+++ b/editeng/inc/editeng/edtdlg.hxx
diff --git a/editeng/inc/editeng/eedata.hxx b/editeng/inc/editeng/eedata.hxx
index 43657d6e81..43657d6e81 100644..100755
--- a/editeng/inc/editeng/eedata.hxx
+++ b/editeng/inc/editeng/eedata.hxx
diff --git a/editeng/inc/editeng/eeitem.hxx b/editeng/inc/editeng/eeitem.hxx
index 936109b283..936109b283 100644..100755
--- a/editeng/inc/editeng/eeitem.hxx
+++ b/editeng/inc/editeng/eeitem.hxx
diff --git a/editeng/inc/editeng/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx
index 62b5a523dc..62b5a523dc 100644..100755
--- a/editeng/inc/editeng/eeitemid.hxx
+++ b/editeng/inc/editeng/eeitemid.hxx
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index f942c7d6fc..7388b09f50 100644..100755
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -38,7 +38,7 @@ class GlobalEditData;
 class EDITENG_DLLPUBLIC EditResId: public ResId
 {
 public:
-    EditResId( USHORT nId );
+    EditResId( sal_uInt16 nId );
 };
 
 class EditDLL
diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 826c7c35d4..3ba2f3e1ab 100644..100755
--- a/editeng/inc/editeng/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
 
     SvxEmphasisMarkItem(  const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/,
-                          const USHORT nId  );
+                          const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -63,14 +63,12 @@ public:
                                     const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
-                                            BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
     {
@@ -82,7 +80,7 @@ public:
     FontEmphasisMark		GetEmphasisMark() const
                                 { return (FontEmphasisMark)GetValue(); }
     void					SetEmphasisMark( FontEmphasisMark eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_EMPHITEM_HXX
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 7c472684e1..59f66e798e 100644..100755
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -56,15 +56,15 @@ namespace rtl
 class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
 {
     short nEsc;
-    BYTE  nProp;
+    sal_uInt8  nProp;
 public:
     TYPEINFO();
 
-    SvxEscapementItem( const USHORT nId  );
+    SvxEscapementItem( const sal_uInt16 nId  );
     SvxEscapementItem( const SvxEscapement eEscape,
-                   const USHORT nId  );
-    SvxEscapementItem( const short nEsc, const BYTE nProp,
-                   const USHORT nId  );
+                   const sal_uInt16 nId  );
+    SvxEscapementItem( const short nEsc, const sal_uInt8 nProp,
+                   const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
@@ -73,12 +73,12 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     inline void SetEscapement( const SvxEscapement eNew )
     {
@@ -95,8 +95,8 @@ public:
     inline short &GetEsc() { return nEsc; }
     inline short GetEsc() const { return nEsc; }
 
-    inline BYTE &GetProp() { return nProp; }
-    inline BYTE GetProp() const { return nProp; }
+    inline sal_uInt8 &GetProp() { return nProp; }
+    inline sal_uInt8 GetProp() const { return nProp; }
 
     inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
         {
@@ -105,10 +105,10 @@ public:
             return *this;
         }
 
-    virtual USHORT			GetValueCount() const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT			GetEnumValue() const;
-    virtual void			SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16			GetValueCount() const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16			GetEnumValue() const;
+    virtual void			SetEnumValue( sal_uInt16 nNewVal );
 };
 
 #endif
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index 0496cebe8a..cd847d4f4f 100644..100755
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -48,24 +48,24 @@ namespace rtl
     This item describes the font height
 */
 
-#define	FONTHEIGHT_16_VERSION	((USHORT)0x0001)
-#define	FONTHEIGHT_UNIT_VERSION	((USHORT)0x0002)
+#define	FONTHEIGHT_16_VERSION	((sal_uInt16)0x0001)
+#define	FONTHEIGHT_UNIT_VERSION	((sal_uInt16)0x0002)
 
 class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
 {
-    UINT32	nHeight;
-    USHORT	nProp;				// default 100%
+    sal_uInt32	nHeight;
+    sal_uInt16	nProp;				// default 100%
     SfxMapUnit ePropUnit;		// Percent, Twip, ...
 public:
     TYPEINFO();
 
-    SvxFontHeightItem( const ULONG nSz /*= 240*/, const USHORT nPropHeight /*= 100*/,
-                       const USHORT nId  );
+    SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -73,11 +73,11 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT			 GetVersion( USHORT nItemVersion) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nItemVersion) const;
+    virtual bool				 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool				 HasMetrics() const;
 
     inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
         {
@@ -86,21 +86,21 @@ public:
             return *this;
         }
 
-    void SetHeight( UINT32 nNewHeight, const USHORT nNewProp = 100,
+    void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100,
                      SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE );
 
-    void SetHeight( UINT32 nNewHeight, USHORT nNewProp,
+    void SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                      SfxMapUnit eUnit, SfxMapUnit eCoreUnit );
 
-    UINT32 GetHeight() const { return nHeight; }
+    sal_uInt32 GetHeight() const { return nHeight; }
 
-    void SetHeightValue( UINT32 nNewHeight )
+    void SetHeightValue( sal_uInt32 nNewHeight )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nHeight = nNewHeight;
         }
 
-    void SetProp( const USHORT nNewProp,
+    void SetProp( const sal_uInt16 nNewProp,
                     SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -108,7 +108,7 @@ public:
             ePropUnit = eUnit;
         }
 
-    USHORT GetProp() const { return nProp; }
+    sal_uInt16 GetProp() const { return nProp; }
 
     SfxMapUnit GetPropUnit() const { return ePropUnit;  }	// Percent, Twip, ...
 };
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 94d47ae2fe..4f5cacee09 100644..100755
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -69,19 +69,19 @@ class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
 private:
     SvxFieldData*			pField;
 
-                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
+                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16 nId );
 
 public:
             TYPEINFO();
 
-            SvxFieldItem( const SvxFieldData& rField, const USHORT nId  );
+            SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId  );
             SvxFieldItem( const SvxFieldItem& rItem );
             ~SvxFieldItem();
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream&, USHORT nVer ) const;
-    virtual SvStream&		Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream&, sal_uInt16 nVer ) const;
+    virtual SvStream&		Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     const SvxFieldData*		GetField() const 	{ return pField; }
     static SvClassManager&	GetClassManager();
diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index 976a6aee78..82b268d537 100644..100755
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -56,13 +56,13 @@ public:
     TYPEINFO();
 
     SvxFontListItem( const FontList* pFontLst,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
     SvxFontListItem( const SvxFontListItem& rItem );
 
     virtual int				operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual	bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index 4d0a53522b..b133626bf9 100644..100755
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -56,25 +56,25 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
     FontPitch ePitch;
     rtl_TextEncoding eTextEncoding;
 
-    static BOOL bEnableStoreUnicodeNames;
+    static sal_Bool bEnableStoreUnicodeNames;
 
 public:
     TYPEINFO();
 
-    SvxFontItem( const USHORT nId  );
+    SvxFontItem( const sal_uInt16 nId  );
     SvxFontItem( const FontFamily eFam, const String& rFamilyName,
         const String& rStyleName,
         const FontPitch eFontPitch /*= PITCH_DONTKNOW*/,
         const rtl_TextEncoding eFontTextEncoding /*= RTL_TEXTENCODING_DONTKNOW*/,
-        const USHORT nId  );
+        const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -107,7 +107,7 @@ public:
         return *this;
     }
 
-    static void EnableStoreUnicodeNames( BOOL bEnable );
+    static void EnableStoreUnicodeNames( sal_Bool bEnable );
 
 };
 
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 477274f98b..e933033d99 100644..100755
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -46,7 +46,7 @@ namespace lang {
 struct ForbiddenCharactersInfo
 {
     com::sun::star::i18n::ForbiddenCharacters aForbiddenChars;
-    BOOL bTemporary;
+    sal_Bool bTemporary;
 };
 
 DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
@@ -57,12 +57,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
 
 public:
-            SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize = 4, USHORT nGrow = 4 );
+            SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, sal_uInt16 nISize = 4, sal_uInt16 nGrow = 4 );
             ~SvxForbiddenCharactersTable();
 
-    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( USHORT nLanuage, BOOL bGetDefault ) const;
-    void 	SetForbiddenCharacters(  USHORT nLanuage , const com::sun::star::i18n::ForbiddenCharacters& );
-    void 	ClearForbiddenCharacters( USHORT nLanuage );
+    const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanuage, sal_Bool bGetDefault ) const;
+    void 	SetForbiddenCharacters(  sal_uInt16 nLanuage , const com::sun::star::i18n::ForbiddenCharacters& );
+    void 	ClearForbiddenCharacters( sal_uInt16 nLanuage );
 };
 
 #endif // _FORBIDDENCHARACTERSTABLE_HXX
diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index f1fb7fd37b..53a9137cf9 100644..100755
--- a/editeng/inc/editeng/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -49,8 +49,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/frmdir.hxx b/editeng/inc/editeng/frmdir.hxx
index a2006b6be9..a2006b6be9 100644..100755
--- a/editeng/inc/editeng/frmdir.hxx
+++ b/editeng/inc/editeng/frmdir.hxx
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 1420ee4b6a..b9cf24747f 100644..100755
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -48,15 +48,15 @@ class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxFrameDirectionItem( USHORT nWhich  );
+    SvxFrameDirectionItem( sal_uInt16 nWhich  );
     SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/,
-                            USHORT nWhich  );
+                            sal_uInt16 nWhich  );
     virtual ~SvxFrameDirectionItem();
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream& 		Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream& 		Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int 			operator==( const SfxPoolItem& ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -65,10 +65,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem )
     {
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 296820db39..9fbdf7dee0 100644..100755
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -44,19 +44,19 @@
 
 class SvxFontWidthItem : public SfxPoolItem
 {
-    UINT16	nWidth;			// 0 = default
-    USHORT	nProp;			// default 100%
+    sal_uInt16	nWidth;			// 0 = default
+    sal_uInt16	nProp;			// default 100%
 public:
     TYPEINFO();
 
-    SvxFontWidthItem(   const USHORT nSz /*= 0*/,
-                        const USHORT nPropWidth /*= 100*/,
-                        const USHORT nId  );
+    SvxFontWidthItem(   const sal_uInt16 nSz /*= 0*/,
+                        const sal_uInt16 nPropWidth /*= 100*/,
+                        const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -64,10 +64,10 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual bool			 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool			 HasMetrics() const;
 
     inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem )
         {
@@ -76,28 +76,28 @@ public:
             return *this;
         }
 
-    void SetWidth( UINT16 nNewWidth, const USHORT nNewProp = 100 )
+    void SetWidth( sal_uInt16 nNewWidth, const sal_uInt16 nNewProp = 100 )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
-            nWidth = UINT16(( (UINT32)nNewWidth * nNewProp ) / 100 );
+            nWidth = sal_uInt16(( (sal_uInt32)nNewWidth * nNewProp ) / 100 );
             nProp = nNewProp;
         }
 
-    UINT16 GetWidth() const { return nWidth; }
+    sal_uInt16 GetWidth() const { return nWidth; }
 
-    void SetWidthValue( UINT16 nNewWidth )
+    void SetWidthValue( sal_uInt16 nNewWidth )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nWidth = nNewWidth;
         }
 
-    void SetProp( const USHORT nNewProp )
+    void SetProp( const sal_uInt16 nNewProp )
         {
             DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
             nProp = nNewProp;
         }
 
-    USHORT GetProp() const { return nProp; }
+    sal_uInt16 GetProp() const { return nProp; }
 };
 
 
diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 15a80b5e8c..15a80b5e8c 100644..100755
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 4dcafd2845..a6a12c9611 100644..100755
--- a/editeng/inc/editeng/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -49,8 +49,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 07bb874df8..19f62c48bc 100644..100755
--- a/editeng/inc/editeng/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -49,24 +49,24 @@ namespace rtl
 
 class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
 {
-    BOOL bHyphen:  1;
-    BOOL bPageEnd: 1;
-    BYTE nMinLead;
-    BYTE nMinTrail;
-    BYTE nMaxHyphens;
+    sal_Bool bHyphen:  1;
+    sal_Bool bPageEnd: 1;
+    sal_uInt8 nMinLead;
+    sal_uInt8 nMinTrail;
+    sal_uInt8 nMaxHyphens;
 
     friend SvStream & operator<<( SvStream & aS, SvxHyphenZoneItem & );
 
 public:
     TYPEINFO();
 
-    SvxHyphenZoneItem( const BOOL bHyph /*= FALSE*/,
-                       const USHORT nId  );
+    SvxHyphenZoneItem( const sal_Bool bHyph /*= sal_False*/,
+                       const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -74,23 +74,23 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
-    inline void SetHyphen( const BOOL bNew ) { bHyphen = bNew; }
-    inline BOOL IsHyphen() const { return bHyphen; }
+    inline void SetHyphen( const sal_Bool bNew ) { bHyphen = bNew; }
+    inline sal_Bool IsHyphen() const { return bHyphen; }
 
-    inline void SetPageEnd( const BOOL bNew ) { bPageEnd = bNew; }
-    inline BOOL IsPageEnd() const { return bPageEnd; }
+    inline void SetPageEnd( const sal_Bool bNew ) { bPageEnd = bNew; }
+    inline sal_Bool IsPageEnd() const { return bPageEnd; }
 
-    inline BYTE &GetMinLead() { return nMinLead; }
-    inline BYTE GetMinLead() const { return nMinLead; }
+    inline sal_uInt8 &GetMinLead() { return nMinLead; }
+    inline sal_uInt8 GetMinLead() const { return nMinLead; }
 
-    inline BYTE &GetMinTrail() { return nMinTrail; }
-    inline BYTE GetMinTrail() const { return nMinTrail; }
+    inline sal_uInt8 &GetMinTrail() { return nMinTrail; }
+    inline sal_uInt8 GetMinTrail() const { return nMinTrail; }
 
-    inline BYTE &GetMaxHyphens() { return nMaxHyphens; }
-    inline BYTE GetMaxHyphens() const { return nMaxHyphens; }
+    inline sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; }
+    inline sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; }
 
     inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew )
     {
diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index 8dd7edb220..77c5f41db3 100644..100755
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -49,14 +49,14 @@ class IntlWrapper;
 static const sal_Unicode cDelim = ',';
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC String GetSvxString( USHORT nId );
+EDITENG_DLLPUBLIC String GetSvxString( sal_uInt16 nId );
 EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
 String GetColorString( const Color& rCol );
-EDITENG_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
+EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit );
 
 // -----------------------------------------------------------------------
 
-inline String GetBoolString( BOOL bVal )
+inline String GetBoolString( sal_Bool bVal )
 {
     return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
 }
diff --git a/editeng/inc/editeng/justifyitem.hxx b/editeng/inc/editeng/justifyitem.hxx
index d6046073b1..f6516cec22 100644..100755
--- a/editeng/inc/editeng/justifyitem.hxx
+++ b/editeng/inc/editeng/justifyitem.hxx
@@ -50,8 +50,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual USHORT          GetValueCount() const;
     virtual String          GetValueText( USHORT nVal ) const;
@@ -83,8 +83,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual USHORT          GetValueCount() const;
     virtual String          GetValueText( USHORT nVal ) const;
@@ -114,8 +114,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual USHORT          GetValueCount() const;
     virtual String          GetValueText( USHORT nVal ) const;
diff --git a/editeng/inc/editeng/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index 2d942c68e8..8c986fb7ae 100644..100755
--- a/editeng/inc/editeng/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -50,14 +50,14 @@ class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    inline SvxFmtKeepItem( const BOOL bKeep /*= FALSE*/,
-                           const USHORT _nWhich  );
+    inline SvxFmtKeepItem( const sal_Bool bKeep /*= sal_False*/,
+                           const sal_uInt16 _nWhich  );
     inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream&, USHORT ) const;
-    virtual SvStream&		Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&		Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,7 +65,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxFmtKeepItem::SvxFmtKeepItem( const BOOL bKeep, const USHORT _nWhich ) :
+inline SvxFmtKeepItem::SvxFmtKeepItem( const sal_Bool bKeep, const sal_uInt16 _nWhich ) :
     SfxBoolItem( _nWhich, bKeep )
 {}
 
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index ba958cc83c..0a69842998 100644..100755
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -54,14 +54,14 @@ class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
 public:
     TYPEINFO();
 
-    SvxKerningItem( const short nKern /*= 0*/, const USHORT nId  );
+    SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual bool            ScaleMetrics( long nMult, long nDiv );
-    virtual	bool            HasMetrics() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual bool			ScaleMetrics( long nMult, long nDiv );
+    virtual	bool			HasMetrics() const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -73,8 +73,8 @@ public:
             return *this;
         }
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index 5255e467a0..f01a7733fa 100644..100755
--- a/editeng/inc/editeng/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
 
     SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/,
-                     const USHORT nId  );
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,9 +62,9 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual sal_uInt16          GetValueCount() const;
 
     inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
         {
@@ -76,9 +76,9 @@ public:
     LanguageType 			GetLanguage() const
                                 { return (LanguageType)GetValue(); }
     void 					SetLanguage( const LanguageType eLang )
-                                { SetValue( (USHORT)eLang ); }
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+                                { SetValue( (sal_uInt16)eLang ); }
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 17b070dd0c..0108f35808 100644..100755
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -43,9 +43,9 @@ class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
 public:
     TYPEINFO();
 
-    SvxLineColorItem( const USHORT nId  );
-    SvxLineColorItem( const Color& aColor, const USHORT nId  );
-    SvxLineColorItem( SvStream& rStrm, const USHORT nId  );
+    SvxLineColorItem( const sal_uInt16 nId  );
+    SvxLineColorItem( const Color& aColor, const sal_uInt16 nId  );
+    SvxLineColorItem( SvStream& rStrm, const sal_uInt16 nId  );
     SvxLineColorItem( const SvxLineColorItem& rCopy );
     ~SvxLineColorItem();
 
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 1b5a6c5393..d6d51b5deb 100644..100755
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -58,10 +58,10 @@ namespace rtl
     700       -500       200       700         -500
 */
 
-#define	LRSPACE_16_VERSION		((USHORT)0x0001)
-#define	LRSPACE_TXTLEFT_VERSION	((USHORT)0x0002)
-#define	LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003)
-#define	LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004)
+#define	LRSPACE_16_VERSION		((sal_uInt16)0x0001)
+#define	LRSPACE_TXTLEFT_VERSION	((sal_uInt16)0x0002)
+#define	LRSPACE_AUTOFIRST_VERSION ((sal_uInt16)0x0003)
+#define	LRSPACE_NEGATIVE_VERSION ((sal_uInt16)0x0004)
 
 class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
 {
@@ -70,25 +70,25 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
     long	nLeftMargin;        // nLeft or the negative first-line indent
     long	nRightMargin;		// The unproblematic right edge
 
-    USHORT	nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin;
-    BOOL 	bAutoFirst	: 1;	// Automatic calculation of the first line indent
+    sal_uInt16	nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin;
+    sal_Bool 	bAutoFirst	: 1;	// Automatic calculation of the first line indent
 
     void   AdjustLeft();		// nLeftMargin and nTxtLeft are being adjusted.
 
 public:
     TYPEINFO();
 
-    SvxLRSpaceItem( const USHORT nId  );
+    SvxLRSpaceItem( const sal_uInt16 nId  );
     SvxLRSpaceItem( const long nLeft, const long nRight,
                     const long nTLeft /*= 0*/, const short nOfset /*= 0*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
     inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -96,41 +96,41 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual bool				 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool				 HasMetrics() const;
 
-    // The Layout Interface:
-    inline void   SetLeft ( const long nL, const USHORT nProp = 100 );
-    inline void   SetRight( const long nR, const USHORT nProp = 100 );
+    // Die "Layout-Schnittstelle":
+    inline void   SetLeft ( const long nL, const sal_uInt16 nProp = 100 );
+    inline void   SetRight( const long nR, const sal_uInt16 nProp = 100 );
 
     // Query/direct setting of the absolute values
     inline long GetLeft()  const { return nLeftMargin; }
     inline long GetRight() const { return nRightMargin;}
     inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; }
     inline void SetRightValue( const long nR ) { nRightMargin = nR; }
-    inline BOOL IsAutoFirst()  const { return bAutoFirst; }
-    inline void SetAutoFirst( const BOOL bNew ) { bAutoFirst = bNew; }
+    inline sal_Bool IsAutoFirst()  const { return bAutoFirst; }
+    inline void SetAutoFirst( const sal_Bool bNew ) { bAutoFirst = bNew; }
 
     // Query/Setting the percentage values
-    inline void SetPropLeft( const USHORT nProp = 100 )
+    inline void SetPropLeft( const sal_uInt16 nProp = 100 )
                     { nPropLeftMargin = nProp; }
-    inline void SetPropRight( const USHORT nProp = 100 )
+    inline void SetPropRight( const sal_uInt16 nProp = 100 )
                     { nPropRightMargin = nProp;}
-    inline USHORT GetPropLeft()  const { return nPropLeftMargin; }
-    inline USHORT GetPropRight() const { return nPropRightMargin;}
+    inline sal_uInt16 GetPropLeft()  const { return nPropLeftMargin; }
+    inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
 
     // The UI/text interface:
-    inline void SetTxtLeft( const long nL, const USHORT nProp = 100 );
+    inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
     inline long GetTxtLeft() const { return nTxtLeft; }
 
-    inline void   SetTxtFirstLineOfst( const short nF, const USHORT nProp = 100 );
+    inline void   SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
     inline short  GetTxtFirstLineOfst() const { return nFirstLineOfst; }
-    inline void SetPropTxtFirstLineOfst( const USHORT nProp = 100 )
+    inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
                     { nPropFirstLineOfst = nProp; }
-    inline USHORT GetPropTxtFirstLineOfst() const
+    inline sal_uInt16 GetPropTxtFirstLineOfst() const
                     { return nPropFirstLineOfst; }
     inline void SetTxtFirstLineOfstValue( const short nValue )
                     { nFirstLineOfst = nValue; }
@@ -149,26 +149,26 @@ inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy )
     return *this;
 }
 
-inline void SvxLRSpaceItem::SetLeft( const long nL, const USHORT nProp )
+inline void SvxLRSpaceItem::SetLeft( const long nL, const sal_uInt16 nProp )
 {
     nLeftMargin = (nL * nProp) / 100;
     nTxtLeft = nLeftMargin;
     nPropLeftMargin = nProp;
 }
-inline void SvxLRSpaceItem::SetRight( const long nR, const USHORT nProp )
+inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
 {
     nRightMargin = (nR * nProp) / 100;
     nPropRightMargin = nProp;
 }
 inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
-                                                 const USHORT nProp )
+                                                 const sal_uInt16 nProp )
 {
     nFirstLineOfst = short((long(nF) * nProp ) / 100);
     nPropFirstLineOfst = nProp;
     AdjustLeft();
 }
 
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const USHORT nProp )
+inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
 {
     nTxtLeft = (nL * nProp) / 100;
     nPropLeftMargin = nProp;
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index a5db017fd2..bd60901d3f 100644..100755
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -52,8 +52,8 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
     friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
 
     short nInterLineSpace;
-    USHORT nLineHeight;
-    BYTE nPropLineSpace;
+    sal_uInt16 nLineHeight;
+    sal_uInt8 nPropLineSpace;
     SvxLineSpace eLineSpace;
     SvxInterLineSpace eInterLineSpace;
 
@@ -65,12 +65,12 @@ public:
     // writer? => Rather have a crooked vales as the default, but the 
     // programmer sees that there's something special happening.
 
-    SvxLineSpacingItem( USHORT nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const USHORT nId  );
+    SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -78,8 +78,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     // Methods to query and edit. InterlineSpace is added to the height.
     inline short GetInterLineSpace() const { return nInterLineSpace; }
@@ -90,16 +90,16 @@ public:
     }
 
     // Determines the absolute or minimum row height.
-    inline USHORT GetLineHeight() const { return nLineHeight; }
-    inline void SetLineHeight( const USHORT nHeight )
+    inline sal_uInt16 GetLineHeight() const { return nLineHeight; }
+    inline void SetLineHeight( const sal_uInt16 nHeight )
     {
         nLineHeight = nHeight;
         eLineSpace = SVX_LINE_SPACE_MIN;
     }
 
     // To increase or decrease the row height.
-    BYTE GetPropLineSpace() const { return nPropLineSpace; }
-    inline void SetPropLineSpace( const BYTE nProp )
+    sal_uInt8 GetPropLineSpace() const { return nPropLineSpace; }
+    inline void SetPropLineSpace( const sal_uInt8 nProp )
     {
         nPropLineSpace = nProp;
         eInterLineSpace = SVX_INTER_LINE_SPACE_PROP;
@@ -111,10 +111,10 @@ public:
     inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
     inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
 
-    virtual USHORT			GetValueCount() const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT			GetEnumValue() const;
-    virtual void			SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16			GetValueCount() const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16			GetEnumValue() const;
+    virtual void			SetEnumValue( sal_uInt16 nNewVal );
 };
 
 #endif
diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx
index 904d8bdf03..904d8bdf03 100644..100755
--- a/editeng/inc/editeng/measfld.hxx
+++ b/editeng/inc/editeng/measfld.hxx
diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc
index e3e57292f8..e3e57292f8 100644..100755
--- a/editeng/inc/editeng/memberids.hrc
+++ b/editeng/inc/editeng/memberids.hrc
diff --git a/editeng/inc/editeng/mutxhelp.hxx b/editeng/inc/editeng/mutxhelp.hxx
index 72cff69e3c..72cff69e3c 100644..100755
--- a/editeng/inc/editeng/mutxhelp.hxx
+++ b/editeng/inc/editeng/mutxhelp.hxx
diff --git a/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index b5db3edfba..291af342c4 100644..100755
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -39,13 +39,13 @@ class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxNoHyphenItem( const BOOL bHyphen /*= TRUE*/,
-                     const USHORT nId  );
+    SvxNoHyphenItem( const sal_Bool bHyphen /*= sal_True*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index 00cb4a5afb..97508edbd3 100644..100755
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -40,13 +40,13 @@ class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxNoLinebreakItem( const BOOL bBreak /*= TRUE*/,
-                        const USHORT nId  );
+    SvxNoLinebreakItem( const sal_Bool bBreak /*= sal_True*/,
+                        const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/numdef.hxx b/editeng/inc/editeng/numdef.hxx
index 5d997c2891..5d997c2891 100644..100755
--- a/editeng/inc/editeng/numdef.hxx
+++ b/editeng/inc/editeng/numdef.hxx
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 186ed8b909..e027908ef7 100644..100755
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -56,7 +56,7 @@ namespace com{namespace sun{ namespace star{
 }}}
 
 // -----------------------------------------------------------------------
-//Feature-Flags (only USHORT!)
+//Feature-Flags (only sal_uInt16!)
 #define NUM_CONTINUOUS 			0x0001 // consecutive numbers possible?
 #define NUM_CHAR_TEXT_DISTANCE 	0x0002 // Distance Symbol<->Text?
 #define NUM_CHAR_STYLE			0x0004 // Character styles?
@@ -84,8 +84,8 @@ public:
     SvxNumberType(const SvxNumberType& rType);
     ~SvxNumberType();
 
-    String 			GetNumStr( ULONG nNo ) const;
-    String 			GetNumStr( ULONG nNo, const com::sun::star::lang::Locale& rLocale ) const;
+    String 			GetNumStr( sal_uLong nNo ) const;
+    String 			GetNumStr( sal_uLong nNo, const com::sun::star::lang::Locale& rLocale ) const;
 
     void			SetNumberingType(sal_Int16 nSet) {nNumType = nSet;}
     sal_Int16		GetNumberingType() const {return nNumType;}
@@ -122,11 +122,11 @@ private:
 
     SvxAdjust			eNumAdjust;
 
-    BYTE				nInclUpperLevels;	// Take over numbers from the previous level.
-    USHORT 				nStart;				// Start of counting
+    sal_uInt8			nInclUpperLevels;	// Take over numbers from the previous level.
+    sal_uInt16 			nStart;				// Start of counting
 
     sal_Unicode 		cBullet;			// Symbol
-    USHORT				nBulletRelSize;		// percentage size of bullets
+    sal_uInt16			nBulletRelSize;		// percentage size of bullets
     Color				nBulletColor;		// Bullet color
 
     // mode indicating, if the position and spacing of the list label is
@@ -178,8 +178,8 @@ public:
     SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
 
     SvxNumberFormat& operator=( const SvxNumberFormat&  );
-    BOOL 			operator==( const SvxNumberFormat&  ) const;
-    BOOL            operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
+    sal_Bool 			operator==( const SvxNumberFormat&  ) const;
+    sal_Bool            operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
 
     void			SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;}
     SvxAdjust		GetNumAdjust() const {return eNumAdjust;}
@@ -195,15 +195,15 @@ public:
     const Font* 	GetBulletFont() const {return pBulletFont;}
     void			SetBulletChar(sal_Unicode cSet){cBullet = cSet;}
     sal_Unicode 	GetBulletChar()const {return cBullet;}
-    void			SetBulletRelSize(USHORT nSet) {nBulletRelSize = nSet;}
-    USHORT			GetBulletRelSize() const { return nBulletRelSize;}
+    void			SetBulletRelSize(sal_uInt16 nSet) {nBulletRelSize = nSet;}
+    sal_uInt16			GetBulletRelSize() const { return nBulletRelSize;}
     void			SetBulletColor(Color nSet){nBulletColor = nSet;}
     Color			GetBulletColor()const {return nBulletColor;}
 
-    void			SetIncludeUpperLevels( BYTE nSet ) { nInclUpperLevels = nSet;}
-    BYTE 			GetIncludeUpperLevels()const  { return nInclUpperLevels;}
-    void 			SetStart(USHORT nSet) {nStart = nSet;}
-    USHORT			GetStart() const {return nStart;}
+    void			SetIncludeUpperLevels( sal_uInt8 nSet ) { nInclUpperLevels = nSet;}
+    sal_uInt8 			GetIncludeUpperLevels()const  { return nInclUpperLevels;}
+    void 			SetStart(sal_uInt16 nSet) {nStart = nSet;}
+    sal_uInt16			GetStart() const {return nStart;}
 
     virtual void    SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
     const SvxBrushItem* 		GetBrush() const {return pGraphicBrush;}
@@ -235,7 +235,7 @@ public:
     long GetIndentAt() const;
 
     static Size		GetGraphicSizeMM100(const Graphic* pGraphic);
-    static String 	CreateRomanString( ULONG nNo, BOOL bUpper );
+    static String 	CreateRomanString( sal_uLong nNo, sal_Bool bUpper );
 };
 
 enum SvxNumRuleType
@@ -248,20 +248,20 @@ enum SvxNumRuleType
 
 class EDITENG_DLLPUBLIC SvxNumRule
 {
-    USHORT 				nLevelCount;            // Number of supported levels
-    ULONG 				nFeatureFlags;          // What is supported?
+    sal_uInt16 			nLevelCount;            // Number of supported levels
+    sal_uInt32 			nFeatureFlags;          // What is supported?
     SvxNumRuleType		eNumberingType;         // Type of numbering
-    BOOL 				bContinuousNumbering;	// sequential numbering
+    sal_Bool 			bContinuousNumbering;	// sequential numbering
 
     SvxNumberFormat* 	aFmts[SVX_MAX_NUM];
-    BOOL			 	aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels
+    sal_Bool			aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels
 
     static sal_Int32	nRefCount;
     com::sun::star::lang::Locale aLocale;
 public:
-    SvxNumRule( ULONG nFeatures,
-                USHORT nLevels,
-                BOOL bCont,
+    SvxNumRule( sal_uLong nFeatures,
+                sal_uInt16 nLevels,
+                sal_Bool bCont,
                 SvxNumRuleType eType = SVX_RULETYPE_NUMBERING,
                 SvxNumberFormat::SvxNumPositionAndSpaceMode
                         eDefaultNumberFormatPositionAndSpaceMode
@@ -277,28 +277,28 @@ public:
 
     SvStream&               Store(SvStream &rStream);
 
-    const SvxNumberFormat* 	Get(USHORT nLevel)const;
-    const SvxNumberFormat& 	GetLevel(USHORT nLevel)const;
-    void					SetLevel(USHORT nLevel, const SvxNumberFormat& rFmt, BOOL bIsValid = TRUE);
-    void					SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt);
+    const SvxNumberFormat* 	Get(sal_uInt16 nLevel)const;
+    const SvxNumberFormat& 	GetLevel(sal_uInt16 nLevel)const;
+    void					SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
+    void					SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt);
 
-    BOOL					IsContinuousNumbering()const
+    sal_Bool					IsContinuousNumbering()const
                                             {return bContinuousNumbering;}
-    void					SetContinuousNumbering(BOOL bSet)
+    void					SetContinuousNumbering(sal_Bool bSet)
                                             {bContinuousNumbering = bSet;}
 
-    USHORT 					GetLevelCount() const {return nLevelCount;}
-    BOOL					IsFeatureSupported(ULONG nFeature) const
+    sal_uInt16 					GetLevelCount() const {return nLevelCount;}
+    sal_Bool					IsFeatureSupported(sal_uInt32 nFeature) const
                                             {return 0 != (nFeatureFlags & nFeature);}
-    ULONG 					GetFeatureFlags() const {return nFeatureFlags;}
-    void					SetFeatureFlag( ULONG nFlag, BOOL bSet = TRUE ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
+    sal_uInt32 					GetFeatureFlags() const {return nFeatureFlags;}
+    void					SetFeatureFlag( sal_uInt32 nFlag, sal_Bool bSet = sal_True ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
 
-    String 					MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const;
+    String 					MakeNumString( const SvxNodeNum&, sal_Bool bInclStrings = sal_True ) const;
 
     SvxNumRuleType			GetNumRuleType() const { return eNumberingType; }
     void                    SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; }
 
-    BOOL					UnLinkGraphics();
+    sal_Bool					UnLinkGraphics();
 };
 
 class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
@@ -306,48 +306,48 @@ class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
     SvxNumRule* 			pNumRule;
 public:
     SvxNumBulletItem(SvxNumRule& rRule);
-    SvxNumBulletItem(SvxNumRule& rRule, USHORT nWhich );
+    SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 nWhich );
     SvxNumBulletItem(const SvxNumBulletItem& rCopy);
     virtual ~SvxNumBulletItem();
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-    USHORT  GetVersion( USHORT nFileVersion ) const;
-    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create(SvStream &, sal_uInt16) const;
+    sal_uInt16  GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual SvStream&        Store(SvStream &, sal_uInt16 nItemVersion ) const;
     virtual int              operator==( const SfxPoolItem& ) const;
 
     SvxNumRule* 			GetNumRule() const {return pNumRule;}
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SvxNodeNum
 {
-    USHORT nLevelVal[ SVX_MAX_NUM ];	// Numbers of all levels
-    USHORT nSetValue;					// predetermined number
-    BYTE nMyLevel;						// Current Level
-    BOOL bStartNum;						// Restart numbering 
+    sal_uInt16 nLevelVal[ SVX_MAX_NUM ];	// Numbers of all levels
+    sal_uInt16 nSetValue;					// predetermined number
+    sal_uInt8 nMyLevel;						// Current Level
+    sal_Bool bStartNum;						// Restart numbering 
 
 public:
-    inline SvxNodeNum( BYTE nLevel = SVX_NO_NUM, USHORT nSetVal = USHRT_MAX );
+    inline SvxNodeNum( sal_uInt8 nLevel = SVX_NO_NUM, sal_uInt16 nSetVal = USHRT_MAX );
     inline SvxNodeNum& operator=( const SvxNodeNum& rCpy );
 
-    BYTE GetLevel() const 					{ return nMyLevel; }
-    void SetLevel( BYTE nVal )  			{ nMyLevel = nVal; }
+    sal_uInt8 GetLevel() const 					{ return nMyLevel; }
+    void SetLevel( sal_uInt8 nVal )  			{ nMyLevel = nVal; }
 
-    BOOL IsStart() const					{ return bStartNum; }
-    void SetStart( BOOL bFlag = TRUE ) 		{ bStartNum = bFlag; }
+    sal_Bool IsStart() const					{ return bStartNum; }
+    void SetStart( sal_Bool bFlag = sal_True ) 		{ bStartNum = bFlag; }
 
-    USHORT GetSetValue() const 				{ return nSetValue; }
-    void SetSetValue( USHORT nVal )  		{ nSetValue = nVal; }
+    sal_uInt16 GetSetValue() const 				{ return nSetValue; }
+    void SetSetValue( sal_uInt16 nVal )  		{ nSetValue = nVal; }
 
-    const USHORT* GetLevelVal() const 		{ return nLevelVal; }
-          USHORT* GetLevelVal() 	 		{ return nLevelVal; }
+    const sal_uInt16* GetLevelVal() const 		{ return nLevelVal; }
+          sal_uInt16* GetLevelVal() 	 		{ return nLevelVal; }
 };
 
-SvxNodeNum::SvxNodeNum( BYTE nLevel, USHORT nSetVal )
-    : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( FALSE )
+SvxNodeNum::SvxNodeNum( sal_uInt8 nLevel, sal_uInt16 nSetVal )
+    : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( sal_False )
 {
     memset( nLevelVal, 0, sizeof( nLevelVal ) );
 }
@@ -365,7 +365,7 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
 /* --------------------------------------------------
  *
  * --------------------------------------------------*/
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevel, SvxNumRuleType eType );
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevel, SvxNumRuleType eType );
 
 #endif
 
diff --git a/editeng/inc/editeng/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 204becbc03..5676b47ddd 100644..100755
--- a/editeng/inc/editeng/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -52,13 +52,13 @@ class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxOpaqueItem( const USHORT nId , const BOOL bOpa = TRUE );
+    SvxOpaqueItem( const sal_uInt16 nId , const sal_Bool bOpa = sal_True );
     inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -66,7 +66,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxOpaqueItem::SvxOpaqueItem( const USHORT nId, const BOOL bOpa )
+inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const sal_Bool bOpa )
     : SfxBoolItem( nId, bOpa )
 {}
 
diff --git a/editeng/inc/editeng/optitems.hxx b/editeng/inc/editeng/optitems.hxx
index fc4e23d040..fc4e23d040 100644..100755
--- a/editeng/inc/editeng/optitems.hxx
+++ b/editeng/inc/editeng/optitems.hxx
diff --git a/editeng/inc/editeng/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index c6d7b57088..2d61bfcf7a 100644..100755
--- a/editeng/inc/editeng/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -52,12 +52,12 @@ class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
 public:
     TYPEINFO();
 
-    SvxOrphansItem( const BYTE nL /*= 0*/, const USHORT nId  );
+    SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index cdfd119c54..d01ea40ef4 100644..100755
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -74,10 +74,15 @@ class SfxItemSet;
 class SvxNumBulletItem;
 class SvxNumberFormat;
 class SvxLRSpaceItem;
-class SfxUndoManager;
 class EditEngine;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
+
+namespace svl
+{
+    class IUndoManager;
+}
+
 #include <com/sun/star/uno/Reference.h>
 
 #include <rtl/ref.hxx>
@@ -131,12 +136,12 @@ private:
 
     Paragraph& operator=(const Paragraph& rPara );
 
-    USHORT				nFlags;
+    sal_uInt16				nFlags;
     XubString			aBulText;
     Size				aBulSize;
-    BOOL				bVisible;
+    sal_Bool				bVisible;
 
-    BOOL 				IsVisible() const { return bVisible; }
+    sal_Bool 				IsVisible() const { return bVisible; }
     void 				SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; }
     void 				Invalidate() { aBulSize.Width() = -1; }
     void 				SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; }
@@ -155,27 +160,27 @@ private:
     sal_Bool            IsParaIsNumberingRestart() const { return mbParaIsNumberingRestart; }
     void                SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart );
 
-    void				SetFlag( USHORT nFlag ) { nFlags |= nFlag; }
-    void				RemoveFlag( USHORT nFlag ) { nFlags &= ~nFlag; }
-    bool				HasFlag( USHORT nFlag ) const { return (nFlags & nFlag) != 0; }
+    void				SetFlag( sal_uInt16 nFlag ) { nFlags |= nFlag; }
+    void				RemoveFlag( sal_uInt16 nFlag ) { nFlags &= ~nFlag; }
+    bool				HasFlag( sal_uInt16 nFlag ) const { return (nFlags & nFlag) != 0; }
 };
 
 struct ParaRange
 {
-    USHORT 	nStartPara;
-    USHORT 	nEndPara;
+    sal_uInt16 	nStartPara;
+    sal_uInt16 	nEndPara;
 
-            ParaRange( USHORT nS, USHORT nE ) { nStartPara = nS, nEndPara = nE; }
+            ParaRange( sal_uInt16 nS, sal_uInt16 nE ) { nStartPara = nS, nEndPara = nE; }
 
     void 	Adjust();
-    USHORT	Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); }
+    sal_uInt16	Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); }
 };
 
 inline void ParaRange::Adjust()
 {
     if ( nStartPara > nEndPara )
     {
-        USHORT nTmp = nStartPara;
+        sal_uInt16 nTmp = nStartPara;
         nStartPara = nEndPara;
         nEndPara = nTmp;
     }
@@ -193,18 +198,18 @@ private:
     EditView*   pEditView;
 
     // Drag & Drop
-    BOOL        bBeginDragAtMove_OLDMEMBER;
-    BOOL        bInDragMode;
+    sal_Bool        bBeginDragAtMove_OLDMEMBER;
+    sal_Bool        bInDragMode;
     Point       aDDStartPosRef;
     Point       aDDStartPosPix;
-    ULONG       nDDStartPara;
-    ULONG       nDDStartParaVisChildCount;
-    ULONG       nDDCurPara;
-    USHORT      nDDStartDepth;
-    USHORT      nDDCurDepth;
-    USHORT      nDDMaxDepth;
-    BOOL        bDDChangingDepth;
-    BOOL        bDDCursorVisible;
+    sal_uLong       nDDStartPara;
+    sal_uLong       nDDStartParaVisChildCount;
+    sal_uLong       nDDCurPara;
+    sal_uInt16      nDDStartDepth;
+    sal_uInt16      nDDCurDepth;
+    sal_uInt16      nDDMaxDepth;
+    sal_Bool        bDDChangingDepth;
+    sal_Bool        bDDCursorVisible;
     long*       pHorTabArrDoc;
     long        nDDScrollLRBorderWidthWin;  // Left Right
     long        nDDScrollTBBorderWidthWin;  // Top Bottom
@@ -212,7 +217,7 @@ private:
     long        nDDScrollTDOffs;
 
     void*		pDummy;
-    ULONG		nDummy;
+    sal_uLong		nDummy;
 
     enum MouseTarget {
         MouseText = 0,
@@ -225,11 +230,11 @@ private:
 
 #ifdef _OUTLINER_CXX
 
-    EDITENG_DLLPRIVATE void 		ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
+    EDITENG_DLLPRIVATE void 		ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand );
 
-    EDITENG_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
+    EDITENG_DLLPRIVATE sal_uLong       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
     EDITENG_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
-    EDITENG_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
+    EDITENG_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds );
     EDITENG_DLLPRIVATE void        ImpHideDDCursor();
     EDITENG_DLLPRIVATE void        ImpShowDDCursor();
     EDITENG_DLLPRIVATE void        ImpPaintDDCursor();
@@ -240,13 +245,13 @@ private:
     EDITENG_DLLPRIVATE void        ImpScrollUp();
     EDITENG_DLLPRIVATE void        ImpScrollDown();
 
-    EDITENG_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE sal_uLong       ImpGetInsertionPara( const Point& rPosPixel );
     EDITENG_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
     EDITENG_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
-    EDITENG_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
-    EDITENG_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
-    EDITENG_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
-    EDITENG_DLLPRIVATE BOOL        ImpIsIndentingPages();
+    EDITENG_DLLPRIVATE sal_uInt16      ImpInitPaste( sal_uLong& rStart );
+    EDITENG_DLLPRIVATE void        ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize);
+    EDITENG_DLLPRIVATE sal_uInt16      ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected );
+    EDITENG_DLLPRIVATE sal_Bool        ImpIsIndentingPages();
 
 #endif
 
@@ -259,12 +264,12 @@ public:
     void        Scroll( long nHorzScroll, long nVertScroll );
 
     void        Paint( const Rectangle& rRect );
-    BOOL        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
-    BOOL        MouseButtonDown( const MouseEvent& );
-    BOOL        MouseButtonUp( const MouseEvent& );
-    BOOL        MouseMove( const MouseEvent& );
+    sal_Bool        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
+    sal_Bool        MouseButtonDown( const MouseEvent& );
+    sal_Bool        MouseButtonUp( const MouseEvent& );
+    sal_Bool        MouseMove( const MouseEvent& );
 
-    void        ShowCursor( BOOL bGotoCursor = TRUE );
+    void        ShowCursor( sal_Bool bGotoCursor = sal_True );
     void        HideCursor();
 
     void        SetOutliner( Outliner* pOutliner );
@@ -273,8 +278,8 @@ public:
     void        SetWindow( Window* pWindow );
     Window*     GetWindow() const;
 
-    void		SetReadOnly( BOOL bReadOnly );
-    BOOL		IsReadOnly() const;
+    void		SetReadOnly( sal_Bool bReadOnly );
+    sal_Bool		IsReadOnly() const;
 
     void        SetOutputArea( const Rectangle& rRect );
     Rectangle   GetOutputArea() const;
@@ -284,26 +289,26 @@ public:
     List*       CreateSelectionList();
 
     // Retruns the number of selected paragraphs
-    ULONG       Select( Paragraph* pParagraph,
-                    BOOL bSelect=TRUE,
-                    BOOL bWChilds=TRUE);
+    sal_uLong       Select( Paragraph* pParagraph,
+                    sal_Bool bSelect=sal_True,
+                    sal_Bool bWChilds=sal_True);
 
     String      GetSelected() const;
-    void        SelectRange( ULONG nFirst, USHORT nCount );
+    void        SelectRange( sal_uLong nFirst, sal_uInt16 nCount );
     void        SetAttribs( const SfxItemSet& );
     void 		Indent( short nDiff );
     void        AdjustDepth( short nDX );	// Later replace with Indent!
 
-    BOOL        AdjustHeight( long nDY );
+    sal_Bool        AdjustHeight( long nDY );
     void        AdjustDepth( Paragraph* pPara, short nDX,
-                    BOOL bWithChilds = FALSE );
+                    sal_Bool bWithChilds = sal_False );
     void        AdjustHeight( Paragraph* pPara, long nDY,
-                    BOOL bWithChilds=FALSE );
+                    sal_Bool bWithChilds=sal_False );
 
-    ULONG       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    ULONG		Write( SvStream& rOutput, EETextFormat eFormat );
+    sal_uLong       Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong		Write( SvStream& rOutput, EETextFormat eFormat );
 
-    void        InsertText( const String& rNew, BOOL bSelect = FALSE );
+    void        InsertText( const String& rNew, sal_Bool bSelect = sal_False );
     void        InsertText( const OutlinerParaObject& rParaObj );
     void        Expand();
     void        Collapse();
@@ -321,7 +326,7 @@ public:
     void        Copy();
     void        Paste();
     void        PasteSpecial();
-    void        EnablePaste( BOOL bEnable );
+    void        EnablePaste( sal_Bool bEnable );
 
     void        Undo();
     void        Redo();
@@ -329,41 +334,41 @@ public:
     void        	SetStyleSheet( SfxStyleSheet* );
     SfxStyleSheet*	GetStyleSheet() const;
 
-    void        SetControlWord( ULONG nWord );
-    ULONG       GetControlWord() const;
+    void        SetControlWord( sal_uLong nWord );
+    sal_uLong       GetControlWord() const;
 
     void            SetAnchorMode( EVAnchorMode eMode );
     EVAnchorMode    GetAnchorMode() const;
 
     Pointer     GetPointer( const Point& rPosPixel );
     void        Command( const CommandEvent& rCEvt );
-    void        RemoveCharAttribs( ULONG nPara, USHORT nWhich = 0 );
+    void        RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich = 0 );
 
     void		CompleteAutoCorrect();
 
-    EESpellState    StartSpeller( BOOL bMultipleDoc = FALSE );
+    EESpellState    StartSpeller( sal_Bool bMultipleDoc = sal_False );
     EESpellState    StartThesaurus();
-    USHORT          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
+    sal_uInt16          StartSearchAndReplace( const SvxSearchItem& rSearchItem );
 
     // for text conversion
-    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc );
+    void            StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
 
     void			TransliterateText( sal_Int32 nTransliterationMode );
 
     ESelection  GetSelection();
 
-    USHORT		GetSelectedScriptType() const;
+    sal_uInt16		GetSelectedScriptType() const;
 
     void        SetVisArea( const Rectangle& rRec );
     void        SetSelection( const ESelection& );
 
-    void        RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0, BOOL bKeepLanguages = FALSE );
-    void        RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs );
-    BOOL        HasSelection() const;
+    void        RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0, sal_Bool bKeepLanguages = sal_False );
+    void        RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs );
+    sal_Bool        HasSelection() const;
 
     void                InsertField( const SvxFieldItem& rFld );
     const SvxFieldItem* GetFieldUnderMousePointer() const;
-    const SvxFieldItem*	GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const;
+    const SvxFieldItem*	GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
     const SvxFieldItem* GetFieldAtSelection() const;
 
     /** enables numbering for the selected paragraphs if the numbering of the first paragraph is off
@@ -376,13 +381,13 @@ public:
     */
     void        EnableBullets();
 
-    BOOL        IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE );
-    BOOL        IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE );
+    sal_Bool        IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
+    sal_Bool        IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
     void        SpellIgnoreWord();
     void        ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 
-    void		SetInvalidateMore( USHORT nPixel );
-    USHORT		GetInvalidateMore() const;
+    void		SetInvalidateMore( sal_uInt16 nPixel );
+    sal_uInt16		GetInvalidateMore() const;
 
     String		GetSurroundingText() const;
      Selection	GetSurroundingTextSelection() const;
@@ -413,7 +418,7 @@ public:
     const Color maOverlineColor;
     const Color maTextLineColor;
 
-    BYTE			    mnBiDiLevel;
+    sal_uInt8			    mnBiDiLevel;
 
     bool                mbFilled;
     long                mnWidthToFill;
@@ -423,7 +428,7 @@ public:
     unsigned            mbEndOfParagraph : 1;
     unsigned            mbEndOfBullet : 1;
 
-    BYTE GetBiDiLevel() const { return mnBiDiLevel; }
+    sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; }
     sal_Bool IsRTL() const;
 
     DrawPortionInfo(
@@ -440,7 +445,7 @@ public:
         const ::com::sun::star::lang::Locale* pLocale,
         const Color& rOverlineColor,
         const Color& rTextLineColor,
-        BYTE nBiDiLevel,
+        sal_uInt8 nBiDiLevel,
         bool bFilled,
         long nWidthToFill,
         bool bEndOfLine,
@@ -487,14 +492,14 @@ public:
 
 struct EDITENG_DLLPUBLIC PaintFirstLineInfo
 {
-    USHORT mnPara;
+    sal_uInt16 mnPara;
     const Point& mrStartPos;
     long mnBaseLineY;
     const Point& mrOrigin;
     short mnOrientation;
     OutputDevice* mpOutDev;
 
-    PaintFirstLineInfo( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+    PaintFirstLineInfo( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
         : mnPara( nPara ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mnOrientation( nOrientation ), mpOutDev( pOutDev )
     {}
 };
@@ -512,9 +517,9 @@ private:
 
     String              aRepresentation;
 
-    USHORT              nPara;
+    sal_uInt16              nPara;
     xub_StrLen			nPos;
-    BOOL                bSimpleClick;
+    sal_Bool                bSimpleClick;
 
                         EditFieldInfo();
                         EditFieldInfo( const EditFieldInfo& );
@@ -522,12 +527,12 @@ private:
     SdrPage*			mpSdrPage;
 
 public:
-                    EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, USHORT nPa, xub_StrLen nPo )
+                    EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, sal_uInt16 nPa, xub_StrLen nPo )
                         : rFldItem( rFItem )
                     {
                         pOutliner = pOutl;
                         nPara = nPa; nPos = nPo;
-                        pTxtColor = 0; pFldColor = 0; bSimpleClick = FALSE;
+                        pTxtColor = 0; pFldColor = 0; bSimpleClick = sal_False;
                         mpSdrPage = 0;
                     }
                     ~EditFieldInfo()
@@ -550,11 +555,11 @@ public:
     void            ClearFldColor()
                         { delete pFldColor; pFldColor = 0; }
 
-    USHORT          GetPara() const { return nPara; }
+    sal_uInt16          GetPara() const { return nPara; }
     xub_StrLen          GetPos() const { return nPos; }
 
-    BOOL            IsSimpleClick() const { return bSimpleClick; }
-    void            SetSimpleClick( BOOL bSimple ) { bSimpleClick = bSimple; }
+    sal_Bool            IsSimpleClick() const { return bSimpleClick; }
+    void            SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; }
 
     const String&       GetRepresentation() const                { return aRepresentation; }
     String&             GetRepresentation()                      { return aRepresentation; }
@@ -566,15 +571,15 @@ public:
 
 struct EBulletInfo
 {
-    BOOL        bVisible;
-    USHORT      nType;          // see SvxNumberType
+    sal_Bool        bVisible;
+    sal_uInt16      nType;          // see SvxNumberType
     String      aText;
     SvxFont		aFont;
     Graphic     aGraphic;
-    USHORT      nParagraph;
+    sal_uInt16      nParagraph;
     Rectangle   aBounds;
 
-    EBulletInfo() : bVisible( FALSE ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {}
+    EBulletInfo() : bVisible( sal_False ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {}
 };
 
 #define OUTLINERMODE_DONTKNOW		0x0000
@@ -604,7 +609,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     ViewList            aViewList;
 
     Paragraph*          pHdlParagraph;
-    ULONG				mnFirstSelPage;
+    sal_uLong				mnFirstSelPage;
     Link                aDrawPortionHdl;
     Link                aDrawBulletHdl;
     Link                aExpandHdl;
@@ -623,20 +628,20 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     Link                maEndPasteOrDropHdl;
 
     sal_Int16			nDepthChangedHdlPrevDepth;
-    USHORT				mnDepthChangeHdlPrevFlags;
+    sal_uInt16				mnDepthChangeHdlPrevFlags;
     sal_Int16			nMaxDepth;
     const sal_Int16		nMinDepth;
-    USHORT				nFirstPage;
+    sal_uInt16				nFirstPage;
 
-    USHORT				nOutlinerMode;
+    sal_uInt16				nOutlinerMode;
 
-    BOOL                bIsExpanding; // Only valid in Expand/Collaps-Hdl, reset
-    BOOL                bFirstParaIsEmpty;
-    BOOL                bBlockInsCallback;
-    BOOL                bStrippingPortions;
-    BOOL 				bPasting;
+    sal_Bool                bIsExpanding; // Only valid in Expand/Collaps-Hdl, reset
+    sal_Bool                bFirstParaIsEmpty;
+    sal_Bool                bBlockInsCallback;
+    sal_Bool                bStrippingPortions;
+    sal_Bool 				bPasting;
 
-    ULONG				nDummy;
+    sal_uLong				nDummy;
 
 #ifdef _OUTLINER_CXX
 
@@ -646,82 +651,82 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
     DECL_LINK( 				BeginPasteOrDropHdl, PasteOrDropInfos* );
     DECL_LINK( 				EndPasteOrDropHdl, PasteOrDropInfos* );
     DECL_LINK( 				EditEngineNotifyHdl, EENotify* );
-    void 					ImplCheckParagraphs( USHORT nStart, USHORT nEnd );
-    BOOL					ImplHasBullet( USHORT nPara ) const;
-    Size 					ImplGetBulletSize( USHORT nPara );
-    sal_uInt16              ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt );
-    void					ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds );
-    String					ImplGetBulletText( USHORT nPara );
-    void 					ImplCheckNumBulletItem( USHORT nPara );
-    void 					ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction = FALSE );
-    void 					ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle = NULL );
-
-    void                    ImplBlockInsertionCallbacks( BOOL b );
-
-    void 				ImplCheckStyleSheet( USHORT nPara, BOOL bReplaceExistingStyle );
-    void                ImpRecalcBulletIndent( ULONG nPara );
-
-    const SvxBulletItem& ImpGetBullet( ULONG nPara, USHORT& );
-    void        ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara );
+    void 					ImplCheckParagraphs( sal_uInt16 nStart, sal_uInt16 nEnd );
+    sal_Bool					ImplHasBullet( sal_uInt16 nPara ) const;
+    Size 					ImplGetBulletSize( sal_uInt16 nPara );
+    sal_uInt16              ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt );
+    void					ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds );
+    String					ImplGetBulletText( sal_uInt16 nPara );
+    void 					ImplCheckNumBulletItem( sal_uInt16 nPara );
+    void 					ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction = sal_False );
+    void 					ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pLevelStyle = NULL );
+
+    void                    ImplBlockInsertionCallbacks( sal_Bool b );
+
+    void 				ImplCheckStyleSheet( sal_uInt16 nPara, sal_Bool bReplaceExistingStyle );
+    void                ImpRecalcBulletIndent( sal_uLong nPara );
+
+    const SvxBulletItem& ImpGetBullet( sal_uLong nPara, sal_uInt16& );
+    void        ImpFilterIndents( sal_uLong nFirstPara, sal_uLong nLastPara );
     bool		ImpConvertEdtToOut( sal_uInt32 nPara, EditView* pView = 0 );
 
-    void        ImpTextPasted( ULONG nStartPara, USHORT nCount );
-    long 		ImpCalcMaxBulletWidth( USHORT nPara, const SvxBulletItem& rBullet );
-    Font        ImpCalcBulletFont( USHORT nPara ) const;
-    Rectangle   ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos );
-    long 		ImpGetTextIndent( ULONG nPara );
-    BOOL        ImpCanIndentSelectedPages( OutlinerView* pCurView );
-    BOOL        ImpCanDeleteSelectedPages( OutlinerView* pCurView );
-    BOOL        ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT nFirstPage, USHORT nPages );
+    void        ImpTextPasted( sal_uLong nStartPara, sal_uInt16 nCount );
+    long 		ImpCalcMaxBulletWidth( sal_uInt16 nPara, const SvxBulletItem& rBullet );
+    Font        ImpCalcBulletFont( sal_uInt16 nPara ) const;
+    Rectangle   ImpCalcBulletArea( sal_uInt16 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos );
+    long 		ImpGetTextIndent( sal_uLong nPara );
+    sal_Bool        ImpCanIndentSelectedPages( OutlinerView* pCurView );
+    sal_Bool        ImpCanDeleteSelectedPages( OutlinerView* pCurView );
+    sal_Bool        ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_uInt16 nFirstPage, sal_uInt16 nPages );
 
-    USHORT		ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
+    sal_uInt16		ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
     void        ImplCheckDepth( sal_Int16& rnDepth ) const;
 #endif
 
 protected:
-    void        	ParagraphInserted( USHORT nParagraph );
-    void        	ParagraphDeleted( USHORT nParagraph );
-    void			ParaAttribsChanged( USHORT nParagraph );
+    void        	ParagraphInserted( sal_uInt16 nParagraph );
+    void        	ParagraphDeleted( sal_uInt16 nParagraph );
+    void			ParaAttribsChanged( sal_uInt16 nParagraph );
 
     virtual void 	StyleSheetChanged( SfxStyleSheet* pStyle );
 
-    void        InvalidateBullet( Paragraph* pPara, ULONG nPara );
-    void        PaintBullet( USHORT nPara, const Point& rStartPos,
+    void        InvalidateBullet( Paragraph* pPara, sal_uLong nPara );
+    void        PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
                     const Point& rOrigin, short nOrientation,
                     OutputDevice* pOutDev );
 
     // used by OutlinerEditEng. Allows Outliner objects to provide
     // bullet access to the EditEngine.
-    virtual const SvxNumberFormat*  GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat*  GetNumberFormat( sal_uInt16 nPara ) const;
 
 public:
 
-                    Outliner( SfxItemPool* pPool, USHORT nOutlinerMode );
+                    Outliner( SfxItemPool* pPool, sal_uInt16 nOutlinerMode );
     virtual         ~Outliner();
 
-    void            Init( USHORT nOutlinerMode );
-    USHORT			GetMode() const { return nOutlinerMode; }
+    void            Init( sal_uInt16 nOutlinerMode );
+    sal_uInt16			GetMode() const { return nOutlinerMode; }
 
-    void			SetVertical( BOOL bVertical );
-    BOOL			IsVertical() const;
+    void			SetVertical( sal_Bool bVertical );
+    sal_Bool			IsVertical() const;
 
-    void			SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL			IsFixedCellHeight() const;
+    void			SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool			IsFixedCellHeight() const;
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir );
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const;
 
-    USHORT			GetScriptType( const ESelection& rSelection ) const;
-    LanguageType    GetLanguage( USHORT nPara, USHORT nPos ) const;
+    sal_uInt16			GetScriptType( const ESelection& rSelection ) const;
+    LanguageType    GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const;
 
-    void            SetAsianCompressionMode( USHORT nCompressionMode );
-    USHORT          GetAsianCompressionMode() const;
+    void            SetAsianCompressionMode( sal_uInt16 nCompressionMode );
+    sal_uInt16          GetAsianCompressionMode() const;
 
-    void            SetKernAsianPunctuation( BOOL bEnabled );
-    BOOL            IsKernAsianPunctuation() const;
+    void            SetKernAsianPunctuation( sal_Bool bEnabled );
+    sal_Bool            IsKernAsianPunctuation() const;
 
-    void            SetAddExtLeading( BOOL b );
-    BOOL            IsAddExtLeading() const;
+    void            SetAddExtLeading( sal_Bool b );
+    sal_Bool            IsAddExtLeading() const;
 
     size_t          InsertView( OutlinerView* pView, size_t nIndex = size_t(-1) );
     OutlinerView*   RemoveView( OutlinerView* pView );
@@ -729,13 +734,13 @@ public:
     OutlinerView*   GetView( size_t nIndex ) const;
     size_t          GetViewCount() const;
 
-    Paragraph*      Insert( const String& rText, ULONG nAbsPos = LIST_APPEND, sal_Int16 nDepth = 0 );
+    Paragraph*      Insert( const String& rText, sal_uLong nAbsPos = LIST_APPEND, sal_Int16 nDepth = 0 );
     void            SetText( const OutlinerParaObject& );
     void            AddText( const OutlinerParaObject& );
     void            SetText( const String& rText, Paragraph* pParagraph );
-    String          GetText( Paragraph* pPara, ULONG nParaCount=1 ) const;
+    String          GetText( Paragraph* pPara, sal_uLong nParaCount=1 ) const;
 
-    OutlinerParaObject* CreateParaObject( USHORT nStartPara = 0, USHORT nParaCount = 0xFFFF ) const;
+    OutlinerParaObject* CreateParaObject( sal_uInt16 nStartPara = 0, sal_uInt16 nParaCount = 0xFFFF ) const;
 
     const SfxItemSet& GetEmptyItemSet() const;
 
@@ -747,44 +752,44 @@ public:
 
     sal_Int16		GetMinDepth() const { return -1; }
 
-    void            SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParas = FALSE );
+    void            SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParas = sal_False );
     sal_Int16          GetMaxDepth() const { return nMaxDepth; }
 
-    void            SetUpdateMode( BOOL bUpdate );
-    BOOL            GetUpdateMode() const;
+    void            SetUpdateMode( sal_Bool bUpdate );
+    sal_Bool            GetUpdateMode() const;
 
     void            Clear();
 
     void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
 
-    ULONG           GetParagraphCount() const;
-    Paragraph*      GetParagraph( ULONG nAbsPos ) const;
+    sal_uLong           GetParagraphCount() const;
+    Paragraph*      GetParagraph( sal_uLong nAbsPos ) const;
 
-    BOOL            HasParent( Paragraph* pParagraph ) const;
-    BOOL            HasChilds( Paragraph* pParagraph ) const;
-    ULONG           GetChildCount( Paragraph* pParent ) const;
-    BOOL            IsExpanded( Paragraph* pPara ) const;
-    Paragraph*      GetParent( Paragraph* pParagraph ) const;
-    ULONG           GetAbsPos( Paragraph* pPara );
+    sal_Bool            HasParent( Paragraph* pParagraph ) const;
+    sal_Bool            HasChilds( Paragraph* pParagraph ) const;
+    sal_uLong           GetChildCount( Paragraph* pParent ) const;
+    sal_Bool            IsExpanded( Paragraph* pPara ) const;
+    Paragraph*          GetParent( Paragraph* pParagraph ) const;
+    sal_uLong           GetAbsPos( Paragraph* pPara );
 
-    sal_Int16		GetDepth( ULONG nPara ) const;
+    sal_Int16		GetDepth( sal_uLong nPara ) const;
     void			SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth );
 
-    void			SetVisible( Paragraph* pPara, BOOL bVisible );
-    BOOL            IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); }
+    void			SetVisible( Paragraph* pPara, sal_Bool bVisible );
+    sal_Bool            IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); }
 
-    void            EnableUndo( BOOL bEnable );
-    BOOL            IsUndoEnabled() const;
-    void            UndoActionStart( USHORT nId );
-    void            UndoActionEnd( USHORT nId );
+    void            EnableUndo( sal_Bool bEnable );
+    sal_Bool            IsUndoEnabled() const;
+    void            UndoActionStart( sal_uInt16 nId );
+    void            UndoActionEnd( sal_uInt16 nId );
     void            InsertUndo( EditUndo* pUndo );
-    BOOL            IsInUndo();
+    sal_Bool            IsInUndo();
 
     void            ClearModifyFlag();
-    BOOL            IsModified() const;
+    sal_Bool            IsModified() const;
 
     Paragraph*      GetHdlParagraph() const { return pHdlParagraph; }
-    BOOL            IsExpanding() const { return bIsExpanding; }
+    sal_Bool            IsExpanding() const { return bIsExpanding; }
 
     virtual void    ExpandHdl();
     void            SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; }
@@ -802,7 +807,7 @@ public:
     void            SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;}
     Link            GetDepthChangedHdl() const { return aDepthChangedHdl; }
     sal_Int16       GetPrevDepth() const { return nDepthChangedHdlPrevDepth; }
-    USHORT			GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
+    sal_uInt16			GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
 
     virtual long    RemovingPagesHdl( OutlinerView* );
     void            SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;}
@@ -811,10 +816,10 @@ public:
     void            SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;}
     Link            GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
     // valid only in the two upper handlers
-    USHORT          GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
+    sal_uInt16          GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
 
     // valid only in the two upper handlers
-    ULONG           GetFirstSelPage() const { return mnFirstSelPage; }
+    sal_uLong           GetFirstSelPage() const { return mnFirstSelPage; }
 
     void            SetCalcFieldValueHdl(const Link& rLink ) { aCalcFieldValueHdl= rLink; }
     Link            GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
@@ -847,8 +852,8 @@ public:
     const Size&     GetPaperSize() const;
     void            SetPaperSize( const Size& rSize );
 
-    void			SetFirstPageNumber( USHORT n ) 	{ nFirstPage = n; }
-    USHORT			GetFirstPageNumber() const 		{ return nFirstPage; }
+    void			SetFirstPageNumber( sal_uInt16 n ) 	{ nFirstPage = n; }
+    sal_uInt16			GetFirstPageNumber() const 		{ return nFirstPage; }
 
     void				SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon );
     void				SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon);
@@ -861,29 +866,29 @@ public:
     const Size&     GetMaxAutoPaperSize() const;
     void            SetMaxAutoPaperSize( const Size& rSz );
 
-    void            SetDefTab( USHORT nTab );
-    USHORT          GetDefTab() const;
+    void            SetDefTab( sal_uInt16 nTab );
+    sal_uInt16          GetDefTab() const;
 
-    BOOL			IsFlatMode() const;
-    void			SetFlatMode( BOOL bFlat );
+    sal_Bool			IsFlatMode() const;
+    void			SetFlatMode( sal_Bool bFlat );
 
-    void            EnableAutoColor( BOOL b );
-    BOOL            IsAutoColorEnabled() const;
+    void            EnableAutoColor( sal_Bool b );
+    sal_Bool            IsAutoColorEnabled() const;
 
-    void            ForceAutoColor( BOOL b );
-    BOOL            IsForceAutoColor() const;
+    void            ForceAutoColor( sal_Bool b );
+    sal_Bool            IsForceAutoColor() const;
 
-    EBulletInfo     GetBulletInfo( USHORT nPara );
+    EBulletInfo     GetBulletInfo( sal_uInt16 nPara );
 
     void        SetWordDelimiters( const String& rDelimiters );
     String      GetWordDelimiters() const;
-    String      GetWord( USHORT nPara, xub_StrLen nIndex );
+    String      GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
 
     void            StripPortions();
 
     virtual void DrawingText(
-        const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
-        const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const String& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+        const sal_Int32* pDXArray, const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -908,17 +913,17 @@ public:
     void            	SetStyleSheetPool( SfxStyleSheetPool* pSPool );
     SfxStyleSheetPool*	GetStyleSheetPool();
 
-    BOOL            IsInSelectionMode() const;
+    sal_Bool            IsInSelectionMode() const;
 
-    void            SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle );
-    SfxStyleSheet*	GetStyleSheet( ULONG nPara );
+    void            SetStyleSheet( sal_uLong nPara, SfxStyleSheet* pStyle );
+    SfxStyleSheet*	GetStyleSheet( sal_uLong nPara );
 
-    void            SetParaAttribs( USHORT nPara, const SfxItemSet& );
-    SfxItemSet      GetParaAttribs( USHORT nPara );
+    void            SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& );
+    SfxItemSet      GetParaAttribs( sal_uInt16 nPara );
 
-    void            Remove( Paragraph* pPara, ULONG nParaCount );
-    BOOL            Expand( Paragraph* );
-    BOOL            Collapse( Paragraph* );
+    void            Remove( Paragraph* pPara, sal_uLong nParaCount );
+    sal_Bool            Expand( Paragraph* );
+    sal_Bool            Collapse( Paragraph* );
 
     void			SetParaFlag( Paragraph* pPara,  sal_uInt16 nFlag );
     void			RemoveParaFlag( Paragraph* pPara, sal_uInt16 nFlag );
@@ -929,22 +934,23 @@ public:
     Link            GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
     void            SetWidthArrReqHdl(const Link& rLink){aWidthArrReqHdl=rLink; }
 
-    void            SetControlWord( ULONG nWord );
-    ULONG           GetControlWord() const;
+    void            SetControlWord( sal_uLong nWord );
+    sal_uLong           GetControlWord() const;
 
     Link            GetBeginMovingHdl() const { return aBeginMovingHdl; }
     void            SetBeginMovingHdl(const Link& rLink) {aBeginMovingHdl=rLink;}
     Link            GetEndMovingHdl() const {return aEndMovingHdl;}
     void            SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;}
 
-    ULONG           GetLineCount( ULONG nParagraph ) const;
-    USHORT          GetLineLen( ULONG nParagraph, USHORT nLine ) const;
-    ULONG           GetLineHeight( ULONG nParagraph, ULONG nLine = 0 );
+    sal_uLong           GetLineCount( sal_uLong nParagraph ) const;
+    sal_uInt16          GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const;
+    sal_uLong           GetLineHeight( sal_uLong nParagraph, sal_uLong nLine = 0 );
 
     // nFormat must be a value from the enum EETextFormat (due to CLOOKS)
-    ULONG           Read( SvStream& rInput, const String& rBaseURL, USHORT, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
+    sal_uLong           Read( SvStream& rInput, const String& rBaseURL, sal_uInt16, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
 
-    SfxUndoManager& GetUndoManager();
+    ::svl::IUndoManager&
+                    GetUndoManager();
 
     void            QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
     void            QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -953,15 +959,15 @@ public:
     // Only for EditEngine mode
     void            QuickInsertText( const String& rText, const ESelection& rSel );
     void            QuickDelete( const ESelection& rSel );
-    void            QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
-    void            QuickFormatDoc( BOOL bFull = FALSE );
+    void            QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0 );
+    void            QuickFormatDoc( sal_Bool bFull = sal_False );
 
-    BOOL            UpdateFields();
-    void 			RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL );
+    sal_Bool            UpdateFields();
+    void 			RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL );
 
-    virtual void    FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual void    FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void    FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual void    FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual String  CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor );
 
     void			SetSpeller( ::com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller );
@@ -981,16 +987,16 @@ public:
     void 			SetDefaultLanguage( LanguageType eLang );
     LanguageType	GetDefaultLanguage() const;
 
-    BOOL			HasOnlineSpellErrors() const;
+    sal_Bool			HasOnlineSpellErrors() const;
     void			CompleteOnlineSpelling();
 
     EESpellState    HasSpellErrors();
-    BOOL            HasText( const SvxSearchItem& rSearchItem );
-    virtual BOOL    SpellNextDocument();
+    sal_Bool            HasText( const SvxSearchItem& rSearchItem );
+    virtual sal_Bool    SpellNextDocument();
 
     // for text conversion
     sal_Bool        HasConvertibleTextPortion( LanguageType nLang );
-    virtual BOOL    ConvertNextDocument();
+    virtual sal_Bool    ConvertNextDocument();
 
     void            SetEditTextObjectPool( SfxItemPool* pPool );
     SfxItemPool*    GetEditTextObjectPool() const;
@@ -998,30 +1004,30 @@ public:
     void            SetRefDevice( OutputDevice* pRefDev );
     OutputDevice*   GetRefDevice() const;
 
-    USHORT          GetFirstLineOffset( ULONG nParagraph );
+    sal_uInt16          GetFirstLineOffset( sal_uLong nParagraph );
 
-    ULONG           GetTextHeight() const;
-    ULONG           GetTextHeight( ULONG nParagraph ) const;
-    Point           GetDocPosTopLeft( ULONG nParagraph );
+    sal_uLong           GetTextHeight() const;
+    sal_uLong           GetTextHeight( sal_uLong nParagraph ) const;
+    Point           GetDocPosTopLeft( sal_uLong nParagraph );
     Point			GetDocPos( const Point& rPaperPos ) const;
-    BOOL			IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 );
-    BOOL			IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBuuletPos );
+    sal_Bool			IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 );
+    sal_Bool			IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBuuletPos );
 
-    void            SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 );
-    void            GetGlobalCharStretching( USHORT& rX, USHORT& rY );
-    void            DoStretchChars( USHORT nX, USHORT nY );
+    void            SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 );
+    void            GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
+    void            DoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
     void            EraseVirtualDevice();
 
-    void            SetBigTextObjectStart( USHORT nStartAtPortionCount );
-    USHORT          GetBigTextObjectStart() const;
-    BOOL            ShouldCreateBigTextObject() const;
+    void            SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount );
+    sal_uInt16          GetBigTextObjectStart() const;
+    sal_Bool            ShouldCreateBigTextObject() const;
 
     const EditEngine& GetEditEngine() const { return *((EditEngine*)pEditEngine); }
 
     // this is needed for StarOffice Api
-    void SetLevelDependendStyleSheet( USHORT nPara );
+    void SetLevelDependendStyleSheet( sal_uInt16 nPara );
 
-    USHORT	GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
+    sal_uInt16	GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; }
 
     void            StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc);
     // spell and return a sentence
diff --git a/editeng/inc/editeng/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx
index c402675bcd..c402675bcd 100644..100755
--- a/editeng/inc/editeng/outlobj.hxx
+++ b/editeng/inc/editeng/outlobj.hxx
diff --git a/editeng/inc/editeng/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx
index a4c32f6788..3c1a7cc493 100644..100755
--- a/editeng/inc/editeng/paperinf.hxx
+++ b/editeng/inc/editeng/paperinf.hxx
@@ -49,7 +49,7 @@ public:
     static Size     GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP );
     static Size     GetPaperSize( Paper ePaper, MapUnit eUnit = MAP_TWIP );
     static Size     GetPaperSize( const Printer* pPrinter );
-    static Paper    GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = FALSE );
+    static Paper    GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = sal_False );
     static long     GetSloppyPaperDimension( long nSize, MapUnit eUnit = MAP_TWIP );
     static String   GetName( Paper ePaper );
 };
diff --git a/editeng/inc/editeng/paragraphdata.hxx b/editeng/inc/editeng/paragraphdata.hxx
index 778dbdea97..778dbdea97 100644..100755
--- a/editeng/inc/editeng/paragraphdata.hxx
+++ b/editeng/inc/editeng/paragraphdata.hxx
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index ed8f0af6d8..d1e94d6a54 100644..100755
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -52,9 +52,9 @@ public:
                        const sal_uInt16 nId  );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream& 		Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream& 		Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -62,10 +62,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
     {
diff --git a/editeng/inc/editeng/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index 67518bd4c9..c13b14a251 100644..100755
--- a/editeng/inc/editeng/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -35,7 +35,7 @@
 
 // define ----------------------------------------------------------------
 
-#define PAPERBIN_PRINTER_SETTINGS	((BYTE)0xFF)
+#define PAPERBIN_PRINTER_SETTINGS	((sal_uInt8)0xFF)
 
 // class SvxPaperBinItem -------------------------------------------------
 
@@ -49,21 +49,21 @@ class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
 public:
     TYPEINFO();
 
-    inline SvxPaperBinItem( const USHORT nId ,
-                            const BYTE nTray = PAPERBIN_PRINTER_SETTINGS );
+    inline SvxPaperBinItem( const sal_uInt16 nId ,
+                            const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
     inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT ) const;
-    virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 ) const;
+    virtual SvStream&		Store( SvStream &, sal_uInt16 nItemVersion ) const;
     virtual SfxItemPresentation	GetPresentation( SfxItemPresentation ePres,
                                              SfxMapUnit eCoreMetric,
                                              SfxMapUnit ePresMetric,
                                              String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxPaperBinItem::SvxPaperBinItem( const USHORT nId, const BYTE nT )
+inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
     : SfxByteItem( nId, nT )
 {}
 
diff --git a/editeng/inc/editeng/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index 46d295072f..f79f5f8b33 100644..100755
--- a/editeng/inc/editeng/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -46,13 +46,13 @@ class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxParaGridItem( const BOOL bSnapToGrid /*= TRUE*/,
-                     const USHORT nId  );
+    SvxParaGridItem( const sal_Bool bSnapToGrid /*= sal_True*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index ec31066d6e..fa5a38c3a3 100644..100755
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -43,14 +43,14 @@
 class EDITENG_DLLPUBLIC SvxPageModelItem : public SfxStringItem
 {
 private:
-    BOOL bAuto;
+    sal_Bool bAuto;
 
 public:
     TYPEINFO();
 
-    inline SvxPageModelItem( USHORT nWh  );
-    inline SvxPageModelItem( const String& rModel, BOOL bA /*= FALSE*/,
-                             USHORT nWh  );
+    inline SvxPageModelItem( sal_uInt16 nWh  );
+    inline SvxPageModelItem( const String& rModel, sal_Bool bA /*= sal_False*/,
+                             sal_uInt16 nWh  );
     inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -60,19 +60,19 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual	bool                 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool                 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    BOOL IsAuto() const { return bAuto; }
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    sal_Bool IsAuto() const { return bAuto; }
 };
 
-inline SvxPageModelItem::SvxPageModelItem( USHORT nWh )
-    : bAuto( FALSE )
+inline SvxPageModelItem::SvxPageModelItem( sal_uInt16 nWh )
+    : bAuto( sal_False )
 {
     SetWhich( nWh );
 }
 
-inline SvxPageModelItem::SvxPageModelItem( const String& rModel, BOOL bA,
-                                           USHORT nWh ) :
+inline SvxPageModelItem::SvxPageModelItem( const String& rModel, sal_Bool bA,
+                                           sal_uInt16 nWh ) :
     SfxStringItem( nWh, rModel ),
     bAuto( bA )
 {}
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index 2ba5365774..6f55626e85 100644..100755
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
 
     SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem + SwEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,17 +62,17 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual int 			HasBoolValue() const;
-    virtual BOOL			GetBoolValue() const;
-    virtual void			SetBoolValue( BOOL bVal );
+    virtual sal_Bool			GetBoolValue() const;
+    virtual void			SetBoolValue( sal_Bool bVal );
 
     inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
         SetValue( rPost.GetValue() );
@@ -83,7 +83,7 @@ public:
     FontItalic				GetPosture() const
                                 { return (FontItalic)GetValue(); }
     void					SetPosture( FontItalic eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_POSTITEM_HXX
diff --git a/editeng/inc/editeng/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index e0ce99fd56..57735fb55a 100644..100755
--- a/editeng/inc/editeng/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -49,13 +49,13 @@ class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxPrintItem( const USHORT nId , const BOOL bPrt = TRUE );
+    SvxPrintItem( const sal_uInt16 nId , const sal_Bool bPrt = sal_True );
     inline SvxPrintItem &operator=( const SvxPrintItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -63,7 +63,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxPrintItem::SvxPrintItem( const USHORT nId, const BOOL bPrt )
+inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const sal_Bool bPrt )
     : SfxBoolItem( nId, bPrt )
 {}
 
diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 95c9c6bd43..0d93de7a57 100644..100755
--- a/editeng/inc/editeng/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -50,14 +50,14 @@ namespace rtl
 
 class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
 {
-    BOOL bCntnt :1;     // Content protected
-    BOOL bSize  :1;     // Size protected
-    BOOL bPos   :1;     // Position protected
+    sal_Bool bCntnt :1;     // Content protected
+    sal_Bool bSize  :1;     // Size protected
+    sal_Bool bPos   :1;     // Position protected
 
 public:
     TYPEINFO();
 
-    inline SvxProtectItem( const USHORT nId  );
+    inline SvxProtectItem( const sal_uInt16 nId  );
     inline SvxProtectItem &operator=( const SvxProtectItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
@@ -70,24 +70,24 @@ public:
 
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-
-    BOOL IsCntntProtected() const { return bCntnt; }
-    BOOL IsSizeProtected()  const { return bSize;  }
-    BOOL IsPosProtected()   const { return bPos;   }
-    void SetCntntProtect( BOOL bNew ) { bCntnt = bNew; }
-    void SetSizeProtect ( BOOL bNew ) { bSize  = bNew; }
-    void SetPosProtect  ( BOOL bNew ) { bPos   = bNew; }
-
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+
+    sal_Bool IsCntntProtected() const { return bCntnt; }
+    sal_Bool IsSizeProtected()  const { return bSize;  }
+    sal_Bool IsPosProtected()   const { return bPos;   }
+    void SetCntntProtect( sal_Bool bNew ) { bCntnt = bNew; }
+    void SetSizeProtect ( sal_Bool bNew ) { bSize  = bNew; }
+    void SetPosProtect  ( sal_Bool bNew ) { bPos   = bNew; }
+
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
-inline SvxProtectItem::SvxProtectItem( const USHORT nId )
+inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
     : SfxPoolItem( nId )
 {
-    bCntnt = bSize = bPos = FALSE;
+    bCntnt = bSize = bPos = sal_False;
 }
 
 inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
diff --git a/editeng/inc/editeng/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 4effaccf8a..cc0d3e532f 100644..100755
--- a/editeng/inc/editeng/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -45,13 +45,13 @@ class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxPropSizeItem( const USHORT nPercent /*= 100*/,
-                 const USHORT nID  );
+    SvxPropSizeItem( const sal_uInt16 nPercent /*= 100*/,
+                 const sal_uInt16 nID  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index b2eb09875b..0357b59904 100644..100755
--- a/editeng/inc/editeng/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -50,8 +50,8 @@ public:
                         const sal_uInt16 nId  );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index 9989ff4f5e..b15f171c04 100644..100755
--- a/editeng/inc/editeng/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -42,9 +42,9 @@
     used for the user interface.
 */
 
-EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
-USHORT GetItemScriptType( short nI18NType );
-short  GetI18NScriptType( USHORT nItemType );
+EDITENG_DLLPUBLIC sal_uInt16 GetI18NScriptTypeOfLanguage( sal_uInt16 nLang );
+sal_uInt16 GetItemScriptType( short nI18NType );
+short  GetI18NScriptType( sal_uInt16 nItemType );
 
 class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item
 {
@@ -61,30 +61,30 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
 public:
     TYPEINFO();
 
-    SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool );
+    SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
 
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const;
+    virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const;
 
     static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet,
-                                                    USHORT nWhich );
-    inline const SfxPoolItem* GetItemOfScriptSet( USHORT _nWhich ) const
+                                                    sal_uInt16 nWhich );
+    inline const SfxPoolItem* GetItemOfScriptSet( sal_uInt16 _nWhich ) const
     { return SvxScriptSetItem::GetItemOfScriptSet( GetItemSet(), _nWhich ); }
 
-    static const SfxPoolItem* GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript );
+    static const SfxPoolItem* GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16 nScript );
 
-    const SfxPoolItem* GetItemOfScript( USHORT nScript ) const;
+    const SfxPoolItem* GetItemOfScript( sal_uInt16 nScript ) const;
 
-    void PutItemForScriptType( USHORT nScriptType, const SfxPoolItem& rItem );
+    void PutItemForScriptType( sal_uInt16 nScriptType, const SfxPoolItem& rItem );
 
-    static void GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex);
+    static void GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex);
 
-    void GetWhichIds( USHORT& rLatin, USHORT& rAsian, USHORT& rComplex) const;
+    void GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex) const;
 
-    static void GetSlotIds( USHORT nSlotId, USHORT& rLatin, USHORT& rAsian,
-                                            USHORT& rComplex );
-    inline void GetSlotIds( USHORT& rLatin, USHORT& rAsian,
-                                USHORT& rComplex ) const
+    static void GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                            sal_uInt16& rComplex );
+    inline void GetSlotIds( sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                sal_uInt16& rComplex ) const
     { GetSlotIds( Which(), rLatin, rAsian, rComplex ); }
 };
 
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 6477d4c51f..570c86f336 100644..100755
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -47,29 +47,29 @@ namespace rtl
     This item describes the shadow attribute (color, width and position).
 */
 
-#define SHADOW_TOP		((USHORT)0)
-#define SHADOW_BOTTOM	((USHORT)1)
-#define SHADOW_LEFT		((USHORT)2)
-#define SHADOW_RIGHT	((USHORT)3)
+#define SHADOW_TOP		((sal_uInt16)0)
+#define SHADOW_BOTTOM	((sal_uInt16)1)
+#define SHADOW_LEFT		((sal_uInt16)2)
+#define SHADOW_RIGHT	((sal_uInt16)3)
 
 class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
 {
     Color 				aShadowColor;
-    USHORT 				nWidth;
+    sal_uInt16 				nWidth;
     SvxShadowLocation 	eLocation;
 public:
     TYPEINFO();
 
-    SvxShadowItem( const USHORT nId ,
-                 const Color *pColor = 0, const USHORT nWidth = 100 /*5pt*/,
+    SvxShadowItem( const sal_uInt16 nId ,
+                 const Color *pColor = 0, const sal_uInt16 nWidth = 100 /*5pt*/,
                  const SvxShadowLocation eLoc = SVX_SHADOW_NONE );
 
     inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -77,27 +77,27 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual bool			 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool			 HasMetrics() const;
 
     const Color& GetColor() const {	return aShadowColor;}
     void SetColor( const Color &rNew ) { aShadowColor = rNew; }
 
-    USHORT GetWidth() const { return nWidth; }
+    sal_uInt16 GetWidth() const { return nWidth; }
     SvxShadowLocation GetLocation() const { return eLocation; }
 
-    void SetWidth( USHORT nNew ) { nWidth = nNew; }
+    void SetWidth( sal_uInt16 nNew ) { nWidth = nNew; }
     void SetLocation( SvxShadowLocation eNew ) { eLocation = eNew; }
 
     // Calculate width of the shadow on the page.
-    USHORT CalcShadowSpace( USHORT nShadow ) const;
+    sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const;
 
-    virtual USHORT			GetValueCount() const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT			GetEnumValue() const;
-    virtual void			SetEnumValue( USHORT nNewVal );
+    virtual sal_uInt16			GetValueCount() const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16			GetEnumValue() const;
+    virtual void			SetEnumValue( sal_uInt16 nNewVal );
 };
 
 inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow )
diff --git a/editeng/inc/editeng/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index 1863ce4b10..01019debc1 100644..100755
--- a/editeng/inc/editeng/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -51,13 +51,13 @@ class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxShadowedItem( const BOOL bShadowed /*= FALSE*/,
-                     const USHORT nId  );
+    SvxShadowedItem( const sal_Bool bShadowed /*= sal_False*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index 3622086d3e..967995e68c 100644..100755
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -49,15 +49,15 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxSizeItem( const USHORT nId );
-    SvxSizeItem( const USHORT nId, const Size& rSize);
+    SvxSizeItem( const sal_uInt16 nId );
+    SvxSizeItem( const sal_uInt16 nId, const Size& rSize);
 
     inline SvxSizeItem& operator=( const SvxSizeItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,10 +65,10 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual bool			 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool			 HasMetrics() const;
 
     const Size& GetSize() const { return aSize; }
     void		SetSize(const Size& rSize) { aSize = rSize; }
diff --git a/editeng/inc/editeng/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index 25cb62a4d8..4b3c0c6d27 100644..100755
--- a/editeng/inc/editeng/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -52,14 +52,14 @@ public:
     TYPEINFO();
     ~SvxFmtSplitItem();
 
-    inline SvxFmtSplitItem( const BOOL bSplit /*= TRUE*/,
-                            const USHORT nWh  );
+    inline SvxFmtSplitItem( const sal_Bool bSplit /*= sal_True*/,
+                            const sal_uInt16 nWh  );
     inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream&, USHORT ) const;
-    virtual SvStream&		Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&		Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -67,7 +67,7 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 };
 
-inline SvxFmtSplitItem::SvxFmtSplitItem( const BOOL bSplit, const USHORT nWh ) :
+inline SvxFmtSplitItem::SvxFmtSplitItem( const sal_Bool bSplit, const sal_uInt16 nWh ) :
     SfxBoolItem( nWh, bSplit )
 {}
 
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index bc45535d96..bc45535d96 100644..100755
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index c884e3836e..ac10b3ad11 100644..100755
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -79,14 +79,14 @@ public:
     SvxAutoCorrDoc() {}
     virtual ~SvxAutoCorrDoc();
 
-    virtual BOOL Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0;
-    virtual BOOL Insert( xub_StrLen nPos, const String& rTxt ) = 0;
-    virtual BOOL Replace( xub_StrLen nPos, const String& rTxt ) = 0;
+    virtual sal_Bool Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0;
+    virtual sal_Bool Insert( xub_StrLen nPos, const String& rTxt ) = 0;
+    virtual sal_Bool Replace( xub_StrLen nPos, const String& rTxt ) = 0;
 
-    virtual BOOL SetAttr( xub_StrLen nStt, xub_StrLen nEnd, USHORT nSlotId,
+    virtual sal_Bool SetAttr( xub_StrLen nStt, xub_StrLen nEnd, sal_uInt16 nSlotId,
                             SfxPoolItem& ) = 0;
 
-    virtual BOOL SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL ) = 0;
+    virtual sal_Bool SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL ) = 0;
 
     // Return the text of a previous paragraph. This must not be empty! 
     // If no paragraph exits or just an empty one, then return 0. 
@@ -94,36 +94,36 @@ public:
     //      TRUE: before the normal insertion position (TRUE) 
     //      FALSE: in which the corrected word was inserted. 
     //             (Does not to have to be the same paragraph !!!!)
-    virtual const String* GetPrevPara( BOOL bAtNormalPos ) = 0;
+    virtual const String* GetPrevPara( sal_Bool bAtNormalPos ) = 0;
 
-    virtual BOOL ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
+    virtual sal_Bool ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos,
                                   SvxAutoCorrect& rACorrect,
                                   const String** ppPara ) = 0;
     // Is called after the change of the signs by the functions 
     //	- FnCptlSttWrd
     // 	- FnCptlSttSntnc
     // As an option, the words can then be inserted into the exception lists.
-    virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos,
+    virtual void SaveCpltSttWord( sal_uLong nFlag, xub_StrLen nPos,
                                     const String& rExceptWord,
                                     sal_Unicode cChar );
 
     // which language at the position?
-    virtual LanguageType GetLanguage( xub_StrLen nPos, BOOL bPrevPara = FALSE ) const;
+    virtual LanguageType GetLanguage( xub_StrLen nPos, sal_Bool bPrevPara = sal_False ) const;
 };
 
 
 class EDITENG_DLLPUBLIC SvxAutocorrWord
 {
     String sShort, sLong;
-    BOOL bIsTxtOnly;				// Is pure ASCII - Text
+    sal_Bool bIsTxtOnly;				// Is pure ASCII - Text
 public:
-    SvxAutocorrWord( const String& rS, const String& rL, BOOL bFlag = TRUE )
+    SvxAutocorrWord( const String& rS, const String& rL, sal_Bool bFlag = sal_True )
         : sShort( rS ), sLong( rL ), bIsTxtOnly( bFlag )
     {}
 
     const String& GetShort() const					{ return sShort; }
     const String& GetLong() const					{ return sLong; }
-    BOOL IsTextOnly() const							{ return bIsTxtOnly; }
+    sal_Bool IsTextOnly() const							{ return bIsTxtOnly; }
 };
 
 typedef SvxAutocorrWord* SvxAutocorrWordPtr;
@@ -144,16 +144,16 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
 
     long nFlags;
 
-    BOOL IsFileChanged_Imp();
+    sal_Bool IsFileChanged_Imp();
     void LoadXMLExceptList_Imp( SvStringsISortDtor*& rpLst,
                                 const sal_Char* pStrmName,
                                 SotStorageRef& rStg);
     void SaveExceptList_Imp( const SvStringsISortDtor& rLst,
                                 const sal_Char* pStrmName,
                                 SotStorageRef& rStg,
-                                BOOL bConvert = FALSE);
+                                sal_Bool bConvert = sal_False);
 
-    BOOL MakeBlocklist_Imp( SotStorage& rStg );
+    sal_Bool MakeBlocklist_Imp( SotStorage& rStg );
     void RemoveStream_Imp( const String& rName );
     void MakeUserStorage_Impl();
 
@@ -175,7 +175,7 @@ public:
     void SaveCplSttExceptList();
     void SetCplSttExceptList( SvStringsISortDtor* pList );
     SvStringsISortDtor* GetCplSttExceptList();
-    BOOL AddToCplSttExceptList(const String& rNew);
+    sal_Bool AddToCplSttExceptList(const String& rNew);
 
     // Load, Set, Get the exception list for 2 Capital letters at the
     // begining of a word.
@@ -183,17 +183,17 @@ public:
     void SaveWrdSttExceptList();
     void SetWrdSttExceptList( SvStringsISortDtor* pList );
     SvStringsISortDtor* GetWrdSttExceptList();
-    BOOL AddToWrdSttExceptList(const String& rNew);
+    sal_Bool AddToWrdSttExceptList(const String& rNew);
 
     // Save word substitutions: 
     //      Store these directly in the storage. The word list is updated 
     //      accordingly!
     //	- pure Text
-    BOOL PutText( const String& rShort, const String& rLong );
+    sal_Bool PutText( const String& rShort, const String& rLong );
     //	- Text with attribution (only the SWG - SWG format!)
-    BOOL PutText( const String& rShort, SfxObjectShell& );
+    sal_Bool PutText( const String& rShort, SfxObjectShell& );
     //	- Deleting an entry
-    BOOL DeleteText( const String& rShort );
+    sal_Bool DeleteText( const String& rShort );
 };
 
 
@@ -227,19 +227,19 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
 protected:
     //	- Text with attribution (only the SWG - SWG format!)
     //      rShort is the stream name - encrypted!
-    virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, SfxObjectShell& ,
+    virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, SfxObjectShell& ,
                             String& );
 
     // required language in the table add if possible only when the file exists
-    BOOL 	CreateLanguageFile(LanguageType eLang, BOOL bNewFile = TRUE);
+    sal_Bool 	CreateLanguageFile(LanguageType eLang, sal_Bool bNewFile = sal_True);
     //  - Return the replacement text (only for SWG format, all others can be 
     //      taken from the word list!) 
     //      rShort is the stream name - encrypted!
 public:
 
-    sal_Unicode GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
+    sal_Unicode GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
                             LanguageType eLang ) const;
-    virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong );
+    virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong );
 
     TYPEINFO();
 
@@ -250,12 +250,12 @@ public:
 
     // Execute an AutoCorrect. 
     // Returns what has been executed, according to the above flags
-    ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
-                        xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert, Window* pFrameWin = NULL );
+    sal_uLong AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+                        xub_StrLen nPos, sal_Unicode cInsChar, sal_Bool bInsert );
 
     // Return for the autotext expansion the previous word,  
     // AutoCorrect - corresponding algorithm
-    BOOL GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt,
+    sal_Bool GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nPos, String& rWord ) const;
 
     // Search for or or the words in the replacement table.
@@ -281,24 +281,24 @@ public:
     void SetEndDoubleQuote( const sal_Unicode cEnd ) 		{ cEndDQuote = cEnd; }
 
     String GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                    sal_Unicode cInsChar, BOOL bSttQuote );
+                    sal_Unicode cInsChar, sal_Bool bSttQuote );
     void InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                    sal_Unicode cInsChar, BOOL bSttQuote, BOOL bIns );
+                    sal_Unicode cInsChar, sal_Bool bSttQuote, sal_Bool bIns );
 
     // Query/Set the name of the AutoCorrect file 
     // the default is "autocorr.dat"
     String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
-                                BOOL bNewFile = FALSE,
-                                BOOL bTstUserExist = FALSE ) const;
+                                sal_Bool bNewFile = sal_False,
+                                sal_Bool bTstUserExist = sal_False ) const;
     void SetUserAutoCorrFileName( const String& rNew );
     void SetShareAutoCorrFileName( const String& rNew );
 
     // Query/Set the current settings of AutoCorrect
     long GetFlags() const						{ return nFlags; }
     inline SvxSwAutoFmtFlags&	GetSwFlags()	{ return aSwFlags;}
-    BOOL IsAutoCorrFlag( long nFlag ) const
-                                { return nFlags & nFlag ? TRUE : FALSE; }
-    void SetAutoCorrFlag( long nFlag, BOOL bOn = TRUE );
+    sal_Bool IsAutoCorrFlag( long nFlag ) const
+                                { return nFlags & nFlag ? sal_True : sal_False; }
+    void SetAutoCorrFlag( long nFlag, sal_Bool bOn = sal_True );
 
     // Load, Set, Get - the replacement list
     SvxAutocorrWordList* LoadAutocorrWordList(
@@ -312,14 +312,14 @@ public:
     //      Save these directly in the storage. The word list is updated 
     //      accordingly!
     //	- pure Text
-    BOOL PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM );
+    sal_Bool PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM );
     //	- Text with attribution (only in the SWG - SWG format!)
-    BOOL PutText( const String& rShort, SfxObjectShell& rShell,
+    sal_Bool PutText( const String& rShort, SfxObjectShell& rShell,
                  LanguageType eLang = LANGUAGE_SYSTEM )
         { return _GetLanguageList( eLang ).PutText(rShort, rShell ); }
 
     //	- Delete a entry
-    BOOL DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM);
+    sal_Bool DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM);
 
     // Load, Set, Get - the exception list for capital letters at the 
     // beginning of a sentence
@@ -332,7 +332,7 @@ public:
         {	return _GetLanguageList( eLang ).GetCplSttExceptList(); }
 
     // Adds a single word. The list will be immediately written to the file!
-    BOOL AddCplSttException( const String& rNew,
+    sal_Bool AddCplSttException( const String& rNew,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
 
     // Load, Set, Get the exception list for 2 Capital letters at the 
@@ -345,33 +345,33 @@ public:
                                     LanguageType eLang = LANGUAGE_SYSTEM )
         {	return _GetLanguageList( eLang ).GetWrdSttExceptList(); }
     // Adds a single word. The list will be immediately written to the file!
-    BOOL AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
+    sal_Bool AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
 
     // Search through the Languages for the entry
-    BOOL FindInWrdSttExceptList( LanguageType eLang, const String& sWord );
-    BOOL FindInCplSttExceptList( LanguageType eLang, const String& sWord,
-                                    BOOL bAbbreviation = FALSE);
+    sal_Bool FindInWrdSttExceptList( LanguageType eLang, const String& sWord );
+    sal_Bool FindInCplSttExceptList( LanguageType eLang, const String& sWord,
+                                    sal_Bool bAbbreviation = sal_False);
 
     // Methods for the auto-correction
-    BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnSetINetAttr( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgWeightUnderl( SvxAutoCorrDoc&, const String&,
+    sal_Bool FnChgWeightUnderl( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, BOOL bNormalPos,
+    sal_Bool FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, sal_Bool bNormalPos,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang  = LANGUAGE_SYSTEM);
     bool FnCorrectCapsLock( SvxAutoCorrDoc&, const String&,
@@ -382,7 +382,7 @@ public:
 
     static long			GetDefaultFlags();
 
-// returns TRUE for charcters where the function
+// returns sal_True for charcters where the function
 // 'SvxAutoCorrect::AutoCorrect' should be called.
 // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
     static sal_Bool		IsAutoCorrectChar( sal_Unicode cChar );
diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index f9305e0f76..f9305e0f76 100644..100755
--- a/editeng/inc/editeng/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index 63751d7f16..fbfe9de3c8 100644..100755
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -47,7 +47,7 @@ class EDITENG_DLLPUBLIC SvxFont : public Font
     LanguageType eLang;         // Language
     SvxCaseMap	 eCaseMap;      // Text Markup
     short nEsc;                 // Degree of Superscript/Subscript 
-    BYTE  nPropr;               // Degree of reduction of the font height
+    sal_uInt8  nPropr;          // Degree of reduction of the font height
     short nKern;                // Kerning in Pt
 
 public:
@@ -59,10 +59,10 @@ public:
     inline short GetEscapement() const { return nEsc; }
     inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; }
 
-    inline BYTE GetPropr() const { return nPropr; }
-    inline void SetPropr( const BYTE nNewPropr ) { nPropr = nNewPropr; }
-    inline void SetProprRel( const BYTE nNewPropr )
-        { SetPropr( (BYTE)( (long)nNewPropr * (long)nPropr / 100L ) ); }
+    inline sal_uInt8 GetPropr() const { return nPropr; }
+    inline void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; }
+    inline void SetProprRel( const sal_uInt8 nNewPropr )
+        { SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); }
 
     // Kerning
     inline short GetFixKerning() const { return nKern; }
@@ -76,10 +76,10 @@ public:
         { eLang = eNewLan;  Font::SetLanguage(eNewLan); }
 
     // Is-Methods:
-    inline BOOL IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
-    inline BOOL IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
-    inline BOOL IsKern() const { return 0 != nKern; }
-    inline BOOL IsEsc() const { return 0 != nEsc; }
+    inline sal_Bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
+    inline sal_Bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
+    inline sal_Bool IsKern() const { return 0 != nKern; }
+    inline sal_Bool IsEsc() const { return 0 != nEsc; }
 
     // Consider Upper case, Lower case letters etc.
     String CalcCaseMap( const String &rTxt ) const;
@@ -88,40 +88,40 @@ public:
 #ifndef REDUCEDSVXFONT
     // Handle upper case letters
     void DoOnCapitals( SvxDoCapitals &rDo,
-                       const USHORT nPartLen = USHRT_MAX ) const;
+                       const sal_uInt16 nPartLen = USHRT_MAX ) const;
 
     void SetPhysFont( OutputDevice *pOut ) const;
     Font ChgPhysFont( OutputDevice *pOut ) const;
 
     Size GetCapitalSize( const OutputDevice *pOut, const String &rTxt,
-                          const USHORT nIdx, const USHORT nLen) const;
+                          const sal_uInt16 nIdx, const sal_uInt16 nLen) const;
     void DrawCapital( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-                      const USHORT nIdx, const USHORT nLen ) const;
+                      const sal_uInt16 nIdx, const sal_uInt16 nLen ) const;
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt,
-                         const USHORT nIdx, const USHORT nLen ) const;
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen ) const;
 
     Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt );
 
     Size GetTxtSize( const OutputDevice *pOut, const String &rTxt,
-                      const USHORT nIdx = 0, const USHORT nLen = STRING_LEN );
+                      const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN );
 
     void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-               const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const;
+               const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
-               const USHORT nIdx = 0, const USHORT nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const;
+               const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const;
 
     Size QuickGetTextSize( const OutputDevice *pOut, const String &rTxt,
-                         const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray = NULL ) const;
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen, sal_Int32* pDXArray = NULL ) const;
 
     void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
                    const Point &rPos, const String &rTxt,
-                   const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const;
+                   const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const;
 
 #endif // !REDUCEDSVXFONT
     static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
-        const Size& rSize, const Color& rCol, BOOL bLeft );
+        const Size& rSize, const Color& rCol, sal_Bool bLeft );
     SvxFont&	operator=( const SvxFont& rFont );
     SvxFont&	operator=( const Font& rFont );
 };
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index 1ed8ef222f..17854b3bc3 100644..100755
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -34,9 +34,11 @@
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uInt16S
 #include <svl/svstdarr.hxx>
 #include <editeng/editengdllapi.h>
+
+#include <deque>
 #include <utility>
 #include <vector>
 class Font;
@@ -66,7 +68,7 @@ class SvxNodeIdx
 {
 public:
     virtual ~SvxNodeIdx() {}
-    virtual ULONG	GetIdx() const = 0;
+    virtual sal_uLong	GetIdx() const = 0;
     virtual SvxNodeIdx* Clone() const = 0;	// Cloning itself
 };
 
@@ -75,7 +77,7 @@ class SvxPosition
 public:
     virtual ~SvxPosition() {}
 
-    virtual ULONG		GetNodeIdx() const = 0;
+    virtual sal_uLong	GetNodeIdx() const = 0;
     virtual xub_StrLen	GetCntIdx() const = 0;
 
     virtual SvxPosition* Clone() const = 0; // Cloning itself
@@ -84,24 +86,27 @@ public:
 
 
 typedef Color* ColorPtr;
-SV_DECL_PTRARR( SvxRTFColorTbl, ColorPtr, 16, 4 )
+typedef std::deque< ColorPtr > SvxRTFColorTbl;
 DECLARE_TABLE( SvxRTFFontTbl, Font* )
 DECLARE_TABLE( SvxRTFStyleTbl, SvxRTFStyleType* )
 typedef SvxRTFItemStackType* SvxRTFItemStackTypePtr;
 SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1, 1 )
-SV_DECL_PTRARR_STACK( SvxRTFItemStack, SvxRTFItemStackTypePtr, 0, 1 )
+
+// SvxRTFItemStack can't be "std::stack< SvxRTFItemStackTypePtr >" type, because
+// the methods are using operator[] in sw/source/filter/rtf/rtftbl.cxx file
+typedef std::deque< SvxRTFItemStackTypePtr > SvxRTFItemStack;
 
 // own helper classes for the RTF Parser
 struct SvxRTFStyleType
 {
     SfxItemSet aAttrSet;		// the attributes of Style (+ derivate!)
     String sName;
-    USHORT nBasedOn, nNext;
-    BOOL bBasedOnIsSet;
-    BYTE nOutlineNo;
-    BOOL bIsCharFmt;
+    sal_uInt16 nBasedOn, nNext;
+    sal_Bool bBasedOnIsSet;
+    sal_uInt8 nOutlineNo;
+    sal_Bool bIsCharFmt;
 
-    SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange );
+    SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange );
 };
 
 
@@ -128,14 +133,14 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType
         HEX_MODE
     } nMode;
 
-    USHORT	nType;
+    sal_uInt16	nType;
     sal_uInt32 uPicLen;
-    USHORT	nWidth, nHeight;
-    USHORT	nGoalWidth, nGoalHeight;
-    USHORT	nBitsPerPixel;
-    USHORT	nPlanes;
-    USHORT	nWidthBytes;
-    USHORT	nScalX, nScalY;
+    sal_uInt16	nWidth, nHeight;
+    sal_uInt16	nGoalWidth, nGoalHeight;
+    sal_uInt16	nBitsPerPixel;
+    sal_uInt16	nPlanes;
+    sal_uInt16	nWidthBytes;
+    sal_uInt16	nScalX, nScalY;
     short 	nCropT, nCropB, nCropL, nCropR;
     PictPropertyNameValuePairs aPropertyPairs;
     SvxRTFPictureType() { ResetValues(); }
@@ -148,7 +153,7 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType
 // the SlotIds from POOL.
 struct RTFPlainAttrMapIds
 {
-    USHORT 	nCaseMap,
+    sal_uInt16 	nCaseMap,
             nBgColor,
             nColor,
             nContour,
@@ -191,7 +196,7 @@ struct RTFPlainAttrMapIds
 // the SlotIds from POOL.
 struct RTFPardAttrMapIds
 {
-    USHORT	nLinespacing,
+    sal_uInt16	nLinespacing,
             nAdjust,
             nTabStop,
             nHyphenzone,
@@ -242,23 +247,23 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
     long	nVersionNo;
     int 	nDfltFont;
 
-    BOOL	bNewDoc : 1;			// FALSE - Reading in an existing
-    BOOL	bNewGroup : 1;			// TRUE - there was an opening parenthesis
-    BOOL	bIsSetDfltTab : 1;		// TRUE - DefTab was loaded
-    BOOL	bChkStyleAttr : 1;		// TRUE - StyleSheets are evaluated
-    BOOL	bCalcValue : 1; 		// TRUE - Twip values adapt to App
-    BOOL	bPardTokenRead : 1; 	// TRUE - Token \pard was detected
-    BOOL	bReadDocInfo : 1;		// TRUE - DocInfo to read
-    BOOL	bIsLeftToRightDef : 1; 	// TRUE - in LeftToRight char run def.
-                                    // FALSE - in RightToLeft char run def.
-    BOOL 	bIsInReadStyleTab : 1;	// TRUE - in ReadStyleTable
+    sal_Bool	bNewDoc : 1;			// FALSE - Reading in an existing
+    sal_Bool	bNewGroup : 1;			// TRUE - there was an opening parenthesis
+    sal_Bool	bIsSetDfltTab : 1;		// TRUE - DefTab was loaded
+    sal_Bool	bChkStyleAttr : 1;		// TRUE - StyleSheets are evaluated
+    sal_Bool	bCalcValue : 1; 		// TRUE - Twip values adapt to App
+    sal_Bool	bPardTokenRead : 1; 	// TRUE - Token \pard was detected
+    sal_Bool	bReadDocInfo : 1;		// TRUE - DocInfo to read
+    sal_Bool	bIsLeftToRightDef : 1; 	// TRUE - in LeftToRight char run def.
+                                        // FALSE - in RightToLeft char run def.
+    sal_Bool 	bIsInReadStyleTab : 1;	// TRUE - in ReadStyleTable
 
     void ClearColorTbl();
     void ClearFontTbl();
     void ClearStyleTbl();
     void ClearAttrStack();
 
-    SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=FALSE );	// Create new ItemStackType:s
+    SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=sal_False );	// Create new ItemStackType:s
     void _ClearStyleAttr( SvxRTFItemStackType& rStkType );
 
     // Sets all the attributes that are different from the current
@@ -317,7 +322,7 @@ protected:
 
 
     virtual void InsertText() = 0;
-    virtual void MovePos( int bForward = TRUE ) = 0;
+    virtual void MovePos( int bForward = sal_True ) = 0;
     virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos,
                                  xub_StrLen& rCntPos )=0;
     virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
@@ -331,7 +336,7 @@ protected:
                     SvStream& rIn,
                     ::com::sun::star::uno::Reference<
                         ::com::sun::star::document::XDocumentProperties> i_xDocProps,
-                    int bReadNewDoc = TRUE );
+                    int bReadNewDoc = sal_True );
     virtual ~SvxRTFParser();
 
     int IsNewDoc() const				{ return bNewDoc; }
@@ -355,8 +360,8 @@ protected:
 
     // Query/Set the mapping IDs for the Pard/Plain attributes 
     //(Set: It is noted in the pointers, which thus does not create a copy)
-    void AddPardAttr( USHORT nWhich ) { aPardMap.Insert( nWhich, aPardMap.Count() ); }
-    void AddPlainAttr( USHORT nWhich ) { aPlainMap.Insert( nWhich, aPlainMap.Count() ); }
+    void AddPardAttr( sal_uInt16 nWhich ) { aPardMap.Insert( nWhich, aPardMap.Count() ); }
+    void AddPlainAttr( sal_uInt16 nWhich ) { aPlainMap.Insert( nWhich, aPlainMap.Count() ); }
 
     SvxRTFStyleTbl& GetStyleTbl()				{ return aStyleTbl; }
     SvxRTFItemStack& GetAttrStack() 			{ return aAttrStack; }
@@ -368,7 +373,7 @@ protected:
     // Read the graphics data and make up for the graphics and the picture
     // meta data.
     // Return - TRUE: the graphic is valid
-    BOOL ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType );
+    sal_Bool ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType );
         // Change the ASCII-HexCodes into binary characters. If invalid data is
         // found (strings not 0-9 | a-f | A-F, then USHRT_MAX is returned, 
         // otherwise the number of the converted character.
@@ -378,8 +383,8 @@ public:
 
     virtual SvParserState CallParser();
 
-    inline const Color& GetColor( USHORT nId ) const;
-    const Font& GetFont( USHORT nId );		// Changes the dflt Font
+    inline const Color& GetColor( size_t nId ) const;
+    const Font& GetFont( sal_uInt16 nId );		// Changes the dflt Font
 
     virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0;
 
@@ -392,8 +397,8 @@ public:
     RTFPlainAttrMapIds& GetPlainMap()
                         { return (RTFPlainAttrMapIds&)*aPlainMap.GetData(); }
     // to be able to assign them from the outside as for example table cells
-    void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE );
-    void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE	);
+    void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False );
+    void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False	);
 
     // for asynchronous read from the SvStream
     virtual void Continue( int nToken );
@@ -415,9 +420,9 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType
     SvxNodeIdx	*pSttNd, *pEndNd;
     xub_StrLen nSttCnt, nEndCnt;
     SvxRTFItemStackList* pChildList;
-    USHORT nStyleNo;
+    sal_uInt16 nStyleNo;
 
-    SvxRTFItemStackType( SfxItemPool&, const USHORT* pWhichRange,
+    SvxRTFItemStackType( SfxItemPool&, const sal_uInt16* pWhichRange,
                             const SvxPosition& );
     ~SvxRTFItemStackType();
 
@@ -426,7 +431,7 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType
 
 public:
     SvxRTFItemStackType( const SvxRTFItemStackType&, const SvxPosition&,
-                        int bCopyAttr = FALSE );
+                        int bCopyAttr = sal_False );
     //cmc, I'm very suspicios about SetStartPos, it doesn't change
     //its children's starting position, and the implementation looks
     //bad, consider this deprecated.
@@ -435,8 +440,8 @@ public:
     void MoveFullNode(const SvxNodeIdx &rOldNode,
         const SvxNodeIdx &rNewNode);
 
-    ULONG GetSttNodeIdx() const { return pSttNd->GetIdx(); }
-    ULONG GetEndNodeIdx() const { return pEndNd->GetIdx(); }
+    sal_uLong GetSttNodeIdx() const { return pSttNd->GetIdx(); }
+    sal_uLong GetEndNodeIdx() const { return pEndNd->GetIdx(); }
 
     const SvxNodeIdx& GetSttNode() const { return *pSttNd; }
     const SvxNodeIdx& GetEndNode() const { return *pEndNd; }
@@ -447,7 +452,7 @@ public:
           SfxItemSet& GetAttrSet()			{ return aAttrSet; }
     const SfxItemSet& GetAttrSet() const	{ return aAttrSet; }
 
-    USHORT StyleNo() const	{ return nStyleNo; }
+    sal_uInt16 StyleNo() const	{ return nStyleNo; }
 
     void SetRTFDefaults( const SfxItemSet& rDefaults );
 };
@@ -455,10 +460,10 @@ public:
 
 // ----------- Inline Implementations --------------
 
-inline const Color& SvxRTFParser::GetColor( USHORT nId ) const
+inline const Color& SvxRTFParser::GetColor( size_t nId ) const
 {
     ColorPtr pColor = (ColorPtr)pDfltColor;
-    if( nId < aColorTbl.Count() )
+    if( nId < aColorTbl.size() )
         pColor = aColorTbl[ nId ];
     return *pColor;
 }
@@ -466,7 +471,7 @@ inline const Color& SvxRTFParser::GetColor( USHORT nId ) const
 inline SfxItemSet& SvxRTFParser::GetAttrSet()
 {
     SvxRTFItemStackTypePtr pTmp;
-    if( bNewGroup || 0 == ( pTmp = aAttrStack.Top()) )
+    if( bNewGroup || 0 == ( pTmp = aAttrStack.empty() ? 0 : aAttrStack.back()) )
         pTmp = _GetAttrSet();
     return pTmp->aAttrSet;
 }
diff --git a/editeng/inc/editeng/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index f22b13f403..0f1583744a 100644..100755
--- a/editeng/inc/editeng/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -45,54 +45,54 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
     sal_Unicode cBullet;
     sal_Unicode cByInputBullet;
 
-    USHORT nAutoCmpltWordLen, nAutoCmpltListLen;
-    USHORT nAutoCmpltExpandKey;
+    sal_uInt16 nAutoCmpltWordLen, nAutoCmpltListLen;
+    sal_uInt16 nAutoCmpltExpandKey;
 
-    BYTE nRightMargin;
+    sal_uInt8 nRightMargin;
 
-    BOOL bAutoCorrect : 1;
-    BOOL bCptlSttSntnc : 1;
-    BOOL bCptlSttWrd : 1;
-    BOOL bChkFontAttr : 1;
+    sal_Bool bAutoCorrect : 1;
+    sal_Bool bCptlSttSntnc : 1;
+    sal_Bool bCptlSttWrd : 1;
+    sal_Bool bChkFontAttr : 1;
 
-    BOOL bChgUserColl : 1;
-    BOOL bChgEnumNum : 1;
+    sal_Bool bChgUserColl : 1;
+    sal_Bool bChgEnumNum : 1;
 
-    BOOL bAFmtByInput : 1;
-    BOOL bDelEmptyNode : 1;
-    BOOL bSetNumRule : 1;
+    sal_Bool bAFmtByInput : 1;
+    sal_Bool bDelEmptyNode : 1;
+    sal_Bool bSetNumRule : 1;
 
-    BOOL bChgOrdinalNumber : 1;
-    BOOL bChgToEnEmDash : 1;
-    BOOL bAddNonBrkSpace : 1;
-    BOOL bChgWeightUnderl : 1;
-    BOOL bSetINetAttr : 1;
+    sal_Bool bChgOrdinalNumber : 1;
+    sal_Bool bChgToEnEmDash : 1;
+    sal_Bool bAddNonBrkSpace : 1;
+    sal_Bool bChgWeightUnderl : 1;
+    sal_Bool bSetINetAttr : 1;
 
-    BOOL bSetBorder : 1;
-    BOOL bCreateTable : 1;
-    BOOL bReplaceStyles : 1;
-    BOOL bDummy : 1;
+    sal_Bool bSetBorder : 1;
+    sal_Bool bCreateTable : 1;
+    sal_Bool bReplaceStyles : 1;
+    sal_Bool bDummy : 1;
 
-    BOOL bWithRedlining : 1;
+    sal_Bool bWithRedlining : 1;
 
-    BOOL bRightMargin : 1;
+    sal_Bool bRightMargin : 1;
 
-    BOOL bAutoCompleteWords : 1;
-    BOOL bAutoCmpltCollectWords : 1;
-    BOOL bAutoCmpltEndless : 1;
+    sal_Bool bAutoCompleteWords : 1;
+    sal_Bool bAutoCmpltCollectWords : 1;
+    sal_Bool bAutoCmpltEndless : 1;
 // -- under NT here starts a new long
-    BOOL bAutoCmpltAppendBlanc : 1;
-    BOOL bAutoCmpltShowAsTip : 1;
+    sal_Bool bAutoCmpltAppendBlanc : 1;
+    sal_Bool bAutoCmpltShowAsTip : 1;
 
-    BOOL bAFmtDelSpacesAtSttEnd : 1;
-    BOOL bAFmtDelSpacesBetweenLines : 1;
-    BOOL bAFmtByInpDelSpacesAtSttEnd : 1;
-    BOOL bAFmtByInpDelSpacesBetweenLines : 1;
+    sal_Bool bAFmtDelSpacesAtSttEnd : 1;
+    sal_Bool bAFmtDelSpacesBetweenLines : 1;
+    sal_Bool bAFmtByInpDelSpacesAtSttEnd : 1;
+    sal_Bool bAFmtByInpDelSpacesBetweenLines : 1;
 
-    BOOL bAutoCmpltKeepList : 1;
+    sal_Bool bAutoCmpltKeepList : 1;
 
     // some dummies for any new options
-    BOOL bDummy6 : 1,
+    sal_Bool bDummy6 : 1,
          bDummy7 : 1,
          bDummy8 : 1
          ;
diff --git a/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index 568225ccde..eb0411c6b4 100644..100755
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -84,7 +84,7 @@ public:
     String			GetValueString() const;
 
     // the "old" operator==()
-    BOOL			IsEqual( const SvxTabStop& rTS ) const
+    sal_Bool			IsEqual( const SvxTabStop& rTS ) const
                         {
                             return ( nTabPos     == rTS.nTabPos     &&
                                      eAdjustment == rTS.eAdjustment &&
@@ -93,9 +93,9 @@ public:
                         }
 
     // For the SortedArray:
-    BOOL            operator==( const SvxTabStop& rTS ) const
+    sal_Bool            operator==( const SvxTabStop& rTS ) const
                         { return nTabPos == rTS.nTabPos; }
-    BOOL            operator <( const SvxTabStop& rTS ) const
+    sal_Bool            operator <( const SvxTabStop& rTS ) const
                         { return nTabPos < rTS.nTabPos; }
 
     SvxTabStop&     operator=( const SvxTabStop& rTS )
@@ -124,27 +124,27 @@ class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopA
 public:
     TYPEINFO();
 
-    SvxTabStopItem( USHORT nWhich  );
-    SvxTabStopItem( const USHORT nTabs,
-                    const USHORT nDist,
+    SvxTabStopItem( sal_uInt16 nWhich  );
+    SvxTabStopItem( const sal_uInt16 nTabs,
+                    const sal_uInt16 nDist,
                     const SvxTabAdjust eAdjst /*= SVX_TAB_ADJUST_DEFAULT*/,
-                    USHORT nWhich  );
+                    sal_uInt16 nWhich  );
     SvxTabStopItem( const SvxTabStopItem& rTSI );
 
     // Returns index of the tab or TAB_NOTFOUND
-    USHORT          GetPos( const SvxTabStop& rTab ) const;
+    sal_uInt16          GetPos( const SvxTabStop& rTab ) const;
 
     // Returns index of the tab at nPos, or TAB_NOTFOUND
-    USHORT          GetPos( const long nPos ) const;
+    sal_uInt16          GetPos( const long nPos ) const;
 
     // unprivatized:
-    USHORT          Count() const { return SvxTabStopArr::Count(); }
-    BOOL            Insert( const SvxTabStop& rTab );
-    void            Insert( const SvxTabStopItem* pTabs, USHORT nStart = 0,
-                            USHORT nEnd = USHRT_MAX );
+    sal_uInt16          Count() const { return SvxTabStopArr::Count(); }
+    sal_Bool            Insert( const SvxTabStop& rTab );
+    void            Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart = 0,
+                            sal_uInt16 nEnd = USHRT_MAX );
     void            Remove( SvxTabStop& rTab )
                         { SvxTabStopArr::Remove( rTab ); }
-    void            Remove( const USHORT nPos, const USHORT nLen = 1 )
+    void            Remove( const sal_uInt16 nPos, const sal_uInt16 nLen = 1 )
                         { SvxTabStopArr::Remove( nPos, nLen ); }
 
     // Assignment operator, equality operator (caution: expensive!)
@@ -155,7 +155,7 @@ public:
     //					{ return !( operator==( rTSI ) ); }
 
     // SortedArrays returns only Stackobjects!
-    const SvxTabStop& operator[]( const USHORT nPos ) const
+    const SvxTabStop& operator[]( const sal_uInt16 nPos ) const
                         {
                             DBG_ASSERT( GetStart() &&
                                         nPos < Count(), "op[]" );
@@ -166,8 +166,8 @@ public:
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -175,8 +175,8 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create( SvStream&, USHORT ) const;
-    virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	 Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&		 Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     using SvxTabStopArr::Insert;
     using SvxTabStopArr::Remove;
diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 71c80f8957..6bcf02b0bd 100644..100755
--- a/editeng/inc/editeng/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -44,7 +44,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
     sal_Bool bOn;
 public:
     TYPEINFO();
-    SvxTwoLinesItem( sal_Bool bOn /*= TRUE*/,
+    SvxTwoLinesItem( sal_Bool bOn /*= sal_True*/,
                      sal_Unicode nStartBracket /*= 0*/,
                      sal_Unicode nEndBracket /*= 0*/,
                      sal_uInt16 nId  );
@@ -54,20 +54,18 @@ public:
     // "pure virtual Methods" from SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT nVer) const;
-    virtual SvStream&		Store(SvStream &, USHORT nIVer) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16 nVer) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nIVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
                                     const IntlWrapper* pIntl = 0 ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT			GetVersion( USHORT nFFVer ) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFFVer ) const;
 
     SvxTwoLinesItem& 		operator=( const SvxTwoLinesItem& rCpy )
     {
diff --git a/editeng/inc/editeng/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx
index 275da1c8c1..608b5f3d40 100644..100755
--- a/editeng/inc/editeng/txtrange.hxx
+++ b/editeng/inc/editeng/txtrange.hxx
@@ -30,7 +30,7 @@
 #define _MyTXTRANGE_HXX
 
 #ifndef _TXTRANGE_HXX
-#define _SVSTDARR_BOOLS
+#define _SVSTDARR_sal_BoolS
 #define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #endif
@@ -58,56 +58,56 @@ class EDITENG_DLLPUBLIC TextRanger
     PolyPolygon *mpPolyPolygon; // Surface polygon
     PolyPolygon *mpLinePolyPolygon; // Line polygon
     Rectangle *pBound;	// Comprehensive rectangle
-    USHORT nCacheSize;	// Cache-Size
-    USHORT nCacheIdx;	// Cache-Index
-    USHORT nRight;		// Distance Contour-Text
-    USHORT nLeft;		// Distance Text-Contour
-    USHORT nUpper;		// Distance Contour-Text
-    USHORT nLower;		// Distance Text-Contour
+    sal_uInt16 nCacheSize;	// Cache-Size
+    sal_uInt16 nCacheIdx;	// Cache-Index
+    sal_uInt16 nRight;		// Distance Contour-Text
+    sal_uInt16 nLeft;		// Distance Text-Contour
+    sal_uInt16 nUpper;		// Distance Contour-Text
+    sal_uInt16 nLower;		// Distance Text-Contour
     sal_uInt32 nPointCount; // Number of polygon points
-    BOOL bSimple : 1;	// Just outside edge
-    BOOL bInner  : 1;	// TRUE: Objekt inline (EditEngine);
+    sal_Bool bSimple : 1;	// Just outside edge
+    sal_Bool bInner  : 1;	// TRUE: Objekt inline (EditEngine);
                         // FALSE: Objekt flow (StarWriter);
-    BOOL bVertical :1;	// for vertical writing mode
-    BOOL bFlag3 :1;
-    BOOL bFlag4 :1;
-    BOOL bFlag5 :1;
-    BOOL bFlag6 :1;
-    BOOL bFlag7 :1;
+    sal_Bool bVertical :1;	// for vertical writing mode
+    sal_Bool bFlag3 :1;
+    sal_Bool bFlag4 :1;
+    sal_Bool bFlag5 :1;
+    sal_Bool bFlag6 :1;
+    sal_Bool bFlag7 :1;
     TextRanger( const TextRanger& ); // not implemented
     const Rectangle& _GetBoundRect();
 public:
     TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
-                USHORT nCacheSize, USHORT nLeft, USHORT nRight,
-                BOOL bSimple, BOOL bInner, BOOL bVert = sal_False );
+                sal_uInt16 nCacheSize, sal_uInt16 nLeft, sal_uInt16 nRight,
+                sal_Bool bSimple, sal_Bool bInner, sal_Bool bVert = sal_False );
     ~TextRanger();
     SvLongsPtr GetTextRanges( const Range& rRange );
-    USHORT GetRight() const { return nRight; }
-    USHORT GetLeft() const { return nLeft; }
-    USHORT GetUpper() const { return nUpper; }
-    USHORT GetLower() const { return nLower; }
+    sal_uInt16 GetRight() const { return nRight; }
+    sal_uInt16 GetLeft() const { return nLeft; }
+    sal_uInt16 GetUpper() const { return nUpper; }
+    sal_uInt16 GetLower() const { return nLower; }
     sal_uInt32 GetPointCount() const { return nPointCount; }
-    BOOL IsSimple() const { return bSimple; }
-    BOOL IsInner() const { return bInner; }
-    BOOL IsVertical() const { return bVertical; }
-    BOOL HasBorder() const { return nRight || nLeft; }
+    sal_Bool IsSimple() const { return bSimple; }
+    sal_Bool IsInner() const { return bInner; }
+    sal_Bool IsVertical() const { return bVertical; }
+    sal_Bool HasBorder() const { return nRight || nLeft; }
     const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
     const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; }
     const Rectangle& GetBoundRect()
         { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); }
-    void SetUpper( USHORT nNew ){ nUpper = nNew; }
-    void SetLower( USHORT nNew ){ nLower = nNew; }
-    void SetVertical( BOOL bNew );
-    BOOL IsFlag3() const { return bFlag3; }
-    void SetFlag3( BOOL bNew ) { bFlag3 = bNew; }
-    BOOL IsFlag4() const { return bFlag4; }
-    void SetFlag4( BOOL bNew ) { bFlag4 = bNew; }
-    BOOL IsFlag5() const { return bFlag5; }
-    void SetFlag5( BOOL bNew ) { bFlag5 = bNew; }
-    BOOL IsFlag6() const { return bFlag6; }
-    void SetFlag6( BOOL bNew ) { bFlag6 = bNew; }
-    BOOL IsFlag7() const { return bFlag7; }
-    void SetFlag7( BOOL bNew ) { bFlag7 = bNew; }
+    void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
+    void SetLower( sal_uInt16 nNew ){ nLower = nNew; }
+    void SetVertical( sal_Bool bNew );
+    sal_Bool IsFlag3() const { return bFlag3; }
+    void SetFlag3( sal_Bool bNew ) { bFlag3 = bNew; }
+    sal_Bool IsFlag4() const { return bFlag4; }
+    void SetFlag4( sal_Bool bNew ) { bFlag4 = bNew; }
+    sal_Bool IsFlag5() const { return bFlag5; }
+    void SetFlag5( sal_Bool bNew ) { bFlag5 = bNew; }
+    sal_Bool IsFlag6() const { return bFlag6; }
+    void SetFlag6( sal_Bool bNew ) { bFlag6 = bNew; }
+    sal_Bool IsFlag7() const { return bFlag7; }
+    void SetFlag7( sal_Bool bNew ) { bFlag7 = bNew; }
 };
 
 
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index ab01ff6123..c06bae4e81 100644..100755
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -52,7 +52,7 @@ public:
     TYPEINFO();
 
     SvxTextLineItem( const FontUnderline eSt,
-                     const USHORT nId );
+                     const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,22 +61,20 @@ public:
                             String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16          GetValueCount() const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     // MS VC4.0 messes things up
-    void			 		SetValue( USHORT nNewVal )
+    void			 		SetValue( sal_uInt16 nNewVal )
                                 {SfxEnumItem::SetValue(nNewVal); }
     virtual int 			HasBoolValue() const;
-    virtual BOOL			GetBoolValue() const;
-    virtual void			SetBoolValue( BOOL bVal );
+    virtual sal_Bool			GetBoolValue() const;
+    virtual void			SetBoolValue( sal_Bool bVal );
 
     virtual int 			operator==( const SfxPoolItem& ) const;
 
@@ -91,7 +89,7 @@ public:
     FontUnderline 			GetLineStyle() const
                                 { return (FontUnderline)GetValue(); }
     void 					SetLineStyle( FontUnderline eNew )
-                                { SetValue((USHORT) eNew); }
+                                { SetValue((sal_uInt16) eNew); }
 
     const Color&			GetColor() const				{ return mColor; }
     void 					SetColor( const Color& rCol )	{ mColor = rCol; }
@@ -107,11 +105,11 @@ public:
     TYPEINFO();
 
     SvxUnderlineItem( const FontUnderline eSt,
-                      const USHORT nId );
+                      const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
 };
 
 // class SvxOverlineItem ------------------------------------------------
@@ -124,11 +122,11 @@ public:
     TYPEINFO();
 
     SvxOverlineItem( const FontUnderline eSt,
-                     const USHORT nId );
+                     const sal_uInt16 nId );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
 };
 
 #endif // #ifndef _SVX_UDLNITEM_HXX
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 6f58c5bfbf..d0e38e8dc3 100644..100755
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -45,26 +45,26 @@ namespace rtl
     This item describes the Upper- and Lower space of a page or paragraph.
 */
 
-#define	ULSPACE_16_VERSION	((USHORT)0x0001)
+#define	ULSPACE_16_VERSION	((sal_uInt16)0x0001)
 
 class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
 {
-    USHORT nUpper;  // Upper space
-    USHORT nLower;  // Lower space
-    USHORT nPropUpper, nPropLower;		// relative or absolute (=100%)
+    sal_uInt16 nUpper;  // Upper space
+    sal_uInt16 nLower;  // Lower space
+    sal_uInt16 nPropUpper, nPropLower;		// relative or absolute (=100%)
 public:
     TYPEINFO();
 
-    SvxULSpaceItem( const USHORT nId  );
-    SvxULSpaceItem( const USHORT nUp, const USHORT nLow,
-                    const USHORT nId  );
+    SvxULSpaceItem( const sal_uInt16 nId  );
+    SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
+                    const sal_uInt16 nId  );
     inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -72,24 +72,24 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const;
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT			 GetVersion( USHORT nFileVersion ) const;
-    virtual bool             ScaleMetrics( long nMult, long nDiv );
-    virtual	bool             HasMetrics() const;
-
-    inline void SetUpper( const USHORT nU, const USHORT nProp = 100 );
-    inline void SetLower( const USHORT nL, const USHORT nProp = 100 );
-
-    void SetUpperValue( const USHORT nU ) { nUpper = nU; }
-    void SetLowerValue( const USHORT nL ) { nLower = nL; }
-    void SetPropUpper( const USHORT nU ) { nPropUpper = nU; }
-    void SetPropLower( const USHORT nL ) { nPropLower = nL; }
-
-    USHORT GetUpper() const { return nUpper; }
-    USHORT GetLower() const { return nLower; }
-    USHORT GetPropUpper() const { return nPropUpper; }
-    USHORT GetPropLower() const { return nPropLower; }
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			 GetVersion( sal_uInt16 nFileVersion ) const;
+    virtual bool				 ScaleMetrics( long nMult, long nDiv );
+    virtual	bool				 HasMetrics() const;
+
+    inline void SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp = 100 );
+    inline void SetLower( const sal_uInt16 nL, const sal_uInt16 nProp = 100 );
+
+    void SetUpperValue( const sal_uInt16 nU ) { nUpper = nU; }
+    void SetLowerValue( const sal_uInt16 nL ) { nLower = nL; }
+    void SetPropUpper( const sal_uInt16 nU ) { nPropUpper = nU; }
+    void SetPropLower( const sal_uInt16 nL ) { nPropLower = nL; }
+
+    sal_uInt16 GetUpper() const { return nUpper; }
+    sal_uInt16 GetLower() const { return nLower; }
+    sal_uInt16 GetPropUpper() const { return nPropUpper; }
+    sal_uInt16 GetPropLower() const { return nPropLower; }
 };
 
 inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy )
@@ -101,13 +101,13 @@ inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy )
     return *this;
 }
 
-inline void SvxULSpaceItem::SetUpper( const USHORT nU, const USHORT nProp )
+inline void SvxULSpaceItem::SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp )
 {
-    nUpper = USHORT((ULONG(nU) * nProp ) / 100); nPropUpper = nProp;
+    nUpper = sal_uInt16((sal_uInt32(nU) * nProp ) / 100); nPropUpper = nProp;
 }
-inline void SvxULSpaceItem::SetLower( const USHORT nL, const USHORT nProp )
+inline void SvxULSpaceItem::SetLower( const sal_uInt16 nL, const sal_uInt16 nProp )
 {
-    nLower = USHORT((ULONG(nL) * nProp ) / 100); nPropLower = nProp;
+    nLower = sal_uInt16((sal_uInt32(nL) * nProp ) / 100); nPropLower = nProp;
 }
 
 #endif
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index b352548440..f065cdc0b3 100644..100755
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -50,20 +50,20 @@ class EditEngine;
 class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
 {
 private:
-    ULONG 	mnStart;
-    ULONG 	mnEnd;
+    sal_uLong 	mnStart;
+    sal_uLong 	mnEnd;
 
 public:
             TYPEINFO();
-            SvxEditSourceHint( ULONG nId );
-            SvxEditSourceHint( ULONG nId, ULONG nValue, ULONG nStart=0, ULONG nEnd=0 );
-
-    ULONG 	GetValue() const;
-    ULONG	GetStartValue() const;
-    ULONG	GetEndValue() const;
-    void	SetValue( ULONG n );
-    void	SetStartValue( ULONG n );
-    void	SetEndValue( ULONG n );
+            SvxEditSourceHint( sal_uLong nId );
+            SvxEditSourceHint( sal_uLong nId, sal_uLong nValue, sal_uLong nStart=0, sal_uLong nEnd=0 );
+
+    sal_uLong 	GetValue() const;
+    sal_uLong	GetStartValue() const;
+    sal_uLong	GetEndValue() const;
+    void	SetValue( sal_uLong n );
+    void	SetStartValue( sal_uLong n );
+    void	SetEndValue( sal_uLong n );
 };
 
 /** Helper class for common functionality in edit sources
@@ -102,7 +102,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex );
+    static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex );
 
     /** Convert point from edit engine to user coordinate space
 
diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 2dfd05ec77..a82ab075f5 100644..100755
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -42,20 +42,20 @@ public:
     SvxAccessibleTextAdapter();
     virtual	~SvxAccessibleTextAdapter();
 
-    virtual USHORT			GetParagraphCount() const;
-    virtual USHORT			GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16			GetParagraphCount() const;
+    virtual sal_uInt16			GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String			GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet		GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
-    virtual	SfxItemSet		GetParaAttribs( USHORT nPara ) const;
-    virtual void			SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet		GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
+    virtual	SfxItemSet		GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void			SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void            GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void            GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
     
-    virtual sal_Int32       CalcLogicalIndex( USHORT nPara, USHORT nEEIndex );
-    virtual USHORT          CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex );
+    virtual sal_Int32       CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex );
+    virtual sal_uInt16          CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex );
     
-     virtual USHORT			GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT			GetItemState( USHORT nPara, USHORT nWhich ) const;
+     virtual sal_uInt16			GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16			GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void			QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void			QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -64,46 +64,46 @@ public:
 
     virtual SfxItemPool* 	GetPool() const;
 
-    virtual XubString    	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void 	        FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual XubString    	CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void 	        FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
     
-    virtual BOOL			IsValid() const;
-
-    virtual LanguageType 	GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT			GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo		GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle		GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle		GetParaBounds( USHORT nPara ) const;
+    virtual sal_Bool			IsValid() const;
+
+    virtual LanguageType 	GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16			GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo		GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle		GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle		GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode			GetMapMode() const;
     virtual OutputDevice*	GetRefDevice() const;
-    virtual sal_Bool		GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool		GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT			GetLineCount( USHORT nPara ) const;
-    virtual USHORT			GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     
     virtual sal_Bool        Delete( const ESelection& );
     virtual sal_Bool		InsertText( const String&, const ESelection& );
-    virtual sal_Bool		QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16		GetDepth( USHORT nPara ) const;
-    virtual sal_Bool		SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool		QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16		GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool		SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     // (not needed for accessibility, only for new import API)
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
 
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource); 
     
     void                    SetForwarder( SvxTextForwarder& );
-    sal_Bool			  	HaveImageBullet( USHORT nPara ) const;
-    sal_Bool			  	HaveTextBullet( USHORT nPara ) const;
+    sal_Bool			  	HaveImageBullet( sal_uInt16 nPara ) const;
+    sal_Bool			  	HaveTextBullet( sal_uInt16 nPara ) const;
 
     /** Query whether all text in given selection is editable
 
@@ -125,7 +125,7 @@ public:
     virtual				~SvxAccessibleTextEditViewAdapter();
 
     // SvxViewForwarder interface
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point		PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index db401d59ce..24b90f8ccb 100644..100755
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -152,25 +152,25 @@ class EDITENG_DLLPUBLIC SvxTextForwarder
 public:
     virtual				~SvxTextForwarder();
     
-    virtual USHORT		GetParagraphCount() const = 0;
-    virtual USHORT		GetTextLen( USHORT nParagraph ) const = 0;
+    virtual sal_uInt16		GetParagraphCount() const = 0;
+    virtual sal_uInt16		GetTextLen( sal_uInt16 nParagraph ) const = 0;
     virtual String		GetText( const ESelection& rSel ) const = 0;
-    virtual SfxItemSet	GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const = 0;
-    virtual	SfxItemSet  GetParaAttribs( USHORT nPara ) const = 0;
-    virtual void		SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ) = 0;
+    virtual SfxItemSet	GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const = 0;
+    virtual	SfxItemSet  GetParaAttribs( sal_uInt16 nPara ) const = 0;
+    virtual void		SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ) = 0;
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0;
-    virtual void		GetPortions( USHORT nPara, SvUShorts& rList ) const = 0;
+    virtual void		GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const = 0;
     
-    virtual USHORT		GetItemState( const ESelection& rSel, USHORT nWhich ) const = 0;
-    virtual USHORT		GetItemState( USHORT nPara, USHORT nWhich ) const = 0;
+    virtual sal_uInt16		GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const = 0;
+    virtual sal_uInt16		GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const = 0;
 
     virtual void		QuickInsertText( const String& rText, const ESelection& rSel ) = 0;
     virtual void		QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) = 0;
     virtual void		QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0;
     virtual void		QuickInsertLineBreak( const ESelection& rSel ) = 0;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0;
-    virtual void 	     FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ) = 0;
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0;
+    virtual void 	     FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos ) = 0;
 
     virtual SfxItemPool* GetPool() const = 0;
 
@@ -178,7 +178,7 @@ public:
  
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph() = 0;
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ) = 0;
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet ) = 0;
     
     // XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource) = 0; 
@@ -187,7 +187,7 @@ public:
 
         @return sal_False, if no longer valid
      */
-    virtual BOOL			IsValid() const = 0;
+    virtual sal_Bool			IsValid() const = 0;
 
     /** Query language of character at given position on the underlying edit engine
 
@@ -197,14 +197,14 @@ public:
         @param nIndex[0 .. m-1]
         Index of character to query language of
      */
-    virtual LanguageType	GetLanguage( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual LanguageType	GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query number of fields in the underlying edit engine
 
         @param nPara[0 .. n-1]
         Index of paragraph to query field number in
      */
-    virtual USHORT			GetFieldCount( USHORT nPara ) const = 0;
+    virtual sal_uInt16			GetFieldCount( sal_uInt16 nPara ) const = 0;
 
     /** Query information for given field number in the underlying edit engine
 
@@ -214,14 +214,14 @@ public:
         @param nField[0 .. m-1]
         Index of field to query information of
      */
-    virtual EFieldInfo		GetFieldInfo( USHORT nPara, USHORT nField ) const = 0;
+    virtual EFieldInfo		GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const = 0;
 
     /** Query information regarding bullets for given paragraph on the underlying edit engine
 
         @param nPara[0 .. n-1]
         Index of paragraph to query bullet info on
      */
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const = 0;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const = 0;
 
     /** Query the bounding rectangle of the given character
 
@@ -244,7 +244,7 @@ public:
         left corner of text. The coordinates returned here are to be
         interpreted in the map mode given by GetMapMode().
     */
-    virtual Rectangle		GetCharBounds( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual Rectangle		GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query the bounding rectangle of the given paragraph
 
@@ -255,7 +255,7 @@ public:
         left corner of text. The coordinates returned here are to be
         interpreted in the map mode given by GetMapMode().
      */
-    virtual Rectangle		GetParaBounds( USHORT nPara ) const = 0;
+    virtual Rectangle		GetParaBounds( sal_uInt16 nPara ) const = 0;
 
     /** Query the map mode of the underlying EditEngine/Outliner
 
@@ -292,7 +292,7 @@ public:
         @return sal_True, if the point is over any text and both rPara and rIndex are valid
 
      */
-    virtual sal_Bool		GetIndexAtPoint( const Point& rPoint, USHORT& rPara, USHORT& rIndex ) const = 0;
+    virtual sal_Bool		GetIndexAtPoint( const Point& rPoint, sal_uInt16& rPara, sal_uInt16& rIndex ) const = 0;
 
     /** Get the start and the end index of the word at the given index
 
@@ -317,7 +317,7 @@ public:
 
         @return sal_True, if the result is non-empty
      */
-    virtual sal_Bool		GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& rStart, USHORT& rEnd ) const = 0;
+    virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& rStart, sal_uInt16& rEnd ) const = 0;
 
     /** Query range of similar attributes
 
@@ -334,7 +334,7 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-    virtual sal_Bool 		GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const = 0;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Query number of lines in the formatted paragraph
 
@@ -344,7 +344,7 @@ public:
         @return number of lines in given paragraph
 
      */
-    virtual USHORT			GetLineCount( USHORT nPara ) const = 0;
+    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const = 0;
 
     /** Query line length
 
@@ -355,7 +355,7 @@ public:
         Index of line in paragraph to query line length of
 
      */
-    virtual USHORT			GetLineLen( USHORT nPara, USHORT nLine ) const = 0;
+    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const = 0;
     
     /** Query bounds of line in paragraph
 
@@ -372,7 +372,7 @@ public:
         Index of line in paragraph to query line length of
 
      */
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const = 0;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const = 0;
     
     /** Query the line number for a index in the paragraphs text
 
@@ -385,7 +385,7 @@ public:
         @returns [0 .. k-1]
         The line number of the chara in the paragraph
      */
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const = 0;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
 
     /** Delete given text range and reformat text
 
@@ -414,7 +414,7 @@ public:
 
          @return sal_True if text have been successfully reformatted
       */
-    virtual sal_Bool		QuickFormatDoc( BOOL bFull=FALSE ) = 0;
+    virtual sal_Bool		QuickFormatDoc( sal_Bool bFull=sal_False ) = 0;
 
     /** Get the outline depth of given paragraph
 
@@ -424,7 +424,7 @@ public:
         @return the outline level of the given paragraph. The range is
         [0,n), where n is the maximal outline level.
      */
-    virtual sal_Int16		GetDepth( USHORT nPara ) const = 0;
+    virtual sal_Int16		GetDepth( sal_uInt16 nPara ) const = 0;
 
     /** Set the outline depth of given paragraph
 
@@ -435,11 +435,11 @@ public:
         The depth to set on the given paragraph. The range is
         [0,n), where n is the maximal outline level.
 
-        @return TRUE, if depth could be successfully set. Reasons for
+        @return sal_True, if depth could be successfully set. Reasons for
         failure are e.g. the text does not support outline level
         (EditEngine), or the depth range is exceeded.
      */
-    virtual sal_Bool		SetDepth( USHORT nPara, sal_Int16 nNewDepth ) = 0;
+    virtual sal_Bool		SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth ) = 0;
 
     virtual sal_Int16 GetNumberingStartValue( sal_uInt16 nPara );
     virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue );
@@ -463,7 +463,7 @@ public:
 
         @return sal_False, if no longer valid
      */
-    virtual BOOL		IsValid() const = 0;
+    virtual sal_Bool		IsValid() const = 0;
 
     /** Query visible area of the view containing the text
 
diff --git a/editeng/inc/editeng/unofdesc.hxx b/editeng/inc/editeng/unofdesc.hxx
index f46aeb32b8..f46aeb32b8 100644..100755
--- a/editeng/inc/editeng/unofdesc.hxx
+++ b/editeng/inc/editeng/unofdesc.hxx
diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 33f5ae25b6..33f5ae25b6 100644..100755
--- a/editeng/inc/editeng/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
diff --git a/editeng/inc/editeng/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index e615611a63..3bcf45cb63 100644..100755
--- a/editeng/inc/editeng/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -44,17 +44,17 @@ public:
                         SvxEditEngineForwarder( EditEngine& rEngine );
     virtual				~SvxEditEngineForwarder();
 
-    virtual USHORT		GetParagraphCount() const;
-    virtual USHORT		GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16		GetParagraphCount() const;
+    virtual sal_uInt16		GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String		GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet	GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const;
-    virtual	SfxItemSet	GetParaAttribs( USHORT nPara ) const;
-    virtual void		SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet	GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
+    virtual	SfxItemSet	GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void		SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void		GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void		GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
     
-    virtual USHORT		GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT		GetItemState( USHORT nPara, USHORT nWhich ) const;
+    virtual sal_uInt16		GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16		GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void		QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void		QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -63,36 +63,36 @@ public:
 
     virtual SfxItemPool* GetPool() const;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void 	     FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
-    virtual BOOL		 IsValid() const;
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void 	     FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
+    virtual sal_Bool		 IsValid() const;
 
-    virtual LanguageType 	GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT			GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo		GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle		GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle		GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType 	GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16			GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo		GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle		GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle		GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode			GetMapMode() const;
     virtual OutputDevice*	GetRefDevice() const;
-    virtual sal_Bool		GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool		GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT			GetLineCount( USHORT nPara ) const;
-    virtual USHORT			GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool		Delete( const ESelection& );
     virtual sal_Bool		InsertText( const String&, const ESelection& );
-    virtual sal_Bool		QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16		GetDepth( USHORT nPara ) const;
-    virtual sal_Bool		SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool		QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16		GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool		SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
  
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource); 
 };
diff --git a/editeng/inc/editeng/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index 65e4016cdb..7c17672646 100644..100755
--- a/editeng/inc/editeng/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -42,7 +42,7 @@ class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
 {
 private:
     Outliner&			rOutliner;
-    BOOL				bOutlinerText;
+    sal_Bool				bOutlinerText;
 
     /** this pointer may be null or point to an item set for the attribs of
         the selection maAttribsSelection */
@@ -56,23 +56,23 @@ private:
     mutable SfxItemSet*	mpParaAttribsCache;
 
     /** if we have a cached para attribute item set, this is the paragraph of it */
-    mutable USHORT		mnParaAttribsCache;
+    mutable sal_uInt16		mnParaAttribsCache;
 
 public:
-                        SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText = FALSE );
+                        SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText = sal_False );
     virtual				~SvxOutlinerForwarder();
 
-    virtual USHORT		GetParagraphCount() const;
-    virtual USHORT		GetTextLen( USHORT nParagraph ) const;
+    virtual sal_uInt16		GetParagraphCount() const;
+    virtual sal_uInt16		GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String		GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet	GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
-    virtual	SfxItemSet	GetParaAttribs( USHORT nPara ) const;
-    virtual void		SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+    virtual SfxItemSet	GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
+    virtual	SfxItemSet	GetParaAttribs( sal_uInt16 nPara ) const;
+    virtual void		SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
-    virtual void		GetPortions( USHORT nPara, SvUShorts& rList ) const;
+    virtual void		GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
 
-    virtual USHORT		GetItemState( const ESelection& rSel, USHORT nWhich ) const;
-    virtual USHORT		GetItemState( USHORT nPara, USHORT nWhich ) const;
+    virtual sal_uInt16		GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+    virtual sal_uInt16		GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
 
     virtual void		QuickInsertText( const String& rText, const ESelection& rSel );
     virtual void		QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -81,33 +81,33 @@ public:
 
     virtual SfxItemPool* GetPool() const;
 
-    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void 	     FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual XubString    CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void 	     FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
     
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
 
     Outliner&			GetOutliner() const { return rOutliner; }
 
-    virtual LanguageType 	GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT			GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo		GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle		GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle		GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType 	GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16			GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo		GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle		GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle		GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode			GetMapMode() const;
     virtual OutputDevice*	GetRefDevice() const;
-    virtual sal_Bool		GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool		GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT			GetLineCount( USHORT nPara ) const;
-    virtual USHORT			GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool		Delete( const ESelection& );
     virtual sal_Bool		InsertText( const String&, const ESelection& );
-    virtual sal_Bool		QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16		GetDepth( USHORT nPara ) const;
-    virtual sal_Bool		SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool		QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16		GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool		SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
     virtual sal_Int16       GetNumberingStartValue( sal_uInt16 nPara );
     virtual void            SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue );
 
@@ -121,7 +121,7 @@ public:
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource); 
 };
diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx
index 685d0aa398..685d0aa398 100644..100755
--- a/editeng/inc/editeng/unoipset.hxx
+++ b/editeng/inc/editeng/unoipset.hxx
diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 1989780262..b521917188 100644..100755
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -55,17 +55,17 @@ class Window;
 
 class SvxLinguConfigUpdate
 {
-    static INT32    nCurrentDataFilesChangedCheckValue;
-    static INT16    nNeedUpdating;  // n == -1 => needs to be checked
+    static sal_Int32    nCurrentDataFilesChangedCheckValue;
+    static sal_Int16    nNeedUpdating;  // n == -1 => needs to be checked
                                     // n ==  0 => already updated, nothing to be done
                                     // n ==  1 => needs to be updated
 
-    static INT32 CalcDataFilesChangedCheckValue();
+    static sal_Int32 CalcDataFilesChangedCheckValue();
 
 public:
 
     EDITENG_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
-    static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
+    static sal_Bool IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -155,15 +155,15 @@ struct SvxAlternativeSpelling
     String		aReplacement;
     ::com::sun::star::uno::Reference< 
         ::com::sun::star::linguistic2::XHyphenatedWord >	xHyphWord;
-    INT16  		nChangedPos,
+    sal_Int16  		nChangedPos,
                  nChangedLength;
-    BOOL		bIsAltSpelling;
+    sal_Bool		bIsAltSpelling;
 
     inline SvxAlternativeSpelling();
 };
 
 inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
-    nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(FALSE)
+    nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(sal_False)
 {
 }
 
diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx
index 9b5e80b7ff..9b5e80b7ff 100644..100755
--- a/editeng/inc/editeng/unonrule.hxx
+++ b/editeng/inc/editeng/unonrule.hxx
diff --git a/editeng/inc/editeng/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx
index da4d92d2b7..da4d92d2b7 100644..100755
--- a/editeng/inc/editeng/unopracc.hxx
+++ b/editeng/inc/editeng/unopracc.hxx
diff --git a/editeng/inc/editeng/unoprnms.hxx b/editeng/inc/editeng/unoprnms.hxx
index 8adbc60f36..8adbc60f36 100644..100755
--- a/editeng/inc/editeng/unoprnms.hxx
+++ b/editeng/inc/editeng/unoprnms.hxx
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 32f9af59f7..72a9d5ffbc 100644..100755
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -192,7 +192,7 @@ public:
     virtual sal_uInt16		GetParagraphCount() const;
     virtual sal_uInt16		GetTextLen( sal_uInt16 nParagraph ) const;
     virtual String			GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet		GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const;
+    virtual SfxItemSet		GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = 0 ) const;
     virtual	SfxItemSet		GetParaAttribs( sal_uInt16 nPara ) const;
     virtual void			SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
     virtual void            RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
@@ -209,37 +209,37 @@ public:
     virtual void			QuickInsertLineBreak( const ESelection& rSel );
 
     virtual XubString		CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void 	        FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos );
+    virtual void 	        FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos );
     
     virtual sal_Bool		IsValid() const;
 
     virtual void 			SetNotifyHdl( const Link& );
-    virtual LanguageType 	GetLanguage( USHORT, USHORT ) const;
-    virtual USHORT			GetFieldCount( USHORT nPara ) const;
-    virtual EFieldInfo		GetFieldInfo( USHORT nPara, USHORT nField ) const;
-    virtual EBulletInfo     GetBulletInfo( USHORT nPara ) const;
-    virtual Rectangle		GetCharBounds( USHORT nPara, USHORT nIndex ) const;
-    virtual Rectangle		GetParaBounds( USHORT nPara ) const;
+    virtual LanguageType 	GetLanguage( sal_uInt16, sal_uInt16 ) const;
+    virtual sal_uInt16			GetFieldCount( sal_uInt16 nPara ) const;
+    virtual EFieldInfo		GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+    virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const;
+    virtual Rectangle		GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual Rectangle		GetParaBounds( sal_uInt16 nPara ) const;
     virtual MapMode		 	GetMapMode() const;
     virtual OutputDevice*	GetRefDevice() const;
-    virtual sal_Bool		GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
-    virtual sal_Bool		GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
-    virtual sal_Bool 		GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
-    virtual USHORT			GetLineCount( USHORT nPara ) const;
-    virtual USHORT			GetLineLen( USHORT nPara, USHORT nLine ) const;
-    virtual void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    virtual USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+    virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+    virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
+    virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+    virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    virtual sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool		Delete( const ESelection& );
     virtual sal_Bool		InsertText( const String&, const ESelection& );
-    virtual sal_Bool		QuickFormatDoc( BOOL bFull=FALSE );
-    virtual sal_Int16		GetDepth( USHORT nPara ) const;
-    virtual sal_Bool		SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+    virtual sal_Bool		QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual sal_Int16		GetDepth( sal_uInt16 nPara ) const;
+    virtual sal_Bool		SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
 
     // implementation functions for XParagraphAppend and XTextPortionAppend
     virtual void        AppendParagraph();
-    virtual xub_StrLen  AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+    virtual xub_StrLen  AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
     //XTextCopy
     virtual void        CopyText(const SvxTextForwarder& rSource); 
 };
diff --git a/editeng/inc/editeng/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
index 7e023fd377..62e6215178 100644..100755
--- a/editeng/inc/editeng/unoviwed.hxx
+++ b/editeng/inc/editeng/unoviwed.hxx
@@ -45,7 +45,7 @@ public:
                         SvxEditEngineViewForwarder( EditView& rView );
     virtual				~SvxEditEngineViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
 
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index b0efc092b8..da28f8d05d 100644..100755
--- a/editeng/inc/editeng/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -48,7 +48,7 @@ public:
                         SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft );
     virtual				~SvxDrawOutlinerViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
 
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 79884f91d2..adbe0ab806 100644..100755
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -53,7 +53,7 @@ public:
     TYPEINFO();
 
     SvxWeightItem(  const FontWeight eWght /*= WEIGHT_NORMAL*/,
-                    const USHORT nId  );
+                    const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -62,17 +62,17 @@ public:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
-    virtual USHORT			GetValueCount() const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
+    virtual sal_uInt16			GetValueCount() const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual int 			HasBoolValue() const;
-    virtual BOOL			GetBoolValue() const;
-    virtual void			SetBoolValue( BOOL bVal );
+    virtual sal_Bool			GetBoolValue() const;
+    virtual void			SetBoolValue( sal_Bool bVal );
 
     inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
             SetValue( rWeight.GetValue() );
@@ -83,7 +83,7 @@ public:
     FontWeight				GetWeight() const
                                 { return (FontWeight)GetValue(); }
     void					SetWeight( FontWeight eNew )
-                                { SetValue( (USHORT)eNew ); }
+                                { SetValue( (sal_uInt16)eNew ); }
 };
 
 #endif // #ifndef _SVX_WGHTITEM_HXX
diff --git a/editeng/inc/editeng/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index 9b0d0e89ec..0e280288c2 100644..100755
--- a/editeng/inc/editeng/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -52,12 +52,12 @@ class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
 public:
     TYPEINFO();
 
-    SvxWidowsItem( const BYTE nL /*= 0*/, const USHORT nId  );
+    SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream &, USHORT ) const;
-    virtual SvStream&		Store( SvStream & , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream &, sal_uInt16 ) const;
+    virtual SvStream&		Store( SvStream & , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index a7d569d158..89efe83bce 100644..100755
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -42,15 +42,15 @@ public:
     TYPEINFO();
 
     SvxWritingModeItem( ::com::sun::star::text::WritingMode eValue /*= com::sun::star::text::WritingMode_LR_TB*/,
-                USHORT nWhich /*= SDRATTR_TEXTDIRECTION*/ );
+                sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ );
     virtual ~SvxWritingModeItem();
 
     SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem );
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT) const;
-    virtual SvStream& 		Store(SvStream & rStrm, USHORT nIVer) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16) const;
+    virtual SvStream& 		Store(SvStream & rStrm, sal_uInt16 nIVer) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
     virtual int 			operator==( const SfxPoolItem& ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -59,10 +59,8 @@ public:
                                     String &rText,
                                     const IntlWrapper * = 0 ) const;
 
-    virtual bool      PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId );
-    virtual bool      QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif // #ifndef _SVX_WRITINGMODEITEM_HXX
diff --git a/editeng/inc/editeng/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index 8e7038e6df..9226fca3ef 100644..100755
--- a/editeng/inc/editeng/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -52,13 +52,13 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxWordLineModeItem( const BOOL bWordLineMode /*= FALSE*/,
-                     const USHORT nId  );
+    SvxWordLineModeItem( const sal_Bool bWordLineMode /*= sal_False*/,
+                     const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index 0c048c7c3c..f4469fb93e 100644..100755
--- a/editeng/inc/editeng/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -63,8 +63,8 @@ public:
 
     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
     { return new SvXMLAttrContainerItem( *this ); }
diff --git a/editeng/inc/editxml.hxx b/editeng/inc/editxml.hxx
index 8d103edde3..8d103edde3 100644..100755
--- a/editeng/inc/editxml.hxx
+++ b/editeng/inc/editxml.hxx
diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
index ad64c838bc..83a7288c52 100644..100755
--- a/editeng/inc/helpid.hrc
+++ b/editeng/inc/helpid.hrc
@@ -27,52 +27,31 @@
 #ifndef _EDITENG_HELPID_HRC
 #define _EDITENG_HELPID_HRC
 
-// include ---------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids --------------------------------------------------------------
-#define HID_EDITENG_SPELLER_WORDLANGUAGE                            (HID_EDIT_START)
-#define HID_EDITENG_SPELLER_PARALANGUAGE                            (HID_EDIT_START +  1)
-#define HID_EDITENG_SPELLER_ADDWORD                                 (HID_EDIT_START +  2)
-#define HID_EDITENG_SPELLER_AUTOCORRECT                             (HID_EDIT_START +  3)
-#define HID_EDITENG_SPELLER_IGNORE                                  (HID_EDIT_START +  4)
-#define HID_EDITENG_SPELLER_START                                   (HID_EDIT_START +  5)
-#define HID_AUTOCORR_HELP_END                                       (HID_EDIT_START +  6)
-#define HID_AUTOCORR_HELP_START                                     (HID_EDIT_START +  7)
-#define HID_AUTOCORR_HELP_WORD                                               HID_AUTOCORR_HELP_START
-
-#define HID_AUTOCORR_HELP_SENT                                               (HID_AUTOCORR_HELP_START+1)
-#define HID_AUTOCORR_HELP_SENTWORD                                           (HID_AUTOCORR_HELP_START+2)
-#define HID_AUTOCORR_HELP_ACORWORD                                           (HID_AUTOCORR_HELP_START+3)
-
-#define HID_AUTOCORR_HELP_ACORSENTWORD                                       (HID_AUTOCORR_HELP_START+5)
-
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH                                      (HID_AUTOCORR_HELP_START+7)
-#define HID_AUTOCORR_HELP_WORDENEMDASH                                       (HID_AUTOCORR_HELP_START+8)
-#define HID_AUTOCORR_HELP_SENTENEMDASH                                       (HID_AUTOCORR_HELP_START+9)
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH                                   (HID_AUTOCORR_HELP_START+10)
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH                                   (HID_AUTOCORR_HELP_START+11)
-
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH                               (HID_AUTOCORR_HELP_START+13)
-#define HID_AUTOCORR_HELP_CHGQUOTES                                          (HID_AUTOCORR_HELP_START+15)
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES                                       (HID_AUTOCORR_HELP_START+16)
-#define HID_AUTOCORR_HELP_SETINETATTR                                        (HID_AUTOCORR_HELP_START+17)
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE                                 (HID_AUTOCORR_HELP_START+18)
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL                                    (HID_AUTOCORR_HELP_START+19)
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL                                  (HID_AUTOCORR_HELP_START+20)
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER                                   (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START +  28
-
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_HID_END		(HID_EDIT_START+28)
-#if ACT_SVX_HID_END > HID_EDIT_END
-#error Resource overflow on #line, #file
-#endif
+#define HID_EDITENG_SPELLER_WORDLANGUAGE                   "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE"
+#define HID_EDITENG_SPELLER_PARALANGUAGE                   "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE"
+#define HID_EDITENG_SPELLER_ADDWORD                        "EDITENG_HID_EDITENG_SPELLER_ADDWORD"
+#define HID_EDITENG_SPELLER_AUTOCORRECT                    "EDITENG_HID_EDITENG_SPELLER_AUTOCORRECT"
+#define HID_EDITENG_SPELLER_IGNORE                         "EDITENG_HID_EDITENG_SPELLER_IGNORE"
+#define HID_EDITENG_SPELLER_START                          "EDITENG_HID_EDITENG_SPELLER_START"
+
+#define HID_AUTOCORR_HELP_WORD                             "EDITENG_HID_AUTOCORR_HELP_START"
+#define HID_AUTOCORR_HELP_SENT                             "EDITENG_HID_AUTOCORR_HELP_SENT"
+#define HID_AUTOCORR_HELP_SENTWORD                         "EDITENG_HID_AUTOCORR_HELP_SENTWORD"
+#define HID_AUTOCORR_HELP_ACORWORD                         "EDITENG_HID_AUTOCORR_HELP_ACORWORD"
+#define HID_AUTOCORR_HELP_ACORSENTWORD                     "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORD"
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH                    "EDITENG_HID_AUTOCORR_HELP_CHGTOENEMDASH"
+#define HID_AUTOCORR_HELP_WORDENEMDASH                     "EDITENG_HID_AUTOCORR_HELP_WORDENEMDASH"
+#define HID_AUTOCORR_HELP_SENTENEMDASH                     "EDITENG_HID_AUTOCORR_HELP_SENTENEMDASH"
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH                 "EDITENG_HID_AUTOCORR_HELP_SENTWORDENEMDASH"
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH                 "EDITENG_HID_AUTOCORR_HELP_ACORWORDENEMDASH"
+#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH             "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH"
+#define HID_AUTOCORR_HELP_CHGQUOTES                        "EDITENG_HID_AUTOCORR_HELP_CHGQUOTES"
+#define HID_AUTOCORR_HELP_CHGSGLQUOTES                     "EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES"
+#define HID_AUTOCORR_HELP_SETINETATTR                      "EDITENG_HID_AUTOCORR_HELP_SETINETATTR"
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE               "EDITENG_HID_AUTOCORR_HELP_INGNOREDOUBLESPACE"
+#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL                  "EDITENG_HID_AUTOCORR_HELP_CHGWEIGHTUNDERL"
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL                "EDITENG_HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL"
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER                 "EDITENG_HID_AUTOCORR_HELP_CHGORDINALNUMBER"
 
 #endif
 
diff --git a/editeng/inc/pch/precompiled_editeng.cxx b/editeng/inc/pch/precompiled_editeng.cxx
index 2b5afa0f3c..2b5afa0f3c 100644..100755
--- a/editeng/inc/pch/precompiled_editeng.cxx
+++ b/editeng/inc/pch/precompiled_editeng.cxx
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index e6672c127b..57cd0397f3 100644..100755
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -738,7 +738,6 @@
 #include "svtools/parhtml.hxx"
 #include "svtools/parrtf.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
 #include "svl/poolitem.hxx"
 #include "unotools/printwarningoptions.hxx"
 #include "svl/ptitem.hxx"
@@ -853,7 +852,7 @@
 #include "vcl/cursor.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
 #include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
@@ -872,7 +871,7 @@
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "xmloff/DashStyle.hxx"
 #include "xmloff/GradientStyle.hxx"
 #include "xmloff/HatchStyle.hxx"
diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst
index 551a21bc37..bba7f26667 100644..100755
--- a/editeng/prj/build.lst
+++ b/editeng/prj/build.lst
@@ -1,13 +1,3 @@
-ed	editeng	:	l10n svtools xmloff linguistic NULL
-ed	editeng										usr1	-	all	ed_mkout NULL
-ed	editeng\inc									nmake	-	all	ed_inc NULL
-ed	editeng\source\items						nmake	-	all	ed_items ed_inc NULL
-ed	editeng\source\editeng						nmake	-	all	ed_eeng ed_inc NULL
-ed	editeng\source\misc							nmake	-	all	ed_misc ed_inc NULL
-ed	editeng\source\outliner						nmake	-	all	ed_outl ed_inc NULL
-ed	editeng\source\rtf							nmake	-	all	ed_rtf ed_inc NULL
-ed	editeng\source\uno							nmake	-	all	ed_uno ed_inc NULL
-ed	editeng\source\xml							nmake	-	all	ed_xml ed_inc NULL
-ed	editeng\source\accessibility				nmake	-	all	ed_accessibility ed_inc NULL
-ed  editeng\util                                nmake   -   all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL
+ed	editeng	:	L10N:l10n svtools xmloff linguistic NULL
+ed	editeng\prj									nmake	-	all	ed_prj NULL
 
diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst
index 364c1a8fdd..e69de29bb2 100644..100755
--- a/editeng/prj/d.lst
+++ b/editeng/prj/d.lst
@@ -1,14 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\iediteng.lib %_DEST%\lib%_EXT%\iediteng.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-mkdir: %_DEST%\inc%_EXT%\svx
-..\inc\editeng\*.h %_DEST%\inc%_EXT%\editeng\*.h
-..\inc\editeng\*.hrc %_DEST%\inc%_EXT%\editeng\*.hrc
-..\inc\editeng\*.hxx %_DEST%\inc%_EXT%\editeng\*.hxx
-
diff --git a/framework/util/makefile.pmk b/editeng/prj/makefile.mk
index e567ba01c1..e312a7ccab 100644..100755
--- a/framework/util/makefile.pmk
+++ b/editeng/prj/makefile.mk
@@ -25,14 +25,16 @@
 #
 #*************************************************************************
 
-.INCLUDE :  settings.mk
+PRJ=..
+TARGET=prj
 
-CFLAGS+=-I..$/..$/idl
+.INCLUDE : settings.mk
 
-.IF "$(GUI)"=="UNX"
-PATH_SEPERATOR=":"
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
 .ELSE
-PATH_SEPERATOR=";"
+VERBOSEFLAG := -s
 .ENDIF
 
-JARFILES = uno.jar
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 181e048592..181e048592 100644..100755
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 39a280c18a..39a280c18a 100644..100755
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 5f541c66bc..bc4e5dfd77 100644..100755
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -191,14 +191,14 @@ namespace accessibility
                    "AccessibleEditableTextPara::getLocale: paragraph index value overflow");
 
         // return locale of first character in the paragraph
-        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< USHORT >( GetParagraphIndex() ), 0 ));
+        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< sal_uInt16 >( GetParagraphIndex() ), 0 ));
     }
 
     void AccessibleEditableTextPara::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
-        USHORT nStart, nEnd;
+        sal_uInt16 nStart, nEnd;
 
         if( GetSelection( nStart, nEnd ) )
         {
@@ -232,13 +232,13 @@ namespace accessibility
         DBG_ASSERT(nParaIndex >= 0 && nParaIndex <= USHRT_MAX,
                    "AccessibleEditableTextPara::implGetLineBoundary: paragraph index value overflow");
 
-        const sal_Int32 nTextLen = rCacheTF.GetTextLen( static_cast< USHORT >( nParaIndex ) );
+        const sal_Int32 nTextLen = rCacheTF.GetTextLen( static_cast< sal_uInt16 >( nParaIndex ) );
 
         CheckPosition(nIndex);
 
         rBoundary.startPos = rBoundary.endPos = -1;
 
-        const USHORT nLineCount=rCacheTF.GetLineCount( static_cast< USHORT >( nParaIndex ) );
+        const sal_uInt16 nLineCount=rCacheTF.GetLineCount( static_cast< sal_uInt16 >( nParaIndex ) );
 
         if( nIndex == nTextLen )
         {
@@ -246,7 +246,7 @@ namespace accessibility
             if( nLineCount <= 1 )
                 rBoundary.startPos = 0;
             else
-                rBoundary.startPos = nTextLen - rCacheTF.GetLineLen( static_cast< USHORT >( nParaIndex ),
+                rBoundary.startPos = nTextLen - rCacheTF.GetLineLen( static_cast< sal_uInt16 >( nParaIndex ),
                                                                      nLineCount-1 );
 
             rBoundary.endPos = nTextLen;
@@ -254,15 +254,15 @@ namespace accessibility
         else
         {
             // normal line search
-            USHORT nLine;
+            sal_uInt16 nLine;
             sal_Int32 nCurIndex;
             for( nLine=0, nCurIndex=0; nLine<nLineCount; ++nLine )
             {
-                nCurIndex += rCacheTF.GetLineLen( static_cast< USHORT >( nParaIndex ), nLine);
+                nCurIndex += rCacheTF.GetLineLen( static_cast< sal_uInt16 >( nParaIndex ), nLine);
 
                 if( nCurIndex > nIndex )
                 {
-                    rBoundary.startPos = nCurIndex - rCacheTF.GetLineLen(static_cast< USHORT >( nParaIndex ), nLine);
+                    rBoundary.startPos = nCurIndex - rCacheTF.GetLineLen(static_cast< sal_uInt16 >( nParaIndex ), nLine);
                     rBoundary.endPos = nCurIndex;
                     break;
                 }
@@ -398,9 +398,9 @@ namespace accessibility
                    GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::MakeSelection: index value overflow");
 
-        USHORT nParaIndex = static_cast< USHORT >( GetParagraphIndex() );
-        return ESelection( nParaIndex, static_cast< USHORT >( nStartEEIndex ),
-                           nParaIndex, static_cast< USHORT >( nEndEEIndex ) );
+        sal_uInt16 nParaIndex = static_cast< sal_uInt16 >( GetParagraphIndex() );
+        return ESelection( nParaIndex, static_cast< sal_uInt16 >( nStartEEIndex ),
+                           nParaIndex, static_cast< sal_uInt16 >( nEndEEIndex ) );
     }
 
     ESelection AccessibleEditableTextPara::MakeSelection( sal_Int32 nEEIndex )
@@ -445,12 +445,12 @@ namespace accessibility
         CheckPosition( nEnd );
     }
 
-    sal_Bool AccessibleEditableTextPara::GetSelection( USHORT& nStartPos, USHORT& nEndPos ) SAL_THROW((uno::RuntimeException))
+    sal_Bool AccessibleEditableTextPara::GetSelection( sal_uInt16& nStartPos, sal_uInt16& nEndPos ) SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         ESelection aSelection;
-        USHORT nPara = static_cast< USHORT > ( GetParagraphIndex() );
+        sal_uInt16 nPara = static_cast< sal_uInt16 > ( GetParagraphIndex() );
         if( !GetEditViewForwarder().GetSelection( aSelection ) )
             return sal_False;
 
@@ -504,11 +504,11 @@ namespace accessibility
         return GetTextForwarder().GetText( MakeSelection(nStartIndex, nEndIndex) );
     }
 
-    USHORT AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
+    sal_uInt16 AccessibleEditableTextPara::GetTextLen() const SAL_THROW((uno::RuntimeException))
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
-        return GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
+        return GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
     }
 
     sal_Bool AccessibleEditableTextPara::IsVisible() const
@@ -659,7 +659,7 @@ namespace accessibility
         DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                    "AccessibleEditableTextPara::HaveChildren: paragraph index value overflow");
 
-        return GetTextForwarder().HaveImageBullet( static_cast< USHORT >(GetParagraphIndex()) );
+        return GetTextForwarder().HaveImageBullet( static_cast< sal_uInt16 >(GetParagraphIndex()) );
     }
 
     sal_Bool AccessibleEditableTextPara::IsActive() const SAL_THROW((uno::RuntimeException))
@@ -785,7 +785,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool AccessibleEditableTextPara::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, sal_Int32 nIndex )
+    sal_Bool AccessibleEditableTextPara::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_Int32 nIndex )
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
@@ -797,8 +797,8 @@ namespace accessibility
 
         return GetTextForwarder().GetAttributeRun( nStartIndex,
                                                    nEndIndex,
-                                                   static_cast< USHORT >(GetParagraphIndex()),
-                                                   static_cast< USHORT >(nIndex) );
+                                                   static_cast< sal_uInt16 >(GetParagraphIndex()),
+                                                   static_cast< sal_uInt16 >(nIndex) );
     }
 
     uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException)
@@ -1054,7 +1054,7 @@ namespace accessibility
             SvxTextForwarder& rCacheTF = GetTextForwarder();
             Point aLogPoint( GetViewForwarder().PixelToLogic( aPoint, rCacheTF.GetMapMode() ) );
 
-            EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< USHORT > (GetParagraphIndex()) );
+            EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 > (GetParagraphIndex()) );
 
             if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
                 aBulletInfo.bVisible &&
@@ -1081,7 +1081,7 @@ namespace accessibility
                    "AccessibleEditableTextPara::getBounds: index value overflow");
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        Rectangle aRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        Rectangle aRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
         // convert to screen coordinates
         Rectangle aScreenRect = AccessibleEditableTextPara::LogicToPixel( aRect,
@@ -1179,7 +1179,7 @@ namespace accessibility
 
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
-        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+        sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
@@ -1296,7 +1296,7 @@ namespace accessibility
         CheckPosition( nIndex );
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        Rectangle aRect = rCacheTF.GetCharBounds( static_cast< USHORT >( GetParagraphIndex() ), static_cast< USHORT >( nIndex ) );
+        Rectangle aRect = rCacheTF.GetCharBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ), static_cast< sal_uInt16 >( nIndex ) );
 
         // convert to screen
         Rectangle aScreenRect = AccessibleEditableTextPara::LogicToPixel( aRect,
@@ -1335,7 +1335,7 @@ namespace accessibility
 
         SolarMutexGuard aGuard;
 
-        USHORT nPara, nIndex;
+        sal_uInt16 nPara, nIndex;
 
         // offset from surrounding cell/shape
         Point aOffset( GetEEOffset() );
@@ -1346,7 +1346,7 @@ namespace accessibility
         Point aLogPoint( GetViewForwarder().PixelToLogic( aPoint, rCacheTF.GetMapMode() ) );
 
         // re-offset to parent (paragraph)
-        Rectangle aParaRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        Rectangle aParaRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
         aLogPoint.Move( aParaRect.Left(), aParaRect.Top() );
 
         if( rCacheTF.GetIndexAtPoint( aLogPoint, nPara, nIndex ) &&
@@ -1486,7 +1486,7 @@ namespace accessibility
             // implGetAttributeRunBoundary() method there
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
+                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
                 if( nIndex == nTextLen )
                 {
@@ -1495,7 +1495,7 @@ namespace accessibility
                 }
                 else
                 {
-                    USHORT nStartIndex, nEndIndex;
+                    sal_uInt16 nStartIndex, nEndIndex;
 
                     if( GetAttributeRun(nStartIndex, nEndIndex, nIndex) )
                     {
@@ -1534,8 +1534,8 @@ namespace accessibility
             // implGetAttributeRunBoundary() method there
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< USHORT >( GetParagraphIndex() ) );
-                USHORT nStartIndex, nEndIndex;
+                const sal_Int32 nTextLen = GetTextForwarder().GetTextLen( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
+                sal_uInt16 nStartIndex, nEndIndex;
 
                 if( nIndex == nTextLen )
                 {
@@ -1591,7 +1591,7 @@ namespace accessibility
         {
             case AccessibleTextType::ATTRIBUTE_RUN:
             {
-                USHORT nStartIndex, nEndIndex;
+                sal_uInt16 nStartIndex, nEndIndex;
 
                 if( GetAttributeRun(nStartIndex, nEndIndex, nIndex) )
                 {
@@ -1832,7 +1832,7 @@ namespace accessibility
             // AccessibleEmptyEditSource relies on this behaviour
             GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();	// MUST be after GetEditViewForwarder(), see method docs
-            USHORT nPara = static_cast< USHORT >( GetParagraphIndex() );
+            sal_uInt16 nPara = static_cast< sal_uInt16 >( GetParagraphIndex() );
 
             DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX,
                        "AccessibleEditableTextPara::setAttributes: index value overflow");
@@ -2081,9 +2081,9 @@ namespace accessibility
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
         const sal_Int32 nPara = GetParagraphIndex();
 
-        USHORT nHyperLinks = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLinks = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
@@ -2099,20 +2099,20 @@ namespace accessibility
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
         const sal_Int32 nPara = GetParagraphIndex();
 
-        USHORT nHyperLink = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLink = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
             {
                 if ( nHyperLink == nLinkIndex )
                 {
-                    USHORT nEEStart = aField.aPosition.nIndex;
+                    sal_uInt16 nEEStart = aField.aPosition.nIndex;
 
                     // Translate EE Index to accessible index
-                    USHORT nStart = rT.CalcEditEngineIndex( nPara, nEEStart );
-                    USHORT nEnd = nStart + aField.aCurrentText.Len();
+                    sal_uInt16 nStart = rT.CalcEditEngineIndex( nPara, nEEStart );
+                    sal_uInt16 nEnd = nStart + aField.aCurrentText.Len();
                     xRef = new AccessibleHyperlink( rT, new SvxFieldItem( *aField.pFieldItem ), nPara, nEEStart, nStart, nEnd, aField.aCurrentText );
                     break;
                 }
@@ -2130,13 +2130,13 @@ namespace accessibility
         
 //        SvxAccessibleTextIndex aIndex;
 //        aIndex.SetIndex(nPara, nCharIndex, rT);
-//        const USHORT nEEIndex = aIndex.GetEEIndex();
+//        const sal_uInt16 nEEIndex = aIndex.GetEEIndex();
 
-        const USHORT nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
+        const sal_uInt16 nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex );
         sal_Int32 nHLIndex = 0;
-        USHORT nHyperLink = 0;
-        USHORT nFields = rT.GetFieldCount( nPara );
-        for ( USHORT n = 0; n < nFields; n++ )
+        sal_uInt16 nHyperLink = 0;
+        sal_uInt16 nFields = rT.GetFieldCount( nPara );
+        for ( sal_uInt16 n = 0; n < nFields; n++ )
         {
             EFieldInfo aField = rT.GetFieldInfo( nPara, n );
             if ( aField.pFieldItem->GetField()->ISA( SvxURLField ) )
@@ -2167,8 +2167,8 @@ namespace accessibility
         if (bValidPara)
         {
             // we explicitly allow for the index to point at the character right behind the text
-            if (0 <= nIndex && nIndex <= rCacheTF.GetTextLen( static_cast< USHORT >(nPara) ))
-                nRes = rCacheTF.GetLineNumberAtIndex( static_cast< USHORT >(nPara), static_cast< USHORT >(nIndex) );
+            if (0 <= nIndex && nIndex <= rCacheTF.GetTextLen( static_cast< sal_uInt16 >(nPara) ))
+                nRes = rCacheTF.GetLineNumberAtIndex( static_cast< sal_uInt16 >(nPara), static_cast< sal_uInt16 >(nIndex) );
             else
                 throw lang::IndexOutOfBoundsException();
         }
@@ -2187,10 +2187,10 @@ namespace accessibility
         DBG_ASSERT( bValidPara, "getTextAtLineNumber: current paragraph index out of range" );
         if (bValidPara)
         {
-            if (0 <= nLineNo && nLineNo < rCacheTF.GetLineCount( static_cast< USHORT >(nPara) ))
+            if (0 <= nLineNo && nLineNo < rCacheTF.GetLineCount( static_cast< sal_uInt16 >(nPara) ))
             {
-                USHORT nStart = 0, nEnd = 0;
-                rCacheTF.GetLineBoundaries( nStart, nEnd, static_cast< USHORT >(nPara), static_cast< USHORT >(nLineNo) );
+                sal_uInt16 nStart = 0, nEnd = 0;
+                rCacheTF.GetLineBoundaries( nStart, nEnd, static_cast< sal_uInt16 >(nPara), static_cast< sal_uInt16 >(nLineNo) );
                 if (nStart != 0xFFFF && nEnd != 0xFFFF)
                 {
                     try
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index f36868cb1b..284cc8a11b 100644..100755
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
 namespace accessibility
 {
 
-    AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD ) 
+    AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, sal_uInt16 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD ) 
     : rTA( r )
     { 
         pFld = p; 
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 2a1fe19211..d670aff911 100644..100755
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -52,12 +52,12 @@ namespace accessibility
         
         SvxAccessibleTextAdapter& rTA;
         SvxFieldItem* pFld;
-        USHORT nPara, nRealIdx;  // EE values
+        sal_uInt16 nPara, nRealIdx;  // EE values
         sal_Int32 nStartIdx, nEndIdx;   // translated values
         ::rtl::OUString aDescription;
 
     public:
-        AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, USHORT nP, USHORT nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD );
+        AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, sal_uInt16 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, const ::rtl::OUString& rD );
         ~AccessibleHyperlink();
         
         // XAccessibleAction
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 3d65307c4c..e1dd35b030 100644..100755
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -219,7 +219,7 @@ namespace accessibility
                    "AccessibleImageBullet::getLocale: paragraph index value overflow");
 
         // return locale of first character in the paragraph
-        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< USHORT >( GetParagraphIndex() ), 0 ));
+        return SvxLanguageToLocale(aLocale, GetTextForwarder().GetLanguage( static_cast< sal_uInt16 >( GetParagraphIndex() ), 0 ));
     }
 
     void SAL_CALL AccessibleImageBullet::addEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException)
@@ -272,8 +272,8 @@ namespace accessibility
                    "AccessibleEditableTextPara::getBounds: index value overflow");
 
         SvxTextForwarder& rCacheTF = GetTextForwarder();
-        EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< USHORT > (GetParagraphIndex()) );
-        Rectangle aParentRect = rCacheTF.GetParaBounds( static_cast< USHORT >( GetParagraphIndex() ) );
+        EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 > (GetParagraphIndex()) );
+        Rectangle aParentRect = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( GetParagraphIndex() ) );
 
         if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
             aBulletInfo.bVisible &&
@@ -365,7 +365,7 @@ namespace accessibility
 
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
-        UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+        sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
         return static_cast<sal_Int32>(nColor);
     }
 
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 99932e13fe..99932e13fe 100644..100755
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 7235169368..7235169368 100644..100755
--- a/editeng/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index ad35aab519..b6a55541ec 100644..100755
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -103,8 +103,8 @@ namespace accessibility
                    nEndIndex >= 0 && nEndIndex <= USHRT_MAX ,
                    "AccessibleStaticTextBase_Impl::MakeSelection: index value overflow");
 
-        return ESelection( static_cast< USHORT >(nStartPara), static_cast< USHORT >(nStartIndex),
-                           static_cast< USHORT >(nEndPara), static_cast< USHORT >(nEndIndex) );
+        return ESelection( static_cast< sal_uInt16 >(nStartPara), static_cast< sal_uInt16 >(nStartIndex),
+                           static_cast< sal_uInt16 >(nEndPara), static_cast< sal_uInt16 >(nEndIndex) );
     }
 
     //------------------------------------------------------------------------
@@ -345,7 +345,7 @@ namespace accessibility
 
         sal_Int32 nIndex = 0;
         if( mpTextParagraph )
-            nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< USHORT >(nParagraph) );
+            nIndex = mpTextParagraph->GetTextForwarder().GetLineCount( static_cast< sal_uInt16 >(nParagraph) );
         return nIndex;
     }    
 
@@ -399,7 +399,7 @@ namespace accessibility
                            nFlatIndex - nCurrIndex + nCurrCount >= 0 && nFlatIndex - nCurrIndex + nCurrCount <= USHRT_MAX ,
                            "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow");
 
-                return EPosition( static_cast< USHORT >(nCurrPara), static_cast< USHORT >(nFlatIndex - nCurrIndex + nCurrCount) );
+                return EPosition( static_cast< sal_uInt16 >(nCurrPara), static_cast< sal_uInt16 >(nFlatIndex - nCurrIndex + nCurrCount) );
             }
         }
 
@@ -411,7 +411,7 @@ namespace accessibility
                        nFlatIndex - nCurrIndex + nCurrCount >= 0 && nFlatIndex - nCurrIndex + nCurrCount <= USHRT_MAX ,
                        "AccessibleStaticTextBase_Impl::Index2Internal: index value overflow");
 
-            return EPosition( static_cast< USHORT >(nCurrPara-1), static_cast< USHORT >(nFlatIndex - nCurrIndex + nCurrCount) );
+            return EPosition( static_cast< sal_uInt16 >(nCurrPara-1), static_cast< sal_uInt16 >(nFlatIndex - nCurrIndex + nCurrCount) );
         }
 
         // not found? Out of bounds
@@ -727,8 +727,8 @@ namespace accessibility
 
             // #112814# Use correct index offset
             if ( ( nIndex = rPara.getIndexAtPoint( aPoint ) ) != -1 )
-                return mpImpl->Internal2Index( EPosition(sal::static_int_cast<USHORT>(i),
-                                                         sal::static_int_cast<USHORT>(nIndex)) );
+                return mpImpl->Internal2Index( EPosition(sal::static_int_cast<sal_uInt16>(i),
+                                                         sal::static_int_cast<sal_uInt16>(nIndex)) );
         }
 
         return -1;
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 30d6467227..8f10f038b9 100644..100755
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -68,7 +68,7 @@ sal_Bool AccessibleStringWrap::GetCharacterBounds( sal_Int32 nIndex, Rectangle&
     else
     {
         sal_Int32 aXArray[2];
-        mrDev.GetCaretPositions( maText, aXArray, static_cast< USHORT >(nIndex), 1 );
+        mrDev.GetCaretPositions( maText, aXArray, static_cast< sal_uInt16 >(nIndex), 1 );
         rRect.Left() = 0;
         rRect.Top() = 0;
         rRect.SetSize( Size(mrDev.GetTextHeight(), labs(aXArray[0] - aXArray[1])) );
diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src
index d7ed9ff738..d7ed9ff738 100644..100755
--- a/editeng/source/accessibility/accessibility.src
+++ b/editeng/source/accessibility/accessibility.src
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 8fe6ddcf57..59647d6a90 100644..100755
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -76,13 +76,13 @@ EditAttrib::~EditAttrib()
 // -------------------------------------------------------------------------
 // class EditCharAttrib
 // -------------------------------------------------------------------------
-EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
                     : EditAttrib( rAttr )
 {
     nStart		= nS;
     nEnd		= nE;
-    bFeature	= FALSE;
-    bEdge		= FALSE;
+    bFeature	= sal_False;
+    bEdge		= sal_False;
 
     DBG_ASSERT( ( rAttr.Which() >= EE_ITEMS_START ) && ( rAttr.Which() <= EE_ITEMS_END ), "EditCharAttrib CTOR: Invalid id!" );
     DBG_ASSERT( ( rAttr.Which() < EE_FEATURE_START ) || ( rAttr.Which() > EE_FEATURE_END ) || ( nE == (nS+1) ), "EditCharAttrib CTOR: Invalid feature!" );
@@ -96,7 +96,7 @@ void EditCharAttrib::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribFont
 // -------------------------------------------------------------------------
-EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTINFO || rAttr.Which() == EE_CHAR_FONTINFO_CJK || rAttr.Which() == EE_CHAR_FONTINFO_CTL, "Not a Font attribute!" );
@@ -115,7 +115,7 @@ void EditCharAttribFont::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribItalic
 // -------------------------------------------------------------------------
-EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribItalic::EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_ITALIC || rAttr.Which() == EE_CHAR_ITALIC_CJK || rAttr.Which() == EE_CHAR_ITALIC_CTL, "Not a Italic attribute!" );
@@ -129,7 +129,7 @@ void EditCharAttribItalic::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribWeight
 // -------------------------------------------------------------------------
-EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribWeight::EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_WEIGHT || rAttr.Which() == EE_CHAR_WEIGHT_CJK || rAttr.Which() == EE_CHAR_WEIGHT_CTL, "Not a Weight attribute!" );
@@ -143,7 +143,7 @@ void EditCharAttribWeight::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribUnderline
 // -------------------------------------------------------------------------
-EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_UNDERLINE, "Not a Underline attribute!" );
@@ -159,7 +159,7 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 // -------------------------------------------------------------------------
 // class EditCharAttribOverline
 // -------------------------------------------------------------------------
-EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribOverline::EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_OVERLINE, "Not a overline attribute!" );
@@ -175,7 +175,7 @@ void EditCharAttribOverline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
 // -------------------------------------------------------------------------
 // class EditCharAttribFontHeight
 // -------------------------------------------------------------------------
-EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFontHeight::EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTHEIGHT || rAttr.Which() == EE_CHAR_FONTHEIGHT_CJK || rAttr.Which() == EE_CHAR_FONTHEIGHT_CTL, "Not a Height attribute!" );
@@ -190,7 +190,7 @@ void EditCharAttribFontHeight::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribFontWidth
 // -------------------------------------------------------------------------
-EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribFontWidth::EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_FONTWIDTH, "Not a Width attribute!" );
@@ -204,7 +204,7 @@ void EditCharAttribFontWidth::SetFont( SvxFont& /*rFont*/, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribStrikeout
 // -------------------------------------------------------------------------
-EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribStrikeout::EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_STRIKEOUT, "Not a Size attribute!" );
@@ -218,7 +218,7 @@ void EditCharAttribStrikeout::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribColor
 // -------------------------------------------------------------------------
-EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribColor::EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_COLOR, "Not a Color attribute!" );
@@ -232,7 +232,7 @@ void EditCharAttribColor::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribLanguage
 // -------------------------------------------------------------------------
-EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribLanguage::EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( ( rAttr.Which() == EE_CHAR_LANGUAGE ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CJK ) || ( rAttr.Which() == EE_CHAR_LANGUAGE_CTL ), "Not a Language attribute!" );
@@ -246,7 +246,7 @@ void EditCharAttribLanguage::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribShadow
 // -------------------------------------------------------------------------
-EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_SHADOW, "Not a Shadow attribute!" );
@@ -254,26 +254,22 @@ EditCharAttribShadow::EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT
 
 void EditCharAttribShadow::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    rFont.SetShadow( (BOOL)((const SvxShadowedItem*)GetItem())->GetValue() );
+    rFont.SetShadow( (sal_Bool)((const SvxShadowedItem*)GetItem())->GetValue() );
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribEscapement
 // -------------------------------------------------------------------------
-EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_ESCAPEMENT, "Not a escapement attribute!" );
 }
 
-#if defined( WIN ) && !defined( WNT )
-#pragma optimize ("", off)
-#endif
-
 void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    USHORT nProp = ((const SvxEscapementItem*)GetItem())->GetProp();
-    rFont.SetPropr( (BYTE)nProp );
+    sal_uInt16 nProp = ((const SvxEscapementItem*)GetItem())->GetProp();
+    rFont.SetPropr( (sal_uInt8)nProp );
 
     short nEsc = ((const SvxEscapementItem*)GetItem())->GetEsc();
     if ( nEsc == DFLT_ESC_AUTO_SUPER )
@@ -283,15 +279,10 @@ void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
     rFont.SetEscapement( nEsc );
 }
 
-#if defined( WIN ) && !defined( WNT )
-#pragma optimize ("", on)
-#endif
-
-
 // -------------------------------------------------------------------------
 // class EditCharAttribOutline
 // -------------------------------------------------------------------------
-EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_OUTLINE, "Not a Outline attribute!" );
@@ -299,16 +290,16 @@ EditCharAttribOutline::EditCharAttribOutline( const SvxContourItem& rAttr, USHOR
 
 void EditCharAttribOutline::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    rFont.SetOutline( (BOOL)((const SvxContourItem*)GetItem())->GetValue() );
+    rFont.SetOutline( (sal_Bool)((const SvxContourItem*)GetItem())->GetValue() );
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribTab
 // -------------------------------------------------------------------------
-EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, USHORT nPos )
+EditCharAttribTab::EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE );
+    SetFeature( sal_True );
 }
 
 void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* )
@@ -318,10 +309,10 @@ void EditCharAttribTab::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribLineBreak
 // -------------------------------------------------------------------------
-EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, USHORT nPos )
+EditCharAttribLineBreak::EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE );
+    SetFeature( sal_True );
 }
 
 void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* )
@@ -331,10 +322,10 @@ void EditCharAttribLineBreak::SetFont( SvxFont&, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribField
 // -------------------------------------------------------------------------
-EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, USHORT nPos )
+EditCharAttribField::EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos )
     : EditCharAttrib( rAttr, nPos, nPos+1 )
 {
-    SetFeature( TRUE );	// !!!
+    SetFeature( sal_True );	// !!!
     pTxtColor = 0;
     pFldColor = 0;
 }
@@ -344,7 +335,7 @@ void EditCharAttribField::SetFont( SvxFont& rFont, OutputDevice* )
     if ( pFldColor )
     {
         rFont.SetFillColor( *pFldColor );
-        rFont.SetTransparent( FALSE );
+        rFont.SetTransparent( sal_False );
     }
     if ( pTxtColor )
         rFont.SetColor( *pTxtColor );
@@ -364,28 +355,28 @@ EditCharAttribField::~EditCharAttribField()
     Reset();
 }
 
-BOOL EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const
+sal_Bool EditCharAttribField::operator == ( const EditCharAttribField& rAttr ) const
 {
     if ( aFieldValue != rAttr.aFieldValue )
-        return FALSE;
+        return sal_False;
 
     if ( ( pTxtColor && !rAttr.pTxtColor ) || ( !pTxtColor && rAttr.pTxtColor ) )
-        return FALSE;
+        return sal_False;
     if ( ( pTxtColor && rAttr.pTxtColor ) && ( *pTxtColor != *rAttr.pTxtColor ) )
-        return FALSE;
+        return sal_False;
 
     if ( ( pFldColor && !rAttr.pFldColor ) || ( !pFldColor && rAttr.pFldColor ) )
-        return FALSE;
+        return sal_False;
     if ( ( pFldColor && rAttr.pFldColor ) && ( *pFldColor != *rAttr.pFldColor ) )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -------------------------------------------------------------------------
 // class EditCharAttribPairKerning
 // -------------------------------------------------------------------------
-EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribPairKerning::EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_PAIRKERNING, "Not a Pair Kerning!" );
@@ -399,7 +390,7 @@ void EditCharAttribPairKerning::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribKerning
 // -------------------------------------------------------------------------
-EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribKerning::EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_KERNING, "Not a Kerning!" );
@@ -413,7 +404,7 @@ void EditCharAttribKerning::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribWordLineMode
 // -------------------------------------------------------------------------
-EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribWordLineMode::EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
 : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_WLM, "Not a Kerning!" );
@@ -427,7 +418,7 @@ void EditCharAttribWordLineMode::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribEmphasisMark
 // -------------------------------------------------------------------------
-EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribEmphasisMark::EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_EMPHASISMARK, "Not a Emphasis attribute!" );
@@ -441,7 +432,7 @@ void EditCharAttribEmphasisMark::SetFont( SvxFont& rFont, OutputDevice* )
 // -------------------------------------------------------------------------
 // class EditCharAttribRelief
 // -------------------------------------------------------------------------
-EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT _nStart, USHORT _nEnd )
+EditCharAttribRelief::EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
     DBG_ASSERT( rAttr.Which() == EE_CHAR_RELIEF, "Not a relief attribute!" );
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 4434a943e0..e4d73082b1 100644..100755
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -57,7 +57,7 @@ class SvxCharReliefItem;
 
 class SfxVoidItem;
 
-#define CH_FEATURE_OLD	(BYTE)			0xFF
+#define CH_FEATURE_OLD	(sal_uInt8)			0xFF
 #define CH_FEATURE		(sal_Unicode) 	0x01
 
 // DEF_METRIC: For my pool, the DefMetric should always appear when 
@@ -84,7 +84,7 @@ public:
     // RemoveFromPool must always be called before the destructor!!
     void				RemoveFromPool( SfxItemPool& rPool );
 
-    USHORT				Which() const	{ return pItem->Which(); }
+    sal_uInt16				Which() const	{ return pItem->Which(); }
     const SfxPoolItem*	GetItem() const	{ return pItem; }
 };
 
@@ -97,72 +97,72 @@ class EditCharAttrib : public EditAttrib
 {
 protected:
 
-    USHORT 				nStart;
-    USHORT 				nEnd;
-    BOOL				bFeature	:1;
-    BOOL				bEdge		:1;
+    sal_uInt16 				nStart;
+    sal_uInt16 				nEnd;
+    sal_Bool				bFeature	:1;
+    sal_Bool				bEdge		:1;
 
 public:
-            EditCharAttrib( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd );
+            EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    USHORT&			GetStart()					{ return nStart; }
-    USHORT&			GetEnd()					{ return nEnd; }
+    sal_uInt16&			GetStart()					{ return nStart; }
+    sal_uInt16&			GetEnd()					{ return nEnd; }
 
-    USHORT			GetStart() const			{ return nStart; }
-    USHORT			GetEnd() const				{ return nEnd; }
+    sal_uInt16			GetStart() const			{ return nStart; }
+    sal_uInt16			GetEnd() const				{ return nEnd; }
 
-    inline USHORT	GetLen() const;
+    inline sal_uInt16	GetLen() const;
 
-    inline void		MoveForward( USHORT nDiff );
-    inline void		MoveBackward( USHORT nDiff );
+    inline void		MoveForward( sal_uInt16 nDiff );
+    inline void		MoveBackward( sal_uInt16 nDiff );
 
-    inline void		Expand( USHORT nDiff );
-    inline void		Collaps( USHORT nDiff );
+    inline void		Expand( sal_uInt16 nDiff );
+    inline void		Collaps( sal_uInt16 nDiff );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 
-    BOOL	IsIn( USHORT nIndex )
+    sal_Bool	IsIn( sal_uInt16 nIndex )
                 { return ( ( nStart <= nIndex ) && ( nEnd >= nIndex ) ); }
-    BOOL	IsInside( USHORT nIndex )
+    sal_Bool	IsInside( sal_uInt16 nIndex )
                 { return ( ( nStart < nIndex ) && ( nEnd > nIndex ) ); }
-    BOOL	IsEmpty()
+    sal_Bool	IsEmpty()
                 { return nStart == nEnd; }
 
-    BOOL	IsFeature() const	{ return bFeature; }
-    void	SetFeature( BOOL b) { bFeature = b; }
+    sal_Bool	IsFeature() const	{ return bFeature; }
+    void	SetFeature( sal_Bool b) { bFeature = b; }
 
-    BOOL	IsEdge() const		{ return bEdge; }
-    void	SetEdge( BOOL b )	{ bEdge = b; }
+    sal_Bool	IsEdge() const		{ return bEdge; }
+    void	SetEdge( sal_Bool b )	{ bEdge = b; }
 };
 
-inline USHORT EditCharAttrib::GetLen() const
+inline sal_uInt16 EditCharAttrib::GetLen() const
 {
     DBG_ASSERT( nEnd >= nStart, "EditCharAttrib: nEnd < nStart!" );
     return nEnd-nStart;
 }
 
-inline void EditCharAttrib::MoveForward( USHORT nDiff )
+inline void EditCharAttrib::MoveForward( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ((long)nEnd + nDiff) <= 0xFFFF, "EditCharAttrib: MoveForward?!" );
     nStart = nStart + nDiff;
     nEnd = nEnd + nDiff;
 }
 
-inline void EditCharAttrib::MoveBackward( USHORT nDiff )
+inline void EditCharAttrib::MoveBackward( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ((long)nStart - nDiff) >= 0, "EditCharAttrib: MoveBackward?!" );
     nStart = nStart - nDiff;
     nEnd = nEnd - nDiff;
 }
 
-inline void	EditCharAttrib::Expand( USHORT nDiff )
+inline void	EditCharAttrib::Expand( sal_uInt16 nDiff )
 {
     DBG_ASSERT( ( ((long)nEnd + nDiff) <= (long)0xFFFF ), "EditCharAttrib: Expand?!" );
     DBG_ASSERT( !bFeature, "Please do not expand any features!" );
     nEnd = nEnd + nDiff;
 }
 
-inline void	EditCharAttrib::Collaps( USHORT nDiff )
+inline void	EditCharAttrib::Collaps( sal_uInt16 nDiff )
 {
     DBG_ASSERT( (long)nEnd - nDiff >= (long)nStart, "EditCharAttrib: Collaps?!" );
     DBG_ASSERT( !bFeature, "Please do not shrink any Features!" );
@@ -175,7 +175,7 @@ inline void	EditCharAttrib::Collaps( USHORT nDiff )
 class EditCharAttribFont: public EditCharAttrib
 {
 public:
-    EditCharAttribFont( const SvxFontItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -186,7 +186,7 @@ public:
 class EditCharAttribWeight : public EditCharAttrib
 {
 public:
-    EditCharAttribWeight( const SvxWeightItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -196,7 +196,7 @@ public:
 class EditCharAttribItalic : public EditCharAttrib
 {
 public:
-    EditCharAttribItalic( const SvxPostureItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -207,7 +207,7 @@ public:
 class EditCharAttribShadow : public EditCharAttrib
 {
 public:
-    EditCharAttribShadow( const SvxShadowedItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -218,7 +218,7 @@ public:
 class EditCharAttribEscapement : public EditCharAttrib
 {
 public:
-    EditCharAttribEscapement( const SvxEscapementItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -229,7 +229,7 @@ public:
 class EditCharAttribOutline : public EditCharAttrib
 {
 public:
-    EditCharAttribOutline( const SvxContourItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -240,7 +240,7 @@ public:
 class EditCharAttribStrikeout : public EditCharAttrib
 {
 public:
-    EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -251,7 +251,7 @@ public:
 class EditCharAttribUnderline : public EditCharAttrib
 {
 public:
-    EditCharAttribUnderline( const SvxUnderlineItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -262,7 +262,7 @@ public:
 class EditCharAttribOverline : public EditCharAttrib
 {
 public:
-    EditCharAttribOverline( const SvxOverlineItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -273,7 +273,7 @@ public:
 class EditCharAttribEmphasisMark : public EditCharAttrib
 {
 public:
-    EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -284,7 +284,7 @@ public:
 class EditCharAttribRelief : public EditCharAttrib
 {
 public:
-    EditCharAttribRelief( const SvxCharReliefItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -295,7 +295,7 @@ public:
 class EditCharAttribFontHeight : public EditCharAttrib
 {
 public:
-    EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -306,7 +306,7 @@ public:
 class EditCharAttribFontWidth : public EditCharAttrib
 {
 public:
-    EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -317,7 +317,7 @@ public:
 class EditCharAttribColor : public EditCharAttrib
 {
 public:
-    EditCharAttribColor( const SvxColorItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -328,7 +328,7 @@ public:
 class EditCharAttribLanguage : public EditCharAttrib
 {
 public:
-    EditCharAttribLanguage( const SvxLanguageItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -339,7 +339,7 @@ public:
 class EditCharAttribTab : public EditCharAttrib
 {
 public:
-    EditCharAttribTab( const SfxVoidItem& rAttr, USHORT nPos );
+    EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -350,7 +350,7 @@ public:
 class EditCharAttribLineBreak : public EditCharAttrib
 {
 public:
-    EditCharAttribLineBreak( const SfxVoidItem& rAttr, USHORT nPos );
+    EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -367,12 +367,12 @@ class EditCharAttribField: public EditCharAttrib
     EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) const;
 
 public:
-    EditCharAttribField( const SvxFieldItem& rAttr, USHORT nPos );
+    EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos );
     EditCharAttribField( const EditCharAttribField& rAttr );
     ~EditCharAttribField();
 
-    BOOL operator == ( const EditCharAttribField& rAttr ) const;
-    BOOL operator != ( const EditCharAttribField& rAttr ) const
+    sal_Bool operator == ( const EditCharAttribField& rAttr ) const;
+    sal_Bool operator != ( const EditCharAttribField& rAttr ) const
                                     { return !(operator == ( rAttr ) ); }
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
@@ -396,7 +396,7 @@ public:
 class EditCharAttribPairKerning : public EditCharAttrib
 {
 public:
-    EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -407,7 +407,7 @@ public:
 class EditCharAttribKerning : public EditCharAttrib
 {
 public:
-    EditCharAttribKerning( const SvxKerningItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
@@ -418,7 +418,7 @@ public:
 class EditCharAttribWordLineMode: public EditCharAttrib
 {
 public:
-    EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, USHORT nStart, USHORT nEnd );
+    EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     virtual void 	SetFont( SvxFont& rFont, OutputDevice* pOutDev );
 };
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index f56b1483c8..2b22328738 100644..100755
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -88,7 +88,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_PARA_NUMBULLET:
             {
             aDebStr += "NumItem ";
-            for ( USHORT nLevel = 0; nLevel < 3; nLevel++ )
+            for ( sal_uInt16 nLevel = 0; nLevel < 3; nLevel++ )
             {
                 aDebStr += "Level";
                 aDebStr += ByteString::CreateFromInt32( nLevel );
@@ -148,14 +148,14 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             else if ( ((SvxLineSpacingItem&)rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
             {
                 aDebStr += "Prop: ";
-                aDebStr += ByteString::CreateFromInt32( (ULONG)((SvxLineSpacingItem&)rItem).GetPropLineSpace() );
+                aDebStr += ByteString::CreateFromInt32( (sal_uLong)((SvxLineSpacingItem&)rItem).GetPropLineSpace() );
             }
             else
                 aDebStr += "Unsupported Type!";
         break;
         case EE_PARA_JUST:
             aDebStr += "SvxAdust=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxAdjustItem&)rItem).GetAdjust() );
         break;
         case EE_PARA_TABS:
         {
@@ -165,7 +165,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             if ( rTabs.Count() )
             {
                 aDebStr += "( ";
-                for ( USHORT i = 0; i < rTabs.Count(); i++ )
+                for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
                 {
                     const SvxTabStop& rTab = rTabs[i];
                     aDebStr += ByteString::CreateFromInt32( rTab.GetTabPos() );
@@ -179,17 +179,17 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_CHAR_LANGUAGE_CJK:
         case EE_CHAR_LANGUAGE_CTL:
             aDebStr += "Language=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxLanguageItem&)rItem).GetLanguage() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxLanguageItem&)rItem).GetLanguage() );
         break;
         case EE_CHAR_COLOR:
         {
             aDebStr += "Color= ";
             Color aColor( ((SvxColorItem&)rItem).GetValue() );
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetRed() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetRed() );
             aDebStr += ", ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetGreen() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetGreen() );
             aDebStr += ", ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)aColor.GetBlue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)aColor.GetBlue() );
         }
         break;
         case EE_CHAR_FONTINFO:
@@ -199,7 +199,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
             aDebStr += "Font=";
             aDebStr += ByteString( ((SvxFontItem&)rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US );
             aDebStr += " (CharSet: ";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxFontItem&)rItem).GetCharSet() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxFontItem&)rItem).GetCharSet() );
             aDebStr += ')';
         }
         break;
@@ -229,41 +229,41 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         case EE_CHAR_WEIGHT_CJK:
         case EE_CHAR_WEIGHT_CTL:
             aDebStr += "FontWeight=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxWeightItem&)rItem).GetWeight() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxWeightItem&)rItem).GetWeight() );
         break;
         case EE_CHAR_UNDERLINE:
             aDebStr += "FontUnderline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxUnderlineItem&)rItem).GetLineStyle() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxUnderlineItem&)rItem).GetLineStyle() );
         break;
         case EE_CHAR_OVERLINE:
             aDebStr += "FontOverline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxOverlineItem&)rItem).GetLineStyle() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxOverlineItem&)rItem).GetLineStyle() );
         break;
         case EE_CHAR_EMPHASISMARK:
             aDebStr += "FontUnderline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxEmphasisMarkItem&)rItem).GetEmphasisMark() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxEmphasisMarkItem&)rItem).GetEmphasisMark() );
         break;
         case EE_CHAR_RELIEF:
             aDebStr += "FontRelief=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxCharReliefItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxCharReliefItem&)rItem).GetValue() );
         break;
         case EE_CHAR_STRIKEOUT:
             aDebStr += "FontStrikeout=";
-            aDebStr +=ByteString::CreateFromInt32(  (USHORT)((SvxCrossedOutItem&)rItem).GetStrikeout() );
+            aDebStr +=ByteString::CreateFromInt32(  (sal_uInt16)((SvxCrossedOutItem&)rItem).GetStrikeout() );
         break;
         case EE_CHAR_ITALIC:
         case EE_CHAR_ITALIC_CJK:
         case EE_CHAR_ITALIC_CTL:
             aDebStr += "FontPosture=";
-            aDebStr +=ByteString::CreateFromInt32(  (USHORT)((SvxPostureItem&)rItem).GetPosture() );
+            aDebStr +=ByteString::CreateFromInt32(  (sal_uInt16)((SvxPostureItem&)rItem).GetPosture() );
         break;
         case EE_CHAR_OUTLINE:
             aDebStr += "FontOutline=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxContourItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxContourItem&)rItem).GetValue() );
         break;
         case EE_CHAR_SHADOW:
             aDebStr += "FontShadowed=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxShadowedItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxShadowedItem&)rItem).GetValue() );
         break;
         case EE_CHAR_ESCAPEMENT:
             aDebStr += "Escape=";
@@ -273,7 +273,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         break;
         case EE_CHAR_PAIRKERNING:
             aDebStr += "PairKerning=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxAutoKernItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxAutoKernItem&)rItem).GetValue() );
         break;
         case EE_CHAR_KERNING:
         {
@@ -290,7 +290,7 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
         break;
         case EE_CHAR_WLM:
             aDebStr += "WordLineMode=";
-            aDebStr += ByteString::CreateFromInt32( (USHORT)((SvxWordLineModeItem&)rItem).GetValue() );
+            aDebStr += ByteString::CreateFromInt32( (sal_uInt16)((SvxWordLineModeItem&)rItem).GetValue() );
         break;
         case EE_CHAR_XMLATTRIBS:
             aDebStr += "XMLAttribs=...";
@@ -299,9 +299,9 @@ ByteString DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem )
     return aDebStr;
 }
 
-void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL )
+void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL )
 {
-    for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         fprintf( fp, "\nWhich: %i\t", nWhich );
         if ( rSet.GetItemState( nWhich, bSearchInParent ) == SFX_ITEM_OFF )
@@ -320,7 +320,7 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL
     }
 }
 
-void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
+void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
 {
 #if defined UNX
     FILE* fp = fopen( "/tmp/debug.log", "w" );
@@ -338,7 +338,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "================================================================================" );
     fprintf( fp, "\n==================   Document   ================================================" );
     fprintf( fp, "\n================================================================================" );
-    for ( USHORT nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
+    for ( sal_uInt16 nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
     {
 
         ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions().GetObject(nPortion );
@@ -348,11 +348,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         if ( pStyle )
             fprintf( fp, " %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
         fprintf( fp, "\nParagraph attribute:" );
-        DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), FALSE, FALSE );
+        DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False );
 
         fprintf( fp, "\nCharacter attribute:" );
-        BOOL bZeroAttr = FALSE;
-        USHORT z;
+        sal_Bool bZeroAttr = sal_False;
+        sal_uInt16 z;
         for ( z = 0; z < pPPortion->GetNode()->GetCharAttribs().Count(); z++ )
         {
             EditCharAttrib* pAttr = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( z );
@@ -366,7 +366,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             aCharAttribs += '\t';
             aCharAttribs += ByteString::CreateFromInt32( pAttr->GetEnd() );
             if ( pAttr->IsEmpty() )
-                bZeroAttr = TRUE;
+                bZeroAttr = sal_True;
             fprintf( fp, "%s => ", aCharAttribs.GetBuffer() );
 
             ByteString aDebStr = DbgOutItem( rPool, *pAttr->GetItem() );
@@ -375,7 +375,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         if ( bZeroAttr )
             fprintf( fp, "\nNULL-Attribute!" );
 
-        USHORT nTextPortions = pPPortion->GetTextPortions().Count();
+        sal_uInt16 nTextPortions = pPPortion->GetTextPortions().Count();
         ByteString aPortionStr("\nText portions: #");
         aPortionStr += ByteString::CreateFromInt32( nTextPortions );
         aPortionStr += " \nA";
@@ -385,7 +385,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         aPortionStr += "\nA";
         aPortionStr += ByteString::CreateFromInt32( nPortion );
         aPortionStr += ": ";
-        ULONG n = 0;
+        sal_uLong n = 0;
         for ( z = 0; z < nTextPortions; z++ )
         {
             TextPortion* pPortion = pPPortion->GetTextPortions().GetObject( z );
@@ -395,7 +395,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             aPortionStr += ByteString::CreateFromInt32( pPortion->GetSize().Width() );
             aPortionStr += ")";
             aPortionStr += "[";
-            aPortionStr += ByteString::CreateFromInt32( (USHORT)pPortion->GetKind() );
+            aPortionStr += ByteString::CreateFromInt32( (sal_uInt16)pPortion->GetKind() );
             aPortionStr += "]";
             aPortionStr += ";";
             n += pPortion->GetLen();
@@ -411,7 +411,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
         fprintf( fp, "\n\nLines:" );
         // First the content ...
-        USHORT nLine;
+        sal_uInt16 nLine;
         for ( nLine = 0; nLine < pPPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
@@ -432,8 +432,8 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
     if ( pEE->pImpEditEngine->GetStyleSheetPool() )
     {
-        ULONG nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
-        fprintf( fp, "\n\n================================================================================" );
+        sal_uLong nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0;
+        fprintf( fp, "\n\n================================================================================" );
         fprintf( fp, "\n==================   Stylesheets   =============================================" );
         fprintf( fp, "\n================================================================================" );
         fprintf( fp, "\n#Template:   %lu\n", nStyles );
@@ -444,7 +444,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
             fprintf( fp, "\nTemplate:   %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
             fprintf( fp, "\nParent:    %s", ByteString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
             fprintf( fp, "\nFollow:    %s", ByteString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
-            DbgOutItemSet( fp, pStyle->GetItemSet(), FALSE, FALSE );
+            DbgOutItemSet( fp, pStyle->GetItemSet(), sal_False, sal_False );
             fprintf( fp, "\n----------------------------------" );
 
             pStyle = aIter.Next();
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   Defaults   ================================================" );
     fprintf( fp, "\n================================================================================" );
-    DbgOutItemSet( fp, pEE->pImpEditEngine->GetEmptyItemSet(), TRUE, TRUE );
+    DbgOutItemSet( fp, pEE->pImpEditEngine->GetEmptyItemSet(), sal_True, sal_True );
 
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   EditEngine & Views   ======================================" );
@@ -466,7 +466,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
     fprintf( fp, "\nMinAutoPaperSize: %li x %li", pEE->GetMinAutoPaperSize().Width(), pEE->GetMinAutoPaperSize().Height() );
     fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() );
     fprintf( fp, "\nNumber of Views: %i", pEE->GetViewCount() );
-    for	( USHORT nView = 0; nView < pEE->GetViewCount(); nView++ )
+    for	( sal_uInt16 nView = 0; nView < pEE->GetViewCount(); nView++ )
     {
         EditView* pV = pEE->GetView( nView );
         DBG_ASSERT( pV, "View not found!" );
@@ -483,7 +483,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
         fprintf( fp, "\n\n================================================================================" );
         fprintf( fp, "\n==================   Current View   ===========================================" );
         fprintf( fp, "\n================================================================================" );
-        DbgOutItemSet( fp, pEE->GetActiveView()->GetAttribs(), TRUE, FALSE );
+        DbgOutItemSet( fp, pEE->GetActiveView()->GetAttribs(), sal_True, sal_False );
     }
     fclose( fp );
     if ( bInfoBox )
@@ -492,7 +492,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, BOOL bInfoBox )
 
 ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
 {
-    USHORT z;
+    sal_uInt16 z;
 
     ByteString aDebStr( "Paragraph Length = " );
     aDebStr += ByteString::CreateFromInt32( pPPortion->GetNode()->Len() );
@@ -510,7 +510,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
     }
 
     aDebStr += "\nText portions:";
-    USHORT n = 0;
+    sal_uInt16 n = 0;
     for ( z = 0; z < pPPortion->GetTextPortions().Count(); z++ )
     {
         TextPortion* pPortion = pPPortion->GetTextPortions().GetObject( z );
@@ -525,7 +525,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
     aDebStr += "\nTotal length: ";
     aDebStr += ByteString::CreateFromInt32( n );
     aDebStr += "\nSorted after Start:";
-    for ( USHORT x = 0; x < pPPortion->GetNode()->GetCharAttribs().Count(); x++ )
+    for ( sal_uInt16 x = 0; x < pPPortion->GetNode()->GetCharAttribs().Count(); x++ )
     {
         EditCharAttrib* pCurAttrib = pPPortion->GetNode()->GetCharAttribs().GetAttribs().GetObject( x );
         aDebStr += "\nStart: ";
@@ -539,7 +539,7 @@ ByteString EditDbg::GetPortionInfo( ParaPortion* pPPortion )
 ByteString EditDbg::GetTextPortionInfo( TextPortionList& rPortions )
 {
     ByteString aDebStr;
-    for ( USHORT z = 0; z < rPortions.Count(); z++ )
+    for ( sal_uInt16 z = 0; z < rPortions.Count(); z++ )
     {
         TextPortion* pPortion = rPortions.GetObject( z );
         aDebStr += " ";
@@ -559,28 +559,28 @@ void EditDbg::ShowPortionData( ParaPortion* pPortion )
 }
 
 
-BOOL ParaPortion::DbgCheckTextPortions()
+sal_Bool ParaPortion::DbgCheckTextPortions()
 {
     // check, if Portion length ok:
-    USHORT nXLen = 0;
-    for ( USHORT nPortion = 0; nPortion < aTextPortionList.Count(); nPortion++  )
+    sal_uInt16 nXLen = 0;
+    for ( sal_uInt16 nPortion = 0; nPortion < aTextPortionList.Count(); nPortion++  )
         nXLen = nXLen + aTextPortionList[nPortion]->GetLen();
-    return nXLen == pNode->Len() ? TRUE : FALSE;
+    return nXLen == pNode->Len() ? sal_True : sal_False;
 }
 
-BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart )
+sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart )
 {
-    USHORT nPrev = 0;
-    for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+    sal_uInt16 nPrev = 0;
+    for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = rAttribs[nAttr];
-        USHORT nCur = bStart ? pAttr->GetStart() : pAttr->GetEnd();
+        sal_uInt16 nCur = bStart ? pAttr->GetStart() : pAttr->GetEnd();
         if ( nCur < nPrev )
-            return FALSE;
+            return sal_False;
 
         nPrev = nCur;
     }
-    return TRUE;
+    return sal_True;
 }
 
 #endif
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index 45cff0d210..041d3b3954 100644..100755
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -42,12 +42,12 @@ class SfxItemPool;
 class SfxPoolItem;
 
 ByteString 	DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem );
-void 		DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL );
+void 		DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent, sal_Bool bShowALL );
 
 class EditDbg
 {
 public:
-    static void			ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE );
+    static void			ShowEditEngineData( EditEngine* pEditEngine, sal_Bool bInfoBox = sal_True );
     static void			ShowPortionData( ParaPortion* pPortion );
     static ByteString	GetPortionInfo( ParaPortion* pPPortion );
     static ByteString	GetTextPortionInfo( TextPortionList& rPortions );
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index bdfc4db2c9..4b11fa8ef4 100644..100755
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -72,10 +72,10 @@ using namespace ::com::sun::star;
 
 // ------------------------------------------------------------
 
-USHORT GetScriptItemId( USHORT nItemId, short nScriptType )
+sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, short nScriptType )
 {
-    USHORT nId = nItemId;
-
+    sal_uInt16 nId = nItemId;
+    
     if ( ( nScriptType == i18n::ScriptType::ASIAN ) ||
          ( nScriptType == i18n::ScriptType::COMPLEX ) )
     {
@@ -102,11 +102,11 @@ USHORT GetScriptItemId( USHORT nItemId, short nScriptType )
     return nId;
 }
 
-BOOL IsScriptItemValid( USHORT nItemId, short nScriptType )
+sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType )
 {
-    BOOL bValid = TRUE;
-
-    switch ( nItemId )
+    sal_Bool bValid = sal_True;
+    
+    switch ( nItemId ) 
     {
         case EE_CHAR_LANGUAGE:
             bValid = nScriptType == i18n::ScriptType::LATIN;
@@ -224,31 +224,31 @@ SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
         { SID_FIELD, SFX_ITEM_POOLABLE }
 };
 
-USHORT aV1Map[] = {
+sal_uInt16 aV1Map[] = {
     3999, 4001, 4002, 4003, 4004, 4005, 4006,
     4007, 4008, 4009, 4010, 4011, 4012, 4013, 4017, 4018, 4019 // MI: 4019?
 };
 
-USHORT aV2Map[] = {
+sal_uInt16 aV2Map[] = {
     3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006,	4007, 4008, 4009,
     4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020
 };
 
-USHORT aV3Map[] = {
+sal_uInt16 aV3Map[] = {
     3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006,	4007,
     4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019,
     4020, 4021
 };
 
-USHORT aV4Map[] = {
-    3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
-    4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
-    4014, 4015, 4016, 4017, 4018,
+sal_uInt16 aV4Map[] = {
+    3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, 
+    4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013, 
+    4014, 4015, 4016, 4017, 4018, 
     /* CJK Items inserted here: EE_CHAR_LANGUAGE - EE_CHAR_XMLATTRIBS */
     4034, 4035, 4036, 4037
 };
 
-USHORT aV5Map[] = {
+sal_uInt16 aV5Map[] = {
     3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
     4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
     4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023,
@@ -258,10 +258,6 @@ USHORT aV5Map[] = {
 };
 
 SV_IMPL_PTRARR( DummyContentList, ContentNode* );
-SV_IMPL_VARARR( ScriptTypePosInfos, ScriptTypePosInfo );
-SV_IMPL_VARARR( WritingDirectionInfos, WritingDirectionInfo );
-// SV_IMPL_VARARR( ExtraCharInfos, ExtraCharInfo );
-
 
 int SAL_CALL CompareStart( const void* pFirst, const void* pSecond )
 {
@@ -272,7 +268,7 @@ int SAL_CALL CompareStart( const void* pFirst, const void* pSecond )
     return 0;
 }
 
-EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
 {
     // Create a new attribute in the pool
     const SfxPoolItem& rNew = rPool.Put( rAttr );
@@ -422,8 +418,8 @@ EditLine::EditLine()
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bHangingPunctuation = FALSE;
-    bInvalid = TRUE;
+    bHangingPunctuation = sal_False;
+    bInvalid = sal_True;
 }
 
 EditLine::EditLine( const EditLine& r )
@@ -442,7 +438,7 @@ EditLine::EditLine( const EditLine& r )
     nTxtWidth = 0;
     nCrsrHeight = 0;
     nMaxAscent = 0;
-    bInvalid = TRUE;
+    bInvalid = sal_True;
 }
 
 EditLine::~EditLine()
@@ -471,21 +467,21 @@ EditLine* EditLine::Clone() const
     return pL;
 }
 
-BOOL operator == ( const EditLine& r1,  const EditLine& r2  )
+sal_Bool operator == ( const EditLine& r1,  const EditLine& r2  )
 {
     if ( r1.nStart != r2.nStart )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nEnd != r2.nEnd )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nStartPortion != r2.nStartPortion )
-        return FALSE;
+        return sal_False;
 
     if ( r1.nEndPortion != r2.nEndPortion )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 EditLine& EditLine::operator = ( const EditLine& r )
@@ -498,7 +494,7 @@ EditLine& EditLine::operator = ( const EditLine& r )
 }
 
 
-BOOL operator != ( const EditLine& r1,  const EditLine& r2  )
+sal_Bool operator != ( const EditLine& r1,  const EditLine& r2  )
 {
     return !( r1 == r2 );
 }
@@ -509,11 +505,11 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion )
     Size aTmpSz;
     TextPortion* pPortion;
 
-    USHORT nIndex = GetStart();
+    sal_uInt16 nIndex = GetStart();
 
     DBG_ASSERT( rParaPortion.GetTextPortions().Count(), "GetTextSize before CreatePortions !" );
 
-    for ( USHORT n = nStartPortion; n <= nEndPortion; n++ )
+    for ( sal_uInt16 n = nStartPortion; n <= nEndPortion; n++ )
     {
         pPortion = rParaPortion.GetTextPortions().GetObject(n);
         switch ( pPortion->GetKind() )
@@ -538,7 +534,7 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion )
         nIndex = nIndex + pPortion->GetLen();
     }
 
-    SetHeight( (USHORT)aSz.Height() );
+    SetHeight( (sal_uInt16)aSz.Height() );
     return aSz;
 }
 
@@ -553,22 +549,22 @@ EditLineList::~EditLineList()
 
 void EditLineList::Reset()
 {
-    for ( USHORT nLine = 0; nLine < Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < Count(); nLine++ )
         delete GetObject(nLine);
     Remove( 0, Count() );
 }
 
-void EditLineList::DeleteFromLine( USHORT nDelFrom )
+void EditLineList::DeleteFromLine( sal_uInt16 nDelFrom )
 {
     DBG_ASSERT( nDelFrom <= (Count() - 1), "DeleteFromLine: Out of range" );
-    for ( USHORT nL = nDelFrom; nL < Count(); nL++ )
+    for ( sal_uInt16 nL = nDelFrom; nL < Count(); nL++ )
         delete GetObject(nL);
     Remove( nDelFrom, Count()-nDelFrom );
 }
 
-USHORT EditLineList::FindLine( USHORT nChar, BOOL bInclEnd )
+sal_uInt16 EditLineList::FindLine( sal_uInt16 nChar, sal_Bool bInclEnd )
 {
-    for ( USHORT nLine = 0; nLine < Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < Count(); nLine++ )
     {
         EditLine* pLine = GetObject( nLine );
         if ( ( bInclEnd && ( pLine->GetEnd() >= nChar ) ) ||
@@ -582,26 +578,26 @@ USHORT EditLineList::FindLine( USHORT nChar, BOOL bInclEnd )
     return ( Count() - 1 );
 }
 
-BOOL EditPaM::DbgIsBuggy( EditDoc& rDoc )
+sal_Bool EditPaM::DbgIsBuggy( EditDoc& rDoc )
 {
     if ( !pNode )
-        return TRUE;
+        return sal_True;
     if ( rDoc.GetPos( pNode ) >= rDoc.Count() )
-        return TRUE;
+        return sal_True;
     if ( nIndex > pNode->Len() )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditSelection::DbgIsBuggy( EditDoc& rDoc )
+sal_Bool EditSelection::DbgIsBuggy( EditDoc& rDoc )
 {
     if ( aStartPaM.DbgIsBuggy( rDoc ) )
-        return TRUE;
+        return sal_True;
     if ( aEndPaM.DbgIsBuggy( rDoc ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 EditSelection::EditSelection()
@@ -630,20 +626,20 @@ EditSelection& EditSelection::operator = ( const EditPaM& rPaM )
     return *this;
 }
 
-BOOL EditSelection::IsInvalid() const
+sal_Bool EditSelection::IsInvalid() const
 {
     EditPaM aEmptyPaM;
 
     if ( aStartPaM == aEmptyPaM )
-        return TRUE;
+        return sal_True;
 
     if ( aEndPaM == aEmptyPaM )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditSelection::Adjust( const ContentList& rNodes )
+sal_Bool EditSelection::Adjust( const ContentList& rNodes )
 {
     DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index out of range in Adjust(1)" );
     DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index out of range in Adjust(2)" );
@@ -651,17 +647,17 @@ BOOL EditSelection::Adjust( const ContentList& rNodes )
     ContentNode* pStartNode = aStartPaM.GetNode();
     ContentNode* pEndNode = aEndPaM.GetNode();
 
-    USHORT nStartNode = rNodes.GetPos( pStartNode );
-    USHORT nEndNode = rNodes.GetPos( pEndNode );
+    sal_uInt16 nStartNode = rNodes.GetPos( pStartNode );
+    sal_uInt16 nEndNode = rNodes.GetPos( pEndNode );
 
     DBG_ASSERT( nStartNode != USHRT_MAX, "Node out of range in Adjust(1)" );
     DBG_ASSERT( nEndNode != USHRT_MAX, "Node out of range in Adjust(2)" );
 
-    BOOL bSwap = FALSE;
+    sal_Bool bSwap = sal_False;
     if ( nStartNode > nEndNode )
-        bSwap = TRUE;
+        bSwap = sal_True;
     else if ( ( nStartNode == nEndNode ) && ( aStartPaM.GetIndex() > aEndPaM.GetIndex() ) )
-        bSwap = TRUE;
+        bSwap = sal_True;
 
     if ( bSwap )
     {
@@ -673,15 +669,15 @@ BOOL EditSelection::Adjust( const ContentList& rNodes )
     return bSwap;
 }
 
-BOOL operator == ( const EditPaM& r1,  const EditPaM& r2  )
+sal_Bool operator == ( const EditPaM& r1,  const EditPaM& r2  )
 {
     if ( r1.GetNode() != r2.GetNode() )
-        return FALSE;
+        return sal_False;
 
     if ( r1.GetIndex() != r2.GetIndex() )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
@@ -691,7 +687,7 @@ EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
     return *this;
 }
 
-BOOL operator != ( const EditPaM& r1,  const EditPaM& r2  )
+sal_Bool operator != ( const EditPaM& r1,  const EditPaM& r2  )
 {
     return !( r1 == r2 );
 }
@@ -717,7 +713,7 @@ ContentNode::~ContentNode()
 #endif
 }
 
-void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemPool )
+void ContentNode::ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNew, SfxItemPool& rItemPool )
 {
     if ( !nNew )
         return;
@@ -728,10 +724,10 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
     // an existing special case, must (n-1) opportunities be provided with 
     // bResort. The most likely possibility receives no bResort, so that is 
     // not sorted anew when all attributes are the same.
-    BOOL bResort = FALSE;
-    BOOL bExpandedEmptyAtIndexNull = FALSE;
+    sal_Bool bResort = sal_False;
+    sal_Bool bExpandedEmptyAtIndexNull = sal_False;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
     while ( pAttrib )
     {
@@ -753,7 +749,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
 //				if ( pAttrib->GetStart() == nIndex )
                 pAttrib->Expand( nNew );
                 if ( pAttrib->GetStart() == 0 )
-                    bExpandedEmptyAtIndexNull = TRUE;
+                    bExpandedEmptyAtIndexNull = sal_True;
             }
             // 1: Attribute starts before, goes to index ...
             else if ( pAttrib->GetEnd() == nIndex ) // Start must be before
@@ -768,7 +764,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                         pAttrib->Expand( nNew );
                 }
                 else
-                    bResort = TRUE;
+                    bResort = sal_True;
             }
             // 2: Attribute starts before, goes past the Index...
             else if ( ( pAttrib->GetStart() < nIndex ) && ( pAttrib->GetEnd() > nIndex ) )
@@ -782,24 +778,24 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                 if ( pAttrib->IsFeature() )
                 {
                     pAttrib->MoveForward( nNew );
-                    bResort = TRUE;
+                    bResort = sal_True;
                 }
                 else
                 {
-                    BOOL bExpand = FALSE;
+                    sal_Bool bExpand = sal_False;
                     if ( nIndex == 0 )
                     {
-                        bExpand = TRUE;
+                        bExpand = sal_True;
                         if( bExpandedEmptyAtIndexNull )
                         {
                             // Check if this kind of attribut was empty and expanded here...
-                            USHORT nW = pAttrib->GetItem()->Which();
-                            for ( USHORT nA = 0; nA < nAttr; nA++ )
+                            sal_uInt16 nW = pAttrib->GetItem()->Which();
+                            for ( sal_uInt16 nA = 0; nA < nAttr; nA++ )
                             {
                                 EditCharAttrib* pA = aCharAttribList.GetAttribs()[nA];
                                 if ( ( pA->GetStart() == 0 ) && ( pA->GetItem()->Which() == nW ) )
                                 {
-                                    bExpand = FALSE;
+                                    bExpand = sal_False;
                                     break;
                                 }
                             }
@@ -809,7 +805,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
                     if ( bExpand )
                     {
                         pAttrib->Expand( nNew );
-                        bResort = TRUE;
+                        bResort = sal_True;
                     }
                     else
                     {
@@ -820,7 +816,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
         }
 
         if ( pAttrib->IsEdge() )
-            pAttrib->SetEdge( FALSE );
+            pAttrib->SetEdge( sal_False );
 
         DBG_ASSERT( !pAttrib->IsFeature() || ( pAttrib->GetLen() == 1 ), "Expand: FeaturesLen != 1" );
 
@@ -829,7 +825,7 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
         if ( pAttrib->IsEmpty() )
         {
             OSL_FAIL( "Empty Attribute after ExpandAttribs?" );
-            bResort = TRUE;
+            bResort = sal_True;
             aCharAttribList.GetAttribs().Remove( nAttr );
             rItemPool.Remove( *pAttrib->GetItem() );
             delete pAttrib;
@@ -845,32 +841,32 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
 #ifndef SVX_LIGHT
     if ( pWrongList )
     {
-        BOOL bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
+        sal_Bool bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
         pWrongList->TextInserted( nIndex, nNew, bSep );
     }
 #endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Expand: Start List distorted" );
+    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Expand: Start List distorted" );
 #endif
 }
 
-void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& rItemPool )
+void ContentNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted, SfxItemPool& rItemPool )
 {
     if ( !nDeleted )
         return;
 
     // Since features are treated differently than normal character attributes,
     // can also the order of the start list be change! 
-    BOOL bResort = FALSE;
-    BOOL bDelAttr = FALSE;
-    USHORT nEndChanges = nIndex+nDeleted;
+    sal_Bool bResort = sal_False;
+    sal_Bool bDelAttr = sal_False;
+    sal_uInt16 nEndChanges = nIndex+nDeleted;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
     while ( pAttrib )
     {
-        bDelAttr = FALSE;
+        bDelAttr = sal_False;
         if ( pAttrib->GetEnd() >= nIndex )
         {
             // Move all Attribute behind the insert point...
@@ -886,7 +882,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
                 if ( !pAttrib->IsFeature() && ( pAttrib->GetStart() == nIndex ) && ( pAttrib->GetEnd() == nEndChanges ) )
                     pAttrib->GetEnd() = nIndex;	// empty
                 else
-                    bDelAttr = TRUE;
+                    bDelAttr = sal_True;
             }
             // 2. Attribute starts earlier, ends inside or behind it ...
             else if ( ( pAttrib->GetStart() <= nIndex ) && ( pAttrib->GetEnd() > nIndex ) )
@@ -904,7 +900,7 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
                 if ( pAttrib->IsFeature() )
                 {
                     pAttrib->MoveBackward( nDeleted );
-                    bResort = TRUE;
+                    bResort = sal_True;
                 }
                 else
                 {
@@ -919,14 +915,14 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
         DBG_ASSERT( ( pAttrib->GetEnd() <= Len()) || bDelAttr, "Collaps: Attribute larger than paragraph!" );
         if ( bDelAttr )
         {
-            bResort = TRUE;
+            bResort = sal_True;
             aCharAttribList.GetAttribs().Remove( nAttr );
             rItemPool.Remove( *pAttrib->GetItem() );
             delete pAttrib;
             nAttr--;
         }
         else if ( pAttrib->IsEmpty() )
-            aCharAttribList.HasEmptyAttribs() = TRUE;
+            aCharAttribList.HasEmptyAttribs() = sal_True;
 
         nAttr++;
         pAttrib = GetAttrib( aCharAttribList.GetAttribs(), nAttr );
@@ -941,17 +937,17 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
 #endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
-    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Collaps: Start list distorted" );
+    DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), sal_True ), "Collaps: Start list distorted" );
 #endif
 }
 
-void ContentNode::CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs )
+void ContentNode::CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, sal_Bool bKeepEndingAttribs )
 {
     DBG_ASSERT( pPrevNode, "Copy of attributes to a null pointer?" );
 
     xub_StrLen nCut = pPrevNode->Len();
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( pPrevNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttrib )
     {
@@ -1000,22 +996,22 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 {
     DBG_ASSERT( pNextNode, "Copy of attributes to a null pointer?" );
 
-    USHORT nNewStart = Len();
+    sal_uInt16 nNewStart = Len();
 
 #ifdef EDITDEBUG
     DBG_ASSERT( aCharAttribList.DbgCheckAttribs(), "Attribute before AppendAttribs broken" );
 #endif
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttrib = GetAttrib( pNextNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttrib )
     {
         // Move all attributes in the current node (this)
-        BOOL bMelted = FALSE;
+        sal_Bool bMelted = sal_False;
         if ( ( pAttrib->GetStart() == 0 ) && ( !pAttrib->IsFeature() ) )
         {
             // Attributes can possibly be summarized as:
-            USHORT nTmpAttr = 0;
+            sal_uInt16 nTmpAttr = 0;
             EditCharAttrib* pTmpAttrib = GetAttrib( aCharAttribList.GetAttribs(), nTmpAttr );
             while ( !bMelted && pTmpAttrib )
             {
@@ -1029,7 +1025,7 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
                         pNextNode->GetCharAttribs().GetAttribs().Remove( nAttr );
                         // Unsubscribe from the pool?!
                         delete pAttrib;
-                        bMelted = TRUE;
+                        bMelted = sal_True;
                     }
                 }
                 ++nTmpAttr;
@@ -1078,7 +1074,7 @@ void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyl
         GetContentAttribs().GetItems(), pS == NULL );
 }
 
-void ContentNode::SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont )
+void ContentNode::SetStyleSheet( SfxStyleSheet* pS, sal_Bool bRecalcFont )
 {
     aContentAttribs.SetStyleSheet( pS );
     if ( bRecalcFont )
@@ -1123,10 +1119,10 @@ ContentAttribs::~ContentAttribs()
 {
 }
 
-SvxTabStop ContentAttribs::FindTabStop( long nCurPos, USHORT nDefTab )
+SvxTabStop ContentAttribs::FindTabStop( long nCurPos, sal_uInt16 nDefTab )
 {
     const SvxTabStopItem& rTabs = (const SvxTabStopItem&) GetItem( EE_PARA_TABS );
-    for ( USHORT i = 0; i < rTabs.Count(); i++ )
+    for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ )
     {
         const SvxTabStop& rTab = rTabs[i];
         if ( rTab.GetTabPos() > nCurPos  )
@@ -1142,7 +1138,7 @@ SvxTabStop ContentAttribs::FindTabStop( long nCurPos, USHORT nDefTab )
 
 void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
 {
-    BOOL bStyleChanged = ( pStyle != pS );
+    sal_Bool bStyleChanged = ( pStyle != pS );
     pStyle = pS;
     // Only when other style sheet, not when current style sheet modified
     if ( pStyle && bStyleChanged )
@@ -1151,7 +1147,7 @@ void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
         // which are specified in the style, so that the attributes of the 
         // style can have an affect.
         const SfxItemSet& rStyleAttribs = pStyle->GetItemSet();
-        for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+        for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
         {
             // Don't change bullet on/off
             if ( ( nWhich != EE_PARA_BULLETSTATE ) && ( rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON ) )
@@ -1160,23 +1156,23 @@ void ContentAttribs::SetStyleSheet( SfxStyleSheet* pS )
     }
 }
 
-const SfxPoolItem& ContentAttribs::GetItem( USHORT nWhich )
+const SfxPoolItem& ContentAttribs::GetItem( sal_uInt16 nWhich )
 {
     // Hard paragraph attributes take precedence!
     SfxItemSet* pTakeFrom = &aAttribSet;
-    if ( pStyle && ( aAttribSet.GetItemState( nWhich, FALSE ) != SFX_ITEM_ON  ) )
+    if ( pStyle && ( aAttribSet.GetItemState( nWhich, sal_False ) != SFX_ITEM_ON  ) )
         pTakeFrom = &pStyle->GetItemSet();
 
     return pTakeFrom->Get( nWhich );
 }
 
-BOOL ContentAttribs::HasItem( USHORT nWhich )
+sal_Bool ContentAttribs::HasItem( sal_uInt16 nWhich )
 {
-    BOOL bHasItem = FALSE;
-    if ( aAttribSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_ON  )
-        bHasItem = TRUE;
+    sal_Bool bHasItem = sal_False;
+    if ( aAttribSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_ON  )
+        bHasItem = sal_True;
     else if ( pStyle && pStyle->GetItemSet().GetItemState( nWhich ) == SFX_ITEM_ON )
-        bHasItem = TRUE;
+        bHasItem = sal_True;
 
     return bHasItem;
 }
@@ -1186,7 +1182,7 @@ ItemList::ItemList() : CurrentItem( 0 )
 {
 }
 
-const SfxPoolItem* ItemList::FindAttrib( USHORT nWhich )
+const SfxPoolItem* ItemList::FindAttrib( sal_uInt16 nWhich )
 {
     for ( size_t i = 0, n = aItemPool.size(); i < n; ++i )
         if ( aItemPool[ i ]->Which() == nWhich )
@@ -1222,21 +1218,21 @@ EditDoc::EditDoc( SfxItemPool* pPool )
     if ( pPool )
     {
         pItemPool = pPool;
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
-        pItemPool = new EditEngineItemPool( FALSE );
-        bOwnerOfPool = TRUE;
+        pItemPool = new EditEngineItemPool( sal_False );
+        bOwnerOfPool = sal_True;
     }
     
     nDefTab = DEFTAB;
-    bIsVertical = FALSE;
-    bIsFixedCellHeight = FALSE;
+    bIsVertical = sal_False;
+    bIsFixedCellHeight = sal_False;
 
     // Don't create a empty node, Clear() will be called in EditEngine-CTOR
 
-    SetModified( FALSE );
+    SetModified( sal_False );
 };
 
 EditDoc::~EditDoc()
@@ -1248,14 +1244,14 @@ EditDoc::~EditDoc()
 
 void EditDoc::ImplDestroyContents()
 {
-    for ( USHORT nNode = Count(); nNode; )
+    for ( sal_uInt16 nNode = Count(); nNode; )
         RemoveItemsFromPool( GetObject( --nNode ) );
     DeleteAndDestroy( 0, Count() );
 }
 
 void EditDoc::RemoveItemsFromPool( ContentNode* pNode )
 {
-    for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = pNode->GetCharAttribs().GetAttribs()[nAttr];
         GetItemPool().Remove( *pAttr->GetItem() );
@@ -1266,13 +1262,13 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
 {
     Font aPrevFont( rFont );
     rFont.SetAlign( ALIGN_BASELINE );
-    rFont.SetTransparent( TRUE );
+    rFont.SetTransparent( sal_True );
 
-    USHORT nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
-    USHORT nWhich_Language = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
-    USHORT nWhich_FontHeight = GetScriptItemId( EE_CHAR_FONTHEIGHT, nScriptType );
-    USHORT nWhich_Weight = GetScriptItemId( EE_CHAR_WEIGHT, nScriptType );
-    USHORT nWhich_Italic = GetScriptItemId( EE_CHAR_ITALIC, nScriptType );
+    sal_uInt16 nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
+    sal_uInt16 nWhich_Language = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
+    sal_uInt16 nWhich_FontHeight = GetScriptItemId( EE_CHAR_FONTHEIGHT, nScriptType );
+    sal_uInt16 nWhich_Weight = GetScriptItemId( EE_CHAR_WEIGHT, nScriptType );
+    sal_uInt16 nWhich_Italic = GetScriptItemId( EE_CHAR_ITALIC, nScriptType );
 
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontInfo ) == SFX_ITEM_ON ) )
     {
@@ -1306,8 +1302,8 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
     {
         const SvxEscapementItem& rEsc = (const SvxEscapementItem&) rSet.Get( EE_CHAR_ESCAPEMENT );
 
-        USHORT nProp = rEsc.GetProp();
-        rFont.SetPropr( (BYTE)nProp );
+        sal_uInt16 nProp = rEsc.GetProp();
+        rFont.SetPropr( (sal_uInt8)nProp );
 
         short nEsc = rEsc.GetEsc();
         if ( nEsc == DFLT_ESC_AUTO_SUPER )
@@ -1335,14 +1331,14 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, s
         rFont = aPrevFont;	// => The same ImpPointer for IsSameInstance
 }
 
-void EditDoc::CreateDefFont( BOOL bUseStyles )
+void EditDoc::CreateDefFont( sal_Bool bUseStyles )
 {
     SfxItemSet aTmpSet( GetItemPool(), EE_PARA_START, EE_CHAR_END );
     CreateFont( aDefFont, aTmpSet );
     aDefFont.SetVertical( IsVertical() );
     aDefFont.SetOrientation( IsVertical() ? 2700 : 0 );
 
-    for ( USHORT nNode = 0; nNode < Count(); nNode++ )
+    for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
     {
         ContentNode* pNode = GetObject( nNode );
         pNode->GetCharAttribs().GetDefFont() = aDefFont;
@@ -1369,11 +1365,11 @@ XubString EditDoc::GetSepStr( LineEnd eEnd )
 
 XubString EditDoc::GetText( LineEnd eEnd ) const
 {
-    ULONG nLen = GetTextLen();
-    USHORT nNodes = Count();
+    sal_uLong nLen = GetTextLen();
+    sal_uInt16 nNodes = Count();
 
     String aSep = EditDoc::GetSepStr( eEnd );
-    USHORT nSepSize = aSep.Len();
+    sal_uInt16 nSepSize = aSep.Len();
 
     if ( nSepSize )
         nLen += nNodes * nSepSize;
@@ -1384,8 +1380,8 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
     }
     xub_Unicode* pStr = new xub_Unicode[nLen+1];
     xub_Unicode* pCur = pStr;
-    USHORT nLastNode = nNodes-1;
-    for ( USHORT nNode = 0; nNode < nNodes; nNode++ )
+    sal_uInt16 nLastNode = nNodes-1;
+    for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ )
     {
         XubString aTmp( GetParaAsString( GetObject(nNode) ) );
         memcpy( pCur, aTmp.GetBuffer(), aTmp.Len()*sizeof(sal_Unicode) );
@@ -1402,24 +1398,24 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
     return aASCIIText;
 }
 
-XubString EditDoc::GetParaAsString( USHORT nNode ) const
+XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const
 {
     return GetParaAsString( SaveGetObject( nNode ) );
 }
 
-XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, BOOL bResolveFields ) const
+XubString EditDoc::GetParaAsString( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, sal_Bool bResolveFields ) const
 {
     if ( nEndPos > pNode->Len() )
         nEndPos = pNode->Len();
 
     DBG_ASSERT( nStartPos <= nEndPos, "Start and End reversed?" );
 
-    USHORT nIndex = nStartPos;
+    sal_uInt16 nIndex = nStartPos;
     XubString aStr;
     EditCharAttrib* pNextFeature = pNode->GetCharAttribs().FindFeature( nIndex );
     while ( nIndex < nEndPos )
     {
-        USHORT nEnd = nEndPos;
+        sal_uInt16 nEnd = nEndPos;
         if ( pNextFeature && ( pNextFeature->GetStart() < nEnd ) )
             nEnd = pNextFeature->GetStart();
         else
@@ -1451,21 +1447,21 @@ XubString EditDoc::GetParaAsString( ContentNode* pNode, USHORT nStartPos, USHORT
     return aStr;
 }
 
-ULONG EditDoc::GetTextLen() const
+sal_uLong EditDoc::GetTextLen() const
 {
-    ULONG nLen = 0;
-    for ( USHORT nNode = 0; nNode < Count(); nNode++ )
+    sal_uLong nLen = 0;
+    for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
     {
         ContentNode* pNode = GetObject( nNode );
         nLen += pNode->Len();
         // Fields can be longer than the placeholder in the Node
         const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
-        for ( USHORT nAttr = rAttrs.Count(); nAttr; )
+        for ( sal_uInt16 nAttr = rAttrs.Count(); nAttr; )
         {
             EditCharAttrib* pAttr = rAttrs[--nAttr];
             if ( pAttr->Which() == EE_FEATURE_FIELD )
             {
-                USHORT nFieldLen = ((EditCharAttribField*)pAttr)->GetFieldValue().Len();
+                sal_uInt16 nFieldLen = ((EditCharAttribField*)pAttr)->GetFieldValue().Len();
                 if ( !nFieldLen )
                     nLen--;
                 else
@@ -1483,16 +1479,16 @@ EditPaM EditDoc::Clear()
     ContentNode* pNode = new ContentNode( GetItemPool() );
     Insert( pNode, 0 );
 
-    CreateDefFont( FALSE );
+    CreateDefFont( sal_False );
 
-    SetModified( FALSE );
+    SetModified( sal_False );
 
     EditPaM aPaM( pNode, 0 );
     return aPaM;
 }
 
-void EditDoc::SetModified( BOOL b )
-{
+void EditDoc::SetModified( sal_Bool b )	
+{ 
     bModified = b;
     if ( bModified )
     {
@@ -1513,11 +1509,11 @@ EditPaM EditDoc::RemoveText()
     ContentNode* pNode = new ContentNode( GetItemPool() );
     Insert( pNode, 0 );
 
-    pNode->SetStyleSheet( pPrevStyle, FALSE );
+    pNode->SetStyleSheet( pPrevStyle, sal_False );
     pNode->GetContentAttribs().GetItems().Set( aPrevSet );
     pNode->GetCharAttribs().GetDefFont() = aPrevFont;
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     EditPaM aPaM( pNode, 0 );
     return aPaM;
@@ -1532,7 +1528,7 @@ void EditDoc::InsertText( const EditPaM& rPaM, xub_Unicode c )
     rPaM.GetNode()->Insert( c, rPaM.GetIndex() );
     rPaM.GetNode()->ExpandAttribs( rPaM.GetIndex(), 1, GetItemPool() );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
 EditPaM EditDoc::InsertText( EditPaM aPaM, const XubString& rStr )
@@ -1546,16 +1542,16 @@ EditPaM EditDoc::InsertText( EditPaM aPaM, const XubString& rStr )
     aPaM.GetNode()->ExpandAttribs( aPaM.GetIndex(), rStr.Len(), GetItemPool() );
     aPaM.GetIndex() = aPaM.GetIndex() + rStr.Len();
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
+EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs )
 {
     DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertParaBreak" );
     ContentNode* pCurNode = aPaM.GetNode();
-    USHORT nPos = GetPos( pCurNode );
+    sal_uInt16 nPos = GetPos( pCurNode );
     XubString aStr = aPaM.GetNode()->Copy( aPaM.GetIndex() );
     aPaM.GetNode()->Erase( aPaM.GetIndex() );
 
@@ -1563,7 +1559,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
     ContentAttribs aContentAttribs( aPaM.GetNode()->GetContentAttribs() );
 
     // for a new paragraph we like to have the bullet/numbering visible by default
-    aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, TRUE), EE_PARA_BULLETSTATE );
+    aContentAttribs.GetItems().Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_True), EE_PARA_BULLETSTATE );
 
     // ContenNode constructor copies also the paragraph attributes
     ContentNode* pNode = new ContentNode( aStr, aContentAttribs );
@@ -1586,7 +1582,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs )
 
     Insert( pNode, nPos+1 );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     aPaM.SetNode( pNode );
     aPaM.SetIndex( 0 );
@@ -1605,7 +1601,7 @@ EditPaM EditDoc::InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem  )
     DBG_ASSERT( pAttrib, "Why can not the feature be created?" );
     aPaM.GetNode()->GetCharAttribs().InsertAttrib( pAttrib );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     aPaM.GetIndex()++;
     return aPaM;
@@ -1622,27 +1618,27 @@ EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight )
 
     // the one to the right disappears.
     RemoveItemsFromPool( pRight );
-    USHORT nRight = GetPos( pRight );
+    sal_uInt16 nRight = GetPos( pRight );
     Remove( nRight );
     delete pRight;
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-EditPaM EditDoc::RemoveChars( EditPaM aPaM, USHORT nChars )
+EditPaM EditDoc::RemoveChars( EditPaM aPaM, sal_uInt16 nChars )
 {
     // Maybe remove Features!
     aPaM.GetNode()->Erase( aPaM.GetIndex(), nChars );
     aPaM.GetNode()->CollapsAttribs( aPaM.GetIndex(), nChars, GetItemPool() );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 
     return aPaM;
 }
 
-void EditDoc::InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem )
+void EditDoc::InsertAttribInSelection( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem )
 {
     DBG_ASSERT( pNode, "What to do with the attribute?" );
     DBG_ASSERT( nEnd <= pNode->Len(), "InsertAttrib: Attribute to large!" );
@@ -1677,17 +1673,17 @@ void EditDoc::InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT
     if ( pStartingAttrib )
         pNode->GetCharAttribs().ResortAttribs();
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich )
+sal_Bool EditDoc::RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nWhich )
 {
     EditCharAttrib* pStarting;
     EditCharAttrib* pEnding;
     return RemoveAttribs( pNode, nStart, nEnd, pStarting, pEnding, nWhich );
 }
 
-BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich )
+sal_Bool EditDoc::RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich )
 {
 
     DBG_ASSERT( pNode, "What to do with the attribute?" );
@@ -1698,23 +1694,23 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
     // This starts at the end of the selection => can be expanded
     rpStarting = 0;
 
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     DBG_ASSERT( nStart <= nEnd, "Small miscalculations in InsertAttribInSelection" );
 
     // iterate over the attributes ...
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttr )
     {
-        BOOL bRemoveAttrib = FALSE;
-        USHORT nAttrWhich = pAttr->Which();
+        sal_Bool bRemoveAttrib = sal_False;
+        sal_uInt16 nAttrWhich = pAttr->Which();
         if ( ( nAttrWhich < EE_FEATURE_START ) && ( !nWhich || ( nAttrWhich == nWhich ) ) )
         {
             // Attribute starts in Selection
             if ( ( pAttr->GetStart() >= nStart ) && ( pAttr->GetStart() <= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( pAttr->GetEnd() > nEnd )
                 {
                     pAttr->GetStart() = nEnd;	// then it starts after this
@@ -1725,14 +1721,14 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
                 {
                     // Delete feature only if on the exact spot
-                    bRemoveAttrib = TRUE;
+                    bRemoveAttrib = sal_True;
                 }
             }
 
             // Attribute ends in Selection
             else if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetEnd() <= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( ( pAttr->GetStart() < nStart ) && !pAttr->IsFeature() )
                 {
                     pAttr->GetEnd() = nStart;	// then it ends here
@@ -1741,13 +1737,13 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) )
                 {
                     // Delete feature only if on the exact spot
-                    bRemoveAttrib = TRUE;
+                    bRemoveAttrib = sal_True;
                 }
             }
             // Attribute overlaps the selection
             else if ( ( pAttr->GetStart() <= nStart ) && ( pAttr->GetEnd() >= nEnd ) )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 if ( pAttr->GetStart() == nStart )
                 {
                     pAttr->GetStart() = nEnd;
@@ -1764,7 +1760,7 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
                 }
                 else // Attribute must be split ...
                 {
-                    USHORT nOldEnd = pAttr->GetEnd();
+                    sal_uInt16 nOldEnd = pAttr->GetEnd();
                     pAttr->GetEnd() = nStart;
                     rpEnding = pAttr;
                     InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd );
@@ -1791,13 +1787,13 @@ BOOL EditDoc::RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, Edi
         // char attributes need to be sorted by start again
         pNode->GetCharAttribs().ResortAttribs();
 
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
 
     return bChanged;
 }
 
-void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, USHORT nStart, USHORT nEnd )
+void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     // This method no longer checks whether a corresponding attribute already 
     // exists at this place!
@@ -1805,10 +1801,10 @@ void EditDoc::InsertAttrib( const SfxPoolItem& rPoolItem, ContentNode* pNode, US
     DBG_ASSERT( pAttrib, "MakeCharAttrib failed!" );
     pNode->GetCharAttribs().InsertAttrib( pAttrib );
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem )
+void EditDoc::InsertAttrib( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem )
 {
     if ( nStart != nEnd )
     {
@@ -1832,7 +1828,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, cons
             if ( pAttr->IsInside( nStart ) )	// split
             {
                 // check again if really splitting, or return !
-                USHORT nOldEnd = pAttr->GetEnd();
+                sal_uInt16 nOldEnd = pAttr->GetEnd();
                 pAttr->GetEnd() = nStart;
                 pAttr = MakeCharAttrib( GetItemPool(), *(pAttr->GetItem()), nStart, nOldEnd );
                 pNode->GetCharAttribs().InsertAttrib( pAttr );
@@ -1848,15 +1844,15 @@ void EditDoc::InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, cons
         InsertAttrib( rPoolItem, pNode, nStart, nStart );
     }
 
-    SetModified( TRUE );
+    SetModified( sal_True );
 }
 
-void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet )
+void EditDoc::FindAttribs( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, SfxItemSet& rCurSet )
 {
     DBG_ASSERT( pNode, "Where to search?" );
     DBG_ASSERT( nStartPos <= nEndPos, "Invalid region!" );
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     // No Selection...
     if ( nStartPos == nEndPos )
@@ -1887,7 +1883,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 
             if ( pItem )
             {
-                USHORT nWhich = pItem->Which();
+                sal_uInt16 nWhich = pItem->Which();
                 if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
                     rCurSet.Put( *pItem );
@@ -1937,7 +1933,7 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 
             if ( pItem )
             {
-                USHORT nWhich = pItem->Which();
+                sal_uInt16 nWhich = pItem->Which();
                 if ( rCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
                     rCurSet.Put( *pItem );
@@ -1961,14 +1957,14 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
 CharAttribList::CharAttribList()
 {
     DBG_CTOR( EE_CharAttribList, 0 );
-    bHasEmptyAttribs = FALSE;
+    bHasEmptyAttribs = sal_False;
 }
 
 CharAttribList::~CharAttribList()
 {
     DBG_DTOR( EE_CharAttribList, 0 );
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr )
     {
@@ -1990,20 +1986,20 @@ void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
     // (InsertBinTextObject!) binary search would not be optimal here.
     // => Would bring something!
 
-    const USHORT nCount = Count();
-    const USHORT nStart = pAttrib->GetStart(); // may be better for Comp.Opt.
+    const sal_uInt16 nCount = Count();
+    const sal_uInt16 nStart = pAttrib->GetStart(); // may be better for Comp.Opt.
 
     if ( pAttrib->IsEmpty() )
-        bHasEmptyAttribs = TRUE;
+        bHasEmptyAttribs = sal_True;
 
-    BOOL bInserted = FALSE;
-    for ( USHORT x = 0; x < nCount; x++ )
+    sal_Bool bInserted = sal_False;
+    for ( sal_uInt16 x = 0; x < nCount; x++ )
     {
         EditCharAttribPtr pCurAttrib = aAttribs[x];
         if ( pCurAttrib->GetStart() > nStart )
         {
             aAttribs.Insert( pAttrib, x );
-            bInserted = TRUE;
+            bInserted = sal_True;
             break;
         }
     }
@@ -2027,10 +2023,10 @@ void CharAttribList::ResortAttribs()
 
 void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
 {
-    for ( USHORT n = 0; n < aAttribs.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aAttribs.Count(); n++ )
     {
         EditCharAttrib* pAttr = aAttribs.GetObject( n );
-        for ( USHORT nNext = n+1; nNext < aAttribs.Count(); nNext++ )
+        for ( sal_uInt16 nNext = n+1; nNext < aAttribs.Count(); nNext++ )
         {
             EditCharAttrib* p = aAttribs.GetObject( nNext );
             if ( !pAttr->IsFeature() && ( p->GetStart() == pAttr->GetEnd() ) && ( p->Which() == pAttr->Which() ) )
@@ -2052,11 +2048,11 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
     }
 }
 
-EditCharAttrib* CharAttribList::FindAttrib( USHORT nWhich, USHORT nPos )
+EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos )
 {
     // Backwards, if one ends where the next starts. 
     // => The starting one is the valid one ...
-    USHORT nAttr = aAttribs.Count()-1;
+    sal_uInt16 nAttr = aAttribs.Count()-1;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr )
     {
@@ -2067,11 +2063,11 @@ EditCharAttrib* CharAttribList::FindAttrib( USHORT nWhich, USHORT nPos )
     return 0;
 }
 
-EditCharAttrib* CharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const
+EditCharAttrib* CharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos ) const
 {
     DBG_ASSERT( nWhich, "FindNextAttrib: Which?" );
-    const USHORT nAttribs = aAttribs.Count();
-    for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
+    const sal_uInt16 nAttribs = aAttribs.Count();
+    for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[ nAttr ];
         if ( ( pAttr->GetStart() >= nFromPos ) && ( pAttr->Which() == nWhich ) )
@@ -2080,50 +2076,50 @@ EditCharAttrib* CharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromPos )
     return 0;
 }
 
-BOOL CharAttribList::HasAttrib( USHORT nWhich ) const
+sal_Bool CharAttribList::HasAttrib( sal_uInt16 nWhich ) const
 {
-    for ( USHORT nAttr = aAttribs.Count(); nAttr; )
+    for ( sal_uInt16 nAttr = aAttribs.Count(); nAttr; )
     {
         const EditCharAttrib* pAttr = aAttribs[--nAttr];
         if ( pAttr->Which() == nWhich )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL CharAttribList::HasAttrib( USHORT nStartPos, USHORT nEndPos ) const
+sal_Bool CharAttribList::HasAttrib( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) const
 {
-    BOOL bAttr = FALSE;
-    for ( USHORT nAttr = aAttribs.Count(); nAttr && !bAttr; )
+    sal_Bool bAttr = sal_False;
+    for ( sal_uInt16 nAttr = aAttribs.Count(); nAttr && !bAttr; )
     {
         const EditCharAttrib* pAttr = aAttribs[--nAttr];
         if ( ( pAttr->GetStart() < nEndPos ) && ( pAttr->GetEnd() > nStartPos ) )
-            return bAttr = TRUE;
+            return bAttr = sal_True;
     }
     return bAttr;
 }
 
 
-BOOL CharAttribList::HasBoundingAttrib( USHORT nBound )
+sal_Bool CharAttribList::HasBoundingAttrib( sal_uInt16 nBound )
 {
     // Backwards, if one ends where the next starts. 
     // => The starting one is the valid one ...
-    USHORT nAttr = aAttribs.Count()-1;
+    sal_uInt16 nAttr = aAttribs.Count()-1;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr && ( pAttr->GetEnd() >= nBound ) )
     {
         if ( ( pAttr->GetStart() == nBound ) || ( pAttr->GetEnd() == nBound ) )
-            return TRUE;
+            return sal_True;
         pAttr = GetAttrib( aAttribs, --nAttr );
     }
-    return FALSE;
+    return sal_False;
 }
 
-EditCharAttrib* CharAttribList::FindEmptyAttrib( USHORT nWhich, USHORT nPos )
+EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos )
 {
     if ( !bHasEmptyAttribs )
         return 0;
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( aAttribs, nAttr );
     while ( pAttr && ( pAttr->GetStart() <= nPos ) )
     {
@@ -2135,10 +2131,10 @@ EditCharAttrib* CharAttribList::FindEmptyAttrib( USHORT nWhich, USHORT nPos )
     return 0;
 }
 
-EditCharAttrib*	CharAttribList::FindFeature( USHORT nPos ) const
+EditCharAttrib*	CharAttribList::FindFeature( sal_uInt16 nPos ) const
 {
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttrib* pNextAttrib = GetAttrib( aAttribs, nAttr );
 
     // first to the desired position ...
@@ -2161,7 +2157,7 @@ EditCharAttrib*	CharAttribList::FindFeature( USHORT nPos ) const
 
 void CharAttribList::DeleteEmptyAttribs( SfxItemPool& rItemPool )
 {
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[nAttr];
         if ( pAttr->IsEmpty() )
@@ -2172,30 +2168,30 @@ void CharAttribList::DeleteEmptyAttribs( SfxItemPool& rItemPool )
             nAttr--;
         }
     }
-    bHasEmptyAttribs = FALSE;
+    bHasEmptyAttribs = sal_False;
 }
 
-BOOL CharAttribList::DbgCheckAttribs()
+sal_Bool CharAttribList::DbgCheckAttribs()
 {
 #ifdef  DBG_UTIL
-    BOOL bOK = TRUE;
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    sal_Bool bOK = sal_True;
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         EditCharAttrib* pAttr = aAttribs[nAttr];
         if ( pAttr->GetStart() > pAttr->GetEnd() )
         {
-            bOK = FALSE;
+            bOK = sal_False;
             OSL_FAIL( "Attribute is distorted" );
         }
         else if ( pAttr->IsFeature() && ( pAttr->GetLen() != 1 ) )
         {
-            bOK = FALSE;
+            bOK = sal_False;
             OSL_FAIL( "Feature, Len != 1" );
         }
     }
     return bOK;
 #else
-    return TRUE;
+    return sal_True;
 #endif
 }
 
@@ -2215,7 +2211,7 @@ SvxFontTable::~SvxFontTable()
     }
 }
 
-ULONG SvxFontTable::GetId( const SvxFontItem& rFontItem )
+sal_uLong SvxFontTable::GetId( const SvxFontItem& rFontItem )
 {
     SvxFontItem* pItem = First();
     while ( pItem )
@@ -2267,7 +2263,7 @@ SvxColorItem* SvxColorList::GetObject( size_t nIndex )
     return ( nIndex >= aColorList.size() ) ? NULL : aColorList[ nIndex ];
 }
 
-EditEngineItemPool::EditEngineItemPool( BOOL bPersistenRefCounts )
+EditEngineItemPool::EditEngineItemPool( sal_Bool bPersistenRefCounts )
     : SfxItemPool( String( "EditEngineItemPool", RTL_TEXTENCODING_ASCII_US ), EE_ITEMS_START, EE_ITEMS_END,
                     aItemInfos, 0, bPersistenRefCounts )
 {
@@ -2295,8 +2291,8 @@ SvStream& EditEngineItemPool::Store( SvStream& rStream ) const
     // stored until then...
 
     long nVersion = rStream.GetVersion();
-    BOOL b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) )
-                        ? TRUE : FALSE;
+    sal_Bool b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) )
+                        ? sal_True : sal_False;
 
     EditEngineItemPool* pThis = (EditEngineItemPool*)this;
     if ( b31Format )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 126808765e..85312b11ee 100644..100755
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -40,6 +40,8 @@
 #include <tools/table.hxx>
 #include <vector>
 
+#include <deque>
+
 class ImpEditEngine;
 class SvxTabStop;
 class SvtCTLOptions;
@@ -50,45 +52,45 @@ DBG_NAMEEX( EE_TextPortion )
 #define DEFTAB 			720
 
 void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent = true, short nScriptType = 0 );
-USHORT GetScriptItemId( USHORT nItemId, short nScriptType );
-BOOL IsScriptItemValid( USHORT nItemId, short nScriptType );
+sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, short nScriptType );
+sal_Bool IsScriptItemValid( sal_uInt16 nItemId, short nScriptType );
 
-EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, USHORT nS, USHORT nE );
+EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE );
 
 class ContentNode;
 class EditDoc;
 
 struct EPaM
 {
-    USHORT nPara;
-    USHORT nIndex;
+    sal_uInt16 nPara;
+    sal_uInt16 nIndex;
 
     EPaM()								{ nPara = 0; nIndex = 0; }
-    EPaM( USHORT nP, USHORT nI )		{ nPara = nP; nIndex = nI; }
+    EPaM( sal_uInt16 nP, sal_uInt16 nI )		{ nPara = nP; nIndex = nI; }
     EPaM( const EPaM& r)				{ nPara = r.nPara; nIndex = r.nIndex; }
     EPaM& operator = ( const EPaM& r )	{ nPara = r.nPara; nIndex = r.nIndex; return *this; }
-    inline BOOL operator == ( const EPaM& r ) const;
-    inline BOOL operator < ( const EPaM& r ) const;
+    inline sal_Bool operator == ( const EPaM& r ) const;
+    inline sal_Bool operator < ( const EPaM& r ) const;
 };
 
-inline BOOL EPaM::operator < ( const EPaM& r ) const
+inline sal_Bool EPaM::operator < ( const EPaM& r ) const
 {
     return ( ( nPara < r.nPara ) ||
-             ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? TRUE : FALSE;
+             ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? sal_True : sal_False;
 }
 
-inline BOOL EPaM::operator == ( const EPaM& r ) const
+inline sal_Bool EPaM::operator == ( const EPaM& r ) const
 {
-    return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? TRUE : FALSE;
+    return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? sal_True : sal_False;
 }
 
 struct ScriptTypePosInfo
 {
     short	nScriptType;
-    USHORT	nStartPos;
-    USHORT	nEndPos;
+    sal_uInt16	nStartPos;
+    sal_uInt16	nEndPos;
 
-    ScriptTypePosInfo( short _Type, USHORT _Start, USHORT _End )
+    ScriptTypePosInfo( short _Type, sal_uInt16 _Start, sal_uInt16 _End )
     {
         nScriptType = _Type;
         nStartPos = _Start;
@@ -96,15 +98,15 @@ struct ScriptTypePosInfo
     }
 };
 
-SV_DECL_VARARR( ScriptTypePosInfos, ScriptTypePosInfo, 0, 4 )
+typedef std::deque< ScriptTypePosInfo > ScriptTypePosInfos;
 
 struct WritingDirectionInfo
 {
-    BYTE	nType;
-    USHORT	nStartPos;
-    USHORT	nEndPos;
+    sal_uInt8	nType;
+    sal_uInt16	nStartPos;
+    sal_uInt16	nEndPos;
 
-    WritingDirectionInfo( BYTE _Type, USHORT _Start, USHORT _End )
+    WritingDirectionInfo( sal_uInt8 _Type, sal_uInt16 _Start, sal_uInt16 _End )
     {
         nType = _Type;
         nStartPos = _Start;
@@ -112,7 +114,8 @@ struct WritingDirectionInfo
     }
 };
 
-SV_DECL_VARARR( WritingDirectionInfos, WritingDirectionInfo, 0, 4 )
+
+typedef std::deque< WritingDirectionInfo > WritingDirectionInfos;
 
 typedef EditCharAttrib* EditCharAttribPtr;
 SV_DECL_PTRARR( CharAttribArray, EditCharAttribPtr, 0, 4 )
@@ -146,7 +149,7 @@ public:
             SvxFontTable();
             ~SvxFontTable();
 
-    ULONG	GetId( const SvxFontItem& rFont );
+    sal_uLong	GetId( const SvxFontItem& rFont );
 };
 
 //	----------------------------------------------------------------------
@@ -206,13 +209,13 @@ public:
                     ContentAttribs( const ContentAttribs& );
                     ~ContentAttribs();	// only for larger Tabs
 
-    SvxTabStop		FindTabStop( long nCurPos, USHORT nDefTab );
+    SvxTabStop		FindTabStop( long nCurPos, sal_uInt16 nDefTab );
     SfxItemSet&		GetItems()							{ return aAttribSet; }
     SfxStyleSheet*	GetStyleSheet() const				{ return pStyle; }
     void			SetStyleSheet( SfxStyleSheet* pS );
 
-    const SfxPoolItem&	GetItem( USHORT nWhich );
-    BOOL				HasItem( USHORT nWhich );
+    const SfxPoolItem&	GetItem( sal_uInt16 nWhich );
+    sal_Bool				HasItem( sal_uInt16 nWhich );
 };
 
 // -------------------------------------------------------------------------
@@ -223,7 +226,7 @@ class CharAttribList
 private:
     CharAttribArray	aAttribs;
     SvxFont			aDefFont;	       // faster than ever from the pool!
-    BOOL			bHasEmptyAttribs;
+    sal_Bool		bHasEmptyAttribs;
 
                     CharAttribList( const CharAttribList& ) {;}
 
@@ -234,32 +237,32 @@ public:
     void			DeleteEmptyAttribs(  SfxItemPool& rItemPool );
     void			RemoveItemsFromPool( SfxItemPool* pItemPool );
 
-    EditCharAttrib*	FindAttrib( USHORT nWhich, USHORT nPos );
-    EditCharAttrib*	FindNextAttrib( USHORT nWhich, USHORT nFromPos ) const;
-    EditCharAttrib*	FindEmptyAttrib( USHORT nWhich, USHORT nPos );
-    EditCharAttrib*	FindFeature( USHORT nPos ) const;
+    EditCharAttrib*	FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
+    EditCharAttrib*	FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos ) const;
+    EditCharAttrib*	FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos );
+    EditCharAttrib*	FindFeature( sal_uInt16 nPos ) const;
 
 
     void			ResortAttribs();
     void            OptimizeRanges( SfxItemPool& rItemPool );
 
-    USHORT			Count()					{ return aAttribs.Count(); }
+    sal_uInt16			Count()					{ return aAttribs.Count(); }
     void			Clear()					{ aAttribs.Remove( 0, aAttribs.Count()); }
     void			InsertAttrib( EditCharAttrib* pAttrib );
 
     SvxFont&		GetDefFont() 			{ return aDefFont; }
 
-    BOOL			HasEmptyAttribs() const	{ return bHasEmptyAttribs; }
-    BOOL&			HasEmptyAttribs() 		{ return bHasEmptyAttribs; }
-    BOOL			HasBoundingAttrib( USHORT nBound );
-    BOOL 			HasAttrib( USHORT nWhich ) const;
-    BOOL			HasAttrib( USHORT nStartPos, USHORT nEndPos ) const;
+    sal_Bool			HasEmptyAttribs() const	{ return bHasEmptyAttribs; }
+    sal_Bool&			HasEmptyAttribs() 		{ return bHasEmptyAttribs; }
+    sal_Bool			HasBoundingAttrib( sal_uInt16 nBound );
+    sal_Bool 			HasAttrib( sal_uInt16 nWhich ) const;
+    sal_Bool			HasAttrib( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) const;
 
     CharAttribArray&		GetAttribs() 		{ return aAttribs; }
     const CharAttribArray&	GetAttribs() const	{ return aAttribs; }
 
     // Debug:
-    BOOL			DbgCheckAttribs();
+    sal_Bool			DbgCheckAttribs();
 };
 
 // -------------------------------------------------------------------------
@@ -280,12 +283,12 @@ public:
     ContentAttribs&	GetContentAttribs() 	{ return aContentAttribs; }
     CharAttribList&	GetCharAttribs()		{ return aCharAttribList; }
 
-    void			ExpandAttribs( USHORT nIndex, USHORT nNewChars, SfxItemPool& rItemPool );
-    void			CollapsAttribs( USHORT nIndex, USHORT nDelChars, SfxItemPool& rItemPool );
+    void			ExpandAttribs( sal_uInt16 nIndex, sal_uInt16 nNewChars, SfxItemPool& rItemPool );
+    void			CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDelChars, SfxItemPool& rItemPool );
     void			AppendAttribs( ContentNode* pNextNode );
-    void			CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, BOOL bKeepEndingAttribs );
+    void			CopyAndCutAttribs( ContentNode* pPrevNode, SfxItemPool& rPool, sal_Bool bKeepEndingAttribs );
 
-    void			SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont = TRUE );
+    void			SetStyleSheet( SfxStyleSheet* pS, sal_Bool bRecalcFont = sal_True );
     void			SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle );
     SfxStyleSheet*	GetStyleSheet()	{ return aContentAttribs.GetStyleSheet(); }
 
@@ -297,7 +300,7 @@ public:
     void			CreateWrongList();
     void			DestroyWrongList();
 
-    BOOL			IsFeature( USHORT nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); }
+    sal_Bool			IsFeature( sal_uInt16 nPos ) const { return ( GetChar( nPos ) == CH_FEATURE ); }
 };
 
 typedef ContentNode* ContentNodePtr;
@@ -305,10 +308,10 @@ SV_DECL_PTRARR( DummyContentList, ContentNodePtr, 0, 4 )
 
 class ContentList : public DummyContentList
 {
-  USHORT nLastCache;
+  sal_uInt16 nLastCache;
 public:
   ContentList() : DummyContentList( 0, 4 ), nLastCache(0) {}
-  USHORT GetPos( const ContentNodePtr &rPtr ) const;
+  sal_uInt16 GetPos( const ContentNodePtr &rPtr ) const;
 };
 
 // -------------------------------------------------------------------------
@@ -318,27 +321,27 @@ class EditPaM
 {
 private:
     ContentNode*	pNode;
-    USHORT			nIndex;
+    sal_uInt16			nIndex;
 
 public:
                     EditPaM() 							{ pNode = NULL; nIndex = 0; }
-                    EditPaM( ContentNode* p, USHORT n )	{ pNode = p; nIndex = n; }
+                    EditPaM( ContentNode* p, sal_uInt16 n )	{ pNode = p; nIndex = n; }
 
     ContentNode*	GetNode() const					{ return pNode; }
     void			SetNode( ContentNode* p) 		{ pNode = p; }
 
-    USHORT			GetIndex() const				{ return nIndex; }
-    USHORT&			GetIndex() 						{ return nIndex; }
-    void			SetIndex( USHORT n )			{ nIndex = n; }
+    sal_uInt16			GetIndex() const				{ return nIndex; }
+    sal_uInt16&			GetIndex() 						{ return nIndex; }
+    void			SetIndex( sal_uInt16 n )			{ nIndex = n; }
 
-    BOOL			IsParaStart() const				{ return nIndex == 0; }
-    BOOL			IsParaEnd() const 				{ return nIndex == pNode->Len(); }
+    sal_Bool			IsParaStart() const				{ return nIndex == 0; }
+    sal_Bool			IsParaEnd() const 				{ return nIndex == pNode->Len(); }
 
-    BOOL			DbgIsBuggy( EditDoc& rDoc );
+    sal_Bool			DbgIsBuggy( EditDoc& rDoc );
 
     EditPaM&	operator = ( const EditPaM& rPaM );
-    friend BOOL operator == ( const EditPaM& r1,  const EditPaM& r2  );
-    friend BOOL operator != ( const EditPaM& r1,  const EditPaM& r2  );
+    friend sal_Bool operator == ( const EditPaM& r1,  const EditPaM& r2  );
+    friend sal_Bool operator != ( const EditPaM& r1,  const EditPaM& r2  );
 };
 
 #define PORTIONKIND_TEXT		0
@@ -367,11 +370,11 @@ struct ExtraPortionInfo
 
     long    nPortionOffsetX;
 
-    USHORT  nMaxCompression100thPercent;
+    sal_uInt16  nMaxCompression100thPercent;
 
-    BYTE    nAsianCompressionTypes;
-    BOOL    bFirstCharIsRightPunktuation;
-    BOOL    bCompressed;
+    sal_uInt8    nAsianCompressionTypes;
+    sal_Bool    bFirstCharIsRightPunktuation;
+    sal_Bool    bCompressed;
 
     sal_Int32*    pOrgDXArray;
 
@@ -379,7 +382,7 @@ struct ExtraPortionInfo
             ExtraPortionInfo();
             ~ExtraPortionInfo();
 
-    void    SaveOrgDXArray( const sal_Int32* pDXArray, USHORT nLen );
+    void    SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLen );
     void    DestroyOrgDXArray();
 };
 
@@ -391,44 +394,44 @@ class TextPortion
 {
 private:
     ExtraPortionInfo*   pExtraInfos;
-    USHORT		        nLen;
+    sal_uInt16		        nLen;
     Size		        aOutSz;
-    BYTE		        nKind;
-    BYTE                nRightToLeft;
+    sal_uInt8		        nKind;
+    sal_uInt8                nRightToLeft;
     sal_Unicode	        nExtraValue;
 
 
                 TextPortion()				{ DBG_CTOR( EE_TextPortion, 0 );
-                                              pExtraInfos = NULL; nLen = 0; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;}
+                                              pExtraInfos = NULL; nLen = 0; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = sal_False;}
 
 public:
-                TextPortion( USHORT nL ) : aOutSz( -1, -1 )
+                TextPortion( sal_uInt16 nL ) : aOutSz( -1, -1 )
                                             {	DBG_CTOR( EE_TextPortion, 0 );
-                                                pExtraInfos = NULL; nLen = nL; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = FALSE;}
+                                                pExtraInfos = NULL; nLen = nL; nKind = PORTIONKIND_TEXT; nExtraValue = 0; nRightToLeft = sal_False;}
                 TextPortion( const TextPortion& r )	: aOutSz( r.aOutSz )
                                             { DBG_CTOR( EE_TextPortion, 0 );
                                                 pExtraInfos = NULL; nLen = r.nLen; nKind = r.nKind; nExtraValue = r.nExtraValue; nRightToLeft = r.nRightToLeft; }
 
                 ~TextPortion()				{ 	DBG_DTOR( EE_TextPortion, 0 ); delete pExtraInfos; }
 
-    USHORT		GetLen() const				{ return nLen; }
-    USHORT&		GetLen() 					{ return nLen; }
-    void		SetLen( USHORT nL )			{ nLen = nL; }
+    sal_uInt16		GetLen() const				{ return nLen; }
+    sal_uInt16&		GetLen() 					{ return nLen; }
+    void		SetLen( sal_uInt16 nL )			{ nLen = nL; }
 
     Size&		GetSize()					{ return aOutSz; }
     Size		GetSize() const				{ return aOutSz; }
 
-    BYTE&		GetKind()					{ return nKind; }
-    BYTE		GetKind() const				{ return nKind; }
+    sal_uInt8&		GetKind()					{ return nKind; }
+    sal_uInt8		GetKind() const				{ return nKind; }
 
-    void        SetRightToLeft( BYTE b )    { nRightToLeft = b; }
-    BYTE        GetRightToLeft() const      { return nRightToLeft; }
-    BOOL        IsRightToLeft() const       { return (nRightToLeft&1); }
+    void        SetRightToLeft( sal_uInt8 b )    { nRightToLeft = b; }
+    sal_uInt8        GetRightToLeft() const      { return nRightToLeft; }
+    sal_Bool        IsRightToLeft() const       { return (nRightToLeft&1); }
 
     sal_Unicode	GetExtraValue() const		{ return nExtraValue; }
     void		SetExtraValue( sal_Unicode n ) 	{ nExtraValue = n; }
 
-    BOOL		HasValidSize() const		{ return aOutSz.Width() != (-1); }
+    sal_Bool		HasValidSize() const		{ return aOutSz.Width() != (-1); }
 
     ExtraPortionInfo*   GetExtraInfos() const { return pExtraInfos; }
     void                SetExtraInfos( ExtraPortionInfo* p ) { delete pExtraInfos; pExtraInfos = p; }
@@ -447,9 +450,9 @@ public:
             ~TextPortionList();
 
     void	Reset();
-    USHORT	FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE );
-    USHORT  GetStartPos( USHORT nPortion );
-    void	DeleteFromPortion( USHORT nDelFrom );
+    sal_uInt16	FindPortion( sal_uInt16 nCharPos, sal_uInt16& rPortionStart, sal_Bool bPreferStartingPortion = sal_False );
+    sal_uInt16  GetStartPos( sal_uInt16 nPortion );
+    void	DeleteFromPortion( sal_uInt16 nDelFrom );
 };
 
 class ParaPortion;
@@ -464,84 +467,84 @@ class EditLine
 private:
     CharPosArray	aPositions;
     long            nTxtWidth;
-    USHORT			nStartPosX;
-    USHORT			nStart;		// could be replaced by nStartPortion
-    USHORT			nEnd;       // could be replaced by nEndPortion
-    USHORT			nStartPortion;
-    USHORT 			nEndPortion;
-    USHORT			nHeight;	//  Total height of the line
-    USHORT			nTxtHeight;	// Pure Text height
-    USHORT			nCrsrHeight;	// For contour flow high lines => cursor is large.
-    USHORT			nMaxAscent;
-    BOOL			bHangingPunctuation;
-    BOOL			bInvalid;	// for skillful formatting
+    sal_uInt16			nStartPosX;
+    sal_uInt16			nStart;		// could be replaced by nStartPortion
+    sal_uInt16			nEnd;       // could be replaced by nEndPortion
+    sal_uInt16			nStartPortion;
+    sal_uInt16 			nEndPortion;
+    sal_uInt16			nHeight;	//  Total height of the line
+    sal_uInt16			nTxtHeight;	// Pure Text height
+    sal_uInt16			nCrsrHeight;	// For contour flow high lines => cursor is large.
+    sal_uInt16			nMaxAscent;
+    sal_Bool			bHangingPunctuation;
+    sal_Bool			bInvalid;	// for skillful formatting
 
 public:
                     EditLine();
                     EditLine( const EditLine& );
                     ~EditLine();
 
-    BOOL			IsIn( USHORT nIndex ) const
+    sal_Bool			IsIn( sal_uInt16 nIndex ) const
                         { return ( (nIndex >= nStart ) && ( nIndex < nEnd ) ); }
 
-    BOOL			IsIn( USHORT nIndex, BOOL bInclEnd ) const
+    sal_Bool			IsIn( sal_uInt16 nIndex, sal_Bool bInclEnd ) const
                         { return ( ( nIndex >= nStart ) && ( bInclEnd ? ( nIndex <= nEnd ) : ( nIndex < nEnd ) ) ); }
 
-    void			SetStart( USHORT n )			{ nStart = n; }
-    USHORT			GetStart() const				{ return nStart; }
-    USHORT&			GetStart() 						{ return nStart; }
+    void			SetStart( sal_uInt16 n )			{ nStart = n; }
+    sal_uInt16			GetStart() const				{ return nStart; }
+    sal_uInt16&			GetStart() 						{ return nStart; }
 
-    void			SetEnd( USHORT n )				{ nEnd = n; }
-    USHORT			GetEnd() const					{ return nEnd; }
-    USHORT&			GetEnd() 						{ return nEnd; }
+    void			SetEnd( sal_uInt16 n )				{ nEnd = n; }
+    sal_uInt16			GetEnd() const					{ return nEnd; }
+    sal_uInt16&			GetEnd() 						{ return nEnd; }
 
-    void			SetStartPortion( USHORT n )		{ nStartPortion = n; }
-    USHORT			GetStartPortion() const			{ return nStartPortion; }
-    USHORT&			GetStartPortion() 				{ return nStartPortion; }
+    void			SetStartPortion( sal_uInt16 n )		{ nStartPortion = n; }
+    sal_uInt16			GetStartPortion() const			{ return nStartPortion; }
+    sal_uInt16&			GetStartPortion() 				{ return nStartPortion; }
 
-    void			SetEndPortion( USHORT n )		{ nEndPortion = n; }
-    USHORT			GetEndPortion() const			{ return nEndPortion; }
-    USHORT&			GetEndPortion() 				{ return nEndPortion; }
+    void			SetEndPortion( sal_uInt16 n )		{ nEndPortion = n; }
+    sal_uInt16			GetEndPortion() const			{ return nEndPortion; }
+    sal_uInt16&			GetEndPortion() 				{ return nEndPortion; }
 
-    void			SetHeight( USHORT nH, USHORT nTxtH = 0, USHORT nCrsrH = 0 )
+    void			SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16 nCrsrH = 0 )
                     { 	nHeight = nH;
                         nTxtHeight = ( nTxtH ? nTxtH : nH );
                         nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight );
                     }
-    USHORT			GetHeight() const				{ return nHeight; }
-    USHORT			GetTxtHeight() const			{ return nTxtHeight; }
-    USHORT			GetCrsrHeight() const			{ return nCrsrHeight; }
+    sal_uInt16			GetHeight() const				{ return nHeight; }
+    sal_uInt16			GetTxtHeight() const			{ return nTxtHeight; }
+    sal_uInt16			GetCrsrHeight() const			{ return nCrsrHeight; }
 
     void            SetTextWidth( long n )          { nTxtWidth = n; }
     long            GetTextWidth() const            { return nTxtWidth; }
 
-    void			SetMaxAscent( USHORT n )		{ nMaxAscent = n; }
-    USHORT			GetMaxAscent() const			{ return nMaxAscent; }
+    void			SetMaxAscent( sal_uInt16 n )		{ nMaxAscent = n; }
+    sal_uInt16			GetMaxAscent() const			{ return nMaxAscent; }
 
-    void			SetHangingPunctuation( BOOL b )		{ bHangingPunctuation = b; }
-    BOOL			IsHangingPunctuation() const		{ return bHangingPunctuation; }
+    void			SetHangingPunctuation( sal_Bool b )		{ bHangingPunctuation = b; }
+    sal_Bool			IsHangingPunctuation() const		{ return bHangingPunctuation; }
 
-    USHORT			GetLen() const					{ return nEnd - nStart; }
+    sal_uInt16			GetLen() const					{ return nEnd - nStart; }
 
-    USHORT			GetStartPosX() const			{ return nStartPosX; }
-    void			SetStartPosX( USHORT start )	{ nStartPosX = start; }
+    sal_uInt16			GetStartPosX() const			{ return nStartPosX; }
+    void			SetStartPosX( sal_uInt16 start )	{ nStartPosX = start; }
 
     Size			CalcTextSize( ParaPortion& rParaPortion );
 
-    BOOL			IsInvalid()	const				{ return bInvalid; }
-    BOOL			IsValid() const					{ return !bInvalid; }
-    void			SetInvalid()					{ bInvalid = TRUE; }
-    void			SetValid()						{ bInvalid = FALSE; }
+    sal_Bool			IsInvalid()	const				{ return bInvalid; }
+    sal_Bool			IsValid() const					{ return !bInvalid; }
+    void			SetInvalid()					{ bInvalid = sal_True; }
+    void			SetValid()						{ bInvalid = sal_False; }
 
-    BOOL			IsEmpty() const					{ return (nEnd > nStart) ? FALSE : TRUE; }
+    sal_Bool			IsEmpty() const					{ return (nEnd > nStart) ? sal_False : sal_True; }
 
     CharPosArray&	GetCharPosArray()				{ return aPositions; }
 
     EditLine*		Clone() const;
 
     EditLine&	operator = ( const EditLine& rLine );
-    friend BOOL operator == ( const EditLine& r1,  const EditLine& r2  );
-    friend BOOL operator != ( const EditLine& r1,  const EditLine& r2  );
+    friend sal_Bool operator == ( const EditLine& r1,  const EditLine& r2  );
+    friend sal_Bool operator != ( const EditLine& r1,  const EditLine& r2  );
 };
 
 
@@ -558,8 +561,8 @@ public:
             ~EditLineList();
 
     void	Reset();
-    void	DeleteFromLine( USHORT nDelFrom );
-    USHORT	FindLine( USHORT nChar, BOOL bInclEnd );
+    void	DeleteFromLine( sal_uInt16 nDelFrom );
+    sal_uInt16	FindLine( sal_uInt16 nChar, sal_Bool bInclEnd );
 };
 
 // -------------------------------------------------------------------------
@@ -577,15 +580,15 @@ private:
     ScriptTypePosInfos	    aScriptInfos;
     WritingDirectionInfos   aWritingDirectionInfos;
 
-    USHORT				nInvalidPosStart;
-    USHORT				nFirstLineOffset;	// For Writer-LineSpacing-Interpretation
-    USHORT				nBulletX;
-    short				nInvalidDiff;
+    sal_uInt16				nInvalidPosStart;
+    sal_uInt16				nFirstLineOffset;	// For Writer-LineSpacing-Interpretation
+    sal_uInt16				nBulletX;
+    short				    nInvalidDiff;
 
-    BOOL				bInvalid 			: 1;
-    BOOL				bSimple				: 1;	// only linear Tap
-    BOOL				bVisible			: 1;	// Belongs to the node!
-    BOOL				bForceRepaint		: 1;
+    sal_Bool				bInvalid 			: 1;
+    sal_Bool				bSimple				: 1;	// only linear Tap
+    sal_Bool				bVisible			: 1;	// Belongs to the node!
+    sal_Bool				bForceRepaint		: 1;
 
                         ParaPortion( const ParaPortion& );
 
@@ -593,39 +596,39 @@ public:
                         ParaPortion( ContentNode* pNode );
                         ~ParaPortion();
 
-    USHORT				GetLineNumber( USHORT nIndex );
+    sal_uInt16				GetLineNumber( sal_uInt16 nIndex );
 
     EditLineList&		GetLines()					{ return aLineList; }
 
-    BOOL				IsInvalid()	const			{ return bInvalid; }
-    BOOL				IsSimpleInvalid()	const	{ return bSimple; }
-    void				SetValid()					{ bInvalid = FALSE; bSimple = TRUE;}
+    sal_Bool				IsInvalid()	const			{ return bInvalid; }
+    sal_Bool				IsSimpleInvalid()	const	{ return bSimple; }
+    void				SetValid()					{ bInvalid = sal_False; bSimple = sal_True;}
 
-    BOOL				MustRepaint() const			{ return bForceRepaint; }
-    void				SetMustRepaint( BOOL bRP )	{ bForceRepaint = bRP; }
+    sal_Bool				MustRepaint() const			{ return bForceRepaint; }
+    void				SetMustRepaint( sal_Bool bRP )	{ bForceRepaint = bRP; }
 
-    USHORT				GetBulletX() const			{ return nBulletX; }
-    void				SetBulletX( USHORT n ) 		{ nBulletX = n; }
+    sal_uInt16				GetBulletX() const			{ return nBulletX; }
+    void				SetBulletX( sal_uInt16 n ) 		{ nBulletX = n; }
 
-    void				MarkInvalid( USHORT nStart, short nDiff);
-    void				MarkSelectionInvalid( USHORT nStart, USHORT nEnd );
+    void				MarkInvalid( sal_uInt16 nStart, short nDiff);
+    void				MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    void				SetVisible( BOOL bVisible );
-    BOOL				IsVisible()					{ return bVisible; }
+    void				SetVisible( sal_Bool bVisible );
+    sal_Bool				IsVisible()					{ return bVisible; }
 
     long				GetHeight() const 			{ return ( bVisible ? nHeight : 0 ); }
-    USHORT				GetFirstLineOffset() const 	{ return ( bVisible ? nFirstLineOffset : 0 ); }
+    sal_uInt16				GetFirstLineOffset() const 	{ return ( bVisible ? nFirstLineOffset : 0 ); }
     void				ResetHeight()	{ nHeight = 0; nFirstLineOffset = 0; }
 
     ContentNode*		GetNode() const				{ return pNode; }
     TextPortionList&	GetTextPortions() 			{ return aTextPortionList; }
 
-    USHORT				GetInvalidPosStart() const	{ return nInvalidPosStart; }
+    sal_uInt16				GetInvalidPosStart() const	{ return nInvalidPosStart; }
     short				GetInvalidDiff() const 		{ return nInvalidDiff; }
 
-    void				CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine );
+    void				CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine );
 
-    BOOL				DbgCheckTextPortions();
+    sal_Bool				DbgCheckTextPortions();
 };
 
 typedef ParaPortion* ParaPortionPtr;
@@ -636,19 +639,19 @@ SV_DECL_PTRARR( DummyParaPortionList, ParaPortionPtr, 0, 4 )
 // -------------------------------------------------------------------------
 class ParaPortionList : public DummyParaPortionList
 {
-    USHORT nLastCache;
+    sal_uInt16 nLastCache;
 public:
                     ParaPortionList();
                     ~ParaPortionList();
 
     void			Reset();
     long			GetYOffset( ParaPortion* pPPortion );
-    USHORT			FindParagraph( long nYOffset );
+    sal_uInt16			FindParagraph( long nYOffset );
 
-    inline ParaPortion*	SaveGetObject( USHORT nPos ) const
+    inline ParaPortion*	SaveGetObject( sal_uInt16 nPos ) const
         { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
 
-    USHORT                  GetPos( const ParaPortionPtr &rPtr ) const;
+    sal_uInt16                  GetPos( const ParaPortionPtr &rPtr ) const;
 
     // temporary:
     void			DbgCheck( EditDoc& rDoc );
@@ -675,17 +678,17 @@ public:
     const EditPaM&	Min() const			{ return aStartPaM; }
     const EditPaM&	Max() const			{ return aEndPaM; }
 
-    BOOL			HasRange() const	{ return aStartPaM != aEndPaM; }
-    BOOL            IsInvalid() const;
-    BOOL			DbgIsBuggy( EditDoc& rDoc );
+    sal_Bool			HasRange() const	{ return aStartPaM != aEndPaM; }
+    sal_Bool            IsInvalid() const;
+    sal_Bool			DbgIsBuggy( EditDoc& rDoc );
 
-    BOOL			Adjust( const ContentList& rNodes );
+    sal_Bool			Adjust( const ContentList& rNodes );
 
     EditSelection&	operator = ( const EditPaM& r );
-    BOOL 			operator == ( const EditSelection& r ) const
+    sal_Bool 			operator == ( const EditSelection& r ) const
                     { return ( ( aStartPaM == r.aStartPaM ) && ( aEndPaM == r.aEndPaM ) )
-                            ? TRUE : FALSE; }
-    BOOL 			operator != ( const EditSelection& r ) const { return !( r == *this ); }
+                            ? sal_True : sal_False; }
+    sal_Bool 			operator != ( const EditSelection& r ) const { return !( r == *this ); }
 };
 
 // -------------------------------------------------------------------------
@@ -694,16 +697,16 @@ public:
 class DeletedNodeInfo
 {
 private:
-    ULONG 	nInvalidAdressPtr;
-    USHORT	nInvalidParagraph;
+    sal_uIntPtr 	nInvalidAdressPtr;
+    sal_uInt16	nInvalidParagraph;
 
 public:
-            DeletedNodeInfo( ULONG nInvAdr, USHORT nPos )
+            DeletedNodeInfo( sal_uIntPtr nInvAdr, sal_uInt16 nPos )
                                             { 	nInvalidAdressPtr = nInvAdr;
                                                 nInvalidParagraph = nPos; }
 
-    ULONG	GetInvalidAdress()				{	return nInvalidAdressPtr; }
-    USHORT	GetPosition()					{	return nInvalidParagraph; }
+    sal_uIntPtr	GetInvalidAdress()				{	return nInvalidAdressPtr; }
+    sal_uInt16	GetPosition()					{	return nInvalidParagraph; }
 };
 
 typedef DeletedNodeInfo* DeletedNodeInfoPtr;
@@ -719,12 +722,12 @@ private:
     Link            aModifyHdl;
 
     SvxFont			aDefFont;			//faster than ever from the pool!!
-    USHORT			nDefTab;
-    BOOL			bIsVertical;
-    BOOL			bIsFixedCellHeight;
+    sal_uInt16			nDefTab;
+    sal_Bool			bIsVertical;
+    sal_Bool			bIsFixedCellHeight;
 
-    BOOL			bOwnerOfPool;
-    BOOL			bModified;
+    sal_Bool			bOwnerOfPool;
+    sal_Bool			bModified;
 
 protected:
     void			ImplDestroyContents();
@@ -733,38 +736,38 @@ public:
                     EditDoc( SfxItemPool* pItemPool );
                     ~EditDoc();
 
-    BOOL			IsModified() const		{ return bModified; }
-    void			SetModified( BOOL b );
+    sal_Bool			IsModified() const		{ return bModified; }
+    void			SetModified( sal_Bool b );
 
     void            SetModifyHdl( const Link& rLink ) { aModifyHdl = rLink; }
     Link            GetModifyHdl() const { return aModifyHdl; }
 
-    void			CreateDefFont( BOOL bUseStyles );
+    void			CreateDefFont( sal_Bool bUseStyles );
     const SvxFont&	GetDefFont() { return aDefFont; }
 
-    void			SetDefTab( USHORT nTab )	{ nDefTab = nTab ? nTab : DEFTAB; }
-    USHORT			GetDefTab() const 			{ return nDefTab; }
+    void			SetDefTab( sal_uInt16 nTab )	{ nDefTab = nTab ? nTab : DEFTAB; }
+    sal_uInt16			GetDefTab() const 			{ return nDefTab; }
 
-    void			SetVertical( BOOL bVertical )	{ bIsVertical = bVertical; }
-    BOOL			IsVertical() const 				{ return bIsVertical; }
+    void			SetVertical( sal_Bool bVertical )	{ bIsVertical = bVertical; }
+    sal_Bool			IsVertical() const 				{ return bIsVertical; }
 
-    void			SetFixedCellHeight( BOOL bUseFixedCellHeight )	{ bIsFixedCellHeight = bUseFixedCellHeight; }
-    BOOL			IsFixedCellHeight() const 				{ return bIsFixedCellHeight; }
+    void			SetFixedCellHeight( sal_Bool bUseFixedCellHeight )	{ bIsFixedCellHeight = bUseFixedCellHeight; }
+    sal_Bool			IsFixedCellHeight() const 				{ return bIsFixedCellHeight; }
 
     EditPaM			Clear();
     EditPaM			RemoveText();
-    EditPaM			RemoveChars( EditPaM aPaM, USHORT nChars );
+    EditPaM			RemoveChars( EditPaM aPaM, sal_uInt16 nChars );
     void            InsertText( const EditPaM& rPaM, xub_Unicode c );
     EditPaM			InsertText( EditPaM aPaM, const XubString& rStr );
-    EditPaM			InsertParaBreak( EditPaM aPaM, BOOL bKeepEndingAttribs );
+    EditPaM			InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs );
     EditPaM			InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem );
     EditPaM			ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight );
 
     String			GetText( LineEnd eEnd ) const;
-    ULONG			GetTextLen() const;
+    sal_uLong			GetTextLen() const;
 
-    XubString 		GetParaAsString( USHORT nNode ) const;
-    XubString 		GetParaAsString( ContentNode* pNode, USHORT nStartPos = 0, USHORT nEndPos = 0xFFFF, BOOL bResolveFields = TRUE ) const;
+    XubString 		GetParaAsString( sal_uInt16 nNode ) const;
+    XubString 		GetParaAsString( ContentNode* pNode, sal_uInt16 nStartPos = 0, sal_uInt16 nEndPos = 0xFFFF, sal_Bool bResolveFields = sal_True ) const;
 
     inline EditPaM	GetStartPaM() const;
     inline EditPaM	GetEndPaM() const;
@@ -774,15 +777,15 @@ public:
     
     void			RemoveItemsFromPool( ContentNode* pNode );
 
-    void			InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, USHORT nStart, USHORT nEnd );
-    void 			InsertAttrib( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem );
-    void			InsertAttribInSelection( ContentNode* pNode, USHORT nStart, USHORT nEnd, const SfxPoolItem& rPoolItem );
-    BOOL			RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, USHORT nWhich = 0 );
-    BOOL			RemoveAttribs( ContentNode* pNode, USHORT nStart, USHORT nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, USHORT nWhich = 0 );
-    void			FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet );
+    void			InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd );
+    void 			InsertAttrib( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem );
+    void			InsertAttribInSelection( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, const SfxPoolItem& rPoolItem );
+    sal_Bool			RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nWhich = 0 );
+    sal_Bool			RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich = 0 );
+    void			FindAttribs( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, SfxItemSet& rCurSet );
 
-    USHORT			GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); }
-    ContentNode*	SaveGetObject( USHORT nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
+    sal_uInt16			GetPos( ContentNode* pNode ) const { return ContentList::GetPos(pNode); }
+    ContentNode*	SaveGetObject( sal_uInt16 nPos ) const { return ( nPos < Count() ) ? GetObject( nPos ) : 0; }
 
     static XubString	GetSepStr( LineEnd eEnd );
 };
@@ -798,12 +801,12 @@ inline EditPaM EditDoc::GetEndPaM() const
     return EditPaM( pLastNode, pLastNode->Len() );
 }
 
-inline EditCharAttrib* GetAttrib( const CharAttribArray& rAttribs, USHORT nAttr )
+inline EditCharAttrib* GetAttrib( const CharAttribArray& rAttribs, sal_uInt16 nAttr )
 {
     return ( nAttr < rAttribs.Count() ) ? rAttribs[nAttr] : 0;
 }
 
-BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart );
+sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart );
 
 // -------------------------------------------------------------------------
 // class EditEngineItemPool
@@ -811,7 +814,7 @@ BOOL CheckOrderedList( CharAttribArray& rAttribs, BOOL bStart );
 class EditEngineItemPool : public SfxItemPool
 {
 public:
-                        EditEngineItemPool( BOOL bPersistenRefCounts );
+                        EditEngineItemPool( sal_Bool bPersistenRefCounts );
 protected:
                         virtual ~EditEngineItemPool();
 public:
diff --git a/editeng/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 6faed936f1..4bf4ef3809 100644..100755
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -81,24 +81,24 @@ TextPortionList::~TextPortionList()
 
 void TextPortionList::Reset()
 {
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
         delete GetObject( nPortion );
     Remove( 0, Count() );
 }
 
-void TextPortionList::DeleteFromPortion( USHORT nDelFrom )
+void TextPortionList::DeleteFromPortion( sal_uInt16 nDelFrom )
 {
     DBG_ASSERT( ( nDelFrom < Count() ) || ( (nDelFrom == 0) && (Count() == 0) ), "DeleteFromPortion: Out of range" );
-    for ( USHORT nP = nDelFrom; nP < Count(); nP++ )
+    for ( sal_uInt16 nP = nDelFrom; nP < Count(); nP++ )
         delete GetObject( nP );
     Remove( nDelFrom, Count()-nDelFrom );
 }
 
-USHORT TextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, BOOL bPreferStartingPortion )
+sal_uInt16 TextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPortionStart, sal_Bool bPreferStartingPortion )
 {
     // When nCharPos at portion limit, the left portion is found
-    USHORT nTmpPos = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    sal_uInt16 nTmpPos = 0;
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         TextPortion* pPortion = GetObject( nPortion );
         nTmpPos = nTmpPos + pPortion->GetLen();
@@ -116,10 +116,10 @@ USHORT TextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, BOO
     return ( Count() - 1 );
 }
 
-USHORT TextPortionList::GetStartPos( USHORT nPortion )
+sal_uInt16 TextPortionList::GetStartPos( sal_uInt16 nPortion )
 {
-    USHORT nPos = 0;
-    for ( USHORT n = 0; n < nPortion; n++ )
+    sal_uInt16 nPos = 0;
+    for ( sal_uInt16 n = 0; n < nPortion; n++ )
     {
         TextPortion* pPortion = GetObject( n );
         nPos = nPos + pPortion->GetLen();
@@ -135,8 +135,8 @@ ExtraPortionInfo::ExtraPortionInfo()
     nMaxCompression100thPercent = 0;
     nAsianCompressionTypes = 0;
     nPortionOffsetX = 0;
-    bFirstCharIsRightPunktuation = FALSE;
-    bCompressed = FALSE;
+    bFirstCharIsRightPunktuation = sal_False;
+    bCompressed = sal_False;
     pOrgDXArray = NULL;
 }
 
@@ -145,7 +145,7 @@ ExtraPortionInfo::~ExtraPortionInfo()
     delete[] pOrgDXArray;
 }
 
-void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, USHORT nLen )
+void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_uInt16 nLen )
 {
     delete[] pOrgDXArray;
     pOrgDXArray = new sal_Int32[nLen];
@@ -164,10 +164,10 @@ ParaPortion::ParaPortion( ContentNode* pN )
     DBG_CTOR( EE_ParaPortion, 0 );
 
     pNode 				= pN;
-    bInvalid 			= TRUE;
-    bVisible 			= TRUE;
-    bSimple 			= FALSE;
-    bForceRepaint 		= FALSE;
+    bInvalid 			= sal_True;
+    bVisible 			= sal_True;
+    bSimple 			= sal_False;
+    bForceRepaint 		= sal_False;
     nInvalidPosStart	= 0;
     nInvalidDiff 		= 0;
     nHeight 			= 0;
@@ -180,9 +180,9 @@ ParaPortion::~ParaPortion()
     DBG_DTOR( EE_ParaPortion, 0 );
 }
 
-void ParaPortion::MarkInvalid( USHORT nStart, short nDiff )
+void ParaPortion::MarkInvalid( sal_uInt16 nStart, short nDiff )
 {
-    if ( bInvalid == FALSE )
+    if ( bInvalid == sal_False )
     {
 //		nInvalidPosEnd = nStart;	// ??? => CreateLines
         nInvalidPosStart = ( nDiff >= 0 ) ? nStart : ( nStart + nDiff );
@@ -206,20 +206,19 @@ void ParaPortion::MarkInvalid( USHORT nStart, short nDiff )
         {
 //			nInvalidPosEnd = pNode->Len();
             DBG_ASSERT( ( nDiff >= 0 ) || ( (nStart+nDiff) >= 0 ), "MarkInvalid: Diff out of Range" );
-            nInvalidPosStart = Min( nInvalidPosStart, (USHORT) ( nDiff < 0 ? nStart+nDiff : nDiff ) );
+            nInvalidPosStart = Min( nInvalidPosStart, (sal_uInt16) ( nDiff < 0 ? nStart+nDiff : nDiff ) );
             nInvalidDiff = 0;
-            bSimple = FALSE;
+            bSimple = sal_False;
         }
     }
-    bInvalid = TRUE;
-    aScriptInfos.Remove( 0, aScriptInfos.Count() );
-    aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() );
-//	aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() );
+    bInvalid = sal_True;
+    aScriptInfos.clear();
+    aWritingDirectionInfos.clear();
 }
 
-void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ )
+void ParaPortion::MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 /* nEnd */ )
 {
-    if ( bInvalid == FALSE )
+    if ( bInvalid == sal_False )
     {
         nInvalidPosStart = nStart;
 //		nInvalidPosEnd = nEnd;
@@ -230,19 +229,18 @@ void ParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /* nEnd */ )
 //		nInvalidPosEnd = pNode->Len();
     }
     nInvalidDiff = 0;
-    bInvalid = TRUE;
-    bSimple = FALSE;
-    aScriptInfos.Remove( 0, aScriptInfos.Count() );
-    aWritingDirectionInfos.Remove( 0, aWritingDirectionInfos.Count() );
-//	aExtraCharInfos.Remove( 0, aExtraCharInfos.Count() );
+    bInvalid = sal_True;
+    bSimple = sal_False;
+    aScriptInfos.clear();
+    aWritingDirectionInfos.clear();
 }
 
-USHORT ParaPortion::GetLineNumber( USHORT nIndex )
+sal_uInt16 ParaPortion::GetLineNumber( sal_uInt16 nIndex )
 {
     DBG_ASSERTWARNING( aLineList.Count(), "Empty ParaPortion in GetLine!" );
     DBG_ASSERT( bVisible, "Why GetLine() on an invisible paragraph?" );
 
-    for ( USHORT nLine = 0; nLine < aLineList.Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < aLineList.Count(); nLine++ )
     {
         if ( aLineList[nLine]->IsIn( nIndex ) )
             return nLine;
@@ -253,14 +251,14 @@ USHORT ParaPortion::GetLineNumber( USHORT nIndex )
     return (aLineList.Count()-1);
 }
 
-void ParaPortion::SetVisible( BOOL bMakeVisible )
+void ParaPortion::SetVisible( sal_Bool bMakeVisible )
 {
     bVisible = bMakeVisible;
 }
 
-void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine )
+void ParaPortion::CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine )
 {
-    USHORT nLines = aLineList.Count();
+    sal_uInt16 nLines = aLineList.Count();
     DBG_ASSERT( nLines, "CorrectPortionNumbersFromLine: Empty Portion?" );
     if ( nLastFormattedLine < ( nLines - 1 ) )
     {
@@ -278,18 +276,18 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLin
         int nTDiff = -( nTextDiff-1 );
         if ( nPDiff || nTDiff )
         {
-            for ( USHORT nL = nLastFormattedLine+1; nL < nLines; nL++ )
+            for ( sal_uInt16 nL = nLastFormattedLine+1; nL < nLines; nL++ )
             {
                 EditLine* pLine = aLineList[ nL ];
 
-                pLine->GetStartPortion() = sal::static_int_cast< USHORT >(
+                pLine->GetStartPortion() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetStartPortion() + nPDiff);
-                pLine->GetEndPortion() = sal::static_int_cast< USHORT >(
+                pLine->GetEndPortion() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetEndPortion() + nPDiff);
 
-                pLine->GetStart() = sal::static_int_cast< USHORT >(
+                pLine->GetStart() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetStart() + nTDiff);
-                pLine->GetEnd() = sal::static_int_cast< USHORT >(
+                pLine->GetEnd() = sal::static_int_cast< sal_uInt16 >(
                     pLine->GetEnd() + nTDiff);
 
                 pLine->SetValid();
@@ -301,21 +299,21 @@ void ParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLin
 
 // Shared reverse lookup acceleration pieces ...
 
-static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
-                          VoidPtr pPtr, USHORT &rLastPos )
+static sal_uInt16 FastGetPos( const VoidPtr *pPtrArray, sal_uInt16 nPtrArrayLen,
+                          VoidPtr pPtr, sal_uInt16 &rLastPos )
 {
   // Through certain filter code-paths we do a lot of appends, which in
   // turn call GetPos - creating some N^2 nightmares. If we have a
   // non-trivially large list, do a few checks from the end first.
   if( rLastPos > 16 )
     {
-      USHORT nEnd;
+      sal_uInt16 nEnd;
       if (rLastPos > nPtrArrayLen - 2)
         nEnd = nPtrArrayLen;
       else
         nEnd = rLastPos + 2;
 
-      for( USHORT nIdx = rLastPos - 2; nIdx < nEnd; nIdx++ )
+      for( sal_uInt16 nIdx = rLastPos - 2; nIdx < nEnd; nIdx++ )
         {
           if( pPtrArray[ nIdx ] == pPtr )
             {
@@ -325,7 +323,7 @@ static USHORT FastGetPos( const VoidPtr *pPtrArray, USHORT nPtrArrayLen,
         }
     }
   // The world's lamest linear search from svarray ...
-  for( USHORT nIdx = 0; nIdx < nPtrArrayLen; nIdx++ )
+  for( sal_uInt16 nIdx = 0; nIdx < nPtrArrayLen; nIdx++ )
     if (pPtrArray[ nIdx ] == pPtr )
       return rLastPos = nIdx;
   return USHRT_MAX;
@@ -340,14 +338,14 @@ ParaPortionList::~ParaPortionList()
     Reset();
 }
 
-USHORT ParaPortionList::GetPos( const ParaPortionPtr &rPtr ) const
+sal_uInt16 ParaPortionList::GetPos( const ParaPortionPtr &rPtr ) const
 {
     return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
                        Count(), static_cast<VoidPtr>( rPtr ),
                        ((ParaPortionList *)this)->nLastCache );
 }
 
-USHORT ContentList::GetPos( const ContentNodePtr &rPtr ) const
+sal_uInt16 ContentList::GetPos( const ContentNodePtr &rPtr ) const
 {
     return FastGetPos( reinterpret_cast<const VoidPtr *>( GetData() ),
                        Count(), static_cast<VoidPtr>( rPtr ),
@@ -356,7 +354,7 @@ USHORT ContentList::GetPos( const ContentNodePtr &rPtr ) const
 
 void ParaPortionList::Reset()
 {
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
         delete GetObject( nPortion );
     Remove( 0, Count() );
 }
@@ -364,7 +362,7 @@ void ParaPortionList::Reset()
 long ParaPortionList::GetYOffset( ParaPortion* pPPortion )
 {
     long nHeight = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         ParaPortion* pTmpPortion = GetObject(nPortion);
         if ( pTmpPortion == pPPortion )
@@ -375,10 +373,10 @@ long ParaPortionList::GetYOffset( ParaPortion* pPPortion )
     return nHeight;
 }
 
-USHORT ParaPortionList::FindParagraph( long nYOffset )
+sal_uInt16 ParaPortionList::FindParagraph( long nYOffset )
 {
     long nY = 0;
-    for ( USHORT nPortion = 0; nPortion < Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < Count(); nPortion++ )
     {
         nY += GetObject(nPortion)->GetHeight(); // should also be correct even in bVisible!
         if ( nY > nYOffset )
@@ -395,7 +393,7 @@ void ParaPortionList::DbgCheck( EditDoc&
 {
 #ifdef DBG_UTIL
     DBG_ASSERT( Count() == rDoc.Count(), "ParaPortionList::DbgCheck() - Count() unequal!" );
-    for ( USHORT i = 0; i < Count(); i++ )
+    for ( sal_uInt16 i = 0; i < Count(); i++ )
     {
         DBG_ASSERT( SaveGetObject(i), "ParaPortionList::DbgCheck() - Null-Pointer in List!" );
         DBG_ASSERT( GetObject(i)->GetNode(), "ParaPortionList::DbgCheck() - Null-Pointer in List(2)!" );
@@ -430,8 +428,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
         {
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxULSpaceItem ) ), "ConvertItem: Invalid Item!" );
             SvxULSpaceItem& rItem = (SvxULSpaceItem&)rPoolItem;
-            rItem.SetUpper( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetUpper(), eSourceUnit, eDestUnit ) ) );
-            rItem.SetLower( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetLower(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetUpper( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetUpper(), eSourceUnit, eDestUnit ) ) );
+            rItem.SetLower( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetLower(), eSourceUnit, eDestUnit ) ) );
         }
         break;
         case EE_PARA_SBL:
@@ -440,7 +438,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
             SvxLineSpacingItem& rItem = (SvxLineSpacingItem&)rPoolItem;
             // SetLineHeight changes also eLineSpace!
             if ( rItem.GetLineSpaceRule() == SVX_LINE_SPACE_MIN )
-                rItem.SetLineHeight( sal::static_int_cast< USHORT >( OutputDevice::LogicToLogic( rItem.GetLineHeight(), eSourceUnit, eDestUnit ) ) );
+                rItem.SetLineHeight( sal::static_int_cast< sal_uInt16 >( OutputDevice::LogicToLogic( rItem.GetLineHeight(), eSourceUnit, eDestUnit ) ) );
         }
         break;
         case EE_PARA_TABS:
@@ -448,7 +446,7 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
             DBG_ASSERT( rPoolItem.IsA( TYPE( SvxTabStopItem ) ), "ConvertItem: Invalid Item!" );
             SvxTabStopItem& rItem = (SvxTabStopItem&)rPoolItem;
             SvxTabStopItem aNewItem( EE_PARA_TABS );
-            for ( USHORT i = 0; i < rItem.Count(); i++ )
+            for ( sal_uInt16 i = 0; i < rItem.Count(); i++ )
             {
                 const SvxTabStop& rTab = rItem[i];
                 SvxTabStop aNewStop( OutputDevice::LogicToLogic( rTab.GetTabPos(), eSourceUnit, eDestUnit ), rTab.GetAdjustment(), rTab.GetDecimal(), rTab.GetFill() );
@@ -474,20 +472,20 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map
     const SfxItemPool* pSourcePool = rSource.GetPool();
     const SfxItemPool* pDestPool = rDest.GetPool();
 
-    for ( USHORT nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_PARA_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         // If possible go through SlotID ...
 
-        USHORT nSourceWhich = nWhich;
-        USHORT nSlot = pDestPool->GetTrueSlotId( nWhich );
+        sal_uInt16 nSourceWhich = nWhich;
+        sal_uInt16 nSlot = pDestPool->GetTrueSlotId( nWhich );
         if ( nSlot )
         {
-            USHORT nW = pSourcePool->GetTrueWhich( nSlot );
+            sal_uInt16 nW = pSourcePool->GetTrueWhich( nSlot );
             if ( nW )
                 nSourceWhich = nW;
         }
 
-        if ( rSource.GetItemState( nSourceWhich, FALSE ) == SFX_ITEM_ON )
+        if ( rSource.GetItemState( nSourceWhich, sal_False ) == SFX_ITEM_ON )
         {
             MapUnit eSourceUnit = pSourceUnit ? *pSourceUnit : (MapUnit)pSourcePool->GetMetric( nSourceWhich );
             MapUnit eDestUnit = pDestUnit ? *pDestUnit : (MapUnit)pDestPool->GetMetric( nWhich );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 66258944d4..d8bddb6abf 100644..100755
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -36,7 +36,7 @@
 
 #define USE_SVXFONT
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uInt16S
 #include <svl/svstdarr.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/ctrltool.hxx>
@@ -146,7 +146,7 @@ sal_Bool EditEngine::IsInUndo()
     return pImpEditEngine->IsInUndo();
 }
 
-SfxUndoManager& EditEngine::GetUndoManager()
+::svl::IUndoManager& EditEngine::GetUndoManager()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetUndoManager();
@@ -168,7 +168,7 @@ void EditEngine::UndoActionEnd( sal_uInt16 nId )
         pImpEditEngine->UndoActionEnd( nId );
 }
 
-BOOL EditEngine::HasTriedMergeOnLastAddUndo() const
+sal_Bool EditEngine::HasTriedMergeOnLastAddUndo() const
 {
     return pImpEditEngine->mbLastTryMerge;
 }
@@ -215,25 +215,25 @@ Color EditEngine::GetAutoColor() const
     return pImpEditEngine->GetAutoColor();
 }
 
-void EditEngine::EnableAutoColor( BOOL b )
+void EditEngine::EnableAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnableAutoColor( b );
 }
 
-BOOL EditEngine::IsAutoColorEnabled() const
+sal_Bool EditEngine::IsAutoColorEnabled() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsAutoColorEnabled();
 }
 
-void EditEngine::ForceAutoColor( BOOL b )
+void EditEngine::ForceAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ForceAutoColor( b );
 }
 
-BOOL EditEngine::IsForceAutoColor() const
+sal_Bool EditEngine::IsForceAutoColor() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsForceAutoColor();
@@ -318,7 +318,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
              ( rOutRect.GetHeight() >= (long)GetTextHeight() ) &&
              ( rOutRect.GetWidth() >= (long)CalcTextWidth() ) )
         {
-            bClip = FALSE;
+            bClip = sal_False;
         }
         else
         {
@@ -492,25 +492,25 @@ const Size& EditEngine::GetPaperSize() const
     return pImpEditEngine->GetPaperSize();
 }
 
-void EditEngine::SetVertical( BOOL bVertical )
+void EditEngine::SetVertical( sal_Bool bVertical )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetVertical( bVertical );
 }
 
-BOOL EditEngine::IsVertical() const
+sal_Bool EditEngine::IsVertical() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsVertical();
 }
 
-void EditEngine::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void EditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
-BOOL EditEngine::IsFixedCellHeight() const
+sal_Bool EditEngine::IsFixedCellHeight() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsFixedCellHeight();
@@ -528,14 +528,14 @@ EEHorizontalTextDirection EditEngine::GetDefaultHorizontalTextDirection() const
     return pImpEditEngine->GetDefaultHorizontalTextDirection();
 }
 
-USHORT EditEngine::GetScriptType( const ESelection& rSelection ) const
+sal_uInt16 EditEngine::GetScriptType( const ESelection& rSelection ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->CreateSel( rSelection ) );
     return pImpEditEngine->GetScriptType( aSel );
 }
 
-LanguageType EditEngine::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType EditEngine::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
@@ -550,37 +550,37 @@ void EditEngine::TransliterateText( const ESelection& rSelection, sal_Int32 nTra
     pImpEditEngine->TransliterateText( pImpEditEngine->CreateSel( rSelection ), nTransliterationMode );
 }
 
-void EditEngine::SetAsianCompressionMode( USHORT n )
+void EditEngine::SetAsianCompressionMode( sal_uInt16 n )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetAsianCompressionMode( n );
 }
 
-USHORT EditEngine::GetAsianCompressionMode() const
+sal_uInt16 EditEngine::GetAsianCompressionMode() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditEngine->GetAsianCompressionMode();
 }
 
-void EditEngine::SetKernAsianPunctuation( BOOL b )
+void EditEngine::SetKernAsianPunctuation( sal_Bool b )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditEngine->SetKernAsianPunctuation( b );
 }
 
-BOOL EditEngine::IsKernAsianPunctuation() const
+sal_Bool EditEngine::IsKernAsianPunctuation() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditEngine->IsKernAsianPunctuation();
 }
 
-void EditEngine::SetAddExtLeading( BOOL b )
+void EditEngine::SetAddExtLeading( sal_Bool b )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetAddExtLeading( b );
 }
 
-BOOL EditEngine::IsAddExtLeading() const
+sal_Bool EditEngine::IsAddExtLeading() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsAddExtLeading();
@@ -689,7 +689,7 @@ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) con
     return pImpEditEngine->GetLineLen( nParagraph, nLine );
 }
     
-void EditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
@@ -697,7 +697,7 @@ void EditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd,
     return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
 }    
 
-USHORT EditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( !pImpEditEngine->IsFormatted() )
@@ -742,7 +742,7 @@ XubString EditEngine::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
     return pImpEditEngine->GetSelected( aSel );
 }
 
-ESelection EditEngine::GetWord( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::GetWord( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -752,7 +752,7 @@ ESelection EditEngine::GetWord( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::WordLeft( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::WordLeft( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -762,7 +762,7 @@ ESelection EditEngine::WordLeft( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::WordRight( const ESelection& rSelection, USHORT nWordType  ) const
+ESelection EditEngine::WordRight( const ESelection& rSelection, sal_uInt16 nWordType  ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -772,7 +772,7 @@ ESelection EditEngine::WordRight( const ESelection& rSelection, USHORT nWordType
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const
+ESelection EditEngine::CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -782,7 +782,7 @@ ESelection EditEngine::CursorLeft( const ESelection& rSelection, USHORT nCharact
     return pE->pImpEditEngine->CreateESel( aSel );
 }
 
-ESelection EditEngine::CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const
+ESelection EditEngine::CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
 {
     // ImpEditEngine-Iteration-Methods should be const!
     EditEngine* pE = (EditEngine*)this;
@@ -813,8 +813,8 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
     sal_Bool bAllowIdle = sal_True;
     sal_Bool bReadOnly	= pEditView->IsReadOnly();
 
-    USHORT nNewCursorFlags = 0;
-    BOOL bSetCursorFlags = TRUE;
+    sal_uInt16 nNewCursorFlags = 0;
+    sal_Bool bSetCursorFlags = sal_True;
 
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
     DBG_ASSERT( !aCurSel.IsInvalid(), "Blinde Selection in EditEngine::PostKeyEvent" );
@@ -867,11 +867,11 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
             {
                 if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
                 {
-                    USHORT nParas = GetParagraphCount();
+                    sal_uInt16 nParas = GetParagraphCount();
                     Point aPos;
                     Point aViewStart( pEditView->GetOutputArea().TopLeft() );
                     long n20 = 40 * pImpEditEngine->nOnePixelInRef;
-                    for ( USHORT n = 0; n < nParas; n++ )
+                    for ( sal_uInt16 n = 0; n < nParas; n++ )
                     {
                         long nH = GetTextHeight( n );
                         Point P1( aViewStart.X() + n20 + n20*(n%2), aViewStart.Y() + aPos.Y() );
@@ -884,7 +884,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                         aPos.Y() += nH;
                     }
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
             case KEY_F11:
@@ -896,7 +896,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                     aInfo += bDebugPaint ? "On" : "Off";
                     InfoBox( NULL, String( aInfo, RTL_TEXTENCODING_ASCII_US ) ).Execute();
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
             case KEY_F12:
@@ -905,7 +905,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                 {
                     EditDbg::ShowEditEngineData( this );
                 }
-                bDone = FALSE;
+                bDone = sal_False;
             }
             break;
            #endif
@@ -937,13 +937,13 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                 if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
                 {
                     if ( pImpEditEngine->DoVisualCursorTraveling( aCurSel.Max().GetNode() ) && ( ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) /* || ( nCode == KEY_HOME ) || ( nCode == KEY_END ) */ ) )
-                        bSetCursorFlags = FALSE;    // Will be manipulated within visual cursor move
+                        bSetCursorFlags = sal_False;    // Will be manipulated within visual cursor move
 
                     aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView );
 
                     if ( aCurSel.HasRange() ) {
                         Reference<com::sun::star::datatransfer::clipboard::XClipboard> aSelection(pEditView->GetWindow()->GetPrimarySelection());
-                        pEditView->pImpEditView->CutCopy( aSelection, FALSE );
+                        pEditView->pImpEditView->CutCopy( aSelection, sal_False );
                     }
 
                     bMoved = sal_True;
@@ -977,7 +977,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                         // now on and that will be all. Otherwise continue as usual.
                         // ...
 
-                        USHORT nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
+                        sal_uInt16 nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
                         SfxBoolItem aBulletState( (const SfxBoolItem&) pImpEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ) );
                         bool bBulletIsVisible = aBulletState.GetValue() ? true : false;
 
@@ -997,7 +997,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                             break;
                     }
 
-                    BYTE nDel = 0, nMode = 0;
+                    sal_uInt8 nDel = 0, nMode = 0;
                     switch( nCode )
                     {
                     case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
@@ -1266,7 +1266,7 @@ sal_uInt32 EditEngine::GetTextHeight() const
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
 
-    sal_uInt32 nHeight = !IsVertical() ? pImpEditEngine->GetTextHeight() : pImpEditEngine->CalcTextWidth( TRUE );
+    sal_uInt32 nHeight = !IsVertical() ? pImpEditEngine->GetTextHeight() : pImpEditEngine->CalcTextWidth( sal_True );
     return nHeight;
 }
 
@@ -1277,7 +1277,7 @@ sal_uInt32 EditEngine::CalcTextWidth()
     if ( !pImpEditEngine->IsFormatted() )
         pImpEditEngine->FormatDoc();
 
-    sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( TRUE ) : pImpEditEngine->GetTextHeight();
+    sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( sal_True ) : pImpEditEngine->GetTextHeight();
      return nWidth;
 }
 
@@ -1309,7 +1309,7 @@ void EditEngine::SetText( const XubString& rText )
         pImpEditEngine->FormatAndUpdate();
 }
 
-ULONG EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
+sal_uLong EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
@@ -1321,7 +1321,7 @@ ULONG EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextFormat e
     return rInput.GetError();
 }
 
-ULONG EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
@@ -1630,7 +1630,7 @@ void EditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) con
     pImpEditEngine->GetCharAttribs( nPara, rLst );
 }
 
-SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib )
+SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     EditSelection aSel( pImpEditEngine->
@@ -1638,7 +1638,7 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib
     return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
 }
 
-SfxItemSet EditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags ) const
+SfxItemSet EditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
@@ -1857,7 +1857,7 @@ Point EditEngine::GetDocPosTopLeft( sal_uInt16 nParagraph )
     return aPoint;
 }
 
-const SvxNumberFormat* EditEngine::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* EditEngine::GetNumberFormat( sal_uInt16 nPara ) const
 {
     // derived objects may overload this function to give access to
     // bullet information (see Outliner)
@@ -1865,7 +1865,7 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( USHORT nPara ) const
     return 0;
 }
 
-BOOL EditEngine::IsRightToLeft( USHORT nPara ) const
+sal_Bool EditEngine::IsRightToLeft( sal_uInt16 nPara ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsRightToLeft( nPara );
@@ -2122,7 +2122,7 @@ void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTa
 rtl::Reference<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
-    return pImpEditEngine->GetForbiddenCharsTable( FALSE );
+    return pImpEditEngine->GetForbiddenCharsTable( sal_False );
 }
 
 
@@ -2244,9 +2244,9 @@ sal_Bool EditEngine::ShouldCreateBigTextObject() const
     return ( nTextPortions >= pImpEditEngine->GetBigTextObjectStart() ) ? sal_True : sal_False;
 }
 
-USHORT EditEngine::GetFieldCount( USHORT nPara ) const
+sal_uInt16 EditEngine::GetFieldCount( sal_uInt16 nPara ) const
 {
-    USHORT nFields = 0;
+    sal_uInt16 nFields = 0;
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
     if ( pNode )
     {
@@ -2262,12 +2262,12 @@ USHORT EditEngine::GetFieldCount( USHORT nPara ) const
     return nFields;
 }
 
-EFieldInfo EditEngine::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo EditEngine::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
     if ( pNode )
     {
-        USHORT nCurrentField = 0;
+        sal_uInt16 nCurrentField = 0;
         const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
         for ( sal_uInt16 nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
         {
@@ -2354,7 +2354,7 @@ void EditEngine::CompleteOnlineSpelling()
     }
 }
 
-USHORT EditEngine::FindParagraph( long nDocPosY )
+sal_uInt16 EditEngine::FindParagraph( long nDocPosY )
 {
     return pImpEditEngine->GetParaPortions().FindParagraph( nDocPosY );
 }
@@ -2363,7 +2363,7 @@ EPosition EditEngine::FindDocPosition( const Point& rDocPos ) const
 {
     EPosition aPos;
     // From the point of the API, this is const....
-    EditPaM aPaM = ((EditEngine*)this)->pImpEditEngine->GetPaM( rDocPos, FALSE );
+    EditPaM aPaM = ((EditEngine*)this)->pImpEditEngine->GetPaM( rDocPos, sal_False );
     if ( aPaM.GetNode() )
     {
         aPos.nPara = pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
@@ -2406,7 +2406,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
         DBG_ASSERT( pParaPortion && pLine, "GetParagraphInfos - Paragraph out of range" );
         if ( pParaPortion && pLine )
         {
-            aInfos.nParaHeight = (USHORT)pParaPortion->GetHeight();
+            aInfos.nParaHeight = (sal_uInt16)pParaPortion->GetHeight();
             aInfos.nLines = pParaPortion->GetLines().Count();
             aInfos.nFirstLineStartX = pLine->GetStartPosX();
             aInfos.nFirstLineOffset = pParaPortion->GetFirstLineOffset();
@@ -2429,8 +2429,8 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
 // =====================================================================
 // ======================    Virtual Methods    ========================
 // =====================================================================
-void EditEngine::DrawingText( const Point&, const XubString&, USHORT, USHORT,
-    const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, BYTE,
+void EditEngine::DrawingText( const Point&, const XubString&, sal_uInt16, sal_uInt16,
+    const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, sal_uInt8,
     const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool,
     const ::com::sun::star::lang::Locale*, const Color&, const Color&)
 
@@ -2478,7 +2478,7 @@ void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
         pImpEditEngine->CallNotify( aNotify );
     }
 }
-void EditEngine::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT /*nRightParagraph*/ )
+void EditEngine::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 /*nRightParagraph*/ )
 {
     DBG_CHKTHIS( EditEngine, 0 );
 }
@@ -2648,7 +2648,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont )
     rSet.Put( SvxCharReliefItem( rFont.GetRelief(), EE_CHAR_RELIEF ) );
 }
 
-Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType )
+Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, sal_uInt16 nScriptType )
 {
     SvxFont aFont;
     CreateFont( aFont, rItemSet, true, nScriptType );
@@ -2749,9 +2749,9 @@ void EditEngine::ImportBulletItem( SvxNumBulletItem& /*rNumBullet*/, sal_uInt16
 {
 }
 
-BOOL EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
+sal_Bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable )
 {
-    BOOL bValidData = FALSE;
+    sal_Bool bValidData = sal_False;
 
     if ( rTransferable.is() )
     {
@@ -2786,12 +2786,12 @@ Link EditEngine::GetEndDropHdl() const
     return pImpEditEngine->GetEndDropHdl();
 }
 
-void EditEngine::SetFirstWordCapitalization( BOOL bCapitalize )
+void EditEngine::SetFirstWordCapitalization( sal_Bool bCapitalize )
 {
     pImpEditEngine->SetFirstWordCapitalization( bCapitalize );
 }
 
-BOOL EditEngine::IsFirstWordCapitalization() const
+sal_Bool EditEngine::IsFirstWordCapitalization() const
 {
     return pImpEditEngine->IsFirstWordCapitalization();
 }
@@ -2803,7 +2803,7 @@ EFieldInfo::EFieldInfo()
 }
 
 
-EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos ) : aPosition( nPara, nPos )
+EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos ) : aPosition( nPara, nPos )
 {
     pFieldItem = new SvxFieldItem( rFieldItem );
 }
diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 7543185f24..7543185f24 100644..100755
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 8c3a66c386..121c2fa1a5 100644..100755
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -59,7 +59,7 @@ DBG_NAME( XEditAttribute )
 
 //--------------------------------------------------------------
 
-BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, SvxBulletItem& rBullet )
+sal_Bool lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, SvxBulletItem& rBullet )
 {
     const SvxNumberFormat* pFmt = rNumBullet.GetNumRule()->Get( nLevel );
     if ( pFmt )
@@ -136,11 +136,11 @@ BOOL lcl_CreateBulletItem( const SvxNumBulletItem& rNumBullet, USHORT nLevel, Sv
                 OSL_FAIL( "Unknown or invalid NumAdjust" );
         }
     }
-    return pFmt ? TRUE : FALSE;
+    return pFmt ? sal_True : sal_False;
 }
 
 
-XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd )
+XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     // Create thw new attribute in the pool
     const SfxPoolItem& rNew = rPool.Put( rItem );
@@ -158,7 +158,7 @@ XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr )
     nEnd = 0;
 }
 
-XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, USHORT nS, USHORT nE )
+XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
 {
     DBG_CTOR( XEditAttribute, 0 );
     pItem = &rAttr;
@@ -172,9 +172,9 @@ XEditAttribute::~XEditAttribute()
     pItem = 0;	// belongs to the Pool.
 }
 
-XEditAttribute* XEditAttributeList::FindAttrib( USHORT _nWhich, USHORT nChar ) const
+XEditAttribute* XEditAttributeList::FindAttrib( sal_uInt16 _nWhich, sal_uInt16 nChar ) const
 {
-    for ( USHORT n = Count(); n; )
+    for ( sal_uInt16 n = Count(); n; )
     {
         XEditAttribute* pAttr = GetObject( --n );
         if( ( pAttr->GetItem()->Which() == _nWhich ) && ( pAttr->GetStart() <= nChar ) && ( pAttr->GetEnd() > nChar ) )
@@ -203,7 +203,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
     aStyle = rCopyFrom.GetStyle();
     eFamily = rCopyFrom.GetFamily();
 
-    for ( USHORT n = 0; n < rCopyFrom.GetAttribs().Count(); n++  )
+    for ( sal_uInt16 n = 0; n < rCopyFrom.GetAttribs().Count(); n++  )
     {
         XEditAttribute* pAttr = rCopyFrom.GetAttribs().GetObject( n );
         XEditAttribute* pMyAttr = MakeXEditAttribute( rPoolToUse, *pAttr->GetItem(), pAttr->GetStart(), pAttr->GetEnd() );
@@ -219,7 +219,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
 
 ContentInfo::~ContentInfo()
 {
-    for ( USHORT nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
+    for ( sal_uInt16 nAttr = 0; nAttr < aAttribs.Count(); nAttr++ )
     {
         XEditAttribute* pAttr = aAttribs.GetObject(nAttr);
         aParaAttribs.GetPool()->Remove( *pAttr->GetItem() );
@@ -251,10 +251,10 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
             (eFamily == rCompare.eFamily ) &&
             (aParaAttribs == rCompare.aParaAttribs ) )
     {
-        const USHORT nCount = aAttribs.Count();
+        const sal_uInt16 nCount = aAttribs.Count();
         if( nCount == rCompare.aAttribs.Count() )
         {
-            USHORT n;
+            sal_uInt16 n;
             for( n = 0; n < nCount; n++ )
             {
                 if( !(*aAttribs.GetObject(n) == *rCompare.aAttribs.GetObject(n)) )
@@ -268,7 +268,7 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
     return false;
 }
 
-EditTextObject::EditTextObject( USHORT n)
+EditTextObject::EditTextObject( sal_uInt16 n)
 {
     DBG_CTOR( EE_EditTextObject, 0 );
     nWhich = n;
@@ -285,38 +285,38 @@ EditTextObject::~EditTextObject()
     DBG_DTOR( EE_EditTextObject, 0 );
 }
 
-USHORT EditTextObject::GetParagraphCount() const
+sal_uInt16 EditTextObject::GetParagraphCount() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return 0;
 }
 
-XubString EditTextObject::GetText( USHORT /* nParagraph */ ) const
+XubString EditTextObject::GetText( sal_uInt16 /* nParagraph */ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return XubString();
 }
 
-void EditTextObject::Insert( const EditTextObject& /* rObj */, USHORT /* nPara */)
+void EditTextObject::Insert( const EditTextObject& /* rObj */, sal_uInt16 /* nPara */)
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-EditTextObject* EditTextObject::CreateTextObject( USHORT /*nPara*/, USHORT /*nParas*/ ) const
+EditTextObject* EditTextObject::CreateTextObject( sal_uInt16 /*nPara*/, sal_uInt16 /*nParas*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::RemoveParagraph( USHORT /*nPara*/ )
+void EditTextObject::RemoveParagraph( sal_uInt16 /*nPara*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::HasPortionInfo() const
+sal_Bool EditTextObject::HasPortionInfo() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 void EditTextObject::ClearPortionInfo()
@@ -324,32 +324,32 @@ void EditTextObject::ClearPortionInfo()
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::HasOnlineSpellErrors() const
+sal_Bool EditTextObject::HasOnlineSpellErrors() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::HasCharAttribs( USHORT ) const
+sal_Bool EditTextObject::HasCharAttribs( sal_uInt16 ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::GetCharAttribs( USHORT /*nPara*/, EECharAttribArray& /*rLst*/ ) const
+void EditTextObject::GetCharAttribs( sal_uInt16 /*nPara*/, EECharAttribArray& /*rLst*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-void EditTextObject::MergeParaAttribs( const SfxItemSet& /*rAttribs*/, USHORT /*nStart*/, USHORT /*nEnd*/ )
+void EditTextObject::MergeParaAttribs( const SfxItemSet& /*rAttribs*/, sal_uInt16 /*nStart*/, sal_uInt16 /*nEnd*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::IsFieldObject() const
+sal_Bool EditTextObject::IsFieldObject() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 const SvxFieldItem* EditTextObject::GetField() const
@@ -358,56 +358,56 @@ const SvxFieldItem* EditTextObject::GetField() const
     return 0;
 }
 
-BOOL EditTextObject::HasField( TypeId /*aType*/ ) const
+sal_Bool EditTextObject::HasField( TypeId /*aType*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet EditTextObject::GetParaAttribs( USHORT /*nPara*/ ) const
+SfxItemSet EditTextObject::GetParaAttribs( sal_uInt16 /*nPara*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return SfxItemSet( *(SfxItemPool*)NULL );
 }
 
-void EditTextObject::SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rAttribs*/ )
+void EditTextObject::SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rAttribs*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::RemoveCharAttribs( USHORT /*nWhich*/ )
+sal_Bool EditTextObject::RemoveCharAttribs( sal_uInt16 /*nWhich*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::RemoveParaAttribs( USHORT /*nWhich*/ )
+sal_Bool EditTextObject::RemoveParaAttribs( sal_uInt16 /*nWhich*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFamily /*eFamily*/ ) const
+sal_Bool EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFamily /*eFamily*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::GetStyleSheet( USHORT /*nPara*/, XubString& /*rName*/, SfxStyleFamily& /*eFamily*/ ) const
+void EditTextObject::GetStyleSheet( sal_uInt16 /*nPara*/, XubString& /*rName*/, SfxStyleFamily& /*eFamily*/ ) const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-void EditTextObject::SetStyleSheet( USHORT /*nPara*/, const XubString& /*rName*/, const SfxStyleFamily& /*eFamily*/ )
+void EditTextObject::SetStyleSheet( sal_uInt16 /*nPara*/, const XubString& /*rName*/, const SfxStyleFamily& /*eFamily*/ )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
+sal_Bool EditTextObject::ChangeStyleSheets( const XubString&, SfxStyleFamily,
                                             const XubString&, SfxStyleFamily )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
 void EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
@@ -416,55 +416,55 @@ void EditTextObject::ChangeStyleSheetName( SfxStyleFamily /*eFamily*/,
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-USHORT EditTextObject::GetUserType() const
+sal_uInt16 EditTextObject::GetUserType() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::SetUserType( USHORT )
+void EditTextObject::SetUserType( sal_uInt16 )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-ULONG EditTextObject::GetObjectSettings() const
+sal_uLong EditTextObject::GetObjectSettings() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return 0;
 }
 
-void EditTextObject::SetObjectSettings( ULONG )
+void EditTextObject::SetObjectSettings( sal_uLong )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
 }
 
-BOOL EditTextObject::IsVertical() const
+sal_Bool EditTextObject::IsVertical() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
-    return FALSE;
+    return sal_False;
 }
 
-void EditTextObject::SetVertical( BOOL bVertical )
+void EditTextObject::SetVertical( sal_Bool bVertical )
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     ((BinTextObject*)this)->SetVertical( bVertical );
 }
 
-USHORT EditTextObject::GetScriptType() const
+sal_uInt16 EditTextObject::GetScriptType() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return ((const BinTextObject*)this)->GetScriptType();
 }
 
 
-BOOL EditTextObject::Store( SvStream& rOStream ) const
+sal_Bool EditTextObject::Store( SvStream& rOStream ) const
 {
     if ( rOStream.GetError() )
-        return FALSE;
+        return sal_False;
 
     sal_Size nStartPos = rOStream.Tell();
 
-    rOStream << (USHORT)Which();
+    rOStream << (sal_uInt16)Which();
 
     sal_uInt32 nStructSz = 0;
     rOStream << nStructSz;
@@ -477,15 +477,15 @@ BOOL EditTextObject::Store( SvStream& rOStream ) const
     rOStream << nStructSz;
     rOStream.Seek( nEndPos );
 
-    return rOStream.GetError() ? FALSE : TRUE;
+    return rOStream.GetError() ? sal_False : sal_True;
 }
 
 EditTextObject*	EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool )
 {
-    ULONG nStartPos = rIStream.Tell();
+    sal_uLong nStartPos = rIStream.Tell();
 
     // First check what type of Object...
-    USHORT nWhich;
+    sal_uInt16 nWhich;
     rIStream >> nWhich;
 
     sal_uInt32 nStructSz;
@@ -522,7 +522,7 @@ void EditTextObject::Skip( SvStream& rIStream )
 {
     sal_Size nStartPos = rIStream.Tell();
 
-    USHORT _nWhich;
+    sal_uInt16 _nWhich;
     rIStream >> _nWhich;
 
     sal_uInt32 nStructSz;
@@ -542,7 +542,7 @@ void EditTextObject::CreateData( SvStream& )
     OSL_FAIL( "CreateData: Base class!" );
 }
 
-USHORT EditTextObject::GetVersion() const
+sal_uInt16 EditTextObject::GetVersion() const
 {
     OSL_FAIL( "Virtual method direct from EditTextObject!" );
     return 0;
@@ -588,7 +588,7 @@ void BinTextObject::ObjectInDestruction(const SfxItemPool& rSfxItemPool)
         
         // set local variables
         pPool = pNewPool;
-        bOwnerOfPool = TRUE;
+        bOwnerOfPool = sal_True;
     }
 }
 
@@ -629,12 +629,12 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) :
     
     if ( pPool )
     {
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
         pPool =	EditEngine::CreatePool();
-        bOwnerOfPool =	TRUE;
+        bOwnerOfPool =	sal_True;
     }
 
     if(!bOwnerOfPool && pPool)
@@ -643,8 +643,8 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) :
         pPool->AddSfxItemPoolUser(*this);
     }
 
-    bVertical = FALSE;
-    bStoreUnicodeStrings = FALSE;
+    bVertical = sal_False;
+    bStoreUnicodeStrings = sal_False;
     nScriptType = 0;
 }
 
@@ -659,7 +659,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
     bVertical = r.bVertical;
     nScriptType = r.nScriptType;
     pPortionInfo = NULL;	// Do not copy PortionInfo 
-    bStoreUnicodeStrings = FALSE;
+    bStoreUnicodeStrings = sal_False;
 
     if ( !r.bOwnerOfPool )
     {
@@ -667,12 +667,12 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
         // since there is no other way to construct a BinTextObject
         // than it's regular constructor where that is ensured
         pPool =	r.pPool;
-        bOwnerOfPool = FALSE;
+        bOwnerOfPool = sal_False;
     }
     else
     {
         pPool =	EditEngine::CreatePool();
-        bOwnerOfPool =	TRUE;
+        bOwnerOfPool =	sal_True;
 
     }
 
@@ -685,7 +685,7 @@ BinTextObject::BinTextObject( const BinTextObject& r ) :
     if ( bOwnerOfPool && pPool && r.pPool )
         pPool->SetDefaultMetric( r.pPool->GetMetric( DEF_METRIC ) );
 
-    for ( USHORT n = 0; n < r.aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < r.aContents.Count(); n++ )
     {
         ContentInfo* pOrg = r.aContents.GetObject( n );
         DBG_ASSERT( pOrg, "NULL-Pointer in ContentList!" );
@@ -709,32 +709,32 @@ BinTextObject::~BinTextObject()
     }
 }
 
-USHORT BinTextObject::GetUserType() const
+sal_uInt16 BinTextObject::GetUserType() const
 {
     return nUserType;
 }
 
-void BinTextObject::SetUserType( USHORT n )
+void BinTextObject::SetUserType( sal_uInt16 n )
 {
     nUserType = n;
 }
 
-ULONG BinTextObject::GetObjectSettings() const
+sal_uLong BinTextObject::GetObjectSettings() const
 {
     return nObjSettings;
 }
 
-void BinTextObject::SetObjectSettings( ULONG n )
+void BinTextObject::SetObjectSettings( sal_uLong n )
 {
     nObjSettings = n;
 }
 
-BOOL BinTextObject::IsVertical() const
+sal_Bool BinTextObject::IsVertical() const
 {
     return bVertical;
 }
 
-void BinTextObject::SetVertical( BOOL b )
+void BinTextObject::SetVertical( sal_Bool b )
 {
     if ( b != bVertical )
     {
@@ -743,12 +743,12 @@ void BinTextObject::SetVertical( BOOL b )
     }
 }
 
-USHORT BinTextObject::GetScriptType() const
+sal_uInt16 BinTextObject::GetScriptType() const
 {
     return nScriptType;
 }
 
-void BinTextObject::SetScriptType( USHORT nType )
+void BinTextObject::SetScriptType( sal_uInt16 nType )
 {
     nScriptType = nType;
 }
@@ -756,7 +756,7 @@ void BinTextObject::SetScriptType( USHORT nType )
 
 void BinTextObject::DeleteContents()
 {
-    for ( USHORT n = 0; n < aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
     {
         ContentInfo* p = aContents.GetObject( n );
         DBG_ASSERT( p, "NULL-Pointer in ContentList!" );
@@ -770,7 +770,7 @@ EditTextObject*	BinTextObject::Clone() const
     return new BinTextObject( *this );
 }
 
-XEditAttribute* BinTextObject::CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd )
+XEditAttribute* BinTextObject::CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     return MakeXEditAttribute( *pPool, rItem, nStart, nEnd );
 }
@@ -788,12 +788,12 @@ ContentInfo* BinTextObject::CreateAndInsertContent()
     return pC;
 }
 
-USHORT BinTextObject::GetParagraphCount() const
+sal_uInt16 BinTextObject::GetParagraphCount() const
 {
     return aContents.Count();
 }
 
-XubString BinTextObject::GetText( USHORT nPara ) const
+XubString BinTextObject::GetText( sal_uInt16 nPara ) const
 {
     DBG_ASSERT( nPara < aContents.Count(), "BinTextObject::GetText: Paragraph does not exist!" );
     if ( nPara < aContents.Count() )
@@ -804,7 +804,7 @@ XubString BinTextObject::GetText( USHORT nPara ) const
     return XubString();
 }
 
-void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
+void BinTextObject::Insert( const EditTextObject& rObj, sal_uInt16 nDestPara )
 {
     DBG_ASSERT( rObj.Which() == EE_FORMAT_BIN, "UTO: unknown Textobjekt" );
 
@@ -813,8 +813,8 @@ void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
     if ( nDestPara > aContents.Count() )
         nDestPara = aContents.Count();
 
-    const USHORT nParas = rBinObj.GetContents().Count();
-    for ( USHORT nP = 0; nP < nParas; nP++ )
+    const sal_uInt16 nParas = rBinObj.GetContents().Count();
+    for ( sal_uInt16 nP = 0; nP < nParas; nP++ )
     {
         ContentInfo* pC = rBinObj.GetContents()[ nP ];
         ContentInfo* pNew = new ContentInfo( *pC, *GetPool() );
@@ -823,7 +823,7 @@ void BinTextObject::Insert( const EditTextObject& rObj, USHORT nDestPara )
     ClearPortionInfo();
 }
 
-EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) const
+EditTextObject* BinTextObject::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas ) const
 {
     if ( ( nPara >= aContents.Count() ) || !nParas )
         return NULL;
@@ -837,8 +837,8 @@ EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) c
     // If text contains different ScriptTypes, this shouldn't be a problem...
     pObj->nScriptType = nScriptType;
 
-    const USHORT nEndPara = nPara+nParas-1;
-    for ( USHORT nP = nPara; nP <= nEndPara; nP++ )
+    const sal_uInt16 nEndPara = nPara+nParas-1;
+    for ( sal_uInt16 nP = nPara; nP <= nEndPara; nP++ )
     {
         ContentInfo* pC = aContents[ nP ];
         ContentInfo* pNew = new ContentInfo( *pC, *pObj->GetPool() );
@@ -847,7 +847,7 @@ EditTextObject* BinTextObject::CreateTextObject( USHORT nPara, USHORT nParas ) c
     return pObj;
 }
 
-void BinTextObject::RemoveParagraph( USHORT nPara )
+void BinTextObject::RemoveParagraph( sal_uInt16 nPara )
 {
     DBG_ASSERT( nPara < aContents.Count(), "BinTextObject::GetText: Paragraph does not exist!" );
     if ( nPara < aContents.Count() )
@@ -859,63 +859,63 @@ void BinTextObject::RemoveParagraph( USHORT nPara )
     }
 }
 
-BOOL BinTextObject::HasPortionInfo() const
+sal_Bool BinTextObject::HasPortionInfo() const
 {
-    return pPortionInfo ? TRUE : FALSE;
+    return pPortionInfo ? sal_True : sal_False;
 }
 
 void BinTextObject::ClearPortionInfo()
 {
     if ( pPortionInfo )
     {
-        for ( USHORT n = pPortionInfo->Count(); n; )
+        for ( sal_uInt16 n = pPortionInfo->Count(); n; )
             delete pPortionInfo->GetObject( --n );
         delete pPortionInfo;
         pPortionInfo = NULL;
     }
 }
 
-BOOL BinTextObject::HasOnlineSpellErrors() const
+sal_Bool BinTextObject::HasOnlineSpellErrors() const
 {
 #ifndef SVX_LIGHT
-    for ( USHORT n = 0; n < aContents.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
     {
         ContentInfo* p = aContents.GetObject( n );
         if ( p->GetWrongList() && p->GetWrongList()->Count() )
-            return TRUE;
+            return sal_True;
     }
 #endif // !SVX_LIGHT
-    return FALSE;
+    return sal_False;
 
 }
 
-BOOL BinTextObject::HasCharAttribs( USHORT _nWhich ) const
+sal_Bool BinTextObject::HasCharAttribs( sal_uInt16 _nWhich ) const
 {
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        USHORT nAttribs = pC->GetAttribs().Count();
+        sal_uInt16 nAttribs = pC->GetAttribs().Count();
         if ( nAttribs && !_nWhich )
-            return TRUE;
+            return sal_True;
 
-        for ( USHORT nAttr = nAttribs; nAttr; )
+        for ( sal_uInt16 nAttr = nAttribs; nAttr; )
         {
             XEditAttribute* pX = pC->GetAttribs().GetObject( --nAttr );
             if ( pX->GetItem()->Which() == _nWhich )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BinTextObject::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const
+void BinTextObject::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const
 {
     rLst.Remove( 0, rLst.Count() );
     ContentInfo* pC = GetContents().GetObject( nPara );
     if ( pC )
     {
-        for ( USHORT nAttr = 0; nAttr < pC->GetAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pC->GetAttribs().Count(); nAttr++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( nAttr );
             EECharAttrib aEEAttr;
@@ -928,21 +928,21 @@ void BinTextObject::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) cons
     }
 }
 
-void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd )
+void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        for ( USHORT nW = nStart; nW <= nEnd; nW++ )
+        for ( sal_uInt16 nW = nStart; nW <= nEnd; nW++ )
         {
-            if ( ( pC->GetParaAttribs().GetItemState( nW, FALSE ) != SFX_ITEM_ON )
-                    && ( rAttribs.GetItemState( nW, FALSE ) == SFX_ITEM_ON ) )
+            if ( ( pC->GetParaAttribs().GetItemState( nW, sal_False ) != SFX_ITEM_ON )
+                    && ( rAttribs.GetItemState( nW, sal_False ) == SFX_ITEM_ON ) )
             {
                 pC->GetParaAttribs().Put( rAttribs.Get( nW ) );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -951,9 +951,9 @@ void BinTextObject::MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart,
         ClearPortionInfo();
 }
 
-BOOL BinTextObject::IsFieldObject() const
+sal_Bool BinTextObject::IsFieldObject() const
 {
-    return BinTextObject::GetField() ? TRUE : FALSE;
+    return BinTextObject::GetField() ? sal_True : sal_False;
 }
 
 const SvxFieldItem* BinTextObject::GetField() const
@@ -963,8 +963,8 @@ const SvxFieldItem* BinTextObject::GetField() const
         ContentInfo* pC = GetContents()[0];
         if ( pC->GetText().Len() == 1 )
         {
-            USHORT nAttribs = pC->GetAttribs().Count();
-            for ( USHORT nAttr = nAttribs; nAttr; )
+            sal_uInt16 nAttribs = pC->GetAttribs().Count();
+            for ( sal_uInt16 nAttr = nAttribs; nAttr; )
             {
                 XEditAttribute* pX = pC->GetAttribs().GetObject( --nAttr );
                 if ( pX->GetItem()->Which() == EE_FEATURE_FIELD )
@@ -975,59 +975,59 @@ const SvxFieldItem* BinTextObject::GetField() const
     return 0;
 }
 
-BOOL BinTextObject::HasField( TypeId aType ) const
+sal_Bool BinTextObject::HasField( TypeId aType ) const
 {
-    USHORT nParagraphs = GetContents().Count();
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    sal_uInt16 nParagraphs = GetContents().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
-        USHORT nAttrs = pC->GetAttribs().Count();
-        for ( USHORT nAttr = 0; nAttr < nAttrs; nAttr++ )
+        sal_uInt16 nAttrs = pC->GetAttribs().Count();
+        for ( sal_uInt16 nAttr = 0; nAttr < nAttrs; nAttr++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs()[nAttr];
             if ( pAttr->GetItem()->Which() == EE_FEATURE_FIELD )
             {
                 if ( !aType )
-                    return TRUE;
+                    return sal_True;
 
                 const SvxFieldData* pFldData = ((const SvxFieldItem*)pAttr->GetItem())->GetField();
                 if ( pFldData && pFldData->IsA( aType ) )
-                    return TRUE;
+                    return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet BinTextObject::GetParaAttribs( USHORT nPara ) const
+SfxItemSet BinTextObject::GetParaAttribs( sal_uInt16 nPara ) const
 {
     ContentInfo* pC = GetContents().GetObject( nPara );
     return pC->GetParaAttribs();
 }
 
-void BinTextObject::SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs )
+void BinTextObject::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs )
 {
     ContentInfo* pC = GetContents().GetObject( nPara );
     pC->GetParaAttribs().Set( rAttribs );
     ClearPortionInfo();
 }
 
-BOOL BinTextObject::RemoveCharAttribs( USHORT _nWhich )
+sal_Bool BinTextObject::RemoveCharAttribs( sal_uInt16 _nWhich )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
-        for ( USHORT nAttr = pC->GetAttribs().Count(); nAttr; )
+        for ( sal_uInt16 nAttr = pC->GetAttribs().Count(); nAttr; )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( --nAttr );
             if ( !_nWhich || ( pAttr->GetItem()->Which() == _nWhich ) )
             {
                 pC->GetAttribs().Remove( nAttr );
                 DestroyAttrib( pAttr );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -1038,18 +1038,18 @@ BOOL BinTextObject::RemoveCharAttribs( USHORT _nWhich )
     return bChanged;
 }
 
-BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
+sal_Bool BinTextObject::RemoveParaAttribs( sal_uInt16 _nWhich )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    for ( USHORT nPara = GetContents().Count(); nPara; )
+    for ( sal_uInt16 nPara = GetContents().Count(); nPara; )
     {
         ContentInfo* pC = GetContents().GetObject( --nPara );
 
         if ( !_nWhich )
         {
             if( pC->GetParaAttribs().Count() )
-                bChanged = TRUE;
+                bChanged = sal_True;
             pC->GetParaAttribs().ClearItem();
         }
         else
@@ -1057,7 +1057,7 @@ BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
             if ( pC->GetParaAttribs().GetItemState( _nWhich ) == SFX_ITEM_ON )
             {
                 pC->GetParaAttribs().ClearItem( _nWhich );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -1068,19 +1068,19 @@ BOOL BinTextObject::RemoveParaAttribs( USHORT _nWhich )
     return bChanged;
 }
 
-BOOL BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
+sal_Bool BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const
 {
-    USHORT nParagraphs = GetContents().Count();
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    sal_uInt16 nParagraphs = GetContents().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
         if ( ( pC->GetFamily() == eFamily ) && ( pC->GetStyle() == rName ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-void BinTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& rFamily ) const
+void BinTextObject::GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& rFamily ) const
 {
     if ( nPara < aContents.Count() )
     {
@@ -1090,7 +1090,7 @@ void BinTextObject::GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamil
     }
 }
 
-void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& rFamily )
+void BinTextObject::SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& rFamily )
 {
     if ( nPara < aContents.Count() )
     {
@@ -1100,14 +1100,14 @@ void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const S
     }
 }
 
-BOOL BinTextObject::ImpChangeStyleSheets(
+sal_Bool BinTextObject::ImpChangeStyleSheets(
                     const XubString& rOldName, SfxStyleFamily eOldFamily,
                     const XubString& rNewName, SfxStyleFamily eNewFamily )
 {
-    const USHORT nParagraphs = GetContents().Count();
-    BOOL bChanges = FALSE;
+    const sal_uInt16 nParagraphs = GetContents().Count();
+    sal_Bool bChanges = sal_False;
 
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
         if ( pC->GetFamily() == eOldFamily )
@@ -1116,18 +1116,18 @@ BOOL BinTextObject::ImpChangeStyleSheets(
             {
                 pC->GetStyle() = rNewName;
                 pC->GetFamily() = eNewFamily;
-                bChanges = TRUE;
+                bChanges = sal_True;
             }
         }
     }
     return bChanges;
 }
 
-BOOL BinTextObject::ChangeStyleSheets(
+sal_Bool BinTextObject::ChangeStyleSheets(
                     const XubString& rOldName, SfxStyleFamily eOldFamily,
                     const XubString& rNewName, SfxStyleFamily eNewFamily )
 {
-    BOOL bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily );
+    sal_Bool bChanges = ImpChangeStyleSheets( rOldName, eOldFamily, rNewName, eNewFamily );
     if ( bChanges )
         ClearPortionInfo();
 
@@ -1142,7 +1142,7 @@ void BinTextObject::ChangeStyleSheetName( SfxStyleFamily eFamily,
 
 void BinTextObject::StoreData( SvStream& rOStream ) const
 {
-    USHORT nVer = 602;
+    sal_uInt16 nVer = 602;
     rOStream << nVer;
 
     rOStream << bOwnerOfPool;
@@ -1155,17 +1155,17 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
     }
 
     // Store Current text encoding ...
-    rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), (USHORT) rOStream.GetVersion() );
-    rOStream << (USHORT) eEncoding;
+    rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), (sal_uInt16) rOStream.GetVersion() );
+    rOStream << (sal_uInt16) eEncoding;
 
     // The number of paragraphs ...
-    USHORT nParagraphs = GetContents().Count();
+    sal_uInt16 nParagraphs = GetContents().Count();
     rOStream << nParagraphs;
 
     char cFeatureConverted = ByteString( CH_FEATURE, eEncoding ).GetChar(0);
 
     // The individual paragraphs ...
-    for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = GetContents().GetObject( nPara );
 
@@ -1173,17 +1173,17 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
         ByteString aText( pC->GetText(), eEncoding );
 
         // Symbols?
-        BOOL bSymbolPara = FALSE;
+        sal_Bool bSymbolPara = sal_False;
         if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
         {
             const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO );
             if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
             {
                 aText = ByteString( pC->GetText(), RTL_TEXTENCODING_SYMBOL );
-                bSymbolPara = TRUE;
+                bSymbolPara = sal_True;
             }
         }
-        for ( USHORT nA = 0; nA < pC->GetAttribs().Count(); nA++ )
+        for ( sal_uInt16 nA = 0; nA < pC->GetAttribs().Count(); nA++ )
         {
             XEditAttribute* pAttr = pC->GetAttribs().GetObject( nA );
 
@@ -1206,7 +1206,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
                 {
                     // Don't create a new Attrib with StarBats font, MBR changed the
                     // SvxFontItem::Store() to store StarBats instead of StarSymbol!
-                    for ( USHORT nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ )
+                    for ( sal_uInt16 nChar = pAttr->GetStart(); nChar < pAttr->GetEnd(); nChar++ )
                     {
                         sal_Unicode cOld = pC->GetText().GetChar( nChar );
                         char cConv = ByteString::ConvertFromUnicode( ConvertFontToSubsFontChar( hConv, cOld ), RTL_TEXTENCODING_SYMBOL );
@@ -1229,7 +1229,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
         }
         if ( hConv )
         {
-            for ( USHORT nChar = 0; nChar < pC->GetText().Len(); nChar++ )
+            for ( sal_uInt16 nChar = 0; nChar < pC->GetText().Len(); nChar++ )
             {
                 if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) )
                 {
@@ -1251,19 +1251,19 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
 
         // StyleName and Family...
         rOStream.WriteByteString( ByteString( pC->GetStyle(), eEncoding ) );
-        rOStream << (USHORT)pC->GetFamily();
+        rOStream << (sal_uInt16)pC->GetFamily();
 
         // Paragraph attributes ...
         pC->GetParaAttribs().Store( rOStream );
 
         // The number of attributes ...
-        USHORT nAttribs = pC->GetAttribs().Count();
+        sal_uInt16 nAttribs = pC->GetAttribs().Count();
         rOStream << nAttribs;
 
         // And the individual attributes
         // Items as Surregate => always 8 bytes per Attribute
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
             XEditAttribute* pX = pC->GetAttribs().GetObject( nAttr );
 
@@ -1285,16 +1285,16 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
     rOStream << bStoreUnicodeStrings;
     if ( bStoreUnicodeStrings )
     {
-        for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+        for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
         {
             ContentInfo* pC = GetContents().GetObject( nPara );
-            USHORT nL = pC->GetText().Len();
+            sal_uInt16 nL = pC->GetText().Len();
             rOStream << nL;
             rOStream.Write( pC->GetText().GetBuffer(), nL*sizeof(sal_Unicode) );
 
             // StyleSheetName must be Unicode too!
             // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed...
-            // If needed, change nL back to ULONG and increase version...
+            // If needed, change nL back to sal_uLong and increase version...
             nL = pC->GetStyle().Len();
             rOStream << nL;
             rOStream.Write( pC->GetStyle().GetBuffer(), nL*sizeof(sal_Unicode) );
@@ -1308,7 +1308,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
 
     // The text object was first created with the current setting of 
     // pTextObjectPool.
-    BOOL bOwnerOfCurrent = bOwnerOfPool;
+    sal_Bool bOwnerOfCurrent = bOwnerOfPool;
     rIStream >> bOwnerOfPool;
 
     if ( bOwnerOfCurrent && !bOwnerOfPool )
@@ -1327,17 +1327,17 @@ void BinTextObject::CreateData( SvStream& rIStream )
         GetPool()->Load( rIStream );
 
     // CharSet, in which it was saved:
-    USHORT nCharSet;
+    sal_uInt16 nCharSet;
     rIStream >> nCharSet;
 
-    rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (USHORT)rIStream.GetVersion() );
+    rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet, (sal_uInt16)rIStream.GetVersion() );
 
     // The number of paragraphs ...
-    USHORT nParagraphs;
+    sal_uInt16 nParagraphs;
     rIStream >> nParagraphs;
 
     // The individual paragraphs ...
-    for ( ULONG nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = CreateAndInsertContent();
 
@@ -1348,7 +1348,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
 
         // StyleName and Family...
         rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding );
-        USHORT nStyleFamily;
+        sal_uInt16 nStyleFamily;
         rIStream >> nStyleFamily;
         pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
 
@@ -1356,16 +1356,16 @@ void BinTextObject::CreateData( SvStream& rIStream )
         pC->GetParaAttribs().Load( rIStream );
 
         // The number of attributes ...
-        USHORT nAttribs;
+        sal_uInt16 nAttribs;
         rIStream >> nAttribs;
 
         // And the individual attributes
         // Items as Surregate => always 8 bytes per Attributes
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        USHORT nAttr;
+        sal_uInt16 nAttr;
         for ( nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
-            USHORT _nWhich, nStart, nEnd;
+            sal_uInt16 _nWhich, nStart, nEnd;
             const SfxPoolItem* pItem;
 
             rIStream >> _nWhich;
@@ -1387,8 +1387,8 @@ void BinTextObject::CreateData( SvStream& rIStream )
                     if ( ( _nWhich >= EE_FEATURE_START ) && ( _nWhich <= EE_FEATURE_END ) )
                     {
                         // Convert CH_FEATURE to CH_FEATURE_OLD
-                        DBG_ASSERT( (BYTE) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" );
-                        if ( (BYTE) aByteString.GetChar( nStart ) == CH_FEATURE_OLD )
+                        DBG_ASSERT( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" );
+                        if ( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD )
                             pC->GetText().SetChar( nStart, CH_FEATURE );
                     }
                 }
@@ -1398,14 +1398,14 @@ void BinTextObject::CreateData( SvStream& rIStream )
         // But check for paragraph and character symbol attribs here,
         // FinishLoad will not be called in OpenOffice Calc, no StyleSheets...
 
-        BOOL bSymbolPara = FALSE;
+        sal_Bool bSymbolPara = sal_False;
         if ( pC->GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == SFX_ITEM_ON )
         {
             const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO );
             if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
             {
                 pC->GetText() = String( aByteString, RTL_TEXTENCODING_SYMBOL );
-                bSymbolPara = TRUE;
+                bSymbolPara = sal_True;
             }
         }
 
@@ -1437,7 +1437,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
                     pC->GetAttribs().Insert( pNewAttr, nAttr );
                     DestroyAttrib( pAttr );
 
-                    for ( USHORT nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ )
+                    for ( sal_uInt16 nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ )
                     {
                         sal_Unicode cOld = pC->GetText().GetChar( nChar );
                         DBG_ASSERT( cOld >= 0xF000, "cOld not converted?!" );
@@ -1464,7 +1464,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
                 aNewFontItem.GetFamilyName() = GetFontToSubsFontName( hConv );
                 pC->GetParaAttribs().Put( aNewFontItem );
 
-                for ( USHORT nChar = 0; nChar < pC->GetText().Len(); nChar++ )
+                for ( sal_uInt16 nChar = 0; nChar < pC->GetText().Len(); nChar++ )
                 {
                     if ( !pC->GetAttribs().FindAttrib( EE_CHAR_FONTINFO, nChar ) )
                     {
@@ -1484,7 +1484,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
     // From 400 also the DefMetric:
     if ( nVersion >= 400 )
     {
-        USHORT nTmpMetric;
+        sal_uInt16 nTmpMetric;
         rIStream >> nTmpMetric;
         if ( nVersion >= 401 )
         {
@@ -1511,14 +1511,14 @@ void BinTextObject::CreateData( SvStream& rIStream )
     {
         rIStream >> nScriptType;
 
-        BOOL bUnicodeStrings;
+        sal_Bool bUnicodeStrings;
         rIStream >> bUnicodeStrings;
         if ( bUnicodeStrings )
         {
-            for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+            for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
             {
                 ContentInfo* pC = GetContents().GetObject( nPara );
-                USHORT nL;
+                sal_uInt16 nL;
 
                 // Text
                 rIStream >> nL;
@@ -1526,7 +1526,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
                 {
                     pC->GetText().AllocBuffer( nL );
                     rIStream.Read( pC->GetText().GetBufferAccess(), nL*sizeof(sal_Unicode) );
-                    pC->GetText().ReleaseBufferAccess( (USHORT)nL );
+                    pC->GetText().ReleaseBufferAccess( (sal_uInt16)nL );
                 }
 
                 // StyleSheetName
@@ -1535,7 +1535,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
                 {
                     pC->GetStyle().AllocBuffer( nL );
                     rIStream.Read( pC->GetStyle().GetBufferAccess(), nL*sizeof(sal_Unicode) );
-                    pC->GetStyle().ReleaseBufferAccess( (USHORT)nL );
+                    pC->GetStyle().ReleaseBufferAccess( (sal_uInt16)nL );
                 }
             }
         }
@@ -1546,7 +1546,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
     // Works only if tab positions are set, not when DefTab.
     if ( nVersion < 500 )
     {
-        for ( USHORT n = 0; n < aContents.Count(); n++ )
+        for ( sal_uInt16 n = 0; n < aContents.Count(); n++ )
         {
             ContentInfo* pC = aContents.GetObject( n );
             const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&) pC->GetParaAttribs().Get( EE_PARA_LRSPACE );
@@ -1554,7 +1554,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
             {
                 const SvxTabStopItem& rTabs = (const SvxTabStopItem&) pC->GetParaAttribs().Get( EE_PARA_TABS );
                 SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
-                for ( USHORT t = 0; t < rTabs.Count(); t++ )
+                for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
                 {
                     const SvxTabStop& rT = rTabs[ t ];
                     aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
@@ -1566,7 +1566,7 @@ void BinTextObject::CreateData( SvStream& rIStream )
     }
 }
 
-USHORT BinTextObject::GetVersion() const
+sal_uInt16 BinTextObject::GetVersion() const
 {
     return nVersion;
 }
@@ -1584,7 +1584,7 @@ bool BinTextObject::operator==( const BinTextObject& rCompare ) const
             ( bVertical != rCompare.bVertical ) )
         return false;
 
-    USHORT n;
+    sal_uInt16 n;
     for( n = 0; n < aContents.Count(); n++ )
     {
         if( !( *aContents.GetObject( n ) == *rCompare.aContents.GetObject( n ) ) )
@@ -1602,7 +1602,7 @@ bool BinTextObject::isWrongListEqual(const BinTextObject& rCompare) const
         return false;
     }
 
-    for(USHORT a(0); a < GetContents().Count(); a++)
+    for(sal_uInt16 a(0); a < GetContents().Count(); a++)
     {
         const ContentInfo& rCandA(*GetContents().GetObject(a));
         const ContentInfo& rCandB(*rCompare.GetContents().GetObject(a));
@@ -1631,7 +1631,7 @@ void BinTextObject::CreateData300( SvStream& rIStream )
     rIStream >> nParagraphs;
 
     // The individual paragraphs...
-    for ( ULONG nPara = 0; nPara < nParagraphs; nPara++ )
+    for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
     {
         ContentInfo* pC = CreateAndInsertContent();
 
@@ -1640,7 +1640,7 @@ void BinTextObject::CreateData300( SvStream& rIStream )
 
         // StyleName and Family...
         rIStream.ReadByteString( pC->GetStyle() );
-        USHORT nStyleFamily;
+        sal_uInt16 nStyleFamily;
         rIStream >> nStyleFamily;
         pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
 
@@ -1654,9 +1654,9 @@ void BinTextObject::CreateData300( SvStream& rIStream )
         // And the individual attributes
         // Items as Surregate => always 8 bytes per Attribute
         // Which = 2; Surregat = 2; Start = 2; End = 2;
-        for ( ULONG nAttr = 0; nAttr < nAttribs; nAttr++ )
+        for ( sal_uLong nAttr = 0; nAttr < nAttribs; nAttr++ )
         {
-            USHORT _nWhich, nStart, nEnd;
+            sal_uInt16 _nWhich, nStart, nEnd;
             const SfxPoolItem* pItem;
 
             rIStream >> _nWhich;
@@ -1673,11 +1673,11 @@ void BinTextObject::CreateData300( SvStream& rIStream )
     }
 
     // Check whether a font was saved
-    USHORT nCharSetMarker;
+    sal_uInt16 nCharSetMarker;
     rIStream >> nCharSetMarker;
     if ( nCharSetMarker == CHARSETMARKER )
     {
-        USHORT nCharSet;
+        sal_uInt16 nCharSet;
         rIStream >> nCharSet;
     }
 }
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 859cbe6017..f7bb04e91b 100644..100755
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -44,8 +44,8 @@ class XEditAttribute
 
 private:
     const SfxPoolItem*	pItem;
-    USHORT 				nStart;
-    USHORT 				nEnd;
+    sal_uInt16 				nStart;
+    sal_uInt16 				nEnd;
 
                         XEditAttribute();
                         XEditAttribute( const XEditAttribute& rCopyFrom );
@@ -54,19 +54,19 @@ private:
 
 public:
                         XEditAttribute( const SfxPoolItem& rAttr );
-                        XEditAttribute( const SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd );
+                        XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
     const SfxPoolItem*	GetItem() const				{ return pItem; }
 
-    USHORT&				GetStart()					{ return nStart; }
-    USHORT&				GetEnd()					{ return nEnd; }
+    sal_uInt16&				GetStart()					{ return nStart; }
+    sal_uInt16&				GetEnd()					{ return nEnd; }
 
-    USHORT				GetStart() const			{ return nStart; }
-    USHORT				GetEnd() const				{ return nEnd; }
+    sal_uInt16				GetStart() const			{ return nStart; }
+    sal_uInt16				GetEnd() const				{ return nEnd; }
 
-    USHORT				GetLen() const				{ return nEnd-nStart; }
+    sal_uInt16				GetLen() const				{ return nEnd-nStart; }
 
-    inline BOOL			IsFeature();
+    inline sal_Bool			IsFeature();
 
     inline bool			operator==( const XEditAttribute& rCompare );
 };
@@ -80,9 +80,9 @@ inline bool XEditAttribute::operator==( const XEditAttribute& rCompare )
             (*pItem == *rCompare.pItem));
 }
 
-inline BOOL XEditAttribute::IsFeature()
+inline sal_Bool XEditAttribute::IsFeature()
 {
-    USHORT nWhich = pItem->Which();
+    sal_uInt16 nWhich = pItem->Which();
     return 	( ( nWhich >= EE_FEATURE_START ) &&
               ( nWhich <=  EE_FEATURE_END ) );
 }
@@ -93,13 +93,13 @@ SV_DECL_PTRARR( XEditAttributeListImpl, XEditAttributePtr, 0, 4 )
 class XEditAttributeList : public XEditAttributeListImpl
 {
 public:
-    XEditAttribute* FindAttrib( USHORT nWhich, USHORT nChar ) const;
+    XEditAttribute* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nChar ) const;
 };
 
 struct XParaPortion
 {
     long				nHeight;
-    USHORT				nFirstLineOffset;
+    sal_uInt16				nFirstLineOffset;
 
     EditLineList		aLines;
     TextPortionList		aTextPortions;
@@ -110,26 +110,26 @@ SV_DECL_PTRARR( XBaseParaPortionList, XParaPortionPtr, 0, 4 )
 
 class XParaPortionList : public  XBaseParaPortionList
 {
-    ULONG 		nRefDevPtr;
+    sal_uIntPtr 		nRefDevPtr;
     OutDevType	eRefDevType;
     MapMode		aRefMapMode;
     sal_uInt16	nStretchX;
     sal_uInt16	nStretchY;
-    ULONG		nPaperWidth;
+    sal_uLong	nPaperWidth;
 
 
 public:
-            XParaPortionList( OutputDevice* pRefDev, ULONG nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY ) :
+            XParaPortionList( OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY ) :
                 aRefMapMode( pRefDev->GetMapMode() ),
                 nStretchX(_nStretchX),
                 nStretchY(_nStretchY)
                 {
-                    nRefDevPtr = (ULONG)pRefDev; nPaperWidth = nPW;
+                    nRefDevPtr = (sal_uIntPtr)pRefDev; nPaperWidth = nPW;
                     eRefDevType = pRefDev->GetOutDevType();
                 }
 
-    ULONG			GetRefDevPtr() const 		{ return nRefDevPtr; }
-    ULONG			GetPaperWidth() const 		{ return nPaperWidth; }
+    sal_uIntPtr			GetRefDevPtr() const 		{ return nRefDevPtr; }
+    sal_uLong			GetPaperWidth() const 		{ return nPaperWidth; }
     OutDevType		GetRefDevType() const 		{ return eRefDevType; }
     const MapMode&	GetRefMapMode() const		{ return aRefMapMode; }
     sal_uInt16	GetStretchX() const         { return nStretchX; }
@@ -142,10 +142,10 @@ struct LoadStoreTempInfos
     ByteString              aOrgString_Load;
 
     FontToSubsFontConverter hOldSymbolConv_Store;
-    BOOL                    bSymbolParagraph_Store;
+    sal_Bool                    bSymbolParagraph_Store;
 
 
-    LoadStoreTempInfos() { bSymbolParagraph_Store = FALSE; hOldSymbolConv_Store = NULL; }
+    LoadStoreTempInfos() { bSymbolParagraph_Store = sal_False; hOldSymbolConv_Store = NULL; }
 };
 */
 
@@ -198,23 +198,23 @@ class BinTextObject : public EditTextObject, public SfxItemPoolUser
 private:
     ContentInfoList			aContents;
     SfxItemPool*			pPool;
-    BOOL					bOwnerOfPool;
+    sal_Bool					bOwnerOfPool;
     XParaPortionList*		pPortionInfo;
     
     sal_uInt32				nObjSettings;
-    USHORT 					nMetric;
-    USHORT 					nVersion;
-    USHORT					nUserType;
-    USHORT					nScriptType;
+    sal_uInt16 					nMetric;
+    sal_uInt16 					nVersion;
+    sal_uInt16					nUserType;
+    sal_uInt16					nScriptType;
 
-    BOOL					bVertical;
-    BOOL					bStoreUnicodeStrings;
+    sal_Bool					bVertical;
+    sal_Bool					bStoreUnicodeStrings;
 
 protected:
     void					DeleteContents();
     virtual void			StoreData( SvStream& rOStream ) const;
     virtual void			CreateData( SvStream& rIStream );
-    BOOL					ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily,
+    sal_Bool					ImpChangeStyleSheets( const String& rOldName, SfxStyleFamily eOldFamily,
                                         const String& rNewName, SfxStyleFamily eNewFamily );
 
 public:
@@ -224,22 +224,22 @@ public:
 
     virtual EditTextObject*	Clone() const;
 
-    USHORT					GetUserType() const;
-    void					SetUserType( USHORT n );
+    sal_uInt16					GetUserType() const;
+    void					SetUserType( sal_uInt16 n );
 
-    ULONG					GetObjectSettings() const;
-    void					SetObjectSettings( ULONG n );
+    sal_uLong					GetObjectSettings() const;
+    void					SetObjectSettings( sal_uLong n );
 
-    BOOL					IsVertical() const;
-    void					SetVertical( BOOL b );
+    sal_Bool					IsVertical() const;
+    void					SetVertical( sal_Bool b );
 
-    USHORT					GetScriptType() const;
-    void					SetScriptType( USHORT nType );
+    sal_uInt16					GetScriptType() const;
+    void					SetScriptType( sal_uInt16 nType );
 
-    USHORT					GetVersion() const;	// As long as the outliner does not store any record length
+    sal_uInt16					GetVersion() const;	// As long as the outliner does not store any record length
 
     ContentInfo*			CreateAndInsertContent();
-    XEditAttribute*			CreateAttrib( const SfxPoolItem& rItem, USHORT nStart, USHORT nEnd );
+    XEditAttribute*			CreateAttrib( const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd );
     void					DestroyAttrib( XEditAttribute* pAttr );
 
     ContentInfoList&		GetContents()			{ return aContents; }
@@ -249,47 +249,48 @@ public:
     void					SetPortionInfo( XParaPortionList* pP )
                                 { pPortionInfo = pP; }
 
-    virtual USHORT			GetParagraphCount() const;
-    virtual String			GetText( USHORT nParagraph ) const;
-    virtual void			Insert( const EditTextObject& rObj, USHORT nPara );
-    virtual EditTextObject*	CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const;
-    virtual void			RemoveParagraph( USHORT nPara );
+    virtual sal_uInt16			GetParagraphCount() const;
+    virtual String			GetText( sal_uInt16 nParagraph ) const;
+    virtual void			Insert( const EditTextObject& rObj, sal_uInt16 nPara );
+    virtual EditTextObject*	CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas = 1 ) const;
+    virtual void			RemoveParagraph( sal_uInt16 nPara );
 
-    virtual BOOL			HasPortionInfo() const;
+    virtual sal_Bool			HasPortionInfo() const;
     virtual void			ClearPortionInfo();
 
-    virtual BOOL			HasOnlineSpellErrors() const;
+    virtual sal_Bool			HasOnlineSpellErrors() const;
 
-    virtual BOOL			HasCharAttribs( USHORT nWhich = 0 ) const;
-    virtual void			GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const;
+    virtual sal_Bool			HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
+    virtual void			GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
 
-    virtual BOOL			RemoveCharAttribs( USHORT nWhich = 0 );
-    virtual BOOL			RemoveParaAttribs( USHORT nWhich = 0 );
+    virtual sal_Bool			RemoveCharAttribs( sal_uInt16 nWhich = 0 );
+    virtual sal_Bool			RemoveParaAttribs( sal_uInt16 nWhich = 0 );
     
-    virtual void			MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart, USHORT nEnd );
+    virtual void			MergeParaAttribs( const SfxItemSet& rAttribs, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual BOOL			IsFieldObject() const;
+    virtual sal_Bool			IsFieldObject() const;
     virtual const SvxFieldItem*	GetField() const;
-    virtual BOOL			HasField( TypeId Type = NULL ) const;
+    virtual sal_Bool			HasField( TypeId Type = NULL ) const;
 
-    SfxItemSet 				GetParaAttribs( USHORT nPara ) const;
-    void 					SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs );
+    SfxItemSet 				GetParaAttribs( sal_uInt16 nPara ) const;
+    void 					SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rAttribs );
 
-    virtual BOOL			HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
-    virtual void			GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
-    virtual void			SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily );
-    virtual BOOL			ChangeStyleSheets( 	const XubString& rOldName, SfxStyleFamily eOldFamily,
+    virtual sal_Bool			HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
+    virtual void			GetStyleSheet( sal_uInt16 nPara, XubString& rName, SfxStyleFamily& eFamily ) const;
+    virtual void			SetStyleSheet( sal_uInt16 nPara, const XubString& rName, const SfxStyleFamily& eFamily );
+    virtual sal_Bool			ChangeStyleSheets( 	const XubString& rOldName, SfxStyleFamily eOldFamily,
                                                 const String& rNewName, SfxStyleFamily eNewFamily );
     virtual void			ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
 
     void					CreateData300( SvStream& rIStream );
 
-    BOOL					HasMetric() const			{ return nMetric != 0xFFFF; }
-    USHORT					GetMetric() const			{ return nMetric; }
-    void					SetMetric( USHORT n )		{ nMetric = n; }
+    sal_Bool					HasMetric() const			{ return nMetric != 0xFFFF; }
+    sal_uInt16					GetMetric() const			{ return nMetric; }
+    void					SetMetric( sal_uInt16 n )		{ nMetric = n; }
+
+    sal_Bool					IsOwnerOfPool() const		{ return bOwnerOfPool; }
+    void					StoreUnicodeStrings( sal_Bool b ) { bStoreUnicodeStrings = b; }
 
-    BOOL					IsOwnerOfPool() const		{ return bOwnerOfPool; }
-    void					StoreUnicodeStrings( BOOL b ) { bStoreUnicodeStrings = b; }
     bool					operator==( const BinTextObject& rCompare ) const;
 
     // #i102062#
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 494e54b8ec..6da806b243 100644..100755
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -54,20 +54,20 @@ void EditSelFunctionSet::DestroyAnchor()
     // Only with multiple selection
 }
 
-BOOL EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL )
+sal_Bool EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool )
 {
     if ( pCurView )
         return pCurView->pImpEditView->SetCursorAtPoint( rPointPixel );
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+sal_Bool EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
 {
     if ( pCurView )
         return pCurView->pImpEditView->IsSelectionAtPoint( rPointPixel );
 
-    return FALSE;
+    return sal_False;
 }
 
 void EditSelFunctionSet::DeselectAtPoint( const Point& )
@@ -95,7 +95,7 @@ void EditSelFunctionSet::DeselectAll()
 EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 )
 {
     SetSelectionMode( RANGE_SELECTION );
-    EnableDrag( TRUE );
+    EnableDrag( sal_True );
 }
 
 void EditSelectionEngine::SetCurView( EditView* pNewView )
diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index 3182bc6d59..034d61cdb1 100644..100755
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -46,9 +46,9 @@ public:
     virtual void 	CreateAnchor();
     virtual void	DestroyAnchor();
 
-    virtual BOOL 	SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+    virtual sal_Bool 	SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False );
 
-    virtual BOOL 	IsSelectionAtPoint( const Point& rPointPixel );
+    virtual sal_Bool 	IsSelectionAtPoint( const Point& rPointPixel );
     virtual void 	DeselectAtPoint( const Point& rPointPixel );
     virtual void 	DeselectAll();
 
diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 3bab4db1b8..a992f21534 100644..100755
--- a/editeng/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -37,93 +37,93 @@ class InternalEditStatus : public EditStatus
 public:
             InternalEditStatus() { ; }
 
-    void	TurnOnFlags( ULONG nFlags )
+    void	TurnOnFlags( sal_uLong nFlags )
                 { nControlBits |= nFlags; }
 
-    void	TurnOffFlags( ULONG nFlags )
+    void	TurnOffFlags( sal_uLong nFlags )
                 { nControlBits &= ~nFlags; }
 
-    void	TurnOnStatusBits( ULONG nBits )
+    void	TurnOnStatusBits( sal_uLong nBits )
                 { nStatusBits |= nBits; }
 
-    void	TurnOffStatusBits( ULONG nBits )
+    void	TurnOffStatusBits( sal_uLong nBits )
                 { nStatusBits &= ~nBits; }
 
 
-    BOOL	UseCharAttribs() const
+    sal_Bool	UseCharAttribs() const
                 { return ( ( nControlBits & EE_CNTRL_USECHARATTRIBS ) != 0 ); }
 
-    BOOL	NotifyCursorMovements() const
+    sal_Bool	NotifyCursorMovements() const
                 { return ( ( nControlBits & EE_CNTRL_CRSRLEFTPARA ) != 0 ); }
 
-    BOOL	UseIdleFormatter() const
+    sal_Bool	UseIdleFormatter() const
                 { return ( ( nControlBits & EE_CNTRL_DOIDLEFORMAT) != 0 ); }
 
-    BOOL	AllowPasteSpecial() const
+    sal_Bool	AllowPasteSpecial() const
                 { return ( ( nControlBits & EE_CNTRL_PASTESPECIAL ) != 0 ); }
 
-    BOOL	DoAutoIndenting() const
+    sal_Bool	DoAutoIndenting() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOINDENTING ) != 0 ); }
 
-    BOOL	DoUndoAttribs() const
+    sal_Bool	DoUndoAttribs() const
                 { return ( ( nControlBits & EE_CNTRL_UNDOATTRIBS ) != 0 ); }
 
-    BOOL	OneCharPerLine() const
+    sal_Bool	OneCharPerLine() const
                 { return ( ( nControlBits & EE_CNTRL_ONECHARPERLINE ) != 0 ); }
 
-    BOOL	IsOutliner() const
+    sal_Bool	IsOutliner() const
                 { return ( ( nControlBits & EE_CNTRL_OUTLINER ) != 0 ); }
 
-    BOOL	IsOutliner2() const
+    sal_Bool	IsOutliner2() const
                 { return ( ( nControlBits & EE_CNTRL_OUTLINER2 ) != 0 ); }
 
-    BOOL	IsAnyOutliner() const
+    sal_Bool	IsAnyOutliner() const
                 { return IsOutliner() || IsOutliner2(); }
 
-    BOOL	DoNotUseColors() const
+    sal_Bool	DoNotUseColors() const
                 { return ( ( nControlBits & EE_CNTRL_NOCOLORS ) != 0 ); }
 
-    BOOL	AllowBigObjects() const
+    sal_Bool	AllowBigObjects() const
                 { return ( ( nControlBits & EE_CNTRL_ALLOWBIGOBJS ) != 0 ); }
 
-    BOOL	DoOnlineSpelling() const
+    sal_Bool	DoOnlineSpelling() const
                 { return ( ( nControlBits & EE_CNTRL_ONLINESPELLING ) != 0 ); }
 
-    BOOL	DoStretch() const
+    sal_Bool	DoStretch() const
                 { return ( ( nControlBits & EE_CNTRL_STRETCHING ) != 0 ); }
 
-    BOOL	AutoPageSize() const
+    sal_Bool	AutoPageSize() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZE ) != 0 ); }
-    BOOL	AutoPageWidth() const
+    sal_Bool	AutoPageWidth() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEX ) != 0 ); }
-    BOOL	AutoPageHeight() const
+    sal_Bool	AutoPageHeight() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOPAGESIZEY ) != 0 ); }
 
-    BOOL	MarkFields() const
+    sal_Bool	MarkFields() const
                 { return ( ( nControlBits & EE_CNTRL_MARKFIELDS ) != 0 ); }
 
-    BOOL	DoRestoreFont() const
+    sal_Bool	DoRestoreFont() const
                 { return ( ( nControlBits & EE_CNTRL_RESTOREFONT ) != 0 ); }
 
-    BOOL	DoImportRTFStyleSheets() const
+    sal_Bool	DoImportRTFStyleSheets() const
                 { return ( ( nControlBits & EE_CNTRL_RTFSTYLESHEETS ) != 0 ); }
 
-    BOOL	DoAutoCorrect() const
+    sal_Bool	DoAutoCorrect() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOCORRECT ) != 0 ); }
 
-    BOOL	DoAutoComplete() const
+    sal_Bool	DoAutoComplete() const
                 { return ( ( nControlBits & EE_CNTRL_AUTOCOMPLETE ) != 0 ); }
 
-    BOOL	DoTabIndenting() const
+    sal_Bool	DoTabIndenting() const
                 { return ( ( nControlBits & EE_CNTRL_TABINDENTING ) != 0 ); }
 
-    BOOL	DoFormat100() const
+    sal_Bool	DoFormat100() const
                 { return ( ( nControlBits & EE_CNTRL_FORMAT100 ) != 0 ); }
     
-    BOOL	ULSpaceSummation() const
+    sal_Bool	ULSpaceSummation() const
                 { return ( ( nControlBits & EE_CNTRL_ULSPACESUMMATION ) != 0 ); }
     
-    BOOL	ULSpaceFirstParagraph() const
+    sal_Bool	ULSpaceFirstParagraph() const
                 { return ( ( nControlBits & EE_CNTRL_ULSPACEFIRSTPARA ) != 0 ); }
 };
 
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 6aeea7e547..d59bb93503 100644..100755
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -58,7 +58,7 @@ TYPEINIT1( EditUndoSetAttribs, EditUndo );
 TYPEINIT1( EditUndoTransliteration, EditUndo );
 TYPEINIT1( EditUndoMarkSelection, EditUndo );
 
-void lcl_DoSetSelection( EditView* pView, USHORT nPara )
+void lcl_DoSetSelection( EditView* pView, sal_uInt16 nPara )
 {
     EPaM aEPaM( nPara, 0 );
     EditPaM aPaM( pView->GetImpEditEngine()->CreateEditPaM( aEPaM ) );
@@ -72,10 +72,10 @@ EditUndoManager::EditUndoManager( ImpEditEngine* p )
     pImpEE = p;
 }
 
-BOOL EditUndoManager::Undo( USHORT nCount )
+sal_Bool EditUndoManager::Undo()
 {
     if ( GetUndoActionCount() == 0 )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT( pImpEE->GetActiveView(), "Active View?" );
 
@@ -86,15 +86,15 @@ BOOL EditUndoManager::Undo( USHORT nCount )
         else
         {
             OSL_FAIL("Undo in engine is not possible without a View! ");
-            return FALSE;
+            return sal_False;
         }
     }
 
     pImpEE->GetActiveView()->GetImpEditView()->DrawSelection();	// Remove the old selection
 
-    pImpEE->SetUndoMode( TRUE );
-    BOOL bDone = SfxUndoManager::Undo( nCount );
-    pImpEE->SetUndoMode( FALSE );
+    pImpEE->SetUndoMode( sal_True );
+    sal_Bool bDone = SfxUndoManager::Undo();
+    pImpEE->SetUndoMode( sal_False );
 
     EditSelection aNewSel( pImpEE->GetActiveView()->GetImpEditView()->GetEditSelection() );
     DBG_ASSERT( !aNewSel.IsInvalid(), "Invalid selection after Undo () ");
@@ -107,10 +107,10 @@ BOOL EditUndoManager::Undo( USHORT nCount )
     return bDone;
 }
 
-BOOL EditUndoManager::Redo( USHORT nCount )
+sal_Bool EditUndoManager::Redo()
 {
     if ( GetRedoActionCount() == 0 )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT( pImpEE->GetActiveView(), "Active View?" );
 
@@ -121,15 +121,15 @@ BOOL EditUndoManager::Redo( USHORT nCount )
         else
         {
             OSL_FAIL( "Redo in Engine ohne View nicht moeglich!" );
-            return FALSE;
+            return sal_False;
         }
     }
 
     pImpEE->GetActiveView()->GetImpEditView()->DrawSelection();	// Remove the old selection
 
-    pImpEE->SetUndoMode( TRUE );
-    BOOL bDone = SfxUndoManager::Redo( nCount );
-    pImpEE->SetUndoMode( FALSE );
+    pImpEE->SetUndoMode( sal_True );
+    sal_Bool bDone = SfxUndoManager::Redo();
+    pImpEE->SetUndoMode( sal_False );
 
     EditSelection aNewSel( pImpEE->GetActiveView()->GetImpEditView()->GetEditSelection() );
     DBG_ASSERT( !aNewSel.IsInvalid(), "Invalid selection after Undo () ");
@@ -142,7 +142,7 @@ BOOL EditUndoManager::Redo( USHORT nCount )
     return bDone;
 }
 
-EditUndo::EditUndo( USHORT nI, ImpEditEngine* p )
+EditUndo::EditUndo( sal_uInt16 nI, ImpEditEngine* p )
 {
     DBG_CTOR( EditUndo, 0 );
     nId = nI;
@@ -154,15 +154,15 @@ EditUndo::~EditUndo()
     DBG_DTOR( EditUndo, 0 );
 }
 
-USHORT EditUndo::GetId() const
+sal_uInt16 EditUndo::GetId() const
 {
     DBG_CHKTHIS( EditUndo, 0 );
     return nId;
 }
 
-BOOL EditUndo::CanRepeat(SfxRepeatTarget&) const
+sal_Bool EditUndo::CanRepeat(SfxRepeatTarget&) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 XubString EditUndo::GetComment() const
@@ -176,12 +176,12 @@ XubString EditUndo::GetComment() const
     return aComment;
 }
 
-EditUndoDelContent::EditUndoDelContent( ImpEditEngine* _pImpEE, ContentNode* pNode, USHORT n )
+EditUndoDelContent::EditUndoDelContent( ImpEditEngine* _pImpEE, ContentNode* pNode, sal_uInt16 n )
                     : EditUndo( EDITUNDO_DELCONTENT, _pImpEE )
 {
     pContentNode = pNode;
     nNode = n;
-    bDelObject = TRUE;
+    bDelObject = sal_True;
 }
 
 EditUndoDelContent::~EditUndoDelContent()
@@ -194,7 +194,7 @@ void EditUndoDelContent::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
     GetImpEditEngine()->InsertContent( pContentNode, nNode );
-    bDelObject = FALSE;	// belongs to the Engine again
+    bDelObject = sal_False;	// belongs to the Engine again
     EditSelection aSel( EditPaM( pContentNode, 0 ), EditPaM( pContentNode, pContentNode->Len() ) );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aSel );
 }
@@ -218,7 +218,7 @@ void EditUndoDelContent::Redo()
     if( _pImpEE->IsCallParaInsertedOrDeleted() )
         _pImpEE->GetEditEnginePtr()->ParagraphDeleted( nNode );
 
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pContentNode, nNode );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pContentNode, nNode );
     _pImpEE->aDeletedNodes.Insert( pInf, _pImpEE->aDeletedNodes.Count() );
     _pImpEE->UpdateSelections();
 
@@ -228,14 +228,14 @@ void EditUndoDelContent::Redo()
     DBG_ASSERT( pN && ( pN != pContentNode ), "?! RemoveContent !? " );
     EditPaM aPaM( pN, pN->Len() );
 
-    bDelObject = TRUE;	// belongs to the Engine again
+    bDelObject = sal_True;	// belongs to the Engine again
 
     _pImpEE->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
 }
 
-EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP,
+EditUndoConnectParas::EditUndoConnectParas( ImpEditEngine* _pImpEE, sal_uInt16 nN, sal_uInt16 nSP,
                                             const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
-                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBkwrd )
+                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, sal_Bool bBkwrd )
                     : 	EditUndo( EDITUNDO_CONNECTPARAS, _pImpEE ),
                         aLeftParaAttribs( rLeftParaAttribs ),
                         aRightParaAttribs( rRightParaAttribs )
@@ -268,8 +268,8 @@ void EditUndoConnectParas::Undo()
     // For SplitContent ParagraphInserted can not be called yet because the 
     // Outliner relies on the attributes to initialize the depth
 
-    BOOL bCall = GetImpEditEngine()->IsCallParaInsertedOrDeleted();
-    GetImpEditEngine()->SetCallParaInsertedOrDeleted( FALSE );
+    sal_Bool bCall = GetImpEditEngine()->IsCallParaInsertedOrDeleted();
+    GetImpEditEngine()->SetCallParaInsertedOrDeleted( sal_False );
 
     EditPaM aPaM = GetImpEditEngine()->SplitContent( nNode, nSepPos );
     GetImpEditEngine()->SetParaAttribs( nNode, aLeftParaAttribs );
@@ -282,7 +282,7 @@ void EditUndoConnectParas::Undo()
     if ( GetImpEditEngine()->GetStyleSheetPool() ) 
     {
         if ( aLeftStyleName.Len() )
-            GetImpEditEngine()->SetStyleSheet( (USHORT)nNode, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
+            GetImpEditEngine()->SetStyleSheet( (sal_uInt16)nNode, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
         if ( aRightStyleName.Len() )
             GetImpEditEngine()->SetStyleSheet( nNode+1, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aRightStyleName, eRightStyleFamily ) );
     }
@@ -298,7 +298,7 @@ void EditUndoConnectParas::Redo()
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
 }
 
-EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, USHORT nN, USHORT nSP )
+EditUndoSplitPara::EditUndoSplitPara( ImpEditEngine* _pImpEE, sal_uInt16 nN, sal_uInt16 nSP )
                     : EditUndo( EDITUNDO_SPLITPARA, _pImpEE )
 {
     nNode	= nN;
@@ -312,7 +312,7 @@ EditUndoSplitPara::~EditUndoSplitPara()
 void EditUndoSplitPara::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
-    EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, FALSE );
+    EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, sal_False );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) );
 }
 
@@ -349,22 +349,22 @@ void EditUndoInsertChars::Redo()
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aNewPaM ) );
 }
 
-BOOL EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
+sal_Bool EditUndoInsertChars::Merge( SfxUndoAction* pNextAction )
 {
     if ( !pNextAction->ISA( EditUndoInsertChars ) )
-        return FALSE;
+        return sal_False;
 
     EditUndoInsertChars* pNext = (EditUndoInsertChars*)pNextAction;
 
     if ( aEPaM.nPara != pNext->aEPaM.nPara )
-        return FALSE;
+        return sal_False;
 
     if ( ( aEPaM.nIndex + aText.Len() ) == pNext->aEPaM.nIndex )
     {
         aText += pNext->aText;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 EditUndoRemoveChars::EditUndoRemoveChars( ImpEditEngine* _pImpEE, const EPaM& rEPaM, const XubString& rStr )
@@ -430,7 +430,7 @@ void EditUndoInsertFeature::Redo()
 }
 
 EditUndoMoveParagraphs::EditUndoMoveParagraphs
-                            ( ImpEditEngine* _pImpEE, const Range& rParas, USHORT n )
+                            ( ImpEditEngine* _pImpEE, const Range& rParas, sal_uInt16 n )
                             : 	EditUndo( EDITUNDO_MOVEPARAGRAPHS, _pImpEE ),
                                 nParagraphs( rParas )
 {
@@ -460,7 +460,7 @@ void EditUndoMoveParagraphs::Undo()
     else
         nTmpDest += aTmpRange.Len();
 
-    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( aTmpRange, (USHORT)nTmpDest, 0 ) );
+    EditSelection aNewSel( GetImpEditEngine()->MoveParagraphs( aTmpRange, (sal_uInt16)nTmpDest, 0 ) );
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
 }
 
@@ -471,7 +471,7 @@ void EditUndoMoveParagraphs::Redo()
     GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
 }
 
-EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, USHORT nP,
+EditUndoSetStyleSheet::EditUndoSetStyleSheet( ImpEditEngine* _pImpEE, sal_uInt16 nP,
                         const XubString& rPrevName, SfxStyleFamily ePrevFam,
                         const XubString& rNewName, SfxStyleFamily eNewFam,
                         const SfxItemSet& rPrevParaAttribs )
@@ -502,7 +502,7 @@ void EditUndoSetStyleSheet::Redo()
     lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara );
 }
 
-EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, USHORT nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
+EditUndoSetParaAttribs::EditUndoSetParaAttribs( ImpEditEngine* _pImpEE, sal_uInt16 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems )
     : EditUndo( EDITUNDO_PARAATTRIBS, _pImpEE ), 
       aPrevItems( rPrevItems ),
       aNewItems(rNewItems )
@@ -536,8 +536,8 @@ EditUndoSetAttribs::EditUndoSetAttribs( ImpEditEngine* _pImpEE, const ESelection
     // When EditUndoSetAttribs actually is a RemoveAttribs this could be 
     // /recognize by the empty itemset, but then it would have to be caught in 
     // its own place, which possible a setAttribs does with an empty itemset. 
-    bSetIsRemove = FALSE;
-    bRemoveParaAttribs = FALSE;
+    bSetIsRemove = sal_False;
+    bRemoveParaAttribs = sal_False;
     nRemoveWhich = 0;
     nSpecial = 0;
 }
@@ -546,12 +546,12 @@ EditUndoSetAttribs::~EditUndoSetAttribs()
 {
     // Get Items from Pool...
     SfxItemPool* pPool = aNewAttribs.GetPool();
-    USHORT nContents = aPrevAttribs.Count();
-    for ( USHORT n = 0; n < nContents; n++ )
+    sal_uInt16 nContents = aPrevAttribs.Count();
+    for ( sal_uInt16 n = 0; n < nContents; n++ )
     {
         ContentAttribsInfo* pInf = aPrevAttribs[n];
         DBG_ASSERT( pInf, "Undo_DTOR (SetAttribs): pInf = NULL!" );
-        for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
         {
             EditCharAttrib* pX = pInf->GetPrevCharAttribs()[nAttr];
             DBG_ASSERT( pX, "Undo_DTOR (SetAttribs): pX = NULL!" );
@@ -566,10 +566,10 @@ void EditUndoSetAttribs::Undo()
 {
     DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
     ImpEditEngine* _pImpEE = GetImpEditEngine();
-    BOOL bFields = FALSE;
-    for ( USHORT nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+    sal_Bool bFields = sal_False;
+    for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
     {
-        ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ];
+        ContentAttribsInfo* pInf = aPrevAttribs[ (sal_uInt16)(nPara-aESel.nStartPara) ];
         DBG_ASSERT( pInf, "Undo (SetAttribs): pInf = NULL!" );
 
         // first the paragraph attributes ...
@@ -577,17 +577,17 @@ void EditUndoSetAttribs::Undo()
 
         // Then the character attributes ...
         // Remove all attributes including features, are later re-established.
-        _pImpEE->RemoveCharAttribs( nPara, 0, TRUE );
+        _pImpEE->RemoveCharAttribs( nPara, 0, sal_True );
         DBG_ASSERT( _pImpEE->GetEditDoc().SaveGetObject( nPara ), "Undo (SetAttribs): pNode = NULL!" );
         ContentNode* pNode = _pImpEE->GetEditDoc().GetObject( nPara );
-        for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ )
         {
             EditCharAttrib* pX = pInf->GetPrevCharAttribs()[nAttr];
             DBG_ASSERT( pX, "Redo (SetAttribs): pX = NULL!" );
             // is automatically "poolsized"
             _pImpEE->GetEditDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() );
             if ( pX->Which() == EE_FEATURE_FIELD )
-                bFields = TRUE;
+                bFields = sal_True;
         }
     }
     if ( bFields )
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 9c78f22fbe..b884136635 100644..100755
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -48,14 +48,14 @@ class EditView;
 class EditUndoDelContent : public EditUndo
 {
 private:
-    BOOL 			bDelObject;
-    USHORT			nNode;
+    sal_Bool 			bDelObject;
+    sal_uInt16			nNode;
     ContentNode* 	pContentNode;	// Points to the valid,
                                     // undestroyed object!
 
 public:
                     TYPEINFO();
-                    EditUndoDelContent( ImpEditEngine* pImpEE, ContentNode* pNode, USHORT nPortio );
+                    EditUndoDelContent( ImpEditEngine* pImpEE, ContentNode* pNode, sal_uInt16 nPortio );
                     ~EditUndoDelContent();
 
     virtual void 	Undo();
@@ -68,8 +68,8 @@ public:
 class EditUndoConnectParas : public EditUndo
 {
 private:
-    USHORT			nNode;
-    USHORT			nSepPos;
+    sal_uInt16			nNode;
+    sal_uInt16			nSepPos;
     SfxItemSet		aLeftParaAttribs;
     SfxItemSet		aRightParaAttribs;
 
@@ -79,13 +79,13 @@ private:
     SfxStyleFamily	eLeftStyleFamily;
     SfxStyleFamily	eRightStyleFamily;
 
-    BOOL			bBackward;
+    sal_Bool			bBackward;
 
 public:
                     TYPEINFO();
-                    EditUndoConnectParas( ImpEditEngine* pImpEE, USHORT nNode, USHORT nSepPos,
+                    EditUndoConnectParas( ImpEditEngine* pImpEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
                                             const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
-                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, BOOL bBackward );
+                                            const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, sal_Bool bBackward );
                     ~EditUndoConnectParas();
 
     virtual void 	Undo();
@@ -98,12 +98,12 @@ public:
 class EditUndoSplitPara : public EditUndo
 {
 private:
-    USHORT			nNode;
-    USHORT			nSepPos;
+    sal_uInt16			nNode;
+    sal_uInt16			nSepPos;
 
 public:
                     TYPEINFO();
-                    EditUndoSplitPara( ImpEditEngine* pImpEE, USHORT nNode, USHORT nSepPos );
+                    EditUndoSplitPara( ImpEditEngine* pImpEE, sal_uInt16 nNode, sal_uInt16 nSepPos );
                     ~EditUndoSplitPara();
 
     virtual void 	Undo();
@@ -129,7 +129,7 @@ public:
     virtual void 	Undo();
     virtual void 	Redo();
 
-    virtual BOOL	Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool	Merge( SfxUndoAction *pNextAction );
 };
 
 // -----------------------------------------------------------------------
@@ -178,11 +178,11 @@ class EditUndoMoveParagraphs: public EditUndo
 {
 private:
     Range			nParagraphs;
-    USHORT 			nDest;
+    sal_uInt16 			nDest;
 
 public:
                     TYPEINFO();
-                    EditUndoMoveParagraphs( ImpEditEngine* pImpEE, const Range& rParas, USHORT nDest );
+                    EditUndoMoveParagraphs( ImpEditEngine* pImpEE, const Range& rParas, sal_uInt16 nDest );
                     ~EditUndoMoveParagraphs();
 
     virtual void	Undo();
@@ -195,7 +195,7 @@ public:
 class EditUndoSetStyleSheet: public EditUndo
 {
 private:
-    USHORT			nPara;
+    sal_uInt16			nPara;
     XubString		aPrevName;
     XubString		aNewName;
     SfxStyleFamily	ePrevFamily;
@@ -205,7 +205,7 @@ private:
 public:
                     TYPEINFO();
                     
-                    EditUndoSetStyleSheet( ImpEditEngine* pImpEE, USHORT nPara,
+                    EditUndoSetStyleSheet( ImpEditEngine* pImpEE, sal_uInt16 nPara,
                         const XubString& rPrevName, SfxStyleFamily ePrevFamily,
                         const XubString& rNewName, SfxStyleFamily eNewFamily,
                         const SfxItemSet& rPrevParaAttribs );
@@ -221,13 +221,13 @@ public:
 class EditUndoSetParaAttribs: public EditUndo
 {
 private:
-    USHORT			nPara;
+    sal_uInt16			nPara;
     SfxItemSet		aPrevItems;
     SfxItemSet		aNewItems;
 
 public:
                     TYPEINFO();
-                    EditUndoSetParaAttribs( ImpEditEngine* pImpEE, USHORT nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
+                    EditUndoSetParaAttribs( ImpEditEngine* pImpEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems );
                     ~EditUndoSetParaAttribs();
 
     virtual void	Undo();
@@ -244,10 +244,10 @@ private:
     SfxItemSet			aNewAttribs;
     ContentInfoArray	aPrevAttribs;
 
-    BYTE				nSpecial;
-    BOOL				bSetIsRemove;
-    BOOL				bRemoveParaAttribs;
-    USHORT				nRemoveWhich;
+    sal_uInt8				nSpecial;
+    sal_Bool				bSetIsRemove;
+    sal_Bool				bRemoveParaAttribs;
+    sal_uInt16				nRemoveWhich;
 
     void				ImpSetSelection( EditView* pView );
 
@@ -260,10 +260,10 @@ public:
     ContentInfoArray&	GetContentInfos()	{ return aPrevAttribs; }
     SfxItemSet&			GetNewAttribs()		{ return aNewAttribs; }
 
-    void				SetSpecial( BYTE n ) 			{ nSpecial = n; }
-    void				SetRemoveAttribs( BOOL b ) 		{ bSetIsRemove = b; }
-    void				SetRemoveParaAttribs( BOOL b )	{ bRemoveParaAttribs = b; }
-    void				SetRemoveWhich( USHORT n )		{ nRemoveWhich = n; }
+    void				SetSpecial( sal_uInt8 n ) 			{ nSpecial = n; }
+    void				SetRemoveAttribs( sal_Bool b ) 		{ bSetIsRemove = b; }
+    void				SetRemoveParaAttribs( sal_Bool b )	{ bRemoveParaAttribs = b; }
+    void				SetRemoveWhich( sal_uInt16 n )		{ nRemoveWhich = n; }
 
     virtual void		Undo();
     virtual void		Redo();
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 0707f21c7f..c62bb669b6 100644..100755
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -46,7 +46,7 @@
 
 #include <svl/srchitem.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <impedit.hxx>
@@ -150,10 +150,10 @@ LanguageType lcl_CheckLanguage(
         lang::Locale a3( SvxCreateLocale( aLangList[3] ) );
 #endif
 
-        INT32   nCount = SAL_N_ELEMENTS(aLangList);
-        for (INT32 i = 0;  i < nCount;  i++)
+        sal_Int32   nCount = SAL_N_ELEMENTS(aLangList);
+        for (sal_Int32 i = 0;  i < nCount;  i++)
         {
-            INT16 nTmpLang = aLangList[i];
+            sal_Int16 nTmpLang = aLangList[i];
             if (nTmpLang != LANGUAGE_NONE  &&  nTmpLang != LANGUAGE_DONTKNOW)
             {
                 if (xSpell->hasLanguage( nTmpLang ) &&
@@ -297,7 +297,7 @@ void EditView::DeleteSelected()
     pImpEditView->DeleteSelected();
 }
 
-USHORT EditView::GetSelectedScriptType() const
+sal_uInt16 EditView::GetSelectedScriptType() const
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -478,7 +478,7 @@ void EditView::HideCursor()
     pImpEditView->GetCursor()->Hide();
 }
 
-Pair EditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
+Pair EditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -578,7 +578,7 @@ void EditView::Redo()
     PIMPEE->Redo( this );
 }
 
-ULONG EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -602,7 +602,7 @@ ULONG EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFo
 }
 
 #ifndef SVX_LIGHT
-ULONG EditView::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong EditView::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -735,7 +735,7 @@ void EditView::MoveParagraphs( long nDiff )
         nDest++;
     DBG_ASSERT( ( nDest >= 0 ) && ( nDest <= pImpEditView->pEditEngine->GetParagraphCount() ), "MoveParagraphs - wrong Parameters!" );
     MoveParagraphs( aRange,
-        sal::static_int_cast< USHORT >( nDest ) );
+        sal::static_int_cast< sal_uInt16 >( nDest ) );
 }
 
 void EditView::SetBackgroundColor( const Color& rColor )
@@ -786,7 +786,7 @@ void EditView::InsertText( const EditTextObject& rTextObject )
     PIMPEE->FormatAndUpdate( this );
 }
 
-void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, BOOL bUseSpecial )
+void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, sal_Bool bUseSpecial )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -803,7 +803,7 @@ void EditView::InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::d
 
 sal_Bool EditView::Drop( const DropEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 ESelection EditView::GetDropPos()
@@ -814,7 +814,7 @@ ESelection EditView::GetDropPos()
 
 sal_Bool EditView::QueryDrop( DropEvent& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
@@ -965,7 +965,7 @@ EESpellState EditView::StartThesaurus()
 
 void EditView::StartTextConversion(
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-        INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
+        sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
 #ifdef SVX_LIGHT
 #else
@@ -1063,7 +1063,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         Sequence< PropertyValue > aPropVals(1);
         PropertyValue &rVal = aPropVals.getArray()[0];
         rVal.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_MAX_NUMBER_OF_SUGGESTIONS ));
-        rVal.Value <<= (INT16) 7;
+        rVal.Value <<= (sal_Int16) 7;
         //
         // Are there any replace suggestions?
         Reference< XSpellAlternatives >  xSpellAlt =
@@ -1123,7 +1123,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         if (xSpellAlt.is())
             aAlt = xSpellAlt->getAlternatives();
         const OUString *pAlt = aAlt.getConstArray();
-        sal_uInt16 nWords = (USHORT) aAlt.getLength();
+        sal_uInt16 nWords = (sal_uInt16) aAlt.getLength();
         if ( nWords )
         {
             for ( sal_uInt16 nW = 0; nW < nWords; nW++ )
@@ -1154,7 +1154,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
             aDics = xDicList->getDictionaries();
             pDic  = aDics.getConstArray();
             sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 );
-            sal_uInt16 nDicCount = (USHORT)aDics.getLength();
+            sal_uInt16 nDicCount = (sal_uInt16)aDics.getLength();
             for (sal_uInt16 i = 0; i < nDicCount; i++)
             {
                 uno::Reference< linguistic2::XDictionary >  xDicTmp( pDic[i], uno::UNO_QUERY );
@@ -1170,7 +1170,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
                 {
                     // the extra 1 is because of the (possible) external
                     // linguistic entry above
-                    USHORT nPos = MN_DICTSTART + i;
+                    sal_uInt16 nPos = MN_DICTSTART + i;
                     pInsertMenu->InsertItem( nPos, xDicTmp->getName() );
 
                     uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY );
@@ -1477,7 +1477,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
 
     if( aSel.HasRange() )
     {
-        for( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+        for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
         {
             SvUShorts aPortions;
             rEditEngine.GetPortions( nPara, aPortions );
@@ -1485,13 +1485,13 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
             if( aPortions.Count() == 0 )
                 aPortions.Insert( rEditEngine.GetTextLen(nPara), 0 );
 
-            const USHORT nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0;
-            const USHORT nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff;
+            const sal_uInt16 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0;
+            const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff;
 
-            for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+            for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
             {
-                USHORT nPortionEnd   = aPortions.GetObject( nPos );
-                USHORT nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+                sal_uInt16 nPortionEnd   = aPortions.GetObject( nPos );
+                sal_uInt16 nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
                 if( (nPortionEnd < nBeginPos) || (nPortionStart > nEndPos) )
                     continue;
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 4863a8d55e..73ea1f7abc 100644..100755
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -224,7 +224,7 @@ WrongList::~WrongList()
 {
 }
 
-void WrongList::MarkInvalid( USHORT nS, USHORT nE )
+void WrongList::MarkInvalid( sal_uInt16 nS, sal_uInt16 nE )
 {
     if ( ( nInvalidStart == NOT_INVALID ) || ( nInvalidStart > nS ) )
         nInvalidStart = nS;
@@ -499,7 +499,7 @@ bool WrongList::operator==(const WrongList& rCompare) const
         return false;
     }
 
-    for(USHORT a(0); a < Count(); a++)
+    for(sal_uInt16 a(0); a < Count(); a++)
     {
         const WrongRange& rCandA(GetObject(a));
         const WrongRange& rCandB(rCompare.GetObject(a));
@@ -650,8 +650,8 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
 
 sal_Bool EdtAutoCorrDoc::HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd )
 {
-    USHORT nScriptType = pImpEE->GetScriptType( EditPaM( pCurNode, nStt ) );
-    USHORT nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
+    sal_uInt16 nScriptType = pImpEE->GetScriptType( EditPaM( pCurNode, nStt ) );
+    sal_uInt16 nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
 
     CharAttribArray& rAttribs = pCurNode->GetCharAttribs().GetAttribs();
     sal_uInt16 nAttrs = rAttribs.Count();
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 207a34efc9..bba15ef230 100644..100755
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -53,13 +53,13 @@ private:
 
 protected:
     virtual	void			SpellStart( SvxSpellArea eArea );
-    virtual	BOOL 			SpellContinue();	// Check area
-    virtual void 			ReplaceAll( const String &rNewText, INT16 nLanguage );
+    virtual	sal_Bool 			SpellContinue();	// Check area
+    virtual void 			ReplaceAll( const String &rNewText, sal_Int16 nLanguage );
     virtual void			SpellEnd();
-    virtual BOOL			SpellMore();
-    virtual	BOOL			HasOtherCnt();
+    virtual sal_Bool			SpellMore();
+    virtual	sal_Bool			HasOtherCnt();
     virtual void			ScrollArea();
-    virtual void            ChangeWord( const String& rNewWord, const USHORT nLang );
+    virtual void            ChangeWord( const String& rNewWord, const sal_uInt16 nLang );
     virtual void            ChangeThesWord( const String& rNewWord );
     virtual void            AutoCorrect( const String& rOldWord, const String& rNewWord );
 
@@ -67,18 +67,18 @@ public:
     EditSpellWrapper( Window* pWin,
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
-            BOOL bIsStart,
-            BOOL bIsAllRight, EditView* pView );
+            sal_Bool bIsStart,
+            sal_Bool bIsAllRight, EditView* pView );
 
 };
 
 
 struct WrongRange
 {
-    USHORT nStart;
-    USHORT nEnd;
+    sal_uInt16 nStart;
+    sal_uInt16 nEnd;
 
-    WrongRange( USHORT nS, USHORT nE ) { nStart = nS; nEnd = nE; }
+    WrongRange( sal_uInt16 nS, sal_uInt16 nE ) { nStart = nS; nEnd = nE; }
 };
 
 SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 )
@@ -87,41 +87,41 @@ SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 )
 class WrongList : private WrongRanges
 {
 private:
-    USHORT 	nInvalidStart;
-    USHORT 	nInvalidEnd;
+    sal_uInt16 	nInvalidStart;
+    sal_uInt16 	nInvalidEnd;
 
-    BOOL	DbgIsBuggy() const;
+    sal_Bool	DbgIsBuggy() const;
 
 public:
             WrongList();
             ~WrongList();
 
-    BOOL	IsInvalid() const 		{ return nInvalidStart != NOT_INVALID; }
+    sal_Bool	IsInvalid() const 		{ return nInvalidStart != NOT_INVALID; }
     void 	SetValid() 				{ nInvalidStart = NOT_INVALID; nInvalidEnd = 0; }
-    void	MarkInvalid( USHORT nS, USHORT nE );
+    void	MarkInvalid( sal_uInt16 nS, sal_uInt16 nE );
 
-    USHORT			Count() const 				{ return WrongRanges::Count(); }
+    sal_uInt16			Count() const 				{ return WrongRanges::Count(); }
 
-    // When one knos what to do:
-    WrongRange&		GetObject( USHORT n ) const	{ return WrongRanges::GetObject( n ); }
-    void			InsertWrong( const WrongRange& rWrong, USHORT nPos );
+    // When one knows what to do:
+    WrongRange&		GetObject( sal_uInt16 n ) const	{ return WrongRanges::GetObject( n ); }
+    void			InsertWrong( const WrongRange& rWrong, sal_uInt16 nPos );
 
-    USHORT	GetInvalidStart() const	{ return nInvalidStart; }
-    USHORT&	GetInvalidStart() 		{ return nInvalidStart; }
+    sal_uInt16	GetInvalidStart() const	{ return nInvalidStart; }
+    sal_uInt16&	GetInvalidStart() 		{ return nInvalidStart; }
 
-    USHORT	GetInvalidEnd() const 	{ return nInvalidEnd; }
-    USHORT&	GetInvalidEnd() 		{ return nInvalidEnd; }
+    sal_uInt16	GetInvalidEnd() const 	{ return nInvalidEnd; }
+    sal_uInt16&	GetInvalidEnd() 		{ return nInvalidEnd; }
 
-    void	TextInserted( USHORT nPos, USHORT nChars, BOOL bPosIsSep );
-    void	TextDeleted( USHORT nPos, USHORT nChars );
+    void	TextInserted( sal_uInt16 nPos, sal_uInt16 nChars, sal_Bool bPosIsSep );
+    void	TextDeleted( sal_uInt16 nPos, sal_uInt16 nChars );
 
     void	ResetRanges() 			{ Remove( 0, Count() ); }
-    BOOL	HasWrongs() const 		{ return Count() != 0; }
-    void	InsertWrong( USHORT nStart, USHORT nEnd, BOOL bClearRange );
-    BOOL	NextWrong( USHORT& rnStart, USHORT& rnEnd ) const;
-    BOOL	HasWrong( USHORT nStart, USHORT nEnd ) const;
-    BOOL	HasAnyWrong( USHORT nStart, USHORT nEnd ) const;
-    void	ClearWrongs( USHORT nStart, USHORT nEnd, const ContentNode* pNode );
+    sal_Bool	HasWrongs() const 		{ return Count() != 0; }
+    void	InsertWrong( sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bClearRange );
+    sal_Bool	NextWrong( sal_uInt16& rnStart, sal_uInt16& rnEnd ) const;
+    sal_Bool	HasWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const;
+    sal_Bool	HasAnyWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const;
+    void	ClearWrongs( sal_uInt16 nStart, sal_uInt16 nEnd, const ContentNode* pNode );
     void	MarkWrongsInvalid();
 
     WrongList*	Clone() const;
@@ -130,7 +130,7 @@ public:
     bool operator==(const WrongList& rCompare) const;
 };
 
-inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos )
+inline void WrongList::InsertWrong( const WrongRange& rWrong, sal_uInt16 nPos )
 {
     WrongRanges::Insert( rWrong, nPos );
 #ifdef DBG_UTIL
@@ -144,35 +144,35 @@ class EdtAutoCorrDoc : public SvxAutoCorrDoc
 {
     ImpEditEngine* 	pImpEE;
     ContentNode*	pCurNode;
-    USHORT			nCursor;
+    sal_uInt16			nCursor;
 
-    BOOL			bAllowUndoAction;
-    BOOL			bUndoAction;
+    sal_Bool			bAllowUndoAction;
+    sal_Bool			bUndoAction;
 
 protected:
     void			ImplStartUndoAction();
 
 public:
-                    EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, USHORT nCrsr, xub_Unicode cIns );
+                    EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, sal_uInt16 nCrsr, xub_Unicode cIns );
                     ~EdtAutoCorrDoc();
 
-    virtual BOOL 	Delete( USHORT nStt, USHORT nEnd );
-    virtual BOOL 	Insert( USHORT nPos, const String& rTxt );
-    virtual BOOL 	Replace( USHORT nPos, const String& rTxt );
+    virtual sal_Bool 	Delete( sal_uInt16 nStt, sal_uInt16 nEnd );
+    virtual sal_Bool 	Insert( sal_uInt16 nPos, const String& rTxt );
+    virtual sal_Bool 	Replace( sal_uInt16 nPos, const String& rTxt );
 
-    virtual BOOL 	SetAttr( USHORT nStt, USHORT nEnd, USHORT nSlotId, SfxPoolItem& );
-    virtual BOOL 	SetINetAttr( USHORT nStt, USHORT nEnd, const String& rURL );
+    virtual sal_Bool 	SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, sal_uInt16 nSlotId, SfxPoolItem& );
+    virtual sal_Bool 	SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, const String& rURL );
 
-    virtual BOOL 	HasSymbolChars( USHORT nStt, USHORT nEnd );
+    virtual sal_Bool 	HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd );
 
-    virtual const String* GetPrevPara( BOOL bAtNormalPos );
+    virtual const String* GetPrevPara( sal_Bool bAtNormalPos );
 
-    virtual BOOL 	ChgAutoCorrWord( USHORT& rSttPos, USHORT nEndPos,
+    virtual sal_Bool 	ChgAutoCorrWord( sal_uInt16& rSttPos, sal_uInt16 nEndPos,
                                   SvxAutoCorrect& rACorrect, const String** ppPara );
 
-    virtual LanguageType GetLanguage( USHORT nPos, BOOL bPrevPara = FALSE ) const;
+    virtual LanguageType GetLanguage( sal_uInt16 nPos, sal_Bool bPrevPara = sal_False ) const;
 
-    USHORT			GetCursor() const { return nCursor; }
+    sal_uInt16			GetCursor() const { return nCursor; }
 
 };
 
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 6c0ec4f708..c34d540188 100644..100755
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -57,15 +57,15 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu
 {
     pImpEditEngine = 0;
     pCurAnchor = 0;
-    bInPara = FALSE;
-    bWasInPara = FALSE;
+    bInPara = sal_False;
+    bWasInPara = sal_False;
     nInTable = 0;
     nInCell = 0;
-    bInTitle = FALSE;
+    bInTitle = sal_False;
     nDefListLevel = 0;
     nBulletLevel = 0;
     nNumberingLevel = 0;
-    bFieldsInserted = FALSE;
+    bFieldsInserted = sal_False;
 
     DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW == GetSrcEncoding( ), "EditHTMLParser::EditHTMLParser: Where does the encoding come from?" );
     DBG_ASSERT( !IsSwitchToUCS2(), "EditHTMLParser::::EditHTMLParser: Switch to UCS2?" );
@@ -75,7 +75,7 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValu
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
 
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 
     if ( pHTTPHeaderAttrs )
         SetEncodingByHTTPHeader( pHTTPHeaderAttrs );
@@ -129,16 +129,16 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_META:
     {
         const HTMLOptions *_pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
-        BOOL bEquiv = FALSE;
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        sal_uInt16 nArrLen = _pOptions->Count();
+        sal_Bool bEquiv = sal_False;
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption *pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
             {
                 case HTML_O_HTTPEQUIV:
                 {
-                    bEquiv = TRUE;
+                    bEquiv = sal_True;
                 }
                 break;
                 case HTML_O_CONTENT:
@@ -158,11 +158,11 @@ void EditHTMLParser::NextToken( int nToken )
     break;
     case HTML_PLAINTEXT_ON:
     case HTML_PLAINTEXT2_ON:
-        bInPara = TRUE;
+        bInPara = sal_True;
     break;
     case HTML_PLAINTEXT_OFF:
     case HTML_PLAINTEXT2_OFF:
-        bInPara = FALSE;
+        bInPara = sal_False;
     break;
 
     case HTML_LINEBREAK:
@@ -195,7 +195,7 @@ void EditHTMLParser::NextToken( int nToken )
         if (!bInTitle)
         {
             if ( !bInPara )
-                StartPara( FALSE );
+                StartPara( sal_False );
 
             // if ( bInPara || pCurAnchor )
 
@@ -213,7 +213,7 @@ void EditHTMLParser::NextToken( int nToken )
                 // Only written until HTML with 319?
                 if ( IsReadPRE() )
                 {
-                    USHORT nTabPos = aText.Search( '\t', 0 );
+                    sal_uInt16 nTabPos = aText.Search( '\t', 0 );
                     while ( nTabPos != STRING_NOTFOUND )
                     {
                         aText.Erase( nTabPos, 1 );
@@ -230,7 +230,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_CENTER_ON:
     case HTML_CENTER_OFF:
                             {
-                                USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+                                sal_uInt16 nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
                                 SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
                                 aItems.ClearItem( EE_PARA_JUST );
                                 if ( nToken == HTML_CENTER_ON )
@@ -246,13 +246,13 @@ void EditHTMLParser::NextToken( int nToken )
 
     case HTML_PARABREAK_ON:
         if( bInPara && HasTextInCurrentPara() )
-            EndPara( TRUE );
-        StartPara( TRUE );
+            EndPara( sal_True );
+        StartPara( sal_True );
         break;
 
     case HTML_PARABREAK_OFF:
         if( bInPara )
-            EndPara( TRUE );
+            EndPara( sal_True );
         break;
 
     case HTML_HEAD1_ON:
@@ -281,7 +281,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_XMP_ON:
     case HTML_LISTING_ON:
     {
-        StartPara( TRUE );
+        StartPara( sal_True );
         ImpSetStyleSheet( STYLE_PRE );
     }
     break;
@@ -320,10 +320,10 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_ORDERLIST_ON:
     case HTML_UNORDERLIST_ON:
     {
-        BOOL bHasText = HasTextInCurrentPara();
+        sal_Bool bHasText = HasTextInCurrentPara();
         if ( bHasText )
             ImpInsertParaBreak();
-        StartPara( FALSE );
+        StartPara( sal_False );
     }
     break;
 
@@ -339,7 +339,7 @@ void EditHTMLParser::NextToken( int nToken )
     case HTML_DD_OFF:
     case HTML_DT_OFF:
     case HTML_ORDERLIST_OFF:
-    case HTML_UNORDERLIST_OFF:	EndPara( FALSE );
+    case HTML_UNORDERLIST_OFF:	EndPara( sal_False );
                                 break;
 
     case HTML_TABLEROW_ON:
@@ -355,10 +355,10 @@ void EditHTMLParser::NextToken( int nToken )
                             break;
 
     case HTML_TITLE_ON:
-        bInTitle = TRUE;
+        bInTitle = sal_True;
         break;
     case HTML_TITLE_OFF:
-        bInTitle = FALSE;
+        bInTitle = sal_False;
         break;
 
     // globals
@@ -553,7 +553,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
     }
 
     ContentNode* pSN = aStartPaM.GetNode();
-    USHORT nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
+    sal_uInt16 nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
 
     // If an attribute goes from 0 to current Paragraph length, 
     // then it should be a paragraph attribute!
@@ -564,7 +564,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
     // not really HTML:
 #ifdef DBG_UTIL
     ContentNode* pEN = aEndPaM.GetNode();
-    USHORT nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
+    sal_uInt16 nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
     DBG_ASSERT( nStartNode == nEndNode, "ImpSetAttribs: Several paragraphs?" );
 #endif
     if ( ( aStartPaM.GetIndex() == 0 ) && ( aEndPaM.GetIndex() == aEndPaM.GetNode()->Len() ) )
@@ -578,7 +578,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
         pImpEditEngine->SetAttribs( EditSelection( aStartPaM, aEndPaM ), rItems );
 }
 
-void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
+void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
 {
     /*
         nHLevel:	0: 			Turn off
@@ -589,8 +589,7 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
     // Enough for Calc, would have to be clarified with StyleSheets 
     // that they should also be in the app so that when they are feed 
     // in a different engine still are here ...
-
-    USHORT nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+    sal_uInt16 nNode = pImpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
 
     SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
 
@@ -693,7 +692,7 @@ void EditHTMLParser::SkipGroup( int nEndToken )
     // groups in cells are closed upon leaving the cell, because those
     // ******* web authors don't know their job
     // for example: <td><form></td>   lacks a closing </form>
-    BYTE nCellLevel = nInCell;
+    sal_uInt8 nCellLevel = nInCell;
     int nToken;
     while( nCellLevel <= nInCell && ( (nToken = GetNextToken() ) != nEndToken ) && nToken )
     {
@@ -712,14 +711,14 @@ void EditHTMLParser::SkipGroup( int nEndToken )
     }
 }
 
-void EditHTMLParser::StartPara( BOOL bReal )
+void EditHTMLParser::StartPara( sal_Bool bReal )
 {
     if ( bReal )
     {
         const HTMLOptions *_pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
+        sal_uInt16 nArrLen = _pOptions->Count();
         SvxAdjust eAdjust = SVX_ADJUST_LEFT;
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption *pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
@@ -742,33 +741,33 @@ void EditHTMLParser::StartPara( BOOL bReal )
         aItemSet.Put( SvxAdjustItem( eAdjust, EE_PARA_JUST ) );
         ImpSetAttribs( aItemSet );
     }
-    bInPara = TRUE;
+    bInPara = sal_True;
 }
 
-void EditHTMLParser::EndPara( BOOL )
+void EditHTMLParser::EndPara( sal_Bool )
 {
     if ( bInPara )
     {
-        BOOL bHasText = HasTextInCurrentPara();
+        sal_Bool bHasText = HasTextInCurrentPara();
         if ( bHasText )
             ImpInsertParaBreak();
     }
-    bInPara = FALSE;
+    bInPara = sal_False;
 }
 
-BOOL EditHTMLParser::ThrowAwayBlank()
+sal_Bool EditHTMLParser::ThrowAwayBlank()
 {
     // A blank must be thrown away if the new text begins with a Blank and 
     // if the current paragraph is empty or ends with a Blank...
     ContentNode* pNode = aCurSel.Max().GetNode();
     if ( pNode->Len() && ( pNode->GetChar( pNode->Len()-1 ) != ' ' ) )
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
-BOOL EditHTMLParser::HasTextInCurrentPara()
+sal_Bool EditHTMLParser::HasTextInCurrentPara()
 {
-    return aCurSel.Max().GetNode()->Len() ? TRUE : FALSE;
+    return aCurSel.Max().GetNode()->Len() ? sal_True : sal_False;
 }
 
 void EditHTMLParser::AnchorStart()
@@ -777,11 +776,11 @@ void EditHTMLParser::AnchorStart()
     if ( !pCurAnchor )
     {
         const HTMLOptions* _pOptions = GetOptions();
-        USHORT nArrLen = _pOptions->Count();
+        sal_uInt16 nArrLen = _pOptions->Count();
 
         String aRef;
 
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption* pOption = (*_pOptions)[i];
             switch( pOption->GetToken() )
@@ -815,7 +814,7 @@ void EditHTMLParser::AnchorEnd()
         // Insert as URL-Field...
         SvxFieldItem aFld( SvxURLField( pCurAnchor->aHRef, pCurAnchor->aText, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD  );
         aCurSel = pImpEditEngine->InsertField( aCurSel, aFld );
-        bFieldsInserted = TRUE;
+        bFieldsInserted = sal_True;
         delete pCurAnchor;
         pCurAnchor = 0;
 
@@ -830,12 +829,12 @@ void EditHTMLParser::AnchorEnd()
 void EditHTMLParser::HeadingStart( int nToken )
 {
     bWasInPara = bInPara;
-    StartPara( FALSE );
+    StartPara( sal_False );
 
     if ( bWasInPara && HasTextInCurrentPara() )
         ImpInsertParaBreak();
 
-    USHORT nId = sal::static_int_cast< USHORT >(
+    sal_uInt16 nId = sal::static_int_cast< sal_uInt16 >(
         1 + ( ( nToken - HTML_HEAD1_ON ) / 2 ) );
     DBG_ASSERT( (nId >= 1) && (nId <= 9), "HeadingStart: ID can not be correct!" );
     ImpSetStyleSheet( nId );
@@ -843,13 +842,13 @@ void EditHTMLParser::HeadingStart( int nToken )
 
 void EditHTMLParser::HeadingEnd( int )
 {
-    EndPara( FALSE );
+    EndPara( sal_False );
     ImpSetStyleSheet( 0 );
 
     if ( bWasInPara )
     {
-        bInPara = TRUE;
-        bWasInPara = FALSE;
+        bInPara = sal_True;
+        bWasInPara = sal_False;
     }
 }
 
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index ab4d42803a..43d55cdfd8 100644..100755
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -53,34 +53,34 @@ private:
     ImpEditEngine* 			pImpEditEngine;
     AnchorInfo*				pCurAnchor;
 
-    BOOL					bInPara;
-    BOOL					bWasInPara;	// Remember bInPara before HeadingStart, because afterwards it will be gone.
-    BOOL					bFieldsInserted;
-    BYTE					nInTable;
-    BYTE					nInCell;
-    BOOL                    bInTitle;
+    sal_Bool					bInPara;
+    sal_Bool					bWasInPara;	// Remember bInPara before HeadingStart, because afterwards it will be gone.
+    sal_Bool					bFieldsInserted;
+    sal_uInt8					nInTable;
+    sal_uInt8					nInCell;
+    sal_Bool                    bInTitle;
 
-    BYTE					nDefListLevel;
-    BYTE					nBulletLevel;
-    BYTE					nNumberingLevel;
+    sal_uInt8					nDefListLevel;
+    sal_uInt8					nBulletLevel;
+    sal_uInt8					nNumberingLevel;
 
-    BYTE					nLastAction;
+    sal_uInt8					nLastAction;
 
-    void					StartPara( BOOL bReal );
-    void					EndPara( BOOL bReal );
+    void					StartPara( sal_Bool bReal );
+    void					EndPara( sal_Bool bReal );
     void					AnchorStart();
     void					AnchorEnd();
     void					HeadingStart( int nToken );
     void					HeadingEnd( int nToken );
     void					SkipGroup( int nEndToken );
-    BOOL					ThrowAwayBlank();
-    BOOL					HasTextInCurrentPara();
-    void					ProcessUnknownControl( BOOL bOn );
+    sal_Bool					ThrowAwayBlank();
+    sal_Bool					HasTextInCurrentPara();
+    void					ProcessUnknownControl( sal_Bool bOn );
 
     void					ImpInsertParaBreak();
     void 					ImpInsertText( const String& rText );
     void 					ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSel = 0 );
-    void					ImpSetStyleSheet( USHORT nHeadingLevel );
+    void					ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
 
 protected:
     virtual void 			NextToken( int nToken );
diff --git a/editeng/source/editeng/eeng_pch.cxx b/editeng/source/editeng/eeng_pch.cxx
index 31a3b5e376..31a3b5e376 100644..100755
--- a/editeng/source/editeng/eeng_pch.cxx
+++ b/editeng/source/editeng/eeng_pch.cxx
diff --git a/editeng/source/editeng/eeng_pch.hxx b/editeng/source/editeng/eeng_pch.hxx
index 1ae7d8beed..1ae7d8beed 100644..100755
--- a/editeng/source/editeng/eeng_pch.hxx
+++ b/editeng/source/editeng/eeng_pch.hxx
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index b014ab71a2..cbe5e85fe0 100644..100755
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -62,7 +62,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
 {
     uno::Any aAny;
 
-    ULONG nT = SotExchange::GetFormat( rFlavor );
+    sal_uLong nT = SotExchange::GetFormat( rFlavor );
     if ( nT == SOT_FORMAT_STRING )
     {
         aAny <<= (::rtl::OUString)GetString();
@@ -75,7 +75,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
 
         SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
         pStream->Seek( STREAM_SEEK_TO_END );
-        ULONG nLen = pStream->Tell();
+        sal_uLong nLen = pStream->Tell();
         pStream->Seek(0);
 
         uno::Sequence< sal_Int8 > aSeq( nLen );
@@ -105,7 +105,7 @@ sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor&
 {
     sal_Bool bSupported = sal_False;
 
-    ULONG nT = SotExchange::GetFormat( rFlavor );
+    sal_uLong nT = SotExchange::GetFormat( rFlavor );
     if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) || ( nT == SOT_FORMATSTR_ID_EDITENGINE ) )
         bSupported = sal_True;
 
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 5629721ecc..5629721ecc 100644..100755
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index c87436272b..c7b10ac961 100644..100755
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -99,7 +99,7 @@ GlobalEditData::~GlobalEditData()
     // Destroy DefItems...
     // Or simply keep them, since at end of excecution?!
     if ( ppDefItems )
-        SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, TRUE );
+        SfxItemPool::ReleaseDefaults( ppDefItems, EDITITEMCOUNT, sal_True );
     delete pStdRefDevice;
 }
 
@@ -110,56 +110,54 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
 
         // Paragraph attributes:
-        SvxNumRule aTmpNumRule( 0, 0, FALSE );
+        SvxNumRule aTmpNumRule( 0, 0, sal_False );
 
         ppDefItems[0]  = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR );
         ppDefItems[1]  = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
-        ppDefItems[2]  = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, FALSE );
-        ppDefItems[3]  = new SfxBoolItem( EE_PARA_FORBIDDENRULES, TRUE );
-        ppDefItems[4]  = new SvxScriptSpaceItem( TRUE, EE_PARA_ASIANCJKSPACING );
+        ppDefItems[2]  = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, sal_False );
+        ppDefItems[3]  = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True );
+        ppDefItems[4]  = new SvxScriptSpaceItem( sal_True, EE_PARA_ASIANCJKSPACING );
         ppDefItems[5]  = new SvxNumBulletItem( aTmpNumRule, EE_PARA_NUMBULLET );
-        ppDefItems[6]  = new SfxBoolItem( EE_PARA_HYPHENATE, FALSE );
-        ppDefItems[7]  = new SfxBoolItem( EE_PARA_BULLETSTATE, TRUE );
+        ppDefItems[6]  = new SfxBoolItem( EE_PARA_HYPHENATE, sal_False );
+        ppDefItems[7]  = new SfxBoolItem( EE_PARA_BULLETSTATE, sal_True );
         ppDefItems[8]  = new SvxLRSpaceItem( EE_PARA_OUTLLRSPACE );
         ppDefItems[9]  = new SfxInt16Item( EE_PARA_OUTLLEVEL, -1 );
-        ppDefItems[10] = new SvxBulletItem( EE_PARA_BULLET );
-        ppDefItems[11] = new SvxLRSpaceItem( EE_PARA_LRSPACE );
-        ppDefItems[12] = new SvxULSpaceItem( EE_PARA_ULSPACE );
-        ppDefItems[13] = new SvxLineSpacingItem( 0, EE_PARA_SBL );
-        ppDefItems[14] = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
-        ppDefItems[15] = new SvxTabStopItem( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
-        ppDefItems[16] = new SvxJustifyMethodItem( SVX_JUSTIFY_METHOD_AUTO, EE_PARA_JUST_METHOD );
-        ppDefItems[17] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD, EE_PARA_VER_JUST );
+        ppDefItems[10]  = new SvxBulletItem( EE_PARA_BULLET );
+        ppDefItems[11]  = new SvxLRSpaceItem( EE_PARA_LRSPACE );
+        ppDefItems[12]  = new SvxULSpaceItem( EE_PARA_ULSPACE );
+        ppDefItems[13]  = new SvxLineSpacingItem( 0, EE_PARA_SBL );
+        ppDefItems[14]  = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
+        ppDefItems[15]  = new SvxTabStopItem( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
 
         // Character attributes:
-        ppDefItems[18] = new SvxColorItem( Color( COL_AUTO ), EE_CHAR_COLOR );
-        ppDefItems[19] = new SvxFontItem( EE_CHAR_FONTINFO );
-        ppDefItems[20] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
-        ppDefItems[21] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
-        ppDefItems[22] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT );
-        ppDefItems[23] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
-        ppDefItems[24] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
-        ppDefItems[25] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
-        ppDefItems[26] = new SvxContourItem( FALSE, EE_CHAR_OUTLINE );
-        ppDefItems[27] = new SvxShadowedItem( FALSE, EE_CHAR_SHADOW );
-        ppDefItems[28] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
-        ppDefItems[29] = new SvxAutoKernItem( FALSE, EE_CHAR_PAIRKERNING );
-        ppDefItems[30] = new SvxKerningItem( 0, EE_CHAR_KERNING );
-        ppDefItems[31] = new SvxWordLineModeItem( FALSE, EE_CHAR_WLM );
-        ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE );
-        ppDefItems[33] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CJK );
-        ppDefItems[34] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL );
-        ppDefItems[35] = new SvxFontItem( EE_CHAR_FONTINFO_CJK );
-        ppDefItems[36] = new SvxFontItem( EE_CHAR_FONTINFO_CTL );
-        ppDefItems[37] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CJK );
-        ppDefItems[38] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CTL );
-        ppDefItems[39] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK );
-        ppDefItems[40] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL );
-        ppDefItems[41] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK );
-        ppDefItems[42] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL );
-        ppDefItems[43] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK );
-        ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
-        ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
+        ppDefItems[16]  = new SvxColorItem( Color( COL_AUTO ), EE_CHAR_COLOR );
+        ppDefItems[17]  = new SvxFontItem( EE_CHAR_FONTINFO );
+        ppDefItems[18] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
+        ppDefItems[19] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
+        ppDefItems[20] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT );
+        ppDefItems[21] = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
+        ppDefItems[22] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
+        ppDefItems[23] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
+        ppDefItems[24] = new SvxContourItem( sal_False, EE_CHAR_OUTLINE );
+        ppDefItems[25] = new SvxShadowedItem( sal_False, EE_CHAR_SHADOW );
+        ppDefItems[26] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
+        ppDefItems[27] = new SvxAutoKernItem( sal_False, EE_CHAR_PAIRKERNING );
+        ppDefItems[28] = new SvxKerningItem( 0, EE_CHAR_KERNING );
+        ppDefItems[29] = new SvxWordLineModeItem( sal_False, EE_CHAR_WLM );
+        ppDefItems[30] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE );
+        ppDefItems[31] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CJK );
+        ppDefItems[32] = new SvxLanguageItem( LANGUAGE_DONTKNOW, EE_CHAR_LANGUAGE_CTL );
+        ppDefItems[33] = new SvxFontItem( EE_CHAR_FONTINFO_CJK );
+        ppDefItems[34] = new SvxFontItem( EE_CHAR_FONTINFO_CTL );
+        ppDefItems[35] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CJK );
+        ppDefItems[36] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT_CTL );
+        ppDefItems[37] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK );
+        ppDefItems[38] = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL );
+        ppDefItems[39] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK );
+        ppDefItems[40] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL );
+        ppDefItems[41] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK );
+        ppDefItems[42] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
+        ppDefItems[43] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
 #ifndef SVX_LIGHT
         ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
 #else
@@ -221,7 +219,7 @@ OutputDevice* GlobalEditData::GetStdRefDevice()
     return pStdRefDevice;
 }
 
-EditResId::EditResId( USHORT nId ):
+EditResId::EditResId( sal_uInt16 nId ):
     ResId( nId, *EE_DLL()->GetResMgr() )
 {
 }
diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index 43bf536982..43bf536982 100644..100755
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 60856bc149..15f30917e6 100644..100755
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -88,9 +88,9 @@ EditRTFParser::EditRTFParser( SvStream& rIn, EditSelection aSel, SfxItemPool& rA
     SetInsPos( EditPosition( pImpEditEngine, &aCurSel ) );
 
     // Convert the twips values ...
-    SetCalcValue( TRUE );
+    SetCalcValue( sal_True );
     SetChkStyleAttr( pImpEE->GetStatus().DoImportRTFStyleSheets() );
-    SetNewDoc( FALSE );		// So that the Pool-Defaults are not overwritten...
+    SetNewDoc( sal_False );		// So that the Pool-Defaults are not overwritten...
     aEditMapMode = MapMode( pImpEE->GetRefDevice()->GetMapMode().GetMapUnit() );
 }
 
@@ -133,7 +133,7 @@ SvParserState EditRTFParser::CallParser()
     if ( nLastAction == ACTION_INSERTPARABRK )
     {
         ContentNode* pCurNode = aCurSel.Max().GetNode();
-        USHORT nPara = pImpEditEngine->GetEditDoc().GetPos( pCurNode );
+        sal_uInt16 nPara = pImpEditEngine->GetEditDoc().GetPos( pCurNode );
         ContentNode* pPrevNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara-1 );
         DBG_ASSERT( pPrevNode, "Invalid RTF-Document?!" );
         EditSelection aSel;
@@ -143,17 +143,17 @@ SvParserState EditRTFParser::CallParser()
     }
     EditPaM aEnd2PaM( aCurSel.Max() );
     //AddRTFDefaultValues( aStart2PaM, aEnd2PaM );
-    BOOL bOnlyOnePara = ( aEnd2PaM.GetNode() == aStart2PaM.GetNode() );
+    sal_Bool bOnlyOnePara = ( aEnd2PaM.GetNode() == aStart2PaM.GetNode() );
     // Paste the chunk again ...
     // Problem: Paragraph attributes may not possibly be taken over
     // => Do Character attributes.
 
-    BOOL bSpecialBackward = aStart1PaM.GetNode()->Len() ? FALSE : TRUE;
+    sal_Bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? sal_False : sal_True;
     if ( bOnlyOnePara || aStart1PaM.GetNode()->Len() )
         pImpEditEngine->ParaAttribsToCharAttribs( aStart2PaM.GetNode() );
     aCurSel.Min() = pImpEditEngine->ImpConnectParagraphs(
         aStart1PaM.GetNode(), aStart2PaM.GetNode(), bSpecialBackward );
-    bSpecialBackward = aEnd1PaM.GetNode()->Len() ? TRUE : FALSE;
+    bSpecialBackward = aEnd1PaM.GetNode()->Len() ? sal_True : sal_False;
     // when bOnlyOnePara, then the node is gone on Connect.
     if ( !bOnlyOnePara && aEnd1PaM.GetNode()->Len() )
         pImpEditEngine->ParaAttribsToCharAttribs( aEnd2PaM.GetNode() );
@@ -176,9 +176,9 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
     SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetName(),
                     aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
 
-    USHORT nStartPara = pImpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
-    USHORT nEndPara = pImpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    sal_uInt16 nStartPara = pImpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
+    sal_uInt16 nEndPara = pImpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( nPara );
         DBG_ASSERT( pNode, "AddRTFDefaultValues - No paragraph?!" );
@@ -195,12 +195,12 @@ void EditRTFParser::NextToken( int nToken )
     {
         case RTF_DEFF:
         {
-            nDefFont = USHORT(nTokenValue);
+            nDefFont = sal_uInt16(nTokenValue);
         }
         break;
         case RTF_DEFTAB:
         {
-            nDefTab = USHORT(nTokenValue);
+            nDefTab = sal_uInt16(nTokenValue);
         }
         break;
         case RTF_CELL:
@@ -287,14 +287,14 @@ void EditRTFParser::MovePos( int bForward )
 }
 
 void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
-                                    USHORT& rCntPos )
+                                    sal_uInt16& rCntPos )
 {
     // The Intention is to: determine the current insert position of the 
     //                      previous paragraph and set the end from this. 
     //                      This "\pard" always apply on the right paragraph.
 
     ContentNode* pN = aCurSel.Max().GetNode();
-    USHORT nCurPara = pImpEditEngine->GetEditDoc().GetPos( pN );
+    sal_uInt16 nCurPara = pImpEditEngine->GetEditDoc().GetPos( pN );
     DBG_ASSERT( nCurPara != 0, "Paragraph equal to 0: SetEnfPrevPara" );
     if ( nCurPara )
         nCurPara--;
@@ -304,7 +304,7 @@ void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
     rCntPos = pPrevNode->Len();
 }
 
-int EditRTFParser::IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const
+int EditRTFParser::IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const
 {
     return ( nCnt == ( ((EditNodeIdx*)pNd)->GetNode()->Len()) );
 }
@@ -325,12 +325,12 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
     const MapUnit eSrcUnit	= aRTFMapMode.GetMapUnit();
     if (eDestUnit != eSrcUnit)
     {
-        USHORT aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL };
+        sal_uInt16 aFntHeightIems[3] = { EE_CHAR_FONTHEIGHT, EE_CHAR_FONTHEIGHT_CJK, EE_CHAR_FONTHEIGHT_CTL };
         for (int i = 0; i < 2; ++i)
         {
-            if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], FALSE, &pItem ))
+            if (SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( aFntHeightIems[i], sal_False, &pItem ))
             {
-                UINT32 nHeight	= ((SvxFontHeightItem*)pItem)->GetHeight();
+                sal_uInt32 nHeight	= ((SvxFontHeightItem*)pItem)->GetHeight();
                 long nNewHeight;
                 nNewHeight = pImpEditEngine->GetRefDevice()->LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit );
 
@@ -340,7 +340,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
         }
     }
 
-    if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetAttrSet().GetItemState( EE_CHAR_ESCAPEMENT, sal_False, &pItem ))
     {
         // die richtige
         long nEsc = ((SvxEscapementItem*)pItem)->GetEsc();
@@ -367,8 +367,8 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     ContentNode* pSN = aStartPaM.GetNode();
     ContentNode* pEN = aEndPaM.GetNode();
-    USHORT nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
-    USHORT nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
+    sal_uInt16 nStartNode = pImpEditEngine->GetEditDoc().GetPos( pSN );
+    sal_uInt16 nEndNode = pImpEditEngine->GetEditDoc().GetPos( pEN );
     sal_Int16 nOutlLevel = 0xff;
 
     if ( rSet.StyleNo() && pImpEditEngine->GetStyleSheetPool() && pImpEditEngine->GetStatus().DoImportRTFStyleSheets() )
@@ -387,7 +387,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     // Note: Selection can reach over several paragraphs.
     // All Complete paragraphs are paragraph attributes ...
-    for ( USHORT z = nStartNode+1; z < nEndNode; z++ )
+    for ( sal_uInt16 z = nStartNode+1; z < nEndNode; z++ )
     {
         DBG_ASSERT( pImpEditEngine->GetEditDoc().SaveGetObject( z ), "Node does not exist yet(RTF)" );
         pImpEditEngine->SetParaAttribs( z, rSet.GetAttrSet() );
@@ -425,7 +425,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
     // OutlLevel...
     if ( nOutlLevel != 0xff )
     {
-        for ( USHORT n = nStartNode; n <= nEndNode; n++ ) 
+        for ( sal_uInt16 n = nStartNode; n <= nEndNode; n++ ) 
         {
             ContentNode* pNode = pImpEditEngine->GetEditDoc().SaveGetObject( n );
             pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nOutlLevel ) );
@@ -508,8 +508,8 @@ void EditRTFParser::ReadField()
 {
     // From SwRTFParser::ReadField()
     int _nOpenBrakets = 1;		// the first was already detected earlier
-    BOOL bFldInst = FALSE;
-    BOOL bFldRslt = FALSE;
+    sal_Bool bFldInst = sal_False;
+    sal_Bool bFldRslt = sal_False;
     String aFldInst;
     String aFldRslt;
 
@@ -522,8 +522,8 @@ void EditRTFParser::ReadField()
                 _nOpenBrakets--;
                 if ( _nOpenBrakets == 1 )
                 {
-                    bFldInst = FALSE;
-                    bFldRslt = FALSE;
+                    bFldInst = sal_False;
+                    bFldRslt = sal_False;
                 }
             }
             break;
@@ -534,10 +534,10 @@ void EditRTFParser::ReadField()
             case RTF_FIELD:		SkipGroup();
                                 break;
 
-            case RTF_FLDINST:	bFldInst = TRUE;
+            case RTF_FLDINST:	bFldInst = sal_True;
                                 break;
 
-            case RTF_FLDRSLT:	bFldRslt = TRUE;
+            case RTF_FLDRSLT:	bFldRslt = sal_True;
                                 break;
 
             case RTF_TEXTTOKEN:
@@ -599,7 +599,7 @@ void EditRTFParser::SkipGroup()
     SkipToken( -1 );		// the closing brace is evaluated "above" 
 }
 
-ULONG EditNodeIdx::GetIdx() const
+sal_uLong EditNodeIdx::GetIdx() const
 {
     return pImpEditEngine->GetEditDoc().GetPos( pNode );
 }
@@ -619,13 +619,13 @@ SvxNodeIdx* EditPosition::MakeNodeIdx() const
     return new EditNodeIdx( pImpEditEngine, pCurSel->Max().GetNode() );
 }
 
-ULONG EditPosition::GetNodeIdx() const
+sal_uLong EditPosition::GetNodeIdx() const
 {
     ContentNode* pN = pCurSel->Max().GetNode();
     return pImpEditEngine->GetEditDoc().GetPos( pN );
 }
 
-USHORT EditPosition::GetCntIdx() const
+sal_uInt16 EditPosition::GetCntIdx() const
 {
     return pCurSel->Max().GetIndex();
 }
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 73c58a61c1..9f35143309 100644..100755
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -44,7 +44,7 @@ private:
 public:
                         EditNodeIdx( ImpEditEngine* pIEE, ContentNode* pNd = 0)
                             { pImpEditEngine = pIEE; pNode = pNd; }
-    virtual ULONG		GetIdx() const;
+    virtual sal_uLong		GetIdx() const;
     virtual SvxNodeIdx* Clone() const;
     ContentNode*		GetNode() { return pNode; }
 };
@@ -59,8 +59,8 @@ public:
                     EditPosition( ImpEditEngine* pIEE, EditSelection* pSel )
                             { pImpEditEngine = pIEE; pCurSel = pSel; }
 
-    virtual ULONG	GetNodeIdx() const;
-    virtual USHORT	GetCntIdx() const;
+    virtual sal_uLong	GetNodeIdx() const;
+    virtual sal_uInt16	GetCntIdx() const;
 
     // clone
     virtual SvxPosition* Clone() const;
@@ -81,22 +81,22 @@ private:
     MapMode				aRTFMapMode;
     MapMode				aEditMapMode;
 
-    USHORT				nDefFont;
-    USHORT				nDefTab;
-    USHORT				nDefFontHeight;
-    BYTE				nLastAction;
+    sal_uInt16				nDefFont;
+    sal_uInt16				nDefTab;
+    sal_uInt16				nDefFontHeight;
+    sal_uInt8				nLastAction;
 
 protected:
     virtual void 		InsertPara();
     virtual void 		InsertText();
-    virtual void		MovePos( int bForward = TRUE );
+    virtual void		MovePos( int bForward = sal_True );
     virtual void		SetEndPrevPara( SvxNodeIdx*& rpNodePos,
-                                            USHORT& rCntPos );
+                                            sal_uInt16& rCntPos );
 
     virtual void 		UnknownAttrToken( int nToken, SfxItemSet* pSet );
     virtual void 		NextToken( int nToken );
     virtual	void 		SetAttrInDoc( SvxRTFItemStackType &rSet );
-    virtual int 		IsEndPara( SvxNodeIdx* pNd, USHORT nCnt ) const;
+    virtual int 		IsEndPara( SvxNodeIdx* pNd, sal_uInt16 nCnt ) const;
     virtual void 		CalcValue();
     void				CreateStyleSheets();
     SfxStyleSheet*		CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
@@ -115,7 +115,7 @@ public:
     void		SetDestCharSet( CharSet eCharSet )	{ eDestCharSet = eCharSet; }
     CharSet		GetDestCharSet() const				{ return eDestCharSet; }
 
-    USHORT		GetDefTab()	const					{ return nDefTab; }
+    sal_uInt16		GetDefTab()	const					{ return nDefTab; }
     Font		GetDefFont() 						{ return GetFont( nDefFont ); }
 
     EditPaM		GetCurPaM() const					{ return aCurSel.Max(); }
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 39131747e8..01c2da31ad 100644..100755
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -96,7 +96,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
     nInvMore			= 1;
     nTravelXPos			= TRAVEL_X_DONTKNOW;
     nControl 			= EV_CNTRL_AUTOSCROLL | EV_CNTRL_ENABLEPASTE;
-    bActiveDragAndDropListener = FALSE;
+    bActiveDragAndDropListener = sal_False;
 
     aEditSelection.Min() = pEng->pImpEditEngine->GetEditDoc().GetStartPaM();
     aEditSelection.Max() = pEng->pImpEditEngine->GetEditDoc().GetEndPaM();
@@ -210,18 +210,18 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
             EditLine* pLine = pTmpPortion->GetLines().GetObject( nLine );
             DBG_ASSERT( pLine, "Line not found: DrawSelection()" );
 
-            BOOL bPartOfLine = FALSE;
+            sal_Bool bPartOfLine = sal_False;
             sal_uInt16 nStartIndex = pLine->GetStart();
             sal_uInt16 nEndIndex = pLine->GetEnd();
             if ( ( nPara == nStartPara ) && ( nLine == nStartLine ) && ( nStartIndex != aTmpSel.Min().GetIndex() ) )
             {
                 nStartIndex = aTmpSel.Min().GetIndex();
-                bPartOfLine = TRUE;
+                bPartOfLine = sal_True;
             }
             if ( ( nPara == nEndPara ) && ( nLine == nEndLine ) && ( nEndIndex != aTmpSel.Max().GetIndex() ) )
             {
                 nEndIndex = aTmpSel.Max().GetIndex();
-                bPartOfLine = TRUE;
+                bPartOfLine = sal_True;
             }
 
             // Can happen if at the beginning of a wrapped line.
@@ -252,8 +252,8 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
             }
             else
             {
-                USHORT nTmpStartIndex = nStartIndex;
-                USHORT nWritingDirStart, nTmpEndIndex;
+                sal_uInt16 nTmpStartIndex = nStartIndex;
+                sal_uInt16 nWritingDirStart, nTmpEndIndex;
 
                 while ( nTmpStartIndex < nEndIndex )
                 {
@@ -263,7 +263,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
 
                     DBG_ASSERT( nTmpEndIndex > nTmpStartIndex, "DrawSelection, Start >= End?" );
 
-                    long nX1 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpStartIndex, TRUE );
+                    long nX1 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpStartIndex, sal_True );
                     long nX2 = pEditEngine->pImpEditEngine->GetXPos( pTmpPortion, pLine, nTmpEndIndex );
 
                     Point aPt1( Min( nX1, nX2 ), aTopLeft.Y() );
@@ -333,7 +333,7 @@ void ImpEditView::ImplDrawHighlightRect( Window* _pOutWin, const Point& rDocPosT
 }
 
 
-BOOL ImpEditView::IsVertical() const
+sal_Bool ImpEditView::IsVertical() const
 {
     return pEditEngine->pImpEditEngine->IsVertical();
 }
@@ -632,7 +632,7 @@ void ImpEditView::CalcAnchorPoint()
     }
 }
 
-void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags )
+void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_uInt16 nShowCursorFlags )
 {
     // No ShowCursor in an empty View ...
     if ( ( aOutArea.Left() >= aOutArea.Right() ) && ( aOutArea.Top() >= aOutArea.Bottom() ) )
@@ -656,8 +656,8 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
 
     EditPaM aPaM( aEditSelection.Max() );
 
-    USHORT nTextPortionStart = 0;
-    USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+    sal_uInt16 nTextPortionStart = 0;
+    sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
     if (nPara == USHRT_MAX) // #i94322
         return;
     ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
@@ -683,7 +683,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             // If we are behind a portion, and the next portion has other direction, we must change position...
             aEditCursor.Left() = aEditCursor.Right() = pEditEngine->pImpEditEngine->PaMtoEditCursor( aPaM, GETCRSR_TXTONLY|GETCRSR_PREFERPORTIONSTART ).Left();
 
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, TRUE );
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, sal_True );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
             if ( pTextPortion->GetKind() == PORTIONKIND_TAB )
             {
@@ -691,7 +691,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
             }
             else
             {
-                EditPaM aNext = pEditEngine->pImpEditEngine->CursorRight( aPaM, (USHORT)i18n::CharacterIteratorMode::SKIPCELL );
+                EditPaM aNext = pEditEngine->pImpEditEngine->CursorRight( aPaM, (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL );
                 Rectangle aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY );
                 if ( aTmpRect.Top() != aEditCursor.Top() )
                     aTmpRect = pEditEngine->pImpEditEngine->PaMtoEditCursor( aNext, GETCRSR_TXTONLY|GETCRSR_ENDOFLINE );
@@ -852,9 +852,9 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
         unsigned char nCursorDir = CURSOR_DIRECTION_NONE;
         if ( IsInsertMode() && !aEditSelection.HasRange() && ( pEditEngine->pImpEditEngine->HasDifferentRTLLevels( aPaM.GetNode() ) ) )
         {
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? TRUE : FALSE );
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? sal_True : sal_False );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-            USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+            sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
             if ( nRTLLevel%2 )
                 nCursorDir = CURSOR_DIRECTION_RTL;
             else
@@ -868,7 +868,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
         {
             SvxFont aFont;
             pEditEngine->pImpEditEngine->SeekCursor( aPaM.GetNode(), aPaM.GetIndex()+1, aFont );
-            ULONG nContextFlags = INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT;
+            sal_uLong nContextFlags = INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT;
             GetWindow()->SetInputContext( InputContext( aFont, nContextFlags ) );
         }
     }
@@ -881,7 +881,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, US
     }
 }
 
-Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
+Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
 {
     DBG_ASSERT( pEditEngine->pImpEditEngine->IsFormatted(), "Scroll: Not formatted!" );
     if ( !ndX && !ndY )
@@ -928,9 +928,9 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
         aNewVisArea.Left() -= ndY;
         aNewVisArea.Right() -= ndY;
     }
-    if ( ( nRangeCheck == RGCHK_PAPERSZ1 ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) ) )
+    if ( ( nRangeCheck == RGCHK_PAPERSZ1 ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( sal_False ) ) )
     {
-        long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( FALSE ) - aNewVisArea.Right(); 	// negative
+        long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( sal_False ) - aNewVisArea.Right(); 	// negative
         aNewVisArea.Move( nDiff, 0 );	// could end up in the negative area...
     }
     if ( ( aNewVisArea.Left() < 0 ) && ( nRangeCheck != RGCHK_NONE ) )
@@ -989,7 +989,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE nRangeCheck )
 
 sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction();
     if ( eFunc != KEYFUNC_DONTKNOW )
@@ -1010,7 +1010,7 @@ sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin
             {
                 Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard());
                 CutCopy( aClipBoard, sal_False );
-                bDone = TRUE;
+                bDone = sal_True;
             }
             break;
             case KEYFUNC_PASTE:
@@ -1060,7 +1060,7 @@ sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
     else if ( rMouseEvent.IsLeft() && GetEditSelection().HasRange() )
     {
         Reference<com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetPrimarySelection());
-        CutCopy( aClipBoard, FALSE );
+        CutCopy( aClipBoard, sal_False );
     }
 
     return pEditEngine->pImpEditEngine->MouseButtonUp( rMouseEvent, GetEditViewPtr() );
@@ -1178,7 +1178,7 @@ void ImpEditView::DeleteSelected()
 
     SetEditSelection( EditSelection( aPaM, aPaM ) );
     pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
-    ShowCursor( DoAutoScroll(), TRUE );
+    ShowCursor( DoAutoScroll(), sal_True );
 }
 
 const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const
@@ -1214,20 +1214,20 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara,
     return NULL;
 }
 
-BOOL ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
+sal_Bool ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
 {
     if ( pPara )
         *pPara = 0xFFFF;
 
     if( !GetOutputArea().IsInside( rPos ) )
-        return FALSE;
+        return sal_False;
 
     Point aDocPos( GetDocPos( rPos ) );
     EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, sal_False );
 
     if ( aPaM.GetIndex() == 0 )
     {
-        USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+        sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
         Rectangle aBulletArea = pEditEngine->GetBulletArea( nPara );
         long nY = pEditEngine->GetDocPosTopLeft( nPara ).Y();
         ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
@@ -1239,14 +1239,14 @@ BOOL ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
         {
             if ( pPara )
                 *pPara = nPara;
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, BOOL bCut )
+void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bCut )
 {
     if ( rxClipboard.is() && GetEditSelection().HasRange() )
     {
@@ -1279,7 +1279,7 @@ void ImpEditView::CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::d
     }
 }
 
-void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, BOOL bUseSpecial )
+void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bUseSpecial )
 {
     if ( rxClipboard.is() )
     {
@@ -1347,58 +1347,58 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat
             SetEditSelection( aSel );
             pEditEngine->pImpEditEngine->UpdateSelections();
             pEditEngine->pImpEditEngine->FormatAndUpdate( GetEditViewPtr() );
-            ShowCursor( DoAutoScroll(), TRUE );
+            ShowCursor( DoAutoScroll(), sal_True );
         }
     }
 }
 
 
-BOOL ImpEditView::IsInSelection( const EditPaM& rPaM )
+sal_Bool ImpEditView::IsInSelection( const EditPaM& rPaM )
 {
     EditSelection aSel = GetEditSelection();
     if ( !aSel.HasRange() )
-        return FALSE;
+        return sal_False;
 
     aSel.Adjust( pEditEngine->pImpEditEngine->GetEditDoc() );
 
-    USHORT nStartNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
-    USHORT nCurNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
+    sal_uInt16 nStartNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nCurNode = pEditEngine->pImpEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
 
     if ( ( nCurNode > nStartNode ) && ( nCurNode < nEndNode ) )
-        return TRUE;
+        return sal_True;
 
     if ( nStartNode == nEndNode )
     {
         if ( nCurNode == nStartNode )
             if ( ( rPaM.GetIndex() >= aSel.Min().GetIndex() ) && ( rPaM.GetIndex() < aSel.Max().GetIndex() ) )
-                return TRUE;
+                return sal_True;
     }
     else if ( ( nCurNode == nStartNode ) && ( rPaM.GetIndex() >= aSel.Min().GetIndex() ) )
-        return TRUE;
+        return sal_True;
     else if ( ( nCurNode == nEndNode ) && ( rPaM.GetIndex() < aSel.Max().GetIndex() ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 void ImpEditView::CreateAnchor()
 {
-    pEditEngine->pImpEditEngine->bInSelection = TRUE;
+    pEditEngine->pImpEditEngine->bInSelection = sal_True;
     GetEditSelection().Min() = GetEditSelection().Max();
 }
 
 void ImpEditView::DeselectAll()
 {
-    pEditEngine->pImpEditEngine->bInSelection = FALSE;
+    pEditEngine->pImpEditEngine->bInSelection = sal_False;
     DrawSelection();
     GetEditSelection().Min() = GetEditSelection().Max();
 }
 
-BOOL ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
+sal_Bool ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
 {
     if ( pDragAndDropInfo && pDragAndDropInfo->pField )
-        return TRUE;
+        return sal_True;
 
     Point aMousePos( rPosPixel );
 
@@ -1407,15 +1407,15 @@ BOOL ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
 
     if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Point aDocPos( GetDocPos( aMousePos ) );
-    EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, FALSE );
+    EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos, sal_False );
     return IsInSelection( aPaM );
 }
 
-BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
+sal_Bool ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
 {
     pEditEngine->pImpEditEngine->CheckIdleFormatter();
 
@@ -1426,7 +1426,7 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
 
     if ( ( !GetOutputArea().IsInside( aMousePos ) ) && !pEditEngine->pImpEditEngine->IsInSelectionMode() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     Point aDocPos( GetDocPos( aMousePos ) );
@@ -1435,7 +1435,7 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
     // then again wiht the PaM for the Rect, even though the line is already 
     // known .... This must not be, though!
     EditPaM aPaM = pEditEngine->pImpEditEngine->GetPaM( aDocPos );
-    BOOL bGotoCursor = DoAutoScroll();
+    sal_Bool bGotoCursor = DoAutoScroll();
 
     // aTmpNewSel: Diff between old and new, not the new selection
     EditSelection aTmpNewSel( GetEditSelection().Max(), aPaM );
@@ -1462,9 +1462,9 @@ BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
         SetEditSelection( aNewEditSelection );
     }
 
-    BOOL bForceCursor = ( pDragAndDropInfo ? FALSE : TRUE ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
+    sal_Bool bForceCursor = ( pDragAndDropInfo ? sal_False : sal_True ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
     ShowCursor( bGotoCursor, bForceCursor );
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1549,7 +1549,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
     else
     {
         // Field?!
-        USHORT nPara, nPos;
+        sal_uInt16 nPara, nPos;
         Point aMousePos = GetWindow()->PixelToLogic( aMousePosPixel );
         const SvxFieldItem* pField = GetField( aMousePos, &nPara, &nPos );
         if ( pField )
@@ -1560,18 +1560,18 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
             aCopySel = EditSelection( EditPaM( pNode, nPos ), EditPaM( pNode, nPos+1 ) );
             GetEditSelection() = aCopySel;
             DrawSelection();
-            BOOL bGotoCursor = DoAutoScroll();
-            BOOL bForceCursor = ( pDragAndDropInfo ? FALSE : TRUE ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
+            sal_Bool bGotoCursor = DoAutoScroll();
+            sal_Bool bForceCursor = ( pDragAndDropInfo ? sal_False : sal_True ) && !pEditEngine->pImpEditEngine->IsInSelectionMode();
             ShowCursor( bGotoCursor, bForceCursor );
         }
         else if ( IsBulletArea( aMousePos, &nPara ) )
         {
             pDragAndDropInfo = new DragAndDropInfo();
-            pDragAndDropInfo->bOutlinerMode = TRUE;
+            pDragAndDropInfo->bOutlinerMode = sal_True;
             EditPaM aStartPaM( pEditEngine->pImpEditEngine->GetEditDoc().GetObject( nPara ), 0 );
             EditPaM aEndPaM( aStartPaM );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
-            for ( USHORT n = nPara +1; n < pEditEngine->pImpEditEngine->GetEditDoc().Count(); n++ )
+            for ( sal_uInt16 n = nPara +1; n < pEditEngine->pImpEditEngine->GetEditDoc().Count(); n++ )
             {
                 const SfxInt16Item& rL = (const SfxInt16Item&) pEditEngine->GetParaAttrib( n, EE_PARA_OUTLLEVEL );
                 if ( rL.GetValue() > rLevel.GetValue() )
@@ -1697,7 +1697,7 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo
             pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_DRAGANDDROP );
 
         HideDDCursor();
-        ShowCursor( DoAutoScroll(), TRUE );
+        ShowCursor( DoAutoScroll(), sal_True );
         delete pDragAndDropInfo;
         pDragAndDropInfo = NULL;
         pEditEngine->GetEndDropHdl().Call(GetEditViewPtr());
@@ -1713,19 +1713,19 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
     if ( pDragAndDropInfo && pDragAndDropInfo->bDragAccepted )
     {
         pEditEngine->GetBeginDropHdl().Call(GetEditViewPtr());
-        BOOL bChanges = FALSE;
+        sal_Bool bChanges = sal_False;
 
         HideDDCursor();
 
         if ( pDragAndDropInfo->bStarterOfDD )
         {
             pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_DRAGANDDROP );
-            pDragAndDropInfo->bUndoAction = TRUE;
+            pDragAndDropInfo->bUndoAction = sal_True;
         }
 
         if ( pDragAndDropInfo->bOutlinerMode )
         {
-            bChanges = TRUE;
+            bChanges = sal_True;
             GetEditViewPtr()->MoveParagraphs( Range( pDragAndDropInfo->aBeginDragSel.nStartPara, pDragAndDropInfo->aBeginDragSel.nEndPara ), pDragAndDropInfo->nOutlinerDropDest );
         }
         else
@@ -1733,7 +1733,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
             uno::Reference< datatransfer::XTransferable > xDataObj = rDTDE.Transferable;
             if ( xDataObj.is() )
             {
-                bChanges = TRUE;
+                bChanges = sal_True;
                 // remove Selection ...
                 DrawSelection();
                 EditPaM aPaM( pDragAndDropInfo->aDropDest );
@@ -1860,7 +1860,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
             pDragAndDropInfo->aDropDest = aPaM;
             if ( pDragAndDropInfo->bOutlinerMode )
             {
-                USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
+                sal_uInt16 nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
                 ParaPortion* pPPortion = pEditEngine->pImpEditEngine->GetParaPortions().SaveGetObject( nPara );
                 long nDestParaStartY = pEditEngine->pImpEditEngine->GetParaPortions().GetYOffset( pPPortion );
                 long nRel = aDocPos.Y() - nDestParaStartY;
@@ -1876,7 +1876,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                 if( ( pDragAndDropInfo->nOutlinerDropDest >= pDragAndDropInfo->aBeginDragSel.nStartPara ) &&
                     ( pDragAndDropInfo->nOutlinerDropDest <= (pDragAndDropInfo->aBeginDragSel.nEndPara+1) ) )
                 {
-                    bAccept = FALSE;
+                    bAccept = sal_False;
                 }
             }
             else if ( HasSelection() )
@@ -1888,7 +1888,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                 aCurSel.Adjust();
                 if ( !aDestSel.IsLess( aCurSel ) && !aDestSel.IsGreater( aCurSel ) )
                 {
-                    bAccept = FALSE;
+                    bAccept = sal_False;
                 }
             }
             if ( bAccept )
@@ -1939,7 +1939,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
                     HideDDCursor();
                     ShowDDCursor(aEditCursor );
                 }
-                pDragAndDropInfo->bDragAccepted = TRUE;
+                pDragAndDropInfo->bDragAccepted = sal_True;
                 rDTDE.Context->acceptDrag( rDTDE.DropAction );
             }
         }
@@ -1949,7 +1949,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
     {
         HideDDCursor();
         if (pDragAndDropInfo)
-            pDragAndDropInfo->bDragAccepted = FALSE;
+            pDragAndDropInfo->bDragAccepted = sal_False;
         rDTDE.Context->rejectDrag();
     }
 }
@@ -1969,7 +1969,7 @@ void ImpEditView::AddDragAndDropListeners()
         pWindow->GetDropTarget()->setActive( sal_True );
         pWindow->GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE );
 
-        bActiveDragAndDropListener = TRUE;
+        bActiveDragAndDropListener = sal_True;
     }
 }
 
@@ -1989,7 +1989,7 @@ void ImpEditView::RemoveDragAndDropListeners()
             mxDnDListener.clear();
         }
 
-        bActiveDragAndDropListener = FALSE;
+        bActiveDragAndDropListener = sal_False;
     }
 }
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 3104ea0020..45b64cb328 100644..100755
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -123,7 +123,7 @@ struct DragAndDropInfo
     sal_uInt16			nCursorWidth;
     ESelection          aBeginDragSel;
     EditPaM				aDropDest;
-    USHORT              nOutlinerDropDest;
+    sal_uInt16              nOutlinerDropDest;
     ESelection			aDropSel;
     VirtualDevice*		pBackground;
     const SvxFieldItem*	pField;
@@ -239,7 +239,7 @@ private:
 
 
     long				nInvMore;
-    ULONG				nControl;
+    sal_uLong				nControl;
     sal_uInt32			nTravelXPos;
     sal_uInt16          nExtraCursorFlags;
     sal_uInt16          nCursorBidiLevel;
@@ -290,13 +290,13 @@ public:
     void				ResetOutputArea( const Rectangle& rRec );
     const Rectangle&	GetOutputArea() const 	{ return aOutArea; }
 
-    BOOL			IsVertical() const;
+    sal_Bool			IsVertical() const;
 
-    BOOL			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+    sal_Bool			PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
 
-    BOOL			MouseButtonUp( const MouseEvent& rMouseEvent );
-    BOOL			MouseButtonDown( const MouseEvent& rMouseEvent );
-    BOOL			MouseMove( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseButtonUp( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseButtonDown( const MouseEvent& rMouseEvent );
+    sal_Bool			MouseMove( const MouseEvent& rMouseEvent );
     void			Command( const CommandEvent& rCEvt );
 
     void            CutCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard, sal_Bool bCut );
@@ -333,7 +333,7 @@ public:
     void            AddDragAndDropListeners();
     void            RemoveDragAndDropListeners();
 
-    BOOL            IsBulletArea( const Point& rPos, sal_uInt16* pPara );
+    sal_Bool            IsBulletArea( const Point& rPos, sal_uInt16* pPara );
 
 //	For the Selection Engine...
     void			CreateAnchor();
@@ -348,9 +348,9 @@ public:
     void			CalcAnchorPoint();
     void			RecalcOutputArea();
 
-    void			ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, BOOL test );
-    void			ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, USHORT nShowCursorFlags = 0 );
-    Pair 			Scroll( long ndX, long ndY, BYTE nRangeCheck = RGCHK_NEG );
+    void			ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_Bool test );
+    void			ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_uInt16 nShowCursorFlags = 0 );
+    Pair 			Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck = RGCHK_NEG );
 
     void			SetInsertMode( sal_Bool bInsert );
     sal_Bool			IsInsertMode() const 			{ return ( ( nControl & EV_CNTRL_OVERWRITE ) == 0 ); }
@@ -456,9 +456,9 @@ private:
     sal_uInt16			nStretchX;
     sal_uInt16			nStretchY;
 
-    USHORT              nAsianCompressionMode;
-    BOOL				bKernAsianPunctuation;
-    BOOL                bAddExtLeading;
+    sal_uInt16              nAsianCompressionMode;
+    sal_Bool				bKernAsianPunctuation;
+    sal_Bool                bAddExtLeading;
 
     EEHorizontalTextDirection eDefaultHorizontalTextDirection;
 
@@ -541,14 +541,14 @@ private:
 
     EditPaM				GetPaM( Point aDocPos, sal_Bool bSmart = sal_True );
     EditPaM				GetPaM( ParaPortion* pPortion, Point aPos, sal_Bool bSmart = sal_True );
-    long 				GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE );
-    long                GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, USHORT nTextPortion );
-    USHORT				GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, BOOL bSmart = TRUE );
+    long 				GetXPos( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False );
+    long                GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nTextPortion );
+    sal_uInt16				GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nX, sal_Bool bSmart = sal_True );
     Range				GetInvalidYOffsets( ParaPortion* pPortion );
     Range               GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* pLine );
 
-    void				SetParaAttrib( BYTE nFunc, EditSelection aSel, sal_uInt16 nValue );
-    sal_uInt16			GetParaAttrib( BYTE nFunc, EditSelection aSel );
+    void				SetParaAttrib( sal_uInt8 nFunc, EditSelection aSel, sal_uInt16 nValue );
+    sal_uInt16			GetParaAttrib( sal_uInt8 nFunc, EditSelection aSel );
     void				SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem );
     void				ParaAttribsToCharAttribs( ContentNode* pNode );
     void				GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const;
@@ -556,12 +556,12 @@ private:
     EditTextObject*		CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 ) const;
     void 				StoreBinTextObject( SvStream& rOStream, BinTextObject& rTextObject );
     EditSelection		InsertBinTextObject( BinTextObject&, EditPaM aPaM );
-    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial );
+    EditSelection       InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
 
     EditPaM				Clear();
     EditPaM				RemoveText();
     EditPaM				RemoveText( EditSelection aEditSelection );
-    sal_Bool			CreateLines( USHORT nPara, sal_uInt32 nStartPosY );
+    sal_Bool			CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY );
     void				CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY );
     sal_Bool			FinishCreateLines( ParaPortion* pParaPortion );
     void				CalcCharPositions( ParaPortion* pParaPortion );
@@ -589,9 +589,9 @@ private:
 
     sal_Bool			ImpCheckRefMapMode();
 
-    BOOL                ImplHasText() const;
+    sal_Bool                ImplHasText() const;
 
-    void                ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT nEnd, SvUShorts& rArray );
+    void                ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, SvUShorts& rArray );
 
     void				InsertContent( ContentNode* pNode, sal_uInt16 nPos );
     EditPaM 			SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos );
@@ -604,8 +604,8 @@ private:
     EditPaM				PageDown( const EditPaM& rPaM, EditView* pView);
     EditPaM				CursorUp( const EditPaM& rPaM, EditView* pEditView );
     EditPaM				CursorDown( const EditPaM& rPaM, EditView* pEditView );
-    EditPaM				CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
-    EditPaM				CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
+    EditPaM				CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
+    EditPaM				CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL );
     EditPaM				CursorStartOfLine( const EditPaM& rPaM );
     EditPaM				CursorEndOfLine( const EditPaM& rPaM );
     EditPaM				CursorStartOfParagraph( const EditPaM& rPaM );
@@ -616,22 +616,22 @@ private:
     EditPaM				WordRight( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditPaM				StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
     EditPaM				EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES );
-    EditSelection		SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, BOOL bAcceptStartOfWord = TRUE );
+    EditSelection		SelectWord( const EditSelection& rCurSelection, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_Bool bAcceptStartOfWord = sal_True );
     EditSelection       SelectSentence( const EditSelection& rCurSel );
-    EditPaM             CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bToLeft );
-    EditPaM             CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart );
+    EditPaM             CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, sal_Bool bToLeft );
+    EditPaM             CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart );
 
 
-    void				InitScriptTypes( USHORT nPara );
-    USHORT				GetScriptType( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const;
-    USHORT				GetScriptType( const EditSelection& rSel ) const;
-    BOOL				IsScriptChange( const EditPaM& rPaM ) const;
-    BOOL                HasScriptType( USHORT nPara, USHORT nType ) const;
+    void				InitScriptTypes( sal_uInt16 nPara );
+    sal_uInt16				GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPos = NULL ) const;
+    sal_uInt16				GetScriptType( const EditSelection& rSel ) const;
+    sal_Bool				IsScriptChange( const EditPaM& rPaM ) const;
+    sal_Bool                HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const;
 
-    BOOL                ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, USHORT nStartPos, sal_Int32* pDXArray, USHORT n100thPercentFromMax, BOOL bManipulateDXArray );
+    sal_Bool                ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray );
     void                ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth );
 
-    void                ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USHORT nIndex );
+    void                ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex );
     void                ImplInitDigitMode( OutputDevice* pOutDev, String* pString, xub_StrLen nStt, xub_StrLen nLen, LanguageType eLang );
 
     EditPaM				ReadText( SvStream& rInput, EditSelection aSel );
@@ -643,7 +643,7 @@ private:
     sal_uInt32			WriteRTF( SvStream& rOutput, EditSelection aSel );
     sal_uInt32			WriteXML( SvStream& rOutput, EditSelection aSel );
     sal_uInt32			WriteHTML( SvStream& rOutput, EditSelection aSel );
-    sal_uInt32			WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicode = FALSE ) const;
+    sal_uInt32			WriteBin( SvStream& rOutput, EditSelection aSel, sal_Bool bStoreUnicode = sal_False ) const;
 
     void				WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
                         SvxFontTable& rFontTable, SvxColorList& rColorList );
@@ -670,12 +670,12 @@ private:
     long                CalcVertLineSpacing(Point& rStartPos) const;
 
     Color				GetAutoColor() const;
-    void                EnableAutoColor( BOOL b ) { bUseAutoColor = b; }
-    BOOL                IsAutoColorEnabled() const { return bUseAutoColor; }
-    void                ForceAutoColor( BOOL b ) { bForceAutoColor = b; }
-    BOOL                IsForceAutoColor() const { return bForceAutoColor; }
+    void                EnableAutoColor( sal_Bool b ) { bUseAutoColor = b; }
+    sal_Bool                IsAutoColorEnabled() const { return bUseAutoColor; }
+    void                ForceAutoColor( sal_Bool b ) { bForceAutoColor = b; }
+    sal_Bool                IsForceAutoColor() const { return bForceAutoColor; }
 
-    inline VirtualDevice*	GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode );
+    inline VirtualDevice*	GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode );
     inline void				EraseVirtualDevice();
 
     DECL_LINK( StatusTimerHdl, Timer * );
@@ -702,7 +702,7 @@ private:
         the output string at hand. This is necessary for slideshow
         text effects.
      */
-    void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const USHORT nIdx, const USHORT nLen) const;
+    void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const;
 
     SpellInfo *     CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs );
 
@@ -713,7 +713,7 @@ public:
                             ImpEditEngine( EditEngine* pEditEngine, SfxItemPool* pPool );
                             ~ImpEditEngine();
 
-    void					InitDoc( BOOL bKeepParaAttribs );
+    void					InitDoc( sal_Bool bKeepParaAttribs );
     EditDoc&				GetEditDoc()			{ return aEditDoc; }
     const EditDoc&			GetEditDoc() const		{ return aEditDoc; }
 
@@ -729,20 +729,20 @@ public:
     const Size&				GetPaperSize() const					{ return aPaperSize; }
     void					SetPaperSize( const Size& rSz ) 		{ aPaperSize = rSz; }
 
-    void					SetVertical( BOOL bVertical );
-    BOOL					IsVertical() const 						{ return GetEditDoc().IsVertical(); }
+    void					SetVertical( sal_Bool bVertical );
+    sal_Bool					IsVertical() const 						{ return GetEditDoc().IsVertical(); }
 
-    void					SetFixedCellHeight( BOOL bUseFixedCellHeight );
-    BOOL					IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); }
+    void					SetFixedCellHeight( sal_Bool bUseFixedCellHeight );
+    sal_Bool					IsFixedCellHeight() const { return GetEditDoc().IsFixedCellHeight(); }
 
     void                        SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ) { eDefaultHorizontalTextDirection = eHTextDir; }
     EEHorizontalTextDirection   GetDefaultHorizontalTextDirection() const { return eDefaultHorizontalTextDirection; }
 
 
-    void				    InitWritingDirections( USHORT nPara );
-    BOOL                    IsRightToLeft( USHORT nPara ) const;
-    BYTE                    GetRightToLeft( USHORT nPara, USHORT nChar, USHORT* pStart = NULL, USHORT* pEnd = NULL );
-    BOOL                    HasDifferentRTLLevels( const ContentNode* pNode );
+    void				    InitWritingDirections( sal_uInt16 nPara );
+    sal_Bool                    IsRightToLeft( sal_uInt16 nPara ) const;
+    sal_uInt8                    GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nChar, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL );
+    sal_Bool                    HasDifferentRTLLevels( const ContentNode* pNode );
 
     void					SetTextRanger( TextRanger* pRanger );
     TextRanger*				GetTextRanger() const { return pTextRanger; }
@@ -786,8 +786,8 @@ public:
     EditPaM			DeleteSelected( EditSelection aEditSelection);
     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput = sal_False );
     EditPaM			InsertText( EditSelection aCurEditSelection, const String& rStr );
-    EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL );
-    EditPaM			DeleteLeftOrRight( const EditSelection& rEditSelection, BYTE nMode, BYTE nDelMode = DELMODE_SIMPLE );
+    EditPaM			AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, sal_Bool bOverwrite, Window* pFrameWin = NULL );
+    EditPaM			DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
     EditPaM			InsertParaBreak( EditSelection aEditSelection );
     EditPaM			InsertLineBreak( EditSelection aEditSelection );
     EditPaM			InsertTab( EditSelection aEditSelection );
@@ -808,18 +808,18 @@ public:
 
     sal_uInt32		CalcTextHeight();
     sal_uInt32		GetTextHeight() const;
-    sal_uInt32		CalcTextWidth( BOOL bIgnoreExtraSpace );
-    sal_uInt32 		CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace );
+    sal_uInt32		CalcTextWidth( sal_Bool bIgnoreExtraSpace );
+    sal_uInt32 		CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace );
     sal_uInt16		GetLineCount( sal_uInt16 nParagraph ) const;
     sal_uInt16      GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
-    void            GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
-    USHORT          GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const;
+    void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+    sal_uInt16          GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     sal_uInt16		GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine );
     sal_uInt32		GetParaHeight( sal_uInt16 nParagraph );
 
-    SfxItemSet      GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const;
-    SfxItemSet		GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib = FALSE  );
-    void			SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial = 0 );
+    SfxItemSet      GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+    SfxItemSet		GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib = sal_False  );
+    void			SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0 );
     void			RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 );
     void			RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
     void			SetFlatMode( sal_Bool bFlat );
@@ -864,8 +864,8 @@ public:
     inline void		IdleFormatAndUpdate( EditView* pCurView = 0 );
 
     svtools::ColorConfig& GetColorConfig();
-    BOOL            IsVisualCursorTravelingEnabled();
-    BOOL            DoVisualCursorTraveling( const ContentNode* pNode );
+    sal_Bool            IsVisualCursorTravelingEnabled();
+    sal_Bool            DoVisualCursorTraveling( const ContentNode* pNode );
 
     EditSelection			ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const;
     inline EPaM				CreateEPaM( const EditPaM& rPaM );
@@ -927,7 +927,7 @@ public:
 
 
     LanguageType        GetLanguage( const EditSelection rSelection ) const;
-    LanguageType		GetLanguage( const EditPaM& rPaM, USHORT* pEndPos = NULL ) const;
+    LanguageType		GetLanguage( const EditPaM& rPaM, sal_uInt16* pEndPos = NULL ) const;
     ::com::sun::star::lang::Locale GetLocale( const EditPaM& rPaM ) const;
 
     void				DoOnlineSpelling( ContentNode* pThisNodeOnly = 0, sal_Bool bSpellAtCursorPos = sal_False, sal_Bool bInteruptable = sal_True );
@@ -939,14 +939,14 @@ public:
                         ImpSpell( EditView* pEditView );
 
     // text conversion functions
-    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
+    void                Convert( EditView* pEditView, LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc );
     void                ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtLang, EditView* pEditView, LanguageType nSrcLang, const ESelection &rConvRange,
                                     sal_Bool bAllowImplicitChangesForNotConvertibleText, LanguageType nTargetLang, const Font *pTargetFont );
     ConvInfo *          GetConvInfo() const { return pConvInfo; }
     sal_Bool            HasConvertibleTextPortion( LanguageType nLang );
     void                SetLanguageAndFont( const ESelection &rESel,
-                                LanguageType nLang, USHORT nLangWhichId,
-                                const Font *pFont,  USHORT nFontWhichId );
+                                LanguageType nLang, sal_uInt16 nLangWhichId,
+                                const Font *pFont,  sal_uInt16 nFontWhichId );
 
     // returns true if input sequence checking should be applied
     sal_Bool            IsInputSequenceCheckingRequired( sal_Unicode nChar, const EditSelection& rCurSel ) const;
@@ -991,8 +991,8 @@ public:
 
     const SvxLRSpaceItem&	GetLRSpaceItem( ContentNode* pNode );
     SvxAdjust               GetJustification( USHORT nPara ) const;
-    SvxCellJustifyMethod    GetJustifyMethod( USHORT nPara ) const;
-    SvxCellVerJustify       GetVerJustification( USHORT nPara ) const;
+    SvxCellJustifyMethod    GetJustifyMethod( sal_uInt16 nPara ) const;
+    SvxCellVerJustify       GetVerJustification( sal_uInt16 nPara ) const;
 
     void				SetCharStretching( sal_uInt16 nX, sal_uInt16 nY );
     inline void			GetCharStretching( sal_uInt16& rX, sal_uInt16& rY );
@@ -1010,22 +1010,22 @@ public:
     void				SetAutoCompleteText( const String& rStr, sal_Bool bUpdateTipWindow );
 
     EditSelection		TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode );
-    short               ReplaceTextOnly( ContentNode* pNode, USHORT nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets );
+    short               ReplaceTextOnly( ContentNode* pNode, sal_uInt16 nCurrentStart, xub_StrLen nLen, const String& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rOffsets );
 
 
-    void                SetAsianCompressionMode( USHORT n );
-    USHORT              GetAsianCompressionMode() const { return nAsianCompressionMode; }
+    void                SetAsianCompressionMode( sal_uInt16 n );
+    sal_uInt16              GetAsianCompressionMode() const { return nAsianCompressionMode; }
 
-    void                SetKernAsianPunctuation( BOOL b );
-    BOOL				IsKernAsianPunctuation() const { return bKernAsianPunctuation; }
+    void                SetKernAsianPunctuation( sal_Bool b );
+    sal_Bool				IsKernAsianPunctuation() const { return bKernAsianPunctuation; }
 
-    void                SetAddExtLeading( BOOL b );
-    BOOL                IsAddExtLeading() const { return bAddExtLeading; }
+    void                SetAddExtLeading( sal_Bool b );
+    sal_Bool                IsAddExtLeading() const { return bAddExtLeading; }
 
-    rtl::Reference<SvxForbiddenCharactersTable>	GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
+    rtl::Reference<SvxForbiddenCharactersTable>	GetForbiddenCharsTable( sal_Bool bGetInternal = sal_True ) const;
     void				SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
 
-    BOOL				mbLastTryMerge;
+    sal_Bool				mbLastTryMerge;
 
     /** sets a link that is called at the beginning of a drag operation at an edit view */
     void				SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; }
@@ -1036,8 +1036,8 @@ public:
     Link			GetEndDropHdl() const { return maEndDropHdl; }
 
     /// specifies if auto-correction should capitalize the first word or not (default is on)
-    void            SetFirstWordCapitalization( BOOL bCapitalize )  { bFirstWordCapitalization = bCapitalize; }
-    BOOL            IsFirstWordCapitalization() const   { return bFirstWordCapitalization; }
+    void            SetFirstWordCapitalization( sal_Bool bCapitalize )  { bFirstWordCapitalization = bCapitalize; }
+    sal_Bool            IsFirstWordCapitalization() const   { return bFirstWordCapitalization; }
 };
 
 inline EPaM ImpEditEngine::CreateEPaM( const EditPaM& rPaM )
@@ -1078,7 +1078,7 @@ inline EditSelection ImpEditEngine::CreateSel( const ESelection& rSel )
     return aSel;
 }
 
-inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode& rMapMode, ULONG nDrawMode )
+inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode )
 {
     if ( !pVirtDev )
         pVirtDev = new VirtualDevice;
@@ -1213,7 +1213,7 @@ inline Cursor* ImpEditView::GetCursor()
 
 void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit );
 void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const MapUnit* pSourceUnit = NULL, const MapUnit* pDestUnit = NULL );
-BYTE GetCharTypeForCompression( xub_Unicode cChar );
+sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar );
 Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin );
 
 #endif // _IMPEDIT_HXX
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index cf0114c9ce..4a6bb9ce0c 100644..100755
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -77,9 +77,9 @@
 
 using namespace ::com::sun::star;
 
-USHORT lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
+sal_uInt16 lcl_CalcExtraSpace( ParaPortion*, const SvxLineSpacingItem& rLSItem )
 {
-    USHORT nExtra = 0;
+    sal_uInt16 nExtra = 0;
     if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
     {
         nExtra = rLSItem.GetInterLineSpace();
@@ -119,26 +119,26 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
     nStretchX			= 100;
     nStretchY			= 100;
 
-    bInSelection 		= FALSE;
-    bOwnerOfRefDev 		= FALSE;
-    bDowning 			= FALSE;
-    bIsInUndo 			= FALSE;
-    bIsFormatting 		= FALSE;
-    bFormatted			= FALSE;
-    bUpdate 			= TRUE;
-    bUseAutoColor       = TRUE;
-    bForceAutoColor     = FALSE;
-    bAddExtLeading      = FALSE;
-    bUndoEnabled 		= TRUE;
-    bCallParaInsertedOrDeleted = FALSE;
-    bImpConvertFirstCall= FALSE;
-    bFirstWordCapitalization    = TRUE;
+    bInSelection 		= sal_False;
+    bOwnerOfRefDev 		= sal_False;
+    bDowning 			= sal_False;
+    bIsInUndo 			= sal_False;
+    bIsFormatting 		= sal_False;
+    bFormatted			= sal_False;
+    bUpdate 			= sal_True;
+    bUseAutoColor       = sal_True;
+    bForceAutoColor     = sal_False;
+    bAddExtLeading      = sal_False;
+    bUndoEnabled 		= sal_True;
+    bCallParaInsertedOrDeleted = sal_False;
+    bImpConvertFirstCall= sal_False;
+    bFirstWordCapitalization    = sal_True;
 
     eDefLanguage		= LANGUAGE_DONTKNOW;
     maBackgroundColor	= COL_AUTO;
 
     nAsianCompressionMode = text::CharacterCompressionType::NONE;
-    bKernAsianPunctuation = FALSE;
+    bKernAsianPunctuation = sal_False;
 
     eDefaultHorizontalTextDirection = EE_HTEXTDIR_DEFAULT;
 
@@ -163,13 +163,13 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
 
     // Access data already from here on!
     SetRefDevice( pRefDev );
-    InitDoc( FALSE );
+    InitDoc( sal_False );
 
-    bCallParaInsertedOrDeleted = TRUE;
+    bCallParaInsertedOrDeleted = sal_True;
 
     aEditDoc.SetModifyHdl( LINK( this, ImpEditEngine, DocModified ) );
 
-    mbLastTryMerge = FALSE;
+    mbLastTryMerge = sal_False;
 }
 
 ImpEditEngine::~ImpEditEngine()
@@ -181,8 +181,8 @@ ImpEditEngine::~ImpEditEngine()
     // Destroying templates may otherwise cause unnecessary formatting, 
     // when a parent template is destroyed. 
     // And this after the destruction of the data!
-    bDowning = TRUE;
-    SetUpdateMode( FALSE );
+    bDowning = sal_True;
+    SetUpdateMode( sal_False );
 
     delete pVirtDev;
     delete pEmptyItemSet;
@@ -202,12 +202,12 @@ void ImpEditEngine::SetRefDevice( OutputDevice* pRef )
         delete pRefDev;
 
     pRefDev = pRef;
-    bOwnerOfRefDev = FALSE;
+    bOwnerOfRefDev = sal_False;
 
     if ( !pRef )
         pRefDev = EE_DLL()->GetGlobalData()->GetStdRefDevice();
 
-    nOnePixelInRef = (USHORT)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
+    nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
 
     if ( IsFormatted() )
     {
@@ -227,10 +227,10 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
         pRefDev = new VirtualDevice;
         pRefDev->SetMapMode( MAP_TWIP );
         SetRefDevice( pRefDev );
-        bOwnerOfRefDev = TRUE;
+        bOwnerOfRefDev = sal_True;
     }
     pRefDev->SetMapMode( rMapMode );
-    nOnePixelInRef = (USHORT)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
+    nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
     if ( IsFormatted() )
     {
         FormatFullDoc();
@@ -238,13 +238,13 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
     }
 }
 
-void ImpEditEngine::InitDoc( BOOL bKeepParaAttribs )
+void ImpEditEngine::InitDoc( sal_Bool bKeepParaAttribs )
 {
-    USHORT nParas = aEditDoc.Count();
-    for ( USHORT n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
+    sal_uInt16 nParas = aEditDoc.Count();
+    for ( sal_uInt16 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
     {
         if ( aEditDoc[n]->GetStyleSheet() )
-            EndListening( *aEditDoc[n]->GetStyleSheet(), FALSE );
+            EndListening( *aEditDoc[n]->GetStyleSheet(), sal_False );
     }
 
     if ( bKeepParaAttribs )
@@ -257,7 +257,7 @@ void ImpEditEngine::InitDoc( BOOL bKeepParaAttribs )
     ParaPortion* pIniPortion = new ParaPortion( aEditDoc[0] );
     GetParaPortions().Insert( pIniPortion, 0 );
 
-    bFormatted = FALSE;
+    bFormatted = sal_False;
 
     if ( IsCallParaInsertedOrDeleted() )
     {
@@ -290,13 +290,13 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e
 
     ContentNode* pStartNode = aSel.Min().GetNode();
     ContentNode* pEndNode = aSel.Max().GetNode();
-    USHORT nStartNode = aEditDoc.GetPos( pStartNode );
-    USHORT nEndNode = aEditDoc.GetPos( pEndNode );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( pStartNode );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( pEndNode );
 
     DBG_ASSERT( nStartNode <= nEndNode, "Selection not sorted ?" );
 
     // iterate over the paragraphs ...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++	)
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++	)
     {
         DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node not found: GetSelected" );
         ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -315,13 +315,13 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e
     return aText;
 }
 
-BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     SetActiveView( pView );
 
     if ( GetAutoCompleteText().Len() )
-        SetAutoCompleteText( String(), TRUE );
+        SetAutoCompleteText( String(), sal_True );
 
     GetSelEngine().SelMouseButtonDown( rMEvt );
     // Special treatment
@@ -331,18 +331,18 @@ BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
         if ( rMEvt.GetClicks() == 2 )
         {
             // So that the SelectionEngine knows about the anchor.
-            aSelEngine.CursorPosChanging( TRUE, FALSE );
+            aSelEngine.CursorPosChanging( sal_True, sal_False );
 
             EditSelection aNewSelection( SelectWord( aCurSel ) );
             pView->pImpEditView->DrawSelection();
             pView->pImpEditView->SetEditSelection( aNewSelection );
             pView->pImpEditView->DrawSelection();
-            pView->ShowCursor( TRUE, TRUE );
+            pView->ShowCursor( sal_True, sal_True );
         }
         else if ( rMEvt.GetClicks() == 3 )
         {
             // So that the SelectionEngine knows about the anchor.
-            aSelEngine.CursorPosChanging( TRUE, FALSE );
+            aSelEngine.CursorPosChanging( sal_True, sal_False );
 
             EditSelection aNewSelection( aCurSel );
             aNewSelection.Min().SetIndex( 0 );
@@ -350,10 +350,10 @@ BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
             pView->pImpEditView->DrawSelection();
             pView->pImpEditView->SetEditSelection( aNewSelection );
             pView->pImpEditView->DrawSelection();
-            pView->ShowCursor( TRUE, TRUE );
+            pView->ShowCursor( sal_True, sal_True );
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
@@ -469,7 +469,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
         delete mpIMEInfos;
         EditPaM aPaM = pView->GetImpEditView()->GetEditSelection().Max();
         String aOldTextAfterStartPos = aPaM.GetNode()->Copy( aPaM.GetIndex() );
-        USHORT nMax = aOldTextAfterStartPos.Search( CH_FEATURE );
+        sal_uInt16 nMax = aOldTextAfterStartPos.Search( CH_FEATURE );
         if ( nMax != STRING_NOTFOUND )  // don't overwrite features!
             aOldTextAfterStartPos.Erase( nMax );
         mpIMEInfos = new ImplIMEInfos( aPaM, aOldTextAfterStartPos );
@@ -506,7 +506,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             ParaPortion* pPortion = FindParaPortion( mpIMEInfos->aPos.GetNode() );
             pPortion->MarkSelectionInvalid( mpIMEInfos->aPos.GetIndex(), 0 );
 
-            BOOL bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
+            sal_Bool bWasCursorOverwrite = mpIMEInfos->bWasCursorOverwrite;
 
             delete mpIMEInfos;
             mpIMEInfos = NULL;
@@ -534,14 +534,14 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
 
                 if ( mpIMEInfos->bWasCursorOverwrite )
                 {
-                    USHORT nOldIMETextLen = mpIMEInfos->nLen;
-                    USHORT nNewIMETextLen = pData->GetText().Len();
+                    sal_uInt16 nOldIMETextLen = mpIMEInfos->nLen;
+                    sal_uInt16 nNewIMETextLen = pData->GetText().Len();
 
                     if ( ( nOldIMETextLen > nNewIMETextLen ) &&
                          ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) )
                     {
                         // restore old characters
-                        USHORT nRestore = nOldIMETextLen - nNewIMETextLen;
+                        sal_uInt16 nRestore = nOldIMETextLen - nNewIMETextLen;
                         EditPaM aPaM( mpIMEInfos->aPos );
                         aPaM.GetIndex() = aPaM.GetIndex() + nNewIMETextLen;
                         ImpInsertText( aPaM, mpIMEInfos->aOldTextAfterStartPos.Copy( nNewIMETextLen, nRestore ) );
@@ -550,7 +550,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
                               ( nOldIMETextLen < mpIMEInfos->aOldTextAfterStartPos.Len() ) )
                     {
                         // overwrite
-                        USHORT nOverwrite = nNewIMETextLen - nOldIMETextLen;
+                        sal_uInt16 nOverwrite = nNewIMETextLen - nOldIMETextLen;
                         if ( ( nOldIMETextLen + nOverwrite ) > mpIMEInfos->aOldTextAfterStartPos.Len() )
                             nOverwrite = mpIMEInfos->aOldTextAfterStartPos.Len() - nOldIMETextLen;
                         DBG_ASSERT( nOverwrite && (nOverwrite < 0xFF00), "IME Overwrite?!" );
@@ -598,13 +598,13 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             EditPaM aPaM( pView->pImpEditView->GetEditSelection().Max() );
             Rectangle aR1 = PaMtoEditCursor( aPaM, 0 );
 
-            USHORT nInputEnd = mpIMEInfos->aPos.GetIndex() + mpIMEInfos->nLen;
+            sal_uInt16 nInputEnd = mpIMEInfos->aPos.GetIndex() + mpIMEInfos->nLen;
 
             if ( !IsFormatted() )
                 FormatDoc();
 
             ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( GetEditDoc().GetPos( aPaM.GetNode() ) );
-            USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_True );
+            sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_True );
             EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
             if ( pLine && ( nInputEnd > pLine->GetEnd() ) )
                 nInputEnd = pLine->GetEnd();
@@ -657,11 +657,11 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
     GetSelEngine().Command( rCEvt );
 }
 
-BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     GetSelEngine().SelMouseButtonUp( rMEvt );
-    bInSelection = FALSE;
+    bInSelection = sal_False;
     // Special treatments
     EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
     if ( !aCurSel.HasRange() )
@@ -672,20 +672,20 @@ BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
             if ( pFld )
             {
                 EditPaM aPaM( aCurSel.Max() );
-                USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+                sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
                 GetEditEnginePtr()->FieldClicked( *pFld, nPara, aPaM.GetIndex() );
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
 {
     // MouseMove is called directly after ShowQuickHelp()!
     GetSelEngine().SetCurView( pView );
     GetSelEngine().SelMouseMove( rMEvt );
-    return TRUE;
+    return sal_True;
 }
 
 EditPaM ImpEditEngine::InsertText( EditSelection aSel, const XubString& rStr )
@@ -696,7 +696,7 @@ EditPaM ImpEditEngine::InsertText( EditSelection aSel, const XubString& rStr )
 
 EditPaM ImpEditEngine::Clear()
 {
-    InitDoc( FALSE );
+    InitDoc( sal_False );
 
     EditPaM aPaM = aEditDoc.GetStartPaM();
     EditSelection aSel( aPaM );
@@ -705,7 +705,7 @@ EditPaM ImpEditEngine::Clear()
 
     ResetUndoManager();
 
-    for ( USHORT nView = aEditViews.Count(); nView; )
+    for ( sal_uInt16 nView = aEditViews.Count(); nView; )
     {
         EditView* pView = aEditViews[--nView];
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -717,11 +717,11 @@ EditPaM ImpEditEngine::Clear()
 
 EditPaM ImpEditEngine::RemoveText()
 {
-    InitDoc( TRUE );
+    InitDoc( sal_True );
 
     EditPaM aStartPaM = aEditDoc.GetStartPaM();
     EditSelection aEmptySel( aStartPaM, aStartPaM );
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews.GetObject(nView);
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -736,16 +736,16 @@ void ImpEditEngine::SetText( const XubString& rText )
 {
     // RemoveText deletes the undo list!
     EditPaM aStartPaM = RemoveText();
-    BOOL bUndoCurrentlyEnabled = IsUndoEnabled();
+    sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled();
     // The text inserted manually can not be made reversable by the user
-    EnableUndo( FALSE );
+    EnableUndo( sal_False );
 
     EditSelection aEmptySel( aStartPaM, aStartPaM );
     EditPaM aPaM = aStartPaM;
     if ( rText.Len() )
         aPaM = ImpInsertText( aEmptySel, rText );
 
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews[nView];
         DBG_CHKOBJ( pView, EditView, 0 );
@@ -774,7 +774,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet()
     if ( !pEmptyItemSet )
     {
         pEmptyItemSet = new SfxItemSet( aEditDoc.GetItemPool(), EE_ITEMS_START, EE_ITEMS_END );
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
         {
             pEmptyItemSet->ClearItem( nWhich );
         }
@@ -794,7 +794,7 @@ void ImpEditEngine::CursorMoved( ContentNode* pPrevNode )
 
 void ImpEditEngine::TextModified()
 {
-    bFormatted = FALSE;
+    bFormatted = sal_False;
 
     if ( GetNotifyHdl().IsSet() )
     {
@@ -809,14 +809,14 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode )
 {
     DBG_ASSERT( pNode, "ParaAttribsChanged: Which one?" );
 
-    aEditDoc.SetModified( TRUE );
-    bFormatted = FALSE;
+    aEditDoc.SetModified( sal_True );
+    bFormatted = sal_False;
 
     ParaPortion* pPortion = FindParaPortion( pNode );
     DBG_ASSERT( pPortion, "ParaAttribsChanged: Portion?" );
     pPortion->MarkSelectionInvalid( 0, pNode->Len() );
 
-    USHORT nPara = aEditDoc.GetPos( pNode );
+    sal_uInt16 nPara = aEditDoc.GetPos( pNode );
     pEditEngine->ParaAttribsChanged( nPara );
 
     ParaPortion* pNextPortion = GetParaPortions().SaveGetObject( nPara+1 );
@@ -846,8 +846,8 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
 
     KeyEvent aTranslatedKeyEvent = rKeyEvent.LogicalTextDirectionality( eTextDirection );
 
-    BOOL bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? TRUE : FALSE;
-    USHORT nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
+    sal_Bool bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? sal_True : sal_False;
+    sal_uInt16 nCode = aTranslatedKeyEvent.GetKeyCode().GetCode();
 
     if ( DoVisualCursorTraveling( aPaM.GetNode() ) )
     {
@@ -1001,16 +1001,16 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
     return pEditView->pImpEditView->GetEditSelection();
 }
 
-EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, BOOL bStart )
+EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart )
 {
     EditPaM aPaM( rPaM );
 
-    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
     EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
-    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+    sal_Bool bEmptyLine = pLine->GetStart() == pLine->GetEnd();
 
     pEditView->pImpEditView->nExtraCursorFlags = 0;
 
@@ -1026,19 +1026,18 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
         const UBiDiLevel  nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 /*LTR*/;
         ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(pLineString), aLine.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
 
-        USHORT nVisPos = bStart ? 0 : aLine.Len()-1;
-        USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+        sal_uInt16 nVisPos = bStart ? 0 : aLine.Len()-1;
+        sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
 
         ubidi_close( pBidi );
 
         aPaM.GetIndex() = nLogPos + pLine->GetStart();
 
-        USHORT nTmp;
-        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, TRUE );
+        sal_uInt16 nTmp;
+        sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, sal_True );
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
-
-        BOOL bPortionRTL = nRTLLevel%2 ? TRUE : FALSE;
+        sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
+        sal_Bool bPortionRTL = nRTLLevel%2 ? sal_True : sal_False;
 
         if ( bStart )
         {
@@ -1058,22 +1057,22 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
     return aPaM;
 }
 
-EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, USHORT nCharacterIteratorMode, BOOL bVisualToLeft )
+EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode, sal_Bool bVisualToLeft )
 {
     EditPaM aPaM( rPaM );
 
-    USHORT nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    USHORT nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
+    sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
     EditLine* pLine = pParaPortion->GetLines().GetObject( nLine );
-    BOOL bEmptyLine = pLine->GetStart() == pLine->GetEnd();
+    sal_Bool bEmptyLine = pLine->GetStart() == pLine->GetEnd();
 
     pEditView->pImpEditView->nExtraCursorFlags = 0;
 
-    BOOL bParaRTL = IsRightToLeft( nPara );
+    sal_Bool bParaRTL = IsRightToLeft( nPara );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     if ( bEmptyLine )
     {
@@ -1081,36 +1080,36 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
         {
             aPaM = CursorUp( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_False );
         }
         else
         {
             aPaM = CursorDown( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_True );
         }
 
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
-    BOOL bLogicalBackward = bParaRTL ? !bVisualToLeft : bVisualToLeft;
+    sal_Bool bLogicalBackward = bParaRTL ? !bVisualToLeft : bVisualToLeft;
 
     if ( !bDone && pEditView->IsInsertMode() )
     {
         // Check if we are within a portion and don't have overwrite mode, then it's easy...
-        USHORT nPortionStart;
-        USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, FALSE );
+        sal_uInt16 nPortionStart;
+        sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, sal_False );
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
 
-        BOOL bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+pTextPortion->GetLen()) );
-        USHORT nRTLLevel = pTextPortion->GetRightToLeft();
+        sal_Bool bPortionBoundary = ( aPaM.GetIndex() == nPortionStart ) || ( aPaM.GetIndex() == (nPortionStart+pTextPortion->GetLen()) );
+        sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft();
 
         // Portion boundary doesn't matter if both have same RTL level
-        USHORT nRTLLevelNextPortion = 0xFFFF;
+        sal_uInt16 nRTLLevelNextPortion = 0xFFFF;
         if ( bPortionBoundary && aPaM.GetIndex() && ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) )
         {
-            USHORT nTmp;
-            USHORT nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? FALSE : TRUE );
+            sal_uInt16 nTmp;
+            sal_uInt16 nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? sal_False : sal_True );
             TextPortion* pNextTextPortion = pParaPortion->GetTextPortions().GetObject( nNextTextPortion );
             nRTLLevelNextPortion = pNextTextPortion->GetRightToLeft();
         }
@@ -1127,17 +1126,17 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
                 aPaM = CursorRight( aPaM, nCharacterIteratorMode );
                 pEditView->pImpEditView->SetCursorBidiLevel( 0 );
             }
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 
     if ( !bDone )
     {
-        BOOL bGotoStartOfNextLine = FALSE;
-        BOOL bGotoEndOfPrevLine = FALSE;
+        sal_Bool bGotoStartOfNextLine = sal_False;
+        sal_Bool bGotoEndOfPrevLine = sal_False;
 
         String aLine( *aPaM.GetNode(), pLine->GetStart(), pLine->GetEnd() - pLine->GetStart() );
-        USHORT nPosInLine = aPaM.GetIndex() - pLine->GetStart();
+        sal_uInt16 nPosInLine = aPaM.GetIndex() - pLine->GetStart();
 
         const sal_Unicode* pLineString = aLine.GetBuffer();
 
@@ -1149,8 +1148,8 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
         if ( !pEditView->IsInsertMode() )
         {
-            BOOL bEndOfLine = nPosInLine == aLine.Len();
-            USHORT nVisPos = (USHORT)ubidi_getVisualIndex( pBidi, !bEndOfLine ? nPosInLine : nPosInLine-1, &nError );
+            sal_Bool bEndOfLine = nPosInLine == aLine.Len();
+            sal_uInt16 nVisPos = (sal_uInt16)ubidi_getVisualIndex( pBidi, !bEndOfLine ? nPosInLine : nPosInLine-1, &nError );
             if ( bVisualToLeft )
             {
                 bGotoEndOfPrevLine = nVisPos == 0;
@@ -1166,22 +1165,22 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
             if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
             {
-                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+                sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
                 aPaM.GetIndex() = pLine->GetStart() + nLogPos;
                 pEditView->pImpEditView->SetCursorBidiLevel( 0 );
             }
         }
         else
         {
-            BOOL bWasBehind = FALSE;
-            BOOL bBeforePortion = !nPosInLine || pEditView->pImpEditView->GetCursorBidiLevel() == 1;
+            sal_Bool bWasBehind = sal_False;
+            sal_Bool bBeforePortion = !nPosInLine || pEditView->pImpEditView->GetCursorBidiLevel() == 1;
             if ( nPosInLine && ( !bBeforePortion ) ) // before the next portion
-                bWasBehind = TRUE;  // step one back, otherwise visual will be unusable when rtl portion follows.
+                bWasBehind = sal_True;  // step one back, otherwise visual will be unusable when rtl portion follows.
 
-            USHORT nPortionStart;
-            USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, bBeforePortion );
+            sal_uInt16 nPortionStart;
+            sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, bBeforePortion );
             TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
-            BOOL bRTLPortion = (pTextPortion->GetRightToLeft() % 2) != 0;
+            sal_Bool bRTLPortion = (pTextPortion->GetRightToLeft() % 2) != 0;
 
             // -1: We are 'behind' the character
             long nVisPos = (long)ubidi_getVisualIndex( pBidi, bWasBehind ? nPosInLine-1 : nPosInLine, &nError );
@@ -1201,14 +1200,14 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
 
             if ( !bGotoEndOfPrevLine && !bGotoStartOfNextLine )
             {
-                USHORT nLogPos = (USHORT)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
+                sal_uInt16 nLogPos = (sal_uInt16)ubidi_getLogicalIndex( pBidi, nVisPos, &nError );
 
                 aPaM.GetIndex() = pLine->GetStart() + nLogPos;
 
                 // RTL portion, stay visually on the left side.
-                USHORT _nPortionStart;
-
-                USHORT _nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), _nPortionStart, TRUE );
+                sal_uInt16 _nPortionStart;
+                // sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nPortionStart, !bRTLPortion );
+                sal_uInt16 _nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), _nPortionStart, sal_True );
                 TextPortion* _pTextPortion = pParaPortion->GetTextPortions().GetObject( _nTextPortion );
                 if ( bVisualToLeft && !bRTLPortion && ( _pTextPortion->GetRightToLeft() % 2 ) )
                     aPaM.GetIndex()++;
@@ -1225,20 +1224,20 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
         {
             aPaM = CursorUp( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, FALSE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_False );
         }
         else if ( bGotoStartOfNextLine )
         {
             aPaM = CursorDown( aPaM, pEditView );
             if ( aPaM != rPaM )
-                aPaM = CursorVisualStartEnd( pEditView, aPaM, TRUE );
+                aPaM = CursorVisualStartEnd( pEditView, aPaM, sal_True );
         }
     }
     return aPaM;
 }
 
 
-EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
+EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
 {
     EditPaM aCurPaM( rPaM );
     EditPaM aNewPaM( aCurPaM );
@@ -1247,7 +1246,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIterato
     {
         sal_Int32 nCount = 1;
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
-         aNewPaM.SetIndex( (USHORT)_xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
+         aNewPaM.SetIndex( (sal_uInt16)_xBI->previousCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
     }
     else
     {
@@ -1263,7 +1262,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, USHORT nCharacterIterato
     return aNewPaM;
 }
 
-EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIteratorMode )
+EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode )
 {
     EditPaM aCurPaM( rPaM );
     EditPaM aNewPaM( aCurPaM );
@@ -1272,7 +1271,7 @@ EditPaM ImpEditEngine::CursorRight( const EditPaM& rPaM, USHORT nCharacterIterat
     {
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
         sal_Int32 nCount = 1;
-        aNewPaM.SetIndex( (USHORT)_xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
+        aNewPaM.SetIndex( (sal_uInt16)_xBI->nextCharacters( *aNewPaM.GetNode(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount ) );
     }
     else
     {
@@ -1294,7 +1293,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, EditView* pView )
 
     ParaPortion* pPPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pPPortion, "No matching portion found: CursorUp ");
-    USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
 
     long nX;
@@ -1339,7 +1338,7 @@ EditPaM ImpEditEngine::CursorDown( const EditPaM& rPaM, EditView* pView )
 
     ParaPortion* pPPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pPPortion, "No matching portion found: CursorDown" );
-    USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
 
     long nX;
     if ( pView->pImpEditView->nTravelXPos == TRAVEL_X_DONTKNOW )
@@ -1383,7 +1382,7 @@ EditPaM ImpEditEngine::CursorStartOfLine( const EditPaM& rPaM )
 {
     ParaPortion* pCurPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pCurPortion, "No Portion for the PaM ?" );
-    USHORT nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pCurPortion->GetLines().GetObject(nLine);
     DBG_ASSERT( pLine, "Current line not found ?!" );
 
@@ -1396,7 +1395,7 @@ EditPaM ImpEditEngine::CursorEndOfLine( const EditPaM& rPaM )
 {
     ParaPortion* pCurPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pCurPortion, "No Portion for the PaM ?" );
-    USHORT nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
+    sal_uInt16 nLine = pCurPortion->GetLineNumber( rPaM.GetIndex() );
     EditLine* pLine = pCurPortion->GetLines().GetObject(nLine);
     DBG_ASSERT( pLine, "Current line not found ?!" );
 
@@ -1487,12 +1486,12 @@ EditPaM ImpEditEngine::PageDown( const EditPaM& rPaM, EditView* pView )
 
 EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
 {
-    USHORT nCurrentPos = rPaM.GetIndex();
+    sal_uInt16 nCurrentPos = rPaM.GetIndex();
     EditPaM aNewPaM( rPaM );
     if ( nCurrentPos == 0 )
     {
         // Previous paragraph...
-        USHORT nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+        sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
         ContentNode* pPrevNode = aEditDoc.SaveGetObject( --nCurPara );
         if ( pPrevNode )
         {
@@ -1514,7 +1513,7 @@ EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
         i18n::Boundary aBoundary = _xBI->getWordBoundary( *aNewPaM.GetNode(), nCurrentPos, aLocale, nWordType, sal_True );
         if ( aBoundary.startPos >= nCurrentPos )
             aBoundary = _xBI->previousWord( *aNewPaM.GetNode(), nCurrentPos, aLocale, nWordType );
-        aNewPaM.SetIndex( ( aBoundary.startPos != (-1) ) ? (USHORT)aBoundary.startPos : 0 );
+        aNewPaM.SetIndex( ( aBoundary.startPos != (-1) ) ? (sal_uInt16)aBoundary.startPos : 0 );
     }
 
     return aNewPaM;
@@ -1534,13 +1533,13 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
 
         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
         i18n::Boundary aBoundary = _xBI->nextWord( *aNewPaM.GetNode(), aNewPaM.GetIndex(), aLocale, nWordType );
-        aNewPaM.SetIndex( (USHORT)aBoundary.startPos );
+        aNewPaM.SetIndex( (sal_uInt16)aBoundary.startPos );
     }
     // not 'else', maybe the index reached nMax now...
     if ( aNewPaM.GetIndex() >= nMax )
     {
         // Next paragraph ...
-        USHORT nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+        sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
         ContentNode* pNextNode = aEditDoc.SaveGetObject( ++nCurPara );
         if ( pNextNode )
         {
@@ -1565,7 +1564,7 @@ EditPaM ImpEditEngine::StartOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
 
     uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
     i18n::Boundary aBoundary = _xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), aLocale, nWordType, sal_True );
-    aNewPaM.SetIndex( (USHORT)aBoundary.startPos );
+    aNewPaM.SetIndex( (sal_uInt16)aBoundary.startPos );
     return aNewPaM;
 }
 
@@ -1583,11 +1582,11 @@ EditPaM ImpEditEngine::EndOfWord( const EditPaM& rPaM, sal_Int16 nWordType )
 
     uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
     i18n::Boundary aBoundary = _xBI->getWordBoundary( *rPaM.GetNode(), rPaM.GetIndex(), aLocale, nWordType, sal_True );
-    aNewPaM.SetIndex( (USHORT)aBoundary.endPos );
+    aNewPaM.SetIndex( (sal_uInt16)aBoundary.endPos );
     return aNewPaM;
 }
 
-EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16 nWordType, BOOL bAcceptStartOfWord )
+EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16 nWordType, sal_Bool bAcceptStartOfWord )
 {
     EditSelection aNewSel( rCurSel );
     EditPaM aPaM( rCurSel.Max() );
@@ -1609,8 +1608,8 @@ EditSelection ImpEditEngine::SelectWord( const EditSelection& rCurSel, sal_Int16
         if ( ( aBoundary.endPos > aPaM.GetIndex() ) &&
              ( ( aBoundary.startPos < aPaM.GetIndex() ) || ( bAcceptStartOfWord && ( aBoundary.startPos == aPaM.GetIndex() ) ) ) )
         {
-            aNewSel.Min().SetIndex( (USHORT)aBoundary.startPos );
-            aNewSel.Max().SetIndex( (USHORT)aBoundary.endPos );
+            aNewSel.Min().SetIndex( (sal_uInt16)aBoundary.startPos );
+            aNewSel.Max().SetIndex( (sal_uInt16)aBoundary.endPos );
         }
     }
 
@@ -1631,8 +1630,8 @@ EditSelection ImpEditEngine::SelectSentence( const EditSelection& rCurSel )
     long nEnd = _xBI->endOfSentence( *pNode, rPaM.GetIndex(), GetLocale( rPaM ) );
     EditSelection aNewSel( rCurSel );
     DBG_ASSERT(nStart < pNode->Len() && nEnd <= pNode->Len(), "sentence indices out of range");
-    aNewSel.Min().SetIndex( (USHORT)nStart );
-    aNewSel.Max().SetIndex( (USHORT)nEnd );
+    aNewSel.Min().SetIndex( (sal_uInt16)nStart );
+    aNewSel.Max().SetIndex( (sal_uInt16)nEnd );
     return aNewSel;
 }
 
@@ -1643,8 +1642,8 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons
         pCTLOptions = new SvtCTLOptions;
 
     // get the index that really is first
-    USHORT nFirstPos = rCurSel.Min().GetIndex();
-    USHORT nMaxPos   = rCurSel.Max().GetIndex();
+    sal_uInt16 nFirstPos = rCurSel.Min().GetIndex();
+    sal_uInt16 nMaxPos   = rCurSel.Max().GetIndex();
     if (nMaxPos < nFirstPos)
         nFirstPos = nMaxPos;
 
@@ -1672,7 +1671,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired( sal_Unicode nChar, cons
 
 
 
-void ImpEditEngine::InitScriptTypes( USHORT nPara )
+void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara )
 {
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
     ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
@@ -1696,7 +1695,7 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
                 aText.SetChar( pField->GetStart(), aFldText.getStr()[0] );
                 short nFldScriptType = _xBI->getScriptType( aFldText, 0 );
 
-                for ( USHORT nCharInField = 1; nCharInField < aFldText.getLength(); nCharInField++ )
+                for ( sal_uInt16 nCharInField = 1; nCharInField < aFldText.getLength(); nCharInField++ )
                 {
                     short nTmpType = _xBI->getScriptType( aFldText, nCharInField );
 
@@ -1721,23 +1720,23 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
         }
 
         ::rtl::OUString aOUText( aText );
-        USHORT nTextLen = (USHORT)aOUText.getLength();
+        sal_uInt16 nTextLen = (sal_uInt16)aOUText.getLength();
 
         sal_Int32 nPos = 0;
         short nScriptType = _xBI->getScriptType( aOUText, nPos );
-        rTypes.Insert( ScriptTypePosInfo( nScriptType, (USHORT)nPos, nTextLen ), rTypes.Count() );
+        rTypes.push_back( ScriptTypePosInfo( nScriptType, (sal_uInt16)nPos, nTextLen ) );
         nPos = _xBI->endOfScript( aOUText, nPos, nScriptType );
         while ( ( nPos != (-1) ) && ( nPos < nTextLen ) )
         {
-            rTypes[rTypes.Count()-1].nEndPos = (USHORT)nPos;
+            rTypes.back().nEndPos = (sal_uInt16)nPos;
 
             nScriptType = _xBI->getScriptType( aOUText, nPos );
             long nEndPos = _xBI->endOfScript( aOUText, nPos, nScriptType );
 
-            if ( ( nScriptType == i18n::ScriptType::WEAK ) || ( nScriptType == rTypes[rTypes.Count()-1].nScriptType ) )
+            if ( ( nScriptType == i18n::ScriptType::WEAK ) || ( nScriptType == rTypes.back().nScriptType ) )
             {
                 // Expand last ScriptTypePosInfo, don't create weak or unecessary portions
-                rTypes[rTypes.Count()-1].nEndPos = (USHORT)nEndPos;
+                rTypes.back().nEndPos = (sal_uInt16)nEndPos;
             }
             else
             {
@@ -1748,67 +1747,67 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
                     case U_ENCLOSING_MARK:
                     case U_COMBINING_SPACING_MARK:
                         --nPos;
-                        rTypes[rTypes.Count()-1].nEndPos--;
+                        rTypes.back().nEndPos--;
                         break;
                     }
                 }
-                rTypes.Insert( ScriptTypePosInfo( nScriptType, (USHORT)nPos, nTextLen ), rTypes.Count() );
+                rTypes.push_back( ScriptTypePosInfo( nScriptType, (sal_uInt16)nPos, nTextLen ) );
             }
 
             nPos = nEndPos;
         }
 
         if ( rTypes[0].nScriptType == i18n::ScriptType::WEAK )
-            rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ? rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
+            rTypes[0].nScriptType = ( rTypes.size() > 1 ) ? rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
 
         // create writing direction information:
-        if ( !pParaPortion->aWritingDirectionInfos.Count() )
+        if ( pParaPortion->aWritingDirectionInfos.empty() )
             InitWritingDirections( nPara );
 
         // i89825: Use CTL font for numbers embedded into an RTL run:
         WritingDirectionInfos& rDirInfos = pParaPortion->aWritingDirectionInfos;
-        for ( USHORT n = 0; n < rDirInfos.Count(); ++n )
+        for ( size_t n = 0; n < rDirInfos.size(); ++n )
         {
             const xub_StrLen nStart = rDirInfos[n].nStartPos;
             const xub_StrLen nEnd   = rDirInfos[n].nEndPos;
-            const BYTE nCurrDirType = rDirInfos[n].nType;
+            const sal_uInt8 nCurrDirType = rDirInfos[n].nType;
 
             if ( nCurrDirType % 2 == UBIDI_RTL  || // text in RTL run
                 ( nCurrDirType > UBIDI_LTR && !lcl_HasStrongLTR( aText, nStart, nEnd ) ) ) // non-strong text in embedded LTR run
             {
-                USHORT nIdx = 0;
+                size_t nIdx = 0;
 
                 // Skip entries in ScriptArray which are not inside the RTL run:
-                while ( nIdx < rTypes.Count() && rTypes[nIdx].nStartPos < nStart )
+                while ( nIdx < rTypes.size() && rTypes[nIdx].nStartPos < nStart )
                     ++nIdx;
 
                 // Remove any entries *inside* the current run:
-                while ( nIdx < rTypes.Count() && rTypes[nIdx].nEndPos <= nEnd )
-                    rTypes.Remove( nIdx );
+                while ( nIdx < rTypes.size() && rTypes[nIdx].nEndPos <= nEnd )
+                    rTypes.erase( rTypes.begin()+nIdx );
 
                 // special case:
-                if(nIdx < rTypes.Count() && rTypes[nIdx].nStartPos < nStart && rTypes[nIdx].nEndPos > nEnd)
+                if(nIdx < rTypes.size() && rTypes[nIdx].nStartPos < nStart && rTypes[nIdx].nEndPos > nEnd)
                 {
-                    rTypes.Insert( ScriptTypePosInfo( rTypes[nIdx].nScriptType, (USHORT)nEnd, rTypes[nIdx].nEndPos ), nIdx );
+                    rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( rTypes[nIdx].nScriptType, (sal_uInt16)nEnd, rTypes[nIdx].nEndPos ) );
                     rTypes[nIdx].nEndPos = nStart;
                 }
 
                 if( nIdx )
                     rTypes[nIdx - 1].nEndPos = nStart;
 
-                rTypes.Insert( ScriptTypePosInfo( i18n::ScriptType::COMPLEX, (USHORT)nStart, (USHORT)nEnd), nIdx );
+                rTypes.insert( rTypes.begin()+nIdx, ScriptTypePosInfo( i18n::ScriptType::COMPLEX, (sal_uInt16)nStart, (sal_uInt16)nEnd) );
                 ++nIdx;
 
-                if( nIdx < rTypes.Count() )
+                if( nIdx < rTypes.size() )
                     rTypes[nIdx].nStartPos = nEnd;
             }
         }
 
 #if OSL_DEBUG_LEVEL > 1
-        USHORT nDebugStt = 0;
-        USHORT nDebugEnd = 0;
+        sal_uInt16 nDebugStt = 0;
+        sal_uInt16 nDebugEnd = 0;
         short nDebugType = 0;
-        for ( USHORT n = 0; n < rTypes.Count(); ++n )
+        for ( size_t n = 0; n < rTypes.size(); ++n )
         {
             nDebugStt  = rTypes[n].nStartPos;
             nDebugEnd  = rTypes[n].nEndPos;
@@ -1818,23 +1817,23 @@ void ImpEditEngine::InitScriptTypes( USHORT nPara )
     }
 }
 
-USHORT ImpEditEngine::GetScriptType( const EditPaM& rPaM, USHORT* pEndPos ) const
+sal_uInt16 ImpEditEngine::GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPos ) const
 {
-    USHORT nScriptType = 0;
+    sal_uInt16 nScriptType = 0;
 
     if ( pEndPos )
         *pEndPos = rPaM.GetNode()->Len();
 
     if ( rPaM.GetNode()->Len() )
     {
-         USHORT nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+         sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
-        if ( !pParaPortion->aScriptInfos.Count() )
+        if ( pParaPortion->aScriptInfos.empty() )
             ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
         ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-        USHORT nPos = rPaM.GetIndex();
-        for ( USHORT n = 0; n < rTypes.Count(); n++ )
+        sal_uInt16 nPos = rPaM.GetIndex();
+        for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if ( ( rTypes[n].nStartPos <= nPos ) && ( rTypes[n].nEndPos >= nPos ) )
                {
@@ -1848,20 +1847,20 @@ USHORT ImpEditEngine::GetScriptType( const EditPaM& rPaM, USHORT* pEndPos ) cons
     return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
 }
 
-USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
+sal_uInt16 ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
 {
     EditSelection aSel( rSel );
     aSel.Adjust( aEditDoc );
 
     short nScriptType = 0;
 
-     USHORT nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
-     USHORT nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
+     sal_uInt16 nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
+     sal_uInt16 nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
 
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
-        if ( !pParaPortion->aScriptInfos.Count() )
+        if ( pParaPortion->aScriptInfos.empty() )
             ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
         ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
@@ -1869,9 +1868,9 @@ USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
         // find the first(!) script type position that holds the
         // complete selection. Thus it will work for selections as
         // well as with just moving the cursor from char to char.
-        USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
-        USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
-        for ( USHORT n = 0; n < rTypes.Count(); n++ )
+        sal_uInt16 nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
+        sal_uInt16 nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
+        for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if (rTypes[n].nStartPos <= nS  &&  nE <= rTypes[n].nEndPos)
                {
@@ -1894,24 +1893,24 @@ USHORT ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
     return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
 }
 
-BOOL ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
+sal_Bool ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
 {
-    BOOL bScriptChange = FALSE;
+    sal_Bool bScriptChange = sal_False;
 
     if ( rPaM.GetNode()->Len() )
     {
-        USHORT nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+        sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
-        if ( !pParaPortion->aScriptInfos.Count() )
+        if ( pParaPortion->aScriptInfos.empty() )
             ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
         ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-        USHORT nPos = rPaM.GetIndex();
-        for ( USHORT n = 0; n < rTypes.Count(); n++ )
+        sal_uInt16 nPos = rPaM.GetIndex();
+        for ( size_t n = 0; n < rTypes.size(); n++ )
         {
             if ( rTypes[n].nStartPos == nPos )
                {
-                bScriptChange = TRUE;
+                bScriptChange = sal_True;
                 break;
             }
         }
@@ -1919,36 +1918,36 @@ BOOL ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
     return bScriptChange;
 }
 
-BOOL ImpEditEngine::HasScriptType( USHORT nPara, USHORT nType ) const
+sal_Bool ImpEditEngine::HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const
 {
-    BOOL bTypeFound = FALSE;
+    sal_Bool bTypeFound = sal_False;
 
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
-    if ( !pParaPortion->aScriptInfos.Count() )
+    if ( pParaPortion->aScriptInfos.empty() )
         ((ImpEditEngine*)this)->InitScriptTypes( nPara );
 
     ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-    for ( USHORT n = rTypes.Count(); n && !bTypeFound; )
+    for ( size_t n = rTypes.size(); n && !bTypeFound; )
     {
         if ( rTypes[--n].nScriptType == nType )
-                bTypeFound = TRUE;
+                bTypeFound = sal_True;
     }
     return bTypeFound;
 }
 
-void ImpEditEngine::InitWritingDirections( USHORT nPara )
+void ImpEditEngine::InitWritingDirections( sal_uInt16 nPara )
 {
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
     WritingDirectionInfos& rInfos = pParaPortion->aWritingDirectionInfos;
-    rInfos.Remove( 0, rInfos.Count() );
+    rInfos.clear();
 
-    BOOL bCTL = FALSE;
+    sal_Bool bCTL = sal_False;
     ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-    for ( USHORT n = 0; n < rTypes.Count(); n++ )
+    for ( size_t n = 0; n < rTypes.size(); n++ )
     {
         if ( rTypes[n].nScriptType == i18n::ScriptType::COMPLEX )
            {
-            bCTL = TRUE;
+            bCTL = sal_True;
             break;
         }
     }
@@ -1969,16 +1968,16 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara )
         ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError );	// UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
 
-        long nCount = ubidi_countRuns( pBidi, &nError );
+        size_t nCount = ubidi_countRuns( pBidi, &nError );
 
         int32_t nStart = 0;
         int32_t nEnd;
         UBiDiLevel nCurrDir;
 
-        for ( USHORT nIdx = 0; nIdx < nCount; ++nIdx )
+        for ( size_t nIdx = 0; nIdx < nCount; ++nIdx )
         {
             ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
-            rInfos.Insert( WritingDirectionInfo( nCurrDir, (USHORT)nStart, (USHORT)nEnd ), rInfos.Count() );
+            rInfos.push_back( WritingDirectionInfo( nCurrDir, (sal_uInt16)nStart, (sal_uInt16)nEnd ) );
             nStart = nEnd;
         }
 
@@ -1986,14 +1985,14 @@ void ImpEditEngine::InitWritingDirections( USHORT nPara )
     }
 
     // No infos mean no CTL and default dir is L2R...
-    if ( !rInfos.Count() )
-        rInfos.Insert( WritingDirectionInfo( 0, 0, (USHORT)pParaPortion->GetNode()->Len() ), rInfos.Count() );
+    if ( rInfos.empty() )
+        rInfos.push_back( WritingDirectionInfo( 0, 0, (sal_uInt16)pParaPortion->GetNode()->Len() ) );
 
 }
 
-BOOL ImpEditEngine::IsRightToLeft( USHORT nPara ) const
+sal_Bool ImpEditEngine::IsRightToLeft( sal_uInt16 nPara ) const
 {
-    BOOL bR2L = FALSE;
+    sal_Bool bR2L = sal_False;
     const SvxFrameDirectionItem* pFrameDirItem = NULL;
 
     if ( !IsVertical() )
@@ -2021,20 +2020,20 @@ BOOL ImpEditEngine::IsRightToLeft( USHORT nPara ) const
     return bR2L;
 }
 
-BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
+sal_Bool ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
 {
-    USHORT nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
+    sal_uInt16 nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
     ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
 
-    BOOL bHasDifferentRTLLevels = FALSE;
+    sal_Bool bHasDifferentRTLLevels = sal_False;
 
-    USHORT nRTLLevel = IsRightToLeft( nPara ) ? 1 : 0;
-    for ( USHORT n = 0; n < pParaPortion->GetTextPortions().Count(); n++ )
+    sal_uInt16 nRTLLevel = IsRightToLeft( nPara ) ? 1 : 0;
+    for ( sal_uInt16 n = 0; n < pParaPortion->GetTextPortions().Count(); n++ )
     {
         TextPortion* pTextPortion = pParaPortion->GetTextPortions().GetObject( n );
         if ( pTextPortion->GetRightToLeft() != nRTLLevel )
         {
-            bHasDifferentRTLLevels = TRUE;
+            bHasDifferentRTLLevels = sal_True;
             break;
         }
     }
@@ -2042,19 +2041,19 @@ BOOL ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
 }
 
 
-BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, USHORT* pEnd )
+sal_uInt8 ImpEditEngine::GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd )
 {
-    BYTE nRightToLeft = 0;
+    sal_uInt8 nRightToLeft = 0;
 
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     if ( pNode && pNode->Len() )
     {
         ParaPortion* pParaPortion = GetParaPortions().SaveGetObject( nPara );
-        if ( !pParaPortion->aWritingDirectionInfos.Count() )
+        if ( pParaPortion->aWritingDirectionInfos.empty() )
             InitWritingDirections( nPara );
 
         WritingDirectionInfos& rDirInfos = pParaPortion->aWritingDirectionInfos;
-        for ( USHORT n = 0; n < rDirInfos.Count(); n++ )
+        for ( size_t n = 0; n < rDirInfos.size(); n++ )
         {
             if ( ( rDirInfos[n].nStartPos <= nPos ) && ( rDirInfos[n].nEndPos >= nPos ) )
                {
@@ -2070,7 +2069,7 @@ BYTE ImpEditEngine::GetRightToLeft( USHORT nPara, USHORT nPos, USHORT* pStart, U
     return nRightToLeft;
 }
 
-SvxAdjust ImpEditEngine::GetJustification( USHORT nPara ) const
+SvxAdjust ImpEditEngine::GetJustification( sal_uInt16 nPara ) const
 {
     SvxAdjust eJustification = SVX_ADJUST_LEFT;
 
@@ -2107,18 +2106,17 @@ SvxCellVerJustify ImpEditEngine::GetVerJustification( USHORT nPara ) const
 //	Text changes
 //	----------------------------------------------------------------------
 
-void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndoRemoveChars* pCurUndo )
+void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
         XubString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) );
 
         // Check whether attributes are deleted or changed:
-        USHORT nStart = rPaM.GetIndex();
-        USHORT nEnd = nStart + nChars;
+        sal_uInt16 nStart = rPaM.GetIndex();
+        sal_uInt16 nEnd = nStart + nChars;
         CharAttribArray& rAttribs = rPaM.GetNode()->GetCharAttribs().GetAttribs();
-
-        for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
         {
             EditCharAttrib* pAttr = rAttribs[nAttr];
             if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetStart() < nEnd ) )
@@ -2144,10 +2142,10 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndo
     TextModified();
 }
 
-EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNewPos )
+EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16 nNewPos )
 {
     aOldPositions.Justify();
-    BOOL bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() );
+    sal_Bool bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() );
     DBG_ASSERT( bValidAction, "Move in itself?" );
     DBG_ASSERT( aOldPositions.Max() <= (long)GetParaPortions().Count(), "totally over it: MoveParagraphs" );
 
@@ -2159,7 +2157,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
         return aSelection;
     }
 
-    ULONG nParaCount = GetParaPortions().Count();
+    sal_uLong nParaCount = GetParaPortions().Count();
 
     if ( nNewPos >= nParaCount )
         nNewPos = GetParaPortions().Count();
@@ -2173,28 +2171,28 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
     if ( nNewPos == 0 )	// Move to Start
     {
         pRecalc1 = GetParaPortions().GetObject( 0 );
-        pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Min() );
+        pRecalc2 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Min() );
 
     }
     else if ( nNewPos == nParaCount )
     {
-        pRecalc1 = GetParaPortions().GetObject( (USHORT)(nParaCount-1) );
-        pRecalc2 = GetParaPortions().GetObject( (USHORT)aOldPositions.Max() );
+        pRecalc1 = GetParaPortions().GetObject( (sal_uInt16)(nParaCount-1) );
+        pRecalc2 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Max() );
     }
 
     if ( aOldPositions.Min() == 0 )	// Move from Start
     {
         pRecalc3 = GetParaPortions().GetObject( 0 );
         pRecalc4 = GetParaPortions().GetObject(
-            sal::static_int_cast< USHORT >( aOldPositions.Max()+1 ) );
+            sal::static_int_cast< sal_uInt16 >( aOldPositions.Max()+1 ) );
     }
-    else if ( (USHORT)aOldPositions.Max() == (nParaCount-1) )
+    else if ( (sal_uInt16)aOldPositions.Max() == (nParaCount-1) )
     {
-        pRecalc3 = GetParaPortions().GetObject( (USHORT)aOldPositions.Max() );
-        pRecalc4 = GetParaPortions().GetObject( (USHORT)(aOldPositions.Min()-1) );
+        pRecalc3 = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Max() );
+        pRecalc4 = GetParaPortions().GetObject( (sal_uInt16)(aOldPositions.Min()-1) );
     }
 
-    MoveParagraphsInfo aMoveParagraphsInfo( sal::static_int_cast< USHORT >(aOldPositions.Min()), sal::static_int_cast< USHORT >(aOldPositions.Max()), nNewPos );
+    MoveParagraphsInfo aMoveParagraphsInfo( sal::static_int_cast< sal_uInt16 >(aOldPositions.Min()), sal::static_int_cast< sal_uInt16 >(aOldPositions.Max()), nNewPos );
     aBeginMovingParagraphsHdl.Call( &aMoveParagraphsInfo );
 
     if ( IsUndoEnabled() && !IsInUndo())
@@ -2204,20 +2202,20 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
     ParaPortion* pDestPortion = GetParaPortions().SaveGetObject( nNewPos );
 
     ParaPortionList aTmpPortionList;
-    USHORT i;
-    for ( i = (USHORT)aOldPositions.Min(); i <= (USHORT)aOldPositions.Max(); i++  )
+    sal_uInt16 i;
+    for ( i = (sal_uInt16)aOldPositions.Min(); i <= (sal_uInt16)aOldPositions.Max(); i++  )
     {
         // always aOldPositions.Min(), since Remove().
-        ParaPortion* pTmpPortion = GetParaPortions().GetObject( (USHORT)aOldPositions.Min() );
-        GetParaPortions().Remove( (USHORT)aOldPositions.Min() );
-        aEditDoc.Remove( (USHORT)aOldPositions.Min() );
+        ParaPortion* pTmpPortion = GetParaPortions().GetObject( (sal_uInt16)aOldPositions.Min() );
+        GetParaPortions().Remove( (sal_uInt16)aOldPositions.Min() );
+        aEditDoc.Remove( (sal_uInt16)aOldPositions.Min() );
         aTmpPortionList.Insert( pTmpPortion, aTmpPortionList.Count() );
     }
 
-    USHORT nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
+    sal_uInt16 nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
     DBG_ASSERT( nRealNewPos != USHRT_MAX, "ImpMoveParagraphs: Invalid Position!" );
 
-    for ( i = 0; i < (USHORT)aTmpPortionList.Count(); i++  )
+    for ( i = 0; i < (sal_uInt16)aTmpPortionList.Count(); i++  )
     {
         ParaPortion* pTmpPortion = aTmpPortionList.GetObject( i );
         if ( i == 0 )
@@ -2239,12 +2237,12 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
         EENotify aNotify( EE_NOTIFY_PARAGRAPHSMOVED );
         aNotify.pEditEngine = GetEditEnginePtr();
         aNotify.nParagraph = nNewPos;
-        aNotify.nParam1 = sal::static_int_cast< USHORT >(aOldPositions.Min());
-        aNotify.nParam2 = sal::static_int_cast< USHORT >(aOldPositions.Max());
+        aNotify.nParam1 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Min());
+        aNotify.nParam2 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Max());
         CallNotify( aNotify );
     }
 
-    aEditDoc.SetModified( TRUE );
+    aEditDoc.SetModified( sal_True );
 
     if ( pRecalc1 )
         CalcHeight( pRecalc1 );
@@ -2264,14 +2262,14 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, USHORT nNew
 }
 
 
-EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, BOOL bBackward )
+EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, sal_Bool bBackward )
 {
     DBG_ASSERT( pLeft != pRight, "Join together the same paragraph ?" );
     DBG_ASSERT( aEditDoc.GetPos( pLeft ) != USHRT_MAX, "Inserted node not found (1)" );
     DBG_ASSERT( aEditDoc.GetPos( pRight ) != USHRT_MAX, "Inserted node not found (2)" );
 
-    USHORT nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pRight, nParagraphTobeDeleted );
+    sal_uInt16 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pRight, nParagraphTobeDeleted );
     aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
 
     GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), aEditDoc.GetPos( pRight ) );
@@ -2288,7 +2286,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
 
     if ( bBackward )
     {
-        pLeft->SetStyleSheet( pRight->GetStyleSheet(), TRUE );
+        pLeft->SetStyleSheet( pRight->GetStyleSheet(), sal_True );
         pLeft->GetContentAttribs().GetItems().Set( pRight->GetContentAttribs().GetItems() );
         pLeft->GetCharAttribs().GetDefFont() = pRight->GetCharAttribs().GetDefFont();
     }
@@ -2310,8 +2308,8 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
         pLeft->GetWrongList()->ClearWrongs( nInv, 0xFFFF, pLeft );	// Possibly remove one
         pLeft->GetWrongList()->MarkInvalid( nInv, nEnd+1 );
         // Take over misspelled words 
-        USHORT nRWrongs = pRight->GetWrongList()->Count();
-        for ( USHORT nW = 0; nW < nRWrongs; nW++ )
+        sal_uInt16 nRWrongs = pRight->GetWrongList()->Count();
+        for ( sal_uInt16 nW = 0; nW < nRWrongs; nW++ )
         {
             WrongRange aWrong = pRight->GetWrongList()->GetObject( nW );
             if ( aWrong.nStart != 0 ) 	// Not a subsequent
@@ -2339,7 +2337,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
         // By joining together the two, the left is although reformatted, 
         // however if its height does not change then the formatting receives 
         // the change of the total text hight too late...
-        for ( USHORT n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
+        for ( sal_uInt16 n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
         {
             ParaPortion* pPP = GetParaPortions().GetObject( n );
             pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
@@ -2352,7 +2350,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
     return aPaM;
 }
 
-EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode, BYTE nDelMode )
+EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 nMode, sal_uInt8 nDelMode )
 {
     DBG_ASSERT( !EditSelection( rSel ).DbgIsBuggy( aEditDoc ), "Index out of range in DeleteLeftOrRight" );
 
@@ -2429,10 +2427,10 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, BYTE nMode,
         return ImpDeleteSelection( EditSelection( aDelStart, aDelEnd ) );
 
     // Decide now if to delete selection (RESTOFCONTENTS)
-    BOOL bSpecialBackward = ( ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE ) )
-                                ? TRUE : FALSE;
+    sal_Bool bSpecialBackward = ( ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE ) )
+                                ? sal_True : sal_False;
     if ( aStatus.IsAnyOutliner() )
-        bSpecialBackward = FALSE;
+        bSpecialBackward = sal_False;
 
     return ImpConnectParagraphs( aDelStart.GetNode(), aDelEnd.GetNode(), bSpecialBackward );
 }
@@ -2452,14 +2450,14 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     DBG_ASSERT( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" );
     DBG_ASSERT( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" );
 
-    USHORT nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
 
     DBG_ASSERT( nEndNode != USHRT_MAX, "Start > End ?!" );
     DBG_ASSERT( nStartNode <= nEndNode, "Start > End ?!" );
 
     // Remove all nodes in between ....
-    for ( ULONG z = nStartNode+1; z < nEndNode; z++ )
+    for ( sal_uLong z = nStartNode+1; z < nEndNode; z++ )
     {
         // Always nStartNode+1, due to Remove()!
         ImpRemoveParagraph( nStartNode+1 );
@@ -2468,7 +2466,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     if ( aStartPaM.GetNode() != aEndPaM.GetNode() )
     {
         // The Rest of the StartNodes...
-        USHORT nChars;
+        sal_uInt16 nChars;
         nChars = aStartPaM.GetNode()->Len() - aStartPaM.GetIndex();
         ImpRemoveChars( aStartPaM, nChars );
         ParaPortion* pPortion = FindParaPortion( aStartPaM.GetNode() );
@@ -2487,7 +2485,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     }
     else
     {
-        USHORT nChars;
+        sal_uInt16 nChars;
         nChars = aEndPaM.GetIndex() - aStartPaM.GetIndex();
         ImpRemoveChars( aStartPaM, nChars );
         ParaPortion* pPortion = FindParaPortion( aStartPaM.GetNode() );
@@ -2500,7 +2498,7 @@ EditPaM ImpEditEngine::ImpDeleteSelection( EditSelection aSel )
     return aStartPaM;
 }
 
-void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
+void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     ContentNode* pNextNode = aEditDoc.SaveGetObject( nPara+1 );
@@ -2509,7 +2507,7 @@ void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
     DBG_ASSERT( pNode, "Blind Node in ImpRemoveParagraph" );
     DBG_ASSERT( pPortion, "Blind Portion in ImpRemoveParagraph(2)" );
 
-    DeletedNodeInfo* pInf = new DeletedNodeInfo( (ULONG)pNode, nPara );
+    DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pNode, nPara );
     aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
 
     // The node is managed by the undo and possibly destroyed!
@@ -2536,12 +2534,12 @@ void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
     {
         aEditDoc.RemoveItemsFromPool( pNode );
         if ( pNode->GetStyleSheet() )
-            EndListening( *pNode->GetStyleSheet(), FALSE );
+            EndListening( *pNode->GetStyleSheet(), sal_False );
         delete pNode;
     }
 }
 
-EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
+EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c, 
                                     bool bOverwrite, Window* pFrameWin )
 {
     EditSelection aSel( rCurSel );
@@ -2554,8 +2552,8 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
 
         // #i78661 allow application to turn off capitalization of
         // start sentence explicitly.
-        // (This is done by setting IsFirstWordCapitalization to FALSE.)
-        BOOL bOldCptlSttSntnc = pAutoCorrect->IsAutoCorrFlag( CptlSttSntnc );
+        // (This is done by setting IsFirstWordCapitalization to sal_False.)
+        sal_Bool bOldCptlSttSntnc = pAutoCorrect->IsAutoCorrFlag( CptlSttSntnc );
         if (!IsFirstWordCapitalization())
         {
             ESelection aESel( CreateESel(aSel) );
@@ -2581,7 +2579,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
                 EditPaM aRight2Word( WordRight( aFirstWordSel.Max(), 1 ) );
                 aSecondWordSel = SelectWord( EditSelection( aRight2Word ) );
             }
-            BOOL bIsFirstWordInFirstPara = aESel.nEndPara == 0 &&
+            sal_Bool bIsFirstWordInFirstPara = aESel.nEndPara == 0 &&
                     aFirstWordSel.Max().GetIndex() <= aSel.Max().GetIndex() &&
                     aSel.Max().GetIndex() <= aSecondWordSel.Min().GetIndex();
 
@@ -2590,7 +2588,7 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
         }
 
         ContentNode* pNode = aSel.Max().GetNode();
-        USHORT nIndex = aSel.Max().GetIndex();
+        sal_uInt16 nIndex = aSel.Max().GetIndex();
         EdtAutoCorrDoc aAuto( this, pNode, nIndex, c );
         pAutoCorrect->AutoCorrect( aAuto, *pNode, nIndex, c, !bOverwrite, pFrameWin );
         aSel.Max().SetIndex( aAuto.GetCursor() );
@@ -2605,17 +2603,17 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
 
 
 EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
-        xub_Unicode c, BOOL bOverwrite, sal_Bool bIsUserInput )
+        xub_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput )
 {
     DBG_ASSERT( c != '\t', "Tab for InsertText ?" );
     DBG_ASSERT( c != '\n', "Word wrapping for InsertText ?");
 
     EditPaM aPaM( rCurSel.Min() );
 
-    BOOL bDoOverwrite = ( bOverwrite &&
-            ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? TRUE : FALSE;
+    sal_Bool bDoOverwrite = ( bOverwrite &&
+            ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? sal_True : sal_False;
 
-    BOOL bUndoAction = ( rCurSel.HasRange() || bDoOverwrite );
+    sal_Bool bUndoAction = ( rCurSel.HasRange() || bDoOverwrite );
 
     if ( bUndoAction )
         UndoActionStart( EDITUNDO_INSERT );
@@ -2669,7 +2667,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
                     String aChgText( aNewText.copy( nChgPos ), nChgLen );
 
                     // select text from first pos to be changed to current pos
-                    EditSelection aSel( EditPaM( aPaM.GetNode(), (USHORT) nChgPos ), aPaM );
+                    EditSelection aSel( EditPaM( aPaM.GetNode(), (sal_uInt16) nChgPos ), aPaM );
 
                     if (aChgText.Len())
                         return InsertText( aSel, aChgText ); // implicitly handles undo
@@ -2690,7 +2688,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
         if ( IsUndoEnabled() && !IsInUndo() )
         {
             EditUndoInsertChars* pNewUndo = new EditUndoInsertChars( this, CreateEPaM( aPaM ), c );
-            BOOL bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? TRUE : FALSE;
+            sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
             InsertUndo( pNewUndo, bTryMerge );
         }
 
@@ -2734,10 +2732,10 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
     // Token LINE_SEP query,
     // since the MAC-Compiler makes something else from \n !
 
-    USHORT nStart = 0;
+    sal_uInt16 nStart = 0;
     while ( nStart < aText.Len() )
     {
-        USHORT nEnd = aText.Search( LINE_SEP, nStart );
+        sal_uInt16 nEnd = aText.Search( LINE_SEP, nStart );
         if ( nEnd == STRING_NOTFOUND )
             nEnd = aText.Len();	// not dereference!
 
@@ -2748,7 +2746,7 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
             xub_StrLen nChars = aPaM.GetNode()->Len() + aLine.Len();
             if ( nChars > MAXCHARSINPARA )
             {
-                USHORT nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
+                sal_uInt16 nMaxNewChars = MAXCHARSINPARA-aPaM.GetNode()->Len();
                 nEnd -= ( aLine.Len() - nMaxNewChars );	// Then the characters end up in the next paragraph.
                 aLine.Erase( nMaxNewChars );            // Delete the Rest...
             }
@@ -2761,10 +2759,10 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
                 aPaM = aEditDoc.InsertText( aPaM, aLine );
             else
             {
-                USHORT nStart2 = 0;
+                sal_uInt16 nStart2 = 0;
                 while ( nStart2 < aLine.Len() )
                 {
-                    USHORT nEnd2 = aLine.Search( '\t', nStart2 );
+                    sal_uInt16 nEnd2 = aLine.Search( '\t', nStart2 );
                     if ( nEnd2 == STRING_NOTFOUND )
                         nEnd2 = aLine.Len();	// not dereference!
 
@@ -2849,7 +2847,7 @@ EditPaM ImpEditEngine::ImpInsertFeature( EditSelection aCurSel, const SfxPoolIte
     return aPaM;
 }
 
-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, BOOL bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, sal_Bool bKeepEndingAttribs )
 {
     EditPaM aPaM;
     if ( rCurSel.HasRange() )
@@ -2860,7 +2858,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, BOOL bK
     return ImpInsertParaBreak( aPaM, bKeepEndingAttribs );
 }
 
-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, sal_Bool bKeepEndingAttribs )
 {
     if ( aEditDoc.Count() >= 0xFFFE )
     {
@@ -2883,8 +2881,8 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
         WrongList* pLWrongs = rPaM.GetNode()->GetWrongList();
         WrongList* pRWrongs = aPaM.GetNode()->GetWrongList();
         // take over misspelled words:
-        USHORT nLWrongs = pLWrongs->Count();
-        for ( USHORT nW = 0; nW < nLWrongs; nW++ )
+        sal_uInt16 nLWrongs = pLWrongs->Count();
+        for ( sal_uInt16 nW = 0; nW < nLWrongs; nW++ )
         {
             WrongRange& rWrong = pLWrongs->GetObject( nW );
             // Correct only if really a word gets overlapped in the process of
@@ -2899,7 +2897,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
             else if ( ( rWrong.nStart < nEnd ) && ( rWrong.nEnd > nEnd ) )
                 rWrong.nEnd = nEnd;
         }
-        USHORT nInv = nEnd ? nEnd-1 : nEnd;
+        sal_uInt16 nInv = nEnd ? nEnd-1 : nEnd;
         if ( nEnd )
             pLWrongs->MarkInvalid( nInv, nEnd );
         else
@@ -2916,7 +2914,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
 
     // Optimization: Do not place unnecessarily many getPos to Listen! 
     // Here, as in undo, but also in all other methods.
-    USHORT nPos = GetParaPortions().GetPos( pPortion );
+    sal_uInt16 nPos = GetParaPortions().GetPos( pPortion );
     ParaPortion* pNewPortion = new ParaPortion( aPaM.GetNode() );
     GetParaPortions().Insert( pNewPortion, nPos + 1 );
     ParaAttribsChanged( pNewPortion->GetNode() );
@@ -2928,7 +2926,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
     return aPaM;
 }
 
-EditPaM ImpEditEngine::ImpFastInsertParagraph( USHORT nPara )
+EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_uInt16 nPara )
 {
 #ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
@@ -2967,10 +2965,10 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel )
     EditPaM aPaM( ImpInsertParaBreak( aCurSel ) );
     if ( aStatus.DoAutoIndenting() )
     {
-        USHORT nPara = aEditDoc.GetPos( aPaM.GetNode() );
+        sal_uInt16 nPara = aEditDoc.GetPos( aPaM.GetNode() );
         DBG_ASSERT( nPara > 0, "AutoIndenting: Error!" );
         XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) );
-        USHORT n = 0;
+        sal_uInt16 n = 0;
         while ( ( n < aPrevParaText.Len() ) &&
                 ( ( aPrevParaText.GetChar(n) == ' ' ) || ( aPrevParaText.GetChar(n) == '\t' ) ) )
         {
@@ -2997,17 +2995,17 @@ EditPaM ImpEditEngine::InsertField( EditSelection aCurSel, const SvxFieldItem& r
     return aPaM;
 }
 
-BOOL ImpEditEngine::UpdateFields()
+sal_Bool ImpEditEngine::UpdateFields()
 {
-    BOOL bChanges = FALSE;
-    USHORT nParas = GetEditDoc().Count();
-    for ( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_Bool bChanges = sal_False;
+    sal_uInt16 nParas = GetEditDoc().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
-        BOOL bChangesInPara = FALSE;
+        sal_Bool bChangesInPara = sal_False;
         ContentNode* pNode = GetEditDoc().GetObject( nPara );
         DBG_ASSERT( pNode, "NULL-Pointer in Doc" );
         CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-        for ( USHORT nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ )
         {
             EditCharAttrib* pAttr = rAttribs[nAttr];
             if ( pAttr->Which() == EE_FEATURE_FIELD )
@@ -3026,8 +3024,8 @@ BOOL ImpEditEngine::UpdateFields()
                 pField->GetFieldValue() = aFldValue;
                 if ( *pField != *pCurrent )
                 {
-                    bChanges = TRUE;
-                    bChangesInPara = TRUE;
+                    bChanges = sal_True;
+                    bChangesInPara = sal_True;
                 }
                 delete pCurrent;
             }
@@ -3052,13 +3050,13 @@ EditPaM ImpEditEngine::InsertLineBreak( EditSelection aCurSel )
 //	----------------------------------------------------------------------
 //	Helper functions
 //	----------------------------------------------------------------------
-Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags )
+Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags )
 {
     DBG_ASSERT( GetUpdateMode(), "Must not be reached when Update=FALSE: PaMtoEditCursor" );
 
     Rectangle aEditCursor;
     long nY = 0;
-    for ( USHORT nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject(nPortion);
         ContentNode* pNode = pPortion->GetNode();
@@ -3079,14 +3077,14 @@ Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, USHORT nFlags )
     return aEditCursor;
 }
 
-EditPaM ImpEditEngine::GetPaM( Point aDocPos, BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( Point aDocPos, sal_Bool bSmart )
 {
     DBG_ASSERT( GetUpdateMode(), "Must not be reached when Update=FALSE: GetPaM" );
 
     long nY = 0;
     long nTmpHeight;
     EditPaM aPaM;
-    USHORT nPortion;
+    sal_uInt16 nPortion;
     for ( nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject(nPortion);
@@ -3126,7 +3124,7 @@ sal_uInt32 ImpEditEngine::GetTextHeight() const
     return nCurTextHeight;
 }
 
-sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
+sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
 {
     // If still not formatted and not in the process. 
     // Will be brought in the formatting for AutoPageSize.
@@ -3141,8 +3139,8 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
     // --------------------------------------------------
     // Over all the paragraphs ...
     // --------------------------------------------------
-    USHORT nParas = GetParaPortions().Count();
-    for ( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_uInt16 nParas = GetParaPortions().Count();
+    for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
         ParaPortion* pPortion = GetParaPortions().GetObject( nPara );
         if ( pPortion->IsVisible() )
@@ -3153,8 +3151,8 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
             // --------------------------------------------------
             // On the lines of the paragraph ...
             // --------------------------------------------------
-            ULONG nLines = pPortion->GetLines().Count();
-            for ( USHORT nLine = 0; nLine < nLines; nLine++ )
+            sal_uLong nLines = pPortion->GetLines().Count();
+            for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
             {
                 pLine = pPortion->GetLines().GetObject( nLine );
                 DBG_ASSERT( pLine, "NULL-Pointer in the line iterator in CalcWidth" );
@@ -3191,9 +3189,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
     return (sal_uInt32)nMaxWidth;
 }
 
-sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
+sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace )
 {
-    USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pPortion->GetNode() );
 
     // #114278# Saving both layout mode and language (since I'm
     // potentially changing both)
@@ -3205,8 +3203,8 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine,
 
     // Calculation of the width without the Indents ...
     sal_uInt32 nWidth = 0;
-    USHORT nPos = pLine->GetStart();
-    for ( USHORT nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ )
+    sal_uInt16 nPos = pLine->GetStart();
+    for ( sal_uInt16 nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ )
     {
         TextPortion* pTextPortion = pPortion->GetTextPortions().GetObject( nTP );
         switch ( pTextPortion->GetKind() )
@@ -3247,12 +3245,12 @@ sal_uInt32 ImpEditEngine::CalcTextHeight()
 {
     DBG_ASSERT( GetUpdateMode(), "Should not be used when Update=FALSE: CalcTextHeight" );
     sal_uInt32 nY = 0;
-    for ( USHORT nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+    for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
         nY += GetParaPortions()[nPortion]->GetHeight();
     return nY;
 }
 
-USHORT ImpEditEngine::GetLineCount( USHORT nParagraph ) const
+sal_uInt16 ImpEditEngine::GetLineCount( sal_uInt16 nParagraph ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3263,7 +3261,7 @@ USHORT ImpEditEngine::GetLineCount( USHORT nParagraph ) const
     return 0xFFFF;
 }
 
-xub_StrLen ImpEditEngine::GetLineLen( USHORT nParagraph, USHORT nLine ) const
+xub_StrLen ImpEditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineLen: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3278,7 +3276,7 @@ xub_StrLen ImpEditEngine::GetLineLen( USHORT nParagraph, USHORT nLine ) const
     return 0xFFFF;
 }
 
-void ImpEditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void ImpEditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3293,9 +3291,9 @@ void ImpEditEngine::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEn
     }
 }    
 
-USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 ImpEditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
-    USHORT nLineNo = 0xFFFF;
+    sal_uInt16 nLineNo = 0xFFFF;
     ContentNode* pNode = GetEditDoc().SaveGetObject( nPara );
     DBG_ASSERT( pNode, "GetLineNumberAtIndex: invalid paragraph index" );
     if (pNode)
@@ -3303,13 +3301,13 @@ USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
         // we explicitly allow for the index to point at the character right behind the text
         const bool bValidIndex = /*0 <= nIndex &&*/ nIndex <= pNode->Len();
         DBG_ASSERT( bValidIndex, "GetLineNumberAtIndex: invalid index" );
-        const USHORT nLineCount = GetLineCount( nPara );
+        const sal_uInt16 nLineCount = GetLineCount( nPara );
         if (nIndex == pNode->Len())
             nLineNo = nLineCount > 0 ? nLineCount - 1 : 0;
         else if (bValidIndex)   // nIndex < pNode->Len()
         {
-            USHORT nStart = USHRT_MAX, nEnd = USHRT_MAX;
-            for (USHORT i = 0;  i < nLineCount && nLineNo == 0xFFFF;  ++i)
+            sal_uInt16 nStart = USHRT_MAX, nEnd = USHRT_MAX;
+            for (sal_uInt16 i = 0;  i < nLineCount && nLineNo == 0xFFFF;  ++i)
             {
                 GetLineBoundaries( nStart, nEnd, nPara, i );
                 if (nStart <= nIndex && nIndex < nEnd)
@@ -3320,7 +3318,7 @@ USHORT ImpEditEngine::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
     return nLineNo;
 }
     
-USHORT ImpEditEngine::GetLineHeight( USHORT nParagraph, USHORT nLine )
+sal_uInt16 ImpEditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
 {
     DBG_ASSERT( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
     ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nParagraph );
@@ -3335,7 +3333,7 @@ USHORT ImpEditEngine::GetLineHeight( USHORT nParagraph, USHORT nLine )
     return 0xFFFF;
 }
 
-sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
+sal_uInt32 ImpEditEngine::GetParaHeight( sal_uInt16 nParagraph )
 {
     sal_uInt32 nHeight = 0;
 
@@ -3350,25 +3348,25 @@ sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
 
 void ImpEditEngine::UpdateSelections()
 {
-    USHORT nInvNodes = aDeletedNodes.Count();
+    sal_uInt16 nInvNodes = aDeletedNodes.Count();
 
     // Check whether one of the selections is at a deleted node... 
     // If the node is valid, the index has yet to be examined!
-    for ( USHORT nView = 0; nView < aEditViews.Count(); nView++ )
+    for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ )
     {
         EditView* pView = aEditViews.GetObject(nView);
         DBG_CHKOBJ( pView, EditView, 0 );
         EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
-        BOOL bChanged = FALSE;
-        for ( USHORT n = 0; n < nInvNodes; n++ )
+        sal_Bool bChanged = sal_False;
+        for ( sal_uInt16 n = 0; n < nInvNodes; n++ )
         {
             DeletedNodeInfo* pInf = aDeletedNodes.GetObject( n );
-            if ( ( ( ULONG )(aCurSel.Min().GetNode()) == pInf->GetInvalidAdress() ) ||
-                 ( ( ULONG )(aCurSel.Max().GetNode()) == pInf->GetInvalidAdress() ) )
+            if ( ( ( sal_uLong )(aCurSel.Min().GetNode()) == pInf->GetInvalidAdress() ) ||
+                 ( ( sal_uLong )(aCurSel.Max().GetNode()) == pInf->GetInvalidAdress() ) )
             {
                 // Use ParaPortions, as now also hidden paragraphs have to be
                 // taken into account!
-                USHORT nPara = pInf->GetPosition();
+                sal_uInt16 nPara = pInf->GetPosition();
                 ParaPortion* pPPortion = GetParaPortions().SaveGetObject( nPara );
                 if ( !pPPortion ) // Last paragraph
                 {
@@ -3377,8 +3375,8 @@ void ImpEditEngine::UpdateSelections()
                 }
                 DBG_ASSERT( pPPortion, "Empty Document in UpdateSelections ?" );
                 // Do not end up from a hidden paragraph:
-                USHORT nCurPara = nPara;
-                USHORT nLastPara = GetParaPortions().Count()-1;
+                sal_uInt16 nCurPara = nPara;
+                sal_uInt16 nLastPara = GetParaPortions().Count()-1;
                 while ( nPara <= nLastPara && !GetParaPortions()[nPara]->IsVisible() )
                     nPara++;
                 if ( nPara > nLastPara ) // then also backwards ...
@@ -3392,7 +3390,7 @@ void ImpEditEngine::UpdateSelections()
                 ParaPortion* pParaPortion = GetParaPortions()[nPara];
                 EditSelection aTmpSelection( EditPaM( pParaPortion->GetNode(), 0 ) );
                 pView->pImpEditView->SetEditSelection( aTmpSelection );
-                bChanged=TRUE;
+                bChanged=sal_True;
                 break;	// for loop
             }
         }
@@ -3413,7 +3411,7 @@ void ImpEditEngine::UpdateSelections()
     }
 
     // Delete ...
-    for ( USHORT n = 0; n < nInvNodes; n++ )
+    for ( sal_uInt16 n = 0; n < nInvNodes; n++ )
     {
         DeletedNodeInfo* pInf = aDeletedNodes.GetObject( n );
         delete pInf;
@@ -3421,14 +3419,14 @@ void ImpEditEngine::UpdateSelections()
     aDeletedNodes.Remove( 0, aDeletedNodes.Count() );
 }
 
-EditSelection ImpEditEngine::ConvertSelection( USHORT nStartPara, USHORT nStartPos,
-                             USHORT nEndPara, USHORT nEndPos ) const
+EditSelection ImpEditEngine::ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos,
+                             sal_uInt16 nEndPara, sal_uInt16 nEndPos ) const
 {
     EditSelection aNewSelection;
 
     // Start...
     ContentNode* pNode = aEditDoc.SaveGetObject( nStartPara );
-    USHORT nIndex = nStartPos;
+    sal_uInt16 nIndex = nStartPos;
     if ( !pNode )
     {
         pNode = aEditDoc[ aEditDoc.Count()-1 ];
@@ -3468,15 +3466,15 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
         return aMatchSel;
     }
 
-    USHORT nPos = aTmpSel.Min().GetIndex();
+    sal_uInt16 nPos = aTmpSel.Min().GetIndex();
     ContentNode* pNode = aTmpSel.Min().GetNode();
     if ( nPos >= pNode->Len() )
         return aMatchSel;
 
-    USHORT nMatchChar = aGroupChars.Search( pNode->GetChar( nPos ) );
+    sal_uInt16 nMatchChar = aGroupChars.Search( pNode->GetChar( nPos ) );
     if ( nMatchChar != STRING_NOTFOUND )
     {
-        USHORT nNode = aEditDoc.GetPos( pNode );
+        sal_uInt16 nNode = aEditDoc.GetPos( pNode );
         if ( ( nMatchChar % 2 ) == 0 )
         {
             // Search forward...
@@ -3484,8 +3482,8 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
             DBG_ASSERT( aGroupChars.Len() > (nMatchChar+1), "Invalid group of MatchChars!" );
             xub_Unicode nEC = aGroupChars.GetChar( nMatchChar+1 );
 
-            USHORT nCur = aTmpSel.Min().GetIndex()+1;
-            USHORT nLevel = 1;
+            sal_uInt16 nCur = aTmpSel.Min().GetIndex()+1;
+            sal_uInt16 nLevel = 1;
             while ( pNode && nLevel )
             {
                 XubString& rStr = *pNode;
@@ -3521,8 +3519,8 @@ EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
             xub_Unicode nEC = aGroupChars.GetChar( nMatchChar );
             xub_Unicode nSC = aGroupChars.GetChar( nMatchChar-1 );
 
-            USHORT nCur = aTmpSel.Min().GetIndex()-1;
-            USHORT nLevel = 1;
+            sal_uInt16 nCur = aTmpSel.Min().GetIndex()-1;
+            sal_uInt16 nLevel = 1;
             while ( pNode && nLevel )
             {
                 if ( pNode->Len() )
@@ -3572,7 +3570,7 @@ void ImpEditEngine::StopSelectionMode()
         pActiveView->pImpEditView->SetEditSelection( aSel );
         pActiveView->ShowCursor();
         aSelEngine.Reset();
-        bInSelection = FALSE;
+        bInSelection = sal_False;
     }
 }
 
@@ -3621,10 +3619,10 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
     aText.ConvertLineEnd();	// System specific
     pDataObj->GetString() = aText;
 
-    SvxFontItem::EnableStoreUnicodeNames( TRUE );
-    WriteBin( pDataObj->GetStream(), aSelection, TRUE );
+    SvxFontItem::EnableStoreUnicodeNames( sal_True );
+    WriteBin( pDataObj->GetStream(), aSelection, sal_True );
     pDataObj->GetStream().Seek( 0 );
-    SvxFontItem::EnableStoreUnicodeNames( FALSE );
+    SvxFontItem::EnableStoreUnicodeNames( sal_False );
 
     ((ImpEditEngine*)this)->WriteRTF( pDataObj->GetRTFStream(), aSelection );
     pDataObj->GetRTFStream().Seek( 0 );
@@ -3656,14 +3654,14 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
 #endif
 }
 
-EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial )
+EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial )
 {
     EditSelection aNewSelection( rPaM );
 
     if ( rxDataObj.is() )
     {
         datatransfer::DataFlavor aFlavor;
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
 
         if ( bUseSpecial )
         {
@@ -3680,7 +3678,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                         SvMemoryStream aBinStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ );
                         aNewSelection = Read( aBinStream, rBaseURL, EE_FORMAT_BIN, rPaM );
                     }
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
                 catch( const ::com::sun::star::uno::Exception& )
                 {
@@ -3702,7 +3700,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                             SvMemoryStream aRTFStream( aSeq.getArray(), aSeq.getLength(), STREAM_READ );
                             aNewSelection = Read( aRTFStream, rBaseURL, EE_FORMAT_RTF, rPaM );
                         }
-                        bDone = TRUE;
+                        bDone = sal_True;
                     }
                     catch( const ::com::sun::star::uno::Exception& )
                     {
@@ -3726,7 +3724,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
                     ::rtl::OUString aText;
                     aData >>= aText;
                     aNewSelection = ImpInsertText( rPaM, aText );
-                       bDone = TRUE;
+                       bDone = sal_True;
                 }
                 catch( ... )
                 {
@@ -3747,12 +3745,12 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
     {
         const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
         const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-        USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+        sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                             ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
         // only from the top ...
-        USHORT nFirstInvalid = 0xFFFF;
-        USHORT nLine;
+        sal_uInt16 nFirstInvalid = 0xFFFF;
+        sal_uInt16 nLine;
         for ( nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pL = pPortion->GetLines().GetObject( nLine );
@@ -3774,7 +3772,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
         if ( nFirstInvalid != 0 )	// Only if the first line is invalid
             aRange.Min() = aRange.Max();
 
-        USHORT nLastInvalid = pPortion->GetLines().Count()-1;
+        sal_uInt16 nLastInvalid = pPortion->GetLines().Count()-1;
         for ( nLine = nFirstInvalid; nLine < pPortion->GetLines().Count(); nLine++ )
         {
             EditLine* pL = pPortion->GetLines().GetObject( nLine );
@@ -3805,17 +3803,17 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* pPortion )
     return aRange;
 }
 
-EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, sal_Bool bSmart )
 {
     DBG_ASSERT( pPortion->IsVisible(), "Why GetPaM() for an invisible paragraph?" );
     DBG_ASSERT( IsFormatted(), "GetPaM: Not formatted" );
 
-    USHORT nCurIndex = 0;
+    sal_uInt16 nCurIndex = 0;
     EditPaM aPaM;
     aPaM.SetNode( pPortion->GetNode() );
 
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-    USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+    sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                         ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
     long nY = pPortion->GetFirstLineOffset();
@@ -3823,7 +3821,7 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart
     DBG_ASSERT( pPortion->GetLines().Count(), "Empty ParaPortion in GetPaM!" );
 
     EditLine* pLine = 0;
-    for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+    for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
     {
         EditLine* pTmpLine = pPortion->GetLines().GetObject( nLine );
         nY += pTmpLine->GetHeight();
@@ -3861,16 +3859,16 @@ EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos, BOOL bSmart
     return aPaM;
 }
 
-USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nXPos, BOOL bSmart )
+sal_uInt16 ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long nXPos, sal_Bool bSmart )
 {
     DBG_ASSERT( pLine, "No line received: GetChar" );
 
-    USHORT nChar = 0xFFFF;
-    USHORT nCurIndex = pLine->GetStart();
+    sal_uInt16 nChar = 0xFFFF;
+    sal_uInt16 nCurIndex = pLine->GetStart();
 
 
     // Search best matching portion with GetPortionXOffset()
-    for ( USHORT i = pLine->GetStartPortion(); i <= pLine->GetEndPortion(); i++ )
+    for ( sal_uInt16 i = pLine->GetStartPortion(); i <= pLine->GetEndPortion(); i++ )
     {
         TextPortion* pPortion = pParaPortion->GetTextPortions().GetObject( i );
         long nXLeft = GetPortionXOffset( pParaPortion, pLine, i );
@@ -3895,16 +3893,16 @@ USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long
             }
             else
             {
-                USHORT nMax = pPortion->GetLen();
-                USHORT nOffset = 0xFFFF;
-                USHORT nTmpCurIndex = nChar - pLine->GetStart();
+                sal_uInt16 nMax = pPortion->GetLen();
+                sal_uInt16 nOffset = 0xFFFF;
+                sal_uInt16 nTmpCurIndex = nChar - pLine->GetStart();
 
                 long nXInPortion = nXPos - nXLeft;
                 if ( pPortion->IsRightToLeft() )
                     nXInPortion = nXRight - nXPos;
 
                 // Search in Array...
-                for ( USHORT x = 0; x < nMax; x++ )
+                for ( sal_uInt16 x = 0; x < nMax; x++ )
                 {
                     long nTmpPosMax = pLine->GetCharPosArray().GetObject( nTmpCurIndex+x );
                     if ( nTmpPosMax > nXInPortion )
@@ -3943,14 +3941,14 @@ USHORT ImpEditEngine::GetChar( ParaPortion* pParaPortion, EditLine* pLine, long
                 if ( nChar && ( nChar < pParaPortion->GetNode()->Len() ) )
                 {
                     EditPaM aPaM( pParaPortion->GetNode(), nChar+1 );
-                    USHORT nScriptType = GetScriptType( aPaM );
+                    sal_uInt16 nScriptType = GetScriptType( aPaM );
                     if ( nScriptType == i18n::ScriptType::COMPLEX )
                     {
                         uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
                         sal_Int32 nCount = 1;
                         lang::Locale aLocale = GetLocale( aPaM );
-                        USHORT nRight = (USHORT)_xBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
-                        USHORT nLeft = (USHORT)_xBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+                        sal_uInt16 nRight = (sal_uInt16)_xBI->nextCharacters( *pParaPortion->GetNode(), nChar, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
+                        sal_uInt16 nLeft = (sal_uInt16)_xBI->previousCharacters( *pParaPortion->GetNode(), nRight, aLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount );
                         if ( ( nLeft != nChar ) && ( nRight != nChar ) )
                         {
                             nChar = ( Abs( nRight - nChar ) < Abs( nLeft - nChar ) ) ? nRight : nLeft;
@@ -3975,7 +3973,7 @@ Range ImpEditEngine::GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* p
 {
     Range aLineXPosStartEnd;
 
-    USHORT nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
     if ( !IsRightToLeft( nPara ) )
     {
         aLineXPosStartEnd.Min() = pLine->GetStartPosX();
@@ -3991,11 +3989,11 @@ Range ImpEditEngine::GetLineXPosStartEnd( ParaPortion* pParaPortion, EditLine* p
     return aLineXPosStartEnd;
 }
 
-long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, USHORT nTextPortion )
+long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nTextPortion )
 {
     long nX = pLine->GetStartPosX();
 
-    for ( USHORT i = pLine->GetStartPortion(); i < nTextPortion; i++ )
+    for ( sal_uInt16 i = pLine->GetStartPortion(); i < nTextPortion; i++ )
     {
         TextPortion* pPortion = pParaPortion->GetTextPortions().GetObject( i );
         switch ( pPortion->GetKind() )
@@ -4011,8 +4009,8 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin
         }
     }
 
-    USHORT nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
-    BOOL bR2LPara = IsRightToLeft( nPara );
+    sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+    sal_Bool bR2LPara = IsRightToLeft( nPara );
 
     TextPortion* pDestPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion );
     if ( pDestPortion->GetKind() != PORTIONKIND_TAB )
@@ -4080,20 +4078,20 @@ long ImpEditEngine::GetPortionXOffset( ParaPortion* pParaPortion, EditLine* pLin
     return nX;
 }
 
-long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT nIndex, BOOL bPreferPortionStart )
+long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart )
 {
     DBG_ASSERT( pLine, "No line received: GetXPos" );
     DBG_ASSERT( ( nIndex >= pLine->GetStart() ) && ( nIndex <= pLine->GetEnd() ) , "GetXPos has to be called properly!" );
 
-    BOOL bDoPreferPortionStart = bPreferPortionStart;
+    sal_Bool bDoPreferPortionStart = bPreferPortionStart;
     // Assure that the portion belongs to this line:
     if ( nIndex == pLine->GetStart() )
-        bDoPreferPortionStart = TRUE;
+        bDoPreferPortionStart = sal_True;
     else if ( nIndex == pLine->GetEnd() )
-        bDoPreferPortionStart = FALSE;
+        bDoPreferPortionStart = sal_False;
 
-    USHORT nTextPortionStart = 0;
-    USHORT nTextPortion = pParaPortion->GetTextPortions().FindPortion( nIndex, nTextPortionStart, bDoPreferPortionStart );
+    sal_uInt16 nTextPortionStart = 0;
+    sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( nIndex, nTextPortionStart, bDoPreferPortionStart );
 
     DBG_ASSERT( ( nTextPortion >= pLine->GetStartPortion() ) && ( nTextPortion <= pLine->GetEndPortion() ), "GetXPos: Portion not in current line! " );
 
@@ -4121,7 +4119,7 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                     if ( pNextPortion->GetKind() != PORTIONKIND_TAB )
                     {
                         if ( !bPreferPortionStart )
-                            nX = GetXPos( pParaPortion, pLine, nIndex, TRUE );
+                            nX = GetXPos( pParaPortion, pLine, nIndex, sal_True );
                         else if ( !IsRightToLeft( GetEditDoc().GetPos( pParaPortion->GetNode() ) ) )
                             nX += nPortionTextWidth;
                     }
@@ -4143,7 +4141,7 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
 
             if( pLine->GetCharPosArray().Count() )
             {
-                USHORT nPos = nIndex - 1 - pLine->GetStart();
+                sal_uInt16 nPos = nIndex - 1 - pLine->GetStart();
                 if( nPos >= pLine->GetCharPosArray().Count() )
                 {
                     nPos = pLine->GetCharPosArray().Count()-1;
@@ -4167,10 +4165,10 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT
                     nX += pPortion->GetExtraInfos()->nPortionOffsetX;
                     if ( pPortion->GetExtraInfos()->nAsianCompressionTypes & CHAR_PUNCTUATIONRIGHT )
                     {
-                        BYTE nType = GetCharTypeForCompression( pParaPortion->GetNode()->GetChar( nIndex ) );
+                        sal_uInt8 nType = GetCharTypeForCompression( pParaPortion->GetNode()->GetChar( nIndex ) );
                         if ( nType == CHAR_PUNCTUATIONRIGHT )
                         {
-                            USHORT n = nIndex - nTextPortionStart;
+                            sal_uInt16 n = nIndex - nTextPortionStart;
                             const sal_Int32* pDXArray = pLine->GetCharPosArray().GetData()+( nTextPortionStart-pLine->GetStart() );
                             sal_Int32 nCharWidth = ( ( (n+1) < pPortion->GetLen() ) ? pDXArray[n] : pPortion->GetSize().Width() )
                                                             - ( n ? pDXArray[n-1] : 0 );
@@ -4218,14 +4216,14 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
     if ( pPortion->IsVisible() )
     {
         DBG_ASSERT( pPortion->GetLines().Count(), "Paragraph with no lines in ParaPortion::CalcHeight" );
-        for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+        for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
             pPortion->nHeight += pPortion->GetLines().GetObject( nLine )->GetHeight();
 
         if ( !aStatus.IsOutliner() )
         {
             const SvxULSpaceItem& rULItem = (const SvxULSpaceItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_ULSPACE );
             const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-            USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
+            sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
             if ( nSBL )
             {
@@ -4235,10 +4233,10 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                     pPortion->nHeight += nSBL;
             }
 
-            USHORT nPortion = GetParaPortions().GetPos( pPortion );
+            sal_uInt16 nPortion = GetParaPortions().GetPos( pPortion );
             if ( nPortion || aStatus.ULSpaceFirstParagraph() )
             {
-                USHORT nUpper = GetYValue( rULItem.GetUpper() );
+                sal_uInt16 nUpper = GetYValue( rULItem.GetUpper() );
                 pPortion->nHeight += nUpper;
                 pPortion->nFirstLineOffset = nUpper;
             }
@@ -4261,7 +4259,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                 // Only Writer3: Do not add up, but minimum distance.
 
                 // check if distance by LineSpacing > Upper:
-                USHORT nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) );
+                sal_uInt16 nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPortion, rLSItem ) );
                 if ( nExtraSpace > pPortion->nFirstLineOffset )
                 {
                     // Paragraph becomes 'bigger':
@@ -4270,7 +4268,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                 }
 
                 // Determine nFirstLineOffset now f(pNode) => now f(pNode, pPrev):
-                USHORT nPrevLower = GetYValue( rPrevULItem.GetLower() );
+                sal_uInt16 nPrevLower = GetYValue( rPrevULItem.GetLower() );
 
                 // This PrevLower is still in the height of PrevPortion ...
                 if ( nPrevLower > pPortion->nFirstLineOffset )
@@ -4294,7 +4292,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
                     nExtraSpace = GetYValue( lcl_CalcExtraSpace( pPrev, rPrevLSItem ) );
                     if ( nExtraSpace > nPrevLower )
                     {
-                        USHORT nMoreLower = nExtraSpace - nPrevLower;
+                        sal_uInt16 nMoreLower = nExtraSpace - nPrevLower;
                         // Paragraph becomes 'bigger', 'grows' downwards:
                         if ( nMoreLower > pPortion->nFirstLineOffset )
                         {
@@ -4308,7 +4306,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
     }
 }
 
-Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, USHORT nFlags )
+Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex, sal_uInt16 nFlags )
 {
     DBG_ASSERT( pPortion->IsVisible(), "Why GetEditCursor() for an invisible paragraph?" );
     DBG_ASSERT( IsFormatted() || GetTextRanger(), "GetEditCursor: Not formatted" );
@@ -4323,14 +4321,14 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, US
     long nY = pPortion->GetFirstLineOffset();
 
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)pPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL );
-    USHORT nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
+    sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_FIX )
                         ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
-    USHORT nCurIndex = 0;
+    sal_uInt16 nCurIndex = 0;
     DBG_ASSERT( pPortion->GetLines().Count(), "Empty ParaPortion in GetEditCursor!" );
     EditLine* pLine = 0;
-    BOOL bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? TRUE : FALSE;
-    for ( USHORT nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+    sal_Bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False;
+    for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
     {
         EditLine* pTmpLine = pPortion->GetLines().GetObject( nLine );
         if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, bEOL ) ) )
@@ -4377,7 +4375,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, USHORT nIndex, US
     }
     else
     {
-        nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? TRUE : FALSE );
+        nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? sal_True : sal_False );
     }
 
     aEditCursor.Left() = aEditCursor.Right() = nX;
@@ -4412,7 +4410,7 @@ void ImpEditEngine::SetValidPaperSize( const Size& rNewSz )
         aPaperSize.Height() = nMaxHeight;
 }
 
-void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
+void ImpEditEngine::IndentBlock( EditView* pEditView, sal_Bool bRight )
 {
     ESelection aESel( CreateESel( pEditView->pImpEditView->GetEditSelection() ) );
     aESel.Adjust();
@@ -4435,7 +4433,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
                         pEditView->pImpEditView->GetEditSelection().Max() );
         UndoActionStart( bRight ? EDITUNDO_INDENTBLOCK : EDITUNDO_UNINDENTBLOCK );
 
-        for ( USHORT nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+        for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
         {
             ContentNode* pNode = GetEditDoc().GetObject( nPara );
             if ( bRight )
@@ -4467,11 +4465,11 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
             aNewSel.nEndPos = pLastNode->Len();
         pEditView->pImpEditView->SetEditSelection( CreateSel( aNewSel ) );
         pEditView->pImpEditView->DrawSelection();
-        pEditView->pImpEditView->ShowCursor( FALSE, TRUE );
+        pEditView->pImpEditView->ShowCursor( sal_False, sal_True );
     }
 }
 
-rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
+rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( sal_Bool bGetInternal ) const
 {
     rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
     if ( !xF.is() && bGetInternal )
@@ -4492,23 +4490,23 @@ svtools::ColorConfig& ImpEditEngine::GetColorConfig()
     return *pColorConfig;
 }
 
-BOOL ImpEditEngine::IsVisualCursorTravelingEnabled()
+sal_Bool ImpEditEngine::IsVisualCursorTravelingEnabled()
 {
-    BOOL bVisualCursorTravaling = FALSE;
+    sal_Bool bVisualCursorTravaling = sal_False;
 
     if( !pCTLOptions )
         pCTLOptions = new SvtCTLOptions;
 
     if ( pCTLOptions->IsCTLFontEnabled() && ( pCTLOptions->GetCTLCursorMovement() == SvtCTLOptions::MOVEMENT_VISUAL ) )
     {
-        bVisualCursorTravaling = TRUE;
+        bVisualCursorTravaling = sal_True;
     }
 
     return bVisualCursorTravaling;
 
 }
 
-BOOL ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
+sal_Bool ImpEditEngine::DoVisualCursorTraveling( const ContentNode* )
 {
     // Don't check if it's necessary, because we also need it when leaving the paragraph
     return IsVisualCursorTravelingEnabled();
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 4a92e56183..170c05af01 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -36,7 +36,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <vcl/wrkwin.hxx>
@@ -102,15 +102,15 @@ SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 );
 
 struct TabInfo
 {
-    BOOL		bValid;
+    sal_Bool		bValid;
 
     SvxTabStop	aTabStop;
     xub_StrLen	nCharPos;
-    USHORT		nTabPortion;
+    sal_uInt16		nTabPortion;
     long		nStartPosX;
     long		nTabPos;
 
-    TabInfo() { bValid = FALSE; }
+    TabInfo() { bValid = sal_False; }
 };
 
 Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
@@ -135,7 +135,7 @@ Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
     return aTranslatedPos;
 }
 
-BYTE GetCharTypeForCompression( xub_Unicode cChar )
+sal_uInt8 GetCharTypeForCompression( xub_Unicode cChar )
 {
     switch ( cChar )
     {
@@ -169,8 +169,8 @@ void lcl_DrawRedLines(
     WrongList* pWrongs, 
     short nOrientation, 
     const Point& rOrigin, 
-    BOOL bVertical,
-    BOOL bIsRightToLeft )
+    sal_Bool bVertical,
+    sal_Bool bIsRightToLeft )
 {
 #ifndef SVX_LIGHT
     // Aber nur, wenn Font nicht zu klein...
@@ -539,9 +539,9 @@ void ImpEditEngine::CheckAutoPageSize()
 {
     Size aPrevPaperSize( GetPaperSize() );
     if ( GetStatus().AutoPageWidth() )
-        aPaperSize.Width() = (long) !IsVertical() ? CalcTextWidth( TRUE ) : GetTextHeight();
+        aPaperSize.Width() = (long) !IsVertical() ? CalcTextWidth( sal_True ) : GetTextHeight();
     if ( GetStatus().AutoPageHeight() )
-        aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( TRUE );
+        aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( sal_True );
 
     SetValidPaperSize( aPaperSize );	//Min, Max beruecksichtigen
 
@@ -596,7 +596,7 @@ static sal_Int32 ImplCalculateFontIndependentLineSpacing( const sal_Int32 nFontH
     return ( nFontHeight * 12 ) / 10;	// + 20%
 }
 
-sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
+sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY )
 {
     ParaPortion* pParaPortion = GetParaPortions().GetObject( nPara );
 
@@ -605,8 +605,8 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     DBG_ASSERT( pParaPortion->IsVisible(), "Unsichtbare Absaetze nicht formatieren!" );
     DBG_ASSERT( pParaPortion->IsInvalid(), "CreateLines: Portion nicht invalid!" );
 
-    BOOL bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 );
-    BOOL bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
+    sal_Bool bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 );
+    sal_Bool bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
 
     // ---------------------------------------------------------------
     // Schnelle Sonderbehandlung fuer leere Absaetze...
@@ -640,7 +640,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     // ---------------------------------------------------------------
     ContentNode* const pNode = pParaPortion->GetNode();
 
-    BOOL bRightToLeftPara = IsRightToLeft( nPara );
+    sal_Bool bRightToLeftPara = IsRightToLeft( nPara );
 
     SvxAdjust eJustification = GetJustification( nPara );
     sal_Bool bHyphenatePara = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_HYPHENATE )).GetValue();
@@ -649,7 +649,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pNode, &nSpaceBefore, &nMinLabelWidth );
     const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pNode );
     const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&) pNode->GetContentAttribs().GetItem( EE_PARA_SBL );
-    const BOOL bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
+    const sal_Bool bScriptSpace = ((const SvxScriptSpaceItem&) pNode->GetContentAttribs().GetItem( EE_PARA_ASIANCJKSPACING )).GetValue();
 
 //	const sal_uInt16 nInvalidEnd = ( pParaPortion->GetInvalidDiff() > 0 )
 //		? pParaPortion->GetInvalidPosStart() + pParaPortion->GetInvalidDiff()
@@ -766,12 +766,12 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
     sal_Bool bSameLineAgain = sal_False;	// Fuer TextRanger, wenn sich die Hoehe aendert.
     TabInfo aCurrentTab;
 
-    BOOL bForceOneRun = bEmptyNodeWithPolygon;
-    BOOL bCompressedChars = FALSE;
+    sal_Bool bForceOneRun = bEmptyNodeWithPolygon;
+    sal_Bool bCompressedChars = sal_False;
 
     while ( ( nIndex < pNode->Len() ) || bForceOneRun )
     {
-        bForceOneRun = FALSE;
+        bForceOneRun = sal_False;
 
         sal_Bool bEOL = sal_False;
         sal_Bool bEOC = sal_False;
@@ -954,7 +954,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
                         aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
                         aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
-                        aCurrentTab.bValid = FALSE;
+                        aCurrentTab.bValid = sal_False;
 
                         // Switch direction in R2L para...
                         if ( bRightToLeftPara )
@@ -970,7 +970,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                              ( aCurrentTab.aTabStop.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL ) )
                         {
                             // Bei LEFT/DEFAULT wird dieses Tab nicht mehr betrachtet.
-                            aCurrentTab.bValid = TRUE;
+                            aCurrentTab.bValid = sal_True;
                             aCurrentTab.nStartPosX = nTmpWidth;
                             aCurrentTab.nCharPos = nTmpPos;
                             aCurrentTab.nTabPortion = nTmpPortion;
@@ -1001,7 +1001,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                             bBrokenLine = sal_True;
                         }
                         pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                     }
                     break;
                     case EE_FEATURE_LINEBR:
@@ -1011,7 +1011,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         bEOL = sal_True;
                         bLineBreak = sal_True;
                         pPortion->GetKind() = PORTIONKIND_LINEBREAK;
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                         pLine->GetCharPosArray().Insert( pPortion->GetSize().Width(), nTmpPos-pLine->GetStart() );
                     }
                     break;
@@ -1045,7 +1045,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                         }
                         // Compression in Fields????
                         // I think this could be a little bit difficult and is not very usefull
-                        bCompressedChars = FALSE;
+                        bCompressedChars = sal_False;
                     }
                     break;
                     default:	OSL_FAIL( "Was fuer ein Feature ?" );
@@ -1081,20 +1081,20 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 
                 // And now check for Compression:
                 if ( pPortion->GetLen() && GetAsianCompressionMode() )
-                    bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (sal_Int32*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, FALSE );
+                    bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (sal_Int32*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, sal_False );
 
                 nTmpWidth += pPortion->GetSize().Width();
 
                 pPortion->SetRightToLeft( GetRightToLeft( nPara, nTmpPos+1 ) );
 
-                USHORT _nPortionEnd = nTmpPos + pPortion->GetLen();
+                sal_uInt16 _nPortionEnd = nTmpPos + pPortion->GetLen();
                 if( bScriptSpace && ( _nPortionEnd < pNode->Len() ) && ( nTmpWidth < nXWidth ) && IsScriptChange( EditPaM( pNode, _nPortionEnd ) ) )
                 {
-                    BOOL bAllow = FALSE;
-                    USHORT nScriptTypeLeft = GetScriptType( EditPaM( pNode, _nPortionEnd ) );
-                    USHORT nScriptTypeRight = GetScriptType( EditPaM( pNode, _nPortionEnd+1 ) );
+                    sal_Bool bAllow = sal_False;
+                    sal_uInt16 nScriptTypeLeft = GetScriptType( EditPaM( pNode, _nPortionEnd ) );
+                    sal_uInt16 nScriptTypeRight = GetScriptType( EditPaM( pNode, _nPortionEnd+1 ) );
                     if ( ( nScriptTypeLeft == i18n::ScriptType::ASIAN ) || ( nScriptTypeRight == i18n::ScriptType::ASIAN ) )
-                        bAllow = TRUE;
+                        bAllow = sal_True;
 
                     // No spacing within L2R/R2L nesting
                     if ( bAllow )
@@ -1110,7 +1110,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
             if ( aCurrentTab.bValid && ( nTmpPortion != aCurrentTab.nTabPortion ) )
             {
                 long nWidthAfterTab = 0;
-                for ( USHORT n = aCurrentTab.nTabPortion+1; n <= nTmpPortion; n++  )
+                for ( sal_uInt16 n = aCurrentTab.nTabPortion+1; n <= nTmpPortion; n++  )
                 {
                     TextPortion* pTP = pParaPortion->GetTextPortions().GetObject( n );
                     nWidthAfterTab += pTP->GetSize().Width();
@@ -1129,12 +1129,12 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 //					nW = nWidthAfterTab;
                     String aText = GetSelected( EditSelection(  EditPaM( pParaPortion->GetNode(), nTmpPos ),
                                                                 EditPaM( pParaPortion->GetNode(), nTmpPos + pPortion->GetLen() ) ) );
-                    USHORT nDecPos = aText.Search( aCurrentTab.aTabStop.GetDecimal() );
+                    sal_uInt16 nDecPos = aText.Search( aCurrentTab.aTabStop.GetDecimal() );
                     if ( nDecPos != STRING_NOTFOUND )
                     {
                         nW -= pParaPortion->GetTextPortions().GetObject( nTmpPortion )->GetSize().Width();
                         nW += aTmpFont.QuickGetTextSize( GetRefDevice(), *pParaPortion->GetNode(), nTmpPos, nDecPos, NULL ).Width();
-                        aCurrentTab.bValid = FALSE;
+                        aCurrentTab.bValid = sal_False;
                     }
                 }
                 else
@@ -1145,7 +1145,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                 if ( nW >= nMaxW )
                 {
                     nW = nMaxW;
-                    aCurrentTab.bValid = FALSE;
+                    aCurrentTab.bValid = sal_False;
                 }
                 TextPortion* pTabPortion = pParaPortion->GetTextPortions().GetObject( aCurrentTab.nTabPortion );
                 pTabPortion->GetSize().Width() = aCurrentTab.nTabPos - aCurrentTab.nStartPosX - nW - nStartX;
@@ -1161,7 +1161,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
 
         DBG_ASSERT( pPortion, "no portion!?" );
 
-        aCurrentTab.bValid = FALSE;
+        aCurrentTab.bValid = sal_False;
 
         // das war evtl. eine Portion zu weit:
         sal_Bool bFixedEnd = sal_False;
@@ -1256,7 +1256,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
             if ( bCompressedChars && pPortion && ( pPortion->GetLen() > 1 ) && pPortion->GetExtraInfos() && pPortion->GetExtraInfos()->bCompressed )
             {
                 // I need the manipulated DXArray for determining the break postion...
-                ImplCalcAsianCompression( pNode, pPortion, nPortionStart, const_cast<sal_Int32*>(( pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()) )), 10000, TRUE );
+                ImplCalcAsianCompression( pNode, pPortion, nPortionStart, const_cast<sal_Int32*>(( pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()) )), 10000, sal_True );
             }
             if( pPortion )
                 ImpBreakLine( pParaPortion, pLine, pPortion, nPortionStart,
@@ -1554,8 +1554,8 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
                     pParaPortion->GetTextPortions().Insert( pDummyPortion, pParaPortion->GetTextPortions().Count() );
                     pLine = new EditLine;
                     pParaPortion->GetLines().Insert( pLine, ++nLine );
-                    bForceOneRun = TRUE;
-                    bProcessingEmptyLine = TRUE;
+                    bForceOneRun = sal_True;
+                    bProcessingEmptyLine = sal_True;
                 }
             }
             if ( pLine )
@@ -1644,7 +1644,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
 
     if ( !aStatus.IsOutliner() )
     {
-        USHORT nPara = GetParaPortions().GetPos( pParaPortion );
+        sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
         SvxAdjust eJustification = GetJustification( nPara );
         long nMaxLineWidth = !IsVertical() ? aPaperSize.Width() : aPaperSize.Height();
         nMaxLineWidth -= GetXValue( rLRItem.GetRight() );
@@ -1677,7 +1677,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
         }
         else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
         {
-            USHORT nPara = GetParaPortions().GetPos( pParaPortion );
+            sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
             if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Nicht die aller erste Zeile
             {
                 // #100508# There are documents with PropLineSpace 0, why?
@@ -1768,8 +1768,8 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
     else
     {
         sal_uInt16 nMinBreakPos = pLine->GetStart();
-        USHORT nAttrs = pNode->GetCharAttribs().GetAttribs().Count();
-        for ( USHORT nAttr = nAttrs; nAttr; )
+        sal_uInt16 nAttrs = pNode->GetCharAttribs().GetAttribs().Count();
+        for ( sal_uInt16 nAttr = nAttrs; nAttr; )
         {
             EditCharAttrib* pAttr = pNode->GetCharAttribs().GetAttribs()[--nAttr];
             if ( pAttr->IsFeature() && ( pAttr->GetEnd() > nMinBreakPos ) && ( pAttr->GetEnd() <= nMaxBreakPos ) )
@@ -1789,15 +1789,15 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
         i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence< PropertyValue >(), 1 );
         i18n::LineBreakUserOptions aUserOptions;
 
-        const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( SvxLocaleToLanguage( aLocale ), TRUE );
+        const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( SvxLocaleToLanguage( aLocale ), sal_True );
         aUserOptions.forbiddenBeginCharacters = pForbidden->beginLine;
         aUserOptions.forbiddenEndCharacters = pForbidden->endLine;
         aUserOptions.applyForbiddenRules = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES )).GetValue();
         aUserOptions.allowPunctuationOutsideMargin = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION )).GetValue();
-        aUserOptions.allowHyphenateEnglish = FALSE;
+        aUserOptions.allowHyphenateEnglish = sal_False;
 
         i18n::LineBreakResults aLBR = _xBI->getLineBreak( *pNode, nMaxBreakPos, aLocale, nMinBreakPos, aHyphOptions, aUserOptions );
-        nBreakPos = (USHORT)aLBR.breakIndex;
+        nBreakPos = (sal_uInt16)aLBR.breakIndex;
 
         // BUG in I18N - under special condition (break behind field, #87327#) breakIndex is < nMinBreakPos
         if ( nBreakPos < nMinBreakPos )
@@ -1839,10 +1839,10 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
 //		    sal_uInt16 nWordStart = nBreakPos;
 //		    sal_uInt16 nBreakPos_OLD = nBreakPos;
             sal_uInt16 nWordStart = nBreakPos;
-            sal_uInt16 nWordEnd = (USHORT) aBoundary.endPos;
+            sal_uInt16 nWordEnd = (sal_uInt16) aBoundary.endPos;
             DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" );
 
-            USHORT nWordLen = nWordEnd - nWordStart;
+            sal_uInt16 nWordLen = nWordEnd - nWordStart;
             if ( ( nWordEnd >= nMaxBreakPos ) && ( nWordLen > 3 ) )
             {
                 // #104415# May happen, because getLineBreak may differ from getWordBoudary with DICTIONARY_WORD
@@ -2000,16 +2000,16 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     if ( ( nRemainingSpace < 0 ) || pLine->IsEmpty() )
         return ;
 
-    const USHORT nFirstChar = pLine->GetStart();
-    const USHORT nLastChar = pLine->GetEnd() -1;	// Last zeigt dahinter
+    const sal_uInt16 nFirstChar = pLine->GetStart();
+    const sal_uInt16 nLastChar = pLine->GetEnd() -1;	// Last zeigt dahinter
     ContentNode* pNode = pParaPortion->GetNode();
 
     DBG_ASSERT( nLastChar < pNode->Len(), "AdjustBlocks: Out of range!" );
 
     // Search blanks or Kashidas...
     SvUShorts aPositions;
-    USHORT nLastScript = i18n::ScriptType::LATIN;
-    for ( USHORT nChar = nFirstChar; nChar <= nLastChar; nChar++ )
+    sal_uInt16 nLastScript = i18n::ScriptType::LATIN;
+    for ( sal_uInt16 nChar = nFirstChar; nChar <= nLastChar; nChar++ )
     {
         EditPaM aPaM( pNode, nChar+1 );
         LanguageType eLang = GetLanguage(aPaM);
@@ -2053,7 +2053,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     if ( ( pNode->GetChar( nLastChar ) == ' ' ) && ( aPositions.Count() > 1 ) && ( MsLangId::getPrimaryLanguage( GetLanguage( EditPaM( pNode, nLastChar ) ) ) != LANGUAGE_ARABIC_PRIMARY_ONLY ) )
     {
         aPositions.Remove( aPositions.Count()-1, 1 );
-        USHORT nPortionStart, nPortion;
+        sal_uInt16 nPortionStart, nPortion;
         nPortion = pParaPortion->GetTextPortions().FindPortion( nLastChar+1, nPortionStart );
         TextPortion* pLastPortion = pParaPortion->GetTextPortions()[ nPortion ];
         long nRealWidth = pLine->GetCharPosArray()[nLastChar-nFirstChar];
@@ -2072,7 +2072,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
         pLine->GetCharPosArray()[nLastChar-nFirstChar] -= nBlankWidth;
     }
 
-    USHORT nGaps = aPositions.Count();
+    sal_uInt16 nGaps = aPositions.Count();
     const long nMore4Everyone = nRemainingSpace / nGaps;
     long nSomeExtraSpace = nRemainingSpace - nMore4Everyone*nGaps;
 
@@ -2081,12 +2081,12 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
 
     // Die Positionen im Array und die Portion-Breiten korrigieren:
     // Letztes Zeichen wird schon nicht mehr beachtet...
-    for ( USHORT n = 0; n < aPositions.Count(); n++ )
+    for ( sal_uInt16 n = 0; n < aPositions.Count(); n++ )
     {
         USHORT nChar = aPositions[n];
         if ( nChar < nLastChar )
         {
-            USHORT nPortionStart, nPortion;
+            sal_uInt16 nPortionStart, nPortion;
             nPortion = pParaPortion->GetTextPortions().FindPortion( nChar, nPortionStart, true );
             TextPortion* pLastPortion = pParaPortion->GetTextPortions()[ nPortion ];
             USHORT nPortionEnd = nPortionStart + pLastPortion->GetLen();
@@ -2098,8 +2098,8 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
 
             // Correct positions in array
             // Even for kashidas just change positions, VCL will then draw the kashida automaticly
-
-            for ( USHORT _n = nChar; _n < nPortionEnd; _n++ )
+            sal_uInt16 nPortionEnd = nPortionStart + pLastPortion->GetLen();
+            for ( sal_uInt16 _n = nChar; _n < nPortionEnd; _n++ )
             {
                 pLine->GetCharPosArray()[_n-nFirstChar] += nMore4Everyone;
                 if ( nSomeExtraSpace )
@@ -2115,7 +2115,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine,
     pLine->SetTextWidth( pLine->GetTextWidth() + nRemainingSpace );
 }
 
-void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT nEnd, SvUShorts& rArray )
+void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, SvUShorts& rArray )
 {
     // the search has to be performed on a per word base
 
@@ -2126,7 +2126,7 @@ void ImpEditEngine::ImpFindKashidas( ContentNode* pNode, USHORT nStart, USHORT n
 
     while ( ( aWordSel.Min().GetNode() == pNode ) && ( aWordSel.Min().GetIndex() < nEnd ) )
     {
-        USHORT nSavPos = aWordSel.Max().GetIndex();
+        sal_uInt16 nSavPos = aWordSel.Max().GetIndex();
         if ( aWordSel.Max().GetIndex() > nEnd )
            aWordSel.Max().GetIndex() = nEnd;
 
@@ -2281,7 +2281,7 @@ sal_uInt16 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_uInt16 nP
         if ( pTextPortion->GetExtraInfos() && pTextPortion->GetExtraInfos()->bCompressed )
         {
             // We need the original size from the portion
-            USHORT nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion );
+            sal_uInt16 nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion );
                SvxFont aTmpFont( pPortion->GetNode()->GetCharAttribs().GetDefFont() );
             SeekCursor( pPortion->GetNode(), nTxtPortionStart+1, aTmpFont );
             aTmpFont.SetPhysFont( GetRefDevice() );
@@ -2320,15 +2320,15 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16& r
     }
     aPositions.Insert( pNode->Len() );
 
-    if ( !pParaPortion->aScriptInfos.Count() )
+    if ( pParaPortion->aScriptInfos.empty() )
         ((ImpEditEngine*)this)->InitScriptTypes( GetParaPortions().GetPos( pParaPortion ) );
 
     const ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-    for ( USHORT nT = 0; nT < rTypes.Count(); nT++ )
+    for ( size_t nT = 0; nT < rTypes.size(); nT++ )
         aPositions.Insert( rTypes[nT].nStartPos );
 
     const WritingDirectionInfos& rWritingDirections = pParaPortion->aWritingDirectionInfos;
-    for ( USHORT nD = 0; nD < rWritingDirections.Count(); nD++ )
+    for ( size_t nD = 0; nD < rWritingDirections.size(); nD++ )
         aPositions.Insert( rWritingDirections[nD].nStartPos );
 
     if ( mpIMEInfos && mpIMEInfos->nLen && mpIMEInfos->pAttribs && ( mpIMEInfos->aPos.GetNode() == pNode ) )
@@ -2419,7 +2419,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nSt
                     !pParaPortion->GetTextPortions()[nNewPortionPos]->GetLen() )
             {
                 DBG_ASSERT( pParaPortion->GetTextPortions()[nNewPortionPos]->GetKind() == PORTIONKIND_TEXT, "Leere Portion war keine TextPortion!" );
-                USHORT & r =
+                sal_uInt16 & r =
                     pParaPortion->GetTextPortions()[nNewPortionPos]->GetLen();
                 r = r + nNewChars;
             }
@@ -2468,7 +2468,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion* pParaPortion, sal_uInt16 nSt
         if ( ( nPos == nStartPos ) && ( (nPos+pTP->GetLen()) == nEnd ) )
         {
             // Portion entfernen;
-            BYTE nType = pTP->GetKind();
+            sal_uInt8 nType = pTP->GetKind();
             pParaPortion->GetTextPortions().Remove( nPortion );
             delete pTP;
             if ( nType == PORTIONKIND_LINEBREAK )
@@ -2533,7 +2533,7 @@ void ImpEditEngine::SetTextRanger( TextRanger* pRanger )
     }
 }
 
-void ImpEditEngine::SetVertical( BOOL bVertical )
+void ImpEditEngine::SetVertical( sal_Bool bVertical )
 {
     if ( IsVertical() != bVertical )
     {
@@ -2548,7 +2548,7 @@ void ImpEditEngine::SetVertical( BOOL bVertical )
     }
 }
 
-void ImpEditEngine::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void ImpEditEngine::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     if ( IsFixedCellHeight() != bUseFixedCellHeight )
     {
@@ -2773,7 +2773,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
             const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
             rFont.SetColor( rStyleSettings.GetHighlightTextColor() );
             rFont.SetFillColor( rStyleSettings.GetHighlightColor() );
-            rFont.SetTransparent( FALSE );
+            rFont.SetTransparent( sal_False );
         }
         else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE )
         {
@@ -3028,16 +3028,16 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                             {
                                 SeekCursor( pPortion->GetNode(), nIndex+1, aTmpFont, pOutDev );
 
-                                BOOL bDrawFrame = FALSE;
+                                sal_Bool bDrawFrame = sal_False;
 
                                 if ( ( pTextPortion->GetKind() == PORTIONKIND_FIELD ) && !aTmpFont.IsTransparent() &&
                                      ( GetBackgroundColor() != COL_AUTO ) && GetBackgroundColor().IsDark() &&
                                      ( IsAutoColorEnabled() && ( pOutDev->GetOutDevType() != OUTDEV_PRINTER ) ) )
                                 {
-                                    aTmpFont.SetTransparent( TRUE );
+                                    aTmpFont.SetTransparent( sal_True );
                                     pOutDev->SetFillColor();
                                     pOutDev->SetLineColor( GetAutoColor() );
-                                    bDrawFrame = TRUE;
+                                    bDrawFrame = sal_True;
                                 }
 
 #ifdef EDITDEBUG
@@ -3066,8 +3066,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                 ImplInitDigitMode( pOutDev, 0, 0, 0, aTmpFont.GetLanguage() );
 
                                 XubString aText;
-                                USHORT nTextStart = 0;
-                                USHORT nTextLen = 0;
+                                sal_uInt16 nTextStart = 0;
+                                sal_uInt16 nTextLen = 0;
                                 const sal_Int32* pDXArray = 0;
                                 sal_Int32* pTmpDXArray = 0;
 
@@ -3139,7 +3139,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                                 {
                                                     const String aSlash( '/' );
                                                     const short nOldEscapement = aTmpFont.GetEscapement();
-                                                    const BYTE nOldPropr = aTmpFont.GetPropr();
+                                                    const sal_uInt8 nOldPropr = aTmpFont.GetPropr();
 
                                                     aTmpFont.SetEscapement( -20 );
                                                     aTmpFont.SetPropr( 25 );
@@ -3390,7 +3390,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                             if ( bSpecialUnderline )
                                             {
                                                 Size aSz = aTmpFont.GetPhysTxtSize( pOutDev, aText, nTextStart, nTextLen );
-                                                BYTE nProp = aTmpFont.GetPropr();
+                                                sal_uInt8 nProp = aTmpFont.GetPropr();
                                                 aTmpFont.SetEscapement( 0 );
                                                 aTmpFont.SetPropr( 100 );
                                                 aTmpFont.SetPhysFont( pOutDev );
@@ -3553,7 +3553,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                         nChars = 3;	// sieht besser aus
 
                                     String aText;
-                                    aText.Fill( (USHORT)nChars, pTextPortion->GetExtraValue() );
+                                    aText.Fill( (sal_uInt16)nChars, pTextPortion->GetExtraValue() );
                                     aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.Len(), NULL );
                                     pOutDev->DrawStretchText( aTmpPos, pTextPortion->GetSize().Width(), aText );
 
@@ -3684,7 +3684,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b
                 }
             }
 
-            UINT8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
+            sal_uInt8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
             if( nColorDiff < 8 )
                 aBackgroundColor = aFontColor.IsDark() ? COL_WHITE : COL_BLACK;
             pVDev->SetBackground( aBackgroundColor );
@@ -4252,7 +4252,7 @@ void ImpEditEngine::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
             // Fonthoehe
             for ( int nItem = 0; nItem < 3; nItem++ )
             {
-                USHORT nItemId = EE_CHAR_FONTHEIGHT;
+                sal_uInt16 nItemId = EE_CHAR_FONTHEIGHT;
                 if ( nItem == 1 )
                     nItemId = EE_CHAR_FONTHEIGHT_CJK;
                 else if ( nItem == 2 )
@@ -4360,7 +4360,7 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode
     if (pNode)
     {
         // get index of paragraph
-        USHORT nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
+        sal_uInt16 nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
         DBG_ASSERT( nPara < USHRT_MAX, "node not found in array" );
         if (nPara < USHRT_MAX)
         {
@@ -4464,10 +4464,10 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x
     }
 }
 
-void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USHORT nIndex )
+void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex )
 {
-    BOOL bCTL = FALSE;
-    BYTE bR2L = FALSE;
+    sal_Bool bCTL = sal_False;
+    sal_uInt8 bR2L = sal_False;
     if ( nIndex == 0xFFFF )
     {
         bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4482,7 +4482,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, USHORT nPara, USH
                                                     // it also works for issue 55927
     }
 
-    ULONG nLayoutMode = pOutDev->GetLayoutMode();
+    sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
 
     // We always use the left postion for DrawText()
     nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL);
@@ -4562,7 +4562,7 @@ Color ImpEditEngine::GetAutoColor() const
 }
 
 
-BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, USHORT nStartPos, sal_Int32* pDXArray, USHORT n100thPercentFromMax, BOOL bManipulateDXArray )
+sal_Bool ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray )
 {
     DBG_ASSERT( GetAsianCompressionMode(), "ImplCalcAsianCompression - Why?" );
     DBG_ASSERT( pTextPortion->GetLen(), "ImplCalcAsianCompression - Empty Portion?" );
@@ -4572,18 +4572,18 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
     if ( n100thPercentFromMax == 10000 )
         pTextPortion->SetExtraInfos( NULL );
 
-    BOOL bCompressed = FALSE;
+    sal_Bool bCompressed = sal_False;
 
     if ( GetScriptType( EditPaM( pNode, nStartPos+1 ) ) == i18n::ScriptType::ASIAN )
     {
         long nNewPortionWidth = pTextPortion->GetSize().Width();
-        USHORT nPortionLen = pTextPortion->GetLen();
-        for ( USHORT n = 0; n < nPortionLen; n++ )
+        sal_uInt16 nPortionLen = pTextPortion->GetLen();
+        for ( sal_uInt16 n = 0; n < nPortionLen; n++ )
         {
-            BYTE nType = GetCharTypeForCompression( pNode->GetChar( n+nStartPos ) );
+            sal_uInt8 nType = GetCharTypeForCompression( pNode->GetChar( n+nStartPos ) );
 
-            BOOL bCompressPunctuation = ( nType == CHAR_PUNCTUATIONLEFT ) || ( nType == CHAR_PUNCTUATIONRIGHT );
-            BOOL bCompressKana = ( nType == CHAR_KANA ) && ( GetAsianCompressionMode() == text::CharacterCompressionType::PUNCTUATION_AND_KANA );
+            sal_Bool bCompressPunctuation = ( nType == CHAR_PUNCTUATIONLEFT ) || ( nType == CHAR_PUNCTUATIONRIGHT );
+            sal_Bool bCompressKana = ( nType == CHAR_KANA ) && ( GetAsianCompressionMode() == text::CharacterCompressionType::PUNCTUATION_AND_KANA );
 
             // create Extra infos only if needed...
             if ( bCompressPunctuation || bCompressKana )
@@ -4634,9 +4634,9 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
 
                 if ( nCompress )
                 {
-                    bCompressed = TRUE;
+                    bCompressed = sal_True;
                     nNewPortionWidth -= nCompress;
-                    pTextPortion->GetExtraInfos()->bCompressed = TRUE;
+                    pTextPortion->GetExtraInfos()->bCompressed = sal_True;
 
 
                     // Special handling for rightpunctuation: For the 'compression' we must
@@ -4652,19 +4652,19 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
                             if ( n )
                             {
                                 // -1: No entry for the last character
-                                for ( USHORT i = n-1; i < (nPortionLen-1); i++ )
+                                for ( sal_uInt16 i = n-1; i < (nPortionLen-1); i++ )
                                     pDXArray[i] -= nCompress;
                             }
                             else
                             {
-                                pTextPortion->GetExtraInfos()->bFirstCharIsRightPunktuation = TRUE;
+                                pTextPortion->GetExtraInfos()->bFirstCharIsRightPunktuation = sal_True;
                                 pTextPortion->GetExtraInfos()->nPortionOffsetX = -nCompress;
                             }
                         }
                         else
                         {
                             // -1: No entry for the last character
-                            for ( USHORT i = n; i < (nPortionLen-1); i++ )
+                            for ( sal_uInt16 i = n; i < (nPortionLen-1); i++ )
                                 pDXArray[i] -= nCompress;
                         }
                     }
@@ -4694,18 +4694,18 @@ BOOL ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* p
 
 void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth )
 {
-    BOOL bFoundCompressedPortion = FALSE;
+    sal_Bool bFoundCompressedPortion = sal_False;
     long nCompressed = 0;
 //    long nCompressWeight = 0;
     TextPortionList aCompressedPortions;
 
-    USHORT nPortion = pLine->GetEndPortion();
+    sal_uInt16 nPortion = pLine->GetEndPortion();
     TextPortion* pTP = pParaPortion->GetTextPortions()[ nPortion ];
     while ( pTP && ( pTP->GetKind() == PORTIONKIND_TEXT ) )
     {
         if ( pTP->GetExtraInfos() && pTP->GetExtraInfos()->bCompressed )
         {
-            bFoundCompressedPortion = TRUE;
+            bFoundCompressedPortion = sal_True;
             nCompressed += pTP->GetExtraInfos()->nOrgWidth - pTP->GetSize().Width();
             aCompressedPortions.Insert( pTP, aCompressedPortions.Count() );
         }
@@ -4723,20 +4723,20 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
             nCompressPercent /= nCompressed;
         }
 
-        for ( USHORT n = 0; n < aCompressedPortions.Count(); n++ )
+        for ( sal_uInt16 n = 0; n < aCompressedPortions.Count(); n++ )
         {
             pTP = aCompressedPortions[n];
-            pTP->GetExtraInfos()->bCompressed = FALSE;
+            pTP->GetExtraInfos()->bCompressed = sal_False;
             pTP->GetSize().Width() = pTP->GetExtraInfos()->nOrgWidth;
             if ( nCompressPercent )
             {
-                USHORT nTxtPortion = pParaPortion->GetTextPortions().GetPos( pTP );
-                USHORT nTxtPortionStart = pParaPortion->GetTextPortions().GetStartPos( nTxtPortion );
+                sal_uInt16 nTxtPortion = pParaPortion->GetTextPortions().GetPos( pTP );
+                sal_uInt16 nTxtPortionStart = pParaPortion->GetTextPortions().GetStartPos( nTxtPortion );
                 DBG_ASSERT( nTxtPortionStart >= pLine->GetStart(), "Portion doesn't belong to the line!!!" );
                 sal_Int32* pDXArray = const_cast< sal_Int32* >( pLine->GetCharPosArray().GetData()+( nTxtPortionStart-pLine->GetStart() ) );
                 if ( pTP->GetExtraInfos()->pOrgDXArray )
                     memcpy( pDXArray, pTP->GetExtraInfos()->pOrgDXArray, (pTP->GetLen()-1)*sizeof(sal_Int32) );
-                ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (USHORT)nCompressPercent, TRUE );
+                ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, sal_True );
             }
         }
     }
@@ -4745,7 +4745,7 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
 }
 
 // redesigned to work with TextMarkingVector
-void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const USHORT nIdx, const USHORT nLen) const
+void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const
 {
     // determine relevant logical text elements for the just-rendered
     // string of characters.
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 523e67e534..cc4357583f 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -94,7 +94,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
-void SwapUSHORTs( sal_uInt16& rX, sal_uInt16& rY )
+void Swapsal_uIt16s( sal_uInt16& rX, sal_uInt16& rY )
 {
     sal_uInt16 n = rX;
     rX = rY;
@@ -306,7 +306,7 @@ sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, s
     return ( rLst.Count() ? sal_True : sal_False );
 }
 
-void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, USHORT nScriptType )
+void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex, sal_uInt16 nScriptType )
 {
     sal_uInt16 nAttr = 0;
     EditCharAttrib* pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
@@ -323,7 +323,7 @@ void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 nIndex
     }
 }
 
-sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, BOOL bStoreUnicodeStrings ) const
+sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, sal_Bool bStoreUnicodeStrings ) const
 {
     BinTextObject* pObj = (BinTextObject*)CreateBinTextObject( aSel, NULL );
     pObj->StoreUnicodeStrings( bStoreUnicodeStrings );
@@ -384,21 +384,21 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
     aFontTable.Insert( 0, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
     aFontTable.Insert( 1, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
     aFontTable.Insert( 2, new SvxFontItem( (const SvxFontItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
-    for ( USHORT nScriptType = 0; nScriptType < 3; nScriptType++ )
+    for ( sal_uInt16 nScriptType = 0; nScriptType < 3; nScriptType++ )
     {
-        USHORT nWhich = EE_CHAR_FONTINFO;
+        sal_uInt16 nWhich = EE_CHAR_FONTINFO;
         if ( nScriptType == 1 )
             nWhich = EE_CHAR_FONTINFO_CJK;
         else if ( nScriptType == 2 )
             nWhich = EE_CHAR_FONTINFO_CTL;
 
-        sal_uInt16 i = 0;
-        SvxFontItem* pFontItem = (SvxFontItem*)aEditDoc.GetItemPool().GetItem( nWhich, i );
+        sal_uInt32 i = 0;
+        SvxFontItem* pFontItem = (SvxFontItem*)aEditDoc.GetItemPool().GetItem2( nWhich, i );
         while ( pFontItem )
         {
             bool bAlreadyExist = false;
-            ULONG nTestMax = nScriptType ? aFontTable.Count() : 1;
-            for ( ULONG nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ )
+            sal_uLong nTestMax = nScriptType ? aFontTable.Count() : 1;
+            for ( sal_uLong nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); nTest++ )
             {
                 bAlreadyExist = *aFontTable.Get( nTest ) == *pFontItem;
             }
@@ -406,7 +406,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
             if ( !bAlreadyExist )
                 aFontTable.Insert( aFontTable.Count(), new SvxFontItem( *pFontItem ) );
 
-            pFontItem = (SvxFontItem*)aEditDoc.GetItemPool().GetItem( nWhich, ++i );
+            pFontItem = (SvxFontItem*)aEditDoc.GetItemPool().GetItem2( nWhich, ++i );
         }
     }
 
@@ -462,17 +462,17 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 
     // Write out ColorList  ...
     SvxColorList aColorList;
-    sal_uInt16 i = 0;
-    SvxColorItem* pColorItem = (SvxColorItem*)aEditDoc.GetItemPool().GetItem( EE_CHAR_COLOR, i );
+    sal_uInt32 i = 0;
+    SvxColorItem* pColorItem = (SvxColorItem*)aEditDoc.GetItemPool().GetItem2( EE_CHAR_COLOR, i );
     while ( pColorItem )
     {
-        USHORT nPos = i;
+        sal_uInt32 nPos = i;
         if ( pColorItem->GetValue() == COL_AUTO )
             nPos = 0;
         aColorList.Insert( new SvxColorItem( *pColorItem ), nPos );
-        pColorItem = (SvxColorItem*)aEditDoc.GetItemPool().GetItem( EE_CHAR_COLOR, ++i );
+        pColorItem = (SvxColorItem*)aEditDoc.GetItemPool().GetItem2( EE_CHAR_COLOR, ++i );
     }
-    aColorList.Insert( new SvxColorItem( (const SvxColorItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_COLOR) ), (sal_uInt32)i );
+    aColorList.Insert( new SvxColorItem( (const SvxColorItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_COLOR) ), i );
 
     rOutput << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
     for ( j = 0; j < aColorList.Count(); j++ )
@@ -665,7 +665,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
             else
             {
                 aAttribItems.Clear();
-                USHORT nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
+                sal_uInt16 nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
                 if ( !n || IsScriptChange( EditPaM( pNode, nIndex ) ) )
                 {
                     SfxItemSet aAttribs = GetAttribs( nNode, nIndex+1, nIndex+1 );
@@ -682,8 +682,8 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
                 if ( WriteItemListAsRTF( aAttribItems, rOutput, nNode, nIndex, aFontTable, aColorList ) )
                     rOutput << ' ';
 
-                USHORT nS = nIndex;
-                USHORT nE = nIndex + pTextPortion->GetLen();
+                sal_uInt16 nS = nIndex;
+                sal_uInt16 nE = nIndex + pTextPortion->GetLen();
                 if ( n == nStartPortion )
                     nS = nStartPos;
                 if ( n == nEndPortion )
@@ -712,7 +712,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 #if defined (EDITDEBUG) && !defined( UNX )
     {
         SvFileStream aStream( String( RTL_CONSTASCII_USTRINGPARAM ( "d:\\rtf_out.rtf" ) ), STREAM_WRITE|STREAM_TRUNC );
-        ULONG nP = rOutput.Tell();
+        sal_uLong nP = rOutput.Tell();
         rOutput.Seek( 0 );
         aStream << rOutput;
         rOutput.Seek( nP );
@@ -930,7 +930,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         break;
         case EE_CHAR_RELIEF:
         {
-            USHORT nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
+            sal_uInt16 nRelief = ((const SvxCharReliefItem&)rItem).GetValue();
             if ( nRelief == RELIEF_EMBOSSED )
                 rOutput << OOO_STRING_SVTOOLS_RTF_EMBO;
             if ( nRelief == RELIEF_ENGRAVED )
@@ -939,7 +939,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
         break;
         case EE_CHAR_EMPHASISMARK:
         {
-            USHORT nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
+            sal_uInt16 nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue();
             if ( nMark == EMPHASISMARK_NONE )
                 rOutput << OOO_STRING_SVTOOLS_RTF_ACCNONE;
             else if ( nMark == EMPHASISMARK_SIDE_DOTS )
@@ -1171,7 +1171,7 @@ EditTextObject*	ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
                 pX->aLines.Insert( pNew, pX->aLines.Count() );
             }
 #ifdef DBG_UTIL
-            USHORT nTest;
+            sal_uInt16 nTest;
             int nTPLen = 0, nTxtLen = 0;
             for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
                 nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
@@ -1268,7 +1268,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
         sal_uInt16 nNewAttribs = pC->GetAttribs().Count();
         if ( nNewAttribs )
         {
-            BOOL bUpdateFields = FALSE;
+            sal_Bool bUpdateFields = sal_False;
             for ( sal_uInt16 nAttr = 0; nAttr < nNewAttribs; nAttr++ )
             {
                 XEditAttribute* pX = pC->GetAttribs().GetObject( nAttr );
@@ -1295,7 +1295,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
                         DBG_ASSERT( pAttr->GetEnd() <= aPaM.GetNode()->Len(), "InsertBinTextObject: Attribute does not fit! (1)" );
                         aPaM.GetNode()->GetCharAttribs().InsertAttrib( pAttr );
                         if ( pAttr->Which() == EE_FEATURE_FIELD )
-                            bUpdateFields = TRUE;
+                            bUpdateFields = sal_True;
                     }
                     else
                     {
@@ -1369,7 +1369,7 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
                     pParaPortion->GetLines().Insert( pNew, m );
                 }
 #ifdef DBG_UTIL
-                USHORT nTest;
+                sal_uInt16 nTest;
                 int nTPLen = 0, nTxtLen = 0;
                 for ( nTest = pParaPortion->GetTextPortions().Count(); nTest; )
                     nTPLen += pParaPortion->GetTextPortions().GetObject( --nTest )->GetLen();
@@ -1409,10 +1409,10 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
     return aSel;
 }
 
-LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, USHORT* pEndPos ) const
+LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, sal_uInt16* pEndPos ) const
 {
     short nScriptType = GetScriptType( rPaM, pEndPos );	// pEndPos will be valid now, pointing to ScriptChange or NodeLen
-    USHORT nLangId = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
+    sal_uInt16 nLangId = GetScriptItemId( EE_CHAR_LANGUAGE, nScriptType );
     const SvxLanguageItem* pLangItem = &(const SvxLanguageItem&)rPaM.GetNode()->GetContentAttribs().GetItem( nLangId );
     EditCharAttrib*	pAttr = rPaM.GetNode()->GetCharAttribs().FindAttrib( nLangId, rPaM.GetIndex() );
     if ( pAttr )
@@ -1515,15 +1515,15 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 #else
     sal_Bool    bHasConvTxt = sal_False;
 
-    USHORT nParas = pEditEngine->GetParagraphCount();
-    for (USHORT k = 0;  k < nParas;  ++k)
+    sal_uInt16 nParas = pEditEngine->GetParagraphCount();
+    for (sal_uInt16 k = 0;  k < nParas;  ++k)
     {
         SvUShorts aPortions;
         pEditEngine->GetPortions( k, aPortions );
-        for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
         {
-            USHORT nEnd   = aPortions.GetObject( nPos );
-            USHORT nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+            sal_uInt16 nEnd   = aPortions.GetObject( nPos );
+            sal_uInt16 nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
             // if the paragraph is not empty we need to increase the index
             // by one since the attribute of the character left to the
@@ -1549,7 +1549,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 
 void ImpEditEngine::Convert( EditView* pEditView,
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-        INT32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
+        sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
     // modified version of ImpEditEngine::Spell
 
@@ -1584,7 +1584,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
         // not work. Thus since chinese conversion is not interactive we start
         // at the begin of the paragraph to solve the problem, i.e. have the
         // TextConversion service get those characters together in the same call.
-        USHORT nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
+        sal_uInt16 nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
                                 0 : aWordStartPaM.GetIndex();
         pConvInfo->aConvStart.nIndex = nStartIdx;
     }
@@ -1616,12 +1616,12 @@ void ImpEditEngine::Convert( EditView* pEditView,
     // disallow formatting, updating the view, ... while
     // non-interactively converting the document. (saves time)
     //if (!bIsInteractive)
-    //	SetUpdateMode( FALSE );
+    //	SetUpdateMode( sal_False );
 
     aWrp.Convert();
 
     //if (!bIsInteractive)
-    //SetUpdateMode( TRUE, 0, TRUE );
+    //SetUpdateMode( sal_True, 0, sal_True );
 
     if ( !bMultipleDoc )
     {
@@ -1641,8 +1641,8 @@ void ImpEditEngine::Convert( EditView* pEditView,
 
 void ImpEditEngine::SetLanguageAndFont(
     const ESelection &rESel,
-    LanguageType nLang, USHORT nLangWhichId,
-    const Font *pFont,  USHORT nFontWhichId )
+    LanguageType nLang, sal_uInt16 nLangWhichId,
+    const Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = pActiveView->GetSelection();
     pActiveView->SetSelection( rESel );
@@ -1702,7 +1702,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
         if (bAllowImplicitChangesForNotConvertibleText &&
             !pEditEngine->GetText( pConvInfo->aConvContinue.nPara ).Len())
         {
-            USHORT nPara = pConvInfo->aConvContinue.nPara;
+            sal_uInt16 nPara = pConvInfo->aConvContinue.nPara;
             ESelection aESel( nPara, 0, nPara, 0 );
             // see comment for below same function call
             SetLanguageAndFont( aESel,
@@ -1715,22 +1715,22 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
             pConvInfo->aConvContinue.nIndex >= pConvInfo->aConvTo.nIndex)
             break;
 
-        USHORT nAttribStart	= USHRT_MAX;
-        USHORT nAttribEnd	= USHRT_MAX;
-        USHORT nCurPos		= USHRT_MAX;
+        sal_uInt16 nAttribStart	= USHRT_MAX;
+        sal_uInt16 nAttribEnd	= USHRT_MAX;
+        sal_uInt16 nCurPos		= USHRT_MAX;
         EPaM aCurStart = CreateEPaM( aCurSel.Min() );
         SvUShorts aPortions;
-        pEditEngine->GetPortions( (USHORT)aCurStart.nPara, aPortions );
-        for ( USHORT nPos = 0; nPos < aPortions.Count(); ++nPos )
+        pEditEngine->GetPortions( (sal_uInt16)aCurStart.nPara, aPortions );
+        for ( sal_uInt16 nPos = 0; nPos < aPortions.Count(); ++nPos )
         {
-            USHORT nEnd	  = aPortions.GetObject( nPos );
-            USHORT nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
+            sal_uInt16 nEnd	  = aPortions.GetObject( nPos );
+            sal_uInt16 nStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0;
 
             // the language attribute is obtained from the left character
             // (like usually all other attributes)
             // thus we usually have to add 1 in order to get the language
             // of the text right to the cursor position
-            USHORT nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
+            sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
             LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx );
 #ifdef DEBUG
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
@@ -2102,7 +2102,7 @@ void ImpEditEngine::AddPortionIterated(
                     pFieldAttr->GetStart() == aCursor.GetIndex() &&
                     pFieldAttr->GetStart() != pFieldAttr->GetEnd() &&
                     pFieldAttr->Which() == EE_FEATURE_FIELD;
-            USHORT nEndField = bIsField ? pFieldAttr->GetEnd() : USHRT_MAX;
+            sal_uInt16 nEndField = bIsField ? pFieldAttr->GetEnd() : USHRT_MAX;
             bool bIsEndField = false;
             do
             {
@@ -2184,8 +2184,8 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
                     rEditView.pImpEditView->SetEditSelection( aCurrentOldPosition->Max() );
                 }
 
-                USHORT nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
-                USHORT nLangWhichId = EE_CHAR_LANGUAGE;
+                sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
+                sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE;
                 switch(nScriptType)
                 {
                     case SCRIPTTYPE_ASIAN : nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
@@ -2231,8 +2231,8 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
                 LanguageType eCurLanguage = GetLanguage( aCurrentPaM );
                 if(eCurLanguage != aCurrentNewPortion->eLanguage)
                 {
-                    USHORT nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
-                    USHORT nLangWhichId = EE_CHAR_LANGUAGE;
+                    sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( aCurrentNewPortion->eLanguage );
+                    sal_uInt16 nLangWhichId = EE_CHAR_LANGUAGE;
                     switch(nScriptType)
                     {
                         case SCRIPTTYPE_ASIAN : nLangWhichId = EE_CHAR_LANGUAGE_CJK; break;
@@ -2264,7 +2264,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
         rEditView.pImpEditView->SetEditSelection( aNext );
         
         FormatAndUpdate();
-        aEditDoc.SetModified(TRUE);
+        aEditDoc.SetModified(sal_True);
     }
 #endif
 }
@@ -2619,7 +2619,7 @@ sal_uInt16 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxS
     return nFound;
 }
 
-BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditView )
+sal_Bool ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditView )
 {
     EditSelection aSel( pEditView->pImpEditView->GetEditSelection() );
     aSel.Adjust( aEditDoc );
@@ -2628,7 +2628,7 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie
         aStartPaM = aSel.Min();
 
     EditSelection aFoundSel;
-    BOOL bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel );
+    sal_Bool bFound = ImpSearch( rSearchItem, aSel, aStartPaM, aFoundSel );
     if ( bFound && ( aFoundSel == aSel ) )	// For backwards-search
     {
         aStartPaM = aSel.Min();
@@ -2640,14 +2640,14 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie
     {
         // First, set the minimum, so the whole word is in the visible range.
         pEditView->pImpEditView->SetEditSelection( aFoundSel.Min() );
-        pEditView->ShowCursor( TRUE, FALSE );
+        pEditView->ShowCursor( sal_True, sal_False );
         pEditView->pImpEditView->SetEditSelection( aFoundSel );
     }
     else
         pEditView->pImpEditView->SetEditSelection( aSel.Max() );
 
     pEditView->pImpEditView->DrawSelection();
-    pEditView->ShowCursor( TRUE, FALSE );
+    pEditView->ShowCursor( sal_True, sal_False );
     return bFound;
 }
 
@@ -2706,7 +2706,7 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
         bool bFound = false;
         if ( bBack )
         {
-            SwapUSHORTs( nStartPos, nEndPos );
+            Swapsal_uIt16s( nStartPos, nEndPos );
             bFound = aSearcher.SearchBkwrd( aParaStr, &nStartPos, &nEndPos);
         }
         else
@@ -2753,7 +2753,7 @@ void ImpEditEngine::SetAutoCompleteText( const String& rStr, sal_Bool bClearTipW
 
 struct TransliterationChgData
 {
-    USHORT                      nStart;
+    sal_uInt16                      nStart;
     xub_StrLen                  nLen;
     EditSelection               aSelection;
     String                      aNewText;
@@ -2775,17 +2775,17 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
     EditSelection aNewSel( aSel );
 
-    const USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    const USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    const sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    const sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
-    BOOL bChanges = FALSE;
-    BOOL bLenChanged = FALSE;
+    sal_Bool bChanges = sal_False;
+    sal_Bool bLenChanged = sal_False;
     EditUndoTransliteration* pUndo = NULL;
 
     utl::TransliterationWrapper aTranslitarationWrapper( ::comphelper::getProcessServiceFactory(), nTransliterationMode );
-    BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
+    sal_Bool bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
 
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++	)
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++	)
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         xub_StrLen nStartPos = 0;
@@ -2795,8 +2795,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
         if ( nNode == nEndNode ) // can also be == nStart!
             nEndPos = aSel.Max().GetIndex();
 
-        USHORT nCurrentStart = nStartPos;
-        USHORT nCurrentEnd = nEndPos;
+        sal_uInt16 nCurrentStart = nStartPos;
+        sal_uInt16 nCurrentEnd = nEndPos;
         sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
 
         // since we don't use Hiragana/Katakana or half-width/full-width transliterations here
@@ -2823,12 +2823,12 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
             i18n::Boundary aEndBndry;
             aSttBndry = _xBI->getWordBoundary(
                         *pNode, nStartPos,
-                        SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ),
-                        nWordType, TRUE /*prefer forward direction*/);
+                        SvxCreateLocale( GetLanguage( EditPaM( pNode, nStartPos + 1 ) ) ), 
+                        nWordType, sal_True /*prefer forward direction*/);
             aEndBndry = _xBI->getWordBoundary(
                         *pNode, nEndPos,
-                        SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ),
-                        nWordType, FALSE /*prefer backward direction*/);
+                        SvxCreateLocale( GetLanguage( EditPaM( pNode, nEndPos + 1 ) ) ), 
+                        nWordType, sal_False /*prefer backward direction*/);
 
             // prevent backtracking to the previous word if selection is at word boundary
             if (aSttBndry.endPos <= nStartPos)
@@ -3040,22 +3040,22 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
             {
                 const TransliterationChgData &rData = aChanges[ aChanges.size() - 1 - i ];
 
-                bChanges = TRUE;
+                bChanges = sal_True;
                 if (rData.nLen != rData.aNewText.Len())
-                    bLenChanged = TRUE;
+                    bLenChanged = sal_True;
 
                 // Change text without loosing the attributes
-                USHORT nDiffs = ReplaceTextOnly( rData.aSelection.Min().GetNode(),
+                sal_uInt16 nDiffs = ReplaceTextOnly( rData.aSelection.Min().GetNode(),
                         rData.nStart, rData.nLen, rData.aNewText, rData.aOffsets );
 
                 // adjust selection in end node to possibly changed size
                 if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode())
                     aNewSel.Max().GetIndex() = aNewSel.Max().GetIndex() + nDiffs;
 
-                USHORT nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
+                sal_uInt16 nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
                 ParaPortion* pParaPortion = GetParaPortions()[nSelNode];
-                pParaPortion->MarkSelectionInvalid( rData.nStart,
-                        std::max< USHORT >( rData.nStart + rData.nLen,
+                pParaPortion->MarkSelectionInvalid( rData.nStart, 
+                        std::max< sal_uInt16 >( rData.nStart + rData.nLen, 
                                             rData.nStart + rData.aNewText.Len() ) );
             }
         } 
@@ -3085,20 +3085,20 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
 short ImpEditEngine::ReplaceTextOnly(
     ContentNode* pNode,
-    USHORT nCurrentStart, xub_StrLen nLen,
+    sal_uInt16 nCurrentStart, xub_StrLen nLen,
     const String& rNewText,
     const uno::Sequence< sal_Int32 >& rOffsets )
 {
     (void)  nLen;
 
     // Change text without loosing the attributes
-    USHORT nCharsAfterTransliteration =
-        sal::static_int_cast< USHORT >(rOffsets.getLength());
+    sal_uInt16 nCharsAfterTransliteration =
+        sal::static_int_cast< sal_uInt16 >(rOffsets.getLength());
     const sal_Int32* pOffsets = rOffsets.getConstArray();
     short nDiffs = 0;
-    for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ )
+    for ( sal_uInt16 n = 0; n < nCharsAfterTransliteration; n++ )
     {
-        USHORT nCurrentPos = nCurrentStart+n;
+        sal_uInt16 nCurrentPos = nCurrentStart+n;
         sal_Int32 nDiff = (nCurrentPos-nDiffs) - pOffsets[n];
 
         if ( !nDiff )
@@ -3113,7 +3113,7 @@ short ImpEditEngine::ReplaceTextOnly(
             pNode->SetChar( nCurrentPos, rNewText.GetChar(n) );
 
             DBG_ASSERT( (nCurrentPos+1) < pNode->Len(), "TransliterateText - String smaller than expected!" );
-            GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< USHORT >(-nDiff) );
+            GetEditDoc().RemoveChars( EditPaM( pNode, nCurrentPos+1 ), sal::static_int_cast< sal_uInt16 >(-nDiff) );
         }
         else
         {
@@ -3128,7 +3128,7 @@ short ImpEditEngine::ReplaceTextOnly(
 }
 
 
-void ImpEditEngine::SetAsianCompressionMode( USHORT n )
+void ImpEditEngine::SetAsianCompressionMode( sal_uInt16 n )
 {
     if ( n != nAsianCompressionMode )
     {
@@ -3141,7 +3141,7 @@ void ImpEditEngine::SetAsianCompressionMode( USHORT n )
     }
 }
 
-void ImpEditEngine::SetKernAsianPunctuation( BOOL b )
+void ImpEditEngine::SetKernAsianPunctuation( sal_Bool b )
 {
     if ( b != bKernAsianPunctuation )
     {
@@ -3154,7 +3154,7 @@ void ImpEditEngine::SetKernAsianPunctuation( BOOL b )
     }
 }
 
-void ImpEditEngine::SetAddExtLeading( BOOL bExtLeading )
+void ImpEditEngine::SetAddExtLeading( sal_Bool bExtLeading )
 {
     if ( IsAddExtLeading() != bExtLeading )
     {
@@ -3169,7 +3169,7 @@ void ImpEditEngine::SetAddExtLeading( BOOL bExtLeading )
 
 
 
-BOOL ImpEditEngine::ImplHasText() const
+sal_Bool ImpEditEngine::ImplHasText() const
 {
     return ( ( GetEditDoc().Count() > 1 ) || GetEditDoc().GetObject(0)->Len() );
 }
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 2f9b039521..80b6e2dd7f 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -48,7 +48,7 @@ void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
     }
 }
 
-SfxStyleSheet* ImpEditEngine::GetStyleSheet( USHORT nPara ) const
+SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_uInt16 nPara ) const
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
@@ -58,19 +58,19 @@ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle )
 {
     aSel.Adjust( aEditDoc );
 
-    USHORT nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
 
-    BOOL _bUpdate = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool _bUpdate = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
-    for ( USHORT n = nStartPara; n <= nEndPara; n++ )
+    for ( sal_uInt16 n = nStartPara; n <= nEndPara; n++ )
         SetStyleSheet( n, pStyle );
 
     SetUpdateMode( _bUpdate, 0 );
 }
 
-void ImpEditEngine::SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle )
+void ImpEditEngine::SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle )
 {
     DBG_ASSERT( GetStyleSheetPool() || !pStyle, "SetStyleSheet: No StyleSheetPool registered!" );
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
@@ -94,10 +94,10 @@ void ImpEditEngine::SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle )
                         pNode->GetContentAttribs().GetItems() ) );
         }
         if ( pCurStyle )
-            EndListening( *pCurStyle, FALSE );
+            EndListening( *pCurStyle, sal_False );
         pNode->SetStyleSheet( pStyle, aStatus.UseCharAttribs() );
         if ( pStyle )
-            StartListening( *pStyle, FALSE );
+            StartListening( *pStyle, sal_False );
         ParaAttribsChanged( pNode );
     }
     FormatAndUpdate();
@@ -108,17 +108,17 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
     SvxFont aFontFromStyle;
     CreateFont( aFontFromStyle, pStyle->GetItemSet() );
 
-    BOOL bUsed = FALSE;
-    for ( USHORT nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+    sal_Bool bUsed = sal_False;
+    for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         if ( pNode->GetStyleSheet() == pStyle )
         {
-            bUsed = TRUE;
+            bUsed = sal_True;
             if ( aStatus.UseCharAttribs() )
                 pNode->SetStyleSheet( pStyle, aFontFromStyle );
             else
-                pNode->SetStyleSheet( pStyle, FALSE );
+                pNode->SetStyleSheet( pStyle, sal_False );
 
             ParaAttribsChanged( pNode );
         }
@@ -132,7 +132,7 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
 
 void ImpEditEngine::RemoveStyleFromParagraphs( SfxStyleSheet* pStyle )
 {
-    for ( USHORT nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+    for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
     {
         ContentNode* pNode = aEditDoc.GetObject(nNode);
         if ( pNode->GetStyleSheet() == pStyle )
@@ -152,7 +152,7 @@ void ImpEditEngine::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
         SfxStyleSheet* pStyle = NULL;
-        ULONG nId = 0;
+        sal_uLong nId = 0;
 
         if ( rHint.ISA( SfxStyleSheetHint ) )
         {
@@ -191,8 +191,8 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
 
     ESelection aESel( CreateESel( aSel ) );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     DBG_ASSERT( nStartNode <= nEndNode, "CreateAttribUndo: Start > End ?!" );
 
@@ -210,14 +210,14 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
 
     SfxItemPool* pPool = pUndo->GetNewAttribs().GetPool();
 
-    for ( USHORT nPara = nStartNode; nPara <= nEndNode; nPara++ )
+    for ( sal_uInt16 nPara = nStartNode; nPara <= nEndNode; nPara++ )
     {
         ContentNode* pNode = aEditDoc.GetObject( nPara );
         DBG_ASSERT( aEditDoc.SaveGetObject( nPara ), "Node not found: CreateAttribUndo" );
         ContentAttribsInfo* pInf = new ContentAttribsInfo( pNode->GetContentAttribs().GetItems() );
         pUndo->GetContentInfos().Insert( pInf, pUndo->GetContentInfos().Count() );
 
-        for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
         {
             EditCharAttribPtr pAttr = pNode->GetCharAttribs().GetAttribs()[ nAttr ];
             if ( pAttr->GetLen() )
@@ -230,7 +230,7 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
     return pUndo;
 }
 
-void ImpEditEngine::UndoActionStart( USHORT nId, const ESelection& aSel )
+void ImpEditEngine::UndoActionStart( sal_uInt16 nId, const ESelection& aSel )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -240,7 +240,7 @@ void ImpEditEngine::UndoActionStart( USHORT nId, const ESelection& aSel )
     }
 }
 
-void ImpEditEngine::UndoActionStart( USHORT nId )
+void ImpEditEngine::UndoActionStart( sal_uInt16 nId )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -249,7 +249,7 @@ void ImpEditEngine::UndoActionStart( USHORT nId )
     }
 }
 
-void ImpEditEngine::UndoActionEnd( USHORT )
+void ImpEditEngine::UndoActionEnd( sal_uInt16 )
 {
     if ( IsUndoEnabled() && !IsInUndo() )
     {
@@ -259,13 +259,13 @@ void ImpEditEngine::UndoActionEnd( USHORT )
     }
 }
 
-void ImpEditEngine::InsertUndo( EditUndo* pUndo, BOOL bTryMerge )
+void ImpEditEngine::InsertUndo( EditUndo* pUndo, sal_Bool bTryMerge )
 {
     DBG_ASSERT( !IsInUndo(), "InsertUndo in Undomodus!" );
     if ( pUndoMarkSelection )
     {
         EditUndoMarkSelection* pU = new EditUndoMarkSelection( this, *pUndoMarkSelection );
-        GetUndoManager().AddUndoAction( pU, FALSE );
+        GetUndoManager().AddUndoAction( pU, sal_False );
         delete pUndoMarkSelection;
         pUndoMarkSelection = NULL;
     }
@@ -280,7 +280,7 @@ void ImpEditEngine::ResetUndoManager()
         GetUndoManager().Clear();
 }
 
-void ImpEditEngine::EnableUndo( BOOL bEnable )
+void ImpEditEngine::EnableUndo( sal_Bool bEnable )
 {
     // When switching the mode Delete list:
     if ( bEnable != IsUndoEnabled() )
@@ -289,39 +289,39 @@ void ImpEditEngine::EnableUndo( BOOL bEnable )
     bUndoEnabled = bEnable;
 }
 
-BOOL ImpEditEngine::Undo( EditView* pView )
+sal_Bool ImpEditEngine::Undo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetUndoActionCount() )
     {
         SetActiveView( pView );
-        GetUndoManager().Undo( 1 );
-        return TRUE;
+        GetUndoManager().Undo();
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ImpEditEngine::Redo( EditView* pView )
+sal_Bool ImpEditEngine::Redo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetRedoActionCount() )
     {
         SetActiveView( pView );
-        GetUndoManager().Redo( 0 );
-        return TRUE;
+        GetUndoManager().Redo();
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ImpEditEngine::Repeat( EditView* /* pView */ )
+sal_Bool ImpEditEngine::Repeat( EditView* /* pView */ )
 {
     if ( HasUndoManager() && GetUndoManager().GetRepeatActionCount() )
     {
         DBG_WARNING( "Repeat not implemented!" );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
+SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib )
 {
     DBG_CHKOBJ( GetEditEnginePtr(), EditEngine, 0 );
 
@@ -329,11 +329,11 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
 
     SfxItemSet aCurSet( GetEmptyItemSet() );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     // iterate over the paragraphs ...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++	)
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++	)
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), "Node not found: GetAttrib" );
@@ -356,7 +356,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
         if( bOnlyHardAttrib != EditEngineAttribs_OnlyHard )
         {
             // and then paragraph formatting and template...
-            for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+            for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
             {
                 if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
                 {
@@ -402,7 +402,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
     // fill empty slots with defaults ...
     if ( bOnlyHardAttrib == EditEngineAttribs_All )
     {
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++ )
         {
             if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
             {
@@ -414,7 +414,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, BOOL bOnlyHardAttrib )
 }
 
 
-SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags ) const
+SfxItemSet ImpEditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
 {
     // Optimized function with less Puts(), which cause unnecessary cloning from default items.
     // If this works, change GetAttribs( EditSelection ) to use this for each paragraph and merge the results!
@@ -438,7 +438,7 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
         // StyleSheet / Parattribs...
 
         if ( pNode->GetStyleSheet() && ( nFlags & GETATTRIBS_STYLESHEET ) )
-            aAttribs.Set( pNode->GetStyleSheet()->GetItemSet(), TRUE );
+            aAttribs.Set( pNode->GetStyleSheet()->GetItemSet(), sal_True );
 
         if ( nFlags & GETATTRIBS_PARAATTRIBS )
             aAttribs.Put( pNode->GetContentAttribs().GetItems() );
@@ -451,13 +451,13 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
             pNode->GetCharAttribs().OptimizeRanges( ((ImpEditEngine*)this)->GetEditDoc().GetItemPool() );
 
             const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
-            for ( USHORT nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
+            for ( sal_uInt16 nAttr = 0; nAttr < rAttrs.Count(); nAttr++ )
             {
                 EditCharAttrib* pAttr = rAttrs.GetObject( nAttr );
 
                 if ( nStart == nEnd )
                 {
-                    USHORT nCursorPos = nStart;
+                    sal_uInt16 nCursorPos = nStart;
                     if ( ( pAttr->GetStart() <= nCursorPos ) && ( pAttr->GetEnd() >= nCursorPos ) )
                     {
                         // To be used the attribute has to start BEFORE the position, or it must be a
@@ -505,17 +505,17 @@ SfxItemSet ImpEditEngine::GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd,
 }
 
 
-void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE nSpecial )
+void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial )
 {
     aSel.Adjust( aEditDoc );
 
     // When no selection => use the Attribute on the word.
     // ( the RTF-parser should actually never call the Method whithout a Range )
     if ( ( nSpecial == ATTRSPECIAL_WHOLEWORD ) && !aSel.HasRange() )
-        aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, FALSE );
+        aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_False );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() )
     {
@@ -524,7 +524,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
         InsertUndo( pUndo );
     }
 
-    BOOL bCheckLanguage = FALSE;
+    sal_Bool bCheckLanguage = sal_False;
     if ( GetStatus().DoOnlineSpelling() )
     {
         bCheckLanguage = ( rSet.GetItemState( EE_CHAR_LANGUAGE ) == SFX_ITEM_ON ) ||
@@ -533,10 +533,10 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
     }
 
     // iterate over the paragraphs ...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++	)
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++	)
     {
-        BOOL bParaAttribFound = FALSE;
-        BOOL bCharAttribFound = FALSE;
+        sal_Bool bParaAttribFound = sal_False;
+        sal_Bool bCharAttribFound = sal_False;
 
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         ParaPortion* pPortion = GetParaPortions().GetObject( nNode );
@@ -557,12 +557,12 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
 //		if ( fp )
 //		{
 //			fprintf( fp, "\n\n=> Character-Attribute: Paragraph %i, %i-%i\n", nNode, nStartPos, nEndPos );
-//			DbgOutItemSet( fp, rSet, TRUE, FALSE );
+//			DbgOutItemSet( fp, rSet, sal_True, sal_False );
 //			fclose( fp );
 //		}
 #endif
 
-        for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
+        for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
         {
             if ( rSet.GetItemState( nWhich ) == SFX_ITEM_ON )
             {
@@ -570,17 +570,17 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
                 if ( nWhich <= EE_PARA_END )
                 {
                     pNode->GetContentAttribs().GetItems().Put( rItem );
-                    bParaAttribFound = TRUE;
+                    bParaAttribFound = sal_True;
                 }
                 else
                 {
                     aEditDoc.InsertAttrib( pNode, nStartPos, nEndPos, rItem );
-                    bCharAttribFound = TRUE;
+                    bCharAttribFound = sal_True;
                     if ( nSpecial == ATTRSPECIAL_EDGE )
                     {
                         CharAttribArray& rAttribs = pNode->GetCharAttribs().GetAttribs();
-                        USHORT nAttrs = rAttribs.Count();
-                        for ( USHORT n = 0; n < nAttrs; n++ )
+                        sal_uInt16 nAttrs = rAttribs.Count();
+                        for ( sal_uInt16 n = 0; n < nAttrs; n++ )
                         {
                             EditCharAttrib* pAttr = rAttribs.GetObject( n );
                             if ( pAttr->GetStart() > nEndPos )
@@ -588,7 +588,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
 
                             if ( ( pAttr->GetEnd() == nEndPos ) && ( pAttr->Which() == nWhich ) )
                             {
-                                pAttr->SetEdge( TRUE );
+                                pAttr->SetEdge( sal_True );
                                 break;
                             }
                         }
@@ -603,7 +603,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
         }
         else if ( bCharAttribFound )
         {
-            bFormatted = FALSE;
+            bFormatted = sal_False;
             if ( !pNode->Len() || ( nStartPos != nEndPos  ) )
             {
                 pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
@@ -614,12 +614,12 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, BYTE
     }
 }
 
-void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttribs, USHORT nWhich )
+void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     aSel.Adjust( aEditDoc );
 
-    USHORT nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
-    USHORT nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+    sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+    sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
 
     const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0;
 
@@ -627,14 +627,14 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
     {
         // Possibly a special Undo, or itemset*
         EditUndoSetAttribs* pUndo = CreateAttribUndo( aSel, GetEmptyItemSet() );
-        pUndo->SetRemoveAttribs( TRUE );
+        pUndo->SetRemoveAttribs( sal_True );
         pUndo->SetRemoveParaAttribs( bRemoveParaAttribs );
         pUndo->SetRemoveWhich( nWhich );
         InsertUndo( pUndo );
     }
 
     // iterate over the paragraphs ...
-    for ( USHORT nNode = nStartNode; nNode <= nEndNode; nNode++ )
+    for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++	)
     {
         ContentNode* pNode = aEditDoc.GetObject( nNode );
         ParaPortion* pPortion = GetParaPortions().GetObject( nNode );
@@ -650,7 +650,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
             nEndPos = aSel.Max().GetIndex();
 
         // Optimize: If whole paragraph, then RemoveCharAttribs (nPara)?
-        BOOL bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich );
+        sal_Bool bChanged = aEditDoc.RemoveAttribs( pNode, nStartPos, nEndPos, nWhich );
         if ( bRemoveParaAttribs )
         {
             SetParaAttribs( nNode, *_pEmptyItemSet );   // Invalidated
@@ -666,7 +666,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
             if ( !nWhich )
             {
                 SfxItemSet aAttribs( GetParaAttribs( nNode ) );
-                for ( USHORT nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
+                for ( sal_uInt16 nW = EE_CHAR_START; nW <= EE_CHAR_END; nW++ )
                     aAttribs.ClearItem( nW );
                 SetParaAttribs( nNode, aAttribs );
             }
@@ -674,7 +674,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
 
         if ( bChanged && !bRemoveParaAttribs )
         {
-            bFormatted = FALSE;
+            bFormatted = sal_False;
             pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos );
         }
     }
@@ -682,7 +682,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL bRemoveParaAttri
 
 typedef EditCharAttrib* EditCharAttribPtr;
 
-void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemoveFeatures )
+void ImpEditEngine::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich, sal_Bool bRemoveFeatures )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     ParaPortion* pPortion = GetParaPortions().SaveGetObject( nPara );
@@ -693,7 +693,7 @@ void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemove
     if ( !pNode )
         return;
 
-    USHORT nAttr = 0;
+    sal_uInt16 nAttr = 0;
     EditCharAttribPtr pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
     while ( pAttr )
     {
@@ -711,7 +711,7 @@ void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich, BOOL bRemove
     pPortion->MarkSelectionInvalid( 0, pNode->Len() );
 }
 
-void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void ImpEditEngine::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
 
@@ -723,7 +723,7 @@ void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
 //		if ( fp )
 //		{
 //			fprintf( fp, "\n\n=> Paragraph-Attribute: Paragraph %i\n", nPara );
-//			DbgOutItemSet( fp, rSet, TRUE, FALSE );
+//			DbgOutItemSet( fp, rSet, sal_True, sal_False );
 //			fclose( fp );
 //		}
 #endif
@@ -751,14 +751,14 @@ void ImpEditEngine::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
     }
 }
 
-const SfxItemSet& ImpEditEngine::GetParaAttribs( USHORT nPara ) const
+const SfxItemSet& ImpEditEngine::GetParaAttribs( sal_uInt16 nPara ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node not found: GetParaAttribs" );
     return pNode->GetContentAttribs().GetItems();
 }
 
-BOOL ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
+sal_Bool ImpEditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node not found: HasParaAttrib" );
@@ -766,7 +766,7 @@ BOOL ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
     return pNode->GetContentAttribs().HasItem( nWhich );
 }
 
-const SfxPoolItem& ImpEditEngine::GetParaAttrib( USHORT nPara, USHORT nWhich ) const
+const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node not found: GetParaAttrib" );
@@ -774,13 +774,13 @@ const SfxPoolItem& ImpEditEngine::GetParaAttrib( USHORT nPara, USHORT nWhich ) c
     return pNode->GetContentAttribs().GetItem( nWhich );
 }
 
-void ImpEditEngine::GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const
+void ImpEditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const
 {
     rLst.Remove( 0, rLst.Count() );
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     if ( pNode )
     {
-        for ( USHORT nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
+        for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
         {
             EditCharAttribPtr pAttr = pNode->GetCharAttribs().GetAttribs()[ nAttr ];
             EECharAttrib aEEAttr;
@@ -797,13 +797,13 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
 {
     pNode->GetCharAttribs().DeleteEmptyAttribs( GetEditDoc().GetItemPool() );
     xub_StrLen nEndPos = pNode->Len();
-    for ( USHORT nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich++ )
+    for ( sal_uInt16 nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich++ )
     {
         if ( pNode->GetContentAttribs().HasItem( nWhich ) )
         {
             const SfxPoolItem& rItem = pNode->GetContentAttribs().GetItem( nWhich );
             // Fill the gap:
-            USHORT nLastEnd = 0;
+            sal_uInt16 nLastEnd = 0;
             EditCharAttrib* pAttr = pNode->GetCharAttribs().FindNextAttrib( nWhich, nLastEnd );
             while ( pAttr )
             {
@@ -819,7 +819,7 @@ void ImpEditEngine::ParaAttribsToCharAttribs( ContentNode* pNode )
                 aEditDoc.InsertAttrib( pNode, nLastEnd, nEndPos, rItem );
         }
     }
-    bFormatted = FALSE;
+    bFormatted = sal_False;
     // Portion does not need to be invalidated here, happens elsewhere.
 }
 
@@ -861,9 +861,9 @@ ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const String& rOldTextAfterStar
 {
     aPos = rPos;
     nLen = 0;
-    bCursor = TRUE;
+    bCursor = sal_True;
     pAttribs = NULL;
-    bWasCursorOverwrite = FALSE;
+    bWasCursorOverwrite = sal_False;
 }
 
 ImplIMEInfos::~ImplIMEInfos()
@@ -871,12 +871,12 @@ ImplIMEInfos::~ImplIMEInfos()
     delete[] pAttribs;
 }
 
-void ImplIMEInfos::CopyAttribs( const USHORT* pA, USHORT nL )
+void ImplIMEInfos::CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL )
 {
     nLen = nL;
     delete[] pAttribs;
-    pAttribs = new USHORT[ nL ];
-    memcpy( pAttribs, pA, nL*sizeof(USHORT) );
+    pAttribs = new sal_uInt16[ nL ];
+    memcpy( pAttribs, pA, nL*sizeof(sal_uInt16) );
 }
 
 void ImplIMEInfos::DestroyAttribs()
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index baf960f4f9..262f1330c9 100644..100755
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -63,7 +63,7 @@ TextConvWrapper::TextConvWrapper( Window* pWindow,
         const Font* pTargetFont,
         sal_Int32 nOptions,
         sal_Bool bIsInteractive,
-        BOOL bIsStart,
+        sal_Bool bIsStart,
         EditView* pView ) :
     HangulHanjaConversion( pWindow, rxMSF, rSourceLocale, rTargetLocale, pTargetFont, nOptions, bIsInteractive )
 {
@@ -259,8 +259,8 @@ sal_Bool TextConvWrapper::ConvContinue_impl()
 
 
 void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
-    LanguageType nLang, USHORT nLangWhichId,
-    const Font *pFont,  USHORT nFontWhichId )
+    LanguageType nLang, sal_uInt16 nLangWhichId,
+    const Font *pFont,  sal_uInt16 nFontWhichId )
 {
     ESelection aOldSel = pEditView->GetSelection();
     pEditView->SetSelection( rESel );
@@ -294,7 +294,7 @@ void TextConvWrapper::SelectNewUnit_impl(
         const sal_Int32 nUnitStart, 
         const sal_Int32 nUnitEnd )
 {
-    BOOL bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
+    sal_Bool bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
     DBG_ASSERT( bOK, "invalid arguments" );
     if (!bOK)
         return;
@@ -302,8 +302,8 @@ void TextConvWrapper::SelectNewUnit_impl(
     ESelection  aSelection = pEditView->GetSelection();
     DBG_ASSERT( aSelection.nStartPara == aSelection.nEndPara,
         "paragraph mismatch in selection" );
-    aSelection.nStartPos = (USHORT) (nLastPos + nUnitOffset + nUnitStart);
-    aSelection.nEndPos   = (USHORT) (nLastPos + nUnitOffset + nUnitEnd);
+    aSelection.nStartPos = (sal_uInt16) (nLastPos + nUnitOffset + nUnitStart);
+    aSelection.nEndPos   = (sal_uInt16) (nLastPos + nUnitOffset + nUnitEnd);
     pEditView->SetSelection( aSelection );
 }
 
@@ -345,7 +345,7 @@ void TextConvWrapper::ReplaceUnit(
         ReplacementAction eAction,
         LanguageType *pNewUnitLanguage )
 {
-    BOOL bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
+    sal_Bool bOK = 0 <= nUnitStart && 0 <= nUnitEnd && nUnitStart <= nUnitEnd;
     DBG_ASSERT( bOK, "invalid arguments" );
     if (!bOK)
         return;
@@ -378,7 +378,7 @@ void TextConvWrapper::ReplaceUnit(
         default:
             OSL_FAIL( "unexpected case" );
     }
-    nUnitOffset = sal::static_int_cast< USHORT >(
+    nUnitOffset = sal::static_int_cast< sal_uInt16 >(
         nUnitOffset + nUnitStart + aNewTxt.getLength());
     
     // remember current original language for kater use
@@ -431,13 +431,13 @@ void TextConvWrapper::ReplaceUnit(
     {
         // Note: replacement is always done in the current paragraph
         // which is the one ConvContinue points to
-        pConvInfo->aConvContinue.nIndex = sal::static_int_cast< USHORT >(
+        pConvInfo->aConvContinue.nIndex = sal::static_int_cast< sal_uInt16 >(
             pConvInfo->aConvContinue.nIndex + nDelta);
 
         // if that is the same as the one where the conversions ends
         // the end needs to be updated also
         if (pConvInfo->aConvTo.nPara == pConvInfo->aConvContinue.nPara)
-            pConvInfo->aConvTo.nIndex = sal::static_int_cast< USHORT >(
+            pConvInfo->aConvTo.nIndex = sal::static_int_cast< sal_uInt16 >(
                 pConvInfo->aConvTo.nIndex + nDelta);
     }
 }
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index e8d17075d7..3323e53035 100644..100755
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -42,8 +42,8 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
 {
     rtl::OUString   aConvText;      // convertible text part found last time
     LanguageType    nConvTextLang;  // language of aConvText
-    USHORT          nLastPos;       // starting position of the last found text portion (word)
-    USHORT          nUnitOffset;    // offset of current unit in the current text portion (word)
+    sal_uInt16          nLastPos;       // starting position of the last found text portion (word)
+    sal_uInt16          nUnitOffset;    // offset of current unit in the current text portion (word)
 
     ESelection      aConvSel;       // selection to be converted if
                                     // 'HasRange' is true, other conversion
@@ -100,8 +100,8 @@ protected:
     virtual sal_Bool    HasRubySupport() const;
 
     void SetLanguageAndFont( const ESelection &rESel,
-                            LanguageType nLang, USHORT nLangWhichId,
-                            const Font *pFont,  USHORT nFontWhichId );
+                            LanguageType nLang, sal_uInt16 nLangWhichId,
+                            const Font *pFont,  sal_uInt16 nFontWhichId );
 
 
 public:
@@ -110,9 +110,9 @@ public:
             const ::com::sun::star::lang::Locale& rSourceLocale,
             const ::com::sun::star::lang::Locale& rTargetLocale,
             const Font* pTargetFont,
-            INT32 nOptions,
+            sal_Int32 nOptions,
             sal_Bool bIsInteractive,
-            BOOL bIsStart, EditView* pView );
+            sal_Bool bIsStart, EditView* pView );
 
     virtual ~TextConvWrapper();
 
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index f58f4b486d..b950714436 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -40,7 +40,7 @@
 
 #include <tools/tenccvt.hxx>
 
-#define BULITEM_VERSION		((USHORT)2)
+#define BULITEM_VERSION		((sal_uInt16)2)
 
 // -----------------------------------------------------------------------
 
@@ -50,20 +50,20 @@ TYPEINIT1(SvxBulletItem,SfxPoolItem);
 
 void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 {
-    USHORT nTemp;
+    sal_uInt16 nTemp;
 
     rStream << rFont.GetColor();
-    nTemp = (USHORT)rFont.GetFamily(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp;
 
-    nTemp = (USHORT)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
+    nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
     rStream << nTemp;
 
-    nTemp = (USHORT)rFont.GetPitch(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetAlign(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetWeight(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetUnderline(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetStrikeout(); rStream << nTemp;
-    nTemp = (USHORT)rFont.GetItalic(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp;
+    nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp;
 
     // UNICODE: rStream << rFont.GetName();
     rStream.WriteByteString(rFont.GetName());
@@ -75,12 +75,12 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
+Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
 {
     Font aFont;
     Color aColor;
     rStream >> aColor;    aFont.SetColor( aColor );
-    USHORT nTemp;
+    sal_uInt16 nTemp;
     rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp);
 
     rStream >> nTemp; 
@@ -106,7 +106,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
         aFont.SetSize( aSize );
     }
 
-    BOOL bTemp;
+    sal_Bool bTemp;
     rStream >> bTemp; aFont.SetOutline( bTemp );
     rStream >> bTemp; aFont.SetShadow( bTemp );
     rStream >> bTemp; aFont.SetTransparent( bTemp );
@@ -116,7 +116,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaultFont_Impl();
     SetDefaults_Impl();
@@ -125,7 +125,7 @@ SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart*/, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt8 nNewStyle, const Font& rFont, sal_uInt16 /*nStart*/, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
     nStyle = nNewStyle;
@@ -135,7 +135,7 @@ SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
     aFont 	= rFont;
@@ -146,7 +146,7 @@ SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhi
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
 
@@ -161,7 +161,7 @@ SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
     SetDefaults_Impl();
 
@@ -176,7 +176,7 @@ SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhic
 
 // -----------------------------------------------------------------------
 
-SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) : 
+SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : 
     SfxPoolItem( _nWhich ), 
     pGraphicObject( NULL )
 {
@@ -188,10 +188,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) :
     {
         // Safe Load with Test on empty Bitmap
         Bitmap			aBmp;
-        const UINT32	nOldPos = rStrm.Tell();
+        const sal_uInt32	nOldPos = rStrm.Tell();
         // Ignore Errorcode when reading Bitmap,
         // see comment in SvxBulletItem::Store()
-        BOOL bOldError = rStrm.GetError() ? TRUE : FALSE;
+        sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
         rStrm >> aBmp;
         if ( !bOldError && rStrm.GetError() )
         {
@@ -260,7 +260,7 @@ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, USHORT /*nVersion*/ ) const
+SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const
 {
     return new SvxBulletItem( rStrm, Which() );
 }
@@ -271,7 +271,7 @@ void SvxBulletItem::SetDefaultFont_Impl()
 {
     aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
     aFont.SetAlign( ALIGN_BOTTOM);
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -289,7 +289,7 @@ void SvxBulletItem::SetDefaults_Impl()
 
 // -----------------------------------------------------------------------
 
-USHORT SvxBulletItem::GetVersion( USHORT /*nVersion*/ ) const
+sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
 {
     return BULITEM_VERSION;
 }
@@ -367,7 +367,7 @@ int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     // Correction for empty bitmap
     if( ( nStyle == BS_BMP ) && 
@@ -388,16 +388,16 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
         StoreFont( rStrm, aFont );
     else
     {
-        ULONG _nStart = rStrm.Tell();
+        sal_uLong _nStart = rStrm.Tell();
 
         // Small preliminary estimate of the size ...
-        USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
+        sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
         const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() );
-        ULONG nBytes = aBmp.GetSizeBytes();
-        if ( nBytes < ULONG(0xFF00*nFac) )
+        sal_uLong nBytes = aBmp.GetSizeBytes();
+        if ( nBytes < sal_uLong(0xFF00*nFac) )
             rStrm << aBmp;
 
-        ULONG nEnd = rStrm.Tell();
+        sal_uLong nEnd = rStrm.Tell();
         // Item can not write with an overhead more than 64K or SfxMultiRecord
         // will crash. Then prefer to forego on the bitmap, it is only 
         // important for the outliner and only for <= 5.0. 
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index fca652ed7d..dad17e9c01 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -36,7 +36,7 @@
 
 TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
 
-SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const USHORT nId ) :
+SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bHidden )
 {
 }
@@ -62,7 +62,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 11d863a49a..d72f955ba2 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -75,7 +75,7 @@ int SvxFieldData::operator==( const SvxFieldData& rFld ) const
 {
     DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" );
     (void)rFld;
-    return TRUE;	// Basic class is always the same.
+    return sal_True;	// Basic class is always the same.
 }
 
 // -----------------------------------------------------------------------
@@ -103,7 +103,7 @@ MetaAction* SvxFieldData::createEndComment() const
 
 // -----------------------------------------------------------------------
 
-SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     pField = pFld;	// belongs directly to the item
@@ -111,7 +111,7 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     pField = rField.Clone();
@@ -141,7 +141,7 @@ SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     SvxFieldData* pData = 0;
     SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -158,7 +158,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFieldItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     DBG_ASSERT( pField, "SvxFieldItem::Store: Field?!" );
     SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -185,10 +185,10 @@ int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
 
     const SvxFieldData* pOtherFld = ((const SvxFieldItem&)rItem).GetField();
     if ( !pField && !pOtherFld )
-        return TRUE;
+        return sal_True;
 
     if ( ( !pField && pOtherFld ) || ( pField && !pOtherFld ) )
-        return FALSE;
+        return sal_False;
 
     return ( ( pField->Type() == pOtherFld->Type() )
                 && ( *pField == *pOtherFld ) );
@@ -230,7 +230,7 @@ SvxFieldData* SvxDateField::Clone() const
 int SvxDateField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxDateField& rOtherFld = (const SvxDateField&) rOther;
     return ( ( nFixDate == rOtherFld.nFixDate ) &&
@@ -242,7 +242,7 @@ int SvxDateField::operator==( const SvxFieldData& rOther ) const
 
 void SvxDateField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     rStm >> nFixDate;
     rStm >> nType;
@@ -257,8 +257,8 @@ void SvxDateField::Load( SvPersistStream & rStm )
 void SvxDateField::Save( SvPersistStream & rStm )
 {
     rStm << nFixDate;
-    rStm << (USHORT)eType;
-    rStm << (USHORT)eFormat;
+    rStm << (sal_uInt16)eType;
+    rStm << (sal_uInt16)eFormat;
 }
 
 // -----------------------------------------------------------------------
@@ -285,7 +285,7 @@ String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberF
         eFormat = SVXDATEFORMAT_STDSMALL;
     }
 
-    ULONG nFormatKey;
+    sal_uLong nFormatKey;
 
     switch( eFormat )
     {
@@ -366,7 +366,7 @@ SvxFieldData* SvxURLField::Clone() const
 int SvxURLField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxURLField& rOtherFld = (const SvxURLField&) rOther;
     return ( ( eFormat == rOtherFld.eFormat ) &&
@@ -377,83 +377,46 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
 
 // -----------------------------------------------------------------------
 
-void SvxURLField::Load( SvPersistStream & rStm )
+static void write_unicode( SvPersistStream & rStm, const String& rString )
 {
-    USHORT nFormat;
-    sal_uInt32 nFrameMarker, nCharSetMarker;
-    long nUlongSize = (long)sizeof(sal_uInt32);
-    String aTmpURL;
-
-    rStm >> nFormat;
-
-    // UNICODE: rStm >> aTmpURL;
-    rStm.ReadByteString(aTmpURL);
-
-    // UNICODE: rStm >> aRepresentation;
-    // read to a temp string first, read text encoding and
-    // convert later to stay compatible to fileformat
-    ByteString aTempString;
-    rtl_TextEncoding aTempEncoding = RTL_TEXTENCODING_MS_1252;  // Init for old documents
-    rStm.ReadByteString(aTempString);
+    sal_uInt16 nL = rString.Len();
+    rStm << nL;
+    rStm.Write( rString.GetBuffer(), nL*sizeof(sal_Unicode) );
+}
 
-    rStm >> nFrameMarker;
-    if ( nFrameMarker == FRAME_MARKER )
+static void read_unicode( SvPersistStream & rStm, String& rString )
+{
+    sal_uInt16 nL = 0;
+    rStm >> nL;
+    if ( nL )
     {
-        // UNICODE: rStm >> aTargetFrame;
-        rStm.ReadByteString(aTargetFrame);
-
-        rStm >> nCharSetMarker;
-        if ( nCharSetMarker == CHARSET_MARKER )
-        {
-            USHORT nCharSet;
-            rStm >> nCharSet;
-
-            // remember encoding
-            aTempEncoding = (rtl_TextEncoding)nCharSet;
-        }
-        else
-            rStm.SeekRel( -nUlongSize );
+        rString.AllocBuffer( nL );
+        rStm.Read( rString.GetBufferAccess(), nL*sizeof(sal_Unicode) );
+        rString.ReleaseBufferAccess( nL );
     }
-    else
-        rStm.SeekRel( -nUlongSize );
+}
 
-    // now build representation string due to known encoding
-    aRepresentation = String(aTempString, aTempEncoding);
+void SvxURLField::Load( SvPersistStream & rStm )
+{
+    sal_uInt16 nFormat = 0;
 
+    rStm >> nFormat;
     eFormat= (SvxURLFormat)nFormat;
 
-    // Relative save => make it absolute for loading
-    OSL_FAIL("No BaseURL!");
-    // TODO/MBA: no BaseURL
-    aURL = INetURLObject::GetAbsURL( String(), aTmpURL );
+    read_unicode( rStm, aURL );
+    read_unicode( rStm, aRepresentation );
+    read_unicode( rStm, aTargetFrame );
 }
 
 // -----------------------------------------------------------------------
 
 void SvxURLField::Save( SvPersistStream & rStm )
 {
-    // Relative save of the URL
-    OSL_FAIL("No BaseURL!");
-    // TODO/MBA: no BaseURL
-    String aTmpURL = INetURLObject::GetRelURL( String(), aURL );
-
-    rStm << (USHORT)eFormat;
-
-    // UNICODE: rStm << aTmpURL;
-    rStm.WriteByteString(aTmpURL);
-
-    // UNICODE: rStm << aRepresentation;
-    rStm.WriteByteString(aRepresentation);
-
-    rStm << FRAME_MARKER;
+    rStm << (sal_uInt16)eFormat;
 
-    // UNICODE: rStm << aTargetFrame;
-    rStm.WriteByteString(aTargetFrame);
-
-    rStm << CHARSET_MARKER;
-
-    // #90477# rStm << (USHORT)GetStoreCharSet(gsl_getSystemTextEncoding(), rStm.GetVersion());
-    rStm << (USHORT)GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rStm.GetVersion());
+    write_unicode( rStm, aURL );
+    write_unicode( rStm, aRepresentation );
+    write_unicode( rStm, aTargetFrame );
 }
 
 MetaAction* SvxURLField::createBeginComment() const
@@ -461,7 +424,7 @@ MetaAction* SvxURLField::createBeginComment() const
     // #i46618# Adding target URL to metafile comment
     return new MetaCommentAction( "FIELD_SEQ_BEGIN",
                                   0, 
-                                  reinterpret_cast<const BYTE*>(aURL.GetBuffer()),
+                                  reinterpret_cast<const sal_uInt8*>(aURL.GetBuffer()),
                                   2*aURL.Len() );
 }
 
@@ -616,7 +579,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
 int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxExtTimeField& rOtherFld = (const SvxExtTimeField&) rOther;
     return ( ( nFixTime == rOtherFld.nFixTime ) &&
@@ -628,7 +591,7 @@ int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 
 void SvxExtTimeField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     rStm >> nFixTime;
     rStm >> nType;
@@ -643,8 +606,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
 void SvxExtTimeField::Save( SvPersistStream & rStm )
 {
     rStm << nFixTime;
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
@@ -684,7 +647,7 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
             String aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
             xub_StrLen nCheckPos;
             short nType;
-            /*BOOL bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
+            /*sal_Bool bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
                 nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang );
             DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" );
             if ( nCheckPos )
@@ -755,7 +718,7 @@ SvxFieldData* SvxExtFileField::Clone() const
 int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxExtFileField& rOtherFld = (const SvxExtFileField&) rOther;
     return ( ( aFile == rOtherFld.aFile ) &&
@@ -767,7 +730,7 @@ int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 
 void SvxExtFileField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
+    sal_uInt16 nType, nFormat;
 
     // UNICODE: rStm >> aFile;
     rStm.ReadByteString(aFile);
@@ -786,8 +749,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
     // UNICODE: rStm << aFile;
     rStm.WriteByteString(aFile);
 
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
@@ -907,7 +870,7 @@ SvxFieldData* SvxAuthorField::Clone() const
 int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 {
     if ( rOther.Type() != Type() )
-        return FALSE;
+        return sal_False;
 
     const SvxAuthorField& rOtherFld = (const SvxAuthorField&) rOther;
     return ( ( aName == rOtherFld.aName ) &&
@@ -921,16 +884,11 @@ int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 
 void SvxAuthorField::Load( SvPersistStream & rStm )
 {
-    USHORT nType, nFormat;
-
-    // UNICODE: rStm >> aName;
-    rStm.ReadByteString(aName);
+    sal_uInt16 nType = 0, nFormat = 0;
 
-    // UNICODE: rStm >> aFirstName;
-    rStm.ReadByteString(aFirstName);
-
-    // UNICODE: rStm >> aShortName;
-    rStm.ReadByteString(aShortName);
+    read_unicode( rStm, aName );
+    read_unicode( rStm, aFirstName );
+    read_unicode( rStm, aShortName );
 
     rStm >> nType;
     rStm >> nFormat;
@@ -943,17 +901,12 @@ void SvxAuthorField::Load( SvPersistStream & rStm )
 
 void SvxAuthorField::Save( SvPersistStream & rStm )
 {
-    // UNICODE: rStm << aName;
-    rStm.WriteByteString(aName);
-
-    // UNICODE: rStm << aFirstName;
-    rStm.WriteByteString(aFirstName);
-
-    // UNICODE: rStm << aShortName;
-    rStm.WriteByteString(aShortName);
+    write_unicode( rStm, aName );
+    write_unicode( rStm, aFirstName );
+    write_unicode( rStm, aShortName );
 
-    rStm << (USHORT) eType;
-    rStm << (USHORT) eFormat;
+    rStm << (sal_uInt16) eType;
+    rStm << (sal_uInt16) eFormat;
 }
 
 //----------------------------------------------------------------------------
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index ccec3fd583..2730b00c93 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -189,7 +189,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            BYTE nValue = GetValue();
+            sal_uInt8 nValue = GetValue();
 
             if ( PAPERBIN_PRINTER_SETTINGS == nValue )
                 rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
@@ -219,7 +219,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
 }
 
 // -----------------------------------------------------------------------
-bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -242,7 +242,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -431,7 +431,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
 }
 
 // -----------------------------------------------------------------------
-bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     bool bRet = true;
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -476,7 +476,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 }
 
 // -----------------------------------------------------------------------
-bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -506,9 +506,9 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
             {
                 if(MID_L_REL_MARGIN== nMemberId)
-                    nPropLeftMargin = (USHORT)nRel;
+                    nPropLeftMargin = (sal_uInt16)nRel;
                 else
-                    nPropRightMargin = (USHORT)nRel;
+                    nPropRightMargin = (sal_uInt16)nRel;
             }
             else
                 return false;
@@ -519,7 +519,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             break;
 
         case MID_FIRST_LINE_REL_INDENT:
-            SetPropTxtFirstLineOfst	( (USHORT)nVal );
+            SetPropTxtFirstLineOfst	( (sal_uInt16)nVal );
             break;
 
         case MID_FIRST_AUTO:
@@ -824,7 +824,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
 }
 
 // -----------------------------------------------------------------------
-bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -850,7 +850,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 }
 
 // -----------------------------------------------------------------------
-bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -875,12 +875,12 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         case MID_UP_MARGIN :
             if(!(rVal >>= nVal) || nVal < 0)
                 return false;
-            SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+            SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
             break;
         case MID_LO_MARGIN :
             if(!(rVal >>= nVal) || nVal < 0)
                 return false;
-            SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+            SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
             break;
         case MID_UP_REL_MARGIN:
         case MID_LO_REL_MARGIN:
@@ -889,9 +889,9 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             if((rVal >>= nRel) && nRel > 1 )
             {
                 if(MID_UP_REL_MARGIN == nMemberId)
-                    nPropUpper = (USHORT)nRel;
+                    nPropUpper = (sal_uInt16)nRel;
                 else
-                    nPropLower = (USHORT)nRel;
+                    nPropLower = (sal_uInt16)nRel;
             }
             else
                 return false;
@@ -1165,7 +1165,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
              bPos   == ( (SvxProtectItem&)rAttr ).bPos );
 }
 
-bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bValue;
@@ -1183,7 +1183,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool	SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool	SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bVal( Any2Bool(rVal) );
@@ -1278,8 +1278,8 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
 
 // class SvxShadowItem ---------------------------------------------------
 
-SvxShadowItem::SvxShadowItem( const USHORT nId,
-                 const Color *pColor, const USHORT nW,
+SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
+                 const Color *pColor, const sal_uInt16 nW,
                  const SvxShadowLocation eLoc ) :
     SfxEnumItemInterface( nId ),
     aShadowColor(COL_GRAY),
@@ -1291,7 +1291,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
 }
 
 // -----------------------------------------------------------------------
-bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1324,7 +1324,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1705,8 +1705,8 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
 
 bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
 {
-    const USHORT nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
-    const USHORT nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
+    const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
+    const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
 
     if (nThisSize > nOtherSize)
     {
@@ -1841,7 +1841,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo
     return aLine;
 }
 // -----------------------------------------------------------------------
-bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     table::BorderLine2 aRetLine;
@@ -1935,8 +1935,7 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert);
 }
 
-sal_Bool
-SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     const bool bRet(lcl_lineToSvxLine(rLine, rSvxLine, bConvert));
 
@@ -2776,7 +2775,7 @@ void SvxBoxInfoItem::ResetFlags()
     nValidFlags = 0x7F;	// all valid except Disable
 }
 
-bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     table::BorderLine2 aRetLine;
@@ -2841,7 +2840,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2870,14 +2869,14 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 else
                     return sal_False;
                 if ( aSeq[3] >>= nFlags )
-                    nValidFlags = (BYTE)nFlags;
+                    nValidFlags = (sal_uInt8)nFlags;
                 else
                     return sal_False;
                 if (( aSeq[4] >>= nVal ) && ( nVal >= 0 ))
                 {
                     if( bConvert )
                         nVal = MM100_TO_TWIP(nVal);
-                    SetDefDist( (USHORT)nVal );
+                    SetDefDist( (sal_uInt16)nVal );
                 }
             }
             return sal_True;
@@ -2962,7 +2961,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             sal_Int16 nFlags = sal_Int16();
             bRet = (rVal >>= nFlags);
             if ( bRet )
-                nValidFlags = (BYTE)nFlags;
+                nValidFlags = (sal_uInt8)nFlags;
             break;
         }
         case MID_DISTANCE:
@@ -2973,7 +2972,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             {
                 if( bConvert )
                     nVal = MM100_TO_TWIP(nVal);
-                SetDefDist( (USHORT)nVal );
+                SetDefDist( (sal_uInt16)nVal );
             }
             break;
         }
@@ -3029,7 +3028,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 }
 
 // -----------------------------------------------------------------------
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
     switch ( (SvxBreak)GetValue() )
@@ -3046,7 +3045,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     style::BreakType nBreak;
 
@@ -3231,7 +3230,7 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
     return new SvxLineItem( *this );
 }
 
-bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
+bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
 {
     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
     nMemId &= ~CONVERT_TWIPS;
@@ -3259,7 +3258,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
 {
     sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
     nMemId &= ~CONVERT_TWIPS;
@@ -3285,9 +3284,9 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
         switch ( nMemId )
         {
             case MID_FG_COLOR:      pLine->SetColor( Color(nVal) ); break;
-            case MID_OUTER_WIDTH:   pLine->SetOutWidth((USHORT)nVal);   break;
-            case MID_INNER_WIDTH:   pLine->SetInWidth((USHORT)nVal);   break;
-            case MID_DISTANCE:      pLine->SetDistance((USHORT)nVal);   break;
+            case MID_OUTER_WIDTH:   pLine->SetOutWidth((sal_uInt16)nVal);   break;
+            case MID_INNER_WIDTH:   pLine->SetInWidth((sal_uInt16)nVal);   break;
+            case MID_DISTANCE:      pLine->SetDistance((sal_uInt16)nVal);   break;
             case MID_LINE_STYLE:    pLine->SetStyle((SvxBorderStyle)nVal); break;
             default:
                 OSL_FAIL( "Wrong MemberId" );
@@ -3667,7 +3666,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
     return (sal_Int8)((nTrans * 100 + 127) / 254);
 }
 
-bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId)
@@ -3728,7 +3727,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId)
@@ -4235,7 +4234,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
 {
     CntWallpaperItem* pItem = new CntWallpaperItem( 0 );
     pItem->SetColor( aColor.GetColor() );
-    pItem->SetStyle( (USHORT)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
+    pItem->SetStyle( (sal_uInt16)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
     sal_Bool bLink = (pStrLink != 0);
     if( bLink )
     {
@@ -4267,14 +4266,14 @@ void  SvxBrushItem::ApplyGraphicTransparency_Impl()
 }
 // class SvxFrameDirectionItem ----------------------------------------------
 
-SvxFrameDirectionItem::SvxFrameDirectionItem( USHORT _nWhich )
-    : SfxUInt16Item( _nWhich, (UINT16)FRMDIR_HORI_LEFT_TOP )
+SvxFrameDirectionItem::SvxFrameDirectionItem( sal_uInt16 _nWhich )
+    : SfxUInt16Item( _nWhich, (sal_uInt16)FRMDIR_HORI_LEFT_TOP )
 {
 }
 
 SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
-                                            USHORT _nWhich )
-    : SfxUInt16Item( _nWhich, (UINT16)nValue )
+                                            sal_uInt16 _nWhich )
+    : SfxUInt16Item( _nWhich, (sal_uInt16)nValue )
 {
 }
 
@@ -4294,21 +4293,21 @@ SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
     return new SvxFrameDirectionItem( *this );
 }
 
-SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
 {
     sal_uInt16 nValue;
     rStrm >> nValue;
     return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
 }
 
-SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
+SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
 {
     sal_uInt16 nValue = GetValue();
     rStrm << nValue;
     return rStrm;
 }
 
-USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const
+sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
 }
@@ -4338,7 +4337,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
 }
 
 bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                             BYTE )
+                                             sal_uInt8 )
 {
     sal_Int16 nVal = sal_Int16();
     sal_Bool bRet = ( rVal >>= nVal );
@@ -4372,7 +4371,7 @@ bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
 }
 
 bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE ) const
+                                            sal_uInt8 ) const
 {
     // translate SvxFrameDirection into WritingDirection2
     sal_Int16 nVal;
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 0d169e4b0b..0d169e4b0b 100644..100755
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index e7bab2dfa4..1256c4b77d 100644..100755
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -86,7 +86,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
 }
 
 
-bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -129,7 +129,7 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -244,7 +244,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
 }
 
 
-bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -281,7 +281,7 @@ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -391,7 +391,7 @@ SfxItemPresentation SvxJustifyMethodItem::GetPresentation
 }
 
 
-bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_Int32 nUno = table::CellJustifyMethod::AUTO;
     switch (static_cast<SvxCellJustifyMethod>(GetValue()))
@@ -404,7 +404,7 @@ bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
     return true;
 }
 
-bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_Int32 nVal = table::CellJustifyMethod::AUTO;
     if (!(rVal >>= nVal))
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 1d66b58235..266776a0cc 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -110,14 +110,14 @@ SvxNumberType::~SvxNumberType()
         xFormatter = 0;
 }
 
-String SvxNumberType::GetNumStr( ULONG nNo ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo ) const
 {
     LanguageType eLang = Application::GetSettings().GetLanguage();
     Locale aLocale = SvxCreateLocale(eLang);
     return GetNumStr( nNo, aLocale );
 }
 
-String 	SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
+String 	SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
 {
     lcl_getFormatter(xFormatter);
     String aTmpStr;
@@ -206,16 +206,16 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
   mnIndentAt( 0 )
 {
 
-    USHORT nVersion;
+    sal_uInt16 nVersion;
   rStream >> nVersion;
 
-  USHORT nUSHORT;
+  sal_uInt16 nUSHORT;
   rStream >> nUSHORT;
   SetNumberingType((sal_Int16)nUSHORT);
   rStream >> nUSHORT;
   eNumAdjust      = (SvxAdjust)nUSHORT;
   rStream >> nUSHORT;
-  nInclUpperLevels = (BYTE)nUSHORT;
+  nInclUpperLevels = (sal_uInt8)nUSHORT;
   rStream >> nUSHORT;
   nStart          = nUSHORT;
   rStream >> nUSHORT;
@@ -263,7 +263,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
   rStream >> nUSHORT;
   nBulletRelSize = nUSHORT;
   rStream >> nUSHORT;
-  SetShowSymbol((BOOL)nUSHORT);
+  SetShowSymbol((sal_Bool)nUSHORT);
 
   if( nVersion < NUMITEM_VERSION_03 )
       cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
@@ -271,7 +271,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
                                       : RTL_TEXTENCODING_SYMBOL );
     if(pBulletFont)
     {
-        BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+        sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
         if(bConvertBulletFont)
         {
 
@@ -313,13 +313,13 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pBulletFont->SetName(sFontName);
     }
 
-    rStream << (USHORT)NUMITEM_VERSION_04;
+    rStream << (sal_uInt16)NUMITEM_VERSION_04;
 
-    rStream << (USHORT)GetNumberingType();
-    rStream << (USHORT)eNumAdjust;
-    rStream << (USHORT)nInclUpperLevels;
+    rStream << (sal_uInt16)GetNumberingType();
+    rStream << (sal_uInt16)eNumAdjust;
+    rStream << (sal_uInt16)nInclUpperLevels;
     rStream << nStart;
-    rStream << (USHORT)cBullet;
+    rStream << (sal_uInt16)cBullet;
 
     rStream << nFirstLineOffset;
     rStream << nAbsLSpace;
@@ -332,7 +332,7 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
     rStream.WriteByteString(sCharStyleName, eEnc);
     if(pGraphicBrush)
     {
-        rStream << (USHORT)1;
+        rStream << (sal_uInt16)1;
 
         // in SD or SI force bullet itself to be stored,
         // for that purpose throw away link when link and graphic
@@ -346,16 +346,16 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
     }
     else
-        rStream << (USHORT)0;
+        rStream << (sal_uInt16)0;
 
-    rStream << (USHORT)eVertOrient;
+    rStream << (sal_uInt16)eVertOrient;
     if(pBulletFont)
     {
-        rStream << (USHORT)1;
+        rStream << (sal_uInt16)1;
         rStream << *pBulletFont;
     }
     else
-        rStream << (USHORT)0;
+        rStream << (sal_uInt16)0;
     rStream << aGraphicSize;
 
     Color nTempColor = nBulletColor;
@@ -363,10 +363,10 @@ SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
         nTempColor = COL_BLACK;
     rStream << nTempColor;
     rStream << nBulletRelSize;
-    rStream << (USHORT)IsShowSymbol();
+    rStream << (sal_uInt16)IsShowSymbol();
 
-    rStream << ( USHORT ) mePositionAndSpaceMode;
-    rStream << ( USHORT ) meLabelFollowedBy;
+    rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
+    rStream << ( sal_uInt16 ) meLabelFollowedBy;
     rStream << ( long ) mnListtabPos;
     rStream << ( long ) mnFirstLineIndent;
     rStream << ( long ) mnIndentAt;
@@ -410,7 +410,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
     return *this;
 }
 
-BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
+sal_Bool  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
 {
     if( GetNumberingType()  != rFormat.GetNumberingType() ||
         eNumAdjust			!= rFormat.eNumAdjust ||
@@ -435,14 +435,14 @@ BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         IsShowSymbol()		!= rFormat.IsShowSymbol() ||
         sCharStyleName      != rFormat.sCharStyleName
         )
-        return FALSE;
+        return sal_False;
     if (
         (pGraphicBrush && !rFormat.pGraphicBrush) ||
         (!pGraphicBrush && rFormat.pGraphicBrush) ||
         (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush) 
        )
     {
-        return FALSE;
+        return sal_False;
     }
     if (
         (pBulletFont && !rFormat.pBulletFont) ||
@@ -450,9 +450,9 @@ BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         (pBulletFont && *pBulletFont != *rFormat.pBulletFont)
        )
     {
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
@@ -612,7 +612,7 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
     return aRetSize;
 }
 
-String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
+String SvxNumberFormat::CreateRomanString( sal_uLong nNo, sal_Bool bUpper )
 {
     nNo %= 4000;			// more can not be displayed
 //		i, ii, iii, iv, v, vi, vii, vii, viii, ix
@@ -622,11 +622,11 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
                         : "mdclxvi--";	// +2 Dummy entries!
 
     String sRet;
-    USHORT nMask = 1000;
+    sal_uInt16 nMask = 1000;
     while( nMask )
     {
-        BYTE nZahl = BYTE(nNo / nMask);
-        BYTE nDiff = 1;
+        sal_uInt8 nZahl = sal_uInt8(nNo / nMask);
+        sal_uInt8 nDiff = 1;
         nNo %= nMask;
 
         if( 5 < nZahl )
@@ -666,9 +666,9 @@ const String&	SvxNumberFormat::GetCharFmtName()const
 sal_Int32 SvxNumRule::nRefCount = 0;
 static SvxNumberFormat*	pStdNumFmt = 0;
 static SvxNumberFormat*	pStdOutlineNumFmt = 0;
-SvxNumRule::SvxNumRule( ULONG nFeatures,
-                        USHORT nLevels,
-                        BOOL bCont,
+SvxNumRule::SvxNumRule( sal_uLong nFeatures,
+                        sal_uInt16 nLevels,
+                        sal_Bool bCont,
                         SvxNumRuleType eType,
                         SvxNumberFormat::SvxNumPositionAndSpaceMode
                                     eDefaultNumberFormatPositionAndSpaceMode )
@@ -680,7 +680,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
     ++nRefCount;
     LanguageType eLang = Application::GetSettings().GetLanguage();
     aLocale = SvxCreateLocale(eLang);
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(i < nLevels)
         {
@@ -719,7 +719,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
         }
         else
             aFmts[i] = 0;
-        aFmtsSet[i] = FALSE;
+        aFmtsSet[i] = sal_False;
     }
 }
 
@@ -732,7 +732,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
     bContinuousNumbering = rCopy.bContinuousNumbering;
     eNumberingType		 = rCopy.eNumberingType;
     memset( aFmts, 0, sizeof( aFmts ));
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(rCopy.aFmts[i])
             aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
@@ -747,31 +747,31 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
     ++nRefCount;
     LanguageType eLang = Application::GetSettings().GetLanguage();
     aLocale = SvxCreateLocale(eLang);
-    USHORT nVersion;
-    USHORT nTemp;
+    sal_uInt16 nVersion;
+    sal_uInt16 nTemp;
     rStream >> nVersion;
     rStream >> nLevelCount;
     rStream >> nTemp;
     nFeatureFlags = nTemp;
     rStream >> nTemp;
-    bContinuousNumbering = (BOOL)nTemp;
+    bContinuousNumbering = (sal_Bool)nTemp;
     rStream >> nTemp;
     eNumberingType       = (SvxNumRuleType)nTemp;
     memset( aFmts, 0, sizeof( aFmts ));
 
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
-        USHORT nSet;
+        sal_uInt16 nSet;
         rStream >> nSet;
         if(nSet)
             aFmts[i] = new SvxNumberFormat(rStream);
         else
             aFmts[i] = 0;
-        aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
+        aFmtsSet[i] = aFmts[i] ? sal_True : sal_False;
     }
     if(NUMITEM_VERSION_02 <= nVersion)
     {
-        USHORT nShort;
+        sal_uInt16 nShort;
         rStream >> nShort;
         nFeatureFlags = nShort;
     }
@@ -779,20 +779,20 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
 
 SvStream&   SvxNumRule::Store(SvStream &rStream)
 {
-    rStream<<(USHORT)NUMITEM_VERSION_03;
+    rStream<<(sal_uInt16)NUMITEM_VERSION_03;
     rStream<<nLevelCount;
     //first save of nFeatureFlags for old versions
-    rStream<<(USHORT)nFeatureFlags;
-    rStream<<(USHORT)bContinuousNumbering;
-    rStream<<(USHORT)eNumberingType;
+    rStream<<(sal_uInt16)nFeatureFlags;
+    rStream<<(sal_uInt16)bContinuousNumbering;
+    rStream<<(sal_uInt16)eNumberingType;
 
     FontToSubsFontConverter pConverter = 0;
-    BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         if(aFmts[i])
         {
-            rStream << USHORT(1);
+            rStream << sal_uInt16(1);
             if(bConvertBulletFont && aFmts[i]->GetBulletFont())
             {
                 if(!pConverter)
@@ -803,10 +803,10 @@ SvStream&   SvxNumRule::Store(SvStream &rStream)
             aFmts[i]->Store(rStream, pConverter);
         }
         else
-            rStream << USHORT(0);
+            rStream << sal_uInt16(0);
     }
     //second save of nFeatureFlags for new versions
-    rStream<<(USHORT)nFeatureFlags;
+    rStream<<(sal_uInt16)nFeatureFlags;
     if(pConverter)
         DestroyFontToSubsFontConverter(pConverter);
 
@@ -815,7 +815,7 @@ SvStream&   SvxNumRule::Store(SvStream &rStream)
 
 SvxNumRule::~SvxNumRule()
 {
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
         delete aFmts[i];
     if(!--nRefCount)
     {
@@ -830,7 +830,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
     nFeatureFlags        = rCopy.nFeatureFlags;
     bContinuousNumbering = rCopy.bContinuousNumbering;
     eNumberingType       = rCopy.eNumberingType;
-    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
         delete aFmts[i];
         if(rCopy.aFmts[i])
@@ -848,8 +848,8 @@ int   SvxNumRule::operator==( const SvxNumRule& rCopy) const
         nFeatureFlags != rCopy.nFeatureFlags ||
             bContinuousNumbering != rCopy.bContinuousNumbering ||
                 eNumberingType != rCopy.eNumberingType)
-            return FALSE;
-    for(USHORT i = 0; i < nLevelCount; i++)
+            return sal_False;
+    for(sal_uInt16 i = 0; i < nLevelCount; i++)
     {
         if (
             (aFmtsSet[i] != rCopy.aFmtsSet[i]) ||
@@ -858,13 +858,13 @@ int   SvxNumRule::operator==( const SvxNumRule& rCopy) const
             (aFmts[i] && *aFmts[i] !=  *rCopy.aFmts[i])
            )
         {
-            return FALSE;
+            return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-const SvxNumberFormat* 	SvxNumRule::Get(USHORT nLevel)const
+const SvxNumberFormat* 	SvxNumRule::Get(sal_uInt16 nLevel)const
 {
     DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
     if( nLevel < SVX_MAX_NUM )
@@ -873,7 +873,7 @@ const SvxNumberFormat* 	SvxNumRule::Get(USHORT nLevel)const
         return 0;
 }
 
-const SvxNumberFormat& 	SvxNumRule::GetLevel(USHORT nLevel)const
+const SvxNumberFormat& 	SvxNumRule::GetLevel(sal_uInt16 nLevel)const
 {
     if(!pStdNumFmt)
     {
@@ -888,8 +888,7 @@ const SvxNumberFormat& 	SvxNumRule::GetLevel(USHORT nLevel)const
                                                         *pStdNumFmt : *pStdOutlineNumFmt;
 }
 
-
-void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid )
+void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, sal_Bool bIsValid )
 {
     DBG_ASSERT(i < SVX_MAX_NUM, "Wrong Level" );
 
@@ -901,7 +900,7 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal
     }
 }
 
-void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
 {
     DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
 
@@ -918,7 +917,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
     }
 }
 
-String 	SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const
+String 	SvxNumRule::MakeNumString( const SvxNodeNum& rNum, sal_Bool bInclStrings ) const
 {
     String aStr;
     if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -926,12 +925,12 @@ String 	SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
         const SvxNumberFormat& rMyNFmt = GetLevel( rNum.GetLevel() );
         if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
         {
-            BYTE i = rNum.GetLevel();
+            sal_uInt8 i = rNum.GetLevel();
 
             if( !IsContinuousNumbering() &&
                 1 < rMyNFmt.GetIncludeUpperLevels() )		// only on own level?
             {
-                BYTE n = rMyNFmt.GetIncludeUpperLevels();
+                sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -974,10 +973,10 @@ String 	SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
 }
 
 // changes linked to embedded bitmaps
-BOOL SvxNumRule::UnLinkGraphics()
+sal_Bool SvxNumRule::UnLinkGraphics()
 {
-    BOOL bRet = FALSE;
-    for(USHORT i = 0; i < GetLevelCount(); i++)
+    sal_Bool bRet = sal_False;
+    for(sal_uInt16 i = 0; i < GetLevelCount(); i++)
     {
         SvxNumberFormat aFmt(GetLevel(i));
         const SvxBrushItem* pBrush = aFmt.GetBrush();
@@ -995,7 +994,7 @@ BOOL SvxNumRule::UnLinkGraphics()
                 aTempItem.SetGraphic(*pGraphic);
                 sal_Int16    eOrient = aFmt.GetVertOrient();
                 aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), &eOrient );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
         else if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
@@ -1011,13 +1010,13 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) :
 {
 }
 
-SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
+SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 _nWhich ) :
     SfxPoolItem(_nWhich),
     pNumRule(new SvxNumRule(rRule))
 {
 }
 
-SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
+SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, sal_uInt16 n) const
 {
     return SfxPoolItem::Create(s, n );
 }
@@ -1043,24 +1042,24 @@ SfxPoolItem*  SvxNumBulletItem::Clone( SfxItemPool * ) const
     return new SvxNumBulletItem(*this);
 }
 
-USHORT  SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16  SvxNumBulletItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return NUMITEM_VERSION_03;
 }
 
-SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
+SvStream&   SvxNumBulletItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ )const
 {
     pNumRule->Store(rStream);
     return rStream;
 }
 
-bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= SvxCreateNumRule( pNumRule );
     return true;
 }
 
-bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     uno::Reference< container::XIndexReplace > xRule;
     if( rVal >>= xRule )
@@ -1086,12 +1085,12 @@ bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nM
     return false;
 }
 
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevels, SvxNumRuleType eType )
 {
-    const USHORT nSrcLevels = pRule->GetLevelCount();
+    const sal_uInt16 nSrcLevels = pRule->GetLevelCount();
     SvxNumRule* pNewRule = new SvxNumRule( pRule->GetFeatureFlags(), nLevels, pRule->IsContinuousNumbering(), eType );
 
-    for( USHORT nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
+    for( sal_uInt16 nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
         pNewRule->SetLevel( nLevel, pRule->GetLevel( nLevel ) );
 
     return pNewRule;
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 82df688afd..82df688afd 100644..100755
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src
index 9a39dc85e6..5d1448858a 100644..100755
--- a/editeng/source/items/page.src
+++ b/editeng/source/items/page.src
@@ -29,154 +29,6 @@
 
 #include <editeng/editrids.hrc>
 
-String RID_SVXSTR_PAPER_A0
-{
-    Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
-    Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
-    Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
-    Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
-    Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
-    Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
-    Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
-    Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
-    Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
-    Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
-    Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
-    Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
-    Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
-    Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
-    Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
-    Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
-    Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
-    Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
-    Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
-    Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
-    Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
-    Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
-    Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
-       Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
-    Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
-    Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
-    Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
-    Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
-    Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
-    Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
-    Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
-    Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
-    Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
-    Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
-    Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
-    Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
-    Text = "B6 (JIS)" ;
-};
 String RID_SVXSTR_PAPERBIN
 {
     Text [ en-US ] = "Paper tray" ;
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index e899af4f47..8796f6d7bc 100644..100755
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -43,9 +43,9 @@
     Description:	Is the printer valid
  --------------------------------------------------------------------*/
 
-inline BOOL IsValidPrinter( const Printer* pPtr )
+inline sal_Bool IsValidPrinter( const Printer* pPtr )
 {
-    return pPtr->GetName().Len() ? TRUE : FALSE;
+    return pPtr->GetName().Len() ? sal_True : sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -134,51 +134,7 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
 
 String SvxPaperInfo::GetName( Paper ePaper )
 {
-    USHORT	nResId = 0;
-
-    switch ( ePaper )
-    {
-        case PAPER_A0:			nResId = RID_SVXSTR_PAPER_A0;		break;
-        case PAPER_A1:			nResId = RID_SVXSTR_PAPER_A1;		break;
-        case PAPER_A2:			nResId = RID_SVXSTR_PAPER_A2;		break;
-        case PAPER_A3:			nResId = RID_SVXSTR_PAPER_A3;		break;
-        case PAPER_A4:			nResId = RID_SVXSTR_PAPER_A4;		break;
-        case PAPER_A5:			nResId = RID_SVXSTR_PAPER_A5;		break;
-        case PAPER_B4_ISO:		nResId = RID_SVXSTR_PAPER_B4_ISO;	break;
-        case PAPER_B5_ISO:		nResId = RID_SVXSTR_PAPER_B5_ISO;	break;
-        case PAPER_LETTER:		nResId = RID_SVXSTR_PAPER_LETTER;	break;
-        case PAPER_LEGAL:		nResId = RID_SVXSTR_PAPER_LEGAL;	break;
-        case PAPER_TABLOID: 	nResId = RID_SVXSTR_PAPER_TABLOID;	break;
-        case PAPER_USER:		nResId = RID_SVXSTR_PAPER_USER;		break;
-        case PAPER_B6_ISO:		nResId = RID_SVXSTR_PAPER_B6_ISO;	break;
-        case PAPER_ENV_C4:		nResId = RID_SVXSTR_PAPER_C4;		break;
-        case PAPER_ENV_C5:		nResId = RID_SVXSTR_PAPER_C5;		break;
-        case PAPER_ENV_C6:		nResId = RID_SVXSTR_PAPER_C6;		break;
-        case PAPER_ENV_C65: 	nResId = RID_SVXSTR_PAPER_C65;		break;
-        case PAPER_ENV_DL:		nResId = RID_SVXSTR_PAPER_DL;		break;
-        case PAPER_SLIDE_DIA:	nResId = RID_SVXSTR_PAPER_DIA;		break;
-        case PAPER_SCREEN:		nResId = RID_SVXSTR_PAPER_SCREEN;	break;
-        case PAPER_C:			nResId = RID_SVXSTR_PAPER_C;		break;
-        case PAPER_D:			nResId = RID_SVXSTR_PAPER_D;		break;
-        case PAPER_E:			nResId = RID_SVXSTR_PAPER_E;		break;
-        case PAPER_EXECUTIVE:	nResId = RID_SVXSTR_PAPER_EXECUTIVE;break;
-        case PAPER_FANFOLD_LEGAL_DE: nResId = RID_SVXSTR_PAPER_LEGAL2;	break;
-        case PAPER_ENV_MONARCH:	nResId = RID_SVXSTR_PAPER_MONARCH;	break;
-        case PAPER_ENV_PERSONAL:	nResId = RID_SVXSTR_PAPER_COM675; 	break;
-        case PAPER_ENV_9:		nResId = RID_SVXSTR_PAPER_COM9;	 	break;
-        case PAPER_ENV_10:		nResId = RID_SVXSTR_PAPER_COM10; 	break;
-        case PAPER_ENV_11:		nResId = RID_SVXSTR_PAPER_COM11; 	break;
-        case PAPER_ENV_12:		nResId = RID_SVXSTR_PAPER_COM12; 	break;
-        case PAPER_KAI16:		nResId = RID_SVXSTR_PAPER_KAI16; 	break;
-        case PAPER_KAI32:		nResId = RID_SVXSTR_PAPER_KAI32; 	break;
-        case PAPER_KAI32BIG:	nResId = RID_SVXSTR_PAPER_KAI32BIG;	break;
-        case PAPER_B4_JIS:		nResId = RID_SVXSTR_PAPER_B4_JIS;	break;
-        case PAPER_B5_JIS:		nResId = RID_SVXSTR_PAPER_B5_JIS;	break;
-        case PAPER_B6_JIS:		nResId = RID_SVXSTR_PAPER_B6_JIS;	break;
-        default: DBG_ERRORFILE( "unknown papersize" );
-    }
-
-    return ( nResId > 0 ) ? String( EditResId( nResId ) ) : String();
+    return String( Printer::GetPaperName( ePaper ) );
 }
 
 
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 57c9f3c176..869f26e18f 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -145,7 +145,7 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
       - ein sal_uInt16 for the mode
       - ein sal_uInt32 for all values (distance, height, rel. detail)
 */
-bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -190,7 +190,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -241,7 +241,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN;
                 nLineHeight = aLSp.Height;
                 if(bConvert)
-                    nLineHeight = (USHORT)MM100_TO_TWIP_UNSIGNED(nLineHeight);
+                    nLineHeight = (sal_uInt16)MM100_TO_TWIP_UNSIGNED(nLineHeight);
             }
             break;
         }
@@ -382,7 +382,7 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
         ? 1 : 0 );
 }
 
-bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -400,7 +400,7 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
+bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -420,7 +420,7 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
                     eVal != SVX_ADJUST_LEFT &&
                     eVal != SVX_ADJUST_BLOCK &&
                     eVal != SVX_ADJUST_CENTER)
-                        return FALSE;
+                        return sal_False;
                 if(eVal < (sal_uInt16)SVX_ADJUST_END)
                     nMemberId == MID_PARA_ADJUST ?
                         SetAdjust((SvxAdjust)eVal) :
@@ -542,7 +542,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
 
 // class SvxWidowsItem ---------------------------------------------------
 
-SvxWidowsItem::SvxWidowsItem(const BYTE nL, const USHORT nId ) :
+SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
     SfxByteItem( nId, nL )
 {
 }
@@ -614,7 +614,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
 
 // class SvxOrphansItem --------------------------------------------------
 
-SvxOrphansItem::SvxOrphansItem(const BYTE nL, const USHORT nId ) :
+SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
     SfxByteItem( nId, nL )
 {
 }
@@ -696,7 +696,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId
 }
 
 // -----------------------------------------------------------------------
-bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -717,7 +717,7 @@ bool	SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Int16 nNewVal = 0;
@@ -732,13 +732,13 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             bHyphen = Any2Bool(rVal);
         break;
         case MID_HYPHEN_MIN_LEAD:
-            nMinLead = (BYTE)nNewVal;
+            nMinLead = (sal_uInt8)nNewVal;
         break;
         case MID_HYPHEN_MIN_TRAIL:
-            nMinTrail = (BYTE)nNewVal;
+            nMinTrail = (sal_uInt8)nNewVal;
         break;
         case MID_HYPHEN_MAX_HYPHENS:
-            nMaxHyphens = (BYTE)nNewVal;
+            nMaxHyphens = (sal_uInt8)nNewVal;
         break;
     }
     return true;
@@ -976,7 +976,7 @@ SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI )
     return *this;
 }
 
-bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxTabStopItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1017,7 +1017,7 @@ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return sal_True;
 }
 
-bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1339,7 +1339,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -1353,7 +1353,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
     return sal_True;
 }
 
-bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bRet;
@@ -1413,14 +1413,14 @@ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
     return new SvxScriptSpaceItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
     rStrm >> bFlag;
     return new SvxScriptSpaceItem( bFlag, Which() );
 }
 
-USHORT	SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16	SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1466,14 +1466,14 @@ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
     return new SvxHangingPunctuationItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
     rStrm >> nValue;
     return new SvxHangingPunctuationItem( nValue, Which() );
 }
 
-USHORT SvxHangingPunctuationItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1519,14 +1519,14 @@ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
     return new SvxForbiddenRuleItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
     rStrm >> nValue;
     return new SvxForbiddenRuleItem( nValue, Which() );
 }
 
-USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1575,20 +1575,20 @@ SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
     return new SvxParaVertAlignItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
     return new SvxParaVertAlignItem( nVal, Which() );
 }
 
-SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
     rStrm << GetValue();
     return rStrm;
 }
 
-USHORT SvxParaVertAlignItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -1606,7 +1606,7 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                USHORT nTmp;
+                sal_uInt16 nTmp;
                 switch( GetValue() )
                 {
                     case AUTOMATIC: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
@@ -1625,19 +1625,19 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
 }
 
 bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                           BYTE /*nMemberId*/ ) const
+                                           sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= (sal_Int16)GetValue();
     return sal_True;
 }
 
 bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                         BYTE /*nMemberId*/ )
+                                         sal_uInt8 /*nMemberId*/ )
 {
     sal_Int16 nVal = sal_Int16();
     if((rVal >>= nVal) && nVal >=0 && nVal <= BOTTOM )
     {
-        SetValue( (USHORT)nVal );
+        SetValue( (sal_uInt16)nVal );
         return sal_True;
     }
     else
@@ -1661,14 +1661,14 @@ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const
     return new SvxParaGridItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
     rStrm >> bFlag;
     return new SvxParaGridItem( bFlag, Which() );
 }
 
-USHORT  SvxParaGridItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16  SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 69f727da6d..856364d3dd 100644..100755
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -49,14 +49,14 @@ int SdrMeasureField::operator==(const SvxFieldData& rSrc) const
 
 void SdrMeasureField::Load(SvPersistStream& rIn)
 {
-    UINT16 nFieldKind;
+    sal_uInt16 nFieldKind;
     rIn>>nFieldKind;
     eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
 }
 
 void SdrMeasureField::Save(SvPersistStream& rOut)
 {
-    rOut<<(UINT16)eMeasureFieldKind;
+    rOut<<(sal_uInt16)eMeasureFieldKind;
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index f98e1ed271..909f2c580e 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -81,7 +81,7 @@ SvxFont::SvxFont( const SvxFont &rFont )
 
 
 void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
-    const Size& rSize, const Color& rCol, BOOL bLeft )
+    const Size& rSize, const Color& rCol, sal_Bool bLeft )
 {
     long nLeft = ( rRect.Left() + rRect.Right() - rSize.Width() )/ 2;
     long nRight = nLeft + rSize.Width();
@@ -146,12 +146,12 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
             // Every beginning of a word is capitalized,  the rest of the word 
             // is taken over as is. 
             // Bug: if the attribute starts in the middle of the word.
-            BOOL bBlank = TRUE;
+            sal_Bool bBlank = sal_True;
 
-            for( USHORT i = 0; i < aTxt.Len(); ++i )
+            for( sal_uInt16 i = 0; i < aTxt.Len(); ++i )
             {
                 if( sal_Unicode(' ') == aTxt.GetChar(i) || sal_Unicode('\t') == aTxt.GetChar(i) )
-                    bBlank = TRUE;
+                    bBlank = sal_True;
                 else
                 {
                     if( bBlank )
@@ -160,7 +160,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
                         aCharClass.toUpper( aTemp );
                         aTxt.Replace( i, 1, aTemp );
                     }
-                    bBlank = FALSE;
+                    bBlank = sal_False;
                 }
             }
             break;
@@ -201,11 +201,11 @@ public:
         : pOut(_pOut), rTxt(_rTxt), nIdx(_nIdx), nLen(_nLen)
         { }
 
-    virtual void DoSpace( const BOOL bDraw );
+    virtual void DoSpace( const sal_Bool bDraw );
     virtual void SetSpace();
     virtual void Do( const XubString &rTxt,
                      const xub_StrLen nIdx, const xub_StrLen nLen,
-                     const BOOL bUpper ) = 0;
+                     const sal_Bool bUpper ) = 0;
 
     inline OutputDevice *GetOut() { return pOut; }
     inline const XubString &GetTxt() const { return rTxt; }
@@ -213,12 +213,12 @@ public:
     xub_StrLen GetLen() const { return nLen; }
 };
 
-void SvxDoCapitals::DoSpace( const BOOL /*bDraw*/ ) { }
+void SvxDoCapitals::DoSpace( const sal_Bool /*bDraw*/ ) { }
 
 void SvxDoCapitals::SetSpace() { }
 
 void SvxDoCapitals::Do( const XubString &/*_rTxt*/, const xub_StrLen /*_nIdx*/,
-    const xub_StrLen /*_nLen*/, const BOOL /*bUpper*/ ) { }
+    const xub_StrLen /*_nLen*/, const sal_Bool /*bUpper*/ ) { }
 
 /*************************************************************************
  *					SvxFont::DoOnCapitals() const
@@ -233,9 +233,9 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
     const xub_StrLen nLen = STRING_LEN == nPartLen ? rDo.GetLen() : nPartLen;
 
     const XubString aTxt( CalcCaseMap( rTxt ) );
-    const USHORT nTxtLen = Min( rTxt.Len(), nLen );
-    USHORT nPos = 0;
-    USHORT nOldPos = nPos;
+    const sal_uInt16 nTxtLen = Min( rTxt.Len(), nLen );
+    sal_uInt16 nPos = 0;
+    sal_uInt16 nOldPos = nPos;
 
     // #108210#
     // Test if string length differ between original and CaseMapped
@@ -275,11 +275,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos-nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
                 
-                rDo.Do( aNewText, 0, aNewText.Len(), TRUE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_True );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, TRUE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_True );
             }
 
             nOldPos = nPos;
@@ -305,11 +305,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
                 
-                rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, FALSE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_False );
             }
 
             nOldPos = nPos;
@@ -320,7 +320,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
 
         if( nOldPos != nPos )
         {
-            rDo.DoSpace( FALSE );
+            rDo.DoSpace( sal_False );
             
             if(bCaseMapLengthDiffers)
             {
@@ -330,18 +330,18 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
                 const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
                 XubString aNewText = CalcCaseMap(aSnippet);
                 
-                rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+                rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
             }
             else
             {
-                rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, FALSE );
+                rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, sal_False );
             }
 
             nOldPos = nPos;
             rDo.SetSpace();
         }
     }
-    rDo.DoSpace( TRUE );
+    rDo.DoSpace( sal_True );
 }
 
 
@@ -432,7 +432,7 @@ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const XubString &rTxt )
 }
 
 Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt,
-                         const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray ) const
+                         const sal_uInt16 nIdx, const sal_uInt16 nLen, sal_Int32* pDXArray ) const
 {
     if ( !IsCaseMap() && !IsKern() )
         return Size( pOut->GetTextArray( rTxt, pDXArray, nIdx, nLen ),
@@ -657,18 +657,18 @@ public:
             { }
 
     virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
-                     const xub_StrLen nLen, const BOOL bUpper );
+                     const xub_StrLen nLen, const sal_Bool bUpper );
 
     inline const Size &GetSize() const { return aTxtSize; };
 };
 
 void SvxDoGetCapitalSize::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
-                              const xub_StrLen _nLen, const BOOL bUpper )
+                              const xub_StrLen _nLen, const sal_Bool bUpper )
 {
     Size aPartSize;
     if ( !bUpper )
     {
-        BYTE nProp = pFont->GetPropr();
+        sal_uInt8 nProp = pFont->GetPropr();
         pFont->SetProprRel( SMALL_CAPS_PERCENTAGE );
         pFont->SetPhysFont( pOut );
         aPartSize.setWidth( pOut->GetTextWidth( _rTxt, _nIdx, _nLen ) );
@@ -720,23 +720,23 @@ public:
           aSpacePos( rPos ),
           nKern( nKrn )
         { }
-    virtual void DoSpace( const BOOL bDraw );
+    virtual void DoSpace( const sal_Bool bDraw );
     virtual void SetSpace();
     virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
-                     const xub_StrLen nLen, const BOOL bUpper );
+                     const xub_StrLen nLen, const sal_Bool bUpper );
 };
 
-void SvxDoDrawCapital::DoSpace( const BOOL bDraw )
+void SvxDoDrawCapital::DoSpace( const sal_Bool bDraw )
 {
     if ( bDraw || pFont->IsWordLineMode() )
     {
-        USHORT nDiff = (USHORT)(aPos.X() - aSpacePos.X());
+        sal_uInt16 nDiff = (sal_uInt16)(aPos.X() - aSpacePos.X());
         if ( nDiff )
         {
-            BOOL bWordWise = pFont->IsWordLineMode();
-            BOOL bTrans = pFont->IsTransparent();
-            pFont->SetWordLineMode( FALSE );
-            pFont->SetTransparent( TRUE );
+            sal_Bool bWordWise = pFont->IsWordLineMode();
+            sal_Bool bTrans = pFont->IsTransparent();
+            pFont->SetWordLineMode( sal_False );
+            pFont->SetTransparent( sal_True );
             pFont->SetPhysFont( pOut );
             pOut->DrawStretchText( aSpacePos, nDiff, XubString( sDoubleSpace,
                             RTL_TEXTENCODING_MS_1252 ), 0, 2 );
@@ -754,9 +754,9 @@ void SvxDoDrawCapital::SetSpace()
 }
 
 void SvxDoDrawCapital::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
-                           const xub_StrLen _nLen, const BOOL bUpper)
+                           const xub_StrLen _nLen, const sal_Bool bUpper)
 {
-    BYTE nProp = 0;
+    sal_uInt8 nProp = 0;
     Size aPartSize;
 
     // Set the desired font
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
index 383683be18..383683be18 100644..100755
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 7943a51fa4..280f427e7a 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -124,7 +124,7 @@ using namespace ::com::sun::star::text;
 #define TWIP_TO_MM100_UNSIGNED(TWIP)     ((((TWIP)*127L+36L)/72L))
 #define MM100_TO_TWIP_UNSIGNED(MM100)    ((((MM100)*72L+63L)/127L))
 
-BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
+sal_Bool SvxFontItem::bEnableStoreUnicodeNames = sal_False;
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -169,7 +169,7 @@ TYPEINIT1(SvxScriptSetItem, SfxSetItem );
 // class SvxFontListItem -------------------------------------------------
 
 SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
-                                  const USHORT nId ) :
+                                  const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     pFontList( pFontLst )
 {
@@ -178,7 +178,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
         sal_Int32 nCount = pFontList->GetFontNameCount();
         aFontNameSeq.realloc( nCount );
 
-        for ( USHORT i = 0; i < nCount; i++ )
+        for ( sal_uInt16 i = 0; i < nCount; i++ )
             aFontNameSeq[i] = pFontList->GetFontName(i).GetName();
     }
 }
@@ -209,7 +209,7 @@ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
     return( pFontList == ((SvxFontListItem&)rAttr).pFontList );
 }
 
-bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= aFontNameSeq;
     return true;
@@ -231,7 +231,7 @@ SfxItemPresentation SvxFontListItem::GetPresentation
 
 // class SvxFontItem -----------------------------------------------------
 
-SvxFontItem::SvxFontItem( const USHORT nId ) :
+SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     eFamily = FAMILY_SWISS;
@@ -243,7 +243,7 @@ SvxFontItem::SvxFontItem( const USHORT nId ) :
 
 SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
                   const XubString& aStName, const FontPitch eFontPitch,
-                  const rtl_TextEncoding eFontTextEncoding, const USHORT nId ) :
+                  const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
 
@@ -257,7 +257,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
 
 // -----------------------------------------------------------------------
 
-bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -286,7 +286,7 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -380,14 +380,14 @@ SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    BOOL bToBats =
+    sal_Bool bToBats =
         GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
         GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 );
 
-    rStrm << (BYTE) GetFamily() << (BYTE) GetPitch()
-          << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
+    rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
+          << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
 
     String aStoreFamilyName( GetFamilyName() );
     if( bToBats )
@@ -409,9 +409,9 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE _eFamily, eFontPitch, eFontTextEncoding;
+    sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding;
     String aName, aStyle;
     rStrm >> _eFamily;
     rStrm >> eFontPitch;
@@ -424,7 +424,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
     rStrm.ReadByteString(aStyle);
 
     // Set the "correct" textencoding
-    eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
+    eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() );
 
     // at some point, the StarBats changes from  ANSI font to SYMBOL font
     if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") )
@@ -476,15 +476,15 @@ SfxItemPresentation SvxFontItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-void SvxFontItem::EnableStoreUnicodeNames( BOOL bEnable )
+void SvxFontItem::EnableStoreUnicodeNames( sal_Bool bEnable )
 {
     bEnableStoreUnicodeNames = bEnable;
 }
 
 // class SvxPostureItem --------------------------------------------------
 
-SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)ePosture )
+SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)ePosture )
 {
 }
 
@@ -497,24 +497,24 @@ SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxPostureItem::GetValueCount() const
+sal_uInt16 SvxPostureItem::GetValueCount() const
 {
     return ITALIC_NORMAL + 1;	// ITALIC_NONE also belongs here
 }
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nPosture;
+    sal_uInt8 nPosture;
     rStrm >> nPosture;
     return new SvxPostureItem( (const FontItalic)nPosture, Which() );
 }
@@ -545,13 +545,13 @@ SfxItemPresentation SvxPostureItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)ITALIC_NORMAL, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
 
     XubString sTxt;
     FontItalic eItalic = (FontItalic)nPos;
-    USHORT nId = 0;
+    sal_uInt16 nId = 0;
 
     switch ( eItalic )
     {
@@ -566,7 +566,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
     return sTxt;
 }
 
-bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -581,7 +581,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -600,7 +600,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
                 eSlant = (awt::FontSlant)nValue;
             }
-            SetValue((USHORT)eSlant);
+            SetValue((sal_uInt16)eSlant);
         }
     }
     return true;
@@ -623,13 +623,13 @@ BOOL SvxPostureItem::GetBoolValue() const
 
 void SvxPostureItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
+    SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
 }
 
 // class SvxWeightItem ---------------------------------------------------
 
-SvxWeightItem::SvxWeightItem( const FontWeight eWght, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eWght )
+SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eWght )
 {
 }
 
@@ -653,12 +653,12 @@ sal_Bool SvxWeightItem::GetBoolValue() const
 
 void SvxWeightItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
+    SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxWeightItem::GetValueCount() const
+sal_uInt16 SvxWeightItem::GetValueCount() const
 {
     return WEIGHT_BLACK;	// WEIGHT_DONTKNOW does not belong
 }
@@ -672,17 +672,17 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nWeight;
+    sal_uInt8 nWeight;
     rStrm >> nWeight;
     return new SvxWeightItem( (FontWeight)nWeight, Which() );
 }
@@ -713,13 +713,13 @@ SfxItemPresentation SvxWeightItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)WEIGHT_BLACK, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
 }
 
-bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -736,7 +736,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxWeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -754,7 +754,7 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     return sal_False;
                 fValue = (float)nValue;
             }
-            SetValue( (USHORT)VCLUnoHelper::ConvertFontWeight((float)fValue) );
+            SetValue( (sal_uInt16)VCLUnoHelper::ConvertFontWeight((float)fValue) );
         }
         break;
     }
@@ -763,9 +763,9 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SvxFontHeightItem -----------------------------------------------
 
-SvxFontHeightItem::SvxFontHeightItem( const ULONG nSz,
-                                      const USHORT nPrp,
-                                      const USHORT nId ) :
+SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
+                                      const sal_uInt16 nPrp,
+                                      const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     SetHeight( nSz,nPrp );	// calculate in percentage
@@ -780,17 +780,17 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
-    rStrm << (USHORT)GetHeight();
+    rStrm << (sal_uInt16)GetHeight();
 
     if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
-        rStrm << GetProp() << (USHORT)GetPropUnit();
+        rStrm << GetProp() << (sal_uInt16)GetPropUnit();
     else
     {
         // When exporting to the old versions the relative information is lost
         // when there is no percentage
-        USHORT _nProp = GetProp();
+        sal_uInt16 _nProp = GetProp();
         if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
             _nProp = 100;
         rStrm << _nProp;
@@ -801,9 +801,9 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) cons
 // -----------------------------------------------------------------------
 
 SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
-                                                 USHORT nVersion ) const
+                                                 sal_uInt16 nVersion ) const
 {
-    USHORT nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
+    sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
 
     rStrm >> nsize;
 
@@ -811,9 +811,9 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
         rStrm >> nprop;
     else
     {
-        BYTE nP;
+        sal_uInt8 nP;
         rStrm  >> nP;
-        nprop = (USHORT)nP;
+        nprop = (sal_uInt16)nP;
     }
 
     if( FONTHEIGHT_UNIT_VERSION <= nVersion )
@@ -834,7 +834,7 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
             GetPropUnit() == ((SvxFontHeightItem&)rItem).GetPropUnit();
 }
 
-bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     //	In StarOne is the uno::Any always 1/100mm. Through the MemberId it is
     //	controlled if the value in the Item should be 1/100mm or Twips.
@@ -968,7 +968,7 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
     return nRet;
 }
 
-bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1095,7 +1095,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-USHORT SvxFontHeightItem::GetVersion(USHORT nFileVersion) const
+sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const
 {
     return (nFileVersion <= SOFFICE_FILEFORMAT_40)
                ? FONTHEIGHT_16_VERSION
@@ -1117,7 +1117,7 @@ bool SvxFontHeightItem::HasMetrics() const
     return true;
 }
 
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp,
                                     SfxMapUnit eUnit )
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1137,7 +1137,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
     ePropUnit = eUnit;
 }
 
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
                                  SfxMapUnit eMetric, SfxMapUnit eCoreMetric )
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1161,7 +1161,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
 
 // class SvxFontWidthItem -----------------------------------------------
 
-SvxFontWidthItem::SvxFontWidthItem( const USHORT nSz, const USHORT nPrp, const USHORT nId ) :
+SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     nWidth = nSz;
@@ -1177,7 +1177,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << GetWidth() << GetProp();
     return rStrm;
@@ -1187,7 +1187,7 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) c
 
 bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
 {
-    nWidth = (USHORT)Scale( nWidth, nMult, nDiv );
+    nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv );
     return true;
 }
 
@@ -1201,10 +1201,10 @@ bool SvxFontWidthItem::HasMetrics() const
 // -----------------------------------------------------------------------
 
 SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
-                                                 USHORT /*nVersion*/ ) const
+                                                 sal_uInt16 /*nVersion*/ ) const
 {
-    USHORT nS;
-    USHORT nP;
+    sal_uInt16 nS;
+    sal_uInt16 nP;
 
     rStrm >> nS;
     rStrm >> nP;
@@ -1222,7 +1222,7 @@ int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
             GetProp() == ((SvxFontWidthItem&)rItem).GetProp();
 }
 
-bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1238,7 +1238,7 @@ bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1295,8 +1295,8 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
 
 // class SvxTextLineItem ------------------------------------------------
 
-SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const USHORT nId )
-    : SfxEnumItem( nId, (USHORT)eSt ), mColor( COL_TRANSPARENT )
+SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId )
+    : SfxEnumItem( nId, (sal_uInt16)eSt ), mColor( COL_TRANSPARENT )
 {
 }
 
@@ -1318,7 +1318,7 @@ sal_Bool SvxTextLineItem::GetBoolValue() const
 
 void SvxTextLineItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
+    SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
 }
 
 // -----------------------------------------------------------------------
@@ -1332,24 +1332,24 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxTextLineItem::GetValueCount() const
+sal_uInt16 SvxTextLineItem::GetValueCount() const
 {
     return UNDERLINE_DOTTED + 1;	// UNDERLINE_NONE also belongs here
 }
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxTextLineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxTextLineItem(  (FontUnderline)nState, Which() );
 }
@@ -1384,13 +1384,13 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
+XubString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
 {
     OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
     return XubString();
 }
 
-bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -1412,7 +1412,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 }
 
-bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bRet = sal_True;
@@ -1461,7 +1461,7 @@ int SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
 
 // class SvxUnderlineItem ------------------------------------------------
 
-SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const USHORT nId )
+SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1477,24 +1477,24 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxUnderlineItem(  (FontUnderline)nState, Which() );
 }
 
 // -----------------------------------------------------------------------
 
-XubString SvxUnderlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
 }
 
 // class SvxOverlineItem ------------------------------------------------
 
-SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const USHORT nId )
+SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId )
     : SvxTextLineItem( eSt, nId )
 {
 }
@@ -1510,25 +1510,25 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxOverlineItem(  (FontUnderline)nState, Which() );
 }
 
 // -----------------------------------------------------------------------
 
-XubString SvxOverlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
 }
 
 // class SvxCrossedOutItem -----------------------------------------------
 
-SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const USHORT nId )
-    : SfxEnumItem( nId, (USHORT)eSt )
+SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId )
+    : SfxEnumItem( nId, (sal_uInt16)eSt )
 {
 }
 
@@ -1550,12 +1550,12 @@ sal_Bool SvxCrossedOutItem::GetBoolValue() const
 
 void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal )
 {
-    SetValue( (USHORT)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
+    SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCrossedOutItem::GetValueCount() const
+sal_uInt16 SvxCrossedOutItem::GetValueCount() const
 {
     return STRIKEOUT_DOUBLE + 1;	// STRIKEOUT_NONE belongs also here
 }
@@ -1569,17 +1569,17 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetValue();
+    rStrm << (sal_uInt8)GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE eCross;
+    sal_uInt8 eCross;
     rStrm >> eCross;
     return new SvxCrossedOutItem(  (FontStrikeout)eCross, Which() );
 }
@@ -1610,13 +1610,13 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos <= (USHORT)STRIKEOUT_X, "enum overflow!" );
+    DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
 }
 
-bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -1631,7 +1631,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -1652,7 +1652,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 }
 // class SvxShadowedItem -------------------------------------------------
 
-SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const USHORT nId ) :
+SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bShadowed )
 {
 }
@@ -1666,17 +1666,17 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxShadowedItem( nState, Which() );
 }
@@ -1699,7 +1699,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_SHADOWED_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_SHADOWED_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_SHADOWED_TRUE;
@@ -1713,7 +1713,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
 
 // class SvxAutoKernItem -------------------------------------------------
 
-SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const USHORT nId ) :
+SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bAutoKern )
 {
 }
@@ -1727,17 +1727,17 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxAutoKernItem( nState, Which() );
 }
@@ -1760,7 +1760,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_AUTOKERN_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_AUTOKERN_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_AUTOKERN_TRUE;
@@ -1775,7 +1775,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
 // class SvxWordLineModeItem ---------------------------------------------
 
 SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
-                                          const USHORT nId ) :
+                                          const sal_uInt16 nId ) :
     SfxBoolItem( nId, bWordLineMode )
 {
 }
@@ -1789,7 +1789,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -1797,7 +1797,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -1822,7 +1822,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_WORDLINE_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_WORDLINE_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_WORDLINE_TRUE;
@@ -1836,7 +1836,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
 
 // class SvxContourItem --------------------------------------------------
 
-SvxContourItem::SvxContourItem( const sal_Bool bContoured, const USHORT nId ) :
+SvxContourItem::SvxContourItem( const sal_Bool bContoured, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bContoured )
 {
 }
@@ -1850,7 +1850,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -1858,7 +1858,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) con
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -1883,7 +1883,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_CONTOUR_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_CONTOUR_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CONTOUR_TRUE;
@@ -1897,7 +1897,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
 
 // class SvxPropSizeItem -------------------------------------------------
 
-SvxPropSizeItem::SvxPropSizeItem( const USHORT nPercent, const USHORT nId ) :
+SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nId ) :
     SfxUInt16Item( nId, nPercent )
 {
 }
@@ -1911,17 +1911,17 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxPropSizeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (USHORT) GetValue();
+    rStrm << (sal_uInt16) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    USHORT nSize;
+    sal_uInt16 nSize;
     rStrm >> nSize;
     return new SvxPropSizeItem( nSize, Which() );
 }
@@ -1942,7 +1942,7 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation
 
 // class SvxColorItem ----------------------------------------------------
 
-SvxColorItem::SvxColorItem( const USHORT nId ) :
+SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     mColor( COL_BLACK )
 {
@@ -1950,7 +1950,7 @@ SvxColorItem::SvxColorItem( const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
+SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
     mColor( rCol )
 {
@@ -1958,7 +1958,7 @@ SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
 
 // -----------------------------------------------------------------------
 
-SvxColorItem::SvxColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
 {
     Color aColor;
@@ -1981,7 +1981,7 @@ SvxColorItem::~SvxColorItem()
 }
 
 // -----------------------------------------------------------------------
-USHORT SvxColorItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -2001,7 +2001,7 @@ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= (sal_Int32)(mColor.GetColor());
     return true;
@@ -2009,7 +2009,7 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_Int32 nColor = 0;
     if(!(rVal >>= nColor))
@@ -2028,7 +2028,7 @@ SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     if( VERSION_USEAUTOCOLOR == nItemVersion &&
         COL_AUTO == mColor.GetColor() )
@@ -2040,7 +2040,7 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const
 {
     return new SvxColorItem( rStrm, Which() );
 }
@@ -2080,7 +2080,7 @@ void SvxColorItem::SetValue( const Color& rNewCol )
 
 // class SvxCharSetColorItem ---------------------------------------------
 
-SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
+SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) :
     SvxColorItem( nId ),
 
     eFrom( RTL_TEXTENCODING_DONTKNOW )
@@ -2091,7 +2091,7 @@ SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
 
 SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
                                           const rtl_TextEncoding _eFrom,
-                                          const USHORT nId ) :
+                                          const sal_uInt16 nId ) :
     SvxColorItem( rCol, nId ),
 
     eFrom( _eFrom )
@@ -2108,18 +2108,18 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
+    rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
           << GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE cSet;
+    sal_uInt8 cSet;
     Color aColor;
     rStrm >> cSet >> aColor;
     return new SvxCharSetColorItem( aColor,  (rtl_TextEncoding)cSet, Which() );
@@ -2141,7 +2141,7 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation
 
 // class SvxKerningItem --------------------------------------------------
 
-SvxKerningItem::SvxKerningItem( const short nKern, const USHORT nId ) :
+SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
     SfxInt16Item( nId, nKern )
 {
 }
@@ -2155,7 +2155,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (short) GetValue();
     return rStrm;
@@ -2178,7 +2178,7 @@ bool SvxKerningItem::HasMetrics() const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     short nValue;
     rStrm >> nValue;
@@ -2208,7 +2208,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             if ( GetValue() > 0 )
                 nId = RID_SVXITEMS_KERNING_EXPANDED;
@@ -2227,7 +2227,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Int16 nVal = GetValue();
     if(nMemberId & CONVERT_TWIPS)
@@ -2236,7 +2236,7 @@ bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 // -----------------------------------------------------------------------
-bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
     sal_Int16 nVal = sal_Int16();
     if(!(rVal >>= nVal))
@@ -2249,14 +2249,14 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
 
 // class SvxCaseMapItem --------------------------------------------------
 
-SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const USHORT nId ) :
-    SfxEnumItem( nId, (USHORT)eMap )
+SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
+    SfxEnumItem( nId, (sal_uInt16)eMap )
 {
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCaseMapItem::GetValueCount() const
+sal_uInt16 SvxCaseMapItem::GetValueCount() const
 {
     return SVX_CASEMAP_END;	// SVX_CASEMAP_KAPITAELCHEN	+ 1
 }
@@ -2270,17 +2270,17 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE cMap;
+    sal_uInt8 cMap;
     rStrm >> cMap;
     return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
 }
@@ -2311,13 +2311,13 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (USHORT)SVX_CASEMAP_END, "enum overflow!" );
+    DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
     return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
 }
 
-bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_Int16 nRet = style::CaseMap::NONE;
     switch( GetValue() )
@@ -2331,7 +2331,7 @@ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     return true;
 }
 
-bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_uInt16 nVal = sal_uInt16();
     if(!(rVal >>= nVal))
@@ -2351,7 +2351,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 
 // class SvxEscapementItem -----------------------------------------------
 
-SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
+SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
 
     nEsc	( 0 ),
@@ -2362,7 +2362,7 @@ SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
 // -----------------------------------------------------------------------
 
 SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
-                                      const USHORT nId ) :
+                                      const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
     nProp( 100 )
 {
@@ -2374,8 +2374,8 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
 // -----------------------------------------------------------------------
 
 SvxEscapementItem::SvxEscapementItem( const short _nEsc,
-                                      const BYTE _nProp,
-                                      const USHORT nId ) :
+                                      const sal_uInt8 _nProp,
+                                      const sal_uInt16 nId ) :
     SfxEnumItemInterface( nId ),
     nEsc    ( _nEsc ),
     nProp   ( _nProp )
@@ -2401,7 +2401,7 @@ SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     short _nEsc = GetEsc();
     if( SOFFICE_FILEFORMAT_31 == rStrm.GetVersion() )
@@ -2411,16 +2411,16 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
         else if( DFLT_ESC_AUTO_SUB == _nEsc )
             _nEsc = DFLT_ESC_SUB;
     }
-    rStrm << (BYTE) GetProp()
+    rStrm << (sal_uInt8) GetProp()
           << (short) _nEsc;
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE _nProp;
+    sal_uInt8 _nProp;
     short _nEsc;
     rStrm >> _nProp >> _nEsc;
     return new SvxEscapementItem( _nEsc, _nProp, Which() );
@@ -2428,7 +2428,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxEscapementItem::GetValueCount() const
+sal_uInt16 SvxEscapementItem::GetValueCount() const
 {
     return SVX_ESCAPEMENT_END;	// SVX_ESCAPEMENT_SUBSCRIPT + 1
 }
@@ -2469,15 +2469,15 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-XubString SvxEscapementItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (USHORT)SVX_ESCAPEMENT_END, "enum overflow!" );
+    DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxEscapementItem::GetEnumValue() const
+sal_uInt16 SvxEscapementItem::GetEnumValue() const
 {
     if ( nEsc < 0 )
         return SVX_ESCAPEMENT_SUBSCRIPT;
@@ -2488,12 +2488,12 @@ USHORT SvxEscapementItem::GetEnumValue() const
 
 // -----------------------------------------------------------------------
 
-void SvxEscapementItem::SetEnumValue( USHORT nVal )
+void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal )
 {
     SetEscapement( (const SvxEscapement)nVal );
 }
 
-bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -2511,7 +2511,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -2536,7 +2536,7 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         break;
         case MID_AUTO_ESC:
         {
-            BOOL bVal = Any2Bool(rVal);
+            sal_Bool bVal = Any2Bool(rVal);
             if(bVal)
             {
                 if(nEsc < 0)
@@ -2557,14 +2557,14 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 // class SvxLanguageItem -------------------------------------------------
 
-SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const USHORT nId )
+SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId )
     : SfxEnumItem( nId , eLang )
 {
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxLanguageItem::GetValueCount() const
+sal_uInt16 SvxLanguageItem::GetValueCount() const
 {
     // #i50205# got rid of class International
     DBG_ERRORFILE("SvxLanguageItem::GetValueCount: supposed to return a count of what?");
@@ -2583,17 +2583,17 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (USHORT) GetValue();
+    rStrm << (sal_uInt16) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    USHORT nValue;
+    sal_uInt16 nValue;
     rStrm >> nValue;
     return new SvxLanguageItem( (LanguageType)nValue, Which() );
 }
@@ -2627,7 +2627,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -2643,7 +2643,7 @@ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch(nMemberId)
@@ -2674,7 +2674,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 }
 
 // class SvxNoLinebreakItem ----------------------------------------------
-SvxNoLinebreakItem::SvxNoLinebreakItem( const BOOL bBreak, const USHORT nId ) :
+SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const sal_uInt16 nId ) :
       SfxBoolItem( nId, bBreak )
 {
 }
@@ -2688,7 +2688,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool)GetValue();
     return rStrm;
@@ -2696,7 +2696,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -2719,7 +2719,7 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation
 
 // class SvxNoHyphenItem -------------------------------------------------
 
-SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const USHORT nId ) :
+SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const sal_uInt16 nId ) :
     SfxBoolItem( nId , bHyphen )
 {
 }
@@ -2733,7 +2733,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_Bool) GetValue();
     return rStrm;
@@ -2741,7 +2741,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) co
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Bool bValue;
     rStrm >> bValue;
@@ -2771,21 +2771,21 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation
 // class SvxLineColorItem (== SvxColorItem)
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) :
     SvxColorItem( nId )
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( const Color& rCol, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) :
     SvxColorItem( rCol, nId )
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     SvxColorItem( rStrm, nId )
 {
 }
@@ -2821,7 +2821,7 @@ SfxItemPresentation SvxLineColorItem::GetPresentation
 // class SvxBlinkItem -------------------------------------------------
 
 
-SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const USHORT nId ) :
+SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const sal_uInt16 nId ) :
     SfxBoolItem( nId, bBlink )
 {
 }
@@ -2835,17 +2835,17 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm << (BYTE) GetValue();
+    rStrm << (sal_uInt8) GetValue();
     return rStrm;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
 {
-    BYTE nState;
+    sal_uInt8 nState;
     rStrm >> nState;
     return new SvxBlinkItem( nState, Which() );
 }
@@ -2868,7 +2868,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = RID_SVXITEMS_BLINK_FALSE;
+            sal_uInt16 nId = RID_SVXITEMS_BLINK_FALSE;
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_BLINK_TRUE;
@@ -2883,7 +2883,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
 // class SvxEmphaisMarkItem ---------------------------------------------------
 
 SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
-                                        const USHORT nId )
+                                        const sal_uInt16 nId )
     : SfxUInt16Item( nId, nValue )
 {
 }
@@ -2898,7 +2898,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
 // -----------------------------------------------------------------------
 
 SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
-                                     USHORT /*nItemVersion*/ ) const
+                                     sal_uInt16 /*nItemVersion*/ ) const
 {
     rStrm << (sal_uInt16)GetValue();
     return rStrm;
@@ -2906,7 +2906,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nValue;
     rStrm >> nValue;
@@ -2935,7 +2935,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
                 sal_uInt16 nVal = GetValue();
                 rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
                                         ( EMPHASISMARK_STYLE & nVal ));
-                USHORT nId = ( EMPHASISMARK_POS_ABOVE & nVal )
+                sal_uInt16 nId = ( EMPHASISMARK_POS_ABOVE & nVal )
                                 ? RID_SVXITEMS_EMPHASIS_ABOVE_POS
                                 : ( EMPHASISMARK_POS_BELOW & nVal )
                                     ? RID_SVXITEMS_EMPHASIS_BELOW_POS
@@ -2951,7 +2951,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch( nMemberId )
@@ -2977,7 +2977,7 @@ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bRet = true;
@@ -3007,7 +3007,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
     return bRet;
 }
 
-USHORT SvxEmphasisMarkItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxEmphasisMarkItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3055,7 +3055,7 @@ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
 }
 
 bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const
+                                sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bRet = true;
@@ -3088,7 +3088,7 @@ bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
 }
 
 bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId )
+                                    sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Bool bRet = sal_False;
@@ -3147,7 +3147,7 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
 }
 
 
-SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
+SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) const
 {
     sal_Bool _bOn;
     sal_Unicode cStart, cEnd;
@@ -3155,13 +3155,13 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
     return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() );
 }
 
-SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
     rStrm << GetValue() << GetStartBracket() << GetEndBracket();
     return rStrm;
 }
 
-USHORT SvxTwoLinesItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
             SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3188,7 +3188,7 @@ SfxPoolItem* SvxCharRotateItem::Clone( SfxItemPool* ) const
     return new SvxCharRotateItem( GetValue(), IsFitToLine(), Which() );
 }
 
-SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     sal_Bool b;
@@ -3196,14 +3196,14 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
     return new SvxCharRotateItem( nVal, b, Which() );
 }
 
-SvStream& SvxCharRotateItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const
 {
     sal_Bool bFlag = IsFitToLine();
     rStrm << GetValue() << bFlag;
     return rStrm;
 }
 
-USHORT SvxCharRotateItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -3239,7 +3239,7 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
 }
 
 bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                BYTE nMemberId ) const
+                                sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -3259,7 +3259,7 @@ bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
 }
 
 bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                    BYTE nMemberId )
+                                    sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -3269,7 +3269,7 @@ bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
         {
             sal_Int16 nVal = 0;
             if((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal))
-                SetValue( (USHORT)nVal );
+                SetValue( (sal_uInt16)nVal );
             else
                 bRet = sal_False;
             break;
@@ -3307,7 +3307,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
     return new SvxCharScaleWidthItem( GetValue(), Which() );
 }
 
-SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
@@ -3319,7 +3319,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
         // USHORT nFixWidth, USHORT nPropWidth.
         // nFixWidth has never been used...
         rStrm >> nVal;
-        USHORT nTest;
+        sal_uInt16 nTest;
         rStrm >> nTest;
         if ( nTest == 0x1234 )
             pItem->SetValue( nVal );
@@ -3330,23 +3330,23 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
     return pItem;
 }
 
-SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, USHORT nVer ) const
+SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) const
 {
     SvStream& rRet = SfxUInt16Item::Store( rStream, nVer );
     if ( Which() == EE_CHAR_FONTWIDTH )
     {
         // see comment in Create()....
-        rRet.SeekRel( -1*(long)sizeof(USHORT) );
-        rRet << (USHORT)0;
+        rRet.SeekRel( -1*(long)sizeof(sal_uInt16) );
+        rRet << (sal_uInt16)0;
         rRet << GetValue();
         // Really ugly, but not a problem for reading the doc in 5.2
-        rRet << (USHORT)0x1234;
+        rRet << (sal_uInt16)0x1234;
     }
     return rRet;
 }
 
 
-USHORT SvxCharScaleWidthItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
@@ -3379,22 +3379,22 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
     // where we still want this to be a sal_Int16
     sal_Int16 nValue = sal_Int16();
     if (rVal >>= nValue)
     {
-        SetValue( (UINT16) nValue );
+        SetValue( (sal_uInt16) nValue );
         return true;
     }
 
-    OSL_FAIL( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
+    DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
     return false;
 }
 
-bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
     // where we still want this to be a sal_Int16
@@ -3408,7 +3408,7 @@ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
 
 SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
                                          const sal_uInt16 nId )
-    : SfxEnumItem( nId, (USHORT)eValue )
+    : SfxEnumItem( nId, (sal_uInt16)eValue )
 {
 }
 
@@ -3417,33 +3417,33 @@ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
     return new SvxCharReliefItem( *this );
 }
 
-SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_uInt16 nVal;
     rStrm >> nVal;
     return new SvxCharReliefItem( (FontRelief)nVal, Which() );
 }
 
-SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
 {
     sal_uInt16 nVal = GetValue();
     rStrm << nVal;
     return rStrm;
 }
 
-USHORT SvxCharReliefItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
 
-String SvxCharReliefItem::GetValueTextByPos( USHORT nPos ) const
+String SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
                     "enum overflow" );
     return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
 }
 
-USHORT SvxCharReliefItem::GetValueCount() const
+sal_uInt16 SvxCharReliefItem::GetValueCount() const
 {
     return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE;
 }
@@ -3475,7 +3475,7 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation
 }
 
 bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId )
+                                        sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -3486,7 +3486,7 @@ bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
             sal_Int16 nVal = -1;
             rVal >>= nVal;
             if(nVal >= 0 && nVal <= RELIEF_ENGRAVED)
-                SetValue( (USHORT)nVal );
+                SetValue( (sal_uInt16)nVal );
             else
                 bRet = false;
         }
@@ -3499,7 +3499,7 @@ bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
 }
 
 bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId ) const
+                                        sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     bool bRet = true;
@@ -3532,14 +3532,14 @@ SfxPoolItem* SvxScriptTypeItem::Clone( SfxItemPool * ) const
 |*    class SvxScriptSetItem
 *************************************************************************/
 
-SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
+SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
     : SfxSetItem( nSlotId, new SfxItemSet( rPool,
                         SID_ATTR_CHAR_FONT,	SID_ATTR_CHAR_FONT ))
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nLatin, nAsian, nComplex );
 
-    USHORT aIds[ 9 ] = { 0 };
+    sal_uInt16 aIds[ 9 ] = { 0 };
     aIds[ 0 ] = aIds[ 1 ] = nLatin;
     aIds[ 2 ] = aIds[ 3 ] = nAsian;
     aIds[ 4 ] = aIds[ 5 ] = nComplex;
@@ -3552,28 +3552,28 @@ SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
 SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
 {
     SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() );
-    p->GetItemSet().Put( GetItemSet(), FALSE );
+    p->GetItemSet().Put( GetItemSet(), sal_False );
     return p;
 }
 
-SfxPoolItem* SvxScriptSetItem::Create( SvStream &, USHORT ) const
+SfxPoolItem* SvxScriptSetItem::Create( SvStream &, sal_uInt16 ) const
 {
     return 0;
 }
 
 const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet(
-                            const SfxItemSet& rSet, USHORT nId )
+                            const SfxItemSet& rSet, sal_uInt16 nId )
 {
     const SfxPoolItem* pI;
-    SfxItemState eSt = rSet.GetItemState( nId, FALSE, &pI );
+    SfxItemState eSt = rSet.GetItemState( nId, sal_False, &pI );
     if( SFX_ITEM_SET != eSt )
         pI = SFX_ITEM_DEFAULT == eSt ? &rSet.Get( nId ) : 0;
     return pI;
 }
 
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript )
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16 nScript )
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nSlotId, rSet, nLatin, nAsian, nComplex );
 
     const SfxPoolItem *pRet, *pAsn, *pCmplx;
@@ -3622,15 +3622,15 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxI
     return pRet;
 }
 
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nScript ) const
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nScript ) const
 {
     return GetItemOfScript( Which(), GetItemSet(), nScript );
 }
 
-void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
+void SvxScriptSetItem::PutItemForScriptType( sal_uInt16 nScriptType,
                                              const SfxPoolItem& rItem )
 {
-    USHORT nLatin, nAsian, nComplex;
+    sal_uInt16 nLatin, nAsian, nComplex;
     GetWhichIds( nLatin, nAsian, nComplex );
 
     SfxPoolItem* pCpy = rItem.Clone();
@@ -3652,7 +3652,7 @@ void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
     delete pCpy;
 }
 
-void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex )
 {
     const SfxItemPool& rPool = *rSet.GetPool();
     GetSlotIds( nSlotId, rLatin, rAsian, rComplex );
@@ -3661,19 +3661,19 @@ void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHO
     rComplex = rPool.GetWhich( rComplex );
 }
 
-void SvxScriptSetItem::GetWhichIds( USHORT& rLatin, USHORT& rAsian,
-                                    USHORT& rComplex ) const
+void SvxScriptSetItem::GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian,
+                                    sal_uInt16& rComplex ) const
 {
     GetWhichIds( Which(), GetItemSet(), rLatin, rAsian, rComplex );
 }
 
-void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
-                                    USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
+                                    sal_uInt16& rAsian, sal_uInt16& rComplex )
 {
     switch( nSlotId )
     {
     default:
-        DBG_ASSERT( FALSE, "wrong SlotId for class SvxScriptSetItem" );
+        DBG_ASSERT( sal_False, "wrong SlotId for class SvxScriptSetItem" );
         // no break - default to font - Id Range !!
 
     case SID_ATTR_CHAR_FONT:
@@ -3706,12 +3706,12 @@ void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
 
 void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex )
 {
-    const USHORT nItemCnt = 3;
+    const sal_uInt16 nItemCnt = 3;
 
     static struct
     {
-        USHORT nFontType;
-        USHORT nLanguage;
+        sal_uInt16 nFontType;
+        sal_uInt16 nLanguage;
     }
     aOutTypeArr[ nItemCnt ] =
     {
@@ -3722,7 +3722,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 
     SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
 
-    for ( USHORT n = 0; n < nItemCnt; ++n )
+    for ( sal_uInt16 n = 0; n < nItemCnt; ++n )
     {
         Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
                                                   aOutTypeArr[ n ].nLanguage,
@@ -3737,12 +3737,12 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
 }
 
 
-USHORT GetI18NScriptTypeOfLanguage( USHORT nLang )
+sal_uInt16 GetI18NScriptTypeOfLanguage( sal_uInt16 nLang )
 {
     return GetI18NScriptType( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) );
 }
 
-USHORT GetItemScriptType( short nI18NType )
+sal_uInt16 GetItemScriptType( short nI18NType )
 {
     switch ( nI18NType )
     {
@@ -3753,7 +3753,7 @@ USHORT GetItemScriptType( short nI18NType )
     return 0;
 }
 
-short GetI18NScriptType( USHORT nItemType )
+short GetI18NScriptType( sal_uInt16 nItemType )
 {
     switch ( nItemType )
     {
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 0d5c6fe73b..549d1213e3 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::text;
 
 TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, 0));
 
-SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, USHORT _nWhich )
+SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich )
     : SfxUInt16Item( _nWhich, (sal_uInt16)eValue )
 {
 }
@@ -63,19 +63,19 @@ SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
     return new SvxWritingModeItem( *this );
 }
 
-SfxPoolItem* SvxWritingModeItem::Create( SvStream & , USHORT  ) const
+SfxPoolItem* SvxWritingModeItem::Create( SvStream & , sal_uInt16  ) const
 {
     OSL_FAIL("SvxWritingModeItem should not be streamed!");
     return NULL;
 }
 
-SvStream& SvxWritingModeItem::Store( SvStream & rStrm, USHORT  ) const
+SvStream& SvxWritingModeItem::Store( SvStream & rStrm, sal_uInt16  ) const
 {
     OSL_FAIL("SvxWritingModeItem should not be streamed!");
     return rStrm;
 }
 
-USHORT SvxWritingModeItem::GetVersion( USHORT /*nFVer*/ ) const
+sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
 {
     return USHRT_MAX;
 }
@@ -104,7 +104,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
     return eRet;
 }
 
-bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
 {
     sal_Int32 nVal = 0;
     bool bRet = ( rVal >>= nVal );
@@ -140,7 +140,7 @@ bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
 }
 
 bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                            BYTE ) const
+                                            sal_uInt8 ) const
 {
     rVal <<= (WritingMode)GetValue();
     return true;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 06f1a9e462..27aa04a063 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::xml;
 
 TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem);
 
-SvXMLAttrContainerItem::SvXMLAttrContainerItem( USHORT _nWhich ) :
+SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
     SfxPoolItem( _nWhich )
 {
     pImpl = new SvXMLAttrContainerData;
@@ -84,13 +84,13 @@ SfxItemPresentation SvXMLAttrContainerItem::GetPresentation(
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-USHORT SvXMLAttrContainerItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
 {
     // This item should never be stored
     return USHRT_MAX;
 }
 
-bool  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     Reference<XNameContainer> xContainer =
         new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
@@ -99,7 +99,7 @@ bool  SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /
     return true;
 }
 
-bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     Reference<XInterface> xRef;
     SvUnoAttributeContainer* pContainer = NULL;
@@ -109,7 +109,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
         xRef = *(Reference<XInterface>*)rVal.getValue();
         Reference<XUnoTunnel> xTunnel(xRef, UNO_QUERY);
         if( xTunnel.is() )
-            pContainer = (SvUnoAttributeContainer*)(ULONG)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
+            pContainer = (SvUnoAttributeContainer*)(sal_uLong)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
     }
 
     if( pContainer )
@@ -125,14 +125,14 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
         {
             Reference<XNameContainer> xContainer( xRef, UNO_QUERY );
             if( !xContainer.is() )
-                return FALSE;
+                return sal_False;
 
             const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() );
             const ::rtl::OUString* pNames = aNameSequence.getConstArray();
-            const INT32 nCount = aNameSequence.getLength();
+            const sal_Int32 nCount = aNameSequence.getLength();
             Any aAny;
             AttributeData* pData;
-            INT32 nAttr;
+            sal_Int32 nAttr;
 
             for( nAttr = 0; nAttr < nCount; nAttr++ )
             {
@@ -140,7 +140,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
 
                 aAny = xContainer->getByName( aName );
                 if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) )
-                    return FALSE;
+                    return sal_False;
 
                 pData = (AttributeData*)aAny.getValue();
                 sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
@@ -188,61 +188,61 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
 }
 
 
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
                                         const ::rtl::OUString& rValue )
 {
     return pImpl->AddAttr( rLName, rValue );
 }
 
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
           const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName,
           const ::rtl::OUString& rValue )
 {
     return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue );
 }
 
-USHORT SvXMLAttrContainerItem::GetAttrCount() const
+sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const
 {
-    return (USHORT)pImpl->GetAttrCount();
+    return (sal_uInt16)pImpl->GetAttrCount();
 }
 
-::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const
 {
     return pImpl->GetAttrNamespace( i );
 }
 
-::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const
 {
     return pImpl->GetAttrPrefix( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const
 {
     return pImpl->GetAttrLName( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const
 {
     return pImpl->GetAttrValue( i );
 }
 
 
-USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
+sal_uInt16 SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
 {
     return pImpl->GetFirstNamespaceIndex();
 }
 
-USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const
+sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) const
 {
     return pImpl->GetNextNamespaceIndex( nIdx );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const
 {
     return pImpl->GetNamespace( i );
 }
 
-const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const
 {
     return pImpl->GetPrefix( i );
 }
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 0c5bd94f16..0c5bd94f16 100644..100755
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 68e7ce41f2..68e7ce41f2 100644..100755
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index d5b5fd045b..c70bb3ce53 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -140,7 +140,7 @@ SvXMLWordContext::SvXMLWordContext(
     if (!sWrong.Len() || !sRight.Len() )
         return;
 
-    BOOL bOnlyTxt = sRight != sWrong;
+    sal_Bool bOnlyTxt = sRight != sWrong;
     if( !bOnlyTxt )
     {
         String sLongSave( sRight );
@@ -148,7 +148,7 @@ SvXMLWordContext::SvXMLWordContext(
             sLongSave.Len() )
         {
             sRight = sLongSave;
-            bOnlyTxt = TRUE;
+            bOnlyTxt = sal_True;
         }
     }
     SvxAutocorrWordPtr pNew = new SvxAutocorrWord( sWrong, sRight, bOnlyTxt );
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 67cd30f036..67cd30f036 100644..100755
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index d1feda9fd0..f16dbdba1b 100644..100755
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -51,18 +51,18 @@ static SvxAutoCorrCfg* pAutoCorrCfg = 0;
 SvxAutoCorrCfg::SvxAutoCorrCfg() :
     aBaseConfig(*this),
     aSwConfig(*this),
-    bFileRel(TRUE),
-    bNetRel(TRUE),
-    bAutoTextTip(TRUE),
-    bAutoTextPreview(FALSE),
-    bAutoFmtByInput(TRUE),
-    bSearchInAllCategories(FALSE)
+    bFileRel(sal_True),
+    bNetRel(sal_True),
+    bAutoTextTip(sal_True),
+    bAutoTextPreview(sal_False),
+    bAutoFmtByInput(sal_True),
+    bSearchInAllCategories(sal_False)
 {
     SvtPathOptions aPathOpt;
     String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
 
     String* pS = &sSharePath;
-    for( USHORT n = 0; n < 2; ++n, pS = &sUserPath )
+    for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
     {
         *pS = sAutoPath.GetToken( n, ';' );
         INetURLObject aPath( *pS );
@@ -223,8 +223,8 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
             }
         }
         if( nFlags )
-            rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, TRUE );
-        rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), FALSE );
+            rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, sal_True );
+        rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), sal_False );
 
     }
 }
@@ -247,7 +247,7 @@ void SvxBaseAutoCorrCfg::Commit()
     Any* pValues = aValues.getArray();
 
     const Type& rType = ::getBooleanCppuType();
-    BOOL bVal;
+    sal_Bool bVal;
     const long nFlags = rParent.pAutoCorrect->GetFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
@@ -461,7 +461,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nRightMargin =
-                            sal::static_int_cast< BYTE >(nVal);
+                            sal::static_int_cast< sal_uInt8 >(nVal);
                     }
                     break; // "Format/Option/CombineValue",
                     case  23: rSwFlags.bAFmtDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesAtStartEnd",
@@ -479,14 +479,14 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltWordLen =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/MinWordLen",
                     case  35:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltListLen =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/MaxListLen",
                     case  36: rSwFlags.bAutoCmpltCollectWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/CollectWords",
@@ -497,7 +497,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltExpandKey =
-                            sal::static_int_cast< USHORT >(nVal);
+                            sal::static_int_cast< sal_uInt16 >(nVal);
                     }
                     break; // "Completion/AcceptKey"
                     case 41 :rSwFlags.bAutoCmpltKeepList = *(sal_Bool*)pValues[nProp].getValue(); break;//"Completion/KeepList"
@@ -556,7 +556,7 @@ void SvxSwAutoCorrCfg::Commit()
     Any* pValues = aValues.getArray();
 
     const Type& rType = ::getBooleanCppuType();
-    BOOL bVal;
+    sal_Bool bVal;
     SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx
index 5ac52a556a..5ac52a556a 100644..100755
--- a/editeng/source/misc/edtdlg.cxx
+++ b/editeng/source/misc/edtdlg.cxx
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 6a57ef606a..74d3f7a7a5 100644..100755
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -36,7 +36,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize, USHORT nGrow )
+SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, sal_uInt16 nISize, sal_uInt16 nGrow )
  : SvxForbiddenCharactersTableImpl( nISize, nGrow )
 {
     mxMSF = xMSF;
@@ -45,13 +45,13 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno:
 
 SvxForbiddenCharactersTable::~SvxForbiddenCharactersTable()
 {
-    for ( ULONG n = Count(); n; )
+    for ( sal_uLong n = Count(); n; )
         delete GetObject( --n );
 }
 
 
 
-const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( USHORT nLanguage, BOOL bGetDefault ) const
+const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage, sal_Bool bGetDefault ) const
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( !pInf && bGetDefault && mxMSF.is() )
@@ -61,7 +61,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge
          pInf = new ForbiddenCharactersInfo;
         pImpl->Insert( nLanguage, pInf );
 
-        pInf->bTemporary = TRUE;
+        pInf->bTemporary = sal_True;
         LocaleDataWrapper aWrapper( mxMSF, SvxCreateLocale( nLanguage ) );
         pInf->aForbiddenChars = aWrapper.getForbiddenCharacters();
     }
@@ -70,7 +70,7 @@ const com::sun::star::i18n::ForbiddenCharacters* SvxForbiddenCharactersTable::Ge
 
 
 
-void SvxForbiddenCharactersTable::SetForbiddenCharacters( USHORT nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
+void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16 nLanguage, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenChars )
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( !pInf )
@@ -78,11 +78,11 @@ void SvxForbiddenCharactersTable::SetForbiddenCharacters( USHORT nLanguage, cons
         pInf = new ForbiddenCharactersInfo;
         Insert( nLanguage, pInf );
     }
-    pInf->bTemporary = FALSE;
+    pInf->bTemporary = sal_False;
     pInf->aForbiddenChars = rForbiddenChars;
 }
 
-void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT nLanguage )
+void SvxForbiddenCharactersTable::ClearForbiddenCharacters( sal_uInt16 nLanguage )
 {
     ForbiddenCharactersInfo* pInf = Get( nLanguage );
     if ( pInf )
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 605979d25f..ba94e00ce6 100644..100755
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -633,7 +633,7 @@ namespace editeng
 
                         // determine if it's Hangul
                         CharClass aCharClassificaton( m_xORB, m_aSourceLocale );
-                        sal_Int16 nScript = aCharClassificaton.getScript( m_sCurrentPortion, sal::static_int_cast< USHORT >(nNextAsianScript) );
+                        sal_Int16 nScript = aCharClassificaton.getScript( m_sCurrentPortion, sal::static_int_cast< sal_uInt16 >(nNextAsianScript) );
                         if	(	( UnicodeScript_kHangulJamo == nScript )
                             ||	( UnicodeScript_kHangulCompatibilityJamo == nScript )
                             ||	( UnicodeScript_kHangulSyllable == nScript )
diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src
index ad65e169e4..ad65e169e4 100644..100755
--- a/editeng/source/misc/lingu.src
+++ b/editeng/source/misc/lingu.src
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index f568b2096d..3e5a4db514 100644..100755
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -104,7 +104,7 @@ struct lt_LanguageType
     }
 };
 
-typedef std::map< LanguageType, USHORT, lt_LanguageType >   LangCheckState_map_t;
+typedef std::map< LanguageType, sal_uInt16, lt_LanguageType >   LangCheckState_map_t;
 
 static LangCheckState_map_t & GetLangCheckState()
 {
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b0c8e0fc7d..052b4b4688 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -141,7 +141,7 @@ inline int IsUpperLetter( sal_Int32 nCharType )
             0 == ( ::com::sun::star::i18n::KCharacterType::LOWER & nCharType);
 }
 
-BOOL lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
+sal_Bool lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
                            xub_StrLen nStt, xub_StrLen nEnd )
 {
     for( ; nStt < nEnd; ++nStt )
@@ -154,19 +154,19 @@ BOOL lcl_IsSymbolChar( CharClass& rCC, const String& rTxt,
 #endif
         if( ::com::sun::star::i18n::UnicodeType::PRIVATE_USE ==
                 rCC.getType( rTxt, nStt ))
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-static BOOL lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
+static sal_Bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     for( ; *pArr; ++pArr )
         if( *pArr == c )
         {
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
     return bRet;
@@ -180,12 +180,12 @@ SvxAutoCorrDoc::~SvxAutoCorrDoc()
     // 	- FnCptlSttSntnc
     // after the exchange of characters. then the words can maybe be inserted 
     // into the exception list.
-void SvxAutoCorrDoc::SaveCpltSttWord( ULONG, xub_StrLen, const String&,
+void SvxAutoCorrDoc::SaveCpltSttWord( sal_uLong, xub_StrLen, const String&,
                                         sal_Unicode )
 {
 }
 
-LanguageType SvxAutoCorrDoc::GetLanguage( xub_StrLen , BOOL ) const
+LanguageType SvxAutoCorrDoc::GetLanguage( xub_StrLen , sal_Bool ) const
 {
     return LANGUAGE_SYSTEM;
 }
@@ -199,11 +199,11 @@ static ::com::sun::star::uno::Reference<
     return xMSF;
 }
 
-static USHORT GetAppLang()
+static sal_uInt16 GetAppLang()
 {
     return Application::GetSettings().GetLanguage();
 }
-static LocaleDataWrapper& GetLocaleDataWrapper( USHORT nLang )
+static LocaleDataWrapper& GetLocaleDataWrapper( sal_uInt16 nLang )
 {
     static LocaleDataWrapper aLclDtWrp( GetProcessFact(),
                                         SvxCreateLocale( GetAppLang() ) );
@@ -241,21 +241,21 @@ static CollatorWrapper& GetCollatorWrapper()
 }
 
 
-void SvxAutocorrWordList::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvxAutocorrWordList::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((SvxAutocorrWordPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
 
 
-BOOL SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, USHORT* pP ) const
+sal_Bool SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvxAutocorrWordList_SAR::Count(),
+    register sal_uInt16 nO  = SvxAutocorrWordList_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -270,21 +270,21 @@ BOOL SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, USHORT* pP )
             if( 0 == nCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( 0 < nCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 void lcl_ClearTable(SvxAutoCorrLanguageTable_Impl& rLangTable)
@@ -395,7 +395,7 @@ void SvxAutoCorrect::_GetCharClass( LanguageType eLang )
     eCharClassLang = eLang;
 }
 
-void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, BOOL bOn )
+void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, sal_Bool bOn )
 {
     long nOld = nFlags;
     nFlags = bOn ? nFlags | nFlag
@@ -414,11 +414,11 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, BOOL bOn )
 
 
     // Two capital letters at the beginning of word?
-BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     CharClass& rCC = GetCharClass( eLang );
 
     // Delete all non alphanumeric. Test the characters at the beginning/end of
@@ -459,7 +459,7 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 {
                     if( SaveWordWrdSttLst & nFlags )
                         rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -468,7 +468,7 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
 }
 
 
-BOOL SvxAutoCorrect::FnChgOrdinalNumber(
+sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang )
@@ -477,7 +477,7 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber(
 // 201th or 201st
 // 12th or 12nd
     CharClass& rCC = GetCharClass( eLang );
-    BOOL bChg = FALSE;
+    sal_Bool bChg = sal_False;
 
     for( ; nSttPos < nEndPos; ++nSttPos )
         if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nSttPos ) ))
@@ -536,12 +536,12 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber(
 }
 
 
-BOOL SvxAutoCorrect::FnChgToEnEmDash(
+sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     CharClass& rCC = GetCharClass( eLang );
     if (eLang == LANGUAGE_SYSTEM)
         eLang = GetAppLang();
@@ -574,7 +574,7 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
                     {
                         rDoc.Delete( nSttPos, nSttPos + 2 );
                         rDoc.Insert( nSttPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -609,7 +609,7 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
                     {
                         rDoc.Delete( nTmpPos, nTmpPos + nLen );
                         rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -633,13 +633,13 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
             nSttPos = nSttPos + nFndPos;
             rDoc.Delete( nSttPos, nSttPos + 2 );
             rDoc.Insert( nSttPos, (bEnDash ? cEnDash : cEmDash) );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
 }
 
-BOOL SvxAutoCorrect::FnAddNonBrkSpace(
+sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen, xub_StrLen nEndPos,
                                 LanguageType eLang )
@@ -720,20 +720,20 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
     return bRet;
 }
 
-BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
     String sURL( URIHelper::FindFirstURLInText( rTxt, nSttPos, nEndPos,
                                                 GetCharClass( eLang ) ));
-    BOOL bRet = 0 != sURL.Len();
+    sal_Bool bRet = 0 != sURL.Len();
     if( bRet )			// also Attribut setzen:
         rDoc.SetINetAttr( nSttPos, nEndPos, sURL );
     return bRet;
 }
 
 
-BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_Bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                         xub_StrLen, xub_StrLen nEndPos,
                                         LanguageType eLang )
 {
@@ -744,11 +744,11 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt
     sal_Unicode c, cInsChar = rTxt.GetChar( nEndPos );	// underline or bold
     if( ++nEndPos != rTxt.Len() &&
         !IsWordDelim( rTxt.GetChar( nEndPos ) ) )
-        return FALSE;
+        return sal_False;
 
     --nEndPos;
 
-    BOOL bAlphaNum = FALSE;
+    sal_Bool bAlphaNum = sal_False;
     xub_StrLen nPos = nEndPos, nFndPos = STRING_NOTFOUND;
     CharClass& rCC = GetCharClass( eLang );
 
@@ -802,14 +802,14 @@ BOOL SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const String& rTxt
 }
 
 
-BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
-                                    const String& rTxt, BOOL bNormalPos,
+sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
+                                    const String& rTxt, sal_Bool bNormalPos,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
                                     LanguageType eLang )
 {
 
     if( !rTxt.Len() || nEndPos <= nSttPos )
-        return FALSE;
+        return sal_False;
 
     CharClass& rCC = GetCharClass( eLang );
     String aText( rTxt );
@@ -818,7 +818,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                       *pWordStt = 0,
                       *pDelim = 0;
 
-    BOOL bAtStart = FALSE;
+    sal_Bool bAtStart = sal_False;
     do {
         --pStr;
         if( rCC.isLetter(
@@ -855,11 +855,11 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                 sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) ||
         INetURLObject::CompareProtocolScheme(rTxt.Copy(pWordStt - pStart, pDelim - pWordStt + 1)) != INET_PROT_NOT_VALID ||
         0x1 == *pWordStt || 0x2 == *pWordStt )
-        return FALSE;		// no character to be replaced, or already ok
+        return sal_False;		// no character to be replaced, or already ok
 
     if( *pDelim && 2 >= pDelim - pWordStt &&
         lcl_IsInAsciiArr( ".-)>", *pDelim ) )
-        return FALSE;
+        return sal_False;
 
     if( !bAtStart )	// Still no beginning of a paragraph?
     {
@@ -872,7 +872,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         // and full width question marks are treated as word delimiters
         else if ( 0x3002 != *pStr && 0xFF0E != *pStr && 0xFF01 != *pStr &&
                   0xFF1F != *pStr )
-            return FALSE; // no valid separator -> no replacement
+            return sal_False; // no valid separator -> no replacement
     }
 
     if( bAtStart )	// at the beginning of a paragraph?
@@ -890,7 +890,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         }
 
         aText = *pPrevPara;
-        bAtStart = FALSE;
+        bAtStart = sal_False;
         pStart = aText.GetBuffer();
         pStr = pStart + aText.Len();
 
@@ -901,7 +901,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         } while( 0 == ( bAtStart = (pStart == pStr)) );
 
         if( bAtStart )
-            return FALSE;  // no valid separator -> no replacement
+            return sal_False;  // no valid separator -> no replacement
     }
 
     // Found [ \t]+[A-Z0-9]+ until here. Test now on the paragraph separator. 
@@ -909,7 +909,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     const sal_Unicode* pExceptStt = 0;
     if( !bAtStart )
     {
-        BOOL bWeiter = TRUE;
+        sal_Bool bWeiter = sal_True;
         int nFlag = C_NONE;
         do {
             switch( *pStr )
@@ -920,7 +920,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF0E :
                 {
                     if( nFlag & C_FULL_STOP )
-                        return FALSE;  // no valid separator -> no replacement
+                        return sal_False;  // no valid separator -> no replacement
                     nFlag |= C_FULL_STOP;
                     pExceptStt = pStr;
                 }
@@ -929,7 +929,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF01 :
                 {
                     if( nFlag & C_EXCLAMATION_MARK )
-                        return FALSE; 	// no valid separator -> no replacement
+                        return sal_False; 	// no valid separator -> no replacement
                     nFlag |= C_EXCLAMATION_MARK;
                 }
                 break;
@@ -937,21 +937,21 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             case 0xFF1F :
                 {
                     if( nFlag & C_QUESTION_MARK)
-                        return FALSE;	// no valid separator -> no replacement
+                        return sal_False;	// no valid separator -> no replacement
                     nFlag |= C_QUESTION_MARK;
                 }
                 break;
             default:
                 if( !nFlag )
-                    return FALSE;		// no valid separator -> no replacement
+                    return sal_False;		// no valid separator -> no replacement
                 else
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 break;
             }
 
             if( bWeiter && pStr-- == pStart )
             {
-                return FALSE;		// no valid separator -> no replacement
+                return sal_False;		// no valid separator -> no replacement
             }
         } while( bWeiter );
         if( C_FULL_STOP != nFlag )
@@ -959,12 +959,12 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     }
 
     if( 2 > ( pStr - pStart ) )
-        return FALSE;
+        return sal_False;
 
     if( !rCC.isLetterNumeric(
             aText, sal::static_int_cast< xub_StrLen >( pStr-- - pStart ) ) )
     {
-        BOOL bValid = FALSE, bAlphaFnd = FALSE;
+        sal_Bool bValid = sal_False, bAlphaFnd = sal_False;
         const sal_Unicode* pTmpStr = pStr;
         while( !bValid )
         {
@@ -972,7 +972,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
                     aText,
                     sal::static_int_cast< xub_StrLen >( pTmpStr - pStart ) ) )
             {
-                bValid = TRUE;
+                bValid = sal_True;
                 pStr = pTmpStr - 1;
             }
             else if( rCC.isLetter(
@@ -982,11 +982,11 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
             {
                 if( bAlphaFnd )
                 {
-                    bValid = TRUE;
+                    bValid = sal_True;
                     pStr = pTmpStr;
                 }
                 else
-                    bAlphaFnd = TRUE;
+                    bAlphaFnd = sal_True;
             }
             else if( bAlphaFnd || IsWordDelim( *pTmpStr ) )
                 break;
@@ -998,10 +998,10 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         }
 
         if( !bValid )
-            return FALSE;		// no valid separator -> no replacement
+            return sal_False;		// no valid separator -> no replacement
     }
 
-    BOOL bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
+    sal_Bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
 
     // Search for the beginning of the word
     while( !IsWordDelim( *pStr ))
@@ -1009,7 +1009,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         if( bNumericOnly &&
             rCC.isLetter(
                 aText, sal::static_int_cast< xub_StrLen >( pStr - pStart ) ) )
-            bNumericOnly = FALSE;
+            bNumericOnly = sal_False;
 
         if( pStart == pStr )
             break;
@@ -1018,7 +1018,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     }
 
     if( bNumericOnly )		// consists of only numbers, then not
-        return FALSE;
+        return sal_False;
 
     if( IsWordDelim( *pStr ))
         ++pStr;
@@ -1031,7 +1031,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         sWord = String(
             pStr, sal::static_int_cast< xub_StrLen >( pExceptStt - pStr + 1 ) );
         if( FindInCplSttExceptList(eLang, sWord) )
-            return FALSE;
+            return sal_False;
 
         // Delete all non alphanumeric. Test the characters at the 
         // beginning/end of the word ( recognizes: "(min.", "/min.", and so on.)
@@ -1050,10 +1050,10 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
 
         if( sTmp.Len() && sTmp.Len() != sWord.Len() &&
             FindInCplSttExceptList(eLang, sTmp))
-            return FALSE;
+            return sal_False;
 
-        if(FindInCplSttExceptList(eLang, sWord, TRUE))
-            return FALSE;
+        if(FindInCplSttExceptList(eLang, sWord, sal_True))
+            return sal_False;
     }
 
     // Ok, then replace
@@ -1061,7 +1061,7 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
     String sChar( cSave );
     rCC.toUpper( sChar );
-    BOOL bRet = sChar.GetChar(0) != cSave && rDoc.Replace( nSttPos, sChar );
+    sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.Replace( nSttPos, sChar );
 
     // Parahaps someone wants to have the word
     if( bRet && SaveWordCplSttLst & nFlags )
@@ -1113,7 +1113,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
 }
 
 
-sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
+sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
                                         LanguageType eLang ) const
 {
     sal_Unicode cRet = bSttQuote ? ( '\"' == cInsChar
@@ -1144,10 +1144,10 @@ sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
 }
 
 void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                                    sal_Unicode cInsChar, BOOL bSttQuote,
-                                    BOOL bIns )
+                                    sal_Unicode cInsChar, sal_Bool bSttQuote,
+                                    sal_Bool bIns )
 {
-    LanguageType eLang = rDoc.GetLanguage( nInsPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
     String sChg( cInsChar );
@@ -1186,9 +1186,9 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
 }
 
 String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
-                                sal_Unicode cInsChar, BOOL bSttQuote )
+                                sal_Unicode cInsChar, sal_Bool bSttQuote )
 {
-    LanguageType eLang = rDoc.GetLanguage( nInsPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
     String sRet( cRet );
@@ -1214,11 +1214,11 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
     return sRet;
 }
 
-ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
+sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nInsPos, sal_Unicode cChar,
-                                    BOOL bInsert, Window* pFrameWin )
+                                    sal_Bool bInsert, Window* pFrameWin )
 {
-    ULONG nRet = 0;
+    sal_uLong nRet = 0;
     bool bIsNextRun = bRunNext;
     bRunNext = false;  // if it was set, then it has to be turned off
     
@@ -1234,14 +1234,14 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 break;
             }
 
-            BOOL bSingle = '\'' == cChar;
-            BOOL bIsReplaceQuote =
+            sal_Bool bSingle = '\'' == cChar;
+            sal_Bool bIsReplaceQuote =
                         (IsAutoCorrFlag( ChgQuotes ) && ('\"' == cChar )) ||
                         (IsAutoCorrFlag( ChgSglQuotes ) && bSingle );
             if( bIsReplaceQuote )
             {
                 sal_Unicode cPrev;
-                BOOL bSttQuote = !nInsPos ||
+                sal_Bool bSttQuote = !nInsPos ||
                         IsWordDelim( ( cPrev = rTxt.GetChar( nInsPos-1 ))) ||
                         lcl_IsInAsciiArr( "([{", cPrev ) ||
                         ( cEmDash && cEmDash == cPrev ) ||
@@ -1261,7 +1261,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             if ( IsAutoCorrFlag( AddNonBrkSpace ) )
             {
                 if ( NeedsHardspaceAutocorr( cChar ) &&
-                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
+                    FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, sal_False ) ) )
                 {
                     nRet = AddNonBrkSpace;
                 }
@@ -1318,7 +1318,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
         if( !nPos && !IsWordDelim( rTxt.GetChar( 0 )))
             --nCapLttrPos;			// Absatz Anfang und kein Blank !
 
-        LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, FALSE );
+        LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, sal_False );
         if( LANGUAGE_SYSTEM == eLang )
             eLang = MsLangId::getSystemLanguage();
         CharClass& rCC = GetCharClass( eLang );
@@ -1331,7 +1331,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             const String* pPara = 0;
             const String** ppPara = IsAutoCorrFlag(CptlSttSntnc) ? &pPara : 0;
 
-            BOOL bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
+            sal_Bool bChgWord = rDoc.ChgAutoCorrWord( nCapLttrPos, nInsPos,
                                                     *this, ppPara );
             if( !bChgWord )
             {
@@ -1349,7 +1349,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                     nCapLttrPos1 < nInsPos1 &&
                     rDoc.ChgAutoCorrWord( nCapLttrPos1, nInsPos1, *this, ppPara ))
                 {
-                    bChgWord = TRUE;
+                    bChgWord = sal_True;
                     nCapLttrPos = nCapLttrPos1;
                 }
             }
@@ -1366,7 +1366,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 
                     // Capital letter at beginning of paragraph?
                     if( IsAutoCorrFlag( CptlSttSntnc ) &&
-                        FnCptlSttSntnc( rDoc, *pPara, FALSE,
+                        FnCptlSttSntnc( rDoc, *pPara, sal_False,
                                                 nCapLttrPos, nEnd, eLang ) )
                         nRet |= CptlSttSntnc;
 
@@ -1401,7 +1401,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 
             // Capital letter at beginning of paragraph ?
             if( IsAutoCorrFlag( CptlSttSntnc ) &&
-                FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) )
+                FnCptlSttSntnc( rDoc, rTxt, sal_True, nCapLttrPos, nInsPos, eLang ) )
                 nRet |= CptlSttSntnc;
 
             // Two capital letters at beginning of word ??
@@ -1414,11 +1414,37 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 nRet |= ChgToEnEmDash;
         }
 
-    } while( FALSE );
+    } while( sal_False );
 
     if( nRet )
     {
-        ULONG nHelpId = 0;
+        const char* aHelpIds[] = 
+        {
+            HID_AUTOCORR_HELP_WORD,
+            HID_AUTOCORR_HELP_SENT,
+            HID_AUTOCORR_HELP_SENTWORD,
+            HID_AUTOCORR_HELP_ACORWORD,
+            "",
+            HID_AUTOCORR_HELP_ACORSENTWORD,
+            "",
+            HID_AUTOCORR_HELP_CHGTOENEMDASH,
+            HID_AUTOCORR_HELP_WORDENEMDASH,
+            HID_AUTOCORR_HELP_SENTENEMDASH,
+            HID_AUTOCORR_HELP_SENTWORDENEMDASH,
+            HID_AUTOCORR_HELP_ACORWORDENEMDASH,
+            "",
+            HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH,
+            "",
+            HID_AUTOCORR_HELP_CHGQUOTES,
+            HID_AUTOCORR_HELP_CHGSGLQUOTES,
+            HID_AUTOCORR_HELP_SETINETATTR,
+            HID_AUTOCORR_HELP_INGNOREDOUBLESPACE,
+            HID_AUTOCORR_HELP_CHGWEIGHTUNDERL,
+            HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL,
+            HID_AUTOCORR_HELP_CHGORDINALNUMBER
+        };
+
+        sal_uLong nHelpId = 0;
         if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) )
         {
             // from 0 - 15
@@ -1444,8 +1470,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 
         if( nHelpId )
         {
-            nHelpId += HID_AUTOCORR_HELP_START - 1;
-            Application::GetHelp()->OpenHelpAgent( nHelpId );
+            nHelpId -= 1;
+            Application::GetHelp()->OpenHelpAgent( aHelpIds[nHelpId] );
         }
     }
 
@@ -1456,16 +1482,16 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 SvxAutoCorrectLanguageLists& SvxAutoCorrect::_GetLanguageList(
                                                         LanguageType eLang )
 {
-    if( !pLangTable->IsKeyValid( ULONG( eLang )))
-        CreateLanguageFile( eLang, TRUE);
-    return *pLangTable->Seek( ULONG( eLang ) );
+    if( !pLangTable->IsKeyValid( sal_uLong( eLang )))
+        CreateLanguageFile( eLang, sal_True);
+    return *pLangTable->Seek( sal_uLong( eLang ) );
 }
 
 void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
 {
-    if( pLangTable->IsKeyValid( ULONG( eLang )))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )))
     {
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         if( pLists )
             pLists->SaveCplSttExceptList();
     }
@@ -1479,9 +1505,9 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
 
 void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
 {
-    if(pLangTable->IsKeyValid(ULONG(eLang)))
+    if(pLangTable->IsKeyValid(sal_uLong(eLang)))
     {
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         if(pLists)
             pLists->SaveWrdSttExceptList();
     }
@@ -1494,17 +1520,17 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
 }
 
     // Adds a single word. The list will immediately be written to the file!
-BOOL SvxAutoCorrect::AddCplSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddCplSttException( const String& rNew,
                                         LanguageType eLang )
 {
     SvxAutoCorrectLanguageListsPtr pLists = 0;
     // either the right language is present or it will be this in the general list
-    if( pLangTable->IsKeyValid(ULONG(eLang)))
-        pLists = pLangTable->Seek(ULONG(eLang));
-    else if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))||
-            CreateLanguageFile(LANGUAGE_DONTKNOW, TRUE))
+    if( pLangTable->IsKeyValid(sal_uLong(eLang)))
+        pLists = pLangTable->Seek(sal_uLong(eLang));
+    else if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))||
+            CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
     {
-        pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        pLists = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
     }
     DBG_ASSERT(pLists, "No auto correction data");
     return pLists->AddToCplSttExceptList(rNew);
@@ -1512,17 +1538,17 @@ BOOL SvxAutoCorrect::AddCplSttException( const String& rNew,
 
 
     // Adds a single word. The list will immediately be written to the file!
-BOOL SvxAutoCorrect::AddWrtSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddWrtSttException( const String& rNew,
                                          LanguageType eLang )
 {
     SvxAutoCorrectLanguageListsPtr pLists = 0;
     //either the right language is present or it is set in the general list
-    if(pLangTable->IsKeyValid(ULONG(eLang)))
-        pLists = pLangTable->Seek(ULONG(eLang));
-    else if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))||
-            CreateLanguageFile(LANGUAGE_DONTKNOW, TRUE))
-        pLists = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
-    DBG_ASSERT(pLists, "No auto correction data");
+    if(pLangTable->IsKeyValid(sal_uLong(eLang)))
+        pLists = pLangTable->Seek(sal_uLong(eLang));
+    else if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))||
+            CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
+        pLists = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
+    DBG_ASSERT(pLists, "keine Autokorrekturdatei");
     return pLists->AddToWrdSttExceptList(rNew);
 }
 
@@ -1554,12 +1580,12 @@ void SvxAutoCorrect::SetShareAutoCorrFileName( const String& rNew )
 }
 
 
-BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
+sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
                                         const String& rTxt, xub_StrLen nPos,
                                         String& rWord ) const
 {
     if( !nPos )
-        return FALSE;
+        return sal_False;
 
     xub_StrLen nEnde = nPos;
 
@@ -1567,7 +1593,7 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
     if( ( nPos < rTxt.Len() &&
         !IsWordDelim( rTxt.GetChar( nPos ))) ||
         IsWordDelim( rTxt.GetChar( --nPos )))
-        return FALSE;
+        return sal_False;
 
     while( nPos && !IsWordDelim( rTxt.GetChar( --nPos )))
         ;
@@ -1580,12 +1606,12 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
 
     while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nCapLttrPos )) )
         if( ++nCapLttrPos >= nEnde )
-            return FALSE;
+            return sal_False;
 
     if( 3 > nEnde - nCapLttrPos )
-        return FALSE;
+        return sal_False;
 
-    LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, FALSE );
+    LanguageType eLang = rDoc.GetLanguage( nCapLttrPos, sal_False );
     if( LANGUAGE_SYSTEM == eLang )
         eLang = MsLangId::getSystemLanguage();
 
@@ -1593,24 +1619,24 @@ BOOL SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
     CharClass& rCC = pThis->GetCharClass( eLang );
 
     if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnde ))
-        return FALSE;
+        return sal_False;
 
     rWord = rTxt.Copy( nCapLttrPos, nEnde - nCapLttrPos );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, BOOL bNewFile )
+sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFile )
 {
-    DBG_ASSERT(!pLangTable->IsKeyValid(ULONG(eLang)), "Language already exists ");
+    DBG_ASSERT(!pLangTable->IsKeyValid(sal_uLong(eLang)), "Language already exists ");
 
-    String sUserDirFile( GetAutoCorrFileName( eLang, TRUE, FALSE )),
+    String sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False )),
            sShareDirFile( sUserDirFile );
     SvxAutoCorrectLanguageListsPtr pLists = 0;
 
     Time nMinTime( 0, 2 ), nAktTime, nLastCheckTime;
-    ULONG nFndPos;
+    sal_uLong nFndPos;
     if( TABLE_ENTRY_NOTFOUND !=
-                    pLastFileTable->SearchKey( ULONG( eLang ), &nFndPos ) &&
+                    pLastFileTable->SearchKey( sal_uLong( eLang ), &nFndPos ) &&
         ( nLastCheckTime.SetTime( pLastFileTable->GetObject( nFndPos )),
             nLastCheckTime < nAktTime ) &&
         ( nAktTime - nLastCheckTime ) < nMinTime )
@@ -1622,60 +1648,60 @@ BOOL SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, BOOL bNewFile )
             sShareDirFile = sUserDirFile;
             pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
                                                         sUserDirFile, eLang );
-            pLangTable->Insert( ULONG(eLang), pLists );
-            pLastFileTable->Remove( ULONG( eLang ) );
+            pLangTable->Insert( sal_uLong(eLang), pLists );
+            pLastFileTable->Remove( sal_uLong( eLang ) );
         }
     }
     else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
                 FStatHelper::IsDocument( sShareDirFile =
-                              GetAutoCorrFileName( eLang, FALSE, FALSE ) ) ) ||
+                              GetAutoCorrFileName( eLang, sal_False, sal_False ) ) ) ||
         ( sShareDirFile = sUserDirFile, bNewFile ))
     {
         pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile,
                                                     sUserDirFile, eLang );
-        pLangTable->Insert( ULONG(eLang), pLists );
-        pLastFileTable->Remove( ULONG( eLang ) );
+        pLangTable->Insert( sal_uLong(eLang), pLists );
+        pLastFileTable->Remove( sal_uLong( eLang ) );
     }
     else if( !bNewFile )
     {
-        if( !pLastFileTable->Insert( ULONG( eLang ), nAktTime.GetTime() ))
-            pLastFileTable->Replace( ULONG( eLang ), nAktTime.GetTime() );
+        if( !pLastFileTable->Insert( sal_uLong( eLang ), nAktTime.GetTime() ))
+            pLastFileTable->Replace( sal_uLong( eLang ), nAktTime.GetTime() );
     }
     return pLists != 0;
 }
 
-BOOL SvxAutoCorrect::PutText( const String& rShort, const String& rLong,
+sal_Bool SvxAutoCorrect::PutText( const String& rShort, const String& rLong,
                                 LanguageType eLang )
 {
-    BOOL bRet = FALSE;
-    if( pLangTable->IsKeyValid( ULONG(eLang)) || CreateLanguageFile(eLang) )
-        bRet = pLangTable->Seek( ULONG(eLang) )->PutText(rShort, rLong);
+    sal_Bool bRet = sal_False;
+    if( pLangTable->IsKeyValid( sal_uLong(eLang)) || CreateLanguageFile(eLang) )
+        bRet = pLangTable->Seek( sal_uLong(eLang) )->PutText(rShort, rLong);
     return bRet;
 }
 
 
     //	- Delete an entry
-BOOL SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang )
+sal_Bool SvxAutoCorrect::DeleteText( const String& rShort, LanguageType eLang )
 {
-    BOOL bRet = FALSE;
-    if( pLangTable->IsKeyValid( ULONG( eLang )) )
-        bRet = pLangTable->Seek( ULONG( eLang ))->DeleteText( rShort );
+    sal_Bool bRet = sal_False;
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) )
+        bRet = pLangTable->Seek( sal_uLong( eLang ))->DeleteText( rShort );
     return bRet;
 }
 
 
     //	- return the replacement text (only for SWG-Format, all other
     //		can be taken from the word list!)
-BOOL SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& )
+sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& )
 {
-    return FALSE;
+    return sal_False;
 }
 
     // Text with attribution (only the SWG - SWG format!)
-BOOL SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&,
+sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&,
                                 String& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void EncryptBlockName_Imp( String& rName )
@@ -1766,11 +1792,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
 
     // First search for eLang, then US-English -> English 
     // and last in LANGUAGE_DONTKNOW
-    if( pLangTable->IsKeyValid( ULONG( eLang ) ) ||
-        CreateLanguageFile( eLang, FALSE ))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang ) ) ||
+        CreateLanguageFile( eLang, sal_False ))
     {
         //the language is available - so bring it on
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(eLang));
         pRet = lcl_SearchWordsInList(  pList, rTxt, rStt, nEndPos, rDoc );
         if( pRet )
         {
@@ -1781,16 +1807,16 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
 
     // If it still could not be found here, then keep on searching
 
-    ULONG nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE
+    sal_uLong nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE
           nTmpKey2 = eLang & 0x3ff, // otherwise for example EN
           nTmp;
 
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //the language is available - so bring it on
         SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek( nTmp );
@@ -1801,11 +1827,11 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
             return pRet;
         }
     }
-    if( pLangTable->IsKeyValid( ULONG( LANGUAGE_DONTKNOW ) ) ||
-        CreateLanguageFile( LANGUAGE_DONTKNOW, FALSE ) )
+    if( pLangTable->IsKeyValid( sal_uLong( LANGUAGE_DONTKNOW ) ) ||
+        CreateLanguageFile( LANGUAGE_DONTKNOW, sal_False ) )
     {
         //the language is available - so bring it on
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
         pRet = lcl_SearchWordsInList( pList, rTxt, rStt, nEndPos, rDoc);
         if( pRet )
         {
@@ -1816,58 +1842,58 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
     return 0;
 }
 
-BOOL SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
+sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
                                              const String& sWord )
 {
     // First search for eLang, then US-English -> English 
     // and last in LANGUAGE_DONTKNOW
-    ULONG nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE
-    ULONG nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
+    sal_uLong nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE
+    sal_uLong nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
     String sTemp(sWord);
-    if( pLangTable->IsKeyValid( ULONG( eLang )) ||
-        CreateLanguageFile( eLang, FALSE ) )
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) ||
+        CreateLanguageFile( eLang, sal_False ) )
     {
         //the language is available - so bring it on
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(eLang));
         String _sTemp(sWord);
         if(pList->GetWrdSttExceptList()->Seek_Entry(&_sTemp))
-            return TRUE;
+            return sal_True;
 
     }
     // If it still could not be found here, then keep on searching
-    ULONG nTmp;
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    sal_uLong nTmp;
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //the language is available - so bring it on
         SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(nTmp);
         if(pList->GetWrdSttExceptList()->Seek_Entry(&sTemp))
-            return TRUE;
+            return sal_True;
     }
-    if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, FALSE))
+    if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, sal_False))
     {
         //the language is available - so bring it on
-        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(ULONG(LANGUAGE_DONTKNOW));
+        SvxAutoCorrectLanguageListsPtr pList = pLangTable->Seek(sal_uLong(LANGUAGE_DONTKNOW));
         if(pList->GetWrdSttExceptList()->Seek_Entry(&sTemp))
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
+sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
 {
     String sAbk( '~' );
-    USHORT nPos;
+    sal_uInt16 nPos;
     pList->Seek_Entry( &sAbk, &nPos );
     if( nPos < pList->Count() )
     {
         String sLowerWord( sWord ); sLowerWord.ToLowerAscii();
         const String* pAbk;
-        for( USHORT n = nPos;
+        for( sal_uInt16 n = nPos;
                 n < pList->Count() &&
                 '~' == ( pAbk = (*pList)[ n ])->GetChar( 0 );
             ++n )
@@ -1879,7 +1905,7 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
                 for( xub_StrLen i = sLowerAbk.Len(), ii = sLowerWord.Len(); i; )
                 {
                     if( !--i )		// agrees
-                        return TRUE;
+                        return sal_True;
 
                     if( sLowerAbk.GetChar( i ) != sLowerWord.GetChar( --ii ))
                         break;
@@ -1889,59 +1915,59 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
     }
     DBG_ASSERT( !(nPos && '~' == (*pList)[ --nPos ]->GetChar( 0 ) ),
             "Wrongly sorted exception list?" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
-                                const String& sWord, BOOL bAbbreviation)
+sal_Bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
+                                const String& sWord, sal_Bool bAbbreviation)
 {
     // First search for eLang, then US-English -> English 
     // and last in LANGUAGE_DONTKNOW
-    ULONG nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE
-    ULONG nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
+    sal_uLong nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE
+    sal_uLong nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
     String sTemp( sWord );
-    if( pLangTable->IsKeyValid( ULONG( eLang )) ||
-        CreateLanguageFile( eLang, FALSE ))
+    if( pLangTable->IsKeyValid( sal_uLong( eLang )) ||
+        CreateLanguageFile( eLang, sal_False ))
     {
         //the language is available - so bring it on
-        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(ULONG(eLang));
+        SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(sal_uLong(eLang));
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
     // If it still could not be found here, then keep on searching
-    ULONG nTmp;
+    sal_uLong nTmp;
 
-    if( ((nTmp = nTmpKey1) != (ULONG)eLang &&
+    if( ((nTmp = nTmpKey1) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey1 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey1 ), FALSE ) )) ||
-        (( nTmp = nTmpKey2) != (ULONG)eLang &&
+           CreateLanguageFile( LanguageType( nTmpKey1 ), sal_False ) )) ||
+        (( nTmp = nTmpKey2) != (sal_uLong)eLang &&
          ( pLangTable->IsKeyValid( nTmpKey2 ) ||
-           CreateLanguageFile( LanguageType( nTmpKey2 ), FALSE ) )) )
+           CreateLanguageFile( LanguageType( nTmpKey2 ), sal_False ) )) )
     {
         //the language is available - so bring it on
         SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(nTmp);
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
-    if(pLangTable->IsKeyValid(ULONG(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, FALSE))
+    if(pLangTable->IsKeyValid(sal_uLong(LANGUAGE_DONTKNOW))|| CreateLanguageFile(LANGUAGE_DONTKNOW, sal_False))
     {
         //the language is available - so bring it on
         SvxAutoCorrectLanguageListsPtr pLists = pLangTable->Seek(LANGUAGE_DONTKNOW);
         const SvStringsISortDtor* pList = pLists->GetCplSttExceptList();
         if(bAbbreviation ? lcl_FindAbbreviation( pList, sWord)
                          : pList->Seek_Entry( &sTemp ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 
 }
 
 String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
-                                            BOOL bNewFile, BOOL bTst ) const
+                                            sal_Bool bNewFile, sal_Bool bTst ) const
 {
     String sRet, sExt( MsLangId::convertLanguageToIsoString( eLang ) );
     sExt.Insert('_', 0);
@@ -1983,10 +2009,10 @@ SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists()
     delete pAutocorr_List;
 }
 
-BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
+sal_Bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
 {
     // Access the file system only every 2 minutes to check the date stamp
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     Time nMinTime( 0, 2 );
     Time nAktTime;
@@ -1998,7 +2024,7 @@ BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
                                             &aTstDate, &aTstTime ) &&
             ( aModifiedDate != aTstDate || aModifiedTime != aTstTime ))
         {
-            bRet = TRUE;
+            bRet = sal_True;
             // then remove all the lists fast!
             if( CplSttLstLoad & nFlags && pCplStt_ExcptLst )
                 delete pCplStt_ExcptLst, pCplStt_ExcptLst = 0;
@@ -2104,7 +2130,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
                             const SvStringsISortDtor& rLst,
                             const sal_Char* pStrmName,
                             SotStorageRef &rStg,
-                            BOOL bConvert )
+                            sal_Bool bConvert )
 {
     if( rStg.Is() )
     {
@@ -2243,13 +2269,13 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::GetCplSttExceptList()
     return pCplStt_ExcptLst;
 }
 
-BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
+sal_Bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
     if( rNew.Len() && GetCplSttExceptList()->Insert( pNew ) )
     {
         MakeUserStorage_Impl();
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
         SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
 
@@ -2264,14 +2290,14 @@ BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
     return 0 != pNew;
 }
 
-BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
+sal_Bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
     SvStringsISortDtor* pExceptList = LoadWrdSttExceptList();
     if( rNew.Len() && pExceptList && pExceptList->Insert( pNew ) )
     {
         MakeUserStorage_Impl();
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
         SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
 
@@ -2288,7 +2314,7 @@ BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
 
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
 {
-    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
+    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_True );
     String sTemp ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplCplStt_ExcptLstStr ) );
     if( xStg.Is() && xStg->IsContained( sTemp ) )
         LoadXMLExceptList_Imp( pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
@@ -2299,7 +2325,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
 void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
 {
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
     SaveExceptList_Imp( *pCplStt_ExcptLst, pXMLImplCplStt_ExcptLstStr, xStg );
 
@@ -2327,7 +2353,7 @@ void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList
 
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
 {
-    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
+    SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, sal_True );
     String sTemp ( RTL_CONSTASCII_USTRINGPARAM ( pXMLImplWrdStt_ExcptLstStr ) );
     if( xStg.Is() && xStg->IsContained( sTemp ) )
         LoadXMLExceptList_Imp( pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
@@ -2337,7 +2363,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
 void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
 {
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
     SaveExceptList_Imp( *pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
 
@@ -2372,7 +2398,7 @@ void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const String& rName )
 {
     if( sShareAutoCorrFile != sUserAutoCorrFile )
     {
-        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+        SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
         if( xStg.Is() && SVSTREAM_OK == xStg->GetError() &&
             xStg->IsStream( rName ) )
         {
@@ -2426,7 +2452,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
             aInfo.NameClash = NameClash::OVERWRITE;
             aInfo.NewTitle  = aDest.GetName();
             aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI );
-            aInfo.MoveData  = FALSE;
+            aInfo.MoveData  = sal_False;
             aAny <<= aInfo;
             aNewContent.executeCommand( OUString ( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), aAny);
         }
@@ -2437,8 +2463,8 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
     }
     if (bConvert && !bError)
     {
-        SotStorageRef xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), STREAM_READ, TRUE );
-        SotStorageRef xDstStg = new SotStorage( sUserAutoCorrFile, STREAM_WRITE, TRUE );
+        SotStorageRef xSrcStg = new SotStorage( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), STREAM_READ, sal_True );
+        SotStorageRef xDstStg = new SotStorage( sUserAutoCorrFile, STREAM_WRITE, sal_True );
 
         if( xSrcStg.Is() && xDstStg.Is() )
         {
@@ -2453,7 +2479,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
 
             if (pTmpWordList)
             {
-                SaveExceptList_Imp( *pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xDstStg, TRUE );
+                SaveExceptList_Imp( *pTmpWordList, pXMLImplWrdStt_ExcptLstStr, xDstStg, sal_True );
                 pTmpWordList->DeleteAndDestroy( 0, pTmpWordList->Count() );
                 pTmpWordList = NULL;
             }
@@ -2464,7 +2490,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
 
             if (pTmpWordList)
             {
-                SaveExceptList_Imp( *pTmpWordList, pXMLImplCplStt_ExcptLstStr, xDstStg, TRUE );
+                SaveExceptList_Imp( *pTmpWordList, pXMLImplCplStt_ExcptLstStr, xDstStg, sal_True );
                 pTmpWordList->DeleteAndDestroy( 0, pTmpWordList->Count() );
             }
 
@@ -2486,10 +2512,10 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
         sShareAutoCorrFile = sUserAutoCorrFile;
 }
 
-BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
+sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
 {
     String sStrmName( pXMLImplAutocorr_ListStr, RTL_TEXTENCODING_MS_1252 );
-    BOOL bRet = TRUE, bRemove = !pAutocorr_List || !pAutocorr_List->Count();
+    sal_Bool bRet = sal_True, bRemove = !pAutocorr_List || !pAutocorr_List->Count();
     if( !bRemove )
     {
         SvStorageStreamRef refList = rStg.OpenSotStream( sStrmName,
@@ -2534,14 +2560,13 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
                 rStg.Commit();
                 if( SVSTREAM_OK != rStg.GetError() )
                 {
-                    bRemove = TRUE;
-                    bRet = FALSE;
+                    bRemove = sal_True;
+                    bRet = sal_False;
                 }
             }
-
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
     if( bRemove )
@@ -2553,22 +2578,22 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
     return bRet;
 }
 
-BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
+sal_Bool SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                            const String& rLong )
 {
     // First get the current list!
     GetAutocorrWordList();
 
     MakeUserStorage_Impl();
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
 
-    BOOL bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
+    sal_Bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
 
     // Update the word list
     if( bRet )
     {
-        USHORT nPos;
-        SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, rLong, TRUE );
+        sal_uInt16 nPos;
+        SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, rLong, sal_True );
         if( pAutocorr_List->Seek_Entry( pNew, &nPos ) )
         {
             if( !(*pAutocorr_List)[ nPos ]->IsTextOnly() )
@@ -2594,14 +2619,13 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
         else
         {
             delete pNew;
-            bRet = FALSE;
+            bRet = sal_False;
         }
     }
     return bRet;
 }
 
-// Text with attribution (only the SWG - SWG format!)
-BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
+sal_Bool SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                         SfxObjectShell& rShell )
 {
     // First get the current list!
@@ -2609,7 +2633,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
 
     MakeUserStorage_Impl();
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String sLong;
     try
     {
@@ -2620,10 +2644,10 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
         // Update the word list
         if( bRet )
         {
-            SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, sLong, FALSE );
+            SvxAutocorrWord* pNew = new SvxAutocorrWord( rShort, sLong, sal_False );
             if( pAutocorr_List->Insert( pNew ) )
             {
-                SotStorageRef xStor = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
+                SotStorageRef xStor = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
                 MakeBlocklist_Imp( *xStor );
             }
             else
@@ -2638,18 +2662,18 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
 }
 
 // Delete an entry
-BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
+sal_Bool SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
 {
     // First get the current list!
     GetAutocorrWordList();
 
     MakeUserStorage_Impl();
 
-    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, TRUE );
-    BOOL bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
+    SotStorageRef xStg = new SotStorage( sUserAutoCorrFile, STREAM_READWRITE, sal_True );
+    sal_Bool bRet = xStg.Is() && SVSTREAM_OK == xStg->GetError();
     if( bRet )
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         SvxAutocorrWord aTmp( rShort, rShort );
         if( pAutocorr_List->Seek_Entry( &aTmp, &nPos ) )
         {
@@ -2674,7 +2698,7 @@ BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
             xStg = 0;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
     return bRet;
 }
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index b798ace08c..0aca4533ab 100644..100755
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -53,14 +53,14 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bAFmtDelSpacesBetweenLines =
     bAFmtByInpDelSpacesAtSttEnd =
     bAFmtByInpDelSpacesBetweenLines =
-    bDummy = TRUE;
+    bDummy = sal_True;
 
     bReplaceStyles =
     bDelEmptyNode =
     bWithRedlining =
     bAutoCmpltEndless =
     bAutoCmpltAppendBlanc =
-    bAutoCmpltShowAsTip = FALSE; 
+    bAutoCmpltShowAsTip = sal_False; 
 
     bSetBorder =
     bCreateTable =
@@ -69,10 +69,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     bRightMargin =
     bAutoCompleteWords =
     bAutoCmpltCollectWords =
-    bAutoCmpltKeepList = TRUE;
+    bAutoCmpltKeepList = sal_True;
 
     bDummy6 = bDummy7 = bDummy8 =
-         FALSE;
+         sal_False;
 
     nRightMargin = 50;		// dflt. 50 %
     nAutoCmpltExpandKey = KEY_RETURN;
@@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     aBulletFont.SetFamily( FAMILY_DONTKNOW );
     aBulletFont.SetPitch( PITCH_DONTKNOW );
     aBulletFont.SetWeight( WEIGHT_DONTKNOW );
-    aBulletFont.SetTransparent( TRUE );
+    aBulletFont.SetTransparent( sal_True );
 
     cBullet = 0x2022;
     cByInputBullet = cBullet;
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index f6c0483131..0204d60f42 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -38,13 +38,9 @@
 
 #include <vector>
 
-#ifdef WIN
-#pragma optimize ( "", off )
-#endif
-
 TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
-    USHORT nCacheSz, USHORT nLft, USHORT nRght, BOOL bSimpl, BOOL bInnr,
-    BOOL bVert ) :
+    sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght, sal_Bool bSimpl, sal_Bool bInnr,
+    sal_Bool bVert ) :
     pBound( NULL ),
     nCacheSize( nCacheSz ),
     nCacheIdx( 0 ),
@@ -58,7 +54,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
     bVertical( bVert )
 {
 #ifdef DBG_UTIL
-    bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = FALSE;
+    bFlag3 = bFlag4 = bFlag5 = bFlag6 = bFlag7 = sal_False;
 #endif
     pRangeArr = new Range[ nCacheSize ];
     pCache = new SvLongsPtr[ nCacheSize ];
@@ -90,13 +86,10 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const baseg
         mpLinePolyPolygon = NULL;
 }
 
-#ifdef WIN
-#pragma optimize ( "", on )
-#endif
 
 TextRanger::~TextRanger()
 {
-    for( USHORT i = 0; i < nCacheSize; ++i )
+    for( sal_uInt16 i = 0; i < nCacheSize; ++i )
         delete pCache[i];
     delete[] pCache;
     delete[] pRangeArr;
@@ -108,12 +101,12 @@ TextRanger::~TextRanger()
    If there's is a change in the writing direction,
    the cache has to be cleared.
 */
-void TextRanger::SetVertical( BOOL bNew )
+void TextRanger::SetVertical( sal_Bool bNew )
 {
     if( IsVertical() != bNew )
     {
         bVertical = bNew;
-        for( USHORT i = 0; i < nCacheSize; ++i )
+        for( sal_uInt16 i = 0; i < nCacheSize; ++i )
             delete pCache[i];
         memset( pRangeArr, 0, nCacheSize * sizeof( Range ) );
         memset( pCache, 0, nCacheSize * sizeof( SvLongsPtr ) );
@@ -135,17 +128,17 @@ class SvxBoundArgs
     long nLower;
     long nStart;
     long nEnd;
-    USHORT nCut;
-    USHORT nLast;
-    USHORT nNext;
-    BYTE nAct;
-    BYTE nFirst;
-    BOOL bClosed : 1;
-    BOOL bInner : 1;
-    BOOL bMultiple : 1;
-    BOOL bConcat : 1;
-    BOOL bRotate : 1;
-    void NoteRange( BOOL bToggle );
+    sal_uInt16 nCut;
+    sal_uInt16 nLast;
+    sal_uInt16 nNext;
+    sal_uInt8 nAct;
+    sal_uInt8 nFirst;
+    sal_Bool bClosed : 1;
+    sal_Bool bInner : 1;
+    sal_Bool bMultiple : 1;
+    sal_Bool bConcat : 1;
+    sal_Bool bRotate : 1;
+    void NoteRange( sal_Bool bToggle );
     long Cut( long nY, const Point& rPt1, const Point& rPt2 );
     void Add();
     void _NoteFarPoint( long nPx, long nPyDiff, long nDiff );
@@ -160,17 +153,17 @@ public:
     void NotePoint( const long nA ) { NoteMargin( nA - nStart, nA + nEnd ); }
     void NoteMargin( const long nL, const long nR )
         { if( nMin > nL ) nMin = nL; if( nMax < nR ) nMax = nR; }
-    USHORT Area( const Point& rPt );
-    void NoteUpLow( long nA, const BYTE nArea );
+    sal_uInt16 Area( const Point& rPt );
+    void NoteUpLow( long nA, const sal_uInt8 nArea );
     void Calc( const PolyPolygon& rPoly );
     void Concat( const PolyPolygon* pPoly );
     // inlines
     void NoteLast() { if( bMultiple ) NoteRange( nAct == nFirst ); }
-    void SetClosed( const BOOL bNew ){ bClosed = bNew; }
-    BOOL IsClosed() const { return bClosed; }
-    void SetConcat( const BOOL bNew ){ bConcat = bNew; }
-    BOOL IsConcat() const { return bConcat; }
-    BYTE GetAct() const { return nAct; }
+    void SetClosed( const sal_Bool bNew ){ bClosed = bNew; }
+    sal_Bool IsClosed() const { return bClosed; }
+    void SetConcat( const sal_Bool bNew ){ bConcat = bNew; }
+    sal_Bool IsConcat() const { return bConcat; }
+    sal_uInt8 GetAct() const { return nAct; }
 };
 
 SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, SvLongs *pLong,
@@ -178,7 +171,7 @@ SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, SvLongs *pLong,
     : pLongArr( pLong ), pTextRanger( pRanger ),
     nTop( rRange.Min() ), nBottom( rRange.Max() ),
     bInner( pRanger->IsInner() ), bMultiple( bInner || !pRanger->IsSimple() ),
-    bConcat( FALSE ), bRotate( pRanger->IsVertical() )
+    bConcat( sal_False ), bRotate( pRanger->IsVertical() )
 {
     if( bRotate )
     {
@@ -215,7 +208,7 @@ long SvxBoundArgs::CalcMax( const Point& rPt1, const Point& rPt2,
     nB += nDa * nDa;
     nB = nRange + nDa * ( nFarRange - nRange ) / sqrt( nB );
 
-    BOOL bNote;
+    sal_Bool bNote;
     if( nB < B(rPt2) )
         bNote = nB > B(rPt1);
     else
@@ -261,29 +254,29 @@ void SvxBoundArgs::_NoteFarPoint( long nPa, long nPbDiff, long nDiff )
     NoteMargin( nTmpA, nPbDiff );
 }
 
-void SvxBoundArgs::NoteRange( BOOL bToggle )
+void SvxBoundArgs::NoteRange( sal_Bool bToggle )
 {
     DBG_ASSERT( nMax >= nMin || bInner, "NoteRange: Min > Max?");
     if( nMax < nMin )
         return;
     if( !bClosed )
-        bToggle = FALSE;
-    USHORT nIdx = 0;
-    USHORT nCount = pLongArr->Count();
+        bToggle = sal_False;
+    sal_uInt16 nIdx = 0;
+    sal_uInt16 nCount = pLongArr->Count();
     DBG_ASSERT( nCount == 2 * aBoolArr.size(), "NoteRange: Incompatible Sizes" );
     while( nIdx < nCount && (*pLongArr)[ nIdx ] < nMin )
         ++nIdx;
-    BOOL bOdd = nIdx % 2 ? TRUE : FALSE;
+    sal_Bool bOdd = nIdx % 2 ? sal_True : sal_False;
     // No overlap with existing intervals?
     if( nIdx == nCount || ( !bOdd && nMax < (*pLongArr)[ nIdx ] ) )
     {	// Then a new one is inserted ...
         pLongArr->Insert( nMin, nIdx );
         pLongArr->Insert( nMax, nIdx + 1 );
-        aBoolArr.insert( aBoolArr.begin() + (nIdx/2), bToggle );
+        aBoolArr.insert( aBoolArr.begin() + nIdx / 2, bToggle );
     }
     else
     {   // expand an existing interval ...
-        USHORT nMaxIdx = nIdx;
+        sal_uInt16 nMaxIdx = nIdx;
         // If we end up on a left interval boundary, it must be reduced to nMin.
         if( bOdd )
             --nIdx;
@@ -300,27 +293,27 @@ void SvxBoundArgs::NoteRange( BOOL bToggle )
         if( nMaxIdx % 2 )
             (*pLongArr)[ nMaxIdx-- ] = nMax;
         // Possible merge of intervals.
-        USHORT nDiff = nMaxIdx - nIdx;
+        sal_uInt16 nDiff = nMaxIdx - nIdx;
         nMaxIdx = nIdx / 2; // From here on is nMaxIdx the Index in BoolArray.
         if( nDiff )
         {
             (*pLongArr).Remove( nIdx + 1, nDiff );
             nDiff /= 2;
-            USHORT nStop = nMaxIdx + nDiff;
-            for( USHORT i = nMaxIdx; i < nStop; ++i )
+            sal_uInt16 nStop = nMaxIdx + nDiff;
+            for( sal_uInt16 i = nMaxIdx; i < nStop; ++i )
                 bToggle ^= aBoolArr[ i ];
-            aBoolArr.erase(aBoolArr.begin() + nMaxIdx, aBoolArr.begin() + nMaxIdx + nDiff);
+            aBoolArr.erase( aBoolArr.begin() + nMaxIdx, aBoolArr.begin() + (nMaxIdx + nDiff) );
         }
         DBG_ASSERT( nMaxIdx < aBoolArr.size(), "NoteRange: Too much deleted" );
-        aBoolArr[ nMaxIdx ] = aBoolArr[ nMaxIdx ] ^ bToggle;
+        aBoolArr[ nMaxIdx ] ^= bToggle;
     }
 }
 
 void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
 {
-    USHORT nCount;
+    sal_uInt16 nCount;
     nAct = 0;
-    for( USHORT i = 0; i < rPoly.Count(); ++i )
+    for( sal_uInt16 i = 0; i < rPoly.Count(); ++i )
     {
         const Polygon& rPol = rPoly[ i ];
         nCount = rPol.GetSize();
@@ -366,8 +359,8 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
             }
             if( nCount > 1 )
             {
-                USHORT nIdx = 1;
-                while( TRUE )
+                sal_uInt16 nIdx = 1;
+                while( sal_True )
                 {
                     const Point& rLast = rPol[ nIdx - 1 ];
                     if( nIdx == nCount )
@@ -375,7 +368,7 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
                     const Point& rNext = rPol[ nIdx ];
                     nNext = Area( rNext );
                     nCut = nNext ^ nLast;
-                    USHORT nOldAct = nAct;
+                    sal_uInt16 nOldAct = nAct;
                     if( nAct )
                         CheckCut( rLast, rNext );
                     if( nCut & 4 )
@@ -455,18 +448,18 @@ void SvxBoundArgs::Calc( const PolyPolygon& rPoly )
 
 void SvxBoundArgs::Add()
 {
-    ULONG nLongIdx = 1;
-    ULONG nCount = aBoolArr.size();
+    sal_uInt16 nLongIdx = 1;
+    size_t nCount = aBoolArr.size();
     if( nCount && ( !bInner || !pTextRanger->IsSimple() ) )
     {
-        BOOL bDelete = aBoolArr[ 0 ];
+        sal_Bool bDelete = aBoolArr.front();
         if( bInner )
             bDelete = !bDelete;
-        for( ULONG nBoolIdx = 1; nBoolIdx < nCount; ++nBoolIdx )
+        for( size_t nBoolIdx = 1; nBoolIdx < nCount; ++nBoolIdx )
         {
             if( bDelete )
             {
-                ULONG next = 2;
+                sal_uInt16 next = 2;
                 while( nBoolIdx < nCount && !aBoolArr[ nBoolIdx++ ] &&
                        (!bInner || nBoolIdx < nCount ) )
                     next += 2;
@@ -474,9 +467,9 @@ void SvxBoundArgs::Add()
                 next /= 2;
                 nBoolIdx = nBoolIdx - next;
                 nCount = nCount - next;
-                aBoolArr.erase( aBoolArr.begin() + nBoolIdx, aBoolArr.begin() + nBoolIdx + next );
+                aBoolArr.erase( aBoolArr.begin() + nBoolIdx, aBoolArr.begin() + (nBoolIdx + next) );
                 if( nBoolIdx )
-                    aBoolArr[ nBoolIdx - 1 ] = FALSE;
+                    aBoolArr[ nBoolIdx - 1 ] = sal_False;
 #if OSL_DEBUG_LEVEL > 1
                 else
                     ++next;
@@ -509,20 +502,20 @@ void SvxBoundArgs::Add()
 
 void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
 {
-    SetConcat( TRUE );
+    SetConcat( sal_True );
     DBG_ASSERT( pPoly, "Nothing to do?" );
     SvLongs *pOld = pLongArr;
     pLongArr = new SvLongs( 2, 8 );
     aBoolArr.clear();
-    bInner = FALSE;
+    bInner = sal_False;
     Calc( *pPoly );
-    USHORT nCount = pLongArr->Count();
-    USHORT nIdx = 0;
-    USHORT i = 0;
-    BOOL bSubtract = pTextRanger->IsInner();
+    sal_uInt16 nCount = pLongArr->Count();
+    sal_uInt16 nIdx = 0;
+    sal_uInt16 i = 0;
+    sal_Bool bSubtract = pTextRanger->IsInner();
     while( i < nCount )
     {
-        USHORT nOldCount = pOld->Count();
+        sal_uInt16 nOldCount = pOld->Count();
         if( nIdx == nOldCount )
         {   // Reached the end of the old Array...
             if( !bSubtract )
@@ -531,7 +524,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
         }
         long nLeft = (*pLongArr)[ i++ ];
         long nRight = (*pLongArr)[ i++ ];
-        USHORT nLeftPos = nIdx + 1;
+        sal_uInt16 nLeftPos = nIdx + 1;
         while( nLeftPos < nOldCount && nLeft > (*pOld)[ nLeftPos ] )
             nLeftPos += 2;
         if( nLeftPos >= nOldCount )
@@ -540,7 +533,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
                 pOld->Insert( pLongArr, nOldCount, i - 2, USHRT_MAX );
             break;
         }
-        USHORT nRightPos = nLeftPos - 1;
+        sal_uInt16 nRightPos = nLeftPos - 1;
         while( nRightPos < nOldCount && nRight >= (*pOld)[ nRightPos ] )
             nRightPos += 2;
         if( nRightPos < nLeftPos )
@@ -593,7 +586,7 @@ void SvxBoundArgs::Concat( const PolyPolygon* pPoly )
  *10 = above the lower edge
  *************************************************************************/
 
-USHORT SvxBoundArgs::Area( const Point& rPt )
+sal_uInt16 SvxBoundArgs::Area( const Point& rPt )
 {
     long nB = B( rPt );
     if( nB >= nBottom )
@@ -633,7 +626,7 @@ long SvxBoundArgs::Cut( long nB, const Point& rPt1, const Point& rPt2 )
     return long( rPt1.X() + nQuot );
 }
 
-void SvxBoundArgs::NoteUpLow( long nA, const BYTE nArea )
+void SvxBoundArgs::NoteUpLow( long nA, const sal_uInt8 nArea )
 {
     if( nAct )
     {
@@ -657,7 +650,7 @@ void SvxBoundArgs::NoteUpLow( long nA, const BYTE nArea )
 SvLongsPtr TextRanger::GetTextRanges( const Range& rRange )
 {
     DBG_ASSERT( rRange.Min() || rRange.Max(), "Zero-Range not allowed, Bye Bye" );
-    USHORT nIndex = 0;
+    sal_uInt16 nIndex = 0;
     while( nIndex < nCacheSize && rRange != pRangeArr[ nIndex ] )
         ++nIndex;
     if( nIndex >= nCacheSize )
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 29216629c2..5b5abd6664 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -93,12 +93,12 @@ static uno::Reference< XLinguServiceManager > GetLngSvcMgr_Impl()
     return xRes;
 }
 
-BOOL lcl_FindEntry( const OUString &rEntry, const Sequence< OUString > &rCfgSvcs )
+sal_Bool lcl_FindEntry( const OUString &rEntry, const Sequence< OUString > &rCfgSvcs )
 {
-    INT32 nRes = -1;
-    INT32 nEntries = rCfgSvcs.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nEntries = rCfgSvcs.getLength();
     const OUString *pEntry = rCfgSvcs.getConstArray();
-    for (INT32 i = 0;  i < nEntries && nRes == -1;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries && nRes == -1;  ++i)
     {
         if (rEntry == pEntry[i])
             nRes = i;
@@ -113,11 +113,11 @@ Sequence< OUString > lcl_RemoveMissingEntries(
 {
     Sequence< OUString > aRes( rCfgSvcs.getLength() );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
-    INT32 nEntries = rCfgSvcs.getLength();
+    sal_Int32 nEntries = rCfgSvcs.getLength();
     const OUString *pEntry = rCfgSvcs.getConstArray();
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         if (pEntry[i].getLength() && lcl_FindEntry( pEntry[i], rAvailSvcs ))
             pRes[ nCnt++ ] = pEntry[i];
@@ -139,7 +139,7 @@ Sequence< OUString > lcl_GetLastFoundSvcs(
                                 SvxLocaleToLanguage( rAvailLocale ) ) );
 
     Sequence< OUString > aNodeNames( rCfg.GetNodeNames(rLastFoundList) );
-    BOOL bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames);
+    sal_Bool bFound = lcl_FindEntry( aCfgLocaleStr, aNodeNames);
 
     if (bFound)
     {
@@ -174,13 +174,13 @@ Sequence< OUString > lcl_GetNewEntries(
         const Sequence< OUString > &rLastFoundSvcs,
         const Sequence< OUString > &rAvailSvcs )
 {
-    INT32 nLen = rAvailSvcs.getLength();
+    sal_Int32 nLen = rAvailSvcs.getLength();
     Sequence< OUString > aRes( nLen );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
     const OUString *pEntry = rAvailSvcs.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], rLastFoundSvcs ))
             pRes[ nCnt++ ] = pEntry[i];
@@ -197,17 +197,17 @@ Sequence< OUString > lcl_MergeSeq(
 {
     Sequence< OUString > aRes( rCfgSvcs.getLength() + rNewSvcs.getLength() );
     OUString *pRes = aRes.getArray();
-    INT32 nCnt = 0;
+    sal_Int32 nCnt = 0;
 
-    for (INT32 k = 0;  k < 2;  ++k)
+    for (sal_Int32 k = 0;  k < 2;  ++k)
     {
         // add previously configuerd service first and append
         // new found services at the end
         const Sequence< OUString > &rSeq = k == 0 ? rCfgSvcs : rNewSvcs;
 
-        INT32 nLen = rSeq.getLength();
+        sal_Int32 nLen = rSeq.getLength();
         const OUString *pEntry = rSeq.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pEntry[i].getLength() && !lcl_FindEntry( pEntry[i], aRes ))
                 pRes[ nCnt++ ] = pEntry[i];
@@ -218,8 +218,8 @@ Sequence< OUString > lcl_MergeSeq(
     return aRes;
 }
 
-INT16 SvxLinguConfigUpdate::nNeedUpdating = -1;
-INT32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1;
+sal_Int16 SvxLinguConfigUpdate::nNeedUpdating = -1;
+sal_Int32 SvxLinguConfigUpdate::nCurrentDataFilesChangedCheckValue = -1;
 
 void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 {
@@ -259,13 +259,13 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
             OUString aService( ::rtl::OUString::createFromAscii( apServices[k] ) );
             OUString aActiveList( ::rtl::OUString::createFromAscii( apCurLists[k] ) );
             OUString aLastFoundList( ::rtl::OUString::createFromAscii( apLastFoundLists[k] ) );
-            INT32 i;
+            sal_Int32 i;
 
             //
             // remove configured but not available language/services entries
             //
             Sequence< OUString > aNodeNames( aCfg.GetNodeNames( aActiveList ) );   // list of configured locales
-            INT32 nNodeNames = aNodeNames.getLength();
+            sal_Int32 nNodeNames = aNodeNames.getLength();
             const OUString *pNodeName = aNodeNames.getConstArray();
             for (i = 0;  i < nNodeNames;  ++i)
             {
@@ -290,7 +290,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
             //
             uno::Reference< XAvailableLocales > xAvail( xLngSvcMgr, UNO_QUERY );
             Sequence< Locale > aAvailLocales( xAvail->getAvailableLocales(aService) );
-            INT32 nAvailLocales = aAvailLocales.getLength();
+            sal_Int32 nAvailLocales = aAvailLocales.getLength();
             const Locale *pAvailLocale = aAvailLocales.getConstArray();
             for (i = 0;  i < nAvailLocales;  ++i)
             {
@@ -334,9 +334,9 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
                         xLngSvcMgr->getAvailableServices( aService, pAvailLocale[i] ) );
 
 #if OSL_DEBUG_LEVEL > 1
-                INT32 nSvcs = aSvcImplNames.getLength();
+                sal_Int32 nSvcs = aSvcImplNames.getLength();
                 const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-                for (INT32 j = 0;  j < nSvcs;  ++j)
+                for (sal_Int32 j = 0;  j < nSvcs;  ++j)
                 {
                     OUString aImplName( pSvcImplName[j] );
                 }
@@ -371,9 +371,9 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 
 #if OSL_DEBUG_LEVEL > 1
                     Sequence< OUString > aSvcImplNames( (*aIt).second );
-                    INT32 nSvcs = aSvcImplNames.getLength();
+                    sal_Int32 nSvcs = aSvcImplNames.getLength();
                     const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-                    for (INT32 j = 0;  j < nSvcs;  ++j)
+                    for (sal_Int32 j = 0;  j < nSvcs;  ++j)
                     {
                         OUString aImplName( pSvcImplName[j] );
                     }
@@ -389,7 +389,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
                 {
                     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::UpdateAll - ReplaceSetProperties" );
                     // add new or replace existing entries.
-                    BOOL bRes = aCfg.ReplaceSetProperties( aSubNodeName, aNewValues );
+                    sal_Bool bRes = aCfg.ReplaceSetProperties( aSubNodeName, aNewValues );
                     if (!bRes)
                     {
 #if OSL_DEBUG_LEVEL > 1
@@ -411,7 +411,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
         // not be too troublesome.
         // In OOo 3.0 we will not need the respective code anymore at all.
 //		aAny <<= nCurrentDataFilesChangedCheckValue;
-        aAny <<= (INT32) -1;	// keep the value set to 'need to check'
+        aAny <<= (sal_Int32) -1;	// keep the value set to 'need to check'
 
         aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny );
 
@@ -428,17 +428,17 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
 }
 
 
-INT32 SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue()
+sal_Int32 SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue()
 {
     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::CalcDataFilesChangedCheckValue" );
 
-    INT32 nHashVal = 0;
+    sal_Int32 nHashVal = 0;
     // nothing to be checked anymore since those old directory paths are gone by now
     return nHashVal;
 }
 
 
-BOOL SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck )
+sal_Bool SvxLinguConfigUpdate::IsNeedUpdateAll( sal_Bool bForceCheck )
 {
     RTL_LOGFILE_CONTEXT( aLog, "svx: SvxLinguConfigUpdate::IsNeedUpdateAll" );
     if (nNeedUpdating == -1 || bForceCheck )    // need to check if updating is necessary
@@ -513,10 +513,10 @@ void ThesDummy_Impl::GetCfgLocales()
         String  aNode( A2OU( "ServiceManager/ThesaurusList" ) );
         Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
         const OUString *pNodeNames = aNodeNames.getConstArray();
-        INT32 nLen = aNodeNames.getLength();
+        sal_Int32 nLen = aNodeNames.getLength();
         pLocaleSeq = new Sequence< Locale >( nLen );
         Locale *pLocale = pLocaleSeq->getArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             pLocale[i] = SvxCreateLocale(
                             MsLangId::convertIsoStringToLanguage( pNodeNames[i] ) );
@@ -571,8 +571,8 @@ sal_Bool SAL_CALL
     else if (!pLocaleSeq)       // if not already loaded save startup time by avoiding loading them now
         GetCfgLocales();
         GetCfgLocales();
-    BOOL bFound = FALSE;
-    INT32 nLen = pLocaleSeq->getLength();
+    sal_Bool bFound = sal_False;
+    sal_Int32 nLen = pLocaleSeq->getLength();
     const Locale *pLocale = pLocaleSeq->getConstArray();
     const Locale *pEnd = pLocale + nLen;
     for ( ;  pLocale < pEnd  &&  !bFound;  ++pLocale)
@@ -669,7 +669,7 @@ sal_Bool SAL_CALL
         throw(uno::RuntimeException)
 {
     GetSpell_Impl();
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xSpell.is())
         bRes = xSpell->hasLanguage( nLanguage );
     return bRes;
@@ -683,7 +683,7 @@ sal_Bool SAL_CALL
               uno::RuntimeException)
 {
     GetSpell_Impl();
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
     if (xSpell.is())
         bRes = xSpell->isValid( rWord, nLanguage, rProperties );
     return bRes;
@@ -785,7 +785,7 @@ sal_Bool SAL_CALL
         throw(uno::RuntimeException)
 {
     GetHyph_Impl();
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xHyph.is())
         bRes = xHyph->hasLocale( rLocale );
     return bRes;
@@ -1215,32 +1215,32 @@ SvxAlternativeSpelling SvxGetAltSpelling(
     {
         OUString aWord( rHyphWord->getWord() ),
                  aAltWord( rHyphWord->getHyphenatedWord() );
-        INT16	nHyphenationPos		= rHyphWord->getHyphenationPos(),
+        sal_Int16	nHyphenationPos		= rHyphWord->getHyphenationPos(),
                 nHyphenPos			= rHyphWord->getHyphenPos();
-        INT16   nLen    = (INT16)aWord.getLength();
-        INT16   nAltLen = (INT16)aAltWord.getLength();
+        sal_Int16   nLen    = (sal_Int16)aWord.getLength();
+        sal_Int16   nAltLen = (sal_Int16)aAltWord.getLength();
         const sal_Unicode *pWord	= aWord.getStr(),
                           *pAltWord = aAltWord.getStr();
 
         // count number of chars from the left to the
         // hyphenation pos / hyphen pos that are equal
-        INT16 nL = 0;
+        sal_Int16 nL = 0;
         while (nL <= nHyphenationPos && nL <= nHyphenPos
                && pWord[ nL ] == pAltWord[ nL ])
             ++nL;
         // count number of chars from the right to the
         // hyphenation pos / hyphen pos that are equal
-        INT16 nR = 0;
-        INT32 nIdx    = nLen - 1;
-        INT32 nAltIdx = nAltLen - 1;
+        sal_Int16 nR = 0;
+        sal_Int32 nIdx    = nLen - 1;
+        sal_Int32 nAltIdx = nAltLen - 1;
         while (nIdx > nHyphenationPos && nAltIdx > nHyphenPos
                && pWord[ nIdx-- ] == pAltWord[ nAltIdx-- ])
             ++nR;
 
         aRes.aReplacement       = OUString( aAltWord.copy( nL, nAltLen - nL - nR ) );
-        aRes.nChangedPos        = (INT16) nL;
+        aRes.nChangedPos        = (sal_Int16) nL;
         aRes.nChangedLength     = nLen - nL - nR;
-        aRes.bIsAltSpelling		= TRUE;
+        aRes.bIsAltSpelling		= sal_True;
         aRes.xHyphWord			= rHyphWord;
     }
     return aRes;
diff --git a/editeng/source/outliner/outl_pch.cxx b/editeng/source/outliner/outl_pch.cxx
index 1eff044ef9..1eff044ef9 100644..100755
--- a/editeng/source/outliner/outl_pch.cxx
+++ b/editeng/source/outliner/outl_pch.cxx
diff --git a/editeng/source/outliner/outl_pch.hxx b/editeng/source/outliner/outl_pch.hxx
index 289b475f98..289b475f98 100644..100755
--- a/editeng/source/outliner/outl_pch.hxx
+++ b/editeng/source/outliner/outl_pch.hxx
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 2767305098..75164f9ebd 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -56,7 +56,7 @@ OutlinerEditEng::~OutlinerEditEng()
 {
 }
 
-void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
     if( GetControlWord() && EE_CNTRL_OUTLINER )
     {
@@ -67,7 +67,7 @@ void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, l
     pOwner->PaintBullet( nPara, rStartPos, rOrigin, nOrientation, pOutDev );
 }
 
-const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = NULL;
     if (pOwner)
@@ -76,32 +76,32 @@ const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
 }
 
 
-Rectangle OutlinerEditEng::GetBulletArea( USHORT nPara )
+Rectangle OutlinerEditEng::GetBulletArea( sal_uInt16 nPara )
 {
     Rectangle aBulletArea = Rectangle( Point(), Point() );
     if ( nPara < pOwner->pParaList->GetParagraphCount() )
     {
         if ( pOwner->ImplHasBullet( nPara ) )
-            aBulletArea = pOwner->ImpCalcBulletArea( nPara, FALSE, FALSE );
+            aBulletArea = pOwner->ImpCalcBulletArea( nPara, sal_False, sal_False );
     }
     return aBulletArea;
 }
 
-void OutlinerEditEng::ParagraphInserted( USHORT nNewParagraph )
+void OutlinerEditEng::ParagraphInserted( sal_uInt16 nNewParagraph )
 {
     pOwner->ParagraphInserted( nNewParagraph );
 
     EditEngine::ParagraphInserted( nNewParagraph );
 }
 
-void OutlinerEditEng::ParagraphDeleted( USHORT nDeletedParagraph )
+void OutlinerEditEng::ParagraphDeleted( sal_uInt16 nDeletedParagraph )
 {
     pOwner->ParagraphDeleted( nDeletedParagraph );
 
     EditEngine::ParagraphDeleted( nDeletedParagraph );
 }
 
-void OutlinerEditEng::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT nRightParagraph )
+void OutlinerEditEng::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 nRightParagraph )
 {
     if( pOwner && pOwner->IsUndoEnabled() && !const_cast<EditEngine&>(pOwner->GetEditEngine()).IsInUndo() )
     {
@@ -119,22 +119,22 @@ void OutlinerEditEng::StyleSheetChanged( SfxStyleSheet* pStyle )
     pOwner->StyleSheetChanged( pStyle );
 }
 
-void OutlinerEditEng::ParaAttribsChanged( USHORT nPara )
+void OutlinerEditEng::ParaAttribsChanged( sal_uInt16 nPara )
 {
     pOwner->ParaAttribsChanged( nPara );
 }
 
-BOOL OutlinerEditEng::SpellNextDocument()
+sal_Bool OutlinerEditEng::SpellNextDocument()
 {
     return pOwner->SpellNextDocument();
 }
 
-BOOL OutlinerEditEng::ConvertNextDocument()
+sal_Bool OutlinerEditEng::ConvertNextDocument()
 {
     return pOwner->ConvertNextDocument();
 }
 
-XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
+XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
 {
     switch( nUndoId )
     {
@@ -158,8 +158,8 @@ XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
     }
 }
 
-void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen,
-    const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+    const sal_Int32* pDXArray, const SvxFont& rFont, sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
     const EEngineData::WrongSpellVector* pWrongSpellVector,
     const SvxFieldData* pFieldData,
     bool bEndOfLine,
@@ -174,7 +174,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rTex
 }
 
 void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar,
-    const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+    const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
     bool bEndOfLine, bool bEndOfParagraph,
     const Color& rOverlineColor, const Color& rTextLineColor)
 {
@@ -182,23 +182,23 @@ void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const Str
             bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor );
 }
 
-void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     EditEngine::FieldClicked( rField, nPara, nPos );	// If URL
     pOwner->FieldClicked( rField, nPara, nPos );
 }
 
-void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     pOwner->FieldSelected( rField, nPara, nPos );
 }
 
-XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return pOwner->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void OutlinerEditEng::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
     if( pPara )
@@ -206,13 +206,13 @@ void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
         if ( !IsInUndo() && IsUndoEnabled() )
             pOwner->UndoActionStart( OLUNDO_ATTR );
 
-        EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
+        EditEngine::SetParaAttribs( (sal_uInt16)nPara, rSet );
 
-        pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
+        pOwner->ImplCheckNumBulletItem( (sal_uInt16)nPara );
         // #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
         // to USHORT without check, if the count is 0.
-        pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()) );
+        pOwner->ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pOwner->pParaList->GetParagraphCount()) );
 
         if ( !IsInUndo() && IsUndoEnabled() )
             pOwner->UndoActionEnd( OLUNDO_ATTR );
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 11baca5b99..b6ddc7bd11 100644..100755
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -42,21 +42,21 @@ protected:
 
     // derived from EditEngine. Allows Outliner objetcs to provide
     // bullet access to the EditEngine.
-    virtual const SvxNumberFormat*  GetNumberFormat( USHORT nPara ) const;
+    virtual const SvxNumberFormat*  GetNumberFormat( sal_uInt16 nPara ) const;
 
 public:
                         OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool );
                         ~OutlinerEditEng();
 
-    virtual void 		PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+    virtual void 		PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
 
-    virtual void 		ParagraphInserted( USHORT nNewParagraph );
-    virtual void 		ParagraphDeleted( USHORT nDeletedParagraph );
-    virtual void        ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph );
+    virtual void 		ParagraphInserted( sal_uInt16 nNewParagraph );
+    virtual void 		ParagraphDeleted( sal_uInt16 nDeletedParagraph );
+    virtual void        ParagraphConnected( sal_uInt16 nLeftParagraph, sal_uInt16 nRightParagraph );
 
     virtual void DrawingText(
-        const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
-        USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+        const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
+        sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         bool bEndOfLine,
@@ -75,20 +75,20 @@ public:
         const Color& rTextLineColor);
 
     virtual	void 		StyleSheetChanged( SfxStyleSheet* pStyle );
-    virtual void 		ParaAttribsChanged( USHORT nPara );
-    virtual BOOL 		SpellNextDocument();
-    virtual XubString	GetUndoComment( USHORT nUndoId ) const;
+    virtual void 		ParaAttribsChanged( sal_uInt16 nPara );
+    virtual sal_Bool 		SpellNextDocument();
+    virtual XubString	GetUndoComment( sal_uInt16 nUndoId ) const;
 
     // for text conversion
-    virtual BOOL        ConvertNextDocument();
+    virtual sal_Bool        ConvertNextDocument();
 
-    virtual void		FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
-    virtual void		FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
-    virtual XubString	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void		FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+    virtual void		FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+    virtual XubString	CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
 
-    virtual Rectangle 	GetBulletArea( USHORT nPara );
+    virtual Rectangle 	GetBulletArea( sal_uInt16 nPara );
 
-       virtual void        SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+       virtual void        SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
 
     // belongs into class Outliner, move there before incompatible update!
     Link                aOutlinerNotifyHdl;
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 9e7de28d58..7181b8b8a1 100644..100755
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -60,14 +60,14 @@ using namespace ::com::sun::star::linguistic2;
 // ======================   Simple pass-through   =======================
 // ======================================================================
 
-void Outliner::SetUpdateMode( BOOL bUpdate )
+void Outliner::SetUpdateMode( sal_Bool bUpdate )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
 
-BOOL Outliner::GetUpdateMode() const
+sal_Bool Outliner::GetUpdateMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetUpdateMode();
@@ -79,13 +79,13 @@ const SfxItemSet& Outliner::GetEmptyItemSet() const
     return pEditEngine->GetEmptyItemSet();
 }
 
-void Outliner::EnableUndo( BOOL bEnable )
+void Outliner::EnableUndo( sal_Bool bEnable )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableUndo( bEnable );
 }
 
-BOOL Outliner::IsUndoEnabled() const
+sal_Bool Outliner::IsUndoEnabled() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsUndoEnabled();
@@ -122,13 +122,13 @@ void Outliner::ClearModifyFlag()
     pEditEngine->ClearModifyFlag();
 }
 
-BOOL Outliner::IsModified() const
+sal_Bool Outliner::IsModified() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsModified();
 }
 
-ULONG Outliner::GetTextHeight() const
+sal_uLong Outliner::GetTextHeight() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetTextHeight();
@@ -176,31 +176,31 @@ Link Outliner::GetStatusEventHdl() const
     return pEditEngine->GetStatusEventHdl();
 }
 
-void Outliner::SetDefTab( USHORT nTab )
+void Outliner::SetDefTab( sal_uInt16 nTab )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetDefTab( nTab );
 }
 
-USHORT Outliner::GetDefTab() const
+sal_uInt16 Outliner::GetDefTab() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetDefTab();
 }
 
-BOOL Outliner::IsFlatMode() const
+sal_Bool Outliner::IsFlatMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsFlatMode();
 }
 
-BOOL Outliner::UpdateFields()
+sal_Bool Outliner::UpdateFields()
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->UpdateFields();
 }
 
-void Outliner::RemoveFields( BOOL bKeepFieldText, TypeId aType )
+void Outliner::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->RemoveFields( bKeepFieldText, aType );
@@ -218,7 +218,7 @@ String Outliner::GetWordDelimiters() const
     return pEditEngine->GetWordDelimiters();
 }
 
-String Outliner::GetWord( USHORT nPara, USHORT nIndex )
+String Outliner::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetWord( nPara, nIndex );
@@ -303,7 +303,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz )
     pEditEngine->SetMaxAutoPaperSize( rSz );
 }
 
-BOOL Outliner::IsExpanded( Paragraph* pPara ) const
+sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->HasVisibleChilds( pPara );
@@ -315,7 +315,7 @@ Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
     return pParaList->GetParent( pParagraph );
 }
 
-ULONG Outliner::GetChildCount( Paragraph* pParent ) const
+sal_uLong Outliner::GetChildCount( Paragraph* pParent ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetChildCount( pParent );
@@ -330,7 +330,7 @@ Size Outliner::CalcTextSize()
 Point Outliner::GetDocPos( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetDocPosTopLeft( (USHORT)pParaList->GetAbsPos( pPara ) );
+    return pEditEngine->GetDocPosTopLeft( (sal_uInt16)pParaList->GetAbsPos( pPara ) );
 }
 
 void Outliner::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
@@ -345,73 +345,73 @@ SfxStyleSheetPool* Outliner::GetStyleSheetPool()
     return pEditEngine->GetStyleSheetPool();
 }
 
-SfxStyleSheet* Outliner::GetStyleSheet( ULONG nPara )
+SfxStyleSheet* Outliner::GetStyleSheet( sal_uLong nPara )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetStyleSheet( (USHORT)nPara );
+    return pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
 }
 
-BOOL Outliner::IsInSelectionMode() const
+sal_Bool Outliner::IsInSelectionMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInSelectionMode();
 }
 
-void Outliner::SetControlWord( ULONG nWord )
+void Outliner::SetControlWord( sal_uLong nWord )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetControlWord( nWord );
 }
 
-ULONG Outliner::GetControlWord() const
+sal_uLong Outliner::GetControlWord() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetControlWord();
 }
 
-void Outliner::SetAsianCompressionMode( USHORT n )
+void Outliner::SetAsianCompressionMode( sal_uInt16 n )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAsianCompressionMode( n );
 }
 
-USHORT Outliner::GetAsianCompressionMode() const
+sal_uInt16 Outliner::GetAsianCompressionMode() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetAsianCompressionMode();
 }
 
-void Outliner::SetKernAsianPunctuation( BOOL b )
+void Outliner::SetKernAsianPunctuation( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetKernAsianPunctuation( b );
 }
 
-BOOL Outliner::IsKernAsianPunctuation() const
+sal_Bool Outliner::IsKernAsianPunctuation() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsKernAsianPunctuation();
 }
 
-void Outliner::SetAddExtLeading( BOOL bExtLeading )
+void Outliner::SetAddExtLeading( sal_Bool bExtLeading )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetAddExtLeading( bExtLeading );
 }
 
-BOOL Outliner::IsAddExtLeading() const
+sal_Bool Outliner::IsAddExtLeading() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsAddExtLeading();
 }
 
-void Outliner::UndoActionStart( USHORT nId )
+void Outliner::UndoActionStart( sal_uInt16 nId )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionStart( nId );
 }
 
-void Outliner::UndoActionEnd( USHORT nId )
+void Outliner::UndoActionEnd( sal_uInt16 nId )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->UndoActionEnd( nId );
@@ -421,35 +421,35 @@ void Outliner::InsertUndo( EditUndo* pUndo )
 {
 #ifndef SVX_LIGHT
     DBG_CHKTHIS(Outliner,0);
-    pEditEngine->GetUndoManager().AddUndoAction( pUndo, FALSE );
+    pEditEngine->GetUndoManager().AddUndoAction( pUndo, sal_False );
 #endif
 }
 
-BOOL Outliner::IsInUndo()
+sal_Bool Outliner::IsInUndo()
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsInUndo();
 }
 
-ULONG Outliner::GetLineCount( ULONG nParagraph ) const
+sal_uLong Outliner::GetLineCount( sal_uLong nParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineCount( (USHORT)nParagraph );
+    return pEditEngine->GetLineCount( (sal_uInt16)nParagraph );
 }
 
-USHORT Outliner::GetLineLen( ULONG nParagraph, USHORT nLine ) const
+sal_uInt16 Outliner::GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineLen( (USHORT)nParagraph, nLine );
+    return pEditEngine->GetLineLen( (sal_uInt16)nParagraph, nLine );
 }
 
-ULONG Outliner::GetLineHeight( ULONG nParagraph, ULONG nLine )
+sal_uLong Outliner::GetLineHeight( sal_uLong nParagraph, sal_uLong nLine )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetLineHeight( (USHORT)nParagraph, (USHORT)nLine );
+    return pEditEngine->GetLineHeight( (sal_uInt16)nParagraph, (sal_uInt16)nLine );
 }
 
-void Outliner::QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich )
+void Outliner::QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickRemoveCharAttribs( nPara, nWhich );
@@ -467,10 +467,10 @@ sal_Bool Outliner::HasConvertibleTextPortion( LanguageType nLang )
     return pEditEngine->HasConvertibleTextPortion( nLang );
 }
 
-BOOL Outliner::ConvertNextDocument()
+sal_Bool Outliner::ConvertNextDocument()
 {
     DBG_CHKTHIS(Outliner,0);
-    return FALSE;
+    return sal_False;
 }
 
 void Outliner::SetDefaultLanguage( LanguageType eLang )
@@ -485,7 +485,7 @@ LanguageType Outliner::GetDefaultLanguage() const
     return pEditEngine->GetDefaultLanguage();
 }
 
-BOOL Outliner::HasOnlineSpellErrors() const
+sal_Bool Outliner::HasOnlineSpellErrors() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasOnlineSpellErrors();
@@ -497,7 +497,7 @@ void Outliner::CompleteOnlineSpelling()
     pEditEngine->CompleteOnlineSpelling();
 }
 
-BOOL Outliner::HasText( const SvxSearchItem& rSearchItem )
+sal_Bool Outliner::HasText( const SvxSearchItem& rSearchItem )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->HasText( rSearchItem );
@@ -515,10 +515,10 @@ SfxItemPool* Outliner::GetEditTextObjectPool() const
     return pEditEngine->GetEditTextObjectPool();
 }
 
-BOOL Outliner::SpellNextDocument()
+sal_Bool Outliner::SpellNextDocument()
 {
     DBG_CHKTHIS(Outliner,0);
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -564,16 +564,16 @@ OutputDevice* Outliner::GetRefDevice() const
     return pEditEngine->GetRefDevice();
 }
 
-USHORT Outliner::GetFirstLineOffset( ULONG nParagraph )
+sal_uInt16 Outliner::GetFirstLineOffset( sal_uLong nParagraph )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetFirstLineOffset( (USHORT)nParagraph );
+    return pEditEngine->GetFirstLineOffset( (sal_uInt16)nParagraph );
 }
 
-ULONG Outliner::GetTextHeight( ULONG nParagraph ) const
+sal_uLong Outliner::GetTextHeight( sal_uLong nParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetTextHeight((USHORT)nParagraph );
+    return pEditEngine->GetTextHeight((sal_uInt16)nParagraph );
 }
 
 Point Outliner::GetDocPos( const Point& rPaperPos ) const
@@ -582,35 +582,35 @@ Point Outliner::GetDocPos( const Point& rPaperPos ) const
     return pEditEngine->GetDocPos( rPaperPos );
 }
 
-Point Outliner::GetDocPosTopLeft( ULONG nParagraph )
+Point Outliner::GetDocPosTopLeft( sal_uLong nParagraph )
 {
     DBG_CHKTHIS(Outliner,0);
-    return pEditEngine->GetDocPosTopLeft( (USHORT)nParagraph );
+    return pEditEngine->GetDocPosTopLeft( (sal_uInt16)nParagraph );
 }
 
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 {
     return IsTextPos( rPaperPos, nBorder, NULL );
 }
 
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBullet )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBullet )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( pbBullet)
-        *pbBullet = FALSE;
-    BOOL bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
+        *pbBullet = sal_False;
+    sal_Bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
     if ( !bTextPos )
     {
         Point aDocPos = GetDocPos( rPaperPos );
-        USHORT nPara = pEditEngine->FindParagraph( aDocPos.Y() );
+        sal_uInt16 nPara = pEditEngine->FindParagraph( aDocPos.Y() );
         if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasBullet( nPara ) )
         {
-            Rectangle aBulArea = ImpCalcBulletArea( nPara, TRUE, TRUE );
+            Rectangle aBulArea = ImpCalcBulletArea( nPara, sal_True, sal_True );
             if ( aBulArea.IsInside( rPaperPos ) )
             {
-                bTextPos = TRUE;
+                bTextPos = sal_True;
                 if ( pbBullet)
-                    *pbBullet = TRUE;
+                    *pbBullet = sal_True;
             }
         }
     }
@@ -626,50 +626,50 @@ void Outliner::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
 
 void Outliner::QuickInsertText( const XubString& rText, const ESelection& rSel )
 {
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertText( rText, rSel );
 }
 
 void Outliner::QuickDelete( const ESelection& rSel )
 {
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickDelete( rSel );
 }
 
 void Outliner::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
 {
     DBG_CHKTHIS(Outliner,0);
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertField( rFld, rSel );
 }
 
 void Outliner::QuickInsertLineBreak( const ESelection& rSel )
 {
     DBG_CHKTHIS(Outliner,0);
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     pEditEngine->QuickInsertLineBreak( rSel );
 }
 
-void Outliner::QuickFormatDoc( BOOL bFull )
+void Outliner::QuickFormatDoc( sal_Bool bFull )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->QuickFormatDoc( bFull );
 }
 
-void Outliner::SetGlobalCharStretching( USHORT nX, USHORT nY )
+void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetGlobalCharStretching( nX, nY );
 }
 
-void Outliner::GetGlobalCharStretching( USHORT& rX, USHORT& rY )
+void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->GetGlobalCharStretching( rX, rY );
 }
 
 
-void Outliner::DoStretchChars( USHORT nX, USHORT nY )
+void Outliner::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->DoStretchChars( nX, nY );
@@ -681,43 +681,43 @@ void Outliner::EraseVirtualDevice()
     pEditEngine->EraseVirtualDevice();
 }
 
-void Outliner::SetBigTextObjectStart( USHORT nStartAtPortionCount )
+void Outliner::SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetBigTextObjectStart( nStartAtPortionCount );
 }
 
-USHORT Outliner::GetBigTextObjectStart() const
+sal_uInt16 Outliner::GetBigTextObjectStart() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetBigTextObjectStart();
 }
 
-BOOL Outliner::ShouldCreateBigTextObject() const
+sal_Bool Outliner::ShouldCreateBigTextObject() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->ShouldCreateBigTextObject();
 }
 
-void Outliner::SetVertical( BOOL b )
+void Outliner::SetVertical( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetVertical( b );
 }
 
-BOOL Outliner::IsVertical() const
+sal_Bool Outliner::IsVertical() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsVertical();
 }
 
-void Outliner::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void Outliner::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
 }
 
-BOOL Outliner::IsFixedCellHeight() const
+sal_Bool Outliner::IsFixedCellHeight() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsFixedCellHeight();
@@ -735,13 +735,13 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
     return pEditEngine->GetDefaultHorizontalTextDirection();
 }
 
-USHORT Outliner::GetScriptType( const ESelection& rSelection ) const
+sal_uInt16 Outliner::GetScriptType( const ESelection& rSelection ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetScriptType( rSelection );
 }
 
-LanguageType Outliner::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType Outliner::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetLanguage( nPara, nPos );
@@ -753,25 +753,25 @@ void Outliner::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePara
     pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
 }
 
-void Outliner::EnableAutoColor( BOOL b )
+void Outliner::EnableAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->EnableAutoColor( b );
 }
 
-BOOL Outliner::IsAutoColorEnabled() const
+sal_Bool Outliner::IsAutoColorEnabled() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsAutoColorEnabled();
 }
 
-void Outliner::ForceAutoColor( BOOL b )
+void Outliner::ForceAutoColor( sal_Bool b )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->ForceAutoColor( b );
 }
 
-BOOL Outliner::IsForceAutoColor() const
+sal_Bool Outliner::IsForceAutoColor() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsForceAutoColor();
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index afbc79858d..67988ba596 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -70,20 +70,20 @@ using ::std::advance;
 
 #define DEFAULT_SCALE	75
 
-static const USHORT nDefStyles = 3;	// Special treatment for the first 3 levels
-static const USHORT nDefBulletIndent = 800;
-static const USHORT nDefBulletWidth = 700;
-static const USHORT	pDefBulletIndents[nDefStyles]= 	{ 1400, 800, 800 };
-static const USHORT	pDefBulletWidths[nDefStyles] = 	{ 1000, 850, 700 };
+static const sal_uInt16 nDefStyles = 3;	// Special treatment for the first 3 levels
+static const sal_uInt16 nDefBulletIndent = 800;
+static const sal_uInt16 nDefBulletWidth = 700;
+static const sal_uInt16	pDefBulletIndents[nDefStyles]= 	{ 1400, 800, 800 };
+static const sal_uInt16	pDefBulletWidths[nDefStyles] = 	{ 1000, 850, 700 };
 
-USHORT lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
 {
     return ( nDepth < nDefStyles ) ? pDefBulletWidths[nDepth] : nDefBulletWidth;
 }
 
-USHORT lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
 {
-    USHORT nI = 0;
+    sal_uInt16 nI = 0;
 
     if( nDepth >= 0 )
     {
@@ -108,7 +108,7 @@ void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
         rnDepth = nMaxDepth;
 }
 
-Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDepth)
+Paragraph* Outliner::Insert(const XubString& rText, sal_uLong nAbsPos, sal_Int16 nDepth)
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pParaList->GetParagraphCount(),"Insert:No Paras");
@@ -117,7 +117,7 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
 
     ImplCheckDepth( nDepth );
 
-    ULONG nParagraphCount = pParaList->GetParagraphCount();
+    sal_uLong nParagraphCount = pParaList->GetParagraphCount();
     if( nAbsPos > nParagraphCount )
         nAbsPos = nParagraphCount;
 
@@ -137,28 +137,28 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
     }
     else
     {
-        BOOL bUpdate = pEditEngine->GetUpdateMode();
-        pEditEngine->SetUpdateMode( FALSE );
-        ImplBlockInsertionCallbacks( TRUE );
+        sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+        pEditEngine->SetUpdateMode( sal_False );
+        ImplBlockInsertionCallbacks( sal_True );
         pPara = new Paragraph( nDepth );
         pParaList->Insert( pPara, nAbsPos );
-        pEditEngine->InsertParagraph( (USHORT)nAbsPos, String() );
+        pEditEngine->InsertParagraph( (sal_uInt16)nAbsPos, String() );
         DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed");
-        ImplInitDepth( (USHORT)nAbsPos, nDepth, FALSE );
+        ImplInitDepth( (sal_uInt16)nAbsPos, nDepth, sal_False );
         pHdlParagraph = pPara;
         ParagraphInsertedHdl();
         pPara->nFlags |= PARAFLAG_HOLDDEPTH;
         SetText( rText, pPara );
-        ImplBlockInsertionCallbacks( FALSE );
+        ImplBlockInsertionCallbacks( sal_False );
         pEditEngine->SetUpdateMode( bUpdate );
     }
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
     DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed");
     return pPara;
 }
 
 
-void Outliner::ParagraphInserted( USHORT nPara )
+void Outliner::ParagraphInserted( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -172,7 +172,7 @@ void Outliner::ParagraphInserted( USHORT nPara )
         if( pEditEngine->IsInUndo() )
         {
             pPara->nFlags = PARAFLAG_SETBULLETTEXT;
-            pPara->bVisible = TRUE;
+            pPara->bVisible = sal_True;
             const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
             pPara->SetDepth( rLevel.GetValue() );
         }
@@ -189,14 +189,14 @@ void Outliner::ParagraphInserted( USHORT nPara )
 
         if( !pEditEngine->IsInUndo() )
         {
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
             pHdlParagraph = pPara;
             ParagraphInsertedHdl();
         }
     }
 }
 
-void Outliner::ParagraphDeleted( USHORT nPara )
+void Outliner::ParagraphDeleted( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -223,24 +223,24 @@ void Outliner::ParagraphDeleted( USHORT nPara )
         pPara = pParaList->GetParagraph( nPara );
         if ( pPara && ( pPara->GetDepth() > nDepth ) )
         {
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
             // Search for next on the this level ...
             while ( pPara && pPara->GetDepth() > nDepth )
                 pPara = pParaList->GetParagraph( ++nPara );
         }
 
         if ( pPara && ( pPara->GetDepth() == nDepth ) )
-            ImplCalcBulletText( nPara, TRUE, FALSE );
+            ImplCalcBulletText( nPara, sal_True, sal_False );
     }
 }
 
-void Outliner::Init( USHORT nMode )
+void Outliner::Init( sal_uInt16 nMode )
 {
     nOutlinerMode = nMode;
 
     Clear();
 
-    ULONG nCtrl = pEditEngine->GetControlWord();
+    sal_uLong nCtrl = pEditEngine->GetControlWord();
     nCtrl &= ~(EE_CNTRL_OUTLINER|EE_CNTRL_OUTLINER2);
 
     SetMaxDepth( 9 );
@@ -263,12 +263,12 @@ void Outliner::Init( USHORT nMode )
 
     pEditEngine->SetControlWord( nCtrl );
 
-    ImplInitDepth( 0, GetMinDepth(), FALSE );
+    ImplInitDepth( 0, GetMinDepth(), sal_False );
 
     GetUndoManager().Clear();
 }
 
-void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
+void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs )
 {
     if( nMaxDepth != nDepth )
     {
@@ -276,8 +276,8 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
 
         if( bCheckParagraphs )
         {
-            USHORT nParagraphs = (USHORT)pParaList->GetParagraphCount();
-            for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+            sal_uInt16 nParagraphs = (sal_uInt16)pParaList->GetParagraphCount();
+            for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
             {
                 Paragraph* pPara = pParaList->GetParagraph( nPara );
                 if( pPara && pPara->GetDepth() > nMaxDepth )
@@ -289,7 +289,7 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
     }
 }
 
-sal_Int16 Outliner::GetDepth( ULONG nPara ) const
+sal_Int16 Outliner::GetDepth( sal_uLong nPara ) const
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
     DBG_ASSERT( pPara, "Outliner::GetDepth - Paragraph not found!" );
@@ -308,9 +308,9 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth )
         mnDepthChangeHdlPrevFlags = pPara->nFlags;
         pHdlParagraph = pPara;
 
-        USHORT nPara = (USHORT)GetAbsPos( pPara );
-        ImplInitDepth( nPara, nNewDepth, TRUE );
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        sal_uInt16 nPara = (sal_uInt16)GetAbsPos( pPara );
+        ImplInitDepth( nPara, nNewDepth, sal_True );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
 
         if ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
             ImplSetLevelDependendStyleSheet( nPara );
@@ -341,7 +341,7 @@ void Outliner::SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingSta
         // #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
         // to USHORT without check, if the count is 0.
-        ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+        ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
         pEditEngine->SetModified();
     }
 }
@@ -368,18 +368,18 @@ void Outliner::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumb
         // #i100014#
         // It is not a good idea to substract 1 from a count and cast the result
         // to USHORT without check, if the count is 0.
-        ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+        ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
         pEditEngine->SetModified();
     }
 }
 
-OutlinerParaObject* Outliner::CreateParaObject( USHORT nStartPara, USHORT nCount ) const
+OutlinerParaObject* Outliner::CreateParaObject( sal_uInt16 nStartPara, sal_uInt16 nCount ) const
 {
     DBG_CHKTHIS(Outliner,0);
 
-    if ( sal::static_int_cast< ULONG >( nStartPara + nCount ) >
+    if ( sal::static_int_cast< sal_uLong >( nStartPara + nCount ) >
          pParaList->GetParagraphCount() )
-        nCount = sal::static_int_cast< USHORT >(
+        nCount = sal::static_int_cast< sal_uInt16 >(
             pParaList->GetParagraphCount() - nStartPara );
 
     // When a new OutlinerParaObject is created because a paragraph is just beeing deleted,
@@ -412,16 +412,16 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"SetText:No Para");
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
-    ImplBlockInsertionCallbacks( TRUE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
+    ImplBlockInsertionCallbacks( sal_True );
 
-    USHORT nPara = (USHORT)pParaList->GetAbsPos( pPara );
+    sal_uInt16 nPara = (sal_uInt16)pParaList->GetAbsPos( pPara );
 
     if( !rText.Len() )
     {
         pEditEngine->SetText( nPara, rText );
-        ImplInitDepth( nPara, pPara->GetDepth(), FALSE );
+        ImplInitDepth( nPara, pPara->GetDepth(), sal_False );
     }
     else
     {
@@ -431,9 +431,9 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
         if( aText.GetChar( aText.Len()-1 ) == '\x0A' )
             aText.Erase( aText.Len()-1, 1 ); // Delete the last break
 
-        USHORT nCount = aText.GetTokenCount( '\x0A' );
-        USHORT nPos = 0;
-        USHORT nInsPos = nPara+1;
+        sal_uInt16 nCount = aText.GetTokenCount( '\x0A' );
+        sal_uInt16 nPos = 0;
+        sal_uInt16 nInsPos = nPara+1;
         while( nCount > nPos )
         {
             XubString aStr = aText.GetToken( nPos, '\x0A' );
@@ -453,7 +453,7 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
                 ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ) )
             {
                 // Extract Tabs 
-                USHORT nTabs = 0;
+                sal_uInt16 nTabs = 0;
                 while ( ( nTabs < aStr.Len() ) && ( aStr.GetChar( nTabs ) == '\t' ) )
                     nTabs++;
                 if ( nTabs )
@@ -480,15 +480,15 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
                 nInsPos--;
                 pEditEngine->SetText( nInsPos, aStr );
             }
-            ImplInitDepth( nInsPos, nCurDepth, FALSE );
+            ImplInitDepth( nInsPos, nCurDepth, sal_False );
             nInsPos++;
             nPos++;
         }
     }
 
     DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!");
-    bFirstParaIsEmpty = FALSE;
-    ImplBlockInsertionCallbacks( FALSE );
+    bFirstParaIsEmpty = sal_False;
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
@@ -499,7 +499,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     DBG_CHKTHIS(Outliner,0);
 
     bool bConverted = false;
-    USHORT nTabs = 0;
+    sal_uInt16 nTabs = 0;
     ESelection aDelSel;
 
 //	const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nPara );
@@ -509,16 +509,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     XubString aHeading_US( RTL_CONSTASCII_USTRINGPARAM( "heading" ) );
     XubString aNumber_US( RTL_CONSTASCII_USTRINGPARAM( "Numbering" ) );
 
-    XubString aStr( pEditEngine->GetText( (USHORT)nPara ) );
+    XubString aStr( pEditEngine->GetText( (sal_uInt16)nPara ) );
     xub_Unicode* pPtr = (xub_Unicode*)aStr.GetBuffer();
 
-    USHORT nHeadingNumberStart = 0;
-    USHORT nNumberingNumberStart = 0;
-    SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (USHORT)nPara );
+    sal_uInt16 nHeadingNumberStart = 0;
+    sal_uInt16 nNumberingNumberStart = 0;
+    SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
     if( pStyle )
     {
         aName = pStyle->GetName();
-        USHORT nSearch;
+        sal_uInt16 nSearch;
         if ( ( nSearch = aName.Search( aHeading_US ) ) != STRING_NOTFOUND )
             nHeadingNumberStart = nSearch + aHeading_US.Len();
         else if ( ( nSearch = aName.Search( aNumber_US ) ) != STRING_NOTFOUND )
@@ -532,16 +532,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
                 ( pPtr[0] != '\t' ) && ( pPtr[1] == '\t' ) )
         {
             // Extract Bullet and Tab
-            aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, 2 );
+            aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, 2 );
         }
 
-        USHORT nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
+        sal_uInt16 nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
         String aLevel = aName.Copy( nPos );
         aLevel.EraseLeadingChars( ' ' );
-        nTabs = sal::static_int_cast< USHORT >(aLevel.ToInt32());
+        nTabs = sal::static_int_cast< sal_uInt16 >(aLevel.ToInt32());
         if( nTabs )
             nTabs--; // Level 0 = "heading 1"
-        bConverted = TRUE;
+        bConverted = sal_True;
     }
     else
     {
@@ -553,7 +553,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
         }
         // Remove tabs from the text
         if( nTabs )
-            aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, nTabs );
+            aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, nTabs );
     }
 
     if ( aDelSel.HasRange() )
@@ -571,7 +571,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
     sal_Int16 nOutlLevel = rLevel.GetValue();
 
     ImplCheckDepth( nOutlLevel );
-    ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, FALSE );
+    ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, sal_False );
 
     return bConverted;
 }
@@ -580,25 +580,25 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    BOOL bUndo = pEditEngine->IsUndoEnabled();
-    EnableUndo( FALSE );
+    sal_Bool bUndo = pEditEngine->IsUndoEnabled();
+    EnableUndo( sal_False );
 
     Init( rPObj.GetOutlinerMode() );
 
-    ImplBlockInsertionCallbacks( TRUE );
+    ImplBlockInsertionCallbacks( sal_True );
     pEditEngine->SetText(rPObj.GetTextObject());
     if( rPObj.Count() != pEditEngine->GetParagraphCount() )
     {
         int nop=0;nop++;
     }
 
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    pParaList->Clear( TRUE );
-    for( USHORT nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
+    pParaList->Clear( sal_True );
+    for( sal_uInt16 nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
     {
         Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(nCurPara));
         ImplCheckDepth( pPara->nDepth );
@@ -610,10 +610,10 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
     // #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
     // to USHORT without check, if the count is 0.
-    ImplCheckParagraphs( 0, (USHORT) (pParaList->GetParagraphCount()) );
+    ImplCheckParagraphs( 0, (sal_uInt16) (pParaList->GetParagraphCount()) );
 
     EnableUndo( bUndo );
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 
     DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed");
@@ -625,14 +625,14 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
     DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara;
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    ImplBlockInsertionCallbacks( TRUE );
-    ULONG nPara;
+    ImplBlockInsertionCallbacks( sal_True );
+    sal_uLong nPara;
     if( bFirstParaIsEmpty )
     {
-        pParaList->Clear( TRUE );
+        pParaList->Clear( sal_True );
         pEditEngine->SetText(rPObj.GetTextObject());
         nPara = 0;
     }
@@ -641,53 +641,53 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
         nPara = pParaList->GetParagraphCount();
         pEditEngine->InsertParagraph( EE_PARA_APPEND, rPObj.GetTextObject() );
     }
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    for( USHORT n = 0; n < rPObj.Count(); n++ )
+    for( sal_uInt16 n = 0; n < rPObj.Count(); n++ )
     {
         pPara = new Paragraph( rPObj.GetParagraphData(n) );
         pParaList->Append(pPara);
-        USHORT nP = sal::static_int_cast< USHORT >(nPara+n);
+        sal_uInt16 nP = sal::static_int_cast< sal_uInt16 >(nPara+n);
         DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync");
-        ImplInitDepth( nP, pPara->GetDepth(), FALSE );
+        ImplInitDepth( nP, pPara->GetDepth(), sal_False );
     }
     DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" );
 
     // #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
     // to USHORT without check, if the count is 0.
-    ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pParaList->GetParagraphCount()) );
+    ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
 
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
-void Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if ( aFieldClickedHdl.IsSet() )
     {
         EditFieldInfo aFldInfo( this, rField, nPara, nPos );
-        aFldInfo.SetSimpleClick( TRUE );
+        aFldInfo.SetSimpleClick( sal_True );
         aFieldClickedHdl.Call( &aFldInfo );
     }
 }
 
 
-void Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( !aFieldClickedHdl.IsSet() )
         return;
 
     EditFieldInfo aFldInfo( this, rField, nPara, nPos );
-    aFldInfo.SetSimpleClick( FALSE );
+    aFldInfo.SetSimpleClick( sal_False );
     aFieldClickedHdl.Call( &aFldInfo );
 }
 
 
-XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( !aCalcFieldValueHdl.IsSet() )
@@ -711,19 +711,19 @@ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, US
     return aFldInfo.GetRepresentation();
 }
 
-void Outliner::SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle )
+void Outliner::SetStyleSheet( sal_uLong nPara, SfxStyleSheet* pStyle )
 {
     DBG_CHKTHIS(Outliner,0);
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (pPara)
         {
-            pEditEngine->SetStyleSheet( (USHORT)nPara, pStyle );
+            pEditEngine->SetStyleSheet( (sal_uInt16)nPara, pStyle );
             pPara->nFlags |= PARAFLAG_SETBULLETTEXT;
-            ImplCheckNumBulletItem( (USHORT) nPara );
+            ImplCheckNumBulletItem( (sal_uInt16) nPara );
         }
 }
 
-void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
+void Outliner::SetVisible( Paragraph* pPara, sal_Bool bVisible )
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT( pPara, "SetVisible: pPara = NULL" );
@@ -731,19 +731,19 @@ void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
         if (pPara)
         {
             pPara->bVisible = bVisible;
-            ULONG nPara = pParaList->GetAbsPos( pPara );
-            pEditEngine->ShowParagraph( (USHORT)nPara, bVisible );
+            sal_uLong nPara = pParaList->GetAbsPos( pPara );
+            pEditEngine->ShowParagraph( (sal_uInt16)nPara, bVisible );
         }
 }
 
-void Outliner::ImplCheckNumBulletItem( USHORT nPara )
+void Outliner::ImplCheckNumBulletItem( sal_uInt16 nPara )
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (pPara)
             pPara->aBulSize.Width() = -1;
 }
 
-void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle )
+void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pLevelStyle )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -778,7 +778,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLe
     }
 }
 
-void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction )
+void Outliner::ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -794,10 +794,10 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
     // the old values are restored by the EditEngine.
     if( !IsInUndo() )
     {
-        BOOL bUpdate = pEditEngine->GetUpdateMode();
-        pEditEngine->SetUpdateMode( FALSE );
+        sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+        pEditEngine->SetUpdateMode( sal_False );
 
-        BOOL bUndo = bCreateUndo && IsUndoEnabled();
+        sal_Bool bUndo = bCreateUndo && IsUndoEnabled();
         if ( bUndo && bUndoAction )
             UndoActionStart( OLUNDO_DEPTH );
 
@@ -805,7 +805,7 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
         aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) );
         pEditEngine->SetParaAttribs( nPara, aAttrs );
         ImplCheckNumBulletItem( nPara );
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
 
         if ( bUndo )
         {
@@ -818,30 +818,30 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
     }
 }
 
-void Outliner::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void Outliner::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     DBG_CHKTHIS(Outliner,0);
 
     pEditEngine->SetParaAttribs( nPara, rSet );
 }
 
-BOOL Outliner::Expand( Paragraph* pPara )
+sal_Bool Outliner::Expand( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if ( pParaList->HasHiddenChilds( pPara ) )
     {
         OLUndoExpand* pUndo = 0;
-        BOOL bUndo = IsUndoEnabled() && !IsInUndo();
+        sal_Bool bUndo = IsUndoEnabled() && !IsInUndo();
         if( bUndo )
         {
             UndoActionStart( OLUNDO_EXPAND );
             pUndo = new OLUndoExpand( this, OLUNDO_EXPAND );
             pUndo->pParas = 0;
-            pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+            pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
         }
         pHdlParagraph = pPara;
-        bIsExpanding = TRUE;
+        bIsExpanding = sal_True;
         pParaList->Expand( pPara );
         ExpandHdl();
         InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -850,32 +850,32 @@ BOOL Outliner::Expand( Paragraph* pPara )
             InsertUndo( pUndo );
             UndoActionEnd( OLUNDO_EXPAND );
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL Outliner::Collapse( Paragraph* pPara )
+sal_Bool Outliner::Collapse( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
     if ( pParaList->HasVisibleChilds( pPara ) )	// expanded
     {
         OLUndoExpand* pUndo = 0;
-        BOOL bUndo = FALSE;
+        sal_Bool bUndo = sal_False;
 
         if( !IsInUndo() && IsUndoEnabled() )
-            bUndo = TRUE;
+            bUndo = sal_True;
         if( bUndo )
         {
             UndoActionStart( OLUNDO_COLLAPSE );
             pUndo = new OLUndoExpand( this, OLUNDO_COLLAPSE );
             pUndo->pParas = 0;
-            pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+            pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
         }
 
         pHdlParagraph = pPara;
-        bIsExpanding = FALSE;
+        bIsExpanding = sal_False;
         pParaList->Collapse( pPara );
         ExpandHdl();
         InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -884,13 +884,13 @@ BOOL Outliner::Collapse( Paragraph* pPara )
             InsertUndo( pUndo );
             UndoActionEnd( OLUNDO_COLLAPSE );
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
+Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
     DBG_ASSERT( pFmt && ( pFmt->GetNumberingType() != SVX_NUM_BITMAP ) && ( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ), "ImpCalcBulletFont: Missing or BitmapBullet!" );
@@ -925,14 +925,14 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
     USHORT nStretchX, nStretchY;
     const_cast<Outliner*>(this)->GetGlobalCharStretching(nStretchX, nStretchY);
 
-    USHORT nScale = pFmt->GetBulletRelSize() * nStretchY / 100;
-    ULONG nScaledLineHeight = aStdFont.GetSize().Height();
+    sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100;
+    sal_uLong nScaledLineHeight = aStdFont.GetSize().Height();
     nScaledLineHeight *= nScale*10;
     nScaledLineHeight /= 1000;
 
     aBulletFont.SetAlign( ALIGN_BOTTOM );
     aBulletFont.SetSize( Size( 0, nScaledLineHeight ) );
-    BOOL bVertical = IsVertical();
+    sal_Bool bVertical = IsVertical();
     aBulletFont.SetVertical( bVertical );
     aBulletFont.SetOrientation( bVertical ? 2700 : 0 );
 
@@ -949,7 +949,7 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
     return aBulletFont;
 }
 
-void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
+void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
     const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
 {
     DBG_CHKTHIS(Outliner,0);
@@ -963,12 +963,12 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
 
     if ( ImplHasBullet( nPara ) && bDrawBullet)
     {
-        BOOL bVertical = IsVertical();
+        sal_Bool bVertical = IsVertical();
 
-        BOOL bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
+        sal_Bool bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
 
-        Rectangle aBulletArea( ImpCalcBulletArea( nPara, TRUE, FALSE ) );
-        USHORT nStretchX, nStretchY;
+        Rectangle aBulletArea( ImpCalcBulletArea( nPara, sal_True, sal_False ) );
+        sal_uInt16 nStretchX, nStretchY;
         GetGlobalCharStretching(nStretchX, nStretchY);
         aBulletArea = Rectangle( Point(aBulletArea.Left()*nStretchX/100,
                                        aBulletArea.Top()),
@@ -983,7 +983,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
             {
                 Font aBulletFont( ImpCalcBulletFont( nPara ) );
                 // Use baseline
-                BOOL bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
+                sal_Bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
                 aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
                 Font aOldFont = pOutDev->GetFont();
                 pOutDev->SetFont( aBulletFont );
@@ -1028,7 +1028,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
                 }
 
                 // VCL will take care of brackets and so on...
-                ULONG nLayoutMode = pOutDev->GetLayoutMode();
+                sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
                 nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
                 if ( bRightToLeftPara )
                     nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
@@ -1136,11 +1136,11 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
     }
 }
 
-void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
+void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_uLong nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    long nLineHeight = (long)pEditEngine->GetLineHeight((USHORT)nPara );
+    long nLineHeight = (long)pEditEngine->GetLineHeight((sal_uInt16)nPara );
     for ( size_t i = 0, n = aViewList.size(); i < n; ++i )
     {
         OutlinerView* pView = aViewList[ i ];
@@ -1155,26 +1155,26 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
     }
 }
 
-ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong Outliner::Read( SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bOldUndo = pEditEngine->IsUndoEnabled();
-    EnableUndo( FALSE );
+    sal_Bool bOldUndo = pEditEngine->IsUndoEnabled();
+    EnableUndo( sal_False );
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
     Clear();
 
-    ImplBlockInsertionCallbacks( TRUE );
-    ULONG nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
+    ImplBlockInsertionCallbacks( sal_True );
+    sal_uLong nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
 
-    bFirstParaIsEmpty = FALSE;
+    bFirstParaIsEmpty = sal_False;
 
-    USHORT nParas = pEditEngine->GetParagraphCount();
-     pParaList->Clear( TRUE );
-    USHORT n;
+    sal_uInt16 nParas = pEditEngine->GetParagraphCount();
+     pParaList->Clear( sal_True );
+    sal_uInt16 n;
     for ( n = 0; n < nParas; n++ )
     {
         Paragraph* pPara = new Paragraph( 0 );
@@ -1185,7 +1185,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
             const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
             sal_Int16 nDepth = rLevel.GetValue();
-            ImplInitDepth( n, nDepth, FALSE );
+            ImplInitDepth( n, nDepth, sal_False );
         }
     }
 
@@ -1194,7 +1194,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
         ImpFilterIndents( 0, nParas-1 );
     }
 
-    ImplBlockInsertionCallbacks( FALSE );
+    ImplBlockInsertionCallbacks( sal_False );
     pEditEngine->SetUpdateMode( bUpdate );
     EnableUndo( bOldUndo );
 
@@ -1202,15 +1202,15 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
 }
 
 
-void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
+void Outliner::ImpFilterIndents( sal_uLong nFirstPara, sal_uLong nLastPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
     Paragraph* pLastConverted = NULL;
-    for( ULONG nPara = nFirstPara; nPara <= nLastPara; nPara++ )
+    for( sal_uLong nPara = nFirstPara; nPara <= nLastPara; nPara++ )
     {
         Paragraph* pPara = pParaList->GetParagraph( nPara );
                 if (pPara)
@@ -1225,27 +1225,27 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
                             pPara->SetDepth( pLastConverted->GetDepth() );
                     }
 
-                    ImplInitDepth( (USHORT)nPara, pPara->GetDepth(), FALSE );
+                    ImplInitDepth( (sal_uInt16)nPara, pPara->GetDepth(), sal_False );
         }
     }
 
     pEditEngine->SetUpdateMode( bUpdate );
 }
 
-SfxUndoManager&	Outliner::GetUndoManager()
+::svl::IUndoManager& Outliner::GetUndoManager()
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetUndoManager();
 }
 
-void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
+void Outliner::ImpTextPasted( sal_uLong nStartPara, sal_uInt16 nCount )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    BOOL bUpdate = pEditEngine->GetUpdateMode();
-    pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+    pEditEngine->SetUpdateMode( sal_False );
 
-    const ULONG nStart = nStartPara;
+    const sal_uLong nStart = nStartPara;
 
     Paragraph* pPara = pParaList->GetParagraph( nStartPara );
 
@@ -1270,14 +1270,14 @@ void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
         else // EditEngine mode
         {
             sal_Int16 nDepth = -1;
-            const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (USHORT)nStartPara );
+            const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nStartPara );
             if ( rAttrs.GetItemState( EE_PARA_OUTLLEVEL ) == SFX_ITEM_ON )
             {
                 const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
                 nDepth = rLevel.GetValue();
             }
             if ( nDepth != GetDepth( nStartPara ) )
-                ImplInitDepth( (USHORT)nStartPara, nDepth, FALSE );
+                ImplInitDepth( (sal_uInt16)nStartPara, nDepth, sal_False );
         }
 
         nCount--;
@@ -1298,7 +1298,7 @@ long Outliner::IndentingPagesHdl( OutlinerView* pView )
     return aIndentingPagesHdl.Call( pView );
 }
 
-BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
 {
     DBG_CHKTHIS(Outliner,0);
     // The selected pages must already be set in advance through 
@@ -1309,32 +1309,32 @@ BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
     if ( ( mnFirstSelPage == 0 ) && ( ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) )
     {
         if ( nDepthChangedHdlPrevDepth == 1 )	// is the only page
-            return FALSE;
+            return sal_False;
         else
-            pCurView->ImpCalcSelectedPages( FALSE );  // without the first
+            pCurView->ImpCalcSelectedPages( sal_False );  // without the first
     }
-    return (BOOL)IndentingPagesHdl( pCurView );
+    return (sal_Bool)IndentingPagesHdl( pCurView );
 }
 
 
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
 {
     DBG_CHKTHIS(Outliner,0);
     // The selected pages must already be set in advance through 
     // ImpCalcSelectedPages 
-    return (BOOL)RemovingPagesHdl( pCurView );
+    return (sal_Bool)RemovingPagesHdl( pCurView );
 }
 
-Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
+Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode )
 : nMinDepth( -1 )
 {
     DBG_CTOR( Outliner, 0 );
 
-    bStrippingPortions 	= FALSE;
-    bPasting			= FALSE;
+    bStrippingPortions 	= sal_False;
+    bPasting			= sal_False;
 
     nFirstPage			= 1;
-    bBlockInsCallback	= FALSE;
+    bBlockInsCallback	= sal_False;
 
     nMaxDepth			= 9;
 
@@ -1342,7 +1342,7 @@ Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
     pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) );
     Paragraph* pPara = new Paragraph( 0 );
     pParaList->Append(pPara);
-    bFirstParaIsEmpty = TRUE;
+    bFirstParaIsEmpty = sal_True;
 
     pEditEngine = new OutlinerEditEng( this, pPool );
     pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, BeginMovingParagraphsHdl ) );
@@ -1357,7 +1357,7 @@ Outliner::~Outliner()
 {
     DBG_DTOR(Outliner,0);
 
-    pParaList->Clear( TRUE );
+    pParaList->Clear( sal_True );
     delete pParaList;
     delete pEditEngine;
 }
@@ -1378,7 +1378,7 @@ size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex )
         advance( it, nIndex );
         ActualIndex = nIndex;
     }
-    pEditEngine->InsertView(  pView->pEditView, (USHORT)nIndex );
+    pEditEngine->InsertView(  pView->pEditView, (sal_uInt16)nIndex );
     return ActualIndex;
 }
 
@@ -1403,10 +1403,10 @@ OutlinerView* Outliner::RemoveView( size_t nIndex )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    EditView* pEditView = pEditEngine->GetView( (USHORT)nIndex );
+    EditView* pEditView = pEditEngine->GetView( (sal_uInt16)nIndex );
     pEditView->HideCursor(); // HACK
 
-    pEditEngine->RemoveView( (USHORT)nIndex );
+    pEditEngine->RemoveView( (sal_uInt16)nIndex );
 
     {
         ViewList::iterator it = aViewList.begin();
@@ -1454,37 +1454,37 @@ void Outliner::DepthChangedHdl()
 }
 
 
-ULONG Outliner::GetAbsPos( Paragraph* pPara )
+sal_uLong Outliner::GetAbsPos( Paragraph* pPara )
 {
     DBG_CHKTHIS(Outliner,0);
     DBG_ASSERT(pPara,"GetAbsPos:No Para");
     return pParaList->GetAbsPos( pPara );
 }
 
-ULONG Outliner::GetParagraphCount() const
+sal_uLong Outliner::GetParagraphCount() const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraphCount();
 }
 
-Paragraph* Outliner::GetParagraph( ULONG nAbsPos ) const
+Paragraph* Outliner::GetParagraph( sal_uLong nAbsPos ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->GetParagraph( nAbsPos );
 }
 
-BOOL Outliner::HasChilds( Paragraph* pParagraph ) const
+sal_Bool Outliner::HasChilds( Paragraph* pParagraph ) const
 {
     DBG_CHKTHIS(Outliner,0);
     return pParaList->HasChilds( pParagraph );
 }
 
-BOOL Outliner::ImplHasBullet( USHORT nPara ) const
+sal_Bool Outliner::ImplHasBullet( sal_uInt16 nPara ) const
 {
     return GetNumberFormat(nPara) != 0;
 }
 
-const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* Outliner::GetNumberFormat( sal_uInt16 nPara ) const
 {
     const SvxNumberFormat* pFmt = NULL;
 
@@ -1504,7 +1504,7 @@ const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
     return pFmt;
 }
 
-Size Outliner::ImplGetBulletSize( USHORT nPara )
+Size Outliner::ImplGetBulletSize( sal_uInt16 nPara )
 {
     Paragraph* pPara = pParaList->GetParagraph( nPara );
         if (!pPara)
@@ -1539,19 +1539,19 @@ Size Outliner::ImplGetBulletSize( USHORT nPara )
     return pPara->aBulSize;
 }
 
-void Outliner::ImplCheckParagraphs( USHORT nStart, USHORT nEnd )
+void Outliner::ImplCheckParagraphs( sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     DBG_CHKTHIS( Outliner, 0 );
 
     // i100014#
     // assure that the following for-loop does not loop forever
-    for ( USHORT n = nStart; n < nEnd; n++ )
+    for ( sal_uInt16 n = nStart; n < nEnd; n++ )
     {
         Paragraph* pPara = pParaList->GetParagraph( n );
         if (pPara)
         {
             pPara->Invalidate();
-            ImplCalcBulletText( n, FALSE, FALSE );
+            ImplCalcBulletText( n, sal_False, sal_False );
         }
     }
 }
@@ -1560,14 +1560,14 @@ void Outliner::SetRefDevice( OutputDevice* pRefDev )
 {
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->SetRefDevice( pRefDev );
-    for ( USHORT n = (USHORT) pParaList->GetParagraphCount(); n; )
+    for ( sal_uInt16 n = (sal_uInt16) pParaList->GetParagraphCount(); n; )
     {
         Paragraph* pPara = pParaList->GetParagraph( --n );
         pPara->Invalidate();
     }
 }
 
-void Outliner::ParaAttribsChanged( USHORT nPara )
+void Outliner::ParaAttribsChanged( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
@@ -1584,7 +1584,7 @@ void Outliner::ParaAttribsChanged( USHORT nPara )
             if ( pPara && pPara->GetDepth() != rLevel.GetValue() )
             {
                 pPara->SetDepth( rLevel.GetValue() );
-                ImplCalcBulletText( nPara, TRUE, TRUE );
+                ImplCalcBulletText( nPara, sal_True, sal_True );
             }
         }
     }
@@ -1598,13 +1598,13 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
     // Here all the paragraphs, which had the said template, used to be
     // hunted by a ImpRecalcParaAttribs, why? 
     // => only the Bullet-representation can really change...
-    USHORT nParas = (USHORT)pParaList->GetParagraphCount();
-    for( USHORT nPara = 0; nPara < nParas; nPara++ )
+    sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+    for( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
     {
         if ( pEditEngine->GetStyleSheet( nPara ) == pStyle )
         {
             ImplCheckNumBulletItem( nPara );
-            ImplCalcBulletText( nPara, FALSE, FALSE );
+            ImplCalcBulletText( nPara, sal_False, sal_False );
             // EditEngine formats changed paragraphs before calling this method,
             // so they are not reformatted now and use wrong bullet indent
             pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) );
@@ -1612,7 +1612,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
     }
 }
 
-Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos )
+Rectangle Outliner::ImpCalcBulletArea( sal_uInt16 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos )
 {
     // Bullet area within the paragraph ...
     Rectangle aBulletArea;
@@ -1623,7 +1623,7 @@ Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnP
         Point aTopLeft;
         Size aBulletSize( ImplGetBulletSize( nPara ) );
 
-        BOOL bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
+        sal_Bool bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
 
         // the ODF attribut text:space-before which holds the spacing to add to the left of the label
         const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
@@ -1720,7 +1720,7 @@ void Outliner::ExpandHdl()
     aExpandHdl.Call( this );
 }
 
-EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
+EBulletInfo Outliner::GetBulletInfo( sal_uInt16 nPara )
 {
     EBulletInfo aInfo;
 
@@ -1747,53 +1747,53 @@ EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
 
     if ( aInfo.bVisible )
     {
-        aInfo.aBounds = ImpCalcBulletArea( nPara, TRUE, TRUE );
+        aInfo.aBounds = ImpCalcBulletArea( nPara, sal_True, sal_True );
     }
 
     return aInfo;
 }
 
-XubString Outliner::GetText( Paragraph* pParagraph, ULONG nCount ) const
+XubString Outliner::GetText( Paragraph* pParagraph, sal_uLong nCount ) const
 {
     DBG_CHKTHIS(Outliner,0);
 
     XubString aText;
-    USHORT nStartPara = (USHORT) pParaList->GetAbsPos( pParagraph );
-    for ( USHORT n = 0; n < nCount; n++ )
+    sal_uInt16 nStartPara = (sal_uInt16) pParaList->GetAbsPos( pParagraph );
+    for ( sal_uInt16 n = 0; n < nCount; n++ )
     {
         aText += pEditEngine->GetText( nStartPara + n );
-        if ( (n+1) < (USHORT)nCount )
+        if ( (n+1) < (sal_uInt16)nCount )
             aText += '\n';
     }
     return aText;
 }
 
-void Outliner::Remove( Paragraph* pPara, ULONG nParaCount )
+void Outliner::Remove( Paragraph* pPara, sal_uLong nParaCount )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    ULONG nPos = pParaList->GetAbsPos( pPara );
+    sal_uLong nPos = pParaList->GetAbsPos( pPara );
     if( !nPos && ( nParaCount >= pParaList->GetParagraphCount() ) )
     {
         Clear();
     }
     else
     {
-        for( USHORT n = 0; n < (USHORT)nParaCount; n++ )
-            pEditEngine->RemoveParagraph( (USHORT) nPos );
+        for( sal_uInt16 n = 0; n < (sal_uInt16)nParaCount; n++ )
+            pEditEngine->RemoveParagraph( (sal_uInt16) nPos );
     }
 }
 
 void Outliner::StripPortions()
 {
     DBG_CHKTHIS(Outliner,0);
-    bStrippingPortions = TRUE;
+    bStrippingPortions = sal_True;
     pEditEngine->StripPortions();
-    bStrippingPortions = FALSE;
+    bStrippingPortions = sal_False;
 }
 
-void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
-    USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
+    sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
     const EEngineData::WrongSpellVector* pWrongSpellVector,
     const SvxFieldData* pFieldData,
     bool bEndOfLine,
@@ -1830,20 +1830,20 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rC
 long Outliner::RemovingPagesHdl( OutlinerView* pView )
 {
     DBG_CHKTHIS(Outliner,0);
-    return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : TRUE;
+    return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True;
 }
 
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT _nFirstPage, USHORT nPages )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_uInt16 _nFirstPage, sal_uInt16 nPages )
 {
     DBG_CHKTHIS(Outliner,0);
 
     nDepthChangedHdlPrevDepth = nPages;
     mnFirstSelPage = _nFirstPage;
     pHdlParagraph = 0;
-    return (BOOL)RemovingPagesHdl( pCurView );
+    return (sal_Bool)RemovingPagesHdl( pCurView );
 }
 
-SfxItemSet Outliner::GetParaAttribs( USHORT nPara )
+SfxItemSet Outliner::GetParaAttribs( sal_uInt16 nPara )
 {
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->GetParaAttribs( nPara );
@@ -1853,8 +1853,8 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
 {
     DBG_CHKTHIS(Outliner,0);
 
-    ULONG nPara = pParaList->GetAbsPos( pPara );
-    pEditEngine->ShowParagraph( (USHORT)nPara, pPara->IsVisible() );
+    sal_uLong nPara = pParaList->GetAbsPos( pPara );
+    pEditEngine->ShowParagraph( (sal_uInt16)nPara, pPara->IsVisible() );
 
     return 0;
 }
@@ -1878,7 +1878,7 @@ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
 
 IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
 {
-    bPasting = FALSE;
+    bPasting = sal_False;
     ImpTextPasted( pInfos->nStartPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
     maEndPasteOrDropHdl.Call( pInfos );
     UndoActionEnd( EDITUNDO_DRAGANDDROP );
@@ -1890,10 +1890,10 @@ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
     DBG_CHKTHIS(Outliner,0);
 
     pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
-    USHORT nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
-    USHORT nParas = (USHORT)pParaList->GetParagraphCount();
-    for ( USHORT n = nChangesStart; n < nParas; n++ )
-        ImplCalcBulletText( n, FALSE, FALSE );
+    sal_uInt16 nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
+    sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+    for ( sal_uInt16 n = nChangesStart; n < nParas; n++ )
+        ImplCalcBulletText( n, sal_False, sal_False );
 
     if( !IsInUndo() )
         aEndMovingHdl.Call( this );
@@ -1915,7 +1915,7 @@ static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat&
     return true;
 }
 
-sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt )
+sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt )
 {
     sal_uInt16 nNumber = pParaFmt->GetStart() - 1;
 
@@ -1963,12 +1963,12 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar
     return nNumber;
 }
 
-void Outliner::ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds )
+void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds )
 {
     DBG_CHKTHIS(Outliner,0);
 
     Paragraph* pPara = pParaList->GetParagraph( nPara );
-    USHORT nRelPos = 0xFFFF;
+    sal_uInt16 nRelPos = 0xFFFF;
 
     while ( pPara )
     {
@@ -2022,12 +2022,12 @@ void Outliner::Clear()
 
     if( !bFirstParaIsEmpty )
     {
-        ImplBlockInsertionCallbacks( TRUE );
+        ImplBlockInsertionCallbacks( sal_True );
         pEditEngine->Clear();
-        pParaList->Clear( TRUE );
+        pParaList->Clear( sal_True );
         pParaList->Append( new Paragraph( nMinDepth ));
-        bFirstParaIsEmpty = TRUE;
-        ImplBlockInsertionCallbacks( FALSE );
+        bFirstParaIsEmpty = sal_True;
+        ImplBlockInsertionCallbacks( sal_False );
     }
     else
     {
@@ -2037,20 +2037,20 @@ void Outliner::Clear()
     }
 }
 
-void Outliner::SetFlatMode( BOOL bFlat )
+void Outliner::SetFlatMode( sal_Bool bFlat )
 {
     DBG_CHKTHIS(Outliner,0);
 
     if( bFlat != pEditEngine->IsFlatMode() )
     {
-        for ( USHORT nPara = (USHORT)pParaList->GetParagraphCount(); nPara; )
+        for ( sal_uInt16 nPara = (sal_uInt16)pParaList->GetParagraphCount(); nPara; )
             pParaList->GetParagraph( --nPara )->aBulSize.Width() = -1;
 
         pEditEngine->SetFlatMode( bFlat );
     }
 }
 
-String Outliner::ImplGetBulletText( USHORT nPara )
+String Outliner::ImplGetBulletText( sal_uInt16 nPara )
 {
         String aRes;
     Paragraph* pPara = pParaList->GetParagraph( nPara );
@@ -2058,14 +2058,14 @@ String Outliner::ImplGetBulletText( USHORT nPara )
         {
     // Enable optimization again ...
 //	if( pPara->nFlags & PARAFLAG_SETBULLETTEXT )
-        ImplCalcBulletText( nPara, FALSE, FALSE );
+        ImplCalcBulletText( nPara, sal_False, sal_False );
                 aRes = pPara->GetText();
         }
     return aRes;
 }
 
 // this is needed for StarOffice Api
-void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
+void Outliner::SetLevelDependendStyleSheet( sal_uInt16 nPara )
 {
     SfxItemSet aOldAttrs( pEditEngine->GetParaAttribs( nPara ) );
     ImplSetLevelDependendStyleSheet( nPara );
@@ -2074,7 +2074,7 @@ void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
 
 SV_IMPL_PTRARR( NotifyList, EENotifyPtr );
 
-void Outliner::ImplBlockInsertionCallbacks( BOOL b )
+void Outliner::ImplBlockInsertionCallbacks( sal_Bool b )
 {
     if ( b )
     {
@@ -2187,7 +2187,7 @@ sal_Bool DrawPortionInfo::IsRTL() const
         nError = U_ZERO_ERROR;
 
         // I do not have this info here. Is it necessary? I'll have to ask MT.
-        const BYTE nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
+        const sal_uInt8 nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
 
         ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError);	// UChar != sal_Unicode in MinGW
         nError = U_ZERO_ERROR;
diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src
index e7e557e040..e7e557e040 100644..100755
--- a/editeng/source/outliner/outliner.src
+++ b/editeng/source/outliner/outliner.src
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 2412dd2af9..2412dd2af9 100644..100755
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index ca7b4e941d..933b6a9c7e 100644..100755
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -42,7 +42,7 @@
 #include <outlundo.hxx>
 
 
-OutlinerUndoBase::OutlinerUndoBase( USHORT _nId, Outliner* pOutliner )
+OutlinerUndoBase::OutlinerUndoBase( sal_uInt16 _nId, Outliner* pOutliner )
     : EditUndo( _nId, NULL )
 {
     DBG_ASSERT( pOutliner, "Undo: Outliner?!" );
@@ -112,7 +112,7 @@ void OutlinerUndoChangeParaNumberingRestart::ImplApplyData( const ParaRestartDat
     pOutliner->SetParaIsNumberingRestart( mnPara, rData.mbParaIsNumberingRestart );
 }
 
-OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
+OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
     : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
 {
     mnPara = nPara;
@@ -122,12 +122,12 @@ OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nP
 
 void OutlinerUndoChangeDepth::Undo()
 {
-    GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, FALSE );
+    GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, sal_False );
 }
 
 void OutlinerUndoChangeDepth::Redo()
 {
-    GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, FALSE );
+    GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, sal_False );
 }
 
 void OutlinerUndoChangeDepth::Repeat()
@@ -136,7 +136,7 @@ void OutlinerUndoChangeDepth::Repeat()
 }
 
 
-OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara )
+OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara )
     : OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
 {
     mnPara = nPara;
@@ -146,14 +146,14 @@ void OutlinerUndoCheckPara::Undo()
 {
     Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
     pPara->Invalidate();
-    GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+    GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
 }
 
 void OutlinerUndoCheckPara::Redo()
 {
     Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
     pPara->Invalidate();
-    GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+    GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
 }
 
 void OutlinerUndoCheckPara::Repeat()
@@ -163,7 +163,7 @@ void OutlinerUndoCheckPara::Repeat()
 
 DBG_NAME(OLUndoExpand);
 
-OLUndoExpand::OLUndoExpand(Outliner* pOut, USHORT _nId )
+OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
     : EditUndo( _nId, 0 )
 {
     DBG_CTOR(OLUndoExpand,0);
@@ -181,20 +181,20 @@ OLUndoExpand::~OLUndoExpand()
 }
 
 
-void OLUndoExpand::Restore( BOOL bUndo )
+void OLUndoExpand::Restore( sal_Bool bUndo )
 {
     DBG_CHKTHIS(OLUndoExpand,0);
     DBG_ASSERT(pOutliner,"Undo:No Outliner");
     DBG_ASSERT(pOutliner->pEditEngine,"Outliner already deleted");
     Paragraph* pPara;
 
-    BOOL bExpand = FALSE;
-    USHORT _nId = GetId();
+    sal_Bool bExpand = sal_False;
+    sal_uInt16 _nId = GetId();
     if((_nId == OLUNDO_EXPAND && !bUndo) || (_nId == OLUNDO_COLLAPSE && bUndo))
-        bExpand = TRUE;
+        bExpand = sal_True;
     if( !pParas )
     {
-        pPara = pOutliner->GetParagraph( (ULONG)nCount );
+        pPara = pOutliner->GetParagraph( (sal_uLong)nCount );
         if( bExpand )
             pOutliner->Expand( pPara );
         else
@@ -202,9 +202,9 @@ void OLUndoExpand::Restore( BOOL bUndo )
     }
     else
     {
-        for( USHORT nIdx = 0; nIdx < nCount; nIdx++ )
+        for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ )
         {
-            pPara = pOutliner->GetParagraph( (ULONG)(pParas[nIdx]) );
+            pPara = pOutliner->GetParagraph( (sal_uLong)(pParas[nIdx]) );
             if( bExpand )
                 pOutliner->Expand( pPara );
             else
@@ -217,14 +217,14 @@ void OLUndoExpand::Restore( BOOL bUndo )
 void OLUndoExpand::Undo()
 {
     DBG_CHKTHIS(OLUndoExpand,0);
-    Restore( TRUE );
+    Restore( sal_True );
 }
 
 
 void OLUndoExpand::Redo()
 {
     DBG_CHKTHIS(OLUndoExpand,0);
-    Restore( FALSE );
+    Restore( sal_False );
 }
 
 
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 3fe9f92be6..fcdce80be4 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -39,7 +39,7 @@ private:
     Outliner*	mpOutliner;
 
 public:
-                OutlinerUndoBase( USHORT nId, Outliner* pOutliner );
+                OutlinerUndoBase( sal_uInt16 nId, Outliner* pOutliner );
 
     Outliner*	GetOutliner() const { return mpOutliner; }
 };
@@ -88,12 +88,12 @@ class OutlinerUndoChangeDepth : public OutlinerUndoBase
 {
     using SfxUndoAction::Repeat;
 private:
-    USHORT 			mnPara;
+    sal_uInt16 			mnPara;
     sal_Int16		mnOldDepth;
     sal_Int16		mnNewDepth;
 
 public:
-                    OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
+                    OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
 
     virtual void	Undo();
     virtual void	Redo();
@@ -107,10 +107,10 @@ class OutlinerUndoCheckPara : public OutlinerUndoBase
 {
     using SfxUndoAction::Repeat;
 private:
-    USHORT 			mnPara;
+    sal_uInt16 			mnPara;
 
 public:
-                    OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara );
+                    OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara );
 
     virtual void	Undo();
     virtual void	Redo();
@@ -125,17 +125,17 @@ public:
 class OLUndoExpand : public EditUndo
 {
     using SfxUndoAction::Repeat;
-    void Restore( BOOL bUndo );
+    void Restore( sal_Bool bUndo );
 public:
-    OLUndoExpand( Outliner* pOut, USHORT nId );
+    OLUndoExpand( Outliner* pOut, sal_uInt16 nId );
     ~OLUndoExpand();
     virtual void Undo();
     virtual void Redo();
     virtual void Repeat();
 
-    USHORT* pParas;  // 0 == nCount contains paragraph number
+    sal_uInt16* pParas;  // 0 == nCount contains paragraph number
     Outliner* pOutliner;
-    USHORT nCount;
+    sal_uInt16 nCount;
 };
 
 #endif
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e07952f992..217888fc06 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -76,8 +76,8 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
     DBG_CTOR( OutlinerView, 0 );
 
     pOwner						= pOut;
-    bDDCursorVisible			= FALSE;
-    bInDragMode 				= FALSE;
+    bDDCursorVisible			= sal_False;
+    bInDragMode 				= sal_False;
     nDDScrollLRBorderWidthWin 	= 0;
     nDDScrollTBBorderWidthWin 	= 0;
     pHorTabArrDoc				= 0;
@@ -104,7 +104,7 @@ void OutlinerView::Paint( const Rectangle& rRect )
     pEditView->Paint( rRect );
 }
 
-BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
+sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
@@ -114,18 +114,18 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
         pOwner->Insert( String() );
 
 
-    BOOL bKeyProcessed = FALSE;
+    sal_Bool bKeyProcessed = sal_False;
     ESelection aSel( pEditView->GetSelection() );
-    BOOL bSelection = aSel.HasRange();
+    sal_Bool bSelection = aSel.HasRange();
     KeyCode aKeyCode = rKEvt.GetKeyCode();
     KeyFuncType eFunc = aKeyCode.GetFunction();
-    USHORT nCode = aKeyCode.GetCode();
-    BOOL bReadOnly = IsReadOnly();
+    sal_uInt16 nCode = aKeyCode.GetCode();
+    sal_Bool bReadOnly = IsReadOnly();
 
     if( bSelection && ( nCode != KEY_TAB ) && EditEngine::DoesKeyChangeText( rKEvt ) )
     {
-        if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
-            return TRUE;
+        if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+            return sal_True;
     }
 
     if ( eFunc != KEYFUNC_DONTKNOW )
@@ -137,14 +137,14 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                 if ( !bReadOnly )
                 {
                     Cut();
-                    bKeyProcessed = TRUE;
+                    bKeyProcessed = sal_True;
                 }
             }
             break;
             case KEYFUNC_COPY:
             {
                 Copy();
-                bKeyProcessed = TRUE;
+                bKeyProcessed = sal_True;
             }
             break;
             case KEYFUNC_PASTE:
@@ -152,7 +152,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                 if ( !bReadOnly )
                 {
                     PasteSpecial();
-                    bKeyProcessed = TRUE;
+                    bKeyProcessed = sal_True;
                 }
             }
             break;
@@ -166,7 +166,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                         if( pNext && pNext->HasFlag(PARAFLAG_ISPAGE) )
                         {
                             if( !pOwner->ImpCanDeleteSelectedPages( this, aSel.nEndPara, 1 ) )
-                                return FALSE;
+                                return sal_False;
                         }
                     }
                 }
@@ -189,13 +189,13 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                          ( bSelection || !aSel.nStartPos ) )
                     {
                         Indent( aKeyCode.IsShift() ? (-1) : (+1) );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                     else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) &&
                               !bSelection && !aSel.nEndPos && pOwner->ImplHasBullet( aSel.nEndPara ) )
                     {
                         Indent( aKeyCode.IsShift() ? (-1) : (+1) );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                 }
             }
@@ -207,11 +207,11 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                     Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara );
                     Paragraph* pPrev = pOwner->pParaList->GetParagraph( aSel.nEndPara-1 );
                     if( !pPrev->IsVisible()  )
-                        return TRUE;
+                        return sal_True;
                     if( !pPara->GetDepth() )
                     {
                         if(!pOwner->ImpCanDeleteSelectedPages(this, aSel.nEndPara , 1 ) )
-                            return TRUE;
+                            return sal_True;
                     }
                 }
             }
@@ -230,20 +230,20 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                         if( !bSelection &&
                                 aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) )
                         {
-                            ULONG nChilds =	pOwner->pParaList->GetChildCount(pPara);
+                            sal_uLong nChilds =	pOwner->pParaList->GetChildCount(pPara);
                             if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara))
                             {
                                 pOwner->UndoActionStart( OLUNDO_INSERT );
-                                ULONG nTemp = aSel.nEndPara;
+                                sal_uLong nTemp = aSel.nEndPara;
                                 nTemp += nChilds;
                                 nTemp++; // insert above next Non-Child
                                 pOwner->Insert( String(),nTemp,pPara->GetDepth());
                                 // Position the cursor 
-                                ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+                                ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
                                 pEditView->SetSelection( aTmpSel );
-                                pEditView->ShowCursor( TRUE, TRUE );
+                                pEditView->ShowCursor( sal_True, sal_True );
                                 pOwner->UndoActionEnd( OLUNDO_INSERT );
-                                bKeyProcessed = TRUE;
+                                bKeyProcessed = sal_True;
                             }
                         }
                     }
@@ -252,16 +252,16 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
                             ( aSel.nEndPos == pOwner->pEditEngine->GetTextLen(aSel.nEndPara) ) )
                     {
                         pOwner->UndoActionStart( OLUNDO_INSERT );
-                        ULONG nTemp = aSel.nEndPara;
+                        sal_uLong nTemp = aSel.nEndPara;
                         nTemp++;
                         pOwner->Insert( String(), nTemp, pPara->GetDepth()+1 );
 
                         // Position the cursor
-                        ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+                        ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
                         pEditView->SetSelection( aTmpSel );
-                        pEditView->ShowCursor( TRUE, TRUE );
+                        pEditView->ShowCursor( sal_True, sal_True );
                         pOwner->UndoActionEnd( OLUNDO_INSERT );
-                        bKeyProcessed = TRUE;
+                        bKeyProcessed = sal_True;
                     }
                 }
             }
@@ -269,14 +269,18 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
         }
     }
 
+<<<<<<< HEAD
     return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin );
+=======
+    return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt );
+>>>>>>> ooo/DEV300_m101
 }
 
 
-ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
+sal_uLong OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nPara = EE_PARA_NOT_FOUND;
+    sal_uLong nPara = EE_PARA_NOT_FOUND;
 
     Point aMousePosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
@@ -295,7 +299,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
         aPaperPos.Y() -= aOutArea.Top();
         aPaperPos.Y() += aVisArea.Top();
 
-        BOOL bBullet;
+        sal_Bool bBullet;
         if ( pOwner->IsTextPos( aPaperPos, 0, &bBullet ) )
         {
             Point aDocPos = pOwner->GetDocPos( aPaperPos );
@@ -317,7 +321,11 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
     return nPara;
 }
 
+<<<<<<< HEAD
 BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
+=======
+sal_Bool __EXPORT OutlinerView::MouseMove( const MouseEvent& rMEvt )
+>>>>>>> ooo/DEV300_m101
 {
     DBG_CHKTHIS(OutlinerView,0);
 
@@ -326,7 +334,7 @@ BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
@@ -334,7 +342,11 @@ BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
 }
 
 
+<<<<<<< HEAD
 BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
+=======
+sal_Bool __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
+>>>>>>> ooo/DEV300_m101
 {
     DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -342,24 +354,29 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
 
     MouseTarget eTarget;
-    ULONG nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
+    sal_uLong nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
     if ( eTarget == MouseBullet )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-        BOOL bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
+        sal_Bool bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
         if( rMEvt.GetClicks() == 1 )
         {
-            ULONG nEndPara = nPara;
+            sal_uLong nEndPara = nPara;
             if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) )
                 nEndPara += pOwner->pParaList->GetChildCount( pPara );
+<<<<<<< HEAD
             // The selection is inverted, so that EditEngine does not scroll 
             ESelection aSel((USHORT)nEndPara, 0xffff,(USHORT)nPara, 0 );
+=======
+            // umgekehrt rum selektieren, damit EditEngine nicht scrollt
+            ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 );
+>>>>>>> ooo/DEV300_m101
             pEditView->SetSelection( aSel );
         }
         else if( rMEvt.GetClicks() == 2 && bHasChilds )
@@ -367,7 +384,7 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 
         aDDStartPosPix = rMEvt.GetPosPixel();
         aDDStartPosRef=pEditView->GetWindow()->PixelToLogic( aDDStartPosPix,pOwner->GetRefMapMode());
-        return TRUE;
+        return sal_True;
     }
 
     // special case for outliner view in impress, check if double click hits the page icon for toggle
@@ -385,7 +402,11 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
 }
 
 
+<<<<<<< HEAD
 BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
+=======
+sal_Bool __EXPORT OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
+>>>>>>> ooo/DEV300_m101
 {
     DBG_CHKTHIS(OutlinerView,0);
     if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -393,7 +414,7 @@ BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
 
     Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
     if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
-        return FALSE;
+        return sal_False;
 
     Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
     pEditView->GetWindow()->SetPointer( aPointer );
@@ -406,7 +427,7 @@ void OutlinerView::ImpHideDDCursor()
     DBG_CHKTHIS(OutlinerView,0);
     if ( bDDCursorVisible )
     {
-        bDDCursorVisible = FALSE;
+        bDDCursorVisible = sal_False;
         ImpPaintDDCursor();
     }
 }
@@ -416,7 +437,7 @@ void OutlinerView::ImpShowDDCursor()
     DBG_CHKTHIS(OutlinerView,0);
     if ( !bDDCursorVisible )
     {
-        bDDCursorVisible = TRUE;
+        bDDCursorVisible = sal_True;
         ImpPaintDDCursor();
     }
 }
@@ -445,16 +466,16 @@ void OutlinerView::ImpPaintDDCursor()
     }
     else
     {
-        ULONG nPara = nDDCurPara;
+        sal_uLong nPara = nDDCurPara;
         if ( nDDCurPara == LIST_APPEND )
         {
             Paragraph* pTemp = pOwner->pParaList->LastVisible();
             nPara = pOwner->pParaList->GetAbsPos( pTemp );
         }
-        aStartPointWin = pEditView->GetWindowPosTopLeft((USHORT) nPara );
+        aStartPointWin = pEditView->GetWindowPosTopLeft((sal_uInt16) nPara );
         if ( nDDCurPara == LIST_APPEND )
         {
-            long nHeight = pOwner->pEditEngine->GetTextHeight((USHORT)nPara );
+            long nHeight = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nPara );
             aStartPointWin.Y() += nHeight;
         }
         aStartPointWin.X() = aOutputArWin.Left();
@@ -469,10 +490,10 @@ void OutlinerView::ImpPaintDDCursor()
 
 // Calculates above which paragraph must it must be inserted
 
-ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
+sal_uLong OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nCurPara = pEditView->GetParagraph( rPosPixel );
+    sal_uLong nCurPara = pEditView->GetParagraph( rPosPixel );
     ParagraphList* pParaList = pOwner->pParaList;
 
     if ( nCurPara == EE_PARA_NOT_FOUND )
@@ -480,8 +501,8 @@ ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel  )
     else
     {
         Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPixel );
-        Point aParaPosWin = pEditView->GetWindowPosTopLeft((USHORT)nCurPara);
-        long nHeightRef = pOwner->pEditEngine->GetTextHeight((USHORT)nCurPara);
+        Point aParaPosWin = pEditView->GetWindowPosTopLeft((sal_uInt16)nCurPara);
+        long nHeightRef = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nCurPara);
         long nParaYOffs = aPosWin.Y() - aParaPosWin.Y();
 
         if ( nParaYOffs > nHeightRef / 2  )
@@ -499,7 +520,7 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    USHORT nPara = (USHORT) pOwner->pParaList->GetAbsPos( pPara );
+    sal_uInt16 nPara = (sal_uInt16) pOwner->pParaList->GetAbsPos( pPara );
     pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
     ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChilds( pPara ) );
     pEditView->ShowCursor();
@@ -515,21 +536,21 @@ void OutlinerView::SetOutliner( Outliner* pOutliner )
 
 
 
-ULONG OutlinerView::Select( Paragraph* pParagraph, BOOL bSelect,
-    BOOL bWithChilds )
+sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
+    sal_Bool bWithChilds )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    ULONG nPara = pOwner->pParaList->GetAbsPos( pParagraph );
-    USHORT nEnd = 0;
+    sal_uLong nPara = pOwner->pParaList->GetAbsPos( pParagraph );
+    sal_uInt16 nEnd = 0;
     if ( bSelect )
         nEnd = 0xffff;
 
-    ULONG nChildCount = 0;
+    sal_uLong nChildCount = 0;
     if ( bWithChilds )
         nChildCount = pOwner->pParaList->GetChildCount( pParagraph );
 
-    ESelection aSel( (USHORT)nPara, 0,(USHORT)(nPara+nChildCount), nEnd );
+    ESelection aSel( (sal_uInt16)nPara, 0,(sal_uInt16)(nPara+nChildCount), nEnd );
     pEditView->SetSelection( aSel );
     return nChildCount+1;
 }
@@ -539,16 +560,17 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
-    BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
     if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
         pOwner->UndoActionStart( OLUNDO_ATTR );
 
-    ParaRange aSel = ImpGetSelectedParagraphs( FALSE );
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_False );
 
     pEditView->SetAttribs( rAttrs );
 
+<<<<<<< HEAD
     // Update Bullet text
     for( USHORT nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
@@ -556,6 +578,13 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
         // update following paras as well, numbering depends on
         // previous paras
         pOwner->ImplCalcBulletText( nPara, TRUE, FALSE );
+=======
+    // Bullet-Texte aktualisieren
+    for( sal_uInt16 nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    {
+        pOwner->ImplCheckNumBulletItem( nPara );
+        pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
+>>>>>>> ooo/DEV300_m101
 
         if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
             pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) );
@@ -567,7 +596,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
     pEditView->SetEditEngineUpdateMode( bUpdate );
 }
 
-ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
+ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
@@ -581,7 +610,7 @@ ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
         Paragraph* pLast = pOwner->pParaList->GetParagraph( aParas.nEndPara );
         if ( pOwner->pParaList->HasHiddenChilds( pLast ) )
             aParas.nEndPara =
-                sal::static_int_cast< USHORT >(
+                sal::static_int_cast< sal_uInt16 >(
                     aParas.nEndPara +
                     pOwner->pParaList->GetChildCount( pLast ) );
     }
@@ -598,22 +627,22 @@ void OutlinerView::Indent( short nDiff )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( TRUE ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
+    if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( sal_True ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
         return;
 
     const bool bOutlinerView = pOwner->pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER;
-    BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
-    BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+    sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
 
     if( bUndo )
         pOwner->UndoActionStart( OLUNDO_DEPTH );
 
     sal_Int16 nMinDepth = -1;	// Optimization: Not to recalculate to manny parargaphs when not really needed. 
 
-    ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
 
@@ -694,8 +723,8 @@ void OutlinerView::Indent( short nDiff )
             pOwner->mnDepthChangeHdlPrevFlags = pPara->nFlags;
             pOwner->pHdlParagraph = pPara;
 
-            pOwner->ImplInitDepth( nPara, nNewDepth, TRUE, FALSE );
-            pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+            pOwner->ImplInitDepth( nPara, nNewDepth, sal_True, sal_False );
+            pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
 
             if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
                 pOwner->ImplSetLevelDependendStyleSheet( nPara );
@@ -710,18 +739,29 @@ void OutlinerView::Indent( short nDiff )
         }
     }
 
+<<<<<<< HEAD
     USHORT nParas = (USHORT)pOwner->pParaList->GetParagraphCount();
     for ( USHORT n = aSel.nEndPara+1; n < nParas; n++ )
+=======
+    // MT 19.08.99: War mal fuer Optimierung (outliner.cxx#1.193),
+    // hat aber zu zuviel Wartungsaufwand / doppelten Funktionen gefuehrt
+    // und zu wenig gebracht:
+    // pOwner->ImpSetBulletTextsFrom( aSel.nStartPara+1, nMinDepth );
+    // Wird jetzt direkt in Schleife mit ImplCalcBulletText() erledigt.
+    // Jetzt fehlen nur noch die folgenden Ansaetze, die davon betroffen sind.
+    sal_uInt16 nParas = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
+    for ( sal_uInt16 n = aSel.nEndPara+1; n < nParas; n++ )
+>>>>>>> ooo/DEV300_m101
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( n );
         if ( pPara->GetDepth() < nMinDepth )
             break;
-        pOwner->ImplCalcBulletText( n, FALSE, FALSE );
+        pOwner->ImplCalcBulletText( n, sal_False, sal_False );
     }
 
     if ( bUpdate )
     {
-        pEditView->SetEditEngineUpdateMode( TRUE );
+        pEditView->SetEditEngineUpdateMode( sal_True );
         pEditView->ShowCursor();
     }
 
@@ -729,33 +769,33 @@ void OutlinerView::Indent( short nDiff )
         pOwner->UndoActionEnd( OLUNDO_DEPTH );
 }
 
-BOOL OutlinerView::AdjustHeight( long nDY )
+sal_Bool OutlinerView::AdjustHeight( long nDY )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->MoveParagraphs( nDY );
-    return TRUE;    // remove return value...
+    return sal_True;    // remove return value...
 }
 
-void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, BOOL bWithChilds)
+void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, sal_Bool bWithChilds)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
-    ULONG nEndPara = nStartPara;
+    sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+    sal_uLong nEndPara = nStartPara;
     if ( bWithChilds )
         nEndPara += pOwner->pParaList->GetChildCount( pPara );
-    ESelection aSel((USHORT)nStartPara, 0,(USHORT)nEndPara, 0xffff );
+    ESelection aSel((sal_uInt16)nStartPara, 0,(sal_uInt16)nEndPara, 0xffff );
     pEditView->SetSelection( aSel );
     AdjustDepth( nDX );
 }
 
-void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, BOOL bWithChilds )
+void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, sal_Bool bWithChilds )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
-    ULONG nEndPara = nStartPara;
+    sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+    sal_uLong nEndPara = nStartPara;
     if ( bWithChilds )
         nEndPara += pOwner->pParaList->GetChildCount( pPara );
-    ESelection aSel( (USHORT)nStartPara, 0, (USHORT)nEndPara, 0xffff );
+    ESelection aSel( (sal_uInt16)nStartPara, 0, (sal_uInt16)nEndPara, 0xffff );
     pEditView->SetSelection( aSel );
     AdjustHeight( nDY );
 }
@@ -896,47 +936,47 @@ void OutlinerView::ImpScrollUp()
 void OutlinerView::Expand()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
-    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, TRUE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_True );
 }
 
 
 void OutlinerView::Collapse()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
-    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, FALSE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+    ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_False );
 }
 
 
 void OutlinerView::ExpandAll()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
-    ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), TRUE );
+    ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_True );
 }
 
 
 void OutlinerView::CollapseAll()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), FALSE );
+    ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_False );
 }
 
-void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand )
+void OutlinerView::ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand )
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    BOOL bUpdate = pOwner->GetUpdateMode();
-    pOwner->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->GetUpdateMode();
+    pOwner->SetUpdateMode( sal_False );
 
-    BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+    sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
     if( bUndo )
         pOwner->UndoActionStart( bExpand ? OLUNDO_EXPAND : OLUNDO_COLLAPSE );
 
-    for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-        BOOL bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
+        sal_Bool bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
         if( bDone )
         {
             // The line under the paragraph should disappear ...
@@ -949,7 +989,7 @@ void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL
 
     if ( bUpdate )
     {
-        pOwner->SetUpdateMode( TRUE );
+        pOwner->SetUpdateMode( sal_True );
         pEditView->ShowCursor();
     }
 }
@@ -981,22 +1021,22 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
 
     DBG_CHKTHIS(OutlinerView,0);
 
-    if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
         return;
 
     pOwner->UndoActionStart( OLUNDO_INSERT );
 
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
-    ULONG nStart, nParaCount;
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
+    sal_uLong nStart, nParaCount;
     nParaCount = pOwner->pEditEngine->GetParagraphCount();
-    USHORT nSize = ImpInitPaste( nStart );
+    sal_uInt16 nSize = ImpInitPaste( nStart );
     pEditView->InsertText( rParaObj.GetTextObject() );
     ImpPasted( nStart, nParaCount, nSize);
-    pEditView->SetEditEngineUpdateMode( TRUE );
+    pEditView->SetEditEngineUpdateMode( sal_True );
 
     pOwner->UndoActionEnd( OLUNDO_INSERT );
 
-    pEditView->ShowCursor( TRUE, TRUE );
+    pEditView->ShowCursor( sal_True, sal_True );
 }
 
 
@@ -1004,7 +1044,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
 void OutlinerView::Cut()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
         pEditView->Cut();
 }
 
@@ -1017,25 +1057,25 @@ void OutlinerView::Paste()
 void OutlinerView::PasteSpecial()
 {
     DBG_CHKTHIS(OutlinerView,0);
-    if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+    if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
     {
         pOwner->UndoActionStart( OLUNDO_INSERT );
 
-        pOwner->pEditEngine->SetUpdateMode( FALSE );
-        pOwner->bPasting = TRUE;
+        pOwner->pEditEngine->SetUpdateMode( sal_False );
+        pOwner->bPasting = sal_True;
         pEditView->PasteSpecial();
 
         if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
         {
-            const USHORT nParaCount = pOwner->pEditEngine->GetParagraphCount();
+            const sal_uInt16 nParaCount = pOwner->pEditEngine->GetParagraphCount();
 
-            for( USHORT nPara = 0; nPara < nParaCount; nPara++ )
+            for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
                 pOwner->ImplSetLevelDependendStyleSheet( nPara );
         }
 
-        pEditView->SetEditEngineUpdateMode( TRUE );
+        pEditView->SetEditEngineUpdateMode( sal_True );
         pOwner->UndoActionEnd( OLUNDO_INSERT );
-        pEditView->ShowCursor( TRUE, TRUE );
+        pEditView->ShowCursor( sal_True, sal_True );
     }
 }
 
@@ -1043,9 +1083,9 @@ List* OutlinerView::CreateSelectionList()
 {
     DBG_CHKTHIS( OutlinerView, 0 );
 
-    ParaRange aParas = ImpGetSelectedParagraphs( TRUE );
+    ParaRange aParas = ImpGetSelectedParagraphs( sal_True );
     List* pSelList = new List;
-    for ( USHORT nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         pSelList->Insert( pPara, LIST_APPEND );
@@ -1064,11 +1104,11 @@ void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle )
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetStyleSheet( pStyle );
 
-    ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
-    for( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+    for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         pOwner->ImplCheckNumBulletItem( nPara );
-        pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+        pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
     }
 }
 
@@ -1097,28 +1137,28 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel )
 }
 
 
-USHORT OutlinerView::ImpInitPaste( ULONG& rStart )
+sal_uInt16 OutlinerView::ImpInitPaste( sal_uLong& rStart )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pOwner->bPasting = TRUE;
+    pOwner->bPasting = sal_True;
     ESelection aSelection( pEditView->GetSelection() );
     aSelection.Adjust();
     rStart = aSelection.nStartPara;
-    USHORT nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
+    sal_uInt16 nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
     return nSize;
 }
 
 
-void OutlinerView::ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize)
+void OutlinerView::ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pOwner->bPasting = FALSE;
-    ULONG nCurParaCount = (ULONG)pOwner->pEditEngine->GetParagraphCount();
+    pOwner->bPasting = sal_False;
+    sal_uLong nCurParaCount = (sal_uLong)pOwner->pEditEngine->GetParagraphCount();
     if( nCurParaCount < nPrevParaCount )
-        nSize = sal::static_int_cast< USHORT >(
+        nSize = sal::static_int_cast< sal_uInt16 >(
             nSize - ( nPrevParaCount - nCurParaCount ) );
     else
-        nSize = sal::static_int_cast< USHORT >(
+        nSize = sal::static_int_cast< sal_uInt16 >(
             nSize + ( nCurParaCount - nPrevParaCount ) );
     pOwner->ImpTextPasted( nStart, nSize );
 }
@@ -1131,31 +1171,36 @@ void OutlinerView::Command( const CommandEvent& rCEvt )
 }
 
 
-void OutlinerView::SelectRange( ULONG nFirst, USHORT nCount )
+void OutlinerView::SelectRange( sal_uLong nFirst, sal_uInt16 nCount )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    ULONG nLast = nFirst+nCount;
-    nCount = (USHORT)pOwner->pParaList->GetParagraphCount();
+    sal_uLong nLast = nFirst+nCount;
+    nCount = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
     if( nLast <= nCount )
         nLast = nCount - 1;
-    ESelection aSel( (USHORT)nFirst, 0, (USHORT)nLast, 0xffff );
+    ESelection aSel( (sal_uInt16)nFirst, 0, (sal_uInt16)nLast, 0xffff );
     pEditView->SetSelection( aSel );
 }
 
 
-USHORT OutlinerView::ImpCalcSelectedPages( BOOL bIncludeFirstSelected )
+sal_uInt16 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected )
 {
     DBG_CHKTHIS(OutlinerView,0);
 
     ESelection aSel( pEditView->GetSelection() );
     aSel.Adjust();
 
-    USHORT nPages = 0;
-    USHORT nFirstPage = 0xFFFF;
-    USHORT nStartPara = aSel.nStartPara;
+    sal_uInt16 nPages = 0;
+    sal_uInt16 nFirstPage = 0xFFFF;
+    sal_uInt16 nStartPara = aSel.nStartPara;
     if ( !bIncludeFirstSelected )
+<<<<<<< HEAD
         nStartPara++;	// All paragraphs after StartPara will be deleted
     for ( USHORT nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
+=======
+        nStartPara++;	// alle nach StartPara kommenden Absaetze werden geloescht
+    for ( sal_uInt16 nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
+>>>>>>> ooo/DEV300_m101
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "ImpCalcSelectedPages: invalid Selection? ");
@@ -1186,11 +1231,11 @@ void OutlinerView::ToggleBullets()
     aSel.Adjust();
 
     const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
     sal_Int16 nDepth = -2;
 
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1217,8 +1262,14 @@ void OutlinerView::ToggleBullets()
 
     // #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
+<<<<<<< HEAD
     // to USHORT without check, if the count is 0.
     USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+=======
+    // to sal_uInt16 without check, if the count is 0.
+    sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
+    // <--
+>>>>>>> ooo/DEV300_m101
     pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
     pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
 
@@ -1235,9 +1286,9 @@ void OutlinerView::EnableBullets()
     aSel.Adjust();
 
     const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
-    pOwner->pEditEngine->SetUpdateMode( FALSE );
+    pOwner->pEditEngine->SetUpdateMode( sal_False );
 
-    for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+    for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
     {
         Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
         DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1250,8 +1301,14 @@ void OutlinerView::EnableBullets()
 
     // #i100014#
     // It is not a good idea to substract 1 from a count and cast the result
+<<<<<<< HEAD
     // to USHORT without check, if the count is 0.
     USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+=======
+    // to sal_uInt16 without check, if the count is 0.
+    sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
+    // <--
+>>>>>>> ooo/DEV300_m101
     pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
     pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
 
@@ -1261,16 +1318,16 @@ void OutlinerView::EnableBullets()
 }
 
 
-void OutlinerView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
+void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 {
-    RemoveAttribs( bRemoveParaAttribs, 0, TRUE /*keep language attribs*/ );
+    RemoveAttribs( bRemoveParaAttribs, 0, sal_True /*keep language attribs*/ );
 }
 
-void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL bKeepLanguages )
+void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich, sal_Bool bKeepLanguages )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    BOOL bUpdate = pOwner->GetUpdateMode();
-    pOwner->SetUpdateMode( FALSE );
+    sal_Bool bUpdate = pOwner->GetUpdateMode();
+    pOwner->SetUpdateMode( sal_False );
     pOwner->UndoActionStart( OLUNDO_ATTR );
     if (bKeepLanguages)
         pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
@@ -1281,10 +1338,10 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
         // Loop through all paragraphs and set indentation and level
         ESelection aSel = pEditView->GetSelection();
         aSel.Adjust();
-        for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+        for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
         {
             Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
-            pOwner->ImplInitDepth( nPara, pPara->GetDepth(), FALSE, FALSE );
+            pOwner->ImplInitDepth( nPara, pPara->GetDepth(), sal_False, sal_False );
         }
     }
     pOwner->UndoActionEnd( OLUNDO_ATTR );
@@ -1298,7 +1355,7 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
 // ======================================================================
 
 
-void OutlinerView::InsertText( const XubString& rNew, BOOL bSelect )
+void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if( pOwner->bFirstParaIsEmpty )
@@ -1319,26 +1376,26 @@ void OutlinerView::SetSelection( const ESelection& rSel )
     pEditView->SetSelection( rSel );
 }
 
-void OutlinerView::SetReadOnly( BOOL bReadOnly )
+void OutlinerView::SetReadOnly( sal_Bool bReadOnly )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetReadOnly( bReadOnly );
 }
 
-BOOL OutlinerView::IsReadOnly() const
+sal_Bool OutlinerView::IsReadOnly() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsReadOnly();
 }
 
-BOOL OutlinerView::HasSelection() const
+sal_Bool OutlinerView::HasSelection() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->HasSelection();
 }
 
 
-void OutlinerView::ShowCursor( BOOL bGotoCursor )
+void OutlinerView::ShowCursor( sal_Bool bGotoCursor )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->ShowCursor( bGotoCursor );
@@ -1387,10 +1444,10 @@ XubString OutlinerView::GetSelected() const
 }
 
 
-void OutlinerView::RemoveCharAttribs( ULONG nPara, USHORT nWhich)
+void OutlinerView::RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich)
 {
     DBG_CHKTHIS(OutlinerView,0);
-    pEditView->RemoveCharAttribs( (USHORT)nPara, nWhich);
+    pEditView->RemoveCharAttribs( (sal_uInt16)nPara, nWhich);
 }
 
 
@@ -1401,7 +1458,7 @@ void OutlinerView::CompleteAutoCorrect()
 }
 
 
-EESpellState OutlinerView::StartSpeller( BOOL bMultiDoc )
+EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSpeller( bMultiDoc );
@@ -1417,7 +1474,7 @@ EESpellState OutlinerView::StartThesaurus()
 
 void OutlinerView::StartTextConversion(
     LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
-    INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
+    sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
 {
     DBG_CHKTHIS(OutlinerView,0);
     if (
@@ -1435,7 +1492,7 @@ void OutlinerView::StartTextConversion(
 }
 
 
-USHORT OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
+sal_uInt16 OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->StartSearchAndReplace( rSearchItem );
@@ -1463,14 +1520,14 @@ void OutlinerView::Scroll( long nHorzScroll, long nVertScroll )
 }
 
 
-void OutlinerView::SetControlWord( ULONG nWord )
+void OutlinerView::SetControlWord( sal_uLong nWord )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetControlWord( nWord );
 }
 
 
-ULONG OutlinerView::GetControlWord() const
+sal_uLong OutlinerView::GetControlWord() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetControlWord();
@@ -1505,7 +1562,7 @@ void OutlinerView::Redo()
 }
 
 
-void OutlinerView::EnablePaste( BOOL bEnable )
+void OutlinerView::EnablePaste( sal_Bool bEnable )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->EnablePaste( bEnable );
@@ -1533,7 +1590,7 @@ const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
 }
 
 
-const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( USHORT& nPara, USHORT& nPos ) const
+const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetFieldUnderMousePointer( nPara, nPos );
@@ -1546,28 +1603,28 @@ const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
     return pEditView->GetFieldAtSelection();
 }
 
-void OutlinerView::SetInvalidateMore( USHORT nPixel )
+void OutlinerView::SetInvalidateMore( sal_uInt16 nPixel )
 {
     DBG_CHKTHIS(OutlinerView,0);
     pEditView->SetInvalidateMore( nPixel );
 }
 
 
-USHORT OutlinerView::GetInvalidateMore() const
+sal_uInt16 OutlinerView::GetInvalidateMore() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetInvalidateMore();
 }
 
 
-BOOL OutlinerView::IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong );
 }
 
 
-BOOL OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
@@ -1587,28 +1644,28 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
     pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
 }
 
-ULONG OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextFormat eFormat, BOOL bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    USHORT nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
+    sal_uInt16 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
     ESelection aOldSel = pEditView->GetSelection();
     aOldSel.Adjust();
 
-    ULONG nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
+    sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
 
     long nParaDiff = pEditView->GetEditEngine()->GetParagraphCount() - nOldParaCount;
-    USHORT nChangesStart = aOldSel.nStartPara;
-    USHORT nChangesEnd = sal::static_int_cast< USHORT >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
+    sal_uInt16 nChangesStart = aOldSel.nStartPara;
+    sal_uInt16 nChangesEnd = sal::static_int_cast< sal_uInt16 >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
 
-    for ( USHORT n = nChangesStart; n <= nChangesEnd; n++ )
+    for ( sal_uInt16 n = nChangesStart; n <= nChangesEnd; n++ )
     {
         if ( eFormat == EE_FORMAT_BIN )
         {
-            USHORT nDepth = 0;
+            sal_uInt16 nDepth = 0;
             const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n );
             const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
             nDepth = rLevel.GetValue();
-            pOwner->ImplInitDepth( n, nDepth, FALSE );
+            pOwner->ImplInitDepth( n, nDepth, sal_False );
         }
 
         if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
@@ -1623,7 +1680,7 @@ ULONG OutlinerView::Read( SvStream& rInput,  const String& rBaseURL, EETextForma
     return nRet;
 }
 
-ULONG OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->Write( rOutput, eFormat );
@@ -1648,7 +1705,7 @@ SfxItemSet OutlinerView::GetAttribs()
     return pEditView->GetAttribs();
 }
 
-USHORT OutlinerView::GetSelectedScriptType() const
+sal_uInt16 OutlinerView::GetSelectedScriptType() const
 {
     DBG_CHKTHIS(OutlinerView,0);
     return pEditView->GetSelectedScriptType();
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index f018318009..8e35263d83 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -76,7 +76,7 @@ Paragraph::Paragraph( sal_Int16 nDDepth )
 
     nDepth = nDDepth;
     nFlags = 0;
-    bVisible = TRUE;
+    bVisible = sal_True;
 }
 
 Paragraph::Paragraph( const Paragraph& rPara )
@@ -94,7 +94,7 @@ Paragraph::Paragraph( const Paragraph& rPara )
 Paragraph::Paragraph( const ParagraphData& rData )
 : nFlags( 0 )
 , aBulSize( -1, -1)
-, bVisible( TRUE )
+, bVisible( sal_True )
 {
     DBG_CTOR( Paragraph, 0 );
 
@@ -122,7 +122,7 @@ void Paragraph::SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart )
         mnNumberingStartValue = -1;
 }
 
-void ParagraphList::Clear( BOOL bDestroyParagraphs )
+void ParagraphList::Clear( sal_Bool bDestroyParagraphs )
 {
     if ( bDestroyParagraphs )
     {
@@ -153,7 +153,7 @@ void ParagraphList::Remove( ULONG nPara )
     maEntries.erase(maEntries.begin() + nPara );
 }
 
-void ParagraphList::MoveParagraphs( ULONG nStart, ULONG nDest, ULONG _nCount )
+void ParagraphList::MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong _nCount )
 {
     OSL_ASSERT(nStart < maEntries.size() && nDest < maEntries.size());
 
@@ -185,7 +185,6 @@ Paragraph* ParagraphList::NextVisible( Paragraph* pPara ) const
     std::vector<Paragraph*>::const_iterator iter = std::find(maEntries.begin(),
                                                              maEntries.end(),
                                                              pPara);
-
     for (; iter != maEntries.end(); ++iter)
     {
         if ((*iter)->IsVisible())
@@ -200,7 +199,6 @@ Paragraph* ParagraphList::PrevVisible( Paragraph* pPara ) const
     std::vector<Paragraph*>::const_reverse_iterator iter = std::find(maEntries.rbegin(),
                                                                      maEntries.rend(),
                                                                      pPara);
-
     for (; iter != maEntries.rend(); ++iter)
     {
         if ((*iter)->IsVisible())
@@ -222,31 +220,31 @@ Paragraph* ParagraphList::LastVisible() const
     return iter != maEntries.rend() ? *iter : NULL;
 }
 
-BOOL ParagraphList::HasChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False;
 }
 
-BOOL ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? sal_True : sal_False;
 }
 
-BOOL ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
 {
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pNext = GetParagraph( ++n );
-    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? TRUE : FALSE;
+    return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? sal_True : sal_False;
 }
 
-ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
+sal_uLong ParagraphList::GetChildCount( Paragraph* pParent ) const
 {
-    ULONG nChildCount = 0;
-    ULONG n = GetAbsPos( pParent );
+    sal_uLong nChildCount = 0;
+    sal_uLong n = GetAbsPos( pParent );
     Paragraph* pPara = GetParagraph( ++n );
     while ( pPara && ( pPara->GetDepth() > pParent->GetDepth() ) )
     {
@@ -256,10 +254,10 @@ ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
     return nChildCount;
 }
 
-Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const
+Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const
 {
     /* rRelPos = 0 */;
-    ULONG n = GetAbsPos( pParagraph );
+    sal_uLong n = GetAbsPos( pParagraph );
     Paragraph* pPrev = GetParagraph( --n );
     while ( pPrev && ( pPrev->GetDepth() >= pParagraph->GetDepth() ) )
     {
@@ -273,15 +271,15 @@ Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos *
 
 void ParagraphList::Expand( Paragraph* pParent )
 {
-    ULONG nChildCount = GetChildCount( pParent );
-    ULONG nPos = GetAbsPos( pParent );
+    sal_uLong nChildCount = GetChildCount( pParent );
+    sal_uLong nPos = GetAbsPos( pParent );
 
-    for ( ULONG n = 1; n <= nChildCount; n++  )
+    for ( sal_uLong n = 1; n <= nChildCount; n++  )
     {
         Paragraph* pPara = GetParagraph( nPos+n );
         if ( !( pPara->IsVisible() ) )
         {
-            pPara->bVisible = TRUE;
+            pPara->bVisible = sal_True;
             aVisibleStateChangedHdl.Call( pPara );
         }
     }
@@ -289,23 +287,23 @@ void ParagraphList::Expand( Paragraph* pParent )
 
 void ParagraphList::Collapse( Paragraph* pParent )
 {
-    ULONG nChildCount = GetChildCount( pParent );
-    ULONG nPos = GetAbsPos( pParent );
+    sal_uLong nChildCount = GetChildCount( pParent );
+    sal_uLong nPos = GetAbsPos( pParent );
 
-    for ( ULONG n = 1; n <= nChildCount; n++  )
+    for ( sal_uLong n = 1; n <= nChildCount; n++  )
     {
         Paragraph* pPara = GetParagraph( nPos+n );
         if ( pPara->IsVisible() )
         {
-            pPara->bVisible = FALSE;
+            pPara->bVisible = sal_False;
             aVisibleStateChangedHdl.Call( pPara );
         }
     }
 }
 
-ULONG ParagraphList::GetAbsPos( Paragraph* pParent ) const
+sal_uLong ParagraphList::GetAbsPos( Paragraph* pParent ) const
 {
-    ULONG pos = 0;
+    sal_uLong pos = 0;
     std::vector<Paragraph*>::const_iterator iter;
     for (iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++pos)
     {
@@ -316,9 +314,9 @@ ULONG ParagraphList::GetAbsPos( Paragraph* pParent ) const
     return ~0;
 }
 
-ULONG ParagraphList::GetVisPos( Paragraph* pPara ) const
+sal_uLong ParagraphList::GetVisPos( Paragraph* pPara ) const
 {
-    ULONG nVisPos = 0;
+    sal_uLong nVisPos = 0;
     std::vector<Paragraph*>::const_iterator iter;
     for (iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++nVisPos)
     {
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index d9095ea1a0..8fa8db965d 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -38,7 +38,7 @@ class Paragraph;
 class ParagraphList
 {
 public:
-    void			Clear( BOOL bDestroyParagraphs );
+    void			Clear( sal_Bool bDestroyParagraphs );
 
     sal_uInt32		GetParagraphCount() const
     {
@@ -50,8 +50,8 @@ public:
         return nPos < maEntries.size() ? maEntries[nPos] : NULL;
     }
 
-    ULONG			GetAbsPos( Paragraph* pParent ) const;
-    ULONG			GetVisPos( Paragraph* pParagraph ) const;
+    sal_uLong			GetAbsPos( Paragraph* pParent ) const;
+    sal_uLong			GetVisPos( Paragraph* pParagraph ) const;
 
     void            Append( Paragraph *pPara);
     void			Insert( Paragraph* pPara, ULONG nAbsPos);
@@ -62,11 +62,11 @@ public:
     Paragraph*		PrevVisible( Paragraph* ) const;
     Paragraph*		LastVisible() const;
 
-    Paragraph*		GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const;
-    BOOL			HasChilds( Paragraph* pParagraph ) const;
-    BOOL			HasHiddenChilds( Paragraph* pParagraph ) const;
-    BOOL			HasVisibleChilds( Paragraph* pParagraph ) const;
-    ULONG			GetChildCount( Paragraph* pParagraph ) const;
+    Paragraph*		GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const;
+    sal_Bool			HasChilds( Paragraph* pParagraph ) const;
+    sal_Bool			HasHiddenChilds( Paragraph* pParagraph ) const;
+    sal_Bool			HasVisibleChilds( Paragraph* pParagraph ) const;
+    sal_uLong			GetChildCount( Paragraph* pParagraph ) const;
 
     void            Expand( Paragraph* pParent );
     void            Collapse( Paragraph* pParent );
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 86cc653259..6c9d9b18bb 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -41,12 +41,12 @@
 
 using namespace ::rtl;
 
-static BYTE aPal1[ 2 * 4 ] = {
+static sal_uInt8 aPal1[ 2 * 4 ] = {
         0x00, 0x00, 0x00, 0x00,				// Black
         0xFF, 0xFF, 0xFF, 0x00				// White
 };
 
-static BYTE aPal4[ 16 * 4 ] = {
+static sal_uInt8 aPal4[ 16 * 4 ] = {
         0x00, 0x00, 0x00, 0x00,
         0x80, 0x00, 0x00, 0x00,
         0x00, 0x80, 0x00, 0x00,
@@ -65,7 +65,7 @@ static BYTE aPal4[ 16 * 4 ] = {
         0xFF, 0xFF, 0xFF, 0x00
 };
 
-static BYTE aPal8[ 256 * 4 ] =
+static sal_uInt8 aPal8[ 256 * 4 ] =
 {
 0x00, 0x00, 0x00, 0x00,   0x80, 0x00, 0x00, 0x00,   0x00, 0x92, 0x00, 0x00,
 0x80, 0x92, 0x00, 0x00,   0x00, 0x00, 0xAA, 0x00,   0x80, 0x00, 0xAA, 0x00,
@@ -181,14 +181,14 @@ inline short SwapShort( short n )
 static void WriteBMPHeader( SvStream& rStream,
                             const SvxRTFPictureType& rPicType )
 {
-    ULONG n4Width = rPicType.nWidth;
-    ULONG n4Height = rPicType.nHeight;
-    USHORT n4ColBits = rPicType.nBitsPerPixel;
+    sal_uInt32 n4Width = rPicType.nWidth;
+    sal_uInt32 n4Height = rPicType.nHeight;
+    sal_uInt16 n4ColBits = rPicType.nBitsPerPixel;
 
-    USHORT nColors = (1 << n4ColBits);	// Number of colors (1, 16, 256)
-    USHORT nWdtOut = rPicType.nWidthBytes;
+    sal_uInt16 nColors = (1 << n4ColBits);	// Number of colors (1, 16, 256)
+    sal_uInt16 nWdtOut = rPicType.nWidthBytes;
     if( !nWdtOut )
-        nWdtOut = (USHORT)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
+        nWdtOut = (sal_uInt16)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
 
     long nOffset = 14 + 40; 	// BMP_FILE_HD_SIZ + sizeof(*pBmpInfo);
     if( 256 >= nColors )
@@ -203,7 +203,7 @@ static void WriteBMPHeader( SvStream& rStream,
     rStream	<< SwapLong(40)				// sizeof( BmpInfo )
             << SwapLong(n4Width)
             << SwapLong(n4Height)
-            << (USHORT)1
+            << (sal_uInt16)1
             << n4ColBits
             << SwapLong(0)
             << SwapLong(0)
@@ -237,7 +237,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
 
     xub_StrLen n, nLen;
     sal_Unicode nVal;
-    BOOL bValidData = TRUE;
+    sal_Bool bValidData = sal_True;
     const sal_Unicode* pStr = rToken.GetBufferAccess();
     sal_Char* pData = (sal_Char*)pStr;
     for( n = 0, nLen = rToken.Len(); n < nLen; ++n, ++pStr )
@@ -251,7 +251,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
         else
         {
             DBG_ASSERT( !this, "invalid Hex value" );
-            bValidData = FALSE;
+            bValidData = sal_False;
             break;
         }
 
@@ -264,7 +264,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
     return bValidData ? nLen / 2  : STRING_NOTFOUND;
 }
 
-BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
+sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
 {
     // Delete the old data
     rGrf.Clear();
@@ -287,7 +287,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
     while( _nOpenBrakets && IsParserWorking() && bValidBmp )
     {
         nToken = GetNextToken();
-        USHORT nVal = USHORT( nTokenValue );
+        sal_uInt16 nVal = sal_uInt16( nTokenValue );
         switch( nToken )
         {
         case '}':       
@@ -390,7 +390,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
             {
                 rStrm.SeekRel(-1);
                 sal_uInt8 aData[4096];
-                ULONG nSize = sizeof(aData);
+                sal_uInt32 nSize = sizeof(aData);
 
                 while (rPicType.uPicLen > 0)
                 {
@@ -447,14 +447,14 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 default:
                     break;
                 }
-                bFirstTextToken = FALSE;
+                bFirstTextToken = sal_False;
             }
 
             if( pTmpFile && SvxRTFPictureType::HEX_MODE == rPicType.nMode )
             {
                 xub_StrLen nTokenLen = HexToBin( aToken );
                 if( STRING_NOTFOUND == nTokenLen )
-                    bValidBmp = FALSE;
+                    bValidBmp = sal_False;
                 else
                 {
                     pTmpFile->Write( (sal_Char*)aToken.GetBuffer(),
@@ -475,12 +475,12 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
         if( bValidBmp )
         {
             GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-            USHORT nImportFilter = GRFILTER_FORMAT_DONTKNOW;
+            sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW;
 
             if( pFilterNm )
             {
                 String sTmp;
-                for( USHORT n = pGF->GetImportFormatCount(); n; )
+                for( sal_uInt16 n = pGF->GetImportFormatCount(); n; )
                 {
                     sTmp = pGF->GetImportFormatShortName( --n );
                     if( sTmp.EqualsAscii( pFilterNm ))
@@ -523,8 +523,8 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
                 else
                     aSize = OutputDevice::LogicToLogic( aSize,
                                         rGrf.GetPrefMapMode(), aMap );
-                rPicType.nWidth = sal::static_int_cast< USHORT >(aSize.Width());
-                rPicType.nHeight = sal::static_int_cast< USHORT >(
+                rPicType.nWidth = sal::static_int_cast< sal_uInt16 >(aSize.Width());
+                rPicType.nHeight = sal::static_int_cast< sal_uInt16 >(
                     aSize.Height());
             }
             break;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index bda56e1a9e..3736c16f10 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -98,14 +98,14 @@
 
 // Some helper functions
 // char
-inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxEscapementItem&)rSet.Get( nId,bInP); }
-inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxLineSpacingItem&)rSet.Get( nId,bInP); }
 // frm
-inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxLRSpaceItem&)rSet.Get( nId,bInP); }
-inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
     { return (const SvxULSpaceItem&)rSet.Get( nId,bInP); }
 
 #define PARDID		((RTFPardAttrMapIds*)aPardMap.GetData())
@@ -114,7 +114,7 @@ inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL b
 void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
                                     SfxPoolItem& rItem )
 {
-    const USHORT *pNormal = 0, *pCJK = 0, *pCTL = 0;
+    const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0;
     const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)aPlainMap.GetData();
     switch( rItem.Which() )
     {
@@ -217,31 +217,37 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
 
 void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 {
+<<<<<<< HEAD
     DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" );
     int bFirstToken = TRUE, bWeiter = TRUE;
     USHORT nStyleNo = 0; 		// default
+=======
+    DBG_ASSERT( pSet, "Es muss ein SfxItemSet uebergeben werden!" );
+    int bFirstToken = sal_True, bWeiter = sal_True;
+    sal_uInt16 nStyleNo = 0; 		// default
+>>>>>>> ooo/DEV300_m101
     FontUnderline eUnderline;
     FontUnderline eOverline;
     FontEmphasisMark eEmphasis;
-    bPardTokenRead = FALSE;
+    bPardTokenRead = sal_False;
     RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
-    USHORT nFontAlign;
+    sal_uInt16 nFontAlign;
 
-    int bChkStkPos = !bNewGroup && aAttrStack.Top();
+    int bChkStkPos = !bNewGroup && !aAttrStack.empty();
 
     while( bWeiter && IsParserWorking() )  // as long as known Attribute are recognized
     {
         switch( nToken )
         {
         case RTF_PARD:
-            RTFPardPlain( TRUE, &pSet );
+            RTFPardPlain( sal_True, &pSet );
             ResetPard();
             nStyleNo = 0;
-            bPardTokenRead = TRUE;
+            bPardTokenRead = sal_True;
             break;
 
         case RTF_PLAIN:
-            RTFPardPlain( FALSE, &pSet );
+            RTFPardPlain( sal_False, &pSet );
             break;
 
         default:
@@ -249,7 +255,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( !bChkStkPos )
                     break;
 
-                SvxRTFItemStackType* pAkt = aAttrStack.Top();
+                SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
                 if( !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
                     pAkt->nSttCnt == pInsPos->GetCntIdx() ))
                     break;
@@ -263,15 +269,15 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     // Open a new Group
                     SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                                *pAkt, *pInsPos, TRUE );
+                                                *pAkt, *pInsPos, sal_True );
                     pNew->SetRTFDefaults( GetRTFDefaults() );
 
                     // "Set" all valid attributes up until this point
                     AttrGroupEnd();
-                    pAkt = aAttrStack.Top();  // can be changed after AttrGroupEnd!
+                    pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();  // can be changed after AttrGroupEnd!
                     pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
 
-                    aAttrStack.Push( pNew );
+                    aAttrStack.push_back( pNew );
                     pAkt = pNew;
                 }
                 else
@@ -279,7 +285,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                     pAkt->SetStartPos( *pInsPos );
 
                 pSet = &pAkt->aAttrSet;
-            } while( FALSE );
+            } while( sal_False );
 
             switch( nToken )
             {
@@ -297,33 +303,71 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     if( !bFirstToken )
                         SkipToken( -1 );
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
                 else
                 {
+<<<<<<< HEAD
                     nStyleNo = -1 == nTokenValue ? 0 : USHORT(nTokenValue);
                     // Set the StyleNumber for the current style on 
                     // the attribute stack
                     SvxRTFItemStackType* pAkt = aAttrStack.Top();
+=======
+                    nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
+                    // setze am akt. auf dem AttrStack stehenden Style die
+                    // StyleNummer
+                    SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
+>>>>>>> ooo/DEV300_m101
                     if( !pAkt )
                         break;
 
-                    pAkt->nStyleNo = USHORT( nStyleNo );
+                    pAkt->nStyleNo = sal_uInt16( nStyleNo );
+
+<<<<<<< HEAD
+=======
+#if 0
+// JP 05.09.95: zuruecksetzen der Style-Attribute fuehrt nur zu Problemen.
+//				Es muss reichen, wenn das ueber pard/plain erfolgt
+//	ansonsten Bugdoc 15304.rtf - nach nur "\pard" falscher Font !!
 
+                    SvxRTFStyleType* pStyle = aStyleTbl.Get( pAkt->nStyleNo );
+                    if( pStyle && pStyle->aAttrSet.Count() )
+                    {
+                        //JP 07.07.95:
+                        // alle Attribute, die in der Vorlage gesetzt werden
+                        // auf defaults setzen. In RTF werden die Attribute
+                        // der Vorlage danach ja wiederholt.
+                        // WICHTIG: Attribute die in der Vorlage definiert
+                        //			sind, werden zurueckgesetzt !!!!
+                        // pAkt->aAttrSet.Put( pStyle->aAttrSet );
+
+                        SfxItemIter aIter( pStyle->aAttrSet );
+                        SfxItemPool* pPool = pStyle->aAttrSet.GetPool();
+                        sal_uInt16 nWh = aIter.GetCurItem()->Which();
+                        while( sal_True )
+                        {
+                            pAkt->aAttrSet.Put( pPool->GetDefaultItem( nWh ));
+                            if( aIter.IsAtEnd() )
+                                break;
+                            nWh = aIter.NextItem()->Which();
+                        }
+                    }
+#endif
+>>>>>>> ooo/DEV300_m101
                 }
                 break;
 
             case RTF_KEEP:
                 if( PARDID->nSplit )
                 {
-                    pSet->Put( SvxFmtSplitItem( FALSE, PARDID->nSplit ));
+                    pSet->Put( SvxFmtSplitItem( sal_False, PARDID->nSplit ));
                 }
                 break;
 
             case RTF_KEEPN:
                 if( PARDID->nKeep )
                 {
-                    pSet->Put( SvxFmtKeepItem( TRUE, PARDID->nKeep ));
+                    pSet->Put( SvxFmtKeepItem( sal_True, PARDID->nKeep ));
                 }
                 break;
 
@@ -331,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nOutlineLvl )
                 {
                     pSet->Put( SfxUInt16Item( PARDID->nOutlineLvl,
-                                                (UINT16)nTokenValue ));
+                                                (sal_uInt16)nTokenValue ));
                 }
                 break;
 
@@ -364,12 +408,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( -1 != nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetTxtFirstLineOfst( nSz );
                     pSet->Put( aLR );
@@ -381,12 +425,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetTxtLeft( nSz );
                     pSet->Put( aLR );
@@ -398,12 +442,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nLRSpace )
                 {
                     SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aLR.SetRight( nSz );
                     pSet->Put( aLR );
@@ -414,12 +458,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nULSpace )
                 {
                     SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aUL.SetUpper( nSz );
                     pSet->Put( aUL );
@@ -430,12 +474,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 if( PARDID->nULSpace )
                 {
                     SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
-                    USHORT nSz = 0;
+                    sal_uInt16 nSz = 0;
                     if( 0 < nTokenValue )
                     {
                         if( IsCalcValue() )
                             CalcValue();
-                        nSz = USHORT(nTokenValue);
+                        nSz = sal_uInt16(nTokenValue);
                     }
                     aUL.SetLower( nSz );
                     pSet->Put( aUL );
@@ -447,7 +491,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                 {
                     // then switches to multi-line!
                     SvxLineSpacingItem aLSpace( GetLineSpacing( *pSet,
-                                                PARDID->nLinespacing, FALSE ));
+                                                PARDID->nLinespacing, sal_False ));
 
                     // how much do you get from the line height value?
 
@@ -461,10 +505,15 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                     nTokenValue = short( 100L * aLSpace.GetLineHeight()
                                             / long( nTokenValue ) );
 
+<<<<<<< HEAD
                     if( nTokenValue > 200 )		// Data value for PropLnSp
                         nTokenValue = 200;		// is one BYTE !!!
+=======
+                    if( nTokenValue > 200 )		// Datenwert fuer PropLnSp
+                        nTokenValue = 200;		// ist ein sal_uInt8 !!!
+>>>>>>> ooo/DEV300_m101
 
-                    aLSpace.SetPropLineSpace( (const BYTE)nTokenValue );
+                    aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue );
                     aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
 
                     pSet->Put( aLSpace );
@@ -502,7 +551,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
                         CalcValue();
 
                     if (eLnSpc != SVX_LINE_SPACE_AUTO)
-                        aLSpace.SetLineHeight( (const USHORT)nTokenValue );
+                        aLSpace.SetLineHeight( (const sal_uInt16)nTokenValue );
 
                     aLSpace.GetLineSpaceRule() = eLnSpc;
                     pSet->Put(aLSpace);
@@ -512,14 +561,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_NOCWRAP:
                 if( PARDID->nForbRule )
                 {
-                    pSet->Put( SvxForbiddenRuleItem( FALSE,
+                    pSet->Put( SvxForbiddenRuleItem( sal_False,
                                                     PARDID->nForbRule ));
                 }
                 break;
             case RTF_NOOVERFLOW:
                 if( PARDID->nHangPunct )
                 {
-                    pSet->Put( SvxHangingPunctuationItem( FALSE,
+                    pSet->Put( SvxHangingPunctuationItem( sal_False,
                                                     PARDID->nHangPunct ));
                 }
                 break;
@@ -527,7 +576,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
             case RTF_ASPALPHA:
                 if( PARDID->nScriptSpace )
                 {
-                    pSet->Put( SvxScriptSpaceItem( TRUE,
+                    pSet->Put( SvxScriptSpaceItem( sal_True,
                                                 PARDID->nScriptSpace ));
                 }
                 break;
@@ -584,14 +633,14 @@ SET_FONTALIGNMENT:
             case RTF_SUB:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     if( -1 == nTokenValue || RTF_SUB == nToken )
                         nTokenValue = 6;
                     if( IsCalcValue() )
                         CalcValue();
-                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
                     short nEs;
-                    BYTE nProp;
+                    sal_uInt8 nProp;
                     if( DFLT_ESC_AUTO_SUPER == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUB;
@@ -609,7 +658,7 @@ SET_FONTALIGNMENT:
             case RTF_NOSUPERSUB:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     pSet->Put( SvxEscapementItem( nEsc ));
                 }
                 break;
@@ -655,7 +704,7 @@ SET_FONTALIGNMENT:
             case RTF_F:
             case RTF_AF:
                 {
-                    const Font& rSVFont = GetFont( USHORT(nTokenValue) );
+                    const Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
                     SvxFontItem aTmpItem( rSVFont.GetFamily(),
                                     rSVFont.GetName(), rSVFont.GetStyleName(),
                                     rSVFont.GetPitch(), rSVFont.GetCharSet(),
@@ -683,7 +732,7 @@ SET_FONTALIGNMENT:
 //                   if( IsCalcValue() )
 //                       CalcValue();
                     SvxFontHeightItem aTmpItem(
-                            (const USHORT)nTokenValue, 100,
+                            (const sal_uInt16)nTokenValue, 100,
                             SID_ATTR_CHAR_FONTHEIGHT );
                     SetScriptAttr( eCharType, *pSet, aTmpItem );
                 }
@@ -704,7 +753,7 @@ SET_FONTALIGNMENT:
                 if( PLAINID->nContour &&
                     IsAttrSttPos() )		// not in the text flow?
                 {
-                    pSet->Put( SvxContourItem( nTokenValue ? TRUE : FALSE,
+                    pSet->Put( SvxContourItem( nTokenValue ? sal_True : sal_False,
                                 PLAINID->nContour ));
                 }
                 break;
@@ -713,7 +762,7 @@ SET_FONTALIGNMENT:
                 if( PLAINID->nShadowed &&
                     IsAttrSttPos() )		// not in the text flow?
                 {
-                    pSet->Put( SvxShadowedItem( nTokenValue ? TRUE : FALSE,
+                    pSet->Put( SvxShadowedItem( nTokenValue ? sal_True : sal_False,
                                 PLAINID->nShadowed ));
                 }
                 break;
@@ -797,7 +846,7 @@ SET_FONTALIGNMENT:
 
                 if( PLAINID->nWordlineMode )
                 {
-                    pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+                    pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
                 }
                 goto ATTR_SETUNDERLINE;
 
@@ -814,7 +863,7 @@ ATTR_SETUNDERLINE:
                     SvxUnderlineItem aUL( UNDERLINE_SINGLE, PLAINID->nUnderline );
                     const SfxPoolItem* pItem;
                     if( SFX_ITEM_SET == pSet->GetItemState(
-                        PLAINID->nUnderline, FALSE, &pItem ) )
+                        PLAINID->nUnderline, sal_False, &pItem ) )
                     {
                         // is switched off ?
                         if( UNDERLINE_NONE ==
@@ -823,11 +872,11 @@ ATTR_SETUNDERLINE:
                         aUL = *(SvxUnderlineItem*)pItem;
                     }
                     else
-                        aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+                        aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
 
                     if( UNDERLINE_NONE == aUL.GetLineStyle() )
                         aUL.SetLineStyle( UNDERLINE_SINGLE );
-                    aUL.SetColor( GetColor( USHORT(nTokenValue) ));
+                    aUL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aUL );
                 }
                 break;
@@ -892,7 +941,7 @@ ATTR_SETUNDERLINE:
 
                 if( PLAINID->nWordlineMode )
                 {
-                    pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+                    pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
                 }
                 goto ATTR_SETOVERLINE;
 
@@ -909,7 +958,7 @@ ATTR_SETOVERLINE:
                     SvxOverlineItem aOL( UNDERLINE_SINGLE, PLAINID->nOverline );
                     const SfxPoolItem* pItem;
                     if( SFX_ITEM_SET == pSet->GetItemState(
-                        PLAINID->nOverline, FALSE, &pItem ) )
+                        PLAINID->nOverline, sal_False, &pItem ) )
                     {
                         // is switched off ?
                         if( UNDERLINE_NONE ==
@@ -918,11 +967,11 @@ ATTR_SETOVERLINE:
                         aOL = *(SvxOverlineItem*)pItem;
                     }
                     else
-                        aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+                        aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
 
                     if( UNDERLINE_NONE == aOL.GetLineStyle() )
                         aOL.SetLineStyle( UNDERLINE_SINGLE );
-                    aOL.SetColor( GetColor( USHORT(nTokenValue) ));
+                    aOL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
                     pSet->Put( aOL );
                 }
                 break;
@@ -931,14 +980,14 @@ ATTR_SETOVERLINE:
             case RTF_SUPER:
                 if( PLAINID->nEscapement )
                 {
-                    const USHORT nEsc = PLAINID->nEscapement;
+                    const sal_uInt16 nEsc = PLAINID->nEscapement;
                     if( -1 == nTokenValue || RTF_SUPER == nToken )
                         nTokenValue = 6;
                     if( IsCalcValue() )
                         CalcValue();
-                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+                    const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
                     short nEs;
-                    BYTE nProp;
+                    sal_uInt8 nProp;
                     if( DFLT_ESC_AUTO_SUB == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUPER;
@@ -956,13 +1005,24 @@ ATTR_SETOVERLINE:
             case RTF_CF:
                 if( PLAINID->nColor )
                 {
-                    pSet->Put( SvxColorItem( GetColor( USHORT(nTokenValue) ),
+                    pSet->Put( SvxColorItem( GetColor( sal_uInt16(nTokenValue) ),
                                 PLAINID->nColor ));
                 }
                 break;
             //#i12501# While cb is clearly documented in the rtf spec, word
             //doesn't accept it at all
+<<<<<<< HEAD
 
+=======
+            case RTF_CB:
+                if( PLAINID->nBgColor )
+                {
+                    pSet->Put( SvxBrushItem( GetColor( sal_uInt16(nTokenValue) ),
+                                PLAINID->nBgColor ));
+                }
+                break;
+#endif
+>>>>>>> ooo/DEV300_m101
             case RTF_LANG:
                 if( PLAINID->nLanguage )
                 {
@@ -987,10 +1047,10 @@ ATTR_SETOVERLINE:
                 break;
 
             case RTF_RTLCH:
-                bIsLeftToRightDef = FALSE;
+                bIsLeftToRightDef = sal_False;
                 break;
             case RTF_LTRCH:
-                bIsLeftToRightDef = TRUE;
+                bIsLeftToRightDef = sal_True;
                 break;
             case RTF_RTLPAR:
                 if (PARDID->nDirection)
@@ -1041,7 +1101,7 @@ ATTR_SETEMPHASIS:
                     default: cStt = 0, cEnd = 0; break;
                     }
 
-                    pSet->Put( SvxTwoLinesItem( TRUE, cStt, cEnd,
+                    pSet->Put( SvxTwoLinesItem( sal_True, cStt, cEnd,
                                                        PLAINID->nTwoLines ));
                 }
                 break;
@@ -1052,7 +1112,7 @@ ATTR_SETEMPHASIS:
                     //i21372
                     if (nTokenValue < 1 || nTokenValue > 600)
                         nTokenValue = 100;
-                    pSet->Put( SvxCharScaleWidthItem( USHORT(nTokenValue),
+                    pSet->Put( SvxCharScaleWidthItem( sal_uInt16(nTokenValue),
                                                        PLAINID->nCharScaleX ));
                 }
                 break;
@@ -1127,8 +1187,13 @@ ATTR_SETEMPHASIS:
 
                         case RTF_SWG_ESCPROP:
                             {
+<<<<<<< HEAD
                                 // Store percentage change!
                                 BYTE nProp = BYTE( nTokenValue / 100 );
+=======
+                                // prozentuale Veraenderung speichern !
+                                sal_uInt8 nProp = sal_uInt8( nTokenValue / 100 );
+>>>>>>> ooo/DEV300_m101
                                 short nEsc = 0;
                                 if( 1 == ( nTokenValue % 100 ))
                                     // Recognize own auto-flags!
@@ -1143,10 +1208,10 @@ ATTR_SETEMPHASIS:
                         case RTF_HYPHEN:
                             {
                                 SvxHyphenZoneItem aHypenZone(
-                                            (nTokenValue & 1) ? TRUE : FALSE,
+                                            (nTokenValue & 1) ? sal_True : sal_False,
                                                 PARDID->nHyphenzone );
                                 aHypenZone.SetPageEnd(
-                                            (nTokenValue & 2) ? TRUE : FALSE );
+                                            (nTokenValue & 2) ? sal_True : sal_False );
 
                                 if( PARDID->nHyphenzone &&
                                     RTF_HYPHLEAD == GetNextToken() &&
@@ -1154,11 +1219,11 @@ ATTR_SETEMPHASIS:
                                     RTF_HYPHMAX == GetNextToken() )
                                 {
                                     aHypenZone.GetMinLead() =
-                                        BYTE(GetStackPtr( -2 )->nTokenValue);
+                                        sal_uInt8(GetStackPtr( -2 )->nTokenValue);
                                     aHypenZone.GetMinTrail() =
-                                            BYTE(GetStackPtr( -1 )->nTokenValue);
+                                            sal_uInt8(GetStackPtr( -1 )->nTokenValue);
                                     aHypenZone.GetMaxHyphens() =
-                                            BYTE(nTokenValue);
+                                            sal_uInt8(nTokenValue);
 
                                     pSet->Put( aHypenZone );
                                 }
@@ -1169,22 +1234,26 @@ ATTR_SETEMPHASIS:
 
                         case RTF_SHADOW:
                             {
-                                int bSkip = TRUE;
+                                int bSkip = sal_True;
                                 do {	// middle check loop
                                     SvxShadowLocation eSL = SvxShadowLocation( nTokenValue );
                                     if( RTF_SHDW_DIST != GetNextToken() )
                                         break;
-                                    USHORT nDist = USHORT( nTokenValue );
+                                    sal_uInt16 nDist = sal_uInt16( nTokenValue );
 
                                     if( RTF_SHDW_STYLE != GetNextToken() )
                                         break;
 
                                     if( RTF_SHDW_COL != GetNextToken() )
                                         break;
-                                    USHORT nCol = USHORT( nTokenValue );
+                                    sal_uInt16 nCol = sal_uInt16( nTokenValue );
 
                                     if( RTF_SHDW_FCOL != GetNextToken() )
                                         break;
+<<<<<<< HEAD
+=======
+//									sal_uInt16 nFillCol = sal_uInt16( nTokenValue );
+>>>>>>> ooo/DEV300_m101
 
                                     Color aColor = GetColor( nCol );
 
@@ -1192,8 +1261,8 @@ ATTR_SETEMPHASIS:
                                         pSet->Put( SvxShadowItem( PARDID->nShadow,
                                                                   &aColor, nDist, eSL ) );
 
-                                    bSkip = FALSE;
-                                } while( FALSE );
+                                    bSkip = sal_False;
+                                } while( sal_False );
 
                                 if( bSkip )
                                     SkipGroup();  // at the end of the group
@@ -1256,7 +1325,7 @@ ATTR_SETEMPHASIS:
                         if (!bFirstToken)
                             --nSkip;	// BRACELEFT: is the next token
                         SkipToken( nSkip );
-                        bWeiter = FALSE;
+                        bWeiter = sal_False;
                     }
                 }
                 break;
@@ -1272,7 +1341,7 @@ ATTR_SETEMPHASIS:
                     // unknown token, so token "returned in Parser"
                     if( !bFirstToken )
                         SkipToken( -1 );
-                    bWeiter = FALSE;
+                    bWeiter = sal_False;
                 }
             }
         }
@@ -1280,8 +1349,37 @@ ATTR_SETEMPHASIS:
         {
             nToken = GetNextToken();
         }
-        bFirstToken = FALSE;
+        bFirstToken = sal_False;
     }
+<<<<<<< HEAD
+=======
+
+/*
+    // teste Attribute gegen ihre Styles
+    if( IsChkStyleAttr() && pSet->Count() && !pInsPos->GetCntIdx() )
+    {
+        SvxRTFStyleType* pStyle = aStyleTbl.Get( nStyleNo );
+        if( pStyle && pStyle->aAttrSet.Count() )
+        {
+            // alle Attribute, die schon vom Style definiert sind, aus dem
+            // akt. Set entfernen
+            const SfxPoolItem* pItem;
+            SfxItemIter aIter( *pSet );
+            sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+            while( sal_True )
+            {
+                if( SFX_ITEM_SET == pStyle->aAttrSet.GetItemState(
+                    nWhich, sal_False, &pItem ) && *pItem == *aIter.GetCurItem())
+                    pSet->ClearItem( nWhich );		// loeschen
+
+                if( aIter.IsAtEnd() )
+                    break;
+                nWhich = aIter.NextItem()->Which();
+            }
+        }
+    }
+*/
+>>>>>>> ooo/DEV300_m101
 }
 
 void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
@@ -1290,7 +1388,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
 // then read all the TabStops
     SvxTabStop aTabStop;
     SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
-    int bWeiter = TRUE;
+    int bWeiter = sal_True;
     do {
         switch( nToken )
         {
@@ -1334,22 +1432,33 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
                     nSkip = -2;
                 else
                 {
+<<<<<<< HEAD
                     aTabStop.GetDecimal() = BYTE(nTokenValue & 0xff);
                     aTabStop.GetFill() = BYTE((nTokenValue >> 8) & 0xff);
                     // overwrite the closing parenthesis
+=======
+                    aTabStop.GetDecimal() = sal_uInt8(nTokenValue & 0xff);
+                    aTabStop.GetFill() = sal_uInt8((nTokenValue >> 8) & 0xff);
+                    // ueberlese noch die schliessende Klammer
+>>>>>>> ooo/DEV300_m101
                     if (bMethodOwnsToken)
                         GetNextToken();
                 }
                 if( nSkip )
                 {
+<<<<<<< HEAD
                     SkipToken( nSkip );		// Ignore back again
                     bWeiter = FALSE;
+=======
+                    SkipToken( nSkip );		// Ignore wieder zurueck
+                    bWeiter = sal_False;
+>>>>>>> ooo/DEV300_m101
                 }
             }
             break;
 
         default:
-            bWeiter = FALSE;
+            bWeiter = sal_False;
         }
         if( bWeiter )
         {
@@ -1398,11 +1507,16 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
     // then read the border attribute
     SvxBoxItem aAttr( PARDID->nBox );
     const SfxPoolItem* pItem;
-    if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) )
         aAttr = *(SvxBoxItem*)pItem;
 
+<<<<<<< HEAD
     SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 );	// simple lines
     int bWeiter = TRUE, nBorderTyp = 0;
+=======
+    SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 );	// einfache Linien
+    int bWeiter = sal_True, nBorderTyp = 0;
+>>>>>>> ooo/DEV300_m101
 
     do {
         switch( nToken )
@@ -1453,23 +1567,23 @@ SETBORDER:
                 switch( nBorderTyp )
                 {
                 case RTF_BRDRB:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_BOTTOM );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_BOTTOM );
                     break;
 
                 case RTF_BRDRT:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_TOP );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_TOP );
                     break;
 
                 case RTF_BRDRL:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_LEFT );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_LEFT );
                     break;
 
                 case RTF_BRDRR:
-                    aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_RIGHT );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_RIGHT );
                     break;
 
                 case RTF_BOX:
-                    aAttr.SetDistance( (USHORT)nTokenValue );
+                    aAttr.SetDistance( (sal_uInt16)nTokenValue );
                     break;
                 }
             }
@@ -1481,7 +1595,7 @@ case RTF_BRDRBAR:			break;
 
         case RTF_BRDRCF:
             {
-                aBrd.SetColor( GetColor( USHORT(nTokenValue) ) );
+                aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ) );
                 SetBorderLine( nBorderTyp, aAttr, aBrd );
             }
             break;
@@ -1577,13 +1691,13 @@ SETBORDERLINE:
                     nSkip = -1;
                 else
                 {
-                    int bSwgControl = TRUE, bFirstToken = TRUE;
+                    int bSwgControl = sal_True, bFirstToken = sal_True;
                     nToken = GetNextToken();
                     do {
                         switch( nToken )
                         {
                         case RTF_BRDBOX:
-                            aAttr.SetDistance( USHORT(nTokenValue) );
+                            aAttr.SetDistance( sal_uInt16(nTokenValue) );
                             break;
 
                         case RTF_BRDRT:
@@ -1591,46 +1705,46 @@ SETBORDERLINE:
                         case RTF_BRDRR:
                         case RTF_BRDRL:
                             nBorderTyp = nToken;
-                            bFirstToken = FALSE;
+                            bFirstToken = sal_False;
                             if( RTF_BRDLINE_COL != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetColor( GetColor( USHORT(nTokenValue) ));
+                            aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ));
 
                             if( RTF_BRDLINE_IN != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetInWidth( USHORT(nTokenValue));
+                            aBrd.SetInWidth( sal_uInt16(nTokenValue));
 
                             if( RTF_BRDLINE_OUT != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetOutWidth( USHORT(nTokenValue));
+                            aBrd.SetOutWidth( sal_uInt16(nTokenValue));
 
                             if( RTF_BRDLINE_DIST != GetNextToken() )
                             {
-                                bSwgControl = FALSE;
+                                bSwgControl = sal_False;
                                 break;
                             }
-                            aBrd.SetDistance( USHORT(nTokenValue));
+                            aBrd.SetDistance( sal_uInt16(nTokenValue));
                             SetBorderLine( nBorderTyp, aAttr, aBrd );
                             break;
 
                         default:
-                            bSwgControl = FALSE;
+                            bSwgControl = sal_False;
                             break;
                         }
 
                         if( bSwgControl )
                         {
                             nToken = GetNextToken();
-                            bFirstToken = FALSE;
+                            bFirstToken = sal_False;
                         }
                     } while( bSwgControl );
 
@@ -1651,8 +1765,13 @@ SETBORDERLINE:
 
                 if( nSkip )
                 {
+<<<<<<< HEAD
                     SkipToken( nSkip );		// Ignore back again
                     bWeiter = FALSE;
+=======
+                    SkipToken( nSkip );		// Ignore wieder zurueck
+                    bWeiter = sal_False;
+>>>>>>> ooo/DEV300_m101
                 }
             }
             break;
@@ -1667,7 +1786,7 @@ SETBORDERLINE:
     SkipToken( -1 );
 }
 
-inline ULONG CalcShading( ULONG nColor, ULONG nFillColor, BYTE nShading )
+inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
 {
     nColor = (nColor * nShading) / 100;
     nFillColor = (nFillColor * ( 100 - nShading )) / 100;
@@ -1677,12 +1796,19 @@ inline ULONG CalcShading( ULONG nColor, ULONG nFillColor, BYTE nShading )
 void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
                                         int bTableDef )
 {
+<<<<<<< HEAD
     // then read the border attribute
     int bWeiter = TRUE;
     USHORT nColor = USHRT_MAX, nFillColor = USHRT_MAX;
     BYTE nFillValue = 0;
-
-    USHORT nWh = ( nToken & ~0xff ) == RTF_CHRFMT
+=======
+    // dann lese doch mal das BoderAttribut ein
+    int bWeiter = sal_True;
+    sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX;
+    sal_uInt8 nFillValue = 0;
+>>>>>>> ooo/DEV300_m101
+
+    sal_uInt16 nWh = ( nToken & ~0xff ) == RTF_CHRFMT
                     ? PLAINID->nBgColor
                     : PARDID->nBrush;
 
@@ -1692,19 +1818,19 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
         case RTF_CLCBPAT:
         case RTF_CHCBPAT:
         case RTF_CBPAT:
-            nFillColor = USHORT( nTokenValue );
+            nFillColor = sal_uInt16( nTokenValue );
             break;
 
         case RTF_CLCFPAT:
         case RTF_CHCFPAT:
         case RTF_CFPAT:
-            nColor = USHORT( nTokenValue );
+            nColor = sal_uInt16( nTokenValue );
             break;
 
         case RTF_CLSHDNG:
         case RTF_CHSHDNG:
         case RTF_SHADING:
-            nFillValue = (BYTE)( nTokenValue / 100 );
+            nFillValue = (sal_uInt8)( nTokenValue / 100 );
             break;
 
         case RTF_CLBGDKHOR:
@@ -1791,9 +1917,9 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
         aColor = aCol;
     else
         aColor = Color(
-            (BYTE)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
-            (BYTE)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
-            (BYTE)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
+            (sal_uInt8)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
+            (sal_uInt8)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
+            (sal_uInt8)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
 
     rSet.Put( SvxBrushItem( aColor, nWh ) );
     SkipToken( -1 );
@@ -1803,34 +1929,43 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
 // pard / plain abarbeiten
 void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
 {
+<<<<<<< HEAD
     if( !bNewGroup && aAttrStack.Top() )	// not at the beginning of a new group
+=======
+    if( !bNewGroup && !aAttrStack.empty() )	// not at the beginning of a new group
+>>>>>>> ooo/DEV300_m101
     {
-        SvxRTFItemStackType* pAkt = aAttrStack.Top();
+        SvxRTFItemStackType* pAkt = aAttrStack.back();
 
         int nLastToken = GetStackPtr(-1)->nTokenId;
-        int bNewStkEntry = TRUE;
+        int bNewStkEntry = sal_True;
         if( RTF_PARD != nLastToken &&
             RTF_PLAIN != nLastToken &&
             BRACELEFT != nLastToken )
         {
             if( pAkt->aAttrSet.Count() || pAkt->pChildList || pAkt->nStyleNo )
             {
+<<<<<<< HEAD
                 // open a new group
                 SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, TRUE );
+=======
+                // eine neue Gruppe aufmachen
+                SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, sal_True );
+>>>>>>> ooo/DEV300_m101
                 pNew->SetRTFDefaults( GetRTFDefaults() );
 
                 // Set all until here valid attributes
                 AttrGroupEnd();
-                pAkt = aAttrStack.Top();  // can be changed after AttrGroupEnd!
+                pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();  // can be changed after AttrGroupEnd!
                 pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
-                aAttrStack.Push( pNew );
+                aAttrStack.push_back( pNew );
                 pAkt = pNew;
             }
             else
             {
                 // continue to use this entry as new
                 pAkt->SetStartPos( *pInsPos );
-                bNewStkEntry = FALSE;
+                bNewStkEntry = sal_False;
             }
         }
 
@@ -1839,8 +1974,8 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             ( pAkt->aAttrSet.GetParent() || pAkt->aAttrSet.Count() ))
         {
             const SfxPoolItem *pItem, *pDef;
-            const USHORT* pPtr;
-            USHORT nCnt;
+            const sal_uInt16* pPtr;
+            sal_uInt16 nCnt;
             const SfxItemSet* pDfltSet = &GetRTFDefaults();
             if( bPard )
             {
@@ -1854,7 +1989,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
                 nCnt = aPlainMap.Count();
             }
 
-            for( USHORT n = 0; n < nCnt; ++n, ++pPtr )
+            for( sal_uInt16 n = 0; n < nCnt; ++n, ++pPtr )
             {
                 // Item set and different -> Set the Default Pool
                 if( !*pPtr )
@@ -1866,19 +2001,19 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
                 else if( !pAkt->aAttrSet.GetParent() )
                 {
                     if( SFX_ITEM_SET ==
-                        pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+                        pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
                         pAkt->aAttrSet.Put( *pDef );
                     else
                         pAkt->aAttrSet.ClearItem( *pPtr );
                 }
                 else if( SFX_ITEM_SET == pAkt->aAttrSet.GetParent()->
-                            GetItemState( *pPtr, TRUE, &pItem ) &&
+                            GetItemState( *pPtr, sal_True, &pItem ) &&
                         *( pDef = &pDfltSet->Get( *pPtr )) != *pItem )
                     pAkt->aAttrSet.Put( *pDef );
                 else
                 {
                     if( SFX_ITEM_SET ==
-                        pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+                        pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
                         pAkt->aAttrSet.Put( *pDef );
                     else
                         pAkt->aAttrSet.ClearItem( *pPtr );
@@ -1897,7 +2032,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
             //we can fall back to the ansicpg set codeset
             if (nDfltFont != -1)
             {
-                const Font& rSVFont = GetFont(USHORT(nDfltFont));
+                const Font& rSVFont = GetFont(sal_uInt16(nDfltFont));
                 SetEncoding(rSVFont.GetCharSet());
             }
             else
@@ -1912,16 +2047,16 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         return;
 
     SfxItemSet aTmp( *pAttrPool, aWhichMap.GetData() );
-    BOOL bOldFlag = bIsLeftToRightDef;
-    bIsLeftToRightDef = TRUE;
+    sal_Bool bOldFlag = bIsLeftToRightDef;
+    bIsLeftToRightDef = sal_True;
     switch( nToken )
     {
-    case RTF_ADEFF:	bIsLeftToRightDef = FALSE;  // no break!
+    case RTF_ADEFF:	bIsLeftToRightDef = sal_False;  // no break!
     case RTF_DEFF:
         {
             if( -1 == nValue )
                 nValue = 0;
-            const Font& rSVFont = GetFont( USHORT(nValue) );
+            const Font& rSVFont = GetFont( sal_uInt16(nValue) );
             SvxFontItem aTmpItem(
                                 rSVFont.GetFamily(), rSVFont.GetName(),
                                 rSVFont.GetStyleName(),	rSVFont.GetPitch(),
@@ -1930,7 +2065,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
         }
         break;
 
-    case RTF_ADEFLANG:	bIsLeftToRightDef = FALSE;  // no break!
+    case RTF_ADEFLANG:	bIsLeftToRightDef = sal_False;  // no break!
     case RTF_DEFLANG:
         // store default Language 
         if( -1 != nValue )
@@ -1944,8 +2079,13 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
     case RTF_DEFTAB:
         if( PARDID->nTabStop )
         {
+<<<<<<< HEAD
             // RTF defines 720 twips as default
             bIsSetDfltTab = TRUE;
+=======
+            // RTF definiert 720 twips als default
+            bIsSetDfltTab = sal_True;
+>>>>>>> ooo/DEV300_m101
             if( -1 == nValue || !nValue )
                 nValue = 720;
 
@@ -1956,11 +2096,44 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
                 CalcValue();
                 nValue = nTokenValue;
             }
+<<<<<<< HEAD
 
             // Calculate the ratio of default TabWidth / Tabs and 
             // calculate the corresponding new number.
             // ?? how did one come up with 13 ??
             USHORT nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / USHORT(nValue);
+=======
+#if 1
+            /*
+            cmc:
+             This stuff looks a little hairy indeed, this should be totally
+             unnecessary where default tabstops are understood. Just make one
+             tabstop and stick the value in there, the first one is all that
+             matters.
+
+             e.g.
+
+            SvxTabStopItem aNewTab(1, sal_uInt16(nValue), SVX_TAB_ADJUST_DEFAULT,
+                PARDID->nTabStop);
+            ((SvxTabStop&)aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
+
+
+             It must exist as a foul hack to support somebody that does not
+             have a true concept of default tabstops by making a tabsetting
+             result from the default tabstop, creating a lot of them all at
+             the default locations to give the effect of the first real
+             default tabstop being in use just in case the receiving
+             application doesn't do that for itself.
+             */
+#endif
+
+            // Verhaeltnis der def. TabWidth / Tabs errechnen und
+            // enstsprechend die neue Anzahl errechnen.
+/*-----------------14.12.94 19:32-------------------
+ ?? wie kommt man auf die 13 ??
+--------------------------------------------------*/
+            sal_uInt16 nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / sal_uInt16(nValue);
+>>>>>>> ooo/DEV300_m101
             /*
              cmc, make sure we have at least one, or all hell breaks loose in
              everybodies exporters, #i8247#
@@ -1968,8 +2141,13 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
             if (nAnzTabs < 1)
                 nAnzTabs = 1;
 
+<<<<<<< HEAD
             // we want Defaulttabs
             SvxTabStopItem aNewTab( nAnzTabs, USHORT(nValue),
+=======
+            // wir wollen Defaulttabs
+            SvxTabStopItem aNewTab( nAnzTabs, sal_uInt16(nValue),
+>>>>>>> ooo/DEV300_m101
                                 SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
             while( nAnzTabs )
                 ((SvxTabStop&)aNewTab[ --nAnzTabs ]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
@@ -1984,7 +2162,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
     {
         SfxItemIter aIter( aTmp );
         const SfxPoolItem* pItem = aIter.GetCurItem();
-        while( TRUE )
+        while( sal_True )
         {
             pAttrPool->SetPoolDefaultItem( *pItem );
             if( aIter.IsAtEnd() )
diff --git a/editeng/source/rtf/segincr.asm b/editeng/source/rtf/segincr.asm
index 27575f74ad..27575f74ad 100644..100755
--- a/editeng/source/rtf/segincr.asm
+++ b/editeng/source/rtf/segincr.asm
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8170ab429b..0d91e30127 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -53,7 +53,6 @@
 using namespace ::com::sun::star;
 
 
-SV_IMPL_PTRARR( SvxRTFColorTbl, ColorPtr )
 SV_IMPL_PTRARR( SvxRTFItemStackList, SvxRTFItemStackType* )
 
 CharSet lcl_GetDefaultTextEncodingForRTF()
@@ -81,7 +80,6 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
             int bReadNewDoc )
     : SvRTFParser( rIn, 5 ),
     rStrm(rIn),
-    aColorTbl( 16, 4 ),
     aFontTbl( 16, 4 ),
     pInsPos( 0 ),
     pAttrPool( &rPool ),
@@ -91,18 +89,18 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
 {
     bNewDoc = bReadNewDoc;
 
-    bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = FALSE;
-    bIsLeftToRightDef = TRUE;
+    bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = sal_False;
+    bIsLeftToRightDef = sal_True;
 
     {
         RTFPlainAttrMapIds aTmp( rPool );
-        aPlainMap.Insert( (USHORT*)&aTmp,
-                    sizeof( RTFPlainAttrMapIds ) / sizeof(USHORT), 0 );
+        aPlainMap.Insert( (sal_uInt16*)&aTmp,
+                    sizeof( RTFPlainAttrMapIds ) / sizeof(sal_uInt16), 0 );
     }
     {
         RTFPardAttrMapIds aTmp( rPool );
-        aPardMap.Insert( (USHORT*)&aTmp,
-                    sizeof( RTFPardAttrMapIds ) / sizeof(USHORT), 0 );
+        aPardMap.Insert( (sal_uInt16*)&aTmp,
+                    sizeof( RTFPardAttrMapIds ) / sizeof(sal_uInt16), 0 );
     }
     pDfltFont = new Font;
     pDfltColor = new Color;
@@ -122,13 +120,13 @@ void SvxRTFParser::ResetPard()
 
 SvxRTFParser::~SvxRTFParser()
 {
-    if( aColorTbl.Count() )
+    if( !aColorTbl.empty() )
         ClearColorTbl();
     if( aFontTbl.Count() )
         ClearFontTbl();
     if( aStyleTbl.Count() )
         ClearStyleTbl();
-    if( aAttrStack.Count() )
+    if( !aAttrStack.empty() )
         ClearAttrStack();
 
     delete pRTFDefaults;
@@ -152,17 +150,17 @@ SvParserState SvxRTFParser::CallParser()
     if( !pInsPos )
         return SVPAR_ERROR;
 
-    if( aColorTbl.Count() )
+    if( !aColorTbl.empty() )
         ClearColorTbl();
     if( aFontTbl.Count() )
         ClearFontTbl();
     if( aStyleTbl.Count() )
         ClearStyleTbl();
-    if( aAttrStack.Count() )
+    if( !aAttrStack.empty() )
         ClearAttrStack();
 
-    bIsSetDfltTab = FALSE;
-    bNewGroup = FALSE;
+    bIsSetDfltTab = sal_False;
+    bNewGroup = sal_False;
     nDfltFont = 0;
 
     sBaseURL.Erase();
@@ -237,7 +235,7 @@ INSINGLECHAR:
         {
             InsertText();
             // all collected Attributes are set
-            for( USHORT n = aAttrSetList.Count(); n; )
+            for( sal_uInt16 n = aAttrSetList.Count(); n; )
             {
                 SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
                 SetAttrSet( *pStkSet );
@@ -349,8 +347,8 @@ void SvxRTFParser::ReadStyleTable()
     SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, aWhichMap.GetData() );
     pStyle->aAttrSet.Put( GetRTFDefaults() );
 
-    bIsInReadStyleTab = TRUE;
-    bChkStyleAttr = FALSE;		// Do not check Attribute against the Styles
+    bIsInReadStyleTab = sal_True;
+    bChkStyleAttr = sal_False;		// Do not check Attribute against the Styles
 
     while( _nOpenBrakets && IsParserWorking() )
     {
@@ -381,13 +379,13 @@ void SvxRTFParser::ReadStyleTable()
             }
             break;
 
-        case RTF_SBASEDON:	pStyle->nBasedOn = USHORT(nTokenValue); pStyle->bBasedOnIsSet=TRUE;	break;
-        case RTF_SNEXT:		pStyle->nNext = USHORT(nTokenValue);   	break;
+        case RTF_SBASEDON:	pStyle->nBasedOn = sal_uInt16(nTokenValue); pStyle->bBasedOnIsSet=sal_True;	break;
+        case RTF_SNEXT:		pStyle->nNext = sal_uInt16(nTokenValue);   	break;
         case RTF_OUTLINELEVEL:
-        case RTF_SOUTLVL:	pStyle->nOutlineNo = BYTE(nTokenValue);	break;
+        case RTF_SOUTLVL:	pStyle->nOutlineNo = sal_uInt8(nTokenValue);	break;
         case RTF_S:			nStyleNo = (short)nTokenValue;			break;
         case RTF_CS:		nStyleNo = (short)nTokenValue;
-                            pStyle->bIsCharFmt = TRUE;
+                            pStyle->bIsCharFmt = sal_True;
                             break;
 
         case RTF_TEXTTOKEN:
@@ -439,21 +437,21 @@ void SvxRTFParser::ReadStyleTable()
 
     // Flag back to old state
     bChkStyleAttr = bSaveChkStyleAttr;
-    bIsInReadStyleTab = FALSE;
+    bIsInReadStyleTab = sal_False;
 }
 
 void SvxRTFParser::ReadColorTable()
 {
     int nToken;
-    BYTE nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
+    sal_uInt8 nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
 
     while( '}' != ( nToken = GetNextToken() ) && IsParserWorking() )
     {
         switch( nToken )
         {
-        case RTF_RED:	nRed = BYTE(nTokenValue);		break;
-        case RTF_GREEN:	nGreen = BYTE(nTokenValue);		break;
-        case RTF_BLUE:	nBlue = BYTE(nTokenValue);		break;
+        case RTF_RED:	nRed = sal_uInt8(nTokenValue);		break;
+        case RTF_GREEN:	nGreen = sal_uInt8(nTokenValue);		break;
+        case RTF_BLUE:	nBlue = sal_uInt8(nTokenValue);		break;
 
         case RTF_TEXTTOKEN:
             if( 1 == aToken.Len()
@@ -469,10 +467,10 @@ void SvxRTFParser::ReadColorTable()
                 // one color is finished, fill in the table
                 // try to map the values to SV internal names
                 ColorPtr pColor = new Color( nRed, nGreen, nBlue );
-                if( !aColorTbl.Count() &&
-                    BYTE(-1) == nRed && BYTE(-1) == nGreen && BYTE(-1) == nBlue )
+                if( aColorTbl.empty() &&
+                    sal_uInt8(-1) == nRed && sal_uInt8(-1) == nGreen && sal_uInt8(-1) == nBlue )
                     pColor->SetColor( COL_AUTO );
-                aColorTbl.Insert( pColor, aColorTbl.Count() );
+                aColorTbl.push_back( pColor );
                 nRed = 0, nGreen = 0, nBlue = 0;
 
                 // Color has been completely read, 
@@ -492,7 +490,7 @@ void SvxRTFParser::ReadFontTable()
     Font* pFont = new Font();
     short nFontNo(0), nInsFontNo (0);
     String sAltNm, sFntNm;
-    BOOL bIsAltFntNm = FALSE, bCheckNewFont;
+    sal_Bool bIsAltFntNm = sal_False, bCheckNewFont;
 
     CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF();
     pFont->SetCharSet( nSystemChar );
@@ -500,16 +498,16 @@ void SvxRTFParser::ReadFontTable()
 
     while( _nOpenBrakets && IsParserWorking() )
     {
-        bCheckNewFont = FALSE;
+        bCheckNewFont = sal_False;
         switch( ( nToken = GetNextToken() ))
         {
             case '}':
-                bIsAltFntNm = FALSE;
+                bIsAltFntNm = sal_False;
                 // Style has been completely read, 
                 // so this is still a stable status
                 if( --_nOpenBrakets <= 1 && IsParserWorking() )
                     SaveState( RTF_FONTTBL );
-                bCheckNewFont = TRUE;
+                bCheckNewFont = sal_True;
                 nInsFontNo = nFontNo;
                 break;
             case '{':
@@ -558,7 +556,7 @@ void SvxRTFParser::ReadFontTable()
                 if (-1 != nTokenValue)
                 {
                     CharSet nCharSet = rtl_getTextEncodingFromWindowsCharset(
-                        (BYTE)nTokenValue);
+                        (sal_uInt8)nTokenValue);
                     pFont->SetCharSet(nCharSet);
                     //When we're in a font, the fontname is in the font
                     //charset, except for symbol fonts I believe
@@ -579,12 +577,12 @@ void SvxRTFParser::ReadFontTable()
                 }
                 break;
             case RTF_F:
-                bCheckNewFont = TRUE;
+                bCheckNewFont = sal_True;
                 nInsFontNo = nFontNo;
                 nFontNo = (short)nTokenValue;
                 break;
             case RTF_FALT:
-                bIsAltFntNm = TRUE;
+                bIsAltFntNm = sal_True;
                 break;
             case RTF_TEXTTOKEN:
                 DelCharAtEnd( aToken, ';' );
@@ -672,19 +670,19 @@ String& SvxRTFParser::GetTextToEndGroup( String& rStr )
 util::DateTime SvxRTFParser::GetDateTimeStamp( )
 {
     util::DateTime aDT;
-    BOOL bWeiter = TRUE;
+    sal_Bool bWeiter = sal_True;
     int nToken;
     while( bWeiter && IsParserWorking() )
     {
         switch( nToken = GetNextToken() )
         {
-        case RTF_YR:	aDT.Year = (USHORT)nTokenValue;	    break;
-        case RTF_MO:    aDT.Month = (USHORT)nTokenValue;	break;
-        case RTF_DY:	aDT.Day = (USHORT)nTokenValue;	    break;
-        case RTF_HR:	aDT.Hours = (USHORT)nTokenValue;	break;
-        case RTF_MIN:	aDT.Minutes = (USHORT)nTokenValue;	break;
+        case RTF_YR:	aDT.Year = (sal_uInt16)nTokenValue;	    break;
+        case RTF_MO:    aDT.Month = (sal_uInt16)nTokenValue;	break;
+        case RTF_DY:	aDT.Day = (sal_uInt16)nTokenValue;	    break;
+        case RTF_HR:	aDT.Hours = (sal_uInt16)nTokenValue;	break;
+        case RTF_MIN:	aDT.Minutes = (sal_uInt16)nTokenValue;	break;
         default:
-            bWeiter = FALSE;
+            bWeiter = sal_False;
         }
     }
     SkipToken( -1 );		// the closing brace is evaluated "above"
@@ -799,27 +797,32 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
 
 void SvxRTFParser::ClearColorTbl()
 {
-    aColorTbl.DeleteAndDestroy( 0, aColorTbl.Count() );
+    while ( !aColorTbl.empty() )
+    {
+        delete aColorTbl.back();
+        aColorTbl.pop_back();
+    }
 }
 
 void SvxRTFParser::ClearFontTbl()
 {
-    for( ULONG nCnt = aFontTbl.Count(); nCnt; )
+    for( sal_uInt32 nCnt = aFontTbl.Count(); nCnt; )
         delete aFontTbl.GetObject( --nCnt );
 }
 
 void SvxRTFParser::ClearStyleTbl()
 {
-    for( ULONG nCnt = aStyleTbl.Count(); nCnt; )
+    for( sal_uInt32 nCnt = aStyleTbl.Count(); nCnt; )
         delete aStyleTbl.GetObject( --nCnt );
 }
 
 void SvxRTFParser::ClearAttrStack()
 {
     SvxRTFItemStackType* pTmp;
-    for( ULONG nCnt = aAttrStack.Count(); nCnt; --nCnt )
+    for( size_t nCnt = aAttrStack.size(); nCnt; --nCnt )
     {
-        pTmp = aAttrStack.Pop();
+        pTmp = aAttrStack.back();
+        aAttrStack.pop_back();
         delete pTmp;
     }
 }
@@ -836,7 +839,7 @@ String& SvxRTFParser::DelCharAtEnd( String& rStr, const sal_Unicode cDel )
 }
 
 
-const Font& SvxRTFParser::GetFont( USHORT nId )
+const Font& SvxRTFParser::GetFont( sal_uInt16 nId )
 {
     const Font* pFont = aFontTbl.Get( nId );
     if( !pFont )
@@ -853,7 +856,7 @@ const Font& SvxRTFParser::GetFont( USHORT nId )
 
 SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( int bCopyAttr )
 {
-    SvxRTFItemStackType* pAkt = aAttrStack.Top();
+    SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
     SvxRTFItemStackType* pNew;
     if( pAkt )
         pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, bCopyAttr );
@@ -862,8 +865,8 @@ SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( int bCopyAttr )
                                         *pInsPos );
     pNew->SetRTFDefaults( GetRTFDefaults() );
 
-    aAttrStack.Push( pNew );
-    bNewGroup = FALSE;
+    aAttrStack.push_back( pNew );
+    bNewGroup = sal_False;
     return pNew;
 }
 
@@ -882,10 +885,10 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
         !rStkType.GetAttrSet().Count() ||
         0 == ( pStyle = aStyleTbl.Get( rStkType.nStyleNo ) ))
     {
-        for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+        for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
         {
             if( SFX_WHICH_MAX > nWhich &&
-                SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+                SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
                      rPool.GetDefaultItem( nWhich ) == *pItem )
                 rSet.ClearItem( nWhich );		// delete
         }
@@ -896,16 +899,16 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
         // from the current AttrSet.
         SfxItemSet &rStyleSet = pStyle->aAttrSet;
         const SfxPoolItem* pSItem;
-        for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+        for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
         {
-            if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, TRUE, &pSItem ))
+            if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, sal_True, &pSItem ))
             {
-                if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem )
+                if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem )
                     && *pItem == *pSItem )
                     rSet.ClearItem( nWhich );		// delete
             }
             else if( SFX_WHICH_MAX > nWhich &&
-                    SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+                    SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
                      rPool.GetDefaultItem( nWhich ) == *pItem )
                 rSet.ClearItem( nWhich );		// delete
         }
@@ -914,13 +917,14 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
 
 void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
 {
-    if( aAttrStack.Count() )
+    if( !aAttrStack.empty() )
     {
-        SvxRTFItemStackType *pOld = aAttrStack.Pop();
-        SvxRTFItemStackType *pAkt = aAttrStack.Top();
+        SvxRTFItemStackType *pOld = aAttrStack.empty() ? 0 : aAttrStack.back();
+        aAttrStack.pop_back();
+        SvxRTFItemStackType *pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
 
         do {		// middle check loop
-            ULONG nOldSttNdIdx = pOld->pSttNd->GetIdx();
+            sal_uLong nOldSttNdIdx = pOld->pSttNd->GetIdx();
             if( !pOld->pChildList &&
                 ((!pOld->aAttrSet.Count() && !pOld->nStyleNo ) ||
                 (nOldSttNdIdx == pInsPos->GetNodeIdx() &&
@@ -932,10 +936,10 @@ void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
             {
                 SfxItemIter aIter( pOld->aAttrSet );
                 const SfxPoolItem* pItem = aIter.GetCurItem(), *pGet;
-                while( TRUE )
+                while( sal_True )
                 {
                     if( SFX_ITEM_SET == pAkt->aAttrSet.GetItemState(
-                        pItem->Which(), FALSE, &pGet ) &&
+                        pItem->Which(), sal_False, &pGet ) &&
                         *pItem == *pGet )
                         pOld->aAttrSet.ClearItem( pItem->Which() );
 
@@ -954,8 +958,8 @@ void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
             if( bCrsrBack )
             {
                 // at the beginning of a paragraph? Move back one position
-                ULONG nNd = pInsPos->GetNodeIdx();
-                MovePos( FALSE );
+                sal_uLong nNd = pInsPos->GetNodeIdx();
+                MovePos( sal_False );
                 // if can not move backward then later dont move forward !
                 bCrsrBack = nNd != pInsPos->GetNodeIdx();
             }
@@ -979,11 +983,11 @@ void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
                         // - all paragraph attributes to get the area
                         // 	 up to the previous paragraph
                         SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                    *pOld, *pInsPos, TRUE );
+                                    *pOld, *pInsPos, sal_True );
                         pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() );
 
                         // Delete all paragraph attributes from pNew
-                        for( USHORT n = 0; n < aPardMap.Count() &&
+                        for( sal_uInt16 n = 0; n < aPardMap.Count() &&
                                             pNew->aAttrSet.Count(); ++n )
                             if( aPardMap[n] )
                                 pNew->aAttrSet.ClearItem( aPardMap[n] );
@@ -1049,19 +1053,19 @@ void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
                     if( bCrsrBack && 50 < pAkt->pChildList->Count() )
                     {
                         // at the beginning of a paragraph? Move back one position
-                        MovePos( TRUE );
-                        bCrsrBack = FALSE;
+                        MovePos( sal_True );
+                        bCrsrBack = sal_False;
 
                         // Open a new Group.
                         SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-                                                *pAkt, *pInsPos, TRUE );
+                                                *pAkt, *pInsPos, sal_True );
                         pNew->SetRTFDefaults( GetRTFDefaults() );
 
                         // Set all until here valid Attributes 
                         AttrGroupEnd();
-                        pAkt = aAttrStack.Top();  // can be changed after AttrGroupEnd!
+                        pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();  // can be changed after AttrGroupEnd!
                         pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : 0 );
-                        aAttrStack.Push( pNew );
+                        aAttrStack.push_back( pNew );
                         pAkt = pNew;
                     }
                 }
@@ -1075,24 +1079,24 @@ void SvxRTFParser::AttrGroupEnd()	// process the current, delete from Stack
 
             if( bCrsrBack )
                 // at the beginning of a paragraph? Move back one position
-                MovePos( TRUE );
+                MovePos( sal_True );
 
-        } while( FALSE );
+        } while( sal_False );
 
         if( pOld )
             delete pOld;
 
-        bNewGroup = FALSE;
+        bNewGroup = sal_False;
     }
 }
 
 void SvxRTFParser::SetAllAttrOfStk()		// end all Attr. and set it into doc
 {
-    // Yet to get all Attrbutes from the stack!
-    while( aAttrStack.Count() )
+    // repeat until all attributes will be taken from stack
+    while( !aAttrStack.empty() )
         AttrGroupEnd();
 
-    for( USHORT n = aAttrSetList.Count(); n; )
+    for( sal_uInt16 n = aAttrSetList.Count(); n; )
     {
         SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
         SetAttrSet( *pStkSet );
@@ -1114,14 +1118,14 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
 
     // then process all the children
     if( rSet.pChildList )
-        for( USHORT n = 0; n < rSet.pChildList->Count(); ++n )
+        for( sal_uInt16 n = 0; n < rSet.pChildList->Count(); ++n )
             SetAttrSet( *(*rSet.pChildList)[ n ] );
 }
 
     // Has no Text been inserted yet? (SttPos from the top Stack entry!)
 int	SvxRTFParser::IsAttrSttPos()
 {
-    SvxRTFItemStackType* pAkt = aAttrStack.Top();
+    SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
     return !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
         pAkt->nSttCnt == pInsPos->GetCntIdx());
 }
@@ -1135,13 +1139,13 @@ void SvxRTFParser::BuildWhichTbl()
 {
     if( aWhichMap.Count() )
         aWhichMap.Remove( 0, aWhichMap.Count() );
-    aWhichMap.Insert( (USHORT)0, (USHORT)0 );
+    aWhichMap.Insert( (sal_uInt16)0, (sal_uInt16)0 );
 
     // Building a Which-Map 'rWhichMap' from an Array of
     // 'pWhichIds' frm Which-Ids. It has the long 'nWhichIds'.
     // The Which-Map is not going to be deleted.
-    SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPardMap.GetData(), aPardMap.Count() );
-    SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPlainMap.GetData(), aPlainMap.Count() );
+    SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPardMap.GetData(), aPardMap.Count() );
+    SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPlainMap.GetData(), aPlainMap.Count() );
 }
 
 const SfxItemSet& SvxRTFParser::GetRTFDefaults()
@@ -1149,10 +1153,10 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
     if( !pRTFDefaults )
     {
         pRTFDefaults = new SfxItemSet( *pAttrPool, aWhichMap.GetData() );
-        USHORT nId;
+        sal_uInt16 nId;
         if( 0 != ( nId = ((RTFPardAttrMapIds*)aPardMap.GetData())->nScriptSpace ))
         {
-            SvxScriptSpaceItem aItem( FALSE, nId );
+            SvxScriptSpaceItem aItem( sal_False, nId );
             if( bNewDoc )
                 pAttrPool->SetPoolDefaultItem( aItem );
             else
@@ -1164,19 +1168,19 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
 
 /**/
 
-SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange )
+SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange )
     : aAttrSet( rPool, pWhichRange )
 {
-    nOutlineNo = BYTE(-1);			// not set
+    nOutlineNo = sal_uInt8(-1);			// not set
     nBasedOn = 0;
-    bBasedOnIsSet = FALSE;
+    bBasedOnIsSet = sal_False;          //$flr #117411#
     nNext = 0;
-    bIsCharFmt = FALSE;
+    bIsCharFmt = sal_False;
 }
 
 
 SvxRTFItemStackType::SvxRTFItemStackType(
-        SfxItemPool& rPool, const USHORT* pWhichRange,
+        SfxItemPool& rPool, const sal_uInt16* pWhichRange,
         const SvxPosition& rPos )
     : aAttrSet( rPool, pWhichRange ),
     pChildList( 0 ),
@@ -1252,8 +1256,8 @@ void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
     }
 
     //And the same for all the children
-    USHORT nCount = pChildList ? pChildList->Count() : 0;
-    for (USHORT i = 0; i < nCount; ++i)
+    sal_uInt16 nCount = pChildList ? pChildList->Count() : 0;
+    for (sal_uInt16 i = 0; i < nCount; ++i)
     {
         SvxRTFItemStackType* pStk = (*pChildList)[i];
         pStk->MoveFullNode(rOldNode, rNewNode);
@@ -1269,7 +1273,7 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
 {
     DBG_ASSERT( pChildList, "There is no child list" );
 
-    USHORT n;
+    sal_uInt16 n;
     SvxRTFItemStackType* pTmp = (*pChildList)[0];
 
     if( !pTmp->aAttrSet.Count() ||
@@ -1308,15 +1312,15 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
             SfxItemIter aIter( aMrgSet );
             const SfxPoolItem* pItem;
             do {
-                USHORT nWhich = aIter.GetCurItem()->Which();
+                sal_uInt16 nWhich = aIter.GetCurItem()->Which();
                 if( SFX_ITEM_SET != pTmp->aAttrSet.GetItemState( nWhich,
-                      FALSE, &pItem ) || *pItem != *aIter.GetCurItem() )
+                      sal_False, &pItem ) || *pItem != *aIter.GetCurItem() )
                     aMrgSet.ClearItem( nWhich );
 
                 if( aIter.IsAtEnd() )
                     break;
                 aIter.NextItem();
-            } while( TRUE );
+            } while( sal_True );
 
             if( !aMrgSet.Count() )
                 return;
@@ -1357,14 +1361,14 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
     {
         SfxItemIter aIter( rDefaults );
         do {
-            USHORT nWhich = aIter.GetCurItem()->Which();
-            if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, FALSE ))
+            sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+            if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, sal_False ))
                 aAttrSet.Put( *aIter.GetCurItem() );
 
             if( aIter.IsAtEnd() )
                 break;
             aIter.NextItem();
-        } while( TRUE );
+        } while( sal_True );
     }
 }
 
@@ -1372,62 +1376,62 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
 
 RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool )
 {
-    nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, FALSE );
-    nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, FALSE );
-    nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, FALSE );
-    nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, FALSE );
-    nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, FALSE );
-    nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, FALSE );
-    nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, FALSE );
-    nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, FALSE );
-    nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, FALSE );
-    nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, FALSE );
-    nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, FALSE );
-    nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, FALSE );
-    nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, FALSE );
-    nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, FALSE );
-    nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, FALSE );
-    nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, FALSE );
-    nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, FALSE );
-
-    nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, FALSE );
-    nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, FALSE );
-    nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, FALSE );
-    nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, FALSE );
-    nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, FALSE );
-    nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, FALSE );
-    nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, FALSE );
-    nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, FALSE );
-    nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, FALSE );
-    nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, FALSE );
-    nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, FALSE );
-    nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, FALSE );
-    nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, FALSE );
-    nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, FALSE );
-    nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, FALSE );
-    nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, FALSE );
-    nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, FALSE );
+    nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, sal_False );
+    nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, sal_False );
+    nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, sal_False );
+    nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, sal_False );
+    nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, sal_False );
+    nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, sal_False );
+    nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, sal_False );
+    nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, sal_False );
+    nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, sal_False );
+    nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, sal_False );
+    nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, sal_False );
+    nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, sal_False );
+    nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, sal_False );
+    nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, sal_False );
+    nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, sal_False );
+    nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, sal_False );
+    nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, sal_False );
+
+    nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, sal_False );
+    nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, sal_False );
+    nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False );
+    nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, sal_False );
+    nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, sal_False );
+    nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, sal_False );
+    nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, sal_False );
+    nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False );
+    nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, sal_False );
+    nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, sal_False );
+    nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, sal_False );
+    nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, sal_False );
+    nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
+    nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, sal_False );
+    nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, sal_False );
+    nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, sal_False );
+    nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, sal_False );
 }
 
 RTFPardAttrMapIds ::RTFPardAttrMapIds ( const SfxItemPool& rPool )
 {
-    nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, FALSE );
-    nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, FALSE );
-    nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, FALSE );
-    nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, FALSE );
-    nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, FALSE );
-    nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, FALSE );
-    nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, FALSE );
-    nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, FALSE );
-    nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, FALSE );
-    nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, FALSE );
-    nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, FALSE );
-    nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, FALSE );
-    nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, FALSE );
-    nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, FALSE );
-    nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, FALSE );
-    nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, FALSE );
-    nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, FALSE );
+    nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, sal_False );
+    nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, sal_False );
+    nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, sal_False );
+    nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, sal_False );
+    nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, sal_False );
+    nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, sal_False );
+    nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, sal_False );
+    nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, sal_False );
+    nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, sal_False );
+    nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, sal_False );
+    nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, sal_False );
+    nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, sal_False );
+    nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, sal_False );
+    nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, sal_False );
+    nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, sal_False );
+    nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, sal_False );
+    nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 5d3c3b468f..985c27be9e 100644..100755
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -64,7 +64,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
         throw RuntimeException();
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
-    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, FALSE );
+    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
     if(!pForbidden)
         throw NoSuchElementException();
 
@@ -80,7 +80,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
         return sal_False;
 
     const LanguageType eLang = SvxLocaleToLanguage( rLocale );
-    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, FALSE );
+    const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
 
     return NULL != pForbidden;
 }
@@ -128,7 +128,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
 
         for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
         {
-            const ULONG nLanguage = mxForbiddenChars->GetObjectKey( nIndex );
+            const sal_uLong nLanguage = mxForbiddenChars->GetObjectKey( nIndex );
             SvxLanguageToLocale ( *pLocales++, static_cast < LanguageType > (nLanguage) );
         }
     }
diff --git a/editeng/source/uno/makefile.mk b/editeng/source/uno/makefile.mk
deleted file mode 100644
index 573dd21508..0000000000
--- a/editeng/source/uno/makefile.mk
+++ /dev/null
@@ -1,61 +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=editeng
-TARGET=uno
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/unonrule.obj	\
-        $(SLO)$/unoedsrc.obj	\
-        $(SLO)$/unoedhlp.obj	\
-        $(SLO)$/unofdesc.obj	\
-        $(SLO)$/unoviwou.obj	\
-        $(SLO)$/unofored.obj	\
-        $(SLO)$/unoforou.obj	\
-        $(SLO)$/unoipset.obj	\
-        $(SLO)$/unotext.obj		\
-        $(SLO)$/unotext2.obj	\
-        $(SLO)$/unofield.obj	\
-        $(SLO)$/UnoForbiddenCharsTable.obj \
-        $(SLO)$/unopracc.obj	\
-        $(SLO)$/unoedprx.obj	\
-        $(SLO)$/unoviwed.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 219f2e797f..1280f3b83a 100644..100755
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -38,46 +38,46 @@
 
 TYPEINIT1( SvxEditSourceHint, TextHint );
 
-SvxEditSourceHint::SvxEditSourceHint( ULONG _nId ) : 
+SvxEditSourceHint::SvxEditSourceHint( sal_uLong _nId ) : 
     TextHint( _nId ),
     mnStart( 0 ),
     mnEnd( 0 )
 {
 }
 
-SvxEditSourceHint::SvxEditSourceHint( ULONG _nId, ULONG nValue, ULONG nStart, ULONG nEnd ) : 
+SvxEditSourceHint::SvxEditSourceHint( sal_uLong _nId, sal_uLong nValue, sal_uLong nStart, sal_uLong nEnd ) : 
     TextHint( _nId, nValue ),
     mnStart( nStart),
     mnEnd( nEnd )
 {
 }
 
-ULONG SvxEditSourceHint::GetValue() const
+sal_uLong SvxEditSourceHint::GetValue() const
 {
     return TextHint::GetValue();
 }
 
-ULONG SvxEditSourceHint::GetStartValue() const
+sal_uLong SvxEditSourceHint::GetStartValue() const
 {
     return mnStart;
 }
 
-ULONG SvxEditSourceHint::GetEndValue() const
+sal_uLong SvxEditSourceHint::GetEndValue() const
 {
     return mnEnd;
 }
 
-void SvxEditSourceHint::SetValue( ULONG n )
+void SvxEditSourceHint::SetValue( sal_uLong n )
 {
     TextHint::SetValue( n );
 }
 
-void SvxEditSourceHint::SetStartValue( ULONG n )
+void SvxEditSourceHint::SetStartValue( sal_uLong n )
 {
     mnStart = n;
 }
 
-void SvxEditSourceHint::SetEndValue( ULONG n )
+void SvxEditSourceHint::SetEndValue( sal_uLong n )
 {
     mnEnd = n; 
 }
@@ -132,14 +132,14 @@ void SvxEditSourceHint::SetEndValue( ULONG n )
     return ::std::auto_ptr<SfxHint>( new SfxHint() );
 }
 
-sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex )
+sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex )
 {
     EECharAttribArray aCharAttribs;
     
     rEE.GetCharAttribs( nPara, aCharAttribs );
     
     // find closest index in front of nIndex
-    USHORT nAttr, nCurrIndex;
+    sal_uInt16 nAttr, nCurrIndex;
     sal_Int32 nClosestStartIndex;
     for( nAttr=0, nClosestStartIndex=0; nAttr<aCharAttribs.Count(); ++nAttr )
     {
@@ -167,8 +167,8 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( USHORT& nStartIndex, USHORT& nEnd
         }
     }
 
-    nStartIndex = static_cast<USHORT>( nClosestStartIndex );
-    nEndIndex = static_cast<USHORT>( nClosestEndIndex );
+    nStartIndex = static_cast<sal_uInt16>( nClosestStartIndex );
+    nEndIndex = static_cast<sal_uInt16>( nClosestEndIndex );
 
     return sal_True;
 }
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 29b4deca4e..8cc4e1f157 100644..100755
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -77,11 +77,11 @@ public:
     ~SvxAccessibleTextIndex() {};
 
     // Get/Set current paragraph
-    void SetParagraph( USHORT nPara )
+    void SetParagraph( sal_uInt16 nPara )
     {
         mnPara = nPara;
     }
-    USHORT GetParagraph() const { return mnPara; }
+    sal_uInt16 GetParagraph() const { return mnPara; }
 
     /** Set the index in the UAA semantic
 
@@ -92,7 +92,7 @@ public:
         The text forwarder to use in the calculations
      */
     void SetIndex( sal_Int32 nIndex, const SvxTextForwarder& rTF );
-    void SetIndex( USHORT nPara, sal_Int32 nIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetIndex(nIndex, rTF); }
+    void SetIndex( sal_uInt16 nPara, sal_Int32 nIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetIndex(nIndex, rTF); }
     sal_Int32 GetIndex() const { return mnIndex; }
 
     /** Set the index in the edit engine semantic
@@ -106,9 +106,9 @@ public:
         @param rTF
         The text forwarder to use in the calculations
      */
-    void SetEEIndex( USHORT nEEIndex, const SvxTextForwarder& rTF );
-    void SetEEIndex( USHORT nPara, USHORT nEEIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetEEIndex(nEEIndex, rTF); }
-    USHORT GetEEIndex() const;
+    void SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwarder& rTF );
+    void SetEEIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex, const SvxTextForwarder& rTF ) { SetParagraph(nPara); SetEEIndex(nEEIndex, rTF); }
+    sal_uInt16 GetEEIndex() const;
 
     void SetFieldOffset( sal_Int32 nOffset, sal_Int32 nLen ) { mnFieldOffset = nOffset; mnFieldLen = nLen; }
     sal_Int32 GetFieldOffset() const { return mnFieldOffset; }
@@ -129,7 +129,7 @@ public:
     sal_Bool IsEditableRange( const SvxAccessibleTextIndex& rEnd ) const;
 
 private:
-    USHORT 	  mnPara;
+    sal_uInt16 	  mnPara;
     sal_Int32 mnIndex;
     sal_Int32 mnEEIndex;
     sal_Int32 mnFieldOffset;
@@ -179,15 +179,15 @@ ESelection MakeEESelection( const SvxAccessibleTextIndex& rIndex )
                        rIndex.GetParagraph(), rIndex.GetEEIndex() + 1 );
 }
 
-USHORT SvxAccessibleTextIndex::GetEEIndex() const
+sal_uInt16 SvxAccessibleTextIndex::GetEEIndex() const
 {
     DBG_ASSERT(mnEEIndex >= 0 && mnEEIndex <= USHRT_MAX,
                "SvxAccessibleTextIndex::GetEEIndex: index value overflow");
 
-    return static_cast< USHORT > (mnEEIndex);
+    return static_cast< sal_uInt16 > (mnEEIndex);
 }
 
-void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder& rTF )
+void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwarder& rTF )
 {
     // reset
     mnFieldOffset = 0;
@@ -201,7 +201,7 @@ void SvxAccessibleTextIndex::SetEEIndex( USHORT nEEIndex, const SvxTextForwarder
     mnEEIndex = nEEIndex;
 
     // calculate unknowns
-    USHORT					nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
+    sal_uInt16					nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
 
     mnIndex = nEEIndex;
 
@@ -247,7 +247,7 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder&
     mnIndex = nIndex;
 
     // calculate unknowns
-    USHORT					nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
+    sal_uInt16					nCurrField, nFieldCount = rTF.GetFieldCount( GetParagraph() );
 
     DBG_ASSERT(nIndex >= 0 && nIndex <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
@@ -456,21 +456,21 @@ SvxAccessibleTextAdapter::~SvxAccessibleTextAdapter()
 {
 }
 
-USHORT SvxAccessibleTextAdapter::GetParagraphCount() const
+sal_uInt16 SvxAccessibleTextAdapter::GetParagraphCount() const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetParagraphCount();
 }
 
-USHORT SvxAccessibleTextAdapter::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetTextLen( sal_uInt16 nParagraph ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     SvxAccessibleTextIndex aIndex;
     aIndex.SetEEIndex( nParagraph, mrTextForwarder->GetTextLen( nParagraph ), *this );
 
-    return static_cast< USHORT >(aIndex.GetIndex());
+    return static_cast< sal_uInt16 >(aIndex.GetIndex());
 }
 
 String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
@@ -499,7 +499,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    aStartIndex.GetFieldOffset() <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr.Erase(0, static_cast< USHORT > (aStartIndex.GetFieldOffset()) );
+        sStr.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetFieldOffset()) );
     }
     if( aEndIndex.InField() && aEndIndex.GetFieldOffset() )
     {
@@ -507,11 +507,11 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr = sStr.Copy(0, static_cast< USHORT > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) );
+        sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetFieldLen() - aEndIndex.GetFieldOffset())) );
     }
 
-    EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< USHORT >(aStartIndex.GetParagraph()) );
-    EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< USHORT >(aEndIndex.GetParagraph()) );
+    EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
+    EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
 
     if( aStartIndex.InBullet() )
     {
@@ -522,7 +522,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    aStartIndex.GetBulletOffset() <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sBullet.Erase(0, static_cast< USHORT > (aStartIndex.GetBulletOffset()) );
+        sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) );
 
         sBullet += sStr;
         sStr = sBullet;
@@ -537,7 +537,7 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sStr = sStr.Copy(0, static_cast< USHORT > (sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
+        sStr = sStr.Copy(0, static_cast< sal_uInt16 > (sStr.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
     }
     else if( aStartIndex.GetParagraph() != aEndIndex.GetParagraph() &&
              HaveTextBullet( aEndIndex.GetParagraph() ) )
@@ -548,17 +548,17 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
                    sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset()) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::GetText: index value overflow");
 
-        sBullet = sBullet.Copy(0, static_cast< USHORT > (sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
+        sBullet = sBullet.Copy(0, static_cast< sal_uInt16 > (sBullet.Len() - (aEndIndex.GetBulletLen() - aEndIndex.GetBulletOffset())) );
 
         // insert bullet
         sStr.Insert( sBullet,
-                     static_cast< USHORT > (GetTextLen(aStartIndex.GetParagraph()) - aStartIndex.GetIndex()) );
+                     static_cast< sal_uInt16 > (GetTextLen(aStartIndex.GetParagraph()) - aStartIndex.GetIndex()) );
     }
 
     return sStr;
 }
 
-SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -572,14 +572,14 @@ SfxItemSet SvxAccessibleTextAdapter::GetAttribs( const ESelection& rSel, BOOL bO
                                         bOnlyHardAttrib );
 }
 
-SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxAccessibleTextAdapter::GetParaAttribs( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetParaAttribs( nPara );
 }
 
-void SvxAccessibleTextAdapter::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxAccessibleTextAdapter::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -591,14 +591,14 @@ void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 }    
 
-void SvxAccessibleTextAdapter::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxAccessibleTextAdapter::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     mrTextForwarder->GetPortions( nPara, rList );
 }
 
-USHORT SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -612,7 +612,7 @@ USHORT SvxAccessibleTextAdapter::GetItemState( const ESelection& rSel, USHORT nW
                                           nWhich );
 }
 
-USHORT SvxAccessibleTextAdapter::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -681,21 +681,21 @@ SfxItemPool* SvxAccessibleTextAdapter::GetPool() const
     return mrTextForwarder->GetPool();
 }
 
-XubString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxAccessibleTextAdapter::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     mrTextForwarder->FieldClicked( rField, nPara, nPos );
 }
 
-sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIndex )
+sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( sal_uInt16 nPara, sal_uInt16 nEEIndex )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
     
@@ -704,7 +704,7 @@ sal_Int32 SvxAccessibleTextAdapter::CalcLogicalIndex( USHORT nPara, USHORT nEEIn
     return aIndex.GetIndex();
 }
 
-USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex )
+sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_uInt16 nPara, sal_Int32 nLogicalIndex )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
     
@@ -715,7 +715,7 @@ USHORT SvxAccessibleTextAdapter::CalcEditEngineIndex( USHORT nPara, sal_Int32 nL
 
 
 
-BOOL SvxAccessibleTextAdapter::IsValid() const
+sal_Bool SvxAccessibleTextAdapter::IsValid() const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -725,7 +725,7 @@ BOOL SvxAccessibleTextAdapter::IsValid() const
         return sal_False;
 }
 
-LanguageType SvxAccessibleTextAdapter::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType SvxAccessibleTextAdapter::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -736,28 +736,28 @@ LanguageType SvxAccessibleTextAdapter::GetLanguage( USHORT nPara, USHORT nPos )
     return mrTextForwarder->GetLanguage( nPara, aIndex.GetEEIndex() );
 }
 
-USHORT SvxAccessibleTextAdapter::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetFieldCount( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetFieldCount( nPara );
 }
 
-EFieldInfo SvxAccessibleTextAdapter::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxAccessibleTextAdapter::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetBulletInfo( nPara );
 }
 
-Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -766,7 +766,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
 
     // preset if anything goes wrong below
     // n-th char in GetParagraphIndex's paragraph
-    Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, static_cast< USHORT >( aIndex.GetEEIndex() ) );
+    Rectangle aRect = mrTextForwarder->GetCharBounds( nPara, static_cast< sal_uInt16 >( aIndex.GetEEIndex() ) );
 
     if( aIndex.InBullet() )
     {
@@ -804,7 +804,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
                                                   aFont,
                                                   mrTextForwarder->GetText( aSel ) );
 
-                Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, static_cast< USHORT >( aIndex.GetEEIndex() ) );
+                Rectangle aStartRect = mrTextForwarder->GetCharBounds( nPara, static_cast< sal_uInt16 >( aIndex.GetEEIndex() ) );
 
                 if( !aStringWrap.GetCharacterBounds( aIndex.GetFieldOffset(), aRect ) )
                     aRect = aStartRect;
@@ -817,7 +817,7 @@ Rectangle SvxAccessibleTextAdapter::GetCharBounds( USHORT nPara, USHORT nIndex )
     return aRect;
 }
 
-Rectangle SvxAccessibleTextAdapter::GetParaBounds( USHORT nPara ) const
+Rectangle SvxAccessibleTextAdapter::GetParaBounds( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -852,7 +852,7 @@ OutputDevice* SvxAccessibleTextAdapter::GetRefDevice() const
     return mrTextForwarder->GetRefDevice();
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -865,7 +865,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
     DBG_ASSERT(aIndex.GetIndex() >= 0 && aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-    nIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     EBulletInfo aBulletInfo = GetBulletInfo( nPara );
 
@@ -892,7 +892,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
                        aStringWrap.GetIndexAtPoint( aPoint ) <= USHRT_MAX,
                        "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-            nIndex = static_cast< USHORT > (aStringWrap.GetIndexAtPoint( aPoint ));
+            nIndex = static_cast< sal_uInt16 > (aStringWrap.GetIndexAtPoint( aPoint ));
             return sal_True;
         }
     }
@@ -920,14 +920,14 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, USHORT&
                    aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( rPoint ) <= USHRT_MAX,
                    "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
-        nIndex = static_cast< USHORT >(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
+        nIndex = static_cast< sal_uInt16 >(aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
         return sal_True;
     }
 
     return sal_True;
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -943,7 +943,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
 
         // always treat bullet as separate word
         nStart = 0;
-        nEnd = static_cast< USHORT > (aIndex.GetBulletLen());
+        nEnd = static_cast< sal_uInt16 > (aIndex.GetBulletLen());
 
         return sal_True;
     }
@@ -958,8 +958,8 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
 
         // always treat field as separate word
         // TODO: to circumvent this, _we_ would have to do the break iterator stuff!
-        nStart = static_cast< USHORT > (aIndex.GetIndex() - aIndex.GetFieldOffset());
-        nEnd = static_cast< USHORT > (nStart + aIndex.GetFieldLen());
+        nStart = static_cast< sal_uInt16 > (aIndex.GetIndex() - aIndex.GetFieldOffset());
+        nEnd = static_cast< sal_uInt16 > (nStart + aIndex.GetFieldLen());
 
         return sal_True;
     }
@@ -971,18 +971,18 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( USHORT nPara, USHORT nIndex,
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nStart = static_cast< USHORT > (aIndex.GetIndex());
+    nStart = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     aIndex.SetEEIndex( nPara, nEnd, *this );
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nEnd = static_cast< USHORT > (aIndex.GetIndex());
+    nEnd = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     return sal_True;
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -998,7 +998,7 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
 
         // always treat bullet as distinct attribute
         nStartIndex = 0;
-        nEndIndex = static_cast< USHORT > (aIndex.GetBulletLen());
+        nEndIndex = static_cast< sal_uInt16 > (aIndex.GetBulletLen());
 
         return sal_True;
     }
@@ -1010,8 +1010,8 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
                    "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
         // always treat field as distinct attribute
-        nStartIndex = static_cast< USHORT > (aIndex.GetIndex() - aIndex.GetFieldOffset());
-        nEndIndex = static_cast< USHORT > (nStartIndex + aIndex.GetFieldLen());
+        nStartIndex = static_cast< sal_uInt16 > (aIndex.GetIndex() - aIndex.GetFieldOffset());
+        nEndIndex = static_cast< sal_uInt16 > (nStartIndex + aIndex.GetFieldLen());
 
         return sal_True;
     }
@@ -1023,32 +1023,32 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( USHORT& nStartIndex, USHORT&
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nStartIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nStartIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     aIndex.SetEEIndex( nPara, nEndIndex, *this );
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
                aIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
-    nEndIndex = static_cast< USHORT > (aIndex.GetIndex());
+    nEndIndex = static_cast< sal_uInt16 > (aIndex.GetIndex());
 
     return sal_True;
 }
 
-USHORT SvxAccessibleTextAdapter::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineCount( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetLineCount( nPara );
 }
 
-USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     SvxAccessibleTextIndex aStartIndex;
     SvxAccessibleTextIndex aEndIndex;
-    USHORT nCurrLine;
-    USHORT nCurrIndex, nLastIndex;
+    sal_uInt16 nCurrLine;
+    sal_uInt16 nCurrIndex, nLastIndex;
     for( nCurrLine=0, nCurrIndex=0, nLastIndex=0; nCurrLine<=nLine; ++nCurrLine )
     {
         nLastIndex = nCurrIndex;
@@ -1061,18 +1061,18 @@ USHORT SvxAccessibleTextAdapter::GetLineLen( USHORT nPara, USHORT nLine ) const
     {
         aStartIndex.SetEEIndex( nPara, nLastIndex, *this );
 
-        return static_cast< USHORT >(aEndIndex.GetIndex() - aStartIndex.GetIndex());
+        return static_cast< sal_uInt16 >(aEndIndex.GetIndex() - aStartIndex.GetIndex());
     }
     else
-        return static_cast< USHORT >(aEndIndex.GetIndex());
+        return static_cast< sal_uInt16 >(aEndIndex.GetIndex());
 }
 
-void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const
+void SvxAccessibleTextAdapter::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
 {
     mrTextForwarder->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
 }    
 
-USHORT SvxAccessibleTextAdapter::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxAccessibleTextAdapter::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return mrTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
 }    
@@ -1103,21 +1103,21 @@ sal_Bool SvxAccessibleTextAdapter::InsertText( const String& rStr, const ESelect
     return mrTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
 }
 
-sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( BOOL bFull )
+sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( sal_Bool bFull )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->QuickFormatDoc( bFull );
 }
 
-sal_Int16 SvxAccessibleTextAdapter::GetDepth( USHORT nPara ) const
+sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     return mrTextForwarder->GetDepth( nPara );
 }
 
-sal_Bool SvxAccessibleTextAdapter::SetDepth( USHORT nPara, sal_Int16 nNewDepth )
+sal_Bool SvxAccessibleTextAdapter::SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1129,7 +1129,7 @@ void SvxAccessibleTextAdapter::SetForwarder( SvxTextForwarder& rForwarder )
     mrTextForwarder = &rForwarder;
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( USHORT nPara ) const
+sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1147,7 +1147,7 @@ sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( USHORT nPara ) const
     }
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( USHORT nPara ) const
+sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_uInt16 nPara ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1196,7 +1196,7 @@ void SvxAccessibleTextAdapter::AppendParagraph()
     OSL_FAIL( "not implemented" );
 }
 
-xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( USHORT, const String &, const SfxItemSet & )
+xub_StrLen SvxAccessibleTextAdapter::AppendTextPortion( sal_uInt16, const String &, const SfxItemSet & )
 {
     OSL_FAIL( "not implemented" );
     return 0;
@@ -1218,7 +1218,7 @@ SvxAccessibleTextEditViewAdapter::~SvxAccessibleTextEditViewAdapter()
 {
 }
 
-BOOL SvxAccessibleTextEditViewAdapter::IsValid() const
+sal_Bool SvxAccessibleTextEditViewAdapter::IsValid() const
 {
     DBG_ASSERT(mrViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
 
@@ -1268,8 +1268,8 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons
                aEndIndex.GetIndex() >= 0 && aEndIndex.GetIndex() <= USHRT_MAX,
                "SvxAccessibleTextEditViewAdapter::GetSelection: index value overflow");
 
-    rSel = ESelection( aStartIndex.GetParagraph(), static_cast< USHORT > (aStartIndex.GetIndex()),
-                       aEndIndex.GetParagraph(), static_cast< USHORT > (aEndIndex.GetIndex()) );
+    rSel = ESelection( aStartIndex.GetParagraph(), static_cast< sal_uInt16 > (aStartIndex.GetIndex()),
+                       aEndIndex.GetParagraph(), static_cast< sal_uInt16 > (aEndIndex.GetIndex()) );
 
     return sal_True;
 }
diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index 06337654b5..06337654b5 100644..100755
--- a/editeng/source/uno/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 419892316b..7ae3d79875 100644..100755
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -143,7 +143,7 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
 {
     const SfxPoolItem* pItem = NULL;
     {
-        SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, TRUE );
+        SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, sal_True );
         rDesc.Name		= pFontItem->GetFamilyName();
         rDesc.StyleName	= pFontItem->GetStyleName();
         rDesc.Family	= sal::static_int_cast< sal_Int16 >(
@@ -153,37 +153,37 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
             pFontItem->GetPitch());
     }
     {
-        pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, sal_True );
         uno::Any aHeight;
         if( pItem->QueryValue( aHeight, MID_FONTHEIGHT ) )
             aHeight >>= rDesc.Height;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_ITALIC, TRUE );
+        pItem = &rSet.Get( EE_CHAR_ITALIC, sal_True );
         uno::Any aFontSlant;
         if(pItem->QueryValue( aFontSlant, MID_POSTURE ))
             aFontSlant >>= rDesc.Slant;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_UNDERLINE, TRUE );
+        pItem = &rSet.Get( EE_CHAR_UNDERLINE, sal_True );
         uno::Any aUnderline;
         if(pItem->QueryValue( aUnderline, MID_TL_STYLE ))
             aUnderline >>= rDesc.Underline;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_WEIGHT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_WEIGHT, sal_True );
         uno::Any aWeight;
         if(pItem->QueryValue( aWeight, MID_WEIGHT ))
             aWeight >>= rDesc.Weight;
     }
     {
-        pItem = &rSet.Get( EE_CHAR_STRIKEOUT, TRUE );
+        pItem = &rSet.Get( EE_CHAR_STRIKEOUT, sal_True );
         uno::Any aStrikeOut;
         if(pItem->QueryValue( aStrikeOut, MID_CROSS_OUT ))
             aStrikeOut >>= rDesc.Strikeout;
     }
     {
-        SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, TRUE );
+        SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, sal_True );
         rDesc.WordLineMode = pWLMItem->GetValue();
     }
 }
@@ -201,13 +201,13 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
 
 beans::PropertyState SvxUnoFontDescriptor::getPropertyState( const SfxItemSet& rSet )
 {
-    CheckState(rSet.GetItemState( EE_CHAR_FONTINFO, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_FONTHEIGHT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_ITALIC, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_UNDERLINE, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_WEIGHT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_STRIKEOUT, FALSE ));
-    CheckState(rSet.GetItemState( EE_CHAR_WLM, FALSE ));
+    CheckState(rSet.GetItemState( EE_CHAR_FONTINFO, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_FONTHEIGHT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_ITALIC, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_UNDERLINE, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_WEIGHT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_STRIKEOUT, sal_False ));
+    CheckState(rSet.GetItemState( EE_CHAR_WLM, sal_False ));
 
     return beans::PropertyState_DEFAULT_VALUE;
 }
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 5952aa612d..85e4ff9af5 100644..100755
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -216,7 +216,7 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 nFormat )
     }
 }
 
-static util::DateTime getDate( ULONG nDate )
+static util::DateTime getDate( sal_uLong nDate )
 {
     util::DateTime aDate;
     memset( &aDate, 0, sizeof( util::DateTime ) );
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index c3b05be0dc..27991ab88a 100644..100755
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -57,12 +57,12 @@ SvxEditEngineForwarder::~SvxEditEngineForwarder()
     // the EditEngine may need to be deleted from the outside
 }
 
-USHORT SvxEditEngineForwarder::GetParagraphCount() const
+sal_uInt16 SvxEditEngineForwarder::GetParagraphCount() const
 {
     return rEditEngine.GetParagraphCount();
 }
 
-USHORT SvxEditEngineForwarder::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxEditEngineForwarder::GetTextLen( sal_uInt16 nParagraph ) const
 {
     return rEditEngine.GetTextLen( nParagraph );
 }
@@ -74,7 +74,7 @@ String SvxEditEngineForwarder::GetText( const ESelection& rSel ) const
     return aRet;
 }
 
-SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
@@ -102,14 +102,14 @@ SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection& rSel, BOOL bOnl
     }
 }
 
-SfxItemSet SvxEditEngineForwarder::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxEditEngineForwarder::GetParaAttribs( sal_uInt16 nPara ) const
 {
     SfxItemSet aSet( rEditEngine.GetParaAttribs( nPara ) );
 
-    USHORT nWhich = EE_PARA_START;
+    sal_uInt16 nWhich = EE_PARA_START;
     while( nWhich <= EE_PARA_END )
     {
-        if( aSet.GetItemState( nWhich, TRUE ) != SFX_ITEM_ON )
+        if( aSet.GetItemState( nWhich, sal_True ) != SFX_ITEM_ON )
         {
             if( rEditEngine.HasParaAttrib( nPara, nWhich ) )
                 aSet.Put( rEditEngine.GetParaAttrib( nPara, nWhich ) );
@@ -120,7 +120,7 @@ SfxItemSet SvxEditEngineForwarder::GetParaAttribs( USHORT nPara ) const
     return aSet;
 }
 
-void SvxEditEngineForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxEditEngineForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     rEditEngine.SetParaAttribs( nPara, rSet );
 }
@@ -135,7 +135,7 @@ SfxItemPool* SvxEditEngineForwarder::GetPool() const
     return rEditEngine.GetEmptyItemSet().GetPool();
 }
 
-void SvxEditEngineForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxEditEngineForwarder::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     rEditEngine.GetPortions( nPara, rList );
 }
@@ -160,24 +160,24 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel
     rEditEngine.QuickSetAttribs( rSet, rSel );
 }
 
-BOOL SvxEditEngineForwarder::IsValid() const
+sal_Bool SvxEditEngineForwarder::IsValid() const
 { 
     // cannot reliably query EditEngine state 
     // while in the middle of an update
     return rEditEngine.GetUpdateMode();
 }
 
-XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return rEditEngine.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxEditEngineForwarder::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     rEditEngine.FieldClicked( rField, nPara, nPos );
 }
 
-USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
+sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich )
 {
     EECharAttribArray aAttribs;
 
@@ -186,16 +186,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
     SfxItemState eState = SFX_ITEM_DEFAULT;
 
     // check all paragraphs inside the selection
-    for( USHORT nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
+    for( sal_uInt16 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
     {
         SfxItemState eParaState = SFX_ITEM_DEFAULT;
 
         // calculate start and endpos for this paragraph
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         if( rSel.nStartPara == nPara )
             nPos = rSel.nStartPos;
 
-        USHORT nEndPos = rSel.nEndPos;
+        sal_uInt16 nEndPos = rSel.nEndPos;
         if( rSel.nEndPara != nPara )
             nEndPos = rEditEngine.GetTextLen( nPara );
 
@@ -203,13 +203,13 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
         // get list of char attribs
         rEditEngine.GetCharAttribs( nPara, aAttribs );
 
-        BOOL bEmpty = TRUE;		// we found no item inside the selektion of this paragraph
-        BOOL bGaps  = FALSE;	// we found items but theire gaps between them
-        USHORT nLastEnd = nPos;
+        sal_Bool bEmpty = sal_True;		// we found no item inside the selektion of this paragraph
+        sal_Bool bGaps  = sal_False;	// we found items but theire gaps between them
+        sal_uInt16 nLastEnd = nPos;
 
         const SfxPoolItem* pParaItem = NULL;
 
-        for( USHORT nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
+        for( sal_uInt16 nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
         {
             struct EECharAttrib aAttrib = aAttribs.GetObject( nAttrib );
             DBG_ASSERT( aAttrib.pAttr, "GetCharAttribs gives corrupt data" );
@@ -237,16 +237,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
             }
 
             if( bEmpty )
-                bEmpty = FALSE;
+                bEmpty = sal_False;
 
             if( !bGaps && aAttrib.nStart > nLastEnd )
-                bGaps = TRUE;
+                bGaps = sal_True;
 
             nLastEnd = aAttrib.nEnd;
         }
 
         if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
-            bGaps = TRUE;
+            bGaps = sal_True;
 /*
         // since we have no portion with our item or if there were gaps
         if( bEmpty || bGaps )
@@ -309,45 +309,45 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
     return eState;
 }
 
-USHORT SvxEditEngineForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxEditEngineForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     return GetSvxEditEngineItemState( rEditEngine, rSel, nWhich );
 }
 
-USHORT SvxEditEngineForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxEditEngineForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     const SfxItemSet& rSet = rEditEngine.GetParaAttribs( nPara );
     return rSet.GetItemState( nWhich );
 }
 
-LanguageType SvxEditEngineForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SvxEditEngineForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rEditEngine.GetLanguage(nPara, nIndex);
 }
 
-USHORT SvxEditEngineForwarder::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxEditEngineForwarder::GetFieldCount( sal_uInt16 nPara ) const
 {
     return rEditEngine.GetFieldCount(nPara); 
 }
 
-EFieldInfo SvxEditEngineForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxEditEngineForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     return rEditEngine.GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxEditEngineForwarder::GetBulletInfo( USHORT ) const
+EBulletInfo SvxEditEngineForwarder::GetBulletInfo( sal_uInt16 ) const
 {
     return EBulletInfo();
 }
 
-Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxEditEngineForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     // #101701#
     // EditEngine's 'internal' methods like GetCharacterBounds()
     // don't rotate for vertical text.
     Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
     ::std::swap( aSize.Width(), aSize.Height() );
-    bool bIsVertical( rEditEngine.IsVertical() == TRUE );
+    bool bIsVertical( rEditEngine.IsVertical() == sal_True );
 
     // #108900# Handle virtual position one-past-the end of the string
     if( nIndex >= rEditEngine.GetTextLen(nPara) )
@@ -388,12 +388,12 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) c
     }
 }
 
-Rectangle SvxEditEngineForwarder::GetParaBounds( USHORT nPara ) const
+Rectangle SvxEditEngineForwarder::GetParaBounds( sal_uInt16 nPara ) const
 {
     const Point aPnt = rEditEngine.GetDocPosTopLeft( nPara );
-    ULONG nWidth; 
-    ULONG nHeight;
-    ULONG nTextWidth;
+    sal_uLong nWidth; 
+    sal_uLong nHeight;
+    sal_uLong nTextWidth;
 
     if( rEditEngine.IsVertical() )
     {
@@ -426,13 +426,13 @@ OutputDevice* SvxEditEngineForwarder::GetRefDevice() const
     return rEditEngine.GetRefDevice();
 }
 
-sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
     ::std::swap( aSize.Width(), aSize.Height() );
     Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos, 
                                                       aSize,
-                                                      rEditEngine.IsVertical() == TRUE ));
+                                                      rEditEngine.IsVertical() == sal_True ));
 
     EPosition aDocPos = rEditEngine.FindDocPosition( aEEPos );
 
@@ -442,7 +442,7 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPa
     return sal_True;
 }
 
-sal_Bool SvxEditEngineForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -458,33 +458,33 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, US
     return sal_False;
 }
 
-sal_Bool SvxEditEngineForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex );
 }
 
-USHORT SvxEditEngineForwarder::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineCount( sal_uInt16 nPara ) const
 {
     return rEditEngine.GetLineCount(nPara);
 }
 
-USHORT SvxEditEngineForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rEditEngine.GetLineLen(nPara, nLine);
 }
     
-void SvxEditEngineForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
+void SvxEditEngineForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     rEditEngine.GetLineBoundaries(rStart, rEnd, nPara, nLine);
 }
     
-USHORT SvxEditEngineForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxEditEngineForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rEditEngine.GetLineNumberAtIndex(nPara, nIndex);
 }
     
 
-sal_Bool SvxEditEngineForwarder::QuickFormatDoc( BOOL )
+sal_Bool SvxEditEngineForwarder::QuickFormatDoc( sal_Bool )
 {
     rEditEngine.QuickFormatDoc();
 
@@ -507,13 +507,13 @@ sal_Bool SvxEditEngineForwarder::InsertText( const String& rStr, const ESelectio
     return sal_True;
 }
 
-sal_Int16 SvxEditEngineForwarder::GetDepth( USHORT ) const
+sal_Int16 SvxEditEngineForwarder::GetDepth( sal_uInt16 ) const
 {
     // EditEngine does not support outline depth
     return -1;
 }
 
-sal_Bool SvxEditEngineForwarder::SetDepth( USHORT, sal_Int16 nNewDepth )
+sal_Bool SvxEditEngineForwarder::SetDepth( sal_uInt16, sal_Int16 nNewDepth )
 {
     // EditEngine does not support outline depth
     return nNewDepth == -1 ? sal_True : sal_False;
@@ -529,11 +529,11 @@ void SvxEditEngineForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxEditEngineForwarder::AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+xub_StrLen SvxEditEngineForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
 {
     xub_StrLen nLen = 0;
 
-    USHORT nParaCount = rEditEngine.GetParagraphCount();
+    sal_uInt16 nParaCount = rEditEngine.GetParagraphCount();
     DBG_ASSERT( nPara < nParaCount, "paragraph index out of bounds" );
     if (/*0 <= nPara && */nPara < nParaCount)
     {
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 004b567750..f95c1bf90b 100644..100755
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText /* = FALSE */ ) :
+SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText /* = sal_False */ ) :
     rOutliner( rOutl ),
     bOutlinerText( bOutlText ),
     mpAttribsCache( NULL ),
@@ -64,12 +64,12 @@ SvxOutlinerForwarder::~SvxOutlinerForwarder()
     flushCache();
 }
 
-USHORT SvxOutlinerForwarder::GetParagraphCount() const
+sal_uInt16 SvxOutlinerForwarder::GetParagraphCount() const
 {
-    return (USHORT)rOutliner.GetParagraphCount();
+    return (sal_uInt16)rOutliner.GetParagraphCount();
 }
 
-USHORT SvxOutlinerForwarder::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SvxOutlinerForwarder::GetTextLen( sal_uInt16 nParagraph ) const
 {
     return rOutliner.GetEditEngine().GetTextLen( nParagraph );
 }
@@ -82,7 +82,7 @@ String SvxOutlinerForwarder::GetText( const ESelection& rSel ) const
     return pEditEngine->GetText( rSel, LINEEND_LF );
 }
 
-static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib, EditEngine& rEditEngine )
+static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib, EditEngine& rEditEngine )
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
@@ -110,7 +110,7 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection& rSel, BOOL
     }
 }
 
-SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
 {
     if( mpAttribsCache && ( 0 == bOnlyHardAttrib ) )
     {
@@ -147,7 +147,7 @@ SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyH
     return aSet;
 }
 
-SfxItemSet SvxOutlinerForwarder::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SvxOutlinerForwarder::GetParaAttribs( sal_uInt16 nPara ) const
 {
     if( mpParaAttribsCache )
     {
@@ -177,7 +177,7 @@ SfxItemSet SvxOutlinerForwarder::GetParaAttribs( USHORT nPara ) const
     return *mpParaAttribsCache;
 }
 
-void SvxOutlinerForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SvxOutlinerForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
 {
     flushCache();
 
@@ -201,7 +201,7 @@ SfxItemPool* SvxOutlinerForwarder::GetPool() const
     return rOutliner.GetEmptyItemSet().GetPool();
 }
 
-void SvxOutlinerForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SvxOutlinerForwarder::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
 {
     ((EditEngine&)rOutliner.GetEditEngine()).GetPortions( nPara, rList );
 }
@@ -237,31 +237,31 @@ void SvxOutlinerForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESelec
     rOutliner.QuickSetAttribs( rSet, rSel );
 }
 
-XubString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
 {
     return rOutliner.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
 }
 
-void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos )
+void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, xub_StrLen nPos )
 {
     rOutliner.FieldClicked( rField, nPara, nPos );
 }
 
-BOOL SvxOutlinerForwarder::IsValid() const
+sal_Bool SvxOutlinerForwarder::IsValid() const
 {
     // cannot reliably query outliner state
     // while in the middle of an update
     return rOutliner.GetUpdateMode();
 }
 
-extern USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich );
+extern sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich );
 
-USHORT SvxOutlinerForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SvxOutlinerForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
 {
     return GetSvxEditEngineItemState( (EditEngine&)rOutliner.GetEditEngine(), rSel, nWhich );
 }
 
-USHORT SvxOutlinerForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SvxOutlinerForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     const SfxItemSet& rSet = rOutliner.GetParaAttribs( nPara );
     return rSet.GetItemState( nWhich );
@@ -283,33 +283,33 @@ void SvxOutlinerForwarder::flushCache()
     }
 }
 
-LanguageType SvxOutlinerForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SvxOutlinerForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rOutliner.GetLanguage(nPara, nIndex);
 }
 
-USHORT SvxOutlinerForwarder::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SvxOutlinerForwarder::GetFieldCount( sal_uInt16 nPara ) const
 {
     return rOutliner.GetEditEngine().GetFieldCount(nPara);
 }
 
-EFieldInfo SvxOutlinerForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SvxOutlinerForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
 {
     return rOutliner.GetEditEngine().GetFieldInfo( nPara, nField );
 }
 
-EBulletInfo SvxOutlinerForwarder::GetBulletInfo( USHORT nPara ) const
+EBulletInfo SvxOutlinerForwarder::GetBulletInfo( sal_uInt16 nPara ) const
 {
     return rOutliner.GetBulletInfo( nPara );
 }
 
-Rectangle SvxOutlinerForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SvxOutlinerForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     // EditEngine's 'internal' methods like GetCharacterBounds()
     // don't rotate for vertical text.
     Size aSize( rOutliner.CalcTextSize() );
     ::std::swap( aSize.Width(), aSize.Height() );
-    bool bIsVertical( rOutliner.IsVertical() == TRUE );
+    bool bIsVertical( rOutliner.IsVertical() == sal_True );
 
     // #108900# Handle virtual position one-past-the end of the string
     if( nIndex >= GetTextLen(nPara) )
@@ -350,7 +350,7 @@ Rectangle SvxOutlinerForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) con
     }
 }
 
-Rectangle SvxOutlinerForwarder::GetParaBounds( USHORT nPara ) const
+Rectangle SvxOutlinerForwarder::GetParaBounds( sal_uInt16 nPara ) const
 {
     Point aPnt = rOutliner.GetDocPosTopLeft( nPara );
     Size aSize = rOutliner.CalcTextSize();
@@ -360,13 +360,13 @@ Rectangle SvxOutlinerForwarder::GetParaBounds( USHORT nPara ) const
         // Hargl. Outliner's 'external' methods return the rotated
         // dimensions, 'internal' methods like GetTextHeight( n )
         // don't rotate.
-        ULONG nWidth = rOutliner.GetTextHeight( nPara );
+        sal_uLong nWidth = rOutliner.GetTextHeight( nPara );
 
         return Rectangle( aSize.Width() - aPnt.Y() - nWidth, 0, aSize.Width() - aPnt.Y(), aSize.Height() );
     }
     else
     {
-        ULONG nHeight = rOutliner.GetTextHeight( nPara );
+        sal_uLong nHeight = rOutliner.GetTextHeight( nPara );
 
         return Rectangle( 0, aPnt.Y(), aSize.Width(), aPnt.Y() + nHeight );
     }
@@ -382,13 +382,13 @@ OutputDevice* SvxOutlinerForwarder::GetRefDevice() const
     return rOutliner.GetRefDevice();
 }
 
-sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const
 {
     Size aSize( rOutliner.CalcTextSize() );
     ::std::swap( aSize.Width(), aSize.Height() );
     Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
                                                       aSize,
-                                                      rOutliner.IsVertical() == TRUE ));
+                                                      rOutliner.IsVertical() == sal_True ));
 
     EPosition aDocPos = rOutliner.GetEditEngine().FindDocPosition( aEEPos );
 
@@ -398,7 +398,7 @@ sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara
     return sal_True;
 }
 
-sal_Bool SvxOutlinerForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
 {
     ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -414,32 +414,32 @@ sal_Bool SvxOutlinerForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHO
     return sal_False;
 }
 
-sal_Bool SvxOutlinerForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SvxOutlinerForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rOutliner.GetEditEngine(), nPara, nIndex );
 }
 
-USHORT SvxOutlinerForwarder::GetLineCount( USHORT nPara ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineCount( sal_uInt16 nPara ) const
 {
-    return static_cast < USHORT >( rOutliner.GetLineCount(nPara) );
+    return static_cast < sal_uInt16 >( rOutliner.GetLineCount(nPara) );
 }
 
-USHORT SvxOutlinerForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rOutliner.GetLineLen(nPara, nLine);
 }
     
-void SvxOutlinerForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
+void SvxOutlinerForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const
 {
     return rOutliner.GetEditEngine().GetLineBoundaries( rStart, rEnd, nPara, nLine );
 }
     
-USHORT SvxOutlinerForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SvxOutlinerForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex );
 }    
 
-sal_Bool SvxOutlinerForwarder::QuickFormatDoc( BOOL )
+sal_Bool SvxOutlinerForwarder::QuickFormatDoc( sal_Bool )
 {
     rOutliner.QuickFormatDoc();
 
@@ -464,7 +464,7 @@ sal_Bool SvxOutlinerForwarder::InsertText( const String& rStr, const ESelection&
     return sal_True;
 }
 
-sal_Int16 SvxOutlinerForwarder::GetDepth( USHORT nPara ) const
+sal_Int16 SvxOutlinerForwarder::GetDepth( sal_uInt16 nPara ) const
 {
     DBG_ASSERT( nPara < GetParagraphCount(), "SvxOutlinerForwarder::GetDepth: Invalid paragraph index");
 
@@ -478,7 +478,7 @@ sal_Int16 SvxOutlinerForwarder::GetDepth( USHORT nPara ) const
     return nLevel;
 }
 
-sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, sal_Int16 nNewDepth )
+sal_Bool SvxOutlinerForwarder::SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT( nPara < GetParagraphCount(), "SvxOutlinerForwarder::SetDepth: Invalid paragraph index");
 
@@ -562,12 +562,12 @@ void SvxOutlinerForwarder::AppendParagraph()
     rEditEngine.InsertParagraph( rEditEngine.GetParagraphCount(), String::EmptyString() );
 }
 
-xub_StrLen SvxOutlinerForwarder::AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet & /*rSet*/ )
+xub_StrLen SvxOutlinerForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet & /*rSet*/ )
 {
     xub_StrLen nLen = 0;
 
     EditEngine& rEditEngine = const_cast< EditEngine& >( rOutliner.GetEditEngine() );
-    USHORT nParaCount = rEditEngine.GetParagraphCount();
+    sal_uInt16 nParaCount = rEditEngine.GetParagraphCount();
     DBG_ASSERT( nPara < nParaCount, "paragraph index out of bounds" );
     if (/*0 <= nPara && */nPara < nParaCount)
     {
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index c5dbf3ae1e..1aa2737458 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -128,8 +128,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     if( NULL == pItem && pPool )
         pItem = &(pPool->GetDefaultItem( pMap->nWID ));
 
-    const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
-    BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+    const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+    sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
 
@@ -190,7 +190,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
     {
         uno::Any aValue( rVal );
 
-        const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
+        const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
 
         // check for needed metric translation
         if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM )
@@ -201,7 +201,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
 
         pNewItem = pItem->Clone();
 
-        BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+        sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
         if( eMapUnit == SFX_MAPUNIT_100TH_MM )
             nMemberId &= (~CONVERT_TWIPS);
 
@@ -223,8 +223,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
         return *pUsrAny;
 
     // No UsrAny detected yet, generate Default entry and return this
-    const SfxMapUnit eMapUnit = mrItemPool.GetMetric((USHORT)pMap->nWID);
-    BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
+    const SfxMapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID);
+    sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
     uno::Any aVal;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index cca9f8bf16..6513fabb25 100644..100755
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -548,7 +548,7 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr
     }
     else
     {
-        SvxNumRule aDefaultRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE);
+        SvxNumRule aDefaultRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False);
         return new SvxUnoNumberingRules( aDefaultRule );
     }
 }
@@ -584,13 +584,13 @@ sal_Int16 SvxUnoNumberingRules::Compare( const Any& Any1, const Any& Any2 )
                 const SvxNumRule& rRule1 = pRule1->getNumRule();
                 const SvxNumRule& rRule2 = pRule2->getNumRule();
 
-                const USHORT nLevelCount1 = rRule1.GetLevelCount();
-                const USHORT nLevelCount2 = rRule2.GetLevelCount();
+                const sal_uInt16 nLevelCount1 = rRule1.GetLevelCount();
+                const sal_uInt16 nLevelCount2 = rRule2.GetLevelCount();
 
                 if( nLevelCount1 == 0 || nLevelCount2 == 0 )
                     return -1;
 
-                for( USHORT i = 0; (i < nLevelCount1) && (i < nLevelCount2); i++ )
+                for( sal_uInt16 i = 0; (i < nLevelCount1) && (i < nLevelCount2); i++ )
                 {
                     if( rRule1.GetLevel(i) != rRule2.GetLevel(i) )
                         return -1;
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 759c8c686d..759c8c686d 100644..100755
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 3eda3f69a0..af248fc685 100644..100755
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -454,9 +454,9 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
                 while( nPara <= nEndPara )
                 {
                     // we have a paragraph
-                    SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nPara ) );
+                    SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nPara ) );
                     setPropertyValue( pMap, aValue, maSelection, aSet, aSet );
-                    pForwarder->SetParaAttribs( (USHORT)nPara, aSet );
+                    pForwarder->SetParaAttribs( (sal_uInt16)nPara, aSet );
                     nPara++;
                 }
             }
@@ -589,7 +589,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert
         {
             SfxItemSet* pAttribs = NULL;
             if( nPara != -1 )
-                pAttribs = pForwarder->GetParaAttribs( (USHORT)nPara ).Clone();
+                pAttribs = pForwarder->GetParaAttribs( (sal_uInt16)nPara ).Clone();
             else
                 pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone();
 
@@ -798,7 +798,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt
                 {
                     if( NULL == pNewParaSet )
                     {
-                        const SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nTempPara ) );
+                        const SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nTempPara ) );
                         pOldParaSet = new SfxItemSet( aSet );
                         pNewParaSet = new SfxItemSet( *pOldParaSet->GetPool(), pOldParaSet->GetRanges() );
                     }
@@ -826,9 +826,9 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< ::rt
             {
                 while( nTempPara <= nEndPara )
                 {
-                    SfxItemSet aSet( pForwarder->GetParaAttribs( (USHORT)nTempPara ) );
+                    SfxItemSet aSet( pForwarder->GetParaAttribs( (sal_uInt16)nTempPara ) );
                     aSet.Put( *pNewParaSet );
-                    pForwarder->SetParaAttribs( (USHORT)nTempPara, aSet );
+                    pForwarder->SetParaAttribs( (sal_uInt16)nTempPara, aSet );
                     nTempPara++;
                 }
                 bNeedsUpdate = sal_True;
@@ -874,7 +874,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons
     {
         SfxItemSet* pAttribs = NULL;
         if( nPara != -1 )
-            pAttribs = pForwarder->GetParaAttribs( (USHORT)nPara ).Clone();
+            pAttribs = pForwarder->GetParaAttribs( (sal_uInt16)nPara ).Clone();
         else
             pAttribs = pForwarder->GetAttribs( GetSelection() ).Clone();
 
@@ -942,7 +942,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
                     while( *pWhichId )
                     {
                         if(nPara != -1)
-                            eTempItemState = pForwarder->GetItemState( (USHORT)nPara, *pWhichId );
+                            eTempItemState = pForwarder->GetItemState( (sal_uInt16)nPara, *pWhichId );
                         else
                             eTempItemState = pForwarder->GetItemState( GetSelection(), *pWhichId );
 
@@ -991,7 +991,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
             if( nWID != 0 )
             {
                 if( nPara != -1 )
-                    eItemState = pForwarder->GetItemState( (USHORT)nPara, nWID );
+                    eItemState = pForwarder->GetItemState( (sal_uInt16)nPara, nWID );
                 else
                     eItemState = pForwarder->GetItemState( GetSelection(), nWID );
             }
@@ -1042,7 +1042,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co
         SfxItemSet* pSet = NULL;
         if( nPara != -1 )
         {
-            pSet = new SfxItemSet( pForwarder->GetParaAttribs( (USHORT)nPara ) );
+            pSet = new SfxItemSet( pForwarder->GetParaAttribs( (sal_uInt16)nPara ) );
         }
         else
         {
@@ -1190,7 +1190,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
 {
     do
     {
-        SfxItemSet aSet( *pForwarder->GetPool(), TRUE );
+        SfxItemSet aSet( *pForwarder->GetPool(), sal_True );
 
         if( pMap->nWID == WID_FONTDESC )
         {
@@ -1216,7 +1216,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
         }
 
         if(nPara != -1)
-            pForwarder->SetParaAttribs( (USHORT)nPara, aSet );
+            pForwarder->SetParaAttribs( (sal_uInt16)nPara, aSet );
         else
             pForwarder->QuickSetAttribs( aSet, GetSelection() );
 
@@ -2057,7 +2057,7 @@ void SvxPropertyValuesToItemSet(
         const uno::Sequence< beans::PropertyValue > rPropertyVaules,
         const SfxItemPropertySet *pPropSet,
         SvxTextForwarder *pForwarder /*needed for WID_NUMLEVEL*/,
-        USHORT nPara /*needed for WID_NUMLEVEL*/)
+        sal_uInt16 nPara /*needed for WID_NUMLEVEL*/)
     throw(lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     sal_Int32 nProps = rPropertyVaules.getLength();
@@ -2136,7 +2136,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendParagraph(
     SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
         pTextForwarder->AppendParagraph();
 
@@ -2167,12 +2167,12 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph(
     SvxTextForwarder *pTextForwarder = pEditSource ? pEditSource->GetTextForwarder() : 0;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
         pTextForwarder->AppendParagraph();
 
         // set properties for the previously last paragraph
-        USHORT nPara = nParaCount - 1;
+        sal_uInt16 nPara = nParaCount - 1;
         ESelection aSel( nPara, 0, nPara, 0 );
         SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
         SvxPropertyValuesToItemSet( aItemSet, rCharAndParaProps, 
@@ -2199,9 +2199,9 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
     uno::Reference< text::XTextRange > xRet;
     if (pTextForwarder)
     {
-        USHORT nParaCount = pTextForwarder->GetParagraphCount();
+        sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
         DBG_ASSERT( nParaCount > 0, "paragraph count is 0 or negative" );
-        USHORT nPara = nParaCount - 1;
+        sal_uInt16 nPara = nParaCount - 1;
         SfxItemSet aSet( pTextForwarder->GetParaAttribs( nPara ) );
         xub_StrLen nStart = pTextForwarder->AppendTextPortion( nPara, rText, aSet );
         pEditSource->UpdateData();
@@ -2463,7 +2463,7 @@ String SvxDummyTextSource::GetText( const ESelection& ) const
     return String();
 }
 
-SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, BOOL ) const
+SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, sal_Bool ) const
 {
     // Very dangerous: The former implementation used a SfxItemPool created on the
     // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
@@ -2524,7 +2524,7 @@ XubString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_uInt16, s
     return XubString();
 }
 
-void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen )
+void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen )
 {
 }
 
@@ -2537,32 +2537,32 @@ void SvxDummyTextSource::SetNotifyHdl( const Link& )
 {
 }
 
-LanguageType SvxDummyTextSource::GetLanguage( USHORT, USHORT ) const
+LanguageType SvxDummyTextSource::GetLanguage( sal_uInt16, sal_uInt16 ) const
 {
     return LANGUAGE_DONTKNOW;
 }
 
-USHORT SvxDummyTextSource::GetFieldCount( USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetFieldCount( sal_uInt16 ) const
 {
     return 0;
 }
 
-EFieldInfo SvxDummyTextSource::GetFieldInfo( USHORT, USHORT ) const
+EFieldInfo SvxDummyTextSource::GetFieldInfo( sal_uInt16, sal_uInt16 ) const
 {
     return EFieldInfo();
 }
 
-EBulletInfo SvxDummyTextSource::GetBulletInfo( USHORT ) const
+EBulletInfo SvxDummyTextSource::GetBulletInfo( sal_uInt16 ) const
 {
     return EBulletInfo();
 }
 
-Rectangle SvxDummyTextSource::GetCharBounds( USHORT, USHORT ) const
+Rectangle SvxDummyTextSource::GetCharBounds( sal_uInt16, sal_uInt16 ) const
 {
     return Rectangle();
 }
 
-Rectangle SvxDummyTextSource::GetParaBounds( USHORT ) const
+Rectangle SvxDummyTextSource::GetParaBounds( sal_uInt16 ) const
 {
     return Rectangle();
 }
@@ -2577,52 +2577,52 @@ OutputDevice* SvxDummyTextSource::GetRefDevice() const
     return NULL;
 }
 
-sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const
+sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const
 {
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const
+sal_Bool SvxDummyTextSource::GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const
 {
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const
+sal_Bool SvxDummyTextSource::GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const
 {
     return sal_False;
 }
 
-USHORT SvxDummyTextSource::GetLineCount( USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetLineCount( sal_uInt16 ) const
 {
     return 0;
 }
 
-USHORT SvxDummyTextSource::GetLineLen( USHORT, USHORT ) const
+sal_uInt16 SvxDummyTextSource::GetLineLen( sal_uInt16, sal_uInt16 ) const
 {
     return 0;
 }
 
-void SvxDummyTextSource::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const
+void SvxDummyTextSource::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const
 {
     rStart = rEnd = 0;
 }
     
-USHORT SvxDummyTextSource::GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const
+sal_uInt16 SvxDummyTextSource::GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const
 {
     return 0;
 }    
 
-sal_Bool SvxDummyTextSource::QuickFormatDoc( BOOL )
+sal_Bool SvxDummyTextSource::QuickFormatDoc( sal_Bool )
 {
     return sal_False;
 }
 
-sal_Int16 SvxDummyTextSource::GetDepth( USHORT ) const
+sal_Int16 SvxDummyTextSource::GetDepth( sal_uInt16 ) const
 {
     return -1;
 }
 
-sal_Bool SvxDummyTextSource::SetDepth( USHORT, sal_Int16 nNewDepth )
+sal_Bool SvxDummyTextSource::SetDepth( sal_uInt16, sal_Int16 nNewDepth )
 {
     return nNewDepth == 0 ? sal_True : sal_False;
 }
@@ -2646,7 +2646,7 @@ void SvxDummyTextSource::AppendParagraph()
 {
 }
 
-xub_StrLen SvxDummyTextSource::AppendTextPortion( USHORT, const String &, const SfxItemSet & )
+xub_StrLen SvxDummyTextSource::AppendTextPortion( sal_uInt16, const String &, const SfxItemSet & )
 {
     return 0;
 }
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 731aa8cf26..7e94aac3bb 100644..100755
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -31,7 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uIt16S
 #include <svl/svstdarr.hxx>
 
 #include <rtl/uuid.h>
diff --git a/editeng/source/uno/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx
index 2ea5fddd09..161f9bc070 100644..100755
--- a/editeng/source/uno/unoviwed.cxx
+++ b/editeng/source/uno/unoviwed.cxx
@@ -44,7 +44,7 @@ SvxEditEngineViewForwarder::~SvxEditEngineViewForwarder()
 {
 }
 
-BOOL SvxEditEngineViewForwarder::IsValid() const
+sal_Bool SvxEditEngineViewForwarder::IsValid() const
 {
     return sal_True;
 }
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 2117334f09..0f5e2305a6 100644..100755
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -57,7 +57,7 @@ Point SvxDrawOutlinerViewForwarder::GetTextOffset() const
     return aOutputRect.TopLeft() - maTextShapeTopLeft;
 }
 
-BOOL SvxDrawOutlinerViewForwarder::IsValid() const
+sal_Bool SvxDrawOutlinerViewForwarder::IsValid() const
 {
     return sal_True;
 }
diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index e412e99d64..e412e99d64 100644..100755
--- a/editeng/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index e4727c0f4f..4a428c98a6 100644..100755
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -449,7 +449,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
 
 /* testcode
             const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
-            SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+            SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
             aMedium.IsRemote();
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
 */
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 760246d82c..dbc293c64f 100644..100755
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -68,10 +68,10 @@ using namespace xmloff::token;
 class SvxXMLTextImportContext : public SvXMLImportContext
 {
 public:
-    SvxXMLTextImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
+    SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
     virtual ~SvxXMLTextImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
 //	SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
 
@@ -81,7 +81,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////
 
-SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText )
+SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText )
 : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
 {
 }
@@ -90,7 +90,7 @@ SvxXMLTextImportContext::~SvxXMLTextImportContext()
 {
 }
 
-SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
     if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
@@ -127,7 +127,7 @@ public:
 
     static sal_Bool load( const rtl::OUString& rUrl, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xTable ) throw();
 protected:
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
 private:
     const uno::Reference< XText > mxText;
@@ -189,7 +189,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
 
 /* testcode
             const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
-            SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, TRUE );
+            SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, sal_True );
             aMedium.IsRemote();
             uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
 
@@ -242,7 +242,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
     }
 }
 
-SvXMLImportContext *SvxXMLXTextImportComponent::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLXTextImportComponent::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext;
     if(XML_NAMESPACE_OFFICE == nPrefix && ( IsXMLToken( rLocalName, XML_DOCUMENT ) || IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ) )
diff --git a/editeng/util/editeng.dxp b/editeng/util/editeng.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/editeng/util/editeng.dxp
+++ b/editeng/util/editeng.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/editeng/util/hidother.src b/editeng/util/hidother.src
index 0203afa929..0203afa929 100644..100755
--- a/editeng/util/hidother.src
+++ b/editeng/util/hidother.src
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
index 29b98e89a4..29b98e89a4 100644..100755
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/inc/makefile.mk
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
index 8ff0bded12..8ff0bded12 100644..100755
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
index eacc88bf09..eacc88bf09 100644..100755
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index e6b48d8e00..b1219f0cdf 100644..100755
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,4 +1,4 @@
-eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper tools unotools NULL
+eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper tools unotools LIBXSLT:libxslt NULL
 eo	embeddedobj									usr1	-	all	eo_mkout NULL
 eo	embeddedobj\inc								nmake	-	all	eo_inc NULL
 eo	embeddedobj\source\commonembedding			nmake	-	all	eo_commonembed eo_inc NULL
diff --git a/embeddedobj/prj/d.lst b/embeddedobj/prj/d.lst
index 6972174716..e85b439a1e 100644..100755
--- a/embeddedobj/prj/d.lst
+++ b/embeddedobj/prj/d.lst
@@ -4,3 +4,5 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\misc\embobj.component %_DEST%\xml%_EXT%\embobj.component
+..\%__SRC%\misc\emboleobj.component %_DEST%\xml%_EXT%\emboleobj.component
diff --git a/embeddedobj/prj/l10n b/embeddedobj/prj/l10n
index 69f0d9e5e2..69f0d9e5e2 100644..100755
--- a/embeddedobj/prj/l10n
+++ b/embeddedobj/prj/l10n
diff --git a/embeddedobj/qa/embedding/EmbeddingTest.java b/embeddedobj/qa/embedding/EmbeddingTest.java
index bb57700abf..bb57700abf 100644..100755
--- a/embeddedobj/qa/embedding/EmbeddingTest.java
+++ b/embeddedobj/qa/embedding/EmbeddingTest.java
diff --git a/embeddedobj/qa/embedding/EmbeddingUnitTest.java b/embeddedobj/qa/embedding/EmbeddingUnitTest.java
index ce2aa05d6a..ce2aa05d6a 100644..100755
--- a/embeddedobj/qa/embedding/EmbeddingUnitTest.java
+++ b/embeddedobj/qa/embedding/EmbeddingUnitTest.java
diff --git a/embeddedobj/qa/embedding/Test01.java b/embeddedobj/qa/embedding/Test01.java
index e962316d31..e962316d31 100644..100755
--- a/embeddedobj/qa/embedding/Test01.java
+++ b/embeddedobj/qa/embedding/Test01.java
diff --git a/embeddedobj/qa/embedding/TestHelper.java b/embeddedobj/qa/embedding/TestHelper.java
index fd0c26ebbc..fd0c26ebbc 100644..100755
--- a/embeddedobj/qa/embedding/TestHelper.java
+++ b/embeddedobj/qa/embedding/TestHelper.java
diff --git a/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk
index 78c6dfb805..78c6dfb805 100644..100755
--- a/embeddedobj/qa/embedding/makefile.mk
+++ b/embeddedobj/qa/embedding/makefile.mk
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 34cdad312f..79cc15bf0d 100644..100755
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -166,7 +166,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange
 void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
 {
     // TODO: may be needs interaction handler to detect wherether the object state
-    //		 can be changed even after errors
+    //         can be changed even after errors
 
     if ( m_nObjectState == embed::EmbedStates::LOADED )
     {
@@ -236,7 +236,10 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
             if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
             {
                 if ( !m_xClientSite.is() )
-                    throw embed::WrongStateException(); //TODO: client site is not set!
+                    throw embed::WrongStateException(
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "client site not set, yet" ) ),
+                        *this
+                );
 
                 uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY );
                 if ( xInplaceClient.is() && xInplaceClient->canInplaceActivate() )
@@ -486,14 +489,19 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
             {
                 if ( nOldState != m_nObjectState )
                     // notify listeners that the object has changed the state
-                    StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState ,aGuard);
+                    StateChangeNotification_Impl( sal_False, nOldState, m_nObjectState, aGuard );
 
                 throw;
             }
         }
 
         // notify listeners that the object has changed the state
-        StateChangeNotification_Impl( sal_False, nOldState, nNewState,aGuard );
+        StateChangeNotification_Impl( sal_False, nOldState, nNewState, aGuard );
+
+        // let the object window be shown
+        if ( nNewState == embed::EmbedStates::UI_ACTIVE || nNewState == embed::EmbedStates::INPLACE_ACTIVE )
+            PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ),
+                                        uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 }
 
@@ -502,7 +510,6 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
@@ -518,7 +525,6 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
@@ -539,7 +545,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
 {
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OCommonEmbeddedObject::doVerb" );
 
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
@@ -562,7 +568,10 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
         // TODO/LATER: check if the verb is a supported one and if it is produce related operation
     }
     else
+    {
+        aGuard.clear();
         changeState( nNewState );
+    }
 }
 
 //----------------------------------------------
@@ -570,7 +579,6 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
@@ -607,7 +615,6 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
@@ -660,7 +667,6 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index bec36d34a0..bec36d34a0 100644..100755
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
diff --git a/embeddedobj/source/commonembedding/makefile.mk b/embeddedobj/source/commonembedding/makefile.mk
index d731b729d9..d731b729d9 100644..100755
--- a/embeddedobj/source/commonembedding/makefile.mk
+++ b/embeddedobj/source/commonembedding/makefile.mk
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index c75df69807..12681f0448 100644..100755
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -40,6 +40,7 @@
 
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/interfacecontainer.h>
+#include <comphelper/mimeconfighelper.hxx>
 
 #include "closepreventer.hxx"
 #include "intercept.hxx"
@@ -241,6 +242,14 @@ void OCommonEmbeddedObject::LinkInit_Impl(
 
     OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" );
 
+    m_bReadOnly = sal_True;
+    if ( m_aLinkFilterName.getLength() )
+    {
+        ::comphelper::MimeConfigurationHelper aHelper( m_xFactory );
+        ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName );
+        m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) );
+    }
+
     m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, sal_False );
 
     uno::Reference< frame::XDispatchProviderInterceptor > xDispatchInterceptor;
@@ -334,7 +343,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName,
             aEvent.Source = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) );
             // For now all the events are sent as object events
             // aEvent.Source = ( xSource.is() ? xSource
-            //					   : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) );
+            //                       : uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ) );
             ::cppu::OInterfaceIteratorHelper aIt( *pIC );
             while( aIt.hasMoreElements() )
             {
@@ -468,9 +477,8 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getImplementationId()
 uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
         throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
-        throw lang::DisposedException(); // TODO
+        throw lang::DisposedException();
 
     return m_aClassID;
 }
@@ -479,9 +487,8 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
 ::rtl::OUString SAL_CALL OCommonEmbeddedObject::getClassName()
         throw ( uno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
-        throw lang::DisposedException(); // TODO
+        throw lang::DisposedException();
 
     return m_aClassName;
 }
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index eedf48261d..082dfea82b 100644..100755
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -228,11 +228,11 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference<
     }
     catch( const uno::Exception& )
     {
-        // some of our embedded object implementations (in particular chart) do neither support
-        // the EmbeddedObject, nor the EmbeddedScriptSupport argument. Also, they do not support
-        // XInitialization, which means the default factory from cppuhelper will throw an
+        // if an embedded object implementation does not support XInitialization,
+        // the default factory from cppuhelper will throw an
         // IllegalArgumentException when we try to create the instance with arguments.
         // Okay, so we fall back to creating the instance without any arguments.
+        OSL_ASSERT("Consider implementing interface XInitialization to avoid duplicate construction");
         xDocument = _rxFactory->createInstance( _rDocumentServiceName );
     }
 
@@ -975,7 +975,21 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
     if ( m_bWaitSaveCompleted )
     {
         if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-            saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
+        {
+            // saveCompleted is expected, handle it accordingly
+            if ( m_xNewParentStorage == xStorage && m_aNewEntryName.equals( sEntName ) )
+            {
+                saveCompleted( sal_True );
+                return;
+            }
+
+            // if a completely different entry is provided, switch first back to the old persistence in saveCompleted
+            // and then switch to the target persistence
+            sal_Bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+            saveCompleted( sal_False );
+            if ( !bSwitchFurther )
+                return;
+        }
         else
             throw embed::WrongStateException(
                         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index f874f5e9ce..8fc269617b 100644..100755
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -88,48 +88,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
     return pRet;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            sal_Int32 nInd = 0;
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        OOoEmbeddedObjectFactory::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-            uno::Sequence< ::rtl::OUString > rServices = OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames();
-            for( nInd = 0; nInd < rServices.getLength(); nInd++ )
-                xNewKey->createKey( rServices.getConstArray()[nInd] );
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-            rServices = OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames();
-            for( nInd = 0; nInd < rServices.getLength(); nInd++ )
-                xNewKey->createKey( rServices.getConstArray()[nInd] );
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        UNOEmbeddedObjectCreator::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-            rServices = UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames();
-            for( nInd = 0; nInd < rServices.getLength(); nInd++ )
-                xNewKey->createKey( rServices.getConstArray()[nInd] );
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 } // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index cb54cc48b9..cb54cc48b9 100644..100755
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 3403c81614..3403c81614 100644..100755
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 3fa388d9eb..3fa388d9eb 100644..100755
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index 3faeb71cb1..3faeb71cb1 100644..100755
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6bc2074837..6bc2074837 100644..100755
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index e2a5fbde0e..e2a5fbde0e 100644..100755
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 6877691321..6877691321 100644..100755
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
diff --git a/embeddedobj/source/general/makefile.mk b/embeddedobj/source/general/makefile.mk
index 2aab057358..2aab057358 100644..100755
--- a/embeddedobj/source/general/makefile.mk
+++ b/embeddedobj/source/general/makefile.mk
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index f91d345501..f91d345501 100644..100755
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 22908596f7..22908596f7 100644..100755
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index a7c8964c4f..a7c8964c4f 100644..100755
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 8d26ef29bf..8d26ef29bf 100644..100755
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index c288deaede..c288deaede 100644..100755
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 6201f65b11..6201f65b11 100644..100755
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index bdf175e4a7..bdf175e4a7 100644..100755
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index e181fe8ccf..e181fe8ccf 100644..100755
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
diff --git a/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx
index 4361b78410..4361b78410 100644..100755
--- a/embeddedobj/source/inc/targetstatecontrol.hxx
+++ b/embeddedobj/source/inc/targetstatecontrol.hxx
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index ae9a4a361b..ae9a4a361b 100644..100755
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx
index f8027bf854..f8027bf854 100644..100755
--- a/embeddedobj/source/msole/advisesink.cxx
+++ b/embeddedobj/source/msole/advisesink.cxx
diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index 83fac1e920..83fac1e920 100644..100755
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index f2368cf43b..f2368cf43b 100644..100755
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
diff --git a/embeddedobj/source/msole/emboleobj.component b/embeddedobj/source/msole/emboleobj.component
new file mode 100755
index 0000000000..96f8ed0d8d
--- /dev/null
+++ b/embeddedobj/source/msole/emboleobj.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory">
+    <service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/>
+    <service name="com.sun.star.embed.OLEEmbeddedObjectFactory"/>
+  </implementation>
+</component>
diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component
new file mode 100755
index 0000000000..644a1d4f19
--- /dev/null
+++ b/embeddedobj/source/msole/emboleobj.windows.component
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.embed.MSOLEObjectSystemCreator">
+    <service name="com.sun.star.comp.embed.MSOLEObjectSystemCreator"/>
+    <service name="com.sun.star.embed.MSOLEObjectSystemCreator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory">
+    <service name="com.sun.star.comp.embed.OLEEmbeddedObjectFactory"/>
+    <service name="com.sun.star.embed.OLEEmbeddedObjectFactory"/>
+  </implementation>
+</component>
diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/embeddedobj/source/msole/exports.dxp
+++ b/embeddedobj/source/msole/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index e8a6e99201..e8a6e99201 100644..100755
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index e8d4a42d19..b7f3482fa0 100644..100755
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -129,3 +129,14 @@ DEF1NAME= $(SHL1TARGET)
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/emboleobj.component
+
+.IF "$(OS)" == "WNT"
+my_platform = .windows
+.END
+
+$(MISC)/emboleobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        emboleobj.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt emboleobj$(my_platform).component
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index d64a9bd28b..d64a9bd28b 100644..100755
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 0d66dc714f..0d66dc714f 100644..100755
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 00c4eb5c60..00c4eb5c60 100644..100755
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index f017966d36..f017966d36 100644..100755
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index bf53a25c4f..bf53a25c4f 100644..100755
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 61e6e4df6d..61e6e4df6d 100644..100755
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index fe49cb1ecb..fe49cb1ecb 100644..100755
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 2e7c796a88..2e7c796a88 100644..100755
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
diff --git a/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx
index 57b66baaf5..57b66baaf5 100644..100755
--- a/embeddedobj/source/msole/olewrapclient.cxx
+++ b/embeddedobj/source/msole/olewrapclient.cxx
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index e054b0b12d..e054b0b12d 100644..100755
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 7924e69787..7924e69787 100644..100755
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 1768ca61cd..1768ca61cd 100644..100755
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 20ffb3f305..20ffb3f305 100644..100755
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 4bcc7836c3..4bcc7836c3 100644..100755
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index 7d20ad0388..7d20ad0388 100644..100755
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 64339daf36..64339daf36 100644..100755
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index 4fea7d3065..4fea7d3065 100644..100755
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
diff --git a/embeddedobj/test/Container1/BitmapPainter.java b/embeddedobj/test/Container1/BitmapPainter.java
index 3895e28ead..3895e28ead 100644..100755
--- a/embeddedobj/test/Container1/BitmapPainter.java
+++ b/embeddedobj/test/Container1/BitmapPainter.java
diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java
index ea17da215b..ea17da215b 100644..100755
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
diff --git a/embeddedobj/test/Container1/EmbedContFrame.java b/embeddedobj/test/Container1/EmbedContFrame.java
index 2a79686df3..2a79686df3 100644..100755
--- a/embeddedobj/test/Container1/EmbedContFrame.java
+++ b/embeddedobj/test/Container1/EmbedContFrame.java
diff --git a/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java
index 6d2c8819ad..6d2c8819ad 100644..100755
--- a/embeddedobj/test/Container1/JavaWindowPeerFake.java
+++ b/embeddedobj/test/Container1/JavaWindowPeerFake.java
diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index 56bfc1f668..56bfc1f668 100644..100755
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
diff --git a/embeddedobj/test/Container1/PaintThread.java b/embeddedobj/test/Container1/PaintThread.java
index b805b61e71..b805b61e71 100644..100755
--- a/embeddedobj/test/Container1/PaintThread.java
+++ b/embeddedobj/test/Container1/PaintThread.java
diff --git a/embeddedobj/test/Container1/WindowHelper.java b/embeddedobj/test/Container1/WindowHelper.java
index b475e9ccd9..b475e9ccd9 100644..100755
--- a/embeddedobj/test/Container1/WindowHelper.java
+++ b/embeddedobj/test/Container1/WindowHelper.java
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index e482384dd9..e482384dd9 100644..100755
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
diff --git a/embeddedobj/test/Container1/nativelib/exports.dxp b/embeddedobj/test/Container1/nativelib/exports.dxp
index e03ee0d2bc..e03ee0d2bc 100644..100755
--- a/embeddedobj/test/Container1/nativelib/exports.dxp
+++ b/embeddedobj/test/Container1/nativelib/exports.dxp
diff --git a/embeddedobj/test/Container1/nativelib/makefile.mk b/embeddedobj/test/Container1/nativelib/makefile.mk
index 331a5b12f2..331a5b12f2 100644..100755
--- a/embeddedobj/test/Container1/nativelib/makefile.mk
+++ b/embeddedobj/test/Container1/nativelib/makefile.mk
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index fada23a76d..fada23a76d 100644..100755
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.h b/embeddedobj/test/Container1/nativelib/nativeview.h
index 0cbb1a28d6..0cbb1a28d6 100644..100755
--- a/embeddedobj/test/Container1/nativelib/nativeview.h
+++ b/embeddedobj/test/Container1/nativelib/nativeview.h
diff --git a/embeddedobj/test/MainThreadExecutor/exports.dxp b/embeddedobj/test/MainThreadExecutor/exports.dxp
index 9630d7e067..9630d7e067 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/exports.dxp
+++ b/embeddedobj/test/MainThreadExecutor/exports.dxp
diff --git a/embeddedobj/test/MainThreadExecutor/makefile.mk b/embeddedobj/test/MainThreadExecutor/makefile.mk
index c94341e604..c94341e604 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/makefile.mk
+++ b/embeddedobj/test/MainThreadExecutor/makefile.mk
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index f65d5d6274..f65d5d6274 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index aa00502b45..aa00502b45 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index c3da32dda9..c3da32dda9 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index 6741d774ab..6741d774ab 100644..100755
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 0a824bc1e7..0a824bc1e7 100644..100755
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
diff --git a/embeddedobj/test/mtexecutor/exports.dxp b/embeddedobj/test/mtexecutor/exports.dxp
index 9630d7e067..9630d7e067 100644..100755
--- a/embeddedobj/test/mtexecutor/exports.dxp
+++ b/embeddedobj/test/mtexecutor/exports.dxp
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 63628cbdb7..63628cbdb7 100644..100755
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index 61ef478406..61ef478406 100644..100755
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
diff --git a/embeddedobj/test/mtexecutor/makefile.mk b/embeddedobj/test/mtexecutor/makefile.mk
index fb6c6224b7..fb6c6224b7 100644..100755
--- a/embeddedobj/test/mtexecutor/makefile.mk
+++ b/embeddedobj/test/mtexecutor/makefile.mk
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 94c7df9d27..94c7df9d27 100644..100755
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
diff --git a/embeddedobj/util/embobj.component b/embeddedobj/util/embobj.component
new file mode 100755
index 0000000000..e46945dcb7
--- /dev/null
+++ b/embeddedobj/util/embobj.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.embed.EmbeddedObjectCreator">
+    <service name="com.sun.star.comp.embed.EmbeddedObjectCreator"/>
+    <service name="com.sun.star.embed.EmbeddedObjectCreator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.OOoEmbeddedObjectFactory">
+    <service name="com.sun.star.comp.embed.OOoEmbeddedObjectFactory"/>
+    <service name="com.sun.star.embed.OOoEmbeddedObjectFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory">
+    <service name="com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"/>
+    <service name="com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"/>
+  </implementation>
+</component>
diff --git a/embeddedobj/util/exports.dxp b/embeddedobj/util/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/embeddedobj/util/exports.dxp
+++ b/embeddedobj/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index d2563fbce1..c70009b552 100644..100755
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -85,3 +85,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo CLEAR_THE_FILE	> $@
     @echo __CT				>>$@
 
+
+ALLTAR : $(MISC)/embobj.component
+
+$(MISC)/embobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        embobj.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt embobj.component
diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst
index 400b5a8f52..7c95320347 100644..100755
--- a/eventattacher/prj/build.lst
+++ b/eventattacher/prj/build.lst
@@ -1,4 +1,4 @@
-ea      eventattacher   :       offapi cppuhelper NULL
+ea      eventattacher   :       offapi cppuhelper LIBXSLT:libxslt NULL
 ea	eventattacher							usr1	-	all	ea_mkout NULL
 ea	eventattacher\prj						get		-	all	ea_prj NULL
 ea	eventattacher\source					nmake	-	all	ea_source NULL
diff --git a/eventattacher/prj/d.lst b/eventattacher/prj/d.lst
index 5f9f228eda..202a0a06ae 100644..100755
--- a/eventattacher/prj/d.lst
+++ b/eventattacher/prj/d.lst
@@ -1,3 +1,4 @@
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%
+..\%__SRC%\misc\evtatt.component %_DEST%\xml%_EXT%\evtatt.component
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 27487d86b7..cd85921988 100644..100755
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -828,34 +828,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * , void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            // DefaultRegistry
-            Reference< XRegistryKey > xNewKey(
-                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") )));
-            
-            Sequence< OUString > aSNL
-                ( ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() );
-            const OUString * pArray = aSNL.getConstArray();
-            for ( sal_Int32 nPos = aSNL.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            return sal_True;
-        }
-        catch (InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-//==================================================================================================
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/eventattacher/source/evtatt.component b/eventattacher/source/evtatt.component
new file mode 100755
index 0000000000..3e48d58893
--- /dev/null
+++ b/eventattacher/source/evtatt.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.EventAttacher">
+    <service name="com.sun.star.script.EventAttacher"/>
+  </implementation>
+</component>
diff --git a/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index 632a1fa41a..360dcdabd7 100644..100755
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/source/makefile.mk
@@ -61,3 +61,11 @@ SHL1LIBS=	$(SLB)$/$(TARGET).lib
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/evtatt.component
+
+$(MISC)/evtatt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        evtatt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt evtatt.component
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst
index a60a92e9c1..0349810c38 100644..100755
--- a/fileaccess/prj/build.lst
+++ b/fileaccess/prj/build.lst
@@ -1,3 +1,3 @@
-fa	fileaccess	:	unotools rdbmaker tools ucbhelper NULL
+fa	fileaccess	:	unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL
 fa	fileaccess								usr1	-	all	fa_mkout NULL
 fa	fileaccess\source						nmake	-	all	fa_src NULL
diff --git a/fileaccess/prj/d.lst b/fileaccess/prj/d.lst
index 695487c560..c9b2bdd18f 100644..100755
--- a/fileaccess/prj/d.lst
+++ b/fileaccess/prj/d.lst
@@ -3,3 +3,4 @@
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml
+..\%__SRC%\misc\fileacc.component %_DEST%\xml%_EXT%\fileacc.component
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 08b709277b..40257aee37 100644..100755
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -881,32 +881,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            Reference< XRegistryKey > xNewKey(
-                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
-
-            const Sequence< rtl::OUString > & rSNL = io_FileAccess::FileAccess_getSupportedServiceNames();
-            const rtl::OUString * pArray = rSNL.getConstArray();
-            for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            return sal_True;
-        }
-        catch (InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-//==================================================================================================
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component
new file mode 100755
index 0000000000..3f14d40532
--- /dev/null
+++ b/fileaccess/source/fileacc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.SimpleFileAccess">
+    <service name="com.sun.star.ucb.SimpleFileAccess"/>
+  </implementation>
+</component>
diff --git a/fileaccess/source/fileacc.xml b/fileaccess/source/fileacc.xml
index c87ed30b33..c87ed30b33 100644..100755
--- a/fileaccess/source/fileacc.xml
+++ b/fileaccess/source/fileacc.xml
diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
index 2b78265346..8c8a91b0f6 100644..100755
--- a/fileaccess/source/makefile.mk
+++ b/fileaccess/source/makefile.mk
@@ -66,3 +66,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/fileacc.component
+
+$(MISC)/fileacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fileacc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fileacc.component
diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx
index 7ad743ac11..7ad743ac11 100644..100755
--- a/formula/inc/AddressConvention.hxx
+++ b/formula/inc/AddressConvention.hxx
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index 20cf2568e4..20cf2568e4 100644..100755
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index f5f1e71174..166d522728 100644..100755
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -65,7 +65,7 @@ struct FormulaArrayStack
 {
     FormulaArrayStack*  pNext;
     FormulaTokenArray*  pArr;
-    BOOL bTemp;
+    sal_Bool bTemp;
 };
 
 
@@ -100,7 +100,7 @@ public:
         ExternalHashMap       * mpExternalHashMap;         /// Hash map of ocExternal, Filter String -> AddIn String
         ExternalHashMap       * mpReverseExternalHashMap;  /// Hash map of ocExternal, AddIn String -> Filter String
         FormulaGrammar::Grammar meGrammar;                  /// Grammar, language and reference convention
-        USHORT                  mnSymbols;                  /// Count of OpCode symbols
+        sal_uInt16                  mnSymbols;                  /// Count of OpCode symbols
         bool                    mbCore      : 1;            /// If mapping was setup by core, not filters
         bool                    mbEnglish   : 1;            /// If English symbols and external names
 
@@ -110,7 +110,7 @@ public:
 
     public:
 
-        OpCodeMap(USHORT nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
+        OpCodeMap(sal_uInt16 nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
             mpHashMap( new OpCodeHashMap( nSymbols)),
             mpTable( new String[ nSymbols ]),
             mpExternalHashMap( new ExternalHashMap),
@@ -137,8 +137,8 @@ public:
         /// Get the symbol string matching an OpCode.
         inline const String& getSymbol( const OpCode eOp ) const
         {
-            DBG_ASSERT( USHORT(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
-            if (USHORT(eOp) < mnSymbols)
+            DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
+            if (sal_uInt16(eOp) < mnSymbols)
                 return mpTable[ eOp ];
             static String s_sEmpty;
             return s_sEmpty;
@@ -148,7 +148,7 @@ public:
         inline FormulaGrammar::Grammar getGrammar() const { return meGrammar; }
 
         /// Get the symbol count.
-        inline USHORT getSymbolCount() const { return mnSymbols; }
+        inline sal_uInt16 getSymbolCount() const { return mnSymbols; }
 
         /** Are these English symbols, as opposed to native language (which may
             be English as well)? */
@@ -218,25 +218,26 @@ public:
      */
     OpCode GetEnglishOpCode( const String& rName ) const;
 
-    void            SetCompileForFAP( BOOL bVal )
+    void            SetCompileForFAP( sal_Bool bVal )
                         { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
 
     static bool IsOpCodeVolatile( OpCode eOp );
 
-    static BOOL DeQuote( String& rStr );
+    static sal_Bool DeQuote( String& rStr );
+
 
     static const String&    GetNativeSymbol( OpCode eOp );
-    static  BOOL            IsMatrixFunction(OpCode _eOpCode);   // if a function _always_ returns a Matrix
+    static  sal_Bool            IsMatrixFunction(OpCode _eOpCode);   // if a function _always_ returns a Matrix
 
     short GetNumFormatType() const { return nNumFmt; }
-    BOOL  CompileTokenArray();
+    sal_Bool  CompileTokenArray();
 
     void CreateStringFromTokenArray( String& rFormula );
     void CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer );
     FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken,
-                                    BOOL bAllowArrAdvance = FALSE );
+                                    sal_Bool bAllowArrAdvance = sal_False );
     FormulaToken* CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pToken,
-                                    BOOL bAllowArrAdvance = FALSE );
+                                    sal_Bool bAllowArrAdvance = sal_False );
 
     void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal );
     void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal );
@@ -250,18 +251,18 @@ public:
     static void ResetNativeSymbols();
     static void SetNativeSymbols( const OpCodeMapPtr& xMap );
 protected:
-    virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
+    virtual String FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const;
     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, FormulaGrammar::Grammar _eGrammar ) const;
     virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const;
 
-    virtual void SetError(USHORT nError);
+    virtual void SetError(sal_uInt16 nError);
     virtual FormulaTokenRef ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef );
-    virtual BOOL HandleExternalReference(const FormulaToken& _aToken);
-    virtual BOOL HandleRange();
-    virtual BOOL HandleSingleRef();
-    virtual BOOL HandleDbData();
+    virtual sal_Bool HandleExternalReference(const FormulaToken& _aToken);
+    virtual sal_Bool HandleRange();
+    virtual sal_Bool HandleSingleRef();
+    virtual sal_Bool HandleDbData();
 
     virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP);
     virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
@@ -269,9 +270,9 @@ protected:
     virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
     virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
     virtual void LocalizeString( String& rName );	// modify rName - input: exact name
-    virtual BOOL IsImportingXML() const;
+    virtual sal_Bool IsImportingXML() const;
 
-    BOOL   GetToken();
+    sal_Bool   GetToken();
     OpCode NextToken();
     void PutCode( FormulaTokenRef& );
     void Factor();
@@ -288,7 +289,7 @@ protected:
     void NotLine();
     OpCode Expression();
     void PopTokenArray();
-    void PushTokenArray( FormulaTokenArray*, BOOL = FALSE );
+    void PushTokenArray( FormulaTokenArray*, sal_Bool = sal_False );
 
     bool MergeRangeReference( FormulaToken * * const pCode1, FormulaToken * const * const pCode2 );
 
@@ -308,18 +309,18 @@ protected:
     OpCode              eLastOp;
     short               nRecursion;                 // GetToken() recursions
     short               nNumFmt;                    // set during CompileTokenArray()
-    USHORT              pc;
+    sal_uInt16              pc;
 
     FormulaGrammar::Grammar  
                         meGrammar;          // The grammar used, language plus convention.
 
-    BOOL                bAutoCorrect;               // whether to apply AutoCorrection
-    BOOL                bCorrected;                 // AutoCorrection was applied
-    BOOL                bCompileForFAP;             //! not real RPN but names, for FunctionAutoPilot,
+    sal_Bool                bAutoCorrect;               // whether to apply AutoCorrection
+    sal_Bool                bCorrected;                 // AutoCorrection was applied
+    sal_Bool                bCompileForFAP;             //! not real RPN but names, for FunctionAutoPilot,
                                                     // will not be resolved
-    BOOL                bIgnoreErrors;              // on AutoCorrect and CompileForFAP
+    sal_Bool                bIgnoreErrors;              // on AutoCorrect and CompileForFAP
                                                     // ignore errors and create RPN nevertheless
-    BOOL                glSubTotal;                 // if code contains one or more subtotal functions
+    sal_Bool                glSubTotal;                 // if code contains one or more subtotal functions
 private:
     void InitSymbolsNative() const;    /// only SymbolsNative, on first document creation
     void InitSymbolsEnglish() const;   /// only SymbolsEnglish, maybe later
@@ -327,7 +328,7 @@ private:
     void InitSymbolsODFF() const;      /// only SymbolsODFF, on demand
     void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand
 
-    void loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
+    void loadSymbols(sal_uInt16 _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
 
     static inline void ForceArrayOperator( FormulaTokenRef& rCurr, const FormulaTokenRef& rPrev )
         {
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index fe50c22139..fe50c22139 100644..100755
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx
index 84fd125061..44aa68ba13 100644..100755
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/formula/inc/formula/IControlReferenceHandler.hxx
@@ -38,7 +38,7 @@ namespace formula
     {
     public:
         virtual void ShowReference(const String& _sRef) = 0;
-        virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0;
+        virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
         virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
         virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
     };
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index eeb3f47db0..838a2f9629 100644..100755
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -90,10 +90,10 @@ namespace formula
         // GetFormulaString
         virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const = 0;
         // GetVisibleArgMapping
-        virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const = 0;
+        virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0;
         virtual void initArgumentInfo() const = 0;
         virtual ::rtl::OUString getSignature() const = 0;
-        virtual long getHelpId() const = 0;
+        virtual rtl::OString getHelpId() const = 0;
 
         // parameter
         virtual sal_uInt32 getParameterCount() const = 0;
@@ -118,7 +118,7 @@ namespace formula
     public:
         IStructHelper(){}
         virtual SvLBoxEntry*	InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
-                                USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL) = 0;
+                                sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
 
         virtual String	        GetEntryText(SvLBoxEntry* pEntry) const = 0;
         virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const = 0;
@@ -153,9 +153,9 @@ namespace formula
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
         virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
 
-        virtual void setDispatcherLock( BOOL bLock ) = 0;
-        virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked) = 0;
-        virtual void doClose(BOOL _bOk) = 0;
+        virtual void setDispatcherLock( sal_Bool bLock ) = 0;
+        virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
+        virtual void doClose(sal_Bool _bOk) = 0;
         virtual void insertEntryToLRUList(const IFunctionDescription*	pDesc) = 0;
         virtual void showReference(const String& _sFormula) = 0;
     };
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index c1a8117ab0..c1a8117ab0 100644..100755
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index 54fd243dba..bf46a4744f 100644..100755
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -35,60 +35,60 @@
 namespace ScErrorCodes
 {
 
-const USHORT errIllegalChar          = 501;
-const USHORT errIllegalArgument      = 502;
-const USHORT errIllegalFPOperation   = 503; // #NUM!
-const USHORT errIllegalParameter     = 504;
-const USHORT errIllegalJump          = 505;
-const USHORT errSeparator            = 506;
-const USHORT errPair                 = 507;
-const USHORT errPairExpected         = 508;
-const USHORT errOperatorExpected     = 509;
-const USHORT errVariableExpected     = 510;
-const USHORT errParameterExpected    = 511;
-const USHORT errCodeOverflow         = 512;
-const USHORT errStringOverflow       = 513;
-const USHORT errStackOverflow        = 514;
-const USHORT errUnknownState         = 515;
-const USHORT errUnknownVariable      = 516;
-const USHORT errUnknownOpCode        = 517;
-const USHORT errUnknownStackVariable = 518;
-const USHORT errNoValue              = 519; // #VALUE!
-const USHORT errUnknownToken         = 520;
-const USHORT errNoCode               = 521; // #NULL!
-const USHORT errCircularReference    = 522;
-const USHORT errNoConvergence        = 523;
-const USHORT errNoRef                = 524; // #REF!
-const USHORT errNoName               = 525; // #NAME?
-const USHORT errDoubleRef            = 526;
-const USHORT errInterpOverflow       = 527;
+const sal_uInt16 errIllegalChar          = 501;
+const sal_uInt16 errIllegalArgument      = 502;
+const sal_uInt16 errIllegalFPOperation   = 503; // #NUM!
+const sal_uInt16 errIllegalParameter     = 504;
+const sal_uInt16 errIllegalJump          = 505;
+const sal_uInt16 errSeparator            = 506;
+const sal_uInt16 errPair                 = 507;
+const sal_uInt16 errPairExpected         = 508;
+const sal_uInt16 errOperatorExpected     = 509;
+const sal_uInt16 errVariableExpected     = 510;
+const sal_uInt16 errParameterExpected    = 511;
+const sal_uInt16 errCodeOverflow         = 512;
+const sal_uInt16 errStringOverflow       = 513;
+const sal_uInt16 errStackOverflow        = 514;
+const sal_uInt16 errUnknownState         = 515;
+const sal_uInt16 errUnknownVariable      = 516;
+const sal_uInt16 errUnknownOpCode        = 517;
+const sal_uInt16 errUnknownStackVariable = 518;
+const sal_uInt16 errNoValue              = 519; // #VALUE!
+const sal_uInt16 errUnknownToken         = 520;
+const sal_uInt16 errNoCode               = 521; // #NULL!
+const sal_uInt16 errCircularReference    = 522;
+const sal_uInt16 errNoConvergence        = 523;
+const sal_uInt16 errNoRef                = 524; // #REF!
+const sal_uInt16 errNoName               = 525; // #NAME?
+const sal_uInt16 errDoubleRef            = 526;
+const sal_uInt16 errInterpOverflow       = 527;
 // Not displayed, temporary for TrackFormulas,
 // Cell depends on another cell that has errCircularReference
-const USHORT errTrackFromCircRef     = 528;
+const sal_uInt16 errTrackFromCircRef     = 528;
 // ScInterpreter internal:  no numeric value but numeric queried. If this is 
 // set as mnStringNoValueError no error is generated but 0 returned.
-const USHORT errCellNoValue          = 529;
+const sal_uInt16 errCellNoValue          = 529;
 // Interpreter: needed AddIn not found
-const USHORT errNoAddin              = 530;
+const sal_uInt16 errNoAddin              = 530;
 // Interpreter: needed Macro not found
-const USHORT errNoMacro              = 531;
+const sal_uInt16 errNoMacro              = 531;
 // Interpreter: Division by zero
-const USHORT errDivisionByZero       = 532; // #DIV/0!
+const sal_uInt16 errDivisionByZero       = 532; // #DIV/0!
 // Compiler: a non-simple (str,err,val) value was put in an array
-const USHORT errNestedArray          = 533;
+const sal_uInt16 errNestedArray          = 533;
 // ScInterpreter internal:  no numeric value but numeric queried. If this is 
 // temporarily (!) set as mnStringNoValueError, the error is generated and can 
 // be used to distinguish that condition from all other (inherited) errors. Do 
 // not use for anything else! Never push or inherit the error otherwise!
-const USHORT errNotNumericString     = 534;
+const sal_uInt16 errNotNumericString     = 534;
 
 // Interpreter: NA() not available condition, not a real error
-const USHORT NOTAVAILABLE            = 0x7fff;
+const sal_uInt16 NOTAVAILABLE            = 0x7fff;
 
 
 /** Unconditionally construct a double value of NAN where the lower bits
     represent an interpreter error code. */
-inline double CreateDoubleError( USHORT nErr )
+inline double CreateDoubleError( sal_uInt16 nErr )
 {
     union
     {
@@ -102,17 +102,17 @@ inline double CreateDoubleError( USHORT nErr )
 
 
 /** Recreate the error code of a coded double error, if any. */
-inline USHORT GetDoubleErrorValue( double fVal )
+inline sal_uInt16 GetDoubleErrorValue( double fVal )
 {
     if ( ::rtl::math::isFinite( fVal ) )
         return 0;
     if ( ::rtl::math::isInf( fVal ) )
         return errIllegalFPOperation;       // normal INF
-    UINT32 nErr = reinterpret_cast< sal_math_Double * >(
+    sal_uInt32 nErr = reinterpret_cast< sal_math_Double * >(
             &fVal)->nan_parts.fraction_lo;
     if ( nErr & 0xffff0000 )
         return errNoValue;                  // just a normal NAN
-    return (USHORT)(nErr & 0x0000ffff);     // any other error
+    return (sal_uInt16)(nErr & 0x0000ffff);     // any other error
 }
 
 } // namespace ScErrorCodes
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 369468eb68..a5dc872d5f 100644..100755
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -44,28 +44,28 @@ public:
 
     virtual void			SaveValues();
     void				    RestoreValues();
-    BOOL				    HasParent() const	{ return pParent != NULL; }
+    sal_Bool				    HasParent() const	{ return pParent != NULL; }
 
-    inline USHORT			GetMode() const		{ return nMode; }
+    inline sal_uInt16			GetMode() const		{ return nMode; }
     inline xub_StrLen		GetFStart() const	{ return nFStart; }
-    inline USHORT			GetCatSel() const	{ return nCatSel; }
-    inline USHORT			GetFuncSel() const	{ return nFuncSel; }
-    inline USHORT			GetOffset() const	{ return nOffset; }
-    inline USHORT			GetEdFocus() const	{ return nEdFocus; }
+    inline sal_uInt16			GetCatSel() const	{ return nCatSel; }
+    inline sal_uInt16			GetFuncSel() const	{ return nFuncSel; }
+    inline sal_uInt16			GetOffset() const	{ return nOffset; }
+    inline sal_uInt16			GetEdFocus() const	{ return nEdFocus; }
     inline const String&	GetUndoStr() const	{ return aUndoStr; }
-    inline BOOL				GetMatrixFlag()const{ return bMatrix;}
-    inline ULONG			GetUniqueId()const	{ return nUniqueId;}
+    inline sal_Bool				GetMatrixFlag()const{ return bMatrix;}
+    inline rtl::OString     GetUniqueId()const	{ return aUniqueId;}
     inline const Selection&	GetSelection()const	{ return aSelection;}
 
-    inline void				SetMode( USHORT nNew )					{ nMode = nNew; }
+    inline void				SetMode( sal_uInt16 nNew )					{ nMode = nNew; }
     inline void				SetFStart( xub_StrLen nNew )			{ nFStart = nNew; }
-    inline void				SetCatSel( USHORT nNew )				{ nCatSel = nNew; }
-    inline void				SetFuncSel( USHORT nNew )				{ nFuncSel = nNew; }
-    inline void				SetOffset( USHORT nNew )				{ nOffset = nNew; }
-    inline void				SetEdFocus( USHORT nNew )				{ nEdFocus = nNew; }
+    inline void				SetCatSel( sal_uInt16 nNew )				{ nCatSel = nNew; }
+    inline void				SetFuncSel( sal_uInt16 nNew )				{ nFuncSel = nNew; }
+    inline void				SetOffset( sal_uInt16 nNew )				{ nOffset = nNew; }
+    inline void				SetEdFocus( sal_uInt16 nNew )				{ nEdFocus = nNew; }
     inline void				SetUndoStr( const String& rNew )		{ aUndoStr = rNew; }
-    inline void				SetMatrixFlag(BOOL bNew)				{ bMatrix=bNew;}
-    inline void				SetUniqueId(ULONG nNew)					{ nUniqueId=nNew;}
+    inline void				SetMatrixFlag(sal_Bool bNew)				{ bMatrix=bNew;}
+    inline void				SetUniqueId(const rtl::OString nNew)	{ aUniqueId=nNew;}
     inline void				SetSelection(const Selection& aSel)		{ aSelection=aSel;}
 protected:
     void				Reset();
@@ -74,15 +74,15 @@ protected:
 
     FormEditData*	pParent;			// fuer Verschachtelung
 private:
-    USHORT				nMode;				// enum ScFormulaDlgMode
+    sal_uInt16				nMode;				// enum ScFormulaDlgMode
     xub_StrLen			nFStart;
-    USHORT				nCatSel;
-    USHORT				nFuncSel;
-    USHORT				nOffset;
-    USHORT				nEdFocus;
+    sal_uInt16				nCatSel;
+    sal_uInt16				nFuncSel;
+    sal_uInt16				nOffset;
+    sal_uInt16				nEdFocus;
     String				aUndoStr;
-    BOOL				bMatrix;
-    ULONG				nUniqueId;
+    sal_Bool				bMatrix;
+    rtl::OString		aUniqueId;
     Selection			aSelection;
 };
 
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 17c30517dc..70ed2f104b 100644..100755
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -79,22 +79,22 @@ protected:
     virtual long	PreNotify( NotifyEvent& rNEvt );
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
-    void	        RefInputDoneAfter( BOOL bForced = FALSE );
-    ULONG			FindFocusWin(Window *pWin);
-    void			SetFocusWin(Window *pWin,ULONG nUniqueId);
+    void	        RefInputDoneAfter( sal_Bool bForced = sal_False );
+    rtl::OString    FindFocusWin(Window *pWin);
+    void			SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void			HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
-    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
     void            Update();
-    BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+    sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
     String          GetMeText() const;
     void            Update(const String& _sExp);
     void            CheckMatrix();
-    void            DoEnter(BOOL _bOk);
-    BOOL            isUserMatrix() const;
+    void            DoEnter(sal_Bool _bOk);
+    sal_Bool            isUserMatrix() const;
     const IFunctionDescription*	getCurrentFunctionDescription() const;
-    BOOL            UpdateParaWin(Selection& _rSelection);
+    sal_Bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
     RefEdit*	    GetActiveEdit();
     void            SetEdSelection();
@@ -128,22 +128,22 @@ protected:
     virtual long	PreNotify( NotifyEvent& rNEvt );
     ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
     void	        RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
-    void	        RefInputDoneAfter( BOOL bForced = FALSE );
-    ULONG			FindFocusWin(Window *pWin);
-    void			SetFocusWin(Window *pWin,ULONG nUniqueId);
+    void	        RefInputDoneAfter( sal_Bool bForced = sal_False );
+    rtl::OString    FindFocusWin(Window *pWin);
+    void			SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
     void			HighlightFunctionParas(const String& aFormula);
 
     void            SetMeText(const String& _sText);
-    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+    FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
     void            Update();
-    BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+    sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
     String          GetMeText() const;
     void            Update(const String& _sExp);
     void            CheckMatrix();
-    void            DoEnter(BOOL _bOk);
-    BOOL            isUserMatrix() const;
+    void            DoEnter(sal_Bool _bOk);
+    sal_Bool            isUserMatrix() const;
     const IFunctionDescription*	getCurrentFunctionDescription() const;
-    BOOL            UpdateParaWin(Selection& _rSelection);
+    sal_Bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
     RefEdit*	    GetActiveEdit();
     void            SetEdSelection();
diff --git a/formula/inc/formula/formuladllapi.h b/formula/inc/formula/formuladllapi.h
index c412c25cf8..c412c25cf8 100644..100755
--- a/formula/inc/formula/formuladllapi.h
+++ b/formula/inc/formula/formuladllapi.h
diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index e8ab24f03b..34d77fd388 100644..100755
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -55,29 +55,29 @@ namespace formula
 
         inline const CharClass* GetCharClass() const { return m_pCharClass; }
 
-        BOOL                GetNextFunc( const String&  rFormula,
-                                                 BOOL           bBack,
+        sal_Bool                GetNextFunc( const String&  rFormula,
+                                                 sal_Bool           bBack,
                                                  xub_StrLen&    rFStart, // Ein- und Ausgabe
                                                  xub_StrLen*    pFEnd = NULL,
                                                  const IFunctionDescription** ppFDesc = NULL,
                                                  ::std::vector< ::rtl::OUString>*      pArgs = NULL ) const;
 
         xub_StrLen          GetFunctionStart( const String& rFormula, xub_StrLen nStart,
-                                                        BOOL bBack, String* pFuncName = NULL ) const;
+                                                        sal_Bool bBack, String* pFuncName = NULL ) const;
 
         xub_StrLen          GetFunctionEnd  ( const String& rFormula, xub_StrLen nStart ) const;
 
         xub_StrLen          GetArgStart     ( const String& rFormula, xub_StrLen nStart,
-                                                      USHORT nArg ) const;
+                                                      sal_uInt16 nArg ) const;
 
         void                GetArgStrings   ( ::std::vector< ::rtl::OUString >& _rArgs,
                                                       const String& rFormula,
                                                       xub_StrLen    nFuncPos,
-                                                      USHORT        nArgs ) const;
+                                                      sal_uInt16        nArgs ) const;
 
         void                FillArgStrings  ( const String& rFormula,
                                                       xub_StrLen    nFuncPos,
-                                                      USHORT        nArgs,
+                                                      sal_uInt16        nArgs,
                                                       ::std::vector< ::rtl::OUString >&      _rArgs ) const;
     };
 // =============================================================================
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 6f7d23d3d3..fd6c3a7603 100644..100755
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -43,7 +43,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
 private:
     Timer               aTimer;
     IControlReferenceHandler*      pAnyRefDlg;         // parent dialog
-    BOOL                bSilentFocus;       // for SilentGrabFocus()
+    sal_Bool                bSilentFocus;       // for SilentGrabFocus()
 
     DECL_LINK( UpdateHdl, Timer* );
 
diff --git a/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx
index 1b95f108cc..1b95f108cc 100644..100755
--- a/formula/inc/formula/grammar.hxx
+++ b/formula/inc/formula/grammar.hxx
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index e13cb6dc72..03e86eb093 100644..100755
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -397,7 +397,7 @@ enum OpCodeEnum
 
 #ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
-typedef USHORT OpCode;
+typedef sal_uInt16 OpCode;
 #else
 // have enum names in debugger
 typedef OpCodeEnum OpCode;
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index 8937f844ae..a8c54aa8df 100644..100755
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -78,7 +78,7 @@ enum StackVarEnum
 
 #ifndef DBG_UTIL
 // save memory since compilers tend to int an enum
-typedef BYTE StackVar;
+typedef sal_uInt8 StackVar;
 #else
 // have enum names in debugger
 typedef StackVarEnum StackVar;
@@ -98,7 +98,7 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 protected:
 
             const StackVar      eType;          // type of data
-            mutable USHORT      nRefCnt;        // reference count
+            mutable sal_uInt16      nRefCnt;        // reference count
 
 public:
                                 FormulaToken( StackVar eTypeP,OpCode e = ocPush ) :
@@ -110,17 +110,17 @@ public:
 
     inline  void                Delete()                { delete this; }
     inline  StackVar      		GetType() const         { return eType; }
-            BOOL                IsFunction() const; // pure functions, no operators
-            BOOL                IsMatrixFunction() const;   // if a function _always_ returns a Matrix
+            sal_Bool                IsFunction() const; // pure functions, no operators
+            sal_Bool                IsMatrixFunction() const;   // if a function _always_ returns a Matrix
             bool                IsExternalRef() const;
-            BYTE                GetParamCount() const;
+            sal_uInt8                GetParamCount() const;
     inline  void                IncRef() const          { nRefCnt++; }
     inline  void                DecRef() const
                                     {
                                         if (!--nRefCnt)
                                             const_cast<FormulaToken*>(this)->Delete();
                                     }
-    inline  USHORT              GetRef() const          { return nRefCnt; }
+    inline  sal_uInt16              GetRef() const          { return nRefCnt; }
     inline OpCode               GetOpCode() const       { return eOp; }
 
     /**
@@ -138,26 +138,26 @@ public:
         Any other non-overloaded method pops up an assertion.
      */
 
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
     virtual bool                HasForceArray() const;
     virtual void                SetForceArray( bool b );
     virtual double              GetDouble() const;
     virtual double&             GetDoubleAsReference();
     virtual const String&       GetString() const;
-    virtual USHORT              GetIndex() const;
-    virtual void                SetIndex( USHORT n );
+    virtual sal_uInt16              GetIndex() const;
+    virtual void                SetIndex( sal_uInt16 n );
     virtual short*              GetJump() const;
     virtual const String&       GetExternal() const;
     virtual FormulaToken*       GetFAPOrigToken() const;
-    virtual USHORT              GetError() const;
-    virtual void                SetError( USHORT );
+    virtual sal_uInt16              GetError() const;
+    virtual void                SetError( sal_uInt16 );
 
     virtual FormulaToken*       Clone() const { return new FormulaToken(*this); }
 
-    virtual BOOL                Is3DRef() const;    // reference with 3D flag set
-    virtual BOOL                TextEqual( const formula::FormulaToken& rToken ) const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                Is3DRef() const;    // reference with 3D flag set
+    virtual sal_Bool                TextEqual( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     virtual bool isFunction() const 
     {
@@ -192,17 +192,17 @@ inline void intrusive_ptr_release(const FormulaToken* p)
 class FORMULA_DLLPUBLIC FormulaByteToken : public FormulaToken
 {
 private:
-            BYTE                nByte;
+            sal_uInt8                nByte;
             bool                bHasForceArray;
 protected:
-                                FormulaByteToken( OpCode e, BYTE n, StackVar v, bool b ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n, StackVar v, bool b ) :
                                     FormulaToken( v,e ), nByte( n ),
                                     bHasForceArray( b ) {}
 public:
-                                FormulaByteToken( OpCode e, BYTE n, bool b ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n, bool b ) :
                                     FormulaToken( svByte,e ), nByte( n ),
                                     bHasForceArray( b ) {}
-                                FormulaByteToken( OpCode e, BYTE n ) :
+                                FormulaByteToken( OpCode e, sal_uInt8 n ) :
                                     FormulaToken( svByte,e ), nByte( n ),
                                     bHasForceArray( false ) {}
                                 FormulaByteToken( OpCode e ) :
@@ -213,11 +213,11 @@ public:
                                     bHasForceArray( r.bHasForceArray ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaByteToken(*this); }
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
     virtual bool                HasForceArray() const;
     virtual void                SetForceArray( bool b );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
 };
@@ -230,7 +230,7 @@ class FORMULA_DLLPUBLIC FormulaFAPToken : public FormulaByteToken
 private:
             FormulaTokenRef          pOrigToken;
 public:
-                                FormulaFAPToken( OpCode e, BYTE n, FormulaToken* p ) :
+                                FormulaFAPToken( OpCode e, sal_uInt8 n, FormulaToken* p ) :
                                     FormulaByteToken( e, n, svFAP, false ),
                                     pOrigToken( p ) {}
                                 FormulaFAPToken( const FormulaFAPToken& r ) :
@@ -238,7 +238,7 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaFAPToken(*this); }
     virtual FormulaToken*       GetFAPOrigToken() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken
@@ -254,7 +254,7 @@ public:
     virtual FormulaToken*       Clone() const { return new FormulaDoubleToken(*this); }
     virtual double              GetDouble() const;
     virtual double&             GetDoubleAsReference();
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
 };
@@ -272,14 +272,14 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaStringToken(*this); }
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
 };
 
 
 /** Identical to FormulaStringToken, but with explicit OpCode instead of implicit
-    ocPush, and an optional BYTE for ocBad tokens. */
+    ocPush, and an optional sal_uInt8 for ocBad tokens. */
 class FORMULA_DLLPUBLIC FormulaStringOpToken : public FormulaByteToken
 {
 private:
@@ -292,23 +292,23 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaStringOpToken(*this); }
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
 {
 private:
-            USHORT              nIndex;
+            sal_uInt16              nIndex;
 public:
-                                FormulaIndexToken( OpCode e, USHORT n ) :
+                                FormulaIndexToken( OpCode e, sal_uInt16 n ) :
                                     FormulaToken(  svIndex, e ), nIndex( n ) {}
                                 FormulaIndexToken( const FormulaIndexToken& r ) :
                                     FormulaToken( r ), nIndex( r.nIndex ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaIndexToken(*this); }
-    virtual USHORT              GetIndex() const;
-    virtual void                SetIndex( USHORT n );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt16              GetIndex() const;
+    virtual void                SetIndex( sal_uInt16 n );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
@@ -316,9 +316,9 @@ class FORMULA_DLLPUBLIC FormulaExternalToken : public FormulaToken
 {
 private:
             String              aExternal;
-            BYTE                nByte;
+            sal_uInt8                nByte;
 public:
-                                FormulaExternalToken( OpCode e, BYTE n, const String& r ) :
+                                FormulaExternalToken( OpCode e, sal_uInt8 n, const String& r ) :
                                     FormulaToken( svExternal, e ), aExternal( r ),
                                     nByte( n ) {}
                                 FormulaExternalToken( OpCode e, const String& r ) :
@@ -330,9 +330,9 @@ public:
 
     virtual FormulaToken*       Clone() const { return new FormulaExternalToken(*this); }
     virtual const String&       GetExternal() const;
-    virtual BYTE                GetByte() const;
-    virtual void                SetByte( BYTE n );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt8                GetByte() const;
+    virtual void                SetByte( sal_uInt8 n );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
@@ -347,7 +347,7 @@ public:
     virtual FormulaToken*       Clone() const { return new FormulaMissingToken(*this); }
     virtual double              GetDouble() const;
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken
@@ -369,7 +369,7 @@ public:
                                 }
     virtual                     ~FormulaJumpToken();
     virtual short*              GetJump() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new FormulaJumpToken(*this); }
 };
 
@@ -383,23 +383,23 @@ public:
                                     FormulaToken( r ) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaUnknownToken(*this); }
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 
 class FORMULA_DLLPUBLIC FormulaErrorToken : public FormulaToken
 {
-            USHORT              nError;
+            sal_uInt16              nError;
 public:
-                                FormulaErrorToken( USHORT nErr ) :
+                                FormulaErrorToken( sal_uInt16 nErr ) :
                                     FormulaToken( svError ), nError( nErr) {}
                                 FormulaErrorToken( const FormulaErrorToken& r ) :
                                     FormulaToken( r ), nError( r.nError) {}
 
     virtual FormulaToken*       Clone() const { return new FormulaErrorToken(*this); }
-    virtual USHORT              GetError() const;
-    virtual void                SetError( USHORT nErr );
-    virtual BOOL                operator==( const FormulaToken& rToken ) const;
+    virtual sal_uInt16              GetError() const;
+    virtual void                SetError( sal_uInt16 nErr );
+    virtual sal_Bool                operator==( const FormulaToken& rToken ) const;
 };
 
 // =============================================================================
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 02d725a9bc..03b0bc9b80 100644..100755
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -42,7 +42,7 @@ namespace formula
 
 // RecalcMode access only via TokenArray SetRecalcMode / IsRecalcMode...
 
-typedef BYTE ScRecalcMode;
+typedef sal_uInt8 ScRecalcMode;
 // Only one of the exclusive bits can be set,
 // handled by TokenArray SetRecalcMode... methods
 #define RECALCMODE_NORMAL       0x01    // exclusive
@@ -75,13 +75,13 @@ class FORMULA_DLLPUBLIC FormulaTokenArray
 protected:
     FormulaToken**  pCode;                  // Token code array
     FormulaToken**  pRPN;                   // RPN array
-    USHORT          nLen;                   // Length of token array
-    USHORT          nRPN;                   // Length of RPN array
-    USHORT          nIndex;                 // Current step index
-    USHORT          nError;                 // Error code
+    sal_uInt16          nLen;                   // Length of token array
+    sal_uInt16          nRPN;                   // Length of RPN array
+    sal_uInt16          nIndex;                 // Current step index
+    sal_uInt16          nError;                 // Error code
     short           nRefs;                  // Count of cell references
     ScRecalcMode    nMode;                  // Flags to indicate when to recalc this code
-    BOOL            bHyperLink;             // If HYPERLINK() occurs in the formula.
+    sal_Bool            bHyperLink;             // If HYPERLINK() occurs in the formula.
 
 protected:
     void                    Assign( const FormulaTokenArray& );
@@ -118,7 +118,7 @@ public:
     FormulaToken* GetNextColRowName();
     FormulaToken* GetNextOpCodeRPN( OpCode );
     /// Peek at nIdx-1 if not out of bounds, decrements nIdx if successful. Returns NULL if not.
-    FormulaToken* PeekPrev( USHORT & nIdx );
+    FormulaToken* PeekPrev( sal_uInt16 & nIdx );
     FormulaToken* PeekNext();
     FormulaToken* PeekPrevNoSpaces();    /// Only after Reset/First/Next/Last/Prev!
     FormulaToken* PeekNextNoSpaces();    /// Only after Reset/First/Next/Last/Prev!
@@ -128,22 +128,22 @@ public:
     FormulaToken* PrevRPN();
 
     bool    HasExternalRef() const;
-    BOOL    HasOpCode( OpCode ) const;
-    BOOL    HasOpCodeRPN( OpCode ) const;
+    sal_Bool    HasOpCode( OpCode ) const;
+    sal_Bool    HasOpCodeRPN( OpCode ) const;
     /// Token of type svIndex or opcode ocColRowName
-    BOOL    HasNameOrColRowName() const;
+    sal_Bool    HasNameOrColRowName() const;
 
     FormulaToken** GetArray() const  { return pCode; }
     FormulaToken** GetCode()  const  { return pRPN; }
-    USHORT    GetLen() const     { return nLen; }
-    USHORT    GetCodeLen() const { return nRPN; }
+    sal_uInt16    GetLen() const     { return nLen; }
+    sal_uInt16    GetCodeLen() const { return nRPN; }
     void      Reset()            { nIndex = 0; }
-    USHORT    GetCodeError() const      { return nError; }
-    void      SetCodeError( USHORT n )  { nError = n; }
+    sal_uInt16    GetCodeError() const      { return nError; }
+    void      SetCodeError( sal_uInt16 n )  { nError = n; }
     short     GetRefs()  const { return nRefs;  }
     void      IncrementRefs() { ++nRefs; }
-    void      SetHyperLink( BOOL bVal ) { bHyperLink = bVal; }
-    BOOL      IsHyperLink() const       { return bHyperLink; }
+    void      SetHyperLink( sal_Bool bVal ) { bHyperLink = bVal; }
+    sal_Bool      IsHyperLink() const       { return bHyperLink; }
 
     inline  ScRecalcMode    GetRecalcMode() const { return nMode; }
                             /** Bits aren't set directly but validated and
@@ -168,17 +168,17 @@ public:
                                 { nMode |= RECALCMODE_ONREFMOVE; }
     inline  void            ClearRecalcModeOnRefMove()
                                 { nMode &= ~RECALCMODE_ONREFMOVE; }
-    inline  BOOL            IsRecalcModeNormal() const
+    inline  sal_Bool            IsRecalcModeNormal() const
                                 { return (nMode & RECALCMODE_NORMAL) != 0; }
-    inline  BOOL            IsRecalcModeAlways() const
+    inline  sal_Bool            IsRecalcModeAlways() const
                                 { return (nMode & RECALCMODE_ALWAYS) != 0; }
-    inline  BOOL            IsRecalcModeOnLoad() const
+    inline  sal_Bool            IsRecalcModeOnLoad() const
                                 { return (nMode & RECALCMODE_ONLOAD) != 0; }
-    inline  BOOL            IsRecalcModeOnLoadOnce() const
+    inline  sal_Bool            IsRecalcModeOnLoadOnce() const
                                 { return (nMode & RECALCMODE_ONLOAD_ONCE) != 0; }
-    inline  BOOL            IsRecalcModeForced() const
+    inline  sal_Bool            IsRecalcModeForced() const
                                 { return (nMode & RECALCMODE_FORCED) != 0; }
-    inline  BOOL            IsRecalcModeOnRefMove() const
+    inline  sal_Bool            IsRecalcModeOnRefMove() const
                                 { return (nMode & RECALCMODE_ONREFMOVE) != 0; }
 
                             /** Get OpCode of the most outer function */
@@ -186,7 +186,7 @@ public:
 
                             /** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
                                 with DoubleRef in Formula? */
-    BOOL                    HasMatrixDoubleRefOps();
+    sal_Bool                    HasMatrixDoubleRefOps();
 
     virtual FormulaToken* AddOpCode(OpCode e);
 
@@ -207,7 +207,7 @@ public:
     FormulaToken* AddString( const sal_Unicode* pStr );
     FormulaToken* AddString( const String& rStr );
     FormulaToken* AddDouble( double fVal );
-    FormulaToken* AddName( USHORT n );
+    FormulaToken* AddName( sal_uInt16 n );
     FormulaToken* AddExternal( const sal_Unicode* pStr );
     /** Xcl import may play dirty tricks with OpCode!=ocExternal.
         Others don't use! */
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index dfd7403f8d..c2f6903517 100644..100755
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -27,36 +27,26 @@
 #ifndef FORMULA_HELPID_HRC
 #define FORMULA_HELPID_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>	// HID_FORMULA_START
-#endif
-
-#define HID_FORMULADLG_FORMULA                          (HID_FORMULA_START + 0)
-#define HID_FORMULA_FAP_FORMULA                         (HID_FORMULA_START + 1)
-#define HID_FORMULA_FAP_STRUCT                          (HID_FORMULA_START + 2)
-#define HID_FORMULA_FAP_PAGE                            (HID_FORMULA_START + 3)
-#define HID_FORMULA_FAP_EDIT1                           (HID_FORMULA_START + 4)
-#define HID_FORMULA_FAP_EDIT2                           (HID_FORMULA_START + 5)
-#define HID_FORMULA_FAP_EDIT3                           (HID_FORMULA_START + 6)
-#define HID_FORMULA_FAP_EDIT4                           (HID_FORMULA_START + 7)
-#define HID_FORMULA_FAP_BTN_FX1                         (HID_FORMULA_START + 8)
-#define HID_FORMULA_FAP_BTN_FX2                         (HID_FORMULA_START + 9)
-#define HID_FORMULA_FAP_BTN_FX3                         (HID_FORMULA_START +10)
-#define HID_FORMULA_FAP_BTN_FX4                         (HID_FORMULA_START +11)
-#define HID_FORMULA_FAP_BTN_REF1                        (HID_FORMULA_START +12)
-#define HID_FORMULA_FAP_BTN_REF2                        (HID_FORMULA_START +13)
-#define HID_FORMULA_FAP_BTN_REF3                        (HID_FORMULA_START +14)
-#define HID_FORMULA_FAP_BTN_REF4                        (HID_FORMULA_START +15)
-#define HID_FORMULA_LB_CATEGORY                         (HID_FORMULA_START +16)
-#define HID_FORMULA_LB_FUNCTION                         (HID_FORMULA_START +17)
-#define HID_FORMULATAB_FUNCTION                         (HID_FORMULA_START +18)
-#define HID_FORMULATAB_STRUCT                           (HID_FORMULA_START +19)
-
-    
-#if HID_FORMULATAB_STRUCT > HID_FORMULA_END
-#error Help-Id Ueberlauf in #file, #line	   
-#endif											   
-// don't forget to update the file util/hidother.src
+#define HID_FORMULADLG_FORMULA                             "FORMULA_HID_FORMULADLG_FORMULA"
+#define HID_FORMULA_FAP_FORMULA                            "FORMULA_HID_FORMULA_FAP_FORMULA"
+#define HID_FORMULA_FAP_STRUCT                             "FORMULA_HID_FORMULA_FAP_STRUCT"
+#define HID_FORMULA_FAP_PAGE                               "FORMULA_HID_FORMULA_FAP_PAGE"
+#define HID_FORMULA_FAP_EDIT1                              "FORMULA_HID_FORMULA_FAP_EDIT1"
+#define HID_FORMULA_FAP_EDIT2                              "FORMULA_HID_FORMULA_FAP_EDIT2"
+#define HID_FORMULA_FAP_EDIT3                              "FORMULA_HID_FORMULA_FAP_EDIT3"
+#define HID_FORMULA_FAP_EDIT4                              "FORMULA_HID_FORMULA_FAP_EDIT4"
+#define HID_FORMULA_FAP_BTN_FX1                            "FORMULA_HID_FORMULA_FAP_BTN_FX1"
+#define HID_FORMULA_FAP_BTN_FX2                            "FORMULA_HID_FORMULA_FAP_BTN_FX2"
+#define HID_FORMULA_FAP_BTN_FX3                            "FORMULA_HID_FORMULA_FAP_BTN_FX3"
+#define HID_FORMULA_FAP_BTN_FX4                            "FORMULA_HID_FORMULA_FAP_BTN_FX4"
+#define HID_FORMULA_FAP_BTN_REF1                           "FORMULA_HID_FORMULA_FAP_BTN_REF1"
+#define HID_FORMULA_FAP_BTN_REF2                           "FORMULA_HID_FORMULA_FAP_BTN_REF2"
+#define HID_FORMULA_FAP_BTN_REF3                           "FORMULA_HID_FORMULA_FAP_BTN_REF3"
+#define HID_FORMULA_FAP_BTN_REF4                           "FORMULA_HID_FORMULA_FAP_BTN_REF4"
+#define HID_FORMULA_LB_CATEGORY                            "FORMULA_HID_FORMULA_LB_CATEGORY"
+#define HID_FORMULA_LB_FUNCTION                            "FORMULA_HID_FORMULA_LB_FUNCTION"
+#define HID_FORMULATAB_FUNCTION                            "FORMULA_HID_FORMULATAB_FUNCTION"
+#define HID_FORMULATAB_STRUCT                              "FORMULA_HID_FORMULATAB_STRUCT"
 
 #endif //FORMULA_HELPID_HRC
 
diff --git a/formula/inc/makefile.mk b/formula/inc/makefile.mk
index dfe7226e08..dfe7226e08 100644..100755
--- a/formula/inc/makefile.mk
+++ b/formula/inc/makefile.mk
diff --git a/formula/inc/pch/precompiled_formula.cxx b/formula/inc/pch/precompiled_formula.cxx
index d38b937c3f..d38b937c3f 100644..100755
--- a/formula/inc/pch/precompiled_formula.cxx
+++ b/formula/inc/pch/precompiled_formula.cxx
diff --git a/formula/inc/pch/precompiled_formula.hxx b/formula/inc/pch/precompiled_formula.hxx
index 10833d9bab..10833d9bab 100644..100755
--- a/formula/inc/pch/precompiled_formula.hxx
+++ b/formula/inc/pch/precompiled_formula.hxx
diff --git a/formula/prj/build.lst b/formula/prj/build.lst
index f26377c457..109a798ea3 100644..100755
--- a/formula/prj/build.lst
+++ b/formula/prj/build.lst
@@ -1,4 +1,4 @@
-fml  formula    :   BOOST:boost comphelper svx NULL
+fml  formula    :   BOOST:boost LIBXSLT:libxslt comphelper svx NULL
 fml  formula                                                        usr1    -   all fml_mkout NULL
 fml  formula\inc                                                    nmake   -   all fml_inc NULL
 fml  formula\source\core\api                                        nmake   -   all fml_api fml_inc NULL
diff --git a/formula/prj/d.lst b/formula/prj/d.lst
index c80df46d31..0fe5a1fe71 100644..100755
--- a/formula/prj/d.lst
+++ b/formula/prj/d.lst
@@ -34,3 +34,4 @@ mkdir: %_DEST%\inc%_EXT%\formula
 
 
 
+..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component
diff --git a/formula/prj/for.xml b/formula/prj/for.xml
index d153b3bf5c..d153b3bf5c 100644..100755
--- a/formula/prj/for.xml
+++ b/formula/prj/for.xml
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 7973b5c402..e52e044e6f 100644..100755
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -134,7 +134,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
     return NUMBERFORMAT_NUMBER;
 }
 
-inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, USHORT nOpCode )
+inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, sal_uInt16 nOpCode )
 {
     sheet::FormulaOpCodeMapEntry aEntry;
     aEntry.Token.OpCode = nOpCode;
@@ -142,15 +142,15 @@ inline void lclPushOpCodeMapEntry( ::std::vector< sheet::FormulaOpCodeMapEntry >
     rVec.push_back( aEntry);
 }
 
-void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, USHORT nOpCodeBeg, USHORT nOpCodeEnd )
+void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, sal_uInt16 nOpCodeBeg, sal_uInt16 nOpCodeEnd )
 {
-    for (USHORT nOpCode = nOpCodeBeg; nOpCode < nOpCodeEnd; ++nOpCode)
+    for (sal_uInt16 nOpCode = nOpCodeBeg; nOpCode < nOpCodeEnd; ++nOpCode)
         lclPushOpCodeMapEntry( rVec, pTable, nOpCode );
 }
 
-void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, const USHORT* pnOpCodes, size_t nCount )
+void lclPushOpCodeMapEntries( ::std::vector< sheet::FormulaOpCodeMapEntry >& rVec, const String* pTable, const sal_uInt16* pnOpCodes, size_t nCount )
 {
-    for (const USHORT* pnEnd = pnOpCodes + nCount; pnOpCodes < pnEnd; ++pnOpCodes)
+    for (const sal_uInt16* pnEnd = pnOpCodes + nCount; pnOpCodes < pnEnd; ++pnOpCodes)
         lclPushOpCodeMapEntry( rVec, pTable, *pnOpCodes );
 }
 
@@ -158,11 +158,11 @@ class OpCodeList : public Resource        // temp object for resource
 {
 public:
 
-    OpCodeList( USHORT, FormulaCompiler::NonConstOpCodeMapPtr );
+    OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr );
 
 private:
-    bool getOpCodeString( String& rStr, USHORT nOp );
-    void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, USHORT nOp );
+    bool getOpCodeString( String& rStr, sal_uInt16 nOp );
+    void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, sal_uInt16 nOp );
 
 private:
     enum SeparatorType
@@ -173,11 +173,11 @@ private:
     SeparatorType meSepType;
 };
 
-OpCodeList::OpCodeList( USHORT nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap ) :
+OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap ) :
     Resource( ResId(nRID,*ResourceManager::getResManager()) )
     ,meSepType(SEMICOLON_BASE)
 {
-     for (USHORT i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
+     for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
     {
         String aOpStr;
         if ( getOpCodeString(aOpStr, i) )
@@ -189,7 +189,7 @@ OpCodeList::OpCodeList( USHORT nRID, FormulaCompiler::NonConstOpCodeMapPtr xMap
     FreeResource();
 }
 
-bool OpCodeList::getOpCodeString( String& rStr, USHORT nOp )
+bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
 {
     switch (nOp)
     {
@@ -240,7 +240,7 @@ bool OpCodeList::getOpCodeString( String& rStr, USHORT nOp )
     return false;
 }
 
-void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, USHORT nOp )
+void OpCodeList::putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, sal_uInt16 nOp )
 {
     ResId aRes(nOp,*ResourceManager::getResManager());
     aRes.SetRT(RSC_STRING);
@@ -303,7 +303,7 @@ uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceO
                 // interest.
             }
             if (!aIntName.getLength())
-                aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish());    // bLocalFirst=FALSE for english
+                aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish());    // bLocalFirst=sal_False for english
             if (!aIntName.getLength())
                 pToken->OpCode = getOpCodeUnknown();
             else
@@ -382,7 +382,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         // Anything else but SPECIAL.
         if ((nGroups & FormulaMapGroup::SEPARATORS) != 0)
         {
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_OPEN,
                 SC_OPCODE_CLOSE,
                 SC_OPCODE_SEP,
@@ -391,7 +391,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         }
         if ((nGroups & FormulaMapGroup::ARRAY_SEPARATORS) != 0)
         {
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_ARRAY_OPEN,
                 SC_OPCODE_ARRAY_CLOSE,
                 SC_OPCODE_ARRAY_ROW_SEP,
@@ -408,7 +408,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
             if ((nGroups & FormulaMapGroup::BINARY_OPERATORS) == 0)
                 lclPushOpCodeMapEntry( aVec, mpTable, ocAdd );
             // regular unary operators
-            for (USHORT nOp = SC_OPCODE_START_UN_OP; nOp < SC_OPCODE_STOP_UN_OP && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_UN_OP; nOp < SC_OPCODE_STOP_UN_OP && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -424,7 +424,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         }
         if ((nGroups & FormulaMapGroup::BINARY_OPERATORS) != 0)
         {
-            for (USHORT nOp = SC_OPCODE_START_BIN_OP; nOp < SC_OPCODE_STOP_BIN_OP && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_BIN_OP; nOp < SC_OPCODE_STOP_BIN_OP && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -442,10 +442,10 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
         {
             // Function names are not consecutive, skip the gaps between
             // functions with no parameter, functions with 1 parameter
-            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_NO_PAR, ::std::min< USHORT >( SC_OPCODE_STOP_NO_PAR, mnSymbols ) );
-            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_1_PAR, ::std::min< USHORT >( SC_OPCODE_STOP_1_PAR, mnSymbols ) );
+            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_NO_PAR, ::std::min< sal_uInt16 >( SC_OPCODE_STOP_NO_PAR, mnSymbols ) );
+            lclPushOpCodeMapEntries( aVec, mpTable, SC_OPCODE_START_1_PAR, ::std::min< sal_uInt16 >( SC_OPCODE_STOP_1_PAR, mnSymbols ) );
             // Additional functions not within range of functions.
-            static const USHORT aOpCodes[] = {
+            static const sal_uInt16 aOpCodes[] = {
                 SC_OPCODE_IF,
                 SC_OPCODE_CHOSE,
                 SC_OPCODE_AND,
@@ -455,7 +455,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
             };
             lclPushOpCodeMapEntries( aVec, mpTable, aOpCodes, SAL_N_ELEMENTS(aOpCodes) );
             // functions with 2 or more parameters.
-            for (USHORT nOp = SC_OPCODE_START_2_PAR; nOp < SC_OPCODE_STOP_2_PAR && nOp < mnSymbols; ++nOp)
+            for (sal_uInt16 nOp = SC_OPCODE_START_2_PAR; nOp < SC_OPCODE_STOP_2_PAR && nOp < mnSymbols; ++nOp)
             {
                 switch (nOp)
                 {
@@ -492,8 +492,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
 
 void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp )
 {
-    DBG_ASSERT( 0 < eOp && USHORT(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
-    if (0 < eOp && USHORT(eOp) < mnSymbols)
+    DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
+    if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
     {
         DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || (eOp == ocCurrency),
             ByteString( "OpCodeMap::putOpCode: reusing OpCode ").
@@ -515,10 +515,10 @@ FormulaCompiler::FormulaCompiler(FormulaTokenArray& _rArr)
         nRecursion(0),
         nNumFmt( NUMBERFORMAT_UNDEFINED ),
         meGrammar( formula::FormulaGrammar::GRAM_UNSPECIFIED ),
-        bAutoCorrect( FALSE ),
-        bCorrected( FALSE ),
-        bCompileForFAP( FALSE ),
-        bIgnoreErrors( FALSE )
+        bAutoCorrect( sal_False ),
+        bCorrected( sal_False ),
+        bCompileForFAP( sal_False ),
+        bIgnoreErrors( sal_False )
 
 {
     DBG_CTOR(FormulaCompiler,NULL);
@@ -531,10 +531,10 @@ FormulaCompiler::FormulaCompiler()
         nRecursion(0),
         nNumFmt( NUMBERFORMAT_UNDEFINED ),
         meGrammar( formula::FormulaGrammar::GRAM_UNSPECIFIED ),
-        bAutoCorrect( FALSE ),
-        bCorrected( FALSE ),
-        bCompileForFAP( FALSE ),
-        bIgnoreErrors( FALSE )
+        bAutoCorrect( sal_False ),
+        bCorrected( sal_False ),
+        bCompileForFAP( sal_False ),
+        bIgnoreErrors( sal_False )
 
 {
     DBG_CTOR(FormulaCompiler,NULL);
@@ -582,7 +582,7 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::GetOpCodeMap( const sal_Int32 nLa
 }
 // -----------------------------------------------------------------------------
 
-String FormulaCompiler::FindAddInFunction( const String& /*rUpperName*/, BOOL /*bLocalFirst*/ ) const
+String FormulaCompiler::FindAddInFunction( const String& /*rUpperName*/, sal_Bool /*bLocalFirst*/ ) const
 {
     return String();
 }
@@ -687,7 +687,7 @@ void FormulaCompiler::InitSymbolsEnglishXL() const
 }
 
 // -----------------------------------------------------------------------------
-void FormulaCompiler::loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const
+void FormulaCompiler::loadSymbols(sal_uInt16 _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const
 {
     if ( !_xMap.get() )
     {
@@ -751,7 +751,7 @@ bool FormulaCompiler::IsOpCodeVolatile( OpCode eOp )
 }
 
 // Remove quotes, escaped quotes are unescaped.
-BOOL FormulaCompiler::DeQuote( String& rStr )
+sal_Bool FormulaCompiler::DeQuote( String& rStr )
 {
     xub_StrLen nLen = rStr.Len();
     if ( nLen > 1 && rStr.GetChar(0) == '\'' && rStr.GetChar( nLen-1 ) == '\'' )
@@ -764,16 +764,16 @@ BOOL FormulaCompiler::DeQuote( String& rStr )
             rStr.Erase( nPos, 1 );
             ++nPos;
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::fillAddInToken(::std::vector< sheet::FormulaOpCodeMapEntry >& /*_rVec*/,bool /*_bIsEnglish*/) const
 {
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
+sal_Bool FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
 {
     switch ( _eOpCode )
     {
@@ -787,13 +787,13 @@ BOOL FormulaCompiler::IsMatrixFunction(OpCode _eOpCode)
         case ocMatMult :
         case ocMatInv :
         case ocMatrixUnit :
-            return TRUE;
+            return sal_True;
         default:
         {
             // added to avoid warnings
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
@@ -827,7 +827,7 @@ sal_Int32 FormulaCompiler::OpCodeMap::getOpCodeUnknown()
     return kOpCodeUnknown;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::GetToken()
+sal_Bool FormulaCompiler::GetToken()
 {
     static const short nRecursionMax = 42;
     FormulaCompilerRecursionGuard aRecursionGuard( nRecursion );
@@ -835,16 +835,16 @@ BOOL FormulaCompiler::GetToken()
     {
         SetError( errStackOverflow );
         pToken = new FormulaByteToken( ocStop );
-        return FALSE;
+        return sal_False;
     }
     if ( bAutoCorrect && !pStack )
     {   // #61426# don't merge stacked subroutine code into entered formula
         aCorrectedFormula += aCorrectedSymbol;
         aCorrectedSymbol.Erase();
     }
-    BOOL bStop = FALSE;
+    sal_Bool bStop = sal_False;
     if( pArr->GetCodeError() && !bIgnoreErrors )
-        bStop = TRUE;
+        bStop = sal_True;
     else
     {
         short nWasColRowName;
@@ -859,11 +859,11 @@ BOOL FormulaCompiler::GetToken()
             if ( nWasColRowName )
                 nWasColRowName++;
             if ( bAutoCorrect && !pStack )
-                CreateStringFromToken( aCorrectedFormula, pToken.get(), FALSE );
+                CreateStringFromToken( aCorrectedFormula, pToken.get(), false );
             pToken = pArr->Next();
         }
         if ( bAutoCorrect && !pStack && pToken )
-            CreateStringFromToken( aCorrectedSymbol, pToken.get(), FALSE );
+            CreateStringFromToken( aCorrectedSymbol, pToken.get(), false );
         if( !pToken )
         {
             if( pStack )
@@ -872,7 +872,7 @@ BOOL FormulaCompiler::GetToken()
                 return GetToken();
             }
             else
-                bStop = TRUE;
+                bStop = sal_True;
         }
         else
         {
@@ -886,10 +886,10 @@ BOOL FormulaCompiler::GetToken()
     if( bStop )
     {
         pToken = new FormulaByteToken( ocStop );
-        return FALSE;
+        return sal_False;
     }
     if( pToken->GetOpCode() == ocSubTotal )
-        glSubTotal = TRUE;
+        glSubTotal = sal_True;
     else if ( pToken->IsExternalRef() )
     {
         return HandleExternalReference(*pToken);
@@ -914,7 +914,7 @@ BOOL FormulaCompiler::GetToken()
     {
         pArr->nRefs++;
     }
-    return TRUE;
+    return sal_True;
 }
 //---------------------------------------------------------------------------
 // RPN creation by recursion
@@ -946,7 +946,7 @@ void FormulaCompiler::Factor()
             if ( bAutoCorrect && !pStack )
             {   // assume multiplication
                 aCorrectedFormula += mxSymbols->getSymbol(ocMul);
-                bCorrected = TRUE;
+                bCorrected = sal_True;
                 NextToken();
                 eOp = Expression();
                 if( eOp != ocClose )
@@ -1003,7 +1003,7 @@ void FormulaCompiler::Factor()
                     pArr->SetRecalcModeOnRefMove();
                 break;
                 case ocHyperLink :
-                    pArr->SetHyperLink(TRUE);
+                pArr->SetHyperLink(sal_True);
                 break;
                 default:
                     ;   // nothing
@@ -1081,7 +1081,7 @@ void FormulaCompiler::Factor()
             }
             else
                 SetError(errPairExpected);
-            BYTE nSepCount = 0;
+            sal_uInt8 nSepCount = 0;
             if( !bNoParam )
             {
                 nSepCount++;
@@ -1169,7 +1169,7 @@ void FormulaCompiler::Factor()
             if ( bAutoCorrect && !pStack )
             {
                 aCorrectedSymbol.Erase();
-                bCorrected = TRUE;
+                bCorrected = sal_True;
             }
         }
         else if ( pToken->IsExternalRef() )
@@ -1188,7 +1188,7 @@ void FormulaCompiler::Factor()
                     if ( nLen )
                         aCorrectedFormula.Erase( nLen - 1 );
                     aCorrectedSymbol.Erase();
-                    bCorrected = TRUE;
+                    bCorrected = sal_True;
                 }
             }
         }
@@ -1377,7 +1377,7 @@ OpCode FormulaCompiler::Expression()
     return pToken->GetOpCode();
 }
 // -----------------------------------------------------------------------------
-void FormulaCompiler::SetError(USHORT /*nError*/)
+void FormulaCompiler::SetError(sal_uInt16 /*nError*/)
 {
 }
 // -----------------------------------------------------------------------------
@@ -1408,10 +1408,10 @@ bool FormulaCompiler::MergeRangeReference(FormulaToken * * const pCode1, Formula
     return true;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::CompileTokenArray()
+sal_Bool FormulaCompiler::CompileTokenArray()
 {
-    glSubTotal = FALSE;
-    bCorrected = FALSE;
+    glSubTotal = sal_False;
+    bCorrected = sal_False;
     if( !pArr->GetCodeError() || bIgnoreErrors )
     {
         if ( bAutoCorrect )
@@ -1424,7 +1424,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         pStack = NULL;
         FormulaToken* pData[ MAXCODE ];
         pCode = pData;
-        BOOL bWasForced = pArr->IsRecalcModeForced();
+        sal_Bool bWasForced = pArr->IsRecalcModeForced();
         if ( bWasForced )
         {
             if ( bAutoCorrect )
@@ -1440,7 +1440,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         if (eOp != ocStop)
             SetError( errOperatorExpected);
 
-        USHORT nErrorBeforePop = pArr->GetCodeError();
+        sal_uInt16 nErrorBeforePop = pArr->GetCodeError();
 
         while( pStack )
             PopTokenArray();
@@ -1458,7 +1458,7 @@ BOOL FormulaCompiler::CompileTokenArray()
         if( pArr->GetCodeError() && !bIgnoreErrors )
         {
             pArr->DelRPN();
-            pArr->SetHyperLink(FALSE);
+            pArr->SetHyperLink(sal_False);
         }
 
         if ( bWasForced )
@@ -1520,7 +1520,7 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
         rBuffer.append(sal_Unicode('='));
     FormulaToken* t = pArr->First();
     while( t )
-        t = CreateStringFromToken( rBuffer, t, TRUE );
+        t = CreateStringFromToken( rBuffer, t, sal_True );
 
     if (pSaveArr != pArr)
     {
@@ -1529,7 +1529,7 @@ void FormulaCompiler::CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer )
     }
 }
 // -----------------------------------------------------------------------------
-FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,BOOL bAllowArrAdvance )
+FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP,sal_Bool bAllowArrAdvance )
 {
     rtl::OUStringBuffer aBuffer;
     FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
@@ -1537,10 +1537,10 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaT
     return p;
 }
 
-FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,BOOL bAllowArrAdvance )
+FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP,sal_Bool bAllowArrAdvance )
 {
-    BOOL bNext = TRUE;
-    BOOL bSpaces = FALSE;
+    sal_Bool bNext = sal_True;
+    sal_Bool bSpaces = sal_False;
     FormulaToken* t = pTokenP;
     OpCode eOp = t->GetOpCode();
     if( eOp >= ocAnd && eOp <= ocOr )
@@ -1550,7 +1550,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
             t = pArr->Next();
         else
             t = pArr->PeekNext();
-        bNext = FALSE;
+        bNext = sal_False;
         bSpaces = ( !t || t->GetOpCode() != ocOpen );
     }
     if( bSpaces )
@@ -1574,8 +1574,8 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
         else
         {
             // most times it's just one blank
-            BYTE n = t->GetByte();
-            for ( BYTE j=0; j<n; ++j )
+            sal_uInt8 n = t->GetByte();
+            for ( sal_uInt8 j=0; j<n; ++j )
             {
                 rBuffer.append(sal_Unicode(' '));
             }
@@ -1583,7 +1583,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuff
     }
     else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
         rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
-    else if( (USHORT) eOp < mxSymbols->getSymbolCount())        // Keyword:
+    else if( (sal_uInt16) eOp < mxSymbols->getSymbolCount())        // Keyword:
         rBuffer.append(mxSymbols->getSymbol(eOp));
     else
     {
@@ -1671,7 +1671,7 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
     {
         ::rtl::math::doubleToUStringBuffer( rBuffer, fVal,
                 rtl_math_StringFormat_Automatic,
-                rtl_math_DecimalPlaces_Max, '.', TRUE );
+                rtl_math_DecimalPlaces_Max, '.', sal_True );
     }
     else
     {
@@ -1680,7 +1680,7 @@ void FormulaCompiler::AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal )
                 rtl_math_StringFormat_Automatic,
                 rtl_math_DecimalPlaces_Max,
                 aSysLocale.GetLocaleDataPtr()->getNumDecimalSep().GetChar(0),
-                TRUE );
+                sal_True );
     }
 }
 // -----------------------------------------------------------------------------
@@ -1689,9 +1689,9 @@ void FormulaCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
     rBuffer.append( mxSymbols->getSymbol(static_cast<OpCode>(bVal ? ocTrue : ocFalse)) );
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::IsImportingXML() const
+sal_Bool FormulaCompiler::IsImportingXML() const
 {
-    return FALSE;
+    return sal_False;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr )
@@ -1767,7 +1767,7 @@ OpCode FormulaCompiler::NextToken()
                 if ( eOp == eLastOp || eLastOp == ocOpen )
                 {   // throw away duplicated operator
                     aCorrectedSymbol.Erase();
-                    bCorrected = TRUE;
+                    bCorrected = sal_True;
                 }
                 else
                 {
@@ -1784,7 +1784,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocGreater).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocLess:
@@ -1793,14 +1793,14 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocLess).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                                 else if ( c == mxSymbols->getSymbol(ocGreater).GetChar(0) )
                                 {   // <> instead of ><
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocLess).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocMul:
@@ -1809,7 +1809,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocMul).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             case ocDiv:
@@ -1818,7 +1818,7 @@ OpCode FormulaCompiler::NextToken()
                                     aCorrectedFormula.SetChar( nPos,
                                         mxSymbols->getSymbol(ocDiv).GetChar(0) );
                                     aCorrectedSymbol = c;
-                                    bCorrected = TRUE;
+                                    bCorrected = sal_True;
                                 }
                             break;
                             default:
@@ -1855,24 +1855,24 @@ void FormulaCompiler::PutCode( FormulaTokenRef& p )
 }
 
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleExternalReference(const FormulaToken& /*_aToken*/)
+sal_Bool FormulaCompiler::HandleExternalReference(const FormulaToken& /*_aToken*/)
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleRange()
+sal_Bool FormulaCompiler::HandleRange()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleSingleRef()
+sal_Bool FormulaCompiler::HandleSingleRef()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaCompiler::HandleDbData()
+sal_Bool FormulaCompiler::HandleDbData()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void FormulaCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& /*rBuffer*/,FormulaToken* /*pTokenP*/)
@@ -1898,7 +1898,7 @@ void FormulaCompiler::CreateStringFromExternal(rtl::OUStringBuffer& /*rBuffer*/,
 void FormulaCompiler::LocalizeString( String& /*rName*/ )
 {
 }
-void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, BOOL bTemp )
+void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, sal_Bool bTemp )
 {
     if ( bAutoCorrect && !pStack )
     {   // #61426# don't merge stacked subroutine code into entered formula
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 28e9675e2d..28e9675e2d 100644..100755
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
diff --git a/formula/source/core/api/makefile.mk b/formula/source/core/api/makefile.mk
index a99f9184ac..a99f9184ac 100644..100755
--- a/formula/source/core/api/makefile.mk
+++ b/formula/source/core/api/makefile.mk
diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 3bcfbf7052..0d1df59c76 100644..100755
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -67,12 +67,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return cppu::component_writeInfoHelper(
-        serviceManager, registryKey, entries);
-}
 } // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 7c67b11146..6d90780822 100644..100755
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -52,19 +52,19 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
 // Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
 
 // Need a lot of FormulaDoubleToken
-const USHORT nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
+const sal_uInt16 nMemPoolDoubleToken = (0x3000 - 64) / sizeof(FormulaDoubleToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken, nMemPoolDoubleToken, nMemPoolDoubleToken )
 // Need a lot of FormulaByteToken
-const USHORT nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
+const sal_uInt16 nMemPoolByteToken = (0x3000 - 64) / sizeof(FormulaByteToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken, nMemPoolByteToken, nMemPoolByteToken )
 // Need several FormulaStringToken
-const USHORT nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
+const sal_uInt16 nMemPoolStringToken = (0x1000 - 64) / sizeof(FormulaStringToken);
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken, nMemPoolStringToken, nMemPoolStringToken )
 
 
 // --- helpers --------------------------------------------------------------
 
-inline BOOL lcl_IsReference( OpCode eOp, StackVar eType )
+inline sal_Bool lcl_IsReference( OpCode eOp, StackVar eType )
 {
     return
         (eOp == ocPush && (eType == svSingleRef || eType == svDoubleRef))
@@ -79,12 +79,12 @@ FormulaToken::~FormulaToken()
 {
 }
 
-BOOL FormulaToken::Is3DRef() const
+sal_Bool FormulaToken::Is3DRef() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaToken::IsFunction() const
+sal_Bool FormulaToken::IsFunction() const
 {
 //    OpCode eOp = GetOpCode();
     return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName &&
@@ -103,14 +103,14 @@ BOOL FormulaToken::IsFunction() const
 }
 
 
-BYTE FormulaToken::GetParamCount() const
+sal_uInt8 FormulaToken::GetParamCount() const
 {
     // OpCode eOp = GetOpCode();
     if ( eOp < SC_OPCODE_STOP_DIV && eOp != ocExternal && eOp != ocMacro &&
             eOp != ocIf && eOp != ocChose && eOp != ocPercentSign )
         return 0;       // parameters and specials
                         // ocIf and ocChose not for FAP, have cByte then
-//2do: BOOL parameter whether FAP or not?
+//2do: sal_Bool parameter whether FAP or not?
     else if ( GetByte() )
         return GetByte();   // all functions, also ocExternal and ocMacro
     else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
@@ -130,7 +130,7 @@ BYTE FormulaToken::GetParamCount() const
 }
 
 
-BOOL FormulaToken::IsMatrixFunction() const
+sal_Bool FormulaToken::IsMatrixFunction() const
 {
     return formula::FormulaCompiler::IsMatrixFunction(GetOpCode());
 }
@@ -147,7 +147,7 @@ bool FormulaToken::IsExternalRef() const
     return false;
 }
 
-BOOL FormulaToken::operator==( const FormulaToken& rToken ) const
+bool FormulaToken::operator==( const FormulaToken& rToken ) const
 {
     // don't compare reference count!
     return  eType == rToken.eType && GetOpCode() == rToken.GetOpCode();
@@ -156,13 +156,13 @@ BOOL FormulaToken::operator==( const FormulaToken& rToken ) const
 
 // --- virtual dummy methods -------------------------------------------------
 
-BYTE FormulaToken::GetByte() const
+sal_uInt8 FormulaToken::GetByte() const
 {
     // ok to be called for any derived class
     return 0;
 }
 
-void FormulaToken::SetByte( BYTE )
+void FormulaToken::SetByte( sal_uInt8 )
 {
     DBG_ERRORFILE( "FormulaToken::SetByte: virtual dummy called" );
 }
@@ -198,13 +198,13 @@ const String& FormulaToken::GetString() const
     return aDummyString;
 }
 
-USHORT FormulaToken::GetIndex() const
+sal_uInt16 FormulaToken::GetIndex() const
 {
     DBG_ERRORFILE( "FormulaToken::GetIndex: virtual dummy called" );
     return 0;
 }
 
-void FormulaToken::SetIndex( USHORT )
+void FormulaToken::SetIndex( sal_uInt16 )
 {
     DBG_ERRORFILE( "FormulaToken::SetIndex: virtual dummy called" );
 }
@@ -229,17 +229,17 @@ FormulaToken* FormulaToken::GetFAPOrigToken() const
     return NULL;
 }
 
-USHORT FormulaToken::GetError() const
+sal_uInt16 FormulaToken::GetError() const
 {
     DBG_ERRORFILE( "FormulaToken::GetError: virtual dummy called" );
     return 0;
 }
 
-void FormulaToken::SetError( USHORT )
+void FormulaToken::SetError( sal_uInt16 )
 {
     DBG_ERRORFILE( "FormulaToken::SetError: virtual dummy called" );
 }
-BOOL FormulaToken::TextEqual( const FormulaToken& rToken ) const
+sal_Bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
 {
     return *this == rToken;
 }
@@ -248,11 +248,11 @@ BOOL FormulaToken::TextEqual( const FormulaToken& rToken ) const
 // --------------------------------------------------------------------------
 
 
-BYTE FormulaByteToken::GetByte() const                       { return nByte; }
-void FormulaByteToken::SetByte( BYTE n )                     { nByte = n; }
+sal_uInt8 FormulaByteToken::GetByte() const                       { return nByte; }
+void FormulaByteToken::SetByte( sal_uInt8 n )                     { nByte = n; }
 bool FormulaByteToken::HasForceArray() const                 { return bHasForceArray; }
 void FormulaByteToken::SetForceArray( bool b )               { bHasForceArray = b; }
-BOOL FormulaByteToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaByteToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
         bHasForceArray == r.HasForceArray();
@@ -260,12 +260,12 @@ BOOL FormulaByteToken::operator==( const FormulaToken& r ) const
 
 
 FormulaToken* FormulaFAPToken::GetFAPOrigToken() const { return pOrigToken.get(); }
-BOOL FormulaFAPToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaFAPToken::operator==( const FormulaToken& r ) const
 {
     return FormulaByteToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken();
 }
 short* FormulaJumpToken::GetJump() const                     { return pJump; }
-BOOL FormulaJumpToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaJumpToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && pJump[0] == r.GetJump()[0] &&
         memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0;
@@ -300,9 +300,9 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter
                 // long is svIndex, used for name / database area, or "byte" for spaces
                 sal_Int32 nValue = _aToken.Data.get<sal_Int32>();
                 if ( eOpCode == ocName || eOpCode == ocDBArea )
-                    AddToken( formula::FormulaIndexToken( eOpCode, static_cast<USHORT>(nValue) ) );
+                    AddToken( formula::FormulaIndexToken( eOpCode, static_cast<sal_uInt16>(nValue) ) );
                 else if ( eOpCode == ocSpaces )
-                    AddToken( formula::FormulaByteToken( ocSpaces, static_cast<BYTE>(nValue) ) );
+                    AddToken( formula::FormulaByteToken( ocSpaces, static_cast<sal_uInt8>(nValue) ) );
                 else
                     bError = true;
             }
@@ -495,7 +495,7 @@ void FormulaTokenArray::DelRPN()
     if( nRPN )
     {
         FormulaToken** p = pRPN;
-        for( USHORT i = 0; i < nRPN; i++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++ )
         {
             (*p++)->DecRef();
         }
@@ -505,7 +505,7 @@ void FormulaTokenArray::DelRPN()
     nRPN = nIndex = 0;
 }
 
-FormulaToken* FormulaTokenArray::PeekPrev( USHORT & nIdx )
+FormulaToken* FormulaTokenArray::PeekPrev( sal_uInt16 & nIdx )
 {
     if (0 < nIdx && nIdx <= nLen)
         return pCode[--nIdx];
@@ -524,7 +524,7 @@ FormulaToken* FormulaTokenArray::PeekNextNoSpaces()
 {
     if( pCode && nIndex < nLen )
     {
-        USHORT j = nIndex;
+        sal_uInt16 j = nIndex;
         while ( pCode[j]->GetOpCode() == ocSpaces && j < nLen )
             j++;
         if ( j < nLen )
@@ -540,7 +540,7 @@ FormulaToken* FormulaTokenArray::PeekPrevNoSpaces()
 {
     if( pCode && nIndex > 1 )
     {
-        USHORT j = nIndex - 2;
+        sal_uInt16 j = nIndex - 2;
         while ( pCode[j]->GetOpCode() == ocSpaces && j > 0 )
             j--;
         if ( j > 0 || pCode[j]->GetOpCode() != ocSpaces )
@@ -562,34 +562,34 @@ bool FormulaTokenArray::HasExternalRef() const
     return false;
 }
 
-BOOL FormulaTokenArray::HasOpCode( OpCode eOp ) const
+bool FormulaTokenArray::HasOpCode( OpCode eOp ) const
 {
-    for ( USHORT j=0; j < nLen; j++ )
+    for ( sal_uInt16 j=0; j < nLen; j++ )
     {
         if ( pCode[j]->GetOpCode() == eOp )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
+sal_Bool FormulaTokenArray::HasOpCodeRPN( OpCode eOp ) const
 {
-    for ( USHORT j=0; j < nRPN; j++ )
+    for ( sal_uInt16 j=0; j < nRPN; j++ )
     {
         if ( pRPN[j]->GetOpCode() == eOp )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL FormulaTokenArray::HasNameOrColRowName() const
+sal_Bool FormulaTokenArray::HasNameOrColRowName() const
 {
-    for ( USHORT j=0; j < nLen; j++ )
+    for ( sal_uInt16 j=0; j < nLen; j++ )
     {
         if( pCode[j]->GetType() == svIndex || pCode[j]->GetOpCode() == ocColRowName )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -598,7 +598,7 @@ FormulaTokenArray::FormulaTokenArray()
 {
     pCode = NULL; pRPN = NULL;
     nError = nLen = nIndex = nRPN = nRefs = 0;
-    bHyperLink = FALSE;
+    bHyperLink = sal_False;
     ClearRecalcMode();
 }
 
@@ -628,14 +628,14 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r )
     {
         pp = pCode = new FormulaToken*[ nLen ];
         memcpy( pp, r.pCode, nLen * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nLen; i++ )
+        for( sal_uInt16 i = 0; i < nLen; i++ )
             (*pp++)->IncRef();
     }
     if( nRPN )
     {
         pp = pRPN = new FormulaToken*[ nRPN ];
         memcpy( pp, r.pRPN, nRPN * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nRPN; i++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++ )
             (*pp++)->IncRef();
     }
 }
@@ -661,7 +661,7 @@ FormulaTokenArray* FormulaTokenArray::Clone() const
     {
         pp = p->pCode = new FormulaToken*[ nLen ];
         memcpy( pp, pCode, nLen * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nLen; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nLen; i++, pp++ )
         {
             *pp = (*pp)->Clone();
             (*pp)->IncRef();
@@ -671,14 +671,14 @@ FormulaTokenArray* FormulaTokenArray::Clone() const
     {
         pp = p->pRPN = new FormulaToken*[ nRPN ];
         memcpy( pp, pRPN, nRPN * sizeof( FormulaToken* ) );
-        for( USHORT i = 0; i < nRPN; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++, pp++ )
         {
             FormulaToken* t = *pp;
             if( t->GetRef() > 1 )
             {
                 FormulaToken** p2 = pCode;
-                USHORT nIdx = 0xFFFF;
-                for( USHORT j = 0; j < nLen; j++, p2++ )
+                sal_uInt16 nIdx = 0xFFFF;
+                for( sal_uInt16 j = 0; j < nLen; j++, p2++ )
                 {
                     if( *p2 == t )
                     {
@@ -704,7 +704,7 @@ void FormulaTokenArray::Clear()
     if( pCode )
     {
         FormulaToken** p = pCode;
-        for( USHORT i = 0; i < nLen; i++ )
+        for( sal_uInt16 i = 0; i < nLen; i++ )
         {
             (*p++)->DecRef();
         }
@@ -712,7 +712,7 @@ void FormulaTokenArray::Clear()
     }
     pCode = NULL; pRPN = NULL;
     nError = nLen = nIndex = nRPN = nRefs = 0;
-    bHyperLink = FALSE;
+    bHyperLink = sal_False;
     ClearRecalcMode();
 }
 
@@ -770,7 +770,7 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal )
     return Add( new FormulaDoubleToken( fVal ) );
 }
 
-FormulaToken* FormulaTokenArray::AddName( USHORT n )
+FormulaToken* FormulaTokenArray::AddName( sal_uInt16 n )
 {
     return Add( new FormulaIndexToken( ocName, n ) );
 }
@@ -814,7 +814,7 @@ void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits )
 }
 
 
-BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
+sal_Bool FormulaTokenArray::HasMatrixDoubleRefOps()
 {
     if ( pRPN && nRPN )
     {
@@ -823,11 +823,11 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
         FormulaToken** pStack = new FormulaToken* [nRPN];
         FormulaToken* pResult = new FormulaDoubleToken( 0.0 );
         short sp = 0;
-        for ( USHORT j = 0; j < nRPN; j++ )
+        for ( sal_uInt16 j = 0; j < nRPN; j++ )
         {
             FormulaToken* t = pRPN[j];
             OpCode eOp = t->GetOpCode();
-            BYTE nParams = t->GetParamCount();
+            sal_uInt8 nParams = t->GetParamCount();
             switch ( eOp )
             {
                 case ocAdd :
@@ -844,13 +844,13 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
                 case ocLessEqual :
                 case ocGreaterEqual :
                 {
-                    for ( BYTE k = nParams; k; k-- )
+                    for ( sal_uInt8 k = nParams; k; k-- )
                     {
                         if ( sp >= k && pStack[sp-k]->GetType() == svDoubleRef )
                         {
                             pResult->Delete();
                             delete [] pStack;
-                            return TRUE;
+                            return sal_True;
                         }
                     }
                 }
@@ -882,7 +882,7 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
         delete [] pStack;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -931,21 +931,21 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi
             if (mnCurArg == 2)
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()
+                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=sal_True()
             }
             break;
         case ocPoissonDist:
             if (mnCurArg == 1)
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=TRUE()
+                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=sal_True()
             }
             break;
         case ocNormDist:
             if ( mnCurArg == 2 )
             {
                 pNewArr->AddOpCode( ocSep );
-                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()          
+                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=sal_True()          
             }
             break;
         case ocLogNormDist:
@@ -1085,7 +1085,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissingToPof( const MissingConvent
     FormulaMissingContext aCtx[ nAlloc ];
     int aOpCodeAddressStack[ nAlloc ];  // use of ADDRESS() function
     const int nOmitAddressArg = 3;      // ADDRESS() 4th parameter A1/R1C1
-    USHORT nTokens = GetLen() + 1;
+    sal_uInt16 nTokens = GetLen() + 1;
     FormulaMissingContext* pCtx = (nAlloc < nTokens ? new FormulaMissingContext[nTokens] : &aCtx[0]);
     int* pOcas = (nAlloc < nTokens ? new int[nTokens] : &aOpCodeAddressStack[0]);
     // Never go below 0, never use 0, mpFunc always NULL.
@@ -1167,7 +1167,7 @@ bool FormulaTokenArray::MayReferenceFollow()
     if ( pCode && nLen > 0 )
     {
         // ignore trailing spaces
-        USHORT i = nLen - 1;
+        sal_uInt16 i = nLen - 1;
         while ( i > 0 && pCode[i]->GetOpCode() == SC_OPCODE_SPACES )
         {
             --i;
@@ -1208,7 +1208,7 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
             }
             break;
         default:
-            pRet = new FormulaByteToken( eOp, 0, FALSE );
+            pRet = new FormulaByteToken( eOp, 0, sal_False );
             break;
     }
     return AddToken( *pRet );
@@ -1296,7 +1296,7 @@ void FormulaTokenIterator::Jump( short nStart, short nNext, short nStop )
 
 bool FormulaTokenIterator::IsEndOfPath() const
 {
-    USHORT nTest = pCur->nPC + 1;
+    sal_uInt16 nTest = pCur->nPC + 1;
     if( nTest < pCur->pArr->nRPN  && nTest < pCur->nStop )
     {
         const FormulaToken* t = pCur->pArr->pRPN[ nTest ];
@@ -1312,44 +1312,44 @@ bool FormulaTokenIterator::IsEndOfPath() const
 
 double      FormulaDoubleToken::GetDouble() const            { return fDouble; }
 double &    FormulaDoubleToken::GetDoubleAsReference()       { return fDouble; }
-BOOL FormulaDoubleToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaDoubleToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && fDouble == r.GetDouble();
 }
 
 
 const String& FormulaStringToken::GetString() const          { return aString; }
-BOOL FormulaStringToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaStringToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aString == r.GetString();
 }
 
 
 const String& FormulaStringOpToken::GetString() const             { return aString; }
-BOOL FormulaStringOpToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaStringOpToken::operator==( const FormulaToken& r ) const
 {
     return FormulaByteToken::operator==( r ) && aString == r.GetString();
 }
 
-USHORT  FormulaIndexToken::GetIndex() const                  { return nIndex; }
-void    FormulaIndexToken::SetIndex( USHORT n )              { nIndex = n; }
-BOOL FormulaIndexToken::operator==( const FormulaToken& r ) const
+sal_uInt16  FormulaIndexToken::GetIndex() const                  { return nIndex; }
+void    FormulaIndexToken::SetIndex( sal_uInt16 n )              { nIndex = n; }
+sal_Bool FormulaIndexToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nIndex == r.GetIndex();
 }
 const String&   FormulaExternalToken::GetExternal() const    { return aExternal; }
-BYTE            FormulaExternalToken::GetByte() const        { return nByte; }
-void            FormulaExternalToken::SetByte( BYTE n )      { nByte = n; }
-BOOL FormulaExternalToken::operator==( const FormulaToken& r ) const
+sal_uInt8            FormulaExternalToken::GetByte() const        { return nByte; }
+void            FormulaExternalToken::SetByte( sal_uInt8 n )      { nByte = n; }
+sal_Bool FormulaExternalToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && nByte == r.GetByte() &&
         aExternal == r.GetExternal();
 }
 
 
-USHORT          FormulaErrorToken::GetError() const          { return nError; }
-void            FormulaErrorToken::SetError( USHORT nErr )   { nError = nErr; }
-BOOL FormulaErrorToken::operator==( const FormulaToken& r ) const
+sal_uInt16          FormulaErrorToken::GetError() const          { return nError; }
+void            FormulaErrorToken::SetError( sal_uInt16 nErr )   { nError = nErr; }
+sal_Bool FormulaErrorToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         nError == static_cast< const FormulaErrorToken & >(r).GetError();
@@ -1360,13 +1360,13 @@ const String&   FormulaMissingToken::GetString() const
     static  String              aDummyString;
     return aDummyString; 
 }
-BOOL FormulaMissingToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaMissingToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r );
 }
 
 
-BOOL FormulaUnknownToken::operator==( const FormulaToken& r ) const
+sal_Bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r );
 }
diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index ee055f3bb2..ee055f3bb2 100644..100755
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.hrc
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index 20a8f9b97c..20a8f9b97c 100644..100755
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index f3f6d31ab4..f3f6d31ab4 100644..100755
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index eaa326ab31..eaa326ab31 100644..100755
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
diff --git a/formula/source/core/resource/makefile.mk b/formula/source/core/resource/makefile.mk
index 96e2dfd5a8..96e2dfd5a8 100644..100755
--- a/formula/source/core/resource/makefile.mk
+++ b/formula/source/core/resource/makefile.mk
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 346f2c7295..758a14b7fc 100644..100755
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -59,7 +59,7 @@ private:
     MultiLineEdit*	pMEdit;
     Link			aSelChangedLink;
     Selection		aOldSel;
-    BOOL			bMouseFlag;
+    sal_Bool			bMouseFlag;
                     DECL_LINK( ChangedHdl, EditBox* );
 
 protected:
@@ -94,7 +94,7 @@ public:
             ArgEdit( Window* pParent, const ResId& rResId );
 
     void	Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                  ScrollBar& rArgSlider, USHORT nArgCount );
+                  ScrollBar& rArgSlider, sal_uInt16 nArgCount );
 
 protected:
     virtual void	KeyInput( const KeyEvent& rKEvt );
@@ -103,7 +103,7 @@ private:
     ArgEdit*	pEdPrev;
     ArgEdit*	pEdNext;
     ScrollBar*	pSlider;
-    USHORT		nArgs;
+    sal_uInt16		nArgs;
 };
 
 
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 7da397f8f1..b07d3eecc1 100644..100755
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -48,10 +48,10 @@ namespace formula
             virtual ::rtl::OUString getDescription() const { return ::rtl::OUString(); }
             virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
             virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& ) const { return ::rtl::OUString(); }
-            virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& ) const {}
+            virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
             virtual void initArgumentInfo()  const {}
             virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
-            virtual long getHelpId() const { return 0; }
+            virtual rtl::OString getHelpId() const { return ""; }
             virtual sal_uInt32 getParameterCount() const { return 0; }
             virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); }
             virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); }
@@ -75,14 +75,14 @@ FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager)
 {
     m_pCharClass = m_pSysLocale->GetCharClassPtr();
 }
-BOOL FormulaHelper::GetNextFunc( const String&	rFormula,
-                                 BOOL			bBack,
+sal_Bool FormulaHelper::GetNextFunc( const String&	rFormula,
+                                 sal_Bool			bBack,
                                  xub_StrLen&	rFStart,   // Input and output
                                  xub_StrLen*	pFEnd, 	   // = NULL
                                  const IFunctionDescription**	ppFDesc,   // = NULL
                                  ::std::vector< ::rtl::OUString>*	pArgs )  const // = NULL
 {
-    BOOL		bFound = FALSE;
+    sal_Bool		bFound = sal_False;
     xub_StrLen	nOldStart = rFStart;
     String		aFname;
 
@@ -115,7 +115,7 @@ BOOL FormulaHelper::GetNextFunc( const String&	rFormula,
             }
             if ( *ppFDesc && pArgs )
             {
-                GetArgStrings( *pArgs,rFormula, rFStart, static_cast<USHORT>((*ppFDesc)->getParameterCount() ));
+                GetArgStrings( *pArgs,rFormula, rFStart, static_cast<sal_uInt16>((*ppFDesc)->getParameterCount() ));
             }
             else
             {
@@ -134,13 +134,13 @@ BOOL FormulaHelper::GetNextFunc( const String&	rFormula,
 
 void FormulaHelper::FillArgStrings( const String&	rFormula,
                                     xub_StrLen		nFuncPos,
-                                    USHORT			nArgs,
+                                    sal_uInt16			nArgs,
                                     ::std::vector< ::rtl::OUString >& _rArgs ) const
 {
     xub_StrLen	nStart	= 0;
     xub_StrLen	nEnd	= 0;
-    USHORT		i;
-    BOOL		bLast	= FALSE;
+    sal_uInt16		i;
+    sal_Bool		bLast	= sal_False;
 
     for ( i=0; i<nArgs && !bLast; i++ )
     {
@@ -153,7 +153,7 @@ void FormulaHelper::FillArgStrings( const String&	rFormula,
             if ( nEnd != nStart )
                 _rArgs.push_back(rFormula.Copy( nStart, nEnd-1-nStart ));
             else
-                _rArgs.push_back(String()), bLast = TRUE;
+                _rArgs.push_back(String()), bLast = sal_True;
         }
         else
         {
@@ -175,7 +175,7 @@ void FormulaHelper::FillArgStrings( const String&	rFormula,
 void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
                                       ,const String& rFormula,
                                        xub_StrLen nFuncPos,
-                                       USHORT nArgs ) const
+                                       sal_uInt16 nArgs ) const
 {
     if (nArgs)
     {
@@ -185,10 +185,10 @@ void FormulaHelper::GetArgStrings( ::std::vector< ::rtl::OUString >& _rArgs
 
 //------------------------------------------------------------------------
 
-inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
+inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
 {
     if( _pCharClass->isLetterNumeric( rStr, nPos ) )
-        return TRUE;
+        return sal_True;
     else
     {	// In internationalized versions function names may contain a dot
         //  and in every version also an underscore... ;-)
@@ -200,7 +200,7 @@ inline BOOL IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_
 
 xub_StrLen FormulaHelper::GetFunctionStart( const String&	rFormula,
                                         xub_StrLen		nStart,
-                                        BOOL			bBack,
+                                        sal_Bool			bBack,
                                         String*			pFuncName ) const
 {
     xub_StrLen nStrLen = rFormula.Len();
@@ -211,11 +211,11 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&	rFormula,
     xub_StrLen	nFStart = FUNC_NOTFOUND;
     xub_StrLen	nParPos	= nStart;
 
-    BOOL bRepeat, bFound;
+    sal_Bool bRepeat, bFound;
     do
     {
-        bFound  = FALSE;
-        bRepeat = FALSE;
+        bFound  = sal_False;
+        bRepeat = sal_False;
 
         if ( bBack )
         {
@@ -229,7 +229,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&	rFormula,
                     if (nParPos > 0)
                         nParPos--;
                 }
-                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
                     nParPos--;
             }
         }
@@ -244,7 +244,7 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&	rFormula,
                         nParPos++;
                     nParPos++;
                 }
-                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == FALSE )
+                else if ( (bFound = ( rFormula.GetChar(nParPos) == '(' ) ) == sal_False )
                     nParPos++;
             }
         }
@@ -269,13 +269,13 @@ xub_StrLen FormulaHelper::GetFunctionStart( const String&	rFormula,
             }
             else					// Brackets without function -> keep searching
             {
-                bRepeat = TRUE;
+                bRepeat = sal_True;
                 if ( !bBack )
                     nParPos++;
                 else if (nParPos > 0)
                     nParPos--;
                 else
-                    bRepeat = FALSE;
+                    bRepeat = sal_False;
             }
         }
         else						// No brackets found
@@ -301,7 +301,7 @@ xub_StrLen	FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
 
     short	nParCount = 0;
     bool    bInArray = false;
-    BOOL	bFound = FALSE;
+    sal_Bool	bFound = sal_False;
 
     while ( !bFound && (nStart < nStrLen) )
     {
@@ -319,10 +319,10 @@ xub_StrLen	FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
         {
             nParCount--;
             if ( nParCount == 0 )
-                bFound = TRUE;
+                bFound = sal_True;
             else if ( nParCount < 0 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nStart--;	// read one too far
             }
         }
@@ -338,7 +338,7 @@ xub_StrLen	FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
         {
             if ( !bInArray && nParCount == 0 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nStart--;	// read one too far
             }
         }
@@ -350,7 +350,7 @@ xub_StrLen	FormulaHelper::GetFunctionEnd( const String& rStr, xub_StrLen nStart
 
 //------------------------------------------------------------------
 
-xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, USHORT nArg ) const
+xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, sal_uInt16 nArg ) const
 {
     xub_StrLen nStrLen = rStr.Len();
 
@@ -359,7 +359,7 @@ xub_StrLen FormulaHelper::GetArgStart( const String& rStr, xub_StrLen nStart, US
 
     short	nParCount	= 0;
     bool    bInArray    = false;
-    BOOL	bFound		= FALSE;
+    sal_Bool	bFound		= sal_False;
 
     while ( !bFound && (nStart < nStrLen) )
     {
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 09f8bdfbba..09f8bdfbba 100644..100755
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 7955fdd473..6740417e9f 100644..100755
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -143,6 +143,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     Moveable = TRUE ;
     TabControl TC_FUNCTION
     {
+        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
         Pos = MAP_APPFONT ( 6 , 5 ) ;
         Size = MAP_APPFONT ( 102 , 199 ) ;
         PageList =
@@ -229,6 +230,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     CheckBox BTN_MATRIX
     {
+        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
         Pos = MAP_APPFONT ( 6 , 208 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -236,12 +238,14 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     Edit ED_REF
     {
+        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 76 , 205 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
     };
     ImageButton RB_REF
     {
+        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF";
         Pos = MAP_APPFONT ( 144 , 205 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
@@ -261,6 +265,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     PushButton BTN_BACKWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD";
         Pos = MAP_APPFONT ( 171 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -268,6 +273,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
     };
     PushButton BTN_FORWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD";
         Pos = MAP_APPFONT ( 219 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -304,6 +310,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     Moveable = TRUE ;
     TabControl TC_FUNCTION
     {
+        HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION";
         Pos = MAP_APPFONT ( 6 , 5 ) ;
         Size = MAP_APPFONT ( 102 , 199 ) ;
         PageList =
@@ -390,6 +397,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     CheckBox BTN_MATRIX
     {
+        HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX";
         Pos = MAP_APPFONT ( 6 , 208 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -397,12 +405,14 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     Edit ED_REF
     {
+        HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 76 , 205 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
     };
     ImageButton RB_REF
     {
+        HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF";
         Pos = MAP_APPFONT ( 144 , 205 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
@@ -422,6 +432,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     PushButton BTN_BACKWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD";
         Pos = MAP_APPFONT ( 171 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
@@ -429,6 +440,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
     };
     PushButton BTN_FORWARD
     {
+        HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD";
         Pos = MAP_APPFONT ( 219 , 208 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
         TabStop = TRUE ;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index da6bc8c104..ff74026439 100644..100755
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -100,9 +100,9 @@ namespace formula
         ::std::pair<RefButton*,RefEdit*>
                         RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
         void            RefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
-        void            RefInputDoneAfter( BOOL bForced );
-        BOOL			CalcValue( const String& rStrExp, String& rStrResult );
-        BOOL			CalcStruct( const String& rStrExp);
+        void            RefInputDoneAfter( sal_Bool bForced );
+        sal_Bool			CalcValue( const String& rStrExp, String& rStrResult );
+        sal_Bool			CalcStruct( const String& rStrExp);
         void			UpdateValues();
         void			DeleteArgs();
         xub_StrLen      GetFunctionPos(xub_StrLen nPos);
@@ -112,39 +112,39 @@ namespace formula
         void            fillTree(IStructHelper* _pTree);
         void            UpdateTokenArray( const String& rStrExp);
         String          RepairFormula(const String& aFormula);
-        void			FillDialog(BOOL nFlag=TRUE);
-        void			EditNextFunc( BOOL bForward, xub_StrLen nFStart=NOT_FOUND );
+        void			FillDialog(sal_Bool nFlag=sal_True);
+        void			EditNextFunc( sal_Bool bForward, xub_StrLen nFStart=NOT_FOUND );
         void			EditThisFunc(xub_StrLen nFStart);
         void			EditFuncParas(xub_StrLen nEditPos);
 
 
-        void			UpdateArgInput( USHORT nOffset, USHORT nInput );
+        void			UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 nInput );
         void			Update();
         void            Update(const String& _sExp);
 
 
-        void			SaveArg( USHORT nEd );
+        void			SaveArg( sal_uInt16 nEd );
         void			UpdateSelection();
-        void			DoEnter( BOOL bOk );
+        void			DoEnter( sal_Bool bOk );
         void			UpdateFunctionDesc();
         void			ResizeArgArr( const IFunctionDescription* pNewFunc );
         void			FillListboxes();
-        void			FillControls(BOOL &rbNext, BOOL &rbPrev);
+        void			FillControls(sal_Bool &rbNext, sal_Bool &rbPrev);
 
-        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+        FormulaDlgMode  SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
         void            SetMeText(const String& _sText);
-        BOOL            CheckMatrix(String& aFormula /*IN/OUT*/);
+        sal_Bool            CheckMatrix(String& aFormula /*IN/OUT*/);
 
         void            SetEdSelection();
 
-        BOOL            UpdateParaWin(Selection& _rSelection);
+        sal_Bool            UpdateParaWin(Selection& _rSelection);
         void            UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
 
         void            SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd);
         void            PreNotify( NotifyEvent& rNEvt );
 
         RefEdit*        GetCurrRefEdit();
-        ULONG           FindFocusWin(Window *pWin);
+        rtl::OString    FindFocusWin(Window *pWin);
 
         const FormulaHelper& GetFormulaHelper() const;
         uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const;
@@ -215,9 +215,9 @@ namespace formula
         FuncPage*	pFuncPage;
         StructPage*	pStructPage;
         String			aOldFormula;
-        BOOL			bStructUpdate;
+        sal_Bool			bStructUpdate;
         MultiLineEdit*  pMEdit;
-        BOOL			bUserMatrixFlag;
+        sal_Bool			bUserMatrixFlag;
         Timer			aTimer;
 
         const String	aTitle1;
@@ -227,20 +227,20 @@ namespace formula
         FormulaHelper
                         m_aFormulaHelper;
 
-        SmartId         m_aSmartEditHelpId;
+        rtl::OString    m_aEditHelpId;
 
-        ULONG			nOldHelp;
-        ULONG			nOldUnique;
-        ULONG			nActivWinId;
-        BOOL			bIsShutDown;
+        rtl::OString	aOldHelp;
+        rtl::OString    aOldUnique;
+        rtl::OString    aActivWinId;
+        sal_Bool			bIsShutDown;
 
 
 
         Font			aFntBold;
         Font			aFntLight;
-        USHORT			nEdFocus;
+        sal_uInt16			nEdFocus;
     //    Selection       theCurSel;
-        BOOL			bEditFlag;
+        sal_Bool			bEditFlag;
         const IFunctionDescription*	pFuncDesc;
         xub_StrLen		nArgs;
         ::std::vector< ::rtl::OUString > m_aArguments;
@@ -293,7 +293,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     //
     pTheRefEdit		(NULL),
     pMEdit			(NULL),
-    bUserMatrixFlag	(FALSE),
+    bUserMatrixFlag	(sal_False),
     //
     aTitle1			( ModuleRes( STR_TITLE1 ) ),		// local resource
     aTitle2			( ModuleRes( STR_TITLE2 ) ),		// local resource
@@ -301,8 +301,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTxtOk			( aBtnEnd.GetText() ),
     m_aFormulaHelper(_pFunctionMgr),
     //
-    nActivWinId		(0),
-    bIsShutDown		(FALSE),
+    bIsShutDown		(sal_False),
     nEdFocus		(0),
     pFuncDesc		(NULL),
     nArgs			(0)
@@ -315,11 +314,16 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aRefBtn.Hide();
 
     pMEdit = aMEFormula.GetEdit();
-    m_aSmartEditHelpId = pMEdit->GetSmartHelpId();
-    pMEdit->SetSmartUniqueId(m_aSmartEditHelpId);
-
-    bEditFlag=FALSE;
-    bStructUpdate=TRUE;
+    //IAccessibility2 Implementation 2009-----
+    aMEFormula.SetAccessibleName(aFtFormula.GetText());
+    if (pMEdit)
+        pMEdit->SetAccessibleName(aFtFormula.GetText());
+    //-----IAccessibility2 Implementation 2009
+    m_aEditHelpId = pMEdit->GetHelpId();
+    pMEdit->SetUniqueId( m_aEditHelpId );
+
+    bEditFlag=sal_False;
+    bStructUpdate=sal_True;
     Point aPos=aGEdit.GetPosPixel();
     pParaWin->SetPosPixel(aPos);
     pParaWin->SetArgModifiedHdl(LINK( this, FormulaDlg_Impl, ModifyHdl ) );
@@ -332,8 +336,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage);
     aTabCtrl.SetTabPage( TP_STRUCT, pStructPage);
 
-    nOldHelp = pParent->GetHelpId();				// HelpId from resource always for "Page 1"
-    nOldUnique = pParent->GetUniqueId();
+    aOldHelp = pParent->GetHelpId();				// HelpId from resource always for "Page 1"
+    aOldUnique = pParent->GetUniqueId();
 
     aFtResult.Show( _bSupportResult );
     aWndResult.Show( _bSupportResult );
@@ -358,7 +362,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aMEFormula.SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) );
 
     aFntLight = aFtFormula.GetFont();
-    aFntLight.SetTransparent( TRUE );
+    aFntLight.SetTransparent( sal_True );
     aFntBold = aFntLight;
     aFntBold.SetWeight( WEIGHT_BOLD );
 
@@ -377,7 +381,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
         aTimer.SetTimeoutHdl(Link());
         aTimer.Stop();
     }// if(aTimer.IsActive())
-    bIsShutDown=TRUE;// Set it in order to PreNotify not to save GetFocus.
+    bIsShutDown=sal_True;// Set it in order to PreNotify not to save GetFocus.
     FormEditData* pData = m_pHelper->getFormEditData();
     if (pData) // it won't be destroyed over Close;
     {
@@ -385,9 +389,9 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
         pData->SetSelection(pMEdit->GetSelection());
 
         if(aTabCtrl.GetCurPageId()==TP_FUNCTION)
-            pData->SetMode( (USHORT) FORMULA_FORMDLG_FORMULA );
+            pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
         else
-            pData->SetMode( (USHORT) FORMULA_FORMDLG_EDIT );
+            pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_EDIT );
         pData->SetUndoStr(pMEdit->GetText());
         pData->SetMatrixFlag(aBtnMatrix.IsChecked());
     }
@@ -403,33 +407,33 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
 // -----------------------------------------------------------------------------
 void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nSwitch=rNEvt.GetType();
+    sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_GETFOCUS && !bIsShutDown)
     {
         Window* pWin=rNEvt.GetWindow();
         if(pWin!=NULL)
         {
-            nActivWinId = pWin->GetUniqueId();
-            if(nActivWinId==0)
+            aActivWinId = pWin->GetUniqueId();
+            if(aActivWinId.getLength()==0)
             {
                 Window* pParent=pWin->GetParent();
                 while(pParent!=NULL)
                 {
-                    nActivWinId=pParent->GetUniqueId();
+                    aActivWinId=pParent->GetUniqueId();
 
-                    if(nActivWinId!=0) break;
+                    if(aActivWinId.getLength()!=0) break;
 
                     pParent=pParent->GetParent();
                 }
             }
-            if(nActivWinId!=0)
+            if(aActivWinId.getLength())
             {
 
                 FormEditData* pData = m_pHelper->getFormEditData();
 
                 if (pData && !aTimer.IsActive()) // it won't be destroyed over Close;
                 {
-                    pData->SetUniqueId(nActivWinId);
+                    pData->SetUniqueId(aActivWinId);
                 }
             }
         }
@@ -487,7 +491,7 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
     xub_StrLen nFuncPos=STRING_NOTFOUND;    //@ Testwise
     xub_StrLen nPrevFuncPos=1;
     short  nBracketCount=0;
-    BOOL   bFlag=FALSE;
+    sal_Bool   bFlag=sal_False;
     String aFormString = pMEdit->GetText();
     m_aFormulaHelper.GetCharClass()->toUpper( aFormString );
 
@@ -543,12 +547,12 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
                 if ( eOp == m_aSeparatorsOpCodes[TOKEN_OPEN].OpCode )
                 {
                     nBracketCount++;
-                    bFlag=TRUE;
+                    bFlag=sal_True;
                 }
                 else if ( eOp == m_aSeparatorsOpCodes[TOKEN_CLOSE].OpCode )
                 {
                     nBracketCount--;
-                    bFlag=FALSE;
+                    bFlag=sal_False;
                     nFuncPos=nPrevFuncPos;
                 }
                 bool bIsFunction = ::std::find_if(m_aFunctionOpCodes.getConstArray(),m_pFunctionOpCodesEnd,::std::bind2nd(OpCodeCompare(),boost::cref(eOp))) != m_pFunctionOpCodesEnd;
@@ -588,9 +592,9 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos)
     return nFuncPos;
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
+sal_Bool FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
 {
-    BOOL bResult = TRUE;
+    sal_Bool bResult = sal_True;
 
     if ( rStrExp.Len() > 0 )
     {
@@ -601,7 +605,7 @@ BOOL FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult )
             bResult = m_pHelper->calculateValue(rStrExp,rStrResult);
         }
         else
-            bResult = FALSE;
+            bResult = sal_False;
     }
 
     return bResult;
@@ -625,9 +629,9 @@ void FormulaDlg_Impl::UpdateValues()
     CalcStruct(pMEdit->GetText());
 }
 
-BOOL FormulaDlg_Impl::CalcStruct( const String& rStrExp)
+sal_Bool FormulaDlg_Impl::CalcStruct( const String& rStrExp)
 {
-    BOOL bResult = TRUE;
+    sal_Bool bResult = sal_True;
     xub_StrLen nLength=rStrExp.Len();
 
     if ( rStrExp.Len() > 0 && aOldFormula!=rStrExp && bStructUpdate)
@@ -658,7 +662,7 @@ BOOL FormulaDlg_Impl::CalcStruct( const String& rStrExp)
                 UpdateTokenArray(rStrExp);
         }
         else
-            bResult = FALSE;
+            bResult = sal_False;
     }
     return bResult;
 }
@@ -766,13 +770,13 @@ void FormulaDlg_Impl::UpdateTokenArray( const String& rStrExp)
     } // if ( pTokens && nLen == m_aTokenList.getLength() )
 
     FormulaCompiler aCompiler(*m_pTokenArray.get());
-    aCompiler.SetCompileForFAP(TRUE);   // #i101512# special handling is needed
+    aCompiler.SetCompileForFAP(sal_True);   // #i101512# special handling is needed
     aCompiler.CompileTokenArray();
 }
 
-void FormulaDlg_Impl::FillDialog(BOOL nFlag)
+void FormulaDlg_Impl::FillDialog(sal_Bool nFlag)
 {
-    BOOL bNext=TRUE, bPrev=TRUE;
+    sal_Bool bNext=sal_True, bPrev=sal_True;
     if(nFlag)
         FillControls(bNext, bPrev);
     FillListboxes();
@@ -803,9 +807,9 @@ void FormulaDlg_Impl::FillListboxes()
     if ( pFuncDesc && pFuncDesc->getCategory() )
     {
         if( pFuncPage->GetCategory() != pFuncDesc->getCategory()->getNumber() + 1 )
-            pFuncPage->SetCategory(static_cast<USHORT>(pFuncDesc->getCategory()->getNumber() + 1));
+            pFuncPage->SetCategory(static_cast<sal_uInt16>(pFuncDesc->getCategory()->getNumber() + 1));
 
-        USHORT nPos=pFuncPage->GetFuncPos(pFuncDesc);
+        sal_uInt16 nPos=pFuncPage->GetFuncPos(pFuncDesc);
 
         pFuncPage->SetFunction(nPos);
     }
@@ -819,16 +823,16 @@ void FormulaDlg_Impl::FillListboxes()
     //	ResizeArgArr is now already in UpdateFunctionDesc
 
 
-    m_pHelper->setDispatcherLock( TRUE);// Activate Modal-Mode
+    m_pHelper->setDispatcherLock( sal_True );// Activate Modal-Mode
 
     aNewTitle = aTitle1;
 
     //	HelpId for 1. page is the one from the resource
-    m_pParent->SetHelpId( nOldHelp );
-    m_pParent->SetUniqueId( nOldUnique );
+    m_pParent->SetHelpId( aOldHelp );
+    m_pParent->SetUniqueId( aOldUnique );
 }
 // -----------------------------------------------------------------------------
-void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
+void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
 {
     //	Switch between the "Pages"
     FormEditData* pData = m_pHelper->getFormEditData();
@@ -846,9 +850,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
     aFormula.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " )" ));
     DeleteArgs();
     const IFunctionDescription* pOldFuncDesc = pFuncDesc;
-    BOOL bTestFlag = FALSE;
+    sal_Bool bTestFlag = sal_False;
 
-    if ( m_aFormulaHelper.GetNextFunc( aFormula, FALSE,
+    if ( m_aFormulaHelper.GetNextFunc( aFormula, sal_False,
                                      nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) )
     {
         bTestFlag = (pOldFuncDesc != pFuncDesc);
@@ -861,9 +865,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
             aFtEditName.SetText( pFuncDesc->getFunctionName() );
             aFtEditName.Show();
             pParaWin->Show();
-            const long nHelpId = pFuncDesc->getHelpId();
-            if ( nHelpId )
-                pMEdit->SetSmartHelpId(SmartId(nHelpId));
+            const rtl::OString aHelpId = pFuncDesc->getHelpId();
+            if ( aHelpId.getLength() )
+                pMEdit->SetHelpId(aHelpId);
         }
 
         xub_StrLen nOldStart, nOldEnd;
@@ -883,26 +887,26 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
             pMEdit->SetSelection( Selection(PrivStart, PrivEnd));
 
         nArgs = pFuncDesc->getSuppressedArgumentCount();
-        USHORT nOffset = pData->GetOffset();
+        sal_uInt16 nOffset = pData->GetOffset();
         nEdFocus = pData->GetEdFocus();
 
         //	Concatenate the Edit's for Focus-Control
 
         if(bTestFlag)
             pParaWin->SetArgumentOffset(nOffset);
-        USHORT nActiv=0;
+        sal_uInt16 nActiv=0;
         xub_StrLen nArgPos= m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
         xub_StrLen nEditPos=(xub_StrLen) pMEdit->GetSelection().Min();
-        BOOL	bFlag=FALSE;
+        sal_Bool	bFlag=sal_False;
 
-        for(USHORT i=0;i<nArgs;i++)
+        for(sal_uInt16 i=0;i<nArgs;i++)
         {
             sal_Int32 nLength = m_aArguments[i].getLength()+1;
             pParaWin->SetArgument(i,m_aArguments[i]);
             if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
             {
                 nActiv=i;
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
             nArgPos = sal::static_int_cast<xub_StrLen>( nArgPos + nLength );
         }
@@ -919,15 +923,15 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
     else
     {
         aFtEditName.SetText(String());
-        pMEdit->SetSmartHelpId(m_aSmartEditHelpId);
+        pMEdit->SetHelpId( m_aEditHelpId );
     }
         //	Test, ob vorne/hinten noch mehr Funktionen sind
 
     xub_StrLen nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
-    rbNext = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nTempStart );
+    rbNext = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nTempStart );
     nTempStart=(xub_StrLen)pMEdit->GetSelection().Min();
     pData->SetFStart(nTempStart);
-    rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nTempStart );
+    rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nTempStart );
 }
 // -----------------------------------------------------------------------------
 
@@ -945,7 +949,7 @@ void FormulaDlg_Impl::ClearAllParas()
         aFtEditName.Hide();
         pParaWin->Hide();
 
-        aBtnForward.Enable(TRUE); //@new
+        aBtnForward.Enable(sal_True); //@new
         aFtHeadLine.Show();
         aFtFuncName.Show();
         aFtFuncDesc.Show();
@@ -976,7 +980,7 @@ String FormulaDlg_Impl::RepairFormula(const String& aFormula)
     return aResult;
 }
 
-void FormulaDlg_Impl::DoEnter(BOOL bOk)
+void FormulaDlg_Impl::DoEnter(sal_Bool bOk)
 {
     //	Accept input to the document or cancel
     if ( bOk)
@@ -1003,11 +1007,11 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
 {
     if ( pBtn == &aBtnCancel )
     {
-        DoEnter(FALSE);					// closes the Dialog
+        DoEnter(sal_False);					// closes the Dialog
     }
     else if ( pBtn == &aBtnEnd )
     {
-        DoEnter(TRUE);					// closes the Dialog
+        DoEnter(sal_True);					// closes the Dialog
     }
     else if ( pBtn == &aBtnForward )
     {
@@ -1015,19 +1019,19 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
         const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
 
         if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
-            EditNextFunc( TRUE );
+            EditNextFunc( sal_True );
         else
         {
             DblClkHdl(pFuncPage);	   //new
-            aBtnForward.Enable(FALSE); //new
+            aBtnForward.Enable(sal_False); //new
         }
-        //@EditNextFunc( TRUE );
+        //@EditNextFunc( sal_True );
     }
     else if ( pBtn == &aBtnBackward )
     {
-        bEditFlag=FALSE;
-        aBtnForward.Enable(TRUE);
-        EditNextFunc( FALSE );
+        bEditFlag=sal_False;
+        aBtnForward.Enable(sal_True);
+        EditNextFunc( sal_False );
         aMEFormula.Invalidate();
         aMEFormula.Update();
     }
@@ -1061,11 +1065,11 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData)
         return;
-    USHORT nCat = pFuncPage->GetCategory();
+    sal_uInt16 nCat = pFuncPage->GetCategory();
     if ( nCat == LISTBOX_ENTRY_NOTFOUND )
         nCat = 0;
     pData->SetCatSel( nCat );
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
     if ( nFunc == LISTBOX_ENTRY_NOTFOUND )
         nFunc = 0;
     pData->SetFuncSel( nFunc );
@@ -1104,7 +1108,7 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
 
 IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
 {
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
 
     //	ex-UpdateLRUList
     const IFunctionDescription*	pDesc = pFuncPage->GetFuncDesc(nFunc);
@@ -1130,7 +1134,7 @@ IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
     }
 
     pParaWin->SetEdFocus(0);
-    aBtnForward.Enable(FALSE); //@New
+    aBtnForward.Enable(sal_False); //@New
 
     return 0;
 }
@@ -1184,11 +1188,11 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
     xub_StrLen nNextFStart	= nFStart;
     xub_StrLen nNextFEnd	= 0;
 
-    BOOL bFound;
+    sal_Bool bFound;
 
-    //@bFound = m_pHelper->getNextFunction( aFormula, FALSE, nNextFStart, &nNextFEnd, &pFuncDesc );
+    //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
 
-    bFound = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd);
+    bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     if ( bFound )
     {
         xub_StrLen PrivStart, PrivEnd;
@@ -1201,7 +1205,7 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
     }
 }
 
-void FormulaDlg_Impl::EditNextFunc( BOOL bForward, xub_StrLen nFStart )
+void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
 {
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData)
@@ -1221,18 +1225,18 @@ void FormulaDlg_Impl::EditNextFunc( BOOL bForward, xub_StrLen nFStart )
     xub_StrLen nNextFStart	= 0;
     xub_StrLen nNextFEnd	= 0;
 
-    BOOL bFound;
+    sal_Bool bFound;
     if ( bForward )
     {
         nNextFStart	= m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
-        //@bFound = m_pHelper->getNextFunction( aFormula, FALSE, nNextFStart, &nNextFEnd, &pFuncDesc );
-        bFound = m_aFormulaHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd);
+        //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
+        bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     }
     else
     {
         nNextFStart	= nFStart;
-        //@bFound = m_pHelper->getNextFunction( aFormula, TRUE, nNextFStart, &nNextFEnd, &pFuncDesc );
-        bFound = m_aFormulaHelper.GetNextFunc( aFormula, TRUE, nNextFStart, &nNextFEnd);
+        //@bFound = m_pHelper->getNextFunction( aFormula, sal_True, nNextFStart, &nNextFEnd, &pFuncDesc );
+        bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nNextFStart, &nNextFEnd);
     }
 
     if ( bFound )
@@ -1261,18 +1265,18 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
         m_aFormulaHelper.GetArgStrings(m_aArguments,aFormula, nFStart, nArgs );
 // 		m_aArguments = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs );
 
-        USHORT nActiv=pParaWin->GetSliderPos();
-        BOOL	bFlag=FALSE;
+        sal_uInt16 nActiv=pParaWin->GetSliderPos();
+        sal_Bool	bFlag=sal_False;
         ::std::vector< ::rtl::OUString >::iterator aIter = m_aArguments.begin();
         ::std::vector< ::rtl::OUString >::iterator aEnd = m_aArguments.end();
-        for(USHORT i=0;aIter != aEnd;i++,++aIter)
+        for(sal_uInt16 i=0;aIter != aEnd;i++,++aIter)
         {
             sal_Int32 nLength=(*aIter).getLength();
             pParaWin->SetArgument(i,(*aIter));
             if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
             {
                 nActiv=i;
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
             nArgPos+=nLength+1;
         }
@@ -1288,11 +1292,11 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
 
 }
 
-void FormulaDlg_Impl::SaveArg( USHORT nEd )
+void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
 {
     if (nEd<nArgs)
     {
-        USHORT i;
+        sal_uInt16 i;
         for(i=0;i<=nEd;i++)
         {
             if ( m_aArguments[i].getLength() == 0 )
@@ -1301,7 +1305,7 @@ void FormulaDlg_Impl::SaveArg( USHORT nEd )
         if(pParaWin->GetArgument(nEd).Len()!=0)
             m_aArguments[nEd] = pParaWin->GetArgument(nEd);
 
-        USHORT nClearPos=nEd+1;
+        sal_uInt16 nClearPos=nEd+1;
         for(i=nEd+1;i<nArgs;i++)
         {
             if(pParaWin->GetArgument(i).Len()!=0)
@@ -1321,14 +1325,14 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
 {
     if(pPtr==pParaWin)
     {
-        aBtnForward.Enable(TRUE); //@ In order to be able to input another function.
+        aBtnForward.Enable(sal_True); //@ In order to be able to input another function.
         aTabCtrl.SetCurPageId(TP_FUNCTION);
 
         String aUndoStr = m_pHelper->getCurrentFormula();		// it will be added before a ";"
         FormEditData* pData = m_pHelper->getFormEditData();
         if (!pData) return 0;
 
-        USHORT nArgNo = pParaWin->GetActiveLine();
+        sal_uInt16 nArgNo = pParaWin->GetActiveLine();
         nEdFocus=nArgNo;
 
         SaveArg(nArgNo);
@@ -1341,12 +1345,12 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin*, pPtr )
 
         pData->SetEdFocus( nEdFocus );
         pData->SaveValues();
-        pData->SetMode( (USHORT) FORMULA_FORMDLG_FORMULA );
+        pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
         pData->SetFStart( n1 );
         pData->SetUndoStr( aUndoStr );
         ClearAllParas();
 
-        FillDialog(FALSE);
+        FillDialog(sal_False);
         pFuncPage->SetFocus(); //There Parawin is not visible anymore
     }
     return 0;
@@ -1371,7 +1375,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     FormEditData* pData = m_pHelper->getFormEditData();
     if (!pData) return 0;
 
-    bEditFlag=TRUE;
+    bEditFlag=sal_True;
     String		aInputFormula=m_pHelper->getCurrentFormula();
     String		aString=pMEdit->GetText();
 
@@ -1418,7 +1422,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     if(nPos<aSel.Min()-1)
     {
         xub_StrLen nPos1=aString.Search('(',nPos);
-        EditNextFunc( FALSE, nPos1);
+        EditNextFunc( sal_False, nPos1);
     }
     else
     {
@@ -1426,7 +1430,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaHdl, MultiLineEdit*, EMPTYARG )
     }
 
     m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max());
-    bEditFlag=FALSE;
+    bEditFlag=sal_False;
     return 0;
 }
 
@@ -1436,7 +1440,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
     if (!pData) return 0;
     xub_StrLen nFStart = pData->GetFStart();
 
-    bEditFlag=TRUE;
+    bEditFlag=sal_True;
 
     String		aInputFormula=m_pHelper->getCurrentFormula();
     String		aString=pMEdit->GetText();
@@ -1479,7 +1483,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
                 }
                 if(nCount==0)
                 {
-                    nFStart=m_aFormulaHelper.GetFunctionStart(aString,n,TRUE);
+                    nFStart=m_aFormulaHelper.GetFunctionStart(aString,n,sal_True);
                     EditThisFunc(nFStart);
                 }
                 else
@@ -1495,7 +1499,7 @@ IMPL_LINK( FormulaDlg_Impl, FormulaCursorHdl, EditBox*, EMPTYARG )
     }
     m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max());
 
-    bEditFlag=FALSE;
+    bEditFlag=sal_False;
     return 0;
 }
 
@@ -1514,16 +1518,16 @@ void FormulaDlg_Impl::UpdateSelection()
     String aFormula=pMEdit->GetText();
     sal_Int32 nArgPos=m_aFormulaHelper.GetArgStart( aFormula,PrivStart,0);
 
-    USHORT nPos=pParaWin->GetActiveLine();
+    sal_uInt16 nPos=pParaWin->GetActiveLine();
 
-    for(USHORT i=0;i<nPos;i++)
+    for(sal_uInt16 i=0;i<nPos;i++)
     {
         nArgPos += (m_aArguments[i].getLength() + 1);
     }
     sal_Int32 nLength= m_aArguments[nPos].getLength();
 
     Selection aSel(nArgPos,nArgPos+nLength);
-    m_pHelper->setSelection((USHORT)nArgPos,(USHORT)(nArgPos+nLength));
+    m_pHelper->setSelection((sal_uInt16)nArgPos,(sal_uInt16)(nArgPos+nLength));
     pMEdit->SetSelection(aSel);
     aMEFormula.UpdateOldSel();
 }
@@ -1569,7 +1573,7 @@ void FormulaDlg_Impl::RefInputStartAfter( RefEdit* /*pEdit*/, RefButton* /*pButt
         m_pParent->SetText( MnemonicGenerator::EraseAllMnemonicChars( aStr ) );
     }
 }
-void FormulaDlg_Impl::RefInputDoneAfter( BOOL bForced )
+void FormulaDlg_Impl::RefInputDoneAfter( sal_Bool bForced )
 {
     aRefBtn.SetStartImage();
     if( bForced || !aRefBtn.IsVisible() )
@@ -1584,7 +1588,7 @@ void FormulaDlg_Impl::RefInputDoneAfter( BOOL bForced )
             if( pTheRefButton )
                 pTheRefButton->SetStartImage();
 
-            USHORT nPrivActiv = pParaWin->GetActiveLine();
+            sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
             pParaWin->SetArgument( nPrivActiv, aEdRef.GetText() );
             ModifyHdl( pParaWin );
             pTheRefEdit = NULL;
@@ -1617,7 +1621,7 @@ void FormulaDlg_Impl::Update(const String& _sExp)
 {
     CalcStruct(_sExp);
     FillDialog();
-    //aBtnForward.Enable(TRUE); //@New
+    //aBtnForward.Enable(sal_True); //@New
     FuncSelHdl(NULL);
 }
 void FormulaDlg_Impl::SetMeText(const String& _sText)
@@ -1627,7 +1631,7 @@ void FormulaDlg_Impl::SetMeText(const String& _sText)
     pMEdit->SetSelection( pData->GetSelection());
     aMEFormula.UpdateOldSel();
 }
-FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA;
     if(!bEditFlag)
@@ -1646,11 +1650,11 @@ FormulaDlgMode FormulaDlg_Impl::SetMeText(const String& _sText,xub_StrLen PrivSt
     } // if ( _bUpdate )
     return eMode;
 }
-BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
+sal_Bool FormulaDlg_Impl::CheckMatrix(String& aFormula)
 {
     pMEdit->GrabFocus();
     xub_StrLen nLen = aFormula.Len();
-    BOOL bMatrix =  nLen > 3 					// Matrix-Formula ?
+    sal_Bool bMatrix =  nLen > 3 					// Matrix-Formula
             && aFormula.GetChar(0) == '{'
             && aFormula.GetChar(1) == '='
             && aFormula.GetChar(nLen-1) == '}';
@@ -1667,23 +1671,23 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
 }
 IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG )
 {
-    bStructUpdate=FALSE;
-    if(pStructPage->IsVisible())	aBtnForward.Enable(FALSE); //@New
+    bStructUpdate=sal_False;
+    if(pStructPage->IsVisible())	aBtnForward.Enable(sal_False); //@New
 
-    bStructUpdate=TRUE;
+    bStructUpdate=sal_True;
     return 0;
 }
 IMPL_LINK( FormulaDlg_Impl, MatrixHdl, CheckBox *, EMPTYARG )
 {
-    bUserMatrixFlag=TRUE;
+    bUserMatrixFlag=sal_True;
     return 0;
 }
 
 IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG )
 {
-    USHORT nCat = pFuncPage->GetCategory();
+    sal_uInt16 nCat = pFuncPage->GetCategory();
     if ( nCat == LISTBOX_ENTRY_NOTFOUND ) nCat = 0;
-    USHORT nFunc = pFuncPage->GetFunction();
+    sal_uInt16 nFunc = pFuncPage->GetFunction();
     if ( nFunc == LISTBOX_ENTRY_NOTFOUND ) nFunc = 0;
 
     if (   (pFuncPage->GetFunctionEntryCount() > 0)
@@ -1691,7 +1695,7 @@ IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG )
     {
         const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
 
-        if(pDesc!=pFuncDesc) aBtnForward.Enable(TRUE); //new
+        if(pDesc!=pFuncDesc) aBtnForward.Enable(sal_True); //new
 
         if (pDesc)
         {
@@ -1722,7 +1726,7 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection,const String& _
     //-------------------------------------
     // Manual Update of the results' fields:
     //-------------------------------------
-    USHORT nPrivActiv = pParaWin->GetActiveLine();
+    sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
     pParaWin->SetArgument(nPrivActiv,aEdRef.GetText());
     pParaWin->UpdateParas();
 
@@ -1730,11 +1734,11 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection,const String& _
     if( pEd != NULL )
         pEd->SetSelection( theSel );
 
-    pParaWin->SetRefMode(FALSE);
+    pParaWin->SetRefMode(sal_False);
 }
-BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
 {
-    pParaWin->SetRefMode(TRUE);
+    pParaWin->SetRefMode(sal_True);
 
     String		aStrEd;
     Edit* pEd = GetCurrRefEdit();
@@ -1754,20 +1758,20 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
     }
     return pTheRefEdit == NULL;
 }
-ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
 {
-    ULONG nUniqueId=0;
+    rtl::OString aUniqueId;
     if(pWin->HasFocus())
     {
-        nUniqueId=pWin->GetUniqueId();
-        if(nUniqueId==0)
+        aUniqueId=pWin->GetUniqueId();
+        if(aUniqueId.getLength()==0)
         {
             Window* pParent=pWin->GetParent();
             while(pParent!=NULL)
             {
-                nUniqueId=pParent->GetUniqueId();
+                aUniqueId=pParent->GetUniqueId();
 
-                if(nUniqueId!=0) break;
+                if(aUniqueId.getLength()!=0) break;
 
                 pParent=pParent->GetParent();
             }
@@ -1775,16 +1779,16 @@ ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
-            nUniqueId=FindFocusWin(pChild);
-            if(nUniqueId>0) break;
+            aUniqueId=FindFocusWin(pChild);
+            if(aUniqueId.getLength()>0) break;
         }
     }
-    return nUniqueId;
+    return aUniqueId;
 }
 
 void FormulaDlg_Impl::SetEdSelection()
@@ -1838,7 +1842,7 @@ void FormulaModalDialog::SetMeText(const String& _sText)
 }
 
 // -----------------------------------------------------------------------------
-FormulaDlgMode FormulaModalDialog::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaModalDialog::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
 }
@@ -1848,7 +1852,7 @@ void FormulaModalDialog::CheckMatrix()
     m_pImpl->aBtnMatrix.Check();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaModalDialog::CheckMatrix(String& aFormula)
+sal_Bool FormulaModalDialog::CheckMatrix(String& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
@@ -1868,11 +1872,11 @@ const FormulaHelper& FormulaModalDialog::GetFormulaHelper() const
     return m_pImpl->GetFormulaHelper();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaModalDialog::isUserMatrix() const
+sal_Bool FormulaModalDialog::isUserMatrix() const
 {
     return m_pImpl->bUserMatrixFlag;
 }
-void FormulaModalDialog::DoEnter(BOOL _bOk)
+void FormulaModalDialog::DoEnter(sal_Bool _bOk)
 {
     m_pImpl->DoEnter(_bOk);
 }
@@ -1884,17 +1888,17 @@ void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
 }
-void FormulaModalDialog::RefInputDoneAfter( BOOL bForced )
+void FormulaModalDialog::RefInputDoneAfter( sal_Bool bForced )
 {
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-ULONG FormulaModalDialog::FindFocusWin(Window *pWin)
+rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin)
 {
     return m_pImpl->FindFocusWin( pWin );
 }
 
-void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -1902,9 +1906,9 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
@@ -1940,7 +1944,7 @@ void FormulaModalDialog::UpdateParaWin(const Selection& _rSelection,const String
 {
     m_pImpl->UpdateParaWin(_rSelection,_sRefStr);
 }
-BOOL FormulaModalDialog::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaModalDialog::UpdateParaWin(Selection& _rSelection)
 {
     return m_pImpl->UpdateParaWin(_rSelection);
 }
@@ -1971,7 +1975,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
                                             ,_pHelper,_pFunctionMgr,_pDlg))
 {
     FreeResource();
-    if(GetHelpId()==0)				//Hack which hides the HelpId for a model Dialog in SfxModelessDialog
+    if(!GetHelpId().getLength())	//Hack which hides the HelpId for a model Dialog in SfxModelessDialog
         SetHelpId(GetUniqueId());	//and will be changed in a UniqueId,
                                     //at this point we reverse it.
     SetText(m_pImpl->aTitle1);
@@ -1993,7 +1997,7 @@ void FormulaDlg::SetMeText(const String& _sText)
 }
 
 // -----------------------------------------------------------------------------
-FormulaDlgMode FormulaDlg::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate)
+FormulaDlgMode FormulaDlg::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
 }
@@ -2003,7 +2007,7 @@ void FormulaDlg::CheckMatrix()
     m_pImpl->aBtnMatrix.Check();
 }
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg::CheckMatrix(String& aFormula)
+sal_Bool FormulaDlg::CheckMatrix(String& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
@@ -2022,11 +2026,11 @@ void FormulaDlg::Update()
 }
 
 // -----------------------------------------------------------------------------
-BOOL FormulaDlg::isUserMatrix() const
+sal_Bool FormulaDlg::isUserMatrix() const
 {
     return m_pImpl->bUserMatrixFlag;
 }
-void FormulaDlg::DoEnter(BOOL _bOk)
+void FormulaDlg::DoEnter(sal_Bool _bOk)
 {
     m_pImpl->DoEnter(_bOk);
 }
@@ -2038,17 +2042,17 @@ void FormulaDlg::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton )
 {
     m_pImpl->RefInputStartAfter( pEdit, pButton );
 }
-void FormulaDlg::RefInputDoneAfter( BOOL bForced )
+void FormulaDlg::RefInputDoneAfter( sal_Bool bForced )
 {
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-ULONG FormulaDlg::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg::FindFocusWin(Window *pWin)
 {
     return m_pImpl->FindFocusWin( pWin );
 }
 
-void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -2056,9 +2060,9 @@ void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId)
     }
     else
     {
-        USHORT nCount=pWin->GetChildCount();
+        sal_uInt16 nCount=pWin->GetChildCount();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
@@ -2093,7 +2097,7 @@ void FormulaDlg::UpdateParaWin(const Selection& _rSelection,const String& _sRefS
 {
     m_pImpl->UpdateParaWin(_rSelection,_sRefStr);
 }
-BOOL FormulaDlg::UpdateParaWin(Selection& _rSelection)
+sal_Bool FormulaDlg::UpdateParaWin(Selection& _rSelection)
 {
     return m_pImpl->UpdateParaWin(_rSelection);
 }
@@ -2119,7 +2123,7 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
     if (pData) // won't be destroyed over Close;
     {
         m_pImpl->m_pHelper->setReferenceInput(pData);
-        ULONG nUniqueId=pData->GetUniqueId();
+        rtl::OString nUniqueId(pData->GetUniqueId());
         SetFocusWin(this,nUniqueId);
     }
     return 0;
@@ -2144,8 +2148,8 @@ void FormEditData::Reset()
     nFuncSel = 0;
     nOffset = 0;
     nEdFocus = 0;
-    bMatrix	=FALSE;
-    nUniqueId=0;
+    bMatrix	=sal_False;
+    aUniqueId=rtl::OString();
     aSelection.Min()=0;
     aSelection.Max()=0;
     aUndoStr.Erase();
@@ -2174,7 +2178,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r )
     nEdFocus		= r.nEdFocus;
     aUndoStr		= r.aUndoStr;
     bMatrix			= r.bMatrix	;
-    nUniqueId		= r.nUniqueId;
+    aUniqueId		= r.aUniqueId;
     aSelection		= r.aSelection;
     return *this;
 }
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 98534e1663..7cae6b0847 100644..100755
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -70,7 +70,7 @@ long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
 
     long nResult=ListBox::PreNotify(rNEvt);
 
-    USHORT nSwitch=aNotifyEvt.GetType();
+    sal_uInt16 nSwitch=aNotifyEvt.GetType();
     if(nSwitch==EVENT_KEYINPUT)
     {
         KeyInput(*aNotifyEvt.GetKeyEvent());
@@ -82,7 +82,7 @@ long FormulaListBox::PreNotify( NotifyEvent& rNEvt )
 
 //============================================================================
 
-inline USHORT Lb2Cat( USHORT nLbPos )
+inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
 {
     // Category 0 == LRU, otherwise Categories == LbPos-1
     if ( nLbPos > 0 )
@@ -103,8 +103,8 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
     m_pFunctionManager(_pFunctionManager)
 {
     FreeResource();
-    m_aSmartHelpId = aLbFunction.GetSmartHelpId();
-    aLbFunction.SetSmartUniqueId(m_aSmartHelpId);
+    m_aHelpId = aLbFunction.GetHelpId();
+    aLbFunction.SetUniqueId(m_aHelpId);
 
     InitLRUList();
 
@@ -135,15 +135,15 @@ void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory)
 
 void FuncPage::UpdateFunctionList()
 {
-    USHORT	nSelPos	  = aLbCategory.GetSelectEntryPos();
+    sal_uInt16	nSelPos	  = aLbCategory.GetSelectEntryPos();
     const IFunctionCategory* pCategory = static_cast<const IFunctionCategory*>(aLbCategory.GetEntryData(nSelPos));
-    USHORT	nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
+    sal_uInt16	nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
                             ? Lb2Cat( nSelPos ) : 0;
 
     (void)nCategory;
 
     aLbFunction.Clear();
-    aLbFunction.SetUpdateMode( FALSE );
+    aLbFunction.SetUpdateMode( sal_False );
     //------------------------------------------------------
 
     if ( nSelPos > 0 )
@@ -178,7 +178,7 @@ void FuncPage::UpdateFunctionList()
     }
 
     //------------------------------------------------------
-    aLbFunction.SetUpdateMode( TRUE );
+    aLbFunction.SetUpdateMode( sal_True );
     aLbFunction.SelectEntryPos(0);
 
     if(IsVisible())	SelHdl(&aLbFunction);
@@ -191,15 +191,15 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
         const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() );
         if ( pDesc )
         {
-            const long nHelpId = pDesc->getHelpId();
-            if ( nHelpId )
-                aLbFunction.SetSmartHelpId(SmartId(nHelpId));
+            const rtl::OString sHelpId = pDesc->getHelpId();
+            if ( sHelpId.getLength() )
+                aLbFunction.SetHelpId(sHelpId);
         }
         aSelectionLink.Call(this);
     }
     else
     {
-        aLbFunction.SetSmartHelpId(m_aSmartHelpId);
+        aLbFunction.SetHelpId(m_aHelpId);
         UpdateFunctionList();
     }
     return 0;
@@ -211,16 +211,16 @@ IMPL_LINK( FuncPage, DblClkHdl, ListBox*, EMPTYARG )
     return 0;
 }
 
-void FuncPage::SetCategory(USHORT nCat)
+void FuncPage::SetCategory(sal_uInt16 nCat)
 {
     aLbCategory.SelectEntryPos(nCat);
     UpdateFunctionList();
 }
-USHORT FuncPage::GetFuncPos(const IFunctionDescription* _pDesc)
+sal_uInt16 FuncPage::GetFuncPos(const IFunctionDescription* _pDesc)
 {
     return aLbFunction.GetEntryPos(_pDesc);
 }
-void FuncPage::SetFunction(USHORT nFunc)
+void FuncPage::SetFunction(sal_uInt16 nFunc)
 {
     aLbFunction.SelectEntryPos(nFunc);
 }
@@ -230,17 +230,17 @@ void FuncPage::SetFocus()
     aLbFunction.GrabFocus();
 }
 
-USHORT FuncPage::GetCategory()
+sal_uInt16 FuncPage::GetCategory()
 {
     return aLbCategory.GetSelectEntryPos();
 }
 
-USHORT FuncPage::GetFunction()
+sal_uInt16 FuncPage::GetFunction()
 {
     return aLbFunction.GetSelectEntryPos();
 }
 
-USHORT FuncPage::GetFunctionEntryCount()
+sal_uInt16 FuncPage::GetFunctionEntryCount()
 {
     return aLbFunction.GetSelectEntryCount();
 }
@@ -249,7 +249,7 @@ String FuncPage::GetSelFunctionName() const
 {
     return aLbFunction.GetSelectEntry();
 }
-const IFunctionDescription*	FuncPage::GetFuncDesc( USHORT nPos ) const
+const IFunctionDescription*	FuncPage::GetFuncDesc( sal_uInt16 nPos ) const
 {
     // not pretty, but hopefully rare
     return (const IFunctionDescription*) aLbFunction.GetEntryData(nPos);
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 29b0de6299..96c68ea450 100644..100755
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -83,7 +83,7 @@ private:
                     m_pFunctionManager;
 
     ::std::vector< TFunctionDesc >	aLRUList;
-    SmartId         m_aSmartHelpId;
+    rtl::OString    m_aHelpId;
 
 
     void impl_addFunctions(const IFunctionCategory* _pCategory);
@@ -100,15 +100,15 @@ public:
 
                     FuncPage( Window* pParent,const IFunctionManager* _pFunctionManager);
 
-    void			SetCategory(USHORT nCat);
-    void			SetFunction(USHORT nFunc);
+    void			SetCategory(sal_uInt16 nCat);
+    void			SetFunction(sal_uInt16 nFunc);
     void			SetFocus();
-    USHORT			GetCategory();
-    USHORT			GetFunction();
-    USHORT			GetFunctionEntryCount();
+    sal_uInt16			GetCategory();
+    sal_uInt16			GetFunction();
+    sal_uInt16			GetFunctionEntryCount();
 
-    USHORT          GetFuncPos(const IFunctionDescription* _pDesc);
-    const IFunctionDescription*	GetFuncDesc( USHORT nPos ) const;
+    sal_uInt16          GetFuncPos(const IFunctionDescription* _pDesc);
+    const IFunctionDescription*	GetFuncDesc( sal_uInt16 nPos ) const;
     String			GetSelFunctionName() const;
 
     void            SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 79b7ea0277..0ba21a82aa 100644..100755
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -50,7 +50,7 @@ namespace formula
 ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
 {
     Font aFnt( GetFont() );
-    aFnt.SetTransparent( TRUE );
+    aFnt.SetTransparent( sal_True );
     aFnt.SetWeight( WEIGHT_LIGHT );
     if ( pParent->IsBackground() )
     {
@@ -111,7 +111,7 @@ ArgEdit::ArgEdit( Window* pParent, const ResId& rResId )
 //----------------------------------------------------------------------------
 
 void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                    ScrollBar& rArgSlider, USHORT nArgCount )
+                    ScrollBar& rArgSlider, sal_uInt16 nArgCount )
 {
     pEdPrev	= pPrevEdit;
     pEdNext	= pNextEdit;
@@ -126,8 +126,8 @@ void ArgEdit::Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
 void ArgEdit::KeyInput( const KeyEvent& rKEvt )
 {
     KeyCode		aCode	= rKEvt.GetKeyCode();
-    BOOL		bUp		= (aCode.GetCode() == KEY_UP);
-    BOOL		bDown	= (aCode.GetCode() == KEY_DOWN);
+    sal_Bool		bUp		= (aCode.GetCode() == KEY_UP);
+    sal_Bool		bDown	= (aCode.GetCode() == KEY_DOWN);
     ArgEdit*	pEd		= NULL;
 
     if (   pSlider
@@ -137,8 +137,8 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
         if ( nArgs > 1 )
         {
             long	nThumb		 = pSlider->GetThumbPos();
-            BOOL	bDoScroll	 = FALSE;
-            BOOL	bChangeFocus = FALSE;
+            sal_Bool	bDoScroll	 = sal_False;
+            sal_Bool	bChangeFocus = sal_False;
 
             if ( bDown )
             {
@@ -152,13 +152,13 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdNext;
-                        bChangeFocus = TRUE;
+                        bChangeFocus = sal_True;
                     }
                 }
                 else if ( pEdNext )
                 {
                     pEd = pEdNext;
-                    bChangeFocus = TRUE;
+                    bChangeFocus = sal_True;
                 }
             }
             else // if ( bUp )
@@ -173,13 +173,13 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
                     else
                     {
                         pEd = pEdPrev;
-                        bChangeFocus = TRUE;
+                        bChangeFocus = sal_True;
                     }
                 }
                 else if ( pEdPrev )
                 {
                     pEd = pEdPrev;
-                    bChangeFocus = TRUE;
+                    bChangeFocus = sal_True;
                 }
             }
 
@@ -744,7 +744,7 @@ EditBox::EditBox(	Window* pParent,WinBits nWinStyle)
 #************************************************************************/
 EditBox::EditBox( Window* pParent, const ResId& rResId )
         :Control(pParent,rResId),
-        bMouseFlag(FALSE)
+        bMouseFlag(sal_False)
 {
     WinBits nStyle=GetStyle();
     SetStyle( nStyle| WB_DIALOGCONTROL);
@@ -759,8 +759,8 @@ EditBox::EditBox( Window* pParent, const ResId& rResId )
 
     //	#105582# the HelpId from the resource must be set for the MultiLineEdit,
     //	not for the control that contains it.
-    pMEdit->SetSmartHelpId( GetSmartHelpId() );
-    SetSmartHelpId( SmartId() );
+    pMEdit->SetHelpId( GetHelpId() );
+    SetHelpId( "" );
 }
 
 EditBox::~EditBox()
@@ -849,15 +849,15 @@ void EditBox::GetFocus()
 #************************************************************************/
 long EditBox::PreNotify( NotifyEvent& rNEvt )
 {
-    long nResult=TRUE;
+    long nResult=sal_True;
 
     if(pMEdit==NULL) return nResult;
 
-    USHORT nSwitch=rNEvt.GetType();
+    sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP)
     {
         const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey=aKeyCode.GetCode();
+        sal_uInt16 nKey=aKeyCode.GetCode();
         if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
         {
             nResult=GetParent()->Notify(rNEvt);
@@ -875,7 +875,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt )
 
         if(nSwitch==EVENT_MOUSEBUTTONDOWN || nSwitch==EVENT_MOUSEBUTTONUP)
         {
-            bMouseFlag=TRUE;
+            bMouseFlag=sal_True;
             Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ) );
         }
     }
@@ -930,7 +930,7 @@ void EditBox::UpdateOldSel()
 RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) :
     Edit( _pParent, rResId ),
     pAnyRefDlg( pParent ),
-    bSilentFocus( FALSE )
+    bSilentFocus( sal_False )
 {
     aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) );
     aTimer.SetTimeout( SC_ENABLE_TIME );
@@ -939,7 +939,7 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
 RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
     Edit( pParent, rResId ),
     pAnyRefDlg( NULL ),
-    bSilentFocus( FALSE )
+    bSilentFocus( sal_False )
 {
 }
 
@@ -981,9 +981,9 @@ void RefEdit::StartUpdateData()
 
 void RefEdit::SilentGrabFocus()
 {
-    bSilentFocus = TRUE;
+    bSilentFocus = sal_True;
     GrabFocus();
-    bSilentFocus = FALSE;
+    bSilentFocus = sal_False;
 }
 
 void RefEdit::SetRefDialog( IControlReferenceHandler* pDlg )
diff --git a/formula/source/ui/dlg/makefile.mk b/formula/source/ui/dlg/makefile.mk
index 688e169d26..688e169d26 100644..100755
--- a/formula/source/ui/dlg/makefile.mk
+++ b/formula/source/ui/dlg/makefile.mk
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 597959d95a..767d1353e6 100644..100755
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -57,30 +57,30 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aFtArgName		( this, ModuleRes( FT_PARNAME ) ),
     aFtArgDesc		( this, ModuleRes( FT_PARDESC ) ),
 
+    aBtnFx1 		( this, ModuleRes( BTN_FX1 ) ),
     aFtArg1 		( this, ModuleRes( FT_ARG1 ) ),
-    aFtArg2 		( this, ModuleRes( FT_ARG2 ) ),
-    aFtArg3 		( this, ModuleRes( FT_ARG3 ) ),
-    aFtArg4 		( this, ModuleRes( FT_ARG4 ) ),
+    aEdArg1 		( this, ModuleRes( ED_ARG1 ) ),
+    aRefBtn1		( this, ModuleRes( RB_ARG1 ) ),
 
-    aBtnFx1 		( this, ModuleRes( BTN_FX1 ) ),
     aBtnFx2 		( this, ModuleRes( BTN_FX2 ) ),
-    aBtnFx3 		( this, ModuleRes( BTN_FX3 ) ),
-    aBtnFx4 		( this, ModuleRes( BTN_FX4 ) ),
-
-    aEdArg1 		( this, ModuleRes( ED_ARG1 ) ),
+    aFtArg2 		( this, ModuleRes( FT_ARG2 ) ),
     aEdArg2 		( this, ModuleRes( ED_ARG2 ) ),
-    aEdArg3 		( this, ModuleRes( ED_ARG3 ) ),
-    aEdArg4 		( this, ModuleRes( ED_ARG4 ) ),
-
-    aRefBtn1		( this, ModuleRes( RB_ARG1 ) ),
     aRefBtn2		( this, ModuleRes( RB_ARG2 ) ),
+
+    aBtnFx3 		( this, ModuleRes( BTN_FX3 ) ),
+    aFtArg3 		( this, ModuleRes( FT_ARG3 ) ),
+    aEdArg3 		( this, ModuleRes( ED_ARG3 ) ),
     aRefBtn3		( this, ModuleRes( RB_ARG3 ) ),
+
+    aBtnFx4 		( this, ModuleRes( BTN_FX4 ) ),
+    aFtArg4 		( this, ModuleRes( FT_ARG4 ) ),
+    aEdArg4 		( this, ModuleRes( ED_ARG4 ) ),
     aRefBtn4		( this, ModuleRes( RB_ARG4 ) ),
 
     aSlider 		( this, ModuleRes( WND_SLIDER ) ),
     m_sOptional     ( ModuleRes( STR_OPTIONAL ) ),
     m_sRequired     ( ModuleRes( STR_REQUIRED ) ),
-    bRefMode		(FALSE)
+    bRefMode		(sal_False)
 {
     FreeResource();
     aDefaultString=aFtEditDesc.GetText();
@@ -101,13 +101,13 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     ClearAll();
 }
 
-void ParaWin::UpdateArgDesc( USHORT nArg )
+void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
 {
     if (nArg==NOT_FOUND) return;
 
     if ( nArgs > 4 )
-        nArg = sal::static_int_cast<USHORT>( nArg + GetSliderPos() );
-        //@ nArg += (USHORT)aSlider.GetThumbPos();
+        nArg = sal::static_int_cast<sal_uInt16>( nArg + GetSliderPos() );
+        //@ nArg += (sal_uInt16)aSlider.GetThumbPos();
 
     if ( (nArgs > 0) && (nArg<nArgs) )
     {
@@ -119,7 +119,7 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
 
         if ( nArgs < VAR_ARGS )
         {
-            USHORT nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
+            sal_uInt16 nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
             aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
             aArgName  = pFuncDesc->getParameterName(nRealArg);
             aArgName += ' ';
@@ -127,9 +127,9 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
         }
         else
         {
-            USHORT nFix = nArgs - VAR_ARGS;
-            USHORT nPos = ( nArg < nFix ? nArg : nFix );
-            USHORT nRealArg = (nPos < aVisibleArgMapping.size() ?
+            sal_uInt16 nFix = nArgs - VAR_ARGS;
+            sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
+            sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
                     aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
             aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
             aArgName  = pFuncDesc->getParameterName(nRealArg);
@@ -145,14 +145,14 @@ void ParaWin::UpdateArgDesc( USHORT nArg )
     }
 }
 
-void ParaWin::UpdateArgInput( USHORT nOffset, USHORT i )
+void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
 {
-    USHORT nArg = nOffset + i;
+    sal_uInt16 nArg = nOffset + i;
     if ( nArgs < VAR_ARGS)
     {
         if(nArg<nArgs)
         {
-            USHORT nRealArg = aVisibleArgMapping[nArg];
+            sal_uInt16 nRealArg = aVisibleArgMapping[nArg];
             SetArgNameFont	(i,(pFuncDesc->isParameterOptional(nRealArg))
                                             ? aFntLight : aFntBold );
             SetArgName		(i,pFuncDesc->getParameterName(nRealArg));
@@ -160,9 +160,9 @@ void ParaWin::UpdateArgInput( USHORT nOffset, USHORT i )
     }
     else
     {
-        USHORT nFix = nArgs - VAR_ARGS;
-        USHORT nPos = ( nArg < nFix ? nArg : nFix );
-        USHORT nRealArg = (nPos < aVisibleArgMapping.size() ?
+        sal_uInt16 nFix = nArgs - VAR_ARGS;
+        sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
+        sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
                 aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
         SetArgNameFont( i,
                 (nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ?
@@ -192,12 +192,12 @@ ParaWin::~ParaWin()
     aBtnFx4.SetGetFocusHdl( aEmptyLink );
 }
 
-USHORT ParaWin::GetActiveLine()
+sal_uInt16 ParaWin::GetActiveLine()
 {
     return nActiveLine;
 }
 
-void ParaWin::SetActiveLine(USHORT no)
+void ParaWin::SetActiveLine(sal_uInt16 no)
 {
     if(no<nArgs)
     {
@@ -207,10 +207,10 @@ void ParaWin::SetActiveLine(USHORT no)
         if(nNewEdPos<0 || nNewEdPos>3)
         {
             nOffset+=nNewEdPos;
-            SetSliderPos((USHORT) nOffset);
+            SetSliderPos((sal_uInt16) nOffset);
             nOffset=GetSliderPos();
         }
-        nEdFocus=no-(USHORT)nOffset;
+        nEdFocus=no-(sal_uInt16)nOffset;
         UpdateArgDesc( nEdFocus );
     }
 }
@@ -228,7 +228,7 @@ RefEdit* ParaWin::GetActiveEdit()
 }
 
 
-String ParaWin::GetArgument(USHORT no)
+String ParaWin::GetArgument(sal_uInt16 no)
 {
     String aStr;
     if(no<aParaArray.size())
@@ -251,7 +251,7 @@ String	ParaWin::GetActiveArgName()
 }
 
 
-void ParaWin::SetArgument(USHORT no, const String& aString)
+void ParaWin::SetArgument(sal_uInt16 no, const String& aString)
 {
     if(no<aParaArray.size())
     {
@@ -289,15 +289,15 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
         {
             SetEditDesc(aDefaultString);
         }
-        long nHelpId = pFuncDesc->getHelpId();
         nArgs = pFuncDesc->getSuppressedArgumentCount();
         pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
         aSlider.Hide();
-        SetHelpId( nHelpId );
-        aEdArg1.SetHelpId( nHelpId );
-        aEdArg2.SetHelpId( nHelpId );
-        aEdArg3.SetHelpId( nHelpId );
-        aEdArg4.SetHelpId( nHelpId );
+        rtl::OString sHelpId = pFuncDesc->getHelpId();
+        SetHelpId( sHelpId );
+        aEdArg1.SetHelpId( sHelpId );
+        aEdArg2.SetHelpId( sHelpId );
+        aEdArg3.SetHelpId( sHelpId );
+        aEdArg4.SetHelpId( sHelpId );
 
         //	Unique-IDs muessen gleich bleiben fuer Automatisierung
         SetUniqueId( HID_FORMULA_FAP_PAGE );
@@ -329,32 +329,32 @@ void ParaWin::SetEditDesc(const String& aText)
     aFtEditDesc.SetText(aText);
 }
 
-void ParaWin::SetArgName(USHORT no,const String& aText)
+void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
 {
     aArgInput[no].SetArgName(aText);
 }
 
-void ParaWin::SetArgNameFont(USHORT no,const Font& aFont)
+void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
 {
     aArgInput[no].SetArgNameFont(aFont);
 }
 
-void ParaWin::SetArgVal(USHORT no,const String& aText)
+void ParaWin::SetArgVal(sal_uInt16 no,const String& aText)
 {
     aArgInput[no].SetArgVal(aText);
 }
 
-void ParaWin::HideParaLine(USHORT no)
+void ParaWin::HideParaLine(sal_uInt16 no)
 {
     aArgInput[no].Hide();
 }
 
-void ParaWin::ShowParaLine(USHORT no)
+void ParaWin::ShowParaLine(sal_uInt16 no)
 {
     aArgInput[no].Show();
 }
 
-void ParaWin::SetEdFocus(USHORT no)
+void ParaWin::SetEdFocus(sal_uInt16 no)
 {
     UpdateArgDesc(no);
     if(no<4 && no<aParaArray.size())
@@ -362,7 +362,7 @@ void ParaWin::SetEdFocus(USHORT no)
 }
 
 
-void ParaWin::InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx,
                         ArgEdit& rEdArg, RefButton& rRefBtn)
 {
 
@@ -385,7 +385,7 @@ void ParaWin::ClearAll()
     SetArgumentOffset(0);
 }
 
-void ParaWin::SetArgumentOffset(USHORT nOffset)
+void ParaWin::SetArgumentOffset(sal_uInt16 nOffset)
 {
     DelParaArray();
     aSlider.SetThumbPos(0);
@@ -425,8 +425,8 @@ void ParaWin::SetArgumentOffset(USHORT nOffset)
 
 void ParaWin::UpdateParas()
 {
-    USHORT i;
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 i;
+    sal_uInt16 nOffset = GetSliderPos();
 
     if ( nArgs > 0 )
     {
@@ -441,19 +441,19 @@ void ParaWin::UpdateParas()
 }
 
 
-USHORT ParaWin::GetSliderPos()
+sal_uInt16 ParaWin::GetSliderPos()
 {
-    return (USHORT) aSlider.GetThumbPos();
+    return (sal_uInt16) aSlider.GetThumbPos();
 }
 
-void ParaWin::SetSliderPos(USHORT nSliderPos)
+void ParaWin::SetSliderPos(sal_uInt16 nSliderPos)
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
 
     if(aSlider.IsVisible() && nOffset!=nSliderPos)
     {
         aSlider.SetThumbPos(nSliderPos);
-        for ( USHORT i=0; i<4; i++ )
+        for ( sal_uInt16 i=0; i<4; i++ )
         {
             UpdateArgInput( nSliderPos, i );
         }
@@ -462,9 +462,9 @@ void ParaWin::SetSliderPos(USHORT nSliderPos)
 
 void ParaWin::SliderMoved()
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
 
-    for ( USHORT i=0; i<4; i++ )
+    for ( sal_uInt16 i=0; i<4; i++ )
     {
         UpdateArgInput( nOffset, i );
     }
@@ -491,9 +491,9 @@ void ParaWin::FxClick()
 
 IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -513,9 +513,9 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
 
 IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -537,9 +537,9 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
 
 IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
@@ -569,9 +569,9 @@ IMPL_LINK( ParaWin, ScrollHdl, ScrollBar*, EMPTYARG )
 
 IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr )
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
-    for ( USHORT nPos=0; nPos<5;nPos++)
+    for ( sal_uInt16 nPos=0; nPos<5;nPos++)
     {
         if(pPtr == &aArgInput[nPos])
         {
diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index 2f8ec808a6..2f8ec808a6 100644..100755
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.hrc
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 5aedaa367c..adb9d26739 100644..100755
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -58,10 +58,10 @@ private:
         Link			aFxLink;
         Link			aArgModifiedLink;
 
-        ::std::vector<USHORT>   aVisibleArgMapping;
+        ::std::vector<sal_uInt16>   aVisibleArgMapping;
         const IFunctionDescription*	pFuncDesc;
         IControlReferenceHandler*	pMyParent;
-        USHORT			nArgs;      // unsuppressed arguments
+        sal_uInt16			nArgs;      // unsuppressed arguments
         Font			aFntBold;
         Font			aFntLight;
 
@@ -69,33 +69,33 @@ private:
         FixedText		aFtArgName;
         FixedInfo		aFtArgDesc;
 
+        ImageButton		aBtnFx1;
         FixedText		aFtArg1;
-        FixedText		aFtArg2;
-        FixedText		aFtArg3;
-        FixedText		aFtArg4;
+        ArgEdit			aEdArg1;
+        RefButton		aRefBtn1;
 
-        ImageButton		aBtnFx1;
         ImageButton		aBtnFx2;
-        ImageButton		aBtnFx3;
-        ImageButton		aBtnFx4;
-
-        ArgEdit			aEdArg1;
+        FixedText		aFtArg2;
         ArgEdit			aEdArg2;
+        RefButton		aRefBtn2;
+
+        ImageButton		aBtnFx3;
+        FixedText		aFtArg3;
         ArgEdit			aEdArg3;
-        ArgEdit			aEdArg4;
+        RefButton		aRefBtn3;
 
-        RefButton	aRefBtn1;
-        RefButton	aRefBtn2;
-        RefButton	aRefBtn3;
-        RefButton	aRefBtn4;
+        ImageButton		aBtnFx4;
+        FixedText		aFtArg4;
+        ArgEdit			aEdArg4;
+        RefButton		aRefBtn4;
 
         ScrollBar		aSlider;
         String          m_sOptional;
         String          m_sRequired;
-        BOOL			bRefMode;
+        sal_Bool			bRefMode;
 
-        USHORT			nEdFocus;
-        USHORT			nActiveLine;
+        sal_uInt16			nEdFocus;
+        sal_uInt16			nActiveLine;
 
         ArgInput		aArgInput[4];
         String			aDefaultString;
@@ -114,7 +114,7 @@ protected:
         virtual void	ArgumentModified();
         virtual void	FxClick();
 
-        void			InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+        void			InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx,
                                         ArgEdit& rEdArg, RefButton& rRefBtn);
 
         void			DelParaArray();
@@ -122,40 +122,40 @@ protected:
         void			SetArgumentText(const String& aText);
 
 
-        void			SetArgName		(USHORT no,const String &aArg);
-        void			SetArgNameFont	(USHORT no,const Font&);
-        void			SetArgVal		(USHORT no,const String &aArg);
+        void			SetArgName		(sal_uInt16 no,const String &aArg);
+        void			SetArgNameFont	(sal_uInt16 no,const Font&);
+        void			SetArgVal		(sal_uInt16 no,const String &aArg);
 
-        void			HideParaLine(USHORT no);
-        void			ShowParaLine(USHORT no);
-        void			UpdateArgDesc( USHORT nArg );
-        void			UpdateArgInput( USHORT nOffset, USHORT i );
+        void			HideParaLine(sal_uInt16 no);
+        void			ShowParaLine(sal_uInt16 no);
+        void			UpdateArgDesc( sal_uInt16 nArg );
+        void			UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i );
 
 public:
                         ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos);
                         ~ParaWin();
 
         void			SetFunctionDesc(const IFunctionDescription* pFDesc);
-        void			SetArgumentOffset(USHORT nOffset);
+        void			SetArgumentOffset(sal_uInt16 nOffset);
         void	    	SetEditDesc(const String& aText);
         void			UpdateParas();
         void			ClearAll();
 
-        BOOL			IsRefMode() {return bRefMode;}
-        void			SetRefMode(BOOL bFlag) {bRefMode=bFlag;}
+        sal_Bool			IsRefMode() {return bRefMode;}
+        void			SetRefMode(sal_Bool bFlag) {bRefMode=bFlag;}
 
-        USHORT	    	GetActiveLine();
-        void			SetActiveLine(USHORT no);
+        sal_uInt16	    	GetActiveLine();
+        void			SetActiveLine(sal_uInt16 no);
         RefEdit*		GetActiveEdit();
         String			GetActiveArgName();
 
-        String			GetArgument(USHORT no);
-        void			SetArgument(USHORT no, const String& aString);
+        String			GetArgument(sal_uInt16 no);
+        void			SetArgument(sal_uInt16 no, const String& aString);
         void			SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
 
-        void			SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen
-        USHORT			GetSliderPos();
-        void			SetSliderPos(USHORT nSliderPos);
+        void			SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
+        sal_uInt16			GetSliderPos();
+        void			SetSliderPos(sal_uInt16 nSliderPos);
 
         void            SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; }
         const Link&     GetScrollHdl() const { return aScrollLink; }
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 7fff42bc9c..de099ae31e 100644..100755
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -68,6 +68,7 @@
 
 TabPage RID_FORMULATAB_PARAMETER
 {
+    HelpID = "formula:TabPage:RID_FORMULATAB_PARAMETER";
     Border	= FALSE;
     Size	= MAP_APPFONT( 203, 128 );
     DialogControl        = TRUE;
@@ -119,10 +120,18 @@ TabPage RID_FORMULATAB_PARAMETER
         HelpId=HID_FORMULA_FAP_BTN_FX4;
         FXBUTTONBLOCK ( 109 )
     };
-    Edit ED_ARG1 { ED_ARGBLOCK (  64 ) };
-    Edit ED_ARG2 { ED_ARGBLOCK (  79 ) };
-    Edit ED_ARG3 { ED_ARGBLOCK (  94 ) };
-    Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) };
+    Edit ED_ARG1 { ED_ARGBLOCK (  64 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG1";
+    };
+    Edit ED_ARG2 { ED_ARGBLOCK (  79 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG2";
+    };
+    Edit ED_ARG3 { ED_ARGBLOCK (  94 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG3";
+    };
+    Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) 
+        HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG4";
+    };
 
     ImageButton RB_ARG1
     {
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 7ef6743ba1..169aa099e2 100644..100755
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -50,7 +50,7 @@ namespace formula
 StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
     SvTreeListBox(pParent,rResId )
 {
-    bActiveFlag=FALSE;
+    bActiveFlag=sal_False;
 
     Font aFont( GetFont() );
     Size aSize = aFont.GetSize();
@@ -62,37 +62,37 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
 SvLBoxEntry* StructListBox::InsertStaticEntry(
         const XubString& rText,
         const Image& rEntryImg,
-        SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken )
+        SvLBoxEntry* pParent, sal_uLong nPos, IFormulaToken* pToken )
 {
-    SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken );
+    SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken );
     return pEntry;
 }
 
-void StructListBox::SetActiveFlag(BOOL bFlag)
+void StructListBox::SetActiveFlag(sal_Bool bFlag)
 {
     bActiveFlag=bFlag;
 }
 
-BOOL StructListBox::GetActiveFlag()
+sal_Bool StructListBox::GetActiveFlag()
 {
     return bActiveFlag;
 }
 
 void StructListBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    bActiveFlag=TRUE;
+    bActiveFlag=sal_True;
     SvTreeListBox::MouseButtonDown(rMEvt);
 }
 
 void StructListBox::GetFocus()
 {
-    bActiveFlag=TRUE;
+    bActiveFlag=sal_True;
     SvTreeListBox::GetFocus();
 }
 
 void StructListBox::LoseFocus()
 {
-    bActiveFlag=FALSE;
+    bActiveFlag=sal_False;
     SvTreeListBox::LoseFocus();
 }
 
@@ -107,7 +107,7 @@ StructPage::StructPage(Window* pParent):
     maImgError      ( ModuleRes( BMP_STR_ERROR ) ),
     pSelectedToken	( NULL )
 {
-    aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|
+    aTlbStruct.SetStyle(aTlbStruct.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|
                         WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION);
 
     aTlbStruct.SetNodeDefaultImages();
@@ -121,20 +121,20 @@ StructPage::StructPage(Window* pParent):
 
 void StructPage::ClearStruct()
 {
-    aTlbStruct.SetActiveFlag(FALSE);
+    aTlbStruct.SetActiveFlag(sal_False);
     aTlbStruct.Clear();
 }
 
 SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
-                                       USHORT nFlag,ULONG nPos,IFormulaToken* pIFormulaToken)
+                                       sal_uInt16 nFlag,sal_uLong nPos,IFormulaToken* pIFormulaToken)
 {
-    aTlbStruct.SetActiveFlag( FALSE );
+    aTlbStruct.SetActiveFlag( sal_False );
 
     SvLBoxEntry* pEntry = NULL;
     switch( nFlag )
     {
         case STRUCT_FOLDER:
-            pEntry = aTlbStruct.InsertEntry( rText, pParent, FALSE, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertEntry( rText, pParent, sal_False, nPos, pIFormulaToken );
         break;
         case STRUCT_END:
             pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, pParent, nPos, pIFormulaToken );
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 2aadec072b..967d789433 100644..100755
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -50,7 +50,7 @@ class	StructListBox : public SvTreeListBox
 {
 private:
 
-    BOOL			bActiveFlag;
+    sal_Bool			bActiveFlag;
 
 protected:
                     virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -64,11 +64,11 @@ public:
                         const XubString& rText,
                         const Image& rEntryImg,
                         SvLBoxEntry* pParent = NULL,
-                        ULONG nPos = LIST_APPEND,
+                        sal_uLong nPos = LIST_APPEND,
                         IFormulaToken* pToken = NULL );
 
-    void			SetActiveFlag(BOOL bFlag=TRUE);
-    BOOL			GetActiveFlag();
+    void			SetActiveFlag(sal_Bool bFlag=sal_True);
+    sal_Bool			GetActiveFlag();
     void			GetFocus();
     void			LoseFocus();
 };
@@ -103,7 +103,7 @@ public:
 
     void			ClearStruct();
     virtual SvLBoxEntry*	InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
-                                USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL);
+                                sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL);
 
     virtual String	        GetEntryText(SvLBoxEntry* pEntry) const;
     virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const;
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index afa944f25d..afa944f25d 100644..100755
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 9eddf04eb9..b0ff5fcc95 100644..100755
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -89,7 +89,7 @@ namespace formula
     class FORMULA_DLLPUBLIC ModuleRes : public ::ResId
     {
     public:
-        ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
     };
 //.........................................................................
 }	// namespace formula
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index d76c0cd85f..d76c0cd85f 100644..100755
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
diff --git a/formula/source/ui/resource/makefile.mk b/formula/source/ui/resource/makefile.mk
index fd6a5351ba..fd6a5351ba 100644..100755
--- a/formula/source/ui/resource/makefile.mk
+++ b/formula/source/ui/resource/makefile.mk
diff --git a/formula/util/for.component b/formula/util/for.component
new file mode 100755
index 0000000000..99a1adfbf9
--- /dev/null
+++ b/formula/util/for.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="simple.formula.FormulaOpCodeMapperObj">
+    <service name="com.sun.star.sheet.FormulaOpCodeMapper"/>
+  </implementation>
+</component>
diff --git a/formula/util/hh.html b/formula/util/hh.html
index bf2b04ac3f..bf2b04ac3f 100644..100755
--- a/formula/util/hh.html
+++ b/formula/util/hh.html
diff --git a/formula/util/hidother.src b/formula/util/hidother.src
index 8f56afa1cd..a6d3111b5b 100644..100755
--- a/formula/util/hidother.src
+++ b/formula/util/hidother.src
@@ -27,10 +27,6 @@
 
 #include "../inc/helpids.hrc"
 
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
-
 hidspecial HID_FORMULADLG_FORMULA   { HelpId = HID_FORMULADLG_FORMULA; };
 hidspecial HID_FORMULA_FAP_FORMULA  { HelpId = HID_FORMULA_FAP_FORMULA; };
 hidspecial HID_FORMULA_FAP_STRUCT   { HelpId = HID_FORMULA_FAP_STRUCT; };
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index 7ae30b007d..3c6f91f607 100644..100755
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -136,3 +136,11 @@ RESLIB2SRSFILES=$(RES2FILELIST)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/for.component
+
+$(MISC)/for.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        for.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt for.component
diff --git a/formula/util/makefile.pmk b/formula/util/makefile.pmk
index db2375e917..db2375e917 100644..100755
--- a/formula/util/makefile.pmk
+++ b/formula/util/makefile.pmk
diff --git a/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
index 8d04d47bc3..8d04d47bc3 100644..100755
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/inc/makefile.mk
diff --git a/fpicker/inc/pch/precompiled_fpicker.cxx b/fpicker/inc/pch/precompiled_fpicker.cxx
index 01ecffffe7..01ecffffe7 100644..100755
--- a/fpicker/inc/pch/precompiled_fpicker.cxx
+++ b/fpicker/inc/pch/precompiled_fpicker.cxx
diff --git a/fpicker/inc/pch/precompiled_fpicker.hxx b/fpicker/inc/pch/precompiled_fpicker.hxx
index 98d92fffdf..98d92fffdf 100644..100755
--- a/fpicker/inc/pch/precompiled_fpicker.hxx
+++ b/fpicker/inc/pch/precompiled_fpicker.hxx
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 04872c5354..75459777d8 100644..100755
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,4 +1,4 @@
-fp	fpicker	:    l10n rdbmaker svtools NULL
+fp	fpicker	: LIBXSLT:libxslt L10N:l10n rdbmaker svtools NULL
 fp	fpicker\inc							nmake	-	all	fp_inc NULL
 fp	fpicker\source\generic				nmake	-	all	fp_generic fp_inc NULL
 fp	fpicker\source\office				nmake	-	all	fp_office fp_inc NULL
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index 33035f34c7..f16a913f3c 100644..100755
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -10,7 +10,10 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 
 ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\unx\gnome\fps-gnome-ucd.txt %_DEST%\bin%_EXT%\fps-gnome-ucd.txt
-..\source\unx\kde4\fps-kde4-ucd.txt %_DEST%\bin%_EXT%\fps-kde4-ucd.txt
-..\source\aqua\fps-aqua-ucd.txt %_DEST%\bin%_EXT%\fps-aqua-ucd.txt
-..\source\unx\kde_unx\fps-kde-ucd.txt %_DEST%\bin%_EXT%\fps-kde-ucd.txt
+..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
+..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
+..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
+..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
+..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
+..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
+..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index b7bea762af..e3afccb814 100644..100755
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -46,7 +46,7 @@ class FilterHelper;
 
 - (void)setFilterHelper:(FilterHelper*)filterHelper;
 
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
 - (void)panelSelectionDidChange:(id)sender;
 - (void)panel:(id)sender directoryDidChange:(NSString *)path;
 
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 4266453a71..d5c9062814 100644..100755
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -56,7 +56,7 @@
 
 #pragma mark NSSavePanel delegate methods
 
-- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
 {
     if( filterHelper == NULL )
         return true;
diff --git a/fpicker/source/aqua/CFStringUtilities.cxx b/fpicker/source/aqua/CFStringUtilities.cxx
index 06fa7fc949..06fa7fc949 100644..100755
--- a/fpicker/source/aqua/CFStringUtilities.cxx
+++ b/fpicker/source/aqua/CFStringUtilities.cxx
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 09f3dadcd2..09f3dadcd2 100644..100755
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
diff --git a/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index c7ac6fdb7d..de224e3191 100644..100755
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -341,8 +341,8 @@ void ControlHelper::createUserPane()
     int currentHeight = kAquaSpaceBoxFrameViewDiffTop + kAquaSpaceBoxFrameViewDiffBottom;
     int currentWidth = 300;
     
-    BOOL bPopupControlPresent = NO;
-    BOOL bButtonControlPresent = NO;
+    sal_Bool bPopupControlPresent = NO;
+    sal_Bool bButtonControlPresent = NO;
     
     int nCheckboxMaxWidth = 0;
     int nPopupMaxWidth = 0;
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index 145ba707f4..145ba707f4 100644..100755
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
diff --git a/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index 57de03afa7..57de03afa7 100644..100755
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 213ef9f513..9e08ef84fa 100644..100755
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -80,32 +80,6 @@ void SAL_CALL component_getImplementationEnvironment(
 //
 //------------------------------------------------
 
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
-            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ));
-        }
-        catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "InvalidRegistryException caught" );
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
 void* SAL_CALL component_getFactory(
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index c67d1e8565..c67d1e8565 100644..100755
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index e4e6cb7bc1..e4e6cb7bc1 100644..100755
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index a3f141bbe1..a3f141bbe1 100644..100755
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index 6707cff4c8..6707cff4c8 100644..100755
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.mm
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index 5198db8466..5198db8466 100644..100755
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index ecc38b7e23..6be80a7652 100644..100755
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -92,8 +92,8 @@ NSString* resolveAlias( NSString* i_pSystemPath )
         FSRef rFS;
         if( CFURLGetFSRef( rUrl, &rFS ) )
         {
-            MacOSBoolean bIsFolder = false;
-            MacOSBoolean bAlias = false;
+            Boolean bIsFolder = false;
+            Boolean bAlias = false;
             OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias);
             if( (err == noErr) && bAlias )
             {
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index 30db99b9af..30db99b9af 100644..100755
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index ea798295c7..ea798295c7 100644..100755
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index cc08f96581..cc08f96581 100644..100755
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index bad373aec8..bad373aec8 100644..100755
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 8922f77d7b..8922f77d7b 100644..100755
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index c970b35740..c970b35740 100644..100755
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index e39709abb6..e39709abb6 100644..100755
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
diff --git a/fpicker/source/aqua/fps-aqua-ucd.txt b/fpicker/source/aqua/fps-aqua-ucd.txt
deleted file mode 100644
index d71e8f4a57..0000000000
--- a/fpicker/source/aqua/fps-aqua-ucd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalAquaFilePicker
-ComponentName=fps_aqua.uno.dylib
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.AquaFilePicker
-
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalAquaFolderPicker
-ComponentName=fps_aqua.uno.dylib
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.AquaFolderPicker
diff --git a/fpicker/source/aqua/fps_aqua.component b/fpicker/source/aqua/fps_aqua.component
new file mode 100755
index 0000000000..a04443e37f
--- /dev/null
+++ b/fpicker/source/aqua/fps_aqua.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.ui.dialogs.SalAquaFilePicker">
+    <service name="com.sun.star.ui.dialogs.AquaFilePicker"/>
+  </implementation>
+  <implementation name="com.sun.star.ui.dialogs.SalAquaFolderPicker">
+    <service name="com.sun.star.ui.dialogs.AquaFolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/aqua/fps_aqua.xml b/fpicker/source/aqua/fps_aqua.xml
index 955ad4e328..955ad4e328 100644..100755
--- a/fpicker/source/aqua/fps_aqua.xml
+++ b/fpicker/source/aqua/fps_aqua.xml
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index 10990e22d5..ff0473c8a7 100644..100755
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -83,3 +83,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/fps_aqua.component
+
+$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps_aqua.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 8681492be3..8681492be3 100644..100755
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index fb0007ba12..fb0007ba12 100644..100755
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component
new file mode 100755
index 0000000000..7d44d006d9
--- /dev/null
+++ b/fpicker/source/generic/fpicker.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.fpicker.FilePicker">
+    <service name="com.sun.star.ui.dialogs.FilePicker"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.fpicker.FolderPicker">
+    <service name="com.sun.star.ui.dialogs.FolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 867ed729ff..83f336b593 100644..100755
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -233,13 +233,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * pServiceManager, void * pRegistryKey)
-{
-    return cppu::component_writeInfoHelper (
-        pServiceManager, pRegistryKey, g_entries);
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
index f426bd7ad7..29f900ac41 100644..100755
--- a/fpicker/source/generic/makefile.mk
+++ b/fpicker/source/generic/makefile.mk
@@ -61,3 +61,11 @@ DEF1NAME=	$(SHL1TARGET)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/fpicker.component
+
+$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fpicker.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fpicker.component
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
index 80b767dd91..80b767dd91 100644..100755
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
diff --git a/fpicker/source/odma/ODMAFilePicker.hxx b/fpicker/source/odma/ODMAFilePicker.hxx
index bb389d8cb8..bb389d8cb8 100644..100755
--- a/fpicker/source/odma/ODMAFilePicker.hxx
+++ b/fpicker/source/odma/ODMAFilePicker.hxx
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index 15490f4503..15490f4503 100644..100755
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
diff --git a/fpicker/source/odma/ODMAFolderPicker.hxx b/fpicker/source/odma/ODMAFolderPicker.hxx
index 880d5a5345..880d5a5345 100644..100755
--- a/fpicker/source/odma/ODMAFolderPicker.hxx
+++ b/fpicker/source/odma/ODMAFolderPicker.hxx
diff --git a/fpicker/source/odma/exports.map b/fpicker/source/odma/exports.map
index f4ed78b9e9..f4ed78b9e9 100644..100755
--- a/fpicker/source/odma/exports.map
+++ b/fpicker/source/odma/exports.map
diff --git a/fpicker/source/odma/fps_odma.cxx b/fpicker/source/odma/fps_odma.cxx
index 6d7642ca06..6d7642ca06 100644..100755
--- a/fpicker/source/odma/fps_odma.cxx
+++ b/fpicker/source/odma/fps_odma.cxx
diff --git a/fpicker/source/odma/makefile.mk b/fpicker/source/odma/makefile.mk
index 3cc62d6f94..3cc62d6f94 100644..100755
--- a/fpicker/source/odma/makefile.mk
+++ b/fpicker/source/odma/makefile.mk
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 4e77054ead..a68f9ce957 100644..100755
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <tools/urlobj.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -201,37 +202,36 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView )
+    void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView )
     {
-        String sHelpURL( _rURL );
-        if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
-        {
-            String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
-            sal_Int32 nHelpId = sID.ToInt32();
+        rtl::OUString sHelpID( sHelpURL );
+        INetURLObject aHID( sHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+              sHelpID = aHID.GetURLPath();
 
-            if ( _bFileView )
-                // the file view "overloaded" the SetHelpId
-                static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId );
-            else
-                _pControl->SetHelpId( nHelpId );
-        }
+        // URLs should always be UTF8 encoded and escaped
+        rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
+        if ( _bFileView )
+            // the file view "overloaded" the SetHelpId
+            static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
         else
-        {
-            DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" );
-        }
+            _pControl->SetHelpId( sID );
     }
 
     //---------------------------------------------------------------------
     ::rtl::OUString	OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
     {
-        sal_Int32 nHelpId = _pControl->GetHelpId();
+        rtl::OString aHelpId = _pControl->GetHelpId();
         if ( _bFileView )
             // the file view "overloaded" the SetHelpId
-            nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
-
-        ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
-        sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId );
-
+            aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
+
+        ::rtl::OUString sHelpURL;
+        ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+        INetURLObject aHID( aTmp );
+        if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+            sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME );
+        sHelpURL += aTmp;
         return sHelpURL;
     }
 
@@ -539,7 +539,7 @@ namespace svt
             {
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
-                    _pListbox->RemoveEntry( (USHORT) nPos );
+                    _pListbox->RemoveEntry( (sal_uInt16) nPos );
             }
             break;
 
@@ -677,7 +677,7 @@ namespace svt
                 sal_Int32 nPos = 0;
                 if ( _rValue >>= nPos )
                 {
-                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (USHORT) nPos );
+                    static_cast< ListBox* >( _pControl )->SelectEntryPos( (sal_uInt16) nPos );
                 }
                 else if ( !_bIgnoreIllegalArgument )
                 {
@@ -739,7 +739,7 @@ namespace svt
 
                 Sequence< ::rtl::OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
                 ::rtl::OUString* pItems = aItems.getArray();
-                for ( USHORT i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
+                for ( sal_uInt16 i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
                     *pItems++ = static_cast< ListBox* >( _pControl )->GetEntry( i );
 
                 aReturn <<= aItems;
@@ -751,7 +751,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 ::rtl::OUString sSelected;
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     sSelected = static_cast< ListBox* >( _pControl )->GetSelectEntry();
@@ -764,7 +764,7 @@ namespace svt
                 DBG_ASSERT( WINDOW_LISTBOX == _pControl->GetType(),
                     "OControlAccess::implGetControlProperty: invalid control/property combination!" );
 
-                USHORT nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+                sal_uInt16 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
                     aReturn <<= (sal_Int32)static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
                 else
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 5341d9529d..5341d9529d 100644..100755
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 0114762b25..32621d3b5c 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -476,7 +476,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
 
     prepareExecute();
 
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     // now we are ready to execute the dialog
     sal_Int16 nRet = getDialog()->Execute();
 
@@ -548,7 +548,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta
     m_xDlgClosedListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) );
 }
 
@@ -624,8 +624,8 @@ Sequence< rtl::OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeExcep
     // files first and then the list of the selected entries
 
     SvStringsDtor* pPathList = getDialog()->GetPathList();
-    USHORT i, nCount = pPathList->Count();
-    USHORT nTotal = nCount > 1 ? nCount+1: nCount;
+    sal_uInt16 i, nCount = pPathList->Count();
+    sal_uInt16 nTotal = nCount > 1 ? nCount+1: nCount;
 
     Sequence< rtl::OUString > aPath( nTotal );
 
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index ebea3196ed..53b53cd897 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include "commonpicker.hxx"
 #include "pickercallbacks.hxx"
 
diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index a527e5165f..a527e5165f 100644..100755
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.src
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index f158a89092..ad8ac8e731 100644..100755
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -109,7 +109,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s
     m_xListener = xListener;
     prepareDialog();
     prepareExecute();
-    getDialog()->EnableAutocompletion( TRUE );
+    getDialog()->EnableAutocompletion( sal_True );
     getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) );
 }
 
@@ -125,7 +125,7 @@ sal_Int16 SvtFolderPicker::implExecutePicker( )
     prepareExecute();
 
     // now we are ready to execute the dialog
-    getDialog()->EnableAutocompletion( FALSE );
+    getDialog()->EnableAutocompletion( sal_False );
     sal_Int16 nRet = getDialog()->Execute();
 
     return nRet;
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index c60c998722..c60c998722 100644..100755
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 3982ed001f..3982ed001f 100644..100755
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 81a403ac27..81a403ac27 100644..100755
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 7cf414f469..7cf414f469 100644..100755
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 062496460b..062496460b 100644..100755
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 3975524c25..3975524c25 100644..100755
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index d078210c55..d078210c55 100644..100755
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
diff --git a/fpicker/source/office/fps_office.component b/fpicker/source/office/fps_office.component
new file mode 100755
index 0000000000..3e49f68a49
--- /dev/null
+++ b/fpicker/source/office/fps_office.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.svtools.OfficeFilePicker">
+    <service name="com.sun.star.ui.dialogs.OfficeFilePicker"/>
+  </implementation>
+  <implementation name="com.sun.star.svtools.OfficeFolderPicker">
+    <service name="com.sun.star.ui.dialogs.OfficeFolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index fb4bf48fb2..58bee9ce5b 100644..100755
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -62,13 +62,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return cppu::component_writeInfoHelper (
-        pServiceManager, pRegistryKey, g_entries);
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 5b33754049..5b33754049 100644..100755
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index fc83eec98b..fc83eec98b 100644..100755
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 43664b93fa..980d75315f 100644..100755
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -398,7 +398,7 @@ struct ControlChain_Impl
 {
     Window* 		   _pControl;
     ControlChain_Impl* _pNext;
-    BOOL			   _bHasOwnerShip;
+    sal_Bool			   _bHasOwnerShip;
 
     ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
     ~ControlChain_Impl();
@@ -413,7 +413,7 @@ ControlChain_Impl::ControlChain_Impl
 )
     : _pControl( pControl ),
       _pNext( pNext ),
-      _bHasOwnerShip( TRUE )
+      _bHasOwnerShip( sal_True )
 {
 }
 
@@ -451,7 +451,7 @@ namespace
 
     struct SvtResId : public ResId
     {
-        SvtResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -478,7 +478,7 @@ SvtFileDialog::SvtFileDialog
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( nExtraBits )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bInExecuteAsync( false )
     ,m_bHasFilename( false )
 {
@@ -501,7 +501,7 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
     ,_pFileNotifier( NULL )
     ,_pImp( new SvtExpFileDlg_Impl( nBits ) )
     ,_nExtraBits( 0L )
-    ,_bIsInExecute( FALSE )
+    ,_bIsInExecute( sal_False )
     ,m_bHasFilename( false )
 {
     Init_Impl( nBits );
@@ -626,7 +626,7 @@ void SvtFileDialog::Init_Impl
     _pImp->_pBtnStandard->SetAccessibleName( _pImp->_pBtnStandard->GetQuickHelpText() );
 
     if ( ( nStyle & SFXWB_MULTISELECTION ) == SFXWB_MULTISELECTION )
-        _pImp->_bMultiSelection = TRUE;
+        _pImp->_bMultiSelection = sal_True;
 
     _pFileView = new SvtFileView( this, SvtResId( CTL_EXPLORERFILE_FILELIST ),
                                        FILEDLG_TYPE_PATHDLG == _pImp->_eDlgType,
@@ -655,7 +655,7 @@ void SvtFileDialog::Init_Impl
             LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
 
     // calculate the length of all buttons
-    const USHORT nBtnCount = 3; // "previous level", "new folder" and "standard dir"
+    const sal_uInt16 nBtnCount = 3; // "previous level", "new folder" and "standard dir"
     long nDelta = n6AppFontInPixel; // right border
     nDelta += ( nBtnCount * aSize.Width() ); // button count * button width
     nDelta += ( n3AppFontInPixel + n3AppFontInPixel / 2 ); // spacing 1*big 1*small
@@ -745,8 +745,8 @@ void SvtFileDialog::Init_Impl
     SetSizePixel( aSize );
 
     // adjust the labels to the mode
-    USHORT nResId = STR_EXPLORERFILE_OPEN;
-    USHORT nButtonResId = 0;
+    sal_uInt16 nResId = STR_EXPLORERFILE_OPEN;
+    sal_uInt16 nButtonResId = 0;
 
     if ( nStyle & WB_SAVEAS )
     {
@@ -924,7 +924,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
         sal_Bool bFilterChanged = sal_True;
 
         // search for a corresponding filter
-        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, FALSE, bFilterChanged );
+        SvtFileDialogFilter_Impl* pFilter = FindFilter_Impl( _rFilter, sal_False, bFilterChanged );
 
 #ifdef AUTOSELECT_USERFILTER
         // if we found a filter which without allowing multi-extensions -> select it
@@ -937,7 +937,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
 
         // look for multi-ext filters if necessary
         if ( !pFilter )
-            pFilter = FindFilter_Impl( _rFilter, TRUE, bFilterChanged );
+            pFilter = FindFilter_Impl( _rFilter, sal_True, bFilterChanged );
 
         if ( bFilterChanged )
             nReturn |= FLT_CHANGED;
@@ -986,7 +986,7 @@ IMPL_LINK( SvtFileDialog, CancelHdl_Impl, void*, EMPTYARG )
     }
     else
     {
-        EndDialog( FALSE );
+        EndDialog( sal_False );
     }
     return 1L;
 }
@@ -1063,7 +1063,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
         return 0;
     }
 
-    USHORT nLen = aFileName.Len();
+    sal_uInt16 nLen = aFileName.Len();
     if ( !nLen )
     {
         // if the dialog was opened to select a folder, the last selected folder should be selected
@@ -1105,7 +1105,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
     }
 
     // check if it is a folder
-    BOOL bIsFolder = FALSE;
+    sal_Bool bIsFolder = sal_False;
 
     // first thing before doing anyhing with the content: Reset it. When the user presses "open" (or "save" or "export",
     // for that matter), s/he wants the complete handling, including all possible error messages, even if s/he
@@ -1172,7 +1172,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                                pThis->_pImp->GetCurFilter()->GetType());
     }
 
-    BOOL bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
+    sal_Bool bOpenFolder = ( FILEDLG_TYPE_PATHDLG == pThis->_pImp->_eDlgType ) &&
                        !pThis->_pImp->_bDoubleClick && pVoid != pThis->_pImp->_pEdFileName;
     if ( bIsFolder )
     {
@@ -1251,7 +1251,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
                     // if content does not exist: at least its path must exist
                     INetURLObject aPathObj = aFileObj;
                     aPathObj.removeSegment();
-                    BOOL bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
+                    sal_Bool bFolder = pThis->m_aContent.isFolder( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
                     if ( !bFolder )
                     {
                         ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
@@ -1308,7 +1308,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
     if ( nRet )
     {
-        pThis->EndDialog( TRUE );
+        pThis->EndDialog( sal_True );
     }
 
     return nRet;
@@ -1316,7 +1316,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 
 //*****************************************************************************
 
-void SvtFileDialog::EnableAutocompletion( BOOL _bEnable )
+void SvtFileDialog::EnableAutocompletion( sal_Bool _bEnable )
 {
     _pImp->_pEdFileName->EnableAutocompletion( _bEnable );
 }
@@ -1377,7 +1377,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox*, pBox )
 
             // if applicable show extension
             pThis->SetDefaultExt( pSelectedFilter->GetExtension() );
-            USHORT nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+            sal_uInt16 nSepPos = pThis->GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
 
             if ( nSepPos != STRING_NOTFOUND )
                 pThis->EraseDefaultExt( nSepPos );
@@ -1443,7 +1443,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 {
     SvtFileDialogFilter_Impl* pFoundFilter = NULL;
     SvtFileDialogFilterList_Impl* pList = _pImp->_pFilter;
-    USHORT nFilter = pList->Count();
+    sal_uInt16 nFilter = pList->Count();
 
     while ( nFilter-- )
     {
@@ -1453,7 +1453,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 
         if ( _bMultiExt )
         {
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             while ( !pFoundFilter && nIdx != STRING_NOTFOUND )
             {
                 aSingleType = rType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nIdx );
@@ -1504,7 +1504,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
 
 {
     String aPath;
-    ULONG nCount = _pFileView->GetSelectionCount();
+    sal_uLong nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( nCount && pEntry )
@@ -1519,7 +1519,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
         nRet = OK();
 
     if ( nRet )
-        EndDialog( TRUE );
+        EndDialog( sal_True );
 }
 
 //*****************************************************************************
@@ -1542,7 +1542,7 @@ void SvtFileDialog::UpdateControls( const String& rURL )
             {
                 // no Fsys path for server file system ( only UCB has mountpoints! )
                 if ( INET_PROT_FILE != aObj.GetProtocol() )
-                    sText = rURL.Copy( static_cast< USHORT >(
+                    sText = rURL.Copy( static_cast< sal_uInt16 >(
                         INetURLObject::GetScheme( aObj.GetProtocol() ).getLength() ) );
             }
 
@@ -1634,9 +1634,9 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
 
 IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG )
 {
-    _pImp->_bDoubleClick = TRUE;
+    _pImp->_bDoubleClick = sal_True;
     OpenHdl_Impl( this, NULL );
-    _pImp->_bDoubleClick = FALSE;
+    _pImp->_bDoubleClick = sal_False;
 
     return 0;
 }
@@ -1738,13 +1738,13 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 */
 
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     long nRet = 0;
 
     if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
     {
         const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nCode = rKeyCode.GetCode();
 
         if ( !rKeyCode.GetModifier() &&
              KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
@@ -1765,7 +1765,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt )
 
 long SvtFileDialog::OK()
 {
-    return TRUE;
+    return sal_True;
 }
 
 //*****************************************************************************
@@ -1842,7 +1842,7 @@ String SvtFileDialog::implGetInitialURL( const String& _rPath, const String& _rF
     INetURLObject aURLParser;
 
     // set the path
-    bool bWasAbsolute = FALSE;
+    bool bWasAbsolute = sal_False;
     aURLParser = aURLParser.smartRel2Abs( _rPath, bWasAbsolute );
 
     // is it a valid folder?
@@ -1894,9 +1894,9 @@ short SvtFileDialog::Execute()
         return 0;
 
     // start the dialog
-    _bIsInExecute = TRUE;
+    _bIsInExecute = sal_True;
     short nResult = ModalDialog::Execute();
-    _bIsInExecute = FALSE;
+    _bIsInExecute = sal_False;
 
     DBG_ASSERT( !m_pCurrentAsyncAction.is(), "SvtFilePicker::Execute: still running an async action!" );
         // the dialog should not be cancellable while an async action is running - first, the action
@@ -1931,16 +1931,16 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationStarted()
 {
-    EnableUI( FALSE );
+    EnableUI( sal_False );
     // the cancel button must be always enabled
-    _pImp->_pBtnCancel->Enable( TRUE );
+    _pImp->_pBtnCancel->Enable( sal_True );
     _pImp->_pBtnCancel->GrabFocus();
 }
 
 //-----------------------------------------------------------------------------
 void SvtFileDialog::onAsyncOperationFinished()
 {
-    EnableUI( TRUE );
+    EnableUI( sal_True );
     m_pCurrentAsyncAction = NULL;
     if ( !m_bInExecuteAsync )
         _pImp->_pEdFileName->GrabFocus();
@@ -1992,7 +1992,7 @@ void SvtFileDialog::displayIOException( const String& _rURL, IOErrorCode _eCode
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableUI( BOOL _bEnable )
+void SvtFileDialog::EnableUI( sal_Bool _bEnable )
 {
     Enable( _bEnable );
 
@@ -2003,13 +2003,13 @@ void SvtFileDialog::EnableUI( BOOL _bEnable )
               ++aLoop
             )
         {
-            (*aLoop)->Enable( FALSE );
+            (*aLoop)->Enable( sal_False );
         }
     }
 }
 
 //-----------------------------------------------------------------------------
-void SvtFileDialog::EnableControl( Control* _pControl, BOOL _bEnable )
+void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
 {
     if ( !_pControl )
     {
@@ -2126,16 +2126,16 @@ short SvtFileDialog::PrepareExecute()
     _pImp->InitFilterList();
 
     // set up initial filter
-    USHORT nFilterCount = GetFilterCount();
+    sal_uInt16 nFilterCount = GetFilterCount();
     String aAll( SvtResId( STR_FILTERNAME_ALL ) );
-    BOOL bHasAll = _pImp->HasFilterListEntry( aAll );
+    sal_Bool bHasAll = _pImp->HasFilterListEntry( aAll );
     if ( _pImp->GetCurFilter() || nFilterCount == 1 || ( nFilterCount == 2 && bHasAll ) )
     {
         // if applicable set the only filter or the only filter that
         // does not refer to all files, as the current one
         if ( !_pImp->GetCurFilter() )
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if ( 2 == nFilterCount && bHasAll )
             {
                 nPos = nFilterCount;
@@ -2153,7 +2153,7 @@ short SvtFileDialog::PrepareExecute()
         // adjust view
         _pImp->SelectFilterListEntry( _pImp->GetCurFilter()->GetName() );
         SetDefaultExt( _pImp->GetCurFilter()->GetExtension() );
-        USHORT nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nSepPos = GetDefaultExt().Search( FILEDIALOG_DEF_EXTSEP );
         if ( nSepPos != STRING_NOTFOUND )
             EraseDefaultExt( nSepPos );
     }
@@ -2346,7 +2346,7 @@ void SvtFileDialog::OpenURL_Impl( const String& _rURL )
 SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const String& _rFilter, const String& _rType )
 {
     SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType );
-    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (USHORT)0 );
+    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (sal_uInt16)0 );
 
     if ( !_pImp->GetCurFilter() )
         _pImp->SetCurFilter( pNewFilter, _rFilter );
@@ -2380,7 +2380,7 @@ void SvtFileDialog::SetCurFilter( const String& rFilter )
     DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );
 
     // look for corresponding filter
-    USHORT nPos = _pImp->_pFilter->Count();
+    sal_uInt16 nPos = _pImp->_pFilter->Count();
 
     while ( nPos-- )
     {
@@ -2413,14 +2413,14 @@ String SvtFileDialog::getCurFilter( ) const
 
 //*****************************************************************************
 
-USHORT SvtFileDialog::GetFilterCount() const
+sal_uInt16 SvtFileDialog::GetFilterCount() const
 {
     return _pImp->_pFilter->Count();
 }
 
 //*****************************************************************************
 
-const String& SvtFileDialog::GetFilterName( USHORT nPos ) const
+const String& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < GetFilterCount(), "invalid index" );
     return _pImp->_pFilter->GetObject( nPos )->GetName();
@@ -2463,7 +2463,7 @@ void SvtFileDialog::InitSize()
 SvStringsDtor* SvtFileDialog::GetPathList() const
 {
     SvStringsDtor*	pList = new SvStringsDtor;
-    ULONG			nCount = _pFileView->GetSelectionCount();
+    sal_uLong			nCount = _pFileView->GetSelectionCount();
     SvLBoxEntry*	pEntry = nCount ? _pFileView->FirstSelected() : NULL;
 
     if ( ! pEntry )
@@ -2538,12 +2538,12 @@ void SvtFileDialog::implArrangeControls()
 
 //*****************************************************************************
 
-BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
+sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
 {
     String aEmpty;
     String aReversePath( rPath );
     aReversePath.Reverse();
-    USHORT nQuestionMarkPos = rPath.Search( '?' );
+    sal_uInt16 nQuestionMarkPos = rPath.Search( '?' );
 
     if ( nQuestionMarkPos != STRING_NOTFOUND )
     {
@@ -2553,12 +2553,12 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         if ( INET_PROT_NOT_VALID != eProt && INET_PROT_FILE != eProt )
             nQuestionMarkPos = STRING_NOTFOUND;
     }
-    USHORT nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
+    sal_uInt16 nWildCardPos = Min( rPath.Search( FILEDIALOG_DEF_WILDCARD ), nQuestionMarkPos );
     rFilter = aEmpty;
 
     if ( nWildCardPos != STRING_NOTFOUND )
     {
-        USHORT nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
+        sal_uInt16 nPathTokenPos = aReversePath.Search( INET_PATH_TOKEN );
 
         if ( nPathTokenPos == STRING_NOTFOUND )
         {
@@ -2591,7 +2591,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
             if ( nPathTokenPos < (rPath.Len() - nWildCardPos - 1) )
             {
                 ErrorHandler::HandleError( ERRCODE_SFX_INVALIDSYNTAX );
-                return FALSE;
+                return sal_False;
             }
 
             // cut off filter
@@ -2611,7 +2611,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-----------------------------------------------------------------------------
@@ -2945,13 +2945,14 @@ void SvtFileDialog::AddControls_Impl( )
         _pPrevBmp = new FixedBitmap( this, WinBits( WB_BORDER ) );
         _pPrevBmp->SetBackground( Wallpaper( Color( COL_WHITE ) ) );
         _pPrevBmp->Show();
+        _pPrevBmp->SetAccessibleName(SvtResId(STR_PREVIEW));
     }
 
     if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION )
     {
         _pImp->_pCbAutoExtension = new CheckBox( this, SvtResId( CB_AUTO_EXTENSION ) );
         _pImp->_pCbAutoExtension->SetText( SvtResId( STR_SVT_FILEPICKER_AUTO_EXTENSION ) );
-        _pImp->_pCbAutoExtension->Check( TRUE );
+        _pImp->_pCbAutoExtension->Check( sal_True );
         AddControl( _pImp->_pCbAutoExtension );
         ReleaseOwnerShip( _pImp->_pCbAutoExtension );
         _pImp->_pCbAutoExtension->SetClickHdl( LINK( this, SvtFileDialog, AutoExtensionHdl_Impl ) );
@@ -3134,7 +3135,7 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
     {
         if ( pElement->_pControl == pUserControl )
         {
-            pElement->_bHasOwnerShip = FALSE;
+            pElement->_bHasOwnerShip = sal_False;
             break;
         }
         pElement = pElement->_pNext;
@@ -3143,14 +3144,14 @@ void SvtFileDialog::ReleaseOwnerShip( Window* pUserControl )
 
 //***************************************************************************
 
-BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
+sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine )
 {
     // control already exists
     ControlChain_Impl* pElement = _pUserControls;
     while ( pElement )
     {
         if ( pElement->_pControl == pControl )
-            return FALSE;
+            return sal_False;
         pElement = pElement->_pNext;
     }
 
@@ -3192,7 +3193,7 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     }
     Point aNewControlPos;
     Size* pNewDlgSize = NULL;
-    BOOL bNewRow = bNewLine;
+    sal_Bool bNewRow = bNewLine;
 
     if ( nType == WINDOW_WINDOW )
     {
@@ -3219,12 +3220,12 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
 
         // Check if a new row has to be created.
         if ( aNewControlRange.X() > aDlgSize.Width() )
-            bNewRow = TRUE;
+            bNewRow = sal_True;
     }
     else
     {
         // Create a new row if there was no usercontrol before.
-        bNewRow = TRUE;
+        bNewRow = sal_True;
     }
 
     // Check if a new row has to be created.
@@ -3264,7 +3265,7 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
     pControl->Show();
     _pUserControls = new ControlChain_Impl( pControl, _pUserControls );
 
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool SvtFileDialog::ContentHasParentFolder( const rtl::OUString& rURL )
@@ -3312,14 +3313,14 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
 
     if ( ! aType.EqualsAscii(FILEDIALOG_FILTER_ALL) )
     {
-        USHORT nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
-        USHORT nIndex, nPos = 0;
+        sal_uInt16 nWildCard = aType.GetTokenCount( FILEDIALOG_DEF_EXTSEP );
+        sal_uInt16 nIndex, nPos = 0;
 
         for ( nIndex = 0; nIndex < nWildCard; nIndex++ )
         {
             String aExt(aType.GetToken( 0, FILEDIALOG_DEF_EXTSEP, nPos ));
             // take care of a leading *
-            USHORT nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
+            sal_uInt16 nExtOffset = (aExt.GetBuffer()[0] == '*' ? 1 : 0);
             sal_Unicode* pExt = aExt.GetBufferAccess() + nExtOffset;
             xub_StrLen nExtLen = aExt.Len() - nExtOffset;
             xub_StrLen nOffset = aTemp.Len() - nExtLen;
@@ -3384,12 +3385,12 @@ IMPL_LINK( QueryFolderNameDialog, NameHdl, Edit *, EMPTYARG )
     if ( aName.Len() )
     {
         if ( !aOKBtn.IsEnabled() )
-            aOKBtn.Enable( TRUE );
+            aOKBtn.Enable( sal_True );
     }
     else
     {
         if ( aOKBtn.IsEnabled() )
-            aOKBtn.Enable( FALSE );
+            aOKBtn.Enable( sal_False );
     }
 
     return 0;
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index f28cb90925..b971773f12 100644..100755
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -28,9 +28,8 @@
 #ifndef _SVTOOLS_IODLGIMPL_HRC
 #define _SVTOOLS_IODLGIMPL_HRC
 
-#ifndef _SVTOOLS_HRC
 #include "svtools/svtools.hrc"
-#endif
+#include "svtools/helpid.hrc"
 
 // ModalDialog DLG_SVT_EXPLORERFILE
 
@@ -71,6 +70,7 @@
 #define STR_PATHSELECT						5
 #define STR_BUTTONSELECT					6
 #define STR_ACTUALVERSION					7
+#define STR_PREVIEW				8
 
 // DLG_SVT_QUERYFOLDERNAME -----------------------
 
@@ -86,22 +86,5 @@
 #define SID_SFX_START                       5000
 #define SID_OPENURL                     (SID_SFX_START + 596)
 
-#define HID_FILEDLG_STANDARD            (HID_SFX_START +  27)
-#define HID_FILEDLG_MANAGER             (HID_SFX_START +  28)
-#define HID_FILEDLG_URL                 (HID_SFX_START +  29)
-#define HID_FILEDLG_USE_PASSWD          (HID_SFX_START +  31)
-#define HID_FILEDLG_READ_ONLY           (HID_SFX_START +  32)
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX		(HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN			(HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME		(HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE		(HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN			(HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN			(HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME		(HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN			(HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME		(HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN		(HID_SFX_START + 227)
-
 #endif
 
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index dbe5c4efbf..3b92330acd 100644..100755
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -107,7 +107,7 @@ private:
     ::svt::IFilePickerListener*	_pFileNotifier;
     SvtExpFileDlg_Impl*			_pImp;
     WinBits						_nExtraBits;
-    BOOL                        _bIsInExecute   :	1;
+    sal_Bool                        _bIsInExecute   :	1;
 
     ImageList					m_aImages;
     ::svt::SmartContent			m_aContent;
@@ -160,14 +160,14 @@ private:
     DECL_LINK( PlayButtonHdl_Impl, PushButton* );
 
     // removes a filter with wildcards from the path and returns it
-    BOOL IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
+    sal_Bool IsolateFilterFromPath_Impl( String& rPath, String& rFilter );
 
     void	implArrangeControls();
     void	implUpdateImages( );
 
 protected:
     virtual long				Notify( NotifyEvent& rNEvt );
-    void						EnableInternet( BOOL bInternet );
+    void						EnableInternet( sal_Bool bInternet );
 
     // originally from VclFileDialog
     Link						_aOKHdl;
@@ -188,14 +188,14 @@ protected:
         This is under the assumption that you'll use EnableControl. Direct access to the control
         (such as pControl->Enable()) will break this.
     */
-    void                        EnableUI( BOOL _bEnable );
+    void                        EnableUI( sal_Bool _bEnable );
 
     /** enables or disables a control
 
         You are strongly encouraged to prefer this method over pControl->Enable( _bEnable ). See
         <member>EnableUI</member> for details.
     */
-    void                        EnableControl( Control* _pControl, BOOL _bEnable );
+    void                        EnableControl( Control* _pControl, sal_Bool _bEnable );
     short                       PrepareExecute();
 
 public:
@@ -225,8 +225,8 @@ public:
 
             void				SetCurFilter( const String& rFilter );
             String				GetCurFilter() const;
-            USHORT				GetFilterCount() const;
-            const String&		GetFilterName( USHORT nPos ) const;
+            sal_uInt16				GetFilterCount() const;
+            const String&		GetFilterName( sal_uInt16 nPos ) const;
 
     virtual	void				Resize();
     virtual void				DataChanged( const DataChangedEvent& _rDCEvt );
@@ -239,7 +239,7 @@ public:
     void						DisableSaveLastDirectory();
     void                        InitSize();
     void						UpdateControls( const String& rURL );
-    void                        EnableAutocompletion( BOOL _bEnable = TRUE );
+    void                        EnableAutocompletion( sal_Bool _bEnable = sal_True );
 
     void						SetFileCallback( ::svt::IFilePickerListener *pNotifier ) { _pFileNotifier = pNotifier; }
 
@@ -264,7 +264,7 @@ public:
     }
 
     // originally from VclFileDialog
-    virtual BOOL				AddControl( Window* pControl, BOOL bNewLine = FALSE );
+    virtual sal_Bool				AddControl( Window* pControl, sal_Bool bNewLine = sal_False );
 
     // inline
     inline void					SetPath( const String& rNewURL );
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 08ad36f470..4a3c2f6736 100644..100755
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -72,12 +72,14 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ImageButton BTN_EXPLORERFILE_NEWFOLDER
     {
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 59 , 6 ) ;
         QuickHelpText [ en-US ] = "Create New Directory" ;
     };
     ImageButton BTN_EXPLORERFILE_LISTVIEW
     {
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 109 , 6 ) ;
         ButtonImage = Image
@@ -90,8 +92,10 @@ ModalDialog DLG_SVT_EXPLORERFILE
         };
         QuickHelpText [ en-US ] = "List";
     };
+        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
     MenuButton BTN_EXPLORERFILE_UP
     {
+        HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 109 , 6 ) ;
         QuickHelpText [ en-US ] = "Up One Level" ;
@@ -99,6 +103,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
 
     MenuButton BTN_EXPLORERFILE_STANDARD
     {
+        HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( 59 , 6 ) ;
         QuickHelpText [ en-US ] = "Default Directory" ;
@@ -118,6 +123,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     Edit ED_EXPLORERFILE_FILENAME
     {
+        HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( 59 , 117 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
@@ -131,6 +137,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ListBox LB_EXPLORERFILE_SHARED_LISTBOX
     {
+        HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX";
         Pos = MAP_APPFONT ( 59 , 132 ) ;
         Size = MAP_APPFONT ( 159 , 40 ) ;
         DropDown = TRUE ;
@@ -145,6 +152,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     ListBox LB_EXPLORERFILE_FILETYPE
     {
+        HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE";
         Pos = MAP_APPFONT ( 59 , 147 ) ;
         Size = MAP_APPFONT ( 159 , 80 ) ;
         DropDown = TRUE ;
@@ -154,26 +162,31 @@ ModalDialog DLG_SVT_EXPLORERFILE
     };
     CheckBox CB_EXPLORERFILE_READONLY
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY";
         Size = MAP_APPFONT ( 80 , 10 ) ;
         Text [ en-US ] = "~Read-only" ;
     };
     CheckBox CB_EXPLORERFILE_PASSWORD
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD";
         Size = MAP_APPFONT ( 100, 10 ) ;
         Text [ en-US ] = "Save with password" ;
     };
     CheckBox CB_AUTO_EXTENSION
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION";
         Size = MAP_APPFONT ( 160 , 10 ) ;
         Text [ en-US ] = "~Automatic file name extension" ;
     };
     CheckBox CB_OPTIONS
     {
+        HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS";
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Text [ en-US ] = "Edit ~filter settings";
     };
     PushButton BTN_EXPLORERFILE_OPEN
     {
+        HelpID = "fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN";
         Pos = MAP_APPFONT ( 224 , 117 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
@@ -217,11 +230,16 @@ ModalDialog DLG_SVT_EXPLORERFILE
     {
         Text [ en-US ] = "Current version";
     };
+    String STR_PREVIEW
+    {
+        Text [ en-US ] = "File Preview";
+    };
 };
 
 // QueryFolderNameDialog ----------------------------------------------------------
 ModalDialog DLG_SVT_QUERYFOLDERNAME
 {
+    HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -236,6 +254,7 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME
     };
     Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME
     {
+        HelpID = "fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 138 , 12 ) ;
         Border = TRUE ;
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index aa75aa3bbd..67dd4976ef 100644..100755
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -121,7 +121,7 @@ namespace
 
     struct SvtSimpleResId : public ResId
     {
-        SvtSimpleResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
@@ -312,7 +312,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
 
     _pMenu->Clear();
 
-    USHORT nItemId = 1;
+    sal_uInt16 nItemId = 1;
     String sDisplayName;
 
     ::std::vector< String >::const_iterator aLoop;
@@ -467,7 +467,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
         sName = _pFilterDesc->GetName();
 
     // insert an set user data
-    USHORT nPos = _pLbFilter->InsertEntry( sName );
+    sal_uInt16 nPos = _pLbFilter->InsertEntry( sName );
     _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) );
 }
 
@@ -479,7 +479,7 @@ void SvtExpFileDlg_Impl::InitFilterList( )
     ClearFilterList( );
 
     // reinit it
-    USHORT nPos = _pFilter->Count();
+    sal_uInt16 nPos = _pFilter->Count();
 
     // search for the first entry which is no group separator
     while ( nPos-- && _pFilter->GetObject( nPos ) && _pFilter->GetObject( nPos )->isGroupSeparator() )
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index c567e5f60c..e4a5d72d7b 100644..100755
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -261,7 +261,7 @@ public:
     inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetBlackList() const { return _aBlackList; }
     void					SetStandardDir( const String& _rDir );
     inline const String&	GetStandardDir() const			{ return _aStdDir; }
-    inline void				DisableFilterBoxAutoWidth() 	{ _pLbFilter->EnableDDAutoWidth( FALSE ); }
+    inline void				DisableFilterBoxAutoWidth() 	{ _pLbFilter->EnableDDAutoWidth( sal_False ); }
 
     // ------------------------------------------
     // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index adc3c30f9a..7481fd867c 100644..100755
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -86,3 +86,11 @@ RESLIB1SRSFILES=\
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/fps_office.component
+
+$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps_office.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps_office.component
diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index f5c0430b76..f5c0430b76 100644..100755
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx
diff --git a/fpicker/source/unx/gnome/FPServiceInfo.hxx b/fpicker/source/unx/gnome/FPServiceInfo.hxx
index f8d7b7e1e0..f8d7b7e1e0 100644..100755
--- a/fpicker/source/unx/gnome/FPServiceInfo.hxx
+++ b/fpicker/source/unx/gnome/FPServiceInfo.hxx
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index 015dfa9cf6..2f63a948e2 100644..100755
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -102,32 +102,6 @@ void SAL_CALL component_getImplementationEnvironment(
 //
 //------------------------------------------------
 
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );				
-            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
-            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ));
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE( sal_False, "InvalidRegistryException caught" );			
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
 void* SAL_CALL component_getFactory( 
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 0e355e6c91..33e612c01b 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <osl/diagnose.h>
+#include <osl/process.h>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -105,7 +106,7 @@ static void expandexpanders(GtkContainer *pWidget)
         if GTK_IS_CONTAINER(GTK_WIDGET(p->data))
             expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data)));
         if GTK_IS_EXPANDER(GTK_WIDGET(p->data))
-            gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True);
     }
     g_list_free(pChildren);
 }
@@ -191,17 +192,17 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 
-    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
-    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
+    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
 
-    m_pVBox = gtk_vbox_new( FALSE, 0 );
+    m_pVBox = gtk_vbox_new( sal_False, 0 );
 
     // We don't want clickable items to have a huge hit-area
-    GtkWidget *pHBox = gtk_hbox_new( FALSE, 0 );
-    GtkWidget *pThinVBox = gtk_vbox_new( FALSE, 0 );
+    GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 );
+    GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 );
 
-    gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0);
+    gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0);
     gtk_widget_show( pHBox );
     gtk_widget_show( pThinVBox );
 
@@ -231,12 +232,12 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
                 break;
         }
 
-        gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], sal_False, sal_False, 0 );
     }
 
     for( i = 0; i < LIST_LAST; i++ )
     {
-        m_pHBoxs[i] = gtk_hbox_new( FALSE, 0 );
+        m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 );
 
         m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1);
 
@@ -261,18 +262,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
         }
 
         gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] );
-        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 );
 
-        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 );
 
-        gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], FALSE, FALSE, 0 );
+        gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 );
     }
 
     aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE );
     m_pFilterExpander = gtk_expander_new_with_mnemonic(
         OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr());
 
-    gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, FALSE, TRUE, 0 );
+    gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 );
 
     GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -290,11 +291,11 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
         case 0:
             break;
         case 1:
-            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
             break;
         case 2:
             expandexpanders(GTK_CONTAINER(m_pDialog));
-            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), TRUE);
+            gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
             break;
     }
 
@@ -311,8 +312,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact
     {
         column = gtk_tree_view_column_new ();
         cell = gtk_cell_renderer_text_new ();
-        gtk_tree_view_column_set_expand (column, TRUE);
-        gtk_tree_view_column_pack_start (column, cell, FALSE);
+        gtk_tree_view_column_set_expand (column, sal_True);
+        gtk_tree_view_column_pack_start (column, cell, sal_False);
         gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
     }
@@ -1358,12 +1359,12 @@ throw( uno::RuntimeException )
         if( bEnable )
         {
             OSL_TRACE( "enable\n" );
-            gtk_widget_set_sensitive( pWidget, TRUE );
+            gtk_widget_set_sensitive( pWidget, sal_True );
         }
         else
         {
             OSL_TRACE( "disable\n" );
-            gtk_widget_set_sensitive( pWidget, FALSE );
+            gtk_widget_set_sensitive( pWidget, sal_False );
         }
     }
     else
@@ -1402,7 +1403,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS
     }
     else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
         g_object_set( pWidget, "label", aTxt.getStr(),
-                      "use_underline", TRUE, (char *)NULL );
+                      "use_underline", sal_True, (char *)NULL );
     else
         OSL_TRACE("Can't set label on list\n");
 }
@@ -1437,7 +1438,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t
     OSL_ASSERT( m_pDialog != NULL );
 
     // TODO return m_pImpl->getSupportedImageFormats();
-    return 0;
+    return uno::Sequence<sal_Int16>();
 }
 
 sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException )
@@ -1540,7 +1541,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi
     GtkWidget *preview;
     char *filename;
     GdkPixbuf *pixbuf;
-    gboolean have_preview = FALSE;
+    gboolean have_preview = sal_False;
 
     preview = pobjFP->m_pPreview;
     filename = gtk_file_chooser_get_preview_filename( file_chooser );
@@ -1857,22 +1858,22 @@ extern "C"
 static gboolean
 case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data)
 {
-    gboolean bRetval = FALSE;
+    gboolean bRetval = sal_False;
     const char *pFilter = (const char *) data;
 
-    g_return_val_if_fail( data != NULL, FALSE );
-    g_return_val_if_fail( filter_info != NULL, FALSE );
+    g_return_val_if_fail( data != NULL, sal_False );
+    g_return_val_if_fail( filter_info != NULL, sal_False );
 
     if( !filter_info->uri )
-        return FALSE;
+        return sal_False;
 
     const char *pExtn = strrchr( filter_info->uri, '.' );
     if( !pExtn )
-        return FALSE;
+        return sal_False;
     pExtn++;
 
     if( !g_ascii_strcasecmp( pFilter, pExtn ) )
-        bRetval = TRUE;
+        bRetval = sal_True;
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n",
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index 2ad10d4131..2ad10d4131 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index 08bbf04731..033faa4238 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -95,8 +95,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference<lang::XMultiService
         GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
-    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
-    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), FALSE );
+    gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
+    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
index 170447bf7a..170447bf7a 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 9bdad500c4..8a560e8dd2 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -228,6 +228,46 @@ static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>&
     static bool bSet = false;
     if (bSet)
         return;
+    
+    OUString sUILocale;
+    try
+    {
+        uno::Reference<lang::XMultiServiceFactory> xConfigMgr = 
+          uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance(
+            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), 
+              UNO_QUERY_THROW );
+
+        Sequence< Any > theArgs(1);
+        theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
+
+        uno::Reference< container::XNameAccess > xNameAccess =
+          uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
+            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
+              UNO_QUERY_THROW );
+
+        if (xNameAccess.is())
+            xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
+    } catch (...) {}
+  
+    if (sUILocale.getLength()) 
+    {
+        sUILocale = sUILocale.replace('-', '_');
+        rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("LANGUAGE"));
+        osl_setEnvironment(envVar.pData, sUILocale.pData);
+    }
+    bSet = true;
+}
+
+SalGtkPicker::SalGtkPicker(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : m_pDialog(0)
+{
+    lcl_setGTKLanguage(xServiceMgr);
+}
+
+static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr)
+{
+    static bool bSet = false;
+    if (bSet)
+        return;
 
     OUString sUILocale;
     try
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx
index 52fe5a060a..52fe5a060a 100644..100755
--- a/fpicker/source/unx/gnome/SalGtkPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx
diff --git a/fpicker/source/unx/gnome/eventnotification.hxx b/fpicker/source/unx/gnome/eventnotification.hxx
index f0cefd6794..f0cefd6794 100644..100755
--- a/fpicker/source/unx/gnome/eventnotification.hxx
+++ b/fpicker/source/unx/gnome/eventnotification.hxx
diff --git a/fpicker/source/unx/gnome/fps-gnome-ucd.txt b/fpicker/source/unx/gnome/fps-gnome-ucd.txt
deleted file mode 100644
index 4a84215dc9..0000000000
--- a/fpicker/source/unx/gnome/fps-gnome-ucd.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalGtkFilePicker
-ComponentName=fps_gnome.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.GtkFilePicker
-
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.SalGtkFolderPicker
-ComponentName=fps_gnome.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.GtkFolderPicker
diff --git a/fpicker/source/unx/gnome/fps_gnome.component b/fpicker/source/unx/gnome/fps_gnome.component
new file mode 100755
index 0000000000..72bca42f8a
--- /dev/null
+++ b/fpicker/source/unx/gnome/fps_gnome.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.ui.dialogs.SalGtkFilePicker">
+    <service name="com.sun.star.ui.dialogs.GtkFilePicker"/>
+  </implementation>
+  <implementation name="com.sun.star.ui.dialogs.SalGtkFolderPicker">
+    <service name="com.sun.star.ui.dialogs.GtkFolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/unx/gnome/fps_gnome.xml b/fpicker/source/unx/gnome/fps_gnome.xml
index c4d320c6dd..c4d320c6dd 100644..100755
--- a/fpicker/source/unx/gnome/fps_gnome.xml
+++ b/fpicker/source/unx/gnome/fps_gnome.xml
diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
index 04c6e650ff..82b2413dd4 100644..100755
--- a/fpicker/source/unx/gnome/makefile.mk
+++ b/fpicker/source/unx/gnome/makefile.mk
@@ -96,3 +96,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/fps_gnome.component
+
+$(MISC)/fps_gnome.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps_gnome.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps_gnome.component
diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index 0f86159530..0f86159530 100644..100755
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
diff --git a/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx
index 7315bb2676..7315bb2676 100644..100755
--- a/fpicker/source/unx/gnome/resourceprovider.hxx
+++ b/fpicker/source/unx/gnome/resourceprovider.hxx
diff --git a/fpicker/source/unx/kde/kdecommandthread.cxx b/fpicker/source/unx/kde/kdecommandthread.cxx
index b68ddb0030..b68ddb0030 100644..100755
--- a/fpicker/source/unx/kde/kdecommandthread.cxx
+++ b/fpicker/source/unx/kde/kdecommandthread.cxx
diff --git a/fpicker/source/unx/kde/kdecommandthread.hxx b/fpicker/source/unx/kde/kdecommandthread.hxx
index 7486bf9192..7486bf9192 100644..100755
--- a/fpicker/source/unx/kde/kdecommandthread.hxx
+++ b/fpicker/source/unx/kde/kdecommandthread.hxx
diff --git a/fpicker/source/unx/kde/kdefilepicker.cxx b/fpicker/source/unx/kde/kdefilepicker.cxx
index 779a34d894..779a34d894 100644..100755
--- a/fpicker/source/unx/kde/kdefilepicker.cxx
+++ b/fpicker/source/unx/kde/kdefilepicker.cxx
diff --git a/fpicker/source/unx/kde/kdefilepicker.hxx b/fpicker/source/unx/kde/kdefilepicker.hxx
index 4d545ebc76..4d545ebc76 100644..100755
--- a/fpicker/source/unx/kde/kdefilepicker.hxx
+++ b/fpicker/source/unx/kde/kdefilepicker.hxx
diff --git a/fpicker/source/unx/kde/kdefpmain.cxx b/fpicker/source/unx/kde/kdefpmain.cxx
index 2300fe61a2..2300fe61a2 100644..100755
--- a/fpicker/source/unx/kde/kdefpmain.cxx
+++ b/fpicker/source/unx/kde/kdefpmain.cxx
diff --git a/fpicker/source/unx/kde/kdemodalityfilter.cxx b/fpicker/source/unx/kde/kdemodalityfilter.cxx
index 5aeddb0a80..5aeddb0a80 100644..100755
--- a/fpicker/source/unx/kde/kdemodalityfilter.cxx
+++ b/fpicker/source/unx/kde/kdemodalityfilter.cxx
diff --git a/fpicker/source/unx/kde/kdemodalityfilter.hxx b/fpicker/source/unx/kde/kdemodalityfilter.hxx
index 8635694a39..8635694a39 100644..100755
--- a/fpicker/source/unx/kde/kdemodalityfilter.hxx
+++ b/fpicker/source/unx/kde/kdemodalityfilter.hxx
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index e1bc4db47d..e1bc4db47d 100644..100755
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
diff --git a/fpicker/source/unx/kde4/FPServiceInfo.hxx b/fpicker/source/unx/kde4/FPServiceInfo.hxx
index 2f265f812c..2f265f812c 100644..100755
--- a/fpicker/source/unx/kde4/FPServiceInfo.hxx
+++ b/fpicker/source/unx/kde4/FPServiceInfo.hxx
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index d0d5299b1f..49bd760a00 100644..100755
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -56,27 +56,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-    {
-        sal_Bool bRetVal = sal_True;
-
-        if ( pRegistryKey )
-        {
-            try
-            {
-                Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );				
-                pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
-            }
-            catch( InvalidRegistryException& )
-            {			
-                OSL_ENSURE( sal_False, "InvalidRegistryException caught" );			
-                bRetVal = sal_False;
-            }
-        }
-
-        return bRetVal;
-    }
-
     void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
     {
         void* pRet = 0;
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index e2d3413386..3c0dc56e4a 100644..100755
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -264,7 +264,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
         files.append(dir);
     }
     
-    for (USHORT i = 0; i < rawFiles.size(); ++i)
+    for (sal_uInt16 i = 0; i < rawFiles.size(); ++i)
     {
         // if the raw file is not the base directory (see above kde bug)
         // we add the file to list of avail files
@@ -339,8 +339,8 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const un
     if (!_filter.isNull())
         _filter.append(QString("\n"));
     
-    const USHORT length = filters.getLength();
-    for (USHORT i = 0; i < length; ++i)
+    const sal_uInt16 length = filters.getLength();
+    for (sal_uInt16 i = 0; i < length; ++i)
     {
         beans::StringPair aPair = filters[i];
         
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index e1b8a15e1b..e1b8a15e1b 100644..100755
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
diff --git a/fpicker/source/unx/kde4/fps-kde4-ucd.txt b/fpicker/source/unx/kde4/fps-kde4-ucd.txt
deleted file mode 100644
index 8ecc4e0a0a..0000000000
--- a/fpicker/source/unx/kde4/fps-kde4-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.ui.dialogs.KDE4FilePicker
-ComponentName=fps_kde4.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ui.dialogs.KDE4FilePicker
diff --git a/fpicker/source/unx/kde4/fps_kde4.component b/fpicker/source/unx/kde4/fps_kde4.component
new file mode 100755
index 0000000000..d627212b75
--- /dev/null
+++ b/fpicker/source/unx/kde4/fps_kde4.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.ui.dialogs.KDE4FilePicker">
+    <service name="com.sun.star.ui.dialogs.KDE4FilePicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/source/unx/kde4/fps_kde4.xml b/fpicker/source/unx/kde4/fps_kde4.xml
index b250c0531a..b250c0531a 100644..100755
--- a/fpicker/source/unx/kde4/fps_kde4.xml
+++ b/fpicker/source/unx/kde4/fps_kde4.xml
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
index e245e66184..7ccf6df6a0 100644..100755
--- a/fpicker/source/unx/kde4/makefile.mk
+++ b/fpicker/source/unx/kde4/makefile.mk
@@ -80,3 +80,11 @@ DEF1VERSIONMAP=exports.map
 
 $(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx
     $(MOC4) $< -o $@
+
+ALLTAR : $(MISC)/fps_kde4.component
+
+$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps_kde4.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component
diff --git a/fpicker/source/unx/kde_unx/FPServiceInfo.hxx b/fpicker/source/unx/kde_unx/FPServiceInfo.hxx
index 9e4cbf1ac4..9e4cbf1ac4 100644..100755
--- a/fpicker/source/unx/kde_unx/FPServiceInfo.hxx
+++ b/fpicker/source/unx/kde_unx/FPServiceInfo.hxx
diff --git a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
index 3b113346eb..3b113346eb 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
+++ b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
diff --git a/fpicker/source/unx/kde_unx/UnxCommandThread.hxx b/fpicker/source/unx/kde_unx/UnxCommandThread.hxx
index b8c6aaaaf9..b8c6aaaaf9 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxCommandThread.hxx
+++ b/fpicker/source/unx/kde_unx/UnxCommandThread.hxx
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index 98c94d6009..98c94d6009 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index 8c7cd91a9e..8c7cd91a9e 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.hxx b/fpicker/source/unx/kde_unx/UnxFilePicker.hxx
index d48af8567d..d48af8567d 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.hxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.hxx
diff --git a/fpicker/source/unx/kde_unx/UnxNotifyThread.cxx b/fpicker/source/unx/kde_unx/UnxNotifyThread.cxx
index a97fdfc24f..a97fdfc24f 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxNotifyThread.cxx
+++ b/fpicker/source/unx/kde_unx/UnxNotifyThread.cxx
diff --git a/fpicker/source/unx/kde_unx/UnxNotifyThread.hxx b/fpicker/source/unx/kde_unx/UnxNotifyThread.hxx
index b60d7b4758..b60d7b4758 100644..100755
--- a/fpicker/source/unx/kde_unx/UnxNotifyThread.hxx
+++ b/fpicker/source/unx/kde_unx/UnxNotifyThread.hxx
diff --git a/fpicker/source/unx/kde_unx/fps-kde-ucd.txt b/fpicker/source/unx/kde_unx/fps-kde-ucd.txt
index 28aa49d97b..28aa49d97b 100644..100755
--- a/fpicker/source/unx/kde_unx/fps-kde-ucd.txt
+++ b/fpicker/source/unx/kde_unx/fps-kde-ucd.txt
diff --git a/fpicker/source/unx/kde_unx/fps_kde.xml b/fpicker/source/unx/kde_unx/fps_kde.xml
index 99683bfeca..99683bfeca 100644..100755
--- a/fpicker/source/unx/kde_unx/fps_kde.xml
+++ b/fpicker/source/unx/kde_unx/fps_kde.xml
diff --git a/fpicker/source/unx/kde_unx/makefile.mk b/fpicker/source/unx/kde_unx/makefile.mk
index 067399bf08..067399bf08 100644..100755
--- a/fpicker/source/unx/kde_unx/makefile.mk
+++ b/fpicker/source/unx/kde_unx/makefile.mk
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index 528add7e5a..528add7e5a 100644..100755
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 91c9632d40..e804a43aa5 100644..100755
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -105,31 +105,6 @@ void SAL_CALL component_getImplementationEnvironment(
 //
 //------------------------------------------------
 
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE( sal_False, "InvalidRegistryException caught" );			
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
 void* SAL_CALL component_getFactory( 
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
 {
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index ffd9fa3324..ffd9fa3324 100644..100755
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 4ad6776151..4ad6776151 100644..100755
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 04b5e7388e..04b5e7388e 100644..100755
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 6d17d3a478..6d17d3a478 100644..100755
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 2c609c4f94..2c609c4f94 100644..100755
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 44e0e15a13..44e0e15a13 100644..100755
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
diff --git a/fpicker/source/win32/filepicker/Fps.rc b/fpicker/source/win32/filepicker/Fps.rc
index ad08ad0669..ad08ad0669 100644..100755
--- a/fpicker/source/win32/filepicker/Fps.rc
+++ b/fpicker/source/win32/filepicker/Fps.rc
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 9eb8ee7794..9eb8ee7794 100644..100755
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 59ce99693f..6bf2c62d40 100644..100755
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -394,7 +394,7 @@ void SAL_CALL CFilePreview::enable( sal_Bool bEnable )
     m_bEnabled = bEnable;
     
     // force a redraw
-    InvalidateRect( m_hwnd, NULL, TRUE );
+    InvalidateRect( m_hwnd, NULL, sal_True );
     UpdateWindow( m_hwnd );	
 }
 
@@ -436,7 +436,7 @@ sal_Bool SAL_CALL CFilePreview::update( const rtl::OUString& aFileName )
             loadFile( aFileName );
         
             // force a complete window redraw
-            InvalidateRect( m_hwnd, NULL, TRUE );
+            InvalidateRect( m_hwnd, NULL, sal_True );
             UpdateWindow( m_hwnd );	
         }
     }	
@@ -549,12 +549,12 @@ sal_Bool CFilePreview::loadFile( const rtl::OUString& aFileName )
         goto CLEANUP_AND_EXIT;
     
     hr = CreateStreamOnHGlobal(
-        hGlobal, FALSE, &pIStream );
+        hGlobal, sal_False, &pIStream );
 
     if ( SUCCEEDED( hr ) )
     {
         hr = OleLoadPicture(
-            pIStream, fsize, FALSE, 
+            pIStream, fsize, sal_False, 
             __uuidof( IPicture ), (LPVOID*)&m_IPicture );
     }
     
@@ -602,7 +602,7 @@ LRESULT CALLBACK CFilePreview::WndProc(
         // a result of handling WM_NCCREATE what
         // leads to a failure of CreateWindow[Ex]!!!
     case WM_NCCREATE:
-        lResult = TRUE;
+        lResult = sal_True;
         break;
 
     default:
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index 818a78b711..818a78b711 100644..100755
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx
index 393bd74836..393bd74836 100644..100755
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.cxx
diff --git a/fpicker/source/win32/filepicker/SolarMutex.hxx b/fpicker/source/win32/filepicker/SolarMutex.hxx
index 1f39a40beb..1f39a40beb 100644..100755
--- a/fpicker/source/win32/filepicker/SolarMutex.hxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index ce38abf435..ce38abf435 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 09380c1905..09380c1905 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 14cefe36f7..14cefe36f7 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index de9983d0cf..de9983d0cf 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 9f006d6925..b13069c0bf 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1106,7 +1106,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
         //case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : // can be ignored ... preview is supported native now !
         case css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
             {
-                BOOL    bValue  = sal_False;
+                BOOL    bValue  = FALSE;
                 HRESULT hResult = iCustom->GetCheckButtonState(nId, &bValue);
                 if ( SUCCEEDED(hResult) )
                     aValue = css::uno::makeAny((sal_Bool)bValue);
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 823141d3b8..823141d3b8 100644..100755
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 8e31612595..6f549cf708 100644..100755
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -528,7 +528,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
             reinterpret_cast<WNDPROC>(pImpl->m_pfnOldDlgProc), 
             hWnd,wMessage,wParam,lParam);
 
-        pImpl->onWMShow((BOOL)wParam);
+        pImpl->onWMShow((sal_Bool)wParam);
         break;
     
     case WM_NCDESTROY:
@@ -609,7 +609,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
       
     OSL_ASSERT(pImpl);
 
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     switch(enumParam->m_action)
     {
@@ -842,7 +842,7 @@ void CWinFileOpenImpl::onWMSize()
 // 
 //-----------------------------------------------------------------------------------------
 
-void CWinFileOpenImpl::onWMShow(BOOL bShow)
+void CWinFileOpenImpl::onWMShow(sal_Bool bShow)
 { 
     m_Preview->notifyParentShow(bShow);
 }
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 379a2dd496..b7ade2afcd 100644..100755
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -188,7 +188,7 @@ protected:
     
 
     void onWMSize();
-    void onWMShow(BOOL bShow);
+    void onWMShow(sal_Bool bShow);
     void onWMWindowPosChanged();
     void onCustomControlHelpRequest(LPHELPINFO lphi);
 
diff --git a/fpicker/source/win32/filepicker/afxres.h b/fpicker/source/win32/filepicker/afxres.h
index 61f5ab91ce..61f5ab91ce 100644..100755
--- a/fpicker/source/win32/filepicker/afxres.h
+++ b/fpicker/source/win32/filepicker/afxres.h
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 3f1f6eb30a..3f1f6eb30a 100644..100755
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index fa50a03e82..fa50a03e82 100644..100755
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index ed197cd9b4..cfaa8e3faf 100644..100755
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -44,7 +44,7 @@ namespace css = ::com::sun::star;
 void lcl_sleep(::osl::Condition& aCondition   ,
                ::sal_Int32       nMilliSeconds)
 {
-    ULONG nAcquireCount = Application::ReleaseSolarMutex();
+    sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
 
     if (nMilliSeconds < 1)
         aCondition.wait(0);
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 6075a247d0..6075a247d0 100644..100755
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx
index ee4b1b5538..ee4b1b5538 100644..100755
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/filepicker/comptr.hxx
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index b21fa64e55..b21fa64e55 100644..100755
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index 5731297eb4..5731297eb4 100644..100755
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index 77385fe5fa..77385fe5fa 100644..100755
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index 362aa78f81..362aa78f81 100644..100755
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index 6f7a94704c..6f7a94704c 100644..100755
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index ed601218ad..ed601218ad 100644..100755
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx
index 7a5e20793c..7a5e20793c 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrol.cxx
+++ b/fpicker/source/win32/filepicker/customcontrol.cxx
diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx
index 6d961147e6..6d961147e6 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrol.hxx
+++ b/fpicker/source/win32/filepicker/customcontrol.hxx
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
index 00bcbddb14..00bcbddb14 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
index 6dcc9d486d..6dcc9d486d 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index 5332fe4087..5332fe4087 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index de5961e6fc..de5961e6fc 100644..100755
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index afe673c77a..563cd964b4 100644..100755
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -54,7 +54,7 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont)
         m_CustomControlHandle,
         WM_SETFONT,
         (WPARAM)hFont,
-        (LPARAM)TRUE);
+        (LPARAM)sal_True);
 }
 
 //-----------------------------------
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
index d3b62867c9..d3b62867c9 100644..100755
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index ede628d2b6..4f7ebe81c0 100644..100755
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -204,7 +204,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
 
     aGuard.clear();
 
-    InvalidateRect(m_Hwnd,NULL,FALSE);
+    InvalidateRect(m_Hwnd,NULL,sal_False);
     UpdateWindow(m_Hwnd);
 }
 
@@ -245,7 +245,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
 {
     BITMAPFILEHEADER*  pbmfh;
     BITMAPINFO      *  pbmi;
-    BYTE            *  pBits;
+    sal_uInt8            *  pBits;
     int                cxDib;
     int                cyDib;
 
@@ -259,7 +259,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
              (pbmfh->bfType == ('B' | ('M' << 8))) )
         {
             pbmi  = reinterpret_cast<BITMAPINFO*>((pbmfh + 1));
-            pBits = reinterpret_cast<BYTE*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
+            pBits = reinterpret_cast<sal_uInt8*>(((DWORD)pbmfh) + pbmfh->bfOffBits);
 
             cxDib =      pbmi->bmiHeader.biWidth;
             cyDib = abs (pbmi->bmiHeader.biHeight);
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 0cf568b66e..0cf568b66e 100644..100755
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index f0cefd6794..f0cefd6794 100644..100755
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
index e79bc9b2f9..e79bc9b2f9 100644..100755
--- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index d2230455c0..d2230455c0 100644..100755
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 1ec72dcec0..1ec72dcec0 100644..100755
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 956082e4ac..956082e4ac 100644..100755
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
diff --git a/fpicker/source/win32/filepicker/fps.xml b/fpicker/source/win32/filepicker/fps.xml
index 445faaafdb..445faaafdb 100644..100755
--- a/fpicker/source/win32/filepicker/fps.xml
+++ b/fpicker/source/win32/filepicker/fps.xml
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 70977b6272..4199d26f8a 100644..100755
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -55,13 +55,13 @@ namespace /* private */
     //-----------------------------------------------
     class CurDirGuard
     {
-        BOOL m_bValid;
+        sal_Bool m_bValid;
         wchar_t* m_pBuffer;
         DWORD m_nBufLen;
         
     public:
         CurDirGuard()
-        : m_bValid( FALSE )
+        : m_bValid( sal_False )
         , m_pBuffer( NULL )
         , m_nBufLen( 0 )
         {
@@ -75,7 +75,7 @@ namespace /* private */
 
         ~CurDirGuard()
         {
-            BOOL bDirSet = FALSE;
+            bool bDirSet = false;
 
             if ( m_pBuffer )
             {
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 9e7b4cfe8e..9e7b4cfe8e 100644..100755
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 42c1ec1327..42c1ec1327 100644..100755
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index ddb74e1f30..ddb74e1f30 100644..100755
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
index bfe5bee1da..bfe5bee1da 100644..100755
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ b/fpicker/source/win32/filepicker/makefile.mk
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index 84479c2c9e..84479c2c9e 100644..100755
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index d6d8e650cb..d6d8e650cb 100644..100755
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index b0f7effb8b..776d564e79 100644..100755
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -307,7 +307,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
     // style bit of the FileOpen dialog must be set after that
     // message
     LONG lStyle = GetWindowLong(prvwnd,GWL_STYLE);
-    BOOL bIsVisible = (BOOL)(lStyle & WS_VISIBLE);
+    sal_Bool bIsVisible = (sal_Bool)(lStyle & WS_VISIBLE);
 
     int cx = 0;
 
@@ -317,7 +317,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 
         // resize the filelistbox to the half of the 
         // available space
-        BOOL bRet = SetWindowPos(flb_new,
+        bool bRet = SetWindowPos(flb_new,
             NULL, 0, 0, cx, height,
             SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
         
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index e10b2e5d31..e10b2e5d31 100644..100755
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 3776cea2d5..3776cea2d5 100644..100755
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index b05e3fb3bf..b05e3fb3bf 100644..100755
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
diff --git a/fpicker/source/win32/filepicker/propmap.hxx b/fpicker/source/win32/filepicker/propmap.hxx
index 904f8fa11c..904f8fa11c 100644..100755
--- a/fpicker/source/win32/filepicker/propmap.hxx
+++ b/fpicker/source/win32/filepicker/propmap.hxx
diff --git a/fpicker/source/win32/filepicker/resource.h b/fpicker/source/win32/filepicker/resource.h
index 3a3f56b5c7..3a3f56b5c7 100644..100755
--- a/fpicker/source/win32/filepicker/resource.h
+++ b/fpicker/source/win32/filepicker/resource.h
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index 34e27b615c..34e27b615c 100644..100755
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index 9237dbada2..9237dbada2 100644..100755
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index c7c29bc044..a3aaa20e73 100644..100755
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -178,7 +178,7 @@ void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::
                  Sequence< sal_Int8 > aDIB( dwFileSize );
                
                  DWORD dwBytesRead;
-                 BOOL bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
+                 sal_Bool bSuccess = ReadFile (hFile, aDIB.getArray( ), dwFileSize, &dwBytesRead, NULL) ;
                  CloseHandle (hFile);
 
                  BITMAPFILEHEADER* pbmfh = (BITMAPFILEHEADER*)aDIB.getConstArray( );
diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/filepicker/workbench/makefile.mk
index 926e2c22a0..926e2c22a0 100644..100755
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/source/win32/filepicker/workbench/makefile.mk
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index 0079e0331f..0079e0331f 100644..100755
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index cae36a0f70..cae36a0f70 100644..100755
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 3276af77d2..3276af77d2 100644..100755
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index edccfc7921..edccfc7921 100644..100755
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 1f71a0771e..9204cce0c5 100644..100755
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -84,31 +84,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
-            pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ) );
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index db9662c428..26d6d8893b 100644..100755
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -280,7 +280,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
         while ( bContinue )
         {
             DWORD dwResult = MsgWaitForMultipleObjects(
-                1, &aReqCtx.hEvent, FALSE, INFINITE, QS_ALLEVENTS );
+                1, &aReqCtx.hEvent, sal_False, INFINITE, QS_ALLEVENTS );
             
             switch ( dwResult )
             {
@@ -547,7 +547,7 @@ void SAL_CALL CMtaFolderPicker::onInitialized( )
         SendMessageA( 
             m_hwnd, 
             BFFM_SETSELECTION, 
-            (WPARAM)FALSE, 
+            (WPARAM)sal_False, 
             (LPARAM) lpiidDisplayDir );
 
         releaseItemIdList( lpiidDisplayDir );    
diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index df7fd4dc50..df7fd4dc50 100644..100755
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index ea8f35dcd5..ea8f35dcd5 100644..100755
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 0dcf37b1ab..0dcf37b1ab 100644..100755
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
diff --git a/fpicker/source/win32/folderpicker/fop.xml b/fpicker/source/win32/folderpicker/fop.xml
index 74e678c73e..74e678c73e 100644..100755
--- a/fpicker/source/win32/folderpicker/fop.xml
+++ b/fpicker/source/win32/folderpicker/fop.xml
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
index f42ff9685c..f42ff9685c 100644..100755
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/source/win32/folderpicker/makefile.mk
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 7f2959894b..7f2959894b 100644..100755
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index 666751f277..666751f277 100644..100755
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/workbench/makefile.mk
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index 1199260447..1199260447 100644..100755
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
diff --git a/fpicker/source/win32/misc/AutoBuffer.hxx b/fpicker/source/win32/misc/AutoBuffer.hxx
index 5af6e4c39f..5af6e4c39f 100644..100755
--- a/fpicker/source/win32/misc/AutoBuffer.hxx
+++ b/fpicker/source/win32/misc/AutoBuffer.hxx
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index cdcd45d523..cdcd45d523 100644..100755
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index c6e6c93904..c6e6c93904 100644..100755
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
index 70faefdeae..70faefdeae 100644..100755
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/source/win32/misc/makefile.mk
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 9e46dc010f..9e46dc010f 100644..100755
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 967c87d3dc..967c87d3dc 100644..100755
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 4157d339bd..4157d339bd 100644..100755
--- a/fpicker/test/makefile.mk
+++ b/fpicker/test/makefile.mk
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index daf57136fc..daf57136fc 100644..100755
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp
index 028ac41759..f0e1c69934 100644..100755
--- a/fpicker/util/exports.dxp
+++ b/fpicker/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo	
 component_getFactory
diff --git a/fpicker/util/fop.component b/fpicker/util/fop.component
new file mode 100755
index 0000000000..a31c096dd4
--- /dev/null
+++ b/fpicker/util/fop.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.ui.dialogs.Win32FolderPicker">
+    <service name="com.sun.star.ui.dialogs.SystemFolderPicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/util/fps.component b/fpicker/util/fps.component
new file mode 100755
index 0000000000..cc18d21102
--- /dev/null
+++ b/fpicker/util/fps.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.ui.dialogs.Win32FilePicker">
+    <service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
+  </implementation>
+</component>
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index e9642f592c..39fb318377 100644..100755
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -102,3 +102,16 @@ DEF2EXPORTFILE=	exports.dxp
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/fop.component $(MISC)/fps.component
+
+$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fop.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fop.component
+
+$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fps.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fps.component
diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/AllLangResTarget_fwe.mk
index 039eba5760..10baea76a9 100755
--- a/framework/qa/complex/imageManager/interfaces/makefile.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,33 +25,39 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..
-TARGET  = ImageManager
-PRJNAME = framework
-PACKAGE = imageManager$/interfaces
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe))
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework))
 
+$(eval $(call gb_AllLangResTarget_add_srs,fwe,\
+    fwe/fwk_classes \
+    fwe/fwk_services \
+))
 
-#----- compile .java files -----------------------------------------
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = _XComponent.java _XUIConfiguration.java _XImageManager.java \
-                  _XUIConfigurationPersistence.java _XInitialization.java _XTypeProvider.java
+$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes))
 
-JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/classes \
+    -I$(OUTDIR)/inc \
+))
 
-#----- make a jar from compiled files ------------------------------
+$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\
+    framework/source/classes/resource.src \
+))
 
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services))
 
+$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/services \
+    -I$(OUTDIR)/inc \
+))
 
+$(eval $(call gb_SrsTarget_add_files,fwe/fwk_services,\
+    framework/source/services/fwk_services.src \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
new file mode 100755
index 0000000000..5865a6fb9f
--- /dev/null
+++ b/framework/JunitTest_framework_complex.mk
@@ -0,0 +1,102 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,framework_complex))
+
+$(eval $(call gb_JunitTest_set_defs,framework_complex,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \
+))
+
+$(eval $(call gb_JunitTest_add_jars,framework_complex,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\
+    framework/qa/complex/disposing/GetServiceWhileDisposingOffice \
+    framework/qa/complex/path_substitution/PathSubstitutionTest \
+    framework/qa/complex/loadAllDocuments/InteractionHandler \
+    framework/qa/complex/loadAllDocuments/StreamSimulator \
+    framework/qa/complex/loadAllDocuments/TestDocument \
+    framework/qa/complex/loadAllDocuments/CheckXComponentLoader \
+    framework/qa/complex/loadAllDocuments/StatusIndicator \
+    framework/qa/complex/broken_document/TestDocument \
+    framework/qa/complex/broken_document/LoadDocument \
+    framework/qa/complex/XUserInputInterception/EventTest \
+    framework/qa/complex/framework/autosave/AutoSave \
+    framework/qa/complex/framework/autosave/Protocol \
+    framework/qa/complex/framework/autosave/ConfigHelper \
+    framework/qa/complex/framework/recovery/TimeoutThread \
+    framework/qa/complex/framework/recovery/KlickButtonThread \
+    framework/qa/complex/framework/recovery/RecoveryTools \
+    framework/qa/complex/framework/recovery/RecoveryTest \
+    framework/qa/complex/framework/recovery/CrashThread \
+    framework/qa/complex/accelerators/AcceleratorsConfigurationTest \
+    framework/qa/complex/accelerators/KeyMapping \
+    framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor \
+    framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor \
+    framework/qa/complex/path_settings/PathSettingsTest \
+    framework/qa/complex/desktop/DesktopTerminate \
+    framework/qa/complex/imageManager/_XComponent \
+    framework/qa/complex/imageManager/CheckImageManager \
+    framework/qa/complex/imageManager/_XTypeProvider \
+    framework/qa/complex/imageManager/_XInitialization \
+    framework/qa/complex/imageManager/_XImageManager \
+    framework/qa/complex/imageManager/_XUIConfigurationPersistence \
+    framework/qa/complex/imageManager/_XUIConfiguration \
+    framework/qa/complex/api_internal/CheckAPI \
+    framework/qa/complex/dispatches/Interceptor \
+    framework/qa/complex/ModuleManager/CheckXModuleManager \
+))
+
+# does not build
+#	framework/qa/complex/dispatches/checkdispatchapi \
+
+$(eval $(call gb_JunitTest_add_classes,framework_complex,\
+))
+# these were disabled in the old build system too, please check
+# carefully before reenabling
+#	complex.ModuleManager.CheckXModuleManager \
+    complex.XUserInputInterception.EventTest \
+    complex.accelerators.AcceleratorsConfigurationTest \
+    complex.dispatches.checkdispatchapi \
+    complex.api_internal.CheckAPI \
+    complex.broken_document.LoadDocument \
+    complex.desktop.DesktopTerminate \
+    complex.disposing.GetServiceWhileDisposingOffice \
+    complex.framework.autosave.AutoSave \
+    complex.framework.recovery.RecoveryTest \
+    complex.imageManager.CheckImageManager \
+    complex.loadAllDocuments.CheckXComponentLoader \
+    complex.path_settings.PathSettingsTest \
+    complex.path_substitution.PathSubstitutionTest \
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/source/accessibility/makefile.mk b/framework/JunitTest_framework_unoapi.mk
index 530b6cac8b..1204ee5262 100644..100755
--- a/editeng/source/accessibility/makefile.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,31 +25,29 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+$(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
 
-PRJNAME=editeng
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/framework/qa/unoapi/framework.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/framework/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \
+))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_JunitTest_add_jars,framework_unoapi,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\
+    framework/qa/unoapi/Test \
+))
 
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/AccessibleStringWrap.obj			\
-    $(SLO)$/AccessibleContextBase.obj			\
-    $(SLO)$/AccessibleComponentBase.obj			\
-    $(SLO)$/AccessibleSelectionBase.obj			\
-    $(SLO)$/AccessibleStaticTextBase.obj		\
-    $(SLO)$/AccessibleParaManager.obj			\
-    $(SLO)$/AccessibleEditableTextPara.obj		\
-    $(SLO)$/AccessibleHyperlink.obj			    \
-    $(SLO)$/AccessibleImageBullet.obj			
-    
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\
+    org.openoffice.framework.qa.unoapi.Test \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
new file mode 100755
index 0000000000..5d30d108cd
--- /dev/null
+++ b/framework/Library_fwe.mk
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,fwe))
+
+$(eval $(call gb_Library_set_include,fwe,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,fwe,\
+    $$(DEFS) \
+    -DFWE_DLLIMPLEMENTATION\
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwe,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwi \
+    sal \
+    stl \
+    svl \
+    svt \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwe,\
+    framework/source/fwe/classes/actiontriggercontainer \
+    framework/source/fwe/classes/actiontriggerpropertyset \
+    framework/source/fwe/classes/actiontriggerseparatorpropertyset \
+    framework/source/fwe/classes/addonmenu \
+    framework/source/fwe/classes/addonsoptions \
+    framework/source/fwe/classes/bmkmenu \
+    framework/source/fwe/classes/framelistanalyzer \
+    framework/source/fwe/classes/fwkresid \
+    framework/source/fwe/classes/imagewrapper \
+    framework/source/fwe/classes/menuextensionsupplier \
+    framework/source/fwe/classes/rootactiontriggercontainer \
+    framework/source/fwe/classes/sfxhelperfunctions \
+    framework/source/fwe/dispatch/interaction \
+    framework/source/fwe/helper/acceleratorinfo \
+    framework/source/fwe/helper/actiontriggerhelper \
+    framework/source/fwe/helper/configimporter \
+    framework/source/fwe/helper/imageproducer \
+    framework/source/fwe/helper/propertysetcontainer \
+    framework/source/fwe/helper/titlehelper \
+    framework/source/fwe/helper/documentundoguard \
+    framework/source/fwe/helper/undomanagerhelper \
+    framework/source/fwe/interaction/preventduplicateinteraction \
+    framework/source/fwe/xml/eventsconfiguration \
+    framework/source/fwe/xml/eventsdocumenthandler \
+    framework/source/fwe/xml/imagesconfiguration \
+    framework/source/fwe/xml/imagesdocumenthandler \
+    framework/source/fwe/xml/menuconfiguration \
+    framework/source/fwe/xml/menudocumenthandler \
+    framework/source/fwe/xml/saxnamespacefilter \
+    framework/source/fwe/xml/statusbarconfiguration \
+    framework/source/fwe/xml/statusbardocumenthandler \
+    framework/source/fwe/xml/toolboxconfiguration \
+    framework/source/fwe/xml/toolboxdocumenthandler \
+    framework/source/fwe/xml/xmlnamespaces \
+))
+
+#todo: ImageListDescriptor can't be exported completely without exporting everything
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
new file mode 100755
index 0000000000..046c7230e3
--- /dev/null
+++ b/framework/Library_fwi.mk
@@ -0,0 +1,86 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,fwi))
+
+$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
+
+$(eval $(call gb_Library_set_defs,fwi,\
+    $$(DEFS) \
+    -DFWI_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_include,fwi,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwi,\
+    framework/source/fwi/classes/converter \
+    framework/source/fwi/classes/propertysethelper \
+    framework/source/fwi/classes/protocolhandlercache \
+    framework/source/fwi/helper/mischelper \
+    framework/source/fwi/helper/networkdomain \
+    framework/source/fwi/helper/shareablemutex \
+    framework/source/fwi/jobs/configaccess \
+    framework/source/fwi/jobs/jobconst \
+    framework/source/fwi/threadhelp/lockhelper \
+    framework/source/fwi/threadhelp/transactionmanager \
+    framework/source/fwi/uielement/constitemcontainer \
+    framework/source/fwi/uielement/itemcontainer \
+    framework/source/fwi/uielement/rootitemcontainer \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,fwi,\
+    advapi32 \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
new file mode 100755
index 0000000000..a34a1bc597
--- /dev/null
+++ b/framework/Library_fwk.mk
@@ -0,0 +1,188 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,fwk))
+
+$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework))
+
+$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
+
+$(eval $(call gb_Library_set_include,fwk,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(SRCDIR)/framework/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    fwi \
+    i18nisolang1 \
+    sal \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwk,\
+    framework/source/accelerators/acceleratorcache \
+    framework/source/accelerators/acceleratorconfiguration \
+    framework/source/accelerators/documentacceleratorconfiguration \
+    framework/source/accelerators/globalacceleratorconfiguration \
+    framework/source/accelerators/keymapping \
+    framework/source/accelerators/moduleacceleratorconfiguration \
+    framework/source/accelerators/presethandler \
+    framework/source/accelerators/storageholder \
+    framework/source/classes/droptargetlistener \
+    framework/source/classes/framecontainer \
+    framework/source/classes/fwktabwindow \
+    framework/source/classes/menumanager \
+    framework/source/classes/taskcreator \
+    framework/source/constant/containerquery \
+    framework/source/constant/contenthandler \
+    framework/source/constant/frameloader \
+    framework/source/dispatch/closedispatcher \
+    framework/source/dispatch/dispatchinformationprovider \
+    framework/source/dispatch/dispatchprovider \
+    framework/source/dispatch/helpagentdispatcher \
+    framework/source/dispatch/interceptionhelper \
+    framework/source/dispatch/loaddispatcher \
+    framework/source/dispatch/menudispatcher \
+    framework/source/dispatch/startmoduledispatcher \
+    framework/source/dispatch/windowcommanddispatch \
+    framework/source/helper/dockingareadefaultacceptor \
+    framework/source/helper/ocomponentaccess \
+    framework/source/helper/ocomponentenumeration \
+    framework/source/helper/oframes \
+    framework/source/helper/persistentwindowstate \
+    framework/source/helper/statusindicator \
+    framework/source/helper/statusindicatorfactory \
+    framework/source/helper/tagwindowasmodified \
+    framework/source/helper/titlebarupdate \
+    framework/source/helper/uiconfigelementwrapperbase \
+    framework/source/helper/uielementwrapperbase \
+    framework/source/helper/vclstatusindicator \
+    framework/source/helper/wakeupthread \
+    framework/source/interaction/quietinteraction \
+    framework/source/jobs/job \
+    framework/source/jobs/jobdata \
+    framework/source/jobs/jobdispatch \
+    framework/source/jobs/jobexecutor \
+    framework/source/jobs/jobresult \
+    framework/source/jobs/joburl \
+    framework/source/layoutmanager/helpers \
+    framework/source/layoutmanager/layoutmanager \
+    framework/source/layoutmanager/panel \
+    framework/source/layoutmanager/panelmanager \
+    framework/source/layoutmanager/toolbarlayoutmanager \
+    framework/source/layoutmanager/uielement \
+    framework/source/loadenv/loadenv \
+    framework/source/loadenv/targethelper \
+    framework/source/register/registerservices \
+    framework/source/services/autorecovery \
+    framework/source/services/backingcomp \
+    framework/source/services/backingwindow \
+    framework/source/services/desktop \
+    framework/source/services/frame \
+    framework/source/services/modelwinservice \
+    framework/source/services/modulemanager \
+    framework/source/services/pathsettings \
+    framework/source/services/sessionlistener \
+    framework/source/services/substitutepathvars \
+    framework/source/services/tabwindowservice \
+    framework/source/services/taskcreatorsrv \
+    framework/source/services/uriabbreviation \
+    framework/source/services/urltransformer \
+    framework/source/uiconfiguration/globalsettings \
+    framework/source/uiconfiguration/graphicnameaccess \
+    framework/source/uiconfiguration/imagemanager \
+    framework/source/uiconfiguration/imagemanagerimpl \
+    framework/source/uiconfiguration/moduleimagemanager \
+    framework/source/uiconfiguration/moduleuicfgsupplier \
+    framework/source/uiconfiguration/moduleuiconfigurationmanager \
+    framework/source/uiconfiguration/uicategorydescription \
+    framework/source/uiconfiguration/uiconfigurationmanager \
+    framework/source/uiconfiguration/uiconfigurationmanagerimpl \
+    framework/source/uiconfiguration/windowstateconfiguration \
+    framework/source/uielement/addonstoolbarmanager \
+    framework/source/uielement/addonstoolbarwrapper \
+    framework/source/uielement/buttontoolbarcontroller \
+    framework/source/uielement/comboboxtoolbarcontroller \
+    framework/source/uielement/complextoolbarcontroller \
+    framework/source/uielement/controlmenucontroller \
+    framework/source/uielement/dropdownboxtoolbarcontroller \
+    framework/source/uielement/edittoolbarcontroller \
+    framework/source/uielement/generictoolbarcontroller \
+    framework/source/uielement/imagebuttontoolbarcontroller \
+    framework/source/uielement/langselectionstatusbarcontroller \
+    framework/source/uielement/menubarmanager \
+    framework/source/uielement/menubarmerger \
+    framework/source/uielement/menubarwrapper \
+    framework/source/uielement/objectmenucontroller \
+    framework/source/uielement/panelwindow \
+    framework/source/uielement/panelwrapper \
+    framework/source/uielement/progressbarwrapper \
+    framework/source/uielement/recentfilesmenucontroller \
+    framework/source/uielement/spinfieldtoolbarcontroller \
+    framework/source/uielement/statusbar \
+    framework/source/uielement/statusbarmanager \
+    framework/source/uielement/statusbarwrapper \
+    framework/source/uielement/statusindicatorinterfacewrapper \
+    framework/source/uielement/togglebuttontoolbarcontroller \
+    framework/source/uielement/toolbar \
+    framework/source/uielement/toolbarmanager \
+    framework/source/uielement/toolbarmerger \
+    framework/source/uielement/toolbarwrapper \
+    framework/source/uielement/uicommanddescription \
+    framework/source/uifactory/addonstoolboxfactory \
+    framework/source/uifactory/factoryconfiguration \
+    framework/source/uifactory/menubarfactory \
+    framework/source/uifactory/popupmenucontrollerfactory \
+    framework/source/uifactory/statusbarcontrollerfactory \
+    framework/source/uifactory/statusbarfactory \
+    framework/source/uifactory/toolbarcontrollerfactory \
+    framework/source/uifactory/toolboxfactory \
+    framework/source/uifactory/uielementfactorymanager \
+    framework/source/uifactory/windowcontentfactorymanager \
+    framework/source/xml/acceleratorconfigurationreader \
+    framework/source/xml/acceleratorconfigurationwriter \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
new file mode 100755
index 0000000000..928c723d3f
--- /dev/null
+++ b/framework/Library_fwl.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,fwl))
+
+$(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
+
+$(eval $(call gb_Library_set_include,fwl,\
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwl,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    fwi \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwl,\
+    framework/source/classes/fwlresid \
+    framework/source/dispatch/mailtodispatcher \
+    framework/source/dispatch/oxt_handler \
+    framework/source/dispatch/popupmenudispatcher \
+    framework/source/dispatch/servicehandler \
+    framework/source/recording/dispatchrecorder \
+    framework/source/recording/dispatchrecordersupplier \
+    framework/source/register/registertemp \
+    framework/source/services/dispatchhelper \
+    framework/source/services/license \
+    framework/source/services/mediatypedetectionhelper \
+    framework/source/services/uriabbreviation \
+    framework/source/uielement/fontmenucontroller \
+    framework/source/uielement/fontsizemenucontroller \
+    framework/source/uielement/footermenucontroller \
+    framework/source/uielement/headermenucontroller \
+    framework/source/uielement/langselectionmenucontroller \
+    framework/source/uielement/logoimagestatusbarcontroller \
+    framework/source/uielement/logotextstatusbarcontroller \
+    framework/source/uielement/macrosmenucontroller \
+    framework/source/uielement/newmenucontroller \
+    framework/source/uielement/popupmenucontroller \
+    framework/source/uielement/simpletextstatusbarcontroller \
+    framework/source/uielement/toolbarsmenucontroller \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
new file mode 100755
index 0000000000..dbd486c40d
--- /dev/null
+++ b/framework/Library_fwm.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,fwm))
+
+$(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm))
+
+$(eval $(call gb_Library_set_include,fwm,\
+    -I$(SRCDIR)/framework/inc/pch \
+    -I$(SRCDIR)/framework/inc \
+    -I$(SRCDIR)/framework/source/inc \
+    -I$(WORKDIR)/inc/framework/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/framework \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fwm,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwi \
+    sal \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    utl \
+    vcl \
+    vos3 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fwm,\
+    framework/source/dispatch/systemexec \
+    framework/source/jobs/helponstartup \
+    framework/source/jobs/shelljob \
+    framework/source/register/register3rdcomponents \
+    framework/source/tabwin/tabwindow \
+    framework/source/tabwin/tabwinfactory \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Makefile b/framework/Makefile
new file mode 100755
index 0000000000..a79aff8310
--- /dev/null
+++ b/framework/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
new file mode 100755
index 0000000000..82e5a34e51
--- /dev/null
+++ b/framework/Module_framework.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,framework))
+
+$(eval $(call gb_Module_add_targets,framework,\
+    AllLangResTarget_fwe \
+    Library_fwe \
+    Library_fwi \
+    Library_fwk \
+    Library_fwl \
+    Library_fwm \
+    Package_dtd \
+    Package_inc \
+    Package_uiconfig \
+    Package_unotypes \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
+    JunitTest_framework_complex \
+    JunitTest_framework_unoapi \
+))
+# vim: set noet ts=4 sw=4:
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
new file mode 100755
index 0000000000..99318b553a
--- /dev/null
+++ b/framework/Package_dtd.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd))
+$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd))
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
new file mode 100755
index 0000000000..6d1c03a597
--- /dev/null
+++ b/framework/Package_inc.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/framelistanalyzer.hxx,framework/framelistanalyzer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/documentundoguard.hxx,framework/documentundoguard.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/undomanagerhelper.hxx,framework/undomanagerhelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imutex.hxx,framework/imutex.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/iguard.hxx,framework/iguard.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,framework/fwedllapi.h))
+$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h))
+$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h))
diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk
new file mode 100755
index 0000000000..0eca53143c
--- /dev/null
+++ b/framework/Package_uiconfig.mk
@@ -0,0 +1,31 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml))
diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk
new file mode 100755
index 0000000000..542dc09902
--- /dev/null
+++ b/framework/Package_unotypes.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes))
+$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml))
+$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml))
diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd
index 5217b635cd..5217b635cd 100644..100755
--- a/framework/dtd/accelerator.dtd
+++ b/framework/dtd/accelerator.dtd
diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd
index bf83b64583..bf83b64583 100644..100755
--- a/framework/dtd/event.dtd
+++ b/framework/dtd/event.dtd
diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd
index 7feb3c5e06..7feb3c5e06 100644..100755
--- a/framework/dtd/groupuinames.dtd
+++ b/framework/dtd/groupuinames.dtd
diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
index e79fdbbb42..e79fdbbb42 100644..100755
--- a/framework/dtd/image.dtd
+++ b/framework/dtd/image.dtd
diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
index df11832274..df11832274 100644..100755
--- a/framework/dtd/menubar.dtd
+++ b/framework/dtd/menubar.dtd
diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd
index 3b380317b6..3b380317b6 100644..100755
--- a/framework/dtd/statusbar.dtd
+++ b/framework/dtd/statusbar.dtd
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd
index 258f9ddb30..258f9ddb30 100644..100755
--- a/framework/dtd/toolbar.dtd
+++ b/framework/dtd/toolbar.dtd
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index 37caffcb93..37caffcb93 100644..100755
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h
index 89ee9c15d9..89ee9c15d9 100644..100755
--- a/framework/inc/arguments.h
+++ b/framework/inc/arguments.h
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 4413b405b2..68b62bb5a5 100644..100755
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -33,14 +33,16 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGERCONTAINER			"com.sun.star.ui.ActionTriggerContainer"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER	"com.sun.star.comp.ui.ActionTriggerContainer"
 
+
 namespace framework
 {
 
-class ActionTriggerContainer :	public PropertySetContainer,
+class FWE_DLLPUBLIC ActionTriggerContainer :	public PropertySetContainer,
                                 public com::sun::star::lang::XMultiServiceFactory,
                                 public com::sun::star::lang::XServiceInfo,
                                 public com::sun::star::lang::XTypeProvider
@@ -50,17 +52,17 @@ class ActionTriggerContainer :	public PropertySetContainer,
         virtual ~ActionTriggerContainer();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
             throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
         virtual void SAL_CALL release() throw ();
 
         // XMultiServiceFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) 
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) 
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() 
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
             throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
@@ -72,7 +74,7 @@ class ActionTriggerContainer :	public PropertySetContainer,
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 };
-                            
+
 }
 
 #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 6b1c35f020..7afa339faf 100644..100755
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger"
@@ -47,7 +48,7 @@
 namespace framework
 {
 
-class ActionTriggerPropertySet :	public ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+class ActionTriggerPropertySet :  public ThreadHelpBase                       ,   // Struct for right initalization of mutex member! Must be first of baseclasses.
                                     public ::com::sun::star::lang::XServiceInfo	,
                                     public ::com::sun::star::lang::XTypeProvider,
                                     public ::cppu::OBroadcastHelper				,
@@ -55,23 +56,23 @@ class ActionTriggerPropertySet :	public ThreadHelpBase						,	// Struct for righ
                                     public ::cppu::OWeakObject
 {
     public:
-        ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-        virtual ~ActionTriggerPropertySet();
+        FWE_DLLPUBLIC ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL acquire() throw ();
-        virtual void SAL_CALL release() throw ();
+        virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw ();
+        virtual FWE_DLLPUBLIC void SAL_CALL release() throw ();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XTypeProvider
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
         //---------------------------------------------------------------------------------------------------------
@@ -80,11 +81,11 @@ class ActionTriggerPropertySet :	public ThreadHelpBase						,	// Struct for righ
         virtual sal_Bool SAL_CALL convertFastPropertyValue(	com::sun::star::uno::Any&		aConvertedValue,
                                                             com::sun::star::uno::Any&		aOldValue,
                                                             sal_Int32						nHandle,
-                                                            const com::sun::star::uno::Any&	aValue			) 
+                                                            const com::sun::star::uno::Any&	aValue			)
             throw( com::sun::star::lang::IllegalArgumentException );
 
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(	sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) 
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(	sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
             throw( com::sun::star::uno::Exception );
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
@@ -92,7 +93,7 @@ class ActionTriggerPropertySet :	public ThreadHelpBase						,	// Struct for righ
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
-        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() 
+        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
             throw (::com::sun::star::uno::RuntimeException);
 
         static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 7998e26d62..cc9c07ddef 100644..100755
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -38,10 +38,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <framework/fwedllapi.h>
 
 #define SERVICENAME_ACTIONTRIGGERSEPARATOR			"com.sun.star.ui.ActionTriggerSeparator"
 #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR	"com.sun.star.comp.ui.ActionTriggerSeparator"
 
+
 namespace framework
 {
 
@@ -57,7 +59,7 @@ class ActionTriggerSeparatorPropertySet :	public ThreadHelpBase						,	// Struct
         virtual ~ActionTriggerSeparatorPropertySet();
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
             throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
         virtual void SAL_CALL release() throw ();
@@ -78,11 +80,11 @@ class ActionTriggerSeparatorPropertySet :	public ThreadHelpBase						,	// Struct
         virtual sal_Bool SAL_CALL convertFastPropertyValue(	com::sun::star::uno::Any&		aConvertedValue,
                                                             com::sun::star::uno::Any&		aOldValue,
                                                             sal_Int32						nHandle,
-                                                            const com::sun::star::uno::Any&	aValue			) 
+                                                            const com::sun::star::uno::Any&	aValue			)
             throw( com::sun::star::lang::IllegalArgumentException );
 
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(	sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) 
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(	sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
             throw( com::sun::star::uno::Exception );
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
@@ -90,7 +92,7 @@ class ActionTriggerSeparatorPropertySet :	public ThreadHelpBase						,	// Struct
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
-        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() 
+        virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
             throw (::com::sun::star::uno::RuntimeException);
 
         static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index d23d3a8510..d23d3a8510 100644..100755
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 5145c2c2bf..b0ad6dd0ba 100644..100755
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -48,6 +48,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <tools/datetime.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -63,7 +64,7 @@ namespace framework{
 //	exported definitions
 //_________________________________________________________________________________________________________________
 
-class Converter
+class FWI_DLLPUBLIC Converter
 {
     public:
         // Seq<Any> <=> Seq<beans.PropertyValue>
diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx
index c450905ced..c450905ced 100644..100755
--- a/framework/inc/classes/droptargetlistener.hxx
+++ b/framework/inc/classes/droptargetlistener.hxx
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 679facf873..679facf873 100644..100755
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 317bbd2d11..317bbd2d11 100644..100755
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index b627157bf4..b627157bf4 100644..100755
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index e5d528f748..0ded9ad323 100644..100755
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -30,16 +30,17 @@
 #define __FRAMEWORK_CLASSES_FWKRESID_HXX_
 
 #include <tools/resid.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class FwkResId : public ResId
+class FWE_DLLPUBLIC FwkResId : public ResId
 {
     public:
-        FwkResId( USHORT nId );
-        
-    static ResMgr*	GetResManager();
+        FwkResId( sal_uInt16 nId );
+
+    static ResMgr*  GetResManager();
 };
 
 }
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index abb3469711..2406ef9e4b 100644..100755
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -55,7 +55,7 @@ class FwkTabControl : public TabControl
 public:
     FwkTabControl( Window* pParent, const ResId& rResId );
 
-    void    BroadcastEvent( ULONG nEvent );
+    void    BroadcastEvent( sal_uLong nEvent );
 };
 
 class FwkTabPage : public TabPage
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index 6dea464ef8..b75c31d073 100644..100755
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -37,7 +37,7 @@ namespace framework
 class FwlResId : public ResId
 {
     public:
-        FwlResId( USHORT nId );
+        FwlResId( sal_uInt16 nId );
         
     static ResMgr*	GetResManager();
 };
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 7c0dd09edd..b587932201 100644..100755
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -35,11 +35,12 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <vcl/image.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class ImageWrapper : public ThreadHelpBase							,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase							,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                      public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap,
                                                     ::com::sun::star::lang::XUnoTunnel >
 {
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 98dd18c901..4a8123f0c8 100644..100755
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -118,16 +118,16 @@ class MenuManager : public ThreadHelpBase			,
         void UpdateSpecialWindowMenu( Menu* pMenu );
         void ClearMenuDispatch(const EVENTOBJECT& Source = EVENTOBJECT(),bool _bRemoveOnly = true);
         void SetHdl();
-        void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
-        USHORT FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
+        void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
+        sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const;
 
 
         struct MenuItemHandler
         {
-            MenuItemHandler( USHORT aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) :
+            MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) :
                 nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {}
 
-            USHORT					nItemId;
+            sal_uInt16					nItemId;
             ::rtl::OUString			aTargetFrame;
             ::rtl::OUString			aMenuItemURL;
             ::rtl::OUString			aFilter;
@@ -141,7 +141,7 @@ class MenuManager : public ThreadHelpBase			,
                             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList,
                             const MenuItemHandler* );
 
-        MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
+        MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
 
         sal_Bool							m_bInitialized;
         sal_Bool							m_bDeleteMenu;
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 173a54e7ab..687c622593 100644..100755
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -50,6 +50,7 @@
 //	other includes
 
 #include <cppuhelper/weakref.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -67,7 +68,7 @@ namespace framework{
  *  Further the derived and this base class share the same lock.
  *  So it's possible to be threadsafe if it's needed.
 */
-class PropertySetHelper : public css::beans::XPropertySet
+class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
                         , public css::beans::XPropertySetInfo
 {
     //-------------------------------------------------------------------------
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index c9b9dcac77..3a2a727af6 100644..100755
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -48,6 +48,7 @@
 
 #include <unotools/configitem.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -77,7 +78,7 @@ namespace framework{
     This struct holds the information about one such registered protocol handler.
     A list of handler objects is defined as ProtocolHandlerHash. see below
 */
-struct ProtocolHandler
+struct FWI_DLLPUBLIC ProtocolHandler
 {
     /* member */
     public:
@@ -95,7 +96,7 @@ struct ProtocolHandler
     uno implementation names as value. Overloading of the index operator makes it possible
     to search for a key by using a full qualified URL on list of all possible pattern keys.
 */
-class PatternHash : public BaseHash< ::rtl::OUString >
+class FWI_DLLPUBLIC PatternHash : public BaseHash< ::rtl::OUString >
 {
     /* interface */
     public:
@@ -134,7 +135,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash;
 */
 
 class HandlerCFGAccess;
-class HandlerCache
+class FWI_DLLPUBLIC HandlerCache
 {
     /* member */
     private:
@@ -179,7 +180,7 @@ class HandlerCache
 
     @modified       30.04.2002 09:58, as96863
 */
-class HandlerCFGAccess : public ::utl::ConfigItem
+class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
 {
     private:
         HandlerCache* m_pCache;
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index cc85041b41..cc85041b41 100644..100755
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 80ba7913ec..e7cd96e77f 100644..100755
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -36,14 +36,15 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <framework/fwedllapi.h>
 
-#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER	"com.sun.star.comp.ui.RootActionTriggerContainer"
+#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER   "com.sun.star.comp.ui.RootActionTriggerContainer"
 
 
 namespace framework
 {
 
-class RootActionTriggerContainer :	public PropertySetContainer,
+class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
                                     public com::sun::star::lang::XMultiServiceFactory,
                                     public com::sun::star::lang::XServiceInfo,
                                     public com::sun::star::lang::XUnoTunnel,
@@ -54,47 +55,47 @@ class RootActionTriggerContainer :	public PropertySetContainer,
         RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
         virtual ~RootActionTriggerContainer();
 
-        const Menu*	GetMenu();
-        
+        const Menu* GetMenu();
+
         ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId() const;
 
         // XInterface
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
             throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL acquire() throw ();
         virtual void SAL_CALL release() throw ();
 
         // XMultiServiceFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) 
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) 
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() 
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames()
             throw (::com::sun::star::uno::RuntimeException);
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) 
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        
-        virtual void SAL_CALL removeByIndex( sal_Int32 Index ) 
+
+        virtual void SAL_CALL removeByIndex( sal_Int32 Index )
             throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) 
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() 
+        virtual sal_Int32 SAL_CALL getCount()
             throw (::com::sun::star::uno::RuntimeException);
-        
-        virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) 
+
+        virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
             throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XElementAccess
-        virtual ::com::sun::star::uno::Type SAL_CALL getElementType() 
+        virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
             throw (::com::sun::star::uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL hasElements() 
+
+        virtual sal_Bool SAL_CALL hasElements()
             throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
@@ -112,17 +113,17 @@ class RootActionTriggerContainer :	public PropertySetContainer,
         // XNamed
         virtual ::rtl::OUString SAL_CALL getName(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-    
+
     private:
         void FillContainer();
 
-        sal_Bool	m_bContainerCreated;
-        sal_Bool	m_bContainerChanged;
-        sal_Bool	m_bInContainerCreation;
-        const Menu*	m_pMenu;
+        sal_Bool    m_bContainerCreated;
+        sal_Bool    m_bContainerChanged;
+        sal_Bool    m_bInContainerCreation;
+        const Menu* m_pMenu;
         const ::rtl::OUString* m_pMenuIdentifier;
 };
-                            
+
 }
 
 #endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx
index b0ce5ee325..b0ce5ee325 100644..100755
--- a/framework/inc/classes/servicemanager.hxx
+++ b/framework/inc/classes/servicemanager.hxx
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index a64c347e11..a64c347e11 100644..100755
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 59342778da..59342778da 100644..100755
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index a5a064e34e..a5a064e34e 100644..100755
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 744d05d974..744d05d974 100644..100755
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx
index 0efce68fe3..0efce68fe3 100644..100755
--- a/framework/inc/dispatch/blankdispatcher.hxx
+++ b/framework/inc/dispatch/blankdispatcher.hxx
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index f8f5cc2fb0..cdb8112776 100644..100755
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -226,7 +226,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     We need it to implement the CLOSE_DOC semantic.
 
             @return [boolean]
-                    TRUE if closing was successfully.
+                    sal_True if closing was successfully.
          */
         sal_Bool implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
                                                      sal_Bool                                   bAllowSuspend         ,
@@ -246,7 +246,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     frame is closed ....
 
             @return [bool]
-                    TRUE if closing was successfully.
+                    sal_True if closing was successfully.
          */
         sal_Bool implts_closeFrame();
 
@@ -255,7 +255,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     as new component of our m_xCloseFrame.
 
             @return [bool]
-                    TRUE if operation was successfully.
+                    sal_True if operation was successfully.
          */
         sal_Bool implts_establishBackingMode();
 
@@ -269,7 +269,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
                     Because he should know, that such things will happen :-)
 
             @return [bool]
-                    TRUE if termination of the application was started ...
+                    sal_True if termination of the application was started ...
          */
         sal_Bool implts_terminateApplication();
 
diff --git a/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx
index 48103eefb2..48103eefb2 100644..100755
--- a/framework/inc/dispatch/createdispatcher.hxx
+++ b/framework/inc/dispatch/createdispatcher.hxx
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index a8b14e1a7a..a8b14e1a7a 100644..100755
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index bad8ea4ed4..bad8ea4ed4 100644..100755
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx
index 9f2c2085f3..42a9d84d3e 100644..100755
--- a/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -148,8 +148,8 @@ class HelpAgentDispatcher : public  css::lang::XTypeProvider
                     in case a new dispatch occures or in case the timer expired.
     
             @return	[sal_Bool]
-                    TRUE in case the member m_xAgentWindow is a valid reference;
-                    FALSE otherwise.
+                    sal_True in case the member m_xAgentWindow is a valid reference;
+                    sal_False otherwise.
         */
         css::uno::Reference< css::awt::XWindow > implts_ensureAgentWindow();
     
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
deleted file mode 100644
index 4d269daab5..0000000000
--- a/framework/inc/dispatch/interaction.hxx
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XInteractionContinuation.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/document/XInteractionFilterSelect.hpp>
-#include <com/sun/star/document/NoSuchFilterRequest.hpp>
-#include <com/sun/star/document/AmbigousFilterRequest.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//_________________________________________________________________________________________________________________
-//	non exported const
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//	non exported definitions
-//_________________________________________________________________________________________________________________
-
-//_________________________________________________________________________________________________________________
-//	declarations
-//_________________________________________________________________________________________________________________
-
-/*-************************************************************************************************************//**
-    @short          base for continuation classes
-    @descr          An interaction continuation could be used on XInteractionHandler/XInteractionRequest
-                    to abort or react for it.
-                    Base functionality is everytime the same - handler mark right continuation by calling
-                    interface method "select()". User of interaction can detect it by testing c++ method "isSelected()"!
-                    Superclasses can add additional interfaces or methods to support additional features ...
-                    but selection of it is supported here!
-
-    @implements		XInterface
-                    XTypeProvider (supported by WeakImplHelper!)
-                    XInteractionContinuation
-
-    @base           WeakImplHelper1
-
-    @devstatus		ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-template< class TContinuationType >
-class ContinuationBase : public ::cppu::WeakImplHelper1< TContinuationType >
-{
-    // c++ interface
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        // initialize continuation with right start values
-        //---------------------------------------------------------------------------------------------------------
-        ContinuationBase()
-            :   m_bSelected( sal_False )
-        {
-        }
-
-        //---------------------------------------------------------------------------------------------------------
-        // was continuation selected by handler?
-        //---------------------------------------------------------------------------------------------------------
-        sal_Bool isSelected() const
-        {
-            return m_bSelected;
-        }
-
-        //---------------------------------------------------------------------------------------------------------
-        // make using more then once possible
-        //---------------------------------------------------------------------------------------------------------
-        void reset()
-        {
-            m_bSelected = sal_False;
-        }
-
-    // uno interface
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        // called by handler to mark continuation as the only possible solution for started interaction
-        //---------------------------------------------------------------------------------------------------------
-        virtual void SAL_CALL select() throw( ::com::sun::star::uno::RuntimeException )
-        {
-            m_bSelected = sal_True;
-        }
-
-    // member
-    private:
-
-        sal_Bool m_bSelected;
-
-};  // class ContinuationBase
-
-/*-************************************************************************************************************//**
-    @short          declaration of some simple continuations
-    @descr          These derived classes implements some simple continuations, which doesnt need and additional
-                    interfaces or methods. Her selected state is the only neccessary feature. User of it can
-                    distinguish by type between different functionality!
-
-    @implements     -
-
-    @base           ContinuationBase
-
-    @devstatus		ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-typedef ContinuationBase< ::com::sun::star::task::XInteractionAbort > ContinuationAbort;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > ContinuationApprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > ContinuationDisapprove;
-typedef ContinuationBase< ::com::sun::star::task::XInteractionRetry > ContinuationRetry;
-
-/*-************************************************************************************************************//**
-    @short          declaration of special continuation for filter selection
-    @descr          Sometimes filter detection during loading document failed. Then we need a possibility
-                    to ask user for his decision. These continuation transport selected filter by user to
-                    code user of interaction.
-
-    @attention      This implementation could be used one times only. We don't support a resetable continuation yet!
-                    Why? Normaly interaction should show a filter selection dialog and ask user for his decision.
-                    He can select any filter - then instances of these class will be called by handler ... or user
-                    close dialog without any selection. Then another continuation should be slected by handler to
-                    abort continuations ... Retrying isn't very usefull here ... I think.
-
-    @implements     XInteractionFilterSelect
-
-    @base           ImplInheritanceHelper1
-                    ContinuationBase
-
-    @devstatus		ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect >
-{
-    // c++ interface
-    public:
-        ContinuationFilterSelect();
-
-    // uno interface
-    public:
-        virtual void            SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::rtl::OUString SAL_CALL getFilter(                                ) throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::rtl::OUString m_sFilter;
-
-};  // class ContinuationFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction to ask user for right filter
-    @descr          These helper can be used to ask user for right filter, if filter detection failed.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-                    Use it and forget complex mechanism of interaction ...
-
-    @example        RequestFilterSelect*             pRequest = new RequestFilterSelect;
-                    Reference< XInteractionRequest > xRequest ( pRequest );
-                    xInteractionHandler->handle( xRequest );
-                    if( ! pRequest.isAbort() )
-                    {
-                        OUString sFilter = pRequest->getFilter();
-                    }
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus		ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        RequestFilterSelect( const ::rtl::OUString& sURL );
-        sal_Bool        isAbort  () const;
-        ::rtl::OUString getFilter() const;
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any                                                                                              SAL_CALL getRequest      () throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-        ContinuationAbort*                                                                                                         m_pAbort        ;
-        ContinuationFilterSelect*                                                                                                  m_pFilter       ;
-
-};  // class RequestFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction
-    @descr          User must decide between a preselected and another detected filter.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus		ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        RequestAmbigousFilter( const ::rtl::OUString& sURL            ,
-                               const ::rtl::OUString& sSelectedFilter ,
-                               const ::rtl::OUString& sDetectedFilter );
-        sal_Bool        isAbort  () const;
-        ::rtl::OUString getFilter() const;
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any                                                                                              SAL_CALL getRequest      () throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-        ContinuationAbort*                                                                                                         m_pAbort        ;
-        ContinuationFilterSelect*                                                                                                  m_pFilter       ;
-
-};  // class RequestFilterSelect
-
-/*-************************************************************************************************************//**
-    @short          special request for interaction
-    @descr          User must decide between a preselected and another detected filter.
-                    It capsulate communication with any interaction handler and supports an easy
-                    access on interaction results for user of these class.
-
-    @implements     XInteractionRequest
-
-    @base           WeakImplHelper1
-
-    @devstatus      ready to use
-    @threadsafe     no (used on once position only!)
-*//*-*************************************************************************************************************/
-class InteractionRequest : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
-{
-    // c++ interface
-    public:
-        InteractionRequest( const ::com::sun::star::uno::Any&                                                                                             aRequest       ,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations )
-        {
-            m_aRequest       = aRequest      ;
-            m_lContinuations = lContinuations;
-        }
-
-    // uno interface
-    public:
-        virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
-            throw( ::com::sun::star::uno::RuntimeException )
-            {
-                return m_aRequest;
-            }
-
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations()
-            throw( ::com::sun::star::uno::RuntimeException )
-            {
-                return m_lContinuations;
-            }
-
-    // member
-    private:
-        ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
-
-};  // class RequestFilterSelect
-
-}       //  namespace framework
-
-#endif  // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 3da0fd7b42..3da0fd7b42 100644..100755
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 26faece82c..26faece82c 100644..100755
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 85197c3245..85197c3245 100644..100755
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 163dfba4ea..163dfba4ea 100644..100755
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index b708d1fc7a..b708d1fc7a 100644..100755
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx
index 1f77b2b2a5..1f77b2b2a5 100644..100755
--- a/framework/inc/dispatch/selfdispatcher.hxx
+++ b/framework/inc/dispatch/selfdispatcher.hxx
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 54bbefab4c..54bbefab4c 100644..100755
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index ed9a0e09db..ac21bfedea 100644..100755
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -167,7 +167,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
         /** @short  open the special BackingComponent (now StartModule)
 
             @return [bool]
-                    TRUE if operation was successfully.
+                    sal_True if operation was successfully.
          */
         ::sal_Bool implts_establishBackingMode();
 
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 2a6755d6bd..2a6755d6bd 100644..100755
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 0084610324..0084610324 100644..100755
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 396dbe51ae..396dbe51ae 100644..100755
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx
index 3ec78674d4..6049198bfd 100644..100755
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/framework/acceleratorinfo.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/keycod.hxx>
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index 2fc8835cf6..c6f3008145 100644..100755
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -34,11 +34,12 @@
 // #110897#
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/menu.hxx>
+#include <framework/fwedllapi.h>
 
 
 namespace framework
 {
-    class ActionTriggerHelper
+    class FWE_DLLPUBLIC ActionTriggerHelper
     {
         public:
             // Fills the submitted menu with the structure contained in the second
@@ -46,10 +47,10 @@ namespace framework
             // @param pNewMenu = must be a valid and empty menu
             // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContaienr"
             static void
-                CreateMenuFromActionTriggerContainer( 
+                CreateMenuFromActionTriggerContainer(
                     Menu* pNewMenu,
                     const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer );
-            
+
             // Creates a "com::sun::star::ui::ActionTriggerContainer" with the structure of the menu
             // provided as a parameter. The implementation class stores the menu pointer
             // to optimize the time of creation of a menu from a actiontrigger structure.
@@ -69,7 +70,7 @@ namespace framework
             // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContainer"
             // @param pNewMenu = must be a valid menu
             static void
-                FillActionTriggerContainerFromMenu( 
+                FillActionTriggerContainerFromMenu(
                     com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer,
                     const Menu* pMenu );
 
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx
index 221483496c..33d1f97f02 100644..100755
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/framework/addonmenu.hxx
@@ -41,6 +41,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/menu.hxx>
+#include <framework/fwedllapi.h>
 
 #define ADDONMENU_ITEMID_START       2000
 #define ADDONMENU_ITEMID_END         3000
@@ -48,7 +49,7 @@
 namespace framework
 {
 
-class AddonMenu : public PopupMenu
+class FWE_DLLPUBLIC AddonMenu : public PopupMenu
 {
     public:
         AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
@@ -60,7 +61,7 @@ class AddonMenu : public PopupMenu
 
 class AddonMenuManager;
 
-class AddonPopupMenu : public AddonMenu
+class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
 {
     public:
         ~AddonPopupMenu();
@@ -82,7 +83,7 @@ class AddonPopupMenu : public AddonMenu
     friend class AddonMenuManager;
 };
 
-class AddonMenuManager
+class FWE_DLLPUBLIC AddonMenuManager
 {
     public:
         enum MenuType
@@ -93,9 +94,9 @@ class AddonMenuManager
 
         static sal_Bool   HasAddonMenuElements();
         static sal_Bool   HasAddonHelpMenuElements();
-        
-        static sal_Bool   IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
-    
+
+        static sal_Bool   IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
+
         // Check if the context string matches the provided xModel context
         static sal_Bool	  IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
 
@@ -104,7 +105,7 @@ class AddonMenuManager
 
         // Create the Add-Ons menu
         static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-        
+
         // Merge the Add-Ons help menu items into the given menu bar at a defined pos
         static void		  MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                               MenuBar* pMergeMenuBar );
@@ -112,17 +113,17 @@ class AddonMenuManager
         // Merge the addon popup menus into the given menu bar at the provided pos.
         static void       MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                                 const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel,
-                                                USHORT	 nMergeAtPos,
+                                                sal_uInt16	 nMergeAtPos,
                                                 MenuBar* pMergeMenuBar );
 
         // Returns the next position to insert a menu item/sub menu
-        static USHORT     GetNextPos( USHORT nPos );
+        static sal_uInt16     GetNextPos( sal_uInt16 nPos );
 
         // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
         static void       BuildMenu( PopupMenu*  pCurrentMenu,
                                      MenuType    nSubMenuType,
-                                     USHORT      nInsPos,
-                                     USHORT&     nUniqueMenuId,
+                                     sal_uInt16      nInsPos,
+                                     sal_uInt16&     nUniqueMenuId,
                                      com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel );
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx
index 0912b4d93d..92d18a8e4c 100644..100755
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/framework/addonsoptions.hxx
@@ -29,7 +29,7 @@
 #define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
 
 //_________________________________________________________________________________________________________________
-//	includes
+//  includes
 //_________________________________________________________________________________________________________________
 
 #include <sal/types.h>
@@ -39,13 +39,13 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
-//	types, enums, ...
+//  types, enums, ...
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @descr			The method GetAddonsMenu() returns a list of property values.
+    @descr          The method GetAddonsMenu() returns a list of property values.
                     Use follow defines to seperate values by names.
 *//*-*************************************************************************************************************/
 #define ADDONSMENUITEM_STRING_URL                       "URL"
@@ -64,25 +64,25 @@
 #define ADDONSMENUITEM_CONTEXT_LEN                      7
 #define ADDONSMENUITEM_IMAGEIDENTIFIER_LEN              15
 
-#define ADDONSMENUITEM_PROPERTYNAME_URL					::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL			  ))
-#define ADDONSMENUITEM_PROPERTYNAME_TITLE				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE		      ))
-#define ADDONSMENUITEM_PROPERTYNAME_TARGET				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET		  ))
-#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER		::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ))
-#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT		  ))
-#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU		  ))
-#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE	  ))
-#define ADDONSMENUITEM_PROPERTYNAME_WIDTH               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH	          ))
+#define ADDONSMENUITEM_PROPERTYNAME_URL                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL             ))
+#define ADDONSMENUITEM_PROPERTYNAME_TITLE               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE           ))
+#define ADDONSMENUITEM_PROPERTYNAME_TARGET              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET          ))
+#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER ))
+#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT         ))
+#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU         ))
+#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE     ))
+#define ADDONSMENUITEM_PROPERTYNAME_WIDTH               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH           ))
 
-#define ADDONSPOPUPMENU_URL_PREFIX_STR					"private:menu/Addon"
+#define ADDONSPOPUPMENU_URL_PREFIX_STR                  "private:menu/Addon"
 
-#define ADDONSPOPUPMENU_URL_PREFIX						::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR ))
+#define ADDONSPOPUPMENU_URL_PREFIX                      ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR ))
 
 namespace framework
 {
 
 typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > MergeMenuDefinition;
 
-struct MergeMenuInstruction
+struct FWE_DLLPUBLIC MergeMenuInstruction
 {
     ::rtl::OUString     aMergePoint;
     ::rtl::OUString     aMergeCommand;
@@ -93,7 +93,7 @@ struct MergeMenuInstruction
 };
 typedef ::std::vector< MergeMenuInstruction > MergeMenuInstructionContainer;
 
-struct MergeToolbarInstruction
+struct FWE_DLLPUBLIC MergeToolbarInstruction
 {
     ::rtl::OUString     aMergeToolbar;
     ::rtl::OUString     aMergePoint;
@@ -107,12 +107,12 @@ struct MergeToolbarInstruction
 typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer;
 
 //_________________________________________________________________________________________________________________
-//	forward declarations
+//  forward declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short			forward declaration to our private date container implementation
-    @descr			We use these class as internal member to support small memory requirements.
+    @short          forward declaration to our private date container implementation
+    @descr          We use these class as internal member to support small memory requirements.
                     You can create the container if it is neccessary. The class which use these mechanism
                     is faster and smaller then a complete implementation!
 *//*-*************************************************************************************************************/
@@ -120,94 +120,94 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine
 class AddonsOptions_Impl;
 
 //_________________________________________________________________________________________________________________
-//	declarations
+//  declarations
 //_________________________________________________________________________________________________________________
 
 /*-************************************************************************************************************//**
-    @short			collect informations about menu features
+    @short          collect informations about menu features
     @descr          -
 
-    @implements		-
-    @base			-
+    @implements     -
+    @base           -
 
-    @devstatus		ready to use
+    @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class AddonsOptions
+class FWE_DLLPUBLIC AddonsOptions
 {
     //-------------------------------------------------------------------------------------------------------------
-    //	public methods
+    //  public methods
     //-------------------------------------------------------------------------------------------------------------
 
     public:
         //---------------------------------------------------------------------------------------------------------
-        //	constructor / destructor
+        //  constructor / destructor
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short		standard constructor and destructor
-            @descr		This will initialize an instance with default values.
+            @short      standard constructor and destructor
+            @descr      This will initialize an instance with default values.
                         We implement these class with a refcount mechanism! Every instance of this class increase it
                         at create and decrease it at delete time - but all instances use the same data container!
                         He is implemented as a static member ...
 
-            @seealso	member m_nRefCount
-            @seealso	member m_pDataContainer
+            @seealso    member m_nRefCount
+            @seealso    member m_pDataContainer
 
-            @param		-
-            @return		-
+            @param      -
+            @return     -
 
-            @onerror	-
+            @onerror    -
         *//*-*****************************************************************************************************/
 
          AddonsOptions();
         ~AddonsOptions();
 
         //---------------------------------------------------------------------------------------------------------
-        //	interface
+        //  interface
         //---------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short		clears completely the addons menu
+            @short      clears completely the addons menu
             @descr      Call this methods to clear the addons menu
                         To fill it again use AppendItem().
 
-            @seealso	-
+            @seealso    -
 
             @param      "eMenu" select right menu to clear.
-            @return		-
+            @return     -
 
-            @onerror	-
+            @onerror    -
         *//*-*****************************************************************************************************/
 
         void Clear();
 
         /*-****************************************************************************************************//**
-            @short		returns if an addons menu is available
+            @short      returns if an addons menu is available
             @descr      Call to retrieve if a addons menu is available
 
 
-            @return		sal_True if there is a menu otherwise sal_False
+            @return     sal_True if there is a menu otherwise sal_False
         *//*-*****************************************************************************************************/
 
-        sal_Bool	HasAddonsMenu() const;
+        sal_Bool    HasAddonsMenu() const;
         
         /*-****************************************************************************************************//**
-            @short		returns if an addons help menu is available
+            @short      returns if an addons help menu is available
             @descr      Call to retrieve if a addons menu is available
 
 
-            @return		sal_True if there is a menu otherwise sal_False
+            @return     sal_True if there is a menu otherwise sal_False
         *//*-*****************************************************************************************************/
 
-        sal_Bool	HasAddonsHelpMenu() const;
+        sal_Bool    HasAddonsHelpMenu() const;
 
         /*-****************************************************************************************************//**
-            @short		returns number of addons toolbars
+            @short      returns number of addons toolbars
             @descr      Call to retrieve the number of addons toolbars
 
 
-            @return		number of addons toolbars
+            @return     number of addons toolbars
         *//*-*****************************************************************************************************/
         sal_Int32   GetAddonsToolBarCount() const ;
         
@@ -216,7 +216,7 @@ class AddonsOptions
             @descr      Call it to get all entries of the addon menu.
                         We return a list of all nodes with his names and properties.
 
-            @seealso	-
+            @seealso    -
 
             @return     A list of menu items is returned.
 
@@ -229,7 +229,7 @@ class AddonsOptions
             @short      Gets the menu bar part of all addon components registered
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     A complete
 
@@ -242,7 +242,7 @@ class AddonsOptions
             @short      Gets a toolbar part of an single addon
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     A complete
 
@@ -255,7 +255,7 @@ class AddonsOptions
             @short      Gets a unique toolbar resource name of an single addon
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     A complete
 
@@ -268,7 +268,7 @@ class AddonsOptions
             @short      Retrieves all available merge instructions for the Office menu bar
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     The filled MergeMenuDefinitionContaier
 
@@ -281,7 +281,7 @@ class AddonsOptions
             @short      Retrieves all available merge instructions for a single toolbar
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     The filled
 
@@ -293,7 +293,7 @@ class AddonsOptions
             @short      Gets the Add-On help menu part of all addon components registered
             @descr      -
 
-            @seealso	-
+            @seealso    -
 
             @return     A complete
 
@@ -305,7 +305,7 @@ class AddonsOptions
             @short      Retrieve an image for a command URL which is defined inside the addon menu configuration
             @descr      Call it to retrieve an image for a command URL which is defined inside the addon menu configuration
 
-            @seealso	-
+            @seealso    -
 
             @return     An image which was defined in the configuration for the menu item. The image can be empty
                         no bitmap was defined for the request image properties.
@@ -317,42 +317,42 @@ class AddonsOptions
         Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const;
 
     //-------------------------------------------------------------------------------------------------------------
-    //	private methods
+    //  private methods
     //-------------------------------------------------------------------------------------------------------------
 
         /*-****************************************************************************************************//**
-            @short		return a reference to a static mutex
-            @descr		These class is partially threadsafe (for de-/initialization only).
+            @short      return a reference to a static mutex
+            @descr      These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso	-
+            @seealso    -
 
-            @param		-
-            @return		A reference to a static mutex member.
+            @param      -
+            @return     A reference to a static mutex member.
 
-            @onerror	-
+            @onerror    -
         *//*-*****************************************************************************************************/
 
         static ::osl::Mutex& GetOwnStaticMutex();
 
         /*-****************************************************************************************************//**
-            @short		return a reference to a static mutex
-            @descr		These class is partially threadsafe (for de-/initialization only).
+            @short      return a reference to a static mutex
+            @descr      These class is partially threadsafe (for de-/initialization only).
                         All access methods are'nt safe!
                         We create a static mutex only for one ime and use at different times.
 
-            @seealso	-
+            @seealso    -
 
-            @param		-
-            @return		A reference to a static mutex member.
+            @param      -
+            @return     A reference to a static mutex member.
 
-            @onerror	-
+            @onerror    -
         *//*-*****************************************************************************************************/
         DECL_STATIC_LINK( AddonsOptions, Notify, void* );
 
     //-------------------------------------------------------------------------------------------------------------
-    //	private member
+    //  private member
     //-------------------------------------------------------------------------------------------------------------
 
     private:
@@ -365,13 +365,13 @@ class AddonsOptions
             Do it in your source only.
          */
 
-        static AddonsOptions_Impl*	m_pDataContainer	;	/// impl. data container as dynamic pointer for smaller memory requirements!
-        static sal_Int32			m_nRefCount			;	/// internal ref count mechanism
+        static AddonsOptions_Impl*  m_pDataContainer    ;   /// impl. data container as dynamic pointer for smaller memory requirements!
+        static sal_Int32            m_nRefCount         ;   /// internal ref count mechanism
 
-};		// class SvtMenuOptions
+};      // class SvtMenuOptions
 
 }
 
-#endif	// #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
+#endif  // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx
index 840a2b753a..276889d877 100644..100755
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/framework/bmkmenu.hxx
@@ -28,13 +28,13 @@
 #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX
 #define __FRAMEWORK_CLASSES_BMKMENU_HXX
 
-#include "classes/addonmenu.hxx"
+#include "framework/addonmenu.hxx"
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
 
 #include <com/sun/star/frame/XFrame.hpp>
-
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //	includes of other projects
 //_________________________________________________________________________________________________________________
@@ -51,7 +51,7 @@ namespace framework
 {
 
 class BmkMenu_Impl;
-class BmkMenu : public AddonMenu
+class FWE_DLLPUBLIC BmkMenu : public AddonMenu
 {
     public:
         enum BmkMenuType
@@ -60,7 +60,7 @@ class BmkMenu : public AddonMenu
             BMK_WIZARDMENU
         };
 
-        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                  BmkMenuType nType
         );
 
@@ -70,10 +70,10 @@ class BmkMenu : public AddonMenu
 
     protected:
         BmkMenu::BmkMenuType m_nType;
-        USHORT CreateMenuId();
+        sal_uInt16			CreateMenuId();
 
     private:
-        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                  BmkMenuType, BmkMenu* pRoot
         );
 
diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/framework/configimporter.hxx
index 76d0011996..25e1a4f501 100644..100755
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/framework/configimporter.hxx
@@ -35,13 +35,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
-    class UIConfigurationImporterOOo1x
+    class FWE_DLLPUBLIC UIConfigurationImporterOOo1x
     {
         public:
-            static sal_Bool ImportCustomToolbars( 
+            static sal_Bool ImportCustomToolbars(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& rContainerFactory,
                         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
diff --git a/framework/inc/framework/documentundoguard.hxx b/framework/inc/framework/documentundoguard.hxx
new file mode 100755
index 0000000000..da2976e895
--- /dev/null
+++ b/framework/inc/framework/documentundoguard.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+#define FRAMEWORK_DOCUMENTUNDOGUARD_HXX
+
+#include "framework/fwedllapi.h"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/uno/XInterface.hpp>
+/** === end UNO includes === **/
+
+#include <boost/scoped_ptr.hpp>
+
+//......................................................................................................................
+namespace framework
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= DocumentUndoGuard
+    //==================================================================================================================
+    struct DocumentUndoGuard_Data;
+    /** a helper class guarding the Undo manager of a document
+
+        This class guards, within a given scope, the Undo Manager of a document (or another component supporting
+        the XUndoManagerSupplier interface). When entering the scope (i.e. when the <code>DocumentUndoGuard</code>
+        instances is constructed), the current state of the undo contexts of the undo manager is examined.
+        Upon leaving the scope (i.e. when the <code>DocumentUndoGuard</code> is destructed), the guard will execute
+        as many calls to <member scope="com::sun::star::document">XUndoManager::leaveUndoContext</member> as are
+        necessary to restore the manager's initial state.
+    */
+    class FWE_DLLPUBLIC DocumentUndoGuard
+    {
+    public:
+        DocumentUndoGuard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_undoSupplierComponent );
+        ~DocumentUndoGuard();
+
+    private:
+        ::boost::scoped_ptr< DocumentUndoGuard_Data >   m_pData;
+    };
+
+//......................................................................................................................
+} // namespace framework
+//......................................................................................................................
+
+#endif // FRAMEWORK_DOCUMENTUNDOGUARD_HXX
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index d6295a71dd..9ba8b43ca0 100644..100755
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,6 +28,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -41,22 +41,22 @@
 namespace framework
 {
 
-struct EventsConfig
+struct FWE_DLLPUBLIC EventsConfig
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >				aEventNames;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >	aEventsProperties;
 };
 
-class EventsConfiguration
+class FWE_DLLPUBLIC EventsConfiguration
 {
     public:
         // #110897#
-        static sal_Bool	LoadEventsConfig( 
+        static sal_Bool	LoadEventsConfig(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rInStream, EventsConfig& aItems );
 
         // #110897#
-        static sal_Bool	StoreEventsConfig( 
+        static sal_Bool	StoreEventsConfig(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rOutStream, const EventsConfig& aItems );
 };
@@ -64,5 +64,3 @@ class EventsConfiguration
 } // namespace framework
 
 #endif // __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx
index 0a90d40831..a2e2e9bb5a 100644..100755
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/framework/framelistanalyzer.hxx
@@ -35,6 +35,7 @@
 
 //_______________________________________________
 //	other includes
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 //	namespace
@@ -54,7 +55,7 @@ namespace framework{
     to switch into the backing mode, close the current active frame only or
     exit the whole application explicitly or implicitly.
  */
-class FrameListAnalyzer
+class FWE_DLLPUBLIC FrameListAnalyzer
 {
     //_______________________________________
     // types
@@ -118,13 +119,13 @@ class FrameListAnalyzer
             if (m_xReferenceFrame == help)
             {
                 m_xHelp   = NULL;
-                m_bIsHelp = TRUE;
+                m_bIsHelp = sal_True;
             }
             else
             if (xOtherFrame == help)
             {
                 m_xHelp   = xOtherFrame;
-                m_bIsHelp = FALSE;
+                m_bIsHelp = sal_False;
             }
             </listing>
 
@@ -144,13 +145,13 @@ class FrameListAnalyzer
             if (m_xReferenceFrame == backing)
             {
                 m_xBackingComponent   = NULL;
-                m_bIsBackingComponent = TRUE;
+                m_bIsBackingComponent = sal_True;
             }
             else
             if (xOtherFrame == backing)
             {
                 m_xBackingComponent   = xOtherFrame;
-                m_bIsBackingComponent = FALSE      ;
+                m_bIsBackingComponent = sal_False      ;
             }
             </listing>
 
diff --git a/framework/inc/framework/fwedllapi.h b/framework/inc/framework/fwedllapi.h
new file mode 100755
index 0000000000..c3aa1bb81d
--- /dev/null
+++ b/framework/inc/framework/fwedllapi.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FWEDLLAPI_H
+#define INCLUDED_FWEDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWE_DLLIMPLEMENTATION)
+#define FWE_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define FWE_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWE_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWEDLLAPI_H */
diff --git a/framework/inc/framework/iguard.hxx b/framework/inc/framework/iguard.hxx
new file mode 100755
index 0000000000..472aae1dfd
--- /dev/null
+++ b/framework/inc/framework/iguard.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_THREADHELP_IGUARD_H_
+#define __FRAMEWORK_THREADHELP_IGUARD_H_
+
+//_________________________________________________________________________________________________________________
+//	includes
+//_________________________________________________________________________________________________________________
+
+#include <sal/types.h>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework{
+
+//_________________________________________________________________________________________________________________
+//	declarations
+//_________________________________________________________________________________________________________________
+
+/*-************************************************************************************************************//**
+    @descr          interface for guarding a lock
+*//*-*************************************************************************************************************/
+class SAL_NO_VTABLE IGuard
+{
+    //-------------------------------------------------------------------------------------------------------------
+    //	public methods
+    //-------------------------------------------------------------------------------------------------------------
+    public:
+
+        /** clears the lock. If the guard does not currently hold the lock, nothing happens.
+        */
+        virtual void clear() = 0;
+
+        /** attempts to re-establishes the lock, blocking until the attempt is successful.
+        */
+        virtual void reset() = 0;
+
+};      //  class IGuard
+
+}		//	namespace framework
+
+#endif  //  #ifndef __FRAMEWORK_THREADHELP_IGUARD_H_
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx
index 4cc6e1b2fe..801cb343f3 100644..100755
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/framework/imageproducer.hxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/image.hxx>
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
@@ -43,15 +44,15 @@ namespace framework
 typedef Image ( *pfunc_getImage)(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
-    BOOL bBig
+    bool bBig
 );
 
-pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
+pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
 Image SAL_CALL GetImageFromURL(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
-    BOOL bBig
+    bool bBig
 );
 
 }
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/framework/imagesconfiguration.hxx
index bd392a44b4..589731b622 100644..100755
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/framework/imagesconfiguration.hxx
@@ -29,6 +29,7 @@
 #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -50,7 +51,7 @@ enum ImageMaskMode
     ImageMaskMode_Bitmap
 };
 
-struct ImageItemDescriptor
+struct FWE_DLLPUBLIC ImageItemDescriptor
 {
     ImageItemDescriptor() : nIndex( -1 ) {}
 
@@ -58,7 +59,7 @@ struct ImageItemDescriptor
     long	nIndex;						// index of the bitmap inside the bitmaplist
 };
 
-struct ExternalImageItemDescriptor
+struct FWE_DLLPUBLIC ExternalImageItemDescriptor
 {
     String	aCommandURL;				// URL command to dispatch
     String	aURL;						// a URL to an external bitmap
@@ -70,11 +71,11 @@ SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2)
 typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) 
 
-struct ImageListItemDescriptor
+struct FWE_DLLPUBLIC ImageListItemDescriptor
 {
     ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ),
                                 pImageItemList( 0 ) {}
-    
+
     ~ImageListItemDescriptor() { delete pImageItemList; }
 
     String						aURL;				// an URL to a bitmap with several images inside
@@ -89,7 +90,7 @@ struct ImageListItemDescriptor
 typedef ImageListItemDescriptor* ImageListItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2)
 
-struct ImageListsDescriptor
+struct FWE_DLLPUBLIC ImageListsDescriptor
 {
     ImageListsDescriptor() : pImageList( 0 ),
                      pExternalImageList( 0 ) {}
@@ -99,7 +100,7 @@ struct ImageListsDescriptor
     ExternalImageItemListDescriptor*	pExternalImageList;
 };
 
-class ImagesConfiguration
+class FWE_DLLPUBLIC ImagesConfiguration
 {
     public:
         // #110897#
diff --git a/framework/inc/threadhelp/imutex.h b/framework/inc/framework/imutex.hxx
index ede0a96b0c..52c515e989 100644..100755
--- a/framework/inc/threadhelp/imutex.h
+++ b/framework/inc/framework/imutex.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +32,8 @@
 //	includes
 //_________________________________________________________________________________________________________________
 
+#include <sal/types.h>
+
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -46,7 +47,7 @@ namespace framework{
 /*-************************************************************************************************************//**
     @descr          We need this interface to support using of different mutex implementations in a generic way.
 *//*-*************************************************************************************************************/
-class IMutex
+class SAL_NO_VTABLE IMutex
 {
     //-------------------------------------------------------------------------------------------------------------
     //	public methods
@@ -66,5 +67,3 @@ class IMutex
 }		//	namespace framework
 
 #endif  //  #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx
new file mode 100755
index 0000000000..d0fff667fe
--- /dev/null
+++ b/framework/inc/framework/interaction.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+#define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
+
+#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <com/sun/star/task/XInteractionContinuation.hpp>
+#include <com/sun/star/task/XInteractionAbort.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+#include <com/sun/star/task/XInteractionRetry.hpp>
+#include <com/sun/star/document/XInteractionFilterSelect.hpp>
+#include <com/sun/star/document/NoSuchFilterRequest.hpp>
+#include <com/sun/star/document/AmbigousFilterRequest.hpp>
+#include <com/sun/star/uno/RuntimeException.hpp>
+
+//_________________________________________________________________________________________________________________
+//  includes of other projects
+//_________________________________________________________________________________________________________________
+#include <rtl/ustring.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <framework/fwedllapi.h>
+
+namespace framework{
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction to ask user for right filter
+    @descr          These helper can be used to ask user for right filter, if filter detection failed.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+                    Use it and forget complex mechanism of interaction ...
+
+    @example        RequestFilterSelect*             pRequest = new RequestFilterSelect;
+                    Reference< XInteractionRequest > xRequest ( pRequest );
+                    xInteractionHandler->handle( xRequest );
+                    if( ! pRequest.isAbort() )
+                    {
+                        OUString sFilter = pRequest->getFilter();
+                    }
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class RequestFilterSelect_Impl;
+class FWE_DLLPUBLIC RequestFilterSelect
+{
+    RequestFilterSelect_Impl* pImp;
+    
+    public:
+        RequestFilterSelect( const ::rtl::OUString& sURL );
+        ~RequestFilterSelect();
+        sal_Bool        isAbort  () const;
+        ::rtl::OUString getFilter() const;
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction
+    @descr          User must decide between a preselected and another detected filter.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class FWE_DLLPUBLIC InteractionRequest
+{
+public:    
+    static com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > 
+        CreateRequest( const ::com::sun::star::uno::Any& aRequest,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations );
+};
+
+/*-************************************************************************************************************//**
+    @short          special request for interaction
+    @descr          User must decide between a preselected and another detected filter.
+                    It capsulate communication with any interaction handler and supports an easy
+                    access on interaction results for user of these class.
+
+    @implements     XInteractionRequest
+
+    @base           WeakImplHelper1
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+/*
+class RequestAmbigousFilter_Impl;
+class RequestAmbigousFilter             // seems to be unused currently
+{
+    RequestAmbigousFilter_Impl* pImp;
+        
+    // c++ interface
+public:
+    RequestAmbigousFilter( const ::rtl::OUString& sURL,
+                            const ::rtl::OUString& sSelectedFilter ,
+                            const ::rtl::OUString& sDetectedFilter );
+    ~RequestAmbigousFilter();
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};
+ */
+
+}       //  namespace framework
+
+#endif  // #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index aaa9be0373..e9e4d826eb 100644..100755
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	includes of other projects
@@ -56,22 +57,22 @@
 
 // Prepare for inclusion by framework and sfx
 // Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS)
-#define FWK_SID_SFX_START 5000						
+#define FWK_SID_SFX_START 5000
 #define FWK_SID_ADDONS (FWK_SID_SFX_START+1678)
 #define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684)
 
-const USHORT START_ITEMID_PICKLIST		= 4500;
-const USHORT END_ITEMID_PICKLIST        = 4599;
-const USHORT MAX_ITEMCOUNT_PICKLIST     =   99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
-const USHORT START_ITEMID_WINDOWLIST	= 4600;
-const USHORT END_ITEMID_WINDOWLIST		= 4699;
-const USHORT ITEMID_ADDONLIST			= FWK_SID_ADDONS;
-const USHORT ITEMID_ADDONHELP			= FWK_SID_ADDONHELP;
+const sal_uInt16 START_ITEMID_PICKLIST		= 4500;
+const sal_uInt16 END_ITEMID_PICKLIST        = 4599;
+const sal_uInt16 MAX_ITEMCOUNT_PICKLIST     =   99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed!
+const sal_uInt16 START_ITEMID_WINDOWLIST	= 4600;
+const sal_uInt16 END_ITEMID_WINDOWLIST		= 4699;
+const sal_uInt16 ITEMID_ADDONLIST			= FWK_SID_ADDONS;
+const sal_uInt16 ITEMID_ADDONHELP			= FWK_SID_ADDONHELP;
 
 namespace framework
 {
 
-class MenuConfiguration
+class FWE_DLLPUBLIC MenuConfiguration
 {
     public:
         struct Attributes
@@ -79,13 +80,13 @@ class MenuConfiguration
             Attributes() {}
             Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) :
                 aTargetFrame( aFrame ), aImageId( aImageIdStr ) {}
-            
+
             ::rtl::OUString aTargetFrame;
             ::rtl::OUString	aImageId;
             ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider;
                         sal_Int16 nStyle;
         };
-                        
+
         MenuConfiguration(
             // #110897#-1 use const when giving a uno reference by reference
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
@@ -112,9 +113,9 @@ class MenuConfiguration
         void StoreToolBox( ToolBox* pToolBox,
                       ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream )
             throw ( ::com::sun::star::lang::WrappedTargetException );
-            
-        static BOOL IsPickListItemId( USHORT nId );
-        static BOOL IsWindowListItemId( USHORT nId );
+
+        static sal_Bool IsPickListItemId( sal_uInt16 nId );
+        static sal_Bool IsWindowListItemId( sal_uInt16 nId );
 
     private:
         // #110897#-1 do not hold the uno reference by reference
diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index d0fc6d99eb..4d7b22cd27 100644..100755
--- a/framework/inc/classes/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +29,9 @@
 #define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
 
 #include <rtl/ustring.hxx>
+#include <framework/fwedllapi.h>
 
-struct MenuExtensionItem
+struct FWE_DLLPUBLIC MenuExtensionItem
 {
     rtl::OUString aLabel;
     rtl::OUString aURL;
@@ -42,12 +42,10 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
 namespace framework
 {
 
-pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
+FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
 
-MenuExtensionItem SAL_CALL GetMenuExtension();
+FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
 
 }
 
 #endif // __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index 30d958e915..6769e1d814 100644..100755
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -29,6 +29,7 @@
 #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
@@ -83,7 +84,7 @@ struct ThreadHelpBase2
         mutable ::osl::Mutex m_aLock;
 };
 
-class PreventDuplicateInteraction : private ThreadHelpBase2
+class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
                                     ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >
 {
     //_____________________________________
@@ -256,8 +257,8 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
                         - the interaction itself, so it can be analyzed further
 
             @return     [boolean]
-                        TRUE if the queried interaction could be found.
-                        FALSE otherwise.
+                        sal_True if the queried interaction could be found.
+                        sal_False otherwise.
 
             @threadsafe yes
         */
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx
index d0a1d0d0b9..12a304f80c 100644..100755
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/framework/sfxhelperfunctions.hxx
@@ -29,6 +29,7 @@
 #ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
 #define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
 
+#include <framework/fwedllapi.h>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <rtl/ustring.hxx>
 #include <vcl/toolbox.hxx>
@@ -66,36 +67,36 @@ typedef void ( *pfunc_activateToolPanel)(
 
 namespace framework
 {
-pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
-svt::ToolboxController* SAL_CALL CreateToolBoxController(
+FWE_DLLPUBLIC pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
+FWE_DLLPUBLIC svt::ToolboxController* SAL_CALL CreateToolBoxController(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     ToolBox* pToolbox,
     unsigned short nID,
     const ::rtl::OUString& aCommandURL );
 
-pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
-svt::StatusbarController* SAL_CALL CreateStatusBarController(
+FWE_DLLPUBLIC pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
+FWE_DLLPUBLIC svt::StatusbarController* SAL_CALL CreateStatusBarController(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     StatusBar* pStatusBar,
     unsigned short nID,
      const ::rtl::OUString& aCommandURL );
 
-pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
-void SAL_CALL RefreshToolbars(
+FWE_DLLPUBLIC pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
+FWE_DLLPUBLIC void SAL_CALL RefreshToolbars(
      ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
 
-pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
-void SAL_CALL CreateDockingWindow(
+FWE_DLLPUBLIC pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
+FWE_DLLPUBLIC void SAL_CALL CreateDockingWindow(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& rResourceURL );
 
-pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
-bool SAL_CALL IsDockingWindowVisible(
+FWE_DLLPUBLIC pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
+FWE_DLLPUBLIC bool SAL_CALL IsDockingWindowVisible(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& rResourceURL );
 
-pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
-void SAL_CALL ActivateToolPanel(
+FWE_DLLPUBLIC pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
+FWE_DLLPUBLIC void SAL_CALL ActivateToolPanel(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
     const ::rtl::OUString& i_rPanelURL );
 }
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx
index fba576ece1..66247f2a99 100644..100755
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/framework/statusbarconfiguration.hxx
@@ -1,7 +1,34 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
 #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
@@ -15,7 +42,7 @@
 namespace framework
 {
 
-struct StatusBarItemDescriptor
+struct FWE_DLLPUBLIC StatusBarItemDescriptor
 {
     String	aURL;						// URL command to dispatch
     long	nItemBits;					// properties for this statusbar item (WinBits)
@@ -32,23 +59,23 @@ struct StatusBarItemDescriptor
 typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr;
 SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
 
-class StatusBarConfiguration
+class FWE_DLLPUBLIC StatusBarConfiguration
 {
     public:
-        static sal_Bool	LoadStatusBar( 
+        static sal_Bool	LoadStatusBar(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rInStream, StatusBarDescriptor& aItems );
 
-        static sal_Bool	StoreStatusBar( 
+        static sal_Bool	StoreStatusBar(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             SvStream& rOutStream, const StatusBarDescriptor& aItems );
 
-        static sal_Bool LoadStatusBar( 
+        static sal_Bool LoadStatusBar(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration );
 
-        static sal_Bool StoreStatusBar( 
+        static sal_Bool StoreStatusBar(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration );
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index f6404c5360..3d66de51fe 100644..100755
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -52,6 +52,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <boost/unordered_map.hpp>
+#include <framework/fwedllapi.h>
 
 //_______________________________________________
 // namespace
@@ -68,10 +69,10 @@ namespace framework{
 // definitions
 
 /** @short  can be used as implementation helper of interface css.frame.XTitle
-            
+
     @threadsafe
  */
-class TitleHelper : private ::cppu::BaseMutex
+class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
                   , public  ::cppu::WeakImplHelper5< css::frame::XTitle                 ,
                                                      css::frame::XTitleChangeBroadcaster,
                                                      css::frame::XTitleChangeListener   ,
@@ -84,42 +85,42 @@ class TitleHelper : private ::cppu::BaseMutex
 
         //---------------------------------------
         /** @short  lightweight constructor.
-         */                    
+         */
         TitleHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
-        
+
         //---------------------------------------
         /** @short  free all internaly used resources.
-         */                    
+         */
         virtual ~TitleHelper();
-    
+
         //---------------------------------------
         /** set an outside component which uses this container and must be set
             as source of all broadcasted messages, exceptions.
-    
+
             It's holded weak only so we do not need any complex dispose sessions.
-    
+
             Note: Passing NULL as parameter will be alloed. It will reset the internal
             member reference only.
-    
+
             @param  xOwner
                     the new owner of this collection.
          */
         void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner);
-    
+
         //---------------------------------------
         /** set an outside component which provides the righht string and number for
             an untitled component.
-    
+
             It's holded weak only so we do not need any complex dispose sessions.
-    
+
             Note: Passing NULL as parameter will be alloed. It will reset the internal
             member reference only.
-    
+
             @param  xNumbers
                     the right numbered collection for this helper.
          */
         void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers);
-        
+
         //---------------------------------------
         /** @see XTitle */
         virtual ::rtl::OUString SAL_CALL getTitle()
@@ -134,22 +135,22 @@ class TitleHelper : private ::cppu::BaseMutex
         /** @see XTitleChangeBroadcaster */
         virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
             throw (css::uno::RuntimeException);
-            
+
         //---------------------------------------
         /** @see XTitleChangeBroadcaster */
         virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
             throw (css::uno::RuntimeException);
-            
+
         //---------------------------------------
         /** @see XTitleChangeListener */
         virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent)
             throw (css::uno::RuntimeException);
-            
+
         //---------------------------------------
         /** @see css.document.XEventListener */
         virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent)
             throw (css::uno::RuntimeException);
-        
+
         //---------------------------------------
         /** @see css.lang.XEventListener */
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
@@ -159,63 +160,63 @@ class TitleHelper : private ::cppu::BaseMutex
         /** @see css.frame.XFrameActionListener */
         virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
             throw(css::uno::RuntimeException);
-         
+
     //-------------------------------------------
     // internal
     private:
 
         void impl_sendTitleChangedEvent ();
-    
+
         void impl_updateTitle ();
         void impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel);
         void impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController);
         void impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame);
-    
+
         void impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel);
         void impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController);
         void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame);
         void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame);
-    
+
         void impl_appendComponentTitle (      ::rtl::OUStringBuffer&                       sTitle    ,
                                         const css::uno::Reference< css::uno::XInterface >& xComponent);
         void impl_appendProductName (::rtl::OUStringBuffer& sTitle);
         void impl_appendProductExtension (::rtl::OUStringBuffer& sTitle);
         void impl_appendModuleName (::rtl::OUStringBuffer& sTitle);
         void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
-    
+
         void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
         ::rtl::OUString impl_getSubTitle ();
-    
+
         ::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL);
-    
+
     //-------------------------------------------
     // member
     private:
-        
+
         /** points to the global uno service manager. */
         css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
-    
+
         /** reference to the outside UNO class using this helper. */
         css::uno::WeakReference< css::uno::XInterface > m_xOwner;
-    
+
         /** used to know how an "Untitled X" string can be created right :-) */
         css::uno::WeakReference< css::frame::XUntitledNumbers > m_xUntitledNumbers;
-    
+
         /** provides parts of our own title and we listen there for changes too. */
         css::uno::WeakReference< css::frame::XTitle > m_xSubTitle;
-    
-        /** if it's set to TRUE the member m_sTitle has not to be changed internaly.
+
+        /** if it's set to sal_True the member m_sTitle has not to be changed internaly.
             It was set from outside and so outside code has to make sure it will be
             updated.
          */
         ::sal_Bool m_bExternalTitle;
-    
+
         /** the actual title value */
         ::rtl::OUString m_sTitle;
-    
+
         /** knows the leased number which must be used for untitled components. */
         ::sal_Int32 m_nLeasedNumber;
-    
+
         /** contains all title change listener */
         ::cppu::OMultiTypeInterfaceContainerHelper m_aListener;
 };
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index e422cf4387..ee83f9ad39 100644..100755
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -1,12 +1,41 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 
+#include <framework/fwedllapi.h>
 #include <svl/svarray.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
+#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_
 #include <com/sun/star/io/XOutputStream.hpp>
+#endif
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 
@@ -16,17 +45,17 @@
 namespace framework
 {
 
-class ToolBoxConfiguration
+class FWE_DLLPUBLIC ToolBoxConfiguration
 {
     public:
         // #110897#
-        static sal_Bool	LoadToolBox( 
+        static sal_Bool LoadToolBox(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
 
         // #110897#
-        static sal_Bool	StoreToolBox( 
+        static sal_Bool StoreToolBox(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration );
diff --git a/framework/inc/framework/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
new file mode 100755
index 0000000000..65d7bfa296
--- /dev/null
+++ b/framework/inc/framework/undomanagerhelper.hxx
@@ -0,0 +1,160 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef FRAMEWORK_UNDOMANAGERHELPER_HXX
+#define FRAMEWORK_UNDOMANAGERHELPER_HXX
+
+#include "framework/fwedllapi.h"
+#include "framework/iguard.hxx"
+#include "framework/imutex.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/document/XUndoManager.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+/** === end UNO includes === **/
+
+#include <boost/scoped_ptr.hpp>
+
+namespace svl
+{
+    class IUndoManager;
+}
+
+//......................................................................................................................
+namespace framework
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= IMutexGuard
+    //==================================================================================================================
+    class SAL_NO_VTABLE IMutexGuard : public IGuard
+    {
+    public:
+        /** returns the mutex guarded by the instance.
+
+            Even if the guard currently has not a lock on the mutex, this method must succeed.
+        */
+        virtual IMutex& getGuardedMutex() = 0;
+    };
+
+    //==================================================================================================================
+    //= IUndoManagerImplementation
+    //==================================================================================================================
+    class SAL_NO_VTABLE IUndoManagerImplementation
+    {
+    public:
+        /** returns the IUndoManager interface to the actual Undo stack
+
+            @throws com::sun::star::lang::DisposedException
+                when the instance is already disposed, and no IUndoManager can be provided
+
+            @throws com::sun::star::lang::NotInitializedException
+                when the instance is not initialized, yet, and no IUndoManager can be provided
+        */
+        virtual ::svl::IUndoManager&    getImplUndoManager() = 0;
+
+        /** provides access to an UNO interface for the XUndoManager implementation. Used when throwing exceptions.
+        */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >
+                                        getThis() = 0;
+    };
+
+    //==================================================================================================================
+    //= UndoManagerHelper
+    //==================================================================================================================
+    class UndoManagerHelper_Impl;
+    /** helper class for implementing an XUndoManager
+
+        Several of the methods of the class take an IMutexGuard instance. It is assumed that this guard has a lock on
+        its mutext at the moment the method is entered. The lock will be released before any notifications to the
+        registered XUndoManagerListeners happen.
+
+        The following locking strategy is used for this mutex:
+        <ul><li>Any notifications to the registered XUndoManagerListeners are after the guard has been cleared. i.e.
+                without the mutex being locked.</p>
+            <li>Any calls into the <code>IUndoManager</code> implementation is made without the mutex being locked.
+                Note that this implies that the <code>IUndoManager</code> implementation must be thread-safe in itself
+                (which is true for the default implementation, SfxUndoManager).</li>
+            <li>An exception to the previous item are the <member>IUndoManager::Undo</member> and
+                <member>IUndoManager::Redo</member> methods: They're called with the given external mutex being
+                locked.</li>
+        </ul>
+
+        The reason for the exception for IUndoManager::Undo and IUndoManager::Redo is that those are expected to
+        modify the actual document which the UndoManager works for. And as long as our documents are not thread-safe,
+        and as long as we do not re-fit <strong>all</strong> existing SfxUndoImplementations to <em>not</em> expect
+        the dreaded SolarMutex being locked when they're called, the above behavior is a compromise between "how it should
+        be" and "how it can realistically be".
+    */
+    class FWE_DLLPUBLIC UndoManagerHelper
+    {
+    public:
+        UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl );
+        ~UndoManagerHelper();
+
+        // life time control
+        void disposing();
+
+        // XUndoManager equivalents
+        void            enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock );
+        void            enterHiddenUndoContext( IMutexGuard& i_instanceLock );
+        void            leaveUndoContext( IMutexGuard& i_instanceLock );
+        void            addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock );
+        void            undo( IMutexGuard& i_instanceLock );
+        void            redo( IMutexGuard& i_instanceLock );
+        ::sal_Bool      isUndoPossible() const;
+        ::sal_Bool      isRedoPossible() const;
+        ::rtl::OUString getCurrentUndoActionTitle() const;
+        ::rtl::OUString getCurrentRedoActionTitle() const;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString >
+                        getAllUndoActionTitles() const;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > 
+                        getAllRedoActionTitles() const;
+        void            clear( IMutexGuard& i_instanceLock );
+        void            clearRedo( IMutexGuard& i_instanceLock );
+        void            reset( IMutexGuard& i_instanceLock );
+        void            addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener );
+        void            removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener );
+
+        // XLockable, base of XUndoManager, equivalents
+        void            lock();
+        void            unlock();
+        ::sal_Bool      isLocked();
+
+        // XModifyBroadcaster equivalents
+        void            addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& i_listener );
+        void            removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& i_listener );
+
+    private:
+        ::boost::scoped_ptr< UndoManagerHelper_Impl >   m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace framework
+//......................................................................................................................
+
+#endif // FRAMEWORK_UNDOMANAGERHELPER_HXX
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
new file mode 100755
index 0000000000..8f4b50cf77
--- /dev/null
+++ b/framework/inc/fwidllapi.h
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_FWIDLLAPI_H
+#define INCLUDED_FWIDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(FWI_DLLIMPLEMENTATION)
+#define FWI_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define FWI_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define FWI_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_FWIDLLAPI_H */
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
new file mode 100755
index 0000000000..a22303386b
--- /dev/null
+++ b/framework/inc/fwkdllapi.h
@@ -0,0 +1,8 @@
+#ifndef INCLUDED_FWKDLLAPI_H
+#define INCLUDED_FWKDLLAPI_H
+
+#include "sal/types.h"
+
+#include <fwidllapi.h>
+
+#endif /* INCLUDED_FWKDLLAPI_H */
diff --git a/framework/inc/general.h b/framework/inc/general.h
index 176c5eac94..176c5eac94 100644..100755
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 57c07bf018..57c07bf018 100644..100755
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
diff --git a/framework/inc/helper/fixeddocumentproperties.hxx b/framework/inc/helper/fixeddocumentproperties.hxx
index ccf5932a31..ccf5932a31 100644..100755
--- a/framework/inc/helper/fixeddocumentproperties.hxx
+++ b/framework/inc/helper/fixeddocumentproperties.hxx
diff --git a/framework/inc/helper/ilayoutnotifications.hxx b/framework/inc/helper/ilayoutnotifications.hxx
new file mode 100755
index 0000000000..2b5823ddc7
--- /dev/null
+++ b/framework/inc/helper/ilayoutnotifications.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * 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
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
+
+namespace framework
+{
+
+class ILayoutNotifications
+{
+    public:
+        enum Hint
+        {
+            HINT_NOT_SPECIFIED,
+            HINT_TOOLBARSPACE_HAS_CHANGED,
+            HINT_COUNT
+        };
+
+        virtual void requestLayout( Hint eHint = HINT_NOT_SPECIFIED ) = 0;
+};
+
+}
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index ca99891dd0..41da5f9fdb 100644..100755
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -42,6 +42,7 @@
 #include <i18npool/lang.h>
 #include <svl/languageoptions.hxx>
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 #include <set>
 
@@ -97,7 +98,7 @@ inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType
 }
 
     
-class LanguageGuessingHelper
+class FWI_DLLPUBLIC LanguageGuessingHelper
 {
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
@@ -108,7 +109,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;
 };
 
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
+FWI_DLLPUBLIC ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
             ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
@@ -116,7 +117,7 @@ public:
             ,sal_Bool& _rIni
             ,const sal_Char* _pName);
 
-void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
+FWI_DLLPUBLIC void FillLangItems( std::set< ::rtl::OUString > &rLangItems,
         const SvtLanguageTable &rLanguageTable,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
         const LanguageGuessingHelper & rLangGuessHelper,
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index 72ecef8536..66e177c8f5 100644..100755
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -30,11 +30,12 @@
 #define __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
 
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
-class NetworkDomain
+class FWI_DLLPUBLIC NetworkDomain
 {
     public:
         static rtl::OUString GetNTDomainName();
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 523931d07b..523931d07b 100644..100755
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index dd352b625d..dd352b625d 100644..100755
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 3cc3cb029e..3cc3cb029e 100644..100755
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx
index 12a631e859..12a631e859 100644..100755
--- a/framework/inc/helper/otasksaccess.hxx
+++ b/framework/inc/helper/otasksaccess.hxx
diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx
index 7293ca0cd5..7293ca0cd5 100644..100755
--- a/framework/inc/helper/otasksenumeration.hxx
+++ b/framework/inc/helper/otasksenumeration.hxx
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index e07187d79c..e07187d79c 100644..100755
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 2bec443a13..610d5d5c88 100644..100755
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -38,11 +38,12 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <threadhelp/threadhelpbase.hxx>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class PropertySetContainer : public com::sun::star::container::XIndexContainer	,
+class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIndexContainer	,
                              public ThreadHelpBase								,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                              public ::cppu::OWeakObject
 {
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index b980be329e..8d6cbf9630 100644..100755
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -31,11 +31,12 @@
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
-class ShareableMutex
+class FWI_DLLPUBLIC ShareableMutex
 {
     public:
         ShareableMutex();
@@ -53,12 +54,12 @@ class ShareableMutex
         {
             MutexRef() : m_refCount(0) {}
             void acquire()
-            { 
+            {
                 osl_incrementInterlockedCount( &m_refCount );
             }
-            
+
             void release()
-            { 
+            {
                 if ( osl_decrementInterlockedCount( &m_refCount ) == 0 )
                     delete this;
             }
@@ -78,7 +79,7 @@ class ShareGuard
         {
             m_rShareMutex.acquire();
         }
-        
+
         ~ShareGuard()
         {
             m_rShareMutex.release();
@@ -90,7 +91,7 @@ class ShareGuard
 
         ShareableMutex& m_rShareMutex;
 };
-                            
+
 }
 
 #endif // #ifndef __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 2907c5f83b..2907c5f83b 100644..100755
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 627c56b942..b67f471321 100644..100755
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -213,7 +213,7 @@ class StatusIndicatorFactory : public  css::lang::XTypeProvider
         WakeUpThread* m_pWakeUp;
 
         /** Our WakeUpThread calls us in our interface method "XUpdatable::update().
-            There we set this member m_bAllowReschedule to TRUE. Next time if our impl_reschedule()
+            There we set this member m_bAllowReschedule to sal_True. Next time if our impl_reschedule()
             method is called, we know, that an Application::Reschedule() should be made.
             Because the last made Reschedule can be was taken long time ago ... may be.*/
         sal_Bool m_bAllowReschedule;
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index f91ebe1285..f91ebe1285 100644..100755
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index 204dfb3428..204dfb3428 100644..100755
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 0542d0c1f2..668c731f05 100644..100755
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -179,8 +179,8 @@ class TitleBarUpdate : // interfaces
                     Is set only if return value is true.
 
             @return [sal_Bool]
-                    TRUE in casee module could be identified and all needed values could be read.
-                    FALSE otherwise.
+                    sal_True in casee module could be identified and all needed values could be read.
+                    sal_False otherwise.
          */
         ::sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
                                               TModuleInfo&                               rInfo );
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 64db92e84a..b1de7eb3e3 100644..100755
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -79,45 +79,48 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //	public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
-        virtual ~UIConfigElementWrapperBase();
-    
-        //---------------------------------------------------------------------------------------------------------
-        //	XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+         UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
+        virtual  ~UIConfigElementWrapperBase();
+
+        //  XInterface
+        virtual  ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); 
+        virtual  void SAL_CALL acquire() throw();  
+        virtual  void SAL_CALL release() throw();
+
+        // XTypeProvider
+        virtual  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+        virtual  ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-        
+        virtual  void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
         // XUIElementSettings
-        virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         //  XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException);
 
     //-------------------------------------------------------------------------------------------------------------
     //	protected methods
@@ -125,21 +128,21 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     protected:
 
         //	OPropertySetHelper
-        virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
+        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                                com::sun::star::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException );
-        virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
+        virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception                 );
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual  void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const;
-        virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
-        virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual  ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-        virtual void impl_fillNewData();
+        virtual  void impl_fillNewData();
 
-        static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
         sal_Int16                                                                               m_nType;
         bool                                                                                    m_bPersistent : 1,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index 5445128e70..8e187027ad 100644..100755
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -72,31 +72,34 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     //	public methods
     //-------------------------------------------------------------------------------------------------------------
     public:
-        UIElementWrapperBase( sal_Int16 nType );
-        virtual ~UIElementWrapperBase();
+         UIElementWrapperBase( sal_Int16 nType );
+        virtual  ~UIElementWrapperBase();
     
-        //---------------------------------------------------------------------------------------------------------
-        //	XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
+        //  XInterface
+        virtual  ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); 
+        virtual  void SAL_CALL acquire() throw();  
+        virtual  void SAL_CALL release() throw();
+
+        // XTypeProvider
+        virtual  ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException );
+        virtual  ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
         
         // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
         
         // XUpdatable
-        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+        virtual  void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
 
         // XUIElement
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::rtl::OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0;
 
     //-------------------------------------------------------------------------------------------------------------
     //	protected methods
@@ -104,19 +107,19 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider
     protected:
 
         //	OPropertySetHelper
-        virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
+        virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                                com::sun::star::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::lang::IllegalArgumentException );
-        virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
+        virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
                                                                                                                const com::sun::star::uno::Any&  aValue          ) throw( com::sun::star::uno::Exception                 );
         using cppu::OPropertySetHelper::getFastPropertyValue;
-        virtual void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
+        virtual  void                                                SAL_CALL getFastPropertyValue( com::sun::star::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const;
-        virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
-        virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+        virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
+        virtual  ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-        static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+        static  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
         ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListenerContainer;   /// container for ALL Listener
         rtl::OUString                                                       m_aResourceURL;
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 4c7580246e..4c7580246e 100644..100755
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 6a7a6fd6e3..6a7a6fd6e3 100644..100755
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 4fd3bdfbfd..a092a83a10 100644..100755
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -27,23 +27,11 @@
 #ifndef _FRAMEWORK_HELPID_HRC
 #define _FRAMEWORK_HELPID_HRC
 
-// include ------------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids -----------------------------------------------------------------
-
-#define HID_BACKINGWINDOW                           (HID_FRAMEWORK_START + 0)
-#define HID_LICENSEDIALOG                           (HID_FRAMEWORK_START + 1)
-#define HID_STATUSBAR								(HID_FRAMEWORK_START + 2)
-
-#define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW
-
-// "Uberlaufpr"ufung --------------------------------------------------------
-
-#if ACT_FRAMEWORK_HID_END > HID_FRAMEWORK_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_BACKINGWINDOW                           "FWK_HID_BACKINGWINDOW"
+#define HID_LICENSEDIALOG                           "FWK_HID_LICENSEDIALOG"
+#define HID_STATUSBAR								"FWK_HID_STATUSBAR"
+#define HID_SVX_COMMON_MACRO_ORGANIZER              "FWK_HID_SVX_COMMON_MACRO_ORGANIZER"
+#define HID_SVX_BASIC_MACRO_ORGANIZER               "FWK_HID_SVX_BASIC_MACRO_ORGANIZER"
 
 #endif // #ifndef _FRAMEWORK_HELPID_HRC
 
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 9d19bcd9db..9d19bcd9db 100644..100755
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 3748d65fee..f17fd2aa86 100644..100755
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -43,6 +43,7 @@
 //_______________________________________
 // other includes
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -59,7 +60,7 @@ namespace framework{
             instead of using soecialize config items of the svtools
             project. This class can wrapp such configuration access.
  */
-class ConfigAccess : public ThreadHelpBase
+class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
 {
     //___________________________________
     // const
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index a5d0129f17..23118ab1f3 100644..100755
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -179,8 +179,8 @@ class HelpOnStartup : private ThreadHelpBase
                     the help url for checking.
 
             @return [bool]
-                    TRUE if the given URL is any default one ...
-                    FALSE otherwise.
+                    sal_True if the given URL is any default one ...
+                    sal_False otherwise.
          */
         ::sal_Bool its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL);
 
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 38db96f423..38db96f423 100644..100755
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 19beca703c..d37fffd50c 100644..100755
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -42,6 +42,7 @@
 // other includes
 
 #include <rtl/ustring.hxx>
+#include <fwidllapi.h>
 
 //_______________________________________
 // namespace
@@ -60,10 +61,9 @@ namespace framework{
             it's code. Typos can occure or code will be changed by new developers ...
             Shared set of constant values can help to improve the mentainance of this code.
  */
-class JobConst
+class FWI_DLLPUBLIC JobConst
 {
     public:
-        
         static const ::rtl::OUString ANSWER_DEACTIVATE_JOB();
         static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS();
         static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT();
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 247d9c0b53..63f0eee1ee 100644..100755
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -81,6 +81,8 @@ class JobData : private ThreadHelpBase
         static const sal_Char* JOBCFG_PROP_ARGUMENTS;
         /// define the cfg key "Service" of a job relativ to JOBCFG_ROOT/<job alias>
         static const sal_Char* JOBCFG_PROP_SERVICE;
+        /// define the cfg key "Context" of a job relativ to JOBCFG_ROOT/<job alias>
+        static const sal_Char* JOBCFG_PROP_CONTEXT;
 
         /// specifies the root package and key to find event registrations
         static const sal_Char* EVENTCFG_ROOT;
@@ -106,6 +108,7 @@ class JobData : private ThreadHelpBase
         static const sal_Char* PROP_FRAME;
         static const sal_Char* PROP_MODEL;
         static const sal_Char* PROP_SERVICE;
+        static const sal_Char* PROP_CONTEXT;
 
     //___________________________________
     // structs
@@ -211,6 +214,12 @@ class JobData : private ThreadHelpBase
         ::rtl::OUString m_sService;
 
         /**
+            the module context list of this job.
+            It's readed from the configuration. Don't set it from outside!
+         */
+        ::rtl::OUString m_sContext;
+
+        /**
             a job can be registered for an event.
             It can be an empty value! But it will be set from outside any times.
             Because it's not clear which job this instance should represent if an event
@@ -256,6 +265,7 @@ class JobData : private ThreadHelpBase
         css::uno::Sequence< css::beans::NamedValue > getJobConfig            () const;
 
         sal_Bool                                     hasConfig               () const;
+        sal_Bool                                     hasCorrectContext       ( const ::rtl::OUString& rModuleIdent ) const;
 
         void                                         setEnvironment (       EEnvironment                                  eEnvironment );
         void                                         setAlias       ( const ::rtl::OUString&                              sAlias       );
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 374dcaf157..62dfc8f4af 100644..100755
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -102,6 +102,9 @@ class JobDispatch : public  css::lang::XTypeProvider
         /** reference to the frame, inside which this dispatch is used */
         css::uno::Reference< css::frame::XFrame > m_xFrame;
 
+        /** name of module (writer, impress etc.) the frame is for */
+        ::rtl::OUString m_sModuleIdentifier;
+
     //___________________________________
     // native interface methods
 
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index febb75c678..fe1b8b6614 100644..100755
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
 
 //_______________________________________
 // other includes
@@ -86,6 +87,9 @@ class JobExecutor : public  css::lang::XTypeProvider
         /** reference to the uno service manager */
         css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
 
+        /** reference to the module info service */
+        css::uno::Reference< css::frame::XModuleManager > m_xModuleManager;
+
         /** cached list of all registered event names of cfg for call optimization. */
         OUStringList m_lEvents;
 
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 7fc0b30f24..7fc0b30f24 100644..100755
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 7746ded6ef..7746ded6ef 100644..100755
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 9e97fd0e1e..b9c3b0bbf1 100644..100755
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -158,7 +158,7 @@ class ShellJob : private ThreadHelpBase
                     If it's set to false we return false only in case executable couldnt be found
                     or couldnt be started.
                     
-            @return TRUE if command was executed successfully; FALSE otherwise.
+            @return sal_True if command was executed successfully; sal_False otherwise.
          */
         ::sal_Bool impl_execute(const ::rtl::OUString&                       sCommand      ,
                                 const css::uno::Sequence< ::rtl::OUString >& lArguments    ,
diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h
index 53d5a40ad4..4897fb9ab6 100644..100755
--- a/framework/inc/loadstate.h
+++ b/framework/inc/loadstate.h
@@ -77,14 +77,14 @@ class LoadStateHelper
                             the failed load request
 
             @param      rReason
-                            in case this Method returns <TRUE/> the referred string object
+                            in case this Method returns <sal_True/> the referred string object
                             will be used to set the original message of the
                             aborted io exception on it.
-                            If method returns <FALSE/> rReason was not used.
+                            If method returns <sal_False/> rReason was not used.
 
             @return     [boolean]
-                            <TRUE/> in case it was an IO error
-                            <FALSE/> in case it wasn't an IO error or interaction was not used
+                            <sal_True/> in case it was an IO error
+                            <sal_False/> in case it wasn't an IO error or interaction was not used
         */
         static sal_Bool wasIOError( const css::uno::Any& aRequest ,
                                           rtl::OUString& rReason  )
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index d87acba2e2..d87acba2e2 100644..100755
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/debug.hxx
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index f956af1b67..1b34daa47a 100644..100755
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -80,7 +80,7 @@
         LOG_ASSERT ( BCONDITION, STEXT )
         LOG_ASSERT2( BCONDITION, SMETHOD, STEXT )
 
-        Forward assertion to logfile (if condition is FALSE - like a DBG_ASSERT!) and continue with program.
+        Forward assertion to logfile (if condition is sal_False - like a DBG_ASSERT!) and continue with program.
         Set LOGTYPE to LOGTYPE_FILECONTINUE to do this.
         BCONDITION is inserted in "(...)" because user can call this macro with an complex expression!
     _____________________________________________________________________________________________________________*/
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index bb472a504e..bb472a504e 100644..100755
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index 198fcbfc23..198fcbfc23 100644..100755
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index 4537d813cd..4537d813cd 100644..100755
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 46d0667493..c34d98267f 100644..100755
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -38,7 +38,7 @@
 
 #ifdef ENABLE_MEMORYMEASURE
 
-    #if !defined( WIN ) && !defined( WNT )
+    #if !defined( WNT )
         #error "Macros to measure memory access not available under platforms different from windows!"
     #endif
 
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index 7d91c57ed1..7d91c57ed1 100644..100755
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index b81edab26d..b81edab26d 100644..100755
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 912dc790f6..bbb328e5a1 100644..100755
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -54,26 +54,6 @@
                     "registration.log"
     #endif
 
-    /*_____________________________________________________________________________________________________________
-        LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
-        Write informations for component_writeInfo() in log file.
-    _____________________________________________________________________________________________________________*/
-
-    #define	LOG_REGISTRATION_WRITEINFO( SINFOTEXT )																\
-                {																								\
-                    ::rtl::OStringBuffer sOut( 1024 );															\
-                    sOut.append( "component_writeInfo():" );													\
-                    sOut.append( SINFOTEXT                );													\
-                    WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() )							\
-                }
-
-    /*_____________________________________________________________________________________________________________
-        LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
-        Write informations for component_getFactory() in log file.
-    _____________________________________________________________________________________________________________*/
-
     #define	LOG_REGISTRATION_GETFACTORY( SINFOTEXT )															\
                 {																								\
                     ::rtl::OStringBuffer sOut( 1024 );															\
@@ -89,7 +69,6 @@
     _____________________________________________________________________________________________________________*/
 
     #undef	LOGFILE_REGISTRATION
-    #define	LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
     #define	LOG_REGISTRATION_GETFACTORY( SINFOTEXT )
 
 #endif	// #ifdef ENABLE_REGISTRATIONDEBUG
diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 1e6bed51a4..1e6bed51a4 100644..100755
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx
index e01191cd8f..e01191cd8f 100644..100755
--- a/framework/inc/macros/debug/timemeasure.hxx
+++ b/framework/inc/macros/debug/timemeasure.hxx
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index 86a5048055..86a5048055 100644..100755
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index feda6bde8c..f5510af61b 100644..100755
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -38,10 +38,8 @@
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
 
 //_________________________________________________________________________________________________________________
 //	other includes
@@ -58,67 +56,14 @@
     macros for registration of services
     Please use follow public macros only!
 
-    1)	COMPONENTINFO( CLASS )						=> use it as parameter for COMPONENT_WRITEINFO( INFOS )
-    2)	IFFACTORY( CLASS )							=> use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
-    3)	COMPONENTGETIMPLEMENTATIONENVIRONMENT		=> use it to define exported function component_getImplementationEnvironment()
-    4)	COMPONENTWRITEINFO( INFOS )					=> use it to define exported function component_writeInfo()
-    5)	COMPONENTGETFACTORY( IFFACTORIES )			=> use it to define exported function component_getFactory()
+    IFFACTORY( CLASS )							=> use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
+    COMPONENTGETIMPLEMENTATIONENVIRONMENT		=> use it to define exported function component_getImplementationEnvironment()
+    COMPONENTGETFACTORY( IFFACTORIES )			=> use it to define exported function component_getFactory()
 
 _________________________________________________________________________________________________________________*/
 
 //*****************************************************************************************************************
 //	public
-//	use it as parameter for COMPONENT_WRITEINFO( INFOS )
-//*****************************************************************************************************************
-
-#define	COMPONENTINFO( CLASS )																											\
-    try																																	\
-    {                                                                                               									\
-        /* Set default result of follow operations !!! */																				\
-        bReturn = sal_False;                                                                       										\
-        /* Do the follow only, if given key is valid ! */																				\
-        if ( xKey.is() == sal_True )                                                                         							\
-        {                                                                                           									\
-            LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" )																	\
-            /* Build new keyname	*/																									\
-            sKeyName	 =	DECLARE_ASCII( "/" );																						\
-            sKeyName	+=	CLASS::impl_getStaticImplementationName();																	\
-            sKeyName	+=	DECLARE_ASCII( "/UNO/SERVICES" );																			\
-            LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" )																			\
-            LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) )																				\
-            LOG_REGISTRATION_WRITEINFO( "\" ...\n" )																					\
-            /* Create new key with new name. */																							\
-             xNewKey = xKey->createKey( sKeyName );                                              										\
-            /* If this new key valid ... */																								\
-            if ( xNewKey.is() == sal_True )                                                                    							\
-            {                                                                                       									\
-                LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" )																\
-                /* Get information about supported services. */																			\
-                seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           										\
-                pArray			=	seqServiceNames.getArray()						;           										\
-                nLength			=	seqServiceNames.getLength()						;           										\
-                nCounter		=	0												;           										\
-                /* Then set this information on this key. */																			\
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                									\
-                {                                                                                   									\
-                    LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" )																\
-                    LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) )																\
-                    LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" )																\
-                    xNewKey->createKey( pArray[nCounter] );                                      										\
-                }                                                                                   									\
-                /* Result of this operations = OK. */																					\
-                bReturn = sal_True ;                                                                									\
-            }                                                                                       									\
-        }                                                                                           									\
-    }                                                                                               									\
-    catch( ::com::sun::star::registry::InvalidRegistryException& )                                                             			\
-    {                                                                                               									\
-        LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" )												\
-        bReturn = sal_False ;                                                                       									\
-    }
-
-//*****************************************************************************************************************
-//	public
 //	use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
 //*****************************************************************************************************************
 #define	IFFACTORY( CLASS )																												\
@@ -145,41 +90,6 @@ ________________________________________________________________________________
 
 //*****************************************************************************************************************
 //	public
-//	define registration of service
-//*****************************************************************************************************************
-#define	COMPONENTWRITEINFO( INFOS )																										\
-    extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(	void* /*pServiceManager*/	,														\
-                                                        void*	pRegistryKey	)														\
-    {																																	\
-        LOG_REGISTRATION_WRITEINFO( "\t[start]\n" )																						\
-        /* Set default return value for this operation - if it failed. */																\
-        sal_Bool bReturn = sal_False ;																									\
-        if ( pRegistryKey != NULL )																										\
-        {																																\
-            LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" )																\
-            /* Define variables for following helper macros! */																			\
-            /* bReturn will set automaticly.                 */																			\
-            ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >	xKey			;							\
-            ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >	xNewKey			;							\
-            ::com::sun::star::uno::Sequence<  ::rtl::OUString >								seqServiceNames	;							\
-            const ::rtl::OUString*															pArray			;							\
-            sal_Int32																		nLength			;							\
-            sal_Int32																		nCounter		;							\
-            ::rtl::OUString																	sKeyName		;							\
-            xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey );										\
-            /* This parameter will expand to */																							\
-            /*   "COMPONENT_INFO(a)          */																							\
-            /*    ...                        */																							\
-            /*    COMPONENT_INFO(z)"         */																							\
-            INFOS																														\
-        }																																\
-        LOG_REGISTRATION_WRITEINFO( "\t[end]\n" )																						\
-        /* Return with result of this operation. */																						\
-        return bReturn ;																												\
-    }
-
-//*****************************************************************************************************************
-//	public
 //	define method to instanciate new services
 //*****************************************************************************************************************
 #define	COMPONENTGETFACTORY( IFFACTORIES )																								\
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index faf81d0e63..faf81d0e63 100644..100755
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 24e6d3918a..24e6d3918a 100644..100755
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 00ab9819a9..00ab9819a9 100644..100755
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
diff --git a/framework/inc/pch/precompiled_framework.cxx b/framework/inc/pch/precompiled_framework.cxx
index 89285be8ac..89285be8ac 100644..100755
--- a/framework/inc/pch/precompiled_framework.cxx
+++ b/framework/inc/pch/precompiled_framework.cxx
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index 4fe695fa75..32620a3528 100644..100755
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -466,7 +466,7 @@
 #include "vcl/keycod.hxx"
 #include "vcl/keycodes.hxx"
 #include "vcl/lstbox.hxx"
-#include "vcl/mapunit.hxx"
+#include "tools/mapunit.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/morebtn.hxx"
@@ -485,7 +485,7 @@
 #include "vcl/timer.hxx"
 #include "vcl/wall.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 
 
 
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index c5c0488b7a..8774fc9e8f 100644..100755
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -285,7 +285,7 @@ class PropHelper
     //___________________________________________
 
     /** checks if given property will be changed by this settings.
-     *  We compare the content of the given any values. If they are different we return TRUE - FALSE otherwhise.
+     *  We compare the content of the given any values. If they are different we return sal_True - sal_False otherwhise.
      *
      *  @param  aCurrentValue   contains the current value for this property
      *  @param  aNewValue       contains the new value for this property
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index 0d1520a82f..0d1520a82f 100644..100755
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 2df007ca36..2df007ca36 100644..100755
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 5fe98a9a2a..5fe98a9a2a 100644..100755
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index c8e87c351b..c8e87c351b 100644..100755
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
diff --git a/framework/inc/services.h b/framework/inc/services.h
index dd560595f3..f8588d2acb 100644..100755
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -126,6 +126,8 @@ namespace framework{
 #define SERVICENAME_TABWINDOWSERVICE                            DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow"          )
 #define SERVICENAME_WINDOWCONTENTFACTORYMANAGER					DECLARE_ASCII("com.sun.star.ui.WindowContentFactoryManager"			)
 #define SERVICENAME_DISPLAYACCESS                               DECLARE_ASCII("com.sun.star.awt.DisplayAccess"                      )
+#define SERVICENAME_PANELFACTORY                                DECLARE_ASCII("com.sun.star.ui.PanelFactory"                        )
+#define SERVICENAME_MODELWINSERVICE                             DECLARE_ASCII("com.sun.star.ui.ModelWinService"                     )
 
 //_________________________________________________________________________________________________________________
 //	used implementationnames by framework
@@ -212,6 +214,8 @@ namespace framework{
 #define IMPLEMENTATIONNAME_IMAGEMANAGER                         DECLARE_ASCII("com.sun.star.comp.framework.ImageManager"            )
 #define IMPLEMENTATIONNAME_TABWINDOWSERVICE                     DECLARE_ASCII("com.sun.star.comp.framework.TabWindowService"        )
 #define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER			DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager"	)
+#define IMPLEMENTATIONNAME_PANELFACTORY                         DECLARE_ASCII("com.sun.star.comp.framework.PanelFactory"	        )
+#define IMPLEMENTATIONNAME_MODELWINSERVICE                      DECLARE_ASCII("com.sun.star.comp.framework.ModelWinService"         )
 
 }		//	namespace framework
 
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 56f0c90180..636ad98e7f 100644..100755
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -667,9 +667,9 @@ class AutoRecovery  : public  css::lang::XTypeProvider
                     the new document, which should be deregistered.
 
             @param  bStopListening
-                    FALSE: must be used in case this method is called withion disposing() of the document,
+                    sal_False: must be used in case this method is called withion disposing() of the document,
                            where it make no sense to deregister our listener. The container dies ...
-                    TRUE : must be used in case this method is used on "dergistration" of this document, where
+                    sal_True : must be used in case this method is used on "dergistration" of this document, where
                            we must deregister our listener .-)
 
             @threadsafe
@@ -736,11 +736,11 @@ class AutoRecovery  : public  css::lang::XTypeProvider
                                  will be postponed if there exists other unsaved
                                  documents. This feature was implemented, because
                                  we dont wish to disturb the user on it's work.
-                                 ... bAllowUserIdleLoop should be set to TRUE
+                                 ... bAllowUserIdleLoop should be set to sal_True
                     EMERGENCY_SAVE / SESSION_SAVE =>
                                  Here we must finish our work ASAP! It's not allowed
                                  to postpone any document.
-                                 ... bAllowUserIdleLoop must(!) be set to FALSE
+                                 ... bAllowUserIdleLoop must(!) be set to sal_False
 
             @param  pParams
                     sometimes this method is required inside an external dispatch request.
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index f66a109ac2..f66a109ac2 100644..100755
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 57bf71175e..57bf71175e 100644..100755
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index c1cc855323..c1cc855323 100644..100755
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx
index d88e8b2d73..574e3deab3 100644..100755
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -372,7 +372,7 @@ class DetectorFactory : // interfaces
             @param  sName
                     the name of the queried container entry.
 
-            @return TRUE if the requested item exist; FALSE otherwise.
+            @return sal_True if the requested item exist; sal_False otherwise.
          */
 
         virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName )
@@ -394,7 +394,7 @@ class DetectorFactory : // interfaces
 
         /** @short  return fill state of this cache.
 
-            @return TRUE if any item exist inside this conatiner; FALSE otherwhise.
+            @return sal_True if any item exist inside this conatiner; sal_False otherwhise.
          */
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index e6176d1824..e6176d1824 100644..100755
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 0bf2ef00be..0bf2ef00be 100644..100755
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 8fa0bd6dce..a040cfebe8 100644..100755
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -297,7 +297,7 @@ class FrameLoaderFactory	:	public ThreadHelpBase							,		// Struct for right in
         /*-****************************************************************************************************//**
             @short		return state if informations about frame loader available
             @descr		If these method return false - no information could'nt read from configuration ...
-                        I think nothing will work then. Normaly we return TRUE!
+                        I think nothing will work then. Normaly we return sal_True!
 
             @seealso	class FilterCache!
 
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 09c6769a3b..e5fccea1c6 100644..100755
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -7,6 +7,9 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +53,10 @@
 #include <stdtypes.h>
 #include <uielement/menubarmanager.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
+#include <uielement/panelwindow.hxx>
+#include <uielement/uielement.hxx>
+#include <helper/ilayoutnotifications.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -77,10 +83,10 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase9.hxx>
+#include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/timer.hxx>
@@ -88,14 +94,15 @@
 class MenuBar;
 namespace framework
 {
+    class ToolbarLayoutManager;
+    class PanelManager;
     class GlobalSettings;
-    typedef ::cppu::WeakImplHelper9 <   ::com::sun::star::lang::XServiceInfo
+    typedef ::cppu::WeakImplHelper8 <   ::com::sun::star::lang::XServiceInfo
                                     ,   ::com::sun::star::frame::XLayoutManager
                                     ,   ::com::sun::star::awt::XWindowListener
                                     ,   ::com::sun::star::frame::XFrameActionListener
                                     ,   ::com::sun::star::ui::XUIConfigurationListener
                                     ,   ::com::sun::star::frame::XInplaceLayout
-                                    ,   ::com::sun::star::awt::XDockableWindowListener
                                     ,   ::com::sun::star::frame::XMenuBarMergingAcceptor
                                     ,   ::com::sun::star::frame::XLayoutManagerEventBroadcaster
                                     >   LayoutManager_Base;
@@ -105,6 +112,7 @@ namespace framework
                           // Order is neccessary for right initialization!
                           private ThreadHelpBase						,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                           public  ::cppu::OBroadcastHelper              ,
+                          public  ILayoutNotifications                  ,
                           public  LayoutManager_PBase
     {
         public:
@@ -122,7 +130,7 @@ namespace framework
             // XLayoutManager
             //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL reset(  ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea(  ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDockingAreaAcceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (::com::sun::star::uno::RuntimeException);
@@ -193,17 +201,6 @@ namespace framework
             virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);        
 
             //---------------------------------------------------------------------------------------------------------
-            //  XDockableWindowListener
-            //---------------------------------------------------------------------------------------------------------
-            virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); 
-            virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException);
-
-            //---------------------------------------------------------------------------------------------------------
             //  XLayoutManagerEventBroadcaster
             //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -212,196 +209,64 @@ namespace framework
             DECL_LINK( MenuBarClose, MenuBar * );
             DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
-            struct DockedData
-            {
-                DockedData() : m_aPos( LONG_MAX, LONG_MAX ),
-                               m_nDockedArea( ::com::sun::star::ui::DockingArea_DOCKINGAREA_TOP ),
-                               m_bLocked( sal_False ) {}
-
-                Point       m_aPos;
-                Size        m_aSize;
-                sal_Int16   m_nDockedArea;
-                sal_Bool    m_bLocked;
-            };
-            struct FloatingData
-            {
-                FloatingData() : m_aPos( LONG_MAX, LONG_MAX ), 
-                                 m_nLines( 1 ), 
-                                 m_bIsHorizontal( sal_True ) {}
-
-                Point       m_aPos;
-                Size        m_aSize;
-                sal_Int16   m_nLines;
-                sal_Bool    m_bIsHorizontal;
-            };
-            struct SingleRowColumnWindowData
-            {
-                SingleRowColumnWindowData() : nVarSize( 0 ), nStaticSize( 0 ), nSpace( 0 ) {}
-
-                std::vector< rtl::OUString >                                                      aUIElementNames;
-                std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aRowColumnWindows;
-                std::vector< ::com::sun::star::awt::Rectangle >                                   aRowColumnWindowSizes;
-                std::vector< sal_Int32 >                                                          aRowColumnSpace;
-                ::com::sun::star::awt::Rectangle                                                  aRowColumnRect;
-                sal_Int32                                                                         nVarSize;
-                sal_Int32                                                                         nStaticSize;
-                sal_Int32                                                                         nSpace;
-                sal_Int32                                                                         nRowColumn;
-            };
+            //---------------------------------------------------------------------------------------------------------
+            //  ILayoutNotifications
+            //---------------------------------------------------------------------------------------------------------
+            virtual void requestLayout( Hint eHint );
 
         protected:
             DECL_LINK( AsyncLayoutHdl, Timer * );
 
         private:
-            enum DockingOperation
-            {
-                DOCKOP_BEFORE_COLROW,
-                DOCKOP_ON_COLROW,
-                DOCKOP_AFTER_COLROW
-            };
-            struct UIElement
-            {
-                UIElement() : m_bFloating( sal_False ),
-                              m_bVisible( sal_True ),
-                              m_bUserActive( sal_False ),
-                              m_bCreateNewRowCol0( sal_False ),
-                              m_bDeactiveHide( sal_False ),
-                              m_bMasterHide( sal_False ),
-                              m_bContextSensitive( sal_False ),
-                              m_bContextActive( sal_True ),
-                              m_bNoClose( sal_False ),
-                              m_bSoftClose( sal_False ),
-                              m_bStateRead( sal_False ),
-                              m_nStyle( BUTTON_SYMBOL )
-                              {}
-                
-                UIElement( const rtl::OUString& rName, 
-                           const rtl::OUString& rType, 
-                           const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement,
-                           sal_Bool bFloating = sal_False
-                           ) : m_aType( rType ), 
-                               m_aName( rName ),
-                               m_xUIElement( rUIElement ), 
-                               m_bFloating( bFloating ),
-                               m_bVisible( sal_True ),
-                               m_bUserActive( sal_False ),
-                               m_bCreateNewRowCol0( sal_False ),
-                               m_bDeactiveHide( sal_False ),
-                               m_bMasterHide( sal_False ),
-                               m_bContextSensitive( sal_False ),
-                               m_bContextActive( sal_True ),
-                               m_bNoClose( sal_False ),
-                               m_bSoftClose( sal_False ),
-                               m_bStateRead( sal_False ),
-                               m_nStyle( BUTTON_SYMBOL ) {}
-
-                bool operator< ( const UIElement& aUIElement ) const;
-                UIElement& operator=( const UIElement& rUIElement );
-
-                rtl::OUString                                                            m_aType;
-                rtl::OUString                                                            m_aName;
-                rtl::OUString                                                            m_aUIName;
-                com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >       m_xUIElement;
-                sal_Bool                                                                 m_bFloating,
-                                                                                         m_bVisible,
-                                                                                         m_bUserActive,
-                                                                                         m_bCreateNewRowCol0,
-                                                                                         m_bDeactiveHide,
-                                                                                         m_bMasterHide,
-                                                                                         m_bContextSensitive,
-                                                                                         m_bContextActive;
-                sal_Bool                                                                 m_bNoClose,
-                                                                                         m_bSoftClose,
-                                                                                         m_bStateRead;
-                sal_Int16                                                                m_nStyle;
-                DockedData                                                               m_aDockedData;
-                FloatingData                                                             m_aFloatingData;
-            };
-            
-            typedef std::vector< UIElement > UIElementVector;
-            
             //---------------------------------------------------------------------------------------------------------
             //  helper
             //---------------------------------------------------------------------------------------------------------
-            
+
             //---------------------------------------------------------------------------------------------------------
-            //  helper
+            //  menu bar
             //---------------------------------------------------------------------------------------------------------
             void impl_clearUpMenuBar();
             void implts_reset( sal_Bool bAttach );
+            void implts_setMenuBarCloser(sal_Bool bCloserState);
             void implts_updateMenuBarClose();
             sal_Bool implts_resetMenuBar();
             
+            //---------------------------------------------------------------------------------------------------------
+            //  locking
+            //---------------------------------------------------------------------------------------------------------
             void implts_lock();
             sal_Bool implts_unlock();
 
-            sal_Bool implts_findElement( const rtl::OUString& aName, rtl::OUString& aElementType, rtl::OUString& aElementName, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xSettings );
-            sal_Bool implts_findElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xUIElement, UIElement& aElementData );
-            sal_Bool implts_findElement( const rtl::OUString& aName, UIElement& aElementData );
+            //---------------------------------------------------------------------------------------------------------
+            //  query
+            //---------------------------------------------------------------------------------------------------------
+            ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const rtl::OUString& aName );
             UIElement& impl_findElement( const rtl::OUString& aName );
-            sal_Bool implts_insertUIElement( const UIElement& rUIElement );
 
-            void implts_refreshContextToolbarsVisibility();
             void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
             sal_Bool implts_readWindowStateData( const rtl::OUString& rName, UIElement& rElementData );
             void implts_writeWindowStateData( const rtl::OUString& rName, const UIElement& rElementData );
             void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
             void implts_sortUIElements();
             void implts_destroyElements();
-            void implts_destroyDockingAreaWindows();
-            void implts_createAddonsToolBars();
-            void implts_createCustomToolBars();
-            void implts_createNonContextSensitiveToolBars();
-            void implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq );
-            void implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle );
             void implts_toggleFloatingUIElementsVisibility( sal_Bool bActive );
             void implts_reparentChildWindows();
+            ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createDockingWindow( const ::rtl::OUString& aElementName );
 
             sal_Bool implts_isEmbeddedLayoutManager() const;
             sal_Int16 implts_getCurrentSymbolsSize();
             sal_Int16 implts_getCurrentSymbolsStyle();
-            ::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >& rParent );
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const rtl::OUString& aName );
-            rtl::OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
-            
-            // docking methods
-            ::Rectangle      implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset );
-            void             implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos );
-            DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos );
-            ::Rectangle      implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const rtl::OUString& rExcludeElementName );
-            ::Rectangle      implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, 
-                                                               sal_Int32 nRowCol, 
-                                                               const ::Rectangle& rDockedElementRect,
-                                                               const ::rtl::OUString& rMovedElementName,
-                                                               const ::Rectangle& rMovedElementRect );
-            void             implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea,
-                                                                        sal_Int32 nOffset,
-                                                                        SingleRowColumnWindowData& rRowColumnWindowData,
-                                                                        const ::Size& rContainerSize );
-            ::Rectangle      implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, 
-                                                                sal_Int32 nRowCol,
-                                                                UIElement& rUIElement,
-                                                                const ::Rectangle& rTrackingRect,
-                                                                const ::Rectangle& rRowColumnRect,
-                                                                const ::Size& rContainerWinSize );
-            void             implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement );
             
             // layouting methods
-            sal_Bool implts_compareRectangles( const ::com::sun::star::awt::Rectangle& rRect1, const ::com::sun::star::awt::Rectangle& rRect2 );
             sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos );
             ::Size  implts_getTopBottomDockingAreaSizes();
             ::Size  implts_getContainerWindowOutputSize();
-            ::com::sun::star::awt::Rectangle implts_getDockingAreaWindowSizes();
-            void    implts_getDockingAreaElementInfos( ::com::sun::star::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData );
-            void    implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, 
-                                                                     sal_Int32 nRowCol, 
-                                                                     SingleRowColumnWindowData& rRowColumnWindowData );
-            ::Point implts_findNextCascadeFloatingPos();
-            void    implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos );
+            
+            void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace );
             ::com::sun::star::awt::Rectangle implts_calcDockingAreaSizes();
-            void    implts_setDockingAreaWindowSizes( const com::sun::star::awt::Rectangle& rBorderSpace );
             sal_Bool implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize );
-            void    implts_doLayout_notify( sal_Bool bOuterResize );
+            void implts_doLayout_notify( sal_Bool bOuterResize );
             
             // internal methods to control status/progress bar
             ::Size      implts_getStatusBarSize();
@@ -416,6 +281,7 @@ namespace framework
             sal_Bool    implts_showProgressBar();
             sal_Bool    implts_hideProgressBar();
             void        implts_backupProgressBarWrapper();
+            void        implts_setOffset( const sal_Int32 nBottomOffset );
 
             void 	implts_setInplaceMenuBar(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar )
@@ -426,12 +292,7 @@ namespace framework
             void    implts_setVisibleState( sal_Bool bShow );
             void    implts_updateUIElementsVisibleState( sal_Bool bShow );
             void    implts_setCurrentUIVisibility( sal_Bool bShow );
-            sal_Bool impl_parseResourceURL( const rtl::OUString aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName );
-
             void    implts_notifyListeners( short nEvent, ::com::sun::star::uno::Any aInfoParam );
-#ifdef DBG_UTIL
-            void    implts_checkElementContainer();
-#endif
 
             DECL_LINK( OptionsChanged, void* );
             DECL_LINK( SettingsChanged, void* );
@@ -460,9 +321,7 @@ namespace framework
             css::uno::WeakReference< css::frame::XModel >                               m_xModel;
             css::uno::Reference< css::awt::XWindow >                                    m_xContainerWindow;
             css::uno::Reference< css::awt::XTopWindow2 >                                m_xContainerTopWindow;
-            css::uno::Reference< css::awt::XWindow >                                    m_xDockAreaWindows[DOCKINGAREAS_COUNT];
             sal_Int32                                                                   m_nLockCount;
-            UIElementVector                                                             m_aUIElements;
             bool                                                                        m_bActive;
             bool                                                                        m_bInplaceMenuSet;
             bool                                                                        m_bDockingInProgress;
@@ -477,11 +336,9 @@ namespace framework
             bool                                                                        m_bHideCurrentUI;
             bool                                                                        m_bGlobalSettings;
             bool                                                                        m_bPreserveContentSize;
-            DockingOperation                                                            m_eDockOperation;
-            UIElement                                                                   m_aDockUIElement;
+            bool                                                                        m_bMenuBarCloser;
             css::awt::Rectangle                                                         m_aDockingArea;
             css::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >           m_xDockingAreaAcceptor;
-            Point                                                                       m_aStartDockMousePos;
             css::uno::Reference< ::com::sun::star::lang::XComponent >                   m_xInplaceMenuBar;
             MenuBarManager*                                                             m_pInplaceMenuBar;
             css::uno::Reference< ::com::sun::star::ui::XUIElement >                     m_xMenuBar;
@@ -490,14 +347,10 @@ namespace framework
             com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >          m_xProgressBarBackup;
             css::uno::Reference< ::com::sun::star::frame::XModuleManager >              m_xModuleManager;
             css::uno::Reference< ::com::sun::star::ui::XUIElementFactory >              m_xUIElementFactoryManager;
-            bool                                                                        m_bMenuBarCloser;
             css::uno::Reference< ::com::sun::star::container::XNameAccess >             m_xPersistentWindowState;
             css::uno::Reference< ::com::sun::star::container::XNameAccess >             m_xPersistentWindowStateSupplier;
             GlobalSettings*                                                             m_pGlobalSettings;
             rtl::OUString                                                               m_aModuleIdentifier;
-            rtl::OUString                                                               m_aCustomTbxPrefix;
-            rtl::OUString                                                               m_aFullCustomTbxPrefix;
-            rtl::OUString                                                               m_aFullAddonTbxPrefix;
             rtl::OUString                                                               m_aStatusBarAlias;
             rtl::OUString                                                               m_aProgressBarAlias;
             rtl::OUString                                                               m_aPropDocked;
@@ -510,12 +363,13 @@ namespace framework
             rtl::OUString                                                               m_aPropStyle;
             rtl::OUString                                                               m_aPropLocked;
             rtl::OUString                                                               m_aCustomizeCmd;
-            AddonsOptions*                                                              m_pAddonOptions;
-            SvtMiscOptions*                                                             m_pMiscOptions;
             sal_Int16                                                                   m_eSymbolsSize;
             sal_Int16                                                                   m_eSymbolsStyle;
-            Timer				                                                        m_aAsyncLayoutTimer;
+        Timer                                                                       m_aAsyncLayoutTimer;
             ::cppu::OMultiTypeInterfaceContainerHelper                                  m_aListenerContainer; // container for ALL Listener
+            PanelManager*                                                               m_pPanelManager;
+            ToolbarLayoutManager*                                                       m_pToolbarManager;
+            css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >       m_xToolbarManager;
     };
     
 } // namespace framework
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index edc704a5d4..edc704a5d4 100644..100755
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 8fd7501d1a..43e0cc1af7 100644..100755
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -46,7 +46,7 @@ namespace framework {
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -56,9 +56,9 @@ public:
 
     void ScrollDown( ScrollType eScroll );
 
-    BOOL IsEndReached() const;
-    BOOL EndReached() const { return mbEndReached; }
-    void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+    sal_Bool IsEndReached() const;
+    sal_Bool EndReached() const { return mbEndReached; }
+    void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
 
     void SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
     const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -86,7 +86,7 @@ class LicenseDialog : public ModalDialog
     String          aStrAccept;
     String          aStrNotAccept;
     String          aOldCancelText;
-    BOOL            bEndReached;
+    sal_Bool            bEndReached;
 
     void                EnableControls();
 
diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc
index d287b34a2f..d287b34a2f 100644..100755
--- a/framework/inc/services/logindialog.hrc
+++ b/framework/inc/services/logindialog.hrc
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index ea13c21d7a..c4d8ec748a 100644..100755
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -561,7 +561,7 @@ class LoginDialog	:	public XTYPEPROVIDER				,
             @return		1; if closed with OK
             @return		0; if cancelled
 
-            @onerror	We return 0(FALSE).
+            @onerror	We return 0(sal_False).
         *//*-*****************************************************************************************************/
 
         virtual sal_Int16 SAL_CALL execute() throw( RUNTIMEEXCEPTION );
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index bce520d7e9..bce520d7e9 100644..100755
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
diff --git a/framework/inc/services/modelwinservice.hxx b/framework/inc/services/modelwinservice.hxx
new file mode 100755
index 0000000000..8a334253ff
--- /dev/null
+++ b/framework/inc/services/modelwinservice.hxx
@@ -0,0 +1,122 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: urltransformer.hxx,v $
+ * $Revision: 1.8 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
+#define __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <threadhelp/threadhelpbase.hxx>
+#include <macros/generic.hxx>
+#include <macros/debug.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <general.h>
+#include <stdtypes.h>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <cppuhelper/weak.hxx>
+#include <vcl/window.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework{
+
+class IModelWin
+{
+    public:
+        virtual void registerModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow, const css::uno::Reference< css::awt::XControlModel >& rModel ) = 0;
+        virtual void deregisterModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow ) = 0;
+};
+    
+class ModelWinService : public css::lang::XTypeProvider
+                     ,  public css::lang::XServiceInfo
+                     ,  public css::container::XNameAccess
+                     ,  public IModelWin
+                     ,  public ::cppu::OWeakObject
+{
+    public:
+        ModelWinService(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+        virtual ~ModelWinService();
+
+        //---------------------------------------------------------------------------------------------------------
+        //	XInterface, XTypeProvider, XServiceInfo
+        //---------------------------------------------------------------------------------------------------------
+
+        FWK_DECLARE_XINTERFACE
+        FWK_DECLARE_XTYPEPROVIDER
+        DECLARE_XSERVICEINFO
+
+        //---------------------------------------------------------------------------------------------------------
+        //	IModelWin
+        //---------------------------------------------------------------------------------------------------------
+        virtual void registerModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow, const css::uno::Reference< css::awt::XControlModel >& rModel );
+        virtual void deregisterModelForXWindow( const css::uno::Reference< css::awt::XWindow >& rWindow );
+        
+        //---------------------------------------------------------------------------------------------------------
+        //	XNameAccess
+        //---------------------------------------------------------------------------------------------------------
+        virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& sName ) throw(	css::container::NoSuchElementException	,
+                                                                                        css::lang::WrappedTargetException		,
+                                                                                        css::uno::RuntimeException				);
+        virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //	XElementAccess
+        //---------------------------------------------------------------------------------------------------------
+        virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException );
+
+    private:
+        css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceManager;
+};
+
+}
+
+#endif // __FRAMEWORK_SERVICES_MODELWINSERVICE_HXX_
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index 4010e3cda8..4010e3cda8 100644..100755
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 41585aff67..41585aff67 100644..100755
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 124c4b198d..124c4b198d 100644..100755
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index d669e71e9e..d669e71e9e 100644..100755
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 7ffd86374e..7ffd86374e 100644..100755
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 3df7d18add..3df7d18add 100644..100755
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index d90136304a..074e225fcf 100644..100755
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -592,8 +592,8 @@ class Task  :   public css::frame::XTask    ,   // => XFrame => XComponent
     protected:
 
         // But some values are neede by derived classes!
-//        sal_Bool            m_bIsPlugIn         ;   /// In objects of these class this member is set to FALSE.
-                                                    /// But in derived class PlugInFrame it's overwrited with TRUE!
+//        sal_Bool            m_bIsPlugIn         ;   /// In objects of these class this member is set to sal_False.
+                                                    /// But in derived class PlugInFrame it's overwrited with sal_True!
 
     private:
 
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index 2eb60ccfe9..0a68effc48 100644..100755
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -84,7 +84,7 @@ class TaskCreatorService : public  css::lang::XTypeProvider
          */
         static const ::rtl::OUString ARGUMENT_FRAMENAME;
     
-        /// [sal_Bool] If its set to TRUE we will make the new created frame visible.
+        /// [sal_Bool] If its set to sal_True we will make the new created frame visible.
         static const ::rtl::OUString ARGUMENT_MAKEVISIBLE;
     
         /** [sal_Bool] If not "ContainerWindow" property is set it force creation of a
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 2f263a94e6..2f263a94e6 100644..100755
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index b17f614619..b17f614619 100644..100755
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 9dd454fd91..9dd454fd91 100644..100755
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 2b494c223d..2b494c223d 100644..100755
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 3a56718669..3a56718669 100644..100755
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index 60d79bb1fc..60d79bb1fc 100644..100755
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index f6306e1bbc..f6306e1bbc 100644..100755
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 6f2f17b459..6f2f17b459 100644..100755
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index c9ccd8cfcc..c9ccd8cfcc 100644..100755
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index c53f5cfaa0..c53f5cfaa0 100644..100755
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index 7e2c80b6d8..7e2c80b6d8 100644..100755
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 2938d54556..2938d54556 100644..100755
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 0f8c37f4db..3408536b90 100644..100755
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -34,7 +34,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <threadhelp/inoncopyable.h>
-#include <threadhelp/imutex.h>
+#include <framework/imutex.hxx>
 #include <threadhelp/irwlock.h>
 #include <threadhelp/fairrwlock.hxx>
 
@@ -46,6 +46,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -103,7 +104,7 @@ enum ELockType
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class LockHelper : public  IMutex
+class FWI_DLLPUBLIC LockHelper : public  IMutex
                  , public  IRWLock
                  , private INonCopyable
 {
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index def23ec923..def23ec923 100644..100755
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index a28da005f3..3a764d086f 100644..100755
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -30,7 +30,7 @@
 #define __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
 
 #include <threadhelp/inoncopyable.h>
-#include <threadhelp/imutex.h>
+#include <framework/imutex.hxx>
 
 #include <sal/types.h>
 
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index 0f49d39104..0f49d39104 100644..100755
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 28c6662106..28c6662106 100644..100755
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index da3c38dab5..da3c38dab5 100644..100755
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 9ff7322fff..c6e6859399 100644..100755
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -50,6 +50,7 @@
 //	other includes
 //_________________________________________________________________________________________________________________
 #include <osl/mutex.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -79,7 +80,7 @@ namespace framework{
 
     @devstatus      draft
 *//*-*************************************************************************************************************/
-class TransactionManager : public  ITransactionManager
+class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
                          , private INonCopyable
 {
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index 094638872d..094638872d 100644..100755
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 8bb5508061..8bb5508061 100644..100755
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 4b025eb7a1..4b025eb7a1 100644..100755
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 04257f0450..04257f0450 100644..100755
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index bc9848f8c8..bc9848f8c8 100644..100755
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 2e385e5fcd..2e385e5fcd 100644..100755
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 48eb9cf5e1..48eb9cf5e1 100644..100755
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 374194f43b..374194f43b 100644..100755
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 1225a84ca9..1225a84ca9 100644..100755
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 2d8d64264d..2d8d64264d 100644..100755
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 6cb52b68f7..6cb52b68f7 100644..100755
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 5e6b8f6e3e..5e6b8f6e3e 100644..100755
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 81ad9a3ccd..81ad9a3ccd 100644..100755
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index bd8f09150c..bd8f09150c 100644..100755
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 28f7721d0b..b4e75862ca 100644..100755
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -61,7 +61,7 @@ class ComboboxToolbarController : public IComboBoxListener,
         ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                    const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                    ToolBox*     pToolBar,
-                                   USHORT       nID,
+                                   sal_uInt16       nID,
                                    sal_Int32    nWidth,
                                    const rtl::OUString& aCommand );
         virtual ~ComboboxToolbarController();
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index ee12d95928..15c41ace5a 100644..100755
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -48,12 +48,14 @@ namespace framework
 struct CommandInfo
 {
     CommandInfo() : nId( 0 ),
+                    nWidth( 0 ),
                     nImageInfo( 0 ),
                     bMirrored( false ),
                     bRotated( false ) {}
 
-    USHORT                  nId;
-    ::std::vector< USHORT > aIds;
+    sal_uInt16                  nId;
+    sal_uInt16                  nWidth;
+    ::std::vector< sal_uInt16 > aIds;
     sal_Int16               nImageInfo;
     sal_Bool                bMirrored : 1,
                             bRotated  : 1;
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index e3d4709cc9..8684e833d5 100644..100755
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -69,7 +69,7 @@ class ComplexToolbarController : public svt::ToolboxController
         ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox*     pToolBar,
-                                  USHORT       nID,
+                                  sal_uInt16       nID,
                                   const rtl::OUString& aCommand );
         virtual ~ComplexToolbarController();
 
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 12b4eea6db..ed4601d0f6 100644..100755
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -57,13 +57,14 @@
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
 
 class RootItemContainer;
 class ItemContainer;
-class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
+class FWI_DLLPUBLIC ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
                             public com::sun::star::container::XIndexAccess  ,
                             public ::com::sun::star::lang::XUnoTunnel       ,
                             public ::com::sun::star::beans::XFastPropertySet,
@@ -72,7 +73,7 @@ class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
 {
     friend class RootItemContainer;
     friend class ItemContainer;
-    
+
     public:
         ConstItemContainer();
         ConstItemContainer( const ItemContainer& rtemContainer );
@@ -85,12 +86,12 @@ class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
         //---------------------------------------------------------------------------------------------------------
         FWK_DECLARE_XINTERFACE
         FWK_DECLARE_XTYPEPROVIDER
-        
+
         // XUnoTunnel
         static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
         static ConstItemContainer*								    GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
         sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-        
+ 
         // XIndexAccess
         virtual sal_Int32 SAL_CALL getCount()
             throw (::com::sun::star::uno::RuntimeException);
@@ -116,7 +117,7 @@ class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
         virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        
+
         // XFastPropertySet
         virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -124,7 +125,7 @@ class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
     private:
         ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
         const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
-        static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW( () ); 
+        static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW( () );
 
         void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector );
         com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer );
@@ -132,7 +133,7 @@ class ConstItemContainer :	public ::com::sun::star::lang::XTypeProvider    ,
         std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector;
         rtl::OUString                                                                        m_aUIName;
 };
-                            
+
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 319272a0dc..319272a0dc 100644..100755
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 38fc43be01..0234b61bd6 100644..100755
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -65,7 +65,7 @@ class DropdownToolbarController : public IListBoxListener,
         DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                    const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                    ToolBox*     pToolBar,
-                                   USHORT       nID,
+                                   sal_uInt16       nID,
                                    sal_Int32    nWidth,
                                    const rtl::OUString& aCommand );
         virtual ~DropdownToolbarController();
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index cc7d6070c2..b07866944d 100644..100755
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -65,7 +65,7 @@ class EditToolbarController : public IEditListener,
         EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                ToolBox*     pToolBar,
-                               USHORT       nID,
+                               sal_uInt16       nID,
                                sal_Int32    nWidth,
                                const rtl::OUString& aCommand );
         virtual ~EditToolbarController();
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 5f16101673..5f16101673 100644..100755
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 129f8a1467..129f8a1467 100644..100755
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index eff406dc3b..eff406dc3b 100644..100755
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index f55a5a877a..5b9106ee10 100644..100755
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -50,7 +50,7 @@ class GenericToolbarController : public svt::ToolboxController
         GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox* pToolBar,
-                                  USHORT   nID,
+                                  sal_uInt16   nID,
                                   const rtl::OUString& aCommand );
         virtual ~GenericToolbarController();
 
@@ -83,7 +83,7 @@ class MenuToolbarController : public GenericToolbarController
         MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                   const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                   ToolBox* pToolBar,
-                                  USHORT   nID,
+                                  sal_uInt16   nID,
                                   const rtl::OUString& aCommand, 
                                   const rtl::OUString& aModuleIdentifier, 
                                   const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc );
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 643dcb5cda..643dcb5cda 100644..100755
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 6c4b72104b..23c9e6b70c 100644..100755
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -52,7 +52,7 @@ class ImageButtonToolbarController : public ComplexToolbarController
         ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                       const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                       ToolBox*             pToolBar,
-                                      USHORT               nID,
+                                      sal_uInt16               nID,
                                       const rtl::OUString& aCommand );
         virtual ~ImageButtonToolbarController();
 
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 09d9f8bd35..5a0dfedcf8 100644..100755
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -53,12 +53,12 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
-
 class ConstItemContainer;
-class ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
+class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
 {
     friend class ConstItemContainer;
 
@@ -75,7 +75,7 @@ class ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::contai
         static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
         static ItemContainer*								        GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
         sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-        
+
         // XIndexContainer
         virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -108,11 +108,11 @@ class ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::contai
         ItemContainer();
         void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
         com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex );
-        
+
         mutable ShareableMutex                                                               m_aShareMutex;
         std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector;
 };
-                            
+
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 5ed6e06711..5ed6e06711 100644..100755
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 5e498e00dc..5e498e00dc 100644..100755
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
index c0deb455b7..c0deb455b7 100644..100755
--- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx
+++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 4a50ff0aef..4a50ff0aef 100644..100755
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index c5d4725ceb..be86c9ac37 100644..100755
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -82,7 +82,7 @@ namespace framework
             virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL);
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
             String RetrieveLabelFromCommand( const String& aCmdURL ); 
-            void addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId );
+            void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
     };
 }
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index ac7db06f05..44fef4d57c 100644..100755
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -73,7 +73,7 @@
 #include <toolkit/awt/vclxmenu.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 
 namespace framework
 {
@@ -164,11 +164,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         Menu*	GetMenuBar() const { return m_pVCLMenu; }
         
         // Configuration methods
-        static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu, 
+        static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, 
                                                const ::rtl::OUString& rModuleIdentifier, 
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, 
                                                const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer );
-        static void FillMenu( USHORT& nId, 
+        static void FillMenu( sal_uInt16& nId, 
                               Menu* pMenu, 
                               const ::rtl::OUString& rModuleIdentifier, 
                               const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, 
@@ -203,7 +203,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
 
         struct MenuItemHandler
         {
-            MenuItemHandler( USHORT             aItemId, 
+            MenuItemHandler( sal_uInt16             aItemId, 
                              ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, 
                              ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) :
                              nItemId( aItemId ), 
@@ -211,7 +211,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                              xSubMenuManager( xManager ),
                              xMenuItemDispatch( rDispatch ) {}
 
-            USHORT					                                                                    nItemId;
+            sal_uInt16					                                                                    nItemId;
             sal_Bool                                                                                    bCheckHide;
             ::rtl::OUString			                                                                    aTargetFrame;
             ::rtl::OUString			                                                                    aMenuItemURL;
@@ -235,10 +235,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                                                                   std::vector< MenuItemHandler* >& aMenuShortCuts );
         static void      MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier );
         
-        MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
+        MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
         sal_Bool         CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
-        void             AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId);
-        USHORT           FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
+        void             AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId);
+        sal_uInt16           FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const;
         void             Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false);
         void             SetHdl();
 
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index a47edcc539..a47edcc539 100644..100755
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 211ba10052..211ba10052 100644..100755
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 86e049d638..86e049d638 100644..100755
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 2864db9901..2864db9901 100644..100755
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
diff --git a/framework/inc/uielement/panelwindow.hxx b/framework/inc/uielement/panelwindow.hxx
new file mode 100755
index 0000000000..5ae692413c
--- /dev/null
+++ b/framework/inc/uielement/panelwindow.hxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_PANELWINDOW_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_PANELWINDOW_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/dockwin.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework
+{
+
+class PanelWindow : public DockingWindow
+{
+    public:
+                        PanelWindow( Window* pParent, WinBits nWinBits  =0);
+        virtual         ~PanelWindow();
+
+        const ::rtl::OUString& getResourceURL() const;
+        void            setResourceURL(const ::rtl::OUString& rResourceURL);
+        Window*         getContentWindow() const;
+        void            setContentWindow( Window* pContentWindow );
+        
+        virtual void	Command ( const CommandEvent& rCEvt );
+        virtual void	StateChanged( StateChangedType nType );
+        virtual void	DataChanged( const DataChangedEvent& rDCEvt );
+        virtual void    Resize();
+
+        // Provide additional handlers to support external implementations
+        void            SetCommandHdl( const Link& aLink ) { m_aCommandHandler = aLink; }
+        const Link&     GetCommandHdl() const { return m_aCommandHandler; }
+        void            SetStateChangedHdl( const Link& aLink ) { m_aStateChangedHandler = aLink; }
+        const Link&     GetStateChangedHdl() const { return m_aStateChangedHandler; }
+        void            SetDataChangedHdl( const Link& aLink ) { m_aDataChangedHandler = aLink; }
+        const Link&     GetDataChangedHdl() { return m_aDataChangedHandler; }
+
+    private:
+        ::rtl::OUString m_aResourceURL;
+        Link	        m_aCommandHandler;
+        Link	        m_aStateChangedHandler;
+        Link            m_aDataChangedHandler;
+        Window*         m_pContentWindow;
+};
+
+}
+
+#endif // __FRAMEWORK_UIELEMENT_PANELWINDOW_HXX_
diff --git a/framework/inc/uielement/panelwrapper.hxx b/framework/inc/uielement/panelwrapper.hxx
new file mode 100755
index 0000000000..bd8fd63317
--- /dev/null
+++ b/framework/inc/uielement/panelwrapper.hxx
@@ -0,0 +1,68 @@
+
+
+#ifndef __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
+#define __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <helper/uielementwrapperbase.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+namespace framework
+{
+
+class PanelWrapper : public UIElementWrapperBase
+{
+    public:
+        PanelWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        virtual ~PanelWrapper();
+        
+        // XInterface
+        virtual void SAL_CALL acquire() throw();
+        virtual void SAL_CALL release() throw();
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
+        
+        // XComponent
+        virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
+        
+        // XInitialization
+        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+        // XUIElement
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException);
+
+        // XUpdatable
+        virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException);
+        
+        // XEventListener
+        using cppu::OPropertySetHelper::disposing;
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+        
+    //-------------------------------------------------------------------------------------------------------------
+    //	protected methods
+    //-------------------------------------------------------------------------------------------------------------
+    protected:
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any&  aValue ) throw( com::sun::star::uno::Exception );
+    
+    private:
+        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+        com::sun::star::uno::Reference< com::sun::star::awt::XWindow >                  m_xPanelWindow;
+        bool                                                                            m_bNoClose;
+};
+
+}
+
+#endif // __FRAMEWORK_UIELEMENT_PANELWRAPPER_HXX_
diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx
index 90f3973259..90f3973259 100644..100755
--- a/framework/inc/uielement/popupmenucontroller.hxx
+++ b/framework/inc/uielement/popupmenucontroller.hxx
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 96dc809269..96dc809269 100644..100755
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 2fba94579f..2fba94579f 100644..100755
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index eb9d975a5a..1cf45ccbf6 100644..100755
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -58,13 +58,12 @@
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <vector>
+#include <fwidllapi.h>
 
 namespace framework
 {
-
 class ConstItemContainer;
-class ItemContainer;
-class RootItemContainer :	public ::com::sun::star::lang::XTypeProvider            ,
+class RootItemContainer : public ::com::sun::star::lang::XTypeProvider            ,
                             public ::com::sun::star::container::XIndexContainer	    ,
                             public ::com::sun::star::lang::XSingleComponentFactory  ,
                             public ::com::sun::star::lang::XUnoTunnel               ,
@@ -76,20 +75,20 @@ class RootItemContainer :	public ::com::sun::star::lang::XTypeProvider
     friend class ConstItemContainer;
 
     public:
-        RootItemContainer();
-        RootItemContainer( const ConstItemContainer& rConstItemContainer );
-        RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
-        virtual ~RootItemContainer();
+        FWI_DLLPUBLIC RootItemContainer();
+        FWI_DLLPUBLIC RootItemContainer( const ConstItemContainer& rConstItemContainer );
+        FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
+        virtual FWI_DLLPUBLIC ~RootItemContainer();
 
         //---------------------------------------------------------------------------------------------------------
         //	XInterface, XTypeProvider
         //---------------------------------------------------------------------------------------------------------
         FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER		
+        FWK_DECLARE_XTYPEPROVIDER
 
         // XUnoTunnel
-        static const ::com::sun::star::uno::Sequence< sal_Int8 >&	GetUnoTunnelId() throw();
-        static RootItemContainer*								    GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
+        static FWI_DLLPUBLIC const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
+        static FWI_DLLPUBLIC RootItemContainer*                                   GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
         sal_Int64													SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
         // XIndexContainer
@@ -151,7 +150,7 @@ class RootItemContainer :	public ::com::sun::star::lang::XTypeProvider
         std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >    m_aItemVector;
         rtl::OUString                                                                           m_aUIName;
 };
-                            
+
 }
 
 #endif // #ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index b03770d4ce..b03770d4ce 100644..100755
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index c6594d5c25..0c039c3995 100644..100755
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -71,7 +71,7 @@ class SpinfieldToolbarController : public ISpinfieldListener,
         SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                     const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                     ToolBox*             pToolBar,
-                                    USHORT               nID,
+                                    sal_uInt16               nID,
                                     sal_Int32            nWidth,
                                     const rtl::OUString& aCommand );
         virtual ~SpinfieldToolbarController();
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 196d4cb270..196d4cb270 100644..100755
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index f1fd888354..f1fd888354 100644..100755
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 42442cc295..42442cc295 100644..100755
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index d1d98ac145..d1d98ac145 100644..100755
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 8df87eac0d..f7a51f8ebf 100644..100755
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -59,7 +59,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, 
                                        const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                        ToolBox*             pToolBar,
-                                       USHORT               nID,
+                                       sal_uInt16               nID,
                                        Style                eStyle,
                                        const rtl::OUString& aCommand );
         virtual ~ToggleButtonToolbarController();
diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx
index 579f17d10a..579f17d10a 100644..100755
--- a/framework/inc/uielement/toolbar.hxx
+++ b/framework/inc/uielement/toolbar.hxx
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 27f87db930..27f87db930 100644..100755
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index b30c447e6b..8c8e66b781 100644..100755
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -146,6 +146,7 @@ class ToolBarMerger
             const ::rtl::OUString& rControlType );
 
         static void CreateToolbarItem( ToolBox* pToolbox,
+                                       CommandToInfoMap& rCommandMap,
                                        sal_uInt16 nPos,
                                        sal_uInt16 nItemId,
                                        const AddonToolbarItem& rAddonToolbarItem );
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 80b5e87d89..d7a872f082 100644..100755
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -106,7 +106,7 @@ namespace framework
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager );
             rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL );
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL );
-            void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& aLabel );
+            void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel );
             sal_Bool isContextSensitiveToolbarNonVisible();
 
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >                m_xPersistentWindowState;
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index e961dbd489..e961dbd489 100644..100755
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 0331069d80..0331069d80 100644..100755
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
new file mode 100755
index 0000000000..6afa94b676
--- /dev/null
+++ b/framework/inc/uielement/uielement.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/ui/DockingArea.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <rtl/ustring.hxx>
+#include <vcl/toolbox.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework
+{
+
+struct DockedData
+{
+    DockedData() : m_aPos( LONG_MAX, LONG_MAX ),
+                   m_nDockedArea( ::com::sun::star::ui::DockingArea_DOCKINGAREA_TOP ),
+                   m_bLocked( false ) {}
+
+    Point     m_aPos;
+    Size      m_aSize;
+    sal_Int16 m_nDockedArea;
+    bool      m_bLocked;
+};
+
+struct FloatingData
+{
+    FloatingData() : m_aPos( LONG_MAX, LONG_MAX ), 
+                     m_nLines( 1 ), 
+                     m_bIsHorizontal( true ) {}
+
+    Point     m_aPos;
+    Size      m_aSize;
+    sal_Int16 m_nLines;
+    bool      m_bIsHorizontal;
+};
+
+struct UIElement
+{
+    UIElement() : m_bFloating( false ),
+                  m_bVisible( true ),
+                  m_bUserActive( false ),
+                  m_bCreateNewRowCol0( false ),
+                  m_bDeactiveHide( false ),
+                  m_bMasterHide( false ),
+                  m_bContextSensitive( false ),
+                  m_bContextActive( true ),
+                  m_bNoClose( false ),
+                  m_bSoftClose( false ),
+                  m_bStateRead( false ),
+                  m_nStyle( BUTTON_SYMBOL )
+                  {}
+    
+    UIElement( const rtl::OUString& rName, 
+               const rtl::OUString& rType, 
+               const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement,
+               bool bFloating = false
+               ) : m_aType( rType ), 
+                   m_aName( rName ),
+                   m_xUIElement( rUIElement ), 
+                   m_bFloating( bFloating ),
+                   m_bVisible( true ),
+                   m_bUserActive( false ),
+                   m_bCreateNewRowCol0( false ),
+                   m_bDeactiveHide( false ),
+                   m_bMasterHide( false ),
+                   m_bContextSensitive( false ),
+                   m_bContextActive( true ),
+                   m_bNoClose( false ),
+                   m_bSoftClose( false ),
+                   m_bStateRead( false ),
+                   m_nStyle( BUTTON_SYMBOL ) {}
+
+    bool operator< ( const UIElement& aUIElement ) const;
+    UIElement& operator=( const UIElement& rUIElement );
+
+    rtl::OUString                                                      m_aType;
+    rtl::OUString                                                      m_aName;
+    rtl::OUString                                                      m_aUIName;
+    com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement;
+    bool                                                               m_bFloating,
+                                                                       m_bVisible,
+                                                                       m_bUserActive,
+                                                                       m_bCreateNewRowCol0,
+                                                                       m_bDeactiveHide,
+                                                                       m_bMasterHide,
+                                                                       m_bContextSensitive,
+                                                                       m_bContextActive;
+    bool                                                               m_bNoClose,
+                                                                       m_bSoftClose,
+                                                                       m_bStateRead;
+    sal_Int16                                                          m_nStyle;
+    DockedData                                                         m_aDockedData;
+    FloatingData                                                       m_aFloatingData;
+};
+
+typedef std::vector< UIElement > UIElementVector;
+
+} // namespace framework
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
diff --git a/framework/inc/uielement/uielementtypenames.hxx b/framework/inc/uielement/uielementtypenames.hxx
index e69049befe..e69049befe 100644..100755
--- a/framework/inc/uielement/uielementtypenames.hxx
+++ b/framework/inc/uielement/uielementtypenames.hxx
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 6f80e7c48c..6f80e7c48c 100644..100755
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 4ec38b4e3d..4ec38b4e3d 100644..100755
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 5d3d62ef08..5d3d62ef08 100644..100755
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
index 83c4e5d427..83c4e5d427 100644..100755
--- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx
+++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index c9a9313cae..c9a9313cae 100644..100755
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index f8753dbaa3..f8753dbaa3 100644..100755
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index fabd3c41ad..fabd3c41ad 100644..100755
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 5269e3eeed..5269e3eeed 100644..100755
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index f10368a534..f10368a534 100644..100755
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index 598089e7ec..598089e7ec 100644..100755
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index f28d93abf5..f28d93abf5 100644..100755
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index c38e1c8395..c38e1c8395 100644..100755
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index 7a8400c0be..fd20b2bf1c 100644..100755
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -29,7 +29,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
 
-#include <xml/eventsconfiguration.hxx>
+#include <framework/eventsconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -47,6 +47,7 @@
 #include <boost/unordered_map.hpp>
 #include <stdtypes.h>
 
+#include <framework/fwedllapi.h>
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -56,7 +57,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -79,9 +80,9 @@ class OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right i
             EV_NS_XLINK,
             EV_XML_NAMESPACES_COUNT
         };
-        
+
         OReadEventsDocumentHandler( EventsConfig& aItems );
-        
+
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
@@ -146,7 +147,7 @@ class OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right i
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
 };
 
-class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteEventsDocumentHandler(
@@ -157,10 +158,10 @@ class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right i
         void WriteEventsDocument() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
-    
+
     protected:
-        virtual void WriteEvent( 
-                const ::rtl::OUString& aEventName, 
+        virtual void WriteEvent(
+                const ::rtl::OUString& aEventName,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPropertyValue ) throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 616dc587a5..bff0a5cce2 100644..100755
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -29,6 +29,8 @@
 #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
+#include <framework/fwedllapi.h>
+
 //_________________________________________________________________________________________________________________
 //	interface includes
 //_________________________________________________________________________________________________________________
@@ -38,7 +40,7 @@
 //_________________________________________________________________________________________________________________
 //	other includes
 //_________________________________________________________________________________________________________________
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -46,6 +48,7 @@
 #include <boost/unordered_map.hpp>
 #include <stdtypes.h>
 
+
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -55,7 +58,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadImagesDocumentHandler : private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadImagesDocumentHandler : private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -83,7 +86,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,	// Struct for right i
             IMG_NS_XLINK,
             TBL_XML_NAMESPACES_COUNT
         };
-        
+
         OReadImagesDocumentHandler( ImageListsDescriptor& aItems );
         virtual ~OReadImagesDocumentHandler();
 
@@ -156,7 +159,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase,	// Struct for right i
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
 };
 
-class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteImagesDocumentHandler(
@@ -167,7 +170,7 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i
         void WriteImagesDocument() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
-    
+
     protected:
         virtual void WriteImageList( const ImageListItemDescriptor* ) throw
             ( ::com::sun::star::xml::sax::SAXException,
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 74f17def3b..166169adcb 100644..100755
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -47,6 +47,7 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -54,7 +55,7 @@
 
 namespace framework{
 
-class ReadMenuDocumentHandlerBase : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -117,11 +118,11 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase,	// Struct for right i
 };
 
 
-class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
-        OReadMenuDocumentHandler( 
+        OReadMenuDocumentHandler(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
         virtual ~OReadMenuDocumentHandler();
@@ -161,11 +162,11 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
 };	// OReadMenuDocumentHandler
 
 
-class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         // #110897#
-        OReadMenuBarHandler( 
+        OReadMenuBarHandler(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer,
             const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
@@ -208,7 +209,7 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
 };	// OReadMenuBarHandler
 
 
-class OReadMenuHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -246,7 +247,7 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase
 }; // OReadMenuHandler
 
 
-class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
+class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
 {
     public:
         OReadMenuPopupHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer,
@@ -289,7 +290,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
 }; // OReadMenuPopupHandler
 
 
-class OWriteMenuDocumentHandler
+class FWE_DLLPUBLIC OWriteMenuDocumentHandler
 {
     public:
         OWriteMenuDocumentHandler(
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index ad90ac7c00..c654588168 100644..100755
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -37,6 +37,7 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <stack>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -45,7 +46,7 @@
 namespace framework
 {
 
-class SaxNamespaceFilter : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
+class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase,	// Struct for right initalization of mutex member! Must be first of baseclasses.
                            public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -54,37 +55,37 @@ class SaxNamespaceFilter : public ThreadHelpBase,	// Struct for right initalizat
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException, 
+        throw (	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void SAL_CALL startElement(
             const rtl::OUString& aName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
                                                     const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException, 
+        throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
-        
-        virtual void SAL_CALL setDocumentLocator( 
+
+        virtual void SAL_CALL setDocumentLocator(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
         throw(	::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
@@ -93,7 +94,7 @@ class SaxNamespaceFilter : public ThreadHelpBase,	// Struct for right initalizat
         typedef ::std::stack< XMLNamespaces > NamespaceStack;
 
         ::rtl::OUString getErrorLineString();
-        
+
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator;
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler;
         NamespaceStack	m_aNamespaceStack;
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 2c7674102d..d538ab19f8 100644..100755
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -29,7 +29,7 @@
 #ifndef __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
 
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -46,6 +46,7 @@
 
 #include <boost/unordered_map.hpp>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	namespace
@@ -56,7 +57,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadStatusBarDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
                                         public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -81,7 +82,7 @@ class OReadStatusBarDocumentHandler :	private ThreadHelpBase,	// Struct for righ
             SB_NS_XLINK,
             SB_XML_NAMESPACES_COUNT
         };
-        
+
         OReadStatusBarDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aStatusBarItems );
         virtual ~OReadStatusBarDocumentHandler();
 
@@ -145,7 +146,7 @@ class OReadStatusBarDocumentHandler :	private ThreadHelpBase,	// Struct for righ
         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	        m_xLocator;
 };
 
-class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
         OWriteStatusBarDocumentHandler(
@@ -156,9 +157,9 @@ class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for righ
         void WriteStatusBarDocument() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
-    
+
     protected:
-        virtual void WriteStatusBarItem( 
+        virtual void WriteStatusBarItem(
             const rtl::OUString& rCommandURL,
             const rtl::OUString& rHelpURL,
             sal_Int16            nOffset,
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index ae6dcb866a..a40e893454 100644..100755
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -1,4 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
 
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 683a79c839..2b049caf1a 100644..100755
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -29,24 +29,25 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 #define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
 
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
-//	interface includes
+//  interface includes
 //_________________________________________________________________________________________________________________
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 //_________________________________________________________________________________________________________________
-//	other includes
+//  other includes
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <stdtypes.h>
+#include <framework/fwedllapi.h>
 
 //_________________________________________________________________________________________________________________
-//	namespace
+//  namespace
 //_________________________________________________________________________________________________________________
 
 namespace framework{
@@ -54,7 +55,7 @@ namespace framework{
 //*****************************************************************************************************************
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase,   // Struct for right initalization of lock member! Must be first of baseclasses.
                                     public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
@@ -91,48 +92,48 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right
 
         // XDocumentHandler
         virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
+        throw ( ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL startElement(
             const rtl::OUString& aName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
                                                     const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
         virtual void SAL_CALL setDocumentLocator(
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
+        throw(  ::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException );
 
     private:
         ::rtl::OUString getErrorLineString();
 
         class ToolBoxHashMap : public ::boost::unordered_map<	::rtl::OUString					,
-                                                        ToolBox_XML_Entry				,
-                                                        OUStringHashCode				,
-                                                        ::std::equal_to< ::rtl::OUString >	>
+                                                        ToolBox_XML_Entry               ,
+                                                        OUStringHashCode                ,
+                                                        ::std::equal_to< ::rtl::OUString >  >
         {
             public:
                 inline void free()
@@ -141,22 +142,22 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right
                 }
         };
 
-        sal_Bool																	    m_bToolBarStartFound : 1;
-        sal_Bool																	    m_bToolBarEndFound : 1;
-        sal_Bool																	    m_bToolBarItemStartFound : 1;
-        sal_Bool																	    m_bToolBarSpaceStartFound : 1;
-        sal_Bool																	    m_bToolBarBreakStartFound : 1;
-        sal_Bool																	    m_bToolBarSeparatorStartFound : 1;
-        ToolBoxHashMap																    m_aToolBoxMap;
+        sal_Bool                                                                        m_bToolBarStartFound : 1;
+        sal_Bool                                                                        m_bToolBarEndFound : 1;
+        sal_Bool                                                                        m_bToolBarItemStartFound : 1;
+        sal_Bool                                                                        m_bToolBarSpaceStartFound : 1;
+        sal_Bool                                                                        m_bToolBarBreakStartFound : 1;
+        sal_Bool                                                                        m_bToolBarSeparatorStartFound : 1;
+        ToolBoxHashMap                                                                  m_aToolBoxMap;
         com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >    m_rItemContainer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	    m_xLocator;
-        
-        sal_Int32																	    m_nHashCode_Style_Radio;
-        sal_Int32																	    m_nHashCode_Style_Auto;
-        sal_Int32																	    m_nHashCode_Style_Left;
-        sal_Int32																	    m_nHashCode_Style_AutoSize;
-        sal_Int32																	    m_nHashCode_Style_DropDown;
-        sal_Int32																	    m_nHashCode_Style_Repeat;
+        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >        m_xLocator;
+
+        sal_Int32                                                                       m_nHashCode_Style_Radio;
+        sal_Int32                                                                       m_nHashCode_Style_Auto;
+        sal_Int32                                                                       m_nHashCode_Style_Left;
+        sal_Int32                                                                       m_nHashCode_Style_AutoSize;
+        sal_Int32                                                                       m_nHashCode_Style_DropDown;
+        sal_Int32                                                                       m_nHashCode_Style_Repeat;
         sal_Int32                                                                       m_nHashCode_Style_DropDownOnly;
         sal_Int32                                                                       m_nHashCode_Style_Text;
         sal_Int32                                                                       m_nHashCode_Style_Image;
@@ -170,7 +171,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase,	// Struct for right
 };
 
 
-class OWriteToolBoxDocumentHandler : private ThreadHelpBase	// Struct for right initalization of lock member! Must be first of baseclasses.
+class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase   // Struct for right initalization of lock member! Must be first of baseclasses.
 {
     public:
             OWriteToolBoxDocumentHandler(
@@ -191,22 +192,22 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase	// Struct for right
         virtual void WriteToolBoxSpace() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void WriteToolBoxBreak() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
-        
+
         virtual void WriteToolBoxSeparator() throw
             ( ::com::sun::star::xml::sax::SAXException,
               ::com::sun::star::uno::RuntimeException );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
+        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xWriteDocumentHandler;
+        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >      m_xEmptyList;
         com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >           m_rItemAccess;
-        ::rtl::OUString																		m_aXMLToolbarNS;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeURL;
+        ::rtl::OUString                                                                     m_aXMLToolbarNS;
+        ::rtl::OUString                                                                     m_aXMLXlinkNS;
+        ::rtl::OUString                                                                     m_aAttributeType;
+        ::rtl::OUString                                                                     m_aAttributeURL;
 };
 
 } // namespace framework
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index f4b5f4684e..f3342c54f9 100644..100755
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -32,25 +32,26 @@
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
 #include <map>
+#include <framework/fwedllapi.h>
 
 namespace framework
 {
 
-class XMLNamespaces
+class FWE_DLLPUBLIC XMLNamespaces
 {
     public:
         XMLNamespaces();
         XMLNamespaces( const XMLNamespaces& );
         virtual ~XMLNamespaces();
 
-        void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue ) 
-            throw(	::com::sun::star::xml::sax::SAXException );
+        void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue )
+            throw(  ::com::sun::star::xml::sax::SAXException );
 
-        ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const 
-            throw(	::com::sun::star::xml::sax::SAXException );
+        ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const
+            throw(  ::com::sun::star::xml::sax::SAXException );
         ::rtl::OUString applyNSToElementName( const ::rtl::OUString& ) const
-            throw(	::com::sun::star::xml::sax::SAXException );
-    
+            throw(  ::com::sun::star::xml::sax::SAXException );
+
     private:
         typedef ::std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap;
 
@@ -58,7 +59,7 @@ class XMLNamespaces
             throw( ::com::sun::star::xml::sax::SAXException );
 
         ::rtl::OUString m_aDefaultNamespace;
-        NamespaceMap	m_aNamespaceMap;
+        NamespaceMap    m_aNamespaceMap;
 };
 
 }
diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index 2eb363b0f3..b9f9a995ea 100644..100755
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,23 +1,2 @@
-fr	framework	:    l10n svtools ucb NULL
-fr	framework								usr1	-	all	fr_mkout NULL
-fr  framework\inc			        	    nmake   -   all fr_inc NULL
-fr  framework\source\constant               nmake   -   all fr_constant fr_inc NULL
-fr  framework\source\threadhelp             nmake   -   all fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\loadenv                nmake   -   all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\classes                nmake   -   all fr_classes fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\jobs                   nmake   -   all fr_jobs fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\interaction            nmake   -   all fr_interaction fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\helper                 nmake   -   all fr_helper fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\dispatch               nmake   -   all fr_dispatch fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\services               nmake   -   all fr_services fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\register               nmake   -   all fr_register fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\recording              nmake   -   all fr_recording fr_threadhelp fr_constant fr_inc NULL
-fr  framework\source\xml					nmake   -  	all fr_xml fr_threadhelp fr_inc NULL
-fr  framework\source\layoutmanager			nmake   -   all fr_layoutmanager fr_threadhelp fr_inc NULL
-fr  framework\source\uielement              nmake   -   all fr_uielement fr_threadhelp fr_inc NULL
-fr  framework\source\uifactory              nmake   -   all fr_uifactory fr_threadhelp fr_inc NULL
-fr  framework\source\uiconfiguration        nmake   -   all fr_uiconfiguration fr_threadhelp fr_inc NULL
-fr  framework\source\accelerators           nmake   -   all fr_accelerators fr_threadhelp fr_inc NULL
-fr  framework\source\tabwin					nmake   -   all fr_tabwin fr_threadhelp fr_inc NULL
-fr  framework\util                          nmake   -   all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin NULL
-fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL
+fr framework : LIBXSLT:libxslt L10N:l10n svtools ucb NULL
+fr framework\prj nmake - all fr_all NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index fe6077f57b..e69de29bb2 100644..100755
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -1,52 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\framework
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-
-..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd
-..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd
-..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd
-..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd
-..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd
-..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd
-..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd
-
-..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
-..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
-..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
-..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx
-..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx
-..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
-..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
-..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx
-..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx
-..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx
-..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx
-..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx
-..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx
-..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx
-..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx
-..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx
-..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx
-..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx
-..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx
-..\inc\classes\framelistanalyzer.hxx %_DEST%\inc%_EXT%\framework\framelistanalyzer.hxx
-
-..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
-..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
-..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
-
-..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
-
diff --git a/framework/util/target.pmk b/framework/prj/makefile.mk
index 857dc59d48..e312a7ccab 100644..100755
--- a/framework/util/target.pmk
+++ b/framework/prj/makefile.mk
@@ -24,11 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-ALLSLO: $(SLOFILES)
 
-SOSHL: $(SHL1TARGETN)
+PRJ=..
+TARGET=prj
 
-WHOLEPRJ:
-    cd $(PRJ)$/prj
-    make debug linkinc prjpch compinc
-    @echo "READY"
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
index 33bc2c0d0c..47b4f877c4 100644..100755
--- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java
+++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
@@ -30,21 +30,27 @@ package complex.ModuleManager;
 import com.sun.star.beans.*;
 import com.sun.star.frame.*;
 import com.sun.star.lang.*;
-import com.sun.star.uno.*;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.*;
 import com.sun.star.container.*;
 
-import complexlib.ComplexTestCase;
 
-import helper.URLHelper;
 
-import java.lang.*;
-import java.util.*;
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 //-----------------------------------------------
 /** @short  todo document me
  */
-public class CheckXModuleManager extends ComplexTestCase
+public class CheckXModuleManager
 {
     //-------------------------------------------
     // some const
@@ -71,16 +77,16 @@ public class CheckXModuleManager extends ComplexTestCase
         @return All test methods.
         @todo   Think about selection of tests from outside ...     
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-        {
-            "checkModuleIdentification"        ,
-            "checkModuleConfigurationReadable" ,
-            "checkModuleConfigurationWriteable",
-            "checkModuleConfigurationQueries"
-        };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//        {
+//            "checkModuleIdentification"        ,
+//            "checkModuleConfigurationReadable" ,
+//            "checkModuleConfigurationWriteable",
+//            "checkModuleConfigurationQueries"
+//        };
+//    }
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
@@ -88,36 +94,28 @@ public class CheckXModuleManager extends ComplexTestCase
         @descr  Use either a component loader from desktop or
                 from frame
      */
-    public void before()
+    @Before public void before()
         throws java.lang.Exception
     {
         // get uno service manager from global test environment
-        m_xSmgr = (XMultiServiceFactory)param.getMSF();
+        m_xSmgr = getMSF();
 
         // create module manager
-        m_xMM = (XModuleManager)UnoRuntime.queryInterface(
-                    XModuleManager.class, 
-                    m_xSmgr.createInstance("com.sun.star.frame.ModuleManager"));
+        m_xMM = UnoRuntime.queryInterface(XModuleManager.class, m_xSmgr.createInstance("com.sun.star.frame.ModuleManager"));
                     
         // create desktop instance to create a special frame to load documents there.
-        XFrame xDesktop = (XFrame)UnoRuntime.queryInterface(
-                                XFrame.class, 
-                                m_xSmgr.createInstance("com.sun.star.frame.Desktop"));
+        XFrame xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xSmgr.createInstance("com.sun.star.frame.Desktop"));
                                 
-        m_xLoader = (XComponentLoader)UnoRuntime.queryInterface(
-                                XComponentLoader.class, 
-                                xDesktop.findFrame("_blank", 0));
+        m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop.findFrame("_blank", 0));
     }
 
     //-------------------------------------------
     /** @short  close the environment.
      */
-    public void after()
+    @After public void after()
         throws java.lang.Exception
     {
-        XCloseable xClose = (XCloseable)UnoRuntime.queryInterface(
-                                XCloseable.class,
-                                m_xLoader);
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xLoader);
         xClose.close(false);
                                 
         m_xLoader = null;
@@ -128,7 +126,7 @@ public class CheckXModuleManager extends ComplexTestCase
     //-------------------------------------------
     /** @todo document me
      */
-    public void checkModuleIdentification()
+    @Test public void checkModuleIdentification()
         throws java.lang.Exception
     {
         impl_identifyModulesBasedOnDocs("com.sun.star.text.TextDocument"                );
@@ -139,13 +137,14 @@ public class CheckXModuleManager extends ComplexTestCase
         impl_identifyModulesBasedOnDocs("com.sun.star.drawing.DrawingDocument"          );
         impl_identifyModulesBasedOnDocs("com.sun.star.presentation.PresentationDocument");
         impl_identifyModulesBasedOnDocs("com.sun.star.sdb.OfficeDatabaseDocument"       );
-        impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument"              );
+        // TODO: fails
+        // impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument"              );
     }
     
     //-------------------------------------------
     /** @todo document me
      */
-    public void checkModuleConfigurationReadable()
+    @Test public void checkModuleConfigurationReadable()
         throws java.lang.Exception
     {
     }
@@ -153,7 +152,7 @@ public class CheckXModuleManager extends ComplexTestCase
     //-------------------------------------------
     /** @todo document me
      */
-    public void checkModuleConfigurationWriteable()
+    @Test public void checkModuleConfigurationWriteable()
         throws java.lang.Exception
     {
         // modules supporting real documents
@@ -182,7 +181,7 @@ public class CheckXModuleManager extends ComplexTestCase
     //-------------------------------------------
     /** @todo document me
      */
-    public void checkModuleConfigurationQueries()
+    @Test public void checkModuleConfigurationQueries()
         throws java.lang.Exception
     {
         impl_searchModulesByDocumentService("com.sun.star.text.TextDocument"                );
@@ -202,14 +201,14 @@ public class CheckXModuleManager extends ComplexTestCase
     private void impl_searchModulesByDocumentService(String sDocumentService)
         throws java.lang.Exception
     {
-        log.println("search modules matching document service '"+sDocumentService+"' ...");
+        System.out.println("search modules matching document service '"+sDocumentService+"' ...");
     
         NamedValue[] lProps          = new NamedValue[1];
                      lProps[0]       = new NamedValue();
                      lProps[0].Name  = "ooSetupFactoryDocumentService";
                      lProps[0].Value = sDocumentService;
     
-        XContainerQuery xMM     = (XContainerQuery)UnoRuntime.queryInterface(XContainerQuery.class, m_xMM);
+        XContainerQuery xMM     = UnoRuntime.queryInterface(XContainerQuery.class, m_xMM);
         XEnumeration    xResult = xMM.createSubSetEnumerationByProperties(lProps);
         while(xResult.hasMoreElements())
         {
@@ -221,18 +220,26 @@ public class CheckXModuleManager extends ComplexTestCase
             for (i=0; i<c; ++i)
             {
                 if (lModuleProps[i].Name.equals("ooSetupFactoryModuleIdentifier"))
+                {
                     sFoundModule = AnyConverter.toString(lModuleProps[i].Value);
+                }
                 if (lModuleProps[i].Name.equals("ooSetupFactoryDocumentService"))
+                {
                     sFoundDocService = AnyConverter.toString(lModuleProps[i].Value);
+                }
             }
         
             if (sFoundModule.length() < 1)
-                failed("Miss module identifier in result set. Returned data are incomplete.");
+            {
+                fail("Miss module identifier in result set. Returned data are incomplete.");
+            }
             
             if ( ! sFoundDocService.equals(sDocumentService))
-                failed("Query returned wrong module '"+sFoundModule+"' with DocumentService='"+sFoundDocService+"'.");
+            {
+                fail("Query returned wrong module '" + sFoundModule + "' with DocumentService='" + sFoundDocService + "'.");
+            }
             
-            log.println("Found module '"+sFoundModule+"'.");
+            System.out.println("Found module '"+sFoundModule+"'.");
         }
     }
 
@@ -242,9 +249,9 @@ public class CheckXModuleManager extends ComplexTestCase
     private void impl_identifyModulesBasedOnDocs(String sModule)
         throws java.lang.Exception
     {
-        log.println("check identification of module '"+sModule+"' ...");
+        System.out.println("check identification of module '"+sModule+"' ...");
     
-        XNameAccess     xMM          = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xMM);
+        XNameAccess     xMM          = UnoRuntime.queryInterface(XNameAccess.class, m_xMM);
         PropertyValue[] lModuleProps = (PropertyValue[])AnyConverter.toArray(xMM.getByName(sModule));
         int             c            = lModuleProps.length;
         int             i            = 0;
@@ -265,7 +272,7 @@ public class CheckXModuleManager extends ComplexTestCase
                         lArgs[0].Value    = Boolean.TRUE;
     
         XComponent      xModel            = m_xLoader.loadComponentFromURL(sFactoryURL, "_self", 0, lArgs);
-        XFrame          xFrame            = (XFrame)UnoRuntime.queryInterface(XFrame.class, m_xLoader);
+        XFrame          xFrame            = UnoRuntime.queryInterface(XFrame.class, m_xLoader);
         XController     xController       = xFrame.getController();
         
         String          sModuleFrame      = m_xMM.identify(xFrame     );
@@ -273,11 +280,17 @@ public class CheckXModuleManager extends ComplexTestCase
         String          sModuleModel      = m_xMM.identify(xModel     );
         
         if ( ! sModuleFrame.equals(sModule))
-            failed("Identification of module '"+sModule+"' failed if frame was used as entry point.");
+        {
+            fail("Identification of module '" + sModule + "' failed if frame was used as entry point.");
+        }
         if ( ! sModuleController.equals(sModule))
-            failed("Identification of module '"+sModule+"' failed if controller was used as entry point.");
+        {
+            fail("Identification of module '" + sModule + "' failed if controller was used as entry point.");
+        }
         if ( ! sModuleModel.equals(sModule))
-            failed("Identification of module '"+sModule+"' failed if model was used as entry point.");
+        {
+            fail("Identification of module '" + sModule + "' failed if model was used as entry point.");
+        }
     }
 
     //-------------------------------------------
@@ -286,7 +299,7 @@ public class CheckXModuleManager extends ComplexTestCase
     private void impl_checkReadOnlyPropsOfModule(String sModule)
         throws java.lang.Exception
     {
-        XNameReplace xWrite = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, m_xMM);
+        XNameReplace xWrite = UnoRuntime.queryInterface(XNameReplace.class, m_xMM);
             
         impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryDocumentService"     , "test");
         impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryActualFilter"        , "test");
@@ -309,13 +322,37 @@ public class CheckXModuleManager extends ComplexTestCase
                         lChanges[0].Value = aPropValue;
     
         // Note: Exception is expected !
-        log.println("check readonly state of module '"+sModule+"' for property '"+sPropName+"' ...");
+        System.out.println("check readonly state of module '"+sModule+"' for property '"+sPropName+"' ...");
         try
         {
             xMM.replaceByName(sModule, lChanges);
-            failed("Was able to write READONLY property '"+sPropName+"' of module '"+sModule+"' configuration.");
+            fail("Was able to write READONLY property '"+sPropName+"' of module '"+sModule+"' configuration.");
         }
         catch(Throwable ex)
             {}
     }
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
deleted file mode 100644
index ec11ef5030..0000000000
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ /dev/null
@@ -1,84 +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 = ..$/..$/..
-TARGET  = CheckXModuleManager
-PRJNAME = $(TARGET)
-PACKAGE = complex$/ModuleManager
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar
-                  
-JAVAFILES       = CheckXModuleManager.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH   = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-#.IF "$(depend)" == ""
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-#.ELSE
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-#.ENDIF
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 4b9ba0eb6f..c511304672 100644..100755
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -45,15 +45,24 @@ import com.sun.star.lang.*;
 import com.sun.star.lang.EventObject;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
 import com.sun.star.util.*;
-import com.sun.star.uno.*;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
 
-import complexlib.ComplexTestCase;
 import util.AccessibilityTools;
 import util.SOfficeFactory;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 //-----------------------------------------------
 /**
  * This <CODE>ComplexTest</CODE> checks the interface 
@@ -64,7 +73,7 @@ import util.SOfficeFactory;
  * @short Check the interface XUserInputIntercaption
  * @descr checks is a simple way the interface XUserInputInteraction
  */
-public class EventTest extends ComplexTestCase {
+public class EventTest {
     //-------------------------------------------
     // some const
     
@@ -112,16 +121,16 @@ public class EventTest extends ComplexTestCase {
      * @return All test methods.
      * @todo Think about selection of tests from outside ...
      */
-    public String[] getTestMethodNames() {
-        return new String[]
-        { "checkTextDocument",
-          "checkCalcDocument",
-          "checkDrawDocument",
-          "checkImpressDocument",
-          "checkChartDocument",
-          "checkMathDocument",
-        };
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]
+//        { "checkTextDocument",
+//          "checkCalcDocument",
+//          "checkDrawDocument",
+//          "checkImpressDocument",
+//          "checkChartDocument",
+//          "checkMathDocument",
+//        };
+//    }
     
     //-------------------------------------------
     /**
@@ -130,17 +139,17 @@ public class EventTest extends ComplexTestCase {
      * @descr create an empty test frame, where we can load
      * different components inside.
      */
-    public void before() {
+@Before public void before() {
         // get uno service manager from global test environment
-        m_xMSF = (XMultiServiceFactory)param.getMSF();
+        m_xMSF = getMSF();
         
         // create frame instance
         try {
             // get a soffice factory object
-            m_SOF = SOfficeFactory.getFactory((XMultiServiceFactory) param.getMSF());
+            m_SOF = SOfficeFactory.getFactory(getMSF());
             
         } catch(java.lang.Throwable ex) {
-            failed("Could not create the XUserInputInterception instance.");
+            fail("Could not create the XUserInputInterception instance.");
         }
     }
     
@@ -151,12 +160,11 @@ public class EventTest extends ComplexTestCase {
      * @param xDoc the document to close
      */
     public void closeDoc(XInterface xDoc) {
-        XCloseable xClose = (XCloseable)UnoRuntime.queryInterface(
-                XCloseable.class, xDoc);
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
         try {
             xClose.close(false);
         } catch(com.sun.star.util.CloseVetoException exVeto) {
-            log.println("document couldn't be closed successfully.");
+            System.out.println("document couldn't be closed successfully.");
         }
     }
     
@@ -166,14 +174,14 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkTextDocument(){
+    @Test public void checkTextDocument(){
         
         XTextDocument xDoc = null;
         
         try{
             xDoc = m_SOF.createTextDoc("WriterTest");
         } catch (com.sun.star.uno.Exception e){
-            failed("Could not create a text document: " +e.toString());
+            fail("Could not create a text document: " +e.toString());
         }
         
         checkListener(xDoc);
@@ -187,14 +195,14 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkImpressDocument(){
+    @Test public void checkImpressDocument(){
         
         XComponent xDoc = null;
         
         try{
             xDoc = m_SOF.createImpressDoc("ImpressTest");
         } catch (com.sun.star.uno.Exception e){
-            failed("Could not create an impress document: " +e.toString());
+            fail("Could not create an impress document: " +e.toString());
         }
         
         checkListener(xDoc);
@@ -208,20 +216,21 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkChartDocument(){
-        
-        XChartDocument xDoc = null;
-        
-        try{
-            xDoc = m_SOF.createChartDoc("ChartTest");
-        } catch (com.sun.star.uno.Exception e){
-            failed("Could not create a chart document: " +e.toString());
-        }
-        
-        checkListener(xDoc);
-        
-        closeDoc(xDoc);
-    }
+// TODO!
+//    @Test public void checkChartDocument(){
+//
+//        XChartDocument xDoc = null;
+//
+//        try{
+//            xDoc = m_SOF.createChartDoc("ChartTest");
+//        } catch (com.sun.star.uno.Exception e){
+//            fail("Could not create a chart document: " +e.toString());
+//        }
+//
+//        checkListener(xDoc);
+//
+//        closeDoc(xDoc);
+//    }
     
     /**
      * creates a math document and check the <CODE>XMouseClickHandler</CODE> and
@@ -229,14 +238,14 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkMathDocument(){
+    @Test public void checkMathDocument(){
         
         XComponent xDoc = null;
         
         try{
             xDoc = m_SOF.createMathDoc("MathTest");
         } catch (com.sun.star.uno.Exception e){
-            failed("Could not create a math document: " +e.toString());
+            fail("Could not create a math document: " +e.toString());
         }
         
         checkListener(xDoc);
@@ -250,14 +259,14 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkDrawDocument(){
+    @Test public void checkDrawDocument(){
         
         XComponent xDoc = null;
         
         try{
             xDoc = m_SOF.createDrawDoc("DrawTest");
         } catch (com.sun.star.uno.Exception e){
-            failed("Could not create a draw document: " +e.toString());
+            fail("Could not create a draw document: " +e.toString());
         }
         
         checkListener(xDoc);
@@ -271,14 +280,14 @@ public class EventTest extends ComplexTestCase {
      * @see com.sun.star.awt.XKeyHandler
      * @see com.sun.star.awt.XMouseClickHandler
      */
-    public void checkCalcDocument(){
+    @Test public void checkCalcDocument(){
         
         XSpreadsheetDocument xDoc = null;
         
         try{
             xDoc = m_SOF.createCalcDoc("CalcTest");
         } catch (com.sun.star.uno.Exception e){
-            failed("Could not create a calc document: " +e.toString());
+            fail("Could not create a calc document: " +e.toString());
         }
         
         checkListener(xDoc);
@@ -293,7 +302,7 @@ public class EventTest extends ComplexTestCase {
      */
     private void checkListener(XInterface xDoc){
         
-        XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDoc);
+        XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc);
         
         XUserInputInterception xUII = getUII(xModel);
         
@@ -320,15 +329,15 @@ public class EventTest extends ComplexTestCase {
         
         xUII.addKeyHandler(keyListener);
         
-        log.println("starting thread to check the key listener...");
+        System.out.println("starting thread to check the key listener...");
         EventTrigger et = new EventTrigger(xModel, EventTriggerType.KEY_TEXT_INTO_DOC);
 
         et.run();
         
         util.utils.shortWait(m_threadWait);
-        log.println("key listener thread should be finished.");
+        System.out.println("key listener thread should be finished.");
         
-        assure("key event does not work!", m_keyPressed && m_keyReleased);
+        assertTrue("key event does not work!", m_keyPressed && m_keyReleased);
         xUII.removeKeyHandler(keyListener);
         
     }
@@ -354,15 +363,15 @@ public class EventTest extends ComplexTestCase {
         
         xUII.addMouseClickHandler(mouseListener);
                
-        log.println("starting thread to check the mouse listener...");
+        System.out.println("starting thread to check the mouse listener...");
         EventTrigger et = new EventTrigger(xModel, EventTriggerType.MOUSE_KLICK_INTO_DOC);
 
         et.run();
         
         util.utils.shortWait(m_threadWait);
-        log.println("mouse listener thread should be finished.");
+        System.out.println("mouse listener thread should be finished.");
         
-        assure("mouse event does not work!", m_mousePressed && m_mouseReleased);
+        assertTrue("mouse event does not work!", m_mousePressed && m_mouseReleased);
         xUII.removeMouseClickHandler(mouseListener);
     }
     
@@ -375,10 +384,9 @@ public class EventTest extends ComplexTestCase {
         
         XController xController = xModel.getCurrentController();
 
-        XUserInputInterception xUII = (XUserInputInterception) UnoRuntime.queryInterface(
-                XUserInputInterception.class, xController);
+        XUserInputInterception xUII = UnoRuntime.queryInterface(XUserInputInterception.class, xController);
         if (xUII == null) {
-            failed("could not get XUserInputInterception from XContoller", true);
+            fail("could not get XUserInputInterception from XContoller");
         }
          return xUII;
     }
@@ -395,7 +403,7 @@ public class EventTest extends ComplexTestCase {
          * @return returns <CODE>TRUE</CODE> in erery case
          */
         public boolean keyPressed( KeyEvent oEvent ){
-            log.println("XKeyHandler: keyPressed-Event");
+            System.out.println("XKeyHandler: keyPressed-Event");
             m_keyPressed = true;
             return true;
         }
@@ -406,7 +414,7 @@ public class EventTest extends ComplexTestCase {
          * @return returns <CODE>TRUE</CODE> in erery case
          */
         public boolean keyReleased( KeyEvent oEvent ){
-            log.println("XKeyHandler: keyReleased-Event");
+            System.out.println("XKeyHandler: keyReleased-Event");
             m_keyReleased = true;
             return true;
         }
@@ -415,7 +423,7 @@ public class EventTest extends ComplexTestCase {
          * @param oEvent refers to the object that fired the event.
          */
         public void disposing( EventObject oEvent ){
-            log.println("XKeyHandler: disposing-Event");
+            System.out.println("XKeyHandler: disposing-Event");
         }
     }
     
@@ -431,7 +439,7 @@ public class EventTest extends ComplexTestCase {
          * @return returns <CODE>TRUE</CODE> in erery case
          */
         public boolean mousePressed( MouseEvent oEvent ){
-            log.println("XMouseClickHandler: mousePressed-Event");
+            System.out.println("XMouseClickHandler: mousePressed-Event");
             m_mousePressed = true;
             return true;
         }
@@ -442,7 +450,7 @@ public class EventTest extends ComplexTestCase {
          * @return returns <CODE>TRUE</CODE> in erery case
          */
         public boolean mouseReleased( MouseEvent oEvent ){
-            log.println("XMouseClickHandler: mouseReleased-Event");
+            System.out.println("XMouseClickHandler: mouseReleased-Event");
             m_mouseReleased = true;
             return true;
         }
@@ -451,7 +459,7 @@ public class EventTest extends ComplexTestCase {
          * @param oEvent refers to the object that fired the event.
          */
         public void disposing( EventObject oEvent ){
-            log.println("XMouseClickHandler: disposing-Event");
+            System.out.println("XMouseClickHandler: disposing-Event");
         }
     };
     
@@ -529,7 +537,7 @@ public class EventTest extends ComplexTestCase {
                 // get the position and the range of a scroll bar
 
                 XWindow xWindow = at.getCurrentWindow(
-                                          (XMultiServiceFactory) param.getMSF(), 
+                                          getMSF(), 
                                           xModel);
 
                 XAccessible xRoot = at.getAccessibleObject(xWindow);
@@ -537,7 +545,7 @@ public class EventTest extends ComplexTestCase {
                 
 
                 XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL);
-                XAccessibleComponent xPanelCont = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel);
+                XAccessibleComponent xPanelCont = UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel);
 
                 // the position of the panel
                 Point point = xPanelCont.getLocationOnScreen();
@@ -549,15 +557,15 @@ public class EventTest extends ComplexTestCase {
                     Robot rob = new Robot();
                     int x = point.X + (rect.Width / 2);
                     int y = point.Y + (rect.Height / 2);
-                    log.println("try to klick into the middle of the document");
+                    System.out.println("try to klick into the middle of the document");
                     rob.mouseMove(x, y);
                     rob.mousePress(InputEvent.BUTTON1_MASK);
                     rob.mouseRelease(InputEvent.BUTTON1_MASK);
                 } catch (java.awt.AWTException e) {
-                    log.println("couldn't press mouse button");
+                    System.out.println("couldn't press mouse button");
                 }
             } catch (java.lang.Exception e){
-                log.println("could not click into the scroll bar: " + e.toString());
+                System.out.println("could not click into the scroll bar: " + e.toString());
             }
         }
         
@@ -569,11 +577,11 @@ public class EventTest extends ComplexTestCase {
         private void keyIntoDoc(){
             try {
                 Robot rob = new Robot();
-                log.println("try to press 'A'");
+                System.out.println("try to press 'A'");
                 rob.keyPress(java.awt.event.KeyEvent.VK_A);
                 rob.keyRelease(java.awt.event.KeyEvent.VK_A);
             } catch (java.awt.AWTException e) {
-                log.println("couldn't press key");
+                System.out.println("couldn't press key");
             }
             
         }
@@ -590,5 +598,30 @@ public class EventTest extends ComplexTestCase {
         
         /** write some text into a spread sheet*/
         final public static int KEY_TEXT_INTO_DOC = 2;
-    }   
+    }
+
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
\ No newline at end of file
diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk
deleted file mode 100644
index d3ca648b02..0000000000
--- a/framework/qa/complex/XUserInputInterception/makefile.mk
+++ /dev/null
@@ -1,89 +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 = ..$/..$/..
-TARGET  = EventTest
-PRJNAME = framework
-PACKAGE = complex$/XUserInputInterception
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar
-JAVAFILES       = EventTest.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-#   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-#   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-
-
-
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index a63baf116c..4faa454d1f 100644..100755
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -24,222 +24,332 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package complex.accelerators;
 
 // imports
-import com.sun.star.awt.*;
-import com.sun.star.beans.*;
-import com.sun.star.container.*;
-import com.sun.star.embed.*;
-import com.sun.star.lang.*;
-import com.sun.star.ui.*;
-import com.sun.star.uno.*;
-import com.sun.star.util.*;
-
-import complexlib.ComplexTestCase;
-
-import java.lang.*;
-import java.util.*;
-
-import helper.*;
-
+import com.sun.star.awt.KeyEvent;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XNameContainer;
+import com.sun.star.embed.XStorage;
+import com.sun.star.embed.XTransactedObject;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.ui.XAcceleratorConfiguration;
+import com.sun.star.ui.XUIConfigurationManager;
+import com.sun.star.ui.XUIConfigurationPersistence;
+import com.sun.star.ui.XUIConfigurationStorage;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.XInterface;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XChangesBatch;
+
+// import complex.accelerators.KeyMapping;
+
+
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.FileHelper;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 //-----------------------------------------------
+
 /** @short todo document me
  */
-public class AcceleratorsConfigurationTest extends ComplexTestCase 
+public class AcceleratorsConfigurationTest
 {
+
     /** points to the global uno service manager. */
     private XMultiServiceFactory m_xSmgr = null;
-
     /** the accelerator configuration for testing. */
     private XAcceleratorConfiguration m_xGlobalAccelCfg = null;
     private XAcceleratorConfiguration m_xModuleAccelCfg = null;
     private XAcceleratorConfiguration m_xDocumentAccelCfg = null;
-
     /** XCS/XCU based accelerator configuration. */
     private XNameAccess m_xConfig = null;
-    private XNameAccess m_xPrimaryKeys   = null;
+    private XNameAccess m_xPrimaryKeys = null;
     private XNameAccess m_xSecondaryKeys = null;
 
     //-------------------------------------------
     // test environment
-
     //-----------------------------------------------
     /** @short todo document me
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-            {
-                "checkGlobalAccelCfg",
-                "checkModuleAccelCfg",
-                "checkDocumentAccelCfg"
-            };
-    }
-
+//	public String[] getTestMethodNames()
+//	{
+//		return new String[]
+//			{
+//				"checkGlobalAccelCfg",
+//				"checkModuleAccelCfg",
+//                "checkDocumentAccelCfg"
+//			};
+//	}
     //-----------------------------------------------
     /** @short Create the environment for following tests.
      */
+    @Before
     public void before()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         // get uno service manager from global test environment
-        m_xSmgr = (XMultiServiceFactory)param.getMSF();
-
-        m_xGlobalAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface(
-            XAcceleratorConfiguration.class,
-            m_xSmgr.createInstance("com.sun.star.ui.GlobalAcceleratorConfiguration"));
-        m_xModuleAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface(
-            XAcceleratorConfiguration.class,
-            m_xSmgr.createInstance("com.sun.star.ui.ModuleAcceleratorConfiguration"));
-        m_xDocumentAccelCfg = (XAcceleratorConfiguration)UnoRuntime.queryInterface(
-            XAcceleratorConfiguration.class,
-            m_xSmgr.createInstance("com.sun.star.ui.DocumentAcceleratorConfiguration"));
+        m_xSmgr = getMSF();
+
+        m_xGlobalAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.GlobalAcceleratorConfiguration"));
+        m_xModuleAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.ModuleAcceleratorConfiguration"));
+        m_xDocumentAccelCfg = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, m_xSmgr.createInstance("com.sun.star.ui.DocumentAcceleratorConfiguration"));
 
         String sConfigPath = "org.openoffice.Office.Accelerators";
         boolean bReadOnly = false;
-        XNameAccess m_xConfig = openConfig(m_xSmgr, sConfigPath, bReadOnly);
-        if (m_xConfig != null)
+        XNameAccess m_xConfig2 = openConfig(m_xSmgr, sConfigPath, bReadOnly);
+        if (m_xConfig2 != null)
         {
-            m_xPrimaryKeys = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xConfig.getByName("PrimaryKeys"));
-            m_xSecondaryKeys = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xConfig.getByName("SecondaryKeys"));
+            m_xPrimaryKeys = UnoRuntime.queryInterface(XNameAccess.class, m_xConfig2.getByName("PrimaryKeys"));
+            m_xSecondaryKeys = UnoRuntime.queryInterface(XNameAccess.class, m_xConfig2.getByName("SecondaryKeys"));
         }
     }
-    
+
     //-------------------------------------------
     /** @short  close the environment.
      */
+    @After
     public void after()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        m_xConfig           = null;
-        m_xGlobalAccelCfg   = null;
-        m_xModuleAccelCfg   = null;
+        m_xConfig = null;
+        m_xGlobalAccelCfg = null;
+        m_xModuleAccelCfg = null;
         m_xDocumentAccelCfg = null;
-        m_xSmgr             = null;
+        m_xSmgr = null;
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
+    @Test
     public void checkGlobalAccelCfg()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("\n---- check Global accelerator configuration: ----");
+        System.out.println("\n---- check Global accelerator configuration: ----");
 
         String[] sKeys;
-        XNameAccess xPrimaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class,m_xPrimaryKeys.getByName("Global"));
-        XNameAccess xSecondaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Global"));
+        XNameAccess xPrimaryAccess = UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Global"));
+        XNameAccess xSecondaryAccess = UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Global"));
 
-        sKeys = new String[] { "A_MOD1" };
+        sKeys = new String[]
+                {
+                    "A_MOD1"
+                };
         impl_checkGetKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, sKeys);
 
-        sKeys = new String[] { "PASTE", "X_SHIFT" };
-        String[] sCommands = new String[] { ".uno:test", ".uno:test" };
+        sKeys = new String[]
+                {
+                    "PASTE", "X_SHIFT"
+                };
+        String[] sCommands = new String[]
+        {
+            ".uno:test", ".uno:test"
+        };
         impl_checkSetKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys, sCommands);
 
-        sKeys = new String[] { "C_MOD1", "CUT" };
+        sKeys = new String[]
+                {
+                    "C_MOD1", "CUT"
+                };
         impl_checkRemoveKeyCommands(m_xGlobalAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys);
 
-        String[] sCommandList = new String[] { ".uno:Paste", ".uno:CloseWin" };
+        String[] sCommandList = new String[]
+        {
+            ".uno:Paste", ".uno:CloseWin"
+        };
         impl_checkGetPreferredKeyEventsForCommandList(m_xGlobalAccelCfg, xPrimaryAccess, sCommandList);
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
+    @Test
     public void checkModuleAccelCfg()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         String[] sModules = new String[]
         {
             "com.sun.star.frame.StartModule",
             "com.sun.star.drawing.DrawingDocument",
             "com.sun.star.presentation.PresentationDocument",
-            "com.sun.star.sheet.SpreadsheetDocument",    
+            "com.sun.star.sheet.SpreadsheetDocument",
             "com.sun.star.text.TextDocument",
-            // add other modules here
+        // add other modules here
         };
 
-        for (int i=0; i<sModules.length; ++i)
+        for (int i = 0; i < sModules.length; ++i)
         {
-            log.println("\n---- check accelerator configuration depending module: " + sModules[i] + " ----");
+            System.out.println("\n---- check accelerator configuration depending module: " + sModules[i] + " ----");
 
             PropertyValue[] aProp = new PropertyValue[2];
             aProp[0] = new PropertyValue();
-            aProp[0].Name  = "ModuleIdentifier";
+            aProp[0].Name = "ModuleIdentifier";
             aProp[0].Value = sModules[i];
             aProp[1] = new PropertyValue();
-            aProp[1].Name  = "Locale";
+            aProp[1].Name = "Locale";
             aProp[1].Value = "en-US";
 
-            XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, m_xModuleAccelCfg);
+            XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, m_xModuleAccelCfg);
             xInit.initialize(aProp); // to fill cache
-                        
-            XNameAccess xPrimaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Modules"));
-            XNameAccess xSecondaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Modules"));
+
+            XNameAccess xPrimaryModules = UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Modules"));
+            XNameAccess xSecondaryModules = UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Modules"));
 
             String[] sKeys;
-            XNameAccess xPrimaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xPrimaryModules.getByName(sModules[i]));
-            XNameAccess xSecondaryAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xSecondaryModules.getByName(sModules[i]));
+            XNameAccess xPrimaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xPrimaryModules.getByName(sModules[i]));
+            XNameAccess xSecondaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xSecondaryModules.getByName(sModules[i]));
 
             //--------------------------------------------
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
-                sKeys = new String[] { "A_SHIFT_MOD1_MOD2" };
+            {
+                sKeys = new String[]
+                        {
+                            "A_SHIFT_MOD1_MOD2"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument"))
-                sKeys = new String[] { "B_MOD1" };
+            {
+                sKeys = new String[]
+                        {
+                            "B_MOD1"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.text.TextDocument"))
-                sKeys = new String[] { "F11_MOD1" };
+            {
+                sKeys = new String[]
+                        {
+                            "F11_MOD1"
+                        };
+            }
             else
-                sKeys = new String[] { "A_MOD1" };
+            {
+                sKeys = new String[]
+                        {
+                            "A_MOD1"
+                        };
+            }
             impl_checkGetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, sKeys);
 
             //--------------------------------------------
             String[] sCommands;
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
             {
-                sKeys = new String[] { "A_SHIFT_MOD1_MOD2" };
-                sCommands = new String[] { ".uno:test" };
+                sKeys = new String[]
+                        {
+                            "A_SHIFT_MOD1_MOD2"
+                        };
+                sCommands = new String[]
+                        {
+                            ".uno:test"
+                        };
             }
             else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument"))
             {
-                sKeys = new String[] { "B_MOD1" };
-                sCommands = new String[] { ".uno:test" };
+                sKeys = new String[]
+                        {
+                            "B_MOD1"
+                        };
+                sCommands = new String[]
+                        {
+                            ".uno:test"
+                        };
             }
             else if (sModules[i].equals("com.sun.star.text.TextDocument"))
             {
-                sKeys = new String[] { "F11_MOD1" };
-                sCommands = new String[] { ".uno:test" };
+                sKeys = new String[]
+                        {
+                            "F11_MOD1"
+                        };
+                sCommands = new String[]
+                        {
+                            ".uno:test"
+                        };
             }
             else
             {
-                sKeys = new String[] { "PASTE" };
-                sCommands = new String[] { ".uno:test" };
+                sKeys = new String[]
+                        {
+                            "PASTE"
+                        };
+                sCommands = new String[]
+                        {
+                            ".uno:test"
+                        };
             }
             impl_checkSetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys, sCommands);
 
             //--------------------------------------------
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
-                sKeys = new String[] { "A_SHIFT_MOD1_MOD2" };
+            {
+                sKeys = new String[]
+                        {
+                            "A_SHIFT_MOD1_MOD2"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument"))
-                sKeys = new String[] { "F5_SHIFT_MOD1" };
+            {
+                sKeys = new String[]
+                        {
+                            "F5_SHIFT_MOD1"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.text.TextDocument"))
-                sKeys = new String[] { "BACKSPACE_MOD2" };
+            {
+                sKeys = new String[]
+                        {
+                            "BACKSPACE_MOD2"
+                        };
+            }
             else
-                sKeys = new String[] { "C_MOD1" };
+            {
+                sKeys = new String[]
+                        {
+                            "C_MOD1"
+                        };
+            }
             impl_checkRemoveKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys);
 
             //--------------------------------------------
             String[] sCommandList;
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
-                sCommandList = new String[] { ".uno:Presentation" };
+            {
+                sCommandList = new String[]
+                        {
+                            ".uno:Presentation"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.sheet.SpreadsheetDocument"))
-                sCommandList = new String[] { ".uno:InsertCell" };
+            {
+                sCommandList = new String[]
+                        {
+                            ".uno:InsertCell"
+                        };
+            }
             else if (sModules[i].equals("com.sun.star.text.TextDocument"))
-                sCommandList = new String[] { ".uno:SelectionModeBlock" };
+            {
+                sCommandList = new String[]
+                        {
+                            ".uno:SelectionModeBlock"
+                        };
+            }
             else
-                sCommandList = new String[] { ".uno:Cut" };
+            {
+                sCommandList = new String[]
+                        {
+                            ".uno:Cut"
+                        };
+            }
             impl_checkGetPreferredKeyEventsForCommandList(m_xModuleAccelCfg, xPrimaryAccess, sCommandList);
         }
     }
@@ -247,58 +357,61 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     //-------------------------------------------
     /** @todo document me.
      */
+    @Test
     public void checkDocumentAccelCfg()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("\n---- check Document accelerator configuration: ----");
+        System.out.println("\n---- check Document accelerator configuration: ----");
 
         String sDocCfgName;
 
-        sDocCfgName = "file:///c:/test.cfg";
+        String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+        sDocCfgName = FileHelper.appendPath(tempDirURL, "test.cfg");
+        // sDocCfgName = "file:///c:/test.cfg";
         SaveDocumentAcceleratorConfiguration(sDocCfgName);
 
-        sDocCfgName = "file:///c:/test.cfg";
-        LoadDocumentAcceleratorConfiguration(sDocCfgName);        
+        // sDocCfgName = "file:///c:/test.cfg";
+        LoadDocumentAcceleratorConfiguration(sDocCfgName);
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
     private void impl_checkGetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xAccess, String[] sKeys)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("check getKeyCommands...");
+        System.out.println("check getKeyCommands...");
 
-        for (int i=0; i<sKeys.length; ++i)
+        for (int i = 0; i < sKeys.length; ++i)
         {
-            if (xAccess.hasByName(sKeys[i]) && getCommandFromConfiguration(xAccess, sKeys[i]).length()>0)
+            if (xAccess.hasByName(sKeys[i]) && getCommandFromConfiguration(xAccess, sKeys[i]).length() > 0)
             {
-                log.println("** get command by " + sKeys[i] + " **");
+                System.out.println("** get command by " + sKeys[i] + " **");
 
                 String sCmdFromCache = new String(); // get a value using XAcceleratorConfiguration API
                 String sCmdFromConfiguration = new String(); // get a value using configuration API            
 
                 // GET shortcuts/commands using XAcceleratorConfiguration API
                 sCmdFromCache = xAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey(sKeys[i]));
-                log.println(sKeys[i] + "-->" + sCmdFromCache + ", by XAcceleratorConfiguration API");
+                System.out.println(sKeys[i] + "-->" + sCmdFromCache + ", by XAcceleratorConfiguration API");
 
                 // GET shortcuts/commands using configuration API
                 sCmdFromConfiguration = getCommandFromConfiguration(xAccess, sKeys[i]);
-                log.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API");
+                System.out.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API");
 
-                assure("values are different by XAcceleratorConfiguration API and configuration API!", sCmdFromCache.equals(sCmdFromConfiguration));
+                assertTrue("values are different by XAcceleratorConfiguration API and configuration API!", sCmdFromCache.equals(sCmdFromConfiguration));
 
                 String sLocale = "es";
                 setOfficeLocale(sLocale);
                 sCmdFromConfiguration = getCommandFromConfiguration(xAccess, sKeys[i]);
-                log.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API" + " for locale:"+ getOfficeLocale());
+                System.out.println(sKeys[i] + "-->" + sCmdFromConfiguration + ", by configuration API" + " for locale:" + getOfficeLocale());
 
                 sLocale = "en-US";
                 setOfficeLocale(sLocale); //reset to default locale
             }
             else
             {
-                log.println(sKeys[i] + " doesn't exist!");
+                System.out.println(sKeys[i] + " doesn't exist!");
             }
         }
     }
@@ -307,20 +420,24 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private void impl_checkSetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys, String[] sCommands)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("check setKeyCommands...");
+        System.out.println("check setKeyCommands...");
 
-        for (int i=0; i<sKeys.length; ++i)
+        for (int i = 0; i < sKeys.length; ++i)
         {
             if (!xPrimaryAccess.hasByName(sKeys[i]) && !xSecondaryAccess.hasByName(sKeys[i]))
             {
                 xAccelCfg.setKeyEvent(convertShortcut2AWTKey(sKeys[i]), sCommands[i]);
                 xAccelCfg.store();
                 if (xPrimaryAccess.hasByName(sKeys[i]))
-                    log.println("add " + sKeys[i] + " successfully!");
+                {
+                    System.out.println("add " + sKeys[i] + " successfully!");
+                }
                 else
-                    log.println("add " + sKeys[i] + " failed!");
+                {
+                    System.out.println("add " + sKeys[i] + " failed!");
+                }
             }
             else if (xPrimaryAccess.hasByName(sKeys[i]))
             {
@@ -332,12 +449,18 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
 
                     String sChangedCommand = getCommandFromConfiguration(xPrimaryAccess, sKeys[i]);
                     if (sCommands[i].equals(sChangedCommand))
-                        log.println("change " + sKeys[i] + " successfully!");
+                    {
+                        System.out.println("change " + sKeys[i] + " successfully!");
+                    }
                     else
-                        log.println("change " + sKeys[i] + " failed!");
+                    {
+                        System.out.println("change " + sKeys[i] + " failed!");
+                    }
                 }
                 else
-                    log.println(sKeys[i] + " already exist!");
+                {
+                    System.out.println(sKeys[i] + " already exist!");
+                }
             }
             else if (xSecondaryAccess.hasByName(sKeys[i]))
             {
@@ -349,12 +472,18 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
 
                     String sChangedCommand = getCommandFromConfiguration(xPrimaryAccess, sKeys[i]);
                     if (sCommands[i].equals(sChangedCommand))
-                        log.println("change " + sKeys[i] + " successfully!");
+                    {
+                        System.out.println("change " + sKeys[i] + " successfully!");
+                    }
                     else
-                        log.println("change " + sKeys[i] + " failed!");
+                    {
+                        System.out.println("change " + sKeys[i] + " failed!");
+                    }
                 }
                 else
-                    log.println(sKeys[i] + " already exist!");
+                {
+                    System.out.println(sKeys[i] + " already exist!");
+                }
             }
         }
     }
@@ -363,33 +492,41 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private void impl_checkRemoveKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("check removeKeyCommands...");
+        System.out.println("check removeKeyCommands...");
 
-        for (int i=0; i<sKeys.length; i++)
+        for (int i = 0; i < sKeys.length; i++)
         {
             if (!xPrimaryAccess.hasByName(sKeys[i]) && !xSecondaryAccess.hasByName(sKeys[i]))
             {
-                log.println(sKeys[i] + " doesn't exist!");
+                System.out.println(sKeys[i] + " doesn't exist!");
             }
             else if (xPrimaryAccess.hasByName(sKeys[i]))
             {
                 xAccelCfg.removeKeyEvent(convertShortcut2AWTKey(sKeys[i]));
                 xAccelCfg.store();
                 if (!xPrimaryAccess.hasByName(sKeys[i]))
-                    log.println("Remove " + sKeys[i] + " successfully!");
+                {
+                    System.out.println("Remove " + sKeys[i] + " successfully!");
+                }
                 else
-                    log.println("Remove " + sKeys[i] + " failed!");
+                {
+                    System.out.println("Remove " + sKeys[i] + " failed!");
+                }
             }
             else if (xSecondaryAccess.hasByName(sKeys[i]))
             {
                 xAccelCfg.removeKeyEvent(convertShortcut2AWTKey(sKeys[i]));
                 xAccelCfg.store();
                 if (!xSecondaryAccess.hasByName(sKeys[i]))
-                    log.println("Remove " + sKeys[i] + " successfully!");
+                {
+                    System.out.println("Remove " + sKeys[i] + " successfully!");
+                }
                 else
-                    log.println("Remove " + sKeys[i] + " failed!");
+                {
+                    System.out.println("Remove " + sKeys[i] + " failed!");
+                }
             }
         }
     }
@@ -398,25 +535,29 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private void impl_checkGetPreferredKeyEventsForCommandList(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, String[] sCommandList)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        log.println("check getPreferredKeyEventsForCommandList...");
+        System.out.println("check getPreferredKeyEventsForCommandList...");
 
         Object[] oKeyEvents = xAccelCfg.getPreferredKeyEventsForCommandList(sCommandList);
         for (int i = 0; i < oKeyEvents.length; i++)
         {
-            log.println("get preferred key for command "+ sCommandList[i] + ":");
+            System.out.println("get preferred key for command " + sCommandList[i] + ":");
 
-            KeyEvent aKeyEvent = (KeyEvent)AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]);
+            KeyEvent aKeyEvent = (KeyEvent) AnyConverter.toObject(KeyEvent.class, oKeyEvents[i]);
             String sKeyEvent = convertAWTKey2Shortcut(aKeyEvent);
-            log.println(sKeyEvent);
+            System.out.println(sKeyEvent);
 
             String sCmdFromConfiguration = getCommandFromConfiguration(xPrimaryAccess, sKeyEvent);
-            log.println(sCmdFromConfiguration);
+            System.out.println(sCmdFromConfiguration);
             if (sCommandList[i].equals(sCmdFromConfiguration))
-                log.println("get preferred key correctly!");
+            {
+                System.out.println("get preferred key correctly!");
+            }
             else
-                log.println("get preferred key failed!");
+            {
+                System.out.println("get preferred key failed!");
+            }
         }
     }
 
@@ -424,18 +565,20 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private String getCommandFromConfiguration(XNameAccess xAccess, String sKey)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         String sCommand = new String();
 
         if (xAccess.hasByName(sKey))
         {
-            XNameAccess xKey = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xAccess.getByName(sKey));
-            XNameAccess xCommand = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xKey.getByName("Command"));
+            XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xAccess.getByName(sKey));
+            XNameAccess xCommand = UnoRuntime.queryInterface(XNameAccess.class, xKey.getByName("Command"));
 
             String sLocale = getOfficeLocale();
-            if (xCommand.hasByName(sLocale))            
-                sCommand = (String)UnoRuntime.queryInterface(String.class, xCommand.getByName(sLocale));
+            if (xCommand.hasByName(sLocale))
+            {
+                sCommand = UnoRuntime.queryInterface(String.class, xCommand.getByName(sLocale));
+            }
         }
 
         return sCommand;
@@ -445,52 +588,54 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private void insertKeyToConfiguration(XNameAccess xAccess, String sKey, String sCommand)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        XNameContainer xContainer = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xAccess);
+        XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess);
         if (!xContainer.hasByName(sKey))
         {
-            XSingleServiceFactory xFac = (XSingleServiceFactory)UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer);
-            XInterface xInst = (XInterface)UnoRuntime.queryInterface(XInterface.class, xFac.createInstance());
+            XSingleServiceFactory xFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer);
+            XInterface xInst = UnoRuntime.queryInterface(XInterface.class, xFac.createInstance());
             xContainer.insertByName(sKey, xInst);
         }
 
-        XNameAccess xKey = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey));
-        XNameContainer xCommand = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command"));
+        XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey));
+        XNameContainer xCommand = UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command"));
         String sLocale = getOfficeLocale();
         if (xCommand.hasByName(sLocale))
+        {
             xCommand.insertByName(sLocale, sCommand);
+        }
         else
+        {
             xCommand.replaceByName(sLocale, sCommand);
+        }
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
     private void removeKeyFromConfiguration(XNameAccess xAccess, String sKey)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        XNameContainer xContainer = (XNameContainer)UnoRuntime.queryInterface(XNameContainer.class, xAccess);
+        XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess);
         if (xContainer.hasByName(sKey))
+        {
             xContainer.removeByName(sKey);
+        }
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
     private void LoadDocumentAcceleratorConfiguration(String sDocCfgName)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
-            XSingleServiceFactory.class,
-            m_xSmgr.createInstance("com.sun.star.embed.StorageFactory"));
+        XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, m_xSmgr.createInstance("com.sun.star.embed.StorageFactory"));
 
         Object aArgs[] = new Object[2];
         aArgs[0] = sDocCfgName;
         aArgs[1] = new Integer(com.sun.star.embed.ElementModes.READ);
-        XStorage xRootStorage = (XStorage)UnoRuntime.queryInterface(
-            XStorage.class,
-            xStorageFactory.createInstanceWithArguments(aArgs));
+        XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs));
 
         XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.READ);
 
@@ -500,58 +645,53 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
         Object[] lArgs = new Object[1];
         lArgs[0] = aProp;
 
-        XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, m_xDocumentAccelCfg);
+        XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, m_xDocumentAccelCfg);
         xInit.initialize(lArgs);
 
-        String test = m_xDocumentAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey("F2"));
-        log.println(test);
+        // TODO: throws css::container::NoSuchElementException
+        try
+        {
+            String test = m_xDocumentAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey("F2"));
+            System.out.println(test);
+        }
+        catch(com.sun.star.container.NoSuchElementException e)
+        {
+            System.out.println("NoSuchElementException caught: " + e.getMessage());
+        }
     }
 
     //-------------------------------------------
     /** @todo document me.
      */
     private void SaveDocumentAcceleratorConfiguration(String sDocCfgName)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
-        XSingleServiceFactory xStorageFactory = (XSingleServiceFactory)UnoRuntime.queryInterface(
-            XSingleServiceFactory.class,
-            m_xSmgr.createInstance("com.sun.star.embed.StorageFactory"));
+        XSingleServiceFactory xStorageFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, m_xSmgr.createInstance("com.sun.star.embed.StorageFactory"));
 
         Object aArgs[] = new Object[2];
         aArgs[0] = sDocCfgName;
         aArgs[1] = new Integer(com.sun.star.embed.ElementModes.WRITE);
-        XStorage xRootStorage = (XStorage)UnoRuntime.queryInterface(
-            XStorage.class,
-            xStorageFactory.createInstanceWithArguments(aArgs));
+        XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs));
 
         XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.WRITE);
 
-        XUIConfigurationManager xCfgMgr = (XUIConfigurationManager)UnoRuntime.queryInterface(
-            XUIConfigurationManager.class,
-            m_xSmgr.createInstance("com.sun.star.ui.UIConfigurationManager"));
+        XUIConfigurationManager xCfgMgr = UnoRuntime.queryInterface(XUIConfigurationManager.class, m_xSmgr.createInstance("com.sun.star.ui.UIConfigurationManager"));
 
-        XUIConfigurationStorage xUICfgStore = (XUIConfigurationStorage)UnoRuntime.queryInterface(
-            XUIConfigurationStorage.class,
-            xCfgMgr);
+        XUIConfigurationStorage xUICfgStore = UnoRuntime.queryInterface(XUIConfigurationStorage.class, xCfgMgr);
         xUICfgStore.setStorage(xUIConfig);
 
-        XPropertySet xUIConfigProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xUIConfig);
+        XPropertySet xUIConfigProps = UnoRuntime.queryInterface(XPropertySet.class, xUIConfig);
         xUIConfigProps.setPropertyValue("MediaType", "application/vnd.sun.xml.ui.configuration");
 
         if (xCfgMgr != null)
         {
-            XAcceleratorConfiguration xTargetAccMgr = (XAcceleratorConfiguration)UnoRuntime.queryInterface(
-                XAcceleratorConfiguration.class,
-                xCfgMgr.getShortCutManager());
-            XUIConfigurationPersistence xCommit1 = (XUIConfigurationPersistence)UnoRuntime.queryInterface(
-                XUIConfigurationPersistence.class, xTargetAccMgr);
-            XUIConfigurationPersistence xCommit2 = (XUIConfigurationPersistence)UnoRuntime.queryInterface(
-                XUIConfigurationPersistence.class, xCfgMgr);
+            XAcceleratorConfiguration xTargetAccMgr = UnoRuntime.queryInterface(XAcceleratorConfiguration.class, xCfgMgr.getShortCutManager());
+            XUIConfigurationPersistence xCommit1 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xTargetAccMgr);
+            XUIConfigurationPersistence xCommit2 = UnoRuntime.queryInterface(XUIConfigurationPersistence.class, xCfgMgr);
             xCommit1.store();
             xCommit2.store();
 
-            XTransactedObject xCommit3 = (XTransactedObject)UnoRuntime.queryInterface(
-                XTransactedObject.class, xRootStorage);
+            XTransactedObject xCommit3 = UnoRuntime.queryInterface(XTransactedObject.class, xRootStorage);
             xCommit3.commit();
         }
     }
@@ -560,7 +700,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private com.sun.star.awt.KeyEvent convertShortcut2AWTKey(String sShortcut)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         com.sun.star.awt.KeyEvent aKeyEvent = new com.sun.star.awt.KeyEvent();
         KeyMapping aKeyMapping = new KeyMapping();
@@ -570,11 +710,17 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
         for (int i = 1; i < sShortcutSplits.length; i++)
         {
             if (sShortcutSplits[i].equals("SHIFT"))
+            {
                 aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT;
+            }
             else if (sShortcutSplits[i].equals("MOD1"))
+            {
                 aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.MOD1;
+            }
             else if (sShortcutSplits[i].equals("MOD2"))
+            {
                 aKeyEvent.Modifiers |= com.sun.star.awt.KeyModifier.MOD2;
+            }
         }
 
         return aKeyEvent;
@@ -584,7 +730,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private String convertAWTKey2Shortcut(com.sun.star.awt.KeyEvent aKeyEvent)
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         String sShortcut;
 
@@ -592,11 +738,17 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
         sShortcut = aKeyMapping.mapCode2Identifier(aKeyEvent.KeyCode);
 
         if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.SHIFT) == com.sun.star.awt.KeyModifier.SHIFT)
+        {
             sShortcut += "_SHIFT";
+        }
         if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.MOD1) == com.sun.star.awt.KeyModifier.MOD1)
+        {
             sShortcut += "_MOD1";
+        }
         if ((aKeyEvent.Modifiers & com.sun.star.awt.KeyModifier.MOD2) == com.sun.star.awt.KeyModifier.MOD2)
+        {
             sShortcut += "_MOD2";
+        }
 
         return sShortcut;
     }
@@ -605,7 +757,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private String getOfficeLocale()
-        throws java.lang.Exception
+            throws java.lang.Exception
     {
         String sLocale = new String();
 
@@ -615,9 +767,9 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
 
         if (xRootConfig != null)
         {
-            XNameAccess xLocale = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N"));
-            XPropertySet xSet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xLocale);
-            sLocale = (String)xSet.getPropertyValue("ooLocale");
+            XNameAccess xLocale = UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N"));
+            XPropertySet xSet = UnoRuntime.queryInterface(XPropertySet.class, xLocale);
+            sLocale = (String) xSet.getPropertyValue("ooLocale");
         }
 
         return sLocale;
@@ -626,8 +778,8 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     //-------------------------------------------
     /** @todo document me.
      */
-    private void  setOfficeLocale(String sLocale)
-        throws java.lang.Exception
+    private void setOfficeLocale(String sLocale)
+            throws java.lang.Exception
     {
         String sConfigPath = "org.openoffice.Setup";
         boolean bReadOnly = false;
@@ -635,10 +787,10 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
 
         if (xRootConfig != null)
         {
-            XNameAccess xLocale = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N"));
-            XPropertySet xSet = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, xLocale);
+            XNameAccess xLocale = UnoRuntime.queryInterface(XNameAccess.class, xRootConfig.getByName("L10N"));
+            XPropertySet xSet = UnoRuntime.queryInterface(XPropertySet.class, xLocale);
             xSet.setPropertyValue("ooLocale", sLocale);
-            XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(XChangesBatch.class, xRootConfig);
+            XChangesBatch xBatch = UnoRuntime.queryInterface(XChangesBatch.class, xRootConfig);
             xBatch.commitChanges();
         }
     }
@@ -647,13 +799,11 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
     /** @todo document me.
      */
     private XNameAccess openConfig(XMultiServiceFactory xSMGR,
-                            String               sConfigPath ,
-                            boolean              bReadOnly   )
-        throws java.lang.Exception
+            String sConfigPath,
+            boolean bReadOnly)
+            throws java.lang.Exception
     {
-        XMultiServiceFactory xConfigRoot = (XMultiServiceFactory)UnoRuntime.queryInterface(
-                                                XMultiServiceFactory.class,
-                                                xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider"));
+        XMultiServiceFactory xConfigRoot = UnoRuntime.queryInterface(XMultiServiceFactory.class, xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider"));
 
         PropertyValue[] lParams = new PropertyValue[2];
         lParams[0] = new PropertyValue();
@@ -666,21 +816,44 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase
 
         Object aConfig;
         if (bReadOnly)
-            aConfig = xConfigRoot.createInstanceWithArguments(
-                            "com.sun.star.configuration.ConfigurationAccess",
-                            lParams);
+        {
+            aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams);
+        }
         else
-            aConfig = xConfigRoot.createInstanceWithArguments(
-                            "com.sun.star.configuration.ConfigurationUpdateAccess",
-                            lParams);
+        {
+            aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", lParams);
+        }
 
-        XNameAccess xConfig = (XNameAccess)UnoRuntime.queryInterface(
-                            XNameAccess.class,
-                            aConfig);
+        XNameAccess xConfig = UnoRuntime.queryInterface(XNameAccess.class, aConfig);
 
         if (xConfig == null)
+        {
             throw new com.sun.star.uno.Exception("Could not open configuration \"" + sConfigPath + "\"");
+        }
 
         return xConfig;
     }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java
index ec538d53b6..5d40a9a09f 100644..100755
--- a/framework/qa/complex/accelerators/helper/KeyMapping.java
+++ b/framework/qa/complex/accelerators/KeyMapping.java
@@ -70,7 +70,7 @@ public class KeyMapping
     private IdentifierHashMap aIdentifierHashMap;
     private CodeHashMap aCodeHashMap;
 
-    KeyMapping()
+    public KeyMapping()
     {
         KeyIdentifierInfo[] aInfoMap = {
             new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)),
diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk
deleted file mode 100644
index a0d10f6881..0000000000
--- a/framework/qa/complex/accelerators/helper/makefile.mk
+++ /dev/null
@@ -1,46 +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 = ..$/..$/..$/..
-TARGET  = AcceleratorsConfigurationTest
-PRJNAME = framework
-PACKAGE = complex$/accelerators$/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-                  Generator.jar OOoRunner.jar
-JAVAFILES       = KeyMapping.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
deleted file mode 100644
index 034287fbb5..0000000000
--- a/framework/qa/complex/accelerators/makefile.mk
+++ /dev/null
@@ -1,87 +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 = ..$/..$/..
-TARGET  = AcceleratorsConfigurationTest
-PRJNAME = $(TARGET)
-PACKAGE = complex$/accelerators
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
-                  OOoRunner.jar
-                  
-JAVAFILES       = AcceleratorsConfigurationTest.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-SUBDIRS=helper
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH   = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-#.IF "$(depend)" == ""
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-#.ELSE
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-#.ENDIF
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index 7042034e55..c712f0a8ee 100755
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -28,7 +28,6 @@
 package complex.api_internal;
 
 // imports
-import complexlib.ComplexTestCase;
 import helper.OfficeProvider;
 import helper.ProcessHandler;
 import com.sun.star.task.XJob;
@@ -38,16 +37,27 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.beans.NamedValue;
 
-import java.io.PrintWriter;
 import java.util.Vector;
 import java.util.StringTokenizer;
 
+
+// ---------- junit imports -----------------
+import lib.TestParameters;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 /**
  * This test executes the API tests internally in StarOffice. Prerequiste is
  * that a OOoRunner.jar is registered inseide of StarOffice. Adjust the joblist
  * inside of the ChekAPI.props to determine which tetss will be executed.
  */
-public class CheckAPI extends ComplexTestCase {
+public class CheckAPI  {
 
     // The name of the tested service
     private final String testName = "StarOfficeAPI";
@@ -56,40 +66,52 @@ public class CheckAPI extends ComplexTestCase {
      * Return all test methods.
      * @return The test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkAPI"};
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkAPI"};
+//    }
+
+    /**
+     * The test parameters
+     */
+    private static TestParameters param = null;
 
     /**
+     *
+     */
+    @Before public void before()
+    {
+        param = new TestParameters();
+    }
+    /**
      * Execute the API tests inside of the Office. If the Office crashes, it
      * will be restarted and the job will continue after the one that caused the crash.
      */
-    public void checkAPI() {
-        log.println("Start with test");
+    @Test public void checkAPI() {
+        System.out.println("Start with test");
         // if test is idle for 5 minutes, assume that it hangs and kill it.
-        param.put("TimeOut", new Integer("300000"));
+        // param.put("TimeOut", new Integer("300000"));
 /*        AppProvider office = (AppProvider)dcl.getInstance("helper.OfficeProvider");
         Object msf = office.getManager(param);
         if (msf == null) {
             failed("Could not connect an Office.");
         }
         param.put("ServiceFactory",msf); */
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
+        XMultiServiceFactory xMSF = getMSF();
         Object oObj = null;
         try {
             oObj = xMSF.createInstance("org.openoffice.RunnerService");
         }
         catch(com.sun.star.uno.Exception e) {
-            failed("Could not create Instance of 'org.openoffice.RunnerService'");
-        }
-        if ( oObj == null ) {
-            failed("Cannot create 'org.openoffice.RunnerService'");
+            fail("Could not create Instance of 'org.openoffice.RunnerService'");
         }
+        assertNotNull("Cannot create 'org.openoffice.RunnerService'", oObj);
+
         // get the parameters for the internal test
         String paramList = (String)param.get("ParamList");
         Vector p = new Vector();
         StringTokenizer paramTokens = new StringTokenizer(paramList, " ");
-        while(paramTokens.hasMoreTokens()) {
+        while(paramTokens.hasMoreTokens())
+        {
             p.add(paramTokens.nextToken());
         }
         int length = p.size()/2+1;
@@ -98,15 +120,17 @@ public class CheckAPI extends ComplexTestCase {
             internalParams[i] = new NamedValue();
             internalParams[i].Name = (String)p.get(i*2);
             internalParams[i].Value = p.get(i*2+1);
-            log.println("Name: "+internalParams[i].Name);
-            log.println("Value: "+(String)internalParams[i].Value);
+            System.out.println("Name: "+internalParams[i].Name);
+            System.out.println("Value: "+(String)internalParams[i].Value);
         }
 
         // do we have test jobs?
         String testJob = (String)param.get("job");
         PropertyValue[]props;
-        if (testJob==null) {
-            if ( param.get("job1")==null ) {
+        if (testJob==null)
+        {
+            if ( param.get("job1")==null )
+            {
                 // get all test jobs from runner service
                 XPropertyAccess xPropAcc = (XPropertyAccess)UnoRuntime.queryInterface(XPropertyAccess.class, oObj);
                 props = xPropAcc.getPropertyValues();
@@ -131,13 +155,13 @@ public class CheckAPI extends ComplexTestCase {
             props[0].Value = testJob;
         }
 
-        log.println("Props length: "+ props.length);
+        System.out.println("Props length: "+ props.length);
         for (int i=0; i<props.length; i++) {
-            XJob xJob = (XJob)UnoRuntime.queryInterface(XJob.class, oObj);
+            XJob xJob = UnoRuntime.queryInterface(XJob.class, oObj);
             internalParams[length-1] = new NamedValue();
             internalParams[length-1].Name = "-o";
             internalParams[length-1].Value = props[i].Value;
-            log.println("Executing: " + (String)props[i].Value);
+            System.out.println("Executing: " + (String)props[i].Value);
 
             String erg = null;
 
@@ -146,8 +170,8 @@ public class CheckAPI extends ComplexTestCase {
             }
             catch(Throwable t) {
                 // restart and go on with test!!
-                t.printStackTrace((PrintWriter)log);
-                failed("Test run '" + (String)props[i].Value +"' could not be executed: Office crashed and is killed!", true);
+                t.printStackTrace();
+                fail("Test run '" + (String)props[i].Value +"' could not be executed: Office crashed and is killed!");
                 xMSF = null;
                 ProcessHandler handler = (ProcessHandler)param.get("AppProvider");
                 handler.kill();
@@ -163,12 +187,12 @@ public class CheckAPI extends ComplexTestCase {
                     oObj = xMSF.createInstance("org.openoffice.RunnerService");
                 }
                 catch(com.sun.star.uno.Exception e) {
-                    failed("Could not create Instance of 'org.openoffice.RunnerService'");
+                    fail("Could not create Instance of 'org.openoffice.RunnerService'");
                 }
             }
-            log.println(erg);
+            System.out.println(erg);
             String processedErg = parseResult(erg);
-            assure("Run '" + (String)props[i].Value + "' has result '" + processedErg + "'", processedErg == null, true);
+            assertTrue("Run '" + (String)props[i].Value + "' has result '" + processedErg + "'", processedErg == null);
         }
     }
 
@@ -195,6 +219,31 @@ public class CheckAPI extends ComplexTestCase {
         }
         return processedErg;
     }
+
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
 
 
diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
deleted file mode 100755
index 4d82ba2da6..0000000000
--- a/framework/qa/complex/api_internal/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 = ..$/..$/..
-TARGET  = CheckAPI
-PRJNAME = $(TARGET)
-PACKAGE = complex$/api_internal
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-JAVAFILES       = CheckAPI.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL: ALLTAR $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-.ELSE
-ALL: ALLDEP $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-.ENDIF
-
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-    cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-    jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-
-.INCLUDE :  target.mk
-
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-
-run: RUN
-
-
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index e1e27907d9..789544cef0 100755
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -27,65 +27,74 @@
 package complex.broken_document;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.frame.FrameSearchFlag;
+// import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XFrame;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
+
+
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 /**
  * Check, if message boxes appear when the Office is in "headless" mode. Tests
  * bug i15809. This test uses the broken document dbf.dbf.emf.
  */
-public class LoadDocument extends ComplexTestCase {
+public class LoadDocument {
 
     /** defect file to load **/
-    private final String mFileName = "dbf.dbf.emf";
+    // private final String mFileName = "dbf.dbf.emf";
 
     /**
      * Get all test methods.
      * @return The test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkHeadlessState"};
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkHeadlessState"};
+//    }
 
     /**
      * Start Office with "-headless" parameter, then
      * load the broken document "dbf.dbf.emf", that brings a message box up in
      * the ui, see if the headless mode of SOffice changes.
      */
-    public void checkHeadlessState() {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
+    @Test public void checkHeadlessState()
+    {
+        XMultiServiceFactory xMSF = getMSF();
         XFrame xDesktop = null;
 
         try {
-            xDesktop = (XFrame)UnoRuntime.queryInterface(XFrame.class,
-                        xMSF.createInstance("com.sun.star.frame.Desktop"));
+            xDesktop = UnoRuntime.queryInterface(XFrame.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
         }
         catch(com.sun.star.uno.Exception e) {
-            failed("Could not create a desktop instance.");
+            fail("Could not create a desktop instance.");
         }
 
-        XComponentLoader xDesktopLoader = (XComponentLoader)
-                UnoRuntime.queryInterface(XComponentLoader.class, xDesktop);
+        XComponentLoader xDesktopLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop);
         System.out.println("xDektopLoader is null: " + (xDesktopLoader == null));
         PropertyValue[] val = new PropertyValue[0];
 
-        String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName;
-        System.out.println("Working dir: " + workingDir);
-        String fileUrl = util.utils.getFullURL(workingDir);
+        // String workingDir = (String)param.get("WorkingDir") + System.getProperty("file.separator") + mFileName;
+        // System.out.println("Working dir: " + workingDir);
+        String fileUrl = complex.broken_document.TestDocument.getUrl("dbf.dbf.emf");
         System.out.println("File Url: " + fileUrl);
 
         try {
             xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val);
         }
         catch(com.sun.star.io.IOException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
         catch(com.sun.star.lang.IllegalArgumentException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
 
         // try again: headless mode defect now?
@@ -93,11 +102,35 @@ public class LoadDocument extends ComplexTestCase {
             xDesktopLoader.loadComponentFromURL(fileUrl, "_blank", 0, val);
         }
         catch(com.sun.star.io.IOException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
         catch(com.sun.star.lang.IllegalArgumentException e) {
-            failed("Could not load document");
+            fail("Could not load document");
         }
 
     }
+
+
+
+  private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/configmgr/source/pad.hxx b/framework/qa/complex/broken_document/TestDocument.java
index 1e86a0af91..8da1491af4 100644..100755
--- a/configmgr/source/pad.hxx
+++ b/framework/qa/complex/broken_document/TestDocument.java
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,39 +25,18 @@
 *
 ************************************************************************/
 
-#ifndef INCLUDED_CONFIGMGR_SOURCE_PAD_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_PAD_HXX
+package complex.broken_document;
 
-#include "sal/config.h"
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
 
-#include "rtl/strbuf.hxx"
-#include "sal/types.h"
-
-#include "span.hxx"
-
-namespace configmgr {
-
-class Pad {
-public:
-    void add(char const * begin, sal_Int32 length);
-
-    void addEphemeral(char const * begin, sal_Int32 length);
-
-    void clear();
-
-    bool is() const;
-
-    Span get() const;
-
-private:
-    void flushSpan();
-
-    Span span_;
-    rtl::OStringBuffer buffer_;
-};
+final class TestDocument
+{
+    public static String getUrl(String name) 
+        {
+            return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
+        }
 
+    private TestDocument() {}
 }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
deleted file mode 100755
index c8f24a9371..0000000000
--- a/framework/qa/complex/broken_document/makefile.mk
+++ /dev/null
@@ -1,80 +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 = ..$/..$/..
-TARGET  = CheckHeadlessState
-PRJNAME = $(TARGET)
-PACKAGE = complex$/broken_document
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = LoadDocument.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# the current directory for loading the document
-CT_WORKDIR  = -WorkingDir $(PWD)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TEST)
-
-run: RUN
diff --git a/framework/qa/complex/broken_document/dbf.dbf.emf b/framework/qa/complex/broken_document/test_documents/dbf.dbf.emf
index 11e45e9df5..11e45e9df5 100755
--- a/framework/qa/complex/broken_document/dbf.dbf.emf
+++ b/framework/qa/complex/broken_document/test_documents/dbf.dbf.emf
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 8cad076b2d..3447f9291e 100644..100755
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -1,4 +1,4 @@
-package contextMenuInterceptor;
+package complex.contextMenuInterceptor;
 
 import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
@@ -9,249 +9,289 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XBitmap;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
-import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.XPropertySetInfo;
-import com.sun.star.container.XIndexAccess;
 import com.sun.star.drawing.XShape;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.IndexOutOfBoundsException;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.ui.XContextMenuInterceptor;
 import com.sun.star.ui.XContextMenuInterception;
+import com.sun.star.ui.XContextMenuInterceptor;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import com.sun.star.uno.Exception;
-import com.sun.star.util.CloseVetoException;
 import com.sun.star.util.XCloseable;
-import com.sun.star.view.XViewSettingsSupplier;
-import complexlib.ComplexTestCase;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
-import java.io.PrintWriter;
-import share.LogWriter;
+import java.io.File;
 import util.AccessibilityTools;
 import util.DesktopTools;
 import util.DrawTools;
 import util.SOfficeFactory;
 import util.utils;
+import org.openoffice.test.OfficeFileUrl;
+
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 /**
  *
  */
-public class CheckContextMenuInterceptor extends ComplexTestCase {
+public class CheckContextMenuInterceptor
+{
+
     XMultiServiceFactory xMSF = null;
     XFrame xFrame = null;
     Point point = null;
     XWindow xWindow = null;
-    
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
-    } 
-
-    public void after() {
-        log.println("release the popup menu");
-        try {
+    com.sun.star.lang.XComponent xDrawDoc;
+
+    @Before
+    public void before()
+    {
+        xMSF = getMSF();
+    }
+
+    @After
+    public void after()
+    {
+        System.out.println("release the popup menu");
+        try
+        {
             Robot rob = new Robot();
             int x = point.X;
             int y = point.Y;
             rob.mouseMove(x, y);
             rob.mousePress(InputEvent.BUTTON1_MASK);
             rob.mouseRelease(InputEvent.BUTTON1_MASK);
-        } catch (java.awt.AWTException e) {
-            log.println("couldn't press mouse button");
         }
-            
-        com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface(
-                com.sun.star.util.XCloseable.class, xFrame);
+        catch (java.awt.AWTException e)
+        {
+            System.out.println("couldn't press mouse button");
+        }
+
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
 
         try
         {
-                xClose.close(false);
+            xClose.close(true);
         }
-        catch(com.sun.star.util.CloseVetoException exVeto)
+        catch (com.sun.star.util.CloseVetoException exVeto)
         {
-            failed("Test frame couldn't be closed successfully.");
+            fail("Test frame couldn't be closed successfully.");
         }
 
         xFrame = null;
+
+//        xClose = UnoRuntime.queryInterface(XCloseable.class, xDrawDoc);
+//        try
+//        {
+//            xClose.close(true);
+//        }
+//        catch (com.sun.star.util.CloseVetoException exVeto)
+//        {
+//            fail("Test DrawDoc couldn't be closed successfully.");
+//        }
+
     }
-    
-    public String[] getTestMethodNames() {
-        return new String[]{"checkContextMenuInterceptor"};
-    }
-    
-    public void checkContextMenuInterceptor() {
-        log.println(" **** Context Menu Interceptor *** ");
-        
-        try {
+
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkContextMenuInterceptor"};
+//    }
+    @Test
+    public void checkContextMenuInterceptor()
+    {
+        System.out.println(" **** Context Menu Interceptor *** ");
+
+        try
+        {
             // intialize the test document
-            com.sun.star.lang.XComponent xDrawDoc = DrawTools.createDrawDoc(xMSF);
-
-            SOfficeFactory SOF = SOfficeFactory.getFactory( xMSF);
-            XShape oShape = SOF.createShape(xDrawDoc,5000,5000,1500,1000,"GraphicObject");
-            DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape);
-            
-            com.sun.star.frame.XModel xModel = 
-                (com.sun.star.frame.XModel)UnoRuntime.queryInterface(
-                com.sun.star.frame.XModel.class, xDrawDoc);
-                
+            xDrawDoc = DrawTools.createDrawDoc(xMSF);
+
+            SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF);
+            XShape oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject");
+            DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape);
+
+            com.sun.star.frame.XModel xModel =
+                    UnoRuntime.queryInterface(com.sun.star.frame.XModel.class, xDrawDoc);
+
             // get the frame for later usage
             xFrame = xModel.getCurrentController().getFrame();
-                                
+
             // ensure that the document content is optimal visible
             DesktopTools.zoomToEntirePage(xDrawDoc);
-                        
+
             XBitmap xBitmap = null;
-            
+
             // adding graphic as ObjRelation for GraphicObjectShape
-            XPropertySet oShapeProps = (XPropertySet)
-                                UnoRuntime.queryInterface(XPropertySet.class,oShape);
-            log.println( "Inserting a shape into the document");
-            
-            try 
+            XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oShape);
+            System.out.println("Inserting a shape into the document");
+
+            try
+            {
+                String sFile = OfficeFileUrl.getAbsolute(new File("space-metal.jpg"));
+                // String sFile = util.utils.getFullTestURL("space-metal.jpg");
+                oShapeProps.setPropertyValue("GraphicURL", sFile);
+                Object oProp = oShapeProps.getPropertyValue("GraphicObjectFillBitmap");
+                xBitmap = (XBitmap) AnyConverter.toObject(new Type(XBitmap.class), oProp);
+            }
+            catch (com.sun.star.lang.WrappedTargetException e)
+            {
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+            }
+            catch (com.sun.star.beans.PropertyVetoException e)
+            {
+            }
+            catch (com.sun.star.beans.UnknownPropertyException e)
             {
-                oShapeProps.setPropertyValue(
-                    "GraphicURL",util.utils.getFullTestURL("space-metal.jpg"));
-                xBitmap = (XBitmap) AnyConverter.toObject(
-                    new Type(XBitmap.class),oShapeProps.getPropertyValue
-                        ("GraphicObjectFillBitmap"));
-            } catch (com.sun.star.lang.WrappedTargetException e) {
-            } catch (com.sun.star.lang.IllegalArgumentException e) {
-            } catch (com.sun.star.beans.PropertyVetoException e) {
-            } catch (com.sun.star.beans.UnknownPropertyException e) {
-            }			
-         
+            }
+
             // reuse the frame
             com.sun.star.frame.XController xController = xFrame.getController();
-            com.sun.star.ui.XContextMenuInterception xContextMenuInterception = null;
-            com.sun.star.ui.XContextMenuInterceptor xContextMenuInterceptor = null;
-            
-            if ( xController != null ) 
+            XContextMenuInterception xContextMenuInterception = null;
+            XContextMenuInterceptor xContextMenuInterceptor = null;
+
+            if (xController != null)
             {
-                log.println( "Creating context menu interceptor");
-                
+                System.out.println("Creating context menu interceptor");
+
                 // add our context menu interceptor
-                xContextMenuInterception = 
-                    (com.sun.star.ui.XContextMenuInterception)UnoRuntime.queryInterface( 
-                    com.sun.star.ui.XContextMenuInterception.class, xController );
-                
-                if( xContextMenuInterception != null ) 
+                xContextMenuInterception =
+                        UnoRuntime.queryInterface(XContextMenuInterception.class, xController);
+
+                if (xContextMenuInterception != null)
                 {
-                    ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor( xBitmap );
-                    xContextMenuInterceptor = 
-                        (com.sun.star.ui.XContextMenuInterceptor)UnoRuntime.queryInterface( 
-                            com.sun.star.ui.XContextMenuInterceptor.class, aContextMenuInterceptor );
-                    
-                    log.println( "Register context menu interceptor");
-                    xContextMenuInterception.registerContextMenuInterceptor( xContextMenuInterceptor );
+                    ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor(xBitmap);
+                    xContextMenuInterceptor =
+                            UnoRuntime.queryInterface(XContextMenuInterceptor.class, aContextMenuInterceptor);
+
+                    System.out.println("Register context menu interceptor");
+                    xContextMenuInterception.registerContextMenuInterceptor(xContextMenuInterceptor);
                 }
             }
-            
-        //	utils.shortWait(10000);
-            
-            openContextMenu((XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc));
-            
+
+            //	utils.shortWait(10000);
+
+            openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
+
             checkHelpEntry();
-                        
+
             // remove our context menu interceptor
-            if ( xContextMenuInterception != null &&
-                 xContextMenuInterceptor  != null    ) {
-                log.println( "Release context menu interceptor");
+            if (xContextMenuInterception != null
+                    && xContextMenuInterceptor != null)
+            {
+                System.out.println("Release context menu interceptor");
                 xContextMenuInterception.releaseContextMenuInterceptor(
-                    xContextMenuInterceptor ); 
+                        xContextMenuInterceptor);
             }
         }
-        catch ( com.sun.star.uno.RuntimeException ex ) {
-            ex.printStackTrace((PrintWriter)log);
-            failed("Runtime exception caught!" + ex.getMessage());
+        catch (com.sun.star.uno.RuntimeException ex)
+        {
+            // ex.printStackTrace();
+            fail("Runtime exception caught!" + ex.getMessage());
         }
-        catch ( java.lang.Exception ex ) {
-            ex.printStackTrace((PrintWriter)log);
-            failed("Java lang exception caught!" + ex.getMessage());
+        catch (java.lang.Exception ex)
+        {
+            // ex.printStackTrace();
+            fail("Java lang exception caught!" + ex.getMessage());
         }
     }
 
-    private void checkHelpEntry(){
+    private void checkHelpEntry()
+    {
         XInterface toolkit = null;
-        
-        log.println("get accesibility...");
-        try{
+
+        System.out.println("get accesibility...");
+        try
+        {
             toolkit = (XInterface) xMSF.createInstance("com.sun.star.awt.Toolkit");
-        } catch (com.sun.star.uno.Exception e){
-            log.println("could not get Toolkit " + e.toString());
         }
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                              XExtendedToolkit.class, toolkit);
+        catch (com.sun.star.uno.Exception e)
+        {
+            System.out.println("could not get Toolkit " + e.toString());
+        }
+        XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit);
 
         XAccessible xRoot = null;
 
         AccessibilityTools at = new AccessibilityTools();
 
-        try {
-            xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, 
-                                                          tk.getTopWindow(0));
-            
+        try
+        {
+            xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0));
+
             xRoot = at.getAccessibleObject(xWindow);
-            
+
 //            at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
-            at.printAccessibleTree((PrintWriter)log, xRoot, true);
-        } 
-        catch (com.sun.star.lang.IndexOutOfBoundsException e) 
+            // at.printAccessibleTree(System.out, xRoot, true);
+        }
+        catch (com.sun.star.lang.IndexOutOfBoundsException e)
         {
-            log.println("Couldn't get Window");
+            System.out.println("Couldn't get Window");
         }
 
         XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU);
 
-        log.println("ImplementationName: " + util.utils.getImplName(oPopMenu));
-        
+        System.out.println("ImplementationName: " + util.utils.getImplName(oPopMenu));
+
         XAccessible xHelp = null;
-        try{
-            log.println("Try to get first entry of context menu...");
+        try
+        {
+            System.out.println("Try to get first entry of context menu...");
             xHelp = oPopMenu.getAccessibleChild(0);
-            
-        } catch (IndexOutOfBoundsException e){
-            failed("Not possible to get first entry of context menu");
+
+        }
+        catch (IndexOutOfBoundsException e)
+        {
+            fail("Not possible to get first entry of context menu");
         }
-        
-        if (xHelp == null) failed("first entry of context menu is NULL");
-        
+
+        if (xHelp == null)
+        {
+            fail("first entry of context menu is NULL");
+        }
+
         XAccessibleContext xHelpCont = xHelp.getAccessibleContext();
 
-        if ( xHelpCont == null ) 
-            failed("No able to retrieve accessible context from first entry of context menu");
-        
+        if (xHelpCont == null)
+        {
+            fail("No able to retrieve accessible context from first entry of context menu");
+        }
+
         String aAccessibleName = xHelpCont.getAccessibleName();
-        if ( !aAccessibleName.equals( "Help" )) {
-            log.println("Accessible name found = "+aAccessibleName );
-            failed("First entry of context menu is not from context menu interceptor");
+        if (!aAccessibleName.equals("Help"))
+        {
+            System.out.println("Accessible name found = " + aAccessibleName);
+            fail("First entry of context menu is not from context menu interceptor");
         }
-        
+
         try
         {
-            log.println("try to get first children of Help context...");
+            System.out.println("try to get first children of Help context...");
             XAccessible xHelpChild = xHelpCont.getAccessibleChild(0);
 
-        } catch (IndexOutOfBoundsException e){
-            failed("not possible to get first children of Help context");
         }
-        
+        catch (IndexOutOfBoundsException e)
+        {
+            fail("not possible to get first children of Help context");
+        }
+
     }
-    
-    private void openContextMenu(XModel aModel){
-    
-        log.println("try to open contex menu...");
+
+    private void openContextMenu(XModel aModel)
+    {
+
+        System.out.println("try to open contex menu...");
         AccessibilityTools at = new AccessibilityTools();
 
         xWindow = at.getCurrentWindow(xMSF, aModel);
@@ -260,14 +300,14 @@ public class CheckContextMenuInterceptor extends ComplexTestCase {
 
         XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL);
 
-        XAccessibleComponent window = (XAccessibleComponent) UnoRuntime.queryInterface(
-                                              XAccessibleComponent.class, oObj);
+        XAccessibleComponent window = UnoRuntime.queryInterface(XAccessibleComponent.class, oObj);
 
         point = window.getLocationOnScreen();
         Rectangle rect = window.getBounds();
-        
-        log.println("klick mouse button...");
-        try {
+
+        System.out.println("klick mouse button...");
+        try
+        {
             Robot rob = new Robot();
             int x = point.X + (rect.Width / 2);
             int y = point.Y + (rect.Height / 2);
@@ -277,11 +317,36 @@ public class CheckContextMenuInterceptor extends ComplexTestCase {
             System.out.println("Release Button");
             rob.mouseRelease(InputEvent.BUTTON3_MASK);
             System.out.println("done");
-        } catch (java.awt.AWTException e) {
-            log.println("couldn't press mouse button");
         }
-        
+        catch (java.awt.AWTException e)
+        {
+            System.out.println("couldn't press mouse button");
+        }
+
         utils.shortWait(3000);
-        
+
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
     }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
index 2a6d9e000d..6455807f56 100644..100755
--- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
@@ -1,130 +1,114 @@
-package contextMenuInterceptor;
+package complex.contextMenuInterceptor;
 
 import com.sun.star.ui.*;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexContainer;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.Exception;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.lang.IllegalArgumentException;
 
-public class ContextMenuInterceptor implements XContextMenuInterceptor {
+public class ContextMenuInterceptor implements XContextMenuInterceptor
+{
 
-        private com.sun.star.awt.XBitmap myBitmap;
-    
-        public ContextMenuInterceptor( com.sun.star.awt.XBitmap aBitmap ) {
-            myBitmap = aBitmap;
-        }
-    
-        public ContextMenuInterceptorAction notifyContextMenuExecute(
-        com.sun.star.ui.ContextMenuExecuteEvent aEvent ) throws RuntimeException 
+    private com.sun.star.awt.XBitmap myBitmap;
+
+    public ContextMenuInterceptor(com.sun.star.awt.XBitmap aBitmap)
+    {
+        myBitmap = aBitmap;
+    }
+
+    public ContextMenuInterceptorAction notifyContextMenuExecute(
+            com.sun.star.ui.ContextMenuExecuteEvent aEvent) throws RuntimeException
     {
-        try 
+        try
         {
             // Retrieve context menu container and query for service factory to
             // create sub menus, menu entries and separators
             com.sun.star.container.XIndexContainer xContextMenu = aEvent.ActionTriggerContainer;
             com.sun.star.lang.XMultiServiceFactory xMenuElementFactory =
-                (com.sun.star.lang.XMultiServiceFactory)UnoRuntime.queryInterface(
-                com.sun.star.lang.XMultiServiceFactory.class, xContextMenu );
-            
-            if ( xMenuElementFactory != null ) 
+                    UnoRuntime.queryInterface(com.sun.star.lang.XMultiServiceFactory.class, xContextMenu);
+
+            if (xMenuElementFactory != null)
             {
-                
+
                 // create root menu entry for sub menu and sub menu
                 com.sun.star.beans.XPropertySet xRootMenuEntry =
-                    (XPropertySet)UnoRuntime.queryInterface(
-                    com.sun.star.beans.XPropertySet.class,
-                    xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" ));
-                
+                        UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
+
                 // create a line separator for our new help sub menu
                 com.sun.star.beans.XPropertySet xSeparator =
-                    (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface(
-                    com.sun.star.beans.XPropertySet.class,
-                    xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) );
-                Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE );
-                xSeparator.setPropertyValue( "SeparatorType", (Object)aSeparatorType );
-                
+                        UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator"));
+                Short aSeparatorType = new Short(ActionTriggerSeparatorType.LINE);
+                xSeparator.setPropertyValue("SeparatorType", (Object) aSeparatorType);
+
                 // query sub menu for index container to get access
                 com.sun.star.container.XIndexContainer xSubMenuContainer =
-                    (com.sun.star.container.XIndexContainer)UnoRuntime.queryInterface(
-                    com.sun.star.container.XIndexContainer.class,
-                    xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer" ));
-                
+                        UnoRuntime.queryInterface(com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer"));
+
                 // intialize root menu entry "Help"
-                xRootMenuEntry.setPropertyValue( "Text", new String( "Help" ));
-                xRootMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5410" ));
-                xRootMenuEntry.setPropertyValue( "HelpURL", new String( "5410" ));
-                xRootMenuEntry.setPropertyValue( "SubContainer", (Object)xSubMenuContainer );
-                xRootMenuEntry.setPropertyValue( "Image", myBitmap );
-                
+                xRootMenuEntry.setPropertyValue("Text", ("Help"));
+                xRootMenuEntry.setPropertyValue("CommandURL", ("slot:5410"));
+                xRootMenuEntry.setPropertyValue("HelpURL", ("5410"));
+                xRootMenuEntry.setPropertyValue("SubContainer", (Object) xSubMenuContainer);
+                xRootMenuEntry.setPropertyValue("Image", myBitmap);
+
                 // create menu entries for the new sub menu
                 // intialize help/content menu entry
                 // entry "Content"
-                XPropertySet xMenuEntry = (XPropertySet)UnoRuntime.queryInterface(
-                    XPropertySet.class, xMenuElementFactory.createInstance (
-                    "com.sun.star.ui.ActionTrigger" ));
-                xMenuEntry.setPropertyValue( "Text", new String( "Content" ));
-                xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5401" ));
-                xMenuEntry.setPropertyValue( "HelpURL", new String( "5401" ));
-                
+                XPropertySet xMenuEntry = UnoRuntime.queryInterface(XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
+                xMenuEntry.setPropertyValue("Text", ("Content"));
+                xMenuEntry.setPropertyValue("CommandURL", ("slot:5401"));
+                xMenuEntry.setPropertyValue("HelpURL", ("5401"));
+
                 // insert menu entry to sub menu
-                xSubMenuContainer.insertByIndex ( 0, (Object)xMenuEntry );
-                
+                xSubMenuContainer.insertByIndex(0, (Object) xMenuEntry);
+
                 // intialize help/help agent
                 // entry "Help Agent"
-                xMenuEntry = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface(
-                    com.sun.star.beans.XPropertySet.class,
-                    xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" ));
-                xMenuEntry.setPropertyValue( "Text", new String( "Help Agent" ));
-                xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5962" ));
-                xMenuEntry.setPropertyValue( "HelpURL", new String( "5962" ));
-                
+                xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
+                xMenuEntry.setPropertyValue("Text", ("Help Agent"));
+                xMenuEntry.setPropertyValue("CommandURL", ("slot:5962"));
+                xMenuEntry.setPropertyValue("HelpURL", ("5962"));
+
                 // insert menu entry to sub menu
-                xSubMenuContainer.insertByIndex( 1, (Object)xMenuEntry );
+                xSubMenuContainer.insertByIndex(1, (Object) xMenuEntry);
                 // intialize help/tips
                 // entry "Tips"
-                xMenuEntry = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface(
-                    com.sun.star.beans.XPropertySet.class,
-                    xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" ));
-                xMenuEntry.setPropertyValue( "Text", new String( "Tips" ));
-                xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5404" ));
-                xMenuEntry.setPropertyValue( "HelpURL", new String( "5404" ));
+                xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger"));
+                xMenuEntry.setPropertyValue("Text", ("Tips"));
+                xMenuEntry.setPropertyValue("CommandURL", ("slot:5404"));
+                xMenuEntry.setPropertyValue("HelpURL", ("5404"));
 
                 // insert menu entry to sub menu
-                xSubMenuContainer.insertByIndex ( 2, (Object)xMenuEntry );
-                
+                xSubMenuContainer.insertByIndex(2, (Object) xMenuEntry);
+
                 // add separator into the given context menu
-                xContextMenu.insertByIndex ( 0, (Object)xSeparator );
-                
+                xContextMenu.insertByIndex(0, (Object) xSeparator);
+
                 // add new sub menu into the given context menu
-                xContextMenu.insertByIndex ( 0, (Object)xRootMenuEntry );
-                
+                xContextMenu.insertByIndex(0, (Object) xRootMenuEntry);
+
                 // The controller should execute the modified context menu and stop notifying other
                 // interceptors.
-                return com.sun.star.ui.ContextMenuInterceptorAction.EXECUTE_MODIFIED ;
+                return com.sun.star.ui.ContextMenuInterceptorAction.EXECUTE_MODIFIED;
             }
         }
-        catch ( com.sun.star.beans.UnknownPropertyException ex ) 
+        catch (com.sun.star.beans.UnknownPropertyException ex)
         {
             // do something useful
             // we used a unknown property
         }
-        catch ( com.sun.star.lang.IndexOutOfBoundsException ex ) 
+        catch (com.sun.star.lang.IndexOutOfBoundsException ex)
         {
             // do something useful
             // we used an invalid index for accessing a container
         }
-        catch ( com.sun.star.uno.Exception ex ) 
+        catch (com.sun.star.uno.Exception ex)
         {
             // something strange has happend!
         }
-        catch ( java.lang.Throwable ex ) 
+        catch (java.lang.Throwable ex)
         {
-            // catch java exceptions � do something useful
+            // catch java exceptions do something useful
         }
-        
+
         return com.sun.star.ui.ContextMenuInterceptorAction.IGNORED;
     }
 }
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
deleted file mode 100644
index f8dcaf26d2..0000000000
--- a/framework/qa/complex/contextMenuInterceptor/makefile.mk
+++ /dev/null
@@ -1,77 +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 = ..$/..$/..
-TARGET  = ContextMenuInterceptor
-PRJNAME = framework
-PACKAGE = contextMenuInterceptor
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = ContextMenuInterceptor.java CheckContextMenuInterceptor.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand \
-            "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) -tdoc \\margritte\qaapi\workspace\qadev\testdocs $(CT_PACKAGE).CheckContextMenuInterceptor
diff --git a/framework/qa/complex/contextMenuInterceptor/space-metal.jpg b/framework/qa/complex/contextMenuInterceptor/space-metal.jpg
new file mode 100755
index 0000000000..d233443890
--- /dev/null
+++ b/framework/qa/complex/contextMenuInterceptor/space-metal.jpg
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index f63c2adef2..b5c0a73595 100755
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -27,51 +27,46 @@
 package complex.desktop;
 
 
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.Any;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XComponent;
 import com.sun.star.frame.XDesktop;
-import com.sun.star.frame.XFramesSupplier;
-import com.sun.star.frame.XFrames;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.awt.Rectangle;
-import com.sun.star.util.XCloseable;
-import helper.ConfigurationRead;
-import complexlib.ComplexTestCase;
 import helper.OfficeProvider;
 //import complex.persistent_window_states.helper.DocumentHandle;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 /**
  * Parameters:
  * <ul>
  *   <li>NoOffice=yes - StarOffice is not started initially.</li>
  * </ul>
  */
-public class DesktopTerminate extends ComplexTestCase {
+public class DesktopTerminate
+{
 
     private XMultiServiceFactory xMSF;
-    private OfficeProvider oProvider;
-    private int iOfficeCloseTime = 0;
-
+    private int iOfficeCloseTime = 1000;
+    
     /**
      * A frunction to tell the framework, which test functions are available.
      * Right now, it's only 'checkPersistentWindowState'.
      * @return All test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkPersistentWindowState"};
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "checkPersistentWindowState"
+//                };
+//    }
 
     /**
      * Test if all available document types change the
@@ -94,65 +89,107 @@ public class DesktopTerminate extends ComplexTestCase {
      *   - close office
      * - Test finished
      */
-    public void checkPersistentWindowState()
+    @Test public void checkPersistentWindowState()
     {
-        try {
-
-            log.println("Connect the first time.");
-            log.println("AppExecCommand: " + (String)param.get("AppExecutionCommand"));
-            log.println("ConnString: " + (String)param.get("ConnectionString"));
-            oProvider = new OfficeProvider();
-            iOfficeCloseTime = param.getInt("OfficeCloseTime");
-            if ( iOfficeCloseTime == 0 ) {
-                iOfficeCloseTime = 1000;
+        try
+        {
+
+            System.out.println("Connect the first time.");
+//            System.out.println("AppExecCommand: " + (String) param.get("AppExecutionCommand"));
+//            System.out.println("ConnString: " + (String) param.get("ConnectionString"));
+//            oProvider = new OfficeProvider();
+//            iOfficeCloseTime = param.getInt("OfficeCloseTime");
+//            if (iOfficeCloseTime == 0)
+//            {
+//                iOfficeCloseTime = 1000;
+//            }
+
+            if (!connect())
+            {
+                return;
+            }
+
+            if (!disconnect())
+            {
+                return;
             }
-    
-            if (!connect()) return;
-    
-            if (!disconnect()) return;
         }
-        catch(Exception e) {
+        catch (Exception e)
+        {
             e.printStackTrace();
         }
     }
 
-    private boolean connect() {
-        try {
-            xMSF = (XMultiServiceFactory)oProvider.getManager(param);
-            try {
+    private boolean connect()
+    {
+        try
+        {
+            xMSF = getMSF();
+            try
+            {
                 Thread.sleep(10000);
             }
-            catch(java.lang.InterruptedException e) {}
+            catch (java.lang.InterruptedException e)
+            {
+            }
         }
-        catch (java.lang.Exception e) {
-            log.println(e.getClass().getName());
-            log.println("Message: " + e.getMessage());
-            failed("Cannot connect the Office.");
+        catch (java.lang.Exception e)
+        {
+            System.out.println(e.getClass().getName());
+            System.out.println("Message: " + e.getMessage());
+            fail("Cannot connect the Office.");
             return false;
         }
         return true;
     }
 
-    private boolean disconnect() {
-        try {
+    private boolean disconnect()
+    {
+        try
+        {
             XDesktop desk = null;
-            desk = (XDesktop) UnoRuntime.queryInterface(
-                    XDesktop.class, xMSF.createInstance(
-                    "com.sun.star.frame.Desktop"));
+            desk = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
             desk.terminate();
-            log.println("Waiting " + iOfficeCloseTime + " milliseconds for the Office to close down");
-            try {
+            System.out.println("Waiting " + iOfficeCloseTime + " milliseconds for the Office to close down");
+            try
+            {
                 Thread.sleep(iOfficeCloseTime);
             }
-            catch(java.lang.InterruptedException e) {}
+            catch (java.lang.InterruptedException e)
+            {
+            }
             xMSF = null;
         }
-        catch (java.lang.Exception e) {
+        catch (java.lang.Exception e)
+        {
             e.printStackTrace();
-            failed("Cannot dispose the Office.");
+            fail("Cannot dispose the Office.");
             return false;
         }
         return true;
     }
 
+    
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        // don't do a tearDown here, desktop is already terminated.
+        // connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
deleted file mode 100755
index 3ad4801eb0..0000000000
--- a/framework/qa/complex/desktop/makefile.mk
+++ /dev/null
@@ -1,79 +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 = ..$/..$/..
-TARGET  = DesktopTerminate
-PRJNAME = $(TARGET)
-PACKAGE = complex$/desktop
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
-JAVAFILES       = DesktopTerminate.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) -NoOffice yes $(CT_TESTBASE) $(CT_TEST)
-
diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index c4eec8f946..f7edf93cf7 100644..100755
--- a/framework/qa/complex/dispatches/helper/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -32,19 +32,18 @@ package complex.dispatches;
 import com.sun.star.beans.PropertyValue;
 
 // exceptions
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.RuntimeException;
-
-// interfaces
-import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.frame.DispatchDescriptor;
 import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XDispatchProviderInterceptor;
-import com.sun.star.frame.XDispatchProviderInterception;
 import com.sun.star.frame.XInterceptorInfo;
+import com.sun.star.frame.XStatusListener;
+
+// interfaces
+
 
 // helper
-import com.sun.star.uno.UnoRuntime;
-import share.LogWriter;
+import com.sun.star.util.URL;
 
 // others
 //import java.lang.*;
@@ -54,10 +53,10 @@ import share.LogWriter;
 /**
  * implements a configurable interceptor for dispatch events.
  */
-public class Interceptor implements com.sun.star.frame.XDispatchProvider,
-                                    com.sun.star.frame.XDispatch,
-                                    com.sun.star.frame.XDispatchProviderInterceptor,
-                                    com.sun.star.frame.XInterceptorInfo
+public class Interceptor implements XDispatchProvider,
+                                    XDispatch,
+                                    XDispatchProviderInterceptor,
+                                    XInterceptorInfo
 {
     // ____________________
 
@@ -88,8 +87,8 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
         The slave can be used inside queryDispatch() to forward requests,
         which are not handled by this interceptor instance.
      */
-    private com.sun.star.frame.XDispatchProvider m_xSlave  = null;
-    private com.sun.star.frame.XDispatchProvider m_xMaster = null;
+    private XDispatchProvider m_xSlave  = null;
+    private XDispatchProvider m_xMaster = null;
 
     // ____________________
 
@@ -107,20 +106,14 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
      */
     private boolean m_bIsRegistered = false;
 
-    // ____________________
-
-    /** used for log output.
-     */
-    private LogWriter m_aLog;
 
     // ____________________
 
     /** ctor
      *  It's initialize an object of this class with default values.
      */
-    public Interceptor(LogWriter aLog)
+    public Interceptor()
     {
-        m_aLog = aLog;
     }
 
     // ____________________
@@ -134,27 +127,27 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized com.sun.star.frame.XDispatchProvider getSlaveDispatchProvider()
+    public synchronized XDispatchProvider getSlaveDispatchProvider()
     {
-        m_aLog.println("Interceptor.getSlaveDispatchProvider() called");
+        System.out.println("Interceptor.getSlaveDispatchProvider() called");
         return m_xSlave;
     }
 
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized com.sun.star.frame.XDispatchProvider getMasterDispatchProvider()
+    public synchronized XDispatchProvider getMasterDispatchProvider()
     {
-        m_aLog.println("Interceptor.getMasterDispatchProvider() called");
+        System.out.println("Interceptor.getMasterDispatchProvider() called");
         return m_xMaster;
     }
 
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized void setSlaveDispatchProvider(com.sun.star.frame.XDispatchProvider xSlave)
+    public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave)
     {
-        m_aLog.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called");
+        System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called");
 
         if (xSlave != null)
         {
@@ -162,7 +155,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
             m_bIsRegistered = true;
         }
         else
+        {
             m_bIsRegistered = false;
+        }
 
         m_xSlave = xSlave;
     }
@@ -170,9 +165,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
     // ____________________
 
     /** XDispatchProviderInterceptor */
-    public synchronized void setMasterDispatchProvider(com.sun.star.frame.XDispatchProvider xMaster)
+    public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster)
     {
-        m_aLog.println("Interceptor.setMasterDispatchProvider("+xMaster+") called");
+        System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called");
         m_xMaster = xMaster;
     }
 
@@ -180,25 +175,25 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatchProvider
      */
-    public synchronized com.sun.star.frame.XDispatch queryDispatch(com.sun.star.util.URL aURL            ,
+    public synchronized XDispatch queryDispatch(URL aURL            ,
                                                                    String                sTargetFrameName,
                                                                    int                   nSearchFlags    )
     {
-        m_aLog.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called");
+        System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called");
 
         if (impl_isBlockedURL(aURL.Complete))
         {
-            m_aLog.println("Interceptor.queryDispatch(): URL blocked => returns NULL");
+            System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL");
             return null;
         }
 
         if (m_xSlave != null)
         {
-            m_aLog.println("Interceptor.queryDispatch(): ask slave ...");
+            System.out.println("Interceptor.queryDispatch(): ask slave ...");
             return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags);
         }
 
-        m_aLog.println("Interceptor.queryDispatch(): no idea => returns this");
+        System.out.println("Interceptor.queryDispatch(): no idea => returns this");
         return this;
     }
 
@@ -206,12 +201,12 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatchProvider
      */
-    public com.sun.star.frame.XDispatch[] queryDispatches(com.sun.star.frame.DispatchDescriptor[] lRequests)
+    public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests)
     {
         int i = 0;
         int c = lRequests.length;
 
-        com.sun.star.frame.XDispatch[] lResults = new com.sun.star.frame.XDispatch[c];
+        XDispatch[] lResults = new XDispatch[c];
         for (i=0; i<c; ++i)
         {
             lResults[i] = queryDispatch(lRequests[i].FeatureURL ,
@@ -226,30 +221,30 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
 
     /** XDispatch
      */
-    public synchronized void dispatch(com.sun.star.util.URL              aURL      ,
-                                      com.sun.star.beans.PropertyValue[] lArguments)
+    public synchronized void dispatch(URL              aURL      ,
+                                      PropertyValue[] lArguments)
     {
-        m_aLog.println("Interceptor.dispatch('"+aURL.Complete+"') called");
+        System.out.println("Interceptor.dispatch('"+aURL.Complete+"') called");
     }
 
     // ____________________
 
     /** XDispatch
      */
-    public synchronized void addStatusListener(com.sun.star.frame.XStatusListener xListener,
+    public synchronized void addStatusListener(XStatusListener xListener,
                                                com.sun.star.util.URL              aURL     )
     {
-        m_aLog.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called");
+        System.out.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called");
     }
 
     // ____________________
 
     /** XDispatch
      */
-    public synchronized void removeStatusListener(com.sun.star.frame.XStatusListener xListener,
+    public synchronized void removeStatusListener(XStatusListener xListener,
                                                   com.sun.star.util.URL              aURL     )
     {
-        m_aLog.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called");
+        System.out.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called");
     }
 
     // ____________________
@@ -332,7 +327,9 @@ public class Interceptor implements com.sun.star.frame.XDispatchProvider,
         for (i=0; i<c; ++i)
         {
             if (impl_match(sURL, lBlockedURLs[i]))
+            {
                 return true;
+            }
         }
 
         return false;
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index ef612c8cc1..0084739f1b 100644..100755
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -24,110 +24,119 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package complex.dispatches;
 
-import com.sun.star.frame.*;
-import com.sun.star.lang.*;
-import com.sun.star.util.*;
-import com.sun.star.beans.*;
-import com.sun.star.uno.*;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.DispatchInformation;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XDispatchInformationProvider;
+import com.sun.star.frame.XDispatchProviderInterception;
+import com.sun.star.frame.XDispatchProviderInterceptor;
+import com.sun.star.frame.XFrame;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XCloseable;
+import complex.dispatches.Interceptor;
+import java.util.HashMap;
+
+
 
-import java.util.*;
 
-import complexlib.ComplexTestCase;
 
-import helper.*;
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 //-----------------------------------------------
 /** @short  Check the interface XDispatchInformationProvider
 
-    @descr  Because there exists more then one implementation of a dispatch
-            object, we have to test all these implementations ...
+@descr  Because there exists more then one implementation of a dispatch
+object, we have to test all these implementations ...
  */
-public class checkdispatchapi extends ComplexTestCase
+public class checkdispatchapi
 {
     //-------------------------------------------
     // some const
-    
+
     //-------------------------------------------
     // member
-    
-    /** points to the global uno service manager. */    
+    /** points to the global uno service manager. */
     private XMultiServiceFactory m_xMSF = null;
     private connectivity.tools.HsqlDatabase db;
-    
     /** can be used to create new test frames. */
     private XFrame m_xDesktop = null;
-
     /** provides XDispatchInformationProvider interface. */
     private XFrame m_xFrame = null;
 
     //-------------------------------------------
     // test environment
-    
     //-------------------------------------------
     /** @short  A function to tell the framework,
-                which test functions are available.
-                
-        @return All test methods.
-        @todo   Think about selection of tests from outside ...     
+    which test functions are available.
+
+    @return All test methods.
+    @todo   Think about selection of tests from outside ...
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-        {
-            "checkDispatchInfoOfWriter",
-            "checkDispatchInfoOfCalc",
-            "checkDispatchInfoOfDraw",
-            "checkDispatchInfoOfImpress",
-            "checkDispatchInfoOfMath",
-            "checkDispatchInfoOfChart",
-            "checkDispatchInfoOfBibliography",
-            "checkDispatchInfoOfQueryDesign",
-            "checkDispatchInfoOfTableDesign",
-            "checkDispatchInfoOfFormGridView",
-            "checkDispatchInfoOfDataSourceBrowser",
-            "checkDispatchInfoOfRelationDesign",
-            "checkDispatchInfoOfBasic",
-            "checkDispatchInfoOfStartModule",
-            "checkInterceptorLifeTime",
-            "checkInterception"
-        };
-    }
-    
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "checkDispatchInfoOfWriter",
+//                    "checkDispatchInfoOfCalc",
+//                    "checkDispatchInfoOfDraw",
+//                    "checkDispatchInfoOfImpress",
+//                    "checkDispatchInfoOfMath",
+//                    "checkDispatchInfoOfChart",
+//                    "checkDispatchInfoOfBibliography",
+//                    "checkDispatchInfoOfQueryDesign",
+//                    "checkDispatchInfoOfTableDesign",
+//                    "checkDispatchInfoOfFormGridView",
+//                    "checkDispatchInfoOfDataSourceBrowser",
+//                    "checkDispatchInfoOfRelationDesign",
+//                    "checkDispatchInfoOfBasic",
+//                    "checkDispatchInfoOfStartModule",
+//                    "checkInterceptorLifeTime",
+//                    "checkInterception"
+//                };
+//    }
+
     //-------------------------------------------
     /** @short  Create the environment for following tests.
 
-        @descr  create an empty test frame, where we can load
-                different components inside.
+    @descr  create an empty test frame, where we can load
+    different components inside.
      */
-    public void before()
+    @Before public void before()
     {
         try
         {
             // get uno service manager from global test environment
-            m_xMSF = (XMultiServiceFactory)param.getMSF();
+            m_xMSF = getMSF();
 
             db = new connectivity.tools.HsqlDatabase(m_xMSF);
 
             // create desktop
-            m_xDesktop = (XFrame)UnoRuntime.queryInterface(
-                                XFrame.class,
-                                m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+            m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
 
             m_xFrame = impl_createNewFrame();
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Cant initialize test environment.");
+            fail("Cant initialize test environment.");
         }
     }
 
     //-------------------------------------------
     /** @short  close the environment.
      */
-    public void after()
+    @After public void after()
     {
         db.close();
         impl_closeFrame(m_xFrame);
@@ -135,109 +144,115 @@ public class checkdispatchapi extends ComplexTestCase
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfWriter()
+    @Test public void checkDispatchInfoOfWriter()
     {
         impl_checkDispatchInfoOfXXX("private:factory/swriter");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfCalc()
+    @Test public void checkDispatchInfoOfCalc()
     {
         impl_checkDispatchInfoOfXXX("private:factory/scalc");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDraw()
+    @Test public void checkDispatchInfoOfDraw()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdraw");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfImpress()
+    @Test public void checkDispatchInfoOfImpress()
     {
         impl_checkDispatchInfoOfXXX("private:factory/simpress");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfChart()
+    @Test public void checkDispatchInfoOfChart()
     {
         impl_checkDispatchInfoOfXXX("private:factory/schart");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfMath()
+    @Test public void checkDispatchInfoOfMath()
     {
         impl_checkDispatchInfoOfXXX("private:factory/smath");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDataBase()
+    @Test public void checkDispatchInfoOfDataBase()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdatabase");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfBibliography()
+    @Test public void checkDispatchInfoOfBibliography()
     {
         impl_checkDispatchInfoOfXXX(".component:Bibliography/View1");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfQueryDesign()
+    @Test public void checkDispatchInfoOfQueryDesign()
     {
         callDatabaseDispatch(".component:DB/QueryDesign");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfTableDesign()
+    @Test public void checkDispatchInfoOfTableDesign()
     {
         callDatabaseDispatch(".component:DB/TableDesign");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfFormGridView()
+    @Test public void checkDispatchInfoOfFormGridView()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/FormGridView");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfDataSourceBrowser()
+    @Test public void checkDispatchInfoOfDataSourceBrowser()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/DataSourceBrowser");
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfRelationDesign()
+    @Test public void checkDispatchInfoOfRelationDesign()
     {
         callDatabaseDispatch(".component:DB/RelationDesign");
     }
     //-------------------------------------------
+
     private void callDatabaseDispatch(String url)
     {
         try
         {
             final PropertyValue args = new PropertyValue();
             args.Name = "ActiveConnection";
-            args.Value = (Object)db.defaultConnection();
+            args.Value = (Object) db.defaultConnection();
 
             XFrame xFrame = impl_createNewFrame();
 
-            impl_loadIntoFrame(xFrame, url, new PropertyValue[] { args });
+            impl_loadIntoFrame(xFrame, url, new PropertyValue[]
+                    {
+                        args
+                    });
             impl_checkDispatchInfo(xFrame);
             impl_closeFrame(xFrame);
-         } catch(java.lang.Exception e ) {
-         }
+        }
+        catch (java.lang.Exception e)
+        {
+        }
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfBasic()
+    @Test public void checkDispatchInfoOfBasic()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.script.BasicIDE");
         impl_checkDispatchInfo(aComponent);
     }
 
     //-------------------------------------------
-    public void checkDispatchInfoOfStartModule()
+    @Test public void checkDispatchInfoOfStartModule()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.frame.StartModule");
         impl_checkDispatchInfo(aComponent);
@@ -250,60 +265,56 @@ public class checkdispatchapi extends ComplexTestCase
         // xInterceptor. Otherwhise we cant check some internal states of aInterceptor at the end of this method, because
         // it was already killed .-)
 
-        Interceptor aInterceptor = new Interceptor(log);
-        com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterceptor.class,
-                                                                                aInterceptor);
+        Interceptor aInterceptor = new Interceptor();
+        XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor);
 
-        com.sun.star.frame.XFrame xFrame = impl_createNewFrame();
-        com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterception.class,
-                                                                                xFrame);
+        XFrame xFrame = impl_createNewFrame();
+        XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame);
 
         xInterception.registerDispatchProviderInterceptor(xInterceptor);
         impl_closeFrame(xFrame);
 
-        int     nRegCount     = aInterceptor.getRegistrationCount();
+        int nRegCount = aInterceptor.getRegistrationCount();
         boolean bIsRegistered = aInterceptor.isRegistered();
 
-        log.println("registration count = "+nRegCount    );
-        log.println("is registered ?    = "+bIsRegistered);
+        System.out.println("registration count = " + nRegCount);
+        System.out.println("is registered ?    = " + bIsRegistered);
 
         if (nRegCount < 1)
-            failed("Interceptor was never registered.");
+        {
+            fail("Interceptor was never registered.");
+        }
 
         if (bIsRegistered)
-            failed("Interceptor was not deregistered automaticly on closing the corresponding frame.");
+        {
+            fail("Interceptor was not deregistered automaticly on closing the corresponding frame.");
+        }
 
-        log.println("Destruction of interception chain works as designed .-)");
+        System.out.println("Destruction of interception chain works as designed .-)");
     }
 
     //-------------------------------------------
     public void checkInterception()
     {
-        String [] lDisabledURLs    = new String [1];
-                  lDisabledURLs[0] = ".uno:Open";
-    
-        log.println("create and initialize interceptor ...");
-        Interceptor aInterceptor = new Interceptor(log);
+        String[] lDisabledURLs = new String[1];
+        lDisabledURLs[0] = ".uno:Open";
+
+        System.out.println("create and initialize interceptor ...");
+        Interceptor aInterceptor = new Interceptor();
         aInterceptor.setURLs4URLs4Blocking(lDisabledURLs);
-    
-        com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterceptor.class,
-                                                                                aInterceptor);
 
-        log.println("create and initialize frame ...");
-        com.sun.star.frame.XFrame xFrame = impl_createNewFrame();
+        XDispatchProviderInterceptor xInterceptor = UnoRuntime.queryInterface(XDispatchProviderInterceptor.class, aInterceptor);
+
+        System.out.println("create and initialize frame ...");
+        XFrame xFrame = impl_createNewFrame();
         impl_loadIntoFrame(xFrame, "private:factory/swriter", null);
-                                                                                
-        com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
-                                                                                com.sun.star.frame.XDispatchProviderInterception.class,
-                                                                                xFrame);
 
-        log.println("register interceptor ...");
+        XDispatchProviderInterception xInterception = UnoRuntime.queryInterface(XDispatchProviderInterception.class, xFrame);
+
+        System.out.println("register interceptor ...");
         xInterception.registerDispatchProviderInterceptor(xInterceptor);
-                                                                                
-        log.println("deregister interceptor ...");
+
+        System.out.println("deregister interceptor ...");
         xInterception.releaseDispatchProviderInterceptor(xInterceptor);
     }
 
@@ -311,7 +322,7 @@ public class checkdispatchapi extends ComplexTestCase
     private void impl_checkDispatchInfoOfXXX(String sXXX)
     {
         XFrame xFrame = impl_createNewFrame();
-        impl_loadIntoFrame(xFrame, sXXX,null);
+        impl_loadIntoFrame(xFrame, sXXX, null);
         impl_checkDispatchInfo(xFrame);
         impl_closeFrame(xFrame);
     }
@@ -319,26 +330,28 @@ public class checkdispatchapi extends ComplexTestCase
     //-------------------------------------------
     /** @short  load an URL into the current test frame.
      */
-    private void impl_loadIntoFrame(XFrame xFrame, String sURL,PropertyValue args[])
+    private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[])
     {
-        XComponentLoader xLoader = (XComponentLoader)UnoRuntime.queryInterface(
-                                        XComponentLoader.class,
-                                        xFrame);
+        XComponentLoader xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame);
         if (xLoader == null)
-            failed("Frame does not provide required interface XComponentLoader.");
+        {
+            fail("Frame does not provide required interface XComponentLoader.");
+        }
 
         XComponent xDoc = null;
         try
         {
             xDoc = xLoader.loadComponentFromURL(sURL, "_self", 0, args);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
             xDoc = null;
         }
 
         if (xDoc == null)
-            failed("Could not load \""+sURL+"\".");
+        {
+            fail("Could not load \"" + sURL + "\".");
+        }
     }
 
     //-------------------------------------------
@@ -351,112 +364,135 @@ public class checkdispatchapi extends ComplexTestCase
         {
             aComponent = m_xMSF.createInstance(sName);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
             aComponent = null;
         }
 
         if (aComponent == null)
-            failed("Could not create UNO component \""+sName+"\".");
+        {
+            fail("Could not create UNO component \"" + sName + "\".");
+        }
         return aComponent;
     }
 
     //-------------------------------------------
     /** @short  check the interface XDispatchInformationProvider
-                at the specified component.
+    at the specified component.
      */
     private void impl_checkDispatchInfo(Object aComponent)
     {
-        XDispatchInformationProvider xInfoProvider = (XDispatchInformationProvider)UnoRuntime.queryInterface(
-                                                        XDispatchInformationProvider.class,
-                                                        aComponent);
+        XDispatchInformationProvider xInfoProvider = UnoRuntime.queryInterface(XDispatchInformationProvider.class, aComponent);
         if (xInfoProvider == null)
         {
             // Warning
-            log.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider.");
+            System.out.println("Warning:\tComponent does not provide the [optional!] interface XDispatchInformationProvider.");
             return;
         }
 
         try
         {
             short[] lGroups = xInfoProvider.getSupportedCommandGroups();
-            int     c1      = lGroups.length;
-            int     i1      = 0;
-            for (i1=0; i1<c1; ++i1)
+            int c1 = lGroups.length;
+            int i1 = 0;
+            for (i1 = 0; i1 < c1; ++i1)
             {
-                short                 nGroup = lGroups[i1];
+                short nGroup = lGroups[i1];
                 DispatchInformation[] lInfos = xInfoProvider.getConfigurableDispatchInformation(nGroup);
-                int                   c2     = lInfos.length;
-                int                   i2     = 0;
+                int c2 = lInfos.length;
+                int i2 = 0;
 
                 // check for empty lists
                 // Warning
                 if (lInfos.length < 1)
-                    log.println("Warning:\tCould not get any DispatchInformation for group ["+nGroup+"].");
+                {
+                    System.out.println("Warning:\tCould not get any DispatchInformation for group [" + nGroup + "].");
+                }
 
                 // check for duplicates (and by the way, if the info item match the requested group)
                 HashMap aCheckMap = new HashMap(c2);
-                for (i2=0; i2<c2; ++i2)
+                for (i2 = 0; i2 < c2; ++i2)
                 {
                     DispatchInformation aInfo = lInfos[i2];
                     if (aInfo.GroupId != nGroup)
                     {
                         // Error
-                        failed("At least one DispatchInformation item does not match the requested group.\n\trequested group=["+nGroup+
-                               "] returned groupd=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test
+                        fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup
+                                + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
                         continue;
                     }
 
                     if (aCheckMap.containsKey(aInfo.Command))
                     {
                         // Error
-                        failed("Found a duplicate item: group=["+aInfo.GroupId+"] command=\""+aInfo.Command+"\"", true); // true => dont break this test
+                        fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test
                         continue;
                     }
 
                     aCheckMap.put(aInfo.Command, aInfo.Command);
-                    log.println("\t["+aInfo.GroupId+"] \""+aInfo.Command+"\"");
+                    System.out.println("\t[" + aInfo.GroupId + "] \"" + aInfo.Command + "\"");
                 }
             }
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Exception caught during using XDispatchInformationProvider.");
-            ex.printStackTrace();
+            fail("Exception caught during using XDispatchInformationProvider.");
+            // ex.printStackTrace();
         }
     }
 
     //-------------------------------------------
-    private synchronized com.sun.star.frame.XFrame impl_createNewFrame()
+    private synchronized XFrame impl_createNewFrame()
     {
-        com.sun.star.frame.XFrame xFrame = null;
+        XFrame xFrame = null;
 
         try
         {
             xFrame = m_xDesktop.findFrame("_blank", 0);
             xFrame.getContainerWindow().setVisible(true);
         }
-        catch(java.lang.Throwable ex)
+        catch (java.lang.Throwable ex)
         {
-            failed("Could not create the frame instance.");
+            fail("Could not create the frame instance.");
         }
 
         return xFrame;
-   }
+    }
 
     //-------------------------------------------
-    private synchronized void impl_closeFrame(com.sun.star.frame.XFrame xFrame)
+    private synchronized void impl_closeFrame(XFrame xFrame)
     {
-        com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface(
-                                                    com.sun.star.util.XCloseable.class,
-                                                    xFrame);
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
         try
         {
             xClose.close(false);
         }
-        catch(com.sun.star.util.CloseVetoException exVeto)
+        catch (com.sun.star.util.CloseVetoException exVeto)
         {
-            failed("Test frame couldn't be closed successfully.");
+            fail("Test frame couldn't be closed successfully.");
         }
     }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
deleted file mode 100644
index 87eba000cf..0000000000
--- a/framework/qa/complex/dispatches/makefile.mk
+++ /dev/null
@@ -1,92 +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 = ..$/..$/..
-TARGET  = checkdispatchapi
-PRJNAME = framework
-PACKAGE = complex$/dispatches
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar ConnectivityTools.jar
-JAVAFILES       = checkdispatchapi.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-SUBDIRS=helper
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-#   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-#   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-
-RUN: run
-
-run:
-   +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-
-
-
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index ec7a36d3ba..80d08b4126 100755
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -28,47 +28,91 @@ package complex.disposing;
 
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
 import com.sun.star.frame.XDesktop;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 /**
  * This test is for bug110698. The Office is closed and is continually connected
  * while it closes. This did let the Office freeze. Now when the Office is
  * closed, the connection is refused.
  */
-public class GetServiceWhileDisposingOffice extends ComplexTestCase {
+public class GetServiceWhileDisposingOffice
+{
 
-    public String[] getTestMethodNames() {
-        return new String[]{"checkServiceWhileDisposing"};
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//                {
+//                    "checkServiceWhileDisposing"
+//                };
+//    }
 
-    public void checkServiceWhileDisposing() {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF();
+    @Test public void checkServiceWhileDisposing()
+    {
+        XMultiServiceFactory xMSF = getMSF();
         XDesktop xDesktop = null;
 
-        try {
-            xDesktop = (XDesktop)UnoRuntime.queryInterface(XDesktop.class,
-                        xMSF.createInstance("com.sun.star.frame.Desktop"));
+        try
+        {
+            xDesktop = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
         }
-        catch(com.sun.star.uno.Exception e) {
-            failed("Could not create a desktop instance.");
+        catch (com.sun.star.uno.Exception e)
+        {
+            fail("Could not create a desktop instance.");
         }
         int step = 0;
-        try {
-            log.println("Start the termination of the Office.");
+        try
+        {
+            System.out.println("Start the termination of the Office.");
             xDesktop.terminate();
-            for ( ; step<10000; step++ ) {
+            for (; step < 10000; step++)
+            {
                 Object o = xMSF.createInstance("com.sun.star.frame.Desktop");
             }
         }
-        catch(com.sun.star.lang.DisposedException e) {
-            log.println("DisposedException in step: " + step);
-            e.printStackTrace();
+        catch (com.sun.star.lang.DisposedException e)
+        {
+            System.out.println("DisposedException in step: " + step);
         }
-        catch(Exception e) {
-            e.printStackTrace();
-            failed(e.getMessage());
+        catch (Exception e)
+        {
+            fail(e.getMessage());
         }
 
     }
+
+
+       private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        // Office is already terminated.
+        // connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk
deleted file mode 100755
index dac80c08af..0000000000
--- a/framework/qa/complex/disposing/makefile.mk
+++ /dev/null
@@ -1,76 +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 = ..$/..$/..
-TARGET  = GetServiceWhileDisposingOffice
-PRJNAME = $(TARGET)
-PACKAGE = complex$/disposing
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = $(TARGET).java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-
-run: RUN
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index a1bf20b466..95f1179b2e 100644..100755
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -27,24 +27,48 @@
 
 package complex.framework.autosave;
 
-import com.sun.star.frame.*;
-import com.sun.star.lang.*;
-import com.sun.star.util.*;
-import com.sun.star.beans.*;
-import com.sun.star.uno.*;
-import com.sun.star.sheet.*;
-import com.sun.star.table.*;
 
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.FeatureStateEvent;
+import com.sun.star.frame.XDispatch;
+import com.sun.star.frame.XDispatchProvider;
+import com.sun.star.frame.XModel;
+import com.sun.star.frame.XStatusListener;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sheet.FillDirection;
+import com.sun.star.sheet.XCellSeries;
+import com.sun.star.table.XCellRange;
+import com.sun.star.util.XCloseable;
+import com.sun.star.sheet.XSpreadsheet;
+import com.sun.star.sheet.XSpreadsheetDocument;
+import com.sun.star.sheet.XSpreadsheets;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+import com.sun.star.util.URL;
+import com.sun.star.util.XURLTransformer;
 import java.util.*;
+import util.utils;
+
 
-import complexlib.*;
-import helper.*;
-import util.*;
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import util.SOfficeFactory;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 //-----------------------------------------------
 /** @short  Check some use cases of the AutoSave feature
  */
-public class AutoSave extends ComplexTestCase
+public class AutoSave 
 {
     //-------------------------------------------
     class AutoSaveListener implements XStatusListener
@@ -64,9 +88,7 @@ public class AutoSave extends ComplexTestCase
             {
                 m_xAutoSave = xAutoSave;
 
-                XURLTransformer xParser = (XURLTransformer)UnoRuntime.queryInterface(
-                                                XURLTransformer.class,
-                                                xSMGR.createInstance("com.sun.star.util.URLTransformer"));
+                XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, xSMGR.createInstance("com.sun.star.util.URLTransformer"));
                 URL[] aURL = new URL[1];
                 aURL[0] = new URL();
                 aURL[0].Complete = "vnd.sun.star.autorecovery:/doAutoSave";
@@ -169,13 +191,13 @@ public class AutoSave extends ComplexTestCase
         @return All test methods.
         @todo   Think about selection of tests from outside ...
      */
-    public String[] getTestMethodNames()
-    {
-        return new String[]
-        {
-            "checkConcurrentAutoSaveToNormalUISave",
-        };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        return new String[]
+//        {
+//            "checkConcurrentAutoSaveToNormalUISave",
+//        };
+//    }
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
@@ -183,22 +205,20 @@ public class AutoSave extends ComplexTestCase
         @descr  create an empty test frame, where we can load
                 different components inside.
      */
-    public void before()
+    @Before public void before()
     {
         m_aLog = new Protocol(Protocol.MODE_HTML | Protocol.MODE_STDOUT, Protocol.FILTER_NONE, utils.getUsersTempDir() + "/complex_log_ascii_01.html");
 
         try
         {
             // get uno service manager from global test environment
-            m_xSMGR = (XMultiServiceFactory)param.getMSF();
+            m_xSMGR = getMSF();
 
             // get another helper to e.g. create test documents
             m_aSOF = SOfficeFactory.getFactory(m_xSMGR);
 
             // create AutoSave instance
-            m_xAutoSave = (XDispatch)UnoRuntime.queryInterface(
-                            XDispatch.class,
-                            m_xSMGR.createInstance("com.sun.star.comp.framework.AutoRecovery"));
+            m_xAutoSave = UnoRuntime.queryInterface(XDispatch.class, m_xSMGR.createInstance("com.sun.star.comp.framework.AutoRecovery"));
 
             // prepare AutoSave
             // make sure it will be started every 1 min
@@ -209,22 +229,20 @@ public class AutoSave extends ComplexTestCase
             aConfig = null;
 
             // is needed to parse dispatch commands
-            m_xURLParser = (XURLTransformer)UnoRuntime.queryInterface(
-                                            XURLTransformer.class,
-                                            m_xSMGR.createInstance("com.sun.star.util.URLTransformer"));
+            m_xURLParser = UnoRuntime.queryInterface(XURLTransformer.class, m_xSMGR.createInstance("com.sun.star.util.URLTransformer"));
 
         }
         catch(java.lang.Throwable ex)
         {
             m_aLog.log(ex);
-            failed("Couldn't create test environment");
+            fail("Couldn't create test environment");
         }
     }
 
     //-------------------------------------------
     /** @short  close the environment.
      */
-    public void after()
+    @After public void after()
     {
         // ???
     }
@@ -249,9 +267,7 @@ public class AutoSave extends ComplexTestCase
             xSheet.getCellByPosition(0, 1).setFormula("=a1+1");
             m_aLog.log("Retrieve big range.");
             XCellRange           xRange      = xSheet.getCellRangeByName("A1:Z9999");
-            XCellSeries          xSeries     = (XCellSeries)UnoRuntime.queryInterface(
-                                                     XCellSeries.class,
-                                                     xRange);
+            XCellSeries          xSeries     = UnoRuntime.queryInterface(XCellSeries.class, xRange);
             m_aLog.log("Duplicate cells from top to bottom inside range.");
             xSeries.fillAuto(FillDirection.TO_BOTTOM, 2);
             m_aLog.log("Duplicate cells from left to right inside range.");
@@ -281,12 +297,8 @@ public class AutoSave extends ComplexTestCase
             aURL[0].Complete = ".uno:SaveAs";
             m_xURLParser.parseStrict(aURL);
 
-            XModel xModel = (XModel)UnoRuntime.queryInterface(
-                                XModel.class,
-                                xDoc);
-            XDispatchProvider xProvider = (XDispatchProvider)UnoRuntime.queryInterface(
-                                                XDispatchProvider.class,
-                                                xModel.getCurrentController());
+            XModel xModel = UnoRuntime.queryInterface(XModel.class, xDoc);
+            XDispatchProvider xProvider = UnoRuntime.queryInterface(XDispatchProvider.class, xModel.getCurrentController());
             XDispatch xDispatch = xProvider.queryDispatch(aURL[0], "_self", 0);
 
             PropertyValue[] lArgs = new PropertyValue[3];
@@ -334,9 +346,7 @@ public class AutoSave extends ComplexTestCase
             {
                 try
                 {
-                    XCloseable xClose = (XCloseable)UnoRuntime.queryInterface(
-                                            XCloseable.class,
-                                            xDoc);
+                    XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
                     if (xClose != null)
                     {
                         xClose.close(false);
@@ -344,7 +354,9 @@ public class AutoSave extends ComplexTestCase
                         nRetry = 0;
                     }
                     else
+                    {
                         m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesnt provide needed interface!");
+                    }
                 }
                 catch(com.sun.star.util.CloseVetoException exVeto)
                 {
@@ -402,7 +414,7 @@ public class AutoSave extends ComplexTestCase
      *          from another thread. So these operations should be started at the same time.
      *          It should not crash. The AutoSave request must be postphoned.
      */
-    public void checkConcurrentAutoSaveToNormalUISave()
+    @Test public void checkConcurrentAutoSaveToNormalUISave()
     {
         m_aLog.log(Protocol.TYPE_TESTMARK , "AutoSave");
         m_aLog.log(Protocol.TYPE_SCOPE_OPEN, "checkConcurrentAutoSaveToNormalUISave()");
@@ -451,4 +463,27 @@ public class AutoSave extends ComplexTestCase
             closeDoc(xDoc);
         }
     }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java
index 3bc4683f4f..a7f5df8cc7 100644..100755
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
@@ -1,6 +1,5 @@
 package complex.framework.autosave;
 
-import java.lang.*;
 import com.sun.star.uno.*;
 import com.sun.star.lang.*;
 import com.sun.star.container.*;
@@ -20,9 +19,7 @@ class ConfigHelper
     {
         m_xSMGR = xSMGR;
 
-        XMultiServiceFactory xConfigRoot = (XMultiServiceFactory)UnoRuntime.queryInterface(
-                                                XMultiServiceFactory.class,
-                                                m_xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider"));
+        XMultiServiceFactory xConfigRoot = UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xSMGR.createInstance("com.sun.star.configuration.ConfigurationProvider"));
 
         PropertyValue[] lParams = new PropertyValue[1];
         lParams[0] = new PropertyValue();
@@ -31,20 +28,20 @@ class ConfigHelper
 
         Object aConfig;
         if (bReadOnly)
-            aConfig = xConfigRoot.createInstanceWithArguments(
-                            "com.sun.star.configuration.ConfigurationAccess",
-                            lParams);
+        {
+            aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess", lParams);
+        }
         else
-            aConfig = xConfigRoot.createInstanceWithArguments(
-                            "com.sun.star.configuration.ConfigurationUpdateAccess",
-                            lParams);
+        {
+            aConfig = xConfigRoot.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", lParams);
+        }
 
-        m_xConfig = (XHierarchicalNameAccess)UnoRuntime.queryInterface(
-                            XHierarchicalNameAccess.class,
-                            aConfig);
+        m_xConfig = UnoRuntime.queryInterface(XHierarchicalNameAccess.class, aConfig);
 
         if (m_xConfig == null)
-            throw new com.sun.star.uno.Exception("Could not open configuration \""+sConfigPath+"\"");
+        {
+            throw new com.sun.star.uno.Exception("Could not open configuration \"" + sConfigPath + "\"");
+        }
     }
 
     //-----------------------------------------------
@@ -54,9 +51,7 @@ class ConfigHelper
     {
         try
         {
-            XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface(
-                                    XPropertySet.class,
-                                    m_xConfig.getByHierarchicalName(sRelPath));
+            XPropertySet xPath = UnoRuntime.queryInterface(XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath));
             return xPath.getPropertyValue(sKey);
         }
         catch(com.sun.star.uno.Exception ex)
@@ -73,9 +68,7 @@ class ConfigHelper
     {
         try
         {
-            XPropertySet xPath = (XPropertySet)UnoRuntime.queryInterface(
-                                    XPropertySet.class,
-                                    m_xConfig.getByHierarchicalName(sRelPath));
+            XPropertySet xPath = UnoRuntime.queryInterface(XPropertySet.class, m_xConfig.getByHierarchicalName(sRelPath));
             xPath.setPropertyValue(sKey, aValue);
         }
         catch(com.sun.star.uno.Exception ex)
@@ -89,9 +82,7 @@ class ConfigHelper
     {
         try
         {
-            XChangesBatch xBatch = (XChangesBatch)UnoRuntime.queryInterface(
-                                        XChangesBatch.class,
-                                        m_xConfig);
+            XChangesBatch xBatch = UnoRuntime.queryInterface(XChangesBatch.class, m_xConfig);
             xBatch.commitChanges();
         }
         catch(com.sun.star.uno.Exception ex)
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 87617a5817..87617a5817 100644..100755
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk
deleted file mode 100644
index e903c9ad5f..0000000000
--- a/framework/qa/complex/framework/autosave/makefile.mk
+++ /dev/null
@@ -1,89 +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 = ..$/..$/..$/..
-TARGET  = AutoSave
-PRJNAME = framework
-PACKAGE = complex$/framework$/autosave
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar
-JAVAFILES       = AutoSave.java ConfigHelper.java Protocol.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-#$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-#   cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-#   jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-
-
-
diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java
index a439834daf..a439834daf 100644..100755
--- a/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/framework/qa/complex/framework/recovery/CrashThread.java
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index c9057c85b8..c9057c85b8 100644..100755
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index fb3cd6ee3f..5cd0597ca3 100644..100755
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -84,6 +84,16 @@ import util.SOfficeFactory;
 import util.UITools;
 import util.utils;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 public class RecoveryTest extends ComplexTestCase {
     
     static XMultiServiceFactory xMSF;
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 5ddaff8cdb..5ddaff8cdb 100644..100755
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
diff --git a/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java
index da3f418c65..da3f418c65 100644..100755
--- a/framework/qa/complex/framework/recovery/TimeoutThread.java
+++ b/framework/qa/complex/framework/recovery/TimeoutThread.java
diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
deleted file mode 100755
index 34155753e8..0000000000
--- a/framework/qa/complex/framework/recovery/makefile.mk
+++ /dev/null
@@ -1,96 +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 = ..$/..$/..$/..
-TARGET  = RecoveryTest
-PRJNAME = framework
-PACKAGE = complex$/framework$/recovery
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES      = RecoveryTest.java RecoveryTools.java CrashThread.java TimeoutThread.java KlickButtonThread.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-#------ some information how to run the test -----------------------
-
-MYTAR: ALLTAR
-    @echo 
-    @echo ###########################   N O T E  ######################################
-    @echo 
-    @echo To run the test successfully you have to extend your LD_LIBRARY_PATH
-    @echo to your office program directory!
-    @echo Example:
-    @echo setenv LD_LIBRARY_PATH /myOffice/program:\$$LD_LIBRARY_PATH
-    @echo
-    @echo To run the you have to use the parameter cmd:
-    @echo cmd="PATH_TO_OFFICE_BINARY -accept=socket,host=localhost,port=8100;urp;"
-    @echo 
-    @echo Example:
-    @echo dmake run cmd="/myOffice/program/soffice -accept=socket,host=localhost,port=8100;urp;"
-    @echo
-    
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(cmd)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -cmd "$(cmd)"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-CT_NOOFFICE = -NoOffice true
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_NOOFFICE) $(CT_PACKAGE).RecoveryTest
-
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 4dac998623..f2a6cb1f8b 100755
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -1,13 +1,5 @@
-package imageManager;
+package complex.imageManager;
 
-import imageManager.interfaces._XComponent;
-import imageManager.interfaces._XImageManager;
-import imageManager.interfaces._XInitialization;
-import imageManager.interfaces._XTypeProvider;
-import imageManager.interfaces._XUIConfiguration;
-import imageManager.interfaces._XUIConfigurationPersistence;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XMultiServiceFactory;
@@ -15,125 +7,135 @@ import com.sun.star.lang.XTypeProvider;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.ui.XImageManager;
-import complexlib.ComplexTestCase;
 import com.sun.star.ui.XModuleUIConfigurationManagerSupplier;
 import com.sun.star.ui.XUIConfiguration;
 import com.sun.star.ui.XUIConfigurationManager;
 import com.sun.star.ui.XUIConfigurationPersistence;
-import java.io.PrintWriter;
-import share.LogWriter;
+
+
+// ---------- junit imports -----------------
+import lib.TestParameters;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
 
 /**
  *
  */
-public class CheckImageManager extends ComplexTestCase {
+public class CheckImageManager  {
     boolean checkUIConfigManager = false;
     XMultiServiceFactory xMSF = null;
-    
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
+    /**
+     * The test parameters
+     */
+    private static TestParameters param = null;
+
+    @Before public void before()
+    {
+        xMSF = getMSF();
+        param = new TestParameters();
+        param.put("ServiceFactory", xMSF); // some qadevOOo functions need the ServiceFactory
     } 
     
-    public String[] getTestMethodNames() {
-        return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"};
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"};
+//    }
     
-    public void checkImageManagerFromModule() {
-        log.println(" **** ImageManager from ModuleUIConfigurationManager *** ");
+    @Test public void checkImageManagerFromModule()
+    {
+        System.out.println(" **** ImageManager from ModuleUIConfigurationManager *** ");
         XUIConfigurationManager xManager = null;
         try {
             Object o = (XInterface)xMSF.createInstance(
                     "com.sun.star.ui.ModuleUIConfigurationManagerSupplier");
             XModuleUIConfigurationManagerSupplier xMUICMS = 
-                    (XModuleUIConfigurationManagerSupplier)UnoRuntime.queryInterface(
-                    XModuleUIConfigurationManagerSupplier.class, o);
+                    UnoRuntime.queryInterface(XModuleUIConfigurationManagerSupplier.class, o);
             xManager = xMUICMS.getUIConfigurationManager(
                     "com.sun.star.text.TextDocument");
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace((PrintWriter)log);
-            failed("Exception. " + e.getMessage());
+            fail("Exception. " + e.getMessage());
         }
-        XImageManager xImageManager = (XImageManager)UnoRuntime.queryInterface(
-                XImageManager.class, xManager.getImageManager());
+        XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager());
         performChecks(xImageManager, "ModuleUIConfig", xManager);
     }
 
     public void checkImageManager() {
-        log.println(" **** ImageManager from UIConfigurationManager *** ");
+        System.out.println(" **** ImageManager from UIConfigurationManager *** ");
         XUIConfigurationManager xManager = null;
         try {
-            xManager = (XUIConfigurationManager)UnoRuntime.queryInterface(
-                    XUIConfigurationManager.class, xMSF.createInstance(
-                    "com.sun.star.comp.framework.UIConfigurationManager"));
+            xManager = UnoRuntime.queryInterface(XUIConfigurationManager.class, xMSF.createInstance("com.sun.star.comp.framework.UIConfigurationManager"));
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace((PrintWriter)log);
-            failed("Exception. " + e.getMessage());
+            fail("Exception. " + e.getMessage());
         }
 
-        XImageManager xImageManager = (XImageManager)UnoRuntime.queryInterface(
-                                XImageManager.class, xManager.getImageManager());
+        XImageManager xImageManager = UnoRuntime.queryInterface(XImageManager.class, xManager.getImageManager());
         performChecks(xImageManager, "UIConfig", xManager);
     }
     
     private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) {
         util.dbg.printInterfaces(xImageManager);
 
-        OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(log, xManager, xMSF);
+        OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(xManager, xMSF);
         param.put("XUIConfiguration.XUIConfigurationListenerImpl", configListener);
         
-        XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, xImageManager);
-        _XInitialization _xInit = new _XInitialization(log, param, xInit);
-        assure(testObjectName + "::XInitialization.initialize", _xInit._initialize(), true);
+        XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImageManager);
+        _XInitialization _xInit = new _XInitialization(param, xInit);
+        assertTrue(testObjectName + "::XInitialization.initialize", _xInit._initialize());
         
         // xImageManager is already there, just write a test ;-)
-        _XImageManager _xImage = new _XImageManager(log, param, xImageManager);
-        assure(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames(), true);
-        assure(testObjectName + "::XImageManager.getImages", _xImage._getImages(), true);
-        assure(testObjectName + "::XImageManager.hasImage", _xImage._hasImage(), true);
-        assure(testObjectName + "::XImageManager.insertImages", _xImage._insertImages(), true);
-        assure(testObjectName + "::XImageManager.removeImages", _xImage._removeImages(), true);
-        assure(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages(), true);
-        assure(testObjectName + "::XImageManager.reset", _xImage._reset(), true);
+        _XImageManager _xImage = new _XImageManager(param, xImageManager);
+        assertTrue(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames());
+        assertTrue(testObjectName + "::XImageManager.getImages", _xImage._getImages());
+        assertTrue(testObjectName + "::XImageManager.hasImage", _xImage._hasImage());
+        assertTrue(testObjectName + "::XImageManager.insertImages", _xImage._insertImages());
+        assertTrue(testObjectName + "::XImageManager.removeImages", _xImage._removeImages());
+        assertTrue(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages());
+        assertTrue(testObjectName + "::XImageManager.reset", _xImage._reset());
         
-        XTypeProvider xType = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xImageManager);
-        _XTypeProvider _xType = new _XTypeProvider(log,param,xType);
-        assure(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId(), true);
-        assure(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes(), true);
+        XTypeProvider xType = UnoRuntime.queryInterface(XTypeProvider.class, xImageManager);
+        _XTypeProvider _xType = new _XTypeProvider(param, xType);
+        assertTrue(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId());
+        assertTrue(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes());
         
-        XUIConfiguration xUIConfig = (XUIConfiguration)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager);
-        _XUIConfiguration _xUIConfig = new _XUIConfiguration(log,  param, xUIConfig);
+        XUIConfiguration xUIConfig = UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager);
+        _XUIConfiguration _xUIConfig = new _XUIConfiguration(param, xUIConfig);
         _xUIConfig.before();
-        assure(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener(), true);
-        assure(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener(), true);
+        assertTrue(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener());
+        assertTrue(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener());
         
         XUIConfigurationPersistence xUIConfigPersistence = (XUIConfigurationPersistence)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager);
-        _XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(log, param, xUIConfigPersistence);
+        _XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(param, xUIConfigPersistence);
         _xUIConfigPersistence.before();
-        assure(testObjectName + "::XUIConfigPersistence.isModified", _xUIConfigPersistence._isModified(), true);
-        assure(testObjectName + "::XUIConfigPersistence.isReadOnly", _xUIConfigPersistence._isReadOnly(), true);
-        assure(testObjectName + "::XUIConfigPersistence.reload", _xUIConfigPersistence._reload(), true);
-        assure(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store(), true);
-        assure(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage(), true);
+        assertTrue(testObjectName + "::XUIConfigPersistence.isModified", _xUIConfigPersistence._isModified());
+        // System.out.println(testObjectName + "::XUIConfigPersistence.isReadOnly "+ _xUIConfigPersistence._isReadOnly());
+        assertTrue(testObjectName + "::XUIConfigPersistence.isReadOnly", _xUIConfigPersistence._isReadOnly());
+        assertTrue(testObjectName + "::XUIConfigPersistence.reload", _xUIConfigPersistence._reload());
+        assertTrue(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store());
+        assertTrue(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage());
         
-        XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class, xImageManager);
-        _XComponent _xComp = new _XComponent(log, param, xComp);
+        XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xImageManager);
+        _XComponent _xComp = new _XComponent(param, xComp);
         _xComp.before();
-        assure(testObjectName + "::XComponent.addEventListener", _xComp._addEventListener(), true);
-        assure(testObjectName + "::XComponent.removeEventListener", _xComp._removeEventListener(), true);
-        assure(testObjectName + "::XComponent.dispose", _xComp._dispose(), true);
+        assertTrue(testObjectName + "::XComponent.addEventListener", _xComp._addEventListener());
+        assertTrue(testObjectName + "::XComponent.removeEventListener", _xComp._removeEventListener());
+        assertTrue(testObjectName + "::XComponent.dispose", _xComp._dispose());
     }
     
     
     class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl {
         private boolean triggered = false;
-        private LogWriter log = null;
         private XUIConfigurationManager xUIManager = null;
         private XMultiServiceFactory xMSF = null;
         
-        public OXUIConfigurationListenerImpl(LogWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
-            log = _log;
+        public OXUIConfigurationListenerImpl(XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) {
+
             this.xUIManager = xUIManager;
             this.xMSF = xMSF;
         }
@@ -167,23 +169,23 @@ public class CheckImageManager extends ComplexTestCase {
 
             }
             catch(com.sun.star.container.NoSuchElementException e) {
-                log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
+                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
                 e.printStackTrace((java.io.PrintWriter)log);
             }
             catch(com.sun.star.lang.IllegalArgumentException e) {
-                log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
+                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
                 e.printStackTrace((java.io.PrintWriter)log);
             }
             catch(com.sun.star.lang.IllegalAccessException e) {
-                log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
+                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
                 e.printStackTrace((java.io.PrintWriter)log);
             }
             catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-                log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
+                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
                 e.printStackTrace((java.io.PrintWriter)log);
             }
             catch(com.sun.star.lang.WrappedTargetException e) {
-                log.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
+                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
                 e.printStackTrace((java.io.PrintWriter)log);
             } */
         }
@@ -194,4 +196,28 @@ public class CheckImageManager extends ComplexTestCase {
         }
         
     }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index e86743c7b5..10545f6a27 100755
--- a/framework/qa/complex/imageManager/interfaces/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -25,11 +25,9 @@
  *
  ************************************************************************/
 
-package imageManager.interfaces;
+package complex.imageManager;
 
 import com.sun.star.container.XNameContainer;
-import share.LogWriter;
-
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XComponent;
@@ -54,7 +52,6 @@ public class _XComponent {
     private XNameContainer xContainer = null;
     private XComponent altDispose = null;
     TestParameters tEnv = null;
-    LogWriter log = null;
     boolean listenerDisposed[] = new boolean[2];
     String[] Loutput = new String[2];
 
@@ -78,8 +75,7 @@ public class _XComponent {
     XEventListener listener1 = new MyEventListener(0, "EV1");
     XEventListener listener2 = new MyEventListener(1, "EV2");
 
-    public _XComponent(LogWriter log, TestParameters tEnv, XComponent oObj) {
-        this.log = log;
+    public _XComponent(TestParameters tEnv, XComponent oObj) {
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
@@ -119,10 +115,14 @@ public class _XComponent {
     * <code>dispose</code> method call.
     */
     public boolean _removeEventListener() {
-        if (disposed) return false;
+        if (disposed)
+        {
+            System.out.println("Hint: already disposed.");
+            return false;
+        }
         // the second listener should not be called
         oObj.removeEventListener( listener2 );
-        log.println(Thread.currentThread() + " is removing EL " + listener2);
+        System.out.println(Thread.currentThread() + " is removing EL " + listener2);
         return true;
     } // finished _removeEventListener()
 
@@ -142,24 +142,32 @@ public class _XComponent {
     public boolean _dispose() {
         disposed = false;
 
-        log.println( "begin dispose" + Thread.currentThread());
+        System.out.println( "begin dispose" + Thread.currentThread());
         XDesktop oDesk = (XDesktop) tEnv.get("Desktop");
         if (oDesk !=null) {
             oDesk.terminate();
         }
         else {
             if (altDispose == null)
+            {
                 oObj.dispose();
+            }
             else
+            {
                 altDispose.dispose();
+            }
         }
 
         try {
             Thread.sleep(500) ;
         } catch (InterruptedException e) {}
-        if (Loutput[0]!=null) log.println(Loutput[0]);
-        if (Loutput[1]!=null) log.println(Loutput[1]);
-        log.println( "end dispose" + Thread.currentThread());
+        if (Loutput[0]!=null){
+            System.out.println(Loutput[0]);
+        }
+        if (Loutput[1]!=null) {
+            System.out.println(Loutput[1]);
+        }
+        System.out.println( "end dispose" + Thread.currentThread());
         disposed = true;
 
         // check that dispose() works OK.
diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java
index bc0a124cf3..8e2cb097fa 100755
--- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java
+++ b/framework/qa/complex/imageManager/_XImageManager.java
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package imageManager.interfaces;
+package complex.imageManager;
 
 import com.sun.star.graphic.XGraphic;
 import com.sun.star.ui.ImageType;
 import com.sun.star.ui.XImageManager;
 import lib.TestParameters;
-import share.LogWriter;
+
 
 /**
  *
  */
 public class _XImageManager {
-    LogWriter log = null;
+
     TestParameters tEnv = null;
     String[]imageNames = null;
     XGraphic[] xGraphicArray = null;
     public XImageManager oObj;
 
-    public _XImageManager(LogWriter log, TestParameters tEnv, XImageManager oObj) {
-        this.log = log;
+    public _XImageManager( TestParameters tEnv, XImageManager oObj) {
+
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
@@ -52,7 +52,9 @@ public class _XImageManager {
         short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT;
         imageNames = oObj.getAllImageNames(s);
         for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++)
+        {
             System.out.println("###### Image: " + imageNames[i]);
+        }
         return imageNames != null;
     }
     
@@ -70,11 +72,12 @@ public class _XImageManager {
         boolean result = true;
         short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT;
         try { // check the first image names, 10 at max
-            for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) 
+            for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++)
+            {
                 result &= oObj.hasImage(s, imageNames[i]);
+            }
         }
         catch(com.sun.star.lang.IllegalArgumentException e) {
-            e.printStackTrace((java.io.PrintWriter)log);
             result = false;
         }
         return result;
diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index d9ca13d917..38af77b991 100644..100755
--- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -25,9 +25,9 @@
  *
  ************************************************************************/
 
-package imageManager.interfaces;
+package complex.imageManager;
+
 
-import share.LogWriter;
 
 
 import com.sun.star.lang.XInitialization;
@@ -48,12 +48,12 @@ import lib.TestParameters;
 */
 public class _XInitialization {
 
-    LogWriter log = null;
+
     TestParameters tEnv = null;
     public static XInitialization oObj = null;
 
-    public _XInitialization(LogWriter log, TestParameters tEnv, XInitialization oObj) {
-        this.log = log;
+    public _XInitialization(TestParameters tEnv, XInitialization oObj) {
+
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
@@ -75,8 +75,7 @@ public class _XInitialization {
             }
 
         } catch (com.sun.star.uno.Exception e) {
-            log.println("Exception occurred while method calling.") ;
-            e.printStackTrace((java.io.PrintWriter)log) ;
+            System.out.println("Exception occurred while method calling.") ;
             result = false ;
         }
 
diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java
index 1b0f5fe2dc..0bc006c300 100644..100755
--- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/_XTypeProvider.java
@@ -25,9 +25,8 @@
  *
  ************************************************************************/
 
-package imageManager.interfaces;
+package complex.imageManager;
 
-import share.LogWriter;
 
 
 import com.sun.star.lang.XTypeProvider;
@@ -46,13 +45,13 @@ import lib.TestParameters;
 */
 public class _XTypeProvider {
 
-    LogWriter log = null;
+
     TestParameters tEnv = null;
     public static XTypeProvider oObj = null;
     public static Type[] types = null;
 
-    public _XTypeProvider(LogWriter log, TestParameters tEnv, XTypeProvider oObj) {
-        this.log = log;
+    public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
+
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
@@ -63,9 +62,9 @@ public class _XTypeProvider {
     */
     public boolean _getImplementationId() {
         boolean result = true;
-        log.println("testing getImplementationId() ... ");
+        System.out.println("testing getImplementationId() ... ");
 
-        log.println("The ImplementationId is "+oObj.getImplementationId());
+        System.out.println("The ImplementationId is "+oObj.getImplementationId());
         result = true;
 
         return  result;
@@ -74,24 +73,24 @@ public class _XTypeProvider {
 
 
     /**
-    * Ñalls the method and checks the return value.<p>
+    * Calls the method and checks the return value.<p>
     * Has <b>OK</b> status if one of the return value equals to the
     * type <code>com.sun.star.lang.XTypeProvider</code>.
     */
     public boolean _getTypes() {
         boolean result = false;
-        log.println("getting Types...");
+        System.out.println("getting Types...");
         types = oObj.getTypes();
         for (int i=0;i<types.length;i++) {
             int k = i+1;
-            log.println(k+". Type is "+types[i].toString());
+            System.out.println(k+". Type is "+types[i].toString());
             if (types[i].toString().equals
                     ("Type[com.sun.star.lang.XTypeProvider]")) {
                 result = true;
             }
         }
         if (!result) {
-            log.println("Component must provide Type "
+            System.out.println("Component must provide Type "
                 +"<com.sun.star.lang.XTypeProvider>");
         }
 
diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index 1a3936bbc6..da1c81ae25 100755
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -25,20 +25,18 @@
  *
  ************************************************************************/
 
-package imageManager.interfaces;
+package complex.imageManager;
+
 
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.ui.XModuleUIConfigurationManagerSupplier;
 import com.sun.star.ui.XUIConfiguration;
 import com.sun.star.ui.XUIConfigurationListener;
 import lib.TestParameters;
-import share.LogWriter;
+
 
 
 public class _XUIConfiguration {
 
-    LogWriter log = null;
+
     TestParameters tEnv = null;
     public XUIConfiguration oObj;
     XUIConfigurationListenerImpl xListener = null;
@@ -51,8 +49,7 @@ public class _XUIConfiguration {
     }
 
 
-    public _XUIConfiguration(LogWriter log, TestParameters tEnv, XUIConfiguration oObj) {
-        this.log = log;
+    public _XUIConfiguration(TestParameters tEnv, XUIConfiguration oObj) {
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java
index b3fb3a1e76..cb398db23f 100755
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
+++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java
@@ -25,26 +25,23 @@
  *
  ************************************************************************/
 
-package imageManager.interfaces;
+package complex.imageManager;
 
 import com.sun.star.embed.XStorage;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.ui.XModuleUIConfigurationManagerSupplier;
 import com.sun.star.ui.XUIConfigurationPersistence;
 import lib.TestParameters;
-import share.LogWriter;
+
 
 
 public class _XUIConfigurationPersistence {
 
-    LogWriter log = null;
+
     TestParameters tEnv = null;
     public XUIConfigurationPersistence oObj;
     private XStorage xStore = null;
 
-    public _XUIConfigurationPersistence(LogWriter log, TestParameters tEnv, XUIConfigurationPersistence oObj) {
-        this.log = log;
+    public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) {
+
         this.tEnv = tEnv;
         this.oObj = oObj;
     }
@@ -58,7 +55,7 @@ public class _XUIConfigurationPersistence {
             oObj.reload();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
+
         }
         return true;
     }
@@ -68,7 +65,7 @@ public class _XUIConfigurationPersistence {
             oObj.store();
         }
         catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
+
         }
         return true;
     }
@@ -80,7 +77,7 @@ public class _XUIConfigurationPersistence {
         }
         catch(com.sun.star.uno.Exception e) {
             result = false;
-            e.printStackTrace((java.io.PrintWriter)log);
+
         }
         return result;
     }
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
deleted file mode 100755
index 3b508b718d..0000000000
--- a/framework/qa/complex/imageManager/makefile.mk
+++ /dev/null
@@ -1,79 +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 = ..$/..$/..
-TARGET  = ImageManager
-PRJNAME = framework
-PACKAGE = imageManager
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = CheckImageManager.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand \
-            "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckImageManager
-
-
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index f65612e247..3df97b0542 100644..100755
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -28,30 +28,17 @@
  package complex.loadAllDocuments;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.comp.loader.FactoryHelper;
 import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XStorable;
 import com.sun.star.io.XInputStream;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XInitialization;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.XCloseable;
 import com.sun.star.ucb.XSimpleFileAccess;
 
-import complex.loadAllDocuments.helper.InteractionHandler;
-import complex.loadAllDocuments.helper.StatusIndicator;
-import complex.loadAllDocuments.helper.StreamSimulator;
-
-import complexlib.ComplexTestCase;
 
 import helper.URLHelper;
 
@@ -59,9 +46,19 @@ import java.io.File;
 import java.io.InputStreamReader;
 
 import java.util.Enumeration;
-import java.util.StringTokenizer;
 import java.util.Vector;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.OfficeFileUrl;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 //-----------------------------------------------
 /** @short  Check the interface method XComponentLoader.loadComponentFromURL()
 
@@ -80,7 +77,7 @@ import java.util.Vector;
             
     @todo   We need a further test for accessing UNC pathes on windows!            
  */
-public class CheckXComponentLoader extends ComplexTestCase
+public class CheckXComponentLoader
 {
     //-------------------------------------------
     // some const
@@ -96,7 +93,7 @@ public class CheckXComponentLoader extends ComplexTestCase
     
     /** File/URL separators. */
     private static final String fs_url = "/";
-    private static final String fs_sys = System.getProperty("file.separator");
+    // private static final String fs_sys = System.getProperty("file.separator");
     
     /** used for testing password protected files. */
     private static final String SUFFIX_PASSWORD_TEMPFILE = "password_";
@@ -140,18 +137,18 @@ public class CheckXComponentLoader extends ComplexTestCase
         @return All test methods.
         @todo   Think about selection of tests from outside ...     
      */
-    public String[] getTestMethodNames()
-    {
-        // TODO think about trigger of sub-tests from outside
-        return new String[]
-        {
-            "checkURLEncoding"           ,
-            "checkURLHandling"           ,
-            "checkUsingOfMediaDescriptor",
-            "checkStreamLoading"         ,
-            "checkLoadingWithPassword"
-        };
-    }
+//    public String[] getTestMethodNames()
+//    {
+//        // TODO think about trigger of sub-tests from outside
+//        return new String[]
+//        {
+//            "checkURLEncoding"           ,
+//            "checkURLHandling"           ,
+//            "checkUsingOfMediaDescriptor",
+//            "checkStreamLoading"         ,
+//            "checkLoadingWithPassword"
+//        };
+//    }
 
     //-------------------------------------------
     /** @short  Create the environment for following tests.
@@ -159,59 +156,51 @@ public class CheckXComponentLoader extends ComplexTestCase
         @descr  Use either a component loader from desktop or
                 from frame
      */
-    public void before()
+    @Before public void before()
     {
         // get uno service manager from global test environment
-        m_xMSF = (XMultiServiceFactory)param.getMSF();
+        m_xMSF = getMSF();
 
         // create stream provider
         try
         {
-            m_xStreamProvider = (XSimpleFileAccess)UnoRuntime.queryInterface(
-                                                    XSimpleFileAccess.class, 
-                                                    m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
+            m_xStreamProvider = UnoRuntime.queryInterface(XSimpleFileAccess.class, m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"));
         }
         catch(java.lang.Throwable ex)
         {
-            ex.printStackTrace();
-            failed("Could not create a stream provider instance.");
+            fail("Could not create a stream provider instance.");
         }
         
         // create desktop instance
         try
         {
-            m_xDesktop = (XFrame)UnoRuntime.queryInterface(
-                                    XFrame.class, 
-                                    m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+            m_xDesktop = UnoRuntime.queryInterface(XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
         }
         catch(java.lang.Throwable ex)
         {
-            ex.printStackTrace();
-            failed("Could not create the desktop instance.");
+            fail("Could not create the desktop instance.");
         }
 
         // create frame instance
-        m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader"                    , 
+        m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader", 
                                         FrameSearchFlag.TASKS | FrameSearchFlag.CREATE);
-        if (m_xFrame==null)
-            failed("Couldn't create test frame.");
+        assertNotNull("Couldn't create test frame.", m_xFrame);
 
         // define default loader for testing
         // TODO think about using of bot loader instances!
-        m_xLoader = (XComponentLoader)UnoRuntime.queryInterface(
-                                         XComponentLoader.class, 
-                                         m_xDesktop);
-        if (m_xLoader==null)
-            failed("Desktop service doesnt support needed component loader interface.");
+        m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, m_xDesktop);
+        assertNotNull("Desktop service doesnt support needed component loader interface.", m_xLoader);
 
         // get temp path for this environment
-        m_sTempPath = (String) param.get("TempPath");
-        m_sTempPath = "."+fs_sys;
+        final String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+        m_sTempPath = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
+        // m_sTempPath = "."+fs_sys;
         
         // get all files from the given directory
         // TODO URLHelper should ignore directories!
         m_lTestFiles = new Vector();
-        m_sTestDocPath = (String) param.get("TestDocumentPath"); 
+        final String sTestDocURL = OfficeFileUrl.getAbsolute(new File("testdocuments"));
+        m_sTestDocPath = graphical.FileHelper.getSystemPathFromFileURL(sTestDocURL);
         try
         {
             File        aBaseDir        = new File(m_sTestDocPath);
@@ -232,36 +221,35 @@ public class CheckXComponentLoader extends ComplexTestCase
                 }
                 
                 String sCompletePath = aFile.getAbsolutePath();
-                String sSubPath      = sCompletePath.substring(nBasePathLength + 1);
+                String sSubPath      = sCompletePath.substring(nBasePathLength);
                 
                 // Some test files are checked into CVS. ignore CVS  helper files!
-                if (sSubPath.indexOf("CVS") > -1)
-                    continue;
+//                if (sSubPath.indexOf("CVS") > -1)
+//                {
+//                    continue;
+//                }
                 
                 m_lTestFiles.add(sSubPath);
             }
         }
         catch(java.lang.Throwable ex)
         {
-            ex.printStackTrace();
-            failed("Couldn't find test documents.");
+            fail("Couldn't find test documents.");
         }
     }
 
     //-------------------------------------------
     /** @short  close the environment.
      */
-    public void after()
+    @After public void after()
     {
-        XCloseable xClose = (XCloseable)UnoRuntime.queryInterface(
-                                            XCloseable.class,
-                                            m_xFrame);
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xFrame);
         try
         {
             xClose.close(false);
         }
         catch(com.sun.star.util.CloseVetoException exVeto)
-            { failed("Test frame couldn't be closed successfully."); }
+            { fail("Test frame couldn't be closed successfully."); }
         
         m_xFrame  = null;
         m_xLoader = null;
@@ -270,7 +258,7 @@ public class CheckXComponentLoader extends ComplexTestCase
     //-------------------------------------------
     /** @short  Look for files in the given directory for loading.
      */
-    public void checkUsingOfMediaDescriptor()
+    @Test public void checkUsingOfMediaDescriptor()
     {
         InteractionHandler xHandler   = new InteractionHandler();
         StatusIndicator    xIndicator = new StatusIndicator(StatusIndicator.SHOWSTATUS_LOG);
@@ -292,17 +280,26 @@ public class CheckXComponentLoader extends ComplexTestCase
         Enumeration aSnapshot = m_lTestFiles.elements();
         while (aSnapshot.hasMoreElements())
         {
-            File   aSysFile = new File(m_sTestDocPath+fs_sys+(String)aSnapshot.nextElement());
+            File   aSysFile = new File(m_sTestDocPath, (String)aSnapshot.nextElement());
             String sURL     = URLHelper.getFileURLFromSystemPath(aSysFile);
             
-            loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
-
-            // Its not needed to reset this using states!
-            // Its done internaly ...
-            if (!xIndicator.wasUsed())
-                failed("External progress was not used for loading.");
-            if (xHandler.wasUsed())
-                failed("External interaction handler was not used for loading.");
+            if (/*! (sURL.endsWith(".jpg") ||
+                   sURL.endsWith(".gif"))*/
+                    true
+                  )
+            {
+                loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps);
+                // Its not needed to reset this using states!
+                // Its done internaly ...
+                if (!xIndicator.wasUsed())
+                {
+                    System.out.println("External progress was not used for loading.");
+                }
+                if (xHandler.wasUsed())
+                {
+                    System.out.println("External interaction handler was not used for loading.");
+                }
+            }
         }
     }
 
@@ -313,17 +310,23 @@ public class CheckXComponentLoader extends ComplexTestCase
                                         String sPrefix  )
     {
         File aDir = new File(sTempPath);
-        if (!aDir.exists())
-            failed("Could not access temp directory \""+sTempPath+"\".");
+        aDir.mkdirs();
+//        if (!aDir.exists())
+//        {
+//            fail("Could not access temp directory \"" + sTempPath + "\".");
+//        }
         
+    // TODO: create a temp file which not exist!
         for (int i=0; i<999999; ++i)
         {
             File aTempFile = new File(aDir, sSuffix+i+sPrefix);
             if (!aTempFile.exists())
+            {
                 return aTempFile.getAbsolutePath();
+            }
         }
         
-        failed("Seems that all temp file names are currently in use!");
+        fail("Seems that all temp file names are currently in use!");
         return null;
     }
     
@@ -360,25 +363,19 @@ public class CheckXComponentLoader extends ComplexTestCase
         {
             // load it
             xDoc = xLoader.loadComponentFromURL(sSourceURL, "_blank", 0, lLoadProps);
-            if (xDoc == null)
-                failed("Could create office document, which should be saved as temp one.");
+            assertNotNull("Could create office document, which should be saved as temp one.", xDoc);
 
             // save it as temp file
-            XStorable xStore = (XStorable)UnoRuntime.queryInterface(
-                                            XStorable.class,
-                                            xDoc);
+            XStorable xStore = UnoRuntime.queryInterface(XStorable.class, xDoc);
             xStore.storeAsURL(sTargetURL, lSaveProps);
             
             // Dont forget to close this file. Otherwise the temp file is locked!
-            XCloseable xClose = (XCloseable)UnoRuntime.queryInterface(
-                                                XCloseable.class,
-                                                xDoc);
+            XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xDoc);
             xClose.close(false);                                                
         }
         catch(java.lang.Throwable ex)
         {
-            ex.printStackTrace();
-            failed("Could not create temp office document.");
+            fail("Could not create temp office document.");
         }
     }
     
@@ -389,7 +386,7 @@ public class CheckXComponentLoader extends ComplexTestCase
                 as password for the ftp connection,
                 or - if none given a default one.
      */
-    public void checkLoadingWithPassword()
+    @Test public void checkLoadingWithPassword()
     {
         String sTempFile = impl_getTempFileName(m_sTempPath, SUFFIX_PASSWORD_TEMPFILE, PREFIX_PASSWORD_TEMPFILE);
         File   aTestFile = new File(sTempFile);
@@ -414,14 +411,14 @@ public class CheckXComponentLoader extends ComplexTestCase
         lArgs2[0].Value = Boolean.TRUE;
 
         loadURL(m_xLoader, RESULT_VALID_DOC, sTestURL, "_blank", 0, lArgs1);
-        loadURL(m_xLoader, RESULT_EMPTY_DOC, sTestURL, "_blank", 0, lArgs2);
+// TODO: wrong?        loadURL(m_xLoader, RESULT_EMPTY_DOC, sTestURL, "_blank", 0, lArgs2);
     }
 
     /**
      * Check URL encoding. The first filename that matches "*.sxw"
      * is used as source for several encodings.
      */
-    public void checkURLEncoding() {
+    @Test public void checkURLEncoding() {
         PropertyValue[] lProps = new PropertyValue[1];
 
         lProps[0] = new PropertyValue();
@@ -432,21 +429,17 @@ public class CheckXComponentLoader extends ComplexTestCase
         InputStreamReader in = new InputStreamReader(System.in);
         String sSystemEncoding = in.getEncoding();
 
-        log.println("This system's encoding: " + sSystemEncoding);
+        System.out.println("This system's encoding: " + sSystemEncoding);
 
-        if (m_lTestFiles == null) {
-            failed("Found an empty directory. There are no files for testing.");
+        assertNotNull("Found an empty directory. There are no files for testing.", m_lTestFiles);
 
-            return;
-        }
 
         // get a file name as byte array
         Enumeration aSnapshot = m_lTestFiles.elements();
         byte[] baURL = null;
 
         while (aSnapshot.hasMoreElements()) {
-            File aFile = new File(m_sTestDocPath + fs_sys + 
-                                  aSnapshot.nextElement());
+            File aFile = new File(m_sTestDocPath, (String)aSnapshot.nextElement());
             String sFile = URLHelper.getFileURLFromSystemPath(aFile);
 
             // take the first sxw file as stream
@@ -457,11 +450,7 @@ public class CheckXComponentLoader extends ComplexTestCase
             }
         }
 
-        if (baURL == null) {
-            failed("Found no file to load. Cannot test.");
-
-            return;
-        }
+        assertNotNull("Found no file to load. Cannot test.", baURL);
 
         //construct several different encoded strings
         String[] sEncoding = new String[] {
@@ -477,7 +466,7 @@ public class CheckXComponentLoader extends ComplexTestCase
         for (int i = 0; i < sEncoding.length; i = i + 2) {
             try {
                 String encURL = new String(baURL, sEncoding[i]);
-                log.println("ENC[" + sEncoding[i] + "]");
+                System.out.println("ENC[" + sEncoding[i] + "]");
 
                 if (sEncoding[i + 1].equals("TRUE")) {
                     loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0, 
@@ -488,8 +477,8 @@ public class CheckXComponentLoader extends ComplexTestCase
                             lProps);
                 }
             } catch (java.io.UnsupportedEncodingException e) {
-                failed("Unsopported Encoding: " + sEncoding[i] + 
-                       "\n Not able to test encoding on this platform.", true);
+                fail("Unsopported Encoding: " + sEncoding[i] + 
+                       "\n Not able to test encoding on this platform.");
             }
         }
     }
@@ -502,107 +491,107 @@ public class CheckXComponentLoader extends ComplexTestCase
      * 4. FTP URLs
      * 5. HTTP URLs
      */
-    public void checkURLHandling() {
-        PropertyValue[] lProps = new PropertyValue[1];
-
-        lProps[0] = new PropertyValue();
-        lProps[0].Name = "Hidden";
-        lProps[0].Value = Boolean.TRUE;
-
-        log.println("check possible but unsupported URLs");
-
-        String[] sIllegalArgs = new String[] {
-            "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open", 
-        };
-        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, 
-                "_blank", 0, lProps);
-
-        log.println("check stupid URLs");
-
-        sIllegalArgs = new String[] {
-            "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this", 
-            ".UnO:*", 
-        };
-        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, 
-                "_blank", 0, lProps);
-
-        String[] sEmptyDocs = new String[] {
-            "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx", 
-            "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\", 
-            "c:\\\\test///\\test.sxw", "news_:staroffice-doc", 
-            "newsletter@blubber", "private_factory/swriter", 
-            "private:factory//swriter", "private:factory/swriter/___", 
-            "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main", 
-            "macro:///Euro.AutoPilotRun.StartAutoPilot", 
-            "service:com.sun.star.frame.Frame", 
-            "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc", 
-            "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot", 
-            "service:com.sun.star.frame."
-        };
-        
-        //with cws_loadenv01 changed to IllegalArgumentException
-        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, 
-                lProps);
-
-        log.println("check case senstive URLs");
-
-        sIllegalArgs = new String[] {
-            "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", 
-        };
-        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, 
-                "_blank", 0, lProps);
-
-        sEmptyDocs = new String[] {
-            "private:factory/SWRITER", "private:factory/SWRITER/WEB", 
-            "macro:///importwizard.main.main", 
-            "Macro:///euro.autopilotrun.startautopilot", 
-            "Service:Com.Sun.Star.Frame.Frame", 
-            "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc", 
-            "News:Staroffice-doc"
-        };
-        
-        //with cws_loadenv01 changed to IllegalArgumentException
-        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, 
-                lProps);
-
-        log.println("check FTP URLs");
-
-        String sFTPURL = (String) param.get("FtpAccess");
-        Enumeration aSnapshot = m_lTestFiles.elements();
-
-        while (aSnapshot.hasMoreElements()) {
-            String doc = (String) aSnapshot.nextElement();
-
-
-            // if os is windows
-            doc = doc.replace('\\', '/');
-        if (doc.indexOf("CVS")<0) {
-            loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc, 
-                    "_blank", 0, lProps);
-        }
-        }
-
-        log.println("check HTTP URLs");
-
-        String sHTTPURL = (String) param.get("HttpAccess");
-        aSnapshot = m_lTestFiles.elements();
-
-        while (aSnapshot.hasMoreElements()) {
-            String doc = (String) aSnapshot.nextElement();
-
-
-            // if os is windows
-            doc = doc.replace('\\', '/');
-        if (doc.indexOf("CVS")<0) {	    
-            loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc, 
-                    "_blank", 0, lProps);
-        }
-        }
-    }
+//    public void checkURLHandling() {
+//        PropertyValue[] lProps = new PropertyValue[1];
+//
+//        lProps[0] = new PropertyValue();
+//        lProps[0].Name = "Hidden";
+//        lProps[0].Value = Boolean.TRUE;
+//
+//        System.out.println("check possible but unsupported URLs");
+//
+//        String[] sIllegalArgs = new String[] {
+//            "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open",
+//        };
+//        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs,
+//                "_blank", 0, lProps);
+//
+//        System.out.println("check stupid URLs");
+//
+//        sIllegalArgs = new String[] {
+//            "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this",
+//            ".UnO:*",
+//        };
+//        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs,
+//                "_blank", 0, lProps);
+//
+//        String[] sEmptyDocs = new String[] {
+//            "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx",
+//            "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\",
+//            "c:\\\\test///\\test.sxw", "news_:staroffice-doc",
+//            "newsletter@blubber", "private_factory/swriter",
+//            "private:factory//swriter", "private:factory/swriter/___",
+//            "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main",
+//            "macro:///Euro.AutoPilotRun.StartAutoPilot",
+//            "service:com.sun.star.frame.Frame",
+//            "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc",
+//            "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot",
+//            "service:com.sun.star.frame."
+//        };
+//
+//        //with cws_loadenv01 changed to IllegalArgumentException
+//        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0,
+//                lProps);
+//
+//        System.out.println("check case senstive URLs");
+//
+//        sIllegalArgs = new String[] {
+//            "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN",
+//        };
+//        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs,
+//                "_blank", 0, lProps);
+//
+//        sEmptyDocs = new String[] {
+//            "private:factory/SWRITER", "private:factory/SWRITER/WEB",
+//            "macro:///importwizard.main.main",
+//            "Macro:///euro.autopilotrun.startautopilot",
+//            "Service:Com.Sun.Star.Frame.Frame",
+//            "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc",
+//            "News:Staroffice-doc"
+//        };
+//
+//        //with cws_loadenv01 changed to IllegalArgumentException
+//        loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0,
+//                lProps);
+//
+//        System.out.println("check FTP URLs");
+//
+//        String sFTPURL = (String) param.get("FtpAccess");
+//        Enumeration aSnapshot = m_lTestFiles.elements();
+//
+//        while (aSnapshot.hasMoreElements()) {
+//            String doc = (String) aSnapshot.nextElement();
+//
+//
+//            // if os is windows
+//            doc = doc.replace('\\', '/');
+//	    if (doc.indexOf("CVS")<0) {
+//		    loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc,
+//                    "_blank", 0, lProps);
+//	    }
+//        }
+//
+//        System.out.println("check HTTP URLs");
+//
+//        String sHTTPURL = (String) param.get("HttpAccess");
+//        aSnapshot = m_lTestFiles.elements();
+//
+//        while (aSnapshot.hasMoreElements()) {
+//            String doc = (String) aSnapshot.nextElement();
+//
+//
+//            // if os is windows
+//            doc = doc.replace('\\', '/');
+//	    if (doc.indexOf("CVS")<0) {
+//		    loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc,
+//                    "_blank", 0, lProps);
+//	    }
+//        }
+//    }
 
     /** TODo document me
      */
-    public void checkStreamLoading()
+    @Test public void checkStreamLoading()
     {
         PropertyValue[] lProps = new PropertyValue[2];
 
@@ -616,11 +605,13 @@ public class CheckXComponentLoader extends ComplexTestCase
         Enumeration aSnapshot = m_lTestFiles.elements();
         while (aSnapshot.hasMoreElements())
         {
-            File   aFile = new File(m_sTestDocPath + fs_sys + (String) aSnapshot.nextElement());
+            File   aFile = new File(m_sTestDocPath, (String) aSnapshot.nextElement());
             String sURL  = URLHelper.getFileURLFromSystemPath(aFile);
             
-            if (sURL.indexOf("CVS") > -1)
-                continue;
+//            if (sURL.indexOf("CVS") > -1)
+//            {
+//                continue;
+//            }
             
             try
             {
@@ -628,12 +619,15 @@ public class CheckXComponentLoader extends ComplexTestCase
                 lProps[1].Value = xStream;
             }
             catch(com.sun.star.uno.Exception e)
-                { failed("Could not open test file \""+sURL+"\" for stream test."); }
+            {
+                fail("Could not open test file \""+sURL+"\" for stream test.");
+            }
                 
             // check different version of "private:stream" URL!                
             loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps);
-            loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream/", "_blank", 0, lProps);
-        }
+            // loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps);
+            // loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream/", "_blank", 0, lProps);
+    }
     }
     
     /**
@@ -664,10 +658,8 @@ public class CheckXComponentLoader extends ComplexTestCase
         } catch (com.sun.star.io.IOException exIO) {
             nResult = RESULT_IOEXCEPTION;
         } catch (com.sun.star.uno.RuntimeException exRuntime) {
-            exRuntime.printStackTrace();
             nResult = RESULT_RUNTIMEEXCEPTION;
         } catch (Exception e) {
-            e.printStackTrace();
             nResult = RESULT_EXCEPTION;
         }
 
@@ -677,22 +669,22 @@ public class CheckXComponentLoader extends ComplexTestCase
                 xDoc = null;
             }
         } catch (com.sun.star.uno.RuntimeException exClosing) {
-            log.println("exception during disposing of a document found!" + 
+            System.out.println("exception during disposing of a document found!" +
                         " Doesn't influence test - but should be checked.");
         }
 
         String sMessage = "URL[\"" + sURL + "\"]";
 
         if (nResult == nRequiredResult) {
-            log.println(sMessage + " expected result [" + 
+            System.out.println(sMessage + " expected result [" +
                         convertResult2String(nResult) + "] ");
         } else {
-            failed(sMessage + " unexpected result [" + 
+            fail(sMessage + " unexpected result [" + 
                    convertResult2String(nResult) + "] " + 
                    "\nrequired was [" + 
                    convertResult2String(nRequiredResult) + "]" + 
-                   "\nwe got       [" + convertResult2String(nResult) + "]", 
-                   true);
+                   "\nwe got       [" + convertResult2String(nResult) + "]"
+                   );
         }
     }
 
@@ -700,8 +692,9 @@ public class CheckXComponentLoader extends ComplexTestCase
                          String[] sURL, String sTarget, int nFlags, 
                          PropertyValue[] lProps) {
         for (int i = 0; i < sURL.length; i++)
-            loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, 
-                    lProps);
+        {
+            loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, lProps);
+        }
     }
 
     /**
@@ -730,4 +723,28 @@ public class CheckXComponentLoader extends ComplexTestCase
 
         return "unknown!";
     }
-}
\ No newline at end of file
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
+
+}
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
index 84bdb5aba9..84bdb5aba9 100644..100755
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index f018912a2b..7bbb50e42f 100644..100755
--- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.loadAllDocuments.helper;
+package complex.loadAllDocuments;
 
 import com.sun.star.beans.PropertyValue;
 
diff --git a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 4320462835..cdbce9d7c6 100644..100755
--- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.loadAllDocuments.helper;
+package complex.loadAllDocuments;
 
 // __________ Imports __________
 
diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index 99c12fa90b..6214963f33 100644..100755
--- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.loadAllDocuments.helper;
+package complex.loadAllDocuments;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.ucb.XSimpleFileAccess;
diff --git a/framework/qa/complex/loadAllDocuments/TestDocument.java b/framework/qa/complex/loadAllDocuments/TestDocument.java
new file mode 100755
index 0000000000..db5ca563a0
--- /dev/null
+++ b/framework/qa/complex/loadAllDocuments/TestDocument.java
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+package complex.loadAllDocuments;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument
+{
+    public static String getUrl(String name) 
+        {
+            return OfficeFileUrl.getAbsolute(new File("testdocuments", name));
+        }
+
+    private TestDocument() {}
+}
diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk
deleted file mode 100644
index 98c414c2c1..0000000000
--- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk
+++ /dev/null
@@ -1,48 +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 = ..$/..$/..$/..
-TARGET  = CheckXComponentLoader
-PRJNAME = framework
-PACKAGE = complex$/loadAllDocuments$/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  Generator.jar
-JAVAFILES       = InteractionHandler.java StatusIndicator.java StreamSimulator.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-MAXLINELENGTH = 100000
-
-.INCLUDE :  target.mk
-
-
-
diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk
deleted file mode 100644
index 02aacd36d2..0000000000
--- a/framework/qa/complex/loadAllDocuments/makefile.mk
+++ /dev/null
@@ -1,91 +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 = ..$/..$/..
-TARGET  = CheckXComponentLoader
-PRJNAME = framework
-PACKAGE = complex$/loadAllDocuments
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar
-JAVAFILES       = CheckXComponentLoader.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-SUBDIRS = helper
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
-.ELSE
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props
-    cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props
-    jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -tdoc $(PWD)$/testdocuments
-
-
-
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/Calc_6.sxc b/framework/qa/complex/loadAllDocuments/testdocuments/Calc_6.sxc
index 4b2b572085..4b2b572085 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/Calc_6.sxc
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/Calc_6.sxc
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/Writer6.sxw b/framework/qa/complex/loadAllDocuments/testdocuments/Writer6.sxw
index 1b2c2cb2da..1b2c2cb2da 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/Writer6.sxw
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/Writer6.sxw
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/draw1.sxd b/framework/qa/complex/loadAllDocuments/testdocuments/draw1.sxd
index 58c8772cb0..58c8772cb0 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/draw1.sxd
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/draw1.sxd
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/imp1.sxi b/framework/qa/complex/loadAllDocuments/testdocuments/imp1.sxi
index efcdf9b6a2..efcdf9b6a2 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/imp1.sxi
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/imp1.sxi
diff --git a/framework/qa/complex/loadAllDocuments/password_check.sxw b/framework/qa/complex/loadAllDocuments/testdocuments/password_check.sxw
index ec545b99e2..ec545b99e2 100644..100755
--- a/framework/qa/complex/loadAllDocuments/password_check.sxw
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/password_check.sxw
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif b/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
index abbbc65f63..abbbc65f63 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/pic.gif
diff --git a/framework/qa/complex/loadAllDocuments/testdocuments/pic.jpg b/framework/qa/complex/loadAllDocuments/testdocuments/pic.jpg
index 6b4b744f8e..6b4b744f8e 100644..100755
--- a/framework/qa/complex/loadAllDocuments/testdocuments/pic.jpg
+++ b/framework/qa/complex/loadAllDocuments/testdocuments/pic.jpg
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index b264bbd558..527176aaae 100755
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -27,432 +27,992 @@
 package complex.path_settings;
 
 import com.sun.star.beans.Property;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XFastPropertySet;
 import com.sun.star.beans.XMultiPropertySet;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.beans.XPropertiesChangeListener;
 import com.sun.star.beans.XPropertyChangeListener;
 import com.sun.star.beans.XVetoableChangeListener;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.AnyConverter;
-import complexlib.ComplexTestCase;
 
-public class PathSettingsTest extends ComplexTestCase {
+// ---------- junit imports -----------------
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
+public class PathSettingsTest
+{
 
     private static XMultiServiceFactory xMSF;
-
     // the test object: an instance of the tested service
-    private static Object oObj = null;
+    private static Object aPathSettings = null;
     // the properties of the service
-    private static Property[] props = null;
-    private static String[] propNames = null;
-    private static String[] availablePropNames = new String[]{
-    "Addin",
-    "AutoCorrect",
-    "Autotext",
-    "Backup",
-    "Basic",
-    "Bitmap",
-    "Config",
-    "Dictionary",
-    "Favorite",
-    "Filter",
-    "Gallery",
-    "Help",
-    "Linguistic",
-    "Module",
-    "Palette",
-    "Plugin",
-    "Temp",
-    "Template",
-    "UIConfig",
-    "UserConfig",
-    "UserDictionary",
-    "Work",
-};
-    private static String[] propVals = null;
+    private static Property[] xPropertyInfoOfPathSettings = null;
+    private static String[] aPathSettingNames = null;
+    private static String[] availablePropNames = new String[]
+    {
+        "Addin",
+        "AutoCorrect",
+        "AutoText",
+        "Backup",
+        "Basic",
+        "Bitmap",
+        "Config",
+        "Dictionary",
+        "Favorite",
+        "Filter",
+        "Fingerprint",
+        "Gallery",
+        "Graphic",
+        "Help",
+        "Linguistic",
+        "Module",
+        "Palette",
+        "Plugin",
+        "Storage",
+        "Temp",
+        "Template",
+        "UIConfig",
+        "UserConfig",
+        "Work",
+    };
+    // every path name from availablePropNames exist in this characteristics
+    // name
+    // name_internal
+    // name_user
+    // name_writable
+    private static String[] availablePropNameExtensions = new String[]
+    {
+        "",
+        "_internal",
+        "_user",
+        "_writable"
+    };
+    private static String[] aPathSettingValues = null;
+    ArrayList<Property> aListOfWorkingProperty;
 
     /**
      * A function to tell the framework, which test functions are available.
      * Right now, it's only 'checkComplexTemplateState'.
      * @return All test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkXFastPropertySet",
-                            "checkXMultiPropertySet",
-                            "checkXPropertySet"
-                        };
-    }
-
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkXFastPropertySet",
+//                            "checkXMultiPropertySet",
+//                            "checkXPropertySet"
+//                        };
+//    }
     /**
      * Initialize before the tests start: this has to be done only once.
-     * This methods sets the 'oObj' and 'props' variables.
+     * This methods sets the 'aPathSettings' and 'xPropertyInfoOfPathSettings' variables.
      */
-    public void before() {
-        try {
-            xMSF = (XMultiServiceFactory)param.getMSF();
-//            oObj = xMSF.createInstance("com.sun.star.util.PathSettings");
-            oObj = xMSF.createInstance("com.sun.star.comp.framework.PathSettings");
-            System.out.println("Implementation: " + util.utils.getImplName(oObj));
-            System.out.println("Service:        ");
-            util.dbg.getSuppServices(oObj);
-            if (oObj == null) throw new com.sun.star.uno.Exception();
-            XPropertySet xProp = (XPropertySet)
-                        UnoRuntime.queryInterface(XPropertySet.class, oObj);
-
-            props = xProp.getPropertySetInfo().getProperties();
-            propNames = new String[props.length];
-            propVals = new String[props.length];
+    @Before
+    public void before()
+    {
+        try
+        {
+            xMSF = getMSF();
+//            aPathSettings = xMSF.createInstance("com.sun.star.util.PathSettings");
+            aPathSettings = xMSF.createInstance("com.sun.star.comp.framework.PathSettings");
+            assertNotNull("Can't instantiate com.sun.star.util.PathSettings.", aPathSettings);
+//            System.out.println("Implementation: " + util.utils.getImplName(aPathSettings));
+//            System.out.println("Service:        ");
+            util.dbg.getSuppServices(aPathSettings);
+            final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings);
+
+            xPropertyInfoOfPathSettings = xPropSet_of_PathSettings.getPropertySetInfo().getProperties();
+            aPathSettingNames = new String[xPropertyInfoOfPathSettings.length];
+            aPathSettingValues = new String[xPropertyInfoOfPathSettings.length];
+
+            aListOfWorkingProperty = new ArrayList<Property>();
 
             // get intitial values and create new ones
-            log.println("\n---- All properties ----");
-            for (int i = 1; i < props.length; i++) {
-                propNames[i] = props[i].Name;
-                Object o = xProp.getPropertyValue(propNames[i]);
-                System.out.println("#### Object: " + o.getClass().getName() + "  -  " + o.toString());
-                propVals[i] = AnyConverter.toString(o);
-                System.out.println("#### String " + propVals[i]);
-                log.println("Property Name: " + propNames[i]);
-                log.println("Property Value: " + propVals[i]);
-            }
-            log.println("---- Finish showing properties ----\n");
-        }
-        catch(com.sun.star.uno.Exception e) {
-            e.printStackTrace();
-            log.println(e.getClass().getName());
-            log.println("Message: " + e.getMessage());
-            failed("Could not create an instance of the test object.");
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-            failed("What exception?");
+            for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++)
+            {
+                final String sName = xPropertyInfoOfPathSettings[i].Name;
+                // System.out.println(sName);
+                aPathSettingNames[i] = sName;
+                Object o = xPropSet_of_PathSettings.getPropertyValue(sName);
+
+                String sValue = convertToString(o);
+                aPathSettingValues[i] = sValue;
+                aListOfWorkingProperty.add(xPropertyInfoOfPathSettings[i]);
+            }
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            System.out.println(e.getClass().getName());
+            System.out.println("Message: " + e.getMessage());
+            // fail("Could not create an instance of the test object.");
+        }
+        catch (Exception e)
+        {
+            fail("What exception?");
+        }
+    }
+
+    private String convertToString(Object o)
+    {
+        String sValue = "";
+        try
+        {
+            if (AnyConverter.isString(o))
+            {
+                sValue = AnyConverter.toString(o);
+            }
+            else if (AnyConverter.isArray(o))
+            {
+                Object oValueList = AnyConverter.toArray(o);
+                String[] aValueList = (String[]) oValueList;
+                String sValues = "";
+                for (int j = 0; j < aValueList.length; j++)
+                {
+                    if (sValues.length() > 0)
+                    {
+                        sValues += ";";
+                    }
+                    sValues += aValueList[j];
+                }
+                sValue = sValues;
+            }
+            else
+            {
+                System.out.println("Can't convert Object to String");
+            }
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            /* ignore */
         }
+        return sValue;
     }
 
     /**
-     * This tests the XFastPropertySet interface implementation.
+     * Simple existance test, if this fails, the Lists must update
      */
-    public void checkXFastPropertySet()
+    @Test
+    public void checkInternalListConsistence()
     {
-        log.println("---- Testing the XFastPropertySet interface ----");
-
-        // creating instances
-        XFastPropertySet xFPS = (XFastPropertySet)
-                UnoRuntime.queryInterface(XFastPropertySet.class, oObj);
-
-        String name = null;
-        // do for all properties
-        for (int i = 0; i < props.length; i++) {
-            try {
-                Property property = props[i];
-                name = property.Name;
-                int handle = property.Handle;
-
-                // get property name and initial value
-                log.println("Test property with name: " + name);
-                String val = (String)xFPS.getFastPropertyValue(handle);
-                log.println("Property has initial value: '" + val + "'");
-
-                // set to a new correct value
-                String newVal = changeToCorrectValue(val);
-                log.println("Try to change to correct value '" + newVal + "'");
-                xFPS.setFastPropertyValue(handle, newVal);
+        // check if all Properties are in the internal test list
+        for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++)
+        {
+            final String sName = xPropertyInfoOfPathSettings[i].Name;
+            boolean bOccur = checkIfNameExistsInList(sName, availablePropNames, availablePropNameExtensions);
+            assertTrue("TEST IS WRONG, Name:='" + sName + "' doesn't exist in internal Test list.", bOccur);
+        }
 
-                // check the change
-                String checkVal = (String)xFPS.getFastPropertyValue(handle);
-                assure("Did not change value on property " + name + ".", checkVal.equals(newVal));
+        // check if all properties in the internal list also exist in real life
+        for (int i = 0; i < availablePropNames.length; i++)
+        {
+            final String aListName = availablePropNames[i];
+            for (int j = 0; j < availablePropNameExtensions.length; j++)
+            {
+                final String aSubListName = availablePropNameExtensions[j];
+                final String aName = aListName + aSubListName;
+                boolean bOccur = checkIfNameExistsInList(aName, aPathSettingNames, new String[]
+                        {
+                            ""
+                        } /* list must not empty! */);
+                assertTrue("TEST IS WRONG, Name:='" + aName + "' from the internal test list do not occur in real life path settings.", bOccur);
+            }
+        }
+    }
 
-                newVal = changeToIncorrectValue(val);
-                log.println("Try to change to incorrect value '" + newVal + "'");
-                try {
-                    xFPS.setFastPropertyValue(handle, newVal);
-                }
-                catch(com.sun.star.lang.IllegalArgumentException e) {
-                    log.println("Correctly thrown Exception caught.");
+    /**
+     * Simple O(n^n) check if a given String (_sNameMustOccur) exist in the given list(+SubList) values.
+     * @param _sNameMustOccur
+     * @param _aList
+     * @param _aSubList
+     * @return true, if name occur
+     */
+    private boolean checkIfNameExistsInList(String _sNameMustOccur, String[] _aList, String[] _aSubList)
+    {
+        for (int i = 0; i < _aList.length; i++)
+        {
+            final String aListName = _aList[i];
+            for (int j = 0; j < _aSubList.length; j++)
+            {
+                final String aSubListName = _aSubList[j];
+                final String aName = aListName + aSubListName;
+                if (aName.equals(_sNameMustOccur))
+                {
+                    return true;
                 }
+            }
+        }
+        return false;
+    }
 
-                // check if changed
-                checkVal = (String)xFPS.getFastPropertyValue(handle);
-                assure("Value did change on property " + name + " though it should not have.",
-                                                                            !checkVal.equals(newVal));
-
-                // set back to initial setting
-                xFPS.setFastPropertyValue(handle, val);
-
-                // check if changed
-                checkVal = (String)xFPS.getFastPropertyValue(handle);
-                assure("Did not change value back to original on property "
-                                            + name, checkVal.equals(val));
-                log.println("Test of property " + name + " finished\n");
+    private String getPropertyValueAsString(String _sName)
+    {
+        final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings);
+        String sValue = "";
+        {
+            Object o;
+            try
+            {
+                o = xPropSet_of_PathSettings.getPropertyValue(_sName);
+                sValue = convertToString(o);
+            }
+            catch (UnknownPropertyException ex)
+            {
             }
-            catch(com.sun.star.uno.Exception e) {
-//                e.printStackTrace();
-                log.println(e.getClass().getName());
-                log.println("Message: " + e.getMessage());
-                failed("Unexpected exception on property " + name + ".");
-                continue;
+            catch (WrappedTargetException ex)
+            {
             }
         }
-        log.println("---- Test of XFastPropertySet finished ----\n");
+        return sValue;
     }
 
-
-    // ____________________
     /**
-     * This tests the XMultiPropertySet interface implementation.
+     * Shows the path settings
+     * @throws UnknownPropertyException
+     * @throws WrappedTargetException
      */
-    public void checkXMultiPropertySet()
+    @Test
+    public void showPathSettings() throws UnknownPropertyException, WrappedTargetException
     {
-        log.println("---- Testing the XMultiPropertySet interface ----");
-        XMultiPropertySet xMPS = (XMultiPropertySet)
-            UnoRuntime.queryInterface(XMultiPropertySet.class, oObj);
-
-        String[] correctVals = new String[props.length];
-        String[] incorrectVals = new String[props.length];
-
-        // get intitial values and create new ones
-        for (int i = 0; i < props.length; i++) {
-            correctVals[i] = changeToCorrectValue(propVals[i]);
-            incorrectVals[i] = changeToIncorrectValue(propVals[i]);
-        }
-
-        try {
-            // add a change listener
-            MyChangeListener mListener = new MyChangeListener();
-            xMPS.addPropertiesChangeListener(propNames, mListener);
-
-            // first change props to correct values
-            log.println("Change to correct values.");
-            xMPS.setPropertyValues(propNames, correctVals);
-            assure("Could not change to correct values with XMultiPropoertySet.",
-                            verifyPropertySet(xMPS,propNames,correctVals)>0);
-
-            // second, change to incorrect values: expect an exception
-            log.println("Try to change to incorrect values.");
-            try {
-                xMPS.setPropertyValues(propNames, incorrectVals);
-            }
-            catch(com.sun.star.lang.IllegalArgumentException r) {
-                log.println("Correctly thrown Exception caught.");
-            }
-            assure("Did change to incorrect values with XMultiPropertySet," +
-                            " but should not have.",
-                            verifyPropertySet(xMPS,propNames,correctVals)>0);
-
-            // third, change back to initial values
-            log.println("Change back to initial values.");
-            xMPS.setPropertyValues(propNames, propVals);
-            assure("Could not change back to initial values with" +
-                                " XMultiPropertySet.",
-                                verifyPropertySet(xMPS,propNames,propVals)>0);
-
-            // fire the event for the listener
-            log.println("Fire event.");
-            xMPS.firePropertiesChangeEvent(propNames, mListener);
-            assure("Event was not fired on XMultiPropertySet.",
-                                        mListener.changePropertiesEventFired());
-        }
-        catch(com.sun.star.uno.Exception e) {
-//            e.printStackTrace();
-            log.println(e.getClass().getName());
-            log.println("Message: " + e.getMessage());
-            failed("Unexpected exception on XMultiPropertySet.");
-        }
-
-        // test finished
-        log.println("---- Test of XMultiPropertySet finished ----\n");
+        System.out.println("\n---- All properties ----");
+        final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings);
+
+//        for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++)
+        for (int i = 0; i < aListOfWorkingProperty.size(); i++)
+        {
+            final String sName = aListOfWorkingProperty.get(i).Name;
+            // aPathSettingWorkingNames[i] = sName;
+//            System.out.print("PathSettings: Name:=");
+            System.out.print(sName);
+            Object o = xPropSet_of_PathSettings.getPropertyValue(sName);
+
+            // System.out.println("#### Object: '" + o.getClass().getName() + "'  -  '" + o.toString() + "'");
+            try
+            {
+                final String sValue = AnyConverter.toString(o);
+                // aPathSettingValues[i] = sValue;
+                // System.out.println("#### String " + sValue);
+                // System.out.println("Property Name: " + sName);
+                // System.out.println("Property Value: " + sValue);
+//                System.out.print(" ==> ");
+//                System.out.print(sValue);
+            }
+            catch (com.sun.star.uno.Exception e)
+            {
+//                System.out.print(" FAILED ");
+            }
+            System.out.println();
+        }
+        System.out.println("---- Finish showing properties ----\n");
     }
 
+    private boolean checkPaths(Object _o, Object _o2)
+    {
+        String sLeftPath = "";
+        String sRightPath = "";
+        if (AnyConverter.isArray(_o))
+        {
+            try
+            {
+                Object oValues = AnyConverter.toArray(_o);
+                sLeftPath = convertToString(oValues);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+            }
+        }
+        else if (AnyConverter.isString(_o))
+        {
+            try
+            {
+                sLeftPath = AnyConverter.toString(_o);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+            }
+        }
+        
+        if (AnyConverter.isArray(_o2))
+        {
+            try
+            {
+                Object oValues = AnyConverter.toArray(_o2);
+                sRightPath = convertToString(oValues);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+            }
+        }
+        else if (AnyConverter.isString(_o2))
+        {
+            try
+            {
+                sRightPath = AnyConverter.toString(_o2);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+            }
+        }
+        return checkPaths(sLeftPath, sRightPath);
+    }
+    
     /**
-     * Verify if the values of xProp are the same as vals.
-     * @param xProp A XMultiPropertySet.
-     * @param propNames An array with property names.
-     * @param vals An array with values of the properties
-     * @return -1 if none are equal, 1 if all are equal, 0 if some were equal
-     * and some not.
-     * @throws com.sun.star.lang.IllegalArgumentException
+     * Check 2 given paths if the _aOtherPath exists in _aPath, _aPath could be a list separated by ';'
+     * @param _aPath
+     * @param _aOtherPath
+     * @return true, if _aOtherPath found
      */
-    private int verifyPropertySet(XMultiPropertySet xProp,
-                            String[] propNames, String[] vals)
+    private boolean checkPaths(String _aPath, String _aOtherPath)
     {
-        int ret=0;
-        if (vals.length != propNames.length) {
-            log.println("Length of array parameters must be equal.");
-            return ret;
-        }
-        for (int i = 0; i < vals.length; i++) {
-            Object[] objs = xProp.getPropertyValues(new String[]{propNames[i]});
-            String retVal = (String)objs[0];
-            boolean nCheck = retVal.equals(vals[i]);
-            if (!nCheck) {
-                log.println("Property '" + propNames[i] +
-                                        "' was supposed to have value:");
-                log.println(vals[i]);
-                log.println("but has value:");
-                log.println(retVal);
-            }
-            // initialize
-            if (i==0) {
-                ret = nCheck?1:-1;
-                continue;
-            }
-            // return 0 if equal state changes compared to initial value
-            if ((nCheck && ret<0) || (!nCheck && ret>0)) {
-                ret = 0;
-            }
-        }
-        return ret;
+        if (_aOtherPath.contains(";"))
+        {
+            StringTokenizer aToken = new StringTokenizer(_aOtherPath, ";");
+            int nCount = 0;
+            int nFound = 0;
+            while (aToken.hasMoreElements())
+            {
+                String sPath = (String)aToken.nextElement();
+                nCount ++;
+                if (checkPaths(_aPath, sPath))
+                {
+                    nFound++;
+                }
+            }
+            if (nFound == nCount)
+            {
+                return true;
+            }
+        }
+        else if(_aPath.contains(";"))
+        {
+            StringTokenizer aToken = new StringTokenizer(_aPath, ";");
+            while (aToken.hasMoreElements())
+            {
+                String sToken = (String)aToken.nextElement();
+                if (sToken.equals(_aOtherPath))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        else if (_aPath.equals(_aOtherPath))
+        {
+            return true;
+        }
+        return false;
     }
 
-
-    // ____________________
     /**
-     * This tests the XPropertySet interface implementation.
+     * This tests the XFastPropertySet interface implementation.
      */
-    public void checkXPropertySet()
+    @Test
+    public void checkXFastPropertySet()
+    {
+        System.out.println("---- Testing the XFastPropertySet interface ----");
+
+
+        // do for all properties
+        // xPropertyInfoOfPathSettings.length
+        for (int i = 0; i < aListOfWorkingProperty.size(); i++)
+        {
+            final Property property = aListOfWorkingProperty.get(i); // xPropertyInfoOfPathSettings[i];
+            String name = property.Name;
+            // get property name and initial value
+            System.out.println("Test property with name: " + name);
+            boolean bResult;
+            if (name.endsWith("_writable"))
+            {
+                bResult = checkStringProperty(property);
+            }
+            else if (name.endsWith("_user"))
+            {
+                bResult = checkStringListProperty(property);
+            }
+            else if (name.endsWith("_internal"))
+            {
+                bResult = checkStringListProperty(property);
+            }
+            else
+            {
+                // old path settings
+                bResult = checkStringProperty(property);
+            }
+            System.out.print(" Test of property " + name + " finished");
+            if (bResult)
+            {
+                System.out.println(" [ok]");
+            }
+            else
+            {
+                System.out.println(" [FAILED]");
+            }
+            System.out.println();
+        }
+        System.out.println("---- Test of XFastPropertySet finished ----\n");
+    }
+
+    private boolean checkStringListProperty(Property property)
     {
-        log.println("---- Testing the XPropertySet interface ----");
+        // creating instances
+        boolean bResult = true;
+        XFastPropertySet xFPS = UnoRuntime.queryInterface(XFastPropertySet.class, aPathSettings);
+
+        String name = property.Name;
+        int handle = property.Handle;
+        
+        Object oValue;
+        try
+        {
+            oValue = xFPS.getFastPropertyValue(handle);
+        }
+        catch (UnknownPropertyException ex)
+        {
+            return false;
+        }
+        catch (WrappedTargetException ex)
+        {
+            return false;
+        }
 
-        XPropertySet xPS = (XPropertySet)
-                            UnoRuntime.queryInterface(XPropertySet.class, oObj);
+        if (!AnyConverter.isArray(oValue))
+        {
+            System.out.println(" Internal error, type wrong. PathSetting property with name:" + name + " should be an array.");
+            return false;
+        }
 
-        MyChangeListener mListener1 = new MyChangeListener();
-        MyChangeListener mListener2 = new MyChangeListener();
+        String val;
+        try
+        {
+            Object oValues = AnyConverter.toArray(oValue);
 
-        for (int i=0; i<props.length; i++) {
-            // adding listeners
-            String name = propNames[i];
-            log.println("Testing property '" + name + "'");
-            try {
-                log.println("Add 2 Listeners.");
-                xPS.addPropertyChangeListener(name, mListener1);
-                xPS.addVetoableChangeListener(name, mListener1);
-                xPS.addPropertyChangeListener(name, mListener2);
-                xPS.addVetoableChangeListener(name, mListener2);
 
-                // change the property
-                log.println("Change value.");
-                String changeVal = changeToCorrectValue(propVals[i]);
-                xPS.setPropertyValue(name, changeVal);
-                String newVal = (String)xPS.getPropertyValue(name);
+            final String[] aValues = (String[])oValues;
 
-                assure("Value did not change on property " + name + ".",
-                                                    newVal.equals(changeVal));
+            // aNewValues contains a deep copy of aValues
+            String[] aNewValues = new String[aValues.length];
+            System.arraycopy(aValues, 0, aNewValues, 0, aValues.length);
+            if (aValues.length > 0)
+            {
+                val = aValues[0];
+            }
+            else
+            {
+                val = null;
+                aNewValues = new String[1]; // create a String list
+            }
+            System.out.println(" Property has initial value: '" + val + "'");
 
-                assure("Listener 1 was not called.", checkListener(mListener1), true);
-                assure("Listener 2 was not called.", checkListener(mListener2), true);
+            // set to a new correct value
+            String newVal = changeToCorrectValue(val);
+            assertFalse("newVal must not equal val.", newVal.equals(val));
 
-                mListener1.resetListener();
-                mListener2.resetListener();
+            System.out.println(" Try to change to a correct value '" + newVal + "'");
+            aNewValues[0] = newVal;
 
-                log.println("Remove Listener 1.");
+            try
+            {
+                try
+                {
+                    xFPS.setFastPropertyValue(handle, aNewValues);
+                }
+                catch (com.sun.star.lang.WrappedTargetException e)
+                {
+                    System.out.println(" FAIL: setFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage());
+                    bResult = false;
+                }
 
-                xPS.removePropertyChangeListener(name, mListener1);
-                xPS.removeVetoableChangeListener(name, mListener1);
+                // Property_internal can't change we will not arrive bejond this line
 
-                // change the property
-                log.println("Change value back.");
-                xPS.setPropertyValue(name, propVals[i]);
-                newVal = (String)xPS.getPropertyValue(name);
-                assure("Value did not change on property " + name,
-                                                    newVal.equals(propVals[i]));
+                // check the change
+                Object oObj = xFPS.getFastPropertyValue(handle);
+                if (!checkPaths(oObj, aNewValues))
+                {
+                    System.out.println(" FAIL: Did not change value on property " + name + ".");
+                    bResult = false;
+                }
 
-                assure("Listener was called, although it was removed on" +
-                        " property " + name + ".", !checkListener(mListener1), true);
-                assure("Listener 2 was not called on property " + name + ".",
-                                                    checkListener(mListener2), true);
+                // set back to initial setting
+                System.out.println(" Try to check");
+                try
+                {
+                    xFPS.setFastPropertyValue(handle, oValue);
+                }
+                catch (com.sun.star.beans.PropertyVetoException e)
+                {
+                    // should not occur
+                    System.out.println(" FAIL: PropertyVetoException caught: " + e.getMessage());
+                    bResult = false;
+                }
+            }
+            catch (com.sun.star.beans.PropertyVetoException e)
+            {
+                if (!name.endsWith("_internal"))
+                {
+                    // should not occur
+                   System.out.println(" FAIL: PropertyVetoException caught: " + e.getMessage());
+                   bResult = false;
+                }
+                else
+                {
+                   System.out.println(" OK: PropertyVetoException caught: " + e.getMessage() + " it seems not allowed to change internal values.");
+                }
             }
-            catch(com.sun.star.uno.Exception e) {
-                e.printStackTrace();
-                log.println(e.getClass().getName());
-                log.println("Message: " + e.getMessage());
-                failed("Unexpcted exception on property " + name);
-                continue;
+
+            // check if changed
+            Object checkVal3 = xFPS.getFastPropertyValue(handle);
+            if (!checkPaths(checkVal3, oValues))
+            {
+                System.out.println(" FAIL: Can't change value back to original on property " + name);
+                bResult = false;
             }
-            log.println("Finish testing property '" + propNames[i] + "'\n");
         }
-        log.println("---- Test of XPropertySet finished ----\n");
-
+        catch (com.sun.star.uno.Exception e)
+        {
+            System.out.println(" FAIL: getFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage());
+            bResult = false;
+        }
+        return bResult;
     }
 
-    private boolean checkListener(MyChangeListener ml) {
-        return  ml.changePropertyEventFired() ||
-                ml.changePropertiesEventFired() ||
-                ml.vetoableChangeEventFired();
+    private boolean checkStringProperty(Property property)
+    {
+        boolean bResult = true;
+        XFastPropertySet xFPS = UnoRuntime.queryInterface(XFastPropertySet.class, aPathSettings);
+        String name = property.Name;
+        int handle = property.Handle;
+        Object oValue;
+        try
+        {
+            oValue = xFPS.getFastPropertyValue(handle);
+        }
+        catch (UnknownPropertyException ex)
+        {
+            return false;
+        }
+        catch (WrappedTargetException ex)
+        {
+            return false;
+        }
+
+
+        try
+        {
+            String val = "";
+            val = AnyConverter.toString(oValue);
+            System.out.println(" Property has initial value: '" + val + "'");
+
+            // set to a new correct value
+            String newVal = changeToCorrectValue(val);
+            System.out.println(" Try to change to a correct value '" + newVal + "'");
+            xFPS.setFastPropertyValue(handle, newVal);
+
+            // check the change
+            String checkVal = (String) xFPS.getFastPropertyValue(handle);
+            if (!checkPaths(checkVal, newVal))
+            {
+                System.out.println("  FAIL: Did not change value on property " + name + ".");
+                bResult = false;
+            }
+            newVal = changeToIncorrectValue(val);
+            System.out.println(" Try to change to incorrect value '" + newVal + "'");
+            try
+            {
+                xFPS.setFastPropertyValue(handle, newVal);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+                System.out.println("  Correctly thrown Exception caught.");
+            }
+
+            // check if changed
+            String checkVal2 = (String) xFPS.getFastPropertyValue(handle);
+            if (!checkPaths(checkVal2, checkVal))
+            {
+                System.out.println("  FAIL: Value did change on property " + name + " though it should not have.");
+                bResult = false;
+            }
+            else
+            {
+                System.out.println("  OK: Incorrect value was not set.");
+            }
+            // set back to initial setting
+            System.out.println(" Set back to initial value.");
+            try
+            {
+                xFPS.setFastPropertyValue(handle, val);
+            }
+            catch (com.sun.star.lang.IllegalArgumentException e)
+            {
+                System.out.println("  IllegalArgumentException caught: " + e.getMessage());
+                bResult = false;
+            }
+            // check if changed
+            String checkVal3 = (String) xFPS.getFastPropertyValue(handle);
+            if (!checkVal3.equals(val))
+            {
+                if (!checkPaths(checkVal3, val))
+                {
+                    System.out.println("  FAIL: Can't change value back to original on property " + name);
+                    System.out.println("  Value is: " + checkVal3);
+
+                    bResult = false;
+                }
+                else
+                {
+                    System.out.println("  OK: the pathsettings contains the original path.");
+                    System.out.println("         Value is: " + checkVal3);
+                    System.out.println("  Value should be: " + val);
+                }
+            }
+            else
+            {
+                System.out.println("  OK: Change value back to original on property " + name);
+            }
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            System.out.println(" FAIL: getFastPropertyValue(handle:=" + handle + ", name:='" + name + "')" + e.getMessage());
+            bResult = false;
+        }
+        return bResult;
     }
 
     // ____________________
     /**
+     * This tests the XMultiPropertySet interface implementation.
+     */
+
+    // The test checkXMultiPropertySet() has been marked as outdated!
+
+//    @Test
+//    public void checkXMultiPropertySet()
+//    {
+//        System.out.println("---- Testing the XMultiPropertySet interface ----");
+//        XMultiPropertySet xMPS = UnoRuntime.queryInterface(XMultiPropertySet.class, aPathSettings);
+//
+//        // xPropertyInfoOfPathSettings.length
+//        String[] propertiesToTest = new String[1];
+//        propertiesToTest[0] = availablePropNames[0];
+//
+//        String[] correctVals = new String[propertiesToTest.length];
+//        String[] incorrectVals = new String[propertiesToTest.length];
+//
+//        String[] aPathSettingWorkingNames = null;
+//        aPathSettingWorkingNames = new String[propertiesToTest.length];
+//
+//        // get intitial values and create new ones
+//        for (int i = 0; i < propertiesToTest.length; i++)
+//        {
+//            // Property aProp = aListOfWorkingProperty.get(i);
+//            final String sName = propertiesToTest[i];
+//            final String sValue = getPropertyValueAsString(sName);
+//            aPathSettingWorkingNames[i] = sName;
+//            correctVals[i] = changeToCorrectValue(sValue);
+//            incorrectVals[i] = changeToIncorrectValue(sValue);
+//        }
+//
+//        try
+//        {
+//            // add a change listener
+//            MyChangeListener mListener = new MyChangeListener();
+//            xMPS.addPropertiesChangeListener(aPathSettingWorkingNames, mListener);
+//
+//            // first change xPropertyInfoOfPathSettings to correct values
+//            System.out.println("Change to correct values.");
+//            xMPS.setPropertyValues(aPathSettingWorkingNames, correctVals);
+//            assertTrue("Could not change to correct values with XMultiPropertySet.",
+//                    verifyPropertySet(xMPS, aPathSettingWorkingNames, correctVals) > 0);
+//
+//            // second, change to incorrect values: expect an exception
+//            System.out.println("Try to change to incorrect values.");
+//            try
+//            {
+//                xMPS.setPropertyValues(aPathSettingWorkingNames, incorrectVals);
+//            }
+//            catch (com.sun.star.lang.IllegalArgumentException r)
+//            {
+//                System.out.println("Correctly thrown Exception caught.");
+//            }
+//            assertTrue("Did change to incorrect values with XMultiPropertySet,"
+//                    + " but should not have.",
+//                    verifyPropertySet(xMPS, aPathSettingWorkingNames, correctVals) > 0);
+//
+//            // third, change back to initial values
+//            System.out.println("Change back to initial values.");
+//            xMPS.setPropertyValues(aPathSettingWorkingNames, aPathSettingValues);
+//            assertTrue("Could not change back to initial values with"
+//                    + " XMultiPropertySet.",
+//                    verifyPropertySet(xMPS, aPathSettingWorkingNames, aPathSettingValues) > 0);
+//
+//            // fire the event for the listener
+//            System.out.println("Fire event.");
+//            xMPS.firePropertiesChangeEvent(aPathSettingWorkingNames, mListener);
+//            assertTrue("Event was not fired on XMultiPropertySet.",
+//                    mListener.changePropertiesEventFired());
+//        }
+//        catch (com.sun.star.uno.Exception e)
+//        {
+////            e.printStackTrace();
+//            System.out.println(e.getClass().getName());
+//            System.out.println("Message: " + e.getMessage());
+//            fail("Unexpected exception on XMultiPropertySet.");
+//        }
+//
+//        // test finished
+//        System.out.println("---- Test of XMultiPropertySet finished ----\n");
+//    }
+
+    /**
+     * Verify if the values of xPropSet_of_PathSettings are the same as vals.
+     * @param xPropSet_of_PathSettings A XMultiPropertySet.
+     * @param aPathSettingWorkingNames An array with property names.
+     * @param vals An array with values of the properties
+     * @return -1 if none are equal, 1 if all are equal, 0 if some were equal
+     * and some not.
+     * @throws com.sun.star.lang.IllegalArgumentException
+     */
+//    private int verifyPropertySet(XMultiPropertySet xProp,
+//            String[] propNames, String[] vals)
+//    {
+//        int ret = 0;
+//        if (vals.length != propNames.length)
+//        {
+//            System.out.println("Length of array parameters must be equal.");
+//            return ret;
+//        }
+//        for (int i = 0; i < vals.length; i++)
+//        {
+//            Object[] objs = xProp.getPropertyValues(new String[]
+//                    {
+//                        propNames[i]
+//                    });
+//            String retVal = (String) objs[0];
+//            boolean nCheck = retVal.equals(vals[i]);
+//            if (!nCheck)
+//            {
+//                System.out.println("Property '" + propNames[i]
+//                        + "' was supposed to have value:");
+//                System.out.println(vals[i]);
+//                System.out.println("but has value:");
+//                System.out.println(retVal);
+//            }
+//            // initialize
+//            if (i == 0)
+//            {
+//                ret = nCheck ? 1 : -1;
+//                continue;
+//            }
+//            // return 0 if equal state changes compared to initial value
+//            if ((nCheck && ret < 0) || (!nCheck && ret > 0))
+//            {
+//                ret = 0;
+//            }
+//        }
+//        return ret;
+//    }
+
+    // ____________________
+    /**
+     * This tests the XPropertySet interface implementation.
+     */
+
+// The test checkXPropertySet() has been marked as outdated!
+
+
+//    @Test
+//    public void checkXPropertySet()
+//    {
+//        System.out.println("---- Testing the XPropertySet interface ----");
+//
+//        XPropertySet xPS = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings);
+//
+//        MyChangeListener mListener1 = new MyChangeListener();
+//        MyChangeListener mListener2 = new MyChangeListener();
+//
+//        for (int i = 0; i < xPropertyInfoOfPathSettings.length; i++)
+//        {
+//            // adding listeners
+//            String name = aPathSettingNames[i];
+//            System.out.println("Testing property '" + name + "'");
+//            try
+//            {
+//                System.out.println("Add 2 Listeners.");
+//                xPS.addPropertyChangeListener(name, mListener1);
+//                xPS.addVetoableChangeListener(name, mListener1);
+//                xPS.addPropertyChangeListener(name, mListener2);
+//                xPS.addVetoableChangeListener(name, mListener2);
+//
+//                // change the property
+//                System.out.println("Change value.");
+//                String changeVal = changeToCorrectValue(aPathSettingValues[i]);
+//                xPS.setPropertyValue(name, changeVal);
+//                String newVal = (String) xPS.getPropertyValue(name);
+//
+//                assertTrue("Value did not change on property " + name + ".",
+//                        newVal.equals(changeVal));
+//
+//                assertTrue("Listener 1 was not called.", checkListener(mListener1));
+//                assertTrue("Listener 2 was not called.", checkListener(mListener2));
+//
+//                mListener1.resetListener();
+//                mListener2.resetListener();
+//
+//                System.out.println("Remove Listener 1.");
+//
+//                xPS.removePropertyChangeListener(name, mListener1);
+//                xPS.removeVetoableChangeListener(name, mListener1);
+//
+//                // change the property
+//                System.out.println("Change value back.");
+//                xPS.setPropertyValue(name, aPathSettingValues[i]);
+//                newVal = (String) xPS.getPropertyValue(name);
+//                assertTrue("Value did not change on property " + name,
+//                        newVal.equals(aPathSettingValues[i]));
+//
+//                assertTrue("Listener was called, although it was removed on"
+//                        + " property " + name + ".", !checkListener(mListener1));
+//                assertTrue("Listener 2 was not called on property " + name + ".",
+//                        checkListener(mListener2));
+//            }
+//            catch (com.sun.star.uno.Exception e)
+//            {
+//                System.out.println(e.getClass().getName());
+//                System.out.println("Message: " + e.getMessage());
+//                fail("Unexpcted exception on property " + name);
+//            }
+//            System.out.println("Finish testing property '" + aPathSettingNames[i] + "'\n");
+//        }
+//        System.out.println("---- Test of XPropertySet finished ----\n");
+//
+//    }
+
+//    private boolean checkListener(MyChangeListener ml)
+//    {
+//        return ml.changePropertyEventFired()
+//                || ml.changePropertiesEventFired()
+//                || ml.vetoableChangeEventFired();
+//    }
+
+    // ____________________
+    /**
      * Change the given String to a correct path URL.
      * @return The changed path URL.
      */
-    private String changeToCorrectValue(String path) {
+    private String changeToCorrectValue(String path)
+    {
         // the simplest possiblity
-        if ( path == null || path.equals("") ) {
-            return "file:///tmp";
+        if (path == null || path.equals(""))
+        {
+            String sTempDir = System.getProperty("java.io.tmpdir");
+            sTempDir = util.utils.getFullURL(sTempDir);
+            return sTempDir; // "file:///tmp";
         }
-        return path + "/tmp";
+        return graphical.FileHelper.appendPath(path, "tmp");
     }
 
-
     /**
      * Change the given String to an incorrect path URL.
      * @return The changed path URL.
      */
-    private String changeToIncorrectValue(String path) {
-        // the simplest possiblity
+    private String changeToIncorrectValue(String path)
+    {
+        // return an illegal path
         return "fileblablabla";
     }
 
-
     /**
-    * Listener implementation which sets a flag when
-    * listener was called.
-    */
+     * Listener implementation which sets a flag when
+     * listener was called.
+     */
     public class MyChangeListener implements XPropertiesChangeListener,
-                                                XPropertyChangeListener,
-                                                XVetoableChangeListener {
-
-         private boolean propChanged = false;
-         private boolean propertiesChanged = false;
-         private boolean disposeCalled = false;
-         private boolean vetoableChanged = false;
-
-         public void propertiesChange(
-                    com.sun.star.beans.PropertyChangeEvent[] e) {
-             propertiesChanged = true;
-         }
-
-         public void vetoableChange(com.sun.star.beans.PropertyChangeEvent pE)
-                            throws com.sun.star.beans.PropertyVetoException {
-             vetoableChanged = true;
-         }
-
-         public void propertyChange(com.sun.star.beans.PropertyChangeEvent pE) {
-             propChanged = true;
-         }
-
-         public void disposing(com.sun.star.lang.EventObject eventObject) {
-             disposeCalled = true;
-         }
-
-         public void resetListener() {
-             propChanged = false;
-             propertiesChanged = false;
-             disposeCalled = false;
-             vetoableChanged = false;
-         }
-
-         public boolean changePropertyEventFired() {
-             return propChanged;
-         }
-         public boolean changePropertiesEventFired() {
-             return propertiesChanged;
-         }
-         public boolean vetoableChangeEventFired() {
-             return vetoableChanged;
-         }
+            XPropertyChangeListener,
+            XVetoableChangeListener
+    {
 
-    };
+        private boolean propChanged = false;
+        private boolean propertiesChanged = false;
+        private boolean disposeCalled = false;
+        private boolean vetoableChanged = false;
+
+        public void propertiesChange(
+                com.sun.star.beans.PropertyChangeEvent[] e)
+        {
+            propertiesChanged = true;
+        }
+
+        public void vetoableChange(com.sun.star.beans.PropertyChangeEvent pE)
+                throws com.sun.star.beans.PropertyVetoException
+        {
+            vetoableChanged = true;
+        }
+
+        public void propertyChange(com.sun.star.beans.PropertyChangeEvent pE)
+        {
+            propChanged = true;
+        }
+
+        public void disposing(com.sun.star.lang.EventObject eventObject)
+        {
+            disposeCalled = true;
+        }
+
+        public void resetListener()
+        {
+            propChanged = false;
+            propertiesChanged = false;
+            disposeCalled = false;
+            vetoableChanged = false;
+        }
+
+        public boolean changePropertyEventFired()
+        {
+            return propChanged;
+        }
+
+        public boolean changePropertiesEventFired()
+        {
+            return propertiesChanged;
+        }
+
+        public boolean vetoableChangeEventFired()
+        {
+            return vetoableChanged;
+        }
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index 88877d8c76..23eea8da42 100755
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
@@ -29,16 +29,26 @@ package complex.path_substitution;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.XStringSubstitution;
-import complexlib.ComplexTestCase;
+
 import java.util.Vector;
 
+// ---------- junit imports -----------------
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+// ------------------------------------------
+
 /**
  *
  */
-public class PathSubstitutionTest extends ComplexTestCase {
+public class PathSubstitutionTest
+{
 
     private static XMultiServiceFactory xMSF;
-
     // all substitution variables
     private VariableContainer substVars = null;
 
@@ -47,14 +57,14 @@ public class PathSubstitutionTest extends ComplexTestCase {
      * Right now, it's only 'checkXStringSubstitution'.
      * @return All test methods.
      */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkXStringSubstitution"};
-    }
-
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkXStringSubstitution"};
+//    }
     /**
      * Create an array with all substitution variables
      */
-    private void initialize() {
+    @Before private void initialize()
+    {
         substVars = new VariableContainer();
         substVars.add("$(prog)", false, true);
         substVars.add("$(inst)", false, true);
@@ -64,65 +74,72 @@ public class PathSubstitutionTest extends ComplexTestCase {
         substVars.add("$(temp)", false, true);
         substVars.add("$(lang)", false, false);
         substVars.add("$(langid)", false, false);
-        substVars.add("$(vlang)", false,false);
+        substVars.add("$(vlang)", false, false);
         // path won't resubstitute
-        substVars.add("$(path)", false,false);
+        substVars.add("$(path)", false, false);
     }
 
     /**
      * One actual test: as the method 'getTestMethodNames()' tells.
      */
-    public void checkXStringSubstitution()
+    @Test public void checkXStringSubstitution()
     {
-        xMSF = (XMultiServiceFactory)param.getMSF();
-        log.println("---- Testing the XStringSubstitution interface ----");
-        log.println("Create intance of test object.\n");
+        xMSF = getMSF();
+        System.out.println("---- Testing the XStringSubstitution interface ----");
+        System.out.println("Create intance of test object.\n");
         XStringSubstitution oObj = null;
-        try {
+        try
+        {
             Object x = xMSF.createInstance(
-                                "com.sun.star.util.PathSubstitution");
-            oObj = (XStringSubstitution)
-                        UnoRuntime.queryInterface(XStringSubstitution.class, x);
-            if (oObj == null) throw new com.sun.star.uno.Exception();
-        }
-        catch(com.sun.star.uno.Exception e) {
-            log.println(e.getClass().getName());
-            log.println("Message: " + e.getMessage());
-            failed("Could not create an instance of the test object.");
+                    "com.sun.star.util.PathSubstitution");
+            oObj = UnoRuntime.queryInterface(XStringSubstitution.class, x);
+            if (oObj == null)
+            {
+                throw new com.sun.star.uno.Exception();
+            }
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            System.out.println(e.getClass().getName());
+            System.out.println("Message: " + e.getMessage());
+            fail("Could not create an instance of the test object.");
             return;
         }
 
-        initialize();
+//        initialize();
 
-        for (int i=0; i<substVars.size(); i++) {
+        for (int i = 0; i < substVars.size(); i++)
+        {
             String var = substVars.getVariable(i);
-            log.println("Testing var '" + var + "'");
-            try {
+            System.out.println("Testing var '" + var + "'");
+            try
+            {
                 String substVal = oObj.getSubstituteVariableValue(var);
-                log.println("\tvalue '" + substVal + "'");
-                substVars.putValue(i,substVal);
+                System.out.println("\tvalue '" + substVal + "'");
+                substVars.putValue(i, substVal);
 
                 // simple check: let path in a string replace
                 String substString = var + "/additional/path";
 
-                log.println("Substitute '"+substString+"'");
+                System.out.println("Substitute '" + substString + "'");
                 String newValue = oObj.substituteVariables(substString, true);
-                log.println("Return value '"+newValue+"'");
+                System.out.println("Return value '" + newValue + "'");
                 // 2do: better check for correct substitution
-                assure("Did not substitute '"
-                        + substString+"' to '" + newValue
+                assertTrue("Did not substitute '"
+                        + substString + "' to '" + newValue
                         + "' correctly:", newValue.startsWith(substVal));
 
                 // simple check part two:
                 //make substitution backwards if possible
-                if (substVars.canReSubstitute(i)) {
+                if (substVars.canReSubstitute(i))
+                {
                     substString = substVal + "/additional/path";
 
-                    log.println("Substitute backwards '"+substString+"'");
+                    System.out.println("Substitute backwards '" + substString + "'");
                     newValue = oObj.reSubstituteVariables(substString);
-                    log.println("Return value '"+newValue+"'");
+                    System.out.println("Return value '" + newValue + "'");
                     // 2do: better check for correct substitution
-                    assure("Did not reSubstitute '"
+                    assertTrue("Did not reSubstitute '"
                             + substString + "' to '" + newValue
                             + "' correctly:", checkResubstitute(newValue, var));
                 }
@@ -131,28 +148,32 @@ public class PathSubstitutionTest extends ComplexTestCase {
                 //in middle of text works
                 substString = "file:///starting/" + var + "/path";
 
-                log.println("Substitute '"+substString+"'");
+                System.out.println("Substitute '" + substString + "'");
                 newValue = oObj.substituteVariables(substString, false);
-                log.println("Return value '"+newValue+"'");
+                System.out.println("Return value '" + newValue + "'");
                 boolean erg = true;
-                if(substVars.onlySubstituteAtBegin(i))
+                if (substVars.onlySubstituteAtBegin(i))
+                {
                     // in this case it should not have worked
-                    erg = newValue.indexOf(substVal)==-1;
+                    erg = newValue.indexOf(substVal) == -1;
+                }
                 else
-                    erg = newValue.indexOf(substVal)!=-1;
-
-                assure("Did not substitute '"
+                {
+                    erg = newValue.indexOf(substVal) != -1;
+                }
+                assertTrue("Did not substitute '"
                         + substString + "' to '" + newValue
                         + "' correctly:", erg);
 
             }
-            catch(com.sun.star.uno.Exception e) {
-                log.println(e.getClass().getName());
-                log.println("Message: " + e.getMessage());
-                failed("Could not create an instance of the test object.");
+            catch (com.sun.star.uno.Exception e)
+            {
+                System.out.println(e.getClass().getName());
+                System.out.println("Message: " + e.getMessage());
+                fail("Could not create an instance of the test object.");
                 return;
             }
-            log.println("Finish testing '" + var + "'\n");
+            System.out.println("Finish testing '" + var + "'\n");
         }
 
         // check of greedy resubstitution
@@ -161,20 +182,21 @@ public class PathSubstitutionTest extends ComplexTestCase {
         String instPth = substVars.getValue(inst);
         String progPth = substVars.getValue(prog);
 
-        if (progPth.startsWith(instPth) && instPth.startsWith(progPth)) {
-            log.println("Greedy ReSubstitute");
+        if (progPth.startsWith(instPth) && instPth.startsWith(progPth))
+        {
+            System.out.println("Greedy ReSubstitute");
             String substString = progPth + "/additional/path";
             String newVal = oObj.reSubstituteVariables(substString);
-            log.println("String '" + substString +
-                                "' should be resubstituted with");
-            log.println("Variable '" + prog + "' instead of Variable '" +
-                                inst + "'");
-            assure("Did not reSubstitute '" + substString
+            System.out.println("String '" + substString
+                    + "' should be resubstituted with");
+            System.out.println("Variable '" + prog + "' instead of Variable '"
+                    + inst + "'");
+            assertTrue("Did not reSubstitute '" + substString
                     + "' to '" + newVal + "' correctly:",
                     newVal.startsWith(prog));
         }
 
-        log.println(
+        System.out.println(
                 "---- Finish testing the XStringSubstitution interface ----");
     }
 
@@ -182,65 +204,118 @@ public class PathSubstitutionTest extends ComplexTestCase {
      * test the resubstitution
      * @return true, if resubstitution is correct.
      */
-    private boolean checkResubstitute(String subst, String original) {
+    private boolean checkResubstitute(String subst, String original)
+    {
         // simple: subst starts with original
-        if ( subst.startsWith(original) ) {
+        if (subst.startsWith(original))
+        {
             return true;
         }
-        else  {                             // hard: been resubstituted with a differernt variable.
-            for (int i=0; i<substVars.size(); i++) {
+        else
+        {                             // hard: been resubstituted with a differernt variable.
+            for (int i = 0; i < substVars.size(); i++)
+            {
                 String var = substVars.getVariable(i);
-                if ( subst.startsWith(var) && original.startsWith(original)) {
+                if (subst.startsWith(var) && original.startsWith(original))
+                {
                     return true;
                 }
             }
         }
         return false;
     }
+
     /**
      * Class for containing the substitution variables with their
      * values and some information.
      */
-    private class VariableContainer {
+    private class VariableContainer
+    {
+
         public Vector varName;
         public Vector varValue;
         public Vector substAtBegin;
         public Vector resubst;
 
-        public VariableContainer() {
+        public VariableContainer()
+        {
             varName = new Vector();
             varValue = new Vector();
             substAtBegin = new Vector();
             resubst = new Vector();
         }
 
-        public void add(String var) {
+        public void add(String var)
+        {
             varName.add(var);
             substAtBegin.add(Boolean.TRUE);
             resubst.add(Boolean.TRUE);
         }
+
         public void add(String var, boolean onlySubstAtBegin,
-                                                        boolean canResubst) {
+                boolean canResubst)
+        {
             varName.add(var);
             this.substAtBegin.add(new Boolean(onlySubstAtBegin));
             this.resubst.add(new Boolean(canResubst));
         }
 
-        public void putValue(int i, String val) {
+        public void putValue(int i, String val)
+        {
             varValue.add(i, val);
         }
 
-        public int size() { return varName.size(); }
-        public String getVariable(int i) { return (String)varName.get(i); }
-        public String getValue(int i) { return (String)varName.get(i); }
-        public String getValue(String var) {
-            return (String)varValue.get(varName.indexOf(var));
+        public int size()
+        {
+            return varName.size();
         }
-        public boolean onlySubstituteAtBegin(int i) {
-            return ((Boolean)substAtBegin.get(i)).booleanValue();
+
+        public String getVariable(int i)
+        {
+            return (String) varName.get(i);
         }
-        public boolean canReSubstitute(int i) {
-            return ((Boolean)resubst.get(i)).booleanValue();
+
+        public String getValue(int i)
+        {
+            return (String) varName.get(i);
         }
+
+        public String getValue(String var)
+        {
+            return (String) varValue.get(varName.indexOf(var));
+        }
+
+        public boolean onlySubstituteAtBegin(int i)
+        {
+            return ((Boolean) substAtBegin.get(i)).booleanValue();
+        }
+
+        public boolean canReSubstitute(int i)
+        {
+            return ((Boolean) resubst.get(i)).booleanValue();
+        }
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
     }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
deleted file mode 100755
index a266d3fa41..0000000000
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ /dev/null
@@ -1,83 +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 = ..$/..$/..
-TARGET  = PathSubstitution
-PRJNAME = $(TARGET)
-PACKAGE = complex$/path_substitution
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-JAVAFILES       = PathSubstitutionTest.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-
diff --git a/framework/qa/complex/sequence/CheckSequenceOfEnum.java b/framework/qa/complex/sequence/CheckSequenceOfEnum.java
deleted file mode 100755
index 90399c5030..0000000000
--- a/framework/qa/complex/sequence/CheckSequenceOfEnum.java
+++ /dev/null
@@ -1,95 +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.
- *
- ************************************************************************/
-package complex.sequence;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.enumexample.XEnumSequence;
-import com.sun.star.beans.PropertyState;
-import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
-
-/**
- * The test is for bug 111128. The mapping of sequence<enumeration> between
- * Java and C++ from the IDL definition was erroneous. This test checks, if
- * the mapping works.
- */
-public class CheckSequenceOfEnum extends ComplexTestCase {
-
-    /**
-     * Return all test methods.
-     * @return The test methods.
-     */
-    public String[] getTestMethodNames() {
-        return new String[]{"checkSequence"};
-    }
-
-    /**
-     * Check the sequence<enumeration> mapping between Java and C++.
-     * Since the Office does
-     * not use such a construct itself, a C++ component with an own defined
-     * interface is used for testing.
-     */
-    public void checkSequence() {
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF();
-            Object oObj = xMSF.createInstance("com.sun.star.enumexample.ChangeSequenceOrder");
-            assure("Build the shared library 'changeSequenceOrder' in directory 'enumexample' and\n"
-                    + "register the created zip 'EnumSequenceComponent' before executing this test.", oObj != null);
-            // build a first sequence
-            PropertyState[] aOriginalSequence = new PropertyState[] {
-                    PropertyState.DIRECT_VALUE,
-                    PropertyState.DEFAULT_VALUE,
-                    PropertyState.AMBIGUOUS_VALUE
-            };
-            XEnumSequence xSequence = (XEnumSequence)UnoRuntime.queryInterface(XEnumSequence.class, oObj);
-            PropertyState[] aChangedSequence = xSequence.getSequenceInChangedOrder(aOriginalSequence);
-            assure("Did not return a correct sequence.", checkSequence(aOriginalSequence, aChangedSequence));
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-            failed("Exception!");
-        }
-    }
-
-    private boolean checkSequence(PropertyState[] aOriginalSequence, PropertyState[] aChangedSequence) {
-        boolean erg = true;
-        int length = aOriginalSequence.length;
-        for ( int i=0; i<length; i++ ) {
-            if ( aOriginalSequence[i] != aChangedSequence[length -1 - i]) {
-                log.println("Checking '" + aOriginalSequence[i] + "' == '" + aChangedSequence[length - 1 - i] + "'");
-                erg = false;
-            }
-            if ( aChangedSequence[length - 1 - i].getValue() != PropertyState.fromInt(i).getValue() ) {
-                log.println("Checking '" + aChangedSequence[length - 1 - i].getValue() + "' == '" + PropertyState.fromInt(i).getValue() + "'");
-                erg = false;
-            }
-        }
-        return erg;
-    }
-}
-
-
diff --git a/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk
deleted file mode 100755
index ba18b278d7..0000000000
--- a/framework/qa/complex/sequence/makefile.mk
+++ /dev/null
@@ -1,98 +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 = ..$/..$/..
-TARGET  = CheckSequenceOfEnum
-PRJNAME = $(TARGET)
-PACKAGE = complex$/sequence
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar CheckSequenceOfEnum.jar
-JAVAFILES       = CheckSequenceOfEnum.java
-
-ENUMSEQUENCEIDL =  com.sun.star.enumexample.XEnumSequence
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE) com
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).CheckSequenceOfEnum
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-RDB = $(BIN)$/myudkapi.rdb
-JAVADIR = $(OUT)$/misc$/java
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL: GENJAVAFILES ALLTAR
-.ELSE
-ALL: ALLDEP
-.ENDIF
-
-
-.INCLUDE :  target.mk
-
-$(RDB) : 
-    +idlc -I$(IDL) -I$(SOLARIDLDIR) -O$(BIN) $?
-    +regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
-    +regmerge $@ / $(SOLARBINDIR)$/udkapi.rdb
-    touch $@
-
-GENJAVAFILES :
-    -+$(MKDIR) $(CLASSDIR) >& $(NULLDEV)
-    -+$(MKDIR) $(JAVADIR)  >& $(NULLDEV)
-    +javamaker -BUCR -nD -O$(CLASSDIR) $(RDB) -T$(ENUMSEQUENCEIDL)
-
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
-
-run: RUN
diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java
index da9bb3bd50..71774b4a62 100644..100755
--- a/framework/qa/unoapi/Test.java
+++ b/framework/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.framework.qa.unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc",
-                "testdocuments", "-cs", connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();
diff --git a/framework/qa/unoapi/framework.sce b/framework/qa/unoapi/framework.sce
index dad0c838de..76f3d1b089 100755
--- a/framework/qa/unoapi/framework.sce
+++ b/framework/qa/unoapi/framework.sce
@@ -2,7 +2,7 @@
 -o fwl.FilterFactory
 -o fwl.FrameLoaderFactory
 -o fwl.SubstituteVariables
--o fwl.TypeDetection
+#i113245 -o fwl.TypeDetection
 #i84346 -o fwl.PathSettings
 -o fwk.DispatchRecorder
 -o fwk.DispatchRecorderSupplier
@@ -17,7 +17,7 @@
 -o fwk.ServiceHandler
 -o fwk.URLTransformer
 -o fwk.MacrosMenuController
--o fwk.ModuleManager
+#i112746 -o fwk.ModuleManager
 -o fwk.UIElementFactoryManager
 -o fwk.UICommandDescription
 -o fwk.LayoutManager
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
deleted file mode 100755
index 38a6cf7cce..0000000000
--- a/framework/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = framework
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/framework/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/framework/qa/unoapi/testdocuments/Calc_Link.sxc b/framework/qa/unoapi/testdocuments/Calc_Link.sxc
index 086c04fe04..086c04fe04 100644..100755
--- a/framework/qa/unoapi/testdocuments/Calc_Link.sxc
+++ b/framework/qa/unoapi/testdocuments/Calc_Link.sxc
diff --git a/framework/qa/unoapi/testdocuments/Writer_link.sxw b/framework/qa/unoapi/testdocuments/Writer_link.sxw
index 5e5c8bdcb8..5e5c8bdcb8 100644..100755
--- a/framework/qa/unoapi/testdocuments/Writer_link.sxw
+++ b/framework/qa/unoapi/testdocuments/Writer_link.sxw
diff --git a/framework/qa/unoapi/testdocuments/XTypeDetection.sxw b/framework/qa/unoapi/testdocuments/XTypeDetection.sxw
index b241f4ed87..b241f4ed87 100644..100755
--- a/framework/qa/unoapi/testdocuments/XTypeDetection.sxw
+++ b/framework/qa/unoapi/testdocuments/XTypeDetection.sxw
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index a1742b688c..a1742b688c 100644..100755
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index e2eb8d0f36..ef23cabea3 100644..100755
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -197,7 +197,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     rCache.setKeyCommandPair(aKeyEvent, sCommand);
 
     aWriteLock.unlock();
@@ -303,7 +303,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
     
-    AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rCache = impl_getCFG(sal_True); // sal_True => force getting of a writeable cache!
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
@@ -323,7 +323,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     try
     {
         xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), sal_True);
@@ -366,7 +366,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     aReadLock.unlock();    
     // <- SAFE ----------------------------------
 
@@ -427,7 +427,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 {
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create!
+    css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // sal_True => open or create!
     aReadLock.unlock();
     // <- SAFE ----------------------------------
 
@@ -768,8 +768,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
 
-    AcceleratorCache& rPrimaryCache   = impl_getCFG(sal_True, sal_True ); // TRUE => force getting of a writeable cache!
-    AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); // TRUE => force getting of a writeable cache!
+    AcceleratorCache& rPrimaryCache   = impl_getCFG(sal_True, sal_True ); // sal_True => force getting of a writeable cache!
+    AcceleratorCache& rSecondaryCache = impl_getCFG(sal_False, sal_True); // sal_True => force getting of a writeable cache!
 
     if ( rPrimaryCache.hasKey(aKeyEvent) )
     {
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 81466165ca..41df4339ae 100644..100755
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -210,7 +210,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/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx
index 14bc3d611a..14bc3d611a 100644..100755
--- a/framework/source/accelerators/acceleratorexecute.hxx
+++ b/framework/source/accelerators/acceleratorexecute.hxx
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 0ad751e9e6..0ad751e9e6 100644..100755
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 3d2c8d9bad..3d2c8d9bad 100644..100755
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index c5effdcb82..c5effdcb82 100644..100755
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
diff --git a/framework/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk
deleted file mode 100644
index 23a60dd187..0000000000
--- a/framework/source/accelerators/makefile.mk
+++ /dev/null
@@ -1,52 +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=			framework
-TARGET=             fwk_accelerators
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/keymapping.obj                      \
-                    $(SLO)$/storageholder.obj                   \
-                    $(SLO)$/presethandler.obj                   \
-                    $(SLO)$/acceleratorcache.obj                \
-                    $(SLO)$/acceleratorconfiguration.obj        \
-                    $(SLO)$/globalacceleratorconfiguration.obj  \
-                    $(SLO)$/moduleacceleratorconfiguration.obj  \
-                    $(SLO)$/documentacceleratorconfiguration.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index e0ee119910..e0ee119910 100644..100755
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 408833e5e1..408833e5e1 100644..100755
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 43051b58ba..43051b58ba 100644..100755
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index f45417734d..f45417734d 100644..100755
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
index ebaae79821..ebaae79821 100644..100755
--- a/framework/source/application/login.cxx
+++ b/framework/source/application/login.cxx
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index e80b12df51..7ab37649b7 100644..100755
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -108,7 +108,7 @@ void SAL_CALL DropTargetListener::drop( const css::datatransfer::dnd::DropTarget
             // at first check filelist format
             if ( aHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList ) )
             {
-                ULONG i, nCount = aFileList.Count();
+                sal_uLong i, nCount = aFileList.Count();
                 for ( i = 0; i < nCount; ++i )
                     implts_OpenFile( aFileList.GetFile(i) );
                 bFormatFound = sal_True;
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 90be4cfab4..90be4cfab4 100644..100755
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index a2d2641694..ad171f0ef1 100644..100755
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -31,7 +31,7 @@
 
 #include <classes/fwktabwindow.hxx>
 #include "framework.hrc"
-#include <classes/fwlresid.hxx>
+#include <classes/fwkresid.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
@@ -46,6 +46,7 @@
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/stream.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include <vcl/msgbox.hxx>
@@ -70,10 +71,10 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
 
 // -----------------------------------------------------------------------
 
-void FwkTabControl::BroadcastEvent( ULONG nEvent )
+void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
 {
     if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
-        ImplCallEventListeners( nEvent, (void*)(ULONG)GetCurPageId() );
+        ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
     else
     {
         DBG_ERRORFILE( "FwkTabControl::BroadcastEvent(): illegal event" );
@@ -156,7 +157,7 @@ sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod )
         }
         catch ( uno::Exception& )
         {
-            DBG_ERRORFILE( "FwkTabPage::CallMethod(): exception of XDialogEventHandler::callHandlerMethod()" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     return bRet;
@@ -204,9 +205,9 @@ void FwkTabPage::Resize()
 
 FwkTabWindow::FwkTabWindow( Window* pParent ) :
 
-    Window( pParent, FwlResId( WIN_TABWINDOW ) ),
+    Window( pParent, FwkResId( WIN_TABWINDOW ) ),
 
-    m_aTabCtrl  ( this, FwlResId( TC_TABCONTROL ) )
+    m_aTabCtrl  ( this, FwkResId( TC_TABCONTROL ) )
 {
     uno::Reference < lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     m_xWinProvider = uno::Reference < awt::XContainerWindowProvider >(
@@ -288,7 +289,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
 
 IMPL_LINK( FwkTabWindow, ActivatePageHdl, TabControl *, EMPTYARG )
 {
-    const USHORT nId = m_aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
     FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl.GetTabPage( nId ) );
     if ( !pTabPage )
     {
@@ -367,7 +368,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
 
     TabEntry* pEntry = new TabEntry( nIndex, sPageURL, xEventHdl );
     m_TabList.push_back( pEntry );
-    USHORT nIdx = static_cast< USHORT >( nIndex );
+    sal_uInt16 nIdx = static_cast< sal_uInt16 >( nIndex );
     m_aTabCtrl.InsertPage( nIdx, sTitle );
     if ( sToolTip.getLength() > 0 )
         m_aTabCtrl.SetHelpText( nIdx, sToolTip );
@@ -383,7 +384,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
 
 void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
 {
-    m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nIndex ) );
+    m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
     ActivatePageHdl( &m_aTabCtrl );
 }
 
@@ -394,7 +395,7 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex )
     TabEntry* pEntry = FindEntry(nIndex);
     if ( pEntry )
     {
-        m_aTabCtrl.RemovePage( static_cast< USHORT >( nIndex ) );
+        m_aTabCtrl.RemovePage( static_cast< sal_uInt16 >( nIndex ) );
         if (RemoveEntry(nIndex))
             delete pEntry;
     }
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index 4a2ced64c3..99ed01bc3b 100644..100755
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -54,7 +54,7 @@ ResMgr*	FwlResId::GetResManager()
 
 // -----------------------------------------------------------------------
 
-FwlResId::FwlResId( USHORT nId ) :
+FwlResId::FwlResId( sal_uInt16 nId ) :
     ResId( nId, *FwlResId::GetResManager() )
 {
 }
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
deleted file mode 100644
index 22e8a6d540..0000000000
--- a/framework/source/classes/makefile.mk
+++ /dev/null
@@ -1,69 +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=			framework
-TARGET=				fwk_classes
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/propertysethelper.obj					\
-                    $(SLO)$/framecontainer.obj						\
-                    $(SLO)$/taskcreator.obj							\
-                    $(SLO)$/menumanager.obj							\
-                    $(SLO)$/bmkmenu.obj								\
-                    $(SLO)$/droptargetlistener.obj					\
-                    $(SLO)$/converter.obj							\
-                    $(SLO)$/actiontriggerpropertyset.obj			\
-                    $(SLO)$/actiontriggerseparatorpropertyset.obj	\
-                    $(SLO)$/actiontriggercontainer.obj				\
-                    $(SLO)$/imagewrapper.obj						\
-                    $(SLO)$/rootactiontriggercontainer.obj          \
-                    $(SLO)$/protocolhandlercache.obj				\
-                    $(SLO)$/addonmenu.obj							\
-                    $(SLO)$/addonsoptions.obj						\
-                    $(SLO)$/fwkresid.obj                            \
-                    $(SLO)$/fwlresid.obj                            \
-                    $(SLO)$/framelistanalyzer.obj                   \
-                    $(SLO)$/sfxhelperfunctions.obj                  \
-                    $(SLO)$/menuextensionsupplier.obj               \
-                    $(SLO)$/fwktabwindow.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    resource.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 26a5791649..b7357d163b 100644..100755
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -34,12 +34,12 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <classes/menumanager.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/bmkmenu.hxx>
-#include <classes/addonmenu.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/addonmenu.hxx>
+#include <framework/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include "classes/addonsoptions.hxx"
+#include "framework/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
 #include <services.h>
 #include "classes/resource.hrc"
@@ -157,12 +157,12 @@ MenuManager::MenuManager(
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
 
 
-    USHORT nItemCount = pMenu->GetItemCount();
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
     m_aMenuItemHandlerVector.reserve(nItemCount);
     ::rtl::OUString aItemCommand;
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
         bool bShowMenuImages( m_bShowMenuImages );
 
         // overwrite the show icons on menu option?
@@ -187,7 +187,7 @@ MenuManager::MenuManager(
                     aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) ) &&
                     AddonMenuManager::HasAddonMenuElements() )
                 {
-                    USHORT      nCount   = 0;
+                    sal_uInt16      nCount   = 0;
                     AddonMenu*  pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame );
                     if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
                     {
@@ -211,7 +211,7 @@ MenuManager::MenuManager(
                         // Set image for the addon popup menu item
                         if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
-                            Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
+                            Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                             if ( !!aImage )
                                    pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -238,7 +238,7 @@ MenuManager::MenuManager(
                 AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -260,7 +260,7 @@ MenuManager::MenuManager(
                 
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -281,14 +281,14 @@ MenuManager::MenuManager(
                         if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                         {
                             // Retrieve image id from menu attributes
-                            aImage = GetImageFromURL( rFrame, aImageId, FALSE );
+                            aImage = GetImageFromURL( rFrame, aImageId, false );
                         }
 
                         if ( !aImage )
                         {
-                            aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
+                            aImage = GetImageFromURL( rFrame, aItemCommand, false );
                             if ( !aImage )
-                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
+                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, false );
                         }
 
                         if ( !!aImage )
@@ -296,7 +296,7 @@ MenuManager::MenuManager(
                     }
                     else if ( !pMenu->GetItemImage( nItemId ))
                     {
-                        Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
+                        Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
                         if ( !!aImage )
                                pMenu->SetItemImage( nItemId, aImage );
                     }
@@ -343,7 +343,7 @@ MenuManager::~MenuManager()
 }
 
 
-MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( USHORT nItemId )
+MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId )
 {
     ResetableGuard aGuard( m_aLock );
 
@@ -510,7 +510,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     ::std::vector< MenuItemHandler* > aNewPickVector;
     Reference< XStringWidth > xStringLength( new StringLength );
 
-    USHORT	nPickItemId = START_ITEMID_PICKLIST;
+    sal_uInt16	nPickItemId = START_ITEMID_PICKLIST;
     int		nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
 
     aNewPickVector.reserve(nPickListMenuItems);
@@ -678,8 +678,8 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe
     // #110897#
     Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
 
-    USHORT	nActiveItemId = 0;
-    USHORT	nItemId = START_ITEMID_WINDOWLIST;
+    sal_uInt16	nActiveItemId = 0;
+    sal_uInt16	nItemId = START_ITEMID_WINDOWLIST;
 
     if ( xDesktop.is() )
     {
@@ -804,7 +804,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         if ( m_bActive )
             return 0;
 
-        m_bActive = TRUE;
+        m_bActive = sal_True;
 
         ::rtl::OUString aCommand( m_aMenuItemCommand );
         if ( m_aMenuItemCommand.matchIgnoreAsciiCase( UNO_COMMAND, 0 ))
@@ -911,7 +911,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
     {
         ResetableGuard aGuard( m_aLock );
 
-        USHORT nCurItemId = pMenu->GetCurItemId();
+        sal_uInt16 nCurItemId = pMenu->GetCurItemId();
         if ( pMenu == m_pVCLMenu &&
              pMenu->GetItemType( nCurItemId ) != MENUITEM_SEPARATOR )
         {
@@ -927,7 +927,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
 
                 if ( xDesktop.is() )
                 {
-                    USHORT nTaskId = START_ITEMID_WINDOWLIST;
+                    sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                     Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
@@ -994,7 +994,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFac
     return mxServiceFactory;
 }
 
-void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
+void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
 {
     MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren );
 
@@ -1009,9 +1009,9 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCo
     m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
 }
 
-USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+sal_uInt16 MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const
 {
-    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+    sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
 
     _rItemCommand = _pMenu->GetItemCommand( nItemId );
     if ( !_rItemCommand.getLength() )
@@ -1027,9 +1027,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 {
     AddonsOptions		aAddonOptions;
 
-    for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ )
     {
-        USHORT nId = _pMenu->GetItemId( nPos );
+        sal_uInt16 nId = _pMenu->GetItemId( nPos );
         if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
         {
             bool bTmpShowMenuImages( bShowMenuImages );
@@ -1053,7 +1053,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE );
+                    Image aImage = GetImageFromURL( _xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -1064,9 +1064,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
                 if ( !bImageSet )
                 {
                     rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
-                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE );
+                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, false );
                     if ( !aImage )
-                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE );
+                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, false );
 
                     _pMenu->SetItemImage( nId, aImage );
                 }
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index c9c0f0829d..659415816d 100644..100755
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -171,6 +171,7 @@ ModalDialog DLG_LICENSE
 
     MultiLineEdit ML_LICENSE
     {
+        HelpID = "framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE";
         PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENSE_HEIGHT ) ;
         Border = TRUE ;
         VScroll = TRUE ;
@@ -217,6 +218,7 @@ ModalDialog DLG_LICENSE
 
     PushButton PB_PAGEDOWN
     {
+        HelpID = "framework:PushButton:DLG_LICENSE:PB_PAGEDOWN";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -257,6 +259,7 @@ ModalDialog DLG_LICENSE
 
     PushButton PB_ACCEPT
     {
+        HelpID = "framework:PushButton:DLG_LICENSE:PB_ACCEPT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_4 - PD_WIDTH - OFFSET_IMG , LICENSE_ROW_6 ) ;
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -264,6 +267,7 @@ ModalDialog DLG_LICENSE
 
     PushButton PB_DECLINE
     {
+        HelpID = "framework:PushButton:DLG_LICENSE:PB_DECLINE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_6 ) ;
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index b41f897381..b41f897381 100644..100755
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx
index f2b0d7c80e..f2b0d7c80e 100644..100755
--- a/framework/source/constant/containerquery.cxx
+++ b/framework/source/constant/containerquery.cxx
diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx
index e51033a80a..e51033a80a 100644..100755
--- a/framework/source/constant/contenthandler.cxx
+++ b/framework/source/constant/contenthandler.cxx
diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx
index 6be4411e00..6be4411e00 100644..100755
--- a/framework/source/constant/frameloader.cxx
+++ b/framework/source/constant/frameloader.cxx
diff --git a/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk
deleted file mode 100644
index 05fc28870d..0000000000
--- a/framework/source/constant/makefile.mk
+++ /dev/null
@@ -1,45 +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=			framework
-TARGET=             fwk_constant
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           $(SLO)$/frameloader.obj         \
-                    $(SLO)$/contenthandler.obj      \
-                    $(SLO)$/containerquery.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index e877111720..df76e0a003 100644..100755
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -35,7 +35,7 @@
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <services.h>
 #include <general.h>
 
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index ed995f9d70..ed995f9d70 100644..100755
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 2b4a73da96..4e26d4d807 100644..100755
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -455,7 +455,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
         else
         {
             css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
-            // Normaly if isTop() returned FALSE ... the parent frame MUST(!) exist ...
+            // Normaly if isTop() returned sal_False ... the parent frame MUST(!) exist ...
             // But it seams to be better to check that here to prevent us against an access violation.
             if (xParent.is())
                 xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_TOP, 0);
diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx
index ceb29cce50..ceb29cce50 100644..100755
--- a/framework/source/dispatch/helpagentdispatcher.cxx
+++ b/framework/source/dispatch/helpagentdispatcher.cxx
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 6688320446..6688320446 100644..100755
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index bc9ef64651..bc9ef64651 100644..100755
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 023b9c02dd..023b9c02dd 100644..100755
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
deleted file mode 100644
index b969d71ea9..0000000000
--- a/framework/source/dispatch/makefile.mk
+++ /dev/null
@@ -1,63 +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=            framework
-TARGET=             fwk_dispatch
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :          settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/closedispatcher.obj                 \
-    $(SLO)$/dispatchinformationprovider.obj     \
-    $(SLO)$/dispatchprovider.obj                \
-    $(SLO)$/helpagentdispatcher.obj             \
-    $(SLO)$/interaction.obj                     \
-    $(SLO)$/interceptionhelper.obj              \
-    $(SLO)$/loaddispatcher.obj                  \
-    $(SLO)$/mailtodispatcher.obj                \
-    $(SLO)$/menudispatcher.obj                  \
-    $(SLO)$/oxt_handler.obj                     \
-    $(SLO)$/popupmenudispatcher.obj             \
-    $(SLO)$/servicehandler.obj                  \
-    $(SLO)$/systemexec.obj		                \
-    $(SLO)$/windowcommanddispatch.obj           \
-    $(SLO)$/startmoduledispatcher.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :          target.mk
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index e1c65d3ce5..b8af8ef029 100644..100755
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -34,8 +34,8 @@
 //_________________________________________________________________________________________________________________
 #include <dispatch/menudispatcher.hxx>
 #include <general.h>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
@@ -89,7 +89,7 @@ using namespace ::cppu							;
 //	non exported const
 //_________________________________________________________________________________________________________________
 
-const USHORT SLOTID_MDIWINDOWLIST = 5610;
+const sal_uInt16 SLOTID_MDIWINDOWLIST = 5610;
 
 //_________________________________________________________________________________________________________________
 //	non exported definitions
@@ -275,9 +275,9 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
 //*****************************************************************************************************************
 void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
 {
-    for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
     {
-        USHORT     nId    = pMenu->GetItemId(nPos);
+        sal_uInt16     nId    = pMenu->GetItemId(nPos);
         PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
         if ( pPopup )
             impl_setAccelerators( (Menu *)pPopup, aAccel );
@@ -334,7 +334,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
 
             if ( pMenuBar != NULL )
             {
-                USHORT nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST );
+                sal_uInt16 nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST );
                 if ( nPos != MENU_ITEM_NOTFOUND )
                 {
                     OUString aNoContext;
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 45456d1e53..45456d1e53 100644..100755
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 5089ee3019..0a165a45dc 100644..100755
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -34,8 +34,8 @@
 
 #include <dispatch/popupmenudispatcher.hxx>
 #include <general.h>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 60f796e54d..60f796e54d 100644..100755
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index d201fabe0c..cdbe6e7aa3 100644..100755
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -37,7 +37,7 @@
 #include <pattern/frame.hxx>
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <dispatchcommands.h>
 #include <targets.h>
 #include <services.h>
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index f6dbbaf24e..f6dbbaf24e 100644..100755
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 70ba031ef8..70ba031ef8 100644..100755
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index b4e054105e..b4e054105e 100644..100755
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index afbf5af665..8d5589f1e2 100644..100755
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -42,6 +42,8 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::awt;
 
+//struct SAL_DLLPUBLIC_IMPORT ::cppu::OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper, OMultiTypeInterfaceContainerHelper::keyType >;
+
 // Handles for properties
 // (PLEASE SORT THIS FIELD, IF YOU ADD NEW PROPERTIES!)
 // We use an enum to define these handles, to use all numbers from 0 to nn and
@@ -202,9 +204,9 @@ sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue(
 throw( IllegalArgumentException )
 {
     //	Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
-    //	Return TRUE, if changed - else return FALSE.
+    //	Return sal_True, if changed - else return sal_False.
     //	Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!!
-    //	Initialize return value with FALSE !!!
+    //	Initialize return value with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index c6c349cc82..b60697d6b9 100644..100755
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -196,9 +196,9 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
 throw( IllegalArgumentException )
 {
     //	Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
-    //	Return TRUE, if changed - else return FALSE.
+    //	Return sal_True, if changed - else return sal_False.
     //	Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!!
-    //	Initialize return value with FALSE !!!
+    //	Initialize return value with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 231a3b84df..f4df73ebb4 100644..100755
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -32,12 +32,12 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include "classes/addonmenu.hxx"
-#include "classes/addonsoptions.hxx"
+#include "framework/addonmenu.hxx"
+#include "framework/addonsoptions.hxx"
 #include <general.h>
 #include <macros/debug/assertion.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -65,8 +65,8 @@ using namespace ::com::sun::star::beans;
 
 // Please look at sfx2/inc/sfxsids.hrc the values are defined there. Due to build dependencies
 // we cannot include the header file.
-const USHORT SID_HELPMENU            = (SID_SFX_START + 410);
-const USHORT SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
+const sal_uInt16 SID_HELPMENU            = (SID_SFX_START + 410);
+const sal_uInt16 SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
 
 namespace framework
 {
@@ -78,12 +78,12 @@ AddonMenu::AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::
 
 AddonMenu::~AddonMenu()
 {
-    for ( USHORT i = 0; i < GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < GetItemCount(); i++ )
     {
         if ( GetItemType( i ) != MENUITEM_SEPARATOR )
         {
             // delete user attributes created with new!
-            USHORT nId = GetItemId( i );
+            sal_uInt16 nId = GetItemId( i );
             MenuConfiguration::Attributes* pUserAttributes = (MenuConfiguration::Attributes*)GetUserValue( nId );
             delete pUserAttributes;
             delete GetPopupMenu( nId );
@@ -155,7 +155,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame
 {
     AddonsOptions aOptions;
     AddonMenu*  pAddonMenu      = NULL;
-    USHORT      nUniqueMenuId   = ADDONMENU_ITEMID_START;
+    sal_uInt16      nUniqueMenuId   = ADDONMENU_ITEMID_START;
 
     const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu();
     if ( rAddonMenuEntries.getLength() > 0 )
@@ -176,19 +176,19 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame
 }
 
 // Returns the next insert position from nPos.
-USHORT AddonMenuManager::GetNextPos( USHORT nPos )
+sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
 {
     return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 );
 }
 
 
-static USHORT FindMenuId( Menu* pMenu, const String aCommand )
+static sal_uInt16 FindMenuId( Menu* pMenu, const String aCommand )
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     String aCmd;
     for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
-        USHORT nId = pMenu->GetItemId( nPos );
+        sal_uInt16 nId = pMenu->GetItemId( nPos );
         aCmd = pMenu->GetItemCommand( nId );
         if ( aCmd == aCommand )
             return nId;
@@ -206,7 +206,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
         PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU );
         if ( !pHelpMenu )
         {
-            USHORT nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
+            sal_uInt16 nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
             if ( nId != USHRT_MAX )
                 pHelpMenu = pMergeMenuBar->GetPopupMenu( nId );
         }
@@ -218,17 +218,17 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
 
             // Add-Ons help menu items should be inserted after the "registration" menu item
             bool   bAddAfter        = true;
-            USHORT nItemCount       = pHelpMenu->GetItemCount();
-            USHORT nRegPos          = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
-            USHORT nInsPos          = nRegPos;
-            USHORT nInsSepAfterPos  = MENU_APPEND;
-            USHORT nUniqueMenuId    = ADDONMENU_ITEMID_START;
+            sal_uInt16 nItemCount       = pHelpMenu->GetItemCount();
+            sal_uInt16 nRegPos          = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
+            sal_uInt16 nInsPos          = nRegPos;
+            sal_uInt16 nInsSepAfterPos  = MENU_APPEND;
+            sal_uInt16 nUniqueMenuId    = ADDONMENU_ITEMID_START;
             AddonsOptions aOptions;
 
             if ( nRegPos == USHRT_MAX )
             {
                 // try to detect the online registration dialog menu item with the command URL
-                USHORT nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
+                sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
                 nRegPos    = pHelpMenu->GetItemPos( nId );
                 nInsPos    = nRegPos;
             }
@@ -237,7 +237,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
             {
                 // second try:
                 // try to detect the about menu item with the command URL
-                USHORT nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
+                sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
                 nRegPos    = pHelpMenu->GetItemPos( nId );
                 nInsPos    = nRegPos;
                 bAddAfter  = false;
@@ -273,13 +273,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
 // Merge the addon popup menus into the given menu bar at the provided pos.
 void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
                                              const Reference< XModel >& rModel,
-                                             USHORT	              nMergeAtPos,
+                                             sal_uInt16	              nMergeAtPos,
                                              MenuBar*             pMergeMenuBar )
 {
     if ( pMergeMenuBar )
     {
         AddonsOptions	aAddonsOptions;
-        USHORT			nInsertPos = nMergeAtPos;
+        sal_uInt16			nInsertPos = nMergeAtPos;
 
         ::rtl::OUString                              aTitle;
         ::rtl::OUString                              aURL;
@@ -287,7 +287,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
         ::rtl::OUString                              aImageId;
         ::rtl::OUString                              aContext;
         Sequence< Sequence< PropertyValue > > aAddonSubMenu;
-        USHORT                                nUniqueMenuId = ADDONMENU_ITEMID_START;
+        sal_uInt16                                nUniqueMenuId = ADDONMENU_ITEMID_START;
 
         const Sequence< Sequence< PropertyValue > >&	rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart();
         for ( sal_Int32 i = 0; i < rAddonMenuEntries.getLength(); i++ )
@@ -304,7 +304,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
                  aAddonSubMenu.getLength() > 0 &&
                  AddonMenuManager::IsCorrectContext( rModel, aContext ))
             {
-                USHORT          nId             = nUniqueMenuId++;
+                sal_uInt16          nId             = nUniqueMenuId++;
                 AddonPopupMenu* pAddonPopupMenu = (AddonPopupMenu *)AddonMenuManager::CreatePopupMenuType( ADDON_POPUPMENU, rFrame );
 
                 AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModel );
@@ -328,17 +328,17 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame,
 // Insert the menu and sub menu entries into pCurrentMenu with the aAddonMenuDefinition provided
 void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrentMenu,
                                   MenuType                              nSubMenuType,
-                                  USHORT                                nInsPos,
-                                  USHORT&                               nUniqueMenuId,
+                                  sal_uInt16                                nInsPos,
+                                  sal_uInt16&                               nUniqueMenuId,
                                   Sequence< Sequence< PropertyValue > > aAddonMenuDefinition,
                                   const Reference< XFrame >&            rFrame,
                                   const Reference< XModel >&            rModel )
 {
     Sequence< Sequence< PropertyValue > >	aAddonSubMenu;
-    BOOL                                    bInsertSeparator    = FALSE;
-    UINT32									i                   = 0;
-    UINT32                                  nElements           = 0;
-    UINT32                                  nCount			    = aAddonMenuDefinition.getLength();
+    sal_Bool                                    bInsertSeparator    = sal_False;
+    sal_uInt32									i                   = 0;
+    sal_uInt32                                  nElements           = 0;
+    sal_uInt32                                  nCount			    = aAddonMenuDefinition.getLength();
     AddonsOptions							aAddonsOptions;
 
     ::rtl::OUString aTitle;
@@ -355,7 +355,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
             continue;
 
         if ( aURL == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:separator" )))
-            bInsertSeparator = TRUE;
+            bInsertSeparator = sal_True;
         else
         {
             PopupMenu* pSubMenu = NULL;
@@ -378,12 +378,12 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
                 // Insert a separator only when we insert a new element afterwards and we
                 // have already one before us
                 nElements = 0;
-                bInsertSeparator = FALSE;
+                bInsertSeparator = sal_False;
                 pCurrentMenu->InsertSeparator( nInsPos );
                 nInsPos = AddonMenuManager::GetNextPos( nInsPos );
             }
 
-            USHORT nId = nUniqueMenuId++;
+            sal_uInt16 nId = nUniqueMenuId++;
             pCurrentMenu->InsertItem( nId, aTitle, 0, nInsPos );
             nInsPos = AddonMenuManager::GetNextPos( nInsPos );
 
@@ -391,7 +391,7 @@ void AddonMenuManager::BuildMenu( PopupMenu*                            pCurrent
 
             // Store values from configuration to the New and Wizard menu entries to enable
             // sfx2 based code to support high contrast mode correctly!
-            pCurrentMenu->SetUserValue( nId, ULONG( new MenuConfiguration::Attributes( aTarget, aImageId )) );
+            pCurrentMenu->SetUserValue( nId, sal_uIntPtr( new MenuConfiguration::Attributes( aTarget, aImageId )) );
             pCurrentMenu->SetItemCommand( nId, aURL );
 
             if ( pSubMenu )
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 6f2daead09..b2fab5a749 100644..100755
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -32,7 +32,7 @@
 //_________________________________________________________________________________________________________________
 //	includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 39df90f52f..4d3ffd44ec 100644..100755
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -35,11 +35,11 @@
 
 #include <limits.h>
 
-#include "classes/bmkmenu.hxx"
+#include "framework/bmkmenu.hxx"
 #include <general.h>
 #include <macros/debug/assertion.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -85,30 +85,30 @@ void GetMenuEntry(
 class BmkMenu_Impl
 {
     private:
-        static USHORT		 m_nMID;
+        static sal_uInt16		 m_nMID;
 
     public:
         BmkMenu*			 m_pRoot;
-        BOOL                 m_bInitialized;
+        sal_Bool                 m_bInitialized;
 
         BmkMenu_Impl( BmkMenu* pRoot );
         BmkMenu_Impl();
         ~BmkMenu_Impl();
 
-        static USHORT		GetMID();
+        static sal_uInt16		GetMID();
 };
 
-USHORT BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START;
+sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START;
 
 BmkMenu_Impl::BmkMenu_Impl( BmkMenu* pRoot ) :
     m_pRoot(pRoot),
-    m_bInitialized(FALSE)
+    m_bInitialized(sal_False)
 {
 }
 
 BmkMenu_Impl::BmkMenu_Impl() :
     m_pRoot(0),
-    m_bInitialized(FALSE)
+    m_bInitialized(sal_False)
 {
 }
 
@@ -116,7 +116,7 @@ BmkMenu_Impl::~BmkMenu_Impl()
 {
 }
 
-USHORT BmkMenu_Impl::GetMID()
+sal_uInt16 BmkMenu_Impl::GetMID()
 {
     m_nMID++;
     if( !m_nMID )
@@ -154,7 +154,7 @@ void BmkMenu::Initialize()
     if( _pImp->m_bInitialized )
         return;
 
-    _pImp->m_bInitialized = TRUE;
+    _pImp->m_bInitialized = sal_True;
 
     Sequence< Sequence< PropertyValue > > aDynamicMenuEntries;
 
@@ -164,14 +164,14 @@ void BmkMenu::Initialize()
         aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_WIZARDMENU );
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+    sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
 
     ::rtl::OUString aTitle;
     ::rtl::OUString aURL;
     ::rtl::OUString aTargetFrame;
     ::rtl::OUString aImageId;
 
-    UINT32 i, nCount = aDynamicMenuEntries.getLength();
+    sal_uInt32 i, nCount = aDynamicMenuEntries.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         GetMenuEntry( aDynamicMenuEntries[i], aTitle, aURL, aTargetFrame, aImageId );
@@ -184,13 +184,13 @@ void BmkMenu::Initialize()
         else
         {
             sal_Bool	bImageSet = sal_False;
-            USHORT		nId = CreateMenuId();
+            sal_uInt16		nId = CreateMenuId();
 
             if ( bShowMenuImages )
             {
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
+                    Image aImage = GetImageFromURL( m_xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -200,7 +200,7 @@ void BmkMenu::Initialize()
 
                 if ( !bImageSet )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE );
+                    Image aImage = GetImageFromURL( m_xFrame, aURL, false );
                     if ( !aImage )
                         InsertItem( nId, aTitle );
                     else
@@ -211,14 +211,14 @@ void BmkMenu::Initialize()
                 InsertItem( nId, aTitle );
 
             MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId );
-            SetUserValue( nId, (ULONG)pUserAttributes );
+            SetUserValue( nId, (sal_uIntPtr)pUserAttributes );
 
             SetItemCommand( nId, aURL );
         }
     }
 }
 
-USHORT BmkMenu::CreateMenuId()
+sal_uInt16 BmkMenu::CreateMenuId()
 {
     return BmkMenu_Impl::GetMID();
 }
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index d6ff2f0bb7..fc10061afa 100644..100755
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include "classes/framelistanalyzer.hxx"
+#include "framework/framelistanalyzer.hxx"
 
 //_______________________________________________
 //	my own includes
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index edbc4fafa0..521ce38fb8 100644..100755
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -54,7 +54,7 @@ ResMgr*	FwkResId::GetResManager()
 
 // -----------------------------------------------------------------------
 
-FwkResId::FwkResId( USHORT nId ) :
+FwkResId::FwkResId( sal_uInt16 nId ) :
     ResId( nId, *FwkResId::GetResManager() )
 {
 }
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index ce9a7fbcec..ce9a7fbcec 100644..100755
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index fda8e5b2fb..5abb009c40 100644..100755
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <classes/menuextensionsupplier.hxx>
+#include <framework/menuextensionsupplier.hxx>
 #include <osl/mutex.hxx>
 
 static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 9ea799b00b..dfc39f1bca 100644..100755
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -33,7 +33,7 @@
 #include <classes/actiontriggercontainer.hxx>
 #include <classes/actiontriggerpropertyset.hxx>
 #include <classes/actiontriggerseparatorpropertyset.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index ae39a9c15e..c0cda74fce 100644..100755
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -29,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_CXX_
-#include <classes/sfxhelperfunctions.hxx>
-#endif
+#include <framework/sfxhelperfunctions.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index f893eb0e95..03a99a0510 100644..100755
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,34 +31,51 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include <dispatch/interaction.hxx>
+#include <comphelper/interaction.hxx>
+#include <framework/interaction.hxx>
 #include <general.h>
 
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
+using namespace ::com::sun::star;
 
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
+namespace framework{
 
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
+/*-************************************************************************************************************//**
+    @short          declaration of special continuation for filter selection
+    @descr          Sometimes filter detection during loading document failed. Then we need a possibility
+                    to ask user for his decision. These continuation transport selected filter by user to
+                    code user of interaction.
 
-namespace framework{
+    @attention      This implementation could be used one times only. We don't support a resetable continuation yet!
+                    Why? Normaly interaction should show a filter selection dialog and ask user for his decision.
+                    He can select any filter - then instances of these class will be called by handler ... or user
+                    close dialog without any selection. Then another continuation should be slected by handler to
+                    abort continuations ... Retrying isn't very usefull here ... I think.
 
-//_________________________________________________________________________________________________________________
-//	non exported const
-//_________________________________________________________________________________________________________________
+    @implements     XInteractionFilterSelect
 
-//_________________________________________________________________________________________________________________
-//	non exported definitions
-//_________________________________________________________________________________________________________________
+    @base           ImplInheritanceHelper1
+                    ContinuationBase
+
+    @devstatus      ready to use
+    @threadsafe     no (used on once position only!)
+*//*-*************************************************************************************************************/
+class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterSelect >
+{
+    // c++ interface
+    public:
+        ContinuationFilterSelect();
+
+    // uno interface
+    public:
+        virtual void            SAL_CALL setFilter( const ::rtl::OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::rtl::OUString SAL_CALL getFilter(                                ) throw( ::com::sun::star::uno::RuntimeException );
+
+    // member
+    private:
+        ::rtl::OUString m_sFilter;
+
+};  // class ContinuationFilterSelect
 
-//_________________________________________________________________________________________________________________
-//	declarations
-//_________________________________________________________________________________________________________________
 
 //---------------------------------------------------------------------------------------------------------
 // initialize continuation with right start values
@@ -85,11 +101,29 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const ::rtl::OUString& sFilte
     return m_sFilter;
 }
 
+class RequestFilterSelect_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestFilterSelect_Impl( const ::rtl::OUString& sURL );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+public:
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+private:
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    comphelper::OInteractionAbort* m_pAbort;
+    ContinuationFilterSelect* m_pFilter;
+};
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL )
 {
     ::rtl::OUString temp;
     css::uno::Reference< css::uno::XInterface > temp2;
@@ -98,7 +132,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
                                                        sURL                                          );
     m_aRequest <<= aFilterRequest;
 
-    m_pAbort  = new ContinuationAbort       ;
+    m_pAbort  = new comphelper::OInteractionAbort;
     m_pFilter = new ContinuationFilterSelect;
 
     m_lContinuations.realloc( 2 );
@@ -110,16 +144,16 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestFilterSelect::isAbort() const
+sal_Bool RequestFilterSelect_Impl::isAbort() const
 {
-    return m_pAbort->isSelected();
+    return m_pAbort->wasSelected();
 }
 
 //---------------------------------------------------------------------------------------------------------
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestFilterSelect::getFilter() const
+::rtl::OUString RequestFilterSelect_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -128,7 +162,7 @@ sal_Bool RequestFilterSelect::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -139,16 +173,102 @@ css::uno::Any SAL_CALL RequestFilterSelect::getRequest() throw( css::uno::Runtim
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+
+RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL )
+{
+    pImp = new RequestFilterSelect_Impl( sURL );
+    pImp->acquire();
+}
+
+RequestFilterSelect::~RequestFilterSelect()
+{
+    pImp->release();
+}            
+
+
+//---------------------------------------------------------------------------------------------------------
+// return abort state of interaction
+// If it is true, return value of method "getFilter()" will be unspecified then!
+//---------------------------------------------------------------------------------------------------------
+sal_Bool RequestFilterSelect::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestFilterSelect::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);        
+}
+
+/*
+class RequestAmbigousFilter_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+public:
+    RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
+                            const ::rtl::OUString& sSelectedFilter ,
+                            const ::rtl::OUString& sDetectedFilter );
+    sal_Bool        isAbort  () const;
+    ::rtl::OUString getFilter() const;
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest () throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException );
+
+    ::com::sun::star::uno::Any                                                                                                 m_aRequest      ;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >    m_lContinuations;
+    ContinuationAbort*                                                                                                         m_pAbort        ;
+    ContinuationFilterSelect*                                                                                                  m_pFilter       ;
+};  
+
+RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL, const ::rtl::OUString& sSelectedFilter,
+    const ::rtl::OUString& sDetectedFilter )
+{
+    pImp = new RequestAmbigousFilter_Impl( sURL, sSelectedFilter, sDetectedFilter );
+    pImp->acquire();  
+}
+
+RequestAmbigousFilter::~RequestAmbigousFilter()
+{
+    pImp->release();
+}            
+
+sal_Bool RequestAmbigousFilter::isAbort() const
+{
+    return pImp->isAbort();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// return user selected filter
+// Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
+//---------------------------------------------------------------------------------------------------------
+::rtl::OUString RequestAmbigousFilter::getFilter() const
+{
+    return pImp->getFilter();
+}
+
+uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest()
+{
+    return uno::Reference < task::XInteractionRequest > (pImp);        
+}
+
 //---------------------------------------------------------------------------------------------------------
 // initialize instance with all neccessary informations
 // We use it without any further checks on our member then ...!
 //---------------------------------------------------------------------------------------------------------
-RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL            ,
+RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL            ,
                                               const ::rtl::OUString& sSelectedFilter ,
                                               const ::rtl::OUString& sDetectedFilter )
 {
@@ -173,7 +293,7 @@ RequestAmbigousFilter::RequestAmbigousFilter( const ::rtl::OUString& sURL
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
 //---------------------------------------------------------------------------------------------------------
-sal_Bool RequestAmbigousFilter::isAbort() const
+sal_Bool RequestAmbigousFilter_Impl::isAbort() const
 {
     return m_pAbort->isSelected();
 }
@@ -182,7 +302,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
 //---------------------------------------------------------------------------------------------------------
-::rtl::OUString RequestAmbigousFilter::getFilter() const
+::rtl::OUString RequestAmbigousFilter_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
@@ -191,7 +311,7 @@ sal_Bool RequestAmbigousFilter::isAbort() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further informations.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::RuntimeException )
+css::uno::Any SAL_CALL RequestAmbigousFilter_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
@@ -202,11 +322,45 @@ css::uno::Any SAL_CALL RequestAmbigousFilter::getRequest() throw( css::uno::Runt
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 //---------------------------------------------------------------------------------------------------------
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter::getContinuations() throw( css::uno::RuntimeException )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestAmbigousFilter_Impl::getContinuations() throw( css::uno::RuntimeException )
 {
     return m_lContinuations;
 }
+*/
 
-}       //  namespace framework
+class InteractionRequest_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >   
+{
+    uno::Any m_aRequest;
+    uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+
+public:    
+    InteractionRequest_Impl( const ::com::sun::star::uno::Any& aRequest, 
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations )
+    {
+        m_aRequest = aRequest;
+        m_lContinuations = lContinuations;
+    }
+
+    virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException );
+    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() 
+            throw( uno::RuntimeException );
+};
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException )
+{
+    return m_aRequest;
+}
+
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations() 
+    throw( uno::RuntimeException )
+{
+    return m_lContinuations;
+}
+
+uno::Reference < task::XInteractionRequest > InteractionRequest::CreateRequest( 
+    const uno::Any& aRequest, const uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations )
+{
+    return new InteractionRequest_Impl( aRequest, lContinuations );
+}
+
+}       //  namespace framework
diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx
index d61eac6857..ff98aec8ad 100644..100755
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/fwe/helper/acceleratorinfo.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 
 namespace framework
 {
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 9693074f70..fd7a0f7807 100644..100755
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -28,11 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <classes/actiontriggerseparatorpropertyset.hxx>
 #include <classes/rootactiontriggercontainer.hxx>
 #include <classes/imagewrapper.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
@@ -43,7 +43,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-const USHORT START_ITEMID = 1000;
+const sal_uInt16 START_ITEMID = 1000;
 
 using namespace com::sun::star::awt;
 using namespace com::sun::star::uno;
@@ -110,7 +110,7 @@ void GetMenuItemAttributes( Reference< XPropertySet > xActionTriggerPropertySet,
     }
 }
 
-void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexContainer > xActionTriggerContainer )
+void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexContainer > xActionTriggerContainer )
 {
     Reference< XIndexAccess > xIndexAccess( xActionTriggerContainer, UNO_QUERY );
     if ( xIndexAccess.is() )
@@ -140,7 +140,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
                         Reference< XBitmap > xBitmap;
                         Reference< XIndexContainer > xSubContainer;
 
-                        USHORT nNewItemId = nItemId++;
+                        sal_uInt16 nNewItemId = nItemId++;
                         GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer );
 
                         SolarMutexGuard aGuard;
@@ -153,7 +153,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
                                 // command url but uses the item id as a unqiue identifier. These entries
                                 // got a special url during conversion from menu=>actiontriggercontainer.
                                 // Now we have to extract this special url and set the correct item id!!!
-                                nNewItemId = (USHORT)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
+                                nNewItemId = (sal_uInt16)aCommandURL.copy( nIndex+aSlotURL.getLength() ).toInt32();
                                 pSubMenu->InsertItem( nNewItemId, aLabel );
                             }
                             else
@@ -255,7 +255,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
 // implementation helper ( ActionTrigger => menu )
 // ----------------------------------------------------------------------------
 
-Reference< XPropertySet > CreateActionTrigger( USHORT nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
     Reference< XPropertySet > xPropSet;
 
@@ -333,9 +333,9 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon
 {
     SolarMutexGuard aGuard;
 
-    for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
     {
-        USHORT			nItemId = pMenu->GetItemId( nPos );
+        sal_uInt16			nItemId = pMenu->GetItemId( nPos );
         MenuItemType	nType	= pMenu->GetItemType( nPos );
 
         try
@@ -379,7 +379,7 @@ void ActionTriggerHelper::CreateMenuFromActionTriggerContainer(
     Menu* pNewMenu,
     const Reference< XIndexContainer >& rActionTriggerContainer )
 {
-    USHORT nItemId = START_ITEMID;
+    sal_uInt16 nItemId = START_ITEMID;
 
     if ( rActionTriggerContainer.is() )
         InsertSubMenuItems( pNewMenu, nItemId, rActionTriggerContainer );
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 3de184b7d0..0db457de4c 100644..100755
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/configimporter.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/configimporter.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
new file mode 100755
index 0000000000..55ceeeeebc
--- /dev/null
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -0,0 +1,271 @@
+/*************************************************************************
+ * 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 "precompiled_framework.hxx"
+
+#include "framework/documentundoguard.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/document/XUndoManagerSupplier.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/ref.hxx>
+#include <tools/diagnose_ex.h>
+
+//......................................................................................................................
+namespace framework
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::document::XUndoManagerSupplier;
+    using ::com::sun::star::document::XUndoManager;
+    using ::com::sun::star::document::XUndoManagerListener;
+    using ::com::sun::star::document::UndoManagerEvent;
+    using ::com::sun::star::lang::EventObject;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= UndoManagerContextListener
+    //==================================================================================================================
+    typedef ::cppu::WeakImplHelper1 <   XUndoManagerListener
+                                    >   UndoManagerContextListener_Base;
+    class UndoManagerContextListener : public UndoManagerContextListener_Base
+    {
+    public:
+        UndoManagerContextListener( const Reference< XUndoManager >& i_undoManager )
+            :m_xUndoManager( i_undoManager, UNO_QUERY_THROW )
+            ,m_nRelativeContextDepth( 0 )
+            ,m_documentDisposed( false )
+        {
+            osl_incrementInterlockedCount( &m_refCount );
+            {
+                m_xUndoManager->addUndoManagerListener( this );
+            }
+            osl_decrementInterlockedCount( &m_refCount );
+        }
+
+        UndoManagerContextListener()
+        {
+        }
+
+        void finish()
+        {
+            OSL_ENSURE( m_nRelativeContextDepth >= 0, "UndoManagerContextListener: more contexts left than entered?" );
+
+            if ( m_documentDisposed )
+                return;
+
+            // work with a copy of m_nRelativeContextDepth, to be independent from possible bugs in the
+            // listener notifications (where it would be decremented with every leaveUndoContext)
+            sal_Int32 nDepth = m_nRelativeContextDepth;
+            while ( nDepth-- > 0 )
+            {
+                m_xUndoManager->leaveUndoContext();
+            }
+            m_xUndoManager->removeUndoManagerListener( this );
+        }
+
+        // XUndoManagerListener
+        virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException);
+        virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException);
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException);
+
+    private:
+        Reference< XUndoManager > const m_xUndoManager;
+        oslInterlockedCount             m_nRelativeContextDepth;
+        bool                            m_documentDisposed;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        // not interested in
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        // not interested in
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        // not interested in
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        // not interested in
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        // not interested in
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        m_nRelativeContextDepth = 0;
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        osl_incrementInterlockedCount( &m_nRelativeContextDepth );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        osl_incrementInterlockedCount( &m_nRelativeContextDepth );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        osl_decrementInterlockedCount( &m_nRelativeContextDepth );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        osl_decrementInterlockedCount( &m_nRelativeContextDepth );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        osl_decrementInterlockedCount( &m_nRelativeContextDepth );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException)
+    {
+        (void)i_event;
+        m_documentDisposed = true;
+    }
+
+    //==================================================================================================================
+    //= DocumentUndoGuard_Data
+    //==================================================================================================================
+    struct DocumentUndoGuard_Data
+    {
+        Reference< XUndoManager >                       xUndoManager;
+        ::rtl::Reference< UndoManagerContextListener >  pContextListener;
+    };
+
+    namespace
+    {
+        //--------------------------------------------------------------------------------------------------------------
+        void lcl_init( DocumentUndoGuard_Data& i_data, const Reference< XInterface >& i_undoSupplierComponent )
+        {
+            try
+            {
+                Reference< XUndoManagerSupplier > xUndoSupplier( i_undoSupplierComponent, UNO_QUERY );
+                if ( xUndoSupplier.is() )
+                    i_data.xUndoManager.set( xUndoSupplier->getUndoManager(), UNO_QUERY_THROW );
+
+                if ( i_data.xUndoManager.is() )
+                    i_data.pContextListener.set( new UndoManagerContextListener( i_data.xUndoManager ) );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        void lcl_restore( DocumentUndoGuard_Data& i_data )
+        {
+            try
+            {
+                if ( i_data.pContextListener.is() )
+                    i_data.pContextListener->finish();
+                i_data.pContextListener.clear();
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+    }
+
+    //==================================================================================================================
+    //= DocumentUndoGuard
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent )
+        :m_pData( new DocumentUndoGuard_Data )
+    {
+        lcl_init( *m_pData, i_undoSupplierComponent );
+    }
+
+    DocumentUndoGuard::~DocumentUndoGuard()
+    {
+        lcl_restore( *m_pData );
+    }
+
+//......................................................................................................................
+} // namespace framework
+//......................................................................................................................
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx
index e7e6bbce78..f76d7362a7 100644..100755
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/fwe/helper/imageproducer.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 
 namespace framework
 {
@@ -48,7 +48,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 Image SAL_CALL GetImageFromURL(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
-    BOOL bBig
+    bool bBig
 )
 {
     if ( _pGetImageFunc )
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index e5a2994d14..e5a2994d14 100644..100755
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index b67607e62f..d92730d00e 100644..100755
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -32,7 +32,7 @@
 //_______________________________________________
 // includes
 
-#include <helper/titlehelper.hxx>
+#include <framework/titlehelper.hxx>
 #include <services.h>
 #include <properties.h>
 
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
new file mode 100755
index 0000000000..1bbd58bcb9
--- /dev/null
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -0,0 +1,1165 @@
+/*************************************************************************
+ * 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 "precompiled_framework.hxx"
+
+#include "framework/undomanagerhelper.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/XComponent.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <comphelper/flagguard.hxx>
+#include <comphelper/asyncnotification.hxx>
+#include <svl/undo.hxx>
+#include <tools/diagnose_ex.h>
+#include <osl/conditn.hxx>
+
+#include <stack>
+#include <queue>
+#include <boost/function.hpp>
+
+//......................................................................................................................
+namespace framework
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::document::XUndoManagerListener;
+    using ::com::sun::star::document::UndoManagerEvent;
+    using ::com::sun::star::document::EmptyUndoStackException;
+    using ::com::sun::star::document::UndoContextNotClosedException;
+    using ::com::sun::star::document::UndoFailedException;
+    using ::com::sun::star::util::NotLockedException;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::document::XUndoAction;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::document::XUndoManager;
+    using ::com::sun::star::util::InvalidStateException;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::util::XModifyListener;
+    /** === end UNO using === **/
+    using ::svl::IUndoManager;
+
+    //==================================================================================================================
+    //= UndoActionWrapper
+    //==================================================================================================================
+    class UndoActionWrapper : public SfxUndoAction
+    {
+    public:
+                            UndoActionWrapper(
+                                Reference< XUndoAction > const& i_undoAction
+                            );
+        virtual             ~UndoActionWrapper();
+
+        virtual String      GetComment() const;
+        virtual void        Undo();
+        virtual void        Redo();
+        virtual sal_Bool    CanRepeat(SfxRepeatTarget&) const;
+
+    private:
+        const Reference< XUndoAction >  m_xUndoAction;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction )
+        :SfxUndoAction()
+        ,m_xUndoAction( i_undoAction )
+    {
+        ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoActionWrapper::~UndoActionWrapper()
+    {
+        try
+        {
+            Reference< XComponent > xComponent( m_xUndoAction, UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    String UndoActionWrapper::GetComment() const
+    {
+        String sComment;
+        try
+        {
+            sComment = m_xUndoAction->getTitle();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sComment;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoActionWrapper::Undo()
+    {
+        m_xUndoAction->undo();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoActionWrapper::Redo()
+    {
+        m_xUndoAction->redo();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
+    {
+        return sal_False;
+    }
+
+    //==================================================================================================================
+    //= UndoManagerRequest
+    //==================================================================================================================
+    class UndoManagerRequest : public ::comphelper::AnyEvent
+    {
+    public:
+        UndoManagerRequest( ::boost::function0< void > const& i_request )
+            :m_request( i_request )
+            ,m_caughtException()
+            ,m_finishCondition()
+        {
+            m_finishCondition.reset();
+        }
+
+        void execute()
+        {
+            try
+            {
+                m_request();
+            }
+            catch( const Exception& )
+            {
+                m_caughtException = ::cppu::getCaughtException();
+            }
+            m_finishCondition.set();
+        }
+
+        void wait()
+        {
+            m_finishCondition.wait();
+            if ( m_caughtException.hasValue() )
+                ::cppu::throwException( m_caughtException );
+        }
+
+        void cancel( const Reference< XInterface >& i_context )
+        {
+            m_caughtException <<= RuntimeException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Concurrency error: an ealier operation on the stack failed." ) ),
+                i_context
+            );
+            m_finishCondition.set();
+        }
+
+    protected:
+        ~UndoManagerRequest()
+        {
+        }
+
+    private:
+        ::boost::function0< void >  m_request;
+        Any                         m_caughtException;
+        ::osl::Condition            m_finishCondition;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+
+    //==================================================================================================================
+    //= UndoManagerHelper_Impl
+    //==================================================================================================================
+    class UndoManagerHelper_Impl : public SfxUndoListener
+    {
+    private:
+        ::osl::Mutex                        m_aMutex;
+        ::osl::Mutex                        m_aQueueMutex;
+        bool                                m_disposed;
+        bool                                m_bAPIActionRunning;
+        bool                                m_bProcessingEvents;
+        ::cppu::OInterfaceContainerHelper   m_aUndoListeners;
+        ::cppu::OInterfaceContainerHelper   m_aModifyListeners;
+        IUndoManagerImplementation&         m_rUndoManagerImplementation;
+        UndoManagerHelper&                  m_rAntiImpl;
+        ::std::stack< bool >                m_aContextVisibilities;
+#if OSL_DEBUG_LEVEL > 0
+        ::std::stack< bool >                m_aContextAPIFlags;
+#endif
+        ::std::queue< ::rtl::Reference< UndoManagerRequest > >
+                                            m_aEventQueue;
+
+    public:
+        ::osl::Mutex&   getMutex() { return m_aMutex; }
+
+    public:
+        UndoManagerHelper_Impl( UndoManagerHelper& i_antiImpl, IUndoManagerImplementation& i_undoManagerImpl )
+            :m_aMutex()
+            ,m_aQueueMutex()
+            ,m_disposed( false )
+            ,m_bAPIActionRunning( false )
+            ,m_bProcessingEvents( false )
+            ,m_aUndoListeners( m_aMutex )
+            ,m_aModifyListeners( m_aMutex )
+            ,m_rUndoManagerImplementation( i_undoManagerImpl )
+            ,m_rAntiImpl( i_antiImpl )
+        {
+            getUndoManager().AddUndoListener( *this );
+        }
+
+        virtual ~UndoManagerHelper_Impl()
+        {
+        }
+
+        //..............................................................................................................
+        IUndoManager& getUndoManager() const
+        {
+            return m_rUndoManagerImplementation.getImplUndoManager();
+        }
+
+        //..............................................................................................................
+        Reference< XUndoManager > getXUndoManager() const
+        {
+            return m_rUndoManagerImplementation.getThis();
+        }
+
+        // SfxUndoListener
+        virtual void actionUndone( const String& i_actionComment );
+        virtual void actionRedone( const String& i_actionComment );
+        virtual void undoActionAdded( const String& i_actionComment );
+        virtual void cleared();
+        virtual void clearedRedo();
+        virtual void resetAll();
+        virtual void listActionEntered( const String& i_comment );
+        virtual void listActionLeft( const String& i_comment );
+        virtual void listActionLeftAndMerged();
+        virtual void listActionCancelled();
+        virtual void undoManagerDying();
+
+        // public operations
+        void disposing();
+
+        void enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock );
+        void leaveUndoContext( IMutexGuard& i_instanceLock );
+        void addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock );
+        void undo( IMutexGuard& i_instanceLock );
+        void redo( IMutexGuard& i_instanceLock );
+        void clear( IMutexGuard& i_instanceLock );
+        void clearRedo( IMutexGuard& i_instanceLock );
+        void reset( IMutexGuard& i_instanceLock );
+
+        void addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
+        {
+            m_aUndoListeners.addInterface( i_listener );
+        }
+
+        void removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
+        {
+            m_aUndoListeners.removeInterface( i_listener );
+        }
+
+        void addModifyListener( const Reference< XModifyListener >& i_listener )
+        {
+            m_aModifyListeners.addInterface( i_listener );
+        }
+
+        void removeModifyListener( const Reference< XModifyListener >& i_listener )
+        {
+            m_aModifyListeners.removeInterface( i_listener );
+        }
+
+        UndoManagerEvent
+            buildEvent( ::rtl::OUString const& i_title ) const;
+
+        void impl_notifyModified();
+        void notify(    ::rtl::OUString const& i_title,
+                        void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& )
+                    );
+        void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) )
+        {
+            notify( ::rtl::OUString(), i_notificationMethod );
+        }
+
+        void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) );
+
+    private:
+        /// adds a function to be called to the request processor's queue
+        void impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock );
+
+        /// impl-versions of the XUndoManager API.
+        void impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden );
+        void impl_leaveUndoContext();
+        void impl_addUndoAction( const Reference< XUndoAction >& i_action );
+        void impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo );
+        void impl_clear();
+        void impl_clearRedo();
+        void impl_reset();
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::disposing()
+    {
+        EventObject aEvent;
+        aEvent.Source = getXUndoManager();
+        m_aUndoListeners.disposeAndClear( aEvent );
+        m_aModifyListeners.disposeAndClear( aEvent );
+
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        getUndoManager().RemoveUndoListener( *this );
+
+        m_disposed = true;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoManagerEvent UndoManagerHelper_Impl::buildEvent( ::rtl::OUString const& i_title ) const
+    {
+        UndoManagerEvent aEvent;
+        aEvent.Source = getXUndoManager();
+        aEvent.UndoActionTitle = i_title;
+        aEvent.UndoContextDepth = getUndoManager().GetListActionDepth();
+        return aEvent;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_notifyModified()
+    {
+        const EventObject aEvent( getXUndoManager() );
+        m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::notify( ::rtl::OUString const& i_title,
+        void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) )
+    {
+        const UndoManagerEvent aEvent( buildEvent( i_title ) );
+
+        // TODO: this notification method here is used by UndoManagerHelper_Impl, to multiplex the notifications we
+        // receive from the IUndoManager. Those notitications are sent with a locked SolarMutex, which means
+        // we're doing the multiplexing here with a locked SM, too. Which is Bad (TM).
+        // Fixing this properly would require outsourcing all the notifications into an own thread - which might lead
+        // to problems of its own, since clients might expect synchronous notifications.
+
+        m_aUndoListeners.notifyEach( i_notificationMethod, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) )
+    {
+        const EventObject aEvent( getXUndoManager() );
+
+        // TODO: the same comment as in the other notify, regarding SM locking applies here ...
+
+        m_aUndoListeners.notifyEach( i_notificationMethod, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_enterUndoContext,
+                this,
+                ::boost::cref( i_title ),
+                i_hidden
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_leaveUndoContext,
+                this
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock )
+    {
+        if ( !i_action.is() )
+            throw IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal undo action object" ) ),
+                getXUndoManager(),
+                1
+            );
+
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_addUndoAction,
+                this,
+                ::boost::ref( i_action )
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_clear,
+                this
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_clearRedo,
+                this
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_reset,
+                this
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock )
+    {
+        // create the request, and add it to our queue
+        ::rtl::Reference< UndoManagerRequest > pRequest( new UndoManagerRequest( i_request ) );
+        {
+            ::osl::MutexGuard aQueueGuard( m_aQueueMutex );
+            m_aEventQueue.push( pRequest );
+        }
+
+        i_instanceLock.clear();
+
+        if ( m_bProcessingEvents )
+        {
+            // another thread is processing the event queue currently => it will also process the event which we just added
+            pRequest->wait();
+            return;
+        }
+
+        m_bProcessingEvents = true;
+        do
+        {
+            pRequest.clear();
+            {
+                ::osl::MutexGuard aQueueGuard( m_aQueueMutex );
+                if ( m_aEventQueue.empty() )
+                {
+                    // reset the flag before releasing the queue mutex, otherwise it's possible that another thread
+                    // could add an event after we release the mutex, but before we reset the flag. If then this other
+                    // thread checks the flag before be reset it, this thread's event would starve.
+                    m_bProcessingEvents = false;
+                    return;
+                }
+                pRequest = m_aEventQueue.front();
+                m_aEventQueue.pop();
+            }
+            try
+            {
+                pRequest->execute();
+                pRequest->wait();
+            }
+            catch( ... )
+            {
+                {
+                    // no chance to process further requests, if the current one failed
+                    // => discard them
+                    ::osl::MutexGuard aQueueGuard( m_aQueueMutex );
+                    while ( !m_aEventQueue.empty() )
+                    {
+                        pRequest = m_aEventQueue.front();
+                        m_aEventQueue.pop();
+                        pRequest->cancel( getXUndoManager() );
+                    }
+                    m_bProcessingEvents = false;
+                }
+                // re-throw the error
+                throw;
+            }
+        }
+        while ( true );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden )
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( !rUndoManager.IsUndoEnabled() )
+            // ignore this request if the manager is locked
+            return;
+
+        if ( i_hidden && ( rUndoManager.GetUndoActionCount( IUndoManager::CurrentLevel ) == 0 ) )
+            throw EmptyUndoStackException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "can't enter a hidden context without a previous Undo action" ) ),
+                m_rUndoManagerImplementation.getThis()
+            );
+
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            rUndoManager.EnterListAction( i_title, ::rtl::OUString() );
+        }
+
+        m_aContextVisibilities.push( i_hidden );
+
+        const UndoManagerEvent aEvent( buildEvent( i_title ) );
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        m_aUndoListeners.notifyEach( i_hidden ? &XUndoManagerListener::enteredHiddenContext : &XUndoManagerListener::enteredContext, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_leaveUndoContext()
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( !rUndoManager.IsUndoEnabled() )
+            // ignore this request if the manager is locked
+            return;
+
+        if ( !rUndoManager.IsInListAction() )
+            throw InvalidStateException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no active undo context" ) ),
+                getXUndoManager()
+            );
+
+        size_t nContextElements = 0;
+
+        const bool isHiddenContext = m_aContextVisibilities.top();;
+        m_aContextVisibilities.pop();
+
+        const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 );
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            if ( isHiddenContext )
+                nContextElements = rUndoManager.LeaveAndMergeListAction();
+            else
+                nContextElements = rUndoManager.LeaveListAction();
+        }
+        const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 );
+
+        // prepare notification
+        void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL;
+
+        UndoManagerEvent aContextEvent( buildEvent( ::rtl::OUString() ) );
+        const EventObject aClearedEvent( getXUndoManager() );
+        if ( nContextElements == 0 )
+        {
+            notificationMethod = &XUndoManagerListener::cancelledContext;
+        }
+        else if ( isHiddenContext )
+        {
+            notificationMethod = &XUndoManagerListener::leftHiddenContext;
+        }
+        else
+        {
+            aContextEvent.UndoActionTitle = rUndoManager.GetUndoActionComment( 0, IUndoManager::CurrentLevel );
+            notificationMethod = &XUndoManagerListener::leftContext;
+        }
+
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        if ( bHadRedoActions && !bHasRedoActions )
+            m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aClearedEvent );
+        m_aUndoListeners.notifyEach( notificationMethod, aContextEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo )
+    {
+        ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() );
+            // note that this assumes that the mutex has been released in the thread which added the
+            // Undo/Redo request, so we can successfully acquire it
+
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( rUndoManager.IsInListAction() )
+            throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() );
+
+        const size_t nElements  =   i_undo
+                                ?   rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
+                                :   rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
+        if ( nElements == 0 )
+            throw EmptyUndoStackException( ::rtl::OUString::createFromAscii( "stack is empty" ), getXUndoManager() );
+
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        try
+        {
+            if ( i_undo )
+                rUndoManager.Undo();
+            else
+                rUndoManager.Redo();
+        }
+        catch( const RuntimeException& ) { /* allowed to leave here */ throw; }
+        catch( const UndoFailedException& ) { /* allowed to leave here */ throw; }
+        catch( const Exception& )
+        {
+            // not allowed to leave
+            const Any aError( ::cppu::getCaughtException() );
+            throw UndoFailedException( ::rtl::OUString(), getXUndoManager(), aError );
+        }
+
+        // note that in opposite to all of the other methods, we do *not* have our mutex locked when calling
+        // into the IUndoManager implementation. This ensures that an actual XUndoAction::undo/redo is also
+        // called without our mutex being locked.
+        // As a consequence, we do not set m_bAPIActionRunning here. Instead, our actionUndone/actionRedone methods
+        // *always* multiplex the event to our XUndoManagerListeners, not only when m_bAPIActionRunning is FALSE (This
+        // again is different from all other SfxUndoListener methods).
+        // So, we do not need to do this notification here ourself.
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action )
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( !rUndoManager.IsUndoEnabled() )
+            // ignore the request if the manager is locked
+            return;
+
+        const UndoManagerEvent aEventAdd( buildEvent( i_action->getTitle() ) );
+        const EventObject aEventClear( getXUndoManager() );
+
+        const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 );
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) );
+        }
+        const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 );
+
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::undoActionAdded, aEventAdd );
+        if ( bHadRedoActions && !bHasRedoActions )
+            m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aEventClear );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_clear()
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( rUndoManager.IsInListAction() )
+            throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() );
+
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            rUndoManager.Clear();
+        }
+
+        const EventObject aEvent( getXUndoManager() );
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::allActionsCleared, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_clearRedo()
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        if ( rUndoManager.IsInListAction() )
+            throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() );
+
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            rUndoManager.ClearRedo();
+        }
+
+        const EventObject aEvent( getXUndoManager() );
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::impl_reset()
+    {
+        // SYNCHRONIZED --->
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        IUndoManager& rUndoManager = getUndoManager();
+        {
+            ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
+            rUndoManager.Reset();
+        }
+
+        const EventObject aEvent( getXUndoManager() );
+        aGuard.clear();
+        // <--- SYNCHRONIZED
+
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::resetAll, aEvent );
+        impl_notifyModified();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::actionUndone( const String& i_actionComment )
+    {
+        UndoManagerEvent aEvent;
+        aEvent.Source = getXUndoManager();
+        aEvent.UndoActionTitle = i_actionComment;
+        aEvent.UndoContextDepth = 0;    // Undo can happen on level 0 only
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::actionUndone, aEvent );
+        impl_notifyModified();
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::actionRedone( const String& i_actionComment )
+    {
+        UndoManagerEvent aEvent;
+        aEvent.Source = getXUndoManager();
+        aEvent.UndoActionTitle = i_actionComment;
+        aEvent.UndoContextDepth = 0;    // Redo can happen on level 0 only
+        m_aUndoListeners.notifyEach( &XUndoManagerListener::actionRedone, aEvent );
+        impl_notifyModified();
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::undoActionAdded( const String& i_actionComment )
+    {
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( i_actionComment, &XUndoManagerListener::undoActionAdded );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::cleared()
+    {
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( &XUndoManagerListener::allActionsCleared );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::clearedRedo()
+    {
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( &XUndoManagerListener::redoActionsCleared );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::resetAll()
+    {
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( &XUndoManagerListener::resetAll );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::listActionEntered( const String& i_comment )
+    {
+#if OSL_DEBUG_LEVEL > 0
+        m_aContextAPIFlags.push( m_bAPIActionRunning );
+#endif
+
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( i_comment, &XUndoManagerListener::enteredContext );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::listActionLeft( const String& i_comment )
+    {
+#if OSL_DEBUG_LEVEL > 0
+        const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
+        m_aContextAPIFlags.pop();
+        OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeft: API and non-API contexts interwoven!" );
+#endif
+
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( i_comment, &XUndoManagerListener::leftContext );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::listActionLeftAndMerged()
+    {
+#if OSL_DEBUG_LEVEL > 0
+        const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
+        m_aContextAPIFlags.pop();
+        OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts interwoven!" );
+#endif
+
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( &XUndoManagerListener::leftHiddenContext );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::listActionCancelled()
+    {
+#if OSL_DEBUG_LEVEL > 0
+        const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
+        m_aContextAPIFlags.pop();
+        OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionCancelled: API and non-API contexts interwoven!" );
+#endif
+
+        if ( m_bAPIActionRunning )
+            return;
+
+        notify( &XUndoManagerListener::cancelledContext );
+    }
+
+     //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::undoManagerDying()
+    {
+        // TODO: do we need to care? Or is this the responsibility of our owner?
+    }
+
+    //==================================================================================================================
+    //= UndoManagerHelper
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl )
+        :m_pImpl( new UndoManagerHelper_Impl( *this, i_undoManagerImpl ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoManagerHelper::~UndoManagerHelper()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::disposing()
+    {
+        m_pImpl->disposing();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->enterUndoContext( i_title, false, i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->enterUndoContext( ::rtl::OUString(), true, i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->leaveUndoContext( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_doUndoRedo,
+                this,
+                ::boost::ref( i_instanceLock ),
+                true
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock )
+    {
+        impl_processRequest(
+            ::boost::bind(
+                &UndoManagerHelper_Impl::impl_doUndoRedo,
+                this,
+                ::boost::ref( i_instanceLock ),
+                false
+            ),
+            i_instanceLock
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->addUndoAction( i_action, i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::undo( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->undo( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::redo( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->redo( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool UndoManagerHelper::isUndoPossible() const
+    {
+        // SYNCHRONIZED --->
+        ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
+        IUndoManager& rUndoManager = m_pImpl->getUndoManager();
+        if ( rUndoManager.IsInListAction() )
+            return sal_False;
+        return rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) > 0;
+        // <--- SYNCHRONIZED
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool UndoManagerHelper::isRedoPossible() const
+    {
+        // SYNCHRONIZED --->
+        ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
+        const IUndoManager& rUndoManager = m_pImpl->getUndoManager();
+        if ( rUndoManager.IsInListAction() )
+            return sal_False;
+        return rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0;
+        // <--- SYNCHRONIZED
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        //..............................................................................................................
+        ::rtl::OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo )
+        {
+            // SYNCHRONIZED --->
+            ::osl::MutexGuard aGuard( i_impl.getMutex() );
+
+            const IUndoManager& rUndoManager = i_impl.getUndoManager();
+            const size_t nActionCount = i_undo
+                                    ?   rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
+                                    :   rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
+            if ( nActionCount == 0 )
+                throw EmptyUndoStackException(
+                    i_undo ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the undo stack" ) )
+                           : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the redo stack" ) ),
+                    i_impl.getXUndoManager()
+                );
+            return  i_undo
+                ?   rUndoManager.GetUndoActionComment( 0, IUndoManager::TopLevel )
+                :   rUndoManager.GetRedoActionComment( 0, IUndoManager::TopLevel );
+            // <--- SYNCHRONIZED
+        }
+
+        //..............................................................................................................
+        Sequence< ::rtl::OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo )
+        {
+            // SYNCHRONIZED --->
+            ::osl::MutexGuard aGuard( i_impl.getMutex() );
+
+            const IUndoManager& rUndoManager = i_impl.getUndoManager();
+            const size_t nCount =   i_undo
+                                ?   rUndoManager.GetUndoActionCount( IUndoManager::TopLevel )
+                                :   rUndoManager.GetRedoActionCount( IUndoManager::TopLevel );
+
+            Sequence< ::rtl::OUString > aTitles( nCount );
+            for ( size_t i=0; i<nCount; ++i )
+            {
+                aTitles[i] =    i_undo
+                            ?   rUndoManager.GetUndoActionComment( i, IUndoManager::TopLevel )
+                            :   rUndoManager.GetRedoActionComment( i, IUndoManager::TopLevel );
+            }
+            return aTitles;
+            // <--- SYNCHRONIZED
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString UndoManagerHelper::getCurrentUndoActionTitle() const
+    {
+        return lcl_getCurrentActionTitle( *m_pImpl, true );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString UndoManagerHelper::getCurrentRedoActionTitle() const
+    {
+        return lcl_getCurrentActionTitle( *m_pImpl, false );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > UndoManagerHelper::getAllUndoActionTitles() const
+    {
+        return lcl_getAllActionTitles( *m_pImpl, true );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > UndoManagerHelper::getAllRedoActionTitles() const
+    {
+        return lcl_getAllActionTitles( *m_pImpl, false );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::clear( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->clear( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->clearRedo( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::reset( IMutexGuard& i_instanceLock )
+    {
+        m_pImpl->reset( i_instanceLock );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::lock()
+    {
+        // SYNCHRONIZED --->
+        ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
+
+        IUndoManager& rUndoManager = m_pImpl->getUndoManager();
+        rUndoManager.EnableUndo( false );
+        // <--- SYNCHRONIZED
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::unlock()
+    {
+        // SYNCHRONIZED --->
+        ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
+
+        IUndoManager& rUndoManager = m_pImpl->getUndoManager();
+        if ( rUndoManager.IsUndoEnabled() )
+            throw NotLockedException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), m_pImpl->getXUndoManager() );
+        rUndoManager.EnableUndo( true );
+        // <--- SYNCHRONIZED
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool UndoManagerHelper::isLocked()
+    {
+        // SYNCHRONIZED --->
+        ::osl::MutexGuard aGuard( m_pImpl->getMutex() );
+
+        IUndoManager& rUndoManager = m_pImpl->getUndoManager();
+        return !rUndoManager.IsUndoEnabled();
+        // <--- SYNCHRONIZED
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
+    {
+        if ( i_listener.is() )
+            m_pImpl->addUndoManagerListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
+    {
+        if ( i_listener.is() )
+            m_pImpl->removeUndoManagerListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener )
+    {
+        if ( i_listener.is() )
+            m_pImpl->addModifyListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener )
+    {
+        if ( i_listener.is() )
+            m_pImpl->removeModifyListener( i_listener );
+    }
+
+//......................................................................................................................
+} // namespace framework
+//......................................................................................................................
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index e00967e846..a07d892102 100644..100755
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include "interaction/preventduplicateinteraction.hxx"
+#include "framework/preventduplicateinteraction.hxx"
 
 //_________________________________________________________________________________________________________________
 //	my own includes
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx
index 09fb40a147..9d6e45a533 100644..100755
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/eventsconfiguration.hxx>
+#include <framework/eventsconfiguration.hxx>
 #include <xml/eventsdocumenthandler.hxx>
 #include <services.h>
 
diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx
index 81d597be3f..f143ae2271 100644..100755
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
+#include <framework/fwedllapi.h>
 #include <stdio.h>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx
index 199c9bdf41..083c4e7a93 100644..100755
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/fwe/xml/imagesconfiguration.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <services.h>
 
 #include <xml/imagesdocumenthandler.hxx>
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx
index 54c14ed2f2..b68d178506 100644..100755
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx
@@ -681,7 +681,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
     {
         ImageListDescriptor* pImageList = m_aImageListsItems.pImageList;
 
-        for ( USHORT i = 0; i < m_aImageListsItems.pImageList->Count(); i++ )
+        for ( sal_uInt16 i = 0; i < m_aImageListsItems.pImageList->Count(); i++ )
         {
             const ImageListItemDescriptor* pImageItems = (*pImageList)[i];
             WriteImageList( pImageItems );
@@ -765,7 +765,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
     ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList;
     if ( pImageItemList )
     {
-        for ( USHORT i = 0; i < pImageItemList->Count(); i++ )
+        for ( sal_uInt16 i = 0; i < pImageItemList->Count(); i++ )
             WriteImage( (*pImageItemList)[i] );
     }
 
@@ -800,7 +800,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte
     m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList );
     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
 
-    for ( USHORT i = 0; i < pExternalImageList->Count(); i++ )
+    for ( sal_uInt16 i = 0; i < pExternalImageList->Count(); i++ )
     {
         ExternalImageItemDescriptor* pItem = (*pExternalImageList)[i];
         WriteExternalImage( pItem );
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 0ae2616356..6dc8d649e7 100644..100755
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -32,10 +32,10 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include <xml/menuconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
 
-#include <classes/bmkmenu.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/addonmenu.hxx>
 #include <xml/menudocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
@@ -63,12 +63,12 @@ using namespace ::com::sun::star::io;
 namespace framework
 {
 
-BOOL MenuConfiguration::IsPickListItemId( USHORT nId )
+sal_Bool MenuConfiguration::IsPickListItemId( sal_uInt16 nId )
 {
     return (( START_ITEMID_PICKLIST <= nId ) && ( nId <= END_ITEMID_PICKLIST ));
 }
 
-BOOL MenuConfiguration::IsWindowListItemId( USHORT nId )
+sal_Bool MenuConfiguration::IsWindowListItemId( sal_uInt16 nId )
 {
     return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <= END_ITEMID_WINDOWLIST ));
 }
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 997f922d19..f093531056 100644..100755
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -33,8 +33,8 @@
 #include <sal/macros.h>
 
 #include <xml/menudocumenthandler.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/addonmenu.hxx>
 
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -926,7 +926,7 @@ throw ( SAXException, RuntimeException )
                     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
                     m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
                     m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-                    bSeparator = FALSE;
+                    bSeparator = sal_False;
                 }
             }
             else
@@ -935,7 +935,7 @@ throw ( SAXException, RuntimeException )
                 {
                     if ( aCommandURL.getLength() > 0 )
                     {
-                        bSeparator = FALSE;
+                        bSeparator = sal_False;
                         WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
                     }
                 }
@@ -943,7 +943,7 @@ throw ( SAXException, RuntimeException )
                 {
                     // Don't write two separators together
                     WriteMenuSeparator();
-                    bSeparator = TRUE;
+                    bSeparator = sal_True;
                 }
             }
         }
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index a44524eb74..a44524eb74 100644..100755
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index 422387e8dd..57c0500160 100644..100755
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -29,7 +29,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 #include <xml/statusbardocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index a8df628758..8513b768db 100644..100755
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -655,7 +655,7 @@ throw ( SAXException, RuntimeException )
                              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_STYLE_OUT )) );
     }
 
-    // autosize (default FALSE)
+    // autosize (default sal_False)
     if ( nStyle & ItemStyle::AUTO_SIZE )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_AUTOSIZE )),
@@ -663,7 +663,7 @@ throw ( SAXException, RuntimeException )
                              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BOOLEAN_TRUE )) );
     }
 
-    // ownerdraw (default FALSE)
+    // ownerdraw (default sal_False)
     if ( nStyle & ItemStyle::OWNER_DRAW )
     {
         pList->AddAttribute( m_aXMLStatusBarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_OWNERDRAW )),
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index f5dbb74469..871d377d64 100644..100755
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -29,7 +29,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <xml/toolboxdocumenthandler.hxx>
 #include <xml/saxnamespacefilter.hxx>
 #include <services.h>
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index aa2cda836f..9f93e76524 100644..100755
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -349,7 +349,7 @@ throw(	SAXException, RuntimeException )
 
                             case TB_ATTRIBUTE_ITEMBITS:
                             {
-                                nItemBits = (USHORT)(xAttribs->getValueByIndex( n ).toInt32());
+                                nItemBits = (sal_uInt16)(xAttribs->getValueByIndex( n ).toInt32());
                             }
                             break;
 
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
new file mode 100755
index 0000000000..039eaffad2
--- /dev/null
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+#include <stdio.h>
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <threadhelp/resetableguard.hxx>
+#include <xml/toolboxlayoutdocumenthandler.hxx>
+#include <macros/debug.hxx>
+#include <xml/toolboxconfigurationdefines.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
+#endif
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index e39eaebfd2..e39eaebfd2 100644..100755
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
diff --git a/framework/source/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index b1b64c5aac..b1b64c5aac 100644..100755
--- a/framework/source/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index f575471927..f575471927 100644..100755
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 64e1495f39..9c2d6a657e 100644..100755
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -333,7 +333,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler ,
             (**ppPattern)[*pItem] = lNames[nSource];
         }
 
-        // �nsert the handler info into the normal handler cache
+        // ï¿œnsert the handler info into the normal handler cache
         (**ppHandler)[lNames[nSource]] = aHandler;
         ++nSource;
     }
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 0e91b807c9..194c4faba6 100644..100755
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -128,14 +128,17 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
             {
                 rtl::OUString aStr;
                 Sequence< PropertyValue > aPropSeq;
-                if ( _xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
+                if( _xUICommandLabels->hasByName( aCmdURL ) )
                 {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+                    if ( _xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq )
                     {
-                        if ( aPropSeq[i].Name.equalsAscii( _pName/*"Label"*/ ))
+                        for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
                         {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
+                            if ( aPropSeq[i].Name.equalsAscii( _pName/*"Label"*/ ))
+                            {
+                                aPropSeq[i].Value >>= aStr;
+                                break;
+                            }
                         }
                     }
                 }
@@ -223,7 +226,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
         Sequence< Locale > rLocales( xDocumentLanguages->getDocumentLanguages( nScriptType, nMaxCount ));
         if ( rLocales.getLength() > 0 )
         {
-            for ( USHORT i = 0; i < rLocales.getLength(); ++i )
+            for ( sal_uInt16 i = 0; i < rLocales.getLength(); ++i )
             {
                 if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
                     break;
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index 24169dcd05..24169dcd05 100644..100755
--- a/framework/source/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx
index 42ffe201f1..42ffe201f1 100644..100755
--- a/framework/source/helper/shareablemutex.cxx
+++ b/framework/source/fwi/helper/shareablemutex.cxx
diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 99409263b4..99409263b4 100644..100755
--- a/framework/source/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index 72127aa58d..72127aa58d 100644..100755
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index c18e9d56b5..c18e9d56b5 100644..100755
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 3fbb1b264c..8d61b28b31 100644..100755
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -37,6 +37,7 @@
 #include <macros/debug.hxx>
 
 #include <macros/generic.hxx>
+#include <fwidllapi.h>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -181,7 +182,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
                                     // Make member access threadsafe!
                                     ResetableGuard aGuard( m_aMutex );
 
-                                    // Check working mode again .. because anoz�ther instance could be faster.
+                                    // Check working mode again .. because anozï¿œther instance could be faster.
                                     // (It's possible to set this guard at first of this method too!)
                                     if( m_aTransactionManager.getWorkingMode() == E_INIT )
                                     {
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 0b99dbd9f6..0b99dbd9f6 100644..100755
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 9b6c20c3e0..9b6c20c3e0 100644..100755
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 75a308b906..2cca964d2d 100644..100755
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -345,7 +345,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any&       aConve
                                                                const Any& aValue             )
 throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //	Initialize state with FALSE !!!
+    //	Initialize state with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 2ff5c23266..a1e07773f7 100644..100755
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -76,7 +76,7 @@ using namespace ::osl							;
 //*****************************************************************************************************************
 //	constructor
 //*****************************************************************************************************************
-DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor(	const	Reference< XFrame >&		xOwner	)
+DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor(	const	css::uno::Reference< XFrame >&		xOwner	)
         //	Init baseclasses first
         :	ThreadHelpBase  ( &Application::GetSolarMutex() )
         // Init member
@@ -100,8 +100,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
-    Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
 
     return xContainerWindow;
 }
@@ -112,13 +112,13 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
     aGuard.unlock();
     
     if ( xFrame.is() == sal_True )
     {
-        Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
-        Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
+        css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+        css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
 
         if (( xContainerWindow.is() == sal_True ) &&
             ( xComponentWindow.is() == sal_True )       )
@@ -152,11 +152,11 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
     ResetableGuard aGuard( m_aLock );
 
     // Try to "lock" the frame for access to taskscontainer.
-    Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY );
     if ( xFrame.is() == sal_True )
     {
-        Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
-        Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
+        css::uno::Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
+        css::uno::Reference< css::awt::XWindow > xComponentWindow( xFrame->getComponentWindow() );
 
         if (( xContainerWindow.is() == sal_True ) &&
             ( xComponentWindow.is() == sal_True )       )
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
deleted file mode 100644
index ed54c38116..0000000000
--- a/framework/source/helper/makefile.mk
+++ /dev/null
@@ -1,69 +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=			framework
-TARGET=				fwk_helper
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES= 			$(SLO)$/ocomponentaccess.obj					\
-                    $(SLO)$/ocomponentenumeration.obj				\
-                    $(SLO)$/oframes.obj								\
-                    $(SLO)$/statusindicatorfactory.obj				\
-                    $(SLO)$/statusindicator.obj						\
-                    $(SLO)$/imageproducer.obj						\
-                    $(SLO)$/propertysetcontainer.obj				\
-                    $(SLO)$/actiontriggerhelper.obj					\
-                    $(SLO)$/persistentwindowstate.obj				\
-                    $(SLO)$/networkdomain.obj						\
-                    $(SLO)$/acceleratorinfo.obj                     \
-                    $(SLO)$/uielementwrapperbase.obj                \
-                    $(SLO)$/dockingareadefaultacceptor.obj          \
-                    $(SLO)$/uiconfigelementwrapperbase.obj          \
-                    $(SLO)$/shareablemutex.obj                      \
-                    $(SLO)$/vclstatusindicator.obj                  \
-                    $(SLO)$/wakeupthread.obj                        \
-                    $(SLO)$/configimporter.obj                      \
-                    $(SLO)$/tagwindowasmodified.obj                 \
-                    $(SLO)$/titlebarupdate.obj                      \
-                    $(SLO)$/titlehelper.obj                         \
-                    $(SLO)$/mischelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index a0eb41b56b..d1e7933e9e 100644..100755
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -76,7 +76,7 @@ using namespace ::rtl							;
 //*****************************************************************************************************************
 //	constructor
 //*****************************************************************************************************************
-OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner )
+OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner )
         //	Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
         // Init member
@@ -96,27 +96,27 @@ OComponentAccess::~OComponentAccess()
 //*****************************************************************************************************************
 //	XEnumerationAccess
 //*****************************************************************************************************************
-Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException )
+css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
 
     // Set default return value, if method failed.
     // If no desktop exist and there is no task container - return an empty enumeration!
-    Reference< XEnumeration > xReturn = Reference< XEnumeration >();
+    css::uno::Reference< XEnumeration > xReturn = css::uno::Reference< XEnumeration >();
 
     // Try to "lock" the desktop for access to task container.
-    Reference< XInterface > xLock = m_xOwner.get();
+    css::uno::Reference< XInterface > xLock = m_xOwner.get();
     if ( xLock.is() == sal_True )
     {
         // Desktop exist => pointer to task container must be valid.
         // Initialize a new enumeration ... if some tasks and his components exist!
         // (OTasksEnumeration will make an assert, if we initialize the new instance without valid values!)
 
-        Sequence< Reference< XComponent > > seqComponents;
-        impl_collectAllChildComponents( Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents );
+        Sequence< css::uno::Reference< XComponent > > seqComponents;
+        impl_collectAllChildComponents( css::uno::Reference< XFramesSupplier >( xLock, UNO_QUERY ), seqComponents );
         OComponentEnumeration* pEnumeration = new OComponentEnumeration( seqComponents );
-        xReturn = Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY );
+        xReturn = css::uno::Reference< XEnumeration >( (OWeakObject*)pEnumeration, UNO_QUERY );
     }
 
     // Return result of this operation.
@@ -130,7 +130,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException )
 {
     // Elements in list an enumeration are components!
     // Return the uno-type of XComponent.
-    return ::getCppuType((const Reference< XComponent >*)NULL);
+    return ::getCppuType((const css::uno::Reference< XComponent >*)NULL);
 }
 
 //*****************************************************************************************************************
@@ -145,7 +145,7 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException )
     sal_Bool bReturn = sal_False;
 
     // Try to "lock" the desktop for access to task container.
-    Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xLock( m_xOwner.get(), UNO_QUERY );
     if ( xLock.is() == sal_True )
     {
         // Ask container of owner for existing elements.
@@ -159,8 +159,8 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException )
 //*****************************************************************************************************************
 //	private method
 //*****************************************************************************************************************
-void OComponentAccess::impl_collectAllChildComponents(	const	Reference< XFramesSupplier >&			xNode			,
-                                                                 Sequence< Reference< XComponent > >&	seqComponents	)
+void OComponentAccess::impl_collectAllChildComponents(	const	css::uno::Reference< XFramesSupplier >&			xNode			,
+                                                                 Sequence< css::uno::Reference< XComponent > >&	seqComponents	)
 {
     // If valid node was given ...
     if( xNode.is() == sal_True )
@@ -172,13 +172,13 @@ void OComponentAccess::impl_collectAllChildComponents(	const	Reference< XFramesS
 
         sal_Int32 nComponentCount = seqComponents.getLength();
 
-        const Reference< XFrames >				xContainer	= xNode->getFrames();
-        const Sequence< Reference< XFrame > >	seqFrames	= xContainer->queryFrames( FrameSearchFlag::CHILDREN );
+        const css::uno::Reference< XFrames >				xContainer	= xNode->getFrames();
+        const Sequence< css::uno::Reference< XFrame > >	seqFrames	= xContainer->queryFrames( FrameSearchFlag::CHILDREN );
 
         const sal_Int32 nFrameCount = seqFrames.getLength();
         for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame )
         {
-            Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] );
+            css::uno::Reference< XComponent > xComponent = impl_getFrameComponent( seqFrames[nFrame] );
             if( xComponent.is() == sal_True )
             {
                 nComponentCount++;
@@ -193,30 +193,30 @@ void OComponentAccess::impl_collectAllChildComponents(	const	Reference< XFramesS
 //*****************************************************************************************************************
 //	private method
 //*****************************************************************************************************************
-Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Reference< XFrame >& xFrame ) const
+css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const
 {
     // Set default return value, if method failed.
-    Reference< XComponent > xComponent = Reference< XComponent >();
+    css::uno::Reference< XComponent > xComponent = css::uno::Reference< XComponent >();
     // Does no controller exists?
-    Reference< XController > xController = xFrame->getController();
+    css::uno::Reference< XController > xController = xFrame->getController();
     if ( xController.is() == sal_False )
     {
         // Controller not exist - use the VCL-component.
-        xComponent = Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY );
+        xComponent = css::uno::Reference< XComponent >( xFrame->getComponentWindow(), UNO_QUERY );
     }
     else
     {
         // Does no model exists?
-        Reference< XModel > xModel( xController->getModel(), UNO_QUERY );
+        css::uno::Reference< XModel > xModel( xController->getModel(), UNO_QUERY );
         if ( xModel.is() == sal_True )
         {
             // Model exist - use the model as component.
-            xComponent = Reference< XComponent >( xModel, UNO_QUERY );
+            xComponent = css::uno::Reference< XComponent >( xModel, UNO_QUERY );
         }
         else
         {
             // Model not exist - use the controller as component.
-            xComponent = Reference< XComponent >( xController, UNO_QUERY );
+            xComponent = css::uno::Reference< XComponent >( xController, UNO_QUERY );
         }
     }
 
@@ -240,7 +240,7 @@ Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Referenc
 #ifdef ENABLE_ASSERTIONS
 
 //*****************************************************************************************************************
-sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   Reference< XDesktop >&      xOwner  )
+sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   css::uno::Reference< XDesktop >&      xOwner  )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 5c95079faf..1d1fd29300 100644..100755
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -73,7 +73,7 @@ using namespace ::rtl							;
 //*****************************************************************************************************************
 //	constructor
 //*****************************************************************************************************************
-OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XComponent > >& seqComponents )
+OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
         //	Init baseclasses first
         //	Attention:
         //		Don't change order of initialization!
@@ -199,7 +199,7 @@ void OComponentEnumeration::impl_resetObject()
 
 //*****************************************************************************************************************
 // An empty list is allowed ... hasMoreElements() will return false then!
-sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< Reference< XComponent > >& seqComponents )
+sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 492d6b6132..fe38cfdd9f 100644..100755
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -78,8 +78,8 @@ using rtl::OUString;
 //*****************************************************************************************************************
 //	constructor
 //*****************************************************************************************************************
-OFrames::OFrames(	const	Reference< XMultiServiceFactory >&	xFactory		,
-                    const	Reference< XFrame >&				xOwner			,
+OFrames::OFrames(	const	css::uno::Reference< XMultiServiceFactory >&	xFactory		,
+                    const	css::uno::Reference< XFrame >&				xOwner			,
                             FrameContainer*						pFrameContainer	)
         //	Init baseclasses first
         :   ThreadHelpBase              ( &Application::GetSolarMutex() )
@@ -106,7 +106,7 @@ OFrames::~OFrames()
 //*****************************************************************************************************************
 //	XFrames
 //*****************************************************************************************************************
-void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException )
+void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -117,7 +117,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim
 
     // Do the follow only, if owner instance valid!
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Append frame to the end of the container ...
@@ -132,7 +132,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim
 //*****************************************************************************************************************
 //	XFrames
 //*****************************************************************************************************************
-void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( RuntimeException )
+void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -143,7 +143,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim
 
     // Do the follow only, if owner instance valid!
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFramesSupplier > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Search frame and remove it from container ...
@@ -159,7 +159,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim
 //*****************************************************************************************************************
 //	XFrames
 //*****************************************************************************************************************
-Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException )
+Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException )
 {
     // Ready for multithreading
     ResetableGuard aGuard( m_aLock );
@@ -169,11 +169,11 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
     LOG_ASSERT( impldbg_checkParameter_queryFrames( nSearchFlags ), "OFrames::queryFrames()\nInvalid parameter detected!\n" )
 
     // Set default return value. (empty sequence)
-    Sequence< Reference< XFrame > > seqFrames;
+    Sequence< css::uno::Reference< XFrame > > seqFrames;
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Work only, if search was not started here ...!
@@ -202,10 +202,10 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
             // Add parent to list ... if any exist!
             if( nSearchFlags & FrameSearchFlag::PARENT )
             {
-                Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY );
+                css::uno::Reference< XFrame > xParent( xOwner->getCreator(), UNO_QUERY );
                 if( xParent.is() == sal_True )
                 {
-                    Sequence< Reference< XFrame > > seqParent( 1 );
+                    Sequence< css::uno::Reference< XFrame > > seqParent( 1 );
                     seqParent[0] = xParent;
                     impl_appendSequence( seqFrames, seqParent );
                 }
@@ -215,7 +215,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
             // Add owner to list if SELF is searched.
             if( nSearchFlags & FrameSearchFlag::SELF )
             {
-                Sequence< Reference< XFrame > > seqSelf( 1 );
+                Sequence< css::uno::Reference< XFrame > > seqSelf( 1 );
                 seqSelf[0] = xOwner;
                 impl_appendSequence( seqFrames, seqSelf );
             }
@@ -228,7 +228,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
                 // Protect this instance against recursive calls from parents.
                 m_bRecursiveSearchProtection = sal_True;
                 // Ask parent of my owner for frames and append results to return list.
-                Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY );
+                css::uno::Reference< XFramesSupplier > xParent( xOwner->getCreator(), UNO_QUERY );
                 // If a parent exist ...
                 if ( xParent.is() == sal_True )
                 {
@@ -253,7 +253,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch
                 {
                     // We don't must control this conversion.
                     // We have done this at append()!
-                    Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY );
+                    css::uno::Reference< XFramesSupplier > xItem( (*m_pFrameContainer)[nIndex], UNO_QUERY );
                     impl_appendSequence( seqFrames, xItem->getFrames()->queryFrames( nChildSearchFlags ) );
                 }
             }
@@ -279,7 +279,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException )
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Set CURRENT size of container for return.
@@ -310,7 +310,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw(	IndexOutOfBoundsExce
 
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // Get element form container.
@@ -328,7 +328,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw(	IndexOutOfBoundsExce
 Type SAL_CALL OFrames::getElementType() throw( RuntimeException )
 {
     // This "container" support XFrame-interfaces only!
-    return ::getCppuType( (const Reference< XFrame >*)NULL );
+    return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL );
 }
 
 //*****************************************************************************************************************
@@ -343,7 +343,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException )
     sal_Bool bHasElements = sal_False;
     // Do the follow only, if owner instance valid.
     // Lock owner for follow operations - make a "hard reference"!
-    Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
+    css::uno::Reference< XFrame > xOwner( m_xOwner.get(), UNO_QUERY );
     if ( xOwner.is() == sal_True )
     {
         // If some elements exist ...
@@ -377,18 +377,18 @@ void OFrames::impl_resetObject()
 //*****************************************************************************************************************
 //	private method
 //*****************************************************************************************************************
-void OFrames::impl_appendSequence(			Sequence< Reference< XFrame > >&	seqDestination	,
-                                     const	Sequence< Reference< XFrame > >&	seqSource		)
+void OFrames::impl_appendSequence(			Sequence< css::uno::Reference< XFrame > >&	seqDestination	,
+                                     const	Sequence< css::uno::Reference< XFrame > >&	seqSource		)
 {
     // Get some informations about the sequences.
     sal_Int32						nSourceCount		= seqSource.getLength();
     sal_Int32						nDestinationCount	= seqDestination.getLength();
-    const Reference< XFrame >* 		pSourceAccess		= seqSource.getConstArray();
-    Reference< XFrame >*			pDestinationAccess	= seqDestination.getArray();
+    const css::uno::Reference< XFrame >* 		pSourceAccess		= seqSource.getConstArray();
+    css::uno::Reference< XFrame >*			pDestinationAccess	= seqDestination.getArray();
 
     // Get memory for result list.
-    Sequence< Reference< XFrame > >	seqResult			( nSourceCount + nDestinationCount );
-    Reference< XFrame >*			pResultAccess		= seqResult.getArray();
+    Sequence< css::uno::Reference< XFrame > >	seqResult			( nSourceCount + nDestinationCount );
+    css::uno::Reference< XFrame >*			pResultAccess		= seqResult.getArray();
     sal_Int32						nResultPosition		= 0;
 
     // Copy all items from first sequence.
@@ -433,8 +433,8 @@ void OFrames::impl_appendSequence(			Sequence< Reference< XFrame > >&	seqDestina
 // An instance of this class can only work with valid initialization.
 // We share the mutex with ouer owner class, need a valid factory to instanciate new services and
 // use the access to ouer owner for some operations.
-sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(	const	Reference< XMultiServiceFactory >&	xFactory		,
-                                                        const	Reference< XFrame >&				xOwner			,
+sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(	const	css::uno::Reference< XMultiServiceFactory >&	xFactory		,
+                                                        const	css::uno::Reference< XFrame >&				xOwner			,
                                                                 FrameContainer*						pFrameContainer	)
 {
     // Set default return value.
@@ -457,7 +457,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(	const	Reference< XMultiSer
 //*****************************************************************************************************************
 // Its only allowed to add valid references to container.
 // AND - alle frames must support XFrames-interface!
-sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFrame )
+sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
@@ -476,7 +476,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFra
 //*****************************************************************************************************************
 // Its only allowed to add valid references to container...
 // ... => You can only delete valid references!
-sal_Bool OFrames::impldbg_checkParameter_remove( const Reference< XFrame >& xFrame )
+sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame )
 {
     // Set default return value.
     sal_Bool bOK = sal_True;
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 86ff6383ea..7bae7866f3 100644..100755
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -294,7 +294,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
             (pWindow->IsSystemWindow())
            )
         {
-            ULONG nMask  =   WINDOWSTATE_MASK_ALL;
+            sal_uLong nMask  =   WINDOWSTATE_MASK_ALL;
                   nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
             sWindowState = B2U_ENC(
                             ((SystemWindow*)pWindow)->GetWindowState(nMask),
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 70ccbde379..70ccbde379 100644..100755
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 64cd2cab52..64cd2cab52 100644..100755
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 67444537af..50f7420740 100644..100755
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -58,7 +58,7 @@
 #include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //_________________________________________________________________________________________________________________
 //	namespace
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index ff36e947df..ff36e947df 100644..100755
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index db300d6920..c6b0719ed5 100644..100755
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
                                                                         sal_Int32  nHandle         ,
                                                                         const Any& aValue             ) throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //	Initialize state with FALSE !!!
+    //	Initialize state with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 6bd01e003c..6923932c15 100644..100755
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -181,7 +181,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any&       /*a
                                                                   sal_Int32  /*nHandle*/         ,
                                                                   const Any& /*aValue*/             ) throw( com::sun::star::lang::IllegalArgumentException )
 {
-    //	Initialize state with FALSE !!!
+    //	Initialize state with sal_False !!!
     //	(Handle can be invalid)
     return sal_False ;
 }
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index af6c4a3a01..47cf82eb9e 100644..100755
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -199,7 +199,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
     // <- SAFE ----------------------------------
 
     // normalize value to fit the range of 0-100 %
-    USHORT nPercent = sal::static_int_cast< USHORT >(
+    sal_uInt16 nPercent = sal::static_int_cast< sal_uInt16 >(
         ::std::min(
             ((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100));
 
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 817b19593b..817b19593b 100644..100755
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index b998fd1e30..197c578c64 100644..100755
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -137,7 +137,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
                     the key, which should be checked.
         
             @return [bool]
-                    TRUE if the speicfied key exists inside this container.
+                    sal_True if the speicfied key exists inside this container.
          */
         virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const;
         virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 3f45d1076d..455e724ce9 100644..100755
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -300,7 +300,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
 
         @param  bWriteAccessRequested
         if the outside code whish to change the container
-        it must call this method with "TRUE". So the internal
+        it must call this method with "sal_True". So the internal
         cache can be prepared for that (means copy-on-write ...).                    
 
         @return [AcceleratorCache]
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index ff36543a1c..ff36543a1c 100644..100755
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index e83eaeeaf9..e83eaeeaf9 100644..100755
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 5b86638cd3..5b86638cd3 100644..100755
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 3e70d16497..026318ae84 100644..100755
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -149,10 +149,10 @@ class KeyMapping
                     
             @param  rCode
                     contains the converted code, but is defined only
-                    if this method returns TRUE!
+                    if this method returns sal_True!
 
             @return [boolean]
-                    TRUE if convertion was successfully.                                
+                    sal_True if convertion was successfully.                                
           */
         sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier,
                                                                 sal_uInt16&      rCode      );
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index 5f073f8e36..5f073f8e36 100644..100755
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 2786b7a1ce..2786b7a1ce 100644..100755
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 2beb83664f..04c1bb7651 100644..100755
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -209,7 +209,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
                     using the given open mode. If it failed there is second step,
                     which tries to do the same again ... but removing a might existing
                     WRITE flag from the open mode. The user can supress this fallback
-                    handling by setting the parameter bAllowFallback to FALSE.
+                    handling by setting the parameter bAllowFallback to sal_False.
                     
             @param  xBaseStorage
                     the storage, where the sub element should be searched.
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index fd433dc57a..fd433dc57a 100644..100755
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx
index 786ab2d8b7..786ab2d8b7 100644..100755
--- a/framework/source/inc/constant/contenthandler.hxx
+++ b/framework/source/inc/constant/contenthandler.hxx
diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx
index c8f1a3587c..c8f1a3587c 100644..100755
--- a/framework/source/inc/constant/frameloader.hxx
+++ b/framework/source/inc/constant/frameloader.hxx
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index b9e297d950..b9e297d950 100644..100755
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx
index 73d854f807..73d854f807 100644..100755
--- a/framework/source/inc/dispatch/uieventloghelper.hxx
+++ b/framework/source/inc/dispatch/uieventloghelper.hxx
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 7c14df80df..7c14df80df 100644..100755
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index c491ab54a6..e6a05b0743 100644..100755
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -123,8 +123,8 @@ class ActionLockGuard : private ThreadHelpBase
             @param  xLock
                     points to the outside resource, which should be locked.
 
-            @return TRUE, if new resource could be set and locked.
-                    FALSE otherwhise.
+            @return sal_True, if new resource could be set and locked.
+                    sal_False otherwhise.
          */
         virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock)
         {
@@ -151,8 +151,8 @@ class ActionLockGuard : private ThreadHelpBase
             @param  xLock
                     points to the outside resource, which should be locked.
 
-            @return TRUE, if new resource could be set and locked.
-                    FALSE otherwhise.
+            @return sal_True, if new resource could be set and locked.
+                    sal_False otherwhise.
          */
         virtual void freeResource()
         {
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index c673bb646b..5ada8077c9 100644..100755
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -192,7 +192,7 @@ class LoadEnv : private ThreadHelpBase
 
         /** @short  it indicates, that the member m_xTargetFrame was new created for this
                     load request and must be closed in case loading (not handling!)
-                    operation failed. The default value is FALSE!
+                    operation failed. The default value is sal_False!
          */
         sal_Bool m_bCloseFrameOnError;
 
@@ -200,7 +200,7 @@ class LoadEnv : private ThreadHelpBase
                     in combination with the m_sTarget value "_self") was suspended.
                     Normaly it will be replaced by the new loaded document. But in case
                     loading (not handling!) failed, it must be reactivated.
-                    The default value is FALSE!
+                    The default value is sal_False!
          */
         sal_Bool m_bReactivateControllerOnError;
 
@@ -366,8 +366,8 @@ class LoadEnv : private ThreadHelpBase
                     specify a timeout in [ms].
                     A value 0 let it wait forever!
 
-            @return TRUE if the started load process could be finished in time;
-                    FALSE if the specified time was over.
+            @return sal_True if the started load process could be finished in time;
+                    sal_False if the specified time was over.
 
             @throw  ... currently not used :-)
 
@@ -650,10 +650,10 @@ class LoadEnv : private ThreadHelpBase
                     points to the container window of a frame.
 
             @param  bForceToFront
-                    if it's set to FALSE ... showing of the window is done more intelligent.
+                    if it's set to sal_False ... showing of the window is done more intelligent.
                     setVisible() is called only if the window was not shown before.
                     This mode is needed by b) and c)
-                    If it's set to TRUE ... both actions has to be done: setVisible(), toFront()!
+                    If it's set to sal_True ... both actions has to be done: setVisible(), toFront()!
                     This mode is needed by a)
          */
         void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow      ,
@@ -669,8 +669,8 @@ class LoadEnv : private ThreadHelpBase
                     the frame, which should be checked.
 
             @return [sal_Bool]
-                    TRUE if this frame is already used for loading,
-                    FALSE otherwise.
+                    sal_True if this frame is already used for loading,
+                    sal_False otherwise.
          */
         sal_Bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const;
 
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index ee666d0d02..ee666d0d02 100644..100755
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index cb8d45413d..cb8d45413d 100644..100755
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 3b1d4d2b75..3b1d4d2b75 100644..100755
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 2f1d7da860..98b17c837b 100644..100755
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -93,7 +93,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
             the right owner in case closing failed.
             
     @return [bool]
-            TRUE if closing failed.            
+            sal_True if closing failed.            
  */
 inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource         ,
                        sal_Bool                                     bDelegateOwnerShip)
diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx
index 68bf9daf60..68bf9daf60 100644..100755
--- a/framework/source/inc/pattern/storages.hxx
+++ b/framework/source/inc/pattern/storages.hxx
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index d2e277909d..da45461a2f 100644..100755
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -81,7 +81,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind
         // check for system window is neccessary to guarantee correct pointer cast!
         if (pWindow!=NULL && pWindow->IsSystemWindow())
         {
-            ULONG nMask  = WINDOWSTATE_MASK_ALL;
+            sal_uLong nMask  = WINDOWSTATE_MASK_ALL;
             nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
             sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
         }
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
deleted file mode 100644
index 0767cb6b33..0000000000
--- a/framework/source/interaction/makefile.mk
+++ /dev/null
@@ -1,49 +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=		framework
-TARGET=			fwk_interaction
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=framework
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=		$(SLO)$/quietinteraction.obj		    \
-                $(SLO)$/preventduplicateinteraction.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index c7f12beaf3..c7f12beaf3 100644..100755
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 1c257eba74..1c257eba74 100644..100755
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 27279512e8..15d1c76943 100644..100755
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -816,7 +816,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
                 describes the broadcaster and must be the frame instance
 
     @param  bGetsOwnerShip
-                If it's set to <TRUE> and we throw the right veto excepion, we have to close this frame later
+                If it's set to <sal_True> and we throw the right veto excepion, we have to close this frame later
                 if our internal processes will be finished. If it's set to <FALSE/> we can ignore it.
 
     @throw  CloseVetoException
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 525954648f..e689f37818 100644..100755
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-    /*************************************************************************
+/*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -62,6 +62,7 @@ namespace framework{
 
 const sal_Char* JobData::JOBCFG_ROOT              = "/org.openoffice.Office.Jobs/Jobs/"   ;
 const sal_Char* JobData::JOBCFG_PROP_SERVICE      = "Service"                             ;
+const sal_Char* JobData::JOBCFG_PROP_CONTEXT      = "Context"                             ;
 const sal_Char* JobData::JOBCFG_PROP_ARGUMENTS    = "Arguments"                           ;
 
 const sal_Char* JobData::EVENTCFG_ROOT            = "/org.openoffice.Office.Jobs/Events/" ;
@@ -80,6 +81,7 @@ const sal_Char* JobData::PROP_ENVTYPE             = "EnvType"
 const sal_Char* JobData::PROP_FRAME               = "Frame"                               ;
 const sal_Char* JobData::PROP_MODEL               = "Model"                               ;
 const sal_Char* JobData::PROP_SERVICE             = "Service"                             ;
+const sal_Char* JobData::PROP_CONTEXT             = "Context"                             ;
 
 //________________________________
 //	non exported definitions
@@ -140,6 +142,7 @@ void JobData::operator=( const JobData& rCopy )
     m_eEnvironment         = rCopy.m_eEnvironment        ;
     m_sAlias               = rCopy.m_sAlias              ;
     m_sService             = rCopy.m_sService            ;
+    m_sContext             = rCopy.m_sContext            ;
     m_sEvent               = rCopy.m_sEvent              ;
     m_lArguments           = rCopy.m_lArguments          ;
     m_aLastExecutionResult = rCopy.m_aLastExecutionResult;
@@ -201,6 +204,10 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
         aValue   = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_SERVICE));
         aValue >>= m_sService;
 
+        // read module context list
+        aValue   = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_CONTEXT));
+        aValue >>= m_sContext;
+
         // read whole argument list
         aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS));
         css::uno::Reference< css::container::XNameAccess > xArgumentList;
@@ -476,7 +483,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
     css::uno::Sequence< css::beans::NamedValue > lConfig;
     if (m_eMode==E_ALIAS)
     {
-        lConfig.realloc(2);
+        lConfig.realloc(3);
         sal_Int32 i = 0;
 
         lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_ALIAS);
@@ -486,6 +493,10 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
         lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_SERVICE);
         lConfig[i].Value <<= m_sService;
         ++i;
+
+        lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_CONTEXT);
+        lConfig[i].Value <<= m_sContext;
+        ++i;
     }
     aReadLock.unlock();
     /* } SAFE */
@@ -502,7 +513,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
             some informations (e.g. for updating her configuration ...). We must know
             if such request is valid or not then.
 
-    @return TRUE if the represented job is part of the underlying configuration package.
+    @return sal_True if the represented job is part of the underlying configuration package.
  */
 sal_Bool JobData::hasConfig() const
 {
@@ -609,6 +620,30 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::lang::X
 //________________________________
 /**
  */
+sal_Bool JobData::hasCorrectContext(const ::rtl::OUString& rModuleIdent) const
+{
+    sal_Int32 nContextLen  = m_sContext.getLength();
+    sal_Int32 nModuleIdLen = rModuleIdent.getLength();
+
+    if ( nContextLen == 0 )
+        return sal_True;
+
+    if ( nModuleIdLen > 0 )
+    {
+        sal_Int32 nIndex = m_sContext.indexOf( rModuleIdent );
+        if ( nIndex >= 0 && ( nIndex+nModuleIdLen <= nContextLen ))
+    {
+        ::rtl::OUString sContextModule = m_sContext.copy( nIndex, nModuleIdLen );
+        return sContextModule.equals( rModuleIdent );
+    }
+    }
+
+    return sal_False;
+}
+
+//________________________________
+/**
+ */
 css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
                                                                        const ::rtl::OUString&                                        sEvent )
 {
@@ -704,6 +739,7 @@ void JobData::impl_reset()
     m_eEnvironment = E_UNKNOWN_ENVIRONMENT;
     m_sAlias       = ::rtl::OUString();
     m_sService     = ::rtl::OUString();
+    m_sContext     = ::rtl::OUString();
     m_sEvent       = ::rtl::OUString();
     m_lArguments   = css::uno::Sequence< css::beans::NamedValue >();
     aWriteLock.unlock();
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index ad670e109c..9522482dfb 100644..100755
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -45,6 +45,7 @@
 //	interface includes
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
 
 //________________________________
 //	includes of other projects
@@ -146,7 +147,20 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
     for (int a=0; a<lArguments.getLength(); ++a)
     {
         if (a==0)
+        {
             lArguments[a] >>= m_xFrame;
+
+            css::uno::Reference< css::frame::XModuleManager > xModuleManager(
+                m_xSMGR->createInstance(
+                    SERVICENAME_MODULEMANAGER ), 
+                css::uno::UNO_QUERY_THROW );
+            try
+            {
+                m_sModuleIdentifier = xModuleManager->identify( m_xFrame );
+            }
+            catch( css::uno::Exception& )
+            {}
+        }
     }
 
     aWriteLock.unlock();
@@ -290,16 +304,8 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
     // But a may given listener will know something ...
     // I think this operaton was finished successfully.
     // It's not realy an error, if no registered jobs could be located.
-    if (lJobs.getLength()<1 && xListener.is())
-    {
-        css::frame::DispatchResultEvent aEvent;
-        aEvent.Source = xThis;
-        aEvent.State  = css::frame::DispatchResultState::SUCCESS;
-        xListener->dispatchFinished(aEvent);
-        return;
-    }
-
     // Step over all found jobs and execute it
+    int nExecutedJobs=0;
     for (int j=0; j<lJobs.getLength(); ++j)
     {
         /* SAFE { */
@@ -308,6 +314,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
         JobData aCfg(m_xSMGR);
         aCfg.setEvent(sEvent, lJobs[j]);
         aCfg.setEnvironment(JobData::E_DISPATCH);
+        const bool bIsEnabled=aCfg.hasCorrectContext(m_sModuleIdentifier);
 
         /*Attention!
             Jobs implements interfaces and dies by ref count!
@@ -321,6 +328,9 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
         aReadLock.unlock();
         /* } SAFE */
 
+        if (!bIsEnabled)
+            continue;
+
         // Special mode for listener.
         // We dont notify it directly here. We delegate that
         // to the job implementation. But we must set ourself there too.
@@ -329,6 +339,15 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString&
         if (xListener.is())
             pJob->setDispatchResultFake(xListener, xThis);
         pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
+        ++nExecutedJobs;
+    }
+
+    if (nExecutedJobs<1 && xListener.is())
+    {
+        css::frame::DispatchResultEvent aEvent;
+        aEvent.Source = xThis;
+        aEvent.State  = css::frame::DispatchResultState::SUCCESS;
+        xListener->dispatchFinished(aEvent);
     }
 }
 
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index cc681a1848..bb78d10532 100644..100755
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -99,6 +99,11 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( JobExecutor                   ,
 
 DEFINE_INIT_SERVICE( JobExecutor,
                      {
+                         m_xModuleManager = css::uno::Reference< css::frame::XModuleManager >(
+                             m_xSMGR->createInstance(
+                                 SERVICENAME_MODULEMANAGER ), 
+                             css::uno::UNO_QUERY_THROW );
+
                          /*Attention
                              I think we don't need any mutex or lock here ... because we are called by our own static method impl_createInstance()
                              to create a new instance of this class by our own supported service factory.
@@ -143,6 +148,7 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::lang::XMultiSer
     : ThreadHelpBase      (&Application::GetSolarMutex()                                   )
     , ::cppu::OWeakObject (                                                                )
     , m_xSMGR             (xSMGR                                                           )
+    , m_xModuleManager    (                                                                )
     , m_aConfig           (xSMGR, ::rtl::OUString::createFromAscii(JobData::EVENTCFG_ROOT) )
 {
     // Don't do any reference related code here! Do it inside special
@@ -237,6 +243,15 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
     // This optimization supress using of the cfg api for getting event and job descriptions.
     // see using of m_lEvents.find() below ...
 
+    // retrieve event context from event source
+    rtl::OUString aModuleIdentifier;
+    try
+    {
+        aModuleIdentifier = m_xModuleManager->identify( aEvent.Source );
+    }
+    catch( css::uno::Exception& )
+    {}
+
     // Special feature: If the events "OnNew" or "OnLoad" occures - we generate our own event "onDocumentOpened".
     if (
         (aEvent.EventName.equals(EVENT_ON_NEW )) ||
@@ -279,6 +294,9 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
         aCfg.setEvent(rBinding.m_sDocEvent, rBinding.m_sJobName);
         aCfg.setEnvironment(JobData::E_DOCUMENTEVENT);
 
+        if (!aCfg.hasCorrectContext(aModuleIdentifier))
+            continue;
+
         /*Attention!
             Jobs implements interfaces and dies by ref count!
             And freeing of such uno object is done by uno itself.
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index 2229356d5c..2229356d5c 100644..100755
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 2c5bbe864c..694a255898 100644..100755
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -279,8 +279,8 @@ sal_Bool JobURL::implst_split( /*IN*/  const ::rtl::OUString& sPart           ,
     // first search for the given identifier
     sal_Bool bPartFound = (sPart.matchIgnoreAsciiCaseAsciiL(pPartIdentifier,nPartLength,0));
 
-    // If it exist - we can split the part and return TRUE.
-    // Otherwhise we do nothing and return FALSE.
+    // If it exist - we can split the part and return sal_True.
+    // Otherwhise we do nothing and return sal_False.
     if (bPartFound)
     {
         // But may the part has optional arguments - seperated by a "?".
diff --git a/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk
deleted file mode 100644
index ee5cc63766..0000000000
--- a/framework/source/jobs/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=			framework
-TARGET=             fwk_jobs
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           $(SLO)$/jobexecutor.obj     \
-                    $(SLO)$/jobdispatch.obj     \
-                    $(SLO)$/job.obj             \
-                    $(SLO)$/jobdata.obj         \
-                    $(SLO)$/jobresult.obj       \
-                    $(SLO)$/joburl.obj          \
-                    $(SLO)$/jobconst.obj        \
-                    $(SLO)$/helponstartup.obj   \
-                    $(SLO)$/shelljob.obj        \
-                    $(SLO)$/configaccess.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 09b97e0b2a..09b97e0b2a 100644..100755
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
new file mode 100755
index 0000000000..e1f07c7440
--- /dev/null
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -0,0 +1,415 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+// my own includes
+#include "helpers.hxx"
+#include <threadhelp/resetableguard.hxx>
+#include <services.h>
+ 
+// interface includes
+#include <com/sun/star/ui/DockingArea.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/frame/XDispatchHelper.hpp>
+#include <com/sun/star/awt/XDockableWindow.hpp>
+#include <com/sun/star/awt/XDockableWindowListener.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+
+// other includes
+#include <comphelper/mediadescriptor.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+#include <toolkit/unohlp.hxx>
+
+// namespace
+using namespace com::sun::star;
+
+namespace framework
+{
+
+bool hasEmptySize( const:: Size& aSize )
+{
+    return ( aSize.Width() == 0 ) && ( aSize.Height() == 0 );
+}
+
+bool hasDefaultPosValue( const ::Point& aPos )
+{
+    return (( aPos.X() == SAL_MAX_INT32 ) || ( aPos.Y() == SAL_MAX_INT32 ));
+}
+
+bool isDefaultPos( const ::com::sun::star::awt::Point& aPos )
+{
+    return (( aPos.X == SAL_MAX_INT32 ) && ( aPos.Y == SAL_MAX_INT32 ));
+}
+
+bool isDefaultPos( const ::Point& aPos )
+{
+    return (( aPos.X() == SAL_MAX_INT32 ) && ( aPos.Y() == SAL_MAX_INT32 ));
+}
+
+bool isReverseOrderDockingArea( const sal_Int32 nDockArea )
+{
+    ui::DockingArea eDockArea = static_cast< ui::DockingArea >( nDockArea );
+    return (( eDockArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) || 
+            ( eDockArea == ui::DockingArea_DOCKINGAREA_RIGHT ));
+}
+
+bool isToolboxHorizontalAligned( ToolBox* pToolBox )
+{
+    if ( pToolBox )
+        return (( pToolBox->GetAlign() == WINDOWALIGN_TOP ) || ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
+    return false;
+}
+
+bool isHorizontalDockingArea( const ui::DockingArea& nDockingArea )
+{
+    return (( nDockingArea == ui::DockingArea_DOCKINGAREA_TOP ) || 
+            ( nDockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM ));
+}
+
+bool isHorizontalDockingArea( const sal_Int32 nDockArea )
+{
+  return isHorizontalDockingArea(static_cast< ui::DockingArea >( nDockArea ));
+}
+
+::rtl::OUString retrieveToolbarNameFromHelpURL( Window* pWindow )
+{
+    ::rtl::OUString aToolbarName;
+    
+    if ( pWindow->GetType() == WINDOW_TOOLBOX )
+    {
+        ToolBox* pToolBox = dynamic_cast<ToolBox *>( pWindow );
+        if ( pToolBox )
+        {
+            aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 );
+            sal_Int32 i = aToolbarName.lastIndexOf( ':' );
+            if (( aToolbarName.getLength() > 0 ) && ( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() ))
+                aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name
+            else
+              aToolbarName = ::rtl::OUString();
+        }
+    }
+    return aToolbarName;
+}
+
+ToolBox* getToolboxPtr( Window* pWindow )
+{
+    ToolBox* pToolbox(NULL);
+    if ( pWindow->GetType() == WINDOW_TOOLBOX )
+        pToolbox = dynamic_cast<ToolBox*>( pWindow );
+    return pToolbox;
+}
+
+Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElement )
+{
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    uno::Reference< awt::XWindow > xWindow;
+    if ( xUIElement.is() )
+        xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY );
+    return VCLUnoHelper::GetWindow( xWindow );
+}
+    
+SystemWindow* getTopSystemWindow( const uno::Reference< awt::XWindow >& xWindow )
+{
+    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+    while ( pWindow && !pWindow->IsSystemWindow() )
+        pWindow = pWindow->GetParent();
+
+    if ( pWindow )
+        return (SystemWindow *)pWindow;
+    else
+        return 0;
+}
+
+void setZeroRectangle( ::Rectangle& rRect )
+{
+    rRect.setX(0);
+    rRect.setY(0);
+    rRect.setWidth(0);
+    rRect.setHeight(0);
+}
+
+// ATTENTION!
+// This value is directly copied from the sfx2 project.
+// You have to change BOTH values, see sfx2/inc/sfx2/sfxsids.hrc (SID_DOCKWIN_START)
+static const sal_Int32 DOCKWIN_ID_BASE = 9800;
+
+bool lcl_checkUIElement(const uno::Reference< ui::XUIElement >& xUIElement, awt::Rectangle& _rPosSize, uno::Reference< awt::XWindow >& _xWindow)
+{
+    bool bRet = xUIElement.is();
+    if ( bRet )
+    {
+        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        _xWindow.set( xUIElement->getRealInterface(), uno::UNO_QUERY );
+        _rPosSize = _xWindow->getPosSize();
+
+        Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
+        if ( pWindow->GetType() == WINDOW_TOOLBOX )
+        {
+            ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
+            _rPosSize.Width = aSize.Width();
+            _rPosSize.Height = aSize.Height();
+        }
+    } // if ( xUIElement.is() )
+    return bRet;
+}
+
+uno::Reference< awt::XWindowPeer > createToolkitWindow( const uno::Reference< lang::XMultiServiceFactory >& rFactory, const uno::Reference< awt::XWindowPeer >& rParent, const char* pService )
+{
+    const rtl::OUString aAWTToolkit( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ));
+    
+    uno::Reference< awt::XWindowPeer > xPeer;
+    if ( rFactory.is() )
+    {
+        uno::Reference< awt::XToolkit > xToolkit( rFactory->createInstance( aAWTToolkit ), uno::UNO_QUERY_THROW );
+        if ( xToolkit.is() )
+        {
+            // describe window properties.
+            css::awt::WindowDescriptor aDescriptor;
+            aDescriptor.Type                =   awt::WindowClass_SIMPLE;
+            aDescriptor.WindowServiceName   =   ::rtl::OUString::createFromAscii( pService );  
+            aDescriptor.ParentIndex         =   -1;
+            aDescriptor.Parent              =   uno::Reference< awt::XWindowPeer >( rParent, uno::UNO_QUERY );
+            aDescriptor.Bounds              =   awt::Rectangle(0,0,0,0);
+            aDescriptor.WindowAttributes    =   0;
+
+            // create a awt window
+            xPeer = xToolkit->createWindow( aDescriptor );
+        }
+    }
+
+    return xPeer;
+}
+
+// convert alignment constant to vcl's WindowAlign type
+WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
+{
+    if ( aAlignment == ui::DockingArea_DOCKINGAREA_LEFT )
+        return WINDOWALIGN_LEFT;
+    else if ( aAlignment == ui::DockingArea_DOCKINGAREA_RIGHT )
+        return WINDOWALIGN_RIGHT;
+    else if ( aAlignment == ui::DockingArea_DOCKINGAREA_TOP )
+        return WINDOWALIGN_TOP;
+    else
+        return WINDOWALIGN_BOTTOM;
+}
+
+::rtl::OUString getElementTypeFromResourceURL( const ::rtl::OUString& aResourceURL )
+{
+    ::rtl::OUString aType;
+
+    ::rtl::OUString aUIResourceURL( UIRESOURCE_URL );
+    if ( aResourceURL.indexOf( aUIResourceURL ) == 0 )
+    {
+        sal_Int32       nIndex = 0;
+        ::rtl::OUString aPathPart   = aResourceURL.copy( aUIResourceURL.getLength() );
+        ::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+
+        return aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+    }
+
+    return aType;
+}
+
+void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName )
+{
+    ::rtl::OUString aUIResourceURL( UIRESOURCE_URL );
+    if ( aResourceURL.indexOf( aUIResourceURL ) == 0 )
+    {
+        sal_Int32       nIndex = 0;
+        ::rtl::OUString aPathPart   = aResourceURL.copy( aUIResourceURL.getLength() );
+        ::rtl::OUString aUIResource = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+
+        aElementType = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+        aElementName = aPathPart.getToken( 0, (sal_Unicode)'/', nIndex );
+    }
+}
+
+::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect )
+{
+    css::awt::Rectangle aRect;
+    aRect.X = rRect.Left();
+    aRect.Y = rRect.Top();
+    aRect.Width = rRect.Right();
+    aRect.Height = rRect.Bottom();
+
+    return aRect;
+}
+
+::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect )
+{
+    ::Rectangle aRect;
+    aRect.Left() = rRect.X;
+    aRect.Top() = rRect.Y;
+    aRect.Right() = rRect.Width;
+    aRect.Bottom() = rRect.Height;
+
+    return aRect;
+}
+
+css::awt::Rectangle convertRectangleToAWT( const ::Rectangle& rRect )
+{
+    css::awt::Rectangle aRect;
+    aRect.X = rRect.Left();
+    aRect.Y = rRect.Top();
+    aRect.Width = rRect.GetWidth();
+    aRect.Height = rRect.GetHeight();
+    return aRect;
+}
+
+::Rectangle convertAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect )
+{
+    ::Rectangle aRect;
+    aRect.Left()   = rRect.X;
+    aRect.Top()    = rRect.Y;
+    aRect.Right()  = rRect.X + rRect.Width;
+    aRect.Bottom() = rRect.Y + rRect.Height;
+
+    return aRect;
+}
+
+bool equalRectangles( const css::awt::Rectangle& rRect1,
+                      const css::awt::Rectangle& rRect2 )
+{
+    return (( rRect1.X == rRect2.X ) &&
+            ( rRect1.Y == rRect2.Y ) &&
+            ( rRect1.Width == rRect2.Width ) &&
+            ( rRect1.Height == rRect2.Height ));
+}
+
+uno::Reference< frame::XModel > impl_getModelFromFrame( const uno::Reference< frame::XFrame >& rFrame )
+{
+    // Query for the model to get check the context information
+    uno::Reference< frame::XModel > xModel;
+        if ( rFrame.is() )
+        {
+        uno::Reference< frame::XController > xController( rFrame->getController(), uno::UNO_QUERY );
+            if ( xController.is() )
+                xModel = xController->getModel();
+        }
+
+    return xModel;
+}
+
+sal_Bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel )
+{
+    if ( xModel.is() )
+    {
+        ::comphelper::MediaDescriptor aDesc( xModel->getArgs() );
+        return aDesc.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
+    }
+    else
+        return sal_False;
+}
+
+sal_Bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFrame )
+{
+    if (xFrame->isTop())
+        return sal_True;
+
+    uno::Reference< awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), uno::UNO_QUERY); // dont use _THROW here ... its a check only
+    if (xWindowCheck.is())
+    {
+        // --> PB 2007-06-18 #i76867# top and system window is required.
+        ::vos::OGuard aSolarLock(&Application::GetSolarMutex());
+        uno::Reference< awt::XWindow > xWindow( xWindowCheck, uno::UNO_QUERY );
+        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        return ( pWindow && pWindow->IsSystemWindow() );
+        // <--
+    }
+
+    return sal_False;
+}
+
+void impl_setDockingWindowVisibility( const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMGR, const css::uno::Reference< css::frame::XFrame >& rFrame, const ::rtl::OUString& rDockingWindowName, bool bVisible )
+{
+    const ::rtl::OUString aDockWinPrefixCommand( RTL_CONSTASCII_USTRINGPARAM( "DockingWindow" ));
+    css::uno::WeakReference< css::frame::XDispatchHelper > xDispatchHelper;
+    
+    sal_Int32 nID    = rDockingWindowName.toInt32();
+    sal_Int32 nIndex = nID - DOCKWIN_ID_BASE;
+
+    css::uno::Reference< css::frame::XDispatchProvider > xProvider(rFrame, css::uno::UNO_QUERY);
+    if ( nIndex >= 0 && xProvider.is() )
+    {
+        ::rtl::OUString aDockWinCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
+        ::rtl::OUString aDockWinArgName( aDockWinPrefixCommand );
+        
+        aDockWinArgName += ::rtl::OUString::valueOf( nIndex );
+        
+        css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
+        aArgs[0].Name  = aDockWinArgName;
+        aArgs[0].Value = css::uno::makeAny( bVisible );
+
+        css::uno::Reference< css::frame::XDispatchHelper > xDispatcher( xDispatchHelper );
+        if ( !xDispatcher.is())
+        {
+            xDispatcher = css::uno::Reference< css::frame::XDispatchHelper >(
+                rSMGR->createInstance(SERVICENAME_DISPATCHHELPER), css::uno::UNO_QUERY_THROW);
+        }
+
+        aDockWinCommand = aDockWinCommand + aDockWinArgName;
+        xDispatcher->executeDispatch(
+            xProvider,
+            aDockWinCommand,
+            ::rtl::OUString::createFromAscii("_self"),
+            0,
+            aArgs);
+    }
+}
+
+void impl_addWindowListeners( 
+    const css::uno::Reference< css::uno::XInterface >& xThis, 
+    const css::uno::Reference< css::ui::XUIElement >& xUIElement )
+{
+    css::uno::Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), css::uno::UNO_QUERY );
+    css::uno::Reference< css::awt::XDockableWindow > xDockWindow( xUIElement->getRealInterface(), css::uno::UNO_QUERY );
+    if ( xDockWindow.is() && xWindow.is() )
+    {
+        try
+        {
+            xDockWindow->addDockableWindowListener( 
+                css::uno::Reference< css::awt::XDockableWindowListener >(
+                    xThis, css::uno::UNO_QUERY ));
+            xWindow->addWindowListener( 
+                css::uno::Reference< css::awt::XWindowListener >(
+                    xThis, css::uno::UNO_QUERY ));
+            xDockWindow->enableDocking( sal_True );
+        }
+        catch ( css::uno::Exception& )
+        {
+        }
+    }
+}
+
+} // namespace framework
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
new file mode 100755
index 0000000000..545abb2a1f
--- /dev/null
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
+
+// my own includes
+#include <macros/generic.hxx>
+#include <stdtypes.h>
+#include <properties.h>
+
+// interface includes
+#include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/ui/DockingArea.hpp>
+#include <com/sun/star/awt/Point.hpp>
+
+// other includes
+#include <vcl/window.hxx>
+#include <vcl/toolbox.hxx>
+
+#define UIRESOURCE_PROTOCO_ASCII        "private:"
+#define UIRESOURCE_RESOURCE_ASCII       "resource"
+#define UIRESOURCE_URL_ASCII            "private:resource"
+#define UIRESOURCE_URL                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCE_URL_ASCII ))
+#define UIRESOURCETYPE_TOOLBAR          "toolbar"
+#define UIRESOURCETYPE_STATUSBAR        "statusbar"
+#define UIRESOURCETYPE_MENUBAR          "menubar"
+
+namespace framework
+{
+
+bool hasEmptySize( const:: Size& aSize );
+bool hasDefaultPosValue( const ::Point& aPos );
+bool isDefaultPos( const ::com::sun::star::awt::Point& aPos );
+bool isDefaultPos( const ::Point& aPos );
+bool isToolboxHorizontalAligned( ToolBox* pToolBox );
+bool isReverseOrderDockingArea( const sal_Int32 nDockArea );
+bool isHorizontalDockingArea( const sal_Int32 nDockArea );
+bool isHorizontalDockingArea( const ::com::sun::star::ui::DockingArea& nDockArea );
+::rtl::OUString retrieveToolbarNameFromHelpURL( Window* pWindow );
+ToolBox* getToolboxPtr( Window* pWindow );
+Window* getWindowFromXUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement );
+SystemWindow* getTopSystemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow );
+bool equalRectangles( const css::awt::Rectangle& rRect1, const css::awt::Rectangle& rRect2 );
+void setZeroRectangle( ::Rectangle& rRect );
+bool lcl_checkUIElement(const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement,::com::sun::star::awt::Rectangle& _rPosSize, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xWindow);
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > createToolkitWindow( const css::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rFactory, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent, const char* pService );
+WindowAlign ImplConvertAlignment( sal_Int16 aAlignment );
+::rtl::OUString getElementTypeFromResourceURL( const ::rtl::OUString& aResourceURL );
+void parseResourceURL( const rtl::OUString& aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName );
+::Rectangle putAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect );
+::com::sun::star::awt::Rectangle putRectangleValueToAWT( const ::Rectangle& rRect );
+::com::sun::star::awt::Rectangle convertRectangleToAWT( const ::Rectangle& rRect );
+::Rectangle convertAWTToRectangle( const ::com::sun::star::awt::Rectangle& rRect );
+::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > impl_getModelFromFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+sal_Bool implts_isPreviewModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+sal_Bool implts_isFrameOrWindowTop( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
+void impl_setDockingWindowVisibility( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& rSMGR, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rDockingWindowName, bool bVisible );
+void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xThis, const ::com::sun::star::uno::Reference< css::ui::XUIElement >& xUIElement );
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const css::uno::Reference< ::com::sun::star::awt::XToolkit >& rToolkit, const css::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rParent );
+
+}
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index ed5ea02190..700a65f189 100644..100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -7,6 +7,9 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: layoutmanager.cxx,v $
+ * $Revision: 1.72 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,28 +32,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
+//      my own includes
 #include <services/layoutmanager.hxx>
+#include <helpers.hxx>
+#include <panelmanager.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <services.h>
 
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <uielement/menubarwrapper.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
 #include <classes/fwkresid.hxx>
-
 #include <classes/resource.hrc>
 #include <toolkit/helper/convert.hxx>
 #include <uielement/progressbarwrapper.hxx>
 #include <uiconfiguration/globalsettings.hxx>
+#include <toolbarlayoutmanager.hxx>
 
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
+//      interface includes
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/frame/XModel.hpp>
@@ -64,21 +65,17 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/ui/XUIFunctionListener.hpp>
 #include <com/sun/star/frame/LayoutManagerEvents.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatchHelper.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
+//      other includes
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/window.hxx>
@@ -97,347 +94,101 @@
 
 #include <algorithm>
 #include <boost/bind.hpp>
-// ______________________________________________
-//	using namespace
 
+//      using namespace
 using namespace ::com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::util;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::container;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ui;
-using namespace com::sun::star::frame;
 using namespace ::com::sun::star::frame;
 
-#define UIRESOURCE_PROTOCO_ASCII        "private:"
-#define UIRESOURCE_RESOURCE_ASCII       "resource"
-#define UIRESOURCE_URL_ASCII            "private:resource"
-#define UIRESOURCE_URL                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCE_URL_ASCII ))
 
 // ATTENTION!
 // This value is directly copied from the sfx2 project.
 // You have to change BOTH values, see sfx2/inc/sfx2/sfxsids.hrc (SID_DOCKWIN_START)
 static const sal_Int32 DOCKWIN_ID_BASE = 9800;
 
-bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rectangle& _rPosSize,Reference< css::awt::XWindow >& _xWindow)
-{
-    bool bRet = xUIElement.is();
-    if ( bRet )
-    {
-        SolarMutexGuard aGuard;
-        _xWindow.set( xUIElement->getRealInterface(), UNO_QUERY );
-        _rPosSize = _xWindow->getPosSize();
-
-        Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
-        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-        {
-            ::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
-            _rPosSize.Width = aSize.Width();
-            _rPosSize.Height = aSize.Height();
-        }
-    }
-    return bRet;
-}
-
-// convert alignment constant to vcl's WindowAlign type
-static WindowAlign ImplConvertAlignment( sal_Int16 aAlignment )
-{
-    if ( aAlignment == DockingArea_DOCKINGAREA_LEFT )
-        return WINDOWALIGN_LEFT;
-    else if ( aAlignment == DockingArea_DOCKINGAREA_RIGHT )
-        return WINDOWALIGN_RIGHT;
-    else if ( aAlignment == DockingArea_DOCKINGAREA_TOP )
-        return WINDOWALIGN_TOP;
-    else
-        return WINDOWALIGN_BOTTOM;
-}
-
-//_________________________________________________________________________________________________________________
-//	Namespace
-//_________________________________________________________________________________________________________________
-//
-
 namespace framework
 {
 
-struct UIElementVisibility
-{
-    rtl::OUString aName;
-    bool          bVisible;
-};
-
-bool LayoutManager::UIElement::operator< ( const LayoutManager::UIElement& aUIElement ) const
-{
-    if ( !m_xUIElement.is() && aUIElement.m_xUIElement.is() )
-        return false;
-    else if ( m_xUIElement.is() && !aUIElement.m_xUIElement.is() )
-        return true;
-    else if ( !m_bVisible && aUIElement.m_bVisible )
-        return false;
-    else if ( m_bVisible && !aUIElement.m_bVisible )
-        return true;
-    else if ( !m_bFloating && aUIElement.m_bFloating )
-        return true;
-    else if ( m_bFloating && !aUIElement.m_bFloating )
-        return false;
-    else
-    {
-        if ( m_bFloating )
-        {
-            bool bEqual = ( m_aFloatingData.m_aPos.Y() == aUIElement.m_aFloatingData.m_aPos.Y() );
-            if ( bEqual )
-                return ( m_aFloatingData.m_aPos.X() < aUIElement.m_aFloatingData.m_aPos.X() );
-            else
-                return ( m_aFloatingData.m_aPos.Y() < aUIElement.m_aFloatingData.m_aPos.Y() );
-        }
-        else
-        {
-            if ( m_aDockedData.m_nDockedArea < aUIElement.m_aDockedData.m_nDockedArea )
-                return true;
-            else if ( m_aDockedData.m_nDockedArea > aUIElement.m_aDockedData.m_nDockedArea )
-                return false;
-            else
-            {
-                if ( m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_TOP ||
-                     m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_BOTTOM )
-                {
-                    if ( !( m_aDockedData.m_aPos.Y() == aUIElement.m_aDockedData.m_aPos.Y() ) )
-                        return  ( m_aDockedData.m_aPos.Y() < aUIElement.m_aDockedData.m_aPos.Y() );
-                    else
-                    {
-                        bool bEqual = ( m_aDockedData.m_aPos.X() == aUIElement.m_aDockedData.m_aPos.X() );
-                        if ( bEqual )
-                        {
-                            return m_bUserActive && !aUIElement.m_bUserActive;
-                        }
-                        else
-                            return ( m_aDockedData.m_aPos.X() < aUIElement.m_aDockedData.m_aPos.X() );
-                    }
-                }
-                else
-                {
-                    if ( !( m_aDockedData.m_aPos.X() == aUIElement.m_aDockedData.m_aPos.X() ) )
-                        return ( m_aDockedData.m_aPos.X() < aUIElement.m_aDockedData.m_aPos.X() );
-                    else
-                    {
-                        bool bEqual = ( m_aDockedData.m_aPos.Y() == aUIElement.m_aDockedData.m_aPos.Y() );
-                        if ( bEqual )
-                        {
-                            return m_bUserActive && !aUIElement.m_bUserActive;
-                        }
-                        else
-                            return ( m_aDockedData.m_aPos.Y() < aUIElement.m_aDockedData.m_aPos.Y() );
-                    }
-                }
-            }
-        }
-    }
-}
-
-LayoutManager::UIElement& LayoutManager::UIElement::operator= ( const LayoutManager::UIElement& rUIElement )
-{
-    if (this == &rUIElement) { return *this; }
-    m_aType             = rUIElement.m_aType;
-    m_aName             = rUIElement.m_aName;
-    m_aUIName           = rUIElement.m_aUIName;
-    m_xUIElement        = rUIElement.m_xUIElement;
-    m_bFloating         = rUIElement.m_bFloating;
-    m_bVisible          = rUIElement.m_bVisible;
-    m_bUserActive       = rUIElement.m_bUserActive;
-    m_bCreateNewRowCol0 = rUIElement.m_bCreateNewRowCol0;
-    m_bDeactiveHide     = rUIElement.m_bDeactiveHide;
-    m_bMasterHide       = rUIElement.m_bMasterHide;
-    m_bContextSensitive = rUIElement.m_bContextSensitive;
-    m_bContextActive    = rUIElement.m_bContextActive;
-    m_bNoClose          = rUIElement.m_bNoClose;
-    m_bSoftClose        = rUIElement.m_bSoftClose;
-    m_bStateRead        = rUIElement.m_bStateRead;
-    m_nStyle            = rUIElement.m_nStyle;
-    m_aDockedData       = rUIElement.m_aDockedData;
-    m_aFloatingData     = rUIElement.m_aFloatingData;
-    return *this;
-}
-
-static Reference< XModel > impl_getModelFromFrame( const Reference< XFrame >& rFrame )
-{
-    // Query for the model to get check the context information
-    Reference< XModel > xModel;
-    if ( rFrame.is() )
-    {
-        Reference< XController > xController( rFrame->getController(), UNO_QUERY );
-        if ( xController.is() )
-            xModel = xController->getModel();
-    }
-
-    return xModel;
-}
-
-static sal_Bool implts_isPreviewModel( const Reference< XModel >& xModel )
-{
-    if ( xModel.is() )
-    {
-        ::comphelper::MediaDescriptor aDesc( xModel->getArgs() );
-        return aDesc.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
-    }
-    else
-        return sal_False;
-}
-
-static sal_Bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame::XFrame >& xFrame )
-{
-    if (xFrame->isTop())
-        return sal_True;
-
-    css::uno::Reference< css::awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), css::uno::UNO_QUERY); // dont use _THROW here ... its a check only
-    if (xWindowCheck.is())
-    {
-        // Top and system window is required (#i76867#)
-        SolarMutexGuard aGuard;
-        css::uno::Reference< css::awt::XWindow > xWindow( xWindowCheck, UNO_QUERY );
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        return ( pWindow && pWindow->IsSystemWindow() );
-    }
-
-    return sal_False;
-}
-
-static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMGR, const css::uno::Reference< css::frame::XFrame >& rFrame, const ::rtl::OUString& rDockingWindowName, bool bVisible )
-{
-    const ::rtl::OUString aDockWinPrefixCommand( RTL_CONSTASCII_USTRINGPARAM( "DockingWindow" ));
-    css::uno::WeakReference< css::frame::XDispatchHelper > xDispatchHelper;
-
-    sal_Int32 nID    = rDockingWindowName.toInt32();
-    sal_Int32 nIndex = nID - DOCKWIN_ID_BASE;
-
-    css::uno::Reference< css::frame::XDispatchProvider > xProvider(rFrame, css::uno::UNO_QUERY);
-    if ( nIndex >= 0 && xProvider.is() )
-    {
-        ::rtl::OUString aDockWinCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-        ::rtl::OUString aDockWinArgName( aDockWinPrefixCommand );
-
-        aDockWinArgName += ::rtl::OUString::valueOf( nIndex );
-
-        css::uno::Sequence< css::beans::PropertyValue > aArgs(1);
-        aArgs[0].Name  = aDockWinArgName;
-        aArgs[0].Value = css::uno::makeAny( bVisible );
-
-        css::uno::Reference< css::frame::XDispatchHelper > xDispatcher( xDispatchHelper );
-        if ( !xDispatcher.is())
-        {
-            xDispatcher = css::uno::Reference< css::frame::XDispatchHelper >(
-                rSMGR->createInstance(SERVICENAME_DISPATCHHELPER), css::uno::UNO_QUERY_THROW);
-        }
-
-        aDockWinCommand = aDockWinCommand + aDockWinArgName;
-        xDispatcher->executeDispatch(
-            xProvider,
-            aDockWinCommand,
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
-            0,
-            aArgs);
-    }
-}
-
-//*****************************************************************************************************************
-//	XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( LayoutManager, LayoutManager_Base, LayoutManager_PBase )
 IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_PBase )
-
-DEFINE_XSERVICEINFO_MULTISERVICE        (   LayoutManager						,
-                                            ::cppu::OWeakObject                 ,
-                                            SERVICENAME_LAYOUTMANAGER			,
-                                            IMPLEMENTATIONNAME_LAYOUTMANAGER
-                                        )
-
-DEFINE_INIT_SERVICE                     (   LayoutManager, {} )
-
-
-LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceManager )
-        :   LayoutManager_Base          (                                                   )
-        ,   ThreadHelpBase              ( &Application::GetSolarMutex()                     )
-        ,   ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex()         )
-        ,   LayoutManager_PBase         ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
-        ,   m_xSMGR( xServiceManager )
-        ,   m_xURLTransformer( xServiceManager->createInstance( SERVICENAME_URLTRANSFORMER ), UNO_QUERY )
-        ,   m_xDisplayAccess( xServiceManager->createInstance( SERVICENAME_DISPLAYACCESS ), UNO_QUERY )
-        ,   m_nLockCount( 0 )
-        ,   m_bActive( sal_False )
-        ,   m_bInplaceMenuSet( sal_False )
-        ,   m_bDockingInProgress( sal_False )
-        ,   m_bMenuVisible( sal_True )
-        ,   m_bComponentAttached( sal_False )
-        ,   m_bDoLayout( sal_False )
-        ,   m_bVisible( sal_True )
-        ,   m_bParentWindowVisible( sal_False )
-        ,   m_bMustDoLayout( sal_True )
-        ,   m_bAutomaticToolbars( sal_True )
-        ,   m_bStoreWindowState( sal_False )
-        ,   m_bHideCurrentUI( false )
-        ,   m_bGlobalSettings( sal_False )
-        ,   m_bPreserveContentSize( false )
-        ,   m_eDockOperation( DOCKOP_ON_COLROW )
-        ,   m_pInplaceMenuBar( NULL )
-        ,   m_xModuleManager( Reference< XModuleManager >(
-                xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY ))
-        ,   m_xUIElementFactoryManager( Reference< ::com::sun::star::ui::XUIElementFactory >(
+DEFINE_XSERVICEINFO_MULTISERVICE( LayoutManager, ::cppu::OWeakObject, SERVICENAME_LAYOUTMANAGER, IMPLEMENTATIONNAME_LAYOUTMANAGER)
+DEFINE_INIT_SERVICE( LayoutManager, {} )
+
+LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceManager ) : LayoutManager_Base()
+        , ThreadHelpBase( &Application::GetSolarMutex())
+        , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex())
+        , LayoutManager_PBase( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+        , m_xSMGR( xServiceManager )
+        , m_xURLTransformer( xServiceManager->createInstance( SERVICENAME_URLTRANSFORMER ), UNO_QUERY )
+        , m_xDisplayAccess( xServiceManager->createInstance( SERVICENAME_DISPLAYACCESS ), UNO_QUERY )
+        , m_nLockCount( 0 )
+        , m_bActive( false )
+        , m_bInplaceMenuSet( false )
+        , m_bDockingInProgress( false )
+        , m_bMenuVisible( true )
+        , m_bComponentAttached( false )
+        , m_bDoLayout( false )
+        , m_bVisible( true )
+        , m_bParentWindowVisible( false )
+        , m_bMustDoLayout( true )
+        , m_bAutomaticToolbars( true )
+        , m_bStoreWindowState( false )
+        , m_bHideCurrentUI( false )
+        , m_bGlobalSettings( false )
+        , m_bPreserveContentSize( false )
+        , m_bMenuBarCloser( false )
+        , m_pInplaceMenuBar( NULL )
+        , m_xModuleManager( Reference< XModuleManager >( xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY ))
+        , m_xUIElementFactoryManager( Reference< ui::XUIElementFactory >(
                 xServiceManager->createInstance( SERVICENAME_UIELEMENTFACTORYMANAGER ), UNO_QUERY ))
-        ,   m_bMenuBarCloser( sal_False )
-        ,   m_xPersistentWindowStateSupplier( Reference< XNameAccess >(
+        , m_xPersistentWindowStateSupplier( Reference< XNameAccess >(
                 xServiceManager->createInstance( SERVICENAME_WINDOWSTATECONFIGURATION ), UNO_QUERY ))
-        ,   m_pGlobalSettings( 0 )
-        ,   m_aCustomTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "custom_" ))
-        ,   m_aFullCustomTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ))
-        ,   m_aFullAddonTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" ))
-        ,   m_aStatusBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ))
-        ,   m_aProgressBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar" ))
-        ,   m_aPropDocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKED ))
-        ,   m_aPropVisible( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_VISIBLE ))
-        ,   m_aPropDockingArea( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKINGAREA ))
-        ,   m_aPropDockPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKPOS ))
-        ,   m_aPropPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_POS ))
-        ,   m_aPropSize( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_SIZE ))
-        ,   m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_UINAME ))
-        ,   m_aPropStyle( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_STYLE ))
-        ,   m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_LOCKED ))
-        ,   m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" ))
-        ,   m_pAddonOptions( 0 )
-        ,   m_aListenerContainer( m_aLock.getShareableOslMutex() )
+        , m_pGlobalSettings( 0 )
+        , m_aStatusBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ))
+        , m_aProgressBarAlias( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar" ))
+        , m_aPropDocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKED ))
+        , m_aPropVisible( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_VISIBLE ))
+        , m_aPropDockingArea( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKINGAREA ))
+        , m_aPropDockPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_DOCKPOS ))
+        , m_aPropPos( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_POS ))
+        , m_aPropSize( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_SIZE ))
+        , m_aPropUIName( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_UINAME ))
+        , m_aPropStyle( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_STYLE ))
+        , m_aPropLocked( RTL_CONSTASCII_USTRINGPARAM( WINDOWSTATE_PROPERTY_LOCKED ))
+        , m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" ))
+        , m_aListenerContainer( m_aLock.getShareableOslMutex() )
+        , m_pPanelManager( 0 )
+        , m_pToolbarManager( 0 )
 {
     // Initialize statusbar member
+    const sal_Bool bRefreshVisibility = sal_False;
     m_aStatusBarElement.m_aType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "statusbar" ));
     m_aStatusBarElement.m_aName = m_aStatusBarAlias;
 
-    m_pMiscOptions = new SvtMiscOptions();
+    m_pToolbarManager = new ToolbarLayoutManager( xServiceManager, m_xUIElementFactoryManager, this );
+    m_xToolbarManager = uno::Reference< ui::XUIConfigurationListener >( static_cast< OWeakObject* >( m_pToolbarManager ), uno::UNO_QUERY );
 
-    m_pMiscOptions->AddListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
     Application::AddEventListener( LINK( this, LayoutManager, SettingsChanged ) );
-    m_eSymbolsSize = m_pMiscOptions->GetSymbolsSize();
-    m_eSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle();
 
     m_aAsyncLayoutTimer.SetTimeout( 50 );
     m_aAsyncLayoutTimer.SetTimeoutHdl( LINK( this, LayoutManager, AsyncLayoutHdl ) );
 
-
     registerProperty( LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS, LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS, css::beans::PropertyAttribute::TRANSIENT, &m_bAutomaticToolbars, ::getCppuType( &m_bAutomaticToolbars ) );
-    registerProperty( LAYOUTMANAGER_PROPNAME_HIDECURRENTUI, LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI, css::beans::PropertyAttribute::TRANSIENT, &m_bHideCurrentUI, ::getCppuType( &m_bHideCurrentUI ) );
-    registerProperty( LAYOUTMANAGER_PROPNAME_LOCKCOUNT, LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT, css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, &m_nLockCount, getCppuType( &m_nLockCount )  );
-    registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, css::beans::PropertyAttribute::TRANSIENT, &m_bMenuBarCloser, ::getCppuType( &m_bMenuBarCloser ) );
-    const sal_Bool bRefreshVisibility = sal_False;
-    registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY, LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY, css::beans::PropertyAttribute::TRANSIENT, ::getCppuType( &bRefreshVisibility ), &bRefreshVisibility );
-    registerProperty( LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE, LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE, css::beans::PropertyAttribute::TRANSIENT, &m_bPreserveContentSize, ::getCppuType( &m_bPreserveContentSize ) );
+    registerProperty( LAYOUTMANAGER_PROPNAME_HIDECURRENTUI, LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI, beans::PropertyAttribute::TRANSIENT, &m_bHideCurrentUI, ::getCppuType( &m_bHideCurrentUI ) );
+    registerProperty( LAYOUTMANAGER_PROPNAME_LOCKCOUNT, LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT, beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::READONLY, &m_nLockCount, getCppuType( &m_nLockCount )  );
+    registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, beans::PropertyAttribute::TRANSIENT, &m_bMenuBarCloser, ::getCppuType( &m_bMenuBarCloser ) );
+    registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY, LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY, beans::PropertyAttribute::TRANSIENT, ::getCppuType( &bRefreshVisibility ), &bRefreshVisibility );
+    registerProperty( LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE, LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE, beans::PropertyAttribute::TRANSIENT, &m_bPreserveContentSize, ::getCppuType( &m_bPreserveContentSize ) );
 }
 
 LayoutManager::~LayoutManager()
 {
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
-    if ( m_pMiscOptions )
-    {
-        m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
-        delete m_pMiscOptions;
-        m_pMiscOptions = 0;
-    }
     m_aAsyncLayoutTimer.Stop();
 }
 
@@ -451,18 +202,15 @@ void LayoutManager::impl_clearUpMenuBar()
     {
         SolarMutexGuard aGuard;
 
-        Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-        while ( pWindow && !pWindow->IsSystemWindow() )
-            pWindow = pWindow->GetParent();
-
-        if ( pWindow )
+        SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+        if ( pSysWindow )
         {
             MenuBar* pSetMenuBar = 0;
             if ( m_xInplaceMenuBar.is() )
                 pSetMenuBar = (MenuBar *)m_pInplaceMenuBar->GetMenuBar();
             else
             {
-                Reference< css::awt::XMenuBar > xMenuBar;
+                Reference< awt::XMenuBar > xMenuBar;
 
                 Reference< XPropertySet > xPropSet( m_xMenuBar, UNO_QUERY );
                 if ( xPropSet.is() )
@@ -471,12 +219,8 @@ void LayoutManager::impl_clearUpMenuBar()
                     {
                         xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
                     }
-                    catch ( com::sun::star::beans::UnknownPropertyException )
-                    {
-                    }
-                    catch ( com::sun::star::lang::WrappedTargetException )
-                    {
-                    }
+                    catch ( beans::UnknownPropertyException ) {}
+                    catch ( lang::WrappedTargetException ) {}
                 }
 
                 VCLXMenu* pAwtMenuBar = VCLXMenu::GetImplementation( xMenuBar );
@@ -484,9 +228,9 @@ void LayoutManager::impl_clearUpMenuBar()
                     pSetMenuBar = (MenuBar*)pAwtMenuBar->GetMenu();
             }
 
-            MenuBar* pTopMenuBar = ((SystemWindow *)pWindow)->GetMenuBar();
+            MenuBar* pTopMenuBar = pSysWindow->GetMenuBar();
             if ( pSetMenuBar == pTopMenuBar )
-                ((SystemWindow *)pWindow)->SetMenuBar( 0 );
+                pSysWindow->SetMenuBar( 0 );
         }
     }
 
@@ -505,45 +249,17 @@ void LayoutManager::impl_clearUpMenuBar()
     implts_unlock();
 }
 
-sal_Bool LayoutManager::impl_parseResourceURL( const rtl::OUString aResourceURL, rtl::OUString& aElementType, rtl::OUString& aElementName )
-{
-    URL         aURL;
-    sal_Int32   nIndex = 0;
-
-    aURL.Complete = aResourceURL;
-    m_xURLTransformer->parseStrict( aURL );
-
-    ::rtl::OUString aUIResource = aURL.Path.getToken( 0, (sal_Unicode)'/', nIndex );
-
-    if (( aURL.Protocol.equalsIgnoreAsciiCaseAscii( UIRESOURCE_PROTOCO_ASCII )) &&
-        ( aUIResource.equalsIgnoreAsciiCaseAscii( UIRESOURCE_RESOURCE_ASCII )))
-    {
-        aElementType = aURL.Path.getToken( 0, (sal_Unicode)'/', nIndex );
-        aElementName = aURL.Path.getToken( 0, (sal_Unicode)'/', nIndex );
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
 void LayoutManager::implts_lock()
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     ++m_nLockCount;
-    aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 }
 
 sal_Bool LayoutManager::implts_unlock()
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    --m_nLockCount;
-    if ( m_nLockCount < 0 )
-        m_nLockCount = 0;
+    m_nLockCount = std::max( --m_nLockCount, static_cast<sal_Int32>(0) );
     return ( m_nLockCount == 0 );
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 }
 
 void LayoutManager::implts_reset( sal_Bool bAttached )
@@ -551,18 +267,16 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     Reference< XFrame > xFrame = m_xFrame;
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
-    Reference< css::awt::XWindow > xTopDockingWindow    = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-    Reference< css::awt::XWindow > xLeftDockingWindow   = m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT];
-    Reference< css::awt::XWindow > xRightDockingWindow  = m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT];
-    Reference< css::awt::XWindow > xBottomDockingWindow = m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM];
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
     Reference< XUIConfiguration > xModuleCfgMgr( m_xModuleCfgMgr, UNO_QUERY );
     Reference< XUIConfiguration > xDocCfgMgr( m_xDocCfgMgr, UNO_QUERY );
     Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
     Reference< XMultiServiceFactory > xServiceManager( m_xSMGR );
     Reference< XNameAccess > xPersistentWindowStateSupplier( m_xPersistentWindowStateSupplier );
+    Reference< awt::XWindowListener > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+    ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
     ::rtl::OUString aModuleIdentifier( m_aModuleIdentifier );
-    sal_Bool bAutomaticToolbars( m_bAutomaticToolbars );
+    bool bAutomaticToolbars( m_bAutomaticToolbars );
     aReadLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
@@ -578,9 +292,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
             {
                 aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) );
             }
-            catch( Exception& )
-            {
-            }
+            catch( Exception& ) {}
 
             if ( aModuleIdentifier.getLength() && aOldModuleIdentifier != aModuleIdentifier )
             {
@@ -596,9 +308,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                         // Remove listener to old module ui configuration manager
                         xModuleCfgMgr->removeConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                     }
-                    catch ( Exception& )
-                    {
-                    }
+                    catch ( Exception& ) {}
                 }
 
                 try
@@ -608,9 +318,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                     if ( xModuleCfgMgr.is() )
                         xModuleCfgMgr->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                 }
-                catch ( Exception& )
-                {
-                }
+                catch ( Exception& ) {}
 
                 try
                 {
@@ -618,12 +326,8 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                     if ( xPersistentWindowStateSupplier.is() )
                         xPersistentWindowStateSupplier->getByName( aModuleIdentifier ) >>= xPersistentWindowState;
                 }
-                catch ( NoSuchElementException& )
-                {
-                }
-                catch ( WrappedTargetException& )
-                {
-                }
+                catch ( NoSuchElementException& ) {}
+                catch ( WrappedTargetException& ) {}
             }
 
             xModel = impl_getModelFromFrame( xFrame );
@@ -639,9 +343,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                             // Remove listener to old ui configuration manager
                             xDocCfgMgr->removeConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                         }
-                        catch ( Exception& )
-                        {
-                        }
+                        catch ( Exception& ) {}
                     }
 
                     try
@@ -650,9 +352,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                         if ( xDocCfgMgr.is() )
                             xDocCfgMgr->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                     }
-                    catch ( Exception& )
-                    {
-                    }
+                    catch ( Exception& ) {}
                 }
             }
         }
@@ -666,9 +366,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                     xModuleCfgMgr->removeConfigurationListener(
                         Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                 }
-                catch ( Exception& )
-                {
-                }
+                catch ( Exception& ) {}
             }
 
             if ( xDocCfgMgr.is() )
@@ -678,9 +376,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
                     xDocCfgMgr->removeConfigurationListener(
                         Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
                 }
-                catch ( Exception& )
-                {
-                }
+                catch ( Exception& ) {}
             }
 
             // Release references to our configuration managers as we currently don't have
@@ -691,47 +387,39 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
             aModuleIdentifier = ::rtl::OUString();
         }
 
+        Reference< XUIConfigurationManager > xModCfgMgr( xModuleCfgMgr, UNO_QUERY );
+        Reference< XUIConfigurationManager > xDokCfgMgr( xDocCfgMgr, UNO_QUERY );
+        
         /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteLock( m_aLock );
         m_xModel = xModel;
-        m_aDockingArea = css::awt::Rectangle();
+        m_aDockingArea = awt::Rectangle();
         m_bComponentAttached = bAttached;
         m_aModuleIdentifier = aModuleIdentifier;
-        m_xModuleCfgMgr = Reference< XUIConfigurationManager >( xModuleCfgMgr, UNO_QUERY );
-        m_xDocCfgMgr = Reference< XUIConfigurationManager >( xDocCfgMgr, UNO_QUERY );
+        m_xModuleCfgMgr = xModCfgMgr;
+        m_xDocCfgMgr = xDokCfgMgr;
         m_xPersistentWindowState = xPersistentWindowState;
         m_aStatusBarElement.m_bStateRead = sal_False; // reset state to read data again!
         aWriteLock.unlock();
         /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-        if ( bAttached )
+        // reset/notify toolbar layout manager
+        if ( pToolbarManager )
         {
-            // reset docking area windows back to zero size
-            try
+            if ( bAttached )
             {
-                if ( xTopDockingWindow.is() )
-                    xTopDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-                if ( xLeftDockingWindow.is() )
-                    xLeftDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-                if ( xRightDockingWindow.is() )
-                    xRightDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-                if ( xBottomDockingWindow.is() )
-                    xBottomDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
+                pToolbarManager->attach( xFrame, xModCfgMgr, xDokCfgMgr, xPersistentWindowState );
+                uno::Reference< awt::XWindowPeer > xParent( xContainerWindow, UNO_QUERY );
+                pToolbarManager->setParentWindow( xParent );
+                if ( bAutomaticToolbars )
+                    pToolbarManager->createStaticToolbars();
             }
-            catch ( Exception& )
-            {
-            }
-
-            if ( bAutomaticToolbars )
+            else
             {
-                implts_createCustomToolBars();
-                implts_createAddonsToolBars();
-                implts_createNonContextSensitiveToolBars();
+                pToolbarManager->reset();
+                implts_destroyElements();
             }
-            implts_sortUIElements();
         }
-        else
-            implts_destroyElements();
     }
 
     implts_unlock();
@@ -739,15 +427,12 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
 
 sal_Bool LayoutManager::implts_isEmbeddedLayoutManager() const
 {
-    // check if this layout manager is currently using the embedded feature
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     Reference< XFrame > xFrame = m_xFrame;
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
     aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
-    Reference< css::awt::XWindow > xFrameContainerWindow = xFrame->getContainerWindow();
+    Reference< awt::XWindow > xFrameContainerWindow = xFrame->getContainerWindow();
     if ( xFrameContainerWindow == xContainerWindow )
         return sal_False;
     else
@@ -756,20 +441,13 @@ sal_Bool LayoutManager::implts_isEmbeddedLayoutManager() const
 
 void LayoutManager::implts_destroyElements()
 {
-    UIElementVector aUIElementVector;
-
     WriteGuard aWriteLock( m_aLock );
-    aUIElementVector = m_aUIElements;
-    m_aUIElements.clear();
+    uno::Reference< ui::XUIConfigurationListener > xThis( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
     aWriteLock.unlock();
 
-    UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
-    {
-        Reference< XComponent > xComponent( pIter->m_xUIElement, UNO_QUERY );
-        if ( xComponent.is() )
-            xComponent->dispose();
-    }
+    if ( pToolbarManager )
+        pToolbarManager->destroyToolbars();
 
     implts_destroyStatusBar();
 
@@ -778,592 +456,49 @@ void LayoutManager::implts_destroyElements()
     aWriteLock.unlock();
 }
 
-void LayoutManager::implts_destroyDockingAreaWindows()
-{
-    std::vector< Reference< css::awt::XWindow > > oldDockingAreaWindows;
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    WriteGuard aWriteLock( m_aLock );
-    oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP] );
-    oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM] );
-    oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT] );
-    oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT] );
-
-    m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP].clear();
-    m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM].clear();
-    m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT].clear();
-    m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT].clear();
-    aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-    const sal_uInt32 nCount = oldDockingAreaWindows.size();
-    for ( sal_uInt32 i=0; i < nCount; i++ )
-    {
-        if ( oldDockingAreaWindows[i].is() )
-        {
-            try
-            {
-                oldDockingAreaWindows[i]->dispose();
-            }
-            catch ( Exception& )
-            {
-            }
-        }
-    }
-}
-
-void LayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle )
-{
-    if ( aTbxResName.getLength() > 0 )
-    {
-        createElement( aTbxResName );
-        if ( !aTitle.isEmpty() )
-        {
-            Reference< XUIElement > xUIElement = getElement( aTbxResName );
-            if ( xUIElement.is() )
-            {
-                SolarMutexGuard aGuard;
-
-                Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow  )
-                    pWindow->SetText( aTitle );
-            }
-        }
-    }
-}
-
-void LayoutManager::implts_createCustomToolBars(
-    const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aTbxSeqSeq )
-{
-    const Sequence< PropertyValue >* pTbxSeq = aTbxSeqSeq.getConstArray();
-    for ( sal_Int32 i = 0; i < aTbxSeqSeq.getLength(); i++ )
-    {
-        const Sequence< PropertyValue >& rTbxSeq = pTbxSeq[i];
-        ::rtl::OUString aTbxResName;
-        ::rtl::OUString aTbxTitle;
-        for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
-        {
-            if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) )
-                rTbxSeq[j].Value >>= aTbxResName;
-            else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")) )
-                rTbxSeq[j].Value >>= aTbxTitle;
-        }
-
-        // Only create custom toolbars. Their name have to start with "custom_"!
-        if ( aTbxResName.getLength() > 0 && aTbxResName.indexOf( m_aCustomTbxPrefix ) != -1 )
-            implts_createCustomToolBar( aTbxResName, aTbxTitle );
-    }
-}
-
-void LayoutManager::implts_createCustomToolBars()
-{
-    ReadGuard aReadLock( m_aLock );
-    if ( !m_bComponentAttached )
-        return;
-
-    Reference< XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
-    Reference< XFrame > xFrame( m_xFrame );
-    Reference< XModel > xModel;
-    Reference< XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr, UNO_QUERY );
-    Reference< XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr, UNO_QUERY );
-    aReadLock.unlock();
-
-    if ( xFrame.is() )
-    {
-        xModel = impl_getModelFromFrame( xFrame );
-        if ( implts_isPreviewModel( xModel ))
-            return; // no custom toolbars for preview frame!
-
-        Sequence< Sequence< PropertyValue > > aTbxSeq;
-        if ( xDocCfgMgr.is() )
-        {
-            aTbxSeq = xDocCfgMgr->getUIElementsInfo( UIElementType::TOOLBAR );
-            implts_createCustomToolBars( aTbxSeq ); // first create all document based toolbars
-        }
-        if ( xModuleCfgMgr.is() )
-        {
-            aTbxSeq = xModuleCfgMgr->getUIElementsInfo( UIElementType::TOOLBAR );
-            implts_createCustomToolBars( aTbxSeq ); // second create module based toolbars
-        }
-    }
-}
-
-rtl::OUString LayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const
-{
-    String aAddonGenericTitle;
-
-    aAddonGenericTitle = String( FwkResId( STR_TOOLBAR_TITLE_ADDON ));
-    const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
-
-    String aNumStr = rI18nHelper.GetNum( nNumber, 0, FALSE, FALSE );
-    aAddonGenericTitle.SearchAndReplaceAscii( "%num%", aNumStr );
-
-    return rtl::OUString( aAddonGenericTitle );
-}
-
-void LayoutManager::implts_createAddonsToolBars()
-{
-    WriteGuard aWriteLock( m_aLock );
-    if ( !m_bComponentAttached )
-        return;
-
-    Reference< XModel > xModel;
-    Reference< XFrame > xFrame( m_xFrame );
-    if ( !xFrame.is() )
-        return;
-
-    if ( !m_pAddonOptions )
-        m_pAddonOptions = new AddonsOptions;
-
-    Reference< XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
-    aWriteLock.unlock();
-
-    xModel = impl_getModelFromFrame( xFrame );
-    if ( implts_isPreviewModel( xModel ))
-        return; // no addon toolbars for preview frame!
-
-    UIElementVector aUIElementVector;
-    Sequence< Sequence< PropertyValue > > aAddonToolBarData;
-    Reference< XUIElement >               xUIElement;
-
-    sal_uInt32 nCount = m_pAddonOptions->GetAddonsToolBarCount();
-    ::rtl::OUString aAddonsToolBarStaticName( m_aFullAddonTbxPrefix );
-    ::rtl::OUString aElementType( RTL_CONSTASCII_USTRINGPARAM( "toolbar" ));
-
-    Sequence< PropertyValue > aPropSeq( 2 );
-    aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
-    aPropSeq[0].Value <<= xFrame;
-    aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" ));
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        ::rtl::OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
-        aAddonToolBarData = m_pAddonOptions->GetAddonsToolBarPart( i );
-        aPropSeq[1].Value <<= aAddonToolBarData;
-
-        aWriteLock.lock();
-        UIElement aElement = impl_findElement( aAddonToolBarName );
-        aWriteLock.unlock();
-
-        // #i79828
-        // It's now possible that we are called more than once. Be sure to not create
-        // add-on toolbars more than once!
-        if ( aElement.m_xUIElement.is() )
-            continue;
-
-        try
-        {
-            xUIElement = xUIElementFactory->createUIElement( aAddonToolBarName, aPropSeq );
-            if ( xUIElement.is() )
-            {
-                Reference< css::awt::XDockableWindow > xDockWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                if ( xDockWindow.is() )
-                {
-                    try
-                    {
-                        xDockWindow->addDockableWindowListener( Reference< css::awt::XDockableWindowListener >( static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                        xDockWindow->enableDocking( sal_True );
-                        Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY );
-                        if ( xWindow.is() )
-                            xWindow->addWindowListener( Reference< css::awt::XWindowListener >( static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                    }
-                    catch ( Exception& )
-                    {
-                    }
-                }
-
-                ::rtl::OUString aGenericAddonTitle = implts_generateGenericAddonToolbarTitle( i+1 );
-
-                if ( aElement.m_aName.getLength() > 0 )
-                {
-                    // Reuse a local entry so we are able to use the latest
-                    // UI changes for this document.
-                    implts_setElementData( aElement, xDockWindow );
-                    aElement.m_xUIElement = xUIElement;
-                    if ( aElement.m_aUIName.getLength() == 0 )
-                    {
-                        aElement.m_aUIName = aGenericAddonTitle;
-                        implts_writeWindowStateData( aElement.m_aName, aElement );
-                    }
-                }
-                else
-                {
-                    // Create new UI element and try to read its state data
-                    UIElement aNewToolbar( aAddonToolBarName, aElementType, xUIElement );
-                    aNewToolbar.m_bFloating = sal_True;
-                    implts_readWindowStateData( aAddonToolBarName, aNewToolbar );
-                    implts_setElementData( aNewToolbar, xDockWindow );
-                    if ( aNewToolbar.m_aUIName.getLength() == 0 )
-                    {
-                        aNewToolbar.m_aUIName = aGenericAddonTitle;
-                        implts_writeWindowStateData( aNewToolbar.m_aName, aNewToolbar );
-                    }
-                    implts_insertUIElement( aNewToolbar );
-                }
-
-                Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY );
-                if ( xWindow.is() )
-                {
-                    // Set generic title for add-on toolbar
-                    SolarMutexGuard aGuard;
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow && pWindow->GetText().Len() == 0 )
-                        pWindow->SetText( aGenericAddonTitle );
-                    if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                    {
-                        ToolBox* pToolbar = (ToolBox *)pWindow;
-                        pToolbar->SetMenuType();
-                    }
-                }
-            }
-        }
-        catch ( NoSuchElementException& )
-        {
-        }
-        catch ( IllegalArgumentException& )
-        {
-        }
-    }
-}
-
-void LayoutManager::implts_createNonContextSensitiveToolBars()
-{
-    ReadGuard aReadLock( m_aLock );
-
-    if ( !m_xPersistentWindowState.is() ||
-         !m_xFrame.is() ||
-         !m_bComponentAttached )
-        return;
-
-    Reference< XFrame > xFrame( m_xFrame );
-
-    Reference< XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
-    Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
-    aReadLock.unlock();
-
-    if ( implts_isPreviewModel( impl_getModelFromFrame( xFrame )))
-        return;
-
-    std::vector< rtl::OUString > aMakeVisibleToolbars;
-
-    try
-    {
-        Sequence< rtl::OUString > aToolbarNames = xPersistentWindowState->getElementNames();
-
-        if ( aToolbarNames.getLength() > 0 )
-        {
-            rtl::OUString aElementType;
-            rtl::OUString aElementName;
-            rtl::OUString aName;
-
-            Reference< ::com::sun::star::ui::XUIElement > xUIElement;
-            aMakeVisibleToolbars.reserve(aToolbarNames.getLength());
-            WriteGuard aWriteLock( m_aLock );
-
-            const rtl::OUString* pTbNames = aToolbarNames.getConstArray();
-            for ( sal_Int32 i = 0; i < aToolbarNames.getLength(); i++ )
-            {
-                aName = pTbNames[i];
-                if ( impl_parseResourceURL( aName, aElementType, aElementName ))
-                {
-                    // Check that we only create:
-                    // - Toolbars (the statusbar is also member of the persistent window state)
-                    // - Not custom toolbars, there are created with their own method (implts_createCustomToolbars)
-                    if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ) &&
-                         aElementName.indexOf( m_aCustomTbxPrefix ) == -1 )
-                    {
-                        UIElement aNewToolbar( aName, aElementType, xUIElement );
-                        bool bFound = implts_findElement( aName, aNewToolbar );
-                        if ( !bFound )
-                            implts_readWindowStateData( aName, aNewToolbar );
-
-                        if ( aNewToolbar.m_bVisible &&
-                             !aNewToolbar.m_bContextSensitive )
-                        {
-                            if ( !bFound )
-                                implts_insertUIElement( aNewToolbar );
-                            aMakeVisibleToolbars.push_back( aName );
-                        }
-                    }
-                }
-            }
-        }
-    }
-    catch ( RuntimeException& e )
-    {
-        throw e;
-    }
-    catch ( Exception& )
-    {
-    }
-
-    if ( !aMakeVisibleToolbars.empty() )
-    {
-        implts_lock();
-        ::std::for_each( aMakeVisibleToolbars.begin(), aMakeVisibleToolbars.end(),::boost::bind( &LayoutManager::requestElement, this,_1 ));
-        implts_unlock();
-    }
-}
-
 void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive )
 {
-    WriteGuard aWriteLock( m_aLock );
-    UIElementVector::iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_xUIElement.is() )
-        {
-            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY );
-            if ( xDockWindow.is() && xWindow.is() )
-            {
-                sal_Bool bVisible( sal_True );
-                SolarMutexGuard aGuard;
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow )
-                    bVisible = pWindow->IsVisible();
-
-                if ( xDockWindow->isFloating() )
-                {
-                    if ( bActive )
-                    {
-                        if ( !bVisible && pIter->m_bDeactiveHide )
-                        {
-                            pIter->m_bDeactiveHide = sal_False;
-                            // we need VCL here to pass special flags to Show()
-                            if( pWindow )
-                                pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-                            //xWindow->setVisible( sal_True );
-                        }
-                    }
-                    else
-                    {
-                        if ( bVisible )
-                        {
-                            pIter->m_bDeactiveHide = sal_True;
-                            xWindow->setVisible( sal_False );
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, rtl::OUString& aElementType, rtl::OUString& aElementName, Reference< XUIElement >& xUIElement )
-{
-    if ( impl_parseResourceURL( aName, aElementType, aElementName ))
-    {
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-             aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
-        {
-            ReadGuard aReadLock( m_aLock );
-            xUIElement = m_xMenuBar;
-            return sal_True;
-        }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-                 ( m_aStatusBarElement.m_aName == aName ))
-        {
-            ReadGuard aReadLock( m_aLock );
-            xUIElement = m_aStatusBarElement.m_xUIElement;
-            return sal_True;
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
-        {
-            ReadGuard aReadLock( m_aLock );
-            xUIElement = m_aProgressBarElement.m_xUIElement;
-            return sal_True;
-        }
-        else
-        {
-            UIElementVector::const_iterator pIter;
-
-            ReadGuard aReadLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_aName == aName )
-                {
-                    xUIElement = pIter->m_xUIElement;
-                    return sal_True;
-                }
-            }
-        }
-    }
-
-    return sal_False;
-}
-
-sal_Bool LayoutManager::implts_findElement( const Reference< XInterface >& xUIElement, UIElement& aElementData )
-{
-    UIElementVector::const_iterator pIter;
-
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_xUIElement.is() )
-        {
-            Reference< XInterface > xIfac( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xIfac == xUIElement )
-            {
-                aElementData = *pIter;
-                return sal_True;
-            }
-        }
-    }
+    uno::Reference< ui::XUIConfigurationListener > xThis( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+    aReadLock.unlock();
 
-    return sal_False;
+    if ( pToolbarManager )
+        pToolbarManager->setFloatingToolbarsVisibility( bActive );
 }
 
-sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, UIElement& aElementData )
+uno::Reference< ui::XUIElement > LayoutManager::implts_findElement( const rtl::OUString& aName )
 {
-    UIElementVector::const_iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_aName == aName )
-        {
-            aElementData = *pIter;
-            return sal_True;
-        }
-    }
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
+    
+    parseResourceURL( aName, aElementType, aElementName );
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
+        return m_xMenuBar;
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
+        return m_aStatusBarElement.m_xUIElement;
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+        return m_aProgressBarElement.m_xUIElement;
 
-    return sal_False;
+    return uno::Reference< ui::XUIElement >();
 }
 
-LayoutManager::UIElement& LayoutManager::impl_findElement( const rtl::OUString& aName )
+UIElement& LayoutManager::impl_findElement( const rtl::OUString& aName )
 {
     static UIElement aEmptyElement;
 
-    UIElementVector::iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_aName == aName )
-            return *pIter;
-    }
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
+    
+    parseResourceURL( aName, aElementType, aElementName );
+    if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
+        return m_aStatusBarElement;
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+        return m_aProgressBarElement;
 
     return aEmptyElement;
 }
 
-sal_Bool LayoutManager::implts_insertUIElement( const UIElement& rUIElement )
-{
-    UIElement aTempData;
-    bool bFound = implts_findElement( rUIElement.m_aName, aTempData );
-
-#ifdef DBG_UTIL
-    if ( bFound )
-    {
-        char aBuffer[256];
-        const sal_Int32 MAX_NAME_LENGTH = 128;
-        ::rtl::OString aName = ::rtl::OUStringToOString( rUIElement.m_aName, RTL_TEXTENCODING_ASCII_US );
-        aName = aName.copy( ::std::min( MAX_NAME_LENGTH, aName.getLength() ));
-        sprintf( aBuffer, "Try to insert an already existing user interface element (%s) into the list\n", aName.getStr() );
-        DBG_ASSERT( bFound, aBuffer );
-    }
-#endif
-
-    bool bResult( false );
-    if ( !bFound )
-    {
-        WriteGuard aWriteLock( m_aLock );
-        m_aUIElements.push_back( rUIElement );
-        bResult = true;
-    }
-    return bResult;
-}
-
-void LayoutManager::implts_writeNewStateData( const rtl::OUString aName, const Reference< css::awt::XWindow >& xWindow )
-{
-    css::awt::Rectangle aPos;
-    css::awt::Size      aSize;
-    sal_Bool            bVisible( sal_False );
-    sal_Bool            bFloating( sal_True );
-
-    if ( xWindow.is() )
-    {
-        Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-        if ( xDockWindow.is() )
-            bFloating = xDockWindow->isFloating();
-
-        Reference< css::awt::XWindow2 > xWindow2( xWindow, UNO_QUERY );
-        if( xWindow2.is() )
-        {
-            aPos     = xWindow2->getPosSize();
-            aSize    = xWindow2->getOutputSize();   // always use output size for consistency
-            bVisible = xWindow2->isVisible();
-        }
-    }
-
-    WriteGuard aWriteLock( m_aLock );
-    UIElement& rUIElement = impl_findElement( aName );
-    if ( rUIElement.m_xUIElement.is() && xWindow.is() )
-    {
-        rUIElement.m_bVisible   = bVisible;
-        rUIElement.m_bFloating  = bFloating;
-        if ( bFloating )
-        {
-            rUIElement.m_aFloatingData.m_aPos  = ::Point( aPos.X, aPos.Y );
-            rUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
-        }
-    }
-
-    implts_writeWindowStateData( aName, rUIElement );
-
-    aWriteLock.unlock();
-}
-
-void LayoutManager::implts_refreshContextToolbarsVisibility()
-{
-    std::vector< UIElementVisibility > aToolbarVisibleVector;
-
-    ReadGuard aReadLock( m_aLock );
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    if ( !m_bVisible || !m_bAutomaticToolbars )
-        return;
-
-    UIElementVisibility aUIElementVisible;
-
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) )
-        {
-            aUIElementVisible.aName    = pIter->m_aName;
-            aUIElementVisible.bVisible = pIter->m_bVisible;
-            aToolbarVisibleVector.push_back( aUIElementVisible );
-        }
-    }
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    aReadLock.unlock();
-
-    UIElement aUIElement;
-    const sal_uInt32 nCount = aToolbarVisibleVector.size();
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        UIElementVisibility& rToolbar = aToolbarVisibleVector[i];
-
-        sal_Bool bVisible = rToolbar.bVisible;
-        if ( implts_readWindowStateData( rToolbar.aName, aUIElement ) &&
-             aUIElement.m_bVisible != bVisible )
-        {
-            WriteGuard aWriteLock( m_aLock );
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-            UIElement& rUIElement = impl_findElement( rToolbar.aName );
-
-            if ( rUIElement.m_aName == rToolbar.aName )
-                rUIElement.m_bVisible = aUIElement.m_bVisible;
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-            aWriteLock.unlock();
-        }
-    }
-}
-
 sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData )
 {
     sal_Bool bGetSettingsState( sal_False );
@@ -1388,7 +523,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
         try
         {
             Sequence< PropertyValue > aWindowState;
-            if ( xPersistentWindowState->getByName( aName ) >>= aWindowState )
+            if ( xPersistentWindowState->hasByName( aName ) && (xPersistentWindowState->getByName( aName ) >>= aWindowState) )
             {
                 sal_Bool bValue( sal_False );
                 for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ )
@@ -1405,13 +540,13 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                     }
                     else if ( aWindowState[n].Name == m_aPropDockingArea )
                     {
-                        ::com::sun::star::ui::DockingArea eDockingArea;
+                        ui::DockingArea eDockingArea;
                         if ( aWindowState[n].Value >>= eDockingArea )
                             rElementData.m_aDockedData.m_nDockedArea = sal_Int16( eDockingArea );
                     }
                     else if ( aWindowState[n].Name == m_aPropDockPos )
                     {
-                        css::awt::Point aPoint;
+                        awt::Point aPoint;
                         if ( aWindowState[n].Value >>= aPoint )
                         {
                             rElementData.m_aDockedData.m_aPos.X() = aPoint.X;
@@ -1420,7 +555,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                     }
                     else if ( aWindowState[n].Name == m_aPropPos )
                     {
-                        css::awt::Point aPoint;
+                        awt::Point aPoint;
                         if ( aWindowState[n].Value >>= aPoint )
                         {
                             rElementData.m_aFloatingData.m_aPos.X() = aPoint.X;
@@ -1429,7 +564,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                     }
                     else if ( aWindowState[n].Name == m_aPropSize )
                     {
-                        css::awt::Size aSize;
+                        awt::Size aSize;
                         if ( aWindowState[n].Value >>= aSize )
                         {
                             rElementData.m_aFloatingData.m_aSize.Width() = aSize.Width;
@@ -1481,7 +616,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
                     m_bGlobalSettings = sal_True;
                     aWriteLock2.unlock();
 
-                    css::uno::Any aValue;
+                    uno::Any aValue;
                     sal_Bool      bValue = sal_Bool();
                     if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR,
                                                         GlobalSettings::STATEINFO_LOCKED,
@@ -1499,9 +634,7 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
 
             return sal_True;
         }
-        catch ( NoSuchElementException& )
-        {
-        }
+        catch ( NoSuchElementException& ) {}
     }
 
     return sal_False;
@@ -1525,14 +658,12 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
             // Check persistent flag of the user interface element
             xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ))) >>= bPersistent;
         }
-        catch ( com::sun::star::beans::UnknownPropertyException )
+        catch ( beans::UnknownPropertyException )
         {
             // Non-configurable elements should at least store their dimension/position
             bPersistent = sal_True;
         }
-        catch ( com::sun::star::lang::WrappedTargetException )
-        {
-        }
+        catch ( lang::WrappedTargetException ) {}
     }
 
     if ( bPersistent && xPersistentWindowState.is() )
@@ -1541,49 +672,47 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
         {
             Sequence< PropertyValue > aWindowState( 8 );
 
-            aWindowState[0].Name    = m_aPropDocked;
-            aWindowState[0].Value   = makeAny( sal_Bool( !rElementData.m_bFloating ));
-            aWindowState[1].Name    = m_aPropVisible;
-            aWindowState[1].Value   = makeAny( sal_Bool( rElementData.m_bVisible ));
+            aWindowState[0].Name  = m_aPropDocked;
+            aWindowState[0].Value = makeAny( sal_Bool( !rElementData.m_bFloating ));
+            aWindowState[1].Name  = m_aPropVisible;
+            aWindowState[1].Value = makeAny( sal_Bool( rElementData.m_bVisible ));
 
-            aWindowState[2].Name    = m_aPropDockingArea;
-            aWindowState[2].Value   = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+            aWindowState[2].Name  = m_aPropDockingArea;
+            aWindowState[2].Value = makeAny( static_cast< DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
 
-            css::awt::Point aPos;
+            awt::Point aPos;
             aPos.X = rElementData.m_aDockedData.m_aPos.X();
             aPos.Y = rElementData.m_aDockedData.m_aPos.Y();
-            aWindowState[3].Name    = m_aPropDockPos;
-            aWindowState[3].Value   <<= aPos;
+            aWindowState[3].Name = m_aPropDockPos;
+            aWindowState[3].Value <<= aPos;
 
             aPos.X = rElementData.m_aFloatingData.m_aPos.X();
             aPos.Y = rElementData.m_aFloatingData.m_aPos.Y();
-            aWindowState[4].Name    = m_aPropPos;
-            aWindowState[4].Value   <<= aPos;
+            aWindowState[4].Name = m_aPropPos;
+            aWindowState[4].Value <<= aPos;
 
-            css::awt::Size aSize;
+            awt::Size aSize;
             aSize.Width = rElementData.m_aFloatingData.m_aSize.Width();
             aSize.Height = rElementData.m_aFloatingData.m_aSize.Height();
-            aWindowState[5].Name    = m_aPropSize;
-            aWindowState[5].Value   <<= aSize;
-            aWindowState[6].Name    = m_aPropUIName;
-            aWindowState[6].Value   = makeAny( rElementData.m_aUIName );
-            aWindowState[7].Name    = m_aPropLocked;
-            aWindowState[7].Value   = makeAny( rElementData.m_aDockedData.m_bLocked );
+            aWindowState[5].Name  = m_aPropSize;
+            aWindowState[5].Value <<= aSize;
+            aWindowState[6].Name  = m_aPropUIName;
+            aWindowState[6].Value = makeAny( rElementData.m_aUIName );
+            aWindowState[7].Name  = m_aPropLocked;
+            aWindowState[7].Value = makeAny( rElementData.m_aDockedData.m_bLocked );
 
             if ( xPersistentWindowState->hasByName( aName ))
             {
-                Reference< XNameReplace > xReplace( xPersistentWindowState, UNO_QUERY );
+                Reference< XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
                 xReplace->replaceByName( aName, makeAny( aWindowState ));
             }
             else
             {
-                Reference< XNameContainer > xInsert( xPersistentWindowState, UNO_QUERY );
+                Reference< XNameContainer > xInsert( xPersistentWindowState, uno::UNO_QUERY );
                 xInsert->insertByName( aName, makeAny( aWindowState ));
             }
         }
-        catch ( Exception& )
-        {
-        }
+        catch ( Exception& ) {}
     }
 
     // Reset flag
@@ -1592,1450 +721,23 @@ void LayoutManager::implts_writeWindowStateData( const rtl::OUString& aName, con
     aWriteLock.unlock();
 }
 
-void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< css::awt::XDockableWindow >& rDockWindow )
-{
-    ReadGuard aReadLock( m_aLock );
-    sal_Bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide && m_bParentWindowVisible );
-    aReadLock.unlock();
-
-    Reference< css::awt::XDockableWindow > xDockWindow( rDockWindow );
-    Reference< css::awt::XWindow2 >        xWindow( xDockWindow, UNO_QUERY );
-
-    Window*     pWindow( 0 );
-    ToolBox*    pToolBox( 0 );
-
-    if ( xDockWindow.is() && xWindow.is() )
-    {
-        {
-            SolarMutexGuard aGuard;
-            pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if ( pWindow )
-            {
-                String aText = pWindow->GetText();
-                if ( aText.Len() == 0 )
-                    pWindow->SetText( rElement.m_aUIName );
-                if ( rElement.m_bNoClose )
-                    pWindow->SetStyle( pWindow->GetStyle() & ~WB_CLOSEABLE );
-                if ( pWindow->GetType() == WINDOW_TOOLBOX )
-                    pToolBox = (ToolBox *)pWindow;
-            }
-            if ( pToolBox )
-            {
-                if (( rElement.m_nStyle < 0 ) ||
-                    ( rElement.m_nStyle > BUTTON_SYMBOLTEXT ))
-                    rElement.m_nStyle = BUTTON_SYMBOL;
-                    pToolBox->SetButtonType( (ButtonType)rElement.m_nStyle );
-                if ( rElement.m_bNoClose )
-                    pToolBox->SetFloatStyle( pToolBox->GetFloatStyle() & ~WB_CLOSEABLE );
-            }
-        }
-
-        if ( rElement.m_bFloating )
-        {
-            if ( pWindow )
-            {
-                SolarMutexGuard aGuard;
-                String aText = pWindow->GetText();
-                if ( aText.Len() == 0 )
-                    pWindow->SetText( rElement.m_aUIName );
-            }
-
-            ::Point  aPos( rElement.m_aFloatingData.m_aPos.X(),
-                           rElement.m_aFloatingData.m_aPos.Y() );
-            sal_Bool bWriteData( sal_False );
-            sal_Bool bUndefPos = ( rElement.m_aFloatingData.m_aPos.X() == SAL_MAX_INT32 ||
-                                   rElement.m_aFloatingData.m_aPos.Y() == SAL_MAX_INT32 );
-            sal_Bool bSetSize = ( rElement.m_aFloatingData.m_aSize.Width() != 0 &&
-                                  rElement.m_aFloatingData.m_aSize.Height() != 0 );
-            xDockWindow->setFloatingMode( sal_True );
-            if ( bUndefPos )
-            {
-                aPos = implts_findNextCascadeFloatingPos();
-                rElement.m_aFloatingData.m_aPos = aPos; // set new cascaded position
-                bWriteData = sal_True;
-            }
-
-            if( bSetSize )
-                xWindow->setOutputSize( AWTSize( rElement.m_aFloatingData.m_aSize ) );
-            else
-            {
-                if( pToolBox )
-                {
-                    // set an optimal initial floating size
-                    SolarMutexGuard aGuard;
-                    ::Size aSize( pToolBox->CalcFloatingWindowSizePixel() );
-                    pToolBox->SetOutputSizePixel( aSize );
-                }
-            }
-
-            // #i60882# IMPORTANT: Set position after size as it is
-            // possible that we position some part of the toolbar
-            // outside of the desktop. A default constructed toolbar
-            // always has one line. Now VCL automatically
-            // position the toolbar back into the desktop. Therefore
-            // we resize the toolbar with the new (wrong) position.
-            // To fix this problem we have to set the size BEFORE the
-            // position.
-            xWindow->setPosSize( aPos.X(), aPos.Y(), 0, 0,
-                                 css::awt::PosSize::POS );
-
-            if ( bWriteData )
-                implts_writeWindowStateData( rElement.m_aName, rElement );
-            if ( bShowElement && pWindow )
-            {
-                SolarMutexGuard aGuard;
-                pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-            }
-        }
-        else
-        {
-            ::Point  aDockPos;
-            ::Point  aPixelPos;
-            sal_Bool bSetSize( sal_False );
-            ::Size   aSize;
-
-            if ( pToolBox )
-            {
-                SolarMutexGuard aGuard;
-                pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea )  );
-                pToolBox->SetLineCount( 1 );
-                if ( rElement.m_aDockedData.m_bLocked )
-                    xDockWindow->lock();
-                aSize = pToolBox->CalcWindowSizePixel();
-                bSetSize = sal_True;
-
-                if (( rElement.m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) &&
-                    ( rElement.m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
-                {
-                    implts_findNextDockingPos( (DockingArea)rElement.m_aDockedData.m_nDockedArea,
-                                               aSize,
-                                               aDockPos,
-                                               aPixelPos );
-                    rElement.m_aDockedData.m_aPos = aDockPos;
-                }
-            }
-
-            xWindow->setPosSize( aPixelPos.X(),
-                                 aPixelPos.Y(),
-                                 0, 0,
-                                 css::awt::PosSize::POS );
-            if( bSetSize )
-                xWindow->setOutputSize( AWTSize( aSize) );
-
-            if ( bShowElement && pWindow )
-            {
-                SolarMutexGuard aGuard;
-                pWindow->Show( sal_True );
-            }
-        }
-    }
-}
-
-::Point LayoutManager::implts_findNextCascadeFloatingPos()
-{
-    const sal_Int32 nHotZoneX       = 50;
-    const sal_Int32 nHotZoneY       = 50;
-    const sal_Int32 nCascadeIndentX = 15;
-    const sal_Int32 nCascadeIndentY = 15;
-
-    ReadGuard aReadLock( m_aLock );
-    Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow;
-    Reference< css::awt::XWindow > xTopDockingWindow = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-    Reference< css::awt::XWindow > xLeftDockingWindow = m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT];
-    aReadLock.unlock();
-
-    ::Point aStartPos( nCascadeIndentX, nCascadeIndentY );
-    ::Point aCurrPos( aStartPos );
-    css::awt::Rectangle aRect;
-
-    Window* pContainerWindow( 0 );
-    if ( xContainerWindow.is() )
-    {
-        SolarMutexGuard aGuard;
-        pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
-        if ( pContainerWindow )
-            aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos );
-    }
-
-    // Determine size of top and left docking area
-    css::awt::Rectangle aTopRect  = xTopDockingWindow->getPosSize();
-    css::awt::Rectangle aLeftRect = xLeftDockingWindow->getPosSize();
-
-    aStartPos.X() += aLeftRect.Width + nCascadeIndentX;
-    aStartPos.Y() += aTopRect.Height + nCascadeIndentY;
-    aCurrPos = aStartPos;
-
-    // Try to find a cascaded position for the new floating window
-    UIElementVector::const_iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_xUIElement.is() )
-        {
-            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY );
-            if ( xDockWindow.is() && xDockWindow->isFloating() )
-            {
-                SolarMutexGuard aGuard;
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow && pWindow->IsVisible() )
-                {
-                    css::awt::Rectangle aFloatRect = xWindow->getPosSize();
-                    if ((( aFloatRect.X - nHotZoneX ) <= aCurrPos.X() ) &&
-                        ( aFloatRect.X >= aCurrPos.X() ) &&
-                        (( aFloatRect.Y - nHotZoneY ) <= aCurrPos.Y() ) &&
-                        ( aFloatRect.Y >= aCurrPos.Y() ))
-                    {
-                        aCurrPos.X() = aFloatRect.X + nCascadeIndentX;
-                        aCurrPos.Y() = aFloatRect.Y + nCascadeIndentY;
-                    }
-                }
-            }
-        }
-    }
-
-    return aCurrPos;
-}
-
-void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos )
-{
-    ReadGuard aReadLock( m_aLock );
-    Reference< css::awt::XWindow > xDockingWindow = m_xDockAreaWindows[DockingArea];
-    ::Size                         aDockingWinSize;
-    Window*                        pDockingWindow( 0 );
-    aReadLock.unlock();
-
-    if (( DockingArea < DockingArea_DOCKINGAREA_TOP ) ||
-        ( DockingArea > DockingArea_DOCKINGAREA_RIGHT ))
-        DockingArea = DockingArea_DOCKINGAREA_TOP;
-
-    {
-        // Retrieve output size from container Window
-        SolarMutexGuard aGuard;
-        pDockingWindow  = VCLUnoHelper::GetWindow( xDockingWindow );
-        if ( pDockingWindow )
-            aDockingWinSize = pDockingWindow->GetOutputSizePixel();
-    }
-
-    sal_Int32 nFreeRowColPixelPos( 0 );
-    sal_Int32 nMaxSpace( 0 );
-    sal_Int32 nNeededSpace( 0 );
-    sal_Int32 nTopDockingAreaSize( 0 );
-
-    if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-        ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-    {
-        nMaxSpace    = aDockingWinSize.Width();
-        nNeededSpace = aUIElementSize.Width();
-    }
-    else
-    {
-        nMaxSpace              = aDockingWinSize.Height();
-        nNeededSpace           = aUIElementSize.Height();
-        nTopDockingAreaSize    = implts_getTopBottomDockingAreaSizes().Width();
-    }
-
-    std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
-
-    implts_getDockingAreaElementInfos( DockingArea, aRowColumnsWindowData );
-    sal_Int32 nPixelPos( 0 );
-    const sal_uInt32 nCount = aRowColumnsWindowData.size();
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        SingleRowColumnWindowData& rRowColumnWindowData = aRowColumnsWindowData[i];
-
-        if (( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ) ||
-            ( DockingArea == DockingArea_DOCKINGAREA_RIGHT  ))
-            nPixelPos += rRowColumnWindowData.nStaticSize;
-
-        if ((( nMaxSpace - rRowColumnWindowData.nVarSize ) >= nNeededSpace ) ||
-            ( rRowColumnWindowData.nSpace >= nNeededSpace ))
-        {
-            // Check current row where we can find the needed space
-            sal_Int32 nCurrPos( 0 );
-            const sal_uInt32 nWindowSizesCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
-            for ( sal_uInt32 j = 0; j < nWindowSizesCount; j++ )
-            {
-                css::awt::Rectangle rRect   = rRowColumnWindowData.aRowColumnWindowSizes[j];
-                sal_Int32&          rSpace  = rRowColumnWindowData.aRowColumnSpace[j];
-                if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                    ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                {
-                    if ( rSpace >= nNeededSpace )
-                    {
-                        rVirtualPos = ::Point( nCurrPos, rRowColumnWindowData.nRowColumn );
-                        if ( DockingArea == DockingArea_DOCKINGAREA_TOP )
-                            rPixelPos   = ::Point( nCurrPos, nPixelPos );
-                        else
-                            rPixelPos   = ::Point( nCurrPos, aDockingWinSize.Height() - nPixelPos );
-                        return;
-                    }
-                    nCurrPos = rRect.X + rRect.Width;
-                }
-                else
-                {
-                    if ( rSpace >= nNeededSpace )
-                    {
-                        rVirtualPos = ::Point( rRowColumnWindowData.nRowColumn, nCurrPos );
-                        if ( DockingArea == DockingArea_DOCKINGAREA_LEFT )
-                            rPixelPos   = ::Point( nPixelPos, nTopDockingAreaSize + nCurrPos );
-                        else
-                            rPixelPos   = ::Point( aDockingWinSize.Width() - nPixelPos , nTopDockingAreaSize + nCurrPos );
-                        return;
-                    }
-                    nCurrPos = rRect.Y + rRect.Height;
-                }
-            }
-
-            if (( nCurrPos + nNeededSpace ) <= nMaxSpace )
-            {
-                if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                    ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                {
-                    rVirtualPos = ::Point( nCurrPos, rRowColumnWindowData.nRowColumn );
-                    if ( DockingArea == DockingArea_DOCKINGAREA_TOP )
-                        rPixelPos   = ::Point( nCurrPos, nPixelPos );
-                    else
-                        rPixelPos   = ::Point( nCurrPos, aDockingWinSize.Height() - nPixelPos );
-                    return;
-                }
-                else
-                {
-                    rVirtualPos = ::Point( rRowColumnWindowData.nRowColumn, nCurrPos );
-                    if ( DockingArea == DockingArea_DOCKINGAREA_LEFT )
-                        rPixelPos   = ::Point( nPixelPos, nTopDockingAreaSize + nCurrPos );
-                    else
-                        rPixelPos   = ::Point( aDockingWinSize.Width() - nPixelPos , nTopDockingAreaSize + nCurrPos );
-                    return;
-                }
-            }
-        }
-
-        if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-            ( DockingArea == DockingArea_DOCKINGAREA_LEFT  ))
-            nPixelPos += rRowColumnWindowData.nStaticSize;
-    }
-
-    sal_Int32 nNextFreeRowCol( 0 );
-    sal_Int32 nRowColumnsCount = aRowColumnsWindowData.size();
-    if ( nRowColumnsCount > 0 )
-        nNextFreeRowCol = aRowColumnsWindowData[nRowColumnsCount-1].nRowColumn+1;
-    else
-        nNextFreeRowCol = 0;
-
-    if ( nNextFreeRowCol == 0 )
-    {
-        if ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM )
-            nFreeRowColPixelPos = aDockingWinSize.Height() - aUIElementSize.Height();
-        else if ( DockingArea == DockingArea_DOCKINGAREA_RIGHT  )
-            nFreeRowColPixelPos = aDockingWinSize.Width() - aUIElementSize.Width();
-    }
-
-    if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-        ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-    {
-        rVirtualPos = ::Point( 0, nNextFreeRowCol );
-        if ( DockingArea == DockingArea_DOCKINGAREA_TOP )
-            rPixelPos = ::Point( 0, nFreeRowColPixelPos );
-        else
-            rPixelPos = ::Point( 0, aDockingWinSize.Height() - nFreeRowColPixelPos );
-    }
-    else
-    {
-        rVirtualPos = ::Point( nNextFreeRowCol, 0 );
-        rPixelPos   = ::Point( aDockingWinSize.Width() - nFreeRowColPixelPos, 0 );
-    }
-}
-
 ::Size LayoutManager::implts_getContainerWindowOutputSize()
 {
-    ReadGuard aReadLock( m_aLock );
-    Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow;
-    ::Size                         aContainerWinSize;
+    ::Size  aContainerWinSize;
     Window* pContainerWindow( 0 );
-    aReadLock.unlock();
 
     // Retrieve output size from container Window
     SolarMutexGuard aGuard;
-    pContainerWindow  = VCLUnoHelper::GetWindow( xContainerWindow );
+    pContainerWindow  = VCLUnoHelper::GetWindow( m_xContainerWindow );
     if ( pContainerWindow )
-        return pContainerWindow->GetOutputSizePixel();
-    else
-        return ::Size();
-}
-
-void LayoutManager::implts_sortUIElements()
-{
-    WriteGuard aWriteLock( m_aLock );
-    UIElementVector::iterator pIterStart = m_aUIElements.begin();
-    UIElementVector::iterator pIterEnd   = m_aUIElements.end();
-
-    std::stable_sort( pIterStart, pIterEnd ); // first created element should first
-
-    // We have to reset our temporary flags.
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        // why check, just set it to false
-        //if ( pIter->m_bUserActive )
-            pIter->m_bUserActive = sal_False;
-    }
-
-#ifdef DBG_UTIL
-    implts_checkElementContainer();
-#endif
-    aWriteLock.unlock();
-}
-
-void LayoutManager::implts_getDockingAreaElementInfos( DockingArea eDockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData )
-{
-    std::vector< UIElement > aWindowVector;
-
-    if (( eDockingArea < DockingArea_DOCKINGAREA_TOP ) ||
-        ( eDockingArea > DockingArea_DOCKINGAREA_RIGHT ))
-        eDockingArea = DockingArea_DOCKINGAREA_TOP;
-
-    Reference< css::awt::XWindow > xDockAreaWindow;
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    ReadGuard aReadLock( m_aLock );
-    aWindowVector.reserve(m_aUIElements.size());
-    xDockAreaWindow = m_xDockAreaWindows[eDockingArea];
-    UIElementVector::iterator   pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating )
-        {
-            Reference< XUIElement > xUIElement( pIter->m_xUIElement );
-            if ( xUIElement.is() )
-            {
-                Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xDockWindow.is() )
-                {
-                    // docked windows
-                    aWindowVector.push_back( *pIter );
-                }
-            }
-        }
-    }
-    aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-    rRowColumnsWindowData.clear();
-
-    // Collect data from windows that are on the same row/column
-    sal_Int32 j;
-    sal_Int32 nIndex( 0 );
-    sal_Int32 nLastPos( 0 );
-    sal_Int32 nCurrPos( -1 );
-    sal_Int32 nLastRowColPixelPos( 0 );
-    css::awt::Rectangle aDockAreaRect;
-
-    if ( xDockAreaWindow.is() )
-        aDockAreaRect = xDockAreaWindow->getPosSize();
-
-    if ( eDockingArea == DockingArea_DOCKINGAREA_TOP )
-        nLastRowColPixelPos = 0;
-    else if ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM )
-        nLastRowColPixelPos = aDockAreaRect.Height;
-    else if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT )
-        nLastRowColPixelPos = 0;
-    else
-        nLastRowColPixelPos = aDockAreaRect.Width;
-
-    const sal_uInt32 nCount = aWindowVector.size();
-    for ( j = 0; j < sal_Int32( nCount); j++ )
-    {
-        const UIElement& rElement = aWindowVector[j];
-        Reference< css::awt::XWindow > xWindow;
-        Reference< XUIElement > xUIElement( rElement.m_xUIElement );
-        css::awt::Rectangle aPosSize;
-        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
-            continue;
-        if (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-            ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-        {
-            if ( nCurrPos == -1 )
-            {
-                nCurrPos = rElement.m_aDockedData.m_aPos.Y();
-                nLastPos = 0;
-
-                SingleRowColumnWindowData aRowColumnWindowData;
-                aRowColumnWindowData.nRowColumn = nCurrPos;
-                rRowColumnsWindowData.push_back( aRowColumnWindowData );
-            }
-
-            sal_Int32 nSpace( 0 );
-            if ( rElement.m_aDockedData.m_aPos.Y() != nCurrPos )
-            {
-                if ( eDockingArea == DockingArea_DOCKINGAREA_TOP )
-                    nLastRowColPixelPos += rRowColumnsWindowData[nIndex].nStaticSize;
-                else
-                    nLastRowColPixelPos -= rRowColumnsWindowData[nIndex].nStaticSize;
-                ++nIndex;
-                nLastPos = 0;
-                nCurrPos = rElement.m_aDockedData.m_aPos.Y();
-                SingleRowColumnWindowData aRowColumnWindowData;
-                aRowColumnWindowData.nRowColumn = nCurrPos;
-                rRowColumnsWindowData.push_back( aRowColumnWindowData );
-            }
-
-            // Calc space before an element and store it
-            nSpace = ( rElement.m_aDockedData.m_aPos.X() - nLastPos );
-            if ( rElement.m_aDockedData.m_aPos.X() >= nLastPos )
-            {
-                rRowColumnsWindowData[nIndex].nSpace += nSpace;
-                nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width;
-            }
-            else
-            {
-                nSpace = 0;
-                nLastPos += aPosSize.Width;
-            }
-            rRowColumnsWindowData[nIndex].aRowColumnSpace.push_back( nSpace );
-
-            rRowColumnsWindowData[nIndex].aRowColumnWindows.push_back( xWindow );
-            rRowColumnsWindowData[nIndex].aUIElementNames.push_back( rElement.m_aName );
-            rRowColumnsWindowData[nIndex].aRowColumnWindowSizes.push_back(
-                css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
-                                     rElement.m_aDockedData.m_aPos.Y(),
-                                     aPosSize.Width,
-                                     aPosSize.Height ));
-            if ( rRowColumnsWindowData[nIndex].nStaticSize < aPosSize.Height )
-                rRowColumnsWindowData[nIndex].nStaticSize = aPosSize.Height;
-            if ( eDockingArea == DockingArea_DOCKINGAREA_TOP )
-                rRowColumnsWindowData[nIndex].aRowColumnRect = css::awt::Rectangle( 0, nLastRowColPixelPos,
-                                                                                    aDockAreaRect.Width, aPosSize.Height );
-            else
-                rRowColumnsWindowData[nIndex].aRowColumnRect = css::awt::Rectangle( 0, ( nLastRowColPixelPos - aPosSize.Height ),
-                                                                                    aDockAreaRect.Width, aPosSize.Height );
-            rRowColumnsWindowData[nIndex].nVarSize += aPosSize.Width + nSpace;
-        }
-        else
-        {
-            if ( nCurrPos == -1 )
-            {
-                nCurrPos = rElement.m_aDockedData.m_aPos.X();
-                nLastPos = 0;
-
-                SingleRowColumnWindowData aRowColumnWindowData;
-                aRowColumnWindowData.nRowColumn = nCurrPos;
-                rRowColumnsWindowData.push_back( aRowColumnWindowData );
-            }
-
-            sal_Int32 nSpace( 0 );
-            if ( rElement.m_aDockedData.m_aPos.X() != nCurrPos )
-            {
-                if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT )
-                    nLastRowColPixelPos += rRowColumnsWindowData[nIndex].nStaticSize;
-                else
-                    nLastRowColPixelPos -= rRowColumnsWindowData[nIndex].nStaticSize;
-                ++nIndex;
-                nLastPos = 0;
-                nCurrPos = rElement.m_aDockedData.m_aPos.X();
-                SingleRowColumnWindowData aRowColumnWindowData;
-                aRowColumnWindowData.nRowColumn = nCurrPos;
-                rRowColumnsWindowData.push_back( aRowColumnWindowData );
-            }
-
-            // Calc space before an element and store it
-            nSpace = ( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
-            if ( rElement.m_aDockedData.m_aPos.Y() > nLastPos )
-            {
-                rRowColumnsWindowData[nIndex].nSpace += nSpace;
-                nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height;
-            }
-            else
-            {
-                nSpace = 0;
-                nLastPos += aPosSize.Height;
-            }
-            rRowColumnsWindowData[nIndex].aRowColumnSpace.push_back( nSpace );
-
-            rRowColumnsWindowData[nIndex].aRowColumnWindows.push_back( xWindow );
-            rRowColumnsWindowData[nIndex].aUIElementNames.push_back( rElement.m_aName );
-            rRowColumnsWindowData[nIndex].aRowColumnWindowSizes.push_back(
-                css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
-                                     rElement.m_aDockedData.m_aPos.Y(),
-                                     aPosSize.Width,
-                                     aPosSize.Height ));
-            if ( rRowColumnsWindowData[nIndex].nStaticSize < aPosSize.Width )
-                rRowColumnsWindowData[nIndex].nStaticSize = aPosSize.Width;
-            if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT )
-                rRowColumnsWindowData[nIndex].aRowColumnRect = css::awt::Rectangle( nLastRowColPixelPos, 0,
-                                                                                    aPosSize.Width, aDockAreaRect.Height );
-            else
-                rRowColumnsWindowData[nIndex].aRowColumnRect = css::awt::Rectangle( ( nLastRowColPixelPos - aPosSize.Width ), 0,
-                                                                                    aPosSize.Width, aDockAreaRect.Height );
-            rRowColumnsWindowData[nIndex].nVarSize += aPosSize.Height + nSpace;
-        }
-    }
-}
-
-void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea eDockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData )
-{
-    std::vector< UIElement > aWindowVector;
-
-    if (( eDockingArea < DockingArea_DOCKINGAREA_TOP ) ||
-        ( eDockingArea > DockingArea_DOCKINGAREA_RIGHT ))
-        eDockingArea = DockingArea_DOCKINGAREA_TOP;
-
-    sal_Bool bHorzDockArea = (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                              ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    ReadGuard aReadLock( m_aLock );
-    UIElementVector::iterator   pIter;
-    UIElementVector::iterator   pEnd = m_aUIElements.end();
-    for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter )
-    {
-        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
-        {
-            sal_Bool                bSameRowCol = bHorzDockArea ?
-                                                   ( pIter->m_aDockedData.m_aPos.Y() == nRowCol ) :
-                                                   ( pIter->m_aDockedData.m_aPos.X() == nRowCol );
-            Reference< XUIElement > xUIElement( pIter->m_xUIElement );
-
-            if ( bSameRowCol && xUIElement.is() )
-            {
-                Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                if ( xWindow.is() )
-                {
-                    SolarMutexGuard aGuard;
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                    if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating )
-                    {
-                        // docked windows
-                        aWindowVector.push_back( *pIter );
-                    }
-                }
-            }
-        }
-    }
-    aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-    // Initialize structure
-    rRowColumnWindowData.aUIElementNames.clear();
-    rRowColumnWindowData.aRowColumnWindows.clear();
-    rRowColumnWindowData.aRowColumnWindowSizes.clear();
-    rRowColumnWindowData.aRowColumnSpace.clear();
-    rRowColumnWindowData.nVarSize = 0;
-    rRowColumnWindowData.nStaticSize = 0;
-    rRowColumnWindowData.nSpace = 0;
-    rRowColumnWindowData.nRowColumn = nRowCol;
-
-    // Collect data from windows that are on the same row/column
-    sal_Int32 j;
-    sal_Int32 nLastPos( 0 );
-
-    const sal_uInt32 nCount = aWindowVector.size();
-    for ( j = 0; j < sal_Int32( nCount); j++ )
-    {
-        const UIElement& rElement = aWindowVector[j];
-        Reference< css::awt::XWindow > xWindow;
-        Reference< XUIElement > xUIElement( rElement.m_xUIElement );
-        css::awt::Rectangle aPosSize;
-        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
-            continue;
-
-        sal_Int32 nSpace;
-        if (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-            ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-        {
-            nSpace = ( rElement.m_aDockedData.m_aPos.X() - nLastPos );
-
-            // Calc space before an element and store it
-            if ( rElement.m_aDockedData.m_aPos.X() > nLastPos )
-                rRowColumnWindowData.nSpace += nSpace;
-            else
-                nSpace = 0;
-
-            nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width;
-
-
-            rRowColumnWindowData.aRowColumnWindowSizes.push_back(
-                css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
-                                     rElement.m_aDockedData.m_aPos.Y(),
-                                     aPosSize.Width,
-                                     aPosSize.Height ));
-            if ( rRowColumnWindowData.nStaticSize < aPosSize.Height )
-                rRowColumnWindowData.nStaticSize = aPosSize.Height;
-            rRowColumnWindowData.nVarSize += aPosSize.Width;
-        }
-        else
-        {
-            // Calc space before an element and store it
-            nSpace = ( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
-            if ( rElement.m_aDockedData.m_aPos.Y() > nLastPos )
-                rRowColumnWindowData.nSpace += nSpace;
-            else
-                nSpace = 0;
-
-            nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height;
-
-            rRowColumnWindowData.aRowColumnWindowSizes.push_back(
-                css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
-                                     rElement.m_aDockedData.m_aPos.Y(),
-                                     aPosSize.Width,
-                                     aPosSize.Height ));
-            if ( rRowColumnWindowData.nStaticSize < aPosSize.Width )
-                rRowColumnWindowData.nStaticSize = aPosSize.Width;
-            rRowColumnWindowData.nVarSize += aPosSize.Height;
-        }
-
-        rRowColumnWindowData.aUIElementNames.push_back( rElement.m_aName );
-        rRowColumnWindowData.aRowColumnWindows.push_back( xWindow );
-        rRowColumnWindowData.aRowColumnSpace.push_back( nSpace );
-        rRowColumnWindowData.nVarSize += nSpace;
-    }
-}
-
-::Rectangle LayoutManager::implts_determineFrontDockingRect(
-    DockingArea            eDockingArea,
-    sal_Int32              nRowCol,
-    const ::Rectangle&     rDockedElementRect,
-    const ::rtl::OUString& rMovedElementName,
-    const ::Rectangle&     rMovedElementRect )
-{
-    SingleRowColumnWindowData aRowColumnWindowData;
-
-    sal_Bool bHorzDockArea = (( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                              ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
-
-    implts_getDockingAreaElementInfoOnSingleRowCol( eDockingArea, nRowCol, aRowColumnWindowData );
-    if ( aRowColumnWindowData.aRowColumnWindows.empty() )
-        return rMovedElementRect;
-    else
-    {
-        sal_Int32 nSpace( 0 );
-        ::Rectangle aFrontDockingRect( rMovedElementRect );
-        const sal_uInt32 nCount = aRowColumnWindowData.aRowColumnWindows.size();
-        for ( sal_uInt32 i = 0; i < nCount; i++ )
-        {
-            if ( bHorzDockArea )
-            {
-                if ( aRowColumnWindowData.aRowColumnWindowSizes[i].X >= rDockedElementRect.Left() )
-                {
-                    nSpace += aRowColumnWindowData.aRowColumnSpace[i];
-                    break;
-                }
-                else if ( aRowColumnWindowData.aUIElementNames[i] == rMovedElementName )
-                    nSpace += aRowColumnWindowData.aRowColumnWindowSizes[i].Width +
-                              aRowColumnWindowData.aRowColumnSpace[i];
-                else
-                    nSpace = 0;
-            }
-            else
-            {
-                if ( aRowColumnWindowData.aRowColumnWindowSizes[i].Y >= rDockedElementRect.Top() )
-                {
-                    nSpace += aRowColumnWindowData.aRowColumnSpace[i];
-                    break;
-                }
-                else if ( aRowColumnWindowData.aUIElementNames[i] == rMovedElementName )
-                    nSpace += aRowColumnWindowData.aRowColumnWindowSizes[i].Height +
-                              aRowColumnWindowData.aRowColumnSpace[i];
-                else
-                    nSpace = 0;
-            }
-        }
-
-        if ( nSpace > 0 )
-        {
-            sal_Int32 nMove = std::min( nSpace, static_cast<sal_Int32>(aFrontDockingRect.getWidth()) );
-            if ( bHorzDockArea )
-                aFrontDockingRect.Move( -nMove, 0 );
-            else
-                aFrontDockingRect.Move( 0, -nMove );
-        }
-
-        return aFrontDockingRect;
-    }
-}
-
-::Rectangle LayoutManager::implts_getWindowRectFromRowColumn(
-    ::com::sun::star::ui::DockingArea DockingArea,
-    const SingleRowColumnWindowData& rRowColumnWindowData,
-    const ::Point& rMousePos,
-    const rtl::OUString& rExcludeElementName )
-{
-    ::Rectangle aWinRect;
-
-    if (( DockingArea < DockingArea_DOCKINGAREA_TOP ) ||
-        ( DockingArea > DockingArea_DOCKINGAREA_RIGHT ))
-        DockingArea = DockingArea_DOCKINGAREA_TOP;
-
-    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
-        return aWinRect;
-    else
-    {
-        ReadGuard aReadLock( m_aLock );
-        Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow;
-        Reference< css::awt::XWindow > xDockingAreaWindow = m_xDockAreaWindows[DockingArea];
-        aReadLock.unlock();
-
-        // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
-        SolarMutexGuard aGuard;
-
-        // Retrieve output size from container Window
-        Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ));
-        Window* pDockingAreaWindow( VCLUnoHelper::GetWindow( xDockingAreaWindow ));
-        if ( pDockingAreaWindow && pContainerWindow )
-        {
-            const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindows.size();
-            for ( sal_uInt32 i = 0; i < nCount; i++ )
-            {
-                css::awt::Rectangle aWindowRect = rRowColumnWindowData.aRowColumnWindows[i]->getPosSize();
-                ::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height );
-                aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
-                if ( aRect.IsInside( rMousePos ))
-                {
-                    // Check if we have found the excluded element. If yes, we have to provide an empty rectangle.
-                    // We prevent that a toolbar cannot be moved when the mouse pointer is inside its own rectangle!
-                    if ( rExcludeElementName != rRowColumnWindowData.aUIElementNames[i] )
-                        return aRect;
-                    else
-                        break;
-                }
-            }
-        }
-    }
-
-    return aWinRect;
-}
-
-framework::LayoutManager::DockingOperation
-LayoutManager::implts_determineDockingOperation(
-    ::com::sun::star::ui::DockingArea DockingArea,
-    const ::Rectangle&                        rRowColRect,
-    const Point&                              rMousePos )
-{
-    const sal_Int32 nHorzVerticalRegionSize        = 6;
-    const sal_Int32 nHorzVerticalMoveRegion        = 4;
-
-    if ( rRowColRect.IsInside( rMousePos ))
-    {
-        if (( DockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-            ( DockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-        {
-            sal_Int32 nRegion = rRowColRect.getHeight() / nHorzVerticalRegionSize;
-            sal_Int32 nPosY   = rRowColRect.Top() + nRegion;
-
-            if ( rMousePos.Y() < nPosY )
-                return ( DockingArea == DockingArea_DOCKINGAREA_TOP ) ? DOCKOP_BEFORE_COLROW : DOCKOP_AFTER_COLROW;
-            else if ( rMousePos.Y() < ( nPosY + nRegion*nHorzVerticalMoveRegion ))
-                return DOCKOP_ON_COLROW;
-            else
-                return ( DockingArea == DockingArea_DOCKINGAREA_TOP ) ? DOCKOP_AFTER_COLROW : DOCKOP_BEFORE_COLROW;
-        }
-        else
-        {
-            sal_Int32 nRegion = rRowColRect.getWidth() / nHorzVerticalRegionSize;
-            sal_Int32 nPosX   = rRowColRect.Left() + nRegion;
-
-            if ( rMousePos.X() < nPosX )
-                return ( DockingArea == DockingArea_DOCKINGAREA_LEFT ) ? DOCKOP_BEFORE_COLROW : DOCKOP_AFTER_COLROW;
-            else if ( rMousePos.X() < ( nPosX + nRegion*nHorzVerticalMoveRegion ))
-                return DOCKOP_ON_COLROW;
-            else
-                return ( DockingArea == DockingArea_DOCKINGAREA_LEFT ) ? DOCKOP_AFTER_COLROW : DOCKOP_BEFORE_COLROW;
-        }
-    }
-    else
-        return DOCKOP_ON_COLROW;
-}
-
-::Rectangle LayoutManager::implts_calcTrackingAndElementRect(
-    ::com::sun::star::ui::DockingArea eDockingArea,
-    sal_Int32 nRowCol,
-    UIElement& rUIElement,
-    const ::Rectangle& rTrackingRect,
-    const ::Rectangle& rRowColumnRect,
-    const ::Size& rContainerWinSize )
-{
-    sal_Bool bHorizontalDockArea( ( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                                  ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
-
-    sal_Int32 nTopDockingAreaSize( implts_getTopBottomDockingAreaSizes().Width() );
-    sal_Int32 nBottomDockingAreaSize( implts_getTopBottomDockingAreaSizes().Height() );
-
-    ::Size  aStatusBarSize( implts_getStatusBarSize() );
-    sal_Int32 nMaxLeftRightDockAreaSize = rContainerWinSize.Height() -
-                                          nTopDockingAreaSize -
-                                          nBottomDockingAreaSize -
-                                          aStatusBarSize.Height();
-
-    ::Rectangle aTrackingRect( rTrackingRect );
-    if ( bHorizontalDockArea )
-    {
-        sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 )));
-        if (( nPosX + rTrackingRect.getWidth()) > rContainerWinSize.Width() )
-            nPosX = std::min( nPosX,
-                                std::max( sal_Int32( rContainerWinSize.Width() - rTrackingRect.getWidth() ),
-                                          sal_Int32( 0 )));
-
-        sal_Int32 nSize = std::min( rContainerWinSize.Width(), rTrackingRect.getWidth() );
-
-        aTrackingRect.SetPos( ::Point( nPosX, rRowColumnRect.Top() ));
-        aTrackingRect.setWidth( nSize );
-        aTrackingRect.setHeight( rRowColumnRect.getHeight() );
-
-        // Set virtual position
-        rUIElement.m_aDockedData.m_aPos.X() = nPosX;
-        rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
-    }
-    else
-    {
-        sal_Int32 nMaxDockingAreaHeight = std::max( sal_Int32( 0 ),
-                                                    sal_Int32( nMaxLeftRightDockAreaSize ));
-
-        sal_Int32 nPosY( std::max( sal_Int32( aTrackingRect.Top()), sal_Int32( nTopDockingAreaSize )));
-        if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight ))
-            nPosY = std::min( nPosY,
-                                std::max( sal_Int32( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() )),
-                                        sal_Int32( nTopDockingAreaSize )));
-
-        sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) );
-
-        aTrackingRect.SetPos( ::Point( rRowColumnRect.Left(), nPosY ));
-        aTrackingRect.setWidth( rRowColumnRect.getWidth() );
-        aTrackingRect.setHeight( nSize );
-
-        ReadGuard aReadLock( m_aLock );
-        Reference< css::awt::XWindow > xDockingAreaWindow = m_xDockAreaWindows[eDockingArea];
-        Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow;
-        aReadLock.unlock();
-
-        sal_Int32 nDockPosY( 0 );
-        Window* pDockingAreaWindow( 0 );
-        Window* pContainerWindow( 0 );
-        {
-            SolarMutexGuard aGuard;
-            pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
-            pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
-            nDockPosY = pDockingAreaWindow->ScreenToOutputPixel(
-                                pContainerWindow->OutputToScreenPixel( ::Point( 0, nPosY ))).Y();
-        }
-
-        // Set virtual position
-        rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
-        rUIElement.m_aDockedData.m_aPos.Y() = nDockPosY;
-    }
-
-    return aTrackingRect;
-}
-
-void implts_setTrackingRect( DockingArea eDockingArea, const Point& rMousePos, ::Rectangle& rTrackingRect )
-{
-    sal_Bool bHorizontalDockArea( ( eDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                                  ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
-
-    ::Point aPoint = rTrackingRect.TopLeft();
-    if ( bHorizontalDockArea )
-        aPoint.X() = rMousePos.X();
-    else
-        aPoint.Y() = rMousePos.Y();
-    rTrackingRect.SetPos( aPoint );
-}
-
-void LayoutManager::implts_calcDockingPosSize(
-    UIElement&          rUIElement,
-    DockingOperation&   rDockingOperation,
-    ::Rectangle&        rTrackingRect,
-    const Point&        rMousePos )
-{
-    ReadGuard aReadLock( m_aLock );
-    Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow;
-    ::Size                         aContainerWinSize;
-    Window* pContainerWindow( 0 );
-    aReadLock.unlock();
-
-    {
-        // Retrieve output size from container Window
-        SolarMutexGuard aGuard;
-        pContainerWindow  = VCLUnoHelper::GetWindow( xContainerWindow );
         aContainerWinSize = pContainerWindow->GetOutputSizePixel();
-    }
-
-    if ( !rUIElement.m_xUIElement.is() )
-    {
-        rTrackingRect = ::Rectangle();
-        return;
-    }
-
-    Window*                                 pDockWindow( 0 );
-    Window*                                 pDockingAreaWindow( 0 );
-    ToolBox*                                pToolBox( 0 );
-    Reference< css::awt::XWindow >          xWindow( rUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-    Reference< css::awt::XWindow >          xDockingAreaWindow;
-    ::Rectangle                             aTrackingRect( rTrackingRect );
-    ::com::sun::star::ui::DockingArea eDockedArea( (::com::sun::star::ui::DockingArea)rUIElement.m_aDockedData.m_nDockedArea );
-    sal_Int32                               nTopDockingAreaSize( implts_getTopBottomDockingAreaSizes().Width() );
-    sal_Int32                               nBottomDockingAreaSize( implts_getTopBottomDockingAreaSizes().Height() );
-    sal_Bool                                bHorizontalDockArea( ( eDockedArea == DockingArea_DOCKINGAREA_TOP ) ||
-                                                                 ( eDockedArea == DockingArea_DOCKINGAREA_BOTTOM ));
-    ::Size                                  aStatusBarSize( implts_getStatusBarSize() );
-    sal_Int32                               nMaxLeftRightDockAreaSize = aContainerWinSize.Height() -
-                                                                        nTopDockingAreaSize -
-                                                                        nBottomDockingAreaSize -
-                                                                        aStatusBarSize.Height();
-    ::Rectangle                             aDockingAreaRect;
-
-    aReadLock.lock();
-    xDockingAreaWindow = m_xDockAreaWindows[eDockedArea];
-    aReadLock.unlock();
-
-    {
-        SolarMutexGuard aGuard;
-        pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
-        pDockWindow        = VCLUnoHelper::GetWindow( xWindow );
-        if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX )
-            pToolBox = (ToolBox *)pDockWindow;
-
-        aDockingAreaRect = ::Rectangle( pDockingAreaWindow->GetPosPixel(), pDockingAreaWindow->GetSizePixel() );
-        if ( pToolBox )
-        {
-            // docked toolbars always have one line
-            ::Size aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( sal_Int16( eDockedArea )) );
-            aTrackingRect.SetSize( ::Size( aSize.Width(), aSize.Height() ));
-        }
-    }
-
-    // default docking operation, dock on the given row/column
-    sal_Bool                                 bOpOutsideOfDockingArea( !aDockingAreaRect.IsInside( rMousePos ));
-    std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
-
-    rDockingOperation = DOCKOP_ON_COLROW;
-    implts_getDockingAreaElementInfos( eDockedArea, aRowColumnsWindowData );
-
-    // determine current first row/column and last row/column
-    sal_Int32 nMaxRowCol( -1 );
-    sal_Int32 nMinRowCol( SAL_MAX_INT32 );
-    const sal_uInt32 nCount = aRowColumnsWindowData.size();
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        if ( aRowColumnsWindowData[i].nRowColumn > nMaxRowCol )
-            nMaxRowCol = aRowColumnsWindowData[i].nRowColumn;
-        if ( aRowColumnsWindowData[i].nRowColumn < nMinRowCol )
-            nMinRowCol = aRowColumnsWindowData[i].nRowColumn;
-    }
-
-    if ( !bOpOutsideOfDockingArea )
-    {
-        // docking inside our docking area
-        sal_Int32   nIndex( -1 );
-        sal_Int32   nRowCol( -1 );
-        ::Rectangle aWindowRect;
-        ::Rectangle aRowColumnRect;
-
-        const sal_uInt32 nWindowDataCount = aRowColumnsWindowData.size();
-        for ( sal_uInt32 i = 0; i < nWindowDataCount; i++ )
-        {
-            ::Rectangle aRect( aRowColumnsWindowData[i].aRowColumnRect.X,
-                               aRowColumnsWindowData[i].aRowColumnRect.Y,
-                               aRowColumnsWindowData[i].aRowColumnRect.X + aRowColumnsWindowData[i].aRowColumnRect.Width,
-                               aRowColumnsWindowData[i].aRowColumnRect.Y + aRowColumnsWindowData[i].aRowColumnRect.Height );
-
-            {
-                // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
-                SolarMutexGuard aGuard;
-                aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
-            }
-
-            sal_Bool bIsInsideRowCol( aRect.IsInside( rMousePos ) );
-            if ( bIsInsideRowCol )
-            {
-                nIndex            = i;
-                nRowCol           = aRowColumnsWindowData[i].nRowColumn;
-                rDockingOperation = implts_determineDockingOperation( eDockedArea, aRect, rMousePos );
-                aWindowRect       = implts_getWindowRectFromRowColumn( eDockedArea, aRowColumnsWindowData[i], rMousePos, rUIElement.m_aName );
-                aRowColumnRect    = aRect;
-                break;
-            }
-        }
-
-        OSL_ENSURE( ( nIndex >= 0 ) && ( nRowCol >= 0 ), "Impossible case - no row/column found but mouse pointer is inside our docking area" );
-        if (( nIndex >= 0 ) && ( nRowCol >= 0 ))
-        {
-            if ( rDockingOperation == DOCKOP_ON_COLROW )
-            {
-                if ( !aWindowRect.IsEmpty())
-                {
-                    // Tracking rect is on a row/column and mouse is over a docked toolbar.
-                    // Determine if the tracking rect must be located before/after the docked toolbar.
-
-                    ::Rectangle aUIElementRect( aWindowRect );
-                    sal_Int32   nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getWidth() / 2 ) :
-                                                               ( aWindowRect.Top() + aWindowRect.getHeight() / 2 ));
-                    sal_Bool    bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle ));
-                    if ( bInsertBefore )
-                    {
-                        if ( bHorizontalDockArea )
-                        {
-                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( aContainerWinSize.Width() -  aWindowRect.Left() ),
-                                                                                    sal_Int32( aTrackingRect.getWidth() )));
-                            if ( nSize == 0 )
-                                nSize = aWindowRect.getWidth();
-
-                            aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() ));
-                            aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect,rUIElement.m_aName, aUIElementRect );
-
-                            // Set virtual position
-                            rUIElement.m_aDockedData.m_aPos.X() = aWindowRect.Left();
-                            rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
-                        }
-                        else
-                        {
-                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32(
-                                                    nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Top() ),
-                                                    sal_Int32( aTrackingRect.getHeight() )));
-                            if ( nSize == 0 )
-                                nSize = aWindowRect.getHeight();
-
-                            aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize ));
-                            aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect, rUIElement.m_aName, aUIElementRect );
-
-                            // Set virtual position
-                            sal_Int32 nPosY = pDockingAreaWindow->ScreenToOutputPixel(
-                                                pContainerWindow->OutputToScreenPixel( aWindowRect.TopLeft() )).Y();
-                            rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
-                            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
-                        }
-
-                        rTrackingRect = aWindowRect;
-                        return;
-                    }
-                    else
-                    {
-                        if ( bHorizontalDockArea )
-                        {
-                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32(( aContainerWinSize.Width() ) - aWindowRect.Right() ),
-                                                                                    sal_Int32( aTrackingRect.getWidth() )));
-                            if ( nSize == 0 )
-                            {
-                                aUIElementRect.SetPos( ::Point( aContainerWinSize.Width() - aTrackingRect.getWidth(), aWindowRect.Top() ));
-                                aUIElementRect.SetSize( ::Size( aTrackingRect.getWidth(), aWindowRect.getHeight() ));
-                                rUIElement.m_aDockedData.m_aPos.X() = aUIElementRect.Left();
-                            }
-                            else
-                            {
-                                aUIElementRect.SetPos( ::Point( aWindowRect.Right(), aWindowRect.Top() ));
-                                aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() ));
-                                rUIElement.m_aDockedData.m_aPos.X() = aWindowRect.Right();
-                            }
-
-                            // Set virtual position
-                            rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
-                        }
-                        else
-                        {
-                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Bottom() ),
-                                                                                    sal_Int32( aTrackingRect.getHeight() )));
-                            aUIElementRect.SetPos( ::Point( aWindowRect.Left(), aWindowRect.Bottom() ));
-                            aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize ));
-
-                            // Set virtual position
-                            sal_Int32 nPosY( 0 );
-                            {
-                                SolarMutexGuard aGuard;
-                                nPosY = pDockingAreaWindow->ScreenToOutputPixel(
-                                                    pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y();
-                            }
-                            rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
-                            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
-                        }
-
-                        rTrackingRect = aUIElementRect;
-                        return;
-                    }
-                }
-                else
-                {
-                    implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
-                    rTrackingRect = implts_calcTrackingAndElementRect(
-                                        eDockedArea, nRowCol, rUIElement,
-                                        aTrackingRect, aRowColumnRect, aContainerWinSize );
-                    return;
-                }
-            }
-            else
-            {
-                if ((( nRowCol == nMinRowCol ) && ( rDockingOperation == DOCKOP_BEFORE_COLROW )) ||
-                    (( nRowCol == nMaxRowCol ) && ( rDockingOperation == DOCKOP_AFTER_COLROW  )))
-                    bOpOutsideOfDockingArea = sal_True;
-                else
-                {
-                    // handle docking before/after a row
-                    implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
-                    rTrackingRect = implts_calcTrackingAndElementRect(
-                                        eDockedArea, nRowCol, rUIElement,
-                                        aTrackingRect, aRowColumnRect, aContainerWinSize );
-
-                    sal_Int32 nOffsetX( 0 );
-                    sal_Int32 nOffsetY( 0 );
-                    if ( bHorizontalDockArea )
-                        nOffsetY = sal_Int32( floor( aRowColumnRect.getHeight() / 2 + 0.5 ));
-                    else
-                        nOffsetX = sal_Int32( floor( aRowColumnRect.getWidth() / 2 + 0.5 ));
-
-                    if ( rDockingOperation == DOCKOP_BEFORE_COLROW )
-                    {
-                        if (( eDockedArea == DockingArea_DOCKINGAREA_TOP ) ||
-                            ( eDockedArea == DockingArea_DOCKINGAREA_LEFT ))
-                        {
-                            // Docking before/after means move track rectangle half column/row.
-                            // As left and top are ordered 0...n instead of right and bottom
-                            // which uses n...0, we have to use negative values for top/left.
-                            nOffsetX *= -1;
-                            nOffsetY *= -1;
-                        }
-                    }
-                    else
-                    {
-                        if (( eDockedArea == DockingArea_DOCKINGAREA_BOTTOM ) ||
-                            ( eDockedArea == DockingArea_DOCKINGAREA_RIGHT ))
-                        {
-                            // Docking before/after means move track rectangle half column/row.
-                            // As left and top are ordered 0...n instead of right and bottom
-                            // which uses n...0, we have to use negative values for top/left.
-                            nOffsetX *= -1;
-                            nOffsetY *= -1;
-                        }
-                        nRowCol++;
-                    }
-
-                    if ( bHorizontalDockArea )
-                        rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
-                    else
-                        rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
-
-                    rTrackingRect.Move( nOffsetX, nOffsetY );
-                    rTrackingRect.SetSize( aTrackingRect.GetSize() );
-                }
-            }
-        }
-    }
-
-    // Docking outside of our docking window area =>
-    // Users want to dock before/after first/last docked element or to an empty docking area
-    if ( bOpOutsideOfDockingArea )
-    {
-        // set correct size for docking
-        implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
-        rTrackingRect = aTrackingRect;
-
-        if ( bHorizontalDockArea )
-        {
-            sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 )));
-            if (( nPosX + rTrackingRect.getWidth()) > aContainerWinSize.Width() )
-                nPosX = std::min( nPosX,
-                                std::max( sal_Int32( aContainerWinSize.Width() - rTrackingRect.getWidth() ),
-                                          sal_Int32( 0 )));
-
-            sal_Int32 nSize = std::min( aContainerWinSize.Width(), rTrackingRect.getWidth() );
-            sal_Int32 nDockHeight = std::max( static_cast<sal_Int32>(aDockingAreaRect.getHeight()), sal_Int32( 0 ));
-            if ( nDockHeight == 0 )
-            {
-                sal_Int32 nPosY( std::max( aDockingAreaRect.Top(), aDockingAreaRect.Bottom() ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_BOTTOM )
-                    nPosY -= rTrackingRect.getHeight();
-                rTrackingRect.SetPos( Point( nPosX, nPosY ));
-                rUIElement.m_aDockedData.m_aPos.Y() = 0;
-            }
-            else if ( rMousePos.Y() < ( aDockingAreaRect.Top() + ( nDockHeight / 2 )))
-            {
-                rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Top() - rTrackingRect.getHeight() ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_TOP )
-                    rUIElement.m_aDockedData.m_aPos.Y() = 0;
-                else
-                    rUIElement.m_aDockedData.m_aPos.Y() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
-                rDockingOperation = DOCKOP_BEFORE_COLROW;
-            }
-            else
-            {
-                rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Bottom() ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_TOP )
-                    rUIElement.m_aDockedData.m_aPos.Y() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
-                else
-                    rUIElement.m_aDockedData.m_aPos.Y() = 0;
-                rDockingOperation = DOCKOP_AFTER_COLROW;
-            }
-            rTrackingRect.setWidth( nSize );
-
-            {
-                SolarMutexGuard aGuard;
-                nPosX = pDockingAreaWindow->ScreenToOutputPixel(
-                                    pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X();
-            }
-            rUIElement.m_aDockedData.m_aPos.X() = nPosX;
-        }
-        else
-        {
-            sal_Int32 nMaxDockingAreaHeight = std::max( sal_Int32( 0 ),
-                                                        sal_Int32( nMaxLeftRightDockAreaSize ));
-
-            sal_Int32 nPosY( std::max( sal_Int32( aTrackingRect.Top()), sal_Int32( nTopDockingAreaSize )));
-            if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight ))
-                nPosY = std::min( nPosY,
-                                std::max( sal_Int32( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() )),
-                                        sal_Int32( nTopDockingAreaSize )));
-
-            sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) );
-            sal_Int32 nDockWidth = std::max( static_cast<sal_Int32>(aDockingAreaRect.getWidth()), sal_Int32( 0 ));
-            if ( nDockWidth == 0 )
-            {
-                sal_Int32 nPosX( std::max( aDockingAreaRect.Left(), aDockingAreaRect.Right() ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_RIGHT )
-                    nPosX -= rTrackingRect.getWidth();
-                rTrackingRect.SetPos( Point( nPosX, nPosY ));
-                rUIElement.m_aDockedData.m_aPos.X() = 0;
-            }
-            else if ( rMousePos.X() < ( aDockingAreaRect.Left() + ( nDockWidth / 2 )))
-            {
-                rTrackingRect.SetPos( Point( aDockingAreaRect.Left() - rTrackingRect.getWidth(), nPosY ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_LEFT )
-                    rUIElement.m_aDockedData.m_aPos.X() = 0;
-                else
-                    rUIElement.m_aDockedData.m_aPos.X() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
-                rDockingOperation = DOCKOP_BEFORE_COLROW;
-            }
-            else
-            {
-                rTrackingRect.SetPos( Point( aDockingAreaRect.Right(), nPosY ));
-                if ( eDockedArea == DockingArea_DOCKINGAREA_LEFT )
-                    rUIElement.m_aDockedData.m_aPos.X() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
-                else
-                    rUIElement.m_aDockedData.m_aPos.X() = 0;
-                rDockingOperation = DOCKOP_AFTER_COLROW;
-            }
-            rTrackingRect.setHeight( nSize );
-
-            {
-                SolarMutexGuard aGuard;
-                nPosY = pDockingAreaWindow->ScreenToOutputPixel(
-                                    pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y();
-            }
-            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
-        }
-    }
-}
-
-void LayoutManager::implts_renumberRowColumnData(
-    ::com::sun::star::ui::DockingArea eDockingArea,
-    DockingOperation /*eDockingOperation*/,
-    const UIElement& rUIElement )
-{
-    ReadGuard aReadLock( m_aLock );
-    Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
-    aReadLock.unlock();
-
-    sal_Bool  bHorzDockingArea(( eDockingArea == DockingArea_DOCKINGAREA_TOP    ) ||
-                               ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ));
-    sal_Int32 nRowCol( bHorzDockingArea ? rUIElement.m_aDockedData.m_aPos.Y() :
-                                          rUIElement.m_aDockedData.m_aPos.X() );
-
-    WriteGuard aWriteLock( m_aLock );
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) &&
-            ( pIter->m_aName != rUIElement.m_aName ))
-        {
-            // Don't change toolbars without a valid docking position!
-            if (( pIter->m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) &&
-                ( pIter->m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
-                continue;
-
-            sal_Int32 nWindowRowCol = ( bHorzDockingArea ) ?
-                pIter->m_aDockedData.m_aPos.Y() : pIter->m_aDockedData.m_aPos.X();
-            if ( nWindowRowCol >= nRowCol )
-            {
-                if ( bHorzDockingArea )
-                    pIter->m_aDockedData.m_aPos.Y() += 1;
-                else
-                    pIter->m_aDockedData.m_aPos.X() += 1;
-            }
-        }
-    }
-    aWriteLock.unlock();
-
-    // We have to change the persistent window state part
-    if ( xPersistentWindowState.is() )
-    {
-        try
-        {
-            Sequence< rtl::OUString > aWindowElements = xPersistentWindowState->getElementNames();
-            for ( sal_Int32 i = 0; i < aWindowElements.getLength(); i++ )
-            {
-                if ( rUIElement.m_aName != aWindowElements[i] )
-                {
-                    try
-                    {
-                        Sequence< PropertyValue > aPropValueSeq;
-                        css::awt::Point           aDockedPos;
-                        DockingArea               nDockedArea( DockingArea_DOCKINGAREA_DEFAULT );
-
-                        xPersistentWindowState->getByName( aWindowElements[i] ) >>= aPropValueSeq;
-                        for ( sal_Int32 j = 0; j < aPropValueSeq.getLength(); j++ )
-                        {
-                            if ( aPropValueSeq[j].Name == m_aPropDockingArea )
-                                aPropValueSeq[j].Value >>= nDockedArea;
-                            else if ( aPropValueSeq[j].Name == m_aPropDockPos )
-                                aPropValueSeq[j].Value >>= aDockedPos;
-                        }
-
-                        // Don't change toolbars without a valid docking position!
-                        if (( aDockedPos.X == SAL_MAX_INT32 ) && ( aDockedPos.Y == SAL_MAX_INT32 ))
-                            continue;
-
-                        sal_Int32 nWindowRowCol = ( bHorzDockingArea ) ? aDockedPos.Y : aDockedPos.X;
-                        if (( nDockedArea == eDockingArea ) && ( nWindowRowCol >= nRowCol ))
-                        {
-                            if ( bHorzDockingArea )
-                                aDockedPos.Y += 1;
-                            else
-                                aDockedPos.X += 1;
-
-                            Reference< XNameReplace > xReplace( xPersistentWindowState, UNO_QUERY );
-                            xReplace->replaceByName( aWindowElements[i], makeAny( aPropValueSeq ));
-                        }
-                    }
-                    catch ( Exception& )
-                    {
-                    }
-                }
-            }
-        }
-        catch ( Exception& )
-        {
-        }
-    }
-}
-
-::Size LayoutManager::implts_getTopBottomDockingAreaSizes()
-{
-    ::Size                         aSize;
-    Reference< css::awt::XWindow > xTopDockingAreaWindow;
-    Reference< css::awt::XWindow > xBottomDockingAreaWindow;
-
-    ReadGuard aReadLock( m_aLock );
-    xTopDockingAreaWindow       = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-    xBottomDockingAreaWindow    = m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM];
-    aReadLock.unlock();
-
-    if ( xTopDockingAreaWindow.is() )
-        aSize.Width() = xTopDockingAreaWindow->getPosSize().Height;
-    if ( xBottomDockingAreaWindow.is() )
-        aSize.Height() = xBottomDockingAreaWindow->getPosSize().Height;
-
-    return aSize;
+    
+    return aContainerWinSize;
 }
 
 Reference< XUIElement > LayoutManager::implts_createElement( const rtl::OUString& aName )
 {
-    Reference< ::com::sun::star::ui::XUIElement > xUIElement;
+    Reference< ui::XUIElement > xUIElement;
 
     ReadGuard   aReadLock( m_aLock );
     Sequence< PropertyValue > aPropSeq( 2 );
@@ -3048,121 +750,39 @@ Reference< XUIElement > LayoutManager::implts_createElement( const rtl::OUString
     {
         xUIElement = m_xUIElementFactoryManager->createUIElement( aName, aPropSeq );
     }
-    catch ( NoSuchElementException& )
-    {
-    }
-    catch ( IllegalArgumentException& )
-    {
-    }
+    catch ( NoSuchElementException& ) {}
+    catch ( IllegalArgumentException& ) {}
 
     return xUIElement;
 }
 
-Reference< css::awt::XWindowPeer > LayoutManager::implts_createToolkitWindow( const Reference< css::awt::XWindowPeer >& rParent )
-{
-    Reference< css::awt::XWindowPeer > xPeer;
-    css::uno::Reference< css::awt::XToolkit > xToolkit( m_xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), css::uno::UNO_QUERY );
-    if ( xToolkit.is() )
-    {
-        // describe window properties.
-        css::awt::WindowDescriptor aDescriptor;
-        aDescriptor.Type                =   css::awt::WindowClass_SIMPLE                                                  ;
-        aDescriptor.WindowServiceName   =   DECLARE_ASCII("dockingarea")                                                  ;
-        aDescriptor.ParentIndex         =   -1                                                                            ;
-        aDescriptor.Parent              =   css::uno::Reference< css::awt::XWindowPeer >( rParent, UNO_QUERY )            ;
-        aDescriptor.Bounds              =   css::awt::Rectangle(0,0,0,0)                                                  ;
-        aDescriptor.WindowAttributes    =   0                                                                             ;
-
-        // create a docking area window
-        xPeer = xToolkit->createWindow( aDescriptor );
-    }
-
-    return xPeer;
-}
-
 void LayoutManager::implts_setVisibleState( sal_Bool bShow )
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-        pIter->m_bMasterHide = !bShow;
     m_aStatusBarElement.m_bMasterHide = !bShow;
     aWriteLock.unlock();
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     implts_updateUIElementsVisibleState( bShow );
-    //implts_doLayout( sal_False );
 }
 
 void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
 {
     // notify listeners
-    css::uno::Any a;
+    uno::Any a;
     if ( bSetVisible )
-        implts_notifyListeners( css::frame::LayoutManagerEvents::VISIBLE, a );
+        implts_notifyListeners( frame::LayoutManagerEvents::VISIBLE, a );
     else
-        implts_notifyListeners( css::frame::LayoutManagerEvents::INVISIBLE, a );
-    std::vector< Reference< css::awt::XWindow > > aWinVector;
-    sal_Bool bOld;
-
-    {
-        WriteGuard aWriteLock( m_aLock );
-        m_bDoLayout = sal_True;
-        bOld = m_bDoLayout;
-    }
-
-    ReadGuard aReadLock( m_aLock );
-    aWinVector.reserve(m_aUIElements.size());
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_xUIElement.is() )
-        {
-            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xWindow.is() )
-            {
-                if ( bSetVisible )
-                {
-                    if ( pIter->m_bVisible && !pIter->m_bMasterHide )
-                        aWinVector.push_back( xWindow );
-                }
-                else
-                    aWinVector.push_back( xWindow );
-            }
-        }
-    }
-
-    aReadLock.unlock();
-
-    try
-    {
-        SolarMutexGuard aGuard;
-        const sal_uInt32 nCount = aWinVector.size();
-        for ( sal_uInt32 i = 0; i < nCount; i++ )
-        {
-            Reference< css::awt::XWindow > xWindow( aWinVector[i] );
-            if ( xWindow.is() )
-            {
-                // we need VCL here to pass special flags to Show()
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if( pWindow )
-                    pWindow->Show( bSetVisible, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-            }
-        }
-    }
-    catch ( DisposedException& )
-    {
-    }
+        implts_notifyListeners( frame::LayoutManagerEvents::INVISIBLE, a );
+    std::vector< Reference< awt::XWindow > > aWinVector;
 
-    // Hide/show menubar according to bSetVisible
-    aReadLock.lock();
-    Reference< XUIElement > xMenuBar( m_xMenuBar, UNO_QUERY );
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
-    Reference< XComponent > xInplaceMenuBar( m_xInplaceMenuBar );
-    MenuBarManager*	pInplaceMenuBar( m_pInplaceMenuBar );
-    aReadLock.unlock();
+    WriteGuard aWriteLock( m_aLock );
+    Reference< XUIElement >   xMenuBar( m_xMenuBar, UNO_QUERY );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
+    Reference< XComponent >   xInplaceMenuBar( m_xInplaceMenuBar );
+    MenuBarManager*           pInplaceMenuBar( m_pInplaceMenuBar );
+    aWriteLock.unlock();
 
+    bool bMustDoLayout(false);
     if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() )
     {
         SolarMutexGuard aGuard;
@@ -3176,103 +796,59 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
             pMenuBar = (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar();
         }
 
-        Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
-        while ( pWindow && !pWindow->IsSystemWindow() )
-            pWindow = pWindow->GetParent();
-
-        if ( pWindow )
+        SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
+        if ( pSysWindow )
         {
-            SystemWindow* pSysWindow = (SystemWindow *)pWindow;
             if ( bSetVisible )
                 pSysWindow->SetMenuBar( pMenuBar );
             else
                 pSysWindow->SetMenuBar( 0 );
+            bMustDoLayout = true;
         }
     }
 
     // Hide/show the statusbar according to bSetVisible
     if ( bSetVisible )
-        implts_showStatusBar();
+        bMustDoLayout = !implts_showStatusBar();
     else
-        implts_hideStatusBar();
+        bMustDoLayout = !implts_hideStatusBar();
 
-    if ( !bOld )
-    {
-        WriteGuard aWriteLock( m_aLock );
-        m_bDoLayout = sal_False;
-    }
+    aWriteLock.lock();
+    uno::Reference< ui::XUIConfigurationListener > xThis( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
+    aWriteLock.unlock();
 
-    if ( bSetVisible )
-    {
-        implts_createNonContextSensitiveToolBars();
-        implts_doLayout_notify( sal_False );
-    }
-    else
+    if ( pToolbarManager )
     {
-        // Set docking area window size to zero
-        ReadGuard aReadLock2( m_aLock );
-        Reference< css::awt::XWindow > xTopDockingWindow    = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-        Reference< css::awt::XWindow > xLeftDockingWindow   = m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT];
-        Reference< css::awt::XWindow > xRightDockingWindow  = m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT];
-        Reference< css::awt::XWindow > xBottomDockingWindow = m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM];
-        aReadLock2.unlock();
-
-        try
-        {
-            if ( xTopDockingWindow.is() )
-                xTopDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-            if ( xLeftDockingWindow.is() )
-                xLeftDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-            if ( xRightDockingWindow.is() )
-                xRightDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-            if ( xBottomDockingWindow.is() )
-                xBottomDockingWindow->setPosSize( 0, 0, 0, 0, css::awt::PosSize::POSSIZE );
-
-            WriteGuard aWriteLock( m_aLock );
-            m_aDockingArea = css::awt::Rectangle();
-            m_bMustDoLayout = sal_True;
-            aWriteLock.unlock();
-        }
-        catch ( Exception& )
-        {
-        }
+        pToolbarManager->setVisible( bSetVisible );
+        bMustDoLayout = pToolbarManager->isLayoutDirty();
     }
+    
+    if ( bMustDoLayout )
+        implts_doLayout_notify( sal_False );
 }
 
 void LayoutManager::implts_setCurrentUIVisibility( sal_Bool bShow )
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( !bShow && pIter->m_bVisible && pIter->m_xUIElement.is() )
-            pIter->m_bMasterHide = true;
-        else if ( bShow && pIter->m_bMasterHide )
-            pIter->m_bMasterHide = false;
-    }
-
     if ( !bShow && m_aStatusBarElement.m_bVisible && m_aStatusBarElement.m_xUIElement.is() )
         m_aStatusBarElement.m_bMasterHide = true;
     else if ( bShow && m_aStatusBarElement.m_bVisible )
         m_aStatusBarElement.m_bMasterHide = false;
     aWriteLock.unlock();
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     implts_updateUIElementsVisibleState( bShow );
 }
 
 void LayoutManager::implts_destroyStatusBar()
 {
-     Reference< XComponent > xCompStatusBar;
+    Reference< XComponent > xCompStatusBar;
 
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     m_aStatusBarElement.m_aName = rtl::OUString();
     xCompStatusBar = Reference< XComponent >( m_aStatusBarElement.m_xUIElement, UNO_QUERY );
     m_aStatusBarElement.m_xUIElement.clear();
     aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     if ( xCompStatusBar.is() )
         xCompStatusBar->dispose();
@@ -3282,7 +858,6 @@ void LayoutManager::implts_destroyStatusBar()
 
 void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     if ( !m_aStatusBarElement.m_xUIElement.is() )
     {
@@ -3290,14 +865,13 @@ void LayoutManager::implts_createStatusBar( const rtl::OUString& aStatusBarName
         m_aStatusBarElement.m_aName      = aStatusBarName;
         m_aStatusBarElement.m_xUIElement = implts_createElement( aStatusBarName );
     }
+    aWriteLock.unlock();
 
     implts_createProgressBar();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 }
 
 void LayoutManager::implts_readStatusBarState( const rtl::OUString& rStatusBarName )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     if ( !m_aStatusBarElement.m_bStateRead )
     {
@@ -3305,17 +879,15 @@ void LayoutManager::implts_readStatusBarState( const rtl::OUString& rStatusBarNa
         if ( implts_readWindowStateData( rStatusBarName, m_aStatusBarElement ))
             m_aStatusBarElement.m_bStateRead = sal_True;
     }
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 }
 
 void LayoutManager::implts_createProgressBar()
 {
-     Reference< XUIElement > xStatusBar;
+    Reference< XUIElement > xStatusBar;
     Reference< XUIElement > xProgressBar;
     Reference< XUIElement > xProgressBarBackup;
-    Reference< css::awt::XWindow > xContainerWindow;
+    Reference< awt::XWindow > xContainerWindow;
 
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     xStatusBar = Reference< XUIElement >( m_aStatusBarElement.m_xUIElement, UNO_QUERY );
     xProgressBar = Reference< XUIElement >( m_aProgressBarElement.m_xUIElement, UNO_QUERY );
@@ -3323,7 +895,6 @@ void LayoutManager::implts_createProgressBar()
     m_xProgressBarBackup.clear();
     xContainerWindow = m_xContainerWindow;
     aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     sal_Bool            bRecycled = xProgressBarBackup.is();
     ProgressBarWrapper* pWrapper  = 0;
@@ -3336,12 +907,12 @@ void LayoutManager::implts_createProgressBar()
 
     if ( xStatusBar.is() )
     {
-        Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
+        Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
         pWrapper->setStatusBar( xWindow );
     }
     else
     {
-        Reference< css::awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar();
+        Reference< awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar();
 
         SolarMutexGuard aGuard;
         Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow );
@@ -3351,7 +922,7 @@ void LayoutManager::implts_createProgressBar()
             if ( pWindow )
             {
                 StatusBar* pStatusBar = new StatusBar( pWindow, WinBits( WB_LEFT | WB_3DLOOK ) );
-                Reference< css::awt::XWindow > xStatusBarWindow2( VCLUnoHelper::GetInterface( pStatusBar ));
+                Reference< awt::XWindow > xStatusBarWindow2( VCLUnoHelper::GetInterface( pStatusBar ));
                 pWrapper->setStatusBar( xStatusBarWindow2, sal_True );
             }
         }
@@ -3388,7 +959,7 @@ void LayoutManager::implts_backupProgressBarWrapper()
     {
         ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)m_xProgressBarBackup.get();
         if ( pWrapper )
-            pWrapper->setStatusBar( Reference< css::awt::XWindow >(), sal_False );
+            pWrapper->setStatusBar( Reference< awt::XWindow >(), sal_False );
     }
 
     // prevent us from dispose() the m_aProgressBarElement.m_xUIElement inside implts_reset()
@@ -3409,9 +980,9 @@ void LayoutManager::implts_destroyProgressBar()
 
 void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Size& rSize )
 {
-     Reference< XUIElement > xStatusBar;
+    Reference< XUIElement > xStatusBar;
     Reference< XUIElement > xProgressBar;
-    Reference< css::awt::XWindow > xContainerWindow;
+    Reference< awt::XWindow > xContainerWindow;
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
@@ -3419,9 +990,9 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
     xProgressBar = Reference< XUIElement >( m_aProgressBarElement.m_xUIElement, UNO_QUERY );
     xContainerWindow = m_xContainerWindow;
 
-    Reference< css::awt::XWindow > xWindow;
+    Reference< awt::XWindow > xWindow;
     if ( xStatusBar.is() )
-        xWindow = Reference< css::awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
+        xWindow = Reference< awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
     else if ( xProgressBar.is() )
     {
         ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
@@ -3448,9 +1019,9 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
 
 sal_Bool LayoutManager::implts_showProgressBar()
 {
-     Reference< XUIElement > xStatusBar;
+    Reference< XUIElement > xStatusBar;
     Reference< XUIElement > xProgressBar;
-    Reference< css::awt::XWindow > xWindow;
+    Reference< awt::XWindow > xWindow;
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
@@ -3463,7 +1034,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
     {
         if ( xStatusBar.is() && !m_aStatusBarElement.m_bMasterHide )
         {
-            xWindow = Reference< css::awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
+            xWindow = Reference< awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
         }
         else if ( xProgressBar.is() )
         {
@@ -3473,6 +1044,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
         }
     }
     aWriteLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     SolarMutexGuard aGuard;
     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
@@ -3480,6 +1052,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
     {
         if ( !pWindow->IsVisible() )
         {
+            implts_setOffset( pWindow->GetSizePixel().Height() );
             pWindow->Show();
             implts_doLayout_notify( sal_False );
         }
@@ -3492,7 +1065,7 @@ sal_Bool LayoutManager::implts_showProgressBar()
 sal_Bool LayoutManager::implts_hideProgressBar()
 {
     Reference< XUIElement > xProgressBar;
-    Reference< css::awt::XWindow > xWindow;
+    Reference< awt::XWindow > xWindow;
     sal_Bool bHideStatusBar( sal_False );
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -3502,25 +1075,26 @@ sal_Bool LayoutManager::implts_hideProgressBar()
     sal_Bool bInternalStatusBar( sal_False );
     if ( xProgressBar.is() )
     {
-        Reference< css::awt::XWindow > xStatusBar;
+        Reference< awt::XWindow > xStatusBar;
         ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
         if ( pWrapper )
             xWindow = pWrapper->getStatusBar();
-        Reference< css::ui::XUIElement > xStatusBarElement = m_aStatusBarElement.m_xUIElement;
+        Reference< ui::XUIElement > xStatusBarElement = m_aStatusBarElement.m_xUIElement;
         if ( xStatusBarElement.is() )
-            xStatusBar = Reference< css::awt::XWindow >( xStatusBarElement->getRealInterface(), UNO_QUERY );
+            xStatusBar = Reference< awt::XWindow >( xStatusBarElement->getRealInterface(), UNO_QUERY );
         bInternalStatusBar = xStatusBar != xWindow;
     }
     m_aProgressBarElement.m_bVisible = sal_False;
     implts_readStatusBarState( m_aStatusBarAlias );
     bHideStatusBar = !m_aStatusBarElement.m_bVisible;
     aWriteLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     SolarMutexGuard aGuard;
     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-    if ( pWindow && pWindow->IsVisible() &&
-         ( bHideStatusBar || bInternalStatusBar ))
+    if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar ))
     {
+        implts_setOffset( 0 );
         pWindow->Hide();
         implts_doLayout_notify( sal_False );
         return sal_True;
@@ -3531,23 +1105,23 @@ sal_Bool LayoutManager::implts_hideProgressBar()
 
 sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    Reference< css::ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
+    Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
     if ( bStoreState )
         m_aStatusBarElement.m_bVisible = sal_True;
     aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     if ( xStatusBar.is() )
     {
-        Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
+        Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
 
         SolarMutexGuard aGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && !pWindow->IsVisible() )
         {
+            implts_setOffset( pWindow->GetSizePixel().Height() );
             pWindow->Show();
+            implts_doLayout_notify( sal_False );
             return sal_True;
         }
     }
@@ -3557,23 +1131,23 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState )
 
 sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    Reference< css::ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
+    Reference< ui::XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
     if ( bStoreState )
         m_aStatusBarElement.m_bVisible = sal_False;
     aWriteLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     if ( xStatusBar.is() )
     {
-        Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
+        Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
 
         SolarMutexGuard aGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->IsVisible() )
         {
+            implts_setOffset( 0 );
             pWindow->Hide();
+            implts_doLayout_notify( sal_False );
             return sal_True;
         }
     }
@@ -3581,14 +1155,26 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState )
     return sal_False;
 }
 
+void LayoutManager::implts_setOffset( const sal_Int32 nBottomOffset )
+{
+    ::Rectangle aOffsetRect;
+    setZeroRectangle( aOffsetRect );
+    aOffsetRect.setHeight( nBottomOffset );
+    
+    // make sure that the toolbar manager refernence/pointer is valid
+    uno::Reference< ui::XUIConfigurationListener > xThis( m_xToolbarManager );
+    if ( xThis.is() )
+        m_pToolbarManager->setDockingAreaOffsets( aOffsetRect );
+}
+
 void LayoutManager::implts_setInplaceMenuBar( const Reference< XIndexAccess >& xMergedMenuBar )
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
 
-     if ( !m_bInplaceMenuSet )
-     {
+    if ( !m_bInplaceMenuSet )
+    {
         SolarMutexGuard aGuard;
 
         // Reset old inplace menubar!
@@ -3598,8 +1184,7 @@ throw (::com::sun::star::uno::RuntimeException)
         m_xInplaceMenuBar.clear();
         m_bInplaceMenuSet = sal_False;
 
-        if ( m_xFrame.is() &&
-             m_xContainerWindow.is() )
+        if ( m_xFrame.is() && m_xContainerWindow.is() )
         {
             rtl::OUString aModuleIdentifier;
             Reference< XDispatchProvider > xDispatchProvider;
@@ -3608,31 +1193,25 @@ throw (::com::sun::star::uno::RuntimeException)
             m_pInplaceMenuBar = new MenuBarManager( m_xSMGR, m_xFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pMenuBar, sal_True, sal_True );
             m_pInplaceMenuBar->SetItemContainer( xMergedMenuBar );
 
-            Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-            while ( pWindow && !pWindow->IsSystemWindow() )
-                pWindow = pWindow->GetParent();
+            SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+            if ( pSysWindow )
+                            pSysWindow->SetMenuBar( pMenuBar );
 
-            if ( pWindow )
-            {
-                SystemWindow* pSysWindow = (SystemWindow *)pWindow;
-                pSysWindow->SetMenuBar( pMenuBar );
-            }
-
-             m_bInplaceMenuSet = sal_True;
+                m_bInplaceMenuSet = sal_True;
             m_xInplaceMenuBar = Reference< XComponent >( (OWeakObject *)m_pInplaceMenuBar, UNO_QUERY );
         }
 
         aWriteLock.unlock();
         /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
         implts_updateMenuBarClose();
     }
-
 }
 
 void LayoutManager::implts_resetInplaceMenuBar()
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     m_bInplaceMenuSet = sal_False;
 
@@ -3641,17 +1220,13 @@ throw (::com::sun::star::uno::RuntimeException)
     {
         SolarMutexGuard aGuard;
         MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() );
-        Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-        while ( pWindow && !pWindow->IsSystemWindow() )
-            pWindow = pWindow->GetParent();
-
-        if ( pWindow )
+        SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+        if ( pSysWindow )
         {
-            SystemWindow* pSysWindow = (SystemWindow *)pWindow;
             if ( pMenuBarWrapper )
-                pSysWindow->SetMenuBar( (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar() );
-            else
-                pSysWindow->SetMenuBar( 0 );
+                                pSysWindow->SetMenuBar( (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar() );
+                        else
+                                pSysWindow->SetMenuBar( 0 );
         }
     }
 
@@ -3660,18 +1235,14 @@ throw (::com::sun::star::uno::RuntimeException)
     if ( m_xInplaceMenuBar.is() )
         m_xInplaceMenuBar->dispose();
     m_xInplaceMenuBar.clear();
-
-    aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 }
 
 void SAL_CALL LayoutManager::attachFrame( const Reference< XFrame >& xFrame )
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     m_xFrame = xFrame;
-    aWriteLock.unlock();
 }
 
 void SAL_CALL LayoutManager::reset()
@@ -3681,13 +1252,13 @@ throw (RuntimeException)
 }
 
 void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 )
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
     OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
 }
 
 void SAL_CALL LayoutManager::resetInplaceMenuBar()
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
     OSL_ENSURE( sal_False, "This method is obsolete and should not be used!\n" );
 }
@@ -3697,45 +1268,42 @@ throw (::com::sun::star::uno::RuntimeException)
 //---------------------------------------------------------------------------------------------------------
 sal_Bool SAL_CALL LayoutManager::setMergedMenuBar(
     const Reference< XIndexAccess >& xMergedMenuBar )
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
     implts_setInplaceMenuBar( xMergedMenuBar );
 
-    css::uno::Any a;
-    implts_notifyListeners( css::frame::LayoutManagerEvents::MERGEDMENUBAR, a );
+    uno::Any a;
+    implts_notifyListeners( frame::LayoutManagerEvents::MERGEDMENUBAR, a );
     return sal_True;
 }
 
 void SAL_CALL LayoutManager::removeMergedMenuBar()
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
     implts_resetInplaceMenuBar();
 }
 
-::com::sun::star::awt::Rectangle SAL_CALL LayoutManager::getCurrentDockingArea()
+awt::Rectangle SAL_CALL LayoutManager::getCurrentDockingArea()
 throw ( RuntimeException )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     return m_aDockingArea;
 }
 
 Reference< XDockingAreaAcceptor > SAL_CALL LayoutManager::getDockingAreaAcceptor()
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     return m_xDockingAreaAcceptor;
 }
 
-void SAL_CALL LayoutManager::setDockingAreaAcceptor( const Reference< ::com::sun::star::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor )
+void SAL_CALL LayoutManager::setDockingAreaAcceptor( const Reference< ui::XDockingAreaAcceptor >& xDockingAreaAcceptor )
 throw ( RuntimeException )
 {
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
 
-    if (( m_xDockingAreaAcceptor == xDockingAreaAcceptor ) ||
-          !m_xFrame.is() )
+    if (( m_xDockingAreaAcceptor == xDockingAreaAcceptor ) || !m_xFrame.is() )
         return;
 
     // IMPORTANT: Be sure to stop layout timer if don't have a docking area acceptor!
@@ -3743,7 +1311,10 @@ throw ( RuntimeException )
         m_aAsyncLayoutTimer.Stop();
 
     sal_Bool bAutomaticToolbars( m_bAutomaticToolbars );
-    std::vector< Reference< css::awt::XWindow > > oldDockingAreaWindows;
+    std::vector< Reference< awt::XWindow > > oldDockingAreaWindows;
+
+    uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
 
     if ( !xDockingAreaAcceptor.is() )
         m_aAsyncLayoutTimer.Stop();
@@ -3751,45 +1322,31 @@ throw ( RuntimeException )
     // Remove listener from old docking area acceptor
     if ( m_xDockingAreaAcceptor.is() )
     {
-        Reference< css::awt::XWindow > xWindow( m_xDockingAreaAcceptor->getContainerWindow() );
+        Reference< awt::XWindow > xWindow( m_xDockingAreaAcceptor->getContainerWindow() );
         if ( xWindow.is() && ( m_xFrame->getContainerWindow() != m_xContainerWindow || !xDockingAreaAcceptor.is() ) )
-            xWindow->removeWindowListener( Reference< css::awt::XWindowListener >( static_cast< OWeakObject * >( this ), UNO_QUERY ));
+            xWindow->removeWindowListener( Reference< awt::XWindowListener >( static_cast< OWeakObject * >( this ), UNO_QUERY ));
 
-        oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP] );
-        oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM] );
-        oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT] );
-        oldDockingAreaWindows.push_back( m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT] );
-
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP].clear();
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM].clear();
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT].clear();
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT].clear();
-        m_aDockingArea = css::awt::Rectangle();
+        m_aDockingArea = awt::Rectangle();
+        if ( pToolbarManager )
+            pToolbarManager->resetDockingArea();
 
         Window* pContainerWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pContainerWindow )
             pContainerWindow->RemoveChildEventListener( LINK( this, LayoutManager, WindowEventListener ) );
     }
 
-    // Set new docking area acceptor and add ourself as window listener on the container window.
-    // Create our docking area windows which are parents for all docked windows.
-    css::uno::Reference< css::awt::XWindow > xTopDockWindow;
-    css::uno::Reference< css::awt::XWindow > xBottomDockWindow;
-    css::uno::Reference< css::awt::XWindow > xLeftDockWindow;
-    css::uno::Reference< css::awt::XWindow > xRightDockWindow;
-
-    Reference< ::com::sun::star::ui::XDockingAreaAcceptor > xOldDockingAreaAcceptor( m_xDockingAreaAcceptor );
+    Reference< ui::XDockingAreaAcceptor > xOldDockingAreaAcceptor( m_xDockingAreaAcceptor );
     m_xDockingAreaAcceptor = xDockingAreaAcceptor;
     if ( m_xDockingAreaAcceptor.is() )
     {
-        m_aDockingArea     = css::awt::Rectangle();
+        m_aDockingArea     = awt::Rectangle();
         m_xContainerWindow = m_xDockingAreaAcceptor->getContainerWindow();
         m_xContainerTopWindow.set( m_xContainerWindow, UNO_QUERY );
-        m_xContainerWindow->addWindowListener( Reference< css::awt::XWindowListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
+        m_xContainerWindow->addWindowListener( Reference< awt::XWindowListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
 
         // we always must keep a connection to the window of our frame for resize events
         if ( m_xContainerWindow != m_xFrame->getContainerWindow() )
-            m_xFrame->getContainerWindow()->addWindowListener( Reference< css::awt::XWindowListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
+            m_xFrame->getContainerWindow()->addWindowListener( Reference< awt::XWindowListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
 
         // #i37884# set initial visibility state - in the plugin case the container window is already shown
         // and we get no notification anymore
@@ -3800,32 +1357,15 @@ throw ( RuntimeException )
                 m_bParentWindowVisible = pContainerWindow->IsVisible();
         }
 
-        css::uno::Reference< css::awt::XWindowPeer > xParent( m_xContainerWindow, UNO_QUERY );
-        xTopDockWindow = Reference< css::awt::XWindow >( implts_createToolkitWindow( xParent ), UNO_QUERY );
-        xBottomDockWindow = Reference< css::awt::XWindow >( implts_createToolkitWindow( xParent ), UNO_QUERY );
-        xLeftDockWindow = Reference< css::awt::XWindow >( implts_createToolkitWindow( xParent ), UNO_QUERY );
-        xRightDockWindow = Reference< css::awt::XWindow >( implts_createToolkitWindow( xParent ), UNO_QUERY );
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP]    = xTopDockWindow;
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM] = xBottomDockWindow;
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT]   = xLeftDockWindow;
-        m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT]  = xRightDockWindow;
+        uno::Reference< awt::XWindowPeer > xParent( m_xContainerWindow, UNO_QUERY );
     }
 
     aWriteLock.unlock();
-     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     if ( xDockingAreaAcceptor.is() )
     {
         SolarMutexGuard aGuard;
-        ::DockingAreaWindow* pWindow;
-        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP );
-        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ) );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
-        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xLeftDockWindow ) );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
-        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xRightDockWindow ) );
-        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
 
         // Add layout manager as listener to get notifications about toolbar button activties
         Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
@@ -3840,23 +1380,8 @@ throw ( RuntimeException )
 
     if ( !oldDockingAreaWindows.empty() )
     {
-        const sal_uInt32 nCount = oldDockingAreaWindows.size();
-        for ( sal_uInt32 i = 0; i < nCount; ++i )
-        {
-            if ( oldDockingAreaWindows[i].is() )
-            {
-                try
-                {
-                    oldDockingAreaWindows[i]->dispose();
-                }
-                catch ( Exception& )
-                {
-                }
-            }
-        }
-
         // Reset docking area size for our old docking area acceptor
-        css::awt::Rectangle aEmptyRect;
+        awt::Rectangle aEmptyRect;
         xOldDockingAreaAcceptor->setDockingAreaSpace( aEmptyRect );
     }
 
@@ -3864,201 +1389,77 @@ throw ( RuntimeException )
     {
         if ( bAutomaticToolbars )
         {
-            implts_createAddonsToolBars(); // create addon toolbars
-            implts_createCustomToolBars(); // create custom toolbars
-            implts_createNonContextSensitiveToolBars();
+            lock();
+            pToolbarManager->createStaticToolbars();
+            unlock();
         }
-        implts_sortUIElements();
         implts_doLayout( sal_True, sal_False );
     }
 }
 
 void LayoutManager::implts_reparentChildWindows()
 {
-    UIElementVector aUIElementVector;
-    UIElement       aStatusBarElement;
-    css::uno::Reference< css::awt::XWindow > xTopDockWindow;
-    css::uno::Reference< css::awt::XWindow > xBottomDockWindow;
-    css::uno::Reference< css::awt::XWindow > xLeftDockWindow;
-    css::uno::Reference< css::awt::XWindow > xRightDockWindow;
-    css::uno::Reference< css::awt::XWindow > xContainerWindow;
-    css::uno::Reference< css::awt::XWindow > xStatusBarWindow;
-
     WriteGuard aWriteLock( m_aLock );
-    aUIElementVector    = m_aUIElements;
-    xTopDockWindow      = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-    xBottomDockWindow   = m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM];
-    xLeftDockWindow     = m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT];
-    xRightDockWindow    = m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT];
-    xContainerWindow    = m_xContainerWindow;
-    aStatusBarElement   = m_aStatusBarElement;
+    UIElement aStatusBarElement = m_aStatusBarElement;
+    uno::Reference< awt::XWindow > xContainerWindow  = m_xContainerWindow;
     aWriteLock.unlock();
 
+    uno::Reference< awt::XWindow > xStatusBarWindow;
     if ( aStatusBarElement.m_xUIElement.is() )
     {
         try
         {
-            xStatusBarWindow = Reference< css::awt::XWindow >(
-                                    aStatusBarElement.m_xUIElement->getRealInterface(),
-                               UNO_QUERY );
-        }
-        catch ( RuntimeException& )
-        {
-            throw;
-        }
-        catch ( Exception& )
-        {
+            xStatusBarWindow = Reference< awt::XWindow >( aStatusBarElement.m_xUIElement->getRealInterface(), UNO_QUERY );
         }
+        catch ( RuntimeException& ) { throw; }
+        catch ( Exception& ) {}
     }
-
-    SolarMutexGuard aGuard;
-    Window* pContainerWindow    = VCLUnoHelper::GetWindow( xContainerWindow );
-    Window* pTopDockWindow      = VCLUnoHelper::GetWindow( xTopDockWindow );
-    Window* pBottomDockWindow   = VCLUnoHelper::GetWindow( xBottomDockWindow );
-    Window* pLeftDockWindow     = VCLUnoHelper::GetWindow( xLeftDockWindow );
-    Window* pRightDockWindow    = VCLUnoHelper::GetWindow( xRightDockWindow );
-    if ( pContainerWindow )
+    
+    if ( xStatusBarWindow.is() )
     {
-        UIElementVector::iterator pIter;
-        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
-        {
-            Reference< XUIElement > xUIElement( pIter->m_xUIElement );
-            if ( xUIElement.is() )
-            {
-                Reference< css::awt::XWindow > xWindow;
-                try
-                {
-                    // We have to retreive the window reference with try/catch as it is
-                    // possible that all elements has been disposed!
-                    xWindow = Reference< css::awt::XWindow >( xUIElement->getRealInterface(), UNO_QUERY );
-                }
-                catch ( RuntimeException& )
-                {
-                    throw;
-                }
-                catch ( Exception& )
-                {
-                }
-
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow )
-                {
-                    // Reparent our child windows acording to their current state.
-                    if ( pIter->m_bFloating )
-                        pWindow->SetParent( pContainerWindow );
-                    else
-                    {
-                        if ( pIter->m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_TOP )
-                            pWindow->SetParent( pTopDockWindow );
-                        else if ( pIter->m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_BOTTOM )
-                            pWindow->SetParent( pBottomDockWindow );
-                        else if ( pIter->m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_LEFT )
-                            pWindow->SetParent( pLeftDockWindow );
-                        else
-                            pWindow->SetParent( pRightDockWindow );
-                    }
-                }
-            }
-        }
+        vos::OGuard     aGuard( Application::GetSolarMutex() );
+        Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+        Window* pWindow          = VCLUnoHelper::GetWindow( xStatusBarWindow );
+        if ( pWindow && pContainerWindow )
+            pWindow->SetParent( pContainerWindow );
+    }
 
-        if ( xStatusBarWindow.is() )
-        {
-            Window* pWindow = VCLUnoHelper::GetWindow( xStatusBarWindow );
-            if ( pWindow )
-                pWindow->SetParent( pContainerWindow );
-        }
+    implts_resetMenuBar();
+    
+    aWriteLock.lock();
+    uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+    if ( pToolbarManager )
+        pToolbarManager->setParentWindow( uno::Reference< awt::XWindowPeer >( xContainerWindow, uno::UNO_QUERY ));
+    aWriteLock.unlock();
+}
 
-        implts_resetMenuBar();
-    }
+uno::Reference< ui::XUIElement > LayoutManager::implts_createDockingWindow( const ::rtl::OUString& aElementName )
+{
+    Reference< XUIElement > xUIElement = implts_createElement( aElementName );
+    return xUIElement;
 }
 
 IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
 {
-    // To enable toolbar controllers to change their image when a sub-toolbar function
-    // is activated, we need this mechanism. We have NO connection between these toolbars
-    // anymore!
+    long nResult( 1 );
+
     if ( pEvent && pEvent->ISA( VclWindowEvent ))
     {
-        if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT )
-        {
-            Window*         pWindow( ((VclWindowEvent*)pEvent)->GetWindow() );
-            ToolBox*        pToolBox( 0 );
-            rtl::OUString   aToolbarName;
-            rtl::OUString   aCommand;
-
-            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-            {
-                pToolBox = (ToolBox *)pWindow;
-                aToolbarName = pToolBox->GetSmartHelpId().GetStr();
-                sal_Int32 i = aToolbarName.lastIndexOf( ':' );
-                if (( aToolbarName.getLength() > 0 ) &&
-                    ( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() ))
-                {
-                    // Remove ".HelpId:" protocol from toolbar name
-                    aToolbarName = aToolbarName.copy( i+1 );
-
-                    USHORT nId = pToolBox->GetCurItemId();
-                    if ( nId > 0 )
-                        aCommand = pToolBox->GetItemCommand( nId );
-                }
-            }
-
-            if (( aToolbarName.getLength() > 0 ) && ( aCommand.getLength() > 0 ))
-            {
-                /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-                ReadGuard aReadLock( m_aLock );
-                std::vector< css::uno::Reference< css::ui::XUIFunctionListener > > aListenerArray;
-                UIElementVector::iterator pIter;
-
-                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-                {
-                    if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) &&
-                        pIter->m_xUIElement.is() )
-                    {
-                        css::uno::Reference< css::ui::XUIFunctionListener > xListener( pIter->m_xUIElement, UNO_QUERY );
-                        if ( xListener.is() )
-                            aListenerArray.push_back( xListener );
-                    }
-                }
-                aReadLock.unlock();
-                /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-                const sal_uInt32 nCount = aListenerArray.size();
-                for ( sal_uInt32 i = 0; i < nCount; ++i )
-                {
-                    try
-                    {
-                        aListenerArray[i]->functionExecute( aToolbarName, aCommand );
-                    }
-                    catch ( RuntimeException& e )
-                    {
-                        throw e;
-                    }
-                    catch ( Exception& ) {}
-                }
-            }
-        }
-        else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED )
+        Window* pWindow = static_cast< VclWindowEvent* >(pEvent)->GetWindow();
+        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
         {
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
             ReadGuard aReadLock( m_aLock );
+            uno::Reference< ui::XUIConfigurationListener > xThis( m_xToolbarManager );
+            ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
+            aReadLock.unlock();
 
-            Window*         pWindow( ((VclWindowEvent*)pEvent)->GetWindow() );
-            ToolBox*        pToolBox( 0 );
-            rtl::OUString   aToolbarName;
-
-            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-            {
-                pToolBox = (ToolBox *)pWindow;
-                aToolbarName = pToolBox->GetSmartHelpId().GetStr();
-                if (( aToolbarName.getLength() > 0 ) && ( m_nLockCount == 0 ))
-                    m_aAsyncLayoutTimer.Start();
-            }
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+            if ( pToolbarManager )
+                nResult = pToolbarManager->childWindowEvent( pEvent );
         }
     }
 
-    return 1;
+    return nResult;
 }
 
 void SAL_CALL LayoutManager::createElement( const ::rtl::OUString& aName )
@@ -4066,13 +1467,11 @@ throw (RuntimeException)
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::createElement" );
 
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     Reference< XFrame > xFrame = m_xFrame;
     Reference< XURLTransformer > xURLTransformer = m_xURLTransformer;
     sal_Bool    bInPlaceMenu = m_bInplaceMenuSet;
     aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     if ( !xFrame.is() )
         return;
@@ -4082,105 +1481,35 @@ throw (RuntimeException)
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
 
-    sal_Bool                                      bFound( sal_False );
-    sal_Bool                                      bNotify( sal_False );
-    ::rtl::OUString                                      aElementType;
-    ::rtl::OUString                                      aElementName;
-    Reference< ::com::sun::star::ui::XUIElement > xUIElement;
-
-    implts_findElement( aName, aElementType, aElementName, xUIElement );
-    bFound = xUIElement.is();
-
-    if ( /*xFrame.is() && */m_xContainerWindow.is() && !implts_isPreviewModel( xModel ) ) // no bars on preview mode
+    bool bMustBeLayouted( false );
+    bool bNotify( false );
+    
+    if ( m_xContainerWindow.is() && !implts_isPreviewModel( xModel ) ) // no UI elements on preview frames
     {
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
-        {
-            if ( !bFound  )
-            {
-                SvtCommandOptions aCmdOptions;
-
-                xUIElement = implts_createElement( aName );
-                sal_Bool bVisible( sal_False );
-                if ( xUIElement.is() )
-                {
-                    Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                    Reference< css::awt::XDockableWindow > xDockWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                    if ( xDockWindow.is() && xWindow.is() )
-                    {
-                        try
-                        {
-                            xDockWindow->addDockableWindowListener( Reference< css::awt::XDockableWindowListener >(
-                                static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                            xWindow->addWindowListener( Reference< css::awt::XWindowListener >(
-                                static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                            xDockWindow->enableDocking( sal_True );
-                        }
-                        catch ( Exception& )
-                        {
-                        }
-                    }
-
-                    UIElement& rElement = impl_findElement( aName );
-                    if ( rElement.m_aName.getLength() > 0 )
-                    {
-                        // Reuse a local entry so we are able to use the latest
-                        // UI changes for this document.
-                        implts_setElementData( rElement, xDockWindow );
-                        rElement.m_xUIElement = xUIElement;
-                        bVisible = rElement.m_bVisible;
-                    }
-                    else
-                    {
-                        // Create new UI element and try to read its state data
-                        UIElement aNewToolbar( aName, aElementType, xUIElement );
-                        implts_readWindowStateData( aName, aNewToolbar );
-                        implts_setElementData( aNewToolbar, xDockWindow );
-                        implts_insertUIElement( aNewToolbar );
-                        bVisible = aNewToolbar.m_bVisible;
-                    }
-
-                    // set toolbar menu style according to customize command state
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                    {
-                        ToolBox* pToolbar = (ToolBox *)pWindow;
-                        USHORT nMenuType = pToolbar->GetMenuType();
-                        if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, m_aCustomizeCmd ))
-                            pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE );
-                        else
-                            pToolbar->SetMenuType( nMenuType | TOOLBOX_MENUTYPE_CUSTOMIZE );
-                    }
-                }
-                aWriteLock.unlock();
+        ::rtl::OUString aElementType;
+        ::rtl::OUString aElementName;
 
-                implts_sortUIElements();
+        parseResourceURL( aName, aElementType, aElementName );
 
-                if ( bVisible )
-                {
-                    doLayout();
-                    bNotify = sal_True;
-                }
-            }
+        if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL )
+        {
+            bNotify         = m_pToolbarManager->createToolbar( aName );
+            bMustBeLayouted = m_pToolbarManager->isLayoutDirty();
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ))
+        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
         {
-            if ( aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ) && !bInPlaceMenu )
-            {
-                SolarMutexGuard aGuard;
-                // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top
-                if ( !m_xMenuBar.is() && implts_isFrameOrWindowTop(xFrame) )
-                    m_xMenuBar = implts_createElement( aName );
-
-                if ( m_xMenuBar.is() && implts_isFrameOrWindowTop(xFrame) )
+            // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top
+            if ( !bInPlaceMenu && !m_xMenuBar.is() && implts_isFrameOrWindowTop( xFrame ))
                 {
-                    Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-                    while ( pWindow && !pWindow->IsSystemWindow() )
-                        pWindow = pWindow->GetParent();
-
-                    if ( pWindow )
+                m_xMenuBar = implts_createElement( aName );
+                if ( m_xMenuBar.is() )
+                {
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                
+                    SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+                    if ( pSysWindow )
                     {
-                        SystemWindow* pSysWindow = (SystemWindow *)pWindow;
-                        Reference< css::awt::XMenuBar > xMenuBar;
+                        Reference< awt::XMenuBar > xMenuBar;
 
                         Reference< XPropertySet > xPropSet( m_xMenuBar, UNO_QUERY );
                         if ( xPropSet.is() )
@@ -4189,12 +1518,8 @@ throw (RuntimeException)
                             {
                                 xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XMenuBar" ))) >>= xMenuBar;
                             }
-                            catch ( com::sun::star::beans::UnknownPropertyException )
-                            {
-                            }
-                            catch ( com::sun::star::lang::WrappedTargetException )
-                            {
-                            }
+                            catch ( beans::UnknownPropertyException ) {}
+                            catch ( lang::WrappedTargetException ) {}
                         }
 
                         if ( xMenuBar.is() )
@@ -4208,9 +1533,7 @@ throw (RuntimeException)
                                     pSysWindow->SetMenuBar( pMenuBar );
                                     pMenuBar->SetDisplayable( m_bMenuVisible );
                                     if ( m_bMenuVisible )
-                                    {
                                         bNotify = sal_True;
-                                    }
                                     implts_updateMenuBarClose();
                                 }
                             }
@@ -4225,27 +1548,35 @@ throw (RuntimeException)
             implts_createStatusBar( aName );
             bNotify = sal_True;
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  implts_isFrameOrWindowTop(xFrame) )
+        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ) && implts_isFrameOrWindowTop(xFrame) )
         {
             implts_createProgressBar();
             bNotify = sal_True;
         }
         else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
         {
-            aWriteLock.unlock();
-
+            // Add layout manager as listener for docking and other window events
+            uno::Reference< uno::XInterface > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY );
+            uno::Reference< ui::XUIElement > xUIElement( implts_createDockingWindow( aName ));
+            
+            if ( xUIElement.is() )
+            {
+                impl_addWindowListeners( xThis, xUIElement );
+                m_pPanelManager->addDockingWindow( aName, xUIElement );
+            }
+            
             // The docking window is created by a factory method located in the sfx2 library.
-            CreateDockingWindow( xFrame, aElementName );
+//            CreateDockingWindow( xFrame, aElementName );
         }
     }
 
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    if ( bMustBeLayouted )
+        implts_doLayout_notify( sal_True );
+
     if ( bNotify )
     {
         // UI element is invisible - provide information to listeners
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
     }
 }
 
@@ -4257,112 +1588,54 @@ throw (RuntimeException)
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
 
-    sal_Bool    bMustLayouted( sal_False );
-    sal_Bool    bMustBeDestroyed( sal_False );
-    sal_Bool    bMustBeSorted( sal_False );
-    sal_Bool    bNotify( sal_False );
-    ::rtl::OUString    aElementType;
-    ::rtl::OUString    aElementName;
+    bool            bMustBeLayouted( sal_False );
+    bool            bMustBeDestroyed( sal_False );
+    bool            bNotify( sal_False );
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
 
     Reference< XComponent > xComponent;
-    if ( impl_parseResourceURL( aName, aElementType, aElementName ))
+    parseResourceURL( aName, aElementType, aElementName );
+    
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
     {
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-             aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
-        {
-            if ( !m_bInplaceMenuSet )
-            {
-                impl_clearUpMenuBar();
-                m_xMenuBar.clear();
-                bNotify = sal_True;
-            }
-        }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-                 ( m_aStatusBarElement.m_aName == aName ))
-        {
-            aWriteLock.unlock();
-            implts_destroyStatusBar();
-            bMustLayouted = sal_True;
-            bNotify = sal_True;
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ) )
-        {
-            aWriteLock.unlock();
-            implts_createProgressBar();
-            bMustLayouted = sal_True;
-            bNotify = sal_True;
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
+        if ( !m_bInplaceMenuSet )
         {
-            UIElementVector::iterator pIter;
-
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_aName == aName )
-                {
-                    xComponent.set( pIter->m_xUIElement, UNO_QUERY );
-                    Reference< XUIElement > xUIElement( pIter->m_xUIElement );
-                    if ( xUIElement.is() )
-                    {
-                        Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                        Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-
-                        rtl::OUString aAddonTbResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" ));
-                        if ( aName.indexOf( aAddonTbResourceName ) != 0 )
-                        {
-                            try
-                            {
-                                if ( xWindow.is() )
-                                    xWindow->removeWindowListener( Reference< css::awt::XWindowListener >(
-                                        static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                            }
-                            catch( Exception& )
-                            {
-                            }
-
-                            try
-                            {
-                                if ( xDockWindow.is() )
-                                    xDockWindow->removeDockableWindowListener( Reference< css::awt::XDockableWindowListener >(
-                                        static_cast< OWeakObject * >( this ), UNO_QUERY ));
-                            }
-                            catch ( Exception& )
-                            {
-                            }
-
-                            bMustBeDestroyed = sal_True;
-                        }
-                        else
-                        {
-                            pIter->m_bVisible = sal_False;
-                            xWindow->setVisible( sal_False );
-                            bNotify = sal_True;
-                        }
-
-                        if ( !xDockWindow->isFloating() )
-                            bMustLayouted = sal_True;
-                        if ( bMustBeDestroyed )
-                            pIter->m_xUIElement.clear();
-
-                        bMustBeSorted = sal_True;
-                    }
-
-                    break;
-                }
-            }
+            impl_clearUpMenuBar();
+            m_xMenuBar.clear();
+            bNotify = true;
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
-        {
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR( m_xSMGR );
-            aWriteLock.unlock();
+    }
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
+             ( m_aStatusBarElement.m_aName == aName ))
+    {
+        aWriteLock.unlock();
+        implts_destroyStatusBar();
+        bMustBeLayouted = true;
+        bNotify         = true;
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+    {
+        aWriteLock.unlock();
+        implts_createProgressBar();
+        bMustBeLayouted = true;
+        bNotify = sal_True;
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_pToolbarManager != NULL )
+    {
+        aWriteLock.unlock();
+        bNotify         = m_pToolbarManager->destroyToolbar( aName );
+        bMustBeLayouted = m_pToolbarManager->isLayoutDirty();
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    {
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        uno::Reference< lang::XMultiServiceFactory > xSMGR( m_xSMGR );
+        aWriteLock.unlock();
 
-            impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, false );
-            bMustLayouted = sal_False;
-            bNotify = sal_False;
-        }
+        impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, false );
+        bMustBeLayouted = false;
+        bNotify         = false;
     }
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -4371,173 +1644,91 @@ throw (RuntimeException)
     {
         if ( xComponent.is() )
             xComponent->dispose();
-        bNotify = sal_True;
+        bNotify = true;
     }
 
-    if ( bMustBeSorted )
-    {
-        implts_sortUIElements();
-        if ( bMustLayouted )
-            doLayout();
-    }
+    if ( bMustBeLayouted )
+        doLayout();
 
     if ( bNotify )
-    {
-        // UI element is invisible - provide information to listeners
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
-    }
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
 }
 
-::sal_Bool SAL_CALL LayoutManager::requestElement( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL LayoutManager::requestElement( const ::rtl::OUString& rResourceURL )
+throw (uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::requestElement" );
+    bool            bResult( false );
+    bool            bNotify( false );
+    bool            bDoLayout( false );
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
 
-    ::rtl::OUString                  aElementType;
-    ::rtl::OUString                  aElementName;
-    UIElementVector::iterator pIter;
-    sal_Bool                  bResult( sal_False );
-    sal_Bool                  bNotify( sal_False );
+    parseResourceURL( rResourceURL, aElementType, aElementName );
 
     WriteGuard aWriteLock( m_aLock );
-    if ( impl_parseResourceURL( ResourceURL, aElementType, aElementName ))
-    {
-        ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
-        RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
+    
+    ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s requested.", aResName.getStr() );
 
-        if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-              aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-            ( m_aStatusBarElement.m_aName == ResourceURL ))
-        {
-            implts_readStatusBarState( ResourceURL );
-            if ( m_aStatusBarElement.m_bVisible && !m_aStatusBarElement.m_bMasterHide )
-            {
-                createElement( ResourceURL );
-
-                // There are some situation where we are not able to create an element.
-                // Therefore we have to check the reference before further action.
-                // See #i70019#
-                css::uno::Reference< css::ui::XUIElement > xUIElement( m_aStatusBarElement.m_xUIElement );
-                if ( xUIElement.is() )
-                {
-                    // we need VCL here to pass special flags to Show()
-                    SolarMutexGuard aGuard;
-                    Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow )
-                    {
-                        pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-                        doLayout();
-                        bResult = sal_True;
-                        bNotify = sal_True;
-                    }
-                }
-            }
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ) )
+    if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == rResourceURL ))
+    {
+        implts_readStatusBarState( rResourceURL );
+        if ( m_aStatusBarElement.m_bVisible && !m_aStatusBarElement.m_bMasterHide )
         {
             aWriteLock.unlock();
-            implts_showProgressBar();
-            doLayout();
-            bResult = sal_True;
-            bNotify = sal_True;
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
-        {
-            if ( m_bVisible )
-            {
-                bool bFound( false );
-                bool bShowElement( false );
-
-                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-                {
-                    if ( pIter->m_aName == ResourceURL )
-                    {
-                        bFound       = sal_True;
-                        bShowElement = ( pIter->m_bVisible && !pIter->m_bMasterHide && m_bParentWindowVisible );
-
-                        Reference< css::awt::XWindow2 > xContainerWindow( m_xContainerWindow, UNO_QUERY );
-                        if ( xContainerWindow.is() && pIter->m_bFloating )
-                            bShowElement = ( bShowElement && xContainerWindow->isActive() );
-
-                        if ( pIter->m_xUIElement.is() )
-                        {
-                            Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-                            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-
-                            if ( xDockWindow.is() && xDockWindow->isFloating() )
-                                bShowElement = ( bShowElement && xContainerWindow->isActive() );
+            createElement( rResourceURL );
 
-                            if ( xDockWindow.is() && bShowElement )
-                            {
-                                pIter->m_bVisible = sal_True;
-                                aWriteLock.unlock();
-
-                                // we need VCL here to pass special flags to Show()
-                                SolarMutexGuard aGuard;
-                                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                                if( pWindow && !pWindow->IsReallyVisible() )
-                                {
-                                    pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-                                    implts_writeNewStateData( ResourceURL, xWindow );
-
-                                    if ( xDockWindow.is() && !xDockWindow->isFloating() )
-                                        doLayout();
-                                    bResult = sal_True;
-                                    bNotify = sal_True;
-                                }
-
-                                bResult = sal_False;
-                            }
-                        } // if ( pIter->m_xUIElement.is() )
-                        break;
-                    }
-                }
-
-                // Create toolbar on demand when it's visible
-                if ( !bResult )
+            // There are some situation where we are not able to create an element.
+            // Therefore we have to check the reference before further action.
+            // See #i70019#
+            uno::Reference< ui::XUIElement > xUIElement( m_aStatusBarElement.m_xUIElement );
+            if ( xUIElement.is() )
+            {
+                // we need VCL here to pass special flags to Show()
+                SolarMutexGuard aGuard;
+                Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow )
                 {
-                    Reference< ::com::sun::star::ui::XUIElement > xUIElement;
-                    if ( !bFound )
-                    {
-                        UIElement aNewToolbar( aElementName, aElementType, xUIElement );
-                        aNewToolbar.m_aName = ResourceURL;
-                        implts_readWindowStateData( ResourceURL, aNewToolbar );
-                        implts_insertUIElement( aNewToolbar );
-                        aWriteLock.unlock();
-
-                        implts_sortUIElements();
-                        if ( aNewToolbar.m_bVisible )
-                            createElement( ResourceURL );
-                        bResult = sal_True;
-                        bNotify = sal_True;
-                    }
-                    else if ( bShowElement )
-                    {
-                        aWriteLock.unlock();
-
-                        createElement( ResourceURL );
-                        bResult = sal_True;
-                        bNotify = sal_True;
-                    }
+                    pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                    bResult   = true;
+                    bNotify   = true;
+                    bDoLayout = true;
                 }
             }
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ) )
+    {
+        aWriteLock.unlock();
+        implts_showProgressBar();
+        bResult   = true;
+        bNotify   = true;
+        bDoLayout = true;
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ) && m_bVisible )
+    {
+        bool bComponentAttached( m_aModuleIdentifier.getLength() > 0 );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aWriteLock.unlock();
+
+        if ( pToolbarManager && bComponentAttached )
         {
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            aWriteLock.unlock();
+                bNotify   = pToolbarManager->requestToolbar( rResourceURL );
+            bDoLayout = true;
+            }
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    {
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        aWriteLock.unlock();
 
-            CreateDockingWindow( xFrame, aElementName );
-        }
+        CreateDockingWindow( xFrame, aElementName );
     }
 
     if ( bNotify )
-    {
-        // UI element is visible - provide information to listeners
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( ResourceURL ) );
-    }
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( rResourceURL ) );
 
     return bResult;
 }
@@ -4545,50 +1736,54 @@ throw (::com::sun::star::uno::RuntimeException)
 Reference< XUIElement > SAL_CALL LayoutManager::getElement( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    ::rtl::OUString                aElementType;
-    ::rtl::OUString                aElementName;
-    Reference< XUIElement > xElement;
+    Reference< XUIElement > xUIElement = implts_findElement( aName );
+    if ( !xUIElement.is() )
+    {
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager( m_pToolbarManager );
+        aReadLock.unlock();
 
-    implts_findElement( aName, aElementType, aElementName, xElement );
-    return xElement;
+        if ( pToolbarManager )
+            xUIElement = pToolbarManager->getToolbar( aName );
+    }
+
+    return xUIElement;
 }
 
-Sequence< Reference< ::com::sun::star::ui::XUIElement > > SAL_CALL LayoutManager::getElements()
-throw (::com::sun::star::uno::RuntimeException)
+Sequence< Reference< ui::XUIElement > > SAL_CALL LayoutManager::getElements()
+throw (uno::RuntimeException)
 {
-    ReadGuard   aReadLock( m_aLock );
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< ui::XUIElement >  xMenuBar( m_xMenuBar );
+    uno::Reference< ui::XUIElement >  xStatusBar( m_aStatusBarElement.m_xUIElement );
+    uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+    ToolbarLayoutManager*             pToolbarManager( m_pToolbarManager );
+    aReadLock.unlock();
 
-    sal_Bool  bMenuBar( sal_False );
-    sal_Bool  bStatusBar( sal_False );
-    sal_Int32 nSize = m_aUIElements.size();
+    Sequence< Reference< ui::XUIElement > > aSeq;
+    if ( pToolbarManager )
+        aSeq = pToolbarManager->getToolbars();
 
-    if ( m_xMenuBar.is() )
+    sal_Int32 nSize = aSeq.getLength();
+    sal_Int32 nMenuBarIndex(-1);
+    sal_Int32 nStatusBarIndex(-1);
+    if ( xMenuBar.is() )
     {
+        nMenuBarIndex = nSize;
         ++nSize;
-        bMenuBar = sal_True;
     }
-    if ( m_aStatusBarElement.m_xUIElement.is() )
+    if ( xStatusBar.is() )
     {
+        nStatusBarIndex = nSize;
         ++nSize;
-        bStatusBar = sal_True;
     }
 
-    Sequence< Reference< ::com::sun::star::ui::XUIElement > > aSeq( nSize );
-
-    sal_Int32 nIndex = 0;
-    UIElementVector::const_iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        if ( pIter->m_xUIElement.is() )
-            aSeq[nIndex++] = pIter->m_xUIElement;
-    }
-    if ( bMenuBar )
-        aSeq[nIndex++] = m_xMenuBar;
-    if ( bStatusBar )
-        aSeq[nIndex++] = m_aStatusBarElement.m_xUIElement;
-
-    // Resize sequence as we now know our correct size
-    aSeq.realloc( nIndex );
+    aSeq.realloc(nSize);
+    if ( nMenuBarIndex >= 0 )
+        aSeq[nMenuBarIndex] = xMenuBar;
+    if ( nStatusBarIndex >= 0 )
+        aSeq[nStatusBarIndex] = xStatusBar;
 
     return aSeq;
 }
@@ -4598,115 +1793,80 @@ throw (RuntimeException)
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::showElement" );
 
-    sal_Bool    bResult( sal_False );
-    sal_Bool    bNotify( sal_False );
-    ::rtl::OUString    aElementType;
-    ::rtl::OUString    aElementName;
+    bool            bResult( false );
+    bool            bNotify( false );
+    bool            bMustLayout( false );
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
+
+    parseResourceURL( aName, aElementType, aElementName );
+    
+    ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
 
-    if ( impl_parseResourceURL( aName, aElementType, aElementName ))
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
     {
-        ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
-        RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
+        WriteGuard aWriteLock( m_aLock );
+        m_bMenuVisible = sal_True;
+        aWriteLock.unlock();
 
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-             aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
+        bResult = implts_resetMenuBar();
+        bNotify = bResult;
+    }
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
+    {
+        WriteGuard aWriteLock( m_aLock );
+        if ( m_aStatusBarElement.m_xUIElement.is() && !m_aStatusBarElement.m_bMasterHide &&
+             implts_showStatusBar( sal_True ))
         {
-            WriteGuard aWriteLock( m_aLock );
-            m_bMenuVisible = sal_True;
             aWriteLock.unlock();
 
-            bResult = implts_resetMenuBar();
-            bNotify = bResult;
-        }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-                 ( m_aStatusBarElement.m_aName == aName ))
-        {
-            WriteGuard aWriteLock( m_aLock );
-            if ( m_aStatusBarElement.m_xUIElement.is() &&
-                 !m_aStatusBarElement.m_bMasterHide )
-            {
-                if ( implts_showStatusBar( sal_True ))
-                {
-                    implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
-                    doLayout();
-                    bResult = sal_True;
-                    bNotify = sal_True;
-                }
-            }
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
-        {
-            bNotify = bResult = implts_showProgressBar();
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
-        {
-            UIElementVector::iterator pIter;
-
-            WriteGuard aWriteLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
-                {
-                    UIElement aUIElement = *pIter;
-                    Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-                    Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-
-                    sal_Bool bShowElement( !pIter->m_bMasterHide && m_bParentWindowVisible );
-
-                    pIter->m_bVisible = sal_True;
-                    aWriteLock.unlock();
-
-                    implts_writeWindowStateData( aUIElement.m_aName, aUIElement );
-                    implts_sortUIElements();
-
-                    if ( xDockWindow.is() && bShowElement )
-                    {
-                        // we need VCL here to pass special flags to Show()
-                        SolarMutexGuard aGuard;
-                        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                        if( pWindow )
-                        {
-                            pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-                            bNotify = sal_True;
-                        }
-                        implts_writeNewStateData( aName, xWindow );
-
-                        if ( xDockWindow.is() && !xDockWindow->isFloating() )
-                            doLayout();
-
-                        bResult = sal_True;
-                    } // if ( xDockWindow.is() && bShowElement )
-                    break;
-                }
-            }
+            implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
+            bMustLayout = true;
+            bResult     = true;
+            bNotify     = true;
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
-        {
-            ReadGuard aReadGuard( m_aLock );
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR( m_xSMGR );
-            aReadGuard.unlock();
-
-            impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, true );
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" ))
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+    {
+        bNotify = bResult = implts_showProgressBar();
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
+    {
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< awt::XWindowListener > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+            
+        if ( pToolbarManager )
         {
-            ReadGuard aReadGuard( m_aLock );
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            aReadGuard.unlock();
-
-            ActivateToolPanel( m_xFrame, aName );
+            bNotify     = pToolbarManager->showToolbar( aName );
+            bMustLayout = pToolbarManager->isLayoutDirty();
         }
     }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    {
+        ReadGuard aReadGuard( m_aLock );
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        uno::Reference< lang::XMultiServiceFactory > xSMGR( m_xSMGR );
+        aReadGuard.unlock();
 
-    if ( bNotify )
+        impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, true );
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" ))
     {
-        // UI element is visible - provide information to listeners
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
+        ReadGuard aReadGuard( m_aLock );
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        aReadGuard.unlock();
+        ActivateToolPanel( m_xFrame, aName );
     }
 
+    if ( bMustLayout )
+        doLayout();
+
+    if ( bNotify )
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_VISIBLE, uno::makeAny( aName ) );
+
     return bResult;
 }
 
@@ -4715,475 +1875,240 @@ throw (RuntimeException)
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" );
 
+    bool            bResult( false );
+    bool            bNotify( false );
+    bool            bMustLayout( false );
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
 
-    sal_Bool            bNotify( sal_False );
-    ::rtl::OUString            aElementType;
-    ::rtl::OUString            aElementName;
+    parseResourceURL( aName, aElementType, aElementName );
+    ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
+    RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
 
-    if ( impl_parseResourceURL( aName, aElementType, aElementName ))
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
     {
-        ::rtl::OString aResName = rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US );
-        RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() );
-
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-             aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
-        {
-            WriteGuard aWriteLock( m_aLock );
-
-            if ( m_xContainerWindow.is() )
-            {
-                SolarMutexGuard aGuard;
-                Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-                while ( pWindow && !pWindow->IsSystemWindow() )
-                    pWindow = pWindow->GetParent();
+        WriteGuard aWriteLock( m_aLock );
 
-                m_bMenuVisible = sal_False;
-                if ( pWindow )
-                {
-                    MenuBar* pMenuBar = ((SystemWindow *)pWindow)->GetMenuBar();
-                    if ( pMenuBar )
-                    {
-                        pMenuBar->SetDisplayable( sal_False );
-                        bNotify = sal_True;
-                    }
-                }
-            }
-        }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-                 ( m_aStatusBarElement.m_aName == aName ))
+        if ( m_xContainerWindow.is() )
         {
-            WriteGuard aWriteLock( m_aLock );
-            if ( m_aStatusBarElement.m_xUIElement.is() &&
-                 !m_aStatusBarElement.m_bMasterHide )
+            m_bMenuVisible = sal_False;
+                
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+            if ( pSysWindow )
             {
-                if ( implts_hideStatusBar( sal_True ))
+                MenuBar* pMenuBar = pSysWindow->GetMenuBar();
+                if ( pMenuBar )
                 {
-                    implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
-                    doLayout();
-                    bNotify = sal_True;
+                    pMenuBar->SetDisplayable( sal_False );
+                    bResult = true;
+                    bNotify = true;
                 }
             }
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                  aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
-        {
-            bNotify = implts_hideProgressBar();
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
+    }
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
+    {
+        WriteGuard aWriteLock( m_aLock );
+        if ( m_aStatusBarElement.m_xUIElement.is() && !m_aStatusBarElement.m_bMasterHide &&
+             implts_hideStatusBar( sal_True ))
         {
-            UIElementVector::iterator pIter;
-
-            WriteGuard aWriteLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
-                {
-                    Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-                    Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-
-                    if ( xDockWindow.is() )
-                    {
-                        pIter->m_bVisible = sal_False;
-                        aWriteLock.unlock();
-
-                        xWindow->setVisible( sal_False );
-                        implts_writeNewStateData( aName, xWindow );
-
-                        if ( xDockWindow.is() && !xDockWindow->isFloating() )
-                            doLayout();
-
-                        bNotify = sal_True;
-                    } // if ( xDockWindow.is() )
-                    break;
-                }
-            }
+            implts_writeWindowStateData( m_aStatusBarAlias, m_aStatusBarElement );
+            bMustLayout = sal_True;
+            bNotify     = sal_True;
+            bResult     = sal_True;
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
-        {
-            ReadGuard aReadGuard( m_aLock );
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR( m_xSMGR );
-            aReadGuard.unlock();
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" ))
+    {
+        bResult = bNotify = implts_hideProgressBar();
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
+    {
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+            
+        bNotify     = pToolbarManager->hideToolbar( aName );
+        bMustLayout = pToolbarManager->isLayoutDirty();
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    {
+        ReadGuard aReadGuard( m_aLock );
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        uno::Reference< lang::XMultiServiceFactory > xSMGR( m_xSMGR );
+        aReadGuard.unlock();
 
-            impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, false );
-        }
+        impl_setDockingWindowVisibility( xSMGR, xFrame, aElementName, false );
     }
 
+    if ( bMustLayout )
+        doLayout();
+
     if ( bNotify )
-    {
-        // UI element is visible - provide information to listeners
-        implts_notifyListeners( css::frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
-    }
+        implts_notifyListeners( frame::LayoutManagerEvents::UIELEMENT_INVISIBLE, uno::makeAny( aName ) );
 
     return sal_False;
 }
 
-sal_Bool SAL_CALL LayoutManager::dockWindow( const ::rtl::OUString& aName, DockingArea DockingArea, const css::awt::Point& Pos )
+sal_Bool SAL_CALL LayoutManager::dockWindow( const ::rtl::OUString& aName, DockingArea DockingArea, const awt::Point& Pos )
 throw (RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( aName, aUIElement ) && aUIElement.m_xUIElement.is() )
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
+    
+    parseResourceURL( aName, aElementType, aElementName );
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        try
-        {
-            Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-            if ( xDockWindow.is() )
-            {
-                if ( DockingArea != DockingArea_DOCKINGAREA_DEFAULT )
-                    aUIElement.m_aDockedData.m_nDockedArea = sal_Int16( DockingArea );
-
-                if (( Pos.X != SAL_MAX_INT32 ) && ( Pos.Y != SAL_MAX_INT32 ))
-                    aUIElement.m_aDockedData.m_aPos = ::Point( Pos.X, Pos.Y );
-
-                if ( !xDockWindow->isFloating() )
-                {
-                    Window*     pWindow( 0 );
-                    ToolBox*    pToolBox( 0 );
-
-                    {
-                        SolarMutexGuard aGuard;
-                        pWindow = VCLUnoHelper::GetWindow( xWindow );
-                        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                        {
-                            pToolBox = (ToolBox *)pWindow;
-
-                            // We have to set the alignment of the toolbox. It's possible that the toolbox is moved from a
-                            // horizontal to a vertical docking area!
-                            pToolBox->SetAlign( ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ));
-                        }
-                    }
-
-                    if (( aUIElement.m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) ||
-                        ( aUIElement.m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
-                    {
-                        // Docking on its default position without a preset position -
-                        // we have to find a good place for it.
-                        ::Size      aSize;
-
-                        SolarMutexGuard aGuard;
-                        {
-                            if ( pToolBox )
-                                aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
-                            else
-                                aSize = pWindow->GetSizePixel();
-                        }
-
-                        ::Point aPixelPos;
-                        ::Point aDockPos;
-                        implts_findNextDockingPos( (::com::sun::star::ui::DockingArea)aUIElement.m_aDockedData.m_nDockedArea,
-                                                aSize,
-                                                aDockPos,
-                                                aPixelPos );
-                        aUIElement.m_aDockedData.m_aPos = aDockPos;
-                    }
-                }
-
-                WriteGuard aWriteLock( m_aLock );
-                UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                if ( rUIElement.m_aName == aName )
-                {
-                    rUIElement.m_aDockedData.m_nDockedArea = aUIElement.m_aDockedData.m_nDockedArea;
-                    rUIElement.m_aDockedData.m_aPos        = aUIElement.m_aDockedData.m_aPos;
-                }
-                aWriteLock.unlock();
-
-                if ( xDockWindow->isFloating() )
-                {
-                    // Will call toggle floating mode which will do the rest!
-                    xWindow->setVisible( sal_False );
-                    xDockWindow->setFloatingMode( sal_False );
-                    xWindow->setVisible( sal_True );
-                }
-                else
-                {
-                    implts_writeWindowStateData( aName, aUIElement );
-                    implts_sortUIElements();
-
-                    if ( aUIElement.m_bVisible )
-                        doLayout();
-                }
-
-                return sal_True;
-            }
-        }
-        catch ( DisposedException& )
-        {
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+        
+        if ( pToolbarManager )
+        {        
+            pToolbarManager->dockToolbar( aName, DockingArea, Pos );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
-
     return sal_False;
 }
 
-::sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 nElementType ) throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException)
 {
-    if ( nElementType == UIElementType::TOOLBAR )
-    {
-        std::vector< rtl::OUString > aToolBarNameVector;
-
-        ::rtl::OUString                  aElementType;
-        ::rtl::OUString                  aElementName;
-
-        {
-            ReadGuard aReadLock( m_aLock );
-            UIElementVector::iterator pIter;
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) &&
-                     pIter->m_xUIElement.is() &&
-                     pIter->m_bFloating &&
-                     pIter->m_bVisible )
-                    aToolBarNameVector.push_back( pIter->m_aName );
-            }
-        }
+    ReadGuard aReadLock( m_aLock );
+    bool bResult( false );
+    uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+    ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+    aReadLock.unlock();
 
-        const sal_uInt32 nCount = aToolBarNameVector.size();
-        for ( sal_uInt32 i = 0; i < nCount; ++i )
-        {
-            ::com::sun::star::awt::Point aPoint;
-            aPoint.X = aPoint.Y = SAL_MAX_INT32;
-            dockWindow( aToolBarNameVector[i], DockingArea_DOCKINGAREA_DEFAULT, aPoint );
-        }
+    if ( pToolbarManager ) 
+    {
+        bResult = pToolbarManager->dockAllToolbars();
+        if ( pToolbarManager->isLayoutDirty() )
+            doLayout();
     }
-
-    return sal_False;
+    return bResult;
 }
 
 sal_Bool SAL_CALL LayoutManager::floatWindow( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( aName, aUIElement ))
+    bool bResult( false );
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( aUIElement.m_xUIElement.is() )
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+
+        if ( pToolbarManager ) 
         {
-            try
-            {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xWindow.is() &&  xDockWindow.is() )
-                {
-                    if ( !xDockWindow->isFloating() )
-                    {
-                        xDockWindow->setFloatingMode( sal_True );
-                        return sal_True;
-                    }
-                }
-            }
-            catch ( DisposedException& )
-            {
-            }
+            bResult = pToolbarManager->floatToolbar( aName );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
-
-    return sal_False;
+    return bResult;
 }
 
-::sal_Bool SAL_CALL LayoutManager::lockWindow( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL LayoutManager::lockWindow( const ::rtl::OUString& aName )
+throw (uno::RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( ResourceURL, aUIElement ))
+    bool bResult( false );
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( aUIElement.m_xUIElement.is() )
-        {
-            try
-            {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow &&
-                     pWindow->IsVisible() &&
-                     xDockWindow.is() &&
-                     !xDockWindow->isFloating() )
-                {
-                    aUIElement.m_aDockedData.m_bLocked = sal_True;
-                    implts_writeWindowStateData( ResourceURL, aUIElement );
-                    xDockWindow->lock();
-
-                    // Write back lock state
-                    WriteGuard aWriteLock( m_aLock );
-                    UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                    if ( rUIElement.m_aName == aUIElement.m_aName )
-                        rUIElement.m_aDockedData.m_bLocked = aUIElement.m_aDockedData.m_bLocked;
-                    aWriteLock.unlock();
-
-                    doLayout();
-                    return sal_True;
-                }
-            }
-            catch ( DisposedException& )
-            {
-            }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+
+        if ( pToolbarManager ) 
+        {    
+            bResult = pToolbarManager->lockToolbar( aName );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
-
-    return sal_False;
+    return bResult;
 }
 
-::sal_Bool SAL_CALL LayoutManager::unlockWindow( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL LayoutManager::unlockWindow( const ::rtl::OUString& aName )
+throw (uno::RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( ResourceURL, aUIElement ))
+    bool bResult( false );
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( aUIElement.m_xUIElement.is() )
-        {
-            try
-            {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow &&
-                     pWindow->IsVisible() &&
-                     xDockWindow.is() &&
-                     !xDockWindow->isFloating() )
-                {
-                    aUIElement.m_aDockedData.m_bLocked = sal_False;
-                    implts_writeWindowStateData( ResourceURL, aUIElement );
-                    xDockWindow->unlock();
-
-                    // Write back lock state
-                    WriteGuard aWriteLock( m_aLock );
-                    UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                    if ( rUIElement.m_aName == aUIElement.m_aName )
-                        rUIElement.m_aDockedData.m_bLocked = aUIElement.m_aDockedData.m_bLocked;
-                    aWriteLock.unlock();
-
-                    doLayout();
-                    return sal_True;
-                }
-            }
-            catch ( DisposedException& )
-            {
-            }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+
+        if ( pToolbarManager ) 
+        {    
+            bResult = pToolbarManager->unlockToolbar( aName );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
-
-    return sal_False;
+    return bResult;
 }
 
-void SAL_CALL LayoutManager::setElementSize( const ::rtl::OUString& aName, const css::awt::Size& aSize )
+void SAL_CALL LayoutManager::setElementSize( const ::rtl::OUString& aName, const awt::Size& aSize )
 throw (RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( aName, aUIElement ))
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( aUIElement.m_xUIElement.is() )
-        {
-            try
-            {
-                Reference< css::awt::XWindow >  xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XWindow2 > xWindow2( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xThis( m_xToolbarManager );
+        ToolbarLayoutManager*             pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
 
-                if ( xWindow.is() && xWindow2.is() && xDockWindow.is() )
-                {
-                    if ( aUIElement.m_bFloating )
-                    {
-                        xWindow2->setOutputSize( aSize );
-                        implts_writeNewStateData( aName, xWindow );
-                    }
-                }
-            }
-            catch ( DisposedException& )
-            {
-            }
+        if ( pToolbarManager ) 
+        {    
+            pToolbarManager->setToolbarSize( aName, aSize );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
 }
 
-void SAL_CALL LayoutManager::setElementPos( const ::rtl::OUString& aName, const css::awt::Point& aPos )
+void SAL_CALL LayoutManager::setElementPos( const ::rtl::OUString& aName, const awt::Point& aPos )
 throw (RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( aName, aUIElement ) && aUIElement.m_xUIElement.is() )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        try
-        {
-            Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+        ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
+        aReadLock.unlock();
 
-            if ( xWindow.is() && xDockWindow.is() )
-            {
-                if ( aUIElement.m_bFloating )
-                {
-                    xWindow->setPosSize( aPos.X, aPos.Y, 0, 0, css::awt::PosSize::POS );
-                    implts_writeNewStateData( aName, xWindow );
-                }
-                else
-                {
-                    WriteGuard aWriteLock( m_aLock );
-                    UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                    if ( rUIElement.m_aName == aName )
-                        rUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                    aWriteLock.unlock();
-
-                    aUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                    implts_writeWindowStateData( aName, aUIElement );
-                    implts_sortUIElements();
-
-                    if ( aUIElement.m_bVisible )
-                        doLayout();
-                }
-            }
-        }
-        catch ( DisposedException& )
+        if ( pToolbarManager )
         {
+            pToolbarManager->setToolbarPos( aName, aPos );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
 }
 
-void SAL_CALL LayoutManager::setElementPosSize( const ::rtl::OUString& aName, const css::awt::Point& aPos, const css::awt::Size& aSize )
+void SAL_CALL LayoutManager::setElementPosSize( const ::rtl::OUString& aName, const awt::Point& aPos, const awt::Size& aSize )
 throw (RuntimeException)
 {
-    UIElement aUIElement;
-
-    if ( implts_findElement( aName, aUIElement ))
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( aUIElement.m_xUIElement.is() )
-        {
-            try
-            {
-                Reference< css::awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XWindow2 > xWindow2( aUIElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+        ToolbarLayoutManager* pToolbarManager( m_pToolbarManager );
+        aReadLock.unlock();
 
-                if ( xWindow.is() && xWindow2.is() && xDockWindow.is() )
-                {
-                    if ( aUIElement.m_bFloating )
-                    {
-                        xWindow2->setPosSize( aPos.X, aPos.Y, 0, 0, css::awt::PosSize::POS );
-                        xWindow2->setOutputSize( aSize );
-                        implts_writeNewStateData( aName, xWindow );
-                    }
-                    else
-                    {
-                        WriteGuard aWriteLock( m_aLock );
-                        UIElement& rUIElement = LayoutManager::impl_findElement( aUIElement.m_aName );
-                        if ( rUIElement.m_aName == aName )
-                            rUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                        aWriteLock.unlock();
-
-                        aUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
-                        implts_writeWindowStateData( aName, rUIElement );
-                        implts_sortUIElements();
-
-                        if ( aUIElement.m_bVisible )
-                            doLayout();
-                    }
-                }
-            }
-            catch ( DisposedException& )
-            {
-            }
+        if ( pToolbarManager )
+        {
+            pToolbarManager->setToolbarPosSize( aName, aPos, aSize );
+            if ( pToolbarManager->isLayoutDirty() )
+                doLayout();
         }
     }
 }
@@ -5194,84 +2119,66 @@ throw (RuntimeException)
     ::rtl::OUString aElementType;
     ::rtl::OUString aElementName;
 
-    if ( impl_parseResourceURL( aName, aElementType, aElementName ))
+    parseResourceURL( aName, aElementType, aElementName );
+    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
     {
-        if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-             aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
+        ReadGuard aReadLock( m_aLock );
+        if ( m_xContainerWindow.is() )
         {
-            ReadGuard aReadLock( m_aLock );
-            if ( m_xContainerWindow.is() )
-            {
-                aReadLock.unlock();
-
-                SolarMutexGuard aGuard;
-                Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-                while ( pWindow && !pWindow->IsSystemWindow() )
-                    pWindow = pWindow->GetParent();
+            aReadLock.unlock();
 
-                if ( pWindow )
-                {
-                    MenuBar* pMenuBar = ((SystemWindow *)pWindow)->GetMenuBar();
-                    if ( pMenuBar && pMenuBar->IsDisplayable() )
-                        return sal_True;
-                }
-                else
-                {
-                    aReadLock.lock();
-                    return m_bMenuVisible;
-                }
+            SolarMutexGuard aGuard;
+            SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow );
+            if ( pSysWindow )
+            {
+                MenuBar* pMenuBar = pSysWindow->GetMenuBar();
+                if ( pMenuBar && pMenuBar->IsDisplayable() )
+                    return sal_True;
             }
-        }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) ||
-                 ( m_aStatusBarElement.m_aName == aName ))
-        {
-            if ( m_aStatusBarElement.m_xUIElement.is() )
+            else
             {
-                Reference< css::awt::XWindow > xWindow(
-                    m_aStatusBarElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-                if ( xWindow.is() )
-                {
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow && pWindow->IsVisible() )
-                        return sal_True;
-                    else
-                        return sal_False;
-                }
+                aReadLock.lock();
+                return m_bMenuVisible;
             }
         }
-        else if (( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) &&
-                   aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" )))
-        {
-            if ( m_aProgressBarElement.m_xUIElement.is() )
-                return m_aProgressBarElement.m_bVisible;
-        }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
+    }
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "statusbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "statusbar" )) || ( m_aStatusBarElement.m_aName == aName ))
+    {
+        if ( m_aStatusBarElement.m_xUIElement.is() )
         {
-            UIElementVector::const_iterator pIter;
-
-            ReadGuard aReadLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
+            Reference< awt::XWindow > xWindow( m_aStatusBarElement.m_xUIElement->getRealInterface(), UNO_QUERY );
+            if ( xWindow.is() )
             {
-                if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
-                {
-                    Reference< css::awt::XWindow > xWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-                    if ( xWindow.is() )
-                    {
-                        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                        return pWindow && pWindow->IsVisible();
-                    }
-                }
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow && pWindow->IsVisible() )
+                    return sal_True;
+                else
+                    return sal_False;
             }
         }
-        else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
-        {
-            ReadGuard aReadGuard( m_aLock );
-            css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame );
-            aReadGuard.unlock();
+    }
+    else if (( aElementType.equalsIgnoreAsciiCaseAscii( "progressbar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "progressbar" )))
+    {
+        if ( m_aProgressBarElement.m_xUIElement.is() )
+            return m_aProgressBarElement.m_bVisible;
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
+    {
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< frame::XLayoutManager > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
 
-            return IsDockingWindowVisible( xFrame, aElementName );
-        }
+        if ( pToolbarManager )
+            return pToolbarManager->isToolbarVisible( aName );
+    }
+    else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" ))
+    {
+        ReadGuard aReadGuard( m_aLock );
+        uno::Reference< frame::XFrame > xFrame( m_xFrame );
+        aReadGuard.unlock();
+
+        return IsDockingWindowVisible( xFrame, aElementName );
     }
 
     return sal_False;
@@ -5280,16 +2187,15 @@ throw (RuntimeException)
 sal_Bool SAL_CALL LayoutManager::isElementFloating( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    UIElementVector::const_iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
-        {
-            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            return xDockWindow.is() && xDockWindow->isFloating();
-        }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+
+        if ( pToolbarManager )
+            return pToolbarManager->isToolbarFloating( aName );
     }
 
     return sal_False;
@@ -5298,93 +2204,69 @@ throw (RuntimeException)
 sal_Bool SAL_CALL LayoutManager::isElementDocked( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    UIElementVector::const_iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
-        {
-            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            return xDockWindow.is() && !xDockWindow->isFloating();
-        }
-    }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
 
+        if ( pToolbarManager )
+            return pToolbarManager->isToolbarDocked( aName );
+    }
+    
     return sal_False;
 }
 
-::sal_Bool SAL_CALL LayoutManager::isElementLocked( const ::rtl::OUString& ResourceURL )
-throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL LayoutManager::isElementLocked( const ::rtl::OUString& aName )
+throw (uno::RuntimeException)
 {
-    UIElementVector::const_iterator pIter;
-
-    ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        if (( pIter->m_aName == ResourceURL ) && ( pIter->m_xUIElement.is() ))
-        {
-            Reference< css::awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), UNO_QUERY );
-            return xDockWindow.is() && !xDockWindow->isLocked();
-        }
-    }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
 
+        if ( pToolbarManager )
+            return pToolbarManager->isToolbarLocked( aName );
+    }
+    
     return sal_False;
 }
 
-css::awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName )
+awt::Size SAL_CALL LayoutManager::getElementSize( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    ReadGuard aReadLock( m_aLock );
-    UIElement aElementData;
-    if ( implts_findElement( aName,aElementData  ) && aElementData.m_xUIElement.is() )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        Reference< css::awt::XWindow > xWindow( aElementData.m_xUIElement->getRealInterface(), UNO_QUERY );
-        if ( xWindow.is() )
-        {
-            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if ( pWindow )
-            {
-                ::Size aSize = pWindow->GetSizePixel();
-                css::awt::Size aElementSize;
-                aElementSize.Width  = aSize.Width();
-                aElementSize.Height = aSize.Height();
-                return aElementSize;
-            } // if ( pWindow )
-        }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
+
+        if ( pToolbarManager )
+            return pToolbarManager->getToolbarSize( aName );
     }
-    return css::awt::Size();
+    
+    return awt::Size();
 }
 
-css::awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName )
+awt::Point SAL_CALL LayoutManager::getElementPos( const ::rtl::OUString& aName )
 throw (RuntimeException)
 {
-    ReadGuard aReadLock( m_aLock );
-    UIElement aElementData;
-    if ( implts_findElement( aName,aElementData  ) && aElementData.m_xUIElement.is() )
+    if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
     {
-        Reference< css::awt::XWindow > xWindow( aElementData.m_xUIElement->getRealInterface(), UNO_QUERY );
-        Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-        if ( xDockWindow.is() )
-        {
-            css::awt::Point aPos;
-            if ( aElementData.m_bFloating )
-            {
-                css::awt::Rectangle aRect = xWindow->getPosSize();
-                aPos.X = aRect.X;
-                aPos.Y = aRect.Y;
-            }
-            else
-            {
-                ::Point aVirtualPos = aElementData.m_aDockedData.m_aPos;
-                aPos.X = aVirtualPos.X();
-                aPos.Y = aVirtualPos.Y();
-            }
+        ReadGuard aReadLock( m_aLock );
+        uno::Reference< uno::XInterface > xToolbarManager( m_xToolbarManager, uno::UNO_QUERY );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        aReadLock.unlock();
 
-            return aPos;
-        }
+        if ( pToolbarManager )
+            return pToolbarManager->getToolbarPos( aName );
     }
-
-    return css::awt::Point();
+    
+    return awt::Point();
 }
 
 void SAL_CALL LayoutManager::lock()
@@ -5406,7 +2288,7 @@ throw (RuntimeException)
 #endif
 
     Any a( nLockCount );
-    implts_notifyListeners( css::frame::LayoutManagerEvents::LOCK, a );
+    implts_notifyListeners( frame::LayoutManagerEvents::LOCK, a );
 }
 
 void SAL_CALL LayoutManager::unlock()
@@ -5429,15 +2311,15 @@ throw (RuntimeException)
     // conform to documentation: unlock with lock count == 0 means force a layout
 
     WriteGuard aWriteLock( m_aLock );
-    if ( bDoLayout )
-        m_aAsyncLayoutTimer.Stop();
-    aWriteLock.unlock();
+        if ( bDoLayout )
+                m_aAsyncLayoutTimer.Stop();
+        aWriteLock.unlock();
 
     Any a( nLockCount );
-    implts_notifyListeners( css::frame::LayoutManagerEvents::UNLOCK, a );
+    implts_notifyListeners( frame::LayoutManagerEvents::UNLOCK, a );
 
     if ( bDoLayout )
-      implts_doLayout_notify( sal_True );
+        implts_doLayout_notify( sal_True );
 }
 
 void SAL_CALL LayoutManager::doLayout()
@@ -5446,62 +2328,61 @@ throw (RuntimeException)
     implts_doLayout_notify( sal_True );
 }
 
+//---------------------------------------------------------------------------------------------------------
+//  ILayoutNotifications
+//---------------------------------------------------------------------------------------------------------
+void LayoutManager::requestLayout( Hint eHint )
+{
+    if ( eHint == HINT_TOOLBARSPACE_HAS_CHANGED )
+        doLayout();
+}
+
 void LayoutManager::implts_doLayout_notify( sal_Bool bOuterResize )
 {
-    sal_Bool bLayouted = implts_doLayout( sal_False, bOuterResize );
+    bool bLayouted = implts_doLayout( false, bOuterResize );
     if ( bLayouted )
-        implts_notifyListeners( css::frame::LayoutManagerEvents::LAYOUT, Any() );
+        implts_notifyListeners( frame::LayoutManagerEvents::LAYOUT, Any() );
 }
 
 sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize )
 {
     RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::implts_doLayout" );
 
-    sal_Bool bNoLock( sal_False );
-    css::awt::Rectangle aCurrBorderSpace;
-    Reference< css::awt::XWindow > xContainerWindow;
-    Reference< css::awt::XTopWindow2 > xContainerTopWindow;
-    Reference< css::awt::XWindow > xComponentWindow;
-    Reference< XDockingAreaAcceptor > xDockingAreaAcceptor;
-    bool bPreserveContentSize( false );
-
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
 
-    sal_Bool bMustDoLayout( m_bMustDoLayout );
-    if ( !m_bParentWindowVisible )
+    if ( !m_xFrame.is() || !m_bParentWindowVisible )
         return sal_False;
 
-    bNoLock = ( m_nLockCount == 0 );
-    xContainerWindow = m_xContainerWindow;
-    xContainerTopWindow = m_xContainerTopWindow;
-    xComponentWindow = m_xFrame->getComponentWindow();
-    xDockingAreaAcceptor = m_xDockingAreaAcceptor;
-    aCurrBorderSpace = m_aDockingArea;
-    bPreserveContentSize = m_bPreserveContentSize;
+    bool bPreserveContentSize( m_bPreserveContentSize );
+    bool bMustDoLayout( m_bMustDoLayout );
+    bool bNoLock = ( m_nLockCount == 0 );
+    awt::Rectangle aCurrBorderSpace( m_aDockingArea );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
+    Reference< awt::XTopWindow2 > xContainerTopWindow( m_xContainerTopWindow );
+    Reference< awt::XWindow > xComponentWindow( m_xFrame->getComponentWindow() );
+    Reference< XDockingAreaAcceptor > xDockingAreaAcceptor( m_xDockingAreaAcceptor );
     aReadLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     sal_Bool bLayouted( sal_False );
 
-    if ( bNoLock &&
-         xDockingAreaAcceptor.is() &&
-         xContainerWindow.is() &&
-         xComponentWindow.is() )
+    if ( bNoLock && xDockingAreaAcceptor.is() && xContainerWindow.is() && xComponentWindow.is() )
     {
         bLayouted = sal_True;
 
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteGuard( m_aLock );
         m_bDoLayout = sal_True;
         aWriteGuard.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-        css::awt::Rectangle     aBorderSpace = implts_calcDockingAreaSizes();
-        sal_Bool                bGotRequestedBorderSpace( sal_True );
-        sal_Bool                bEqual = implts_compareRectangles( aBorderSpace, aCurrBorderSpace );
 
-        if ( !bEqual || bForceRequestBorderSpace || bMustDoLayout )
+        awt::Rectangle aDockSpace( implts_calcDockingAreaSizes() );
+        awt::Rectangle aBorderSpace( aDockSpace );
+        sal_Bool       bGotRequestedBorderSpace( sal_True );
+        
+        // We have to add the height of a possible status bar
+        aBorderSpace.Height += implts_getStatusBarSize().Height();
+        
+        if ( !equalRectangles( aBorderSpace, aCurrBorderSpace ) || bForceRequestBorderSpace || bMustDoLayout )
         {
             // we always resize the content window (instead of the complete container window) if we're not set up
             // to (attempt to) preserve the content window's size
@@ -5514,7 +2395,7 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
 
             // if the component window does not have a size (yet), then we can't use it to calc the container
             // window size
-            css::awt::Rectangle aComponentRect = xComponentWindow->getPosSize();
+            awt::Rectangle aComponentRect = xComponentWindow->getPosSize();
             if ( bOuterResize && ( aComponentRect.Width == 0 ) && ( aComponentRect.Height == 0 ) )
                 bOuterResize = sal_False;
 
@@ -5533,52 +2414,34 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
 
             // if we did not do an container window resize, or it failed, then use the DockingAcceptor as usual
             if ( !bGotRequestedBorderSpace )
-            {
                 bGotRequestedBorderSpace = xDockingAreaAcceptor->requestDockingAreaSpace( aBorderSpace );
-                if ( bGotRequestedBorderSpace )
-                    xDockingAreaAcceptor->setDockingAreaSpace( aBorderSpace );
-            }
 
             if ( bGotRequestedBorderSpace )
             {
-                /* SAFE AREA ----------------------------------------------------------------------------------------------- */
                 aWriteGuard.lock();
                 m_aDockingArea = aBorderSpace;
                 m_bMustDoLayout = sal_False;
                 aWriteGuard.unlock();
-                /* SAFE AREA ----------------------------------------------------------------------------------------------- */
             }
         }
 
         if ( bGotRequestedBorderSpace )
         {
-            ::Size                      aContainerSize;
-            ::Size                      aStatusBarSize;
-
-            aStatusBarSize = implts_getStatusBarSize();
-            aBorderSpace.Height -= aStatusBarSize.Height();
-            implts_setDockingAreaWindowSizes( aBorderSpace );
+            ::Size      aContainerSize;
+            ::Size      aStatusBarSize;
+            
+            // Interim solution to let the layout method within the
+            // toolbar layout manager.
+            implts_setOffset( implts_getStatusBarSize().Height() );
+            m_pToolbarManager->setDockingArea( aDockSpace );
 
             // Subtract status bar size from our container output size. Docking area windows
             // don't contain the status bar!
+            aStatusBarSize = implts_getStatusBarSize();
             aContainerSize = implts_getContainerWindowOutputSize();
             aContainerSize.Height() -= aStatusBarSize.Height();
 
-            // Retrieve row/column dependent data from all docked user-interface elements
-            for ( sal_Int32 i = 0; i < DOCKINGAREAS_COUNT; i++ )
-            {
-                std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
-
-                implts_getDockingAreaElementInfos( (DockingArea)i, aRowColumnsWindowData );
-
-                sal_Int32 nOffset( 0 );
-                const sal_uInt32 nCount = aRowColumnsWindowData.size();
-                for ( sal_uInt32 j = 0; j < nCount; ++j )
-                {
-                    implts_calcWindowPosSizeOnSingleRowColumn( i, nOffset, aRowColumnsWindowData[j], aContainerSize );
-                    nOffset += aRowColumnsWindowData[j].nStaticSize;
-                }
-            }
+            m_pToolbarManager->doLayout(aContainerSize);
 
             // Position the status bar
             if ( aStatusBarSize.Height() > 0 )
@@ -5587,37 +2450,26 @@ sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_
                                             ::Size( aContainerSize.Width(),aStatusBarSize.Height() ));
             }
 
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+            xDockingAreaAcceptor->setDockingAreaSpace( aBorderSpace );
+
             aWriteGuard.lock();
             m_bDoLayout = sal_False;
             aWriteGuard.unlock();
-            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         }
     }
 
     return bLayouted;
 }
 
-sal_Bool LayoutManager::implts_compareRectangles( const css::awt::Rectangle& rRect1,
-                                                  const css::awt::Rectangle& rRect2 )
-{
-    return (( rRect1.X == rRect2.X ) &&
-            ( rRect1.Y == rRect2.Y ) &&
-            ( rRect1.Width == rRect2.Width ) &&
-            ( rRect1.Height == rRect2.Height ));
-}
-
 sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSize,
                                                       const awt::Point& rComponentPos )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
     Reference< awt::XWindow >               xContainerWindow    = m_xContainerWindow;
     Reference< awt::XTopWindow2 >           xContainerTopWindow = m_xContainerTopWindow;
     Reference< awt::XWindow >               xComponentWindow    = m_xFrame->getComponentWindow();
     Reference< container::XIndexAccess >    xDisplayAccess      = m_xDisplayAccess;
     aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     // calculate the maximum size we have for the container window
     awt::Rectangle aWorkArea;
@@ -5632,34 +2484,30 @@ sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContaine
         DBG_UNHANDLED_EXCEPTION();
     }
 
-    if ( ( aWorkArea.Width > 0 ) && ( aWorkArea.Height > 0 ) )
+    if (( aWorkArea.Width > 0 ) && ( aWorkArea.Height > 0 ))
     {
-        if  (   ( rContainerSize.Width > aWorkArea.Width )
-            ||  ( rContainerSize.Height > aWorkArea.Height )
-            )
+        if (( rContainerSize.Width > aWorkArea.Width ) || ( rContainerSize.Height > aWorkArea.Height ))
             return sal_False;
         // Strictly, this is not correct. If we have a multi-screen display (css.awt.DisplayAccess.MultiDisplay == true),
         // the the "effective work area" would be much larger than the work area of a single display, since we could in theory
         // position the container window across multiple screens.
-        // However, this should suffice as a heuristics here ... (nobody really wants to check whethere the different screens are
+        // However, this should suffice as a heuristics here ... (nobody really wants to check whether the different screens are
         // stacked horizontally or vertically, whether their work areas can really be combined, or are separated by non-work-areas,
         // and the like ... right?)
     }
 
     // resize our container window
-    xContainerWindow->setPosSize( 0, 0, rContainerSize.Width, rContainerSize.Height, css::awt::PosSize::SIZE );
+    xContainerWindow->setPosSize( 0, 0, rContainerSize.Width, rContainerSize.Height, awt::PosSize::SIZE );
     // position the component window
-    xComponentWindow->setPosSize( rComponentPos.X, rComponentPos.Y, 0, 0, css::awt::PosSize::POS );
+    xComponentWindow->setPosSize( rComponentPos.X, rComponentPos.Y, 0, 0, awt::PosSize::POS );
     return sal_True;
 }
 
 void SAL_CALL LayoutManager::setVisible( sal_Bool bVisible )
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
-    sal_Bool bWasVisible( sal_True );
-
     WriteGuard aWriteLock( m_aLock );
-    bWasVisible = m_bVisible;
+    sal_Bool bWasVisible( m_bVisible );
     m_bVisible = bVisible;
     aWriteLock.unlock();
 
@@ -5668,226 +2516,24 @@ throw (::com::sun::star::uno::RuntimeException)
 }
 
 sal_Bool SAL_CALL LayoutManager::isVisible()
-throw (::com::sun::star::uno::RuntimeException)
+throw (uno::RuntimeException)
 {
     ReadGuard aReadLock( m_aLock );
     return m_bVisible;
 }
 
-void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea,
-                                                               sal_Int32 nOffset,
-                                                               SingleRowColumnWindowData& rRowColumnWindowData,
-                                                               const ::Size& rContainerSize )
-{
-    sal_Int32   nDiff( 0 );
-    sal_Int32   nRCSpace( rRowColumnWindowData.nSpace );
-    sal_Int32   nTopDockingAreaSize;
-    sal_Int32   nBottomDockingAreaSize;
-    sal_Int32   nContainerClientSize;
-
-    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
-        return;
-
-    if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-        ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-    {
-        nContainerClientSize = rContainerSize.Width();
-        nDiff = nContainerClientSize - rRowColumnWindowData.nVarSize;
-    }
-    else
-    {
-        nTopDockingAreaSize    = implts_getTopBottomDockingAreaSizes().Width();
-        nBottomDockingAreaSize = implts_getTopBottomDockingAreaSizes().Height();
-        nContainerClientSize   = ( rContainerSize.Height() - nTopDockingAreaSize - nBottomDockingAreaSize );
-        nDiff = nContainerClientSize - rRowColumnWindowData.nVarSize;
-    }
-
-    const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
-    if (( nDiff < 0 ) && ( nRCSpace > 0 ))
-    {
-        // First we try to reduce the size of blank space before/behind docked windows
-        sal_Int32 i = nCount - 1;
-        while ( i >= 0 )
-        {
-            sal_Int32 nSpace = rRowColumnWindowData.aRowColumnSpace[i];
-            if ( nSpace >= -nDiff )
-            {
-
-                if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                    ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                {
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount ; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
-                }
-                else
-                {
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount ; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
-                }
-                nDiff = 0;
-
-                break;
-            }
-            else if ( nSpace > 0 )
-            {
-                if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                    ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                {
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].X -= nSpace;
-                }
-                else
-                {
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y -= nSpace;
-                }
-                nDiff += nSpace;
-            }
-            --i;
-        }
-    }
-
-    // Check if we have to reduce further
-    if ( nDiff < 0 )
-    {
-        // Now we have to reduce the size of certain docked windows
-        sal_Int32 i = sal_Int32( nCount - 1 );
-        while ( i >= 0 )
-        {
-            css::awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
-            ::Size               aMinSize;
-
-            SolarMutexGuard aGuard;
-            {
-                Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                    aMinSize = ((ToolBox *)pWindow)->CalcMinimumWindowSizePixel();
-            }
-
-            if (( aMinSize.Width() > 0 ) && ( aMinSize.Height() > 0 ))
-            {
-                if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) ||
-                    ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                {
-                    sal_Int32 nMaxReducation = ( rWinRect.Width - aMinSize.Width() );
-                    if ( nMaxReducation >= -nDiff )
-                    {
-                        rWinRect.Width = rWinRect.Width + nDiff;
-                        nDiff = 0;
-                    }
-                    else
-                    {
-                        rWinRect.Width = aMinSize.Width();
-                        nDiff += nMaxReducation;
-                    }
-
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
-                }
-                else
-                {
-                    sal_Int32 nMaxReducation = ( rWinRect.Height - aMinSize.Height() );
-                    if ( nMaxReducation >= -nDiff )
-                    {
-                        rWinRect.Height = rWinRect.Height + nDiff;
-                        nDiff = 0;
-                    }
-                    else
-                    {
-                        rWinRect.Height = aMinSize.Height();
-                        nDiff += nMaxReducation;
-                    }
-
-                    // Try to move this and all user elements behind with the calculated difference
-                    for ( sal_uInt32 j = i; j < nCount; j++ )
-                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
-                }
-            }
-
-            if ( nDiff >= 0 )
-                break;
-
-            --i;
-        }
-    }
-
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    ReadGuard aReadLock( m_aLock );
-    Window* pDockAreaWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[nDockingArea] );
-    aReadLock.unlock();
-
-    sal_Int32 nCurrPos( 0 );
-    sal_Int32 nStartOffset( 0 );
-
-    if ( nDockingArea == DockingArea_DOCKINGAREA_RIGHT )
-        nStartOffset = pDockAreaWindow->GetSizePixel().Width() - rRowColumnWindowData.nStaticSize;
-    else if ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM )
-        nStartOffset = pDockAreaWindow->GetSizePixel().Height() - rRowColumnWindowData.nStaticSize;
-
-    SolarMutexGuard aGuard;
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-    {
-        Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        Window* pOldParentWindow = pWindow->GetParent();
-
-        if ( pDockAreaWindow != pOldParentWindow )
-            pWindow->SetParent( pDockAreaWindow );
-
-        css::awt::Rectangle aWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
-        if ( nDockingArea == DockingArea_DOCKINGAREA_TOP )
-        {
-            if ( aWinRect.X < nCurrPos )
-                aWinRect.X = nCurrPos;
-            pWindow->SetPosSizePixel( ::Point( aWinRect.X, nOffset ),
-                                      ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize ));
-            nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width;
-        }
-        else if ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM )
-        {
-            if ( aWinRect.X < nCurrPos )
-                aWinRect.X = nCurrPos;
-            pWindow->SetPosSizePixel( ::Point( aWinRect.X, nStartOffset - nOffset ),
-                                      ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize ));
-            nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width;
-        }
-        else if ( nDockingArea == DockingArea_DOCKINGAREA_LEFT )
-        {
-            if ( aWinRect.Y < nCurrPos )
-                aWinRect.Y = nCurrPos;
-            pWindow->SetPosSizePixel( ::Point( nOffset, aWinRect.Y ),
-                                      ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height ));
-            nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height;
-        }
-        else if ( nDockingArea == DockingArea_DOCKINGAREA_RIGHT )
-        {
-            if ( aWinRect.Y < nCurrPos )
-                aWinRect.Y = nCurrPos;
-            pWindow->SetPosSizePixel( ::Point( nStartOffset - nOffset, aWinRect.Y ),
-                                      ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height ));
-            nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height;
-        }
-    }
-}
-
 ::Size LayoutManager::implts_getStatusBarSize()
 {
     ReadGuard aReadLock( m_aLock );
-    sal_Bool bStatusBarVisible( isElementVisible( m_aStatusBarAlias ));
-    sal_Bool bProgressBarVisible( isElementVisible( m_aProgressBarAlias ));
-    sal_Bool bVisible = m_bVisible;
-    Reference< XUIElement > xStatusBar = m_aStatusBarElement.m_xUIElement;
-    Reference< XUIElement > xProgressBar = m_aProgressBarElement.m_xUIElement;
+    bool bStatusBarVisible( isElementVisible( m_aStatusBarAlias ));
+    bool bProgressBarVisible( isElementVisible( m_aProgressBarAlias ));
+    bool bVisible( m_bVisible );
+    Reference< XUIElement > xStatusBar( m_aStatusBarElement.m_xUIElement );
+    Reference< XUIElement > xProgressBar( m_aProgressBarElement.m_xUIElement );
 
-    Reference< css::awt::XWindow > xWindow;
+    Reference< awt::XWindow > xWindow;
     if ( bStatusBarVisible && bVisible && xStatusBar.is() )
-        xWindow = Reference< css::awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
+        xWindow = Reference< awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
     else if ( xProgressBar.is() && !xStatusBar.is() && bProgressBarVisible )
     {
         ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
@@ -5898,194 +2544,40 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin
 
     if ( xWindow.is() )
     {
-        css::awt::Rectangle aPosSize = xWindow->getPosSize();
+        awt::Rectangle aPosSize = xWindow->getPosSize();
         return ::Size( aPosSize.Width, aPosSize.Height );
     }
     else
         return ::Size();
 }
 
-css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes()
+awt::Rectangle LayoutManager::implts_calcDockingAreaSizes()
 {
-    Reference< css::awt::XWindow > xContainerWindow;
-    Reference< XDockingAreaAcceptor > xDockingAreaAcceptor;
-
     ReadGuard aReadLock( m_aLock );
-    xContainerWindow = m_xContainerWindow;
-    xDockingAreaAcceptor = m_xDockingAreaAcceptor;
-    UIElementVector aWindowVector( m_aUIElements );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
+    Reference< XDockingAreaAcceptor > xDockingAreaAcceptor( m_xDockingAreaAcceptor );
     aReadLock.unlock();
 
-    css::awt::Rectangle aBorderSpace;
+    awt::Rectangle aBorderSpace;
     if ( xDockingAreaAcceptor.is() && xContainerWindow.is() )
-    {
-        sal_Int32                       nCurrRowColumn( 0 );
-        sal_Int32                       nCurrPos( 0 );
-        sal_Int32                       nCurrDockingArea( DockingArea_DOCKINGAREA_TOP );
-        std::vector< sal_Int32 >        aRowColumnSizes[DOCKINGAREAS_COUNT];
-        UIElementVector::const_iterator pConstIter;
-
-        aRowColumnSizes[nCurrDockingArea].clear();
-        aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-
-        for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter )
-        {
-            Reference< XUIElement > xUIElement( pConstIter->m_xUIElement, UNO_QUERY );
-            if ( xUIElement.is() )
-            {
-                Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-                if ( xWindow.is() && xDockWindow.is() )
-                {
-                    SolarMutexGuard aGuard;
-
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow && pWindow->IsVisible() && !xDockWindow->isFloating() )
-                    {
-                        css::awt::Rectangle aPosSize = xWindow->getPosSize();
-                        if ( pConstIter->m_aDockedData.m_nDockedArea != nCurrDockingArea )
-                        {
-                            nCurrDockingArea    = pConstIter->m_aDockedData.m_nDockedArea;
-                            nCurrRowColumn      = 0;
-                            nCurrPos            = 0;
-                            aRowColumnSizes[nCurrDockingArea].clear();
-                            aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                        }
-
-                        if ( pConstIter->m_aDockedData.m_nDockedArea == nCurrDockingArea )
-                        {
-                            if (( pConstIter->m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_TOP ) ||
-                                ( pConstIter->m_aDockedData.m_nDockedArea == DockingArea_DOCKINGAREA_BOTTOM ))
-                            {
-                                if ( pConstIter->m_aDockedData.m_aPos.Y() > nCurrPos )
-                                {
-                                    ++nCurrRowColumn;
-                                    nCurrPos = pConstIter->m_aDockedData.m_aPos.Y();
-                                    aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                                }
-
-                                if ( aPosSize.Height > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
-                                    aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Height;
-                            }
-                            else
-                            {
-                                if ( pConstIter->m_aDockedData.m_aPos.X() > nCurrPos )
-                                {
-                                    ++nCurrRowColumn;
-                                    nCurrPos = pConstIter->m_aDockedData.m_aPos.X();
-                                    aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                                }
-
-                                if ( aPosSize.Width > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
-                                    aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Width;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Sum up max heights from every row/column
-        if ( !aWindowVector.empty() )
-        {
-            for ( sal_Int32 i = 0; i <= DockingArea_DOCKINGAREA_RIGHT; i++ )
-            {
-                sal_Int32 nSize( 0 );
-                const sal_uInt32 nCount = aRowColumnSizes[i].size();
-                for ( sal_uInt32 j = 0; j < nCount; j++ )
-                    nSize += aRowColumnSizes[i][j];
-
-                if ( i == DockingArea_DOCKINGAREA_TOP )
-                    aBorderSpace.Y = nSize;
-                else if ( i == DockingArea_DOCKINGAREA_BOTTOM )
-                    aBorderSpace.Height = nSize;
-                else if ( i == DockingArea_DOCKINGAREA_LEFT )
-                    aBorderSpace.X = nSize;
-                else
-                    aBorderSpace.Width = nSize;
-            }
-        }
-
-        // We have to add the height of a possible status bar
-        aBorderSpace.Height += implts_getStatusBarSize().Height();
-    }
-
+        aBorderSpace = m_pToolbarManager->getDockingArea();
+    
     return aBorderSpace;
 }
 
-void LayoutManager::implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace )
+void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rBorderSpace*/ )
 {
-    Reference< css::awt::XWindow > xContainerWindow;
-
     ReadGuard aReadLock( m_aLock );
-    xContainerWindow = m_xContainerWindow;
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
     aReadLock.unlock();
 
-    css::uno::Reference< css::awt::XDevice > xDevice( xContainerWindow, css::uno::UNO_QUERY );
+    uno::Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY );
     // Convert relativ size to output size.
-    css::awt::Rectangle  aRectangle             = xContainerWindow->getPosSize();
-    css::awt::DeviceInfo aInfo                  = xDevice->getInfo();
-    css::awt::Size       aContainerClientSize   = css::awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset  ,
-                                                                  aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
-    ::Size               aStatusBarSize         = implts_getStatusBarSize();
-
-    sal_Int32 nLeftRightDockingAreaHeight( aContainerClientSize.Height );
-    if ( rBorderSpace.Y >= 0 )
-    {
-        // Top docking area window
-        aReadLock.lock();
-        Reference< css::awt::XWindow > xDockAreaWindow( m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP] );
-        aReadLock.unlock();
-
-        xDockAreaWindow->setPosSize( 0, 0, aContainerClientSize.Width, rBorderSpace.Y, css::awt::PosSize::POSSIZE );
-        xDockAreaWindow->setVisible( sal_True );
-        nLeftRightDockingAreaHeight -= rBorderSpace.Y;
-    }
-
-    if ( rBorderSpace.Height >= 0 )
-    {
-        // Bottom docking area window
-        sal_Int32 nBottomPos = std::max( sal_Int32( aContainerClientSize.Height - rBorderSpace.Height - aStatusBarSize.Height() ), sal_Int32( 0 ));
-        sal_Int32 nHeight = ( nBottomPos == 0 ) ? 0 : rBorderSpace.Height;
-
-        aReadLock.lock();
-        Reference< css::awt::XWindow > xDockAreaWindow( m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM] );
-        aReadLock.unlock();
-
-        xDockAreaWindow->setPosSize( 0, nBottomPos, aContainerClientSize.Width, nHeight, css::awt::PosSize::POSSIZE );
-        xDockAreaWindow->setVisible( sal_True );
-        nLeftRightDockingAreaHeight -= nHeight;
-    }
-
-    nLeftRightDockingAreaHeight -= aStatusBarSize.Height();
-    if ( rBorderSpace.X >= 0 || nLeftRightDockingAreaHeight > 0 )
-    {
-        // Left docking area window
-        aReadLock.lock();
-        Reference< css::awt::XWindow > xDockAreaWindow( m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT] );
-        aReadLock.unlock();
-
-        // We also have to change our right docking area window if the top or bottom area has changed. They have a higher priority!
-        sal_Int32 nHeight = std::max( sal_Int32( 0 ), sal_Int32( nLeftRightDockingAreaHeight ));
-
-        xDockAreaWindow->setPosSize( 0, rBorderSpace.Y, rBorderSpace.X, nHeight, css::awt::PosSize::POSSIZE );
-        xDockAreaWindow->setVisible( sal_True );
-    }
-    if ( rBorderSpace.Width >= 0 || nLeftRightDockingAreaHeight > 0 )
-    {
-        // Right docking area window
-        aReadLock.lock();
-        Reference< css::awt::XWindow > xDockAreaWindow( m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT] );
-        aReadLock.unlock();
-
-        // We also have to change our right docking area window if the top or bottom area has changed. They have a higher priority!
-        sal_Int32 nLeftPos  = std::max( sal_Int32( 0 ), sal_Int32( aContainerClientSize.Width - rBorderSpace.Width ));
-        sal_Int32 nHeight   = std::max( sal_Int32( 0 ), sal_Int32( nLeftRightDockingAreaHeight ));
-        sal_Int32 nWidth    = ( nLeftPos == 0 ) ? 0 : rBorderSpace.Width;
-
-        xDockAreaWindow->setPosSize( nLeftPos, rBorderSpace.Y, nWidth, nHeight, css::awt::PosSize::POSSIZE );
-        xDockAreaWindow->setVisible( sal_True );
-    }
+    awt::Rectangle  aRectangle           = xContainerWindow->getPosSize();
+    awt::DeviceInfo aInfo                = xDevice->getInfo();
+    awt::Size       aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset,
+                                                      aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
+    ::Size          aStatusBarSize       = implts_getStatusBarSize();
 
     // Position the status bar
     if ( aStatusBarSize.Height() > 0 )
@@ -6096,41 +2588,28 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const css::awt::Rectangle&
 }
 
 //---------------------------------------------------------------------------------------------------------
-//	XMenuCloser
+//      XMenuCloser
 //---------------------------------------------------------------------------------------------------------
 void LayoutManager::implts_updateMenuBarClose()
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
-    sal_Bool bShowCloser = m_bMenuBarCloser;
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
+    bool                      bShowCloser( m_bMenuBarCloser );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
     aWriteLock.unlock();
 
     if ( xContainerWindow.is() )
     {
         SolarMutexGuard aGuard;
 
-        Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
-        while ( pWindow && !pWindow->IsSystemWindow() )
-            pWindow = pWindow->GetParent();
-
-        if ( pWindow )
+        SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
+        if ( pSysWindow )
         {
-            SystemWindow* pSysWindow = (SystemWindow *)pWindow;
             MenuBar* pMenuBar = pSysWindow->GetMenuBar();
             if ( pMenuBar )
             {
-                // TODO remove link on FALSE ?!
-                if ( bShowCloser )
-                {
-                    pMenuBar->ShowCloser( TRUE );
-                    pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
-                }
-                else
-                {
-                    pMenuBar->ShowCloser( FALSE );
-                    pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
-                }
+                // TODO remove link on sal_False ?!
+                pMenuBar->ShowCloser( bShowCloser );
+                pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
             }
         }
     }
@@ -6141,14 +2620,14 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     sal_Bool bMenuVisible( m_bMenuVisible );
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
 
     MenuBar* pSetMenuBar = 0;
     if ( m_xInplaceMenuBar.is() )
         pSetMenuBar = (MenuBar *)m_pInplaceMenuBar->GetMenuBar();
     else
     {
-        MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() );
+        MenuBarWrapper* pMenuBarWrapper = static_cast< MenuBarWrapper* >( m_xMenuBar.get() );
         if ( pMenuBarWrapper )
             pSetMenuBar = (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar();
     }
@@ -6156,13 +2635,10 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     SolarMutexGuard aGuard;
-    Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-    while ( pWindow && !pWindow->IsSystemWindow() )
-        pWindow = pWindow->GetParent();
-
-    if ( pWindow && bMenuVisible && pSetMenuBar )
+    SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
+    if ( pSysWindow && bMenuVisible && pSetMenuBar )
     {
-        ((SystemWindow *)pWindow)->SetMenuBar( pSetMenuBar );
+        pSysWindow->SetMenuBar( pSetMenuBar );
         pSetMenuBar->SetDisplayable( sal_True );
         return sal_True;
     }
@@ -6170,725 +2646,62 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     return sal_False;
 }
 
-sal_Int16 LayoutManager::implts_getCurrentSymbolsSize()
-{
-    sal_Int16 eOptSymbolsSize( 0 );
-
-    {
-        ReadGuard aReadLock( m_aLock );
-        SolarMutexGuard aGuard;
-        if ( m_pMiscOptions )
-            eOptSymbolsSize = m_pMiscOptions->GetCurrentSymbolsSize();
-    }
-
-    return eOptSymbolsSize;
-}
-
-sal_Int16 LayoutManager::implts_getCurrentSymbolsStyle()
+void LayoutManager::implts_setMenuBarCloser(sal_Bool bCloserState)
 {
-    sal_Int16 eOptSymbolsStyle( 0 );
-
-    {
-        ReadGuard aReadLock( m_aLock );
-        SolarMutexGuard aGuard;
-        if ( m_pMiscOptions )
-            eOptSymbolsStyle = m_pMiscOptions->GetCurrentSymbolsStyle();
-    }
+    WriteGuard aWriteLock( m_aLock );
+    m_bMenuBarCloser = bCloserState;
+    aWriteLock.unlock();
 
-    return eOptSymbolsStyle;
+    implts_updateMenuBarClose();
 }
 
 IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
 {
     ReadGuard aReadLock( m_aLock );
-    css::uno::Reference< css::frame::XDispatchProvider >   xProvider(m_xFrame, css::uno::UNO_QUERY);
-    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR    = m_xSMGR;
+    uno::Reference< frame::XDispatchProvider >   xProvider(m_xFrame, uno::UNO_QUERY);
+    uno::Reference< lang::XMultiServiceFactory > xSMGR    = m_xSMGR;
     aReadLock.unlock();
 
-    if (! xProvider.is())
+    if ( !xProvider.is())
         return 0;
 
-    css::uno::Reference< css::frame::XDispatchHelper > xDispatcher(
-        xSMGR->createInstance(SERVICENAME_DISPATCHHELPER), css::uno::UNO_QUERY_THROW);
+    uno::Reference< frame::XDispatchHelper > xDispatcher(
+        xSMGR->createInstance(SERVICENAME_DISPATCHHELPER), uno::UNO_QUERY_THROW);
 
     xDispatcher->executeDispatch(
         xProvider,
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")),
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
         0,
-        css::uno::Sequence< css::beans::PropertyValue >());
+        uno::Sequence< beans::PropertyValue >());
 
     return 0;
 }
 
-IMPL_LINK( LayoutManager, OptionsChanged, void*, EMPTYARG )
-{
-    sal_Int16 eSymbolsSize( implts_getCurrentSymbolsSize() );
-    sal_Int16 eSymbolsStyle( implts_getCurrentSymbolsStyle() );
-
-    ReadGuard aReadLock( m_aLock );
-    sal_Int16 eOldSymbolsSize = m_eSymbolsSize;
-    sal_Int16 eOldSymbolsStyle = m_eSymbolsStyle;
-    aReadLock.unlock();
-
-    if ( eSymbolsSize != eOldSymbolsSize || eSymbolsStyle != eOldSymbolsStyle )
-    {
-        WriteGuard aWriteLock( m_aLock );
-        m_eSymbolsSize = eSymbolsSize;
-        m_eSymbolsStyle = eSymbolsStyle;
-        aWriteLock.unlock();
-
-        std::vector< Reference< XUpdatable > > aToolBarVector;
-
-        aReadLock.lock();
-        {
-            UIElementVector::iterator pIter;
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-            {
-                if ( pIter->m_xUIElement.is() )
-                    aToolBarVector.push_back( Reference< XUpdatable >( pIter->m_xUIElement, UNO_QUERY ));
-            }
-        }
-        aReadLock.unlock();
-
-        lock();
-        {
-            std::vector< Reference< XUpdatable > >::iterator pIter;
-            for ( pIter = aToolBarVector.begin(); pIter != aToolBarVector.end(); ++pIter )
-            {
-                if ( (*pIter).is() )
-                    (*pIter)->update();
-            }
-        }
-        unlock();
-        doLayout();
-    }
-
-    return 1;
-}
-
 IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG )
 {
     return 1;
 }
 
 //---------------------------------------------------------------------------------------------------------
-//	XDockableWindowListener
-//---------------------------------------------------------------------------------------------------------
-void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Bool    bWinFound( sal_False );
-    UIElement   aUIElement;
-
-    ReadGuard aReadGuard( m_aLock );
-    Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow );
-    Reference< css::awt::XWindow2 > xWindow( e.Source, UNO_QUERY );
-    aReadGuard.unlock();
-
-    Window* pContainerWindow( 0 );
-    Window* pWindow( 0 );
-    ::Point aMousePos;
-    {
-        SolarMutexGuard aGuard;
-        pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
-        aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y ));
-    }
-
-    bWinFound = implts_findElement( e.Source, aUIElement );
-
-    if ( bWinFound && xWindow.is() )
-    {
-        css::awt::Rectangle aRect;
-        Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-        if ( xDockWindow->isFloating() )
-        {
-            css::awt::Rectangle aPos  = xWindow->getPosSize();
-            css::awt::Size      aSize = xWindow->getOutputSize();
-
-            aUIElement.m_aFloatingData.m_aPos    = ::Point( aPos.X, aPos.Y );
-            aUIElement.m_aFloatingData.m_aSize   = ::Size( aSize.Width, aSize.Height );
-
-            SolarMutexGuard aGuard;
-            pWindow = VCLUnoHelper::GetWindow( xWindow );
-            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-            {
-                ToolBox* pToolBox = (ToolBox *)pWindow;
-                aUIElement.m_aFloatingData.m_nLines          = pToolBox->GetFloatingLines();
-                aUIElement.m_aFloatingData.m_bIsHorizontal   = (( pToolBox->GetAlign() == WINDOWALIGN_TOP ) ||
-                                                                ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
-            }
-        }
-    }
-
-    WriteGuard aWriteLock( m_aLock );
-    m_bDockingInProgress = bWinFound;
-    m_aDockUIElement = aUIElement;
-    m_aDockUIElement.m_bUserActive = sal_True;
-    m_aStartDockMousePos = aMousePos;
-    aWriteLock.unlock();
-}
-
-::Rectangle LayoutManager::implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset )
-{
-    ::Rectangle aRect( rRect );
-
-    aRect.Left() -= nHotZoneOffset;
-    aRect.Top() -= nHotZoneOffset;
-    aRect.Right() += nHotZoneOffset;
-    aRect.Bottom() += nHotZoneOffset;
-    return aRect;
-}
-
-css::awt::DockingData SAL_CALL LayoutManager::docking( const ::com::sun::star::awt::DockingEvent& e )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25;
-    const sal_Int32 MAGNETIC_DISTANCE_DOCK   = 20;
-
-    css::awt::DockingData                  aDockingData;
-    Reference< css::awt::XDockableWindow > xDockWindow( e.Source, UNO_QUERY );
-    Reference< css::awt::XWindow >         xWindow( e.Source, UNO_QUERY );
-    Reference< css::awt::XWindow >         xTopDockingWindow;
-    Reference< css::awt::XWindow >         xLeftDockingWindow;
-    Reference< css::awt::XWindow >         xRightDockingWindow;
-    Reference< css::awt::XWindow >         xBottomDockingWindow;
-    Reference< css::awt::XWindow >         xContainerWindow;
-    UIElement                              aUIDockingElement;
-    DockingOperation                       eDockingOperation( DOCKOP_ON_COLROW );
-    ::Size                                 aStatusBarSize;
-
-    aDockingData.TrackingRectangle = e.TrackingRectangle;
-    sal_Bool bDockingInProgress;
-
-    {
-        ReadGuard aReadLock( m_aLock );
-        bDockingInProgress = m_bDockingInProgress;
-        if ( bDockingInProgress )
-        {
-            xContainerWindow        = m_xContainerWindow;
-            xTopDockingWindow       = m_xDockAreaWindows[DockingArea_DOCKINGAREA_TOP];
-            xLeftDockingWindow      = m_xDockAreaWindows[DockingArea_DOCKINGAREA_LEFT];
-            xRightDockingWindow     = m_xDockAreaWindows[DockingArea_DOCKINGAREA_RIGHT];
-            xBottomDockingWindow    = m_xDockAreaWindows[DockingArea_DOCKINGAREA_BOTTOM];
-            aUIDockingElement       = m_aDockUIElement;
-            aStatusBarSize          = implts_getStatusBarSize();
-        }
-    }
-
-    if ( bDockingInProgress &&
-         xDockWindow.is() &&
-         xWindow.is() )
-    {
-        try
-        {
-            SolarMutexGuard aGuard;
-
-            sal_Int16 eDockingArea( -1 ); // none
-            sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK );
-            css::awt::Rectangle aNewTrackingRect;
-            ::Rectangle aTrackingRect( e.TrackingRectangle.X,
-                                       e.TrackingRectangle.Y,
-                                       ( e.TrackingRectangle.X + e.TrackingRectangle.Width ),
-                                       ( e.TrackingRectangle.Y + e.TrackingRectangle.Height ));
-
-            css::awt::Rectangle aTmpRect = xTopDockingWindow->getPosSize();
-            ::Rectangle aTopDockRect( aTmpRect.X, aTmpRect.Y, aTmpRect.Width, aTmpRect.Height );
-            ::Rectangle aHotZoneTopDockRect( implts_calcHotZoneRect( aTopDockRect, nMagneticZone ));
-
-            aTmpRect = xBottomDockingWindow->getPosSize();
-            ::Rectangle aBottomDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width), ( aTmpRect.Y + aTmpRect.Height ));
-            ::Rectangle aHotZoneBottomDockRect( implts_calcHotZoneRect( aBottomDockRect, nMagneticZone ));
-
-            aTmpRect = xLeftDockingWindow->getPosSize();
-            ::Rectangle aLeftDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height ));
-            ::Rectangle aHotZoneLeftDockRect( implts_calcHotZoneRect( aLeftDockRect, nMagneticZone ));
-
-            aTmpRect = xRightDockingWindow->getPosSize();
-            ::Rectangle aRightDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height ));
-            ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone ));
-
-            Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
-            ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
-
-            if ( aHotZoneTopDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_TOP;
-            else if ( aHotZoneBottomDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_BOTTOM;
-            else if ( aHotZoneLeftDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_LEFT;
-            else if ( aHotZoneRightDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_RIGHT;
-
-            // Higher priority for movements inside the real docking area
-            if ( aTopDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_TOP;
-            else if ( aBottomDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_BOTTOM;
-            else if ( aLeftDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_LEFT;
-            else if ( aRightDockRect.IsInside( aMousePos ))
-                eDockingArea = DockingArea_DOCKINGAREA_RIGHT;
-
-            // Determine if we have a toolbar and set alignment according to the docking area!
-            Window*     pWindow = VCLUnoHelper::GetWindow( xWindow );
-            ToolBox*    pToolBox = 0;
-            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-                pToolBox = (ToolBox *)pWindow;
-
-            if ( eDockingArea != -1 )
-            {
-                if ( eDockingArea == DockingArea_DOCKINGAREA_TOP )
-                {
-                    aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_TOP;
-                    aUIDockingElement.m_bFloating = sal_False;
-                    VCLUnoHelper::GetWindow( xTopDockingWindow );
-                }
-                else if ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM )
-                {
-                    aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_BOTTOM;
-                    aUIDockingElement.m_bFloating = sal_False;
-                    VCLUnoHelper::GetWindow( xBottomDockingWindow );
-                }
-                else if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT )
-                {
-                    aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_LEFT;
-                    aUIDockingElement.m_bFloating = sal_False;
-                    VCLUnoHelper::GetWindow( xLeftDockingWindow );
-                }
-                else if ( eDockingArea == DockingArea_DOCKINGAREA_RIGHT )
-                {
-                    aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_RIGHT;
-                    aUIDockingElement.m_bFloating = sal_False;
-                    VCLUnoHelper::GetWindow( xRightDockingWindow );
-                }
-
-                ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() );
-                aTrackingRect.SetPos( aOutputPos );
-
-                ::Rectangle         aNewDockingRect( aTrackingRect );
-                implts_calcDockingPosSize( aUIDockingElement, eDockingOperation, aNewDockingRect, aMousePos );
-
-                ::Point aScreenPos = pContainerWindow->OutputToScreenPixel( aNewDockingRect.TopLeft() );
-                aNewTrackingRect = css::awt::Rectangle( aScreenPos.X(),
-                                                        aScreenPos.Y(),
-                                                        aNewDockingRect.getWidth(),
-                                                        aNewDockingRect.getHeight() );
-                aDockingData.TrackingRectangle = aNewTrackingRect;
-            }
-            else if ( pToolBox && bDockingInProgress )
-            {
-                sal_Bool bIsHorizontal = (( pToolBox->GetAlign() == WINDOWALIGN_TOP    ) ||
-                                          ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
-                ::Size aFloatSize = aUIDockingElement.m_aFloatingData.m_aSize;
-                if ( aFloatSize.Width() > 0 && aFloatSize.Height() > 0 )
-                {
-                    aUIDockingElement.m_aFloatingData.m_aPos = pContainerWindow->ScreenToOutputPixel(
-                                                                ::Point( e.MousePos.X, e.MousePos.Y ));
-                    aDockingData.TrackingRectangle.Height = aFloatSize.Height();
-                    aDockingData.TrackingRectangle.Width  = aFloatSize.Width();
-                }
-                else
-                {
-                    aFloatSize = pToolBox->CalcWindowSizePixel();
-                    if ( !bIsHorizontal )
-                    {
-                        // Floating toolbars are always horizontal aligned! We have to swap
-                        // width/height if we have a vertical aligned toolbar.
-                        sal_Int32 nTemp = aFloatSize.Height();
-                        aFloatSize.Height() = aFloatSize.Width();
-                        aFloatSize.Width()  = nTemp;
-                    }
-
-                    aDockingData.TrackingRectangle.Height = aFloatSize.Height();
-                    aDockingData.TrackingRectangle.Width  = aFloatSize.Width();
-
-                    // For the first time we don't have any data about the floating size of a toolbar.
-                    // We calculate it and store it for later use.
-                    aUIDockingElement.m_aFloatingData.m_aPos = pContainerWindow->ScreenToOutputPixel(
-                                                                ::Point( e.MousePos.X, e.MousePos.Y ));
-                    aUIDockingElement.m_aFloatingData.m_aSize           = aFloatSize;
-                    aUIDockingElement.m_aFloatingData.m_nLines          = pToolBox->GetFloatingLines();
-                    aUIDockingElement.m_aFloatingData.m_bIsHorizontal   = (( pToolBox->GetAlign() == WINDOWALIGN_TOP ) ||
-                                                                           ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
-                }
-                aDockingData.TrackingRectangle.X = e.MousePos.X;
-                aDockingData.TrackingRectangle.Y = e.MousePos.Y;
-            }
-
-            aDockingData.bFloating = ( eDockingArea == -1 );
-
-            // Write current data to the member docking progress data
-            WriteGuard aWriteLock( m_aLock );
-            m_aDockUIElement.m_bFloating = aDockingData.bFloating;
-            if ( !aDockingData.bFloating )
-            {
-                m_aDockUIElement.m_aDockedData   = aUIDockingElement.m_aDockedData;
-                m_eDockOperation                 = eDockingOperation;
-            }
-            else
-                m_aDockUIElement.m_aFloatingData = aUIDockingElement.m_aFloatingData;
-            aWriteLock.unlock();
-        }
-        catch ( Exception& )
-        {
-        }
-    }
-
-    return aDockingData;
-}
-
-void SAL_CALL LayoutManager::endDocking( const ::com::sun::star::awt::EndDockingEvent& e )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Bool    bDockingInProgress( sal_False );
-    sal_Bool    bStartDockFloated( sal_False );
-    sal_Bool    bFloating( sal_False );
-    UIElement   aUIDockingElement;
-
-    WriteGuard aWriteLock( m_aLock );
-    bDockingInProgress = m_bDockingInProgress;
-    aUIDockingElement = m_aDockUIElement;
-    bFloating = aUIDockingElement.m_bFloating;
-
-    UIElement& rUIElement = impl_findElement( aUIDockingElement.m_aName );
-    if ( rUIElement.m_aName == aUIDockingElement.m_aName )
-    {
-        if ( aUIDockingElement.m_bFloating )
-        {
-            // Write last position into position data
-            Reference< css::awt::XWindow > xWindow( aUIDockingElement.m_xUIElement->getRealInterface(), UNO_QUERY );
-            rUIElement.m_aFloatingData = aUIDockingElement.m_aFloatingData;
-            css::awt::Rectangle aTmpRect = xWindow->getPosSize();
-            rUIElement.m_aFloatingData.m_aPos = ::Point( aTmpRect.X, aTmpRect.Y );
-            // make changes also for our local data as we use it to make data persistent
-            aUIDockingElement.m_aFloatingData = rUIElement.m_aFloatingData;
-        }
-        else
-        {
-            rUIElement.m_aDockedData = aUIDockingElement.m_aDockedData;
-            rUIElement.m_aFloatingData.m_aSize = aUIDockingElement.m_aFloatingData.m_aSize;
-
-            if ( m_eDockOperation != DOCKOP_ON_COLROW )
-            {
-                // we have to renumber our row/column data to insert a new row/column
-                implts_renumberRowColumnData( (::com::sun::star::ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea,
-                                              m_eDockOperation,
-                                              aUIDockingElement );
-            }
-        }
-
-        bStartDockFloated = rUIElement.m_bFloating;
-        rUIElement.m_bFloating = m_aDockUIElement.m_bFloating;
-        rUIElement.m_bUserActive = sal_True;
-    }
-
-    // reset member for next docking operation
-    m_aDockUIElement.m_xUIElement.clear();
-    m_eDockOperation = DOCKOP_ON_COLROW;
-    aWriteLock.unlock();
-
-    implts_writeWindowStateData( aUIDockingElement.m_aName, aUIDockingElement );
-
-    if ( bDockingInProgress )
-    {
-        SolarMutexGuard aGuard;
-        Window*  pWindow = VCLUnoHelper::GetWindow( Reference< css::awt::XWindow >( e.Source, UNO_QUERY ));
-        ToolBox* pToolBox = 0;
-        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-            pToolBox = (ToolBox *)pWindow;
-
-        if ( pToolBox )
-        {
-            if( e.bFloating )
-            {
-                if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                    pToolBox->SetAlign( WINDOWALIGN_TOP );
-                else
-                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
-            }
-            else
-            {
-                ::Size aSize;
-
-                pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
-
-                // Docked toolbars have always one line
-                aSize = pToolBox->CalcWindowSizePixel( 1 );
-
-                // Lock layouting updates as our listener would be called due to SetSizePixel
-                pToolBox->SetOutputSizePixel( aSize );
-            }
-        }
-    }
-
-    aWriteLock.lock();
-    m_bDockingInProgress = sal_False;
-    aWriteLock.unlock();
-
-    implts_sortUIElements();
-    if ( !bStartDockFloated || !bFloating )
-    {
-        // Optimization: Don't layout if we started floating and now floating again.
-        // This would not change anything for the docked user-interface elements.
-        doLayout();
-    }
-}
-
-sal_Bool SAL_CALL LayoutManager::prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Bool    bDockingInProgress( sal_False );
-
-    ReadGuard aReadLock( m_aLock );
-    bDockingInProgress = m_bDockingInProgress;
-    aReadLock.unlock();
-
-    UIElement                         aUIDockingElement;
-    sal_Bool                          bWinFound( implts_findElement( e.Source, aUIDockingElement ) );
-    Reference< css::awt::XWindow >    xWindow( e.Source, UNO_QUERY );
-
-    if ( bWinFound && xWindow.is() )
-    {
-        if ( !bDockingInProgress )
-        {
-            css::awt::Rectangle aRect;
-            Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY );
-            if ( xDockWindow->isFloating() )
-            {
-                {
-                    SolarMutexGuard aGuard;
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                    if ( pWindow )
-                    {
-                        if ( pWindow->GetType() == WINDOW_TOOLBOX )
-                        {
-                            ToolBox* pToolBox = (ToolBox *)pWindow;
-                            aUIDockingElement.m_aFloatingData.m_aPos            = pToolBox->GetPosPixel();
-                            aUIDockingElement.m_aFloatingData.m_aSize           = pToolBox->GetOutputSizePixel();
-                            aUIDockingElement.m_aFloatingData.m_nLines          = pToolBox->GetFloatingLines();
-                            aUIDockingElement.m_aFloatingData.m_bIsHorizontal   = (( pToolBox->GetAlign() == WINDOWALIGN_TOP ) ||
-                                                                                   ( pToolBox->GetAlign() == WINDOWALIGN_BOTTOM ));
-                        }
-                    }
-                }
-
-                WriteGuard aWriteLock( m_aLock );
-                UIElement& rUIElement = LayoutManager::impl_findElement( aUIDockingElement.m_aName );
-                if ( rUIElement.m_aName == aUIDockingElement.m_aName )
-                    rUIElement = aUIDockingElement;
-                aWriteLock.unlock();
-            }
-        }
-    }
-
-    return sal_True;
-}
-
-void SAL_CALL LayoutManager::toggleFloatingMode( const ::com::sun::star::lang::EventObject& e )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Bool  bDockingInProgress( sal_False );
-    UIElement aUIDockingElement;
-
-    ReadGuard aReadLock( m_aLock );
-    bDockingInProgress = m_bDockingInProgress;
-    if ( bDockingInProgress )
-        aUIDockingElement = m_aDockUIElement;
-    aReadLock.unlock();
-
-    Window*  pWindow( 0 );
-    ToolBox* pToolBox( 0 );
-    Reference< css::awt::XWindow2 > xWindow;
-
-    {
-        SolarMutexGuard aGuard;
-        xWindow = Reference< css::awt::XWindow2 >( e.Source, UNO_QUERY );
-        pWindow = VCLUnoHelper::GetWindow( xWindow );
-
-        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
-            pToolBox = (ToolBox *)pWindow;
-    }
-
-    if ( !bDockingInProgress )
-    {
-        sal_Bool bWinFound( implts_findElement( e.Source, aUIDockingElement ) );
-        if ( bWinFound && xWindow.is() )
-        {
-            aUIDockingElement.m_bFloating   = !aUIDockingElement.m_bFloating;
-            aUIDockingElement.m_bUserActive = sal_True;
-
-            WriteGuard aWriteLock( m_aLock );
-            m_bDoLayout = sal_True;
-            aWriteLock.unlock();
-
-            if ( aUIDockingElement.m_bFloating )
-            {
-                SolarMutexGuard aGuard;
-                if ( pToolBox )
-                {
-                    pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines );
-                    if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                        pToolBox->SetAlign( WINDOWALIGN_TOP );
-                    else
-                        pToolBox->SetAlign( WINDOWALIGN_LEFT );
-                }
-
-                sal_Bool bUndefPos = ( aUIDockingElement.m_aFloatingData.m_aPos.X() == SAL_MAX_INT32 ||
-                                       aUIDockingElement.m_aFloatingData.m_aPos.Y() == SAL_MAX_INT32 );
-                sal_Bool bSetSize = ( aUIDockingElement.m_aFloatingData.m_aSize.Width() != 0 &&
-                                      aUIDockingElement.m_aFloatingData.m_aSize.Height() != 0 );
-
-                if ( bUndefPos )
-                    aUIDockingElement.m_aFloatingData.m_aPos = implts_findNextCascadeFloatingPos();
-
-                if ( !bSetSize )
-                {
-                    if ( pToolBox )
-                        aUIDockingElement.m_aFloatingData.m_aSize = pToolBox->CalcFloatingWindowSizePixel();
-                    else
-                        aUIDockingElement.m_aFloatingData.m_aSize = pWindow->GetOutputSizePixel();
-                }
-
-                xWindow->setPosSize( aUIDockingElement.m_aFloatingData.m_aPos.X(),
-                                     aUIDockingElement.m_aFloatingData.m_aPos.Y(),
-                                     0, 0, css::awt::PosSize::POS );
-                xWindow->setOutputSize( AWTSize( aUIDockingElement.m_aFloatingData.m_aSize ) );
-            }
-            else
-            {
-                if (( aUIDockingElement.m_aDockedData.m_aPos.X() == SAL_MAX_INT32 ) &&
-                    ( aUIDockingElement.m_aDockedData.m_aPos.Y() == SAL_MAX_INT32 ))
-                {
-                    // Docking on its default position without a preset position -
-                    // we have to find a good place for it.
-                    ::Point aPixelPos;
-                    ::Point aDockPos;
-                    ::Size  aSize;
-
-                    {
-                        SolarMutexGuard aGuard;
-                        if ( pToolBox )
-                            aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) );
-                        else
-                            aSize = pWindow->GetSizePixel();
-                    }
-
-                    implts_findNextDockingPos( (::com::sun::star::ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea,
-                                                aSize,
-                                                aDockPos,
-                                                aPixelPos );
-                    aUIDockingElement.m_aDockedData.m_aPos = aDockPos;
-                }
-
-                SolarMutexGuard aGuard;
-                if ( pToolBox )
-                {
-                    pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
-                    ::Size aSize = pToolBox->CalcWindowSizePixel( 1 );
-                    css::awt::Rectangle aRect = xWindow->getPosSize();
-                    xWindow->setPosSize( aRect.X, aRect.Y, 0, 0, css::awt::PosSize::POS );
-                    xWindow->setOutputSize( AWTSize( aSize ) );
-                }
-            }
-
-            aWriteLock.lock();
-            m_bDoLayout = sal_False;
-            UIElement& rUIElement = LayoutManager::impl_findElement( aUIDockingElement.m_aName );
-            if ( rUIElement.m_aName == aUIDockingElement.m_aName )
-                rUIElement = aUIDockingElement;
-            aWriteLock.unlock();
-
-            implts_writeWindowStateData( aUIDockingElement.m_aName, aUIDockingElement );
-
-            implts_sortUIElements();
-            doLayout();
-        }
-    }
-    else
-    {
-        SolarMutexGuard aGuard;
-        if ( pToolBox )
-        {
-            if ( aUIDockingElement.m_bFloating )
-            {
-                if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
-                    pToolBox->SetAlign( WINDOWALIGN_TOP );
-                else
-                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
-            }
-            else
-            {
-                pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
-            }
-        }
-    }
-}
-
-void SAL_CALL LayoutManager::closed( const ::com::sun::star::lang::EventObject& e )
-throw (::com::sun::star::uno::RuntimeException)
-{
-    rtl::OUString aName;
-    UIElement     aUIElement;
-    UIElementVector::iterator pIter;
-
-    WriteGuard aWriteLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-    {
-        Reference< XUIElement > xUIElement( pIter->m_xUIElement );
-        if ( xUIElement.is() )
-        {
-            Reference< XInterface > xIfac( xUIElement->getRealInterface(), UNO_QUERY );
-            if ( xIfac == e.Source )
-            {
-                aName = pIter->m_aName;
-
-                // user closes a toolbar =>
-                // context sensitive toolbar: only destroy toolbar and store state.
-                // context sensitive toolbar: make it invisible, store state and destroy it.
-                if ( !pIter->m_bContextSensitive )
-                    pIter->m_bVisible = sal_False;
-
-                aUIElement = *pIter;
-                break;
-            }
-        }
-    }
-    aWriteLock.unlock();
-
-
-    // destroy element
-    if ( aName.getLength() > 0 )
-    {
-        implts_writeWindowStateData( aName, aUIElement );
-        destroyElement( aName );
-    }
-}
-
-void SAL_CALL LayoutManager::endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& )
-throw (::com::sun::star::uno::RuntimeException)
-{
-
-}
-
-//---------------------------------------------------------------------------------------------------------
 //  XLayoutManagerEventBroadcaster
 //---------------------------------------------------------------------------------------------------------
-void SAL_CALL LayoutManager::addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
+throw (uno::RuntimeException)
 {
-    m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XLayoutManagerListener >*)NULL ), xListener );
+    m_aListenerContainer.addInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener );
 }
 
-void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& xListener )
-throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
+throw (uno::RuntimeException)
 {
-    m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XLayoutManagerListener >*)NULL ), xListener );
+    m_aListenerContainer.removeInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener );
 }
 
-void LayoutManager::implts_notifyListeners( short nEvent, ::com::sun::star::uno::Any aInfoParam )
+void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam )
 {
-    css::lang::EventObject             aSource    (static_cast< ::cppu::OWeakObject*>(this));
-    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XLayoutManagerListener >*) NULL ) );
+    lang::EventObject                  aSource( static_cast< ::cppu::OWeakObject*>(this) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const uno::Reference< frame::XLayoutManagerListener >*) NULL ) );
     if (pContainer!=NULL)
     {
         ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -6896,9 +2709,9 @@ void LayoutManager::implts_notifyListeners( short nEvent, ::com::sun::star::uno:
         {
             try
             {
-                ((css::frame::XLayoutManagerListener*)pIterator.next())->layoutEvent( aSource, nEvent, aInfoParam );
+                ((frame::XLayoutManagerListener*)pIterator.next())->layoutEvent( aSource, nEvent, aInfoParam );
             }
-            catch( css::uno::RuntimeException& )
+            catch( uno::RuntimeException& )
             {
                 pIterator.remove();
             }
@@ -6907,10 +2720,10 @@ void LayoutManager::implts_notifyListeners( short nEvent, ::com::sun::star::uno:
 }
 
 //---------------------------------------------------------------------------------------------------------
-//	XWindowListener
+//      XWindowListener
 //---------------------------------------------------------------------------------------------------------
-void SAL_CALL LayoutManager::windowResized( const css::awt::WindowEvent& aEvent )
-throw( css::uno::RuntimeException )
+void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent )
+throw( uno::RuntimeException )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
@@ -6919,9 +2732,9 @@ throw( css::uno::RuntimeException )
         return;
 
     // Request to set docking area space again.
-    css::awt::Rectangle               aDockingArea( m_aDockingArea );
+    awt::Rectangle                    aDockingArea( m_aDockingArea );
     Reference< XDockingAreaAcceptor > xDockingAreaAcceptor( m_xDockingAreaAcceptor );
-    Reference< css::awt::XWindow >    xContainerWindow( m_xContainerWindow );
+    Reference< awt::XWindow >         xContainerWindow( m_xContainerWindow );
 
     Reference< XInterface > xIfac( xContainerWindow, UNO_QUERY );
     if ( xIfac == aEvent.Source && m_bVisible )
@@ -6943,105 +2756,65 @@ throw( css::uno::RuntimeException )
     {
         // the container window of my DockingAreaAcceptor is not the same as of my frame
         // I still have to resize my frames' window as nobody else will do it
-        Reference< css::awt::XWindow > xComponentWindow( m_xFrame->getComponentWindow() );
+        Reference< awt::XWindow > xComponentWindow( m_xFrame->getComponentWindow() );
         if( xComponentWindow.is() == sal_True )
         {
-            css::uno::Reference< css::awt::XDevice > xDevice( m_xFrame->getContainerWindow(), css::uno::UNO_QUERY );
+            uno::Reference< awt::XDevice > xDevice( m_xFrame->getContainerWindow(), uno::UNO_QUERY );
 
             // Convert relativ size to output size.
-            css::awt::Rectangle  aRectangle  = m_xFrame->getContainerWindow()->getPosSize();
-            css::awt::DeviceInfo aInfo       = xDevice->getInfo();
-            css::awt::Size       aSize       (  aRectangle.Width  - aInfo.LeftInset - aInfo.RightInset  ,
-                                                aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
+            awt::Rectangle  aRectangle = m_xFrame->getContainerWindow()->getPosSize();
+            awt::DeviceInfo aInfo      = xDevice->getInfo();
+            awt::Size       aSize(  aRectangle.Width  - aInfo.LeftInset - aInfo.RightInset  ,
+                                    aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
 
             // Resize our component window.
-            xComponentWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE );
-        }
-    }
-    else
-    {
-        // resize event for one of the UIElements
-        sal_Bool bLocked( m_bDockingInProgress );
-        sal_Bool bDoLayout( m_bDoLayout );
-        aWriteLock.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-
-        if ( !bLocked && !bDoLayout )
-        {
-            // Do not do anything if we are in the middle of a docking process. This would interfere all other
-            // operations. We will store the new position and size in the docking handlers.
-            // Do not do anything if we are in the middle of our layouting process. We will adapt the position
-            // and size of the user interface elements.
-            UIElement aUIElement;
-            if ( implts_findElement( aEvent.Source, aUIElement ))
-            {
-                if ( aUIElement.m_bFloating )
-                    implts_writeNewStateData( aUIElement.m_aName,
-                                            Reference< css::awt::XWindow >( aEvent.Source, UNO_QUERY ));
-                else
-                    doLayout();
-            }
+            xComponentWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, awt::PosSize::POSSIZE );
         }
     }
 }
 
-void SAL_CALL LayoutManager::windowMoved( const css::awt::WindowEvent& ) throw( css::uno::RuntimeException )
+void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& ) throw( uno::RuntimeException )
 {
 }
 
-void SAL_CALL LayoutManager::windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException )
+void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
-
-    // Request to set docking area space again.
-    Reference< css::awt::XWindow >  xContainerWindow( m_xContainerWindow );
-    bool                        bParentWindowVisible( m_bParentWindowVisible );
+    Reference< awt::XWindow >  xContainerWindow( m_xContainerWindow );
+    bool                       bParentWindowVisible( m_bParentWindowVisible );
     aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     Reference< XInterface > xIfac( xContainerWindow, UNO_QUERY );
     if ( xIfac == aEvent.Source )
     {
         bool bSetVisible = false;
 
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteLock( m_aLock );
         m_bParentWindowVisible = true;
         bSetVisible = ( m_bParentWindowVisible != bParentWindowVisible );
         aWriteLock.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
         if ( bSetVisible )
-        {
             implts_updateUIElementsVisibleState( sal_True );
-            //implts_doLayout( sal_False );
-        }
     }
 }
 
-void SAL_CALL LayoutManager::windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException )
+void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
-
-    // Request to set docking area space again.
-    Reference< css::awt::XWindow >  xContainerWindow( m_xContainerWindow );
-    bool                        bParentWindowVisible( m_bParentWindowVisible );
+    Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
+    bool                      bParentWindowVisible( m_bParentWindowVisible );
     aReadLock.unlock();
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
     Reference< XInterface > xIfac( xContainerWindow, UNO_QUERY );
     if ( xIfac == aEvent.Source )
     {
         bool bSetInvisible = false;
 
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteLock( m_aLock );
         m_bParentWindowVisible = false;
         bSetInvisible = ( m_bParentWindowVisible != bParentWindowVisible );
         aWriteLock.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
         if ( bSetInvisible )
             implts_updateUIElementsVisibleState( sal_False );
@@ -7050,17 +2823,14 @@ void SAL_CALL LayoutManager::windowHidden( const css::lang::EventObject& aEvent
 
 IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG )
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     ReadGuard aReadLock( m_aLock );
-
-    // Request to set docking area space again.
     m_aAsyncLayoutTimer.Stop();
 
     if( !m_xContainerWindow.is() )
         return 0;
 
-    css::awt::Rectangle aDockingArea( m_aDockingArea );
-    ::Size              aStatusBarSize( implts_getStatusBarSize() );
+    awt::Rectangle aDockingArea( m_aDockingArea );
+    ::Size         aStatusBarSize( implts_getStatusBarSize() );
 
     // Subtract status bar height
     aDockingArea.Height -= aStatusBarSize.Height();
@@ -7072,78 +2842,42 @@ IMPL_LINK( LayoutManager, AsyncLayoutHdl, Timer *, EMPTYARG )
     return 0;
 }
 
-#ifdef DBG_UTIL
-void LayoutManager::implts_checkElementContainer()
-{
-#ifdef DBG_UTIL
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    ReadGuard aReadLock( m_aLock );
-
-    BaseHash< sal_Int32 > aUIElementHash;
-
-    UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
-        aUIElementHash[pIter->m_aName]++;
-
-
-    BaseHash< sal_Int32 >::const_iterator pCheckIter = aUIElementHash.begin();
-    for ( ; pCheckIter != aUIElementHash.end(); ++pCheckIter )
-    {
-        if ( pCheckIter->second > 1 )
-        {
-            ::rtl::OString aName = ::rtl::OUStringToOString( pCheckIter->first, RTL_TEXTENCODING_ASCII_US );
-            DBG_ASSERT( "More than one element (%s) with the same name found!", aName.getStr() );
-        }
-    } // for ( ; pCheckIter != aUIElementHash.end(); pCheckIter++ )
-#endif
-}
-#endif
-
 //---------------------------------------------------------------------------------------------------------
-//	XFrameActionListener
+//      XFrameActionListener
 //---------------------------------------------------------------------------------------------------------
 void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent )
 throw ( RuntimeException )
 {
-    if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED   ) ||
-        ( aEvent.Action == FrameAction_COMPONENT_REATTACHED ))
+    if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED ) || ( aEvent.Action == FrameAction_COMPONENT_REATTACHED ))
     {
         RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_ATTACHED|REATTACHED)" );
 
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteLock( m_aLock );
         m_bComponentAttached = sal_True;
         m_bMustDoLayout = sal_True;
         aWriteLock.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
         implts_reset( sal_True );
         implts_doLayout( sal_True, sal_False );
         implts_doLayout( sal_True, sal_True );
     }
-    else if (( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED      ) ||
-             ( aEvent.Action == FrameAction_FRAME_UI_DEACTIVATING   ))
+    else if (( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ) || ( aEvent.Action == FrameAction_FRAME_UI_DEACTIVATING ))
     {
         RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (FRAME_UI_ACTIVATED|DEACTIVATING)" );
 
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
         WriteGuard aWriteLock( m_aLock );
         m_bActive = ( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED );
         aWriteLock.unlock();
-        /* SAFE AREA ----------------------------------------------------------------------------------------------- */
 
         implts_toggleFloatingUIElementsVisibility( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED );
-//        doLayout();
     }
     else if ( aEvent.Action == FrameAction_COMPONENT_DETACHING )
     {
         RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_DETACHING)" );
 
-        // SAFE AREA -----------------------------------------------------------------------------------------------
         WriteGuard aWriteLock( m_aLock );
         m_bComponentAttached = sal_False;
         aWriteLock.unlock();
-        // SAFE AREA -----------------------------------------------------------------------------------------------
 
         implts_reset( sal_False );
     }
@@ -7151,7 +2885,7 @@ throw ( RuntimeException )
 
 // ______________________________________________
 
-void SAL_CALL LayoutManager::disposing( const css::lang::EventObject& rEvent )
+void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent )
 throw( RuntimeException )
 {
     sal_Bool bDisposeAndClear( sal_False );
@@ -7161,23 +2895,11 @@ throw( RuntimeException )
 
     if ( rEvent.Source == Reference< XInterface >( m_xFrame, UNO_QUERY ))
     {
-        // Our frame gets disposed, release all our references that depends on a working
-        // frame reference.
+        // Our frame gets disposed, release all our references that depends on a working frame reference.
         Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
-        if ( m_pMiscOptions )
-        {
-            m_pMiscOptions->RemoveListenerLink( LINK( this, LayoutManager, OptionsChanged ) );
-            delete m_pMiscOptions;
-            m_pMiscOptions = 0;
-        }
-
-        delete m_pAddonOptions;
-        m_pAddonOptions = 0;
 
         // destroy all elements, it's possible that dettaching is NOT called!
         implts_destroyElements();
-
-        m_aUIElements.clear();
         impl_clearUpMenuBar();
         m_xMenuBar.clear();
         if ( m_xInplaceMenuBar.is() )
@@ -7188,7 +2910,10 @@ throw( RuntimeException )
         m_xInplaceMenuBar.clear();
         m_xContainerWindow.clear();
         m_xContainerTopWindow.clear();
-        implts_destroyDockingAreaWindows();
+        
+        // forward disposing call to toolbar manager
+        if ( m_pToolbarManager != NULL )
+            m_pToolbarManager->disposing(rEvent);
 
         if ( m_xModuleCfgMgr.is() )
         {
@@ -7198,9 +2923,7 @@ throw( RuntimeException )
                 xModuleCfgMgr->removeConfigurationListener(
                     Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
             }
-            catch ( Exception& )
-            {
-            }
+            catch ( Exception& ) {}
         }
 
         if ( m_xDocCfgMgr.is() )
@@ -7211,9 +2934,7 @@ throw( RuntimeException )
                 xDocCfgMgr->removeConfigurationListener(
                     Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ));
             }
-            catch ( Exception& )
-            {
-            }
+            catch ( Exception& ) {}
         }
 
         m_xDocCfgMgr.clear();
@@ -7221,14 +2942,20 @@ throw( RuntimeException )
         m_xFrame.clear();
         delete m_pGlobalSettings;
         m_pGlobalSettings = 0;
-        m_xDockingAreaAcceptor = Reference< ::com::sun::star::ui::XDockingAreaAcceptor >();
+                m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
 
         bDisposeAndClear = sal_True;
     }
     else if ( rEvent.Source == Reference< XInterface >( m_xContainerWindow, UNO_QUERY ))
     {
         // Our container window gets disposed. Remove all user interface elements.
-        m_aUIElements.clear();
+        uno::Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+        ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+        if ( pToolbarManager )
+        {
+            uno::Reference< awt::XWindowPeer > aEmptyWindowPeer;
+            pToolbarManager->setParentWindow( aEmptyWindowPeer );
+        }
         impl_clearUpMenuBar();
         m_xMenuBar.clear();
         if ( m_xInplaceMenuBar.is() )
@@ -7241,13 +2968,9 @@ throw( RuntimeException )
         m_xContainerTopWindow.clear();
     }
     else if ( rEvent.Source == Reference< XInterface >( m_xDocCfgMgr, UNO_QUERY ))
-    {
         m_xDocCfgMgr.clear();
-    }
     else if ( rEvent.Source == Reference< XInterface >( m_xModuleCfgMgr , UNO_QUERY ))
-    {
         m_xModuleCfgMgr.clear();
-    }
 
     aWriteLock.unlock();
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -7256,208 +2979,207 @@ throw( RuntimeException )
     if ( bDisposeAndClear )
     {
         // Send message to all listener and forget her references.
-        css::uno::Reference< css::frame::XLayoutManager > xThis( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
-        css::lang::EventObject aEvent( xThis );
+        uno::Reference< frame::XLayoutManager > xThis( static_cast< ::cppu::OWeakObject* >(this), uno::UNO_QUERY );
+        lang::EventObject aEvent( xThis );
         m_aListenerContainer.disposeAndClear( aEvent );
     }
 }
 
-void SAL_CALL LayoutManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException)
 {
     ReadGuard aReadLock( m_aLock );
+    Reference< XFrame > xFrame( m_xFrame );
+    Reference< ui::XUIConfigurationListener > xUICfgListener( m_xToolbarManager );
+    ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+    aReadLock.unlock();
 
-    ::rtl::OUString                aElementType;
-    ::rtl::OUString                aElementName;
-    Reference< XUIElement > xElement;
-    Reference< XFrame >     xFrame( m_xFrame );
-
-    if ( m_xFrame.is() )
+    if ( xFrame.is() )
     {
-        implts_findElement( Event.ResourceURL, aElementType, aElementName, xElement );
-
-        Reference< XUIElementSettings > xElementSettings( xElement, UNO_QUERY );
-        if ( xElementSettings.is() )
+        ::rtl::OUString aElementType;
+        ::rtl::OUString aElementName;
+        bool            bRefreshLayout(false);
+    
+        parseResourceURL( Event.ResourceURL, aElementType, aElementName );
+        if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
         {
-            ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
-            Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
-            if ( xPropSet.is() )
+            if ( xUICfgListener.is() )
             {
-                if ( Event.Source == Reference< XInterface >( m_xDocCfgMgr, UNO_QUERY ))
-                    xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xDocCfgMgr ));
+                xUICfgListener->elementInserted( Event );
+                bRefreshLayout = pToolbarManager->isLayoutDirty();
             }
-            xElementSettings->updateSettings();
         }
-        else
+        else if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_MENUBAR ))
         {
-            if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ) &&
-                 ( aElementName.indexOf( m_aCustomTbxPrefix ) != -1 ))
+            Reference< XUIElement >         xUIElement = implts_findElement( Event.ResourceURL );
+            Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
+            if ( xElementSettings.is() )
             {
-                // custom toolbar must be directly created, shown and layouted!
-                createElement( Event.ResourceURL );
-                Reference< XUIElement > xUIElement = getElement( Event.ResourceURL );
-                if ( xUIElement.is() )
+                ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+                uno::Reference< XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
+                if ( xPropSet.is() )
                 {
-                    Reference< XUIConfigurationManager > xCfgMgr;
-                    Reference< XPropertySet >            xPropSet;
-                    ::rtl::OUString                             aUIName;
-
-                    try
-                    {
-                        xCfgMgr  = Reference< XUIConfigurationManager >( Event.Source, UNO_QUERY );
-                        xPropSet = Reference< XPropertySet >( xCfgMgr->getSettings( Event.ResourceURL, sal_False ), UNO_QUERY );
-
-                        if ( xPropSet.is() )
-                            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
-                    }
-                    catch ( com::sun::star::container::NoSuchElementException& )
-                    {
-                    }
-                    catch ( com::sun::star::beans::UnknownPropertyException& )
-                    {
-                    }
-                    catch ( com::sun::star::lang::WrappedTargetException& )
-                    {
-                    }
-
-                    {
-                        SolarMutexGuard aGuard;
-                        Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                        if ( pWindow  )
-                            pWindow->SetText( aUIName );
-                    }
-
-                    showElement( Event.ResourceURL );
+                    if ( Event.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
+                        xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xDocCfgMgr ));
                 }
+                xElementSettings->updateSettings();
             }
         }
-    }
+
+        if ( bRefreshLayout )
+            doLayout();
+    }    
 }
 
-void SAL_CALL LayoutManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException)
 {
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    WriteGuard aWriteLock( m_aLock );
-
-    ::rtl::OUString                aElementType;
-    ::rtl::OUString                aElementName;
-    Reference< XUIElement > xUIElement;
-    Reference< XFrame >     xFrame( m_xFrame );
+    ReadGuard aReadLock( m_aLock );
+    Reference< frame::XFrame >                xFrame( m_xFrame );
+    Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+    Reference< awt::XWindow >                 xContainerWindow( m_xContainerWindow );
+    Reference< ui::XUIElement >               xMenuBar( m_xMenuBar );
+    Reference< ui::XUIConfigurationManager >  xModuleCfgMgr( m_xModuleCfgMgr );
+    Reference< ui::XUIConfigurationManager >  xDocCfgMgr( m_xDocCfgMgr );
+    ToolbarLayoutManager*                     pToolbarManager = m_pToolbarManager;
+    aReadLock.unlock();
 
-    if ( m_xFrame.is() )
+    if ( xFrame.is() )
     {
-        implts_findElement( Event.ResourceURL, aElementType, aElementName, xUIElement );
-
-        Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
-        if ( xElementSettings.is() )
+       ::rtl::OUString aElementType;
+       ::rtl::OUString aElementName;
+       bool            bRefreshLayout(false);
+        
+       parseResourceURL( Event.ResourceURL, aElementType, aElementName );
+        if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
+        {
+            if ( xToolbarManager.is() )
+            {
+                xToolbarManager->elementRemoved( Event );
+                bRefreshLayout = pToolbarManager->isLayoutDirty();
+            }
+        }
+        else
         {
-            bool                        bNoSettings( false );
-            ::rtl::OUString                    aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
-            Reference< XInterface >     xElementCfgMgr;
-            Reference< XPropertySet >   xPropSet( xElementSettings, UNO_QUERY );
+            Reference< XUIElement > xUIElement = implts_findElement( Event.ResourceURL );
+            Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
+            if ( xElementSettings.is() )
+            {
+                bool                      bNoSettings( false );
+                ::rtl::OUString           aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+                Reference< XInterface >   xElementCfgMgr;
+                Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
 
-            if ( xPropSet.is() )
-                xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
+                if ( xPropSet.is() )
+                    xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
 
-            if ( !xElementCfgMgr.is() )
-                return;
+                if ( !xElementCfgMgr.is() )
+                    return;
 
-            // Check if the same UI configuration manager has changed => check further
-            if ( Event.Source == xElementCfgMgr )
-            {
-                // Same UI configuration manager where our element has its settings
-                if ( Event.Source == Reference< XInterface >( m_xDocCfgMgr, UNO_QUERY ))
+                // Check if the same UI configuration manager has changed => check further
+                if ( Event.Source == xElementCfgMgr )
                 {
-                    // document settings removed
-                    if ( m_xModuleCfgMgr->hasSettings( Event.ResourceURL ))
+                    // Same UI configuration manager where our element has its settings
+                    if ( Event.Source == Reference< XInterface >( xDocCfgMgr, UNO_QUERY ))
                     {
-                        xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xModuleCfgMgr ));
-                        xElementSettings->updateSettings();
-                        return;
+                        // document settings removed
+                        if ( xModuleCfgMgr->hasSettings( Event.ResourceURL ))
+                        {
+                            xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xModuleCfgMgr ));
+                            xElementSettings->updateSettings();
+                            return;
+                        }
                     }
-                }
 
-                bNoSettings = true;
-            }
-
-            // No settings anymore, element must be destroyed
-            if ( m_xContainerWindow.is() && bNoSettings )
-            {
-                if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) &&
-                     aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
-                {
-                    Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
-                    while ( pWindow && !pWindow->IsSystemWindow() )
-                        pWindow = pWindow->GetParent();
-
-                    if ( pWindow && !m_bInplaceMenuSet )
-                        ((SystemWindow *)pWindow)->SetMenuBar( 0 );
-
-                    Reference< XComponent > xComp( m_xMenuBar, UNO_QUERY );
-                    if ( xComp.is() )
-                        xComp->dispose();
-                    m_xMenuBar.clear();
+                    bNoSettings = true;
                 }
-                else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
+                
+                // No settings anymore, element must be destroyed
+                    if ( xContainerWindow.is() && bNoSettings )
                 {
-                    destroyElement( Event.ResourceURL );
+                    if ( aElementType.equalsIgnoreAsciiCaseAscii( "menubar" ) && aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ))
+                    {
+                        SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
+                        if ( pSysWindow && !m_bInplaceMenuSet )
+                            pSysWindow->SetMenuBar( 0 );
+                          
+                        Reference< XComponent > xComp( xMenuBar, UNO_QUERY );
+                        if ( xComp.is() )
+                            xComp->dispose();
+                            
+                        WriteGuard aWriteLock( m_aLock );                       
+                        m_xMenuBar.clear();
+                    }
                 }
             }
         }
+        
+        if ( bRefreshLayout )
+            doLayout();
     }
 }
 
-void SAL_CALL LayoutManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException)
 {
     ReadGuard aReadLock( m_aLock );
+    Reference< XFrame >                       xFrame( m_xFrame );
+    Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+    ToolbarLayoutManager*                     pToolbarManager = m_pToolbarManager;
+    aReadLock.unlock();
 
-    ::rtl::OUString                aElementType;
-    ::rtl::OUString                aElementName;
-    Reference< XUIElement > xUIElement;
-    Reference< XFrame >     xFrame( m_xFrame );
-
-    if ( m_xFrame.is() )
+    if ( xFrame.is() )
     {
-        implts_findElement( Event.ResourceURL, aElementType, aElementName, xUIElement );
+        ::rtl::OUString aElementType;
+        ::rtl::OUString aElementName;
+        bool            bRefreshLayout(false);
 
-        Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
-        if ( xElementSettings.is() )
+        parseResourceURL( Event.ResourceURL, aElementType, aElementName );
+        if ( aElementType.equalsIgnoreAsciiCaseAscii( UIRESOURCETYPE_TOOLBAR ))
         {
-            ::rtl::OUString                    aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
-            Reference< XInterface >     xElementCfgMgr;
-            Reference< XPropertySet >   xPropSet( xElementSettings, UNO_QUERY );
+            if ( xToolbarManager.is() )
+            {
+                xToolbarManager->elementReplaced( Event );
+                bRefreshLayout = pToolbarManager->isLayoutDirty();
+            }
+        }
+        else
+        {
+            Reference< XUIElement >         xUIElement = implts_findElement( Event.ResourceURL );
+            Reference< XUIElementSettings > xElementSettings( xUIElement, UNO_QUERY );
+            if ( xElementSettings.is() )
+            {
+                ::rtl::OUString           aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+                Reference< XInterface >   xElementCfgMgr;
+                Reference< XPropertySet > xPropSet( xElementSettings, UNO_QUERY );
 
-            if ( xPropSet.is() )
-                xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
+                if ( xPropSet.is() )
+                    xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
 
-            if ( !xElementCfgMgr.is() )
-                return;
+                if ( !xElementCfgMgr.is() )
+                    return;
 
-            // Check if the same UI configuration manager has changed => update settings
-            if ( Event.Source == xElementCfgMgr )
-            {
-                xElementSettings->updateSettings();
-                if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ))
-                    doLayout();
+                // Check if the same UI configuration manager has changed => update settings
+                if ( Event.Source == xElementCfgMgr )
+                    xElementSettings->updateSettings();
             }
         }
+        
+        if ( bRefreshLayout )
+            doLayout();
     }
 }
 
 //---------------------------------------------------------------------------------------------------------
-//	OPropertySetHelper
+//      OPropertySetHelper
 //---------------------------------------------------------------------------------------------------------
-// XPropertySet helper
-sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any&       aConvertedValue ,
-                                                           Any&       aOldValue       ,
-                                                           sal_Int32  nHandle         ,
-                                                           const Any& aValue             ) throw( com::sun::star::lang::IllegalArgumentException )
+sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any&       aConvertedValue,
+                                                           Any&       aOldValue,
+                                                           sal_Int32  nHandle,
+                                                           const Any& aValue ) throw( lang::IllegalArgumentException )
 {
     return LayoutManager_PBase::convertFastPropertyValue( aConvertedValue, aOldValue, nHandle, aValue );
 }
 
-void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32                       nHandle ,
-                                                               const com::sun::star::uno::Any& aValue  ) throw( com::sun::star::uno::Exception )
+void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32       nHandle,
+                                                               const uno::Any& aValue  ) throw( uno::Exception )
 {
     if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY )
         LayoutManager_PBase::setFastPropertyValue_NoBroadcast( nHandle, aValue );
@@ -7470,40 +3192,43 @@ void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32
 
         case LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY:
         {
-            sal_Bool bValue = sal_Bool();
+            sal_Bool bValue(sal_False);
             if (( aValue >>= bValue ) && bValue )
-                implts_refreshContextToolbarsVisibility();
+            {
+                ReadGuard aReadLock( m_aLock );
+                Reference< ui::XUIConfigurationListener > xToolbarManager( m_xToolbarManager );
+                ToolbarLayoutManager* pToolbarManager = m_pToolbarManager;
+                bool bAutomaticToolbars( m_bAutomaticToolbars );
+                aReadLock.unlock();
+                
+                if ( pToolbarManager )
+                    pToolbarManager->refreshToolbarsVisibility( bAutomaticToolbars );
+            }
             break;
         }
 
         case LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI:
             implts_setCurrentUIVisibility( !m_bHideCurrentUI );
             break;
+        default: break;
     }
 }
 
-void SAL_CALL LayoutManager::getFastPropertyValue( com::sun::star::uno::Any& aValue  ,
-                                                   sal_Int32                 nHandle    ) const
+void SAL_CALL LayoutManager::getFastPropertyValue( uno::Any& aValue, sal_Int32 nHandle ) const
 {
     LayoutManager_PBase::getFastPropertyValue( aValue, nHandle );
 }
 
 ::cppu::IPropertyArrayHelper& SAL_CALL LayoutManager::getInfoHelper()
 {
-    // Optimize this method !
-    // We initialize a static variable only one time. And we don't must use a mutex at every call!
-    // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL!
     static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL;
 
     if( pInfoHelper == NULL )
     {
-        // Ready for multithreading
         osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
 
-        // Control this pointer again, another instance can be faster then these!
         if( pInfoHelper == NULL )
         {
-            // Define static member to give structure of properties to baseclass "OPropertySetHelper".
             uno::Sequence< beans::Property > aProperties;
             describeProperties( aProperties );
             static ::cppu::OPropertyArrayHelper aInfoHelper( aProperties, sal_True );
@@ -7514,23 +3239,17 @@ void SAL_CALL LayoutManager::getFastPropertyValue( com::sun::star::uno::Any& aVa
     return(*pInfoHelper);
 }
 
-com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException)
 {
-    // Optimize this method !
-    // We initialize a static variable only one time. And we don't must use a mutex at every call!
-    // For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
-    static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL;
+    static uno::Reference< beans::XPropertySetInfo >* pInfo = NULL;
 
     if( pInfo == NULL )
     {
-        // Ready for multithreading
         osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-        // Control this pointer again, another instance can be faster then these!
+        
         if( pInfo == NULL )
         {
-            // Create structure of propertysetinfo for baseclass "OPropertySetHelper".
-            // (Use method "getInfoHelper()".)
-            static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+            static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
             pInfo = &xInfo;
         }
     }
@@ -7540,4 +3259,4 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CA
 
 } // namespace framework
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
deleted file mode 100644
index 70215a3657..0000000000
--- a/framework/source/layoutmanager/makefile.mk
+++ /dev/null
@@ -1,47 +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=			framework
-TARGET=				fwk_layout
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-VISIBILITY_HIDDEN = TRUE
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/layoutmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/layoutmanager/panel.cxx b/framework/source/layoutmanager/panel.cxx
new file mode 100755
index 0000000000..1e208e1f8c
--- /dev/null
+++ b/framework/source/layoutmanager/panel.cxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include "panel.hxx"
+#include "helpers.hxx"
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/unohlp.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+using namespace ::com::sun::star;
+
+namespace framework
+{
+
+Panel::Panel( 
+    const uno::Reference< lang::XMultiServiceFactory >& rSMGR,
+    const uno::Reference< awt::XWindow >& rParent, 
+    PanelPosition nPanel ) :
+    m_xSMGR(rSMGR), m_nPanelPosition(nPanel)
+{
+    uno::Reference< awt::XWindowPeer > xWindowPeer( rParent, uno::UNO_QUERY );
+    m_xPanelWindow = uno::Reference< awt::XWindow >( createToolkitWindow( rSMGR, xWindowPeer, "splitwindow" ), uno::UNO_QUERY );
+    
+    vos::OGuard	aGuard( Application::GetSolarMutex() );
+    SplitWindow* pSplitWindow = dynamic_cast< SplitWindow* >( VCLUnoHelper::GetWindow( m_xPanelWindow ));
+
+    if ( pSplitWindow )
+    {
+        // Set alignment
+        if (nPanel == PANEL_TOP)
+            pSplitWindow->SetAlign( WINDOWALIGN_TOP );
+        else if (nPanel == PANEL_BOTTOM)
+            pSplitWindow->SetAlign( WINDOWALIGN_BOTTOM );
+        else if (nPanel == PANEL_LEFT)
+            pSplitWindow->SetAlign( WINDOWALIGN_LEFT );
+        else
+            pSplitWindow->SetAlign( WINDOWALIGN_RIGHT );
+    }
+}
+
+Panel::~Panel()
+{
+}
+    
+} // namespace framework
diff --git a/framework/source/layoutmanager/panel.hxx b/framework/source/layoutmanager/panel.hxx
new file mode 100755
index 0000000000..fdebd4aa63
--- /dev/null
+++ b/framework/source/layoutmanager/panel.hxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <macros/generic.hxx>
+#include <stdtypes.h>
+#include <properties.h>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/window.hxx>
+#include <vcl/splitwin.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework
+{
+
+enum PanelPosition
+{
+    PANEL_TOP,
+    PANEL_LEFT,
+    PANEL_RIGHT,
+    PANEL_BOTTOM,
+    PANEL_COUNT
+};
+
+class Panel
+{
+    public:
+        Panel( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMGR,
+               const css::uno::Reference< css::awt::XWindow >& rParent, 
+               PanelPosition nPanel );
+        virtual ~Panel();
+        
+    private:
+        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::awt::XWindow >               m_xPanelWindow;
+        PanelPosition                                          m_nPanelPosition;
+};
+
+}
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_PANEL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/panelmanager.cxx b/framework/source/layoutmanager/panelmanager.cxx
new file mode 100755
index 0000000000..81428a62de
--- /dev/null
+++ b/framework/source/layoutmanager/panelmanager.cxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include "panelmanager.hxx"
+#include "services.h"
+#include "services/modelwinservice.hxx"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <vcl/svapp.hxx>
+#include <toolkit/unohlp.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+using namespace ::com::sun::star;
+
+namespace framework
+{
+
+//_________________________________________________________________________________________________________________
+//	non exported definitions
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//	declarations
+//_________________________________________________________________________________________________________________
+
+
+PanelManager::PanelManager( 
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMGR,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ) :
+    m_xSMGR( rSMGR ),
+    m_xFrame( rFrame )
+{
+    m_aPanels[PANEL_TOP]    = 0;
+    m_aPanels[PANEL_BOTTOM] = 0;
+    m_aPanels[PANEL_LEFT]   = 0;
+    m_aPanels[PANEL_RIGHT]  = 0;
+}
+
+PanelManager::~PanelManager()
+{
+}
+        
+//---------------------------------------------------------------------------------------------------------
+// Creation and layouting
+//---------------------------------------------------------------------------------------------------------
+bool PanelManager::createPanels()
+{
+    if ( m_xFrame.is() )
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        uno::Reference< awt::XWindow > xWindow( m_xFrame->getContainerWindow(), uno::UNO_QUERY );
+        if ( xWindow.is() )
+        {
+            // destroy old panel windows
+            delete m_aPanels[PANEL_TOP   ];
+            delete m_aPanels[PANEL_BOTTOM];
+            delete m_aPanels[PANEL_LEFT  ];
+            delete m_aPanels[PANEL_RIGHT ];
+            
+            m_aPanels[PANEL_TOP   ] = new Panel( m_xSMGR, xWindow, PANEL_TOP    );
+            m_aPanels[PANEL_BOTTOM] = new Panel( m_xSMGR, xWindow, PANEL_BOTTOM );
+            m_aPanels[PANEL_LEFT  ] = new Panel( m_xSMGR, xWindow, PANEL_LEFT   );
+            m_aPanels[PANEL_RIGHT ] = new Panel( m_xSMGR, xWindow, PANEL_RIGHT  );
+            return true;
+        }
+    }
+
+    return false;
+}
+
+awt::Rectangle PanelManager::getPreferredSize() const
+{
+    return awt::Rectangle();
+}
+
+void PanelManager::layoutPanels( const awt::Rectangle /*newSize*/ )
+{
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  Panel functions
+//---------------------------------------------------------------------------------------------------------
+UIElement* PanelManager::findDockingWindow( const ::rtl::OUString& /*rResourceName*/ )
+{
+    return NULL;
+}
+
+bool PanelManager::addDockingWindow( const ::rtl::OUString& /*rResourceName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& /*xUIElement*/ )
+{
+    return false;
+}
+
+bool PanelManager::destroyDockingWindow( const ::rtl::OUString& /*rResourceName*/ )
+{
+    return false;
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  XDockableWindowListener
+//---------------------------------------------------------------------------------------------------------
+void SAL_CALL PanelManager::startDocking( const awt::DockingEvent& ) 
+throw (uno::RuntimeException)
+{
+}
+
+awt::DockingData SAL_CALL PanelManager::docking( const awt::DockingEvent& ) 
+throw (uno::RuntimeException)
+{
+    return awt::DockingData();
+}
+
+void SAL_CALL PanelManager::endDocking( const awt::EndDockingEvent& ) 
+throw (uno::RuntimeException)
+{
+}
+
+sal_Bool SAL_CALL PanelManager::prepareToggleFloatingMode( const lang::EventObject& ) 
+throw (uno::RuntimeException)
+{
+    return false;
+}
+
+void SAL_CALL PanelManager::toggleFloatingMode( const lang::EventObject& ) 
+throw (uno::RuntimeException)
+{
+}
+
+void SAL_CALL PanelManager::closed( const lang::EventObject& ) 
+throw (uno::RuntimeException)
+{
+}
+
+void SAL_CALL PanelManager::endPopupMode( const awt::EndPopupModeEvent& ) 
+throw (uno::RuntimeException)
+{
+}
+
+} // namespace framework
diff --git a/framework/source/layoutmanager/panelmanager.hxx b/framework/source/layoutmanager/panelmanager.hxx
new file mode 100755
index 0000000000..b89b474a7d
--- /dev/null
+++ b/framework/source/layoutmanager/panelmanager.hxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <threadhelp/threadhelpbase.hxx>
+#include <macros/generic.hxx>
+#include <macros/debug.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <general.h>
+#include <stdtypes.h>
+#include "panel.hxx"
+#include <uielement/uielement.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/awt/XDockableWindowListener.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <cppuhelper/weak.hxx>
+#include <vcl/window.hxx>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework
+{
+        
+class PanelManager : private ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses.
+{
+    public:
+        PanelManager( 
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMGR,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        virtual ~PanelManager();
+        
+        bool createPanels();
+        ::com::sun::star::awt::Rectangle getPreferredSize() const;
+        void layoutPanels( const ::com::sun::star::awt::Rectangle newSize );
+
+        UIElement* findDockingWindow( const ::rtl::OUString& rResourceName );
+        bool addDockingWindow( const ::rtl::OUString& rResourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement );
+        bool destroyDockingWindow( const ::rtl::OUString& rResourceName );
+        
+        //---------------------------------------------------------------------------------------------------------
+        //  XDockableWindowListener
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); 
+        virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            
+    private:
+        Panel*                                                 m_aPanels[PANEL_COUNT];
+        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::frame::XFrame >              m_xFrame;
+};
+
+} // namespace framework
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_PANELMANAGER_HXX_
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
new file mode 100755
index 0000000000..5f48a31393
--- /dev/null
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -0,0 +1,4305 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.cxx,v $
+ * $Revision: 1.72 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+// my own includes
+#include <toolbarlayoutmanager.hxx>
+#include <helpers.hxx>
+#include <services.h>
+#include <classes/resource.hrc>
+#include <classes/fwkresid.hxx>
+#include <uiconfiguration/windowstateconfiguration.hxx>
+
+// interface includes
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/ui/XUIElementSettings.hpp>
+#include <com/sun/star/ui/XUIFunctionListener.hpp>
+
+// other includes
+#include <unotools/cmdoptions.hxx>
+#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <vcl/i18nhelp.hxx>
+#include <vcl/dockingarea.hxx>
+#include <boost/bind.hpp>
+
+using namespace ::com::sun::star;
+
+namespace framework
+{
+
+ToolbarLayoutManager::ToolbarLayoutManager( 
+    const uno::Reference< lang::XMultiServiceFactory >& xSMGR, 
+    const uno::Reference< ui::XUIElementFactory >& xUIElementFactory,
+    ILayoutNotifications* pParentLayouter )
+    : ThreadHelpBase( &Application::GetSolarMutex() ),
+    m_xSMGR( xSMGR ),
+    m_xUIElementFactoryManager( xUIElementFactory ),
+    m_pParentLayouter( pParentLayouter ),
+    m_eDockOperation( DOCKOP_ON_COLROW ),
+    m_pAddonOptions( 0 ),
+    m_pGlobalSettings( 0 ),
+    m_bComponentAttached( false ),
+    m_bMustLayout( false ),
+    m_bLayoutDirty( false ),
+    m_bStoreWindowState( false ),
+    m_bGlobalSettings( false ),
+    m_bDockingInProgress( false ),
+    m_bVisible( true ),
+    m_bLayoutInProgress( false ),
+    m_bToolbarCreation( false ),
+    m_aFullAddonTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" )),
+    m_aCustomTbxPrefix( RTL_CONSTASCII_USTRINGPARAM( "custom_" )),
+    m_aCustomizeCmd( RTL_CONSTASCII_USTRINGPARAM( "ConfigureDialog" )),
+    m_aToolbarTypeString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCETYPE_TOOLBAR ))
+{
+    // initialize rectangles to zero values
+    setZeroRectangle( m_aDockingAreaOffsets );
+    setZeroRectangle( m_aDockingArea );
+    
+    // create toolkit object
+    m_xToolkit = uno::Reference< awt::XToolkit >( m_xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), uno::UNO_QUERY );
+}
+
+ToolbarLayoutManager::~ToolbarLayoutManager()
+{
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  XInterface
+//---------------------------------------------------------------------------------------------------------
+void SAL_CALL ToolbarLayoutManager::acquire() throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL ToolbarLayoutManager::release() throw()
+{
+    OWeakObject::release();
+}
+
+uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException )
+{
+    uno::Any a = ::cppu::queryInterface( rType,
+        SAL_STATIC_CAST( awt::XDockableWindowListener*, this ),
+        SAL_STATIC_CAST( ui::XUIConfigurationListener*, this ),
+        SAL_STATIC_CAST( awt::XWindowListener*,         this ));
+
+    if ( a.hasValue() )
+        return a;
+
+    return OWeakObject::queryInterface( rType );
+}
+
+void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
+{
+    if ( aEvent.Source == m_xFrame )
+    {
+        // Reset all internal references
+        reset();
+        implts_destroyDockingAreaWindows();
+    }
+}
+
+awt::Rectangle ToolbarLayoutManager::getDockingArea()
+{
+    WriteGuard aWriteLock( m_aLock );
+    Rectangle aNewDockingArea( m_aDockingArea );
+    aWriteLock.unlock();
+
+    if ( isLayoutDirty() )
+        aNewDockingArea = implts_calcDockingArea();
+    
+    aWriteLock.lock();
+    m_aDockingArea = aNewDockingArea;
+    aWriteLock.unlock();
+    
+    return putRectangleValueToAWT(aNewDockingArea);
+}
+
+void ToolbarLayoutManager::setDockingArea( const awt::Rectangle& rDockingArea )
+{
+    WriteGuard aWriteLock( m_aLock );
+    m_aDockingArea = putAWTToRectangle( rDockingArea );
+    m_bLayoutDirty = true;
+    aWriteLock.unlock();
+}
+
+void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& rBorderSpace )
+{
+    ReadGuard aReadLock( m_aLock );
+    Rectangle aDockOffsets = m_aDockingAreaOffsets;
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+    uno::Reference< awt::XWindow > xTopDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    uno::Reference< awt::XWindow > xBottomDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    uno::Reference< awt::XWindow > xLeftDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    uno::Reference< awt::XWindow > xRightDockAreaWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+    aReadLock.unlock();
+
+    uno::Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY );
+    
+    // Convert relativ size to output size.
+    awt::Rectangle  aRectangle           = xContainerWindow->getPosSize();
+    awt::DeviceInfo aInfo                = xDevice->getInfo();
+    awt::Size       aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset  ,
+                                                      aRectangle.Height - aInfo.TopInset  - aInfo.BottomInset );
+    long aStatusBarHeight                = aDockOffsets.GetHeight();
+
+    sal_Int32 nLeftRightDockingAreaHeight( aContainerClientSize.Height );
+    if ( rBorderSpace.Y >= 0 )
+    {
+        // Top docking area window
+        xTopDockAreaWindow->setPosSize( 0, 0, aContainerClientSize.Width, rBorderSpace.Y, awt::PosSize::POSSIZE );
+        xTopDockAreaWindow->setVisible( sal_True );
+        nLeftRightDockingAreaHeight -= rBorderSpace.Y;
+    }
+
+    if ( rBorderSpace.Height >= 0 )
+    {
+        // Bottom docking area window
+        sal_Int32 nBottomPos = std::max( sal_Int32( aContainerClientSize.Height - rBorderSpace.Height - aStatusBarHeight ), sal_Int32( 0 ));
+        sal_Int32 nHeight = ( nBottomPos == 0 ) ? 0 : rBorderSpace.Height;
+
+        xBottomDockAreaWindow->setPosSize( 0, nBottomPos, aContainerClientSize.Width, nHeight, awt::PosSize::POSSIZE );
+        xBottomDockAreaWindow->setVisible( sal_True );
+        nLeftRightDockingAreaHeight -= nHeight;
+    }
+
+    nLeftRightDockingAreaHeight -= aStatusBarHeight;
+    if ( rBorderSpace.X >= 0 || nLeftRightDockingAreaHeight > 0 )
+    {
+        // Left docking area window
+        // We also have to change our right docking area window if the top or bottom area has changed. They have a higher priority!
+        sal_Int32 nHeight = std::max( sal_Int32( 0 ), sal_Int32( nLeftRightDockingAreaHeight ));
+
+        xLeftDockAreaWindow->setPosSize( 0, rBorderSpace.Y, rBorderSpace.X, nHeight, awt::PosSize::POSSIZE );
+        xLeftDockAreaWindow->setVisible( sal_True );
+    }
+    if ( rBorderSpace.Width >= 0 || nLeftRightDockingAreaHeight > 0 )
+    {
+        // Right docking area window
+        // We also have to change our right docking area window if the top or bottom area has changed. They have a higher priority!
+        sal_Int32 nLeftPos = std::max( sal_Int32( 0 ), sal_Int32( aContainerClientSize.Width - rBorderSpace.Width ));
+        sal_Int32 nHeight  = std::max( sal_Int32( 0 ), sal_Int32( nLeftRightDockingAreaHeight ));
+        sal_Int32 nWidth   = ( nLeftPos == 0 ) ? 0 : rBorderSpace.Width;
+
+        xRightDockAreaWindow->setPosSize( nLeftPos, rBorderSpace.Y, nWidth, nHeight, awt::PosSize::POSSIZE );
+        xRightDockAreaWindow->setVisible( sal_True );
+    }
+}
+
+bool ToolbarLayoutManager::isLayoutDirty()
+{
+    return m_bLayoutDirty;
+}
+
+void ToolbarLayoutManager::doLayout(const ::Size& aContainerSize)
+{
+    WriteGuard aWriteLock( m_aLock );
+    bool bLayoutInProgress( m_bLayoutInProgress );
+    m_bLayoutInProgress = true;
+    awt::Rectangle aDockingArea = putRectangleValueToAWT( m_aDockingArea );
+    aWriteLock.unlock();
+
+    if ( bLayoutInProgress )
+        return;
+
+    // Retrieve row/column dependent data from all docked user-interface elements
+    for ( sal_Int32 i = 0; i < DOCKINGAREAS_COUNT; i++ )
+    {
+        bool bReverse( isReverseOrderDockingArea( i ));
+        std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
+
+        implts_getDockingAreaElementInfos( (ui::DockingArea)i, aRowColumnsWindowData );
+
+        sal_Int32 nOffset( 0 );
+        const sal_uInt32 nCount = aRowColumnsWindowData.size();
+        for ( sal_uInt32 j = 0; j < nCount; ++j )
+        {
+            sal_uInt32 nIndex = bReverse ? nCount-j-1 : j;
+            implts_calcWindowPosSizeOnSingleRowColumn( i, nOffset, aRowColumnsWindowData[nIndex], aContainerSize );
+            nOffset += aRowColumnsWindowData[j].nStaticSize;
+        }
+    }
+
+    implts_setDockingAreaWindowSizes( aDockingArea );
+    
+    aWriteLock.lock();
+    m_bLayoutDirty      = false;
+    m_bLayoutInProgress = false;
+    aWriteLock.unlock();
+}
+
+bool ToolbarLayoutManager::implts_isParentWindowVisible() const
+{
+    ReadGuard aReadLock( m_aLock );
+    bool bVisible( false );    
+    if ( m_xContainerWindow.is() )
+        bVisible = m_xContainerWindow->isVisible();
+
+    return bVisible;
+}
+
+Rectangle ToolbarLayoutManager::implts_calcDockingArea()
+{
+    ReadGuard aReadLock( m_aLock );
+    UIElementVector aWindowVector( m_aUIElements );
+    aReadLock.unlock();
+
+    Rectangle                aBorderSpace;
+    sal_Int32                nCurrRowColumn( 0 );
+    sal_Int32                nCurrPos( 0 );
+    sal_Int32                nCurrDockingArea( ui::DockingArea_DOCKINGAREA_TOP );
+    std::vector< sal_Int32 > aRowColumnSizes[DOCKINGAREAS_COUNT];
+    UIElementVector::const_iterator pConstIter;
+
+    // initialize rectangle with zero values!
+    aBorderSpace.setWidth(0);
+    aBorderSpace.setHeight(0);
+
+    aRowColumnSizes[nCurrDockingArea].clear();
+    aRowColumnSizes[nCurrDockingArea].push_back( 0 );
+
+    for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ )
+    {
+        uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY );
+        if ( xUIElement.is() )
+        {
+            uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+            uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+            if ( xWindow.is() && xDockWindow.is() )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible )
+                {
+                    awt::Rectangle aPosSize = xWindow->getPosSize();
+                    if ( pConstIter->m_aDockedData.m_nDockedArea != nCurrDockingArea )
+                    {
+                        nCurrDockingArea = pConstIter->m_aDockedData.m_nDockedArea;
+                        nCurrRowColumn   = 0;
+                        nCurrPos         = 0;
+                        aRowColumnSizes[nCurrDockingArea].clear();
+                        aRowColumnSizes[nCurrDockingArea].push_back( 0 );
+                    }
+
+                    if ( pConstIter->m_aDockedData.m_nDockedArea == nCurrDockingArea )
+                    {
+                        if ( isHorizontalDockingArea( pConstIter->m_aDockedData.m_nDockedArea ))
+                        {
+                            if ( pConstIter->m_aDockedData.m_aPos.Y() > nCurrPos )
+                            {
+                                ++nCurrRowColumn;
+                                nCurrPos = pConstIter->m_aDockedData.m_aPos.Y();
+                                aRowColumnSizes[nCurrDockingArea].push_back( 0 );
+                            }
+
+                            if ( aPosSize.Height > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
+                                aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Height;
+                        }
+                        else
+                        {
+                            if ( pConstIter->m_aDockedData.m_aPos.X() > nCurrPos )
+                            {
+                                ++nCurrRowColumn;
+                                nCurrPos = pConstIter->m_aDockedData.m_aPos.X();
+                                aRowColumnSizes[nCurrDockingArea].push_back( 0 );
+                            }
+
+                            if ( aPosSize.Width > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
+                                aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Width;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Sum up max heights from every row/column
+    if ( !aWindowVector.empty() )
+    {
+        for ( sal_Int32 i = 0; i <= ui::DockingArea_DOCKINGAREA_RIGHT; i++ )
+        {
+            sal_Int32 nSize( 0 );
+            const sal_uInt32 nCount = aRowColumnSizes[i].size();
+            for ( sal_uInt32 j = 0; j < nCount; j++ )
+                nSize += aRowColumnSizes[i][j];
+
+            if ( i == ui::DockingArea_DOCKINGAREA_TOP )
+                aBorderSpace.Top() = nSize;
+            else if ( i == ui::DockingArea_DOCKINGAREA_BOTTOM )
+                aBorderSpace.Bottom() = nSize;
+            else if ( i == ui::DockingArea_DOCKINGAREA_LEFT )
+                aBorderSpace.Left() = nSize;
+            else
+                aBorderSpace.Right() = nSize;
+        }
+    }
+
+    return aBorderSpace;
+}
+
+void ToolbarLayoutManager::reset()
+{    
+    WriteGuard aWriteLock( m_aLock );
+    uno::Reference< ui::XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr );
+    uno::Reference< ui::XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr );
+    m_xModuleCfgMgr.clear();
+    m_xDocCfgMgr.clear();
+    m_bComponentAttached = false;
+    aWriteLock.unlock();
+
+    destroyToolbars();
+    resetDockingArea();
+}
+
+void ToolbarLayoutManager::attach( 
+    const uno::Reference< frame::XFrame >& xFrame,
+    const uno::Reference< ui::XUIConfigurationManager >& xModuleCfgMgr,
+    const uno::Reference< ui::XUIConfigurationManager >& xDocCfgMgr,
+    const uno::Reference< container::XNameAccess >& xPersistentWindowState )
+{
+    // reset toolbar manager if we lose our current frame
+    if ( m_xFrame.is() && m_xFrame != xFrame )
+        reset();
+    
+    WriteGuard aWriteLock( m_aLock );
+    m_xFrame                 = xFrame;
+    m_xModuleCfgMgr          = xModuleCfgMgr;
+    m_xDocCfgMgr             = xDocCfgMgr;
+    m_xPersistentWindowState = xPersistentWindowState;
+    m_bComponentAttached     = true;
+}
+
+void ToolbarLayoutManager::createStaticToolbars()
+{
+    resetDockingArea();
+    implts_createCustomToolBars();
+    implts_createAddonsToolBars();
+    implts_createNonContextSensitiveToolBars();
+    implts_sortUIElements();
+}
+
+bool ToolbarLayoutManager::requestToolbar( const ::rtl::OUString& rResourceURL )
+{
+    bool bNotify( false );
+    bool bMustCallCreate( false );
+    uno::Reference< ui::XUIElement > xUIElement;
+    
+    UIElement aRequestedToolbar = impl_findToolbar( rResourceURL );
+    if ( aRequestedToolbar.m_aName != rResourceURL  )
+    {
+        bMustCallCreate = true;
+        aRequestedToolbar.m_aName      = rResourceURL;
+        aRequestedToolbar.m_aType      = m_aToolbarTypeString;
+        aRequestedToolbar.m_xUIElement = xUIElement;
+        implts_readWindowStateData( rResourceURL, aRequestedToolbar );
+    }
+    
+    xUIElement = aRequestedToolbar.m_xUIElement;
+    if ( !xUIElement.is() )
+        bMustCallCreate = true;
+    
+    bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible & !aRequestedToolbar.m_bMasterHide );
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY );
+    if ( xContainerWindow.is() && aRequestedToolbar.m_bFloating )
+        bCreateOrShowToolbar &= bool( xContainerWindow->isActive());
+    
+    if ( bCreateOrShowToolbar )
+        bNotify = ( bMustCallCreate ) ? createToolbar( rResourceURL ) : showToolbar( rResourceURL );
+    
+    return bNotify;
+}
+
+bool ToolbarLayoutManager::createToolbar( const ::rtl::OUString& rResourceURL )
+{
+    bool bNotify( false );
+    uno::Reference< ui::XUIElement > xUITempElement;
+    
+    implts_createToolBar( rResourceURL, bNotify, xUITempElement );
+    return bNotify;
+}
+
+bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL )
+{
+    const rtl::OUString aAddonTbResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" ));
+    
+    UIElementVector::iterator pIter;
+    uno::Reference< lang::XComponent > xComponent;
+
+    bool bNotify( false );
+    bool bMustBeSorted( false );
+    bool bMustLayouted( false );
+    bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 );
+    
+    WriteGuard aWriteLock( m_aLock );
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_aName == rResourceURL )
+        {
+            xComponent.set( pIter->m_xUIElement, uno::UNO_QUERY );
+            if ( bMustBeDestroyed )
+                pIter->m_xUIElement.clear();
+            else
+                pIter->m_bVisible = false;
+            break;
+        }
+    }
+    aWriteLock.unlock();
+
+    uno::Reference< ui::XUIElement > xUIElement( xComponent, uno::UNO_QUERY );
+    if ( xUIElement.is() )
+    {
+        uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+        uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+
+        if ( bMustBeDestroyed )
+        {
+            try
+            {
+                if ( xWindow.is() )
+                    xWindow->removeWindowListener( uno::Reference< awt::XWindowListener >(
+                        static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+            }
+            catch( uno::Exception& ) {}
+
+            try
+            {
+                if ( xDockWindow.is() )
+                    xDockWindow->removeDockableWindowListener( uno::Reference< awt::XDockableWindowListener >(
+                        static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+            }
+            catch ( uno::Exception& ) {}
+        }
+        else
+        {
+            if ( xWindow.is() )
+                xWindow->setVisible( sal_False );
+            bNotify = true;
+        }
+
+        if ( !xDockWindow->isFloating() )
+            bMustLayouted = true;
+        bMustBeSorted = true;
+    }
+    
+    if ( bMustBeDestroyed )
+    {
+        if ( xComponent.is() )
+            xComponent->dispose();
+        bNotify = true;
+    }
+
+    if ( bMustLayouted )
+         implts_setLayoutDirty();
+    
+    if ( bMustBeSorted )
+        implts_sortUIElements();
+
+    return bNotify;
+}
+
+void ToolbarLayoutManager::destroyToolbars()
+{
+    UIElementVector aUIElementVector;
+    implts_getUIElementVectorCopy( aUIElementVector );
+
+    WriteGuard aWriteLock( m_aLock );
+    m_aUIElements.clear();
+    m_bLayoutDirty = true;
+    aWriteLock.unlock();
+
+    UIElementVector::iterator pIter;
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    {
+        uno::Reference< lang::XComponent > xComponent( pIter->m_xUIElement, uno::UNO_QUERY );
+        if ( xComponent.is() )
+            xComponent->dispose();
+    }
+}
+
+bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
+    if ( pWindow )
+    {
+        if ( !aUIElement.m_bFloating )
+            implts_setLayoutDirty();
+        else
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+        
+        aUIElement.m_bVisible = true;
+        implts_writeWindowStateData( aUIElement );
+        implts_setToolbar( aUIElement );
+        return true;
+    }
+    
+    return false;
+}
+
+bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
+    if ( pWindow )
+    {
+        pWindow->Show( sal_False );
+        if ( !aUIElement.m_bFloating )
+            implts_setLayoutDirty();
+        
+        aUIElement.m_bVisible = false;
+        implts_writeWindowStateData( aUIElement );
+        implts_setToolbar( aUIElement );
+        return true;
+    }
+
+    return false;
+}
+
+void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars )
+{
+    UIElementVector aUIElementVector;
+
+    ReadGuard aReadLock( m_aLock );
+    bool bVisible( m_bVisible );
+    aReadLock.unlock();
+
+    if ( !bVisible || !bAutomaticToolbars )
+        return;
+
+    implts_getUIElementVectorCopy( aUIElementVector );
+    
+    UIElement aUIElement;
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    UIElementVector::iterator pIter;
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    {
+        if ( implts_readWindowStateData( pIter->m_aName, aUIElement ) &&
+             ( pIter->m_bVisible != aUIElement.m_bVisible ) && !pIter->m_bMasterHide )
+        {
+            WriteGuard aWriteLock( m_aLock );
+            UIElement& rUIElement = impl_findToolbar( pIter->m_aName );
+            if ( rUIElement.m_aName == pIter->m_aName )
+            {
+                rUIElement.m_bVisible = aUIElement.m_bVisible;
+                implts_setLayoutDirty();
+            }
+        }
+    }
+}
+
+void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible )
+{
+    UIElementVector aUIElementVector;
+    implts_getUIElementVectorCopy( aUIElementVector );
+
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    UIElementVector::iterator pIter;
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    {
+        Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
+        if ( pWindow && pIter->m_bFloating )
+        {
+            if ( bVisible )
+            {    
+                if ( pIter->m_bVisible && !pIter->m_bMasterHide )
+                    pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            }
+            else
+                pWindow->Show( sal_False );
+        }            
+    }
+}
+
+void ToolbarLayoutManager::setVisible( bool bVisible )
+{
+    UIElementVector aUIElementVector;
+    implts_getUIElementVectorCopy( aUIElementVector );
+    
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    UIElementVector::iterator pIter;
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    {
+        pIter->m_bMasterHide = !bVisible;
+        Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
+        if ( pWindow )
+        {
+            bool bSetVisible( pIter->m_bVisible & bVisible );
+            if ( !bSetVisible )
+                pWindow->Hide();
+            else
+            {
+                if ( pIter->m_bFloating )
+                    pWindow->Show(true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                else
+                    implts_setLayoutDirty();
+            }
+        }
+    }
+        
+    if ( !bVisible )
+        resetDockingArea();
+}
+
+bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui::DockingArea eDockingArea, const awt::Point& aPos )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+
+    if ( aUIElement.m_xUIElement.is() )
+    {
+        try
+        {
+            uno::Reference< awt::XWindow > xWindow( aUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+            if ( xDockWindow.is() )
+            {
+                if ( eDockingArea != ui::DockingArea_DOCKINGAREA_DEFAULT )
+                    aUIElement.m_aDockedData.m_nDockedArea = sal_Int16( eDockingArea );
+
+                if ( !isDefaultPos( aPos ))
+                    aUIElement.m_aDockedData.m_aPos = ::Point( aPos.X, aPos.Y );
+
+                if ( !xDockWindow->isFloating() )
+                {
+                    Window*  pWindow( 0 );
+                    ToolBox* pToolBox( 0 );
+
+                    {
+                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        pWindow = VCLUnoHelper::GetWindow( xWindow );
+                        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+                        {
+                            pToolBox = (ToolBox *)pWindow;
+
+                            // We have to set the alignment of the toolbox. It's possible that the toolbox is moved from a
+                            // horizontal to a vertical docking area!
+                            pToolBox->SetAlign( ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ));
+                        }
+                    }
+
+                    if ( hasDefaultPosValue( aUIElement.m_aDockedData.m_aPos ))
+                    {
+                        // Docking on its default position without a preset position -
+                        // we have to find a good place for it.
+                        ::Size aSize;
+
+                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        {
+                            if ( pToolBox )
+                                aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) );
+                            else
+                                aSize = pWindow->GetSizePixel();
+                        }
+
+                        ::Point aPixelPos;
+                        ::Point aDockPos;
+                        implts_findNextDockingPos((ui::DockingArea)aUIElement.m_aDockedData.m_nDockedArea, aSize, aDockPos, aPixelPos );
+                        aUIElement.m_aDockedData.m_aPos = aDockPos;
+                    }
+                }
+
+                implts_setToolbar( aUIElement );
+
+                if ( xDockWindow->isFloating() )
+                {
+                    // ATTENTION: This will call toggleFloatingMode() via notifications which 
+                    // sets the floating member of the UIElement correctly!
+                    xDockWindow->setFloatingMode( sal_False );
+                }
+                else
+                {
+                    implts_writeWindowStateData( aUIElement );
+                    implts_sortUIElements();
+
+                    if ( aUIElement.m_bVisible )
+                        implts_setLayoutDirty();
+                }
+                return true;
+            }
+        }
+        catch ( lang::DisposedException& ) {}
+    }
+
+    return false;
+}
+
+bool ToolbarLayoutManager::dockAllToolbars()
+{
+    std::vector< ::rtl::OUString > aToolBarNameVector;
+
+    ::rtl::OUString aElementType;
+    ::rtl::OUString aElementName;
+
+    ReadGuard aReadLock( m_aLock );
+    UIElementVector::iterator pIter;
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() &&
+             pIter->m_bFloating && pIter->m_bVisible )
+            aToolBarNameVector.push_back( pIter->m_aName );
+    }
+    aReadLock.unlock();
+
+    bool bResult(true);
+    const sal_uInt32 nCount = aToolBarNameVector.size();
+    for ( sal_uInt32 i = 0; i < nCount; ++i )
+    {
+        awt::Point aPoint;
+        aPoint.X = aPoint.Y = SAL_MAX_INT32;
+        bResult &= dockToolbar( aToolBarNameVector[i], ui::DockingArea_DOCKINGAREA_DEFAULT, aPoint );
+    }
+
+    return bResult;
+}
+
+long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
+{
+    // To enable toolbar controllers to change their image when a sub-toolbar function
+    // is activated, we need this mechanism. We have NO connection between these toolbars
+    // anymore!
+    if ( pEvent && pEvent->ISA( VclWindowEvent ))
+    {
+        if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT )
+        {
+            ::rtl::OUString aToolbarName;
+            ::rtl::OUString aCommand;
+            ToolBox*        pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() );
+            
+            if ( pToolBox )
+            {
+                aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
+                sal_uInt16 nId = pToolBox->GetCurItemId();
+                if ( nId > 0 )
+                    aCommand = pToolBox->GetItemCommand( nId );
+            }
+
+            if (( aToolbarName.getLength() > 0 ) && ( aCommand.getLength() > 0 ))
+            {
+                ReadGuard aReadLock( m_aLock );
+                ::std::vector< uno::Reference< ui::XUIFunctionListener > > aListenerArray;
+                UIElementVector::iterator pIter;
+
+                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+                {
+                    if ( pIter->m_xUIElement.is() )
+                    {
+                        uno::Reference< ui::XUIFunctionListener > xListener( pIter->m_xUIElement, uno::UNO_QUERY );
+                        if ( xListener.is() )
+                            aListenerArray.push_back( xListener );
+                    }
+                }
+                aReadLock.unlock();
+
+                const sal_uInt32 nCount = aListenerArray.size();
+                for ( sal_uInt32 i = 0; i < nCount; ++i )
+                {
+                    try { aListenerArray[i]->functionExecute( aToolbarName, aCommand ); }
+                    catch ( uno::RuntimeException& ) { throw; }
+                    catch ( uno::Exception& ) {}
+                }
+            }
+        }
+        else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED )
+        {
+            if ( !implts_isToolbarCreationActive() )
+            {    
+                ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() );
+                if ( pToolBox )
+                {
+                    ::rtl::OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
+                    if ( aToolbarName.getLength() > 0 )
+                    {
+                        ::rtl::OUStringBuffer aBuf(100);
+                        aBuf.appendAscii( "private:resource/toolbar/" );
+                        aBuf.append( aToolbarName );
+
+                        UIElement aToolbar = implts_findToolbar( aBuf.makeStringAndClear() );
+                        if ( aToolbar.m_xUIElement.is() && !aToolbar.m_bFloating )
+                        {
+                            implts_setLayoutDirty();                    
+                            m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return 1;
+}
+
+void ToolbarLayoutManager::resetDockingArea()
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< awt::XWindow > xTopDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    uno::Reference< awt::XWindow > xLeftDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    uno::Reference< awt::XWindow > xRightDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+    uno::Reference< awt::XWindow > xBottomDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    aReadLock.unlock();
+    
+    if ( xTopDockingWindow.is() )
+        xTopDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE );
+    if ( xLeftDockingWindow.is() )
+        xLeftDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE );
+    if ( xRightDockingWindow.is() )
+        xRightDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE );
+    if ( xBottomDockingWindow.is() )
+        xBottomDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE );
+}
+
+void ToolbarLayoutManager::setParentWindow( 
+    const uno::Reference< awt::XWindowPeer >& xParentWindow )
+{
+    static const char DOCKINGAREASTRING[] = "dockingarea";
+
+    uno::Reference< awt::XWindow > xTopDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY );
+    uno::Reference< awt::XWindow > xLeftDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY );
+    uno::Reference< awt::XWindow > xRightDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY );
+    uno::Reference< awt::XWindow > xBottomDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY );
+    
+    WriteGuard aWriteLock( m_aLock );
+    m_xContainerWindow = uno::Reference< awt::XWindow2 >( xParentWindow, uno::UNO_QUERY );    
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP]    = xTopDockWindow;
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT]   = xLeftDockWindow;
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT]  = xRightDockWindow;
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] = xBottomDockWindow;
+    aWriteLock.unlock();
+
+    if ( xParentWindow.is() )
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        ::DockingAreaWindow* pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) );
+        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP );
+        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ) );
+            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
+        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xLeftDockWindow ) );
+            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
+        pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xRightDockWindow ) );
+            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
+        implts_reparentToolbars();
+    }
+    else
+    {
+        destroyToolbars();
+        resetDockingArea();
+    }
+}
+
+void ToolbarLayoutManager::setDockingAreaOffsets( const ::Rectangle aOffsets )
+{
+    WriteGuard aWriteLock( m_aLock );
+    m_aDockingAreaOffsets = aOffsets;
+    m_bLayoutDirty        = true;
+}
+
+rtl::OUString ToolbarLayoutManager::implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const
+{
+    String aAddonGenericTitle;
+
+    aAddonGenericTitle = String( FwkResId( STR_TOOLBAR_TITLE_ADDON ));
+    const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
+
+    String aNumStr = rI18nHelper.GetNum( nNumber, 0, sal_False, sal_False );
+    aAddonGenericTitle.SearchAndReplaceAscii( "%num%", aNumStr );
+
+    return rtl::OUString( aAddonGenericTitle );
+}
+
+void ToolbarLayoutManager::implts_createAddonsToolBars()
+{
+    WriteGuard aWriteLock( m_aLock );
+    if ( !m_pAddonOptions )
+        m_pAddonOptions = new AddonsOptions;
+
+    uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
+    uno::Reference< frame::XFrame > xFrame( m_xFrame );
+    aWriteLock.unlock();
+
+    uno::Reference< frame::XModel > xModel( impl_getModelFromFrame( xFrame ));
+    if ( implts_isPreviewModel( xModel ))
+        return; // no addon toolbars for preview frame!
+
+    UIElementVector aUIElementVector;
+    uno::Sequence< uno::Sequence< beans::PropertyValue > > aAddonToolBarData;
+    uno::Reference< ui::XUIElement >                       xUIElement;
+
+    sal_uInt32 nCount = m_pAddonOptions->GetAddonsToolBarCount();
+    ::rtl::OUString aAddonsToolBarStaticName( m_aFullAddonTbxPrefix );
+    ::rtl::OUString aElementType( RTL_CONSTASCII_USTRINGPARAM( "toolbar" ));
+
+    uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
+    aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    aPropSeq[0].Value <<= xFrame;
+    aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationData" ));
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
+    {
+        ::rtl::OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
+        aAddonToolBarData = m_pAddonOptions->GetAddonsToolBarPart( i );
+        aPropSeq[1].Value <<= aAddonToolBarData;
+
+        UIElement aElement = implts_findToolbar( aAddonToolBarName );
+
+        // #i79828
+        // It's now possible that we are called more than once. Be sure to not create
+        // add-on toolbars more than once!
+        if ( aElement.m_xUIElement.is() )
+            continue;
+
+        try
+        {
+            xUIElement = xUIElementFactory->createUIElement( aAddonToolBarName, aPropSeq );
+            if ( xUIElement.is() )
+            {
+                uno::Reference< awt::XDockableWindow > xDockWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+                if ( xDockWindow.is() )
+                {
+                    try
+                    {
+                        xDockWindow->addDockableWindowListener( uno::Reference< awt::XDockableWindowListener >( static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+                        xDockWindow->enableDocking( sal_True );
+                        uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY );
+                        if ( xWindow.is() )
+                            xWindow->addWindowListener( uno::Reference< awt::XWindowListener >( static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+                    }
+                    catch ( uno::Exception& ) {}
+                }
+
+                ::rtl::OUString aGenericAddonTitle = implts_generateGenericAddonToolbarTitle( i+1 );
+
+                if ( aElement.m_aName.getLength() > 0 )
+                {
+                    // Reuse a local entry so we are able to use the latest
+                    // UI changes for this document.
+                    implts_setElementData( aElement, xDockWindow );
+                    aElement.m_xUIElement = xUIElement;
+                    if ( aElement.m_aUIName.getLength() == 0 )
+                    {
+                        aElement.m_aUIName = aGenericAddonTitle;
+                        implts_writeWindowStateData( aElement );
+                    }
+                }
+                else
+                {
+                    // Create new UI element and try to read its state data
+                    UIElement aNewToolbar( aAddonToolBarName, aElementType, xUIElement );
+                    aNewToolbar.m_bFloating = true;
+                    implts_readWindowStateData( aAddonToolBarName, aNewToolbar );
+                    implts_setElementData( aNewToolbar, xDockWindow );
+                    if ( aNewToolbar.m_aUIName.getLength() == 0 )
+                    {
+                        aNewToolbar.m_aUIName = aGenericAddonTitle;
+                        implts_writeWindowStateData( aNewToolbar );
+                    }
+                    implts_insertToolbar( aNewToolbar );
+                }
+
+                uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY );
+                if ( xWindow.is() )
+                {
+                    // Set generic title for add-on toolbar
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                    if ( pWindow->GetText().Len() == 0 )
+                        pWindow->SetText( aGenericAddonTitle );
+                    if ( pWindow->GetType() == WINDOW_TOOLBOX )
+                    {
+                        ToolBox* pToolbar = (ToolBox *)pWindow;
+                        pToolbar->SetMenuType();
+                    }
+                }
+            }
+        }
+        catch ( container::NoSuchElementException& ) {}
+        catch ( lang::IllegalArgumentException& ) {}
+    }
+}
+
+void ToolbarLayoutManager::implts_createCustomToolBars()
+{
+    ReadGuard aReadLock( m_aLock );
+    if ( !m_bComponentAttached )
+        return;
+
+    uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
+    uno::Reference< frame::XFrame > xFrame( m_xFrame );
+    uno::Reference< frame::XModel > xModel;
+    uno::Reference< ui::XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr, uno::UNO_QUERY );
+    uno::Reference< ui::XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr, uno::UNO_QUERY );
+    aReadLock.unlock();
+
+    if ( xFrame.is() )
+    {
+        xModel = impl_getModelFromFrame( xFrame );
+        if ( implts_isPreviewModel( xModel ))
+            return; // no custom toolbars for preview frame!
+
+        uno::Sequence< uno::Sequence< beans::PropertyValue > > aTbxSeq;
+        if ( xDocCfgMgr.is() )
+        {
+            aTbxSeq = xDocCfgMgr->getUIElementsInfo( ui::UIElementType::TOOLBAR );
+            implts_createCustomToolBars( aTbxSeq ); // first create all document based toolbars
+        }
+        if ( xModuleCfgMgr.is() )
+        {
+            aTbxSeq = xModuleCfgMgr->getUIElementsInfo( ui::UIElementType::TOOLBAR );
+            implts_createCustomToolBars( aTbxSeq ); // second create module based toolbars
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars()
+{
+    ReadGuard aReadLock( m_aLock );
+
+    if ( !m_xPersistentWindowState.is() || !m_xFrame.is() || !m_bComponentAttached )
+        return;
+
+    uno::Reference< frame::XFrame >          xFrame( m_xFrame );
+    uno::Reference< ui::XUIElementFactory >  xUIElementFactory( m_xUIElementFactoryManager );
+    uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
+    aReadLock.unlock();
+
+    if ( implts_isPreviewModel( impl_getModelFromFrame( xFrame )))
+        return;
+
+    std::vector< rtl::OUString > aMakeVisibleToolbars;
+
+    try
+    {
+        uno::Sequence< ::rtl::OUString > aToolbarNames = xPersistentWindowState->getElementNames();
+
+        if ( aToolbarNames.getLength() > 0 )
+        {
+            ::rtl::OUString aElementType;
+            ::rtl::OUString aElementName;
+            ::rtl::OUString aName;
+
+            uno::Reference< ui::XUIElement > xUIElement;
+            aMakeVisibleToolbars.reserve(aToolbarNames.getLength());
+
+            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+            WriteGuard aWriteLock( m_aLock );
+
+            const rtl::OUString* pTbNames = aToolbarNames.getConstArray();
+            for ( sal_Int32 i = 0; i < aToolbarNames.getLength(); i++ )
+            {
+                aName = pTbNames[i];
+                parseResourceURL( aName, aElementType, aElementName );
+                
+                // Check that we only create:
+                // - Toolbars (the statusbar is also member of the persistent window state)
+                // - Not custom toolbars, there are created with their own method (implts_createCustomToolbars)
+                if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ) && aElementName.indexOf( m_aCustomTbxPrefix ) == -1 )
+                {
+                    UIElement aNewToolbar = implts_findToolbar( aName );
+                    bool bFound = ( aNewToolbar.m_aName == aName );
+                    if ( !bFound )
+                        implts_readWindowStateData( aName, aNewToolbar );
+
+                    if ( aNewToolbar.m_bVisible && !aNewToolbar.m_bContextSensitive )
+                    {
+                        if ( !bFound )
+                            implts_insertToolbar( aNewToolbar );
+                        aMakeVisibleToolbars.push_back( aName );
+                    }
+                }
+            }
+            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+        }
+    }
+    catch ( uno::RuntimeException& ) { throw; }
+    catch ( uno::Exception& ) {}
+
+    if ( !aMakeVisibleToolbars.empty() )
+        ::std::for_each( aMakeVisibleToolbars.begin(), aMakeVisibleToolbars.end(),::boost::bind( &ToolbarLayoutManager::requestToolbar, this,_1 ));
+}
+
+void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno::Sequence< beans::PropertyValue > >& aTbxSeqSeq )
+{
+    const uno::Sequence< beans::PropertyValue >* pTbxSeq = aTbxSeqSeq.getConstArray();
+    for ( sal_Int32 i = 0; i < aTbxSeqSeq.getLength(); i++ )
+    {
+        const uno::Sequence< beans::PropertyValue >& rTbxSeq = pTbxSeq[i];
+        ::rtl::OUString aTbxResName;
+        ::rtl::OUString aTbxTitle;
+        for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
+        {
+            if ( rTbxSeq[j].Name.equalsAscii( "ResourceURL" ))
+                rTbxSeq[j].Value >>= aTbxResName;
+            else if ( rTbxSeq[j].Name.equalsAscii( "UIName" ))
+                rTbxSeq[j].Value >>= aTbxTitle;
+        }
+
+        // Only create custom toolbars. Their name have to start with "custom_"!
+        if ( aTbxResName.getLength() > 0 && aTbxResName.indexOf( m_aCustomTbxPrefix ) != -1 )
+            implts_createCustomToolBar( aTbxResName, aTbxTitle );
+    }
+}
+
+void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle )
+{
+    if ( aTbxResName.getLength() > 0 )
+    {
+        bool bNotify( false );
+        uno::Reference< ui::XUIElement > xUIElement;
+        implts_createToolBar( aTbxResName, bNotify, xUIElement );
+        
+        if ( aTitle && xUIElement.is() )
+        {
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+
+            Window* pWindow = getWindowFromXUIElement( xUIElement );
+            if ( pWindow  )
+                pWindow->SetText( aTitle );
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_reparentToolbars()
+{
+    WriteGuard aWriteLock( m_aLock );
+    UIElementVector aUIElementVector = m_aUIElements;
+    Window* pContainerWindow  = VCLUnoHelper::GetWindow( m_xContainerWindow );
+    Window* pTopDockWindow    = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    Window* pBottomDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    Window* pLeftDockWindow   = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    Window* pRightDockWindow  = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+    aWriteLock.unlock();
+
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    if ( pContainerWindow )
+    {
+        UIElementVector::iterator pIter;
+        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+        {
+            uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
+            if ( xUIElement.is() )
+            {
+                uno::Reference< awt::XWindow > xWindow;
+                try
+                {
+                    // We have to retreive the window reference with try/catch as it is
+                    // possible that all elements have been disposed!
+                    xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY );
+                }
+                catch ( uno::RuntimeException& ) { throw; }
+                catch ( uno::Exception& ) {}
+
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow )
+                {
+                    // Reparent our child windows acording to their current state.
+                    if ( pIter->m_bFloating )
+                        pWindow->SetParent( pContainerWindow );
+                    else
+                    {
+                        if ( pIter->m_aDockedData.m_nDockedArea == ui::DockingArea_DOCKINGAREA_TOP )
+                            pWindow->SetParent( pTopDockWindow );
+                        else if ( pIter->m_aDockedData.m_nDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+                            pWindow->SetParent( pBottomDockWindow );
+                        else if ( pIter->m_aDockedData.m_nDockedArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                            pWindow->SetParent( pLeftDockWindow );
+                        else
+                            pWindow->SetParent( pRightDockWindow );
+                    }
+                }
+            }
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_setToolbarCreation( bool bStart )
+{
+    WriteGuard aWriteLock( m_aLock );
+    m_bToolbarCreation = bStart;
+}
+
+bool ToolbarLayoutManager::implts_isToolbarCreationActive()
+{
+    ReadGuard aReadLock( m_aLock );
+    return m_bToolbarCreation;
+}
+
+void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, bool& bNotify, uno::Reference< ui::XUIElement >& rUIElement )
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< frame::XFrame > xFrame( m_xFrame );
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+    aReadLock.unlock();
+
+    bNotify = false;
+    
+    if ( !xFrame.is() || !xContainerWindow.is() )
+        return;
+
+    UIElement aToolbarElement = implts_findToolbar( aName );
+    if ( !aToolbarElement.m_xUIElement.is()  )
+    {
+        uno::Reference< ui::XUIElement > xUIElement = implts_createElement( aName );
+
+        bool bVisible( false );
+        bool bFloating( false );
+        if ( xUIElement.is() )
+        {
+            rUIElement = xUIElement;
+            
+            uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+            uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+            if ( xDockWindow.is() && xWindow.is() )
+            {
+                try
+                {
+                    xDockWindow->addDockableWindowListener( uno::Reference< awt::XDockableWindowListener >(
+                        static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+                    xWindow->addWindowListener( uno::Reference< awt::XWindowListener >(
+                        static_cast< OWeakObject * >( this ), uno::UNO_QUERY ));
+                    xDockWindow->enableDocking( sal_True );
+                }
+                catch ( uno::Exception& ) {}
+            }
+
+            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+            WriteGuard aWriteLock( m_aLock );
+
+            UIElement& rElement = impl_findToolbar( aName );
+            if ( rElement.m_aName.getLength() > 0 )
+            {
+                // Reuse a local entry so we are able to use the latest
+                // UI changes for this document.
+                implts_setElementData( rElement, xDockWindow );
+                rElement.m_xUIElement = xUIElement;
+                bVisible = rElement.m_bVisible;
+                bFloating = rElement.m_bFloating;
+            }
+            else
+            {
+                // Create new UI element and try to read its state data
+                UIElement aNewToolbar( aName, m_aToolbarTypeString, xUIElement );
+                implts_readWindowStateData( aName, aNewToolbar );
+                implts_setElementData( aNewToolbar, xDockWindow );
+                implts_insertToolbar( aNewToolbar );
+                bVisible = aNewToolbar.m_bVisible;
+                bFloating = rElement.m_bFloating;
+            }
+            aWriteLock.unlock();
+            /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
+            // set toolbar menu style according to customize command state
+            SvtCommandOptions aCmdOptions;
+
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+            {
+                ToolBox* pToolbar = (ToolBox *)pWindow;
+                sal_uInt16 nMenuType = pToolbar->GetMenuType();
+                if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, m_aCustomizeCmd ))
+                    pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE );
+                else
+                    pToolbar->SetMenuType( nMenuType | TOOLBOX_MENUTYPE_CUSTOMIZE );
+            }
+            bNotify = true;
+            
+            implts_sortUIElements();
+
+            if ( bVisible && !bFloating )
+                implts_setLayoutDirty();
+        }
+    }
+}
+
+uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( const ::rtl::OUString& aName )
+{
+    uno::Reference< ui::XUIElement > xUIElement;
+
+    ReadGuard aReadLock( m_aLock );
+    uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
+    aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+    aPropSeq[0].Value <<= m_xFrame;
+    aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+    aPropSeq[1].Value <<= true;
+    uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
+    aReadLock.unlock();
+
+    implts_setToolbarCreation( true );
+    try
+    {
+        if ( xUIElementFactory.is() )
+            xUIElement = xUIElementFactory->createUIElement( aName, aPropSeq );
+    }
+    catch ( container::NoSuchElementException& ) {}
+    catch ( lang::IllegalArgumentException& ) {}
+    implts_setToolbarCreation( false );
+
+    return xUIElement;
+}
+
+void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno::Reference< awt::XDockableWindow >& rDockWindow )
+{
+    ReadGuard aReadLock( m_aLock );
+    bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide && implts_isParentWindowVisible() );
+    aReadLock.unlock();
+
+    uno::Reference< awt::XDockableWindow > xDockWindow( rDockWindow );
+    uno::Reference< awt::XWindow2 >        xWindow( xDockWindow, uno::UNO_QUERY );
+
+    Window*  pWindow( 0 );
+    ToolBox* pToolBox( 0 );
+
+    if ( xDockWindow.is() && xWindow.is() )
+    {
+        {
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            pWindow = VCLUnoHelper::GetWindow( xWindow );
+            if ( pWindow )
+            {
+                String aText = pWindow->GetText();
+                if ( aText.Len() == 0 )
+                    pWindow->SetText( rElement.m_aUIName );
+                if ( rElement.m_bNoClose )
+                    pWindow->SetStyle( pWindow->GetStyle() & ~WB_CLOSEABLE );
+                if ( pWindow->GetType() == WINDOW_TOOLBOX )
+                    pToolBox = (ToolBox *)pWindow;
+            }
+            if ( pToolBox )
+            {
+                if (( rElement.m_nStyle < 0 ) || ( rElement.m_nStyle > BUTTON_SYMBOLTEXT ))
+                    rElement.m_nStyle = BUTTON_SYMBOL;
+                pToolBox->SetButtonType( (ButtonType)rElement.m_nStyle );
+                if ( rElement.m_bNoClose )
+                    pToolBox->SetFloatStyle( pToolBox->GetFloatStyle() & ~WB_CLOSEABLE );
+            }
+        }
+
+        if ( rElement.m_bFloating )
+        {
+            if ( pWindow )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                String aText = pWindow->GetText();
+                if ( aText.Len() == 0 )
+                    pWindow->SetText( rElement.m_aUIName );
+            }
+
+            ::Point  aPos( rElement.m_aFloatingData.m_aPos.X(),
+                           rElement.m_aFloatingData.m_aPos.Y() );
+            bool bWriteData( false );
+            bool bUndefPos = hasDefaultPosValue( rElement.m_aFloatingData.m_aPos );
+            bool bSetSize = ( rElement.m_aFloatingData.m_aSize.Width() != 0 &&
+                              rElement.m_aFloatingData.m_aSize.Height() != 0 );
+            xDockWindow->setFloatingMode( sal_True );
+            if ( bUndefPos )
+            {
+                aPos = implts_findNextCascadeFloatingPos();
+                rElement.m_aFloatingData.m_aPos = aPos; // set new cascaded position
+                bWriteData = true;
+            }
+
+            if( bSetSize )
+                xWindow->setOutputSize( AWTSize( rElement.m_aFloatingData.m_aSize ) );
+            else
+            {
+                if( pToolBox )
+                {
+                    // set an optimal initial floating size
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    ::Size aSize( pToolBox->CalcFloatingWindowSizePixel() );
+                    pToolBox->SetOutputSizePixel( aSize );
+                }
+            }
+
+            // #i60882# IMPORTANT: Set position after size as it is
+            // possible that we position some part of the toolbar
+            // outside of the desktop. A default constructed toolbar
+            // always has one line. Now VCL automatically
+            // position the toolbar back into the desktop. Therefore
+            // we resize the toolbar with the new (wrong) position.
+            // To fix this problem we have to set the size BEFORE the
+            // position.
+            xWindow->setPosSize( aPos.X(), aPos.Y(), 0, 0, awt::PosSize::POS );
+
+            if ( bWriteData )
+                implts_writeWindowStateData( rElement );
+            if ( bShowElement && pWindow )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            }
+        }
+        else
+        {
+            bool    bSetSize( false );
+            ::Point aDockPos;
+            ::Point aPixelPos;
+            ::Size  aSize;
+
+            if ( pToolBox )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea )  );
+                pToolBox->SetLineCount( 1 );
+                xDockWindow->setFloatingMode( sal_False );
+                if ( rElement.m_aDockedData.m_bLocked )
+                    xDockWindow->lock();
+                aSize = pToolBox->CalcWindowSizePixel();
+                bSetSize = true;
+
+                if ( isDefaultPos( rElement.m_aDockedData.m_aPos ))
+                {
+                    implts_findNextDockingPos( (ui::DockingArea)rElement.m_aDockedData.m_nDockedArea, aSize, aDockPos, aPixelPos );
+                    rElement.m_aDockedData.m_aPos = aDockPos;
+                }
+            }
+
+            xWindow->setPosSize( aPixelPos.X(), aPixelPos.Y(), 0, 0, awt::PosSize::POS );
+            if( bSetSize )
+                xWindow->setOutputSize( AWTSize( aSize) );
+
+            if ( pWindow )
+            {            
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                if ( !bShowElement )
+                    pWindow->Hide();
+            }
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_destroyDockingAreaWindows()
+{
+    WriteGuard aWriteLock( m_aLock );
+    uno::Reference< awt::XWindow > xTopDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    uno::Reference< awt::XWindow > xLeftDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    uno::Reference< awt::XWindow > xRightDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+    uno::Reference< awt::XWindow > xBottomDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP].clear();
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT].clear();
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT].clear();
+    m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM].clear();
+    aWriteLock.unlock();
+
+    // destroy windows
+    xTopDockingWindow->dispose();
+    xLeftDockingWindow->dispose();
+    xRightDockingWindow->dispose();
+    xBottomDockingWindow->dispose();
+}
+
+//---------------------------------------------------------------------------------------------------------
+// persistence methods
+//---------------------------------------------------------------------------------------------------------
+
+sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData )
+{
+    WriteGuard aWriteLock( m_aLock );
+    uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
+    bool bGetSettingsState( false );
+    aWriteLock.unlock();
+
+    if ( xPersistentWindowState.is() )
+    {
+        aWriteLock.lock();
+        bool bGlobalSettings( m_bGlobalSettings );
+        GlobalSettings* pGlobalSettings( 0 );
+        if ( m_pGlobalSettings == 0 )
+        {
+            m_pGlobalSettings = new GlobalSettings( m_xSMGR );
+            bGetSettingsState = true;
+        }
+        pGlobalSettings = m_pGlobalSettings;
+        aWriteLock.unlock();
+
+        try
+        {
+            uno::Sequence< beans::PropertyValue > aWindowState;
+            if ( xPersistentWindowState->getByName( aName ) >>= aWindowState )
+            {
+                sal_Bool bValue( sal_False );
+                for ( sal_Int32 n = 0; n < aWindowState.getLength(); n++ )
+                {
+                    if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_DOCKED ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bFloating = !bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_VISIBLE ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bVisible = bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA ))
+                    {
+                        ui::DockingArea eDockingArea;
+                        if ( aWindowState[n].Value >>= eDockingArea )
+                            rElementData.m_aDockedData.m_nDockedArea = sal_Int16( eDockingArea );
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_DOCKPOS ))
+                    {
+                        awt::Point aPoint;
+                        if ( aWindowState[n].Value >>= aPoint )
+                        {
+                            rElementData.m_aDockedData.m_aPos.X() = aPoint.X;
+                            rElementData.m_aDockedData.m_aPos.Y() = aPoint.Y;
+                        }
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_POS ))
+                    {
+                        awt::Point aPoint;
+                        if ( aWindowState[n].Value >>= aPoint )
+                        {
+                            rElementData.m_aFloatingData.m_aPos.X() = aPoint.X;
+                            rElementData.m_aFloatingData.m_aPos.Y() = aPoint.Y;
+                        }
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_SIZE ))
+                    {
+                        awt::Size aSize;
+                        if ( aWindowState[n].Value >>= aSize )
+                        {
+                            rElementData.m_aFloatingData.m_aSize.Width() = aSize.Width;
+                            rElementData.m_aFloatingData.m_aSize.Height() = aSize.Height;
+                        }
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_UINAME ))
+                        aWindowState[n].Value >>= rElementData.m_aUIName;
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_STYLE ))
+                    {
+                        sal_Int32 nStyle = 0;
+                        if ( aWindowState[n].Value >>= nStyle )
+                            rElementData.m_nStyle = sal_Int16( nStyle );
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_LOCKED ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_aDockedData.m_bLocked = bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXT ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bContextSensitive = bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_NOCLOSE ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bNoClose = bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXTACTIVE ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bContextActive = bValue;
+                    }
+                    else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_SOFTCLOSE ))
+                    {
+                        if ( aWindowState[n].Value >>= bValue )
+                            rElementData.m_bSoftClose = bValue;
+                    }
+                }
+            }
+
+            // oversteer values with global settings
+            if ( pGlobalSettings && ( bGetSettingsState || bGlobalSettings ))
+            {
+                if ( pGlobalSettings->HasStatesInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR ))
+                {
+                    WriteGuard aWriteLock2( m_aLock );
+                    m_bGlobalSettings = true;
+                    aWriteLock2.unlock();
+
+                    uno::Any aValue;
+                    sal_Bool bValue = sal_Bool();
+                    if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR,
+                                                        GlobalSettings::STATEINFO_LOCKED,
+                                                        aValue ))
+                        aValue >>= rElementData.m_aDockedData.m_bLocked;
+                    if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR,
+                                                        GlobalSettings::STATEINFO_DOCKED,
+                                                        aValue ))
+                    {
+                        if ( aValue >>= bValue )
+                            rElementData.m_bFloating = !bValue;
+                    }
+                }
+            }
+
+            return sal_True;
+        }
+        catch ( container::NoSuchElementException& ) {}
+    }
+
+    return sal_False;
+}
+
+void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElementData )
+{
+    WriteGuard aWriteLock( m_aLock );
+    uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
+    m_bStoreWindowState = true; // set flag to determine that we triggered the notification
+    aWriteLock.unlock();
+
+    bool bPersistent( sal_False );
+    uno::Reference< beans::XPropertySet > xPropSet( rElementData.m_xUIElement, uno::UNO_QUERY );
+    if ( xPropSet.is() )
+    {
+        try
+        {
+            // Check persistent flag of the user interface element
+            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ))) >>= bPersistent;
+        }
+        catch ( beans::UnknownPropertyException )
+        {
+            bPersistent = true; // Non-configurable elements should at least store their dimension/position
+        }
+        catch ( lang::WrappedTargetException ) {}
+    }
+
+    if ( bPersistent && xPersistentWindowState.is() )
+    {
+        try
+        {
+            uno::Sequence< beans::PropertyValue > aWindowState( 8 );
+
+            aWindowState[0].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED );
+            aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating ));
+            aWindowState[1].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE );
+            aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible ));
+            aWindowState[2].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA );
+            aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
+
+            awt::Point aPos;
+            aPos.X = rElementData.m_aDockedData.m_aPos.X();
+            aPos.Y = rElementData.m_aDockedData.m_aPos.Y();
+            aWindowState[3].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS );
+            aWindowState[3].Value <<= aPos;
+
+            aPos.X = rElementData.m_aFloatingData.m_aPos.X();
+            aPos.Y = rElementData.m_aFloatingData.m_aPos.Y();
+            aWindowState[4].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS );
+            aWindowState[4].Value <<= aPos;
+
+            awt::Size aSize;
+            aSize.Width  = rElementData.m_aFloatingData.m_aSize.Width();
+            aSize.Height = rElementData.m_aFloatingData.m_aSize.Height();
+            aWindowState[5].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE );
+            aWindowState[5].Value <<= aSize;
+            aWindowState[6].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME );
+            aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
+            aWindowState[7].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED );
+            aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
+
+            ::rtl::OUString aName = rElementData.m_aName;
+            if ( xPersistentWindowState->hasByName( aName ))
+            {
+                uno::Reference< container::XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
+                xReplace->replaceByName( aName, uno::makeAny( aWindowState ));
+            }
+            else
+            {
+                uno::Reference< container::XNameContainer > xInsert( xPersistentWindowState, uno::UNO_QUERY );
+                xInsert->insertByName( aName, uno::makeAny( aWindowState ));
+            }
+        }
+        catch ( uno::Exception& ) {}
+    }
+
+    // Reset flag
+    aWriteLock.lock();
+    m_bStoreWindowState = false;
+    aWriteLock.unlock();
+}
+
+void ToolbarLayoutManager::implts_writeNewWindowStateData( const rtl::OUString aName, const uno::Reference< awt::XWindow >& xWindow )
+{
+    bool bVisible( false );
+    bool bFloating( true );
+    awt::Rectangle aPos;
+    awt::Size      aSize;
+
+    if ( xWindow.is() )
+    {
+        uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+        if ( xDockWindow.is() )
+            bFloating = xDockWindow->isFloating();
+
+        uno::Reference< awt::XWindow2 > xWindow2( xWindow, uno::UNO_QUERY );
+        if( xWindow2.is() )
+        {
+            aPos     = xWindow2->getPosSize();
+            aSize    = xWindow2->getOutputSize();   // always use output size for consistency
+            bVisible = xWindow2->isVisible();
+        }
+
+        WriteGuard aWriteLock( m_aLock );
+        UIElement& rUIElement = impl_findToolbar( aName );
+        if ( rUIElement.m_xUIElement.is() )
+        {
+            rUIElement.m_bVisible   = bVisible;
+            rUIElement.m_bFloating  = bFloating;
+            if ( bFloating )
+            {
+                rUIElement.m_aFloatingData.m_aPos  = ::Point( aPos.X, aPos.Y );
+                rUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
+            }
+        }
+        implts_writeWindowStateData( rUIElement );
+        aWriteLock.unlock();
+    }
+}
+
+/******************************************************************************
+                        LOOKUP PART FOR TOOLBARS
+******************************************************************************/
+
+UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName )
+{
+    static UIElement aEmptyElement;
+    UIElementVector::iterator pIter;
+    
+    ReadGuard aReadLock( m_aLock );
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_aName == aName )
+            return *pIter;
+    }
+
+    return aEmptyElement;
+}
+
+UIElement ToolbarLayoutManager::implts_findToolbar( const rtl::OUString& aName )
+{
+    ReadGuard aReadLock( m_aLock );
+    UIElement aElement = impl_findToolbar( aName );
+    aReadLock.unlock();
+
+    return aElement;
+}
+
+UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::XInterface >& xToolbar )
+{
+    UIElement                       aToolbar;
+    UIElementVector::const_iterator pIter;
+
+    ReadGuard aReadLock( m_aLock );
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_xUIElement.is() )
+        {
+            uno::Reference< uno::XInterface > xIfac( pIter->m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            if ( xIfac == xToolbar )
+            {
+                aToolbar = *pIter;
+                break;
+            }
+        }
+    }
+
+    return aToolbar;
+}
+
+uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const ::rtl::OUString& aName )
+{
+    UIElementVector::iterator pIter;
+    uno::Reference< awt::XWindow > xWindow;
+
+    ReadGuard aReadLock( m_aLock );
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
+        {
+             xWindow = uno::Reference< awt::XWindow >( pIter->m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+             break;
+        }
+    }
+
+    return xWindow;
+}
+
+Window* ToolbarLayoutManager::implts_getWindow( const ::rtl::OUString& aName )
+{
+    uno::Reference< awt::XWindow > xWindow = implts_getXWindow( aName );
+    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+
+    return pWindow;
+}
+
+bool ToolbarLayoutManager::implts_insertToolbar( const UIElement& rUIElement )
+{
+    UIElement aTempData;
+    bool      bFound( false );
+    bool      bResult( false );
+    
+    aTempData = implts_findToolbar( rUIElement.m_aName );
+    if ( aTempData.m_aName == rUIElement.m_aName )
+        bFound = true;
+    
+    if ( !bFound )
+    {
+        WriteGuard aWriteLock( m_aLock );
+        m_aUIElements.push_back( rUIElement );
+        bResult = true;
+    }
+    
+    return bResult;
+}
+
+void ToolbarLayoutManager::implts_setToolbar( const UIElement& rUIElement )
+{
+    WriteGuard aWriteLock( m_aLock );
+    UIElement& rData = impl_findToolbar( rUIElement.m_aName );
+    if ( rData.m_aName == rUIElement.m_aName )
+        rData = rUIElement;
+    else
+        m_aUIElements.push_back( rUIElement );
+}
+
+/******************************************************************************
+                        LAYOUT CODE PART FOR TOOLBARS
+******************************************************************************/
+
+::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
+{
+    const sal_Int32 nHotZoneX       = 50;
+    const sal_Int32 nHotZoneY       = 50;
+    const sal_Int32 nCascadeIndentX = 15;
+    const sal_Int32 nCascadeIndentY = 15;
+
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+    uno::Reference< awt::XWindow > xTopDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    uno::Reference< awt::XWindow > xLeftDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    aReadLock.unlock();
+
+    ::Point aStartPos( nCascadeIndentX, nCascadeIndentY );
+    ::Point aCurrPos( aStartPos );
+    awt::Rectangle aRect;
+
+    Window* pContainerWindow( 0 );
+    if ( xContainerWindow.is() )
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+        if ( pContainerWindow )
+            aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos );
+    }
+
+    // Determine size of top and left docking area
+    awt::Rectangle aTopRect( xTopDockingWindow->getPosSize() );
+    awt::Rectangle aLeftRect( xLeftDockingWindow->getPosSize() );
+
+    aStartPos.X() += aLeftRect.Width + nCascadeIndentX;
+    aStartPos.Y() += aTopRect.Height + nCascadeIndentY;
+    aCurrPos = aStartPos;
+
+    // Try to find a cascaded position for the new floating window
+    UIElementVector::const_iterator pIter;
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_xUIElement.is() )
+        {
+            uno::Reference< awt::XDockableWindow > xDockWindow( pIter->m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            uno::Reference< awt::XWindow > xWindow( xDockWindow, uno::UNO_QUERY );
+            if ( xDockWindow.is() && xDockWindow->isFloating() )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow && pWindow->IsVisible() )
+                {
+                    awt::Rectangle aFloatRect = xWindow->getPosSize();
+                    if ((( aFloatRect.X - nHotZoneX ) <= aCurrPos.X() ) &&
+                        ( aFloatRect.X >= aCurrPos.X() ) &&
+                        (( aFloatRect.Y - nHotZoneY ) <= aCurrPos.Y() ) &&
+                        ( aFloatRect.Y >= aCurrPos.Y() ))
+                    {
+                        aCurrPos.X() = aFloatRect.X + nCascadeIndentX;
+                        aCurrPos.Y() = aFloatRect.Y + nCascadeIndentY;
+                    }
+                }
+            }
+        }
+    }
+
+    return aCurrPos;
+}
+
+void ToolbarLayoutManager::implts_sortUIElements()
+{
+    WriteGuard aWriteLock( m_aLock );
+    UIElementVector::iterator pIterStart = m_aUIElements.begin();
+    UIElementVector::iterator pIterEnd   = m_aUIElements.end();
+
+    std::stable_sort( pIterStart, pIterEnd ); // first created element should first
+
+    // We have to reset our temporary flags.
+    UIElementVector::iterator pIter;
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+        pIter->m_bUserActive = sal_False;
+    aWriteLock.unlock();
+}
+
+void ToolbarLayoutManager::implts_getUIElementVectorCopy( UIElementVector& rCopy )
+{
+    ReadGuard aReadLock( m_aLock );
+    rCopy = m_aUIElements;
+}
+
+::Size ToolbarLayoutManager::implts_getTopBottomDockingAreaSizes()
+{
+    ::Size                         aSize;
+    uno::Reference< awt::XWindow > xTopDockingAreaWindow;
+    uno::Reference< awt::XWindow > xBottomDockingAreaWindow;
+
+    ReadGuard aReadLock( m_aLock );
+    xTopDockingAreaWindow    = m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP];
+    xBottomDockingAreaWindow = m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM];
+    aReadLock.unlock();
+
+    if ( xTopDockingAreaWindow.is() )
+        aSize.Width() = xTopDockingAreaWindow->getPosSize().Height;
+    if ( xBottomDockingAreaWindow.is() )
+        aSize.Height() = xBottomDockingAreaWindow->getPosSize().Height;
+
+    return aSize;
+}
+
+void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eDockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData )
+{
+    std::vector< UIElement > aWindowVector;
+
+    if (( eDockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( eDockingArea > ui::DockingArea_DOCKINGAREA_RIGHT ))
+        eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+
+    uno::Reference< awt::XWindow > xDockAreaWindow;
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    ReadGuard aReadLock( m_aLock );
+    aWindowVector.reserve(m_aUIElements.size());
+    xDockAreaWindow = m_xDockAreaWindows[eDockingArea];
+    UIElementVector::iterator   pIter;
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating )
+        {
+            uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
+            if ( xUIElement.is() )
+            {
+                uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+                uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+                if ( xDockWindow.is() )
+                {
+                    // docked windows
+                    aWindowVector.push_back( *pIter );
+                }
+            }
+        }
+    }
+    aReadLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
+    rRowColumnsWindowData.clear();
+
+    // Collect data from windows that are on the same row/column
+    sal_Int32 j;
+    sal_Int32 nIndex( 0 );
+    sal_Int32 nLastPos( 0 );
+    sal_Int32 nCurrPos( -1 );
+    sal_Int32 nLastRowColPixelPos( 0 );
+    awt::Rectangle aDockAreaRect;
+
+    if ( xDockAreaWindow.is() )
+        aDockAreaRect = xDockAreaWindow->getPosSize();
+
+    if ( eDockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+        nLastRowColPixelPos = 0;
+    else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+        nLastRowColPixelPos = aDockAreaRect.Height;
+    else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+        nLastRowColPixelPos = 0;
+    else
+        nLastRowColPixelPos = aDockAreaRect.Width;
+
+    const sal_uInt32 nCount = aWindowVector.size();
+    for ( j = 0; j < sal_Int32( nCount); j++ )
+    {
+        const UIElement& rElement = aWindowVector[j];
+        uno::Reference< awt::XWindow > xWindow;
+        uno::Reference< ui::XUIElement > xUIElement( rElement.m_xUIElement );
+        awt::Rectangle aPosSize;
+        
+        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
+            continue;
+        if ( isHorizontalDockingArea( eDockingArea ))
+        {
+            if ( nCurrPos == -1 )
+            {
+                nCurrPos = rElement.m_aDockedData.m_aPos.Y();
+                nLastPos = 0;
+
+                SingleRowColumnWindowData aRowColumnWindowData;
+                aRowColumnWindowData.nRowColumn = nCurrPos;
+                rRowColumnsWindowData.push_back( aRowColumnWindowData );
+            }
+
+            sal_Int32 nSpace( 0 );
+            if ( rElement.m_aDockedData.m_aPos.Y() != nCurrPos )
+            {
+                if ( eDockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+                    nLastRowColPixelPos += rRowColumnsWindowData[nIndex].nStaticSize;
+                else
+                    nLastRowColPixelPos -= rRowColumnsWindowData[nIndex].nStaticSize;
+                ++nIndex;
+                nLastPos = 0;
+                nCurrPos = rElement.m_aDockedData.m_aPos.Y();
+                SingleRowColumnWindowData aRowColumnWindowData;
+                aRowColumnWindowData.nRowColumn = nCurrPos;
+                rRowColumnsWindowData.push_back( aRowColumnWindowData );
+            }
+
+            // Calc space before an element and store it
+            nSpace = ( rElement.m_aDockedData.m_aPos.X() - nLastPos );
+            if ( rElement.m_aDockedData.m_aPos.X() >= nLastPos )
+            {
+                rRowColumnsWindowData[nIndex].nSpace += nSpace;
+                nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width;
+            }
+            else
+            {
+                nSpace = 0;
+                nLastPos += aPosSize.Width;
+            }
+            rRowColumnsWindowData[nIndex].aRowColumnSpace.push_back( nSpace );
+
+            rRowColumnsWindowData[nIndex].aRowColumnWindows.push_back( xWindow );
+            rRowColumnsWindowData[nIndex].aUIElementNames.push_back( rElement.m_aName );
+            rRowColumnsWindowData[nIndex].aRowColumnWindowSizes.push_back(
+                awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
+                                rElement.m_aDockedData.m_aPos.Y(),
+                                aPosSize.Width,
+                                aPosSize.Height ));
+            if ( rRowColumnsWindowData[nIndex].nStaticSize < aPosSize.Height )
+                rRowColumnsWindowData[nIndex].nStaticSize = aPosSize.Height;
+            if ( eDockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+                rRowColumnsWindowData[nIndex].aRowColumnRect = awt::Rectangle( 0, nLastRowColPixelPos,
+                                                                               aDockAreaRect.Width, aPosSize.Height );
+            else
+                rRowColumnsWindowData[nIndex].aRowColumnRect = awt::Rectangle( 0, ( nLastRowColPixelPos - aPosSize.Height ),
+                                                                               aDockAreaRect.Width, aPosSize.Height );
+            rRowColumnsWindowData[nIndex].nVarSize += aPosSize.Width + nSpace;
+        }
+        else
+        {
+            if ( nCurrPos == -1 )
+            {
+                nCurrPos = rElement.m_aDockedData.m_aPos.X();
+                nLastPos = 0;
+
+                SingleRowColumnWindowData aRowColumnWindowData;
+                aRowColumnWindowData.nRowColumn = nCurrPos;
+                rRowColumnsWindowData.push_back( aRowColumnWindowData );
+            }
+
+            sal_Int32 nSpace( 0 );
+            if ( rElement.m_aDockedData.m_aPos.X() != nCurrPos )
+            {
+                if ( eDockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                    nLastRowColPixelPos += rRowColumnsWindowData[nIndex].nStaticSize;
+                else
+                    nLastRowColPixelPos -= rRowColumnsWindowData[nIndex].nStaticSize;
+                ++nIndex;
+                nLastPos = 0;
+                nCurrPos = rElement.m_aDockedData.m_aPos.X();
+                SingleRowColumnWindowData aRowColumnWindowData;
+                aRowColumnWindowData.nRowColumn = nCurrPos;
+                rRowColumnsWindowData.push_back( aRowColumnWindowData );
+            }
+
+            // Calc space before an element and store it
+            nSpace = ( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
+            if ( rElement.m_aDockedData.m_aPos.Y() > nLastPos )
+            {
+                rRowColumnsWindowData[nIndex].nSpace += nSpace;
+                nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height;
+            }
+            else
+            {
+                nSpace = 0;
+                nLastPos += aPosSize.Height;
+            }
+            rRowColumnsWindowData[nIndex].aRowColumnSpace.push_back( nSpace );
+
+            rRowColumnsWindowData[nIndex].aRowColumnWindows.push_back( xWindow );
+            rRowColumnsWindowData[nIndex].aUIElementNames.push_back( rElement.m_aName );
+            rRowColumnsWindowData[nIndex].aRowColumnWindowSizes.push_back(
+                awt::Rectangle( rElement.m_aDockedData.m_aPos.X(),
+                                rElement.m_aDockedData.m_aPos.Y(),
+                                aPosSize.Width,
+                                aPosSize.Height ));
+            if ( rRowColumnsWindowData[nIndex].nStaticSize < aPosSize.Width )
+                rRowColumnsWindowData[nIndex].nStaticSize = aPosSize.Width;
+            if ( eDockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                rRowColumnsWindowData[nIndex].aRowColumnRect = awt::Rectangle( nLastRowColPixelPos, 0,
+                                                                               aPosSize.Width, aDockAreaRect.Height );
+            else
+                rRowColumnsWindowData[nIndex].aRowColumnRect = awt::Rectangle( ( nLastRowColPixelPos - aPosSize.Width ), 0,
+                                                                                 aPosSize.Width, aDockAreaRect.Height );
+            rRowColumnsWindowData[nIndex].nVarSize += aPosSize.Height + nSpace;
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::DockingArea eDockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData )
+{
+    std::vector< UIElement > aWindowVector;
+
+    if (( eDockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( eDockingArea > ui::DockingArea_DOCKINGAREA_RIGHT ))
+        eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+
+    bool bHorzDockArea = isHorizontalDockingArea( eDockingArea );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    ReadGuard aReadLock( m_aLock );
+    UIElementVector::iterator   pIter;
+    UIElementVector::iterator   pEnd = m_aUIElements.end();
+    for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ )
+    {
+        if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
+        {
+            bool bSameRowCol = bHorzDockArea ? ( pIter->m_aDockedData.m_aPos.Y() == nRowCol ) : ( pIter->m_aDockedData.m_aPos.X() == nRowCol );
+            uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
+
+            if ( bSameRowCol && xUIElement.is() )
+            {
+                uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+                if ( xWindow.is() )
+                {
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                    uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+                    if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating )
+                        aWindowVector.push_back( *pIter ); // docked windows
+                }
+            }
+        }
+    }
+    aReadLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
+    // Initialize structure
+    rRowColumnWindowData.aUIElementNames.clear();
+    rRowColumnWindowData.aRowColumnWindows.clear();
+    rRowColumnWindowData.aRowColumnWindowSizes.clear();
+    rRowColumnWindowData.aRowColumnSpace.clear();
+    rRowColumnWindowData.nVarSize = 0;
+    rRowColumnWindowData.nStaticSize = 0;
+    rRowColumnWindowData.nSpace = 0;
+    rRowColumnWindowData.nRowColumn = nRowCol;
+
+    // Collect data from windows that are on the same row/column
+    sal_Int32 j;
+    sal_Int32 nLastPos( 0 );
+
+    const sal_uInt32 nCount = aWindowVector.size();
+    for ( j = 0; j < sal_Int32( nCount); j++ )
+    {
+        const UIElement& rElement = aWindowVector[j];
+        uno::Reference< awt::XWindow > xWindow;
+        uno::Reference< ui::XUIElement > xUIElement( rElement.m_xUIElement );
+        awt::Rectangle aPosSize;
+        if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) )
+            continue;
+
+        sal_Int32 nSpace;
+        if ( isHorizontalDockingArea( eDockingArea ))
+        {
+            nSpace = ( rElement.m_aDockedData.m_aPos.X() - nLastPos );
+
+            // Calc space before an element and store it
+            if ( rElement.m_aDockedData.m_aPos.X() > nLastPos )
+                rRowColumnWindowData.nSpace += nSpace;
+            else
+                nSpace = 0;
+
+            nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width;
+
+
+            rRowColumnWindowData.aRowColumnWindowSizes.push_back(
+                awt::Rectangle( rElement.m_aDockedData.m_aPos.X(), rElement.m_aDockedData.m_aPos.Y(),
+                                aPosSize.Width, aPosSize.Height ));
+            if ( rRowColumnWindowData.nStaticSize < aPosSize.Height )
+                rRowColumnWindowData.nStaticSize = aPosSize.Height;
+            rRowColumnWindowData.nVarSize += aPosSize.Width;
+        }
+        else
+        {
+            // Calc space before an element and store it
+            nSpace = ( rElement.m_aDockedData.m_aPos.Y() - nLastPos );
+            if ( rElement.m_aDockedData.m_aPos.Y() > nLastPos )
+                rRowColumnWindowData.nSpace += nSpace;
+            else
+                nSpace = 0;
+
+            nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height;
+
+            rRowColumnWindowData.aRowColumnWindowSizes.push_back(
+                awt::Rectangle( rElement.m_aDockedData.m_aPos.X(), rElement.m_aDockedData.m_aPos.Y(),
+                                aPosSize.Width, aPosSize.Height ));
+            if ( rRowColumnWindowData.nStaticSize < aPosSize.Width )
+                rRowColumnWindowData.nStaticSize = aPosSize.Width;
+            rRowColumnWindowData.nVarSize += aPosSize.Height;
+        }
+
+        rRowColumnWindowData.aUIElementNames.push_back( rElement.m_aName );
+        rRowColumnWindowData.aRowColumnWindows.push_back( xWindow );
+        rRowColumnWindowData.aRowColumnSpace.push_back( nSpace );
+        rRowColumnWindowData.nVarSize += nSpace;
+    }
+}
+
+::Rectangle ToolbarLayoutManager::implts_getWindowRectFromRowColumn(
+    ui::DockingArea DockingArea,
+    const SingleRowColumnWindowData& rRowColumnWindowData,
+    const ::Point& rMousePos,
+    const rtl::OUString& rExcludeElementName )
+{
+    ::Rectangle aWinRect;
+
+    if (( DockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea > ui::DockingArea_DOCKINGAREA_RIGHT ))
+        DockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+
+    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
+        return aWinRect;
+    else
+    {
+        ReadGuard aReadLock( m_aLock );
+        Window* pContainerWindow( VCLUnoHelper::GetWindow( m_xContainerWindow ));
+        Window* pDockingAreaWindow( VCLUnoHelper::GetWindow( m_xDockAreaWindows[DockingArea] ));
+        aReadLock.unlock();
+
+        // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+
+        // Retrieve output size from container Window
+        if ( pDockingAreaWindow && pContainerWindow )
+        {
+            const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindows.size();
+            for ( sal_uInt32 i = 0; i < nCount; i++ )
+            {
+                awt::Rectangle aWindowRect = rRowColumnWindowData.aRowColumnWindows[i]->getPosSize();
+                ::Rectangle aRect( aWindowRect.X, aWindowRect.Y, aWindowRect.X+aWindowRect.Width, aWindowRect.Y+aWindowRect.Height );
+                aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
+                if ( aRect.IsInside( rMousePos ))
+                {
+                    // Check if we have found the excluded element. If yes, we have to provide an empty rectangle.
+                    // We prevent that a toolbar cannot be moved when the mouse pointer is inside its own rectangle!
+                    if ( rExcludeElementName != rRowColumnWindowData.aUIElementNames[i] )
+                        return aRect;
+                    else
+                        break;
+                }
+            }
+        }
+    }
+
+    return aWinRect;
+}
+
+::Rectangle ToolbarLayoutManager::implts_determineFrontDockingRect(
+    ui::DockingArea        eDockingArea,
+    sal_Int32              nRowCol,
+    const ::Rectangle&     rDockedElementRect,
+    const ::rtl::OUString& rMovedElementName,
+    const ::Rectangle&     rMovedElementRect )
+{
+    SingleRowColumnWindowData aRowColumnWindowData;
+
+    sal_Bool bHorzDockArea( isHorizontalDockingArea( eDockingArea ));
+    implts_getDockingAreaElementInfoOnSingleRowCol( eDockingArea, nRowCol, aRowColumnWindowData );
+    if ( aRowColumnWindowData.aRowColumnWindows.empty() )
+        return rMovedElementRect;
+    else
+    {
+        sal_Int32 nSpace( 0 );
+        ::Rectangle aFrontDockingRect( rMovedElementRect );
+        const sal_uInt32 nCount = aRowColumnWindowData.aRowColumnWindows.size();
+        for ( sal_uInt32 i = 0; i < nCount; i++ )
+        {
+            if ( bHorzDockArea )
+            {
+                if ( aRowColumnWindowData.aRowColumnWindowSizes[i].X >= rDockedElementRect.Left() )
+                {
+                    nSpace += aRowColumnWindowData.aRowColumnSpace[i];
+                    break;
+                }
+                else if ( aRowColumnWindowData.aUIElementNames[i] == rMovedElementName )
+                    nSpace += aRowColumnWindowData.aRowColumnWindowSizes[i].Width +
+                              aRowColumnWindowData.aRowColumnSpace[i];
+                else
+                    nSpace = 0;
+            }
+            else
+            {
+                if ( aRowColumnWindowData.aRowColumnWindowSizes[i].Y >= rDockedElementRect.Top() )
+                {
+                    nSpace += aRowColumnWindowData.aRowColumnSpace[i];
+                    break;
+                }
+                else if ( aRowColumnWindowData.aUIElementNames[i] == rMovedElementName )
+                    nSpace += aRowColumnWindowData.aRowColumnWindowSizes[i].Height +
+                              aRowColumnWindowData.aRowColumnSpace[i];
+                else
+                    nSpace = 0;
+            }
+        }
+
+        if ( nSpace > 0 )
+        {
+            sal_Int32 nMove = std::min( nSpace, static_cast<sal_Int32>(aFrontDockingRect.getWidth()) );
+            if ( bHorzDockArea )
+                aFrontDockingRect.Move( -nMove, 0 );
+            else
+                aFrontDockingRect.Move( 0, -nMove );
+        }
+
+        return aFrontDockingRect;
+    }
+}
+
+void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos )
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< awt::XWindow > xDockingWindow( m_xDockAreaWindows[DockingArea] );
+    ::Size                         aDockingWinSize;
+    Window*                        pDockingWindow( 0 );
+    aReadLock.unlock();
+
+    if (( DockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea > ui::DockingArea_DOCKINGAREA_RIGHT ))
+        DockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+
+    {
+        // Retrieve output size from container Window
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        pDockingWindow  = VCLUnoHelper::GetWindow( xDockingWindow );
+        if ( pDockingWindow )
+            aDockingWinSize = pDockingWindow->GetOutputSizePixel();
+    }
+
+    sal_Int32 nFreeRowColPixelPos( 0 );
+    sal_Int32 nMaxSpace( 0 );
+    sal_Int32 nNeededSpace( 0 );
+    sal_Int32 nTopDockingAreaSize( 0 );
+
+    if ( isHorizontalDockingArea( DockingArea ))
+    {
+        nMaxSpace    = aDockingWinSize.Width();
+        nNeededSpace = aUIElementSize.Width();
+    }
+    else
+    {
+        nMaxSpace           = aDockingWinSize.Height();
+        nNeededSpace        = aUIElementSize.Height();
+        nTopDockingAreaSize = implts_getTopBottomDockingAreaSizes().Width();
+    }
+
+    std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
+
+    implts_getDockingAreaElementInfos( DockingArea, aRowColumnsWindowData );
+    sal_Int32 nPixelPos( 0 );
+    const sal_uInt32 nCount = aRowColumnsWindowData.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
+    {
+        SingleRowColumnWindowData& rRowColumnWindowData = aRowColumnsWindowData[i];
+
+        if (( DockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) ||
+            ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT  ))
+            nPixelPos += rRowColumnWindowData.nStaticSize;
+
+        if ((( nMaxSpace - rRowColumnWindowData.nVarSize ) >= nNeededSpace ) ||
+            ( rRowColumnWindowData.nSpace >= nNeededSpace ))
+        {
+            // Check current row where we can find the needed space
+            sal_Int32 nCurrPos( 0 );
+            const sal_uInt32 nWindowSizesCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
+            for ( sal_uInt32 j = 0; j < nWindowSizesCount; j++ )
+            {
+                awt::Rectangle rRect  = rRowColumnWindowData.aRowColumnWindowSizes[j];
+                sal_Int32&     rSpace = rRowColumnWindowData.aRowColumnSpace[j];
+                if ( isHorizontalDockingArea( DockingArea ))
+                {
+                    if ( rSpace >= nNeededSpace )
+                    {
+                        rVirtualPos = ::Point( nCurrPos, rRowColumnWindowData.nRowColumn );
+                        if ( DockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+                            rPixelPos   = ::Point( nCurrPos, nPixelPos );
+                        else
+                            rPixelPos   = ::Point( nCurrPos, aDockingWinSize.Height() - nPixelPos );
+                        return;
+                    }
+                    nCurrPos = rRect.X + rRect.Width;
+                }
+                else
+                {
+                    if ( rSpace >= nNeededSpace )
+                    {
+                        rVirtualPos = ::Point( rRowColumnWindowData.nRowColumn, nCurrPos );
+                        if ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                            rPixelPos   = ::Point( nPixelPos, nTopDockingAreaSize + nCurrPos );
+                        else
+                            rPixelPos   = ::Point( aDockingWinSize.Width() - nPixelPos , nTopDockingAreaSize + nCurrPos );
+                        return;
+                    }
+                    nCurrPos = rRect.Y + rRect.Height;
+                }
+            }
+
+            if (( nCurrPos + nNeededSpace ) <= nMaxSpace )
+            {
+                if ( isHorizontalDockingArea( DockingArea ))
+                {
+                    rVirtualPos = ::Point( nCurrPos, rRowColumnWindowData.nRowColumn );
+                    if ( DockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+                        rPixelPos   = ::Point( nCurrPos, nPixelPos );
+                    else
+                        rPixelPos   = ::Point( nCurrPos, aDockingWinSize.Height() - nPixelPos );
+                    return;
+                }
+                else
+                {
+                    rVirtualPos = ::Point( rRowColumnWindowData.nRowColumn, nCurrPos );
+                    if ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                        rPixelPos   = ::Point( nPixelPos, nTopDockingAreaSize + nCurrPos );
+                    else
+                        rPixelPos   = ::Point( aDockingWinSize.Width() - nPixelPos , nTopDockingAreaSize + nCurrPos );
+                    return;
+                }
+            }
+        }
+
+        if (( DockingArea == ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT  ))
+            nPixelPos += rRowColumnWindowData.nStaticSize;
+    }
+
+    sal_Int32 nNextFreeRowCol( 0 );
+    sal_Int32 nRowColumnsCount = aRowColumnsWindowData.size();
+    if ( nRowColumnsCount > 0 )
+        nNextFreeRowCol = aRowColumnsWindowData[nRowColumnsCount-1].nRowColumn+1;
+    else
+        nNextFreeRowCol = 0;
+
+    if ( nNextFreeRowCol == 0 )
+    {
+        if ( DockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+            nFreeRowColPixelPos = aDockingWinSize.Height() - aUIElementSize.Height();
+        else if ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT  )
+            nFreeRowColPixelPos = aDockingWinSize.Width() - aUIElementSize.Width();
+    }
+
+    if ( isHorizontalDockingArea( DockingArea ))
+    {
+        rVirtualPos = ::Point( 0, nNextFreeRowCol );
+        if ( DockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+            rPixelPos = ::Point( 0, nFreeRowColPixelPos );
+        else
+            rPixelPos = ::Point( 0, aDockingWinSize.Height() - nFreeRowColPixelPos );
+    }
+    else
+    {
+        rVirtualPos = ::Point( nNextFreeRowCol, 0 );
+        rPixelPos   = ::Point( aDockingWinSize.Width() - nFreeRowColPixelPos, 0 );
+    }
+}
+
+void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( 
+    sal_Int32 nDockingArea,
+    sal_Int32 nOffset,
+    SingleRowColumnWindowData& rRowColumnWindowData,
+    const ::Size& rContainerSize )
+{
+    sal_Int32 nDiff(0);
+    sal_Int32 nRCSpace( rRowColumnWindowData.nSpace );
+    sal_Int32 nTopDockingAreaSize(0);
+    sal_Int32 nBottomDockingAreaSize(0);
+    sal_Int32 nContainerClientSize(0);
+
+    if ( rRowColumnWindowData.aRowColumnWindows.empty() )
+        return;
+
+    if ( isHorizontalDockingArea( nDockingArea ))
+    {
+        nContainerClientSize = rContainerSize.Width();
+        nDiff = nContainerClientSize - rRowColumnWindowData.nVarSize;
+    }
+    else
+    {
+        nTopDockingAreaSize    = implts_getTopBottomDockingAreaSizes().Width();
+        nBottomDockingAreaSize = implts_getTopBottomDockingAreaSizes().Height();
+        nContainerClientSize   = ( rContainerSize.Height() - nTopDockingAreaSize - nBottomDockingAreaSize );
+        nDiff = nContainerClientSize - rRowColumnWindowData.nVarSize;
+    }
+
+    const sal_uInt32 nCount = rRowColumnWindowData.aRowColumnWindowSizes.size();
+    if (( nDiff < 0 ) && ( nRCSpace > 0 ))
+    {
+        // First we try to reduce the size of blank space before/behind docked windows
+        sal_Int32 i = nCount - 1;
+        while ( i >= 0 )
+        {
+            sal_Int32 nSpace = rRowColumnWindowData.aRowColumnSpace[i];
+            if ( nSpace >= -nDiff )
+            {
+                if ( isHorizontalDockingArea( nDockingArea ))
+                {
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount ; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
+                }
+                else
+                {
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount ; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
+                }
+                nDiff = 0;
+
+                break;
+            }
+            else if ( nSpace > 0 )
+            {
+                if ( isHorizontalDockingArea( nDockingArea ))
+                {
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].X -= nSpace;
+                }
+                else
+                {
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y -= nSpace;
+                }
+                nDiff += nSpace;
+            }
+            --i;
+        }
+    }
+
+    // Check if we have to reduce further
+    if ( nDiff < 0 )
+    {
+        // Now we have to reduce the size of certain docked windows
+        sal_Int32 i = sal_Int32( nCount - 1 );
+        while ( i >= 0 )
+        {
+            awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
+            ::Size          aMinSize;
+
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            {
+                uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
+                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+                    aMinSize = ((ToolBox *)pWindow)->CalcMinimumWindowSizePixel();
+            }
+
+            if (( aMinSize.Width() > 0 ) && ( aMinSize.Height() > 0 ))
+            {
+                if ( isHorizontalDockingArea( nDockingArea ))
+                {
+                    sal_Int32 nMaxReducation = ( rWinRect.Width - aMinSize.Width() );
+                    if ( nMaxReducation >= -nDiff )
+                    {
+                        rWinRect.Width = rWinRect.Width + nDiff;
+                        nDiff = 0;
+                    }
+                    else
+                    {
+                        rWinRect.Width = aMinSize.Width();
+                        nDiff += nMaxReducation;
+                    }
+
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].X += nDiff;
+                }
+                else
+                {
+                    sal_Int32 nMaxReducation = ( rWinRect.Height - aMinSize.Height() );
+                    if ( nMaxReducation >= -nDiff )
+                    {
+                        rWinRect.Height = rWinRect.Height + nDiff;
+                        nDiff = 0;
+                    }
+                    else
+                    {
+                        rWinRect.Height = aMinSize.Height();
+                        nDiff += nMaxReducation;
+                    }
+
+                    // Try to move this and all user elements behind with the calculated difference
+                    for ( sal_uInt32 j = i; j < nCount; j++ )
+                        rRowColumnWindowData.aRowColumnWindowSizes[j].Y += nDiff;
+                }
+            }
+
+            if ( nDiff >= 0 )
+                break;
+
+            --i;
+        }
+    }
+
+    ReadGuard aReadLock( m_aLock );
+    Window* pDockAreaWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[nDockingArea] );
+    aReadLock.unlock();
+
+    sal_Int32 nCurrPos( 0 );
+
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
+    {
+        uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
+        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        Window* pOldParentWindow = pWindow->GetParent();
+
+        if ( pDockAreaWindow != pOldParentWindow )
+            pWindow->SetParent( pDockAreaWindow );
+
+        awt::Rectangle aWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i];
+        if ( isHorizontalDockingArea( nDockingArea ))
+        {
+            if ( aWinRect.X < nCurrPos )
+                aWinRect.X = nCurrPos;
+            pWindow->SetPosSizePixel( ::Point( aWinRect.X, nOffset ), ::Size( aWinRect.Width, rRowColumnWindowData.nStaticSize ));
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            nCurrPos += ( aWinRect.X - nCurrPos ) + aWinRect.Width;
+        }
+        else
+        {
+            if ( aWinRect.Y < nCurrPos )
+                aWinRect.Y = nCurrPos;
+            pWindow->SetPosSizePixel( ::Point( nOffset, aWinRect.Y ), ::Size( rRowColumnWindowData.nStaticSize, aWinRect.Height ));
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            nCurrPos += ( aWinRect.Y - nCurrPos ) + aWinRect.Height;
+        }
+    }
+}
+
+void ToolbarLayoutManager::implts_setLayoutDirty()
+{
+    WriteGuard aWriteLock( m_aLock );
+    m_bLayoutDirty = true;
+}
+
+void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress )
+{
+    WriteGuard aWriteLock( m_aLock );
+    m_bLayoutInProgress = bInProgress;
+}
+
+::Rectangle ToolbarLayoutManager::implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset )
+{
+    ::Rectangle aRect( rRect );
+
+    aRect.Left() -= nHotZoneOffset;
+    aRect.Top() -= nHotZoneOffset;
+    aRect.Right() += nHotZoneOffset;
+    aRect.Bottom() += nHotZoneOffset;
+    
+    return aRect;
+}
+
+void ToolbarLayoutManager::implts_calcDockingPosSize(
+    UIElement&          rUIElement,
+    DockingOperation&   rDockingOperation,
+    ::Rectangle&        rTrackingRect,
+    const Point&        rMousePos )
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+    ::Size                          aContainerWinSize;
+    Window*                         pContainerWindow( 0 );
+    ::Rectangle                     aDockingAreaOffsets( m_aDockingAreaOffsets );
+    aReadLock.unlock();
+
+    if ( !rUIElement.m_xUIElement.is() )
+    {
+        rTrackingRect = ::Rectangle();
+        return;
+    }
+
+    {
+        // Retrieve output size from container Window
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        pContainerWindow  = VCLUnoHelper::GetWindow( xContainerWindow );
+        aContainerWinSize = pContainerWindow->GetOutputSizePixel();
+    }
+
+    Window*                        pDockWindow( 0 );
+    Window*                        pDockingAreaWindow( 0 );
+    ToolBox*                       pToolBox( 0 );
+    uno::Reference< awt::XWindow > xWindow( rUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+    uno::Reference< awt::XWindow > xDockingAreaWindow;
+    ::Rectangle                    aTrackingRect( rTrackingRect );
+    ui::DockingArea                eDockedArea( (ui::DockingArea)rUIElement.m_aDockedData.m_nDockedArea );
+    sal_Int32                      nTopDockingAreaSize( implts_getTopBottomDockingAreaSizes().Width() );
+    sal_Int32                      nBottomDockingAreaSize( implts_getTopBottomDockingAreaSizes().Height() );
+    bool                           bHorizontalDockArea(( eDockedArea == ui::DockingArea_DOCKINGAREA_TOP ) ||
+                                                       ( eDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM ));
+    sal_Int32                      nMaxLeftRightDockAreaSize = aContainerWinSize.Height() -
+                                                               nTopDockingAreaSize -
+                                                               nBottomDockingAreaSize -
+                                                               aDockingAreaOffsets.Top() -
+                                                               aDockingAreaOffsets.Bottom();
+    ::Rectangle                    aDockingAreaRect;
+
+    aReadLock.lock();
+    xDockingAreaWindow = m_xDockAreaWindows[eDockedArea];
+    aReadLock.unlock();
+
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
+        pDockWindow        = VCLUnoHelper::GetWindow( xWindow );
+        if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX )
+            pToolBox = (ToolBox *)pDockWindow;
+
+        aDockingAreaRect = ::Rectangle( pDockingAreaWindow->GetPosPixel(), pDockingAreaWindow->GetSizePixel() );
+        if ( pToolBox )
+        {
+            // docked toolbars always have one line
+            ::Size aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( sal_Int16( eDockedArea )) );
+            aTrackingRect.SetSize( ::Size( aSize.Width(), aSize.Height() ));
+        }
+    }
+
+    // default docking operation, dock on the given row/column
+    bool                                     bOpOutsideOfDockingArea( !aDockingAreaRect.IsInside( rMousePos ));
+    std::vector< SingleRowColumnWindowData > aRowColumnsWindowData;
+
+    rDockingOperation = DOCKOP_ON_COLROW;
+    implts_getDockingAreaElementInfos( eDockedArea, aRowColumnsWindowData );
+
+    // determine current first row/column and last row/column
+    sal_Int32 nMaxRowCol( -1 );
+    sal_Int32 nMinRowCol( SAL_MAX_INT32 );
+    const sal_uInt32 nCount = aRowColumnsWindowData.size();
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
+    {
+        if ( aRowColumnsWindowData[i].nRowColumn > nMaxRowCol )
+            nMaxRowCol = aRowColumnsWindowData[i].nRowColumn;
+        if ( aRowColumnsWindowData[i].nRowColumn < nMinRowCol )
+            nMinRowCol = aRowColumnsWindowData[i].nRowColumn;
+    }
+
+    if ( !bOpOutsideOfDockingArea )
+    {
+        // docking inside our docking area
+        sal_Int32   nIndex( -1 );
+        sal_Int32   nRowCol( -1 );
+        ::Rectangle aWindowRect;
+        ::Rectangle aRowColumnRect;
+
+        const sal_uInt32 nWindowDataCount = aRowColumnsWindowData.size();
+        for ( sal_uInt32 i = 0; i < nWindowDataCount; i++ )
+        {
+            ::Rectangle aRect( aRowColumnsWindowData[i].aRowColumnRect.X,
+                               aRowColumnsWindowData[i].aRowColumnRect.Y,
+                               aRowColumnsWindowData[i].aRowColumnRect.X + aRowColumnsWindowData[i].aRowColumnRect.Width,
+                               aRowColumnsWindowData[i].aRowColumnRect.Y + aRowColumnsWindowData[i].aRowColumnRect.Height );
+
+            {
+                // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() )));
+            }
+
+            bool bIsInsideRowCol( aRect.IsInside( rMousePos ) );
+            if ( bIsInsideRowCol )
+            {
+                nIndex            = i;
+                nRowCol           = aRowColumnsWindowData[i].nRowColumn;
+                rDockingOperation = implts_determineDockingOperation( eDockedArea, aRect, rMousePos );
+                aWindowRect       = implts_getWindowRectFromRowColumn( eDockedArea, aRowColumnsWindowData[i], rMousePos, rUIElement.m_aName );
+                aRowColumnRect    = aRect;
+                break;
+            }
+        }
+
+        OSL_ENSURE( ( nIndex >= 0 ) && ( nRowCol >= 0 ), "Impossible case - no row/column found but mouse pointer is inside our docking area" );
+        if (( nIndex >= 0 ) && ( nRowCol >= 0 ))
+        {
+            if ( rDockingOperation == DOCKOP_ON_COLROW )
+            {
+                if ( !aWindowRect.IsEmpty())
+                {
+                    // Tracking rect is on a row/column and mouse is over a docked toolbar.
+                    // Determine if the tracking rect must be located before/after the docked toolbar.
+
+                    ::Rectangle aUIElementRect( aWindowRect );
+                    sal_Int32   nMiddle( bHorizontalDockArea ? ( aWindowRect.Left() + aWindowRect.getWidth() / 2 ) :
+                                                               ( aWindowRect.Top() + aWindowRect.getHeight() / 2 ));
+                    sal_Bool    bInsertBefore( bHorizontalDockArea ? ( rMousePos.X() < nMiddle ) : ( rMousePos.Y() < nMiddle ));
+                    if ( bInsertBefore )
+                    {
+                        if ( bHorizontalDockArea )
+                        {
+                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( aContainerWinSize.Width() -  aWindowRect.Left() ),
+                                                                                    sal_Int32( aTrackingRect.getWidth() )));
+                            if ( nSize == 0 )
+                                nSize = aWindowRect.getWidth();
+
+                            aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() ));
+                            aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect,rUIElement.m_aName, aUIElementRect );
+
+                            // Set virtual position
+                            rUIElement.m_aDockedData.m_aPos.X() = aWindowRect.Left();
+                            rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
+                        }
+                        else
+                        {
+                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32(
+                                                    nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Top() ),
+                                                    sal_Int32( aTrackingRect.getHeight() )));
+                            if ( nSize == 0 )
+                                nSize = aWindowRect.getHeight();
+
+                            aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize ));
+                            aWindowRect = implts_determineFrontDockingRect( eDockedArea, nRowCol, aWindowRect, rUIElement.m_aName, aUIElementRect );
+
+                            // Set virtual position
+                            sal_Int32 nPosY = pDockingAreaWindow->ScreenToOutputPixel(
+                                                pContainerWindow->OutputToScreenPixel( aWindowRect.TopLeft() )).Y();
+                            rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
+                            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
+                        }
+
+                        rTrackingRect = aWindowRect;
+                        return;
+                    }
+                    else
+                    {
+                        if ( bHorizontalDockArea )
+                        {
+                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32(( aContainerWinSize.Width() ) - aWindowRect.Right() ),
+                                                                                    sal_Int32( aTrackingRect.getWidth() )));
+                            if ( nSize == 0 )
+                            {
+                                aUIElementRect.SetPos( ::Point( aContainerWinSize.Width() - aTrackingRect.getWidth(), aWindowRect.Top() ));
+                                aUIElementRect.SetSize( ::Size( aTrackingRect.getWidth(), aWindowRect.getHeight() ));
+                                rUIElement.m_aDockedData.m_aPos.X() = aUIElementRect.Left();
+                            }
+                            else
+                            {
+                                aUIElementRect.SetPos( ::Point( aWindowRect.Right(), aWindowRect.Top() ));
+                                aUIElementRect.SetSize( ::Size( nSize, aWindowRect.getHeight() ));
+                                rUIElement.m_aDockedData.m_aPos.X() = aWindowRect.Right();
+                            }
+
+                            // Set virtual position
+                            rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
+                        }
+                        else
+                        {
+                            sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( nTopDockingAreaSize + nMaxLeftRightDockAreaSize - aWindowRect.Bottom() ),
+                                                                                    sal_Int32( aTrackingRect.getHeight() )));
+                            aUIElementRect.SetPos( ::Point( aWindowRect.Left(), aWindowRect.Bottom() ));
+                            aUIElementRect.SetSize( ::Size( aWindowRect.getWidth(), nSize ));
+
+                            // Set virtual position
+                            sal_Int32 nPosY( 0 );
+                            {
+                                vos::OGuard aGuard( Application::GetSolarMutex() );
+                                nPosY = pDockingAreaWindow->ScreenToOutputPixel(
+                                                    pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y();
+                            }
+                            rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
+                            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
+                        }
+
+                        rTrackingRect = aUIElementRect;
+                        return;
+                    }
+                }
+                else
+                {
+                    implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
+                    rTrackingRect = implts_calcTrackingAndElementRect(
+                                        eDockedArea, nRowCol, rUIElement,
+                                        aTrackingRect, aRowColumnRect, aContainerWinSize );
+                    return;
+                }
+            }
+            else
+            {
+                if ((( nRowCol == nMinRowCol ) && ( rDockingOperation == DOCKOP_BEFORE_COLROW )) ||
+                    (( nRowCol == nMaxRowCol ) && ( rDockingOperation == DOCKOP_AFTER_COLROW  )))
+                    bOpOutsideOfDockingArea = true;
+                else
+                {
+                    // handle docking before/after a row
+                    implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
+                    rTrackingRect = implts_calcTrackingAndElementRect(
+                                        eDockedArea, nRowCol, rUIElement,
+                                        aTrackingRect, aRowColumnRect, aContainerWinSize );
+
+                    sal_Int32 nOffsetX( 0 );
+                    sal_Int32 nOffsetY( 0 );
+                    if ( bHorizontalDockArea )
+                        nOffsetY = sal_Int32( floor( aRowColumnRect.getHeight() / 2 + 0.5 ));
+                    else
+                        nOffsetX = sal_Int32( floor( aRowColumnRect.getWidth() / 2 + 0.5 ));
+
+                    if ( rDockingOperation == DOCKOP_BEFORE_COLROW )
+                    {
+                        if (( eDockedArea == ui::DockingArea_DOCKINGAREA_TOP ) || ( eDockedArea == ui::DockingArea_DOCKINGAREA_LEFT ))
+                        {
+                            // Docking before/after means move track rectangle half column/row.
+                            // As left and top are ordered 0...n instead of right and bottom
+                            // which uses n...0, we have to use negative values for top/left.
+                            nOffsetX *= -1;
+                            nOffsetY *= -1;
+                        }
+                    }
+                    else
+                    {
+                        if (( eDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) || ( eDockedArea == ui::DockingArea_DOCKINGAREA_RIGHT ))
+                        {
+                            // Docking before/after means move track rectangle half column/row.
+                            // As left and top are ordered 0...n instead of right and bottom
+                            // which uses n...0, we have to use negative values for top/left.
+                            nOffsetX *= -1;
+                            nOffsetY *= -1;
+                        }
+                        nRowCol++;
+                    }
+
+                    if ( bHorizontalDockArea )
+                        rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
+                    else
+                        rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
+
+                    rTrackingRect.Move( nOffsetX, nOffsetY );
+                    rTrackingRect.SetSize( aTrackingRect.GetSize() );
+                }
+            }
+        }
+    }
+
+    // Docking outside of our docking window area =>
+    // Users want to dock before/after first/last docked element or to an empty docking area
+    if ( bOpOutsideOfDockingArea )
+    {
+        // set correct size for docking
+        implts_setTrackingRect( eDockedArea, rMousePos, aTrackingRect );
+        rTrackingRect = aTrackingRect;
+
+        if ( bHorizontalDockArea )
+        {
+            sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 )));
+            if (( nPosX + rTrackingRect.getWidth()) > aContainerWinSize.Width() )
+                nPosX = std::min( nPosX,
+                                std::max( sal_Int32( aContainerWinSize.Width() - rTrackingRect.getWidth() ),
+                                          sal_Int32( 0 )));
+
+            sal_Int32 nSize = std::min( aContainerWinSize.Width(), rTrackingRect.getWidth() );
+            sal_Int32 nDockHeight = std::max( static_cast<sal_Int32>(aDockingAreaRect.getHeight()), sal_Int32( 0 ));
+            if ( nDockHeight == 0 )
+            {
+                sal_Int32 nPosY( std::max( aDockingAreaRect.Top(), aDockingAreaRect.Bottom() ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+                    nPosY -= rTrackingRect.getHeight();
+                rTrackingRect.SetPos( Point( nPosX, nPosY ));
+                rUIElement.m_aDockedData.m_aPos.Y() = 0;
+            }
+            else if ( rMousePos.Y() < ( aDockingAreaRect.Top() + ( nDockHeight / 2 )))
+            {
+                rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Top() - rTrackingRect.getHeight() ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_TOP )
+                    rUIElement.m_aDockedData.m_aPos.Y() = 0;
+                else
+                    rUIElement.m_aDockedData.m_aPos.Y() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
+                rDockingOperation = DOCKOP_BEFORE_COLROW;
+            }
+            else
+            {
+                rTrackingRect.SetPos( Point( nPosX, aDockingAreaRect.Bottom() ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_TOP )
+                    rUIElement.m_aDockedData.m_aPos.Y() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
+                else
+                    rUIElement.m_aDockedData.m_aPos.Y() = 0;
+                rDockingOperation = DOCKOP_AFTER_COLROW;
+            }
+            rTrackingRect.setWidth( nSize );
+
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                nPosX = pDockingAreaWindow->ScreenToOutputPixel(
+                                    pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X();
+            }
+            rUIElement.m_aDockedData.m_aPos.X() = nPosX;
+        }
+        else
+        {
+            sal_Int32 nMaxDockingAreaHeight = std::max( sal_Int32( 0 ), sal_Int32( nMaxLeftRightDockAreaSize ));
+            sal_Int32 nPosY( std::max( sal_Int32( aTrackingRect.Top()), sal_Int32( nTopDockingAreaSize )));
+            if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight ))
+                nPosY = std::min( nPosY,
+                                std::max( sal_Int32( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() )),
+                                        sal_Int32( nTopDockingAreaSize )));
+
+            sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) );
+            sal_Int32 nDockWidth = std::max( static_cast<sal_Int32>(aDockingAreaRect.getWidth()), sal_Int32( 0 ));
+            if ( nDockWidth == 0 )
+            {
+                sal_Int32 nPosX( std::max( aDockingAreaRect.Left(), aDockingAreaRect.Right() ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_RIGHT )
+                    nPosX -= rTrackingRect.getWidth();
+                rTrackingRect.SetPos( Point( nPosX, nPosY ));
+                rUIElement.m_aDockedData.m_aPos.X() = 0;
+            }
+            else if ( rMousePos.X() < ( aDockingAreaRect.Left() + ( nDockWidth / 2 )))
+            {
+                rTrackingRect.SetPos( Point( aDockingAreaRect.Left() - rTrackingRect.getWidth(), nPosY ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                    rUIElement.m_aDockedData.m_aPos.X() = 0;
+                else
+                    rUIElement.m_aDockedData.m_aPos.X() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
+                rDockingOperation = DOCKOP_BEFORE_COLROW;
+            }
+            else
+            {
+                rTrackingRect.SetPos( Point( aDockingAreaRect.Right(), nPosY ));
+                if ( eDockedArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                    rUIElement.m_aDockedData.m_aPos.X() = ( nMaxRowCol >= 0 ) ? nMaxRowCol+1 : 0;
+                else
+                    rUIElement.m_aDockedData.m_aPos.X() = 0;
+                rDockingOperation = DOCKOP_AFTER_COLROW;
+            }
+            rTrackingRect.setHeight( nSize );
+
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                nPosY = pDockingAreaWindow->ScreenToOutputPixel(
+                                    pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y();
+            }
+            rUIElement.m_aDockedData.m_aPos.Y() = nPosY;
+        }
+    }
+}
+
+framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_determineDockingOperation(
+    ui::DockingArea    DockingArea,
+    const ::Rectangle& rRowColRect,
+    const Point&       rMousePos )
+{
+    const sal_Int32 nHorzVerticalRegionSize        = 6;
+    const sal_Int32 nHorzVerticalMoveRegion        = 4;
+
+    if ( rRowColRect.IsInside( rMousePos ))
+    {
+        if ( isHorizontalDockingArea( DockingArea ))
+        {
+            sal_Int32 nRegion = rRowColRect.getHeight() / nHorzVerticalRegionSize;
+            sal_Int32 nPosY   = rRowColRect.Top() + nRegion;
+
+            if ( rMousePos.Y() < nPosY )
+                return ( DockingArea == ui::DockingArea_DOCKINGAREA_TOP ) ? DOCKOP_BEFORE_COLROW : DOCKOP_AFTER_COLROW;
+            else if ( rMousePos.Y() < ( nPosY + nRegion*nHorzVerticalMoveRegion ))
+                return DOCKOP_ON_COLROW;
+            else
+                return ( DockingArea == ui::DockingArea_DOCKINGAREA_TOP ) ? DOCKOP_AFTER_COLROW : DOCKOP_BEFORE_COLROW;
+        }
+        else
+        {
+            sal_Int32 nRegion = rRowColRect.getWidth() / nHorzVerticalRegionSize;
+            sal_Int32 nPosX   = rRowColRect.Left() + nRegion;
+
+            if ( rMousePos.X() < nPosX )
+                return ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT ) ? DOCKOP_BEFORE_COLROW : DOCKOP_AFTER_COLROW;
+            else if ( rMousePos.X() < ( nPosX + nRegion*nHorzVerticalMoveRegion ))
+                return DOCKOP_ON_COLROW;
+            else
+                return ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT ) ? DOCKOP_AFTER_COLROW : DOCKOP_BEFORE_COLROW;
+        }
+    }
+    else
+        return DOCKOP_ON_COLROW;
+}
+
+::Rectangle ToolbarLayoutManager::implts_calcTrackingAndElementRect(
+    ui::DockingArea eDockingArea,
+    sal_Int32 nRowCol,
+    UIElement& rUIElement,
+    const ::Rectangle& rTrackingRect,
+    const ::Rectangle& rRowColumnRect,
+    const ::Size& rContainerWinSize )
+{
+    ReadGuard aReadGuard( m_aLock );
+    ::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets );
+    aReadGuard.unlock();
+
+    bool      bHorizontalDockArea( isHorizontalDockingArea( eDockingArea ));
+    sal_Int32 nTopDockingAreaSize( implts_getTopBottomDockingAreaSizes().Width() );
+    sal_Int32 nBottomDockingAreaSize( implts_getTopBottomDockingAreaSizes().Height() );
+
+    sal_Int32 nMaxLeftRightDockAreaSize = rContainerWinSize.Height() -
+                                          nTopDockingAreaSize -
+                                          nBottomDockingAreaSize -
+                                          aDockingAreaOffsets.Top() -
+                                          aDockingAreaOffsets.Bottom();
+
+    ::Rectangle aTrackingRect( rTrackingRect );
+    if ( bHorizontalDockArea )
+    {
+        sal_Int32 nPosX( std::max( sal_Int32( rTrackingRect.Left()), sal_Int32( 0 )));
+        if (( nPosX + rTrackingRect.getWidth()) > rContainerWinSize.Width() )
+            nPosX = std::min( nPosX,
+                                std::max( sal_Int32( rContainerWinSize.Width() - rTrackingRect.getWidth() ),
+                                          sal_Int32( 0 )));
+
+        sal_Int32 nSize = std::min( rContainerWinSize.Width(), rTrackingRect.getWidth() );
+
+        aTrackingRect.SetPos( ::Point( nPosX, rRowColumnRect.Top() ));
+        aTrackingRect.setWidth( nSize );
+        aTrackingRect.setHeight( rRowColumnRect.getHeight() );
+
+        // Set virtual position
+        rUIElement.m_aDockedData.m_aPos.X() = nPosX;
+        rUIElement.m_aDockedData.m_aPos.Y() = nRowCol;
+    }
+    else
+    {
+        sal_Int32 nMaxDockingAreaHeight = std::max( sal_Int32( 0 ),
+                                                    sal_Int32( nMaxLeftRightDockAreaSize ));
+
+        sal_Int32 nPosY( std::max( sal_Int32( aTrackingRect.Top()), sal_Int32( nTopDockingAreaSize )));
+        if (( nPosY + aTrackingRect.getHeight()) > ( nTopDockingAreaSize + nMaxDockingAreaHeight ))
+            nPosY = std::min( nPosY,
+                                std::max( sal_Int32( nTopDockingAreaSize + ( nMaxDockingAreaHeight - aTrackingRect.getHeight() )),
+                                        sal_Int32( nTopDockingAreaSize )));
+
+        sal_Int32 nSize = std::min( nMaxDockingAreaHeight, static_cast<sal_Int32>(aTrackingRect.getHeight()) );
+
+        aTrackingRect.SetPos( ::Point( rRowColumnRect.Left(), nPosY ));
+        aTrackingRect.setWidth( rRowColumnRect.getWidth() );
+        aTrackingRect.setHeight( nSize );
+
+        aReadGuard.lock();
+        uno::Reference< awt::XWindow  > xDockingAreaWindow( m_xDockAreaWindows[eDockingArea] );
+        uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+        aReadGuard.unlock();
+
+        sal_Int32 nDockPosY( 0 );
+        Window* pDockingAreaWindow( 0 );
+        Window* pContainerWindow( 0 );
+        {
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
+            pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+            nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( ::Point( 0, nPosY ))).Y();
+        }
+
+        // Set virtual position
+        rUIElement.m_aDockedData.m_aPos.X() = nRowCol;
+        rUIElement.m_aDockedData.m_aPos.Y() = nDockPosY;
+    }
+
+    return aTrackingRect;
+}
+
+void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect )
+{
+    ::Point aPoint( rTrackingRect.TopLeft());
+    if ( isHorizontalDockingArea( eDockingArea ))
+        aPoint.X() = rMousePos.X();
+    else
+        aPoint.Y() = rMousePos.Y();
+    rTrackingRect.SetPos( aPoint );
+}
+
+void ToolbarLayoutManager::implts_renumberRowColumnData(
+    ui::DockingArea eDockingArea,
+    DockingOperation /*eDockingOperation*/,
+    const UIElement& rUIElement )
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< container::XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
+    aReadLock.unlock();
+
+    bool bHorzDockingArea( isHorizontalDockingArea( eDockingArea ));
+    sal_Int32 nRowCol( bHorzDockingArea ? rUIElement.m_aDockedData.m_aPos.Y() : rUIElement.m_aDockedData.m_aPos.X() );
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    WriteGuard aWriteLock( m_aLock );
+    UIElementVector::iterator pIter;
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) && ( pIter->m_aName != rUIElement.m_aName ))
+        {
+            // Don't change toolbars without a valid docking position!
+            if ( isDefaultPos( pIter->m_aDockedData.m_aPos ))
+                continue;
+
+            sal_Int32 nWindowRowCol = ( bHorzDockingArea ) ? pIter->m_aDockedData.m_aPos.Y() : pIter->m_aDockedData.m_aPos.X();
+            if ( nWindowRowCol >= nRowCol )
+            {
+                if ( bHorzDockingArea )
+                    pIter->m_aDockedData.m_aPos.Y() += 1;
+                else
+                    pIter->m_aDockedData.m_aPos.X() += 1;
+            }
+        }
+    }
+    aWriteLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
+    // We have to change the persistent window state part
+    if ( xPersistentWindowState.is() )
+    {
+        try
+        {
+            uno::Sequence< ::rtl::OUString > aWindowElements = xPersistentWindowState->getElementNames();
+            for ( sal_Int32 i = 0; i < aWindowElements.getLength(); i++ )
+            {
+                if ( rUIElement.m_aName != aWindowElements[i] )
+                {
+                    try
+                    {
+                        uno::Sequence< beans::PropertyValue > aPropValueSeq;
+                        awt::Point                            aDockedPos;
+                        ui::DockingArea                       nDockedArea( ui::DockingArea_DOCKINGAREA_DEFAULT );
+
+                        xPersistentWindowState->getByName( aWindowElements[i] ) >>= aPropValueSeq;
+                        for ( sal_Int32 j = 0; j < aPropValueSeq.getLength(); j++ )
+                        {
+                            if ( aPropValueSeq[j].Name.equalsAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA ))
+                                aPropValueSeq[j].Value >>= nDockedArea;
+                            else if ( aPropValueSeq[j].Name.equalsAscii( WINDOWSTATE_PROPERTY_DOCKPOS ))
+                                aPropValueSeq[j].Value >>= aDockedPos;
+                        }
+
+                        // Don't change toolbars without a valid docking position!
+                        if ( isDefaultPos( aDockedPos ))
+                            continue;
+
+                        sal_Int32 nWindowRowCol = ( bHorzDockingArea ) ? aDockedPos.Y : aDockedPos.X;
+                        if (( nDockedArea == eDockingArea ) && ( nWindowRowCol >= nRowCol ))
+                        {
+                            if ( bHorzDockingArea )
+                                aDockedPos.Y += 1;
+                            else
+                                aDockedPos.X += 1;
+
+                            uno::Reference< container::XNameReplace > xReplace( xPersistentWindowState, uno::UNO_QUERY );
+                            xReplace->replaceByName( aWindowElements[i], makeAny( aPropValueSeq ));
+                        }
+                    }
+                    catch ( uno::Exception& ) {}
+                }
+            }
+        }
+        catch ( uno::Exception& ) {}
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  XWindowListener
+//---------------------------------------------------------------------------------------------------------
+void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) 
+throw( uno::RuntimeException )
+{
+    WriteGuard aWriteLock( m_aLock );
+    bool bLocked( m_bDockingInProgress );
+    bool bLayoutInProgress( m_bLayoutInProgress );
+    aWriteLock.unlock();
+
+    // Do not do anything if we are in the middle of a docking process. This would interfere all other
+    // operations. We will store the new position and size in the docking handlers.
+    // Do not do anything if we are in the middle of our layouting process. We will adapt the position
+    // and size of the user interface elements.
+    if ( !bLocked && !bLayoutInProgress )
+    {
+        bool                           bNotify( false );
+        uno::Reference< awt::XWindow > xWindow( aEvent.Source, uno::UNO_QUERY );
+
+        UIElement aUIElement = implts_findToolbar( aEvent.Source );
+        if ( aUIElement.m_xUIElement.is() )
+        {
+            if ( aUIElement.m_bFloating )
+            {
+                uno::Reference< awt::XWindow2 > xWindow2( xWindow, uno::UNO_QUERY );
+                
+                if( xWindow2.is() )
+                {
+                    awt::Rectangle aPos     = xWindow2->getPosSize();
+                    awt::Size      aSize    = xWindow2->getOutputSize();   // always use output size for consistency
+                    bool           bVisible = xWindow2->isVisible();
+                    
+                    // update element data
+                    aUIElement.m_aFloatingData.m_aPos  = ::Point( aPos.X, aPos.Y );
+                    aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
+                    aUIElement.m_bVisible              = bVisible;
+                }
+                
+                implts_writeWindowStateData( aUIElement );
+            }
+            else
+            {
+                implts_setLayoutDirty();
+                bNotify = true;
+            }
+        }
+
+        if ( bNotify )
+            m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+    }
+}
+
+void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ ) 
+throw( uno::RuntimeException )
+{
+}
+
+void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ ) 
+throw( uno::RuntimeException )
+{
+}
+
+void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ ) 
+throw( uno::RuntimeException )
+{
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  XDockableWindowListener
+//---------------------------------------------------------------------------------------------------------
+void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) 
+throw (uno::RuntimeException)
+{
+    bool bWinFound( false );
+
+    ReadGuard aReadGuard( m_aLock );
+    uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
+    uno::Reference< awt::XWindow2 > xWindow( e.Source, uno::UNO_QUERY );
+    aReadGuard.unlock();
+
+    Window* pContainerWindow( 0 );
+    Window* pWindow( 0 );
+    ::Point aMousePos;
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+        aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y ));
+    }
+
+    UIElement aUIElement = implts_findToolbar( e.Source );
+
+    if ( aUIElement.m_xUIElement.is() && xWindow.is() )
+    {
+        awt::Rectangle aRect;
+        
+        bWinFound = true;
+        uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+        if ( xDockWindow->isFloating() )
+        {
+            awt::Rectangle aPos  = xWindow->getPosSize();
+            awt::Size      aSize = xWindow->getOutputSize();
+
+            aUIElement.m_aFloatingData.m_aPos  = ::Point( aPos.X, aPos.Y );
+            aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
+
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+            pWindow = VCLUnoHelper::GetWindow( xWindow );
+            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+            {
+                ToolBox* pToolBox = (ToolBox *)pWindow;
+                aUIElement.m_aFloatingData.m_nLines        = pToolBox->GetFloatingLines();
+                aUIElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
+            }
+        }
+    }
+
+    WriteGuard aWriteLock( m_aLock );
+    m_bDockingInProgress = bWinFound;
+    m_aDockUIElement = aUIElement;
+    m_aDockUIElement.m_bUserActive = true;
+    m_aStartDockMousePos = aMousePos;
+    aWriteLock.unlock();
+}
+
+awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e ) 
+throw (uno::RuntimeException)
+{
+    const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25;
+    const sal_Int32 MAGNETIC_DISTANCE_DOCK   = 20;
+
+    ReadGuard aReadLock( m_aLock );
+    awt::DockingData                       aDockingData;
+    uno::Reference< awt::XDockableWindow > xDockWindow( e.Source, uno::UNO_QUERY );
+    uno::Reference< awt::XWindow >         xWindow( e.Source, uno::UNO_QUERY );
+    uno::Reference< awt::XWindow >         xTopDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+    uno::Reference< awt::XWindow >         xLeftDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+    uno::Reference< awt::XWindow >         xRightDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+    uno::Reference< awt::XWindow >         xBottomDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    uno::Reference< awt::XWindow2 >        xContainerWindow( m_xContainerWindow );
+    UIElement                              aUIDockingElement( m_aDockUIElement );
+    DockingOperation                       eDockingOperation( DOCKOP_ON_COLROW );
+    bool                                   bDockingInProgress( m_bDockingInProgress );
+    aReadLock.unlock();
+
+    if ( bDockingInProgress )
+        aDockingData.TrackingRectangle = e.TrackingRectangle;
+
+    if ( bDockingInProgress && xDockWindow.is() && xWindow.is() )
+    {
+        try
+        {
+            vos::OGuard aGuard( Application::GetSolarMutex() );
+
+            sal_Int16 eDockingArea( -1 ); // none
+            sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK );
+            awt::Rectangle aNewTrackingRect;
+            ::Rectangle aTrackingRect( e.TrackingRectangle.X, e.TrackingRectangle.Y,
+                                       ( e.TrackingRectangle.X + e.TrackingRectangle.Width ),
+                                       ( e.TrackingRectangle.Y + e.TrackingRectangle.Height ));
+
+            awt::Rectangle aTmpRect = xTopDockingWindow->getPosSize();
+            ::Rectangle aTopDockRect( aTmpRect.X, aTmpRect.Y, aTmpRect.Width, aTmpRect.Height );
+            ::Rectangle aHotZoneTopDockRect( implts_calcHotZoneRect( aTopDockRect, nMagneticZone ));
+
+            aTmpRect = xBottomDockingWindow->getPosSize();
+            ::Rectangle aBottomDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width), ( aTmpRect.Y + aTmpRect.Height ));
+            ::Rectangle aHotZoneBottomDockRect( implts_calcHotZoneRect( aBottomDockRect, nMagneticZone ));
+
+            aTmpRect = xLeftDockingWindow->getPosSize();
+            ::Rectangle aLeftDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height ));
+            ::Rectangle aHotZoneLeftDockRect( implts_calcHotZoneRect( aLeftDockRect, nMagneticZone ));
+
+            aTmpRect = xRightDockingWindow->getPosSize();
+            ::Rectangle aRightDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height ));
+            ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone ));
+
+            Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
+            Window* pDockingAreaWindow( 0 );
+            ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
+
+            if ( aHotZoneTopDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+            else if ( aHotZoneBottomDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
+            else if ( aHotZoneLeftDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_LEFT;
+            else if ( aHotZoneRightDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_RIGHT;
+
+            // Higher priority for movements inside the real docking area
+            if ( aTopDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_TOP;
+            else if ( aBottomDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
+            else if ( aLeftDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_LEFT;
+            else if ( aRightDockRect.IsInside( aMousePos ))
+                eDockingArea = ui::DockingArea_DOCKINGAREA_RIGHT;
+
+            // Determine if we have a toolbar and set alignment according to the docking area!
+            Window*  pWindow = VCLUnoHelper::GetWindow( xWindow );
+            ToolBox* pToolBox = 0;
+            if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+                pToolBox = (ToolBox *)pWindow;
+
+            if ( eDockingArea != -1 )
+            {
+                if ( eDockingArea == ui::DockingArea_DOCKINGAREA_TOP )
+                {
+                    aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_TOP;
+                    aUIDockingElement.m_bFloating = false;
+                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xTopDockingWindow );
+                }
+                else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+                {
+                    aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_BOTTOM;
+                    aUIDockingElement.m_bFloating = false;
+                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xBottomDockingWindow );
+                }
+                else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_LEFT )
+                {
+                    aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_LEFT;
+                    aUIDockingElement.m_bFloating = false;
+                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xLeftDockingWindow );
+                }
+                else if ( eDockingArea == ui::DockingArea_DOCKINGAREA_RIGHT )
+                {
+                    aUIDockingElement.m_aDockedData.m_nDockedArea = ui::DockingArea_DOCKINGAREA_RIGHT;
+                    aUIDockingElement.m_bFloating = false;
+                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xRightDockingWindow );
+                }
+
+                ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() );
+                aTrackingRect.SetPos( aOutputPos );
+
+                ::Rectangle aNewDockingRect( aTrackingRect );
+                implts_calcDockingPosSize( aUIDockingElement, eDockingOperation, aNewDockingRect, aMousePos );
+
+                ::Point aScreenPos = pContainerWindow->OutputToScreenPixel( aNewDockingRect.TopLeft() );
+                aNewTrackingRect = awt::Rectangle( aScreenPos.X(), aScreenPos.Y(),
+                                                   aNewDockingRect.getWidth(), aNewDockingRect.getHeight() );
+                aDockingData.TrackingRectangle = aNewTrackingRect;
+            }
+            else if ( pToolBox && bDockingInProgress )
+            {
+                bool bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
+                ::Size aFloatSize  = aUIDockingElement.m_aFloatingData.m_aSize;
+                if ( aFloatSize.Width() > 0 && aFloatSize.Height() > 0 )
+                {
+                    aUIDockingElement.m_aFloatingData.m_aPos = pContainerWindow->ScreenToOutputPixel(
+                                                                ::Point( e.MousePos.X, e.MousePos.Y ));
+                    aDockingData.TrackingRectangle.Height = aFloatSize.Height();
+                    aDockingData.TrackingRectangle.Width  = aFloatSize.Width();
+                }
+                else
+                {
+                    aFloatSize = pToolBox->CalcWindowSizePixel();
+                    if ( !bIsHorizontal )
+                    {
+                        // Floating toolbars are always horizontal aligned! We have to swap
+                        // width/height if we have a vertical aligned toolbar.
+                        sal_Int32 nTemp = aFloatSize.Height();
+                        aFloatSize.Height() = aFloatSize.Width();
+                        aFloatSize.Width()  = nTemp;
+                    }
+
+                    aDockingData.TrackingRectangle.Height = aFloatSize.Height();
+                    aDockingData.TrackingRectangle.Width  = aFloatSize.Width();
+
+                    // For the first time we don't have any data about the floating size of a toolbar.
+                    // We calculate it and store it for later use.
+                    aUIDockingElement.m_aFloatingData.m_aPos = pContainerWindow->ScreenToOutputPixel(::Point( e.MousePos.X, e.MousePos.Y ));
+                    aUIDockingElement.m_aFloatingData.m_aSize         = aFloatSize;
+                    aUIDockingElement.m_aFloatingData.m_nLines        = pToolBox->GetFloatingLines();
+                    aUIDockingElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
+                }
+                aDockingData.TrackingRectangle.X = e.MousePos.X;
+                aDockingData.TrackingRectangle.Y = e.MousePos.Y;
+            }
+
+            aDockingData.bFloating = ( eDockingArea == -1 );
+
+            // Write current data to the member docking progress data
+            WriteGuard aWriteLock( m_aLock );
+            m_aDockUIElement.m_bFloating = aDockingData.bFloating;
+            if ( !aDockingData.bFloating )
+            {
+                m_aDockUIElement.m_aDockedData = aUIDockingElement.m_aDockedData;
+                m_eDockOperation               = eDockingOperation;
+            }
+            else
+                m_aDockUIElement.m_aFloatingData = aUIDockingElement.m_aFloatingData;
+            aWriteLock.unlock();
+        }
+        catch ( uno::Exception& ) {}
+    }
+
+    return aDockingData;
+}
+
+void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) 
+throw (uno::RuntimeException)
+{
+    bool bDockingInProgress( false );
+    bool bStartDockFloated( false );
+    bool bFloating( false );
+    UIElement aUIDockingElement;
+
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+    WriteGuard aWriteLock( m_aLock );
+    bDockingInProgress = m_bDockingInProgress;
+    aUIDockingElement  = m_aDockUIElement;
+    bFloating          = aUIDockingElement.m_bFloating;
+
+    UIElement& rUIElement = impl_findToolbar( aUIDockingElement.m_aName );
+    if ( rUIElement.m_aName == aUIDockingElement.m_aName )
+    {
+        if ( aUIDockingElement.m_bFloating )
+        {
+            // Write last position into position data
+            uno::Reference< awt::XWindow > xWindow( aUIDockingElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            rUIElement.m_aFloatingData = aUIDockingElement.m_aFloatingData;
+            awt::Rectangle aTmpRect = xWindow->getPosSize();
+            rUIElement.m_aFloatingData.m_aPos = ::Point( aTmpRect.X, aTmpRect.Y );
+            // make changes also for our local data as we use it to make data persistent
+            aUIDockingElement.m_aFloatingData = rUIElement.m_aFloatingData;
+        }
+        else
+        {
+            rUIElement.m_aDockedData = aUIDockingElement.m_aDockedData;
+            rUIElement.m_aFloatingData.m_aSize = aUIDockingElement.m_aFloatingData.m_aSize;
+
+            if ( m_eDockOperation != DOCKOP_ON_COLROW )
+            {
+                // we have to renumber our row/column data to insert a new row/column
+                implts_renumberRowColumnData((ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea, m_eDockOperation, aUIDockingElement );
+            }
+        }
+
+        bStartDockFloated        = rUIElement.m_bFloating;
+        rUIElement.m_bFloating   = m_aDockUIElement.m_bFloating;
+        rUIElement.m_bUserActive = true;
+    }
+
+    // reset member for next docking operation
+    m_aDockUIElement.m_xUIElement.clear();
+    m_eDockOperation = DOCKOP_ON_COLROW;
+    aWriteLock.unlock();
+    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
+
+    implts_writeWindowStateData( aUIDockingElement );
+
+    if ( bDockingInProgress )
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        Window*  pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY ));
+        ToolBox* pToolBox = 0;
+        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+            pToolBox = (ToolBox *)pWindow;
+
+        if ( pToolBox )
+        {
+            if( e.bFloating )
+            {
+                if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
+                    pToolBox->SetAlign( WINDOWALIGN_TOP );
+                else
+                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
+            }
+            else
+            {
+                ::Size aSize;
+
+                pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
+
+                // Docked toolbars have always one line
+                aSize = pToolBox->CalcWindowSizePixel( 1 );
+
+                // Lock layouting updates as our listener would be called due to SetSizePixel
+                pToolBox->SetOutputSizePixel( aSize );
+            }
+        }
+    }
+
+    implts_sortUIElements();
+    
+    aWriteLock.lock();
+    m_bDockingInProgress = sal_False;
+    m_bLayoutDirty       = !bStartDockFloated || !bFloating;
+    bool bNotify         = m_bLayoutDirty;
+    aWriteLock.unlock();
+
+    if ( bNotify )
+        m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+}
+
+sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e ) 
+throw (uno::RuntimeException)
+{
+    ReadGuard aReadLock( m_aLock );
+    bool bDockingInProgress = m_bDockingInProgress;
+    aReadLock.unlock();
+
+    UIElement aUIDockingElement = implts_findToolbar( e.Source );
+    bool      bWinFound( aUIDockingElement.m_aName.getLength() > 0 );
+    uno::Reference< awt::XWindow > xWindow( e.Source, uno::UNO_QUERY );
+
+    if ( bWinFound && xWindow.is() )
+    {
+        if ( !bDockingInProgress )
+        {
+            awt::Rectangle aRect;
+            uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+            if ( xDockWindow->isFloating() )
+            {
+                {
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                    if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+                    {
+                        ToolBox* pToolBox = static_cast< ToolBox *>( pWindow );
+                        aUIDockingElement.m_aFloatingData.m_aPos          = pToolBox->GetPosPixel();
+                        aUIDockingElement.m_aFloatingData.m_aSize         = pToolBox->GetOutputSizePixel();
+                        aUIDockingElement.m_aFloatingData.m_nLines        = pToolBox->GetFloatingLines();
+                        aUIDockingElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
+                    }
+                }
+
+                UIElement aUIElement = implts_findToolbar( aUIDockingElement.m_aName );
+                if ( aUIElement.m_aName == aUIDockingElement.m_aName )
+                    implts_setToolbar( aUIDockingElement );
+            }
+        }
+    }
+
+    return sal_True;
+}
+
+void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e ) 
+throw (uno::RuntimeException)
+{
+    UIElement aUIDockingElement;
+
+    ReadGuard aReadLock( m_aLock );
+    bool bDockingInProgress( m_bDockingInProgress );
+    if ( bDockingInProgress )
+        aUIDockingElement = m_aDockUIElement;
+    aReadLock.unlock();
+
+    Window*  pWindow( 0 );
+    ToolBox* pToolBox( 0 );
+    uno::Reference< awt::XWindow2 > xWindow;
+
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        xWindow = uno::Reference< awt::XWindow2 >( e.Source, uno::UNO_QUERY );
+        pWindow = VCLUnoHelper::GetWindow( xWindow );
+
+        if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
+            pToolBox = (ToolBox *)pWindow;
+    }
+
+    if ( !bDockingInProgress )
+    {
+        aUIDockingElement = implts_findToolbar( e.Source );
+        bool bWinFound = ( aUIDockingElement.m_aName.getLength() > 0 );
+        
+        if ( bWinFound && xWindow.is() )
+        {
+            aUIDockingElement.m_bFloating   = !aUIDockingElement.m_bFloating;
+            aUIDockingElement.m_bUserActive = true;
+
+            implts_setLayoutInProgress( true );
+            if ( aUIDockingElement.m_bFloating )
+            {
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                if ( pToolBox )
+                {
+                    pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines );
+                    if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
+                        pToolBox->SetAlign( WINDOWALIGN_TOP );
+                    else
+                        pToolBox->SetAlign( WINDOWALIGN_LEFT );
+                }
+
+                bool bUndefPos = hasDefaultPosValue( aUIDockingElement.m_aFloatingData.m_aPos );
+                bool bSetSize = !hasEmptySize( aUIDockingElement.m_aFloatingData.m_aSize );
+
+                if ( bUndefPos )
+                    aUIDockingElement.m_aFloatingData.m_aPos = implts_findNextCascadeFloatingPos();
+
+                if ( !bSetSize )
+                {
+                    if ( pToolBox )
+                        aUIDockingElement.m_aFloatingData.m_aSize = pToolBox->CalcFloatingWindowSizePixel();
+                    else
+                        aUIDockingElement.m_aFloatingData.m_aSize = pWindow->GetOutputSizePixel();
+                }
+
+                xWindow->setPosSize( aUIDockingElement.m_aFloatingData.m_aPos.X(),
+                                     aUIDockingElement.m_aFloatingData.m_aPos.Y(),
+                                     0, 0, awt::PosSize::POS );
+                xWindow->setOutputSize( AWTSize( aUIDockingElement.m_aFloatingData.m_aSize ) );
+            }
+            else
+            {
+                if ( isDefaultPos( aUIDockingElement.m_aDockedData.m_aPos ))
+                {
+                    // Docking on its default position without a preset position -
+                    // we have to find a good place for it.
+                    ::Point aPixelPos;
+                    ::Point aDockPos;
+                    ::Size  aSize;
+
+                    {
+                        vos::OGuard aGuard( Application::GetSolarMutex() );
+                        if ( pToolBox )
+                            aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) );
+                        else
+                            aSize = pWindow->GetSizePixel();
+                    }
+
+                    implts_findNextDockingPos((ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea, aSize, aDockPos, aPixelPos );
+                    aUIDockingElement.m_aDockedData.m_aPos = aDockPos;
+                }
+
+                vos::OGuard aGuard( Application::GetSolarMutex() );
+                if ( pToolBox )
+                {
+                    pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
+                    ::Size aSize = pToolBox->CalcWindowSizePixel( 1 );
+                    awt::Rectangle aRect = xWindow->getPosSize();
+                    xWindow->setPosSize( aRect.X, aRect.Y, 0, 0, awt::PosSize::POS );
+                    xWindow->setOutputSize( AWTSize( aSize ) );
+                }
+            }
+
+            implts_setLayoutInProgress( false );
+            implts_setToolbar( aUIDockingElement );
+            implts_writeWindowStateData( aUIDockingElement );
+            implts_sortUIElements();
+            implts_setLayoutDirty();
+            
+            aReadLock.lock();
+            ILayoutNotifications* pParentLayouter( m_pParentLayouter );
+            aReadLock.unlock();
+
+            if ( pParentLayouter )
+                pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+        }
+    }
+    else
+    {
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+        if ( pToolBox )
+        {
+            if ( aUIDockingElement.m_bFloating )
+            {
+                if ( aUIDockingElement.m_aFloatingData.m_bIsHorizontal )
+                    pToolBox->SetAlign( WINDOWALIGN_TOP );
+                else
+                    pToolBox->SetAlign( WINDOWALIGN_LEFT );
+            }
+            else
+                pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) );
+        }
+    }
+}
+
+void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e ) 
+throw (uno::RuntimeException)
+{
+    rtl::OUString aName;
+    UIElement     aUIElement;
+    UIElementVector::iterator pIter;
+
+    WriteGuard aWriteLock( m_aLock );
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    {
+        uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement );
+        if ( xUIElement.is() )
+        {
+            uno::Reference< uno::XInterface > xIfac( xUIElement->getRealInterface(), uno::UNO_QUERY );
+            if ( xIfac == e.Source )
+            {
+                aName = pIter->m_aName;
+
+                // user closes a toolbar =>
+                // context sensitive toolbar: only destroy toolbar and store state.
+                // context sensitive toolbar: make it invisible, store state and destroy it.
+                if ( !pIter->m_bContextSensitive )
+                    pIter->m_bVisible = sal_False;
+
+                aUIElement = *pIter;
+                break;
+            }
+        }
+    }
+    aWriteLock.unlock();
+
+    // destroy element
+    if ( aName.getLength() > 0 )
+    {
+        implts_writeWindowStateData( aUIElement );
+        destroyToolbar( aName );
+    }
+}
+
+void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ ) 
+throw (uno::RuntimeException)
+{
+}
+
+//---------------------------------------------------------------------------------------------------------
+//  XUIConfigurationListener
+//---------------------------------------------------------------------------------------------------------
+void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) 
+throw (uno::RuntimeException)
+{
+    UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
+
+    uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY );
+    if ( xElementSettings.is() )
+    {
+        ::rtl::OUString aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+        uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
+        if ( xPropSet.is() )
+        {
+            if ( rEvent.Source == uno::Reference< uno::XInterface >( m_xDocCfgMgr, uno::UNO_QUERY ))
+                xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( m_xDocCfgMgr ));
+        }
+        xElementSettings->updateSettings();
+    }
+    else
+    {
+        ::rtl::OUString aElementType;
+        ::rtl::OUString aElementName;
+        parseResourceURL( rEvent.ResourceURL, aElementType, aElementName );
+        if ( aElementName.indexOf( m_aCustomTbxPrefix ) != -1 )
+        {
+            // custom toolbar must be directly created, shown and layouted!
+            createToolbar( rEvent.ResourceURL );
+            uno::Reference< ui::XUIElement > xUIElement = getToolbar( rEvent.ResourceURL );
+            if ( xUIElement.is() )
+            {
+                ::rtl::OUString                               aUIName;
+                uno::Reference< ui::XUIConfigurationManager > xCfgMgr;
+                uno::Reference< beans::XPropertySet >         xPropSet;
+
+                try
+                {
+                    xCfgMgr  = uno::Reference< ui::XUIConfigurationManager >( rEvent.Source, uno::UNO_QUERY );
+                    xPropSet = uno::Reference< beans::XPropertySet >( xCfgMgr->getSettings( rEvent.ResourceURL, sal_False ), uno::UNO_QUERY );
+
+                    if ( xPropSet.is() )
+                        xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
+                }
+                catch ( container::NoSuchElementException& ) {}
+                catch ( beans::UnknownPropertyException& ) {}
+                catch ( lang::WrappedTargetException& ) {}
+
+                {
+                    vos::OGuard aGuard( Application::GetSolarMutex() );
+                    Window* pWindow = getWindowFromXUIElement( xUIElement );
+                    if ( pWindow  )
+                        pWindow->SetText( aUIName );
+                }
+
+                showToolbar( rEvent.ResourceURL );
+            }
+        }
+    }
+}
+
+void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent ) 
+throw (uno::RuntimeException)
+{
+    ReadGuard aReadLock( m_aLock );
+    uno::Reference< awt::XWindow > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY );
+    uno::Reference< ui::XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr );
+    uno::Reference< ui::XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr );
+    aReadLock.unlock();
+    
+    UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
+    uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY );
+    if ( xElementSettings.is() )
+    {
+        bool                                  bNoSettings( false );
+        ::rtl::OUString                       aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+        uno::Reference< uno::XInterface >     xElementCfgMgr;
+        uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
+
+        if ( xPropSet.is() )
+            xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
+
+        if ( !xElementCfgMgr.is() )
+            return;
+
+        // Check if the same UI configuration manager has changed => check further
+        if ( rEvent.Source == xElementCfgMgr )
+        {
+            // Same UI configuration manager where our element has its settings
+            if ( rEvent.Source == uno::Reference< uno::XInterface >( xDocCfgMgr, uno::UNO_QUERY ))
+            {
+                // document settings removed
+                if ( xModuleCfgMgr->hasSettings( rEvent.ResourceURL ))
+                {
+                    xPropSet->setPropertyValue( aConfigSourcePropName, makeAny( xModuleCfgMgr ));
+                    xElementSettings->updateSettings();
+                    return;
+                }
+            }
+
+            bNoSettings = true;
+        }
+
+        // No settings anymore, element must be destroyed
+        if ( xContainerWindow.is() && bNoSettings )
+            destroyToolbar( rEvent.ResourceURL );
+    }
+}
+
+void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent ) 
+throw (uno::RuntimeException)
+{
+    UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
+
+    uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY );
+    if ( xElementSettings.is() )
+    {
+        ::rtl::OUString                       aConfigSourcePropName( RTL_CONSTASCII_USTRINGPARAM( "ConfigurationSource" ));
+        uno::Reference< uno::XInterface >     xElementCfgMgr;
+        uno::Reference< beans::XPropertySet > xPropSet( xElementSettings, uno::UNO_QUERY );
+
+        if ( xPropSet.is() )
+            xPropSet->getPropertyValue( aConfigSourcePropName ) >>= xElementCfgMgr;
+
+        if ( !xElementCfgMgr.is() )
+            return;
+
+        // Check if the same UI configuration manager has changed => update settings
+        if ( rEvent.Source == xElementCfgMgr )
+        {
+            xElementSettings->updateSettings();
+            
+            WriteGuard aWriteLock( m_aLock );
+            bool bNotify = !aUIElement.m_bFloating;
+            m_bLayoutDirty = bNotify;
+            ILayoutNotifications* pParentLayouter( m_pParentLayouter );
+            aWriteLock.unlock();
+
+            if ( bNotify && pParentLayouter )
+                pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+        }
+    }
+}
+
+uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( const ::rtl::OUString& aName )
+{
+    return implts_findToolbar( aName ).m_xUIElement;
+}
+
+uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolbars()
+{
+    uno::Sequence< uno::Reference< ui::XUIElement > > aSeq;
+    
+    ReadGuard aReadLock( m_aLock );
+    if ( m_aUIElements.size() > 0 )
+    {
+        sal_uInt32 nCount(0);
+        UIElementVector::iterator pIter;
+        for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+        {
+            if ( pIter->m_xUIElement.is() )
+            {
+                ++nCount;
+                aSeq.realloc( nCount );
+                aSeq[nCount-1] = pIter->m_xUIElement;
+            }
+        }
+    }
+
+    return aSeq;
+}
+
+bool ToolbarLayoutManager::floatToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    if ( aUIElement.m_xUIElement.is() )
+    {
+        try
+        {
+            uno::Reference< awt::XDockableWindow > xDockWindow( aUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            if ( xDockWindow.is() && !xDockWindow->isFloating() )
+            {
+                aUIElement.m_bFloating = true;
+                implts_writeWindowStateData( aUIElement );
+                xDockWindow->setFloatingMode( true );
+
+                implts_setLayoutDirty();
+                implts_setToolbar( aUIElement );                
+                return true;
+            }
+        }
+        catch ( lang::DisposedException& ) {}
+    }
+
+    return false;
+}
+
+bool ToolbarLayoutManager::lockToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    if ( aUIElement.m_xUIElement.is() )
+    {
+        try
+        {
+            uno::Reference< awt::XDockableWindow > xDockWindow( aUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            if ( xDockWindow.is() && !xDockWindow->isFloating() && !xDockWindow->isLocked() )
+            {
+                aUIElement.m_aDockedData.m_bLocked = true;
+                implts_writeWindowStateData( aUIElement );
+                xDockWindow->lock();
+
+                implts_setLayoutDirty();
+                implts_setToolbar( aUIElement );                
+                return true;
+            }
+        }
+        catch ( lang::DisposedException& ) {}
+    }
+
+    return false;
+}
+
+bool ToolbarLayoutManager::unlockToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    if ( aUIElement.m_xUIElement.is() )
+    {
+        try
+        {
+            uno::Reference< awt::XDockableWindow > xDockWindow( aUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
+            if ( xDockWindow.is() && !xDockWindow->isFloating() && xDockWindow->isLocked() )
+            {
+                aUIElement.m_aDockedData.m_bLocked = false;
+                implts_writeWindowStateData( aUIElement );
+                xDockWindow->unlock();
+
+                implts_setLayoutDirty();
+                implts_setToolbar( aUIElement );                
+                return true;
+            }
+        }
+        catch ( lang::DisposedException& ) {}
+    }
+
+    return false;
+}
+
+bool ToolbarLayoutManager::isToolbarVisible( const ::rtl::OUString& rResourceURL )
+{
+    uno::Reference< awt::XWindow2 > xWindow2( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
+    return ( xWindow2.is() && xWindow2->isVisible() );
+}
+
+bool ToolbarLayoutManager::isToolbarFloating( const ::rtl::OUString& rResourceURL )
+{
+    uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
+    return ( xDockWindow.is() && xDockWindow->isFloating() );
+}
+
+bool ToolbarLayoutManager::isToolbarDocked( const ::rtl::OUString& rResourceURL )
+{
+    return !isToolbarFloating( rResourceURL );
+}    
+
+bool ToolbarLayoutManager::isToolbarLocked( const ::rtl::OUString& rResourceURL )
+{
+    uno::Reference< awt::XDockableWindow > xDockWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
+    return ( xDockWindow.is() && xDockWindow->isLocked() );
+}
+
+awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResourceURL )
+{
+    Window* pWindow = implts_getWindow( rResourceURL );
+    
+    vos::OGuard aGuard( Application::GetSolarMutex() );
+    if ( pWindow )
+    {
+        ::Size    aSize = pWindow->GetSizePixel();
+        awt::Size aWinSize;
+        aWinSize.Width  = aSize.Width();
+        aWinSize.Height = aSize.Height();
+        return aWinSize;
+    }
+
+    return awt::Size();
+}
+
+awt::Point ToolbarLayoutManager::getToolbarPos( const ::rtl::OUString& rResourceURL )
+{
+    awt::Point aPos;
+    UIElement  aUIElement = implts_findToolbar( rResourceURL );
+    
+    uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL ));
+    if ( xWindow.is() )
+    {
+        if ( aUIElement.m_bFloating )
+        {
+            awt::Rectangle aRect = xWindow->getPosSize();
+            aPos.X = aRect.X;
+            aPos.Y = aRect.Y;
+        }
+        else
+        {
+            ::Point aVirtualPos = aUIElement.m_aDockedData.m_aPos;
+            aPos.X = aVirtualPos.X();
+            aPos.Y = aVirtualPos.Y();
+        }
+    }
+    
+    return aPos;
+}
+
+void ToolbarLayoutManager::setToolbarSize( const ::rtl::OUString& rResourceURL, const awt::Size& aSize )
+{
+  uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY );
+    uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    
+    if ( xWindow.is() && xDockWindow.is() && xDockWindow->isFloating() )
+    {
+        xWindow->setOutputSize( aSize );
+        aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height );
+        implts_setToolbar( aUIElement );
+        implts_writeWindowStateData( aUIElement );
+        implts_sortUIElements();
+    }
+}
+
+void ToolbarLayoutManager::setToolbarPos( const ::rtl::OUString& rResourceURL, const awt::Point& aPos )
+{
+    uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL ));
+    uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    
+    if ( xWindow.is() && xDockWindow.is() && xDockWindow->isFloating() )
+    {
+        xWindow->setPosSize( aPos.X, aPos.Y, 0, 0, awt::PosSize::POS );
+        aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y );
+        implts_setToolbar( aUIElement );
+        implts_writeWindowStateData( aUIElement );
+        implts_sortUIElements();
+    }
+}
+
+void ToolbarLayoutManager::setToolbarPosSize( const ::rtl::OUString& rResourceURL, const awt::Point& aPos, const awt::Size& aSize )
+{
+    setToolbarPos( rResourceURL, aPos );
+    setToolbarSize( rResourceURL, aSize );
+}
+
+} // namespace framework
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
new file mode 100755
index 0000000000..1c839c2e2d
--- /dev/null
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -0,0 +1,344 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
+#define __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
+
+/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
+               with solaris headers ...
+*/
+#include <vector>
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+#include <threadhelp/threadhelpbase.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/writeguard.hxx>
+#include <threadhelp/readguard.hxx>
+#include <macros/generic.hxx>
+#include <macros/xinterface.hxx>
+#include <macros/xtypeprovider.hxx>
+#include <macros/xserviceinfo.hxx>
+#include <stdtypes.h>
+#include <properties.h>
+#include <stdtypes.h>
+#include <uiconfiguration/globalsettings.hxx>
+#include <uiconfiguration/windowstateconfiguration.hxx>
+#include <framework/addonsoptions.hxx>
+#include <uielement/uielement.hxx>
+#include <helper/ilayoutnotifications.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfiguration.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/ui/XUIElementFactory.hpp>
+#include <com/sun/star/ui/DockingArea.hpp>
+#include <com/sun/star/awt/XTopWindow2.hpp>
+#include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/awt/XDockableWindow.hpp>
+#include <com/sun/star/awt/XDockableWindowListener.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <cppuhelper/implbase3.hxx>
+
+
+namespace framework
+{
+
+class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::awt::XDockableWindowListener,
+                                                             ::com::sun::star::ui::XUIConfigurationListener,
+                                                             ::com::sun::star::awt::XWindowListener >,
+                             private ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses.
+{
+    public:
+        enum { DOCKINGAREAS_COUNT = 4 };
+
+        ToolbarLayoutManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMGR,
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory >& xUIElementFactory,
+                              ILayoutNotifications* pParentLayouter );
+        virtual ~ToolbarLayoutManager();
+
+        void reset();
+        void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+                     const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& xModuleCfgMgr,
+                     const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& xDocCfgMgr,
+                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xPersistentWindowState );
+        
+        void setParentWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentWindow );
+        void setDockingAreaOffsets( const ::Rectangle aOffsets );
+
+        void resetDockingArea();
+        
+        ::com::sun::star::awt::Rectangle getDockingArea();
+        void setDockingArea( const ::com::sun::star::awt::Rectangle& rDockingArea );
+        
+        // layouting
+        bool isLayoutDirty();
+        void doLayout(const ::Size& aContainerSize);
+
+        // creation/destruction
+        void createStaticToolbars();
+        void destroyToolbars();
+        
+        bool requestToolbar( const ::rtl::OUString& rResourceURL );
+        bool createToolbar( const ::rtl::OUString& rResourceURL );
+        bool destroyToolbar( const ::rtl::OUString& rResourceURL );
+
+        // visibility
+        bool showToolbar( const ::rtl::OUString& rResourceURL );
+        bool hideToolbar( const ::rtl::OUString& rResourceURL );
+
+        void refreshToolbarsVisibility( bool bAutomaticToolbars );
+        void setFloatingToolbarsVisibility( bool bVisible );
+        void setVisible(bool bVisible);
+        bool isVisible() { return m_bVisible; }
+
+        // docking and further functions
+        bool dockToolbar( const ::rtl::OUString& rResourceURL, ::com::sun::star::ui::DockingArea eDockingArea, const ::com::sun::star::awt::Point& aPos );
+        bool dockAllToolbars();
+        bool floatToolbar( const ::rtl::OUString& rResoureURL );
+        bool lockToolbar( const ::rtl::OUString& rResourceURL );
+        bool unlockToolbar( const ::rtl::OUString& rResourceURL );
+        void setToolbarPos( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos ); 
+        void setToolbarSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Size& aSize );
+        void setToolbarPosSize( const ::rtl::OUString& rResourceURL, const ::com::sun::star::awt::Point& aPos, const ::com::sun::star::awt::Size& aSize );
+        bool isToolbarVisible( const ::rtl::OUString& rResourceURL );
+        bool isToolbarFloating( const ::rtl::OUString& rResourceURL );
+        bool isToolbarDocked( const ::rtl::OUString& rResourceURL );
+        bool isToolbarLocked( const ::rtl::OUString& rResourceURL );
+        ::com::sun::star::awt::Point getToolbarPos( const ::rtl::OUString& rResourceURL );
+        ::com::sun::star::awt::Size getToolbarSize( const ::rtl::OUString& rResourceURL );
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > getToolbar( const ::rtl::OUString& aName );
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > > getToolbars();
+
+        // child window notifications
+        long childWindowEvent( VclSimpleEvent* pEvent );
+
+        //---------------------------------------------------------------------------------------------------------
+        // XInterface
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL acquire() throw();
+        virtual void SAL_CALL release() throw();
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException );
+        
+        //---------------------------------------------------------------------------------------------------------
+        // XEventListener
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException );
+        
+        //---------------------------------------------------------------------------------------------------------
+        // XWindowListener
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        // XDockableWindowListener
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); 
+        virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+        //---------------------------------------------------------------------------------------------------------
+        // XUIConfigurationListener
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);        
+
+    private:
+        enum DockingOperation
+        {
+            DOCKOP_BEFORE_COLROW,
+            DOCKOP_ON_COLROW,
+            DOCKOP_AFTER_COLROW
+        };
+        
+        typedef std::vector< UIElement > UIElementVector;
+        struct SingleRowColumnWindowData
+        {
+            SingleRowColumnWindowData() : nVarSize( 0 ), nStaticSize( 0 ), nSpace( 0 ) {}
+
+            std::vector< rtl::OUString >                                                      aUIElementNames;
+            std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aRowColumnWindows;
+            std::vector< ::com::sun::star::awt::Rectangle >                                   aRowColumnWindowSizes;
+            std::vector< sal_Int32 >                                                          aRowColumnSpace;
+            ::com::sun::star::awt::Rectangle                                                  aRowColumnRect;
+            sal_Int32                                                                         nVarSize;
+            sal_Int32                                                                         nStaticSize;
+            sal_Int32                                                                         nSpace;
+            sal_Int32                                                                         nRowColumn;
+        };
+
+        //---------------------------------------------------------------------------------------------------------
+        // internal helper methods
+        //---------------------------------------------------------------------------------------------------------
+        bool             implts_isParentWindowVisible() const;
+        ::Rectangle      implts_calcDockingArea();
+        void             implts_sortUIElements();
+        void             implts_reparentToolbars();
+        rtl::OUString    implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
+        void             implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
+        void             implts_destroyDockingAreaWindows();
+
+        //---------------------------------------------------------------------------------------------------------
+        // layout methods
+        //---------------------------------------------------------------------------------------------------------
+        void             implts_setDockingAreaWindowSizes( const ::com::sun::star::awt::Rectangle& rBorderSpace );
+        ::Point          implts_findNextCascadeFloatingPos();
+        void             implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement );
+        void             implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea,
+                                                                    sal_Int32 nOffset,
+                                                                    SingleRowColumnWindowData& rRowColumnWindowData,
+                                                                    const ::Size& rContainerSize );
+        void             implts_setLayoutDirty();
+        void             implts_setLayoutInProgress( bool bInProgress = true );
+        bool             implts_isLayoutInProgress() const { return m_bLayoutInProgress; }
+        
+        //---------------------------------------------------------------------------------------------------------
+        // lookup/container methods
+        //---------------------------------------------------------------------------------------------------------
+        UIElement        implts_findToolbar( const rtl::OUString& aName );
+        UIElement        implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar );
+        UIElement&       impl_findToolbar( const rtl::OUString& aName );
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const ::rtl::OUString& aName );
+        Window*          implts_getWindow( const ::rtl::OUString& aName );
+        bool             implts_insertToolbar( const UIElement& rUIElement );
+        void             implts_setToolbar( const UIElement& rUIElement );
+        ::Size           implts_getTopBottomDockingAreaSizes();
+        void             implts_getUIElementVectorCopy( UIElementVector& rCopy );
+        
+        //---------------------------------------------------------------------------------------------------------
+        // internal docking methods
+        //---------------------------------------------------------------------------------------------------------
+        ::Rectangle      implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset );
+        void             implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos );
+        DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos );
+        ::Rectangle      implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const rtl::OUString& rExcludeElementName );
+        ::Rectangle      implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, 
+                                                           sal_Int32 nRowCol, 
+                                                           const ::Rectangle& rDockedElementRect,
+                                                           const ::rtl::OUString& rMovedElementName,
+                                                           const ::Rectangle& rMovedElementRect );
+        ::Rectangle      implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, 
+                                                            sal_Int32 nRowCol,
+                                                            UIElement& rUIElement,
+                                                            const ::Rectangle& rTrackingRect,
+                                                            const ::Rectangle& rRowColumnRect,
+                                                            const ::Size& rContainerWinSize );
+        
+        void             implts_getDockingAreaElementInfos( ::com::sun::star::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData );
+        void             implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData );
+        void             implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos );
+        void             implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect );
+        
+        //---------------------------------------------------------------------------------------------------------
+        // creation methods
+        //---------------------------------------------------------------------------------------------------------
+        void             implts_createAddonsToolBars();
+        void             implts_createCustomToolBars();
+        void             implts_createNonContextSensitiveToolBars();
+        void             implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq );
+        void             implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle );
+        void             implts_createToolBar( const ::rtl::OUString& aName, bool& bNotify, ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement );
+        css::uno::Reference< css::ui::XUIElement > implts_createElement( const ::rtl::OUString& aName );
+        void             implts_setToolbarCreation( bool bStart = true );
+        bool             implts_isToolbarCreationActive();
+        
+        //---------------------------------------------------------------------------------------------------------
+        // persistence methods
+        //---------------------------------------------------------------------------------------------------------
+        sal_Bool         implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData );
+        void             implts_writeWindowStateData( const UIElement& rElementData );
+        void             implts_writeNewWindowStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow );
+        
+        //---------------------------------------------------------------------------------------------------------
+        // members
+        //---------------------------------------------------------------------------------------------------------
+        css::uno::Reference< css::lang::XMultiServiceFactory >               m_xSMGR;
+        css::uno::Reference< css::frame::XFrame >                            m_xFrame;
+        css::uno::Reference< css::awt::XWindow2 >                            m_xContainerWindow;
+        css::uno::Reference< css::awt::XWindow >                             m_xDockAreaWindows[DOCKINGAREAS_COUNT];
+        css::uno::Reference< ::com::sun::star::ui::XUIElementFactory >       m_xUIElementFactoryManager;
+        css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
+        css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
+        css::uno::Reference< ::com::sun::star::awt::XToolkit >               m_xToolkit;
+        css::uno::Reference< ::com::sun::star::container::XNameAccess >      m_xPersistentWindowState;
+        ILayoutNotifications*                                                m_pParentLayouter;
+        
+        UIElementVector                                                      m_aUIElements;
+        UIElement                                                            m_aDockUIElement;
+        Point                                                                m_aStartDockMousePos;
+        Rectangle                                                            m_aDockingArea;
+        Rectangle                                                            m_aDockingAreaOffsets;
+        DockingOperation                                                     m_eDockOperation;
+        
+        AddonsOptions*                                                       m_pAddonOptions;
+        GlobalSettings*                                                      m_pGlobalSettings;
+        
+        bool                                                                 m_bComponentAttached;
+        bool                                                                 m_bMustLayout;
+        bool                                                                 m_bLayoutDirty;
+        bool                                                                 m_bStoreWindowState;
+        bool                                                                 m_bGlobalSettings;
+        bool                                                                 m_bDockingInProgress;
+        bool                                                                 m_bVisible;
+        bool                                                                 m_bLayoutInProgress;
+        bool                                                                 m_bToolbarCreation;
+        
+        ::rtl::OUString                                                      m_aFullAddonTbxPrefix;
+        ::rtl::OUString                                                      m_aCustomTbxPrefix;
+        ::rtl::OUString                                                      m_aCustomizeCmd;
+        ::rtl::OUString                                                      m_aToolbarTypeString;
+        ::rtl::OUString                                                      m_aModuleIdentifier;
+};
+
+} // namespace framework
+
+#endif // __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx
new file mode 100755
index 0000000000..3dc8624324
--- /dev/null
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: layoutmanager.hxx,v $
+ * $Revision: 1.34 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <uielement/uielement.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/ui/DockingArea.hpp>
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+using namespace ::com::sun::star;
+
+namespace framework
+{
+
+    bool UIElement::operator< ( const ::framework::UIElement& aUIElement ) const
+{
+    if ( !m_xUIElement.is() && aUIElement.m_xUIElement.is() )
+        return false;
+    else if ( m_xUIElement.is() && !aUIElement.m_xUIElement.is() )
+        return true;
+    else if ( !m_bVisible && aUIElement.m_bVisible )
+        return false;
+    else if ( m_bVisible && !aUIElement.m_bVisible )
+        return true;
+    else if ( !m_bFloating && aUIElement.m_bFloating )
+        return true;
+    else if ( m_bFloating && !aUIElement.m_bFloating )
+        return false;
+    else
+    {
+        if ( m_bFloating )
+        {
+            bool bEqual = ( m_aFloatingData.m_aPos.Y() == aUIElement.m_aFloatingData.m_aPos.Y() );
+            if ( bEqual )
+                return ( m_aFloatingData.m_aPos.X() < aUIElement.m_aFloatingData.m_aPos.X() );
+            else
+                return ( m_aFloatingData.m_aPos.Y() < aUIElement.m_aFloatingData.m_aPos.Y() );
+        }
+        else
+        {
+            if ( m_aDockedData.m_nDockedArea < aUIElement.m_aDockedData.m_nDockedArea )
+                return true;
+            else if ( m_aDockedData.m_nDockedArea > aUIElement.m_aDockedData.m_nDockedArea )
+                return false;
+            else
+            {
+                if ( m_aDockedData.m_nDockedArea == ui::DockingArea_DOCKINGAREA_TOP ||
+                     m_aDockedData.m_nDockedArea == ui::DockingArea_DOCKINGAREA_BOTTOM )
+                {
+                    if ( !( m_aDockedData.m_aPos.Y() == aUIElement.m_aDockedData.m_aPos.Y() ) )
+                        return  ( m_aDockedData.m_aPos.Y() < aUIElement.m_aDockedData.m_aPos.Y() );
+                    else
+                    {
+                        bool bEqual = ( m_aDockedData.m_aPos.X() == aUIElement.m_aDockedData.m_aPos.X() );
+                        if ( bEqual )
+                        {
+                            if ( m_bUserActive && !aUIElement.m_bUserActive )
+                                return sal_True;
+                            else if ( !m_bUserActive && aUIElement.m_bUserActive )
+                                return sal_False;
+                            else
+                                return sal_False;
+                        }
+                        else
+                            return ( m_aDockedData.m_aPos.X() <= aUIElement.m_aDockedData.m_aPos.X() );
+                    }
+                }
+                else
+                {
+                    if ( !( m_aDockedData.m_aPos.X() == aUIElement.m_aDockedData.m_aPos.X() ) )
+                        return ( m_aDockedData.m_aPos.X() < aUIElement.m_aDockedData.m_aPos.X() );
+                    else
+                    {
+                        bool bEqual = ( m_aDockedData.m_aPos.Y() == aUIElement.m_aDockedData.m_aPos.Y() );
+                        if ( bEqual )
+                        {
+                            if ( m_bUserActive && !aUIElement.m_bUserActive )
+                                return sal_True;
+                            else if ( !m_bUserActive && aUIElement.m_bUserActive )
+                                return sal_False;
+                            else
+                                return sal_False;
+                        }
+                        else
+                            return ( m_aDockedData.m_aPos.Y() <= aUIElement.m_aDockedData.m_aPos.Y() );
+                    }
+                }
+            }
+        }
+    }
+}
+
+UIElement& UIElement::operator= ( const UIElement& rUIElement )
+{
+    if (&rUIElement != this)
+    {
+        m_aType             = rUIElement.m_aType;
+        m_aName             = rUIElement.m_aName;
+        m_aUIName           = rUIElement.m_aUIName;
+        m_xUIElement        = rUIElement.m_xUIElement;
+        m_bFloating         = rUIElement.m_bFloating;
+        m_bVisible          = rUIElement.m_bVisible;
+        m_bUserActive       = rUIElement.m_bUserActive;
+        m_bCreateNewRowCol0 = rUIElement.m_bCreateNewRowCol0;
+        m_bDeactiveHide     = rUIElement.m_bDeactiveHide;
+        m_bMasterHide       = rUIElement.m_bMasterHide;
+        m_bContextSensitive = rUIElement.m_bContextSensitive;
+        m_bContextActive    = rUIElement.m_bContextActive;
+        m_bNoClose          = rUIElement.m_bNoClose;
+        m_bSoftClose        = rUIElement.m_bSoftClose;
+        m_bStateRead        = rUIElement.m_bStateRead;
+        m_nStyle            = rUIElement.m_nStyle;
+        m_aDockedData       = rUIElement.m_aDockedData;
+        m_aFloatingData     = rUIElement.m_aFloatingData;
+    }
+    return *this;
+}
+
+} // namespace framework
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 0ac14c6784..0f52059441 100644..100755
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -33,9 +33,7 @@
 #include <loadenv/loadenv.hxx>
 
 #include <loadenv/targethelper.hxx>
-#include <classes/framelistanalyzer.hxx>
-
-#include <dispatch/interaction.hxx>
+#include <framework/framelistanalyzer.hxx>
 
 #include <constant/frameloader.hxx>
 
@@ -49,7 +47,8 @@
 #include <properties.h>
 #include <protocols.h>
 #include <services.h>
-#include <dispatch/interaction.hxx>
+#include <comphelper/interaction.hxx>
+#include <framework/interaction.hxx>
 
 //_______________________________________________
 // includes of uno interface
@@ -1009,7 +1008,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
-        //     => return TRUE
+        //     => return sal_True
         if ( ! aVal.hasValue())
             bAllowed = sal_True;
         else
@@ -1049,8 +1048,8 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::uno::Any                                                                    aInteraction;
             css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations(2);
 
-            ContinuationAbort*   pAbort   = new ContinuationAbort();
-            ContinuationApprove* pApprove = new ContinuationApprove();
+            comphelper::OInteractionAbort*   pAbort   = new comphelper::OInteractionAbort();
+            comphelper::OInteractionApprove* pApprove = new comphelper::OInteractionApprove();
 
             lContinuations[0] = css::uno::Reference< css::task::XInteractionContinuation >(
                                     static_cast< css::task::XInteractionContinuation* >(pAbort),
@@ -1062,13 +1061,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
             css::task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = ERRCODE_SFX_NOMOREDOCUMENTSALLOWED;
             aInteraction <<= aErrorCode;
-
-            InteractionRequest* pRequest = new InteractionRequest(aInteraction, lContinuations);
-            css::uno::Reference< css::task::XInteractionRequest > xRequest(
-                static_cast< css::task::XInteractionRequest* >(pRequest),
-                css::uno::UNO_QUERY_THROW);
-
-            xInteraction->handle(xRequest);
+            xInteraction->handle( InteractionRequest::CreateRequest(aInteraction, lContinuations) );
         }
     }
 
@@ -1705,7 +1698,7 @@ void LoadEnv::impl_reactForLoadingState()
     }
 
     // This max force an implicit closing of our target frame ...
-    // e.g. in case close(TRUE) was called before and the frame
+    // e.g. in case close(sal_True) was called before and the frame
     // kill itself if our external use-lock is released here!
     // Thats why we releas this lock AFTER ALL OPERATIONS on this frame
     // are finished. The frame itslef must handle then
diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
deleted file mode 100644
index c68ad8d304..0000000000
--- a/framework/source/loadenv/makefile.mk
+++ /dev/null
@@ -1,46 +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=			framework
-TARGET=             fwk_loadenv
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/loadenv.obj              \
-                    $(SLO)$/targethelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index 86c466423d..86c466423d 100644..100755
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index cc0fddbcb2..cc0fddbcb2 100644..100755
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 386a604d97..386a604d97 100644..100755
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
diff --git a/framework/source/recording/makefile.mk b/framework/source/recording/makefile.mk
deleted file mode 100644
index a13eb7b912..0000000000
--- a/framework/source/recording/makefile.mk
+++ /dev/null
@@ -1,47 +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=framework
-TARGET=recording
-ENABLE_EXCEPTIONS=TRUE
-NO_BSYMBOLIC=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-    $(SLO)$/dispatchrecordersupplier.obj\
-    $(SLO)$/dispatchrecorder.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/framework/source/register/makefile.mk b/framework/source/register/makefile.mk
deleted file mode 100644
index 2920cb2830..0000000000
--- a/framework/source/register/makefile.mk
+++ /dev/null
@@ -1,50 +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=			framework
-TARGET=				fwk_register
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-LIBTARGET=			NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-VISIBILITY_HIDDEN = TRUE
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/registerservices.obj		\
-                    $(SLO)$/registertemp.obj            \
-                    $(SLO)$/register3rdcomponents.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index 5f90556953..a5a15b7227 100644..100755
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -48,10 +48,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO	(	COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -64,12 +60,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::HelpOnStartup	)
-                        COMPONENTINFO( ::framework::TabWinFactory	)
-                        COMPONENTINFO( ::framework::SystemExec	    )
-                        COMPONENTINFO( ::framework::ShellJob	    )
-                    )
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::HelpOnStartup		) else
                         IFFACTORY( ::framework::TabWinFactory		) else
                         IFFACTORY( ::framework::SystemExec	        ) else
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index 0896c5acd1..2ee525093e 100644..100755
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -49,10 +49,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO	(	COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -63,9 +59,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO	(	COMPONENTINFO( ::framework::LoginDialog )
-                    )
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::LoginDialog		)
                     )
 
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 6e07d6cbcc..6250b71c1b 100644..100755
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -46,10 +46,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO	(	COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -57,6 +53,7 @@
 =================================================================================================================*/
 #include <services/urltransformer.hxx>
 #include <services/desktop.hxx>
+#include <services/tabwindowservice.hxx>
 #include <services/frame.hxx>
 #include <services/modulemanager.hxx>
 #include <jobs/jobexecutor.hxx>
@@ -96,45 +93,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::URLTransformer                          )
-                        COMPONENTINFO( ::framework::Desktop						            )
-                        COMPONENTINFO( ::framework::Frame                                   )
-                        COMPONENTINFO( ::framework::JobExecutor                             )
-                        COMPONENTINFO( ::framework::JobDispatch                             )
-                        COMPONENTINFO( ::framework::BackingComp                             )
-                        COMPONENTINFO( ::framework::LayoutManager                           )
-                        COMPONENTINFO( ::framework::UIElementFactoryManager                 )
-                        COMPONENTINFO( ::framework::PopupMenuControllerFactory              )
-                        COMPONENTINFO( ::framework::ObjectMenuController                    )
-                        COMPONENTINFO( ::framework::ControlMenuController                   )
-                        COMPONENTINFO( ::framework::UICommandDescription                    )
-                        COMPONENTINFO( ::framework::ModuleManager                           )
-                        COMPONENTINFO( ::framework::UIConfigurationManager                  )
-                        COMPONENTINFO( ::framework::ModuleUIConfigurationManagerSupplier    )
-                        COMPONENTINFO( ::framework::ModuleUIConfigurationManager            )
-                        COMPONENTINFO( ::framework::MenuBarFactory                          )
-                        COMPONENTINFO( ::framework::GlobalAcceleratorConfiguration          )
-                        COMPONENTINFO( ::framework::ModuleAcceleratorConfiguration          )
-                        COMPONENTINFO( ::framework::DocumentAcceleratorConfiguration        )
-                        COMPONENTINFO( ::framework::ToolBoxFactory                          )
-                        COMPONENTINFO( ::framework::AddonsToolBoxFactory                    )
-                        COMPONENTINFO( ::framework::WindowStateConfiguration                )
-                        COMPONENTINFO( ::framework::ToolbarControllerFactory                )
-                        COMPONENTINFO( ::framework::AutoRecovery                            )
-                        COMPONENTINFO( ::framework::StatusIndicatorFactory                  )
-                        COMPONENTINFO( ::framework::RecentFilesMenuController               )
-                        COMPONENTINFO( ::framework::StatusBarFactory                        )
-                        COMPONENTINFO( ::framework::UICategoryDescription                   )
-                        COMPONENTINFO( ::framework::StatusbarControllerFactory              )
-                        COMPONENTINFO( ::framework::SessionListener                         )
-                        COMPONENTINFO( ::framework::TaskCreatorService                      )
-                        COMPONENTINFO( ::framework::ImageManager                            )
-                        COMPONENTINFO( ::framework::LangSelectionStatusbarController        )
-                        COMPONENTINFO( ::framework::WindowContentFactoryManager             )
-                        COMPONENTINFO( ::framework::SubstitutePathVariables		)
-                        COMPONENTINFO( ::framework::PathSettings				)
-                    )
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::Desktop							        )	else
                         IFFACTORY( ::framework::Frame                                   )   else
@@ -171,6 +129,7 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::ImageManager                            )   else
                         IFFACTORY( ::framework::LangSelectionStatusbarController        )   else
                         IFFACTORY( ::framework::WindowContentFactoryManager             )   else
+                        IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::SubstitutePathVariables			        )	else
                         IFFACTORY( ::framework::PathSettings					        )
             )
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 5a58a965d5..0947b9c0a1 100644..100755
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -48,10 +48,6 @@
 
         COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-        COMPONENTWRITEINFO	(	COMPONENTINFO( Service1 )
-                                 COMPONENTINFO( Service2 )
-                            )
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -70,7 +66,6 @@
 #include <uielement/simpletextstatusbarcontroller.hxx>
 #include <uielement/logoimagestatusbarcontroller.hxx>
 #include <uielement/logotextstatusbarcontroller.hxx>
-#include <services/tabwindowservice.hxx>
 #include <uielement/fontmenucontroller.hxx>
 #include <uielement/fontsizemenucontroller.hxx>
 #include <uielement/footermenucontroller.hxx>
@@ -83,31 +78,6 @@
 
 COMPONENTGETIMPLEMENTATIONENVIRONMENT
 
-COMPONENTWRITEINFO  (   COMPONENTINFO( ::framework::MediaTypeDetectionHelper	)
-                        COMPONENTINFO( ::framework::MailToDispatcher                        )
-                        COMPONENTINFO( ::framework::NewMenuController                       )
-                        COMPONENTINFO( ::framework::ToolbarsMenuController                  )
-                        COMPONENTINFO( ::framework::MacrosMenuController                    )
-                        COMPONENTINFO( ::framework::FontSizeMenuController                  )
-                        COMPONENTINFO( ::framework::HeaderMenuController                    )
-                        COMPONENTINFO( ::framework::FooterMenuController                    )
-                        COMPONENTINFO( ::framework::FontMenuController                      )
-                        COMPONENTINFO( ::framework::ServiceHandler                          )
-                        COMPONENTINFO( ::framework::LogoImageStatusbarController            )
-                        COMPONENTINFO( ::framework::LogoTextStatusbarController             )
-                        COMPONENTINFO( ::framework::SimpleTextStatusbarController           )
-                        COMPONENTINFO( ::framework::UriAbbreviation                         )
-                        COMPONENTINFO( ::framework::LanguageSelectionMenuController         )
-                        COMPONENTINFO( ::framework::PopupMenuDispatcher                     )
-                        COMPONENTINFO( ::framework::DispatchHelper                          )
-                        COMPONENTINFO( ::framework::TabWindowService                        )
-                        COMPONENTINFO( ::framework::DispatchRecorder                        )
-                        COMPONENTINFO( ::framework::DispatchRecorderSupplier                )
-                        COMPONENTINFO( ::framework::Oxt_Handler                             )
-                        COMPONENTINFO( ::framework::License                                 )
-                        COMPONENTINFO( ::framework::PopupMenuController						)
-                    )
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::MediaTypeDetectionHelper		)	
                         IFFACTORY( ::framework::MailToDispatcher                        ) else
                         IFFACTORY( ::framework::ServiceHandler                          )   else
@@ -116,7 +86,6 @@ COMPONENTGETFACTORY	(	IFFACTORY( ::framework::MediaTypeDetectionHelper		)
                         IFFACTORY( ::framework::License                                 )   else
                         IFFACTORY( ::framework::PopupMenuDispatcher                     )   else
                         IFFACTORY( ::framework::DispatchHelper                          )   else
-                        IFFACTORY( ::framework::TabWindowService                        )   else
                         IFFACTORY( ::framework::DispatchRecorder                        )   else
                         IFFACTORY( ::framework::DispatchRecorderSupplier                )   else
                         IFFACTORY( ::framework::SimpleTextStatusbarController           )   else
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 142b2d4d43..a6f38c9f41 100644..100755
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
+
 #include "services/autorecovery.hxx"
 #include <loadenv/loadenv.hxx>
 
@@ -100,6 +101,8 @@
 
 #include <tools/urlobj.hxx>
 
+#include <fwkdllapi.h>
+
 //_______________________________________________
 // namespaces
 
@@ -126,6 +129,7 @@ using ::com::sun::star::lang::XComponent;
 
 namespace fpf = ::framework::pattern::frame;
 
+
 namespace framework
 {
 
@@ -231,7 +235,7 @@ static const sal_Int32       GIVE_UP_RETRY                          =   1; // in
 // should be flushed an exception ... so the special error handler for this scenario is triggered
 // #define TRIGGER_FULL_DISC_CHECK
 
-// force "return FALSE" for the method impl_enoughDiscSpace().
+// force "return sal_False" for the method impl_enoughDiscSpace().
 // #define SIMULATE_FULL_DISC
 
 //-----------------------------------------------
@@ -819,7 +823,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
     else
     if (aEvent.EventName.equals(EVENT_ON_UNLOAD))
     {
-        implts_deregisterDocument(xDocument, sal_True); // TRUE => stop listening for disposing() !
+        implts_deregisterDocument(xDocument, sal_True); // sal_True => stop listening for disposing() !
     }
 }
 
@@ -914,7 +918,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
     css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
     if (xDocument.is())
     {
-        implts_deregisterDocument(xDocument, sal_False); // FALSE => dont call removeEventListener() .. because it's not needed here
+        implts_deregisterDocument(xDocument, sal_False); // sal_False => dont call removeEventListener() .. because it's not needed here
         return;
     }
 
@@ -1470,7 +1474,7 @@ void AutoRecovery::implts_updateTimer()
        )
         return;
 
-    ULONG nMilliSeconds = 0;
+    sal_uLong nMilliSeconds = 0;
     if (m_eTimerType == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL)
     {
         nMilliSeconds = (m_nAutoSaveTimeIntervall*60000); // [min] => 60.000 ms
@@ -1804,7 +1808,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra
 
     AutoRecovery::st_impl_removeFile(aInfo.OldTempURL);
     AutoRecovery::st_impl_removeFile(aInfo.NewTempURL);
-    implts_flushConfigItem(aInfo, sal_True); // TRUE => remove it from config
+    implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config
 }
 
 //-----------------------------------------------
@@ -1845,7 +1849,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr
     {
         AutoRecovery::TDocumentInfo& rInfo = *pIt;
 
-        // use TRUE as fallback ... so we recognize every document on EmergencySave/AutoRecovery!
+        // use sal_True as fallback ... so we recognize every document on EmergencySave/AutoRecovery!
         sal_Bool bModified = sal_True;
         css::uno::Reference< css::util::XModifiable > xModify(xDocument, css::uno::UNO_QUERY);
         if (xModify.is())
@@ -3195,7 +3199,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
 
         AutoRecovery::st_impl_removeFile(rInfo.OldTempURL);
         AutoRecovery::st_impl_removeFile(rInfo.NewTempURL);
-        implts_flushConfigItem(rInfo, sal_True); // TRUE => remove it from xml config!
+        implts_flushConfigItem(rInfo, sal_True); // sal_True => remove it from xml config!
 
         m_lDocCache.erase(pIt);
         break; /// !!! pIt is not defined any longer ... further this function has finished it's work
@@ -3276,7 +3280,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                     sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0));
 
                     // exists session data ... => then we cant say, that these
-                    // data are valid for recovery. So we have to return FALSE then!
+                    // data are valid for recovery. So we have to return sal_False then!
                     if (bSessionData)
                         bRecoveryData = sal_False;
 
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 98c468dfe4..c8e5fd4829 100644..100755
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -38,7 +38,7 @@
 #include <threadhelp/readguard.hxx>
 #include <threadhelp/writeguard.hxx>
 #include <classes/droptargetlistener.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 #include <targets.h>
 #include <properties.h>
 #include <services.h>
@@ -501,7 +501,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     // disable full screen mode of the frame!
     if (pParent && pParent->IsFullScreenMode())
     {
-        pParent->ShowFullScreenMode(FALSE);
+        pParent->ShowFullScreenMode(sal_False);
         pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL);
     }
 
@@ -623,10 +623,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
     UI user.
 
     @param  bSuspend
-                If its set to TRUE this controller should be suspended.
-                FALSE will resuspend it.
+                If its set to sal_True this controller should be suspended.
+                sal_False will resuspend it.
 
-    @return TRUE if the request could be finished successfully; FALSE otherwise.
+    @return sal_True if the request could be finished successfully; sal_False otherwise.
  */
 
 sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 490a09eaed..e85bd5e046 100644..100755
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -87,7 +87,7 @@ DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) :
     ToolBox( pParent, nStyle )
 {
         SetBackground();
-        SetPaintTransparent( TRUE );
+        SetPaintTransparent( sal_True );
 }
 
 void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt )
@@ -98,17 +98,17 @@ void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt )
     {
         calcMinSize();
         SetBackground();
-        SetPaintTransparent( TRUE );
+        SetPaintTransparent( sal_True );
     }
 }
 
 void DecoToolBox::calcMinSize()
 {
     ToolBox aTbx( GetParent() );
-    USHORT nItems = GetItemCount();
-    for( USHORT i = 0; i < nItems; i++ )
+    sal_uInt16 nItems = GetItemCount();
+    for( sal_uInt16 i = 0; i < nItems; i++ )
     {
-        USHORT nId = GetItemId( i );
+        sal_uInt16 nId = GetItemId( i );
         aTbx.InsertItem( nId, GetItemImage( nId ) );
     }
     aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
@@ -196,8 +196,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     // clean up resource stack
     FreeResource();
 
-    maWelcome.SetPaintTransparent( TRUE );
-    maProduct.SetPaintTransparent( TRUE );
+    maWelcome.SetPaintTransparent( sal_True );
+    maProduct.SetPaintTransparent( sal_True );
     EnableChildTransparentMode();
 
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
@@ -229,15 +229,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     if( mxDesktop.is() )
         mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY );
 
-    maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) );
-    maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) );
-    maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) );
-    maDrawButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DrawButton" ) ) ) );
-    maDBButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DBButton" ) ) ) );
-    maMathButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:MathButton" ) ) ) );
-    maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) );
-    maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) );
-    maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) );
+    maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" );
+    maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" );
+    maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" );
+    maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" );
+    maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" );
+    maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" );
+    maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" );
 
     // init background
     initBackground();
@@ -384,7 +384,7 @@ void BackingWindow::prepareRecentFileMenu()
                 aBuf.append( i+1 );
             aBuf.appendAscii( ": " );
             aBuf.append( aMenuTitle );
-            mpRecentMenu->InsertItem( static_cast<USHORT>(i+1), aBuf.makeStringAndClear() );
+            mpRecentMenu->InsertItem( static_cast<sal_uInt16>(i+1), aBuf.makeStringAndClear() );
         }
     }
     else
@@ -562,9 +562,9 @@ void BackingWindow::initControls()
         MenuBar* pMBar = pSysWin->GetMenuBar();
         if( pMBar )
         {
-            for( USHORT i = 0; i < pMBar->GetItemCount(); i++ )
+            for( sal_uInt16 i = 0; i < pMBar->GetItemCount(); i++ )
             {
-                USHORT nItemId = pMBar->GetItemId( i );
+                sal_uInt16 nItemId = pMBar->GetItemId( i );
                 String aItemText( pMBar->GetItemText( nItemId ) );
                 if( aItemText.Len() )
                     aMnemns.RegisterMnemonic( aItemText );
@@ -675,11 +675,11 @@ void BackingWindow::layoutButton(
 {
     rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() );
     // setup button
-    i_rBtn.SetPaintTransparent( TRUE );
+    i_rBtn.SetPaintTransparent( sal_True );
     i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
     if( i_pURL && (! i_rOpt.IsModuleInstalled( i_eMod ) || i_rURLS.find( aURL ) == i_rURLS.end()) )
     {
-        i_rBtn.Enable( FALSE );
+        i_rBtn.Enable( sal_False );
     }
 
     // setup text
@@ -1100,7 +1100,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
             if ( xDispatch.is() )
             {
                 ImplDelayedDispatch* pDisp = new ImplDelayedDispatch( xDispatch, aDispatchURL, i_rArgs );
-                ULONG nEventId = 0;
+                sal_uLong nEventId = 0;
                 if( ! Application::PostUserEvent( nEventId, Link( NULL, implDispatchDelayed ), pDisp ) )
                     delete pDisp; // event could not be posted for unknown reason, at least don't leak
             }
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index f3a67213b0..f3a67213b0 100644..100755
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index dedeada6ba..69c415d4a9 100644..100755
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -96,6 +96,8 @@
 #endif
 #include <comphelper/extract.hxx>
 
+#include <fwkdllapi.h>
+
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -1527,7 +1529,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     // Register transaction and reject wrong calls.
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
-    //	Initialize state with FALSE !!!
+    //	Initialize state with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index f372875e60..f372875e60 100644..100755
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0c76fec11a..462e69c63f 100644..100755
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -41,11 +41,11 @@
 #include <loadenv/loadenv.hxx>
 #include <helper/oframes.hxx>
 #include <helper/statusindicatorfactory.hxx>
-#include <helper/titlehelper.hxx>
+#include <framework/titlehelper.hxx>
 #include <classes/droptargetlistener.hxx>
 #include <classes/taskcreator.hxx>
 #include <loadenv/targethelper.hxx>
-#include <classes/framelistanalyzer.hxx>
+#include <framework/framelistanalyzer.hxx>
 #include <helper/dockingareadefaultacceptor.hxx>
 #include <dispatch/dispatchinformationprovider.hxx>
 #include <threadhelp/transactionguard.hxx>
@@ -275,7 +275,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac
         ,   PropertySetHelper           ( xFactory,
                                           &m_aLock,
                                           &m_aTransactionManager,
-                                          sal_False) // FALSE => dont release shared mutex on calling us!
+                                          sal_False) // sal_False => dont release shared mutex on calling us!
         ,   ::cppu::OWeakObject         (                                                   )
         //	init member
         ,   m_xFactory                  ( xFactory                                          )
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index d2368f9eac..d2368f9eac 100644..100755
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 1b3d78c10d..e59da1d5c6 100644..100755
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -228,7 +228,7 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32();
     sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32();
 
-    Date tmpDate((USHORT)nDay, (USHORT)nMonth, (USHORT)nYear);
+    Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear);
     Time tmpTime(nHour, nMinute, nSecond);
     DateTime tmpDateTime(tmpDate, tmpTime);
     if (aString.indexOf(aUTCString) < 0)
@@ -423,7 +423,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
     aArrow(this, ResId(IMG_ARROW, *pResMgr)),
     aStrAccept( ResId(LICENSE_ACCEPT, *pResMgr) ),
     aStrNotAccept( ResId(LICENSE_NOTACCEPT, *pResMgr) ),
-    bEndReached(FALSE)
+    bEndReached(sal_False)
 {
     FreeResource();
 
@@ -486,7 +486,7 @@ IMPL_LINK( LicenseDialog, PageDownHdl, PushButton *, EMPTYARG )
 
 IMPL_LINK( LicenseDialog, EndReachedHdl, LicenseView *, EMPTYARG )
 {
-    bEndReached = TRUE;
+    bEndReached = sal_True;
 
     EnableControls();
 
@@ -516,7 +516,7 @@ void LicenseDialog::EnableControls()
 {
     if( !bEndReached &&
         ( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) )
-        bEndReached = TRUE;
+        bEndReached = sal_True;
 
     if ( bEndReached )
     {
@@ -567,20 +567,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
         pScroll->DoScrollAction( eScroll );
 }
 
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
 {
-    BOOL bEndReached;
+    sal_Bool bEndReached;
 
     ExtTextView*    pView = GetTextView();
     ExtTextEngine*  pEdit = GetTextEngine();
-    ULONG           nHeight = pEdit->GetTextHeight();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
     Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
     Point           aBottom( 0, aOutSize.Height() );
 
-    if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
-        bEndReached = TRUE;
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
     else
-        bEndReached = FALSE;
+        bEndReached = sal_False;
 
     return bEndReached;
 }
@@ -589,8 +589,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        BOOL    bLastVal = EndReached();
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
 
         if ( nId == TEXT_HINT_PARAINSERTED )
         {
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
deleted file mode 100644
index 2978d9aacf..0000000000
--- a/framework/source/services/makefile.mk
+++ /dev/null
@@ -1,64 +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=			framework
-TARGET=				fwk_services
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/desktop.obj \
-        $(SLO)$/frame.obj \
-        $(SLO)$/urltransformer.obj \
-        $(SLO)$/mediatypedetectionhelper.obj \
-        $(SLO)$/substitutepathvars.obj \
-        $(SLO)$/pathsettings.obj \
-        $(SLO)$/backingcomp.obj \
-        $(SLO)$/backingwindow.obj \
-        $(SLO)$/dispatchhelper.obj \
-        $(SLO)$/license.obj \
-        $(SLO)$/modulemanager.obj \
-        $(SLO)$/autorecovery.obj \
-        $(SLO)$/sessionlistener.obj \
-        $(SLO)$/taskcreatorsrv.obj \
-        $(SLO)$/uriabbreviation.obj \
-        $(SLO)$/tabwindowservice.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= fwk_services.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index e9dd2b7423..e9dd2b7423 100644..100755
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx
deleted file mode 100644
index 8f1fa0e815..0000000000
--- a/framework/source/services/menudocumenthandler.cxx
+++ /dev/null
@@ -1,902 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <stdio.h>
-#include <services/menudocumenthandler.hxx>
-#include <classes/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
-
-#include <services/attributelist.hxx>
-
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-
-const int ITEMID_START_VALUE = 1000;
-
-#define XMLNS_MENU				"http://openoffice.org/2001/menu"
-#define XMLNS_PREFIX			"menu:"
-
-#define ELEMENT_MENUBAR			"http://openoffice.org/2001/menu^menubar"
-#define ELEMENT_MENU			"http://openoffice.org/2001/menu^menu"
-#define ELEMENT_MENUPOPUP		"http://openoffice.org/2001/menu^menupopup"
-#define ELEMENT_MENUITEM		"http://openoffice.org/2001/menu^menuitem"
-#define ELEMENT_MENUSEPARATOR	"http://openoffice.org/2001/menu^menuseparator"
-
-#define ELEMENT_NS_MENUBAR			"menu:menubar"
-#define ELEMENT_NS_MENU				"menu:menu"
-#define ELEMENT_NS_MENUPOPUP		"menu:menupopup"
-#define ELEMENT_NS_MENUITEM			"menu:menuitem"
-#define ELEMENT_NS_MENUSEPARATOR	"menu:menuseparator"
-
-#define ATTRIBUTE_ID			"http://openoffice.org/2001/menu^id"
-#define ATTRIBUTE_LABEL			"http://openoffice.org/2001/menu^label"
-#define ATTRIBUTE_HELPID		"http://openoffice.org/2001/menu^helpid"
-#define ATTRIBUTE_LINEBREAK		"http://openoffice.org/2001/menu^linebreak"
-
-#define ATTRIBUTE_NS_ID			"menu:id"
-#define ATTRIBUTE_NS_LABEL		"menu:label"
-#define ATTRIBUTE_NS_HELPID		"menu:helpid"
-#define ATTRIBUTE_NS_LINEBREAK	"menu:linebreak"
-
-#define ATTRIBUTE_XMLNS_MENU	"xmlns:menu"
-
-#define ATTRIBUTE_TYPE_CDATA	"CDATA"
-
-#define MENUBAR_DOCTYPE			"<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">"
-
-
-// special popup menus (filled during runtime) must be saved as a menuitem!!!
-// same as in menumanager.cxx - you have to change both files!!!
-#define SID_SFX_START			5000
-#define SID_NEWDOCDIRECT		(SID_SFX_START + 537)
-#define SID_AUTOPILOTMENU		(SID_SFX_START + 1381)
-#define SID_FORMATMENU          (SID_SFX_START + 780)
-
-const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
-const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" ));
-const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ));
-
-const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" ));
-const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" ));
-
-const ULONG  MENU_SAVE_LABEL			= 0x00000001;
-
-namespace framework
-{
-
-// -----------------------------------------------------------------------------
-// Base class implementation
-
-ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
-    m_xLocator( 0 ),
-    m_xReader( 0 )
-{
-}
-
-ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
-{
-}
-
-Any SAL_CALL ReadMenuDocumentHandlerBase::queryInterface(
-    const Type & rType )
-throw( RuntimeException )
-{
-    Any a = ::cppu::queryInterface(
-                rType ,
-                SAL_STATIC_CAST( XDocumentHandler*, this ));
-    if ( a.hasValue() )
-        return a;
-
-    return OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
-    const OUString& aWhitespaces )
-throw( SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
-    const OUString& aTarget, const OUString& aData )
-throw( SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator(
-    const Reference< XLocator > &xLocator)
-throw(	SAXException, RuntimeException )
-{
-    m_xLocator = xLocator;
-}
-
-::rtl::OUString ReadMenuDocumentHandlerBase::getErrorLineString()
-{
-    char buffer[32];
-
-    if ( m_xLocator.is() )
-    {
-        snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() ));
-        return OUString::createFromAscii( buffer );
-    }
-    else
-        return OUString();
-}
-
-// -----------------------------------------------------------------------------
-
-// #110897#
-OReadMenuDocumentHandler::OReadMenuDocumentHandler( 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    MenuBar* pMenuBar )
-:	// #110897#
-    mxServiceFactory(xServiceFactory),
-    m_pMenuBar( pMenuBar ),
-    m_nElementDepth( 0 ),
-    m_bMenuBarMode( sal_False ),
-    m_nItemId( ITEMID_START_VALUE )
-{
-}
-
-// #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory()
-{
-    // #110897#
-    return mxServiceFactory;
-}
-
-OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::startDocument(void)
-    throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::endDocument(void)
-    throw( SAXException, RuntimeException )
-{
-    if ( m_nElementDepth > 0 )
-    {
-        OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "A closing element is missing!" ));
-        throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-    }
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::startElement(
-    const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuBarMode )
-    {
-        ++m_nElementDepth;
-        m_xReader->startElement( aName, xAttrList );
-    }
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR )))
-    {
-        ++m_nElementDepth;
-        m_bMenuBarMode = sal_True;
-        
-        // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId ));
-        m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId ));
-        
-        m_xReader->startDocument();
-    }
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars)
-throw(	SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuBarMode )
-    {
-        --m_nElementDepth;
-        m_xReader->endElement( aName );
-        if ( 0 == m_nElementDepth )
-        {
-            m_xReader->endDocument();
-            m_xReader = Reference< XDocumentHandler >();
-            m_bMenuBarMode = sal_False;
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menubar expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-    }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-// #110897#
-OReadMenuBarHandler::OReadMenuBarHandler( 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
-    MenuBar* pMenuBar, USHORT* pItemId ) 
-:	// #110897#
-    mxServiceFactory( xServiceFactory ),
-    m_pMenuBar( pMenuBar ),
-    m_nElementDepth( 0 ),
-    m_bMenuMode( sal_False ),
-    m_pItemId( pItemId )
-{
-}
-
-// #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory()
-{
-    // #110897#
-    return mxServiceFactory;
-}
-
-OReadMenuBarHandler::~OReadMenuBarHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::startDocument(void)
-    throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::endDocument(void)
-    throw( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::startElement(
-    const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuMode )
-    {
-        ++m_nElementDepth;
-        m_xReader->startElement( aName, xAttrList );
-    }
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
-    {
-        ++m_nElementDepth;
-
-        ULONG	 nHelpId = 0;
-        OUString aCommandId;
-        OUString aLabel;
-
-        m_bMenuMode = sal_True;
-        PopupMenu* pMenu = new PopupMenu();
-
-        // read attributes for menu
-        for ( int i=0; i< xAttrList->getLength(); i++ )
-        {
-            OUString aName = xAttrList->getNameByIndex( i );
-            OUString aValue = xAttrList->getValueByIndex( i );
-            if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
-                aCommandId = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
-                aLabel = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
-                nHelpId = aValue.toInt32();
-        }
-
-        if ( aCommandId.getLength() > 0 )
-        {
-            USHORT nItemId;
-            if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
-                nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
-            else
-                nItemId = ++(*m_pItemId);
-
-            m_pMenuBar->InsertItem( nItemId, String() );
-            m_pMenuBar->SetPopupMenu( nItemId, pMenu );
-            m_pMenuBar->SetItemCommand( nItemId, aCommandId );
-            if ( nHelpId > 0 )
-                m_pMenuBar->SetHelpId( nItemId, nHelpId );
-            if ( aLabel.getLength() > 0 )
-            {
-                m_pMenuBar->SetItemText( nItemId, aLabel );
-                m_pMenuBar->SetUserValue( nItemId, MENU_SAVE_LABEL );
-            }
-            else
-            {
-                m_pMenuBar->SetUserValue( nItemId, 0 );
-            }
-        }
-        else
-        {
-            delete pMenu;
-            OUString aErrorMessage = getErrorLineString();
-            aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
-            throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-        }
-
-        m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId ));
-        m_xReader->startDocument();
-    }
-    else
-    {
-        OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "element menu expected!" ));
-        throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-    }
-}
-
-
-void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars)
-throw(	SAXException, RuntimeException )
-{
-}
-
-
-void OReadMenuBarHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuMode )
-    {
-        --m_nElementDepth;
-        if ( 0 == m_nElementDepth )
-        {
-            m_xReader->endDocument();
-            m_xReader = Reference< XDocumentHandler >();
-            m_bMenuMode = sal_False;
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-        else
-            m_xReader->endElement( aName );
-    }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-OReadMenuHandler::OReadMenuHandler( Menu* pMenu, USHORT* pItemId ) :
-    m_pMenu( pMenu ),
-    m_nElementDepth( 0 ),
-    m_bMenuPopupMode( sal_False ),
-    m_pItemId( pItemId )
-{
-}
-
-
-OReadMenuHandler::~OReadMenuHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::startDocument(void)
-    throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::endDocument(void)
-    throw( SAXException, RuntimeException)
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::startElement(
-    const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuPopupMode )
-    {
-        ++m_nElementDepth;
-        m_xReader->startElement( aName, xAttrList );
-    }
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP )))
-    {
-        ++m_nElementDepth;
-        m_bMenuPopupMode = sal_True;
-        m_xReader = Reference< XDocumentHandler >( new OReadMenuPopupHandler( m_pMenu, m_pItemId ));
-        m_xReader->startDocument();
-    }
-    else
-    {
-        OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" ));
-        throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-    }
-}
-
-
-void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars)
-throw(	SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException )
-{
-    if ( m_bMenuPopupMode )
-    {
-        --m_nElementDepth;
-        if ( 0 == m_nElementDepth )
-        {
-            m_xReader->endDocument();
-            m_xReader = Reference< XDocumentHandler >();
-            m_bMenuPopupMode = sal_False;
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menupopup expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-        else
-            m_xReader->endElement( aName );
-    }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId ) :
-    m_pMenu( pMenu ),
-    m_nElementDepth( 0 ),
-    m_bMenuMode( sal_False ),
-    m_pItemId( pItemId ),
-    m_nNextElementExpected( ELEM_CLOSE_NONE )
-{
-}
-
-
-OReadMenuPopupHandler::~OReadMenuPopupHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::startDocument(void)
-    throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::endDocument(void)
-    throw( SAXException, RuntimeException)
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::startElement(
-    const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
-    ++m_nElementDepth;
-
-    if ( m_bMenuMode )
-        m_xReader->startElement( aName, xAttrList );
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
-    {
-        ULONG	 nHelpId = 0;
-        OUString aCommandId;
-        OUString aLabel;
-
-        m_bMenuMode = sal_True;
-        PopupMenu* pMenu = new PopupMenu();
-
-        // read attributes for menu
-        for ( int i=0; i< xAttrList->getLength(); i++ )
-        {
-            OUString aName = xAttrList->getNameByIndex( i );
-            OUString aValue = xAttrList->getValueByIndex( i );
-            if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
-                aCommandId = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
-                aLabel = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
-                nHelpId = aValue.toInt32();
-        }
-
-        if ( aCommandId.getLength() > 0 )
-        {
-            USHORT nItemId;
-            if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
-                nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
-            else
-                nItemId = ++(*m_pItemId);
-
-            m_pMenu->InsertItem( nItemId, String() );
-            m_pMenu->SetPopupMenu( nItemId, pMenu );
-            m_pMenu->SetItemCommand( nItemId, aCommandId );
-            if ( nHelpId > 0 )
-                m_pMenu->SetHelpId( nItemId, nHelpId );
-            if ( aLabel.getLength() > 0 )
-            {
-                m_pMenu->SetItemText( nItemId, aLabel );
-                m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL );
-            }
-            else
-            {
-                m_pMenu->SetUserValue( nItemId, 0 );
-             }
-        }
-        else
-        {
-            delete pMenu;
-            OUString aErrorMessage = getErrorLineString();
-            aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
-            throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-        }
-
-        m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId ));
-        m_xReader->startDocument();
-    }
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM )))
-    {
-        ULONG	 nHelpId = 0;
-        OUString aCommandId;
-        OUString aLabel;
-
-        // read attributes for menu item
-        for ( int i=0; i< xAttrList->getLength(); i++ )
-        {
-            OUString aName = xAttrList->getNameByIndex( i );
-            OUString aValue = xAttrList->getValueByIndex( i );
-            if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
-                aCommandId = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
-                aLabel = aValue;
-            else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
-                nHelpId = aValue.toInt32();
-        }
-
-        if ( aCommandId.getLength() > 0 )
-        {
-            USHORT nItemId;
-            if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
-                nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
-            else
-                nItemId = ++(*m_pItemId);
-
-            m_pMenu->InsertItem( nItemId, String() );
-            m_pMenu->SetItemCommand( nItemId, aCommandId );
-            if ( nHelpId > 0 )
-                m_pMenu->SetHelpId( nItemId, nHelpId );
-            if ( aLabel.getLength() > 0 )
-            {
-                m_pMenu->SetItemText( nItemId, aLabel );
-                m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL );
-            }
-            else
-            {
-                m_pMenu->SetUserValue( nItemId, 0 );
-            }
-        }
-
-        m_nNextElementExpected = ELEM_CLOSE_MENUITEM;
-    }
-    else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR )))
-    {
-        m_pMenu->InsertSeparator();
-        m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR;
-    }
-    else
-    {
-        OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" ));
-        throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-    }
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars)
-throw(	SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException )
-{
-    --m_nElementDepth;
-    if ( m_bMenuMode )
-    {
-        if ( 0 == m_nElementDepth )
-        {
-            m_xReader->endDocument();
-            m_xReader = Reference< XDocumentHandler >();
-            m_bMenuMode = sal_False;
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-        else
-            m_xReader->endElement( aName );
-    }
-    else
-    {
-        if ( m_nNextElementExpected == ELEM_CLOSE_MENUITEM )
-        {
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuitem expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-        else if ( m_nNextElementExpected == ELEM_CLOSE_MENUSEPARATOR )
-        {
-            if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR )))
-            {
-                OUString aErrorMessage = getErrorLineString();
-                aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuseparator expected!" ));
-                throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-            }
-        }
-
-        m_nNextElementExpected = ELEM_CLOSE_NONE;
-    }
-}
-
-
-// --------------------------------- Write XML ---------------------------------
-
-
-OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< XDocumentHandler > rxWriteDocumentHandler ) :
-    m_pMenuBar( pMenu ),
-    m_xWriteDocumentHandler( rxWriteDocumentHandler )
-{
-    m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY );
-    m_aAttributeType = 	OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
-}
-
-
-OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler()
-{
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuDocument()
-throw ( SAXException, RuntimeException )
-{
-    AttributeListImpl* pList = new AttributeListImpl;
-    Reference< XAttributeList > rList( (XAttributeList *) pList , UNO_QUERY );
-
-    m_xWriteDocumentHandler->startDocument();
-
-    // write DOCTYPE line!
-    Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
-    if ( xExtendedDocHandler.is() )
-    {
-        xExtendedDocHandler->unknown( OUString( RTL_CONSTASCII_USTRINGPARAM( MENUBAR_DOCTYPE )) );
-        m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    }
-
-    pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_MENU )),
-                         m_aAttributeType,
-                         OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_MENU )) );
-
-    pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
-                         m_aAttributeType,
-                         OUString( RTL_CONSTASCII_USTRINGPARAM( "menubar" )) );
-
-    m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )), pList );
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-
-    WriteMenu( m_pMenuBar );
-
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )) );
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->endDocument();
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenu( Menu* pMenu )
-throw ( SAXException, RuntimeException )
-{
-    USHORT  nItemCount = pMenu->GetItemCount();
-    BOOL    bSeparator = FALSE;
-
-    for ( USHORT nItemPos = 0; nItemPos < nItemCount; nItemPos++ )
-    {
-        USHORT nItemId = pMenu->GetItemId( nItemPos );
-
-        PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId );
-        if ( pPopupMenu )
-        {
-            OUString aItemCommand = pMenu->GetItemCommand( nItemId );
-
-            if ( nItemId == SID_NEWDOCDIRECT ||
-                 nItemId == SID_AUTOPILOTMENU )
-            {
-                // special popup menus (filled during runtime) must be saved as a menuitem!!!
-                WriteMenuItem( pMenu, nItemId );
-                bSeparator = FALSE;
-            }
-            else if ( nItemId == SID_FORMATMENU )
-            {
-                // special popup menu - must be written as empty popup!
-                AttributeListImpl* pListMenu = new AttributeListImpl;
-                Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY );
-
-                String aCommand( pMenu->GetItemCommand( nItemId ) );
-                if ( !aCommand.Len() )
-                {
-                    aCommand = String::CreateFromAscii("slot:");
-                    aCommand += String::CreateFromInt32( nItemId );
-                }
-
-                pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
-                                         m_aAttributeType,
-                                         aCommand );
-
-//                if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
-                pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
-                                            m_aAttributeType,
-                                            pMenu->GetItemText( nItemId ) );
-
-                m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                bSeparator = FALSE;
-            }
-            else if ( !AddonPopupMenu::IsCommandURLPrefix ( aItemCommand ))
-            {
-                AttributeListImpl* pListMenu = new AttributeListImpl;
-                Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY );
-
-                String aCommand( pMenu->GetItemCommand( nItemId ) );
-                if ( !aCommand.Len() )
-                {
-                    aCommand = String::CreateFromAscii("slot:");
-                    aCommand += String::CreateFromInt32( nItemId );
-                }
-
-                pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
-                                         m_aAttributeType,
-                                         aCommand );
-
-//                if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
-                    pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
-                                             m_aAttributeType,
-                                             pMenu->GetItemText( nItemId ) );
-
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-
-                WriteMenu( pPopupMenu );
-
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
-                m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-                bSeparator = FALSE;
-            }
-        }
-        else
-        {
-            if ( pMenu->GetItemType( nItemPos ) != MENUITEM_SEPARATOR )
-            {
-                // don't save special menu items for (window list and pickup list, add-ons )
-                if ( !MenuConfiguration::IsPickListItemId( nItemId ) &&
-                     !MenuConfiguration::IsWindowListItemId( nItemId ) &&
-                     !AddonMenuManager::IsAddonMenuId( nItemId ))
-                {
-                    bSeparator = FALSE;
-                    WriteMenuItem( pMenu, nItemId );
-                }
-            }
-            else if ( !bSeparator )
-            {
-                // Don't write two separators together
-                WriteMenuSeparator();
-                bSeparator = TRUE;
-            }
-        }
-    }
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId )
-{
-    AttributeListImpl* pList = new AttributeListImpl;
-    Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-    String aCommand( pMenu->GetItemCommand( nItemId ) );
-    if ( !aCommand.Len() )
-    {
-        aCommand = String::CreateFromAscii("slot:");
-        aCommand += String::CreateFromInt32( nItemId );
-    }
-
-    pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
-                                m_aAttributeType,
-                                aCommand );
-
-    ULONG nHelpId = pMenu->GetHelpId( nItemId );
-    if ( nHelpId > 0 )
-    {
-        pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )),
-                             m_aAttributeType,
-                             OUString::valueOf( sal_Int64( nHelpId )) );
-    }
-
-//    if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
-         pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
-                             m_aAttributeType,
-                             pMenu->GetItemText( nItemId ));
-
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList );
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )) );
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuSeparator()
-{
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )), m_xEmptyList );
-    m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-    m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )) );
-}
-
-} // namespace framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/modelwinservice.cxx b/framework/source/services/modelwinservice.cxx
new file mode 100755
index 0000000000..8c422db2aa
--- /dev/null
+++ b/framework/source/services/modelwinservice.cxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: urltransformer.cxx,v $
+ * $Revision: 1.17 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include "services.h"
+#include "services/modelwinservice.hxx"
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XControlModel.hpp>
+
+using namespace ::com::sun::star;
+
+//_________________________________________________________________________________________________________________
+//	namespace
+//_________________________________________________________________________________________________________________
+
+namespace framework{
+
+//_________________________________________________________________________________________________________________
+//	non exported definitions
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//	declarations
+//_________________________________________________________________________________________________________________
+    
+class Impl_ModelWinService
+{
+    public:
+        ~Impl_ModelWinService();
+
+        static Impl_ModelWinService* getSingleInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+        uno::Any getByName( const ::rtl::OUString& sName ) 
+            throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException );
+
+        uno::Sequence< ::rtl::OUString > getElementNames() 
+            throw( uno::RuntimeException );
+
+        sal_Bool hasByName( const ::rtl::OUString& sName ) 
+            throw( uno::RuntimeException );
+
+        uno::Type getElementType() 
+            throw( css::uno::RuntimeException );
+
+        sal_Bool hasElements() 
+            throw( css::uno::RuntimeException );
+
+        void registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel );
+
+        void deregisterModelForXWindow( const uno::Reference< awt::XWindow >& rWindow );
+
+    private:
+        typedef BaseHash< uno::WeakReference< awt::XControlModel > > ModelWinMap;
+        
+        Impl_ModelWinService();
+        Impl_ModelWinService( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+
+        static Impl_ModelWinService* m_pModelWinService;
+        
+        ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+        ModelWinMap m_aModelMap;
+};
+
+Impl_ModelWinService* Impl_ModelWinService::m_pModelWinService = 0;
+
+Impl_ModelWinService* Impl_ModelWinService::getSingleInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager )
+{
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    if ( !m_pModelWinService )
+        m_pModelWinService = new Impl_ModelWinService( rServiceManager );
+    return m_pModelWinService;
+}
+
+Impl_ModelWinService::Impl_ModelWinService( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) :
+    m_xServiceManager( rServiceManager )
+{
+}
+
+Impl_ModelWinService::Impl_ModelWinService()
+{
+}
+
+Impl_ModelWinService::~Impl_ModelWinService()
+{
+}
+
+void Impl_ModelWinService::registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel )
+{
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    
+    ::rtl::OUString sName = rtl::OUString::valueOf( reinterpret_cast< sal_Int64 >((void*)rWindow.get()));
+    ModelWinMap::iterator pIter = m_aModelMap.find( sName );
+    if ( pIter != m_aModelMap.end() )
+        pIter->second = rModel;
+    else
+        m_aModelMap[sName] = rModel;
+}
+
+void Impl_ModelWinService::deregisterModelForXWindow( const uno::Reference< awt::XWindow >& /*rWindow*/ )
+{
+}
+
+uno::Any Impl_ModelWinService::getByName( const ::rtl::OUString& sName ) 
+throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
+{
+    uno::Any aAny;
+
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    ModelWinMap::iterator pIter = m_aModelMap.find( sName );
+    if ( pIter != m_aModelMap.end())
+    {
+        uno::Reference< awt::XControlModel > xModel( pIter->second );
+        aAny = uno::makeAny(xModel);
+    }
+
+    return aAny;
+}
+
+uno::Sequence< ::rtl::OUString > Impl_ModelWinService::getElementNames()
+throw( uno::RuntimeException )
+{
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    uno::Sequence< ::rtl::OUString > aResult( m_aModelMap.size() );
+    
+    sal_Int32 i = 0;
+    ModelWinMap::const_iterator pIter = m_aModelMap.begin();
+    while ( pIter != m_aModelMap.end())
+        aResult[i++] = pIter->first;
+
+    return aResult;
+}
+
+sal_Bool Impl_ModelWinService::hasByName( const ::rtl::OUString& sName ) 
+throw( uno::RuntimeException )
+{
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    ModelWinMap::iterator pIter = m_aModelMap.find( sName );
+    if ( pIter != m_aModelMap.end())
+        return true;
+    else
+        return false;
+}
+
+uno::Type Impl_ModelWinService::getElementType() 
+throw( css::uno::RuntimeException )
+{
+    return ::getCppuType(( const uno::Reference< awt::XControlModel >*)NULL );
+}
+
+sal_Bool Impl_ModelWinService::hasElements() 
+throw( css::uno::RuntimeException )
+{
+    osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
+    return (m_aModelMap.size() > 0);
+}
+
+//*****************************************************************************************************************
+//	css::uno::XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+
+DEFINE_XINTERFACE_4                 (   ModelWinService                                 ,
+                                        OWeakObject                                     ,
+                                        DIRECT_INTERFACE(css::lang::XTypeProvider       ),
+                                        DIRECT_INTERFACE(css::lang::XServiceInfo        ),
+                                        DIRECT_INTERFACE(css::container::XNameAccess    ),
+                                        DIRECT_INTERFACE(css::container::XElementAccess )
+                                    )
+
+DEFINE_XTYPEPROVIDER_4              (   ModelWinService                ,
+                                        css::lang::XTypeProvider       ,
+                                        css::lang::XServiceInfo        ,
+                                        css::container::XNameAccess    ,
+                                        css::container::XElementAccess
+                                    )
+
+DEFINE_XSERVICEINFO_MULTISERVICE    (   ModelWinService                    ,
+                                        OWeakObject                        ,
+                                        SERVICENAME_MODELWINSERVICE        ,
+                                        IMPLEMENTATIONNAME_MODELWINSERVICE
+                                    )
+
+DEFINE_INIT_SERVICE                 (   ModelWinService,
+                                        {
+                                        }
+                                    )
+                                    
+//*****************************************************************************************************************
+//	constructor
+//*****************************************************************************************************************
+ModelWinService::ModelWinService(const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) :
+    m_xServiceManager( rServiceManager )
+{
+}
+
+ModelWinService::~ModelWinService()
+{
+}
+
+void ModelWinService::registerModelForXWindow( const uno::Reference< awt::XWindow >& rWindow, const uno::Reference< awt::XControlModel >& rModel )
+{
+    Impl_ModelWinService::getSingleInstance(m_xServiceManager)->registerModelForXWindow( rWindow, rModel );
+}
+
+void ModelWinService::deregisterModelForXWindow( const uno::Reference< awt::XWindow >& rWindow )
+{
+    Impl_ModelWinService::getSingleInstance(m_xServiceManager)->deregisterModelForXWindow( rWindow );
+}
+        
+uno::Any SAL_CALL ModelWinService::getByName( const ::rtl::OUString& sName ) 
+throw(	container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
+{
+    return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->getByName( sName );
+}
+
+uno::Sequence< ::rtl::OUString > SAL_CALL ModelWinService::getElementNames() 
+throw( uno::RuntimeException )
+{
+    return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->getElementNames( );
+}
+
+sal_Bool SAL_CALL ModelWinService::hasByName( const ::rtl::OUString& sName ) 
+throw( uno::RuntimeException )
+{
+    return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->hasByName( sName );
+}
+
+//---------------------------------------------------------------------------------------------------------
+//	XElementAccess
+//---------------------------------------------------------------------------------------------------------
+uno::Type SAL_CALL ModelWinService::getElementType() 
+throw( uno::RuntimeException )
+{
+    return ::getCppuType( (const uno::Reference< awt::XControlModel > *)NULL );
+}
+
+sal_Bool SAL_CALL ModelWinService::hasElements() 
+throw( uno::RuntimeException )
+{
+    return Impl_ModelWinService::getSingleInstance(m_xServiceManager)->hasElements();
+}
+
+}
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index f3d1c23753..f3d1c23753 100644..100755
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 3fc6a0866e..29620b6844 100644..100755
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -60,6 +60,8 @@
 #include <comphelper/configurationhelper.hxx>
 #include <unotools/configpathes.hxx>
 
+#include <fwkdllapi.h>
+
 // ______________________________________________
 //	non exported const
 
@@ -249,21 +251,24 @@ void PathSettings::impl_readAll()
 OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readOldFormat" );
-    css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgOld();
-    css::uno::Any                                      aVal = xCfg->getByName(sPath);
-
-    ::rtl::OUString                       sStringVal;
-    css::uno::Sequence< ::rtl::OUString > lStringListVal;
-    OUStringList                          aPathVal;
+    css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld() );
+    OUStringList aPathVal;
 
-    if (aVal >>= sStringVal)
-    {
-        aPathVal.push_back(sStringVal);
-    }
-    else
-    if (aVal >>= lStringListVal)
+    if( xCfg->hasByName(sPath) )
     {
-        aPathVal << lStringListVal;
+        css::uno::Any aVal( xCfg->getByName(sPath) );
+
+        ::rtl::OUString                       sStringVal;
+        css::uno::Sequence< ::rtl::OUString > lStringListVal;
+
+        if (aVal >>= sStringVal)
+        {
+            aPathVal.push_back(sStringVal);
+        }
+        else if (aVal >>= lStringListVal)
+        {
+            aPathVal << lStringListVal;
+        }
     }
 
     return aPathVal;
@@ -982,6 +987,13 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const
 //-----------------------------------------------------------------------------
 sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const
 {
+    // allow empty path to reset a path.
+// idea by LLA to support empty pathes
+//    if (sPath.getLength() == 0)
+//    {
+//        return sal_True;
+//    }
+    
     return (! INetURLObject(sPath).HasError());
 }
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 7246d5fc0b..7246d5fc0b 100644..100755
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index ace5ffce6a..ace5ffce6a 100644..100755
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index e5ca800054..586ec3618e 100644..100755
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -120,7 +120,7 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti
         ,   PropertySetHelper       ( xFactory                      ,
                                       &m_aLock                      ,
                                       &m_aTransactionManager        ,
-                                      sal_False                     ) // FALSE => dont release shared mutex on calling us!
+                                      sal_False                     ) // sal_False => dont release shared mutex on calling us!
         ,   OWeakObject             (                               )
 
         // Init member
@@ -369,7 +369,7 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
     if ( !pEvent && !pEvent->ISA(VclWindowEvent))
         return 0;
     
-    ULONG           nEventId = pEvent->GetId();
+    sal_uLong           nEventId = pEvent->GetId();
     VclWindowEvent* pWinEvt  = static_cast< VclWindowEvent* >(pEvent);
 
     css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY );
@@ -400,19 +400,19 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
             switch (nEventId)
             {
                 case VCLEVENT_TABPAGE_ACTIVATE :
-                    pListener->activated( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->activated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_DEACTIVATE :
-                    pListener->deactivated( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->deactivated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_INSERTED :
-                    pListener->inserted( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->inserted( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_REMOVED :
-                    pListener->removed( (sal_Int32)(ULONG)pWinEvt->GetData() );
+                    pListener->removed( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
                     break;
 
                 case VCLEVENT_TABPAGE_PAGETEXTCHANGED :
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index f8b62da849..f8b62da849 100644..100755
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index b5d589a420..b5d589a420 100644..100755
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 74da8f02ef..74da8f02ef 100644..100755
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk
deleted file mode 100644
index 6147672bdc..0000000000
--- a/framework/source/tabwin/makefile.mk
+++ /dev/null
@@ -1,48 +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=			framework
-TARGET=				fwk_tabwin
-USE_DEFFILE=		TRUE
-NO_BSYMBOLIC=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-BOOTSTRAP_SERVICE=	FALSE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/tabwinfactory.obj	\
-                    $(SLO)$/tabwindow.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 494aa572f7..4bb5b25a37 100644..100755
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -423,16 +423,16 @@ throw (css::uno::Exception, css::uno::RuntimeException)
                     SolarMutexGuard aGuard;
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if( pWindow )
-                        pWindow->Show( TRUE );
+                        pWindow->Show( sal_True );
 
                     pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
                     if ( pWindow )
-                        pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
+                        pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
 
                     pWindow = VCLUnoHelper::GetWindow( xTabControl );
                     if ( pWindow )
                     {
-                        pWindow->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
+                        pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE  );
                         TabControl* pTabControl = (TabControl *)pWindow;
                         pTabControl->SetActivatePageHdl( LINK( this, TabWindow, Activate ));
                         pTabControl->SetDeactivatePageHdl( LINK( this, TabWindow, Deactivate ));
@@ -848,7 +848,7 @@ sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any&       aCon
                                                        const css::uno::Any& aValue             )
 throw( css::lang::IllegalArgumentException )
 {
-    //	Initialize state with FALSE !!!
+    //	Initialize state with sal_False !!!
     //	(Handle can be invalid)
     sal_Bool bReturn = sal_False;
 
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index a430f4538f..a430f4538f 100644..100755
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
diff --git a/framework/source/threadhelp/makefile.mk b/framework/source/threadhelp/makefile.mk
deleted file mode 100644
index be4d711379..0000000000
--- a/framework/source/threadhelp/makefile.mk
+++ /dev/null
@@ -1,45 +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=			framework
-TARGET=				fwk_threadhelp
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :			settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			$(SLO)$/lockhelper.obj				\
-                    $(SLO)$/transactionmanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 5a704a8c8f..5a704a8c8f 100644..100755
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index b0a5966051..b0a5966051 100644..100755
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 51130391c9..a29e80c800 100644..100755
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_framework.hxx"
 #include <uiconfiguration/imagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 4c978b5e50..12134c740a 100644..100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_framework.hxx"
 #include <imagemanagerimpl.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 
@@ -511,7 +511,7 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
                 sal_Int32 nCount = pList->pImageItemList->Count();
                 std::vector< OUString > aUserImagesVector;
                 aUserImagesVector.reserve(nCount);
-                for ( USHORT i=0; i < nCount; i++ )
+                for ( sal_uInt16 i=0; i < nCount; i++ )
                 {
                     const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
                     aUserImagesVector.push_back( pItem->aCommandURL );
@@ -584,7 +584,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             aUserImageListInfo.pImageList->Insert( pList, 0 );
 
             pList->pImageItemList = new ImageItemListDescriptor;
-            for ( USHORT i=0; i < pImageList->GetImageCount(); i++ )
+            for ( sal_uInt16 i=0; i < pImageList->GetImageCount(); i++ )
             {
                 ImageItemDescriptor* pItem = new ::framework::ImageItemDescriptor;
 
@@ -996,7 +996,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
             if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex ))
                 continue;
             
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
             if ( nPos == IMAGELIST_IMAGE_NOTFOUND )
             {
                 pImageList->AddImage( aCommandURLSequence[i], xGraphic );
@@ -1080,11 +1080,11 @@ throw ( ::com::sun::star::lang::IllegalArgumentException,
 
         for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ )
         {
-            USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
+            sal_uInt16 nPos = pImageList->GetImagePos( aCommandURLSequence[i] );
             if ( nPos != IMAGELIST_IMAGE_NOTFOUND )
             {
                 Image aImage = pImageList->GetImage( nPos );
-                USHORT nId   = pImageList->GetImageId( nPos );
+                sal_uInt16 nId   = pImageList->GetImageId( nPos );
                 pImageList->RemoveImage( nId );
 
                 if ( m_bUseGlobal )
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 20cfd5d471..20cfd5d471 100644..100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
deleted file mode 100644
index ef82e2da76..0000000000
--- a/framework/source/uiconfiguration/makefile.mk
+++ /dev/null
@@ -1,54 +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=			framework
-TARGET=				fwk_uiconfiguration
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/uiconfigurationmanager.obj          \
-                    $(SLO)$/moduleuiconfigurationmanager.obj    \
-                    $(SLO)$/moduleuicfgsupplier.obj             \
-                    $(SLO)$/windowstateconfiguration.obj        \
-                    $(SLO)$/moduleimagemanager.obj              \
-                    $(SLO)$/imagemanager.obj                    \
-                    $(SLO)$/imagemanagerimpl.obj                \
-                    $(SLO)$/graphicnameaccess.obj               \
-                    $(SLO)$/uicategorydescription.obj           \
-                    $(SLO)$/globalsettings.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index b76e737d55..1483a231f2 100644..100755
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -31,7 +31,7 @@
 #include <rtl/logfile.hxx>
 #include <uiconfiguration/moduleimagemanager.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <xml/imagesconfiguration.hxx>
+#include <framework/imagesconfiguration.hxx>
 #include <uiconfiguration/graphicnameaccess.hxx>
 #include <services.h>
 #include "imagemanagerimpl.hxx"
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 1174c604be..1174c604be 100644..100755
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 3245495607..990040b0df 100644..100755
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -34,10 +34,10 @@
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -722,8 +722,9 @@ void ModuleUIConfigurationManager::impl_Initialize()
             Reference< XStorage > xElementTypeStorage;
             try
             {
-                Any a = xNameAccess->getByName( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ));
-                a >>= xElementTypeStorage;
+                const OUString sName( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ) );
+                if( xNameAccess->hasByName( sName ) )
+                    xNameAccess->getByName( sName ) >>= xElementTypeStorage;
             }
             catch ( com::sun::star::container::NoSuchElementException& )
             {
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 9ac42e5a70..9ac42e5a70 100644..100755
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 93f9e9c62b..0ed588ab8b 100644..100755
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -34,10 +34,10 @@
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index a60cd01308..ad1c37247a 100644..100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -34,11 +34,11 @@
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/uielementtypenames.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <xml/toolboxconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/toolboxconfiguration.hxx>
 #include <uiconfiguration/imagemanager.hxx>
 
-#include <xml/statusbarconfiguration.hxx>
+#include <framework/statusbarconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
index 540bc3f7e8..540bc3f7e8 100644..100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 4d9c39af57..be0a47d92c 100644..100755
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -368,16 +368,20 @@ throw ( RuntimeException )
 sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const ::rtl::OUString& rResourceURL )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    try
-    {
-        getByName( rResourceURL );
-    }
-    catch ( NoSuchElementException& )
+    // SAFE
+    ResetableGuard aLock( m_aLock );
+
+    ResourceURLToInfoCache::const_iterator pIter = m_aResourceURLToInfoCache.find( rResourceURL );
+    if ( pIter != m_aResourceURLToInfoCache.end() )
+        return sal_True;
+    else
     {
-        return sal_False;
+        Any a( impl_getWindowStateFromResourceURL( rResourceURL ) );
+        if ( a == Any() )
+            return sal_False;
+        else
+            return sal_True;
     }
-
-    return sal_True;
 }
 
 // XElementAccess
@@ -1048,12 +1052,11 @@ Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const r
     try
     {
         // Try to ask our configuration access
-        if ( m_xConfigAccess.is() )
+        if ( m_xConfigAccess.is() && m_xConfigAccess->hasByName( rResourceURL ) )
         {
-            Reference< XNameAccess > xNameAccess;
-            Any a( m_xConfigAccess->getByName( rResourceURL ));
 
-            if ( a >>= xNameAccess )
+            Reference< XNameAccess > xNameAccess( m_xConfigAccess->getByName( rResourceURL ), UNO_QUERY );
+            if ( xNameAccess.is() )
                 return impl_insertCacheAndReturnSequence( rResourceURL, xNameAccess );
         }
     }
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index c2ebabc3d7..ff7eb738ca 100644..100755
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -40,11 +40,11 @@
 #include <uielement/generictoolbarcontroller.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include "services.h"
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/resource.hrc>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/comboboxtoolbarcontroller.hxx>
 #include <uielement/imagebuttontoolbarcontroller.hxx>
 #include <uielement/togglebuttontoolbarcontroller.hxx>
@@ -98,7 +98,7 @@ namespace framework
 {
 
 static const char   TOOLBOXITEM_SEPARATOR_STR[] = "private:separator";
-static const USHORT TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
+static const sal_uInt16 TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
 
 AddonsToolBarManager::AddonsToolBarManager( const Reference< XMultiServiceFactory >& rServiceManager,
                                 const Reference< XFrame >& rFrame,
@@ -175,7 +175,7 @@ void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException )
         ResetableGuard aGuard( m_aLock );
         for ( sal_uInt16 n = 0; n < m_pToolBar->GetItemCount(); n++ )
         {
-            USHORT nId( m_pToolBar->GetItemId( n ) );
+            sal_uInt16 nId( m_pToolBar->GetItemId( n ) );
 
             if ( nId > 0 )
             {
@@ -203,9 +203,9 @@ bool AddonsToolBarManager::MenuItemAllowed( sal_uInt16 nId ) const
 void AddonsToolBarManager::RefreshImages()
 {
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId( m_pToolBar->GetItemId( nPos ) );
+        sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
 
         if ( nId > 0 )
         {
@@ -230,7 +230,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
     if ( m_bDisposed )
         return;
 
-    USHORT    nId( 1 );
+    sal_uInt16    nId( 1 );
 
     RemoveControllers();
 
@@ -278,7 +278,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
         {
             if ( aURL.equalsAsciiL( TOOLBOXITEM_SEPARATOR_STR, TOOLBOXITEM_SEPARATOR_STR_LEN ))
             {
-                USHORT nCount = m_pToolBar->GetItemCount();
+                sal_uInt16 nCount = m_pToolBar->GetItemCount();
                 if ( nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ) && nElements > 0 )
                 {
                     nElements = 0;
@@ -287,13 +287,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
             }
             else
             {
-                USHORT nCount = m_pToolBar->GetItemCount();
+                sal_uInt16 nCount = m_pToolBar->GetItemCount();
                 if ( bAppendSeparator && nCount > 0 && ( m_pToolBar->GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ))
                 {
                     // We have to append a separator first if the last item is not a separator
                     m_pToolBar->InsertSeparator();
                 }
-                bAppendSeparator = FALSE;
+                bAppendSeparator = sal_False;
 
                 m_pToolBar->InsertItem( nId, aTitle );
 
@@ -428,7 +428,7 @@ IMPL_LINK( AddonsToolBarManager, Click, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -446,7 +446,7 @@ IMPL_LINK( AddonsToolBarManager, DoubleClick, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -475,7 +475,7 @@ IMPL_LINK( AddonsToolBarManager, Select, ToolBox*, EMPTYARG )
         return 1;
 
     sal_Int16   nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() );
-    USHORT      nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16      nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -521,9 +521,9 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
         CheckAndUpdateImages();
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
-        const USHORT nId = m_pToolBar->GetItemId(nPos);
+        const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 2a4310bf04..10678bbb55 100644..100755
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -36,7 +36,7 @@
 
 #include <uielement/addonstoolbarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/addonstoolbarmanager.hxx>
@@ -140,7 +140,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
@@ -157,7 +157,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
                     // Fill toolbar with container contents
                     pToolBarManager->FillToolbar( m_aConfigData );
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index c2b8e48228..c2b8e48228 100644..100755
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 32a95e1a6e..49e97b2baf 100644..100755
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -165,7 +165,7 @@ ComboboxToolbarController::ComboboxToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
@@ -415,7 +415,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
                 com::sun::star::util::Color aColor(0);
                 if ( rControlCommand.Arguments[i].Value >>= aColor )
                 {
-                    ::Color aBackColor( static_cast< UINT32 >( aColor ));
+                    ::Color aBackColor( static_cast< sal_uInt32 >( aColor ));
                     m_pComboBox->SetControlBackground( aBackColor );
                 }
                 break;
@@ -431,7 +431,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
                 com::sun::star::util::Color aColor(0);
                 if ( rControlCommand.Arguments[i].Value >>= aColor )
                 {
-                    ::Color aForeColor( static_cast< UINT32 >( aColor ));
+                    ::Color aForeColor( static_cast< sal_uInt32 >( aColor ));
                     m_pComboBox->SetControlForeground( aForeColor );
                 }
                 break;
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index a55a2d6cb5..8e955839b7 100644..100755
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -77,7 +77,7 @@ ComplexToolbarController::ComplexToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     const ::rtl::OUString&                          aCommand ) :
     svt::ToolboxController( rServiceManager, rFrame, aCommand )
     ,   m_pToolbar( pToolbar )
@@ -180,7 +180,7 @@ throw ( RuntimeException )
     {
         m_pToolbar->EnableItem( m_nID, Event.IsEnabled );
 
-        USHORT nItemBits = m_pToolbar->GetItemBits( m_nID );
+        sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID );
         nItemBits &= ~TIB_CHECKABLE;
         TriState eTri = STATE_NOCHECK;
 
@@ -194,7 +194,7 @@ throw ( RuntimeException )
         {
             // Boolean, treat it as checked/unchecked
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
             m_pToolbar->CheckItem( m_nID, bValue );
             if ( bValue )
                 eTri = STATE_CHECK;
@@ -207,14 +207,14 @@ throw ( RuntimeException )
             m_pToolbar->SetQuickHelpText( m_nID, aText );
 
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemState )
         {
             eTri = STATE_DONTKNOW;
             nItemBits |= TIB_CHECKABLE;
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemVisibility )
         {
@@ -225,11 +225,11 @@ throw ( RuntimeException )
         {
             executeControlCommand( aControlCommand );
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
 
         else if ( m_bMadeInvisible )
-            m_pToolbar->ShowItem( m_nID, TRUE );
+            m_pToolbar->ShowItem( m_nID, sal_True );
 
         m_pToolbar->SetItemState( m_nID, eTri );
         m_pToolbar->SetItemBits( m_nID, nItemBits );
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index a2aa126948..70a70e9fb3 100644..100755
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -287,7 +287,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
-    USHORT nMenuId = 0;
+    sal_uInt16 nMenuId = 0;    
     for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
     {
         if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] ))
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 438532ed4a..ac9a5e62cc 100644..100755
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -147,7 +147,7 @@ DropdownToolbarController::DropdownToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 2f4366bdd9..238e2209f4 100644..100755
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -146,7 +146,7 @@ EditToolbarController::EditToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 2d97656299..9302db9b7d 100644..100755
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -114,7 +114,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont
     {
         vector<rtl::OUString> aVector;
         aVector.reserve(rFontNameSeq.getLength());
-        for ( USHORT i = 0; i < rFontNameSeq.getLength(); i++ )
+        for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ )
         {
             aVector.push_back(MnemonicGenerator::EraseAllMnemonicChars(pFontNameArray[i]));
         }
@@ -195,12 +195,12 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (
     if ( m_xPopupMenu.is() )
     {
         // find new font name and set check mark!
-        USHORT        nChecked = 0;
-        USHORT        nItemCount = m_xPopupMenu->getItemCount();
+        sal_uInt16        nChecked = 0;
+        sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
         rtl::OUString aEmpty;
-        for( USHORT i = 0; i < nItemCount; i++ )
+        for( sal_uInt16 i = 0; i < nItemCount; i++ )
         {
-            USHORT nItemId = m_xPopupMenu->getItemId( i );
+            sal_uInt16 nItemId = m_xPopupMenu->getItemId( i );
 
             if ( m_xPopupMenu->isItemChecked( nItemId ) )
                 nChecked = nItemId;
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index fbfcba7740..3c32e2a000 100644..100755
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -50,7 +50,7 @@
 //_________________________________________________________________________________________________________________
 
 #include <vcl/menu.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/outdev.hxx>
@@ -128,16 +128,16 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::
 void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu )
 {
     // check menu item
-    rtl::OUString	aHeight     = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE  );
-    USHORT		    nChecked    = 0;
-    USHORT		    nItemCount  = rPopupMenu->getItemCount();
-    for( USHORT i = 0; i < nItemCount; i++ )
+    rtl::OUString	aHeight     = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, sal_True, sal_False  );
+    sal_uInt16		    nChecked    = 0;
+    sal_uInt16		    nItemCount  = rPopupMenu->getItemCount();
+    for( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = rPopupMenu->getItemId( i );
+        sal_uInt16 nItemId = rPopupMenu->getItemId( i );
 
         if ( m_pHeightArray[i] == nHeight )
         {
-            rPopupMenu->checkItem( nItemId, TRUE );
+            rPopupMenu->checkItem( nItemId, sal_True );
             return;
         }
 
@@ -146,7 +146,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP
     }
 
     if ( nChecked )
-        rPopupMenu->checkItem( nChecked, FALSE );
+        rPopupMenu->checkItem( nChecked, sal_False );
 }
 
 // private function
@@ -188,11 +188,11 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
 
         const long* pTempAry;
         const long* pAry = pFontList->GetSizeAry( aFntInfo );
-        USHORT nSizeCount = 0;
+        sal_uInt16 nSizeCount = 0;
         while ( pAry[nSizeCount] )
             nSizeCount++;
 
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         const rtl::OUString aFontHeightCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight.Height:float=" ));
         
         // first insert font size names (for simplified/traditional chinese)
@@ -207,8 +207,8 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             if ( pAry == pFontList->GetStdSizeAry() )
             {
                 // for scalable fonts all font size names
-                ULONG nCount = aFontSizeNames.Count();
-                for( ULONG i = 0; i < nCount; i++ )
+                sal_uLong nCount = aFontSizeNames.Count();
+                for( sal_uLong i = 0; i < nCount; i++ )
                 {
                     String	aSizeName = aFontSizeNames.GetIndexName( i );
                     long	nSize = aFontSizeNames.GetIndexSize( i );
@@ -252,7 +252,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         {
             m_pHeightArray[nPos] = *pTempAry;
             nPos++; // Id is nPos+1
-            pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, TRUE, FALSE ), MIB_RADIOCHECK | MIB_AUTOCHECK );
+            pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, sal_True, sal_False ), MIB_RADIOCHECK | MIB_AUTOCHECK );
             fPoint = float( m_pHeightArray[nPos-1] ) / 10;
 
             // Create dispatchable .uno command and set it
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index e447ba0e2c..e447ba0e2c 100644..100755
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 252a51fbfc..c8f3de9e00 100644..100755
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -60,7 +60,7 @@
 #include <classes/fwkresid.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
-#include <xml/menuconfiguration.hxx>
+#include <framework/menuconfiguration.hxx>
 #include <uielement/menubarmanager.hxx>
 
 using namespace ::com::sun::star::awt;
@@ -125,7 +125,7 @@ struct ExecuteInfo
 GenericToolbarController::GenericToolbarController( const Reference< XMultiServiceFactory >& rServiceManager,
                                                     const Reference< XFrame >&               rFrame,
                                                     ToolBox*                                 pToolbar,
-                                                    USHORT                                   nID,
+                                                    sal_uInt16                                   nID,
                                                     const ::rtl::OUString&                          aCommand ) :
     svt::ToolboxController( rServiceManager, rFrame, aCommand )
     ,   m_pToolbar( pToolbar )
@@ -217,7 +217,7 @@ throw ( RuntimeException )
     {
         m_pToolbar->EnableItem( m_nID, Event.IsEnabled );
 
-        USHORT nItemBits = m_pToolbar->GetItemBits( m_nID );
+        sal_uInt16 nItemBits = m_pToolbar->GetItemBits( m_nID );
         nItemBits &= ~TIB_CHECKABLE;
         TriState eTri = STATE_NOCHECK;
 
@@ -230,7 +230,7 @@ throw ( RuntimeException )
         {
             // Boolean, treat it as checked/unchecked
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
             m_pToolbar->CheckItem( m_nID, bValue );
             if ( bValue )
                 eTri = STATE_CHECK;
@@ -281,14 +281,14 @@ throw ( RuntimeException )
             }
 
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if (( Event.State >>= aItemState ) && !m_bEnumCommand )
         {
             eTri = STATE_DONTKNOW;
             nItemBits |= TIB_CHECKABLE;
             if ( m_bMadeInvisible )
-                m_pToolbar->ShowItem( m_nID, TRUE );
+                m_pToolbar->ShowItem( m_nID, sal_True );
         }
         else if ( Event.State >>= aItemVisibility )
         {
@@ -296,7 +296,7 @@ throw ( RuntimeException )
             m_bMadeInvisible = !aItemVisibility.bVisible;
         }
         else if ( m_bMadeInvisible )
-            m_pToolbar->ShowItem( m_nID, TRUE );
+            m_pToolbar->ShowItem( m_nID, sal_True );
 
         m_pToolbar->SetItemState( m_nID, eTri );
         m_pToolbar->SetItemBits( m_nID, nItemBits );
@@ -322,7 +322,7 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
    return 0;
 }
 
-MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, USHORT   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
+MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16   nID, const rtl::OUString& aCommand, const rtl::OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier )
 {
 }
 
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 8c9cb6fe3d..8265159872 100644..100755
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -79,7 +79,7 @@ using namespace com::sun::star::container;
 //#define RID_SW_SHELLRES (RID_SW_START + 1250 + 1)
 //#define STR_ALLPAGE_HEADFOOT 14
 
-const USHORT ALL_MENUITEM_ID = 1;
+const sal_uInt16 ALL_MENUITEM_ID = 1;
 
 namespace framework
 {
@@ -136,8 +136,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
             {
                 Sequence< rtl::OUString > aSeqNames = xNameContainer->getElementNames();
 
-                USHORT   nId = 2;
-                USHORT  nCount = 0;
+                sal_uInt16   nId = 2;
+                sal_uInt16  nCount = 0;
                 sal_Bool bAllOneState( sal_True );
                 sal_Bool bLastCheck( sal_True );
                 sal_Bool bFirstChecked( sal_False );
@@ -180,7 +180,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
                             
                             // Check if all entries have the same state
                             if( bAllOneState && n && bHeaderIsOn != bLastCheck )
-                                bAllOneState = FALSE;
+                                bAllOneState = sal_False;
                             bLastCheck = bHeaderIsOn;
                             ++nCount;
                         }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index c2268e9560..26643f45a9 100644..100755
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -34,7 +34,7 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include "uielement/toolbar.hxx"
 
 //_________________________________________________________________________________________________________________
@@ -131,7 +131,7 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
 {
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index e6510bef9b..d6b10b856a 100644..100755
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -287,7 +287,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
             if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu )
             {
                 //make a sign for the current language
-                pPopupMenu->CheckItem( nItemId, TRUE );
+                pPopupMenu->CheckItem( nItemId, sal_True );
             }
             aLangMap[ nItemId ] = rStr;
             ++nItemId;
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 9357dfd3a6..c72436560a 100644..100755
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -223,7 +223,7 @@ throw (::com::sun::star::uno::RuntimeException)
             if ( rStr == m_aCurLang )
             {
                 //make a sign for the current language
-                xPopupMenu->checkItem( nItemId, TRUE );
+                xPopupMenu->checkItem( nItemId, sal_True );
             }
             aLangMap[ nItemId ] = rStr;
             ++nItemId;
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 51754eb626..51754eb626 100644..100755
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index 575ae359bb..575ae359bb 100644..100755
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index ff90c4912b..5171dc762c 100644..100755
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -35,7 +35,7 @@
 #include "services.h"
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 #include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -49,6 +49,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <dispatch/uieventloghelper.hxx>
 #include "helper/mischelper.hxx"
+#include "helpid.hrc"
 #include <osl/mutex.hxx>
 
 using namespace com::sun::star::uno;
@@ -102,9 +103,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
     String aDisplayName = RetrieveLabelFromCommand( aCommand );
     pPopupMenu->InsertItem( 2, aDisplayName );
     pPopupMenu->SetItemCommand( 2, aCommand );
-    //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER );
-    pPopupMenu->SetHelpId( 2, 40012 );
-
+    
     // insert providers but not basic or java
     addScriptItems( pPopupMenu, 4);
 }
@@ -184,13 +183,13 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
     return framework::RetrieveLabelFromCommand(aCmdURL,m_xServiceManager,m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
 }
 
-void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId )
+void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
 {
     const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
     const String ellipsis = String::CreateFromAscii( "..." );
     const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor"));
     const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.LanguageScriptProvider"));
-    USHORT itemId = startItemId;
+    sal_uInt16 itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
 
@@ -221,8 +220,6 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt
                     aDisplayName.Append( ellipsis );
                     pPopupMenu->InsertItem( itemId, aDisplayName );
                     pPopupMenu->SetItemCommand( itemId, aCommand );
-                    //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER );
-                    pPopupMenu->SetHelpId( itemId, 40014 );
                     itemId++;
                     break;
                 }
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
deleted file mode 100644
index b74adb1e17..0000000000
--- a/framework/source/uielement/makefile.mk
+++ /dev/null
@@ -1,87 +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=            framework
-TARGET=             fwk_uielement
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :          settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/addonstoolbarmanager.obj            \
-                    $(SLO)$/addonstoolbarwrapper.obj            \
-                    $(SLO)$/buttontoolbarcontroller.obj         \
-                    $(SLO)$/comboboxtoolbarcontroller.obj       \
-                    $(SLO)$/complextoolbarcontroller.obj        \
-                    $(SLO)$/constitemcontainer.obj              \
-                    $(SLO)$/controlmenucontroller.obj           \
-                    $(SLO)$/dropdownboxtoolbarcontroller.obj    \
-                    $(SLO)$/edittoolbarcontroller.obj           \
-                    $(SLO)$/fontmenucontroller.obj              \
-                    $(SLO)$/fontsizemenucontroller.obj          \
-                    $(SLO)$/footermenucontroller.obj            \
-                    $(SLO)$/generictoolbarcontroller.obj        \
-                    $(SLO)$/headermenucontroller.obj            \
-                    $(SLO)$/imagebuttontoolbarcontroller.obj    \
-                    $(SLO)$/itemcontainer.obj                   \
-                    $(SLO)$/langselectionmenucontroller.obj     \
-                    $(SLO)$/langselectionstatusbarcontroller.obj \
-                    $(SLO)$/logoimagestatusbarcontroller.obj    \
-                    $(SLO)$/logotextstatusbarcontroller.obj     \
-                    $(SLO)$/macrosmenucontroller.obj            \
-                    $(SLO)$/menubarmanager.obj                  \
-                    $(SLO)$/menubarmerger.obj                   \
-                    $(SLO)$/menubarwrapper.obj                  \
-                    $(SLO)$/newmenucontroller.obj               \
-                    $(SLO)$/objectmenucontroller.obj            \
-                    $(SLO)$/progressbarwrapper.obj              \
-                    $(SLO)$/recentfilesmenucontroller.obj       \
-                    $(SLO)$/rootitemcontainer.obj               \
-                    $(SLO)$/simpletextstatusbarcontroller.obj   \
-                    $(SLO)$/spinfieldtoolbarcontroller.obj      \
-                    $(SLO)$/statusbar.obj                       \
-                    $(SLO)$/statusbarmanager.obj                \
-                    $(SLO)$/statusbarwrapper.obj                \
-                    $(SLO)$/statusindicatorinterfacewrapper.obj \
-                    $(SLO)$/togglebuttontoolbarcontroller.obj   \
-                    $(SLO)$/toolbar.obj                         \
-                    $(SLO)$/toolbarmanager.obj                  \
-                    $(SLO)$/toolbarmerger.obj                   \
-                    $(SLO)$/toolbarsmenucontroller.obj          \
-                    $(SLO)$/toolbarwrapper.obj                  \
-                    $(SLO)$/popupmenucontroller.obj				\
-                    $(SLO)$/uicommanddescription.obj            \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :          target.mk
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 58e5d6beb9..c34033fbd6 100644..100755
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -34,17 +34,17 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarmanager.hxx>
-#include <xml/menuconfiguration.hxx>
-#include <classes/bmkmenu.hxx>
-#include <classes/addonmenu.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/addonmenu.hxx>
+#include <framework/imageproducer.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include "classes/addonsoptions.hxx"
+#include "framework/addonsoptions.hxx"
 #include <classes/fwkresid.hxx>
 #include <classes/menumanager.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 #include <helper/mischelper.hxx>
-#include <classes/menuextensionsupplier.hxx>
+#include <framework/menuextensionsupplier.hxx>
 #include <classes/resource.hrc>
 #include <services.h>
 
@@ -94,7 +94,7 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <rtl/logfile.hxx>
 #include "svtools/miscopt.hxx"
-#include <classes/addonmenu.hxx>
+#include <framework/addonmenu.hxx>
 #include <uielement/menubarmerger.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
@@ -538,7 +538,7 @@ throw ( RuntimeException )
                 if ( Event.State >>= bCheckmark )
                 {
                     // Checkmark or RadioButton
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
                     m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, bCheckmark );
 
                     MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId );
@@ -572,7 +572,7 @@ throw ( RuntimeException )
                         aItemText = aTmp;
                     }
 
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
                     m_pVCLMenu->SetItemText( pMenuItemHandler->nItemId, aItemText );
                 }
                 else if ( Event.State >>= aVisibilityStatus )
@@ -581,7 +581,7 @@ throw ( RuntimeException )
                     m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, aVisibilityStatus.bVisible );
                 }
                 else
-                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE );
+                    m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True );
             }
 
             if ( Event.Requery )
@@ -594,7 +594,7 @@ throw ( RuntimeException )
 }
 
 // Helper to retrieve own structure from item ID
-MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nItemId )
+MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 nItemId )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetMenuItemHandler" );
     ResetableGuard aGuard( m_aLock );
@@ -820,7 +820,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
     }
 }
 
-static void lcl_CheckForChildren(Menu* pMenu, USHORT nItemId)
+static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
 {
     if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
         pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
@@ -853,7 +853,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         if ( m_bActive )
             return 0;
 
-        m_bActive = TRUE;
+        m_bActive = sal_True;
 
         ::rtl::OUString aMenuCommand( m_aMenuItemCommand );
         if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) ||
@@ -875,9 +875,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         }
 
         // Try to map commands to labels
-        for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
+        for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
-            USHORT nItemId = pMenu->GetItemId( nPos );
+            sal_uInt16 nItemId = pMenu->GetItemId( nPos );
             if (( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) &&
                 ( pMenu->GetItemText( nItemId ).Len() == 0 ))
             {
@@ -1073,8 +1073,8 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     {
         ResetableGuard aGuard( m_aLock );
 
-        USHORT nCurItemId = pMenu->GetCurItemId();
-        USHORT nCurPos    = pMenu->GetItemPos( nCurItemId );
+        sal_uInt16 nCurItemId = pMenu->GetCurItemId();
+        sal_uInt16 nCurPos    = pMenu->GetItemPos( nCurItemId );
         if ( pMenu == m_pVCLMenu &&
              pMenu->GetItemType( nCurPos ) != MENUITEM_SEPARATOR )
         {
@@ -1089,7 +1089,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
 
                 if ( xDesktop.is() )
                 {
-                    USHORT nTaskId = START_ITEMID_WINDOWLIST;
+                    sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
                     Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
                     sal_Int32 nCount = xList->getCount();
                     for ( sal_Int32 i=0; i<nCount; ++i )
@@ -1266,10 +1266,10 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     if ( pMenu->IsMenuBar() && rFrame.is() )
     {
         // First merge all addon popup menus into our structure
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         for ( nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
-            USHORT          nItemId  = pMenu->GetItemId( nPos );
+            sal_uInt16          nItemId  = pMenu->GetItemId( nPos );
             ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId );
             if ( nItemId == SID_MDIWINDOWLIST ||
                  aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) )
@@ -1290,12 +1290,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
     String      aEmpty;
     sal_Bool    bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() );
-    USHORT nItemCount = pMenu->GetItemCount();
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
     ::rtl::OUString aItemCommand;
     m_aMenuItemHandlerVector.reserve(nItemCount);
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
 
         // Set module identifier when provided from outside
         if ( rModuleIdentifier.getLength() > 0 )
@@ -1382,7 +1382,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                          AddonMenuManager::HasAddonMenuElements() )
                 {
                     // Create addon popup menu if there exist elements and this is the tools popup menu
-                    USHORT      nCount   = 0;
+                    sal_uInt16      nCount   = 0;
                     AddonMenu*  pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame );
                     if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
                     {
@@ -1419,7 +1419,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
-                            Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE );
+                            Image aImage = GetImageFromURL( xTemp, aItemCommand, false );
                             if ( !!aImage )
                                    pPopup->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -1449,14 +1449,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                     {
                         // Retrieve image id from menu attributes
-                        aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
+                        aImage = GetImageFromURL( m_xFrame, aImageId, false );
                     }
 
                     if ( !aImage )
                     {
-                        aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE );
+                        aImage = GetImageFromURL( m_xFrame, aItemCommand, false );
                         if ( !aImage )
-                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
+                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, false );
                     }
 
                     if ( !!aImage )
@@ -1692,7 +1692,7 @@ void MenuBarManager::RetrieveImageManagers()
 }
 
 void MenuBarManager::FillMenuWithConfiguration(
-    USHORT&                             nId,
+    sal_uInt16&                             nId,
     Menu*                               pMenu,
     const ::rtl::OUString&              rModuleIdentifier,
     const Reference< XIndexAccess >&    rItemContainer,
@@ -1728,7 +1728,7 @@ void MenuBarManager::FillMenuWithConfiguration(
 }
 
 void MenuBarManager::FillMenu(
-    USHORT&                               nId,
+    sal_uInt16&                               nId,
     Menu*                                 pMenu,
     const rtl::OUString&                  rModuleIdentifier,
     const Reference< XIndexAccess >&      rItemContainer,
@@ -1784,9 +1784,6 @@ void MenuBarManager::FillMenu(
                     pMenu->InsertItem( nId, aLabel );
                     pMenu->SetItemCommand( nId, aCommandURL );
 
-                    sal_Int32 nHelpId = aHelpURL.toInt32();
-                    if ( nHelpId > 0 )
-                        pMenu->SetHelpId( nId, (USHORT)nHelpId );
                     if ( nStyle )
                     {
                         MenuItemBits nBits = pMenu->GetItemBits( nId );
@@ -1808,7 +1805,7 @@ void MenuBarManager::FillMenu(
                             // Use attributes struct to transport special dispatch provider
                             MenuConfiguration::Attributes* pAttributes = new MenuConfiguration::Attributes;
                             pAttributes->xDispatchProvider = xDispatchProvider;
-                            pMenu->SetUserValue( nId, (ULONG)( pAttributes ));
+                            pMenu->SetUserValue( nId, (sal_uIntPtr)( pAttributes ));
                         }
 
                         // Use help command to transport module identifier
@@ -1938,7 +1935,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
         // Remove top-level parts
         m_pVCLMenu->Clear();
 
-        USHORT          nId = 1;
+        sal_uInt16          nId = 1;
 
         // Fill menu bar with container contents
         FillMenuWithConfiguration( nId, (Menu *)m_pVCLMenu, m_aModuleIdentifier, rItemContainer, m_xURLTransformer );
@@ -2006,7 +2003,7 @@ const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
     return mxServiceFactory;
 }
 
-void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId)
+void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::AddMenu" );
     Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
@@ -2023,10 +2020,10 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri
     m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
 }
 
-USHORT MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const
+sal_uInt16 MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillItemCommand" );
-    USHORT nItemId = _pMenu->GetItemId( _nIndex );
+    sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
 
     _rItemCommand = _pMenu->GetItemCommand( nItemId );
     if ( !_rItemCommand.getLength() )
@@ -2056,12 +2053,12 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
 
     Reference< XStatusListener > xStatusListener;
     Reference< XDispatch > xDispatch;
-    USHORT nItemCount = pAddonMenu->GetItemCount();
+    sal_uInt16 nItemCount = pAddonMenu->GetItemCount();
     ::rtl::OUString aItemCommand;
     m_aMenuItemHandlerVector.reserve(nItemCount);
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
+        sal_uInt16 nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
 
         PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
         if ( pPopupMenu )
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index ba0369587f..05acedc387 100644..100755
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_framework.hxx"
 
 #include <uielement/menubarmerger.hxx>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 5b5bc0cbc4..de729453bf 100644..100755
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -34,7 +34,7 @@
 //_________________________________________________________________________________________________________________
 #include <uielement/menubarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <services.h>
 
 //_________________________________________________________________________________________________________________
@@ -182,7 +182,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 if ( m_xConfigData.is() )
                 {
                     // Fill menubar with container contents
-                    USHORT nId = 1;
+                    sal_uInt16 nId = 1;
                     MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans );
                 }
             }
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index f9d69202a8..79bb6fa4bb 100644..100755
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -37,9 +37,9 @@
 #include "services.h"
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
-#include <classes/bmkmenu.hxx>
-#include <helper/imageproducer.hxx>
-#include <xml/menuconfiguration.hxx>
+#include <framework/bmkmenu.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/menuconfiguration.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -96,13 +96,13 @@ DEFINE_INIT_SERVICE                     (   NewMenuController, {} )
 
 void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages )
 {
-    USHORT nItemCount = pPopupMenu->GetItemCount();
+    sal_uInt16 nItemCount = pPopupMenu->GetItemCount();
     Image               aImage;
     Reference< XFrame > xFrame( m_xFrame );
 
-    for ( USHORT i = 0; i < nItemCount; i++ )
+    for ( sal_uInt16 i = 0; i < nItemCount; i++ )
     {
-        USHORT nItemId = pPopupMenu->GetItemId( sal::static_int_cast<USHORT>( i ));
+        sal_uInt16 nItemId = pPopupMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ));
         if ( nItemId != 0 )
         {
             if ( bSetImages )
@@ -116,7 +116,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    aImage = GetImageFromURL( xFrame, aImageId, FALSE );
+                    aImage = GetImageFromURL( xFrame, aImageId, false );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -128,7 +128,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
                 {
                     String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
                     if ( aCmd.Len() )
-                        aImage = GetImageFromURL( xFrame, aCmd, FALSE );
+                        aImage = GetImageFromURL( xFrame, aCmd, false );
 
                     if ( !!aImage )
                         pPopupMenu->SetItemImage( nItemId, aImage );
@@ -142,8 +142,8 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
 void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode )
 {
-    USHORT        nCount( pPopupMenu->GetItemCount() );
-    USHORT        nId( 0 );
+    sal_uInt16        nCount( pPopupMenu->GetItemCount() );
+    sal_uInt16        nId( 0 );
     sal_Bool      bFound( sal_False );
     rtl::OUString aCommand;
 
@@ -153,7 +153,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
 
         for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ )
         {
-            nId = pPopupMenu->GetItemId( USHORT( i ));
+            nId = pPopupMenu->GetItemId( sal_uInt16( i ));
             if ( nId != 0 && pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR )
             {
                 aCommand = pPopupMenu->GetItemCommand( nId );
@@ -175,7 +175,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const
         {
             for ( sal_uInt32 i = 0; i < sal_uInt32( nCount ); i++ )
             {
-                nId = pPopupMenu->GetItemId( USHORT( i ));
+                nId = pPopupMenu->GetItemId( sal_uInt16( i ));
                 if ( nId != 0 && pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR )
                 {
                     aCommand = pPopupMenu->GetItemCommand( nId );
@@ -254,7 +254,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
         std::vector< sal_uInt32 >       aIds;
         for ( sal_uInt32 i = 0; i < nItemCount; i++ )
         {
-            USHORT nId( pPopupMenu->GetItemId( USHORT( i )));
+            sal_uInt16 nId( pPopupMenu->GetItemId( sal_uInt16( i )));
             if ( nId & ( pPopupMenu->GetItemType( nId ) != MENUITEM_SEPARATOR ))
             {
                 aIds.push_back( nId );
@@ -290,7 +290,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
 
         const sal_uInt32 nCount2 = aIds.size();
         for ( sal_uInt32 i = 0; i < nCount2; i++ )
-            pPopupMenu->SetAccelKey( USHORT( aIds[i] ), aMenuShortCuts[i] );
+            pPopupMenu->SetAccelKey( sal_uInt16( aIds[i] ), aMenuShortCuts[i] );
 
         // Special handling for "New" menu short-cut should be set at the
         // document which will be opened using it.
@@ -369,9 +369,9 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
 
         // retrieve additional parameters from bookmark menu and
         // store it in a boost::unordered_map.
-        for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ )
+        for ( sal_uInt16 i = 0; i < pSubMenu->GetItemCount(); i++ )
         {
-            USHORT nItemId = pSubMenu->GetItemId( sal::static_int_cast<USHORT>( i ) );
+            sal_uInt16 nItemId = pSubMenu->GetItemId( sal::static_int_cast<sal_uInt16>( i ) );
             if (( nItemId != 0 ) &&
                 ( pSubMenu->GetItemType( nItemId ) != MENUITEM_SEPARATOR ))
             {
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 30dfd5257c..de6eb8416a 100644..100755
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -105,7 +105,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed:
     if ( pVCLPopupMenu )
     {
         const rtl::OUString aVerbCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ObjectMenue?VerbID:short=" ));
-        for ( USHORT i = 0; i < rVerbCommandSeq.getLength(); i++ )
+        for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ )
         {
             const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i];
             if ( rVerb.VerbAttributes & com::sun::star::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU )
diff --git a/framework/source/uielement/panelwindow.cxx b/framework/source/uielement/panelwindow.cxx
new file mode 100755
index 0000000000..d008ee550d
--- /dev/null
+++ b/framework/source/uielement/panelwindow.cxx
@@ -0,0 +1,77 @@
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <uielement/panelwindow.hxx>
+
+namespace framework
+{
+
+PanelWindow::PanelWindow( Window* pParent, WinBits nWinBits ) :
+    DockingWindow( pParent, nWinBits )
+{
+}
+
+PanelWindow::~PanelWindow()
+{
+}
+        
+const ::rtl::OUString& PanelWindow::getResourceURL() const
+{
+    return m_aResourceURL;
+}
+
+void PanelWindow::setResourceURL(const ::rtl::OUString& rResourceURL)
+{
+    m_aResourceURL = rResourceURL;
+}
+
+Window* PanelWindow::getContentWindow() const
+{
+    return m_pContentWindow;
+}
+
+void PanelWindow::setContentWindow( Window* pContentWindow )
+{
+    m_pContentWindow = pContentWindow;
+    if ( m_pContentWindow != NULL )
+    {
+        m_pContentWindow->SetParent(this);
+        m_pContentWindow->SetSizePixel( GetOutputSizePixel() );
+        m_pContentWindow->Show();
+    }
+}
+
+void PanelWindow::Command( const CommandEvent& rCEvt )
+{
+    if ( m_aCommandHandler.IsSet() )
+        m_aCommandHandler.Call( (void *)( &rCEvt ));
+    DockingWindow::Command( rCEvt );
+}
+
+void PanelWindow::StateChanged( StateChangedType nType )
+{
+    DockingWindow::StateChanged( nType );
+    if ( m_aStateChangedHandler.IsSet() )
+        m_aStateChangedHandler.Call( &nType );
+}
+
+void PanelWindow::DataChanged( const DataChangedEvent& rDCEvt )
+{
+    DockingWindow::DataChanged( rDCEvt );
+    if ( m_aDataChangedHandler.IsSet() )
+        m_aDataChangedHandler.Call( (void*)&rDCEvt );
+}
+
+void PanelWindow::Resize()
+{
+    DockingWindow::Resize();
+    if ( m_pContentWindow )
+        m_pContentWindow->SetSizePixel( GetOutputSizePixel() );
+}
+
+}
diff --git a/framework/source/uielement/panelwrapper.cxx b/framework/source/uielement/panelwrapper.cxx
new file mode 100755
index 0000000000..b20e927c18
--- /dev/null
+++ b/framework/source/uielement/panelwrapper.cxx
@@ -0,0 +1,226 @@
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_framework.hxx"
+//_________________________________________________________________________________________________________________
+//	my own includes
+//_________________________________________________________________________________________________________________
+
+#include <services.h>
+#include <uielement/panelwrapper.hxx>
+#include <threadhelp/resetableguard.hxx>
+#include <uielement/constitemcontainer.hxx>
+#include <uielement/rootitemcontainer.hxx>
+#include <uielement/panelwindow.hxx>
+#include <services/modelwinservice.hxx>
+
+//_________________________________________________________________________________________________________________
+//	interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp>
+#include <com/sun/star/awt/XMenuBar.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/ui/UIElementType.hpp>
+
+//_________________________________________________________________________________________________________________
+//	other includes
+//_________________________________________________________________________________________________________________
+
+#include <toolkit/unohlp.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <comphelper/processfactory.hxx>
+#include <svtools/miscopt.hxx>
+#include <vcl/svapp.hxx>
+#include <rtl/logfile.hxx>
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::frame;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::container;
+using namespace com::sun::star::awt;
+using namespace ::com::sun::star::ui;
+
+namespace framework
+{
+
+PanelWrapper::PanelWrapper( const Reference< XMultiServiceFactory >& xServiceManager ) :
+    UIElementWrapperBase( UIElementType::DOCKINGWINDOW ),
+    m_xServiceManager( xServiceManager ),
+    m_bNoClose(false)
+{
+}
+
+PanelWrapper::~PanelWrapper()
+{
+}
+
+// XInterface
+void SAL_CALL PanelWrapper::acquire() throw()
+{
+    UIElementWrapperBase::acquire();
+}
+
+void SAL_CALL PanelWrapper::release() throw()
+{
+    UIElementWrapperBase::release();
+}
+
+uno::Any SAL_CALL PanelWrapper::queryInterface( const uno::Type & rType ) 
+throw( ::com::sun::star::uno::RuntimeException )
+{
+    return UIElementWrapperBase::queryInterface( rType );
+}
+
+// XComponent
+void SAL_CALL PanelWrapper::dispose() throw ( RuntimeException )
+{
+    Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
+    Reference< XMultiServiceFactory > xSMGR( m_xServiceManager );
+    Reference< XWindow > xWindow;
+
+    {
+        ResetableGuard aLock( m_aLock );
+        if ( m_bDisposed )
+            return;
+        xSMGR = m_xServiceManager;
+    }
+
+    com::sun::star::lang::EventObject aEvent( xThis );
+    m_aListenerContainer.disposeAndClear( aEvent );
+
+    rtl::OUString aModelWinService( SERVICENAME_MODELWINSERVICE );
+    Reference< XNameAccess > xNameAccess( xSMGR->createInstance( aModelWinService ), UNO_QUERY );
+    if ( xNameAccess.is() )
+    {
+        ModelWinService* pService = dynamic_cast< ModelWinService* >( xNameAccess.get() );
+        if ( pService != 0 )
+        {
+            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            PanelWindow* pPanelWindow = dynamic_cast< PanelWindow* >( m_xPanelWindow.get() );
+            if ( pPanelWindow != NULL )
+            {
+                xWindow = VCLUnoHelper::GetInterface( pPanelWindow->getContentWindow() );
+                pService->deregisterModelForXWindow( xWindow );
+            }
+        }
+    }
+
+    ResetableGuard aLock( m_aLock );
+    m_xPanelWindow.clear();
+    m_bDisposed = sal_True;
+}
+
+// XInitialization
+void SAL_CALL PanelWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
+{
+    ResetableGuard aLock( m_aLock );
+
+    if ( m_bDisposed )
+        throw DisposedException();
+    
+    if ( !m_bInitialized )
+    {
+        UIElementWrapperBase::initialize( aArguments );
+
+        sal_Bool bPopupMode( sal_False );
+        Reference< XWindow > xContentWindow;
+        for ( sal_Int32 i = 0; i < aArguments.getLength(); i++ )
+        {
+            PropertyValue aPropValue;
+            if ( aArguments[i] >>= aPropValue )
+            {
+                if ( aPropValue.Name.equalsAsciiL( "PopupMode", 9 ))
+                    aPropValue.Value >>= bPopupMode;
+                else if ( aPropValue.Name.equalsAsciiL( "ContentWindow", 13 ))
+                    aPropValue.Value >>= xContentWindow;
+            }
+        }
+
+        Reference< XFrame > xFrame( m_xWeakFrame );
+        if ( xFrame.is() )
+        {
+            PanelWindow* pPanelWindow(0);
+            Window*      pContentWindow(0);
+            {
+                vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+                Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+                pContentWindow  = VCLUnoHelper::GetWindow( xContentWindow );
+                if ( pWindow )
+                {
+                    sal_uInt32 nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    
+                    pPanelWindow = new PanelWindow( pWindow, nStyles );
+                    m_xPanelWindow = VCLUnoHelper::GetInterface( pPanelWindow );
+                    pPanelWindow->setResourceURL( m_aResourceURL );
+                    pPanelWindow->setContentWindow( pContentWindow );
+                }
+            }
+
+            try
+            {
+            }
+            catch ( NoSuchElementException& )
+            {
+            }
+        }
+    }
+}
+
+// XEventListener
+void SAL_CALL PanelWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+{
+    // nothing todo
+}
+
+// XUpdatable
+void SAL_CALL PanelWrapper::update() throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    
+    if ( m_bDisposed )
+        throw DisposedException();
+}
+
+// XUIElement interface
+Reference< XInterface > SAL_CALL PanelWrapper::getRealInterface(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    ResetableGuard aLock( m_aLock );
+    return m_xPanelWindow;
+}
+
+void SAL_CALL PanelWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any&  aValue ) throw( com::sun::star::uno::Exception )
+{
+    ResetableGuard aLock( m_aLock );
+    sal_Bool bNoClose( m_bNoClose );
+    aLock.unlock();
+
+    UIElementWrapperBase::setFastPropertyValue_NoBroadcast( nHandle, aValue );
+
+    aLock.lock();
+    
+    sal_Bool bNewNoClose( m_bNoClose );
+    if ( m_xPanelWindow.is() && !m_bDisposed && ( bNewNoClose != bNoClose ))
+    {
+        PanelWindow* pPanelWindow = dynamic_cast< PanelWindow* >( VCLUnoHelper::GetWindow( m_xPanelWindow ) );
+        if ( pPanelWindow )
+        {
+            if ( bNewNoClose )
+            {
+                pPanelWindow->SetStyle( pPanelWindow->GetStyle() & ~WB_CLOSEABLE );
+                pPanelWindow->SetFloatStyle( pPanelWindow->GetFloatStyle() & ~WB_CLOSEABLE );
+            }
+            else
+            {
+                pPanelWindow->SetStyle( pPanelWindow->GetStyle() | WB_CLOSEABLE );
+                pPanelWindow->SetFloatStyle( pPanelWindow->GetFloatStyle() | WB_CLOSEABLE );
+            }
+        }
+    }
+}
+
+} // namespace framework
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 32593964b9..5d11df5e71 100644..100755
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -204,7 +204,7 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
             return xRet;
 
         // get selected button
-        USHORT nItemId = pToolBox->GetDownItemId();
+        sal_uInt16 nItemId = pToolBox->GetDownItemId();
         if( !nItemId )
             return xRet;
 
@@ -223,10 +223,10 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
             mxPopupMenuController->updatePopupMenu();
 
         }
-        pToolBox->SetItemDown( nItemId, TRUE );
+        pToolBox->SetItemDown( nItemId, sal_True );
         Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
         mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
-        pToolBox->SetItemDown( nItemId, FALSE );
+        pToolBox->SetItemDown( nItemId, sal_False );
     }
     catch( Exception& )
     {
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 849cfabb96..bc6446ea4f 100644..100755
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -148,13 +148,13 @@ throw (uno::RuntimeException)
                 pStatusBar->StartProgressMode( Text );
             else
             {
-                pStatusBar->SetUpdateMode( FALSE );
+                pStatusBar->SetUpdateMode( sal_False );
                 pStatusBar->EndProgressMode();
                 pStatusBar->StartProgressMode( Text );
-                pStatusBar->SetProgressValue( USHORT( nValue )); 
-                pStatusBar->SetUpdateMode( TRUE );
+                pStatusBar->SetProgressValue( sal_uInt16( nValue )); 
+                pStatusBar->SetUpdateMode( sal_True );
             }
-            pStatusBar->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+            pStatusBar->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
         }
     }
 }
@@ -214,11 +214,11 @@ throw (uno::RuntimeException)
             StatusBar* pStatusBar = (StatusBar *)pWindow;
             if( pStatusBar->IsProgressMode() )
             {
-                pStatusBar->SetUpdateMode( FALSE );
+                pStatusBar->SetUpdateMode( sal_False );
                 pStatusBar->EndProgressMode();
                 pStatusBar->StartProgressMode( Text );
-                pStatusBar->SetProgressValue( USHORT( nValue )); 
-                pStatusBar->SetUpdateMode( TRUE );
+                pStatusBar->SetProgressValue( sal_uInt16( nValue )); 
+                pStatusBar->SetUpdateMode( sal_True );
             }
             else
                 pStatusBar->SetText( Text );
@@ -267,7 +267,7 @@ throw (uno::RuntimeException)
             StatusBar* pStatusBar = (StatusBar *)pWindow;
             if ( !pStatusBar->IsProgressMode() )
                 pStatusBar->StartProgressMode( aText );
-            pStatusBar->SetProgressValue( USHORT( nValue ));
+            pStatusBar->SetProgressValue( sal_uInt16( nValue ));
         }
     }
 }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 7fcbb29053..3708c4fa9f 100644..100755
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -257,9 +257,9 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
 
                 ::rtl::OUString aTitle( aMenuShortCut + aMenuTitle );
 
-                pVCLPopupMenu->InsertItem( USHORT( i+1 ), aTitle );
-                pVCLPopupMenu->SetTipHelpText( USHORT( i+1 ), aTipHelpText );
-                pVCLPopupMenu->SetItemCommand( USHORT( i+1 ), aURLString );
+                pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aTitle );
+                pVCLPopupMenu->SetTipHelpText( sal_uInt16( i+1 ), aTipHelpText );
+                pVCLPopupMenu->SetItemCommand( sal_uInt16( i+1 ), aURLString );
             }
         }
         else
@@ -267,7 +267,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             // No recent documents => insert "no document" string
             String aNoDocumentStr = String( FwkResId( STR_NODOCUMENT ));
             pVCLPopupMenu->InsertItem( 1, aNoDocumentStr );
-            pVCLPopupMenu->EnableItem( 1, FALSE );
+            pVCLPopupMenu->EnableItem( 1, sal_False );
         }
     }
 }
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index 8f6fd07fc3..8f6fd07fc3 100644..100755
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index b5eed582ed..003a89b299 100644..100755
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -200,7 +200,7 @@ SpinfieldToolbarController::SpinfieldToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     sal_Int32                                nWidth,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 66090061df..66090061df 100644..100755
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index b172d4473b..7242d945fd 100644..100755
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -36,7 +36,7 @@
 //_________________________________________________________________________________________________________________
 #include <threadhelp/threadhelpbase.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
@@ -92,9 +92,9 @@ static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
 namespace framework
 {
 
-static USHORT impl_convertItemStyleToItemBits( sal_Int16 nStyle )
+static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle )
 {
-    USHORT nItemBits( 0 );
+    sal_uInt16 nItemBits( 0 );
 
     if (( nStyle & css_ui::ItemStyle::ALIGN_RIGHT ) == css_ui::ItemStyle::ALIGN_RIGHT )
         nItemBits |= SIB_RIGHT;
@@ -362,9 +362,9 @@ void StatusBarManager::CreateControllers()
     if ( xProps.is() )
         xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext;
     
-    for ( USHORT i = 0; i < m_pStatusBar->GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ )
     {
-        USHORT nId = m_pStatusBar->GetItemId( i );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( i );
         if ( nId == 0 )
             continue;
         
@@ -470,7 +470,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
     if ( m_bDisposed || !m_pStatusBar )
         return;
 
-    USHORT         nId( 1 );
+    sal_uInt16         nId( 1 );
     rtl::OUString  aHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ));
 
     RemoveControllers();
@@ -525,21 +525,11 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
                 if (( nType == ::com::sun::star::ui::ItemType::DEFAULT ) && ( aCommandURL.getLength() > 0 ))
                 {
                     rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL ));
-                    USHORT        nItemBits( impl_convertItemStyleToItemBits( nStyle ));
+                    sal_uInt16        nItemBits( impl_convertItemStyleToItemBits( nStyle ));
                     
                     m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset );
                     m_pStatusBar->SetItemCommand( nId, aCommandURL );
                     m_pStatusBar->SetAccessibleName( nId, aString );
-//                    m_pStatusBar->SetHelpText( nId, aString );
-                    
-                    if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 )
-                    {
-                        rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH ));
-                        sal_uInt16    nHelpId = (sal_uInt16)(aId.toInt32());
-                        if ( nHelpId > 0 )
-                            m_pStatusBar->SetHelpId( nId, nHelpId );
-                    }
-                    
                     ++nId;
                 }
             }
@@ -593,7 +583,7 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
     if ( m_bDisposed )
         return;
     
-    USHORT nId( rUDEvt.GetItemId() );
+    sal_uInt16 nId( rUDEvt.GetItemId() );
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController( 
@@ -623,7 +613,7 @@ void StatusBarManager::Command( const CommandEvent& rEvt )
     
     if ( rEvt.GetCommand() == COMMAND_CONTEXTMENU )
     {
-        USHORT nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() );
         if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
         {
             uno::Reference< frame::XStatusbarController > xController(
@@ -651,7 +641,7 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL
     
     if ( !m_bDisposed )
     {
-        USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
+        sal_uInt16 nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() );
         if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
         {
             uno::Reference< frame::XStatusbarController > xController( 
@@ -687,7 +677,7 @@ IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
     
-    USHORT nId = m_pStatusBar->GetCurItemId();
+    sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController( 
@@ -706,7 +696,7 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
     
-    USHORT nId = m_pStatusBar->GetCurItemId();
+    sal_uInt16 nId = m_pStatusBar->GetCurItemId();
     if (( nId > 0 ) && ( nId <= m_aControllerVector.size() ))
     {
         uno::Reference< frame::XStatusbarController > xController(
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 436a813a14..bc64615a47 100644..100755
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -35,7 +35,7 @@
 //	my own includes
 //_________________________________________________________________________________________________________________
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/statusbar.hxx>
@@ -130,7 +130,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WinBits( WB_LEFT | WB_3DLOOK );
+                    sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
 
                     pStatusBar = new FrameworkStatusBar( pWindow, nStyles );
                     pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar );
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index aca204ff22..aca204ff22 100644..100755
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 34b4a05fdf..e6ed3dfaa1 100644..100755
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -34,7 +34,7 @@
 //_________________________________________________________________________________________________________________
 //	my own includes
 //_________________________________________________________________________________________________________________
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include "uielement/toolbar.hxx"
 
 //_________________________________________________________________________________________________________________
@@ -82,7 +82,7 @@ ToggleButtonToolbarController::ToggleButtonToolbarController(
     const Reference< XMultiServiceFactory >& rServiceManager,
     const Reference< XFrame >&               rFrame,
     ToolBox*                                 pToolbar,
-    USHORT                                   nID,
+    sal_uInt16                                   nID,
     Style                                    eStyle,
     const ::rtl::OUString&                          aCommand ) :
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ),
@@ -146,10 +146,10 @@ throw (::com::sun::star::uno::RuntimeException)
                 aPopup.CheckItem( sal_uInt16( i+1 ), sal_False );
         }
 
-        m_pToolbar->SetItemDown( m_nID, TRUE );
+        m_pToolbar->SetItemDown( m_nID, sal_True );
         aPopup.SetSelectHdl( LINK( this, ToggleButtonToolbarController, MenuSelectHdl ));
         aPopup.Execute( m_pToolbar, m_pToolbar->GetItemRect( m_nID ));
-        m_pToolbar->SetItemDown( m_nID, FALSE );
+        m_pToolbar->SetItemDown( m_nID, sal_False );
     }
 
     return xWindow;
diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index 2136c8ff84..2136c8ff84 100644..100755
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 3d5550416e..0c016a6435 100644..100755
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -41,13 +41,13 @@
 #include "services.h"
 #include "general.h"
 #include "properties.h"
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 #include <classes/fwkresid.hxx>
 #include <classes/resource.hrc>
-#include <classes/addonsoptions.hxx>
+#include <framework/addonsoptions.hxx>
 #include <uielement/toolbarmerger.hxx>
-#include <helper/acceleratorinfo.hxx>
+#include <framework/acceleratorinfo.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -135,7 +135,7 @@ static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN       = RTL_CONSTASCII_LENGTH(I
 
 static const char   HELPID_PREFIX[]                 = "helpid:";
 static const char   HELPID_PREFIX_TESTTOOL[]        = ".HelpId:";
-static const USHORT STARTID_CUSTOMIZE_POPUPMENU     = 1000;
+static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU     = 1000;
 
 #define MENUPREFIX "private:resource/menubar/"
 
@@ -283,7 +283,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
 
     // enables a menu for clipped items and customization
     SvtCommandOptions aCmdOptions;
-    USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
+    sal_uInt16 nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
     if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog"))))
          nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
     //added for issue33668 by shizhoubo
@@ -297,10 +297,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     // set name for testtool, the useful part is after the last '/'
     sal_Int32 idx = rResourceName.lastIndexOf('/');
     idx++; // will become 0 if '/' not found: use full string
-    ::rtl::OUString  aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL ));
+    ::rtl::OString  aHelpIdAsString( HELPID_PREFIX_TESTTOOL );
     ::rtl::OUString  aToolbarName = rResourceName.copy( idx );
-    aHelpIdAsString += aToolbarName;
-    m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) );
+    aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );;
+    m_pToolBar->SetHelpId( aHelpIdAsString );
 
     m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
     m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
@@ -390,9 +390,9 @@ void ToolBarManager::RefreshImages()
     ResetableGuard aGuard( m_aLock );
 
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId( m_pToolBar->GetItemId( nPos ) );
+        sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
 
         if ( nId > 0 )
         {
@@ -442,9 +442,9 @@ void ToolBarManager::UpdateImageOrientation()
         }
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
     {
-        USHORT nId = m_pToolBar->GetItemId( nPos );
+        sal_uInt16 nId = m_pToolBar->GetItemId( nPos );
         if ( nId > 0 )
         {
             rtl::OUString aCmd = m_pToolBar->GetItemCommand( nId );
@@ -454,7 +454,7 @@ void ToolBarManager::UpdateImageOrientation()
             {
                 if ( pIter->second.bRotated )
                 {
-                    m_pToolBar->SetItemImageMirrorMode( nId, FALSE );
+                    m_pToolBar->SetItemImageMirrorMode( nId, sal_False );
                     m_pToolBar->SetItemImageAngle( nId, m_lImageRotation );
                 }
                 if ( pIter->second.bMirrored )
@@ -796,7 +796,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
 }
 void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter)
 {
-    const ::std::vector< USHORT >& _rIDs = _pIter->second.aIds;
+    const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds;
     m_pToolBar->SetItemImage( _pIter->second.nId, _aImage );
     ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBar::SetItemImage,m_pToolBar,_1,_aImage));
 }
@@ -931,22 +931,22 @@ void ToolBarManager::CreateControllers()
     if ( xProps.is() )
         xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext;
 
-    for ( USHORT i = 0; i < m_pToolBar->GetItemCount(); i++ )
+    for ( sal_uInt16 i = 0; i < m_pToolBar->GetItemCount(); i++ )
     {
-        USHORT nId = m_pToolBar->GetItemId( i );
+        sal_uInt16 nId = m_pToolBar->GetItemId( i );
         if ( nId == 0 )
             continue;
 
-        sal_Int16                    nWidth( sal_Int16( m_pToolBar->GetHelpId( nId )));
         rtl::OUString                aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" ));
         rtl::OUString                aCommandURL( m_pToolBar->GetItemCommand( nId ));
         sal_Bool                     bInit( sal_True );
         sal_Bool                     bCreate( sal_True );
         Reference< XStatusListener > xController;
+        CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL );
+        sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 );
 
         svt::ToolboxController* pController( 0 );
 
-        m_pToolBar->SetHelpId( nId, 0 ); // reset value again
         if ( bHasDisabledEntries )
         {
             aURL.Complete = aCommandURL;
@@ -1228,7 +1228,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
     if ( m_bDisposed )
         return;
 
-    USHORT    nId( 1 );
+    sal_uInt16    nId( 1 );
     ::rtl::OUString  aHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ));
 
     Reference< XModuleManager > xModuleManager( Reference< XModuleManager >(
@@ -1395,6 +1395,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     if ( pIter == m_aCommandMap.end())
                     {
                         aCmdInfo.nId = nId;
+                        aCmdInfo.nWidth = nWidth;
                         m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo ));
                     }
                     else
@@ -1402,9 +1403,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                         pIter->second.aIds.push_back( nId );
                     }
 
-                    // Add additional information for the controller to the obsolete help id
-                    m_pToolBar->SetHelpId( ULONG( nWidth ));
-
                     if ( !bIsVisible )
                         m_pToolBar->HideItem( nId );
 
@@ -1619,7 +1617,7 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )(
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1643,7 +1641,7 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG )
     if ( m_bDisposed )
         return 1;
 
-    USHORT nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16 nId( m_pToolBar->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
     {
@@ -1683,7 +1681,7 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
     }
 
     // remove all items that were not added by the toolbar itself
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i<pMenu->GetItemCount(); )
     {
         if( pMenu->GetItemId( i ) < TOOLBOX_MENUITEM_START )
@@ -1769,7 +1767,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
 
     if ( m_pToolBar->IsCustomize() )
     {
-        USHORT      nPos( 0 );
+        sal_uInt16      nPos( 0 );
         PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
 
         sal_Bool    bIsFloating( sal_False );
@@ -1810,7 +1808,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
         {
             if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
             {
-                USHORT nId = m_pToolBar->GetItemId(nPos);
+                sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
                 ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
                 pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), MIB_CHECKABLE );
                 pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
@@ -1827,7 +1825,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
     }
     else
     {
-        USHORT nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
+        sal_uInt16 nPos = aPopupMenu.GetItemPos( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR );
         if ( nPos != MENU_ITEM_NOTFOUND )
             aPopupMenu.RemoveItem( nPos );
     }
@@ -1836,7 +1834,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
     if( pMenu->GetItemCount() )
         pMenu->InsertSeparator();
 
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i< aPopupMenu.GetItemCount(); i++)
     {
         sal_uInt16 nId = aPopupMenu.GetItemId( i );
@@ -1995,7 +1993,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
 
             default:
             {
-                USHORT nId = pMenu->GetCurItemId();
+                sal_uInt16 nId = pMenu->GetCurItemId();
                 if(( nId > 0 ) && ( nId < TOOLBOX_MENUITEM_START ))
                 {
                     // toggle toolbar button visibility
@@ -2077,7 +2075,7 @@ IMPL_LINK( ToolBarManager, Select, ToolBox*, EMPTYARG )
         return 1;
 
     sal_Int16   nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() );
-    USHORT      nId( m_pToolBar->GetCurItemId() );
+    sal_uInt16      nId( m_pToolBar->GetCurItemId() );
 
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
     if ( pIter != m_aControllerMap.end() )
@@ -2136,9 +2134,9 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         CheckAndUpdateImages();
     }
 
-    for ( USHORT nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
-        const USHORT nId = m_pToolBar->GetItemId(nPos);
+        const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
         Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index b044141331..f46d9130d5 100644..100755
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -31,7 +31,7 @@
 
 #include <uielement/toolbarmerger.hxx>
 #include <uielement/generictoolbarcontroller.hxx>
-#include <helper/imageproducer.hxx>
+#include <framework/imageproducer.hxx>
 
 #include <svtools/miscopt.hxx>
 
@@ -87,7 +87,7 @@ static const char TOOLBARCONTROLLER_TOGGLEDDBTN[]         = "ToggleDropdownButto
 static const sal_uInt32 TOOLBARCONTROLLER_TOGGLEDDBTN_LEN = 20;
 
 static const char   TOOLBOXITEM_SEPARATOR_STR[]   = "private:separator";
-static const USHORT TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
+static const sal_uInt16 TOOLBOXITEM_SEPARATOR_STR_LEN = sizeof( TOOLBOXITEM_SEPARATOR_STR )-1;
 
 using namespace ::com::sun::star;
 
@@ -513,7 +513,6 @@ bool ToolBarMerger::MergeItems(
                 pToolbar->InsertSeparator( sal_uInt16( nInsPos ));
             else
             {
-                ToolBarMerger::CreateToolbarItem( pToolbar, sal_uInt16( nInsPos ), rItemId, rItem );
                 CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
                 if ( pIter == rCommandMap.end())
                 {
@@ -525,6 +524,8 @@ bool ToolBarMerger::MergeItems(
                 {
                     pIter->second.aIds.push_back( rItemId );
                 }
+
+                ToolBarMerger::CreateToolbarItem( pToolbar, rCommandMap, sal_uInt16( nInsPos ), rItemId, rItem );
             }
 
             ++nIndex;
@@ -692,7 +693,7 @@ bool ToolBarMerger::RemoveItems(
     return pResult;
 }
 
-void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
+void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
 {
     pToolbar->InsertItem( nItemId, rItem.aLabel, 0, nPos );
     pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );
@@ -701,8 +702,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u
     pToolbar->EnableItem( nItemId, sal_True );
     pToolbar->SetItemState( nItemId, STATE_NOCHECK );
 
-    // Use obsolete help id to transport the width of the item
-    pToolbar->SetHelpId( nItemId, rItem.nWidth );
+    CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
+    if ( pIter != rCommandMap.end() )
+        pIter->second.nWidth = rItem.nWidth;
 
     // Use the user data to store add-on specific data with the toolbar item
     AddonsParams* pAddonParams = new AddonsParams;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 3aa25e7ec8..d0211ac422 100644..100755
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -40,8 +40,8 @@
 #include <classes/resource.hrc>
 #include <classes/fwkresid.hxx>
 #include <uiconfiguration/windowstateconfiguration.hxx>
-#include <helper/imageproducer.hxx>
-#include <classes/sfxhelperfunctions.hxx>
+#include <framework/imageproducer.hxx>
+#include <framework/sfxhelperfunctions.hxx>
 
 //_________________________________________________________________________________________________________________
 //	interface includes
@@ -175,9 +175,9 @@ ToolbarsMenuController::~ToolbarsMenuController()
 }
 
 void ToolbarsMenuController::addCommand(
-    Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& rLabel )
+    Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& rLabel )
 {
-    USHORT        nItemId    = m_xPopupMenu->getItemCount()+1;
+    sal_uInt16        nItemId    = m_xPopupMenu->getItemCount()+1;
 
     rtl::OUString aLabel;
     if ( rLabel.getLength() == 0 )
@@ -202,7 +202,7 @@ void ToolbarsMenuController::addCommand(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
     if ( rSettings.GetUseImagesInMenus() )
-        aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE );
+        aImage = GetImageFromURL( m_xFrame, rCommandURL, false );
 
     VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
     if ( pPopupMenu )
@@ -210,7 +210,6 @@ void ToolbarsMenuController::addCommand(
         PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
         if ( !!aImage )
             pVCLPopupMenu->SetItemImage( nItemId, aImage );
-        pVCLPopupMenu->SetHelpId( nItemId, nHelpId );
     }
 
     m_aCommandVector.push_back( rCommandURL );
@@ -469,7 +468,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         const sal_uInt32 nCount = aSortedTbs.size();
         for ( sal_uInt32 i = 0; i < nCount; i++ )
         {
-            USHORT nItemCount = m_xPopupMenu->getItemCount();
+            sal_uInt16 nItemCount = m_xPopupMenu->getItemCount();
             m_xPopupMenu->insertItem( nIndex, aSortedTbs[i].aUIName, css::awt::MenuItemStyle::CHECKABLE, nItemCount );
             if ( aSortedTbs[i].bVisible )
                 m_xPopupMenu->checkItem( nIndex, sal_True );
@@ -479,7 +478,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
                 VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
                 PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
-                pVCLPopupMenu->SetUserValue( nIndex, ULONG( aSortedTbs[i].bContextSensitive ? 1L : 0L ));
+                pVCLPopupMenu->SetUserValue( nIndex, sal_uIntPtr( aSortedTbs[i].bContextSensitive ? 1L : 0L ));
             }
 
             // use VCL popup menu pointer to set vital information that are not part of the awt implementation
@@ -507,11 +506,11 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
         {
             if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ||
                  m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ))
-                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), 10417, aEmptyString );
+                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), aEmptyString );
             else if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ))
-                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), 26241, aEmptyString );
+                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), aEmptyString );
             else
-                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), 20128, aEmptyString );
+                addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), aEmptyString );
         }
 
         sal_Bool          bAddCommand( sal_True );
@@ -530,11 +529,11 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             // Create command for configure
             if ( m_xPopupMenu->getItemCount() > 0 )
             {
-                USHORT        nItemCount = m_xPopupMenu->getItemCount();
+                sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
                 m_xPopupMenu->insertSeparator( nItemCount+1 );
             }
 
-            addCommand( m_xPopupMenu, aConfigureToolbar, 5904, aEmptyString );
+            addCommand( m_xPopupMenu, aConfigureToolbar, aEmptyString );
         }
 
         // Add separator if no configure has been added
@@ -543,14 +542,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
             // Create command for configure
             if ( m_xPopupMenu->getItemCount() > 0 )
             {
-                USHORT        nItemCount = m_xPopupMenu->getItemCount();
+                sal_uInt16        nItemCount = m_xPopupMenu->getItemCount();
                 m_xPopupMenu->insertSeparator( nItemCount+1 );
             }
         }
 
         String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS ));
         rtl::OUString aRestoreCmd( RTL_CONSTASCII_USTRINGPARAM( CMD_RESTOREVISIBILITY ));
-        addCommand( m_xPopupMenu, aRestoreCmd, 9999, aLabelStr );
+        addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr );
     }
 }
 
@@ -590,9 +589,9 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
         VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu );
         PopupMenu*     pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu();
 
-        for ( USHORT i = 0; i < pVCLPopupMenu->GetItemCount(); i++ )
+        for ( sal_uInt16 i = 0; i < pVCLPopupMenu->GetItemCount(); i++ )
         {
-            USHORT nId = pVCLPopupMenu->GetItemId( i );
+            sal_uInt16 nId = pVCLPopupMenu->GetItemId( i );
             if ( nId == 0 )
                 continue;
 
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 49f7970c2b..d9f297aec0 100644..100755
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -35,7 +35,7 @@
 
 #include <uielement/toolbarwrapper.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include <helper/actiontriggerhelper.hxx>
+#include <framework/actiontriggerhelper.hxx>
 #include <uielement/constitemcontainer.hxx>
 #include <uielement/rootitemcontainer.hxx>
 #include <uielement/toolbarmanager.hxx>
@@ -175,7 +175,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 if ( pWindow )
                 {
-                    ULONG nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
+                    sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar );
@@ -194,7 +194,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                     // Fill toolbar with container contents
                     pToolBarManager->FillToolbar( m_xConfigData );
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
@@ -209,7 +209,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
                 if ( pToolBar && pToolBarManager )
                 {
                     pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() );
-                    pToolBar->EnableCustomize( TRUE );
+                    pToolBar->EnableCustomize( sal_True );
                     ::Size aActSize( pToolBar->GetSizePixel() );
                     ::Size aSize( pToolBar->CalcWindowSizePixel() );
                     aSize.Width() = aActSize.Width();
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 4594f3a07f..bd27d2979e 100644..100755
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -145,6 +145,8 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ
         virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException);
 
     protected:
+        virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const ::rtl::OUString& aName );
+
         struct CmdToInfoMap
         {
             CmdToInfoMap() : bPopup( false ),
@@ -255,9 +257,9 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
         xContainer->removeContainerListener(m_xConfigAccessListener);
 }
 
+
 // XNameAccess
-Any SAL_CALL ConfigurationAccess_UICommand::getByName( const ::rtl::OUString& rCommandURL )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
+Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const ::rtl::OUString& rCommandURL )
 {
     static sal_Int32 nRequests  = 0;
 
@@ -282,19 +284,24 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
         else if ( rCommandURL.equalsIgnoreAsciiCaseAscii( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ))
             return makeAny( m_aCommandMirrorImageList );
         else
-            throw NoSuchElementException();
+            return Any();
     }
     else
     {
         // SAFE
         ++nRequests;
-        Any a = getInfoFromCommand( rCommandURL );
+        return getInfoFromCommand( rCommandURL );
+    }
+}
 
-        if ( !a.hasValue() )
-            throw NoSuchElementException();
+Any SAL_CALL ConfigurationAccess_UICommand::getByName( const ::rtl::OUString& rCommandURL )
+throw ( NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    Any aRet( getByNameImpl( rCommandURL ) );
+    if( !aRet.hasValue() )
+        throw NoSuchElementException();
 
-        return a;
-    }
+    return aRet;
 }
 
 Sequence< ::rtl::OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames()
@@ -306,7 +313,7 @@ throw ( RuntimeException )
 sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const ::rtl::OUString& rCommandURL )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    return getByName( rCommandURL ).hasValue();
+    return getByNameImpl( rCommandURL ).hasValue();
 }
 
 // XElementAccess
@@ -472,7 +479,7 @@ Any ConfigurationAccess_UICommand::getInfoFromCommand( const rtl::OUString& rCom
         {
             // First try to ask our global commands configuration access. It also caches maybe
             // we find the entry in its cache first.
-            if ( m_xGenericUICommands.is() )
+            if ( m_xGenericUICommands.is() && m_xGenericUICommands->hasByName( rCommandURL ) )
             {
                 try
                 {
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 713449c602..713449c602 100644..100755
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 2f96a265c0..2f96a265c0 100644..100755
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk
deleted file mode 100644
index cf820e9873..0000000000
--- a/framework/source/uifactory/makefile.mk
+++ /dev/null
@@ -1,54 +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=framework
-TARGET=	fwk_uifactory
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=			\
-                    $(SLO)$/popupmenucontrollerfactory.obj  \
-                    $(SLO)$/uielementfactorymanager.obj     \
-                    $(SLO)$/menubarfactory.obj              \
-                    $(SLO)$/toolboxfactory.obj              \
-                    $(SLO)$/addonstoolboxfactory.obj        \
-                    $(SLO)$/toolbarcontrollerfactory.obj    \
-                    $(SLO)$/statusbarfactory.obj            \
-                    $(SLO)$/statusbarcontrollerfactory.obj	\
-                    $(SLO)$/factoryconfiguration.obj        \
-                    $(SLO)$/windowcontentfactorymanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 4ae733e4e1..4ae733e4e1 100644..100755
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 2011f9f368..2011f9f368 100644..100755
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index fc2fa1f75a..fc2fa1f75a 100644..100755
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 2fddb309f6..2fddb309f6 100644..100755
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index b56252c3f4..b56252c3f4 100644..100755
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 21bf2ae567..21bf2ae567 100644..100755
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index ed3889d5dd..ed3889d5dd 100644..100755
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index cea43a2a65..cea43a2a65 100644..100755
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml
index 081c7cb05f..081c7cb05f 100644..100755
--- a/framework/source/unotypes/fwk.xml
+++ b/framework/source/unotypes/fwk.xml
diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml
index 613fcee878..613fcee878 100644..100755
--- a/framework/source/unotypes/fwl.xml
+++ b/framework/source/unotypes/fwl.xml
diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml
index a3256a7940..a3256a7940 100644..100755
--- a/framework/source/unotypes/lgd.xml
+++ b/framework/source/unotypes/lgd.xml
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 5ddfa4d6b4..5ddfa4d6b4 100644..100755
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 3b1ffb8d95..3b1ffb8d95 100644..100755
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
deleted file mode 100644
index a4f18a555a..0000000000
--- a/framework/source/xml/makefile.mk
+++ /dev/null
@@ -1,58 +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=			framework
-TARGET=				fwk_xml
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-SLOFILES=		\
-                $(SLO)$/eventsconfiguration.obj				\
-                $(SLO)$/eventsdocumenthandler.obj			\
-                $(SLO)$/imagesconfiguration.obj				\
-                $(SLO)$/imagesdocumenthandler.obj			\
-                $(SLO)$/menuconfiguration.obj				\
-                $(SLO)$/menudocumenthandler.obj				\
-                $(SLO)$/statusbarconfiguration.obj			\
-                $(SLO)$/statusbardocumenthandler.obj		\
-                $(SLO)$/toolboxconfiguration.obj			\
-                $(SLO)$/toolboxdocumenthandler.obj			\
-                $(SLO)$/saxnamespacefilter.obj				\
-                $(SLO)$/xmlnamespaces.obj                   \
-                $(SLO)$/acceleratorconfigurationreader.obj  \
-                $(SLO)$/acceleratorconfigurationwriter.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
deleted file mode 100644
index df4adda7c2..0000000000
--- a/framework/test/makefile.mk
+++ /dev/null
@@ -1,70 +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=			framework
-TARGET=				test
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- application: "threadtest" --------------------------------------------------
-
-APP2TARGET= 	threadtest
-
-APP2OBJS=		$(SLO)$/threadtest.obj				\
-                $(SLO)$/transactionmanager.obj		\
-                $(SLO)$/transactionguard.obj		\
-                $(SLO)$/fairrwlock.obj				\
-                $(SLO)$/resetableguard.obj			\
-                $(SLO)$/gate.obj					\
-                $(SLO)$/readguard.obj				\
-                $(SLO)$/writeguard.obj
-
-DEPOBJFILES+= $(APP2OBJS)
-
-APP2STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(VCLLIB)
-
-APP2DEPN=		$(SLO)$/fairrwlock.obj				\
-                $(SLO)$/transactionmanager.obj		\
-                $(SLO)$/transactionguard.obj		\
-                $(SLO)$/resetableguard.obj			\
-                $(SLO)$/gate.obj					\
-                $(SLO)$/readguard.obj				\
-                $(SLO)$/writeguard.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index f69a9f175f..f69a9f175f 100644..100755
--- a/framework/test/test.cxx
+++ b/framework/test/test.cxx
diff --git a/framework/test/test_componentenumeration.bas b/framework/test/test_componentenumeration.bas
index 77b64bb969..77b64bb969 100644..100755
--- a/framework/test/test_componentenumeration.bas
+++ b/framework/test/test_componentenumeration.bas
diff --git a/framework/test/test_documentproperties.bas b/framework/test/test_documentproperties.bas
index 15e4f62a29..15e4f62a29 100644..100755
--- a/framework/test/test_documentproperties.bas
+++ b/framework/test/test_documentproperties.bas
diff --git a/framework/test/test_filterregistration.bas b/framework/test/test_filterregistration.bas
index 47a19acfc3..47a19acfc3 100644..100755
--- a/framework/test/test_filterregistration.bas
+++ b/framework/test/test_filterregistration.bas
diff --git a/framework/test/test_statusindicatorfactory.bas b/framework/test/test_statusindicatorfactory.bas
index e82590fb76..e82590fb76 100644..100755
--- a/framework/test/test_statusindicatorfactory.bas
+++ b/framework/test/test_statusindicatorfactory.bas
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index 88d20041b1..88d20041b1 100644..100755
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
deleted file mode 100644
index 467f628890..0000000000
--- a/framework/test/threadtest/makefile.mk
+++ /dev/null
@@ -1,66 +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=			framework
-TARGET=				threadtest
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- application: "threadtest" --------------------------------------------------
-
-APP1TARGET= 	threadtest
-
-APP1OBJS=       $(SLO)$/threadtest.obj \
-                $(SLO)$/lockhelper.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-# [ed] 6/16/02 Add the transaction manager library on OS X
-
-APP1STDLIBS=	$(CPPULIB) \
-                $(CPPUHELPERLIB) \
-                $(SALLIB) \
-                $(VCLLIB)
-
-APP1DEPN=       $(INC)$/threadhelp$/threadhelpbase.hxx			\
-                $(INC)$/threadhelp$/transactionbase.hxx			\
-                $(INC)$/threadhelp$/transactionmanager.hxx		\
-                $(INC)$/threadhelp$/transactionguard.hxx		\
-                $(INC)$/threadhelp$/resetableguard.hxx			\
-                $(INC)$/threadhelp$/readguard.hxx				\
-                $(INC)$/threadhelp$/writeguard.hxx
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/test/threadtest/test.btm b/framework/test/threadtest/test.btm
index 627c756893..627c756893 100644..100755
--- a/framework/test/threadtest/test.btm
+++ b/framework/test/threadtest/test.btm
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 9d86d072e4..9d86d072e4 100644..100755
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
diff --git a/framework/test/typecfg/build.btm b/framework/test/typecfg/build.btm
index f984a11462..f984a11462 100644..100755
--- a/framework/test/typecfg/build.btm
+++ b/framework/test/typecfg/build.btm
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index bbad8a374f..bbad8a374f 100644..100755
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
deleted file mode 100644
index 730febefdd..0000000000
--- a/framework/test/typecfg/makefile.mk
+++ /dev/null
@@ -1,72 +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=			framework
-TARGET=             typecfg
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- applikation: "xml2xcd" --------------------------------------------------
-
-# --- applikation: "cfgview" --------------------------------------------------
-
-APP2TARGET=     cfgview
-
-APP2OBJS=		$(SLO)$/cfgview.obj					\
-                $(SLO)$/servicemanager.obj			\
-                $(SLO)$/filtercachedata.obj			\
-                $(SLO)$/filtercache.obj				\
-                $(SLO)$/wildcard.obj				\
-                $(SLO)$/lockhelper.obj
-
-DEPOBJFILES=$(APP2OBJS)
-
-APP2STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(TOOLSLIB) 						\
-                $(SVTOOLLIB)						\
-                $(TKLIB)							\
-                $(COMPHELPERLIB)					\
-                $(UNOTOOLSLIB)						\
-                $(VCLLIB)
-
-APP2DEPN=		$(SLO)$/servicemanager.obj			\
-                $(SLO)$/filtercachedata.obj			\
-                $(SLO)$/filtercache.obj				\
-                $(SLO)$/wildcard.obj				\
-                $(SLO)$/lockhelper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index 4f1c0cd30c..4f1c0cd30c 100644..100755
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index 420da0ee6b..420da0ee6b 100644..100755
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index 5ac4c3eb4b..5ac4c3eb4b 100644..100755
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
diff --git a/framework/uiconfig/startmodule/statusbar/statusbar.xml b/framework/uiconfig/startmodule/statusbar/statusbar.xml
index 7b15360f97..7b15360f97 100644..100755
--- a/framework/uiconfig/startmodule/statusbar/statusbar.xml
+++ b/framework/uiconfig/startmodule/statusbar/statusbar.xml
diff --git a/framework/uiconfig/startmodule/toolbar/standardbar.xml b/framework/uiconfig/startmodule/toolbar/standardbar.xml
index 4d50afc657..4d50afc657 100644..100755
--- a/framework/uiconfig/startmodule/toolbar/standardbar.xml
+++ b/framework/uiconfig/startmodule/toolbar/standardbar.xml
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
new file mode 100755
index 0000000000..c460ecbccd
--- /dev/null
+++ b/framework/util/fwk.component
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.frame.SessionListener">
+    <service name="com.sun.star.frame.SessionListener"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.AddonsToolBarFactory">
+    <service name="com.sun.star.ui.ToolBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.AutoRecovery">
+    <service name="com.sun.star.frame.AutoRecovery"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.BackingComp">
+    <service name="com.sun.star.frame.StartModule"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ControlMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.Desktop">
+    <service name="com.sun.star.frame.Desktop"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
+    <service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.Frame">
+    <service name="com.sun.star.frame.Frame"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.GlobalAcceleratorConfiguration">
+    <service name="com.sun.star.ui.GlobalAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ImageManager">
+    <service name="com.sun.star.ui.ImageManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.JobExecutor">
+    <service name="com.sun.star.task.JobExecutor"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LangSelectionStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LayoutManager">
+    <service name="com.sun.star.frame.LayoutManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MenuBarFactory">
+    <service name="com.sun.star.ui.UIElementFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleAcceleratorConfiguration">
+    <service name="com.sun.star.ui.ModuleAcceleratorConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleManager">
+    <service name="com.sun.star.frame.ModuleManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager">
+    <service name="com.sun.star.ui.ModuleUIConfigurationManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier">
+    <service name="com.sun.star.ui.ModuleUIConfigurationManagerSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ObjectMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PathSettings">
+    <service name="com.sun.star.util.PathSettings"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PathSubstitution">
+    <service name="com.sun.star.util.PathSubstitution"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuControllerFactory">
+    <service name="com.sun.star.frame.PopupMenuControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.RecentFilesMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusBarControllerFactory">
+    <service name="com.sun.star.frame.StatusbarControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusBarFactory">
+    <service name="com.sun.star.ui.StatusBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.StatusIndicatorFactory">
+    <service name="com.sun.star.task.StatusIndicatorFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TaskCreator">
+    <service name="com.sun.star.frame.TaskCreator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarControllerFactory">
+    <service name="com.sun.star.frame.ToolBarControllerFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarFactory">
+    <service name="com.sun.star.ui.ToolBarFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UICategoryDescription">
+    <service name="com.sun.star.ui.UICategoryDescription"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UICommandDescription">
+    <service name="com.sun.star.frame.UICommandDescription"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UIConfigurationManager">
+    <service name="com.sun.star.ui.UIConfigurationManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UIElementFactoryManager">
+    <service name="com.sun.star.ui.UIElementFactoryManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.URLTransformer">
+    <service name="com.sun.star.util.URLTransformer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.WindowContentFactoryManager">
+    <service name="com.sun.star.ui.WindowContentFactoryManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.WindowStateConfiguration">
+    <service name="com.sun.star.ui.WindowStateConfiguration"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.jobs.JobDispatch">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TabWindowService">
+    <service name="com.sun.star.ui.dialogs.TabContainerWindow"/>
+  </implementation>
+</component>
diff --git a/framework/util/fwl.component b/framework/util/fwl.component
new file mode 100755
index 0000000000..99c5ca7213
--- /dev/null
+++ b/framework/util/fwl.component
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sum.star.comp.framework.LanguageSelectionMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorder">
+    <service name="com.sun.star.frame.DispatchRecorder"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.DispatchRecorderSupplier">
+    <service name="com.sun.star.frame.DispatchRecorderSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FontSizeMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.FooterMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.HeaderMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.License">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LogoImageStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.LogoTextStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MacrosMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MailToDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.MediaTypeDetectionHelper">
+    <service name="com.sun.star.frame.MediaTypeDetectionHelper"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.NewMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.OXTFileHandler">
+    <service name="com.sun.star.frame.ContentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.PopupMenuControllerDispatcher">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ServiceHandler">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.SimpleTextStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.UriAbbreviation">
+    <service name="com.sun.star.util.UriAbbreviation"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.services.DispatchHelper">
+    <service name="com.sun.star.frame.DispatchHelper"/>
+  </implementation>
+</component>
diff --git a/framework/util/fwm.component b/framework/util/fwm.component
new file mode 100755
index 0000000000..624249ff43
--- /dev/null
+++ b/framework/util/fwm.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.framework.HelpOnStartup">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.ShellJob">
+    <service name="com.sun.star.task.Job"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.SystemExecute">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.framework.TabWindowFactory">
+    <service name="com.sun.star.frame.TabWindowFactory"/>
+  </implementation>
+</component>
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
deleted file mode 100644
index c5f77714f2..0000000000
--- a/framework/util/guiapps/makefile.mk
+++ /dev/null
@@ -1,66 +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=			framework
-TARGET=				framework_guiapp
-TARGETTYPE=GUI
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-GEN_HID=                TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- login applikation -------------------------------------------------------
-
-APP1TARGET= 	login
-
-APP1OBJS=		$(SLO)$/login.obj					\
-                $(SLO)$/servicemanager.obj			\
-                $(SLO)$/lockhelper.obj				\
-                $(SLO)$/transactionmanager.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-APP1STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(SALLIB)							\
-                $(TOOLSLIB) 						\
-                $(SVTOOLLIB)						\
-                $(TKLIB)							\
-                $(COMPHELPERLIB)					\
-                $(VCLLIB)
-
-APP1DEPN=		$(SLO)$/servicemanager.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/util/hidother.src b/framework/util/hidother.src
index f12337cfe7..f12337cfe7 100644..100755
--- a/framework/util/hidother.src
+++ b/framework/util/hidother.src
diff --git a/framework/util/lgd.xml b/framework/util/lgd.xml
index a3256a7940..a3256a7940 100644..100755
--- a/framework/util/lgd.xml
+++ b/framework/util/lgd.xml
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
deleted file mode 100755
index 82b18cd97c..0000000000
--- a/framework/util/makefile.mk
+++ /dev/null
@@ -1,424 +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=            framework
-TARGET=             framework
-
-USE_DEFFILE=        TRUE
-ENABLE_EXCEPTIONS=  TRUE
-NO_BSYMBOLIC=       TRUE
-GEN_HID=            TRUE
-GEN_HID_OTHER=      TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- internal import -------------------------------------------------
-
-LIB1TARGET=     $(SLB)$/fwiobj.lib
-
-LIB1OBJFILES=   \
-                $(SLO)$/converter.obj                           \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/transactionmanager.obj                  \
-                $(SLO)$/protocolhandlercache.obj                \
-                $(SLO)$/networkdomain.obj                       \
-                $(SLO)$/configaccess.obj                        \
-                $(SLO)$/shareablemutex.obj                      \
-                $(SLO)$/itemcontainer.obj                       \
-                $(SLO)$/rootitemcontainer.obj                   \
-                $(SLO)$/constitemcontainer.obj                  \
-                $(SLO)$/jobconst.obj                            \
-                $(SLO)$/mischelper.obj                          \
-                $(SLO)$/propertysethelper.obj
-
-
-
-# --- export library for sfx2 -------------------------------------------------
-
-LIB2TARGET=     $(SLB)$/fweobj.lib
-
-LIB2OBJFILES=   \
-                $(SLO)$/bmkmenu.obj                             \
-                $(SLO)$/eventsconfiguration.obj                 \
-                $(SLO)$/eventsdocumenthandler.obj               \
-                $(SLO)$/imageproducer.obj                       \
-                $(SLO)$/lockhelper.obj                          \
-                $(SLO)$/menuconfiguration.obj                   \
-                $(SLO)$/menudocumenthandler.obj                 \
-                $(SLO)$/saxnamespacefilter.obj                  \
-                $(SLO)$/statusbarconfiguration.obj              \
-                $(SLO)$/statusbardocumenthandler.obj            \
-                $(SLO)$/toolboxconfiguration.obj                \
-                $(SLO)$/toolboxdocumenthandler.obj              \
-                $(SLO)$/imagesconfiguration.obj                 \
-                $(SLO)$/imagesdocumenthandler.obj               \
-                $(SLO)$/xmlnamespaces.obj                       \
-                $(SLO)$/actiontriggerpropertyset.obj            \
-                $(SLO)$/actiontriggerseparatorpropertyset.obj   \
-                $(SLO)$/actiontriggercontainer.obj              \
-                $(SLO)$/propertysetcontainer.obj                \
-                $(SLO)$/rootactiontriggercontainer.obj          \
-                $(SLO)$/actiontriggerhelper.obj                 \
-                $(SLO)$/imagewrapper.obj                        \
-                $(SLO)$/interaction.obj                         \
-                $(SLO)$/addonmenu.obj                           \
-                $(SLO)$/addonsoptions.obj                       \
-                $(SLO)$/fwkresid.obj                            \
-                $(SLO)$/acceleratorinfo.obj                     \
-                $(SLO)$/sfxhelperfunctions.obj                  \
-                $(SLO)$/uielementwrapperbase.obj                \
-                $(SLO)$/uiconfigelementwrapperbase.obj          \
-                $(SLO)$/configimporter.obj                      \
-                $(SLO)$/menuextensionsupplier.obj               \
-                $(SLO)$/preventduplicateinteraction.obj         \
-                $(SLO)$/framelistanalyzer.obj                   \
-                $(SLO)$/titlehelper.obj
-
-# --- import classes library ---------------------------------------------------
-
-SHL1TARGET=     fwi$(DLLPOSTFIX)
-
-SHL1IMPLIB=     ifwi
-
-SHL1LIBS=       $(LIB1TARGET)
-
-SHL1STDLIBS=    \
-                $(UNOTOOLSLIB)      \
-                $(CPPUHELPERLIB)    \
-                $(TOOLSLIB)         \
-                $(SVTOOLLIB)        \
-                $(SVLLIB)        	\
-                $(I18NISOLANGLIB)   \
-                $(VCLLIB)           \
-                $(TKLIB)            \
-                $(CPPULIB)          \
-                $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB) \
-        $(KERNEL32LIB)
-.ENDIF
-
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=       $(SHL1TARGET)
-
-DEFLIB1NAME=    fwiobj
-DEF1DEPN=       $(MISC)$/$(SHL1TARGET).flt
-
-
-# --- export classes library ---------------------------------------------------
-
-SHL2TARGET=     fwe$(DLLPOSTFIX)
-
-SHL2IMPLIB=     ifwe
-
-SHL2LIBS=       $(LIB2TARGET)
-
-SHL2STDLIBS=    \
-                $(FWILIB)                           \
-                $(VCLLIB)                           \
-                $(SVLLIB)                           \
-                $(SVTOOLLIB)                        \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(SALLIB)
-
-SHL2DEF=        $(MISC)$/$(SHL2TARGET).def
-SHL2DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF2NAME=       $(SHL2TARGET)
-
-DEFLIB2NAME=    fweobj
-DEF2DEPN=       $(MISC)$/$(SHL2TARGET).flt
-
-# --- light services library ----------------------------------------------------
-
-SHL3TARGET=     fwl$(DLLPOSTFIX)
-
-SHL3IMPLIB=     ifwl
-
-SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
-                $(SLO)$/registertemp.obj            \
-                $(SLO)$/mailtodispatcher.obj        \
-                $(SLO)$/oxt_handler.obj    			\
-                $(SLO)$/toolbarsmenucontroller.obj  \
-                $(SLO)$/newmenucontroller.obj          \
-                $(SLO)$/macrosmenucontroller.obj   \
-                $(SLO)$/langselectionmenucontroller.obj   \
-                $(SLO)$/headermenucontroller.obj    \
-                $(SLO)$/footermenucontroller.obj    \
-                $(SLO)$/fontsizemenucontroller.obj  \
-                $(SLO)$/fontmenucontroller.obj      \
-                $(SLO)$/tabwindowservice.obj        \
-                $(SLO)$/fwktabwindow.obj            \
-                $(SLO)$/logotextstatusbarcontroller.obj   \
-                $(SLO)$/fwlresid.obj    			\
-                $(SLO)$/logoimagestatusbarcontroller.obj  \
-                $(SLO)$/simpletextstatusbarcontroller.obj \
-                $(SLO)$/uriabbreviation.obj         \
-                $(SLO)$/servicehandler.obj          \
-                $(SLO)$/license.obj                 \
-                $(SLO)$/dispatchrecorder.obj        \
-                $(SLO)$/dispatchrecordersupplier.obj\
-                $(SLO)$/dispatchhelper.obj          \
-                $(SLO)$/popupmenudispatcher.obj     \
-                $(SLO)$/popupmenucontroller.obj
-
-SHL3STDLIBS=    \
-                $(FWILIB)                           \
-                $(FWELIB)                           \
-                $(SVLLIB)                           \
-                $(TKLIB)                            \
-                $(SVTOOLLIB)                        \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(COMPHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(VCLLIB)                           \
-                $(SALLIB)
-
-SHL3DEF=        $(MISC)$/$(SHL3TARGET).def
-SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
-
-DEF3NAME=       $(SHL3TARGET)
-
-SHL3VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- services library ----------------------------------------------------
-
-SHL4TARGET=     fwk$(DLLPOSTFIX)
-
-SHL4IMPLIB=     ifwk
-
-SHL4OBJS=       \
-                $(SLO)$/acceleratorcache.obj                \
-                $(SLO)$/acceleratorconfiguration.obj        \
-                $(SLO)$/acceleratorconfigurationreader.obj  \
-                $(SLO)$/acceleratorconfigurationwriter.obj  \
-                $(SLO)$/addonstoolbarmanager.obj    \
-                $(SLO)$/addonstoolbarwrapper.obj    \
-                $(SLO)$/addonstoolboxfactory.obj    \
-                $(SLO)$/autorecovery.obj            \
-                $(SLO)$/backingcomp.obj             \
-                $(SLO)$/backingwindow.obj           \
-                $(SLO)$/buttontoolbarcontroller.obj       \
-                $(SLO)$/closedispatcher.obj         \
-                $(SLO)$/comboboxtoolbarcontroller.obj     \
-                $(SLO)$/complextoolbarcontroller.obj      \
-                $(SLO)$/configaccess.obj            \
-                $(SLO)$/containerquery.obj          \
-                $(SLO)$/contenthandler.obj          \
-                $(SLO)$/controlmenucontroller.obj   \
-                $(SLO)$/desktop.obj                 \
-                $(SLO)$/dispatchinformationprovider.obj     \
-                $(SLO)$/dispatchprovider.obj        \
-                $(SLO)$/dockingareadefaultacceptor.obj  \
-                $(SLO)$/documentacceleratorconfiguration.obj \
-                $(SLO)$/dropdownboxtoolbarcontroller.obj  \
-                $(SLO)$/droptargetlistener.obj      \
-                $(SLO)$/edittoolbarcontroller.obj   \
-                $(SLO)$/factoryconfiguration.obj    \
-                $(SLO)$/framecontainer.obj          \
-                $(SLO)$/frameloader.obj             \
-                $(SLO)$/frame.obj                   \
-                $(SLO)$/generictoolbarcontroller.obj    \
-                $(SLO)$/globalacceleratorconfiguration.obj  \
-                $(SLO)$/globalsettings.obj                \
-                $(SLO)$/graphicnameaccess.obj       \
-                $(SLO)$/helpagentdispatcher.obj     \
-                $(SLO)$/imagebuttontoolbarcontroller.obj  \
-                $(SLO)$/imagemanager.obj            \
-                $(SLO)$/imagemanagerimpl.obj        \
-                $(SLO)$/interceptionhelper.obj      \
-                $(SLO)$/jobdata.obj                 \
-                $(SLO)$/jobdispatch.obj             \
-                $(SLO)$/jobexecutor.obj             \
-                $(SLO)$/job.obj                     \
-                $(SLO)$/jobresult.obj               \
-                $(SLO)$/joburl.obj                  \
-                $(SLO)$/keymapping.obj              \
-                $(SLO)$/langselectionstatusbarcontroller.obj \
-                $(SLO)$/layoutmanager.obj           \
-                $(SLO)$/loaddispatcher.obj          \
-                $(SLO)$/loadenv.obj                 \
-                $(SLO)$/menubarfactory.obj          \
-                $(SLO)$/menubarmanager.obj          \
-                $(SLO)$/menubarmerger.obj                 \
-                $(SLO)$/menubarwrapper.obj          \
-                $(SLO)$/menudispatcher.obj          \
-                $(SLO)$/menumanager.obj             \
-                $(SLO)$/moduleacceleratorconfiguration.obj  \
-                $(SLO)$/moduleimagemanager.obj      \
-                $(SLO)$/modulemanager.obj           \
-                $(SLO)$/moduleuicfgsupplier.obj     \
-                $(SLO)$/moduleuiconfigurationmanager.obj \
-                $(SLO)$/objectmenucontroller.obj    \
-                $(SLO)$/ocomponentaccess.obj        \
-                $(SLO)$/ocomponentenumeration.obj   \
-                $(SLO)$/oframes.obj                 \
-                $(SLO)$/pathsettings.obj			\
-                $(SLO)$/persistentwindowstate.obj   \
-                $(SLO)$/popupmenucontrollerfactory.obj\
-                $(SLO)$/presethandler.obj                   \
-                $(SLO)$/progressbarwrapper.obj          \
-                $(SLO)$/recentfilesmenucontroller.obj   \
-                $(SLO)$/registerservices.obj        \
-                $(SLO)$/sessionlistener.obj         \
-                $(SLO)$/spinfieldtoolbarcontroller.obj    \
-                $(SLO)$/statusbarcontrollerfactory.obj\
-                $(SLO)$/statusbarfactory.obj        \
-                $(SLO)$/statusbarmanager.obj        \
-                $(SLO)$/statusbar.obj               \
-                $(SLO)$/statusbarwrapper.obj        \
-                $(SLO)$/statusindicatorfactory.obj  \
-                $(SLO)$/statusindicatorinterfacewrapper.obj \
-                $(SLO)$/statusindicator.obj         \
-                $(SLO)$/quietinteraction.obj        \
-                $(SLO)$/storageholder.obj           \
-                $(SLO)$/substitutepathvars.obj      \
-                $(SLO)$/tagwindowasmodified.obj     \
-                $(SLO)$/targethelper.obj            \
-                $(SLO)$/taskcreator.obj             \
-                $(SLO)$/taskcreatorsrv.obj          \
-                $(SLO)$/titlebarupdate.obj          \
-                $(SLO)$/togglebuttontoolbarcontroller.obj \
-                $(SLO)$/toolbarcontrollerfactory.obj\
-                $(SLO)$/toolbarmanager.obj          \
-                $(SLO)$/toolbarmerger.obj           \
-                $(SLO)$/toolbar.obj                 \
-                $(SLO)$/toolbarwrapper.obj          \
-                $(SLO)$/toolboxfactory.obj          \
-                $(SLO)$/uicategorydescription.obj   \
-                $(SLO)$/uicommanddescription.obj    \
-                $(SLO)$/uiconfigurationmanager.obj  \
-                $(SLO)$/uielementfactorymanager.obj \
-                $(SLO)$/urltransformer.obj          \
-                $(SLO)$/vclstatusindicator.obj      \
-                $(SLO)$/wakeupthread.obj            \
-                $(SLO)$/windowcommanddispatch.obj   \
-                $(SLO)$/windowstateconfiguration.obj \
-                $(SLO)$/windowcontentfactorymanager.obj \
-                $(SLO)$/startmoduledispatcher.obj
-
-SHL4STDLIBS=    \
-         $(ODMA_LIB_LIB)    \
-                $(FWILIB)                           \
-                $(FWELIB)                           \
-                $(SVTOOLLIB)                        \
-                $(TKLIB)                            \
-                $(VCLLIB)                           \
-                $(SVLLIB)                           \
-                $(SOTLIB)                           \
-                $(UNOTOOLSLIB)                      \
-                $(TOOLSLIB)                         \
-                $(COMPHELPERLIB)                    \
-                $(CPPUHELPERLIB)                    \
-                $(CPPULIB)                          \
-                $(SALLIB)                           \
-                $(UCBHELPERLIB)                     \
-                $(SALHELPERLIB)                     \
-                $(I18NISOLANGLIB)
-
-SHL4DEF=        $(MISC)$/$(SHL4TARGET).def
-SHL4DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
-
-DEF4NAME=       $(SHL4TARGET)
-
-SHL4VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- services library ----------------------------------------------------
-
-SHL5TARGET=     fwm$(DLLPOSTFIX)
-
-SHL5IMPLIB=     ifwm
-
-SHL5OBJS=       \
-                $(SLO)$/helponstartup.obj   \
-                $(SLO)$/tabwinfactory.obj   \
-                $(SLO)$/tabwindow.obj       \
-                $(SLO)$/systemexec.obj      \
-                $(SLO)$/shelljob.obj        \
-                $(SLO)$/register3rdcomponents.obj
-
-SHL5STDLIBS=    \
-                $(FWILIB)           \
-                $(TKLIB)            \
-                $(VCLLIB)           \
-                $(TOOLSLIB)         \
-                $(COMPHELPERLIB)    \
-                $(CPPUHELPERLIB)    \
-                $(CPPULIB)          \
-                $(SALLIB)
-
-SHL5DEF=        $(MISC)$/$(SHL5TARGET).def
-SHL5DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF5NAME=       $(SHL5TARGET)
-
-SHL5VERSIONMAP= $(SOLARENV)/src/component.map
-
-RESLIB1NAME=        fwe
-RESLIB1IMAGES=      $(PRJ)$/res
-RESLIB1SRSFILES=    $(SRS)$/fwk_classes.srs \
-                    $(SRS)$/fwk_services.srs \
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo _Impl>$@
-    @echo WEP>>$@
-    @echo m_pLoader>$@
-    @echo _TI2>>$@
-    @echo _TI3>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-    @echo _STL::pair>>$@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo _Impl>$@
-    @echo WEP>>$@
-    @echo m_pLoader>$@
-    @echo _TI2>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index ff0d72b2ee..853d907df5 100644..100755
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -80,19 +80,19 @@ public:
             SvMetaObject();
 
 #ifdef IDL_COMPILER
-    static void			WriteTab( SvStream & rOutStm, USHORT nTab );
-    static BOOL			TestAndSeekSpaceOnly( SvStream &, ULONG nBegPos );
+    static void			WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
+    static sal_Bool			TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
     static void			Back2Delemitter( SvStream & );
     static void 		WriteStars( SvStream & );
 
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                 WriteType, WriteAttribute = 0 );
 
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_DECL_IMPL_REF(SvMetaObject)
@@ -111,7 +111,7 @@ public:
     SvMetaObject *  Pop() { return aList.Remove( aList.Count() -1 ); }
     SvMetaObject *  Top() const { return aList.GetObject( aList.Count() -1 ); }
     void            Clear() { aList.Clear(); }
-    ULONG           Count() const { return aList.Count(); }
+    sal_uLong     Count() const { return aList.Count(); }
 
     SvMetaObject *  Get( TypeId nType )
                     {
@@ -136,26 +136,26 @@ class SvMetaName : public SvMetaObject
 
 protected:
 #ifdef IDL_COMPILER
-    virtual BOOL ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
             void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
                                      char c = '\0' );
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                       SvStream & rOutStm, USHORT nTab );
-    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                       SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
-    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
             SvMetaName();
 
-    virtual BOOL        		SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool        		SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
     void        				SetDescription( const ByteString& rText )
                                 { aDescription = rText; }
     const SvHelpContext& 		GetHelpContext() const { return aHelpContext; }
@@ -165,10 +165,10 @@ public:
     virtual const SvString&     GetDescription() const{ return aDescription; }
 
 #ifdef IDL_COMPILER
-    virtual BOOL 		Test( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool 		Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                        WriteType, WriteAttribute = 0);
     void				WriteDescription( SvStream& rOutStm );
 #endif
@@ -232,8 +232,8 @@ class SvMetaExtern : public SvMetaReference
 
     SvUUId                  aUUId;
     SvVersion               aVersion;
-    BOOL					bReadUUId;
-    BOOL					bReadVersion;
+    sal_Bool					bReadUUId;
+    sal_Bool					bReadVersion;
 public:
                         SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
                         SvMetaExtern();
@@ -244,16 +244,16 @@ public:
     const SvVersion &   GetVersion() const { return aVersion; }
 #ifdef IDL_COMPILER
     void				SetModule( SvIdlDataBase & rBase );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0);
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                              SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                           WriteType, WriteAttribute = 0);
 #endif
 };
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 1f979982a2..e711c94dd6 100644..100755
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -42,16 +42,16 @@ class SvTokenStream;
 
 class SvUINT32
 {
-    UINT32  nVal;
+    sal_uInt32  nVal;
 public:
                 SvUINT32() { nVal = 0; }
-                SvUINT32( UINT32 n ) : nVal( n ) {}
-    SvUINT32 &  operator = ( UINT32 n ) { nVal = n; return *this; }
+                SvUINT32( sal_uInt32 n ) : nVal( n ) {}
+    SvUINT32 &  operator = ( sal_uInt32 n ) { nVal = n; return *this; }
 
-    operator    UINT32 &() { return nVal; }
+    operator    sal_uInt32 &() { return nVal; }
 
-    static UINT32  Read( SvStream & rStm );
-    static void    Write( SvStream & rStm, UINT32 nVal );
+    static sal_uInt32  Read( SvStream & rStm );
+    static void    Write( SvStream & rStm, sal_uInt32 nVal );
 
     friend SvStream& operator << (SvStream & rStm, const SvUINT32 & r )
                 { SvUINT32::Write( rStm, r.nVal ); return rStm; }
@@ -71,7 +71,7 @@ public:
     operator    short &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvINT16 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvINT16 & r )
                 { r.nVal = (short)SvUINT32::Read( rStm ); return rStm; }
 };
@@ -79,53 +79,53 @@ public:
 
 class SvUINT16
 {
-    USHORT  nVal;
+    sal_uInt16  nVal;
 public:
                 SvUINT16() { nVal = 0; }
-                SvUINT16( USHORT n ) : nVal( n ) {}
-    SvUINT16 &  operator = ( USHORT n ) { nVal = n; return *this; }
+                SvUINT16( sal_uInt16 n ) : nVal( n ) {}
+    SvUINT16 &  operator = ( sal_uInt16 n ) { nVal = n; return *this; }
 
-    operator    UINT16 &() { return nVal; }
+    operator    sal_uInt16 &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvUINT16 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvUINT16 & r )
-                { r.nVal = (USHORT)SvUINT32::Read( rStm ); return rStm; }
+                { r.nVal = (sal_uInt16)SvUINT32::Read( rStm ); return rStm; }
 };
 
 
 class SvINT32
 {
-    INT32   nVal;
+    sal_Int32   nVal;
 public:
                 SvINT32() { nVal = 0; }
-                SvINT32( INT32 n ) : nVal( n ) {}
-    SvINT32 &   operator = ( INT32 n ) { nVal = n; return *this; }
+                SvINT32( sal_Int32 n ) : nVal( n ) {}
+    SvINT32 &   operator = ( sal_Int32 n ) { nVal = n; return *this; }
 
-    operator    INT32 &() { return nVal; }
+    operator    sal_Int32 &() { return nVal; }
 
     friend SvStream& operator << (SvStream & rStm, const SvINT32 & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
     friend SvStream& operator >> (SvStream & rStm, SvINT32 & r )
-                { r.nVal = (INT32)SvUINT32::Read( rStm ); return rStm; }
+                { r.nVal = (sal_Int32)SvUINT32::Read( rStm ); return rStm; }
 };
 
 
 class Svint
 {
     int  	nVal;
-    BOOL	bSet;
+    sal_Bool	bSet;
 public:
                 Svint() { nVal = bSet = 0; }
-                Svint( int n ) : nVal( n ), bSet( TRUE ) {}
-                Svint( int n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
-    Svint    &  operator = ( int n ) { nVal = n; bSet = TRUE; return *this; }
+                Svint( int n ) : nVal( n ), bSet( sal_True ) {}
+                Svint( int n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+    Svint    &  operator = ( int n ) { nVal = n; bSet = sal_True; return *this; }
 
     operator    int ()const { return nVal; }
-    BOOL        IsSet() const { return bSet; }
+    sal_Bool        IsSet() const { return bSet; }
 
     friend SvStream& operator << (SvStream & rStm, const Svint & r )
-                { SvUINT32::Write( rStm, (UINT32)r.nVal ); rStm << r.bSet; return rStm; }
+                { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
     friend SvStream& operator >> (SvStream & rStm, Svint & r )
                 { r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
 };
@@ -133,27 +133,27 @@ public:
 
 class SvBOOL
 {
-    BOOL  nVal:1,
+    sal_Bool  nVal:1,
           bSet:1;
 public:
-                SvBOOL() { bSet = nVal = FALSE; }
-                SvBOOL( BOOL n ) : nVal( n ), bSet( TRUE ) {}
-                SvBOOL( BOOL n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
-    SvBOOL &    operator = ( BOOL n ) { nVal = n; bSet = TRUE; return *this; }
+                SvBOOL() { bSet = nVal = sal_False; }
+                SvBOOL( sal_Bool n ) : nVal( n ), bSet( sal_True ) {}
+                SvBOOL( sal_Bool n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+    SvBOOL &    operator = ( sal_Bool n ) { nVal = n; bSet = sal_True; return *this; }
 
-    operator    BOOL() const { return nVal; }
+    operator    sal_Bool() const { return nVal; }
 #ifdef STC
     operator    int() const { return nVal; }
 #endif
-    BOOL        Is() const { return nVal; }
-    BOOL        IsSet() const { return bSet; }
+    sal_Bool        Is() const { return nVal; }
+    sal_Bool        IsSet() const { return bSet; }
 
     friend SvStream& operator << (SvStream &, const SvBOOL &);
     friend SvStream& operator >> (SvStream &, SvBOOL &);
 
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
     ByteString      GetSvIdlString( SvStringHashEntry * pName );
 #endif
 };
@@ -168,34 +168,34 @@ public:
     friend SvStream& operator << (SvStream &, const SvIdentifier &);
     friend SvStream& operator >> (SvStream &, SvIdentifier &);
 
-    BOOL        IsSet() const { return Len() != 0; }
+    sal_Bool        IsSet() const { return Len() != 0; }
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
 
 class SvNumberIdentifier : public SvIdentifier
 {
-    UINT32  nValue;
+    sal_uInt32  nValue;
     // must not be used
-    BOOL    ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool    ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
 public:
                 SvNumberIdentifier() : nValue( 0 ) {};
-    BOOL        IsSet() const
+    sal_Bool        IsSet() const
                 {
                     return SvIdentifier::IsSet() || nValue != 0;
                 }
-    UINT32      GetValue() const { return nValue; }
-    void		SetValue( UINT32 nVal ) { nValue = nVal; }
+    sal_uInt32      GetValue() const { return nValue; }
+    void		SetValue( sal_uInt32 nVal ) { nValue = nVal; }
 
     friend SvStream& operator << (SvStream &, const SvNumberIdentifier &);
     friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
                            SvTokenStream & rInStm );
 #endif
 };
@@ -207,14 +207,14 @@ public:
                 SvString(){};
     SvString &  operator = ( const ByteString & rStr )
                 { ByteString::operator =( rStr ); return *this; }
-    BOOL        IsSet() const { return Len() != 0; }
+    sal_Bool        IsSet() const { return Len() != 0; }
     friend SvStream& operator << (SvStream &, const SvString &);
     friend SvStream& operator >> (SvStream &, SvString &);
 
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
@@ -224,9 +224,9 @@ class SvHelpText : public SvString
 public:
                 SvHelpText() {}
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
+                            sal_uInt16 nTab );
 #endif
 };
 
@@ -240,36 +240,36 @@ class SvUUId : public SvGlobalName
 public:
                 SvUUId() {}
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStream & rOutStm );
 #endif
 };
 
 
 class SvVersion
 {
-    USHORT  nMajorVersion;
-    USHORT  nMinorVersion;
+    sal_uInt16  nMajorVersion;
+    sal_uInt16  nMinorVersion;
 public:
                 SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
-    BOOL        operator == ( const SvVersion & r )
+    sal_Bool        operator == ( const SvVersion & r )
                 {
                     return (r.nMajorVersion == nMajorVersion)
                              && (r.nMinorVersion == nMinorVersion);
                 }
-    BOOL        operator != ( const SvVersion & r )
+    sal_Bool        operator != ( const SvVersion & r )
                 {
                     return !(*this == r);
                 }
 
-    USHORT      GetMajorVersion() const { return nMajorVersion; }
-    USHORT      GetMinorVersion() const { return nMinorVersion; }
+    sal_uInt16      GetMajorVersion() const { return nMajorVersion; }
+    sal_uInt16      GetMinorVersion() const { return nMinorVersion; }
 
     friend SvStream& operator << (SvStream &, const SvVersion &);
     friend SvStream& operator >> (SvStream &, SvVersion &);
 #ifdef IDL_COMPILER
-    BOOL        ReadSvIdl( SvTokenStream & rInStm );
-    BOOL        WriteSvIdl( SvStream & rOutStm );
+    sal_Bool        ReadSvIdl( SvTokenStream & rInStm );
+    sal_Bool        WriteSvIdl( SvStream & rOutStm );
 #endif
 };
 
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index 248eac3787..248eac3787 100644..100755
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 2882ba07a2..f8ea98a5e6 100644..100755
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -61,8 +61,8 @@ public:
     String      aCSVFile;
     String      aExportFile;
     String      aDocuFile;
-    UINT32      nVerbosity;
-    UINT32      nFlags;
+    sal_uInt32      nVerbosity;
+    sal_uInt32      nFlags;
 
                 SvCommand( int argc, char ** argv );
                 ~SvCommand();
@@ -70,7 +70,7 @@ public:
 
 void Init();
 class SvIdlWorkingBase;
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
 void DeInit();
 
 #endif // _COMMAND_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 76a6b02067..e3286adecf 100644..100755
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -42,15 +42,15 @@ class SvIdlError
 {
     ByteString  aText;
 public:
-    UINT32  nLine, nColumn;
+    sal_uInt32  nLine, nColumn;
 
             SvIdlError() : nLine(0), nColumn(0) {}
-            SvIdlError( UINT32 nL, UINT32 nC )
+            SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
                 : nLine(nL), nColumn(nC) {}
 
     const ByteString &  GetText() const { return aText; }
     void            SetText( const ByteString & rT ) { aText = rT; }
-    BOOL            IsError() const { return nLine != 0; }
+    sal_Bool            IsError() const { return nLine != 0; }
     void            Clear() { nLine = nColumn = 0; }
     SvIdlError &	operator = ( const SvIdlError & rRef )
     { aText   = rRef.aText;
@@ -63,13 +63,13 @@ public:
 
 class SvIdlDataBase
 {
-    BOOL  						bExport;
+    sal_Bool  						bExport;
     String                      aExportFile;
     sal_uInt32					nUniqueId;
     sal_uInt32                  nVerbosity;
     String                      aDataBaseFile;
     SvFileStream *              pStm;
-    BOOL                        bIsModified;
+    sal_Bool                        bIsModified;
     SvPersistStream             aPersStream;
     StringList                  aIdFileList;
     SvStringHashTable *         pIdTable;
@@ -95,10 +95,10 @@ protected:
 public:
                 explicit SvIdlDataBase( const SvCommand& rCmd );
                 ~SvIdlDataBase();
-    static BOOL IsBinaryFormat( SvStream & rInStm );
+    static sal_Bool IsBinaryFormat( SvStream & rInStm );
 
     void        Load( SvStream & rInStm );
-    void        Save( SvStream & rInStm, UINT32 nContextFlags );
+    void        Save( SvStream & rInStm, sal_uInt32 nContextFlags );
 
     SvMetaAttributeMemberList&  GetAttrList() { return aAttrList; }
     SvStringHashTable *       GetIdTable() { return pIdTable; }
@@ -129,11 +129,11 @@ public:
     void 					WriteError( const ByteString & rErrWrn,
                                     const ByteString & rFileName,
                                     const ByteString & rErrorText,
-                                    ULONG nRow = 0, ULONG nColumn = 0 ) const;
+                                    sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
     void                    WriteError( SvTokenStream & rInStm );
     void                    SetError( const ByteString & rError, SvToken * pTok );
     void                    Push( SvMetaObject * pObj );
-    BOOL                    Pop( BOOL bOk, SvTokenStream & rInStm, UINT32 nTokPos )
+    sal_Bool                    Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
                             {
                                 GetStack().Pop();
                                 if( bOk )
@@ -143,9 +143,9 @@ public:
                                 return bOk;
                             }
     sal_uInt32				GetUniqueId() { return ++nUniqueId; }
-    BOOL                    FindId( const ByteString & rIdName, ULONG * pVal );
-    BOOL                    InsertId( const ByteString & rIdName, ULONG nVal );
-    BOOL                    ReadIdFile( const String & rFileName );
+    sal_Bool                    FindId( const ByteString & rIdName, sal_uLong * pVal );
+    sal_Bool                    InsertId( const ByteString & rIdName, sal_uLong nVal );
+    sal_Bool                    ReadIdFile( const String & rFileName );
 
     SvMetaType *			FindType( const ByteString & rName );
     static SvMetaType *		FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -164,14 +164,14 @@ class SvIdlWorkingBase : public SvIdlDataBase
 public:
                 explicit SvIdlWorkingBase( const SvCommand& rCmd );
 
-    BOOL        ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath );
-    BOOL        WriteSvIdl( SvStream & );
+    sal_Bool        ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath );
+    sal_Bool        WriteSvIdl( SvStream & );
 
-    BOOL        WriteSfx( SvStream & );
-    BOOL		WriteHelpIds( SvStream & );
-    BOOL        WriteSfxItem( SvStream & );
-    BOOL 		WriteCSV( SvStream& );
-    BOOL		WriteDocumentation( SvStream& );
+    sal_Bool        WriteSfx( SvStream & );
+    sal_Bool		WriteHelpIds( SvStream & );
+    sal_Bool        WriteSfxItem( SvStream & );
+    sal_Bool 		WriteCSV( SvStream& );
+    sal_Bool		WriteDocumentation( SvStream& );
 };
 #endif
 
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 16f71e54b0..16f71e54b0 100644..100755
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 41ee6db65c..6449dfd7b9 100644..100755
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -35,24 +35,24 @@
 
 class SvHashTable
 {
-    UINT32       nMax;                 // size of hash-tabel
-    UINT32       nFill;                // elements in hash-tabel
-    UINT32       lAsk;                 // number of requests
-    UINT32       lTry;                 // number of tries
+    sal_uInt32       nMax;                 // size of hash-tabel
+    sal_uInt32       nFill;                // elements in hash-tabel
+    sal_uInt32       lAsk;                 // number of requests
+    sal_uInt32       lTry;                 // number of tries
 protected:
-    BOOL        Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos );
+    sal_Bool        Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
 
                             // compare element with entry
-    virtual StringCompare   Compare( const void * , UINT32 ) const = 0;
+    virtual StringCompare   Compare( const void * , sal_uInt32 ) const = 0;
                             // get hash value from subclass
-    virtual UINT32          HashFunc( const void * ) const = 0;
+    virtual sal_uInt32          HashFunc( const void * ) const = 0;
 public:
-                SvHashTable( UINT32 nMaxEntries );
+                SvHashTable( sal_uInt32 nMaxEntries );
                 virtual ~SvHashTable();
 
-    UINT32      GetMax() const { return nMax; }
+    sal_uInt32      GetMax() const { return nMax; }
 
-    virtual BOOL            IsEntry( UINT32 ) const = 0;
+    virtual sal_Bool            IsEntry( sal_uInt32 ) const = 0;
 };
 
 class SvStringHashTable;
@@ -60,28 +60,28 @@ class SvStringHashEntry : public SvRefBase
 {
 friend class SvStringHashTable;
     ByteString  aName;
-    UINT32  nHashId;
-    ULONG   nValue;
-    BOOL    bHasId;
+    sal_uInt32  nHashId;
+    sal_uLong   nValue;
+    sal_Bool    bHasId;
 public:
-                    SvStringHashEntry() : bHasId( FALSE ) {;}
-                    SvStringHashEntry( const ByteString & rName, UINT32 nIdx )
+                    SvStringHashEntry() : bHasId( sal_False ) {;}
+                    SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
                         : aName( rName )
                         , nHashId( nIdx )
                         , nValue( 0 )
-                        , bHasId( TRUE ) {}
+                        , bHasId( sal_True ) {}
                     ~SvStringHashEntry();
 
     const ByteString &  GetName() const { return aName; }
-    BOOL            HasId() const { return bHasId; }
-    UINT32          GetId() const { return nHashId; }
+    sal_Bool            HasId() const { return bHasId; }
+    sal_uInt32          GetId() const { return nHashId; }
 
-    void            SetValue( ULONG n ) { nValue = n; }
-    ULONG           GetValue() const { return nValue; }
+    void            SetValue( sal_uLong n ) { nValue = n; }
+    sal_uLong           GetValue() const { return nValue; }
 
-    BOOL            operator == ( const SvStringHashEntry & rRef )
+    sal_Bool            operator == ( const SvStringHashEntry & rRef )
                     { return nHashId == rRef.nHashId; }
-    BOOL            operator != ( const SvStringHashEntry & rRef )
+    sal_Bool            operator != ( const SvStringHashEntry & rRef )
                     { return ! operator == ( rRef ); }
     SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
         { SvRefBase::operator=( rRef );
@@ -101,19 +101,19 @@ class SvStringHashTable : public SvHashTable
 {
     SvStringHashEntry*      pEntries;
 protected:
-    virtual UINT32          HashFunc( const void * pElement ) const;
-    virtual StringCompare   Compare( const void * pElement, UINT32 nIndex ) const;
+    virtual sal_uInt32          HashFunc( const void * pElement ) const;
+    virtual StringCompare   Compare( const void * pElement, sal_uInt32 nIndex ) const;
 public:
-            SvStringHashTable( UINT32 nMaxEntries );   // max size of hash-tabel
+            SvStringHashTable( sal_uInt32 nMaxEntries );   // max size of hash-tabel
             virtual ~SvStringHashTable();
 
     ByteString          GetNearString( const ByteString & rName ) const;
-    virtual BOOL    IsEntry( UINT32 nIndex ) const;
+    virtual sal_Bool    IsEntry( sal_uInt32 nIndex ) const;
 
-    BOOL    Insert( const ByteString & rStr, UINT32 * pHash ); // insert string
-    BOOL    Test( const ByteString & rStr, UINT32 * pHash ) const; // test of insert string
-    SvStringHashEntry * Get ( UINT32 nIndex ) const; // return pointer to string
-    SvStringHashEntry & operator []( UINT32 nPos ) const
+    sal_Bool    Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
+    sal_Bool    Test( const ByteString & rStr, sal_uInt32 * pHash ) const; // test of insert string
+    SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
+    SvStringHashEntry & operator []( sal_uInt32 nPos ) const
             { return pEntries[ nPos ]; }
 
     void    FillHashList( SvStringHashList * rList ) const;
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index eb667a23e3..461efb7027 100644..100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,21 +44,21 @@ class BigInt;
 class SvToken
 {
 friend class SvTokenStream;
-    ULONG               	nLine, nColumn;
+    sal_uLong               	nLine, nColumn;
     SVTOKEN_ENUM        	nType;
     ByteString              	aString;
     union
     {
-        ULONG           	nLong;
-        BOOL            	bBool;
+        sal_uLong           	nLong;
+        sal_Bool            	bBool;
         char            	cChar;
         SvStringHashEntry *	pHash;
     };
 public:
             SvToken();
             SvToken( const SvToken & rObj );
-            SvToken( ULONG n );
-            SvToken( SVTOKEN_ENUM nTypeP, BOOL b );
+            SvToken( sal_uLong n );
+            SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
             SvToken( char c );
             SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
             SvToken( SVTOKEN_ENUM nTypeP );
@@ -68,27 +68,27 @@ public:
     ByteString          GetTokenAsString() const;
     SVTOKEN_ENUM    GetType() const { return nType; }
 
-    void        SetLine( ULONG nLineP )     { nLine = nLineP;       }
-    ULONG       GetLine() const             { return nLine;         }
+    void        SetLine( sal_uLong nLineP )     { nLine = nLineP;       }
+    sal_uLong       GetLine() const             { return nLine;         }
 
-    void        SetColumn( ULONG nColumnP ) { nColumn = nColumnP;   }
-    ULONG       GetColumn() const           { return nColumn;       }
+    void        SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP;   }
+    sal_uLong       GetColumn() const           { return nColumn;       }
 
-    BOOL        IsEmpty() const     { return nType == SVTOKEN_EMPTY; }
-    BOOL        IsComment() const   { return nType == SVTOKEN_COMMENT; }
-    BOOL        IsInteger() const   { return nType == SVTOKEN_INTEGER; }
-    BOOL        IsString() const    { return nType == SVTOKEN_STRING; }
-    BOOL        IsBool() const      { return nType == SVTOKEN_BOOL; }
-    BOOL        IsIdentifierHash() const
+    sal_Bool        IsEmpty() const     { return nType == SVTOKEN_EMPTY; }
+    sal_Bool        IsComment() const   { return nType == SVTOKEN_COMMENT; }
+    sal_Bool        IsInteger() const   { return nType == SVTOKEN_INTEGER; }
+    sal_Bool        IsString() const    { return nType == SVTOKEN_STRING; }
+    sal_Bool        IsBool() const      { return nType == SVTOKEN_BOOL; }
+    sal_Bool        IsIdentifierHash() const
                 { return nType == SVTOKEN_HASHID; }
-    BOOL        IsIdentifier() const
+    sal_Bool        IsIdentifier() const
                 {
                     return nType == SVTOKEN_IDENTIFIER
                             || nType == SVTOKEN_HASHID;
                 }
-    BOOL        IsChar() const      { return nType == SVTOKEN_CHAR; }
-    BOOL        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
-    BOOL        IsEof() const       { return nType == SVTOKEN_EOF; }
+    sal_Bool        IsChar() const      { return nType == SVTOKEN_CHAR; }
+    sal_Bool        IsRttiBase() const  { return nType == SVTOKEN_RTTIBASE; }
+    sal_Bool        IsEof() const       { return nType == SVTOKEN_EOF; }
 
     const ByteString & GetString() const
                 {
@@ -96,26 +96,26 @@ public:
                         ? pHash->GetName()
                         : aString;
                 }
-    ULONG       GetNumber() const       { return nLong;         }
-    BOOL        GetBool() const         { return bBool;         }
+    sal_uLong       GetNumber() const       { return nLong;         }
+    sal_Bool        GetBool() const         { return bBool;         }
     char        GetChar() const         { return cChar;         }
 
     void        SetHash( SvStringHashEntry * pHashP )
                 { pHash = pHashP; nType = SVTOKEN_HASHID; }
-    BOOL        HasHash() const
+    sal_Bool        HasHash() const
                 { return nType == SVTOKEN_HASHID; }
     SvStringHashEntry * GetHash() const { return pHash; }
-    BOOL        Is( SvStringHashEntry * pEntry ) const
+    sal_Bool        Is( SvStringHashEntry * pEntry ) const
                 { return IsIdentifierHash() && pHash == pEntry; }
 };
 
 inline SvToken::SvToken()
     : nType( SVTOKEN_EMPTY ) {}
 
-inline SvToken::SvToken( ULONG n )
+inline SvToken::SvToken( sal_uLong n )
     : nType( SVTOKEN_INTEGER ), nLong( n ) {}
 
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, BOOL b )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
     : nType( nTypeP ), bBool( b ) {}
 
 inline SvToken::SvToken( char c )
@@ -131,15 +131,15 @@ DECLARE_LIST( SvTokenList, SvToken * )
 
 class SvTokenStream
 {
-    ULONG       nLine, nColumn;
+    sal_uLong       nLine, nColumn;
     int			nBufPos;
     int         c;          // next character
     CharSet     nCharSet;
     char *      pCharTab;   // pointer to conversion table
-    USHORT      nTabSize;   // length of tabulator
+    sal_uInt16      nTabSize;   // length of tabulator
     ByteString		aStrTrue;
     ByteString		aStrFalse;
-    ULONG		nMaxPos;
+    sal_uLong		nMaxPos;
 
     SvFileStream *  pInStream;
     SvStream &      rInStream;
@@ -153,16 +153,16 @@ class SvTokenStream
     int         	GetNextChar();
     int         	GetFastNextChar()
                     {
-                        return aBufStr.GetChar((USHORT)nBufPos++);
+                        return aBufStr.GetChar((sal_uInt16)nBufPos++);
                     }
 
     void			FillTokenList();
-    ULONG       	GetNumber();
-    BOOL        	MakeToken( SvToken & );
-    BOOL			IsEof() const { return rInStream.IsEof(); }
+    sal_uLong       	GetNumber();
+    sal_Bool        	MakeToken( SvToken & );
+    sal_Bool			IsEof() const { return rInStream.IsEof(); }
     void			SetMax()
                     {
-                        ULONG n = Tell();
+                        sal_uLong n = Tell();
                         if( n > nMaxPos )
                             nMaxPos = n;
                     }
@@ -171,7 +171,7 @@ class SvTokenStream
                         // if end of line spare calculation
                         if( 0 != c )
                         {
-                            USHORT n = 0;
+                            sal_uInt16 n = 0;
                             nColumn = 0;
                             while( n < nBufPos )
                                 nColumn += aBufStr.GetChar(n++) == '\t' ? nTabSize : 1;
@@ -188,9 +188,9 @@ public:
     void            SetCharSet( CharSet nSet );
     CharSet         GetCharSet() const { return nCharSet; }
 
-    void            SetTabSize( USHORT nTabSizeP )
+    void            SetTabSize( sal_uInt16 nTabSizeP )
                     { nTabSize = nTabSizeP; }
-    USHORT          GetTabSize() const { return nTabSize; }
+    sal_uInt16          GetTabSize() const { return nTabSize; }
 
     SvToken *       GetToken_PrevAll()
                     {
@@ -216,16 +216,16 @@ public:
                         return GetToken_NextAll();
                     }
     SvToken *       GetToken() const { return pCurToken; }
-    BOOL            Read( char cChar )
+    sal_Bool            Read( char cChar )
                     {
                         if( pCurToken->IsChar()
                           && cChar == pCurToken->GetChar() )
                         {
                             GetToken_Next();
-                            return TRUE;
+                            return sal_True;
                         }
                         else
-                            return FALSE;
+                            return sal_False;
                     }
     void            ReadDelemiter()
                     {
@@ -237,14 +237,14 @@ public:
                         }
                     }
 
-    UINT32          Tell() const
+    sal_uInt32          Tell() const
                     { return aTokList.GetCurPos(); }
-    void            Seek( UINT32 nPos )
+    void            Seek( sal_uInt32 nPos )
                     {
                         pCurToken = aTokList.Seek( nPos );
                         SetMax();
                     }
-    void            SeekRel( INT32 nRelPos )
+    void            SeekRel( sal_Int32 nRelPos )
                     {
                         pCurToken = aTokList.Seek( Tell() + nRelPos );
                         SetMax();
diff --git a/idl/inc/makefile.mk b/idl/inc/makefile.mk
index 66b944a148..66b944a148 100644..100755
--- a/idl/inc/makefile.mk
+++ b/idl/inc/makefile.mk
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index af21d62d6e..d4b05cbaab 100644..100755
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -35,8 +35,8 @@
 struct SvNamePos
 {
     SvGlobalName	aUUId;
-    UINT32  		nStmPos;
-    SvNamePos( const SvGlobalName & rName, UINT32 nPos )
+    sal_uInt32  		nStmPos;
+    SvNamePos( const SvGlobalName & rName, sal_uInt32 nPos )
         : aUUId( rName )
         , nStmPos( nPos ) {}
 };
@@ -54,16 +54,16 @@ class SvMetaModule : public SvMetaExtern
     SvString				aModulePrefix;
 
 #ifdef IDL_COMPILER
-    BOOL                    bImported   : 1,
+    sal_Bool                    bImported   : 1,
                             bIsModified : 1;
     SvGlobalName            aBeginName;
     SvGlobalName            aEndName;
     SvGlobalName            aNextName;
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void        ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
                         SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
@@ -72,7 +72,7 @@ public:
     const String &      GetIdlFileName() const { return aIdlFileName; }
     const ByteString &  	GetModulePrefix() const { return aModulePrefix; }
 
-    virtual BOOL        SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
+    virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL  );
 
     const ByteString &      GetHelpFileName() const { return aHelpFileName; }
     const ByteString &      GetTypeLibFileName() const { return aTypeLibFile; }
@@ -83,19 +83,19 @@ public:
 
 #ifdef IDL_COMPILER
                         SvMetaModule( const String & rIdlFileName,
-                                      BOOL bImported );
+                                      sal_Bool bImported );
 
-    BOOL                FillNextName( SvGlobalName * );
-    BOOL                IsImported() const { return bImported; }
-    BOOL                IsModified() const { return bIsModified; }
+    sal_Bool                FillNextName( SvGlobalName * );
+    sal_Bool                IsImported() const { return bImported; }
+    sal_Bool                IsModified() const { return bIsModified; }
 
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
     virtual void		WriteAttributes( SvIdlDataBase & rBase,
-                                        SvStream & rOutStm, USHORT nTab,
+                                        SvStream & rOutStm, sal_uInt16 nTab,
                                             WriteType, WriteAttribute = 0 );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType, WriteAttribute = 0 );
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void        WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -103,8 +103,8 @@ public:
     virtual void        WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                                       Table *pIdTable );
 
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_DECL_IMPL_REF(SvMetaModule)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 5529088e69..6b3d6cfc83 100644..100755
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -64,9 +64,9 @@ public:
     const ByteString &	GetPrefix() const
                     { return aPrefix; }
 
-    void			SetAutomation( BOOL rAutomation )
+    void			SetAutomation( sal_Bool rAutomation )
                     { aAutomation = rAutomation; }
-    BOOL			GetAutomation() const
+    sal_Bool			GetAutomation() const
                     { return aAutomation; }
 
     void			SetClass( SvMetaClass * pClass )
@@ -88,22 +88,22 @@ class SvMetaClass : public SvMetaType
     SvBOOL          			aAutomation;
     SvMetaClassRef				xAutomationInterface;
 
-    BOOL 				TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+    sal_Bool 				TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                      SvMetaAttribute & rAttr ) const;
 #ifdef IDL_COMPILER
     void 				WriteSlotStubs( const ByteString & rShellName,
                                         SvSlotElementList & rSlotList,
                                         ByteStringList & rList,
                                         SvStream & rOutStm );
-    USHORT  			WriteSlotParamArray( SvIdlDataBase & rBase,
+    sal_uInt16  			WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvSlotElementList & rSlotList,
                                             SvStream & rOutStm );
-    USHORT				WriteSlots( const ByteString & rShellName, USHORT nCount,
+    sal_uInt16				WriteSlots( const ByteString & rShellName, sal_uInt16 nCount,
                                     SvSlotElementList & rSlotList,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
 
-    void				InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSuperList,
+    void				InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                                     SvMetaClassList & rClassList,
                                     const ByteString & rPrefix, SvIdlDataBase& rBase );
 
@@ -111,21 +111,21 @@ protected:
     virtual void 	ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void 	WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void    ReadContextSvIdl( SvIdlDataBase &,
                                      SvTokenStream & rInStm );
     virtual void	WriteContextSvIdl( SvIdlDataBase & rBase,
-                                     SvStream & rOutStm, USHORT nTab );
+                                     SvStream & rOutStm, sal_uInt16 nTab );
     void            WriteOdlMembers( ByteStringList & rSuperList,
-                                    BOOL bVariable, BOOL bWriteTab,
+                                    sal_Bool bVariable, sal_Bool bWriteTab,
                                     SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
             SvMetaClass();
 
-    BOOL                GetAutomation() const
+    sal_Bool                GetAutomation() const
                         { return aAutomation; }
     SvMetaClass *		GetSuperClass() const
                         { return aSuperClass; }
@@ -137,18 +137,18 @@ public:
                         { return aClassList; }
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void 		Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab,
+                                 sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
     virtual void		WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void		WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                                 Table* pTable );
     virtual void		WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                                  Table * pTable );
-    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void        WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 };
 SV_IMPL_REF(SvMetaClass)
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index 3c215bea8f..3c215bea8f 100644..100755
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index f3a3a3bddb..f3a3a3bddb 100644..100755
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 931cbc4926..e2840cc6aa 100644..100755
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -74,108 +74,108 @@ class SvMetaSlot : public SvMetaAttribute
     SvString		aDisableFlags;
     SvMetaSlot*		pLinkedSlot;
     SvMetaSlot*		pNextSlot;
-    ULONG			nListPos;
+    sal_uLong			nListPos;
     SvMetaEnumValue* pEnumValue;
     SvString    aUnoName;
 
 #ifdef IDL_COMPILER
     void			WriteSlot( const ByteString & rShellName,
-                            USHORT nCount, const ByteString & rSlotId,
+                            sal_uInt16 nCount, const ByteString & rSlotId,
                             SvSlotElementList &rList,
                             const ByteString & rPrefix,
                                SvIdlDataBase & rBase, SvStream & rOutStm );
     virtual void    Write( SvIdlDataBase & rBase,
-                            SvStream & rOutStm, USHORT nTab,
+                            SvStream & rOutStm, sal_uInt16 nTab,
                              WriteType, WriteAttribute = 0 );
 
     void			SetEnumValue(SvMetaEnumValue *p)
                     { pEnumValue = p; }
 #endif
 protected:
-    void    SetCachable( BOOL bSet )
+    void    SetCachable( sal_Bool bSet )
             {
                 aCachable = bSet;
                 if( bSet )
-                    aVolatile = FALSE;
+                    aVolatile = sal_False;
             }
-    void    SetVolatile( BOOL bSet )
+    void    SetVolatile( sal_Bool bSet )
             {
                 aVolatile = bSet;
                 if( bSet )
-                    aCachable = FALSE;
+                    aCachable = sal_False;
             }
-    void    SetToggle( BOOL bSet )
+    void    SetToggle( sal_Bool bSet )
             {
                 aToggle = bSet;
             }
-    void    SetAutoUpdate( BOOL bSet )
+    void    SetAutoUpdate( sal_Bool bSet )
             {
                 aAutoUpdate = bSet;
             }
 
-    void    SetSynchron( BOOL bSet )
+    void    SetSynchron( sal_Bool bSet )
             {
                 aSynchron = bSet;
                 if( bSet )
-                    aAsynchron = FALSE;
+                    aAsynchron = sal_False;
             }
-    void    SetAsynchron( BOOL bSet )
+    void    SetAsynchron( sal_Bool bSet )
             {
                 aAsynchron = bSet;
                 if( bSet )
-                    aSynchron = FALSE;
+                    aSynchron = sal_False;
             }
 
-    void    SetRecordPerItem( BOOL bSet )
+    void    SetRecordPerItem( sal_Bool bSet )
             {
                 aRecordPerItem = bSet;
                 if( bSet )
-                    aRecordPerSet = aRecordManual = aNoRecord = FALSE;
+                    aRecordPerSet = aRecordManual = aNoRecord = sal_False;
             }
-    void    SetRecordPerSet( BOOL bSet )
+    void    SetRecordPerSet( sal_Bool bSet )
             {
                 aRecordPerSet = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordManual = aNoRecord = FALSE;
+                    aRecordPerItem = aRecordManual = aNoRecord = sal_False;
             }
-    void    SetRecordManual( BOOL bSet )
+    void    SetRecordManual( sal_Bool bSet )
             {
                 aRecordManual = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordPerSet = aNoRecord = FALSE;
+                    aRecordPerItem = aRecordPerSet = aNoRecord = sal_False;
             }
-    void    SetNoRecord( BOOL bSet )
+    void    SetNoRecord( sal_Bool bSet )
             {
                 aNoRecord = bSet;
                 if( bSet )
-                    aRecordPerItem = aRecordPerSet = aRecordManual = FALSE;
+                    aRecordPerItem = aRecordPerSet = aRecordManual = sal_False;
             }
-    void    SetRecordAbsolute( BOOL bSet )
+    void    SetRecordAbsolute( sal_Bool bSet )
             { aRecordAbsolute = bSet; }
-    void    SetHasDialog( BOOL bSet )
+    void    SetHasDialog( sal_Bool bSet )
             { aHasDialog = bSet; }
-    void    SetMenuConfig( BOOL bSet )
+    void    SetMenuConfig( sal_Bool bSet )
             { aMenuConfig = bSet; }
-    void    SetToolBoxConfig( BOOL bSet )
+    void    SetToolBoxConfig( sal_Bool bSet )
             { aToolBoxConfig = bSet; }
-    void    SetStatusBarConfig( BOOL bSet )
+    void    SetStatusBarConfig( sal_Bool bSet )
             { aStatusBarConfig = bSet; }
-    void    SetAccelConfig( BOOL bSet )
+    void    SetAccelConfig( sal_Bool bSet )
             { aAccelConfig = bSet; }
-    void    SetAllConfig( BOOL bSet )
+    void    SetAllConfig( sal_Bool bSet )
             {
                 aMenuConfig     = bSet;
                 aToolBoxConfig  = bSet;
                 aStatusBarConfig = bSet;
                 aAccelConfig    = bSet;
             }
-    void    SetFastCall( BOOL bSet )
+    void    SetFastCall( sal_Bool bSet )
             { aFastCall = bSet; }
-    void    SetContainer( BOOL bSet )
+    void    SetContainer( sal_Bool bSet )
             { aContainer = bSet; }
-    void    SetImageRotation( BOOL bSet )
+    void    SetImageRotation( sal_Bool bSet )
             { aImageRotation = bSet; }
-    void    SetImageReflection( BOOL bSet )
+    void    SetImageReflection( sal_Bool bSet )
             { aImageReflection = bSet; }
 
 public:
@@ -186,52 +186,52 @@ public:
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
-    virtual BOOL    IsVariable() const;
-    virtual BOOL    IsMethod() const;
-    virtual ByteString	GetMangleName( BOOL bVariable ) const;
+    virtual sal_Bool    IsVariable() const;
+    virtual sal_Bool    IsMethod() const;
+    virtual ByteString	GetMangleName( sal_Bool bVariable ) const;
 
     SvMetaAttribute *	GetMethod() const;
     SvMetaType *		GetSlotType() const;
-    BOOL                GetHasCoreId() const;
+    sal_Bool                GetHasCoreId() const;
     const ByteString &      GetGroupId() const;
     const ByteString &      GetConfigId() const;
     const ByteString &      GetExecMethod() const;
     const ByteString &      GetStateMethod() const;
     const ByteString &      GetDefault() const;
     const ByteString &		GetDisableFlags() const;
-    BOOL                GetPseudoSlots() const;
-    BOOL                GetCachable() const;
-    BOOL                GetVolatile() const;
-    BOOL                GetToggle() const;
-    BOOL                GetAutoUpdate() const;
+    sal_Bool                GetPseudoSlots() const;
+    sal_Bool                GetCachable() const;
+    sal_Bool                GetVolatile() const;
+    sal_Bool                GetToggle() const;
+    sal_Bool                GetAutoUpdate() const;
 
-    BOOL                GetSynchron() const;
-    BOOL                GetAsynchron() const;
+    sal_Bool                GetSynchron() const;
+    sal_Bool                GetAsynchron() const;
 
-    BOOL                GetRecordPerItem() const;
-    BOOL                GetRecordPerSet() const;
-    BOOL                GetRecordManual() const;
-    BOOL                GetNoRecord() const;
-    BOOL                GetRecordAbsolute() const;
+    sal_Bool                GetRecordPerItem() const;
+    sal_Bool                GetRecordPerSet() const;
+    sal_Bool                GetRecordManual() const;
+    sal_Bool                GetNoRecord() const;
+    sal_Bool                GetRecordAbsolute() const;
 
-    BOOL                GetHasDialog() const;
+    sal_Bool                GetHasDialog() const;
     const ByteString &      GetPseudoPrefix() const;
     const ByteString &      GetUnoName() const;
-    BOOL                GetMenuConfig() const;
-    BOOL                GetToolBoxConfig() const;
-    BOOL                GetStatusBarConfig() const;
-    BOOL                GetAccelConfig() const;
-    BOOL                GetFastCall() const;
-    BOOL                GetContainer() const;
-    BOOL                GetImageRotation() const;
-    BOOL                GetImageReflection() const;
+    sal_Bool                GetMenuConfig() const;
+    sal_Bool                GetToolBoxConfig() const;
+    sal_Bool                GetStatusBarConfig() const;
+    sal_Bool                GetAccelConfig() const;
+    sal_Bool                GetFastCall() const;
+    sal_Bool                GetContainer() const;
+    sal_Bool                GetImageRotation() const;
+    sal_Bool                GetImageReflection() const;
     SvMetaSlot*			GetLinkedSlot() const
                         { return pLinkedSlot; }
     SvMetaSlot*			GetNextSlot() const
                         { return pNextSlot; }
-    ULONG				GetListPos() const
+    sal_uLong				GetListPos() const
                         { return nListPos; }
-    void 				SetListPos(ULONG n)
+    void 				SetListPos(sal_uLong n)
                         { nListPos = n; }
     void				ResetSlotPointer()
                         { pNextSlot = pLinkedSlot = 0; }
@@ -239,26 +239,26 @@ public:
 #ifdef IDL_COMPILER
     SvMetaEnumValue*	GetEnumValue() const
                         { return pEnumValue; }
-    virtual BOOL 		Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool 		Test( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
     virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, USHORT nTab );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+                                              SvStream & rOutStm, sal_uInt16 nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void        WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual	void		Insert( SvSlotElementList&, const ByteString & rPrefix,
                                 SvIdlDataBase& );
     void				WriteSlotStubs( const ByteString & rShellName,
                                     ByteStringList & rList,
                                     SvStream & rOutStm );
-    USHORT      		WriteSlotMap( const ByteString & rShellName,
-                                    USHORT nCount,
+    sal_uInt16      		WriteSlotMap( const ByteString & rShellName,
+                                    sal_uInt16 nCount,
                                     SvSlotElementList&,
                                     const ByteString &,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm );
-    USHORT  			WriteSlotParamArray( SvIdlDataBase & rBase,
+    sal_uInt16  			WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvStream & rOutStm );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                                   Table * pIdTable );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 4678912b1d..79b1391297 100644..100755
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,75 +48,75 @@ class SvMetaAttribute : public SvMetaReference
     SvBOOL          	aIsCollection;
     SvBOOL          	aReadOnlyDoc;
     SvBOOL				aHidden;
-    BOOL				bNewAttr;
+    sal_Bool				bNewAttr;
 
 protected:
 #ifdef IDL_COMPILER
     virtual void WriteCSource( SvIdlDataBase & rBase,
-                                 SvStream & rOutStm, BOOL bSet );
-    ULONG		 MakeSlotValue( SvIdlDataBase & rBase, BOOL bVariable ) const;
+                                 SvStream & rOutStm, sal_Bool bSet );
+    sal_uLong		 MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
     virtual void WriteAttributes( SvIdlDataBase & rBase,
-                                      SvStream & rOutStm, USHORT nTab,
+                                      SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0 );
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
     virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
+                                    SvStream & rOutStm, sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 )
                         SvMetaAttribute();
                         SvMetaAttribute( SvMetaType * );
 
-    void 				SetNewAttribute( BOOL bNew )
+    void 				SetNewAttribute( sal_Bool bNew )
                         { bNewAttr = bNew; }
-    BOOL				IsNewAttribute() const
+    sal_Bool				IsNewAttribute() const
                         { return bNewAttr; }
-    BOOL                GetReadonly() const;
+    sal_Bool                GetReadonly() const;
 
     void				SetSlotId( const SvNumberIdentifier & rId )
                         { aSlotId = rId; }
     const SvNumberIdentifier & GetSlotId() const;
 
-    void    			SetExport( BOOL bSet )
+    void    			SetExport( sal_Bool bSet )
                         { aExport = bSet; }
-    BOOL                GetExport() const;
+    sal_Bool                GetExport() const;
 
-    void    			SetHidden( BOOL bSet )
+    void    			SetHidden( sal_Bool bSet )
                         { aHidden = bSet; }
-    BOOL                GetHidden() const;
+    sal_Bool                GetHidden() const;
 
-    void    			SetAutomation( BOOL bSet )
+    void    			SetAutomation( sal_Bool bSet )
                         { aAutomation = bSet; }
-    BOOL                GetAutomation() const;
+    sal_Bool                GetAutomation() const;
 
-    void    			SetIsCollection( BOOL bSet )
+    void    			SetIsCollection( sal_Bool bSet )
                         { aIsCollection = bSet; }
-    BOOL    			GetIsCollection() const;
-    void    			SetReadOnlyDoc( BOOL bSet )
+    sal_Bool    			GetIsCollection() const;
+    void    			SetReadOnlyDoc( sal_Bool bSet )
                         { aReadOnlyDoc = bSet; }
-    BOOL                GetReadOnlyDoc() const;
+    sal_Bool                GetReadOnlyDoc() const;
 
     void				SetType( SvMetaType * pT ) { aType = pT; }
     SvMetaType *        GetType() const;
 
-    virtual BOOL		IsMethod() const;
-    virtual BOOL		IsVariable() const;
-    virtual ByteString   	GetMangleName( BOOL bVariable ) const;
+    virtual sal_Bool		IsMethod() const;
+    virtual sal_Bool		IsVariable() const;
+    virtual ByteString   	GetMangleName( sal_Bool bVariable ) const;
 
 
 #ifdef IDL_COMPILER
-    virtual BOOL		Test( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool		Test( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType );
     void        		WriteRecursiv_Impl( SvIdlDataBase & rBase,
-                                        SvStream & rOutStm, USHORT nTab,
+                                        SvStream & rOutStm, sal_uInt16 nTab,
                                           WriteType, WriteAttribute );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    ULONG				MakeSfx( ByteString * pAtrrArray );
+    sal_uLong				MakeSfx( ByteString * pAtrrArray );
     virtual	void		Insert( SvSlotElementList&, const ByteString & rPrefix,
                                 SvIdlDataBase& );
     virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -149,30 +149,30 @@ class SvMetaType : public SvMetaExtern
     SvIdentifier				aBasicName;
     SvMetaAttributeMemberList * pAttrList;
     int							nType;
-    BOOL						bIsItem;
-    BOOL						bIsShell;
+    sal_Bool						bIsItem;
+    sal_Bool						bIsShell;
     char						cParserChar;
 
 #ifdef IDL_COMPILER
     void	WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
                         SvStream & rOutStm );
 protected:
-    BOOL 		ReadNamesSvIdl( SvIdlDataBase & rBase,
+    sal_Bool 		ReadNamesSvIdl( SvIdlDataBase & rBase,
                                          SvTokenStream & rInStm );
     virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   USHORT nTab );
+                                   sal_uInt16 nTab );
 
     virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                      USHORT nTab,
+                                      sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
-    BOOL 	ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    sal_Bool 	ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     void 	WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                              USHORT nTab );
+                              sal_uInt16 nTab );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
@@ -185,7 +185,7 @@ public:
                         const ByteString & rBasicPostfix );
 
     SvMetaAttributeMemberList &	GetAttrList() const;
-    ULONG				GetAttrCount() const
+    sal_uLong				GetAttrCount() const
                         {
                             return pAttrList ? pAttrList->Count() : 0L;
                         }
@@ -198,14 +198,14 @@ public:
     int 				GetType() const { return nType; }
     SvMetaType *		GetBaseType() const;
     SvMetaType *		GetReturnType() const;
-    BOOL				IsItem() const { return bIsItem; }
-    BOOL				IsShell() const { return bIsShell; }
+    sal_Bool				IsItem() const { return bIsItem; }
+    sal_Bool				IsShell() const { return bIsShell; }
 
-    void                SetIn( BOOL b ) { aIn = b; }
-    BOOL                GetIn() const;
+    void                SetIn( sal_Bool b ) { aIn = b; }
+    sal_Bool                GetIn() const;
 
-    void                SetOut( BOOL b ) { aOut = b; }
-    BOOL                GetOut() const;
+    void                SetOut( sal_Bool b ) { aOut = b; }
+    sal_Bool                GetOut() const;
 
     void                SetCall0( int e );
     int				    GetCall0() const;
@@ -224,27 +224,27 @@ public:
     const ByteString &      GetCName() const;
     char				GetParserChar() const { return cParserChar; }
 
-    virtual BOOL        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+    virtual sal_Bool        SetName( const ByteString & rName, SvIdlDataBase * = NULL );
 
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void 		WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                    SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
     ByteString              GetCString() const;
-    void                WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    void                WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    void                WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
     void 				AppendParserString (ByteString &rString);
 
-    ULONG				MakeSfx( ByteString * pAtrrArray );
+    sal_uLong				MakeSfx( ByteString * pAtrrArray );
     virtual void 		WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
-    BOOL 				ReadMethodArgs( SvIdlDataBase & rBase,
+    sal_Bool 				ReadMethodArgs( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm );
-    void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
-    void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
-    void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
+    void                WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+    void                WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+    void                WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
     ByteString				GetParserString() const;
     void        		WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
                                         const ByteString & rChief );
@@ -272,9 +272,9 @@ public:
             SvMetaEnumValue();
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
-    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+    virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 };
@@ -290,26 +290,26 @@ protected:
 #ifdef IDL_COMPILER
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   USHORT nTab );
-    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+                                   sal_uInt16 nTab );
+    virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 public:
             SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
             SvMetaTypeEnum();
 
-    USHORT              GetMaxValue() const;
-    ULONG               Count() const { return aEnumValueList.Count(); }
+    sal_uInt16              GetMaxValue() const;
+    sal_uLong               Count() const { return aEnumValueList.Count(); }
     const ByteString &      GetPrefix() const { return aPrefix; }
-    SvMetaEnumValue *   GetObject( ULONG n ) const
+    SvMetaEnumValue *   GetObject( sal_uLong n ) const
                         { return aEnumValueList.GetObject( n ); }
 
 #ifdef IDL_COMPILER
-    virtual BOOL        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+    virtual sal_Bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
 
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                USHORT nTab,
+                                sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 );
 #endif
 };
diff --git a/idl/prj/build.lst b/idl/prj/build.lst
index e5f36475ee..e5f36475ee 100644..100755
--- a/idl/prj/build.lst
+++ b/idl/prj/build.lst
diff --git a/idl/prj/d.lst b/idl/prj/d.lst
index bd88bc495f..bd88bc495f 100644..100755
--- a/idl/prj/d.lst
+++ b/idl/prj/d.lst
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index bd47aa5d26..be37d1ed20 100644..100755
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -80,20 +80,20 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
     if( !pCharTable )
         pCharTable = new Table();
 
-    BYTE * pSet;
-    pSet = (BYTE *)pCharTable->Get( ((ULONG)nSource << 16) + (ULONG)nDest );
+    sal_uInt8 * pSet;
+    pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uLong)nSource << 16) + (sal_uLong)nDest );
 
     if( !pSet )
     {
-        pSet = new BYTE[ 256 ];
+        pSet = new sal_uInt8[ 256 ];
         memcpy( pSet, EqualTab, sizeof( EqualTab ) );
-        for( USHORT i = 128; i < 256; i++ )
+        for( sal_uInt16 i = 128; i < 256; i++ )
         {
             char c = ByteString::Convert( pSet[i], nSource, nDest );
             if( c )
-                pSet[ i ] = (BYTE)c;
+                pSet[ i ] = (sal_uInt8)c;
         }
-        pCharTable->Insert( ((ULONG)nSource << 16) + (ULONG)nDest, pSet );
+        pCharTable->Insert( ((sal_uLong)nSource << 16) + (sal_uLong)nDest, pSet );
     }
 
     return (char *)pSet;
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index bded3d1f7a..6ddc5a618b 100644..100755
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -40,7 +40,7 @@
 
 SvStringHashEntry::~SvStringHashEntry() { };
 
-SvHashTable::SvHashTable( UINT32 nMaxEntries )
+SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
 {
     nMax = nMaxEntries;     // set max entries
     nFill = 0;              // no entries
@@ -52,12 +52,12 @@ SvHashTable::~SvHashTable()
 {
 }
 
-BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
-                               UINT32 * pInsertPos )
+sal_Bool SvHashTable::Test_Insert( const void * pElement, sal_Bool bInsert,
+                               sal_uInt32 * pInsertPos )
 {
-    UINT32    nHash;
-    UINT32    nIndex;
-    UINT32    nLoop;
+    sal_uInt32    nHash;
+    sal_uInt32    nIndex;
+    sal_uInt32    nLoop;
 
     lAsk++;
     lTry++;
@@ -72,11 +72,11 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
         {
             if( pInsertPos )
                 *pInsertPos = nIndex;               // place of Element
-            return TRUE;
+            return sal_True;
         }
         nLoop++;
         lTry++;
-        nIndex = (USHORT)(nIndex + nHash + 7) % nMax;
+        nIndex = (sal_uInt16)(nIndex + nHash + 7) % nMax;
     }
 
     if( bInsert )
@@ -86,19 +86,15 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
         {
             nFill++;
             *pInsertPos = nIndex;                       // return free place
-            return TRUE;
+            return sal_True;
         }
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries )
+SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries )
         : SvHashTable( nMaxEntries )
 {
-#ifdef WIN
-    DBG_ASSERT( (UINT32)nMaxEntries * sizeof( SvStringHashEntry ) <= 0xFF00,
-                "Hash table size cannot exeed 64k byte" )
-#endif
     pEntries = new SvStringHashEntry[ nMaxEntries ];
 
     // set RefCount to one
@@ -129,18 +125,18 @@ SvStringHashTable::~SvStringHashTable()
     delete [] pEntries;
 }
 
-UINT32 SvStringHashTable::HashFunc( const void * pElement ) const
+sal_uInt32 SvStringHashTable::HashFunc( const void * pElement ) const
 {
-    UINT32          nHash = 0;  // hash value
+    sal_uInt32          nHash = 0;  // hash value
     const char *    pStr = ((const ByteString * )pElement)->GetBuffer();
 
     int nShift = 0;
     while( *pStr )
     {
         if( isupper( *pStr ) )
-            nHash ^= UINT32(*pStr - 'A' + 26) << nShift;
+            nHash ^= sal_uInt32(*pStr - 'A' + 26) << nShift;
         else
-            nHash ^= UINT32(*pStr - 'a') << nShift;
+            nHash ^= sal_uInt32(*pStr - 'a') << nShift;
         if( nShift == 28 )
             nShift = 0;
         else
@@ -152,7 +148,7 @@ UINT32 SvStringHashTable::HashFunc( const void * pElement ) const
 
 ByteString SvStringHashTable::GetNearString( const ByteString & rName ) const
 {
-    for( UINT32 i = 0; i < GetMax(); i++ )
+    for( sal_uInt32 i = 0; i < GetMax(); i++ )
     {
         SvStringHashEntry * pE = Get( i );
         if( pE )
@@ -164,34 +160,34 @@ ByteString SvStringHashTable::GetNearString( const ByteString & rName ) const
     return ByteString();
 }
 
-BOOL SvStringHashTable::IsEntry( UINT32 nIndex ) const
+sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
 {
     if( nIndex >= GetMax() )
-        return FALSE;
+        return sal_False;
     return pEntries[ nIndex ].HasId();
 }
 
-BOOL SvStringHashTable::Insert( const ByteString & rName, UINT32 * pIndex )
+sal_Bool SvStringHashTable::Insert( const ByteString & rName, sal_uInt32 * pIndex )
 {
-    UINT32 nIndex;
+    sal_uInt32 nIndex;
 
     if( !pIndex ) pIndex = &nIndex;
 
-    if( !SvHashTable::Test_Insert( &rName, TRUE, pIndex ) )
-        return FALSE;
+    if( !SvHashTable::Test_Insert( &rName, sal_True, pIndex ) )
+        return sal_False;
 
     if( !IsEntry( *pIndex ) )
         pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvStringHashTable::Test( const ByteString & rName, UINT32 * pPos ) const
+sal_Bool SvStringHashTable::Test( const ByteString & rName, sal_uInt32 * pPos ) const
 {
     return ((SvStringHashTable *)this)->SvHashTable::
-                Test_Insert( &rName, FALSE, pPos );
+                Test_Insert( &rName, sal_False, pPos );
 }
 
-SvStringHashEntry * SvStringHashTable::Get( UINT32 nIndex ) const
+SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
 {
     if( IsEntry( nIndex ) )
         return pEntries + nIndex;
@@ -199,14 +195,14 @@ SvStringHashEntry * SvStringHashTable::Get( UINT32 nIndex ) const
 }
 
 StringCompare SvStringHashTable::Compare( const void * pElement,
-                                          UINT32 nIndex ) const
+                                          sal_uInt32 nIndex ) const
 {
     return ((const ByteString *)pElement)->CompareTo( pEntries[ nIndex ].GetName() );
 }
 
 void SvStringHashTable::FillHashList( SvStringHashList * pList ) const
 {
-    for( UINT32 n = 0; n < GetMax(); n++ )
+    for( sal_uInt32 n = 0; n < GetMax(); n++ )
     {
         if( IsEntry( n ) )
             pList->push_back( Get( n ) );
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 25feb28686..41775ab191 100644..100755
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -196,14 +196,14 @@ int SvTokenStream::GetNextChar()
             return '\0';
         }
     }
-    nChar = aBufStr.GetChar( (USHORT)nBufPos++ );
+    nChar = aBufStr.GetChar( (sal_uInt16)nBufPos++ );
     nColumn += nChar == '\t' ? nTabSize : 1;
     return nChar;
 }
 
-ULONG SvTokenStream::GetNumber()
+sal_uLong SvTokenStream::GetNumber()
 {
-    ULONG   l = 0;
+    sal_uLong   l = 0;
     short   nLog = 10;
 
     if( '0' == c )
@@ -239,7 +239,7 @@ ULONG SvTokenStream::GetNumber()
     return( l );
 }
 
-BOOL SvTokenStream::MakeToken( SvToken & rToken )
+sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
 {
     do
     {
@@ -254,8 +254,8 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
     }
     while( 0 == c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
 
-    ULONG nLastLine		= nLine;
-    ULONG nLastColumn	= nColumn;
+    sal_uLong nLastLine		= nLine;
+    sal_uLong nLastColumn	= nColumn;
     // comment
     if( '/' == c )
     {
@@ -282,7 +282,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                     {
                         c = GetNextChar();
                         if( IsEof() )
-                            return FALSE;
+                            return sal_False;
                     }
                     else
                         c = GetFastNextChar();
@@ -291,7 +291,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
             }
             while( '/' != c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) );
             if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
-                return FALSE;
+                return sal_False;
             c = GetNextChar();
             rToken.nType = SVTOKEN_COMMENT;
             CalcColumn();
@@ -305,7 +305,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
     else if( c == '"' )
     {
         ByteString          aStr;
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
         while( !bDone && !IsEof() && c )
         {
             c = GetFastNextChar();
@@ -315,7 +315,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                 aStr += '\n';
                 c = GetNextChar();
                 if( IsEof() )
-                    return FALSE;
+                    return sal_False;
             }
             if( c == '"' )
             {
@@ -326,7 +326,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                     aStr += '"';
                 }
                 else
-                    bDone = TRUE;
+                    bDone = sal_True;
             }
             else if( c == '\\' )
             {
@@ -339,7 +339,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
                 aStr += (char)c;
         }
         if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) )
-            return FALSE;
+            return sal_False;
         char * pStr = (char *)aStr.GetBuffer();
         while( *pStr )
         {
@@ -367,16 +367,16 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
         if( aStr.EqualsIgnoreCaseAscii( aStrTrue ) )
         {
             rToken.nType = SVTOKEN_BOOL;
-            rToken.bBool = TRUE;
+            rToken.bBool = sal_True;
         }
         else if( aStr.EqualsIgnoreCaseAscii( aStrFalse ) )
         {
             rToken.nType = SVTOKEN_BOOL;
-            rToken.bBool = FALSE;
+            rToken.bBool = sal_False;
         }
         else
         {
-            UINT32 nHashId;
+            sal_uInt32 nHashId;
             if( IDLAPP->pHashTable->Test( aStr, &nHashId ) )
                 rToken.SetHash( IDLAPP->pHashTable->Get( nHashId ) );
             else
diff --git a/idl/source/cmptools/makefile.mk b/idl/source/cmptools/makefile.mk
index bf53623dfd..bf53623dfd 100644..100755
--- a/idl/source/cmptools/makefile.mk
+++ b/idl/source/cmptools/makefile.mk
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 7ae3def89d..e6ca91fba1 100644..100755
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -53,7 +53,7 @@ void SvMetaObject::Save( SvPersistStream & )
 }
 
 #ifdef IDL_COMPILER
-void SvMetaObject::WriteTab( SvStream & rOutStm, USHORT nTab )
+void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
 {
     while( nTab-- )
         rOutStm << "    ";
@@ -67,18 +67,18 @@ void SvMetaObject::WriteStars( SvStream & rOutStm )
     rOutStm << '/' << endl;
 }
 
-BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
+sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos )
 {
     // write no empty brackets
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nBegPos );
-    BOOL bOnlySpace = TRUE;
+    sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
     {
         char c;
         rOutStm >> c;
         if( !isspace( c ) )
-            bOnlySpace = FALSE;
+            bOnlySpace = sal_False;
     }
     if( bOnlySpace )
         // nothing written
@@ -91,7 +91,7 @@ BOOL SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, ULONG nBegPos )
 void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
 {
     // write no empty brackets
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.SeekRel( -1 );
     char c = 0;
     rOutStm >> c;
@@ -108,25 +108,25 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
         rOutStm.Seek( nPos );
 }
 
-BOOL SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & )
 {
-    return FALSE;
+    return sal_False;
 }
 
-void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
-void SvMetaObject::Write( SvIdlDataBase &, SvStream &, USHORT /*nTab */,
+void SvMetaObject::Write( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */,
                              WriteType, WriteAttribute )
 {
 }
 
-void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteCxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
-void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, USHORT /*nTab */ )
+void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ )
 {
 }
 
@@ -140,7 +140,7 @@ SvMetaName::SvMetaName()
 void SvMetaName::Load( SvPersistStream & rStm )
 {
     SvMetaObject::Load( rStm );
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
 
     if( nMask >= 0x20 )
@@ -159,7 +159,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
 void SvMetaName::Save( SvPersistStream & rStm )
 {
     SvMetaObject::Save( rStm );
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aName.IsSet() )			nMask |= 0x01;
     if( aHelpContext.IsSet() )  nMask |= 0x02;
     if( aHelpText.IsSet() )   	nMask |= 0x04;
@@ -174,32 +174,32 @@ void SvMetaName::Save( SvPersistStream & rStm )
     if( nMask & 0x10 ) rStm << aDescription;
 }
 
-BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
 {
     aName = rName;
-    return TRUE;
+    return sal_True;
 }
 
 #ifdef IDL_COMPILER
-BOOL SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
                                 SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     // read module name
     if( pTok->IsIdentifier() )
         if( SetName( pTok->GetString(), &rBase ) )
-            return TRUE;
+            return sal_True;
 
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     if( aName.ReadSvIdl( SvHash_Name(), rInStm ) )
     {
         if( !SetName( aName, &rBase ) )
@@ -214,7 +214,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase,
                                    SvTokenStream & rInStm, char cDel )
 {
-    UINT32 nBeginPos = 0; // can not happen with Tell
+    sal_uInt32 nBeginPos = 0; // can not happen with Tell
     while( nBeginPos != rInStm.Tell() )
     {
         nBeginPos = rInStm.Tell();
@@ -230,12 +230,12 @@ void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & )
 {
 }
 
-BOOL SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
+sal_Bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & )
 {
-    return TRUE;
+    return sal_True;
 }
 
-void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, USHORT )
+void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 )
 {
 }
 
@@ -244,7 +244,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
     rOutStm << "<DESCRIPTION>" << endl;
 
     ByteString aDesc( GetDescription() );
-    USHORT nPos = aDesc.Search( '\n' );
+    sal_uInt16 nPos = aDesc.Search( '\n' );
     while ( nPos != STRING_NOTFOUND )
     {
         rOutStm << aDesc.Copy( 0, nPos ).GetBuffer() << endl;
@@ -257,7 +257,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
 
 void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                        SvStream & rOutStm,
-                                       USHORT nTab )
+                                       sal_uInt16 nTab )
 {
     if( aHelpContext.IsSet() || aHelpText.IsSet() || aConfigName.IsSet() )
     {
@@ -284,13 +284,13 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase,
     }
 }
 
-BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
-    BOOL bOk = TRUE;
+    sal_uInt32 nTokPos = rInStm.Tell();
+    sal_Bool bOk = sal_True;
     if( rInStm.Read( '[' ) )
     {
-        UINT32 nBeginPos = 0; // can not happen with Tell
+        sal_uInt32 nBeginPos = 0; // can not happen with Tell
         while( nBeginPos != rInStm.Tell() )
         {
             nBeginPos = rInStm.Tell();
@@ -315,12 +315,12 @@ BOOL SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 }
 
 void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    ULONG nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributesSvIdl( rBase, rOutStm, nTab +1 );
 
     // write no empty brackets
@@ -352,25 +352,25 @@ void SvMetaName::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                           USHORT nTab,
+                           sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
-    ULONG nBeginPos = rOutStm.Tell();
+    sal_uLong nBeginPos = rOutStm.Tell();
     WriteTab( rOutStm, nTab );
     rOutStm << '[' << endl;
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     WriteAttributes( rBase, rOutStm, nTab +1, nT, nA );
 
     // write no empty brackets
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm.Seek( nOldPos );
-    BOOL bOnlySpace = TRUE;
+    sal_Bool bOnlySpace = sal_True;
     while( bOnlySpace && rOutStm.Tell() < nPos )
     {
         char c;
         rOutStm >> c;
         if( !isspace( c ) )
-            bOnlySpace = FALSE;
+            bOnlySpace = sal_False;
     }
     if( bOnlySpace )
         // nothing written
@@ -384,7 +384,7 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
-                                USHORT nTab,
+                                sal_uInt16 nTab,
                                  WriteType, WriteAttribute )
 {
     if( GetHelpText().IsSet() || GetHelpContext().IsSet() )
@@ -408,7 +408,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
 }
 
 void SvMetaName::WriteContext( SvIdlDataBase &, SvStream &,
-                                USHORT,
+                                sal_uInt16,
                                  WriteType, WriteAttribute )
 {
 }
@@ -424,7 +424,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
 {
     SvMetaName::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x2 )
     {
@@ -445,7 +445,7 @@ void SvMetaReference::Save( SvPersistStream & rStm )
     SvMetaName::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aRef.Is() )
         nMask |= 0x01;
 
@@ -458,8 +458,8 @@ SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference );
 
 SvMetaExtern::SvMetaExtern()
     : pModule( NULL )
-    , bReadUUId( FALSE )
-    , bReadVersion( FALSE )
+    , bReadUUId( sal_False )
+    , bReadVersion( sal_False )
 {
 }
 
@@ -467,7 +467,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
 {
     SvMetaReference::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x20 )
     {
@@ -478,8 +478,8 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
     if( nMask & 0x01 ) rStm >> pModule;
     if( nMask & 0x02 ) rStm >> aUUId;
     if( nMask & 0x04 ) rStm >> aVersion;
-    if( nMask & 0x08 ) bReadUUId = TRUE;
-    if( nMask & 0x10 ) bReadVersion = TRUE;
+    if( nMask & 0x08 ) bReadUUId = sal_True;
+    if( nMask & 0x10 ) bReadVersion = sal_True;
 }
 
 void SvMetaExtern::Save( SvPersistStream & rStm )
@@ -487,7 +487,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm )
     SvMetaReference::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( pModule )                	nMask |= 0x01;
     if( aUUId != SvGlobalName() )	nMask |= 0x02;
     if( aVersion != SvVersion() )	nMask |= 0x04;
@@ -527,13 +527,13 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
     if( aUUId.ReadSvIdl( rBase, rInStm ) )
-        bReadUUId = TRUE;
+        bReadUUId = sal_True;
     if( aVersion.ReadSvIdl( rInStm ) )
-        bReadVersion = TRUE;
+        bReadVersion = sal_True;
 }
 
 void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                         SvStream & rOutStm, USHORT nTab )
+                                         SvStream & rOutStm, sal_uInt16 nTab )
 {
     SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     if( bReadUUId || bReadVersion )
@@ -556,7 +556,7 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase,
     }
 }
 
-BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
     SetModule( rBase );
     GetUUId(); // id gets created
@@ -564,20 +564,20 @@ BOOL SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 }
 
 void SvMetaExtern::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                               USHORT nTab )
+                               sal_uInt16 nTab )
 {
     SvMetaReference::WriteSvIdl( rBase, rOutStm, nTab );
 }
 
 void SvMetaExtern::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                        USHORT nTab,
+                        sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
     SvMetaReference::Write( rBase, rOutStm, nTab, nT, nA );
 }
 
 void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                     USHORT nTab,
+                                     sal_uInt16 nTab,
                                      WriteType nT, WriteAttribute nA )
 {
     SvMetaReference::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 91356dd4a1..3ba2c8d1da 100644..100755
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -40,50 +40,50 @@
 #include <database.hxx>
 
 #ifdef IDL_COMPILER
-static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
-                            ULONG nMin, ULONG nMax, ULONG* pValue )
+static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
+                            sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         if( rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken_Next();
             if( pTok->IsInteger() )
             {
-                ULONG n = pTok->GetNumber();
+                sal_uLong n = pTok->GetNumber();
                 if ( n >= nMin && n <= nMax )
                 {
                     *pValue = n;
-                    bOk = TRUE;
+                    bOk = sal_True;
                 }
             }
         }
 
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
 
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 #endif
 
-UINT32 SvUINT32::Read( SvStream & rStm )
+sal_uInt32 SvUINT32::Read( SvStream & rStm )
 {
     return SvPersistStream::ReadCompressed( rStm );
 }
 
-void SvUINT32::Write( SvStream & rStm, UINT32 nVal )
+void SvUINT32::Write( SvStream & rStm, sal_uInt32 nVal )
 {
     SvPersistStream::WriteCompressed( rStm, nVal );
 }
 
 SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
 {
-    BYTE n = rb.nVal;
+    sal_uInt8 n = rb.nVal;
     if( rb.bSet )
         n |= 0x02;
     rStm << n;
@@ -91,10 +91,10 @@ SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
 }
 SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
 {
-    BYTE n;
+    sal_uInt8 n;
     rStm >> n;
-    rb.nVal = (n & 0x01) ? TRUE : FALSE;
-    rb.bSet = (n & 0x02) ? TRUE : FALSE;
+    rb.nVal = (n & 0x01) ? sal_True : sal_False;
+    rb.bSet = (n & 0x02) ? sal_True : sal_False;
     if( n & ~0x03 )
     {
         rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
@@ -113,11 +113,11 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
 
         int n = r.GetMajorVersion() << 4;
         n |= r.GetMinorVersion();
-        rStm << (BYTE)n;
+        rStm << (sal_uInt8)n;
     }
     else
     {
-        rStm << (BYTE)0;
+        rStm << (sal_uInt8)0;
         rStm << r.GetMajorVersion();
         rStm << r.GetMinorVersion();
     }
@@ -126,7 +126,7 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r )
 
 SvStream& operator >> (SvStream & rStm, SvVersion & r )
 {
-    BYTE n;
+    sal_uInt8 n;
     rStm >> n;
     if( n == 0 )
     { // not compressed
@@ -143,15 +143,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r )
 
 
 #ifdef IDL_COMPILER
-BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -165,21 +165,21 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         else
-            *this = TRUE; //default action set to TRUE
+            *this = sal_True; //default action set to TRUE
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
+sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
 {
     if( nVal )
         rOutStm << pName->GetName().GetBuffer();
     else
         rOutStm << pName->GetName().GetBuffer() << "(FALSE)";
-    return TRUE;
+    return sal_True;
 }
 
 ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
@@ -195,15 +195,15 @@ ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
 }
 
 
-BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -216,19 +216,19 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
+sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
                                SvStream & rOutStm,
-                               USHORT /*nTab */ )
+                               sal_uInt16 /*nTab */ )
 {
     rOutStm << pName->GetName().GetBuffer() << '(';
     rOutStm << GetBuffer() << ')';
-    return TRUE;
+    return sal_True;
 }
 
 SvStream& operator << (SvStream & rStm, const SvIdentifier & r )
@@ -244,17 +244,17 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r )
 }
 
 
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvStringHashEntry * pName,
                                     SvTokenStream & rInStm )
 {
     if( SvIdentifier::ReadSvIdl( pName, rInStm ) )
     {
-        ULONG n;
+        sal_uLong n;
         if( rBase.FindId( *this, &n ) )
         {
             nValue = n;
-            return TRUE;
+            return sal_True;
         }
         else
         {
@@ -265,23 +265,23 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
             rBase.WriteError( rInStm );
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
                                     SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->IsIdentifier() )
     {
-        ULONG n;
+        sal_uLong n;
         if( rBase.FindId( pTok->GetString(), &n ) )
         {
             *(ByteString *)this = pTok->GetString();
             nValue = n;
-            return TRUE;
+            return sal_True;
         }
         else
         {
@@ -293,7 +293,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
         }
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 SvStream& operator << (SvStream & rStm, const SvNumberIdentifier & r )
@@ -311,15 +311,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r )
 }
 
 
-BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
+sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( pName ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -332,18 +332,18 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                           USHORT /*nTab */ )
+sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+                           sal_uInt16 /*nTab */ )
 {
     rOutStm << pName->GetName().GetBuffer() << "(\"";
     rOutStm << GetBuffer() << "\")";
-    return TRUE;
+    return sal_True;
 }
 
 SvStream& operator << (SvStream & rStm, const SvString & r )
@@ -359,25 +359,25 @@ SvStream& operator >> (SvStream & rStm, SvString & r )
 }
 
 
-BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 {
     return SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
 }
 
-BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
+sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab )
 {
     return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab );
 }
 
-BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
+sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_uuid() ) )
     {
-        BOOL bOk = TRUE;
-        BOOL bBraket = rInStm.Read( '(' );
+        sal_Bool bOk = sal_True;
+        sal_Bool bBraket = rInStm.Read( '(' );
         if( bBraket || rInStm.Read( '=' ) )
         {
             pTok = rInStm.GetToken();
@@ -390,51 +390,51 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
                 bOk = rInStm.Read( ')' );
         }
         if( bOk )
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
 {
     // write global id
     rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\"";
     rOutStm << ByteString( GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\")";
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
+sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
 {
-    ULONG n = 0;
+    sal_uLong n = 0;
 
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
     if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
     {
-        nMajorVersion = (USHORT)n;
+        nMajorVersion = (sal_uInt16)n;
         if( rInStm.Read( '.' ) )
         {
             SvToken * pTok = rInStm.GetToken_Next();
             if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
             {
-                nMinorVersion = (USHORT)pTok->GetNumber();
-                return TRUE;
+                nMinorVersion = (sal_uInt16)pTok->GetNumber();
+                return sal_True;
             }
         }
         else
-            return TRUE;
+            return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvVersion::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm )
 {
     rOutStm << SvHash_Version()->GetName().GetBuffer() << '('
             << ByteString::CreateFromInt32( nMajorVersion ).GetBuffer() << '.'
             << ByteString::CreateFromInt32( nMinorVersion ).GetBuffer() << ')';
-    return TRUE;
+    return sal_True;
 }
 #endif //IDL_COMPILER
 
diff --git a/idl/source/objects/makefile.mk b/idl/source/objects/makefile.mk
index e141d85540..e141d85540 100644..100755
--- a/idl/source/objects/makefile.mk
+++ b/idl/source/objects/makefile.mk
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 6b7cdcf86f..84fe62e818 100644..100755
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -42,16 +42,16 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
 
 SvMetaModule::SvMetaModule()
 #ifdef IDL_COMPILER
-    : bImported( FALSE )
-    , bIsModified( FALSE )
+    : bImported( sal_False )
+    , bIsModified( sal_False )
 #endif
 {
 }
 
 #ifdef IDL_COMPILER
-SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
+SvMetaModule::SvMetaModule( const String & rIdlFileName, sal_Bool bImp )
     : aIdlFileName( rIdlFileName )
-    , bImported( bImp ), bIsModified( FALSE )
+    , bImported( bImp ), bIsModified( sal_False )
 {
 }
 #endif
@@ -59,10 +59,10 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
 #define MODULE_VER      0x0001
 void SvMetaModule::Load( SvPersistStream & rStm )
 {
-    bImported = TRUE; // import always
+    bImported = sal_True; // import always
     SvMetaExtern::Load( rStm );
 
-    USHORT nVer;
+    sal_uInt16 nVer;
 
     rStm >> nVer; // version
     DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" );
@@ -77,7 +77,7 @@ void SvMetaModule::Load( SvPersistStream & rStm )
     rStm.ReadByteString( aModulePrefix );
 
     // read compiler data
-    USHORT nCmpLen;
+    sal_uInt16 nCmpLen;
     rStm >> nCmpLen;
 #ifdef IDL_COMPILER
     DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER,
@@ -94,7 +94,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
 {
     SvMetaExtern::Save( rStm );
 
-    rStm << (USHORT)(MODULE_VER | IDL_WRITE_COMPILER); // version
+    rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version
 
     rStm << aClassList;
     rStm << aTypeList;
@@ -106,43 +106,43 @@ void SvMetaModule::Save( SvPersistStream & rStm )
     rStm.WriteByteString( aModulePrefix );
 
     // write compiler data
-    USHORT nCmpLen = 0;
-    ULONG nLenPos = rStm.Tell();
+    sal_uInt16 nCmpLen = 0;
+    sal_uLong nLenPos = rStm.Tell();
     rStm << nCmpLen;
 #ifdef IDL_COMPILER
     rStm << aBeginName;
     rStm << aEndName;
     rStm << aNextName;
     // write length of compiler data
-    ULONG nPos = rStm.Tell();
+    sal_uLong nPos = rStm.Tell();
     rStm.Seek( nLenPos );
-    rStm << (USHORT)( nPos - nLenPos - sizeof( USHORT ) );
+    rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) );
     rStm.Seek( nPos );
 #endif
 }
 
-BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 {
     if( pBase )
     {
         if( pBase->GetModule( rName ) )
-            return FALSE;
+            return sal_False;
     }
     return SvMetaExtern::SetName( rName );
 }
 
 #ifdef IDL_COMPILER
-BOOL SvMetaModule::FillNextName( SvGlobalName * pName )
+sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName )
 {
     *pName = aNextName;
 
     if( aNextName < aEndName )
     {
         ++aNextName;
-        bIsModified = TRUE;
-        return TRUE;
+        bIsModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
@@ -153,7 +153,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     aHelpFileName.ReadSvIdl( SvHash_HelpFile(), rInStm );
     if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
     {
-        UINT32 nTokPos = rInStm.Tell();
+        sal_uInt32 nTokPos = rInStm.Tell();
         if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.GetBuffer() ) ) )
         {
             ByteString aStr = "cannot read file: ";
@@ -170,7 +170,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
 void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                          SvStream & rOutStm,
-                                         USHORT nTab )
+                                         sal_uInt16 nTab )
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     if( aTypeLibFile.Len() || aSlotIdFile.Len() || aTypeLibFile.Len() )
@@ -199,7 +199,7 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     if( rInStm.GetToken()->Is( SvHash_interface() )
       || rInStm.GetToken()->Is( SvHash_shell() ) )
     {
@@ -239,7 +239,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else if( rInStm.GetToken()->Is( SvHash_include() ) )
     {
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         rInStm.GetToken_Next();
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsString() )
@@ -256,7 +256,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
                     // reset error
                     rBase.SetError( SvIdlError() );
 
-                    UINT32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
+                    sal_uInt32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
                     while( nBeginPos != aTokStm.Tell() )
                     {
                         nBeginPos = aTokStm.Tell();
@@ -307,10 +307,10 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
 
 void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
                                       SvStream & rOutStm,
-                                      USHORT nTab )
+                                      sal_uInt16 nTab )
 {
     SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab );
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aTypeList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -330,13 +330,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase,
     }
 }
 
-BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    bIsModified = TRUE; // up to now always when compiler running
+    bIsModified = sal_True; // up to now always when compiler running
 
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok  = rInStm.GetToken_Next();
-    BOOL bOk        = FALSE;
+    sal_Bool bOk        = sal_False;
     bOk = pTok->Is( SvHash_module() );
     if( bOk )
     {
@@ -372,7 +372,7 @@ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 }
 
 void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                               USHORT nTab )
+                               sal_uInt16 nTab )
 {
     rOutStm << SvHash_module()->GetName().GetBuffer() << endl
             << '\"';
@@ -385,7 +385,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 
 void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteSfx( rBase, rOutStm );
@@ -395,7 +395,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHelpIds( rBase, rOutStm, pTable );
@@ -404,7 +404,7 @@ void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
 
 void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
                                     SvStream & rOutStm,
-                                     USHORT nTab,
+                                     sal_uInt16 nTab,
                                      WriteType nT, WriteAttribute nA )
 {
     SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
@@ -418,7 +418,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
 }
 
 void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                              USHORT nTab,
+                              sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     switch ( nT )
@@ -439,7 +439,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         WriteTab( rOutStm, nTab );
         rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
 
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() && pClass->GetAutomation() )
@@ -463,7 +463,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
         rOutStm	<< "</MODULE>" << endl << endl;
 
         rOutStm << "<CLASSES>" << endl;
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() )
@@ -479,7 +479,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 {
                     rOutStm << " ( ";
 
-                    for( ULONG m=0; m<rClassList.Count(); m++ )
+                    for( sal_uLong m=0; m<rClassList.Count(); m++ )
                     {
                         SvClassElement *pEle = rClassList.GetObject(m);
                         SvMetaClass *pCl = pEle->GetClass();
@@ -501,7 +501,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     case WRITE_C_SOURCE:
     case WRITE_C_HEADER:
     {
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( !pClass->IsShell() )
@@ -520,16 +520,16 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 {
     if( aSlotIdFile.Len() )
         rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl;
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
     }
 }
 
 void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteHxx( rBase, rOutStm, nTab );
@@ -537,9 +537,9 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab )
+                             sal_uInt16 nTab )
 {
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uLong n = 0; n < aClassList.Count(); n++ )
     {
         SvMetaClass * pClass = aClassList.GetObject( n );
         pClass->WriteCxx( rBase, rOutStm, nTab );
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index bcadfc089c..d1f7343518 100644..100755
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -46,7 +46,7 @@ SvClassElement::SvClassElement()
 
 void SvClassElement::Load( SvPersistStream & rStm )
 {
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x08 )
     {
@@ -67,7 +67,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
 void SvClassElement::Save( SvPersistStream & rStm )
 {
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aAutomation.IsSet() ) 		nMask |= 0x1;
     if( aPrefix.Len() )		  		nMask |= 0x2;
     if( xClass.Is() )				nMask |= 0x4;
@@ -81,7 +81,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
 
 SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType );
 SvMetaClass::SvMetaClass()
-    : aAutomation( TRUE, FALSE )
+    : aAutomation( sal_True, sal_False )
 {
 }
 
@@ -89,7 +89,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
 {
     SvMetaType::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x20 )
     {
@@ -119,7 +119,7 @@ void SvMetaClass::Save( SvPersistStream & rStm )
     SvMetaType::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aAttrList.Count() ) 		nMask |= 0x1;
     if( aSuperClass.Is() )  		nMask |= 0x2;
     if( aClassList.Count() )		nMask |= 0x4;
@@ -144,7 +144,7 @@ void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 }
 
 void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                 SvStream & rOutStm, USHORT nTab )
+                                 SvStream & rOutStm, sal_uInt16 nTab )
 {
     SvMetaType::WriteAttributesSvIdl( rBase, rOutStm, nTab );
 
@@ -164,7 +164,7 @@ void SvMetaClass::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
                                     SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_import() ) )
@@ -191,7 +191,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
                             rBase.WriteError( rInStm );
                         }
                         xAutomationInterface = pClass;
-                        xEle->SetAutomation( TRUE );
+                        xEle->SetAutomation( sal_True );
                     }
                     else
                     {
@@ -228,7 +228,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         rInStm.Seek( nTokPos );
         SvMetaType * pType = rBase.ReadKnownType( rInStm );
 
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         SvMetaAttributeRef xAttr;
         if( !pType || pType->IsItem() )
         {
@@ -264,10 +264,10 @@ void SvMetaClass::WriteContextSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         WriteTab( rOutStm, nTab );
@@ -289,12 +289,12 @@ void SvMetaClass::WriteContextSvIdl
     }
 }
 
-BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    ULONG nTokPos = rInStm.Tell();
+    sal_uLong nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
     {
-        BOOL bOk = TRUE;
+        sal_Bool bOk = sal_True;
         if( rInStm.Read( ':' ) )
         {
             aSuperClass = rBase.ReadKnownClass( rInStm );
@@ -316,10 +316,10 @@ BOOL SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
             return bOk;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                  SvMetaAttribute & rAttr ) const
 {
     if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
@@ -328,7 +328,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
         DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
     }
 
-    for( ULONG n = 0; n < aAttrList.Count(); n++ )
+    for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pS = aAttrList.GetObject( n );
         if( pS->GetName() == rAttr.GetName() )
@@ -346,13 +346,13 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                 aStr += " with different id's";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                return FALSE;
+                return sal_False;
              }
         }
         else
         {
-            UINT32 nId1 = pS->GetSlotId().GetValue();
-            UINT32 nId2 = rAttr.GetSlotId().GetValue();
+            sal_uInt32 nId1 = pS->GetSlotId().GetValue();
+            sal_uInt32 nId2 = rAttr.GetSlotId().GetValue();
             if( nId1 == nId2 && nId1 != 0 )
             {
                 OSL_FAIL( "Gleiche Id in MetaClass : " );
@@ -367,18 +367,18 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                 aStr += " with equal id's";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                return FALSE;
+                return sal_False;
              }
         }
     }
     SvMetaClass * pSC = aSuperClass;
     if( pSC )
         return pSC->TestAttribute( rBase, rInStm, rAttr );
-    return TRUE;
+    return sal_True;
 }
 
 void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                              USHORT nTab )
+                              sal_uInt16 nTab )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     if( aSuperClass.Is() )
@@ -389,7 +389,7 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                        USHORT nTab,
+                        sal_uInt16 nTab,
                          WriteType nT, WriteAttribute )
 {
     rBase.aIFaceName = GetName();
@@ -417,7 +417,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             rOutStm	<< "</INTERFACE>" << endl << endl;
 
             // write all attributes
-            ULONG n;
+            sal_uLong n;
             for( n = 0; n < aAttrList.Count(); n++ )
             {
                 SvMetaAttribute * pAttr = aAttrList.GetObject( n );
@@ -438,12 +438,12 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     }
 }
 
-USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
+sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
                                         SvSlotElementList & rSlotList,
                                         SvStream & rOutStm )
 {
-    USHORT nCount = 0;
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    sal_uInt16 nCount = 0;
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -453,13 +453,13 @@ USHORT SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
     return nCount;
 }
 
-USHORT SvMetaClass::WriteSlots( const ByteString & rShellName,
-                                USHORT nCount, SvSlotElementList & rSlotList,
+sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
+                                sal_uInt16 nCount, SvSlotElementList & rSlotList,
                                 SvIdlDataBase & rBase,
                                 SvStream & rOutStm )
 {
-    USHORT nSCount = 0;
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    sal_uInt16 nSCount = 0;
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         rSlotList.Seek(n);
         SvSlotElement * pEle = rSlotList.GetCurObject();
@@ -472,7 +472,7 @@ USHORT SvMetaClass::WriteSlots( const ByteString & rShellName,
     return nSCount;
 }
 
-void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSuperList,
+void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
                             SvMetaClassList &rClassList,
                             const ByteString & rPrefix, SvIdlDataBase& rBase)
 {
@@ -484,14 +484,14 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSu
     rClassList.push_back( this );
 
     // write all direct attributes
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
 
-        ULONG nId = pAttr->GetSlotId().GetValue();
+        sal_uLong nId = pAttr->GetSlotId().GetValue();
 
-        std::vector<ULONG>::iterator iter = std::find(rSuperList.begin(),
+        std::vector<sal_uLong>::iterator iter = std::find(rSuperList.begin(),
                                                       rSuperList.end(),nId);
 
         if( iter == rSuperList.end() )
@@ -542,7 +542,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
     rList.push_back( this );
 
     // my imports
-    for( ULONG n = 0; n < aClassList.Count(); n++ )
+    for( sal_uInt32 n = 0; n < aClassList.Count(); n++ )
     {
         SvClassElement * pEle = aClassList.GetObject( n );
         SvMetaClass * pCl = pEle->GetClass();
@@ -561,7 +561,7 @@ void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
                                 SvStream & rOutStm )
 {
     // write all attributes
-    for( ULONG n = 0; n < rSlotList.Count(); n++ )
+    for( sal_uLong n = 0; n < rSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = rSlotList.GetObject( n );
         SvMetaSlot *pAttr = pEle->xSlot;
@@ -588,21 +588,21 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     rOutStm << "SFX_ARGUMENTMAP(" << GetName().GetBuffer() << ')' << endl
         << '{' << endl;
 
-    std::vector<ULONG> aSuperList;
+    std::vector<sal_uLong> aSuperList;
     SvMetaClassList classList;
     SvSlotElementList aSlotList;
     InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
-    for (ULONG n=0; n<aSlotList.Count(); n++ )
+    for (sal_uInt32 n=0; n<aSlotList.Count(); n++ )
     {
         SvSlotElement *pEle = aSlotList.GetObject( n );
         SvMetaSlot *pSlot = pEle->xSlot;
         pSlot->SetListPos(n);
     }
 
-    ULONG nSlotCount = aSlotList.Count();
+    sal_uLong nSlotCount = aSlotList.Count();
 
     // write all attributes
-    USHORT nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
+    sal_uInt16 nArgCount = WriteSlotParamArray( rBase, aSlotList, rOutStm );
     if( nArgCount )
         Back2Delemitter( rOutStm );
     else
@@ -641,7 +641,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     }
     rOutStm << endl << "};" << endl << "#endif" << endl << endl;
 
-    for( ULONG n=0; n<aSlotList.Count(); n++ )
+    for( sal_uLong n=0; n<aSlotList.Count(); n++ )
     {
         aSlotList.Seek(n);
         SvSlotElement* pEle = aSlotList.GetCurObject();
@@ -649,14 +649,14 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
         pAttr->ResetSlotPointer();
     }
 
-    for ( ULONG n=0; n<aSlotList.Count(); n++ )
+    for ( sal_uLong n=0; n<aSlotList.Count(); n++ )
         delete aSlotList.GetObject(n);
 }
 
 void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
                             Table* pTable )
 {
-    for( ULONG n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteHelpId( rBase, rOutStm, pTable );
@@ -666,14 +666,14 @@ void SvMetaClass::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaClass::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    for( ULONG n=0; n<aAttrList.Count(); n++ )
+    for( sal_uLong n=0; n<aAttrList.Count(); n++ )
     {
         SvMetaAttribute * pAttr = aAttrList.GetObject( n );
         pAttr->WriteSrc( rBase, rOutStm, pTable );
     }
 }
 
-void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     ByteString aSuperName( "SvDispatch" );
     if( GetSuperClass() )
@@ -686,11 +686,11 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
     << '{' << endl
     << "protected:" << endl
     << "\tvirtual SvGlobalName  GetTypeName() const;" << endl
-    << "\tvirtual BOOL          FillTypeLibInfo( SvGlobalName *, USHORT * pMajor," << endl
-    << "\t                         			     USHORT * pMinor ) const;" << endl
-    << "\tvirtual BOOL          FillTypeLibInfo( ByteString * pName, USHORT * pMajor," << endl;
+    << "\tvirtual sal_Bool          FillTypeLibInfo( SvGlobalName *, sal_uInt16 * pMajor," << endl
+    << "\t                         			     sal_uInt16 * pMinor ) const;" << endl
+    << "\tvirtual sal_Bool          FillTypeLibInfo( ByteString * pName, sal_uInt16 * pMajor," << endl;
     rOutStm
-    << "\t			                             USHORT * pMinor ) const;" << endl
+    << "\t			                             sal_uInt16 * pMinor ) const;" << endl
     << "\tvirtual void 			Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) = 0;" << endl
     << "public:" << endl
     << "\t static SvGlobalName  ClassName()" << endl
@@ -698,7 +698,7 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
     << "};" << endl;
 }
 
-void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     ByteString aSuperName( "SvDispatch" );
     if( GetSuperClass() )
@@ -714,26 +714,26 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
 
     SvMetaModule * pMod = GetModule();
     // FillTypeLibInfo
-    rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
-    << "\t								 USHORT * pMajor," << endl
-    << "\t                         		 USHORT * pMinor ) const" << endl
+    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( SvGlobalName * pGN," << endl
+    << "\t								 sal_uInt16 * pMajor," << endl
+    << "\t                         		 sal_uInt16 * pMinor ) const" << endl
     << '{' << endl
     << "\tSvGlobalName aN( " << ByteString( pMod->GetUUId().GetctorName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << " );" << endl;
     rOutStm << "\t*pGN = aN;" << endl
     << "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
     << "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
-    << "\treturn TRUE;" << endl
+    << "\treturn sal_True;" << endl
     << '}' << endl;
 
     // FillTypeLibInfo
-    rOutStm << "BOOL " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
-    << "\t								 USHORT * pMajor," << endl
-    << "\t                         		 USHORT * pMinor ) const" << endl;
+    rOutStm << "sal_Bool " << name.GetBuffer() << "::FillTypeLibInfo( ByteString * pName,"
+    << "\t								 sal_uInt16 * pMajor," << endl
+    << "\t                         		 sal_uInt16 * pMinor ) const" << endl;
     rOutStm << '{' << endl
     << "\t*pName = \"" << pMod->GetTypeLibFileName().GetBuffer()  << "\";" << endl
     << "\t*pMajor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMajorVersion()).GetBuffer() << ';' << endl
     << "\t*pMinor = " << ByteString::CreateFromInt32(pMod->GetVersion().GetMinorVersion()).GetBuffer() << ';' << endl
-    << "\treturn TRUE;" << endl
+    << "\treturn sal_True;" << endl
     << '}' << endl;
 
     rOutStm << "void " << name.GetBuffer() << "::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )" << endl
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 5b7c9215c0..06c161cdad 100644..100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -44,10 +44,10 @@ SvMetaObject *SvMetaSlot::MakeClone() const
 }
 
 SvMetaSlot::SvMetaSlot()
-    : aCachable( TRUE, FALSE )
-    , aSynchron( TRUE, FALSE )
-    , aRecordPerSet( TRUE, FALSE )
-    , aRecordAbsolute( FALSE, FALSE )
+    : aCachable( sal_True, sal_False )
+    , aSynchron( sal_True, sal_False )
+    , aRecordPerSet( sal_True, sal_False )
+    , aRecordAbsolute( sal_False, sal_False )
     , pLinkedSlot(0)
     , pNextSlot(0)
     , pEnumValue(0)
@@ -56,10 +56,10 @@ SvMetaSlot::SvMetaSlot()
 
 SvMetaSlot::SvMetaSlot( SvMetaType * pType )
     : SvMetaAttribute( pType )
-    , aCachable( TRUE, FALSE )
-    , aSynchron( TRUE, FALSE )
-    , aRecordPerSet( TRUE, FALSE )
-    , aRecordAbsolute( FALSE, FALSE )
+    , aCachable( sal_True, sal_False )
+    , aSynchron( sal_True, sal_False )
+    , aRecordPerSet( sal_True, sal_False )
+    , aRecordAbsolute( sal_False, sal_False )
     , pLinkedSlot(0)
     , pNextSlot(0)
     , pEnumValue(0)
@@ -73,7 +73,7 @@ void SvMetaSlot::Load( SvPersistStream & rStm )
 {
     SvMetaAttribute::Load( rStm );
 
-    USHORT nMask;
+    sal_uInt16 nMask;
     rStm >> nMask;
 
     TEST_READ
@@ -171,7 +171,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     SvMetaAttribute::Save( rStm );
 
     // create mask
-    USHORT nMask = 0;
+    sal_uInt16 nMask = 0;
     if( aMethod.Is() )			nMask |= 0x0001;
     if( aGroupId.Len() )		nMask |= 0x0002;
     if( aHasCoreId.IsSet() )	nMask |= 0x0004;
@@ -289,19 +289,19 @@ void SvMetaSlot::Save( SvPersistStream & rStm )
     if( nMask & 0x0002 ) rStm << aImageReflection;
 }
 
-BOOL SvMetaSlot::IsVariable() const
+sal_Bool SvMetaSlot::IsVariable() const
 {
     return SvMetaAttribute::IsVariable();
 }
 
-BOOL SvMetaSlot::IsMethod() const
+sal_Bool SvMetaSlot::IsMethod() const
 {
-    BOOL b = SvMetaAttribute::IsMethod();
+    sal_Bool b = SvMetaAttribute::IsMethod();
     b |= NULL != GetMethod();
     return b;
 }
 
-ByteString SvMetaSlot::GetMangleName( BOOL bVariable ) const
+ByteString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
 {
     if( !bVariable )
     {
@@ -329,7 +329,7 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const
     if( aMethod.Is() || !GetRef() ) return aMethod;
     return ((SvMetaSlot *)GetRef())->GetMethod();
 }
-BOOL SvMetaSlot::GetHasCoreId() const
+sal_Bool SvMetaSlot::GetHasCoreId() const
 {
     if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
     return ((SvMetaSlot *)GetRef())->GetHasCoreId();
@@ -364,50 +364,50 @@ const ByteString & SvMetaSlot::GetDefault() const
     if( aDefault.Len() || !GetRef() ) return aDefault;
     return ((SvMetaSlot *)GetRef())->GetDefault();
 }
-BOOL SvMetaSlot::GetPseudoSlots() const
+sal_Bool SvMetaSlot::GetPseudoSlots() const
 {
     if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
     return ((SvMetaSlot *)GetRef())->GetPseudoSlots();
 }
-BOOL SvMetaSlot::GetCachable() const
+sal_Bool SvMetaSlot::GetCachable() const
 {
     // Cachable and Volatile are exclusive
     if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
          return aCachable;
     return ((SvMetaSlot *)GetRef())->GetCachable();
 }
-BOOL SvMetaSlot::GetVolatile() const
+sal_Bool SvMetaSlot::GetVolatile() const
 {
     // Cachable and Volatile are exclusive
     if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
         return aVolatile;
     return ((SvMetaSlot *)GetRef())->GetVolatile();
 }
-BOOL SvMetaSlot::GetToggle() const
+sal_Bool SvMetaSlot::GetToggle() const
 {
     if( aToggle.IsSet() || !GetRef() ) return aToggle;
     return ((SvMetaSlot *)GetRef())->GetToggle();
 }
-BOOL SvMetaSlot::GetAutoUpdate() const
+sal_Bool SvMetaSlot::GetAutoUpdate() const
 {
     if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
     return ((SvMetaSlot *)GetRef())->GetAutoUpdate();
 }
-BOOL SvMetaSlot::GetSynchron() const
+sal_Bool SvMetaSlot::GetSynchron() const
 {
     // Synchron and Asynchron are exclusive
     if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
         return aSynchron;
     return ((SvMetaSlot *)GetRef())->GetSynchron();
 }
-BOOL SvMetaSlot::GetAsynchron() const
+sal_Bool SvMetaSlot::GetAsynchron() const
 {
     // Synchron and Asynchron are exclusive
     if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
         return aAsynchron;
     return ((SvMetaSlot *)GetRef())->GetAsynchron();
 }
-BOOL SvMetaSlot::GetRecordPerItem() const
+sal_Bool SvMetaSlot::GetRecordPerItem() const
 {
     // Record- PerItem, No, PerSet and Manual are exclusive
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -415,7 +415,7 @@ BOOL SvMetaSlot::GetRecordPerItem() const
         return aRecordPerItem;
     return ((SvMetaSlot *)GetRef())->GetRecordPerItem();
 }
-BOOL SvMetaSlot::GetRecordPerSet() const
+sal_Bool SvMetaSlot::GetRecordPerSet() const
 {
     // Record- PerItem, No, PerSet and Manual are exclusive
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -423,7 +423,7 @@ BOOL SvMetaSlot::GetRecordPerSet() const
         return aRecordPerSet;
     return ((SvMetaSlot *)GetRef())->GetRecordPerSet();
 }
-BOOL SvMetaSlot::GetRecordManual() const
+sal_Bool SvMetaSlot::GetRecordManual() const
 {
     // Record- PerItem, No, PerSet and Manual are exclusive
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -431,7 +431,7 @@ BOOL SvMetaSlot::GetRecordManual() const
         return aRecordManual;
     return ((SvMetaSlot *)GetRef())->GetRecordManual();
 }
-BOOL SvMetaSlot::GetNoRecord() const
+sal_Bool SvMetaSlot::GetNoRecord() const
 {
     // Record- PerItem, No, PerSet and Manual are exclusive
     if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
@@ -439,13 +439,13 @@ BOOL SvMetaSlot::GetNoRecord() const
         return aNoRecord;
     return ((SvMetaSlot *)GetRef())->GetNoRecord();
 }
-BOOL SvMetaSlot::GetRecordAbsolute() const
+sal_Bool SvMetaSlot::GetRecordAbsolute() const
 {
     if( !GetRef() || aRecordAbsolute.IsSet() )
         return aRecordAbsolute;
     return ((SvMetaSlot *)GetRef())->GetRecordAbsolute();
 }
-BOOL SvMetaSlot::GetHasDialog() const
+sal_Bool SvMetaSlot::GetHasDialog() const
 {
     if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
     return ((SvMetaSlot *)GetRef())->GetHasDialog();
@@ -455,44 +455,44 @@ const ByteString & SvMetaSlot::GetPseudoPrefix() const
     if( aPseudoPrefix.Len() || !GetRef() ) return aPseudoPrefix;
     return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
 }
-BOOL SvMetaSlot::GetMenuConfig() const
+sal_Bool SvMetaSlot::GetMenuConfig() const
 {
     if( aMenuConfig.IsSet() || !GetRef() ) return aMenuConfig;
     return ((SvMetaSlot *)GetRef())->GetMenuConfig();
 }
-BOOL SvMetaSlot::GetToolBoxConfig() const
+sal_Bool SvMetaSlot::GetToolBoxConfig() const
 {
     if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig;
     return ((SvMetaSlot *)GetRef())->GetToolBoxConfig();
 }
-BOOL SvMetaSlot::GetStatusBarConfig() const
+sal_Bool SvMetaSlot::GetStatusBarConfig() const
 {
     if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig;
     return ((SvMetaSlot *)GetRef())->GetStatusBarConfig();
 }
-BOOL SvMetaSlot::GetAccelConfig() const
+sal_Bool SvMetaSlot::GetAccelConfig() const
 {
     if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig;
     return ((SvMetaSlot *)GetRef())->GetAccelConfig();
 }
-BOOL SvMetaSlot::GetFastCall() const
+sal_Bool SvMetaSlot::GetFastCall() const
 {
     if( aFastCall.IsSet() || !GetRef() ) return aFastCall;
     return ((SvMetaSlot *)GetRef())->GetFastCall();
 }
-BOOL SvMetaSlot::GetContainer() const
+sal_Bool SvMetaSlot::GetContainer() const
 {
     if( aContainer.IsSet() || !GetRef() ) return aContainer;
     return ((SvMetaSlot *)GetRef())->GetContainer();
 }
 
-BOOL SvMetaSlot::GetImageRotation() const
+sal_Bool SvMetaSlot::GetImageRotation() const
 {
     if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
     return ((SvMetaSlot *)GetRef())->GetImageRotation();
 }
 
-BOOL SvMetaSlot::GetImageReflection() const
+sal_Bool SvMetaSlot::GetImageReflection() const
 {
     if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
     return ((SvMetaSlot *)GetRef())->GetImageReflection();
@@ -510,7 +510,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
 
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
     bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
     bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm );
@@ -534,29 +534,29 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     }
 
     if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) )
-        SetCachable( aCachable ), bOk = TRUE;
+        SetCachable( aCachable ), bOk = sal_True;
     if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
-        SetVolatile( aVolatile ), bOk = TRUE;
+        SetVolatile( aVolatile ), bOk = sal_True;
     if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) )
-        SetToggle( aToggle ), bOk = TRUE;
+        SetToggle( aToggle ), bOk = sal_True;
     if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
-        SetAutoUpdate( aAutoUpdate ), bOk = TRUE;
+        SetAutoUpdate( aAutoUpdate ), bOk = sal_True;
 
     if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
-        SetSynchron( aSynchron ), bOk = TRUE;
+        SetSynchron( aSynchron ), bOk = sal_True;
     if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
-        SetAsynchron( aAsynchron ), bOk = TRUE;
+        SetAsynchron( aAsynchron ), bOk = sal_True;
 
     if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) )
-        SetRecordAbsolute( aRecordAbsolute), bOk = TRUE;
+        SetRecordAbsolute( aRecordAbsolute), bOk = sal_True;
     if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) )
-        SetRecordPerItem( aRecordPerItem ), bOk = TRUE;
+        SetRecordPerItem( aRecordPerItem ), bOk = sal_True;
     if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
-        SetRecordPerSet( aRecordPerSet ), bOk = TRUE;
+        SetRecordPerSet( aRecordPerSet ), bOk = sal_True;
     if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) )
-        SetRecordManual( aRecordManual ), bOk = TRUE;
+        SetRecordManual( aRecordManual ), bOk = sal_True;
     if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
-        SetNoRecord( aNoRecord ), bOk = TRUE;
+        SetNoRecord( aNoRecord ), bOk = sal_True;
 
     bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
     bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
@@ -567,7 +567,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
     SvBOOL aAllConfig;
     if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) )
-        SetAllConfig( aAllConfig ), bOk = TRUE;
+        SetAllConfig( aAllConfig ), bOk = sal_True;
     bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
     bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
     bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
@@ -578,11 +578,11 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     {
         if( !aSlotType.Is() )
         {
-            UINT32 nTokPos = rInStm.Tell();
+            sal_uInt32 nTokPos = rInStm.Tell();
             SvToken * pTok = rInStm.GetToken_Next();
             if( pTok->Is( SvHash_SlotType() ) )
             {
-                BOOL bBraket = rInStm.Read( '(' );
+                sal_Bool bBraket = rInStm.Read( '(' );
                 if( bBraket || rInStm.Read( '=' ) )
                 {
                     aSlotType = rBase.ReadKnownType( rInStm );
@@ -614,7 +614,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
             if( pTok->IsIdentifier() )
             {
                 aMethod = new SvMetaSlot();
-                UINT32 nTokPos = rInStm.Tell();
+                sal_uInt32 nTokPos = rInStm.Tell();
                 if( aMethod->ReadSvIdl( rBase, rInStm ) )
                 {
                     if( aMethod->IsMethod() )
@@ -633,7 +633,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
 void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                        SvStream & rOutStm,
-                       USHORT nTab )
+                       sal_uInt16 nTab )
 {
     SvMetaAttribute::WriteAttributesSvIdl( rBase, rOutStm, nTab );
 
@@ -807,9 +807,9 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
 }
 
 
-BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    BOOL bOk = SvMetaAttribute::Test( rBase, rInStm );
+    sal_Bool bOk = SvMetaAttribute::Test( rBase, rInStm );
     if( bOk )
     {
         SvMetaType * pType = GetType();
@@ -819,17 +819,17 @@ BOOL SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
         {
             rBase.SetError( "this attribute is not a slot", rInStm.GetToken() );
             rBase.WriteError( rInStm );
-            bOk = FALSE;
+            bOk = sal_False;
         }
     }
 
     return bOk;
 }
 
-BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
+sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
-    UINT32	nTokPos 	= rInStm.Tell();
-    BOOL bOk = TRUE;
+    sal_uInt32	nTokPos 	= rInStm.Tell();
+    sal_Bool bOk = sal_True;
 
     SvMetaAttribute * pAttr = rBase.ReadKnownAttr( rInStm, GetType() );
     if( pAttr )
@@ -849,7 +849,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
             aStr += " is method or variable but not a slot";
             rBase.SetError( aStr, rInStm.GetToken() );
             rBase.WriteError( rInStm );
-            bOk = FALSE;
+            bOk = sal_False;
         }
     }
     else
@@ -870,7 +870,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
                 {
                     OSL_FAIL("Illegal definition!");
                     rInStm.Seek( nTokPos );
-                    return FALSE;
+                    return sal_False;
                 }
 
                   SetName( pKnownSlot->GetName(), &rBase );
@@ -882,7 +882,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
                 aStr += " is method or variable but not a slot";
                 rBase.SetError( aStr, rInStm.GetToken() );
                 rBase.WriteError( rInStm );
-                bOk = FALSE;
+                bOk = sal_False;
             }
         }
     }
@@ -894,13 +894,13 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 }
 
 void SvMetaSlot::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab )
+                            sal_uInt16 nTab )
 {
     SvMetaAttribute::WriteSvIdl( rBase, rOutStm, nTab );
 }
 
 void SvMetaSlot::Write( SvIdlDataBase & rBase,
-                        SvStream & rOutStm, USHORT nTab,
+                        SvStream & rOutStm, sal_uInt16 nTab,
                         WriteType nT, WriteAttribute nA )
 {
     if ( nT == WRITE_DOCU )
@@ -935,10 +935,10 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
                         SvIdlDataBase& rBase)
 {
     // get insert position through binary search in slotlist
-    USHORT nId = (USHORT) GetSlotId().GetValue();
-    USHORT nListCount = (USHORT) rList.Count();
-    USHORT nPos;
-    ULONG m;  // for inner "for" loop
+    sal_uInt16 nId = (sal_uInt16) GetSlotId().GetValue();
+    sal_uInt16 nListCount = (sal_uInt16) rList.Count();
+    sal_uInt16 nPos;
+    sal_uLong m;  // for inner "for" loop
 
     if ( !nListCount )
         nPos = 0;
@@ -946,9 +946,9 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         nPos = rList.GetObject(0)->xSlot->GetSlotId().GetValue() >= nId ? 0 : 1;
     else
     {
-        USHORT nMid = 0, nLow = 0;
-        USHORT nHigh = nListCount - 1;
-        BOOL bFound = FALSE;
+        sal_uInt16 nMid = 0, nLow = 0;
+        sal_uInt16 nHigh = nListCount - 1;
+        sal_Bool bFound = sal_False;
         while ( !bFound && nLow <= nHigh )
         {
             nMid = (nLow + nHigh) >> 1;
@@ -967,7 +967,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
                 break;
             }
             else
-                bFound = TRUE;
+                bFound = sal_True;
         }
 
         DBG_ASSERT(!bFound, "Duplicate SlotId!");
@@ -977,13 +977,13 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
     DBG_ASSERT( nPos <= nListCount,
         "nPos too large" );
     DBG_ASSERT( nPos == nListCount || nId <=
-        (USHORT) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos)->xSlot->GetSlotId().GetValue(),
         "Successor has lower SlotId" );
     DBG_ASSERT( nPos == 0 || nId >
-        (USHORT) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos-1)->xSlot->GetSlotId().GetValue(),
         "Predecessor has higher SlotId" );
     DBG_ASSERT( nPos+1 >= nListCount || nId <
-        (USHORT) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
+        (sal_uInt16) rList.GetObject(nPos+1)->xSlot->GetSlotId().GetValue(),
         "Successor has lower SlotId" );
 
     rList.Insert( new SvSlotElement( this, rPrefix ), nPos );
@@ -997,7 +997,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         // clone the MasterSlot
         SvMetaSlotRef xEnumSlot;
         SvMetaSlot *pFirstEnumSlot = NULL;
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             // create SlotId
             SvMetaEnumValue *enumValue = pEnum->GetObject(n);
@@ -1024,7 +1024,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             {
                 OSL_FAIL("Invalid EnumSlot!");
                 xEnumSlot = Clone();
-                ULONG nValue;
+                sal_uLong nValue;
                 if ( rBase.FindId(aSId , &nValue) )
                 {
                     SvNumberIdentifier aId;
@@ -1035,7 +1035,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
             }
 
             // The slaves are no master!
-            xEnumSlot->aPseudoSlots = FALSE;
+            xEnumSlot->aPseudoSlots = sal_False;
             xEnumSlot->SetEnumValue(enumValue);
 
             if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() )
@@ -1052,7 +1052,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
         pLinkedSlot = pFirstEnumSlot;
 
         // concatenate slaves among themselves
-        rList.Seek((ULONG)0);
+        rList.Seek((sal_uLong)0);
         xEnumSlot = pFirstEnumSlot;
         SvSlotElement *pEle;
         do
@@ -1087,12 +1087,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     ByteString aMethodName( GetExecMethod() );
     if ( aMethodName.Len() && aMethodName != "NoExec" )
     {
-        BOOL bIn = FALSE;
+        sal_Bool bIn = sal_False;
         for( size_t n = 0; n < rList.size(); n++ )
         {
             if( *(rList[ n ]) == aMethodName )
             {
-                bIn=TRUE;
+                bIn=sal_True;
                 break;
             }
         }
@@ -1111,12 +1111,12 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     aMethodName = GetStateMethod();
     if ( aMethodName.Len() && aMethodName != "NoState" )
     {
-        BOOL bIn = FALSE;
+        sal_Bool bIn = sal_False;
         for ( size_t n=0; n < rList.size(); n++ )
         {
             if ( *(rList[ n ]) == aMethodName )
             {
-                bIn=TRUE;
+                bIn=sal_True;
                 break;
             }
         }
@@ -1133,7 +1133,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
     }
 }
 
-void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
+void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
                             const ByteString & rSlotId,
                             SvSlotElementList& rSlotList,
                             const ByteString & rPrefix,
@@ -1142,7 +1142,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
     if ( !GetExport() && !GetHidden() )
         return;
 
-    BOOL bIsEnumSlot = 0 != pEnumValue;
+    sal_Bool bIsEnumSlot = 0 != pEnumValue;
 
     rOutStm << "// Slot Nr. " << ByteString::CreateFromInt32(nListPos).GetBuffer() << " : ";
     ByteString aSlotIdValue( ByteString::CreateFromInt32( GetSlotId().GetValue() ) );
@@ -1353,7 +1353,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
                 pType = pMethod->GetType();
             else
                 pType = GetType();
-            ULONG nSCount = pType->GetAttrCount();
+            sal_uLong nSCount = pType->GetAttrCount();
             rOutStm << ByteString::CreateFromInt32( nSCount ).GetBuffer() << "/*Count*/";
         }
         else
@@ -1368,7 +1368,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
             rOutStm << '.';
             if ( !IsVariable() || !GetType() ||
                  GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
-                rOutStm << GetMangleName( FALSE ).GetBuffer();
+                rOutStm << GetMangleName( sal_False ).GetBuffer();
             rOutStm << "\",";
         }
         else
@@ -1389,14 +1389,14 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, USHORT nCount,
 
     {
         rOutStm << ",\"";
-        rOutStm << GetMangleName( FALSE ).GetBuffer();
+        rOutStm << GetMangleName( sal_False ).GetBuffer();
         rOutStm << "\"";
     }
 
     rOutStm << " )," << endl;
 }
 
-USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
+sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
     if ( !GetExport() && !GetHidden() )
         return 0;
@@ -1415,7 +1415,7 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
 
         const SvMetaAttributeMemberList & rList =
                     pType->GetAttrList();
-        for( ULONG n = 0; n < rList.Count(); n++ )
+        for( sal_uLong n = 0; n < rList.Count(); n++ )
         {
             SvMetaAttribute * pPar	= rList.GetObject( n );
             SvMetaType * pPType 	= pPar->GetType();
@@ -1429,12 +1429,12 @@ USHORT SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutSt
             if( !rBase.FindType( pPType, rBase.aUsedTypes ) )
                 rBase.aUsedTypes.Append( pPType );
         }
-        return (USHORT)rList.Count();
+        return (sal_uInt16)rList.Count();
     }
     return 0;
 }
 
-USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
+sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount,
                                 SvSlotElementList& rSlotList,
                                 const ByteString & rPrefix,
                                 SvIdlDataBase & rBase,
@@ -1443,7 +1443,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
     // SlotId, if not specified generate from name
     ByteString slotId = GetSlotId();
 
-    USHORT nSCount = 0;
+    sal_uInt16 nSCount = 0;
     if( IsMethod() )
     {
         SvMetaType * pType;
@@ -1453,7 +1453,7 @@ USHORT SvMetaSlot::WriteSlotMap( const ByteString & rShellName, USHORT nCount,
         else
             pType = GetType();
 
-        nSCount = (USHORT)pType->GetAttrCount();
+        nSCount = (sal_uInt16)pType->GetAttrCount();
     }
 
     WriteSlot( rShellName, nCount, slotId, rSlotList, rPrefix, rBase, rOutStm );
@@ -1466,7 +1466,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     if (!GetToolBoxConfig() && !GetAccelConfig() && !GetMenuConfig() && !GetStatusBarConfig() )
         return;
 
-    ULONG nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1493,7 +1493,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1502,12 +1502,12 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            ULONG nSId2;
-            BOOL bIdOk = FALSE;
+            sal_uLong nSId2;
+            sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
                 aSId = ByteString::CreateFromInt32( nSId2 );
-                bIdOk = TRUE;
+                bIdOk = sal_True;
             }
 
             // if id not found, write always
@@ -1535,7 +1535,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
 void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
                              Table * pTable )
 {
-    ULONG nSId = GetSlotId().GetValue();
+    sal_uLong nSId = GetSlotId().GetValue();
     if( !pTable->IsKeyValid( nSId ) )
     {
         pTable->Insert( nSId, this );
@@ -1545,7 +1545,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     SvMetaTypeEnum * pEnum = PTR_CAST( SvMetaTypeEnum, GetType() );
     if( GetPseudoSlots() && pEnum )
     {
-        for( ULONG n = 0; n < pEnum->Count(); n++ )
+        for( sal_uLong n = 0; n < pEnum->Count(); n++ )
         {
             ByteString aValName = pEnum->GetObject( n )->GetName();
             ByteString aSId( GetSlotId() );
@@ -1554,12 +1554,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
             aSId += '_';
             aSId += aValName.Copy( pEnum->GetPrefix().Len() );
 
-            ULONG nSId2;
-            BOOL bIdOk = FALSE;
+            sal_uLong nSId2;
+            sal_Bool bIdOk = sal_False;
             if( rBase.FindId( aSId, &nSId2 ) )
             {
                 aSId = ByteString::CreateFromInt32( nSId2 );
-                bIdOk = TRUE;
+                bIdOk = sal_True;
             }
 
             // if id not found, write always
@@ -1574,12 +1574,12 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
     }
 }
 
-void WriteBool( BOOL bSet, SvStream& rStream )
+void WriteBool( sal_Bool bSet, SvStream& rStream )
 {
     if ( bSet )
-        rStream << "TRUE" << ',';
+        rStream << "sal_True" << ',';
     else
-        rStream << "FALSE" << ',';
+        rStream << "sal_False" << ',';
 }
 
 void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 510f0eed7a..e8ad7d2f31 100644..100755
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -40,23 +40,23 @@
 
 SV_IMPL_META_FACTORY1( SvMetaAttribute, SvMetaReference );
 SvMetaAttribute::SvMetaAttribute()
-    : aAutomation( TRUE, FALSE )
-    , aExport( TRUE, FALSE )
-    , aIsCollection ( FALSE, FALSE )
-    , aReadOnlyDoc ( TRUE, FALSE )
-    , aHidden( FALSE, FALSE )
-    , bNewAttr( FALSE )
+    : aAutomation( sal_True, sal_False )
+    , aExport( sal_True, sal_False )
+    , aIsCollection ( sal_False, sal_False )
+    , aReadOnlyDoc ( sal_True, sal_False )
+    , aHidden( sal_False, sal_False )
+    , bNewAttr( sal_False )
 {
 }
 
 SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
     : aType( pType )
-    , aAutomation( TRUE, FALSE )
-    , aExport( TRUE, FALSE )
-    , aIsCollection ( FALSE, FALSE)
-    , aReadOnlyDoc ( TRUE, FALSE)
-    , aHidden( FALSE, FALSE )
-    , bNewAttr( FALSE )
+    , aAutomation( sal_True, sal_False )
+    , aExport( sal_True, sal_False )
+    , aIsCollection ( sal_False, sal_False)
+    , aReadOnlyDoc ( sal_True, sal_False)
+    , aHidden( sal_False, sal_False )
+    , bNewAttr( sal_False )
 {
 }
 
@@ -64,7 +64,7 @@ void SvMetaAttribute::Load( SvPersistStream & rStm )
 {
     SvMetaReference::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask & 0x01 )
     {
@@ -86,7 +86,7 @@ void SvMetaAttribute::Save( SvPersistStream & rStm )
     SvMetaReference::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aType.Is() )    		nMask |= 0x1;
     if( aSlotId.IsSet() ) 		nMask |= 0x2;
     if( aExport.IsSet() )		nMask |= 0x4;
@@ -120,19 +120,19 @@ const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const
     return ((SvMetaAttribute *)GetRef())->GetSlotId();
 }
 
-BOOL SvMetaAttribute::GetReadonly() const
+sal_Bool SvMetaAttribute::GetReadonly() const
 {
     if( aReadonly.IsSet() || !GetRef() ) return aReadonly;
     return ((SvMetaAttribute *)GetRef())->GetReadonly();
 }
 
-BOOL SvMetaAttribute::GetExport() const
+sal_Bool SvMetaAttribute::GetExport() const
 {
     if( aExport.IsSet() || !GetRef() ) return aExport;
     return ((SvMetaAttribute *)GetRef())->GetExport();
 }
 
-BOOL SvMetaAttribute::GetHidden() const
+sal_Bool SvMetaAttribute::GetHidden() const
 {
     // when export is set, but hidden is not the default is used
     if ( aExport.IsSet() && !aHidden.IsSet() )
@@ -143,15 +143,15 @@ BOOL SvMetaAttribute::GetHidden() const
         return ((SvMetaAttribute *)GetRef())->GetHidden();
 }
 
-BOOL SvMetaAttribute::GetAutomation() const
+sal_Bool SvMetaAttribute::GetAutomation() const
 {
     if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
     return ((SvMetaAttribute *)GetRef())->GetAutomation();
 }
 
-BOOL SvMetaAttribute::GetIsCollection() const
+sal_Bool SvMetaAttribute::GetIsCollection() const
 {
-    BOOL bRet;
+    sal_Bool bRet;
     if( aIsCollection.IsSet() || !GetRef() )
     {
         if ( aIsCollection.IsSet() )
@@ -166,58 +166,58 @@ BOOL SvMetaAttribute::GetIsCollection() const
     return ((SvMetaSlot *)GetRef())->GetIsCollection();
 }
 
-BOOL SvMetaAttribute::GetReadOnlyDoc() const
+sal_Bool SvMetaAttribute::GetReadOnlyDoc() const
 {
     if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
     return ((SvMetaSlot *)GetRef())->GetReadOnlyDoc();
 }
 
-BOOL SvMetaAttribute::IsMethod() const
+sal_Bool SvMetaAttribute::IsMethod() const
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
     return pType->GetType() == TYPE_METHOD;
 }
 
-BOOL SvMetaAttribute::IsVariable() const
+sal_Bool SvMetaAttribute::IsVariable() const
 {
     SvMetaType * pType = GetType();
     return pType->GetType() != TYPE_METHOD;
 }
 
-ByteString SvMetaAttribute::GetMangleName( BOOL ) const
+ByteString SvMetaAttribute::GetMangleName( sal_Bool ) const
 {
     return GetName();
 }
 
 #ifdef IDL_COMPILER
-BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase,
                             SvTokenStream & rInStm )
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     if( GetType()->IsItem() && !GetSlotId().IsSet() )
     {
         rBase.SetError( "slot without id declared", rInStm.GetToken() );
         rBase.WriteError( rInStm );
-        bOk = FALSE;
+        bOk = sal_False;
     }
     return bOk;
 }
 
-BOOL SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    UINT32  nTokPos     = rInStm.Tell();
+    sal_uInt32  nTokPos     = rInStm.Tell();
     if( !GetType() )
         // no type in ctor passed on
         aType = rBase.ReadKnownType( rInStm );
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     if( GetType() )
     {
         ReadNameSvIdl( rBase, rInStm );
         aSlotId.ReadSvIdl( rBase, rInStm );
 
-        bOk = TRUE;
+        bOk = sal_True;
         SvToken * pTok  = rInStm.GetToken();
         if( bOk && pTok->IsChar() && pTok->GetChar() == '(' )
         {
@@ -241,7 +241,7 @@ void SvMetaAttribute::WriteSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     SvMetaType * pType = GetType();
@@ -251,7 +251,7 @@ void SvMetaAttribute::WriteSvIdl
         rOutStm << ' ' << aSlotId.GetBuffer();
     if( pType->GetType() == TYPE_METHOD )
         pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
-    ULONG nPos = rOutStm.Tell();
+    sal_uLong nPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
     TestAndSeekSpaceOnly( rOutStm, nPos );
@@ -282,7 +282,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     SvMetaReference::WriteAttributesSvIdl( rBase, rOutStm, nTab );
@@ -332,7 +332,7 @@ void SvMetaAttribute::WriteAttributesSvIdl
 
 void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
                                     SvStream & rOutStm,
-                                    USHORT nTab,
+                                    sal_uInt16 nTab,
                                     WriteType nT )
 {
     SvMetaType * pType = GetType();
@@ -346,8 +346,8 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
         if( pBaseType->GetType() == TYPE_STRUCT )
         {
             const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
-            ULONG nCount = rList.Count();
-            for( ULONG i = 0; i < nCount; i++ )
+            sal_uLong nCount = rList.Count();
+            for( sal_uLong i = 0; i < nCount; i++ )
             {
                 rList.GetObject( i )->WriteParam( rBase, rOutStm, nTab, nT );
                 if( i+1<nCount )
@@ -385,10 +385,10 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
     }
 }
 
-ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
+sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const
 {
      const SvNumberIdentifier & rId = GetSlotId();
-    ULONG n = rId.GetValue();
+    sal_uLong n = rId.GetValue();
     if( rBase.aStructSlotId.Len() )
     {
         n = n << 20;
@@ -404,20 +404,20 @@ ULONG SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, BOOL bVar ) const
 }
 
 void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                      USHORT nTab,
+                                      sal_uInt16 nTab,
                                       WriteType nT, WriteAttribute nA )
 {
     if( nT == WRITE_ODL  )
     {
         const SvNumberIdentifier & rId = GetSlotId();
-        BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+        sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
         if( (rId.IsSet() && !(nA & WA_STRUCT)) || bReadonly )
         {
-            BOOL bVar = IsVariable();
+            sal_Bool bVar = IsVariable();
             if( nA & WA_VARIABLE )
-                bVar = TRUE;
+                bVar = sal_True;
             else if( nA & WA_METHOD )
-                bVar = FALSE;
+                bVar = sal_False;
 
             WriteTab( rOutStm, nTab );
             rOutStm << "//class SvMetaAttribute" << endl;
@@ -438,14 +438,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
 }
 
 void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                    BOOL bSet )
+                                    sal_Bool bSet )
 {
     rOutStm << endl;
     SvMetaType * pType = GetType();
     SvMetaType * pBaseType = pType->GetBaseType();
 
     // for Set the return is always void
-    BOOL bVoid = bSet;
+    sal_Bool bVoid = bSet;
     if( pBaseType->GetType() == TYPE_METHOD )
         bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName() == "void";
 
@@ -513,11 +513,11 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
-                            SvStream & rOutStm, USHORT nTab,
+                            SvStream & rOutStm, sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     const SvMetaAttributeMemberList & rList = GetType()->GetBaseType()->GetAttrList();
-    ULONG nCount = rList.Count();
+    sal_uLong nCount = rList.Count();
 
     SvNumberIdentifier slotId = rBase.aStructSlotId;
     if ( GetSlotId().Len() )
@@ -527,7 +527,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
     if ( GetReadonly() )
         nA |= WA_READONLY;
 
-    for( ULONG i = 0; i < nCount; i++ )
+    for( sal_uLong i = 0; i < nCount; i++ )
     {
         SvMetaAttribute *pAttr = rList.GetObject( i );
         if ( nT == WRITE_DOCU )
@@ -541,7 +541,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase,
 }
 
 void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab,
+                            sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     // no attributes for automation
@@ -553,11 +553,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     else if	( !GetAutomation() || !GetExport() )
         return;
 
-    BOOL bVariable;
+    sal_Bool bVariable;
     if( nA & WA_VARIABLE )
-        bVariable = TRUE;
+        bVariable = sal_True;
     else if( nA & WA_METHOD )
-        bVariable = FALSE;
+        bVariable = sal_False;
     else
         bVariable = IsVariable();
 
@@ -604,7 +604,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             if( nT == WRITE_C_HEADER )
                 rOutStm << ';' << endl << endl;
             else
-                WriteCSource( rBase, rOutStm, FALSE );
+                WriteCSource( rBase, rOutStm, sal_False );
         }
         else if ( bVariable && IsVariable() )
         {
@@ -619,7 +619,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
             {
                 ByteString name = GetName();
 
-                BOOL bReadonly = GetReadonly() || ( nA & WA_READONLY );
+                sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
                 if ( !bReadonly && !IsMethod() )
                 {
                     // allocation
@@ -634,7 +634,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                     if( nT == WRITE_C_HEADER )
                         rOutStm << ';' << endl << endl;
                     else
-                        WriteCSource( rBase, rOutStm, TRUE );
+                        WriteCSource( rBase, rOutStm, sal_True );
                 }
 
                 // access
@@ -647,7 +647,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                 if( nT == WRITE_C_HEADER )
                     rOutStm << ';' << endl << endl;
                 else
-                    WriteCSource( rBase, rOutStm, FALSE );
+                    WriteCSource( rBase, rOutStm, sal_False );
             }
         }
     }
@@ -722,7 +722,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     }
 }
 
-ULONG SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( ByteString * pAttrArray )
 {
     SvMetaType * pType = GetType();
     DBG_ASSERT( pType, "no type for attribute" );
@@ -757,13 +757,13 @@ void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, Table * )
 
 SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern );
 #define CTOR							\
-    : aCall0( CALL_VALUE, FALSE )       \
-    , aCall1( CALL_VALUE, FALSE )       \
-    , aSbxDataType( 0, FALSE )          \
+    : aCall0( CALL_VALUE, sal_False )       \
+    , aCall1( CALL_VALUE, sal_False )       \
+    , aSbxDataType( 0, sal_False )          \
     , pAttrList( NULL )					\
     , nType( TYPE_BASE )				\
-    , bIsItem( FALSE )                  \
-    , bIsShell( FALSE )					\
+    , bIsItem( sal_False )                  \
+    , bIsShell( sal_False )					\
     , cParserChar( 'h' )
 
 SvMetaType::SvMetaType()
@@ -802,7 +802,7 @@ void SvMetaType::Load( SvPersistStream & rStm )
 {
     SvMetaExtern::Load( rStm );
 
-    USHORT nMask;
+    sal_uInt16 nMask;
     rStm >> nMask;
     if( nMask & 0x0001 ) rStm >> aIn;
     if( nMask & 0x0002 ) rStm >> aOut;
@@ -813,11 +813,11 @@ void SvMetaType::Load( SvPersistStream & rStm )
     if( nMask & 0x0040 ) rStm >> aSbxName;
     if( nMask & 0x0080 ) rStm >> aOdlName;
     if( nMask & 0x0100 ) rStm >> GetAttrList();
-    if( nMask & 0x0200 ) bIsItem = TRUE;
-    if( nMask & 0x0400 ) bIsShell = TRUE;
+    if( nMask & 0x0200 ) bIsItem = sal_True;
+    if( nMask & 0x0400 ) bIsShell = sal_True;
     if( nMask & 0x0800 )
     {
-        USHORT nT;
+        sal_uInt16 nT;
         rStm >> nT;
         nType = nT;
     }
@@ -832,7 +832,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
     SvMetaExtern::Save( rStm );
 
     // create mask
-    USHORT nMask = 0;
+    sal_uInt16 nMask = 0;
     if( aIn.IsSet() )				nMask |= 0x0001;
     if( aOut.IsSet() )				nMask |= 0x0002;
     if( aCall0.IsSet() )			nMask |= 0x0004;
@@ -861,7 +861,7 @@ void SvMetaType::Save( SvPersistStream & rStm )
     if( nMask & 0x0040 ) rStm << aSbxName;
     if( nMask & 0x0080 ) rStm << aOdlName;
     if( nMask & 0x0100 ) rStm << *pAttrList;
-    if( nMask & 0x0800 ) rStm << (USHORT)nType;
+    if( nMask & 0x0800 ) rStm << (sal_uInt16)nType;
     if( nMask & 0x1000 ) rStm << cParserChar;
     if( nMask & 0x2000 ) rStm << aCName;
     if( nMask & 0x4000 ) rStm << aBasicName;
@@ -926,7 +926,7 @@ ByteString SvMetaType::GetBasicPostfix() const
     return aRet;
 }
 
-BOOL SvMetaType::GetIn() const
+sal_Bool SvMetaType::GetIn() const
 {
     if( aIn.IsSet() || !GetRef() )
         return aIn;
@@ -934,7 +934,7 @@ BOOL SvMetaType::GetIn() const
         return ((SvMetaType *)GetRef())->GetIn();
 }
 
-BOOL SvMetaType::GetOut() const
+sal_Bool SvMetaType::GetOut() const
 {
     if( aOut.IsSet() || !GetRef() )
         return aOut;
@@ -1022,7 +1022,7 @@ const ByteString & SvMetaType::GetCName() const
         return ((SvMetaType *)GetRef())->GetCName();
 }
 
-BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
 {
     aSvName 	= rName;
     aSbxName    = rName;
@@ -1047,18 +1047,18 @@ ByteString SvMetaType::GetCString() const
     return out;
 }
 
-BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    BOOL bOk = FALSE;
-    UINT32  nTokPos = rInStm.Tell();
+    sal_Bool bOk = sal_False;
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->Is( SvHash_interface() )
       || pTok->Is( SvHash_shell() ) )
     {
         if( pTok->Is( SvHash_shell() ) )
-            bIsShell = TRUE;
+            bIsShell = sal_True;
         SetType( TYPE_CLASS );
         bOk = ReadNamesSvIdl( rBase, rInStm );
 
@@ -1072,7 +1072,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
     {
         SetType( TYPE_UNION );
         if( ReadNameSvIdl( rBase, rInStm ) )
-            return TRUE;
+            return sal_True;
     }
     else if( pTok->Is( SvHash_enum() ) )
     {
@@ -1083,7 +1083,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
       || pTok->Is( SvHash_item() ) )
     {
           if( pTok->Is( SvHash_item() ) )
-            bIsItem = TRUE;
+            bIsItem = sal_True;
 
         SvMetaType * pType = rBase.ReadKnownType( rInStm );
         if( pType )
@@ -1097,12 +1097,12 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
                     if( rInStm.Read( ')' ) )
                     {
                         SetType( TYPE_METHOD );
-                        bOk = TRUE;
+                        bOk = sal_True;
                     }
                 }
                 else
                 {
-                    bOk = TRUE;
+                    bOk = sal_True;
                 }
             }
         }
@@ -1120,7 +1120,7 @@ BOOL SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
     return bOk;
 }
 
-BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
                              SvTokenStream & rInStm )
 {
     if( ReadHeaderSvIdl( rBase, rInStm ) )
@@ -1128,21 +1128,21 @@ BOOL SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
         rBase.Write( '.' );
         return SvMetaExtern::ReadSvIdl( rBase, rInStm );
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SvMetaType::WriteSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     if( GetType() == TYPE_METHOD )
         WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL );
 
-    ULONG nOldPos = rOutStm.Tell();
+    sal_uLong nOldPos = rOutStm.Tell();
     rOutStm << endl;
     SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab );
     if( TestAndSeekSpaceOnly( rOutStm, nOldPos ) )
@@ -1152,7 +1152,7 @@ void SvMetaType::WriteSvIdl
 }
 
 void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab,
+                                 sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     if( GetAttrCount() )
@@ -1171,7 +1171,7 @@ void SvMetaType::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                          USHORT nTab,
+                          sal_uInt16 nTab,
                          WriteType nT, WriteAttribute nA )
 {
     if( nT == WRITE_C_HEADER && nType != TYPE_ENUM )
@@ -1250,17 +1250,17 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
     }
 }
 
-BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
                                      SvTokenStream & rInStm )
 {
-    BOOL bOk = ReadNameSvIdl( rBase, rInStm );
+    sal_Bool bOk = ReadNameSvIdl( rBase, rInStm );
 
     return bOk;
 }
 
 void SvMetaType::WriteHeaderSvIdl( SvIdlDataBase & rBase,
                                    SvStream & rOutStm,
-                                   USHORT nTab )
+                                   sal_uInt16 nTab )
 {
     switch( nType )
     {
@@ -1329,7 +1329,7 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
 void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
                                        SvStream & rOutStm,
-                                       USHORT nTab )
+                                       sal_uInt16 nTab )
 {
     SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
     ByteString name = GetName();
@@ -1373,7 +1373,7 @@ void SvMetaType::WriteContextSvIdl
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab
+    sal_uInt16 nTab
 )
 {
     if( GetAttrCount() )
@@ -1393,21 +1393,21 @@ void SvMetaType::WriteContextSvIdl
 }
 
 void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab,
+                                   sal_uInt16 nTab,
                                  WriteType nT, WriteAttribute nA )
 {
     SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
 }
 
-ULONG SvMetaType::MakeSfx( ByteString * pAttrArray )
+sal_uLong SvMetaType::MakeSfx( ByteString * pAttrArray )
 {
-    ULONG nC = 0;
+    sal_uLong nC = 0;
 
     if( GetBaseType()->GetType() == TYPE_STRUCT )
     {
-        ULONG nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // write the single attributes
-        for( ULONG n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             nC += pAttrList->GetObject( n )->MakeSfx( pAttrArray );
             if( n +1 < nAttrCount )
@@ -1427,7 +1427,7 @@ void SvMetaType::WriteSfxItem(
 
     ByteString	aTypeName = "SfxType";
     ByteString  aAttrArray;
-    ULONG	nAttrCount = MakeSfx( &aAttrArray );
+    sal_uLong	nAttrCount = MakeSfx( &aAttrArray );
     ByteString  aAttrCount( ByteString::CreateFromInt32( nAttrCount ) );
     aTypeName += aAttrCount;
 
@@ -1463,28 +1463,28 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
     }
 }
 
-BOOL SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
+sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     if( rInStm.Read( '(' ) )
     {
         DoReadContextSvIdl( rBase, rInStm );
         if( rInStm.Read( ')' ) )
         {
             SetType( TYPE_METHOD );
-            return TRUE;
+            return sal_True;
         }
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 void SvMetaType::WriteMethodArgs
 (
     SvIdlDataBase & rBase,
     SvStream & rOutStm,
-    USHORT nTab, WriteType nT
+    sal_uInt16 nTab, WriteType nT
 )
 {
     if( nT == WRITE_IDL )
@@ -1560,7 +1560,7 @@ void SvMetaType::WriteMethodArgs
 
                     default:
                     {
-                        DBG_ASSERT( FALSE, "WriteType not implemented" );
+                        DBG_ASSERT( sal_False, "WriteType not implemented" );
                     }
                 }
                 pAttr = pAttrList->Next();
@@ -1579,7 +1579,7 @@ void SvMetaType::WriteMethodArgs
 }
 
 void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                 USHORT nTab, WriteType nT )
+                                 sal_uInt16 nTab, WriteType nT )
 {
     switch( nT )
     {
@@ -1597,8 +1597,8 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
 
         case WRITE_ODL:
         {
-            BOOL bIn = GetIn();
-            BOOL bOut = GetOut();
+            sal_Bool bIn = GetIn();
+            sal_Bool bOut = GetOut();
             if( bIn || bOut )
             {
                 if( bIn && bOut )
@@ -1685,13 +1685,13 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
 
         default:
         {
-            DBG_ASSERT( FALSE, "WriteType not implemented" );
+            DBG_ASSERT( sal_False, "WriteType not implemented" );
         }
     }
 }
 
 void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
-                             USHORT nTab, WriteType nT )
+                             sal_uInt16 nTab, WriteType nT )
 {
     WriteTypePrefix( rBase, rOutStm, nTab, nT );
     if( GetType() == TYPE_METHOD )
@@ -1709,9 +1709,9 @@ ByteString SvMetaType::GetParserString() const
 
     if( TYPE_METHOD == type || TYPE_STRUCT == type )
     {
-        ULONG nAttrCount = GetAttrCount();
+        sal_uLong nAttrCount = GetAttrCount();
         // write the single attributes
-        for( ULONG n = 0; n < nAttrCount; n++ )
+        for( sal_uLong n = 0; n < nAttrCount; n++ )
         {
             SvMetaAttribute * pT = pAttrList->GetObject( n );
             aPStr += pT->GetType()->GetParserString();
@@ -1736,9 +1736,9 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
 
         if( TYPE_METHOD == type || TYPE_STRUCT == type )
         {
-            ULONG nAttrCount = GetAttrCount();
+            sal_uLong nAttrCount = GetAttrCount();
             // write the single attributes
-            for( ULONG n = 0; n < nAttrCount; n++ )
+            for( sal_uLong n = 0; n < nAttrCount; n++ )
             {
                 SvMetaAttribute * pA = pAttrList->GetObject( n );
                 ByteString aStr = pA->GetName();
@@ -1779,7 +1779,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
 {
     SvMetaName::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x02 )
     {
@@ -1795,7 +1795,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
     SvMetaName::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aEnumValue.Len() ) nMask |= 0x01;
 
     // write data
@@ -1804,20 +1804,20 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm )
 }
 
 #ifdef IDL_COMPILER
-BOOL SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
                                  SvTokenStream & rInStm )
 {
     if( !ReadNameSvIdl( rBase, rInStm ) )
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
-void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT )
+void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
 {
     rOutStm << GetName().GetBuffer();
 }
 
-void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, USHORT,
+void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16,
                              WriteType nT, WriteAttribute )
 {
     if ( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
@@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
 {
     SvMetaType::Load( rStm );
 
-    BYTE nMask;
+    sal_uInt8 nMask;
     rStm >> nMask;
     if( nMask >= 0x04 )
     {
@@ -1854,7 +1854,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
     SvMetaType::Save( rStm );
 
     // create mask
-    BYTE nMask = 0;
+    sal_uInt8 nMask = 0;
     if( aEnumValueList.Count() )	nMask |= 0x01;
     if( aPrefix.Len() ) 			nMask |= 0x02;
 
@@ -1868,10 +1868,10 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
 void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
                                        SvTokenStream & rInStm )
 {
-    UINT32 nTokPos = rInStm.Tell();
+    sal_uInt32 nTokPos = rInStm.Tell();
 
     SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
-    BOOL bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
+    sal_Bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
     if( bOk )
     {
         if( 0 == aEnumValueList.Count() )
@@ -1879,7 +1879,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
            aPrefix = aEnumVal->GetName();
         else
         {
-            USHORT nPos = aPrefix.Match( aEnumVal->GetName() );
+            sal_uInt16 nPos = aPrefix.Match( aEnumVal->GetName() );
             if( nPos != aPrefix.Len() && nPos != STRING_MATCH )
                 aPrefix.Erase( nPos );
         }
@@ -1891,10 +1891,10 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
 
 void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
                                         SvStream & rOutStm,
-                                        USHORT nTab )
+                                        sal_uInt16 nTab )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->WriteSvIdl( rBase, rOutStm, nTab );
         if( n +1 != aEnumValueList.Count() )
@@ -1904,22 +1904,22 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase,
     }
 }
 
-BOOL SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
+sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
                                 SvTokenStream & rInStm )
 {
-    UINT32	nTokPos = rInStm.Tell();
+    sal_uInt32	nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
       && GetType() == TYPE_ENUM )
     {
         if( SvMetaName::ReadSvIdl( rBase, rInStm ) )
-             return TRUE;
+             return sal_True;
     }
     rInStm.Seek( nTokPos );
-    return FALSE;
+    return sal_False;
 }
 
 void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab )
+                                   sal_uInt16 nTab )
 {
     WriteHeaderSvIdl( rBase, rOutStm, nTab );
     rOutStm << endl;
@@ -1928,18 +1928,18 @@ void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
 }
 
 void SvMetaTypeEnum::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            USHORT nTab,
+                            sal_uInt16 nTab,
                              WriteType nT, WriteAttribute nA )
 {
     SvMetaType::Write( rBase, rOutStm, nTab, nT, nA );
 }
 
 void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                   USHORT nTab,
+                                   sal_uInt16 nTab,
                                  WriteType nT, WriteAttribute nA )
 {
     WriteTab( rOutStm, nTab +1 );
-    for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
+    for( sal_uLong n = 0; n < aEnumValueList.Count(); n++ )
     {
         aEnumValueList.GetObject( n )->Write( rBase, rOutStm, nTab +1, nT, nA );
 
@@ -1994,7 +1994,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
 
             if ( aType->GetAttrCount() )
             {
-                ULONG nCount = aType->GetAttrCount();
+                sal_uLong nCount = aType->GetAttrCount();
                 SvMetaAttributeMemberList& rList = aType->GetAttrList();
                 SvMetaAttributeMemberList& rOtherList = pAttr->GetType()->GetAttrList();
                 if ( pAttr->GetType()->GetAttrCount() != nCount )
@@ -2003,7 +2003,7 @@ ByteString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
                 }
                 else
                 {
-                    for ( USHORT n=0; n<nCount; n++ )
+                    for ( sal_uInt16 n=0; n<nCount; n++ )
                     {
                         SvMetaAttribute *pAttr1 = rList.GetObject(n);
                         SvMetaAttribute *pAttr2 = rOtherList.GetObject(n);
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 6f859e99e5..e72d7666df 100644..100755
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -141,7 +141,7 @@ void DeInit()
     delete IDLAPP;
 }
 
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
 {
     for( size_t n = 0; n < rCommand.aInFileList.size(); ++n )
     {
@@ -163,23 +163,27 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
                         aStr = "error during load, file ";
                     aStr += ByteString( aFileName, RTL_TEXTENCODING_UTF8 );
                     fprintf( stderr, "%s\n", aStr.GetBuffer() );
-                    return FALSE;
+                    return sal_False;
                 }
             }
             else
             {
                 SvTokenStream aTokStm( aStm, aFileName );
-                if( !pDataBase->ReadSvIdl( aTokStm, FALSE, rCommand.aPath ) )
-                    return FALSE;
+                if( !pDataBase->ReadSvIdl( aTokStm, sal_False, rCommand.aPath ) )
+                    return sal_False;
             }
         }
         else
-            return FALSE;
+        {
+            const ByteString aStr( aFileName, RTL_TEXTENCODING_UTF8 );
+            fprintf( stderr, "unable to read input file: %s\n", aStr.GetBuffer() );
+            return sal_False;
+        }
     }
-    return TRUE;
+    return sal_True;
 }
 
-static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
+static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
 {
     // program name
     pList->push_back( new String( String::CreateFromAscii(*argv) ) );
@@ -189,13 +193,13 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
         { // when @, then response file
             SvFileStream aStm( String::CreateFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
             if( aStm.GetError() != SVSTREAM_OK )
-                return FALSE;
+                return sal_False;
 
             ByteString aStr;
             while( aStm.ReadLine( aStr ) )
             {
-                USHORT n = 0;
-                USHORT nPos = 1;
+                sal_uInt16 n = 0;
+                sal_uInt16 nPos = 1;
                 while( n != nPos )
                 {
                     while( aStr.GetChar(n) && isspace( aStr.GetChar(n) ) )
@@ -211,7 +215,7 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
         else if( argv[ i ] )
             pList->push_back( new String( String::CreateFromAscii( argv[ i ] ) ) );
     }
-    return TRUE;
+    return sal_True;
 }
 
 SvCommand::SvCommand( int argc, char ** argv )
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 02331b7e53..83f3eee499 100644..100755
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -38,10 +38,10 @@
 #include <globals.hxx>
 
 SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
-    : bExport( FALSE )
+    : bExport( sal_False )
     , nUniqueId( 0 )
     , nVerbosity( rCmd.nVerbosity )
-    , bIsModified( FALSE )
+    , bIsModified( sal_False )
     , aPersStream( *IDLAPP->pClassMgr, NULL )
     , pIdTable( NULL )
 {
@@ -88,18 +88,18 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 
 SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
 {
-    for( ULONG n = 0; n < aModuleList.Count(); n++ )
+    for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
         if( aModuleList.GetObject( n )->GetName() == rName )
             return aModuleList.GetObject( n );
     return NULL;
 }
 
-#define DATABASE_SIGNATURE  (UINT32)0x13B799F2
+#define DATABASE_SIGNATURE  (sal_uInt32)0x13B799F2
 #define DATABASE_VER 0x0006
-BOOL SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
+sal_Bool SvIdlDataBase::IsBinaryFormat( SvStream & rStm )
 {
-    UINT32  nSig = 0;
-    ULONG   nPos = rStm.Tell();
+    sal_uInt32  nSig = 0;
+    sal_uLong   nPos = rStm.Tell();
     rStm >> nSig;
     rStm.Seek( nPos );
 
@@ -111,8 +111,8 @@ void SvIdlDataBase::Load( SvStream & rStm )
     DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" );
     SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm );
 
-    USHORT  nVersion = 0;
-    UINT32  nSig = 0;
+    sal_uInt16  nVersion = 0;
+    sal_uInt32  nSig = 0;
 
     aPStm >> nSig;
     aPStm >> nVersion;
@@ -136,22 +136,22 @@ void SvIdlDataBase::Load( SvStream & rStm )
         aPStm.SetError( SVSTREAM_GENERALERROR );
 }
 
-void SvIdlDataBase::Save( SvStream & rStm, UINT32 nFlags )
+void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
 {
     SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm );
     aPStm.SetContextFlags( nFlags );
 
-    aPStm << (UINT32)DATABASE_SIGNATURE;
-    aPStm << (USHORT)DATABASE_VER;
+    aPStm << (sal_uInt32)DATABASE_SIGNATURE;
+    aPStm << (sal_uInt16)DATABASE_VER;
 
-    BOOL bOnlyStreamedObjs = FALSE;
+    sal_Bool bOnlyStreamedObjs = sal_False;
     if( nFlags & IDL_WRITE_CALLING )
-        bOnlyStreamedObjs = TRUE;
+        bOnlyStreamedObjs = sal_True;
 
     if( bOnlyStreamedObjs )
     {
         SvMetaClassMemberList aList;
-        for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+        for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
         {
             SvMetaModule * pModule = GetModuleList().GetObject( n );
             if( !pModule->IsImported() )
@@ -187,42 +187,42 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
 }
 
 #ifdef IDL_COMPILER
-BOOL SvIdlDataBase::FindId( const ByteString & rIdName, ULONG * pVal )
+sal_Bool SvIdlDataBase::FindId( const ByteString & rIdName, sal_uLong * pVal )
 {
     if( pIdTable )
     {
-        UINT32 nHash;
+        sal_uInt32 nHash;
         if( pIdTable->Test( rIdName, &nHash ) )
         {
             *pVal = pIdTable->Get( nHash )->GetValue();
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvIdlDataBase::InsertId( const ByteString & rIdName, ULONG nVal )
+sal_Bool SvIdlDataBase::InsertId( const ByteString & rIdName, sal_uLong nVal )
 {
     if( !pIdTable )
         pIdTable = new SvStringHashTable( 20003 );
 
-    UINT32 nHash;
+    sal_uInt32 nHash;
     if( pIdTable->Insert( rIdName, &nHash ) )
     {
         pIdTable->Get( nHash )->SetValue( nVal );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
+sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
 {
     DirEntry aFullName( rFileName );
     aFullName.Find( GetPath() );
 
     for ( size_t i = 0, n = aIdFileList.size(); i < n; ++i )
         if ( *aIdFileList[ i ] == rFileName )
-            return TRUE;
+            return sal_True;
 
     aIdFileList.push_back( new String( rFileName ) );
 
@@ -248,21 +248,21 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                         // set error
                         SetError( aStr, pTok );
                         WriteError( aTokStm );
-                        return FALSE;
+                        return sal_False;
                     }
 
-                    ULONG nVal = 0;
-                    BOOL bOk = TRUE;
+                    sal_uLong nVal = 0;
+                    sal_Bool bOk = sal_True;
                     while( bOk )
                     {
                         pTok = aTokStm.GetToken_Next();
                         if( pTok->IsIdentifier() )
                         {
-                            ULONG n;
+                            sal_uLong n;
                             if( FindId( pTok->GetString(), &n ) )
                                 nVal += n;
                             else
-                                bOk = FALSE;
+                                bOk = sal_False;
                         }
                         else if( pTok->IsChar() )
                         {
@@ -280,7 +280,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                                 // set error
                                 SetError( aStr, pTok );
                                 WriteError( aTokStm );
-                                return FALSE;
+                                return sal_False;
                             }
                             if( pTok->GetChar() != '+'
                               && pTok->GetChar() != '('
@@ -303,7 +303,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                             ByteString aStr = "hash table overflow: ";
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
-                            return FALSE;
+                            return sal_False;
                         }
                     }
                 }
@@ -328,7 +328,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                             // set error
                             SetError( aStr, pTok );
                             WriteError( aTokStm );
-                            return FALSE;
+                            return sal_False;
                         }
                     }
                     if( !ReadIdFile( String::CreateFromAscii(aName.GetBuffer()) ) )
@@ -337,7 +337,7 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
                         aStr += aName;
                         SetError( aStr, pTok );
                         WriteError( aTokStm );
-                        return FALSE;
+                        return sal_False;
                     }
                 }
             }
@@ -346,8 +346,8 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
         }
     }
     else
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
 SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
@@ -369,39 +369,39 @@ SvMetaType * SvIdlDataBase::FindType( const ByteString & rName )
 
 SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
 {
-    BOOL bIn	= FALSE;
-    BOOL bOut	= FALSE;
+    sal_Bool bIn	= sal_False;
+    sal_Bool bOut	= sal_False;
     int nCall0	= CALL_VALUE;
     int nCall1	= CALL_VALUE;
-    BOOL bSet   = FALSE; // any attribute set
+    sal_Bool bSet   = sal_False; // any attribute set
 
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->HasHash() )
     {
-        UINT32 nBeginPos = 0; // can not happen with Tell
+        sal_uInt32 nBeginPos = 0; // can not happen with Tell
         while( nBeginPos != rInStm.Tell() )
         {
             nBeginPos = rInStm.Tell();
             if( pTok->Is( SvHash_in() ) )
             {
-                bIn  = TRUE;
+                bIn  = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
             if( pTok->Is( SvHash_out() ) )
             {
-                bOut = TRUE;
+                bOut = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
             if( pTok->Is( SvHash_inout() ) )
             {
-                bIn  = TRUE;
-                bOut = TRUE;
+                bIn  = sal_True;
+                bOut = sal_True;
                 pTok = rInStm.GetToken_Next();
-                bSet = TRUE;
+                bSet = sal_True;
             }
         }
     }
@@ -434,7 +434,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
                                                             CALL_POINTER;
                         rInStm.GetToken_Next();
                     }
-                    bSet = TRUE;
+                    bSet = sal_True;
                 }
             }
 
@@ -465,7 +465,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
                                still to be read. */
 )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
 
     if( !pType )
         pType = ReadKnownType( rInStm );
@@ -476,10 +476,10 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
         SvToken * pTok = rInStm.GetToken_Next();
         if( pTok->IsIdentifier() )
         {
-            ULONG n;
+            sal_uLong n;
             if( FindId( pTok->GetString(), &n ) )
             {
-                for( ULONG i = 0; i < aAttrList.Count(); i++ )
+                for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
                 {
                     SvMetaAttribute * pAttr = aAttrList.GetObject( i );
                     if( pAttr->GetSlotId() == pTok->GetString() )
@@ -502,10 +502,10 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
     const SvNumberIdentifier& rId
 )
 {
-    ULONG n;
+    sal_uLong n;
     if( FindId( rId, &n ) )
     {
-        for( ULONG i = 0; i < aAttrList.Count(); i++ )
+        for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
         {
             SvMetaAttribute * pAttr = aAttrList.GetObject( i );
             if( pAttr->GetSlotId() == rId )
@@ -518,11 +518,11 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr
 
 SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
 {
-    UINT32  nTokPos = rInStm.Tell();
+    sal_uInt32  nTokPos = rInStm.Tell();
     SvToken * pTok = rInStm.GetToken_Next();
 
     if( pTok->IsIdentifier() )
-        for( ULONG n = 0; n < aClassList.Count(); n++ )
+        for( sal_uLong n = 0; n < aClassList.Count(); n++ )
         {
             SvMetaClass * pClass = aClassList.GetObject( n );
             if( pClass->GetName() == pTok->GetString() )
@@ -535,19 +535,16 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
 
 void SvIdlDataBase::Write( const ByteString & rText )
 {
-#ifndef W31
     if( nVerbosity != 0 )
         fprintf( stdout, "%s", rText.GetBuffer() );
-#endif
 }
 
 void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
                                 const ByteString & rFileName,
                                 const ByteString & rErrorText,
-                                ULONG nRow, ULONG nColumn ) const
+                                sal_uLong nRow, sal_uLong nColumn ) const
 {
     // error treatment
-#ifndef W31
     fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n",
              rFileName.GetBuffer(), rErrWrn.GetBuffer(), nRow, nColumn );
 
@@ -555,16 +552,14 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn,
     { // error set
         fprintf( stderr, "\t%s\n", rErrorText.GetBuffer() );
     }
-#endif
 }
 
 void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
 {
     // error treatment
-#ifndef W31
     String aFileName( rInStm.GetFileName() );
     ByteString aErrorText;
-    ULONG	nRow = 0, nColumn = 0;
+    sal_uLong	nRow = 0, nColumn = 0;
 
     rInStm.SeekEnd();
     SvToken *pTok = rInStm.GetToken();
@@ -621,18 +616,17 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
         if( aN.Len() )
             fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.GetBuffer() );
     }
-#endif
 }
 
 SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
 {
 }
 
-BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const String & rPath )
+sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported, const String & rPath )
 {
     aPath = rPath; // only valid for this iteration
     SvToken * pTok;
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
         pTok = rInStm.GetToken();
         // only one import at the very beginning
         if( pTok->Is( SvHash_import() ) )
@@ -656,34 +650,34 @@ BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const
                             aStr += ByteString( aFullName.GetFull(), RTL_TEXTENCODING_UTF8 );
                             SetError( aStr, pTok );
                             WriteError( rInStm );
-                            bOk = FALSE;
+                            bOk = sal_False;
                         }
                         else
                         {
                             aStm.Seek( 0 );
                             aStm.ResetError();
                             SvTokenStream aTokStm( aStm, aFullName.GetFull() );
-                            bOk = ReadSvIdl( aTokStm, TRUE, rPath );
+                            bOk = ReadSvIdl( aTokStm, sal_True, rPath );
                         }
                     }
                 }
                 else
-                    bOk = FALSE;
+                    bOk = sal_False;
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
         }
 
-    UINT32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
+    sal_uInt32 nBeginPos = 0xFFFFFFFF; // can not happen with Tell
 
     while( bOk && nBeginPos != rInStm.Tell() )
     {
         nBeginPos = rInStm.Tell();
         pTok = rInStm.GetToken();
         if( pTok->IsEof() )
-            return TRUE;
+            return sal_True;
         if( pTok->IsEmpty() )
-            bOk = FALSE;
+            bOk = sal_False;
 
         // only one import at the very beginning
         if( pTok->Is( SvHash_module() ) )
@@ -692,24 +686,24 @@ BOOL SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, BOOL bImported, const
             if( aModule->ReadSvIdl( *this, rInStm ) )
                 GetModuleList().Append( aModule );
             else
-                bOk = FALSE;
+                bOk = sal_False;
         }
         else
-            bOk = FALSE;
+            bOk = sal_False;
     }
     if( !bOk || !pTok->IsEof() )
     {
          // error treatment
          WriteError( rInStm );
-         return FALSE;
+         return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     SvStringHashList aList;
     if( GetIdTable() )
@@ -726,23 +720,23 @@ BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
         }
     }
 
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         pModule->WriteSvIdl( *this, rOutStm, 0 );
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     // reset all tmp variables for writing
     WriteReset();
     SvMemoryStream aTmpStm( 256000, 256000 );
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -757,16 +751,16 @@ BOOL SvIdlWorkingBase::WriteSfx( SvStream & rOutStm )
     }
     aUsedTypes.Clear();
     rOutStm << aTmpStm;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
+sal_Bool SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
     Table aIdTable;
-    ULONG n;
+    sal_uLong n;
     for( n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
@@ -780,12 +774,12 @@ BOOL SvIdlWorkingBase::WriteHelpIds( SvStream& rOutStm )
         pAttr->WriteHelpId( *this, rOutStm, &aIdTable );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteSfxItem( SvStream & )
+sal_Bool SvIdlWorkingBase::WriteSfxItem( SvStream & )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SvIdlDataBase::StartNewFile( const String& rName )
@@ -797,14 +791,14 @@ void SvIdlDataBase::AppendAttr( SvMetaAttribute *pAttr )
 {
     aAttrList.Append( pAttr );
     if ( bExport )
-        pAttr->SetNewAttribute( TRUE );
+        pAttr->SetNewAttribute( sal_True );
 }
 
-BOOL SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
+sal_Bool SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
 {
     SvMetaAttributeMemberList &rList = GetAttrList();
-    ULONG nCount = rList.Count();
-    for ( ULONG n=0; n<nCount; n++ )
+    sal_uLong nCount = rList.Count();
+    for ( sal_uLong n=0; n<nCount; n++ )
     {
         if ( rList.GetObject(n)->IsNewAttribute() )
         {
@@ -813,23 +807,23 @@ BOOL SvIdlWorkingBase::WriteCSV( SvStream& rStrm )
     }
 
     if ( rStrm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
+sal_Bool SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
 {
     if( rOutStm.GetError() != SVSTREAM_OK )
-        return FALSE;
+        return sal_False;
 
-    for( ULONG n = 0; n < GetModuleList().Count(); n++ )
+    for( sal_uLong n = 0; n < GetModuleList().Count(); n++ )
     {
         SvMetaModule * pModule = GetModuleList().GetObject( n );
         if( !pModule->IsImported() )
             pModule->Write( *this, rOutStm, 0, WRITE_DOCU );
     }
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 76179a97da..ad5e198866 100644..100755
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -80,7 +80,7 @@ IdlDll::~IdlDll()
 
 inline SvStringHashEntry * INS( const ByteString & rName )
 {
-    UINT32  nIdx;
+    sal_uInt32  nIdx;
     IDLAPP->pHashTable->Insert( rName, &nIdx );
     return (SvStringHashEntry * )IDLAPP->pHashTable->Get( nIdx );
 }
diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk
index c33d2e9f3d..c33d2e9f3d 100644..100755
--- a/idl/source/prj/makefile.mk
+++ b/idl/source/prj/makefile.mk
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index ed6a9f5643..21a9bdd6fb 100644..100755
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -38,19 +38,19 @@
 #include <tools/string.hxx>
 
 #define BR 0x8000
-BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVerschieben )
+sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool bImmerVerschieben )
 {
     //printf( "Move from %s to %s\n", rFile2.GetStr(), rFile1.GetStr() );
-    ULONG nC1 = 0;
-    ULONG nC2 = 1;
+    sal_uLong nC1 = 0;
+    sal_uLong nC2 = 1;
     if( !bImmerVerschieben )
     {
         SvFileStream aOutStm1( rFile1, STREAM_STD_READ );
         SvFileStream aOutStm2( rFile2, STREAM_STD_READ );
         if( aOutStm1.GetError() == SVSTREAM_OK )
         {
-            BYTE * pBuf1 = new BYTE[ BR ];
-            BYTE * pBuf2 = new BYTE[ BR ];
+            sal_uInt8 * pBuf1 = new sal_uInt8[ BR ];
+            sal_uInt8 * pBuf2 = new sal_uInt8[ BR ];
             nC1 = aOutStm1.Read( pBuf1, BR );
             nC2 = aOutStm2.Read( pBuf2, BR );
             while( nC1 == nC2 )
@@ -83,9 +83,9 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
             // delete both files
             aF1.Kill();
             aF2.Kill();
-            return FALSE;
+            return sal_False;
         }
-        return TRUE;
+        return sal_True;
     }
     return 0 == aF2.Kill();
 }
@@ -232,8 +232,8 @@ int cdecl main ( int argc, char ** argv)
 
     if( nExit == 0 )
     {
-        BOOL bErr = FALSE;
-        BOOL bDoMove = aCommand.aTargetFile.Len() == 0;
+        sal_Bool bErr = sal_False;
+        sal_Bool bDoMove = aCommand.aTargetFile.Len() == 0;
         String aErrFile, aErrFile2;
         if( !bErr && aCommand.aListFile.Len() )
         {
diff --git a/idl/source/svidl.dat b/idl/source/svidl.dat
index 4750475c74..4750475c74 100644..100755
--- a/idl/source/svidl.dat
+++ b/idl/source/svidl.dat
diff --git a/idl/util/idlpch.cxx b/idl/util/idlpch.cxx
index 4df0e9a073..4df0e9a073 100644..100755
--- a/idl/util/idlpch.cxx
+++ b/idl/util/idlpch.cxx
diff --git a/idl/util/makefile.mk b/idl/util/makefile.mk
index 27cc52ef27..27cc52ef27 100644..100755
--- a/idl/util/makefile.mk
+++ b/idl/util/makefile.mk
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 515e7ebe19..515e7ebe19 100644..100755
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index b7c2c908e3..316f26f68c 100644..100755
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
@@ -52,18 +52,18 @@ class HyphenatedWord :
 {
     ::rtl::OUString		aWord;
     ::rtl::OUString		aHyphenatedWord;
-    INT16				nHyphPos;
-    INT16				nHyphenationPos;
-    INT16				nLanguage;
-    BOOL				bIsAltSpelling;
+    sal_Int16				nHyphPos;
+    sal_Int16				nHyphenationPos;
+    sal_Int16				nLanguage;
+    sal_Bool				bIsAltSpelling;
 
     // disallow copy-constructor and assignment-operator for now
     HyphenatedWord(const HyphenatedWord &);
     HyphenatedWord & operator = (const HyphenatedWord &);
 
 public:
-    HyphenatedWord(const ::rtl::OUString &rWord, INT16 nLang, INT16 nHyphenationPos,
-                   const ::rtl::OUString &rHyphenatedWord, INT16 nHyphenPos );
+    HyphenatedWord(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+                   const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
     virtual ~HyphenatedWord();
 
     // XHyphenatedWord
@@ -88,10 +88,10 @@ public:
 
     ::rtl::OUString GetWord()           { return aWord; }
     ::rtl::OUString GetHyphenatedWord() { return aHyphenatedWord; }
-    INT16           GetLanguage()       { return nLanguage; }
+    sal_Int16           GetLanguage()       { return nLanguage; }
     void            SetWord( ::rtl::OUString &rTxt )            { aWord = rTxt; }
     void            SetHyphenatedWord( ::rtl::OUString &rTxt )  { aHyphenatedWord = rTxt; }
-    void            SetLanguage( INT16 nLang )                  { nLanguage = nLang; }
+    void            SetLanguage( sal_Int16 nLang )                  { nLanguage = nLang; }
 };
 
 
@@ -105,17 +105,17 @@ class PossibleHyphens :
 {
     ::rtl::OUString				aWord;
     ::rtl::OUString				aWordWithHyphens;
-    ::com::sun::star::uno::Sequence< INT16 >	aOrigHyphenPos;
-    INT16						nLanguage;
+    ::com::sun::star::uno::Sequence< sal_Int16 >	aOrigHyphenPos;
+    sal_Int16						nLanguage;
 
     // disallow copy-constructor and assignment-operator for now
     PossibleHyphens(const PossibleHyphens &);
     PossibleHyphens & operator = (const PossibleHyphens &);
 
 public:
-    PossibleHyphens(const ::rtl::OUString &rWord, INT16 nLang,
+    PossibleHyphens(const ::rtl::OUString &rWord, sal_Int16 nLang,
             const ::rtl::OUString &rHyphWord,
-            const ::com::sun::star::uno::Sequence< INT16 > &rPositions);
+            const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
     virtual ~PossibleHyphens();
 
     // XPossibleHyphens
@@ -133,9 +133,9 @@ public:
             throw(::com::sun::star::uno::RuntimeException);
 
     ::rtl::OUString GetWord()       { return aWord; }
-    INT16           GetLanguage()   { return nLanguage; }
+    sal_Int16           GetLanguage()   { return nLanguage; }
     void            SetWord( ::rtl::OUString &rTxt )    { aWord = rTxt; }
-    void            SetLanguage( INT16 nLang )          { nLanguage = nLang; }
+    void            SetLanguage( sal_Int16 nLang )          { nLanguage = nLang; }
 };
 
 
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index f8d46f4a08..51503366f6 100644..100755
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@ -81,12 +81,12 @@ class PropertyChgHelper :
     int		nEvtFlags;	// flags for event types allowed to be launched
 
     // default values
-    BOOL	bIsIgnoreControlCharacters;
-    BOOL	bIsUseDictionaryList;
+    sal_Bool	bIsIgnoreControlCharacters;
+    sal_Bool	bIsUseDictionaryList;
     
     // return values, will be set to default value or current temporary value
-    BOOL	bResIsIgnoreControlCharacters;
-    BOOL	bResIsUseDictionaryList;
+    sal_Bool	bResIsIgnoreControlCharacters;
+    sal_Bool	bResIsUseDictionaryList;
     
     
     // disallow use of copy-constructor and assignment-operator
@@ -103,9 +103,9 @@ protected:
         ::com::sun::star::beans::XPropertySet > &
             GetPropSet()	{ return xPropSet; }
 
-    void	AddPropNames( const char *pNewNames[], INT32 nCount );
+    void	AddPropNames( const char *pNewNames[], sal_Int32 nCount );
     
-    virtual BOOL	propertyChange_Impl( 
+    virtual sal_Bool	propertyChange_Impl( 
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -156,8 +156,8 @@ public:
         ::com::sun::star::uno::XInterface > &
             GetEvtObj() const		{ return xMyEvtObj; }
 
-    BOOL	IsIgnoreControlCharacters() const	{ return bResIsIgnoreControlCharacters; }
-    BOOL	IsUseDictionaryList() const			{ return bResIsUseDictionaryList; }
+    sal_Bool	IsIgnoreControlCharacters() const	{ return bResIsIgnoreControlCharacters; }
+    sal_Bool	IsUseDictionaryList() const			{ return bResIsUseDictionaryList; }
 };
 
 
@@ -190,15 +190,15 @@ class PropertyHelper_Spell :
     public PropertyChgHelper
 {
     // default values
-    BOOL	bIsSpellUpperCase;
-    BOOL	bIsSpellWithDigits;
-    BOOL	bIsSpellCapitalization;
+    sal_Bool	bIsSpellUpperCase;
+    sal_Bool	bIsSpellWithDigits;
+    sal_Bool	bIsSpellCapitalization;
 
     // return values, will be set to default value or current temporary value
-    INT16   nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently
-    BOOL	bResIsSpellUpperCase;
-    BOOL	bResIsSpellWithDigits;
-    BOOL	bResIsSpellCapitalization;
+    sal_Int16   nResMaxNumberOfSuggestions; // special value that is not part of the property set and thus needs to be handled differently
+    sal_Bool	bResIsSpellUpperCase;
+    sal_Bool	bResIsSpellWithDigits;
+    sal_Bool	bResIsSpellCapitalization;
 
 
     // disallow use of copy-constructor and assignment-operator
@@ -209,7 +209,7 @@ protected:
     // PropertyChgHelper
     virtual void	SetDefaultValues();
     virtual void	GetCurrentValues();
-    virtual BOOL	propertyChange_Impl( 
+    virtual sal_Bool	propertyChange_Impl( 
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -227,12 +227,12 @@ public:
         propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
             throw(::com::sun::star::uno::RuntimeException);
 
-    virtual INT16   GetDefaultNumberOfSuggestions() const;
+    virtual sal_Int16   GetDefaultNumberOfSuggestions() const;
 
-    INT16   GetMaxNumberOfSuggestions() const   { return nResMaxNumberOfSuggestions; }
-    BOOL	IsSpellUpperCase() const			{ return bResIsSpellUpperCase; }
-    BOOL	IsSpellWithDigits() const			{ return bResIsSpellWithDigits; }
-    BOOL	IsSpellCapitalization() const		{ return bResIsSpellCapitalization; }
+    sal_Int16   GetMaxNumberOfSuggestions() const   { return nResMaxNumberOfSuggestions; }
+    sal_Bool	IsSpellUpperCase() const			{ return bResIsSpellUpperCase; }
+    sal_Bool	IsSpellWithDigits() const			{ return bResIsSpellWithDigits; }
+    sal_Bool	IsSpellCapitalization() const		{ return bResIsSpellCapitalization; }
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -241,12 +241,12 @@ class PropertyHelper_Hyphen :
     public PropertyChgHelper
 {
     // default values
-    INT16	nHyphMinLeading,
+    sal_Int16	nHyphMinLeading,
             nHyphMinTrailing,
             nHyphMinWordLength;
 
     // return values, will be set to default value or current temporary value
-    INT16	nResHyphMinLeading,
+    sal_Int16	nResHyphMinLeading,
             nResHyphMinTrailing,
             nResHyphMinWordLength;
 
@@ -258,7 +258,7 @@ protected:
     // PropertyChgHelper
     virtual void	SetDefaultValues();
     virtual void	GetCurrentValues();
-    virtual BOOL	propertyChange_Impl( 
+    virtual sal_Bool	propertyChange_Impl( 
                             const ::com::sun::star::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -276,9 +276,9 @@ public:
         propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
             throw(::com::sun::star::uno::RuntimeException);
 
-    INT16	GetMinLeading() const				{ return nResHyphMinLeading; }
-    INT16	GetMinTrailing() const				{ return nResHyphMinTrailing; }
-    INT16	GetMinWordLength() const			{ return nResHyphMinWordLength; }
+    sal_Int16	GetMinLeading() const				{ return nResHyphMinLeading; }
+    sal_Int16	GetMinTrailing() const				{ return nResHyphMinTrailing; }
+    sal_Int16	GetMinWordLength() const			{ return nResHyphMinWordLength; }
 };
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx
index d285aba124..d285aba124 100644..100755
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/linguistic/lngprops.hxx
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index 731ff97e59..6d8ace0598 100644..100755
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -98,11 +98,11 @@ namespace linguistic
 
 ::osl::Mutex &	GetLinguMutex();
 
-LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang );
+LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
 
 ///////////////////////////////////////////////////////////////////////////
 
-rtl_TextEncoding GetTextEncoding( INT16 nLanguage );
+rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage );
 
 inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc)
 {
@@ -132,9 +132,9 @@ LanguageType
     LanguageToLocale( ::com::sun::star::lang::Locale& rLocale, LanguageType eLang );
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >
-    LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< INT16 > &rLangSeq );
+    LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< sal_Int16 > &rLangSeq );
 
-::com::sun::star::uno::Sequence< INT16 >
+::com::sun::star::uno::Sequence< sal_Int16 >
     LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence<
         ::com::sun::star::lang::Locale > &rLocaleSeq );
 
@@ -142,10 +142,10 @@ LanguageType
 
 // checks if file pointed to by rURL is readonly
 // and may also check return if such a file exists or not
-BOOL    IsReadOnly( const String &rURL, BOOL *pbExist = 0 );
+sal_Bool    IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 );
 
 // checks if a file with the given URL exists
-BOOL    FileExists( const String &rURL );
+sal_Bool    FileExists( const String &rURL );
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -164,7 +164,7 @@ String     SearchFileInPaths( const String &rFile, const ::com::sun::star::uno::
 
 ///////////////////////////////////////////////////////////////////////////
 
-INT32		GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos );
+sal_Int32		GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
 
 ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XHyphenatedWord >
@@ -174,19 +174,19 @@ INT32		GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos );
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL        IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage );
-BOOL        IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage );
+sal_Bool        IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
+sal_Bool        IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage );
 
-inline BOOL        IsUpper( const String &rText, INT16 nLanguage )     { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
-inline BOOL        IsLower( const String &rText, INT16 nLanguage )     { return IsLower( rText, 0, rText.Len(), nLanguage ); }
+inline sal_Bool        IsUpper( const String &rText, sal_Int16 nLanguage )     { return IsUpper( rText, 0, rText.Len(), nLanguage ); }
+inline sal_Bool        IsLower( const String &rText, sal_Int16 nLanguage )     { return IsLower( rText, 0, rText.Len(), nLanguage ); }
 
-String      ToLower( const String &rText, INT16 nLanguage );
-String      ToUpper( const String &rText, INT16 nLanguage );
-String      ToTitle( const String &rText, INT16 nLanguage );
-sal_Unicode	ToLower( const sal_Unicode cChar, INT16 nLanguage );
-sal_Unicode	ToUpper( const sal_Unicode cChar, INT16 nLanguage );
-BOOL		HasDigits( const ::rtl::OUString &rText );
-BOOL		IsNumeric( const String &rText );
+String      ToLower( const String &rText, sal_Int16 nLanguage );
+String      ToUpper( const String &rText, sal_Int16 nLanguage );
+String      ToTitle( const String &rText, sal_Int16 nLanguage );
+sal_Unicode	ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
+sal_Unicode	ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
+sal_Bool		HasDigits( const ::rtl::OUString &rText );
+sal_Bool		IsNumeric( const String &rText );
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -198,11 +198,11 @@ BOOL		IsNumeric( const String &rText );
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
+sal_Bool IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > &rxPropSet );
 
-BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
+sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > &rxPropSet );
 
@@ -210,8 +210,8 @@ BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rPrope
     ::com::sun::star::linguistic2::XDictionaryEntry >
         SearchDicList(
             const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList,
-            const ::rtl::OUString& rWord, INT16 nLanguage,
-            BOOL bSearchPosDics, BOOL bSearchSpellEntry );
+            const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+            sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
 
 sal_uInt8 AddEntryToDic(
     ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >  &rxDic,
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index c0f5aebe23..ea4b7d8504 100644..100755
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -62,21 +62,21 @@ namespace linguistic
         MergeProposalSeqs(
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt1,
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt2,
-                BOOL bAllowDuplicates );
+                sal_Bool bAllowDuplicates );
 
 void    SeqRemoveNegEntries( 
                 ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
                 ::com::sun::star::uno::Reference< 
                     ::com::sun::star::linguistic2::XDictionaryList > &rxDicList, 
-                INT16 nLanguage );
+                sal_Int16 nLanguage );
 
-BOOL    SeqHasEntry( 
+sal_Bool    SeqHasEntry( 
                 const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq, 
                 const ::rtl::OUString &rTxt);
 
 ///////////////////////////////////////////////////////////////////////////
 
-void SearchSimilarText( const rtl::OUString &rText, INT16 nLanguage, 
+void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage, 
         ::com::sun::star::uno::Reference< 
             ::com::sun::star::linguistic2::XDictionaryList > &xDicList,
         std::vector< rtl::OUString > & rDicListProps );
@@ -93,8 +93,8 @@ class SpellAlternatives :
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >	aAlt;	// list of alternatives, may be empty.
     ::rtl::OUString			aWord;
-    INT16					nType;			// type of failure
-    INT16					nLanguage;
+    sal_Int16					nType;			// type of failure
+    sal_Int16					nLanguage;
 
     // disallow copy-constructor and assignment-operator for now
     SpellAlternatives(const SpellAlternatives &);
@@ -102,9 +102,9 @@ class SpellAlternatives :
 
 public:
     SpellAlternatives();
-    SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType,
+    SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
                       const ::rtl::OUString &rRplcWord );
-    SpellAlternatives(const ::rtl::OUString &rWord, INT16 nLang, INT16 nFailureType,
+    SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
                       const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives );
     virtual ~SpellAlternatives();
 
@@ -120,8 +120,8 @@ public:
     virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException);
 
     // non-interface specific functions
-    void	SetWordLanguage(const ::rtl::OUString &rWord, INT16 nLang);
-    void	SetFailureType(INT16 nTypeP);
+    void	SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
+    void	SetFailureType(sal_Int16 nTypeP);
     void	SetAlternatives(
                 const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
 };
diff --git a/linguistic/inc/makefile.mk b/linguistic/inc/makefile.mk
index fa5aad7b0a..fa5aad7b0a 100644..100755
--- a/linguistic/inc/makefile.mk
+++ b/linguistic/inc/makefile.mk
diff --git a/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx
index 32cfae296c..32cfae296c 100644..100755
--- a/linguistic/inc/pch/precompiled_linguistic.cxx
+++ b/linguistic/inc/pch/precompiled_linguistic.cxx
diff --git a/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx
index f4a40710f1..f4a40710f1 100644..100755
--- a/linguistic/inc/pch/precompiled_linguistic.hxx
+++ b/linguistic/inc/pch/precompiled_linguistic.hxx
diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx
index 8c692b46f3..9b51510497 100644..100755
--- a/linguistic/inc/thesdta.hxx
+++ b/linguistic/inc/thesdta.hxx
@@ -52,7 +52,7 @@ class ThesaurusMeaning :
 protected:
     ::rtl::OUString aText;              // one of the found 'meanings' for the looked up text
     ::rtl::OUString aLookUpText;        // text that was looked up in the thesaurus
-    INT16           nLookUpLanguage;    // language of the text that was looked up
+    sal_Int16           nLookUpLanguage;    // language of the text that was looked up
 
     // disallow copy-constructor and assignment-operator for now
     ThesaurusMeaning(const ThesaurusMeaning &);
@@ -60,7 +60,7 @@ protected:
 
 public:
     ThesaurusMeaning(const ::rtl::OUString &rText,
-            const ::rtl::OUString &rLookUpText, INT16 nLookUpLang );
+            const ::rtl::OUString &rLookUpText, sal_Int16 nLookUpLang );
     virtual ~ThesaurusMeaning();
 
     // XMeaning
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index 8b17240c31..107a42fced 100644..100755
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,6 +1,10 @@
-lg  linguistic  :   svl xmloff ucbhelper comphelper ICU:icu NULL
+lg  linguistic  :   svl xmloff ucbhelper comphelper ICU:icu LIBXSLT:libxslt NULL
 lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
 lg	linguistic\source						nmake	-	all	lg_src lg_inc NULL
+
 lg linguistic\qa\unoapi nmake - all lg_qa_unoapi NULL
+
+# could be we need a Japanese office version
+# lg linguistic\qa\complex\linguistic nmake - all lg_qa_complex NULL
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index 01a755e53c..03237f9257 100644..100755
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -7,4 +7,7 @@
 ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
 
 mkdir: %_DEST%\inc%_EXT%\linguistic
-..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx
+
+..\%__SRC%\misc\lng.component %_DEST%\xml%_EXT%\lng.component
+
diff --git a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
index 42b8e9fe8e..f1e7d2d64b 100644..100755
--- a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
+++ b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
@@ -43,56 +43,57 @@ import com.sun.star.linguistic2.XConversionDictionaryList;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.XCell;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XWordCursor;
+
 import com.sun.star.uno.UnoRuntime;
 
-import complexlib.ComplexTestCase;
 
-import java.io.PrintWriter;
 
 import util.DesktopTools;
 
+// import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
-public class HangulHanjaConversion extends ComplexTestCase {
+public class HangulHanjaConversion {
     XMultiServiceFactory xMSF = null;
     boolean disposed = false;
     Locale aLocale = new Locale("ko", "KR", "");
     short dictType = ConversionDictionaryType.HANGUL_HANJA;
 
-    public String[] getTestMethodNames() {
-        return new String[] { "ConversionDictionaryList" };
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[] { "ConversionDictionaryList" };
+//    }
 
-    public void before() {
-        xMSF = (XMultiServiceFactory) param.getMSF();
+    @Before public void before() {
+        xMSF = getMSF();
     }
 
-    public void ConversionDictionaryList() {
+    @Test public void ConversionDictionaryList() {
         Object ConversionDictionaryList = null;
 
         try {
             ConversionDictionaryList = xMSF.createInstance(
                                                "com.sun.star.linguistic2.ConversionDictionaryList");
         } catch (com.sun.star.uno.Exception e) {
-            assure("Couldn't create ConversionDictionaryList", false);
+            fail("Couldn't create ConversionDictionaryList");
         }
 
         if (ConversionDictionaryList == null) {
-            assure("Couldn't create ConversionDictionaryList", false);
+            fail("Couldn't create ConversionDictionaryList");
         }
 
         boolean bList = checkXConversionDictionaryList(
                                 ConversionDictionaryList);
-        assure("XConversionDictionaryList doesnt work as expected", bList);
+        assertTrue("XConversionDictionaryList doesnt work as expected", bList);
     }
 
     private boolean checkXConversionDictionaryList(Object list) {
         boolean res = true;
-        XConversionDictionaryList xCList = (XConversionDictionaryList) UnoRuntime.queryInterface(
-                                                   XConversionDictionaryList.class, 
-                                                   list);
+        XConversionDictionaryList xCList = UnoRuntime.queryInterface(XConversionDictionaryList.class, list);
         XConversionDictionary xDict = null;
 
         try {
@@ -100,28 +101,30 @@ public class HangulHanjaConversion extends ComplexTestCase {
                                             dictType);
         } catch (com.sun.star.lang.NoSupportException e) {
             res = false;
-            assure("Couldn't add Dictionary", false);
+            fail("Couldn't add Dictionary");
         } catch (com.sun.star.container.ElementExistException e) {
             res = false;
-            assure("Couldn't add Dictionary", false);
+            fail("Couldn't add Dictionary");
         }
 
         try {
             xCList.addNewDictionary("addNewDictionary", aLocale, dictType);
             res = false;
-            assure("wrong exception while adding Dictionary again", false);
+            fail("wrong exception while adding Dictionary again");
         } catch (com.sun.star.lang.NoSupportException e) {
             res = false;
-            assure("wrong exception while adding Dictionary again", false);
+            fail("wrong exception while adding Dictionary again");
         } catch (com.sun.star.container.ElementExistException e) {
         }
 
         boolean localRes = checkNameContainer(xCList.getDictionaryContainer());
         res &= localRes;
-        assure("getDictionaryContainer didn't work as expected", localRes);
+        assertTrue("getDictionaryContainer didn't work as expected", localRes);
 
-        String FileToLoad = util.utils.getFullTestURL("hangulhanja.sxc");
-        XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad, 
+        String FileToLoad = TestDocument.getUrl("hangulhanja.sxc");
+        // String FileToLoad = util.utils.getFullTestURL();
+
+XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad, 
                                                new PropertyValue[] {  });
         XSpreadsheet xSheet = getSheet(xDoc);
         boolean done = false;
@@ -145,7 +148,7 @@ public class HangulHanjaConversion extends ComplexTestCase {
                 } catch (com.sun.star.lang.IllegalArgumentException e) {
                     e.printStackTrace();
                     res = false;
-                    assure("Exception while checking adding entry", false);
+                    fail("Exception while checking adding entry");
                 } catch (com.sun.star.container.ElementExistException e) {
                     //ignored
                 }
@@ -157,7 +160,7 @@ public class HangulHanjaConversion extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException e) {
             e.printStackTrace();
             res = false;
-            assure("Exception while checking adding entry", false);
+            fail("Exception while checking adding entry");
         } catch (com.sun.star.container.ElementExistException e) {
             //ignored
         }
@@ -165,7 +168,7 @@ public class HangulHanjaConversion extends ComplexTestCase {
         localRes = xCList.queryMaxCharCount(aLocale, dictType, 
                                             ConversionDirection.FROM_LEFT) == 42;
         res &= localRes;
-        assure("queryMaxCharCount returned the wrong value", localRes);
+        assertTrue("queryMaxCharCount returned the wrong value", localRes);
 
         String[] conversion = null;
 
@@ -177,37 +180,36 @@ public class HangulHanjaConversion extends ComplexTestCase {
                                                  TextConversionOption.NONE);
         } catch (com.sun.star.lang.IllegalArgumentException e) {
             res = false;
-            assure("Exception while calling queryConversions", false);
+            fail("Exception while calling queryConversions");
         } catch (com.sun.star.lang.NoSupportException e) {
             res = false;
-            assure("Exception while calling queryConversions", false);
+            fail("Exception while calling queryConversions");
         }
 
         localRes = conversion[0].equals(expectedConversion);
         res &= localRes;
-        assure("queryConversions didn't work as expected", localRes);
+        assertTrue("queryConversions didn't work as expected", localRes);
 
         try {
             xCList.getDictionaryContainer().removeByName("addNewDictionary");
         } catch (com.sun.star.container.NoSuchElementException e) {
             res = false;
-            assure("exception while removing Dictionary again", false);
+            fail("exception while removing Dictionary again");
         } catch (com.sun.star.lang.WrappedTargetException e) {
             res = false;
-            assure("exception while removing Dictionary again", false);
+            fail("exception while removing Dictionary again");
         }
 
         localRes = !xCList.getDictionaryContainer()
                           .hasByName("addNewDictionary");
         res &= localRes;
-        assure("Dictionary hasn't been removed properly", localRes);
+        assertTrue("Dictionary hasn't been removed properly", localRes);
 
-        XComponent dicList = (XComponent) UnoRuntime.queryInterface(
-                                     XComponent.class, xCList);
+        XComponent dicList = UnoRuntime.queryInterface(XComponent.class, xCList);
         XEventListener listen = new EventListener();
         dicList.addEventListener(listen);
         dicList.dispose();
-        assure("dispose didn't work", disposed);
+        assertTrue("dispose didn't work", disposed);
         dicList.removeEventListener(listen);
 
         DesktopTools.closeDoc(xDoc);
@@ -244,23 +246,17 @@ public class HangulHanjaConversion extends ComplexTestCase {
     }
 
     private XSpreadsheet getSheet(XComponent xDoc) {
-        XSpreadsheetDocument xSheetDoc = (XSpreadsheetDocument) UnoRuntime.queryInterface(
-                                                 XSpreadsheetDocument.class, 
-                                                 xDoc);
+        XSpreadsheetDocument xSheetDoc = UnoRuntime.queryInterface(XSpreadsheetDocument.class, xDoc);
         XSpreadsheet xSheet = null;
 
         try {
-            xSheet = (XSpreadsheet) UnoRuntime.queryInterface(
-                             XSpreadsheet.class, 
-                             xSheetDoc.getSheets()
-                                      .getByName(xSheetDoc.getSheets()
-                                                          .getElementNames()[0]));
+            xSheet = UnoRuntime.queryInterface(XSpreadsheet.class, xSheetDoc.getSheets().getByName(xSheetDoc.getSheets().getElementNames()[0]));
         } catch (com.sun.star.container.NoSuchElementException e) {
-            log.println("Couldn't get sheet");
-            e.printStackTrace((PrintWriter) log);
+            System.out.println("Couldn't get sheet");
+            e.printStackTrace();
         } catch (com.sun.star.lang.WrappedTargetException e) {
-            log.println("Couldn't get sheet");
-            e.printStackTrace((PrintWriter) log);
+            System.out.println("Couldn't get sheet");
+            e.printStackTrace();
         }
 
         return xSheet;
@@ -280,8 +276,8 @@ public class HangulHanjaConversion extends ComplexTestCase {
         try {
             re = xSpreadsheet.getCellByPosition(x, y);
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
-            log.println("Couldn't get word");
-            e.printStackTrace((PrintWriter) log);
+            System.out.println("Couldn't get word");
+            e.printStackTrace();
         }
 
         return re;
@@ -342,4 +338,26 @@ public class HangulHanjaConversion extends ComplexTestCase {
             disposed = true;
         }
     }
-}
\ No newline at end of file
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+}
diff --git a/linguistic/qa/complex/linguistic/TestDocument.java b/linguistic/qa/complex/linguistic/TestDocument.java
new file mode 100755
index 0000000000..415686b7c4
--- /dev/null
+++ b/linguistic/qa/complex/linguistic/TestDocument.java
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+package complex.linguistic;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument
+{
+    public static String getUrl(String name) 
+        {
+            return OfficeFileUrl.getAbsolute(new File("testdocuments", name));
+        }
+
+    private TestDocument() {}
+}
diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk
index 75330e3c5d..43a88ee0a1 100644..100755
--- a/linguistic/qa/complex/linguistic/makefile.mk
+++ b/linguistic/qa/complex/linguistic/makefile.mk
@@ -25,49 +25,37 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = HangulHanjaConversion
-PRJNAME = linguistic
-PACKAGE = complex$/linguistic
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \
-                  OOoRunner.jar mysql.jar
-JAVAFILES       = HangulHanjaConversion.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_linguistic
 
-MAXLINELENGTH = 100000
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/linguistic
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    HangulHanjaConversion.java
 
-# --- Parameters for the test --------------------------------------
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    TestDocument.java
 
-# test base is java complex
-CT_TESTBASE = -tb java_complex
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_TEST) -tdoc $(PWD)$/testdocuments
+.END
 
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
+ALLTAR : javatest
 
+.END
diff --git a/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc b/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc
index 823ce57d32..823ce57d32 100644..100755
--- a/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc
+++ b/linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxc
diff --git a/linguistic/qa/unoapi/Test.java b/linguistic/qa/unoapi/Test.java
index 4a96418255..4a96418255 100644..100755
--- a/linguistic/qa/unoapi/Test.java
+++ b/linguistic/qa/unoapi/Test.java
diff --git a/linguistic/qa/unoapi/knownissues.xcl b/linguistic/qa/unoapi/knownissues.xcl
index e5bf99558a..e5bf99558a 100644..100755
--- a/linguistic/qa/unoapi/knownissues.xcl
+++ b/linguistic/qa/unoapi/knownissues.xcl
diff --git a/linguistic/qa/unoapi/lng.sce b/linguistic/qa/unoapi/lng.sce
index fd41284386..fd41284386 100644..100755
--- a/linguistic/qa/unoapi/lng.sce
+++ b/linguistic/qa/unoapi/lng.sce
diff --git a/linguistic/qa/unoapi/makefile.mk b/linguistic/qa/unoapi/makefile.mk
index bd330c6fba..bd330c6fba 100644..100755
--- a/linguistic/qa/unoapi/makefile.mk
+++ b/linguistic/qa/unoapi/makefile.mk
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 303b0afecd..79be33ba73 100644..100755
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -67,7 +67,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
@@ -156,9 +156,9 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
     }
 }
 
-BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
+sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (rFileURL.Len() == 0)
         return bRes;
@@ -199,9 +199,9 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
 
 ConvDic::ConvDic( 
         const String &rName, 
-        INT16 nLang,
+        sal_Int16 nLang,
         sal_Int16 nConvType,
-             BOOL bBiDirectional,
+             sal_Bool bBiDirectional,
         const String &rMainURL) :
     aFlushListeners( GetLinguMutex() )
 {
@@ -216,30 +216,30 @@ ConvDic::ConvDic(
         pConvPropType = std::auto_ptr< PropTypeMap >( new PropTypeMap );
 
     nMaxLeftCharCount = nMaxRightCharCount = 0;
-    bMaxCharCountIsValid = TRUE;
+    bMaxCharCountIsValid = sal_True;
 
-    bNeedEntries = TRUE;
-    bIsModified  = bIsActive = FALSE;
-    bIsReadonly = FALSE;
+    bNeedEntries = sal_True;
+    bIsModified  = bIsActive = sal_False;
+    bIsReadonly = sal_False;
     
     if( rMainURL.Len() > 0 )
     {
-        BOOL bExists = FALSE;
+        sal_Bool bExists = sal_False;
         bIsReadonly = IsReadOnly( rMainURL, &bExists );
 
         if( !bExists )  // new empty dictionary
         {
-            bNeedEntries = FALSE;
+            bNeedEntries = sal_False;
             //! create physical representation of an **empty** dictionary
             //! that could be found by the dictionary-list implementation
             // (Note: empty dictionaries are not just empty files!)
             Save();
-            bIsReadonly = IsReadOnly( rMainURL );   // will be FALSE if Save was succesfull
+            bIsReadonly = IsReadOnly( rMainURL );   // will be sal_False if Save was succesfull
         }
     }
     else
     {
-        bNeedEntries = FALSE;
+        bNeedEntries = sal_False;
     }
 }
 
@@ -254,12 +254,12 @@ void ConvDic::Load()
     DBG_ASSERT( !bIsModified, "dictionary is modified. Really do 'Load'?" );
 
     //!! prevent function from being called recursively via HasEntry, AddEntry
-    bNeedEntries = FALSE;
+    bNeedEntries = sal_False;
     ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL );
     //!! keep a first reference to ensure the lifetime of the object !!
     uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY );
     ReadThroughDic( aMainURL, *pImport );    // will implicitly add the entries
-    bIsModified = FALSE;
+    bIsModified = sal_False;
 }
 
 
@@ -320,7 +320,7 @@ void ConvDic::Save()
         sal_Bool bRet = pExport->Export();     // write entries to file
         DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" );
         if (bRet)
-            bIsModified = FALSE;
+            bIsModified = sal_False;
     }
     DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" );
 }
@@ -342,7 +342,7 @@ ConvMap::iterator ConvDic::GetEntry( ConvMap &rMap, const rtl::OUString &rFirstT
 }
 
 
-BOOL ConvDic::HasEntry( const OUString &rLeftText, const OUString &rRightText )
+sal_Bool ConvDic::HasEntry( const OUString &rLeftText, const OUString &rRightText )
 {
     if (bNeedEntries)
         Load();
@@ -369,7 +369,7 @@ void ConvDic::AddEntry( const OUString &rLeftText, const OUString &rRightText )
             nMaxRightCharCount  = (sal_Int16) rRightText.getLength();
     }
     
-    bIsModified = TRUE;
+    bIsModified = sal_True;
 }
 
 
@@ -389,8 +389,8 @@ void ConvDic::RemoveEntry( const OUString &rLeftText, const OUString &rRightText
         pFromRight->erase( aRightIt );
     }
 
-    bIsModified = TRUE;
-    bMaxCharCountIsValid = FALSE;
+    bIsModified = sal_True;
+    bMaxCharCountIsValid = sal_False;
 }
     
 
@@ -441,11 +441,11 @@ void SAL_CALL ConvDic::clear(  )
     aFromLeft .clear();
     if (pFromRight.get())
         pFromRight->clear();
-    bNeedEntries    = FALSE;
-    bIsModified     = TRUE;
+    bNeedEntries    = sal_False;
+    bIsModified     = sal_True;
     nMaxLeftCharCount       = 0;
     nMaxRightCharCount      = 0;
-    bMaxCharCountIsValid    = TRUE;
+    bMaxCharCountIsValid    = sal_True;
 }
 
 
@@ -471,14 +471,14 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
     pair< ConvMap::iterator, ConvMap::iterator > aRange =
             rConvMap.equal_range( aLookUpText );
     
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     ConvMap::iterator aIt;
     for (aIt = aRange.first;  aIt != aRange.second;  ++aIt)
         ++nCount;
     
     uno::Sequence< OUString > aRes( nCount );
     OUString *pRes = aRes.getArray();
-    INT32 i = 0;
+    sal_Int32 i = 0;
     for (aIt = aRange.first;  aIt != aRange.second;  ++aIt)
         pRes[i++] = (*aIt).second;
     
@@ -486,19 +486,19 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
 }
 
 
-static BOOL lcl_SeqHasEntry(
+static sal_Bool lcl_SeqHasEntry(
     const OUString *pSeqStart,  // first element to check
-    INT32 nToCheck,             // number of elements to check
+    sal_Int32 nToCheck,             // number of elements to check
     const OUString &rText)
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (pSeqStart && nToCheck > 0)
     {
         const OUString *pDone = pSeqStart + nToCheck;   // one behind last to check
         while (!bRes && pSeqStart != pDone)
         {
             if (*pSeqStart++ == rText)
-                bRes = TRUE;
+                bRes = sal_True;
         }   
     }
     return bRes;
@@ -521,7 +521,7 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
     uno::Sequence< OUString > aRes( rConvMap.size() );
     OUString *pRes = aRes.getArray();
     ConvMap::iterator aIt = rConvMap.begin();
-    INT32 nIdx = 0;
+    sal_Int32 nIdx = 0;
     while (aIt != rConvMap.end())
     {
         OUString aCurEntry( (*aIt).first );
@@ -606,7 +606,7 @@ sal_Int16 SAL_CALL ConvDic::getMaxCharCount( ConversionDirection eDirection )
             }
         }
 
-        bMaxCharCountIsValid = TRUE;
+        bMaxCharCountIsValid = sal_True;
     }
     sal_Int16 nRes = eDirection == ConversionDirection_FROM_LEFT ?
             nMaxLeftCharCount : nMaxRightCharCount;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 67527bac50..74fb768209 100644..100755
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -39,7 +39,7 @@
 #include <boost/unordered_map.hpp>
 #include <set>
 #include <memory>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 // text conversion dictionary extension
@@ -53,7 +53,7 @@ class SvStream;
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL    IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType );
+sal_Bool    IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType );
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -105,15 +105,15 @@ protected:
 
     String          aMainURL;   // URL to file
     rtl::OUString   aName;
-    INT16           nLanguage;
+    sal_Int16           nLanguage;
     sal_Int16       nConversionType;
     sal_Int16       nMaxLeftCharCount;
     sal_Int16       nMaxRightCharCount;
-    BOOL            bMaxCharCountIsValid;
-    BOOL            bNeedEntries;
-    BOOL            bIsModified;
-    BOOL            bIsActive;
-    BOOL            bIsReadonly;
+    sal_Bool            bMaxCharCountIsValid;
+    sal_Bool            bNeedEntries;
+    sal_Bool            bIsModified;
+    sal_Bool            bIsActive;
+    sal_Bool            bIsReadonly;
 
     // disallow copy-constructor and assignment-operator for now
     ConvDic(const ConvDic &);
@@ -125,9 +125,9 @@ protected:
 
 public:
     ConvDic( const String &rName,
-             INT16 nLanguage,
+             sal_Int16 nLanguage,
              sal_Int16 nConversionType,
-             BOOL bBiDirectional,
+             sal_Bool bBiDirectional,
              const String &rMainURL);
     virtual ~ConvDic();
 
@@ -164,7 +164,7 @@ public:
     static com::sun::star::uno::Sequence< ::rtl::OUString >
         getSupportedServiceNames_Static() throw();
 
-    BOOL    HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
+    sal_Bool    HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
     void    AddEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
     void    RemoveEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
 };
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 6432f4fc8c..fbb520ad43 100644..100755
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -52,7 +52,7 @@
 #include "convdiclist.hxx"
 #include "convdic.hxx"
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace osl;
@@ -112,7 +112,7 @@ class ConvDicNameContainer :
     ConvDicNameContainer(const ConvDicNameContainer &);
     ConvDicNameContainer & operator = (const ConvDicNameContainer &);
 
-    INT32 GetIndexByName_Impl( const OUString& rName );
+    sal_Int32 GetIndexByName_Impl( const OUString& rName );
 
 public:
     ConvDicNameContainer( ConvDicList &rMyConvDicList );
@@ -142,10 +142,10 @@ public:
     // calls Flush for the dictionaries that support XFlushable
     void    FlushDics() const;
 
-    INT32   GetCount() const    { return aConvDics.getLength(); }
+    sal_Int32   GetCount() const    { return aConvDics.getLength(); }
     uno::Reference< XConversionDictionary > GetByName( const OUString& rName );
 
-    const uno::Reference< XConversionDictionary >    GetByIndex( INT32 nIdx )
+    const uno::Reference< XConversionDictionary >    GetByIndex( sal_Int32 nIdx )
     {
         return aConvDics.getConstArray()[nIdx];
     }
@@ -165,9 +165,9 @@ ConvDicNameContainer::~ConvDicNameContainer()
 
 void ConvDicNameContainer::FlushDics() const
 {
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         uno::Reference< util::XFlushable > xFlush( pDic[i] , UNO_QUERY );
         if (xFlush.is())
@@ -185,13 +185,13 @@ void ConvDicNameContainer::FlushDics() const
 }
 
 
-INT32 ConvDicNameContainer::GetIndexByName_Impl(
+sal_Int32 ConvDicNameContainer::GetIndexByName_Impl(
         const OUString& rName )
 {
-    INT32 nRes = -1;
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nLen = aConvDics.getLength();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen && nRes == -1;  ++i)
+    for (sal_Int32 i = 0;  i < nLen && nRes == -1;  ++i)
     {
         if (rName == pDic[i]->getName())
             nRes = i;
@@ -204,7 +204,7 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName(
         const OUString& rName )
 {
     uno::Reference< XConversionDictionary > xRes;
-    INT32 nIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nIdx = GetIndexByName_Impl( rName );
     if ( nIdx != -1)
         xRes = aConvDics.getArray()[nIdx];
     return xRes;
@@ -243,11 +243,11 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames(  )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     uno::Sequence< OUString > aRes( nLen );
     OUString *pName = aRes.getArray();
     const uno::Reference< XConversionDictionary > *pDic = aConvDics.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
         pName[i] = pDic[i]->getName();
     return aRes;
 }
@@ -268,7 +268,7 @@ void SAL_CALL ConvDicNameContainer::replaceByName(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nRplcIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nRplcIdx = GetIndexByName_Impl( rName );
     if (nRplcIdx == -1)
         throw NoSuchElementException();
     uno::Reference< XConversionDictionary > xNew;
@@ -293,7 +293,7 @@ void SAL_CALL ConvDicNameContainer::insertByName(
     if (!xNew.is() || xNew->getName() != rName)
         throw IllegalArgumentException();
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     aConvDics.realloc( nLen + 1 );
     aConvDics.getArray()[ nLen ] = xNew;
 }
@@ -304,7 +304,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nRplcIdx = GetIndexByName_Impl( rName );
+    sal_Int32 nRplcIdx = GetIndexByName_Impl( rName );
     if (nRplcIdx == -1)
         throw NoSuchElementException();
 
@@ -332,9 +332,9 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
         }
     }
 
-    INT32 nLen = aConvDics.getLength();
+    sal_Int32 nLen = aConvDics.getLength();
     uno::Reference< XConversionDictionary > *pDic = aConvDics.getArray();
-    for (INT32 i = nRplcIdx;  i < nLen - 1;  ++i)
+    for (sal_Int32 i = nRplcIdx;  i < nLen - 1;  ++i)
         pDic[i] = pDic[i + 1];
     aConvDics.realloc( nLen - 1 );
 }
@@ -345,11 +345,11 @@ void ConvDicNameContainer::AddConvDics(
         const String &rExtension )
 {
     const Sequence< OUString > aDirCnt(
-                utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, FALSE ) );
+                utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, sal_False ) );
     const OUString *pDirCnt = aDirCnt.getConstArray();
-    INT32 nEntries = aDirCnt.getLength();
+    sal_Int32 nEntries = aDirCnt.getLength();
 
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         String  aURL( pDirCnt[i] );
 
@@ -361,7 +361,7 @@ void ConvDicNameContainer::AddConvDics(
         if(aExt != aSearchExt)
             continue;          // skip other files
 
-        INT16 nLang;
+        sal_Int16 nLang;
         sal_Int16 nConvType;
         if (IsConvDic( aURL, nLang, nConvType ))
         {
@@ -380,7 +380,7 @@ void ConvDicNameContainer::AddConvDics(
             else if ((nLang == LANGUAGE_CHINESE_SIMPLIFIED || nLang == LANGUAGE_CHINESE_TRADITIONAL) &&
                       nConvType == ConversionDictionaryType::SCHINESE_TCHINESE)
             {
-                xDic = new ConvDic( aDicName, nLang, nConvType, FALSE, aURL );
+                xDic = new ConvDic( aDicName, nLang, nConvType, sal_False, aURL );
             }
 
             if (xDic.is())
@@ -416,7 +416,7 @@ ConvDicList::ConvDicList() :
     aEvtListeners( GetLinguMutex() )
 {
     pNameContainer = 0;
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 
     pExitListener = new MyAppExitListener( *this );
     xExitListener = pExitListener;
@@ -458,9 +458,9 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
         // access list of text conversion dictionaries to activate
         SvtLinguOptions aOpt;
         SvtLinguConfig().GetOptions( aOpt );
-        INT32 nLen = aOpt.aActiveConvDics.getLength();
+        sal_Int32 nLen = aOpt.aActiveConvDics.getLength();
         const OUString *pActiveConvDics = aOpt.aActiveConvDics.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Reference< XConversionDictionary > xDic =
                     pNameContainer->GetByName( pActiveConvDics[i] );
@@ -501,7 +501,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT16 nLang = LocaleToLanguage( rLocale );
+    sal_Int16 nLang = LocaleToLanguage( rLocale );
 
     if (GetNameContainer().hasByName( rName ))
         throw ElementExistException();
@@ -516,7 +516,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
     else if ((nLang == LANGUAGE_CHINESE_SIMPLIFIED || nLang == LANGUAGE_CHINESE_TRADITIONAL) &&
               nConvDicType == ConversionDictionaryType::SCHINESE_TCHINESE)
     {
-        xRes = new ConvDic( rName, nLang, nConvDicType, FALSE, aDicMainURL );
+        xRes = new ConvDic( rName, nLang, nConvDicType, sal_False, aDicMainURL );
     }
 
     if (!xRes.is())
@@ -544,13 +544,13 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     uno::Sequence< OUString > aRes( 20 );
     OUString *pRes = aRes.getArray();
 
     sal_Bool bSupported = sal_False;
-    INT32 nLen = GetNameContainer().GetCount();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = GetNameContainer().GetCount();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const uno::Reference< XConversionDictionary > xDic( GetNameContainer().GetByIndex(i) );
         sal_Bool bMatch =   xDic.is()  &&
@@ -562,7 +562,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
             Sequence< OUString > aNewConv( xDic->getConversions(
                                 rText, nStartPos, nLength,
                                 eDirection, nTextConversionOptions ) );
-            INT32 nNewLen = aNewConv.getLength();
+            sal_Int32 nNewLen = aNewConv.getLength();
             if (nNewLen > 0)
             {
                 if (nCount + nNewLen > aRes.getLength())
@@ -571,7 +571,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
                     pRes = aRes.getArray();
                 }
                 const OUString *pNewConv = aNewConv.getConstArray();
-                for (INT32 k = 0;  k < nNewLen;  ++k)
+                for (sal_Int32 k = 0;  k < nNewLen;  ++k)
                     pRes[nCount++] = pNewConv[k];
             }
         }
@@ -595,8 +595,8 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
 
     sal_Int16 nRes = 0;
     GetNameContainer();
-    INT32 nLen = GetNameContainer().GetCount();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = GetNameContainer().GetCount();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const uno::Reference< XConversionDictionary > xDic( GetNameContainer().GetByIndex(i) );
         if (xDic.is()  &&
@@ -618,7 +618,7 @@ void SAL_CALL ConvDicList::dispose(  )
     MutexGuard  aGuard( GetLinguMutex() );
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
         EventObject aEvtObj( (XConversionDictionaryList *) this );
         aEvtListeners.disposeAndClear( aEvtObj );
 
@@ -689,31 +689,6 @@ uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance(
     return StaticConvDicList::get();
 }
 
-
-sal_Bool SAL_CALL ConvDicList_writeInfo(
-    void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += ConvDicList::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        uno::Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey(aImpl );
-        uno::Sequence< OUString > aServices =
-                ConvDicList::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i]);
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL ConvDicList_getFactory(
         const sal_Char * pImplName,
         XMultiServiceFactory * pServiceManager, void *  )
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index f1bac139fe..33048b61cb 100644..100755
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -37,7 +37,7 @@
 #include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 
@@ -74,7 +74,7 @@ class ConvDicList :
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::
                 XTerminateListener >        xExitListener;
     
-    BOOL                                    bDisposing;
+    sal_Bool                                    bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     ConvDicList( const ConvDicList & );
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 5e0a3e390d..55823936d0 100644..100755
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -57,7 +57,7 @@
 
 #include "convdic.hxx"
 #include "convdicxml.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace std;
@@ -129,7 +129,7 @@ public:
 class ConvDicXMLDictionaryContext_Impl :
     public ConvDicXMLImportContext
 {
-    INT16		nLanguage;
+    sal_Int16		nLanguage;
     sal_Int16   nConversionType;
 
 public:
@@ -145,7 +145,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList );
 
-    INT16		GetLanguage() const			{ return nLanguage; }
+    sal_Int16		GetLanguage() const			{ return nLanguage; }
     sal_Int16   GetConversionType() const	{ return nConversionType; }
 };
 
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 8695f9c384..4c73a3e6aa 100644..100755
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -39,7 +39,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 #include <rtl/ustring.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 
@@ -90,7 +90,7 @@ class ConvDicXMLImport : public SvXMLImport
                                 //   but the language and conversion type will
                                 //   still be determined!
 
-    INT16           nLanguage;          // language of the dictionary
+    sal_Int16           nLanguage;          // language of the dictionary
     sal_Int16       nConversionType;    // conversion type the dictionary is used for
     sal_Bool        bSuccess;
 
@@ -121,11 +121,11 @@ public:
         const com::sun::star::uno::Reference < com::sun::star::xml::sax::XAttributeList > &rxAttrList );
 
     ConvDic *   GetDic()                    { return pDic; }
-    INT16       GetLanguage() const         { return nLanguage; }
+    sal_Int16       GetLanguage() const         { return nLanguage; }
     sal_Int16   GetConversionType() const   { return nConversionType; }
     sal_Bool    GetSuccess() const          { return bSuccess; }
 
-    void        SetLanguage( INT16 nLang )              { nLanguage = nLang; }
+    void        SetLanguage( sal_Int16 nLang )              { nLanguage = nLang; }
     void        SetConversionType( sal_Int16 nType )    { nConversionType = nType; }
 };
 
diff --git a/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 2ead973357..2ead973357 100644..100755
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index db0b0a2d36..6b81485748 100644..100755
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -76,32 +76,32 @@ static const sal_Char*		pVerStr5	= "WBSWG5";
 static const sal_Char*		pVerStr6	= "WBSWG6";
 static const sal_Char*      pVerOOo7    = "OOoUserDict1";
 
-static const INT16 DIC_VERSION_DONTKNOW = -1;
-static const INT16 DIC_VERSION_2 = 2;
-static const INT16 DIC_VERSION_5 = 5;
-static const INT16 DIC_VERSION_6 = 6;
-static const INT16 DIC_VERSION_7 = 7;
+static const sal_Int16 DIC_VERSION_DONTKNOW = -1;
+static const sal_Int16 DIC_VERSION_2 = 2;
+static const sal_Int16 DIC_VERSION_5 = 5;
+static const sal_Int16 DIC_VERSION_6 = 6;
+static const sal_Int16 DIC_VERSION_7 = 7;
 
 static sal_Bool getTag(const ByteString &rLine, 
         const sal_Char *pTagName, ByteString &rTagValue)
 {
     xub_StrLen nPos = rLine.Search( pTagName );
     if (nPos == STRING_NOTFOUND)
-        return FALSE;
+        return sal_False;
 
     rTagValue = rLine.Copy( nPos + sal::static_int_cast< xub_StrLen >(strlen( pTagName )) ).EraseLeadingAndTrailingChars();
-    return TRUE;
+    return sal_True;
 }
 
 
-INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
+sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg )
 {
     // Sniff the header
-    INT16 nDicVersion = DIC_VERSION_DONTKNOW;
+    sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW;
     sal_Char pMagicHeader[MAX_HEADER_LENGTH];
 
     nLng = LANGUAGE_NONE;
-    bNeg = FALSE;
+    bNeg = sal_False;
 
     if (!rpStream.get() || rpStream->GetError())
         return -1;
@@ -142,9 +142,9 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
             if (getTag(aLine, "type: ", aTagValue))
             {
                 if (aTagValue == "negative")
-                    bNeg = TRUE;
+                    bNeg = sal_True;
                 else
-                    bNeg = FALSE;
+                    bNeg = sal_False;
             }
 
             if (aLine.Search ("---") != STRING_NOTFOUND) // end of header
@@ -155,7 +155,7 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
     }    
     else
     {
-        USHORT nLen;
+        sal_uInt16 nLen;
 
         rpStream->Seek (nSniffPos );
 
@@ -189,7 +189,7 @@ INT16 ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg )
             // Negative Flag
             sal_Char nTmp;
             *rpStream >> nTmp;
-            bNeg = (BOOL)nTmp;
+            bNeg = (sal_Bool)nTmp;
         }
     }
 
@@ -212,15 +212,15 @@ DictionaryNeo::DictionaryNeo() :
 {
     nCount		 = 0;
     nDicVersion	 = DIC_VERSION_DONTKNOW;
-    bNeedEntries = FALSE;
-    bIsModified	 = bIsActive = FALSE;
-    bIsReadonly	 = FALSE;
+    bNeedEntries = sal_False;
+    bIsModified	 = bIsActive = sal_False;
+    bIsReadonly	 = sal_False;
 }
 
 DictionaryNeo::DictionaryNeo(const OUString &rName,
-                             INT16 nLang, DictionaryType eType,
+                             sal_Int16 nLang, DictionaryType eType,
                              const OUString &rMainURL,
-                             BOOL bWriteable) :
+                             sal_Bool bWriteable) :
     aDicEvtListeners( GetLinguMutex() ),
     aDicName        (rName),
     aMainURL        (rMainURL),
@@ -229,13 +229,13 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
 {
     nCount		 = 0;
     nDicVersion	 = DIC_VERSION_DONTKNOW;
-    bNeedEntries = TRUE;
-    bIsModified	 = bIsActive = FALSE;
+    bNeedEntries = sal_True;
+    bIsModified	 = bIsActive = sal_False;
     bIsReadonly = !bWriteable;
 
     if( rMainURL.getLength() > 0 )
     {
-        BOOL bExists = FileExists( rMainURL );
+        sal_Bool bExists = FileExists( rMainURL );
         if( !bExists )
         {
             // save new dictionaries with in Format 7 (UTF8 plain text)
@@ -248,14 +248,14 @@ DictionaryNeo::DictionaryNeo(const OUString &rName,
                     "DictionaryNeo: dictionaries should be writeable if they are to be saved" );
             if (!bIsReadonly)
                 saveEntries( rMainURL );
-            bNeedEntries = FALSE;
+            bNeedEntries = sal_False;
         }
     }
     else
     {
         // non persistent dictionaries (like IgnoreAllList) should always be writable
-        bIsReadonly  = FALSE;
-        bNeedEntries = FALSE;
+        bIsReadonly  = sal_False;
+        bNeedEntries = sal_False;
     }
 }
 
@@ -263,16 +263,16 @@ DictionaryNeo::~DictionaryNeo()
 {
 }
 
-ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
+sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    // counter check that it is safe to set bIsModified to FALSE at
+    // counter check that it is safe to set bIsModified to sal_False at
     // the end of the function
     DBG_ASSERT(!bIsModified, "lng : dictionary already modified!");
 
     // function should only be called once in order to load entries from file
-    bNeedEntries = FALSE;
+    bNeedEntries = sal_False;
 
     if (rMainURL.getLength() == 0)
         return 0;
@@ -293,15 +293,15 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
         (void) e;
     }
     if (!xStream.is())
-        return static_cast< ULONG >(-1);
+        return static_cast< sal_uLong >(-1);
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
 
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
+    sal_uLong nErr = sal::static_int_cast< sal_uLong >(-1);
 
     // read header
-    BOOL bNegativ;
-    USHORT nLang;
+    sal_Bool bNegativ;
+    sal_uInt16 nLang;
     nDicVersion = ReadDicVersion(pStream, nLang, bNegativ);
     if (0 != (nErr = pStream->GetError()))
         return nErr;
@@ -319,7 +319,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
         DIC_VERSION_5 == nDicVersion ||
         DIC_VERSION_2 == nDicVersion)
     {
-        USHORT  nLen = 0;
+        sal_uInt16  nLen = 0;
         sal_Char aWordBuf[ BUFSIZE ];
 
         // Read the first word
@@ -347,7 +347,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
                 String aText( aDummy, eEnc );
                 uno::Reference< XDictionaryEntry > xEntry =
                         new DicEntry( aText, bNegativ );
-                addEntry_Impl( xEntry , TRUE ); //! don't launch events here
+                addEntry_Impl( xEntry , sal_True ); //! don't launch events here
             }
 
             *pStream >> nLen;
@@ -384,7 +384,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
             rtl::OUString aText = rtl::OStringToOUString (aLine, RTL_TEXTENCODING_UTF8);
             uno::Reference< XDictionaryEntry > xEntry =
                     new DicEntry( aText, eDicType == DictionaryType_NEGATIVE );
-            addEntry_Impl( xEntry , TRUE ); //! don't launch events here
+            addEntry_Impl( xEntry , sal_True ); //! don't launch events here
         }
     }
 
@@ -393,7 +393,7 @@ ULONG DictionaryNeo::loadEntries(const OUString &rMainURL)
     // since this routine should be called only initialy (prior to any
     // modification to be saved) we reset the bIsModified flag here that
     // was implicitly set by addEntry_Impl
-    bIsModified = FALSE;
+    bIsModified = sal_False;
 
     return pStream->GetError();
 }
@@ -413,7 +413,7 @@ static ByteString formatForSave(
 }
 
 
-ULONG DictionaryNeo::saveEntries(const OUString &rURL)
+sal_uLong DictionaryNeo::saveEntries(const OUString &rURL)
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
@@ -437,107 +437,54 @@ ULONG DictionaryNeo::saveEntries(const OUString &rURL)
         (void) e;
     }
     if (!xStream.is())
-        return static_cast< ULONG >(-1);
+        return static_cast< sal_uLong >(-1);
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
+    sal_uLong nErr = sal::static_int_cast< sal_uLong >(-1);
 
-    ULONG nErr = sal::static_int_cast< ULONG >(-1);
-
-    rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
-    if (nDicVersion >= DIC_VERSION_6)
-        eEnc = RTL_TEXTENCODING_UTF8;
-
-    if (nDicVersion == DIC_VERSION_7)
+    //
+    // Always write as the latest version, i.e. DIC_VERSION_7
+    //
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8;
+    pStream->WriteLine(ByteString (pVerOOo7));
+    if (0 != (nErr = pStream->GetError()))
+        return nErr;
+    if (nLanguage == LANGUAGE_NONE)
+        pStream->WriteLine(ByteString("lang: <none>"));
+    else
     {
-        pStream->WriteLine(ByteString (pVerOOo7));
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        if (nLanguage == LANGUAGE_NONE)
-            pStream->WriteLine(ByteString("lang: <none>"));
-        else
-        {
-            ByteString aLine("lang: ");
-            aLine += ByteString( String( MsLangId::convertLanguageToIsoString( nLanguage ) ), eEnc);
-            pStream->WriteLine( aLine );
-        }
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        if (eDicType == DictionaryType_POSITIVE)
-            pStream->WriteLine(ByteString("type: positive"));
-        else
-            pStream->WriteLine(ByteString("type: negative"));
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        pStream->WriteLine(ByteString("---"));
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-        for (INT32 i = 0;  i < nCount;  i++)
-        {
-            ByteString aOutStr = formatForSave(pEntry[i], eEnc);
-            pStream->WriteLine (aOutStr);
-            if (0 != (nErr = pStream->GetError()))
-                return nErr;
-        }
+        ByteString aLine("lang: ");
+        aLine += ByteString( String( MsLangId::convertLanguageToIsoString( nLanguage ) ), eEnc);
+        pStream->WriteLine( aLine );
     }
+    if (0 != (nErr = pStream->GetError()))
+        return nErr;
+    if (eDicType == DictionaryType_POSITIVE)
+        pStream->WriteLine(ByteString("type: positive"));
     else
+        pStream->WriteLine(ByteString("type: negative"));
+    if (0 != (nErr = pStream->GetError()))
+        return nErr;
+    pStream->WriteLine(ByteString("---"));
+    if (0 != (nErr = pStream->GetError()))
+        return nErr;
+    const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
+    for (sal_Int32 i = 0;  i < nCount;  i++)
     {
-        sal_Char aWordBuf[BUFSIZE];
-
-        // write version
-        const sal_Char *pVerStr = NULL;
-        if (DIC_VERSION_6 == nDicVersion)
-            pVerStr = pVerStr6;
-        else
-            pVerStr = eDicType == DictionaryType_POSITIVE ? pVerStr2 : pVerStr5;
-        strcpy( aWordBuf, pVerStr );
-        USHORT nLen = sal::static_int_cast< USHORT >(strlen( aWordBuf ));
-        *pStream << nLen;
+        ByteString aOutStr = formatForSave(pEntry[i], eEnc);
+        pStream->WriteLine (aOutStr);
         if (0 != (nErr = pStream->GetError()))
             return nErr;
-        pStream->Write(aWordBuf, nLen);
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        *pStream << nLanguage;
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-        *pStream << (sal_Char) (eDicType == DictionaryType_NEGATIVE ? TRUE : FALSE);
-        if (0 != (nErr = pStream->GetError()))
-            return nErr;
-
-        const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-        for (INT32 i = 0;  i < nCount;  i++)
-        {
-            ByteString aOutStr = formatForSave(pEntry[i], eEnc);
-
-            // the old format would fail (mis-calculation of nLen) and write
-            // uninitialized junk for combined len >= BUFSIZE - we truncate
-            // silently here, but BUFSIZE is large anyway.
-            nLen = aOutStr.Len();
-            if (nLen >= BUFSIZE)
-                nLen = BUFSIZE - 1;
-
-            *pStream << nLen;
-            if (0 != (nErr = pStream->GetError()))
-                return nErr;
-            pStream->Write(aOutStr.GetBuffer(), nLen);
-            if (0 != (nErr = pStream->GetError()))
-                return nErr;
-        }
     }
 
-    //! get return value before Stream is destroyed
-    ULONG nError = pStream->GetError();
+    //If we are migrating from an older version, then on first successful
+    //write, we're now converted to the latest version, i.e. DIC_VERSION_7
+    nDicVersion = DIC_VERSION_7;
 
-    return nError;
+    return nErr;
 }
 
-void DictionaryNeo::launchEvent(INT16 nEvent,
+void DictionaryNeo::launchEvent(sal_Int16 nEvent,
                                 uno::Reference< XDictionaryEntry > xEntry)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -558,7 +505,7 @@ void DictionaryNeo::launchEvent(INT16 nEvent,
 
 int	DictionaryNeo::cmpDicEntry(const OUString& rWord1,
                                const OUString &rWord2,
-                               BOOL bSimilarOnly)
+                               sal_Bool bSimilarOnly)
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
@@ -570,7 +517,7 @@ int	DictionaryNeo::cmpDicEntry(const OUString& rWord1,
 
     OUString	aWord1( rWord1 ),
                 aWord2( rWord2 );
-    INT32       nLen1 = aWord1.getLength(),
+    sal_Int32       nLen1 = aWord1.getLength(),
                   nLen2 = aWord2.getLength();
     if (bSimilarOnly)
     {
@@ -582,7 +529,7 @@ int	DictionaryNeo::cmpDicEntry(const OUString& rWord1,
     }
 
     const sal_Unicode cIgnChar = '=';
-    INT32       nIdx1 = 0,
+    sal_Int32       nIdx1 = 0,
                   nIdx2 = 0,
                   nNumIgnChar1 = 0,
                   nNumIgnChar2 = 0;
@@ -633,17 +580,17 @@ int	DictionaryNeo::cmpDicEntry(const OUString& rWord1,
                 nNumIgnChar2++;
         }
 
-        nRes = ((INT32) nLen1 - nNumIgnChar1) - ((INT32) nLen2 - nNumIgnChar2);
+        nRes = ((sal_Int32) nLen1 - nNumIgnChar1) - ((sal_Int32) nLen2 - nNumIgnChar2);
     }
 
     return nRes;
 }
 
-BOOL DictionaryNeo::seekEntry(const OUString &rWord,
-                              INT32 *pPos, BOOL bSimilarOnly)
+sal_Bool DictionaryNeo::seekEntry(const OUString &rWord,
+                              sal_Int32 *pPos, sal_Bool bSimilarOnly)
 {
     // look for entry with binary search.
-    // return TRUE if found FALSE else.
+    // return sal_True if found sal_False else.
     // if pPos != NULL it will become the position of the found entry, or
     // if that was not found the position where it has to be inserted
     // to keep the entries sorted
@@ -651,7 +598,7 @@ BOOL DictionaryNeo::seekEntry(const OUString &rWord,
     MutexGuard	aGuard( GetLinguMutex() );
 
     const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-    INT32 nUpperIdx = getCount(),
+    sal_Int32 nUpperIdx = getCount(),
           nMidIdx,
           nLowerIdx = 0;
     if( nUpperIdx > 0 )
@@ -667,66 +614,66 @@ BOOL DictionaryNeo::seekEntry(const OUString &rWord,
             if(nCmp == 0)
             {
                 if( pPos ) *pPos = nMidIdx;
-                return TRUE;
+                return sal_True;
             }
             else if(nCmp > 0)
                 nLowerIdx = nMidIdx + 1;
             else if( nMidIdx == 0 )
             {
                 if( pPos ) *pPos = nLowerIdx;
-                return FALSE;
+                return sal_False;
             }
             else
                 nUpperIdx = nMidIdx - 1;
         }
     }
     if( pPos ) *pPos = nLowerIdx;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL DictionaryNeo::isSorted()
+sal_Bool DictionaryNeo::isSorted()
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
     const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray();
-    INT32 nEntries = getCount();
-    INT32 i;
+    sal_Int32 nEntries = getCount();
+    sal_Int32 i;
     for (i = 1;  i < nEntries;  i++)
     {
         if (cmpDicEntry( pEntry[i-1]->getDictionaryWord(),
                          pEntry[i]->getDictionaryWord() ) > 0)
         {
-            bRes = FALSE;
+            bRes = sal_False;
             break;
         }
     }
     return bRes;
 }
 
-BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicEntry,
-        BOOL bIsLoadEntries)
+sal_Bool DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicEntry,
+        sal_Bool bIsLoadEntries)
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if ( bIsLoadEntries || (!bIsReadonly  &&  xDicEntry.is()) )
     {
-        BOOL bIsNegEntry = xDicEntry->isNegative();
-        BOOL bAddEntry   = !isFull() &&
+        sal_Bool bIsNegEntry = xDicEntry->isNegative();
+        sal_Bool bAddEntry   = !isFull() &&
                    (   ( eDicType == DictionaryType_POSITIVE && !bIsNegEntry )
                     || ( eDicType == DictionaryType_NEGATIVE &&  bIsNegEntry )
                     || ( eDicType == DictionaryType_MIXED ) );
 
         // look for position to insert entry at
         // if there is already an entry do not insert the new one
-        INT32 nPos = 0;
-        BOOL bFound = FALSE;
+        sal_Int32 nPos = 0;
+        sal_Bool bFound = sal_False;
         if (bAddEntry)
         {
             bFound = seekEntry( xDicEntry->getDictionaryWord(), &nPos );
             if (bFound)
-                bAddEntry = FALSE;
+                bAddEntry = sal_False;
         }
 
         if (bAddEntry)
@@ -738,7 +685,7 @@ BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicE
             uno::Reference< XDictionaryEntry > *pEntry = aEntries.getArray();
 
             // shift old entries right
-            INT32 i;
+            sal_Int32 i;
             for (i = nCount - 1; i >= nPos;  i--)
                 pEntry[ i+1 ] = pEntry[ i ];
             // insert new entry at specified position
@@ -747,8 +694,8 @@ BOOL DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry > xDicE
 
             nCount++;
 
-            bIsModified = TRUE;
-            bRes = TRUE;
+            bIsModified = sal_True;
+            bRes = sal_True;
 
             if (!bIsLoadEntries)
                 launchEvent( DictionaryEventFlags::ADD_ENTRY, xDicEntry );
@@ -803,13 +750,13 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
     if (bIsActive != bActivate)
     {
         bIsActive = bActivate != 0;
-        INT16 nEvent = bIsActive ?
+        sal_Int16 nEvent = bIsActive ?
                 DictionaryEventFlags::ACTIVATE_DIC : DictionaryEventFlags::DEACTIVATE_DIC;
 
         // remove entries from memory if dictionary is deactivated
-        if (bIsActive == FALSE)
+        if (bIsActive == sal_False)
         {
-            BOOL bIsEmpty = nCount == 0;
+            sal_Bool bIsEmpty = nCount == 0;
 
             // save entries first if necessary
             if (bIsModified && hasLocation() && !isReadonly())
@@ -857,11 +804,11 @@ void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
-    INT16 nLanguageP = LocaleToLanguage( aLocale );
+    sal_Int16 nLanguageP = LocaleToLanguage( aLocale );
     if (!bIsReadonly  &&  nLanguage != nLanguageP)
     {
         nLanguage = nLanguageP;
-        bIsModified = TRUE;	// new language needs to be saved with dictionary
+        bIsModified = sal_True;	// new language needs to be saved with dictionary
 
         launchEvent( DictionaryEventFlags::CHG_LANGUAGE, NULL );
     }
@@ -876,8 +823,8 @@ uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
     if (bNeedEntries)
         loadEntries( aMainURL );
 
-    INT32 nPos;
-    BOOL bFound = seekEntry( aWord, &nPos, TRUE );
+    sal_Int32 nPos;
+    sal_Bool bFound = seekEntry( aWord, &nPos, sal_True );
     DBG_ASSERT( nCount <= aEntries.getLength(), "lng : wrong number of entries");
     DBG_ASSERT(!bFound || nPos < nCount, "lng : index out of range");
 
@@ -891,7 +838,7 @@ sal_Bool SAL_CALL DictionaryNeo::addEntry(
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (!bIsReadonly)
     {
@@ -910,7 +857,7 @@ sal_Bool SAL_CALL
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (!bIsReadonly)
     {
@@ -947,15 +894,15 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRemoved = FALSE;
+    sal_Bool bRemoved = sal_False;
 
     if (!bIsReadonly)
     {
         if (bNeedEntries)
             loadEntries( aMainURL );
 
-        INT32 nPos;
-        BOOL bFound = seekEntry( aWord, &nPos );
+        sal_Int32 nPos;
+        sal_Bool bFound = seekEntry( aWord, &nPos );
         DBG_ASSERT( nCount < aEntries.getLength(),
                 "lng : wrong number of entries");
         DBG_ASSERT(!bFound || nPos < nCount, "lng : index out of range");
@@ -972,7 +919,7 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
 
             //! the following call reduces the length of the sequence by 1 also
             lcl_SequenceRemoveElementAt( aEntries, nPos );
-            bRemoved = bIsModified = TRUE;
+            bRemoved = bIsModified = sal_True;
 
             launchEvent( DictionaryEventFlags::DEL_ENTRY, xDicEntry );
         }
@@ -1017,8 +964,8 @@ void SAL_CALL DictionaryNeo::clear(  )
         aEntries = uno::Sequence< uno::Reference< XDictionaryEntry > > ( 32 );
 
         nCount = 0;
-        bNeedEntries = FALSE;
-        bIsModified = TRUE;
+        bNeedEntries = sal_False;
+        bIsModified = sal_True;
 
         launchEvent( DictionaryEventFlags::ENTRIES_CLEARED , NULL );
     }
@@ -1030,10 +977,10 @@ sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is())
     {
-        INT32   nLen = aDicEvtListeners.getLength();
+        sal_Int32   nLen = aDicEvtListeners.getLength();
         bRes = aDicEvtListeners.addInterface( xListener ) != nLen;
     }
     return bRes;
@@ -1045,10 +992,10 @@ sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is())
     {
-        INT32   nLen = aDicEvtListeners.getLength();
+        sal_Int32   nLen = aDicEvtListeners.getLength();
         bRes = aDicEvtListeners.removeInterface( xListener ) != nLen;
     }
     return bRes;
@@ -1091,7 +1038,7 @@ void SAL_CALL DictionaryNeo::store()
 #endif
         }
         else
-            bIsModified = FALSE;
+            bIsModified = sal_False;
     }
 }
 
@@ -1111,7 +1058,7 @@ void SAL_CALL DictionaryNeo::storeAsURL(
     else
     {
         aMainURL = aURL;
-        bIsModified = FALSE;
+        bIsModified = sal_False;
         bIsReadonly = IsReadOnly( getLocation() );
     }
 }
@@ -1135,18 +1082,18 @@ void SAL_CALL DictionaryNeo::storeToURL(
 
 DicEntry::DicEntry()
 {
-    bIsNegativ = FALSE;
+    bIsNegativ = sal_False;
 }
 
 DicEntry::DicEntry(const OUString &rDicFileWord,
-                   BOOL bIsNegativWord)
+                   sal_Bool bIsNegativWord)
 {
     if (rDicFileWord.getLength())
         splitDicFileWord( rDicFileWord, aDicWord, aReplacement );
     bIsNegativ = bIsNegativWord;
 }
 
-DicEntry::DicEntry(const OUString &rDicWord, BOOL bNegativ,
+DicEntry::DicEntry(const OUString &rDicWord, sal_Bool bNegativ,
                    const OUString &rRplcText) :
     aDicWord				(rDicWord),
     aReplacement            (rRplcText),
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 38b1f5157a..e08cf0c370 100644..100755
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -41,14 +41,14 @@
 #include <tools/stream.hxx>
 
 #include "defs.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 
 ///////////////////////////////////////////////////////////////////////////
 
 #define DIC_MAX_ENTRIES     30000
 
-INT16           ReadDicVersion( SvStreamPtr &rpStream, USHORT &nLng, BOOL &bNeg );
+sal_Int16           ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, sal_Bool &bNeg );
 const String    GetDicExtension();
 
 ///////////////////////////////////////////////////////////////////////////
@@ -68,41 +68,41 @@ class DictionaryNeo :
     ::rtl::OUString												aDicName;
     ::rtl::OUString												aMainURL;
     ::com::sun::star::linguistic2::DictionaryType				eDicType;
-    INT16														nCount;
-    INT16														nLanguage;
-    INT16														nDicVersion;
-    BOOL														bNeedEntries;
-    BOOL														bIsModified;
-    BOOL														bIsActive;
-    BOOL														bIsReadonly;
+    sal_Int16														nCount;
+    sal_Int16														nLanguage;
+    sal_Int16														nDicVersion;
+    sal_Bool														bNeedEntries;
+    sal_Bool														bIsModified;
+    sal_Bool														bIsActive;
+    sal_Bool														bIsReadonly;
 
     // disallow copy-constructor and assignment-operator for now
     DictionaryNeo(const DictionaryNeo &);
     DictionaryNeo & operator = (const DictionaryNeo &);
 
-    void					launchEvent(INT16 nEvent,
+    void					launchEvent(sal_Int16 nEvent,
         ::com::sun::star::uno::Reference< 
             ::com::sun::star::linguistic2::XDictionaryEntry > xEntry);
 
-    ULONG                   loadEntries(const ::rtl::OUString &rMainURL);
-    ULONG                   saveEntries(const ::rtl::OUString &rMainURL);
+    sal_uLong                   loadEntries(const ::rtl::OUString &rMainURL);
+    sal_uLong                   saveEntries(const ::rtl::OUString &rMainURL);
     int						cmpDicEntry(const ::rtl::OUString &rWord1, 
                                         const ::rtl::OUString &rWord2,
-                                        BOOL bSimilarOnly = FALSE);
-    BOOL					seekEntry(const ::rtl::OUString &rWord, INT32 *pPos,
-                                        BOOL bSimilarOnly = FALSE);
-    BOOL					isSorted();
+                                        sal_Bool bSimilarOnly = sal_False);
+    sal_Bool					seekEntry(const ::rtl::OUString &rWord, sal_Int32 *pPos,
+                                        sal_Bool bSimilarOnly = sal_False);
+    sal_Bool					isSorted();
 
-    BOOL		 			addEntry_Impl(const ::com::sun::star::uno::Reference< 
+    sal_Bool		 			addEntry_Impl(const ::com::sun::star::uno::Reference< 
         ::com::sun::star::linguistic2::XDictionaryEntry > xDicEntry,
-                                          BOOL bIsLoadEntries = FALSE);
+                                          sal_Bool bIsLoadEntries = sal_False);
 
 public:
     DictionaryNeo();
-    DictionaryNeo(const ::rtl::OUString &rName, INT16 nLang,
+    DictionaryNeo(const ::rtl::OUString &rName, sal_Int16 nLang,
                     ::com::sun::star::linguistic2::DictionaryType eType,
                     const ::rtl::OUString &rMainURL,
-                    BOOL bWriteable );
+                    sal_Bool bWriteable );
     virtual ~DictionaryNeo();
 
     // XNamed
@@ -206,7 +206,7 @@ class DicEntry :
 {
     ::rtl::OUString	aDicWord,		// including hyphen positions represented by "="
                     aReplacement;	// including hyphen positions represented by "="
-    BOOL			bIsNegativ;
+    sal_Bool			bIsNegativ;
 
     // disallow copy-constructor and assignment-operator for now
     DicEntry(const DicEntry &);
@@ -218,8 +218,8 @@ class DicEntry :
 
 public:
     DicEntry();
-    DicEntry(const ::rtl::OUString &rDicFileWord, BOOL bIsNegativ);
-    DicEntry(const ::rtl::OUString &rDicWord, BOOL bIsNegativ,
+    DicEntry(const ::rtl::OUString &rDicFileWord, sal_Bool bIsNegativ);
+    DicEntry(const ::rtl::OUString &rDicWord, sal_Bool bIsNegativ,
              const ::rtl::OUString &rRplcText);
     virtual ~DicEntry();
 
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 366e8aa5f3..613f00f6a9 100644..100755
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -71,7 +71,7 @@ using ::rtl::OUString;
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg );
+static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg );
 
 static void AddInternal( const uno::Reference< XDictionary > &rDic,
                          const rtl::OUString& rNew );
@@ -89,8 +89,8 @@ class DicEvtListenerHelper :
     uno::Sequence< DictionaryEvent >        aCollectDicEvt;
     uno::Reference< XDictionaryList >		xMyDicList;
 
-    INT16								nCondensedEvt;
-    INT16								nNumCollectEvtListeners,
+    sal_Int16								nCondensedEvt;
+    sal_Int16								nNumCollectEvtListeners,
                                          nNumVerboseListeners;
 
 public:
@@ -110,14 +110,14 @@ public:
     // non-UNO functions
     void 	DisposeAndClear( const EventObject &rEvtObj );
 
-    BOOL	AddDicListEvtListener(
+    sal_Bool	AddDicListEvtListener(
                 const uno::Reference< XDictionaryListEventListener >& rxListener,
-                BOOL bReceiveVerbose );
-    BOOL	RemoveDicListEvtListener(
+                sal_Bool bReceiveVerbose );
+    sal_Bool	RemoveDicListEvtListener(
                 const uno::Reference< XDictionaryListEventListener >& rxListener );
-    INT16	BeginCollectEvents();
-    INT16	EndCollectEvents();
-    INT16	FlushEvents();
+    sal_Int16	BeginCollectEvents();
+    sal_Int16	EndCollectEvents();
+    sal_Int16	FlushEvents();
     void    ClearEvents()   { nCondensedEvt = 0; }
 };
 
@@ -220,7 +220,7 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
     // update list of collected events if needs to be
     if (nNumVerboseListeners > 0)
     {
-        INT32 nColEvts = aCollectDicEvt.getLength();
+        sal_Int32 nColEvts = aCollectDicEvt.getLength();
         aCollectDicEvt.realloc( nColEvts + 1 );
         aCollectDicEvt.getArray()[ nColEvts ] = rDicEvent;
     }
@@ -230,32 +230,32 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
 }
 
 
-BOOL DicEvtListenerHelper::AddDicListEvtListener(
+sal_Bool DicEvtListenerHelper::AddDicListEvtListener(
             const uno::Reference< XDictionaryListEventListener >& xListener,
-            BOOL /*bReceiveVerbose*/ )
+            sal_Bool /*bReceiveVerbose*/ )
 {
     DBG_ASSERT( xListener.is(), "empty reference" );
-    INT32	nCount = aDicListEvtListeners.getLength();
+    sal_Int32	nCount = aDicListEvtListeners.getLength();
     return aDicListEvtListeners.addInterface( xListener ) != nCount;
 }
 
 
-BOOL DicEvtListenerHelper::RemoveDicListEvtListener(
+sal_Bool DicEvtListenerHelper::RemoveDicListEvtListener(
             const uno::Reference< XDictionaryListEventListener >& xListener )
 {
     DBG_ASSERT( xListener.is(), "empty reference" );
-    INT32	nCount = aDicListEvtListeners.getLength();
+    sal_Int32	nCount = aDicListEvtListeners.getLength();
     return aDicListEvtListeners.removeInterface( xListener ) != nCount;
 }
 
 
-INT16 DicEvtListenerHelper::BeginCollectEvents()
+sal_Int16 DicEvtListenerHelper::BeginCollectEvents()
 {
     return ++nNumCollectEvtListeners;
 }
 
 
-INT16 DicEvtListenerHelper::EndCollectEvents()
+sal_Int16 DicEvtListenerHelper::EndCollectEvents()
 {
     DBG_ASSERT(nNumCollectEvtListeners > 0, "lng: mismatched function call");
     if (nNumCollectEvtListeners > 0)
@@ -268,7 +268,7 @@ INT16 DicEvtListenerHelper::EndCollectEvents()
 }
 
 
-INT16 DicEvtListenerHelper::FlushEvents()
+sal_Int16 DicEvtListenerHelper::FlushEvents()
 {
     if (0 != nCondensedEvt)
     {
@@ -310,8 +310,8 @@ DicList::DicList() :
 {
     pDicEvtLstnrHelper	= new DicEvtListenerHelper( this );
     xDicEvtLstnrHelper	= pDicEvtLstnrHelper;
-    bDisposing = FALSE;
-    bInCreation = FALSE;
+    bDisposing = sal_False;
+    bInCreation = sal_False;
 
     pExitListener = new MyAppExitListener( *this );
     xExitListener = pExitListener;
@@ -327,22 +327,22 @@ DicList::~DicList()
 void DicList::SearchForDictionaries(
     DictionaryVec_t&rDicList,
     const String &rDicDirURL,
-    BOOL bIsWriteablePath )
+    sal_Bool bIsWriteablePath )
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     const uno::Sequence< rtl::OUString > aDirCnt( utl::LocalFileHelper::
-                                        GetFolderContents( rDicDirURL, FALSE ) );
+                                        GetFolderContents( rDicDirURL, sal_False ) );
     const rtl::OUString *pDirCnt = aDirCnt.getConstArray();
-    INT32 nEntries = aDirCnt.getLength();
+    sal_Int32 nEntries = aDirCnt.getLength();
 
     String aDCN( String::CreateFromAscii( "dcn" ) );
     String aDCP( String::CreateFromAscii( "dcp" ) );
-    for (INT32 i = 0;  i < nEntries;  ++i)
+    for (sal_Int32 i = 0;  i < nEntries;  ++i)
     {
         String  aURL( pDirCnt[i] );
-        USHORT	nLang = LANGUAGE_NONE;
-        BOOL	bNeg  = FALSE;
+        sal_uInt16	nLang = LANGUAGE_NONE;
+        sal_Bool	bNeg  = sal_False;
 
         if(!::IsVers2OrNewer( aURL, nLang, bNeg ))
         {
@@ -352,16 +352,16 @@ void DicList::SearchForDictionaries(
             aExt.ToLowerAscii();
 
             if(aExt == aDCN)       // negativ
-                bNeg = TRUE;
+                bNeg = sal_True;
             else if(aExt == aDCP)  // positiv
-                bNeg = FALSE;
+                bNeg = sal_False;
             else
                 continue;          // andere Files
         }
 
         // Record in the list of Dictoinaries
         // When it already exists don't record
-        INT16 nSystemLanguage = MsLangId::getSystemLanguage();
+        sal_Int16 nSystemLanguage = MsLangId::getSystemLanguage();
         String aTmp1 = ToLower( aURL, nSystemLanguage );
         xub_StrLen nPos = aTmp1.SearchBackward( '/' );
         if (STRING_NOTFOUND != nPos)
@@ -395,11 +395,11 @@ void DicList::SearchForDictionaries(
 }
 
 
-INT32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
+sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT32 nPos = -1;
+    sal_Int32 nPos = -1;
     DictionaryVec_t& rDicList = GetOrCreateDicList();
     size_t n = rDicList.size();
     for (size_t i = 0;  i < n;  i++)
@@ -436,8 +436,8 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
     uno::Sequence< uno::Reference< XDictionary > > aDics( rDicList.size() );
     uno::Reference< XDictionary > *pDic = aDics.getArray();
 
-    INT32 n = (USHORT) aDics.getLength();
-    for (INT32 i = 0;  i < n;  i++)
+    sal_Int32 n = (sal_uInt16) aDics.getLength();
+    for (sal_Int32 i = 0;  i < n;  i++)
         pDic[i] = rDicList[i];
 
     return aDics;
@@ -472,14 +472,14 @@ sal_Bool SAL_CALL DicList::addDictionary(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xDictionary.is())
     {
         DictionaryVec_t& rDicList = GetOrCreateDicList();
         rDicList.push_back( xDictionary );
-        bRes = TRUE;
+        bRes = sal_True;
 
         // add listener helper to the dictionaries listener lists
         xDictionary->addDictionaryEventListener( xDicEvtLstnrHelper );
@@ -494,10 +494,10 @@ sal_Bool SAL_CALL
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL  bRes = FALSE;
-    INT32 nPos = GetDicPos( xDictionary );
+    sal_Bool  bRes = sal_False;
+    sal_Int32 nPos = GetDicPos( xDictionary );
     if (nPos >= 0)
     {
         // remove dictionary list from the dictionaries listener lists
@@ -507,14 +507,14 @@ sal_Bool SAL_CALL
         if (xDic.is())
         {
             // deactivate dictionary if not already done
-            xDic->setActive( FALSE );
+            xDic->setActive( sal_False );
 
             xDic->removeDictionaryEventListener( xDicEvtLstnrHelper );
         }
 
         // remove element at nPos
         rDicList.erase( rDicList.begin() + nPos );
-        bRes = TRUE;
+        bRes = sal_True;
     }
     return bRes;
 }
@@ -527,11 +527,11 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT(!bReceiveVerbose, "lng : not yet supported");
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xListener.is())	//! don't add empty references
     {
         bRes = pDicEvtLstnrHelper->
@@ -547,9 +547,9 @@ sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
     osl::MutexGuard aGuard( GetLinguMutex() );
 
     if (bDisposing)
-        return FALSE;
+        return sal_False;
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if(xListener.is())
     {
         bRes = pDicEvtLstnrHelper->RemoveDicListEvtListener( xListener );
@@ -582,7 +582,7 @@ uno::Reference< XDictionary > SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     bool bIsWriteablePath = rURL.match( GetDictionaryWriteablePath(), 0 );
     return new DictionaryNeo( rName, nLanguage, eDicType, rURL, bIsWriteablePath );
 }
@@ -607,7 +607,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
         EventObject	aEvtObj( (XDictionaryList *) this );
 
         aEvtListeners.disposeAndClear( aEvtObj );
@@ -668,7 +668,7 @@ void SAL_CALL
 
 void DicList::_CreateDicList()
 {
-    bInCreation = TRUE;
+    bInCreation = sal_True;
 
     // look for dictionaries
     const rtl::OUString aWriteablePath( GetDictionaryWriteablePath() );
@@ -676,7 +676,7 @@ void DicList::_CreateDicList()
     const rtl::OUString *pPaths = aPaths.getConstArray();
     for (sal_Int32 i = 0;  i < aPaths.getLength();  ++i)
     {
-        const BOOL bIsWriteablePath = (pPaths[i] == aWriteablePath);
+        const sal_Bool bIsWriteablePath = (pPaths[i] == aWriteablePath);
         SearchForDictionaries( aDicList, pPaths[i], bIsWriteablePath );
     }
 
@@ -689,7 +689,7 @@ void DicList::_CreateDicList()
     if (xIgnAll.is())
     {
         AddUserData( xIgnAll );
-        xIgnAll->setActive( TRUE );
+        xIgnAll->setActive( sal_True );
         addDictionary( xIgnAll );
     }
 
@@ -703,14 +703,14 @@ void DicList::_CreateDicList()
     //
     const uno::Sequence< rtl::OUString > aActiveDics( aOpt.GetActiveDics() );
     const rtl::OUString *pActiveDic = aActiveDics.getConstArray();
-    INT32 nLen = aActiveDics.getLength();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = aActiveDics.getLength();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         if (pActiveDic[i].getLength())
         {
             uno::Reference< XDictionary > xDic( getDictionaryByName( pActiveDic[i] ) );
             if (xDic.is())
-                xDic->setActive( TRUE );
+                xDic->setActive( sal_True );
         }
     }
 
@@ -720,7 +720,7 @@ void DicList::_CreateDicList()
 
     pDicEvtLstnrHelper->EndCollectEvents();
 
-    bInCreation = FALSE;
+    bInCreation = sal_False;
 }
 
 
@@ -771,10 +771,10 @@ sal_Bool SAL_CALL DicList::supportsService( const rtl::OUString& ServiceName )
 
     uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
     const rtl::OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -795,31 +795,6 @@ uno::Sequence< rtl::OUString > DicList::getSupportedServiceNames_Static() throw(
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL DicList_writeInfo(
-    void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += DicList::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        uno::Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey(aImpl );
-        uno::Sequence< rtl::OUString > aServices =
-                DicList::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i]);
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL DicList_getFactory(	const sal_Char * pImplName,
         XMultiServiceFactory * pServiceManager, void *  )
 {
@@ -866,7 +841,7 @@ xub_StrLen lcl_GetToken( String &rToken,
         if (i >= rText.Len())	// delimeter not found
             rToken	= rText.Copy( nPos );
         else
-            rToken  = rText.Copy( nPos, sal::static_int_cast< xub_StrLen >((INT32) i - nPos) );
+            rToken  = rText.Copy( nPos, sal::static_int_cast< xub_StrLen >((sal_Int32) i - nPos) );
         nRes	= i + 1;	// continue after found delimeter
     }
 
@@ -894,7 +869,7 @@ static void AddInternal(
         {
             if( aToken.Len()  &&  !IsNumeric( aToken ) )
             {
-                rDic->add( aToken, FALSE, rtl::OUString() );
+                rDic->add( aToken, sal_False, rtl::OUString() );
             }
         }
     }
@@ -921,10 +896,10 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic )
 #pragma optimize("g",off)
 #endif
 
-static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
+static sal_Bool IsVers2OrNewer( const String& rFileURL, sal_uInt16& nLng, sal_Bool& bNeg )
 {
     if (rFileURL.Len() == 0)
-        return FALSE;
+        return sal_False;
     String aDIC( GetDicExtension() );
     String aExt;
     xub_StrLen nPos = rFileURL.SearchBackward( '.' );
@@ -933,7 +908,7 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
     aExt.ToLowerAscii();
 
     if(aExt != aDIC)
-        return FALSE;
+        return sal_False;
 
     // get stream to be used
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
@@ -953,15 +928,15 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg )
     }
     DBG_ASSERT( xStream.is(), "failed to get stream for read" );
     if (!xStream.is())
-        return FALSE;
+        return sal_False;
 
     SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) );
     
     int nDicVersion = ReadDicVersion(pStream, nLng, bNeg);
     if (2 == nDicVersion || nDicVersion >= 5)
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 12268643b0..ff3df3811c 100644..100755
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -42,7 +42,7 @@
 #include <vector>
 #include <memory>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "lngopt.hxx"
 
 class DicEvtListenerHelper;
@@ -81,8 +81,8 @@ class DicList :
                 XTerminateListener >		xExitListener;
     MyAppExitListener						*pExitListener;
 
-    BOOL	bDisposing;
-    BOOL    bInCreation;
+    sal_Bool	bDisposing;
+    sal_Bool    bInCreation;
 
     // disallow copy-constructor and assignment-operator for now
     DicList( const DicList & );
@@ -96,11 +96,11 @@ class DicList :
                             return aDicList;
                         }
 
-    void            LaunchEvent(INT16 nEvent, com::sun::star::uno::Sequence<
+    void            LaunchEvent(sal_Int16 nEvent, com::sun::star::uno::Sequence<
                             ::com::sun::star::linguistic2::XDictionary > xDic);
     void            SearchForDictionaries( DictionaryVec_t &rDicList,
-                                            const String &rDicDir, BOOL bIsWritePath );
-    INT32           GetDicPos(const com::sun::star::uno::Reference<
+                                            const String &rDicDir, sal_Bool bIsWritePath );
+    sal_Int32           GetDicPos(const com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XDictionary > &xDic);
 
 public:
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index a5ddc9bd33..933740c8df 100644..100755
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -60,16 +60,16 @@
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/extract.hxx>
 #include <cppuhelper/factory.hxx>
 #include <i18npool/mslangid.hxx>
 #include <unotools/processfactory.hxx>
+#include <comphelper/extract.hxx>
 
 #include <deque>
 #include <map>
 #include <vector>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "lngopt.hxx"
 
@@ -1222,10 +1222,10 @@ throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); ++i )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); ++i )
         if( pArray[i] == rServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -1336,27 +1336,4 @@ void * SAL_CALL GrammarCheckingIterator_getFactory(
     return pRet;
 }
 
-
-sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo(
-    void * /*pServiceManager*/,
-    registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        OUString aImpl( '/' );
-        aImpl += GrammarCheckingIterator_getImplementationName().getStr();
-        aImpl += A2OU( "/UNO/SERVICES" );
-        uno::Reference< registry::XRegistryKey > xNewKey = pRegistryKey->createKey( aImpl );
-        uno::Sequence< OUString > aServices = GrammarCheckingIterator_getSupportedServiceNames();
-        for( sal_Int32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch (uno::Exception &)
-    {
-        return sal_False;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 9932c599d7..9932c599d7 100644..100755
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 4f1bdf01a4..1268778230 100644..100755
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -35,7 +35,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -48,7 +48,7 @@
 #include <com/sun/star/linguistic2/SingleGrammarError.hpp>
 #include <com/sun/star/linguistic2/GrammarCheckingResult.hpp>
 #include "lngopt.hxx"
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <unotools/processfactory.hxx>
 #include <map>
 #include <com/sun/star/text/TextMarkupType.hpp>
@@ -250,10 +250,10 @@ sal_Bool SAL_CALL GrammarChecker::supportsService( const OUString& ServiceName )
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); ++i )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); ++i )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 uno::Sequence< OUString > GrammarChecker::getSupportedServiceNames_Static(  ) throw()
@@ -277,27 +277,6 @@ OUString SAL_CALL GrammarChecker::getImplementationName(  ) throw(uno::RuntimeEx
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL GrammarChecker_writeInfo( void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += GrammarChecker::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        uno::Reference< registry::XRegistryKey > xNewKey =
-            pRegistryKey->createKey( aImpl );
-        uno::Sequence< OUString > aServices = GrammarChecker::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); ++i )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(uno::Exception &)
-    {
-        return sal_False;
-    }
-}
-
 uno::Reference< uno::XInterface > SAL_CALL GrammarChecker_CreateInstance(
         const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
     throw(uno::Exception)
diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx
index bae78b6c15..bae78b6c15 100644..100755
--- a/linguistic/source/grammarchecker.hxx
+++ b/linguistic/source/grammarchecker.hxx
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 5a2d887960..6b2a964781 100644..100755
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
 #include "hhconvdic.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 using namespace utl;
@@ -88,13 +88,13 @@ sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException)
 
 
 
-BOOL TextIsAllScriptType( const OUString &rTxt, INT16 nScriptType )
+sal_Bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType )
 {
-    BOOL bIsAll = TRUE;
-    for (INT32 i = 0;  i < rTxt.getLength() && bIsAll;  ++i)
+    sal_Bool bIsAll = sal_True;
+    for (sal_Int32 i = 0;  i < rTxt.getLength() && bIsAll;  ++i)
     {
         if (checkScriptType( rTxt.getStr()[i]) != nScriptType)
-            bIsAll = FALSE;
+            bIsAll = sal_False;
     }
     return bIsAll;
 }
@@ -103,7 +103,7 @@ BOOL TextIsAllScriptType( const OUString &rTxt, INT16 nScriptType )
 ///////////////////////////////////////////////////////////////////////////
 
 HHConvDic::HHConvDic( const String &rName, const String &rMainURL ) :
-    ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, TRUE, rMainURL )
+    ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, sal_True, rMainURL )
 {
 }
 
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index 46c9ec5a49..36388f825b 100644..100755
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -36,7 +36,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <tools/string.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 #include "convdic.hxx"
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 3dae95da86..a73bd8173e 100644..100755
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -43,8 +43,8 @@
 #include <osl/mutex.hxx>
 
 #include "hyphdsp.hxx"
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
 #include "lngsvcmgr.hxx"
 
 
@@ -85,7 +85,7 @@ void HyphenatorDispatcher::ClearSvcList()
 Reference<XHyphenatedWord>	HyphenatorDispatcher::buildHyphWord(
             const OUString rOrigWord,
             const Reference<XDictionaryEntry> &xEntry,
-            INT16 nLang, INT16 nMaxLeading )
+            sal_Int16 nLang, sal_Int16 nMaxLeading )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
@@ -94,25 +94,25 @@ Reference<XHyphenatedWord>	HyphenatorDispatcher::buildHyphWord(
     if (xEntry.is())
     {
         OUString aText( xEntry->getDictionaryWord() );
-        INT32 nTextLen = aText.getLength();
+        sal_Int32 nTextLen = aText.getLength();
 
         // trailing '=' means "hyphenation should not be possible"
         if (nTextLen > 0  &&  aText[ nTextLen - 1 ] != '=')
         {
-            INT16 nHyphenationPos = -1;
+            sal_Int16 nHyphenationPos = -1;
 
             OUStringBuffer aTmp( nTextLen );
-            BOOL  bSkip = FALSE;
-            INT32 nHyphIdx = -1;
-            INT32 nLeading = 0;
-            for (INT32 i = 0;  i < nTextLen;  i++)
+            sal_Bool  bSkip = sal_False;
+            sal_Int32 nHyphIdx = -1;
+            sal_Int32 nLeading = 0;
+            for (sal_Int32 i = 0;  i < nTextLen;  i++)
             {
                 sal_Unicode cTmp = aText[i];
                 if (cTmp != '=')
                 {
                     aTmp.append( cTmp );
                     nLeading++;
-                    bSkip = FALSE;
+                    bSkip = sal_False;
                     nHyphIdx++;
                 }
                 else
@@ -120,9 +120,9 @@ Reference<XHyphenatedWord>	HyphenatorDispatcher::buildHyphWord(
                     if (!bSkip  &&  nHyphIdx >= 0)
                     {
                         if (nLeading <= nMaxLeading)
-                            nHyphenationPos = (INT16) nHyphIdx;
+                            nHyphenationPos = (sal_Int16) nHyphIdx;
                     }
-                    bSkip = TRUE;	//! multiple '=' should count as one only
+                    bSkip = sal_True;	//! multiple '=' should count as one only
                 }
             }
 
@@ -172,7 +172,7 @@ Reference<XHyphenatedWord>	HyphenatorDispatcher::buildHyphWord(
 
 
 Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
-            const Reference< XDictionaryEntry > &xEntry, INT16 nLanguage )
+            const Reference< XDictionaryEntry > &xEntry, sal_Int16 nLanguage )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
@@ -182,33 +182,33 @@ Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
     {
         // text with hyphenation info
         OUString aText( xEntry->getDictionaryWord() );
-        INT32 nTextLen = aText.getLength();
+        sal_Int32 nTextLen = aText.getLength();
 
         // trailing '=' means "hyphenation should not be possible"
         if (nTextLen > 0  &&  aText[ nTextLen - 1 ] != '=')
         {
             // sequence to hold hyphenation positions
-            Sequence< INT16 > aHyphPos( nTextLen );
-            INT16 *pPos = aHyphPos.getArray();
-            INT32 nHyphCount = 0;
+            Sequence< sal_Int16 > aHyphPos( nTextLen );
+            sal_Int16 *pPos = aHyphPos.getArray();
+            sal_Int32 nHyphCount = 0;
 
             OUStringBuffer aTmp( nTextLen );
-            BOOL  bSkip = FALSE;
-            INT32 nHyphIdx = -1;
-            for (INT32 i = 0;  i < nTextLen;  i++)
+            sal_Bool  bSkip = sal_False;
+            sal_Int32 nHyphIdx = -1;
+            for (sal_Int32 i = 0;  i < nTextLen;  i++)
             {
                 sal_Unicode cTmp = aText[i];
                 if (cTmp != '=')
                 {
                     aTmp.append( cTmp );
-                    bSkip = FALSE;
+                    bSkip = sal_False;
                     nHyphIdx++;
                 }
                 else
                 {
                     if (!bSkip  &&  nHyphIdx >= 0)
-                        pPos[ nHyphCount++ ] = (INT16) nHyphIdx;
-                    bSkip = TRUE;	//! multiple '=' should count as one only
+                        pPos[ nHyphCount++ ] = (sal_Int16) nHyphIdx;
+                    bSkip = sal_True;	//! multiple '=' should count as one only
                 }
             }
 
@@ -267,8 +267,8 @@ Reference< XHyphenatedWord > SAL_CALL
 
     Reference< XHyphenatedWord >	xRes;
 
-    INT32 nWordLen = rWord.getLength();
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int32 nWordLen = rWord.getLength();
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !nWordLen ||
         nMaxLeading == 0 || nMaxLeading == nWordLen)
         return xRes;
@@ -277,7 +277,7 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphSvcByLangMap_t::iterator    aIt( aSvcMap.find( nLanguage ) );
     LangSvcEntries_Hyph     *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 
-    BOOL bWordModified = FALSE;
+    sal_Bool bWordModified = sal_False;
     if (!pEntry || (nMaxLeading < 0 || nMaxLeading > nWordLen))
     {
 #ifdef LINGU_EXCEPTIONS
@@ -299,7 +299,7 @@ Reference< XHyphenatedWord > SAL_CALL
         bWordModified |= RemoveHyphens( aChkWord );
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             bWordModified |= RemoveControlChars( aChkWord );
-        INT16 nChkMaxLeading = (INT16) GetPosInWordToCheck( rWord, nMaxLeading );
+        sal_Int16 nChkMaxLeading = (sal_Int16) GetPosInWordToCheck( rWord, nMaxLeading );
 
         // check for results from (positive) dictionaries which have precedence!
         Reference< XDictionaryEntry > xEntry;
@@ -307,7 +307,7 @@ Reference< XHyphenatedWord > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -321,11 +321,11 @@ Reference< XHyphenatedWord > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -376,7 +376,7 @@ Reference< XHyphenatedWord > SAL_CALL
                         xRes = xHyph->hyphenate( aChkWord, rLocale, nChkMaxLeading,
                                                 rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -412,8 +412,8 @@ Reference< XHyphenatedWord > SAL_CALL
 
     Reference< XHyphenatedWord >	xRes;
 
-    INT32 nWordLen = rWord.getLength();
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int32 nWordLen = rWord.getLength();
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !nWordLen)
         return xRes;
 
@@ -421,7 +421,7 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphSvcByLangMap_t::iterator    aIt( aSvcMap.find( nLanguage ) );
     LangSvcEntries_Hyph     *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
 
-    BOOL bWordModified = FALSE;
+    sal_Bool bWordModified = sal_False;
     if (!pEntry || !(0 <= nIndex && nIndex <= nWordLen - 2))
     {
 #ifdef LINGU_EXCEPTIONS
@@ -443,7 +443,7 @@ Reference< XHyphenatedWord > SAL_CALL
         bWordModified |= RemoveHyphens( aChkWord );
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             bWordModified |= RemoveControlChars( aChkWord );
-        INT16 nChkIndex = (INT16) GetPosInWordToCheck( rWord, nIndex );
+        sal_Int16 nChkIndex = (sal_Int16) GetPosInWordToCheck( rWord, nIndex );
 
         // check for results from (positive) dictionaries which have precedence!
         Reference< XDictionaryEntry > xEntry;
@@ -451,7 +451,7 @@ Reference< XHyphenatedWord > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -460,11 +460,11 @@ Reference< XHyphenatedWord > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -515,7 +515,7 @@ Reference< XHyphenatedWord > SAL_CALL
                         xRes = xHyph->queryAlternativeSpelling( aChkWord, rLocale,
                                     nChkIndex, rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -551,7 +551,7 @@ Reference< XPossibleHyphens > SAL_CALL
 
     Reference< XPossibleHyphens >	xRes;
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !rWord.getLength())
         return xRes;
 
@@ -585,7 +585,7 @@ Reference< XPossibleHyphens > SAL_CALL
         if (GetDicList().is()  &&  IsUseDicList( rProperties, GetPropSet() ))
         {
             xEntry = GetDicList()->queryDictionaryEntry( aChkWord, rLocale,
-                        TRUE, FALSE );
+                        sal_True, sal_False );
         }
 
         if (xEntry.is())
@@ -594,11 +594,11 @@ Reference< XPossibleHyphens > SAL_CALL
         }
         else
         {
-            INT32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
+            sal_Int32 nLen = pEntry->aSvcImplNames.getLength() > 0 ? 1 : 0;
             DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                     "lng : index out of range");
 
-            INT32 i = 0;
+            sal_Int32 i = 0;
             Reference< XHyphenator > xHyph;
             if (pEntry->aSvcRefs.getLength() > 0)
                 xHyph = pEntry->aSvcRefs[0];
@@ -649,7 +649,7 @@ Reference< XPossibleHyphens > SAL_CALL
                     xRes = xHyph->createPossibleHyphens( aChkWord, rLocale,
                                 rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
 
                     // if language is not supported by the services
@@ -677,9 +677,9 @@ void HyphenatorDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -714,7 +714,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     HyphenatorDispatcher            *pThis = (HyphenatorDispatcher *) this;
     const HyphSvcByLangMap_t::iterator  aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Hyph       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 170b656b8a..14683124a4 100644..100755
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -46,7 +46,7 @@
 #include <map>
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class LngSvcMgr;
@@ -89,13 +89,13 @@ class HyphenatorDispatcher :
             buildHyphWord( const rtl::OUString rOrigWord, 
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XDictionaryEntry> &xEntry,
-                INT16 nLang, INT16 nMaxLeading );
+                sal_Int16 nLang, sal_Int16 nMaxLeading );
 
     com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XPossibleHyphens >
             buildPossHyphens( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::linguistic2::XDictionaryEntry > &xEntry,
-                    INT16 nLanguage );
+                    sal_Int16 nLanguage );
 
 public:
     HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr );
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 7b9786543e..79a4cd7d42 100644..100755
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -29,9 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_linguistic.hxx"
 
-#include "hyphdta.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <osl/mutex.hxx>
 
 
@@ -53,8 +53,8 @@ namespace linguistic
 ///////////////////////////////////////////////////////////////////////////
 
 
-HyphenatedWord::HyphenatedWord(const OUString &rWord, INT16 nLang, INT16 nHPos,
-                               const OUString &rHyphWord, INT16 nPos ) :
+HyphenatedWord::HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHPos,
+                               const OUString &rHyphWord, sal_Int16 nPos ) :
     aWord			(rWord),
     aHyphenatedWord (rHyphWord),
     nHyphPos        (nPos),
@@ -136,9 +136,9 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
 ///////////////////////////////////////////////////////////////////////////
 
 
-PossibleHyphens::PossibleHyphens(const OUString &rWord, INT16 nLang,
+PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
             const OUString &rHyphWord,
-            const Sequence< INT16 > &rPositions) :
+            const Sequence< sal_Int16 > &rPositions) :
     aWord			(rWord),
     aWordWithHyphens(rHyphWord),
     aOrigHyphenPos	(rPositions),
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index f7d938796b..2ea27382ac 100644..100755
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -32,13 +32,13 @@
 #include <string.h>
 
 #include "iprcache.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/processfactory.hxx>
-#include <lngprops.hxx>
+#include <linguistic/lngprops.hxx>
 
 using namespace utl;
 using namespace osl;
@@ -60,7 +60,7 @@ namespace linguistic
 static const struct
 {
     const char *pPropName;
-    INT32		nPropHdl;
+    sal_Int32		nPropHdl;
 } aFlushProperties[ NUM_FLUSH_PROPS ] = 
 {
     { UPN_IS_USE_DICTIONARY_LIST,         UPH_IS_USE_DICTIONARY_LIST },
@@ -101,7 +101,7 @@ static void lcl_RemoveAsPropertyChangeListener(
 }
 
 
-static BOOL lcl_IsFlushProperty( INT32 nHandle )
+static sal_Bool lcl_IsFlushProperty( sal_Int32 nHandle )
 {
     int i;
     for (i = 0;  i < NUM_FLUSH_PROPS;  ++i)
@@ -135,7 +135,7 @@ void FlushListener::SetDicList(	Reference<XDictionaryList> &rDL )
 
         xDicList = rDL;
         if (xDicList.is())
-            xDicList->addDictionaryListEventListener( this, FALSE );
+            xDicList->addDictionaryListEventListener( this, sal_False );
     }
 }
     
@@ -182,13 +182,13 @@ void SAL_CALL FlushListener::processDictionaryListEvent(
 
     if (rDicListEvent.Source == xDicList)
     {
-        INT16 nEvt = rDicListEvent.nCondensedEvent;
-        INT16 nFlushFlags = 
+        sal_Int16 nEvt = rDicListEvent.nCondensedEvent;
+        sal_Int16 nFlushFlags = 
                 DictionaryListEventFlags::ADD_NEG_ENTRY		|
                 DictionaryListEventFlags::DEL_POS_ENTRY		|
                 DictionaryListEventFlags::ACTIVATE_NEG_DIC	|
                 DictionaryListEventFlags::DEACTIVATE_POS_DIC;
-        BOOL bFlush	= 0 != (nEvt & nFlushFlags);
+        sal_Bool bFlush	= 0 != (nEvt & nFlushFlags);
 
         DBG_ASSERT( pFlushObj, "missing object (NULL pointer)" );
         if (bFlush && pFlushObj != NULL)
@@ -205,7 +205,7 @@ void SAL_CALL FlushListener::propertyChange(
 
     if (rEvt.Source == xPropSet)
     {
-        BOOL bFlush	= lcl_IsFlushProperty( rEvt.PropertyHandle );
+        sal_Bool bFlush	= lcl_IsFlushProperty( rEvt.PropertyHandle );
 
         DBG_ASSERT( pFlushObj, "missing object (NULL pointer)" );
         if (bFlush && pFlushObj != NULL)
diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component
new file mode 100755
index 0000000000..f4f3ca603a
--- /dev/null
+++ b/linguistic/source/lng.component
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.lingu2.ConvDicList">
+    <service name="com.sun.star.linguistic2.ConversionDictionaryList"/>
+  </implementation>
+  <implementation name="com.sun.star.lingu2.DicList">
+    <service name="com.sun.star.linguistic2.DictionaryList"/>
+  </implementation>
+  <implementation name="com.sun.star.lingu2.LinguProps">
+    <service name="com.sun.star.linguistic2.LinguProperties"/>
+  </implementation>
+  <implementation name="com.sun.star.lingu2.LngSvcMgr">
+    <service name="com.sun.star.linguistic2.LinguServiceManager"/>
+  </implementation>
+  <implementation name="com.sun.star.lingu2.ProofreadingIterator">
+    <service name="com.sun.star.linguistic2.ProofreadingIterator"/>
+  </implementation>
+</component>
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index f6230528a5..9046270f4c 100644..100755
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -31,8 +31,8 @@
 
 #include <sal/macros.h>
 #include "lngopt.hxx"
-#include "lngprops.hxx"
-#include "misc.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/misc.hxx"
 #include <tools/debug.hxx>
 #include <unotools/lingucfg.hxx>
 
@@ -101,33 +101,33 @@ LinguOptions::~LinguOptions()
 }
 
 
-BOOL LinguOptions::SetLocale_Impl( INT16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
+sal_Bool LinguOptions::SetLocale_Impl( sal_Int16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     Locale	aNew;
     rVal >>= aNew;
-        INT16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
+        sal_Int16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
     if (nNew != rLanguage)
     {
         Locale	aLocale( CreateLocale( rLanguage ) );
         rOld.setValue( &aLocale, ::getCppuType((Locale*)0 ));
         rLanguage = nNew;
-        bRes = TRUE;
+        bRes = sal_True;
     }
 
     return bRes;
 }
 
 
-BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
+sal_Bool LinguOptions::SetValue( Any &rOld, const Any &rVal, sal_Int32 nWID )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
-    INT16 *pnVal = 0;
-    BOOL  *pbVal = 0;
+    sal_Int16 *pnVal = 0;
+    sal_Bool  *pbVal = 0;
 
     switch( nWID )
     {
@@ -166,30 +166,30 @@ BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
         default :
         {
             DBG_ASSERT( 0,"lng : unknown WID");
-            bRes = FALSE;
+            bRes = sal_False;
         }
     }
 
     if (pbVal)
     {
-        BOOL bNew = FALSE;
+        sal_Bool bNew = sal_False;
         rVal >>= bNew;
         if (bNew != *pbVal)
         {
             rOld <<= *pbVal;
             *pbVal = bNew;
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
     if (pnVal)
     {
-        INT16 nNew = 0;
+        sal_Int16 nNew = 0;
         rVal >>= nNew;
         if (nNew != *pnVal)
         {
             rOld <<= *pnVal;
             *pnVal = nNew;
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
 
@@ -199,13 +199,13 @@ BOOL LinguOptions::SetValue( Any &rOld, const Any &rVal, INT32 nWID )
     return bRes;
 }
 
-void LinguOptions::GetValue( Any &rVal, INT32 nWID ) const
+void LinguOptions::GetValue( Any &rVal, sal_Int32 nWID ) const
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    INT16 *pnVal = 0;
-    BOOL  *pbVal = 0;
-    BOOL  bDummy = FALSE;
+    sal_Int16 *pnVal = 0;
+    sal_Bool  *pbVal = 0;
+    sal_Bool  bDummy = sal_False;
 
     switch( nWID )
     {
@@ -259,7 +259,7 @@ void LinguOptions::GetValue( Any &rVal, INT32 nWID ) const
 
 struct WID_Name
 {
-    INT32		 nWID;
+    sal_Int32		 nWID;
     const char	*pPropertyName;
 };
 
@@ -294,13 +294,13 @@ WID_Name aWID_Name[] =
 };
 
 
-OUString LinguOptions::GetName( INT32 nWID )
+OUString LinguOptions::GetName( sal_Int32 nWID )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
     OUString aRes;
 
-    INT32 nLen = SAL_N_ELEMENTS( aWID_Name );
+    sal_Int32 nLen = SAL_N_ELEMENTS( aWID_Name );
     if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID)
         aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName);
     else
@@ -366,7 +366,7 @@ LinguProps::LinguProps() :
     aPropListeners	(GetLinguMutex()),
     aPropertyMap(lcl_GetLinguProps())
 {
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 }
 
 void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const
@@ -417,7 +417,7 @@ void SAL_CALL LinguProps::setPropertyValue(
         if (aOld != rValue && aConfig.SetProperty( pCur->nWID, rValue ))
         {
             PropertyChangeEvent aChgEvt( (XPropertySet *) this, rPropertyName,
-                    FALSE, pCur->nWID, aOld, rValue );
+                    sal_False, pCur->nWID, aOld, rValue );
             launchEvent( aChgEvt );
         }
     }
@@ -520,7 +520,7 @@ void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rV
     if (aOld != rValue && aConfig.SetProperty( nHandle, rValue ))
     {
         PropertyChangeEvent aChgEvt( (XPropertySet *) this,
-                LinguOptions::GetName( nHandle ), FALSE, nHandle, aOld, rValue );
+                LinguOptions::GetName( nHandle ), sal_False, nHandle, aOld, rValue );
         launchEvent( aChgEvt );
     }
 }
@@ -542,12 +542,12 @@ Sequence< PropertyValue > SAL_CALL
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    INT32 nLen = aPropertyMap.getSize();
+    sal_Int32 nLen = aPropertyMap.getSize();
     Sequence< PropertyValue > aProps( nLen );
     PropertyValue *pProp = aProps.getArray();
     PropertyEntryVector_t aPropEntries = aPropertyMap.getPropertyEntries();
     PropertyEntryVector_t::const_iterator aIt = aPropEntries.begin();
-    for (INT32 i = 0;  i < nLen;  ++i, ++aIt)
+    for (sal_Int32 i = 0;  i < nLen;  ++i, ++aIt)
     {
         PropertyValue &rVal = pProp[i];
         Any aAny( aConfig.GetProperty( aIt->nWID ) );
@@ -567,9 +567,9 @@ void SAL_CALL
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    INT32 nLen = rProps.getLength();
+    sal_Int32 nLen = rProps.getLength();
     const PropertyValue *pVal = rProps.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const PropertyValue &rVal = pVal[i];
         setPropertyValue( rVal.Name, rVal.Value );
@@ -584,7 +584,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
 
         //! its too late to save the options here!
         // (see AppExitListener for saving)
@@ -637,10 +637,10 @@ sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName )
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 // XServiceInfo
@@ -662,29 +662,6 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL LinguProps_writeInfo( void * /*pServiceManager*/,
-            XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += LinguProps::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        Reference< XRegistryKey > xNewKey =
-            pRegistryKey->createKey(aImpl );
-        uno::Sequence< OUString > aServices = LinguProps::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i]);
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
 void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName,
             XMultiServiceFactory *pServiceManager, void * )
 {
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 323b60a691..3bf28c54b6 100644..100755
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -46,7 +46,7 @@
 #include <tools/solar.h>
 
 #include <svl/itemprop.hxx>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 namespace com { namespace sun { namespace star {
@@ -72,7 +72,7 @@ class LinguOptions
 
     //! uses default assignment-operator
 
-    BOOL SetLocale_Impl( INT16 &rLanguage,
+    sal_Bool SetLocale_Impl( sal_Int16 &rLanguage,
             ::com::sun::star::uno::Any &rOld,
             const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
 
@@ -81,11 +81,11 @@ public:
     LinguOptions(const LinguOptions &rOpt);
     ~LinguOptions();
 
-    BOOL			SetValue( ::com::sun::star::uno::Any &rOld,
-                            const ::com::sun::star::uno::Any &rVal, INT32 nWID );
-    void			GetValue( ::com::sun::star::uno::Any &rVal, INT32 nWID ) const;
+    sal_Bool			SetValue( ::com::sun::star::uno::Any &rOld,
+                            const ::com::sun::star::uno::Any &rVal, sal_Int32 nWID );
+    void			GetValue( ::com::sun::star::uno::Any &rVal, sal_Int32 nWID ) const;
 
-    static ::rtl::OUString    GetName( INT32 nWID );
+    static ::rtl::OUString    GetName( sal_Int32 nWID );
 
     const ::com::sun::star::uno::Sequence< rtl::OUString >
             GetActiveDics() const	{ return pData->aActiveDics; }
@@ -103,14 +103,14 @@ public:
 // helper function call class
 struct PropHashType_Impl
 {
-    size_t operator()(const INT32 &s) const	{ return s; }
+    size_t operator()(const sal_Int32 &s) const	{ return s; }
 };
 
 typedef cppu::OMultiTypeInterfaceContainerHelperVar
     <
-        INT32,
+        sal_Int32,
         PropHashType_Impl,
-        std::equal_to< INT32 >
+        std::equal_to< sal_Int32 >
     > OPropertyListenerContainerHelper;
 
 ///////////////////////////////////////////////////////////////////////////
@@ -132,7 +132,7 @@ class LinguProps :
     SfxItemPropertyMap                          aPropertyMap;
     SvtLinguConfig                              aConfig;
 
-    BOOL										bDisposing;
+    sal_Bool										bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     LinguProps(const LinguProps &);
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index daae4f96fe..e75f89bac5 100644..100755
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -38,10 +38,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
-#include <lngprops.hxx>
+#include <linguistic/misc.hxx>
+#include <linguistic/lngprops.hxx>
 
-#include <lngprophelp.hxx>
+#include <linguistic/lngprophelp.hxx>
 
 using namespace osl;
 using namespace com::sun::star;
@@ -79,7 +79,7 @@ PropertyChgHelper::PropertyChgHelper(
     nEvtFlags           (nAllowedEvents)
 {
     OUString *pName = aPropNames.getArray();
-    for (INT32 i = 0;  i < nCHCount;  ++i)
+    for (sal_Int32 i = 0;  i < nCHCount;  ++i)
     {
         pName[i] = ::rtl::OUString::createFromAscii( aCH[i] );
     }
@@ -109,14 +109,14 @@ PropertyChgHelper::~PropertyChgHelper()
 }
 
 
-void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount )
+void PropertyChgHelper::AddPropNames( const char *pNewNames[], sal_Int32 nCount )
 {
     if (pNewNames && nCount)
     {
-        INT32 nLen = GetPropNames().getLength();
+        sal_Int32 nLen = GetPropNames().getLength();
         GetPropNames().realloc( nLen + nCount );
         OUString *pName = GetPropNames().getArray();
-        for (INT32 i = 0;  i < nCount;  ++i)
+        for (sal_Int32 i = 0;  i < nCount;  ++i)
         {
             pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] );
 
@@ -127,20 +127,20 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount )
 
 void PropertyChgHelper::SetDefaultValues()
 {
-    bResIsIgnoreControlCharacters	= bIsIgnoreControlCharacters	= TRUE;
-    bResIsUseDictionaryList			= bIsUseDictionaryList			= TRUE;
+    bResIsIgnoreControlCharacters	= bIsIgnoreControlCharacters	= sal_True;
+    bResIsUseDictionaryList			= bIsUseDictionaryList			= sal_True;
 }
 
 
 void PropertyChgHelper::GetCurrentValues()
 {
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbVal		= NULL,
+            sal_Bool *pbVal		= NULL,
                  *pbResVal	= NULL;
             
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_IS_IGNORE_CONTROL_CHARACTERS ) ))
@@ -171,13 +171,13 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals )
     bResIsIgnoreControlCharacters	= bIsIgnoreControlCharacters;
     bResIsUseDictionaryList			= bIsUseDictionaryList;
     //
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL  *pbResVal = NULL;
+            sal_Bool  *pbResVal = NULL;
             switch (pVal[i].Handle)
             {
                 case UPH_IS_IGNORE_CONTROL_CHARACTERS : 
@@ -195,18 +195,18 @@ void PropertyChgHelper::SetTmpPropVals( const PropertyValues &rPropVals )
 }
 
 
-BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     if (GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = (nEvtFlags & AE_HYPHENATOR) ?
+        sal_Int16 nLngSvcFlags = (nEvtFlags & AE_HYPHENATOR) ?
                     LinguServiceEventFlags::HYPHENATE_AGAIN : 0;
-        BOOL bSCWA = FALSE,	// SPELL_CORRECT_WORDS_AGAIN ?
-             bSWWA = FALSE;	// SPELL_WRONG_WORDS_AGAIN ?
+        sal_Bool bSCWA = sal_False,	// SPELL_CORRECT_WORDS_AGAIN ?
+             bSWWA = sal_False;	// SPELL_WRONG_WORDS_AGAIN ?
 
-        BOOL  *pbVal = NULL;
+        sal_Bool  *pbVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_IS_IGNORE_CONTROL_CHARACTERS :
@@ -218,12 +218,12 @@ BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
             case UPH_IS_USE_DICTIONARY_LIST		  :
             {
                 pbVal = &bIsUseDictionaryList;
-                bSCWA = bSWWA = TRUE;
+                bSCWA = bSWWA = sal_True;
                 break;
             }
             default:
             {
-                bRes = FALSE;
+                bRes = sal_False;
                 //DBG_ASSERT( 0, "unknown property" );
             }
         }
@@ -233,7 +233,7 @@ BOOL PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
         bRes = 0 != pbVal;	// sth changed?
         if (bRes)
         {
-            BOOL bSpellEvts = (nEvtFlags & AE_SPELLCHECKER) ? TRUE : FALSE;
+            sal_Bool bSpellEvts = (nEvtFlags & AE_SPELLCHECKER) ? sal_True : sal_False;
             if (bSCWA && bSpellEvts)
                 nLngSvcFlags |= LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
             if (bSWWA && bSpellEvts)
@@ -263,9 +263,9 @@ void PropertyChgHelper::AddAsPropListener()
 {
     if (xPropSet.is())
     {
-        INT32 nLen = aPropNames.getLength();
+        sal_Int32 nLen = aPropNames.getLength();
         const OUString *pPropName = aPropNames.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pPropName[i].getLength())
                 xPropSet->addPropertyChangeListener( pPropName[i], this );
@@ -277,9 +277,9 @@ void PropertyChgHelper::RemoveAsPropListener()
 {
     if (xPropSet.is())
     {
-        INT32 nLen = aPropNames.getLength();
+        sal_Int32 nLen = aPropNames.getLength();
         const OUString *pPropName = aPropNames.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pPropName[i].getLength())
                 xPropSet->removePropertyChangeListener( pPropName[i], this );
@@ -320,10 +320,10 @@ sal_Bool SAL_CALL
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxListener.is())
     {
-        INT32	nCount = aLngSvcEvtListeners.getLength();
+        sal_Int32	nCount = aLngSvcEvtListeners.getLength();
         bRes = aLngSvcEvtListeners.addInterface( rxListener ) != nCount;
     }
     return bRes;
@@ -337,10 +337,10 @@ sal_Bool SAL_CALL
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxListener.is())
     {
-        INT32	nCount = aLngSvcEvtListeners.getLength();
+        sal_Int32	nCount = aLngSvcEvtListeners.getLength();
         bRes = aLngSvcEvtListeners.removeInterface( rxListener ) != nCount;
     }
     return bRes;
@@ -407,9 +407,9 @@ void PropertyHelper_Spell::SetDefaultValues()
 {
     PropertyChgHelper::SetDefaultValues();
 
-    bResIsSpellUpperCase		= bIsSpellUpperCase			= FALSE;
-    bResIsSpellWithDigits		= bIsSpellWithDigits		= FALSE;
-    bResIsSpellCapitalization	= bIsSpellCapitalization	= TRUE;
+    bResIsSpellUpperCase		= bIsSpellUpperCase			= sal_False;
+    bResIsSpellWithDigits		= bIsSpellWithDigits		= sal_False;
+    bResIsSpellCapitalization	= bIsSpellCapitalization	= sal_True;
 }
 
 
@@ -417,13 +417,13 @@ void PropertyHelper_Spell::GetCurrentValues()
 {
     PropertyChgHelper::GetCurrentValues();
 
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbVal		= NULL,
+            sal_Bool *pbVal		= NULL,
                  *pbResVal	= NULL;
             
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_IS_SPELL_UPPER_CASE ) ))
@@ -452,38 +452,38 @@ void PropertyHelper_Spell::GetCurrentValues()
 }
 
 
-BOOL PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
+    sal_Bool bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
 
     if (!bRes  &&  GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = 0;
-        BOOL bSCWA = FALSE,	// SPELL_CORRECT_WORDS_AGAIN ?
-             bSWWA = FALSE;	// SPELL_WRONG_WORDS_AGAIN ?
+        sal_Int16 nLngSvcFlags = 0;
+        sal_Bool bSCWA = sal_False,	// SPELL_CORRECT_WORDS_AGAIN ?
+             bSWWA = sal_False;	// SPELL_WRONG_WORDS_AGAIN ?
 
-        BOOL *pbVal = NULL;
+        sal_Bool *pbVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_IS_SPELL_UPPER_CASE		  :
             {
                 pbVal = &bIsSpellUpperCase;
-                bSCWA = FALSE == *pbVal;	// FALSE->TRUE change?
-                bSWWA = !bSCWA;				// TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;	// sal_False->sal_True change?
+                bSWWA = !bSCWA;				// sal_True->sal_False change?
                 break;
             }
             case UPH_IS_SPELL_WITH_DIGITS		  :
             {
                 pbVal = &bIsSpellWithDigits;
-                bSCWA = FALSE == *pbVal;	// FALSE->TRUE change?
-                bSWWA = !bSCWA;				// TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;	// sal_False->sal_True change?
+                bSWWA = !bSCWA;				// sal_True->sal_False change?
                 break;
             }
             case UPH_IS_SPELL_CAPITALIZATION	  :
             {
                 pbVal = &bIsSpellCapitalization;
-                bSCWA = FALSE == *pbVal;	// FALSE->TRUE change?
-                bSWWA = !bSCWA;				// TRUE->FALSE change?
+                bSCWA = sal_False == *pbVal;	// sal_False->sal_True change?
+                bSWWA = !bSCWA;				// sal_True->sal_False change?
                 break;
             }
             default:
@@ -530,11 +530,11 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
     bResIsSpellWithDigits		= bIsSpellWithDigits;
     bResIsSpellCapitalization	= bIsSpellCapitalization;
 
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             if (pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(UPN_MAX_NUMBER_OF_SUGGESTIONS)))
             {
@@ -542,7 +542,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
             }
             else
             {
-                BOOL *pbResVal = NULL;
+                sal_Bool *pbResVal = NULL;
                 switch (pVal[i].Handle)
                 {
                     case UPH_IS_SPELL_UPPER_CASE     : pbResVal = &bResIsSpellUpperCase; break;
@@ -558,7 +558,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
     }
 }
 
-INT16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const
+sal_Int16 PropertyHelper_Spell::GetDefaultNumberOfSuggestions() const
 {
     return 16;
 }
@@ -603,13 +603,13 @@ void PropertyHelper_Hyphen::GetCurrentValues()
 {
     PropertyChgHelper::GetCurrentValues();
 
-    INT32 nLen = GetPropNames().getLength();
+    sal_Int32 nLen = GetPropNames().getLength();
     if (GetPropSet().is() && nLen)
     {
         const OUString *pPropName = GetPropNames().getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            INT16  *pnVal	 = NULL,
+            sal_Int16  *pnVal	 = NULL,
                    *pnResVal = NULL;
 
             if (pPropName[i].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UPN_HYPH_MIN_LEADING ) ))
@@ -638,15 +638,15 @@ void PropertyHelper_Hyphen::GetCurrentValues()
 }
 
 
-BOOL PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt )
+sal_Bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 {
-    BOOL bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
+    sal_Bool bRes = PropertyChgHelper::propertyChange_Impl( rEvt );
 
     if (!bRes  &&  GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = LinguServiceEventFlags::HYPHENATE_AGAIN;
+        sal_Int16 nLngSvcFlags = LinguServiceEventFlags::HYPHENATE_AGAIN;
 
-        INT16	*pnVal = NULL;
+        sal_Int16	*pnVal = NULL;
         switch (rEvt.PropertyHandle)
         {
             case UPH_HYPH_MIN_LEADING	  : pnVal = &nHyphMinLeading; break;
@@ -692,13 +692,13 @@ void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals )
     nResHyphMinTrailing	 	= nHyphMinTrailing;
     nResHyphMinWordLength	= nHyphMinWordLength;
 
-    INT32 nLen = rPropVals.getLength();
+    sal_Int32 nLen = rPropVals.getLength();
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
-            INT16	*pnResVal = NULL;
+            sal_Int16	*pnResVal = NULL;
             switch (pVal[i].Handle)
             {
                 case UPH_HYPH_MIN_LEADING	  : pnResVal = &nResHyphMinLeading; break;
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index 7a44271e6c..72876519ab 100644..100755
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -39,42 +39,6 @@ using namespace com::sun::star::lang;
 
 using namespace com::sun::star::registry;
 
-////////////////////////////////////////
-// declaration of external RegEntry-functions defined by the service objects
-//
-
-extern sal_Bool SAL_CALL LngSvcMgr_writeInfo
-(
-    void * /*pServiceManager*/,
-    XRegistryKey * pRegistryKey
-);
-
-extern sal_Bool SAL_CALL DicList_writeInfo
-(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey
-);
-
-extern sal_Bool SAL_CALL LinguProps_writeInfo
-(
-    void * /*pServiceManager*/,
-    XRegistryKey * pRegistryKey
-);
-
-extern sal_Bool SAL_CALL ConvDicList_writeInfo
-(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey
-);
-
-extern sal_Bool SAL_CALL GrammarCheckingIterator_writeInfo
-(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey
-);
-
-//extern sal_Bool SAL_CALL GrammarChecker_writeInfo
-//(
-//    void * /*pServiceManager*/, XRegistryKey * pRegistryKey
-//);
-
 extern void * SAL_CALL LngSvcMgr_getFactory
 (
     const sal_Char * pImplName,
@@ -130,28 +94,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo
-(
-    void * pServiceManager,
-    XRegistryKey * pRegistryKey
-)
-{
-    sal_Bool bRet = LngSvcMgr_writeInfo( pServiceManager, pRegistryKey );
-    if(bRet)
-        bRet = LinguProps_writeInfo( pServiceManager, pRegistryKey );
-    if(bRet)
-        bRet = DicList_writeInfo( pServiceManager, pRegistryKey );
-    if(bRet)
-        bRet = ConvDicList_writeInfo( pServiceManager, pRegistryKey );
-    if(bRet)
-        bRet = GrammarCheckingIterator_writeInfo( pServiceManager, pRegistryKey );
-/*    
-    if(bRet)
-        bRet = GrammarChecker_writeInfo( pServiceManager, pRegistryKey );
-*/ 
-    return bRet;
-}
-
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 2596ef6f3e..9fba7fe482 100644..100755
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -43,12 +43,14 @@
 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <rtl/logfile.hxx>
 
+#include <boost/checked_delete.hpp>
+
 #include "lngsvcmgr.hxx"
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "spelldsp.hxx"
 #include "hyphdsp.hxx"
 #include "thesdsp.hxx"
@@ -65,19 +67,19 @@ uno::Sequence< OUString > static GetLangSvc( const uno::Any &rVal );
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText )
+static sal_Bool lcl_SeqHasString( const uno::Sequence< OUString > &rSeq, const OUString &rText )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
-    INT32 nLen = rSeq.getLength();
+    sal_Int32 nLen = rSeq.getLength();
     if (nLen == 0 || rText.getLength() == 0)
         return bRes;
 
     const OUString *pSeq = rSeq.getConstArray();
-    for (INT32 i = 0;  i < nLen  &&  !bRes;  ++i)
+    for (sal_Int32 i = 0;  i < nLen  &&  !bRes;  ++i)
     {
         if (rText == pSeq[i])
-            bRes = TRUE;
+            bRes = sal_True;
     }
     return bRes;
 }
@@ -90,7 +92,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
     uno::Sequence< lang::Locale > aRes;
 
     uno::Reference< lang::XMultiServiceFactory >  xFac( utl::getProcessServiceFactory() );
-    INT32 nNames = rSvcImplNames.getLength();
+    sal_Int32 nNames = rSvcImplNames.getLength();
     if (nNames  &&  xFac.is())
     {
         std::set< LanguageType > aLanguages;
@@ -103,7 +105,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
         // check all services for the supported languages and new
         // languages to the result
         const OUString *pImplNames = rSvcImplNames.getConstArray();
-        INT32 i;
+        sal_Int32 i;
 
         for (i = 0;  i < nNames;  ++i)
         {
@@ -121,8 +123,8 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
             if (xSuppLoc.is())
             {
                 uno::Sequence< lang::Locale > aLoc( xSuppLoc->getLocales() );
-                INT32 nLoc = aLoc.getLength();
-                for (INT32 k = 0;  k < nLoc;  ++k)
+                sal_Int32 nLoc = aLoc.getLength();
+                for (sal_Int32 k = 0;  k < nLoc;  ++k)
                 {
                     const lang::Locale *pLoc = aLoc.getConstArray();
                     LanguageType nLang = LocaleToLanguage( pLoc[k] );
@@ -139,7 +141,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
         }
 
         // build return sequence
-        INT32 nLanguages = static_cast< INT32 >(aLanguages.size());
+        sal_Int32 nLanguages = static_cast< sal_Int32 >(aLanguages.size());
         aRes.realloc( nLanguages );
         lang::Locale *pRes = aRes.getArray();
         std::set< LanguageType >::const_iterator aIt( aLanguages.begin() );
@@ -158,24 +160,24 @@ static uno::Sequence< lang::Locale > GetAvailLocales(
 struct SvcInfo
 {
     const OUString                  aSvcImplName;
-    const uno::Sequence< INT16 >    aSuppLanguages;
+    const uno::Sequence< sal_Int16 >    aSuppLanguages;
 
     SvcInfo( const OUString &rSvcImplName,
-             const uno::Sequence< INT16 >  &rSuppLanguages ) :
+             const uno::Sequence< sal_Int16 >  &rSuppLanguages ) :
         aSvcImplName	(rSvcImplName),
         aSuppLanguages	(rSuppLanguages)
     {
     }
 
-    BOOL    HasLanguage( INT16 nLanguage ) const;
+    sal_Bool    HasLanguage( sal_Int16 nLanguage ) const;
 };
 
 
-BOOL SvcInfo::HasLanguage( INT16 nLanguage ) const
+sal_Bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const
 {
-    INT32 nCnt = aSuppLanguages.getLength();
-    const INT16 *pLang = aSuppLanguages.getConstArray();
-    INT32 i;
+    sal_Int32 nCnt = aSuppLanguages.getLength();
+    const sal_Int16 *pLang = aSuppLanguages.getConstArray();
+    sal_Int32 i;
 
     for ( i = 0;  i < nCnt;  ++i)
     {
@@ -194,15 +196,15 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
 {
     // get list of nodenames to look at for their service list
     const char *pEntryName = 0;
-    BOOL bHasLangSvcList = TRUE;
+    sal_Bool bHasLangSvcList = sal_True;
     switch (rDispatcher.GetDspType())
     {
         case LinguDispatcher::DSP_SPELL     : pEntryName = "ServiceManager/SpellCheckerList";    break;
         case LinguDispatcher::DSP_GRAMMAR   : pEntryName = "ServiceManager/GrammarCheckerList";
-                                              bHasLangSvcList = FALSE;
+                                              bHasLangSvcList = sal_False;
                                               break;
         case LinguDispatcher::DSP_HYPH      : pEntryName = "ServiceManager/HyphenatorList";
-                                              bHasLangSvcList = FALSE;
+                                              bHasLangSvcList = sal_False;
                                               break;
         case LinguDispatcher::DSP_THES      : pEntryName = "ServiceManager/ThesaurusList";  break;
         default :
@@ -212,9 +214,9 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
     uno::Sequence < OUString > aNodeNames( /*aCfg.*/GetNodeNames( aNode ) );
 
 
-    INT32 nLen = aNodeNames.getLength();
+    sal_Int32 nLen = aNodeNames.getLength();
     const OUString *pNodeNames = aNodeNames.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         uno::Sequence< OUString >   aSvcImplNames;
 
@@ -237,7 +239,7 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
             else
                 aSvcImplNames = GetLangSvc( rValue );
 
-            INT32 nSvcs = aSvcImplNames.getLength();
+            sal_Int32 nSvcs = aSvcImplNames.getLength();
             if (nSvcs)
             {
                 const OUString *pImplNames = aSvcImplNames.getConstArray();
@@ -245,10 +247,10 @@ void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
                 LanguageType nLang = MsLangId::convertIsoStringToLanguage( pNodeNames[i] );
 
                 // build list of available services from those
-                INT32 nCnt = 0;
+                sal_Int32 nCnt = 0;
                 uno::Sequence< OUString > aAvailSvcs( nSvcs );
                 OUString *pAvailSvcs = aAvailSvcs.getArray();
-                for (INT32 k = 0;  k < nSvcs;  ++k)
+                for (sal_Int32 k = 0;  k < nSvcs;  ++k)
                 {
                     // check for availability of the service
                     size_t nAvailSvcs = rAvailSvcs.size();
@@ -294,13 +296,13 @@ class LngSvcMgrListenerHelper :
     uno::Reference< linguistic2::XDictionaryList >               xDicList;
     uno::Reference< uno::XInterface >                        xMyEvtObj;
 
-    INT16	nCombinedLngSvcEvt;
+    sal_Int16	nCombinedLngSvcEvt;
 
     // disallow copy-constructor and assignment-operator for now
     LngSvcMgrListenerHelper(const LngSvcMgrListenerHelper &);
     LngSvcMgrListenerHelper & operator = (const LngSvcMgrListenerHelper &);
 
-    void	LaunchEvent( INT16 nLngSvcEvtFlags );
+    void	LaunchEvent( sal_Int16 nLngSvcEvtFlags );
 
 //	DECL_LINK( TimeOut, Timer* );
     long Timeout();
@@ -326,17 +328,17 @@ public:
                 const linguistic2::DictionaryListEvent& rDicListEvent )
             throw(uno::RuntimeException);
 
-    inline	BOOL	AddLngSvcMgrListener(
+    inline	sal_Bool	AddLngSvcMgrListener(
                         const uno::Reference< lang::XEventListener >& rxListener );
-    inline	BOOL    RemoveLngSvcMgrListener(
+    inline	sal_Bool    RemoveLngSvcMgrListener(
                         const uno::Reference< lang::XEventListener >& rxListener );
     void    DisposeAndClear( const lang::EventObject &rEvtObj );
-    BOOL	AddLngSvcEvtBroadcaster(
+    sal_Bool	AddLngSvcEvtBroadcaster(
                         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
-    BOOL	RemoveLngSvcEvtBroadcaster(
+    sal_Bool	RemoveLngSvcEvtBroadcaster(
                         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
 
-    void    AddLngSvcEvt( INT16 nLngSvcEvt );
+    void    AddLngSvcEvt( sal_Int16 nLngSvcEvt );
 };
 
 
@@ -353,7 +355,7 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper(
     if (xDicList.is())
     {
         xDicList->addDictionaryListEventListener(
-            (linguistic2::XDictionaryListEventListener *) this, FALSE );
+            (linguistic2::XDictionaryListEventListener *) this, sal_False );
     }
 
     //! The timer is used to 'sum up' different events in order to reduce the
@@ -413,7 +415,7 @@ long LngSvcMgrListenerHelper::Timeout()
 }
 
 
-void LngSvcMgrListenerHelper::AddLngSvcEvt( INT16 nLngSvcEvt )
+void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt )
 {
     nCombinedLngSvcEvt |= nLngSvcEvt;
 //	aLaunchTimer.Start();
@@ -438,7 +440,7 @@ void SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    INT16 nDlEvt = rDicListEvent.nCondensedEvent;
+    sal_Int16 nDlEvt = rDicListEvent.nCondensedEvent;
     if (0 == nDlEvt)
         return;
 
@@ -456,9 +458,9 @@ void SAL_CALL
     //
     // "translate" DictionaryList event into linguistic2::LinguServiceEvent
     //
-    INT16 nLngSvcEvt = 0;
+    sal_Int16 nLngSvcEvt = 0;
     //
-    INT16 nSpellCorrectFlags =
+    sal_Int16 nSpellCorrectFlags =
             linguistic2::DictionaryListEventFlags::ADD_NEG_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_NEG_DIC |
@@ -466,7 +468,7 @@ void SAL_CALL
     if (0 != (nDlEvt & nSpellCorrectFlags))
         nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
     //
-    INT16 nSpellWrongFlags =
+    sal_Int16 nSpellWrongFlags =
             linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_NEG_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_POS_DIC |
@@ -474,7 +476,7 @@ void SAL_CALL
     if (0 != (nDlEvt & nSpellWrongFlags))
         nLngSvcEvt |= linguistic2::LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN;
     //
-    INT16 nHyphenateFlags =
+    sal_Int16 nHyphenateFlags =
             linguistic2::DictionaryListEventFlags::ADD_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::DEL_POS_ENTRY        |
             linguistic2::DictionaryListEventFlags::ACTIVATE_POS_DIC |
@@ -489,7 +491,7 @@ void SAL_CALL
 }
 
 
-void LngSvcMgrListenerHelper::LaunchEvent( INT16 nLngSvcEvtFlags )
+void LngSvcMgrListenerHelper::LaunchEvent( sal_Int16 nLngSvcEvtFlags )
 {
     linguistic2::LinguServiceEvent aEvt( xMyEvtObj, nLngSvcEvtFlags );
 
@@ -504,19 +506,19 @@ void LngSvcMgrListenerHelper::LaunchEvent( INT16 nLngSvcEvtFlags )
 }
 
 
-inline BOOL LngSvcMgrListenerHelper::AddLngSvcMgrListener(
+inline sal_Bool LngSvcMgrListenerHelper::AddLngSvcMgrListener(
         const uno::Reference< lang::XEventListener >& rxListener )
 {
     aLngSvcMgrListeners.addInterface( rxListener );
-    return TRUE;
+    return sal_True;
 }
 
 
-inline BOOL LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
+inline sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcMgrListener(
         const uno::Reference< lang::XEventListener >& rxListener )
 {
     aLngSvcMgrListeners.removeInterface( rxListener );
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -544,10 +546,10 @@ void LngSvcMgrListenerHelper::DisposeAndClear( const lang::EventObject &rEvtObj
 }
 
 
-BOOL LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         aLngSvcEvtBroadcasters.addInterface( rxBroadcaster );
@@ -558,10 +560,10 @@ BOOL LngSvcMgrListenerHelper::AddLngSvcEvtBroadcaster(
 }
 
 
-BOOL LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster(
         const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         aLngSvcEvtBroadcasters.removeInterface( rxBroadcaster );
@@ -579,7 +581,7 @@ LngSvcMgr::LngSvcMgr() :
     utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ),
     aEvtListeners	( GetLinguMutex() )
 {
-    bDisposing = FALSE;
+    bDisposing = sal_False;
 
     pSpellDsp	= 0;
     pGrammarDsp = 0;
@@ -602,6 +604,14 @@ LngSvcMgr::LngSvcMgr() :
     EnableNotification( aNames );
 }
 
+void LngSvcMgr::clearSvcInfoArray(SvcInfoArray* pInfo)
+{
+    if (pInfo)
+    {
+        std::for_each(pInfo->begin(), pInfo->end(), boost::checked_deleter<SvcInfo>());
+        delete pInfo;
+    }
+}
 
 LngSvcMgr::~LngSvcMgr()
 {
@@ -609,10 +619,10 @@ LngSvcMgr::~LngSvcMgr()
     // will be freed in the destructor of the respective Reference's
     // xSpellDsp, xGrammarDsp, xHyphDsp, xThesDsp
 
-    delete pAvailSpellSvcs;
-    delete pAvailGrammarSvcs;
-    delete pAvailHyphSvcs;
-    delete pAvailThesSvcs;
+    clearSvcInfoArray(pAvailSpellSvcs);
+    clearSvcInfoArray(pAvailGrammarSvcs);
+    clearSvcInfoArray(pAvailHyphSvcs);
+    clearSvcInfoArray(pAvailThesSvcs);
 }
 
 
@@ -649,7 +659,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
         if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-            delete pAvailSpellSvcs;		pAvailSpellSvcs = 0;
+            clearSvcInfoArray(pAvailSpellSvcs);		pAvailSpellSvcs = 0;
 
             OUString aNode( aSpellCheckerList );
             if (lcl_SeqHasString( aSpellCheckerListEntries, aKeyText ))
@@ -674,7 +684,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
         else if (0 == rName.compareTo( aGrammarCheckerList, aGrammarCheckerList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-            delete pAvailGrammarSvcs;      pAvailGrammarSvcs = 0;
+            clearSvcInfoArray(pAvailGrammarSvcs);      pAvailGrammarSvcs = 0;
 
             OUString aNode( aGrammarCheckerList );
             if (lcl_SeqHasString( aGrammarCheckerListEntries, aKeyText ))
@@ -702,7 +712,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
         else if (0 == rName.compareTo( aHyphenatorList, aHyphenatorList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-            delete pAvailHyphSvcs;		pAvailHyphSvcs = 0;
+            clearSvcInfoArray(pAvailHyphSvcs);		pAvailHyphSvcs = 0;
 
             OUString aNode( aHyphenatorList );
             if (lcl_SeqHasString( aHyphenatorListEntries, aKeyText ))
@@ -727,7 +737,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
         else if (0 == rName.compareTo( aThesaurusList, aThesaurusList.getLength() ))
         {
             // delete old cached data, needs to be acquired new on demand
-            delete pAvailThesSvcs;		pAvailThesSvcs = 0;
+            clearSvcInfoArray(pAvailThesSvcs);		pAvailThesSvcs = 0;
 
             OUString aNode( aThesaurusList );
             if (lcl_SeqHasString( aThesaurusListEntries, aKeyText ))
@@ -887,7 +897,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString 			aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -953,7 +963,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString            aImplName;
-                        uno::Sequence< INT16 >   aLanguages;
+                        uno::Sequence< sal_Int16 >   aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1018,7 +1028,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString 			aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1085,7 +1095,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl()
                     if (xSvc.is())
                     {
                         OUString 			aImplName;
-                        uno::Sequence< INT16 >    aLanguages;
+                        uno::Sequence< sal_Int16 >    aLanguages;
                         uno::Reference< XServiceInfo > xInfo( xSvc, uno::UNO_QUERY );
                         if (xInfo.is())
                             aImplName = xInfo->getImplementationName();
@@ -1114,7 +1124,7 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/SpellCheckerList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1130,13 +1140,13 @@ void LngSvcMgr::SetCfgServiceLists( SpellCheckerDispatcher &rSpellDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
             {
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1157,7 +1167,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/GrammarCheckerList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1173,7 +1183,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
@@ -1183,7 +1193,7 @@ void LngSvcMgr::SetCfgServiceLists( GrammarCheckingIterator &rGrammarDsp )
                     aSvcImplNames.realloc(1);
 
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1204,7 +1214,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/HyphenatorList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1220,7 +1230,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
@@ -1230,7 +1240,7 @@ void LngSvcMgr::SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp )
                     aSvcImplNames.realloc(1);
 
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1251,7 +1261,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
     String  aNode( String::CreateFromAscii( "ServiceManager/ThesaurusList" ) );
     uno::Sequence< OUString > aNames( /*aCfg.*/GetNodeNames( aNode ) );
     OUString *pNames = aNames.getArray();
-    INT32 nLen = aNames.getLength();
+    sal_Int32 nLen = aNames.getLength();
 
     // append path prefix need for 'GetProperties' call below
     String aPrefix( aNode );
@@ -1267,13 +1277,13 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
     if (nLen  &&  nLen == aValues.getLength())
     {
         const uno::Any *pValues = aValues.getConstArray();
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             if (pValues[i] >>= aSvcImplNames)
             {
 #if OSL_DEBUG_LEVEL > 1
-//                INT32 nSvcs = aSvcImplNames.getLength();
+//                sal_Int32 nSvcs = aSvcImplNames.getLength();
 //                const OUString *pSvcImplNames = aSvcImplNames.getConstArray();
 #endif
                 String aLocaleStr( pNames[i] );
@@ -1354,7 +1364,7 @@ sal_Bool SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (!bDisposing  &&  xListener.is())
     {
         if (!pListenerHelper)
@@ -1372,7 +1382,7 @@ sal_Bool SAL_CALL
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (!bDisposing  &&  xListener.is())
     {
         DBG_ASSERT( pListenerHelper, "listener removed without being added" );
@@ -1399,7 +1409,7 @@ uno::Sequence< OUString > SAL_CALL
     {
         // don't used cached data here (force re-evaluation in order to have downloaded dictionaries
         // already found without the need to restart the office
-        delete pAvailSpellSvcs;  pAvailSpellSvcs = 0;
+        clearSvcInfoArray(pAvailSpellSvcs);  pAvailSpellSvcs = 0;
         GetAvailableSpellSvcs_Impl();
         pInfoArray = pAvailSpellSvcs;
     }
@@ -1407,7 +1417,7 @@ uno::Sequence< OUString > SAL_CALL
     {
         // don't used cached data here (force re-evaluation in order to have downloaded dictionaries
         // already found without the need to restart the office
-        delete pAvailGrammarSvcs;  pAvailGrammarSvcs = 0;
+        clearSvcInfoArray(pAvailGrammarSvcs);  pAvailGrammarSvcs = 0;
         GetAvailableGrammarSvcs_Impl();
         pInfoArray = pAvailGrammarSvcs;
     }
@@ -1415,7 +1425,7 @@ uno::Sequence< OUString > SAL_CALL
     {
         // don't used cached data here (force re-evaluation in order to have downloaded dictionaries
         // already found without the need to restart the office
-        delete pAvailHyphSvcs;  pAvailHyphSvcs = 0;
+        clearSvcInfoArray(pAvailHyphSvcs);  pAvailHyphSvcs = 0;
         GetAvailableHyphSvcs_Impl();
         pInfoArray = pAvailHyphSvcs;
     }
@@ -1423,7 +1433,7 @@ uno::Sequence< OUString > SAL_CALL
     {
         // don't used cached data here (force re-evaluation in order to have downloaded dictionaries
         // already found without the need to restart the office
-        delete pAvailThesSvcs;  pAvailThesSvcs = 0;
+        clearSvcInfoArray(pAvailThesSvcs);  pAvailThesSvcs = 0;
         GetAvailableThesSvcs_Impl();
         pInfoArray = pAvailThesSvcs;
     }
@@ -1435,7 +1445,7 @@ uno::Sequence< OUString > SAL_CALL
         aRes.realloc( nMaxCnt );
         OUString *pImplName = aRes.getArray();
 
-        USHORT nCnt = 0;
+        sal_uInt16 nCnt = 0;
         LanguageType nLanguage = LocaleToLanguage( rLocale );
         for (size_t i = 0;  i < nMaxCnt;  ++i)
         {
@@ -1487,22 +1497,22 @@ uno::Sequence< lang::Locale > SAL_CALL
     return aRes;
 }
 
-static BOOL IsEqSvcList( const uno::Sequence< OUString > &rList1,
+static sal_Bool IsEqSvcList( const uno::Sequence< OUString > &rList1,
                         const uno::Sequence< OUString > &rList2 )
 {
-    // returns TRUE iff both sequences are equal
+    // returns sal_True iff both sequences are equal
 
-    BOOL bRes = FALSE;
-    INT32 nLen = rList1.getLength();
+    sal_Bool bRes = sal_False;
+    sal_Int32 nLen = rList1.getLength();
     if (rList2.getLength() == nLen)
     {
         const OUString *pStr1 = rList1.getConstArray();
         const OUString *pStr2 = rList2.getConstArray();
-        bRes = TRUE;
-        for (INT32 i = 0;  i < nLen  &&  bRes;  ++i)
+        bRes = sal_True;
+        for (sal_Int32 i = 0;  i < nLen  &&  bRes;  ++i)
         {
             if (*pStr1++ != *pStr2++)
-                bRes = FALSE;
+                bRes = sal_False;
         }
     }
     return bRes;
@@ -1531,7 +1541,7 @@ void SAL_CALL
         {
             if (!xSpellDsp.is())
                 GetSpellCheckerDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pSpellDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1548,7 +1558,7 @@ void SAL_CALL
         {
             if (!xGrammarDsp.is())
                 GetGrammarCheckerDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pGrammarDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1564,7 +1574,7 @@ void SAL_CALL
         {
             if (!xHyphDsp.is())
                 GetHyphenatorDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pHyphDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1580,7 +1590,7 @@ void SAL_CALL
         {
             if (!xThesDsp.is())
                 GetThesaurusDsp_Impl();
-            BOOL bChanged = !IsEqSvcList( rServiceImplNames,
+            sal_Bool bChanged = !IsEqSvcList( rServiceImplNames,
                                           pThesDsp->GetServiceList( rLocale ) );
             if (bChanged)
             {
@@ -1592,11 +1602,11 @@ void SAL_CALL
 }
 
 
-BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
+sal_Bool LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "linguistic: LngSvcMgr::SaveCfgSvcs" );
 
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
 
     LinguDispatcher *pDsp = 0;
     uno::Sequence< lang::Locale > aLocales;
@@ -1632,7 +1642,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
 
     if (pDsp  &&  aLocales.getLength())
     {
-        INT32 nLen = aLocales.getLength();
+        sal_Int32 nLen = aLocales.getLength();
         const lang::Locale *pLocale = aLocales.getConstArray();
 
         uno::Sequence< beans::PropertyValue > aValues( nLen );
@@ -1655,15 +1665,15 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
         }
         OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) );
 
-        for (INT32 i = 0;  i < nLen;  ++i)
+        for (sal_Int32 i = 0;  i < nLen;  ++i)
         {
             uno::Sequence< OUString > aSvcImplNames;
             aSvcImplNames = pDsp->GetServiceList( pLocale[i] );
 
 #if OSL_DEBUG_LEVEL > 1
-            INT32 nSvcs = aSvcImplNames.getLength();
+            sal_Int32 nSvcs = aSvcImplNames.getLength();
             const OUString *pSvcImplName = aSvcImplNames.getConstArray();
-            for (INT32 j = 0;  j < nSvcs;  ++j)
+            for (sal_Int32 j = 0;  j < nSvcs;  ++j)
             {
                 OUString aImplName( pSvcImplName[j] );
             }
@@ -1702,11 +1712,11 @@ static uno::Sequence< OUString > GetLangSvcList( const uno::Any &rVal )
     {
         rVal >>= aRes;
 #if OSL_DEBUG_LEVEL > 1
-        INT32 nSvcs = aRes.getLength();
+        sal_Int32 nSvcs = aRes.getLength();
         if (nSvcs)
         {
             const OUString *pSvcName = aRes.getConstArray();
-            for (INT32 j = 0;  j < nSvcs;  ++j)
+            for (sal_Int32 j = 0;  j < nSvcs;  ++j)
             {
                 OUString aImplName( pSvcName[j] );
                 DBG_ASSERT( aImplName.getLength(), "service impl-name missing" );
@@ -1848,7 +1858,7 @@ void SAL_CALL
 
     if (!bDisposing)
     {
-        bDisposing = TRUE;
+        bDisposing = sal_True;
 
         // require listeners to release this object
         lang::EventObject aEvtObj( (XLinguServiceManager *) this );
@@ -1888,10 +1898,10 @@ void SAL_CALL
 }
 
 
-BOOL LngSvcMgr::AddLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgr::AddLngSvcEvtBroadcaster(
             const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         if (!pListenerHelper)
@@ -1902,10 +1912,10 @@ BOOL LngSvcMgr::AddLngSvcEvtBroadcaster(
 }
 
 
-BOOL LngSvcMgr::RemoveLngSvcEvtBroadcaster(
+sal_Bool LngSvcMgr::RemoveLngSvcEvtBroadcaster(
             const uno::Reference< linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (rxBroadcaster.is())
     {
         DBG_ASSERT( pListenerHelper, "pListenerHelper non existent" );
@@ -1934,10 +1944,10 @@ sal_Bool SAL_CALL
 
     uno::Sequence< OUString > aSNL = getSupportedServiceNames();
     const OUString * pArray = aSNL.getConstArray();
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -1969,31 +1979,6 @@ uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance(
     return xService;
 }
 
-
-
-sal_Bool SAL_CALL LngSvcMgr_writeInfo(
-            void * /*pServiceManager*/,
-            registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += LngSvcMgr::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        uno::Reference< registry::XRegistryKey > xNewKey =
-            pRegistryKey->createKey( aImpl );
-        uno::Sequence< OUString > aServices = LngSvcMgr::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(uno::Exception &)
-    {
-        return sal_False;
-    }
-}
-
 void * SAL_CALL LngSvcMgr_getFactory(
             const sal_Char * pImplName,
             lang::XMultiServiceFactory * pServiceManager,
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1675b399c9..095efbf84a 100644..100755
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
 #include <unotools/configitem.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
 
 class SpellCheckerDispatcher;
@@ -111,7 +111,7 @@ class LngSvcMgr :
     SvcInfoArray *										pAvailHyphSvcs;
     SvcInfoArray *										pAvailThesSvcs;
     
-    BOOL bDisposing;
+    sal_Bool bDisposing;
 
     // disallow copy-constructor and assignment-operator for now
     LngSvcMgr(const LngSvcMgr &);
@@ -133,11 +133,13 @@ class LngSvcMgr :
     void	SetCfgServiceLists( HyphenatorDispatcher &rHyphDsp );
     void	SetCfgServiceLists( ThesaurusDispatcher &rThesDsp );
     
-    BOOL	SaveCfgSvcs( const String &rServiceName );
+    sal_Bool	SaveCfgSvcs( const String &rServiceName );
 
     void    SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
                     const SvcInfoArray &rAvailSvcs );
 
+    static void clearSvcInfoArray(SvcInfoArray *pInfo);
+
     // utl::ConfigItem (to allow for listening of changes of relevant properties)
     virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
     virtual void    Commit();
@@ -173,10 +175,10 @@ public:
     static inline ::rtl::OUString   getImplementationName_Static();
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw();
 
-    BOOL	AddLngSvcEvtBroadcaster( 
+    sal_Bool	AddLngSvcEvtBroadcaster( 
                 const ::com::sun::star::uno::Reference< 
                     ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
-    BOOL	RemoveLngSvcEvtBroadcaster( 
+    sal_Bool	RemoveLngSvcEvtBroadcaster( 
                 const ::com::sun::star::uno::Reference< 
                     ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster > &rxBroadcaster );
 };
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index da6277db15..c699854058 100644..100755
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -29,7 +29,7 @@ PRJ=..
 
 PRJNAME=linguistic
 TARGET=lng
-ENABLE_EXCEPTIONS=TRUE
+ENABLE_EXCEPTIONS=sal_True
 
 #----- Settings ---------------------------------------------------------
 
@@ -88,9 +88,8 @@ DEF1DES     =Linguistic main DLL
 
 
 .IF "$(GUI)"=="WNT"
-DEF1EXPORT1 = component_writeInfo
-DEF1EXPORT2 = component_getFactory
-DEF1EXPORT3 = component_getImplementationEnvironment
+DEF1EXPORT1 = component_getFactory
+DEF1EXPORT2 = component_getImplementationEnvironment
 .ENDIF
 
 # --- Targets ------------------------------------------------------
@@ -105,3 +104,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo component >> $@
     @echo __CT >> $@
 
+
+ALLTAR : $(MISC)/lng.component
+
+$(MISC)/lng.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        lng.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt lng.component
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 088885360a..05e2dc5958 100644..100755
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -55,10 +55,10 @@
 
 #include <rtl/instance.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "defs.hxx"
-#include "lngprops.hxx"
-#include "hyphdta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/hyphdta.hxx"
 #include <i18npool/mslangid.hxx>
 
 using namespace utl;
@@ -89,7 +89,7 @@ osl::Mutex &	GetLinguMutex()
 
 ///////////////////////////////////////////////////////////////////////////
 
-LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang )
+LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang )
 {
     static LocaleDataWrapper aLclDtaWrp(
                 getProcessServiceFactory(),
@@ -109,10 +109,10 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang )
 /**
     returns text-encoding used for ByteString unicode String conversion
  */
-rtl_TextEncoding GetTextEncoding( INT16 nLanguage )
+rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage )
 {
     DBG_ASSERT( nLanguage != LANGUAGE_NONE, "invalid language argument" );
-    static INT16 nLastLanguage = LANGUAGE_NONE;
+    static sal_Int16 nLastLanguage = LANGUAGE_NONE;
 
     // set default value for unknown languages
     static rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW;
@@ -268,14 +268,14 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 )
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL IsUseDicList( const PropertyValues &rProperties,
+sal_Bool IsUseDicList( const PropertyValues &rProperties,
         const uno::Reference< XPropertySet > &rxProp )
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
-    INT32 nLen = rProperties.getLength();
+    sal_Int32 nLen = rProperties.getLength();
     const PropertyValue *pVal = rProperties.getConstArray();
-    INT32 i;
+    sal_Int32 i;
 
     for ( i = 0;  i < nLen;  ++i)
     {
@@ -296,14 +296,14 @@ BOOL IsUseDicList( const PropertyValues &rProperties,
 }
 
 
-BOOL IsIgnoreControlChars( const PropertyValues &rProperties,
+sal_Bool IsIgnoreControlChars( const PropertyValues &rProperties,
         const uno::Reference< XPropertySet > &rxProp )
 {
-    BOOL bRes = TRUE;
+    sal_Bool bRes = sal_True;
 
-    INT32 nLen = rProperties.getLength();
+    sal_Int32 nLen = rProperties.getLength();
     const PropertyValue *pVal = rProperties.getConstArray();
-    INT32 i;
+    sal_Int32 i;
 
     for ( i = 0;  i < nLen;  ++i)
     {
@@ -324,9 +324,9 @@ BOOL IsIgnoreControlChars( const PropertyValues &rProperties,
 }
 
 
-static BOOL lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
+static sal_Bool lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     if (xEntry.is())
     {
         // there has to be (at least one) '=' denoting a hyphenation position
@@ -340,8 +340,8 @@ static BOOL lcl_HasHyphInfo( const uno::Reference<XDictionaryEntry> &xEntry )
 
 uno::Reference< XDictionaryEntry > SearchDicList(
         const uno::Reference< XDictionaryList > &xDicList,
-        const OUString &rWord, INT16 nLanguage,
-        BOOL bSearchPosDics, BOOL bSearchSpellEntry )
+        const OUString &rWord, sal_Int16 nLanguage,
+        sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
@@ -354,15 +354,15 @@ uno::Reference< XDictionaryEntry > SearchDicList(
             aDics( xDicList->getDictionaries() );
     const uno::Reference< XDictionary >
             *pDic = aDics.getConstArray();
-    INT32 nDics = xDicList->getCount();
+    sal_Int32 nDics = xDicList->getCount();
 
-    INT32 i;
+    sal_Int32 i;
     for (i = 0;  i < nDics;  i++)
     {
         uno::Reference< XDictionary > axDic( pDic[i], UNO_QUERY );
 
         DictionaryType	eType = axDic->getDictionaryType();
-        INT16			nLang = LocaleToLanguage( axDic->getLocale() );
+        sal_Int16			nLang = LocaleToLanguage( axDic->getLocale() );
 
         if ( axDic.is() && axDic->isActive()
             && (nLang == nLanguage  ||  nLang == LANGUAGE_NONE) )
@@ -396,8 +396,8 @@ sal_Bool SaveDictionaries( const uno::Reference< XDictionaryList > &xDicList )
 
     Sequence< uno::Reference< XDictionary >  > aDics( xDicList->getDictionaries() );
     const uno::Reference< XDictionary >  *pDic = aDics.getConstArray();
-    INT32 nCount = aDics.getLength();
-    for (INT32 i = 0;  i < nCount;  i++)
+    sal_Int32 nCount = aDics.getLength();
+    for (sal_Int32 i = 0;  i < nCount;  i++)
     {
         try
         {
@@ -488,14 +488,14 @@ Locale CreateLocale( LanguageType eLang )
     return aLocale;
 }
 
-uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< INT16 > &rLangSeq )
+uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< sal_Int16 > &rLangSeq )
 {
-    const INT16 *pLang = rLangSeq.getConstArray();
-    INT32 nCount = rLangSeq.getLength();
+    const sal_Int16 *pLang = rLangSeq.getConstArray();
+    sal_Int32 nCount = rLangSeq.getLength();
 
     uno::Sequence< Locale > aLocales( nCount );
     Locale *pLocale = aLocales.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         LanguageToLocale( pLocale[i], pLang[ i ] );
     }
@@ -503,15 +503,15 @@ uno::Sequence< Locale > LangSeqToLocaleSeq( const uno::Sequence< INT16 > &rLangS
     return aLocales;
 }
 
-uno::Sequence< INT16 >
+uno::Sequence< sal_Int16 >
     LocaleSeqToLangSeq( uno::Sequence< Locale > &rLocaleSeq )
 {
     const Locale *pLocale = rLocaleSeq.getConstArray();
-    INT32 nCount = rLocaleSeq.getLength();
+    sal_Int32 nCount = rLocaleSeq.getLength();
 
-    uno::Sequence< INT16 >   aLangs( nCount );
-    INT16 *pLang = aLangs.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    uno::Sequence< sal_Int16 >   aLangs( nCount );
+    sal_Int16 *pLang = aLangs.getArray();
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         pLang[i] = LocaleToLanguage( pLocale[i] );
     }
@@ -521,10 +521,10 @@ uno::Sequence< INT16 >
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
+sal_Bool    IsReadOnly( const String &rURL, sal_Bool *pbExist )
 {
-    BOOL bRes = FALSE;
-    BOOL bExists = FALSE;
+    sal_Bool bRes = sal_False;
+    sal_Bool bExists = sal_False;
 
     if (rURL.Len() > 0)
     {
@@ -542,7 +542,7 @@ BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
         }
         catch (Exception &)
         {
-            bRes = TRUE;
+            bRes = sal_True;
         }
     }
 
@@ -554,16 +554,16 @@ BOOL    IsReadOnly( const String &rURL, BOOL *pbExist )
 ///////////////////////////////////////////////////////////////////////////
 
 
-static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
+static sal_Bool GetAltSpelling( sal_Int16 &rnChgPos, sal_Int16 &rnChgLen, OUString &rRplc,
         uno::Reference< XHyphenatedWord > &rxHyphWord )
 {
-    BOOL bRes = rxHyphWord->isAlternativeSpelling();
+    sal_Bool bRes = rxHyphWord->isAlternativeSpelling();
     if (bRes)
     {
         OUString aWord( rxHyphWord->getWord() ),
                  aHyphenatedWord( rxHyphWord->getHyphenatedWord() );
-        INT16   nHyphenationPos     = rxHyphWord->getHyphenationPos();
-        /*INT16   nHyphenPos          = rxHyphWord->getHyphenPos()*/;
+        sal_Int16   nHyphenationPos     = rxHyphWord->getHyphenationPos();
+        /*sal_Int16   nHyphenPos          = rxHyphWord->getHyphenPos()*/;
         const sal_Unicode *pWord	= aWord.getStr(),
                           *pAltWord = aHyphenatedWord.getStr();
 
@@ -577,7 +577,7 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
         // find first different char from left
         sal_Int32	nPosL    = 0,
                     nAltPosL = 0;
-        for (INT16 i = 0 ;  pWord[ nPosL ] == pAltWord[ nAltPosL ];  nPosL++, nAltPosL++, i++)
+        for (sal_Int16 i = 0 ;  pWord[ nPosL ] == pAltWord[ nAltPosL ];  nPosL++, nAltPosL++, i++)
         {
             // restrict changes area beginning to the right to
             // the char immediately following the hyphen.
@@ -595,8 +595,8 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
                 nPosR--, nAltPosR--)
             ;
 
-        rnChgPos = sal::static_int_cast< INT16 >(nPosL);
-        rnChgLen = sal::static_int_cast< INT16 >(nPosR - nPosL + 1);
+        rnChgPos = sal::static_int_cast< sal_Int16 >(nPosL);
+        rnChgLen = sal::static_int_cast< sal_Int16 >(nPosR - nPosL + 1);
         DBG_ASSERT( rnChgLen >= 0, "nChgLen < 0");
 
         sal_Int32 nTxtStart = nPosL;
@@ -607,32 +607,32 @@ static BOOL GetAltSpelling( INT16 &rnChgPos, INT16 &rnChgLen, OUString &rRplc,
 }
 
 
-static INT16 GetOrigWordPos( const OUString &rOrigWord, INT16 nPos )
+static sal_Int16 GetOrigWordPos( const OUString &rOrigWord, sal_Int16 nPos )
 {
-    INT32 nLen = rOrigWord.getLength();
-    INT32 i = -1;
+    sal_Int32 nLen = rOrigWord.getLength();
+    sal_Int32 i = -1;
     while (nPos >= 0  &&  i++ < nLen)
     {
         sal_Unicode cChar = rOrigWord[i];
-        BOOL bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
+        sal_Bool bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
         if (!bSkip)
             --nPos;
     }
-    return sal::static_int_cast< INT16 >((0 <= i  &&  i < nLen) ? i : -1);
+    return sal::static_int_cast< sal_Int16 >((0 <= i  &&  i < nLen) ? i : -1);
 }
 
 
-INT32 GetPosInWordToCheck( const OUString &rTxt, INT32 nPos )
+sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos )
 {
-    INT32 nRes = -1;
-    INT32 nLen = rTxt.getLength();
+    sal_Int32 nRes = -1;
+    sal_Int32 nLen = rTxt.getLength();
     if (0 <= nPos  &&  nPos < nLen)
     {
         nRes = 0;
-        for (INT32 i = 0;  i < nPos;  ++i)
+        for (sal_Int32 i = 0;  i < nPos;  ++i)
         {
             sal_Unicode cChar = rTxt[i];
-            BOOL bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
+            sal_Bool bSkip = IsHyphen( cChar ) || IsControlChar( cChar );
             if (!bSkip)
                 ++nRes;
         }
@@ -648,17 +648,17 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
     uno::Reference< XHyphenatedWord > xRes;
     if (rOrigWord.getLength() && rxHyphWord.is())
     {
-        INT16 	 nChgPos = 0,
+        sal_Int16 	 nChgPos = 0,
                  nChgLen = 0;
         OUString aRplc;
-        BOOL bAltSpelling = GetAltSpelling( nChgPos, nChgLen, aRplc, rxHyphWord );
+        sal_Bool bAltSpelling = GetAltSpelling( nChgPos, nChgLen, aRplc, rxHyphWord );
 #if OSL_DEBUG_LEVEL > 1
         OUString aWord( rxHyphWord->getWord() );
 #endif
 
         OUString aOrigHyphenatedWord;
-        INT16 nOrigHyphenPos        = -1;
-        INT16 nOrigHyphenationPos   = -1;
+        sal_Int16 nOrigHyphenPos        = -1;
+        sal_Int16 nOrigHyphenationPos   = -1;
         if (!bAltSpelling)
         {
             aOrigHyphenatedWord = rOrigWord;
@@ -671,10 +671,10 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
             //! B�-c-k-er and Sc-hif-fah-rt
 
             OUString aLeft, aRight;
-            INT16 nPos = GetOrigWordPos( rOrigWord, nChgPos );
+            sal_Int16 nPos = GetOrigWordPos( rOrigWord, nChgPos );
 
             // get words like Sc-hif-fah-rt to work correct
-            INT16 nHyphenationPos = rxHyphWord->getHyphenationPos();
+            sal_Int16 nHyphenationPos = rxHyphWord->getHyphenationPos();
             if (nChgPos > nHyphenationPos)
                 --nPos;
 
@@ -685,7 +685,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
             aOrigHyphenatedWord += aRplc;
             aOrigHyphenatedWord += aRight;
 
-            nOrigHyphenPos      = sal::static_int_cast< INT16 >(aLeft.getLength() +
+            nOrigHyphenPos      = sal::static_int_cast< sal_Int16 >(aLeft.getLength() +
                                   rxHyphWord->getHyphenPos() - nChgPos);
             nOrigHyphenationPos = GetOrigWordPos( rOrigWord, nHyphenationPos );
         }
@@ -696,7 +696,7 @@ uno::Reference< XHyphenatedWord > RebuildHyphensAndControlChars(
         }
         else
         {
-            INT16 nLang = LocaleToLanguage( rxHyphWord->getLocale() );
+            sal_Int16 nLang = LocaleToLanguage( rxHyphWord->getLocale() );
             xRes = new HyphenatedWord(
                         rOrigWord, nLang, nOrigHyphenationPos,
                         aOrigHyphenatedWord, nOrigHyphenPos );
@@ -724,7 +724,7 @@ osl::Mutex & lcl_GetCharClassMutex()
 }
 
 
-BOOL IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage )
+sal_Bool IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -736,7 +736,7 @@ BOOL IsUpper( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLang
 }
 
 
-BOOL IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLanguage )
+sal_Bool IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -748,7 +748,7 @@ BOOL IsLower( const String &rText, xub_StrLen nPos, xub_StrLen nLen, INT16 nLang
 }
 
 
-String ToLower( const String &rText, INT16 nLanguage )
+String ToLower( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -758,7 +758,7 @@ String ToLower( const String &rText, INT16 nLanguage )
 }
 
 
-String ToUpper( const String &rText, INT16 nLanguage )
+String ToUpper( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -768,7 +768,7 @@ String ToUpper( const String &rText, INT16 nLanguage )
 }
 
 
-String ToTitle( const String &rText, INT16 nLanguage )
+String ToTitle( const String &rText, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -778,7 +778,7 @@ String ToTitle( const String &rText, INT16 nLanguage )
 }
 
 
-sal_Unicode	ToLower( const sal_Unicode cChar, INT16 nLanguage )
+sal_Unicode	ToLower( const sal_Unicode cChar, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -788,7 +788,7 @@ sal_Unicode	ToLower( const sal_Unicode cChar, INT16 nLanguage )
 }
 
 
-sal_Unicode	ToUpper( const sal_Unicode cChar, INT16 nLanguage )
+sal_Unicode	ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage )
 {
     MutexGuard  aGuard( lcl_GetCharClassMutex() );
 
@@ -836,7 +836,7 @@ static const sal_uInt32 the_aDigitZeroes [] =
     0x0001D7CE  //1D7FF   ; Decimal # Nd  [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE
 };
 
-BOOL HasDigits( const OUString &rText )
+sal_Bool HasDigits( const OUString &rText )
 {
     static const int nNumDigitZeroes = SAL_N_ELEMENTS(the_aDigitZeroes);
     const sal_Int32 nLen = rText.getLength();
@@ -851,27 +851,27 @@ BOOL HasDigits( const OUString &rText )
             if (nDigitZero > nCodePoint)
                 break;
             if (/*nDigitZero <= nCodePoint &&*/ nCodePoint <= nDigitZero + 9)
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL IsNumeric( const String &rText )
+sal_Bool IsNumeric( const String &rText )
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     xub_StrLen nLen = rText.Len();
     if (nLen)
     {
-        bRes = TRUE;
+        bRes = sal_True;
         xub_StrLen i = 0;
         while (i < nLen)
         {
             sal_Unicode cChar = rText.GetChar( i++ );
             if ( !((sal_Unicode)'0' <= cChar  &&  cChar <= (sal_Unicode)'9') )
             {
-                bRes = FALSE;
+                bRes = sal_False;
                 break;
             }
         }
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index c3529110d7..550ac9db0a 100644..100755
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 using namespace com::sun::star;
 
@@ -54,9 +54,9 @@ namespace linguistic
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL FileExists( const String &rMainURL )
+sal_Bool FileExists( const String &rMainURL )
 {
-    BOOL bExists = FALSE;
+    sal_Bool bExists = sal_False;
     if (rMainURL.Len())
     {
         try
@@ -187,7 +187,10 @@ String  GetWritableDictionaryURL( const String &rDicName )
     aURLObj.Append( rDicName, INetURLObject::ENCODE_ALL );
     DBG_ASSERT(!aURLObj.HasError(), "lng : invalid URL");
 
-    return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
+    // NO_DECODE preserves the escape sequences that might be included in aDirName 
+    // depending on the characters used in the path string. (Needed when comparing
+    // the dictionary URL with GetDictionaryWriteablePath in DicList::createDictionary.)
+    return aURLObj.GetMainURL( INetURLObject::NO_DECODE );
 }
 
 
@@ -203,11 +206,11 @@ String SearchFileInPaths(
     const sal_Int32 nPaths = rPaths.getLength();
     for (sal_Int32 k = 0;  k < nPaths;  ++k)
     {
-        BOOL bIsURL = TRUE;
+        sal_Bool bIsURL = sal_True;
         INetURLObject aObj( rPaths[k] );
         if ( aObj.HasError() )
         {
-            bIsURL = FALSE;
+            bIsURL = sal_False;
             String aURL;
             if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( rPaths[k], aURL ) )
                 aObj.SetURL( aURL );
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index cd7e622bd4..b509daa87d 100644..100755
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -44,9 +44,9 @@
 #include <vector>
 
 #include "spelldsp.hxx"
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 
 using namespace utl;
@@ -73,7 +73,7 @@ class ProposalList
 {
     std::vector< OUString > aVec;
 
-    BOOL    HasEntry( const OUString &rText ) const;
+    sal_Bool    HasEntry( const OUString &rText ) const;
 
     // make copy c-tor and assignment operator private
     ProposalList( const ProposalList & );
@@ -93,14 +93,14 @@ public:
 };
 
 
-BOOL ProposalList::HasEntry( const OUString &rText ) const
+sal_Bool ProposalList::HasEntry( const OUString &rText ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     size_t nCnt = aVec.size();
     for (size_t i = 0;  !bFound && i < nCnt;  ++i)
     {
         if (aVec[i] == rText)
-            bFound = TRUE;
+            bFound = sal_True;
     }
     return bFound;
 }
@@ -130,9 +130,9 @@ void ProposalList::Append( const std::vector< OUString > &rNew )
 
 void ProposalList::Append( const Sequence< OUString > &rNew )
 {
-    INT32 nLen = rNew.getLength();
+    sal_Int32 nLen = rNew.getLength();
     const OUString *pNew = rNew.getConstArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const OUString &rText = pNew[i];
         if (!HasEntry( rText ))
@@ -156,12 +156,12 @@ size_t ProposalList::Count() const
  
 Sequence< OUString > ProposalList::GetSequence() const
 {
-    INT32 nCount = Count();
-    INT32 nIdx = 0;
+    sal_Int32 nCount = Count();
+    sal_Int32 nIdx = 0;
     Sequence< OUString > aRes( nCount );
     OUString *pRes = aRes.getArray();
-    INT32 nLen = aVec.size();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    sal_Int32 nLen = aVec.size();
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         const OUString &rText = aVec[i];
         DBG_ASSERT( nIdx < nCount, "index our of range" );
@@ -188,16 +188,16 @@ void ProposalList::Remove( const OUString &rText )
 
 ///////////////////////////////////////////////////////////////////////////
 
-BOOL SvcListHasLanguage( 
+sal_Bool SvcListHasLanguage( 
         const LangSvcEntries_Spell &rEntry, 
         LanguageType nLanguage )
 {
-    BOOL bHasLanguage = FALSE;
+    sal_Bool bHasLanguage = sal_False;
     Locale aTmpLocale;
     
     const Reference< XSpellChecker >  *pRef  = rEntry.aSvcRefs .getConstArray();
     sal_Int32 nLen = rEntry.aSvcRefs.getLength();
-    for (INT32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
+    for (sal_Int32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
     {
         if (pRef[k].is())
         {
@@ -266,7 +266,7 @@ sal_Bool SAL_CALL
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
-    return isValid_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
+    return isValid_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, sal_True );
 }
 
 
@@ -276,7 +276,7 @@ Reference< XSpellAlternatives > SAL_CALL
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
-    return spell_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, TRUE );
+    return spell_Impl( rWord, LocaleToLanguage( rLocale ), rProperties, sal_True );
 }
 
 
@@ -298,13 +298,13 @@ static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
     {
         Reference< XDictionaryList > xDList( GetDictionaryList() );
         Reference< XDictionaryEntry > xNegEntry( SearchDicList( xDList,
-                rWord, nLanguage, FALSE, TRUE ) );
+                rWord, nLanguage, sal_False, sal_True ) );
         if (xNegEntry.is())
             xRes = xNegEntry;
         else
         {
             Reference< XDictionaryEntry > xPosEntry( SearchDicList( xDList,
-                    rWord, nLanguage, TRUE, TRUE ) );
+                    rWord, nLanguage, sal_True, sal_True ) );
             if (xPosEntry.is())
                 xRes = xPosEntry;
         }
@@ -314,16 +314,16 @@ static Reference< XDictionaryEntry > lcl_GetRulingDictionaryEntry(
 }
 
 
-BOOL SpellCheckerDispatcher::isValid_Impl(
+sal_Bool SpellCheckerDispatcher::isValid_Impl(
             const OUString& rWord, 
             LanguageType nLanguage, 
             const PropertyValues& rProperties,
-            BOOL bCheckDics) 
+            sal_Bool bCheckDics) 
         throw( RuntimeException, IllegalArgumentException )
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    BOOL bRes =	TRUE;
+    sal_Bool bRes =	sal_True;
     
     if (nLanguage == LANGUAGE_NONE  || !rWord.getLength())
         return bRes;
@@ -353,24 +353,24 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(), 
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen, 
                 "lng : index out of range");
 
-        INT32 i = 0;
-        BOOL bTmpRes = TRUE;
-        BOOL bTmpResValid = FALSE;
+        sal_Int32 i = 0;
+        sal_Bool bTmpRes = sal_True;
+        sal_Bool bTmpResValid = sal_False;
 
         // try already instantiated services first
         {
             const Reference< XSpellChecker >  *pRef  = 
                     pEntry->aSvcRefs.getConstArray();
             while (i <= pEntry->nLastTriedSvcIndex
-                   &&  (!bTmpResValid  ||  FALSE == bTmpRes))
+                   &&  (!bTmpResValid  ||  sal_False == bTmpRes))
             {
-                bTmpResValid = TRUE;
+                bTmpResValid = sal_True;
                 if (pRef[i].is()  &&  pRef[i]->hasLocale( aLocale ))
                 {
                     bTmpRes = GetCache().CheckWord( aChkWord, nLanguage );
@@ -386,7 +386,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                     }
                 }
                 else
-                    bTmpResValid = FALSE;
+                    bTmpResValid = sal_False;
 
                 if (bTmpResValid)
                     bRes = bTmpRes;
@@ -396,7 +396,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
         }
         
         // if still no result instantiate new services and try those
-        if ((!bTmpResValid  ||  FALSE == bTmpRes)
+        if ((!bTmpResValid  ||  sal_False == bTmpRes)
             &&  pEntry->nLastTriedSvcIndex < nLen - 1)
         {
             const OUString *pImplNames = pEntry->aSvcImplNames.getConstArray();
@@ -412,7 +412,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                 //! thus the service needs not to now about it
                 //aArgs.getArray()[1] <<= GetDicList();
 
-                while (i < nLen  &&  (!bTmpResValid  ||  FALSE == bTmpRes))
+                while (i < nLen  &&  (!bTmpResValid  ||  sal_False == bTmpRes))
                 {
                     // create specific service via it's implementation name
                     Reference< XSpellChecker > xSpell;
@@ -433,7 +433,7 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                     if (xBroadcaster.is())
                         rMgr.AddLngSvcEvtBroadcaster( xBroadcaster );
                     
-                    bTmpResValid = TRUE;			   
+                    bTmpResValid = sal_True;			   
                     if (xSpell.is()  &&  xSpell->hasLocale( aLocale ))
                     {
                         bTmpRes = GetCache().CheckWord( aChkWord, nLanguage );
@@ -449,12 +449,12 @@ BOOL SpellCheckerDispatcher::isValid_Impl(
                         }
                     }
                     else
-                        bTmpResValid = FALSE;
+                        bTmpResValid = sal_False;
                 
                     if (bTmpResValid)
                         bRes = bTmpRes;
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
                 
@@ -486,7 +486,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             const OUString& rWord, 
             LanguageType nLanguage,
             const PropertyValues& rProperties,
-            BOOL bCheckDics ) 
+            sal_Bool bCheckDics ) 
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -521,15 +521,15 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(), 
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen, 
                 "lng : index out of range");
 
-        INT32 i = 0;
+        sal_Int32 i = 0;
         Reference< XSpellAlternatives > xTmpRes;
-        BOOL bTmpResValid = FALSE;
+        sal_Bool bTmpResValid = sal_False;
 
         // try already instantiated services first
         {
@@ -538,10 +538,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             while (i <= pEntry->nLastTriedSvcIndex
                    &&  (!bTmpResValid || xTmpRes.is()) )
             {
-                bTmpResValid = TRUE;
+                bTmpResValid = sal_True;
                 if (pRef[i].is()  &&  pRef[i]->hasLocale( aLocale ))
                 {
-                    BOOL bOK = GetCache().CheckWord( aChkWord, nLanguage );
+                    sal_Bool bOK = GetCache().CheckWord( aChkWord, nLanguage );
                     if (bOK)
                         xTmpRes = NULL;
                     else
@@ -556,7 +556,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                     }
                 }
                 else
-                    bTmpResValid = FALSE;
+                    bTmpResValid = sal_False;
 
                 // return first found result if the word is not known by any checker.
                 // But if that result has no suggestions use the first one that does 
@@ -620,10 +620,10 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                     if (xBroadcaster.is())
                         rMgr.AddLngSvcEvtBroadcaster( xBroadcaster );
                     
-                    bTmpResValid = TRUE;			   
+                    bTmpResValid = sal_True;			   
                     if (xSpell.is()  &&  xSpell->hasLocale( aLocale ))
                     {
-                        BOOL bOK = GetCache().CheckWord( aChkWord, nLanguage );
+                        sal_Bool bOK = GetCache().CheckWord( aChkWord, nLanguage );
                         if (bOK)
                             xTmpRes = NULL;
                         else
@@ -638,7 +638,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                         }
                     }
                     else
-                        bTmpResValid = FALSE;
+                        bTmpResValid = sal_False;
                 
                     // return first found result if the word is not known by any checker.
                     // But if that result has no suggestions use the first one that does 
@@ -659,7 +659,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
                         nNumSugestions = nTmpNumSugestions;
                     }    
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
 
@@ -682,7 +682,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
         // neagtive dictionaries)
         ProposalList aProposalList;
 //        Sequence< OUString > aProposals;
-        INT16 eFailureType = -1;	// no failure
+        sal_Int16 eFailureType = -1;	// no failure
         if (xRes.is())
         {
             aProposalList.Append( xRes->getAlternatives() );
@@ -708,7 +708,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
 
                     // replacement text must not be in negative dictionary itself
                     if (aAddRplcTxt.getLength() &&
-                        !SearchDicList( xDList, aAddRplcTxt, nLanguage, FALSE, TRUE ).is())
+                        !SearchDicList( xDList, aAddRplcTxt, nLanguage, sal_False, sal_True ).is())
                     {
                         aProposalList.Prepend( aAddRplcTxt );
                     }
@@ -766,7 +766,7 @@ throw (uno::RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     uno::Sequence< Locale > aTmp( getLocales() );
-    uno::Sequence< INT16 > aRes( LocaleSeqToLangSeq( aTmp ) );
+    uno::Sequence< sal_Int16 > aRes( LocaleSeqToLangSeq( aTmp ) );
     return aRes;
 }
 
@@ -813,9 +813,9 @@ void SpellCheckerDispatcher::SetServiceList( const Locale &rLocale,
     if (pCache)
         pCache->Flush();    // new services may spell differently...
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -847,7 +847,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
     
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     SpellCheckerDispatcher          *pThis = (SpellCheckerDispatcher *) this;
     const SpellSvcByLangMap_t::iterator aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Spell      *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index c8194f89cd..24d85f4545 100644..100755
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -30,7 +30,7 @@
 #define _LINGUISTIC_SPELLDSP_HXX_
 
 #include "lngopt.hxx"
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "iprcache.hxx"
 
 #include <uno/lbnames.h>			// CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
@@ -91,16 +91,16 @@ class SpellCheckerDispatcher :
 
     void	ClearSvcList();
 
-    BOOL    isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
+    sal_Bool    isValid_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
                     const ::com::sun::star::beans::PropertyValues& aProperties,
-                    BOOL bCheckDics)
+                    sal_Bool bCheckDics)
                 throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellAlternatives >
             spell_Impl(const ::rtl::OUString& aWord, LanguageType nLanguage,
                     const ::com::sun::star::beans::PropertyValues& aProperties,
-                    BOOL bCheckDics)
+                    sal_Bool bCheckDics)
                 throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
 
 public:
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index adfc4f1bd6..b9e82640f3 100644..100755
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -38,7 +38,7 @@
 
 #include <vector>
 
-#include "spelldta.hxx"
+#include "linguistic/spelldta.hxx"
 #include "lngsvcmgr.hxx"
 
 
@@ -72,23 +72,23 @@ Reference< XSpellAlternatives > MergeProposals(
         xMerged = rxAlt1;
     else
     {
-        INT32 nAltCount1 = rxAlt1->getAlternativesCount();
+        sal_Int32 nAltCount1 = rxAlt1->getAlternativesCount();
         Sequence< OUString > aAlt1( rxAlt1->getAlternatives() );
         const OUString *pAlt1 = aAlt1.getConstArray();
 
-        INT32 nAltCount2 = rxAlt2->getAlternativesCount();
+        sal_Int32 nAltCount2 = rxAlt2->getAlternativesCount();
         Sequence< OUString > aAlt2( rxAlt2->getAlternatives() );
         const OUString *pAlt2 = aAlt2.getConstArray();
 
-        INT32 nCountNew = Min( nAltCount1 + nAltCount2, (INT32) MAX_PROPOSALS );
+        sal_Int32 nCountNew = Min( nAltCount1 + nAltCount2, (sal_Int32) MAX_PROPOSALS );
         Sequence< OUString > aAltNew( nCountNew );
         OUString *pAltNew = aAltNew.getArray();
 
-        INT32 nIndex = 0;
-        INT32 i = 0;
+        sal_Int32 nIndex = 0;
+        sal_Int32 i = 0;
         for (int j = 0;  j < 2;  j++)
         {
-            INT32 			nCount 	= j == 0 ? nAltCount1 : nAltCount2;
+            sal_Int32 			nCount 	= j == 0 ? nAltCount1 : nAltCount2;
             const OUString  *pAlt 	= j == 0 ? pAlt1 : pAlt2;
             for (i = 0;  i < nCount  &&  nIndex < MAX_PROPOSALS;  i++)
             {
@@ -110,23 +110,23 @@ Reference< XSpellAlternatives > MergeProposals(
 }
 
 
-BOOL SeqHasEntry( 
+sal_Bool SeqHasEntry( 
         const Sequence< OUString > &rSeq, 
         const OUString &rTxt)
 {
-    BOOL bRes = FALSE;
-    INT32 nLen = rSeq.getLength();
+    sal_Bool bRes = sal_False;
+    sal_Int32 nLen = rSeq.getLength();
     const OUString *pEntry = rSeq.getConstArray();
-    for (INT32 i = 0;  i < nLen  &&  !bRes;  ++i)
+    for (sal_Int32 i = 0;  i < nLen  &&  !bRes;  ++i)
     {
         if (rTxt == pEntry[i])
-            bRes = TRUE;
+            bRes = sal_True;
     }
     return bRes;
 }
 
 
-void SearchSimilarText( const OUString &rText, INT16 nLanguage, 
+void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage, 
         Reference< XDictionaryList > &xDicList,
         std::vector< OUString > & rDicListProps )
 {
@@ -137,13 +137,13 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
             aDics( xDicList->getDictionaries() );
     const Reference< XDictionary >
             *pDic = aDics.getConstArray();
-    INT32 nDics = xDicList->getCount();
+    sal_Int32 nDics = xDicList->getCount();
 
-    for (INT32 i = 0;  i < nDics;  i++)
+    for (sal_Int32 i = 0;  i < nDics;  i++)
     {
         Reference< XDictionary > xDic( pDic[i], UNO_QUERY );
 
-        INT16           nLang = LocaleToLanguage( xDic->getLocale() );
+        sal_Int16           nLang = LocaleToLanguage( xDic->getLocale() );
 
         if ( xDic.is() && xDic->isActive()
             && (nLang == nLanguage  ||  nLang == LANGUAGE_NONE) )
@@ -155,8 +155,8 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
 #endif
             const Sequence< Reference< XDictionaryEntry > > aEntries = xDic->getEntries();
             const Reference< XDictionaryEntry > *pEntries = aEntries.getConstArray();
-            INT32 nLen = aEntries.getLength();
-            for (INT32 k = 0;  k < nLen;  ++k)
+            sal_Int32 nLen = aEntries.getLength();
+            for (sal_Int32 k = 0;  k < nLen;  ++k)
             {
                 String aEntryTxt;
                 if (pEntries[k].is())
@@ -175,27 +175,27 @@ void SearchSimilarText( const OUString &rText, INT16 nLanguage,
 
 void SeqRemoveNegEntries( Sequence< OUString > &rSeq, 
         Reference< XDictionaryList > &rxDicList, 
-        INT16 nLanguage )
+        sal_Int16 nLanguage )
 {
     static const OUString aEmpty;
-    BOOL bSthRemoved = FALSE;
-    INT32 nLen = rSeq.getLength();
+    sal_Bool bSthRemoved = sal_False;
+    sal_Int32 nLen = rSeq.getLength();
     OUString *pEntries = rSeq.getArray();
-    for (INT32 i = 0;  i < nLen;  ++i)
+    for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         Reference< XDictionaryEntry > xNegEntry( SearchDicList( rxDicList, 
-                    pEntries[i], nLanguage, FALSE, TRUE ) );
+                    pEntries[i], nLanguage, sal_False, sal_True ) );
         if (xNegEntry.is())
         {
             pEntries[i] = aEmpty;
-            bSthRemoved = TRUE;
+            bSthRemoved = sal_True;
         }
     }
     if (bSthRemoved)
     {
         Sequence< OUString > aNew;
         // merge sequence without duplicates and empty strings in new empty sequence
-        aNew = MergeProposalSeqs( aNew, rSeq, FALSE );
+        aNew = MergeProposalSeqs( aNew, rSeq, sal_False );
         rSeq = aNew;
     }
 }
@@ -204,7 +204,7 @@ void SeqRemoveNegEntries( Sequence< OUString > &rSeq,
 Sequence< OUString > MergeProposalSeqs(
             Sequence< OUString > &rAlt1,
             Sequence< OUString > &rAlt2,
-            BOOL bAllowDuplicates )
+            sal_Bool bAllowDuplicates )
 {
     Sequence< OUString > aMerged;
 
@@ -214,20 +214,20 @@ Sequence< OUString > MergeProposalSeqs(
         aMerged = rAlt1;
     else
     {
-        INT32 nAltCount1 = rAlt1.getLength();
+        sal_Int32 nAltCount1 = rAlt1.getLength();
         const OUString *pAlt1 = rAlt1.getConstArray();
-        INT32 nAltCount2 = rAlt2.getLength();
+        sal_Int32 nAltCount2 = rAlt2.getLength();
         const OUString *pAlt2 = rAlt2.getConstArray();
 
-        INT32 nCountNew = Min( nAltCount1 + nAltCount2, (INT32) MAX_PROPOSALS );
+        sal_Int32 nCountNew = Min( nAltCount1 + nAltCount2, (sal_Int32) MAX_PROPOSALS );
         aMerged.realloc( nCountNew );
         OUString *pMerged = aMerged.getArray();
 
-        INT32 nIndex = 0;
-        INT32 i = 0;
+        sal_Int32 nIndex = 0;
+        sal_Int32 i = 0;
         for (int j = 0;  j < 2;  j++)
         {
-            INT32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
+            sal_Int32           nCount  = j == 0 ? nAltCount1 : nAltCount2;
             const OUString  *pAlt   = j == 0 ? pAlt1 : pAlt2;
             for (i = 0;  i < nCount  &&  nIndex < MAX_PROPOSALS;  i++)
             {
@@ -254,8 +254,8 @@ SpellAlternatives::SpellAlternatives()
 
 
 SpellAlternatives::SpellAlternatives( 
-            const OUString &rWord, INT16 nLang,
-            INT16 nFailureType, const OUString &rRplcWord ) :
+            const OUString &rWord, sal_Int16 nLang,
+            sal_Int16 nFailureType, const OUString &rRplcWord ) :
     aAlt        ( Sequence< OUString >(1) ),
     aWord		(rWord),
     nType       (nFailureType),
@@ -269,7 +269,7 @@ SpellAlternatives::SpellAlternatives(
 
 
 SpellAlternatives::SpellAlternatives(
-        const OUString &rWord, INT16 nLang, INT16 nFailureType,
+        const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
         const Sequence< OUString > &rAlternatives ) :
     aAlt        (rAlternatives),
     aWord       (rWord),
@@ -312,7 +312,7 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
-    return (INT16) aAlt.getLength();
+    return (sal_Int16) aAlt.getLength();
 }
 
 
@@ -340,7 +340,7 @@ throw (uno::RuntimeException)
 }
 
 
-void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
+void SpellAlternatives::SetWordLanguage(const OUString &rWord, sal_Int16 nLang)
 {
     MutexGuard	aGuard( GetLinguMutex() );
     aWord = rWord;
@@ -348,7 +348,7 @@ void SpellAlternatives::SetWordLanguage(const OUString &rWord, INT16 nLang)
 }
 
 
-void SpellAlternatives::SetFailureType(INT16 nTypeP)
+void SpellAlternatives::SetFailureType(sal_Int16 nTypeP)
 {
     MutexGuard	aGuard( GetLinguMutex() );
     nType = nTypeP;
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index 7e4f094b18..d8c6d192d8 100644..100755
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -39,7 +39,7 @@
 #include <osl/mutex.hxx>
 
 #include "thesdsp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 
 using namespace utl;
 using namespace osl;
@@ -54,15 +54,15 @@ using ::rtl::OUString;
 
 ///////////////////////////////////////////////////////////////////////////
 
-static BOOL SvcListHasLanguage( 
+static sal_Bool SvcListHasLanguage( 
         const Sequence< Reference< XThesaurus > > &rRefs, 
         const Locale &rLocale )
 {
-    BOOL bHasLanguage = FALSE;
+    sal_Bool bHasLanguage = sal_False;
     
     const Reference< XThesaurus > *pRef = rRefs.getConstArray();
-    INT32 nLen = rRefs.getLength();
-    for (INT32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
+    sal_Int32 nLen = rRefs.getLength();
+    for (sal_Int32 k = 0;  k < nLen  &&  !bHasLanguage;  ++k)
     {
         if (pRef[k].is())
             bHasLanguage = pRef[k]->hasLocale( rLocale );
@@ -130,7 +130,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
 
     Sequence< Reference< XMeaning > >	aMeanings;
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     if (nLanguage == LANGUAGE_NONE  || !rTerm.getLength())
         return aMeanings;
 
@@ -152,13 +152,13 @@ Sequence< Reference< XMeaning > > SAL_CALL
         if (IsIgnoreControlChars( rProperties, GetPropSet() ))
             RemoveControlChars( aChkWord );
 
-        INT32 nLen = pEntry->aSvcRefs.getLength();
+        sal_Int32 nLen = pEntry->aSvcRefs.getLength();
         DBG_ASSERT( nLen == pEntry->aSvcImplNames.getLength(),
                 "lng : sequence length mismatch");
         DBG_ASSERT( pEntry->nLastTriedSvcIndex < nLen,
                 "lng : index out of range");
 
-        INT32 i = 0;
+        sal_Int32 i = 0;
 
         // try already instantiated services first
         {
@@ -205,7 +205,7 @@ Sequence< Reference< XMeaning > > SAL_CALL
                     if (xThes.is()  &&  xThes->hasLocale( rLocale ))
                         aMeanings = xThes->queryMeanings( aChkWord, rLocale, rProperties );
 
-                    pEntry->nLastTriedSvcIndex = (INT16) i;
+                    pEntry->nLastTriedSvcIndex = (sal_Int16) i;
                     ++i;
                 }
                 
@@ -229,9 +229,9 @@ void ThesaurusDispatcher::SetServiceList( const Locale &rLocale,
 {
     MutexGuard	aGuard( GetLinguMutex() );
 
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
 
-    INT32 nLen = rSvcImplNames.getLength();
+    sal_Int32 nLen = rSvcImplNames.getLength();
     if (0 == nLen)
         // remove entry
         aSvcMap.erase( nLanguage );
@@ -263,7 +263,7 @@ Sequence< OUString >
     Sequence< OUString > aRes;
 
     // search for entry with that language and use data from that
-    INT16 nLanguage = LocaleToLanguage( rLocale );
+    sal_Int16 nLanguage = LocaleToLanguage( rLocale );
     ThesaurusDispatcher             *pThis = (ThesaurusDispatcher *) this;
     const ThesSvcByLangMap_t::iterator  aIt( pThis->aSvcMap.find( nLanguage ) );
     const LangSvcEntries_Thes       *pEntry = aIt != aSvcMap.end() ? aIt->second.get() : NULL;
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 3b12cf1b1c..3b12cf1b1c 100644..100755
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index 1bd4759a84..e8f3d304a5 100644..100755
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
-#include <misc.hxx>
+#include <linguistic/misc.hxx>
 
 #include "thesdta.hxx"
 
@@ -52,7 +52,7 @@ namespace linguistic
 
 
 ThesaurusMeaning::ThesaurusMeaning(const OUString &rText,
-                 const OUString &rLookUpText, INT16 nLookUpLang ) :
+                 const OUString &rLookUpText, sal_Int16 nLookUpLang ) :
     aText				(rText),
     aLookUpText			(rLookUpText),
     nLookUpLanguage		(nLookUpLang)
diff --git a/linguistic/workben/exports.dxp b/linguistic/workben/exports.dxp
index b0f85bf7be..b0f85bf7be 100644..100755
--- a/linguistic/workben/exports.dxp
+++ b/linguistic/workben/exports.dxp
diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index 6c04929d7b..6c04929d7b 100644..100755
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/workben/makefile.mk
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 089e81ccc4..d9008ef979 100644..100755
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -30,10 +30,10 @@
 #include "precompiled_linguistic.hxx"
 
 #include <sal/macros.h>
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 
 #include "sprophelp.hxx"
-#include "lngprops.hxx"
+#include "linguistic/lngprops.hxx"
 #include <tools/debug.hxx>
 
 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index c84f7de550..c84f7de550 100644..100755
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index b466c9dc57..b466c9dc57 100644..100755
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 38b6785556..ff25e21706 100644..100755
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -40,8 +40,8 @@
 
 #include <sspellimp.hxx>
 
-#include "lngprops.hxx"
-#include "spelldta.hxx"
+#include "linguistic/lngprops.hxx"
+#include "linguistic/spelldta.hxx"
 
 using namespace utl;
 using namespace osl;
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index ae6655e64b..676e1ecc3b 100644..100755
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
 #include <tools/table.hxx>
 
-#include "misc.hxx"
+#include "linguistic/misc.hxx"
 #include "sprophelp.hxx"
 
 using namespace ::rtl;
diff --git a/linguistic/xml/linguistic.xml b/linguistic/xml/linguistic.xml
index 83aaaeb0c1..83aaaeb0c1 100644..100755
--- a/linguistic/xml/linguistic.xml
+++ b/linguistic/xml/linguistic.xml
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index 04d2cfd87a..b07a34aee9 100644..100755
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,4 +1,4 @@
-oc  officecfg   :    l10n soltools solenv LIBXSLT:libxslt NULL
+oc  officecfg   :    L10N:l10n soltools solenv LIBXSLT:libxslt NULL
 oc  officecfg                                                       usr1  -   all oc_mkout NULL
 oc  officecfg\registry\schema                                       nmake -   all oc_reg_schema NULL
 oc  officecfg\registry                                              nmake -   all oc_reg NULL
diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst
index debb9659a9..debb9659a9 100644..100755
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
diff --git a/officecfg/registry/component-schema.dtd b/officecfg/registry/component-schema.dtd
index 17d265da91..17d265da91 100644..100755
--- a/officecfg/registry/component-schema.dtd
+++ b/officecfg/registry/component-schema.dtd
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index 81acc5e35e..81acc5e35e 100644..100755
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
diff --git a/officecfg/registry/data.dtd b/officecfg/registry/data.dtd
index c3f7d0a61b..c3f7d0a61b 100644..100755
--- a/officecfg/registry/data.dtd
+++ b/officecfg/registry/data.dtd
diff --git a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
index 06546894ff..06546894ff 100644..100755
--- a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index 2f8e44c784..2f8e44c784 100644..100755
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
diff --git a/officecfg/registry/data/org/openoffice/Interaction.xcu b/officecfg/registry/data/org/openoffice/Interaction.xcu
index 4269378c36..c359ea662b 100644..100755
--- a/officecfg/registry/data/org/openoffice/Interaction.xcu
+++ b/officecfg/registry/data/org/openoffice/Interaction.xcu
@@ -52,5 +52,17 @@
         <value>com.sun.star.comp.dbaccess.DatabaseInteractionHandler</value>
       </prop>
     </node>
+    <node oor:name="org.openoffice.Filter.PDFExport.Interactions" oor:op="replace">
+      <node oor:name="HandledRequestTypes">
+        <node oor:name="com.sun.star.task.PDFExportException" oor:op="replace">
+          <prop oor:name="Propagation" oor:type="xs:string">
+            <value>named-and-derived</value>
+          </prop>
+        </node>
+      </node>
+      <prop oor:name="ServiceName" oor:type="xs:string">
+        <value>com.sun.star.filter.pdfexport.PDFExportInteractionHandler</value>
+      </prop>
+    </node>
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
index 538a7acb27..538a7acb27 100644..100755
--- a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
+++ b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 04141b3d66..dfbb7d99c5 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1743,7 +1743,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -1938,7 +1938,7 @@
     </node>
    </node>
    <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace">
-     <node oor:name="N_MOD1_MOD2" oor:op="replace">
+     <node oor:name="C_MOD1_MOD2" oor:op="replace">
        <prop oor:name="Command">
          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
          <value xml:lang="en-US">.uno:InsertAnnotation</value>
@@ -2784,7 +2784,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -3424,7 +3424,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -4034,7 +4034,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -4644,7 +4644,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -5259,7 +5259,7 @@
       <value xml:lang="es">.uno:Bold</value>
      </prop>
     </node>
-    <node oor:name="N_MOD1_MOD2" oor:op="replace">
+    <node oor:name="C_MOD1_MOD2" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:InsertAnnotation</value>
      </prop>
@@ -5622,7 +5622,7 @@
     </node>
    </node>
    <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace">
-     <node oor:name="N_MOD1_MOD2" oor:op="replace">
+     <node oor:name="C_MOD1_MOD2" oor:op="replace">
        <prop oor:name="Command">
          <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
          <value xml:lang="en-US">.uno:InsertAnnotation</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 07bbfb0a60..07bbfb0a60 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f672cad67a..f672cad67a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
index d8182c8361..d8182c8361 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index fdf497ca74..fdf497ca74 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index fccad65f92..fccad65f92 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index c8f5c5736d..c8f5c5736d 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Histories.xcu b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
index fcb40eb045..fcb40eb045 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Histories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index af8710c558..af8710c558 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
index 2e2fdc4243..2e2fdc4243 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
index 1bf84cd3c8..1bf84cd3c8 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
index d48521411e..d48521411e 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Logging.xcu b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
index 799a6f34c7..799a6f34c7 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Logging.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 686682ff93..686682ff93 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 4a8002e167..4a8002e167 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
index efe80701a6..efe80701a6 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/SFX.xcu b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
index 322ba63c8a..322ba63c8a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/SFX.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
index 2512fbea63..2512fbea63 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Security.xcu b/officecfg/registry/data/org/openoffice/Office/Security.xcu
index 5de66a0a81..5de66a0a81 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Security.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Security.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
index f039454d3e..f039454d3e 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
index d2d3d05741..d2d3d05741 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index cca7916c89..cca7916c89 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
index 9da5f1f348..9da5f1f348 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index 675002857a..675002857a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index 8ba1a72b81..8ba1a72b81 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
index 0d05dfacd0..0d05dfacd0 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index bfc9ece677..dedcee555a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -170,7 +170,7 @@
             </node>
             <node oor:name=".uno:DataPilotFilter" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">DataPilot Filter</value>
+                    <value xml:lang="en-US">Pivot Table Filter</value>
                 </prop>
             </node>
             <node oor:name=".uno:NextPage" oor:op="replace">
@@ -323,10 +323,10 @@
             </node>
             <node oor:name=".uno:DataDataPilotRun" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Start DataPilot...</value>
+                    <value xml:lang="en-US">~Create Pivot Table...</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
-                    <value xml:lang="en-US">~Start...</value>
+                    <value xml:lang="en-US">~Create...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -1131,7 +1131,7 @@
             </node>
             <node oor:name=".uno:RecalcPivotTable" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Refresh DataPilot</value>
+                    <value xml:lang="en-US">~Refresh Pivot Table</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
                     <value xml:lang="en-US">~Refresh</value>
@@ -1139,7 +1139,7 @@
             </node>
             <node oor:name=".uno:DeletePivotTable" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Delete DataPilot</value>
+                    <value xml:lang="en-US">~Delete Pivot Table</value>
                 </prop>
                 <prop oor:name="ContextLabel" oor:type="xs:string">
                     <value xml:lang="en-US">~Delete</value>
@@ -1545,7 +1545,7 @@
             </node>
             <node oor:name=".uno:DataPilotMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Data~Pilot</value>
+                    <value xml:lang="en-US">~Pivot Table</value>
                 </prop>
             </node>
             <node oor:name=".uno:EditSheetMenu" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index dcdce12af9..dcdce12af9 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
index 6619f83e8e..6619f83e8e 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 3d3c89ab15..3d3c89ab15 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index e09cbca03d..e09cbca03d 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu
index 59ac9ba33b..59ac9ba33b 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu
index 8aaa0a4534..8aaa0a4534 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu
index 20e3b7933a..20e3b7933a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu
index 0deb0bcd1a..0deb0bcd1a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu
index 1181d3d99a..1181d3d99a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
index 2df5259bac..2df5259bac 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 7138636549..7138636549 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index abaa9fca82..abaa9fca82 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index 53d6a084e1..53d6a084e1 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index d9ff190344..d9ff190344 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
index 92a9f2cb6a..92a9f2cb6a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ea2485e85b..efe7afd89d 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -29,13 +29,13 @@
 <oor:component-data oor:name="GenericCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <node oor:name="UserInterface">
         <node oor:name="Commands">
-      <node oor:name=".uno:WebHtml" oor:op="replace">
+            <node oor:name=".uno:WebHtml" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="de">Vorschau in Web-Browser</value>
                     <value xml:lang="en-US">Preview in Web Browser</value>
                 </prop>
             </node>
-      <node oor:name=".uno:NewPresentation" oor:op="replace">
+            <node oor:name=".uno:NewPresentation" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">New Presentation</value>
                 </prop>
@@ -1471,7 +1471,7 @@
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
-            </node>            
+            </node>
             <node oor:name=".uno:UpSearch" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Find Previous</value>
@@ -1484,7 +1484,7 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Find...</value>
                 </prop>
-            </node>            
+            </node>
             <node oor:name=".uno:ExtendedHelp" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">What's ~This?</value>
@@ -2117,9 +2117,9 @@
                 </prop>
             </node>
             <node oor:name=".uno:LanguageStatus" oor:op="replace">
-                    <prop oor:name="Label" oor:type="xs:string">
-                            <value xml:lang="en-US">Language Status</value>
-                    </prop>
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Language Status</value>
+                </prop>
             </node>
             <node oor:name=".uno:ChooseControls" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
@@ -3006,7 +3006,7 @@
                     <value xml:lang="en-US">~Spelling and Grammar...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
-                  <value>1</value>
+                    <value>1</value>
                 </prop>
             </node>
             <node oor:name=".uno:SpellDialog" oor:op="replace">
@@ -3412,7 +3412,7 @@
             </node>
             <node oor:name=".uno:BmpMask" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Eyedropper</value>
+                    <value xml:lang="en-US">Color ~Replacer</value>
                 </prop>
             </node>
             <node oor:name=".uno:GoLeftBlock" oor:op="replace">
@@ -3453,12 +3453,12 @@
                     <value>9</value>
                 </prop>
             </node>
-      <node oor:name=".uno:TaskPane" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Task Pane</value>
-        </prop>
-      </node>
-      <node oor:name=".uno:RestoreEditingView" oor:op="replace">
+            <node oor:name=".uno:TaskPane" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Task Pane</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:RestoreEditingView" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Restore Editing View</value>
                 </prop>
@@ -3472,10 +3472,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Fit to Frame</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ImageMapDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">ImageMap</value>
@@ -3732,10 +3732,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Flash</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ToolsMacroEdit" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Edit Macros</value>
@@ -4039,12 +4039,12 @@
             </node>
             <node oor:name=".uno:RubyDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">As~ian phonetic guide...</value>
+                    <value xml:lang="en-US">As~ian phonetic guide...</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:InsertSymbol" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">S~pecial Character...</value>
@@ -4146,10 +4146,10 @@
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Status ~Bar</value>
                 </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>8</value>
-        </prop>
-      </node>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>8</value>
+                </prop>
+            </node>
             <node oor:name=".uno:MacroBarVisible" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Macro Toolbar On/Off</value>
@@ -5118,16 +5118,16 @@
                     <value xml:lang="en-US">~Extension Manager...</value>
                 </prop>
             </node>
-                        <node oor:name=".uno:Signature" oor:op="replace">
-                                <prop oor:name="Label" oor:type="xs:string">
-                                        <value xml:lang="en-US">Digital Signatu~res...</value>
-                                </prop>
-                        </node>
-                        <node oor:name=".uno:MacroSignature" oor:op="replace">
-                                <prop oor:name="Label" oor:type="xs:string">
-                                        <value xml:lang="en-US">Digital Signature...</value>
-                                </prop>
-                        </node>
+            <node oor:name=".uno:Signature" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Digital Signatu~res...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:MacroSignature" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Digital Signature...</value>
+                </prop>
+            </node>
             <node oor:name=".uno:CommonAlignLeft" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Left</value>
@@ -5184,22 +5184,27 @@
                     <value xml:lang="en-US">Find</value>
                 </prop>
             </node> -->
-      <node oor:name=".uno:DeleteAllNotes" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Comments</value>
-        </prop>
-      </node>
-      <node oor:name=".uno:DeleteAuthor" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Comments by This Author</value>
-        </prop>
-      </node>
-      <node oor:name=".uno:DeleteNote" oor:op="replace">
+            <node oor:name=".uno:DeleteAllNotes" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete All Comments</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteAuthor" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete All Comments by This Author</value>
+                </prop>
+            </node>
+      <node oor:name=".uno:ReplyComment" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete Comment</value>
+          <value xml:lang="en-US">Reply Comment</value>
         </prop>
       </node>
-    </node>
+      <node oor:name=".uno:DeleteComment" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Comment</value>
+                </prop>
+            </node>
+        </node>
         <node oor:name="Popups">
             <node oor:name=".uno:HelpMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index e6f386fb0e..e6f386fb0e 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 7570fda066..07a717f314 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -38,13 +38,10 @@
                     <value xml:lang="en-US">~Text Mode</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertFormula" oor:op="replace">
+            <node oor:name=".uno:ImportFormula" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Import Formula...</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
             </node>
             <node oor:name=".uno:FitInWindow" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
@@ -111,7 +108,7 @@
             </node>
             <node oor:name=".uno:View100" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">1</value>
+                    <value xml:lang="en-US">Zoom 100%</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -119,7 +116,7 @@
             </node>
             <node oor:name=".uno:View200" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">2</value>
+                    <value xml:lang="en-US">Zoom 200%</value>
                 </prop>
             </node>
             <node oor:name=".uno:ZoomIn" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
index f7b9bddf2f..f7b9bddf2f 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
index 697e0ae949..697e0ae949 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
index 82e076875b..82e076875b 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 455f13f168..f5725b320b 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -166,6 +166,16 @@
                     <value xml:lang="en-US">~Protect Records...</value>
                 </prop>
             </node>
+            <node oor:name=".uno:RejectTracedChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Reject Change</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:AcceptTracedChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Accept Change</value>
+                </prop>
+            </node>
             <node oor:name=".uno:UpdateAllLinks" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">~Links</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index c62f6324c7..c62f6324c7 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index e944cf9bfb..e944cf9bfb 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index d7303336e3..d7303336e3 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 49859d2bf8..49859d2bf8 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 558d215621..558d215621 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index ba2221766d..ba2221766d 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index 7979878e3a..7979878e3a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 73d9f0fa4a..73d9f0fa4a 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
index a660d9f0d9..a660d9f0d9 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index bae36af742..b714fa6e38 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -79,6 +79,9 @@
   </node>
   <node oor:name="Insert">
     <node oor:name="Caption">
+      <prop oor:name="CaptionOrderNumberingFirst">
+         <value xml:lang="hu">true</value>
+      </prop>
       <node oor:name="WriterObject">
         <node oor:name="Table">
           <node oor:name="Settings">
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 31e228d567..31e228d567 100644..100755
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 149971a42e..149971a42e 100644..100755
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
diff --git a/officecfg/registry/data/org/openoffice/System.xcu b/officecfg/registry/data/org/openoffice/System.xcu
index 9e3ae0ea77..9e3ae0ea77 100644..100755
--- a/officecfg/registry/data/org/openoffice/System.xcu
+++ b/officecfg/registry/data/org/openoffice/System.xcu
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 1ac4f3baa6..1ac4f3baa6 100644..100755
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
index f09ab7502a..f09ab7502a 100644..100755
--- a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
diff --git a/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu
index 4934c05e97..4934c05e97 100644..100755
--- a/officecfg/registry/data/org/openoffice/UserProfile.xcu
+++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 8b06a49f04..0eb2144982 100644..100755
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -60,6 +60,11 @@
             <value>Default</value>
         </prop>
     </node>
+    <node oor:name="WM" oor:op="replace">
+        <prop oor:name="ShouldSwitchWorkspace" oor:op="replace" oor:type="xs:string">
+            <value></value>
+        </prop>
+    </node>
   </node>
   <node oor:name="DefaultFonts">
     <node oor:name="en" oor:op="replace">
@@ -515,31 +520,31 @@
     </node>
     <node oor:name="ja" oor:op="replace">
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>HG 明�L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ Ｐ明�;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;UmePlus P Gothic;TLP明�;LX明�;HGPMinchoL;IPA P明�;Takao P明�;�風明�;Kochi Mincho;����明�;Mincho;Serif</value>
+        <value>HG 明�L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ Ｐ明�;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;UmePlus P Gothic;TLP明�;LX明�;HGPMinchoL;IPA P明�;�風明�;Kochi Mincho;����明�;Mincho;Serif</value>
       </prop>
        <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>HG 明�L Sun;HG 明�L;HG Mincho Light J;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;Gothic;ＭＳ 明�;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明�;HG Mincho Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ Ｐゴシック;UmePlus P Gothic;Andale Sans UI</value>
+        <value>HG 明�L Sun;HG 明�L;HG Mincho Light J;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;Gothic;ＭＳ 明�;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明�;HG Mincho Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ Ｐゴシック;UmePlus P Gothic;Andale Sans UI</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ＭＳ Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic;Andale Sans UI</value>
+        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ＭＳ Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic;Andale Sans UI</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
         <value>Andale;Arial</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;UmePlus P Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value>
+        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明� ProN W3;ヒラギノ明� Pro W3;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;UmePlus P Gothic;Andale Sans UI;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;Andale Sans UI;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value>
+        <value>HG PゴシックB Sun;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;Andale Sans UI;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>HG ゴシックB Sun;HG-GothicB Sun;HG Mincho Light J;ＭＳ Ｐゴシック;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
+        <value>HG ゴシックB Sun;HG-GothicB Sun;HG Mincho Light J;ＭＳ Ｐゴシック;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
        </prop>
        <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
+        <value>HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;UmePlus Gothic;Gothic</value>
        </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;Andale Sans UI;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;Takao Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;Gothic;Gnu-Unifont</value>
+        <value>HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro W3;HG-PGothicB Sun;HG PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;Andale Sans UI;HG Mincho Light J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;�風ゴシック;����ゴシック;Kochi Gothic;Gothic;Gnu-Unifont</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>hgmincholightj;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced</value>
@@ -1423,9 +1428,8 @@
       </node>
       <node oor:name="arial" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>liberationsans;albanyamt;albany;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>liberationsans;albanyamt;albany;arimo;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
-        <prop oor:name="SubstFontsMS"><value></value></prop>
         <prop oor:name="SubstFontsPS"><value>Helvetica</value></prop>
         <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -1436,24 +1440,9 @@
         <prop oor:name="SubstFonts">
           <value>arialnarrowmt;liberationsansnarrow;helveticanarrow;helmetcondensed;dejavusanscondensed;nimbussanslcondensed;nimbussanscondensed</value>
         </prop>
-        <prop oor:name="SubstFontsMS">
-          <value></value>
-        </prop>
-        <prop oor:name="SubstFontsPS">
-          <value></value>
-        </prop>
-        <prop oor:name="SubstFontsHTML">
-          <value></value>
-        </prop>
-        <prop oor:name="FontWeight">
-          <value>Normal</value>
-        </prop>
-        <prop oor:name="FontWidth">
-          <value>Condensed</value>
-        </prop>
-        <prop oor:name="FontType">
-          <value>Normal,SansSerif</value>
-        </prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Condensed</value></prop>
+        <prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
       </node>
       <node oor:name="arialunicode" oor:op="replace">
         <prop oor:name="SubstFonts">
@@ -1478,6 +1467,17 @@
           <value>Normal,SansSerif,Full</value>
         </prop>
       </node>
+      <node oor:name="arimo" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>arial;liberationsans;albany;albanyamt;helvetica;</value>
+        </prop>
+        <prop oor:name="SubstFontsMS"><value>arial</value></prop>
+        <prop oor:name="SubstFontsPS"><value>helvetica</value></prop>
+        <prop oor:name="SubstFontsHTML"><value>sans-serif</value></prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Normal</value></prop>
+        <prop oor:name="FontType"><value>Standard,Normal,SansSerif</value></prop>
+      </node>
       <node oor:name="arioso" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>palacescript;palacescriptmt;arioso;shelley;zapfchancery;itczapfchancery;monotypecorsiva;corsiva;chancery;chanceryl;lucidacalligraphy;lucidahandwriting;andymt;comicsansms;andy;kidprint;</value>
@@ -2394,7 +2394,7 @@
       </node>
       <node oor:name="courier" oor:op="replace">
     <prop oor:name="SubstFonts">
-          <value>cumberlandamt;cumberland;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;cumberland;cousine;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -2405,9 +2405,19 @@
       </node>
       <node oor:name="couriernew" oor:op="replace">
     <prop oor:name="SubstFonts">
-      <value>cumberlandamt;cumberland;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+      <value>cumberlandamt;cumberland;cousine;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+        </prop>
+    <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
+    <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
+    <prop oor:name="FontWeight"><value>Normal</value></prop>
+    <prop oor:name="FontWidth"><value>Normal</value></prop>
+    <prop oor:name="FontType"><value>Standard,Normal,Fixed,Typewriter</value></prop>
+      </node>
+      <node oor:name="cousine" oor:op="replace">
+    <prop oor:name="SubstFonts">
+      <value>couriernew;cumberland;cumberlandamt;liberationmono;courier</value>
         </prop>
-    <prop oor:name="SubstFontsMS"><value></value></prop>
+    <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
     <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
     <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -3245,7 +3255,7 @@
       </node>
       <node oor:name="gothic" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hggothicbsun;msgothic;mspgothic;hiraginominchopronw3;hiraginominchoprow3;hggothic;hggothicb;hggothice;ipagothic;takaogothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hggothicbsun;msgothic;mspgothic;hiraginominchopronw3;hiraginominchoprow3;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3262,7 +3272,7 @@
       </node>
       <node oor:name="gothicb" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;takaogothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3279,7 +3289,7 @@
       </node>
       <node oor:name="gothicl" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>msgothic;mspgothic;hggothic;hggothicb;hggothice;ipapgothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>msgothic;mspgothic;hggothic;hggothicb;hggothice;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3635,7 +3645,7 @@
       </node>
       <node oor:name="hgpmincholsun" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>mspmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
+          <value>mspmincho;ipapmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
       </node>
@@ -3658,7 +3668,7 @@
       </node>
       <node oor:name="hggothicb" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;takaogothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3675,7 +3685,7 @@
       </node>
       <node oor:name="hggothice" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>msgothic;mspgothic;hggothic;hggothicb;ipagothic;ipapgothic;takaogothic;takaopgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>msgothic;mspgothic;hggothic;hggothicb;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -3698,7 +3708,7 @@
       </node>
       <node oor:name="hgminchoj" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholightj;msmincho;mspmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hgmincholightj;msmincho;mspmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -3715,7 +3725,7 @@
       </node>
       <node oor:name="hgminchol" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hgminchoj;ipamincho;ipapmincho;takaomincho;takaopmincho;sazanamimincho;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hgminchoj;ipamincho;ipapmincho;sazanamimincho;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -3738,7 +3748,7 @@
       </node>
       <node oor:name="hgmincholightj" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;msmincho;mspmincho;ipapmincho;takaopmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;msmincho;mspmincho;ipapmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5181,7 +5191,7 @@
       </node>
       <node oor:name="mincho" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hiraginominchopronw3;hiraginominchoprow3;ipamincho;ipapmincho;takaomincho;takaopmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;hiraginominchopronw3;hiraginominchoprow3;ipamincho;ipapmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5215,7 +5225,7 @@
       </node>
       <node oor:name="minchol" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;takaomincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -5232,7 +5242,7 @@
       </node>
       <node oor:name="minchou" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;hgmincholightj;msmincho;ipamicho;ipapmincho;takaomicho;takaopminchosazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;hgmincholightj;msmincho;ipamicho;ipapmincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -5541,7 +5551,7 @@
       </node>
        <node oor:name="msgothic" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hggothicbsun;mspgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipagothic;takaogothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
+          <value>hggothicbsun;mspgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipagothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -5564,7 +5574,7 @@
       </node>
        <node oor:name="mspgothic" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgpgothicbsun;mspgothic;msgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipapgothic;takaogothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hgpgothicbsun;mspgothic;msgothic;hiraginokakugothicpronw3;hiraginokakugothicprow3;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="FontWeight"> <value>Normal</value> </prop>
         <prop oor:name="FontWidth"> <value>Normal</value> </prop>
@@ -5572,7 +5582,7 @@
       </node>
       <node oor:name="msmincho" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgmincholsun;hgmincholightj;ipamincho;takaomincho;hiraginominchopronw3;hiraginominchoprow3;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgmincholsun;hgmincholightj;ipamincho;hiraginominchopronw3;hiraginominchoprow3;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -5618,7 +5628,7 @@
       </node>
       <node oor:name="mspmincho" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgpmincholsun;hgmincholightj;msmincho;hiraginominchopronw3;hiraginominchoprow3;ipapmincho;takaopmincho;sazanamimincho;hgminchoj;hgminchol;kochimincho;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgpmincholsun;hgmincholightj;msmincho;hiraginominchopronw3;hiraginominchoprow3;ipapmincho;sazanamimincho;hgminchoj;hgminchol;kochimincho;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -6205,7 +6215,7 @@
       </node>
       <node oor:name="pgothic" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;takaopgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -6268,7 +6278,7 @@
       </node>
       <node oor:name="pmincho" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;takaopmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+          <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>mspmincho</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -7316,6 +7326,17 @@
         <prop oor:name="FontWidth"><value>Normal</value></prop>
         <prop oor:name="FontType"><value>Normal,Serif</value></prop>
       </node>
+      <node oor:name="timos" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>timesnewroman;thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons</value>
+        </prop>
+        <prop oor:name="SubstFontsMS"><value>Times New Roman</value></prop>
+        <prop oor:name="SubstFontsPS"><value>Times</value></prop>
+        <prop oor:name="SubstFontsHTML"><value>serif</value></prop>
+        <prop oor:name="FontWeight"><value>Normal</value></prop>
+        <prop oor:name="FontWidth"><value>Normal</value></prop>
+        <prop oor:name="FontType"><value>Standard,Normal,Serif</value></prop>
+      </node>
       <node oor:name="tmsrmn" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index d230087724..d230087724 100644..100755
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
diff --git a/officecfg/registry/data/org/openoffice/ucb/makefile.mk b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
index fccb0e97ab..fccb0e97ab 100644..100755
--- a/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
diff --git a/officecfg/registry/makefile.mk b/officecfg/registry/makefile.mk
index bc6f3080d0..bc6f3080d0 100644..100755
--- a/officecfg/registry/makefile.mk
+++ b/officecfg/registry/makefile.mk
diff --git a/officecfg/registry/schema/makefile.mk b/officecfg/registry/schema/makefile.mk
index d735d03c84..d735d03c84 100644..100755
--- a/officecfg/registry/schema/makefile.mk
+++ b/officecfg/registry/schema/makefile.mk
diff --git a/officecfg/registry/schema/oo-ad-ldap.xcd.sample b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
index edc50fb637..edc50fb637 100644..100755
--- a/officecfg/registry/schema/oo-ad-ldap.xcd.sample
+++ b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
diff --git a/officecfg/registry/schema/oo-common-ad.ldf b/officecfg/registry/schema/oo-common-ad.ldf
index b22cc27d2b..b22cc27d2b 100644..100755
--- a/officecfg/registry/schema/oo-common-ad.ldf
+++ b/officecfg/registry/schema/oo-common-ad.ldf
diff --git a/officecfg/registry/schema/oo-common.conf b/officecfg/registry/schema/oo-common.conf
index 61fc0cc9ac..61fc0cc9ac 100644..100755
--- a/officecfg/registry/schema/oo-common.conf
+++ b/officecfg/registry/schema/oo-common.conf
diff --git a/officecfg/registry/schema/oo-common.ldif b/officecfg/registry/schema/oo-common.ldif
index 5f80bfa770..5f80bfa770 100644..100755
--- a/officecfg/registry/schema/oo-common.ldif
+++ b/officecfg/registry/schema/oo-common.ldif
diff --git a/officecfg/registry/schema/oo-ldap-attr-map.properties b/officecfg/registry/schema/oo-ldap-attr-map.properties
index 684dfbdebf..684dfbdebf 100644..100755
--- a/officecfg/registry/schema/oo-ldap-attr-map.properties
+++ b/officecfg/registry/schema/oo-ldap-attr-map.properties
diff --git a/officecfg/registry/schema/oo-ldap.xcd.sample b/officecfg/registry/schema/oo-ldap.xcd.sample
index 8e9271a44d..8e9271a44d 100644..100755
--- a/officecfg/registry/schema/oo-ldap.xcd.sample
+++ b/officecfg/registry/schema/oo-ldap.xcd.sample
diff --git a/officecfg/registry/schema/oo-org-map.properties b/officecfg/registry/schema/oo-org-map.properties
index dc87a4346c..dc87a4346c 100644..100755
--- a/officecfg/registry/schema/oo-org-map.properties
+++ b/officecfg/registry/schema/oo-org-map.properties
diff --git a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
index 3f6da6a5b6..3f6da6a5b6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs
index b555c3f635..b555c3f635 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Interaction.xcs b/officecfg/registry/schema/org/openoffice/Interaction.xcs
index e39d44da7f..e39d44da7f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Interaction.xcs
+++ b/officecfg/registry/schema/org/openoffice/Interaction.xcs
diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index dd5e79833a..dd5e79833a 100644..100755
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
index 379f7cbb25..379f7cbb25 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
index 3e2c61b09d..3e2c61b09d 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index fbec7abc00..baf777b004 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1039,7 +1039,7 @@
                             with no exception.</desc>
                         <label>QuotedFieldAsText</label>
                     </info>
-                    <value>true</value>
+                    <value>false</value>
                 </prop>
                 <prop oor:name="DetectSpecialNumbers" oor:type="xs:boolean">
                     <info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
index 35bd2722e1..35bd2722e1 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
index 8989c0f7c2..8989c0f7c2 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
index 209b0a1851..209b0a1851 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c1910892f2..668e740e0f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2609,39 +2609,6 @@
 				</constraints>
 				<value>100</value>
 			</prop>
-			<prop oor:name="LookAndFeel" oor:type="xs:short">
-				<!-- OldPath: General/View -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Tools  Options - General  View  [Section] Display -->
-				<info>
-					<author>PB</author>
-					<desc>Determines the look and feel of the application.</desc>
-					<label>Look &amp; Feel</label>
-				</info>
-				<constraints>
-					<enumeration oor:value="0">
-						<info>
-							<desc>Standard</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="1">
-						<info>
-							<desc>Macintosh</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="2">
-						<info>
-							<desc>X Window</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="3">
-						<info>
-							<desc>OS/2</desc>
-						</info>
-					</enumeration>
-				</constraints>
-				<value>0</value>
-			</prop>
 			<group oor:name="NewDocumentHandling">
 				<info>
 					<author>CD</author>
@@ -2723,17 +2690,6 @@
 					</info>
 					<value>true</value>
 				</prop>
-				<prop oor:name="ColoredTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with colored tab control (True)</desc>
-						<label>Colored tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 				<prop oor:name="MousePositioning" oor:type="xs:short">
 					<!-- OldPath: General/View -->
 					<!-- OldLocation: soffice.cfg -->
@@ -2789,17 +2745,6 @@
 					</constraints>
 					<value>1</value>
 				</prop>
-				<prop oor:name="SingleLineTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with single line tab control (True).</desc>
-						<label>Single line tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 			</group>
 			<group oor:name="Localisation">
 				<info>
@@ -4377,69 +4322,133 @@
 					<info>
 						<desc>Specifies default settings of graphic export dialogs.</desc>
 					</info>
-					<group oor:name="BMP">
+          <prop oor:name="PixelExportUnit" oor:type="xs:int">
+            <info>
+                <desc>Specifies the unit default that is used in the the graphic export dialog if exporting pixel graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>inches</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>mm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="3">
+                <info>
+                  <desc>points</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="4">
+                <info>
+                  <desc>pica</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="5">
+                <info>
+                  <desc>pixels</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="-1">
+                <info>
+                  <desc>default (depends to the metric settings in tools/options)</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>-1</value>
+          </prop>
+          <prop oor:name="PixelExportResolutionUnit" oor:type="xs:int">
+            <info>
+              <desc>Specifies the unit default for the resolution that is used in the the graphic export dialog if exporting pixel graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>pixels/inch</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>pixels/cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>pixels/meter</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>0</value>
+          </prop>
+          <prop oor:name="PixelExportResolution" oor:type="xs:int">
+            <info>
+              <desc>Specifies the logical width of a graphic. [UNIT=1/100 mm].</desc>
+            </info>
+            <constraints>
+              <minInclusive oor:value="1">
+                <info>
+                  <desc>Represents the lowest value that can be entered in the dialog.</desc>
+                </info>
+              </minInclusive>
+            </constraints>
+            <value>96</value>
+          </prop>
+          <prop oor:name="MaxFilesizeForRealtimePreview" oor:type="xs:int">
+            <info>
+              <desc>Specifies the maximum raw graphic size in bytes up to which the realtime preview is enabled, for fast computers this value may be enlarged</desc>
+            </info>
+            <value>4000000</value>
+          </prop>
+          <prop oor:name="VectorExportUnit" oor:type="xs:int">
+            <info>
+              <desc>Specifies the unit default that is used in the the graphic export dialog if exporting vector graphics.</desc>
+            </info>
+            <constraints>
+              <enumeration oor:value="0">
+                <info>
+                  <desc>inches</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="1">
+                <info>
+                  <desc>cm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="2">
+                <info>
+                  <desc>mm</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="3">
+                <info>
+                  <desc>points</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="4">
+                <info>
+                  <desc>pica</desc>
+                </info>
+              </enumeration>
+              <enumeration oor:value="-1">
+                <info>
+                  <desc>default (depends to the metric settings in tools/options)</desc>
+                </info>
+              </enumeration>
+            </constraints>
+            <value>-1</value>
+          </prop>
+          <group oor:name="BMP">
 						<info>
 							<desc>Specifies default settings of the Windows Bitmap export dialog.</desc>
 						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: BMP-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-							<info>
-								<desc>Specifies usable export modes.</desc>
-								<label>Mode - Original / Resolution / Size</label>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Logical size (dpi/pixel ratio)</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="2">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<prop oor:name="Resolution" oor:type="xs:int">
-							<!-- OldPath: BMP-EXPORT-RES -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-							<info>
-								<desc>Specifies resolution which is to be used if export mode is 1. [UNIT=dpi]</desc>
-								<label>Resolution</label>
-							</info>
-							<constraints>
-								<enumeration oor:value="75">
-									<info>
-										<desc>75</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="150">
-									<info>
-										<desc>150</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="300">
-									<info>
-										<desc>300</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="600">
-									<info>
-										<desc>600</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>75</value>
-						</prop>
 						<prop oor:name="Color" oor:type="xs:int">
 							<!-- OldLocation: fltopt.ini -->
 							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
@@ -4501,13 +4510,6 @@
 							</info>
 							<value>true</value>
 						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog] BMP Options -->
-						</node-ref>
 					</group>
 					<group oor:name="EPS">
 						<!-- OldLocation: fltopt.ini -->
@@ -4715,72 +4717,6 @@
 							<value>0</value>
 						</prop>
 					</group>
-					<group oor:name="MET">
-						<info>
-							<desc>Specifies if graphics are exported with the original- or selected size.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: MET-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  MET-OS/2 Metafile -->
-							<info>
-								<desc>Specifies if graphics are exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  MET-MS Windows - [dialog] MET Options -->
-						</node-ref>
-					</group>
-					<group oor:name="PCT">
-						<info>
-							<desc>Specifies default settings of the PCT - Mac Pict export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: PCT-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  PCT-Mac Pict -->
-							<info>
-								<desc>Specifies if graphics are exported with original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  PCT-MS Windows - [dialog] PCT Options -->
-						</node-ref>
-					</group>
 					<group oor:name="PBM">
 						<info>
 							<desc>Specifies default settings of the PBM - Portable Bitmap export dialog.</desc>
@@ -4859,105 +4795,6 @@
 							<value>1</value>
 						</prop>
 					</group>
-					<group oor:name="SVM">
-						<info>
-							<desc>Specifies default settings of the SVM - StarView Meta File export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: SVM-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  SVM - StarView Metafile -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  SVM  - StarView Metafile - [dialog] SVM Options -->
-						</node-ref>
-					</group>
-					<group oor:name="WMF">
-						<info>
-							<desc>Specifies default settings of the WMF - Windows Metafile export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: WMF-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  WMF -MS Windows Metafile -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  WMF - MS Windows Metafile - [dialog] WMF Options -->
-						</node-ref>
-					</group>
-					<group oor:name="EMF">
-						<info>
-							<desc>Specifies default settings of the EMF - Enhanced Metafile export dialog.</desc>
-						</info>
-						<prop oor:name="ExportMode" oor:type="xs:int">
-							<!-- OldPath: EMF-EXPORT-MODE -->
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File - Export -->
-							<info>
-								<desc>Specifies if graphics should be exported with the original- or selected size.</desc>
-							</info>
-							<constraints>
-								<enumeration oor:value="0">
-									<info>
-										<desc>Original size</desc>
-									</info>
-								</enumeration>
-								<enumeration oor:value="1">
-									<info>
-										<desc>Given size</desc>
-									</info>
-								</enumeration>
-							</constraints>
-							<value>0</value>
-						</prop>
-						<node-ref oor:name="Size" oor:node-type="LogicalGraphicSize">
-							<info>
-								<desc>Specifies the logical size of a graphic. [UNIT=1/100 mm].</desc>
-							</info>
-							<!-- OldLocation: fltopt.ini -->
-							<!-- UIHints: File  Export  Filetype  EMF - Enhanced Metafile - [dialog] EMF Options -->
-						</node-ref>
-					</group>
 					<group oor:name="PNG">
 						<info>
 							<desc>Specifies default settings of the PNG - Portable Network Graphic export dialog.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 1e1c800a50..1e1c800a50 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index a29bf76221..a29bf76221 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index a48598ee6e..e3c6c5cd58 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -282,7 +282,7 @@
 					<desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
 					<label>Copy while moving</label>
 				</info>
-				<value>false</value>
+				<value>true</value>
 			</prop>
 			<prop oor:name="ObjectMoveable" oor:type="xs:boolean">
 				<!-- OldPath: Draw/Other -->
@@ -410,7 +410,7 @@
 						<desc>Indicates whether a simple click on a text object changes it to edit mode.</desc>
 						<label>Allow quick editing</label>
 					</info>
-					<value>false</value>
+					<value>true</value>
 				</prop>
 				<prop oor:name="Selectable" oor:type="xs:boolean">
 					<!-- OldPath: Draw/Other/Text_Objects -->
@@ -824,7 +824,7 @@
 						<desc>Specifies the number of points between two grid points on the X axis.</desc>
 						<label>X Axis Subdivision</label>
 					</info>
-					<value>1</value>
+					<value>9</value>
 				</prop>
 				<prop oor:name="YAxis" oor:type="xs:double">
 					<!-- OldPath: Draw/Grid/Subdivision -->
@@ -836,7 +836,7 @@
 						<desc>Specifies the number of points between two grid points on the Y axis.</desc>
 						<label>Y Axis Subdivision</label>
 					</info>
-					<value>1</value>
+					<value>9</value>
 				</prop>
 			</group>
 			<group oor:name="SnapGrid">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
index a8652d720b..a8652d720b 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Events.xcs b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
index 6b0eb2d19f..6b0eb2d19f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Events.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
index 5f2f451f7b..5f2f451f7b 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
index de26a3ae14..819290c3c2 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
@@ -26,28 +26,52 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US"> 
-  <info>
-    <author>JL</author>
-    <desc >Contains information for the Extension Manager.</desc>
-  </info>
-  <component>
-    <group oor:name="ExtensionRepositories">
-      <info>
-	<desc>Information about repositories for extensions.
-	</desc>
-      </info>
-      <prop oor:name="WebsiteLink" oor:type="xs:string">
-	<info>
-	  <desc>This links is used from the Extension Manager. A user can click on the &amp;Download extensions...&amp;
-	    control so that a browser is opened which displayed the website to which directs this URL.
-	  </desc>
-	</info>
-	<value></value>
-      </prop>
-      
-    </group>
-  </component>
-
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ExtensionManager" oor:package="org.openoffice.Office" xml:lang="en-US">
+    <info>
+        <author>JL</author>
+        <desc>Contains information for the Extension Manager.</desc>
+    </info>
+    <templates>
+        <group oor:name="UpdateInfo">
+            <info>
+                <desc>Holds the information about updates for extensions.</desc>
+            </info>
+            <prop oor:name="Version" oor:type="xs:string" oor:localized="false">
+                <info>
+                    <desc>The version of the extension</desc>
+                </info>
+            </prop>
+        </group>
+    </templates>
+    <component>
+        <group oor:name="ExtensionRepositories">
+            <info>
+                <desc>Information about repositories for extensions.</desc>
+            </info>
+            <prop oor:name="WebsiteLink" oor:type="xs:string">
+                <info>
+                    <desc>This links is used from the Extension Manager. A user can click on the &amp;Download extensions...&amp;
+                        control so that a browser is opened which displayed the website to which directs this URL.
+                    </desc>
+                </info>
+                <value></value>
+            </prop>
+        </group>
+        <group oor:name="ExtensionUpdateData">
+            <info>
+                <desc>Contains inforamtion about availabe or ignored updates for extensions."</desc>
+            </info>
+            <set oor:name="AvailableUpdates" oor:node-type="UpdateInfo">
+                <info>
+                    <desc>This set lists all known updates for extensions, which where not applied yet.</desc>
+                </info>
+            </set>
+            <set oor:name="IgnoredUpdates" oor:node-type="UpdateInfo">
+                <info>
+                    <desc>This set lists all updates for extensions which the user wanted to ignore.</desc>
+                </info>
+            </set>
+        </group>
+    </component>
 </oor:component-schema>
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
index db5da3f67c..db5da3f67c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 947a26ce37..a2590a2d1c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -331,7 +331,7 @@
           <desc>Indicates whether moving while holding the Control key makes a copy of the moved object.</desc>
           <label>Copy while moving</label>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
       <prop oor:name="ObjectMoveable" oor:type="xs:boolean">
         <!-- OldPath: Impress/Other -->
@@ -371,7 +371,7 @@
           <desc>Indicates whether a double-click on an object activates the rotation mode.</desc>
           <label>Rotation Mode after clicking object</label>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
       <prop oor:name="Preview" oor:type="xs:double">
         <!-- OldPath: Impress/Other -->
@@ -537,6 +537,29 @@
         </info>
         <value>0</value>
       </prop>
+      <prop oor:name="PenColor" oor:type="xs:int">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: slide show context menu -->
+        <info>
+          <author>CL</author>
+          <desc>Color of the pen during slideshow.</desc>
+          <label>Pen Color</label>
+        </info>
+        <value>16711680</value>
+      </prop>
+      <prop oor:name="PenWidth" oor:type="xs:double">
+        <!-- OldPath: -->
+        <!-- OldLocation: -->
+        <!-- UIHints: slide show context menu -->
+        <info>
+          <author>CL</author>
+          <desc>Width of the pen during slideshow.</desc>
+          <label>Pen Width</label>
+        </info>
+        <value>150</value>
+      </prop>
+
       <group oor:name="TextObject">
         <info>
           <desc>Contains text editing related configuration items.</desc>
@@ -679,7 +702,7 @@
             <desc>Indicates whether to snap at snap lines.</desc>
             <label>Snap lines</label>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop oor:name="PageMargin" oor:type="xs:boolean">
           <!-- OldPath: Impress/Snap/Objects -->
@@ -699,7 +722,7 @@
             <desc>Indicates whether to justify the outline of an object to that of an adjacent object.</desc>
             <label>Object frame</label>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop oor:name="ObjectPoint" oor:type="xs:boolean">
           <!-- OldPath: Impress/Snap/Objects -->
@@ -871,14 +894,14 @@
               <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>2000</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
               <desc>Defines the horizontal distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
               <label/>
             </info>
-            <value>1270</value>
+            <value>2540</value>
           </prop>
         </group>
         <group oor:name="YAxis">
@@ -895,14 +918,14 @@
               <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the metric system is active.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>2000</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
               <desc>Defines the vertical distance between adjacent grid points in 1/100 mm, used when the non-metric system is active.</desc>
               <label/>
             </info>
-            <value>1270</value>
+            <value>2540</value>
           </prop>
         </group>
       </group>
@@ -919,7 +942,7 @@
             <desc>Specifies the number of points between two adjacent grid points on the X axis.</desc>
             <label>X Axis Subdivision</label>
           </info>
-          <value>1</value>
+          <value>9</value>
         </prop>
         <prop oor:name="YAxis" oor:type="xs:double">
           <!-- OldPath: Impress/Grid/Subdivision -->
@@ -930,7 +953,7 @@
             <desc>Specifies the number of intervals between two adjacent grid points on the Y axis</desc>
             <label>Y Axis Subdivision</label>
           </info>
-          <value>1</value>
+          <value>9</value>
         </prop>
       </group>
       <group oor:name="SnapGrid">
@@ -961,7 +984,7 @@
               <desc>Defines the horizontal distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>100</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
@@ -985,7 +1008,7 @@
               <desc>Defines the vertical distance between adjacent points of the snap grid in 1/100 mm, used when the metric system is selected.</desc>
               <label/>
             </info>
-            <value>1000</value>
+            <value>100</value>
           </prop>
           <prop oor:name="NonMetric" oor:type="xs:int">
             <info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index 06666ad4a6..06666ad4a6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
index a9b4cdc70f..f5421c8a24 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -40,6 +40,11 @@
 					<desc>Must contain an UNO implementation(!) name of the implemented job component.</desc>
 				</info>
             		</prop>
+            		<prop oor:name="Context" oor:type="xs:string">
+                		<info>
+					<desc>An property to define the context this event should be active in. It can be empty or a colon separated list of the supported application modules.</desc>
+				</info>
+            		</prop>
             		<group oor:name="Arguments" oor:extensible="true">
                 		<info>
 					<desc>Can be filled with any argument, which is under control of the job component.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index c8eec73838..c8eec73838 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 42d0f5428d..42d0f5428d 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 2fda9ea6aa..2fda9ea6aa 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index da1071db75..50b4ede0ec 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -316,6 +316,20 @@
 				<value>100</value>
 			</prop>
 		</group>
+        <group oor:name="LoadSave">
+            <info>
+                <desc>Contains settings related to load and save operations.</desc>
+            </info>
+            <prop oor:name="IsSaveOnlyUsedSymbols" oor:type="xs:boolean">
+                <!-- UIHints: - Tools/Options - OpenOffice Maths - Settings -->
+                <info>
+                    <author>TL</author>
+                    <desc>When set only symbols used in the current formula will be saved. Otherwise all user defined symbols will be saved in each formula.</desc>
+                    <label>Save only used symbols.</label>
+                </info>
+                <value>true</value>
+            </prop>
+        </group>
 		<group oor:name="Misc">
 			<info>
 				<desc>Contains miscellaneous settings.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
index db7b694b5b..db7b694b5b 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
index f1c4cab212..f1c4cab212 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
index fe9620cf81..fe9620cf81 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index 0feb152457..0feb152457 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index f424180c76..f424180c76 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index 496381d36e..496381d36e 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
index b77cb00f8c..90acb2a110 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
@@ -48,28 +48,5 @@
 				<desc>Lists the registered Scripting Framework runtimes.</desc>
 			</info>
 		</set>
-		<group oor:name="ScriptDisplaySettings">
-			<info>
-				<desc> Specifies display settings for assignment dialogs </desc>
-			</info>
-			<prop oor:name="ShowBasic" oor:type="xs:boolean">
-				<info>
-					<desc>Show Basic scripts in assignment dialogs</desc>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="ShowSF" oor:type="xs:boolean">
-				<info>
-					<desc>Show Scripting Framework scripts in assignment dialogs</desc>
-				</info>
-				<value>true</value>
-			</prop>
-			<prop oor:name="UseNewToolsConfigure" oor:type="xs:boolean">
-				<info>
-					<desc>Use New Tools Configure dialog</desc>
-				</info>
-				<value>true</value>
-			</prop>
-		</group>
 	</component>
 </oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Security.xcs b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
index d66d539fa9..d66d539fa9 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
index c4c2ecdc3b..c4c2ecdc3b 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
index 85ec176423..85ec176423 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
index 5479453aed..5479453aed 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
index eabd4a8094..eabd4a8094 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 1784d82f62..1784d82f62 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
index a7b3c2b02c..a7b3c2b02c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
index 04a554578a..04a554578a 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
index 2b98a81576..2b98a81576 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
index c0fe1abc68..c0fe1abc68 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
index 0cb6022d21..0cb6022d21 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
index ab8a986db7..ab8a986db7 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
index 6f13b54589..6f13b54589 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
index 7830975c4c..7830975c4c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
index f94c262438..f94c262438 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
index 8df1302813..8df1302813 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 71efdab1b6..71efdab1b6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
index 5d45bcce7a..5d45bcce7a 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
index 7af6774dc9..7af6774dc9 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
index d01098d2c3..d01098d2c3 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
index a007de1118..a007de1118 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
index 90ddd2abfe..90ddd2abfe 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
index 0619bf296a..0619bf296a 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
index 372b64465e..372b64465e 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
index 3ae166d234..3ae166d234 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
index 4bb0543371..4bb0543371 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
index b89f2dec03..b89f2dec03 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
index 958d10cac5..958d10cac5 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
index 63e36d1eda..63e36d1eda 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
index 779bcc5925..779bcc5925 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
index b9104649a6..b9104649a6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
index 48331f37ee..48331f37ee 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
index f79a2ebde6..f79a2ebde6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
index f7a16d9e49..f7a16d9e49 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
index 8e82d2e03b..8e82d2e03b 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
index 7bf3ec8294..7bf3ec8294 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
index 68535d1fc6..68535d1fc6 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
index b56629aca2..b56629aca2 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
index d2af2b1ce5..d2af2b1ce5 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
index 22e05e161c..22e05e161c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
index abf68bdeca..abf68bdeca 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
index 4424ce1cbc..4424ce1cbc 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
index 96a2a834b2..96a2a834b2 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
index 87854b9a5f..87854b9a5f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
index 13d864751f..13d864751f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
index e5b949b08c..e5b949b08c 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/Office/Views.xcs b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
index 58afd94a92..58afd94a92 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Views.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
index bd46f61937..bd46f61937 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 3c3c5dbde3..cb951f9878 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1523,6 +1523,15 @@
 				<info>
 					<desc>Contains miscellaneous settings.</desc>
 				</info>
+				<prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean">
+					<!-- UIHints: none yet -->
+					<info>
+						<author>TL</author>
+						<desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc>
+						<label>Align Math objects</label>
+					</info>
+					<value>true</value>
+				</prop>
 				<prop oor:name="MeasureUnit" oor:type="xs:int">
 					<!-- OldPath: Writer/Layout -->
 					<!-- OldLocation: Soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 8738d9db21..b92e4684c8 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -418,6 +418,15 @@
 				<info>
 					<desc>Contains miscellaneous settings.</desc>
 				</info>
+                <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean">
+                    <!-- UIHints: none yet -->
+                    <info>
+                        <author>TL</author>
+                        <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc>
+                        <label>Align Math objects</label>
+                    </info>
+                    <value>true</value>
+                </prop>
 				<prop oor:name="MeasureUnit" oor:type="xs:int">
 					<!-- OldPath: HTML_Editor/Layout/Window -->
 					<!-- OldLocation: Soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
index c59b2d8721..c59b2d8721 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index 62d3fdcce8..62d3fdcce8 100644..100755
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
diff --git a/officecfg/registry/schema/org/openoffice/System.xcs b/officecfg/registry/schema/org/openoffice/System.xcs
index 4d432659d5..4d432659d5 100644..100755
--- a/officecfg/registry/schema/org/openoffice/System.xcs
+++ b/officecfg/registry/schema/org/openoffice/System.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index c92f93f79d..c92f93f79d 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
index c6762465b8..c6762465b8 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
index 62e3bd508f..62e3bd508f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index 43e6693fc1..43e6693fc1 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
index a39002b310..a39002b310 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
index e2279a42f7..e2279a42f7 100644..100755
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/UserProfile.xcs b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
index 1ff7c0aa05..1ff7c0aa05 100644..100755
--- a/officecfg/registry/schema/org/openoffice/UserProfile.xcs
+++ b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
diff --git a/officecfg/registry/schema/org/openoffice/VCL.xcs b/officecfg/registry/schema/org/openoffice/VCL.xcs
index 1132461ff1..1132461ff1 100644..100755
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
diff --git a/officecfg/registry/schema/org/openoffice/makefile.mk b/officecfg/registry/schema/org/openoffice/makefile.mk
index f928e447f4..f928e447f4 100644..100755
--- a/officecfg/registry/schema/org/openoffice/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/makefile.mk
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
index 049ccc9492..049ccc9492 100644..100755
--- a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
index 3366253166..3366253166 100644..100755
--- a/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
diff --git a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
index ea6de5b80a..ea6de5b80a 100644..100755
--- a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
diff --git a/officecfg/registry/schema/org/openoffice/ucb/Store.xcs b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
index ee439c9e02..ee439c9e02 100644..100755
--- a/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
diff --git a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
index d35de7a73f..d35de7a73f 100644..100755
--- a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index dafb45c85c..dafb45c85c 100644..100755
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
diff --git a/officecfg/util/component-conf.gen b/officecfg/util/component-conf.gen
index 1882c60b8a..1882c60b8a 100644..100755
--- a/officecfg/util/component-conf.gen
+++ b/officecfg/util/component-conf.gen
diff --git a/officecfg/util/component-ldif.gen b/officecfg/util/component-ldif.gen
index 4b0fffeaa5..4b0fffeaa5 100644..100755
--- a/officecfg/util/component-ldif.gen
+++ b/officecfg/util/component-ldif.gen
diff --git a/officecfg/util/component-map.gen b/officecfg/util/component-map.gen
index 3285c5d659..3285c5d659 100644..100755
--- a/officecfg/util/component-map.gen
+++ b/officecfg/util/component-map.gen
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index d918431c75..d918431c75 100644..100755
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
diff --git a/officecfg/util/delcomment.sed b/officecfg/util/delcomment.sed
index 7f47aaeb21..7f47aaeb21 100644..100755
--- a/officecfg/util/delcomment.sed
+++ b/officecfg/util/delcomment.sed
diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index f87e270945..c1fa542771 100644..100755
--- a/officecfg/util/makefile.mk
+++ b/officecfg/util/makefile.mk
@@ -37,7 +37,6 @@ TARGET=util
 
 $(MISC)$/$(TARGET)_delzip :
     -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
-    -$(RM) $(COMMON_OUTDIR)$/bin$/registry_{$(alllangiso)}.zip
 
 $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
     cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
diff --git a/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
index 28316b4267..28316b4267 100644..100755
--- a/officecfg/util/makefile.pmk
+++ b/officecfg/util/makefile.pmk
diff --git a/officecfg/util/resource.xsl b/officecfg/util/resource.xsl
index 83bc04db2b..83bc04db2b 100644..100755
--- a/officecfg/util/resource.xsl
+++ b/officecfg/util/resource.xsl
diff --git a/officecfg/util/sanity.xsl b/officecfg/util/sanity.xsl
index 995f90c9ef..995f90c9ef 100644..100755
--- a/officecfg/util/sanity.xsl
+++ b/officecfg/util/sanity.xsl
diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index 6d58e97ccc..6d58e97ccc 100644..100755
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl
index f8147d82b6..f8147d82b6 100644..100755
--- a/officecfg/util/schema_val.xsl
+++ b/officecfg/util/schema_val.xsl
diff --git a/officecfg/util/template.gen b/officecfg/util/template.gen
index 5b2c3d4088..5b2c3d4088 100644..100755
--- a/officecfg/util/template.gen
+++ b/officecfg/util/template.gen
diff --git a/oovbaapi/genconstidl/ApiSymbols.dtd b/oovbaapi/genconstidl/ApiSymbols.dtd
index 28fb539870..28fb539870 100644..100755
--- a/oovbaapi/genconstidl/ApiSymbols.dtd
+++ b/oovbaapi/genconstidl/ApiSymbols.dtd
diff --git a/oovbaapi/genconstidl/access.api b/oovbaapi/genconstidl/access.api
index 6abbcf1f36..6abbcf1f36 100644..100755
--- a/oovbaapi/genconstidl/access.api
+++ b/oovbaapi/genconstidl/access.api
diff --git a/oovbaapi/genconstidl/adodb.api b/oovbaapi/genconstidl/adodb.api
index e36a2cb40d..e36a2cb40d 100644..100755
--- a/oovbaapi/genconstidl/adodb.api
+++ b/oovbaapi/genconstidl/adodb.api
diff --git a/oovbaapi/genconstidl/api-to-idl.pl b/oovbaapi/genconstidl/api-to-idl.pl
index 972e8b3445..972e8b3445 100644..100755
--- a/oovbaapi/genconstidl/api-to-idl.pl
+++ b/oovbaapi/genconstidl/api-to-idl.pl
diff --git a/oovbaapi/genconstidl/dao.api b/oovbaapi/genconstidl/dao.api
index 9f32fa07c2..9f32fa07c2 100644..100755
--- a/oovbaapi/genconstidl/dao.api
+++ b/oovbaapi/genconstidl/dao.api
diff --git a/oovbaapi/genconstidl/excel.api b/oovbaapi/genconstidl/excel.api
index 6e61db1249..6e61db1249 100644..100755
--- a/oovbaapi/genconstidl/excel.api
+++ b/oovbaapi/genconstidl/excel.api
diff --git a/oovbaapi/genconstidl/makefile.mk b/oovbaapi/genconstidl/makefile.mk
index 078f4d0904..078f4d0904 100644..100755
--- a/oovbaapi/genconstidl/makefile.mk
+++ b/oovbaapi/genconstidl/makefile.mk
diff --git a/oovbaapi/genconstidl/msforms.api b/oovbaapi/genconstidl/msforms.api
index a604330776..a604330776 100644..100755
--- a/oovbaapi/genconstidl/msforms.api
+++ b/oovbaapi/genconstidl/msforms.api
diff --git a/oovbaapi/genconstidl/oovbaconsts.xsl b/oovbaapi/genconstidl/oovbaconsts.xsl
index 417cfd51ec..417cfd51ec 100644..100755
--- a/oovbaapi/genconstidl/oovbaconsts.xsl
+++ b/oovbaapi/genconstidl/oovbaconsts.xsl
diff --git a/oovbaapi/genconstidl/powerpoint.api b/oovbaapi/genconstidl/powerpoint.api
index cd417af4a6..cd417af4a6 100644..100755
--- a/oovbaapi/genconstidl/powerpoint.api
+++ b/oovbaapi/genconstidl/powerpoint.api
diff --git a/oovbaapi/genconstidl/stdole.api b/oovbaapi/genconstidl/stdole.api
index aefe25a9ee..aefe25a9ee 100644..100755
--- a/oovbaapi/genconstidl/stdole.api
+++ b/oovbaapi/genconstidl/stdole.api
diff --git a/oovbaapi/genconstidl/vba.api b/oovbaapi/genconstidl/vba.api
index bbbe1a0fc1..bbbe1a0fc1 100644..100755
--- a/oovbaapi/genconstidl/vba.api
+++ b/oovbaapi/genconstidl/vba.api
diff --git a/oovbaapi/genconstidl/word.api b/oovbaapi/genconstidl/word.api
index 9951e2a206..9951e2a206 100644..100755
--- a/oovbaapi/genconstidl/word.api
+++ b/oovbaapi/genconstidl/word.api
diff --git a/oovbaapi/ooo/vba/ControlProvider.idl b/oovbaapi/ooo/vba/ControlProvider.idl
index a6c47131a5..a6c47131a5 100644..100755
--- a/oovbaapi/ooo/vba/ControlProvider.idl
+++ b/oovbaapi/ooo/vba/ControlProvider.idl
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index c1490fc643..c53e1fa357 100644..100755
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -49,9 +49,9 @@ interface XApplicationBase
 
     void Quit();
 
-    any CommandBars( [in] any aIndex );
+    any CommandBars( [in] any Index );
     any Run([in] string MacroName, [in] /*Optional*/ any varg1, [in] /*Optional*/ any varg2, [in] /*Optional*/ any varg3, [in] /*Optional*/ any varg4, [in] /*Optional*/ any varg5, [in] /*Optional*/ any varg6, [in] /*Optional*/ any varg7, [in] /*Optional*/ any varg8, [in] /*Optional*/ any varg9, [in] /*Optional*/ any varg10, [in] /*Optional*/ any varg11, [in] /*Optional*/ any varg12, [in] /*Optional*/ any varg13, [in] /*Optional*/ any varg14, [in] /*Optional*/ any varg15, [in] /*Optional*/ any varg16, [in] /*Optional*/ any varg17, [in] /*Optional*/ any varg18, [in] /*Optional*/ any varg19, [in] /*Optional*/ any varg20, [in] /*Optional*/ any varg21, [in] /*Optional*/ any varg22, [in] /*Optional*/ any varg23, [in] /*Optional*/ any varg24, [in] /*Optional*/ any varg25, [in] /*Optional*/ any varg26, [in] /*Optional*/ any varg27, [in] /*Optional*/ any varg28, [in] /*Optional*/ any varg29, [in] /*Optional*/ any varg30);
-    void OnTime( [in] any aEarliestTime, [in] string aFunction, [in] any aLatestTime, [in] any aSchedule );
+    void OnTime( [in] any EarliestTime, [in] string Procedure, [in] any LatestTime, [in] any Schedule );
     float CentimetersToPoints([in] float Centimeters );
     void Undo();
 };
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
index dd6e762ab5..dd6e762ab5 100644..100755
--- a/oovbaapi/ooo/vba/XAssistant.idl
+++ b/oovbaapi/ooo/vba/XAssistant.idl
diff --git a/oovbaapi/ooo/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 7b41e9e682..7b41e9e682 100644..100755
--- a/oovbaapi/ooo/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl
index 9ec666fcdd..9ec666fcdd 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBar.idl
+++ b/oovbaapi/ooo/vba/XCommandBar.idl
diff --git a/oovbaapi/ooo/vba/XCommandBarButton.idl b/oovbaapi/ooo/vba/XCommandBarButton.idl
index edbd0920bd..edbd0920bd 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBarButton.idl
+++ b/oovbaapi/ooo/vba/XCommandBarButton.idl
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
index 2049cf5342..2049cf5342 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBarControl.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
index 5a2e9a4645..5a2e9a4645 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBarControls.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
diff --git a/oovbaapi/ooo/vba/XCommandBarPopup.idl b/oovbaapi/ooo/vba/XCommandBarPopup.idl
index b90d3ba6f5..b90d3ba6f5 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBarPopup.idl
+++ b/oovbaapi/ooo/vba/XCommandBarPopup.idl
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
index 0197cb2f19..0197cb2f19 100644..100755
--- a/oovbaapi/ooo/vba/XCommandBars.idl
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
diff --git a/oovbaapi/ooo/vba/XControlProvider.idl b/oovbaapi/ooo/vba/XControlProvider.idl
index afffe8edbb..afffe8edbb 100644..100755
--- a/oovbaapi/ooo/vba/XControlProvider.idl
+++ b/oovbaapi/ooo/vba/XControlProvider.idl
diff --git a/oovbaapi/ooo/vba/XDialogBase.idl b/oovbaapi/ooo/vba/XDialogBase.idl
index 9a4cef9682..9a4cef9682 100644..100755
--- a/oovbaapi/ooo/vba/XDialogBase.idl
+++ b/oovbaapi/ooo/vba/XDialogBase.idl
diff --git a/oovbaapi/ooo/vba/XDialogsBase.idl b/oovbaapi/ooo/vba/XDialogsBase.idl
index a194006709..a194006709 100644..100755
--- a/oovbaapi/ooo/vba/XDialogsBase.idl
+++ b/oovbaapi/ooo/vba/XDialogsBase.idl
diff --git a/oovbaapi/ooo/vba/XDocumentBase.idl b/oovbaapi/ooo/vba/XDocumentBase.idl
index 04181bb33c..04181bb33c 100644..100755
--- a/oovbaapi/ooo/vba/XDocumentBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentBase.idl
diff --git a/oovbaapi/ooo/vba/XDocumentProperties.idl b/oovbaapi/ooo/vba/XDocumentProperties.idl
index cd5c80964e..cd5c80964e 100644..100755
--- a/oovbaapi/ooo/vba/XDocumentProperties.idl
+++ b/oovbaapi/ooo/vba/XDocumentProperties.idl
diff --git a/oovbaapi/ooo/vba/XDocumentProperty.idl b/oovbaapi/ooo/vba/XDocumentProperty.idl
index b0f1a2c5c6..b0f1a2c5c6 100644..100755
--- a/oovbaapi/ooo/vba/XDocumentProperty.idl
+++ b/oovbaapi/ooo/vba/XDocumentProperty.idl
diff --git a/oovbaapi/ooo/vba/XDocumentsBase.idl b/oovbaapi/ooo/vba/XDocumentsBase.idl
index 1ce6725660..1ce6725660 100644..100755
--- a/oovbaapi/ooo/vba/XDocumentsBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentsBase.idl
diff --git a/oovbaapi/ooo/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index 5c3ea226a2..5c3ea226a2 100644..100755
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
diff --git a/oovbaapi/ooo/vba/XFileDialog.idl b/oovbaapi/ooo/vba/XFileDialog.idl
index f7639860ca..f7639860ca 100644..100755
--- a/oovbaapi/ooo/vba/XFileDialog.idl
+++ b/oovbaapi/ooo/vba/XFileDialog.idl
diff --git a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
index 103ffac55a..103ffac55a 100644..100755
--- a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
+++ b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl
diff --git a/oovbaapi/ooo/vba/XFileSearch.idl b/oovbaapi/ooo/vba/XFileSearch.idl
index 7b67c995fa..7b67c995fa 100644..100755
--- a/oovbaapi/ooo/vba/XFileSearch.idl
+++ b/oovbaapi/ooo/vba/XFileSearch.idl
diff --git a/oovbaapi/ooo/vba/XFontBase.idl b/oovbaapi/ooo/vba/XFontBase.idl
index 1310ca67b1..1310ca67b1 100644..100755
--- a/oovbaapi/ooo/vba/XFontBase.idl
+++ b/oovbaapi/ooo/vba/XFontBase.idl
diff --git a/oovbaapi/ooo/vba/XFoundFiles.idl b/oovbaapi/ooo/vba/XFoundFiles.idl
index a11fa98e6b..a11fa98e6b 100644..100755
--- a/oovbaapi/ooo/vba/XFoundFiles.idl
+++ b/oovbaapi/ooo/vba/XFoundFiles.idl
diff --git a/oovbaapi/ooo/vba/XGlobalsBase.idl b/oovbaapi/ooo/vba/XGlobalsBase.idl
index c04a2029bd..c04a2029bd 100644..100755
--- a/oovbaapi/ooo/vba/XGlobalsBase.idl
+++ b/oovbaapi/ooo/vba/XGlobalsBase.idl
diff --git a/oovbaapi/ooo/vba/XHelperInterface.idl b/oovbaapi/ooo/vba/XHelperInterface.idl
index 6adfdbee24..6adfdbee24 100644..100755
--- a/oovbaapi/ooo/vba/XHelperInterface.idl
+++ b/oovbaapi/ooo/vba/XHelperInterface.idl
diff --git a/oovbaapi/ooo/vba/XPageSetupBase.idl b/oovbaapi/ooo/vba/XPageSetupBase.idl
index db5a1499a8..db5a1499a8 100644..100755
--- a/oovbaapi/ooo/vba/XPageSetupBase.idl
+++ b/oovbaapi/ooo/vba/XPageSetupBase.idl
diff --git a/oovbaapi/ooo/vba/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index bdb1f89e18..bdb1f89e18 100644..100755
--- a/oovbaapi/ooo/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
diff --git a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index 5ca644c12d..5ca644c12d 100644..100755
--- a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
diff --git a/oovbaapi/ooo/vba/XWindowBase.idl b/oovbaapi/ooo/vba/XWindowBase.idl
index 6c35904662..6c35904662 100644..100755
--- a/oovbaapi/ooo/vba/XWindowBase.idl
+++ b/oovbaapi/ooo/vba/XWindowBase.idl
diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index dbe2213913..dbe2213913 100644..100755
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
diff --git a/oovbaapi/ooo/vba/excel/Globals.idl b/oovbaapi/ooo/vba/excel/Globals.idl
index 334bcff1bb..334bcff1bb 100644..100755
--- a/oovbaapi/ooo/vba/excel/Globals.idl
+++ b/oovbaapi/ooo/vba/excel/Globals.idl
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
index e3cf458b98..e3cf458b98 100644..100755
--- a/oovbaapi/ooo/vba/excel/Hyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
diff --git a/oovbaapi/ooo/vba/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index f8639b8901..f8639b8901 100644..100755
--- a/oovbaapi/ooo/vba/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
diff --git a/oovbaapi/ooo/vba/excel/SheetObject.idl b/oovbaapi/ooo/vba/excel/SheetObject.idl
index 5d8e6efb39..618c0962d5 100755
--- a/oovbaapi/ooo/vba/excel/SheetObject.idl
+++ b/oovbaapi/ooo/vba/excel/SheetObject.idl
@@ -111,7 +111,7 @@ interface XButton : com::sun::star::uno::XInterface
     [attribute] long Orientation;
 
     /** Access to text and text formatting of the button caption. */
-    XCharacters Characters( [in] any aStart, [in] any aLength );
+    XCharacters Characters( [in] any Start, [in] any Length );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/SheetObjects.idl b/oovbaapi/ooo/vba/excel/SheetObjects.idl
index 4c93bb3bf5..a88ab6b162 100755
--- a/oovbaapi/ooo/vba/excel/SheetObjects.idl
+++ b/oovbaapi/ooo/vba/excel/SheetObjects.idl
@@ -81,7 +81,7 @@ interface XGraphicObjects : com::sun::star::uno::XInterface
         
         @return  The created graphic object.
      */
-    any Add( [in] any fLeft, [in] any fTop, [in] any fWidth, [in] any fHeight );
+    any Add( [in] any Left, [in] any Top, [in] any Width, [in] any Height );
 };
 
 //=============================================================================
@@ -109,7 +109,7 @@ interface XLineObjects : com::sun::star::uno::XInterface
 
         @return  The created line object.
      */
-    any Add( [in] any fX1, [in] any fY1, [in] any fX2, [in] any fY2 );
+    any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2 );
 };
 
 //=============================================================================
@@ -131,7 +131,7 @@ interface XDrawings : com::sun::star::uno::XInterface
 
         @return  The created polygon object.
      */
-    any Add( [in] any fX1, [in] any fY1, [in] any fX2, [in] any fY2, [in] any bClosed );
+    any Add( [in] any X1, [in] any Y1, [in] any X2, [in] any Y2, [in] any Closed );
 };
 
 //=============================================================================
diff --git a/oovbaapi/ooo/vba/excel/TextFrame.idl b/oovbaapi/ooo/vba/excel/TextFrame.idl
index 26a4481e98..26a4481e98 100644..100755
--- a/oovbaapi/ooo/vba/excel/TextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/TextFrame.idl
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
index e13f8b6732..e13f8b6732 100644..100755
--- a/oovbaapi/ooo/vba/excel/Window.idl
+++ b/oovbaapi/ooo/vba/excel/Window.idl
diff --git a/oovbaapi/ooo/vba/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index a3ea43e1f7..a3ea43e1f7 100644..100755
--- a/oovbaapi/ooo/vba/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
diff --git a/oovbaapi/ooo/vba/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index 4d7189c361..4d7189c361 100644..100755
--- a/oovbaapi/ooo/vba/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 16bb415643..c219c5a2ee 100644..100755
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -90,10 +90,10 @@ interface XApplication
     string LibraryPath() raises(com::sun::star::script::BasicErrorException);
     string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
     string PathSeparator() raises(com::sun::star::script::BasicErrorException);
-    //any CommandBars( [in] any aIndex );
-    any Workbooks( [in] any aIndex );
-    any Worksheets( [in] any aIndex );
-    any Windows( [in] any aIndex );
+    //any CommandBars( [in] any Index );
+    any Workbooks( [in] any Index );
+    any Worksheets( [in] any Index );
+    any Windows( [in] any Index );
     any WorksheetFunction();
     any Evaluate( [in] string Name );
     any Dialogs( [in] any DialogIndex );
@@ -108,7 +108,7 @@ interface XApplication
     XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
         raises(com::sun::star::script::BasicErrorException);
     void Volatile([in] any Volatile);
-    any Caller( [in] any aIndex );
+    any Caller( [in] any Index );
     any MenuBars( [in] any aIndex );
     any International([in] long Index);
     any GetSaveAsFilename( [in] any InitialFilename, [in] any FileFilter, [in] any FilterIndex, [in] any Title,[in] any ButtonText);
diff --git a/oovbaapi/ooo/vba/excel/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index 06d7c7f073..06d7c7f073 100644..100755
--- a/oovbaapi/ooo/vba/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 0183d3bccc..0183d3bccc 100644..100755
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
diff --git a/oovbaapi/ooo/vba/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index 559a6e26e0..559a6e26e0 100644..100755
--- a/oovbaapi/ooo/vba/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
diff --git a/oovbaapi/ooo/vba/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index c25c15f7f6..c25c15f7f6 100644..100755
--- a/oovbaapi/ooo/vba/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
diff --git a/oovbaapi/ooo/vba/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index 1cf3233227..1cf3233227 100644..100755
--- a/oovbaapi/ooo/vba/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
diff --git a/oovbaapi/ooo/vba/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index e5ea29de03..e5ea29de03 100644..100755
--- a/oovbaapi/ooo/vba/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
diff --git a/oovbaapi/ooo/vba/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index 01db5bd38b..01db5bd38b 100644..100755
--- a/oovbaapi/ooo/vba/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
diff --git a/oovbaapi/ooo/vba/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index 782f97f11d..782f97f11d 100644..100755
--- a/oovbaapi/ooo/vba/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
diff --git a/oovbaapi/ooo/vba/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index 9f2a4a148c..9f2a4a148c 100644..100755
--- a/oovbaapi/ooo/vba/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
diff --git a/oovbaapi/ooo/vba/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index 66b5921867..66b5921867 100644..100755
--- a/oovbaapi/ooo/vba/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
diff --git a/oovbaapi/ooo/vba/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index c04189bb7f..c04189bb7f 100644..100755
--- a/oovbaapi/ooo/vba/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
diff --git a/oovbaapi/ooo/vba/excel/XComment.idl b/oovbaapi/ooo/vba/excel/XComment.idl
index e691c1f0d7..e691c1f0d7 100644..100755
--- a/oovbaapi/ooo/vba/excel/XComment.idl
+++ b/oovbaapi/ooo/vba/excel/XComment.idl
diff --git a/oovbaapi/ooo/vba/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index 23df436e9c..23df436e9c 100644..100755
--- a/oovbaapi/ooo/vba/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
diff --git a/oovbaapi/ooo/vba/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index ae2f06070b..ae2f06070b 100644..100755
--- a/oovbaapi/ooo/vba/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
diff --git a/oovbaapi/ooo/vba/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 59e22713a2..59e22713a2 100644..100755
--- a/oovbaapi/ooo/vba/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index 3d4fc78e49..3d4fc78e49 100644..100755
--- a/oovbaapi/ooo/vba/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index 92828c3708..92828c3708 100644..100755
--- a/oovbaapi/ooo/vba/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index 40cddb57b5..40cddb57b5 100644..100755
--- a/oovbaapi/ooo/vba/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
diff --git a/oovbaapi/ooo/vba/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 7b3622ecc5..3cbb678dad 100644..100755
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -46,7 +46,7 @@ interface XFormat
     interface ::ooo::vba::XHelperInterface;
     // void			Clear(  ) raises ( com::sun::star::script::BasicErrorException );
 
-    any Borders( [in] any item )
+    any Borders( [in] any Item )
         raises(com::sun::star::script::BasicErrorException);
 
     XFont Font()
diff --git a/oovbaapi/ooo/vba/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index f3ea093098..f3ea093098 100644..100755
--- a/oovbaapi/ooo/vba/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
diff --git a/oovbaapi/ooo/vba/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 14b7ba3b69..14b7ba3b69 100644..100755
--- a/oovbaapi/ooo/vba/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
diff --git a/oovbaapi/ooo/vba/excel/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index c3104cebf8..ab0b35152e 100644..100755
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -65,18 +65,18 @@ interface XGlobals: com::sun::star::uno::XInterface
 
     void Calculate() raises(com::sun::star::script::BasicErrorException);
     XRange Cells([in] any RowIndex, [in] any ColumnIndex);
-    XRange Columns([in] any aIndex);
-    any CommandBars( [in] any aIndex );
+    XRange Columns([in] any Index);
+    any CommandBars( [in] any Index );
     any Evaluate( [in] string Name );
 XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
         raises(com::sun::star::script::BasicErrorException);
-    any WorkSheets( [in] any aIndex );
-    any WorkBooks( [in] any aIndex );
+    any WorkSheets( [in] any Index );
+    any WorkBooks( [in] any Index );
     any WorksheetFunction();
-    any Windows( [in] any aIndex );
-    any Sheets( [in] any aIndex );
+    any Windows( [in] any Index );
+    any Sheets( [in] any Index );
     any Range( [in] any Cell1, [in] any Cell2 );
-    XRange Rows([in] any aIndex);
+    XRange Rows([in] any Index);
     any Names( [in] any Index );
     XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
         raises(com::sun::star::script::BasicErrorException);
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
index befeaf7d7c..befeaf7d7c 100644..100755
--- a/oovbaapi/ooo/vba/excel/XHPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
index f7bd1e760b..f7bd1e760b 100644..100755
--- a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
diff --git a/oovbaapi/ooo/vba/excel/XHyperlink.idl b/oovbaapi/ooo/vba/excel/XHyperlink.idl
index 76a2694c25..76a2694c25 100644..100755
--- a/oovbaapi/ooo/vba/excel/XHyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/XHyperlink.idl
diff --git a/oovbaapi/ooo/vba/excel/XHyperlinks.idl b/oovbaapi/ooo/vba/excel/XHyperlinks.idl
index 76c6daf3e3..0b8a6c28b6 100755
--- a/oovbaapi/ooo/vba/excel/XHyperlinks.idl
+++ b/oovbaapi/ooo/vba/excel/XHyperlinks.idl
@@ -47,11 +47,11 @@ interface XHyperlinks
     // ------------------------------------------------------------------------
 
     XHyperlink Add(
-        [in] any aAnchor,
-        [in] any aAddress,
-        [in] any aSubAddress,
-        [in] any aScreenTip,
-        [in] any aTextToDisplay );
+        [in] any Anchor,
+        [in] any Address,
+        [in] any SubAddress,
+        [in] any ScreenTip,
+        [in] any TextToDisplay );
         
     // ------------------------------------------------------------------------
     
diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index 2d3a9120bf..2d3a9120bf 100644..100755
--- a/oovbaapi/ooo/vba/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenu.idl b/oovbaapi/ooo/vba/excel/XMenu.idl
index 5fbb42761b..5fbb42761b 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenu.idl
+++ b/oovbaapi/ooo/vba/excel/XMenu.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenuBar.idl b/oovbaapi/ooo/vba/excel/XMenuBar.idl
index 76527e52f3..76527e52f3 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenuBar.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuBar.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenuBars.idl b/oovbaapi/ooo/vba/excel/XMenuBars.idl
index 606e533cff..606e533cff 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenuBars.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuBars.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenuItem.idl b/oovbaapi/ooo/vba/excel/XMenuItem.idl
index 767cac22fe..767cac22fe 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenuItem.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuItem.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenuItems.idl b/oovbaapi/ooo/vba/excel/XMenuItems.idl
index 1ddb03d9d1..1ddb03d9d1 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenuItems.idl
+++ b/oovbaapi/ooo/vba/excel/XMenuItems.idl
diff --git a/oovbaapi/ooo/vba/excel/XMenus.idl b/oovbaapi/ooo/vba/excel/XMenus.idl
index 2ae728b853..2ae728b853 100644..100755
--- a/oovbaapi/ooo/vba/excel/XMenus.idl
+++ b/oovbaapi/ooo/vba/excel/XMenus.idl
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index e5faa0ab58..e5faa0ab58 100644..100755
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
diff --git a/oovbaapi/ooo/vba/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index 457917c171..457917c171 100644..100755
--- a/oovbaapi/ooo/vba/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index fbabb9478c..fbabb9478c 100644..100755
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
diff --git a/oovbaapi/ooo/vba/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index c007c6c629..c007c6c629 100644..100755
--- a/oovbaapi/ooo/vba/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
diff --git a/oovbaapi/ooo/vba/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index e0515818d8..e0515818d8 100644..100755
--- a/oovbaapi/ooo/vba/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
index 30e2087aa0..30e2087aa0 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 694526ec34..694526ec34 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
diff --git a/oovbaapi/ooo/vba/excel/XPane.idl b/oovbaapi/ooo/vba/excel/XPane.idl
index 93330f9648..93330f9648 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPane.idl
+++ b/oovbaapi/ooo/vba/excel/XPane.idl
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 375e5a0d71..375e5a0d71 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
diff --git a/oovbaapi/ooo/vba/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index 4d625c38b0..4d625c38b0 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
diff --git a/oovbaapi/ooo/vba/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index 4c1029064d..4c1029064d 100644..100755
--- a/oovbaapi/ooo/vba/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
diff --git a/oovbaapi/ooo/vba/excel/XQueryTable.idl b/oovbaapi/ooo/vba/excel/XQueryTable.idl
index 893fa3062d..893fa3062d 100644..100755
--- a/oovbaapi/ooo/vba/excel/XQueryTable.idl
+++ b/oovbaapi/ooo/vba/excel/XQueryTable.idl
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 30edc48ecb..a867f99568 100644..100755
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -121,7 +121,7 @@ interface XRange
     void FillRight();
     void FillUp();
     void FillDown();
-    XRange Item([in] any row, [in] any column) raises(com::sun::star::script::BasicErrorException);
+    XRange Item([in] any RowIndex, [in] any ColumnIndex) raises(com::sun::star::script::BasicErrorException);
     XRange Offset([in] any RowOffset, [in] any ColumnOffset);
     XRange CurrentRegion();
     XRange CurrentArray();
@@ -154,7 +154,7 @@ interface XRange
     XCharacters characters([in] any Start, [in] any Length);
     void Delete( [in] any Shift );
 
-    any Areas( [in] any item );
+    any Areas( [in] any Item );
     any BorderAround( [in] any LineStyle, [in] any Weight, [in] any ColorIndex, [in] any Color );
         void AutoFilter([in ] any Field, [in] any Criteria1, [in] any Operator, [in] any Criteria2, [in] any VisibleDropDown);
         void Insert([in] any Shift, [in] any CopyOrigin);
@@ -173,7 +173,7 @@ interface XRange
     void RemoveSubtotal() raises ( com::sun::star::script::BasicErrorException );
     void	Subtotal( [in] long GroupBy, [in] long Function, [in]  /*Optional*/ sequence<long> TotalList, [in]  /*Optional*/ any Replace, [in]  /*Optional*/ any PageBreaks, [in] any SummaryBelowData ) raises ( com::sun::star::script::BasicErrorException );
     XRange MergeArea( ) raises ( com::sun::star::script::BasicErrorException );
-    any Hyperlinks( [in] any aIndex );
+    any Hyperlinks( [in] any Index );
     long   CopyFromRecordset([in] any Data, [in]  any MaxRows , [in]  any MaxColumns) raises ( com::sun::star::script::BasicErrorException );
     XPivotTable PivotTable();
     void TextToColumns([in] any Destination, [in] any DataType, [in] any TextQualifier, [in] any ConsecutiveDelimiter, [in] any Tab, [in] any Semicolon, [in] any Comma,
diff --git a/oovbaapi/ooo/vba/excel/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index d891b6b126..d891b6b126 100644..100755
--- a/oovbaapi/ooo/vba/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
diff --git a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index f143f86723..f143f86723 100644..100755
--- a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
diff --git a/oovbaapi/ooo/vba/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index 2668d7e8bf..2668d7e8bf 100644..100755
--- a/oovbaapi/ooo/vba/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
diff --git a/oovbaapi/ooo/vba/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index bbce40f104..bbce40f104 100644..100755
--- a/oovbaapi/ooo/vba/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index 159f838479..159f838479 100644..100755
--- a/oovbaapi/ooo/vba/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
diff --git a/oovbaapi/ooo/vba/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 22c8232aaf..22c8232aaf 100644..100755
--- a/oovbaapi/ooo/vba/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreak.idl b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
index 38ac2f4427..38ac2f4427 100644..100755
--- a/oovbaapi/ooo/vba/excel/XVPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
index eab4a8f00e..eab4a8f00e 100644..100755
--- a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
diff --git a/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index 20baa16d67..20baa16d67 100644..100755
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl
index e2bf39a699..3e2e55eac3 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -60,7 +60,7 @@ interface XWindow : com::sun::star::uno::XInterface
     [attribute, readonly] XRange VisibleRange;
     [attribute] any WindowState;
     [attribute] any Zoom;
-    any SelectedSheets( [in] any aIndex );
+    any SelectedSheets( [in] any Index );
     void SmallScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any ToLeft );
     void LargeScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any ToLeft );
     void ScrollWorkbookTabs( [in] any Sheets, [in] any Position );
diff --git a/oovbaapi/ooo/vba/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 6a8472a255..6a8472a255 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 317b1fb215..a1f0af3b5a 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -53,14 +53,14 @@ interface XWorkbook : com::sun::star::uno::XInterface
     [attribute, readonly] long FileFormat;
     [attribute] boolean  PrecisionAsDisplayed;
 
-    any  Worksheets([in] any sheet);
-    any  Styles([in] any Index );
-    any  Sheets([in] any sheet);
-    any  Windows([in] any index );
+    any  Worksheets( [in] any Index );
+    any  Styles( [in] any Index );
+    any  Sheets( [in] any Index );
+    any  Windows( [in] any Index );
     void ResetColors() raises (com::sun::star::script::BasicErrorException);
     void Activate();
     any Names( [in] any Index );
-    any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
+    any Colors( [in] any Index ) raises (com::sun::star::script::BasicErrorException);
     void SaveCopyAs( [in] string Filename );
     void Protect( [in] any Password );
     void SaveAs([in] string FileName, [in]any FileFormat, [in]any CreateBackup);
diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index 721411b987..add5909e1c 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -44,7 +44,7 @@ module ooo {  module vba {  module excel {
 
 interface XWorkbooks : com::sun::star::uno::XInterface
 {
-    any Add();
+    any Add([in] any Template);
     any Open([in] string Filename, [in] any UpdateLinks, [in] any ReadOnly, [in] any Format, [in] any Password, [in] any WriteResPassword, [in] any IgnoreReadOnlyRecommended, [in] any Origin, [in] any Delimiter, [in] any Editable, [in] any Notify, [in] any Converter, [in] any AddToMru);
 
     void Close();
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 2f8ba6a0d4..961d1e2af2 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -102,26 +102,26 @@ interface XWorksheet
     /*  The following form control related symbols do not refer to ActiveX form
         controls embedded in the sheet, but to the old-style drawing controls
         of Excel. This is an Excel-only feature. */
-    any Buttons( [in] any aIndex );
-    any CheckBoxes( [in] any aIndex );
-    any DropDowns( [in] any aIndex );
-    any GroupBoxes( [in] any aIndex );
-    any Labels( [in] any aIndex );
-    any ListBoxes( [in] any aIndex );
-    any OptionButtons( [in] any aIndex );
-    any ScrollBars( [in] any aIndex );
-    any Spinners( [in] any aIndex );
+    any Buttons( [in] any Index );
+    any CheckBoxes( [in] any Index );
+    any DropDowns( [in] any Index );
+    any GroupBoxes( [in] any Index );
+    any Labels( [in] any Index );
+    any ListBoxes( [in] any Index );
+    any OptionButtons( [in] any Index );
+    any ScrollBars( [in] any Index );
+    any Spinners( [in] any Index );
 
 // FIXME: should prolly inherit from Range somehow...
-    XRange Cells([in] any RowIndex, [in] any ColumnIndex);
-    XRange Rows([in] any aIndex);
-    XRange Columns([in] any aIndex);
-    any Hyperlinks( [in] any aIndex );
+    XRange Cells( [in] any RowIndex, [in] any ColumnIndex );
+    XRange Rows( [in] any Index );
+    XRange Columns( [in] any Index );
+    any Hyperlinks( [in] any Index );
     any Names( [in] any Index );
 
-    any Evaluate( [in] string Name);
+    any Evaluate( [in] string Name );
 
-    void setEnableCalculation([in] boolean EnableCalculation) raises(com::sun::star::script::BasicErrorException);
+    void setEnableCalculation( [in] boolean EnableCalculation ) raises(com::sun::star::script::BasicErrorException);
     boolean getEnableCalculation() raises(com::sun::star::script::BasicErrorException);
     void PrintOut( [in] any From, [in] any To, [in] any Copies, [in] any Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in] any PrToFileName, [in] any IgnorePrintAreas );
 };
diff --git a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index 4f9915711d..4f9915711d 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index bf898476bf..bf898476bf 100644..100755
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
diff --git a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
index b1a5ec059f..b1a5ec059f 100644..100755
--- a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 428062f5c9..428062f5c9 100644..100755
--- a/oovbaapi/ooo/vba/excel/makefile.mk
+++ b/oovbaapi/ooo/vba/excel/makefile.mk
diff --git a/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index bacb05fb6f..bacb05fb6f 100644..100755
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
diff --git a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index c2ca0877ff..c2ca0877ff 100644..100755
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index ddfd3dae0c..ddfd3dae0c 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index 0a89347ea9..0a89347ea9 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 53c85d98e5..53c85d98e5 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 49e4320c2a..49e4320c2a 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index 42abf15426..42abf15426 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index e197bd3e1e..e197bd3e1e 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
diff --git a/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 866a2831fc..866a2831fc 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index f26c07ff50..f26c07ff50 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index bc6af54c36..bc6af54c36 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
diff --git a/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index ea4d9448a8..ea4d9448a8 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index 9f17bc3190..9f17bc3190 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 8012803acc..8012803acc 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index f4763fdbc7..f4763fdbc7 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index e329a7208c..e329a7208c 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
diff --git a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index a2a7bded98..a2a7bded98 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index bbdcf60df9..bbdcf60df9 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index d115a59628..d115a59628 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
diff --git a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
index 6ffc4d1be9..6ffc4d1be9 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnBoolean.idl
diff --git a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
index 3f7d7975cf..3f7d7975cf 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
+++ b/oovbaapi/ooo/vba/msforms/XReturnInteger.idl
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 48c710a26b..48c710a26b 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index eec1a7fb20..eec1a7fb20 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 2d936e087b..2d936e087b 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index 9fdf6a80ae..9fdf6a80ae 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index 15001c2e6b..15001c2e6b 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index c3574924d0..c3574924d0 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index c27087d56e..c27087d56e 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
diff --git a/oovbaapi/ooo/vba/msforms/XTextFrame.idl b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
index 0366dfef8f..0366dfef8f 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index b151eb2c62..b151eb2c62 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index 21ee17c464..21ee17c464 100644..100755
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index ebf4d2ee89..ebf4d2ee89 100644..100755
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
diff --git a/oovbaapi/ooo/vba/word/XAddin.idl b/oovbaapi/ooo/vba/word/XAddin.idl
index 898ff728f2..898ff728f2 100644..100755
--- a/oovbaapi/ooo/vba/word/XAddin.idl
+++ b/oovbaapi/ooo/vba/word/XAddin.idl
diff --git a/oovbaapi/ooo/vba/word/XAddins.idl b/oovbaapi/ooo/vba/word/XAddins.idl
index f2936c93af..f2936c93af 100644..100755
--- a/oovbaapi/ooo/vba/word/XAddins.idl
+++ b/oovbaapi/ooo/vba/word/XAddins.idl
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index 311f981afe..8880121ff3 100644..100755
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -53,10 +53,10 @@ interface XApplication : com::sun::star::uno::XInterface
     [attribute] boolean DisplayAutoCompleteTips;
     [attribute] long EnableCancelKey;
 
-    any CommandBars( [in] any aIndex );
-    any Documents( [in] any aIndex );
-    any Addins( [in] any aIndex );
-    any Dialogs( [in] any aIndex );
+    any CommandBars( [in] any Index );
+    any Documents( [in] any Index );
+    any Addins( [in] any Index );
+    any Dialogs( [in] any Index );
     any ListGalleries( [in] any aIndex );
     float CentimetersToPoints([in] float Centimeters );
 };
diff --git a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
index af3522f142..af3522f142 100644..100755
--- a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
diff --git a/oovbaapi/ooo/vba/word/XAutoTextEntry.idl b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
index 69788308af..69788308af 100644..100755
--- a/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
diff --git a/oovbaapi/ooo/vba/word/XBookmark.idl b/oovbaapi/ooo/vba/word/XBookmark.idl
index a37ece6aae..a37ece6aae 100644..100755
--- a/oovbaapi/ooo/vba/word/XBookmark.idl
+++ b/oovbaapi/ooo/vba/word/XBookmark.idl
diff --git a/oovbaapi/ooo/vba/word/XBookmarks.idl b/oovbaapi/ooo/vba/word/XBookmarks.idl
index 8220090a23..8220090a23 100644..100755
--- a/oovbaapi/ooo/vba/word/XBookmarks.idl
+++ b/oovbaapi/ooo/vba/word/XBookmarks.idl
diff --git a/oovbaapi/ooo/vba/word/XBorder.idl b/oovbaapi/ooo/vba/word/XBorder.idl
index 16d645d2ef..16d645d2ef 100644..100755
--- a/oovbaapi/ooo/vba/word/XBorder.idl
+++ b/oovbaapi/ooo/vba/word/XBorder.idl
diff --git a/oovbaapi/ooo/vba/word/XBorders.idl b/oovbaapi/ooo/vba/word/XBorders.idl
index 9fbe1f0fc7..9fbe1f0fc7 100644..100755
--- a/oovbaapi/ooo/vba/word/XBorders.idl
+++ b/oovbaapi/ooo/vba/word/XBorders.idl
diff --git a/oovbaapi/ooo/vba/word/XCell.idl b/oovbaapi/ooo/vba/word/XCell.idl
index 442285b635..442285b635 100644..100755
--- a/oovbaapi/ooo/vba/word/XCell.idl
+++ b/oovbaapi/ooo/vba/word/XCell.idl
diff --git a/oovbaapi/ooo/vba/word/XCells.idl b/oovbaapi/ooo/vba/word/XCells.idl
index a5178bcfbe..a5178bcfbe 100644..100755
--- a/oovbaapi/ooo/vba/word/XCells.idl
+++ b/oovbaapi/ooo/vba/word/XCells.idl
diff --git a/oovbaapi/ooo/vba/word/XCheckBox.idl b/oovbaapi/ooo/vba/word/XCheckBox.idl
index f159b550db..f159b550db 100644..100755
--- a/oovbaapi/ooo/vba/word/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/word/XCheckBox.idl
diff --git a/oovbaapi/ooo/vba/word/XColumn.idl b/oovbaapi/ooo/vba/word/XColumn.idl
index 143cfdc7bd..143cfdc7bd 100644..100755
--- a/oovbaapi/ooo/vba/word/XColumn.idl
+++ b/oovbaapi/ooo/vba/word/XColumn.idl
diff --git a/oovbaapi/ooo/vba/word/XColumns.idl b/oovbaapi/ooo/vba/word/XColumns.idl
index b35812da1f..b35812da1f 100644..100755
--- a/oovbaapi/ooo/vba/word/XColumns.idl
+++ b/oovbaapi/ooo/vba/word/XColumns.idl
diff --git a/oovbaapi/ooo/vba/word/XDialog.idl b/oovbaapi/ooo/vba/word/XDialog.idl
index ece567b05a..ece567b05a 100644..100755
--- a/oovbaapi/ooo/vba/word/XDialog.idl
+++ b/oovbaapi/ooo/vba/word/XDialog.idl
diff --git a/oovbaapi/ooo/vba/word/XDialogs.idl b/oovbaapi/ooo/vba/word/XDialogs.idl
index 43425d0020..43425d0020 100644..100755
--- a/oovbaapi/ooo/vba/word/XDialogs.idl
+++ b/oovbaapi/ooo/vba/word/XDialogs.idl
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index 1ab2080f2c..d65b13141e 100644..100755
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -56,16 +56,16 @@ interface XDocument : com::sun::star::script::XInvocation
     [attribute] long ConsecutiveHyphensLimit;
 
     XRange Range( [in] any Start, [in] any End );
-    any BuiltInDocumentProperties( [in] any index );
-    any CustomDocumentProperties( [in] any index );
-    any Bookmarks( [in] any aIndex );
-    any Variables( [in] any aIndex );
-    any Paragraphs( [in] any aIndex );
-    any Styles( [in] any aIndex );
-    any Tables( [in] any aIndex );
-    any Fields( [in] any aIndex );
-    any Shapes([in] any Index);
-    any Sections([in] any Index);
+    any BuiltInDocumentProperties( [in] any Index );
+    any CustomDocumentProperties( [in] any Index );
+    any Bookmarks( [in] any Index );
+    any Variables( [in] any Index );
+    any Paragraphs( [in] any Index );
+    any Styles( [in] any Index );
+    any Tables( [in] any Index );
+    any Fields( [in] any Index );
+    any Shapes( [in] any Index );
+    any Sections( [in] any Index );
     void Activate();
     any PageSetup();
     any TablesOfContents([in] any Index);
diff --git a/oovbaapi/ooo/vba/word/XDocuments.idl b/oovbaapi/ooo/vba/word/XDocuments.idl
index 46b7643d4f..46b7643d4f 100644..100755
--- a/oovbaapi/ooo/vba/word/XDocuments.idl
+++ b/oovbaapi/ooo/vba/word/XDocuments.idl
diff --git a/oovbaapi/ooo/vba/word/XField.idl b/oovbaapi/ooo/vba/word/XField.idl
index 29d30aa631..29d30aa631 100644..100755
--- a/oovbaapi/ooo/vba/word/XField.idl
+++ b/oovbaapi/ooo/vba/word/XField.idl
diff --git a/oovbaapi/ooo/vba/word/XFields.idl b/oovbaapi/ooo/vba/word/XFields.idl
index e4517debde..e4517debde 100644..100755
--- a/oovbaapi/ooo/vba/word/XFields.idl
+++ b/oovbaapi/ooo/vba/word/XFields.idl
diff --git a/oovbaapi/ooo/vba/word/XFind.idl b/oovbaapi/ooo/vba/word/XFind.idl
index 970c01e2a1..970c01e2a1 100644..100755
--- a/oovbaapi/ooo/vba/word/XFind.idl
+++ b/oovbaapi/ooo/vba/word/XFind.idl
diff --git a/oovbaapi/ooo/vba/word/XFont.idl b/oovbaapi/ooo/vba/word/XFont.idl
index b9e9364363..b9e9364363 100644..100755
--- a/oovbaapi/ooo/vba/word/XFont.idl
+++ b/oovbaapi/ooo/vba/word/XFont.idl
diff --git a/oovbaapi/ooo/vba/word/XFormField.idl b/oovbaapi/ooo/vba/word/XFormField.idl
index f29040cea8..f29040cea8 100644..100755
--- a/oovbaapi/ooo/vba/word/XFormField.idl
+++ b/oovbaapi/ooo/vba/word/XFormField.idl
diff --git a/oovbaapi/ooo/vba/word/XFormFields.idl b/oovbaapi/ooo/vba/word/XFormFields.idl
index 33bff1a758..33bff1a758 100644..100755
--- a/oovbaapi/ooo/vba/word/XFormFields.idl
+++ b/oovbaapi/ooo/vba/word/XFormFields.idl
diff --git a/oovbaapi/ooo/vba/word/XFrame.idl b/oovbaapi/ooo/vba/word/XFrame.idl
index cb231e24ac..cb231e24ac 100644..100755
--- a/oovbaapi/ooo/vba/word/XFrame.idl
+++ b/oovbaapi/ooo/vba/word/XFrame.idl
diff --git a/oovbaapi/ooo/vba/word/XFrames.idl b/oovbaapi/ooo/vba/word/XFrames.idl
index b0400ec5ad..b0400ec5ad 100644..100755
--- a/oovbaapi/ooo/vba/word/XFrames.idl
+++ b/oovbaapi/ooo/vba/word/XFrames.idl
diff --git a/oovbaapi/ooo/vba/word/XGlobals.idl b/oovbaapi/ooo/vba/word/XGlobals.idl
index c3cfd6de45..c63e7a5923 100644..100755
--- a/oovbaapi/ooo/vba/word/XGlobals.idl
+++ b/oovbaapi/ooo/vba/word/XGlobals.idl
@@ -45,10 +45,10 @@ interface XGlobals : com::sun::star::uno::XInterface
     [attribute, readonly] ooo::vba::word::XSystem System;
     [attribute, readonly] ooo::vba::word::XOptions Options;
     [attribute, readonly] ooo::vba::word::XSelection Selection;
-    any CommandBars( [in] any aIndex );
-    any Documents( [in] any aIndex );
-    any Addins( [in] any aIndex );
-    any Dialogs( [in] any aIndex );
+    any CommandBars( [in] any Index );
+    any Documents( [in] any Index );
+    any Addins( [in] any Index );
+    any Dialogs( [in] any Index );
     any ListGalleries( [in] any aIndex );
     float CentimetersToPoints([in] float Centimeters );
 };
diff --git a/oovbaapi/ooo/vba/word/XHeaderFooter.idl b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
index 0b28a1128e..0b28a1128e 100644..100755
--- a/oovbaapi/ooo/vba/word/XHeaderFooter.idl
+++ b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
diff --git a/oovbaapi/ooo/vba/word/XHeadersFooters.idl b/oovbaapi/ooo/vba/word/XHeadersFooters.idl
index 068a967a99..068a967a99 100644..100755
--- a/oovbaapi/ooo/vba/word/XHeadersFooters.idl
+++ b/oovbaapi/ooo/vba/word/XHeadersFooters.idl
diff --git a/oovbaapi/ooo/vba/word/XListFormat.idl b/oovbaapi/ooo/vba/word/XListFormat.idl
index 512483dd4b..512483dd4b 100644..100755
--- a/oovbaapi/ooo/vba/word/XListFormat.idl
+++ b/oovbaapi/ooo/vba/word/XListFormat.idl
diff --git a/oovbaapi/ooo/vba/word/XListGalleries.idl b/oovbaapi/ooo/vba/word/XListGalleries.idl
index 864f3d8861..864f3d8861 100644..100755
--- a/oovbaapi/ooo/vba/word/XListGalleries.idl
+++ b/oovbaapi/ooo/vba/word/XListGalleries.idl
diff --git a/oovbaapi/ooo/vba/word/XListGallery.idl b/oovbaapi/ooo/vba/word/XListGallery.idl
index 8eecaf9291..8eecaf9291 100644..100755
--- a/oovbaapi/ooo/vba/word/XListGallery.idl
+++ b/oovbaapi/ooo/vba/word/XListGallery.idl
diff --git a/oovbaapi/ooo/vba/word/XListLevel.idl b/oovbaapi/ooo/vba/word/XListLevel.idl
index f6353fb99d..f6353fb99d 100644..100755
--- a/oovbaapi/ooo/vba/word/XListLevel.idl
+++ b/oovbaapi/ooo/vba/word/XListLevel.idl
diff --git a/oovbaapi/ooo/vba/word/XListLevels.idl b/oovbaapi/ooo/vba/word/XListLevels.idl
index 7978ad9bdc..7978ad9bdc 100644..100755
--- a/oovbaapi/ooo/vba/word/XListLevels.idl
+++ b/oovbaapi/ooo/vba/word/XListLevels.idl
diff --git a/oovbaapi/ooo/vba/word/XListTemplate.idl b/oovbaapi/ooo/vba/word/XListTemplate.idl
index b857e8348e..b857e8348e 100644..100755
--- a/oovbaapi/ooo/vba/word/XListTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XListTemplate.idl
diff --git a/oovbaapi/ooo/vba/word/XListTemplates.idl b/oovbaapi/ooo/vba/word/XListTemplates.idl
index b61c1707c4..b61c1707c4 100644..100755
--- a/oovbaapi/ooo/vba/word/XListTemplates.idl
+++ b/oovbaapi/ooo/vba/word/XListTemplates.idl
diff --git a/oovbaapi/ooo/vba/word/XOptions.idl b/oovbaapi/ooo/vba/word/XOptions.idl
index 009a220dde..009a220dde 100644..100755
--- a/oovbaapi/ooo/vba/word/XOptions.idl
+++ b/oovbaapi/ooo/vba/word/XOptions.idl
diff --git a/oovbaapi/ooo/vba/word/XPageSetup.idl b/oovbaapi/ooo/vba/word/XPageSetup.idl
index 480d95e3c4..480d95e3c4 100644..100755
--- a/oovbaapi/ooo/vba/word/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/word/XPageSetup.idl
diff --git a/oovbaapi/ooo/vba/word/XPane.idl b/oovbaapi/ooo/vba/word/XPane.idl
index dbd20e05b8..dbd20e05b8 100644..100755
--- a/oovbaapi/ooo/vba/word/XPane.idl
+++ b/oovbaapi/ooo/vba/word/XPane.idl
diff --git a/oovbaapi/ooo/vba/word/XPanes.idl b/oovbaapi/ooo/vba/word/XPanes.idl
index 8eaa18ec23..8eaa18ec23 100644..100755
--- a/oovbaapi/ooo/vba/word/XPanes.idl
+++ b/oovbaapi/ooo/vba/word/XPanes.idl
diff --git a/oovbaapi/ooo/vba/word/XParagraph.idl b/oovbaapi/ooo/vba/word/XParagraph.idl
index a585e32cb0..a585e32cb0 100644..100755
--- a/oovbaapi/ooo/vba/word/XParagraph.idl
+++ b/oovbaapi/ooo/vba/word/XParagraph.idl
diff --git a/oovbaapi/ooo/vba/word/XParagraphFormat.idl b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
index 9b00a38009..9b00a38009 100644..100755
--- a/oovbaapi/ooo/vba/word/XParagraphFormat.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
diff --git a/oovbaapi/ooo/vba/word/XParagraphs.idl b/oovbaapi/ooo/vba/word/XParagraphs.idl
index 039ea06b6c..039ea06b6c 100644..100755
--- a/oovbaapi/ooo/vba/word/XParagraphs.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphs.idl
diff --git a/oovbaapi/ooo/vba/word/XRange.idl b/oovbaapi/ooo/vba/word/XRange.idl
index 4bed0c0fb9..4bed0c0fb9 100644..100755
--- a/oovbaapi/ooo/vba/word/XRange.idl
+++ b/oovbaapi/ooo/vba/word/XRange.idl
diff --git a/oovbaapi/ooo/vba/word/XReplacement.idl b/oovbaapi/ooo/vba/word/XReplacement.idl
index 778f9e1184..778f9e1184 100644..100755
--- a/oovbaapi/ooo/vba/word/XReplacement.idl
+++ b/oovbaapi/ooo/vba/word/XReplacement.idl
diff --git a/oovbaapi/ooo/vba/word/XRevision.idl b/oovbaapi/ooo/vba/word/XRevision.idl
index d71d5f9ba5..d71d5f9ba5 100644..100755
--- a/oovbaapi/ooo/vba/word/XRevision.idl
+++ b/oovbaapi/ooo/vba/word/XRevision.idl
diff --git a/oovbaapi/ooo/vba/word/XRevisions.idl b/oovbaapi/ooo/vba/word/XRevisions.idl
index 1319ec6717..1319ec6717 100644..100755
--- a/oovbaapi/ooo/vba/word/XRevisions.idl
+++ b/oovbaapi/ooo/vba/word/XRevisions.idl
diff --git a/oovbaapi/ooo/vba/word/XRow.idl b/oovbaapi/ooo/vba/word/XRow.idl
index f2b727f703..f2b727f703 100644..100755
--- a/oovbaapi/ooo/vba/word/XRow.idl
+++ b/oovbaapi/ooo/vba/word/XRow.idl
diff --git a/oovbaapi/ooo/vba/word/XRows.idl b/oovbaapi/ooo/vba/word/XRows.idl
index 70b27bdfa4..70b27bdfa4 100644..100755
--- a/oovbaapi/ooo/vba/word/XRows.idl
+++ b/oovbaapi/ooo/vba/word/XRows.idl
diff --git a/oovbaapi/ooo/vba/word/XSection.idl b/oovbaapi/ooo/vba/word/XSection.idl
index ec4569b03e..ec4569b03e 100644..100755
--- a/oovbaapi/ooo/vba/word/XSection.idl
+++ b/oovbaapi/ooo/vba/word/XSection.idl
diff --git a/oovbaapi/ooo/vba/word/XSections.idl b/oovbaapi/ooo/vba/word/XSections.idl
index 5e50c9b738..5e50c9b738 100644..100755
--- a/oovbaapi/ooo/vba/word/XSections.idl
+++ b/oovbaapi/ooo/vba/word/XSections.idl
diff --git a/oovbaapi/ooo/vba/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl
index 3cbcfaaf08..25f3052890 100644..100755
--- a/oovbaapi/ooo/vba/word/XSelection.idl
+++ b/oovbaapi/ooo/vba/word/XSelection.idl
@@ -59,8 +59,8 @@ interface XSelection
     [attribute] long Start;
     [attribute] long End;
 
-    any Tables( [in] any aIndex );
-    any Fields( [in] any aIndex );
+    any Tables( [in] any Index );
+    any Fields( [in] any Index );
     void TypeText( [in] string Text );
     void HomeKey( [in] any Unit, [in] any Extend );
     void EndKey( [in] any Unit, [in] any Extend );
diff --git a/oovbaapi/ooo/vba/word/XStyle.idl b/oovbaapi/ooo/vba/word/XStyle.idl
index 1c0f30534a..1c0f30534a 100644..100755
--- a/oovbaapi/ooo/vba/word/XStyle.idl
+++ b/oovbaapi/ooo/vba/word/XStyle.idl
diff --git a/oovbaapi/ooo/vba/word/XStyles.idl b/oovbaapi/ooo/vba/word/XStyles.idl
index 1262869ac5..1262869ac5 100644..100755
--- a/oovbaapi/ooo/vba/word/XStyles.idl
+++ b/oovbaapi/ooo/vba/word/XStyles.idl
diff --git a/oovbaapi/ooo/vba/word/XSystem.idl b/oovbaapi/ooo/vba/word/XSystem.idl
index f8c29a5db5..f8c29a5db5 100644..100755
--- a/oovbaapi/ooo/vba/word/XSystem.idl
+++ b/oovbaapi/ooo/vba/word/XSystem.idl
diff --git a/oovbaapi/ooo/vba/word/XTabStop.idl b/oovbaapi/ooo/vba/word/XTabStop.idl
index 37020cf921..37020cf921 100644..100755
--- a/oovbaapi/ooo/vba/word/XTabStop.idl
+++ b/oovbaapi/ooo/vba/word/XTabStop.idl
diff --git a/oovbaapi/ooo/vba/word/XTabStops.idl b/oovbaapi/ooo/vba/word/XTabStops.idl
index 87dffbe6fe..87dffbe6fe 100644..100755
--- a/oovbaapi/ooo/vba/word/XTabStops.idl
+++ b/oovbaapi/ooo/vba/word/XTabStops.idl
diff --git a/oovbaapi/ooo/vba/word/XTable.idl b/oovbaapi/ooo/vba/word/XTable.idl
index 1d21c4db50..96c867bcb1 100644..100755
--- a/oovbaapi/ooo/vba/word/XTable.idl
+++ b/oovbaapi/ooo/vba/word/XTable.idl
@@ -68,7 +68,7 @@ interface XTable
     XRange ConvertToText([in] any Separator, [in] any NestedTables)
         raises(com::sun::star::script::BasicErrorException);
 */
-    any Borders( [in] any aIndex );
+    any Borders( [in] any Index );
 
     any Rows([in] any aIndex );
     any Columns([in] any aIndex );
diff --git a/oovbaapi/ooo/vba/word/XTableOfContents.idl b/oovbaapi/ooo/vba/word/XTableOfContents.idl
index 68f668a0ab..68f668a0ab 100644..100755
--- a/oovbaapi/ooo/vba/word/XTableOfContents.idl
+++ b/oovbaapi/ooo/vba/word/XTableOfContents.idl
diff --git a/oovbaapi/ooo/vba/word/XTables.idl b/oovbaapi/ooo/vba/word/XTables.idl
index c561e3a2ca..c561e3a2ca 100644..100755
--- a/oovbaapi/ooo/vba/word/XTables.idl
+++ b/oovbaapi/ooo/vba/word/XTables.idl
diff --git a/oovbaapi/ooo/vba/word/XTablesOfContents.idl b/oovbaapi/ooo/vba/word/XTablesOfContents.idl
index 397678c3a9..397678c3a9 100644..100755
--- a/oovbaapi/ooo/vba/word/XTablesOfContents.idl
+++ b/oovbaapi/ooo/vba/word/XTablesOfContents.idl
diff --git a/oovbaapi/ooo/vba/word/XTemplate.idl b/oovbaapi/ooo/vba/word/XTemplate.idl
index 04e7063923..129177bc90 100644..100755
--- a/oovbaapi/ooo/vba/word/XTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XTemplate.idl
@@ -44,7 +44,7 @@ interface XTemplate
     [attribute, readonly] string Name;
     [attribute, readonly] string Path;
 
-    any AutoTextEntries( [in] any aIndex );
+    any AutoTextEntries( [in] any Index );
 };
 
 }; }; };
diff --git a/oovbaapi/ooo/vba/word/XVariable.idl b/oovbaapi/ooo/vba/word/XVariable.idl
index 2ac0b55504..2ac0b55504 100644..100755
--- a/oovbaapi/ooo/vba/word/XVariable.idl
+++ b/oovbaapi/ooo/vba/word/XVariable.idl
diff --git a/oovbaapi/ooo/vba/word/XVariables.idl b/oovbaapi/ooo/vba/word/XVariables.idl
index 2f070795f0..2f070795f0 100644..100755
--- a/oovbaapi/ooo/vba/word/XVariables.idl
+++ b/oovbaapi/ooo/vba/word/XVariables.idl
diff --git a/oovbaapi/ooo/vba/word/XView.idl b/oovbaapi/ooo/vba/word/XView.idl
index c01e087e2a..c01e087e2a 100644..100755
--- a/oovbaapi/ooo/vba/word/XView.idl
+++ b/oovbaapi/ooo/vba/word/XView.idl
diff --git a/oovbaapi/ooo/vba/word/XWindow.idl b/oovbaapi/ooo/vba/word/XWindow.idl
index 4ef56da9a3..4e66e4c49a 100644..100755
--- a/oovbaapi/ooo/vba/word/XWindow.idl
+++ b/oovbaapi/ooo/vba/word/XWindow.idl
@@ -47,7 +47,7 @@ interface XWindow : com::sun::star::uno::XInterface
     [attribute] any WindowState;
     void Activate();
     void Close([in] any SaveChanges, [in] any RouteDocument);
-    any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write
+    any Panes( [in] any Index ); // this is a fake api for it seems not support in Write
     any ActivePane(); // this is a fake api for it seems not support in Write
 };
 
diff --git a/oovbaapi/ooo/vba/word/XWrapFormat.idl b/oovbaapi/ooo/vba/word/XWrapFormat.idl
index 15ff956ea3..15ff956ea3 100644..100755
--- a/oovbaapi/ooo/vba/word/XWrapFormat.idl
+++ b/oovbaapi/ooo/vba/word/XWrapFormat.idl
diff --git a/oovbaapi/ooo/vba/word/makefile.mk b/oovbaapi/ooo/vba/word/makefile.mk
index 4ed210befa..4ed210befa 100644..100755
--- a/oovbaapi/ooo/vba/word/makefile.mk
+++ b/oovbaapi/ooo/vba/word/makefile.mk
diff --git a/oovbaapi/prj/build.lst b/oovbaapi/prj/build.lst
index e6d23a3bed..e6d23a3bed 100644..100755
--- a/oovbaapi/prj/build.lst
+++ b/oovbaapi/prj/build.lst
diff --git a/oovbaapi/prj/d.lst b/oovbaapi/prj/d.lst
index 86e801a15d..86e801a15d 100644..100755
--- a/oovbaapi/prj/d.lst
+++ b/oovbaapi/prj/d.lst
diff --git a/oovbaapi/util/makefile.mk b/oovbaapi/util/makefile.mk
index 5100327b4b..5100327b4b 100644..100755
--- a/oovbaapi/util/makefile.mk
+++ b/oovbaapi/util/makefile.mk
diff --git a/oovbaapi/util/makefile.pmk b/oovbaapi/util/makefile.pmk
index 81737fa216..81737fa216 100644..100755
--- a/oovbaapi/util/makefile.pmk
+++ b/oovbaapi/util/makefile.pmk
diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index 4e77fa522c..4e77fa522c 100644..100755
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
diff --git a/readlicense_oo/docs/readme/eval.xsl b/readlicense_oo/docs/readme/eval.xsl
index e8830d4301..e8830d4301 100644..100755
--- a/readlicense_oo/docs/readme/eval.xsl
+++ b/readlicense_oo/docs/readme/eval.xsl
diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
index 9e141afb57..9e141afb57 100644..100755
--- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
+++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt
index b9246dc693..b9246dc693 100644..100755
--- a/readlicense_oo/odt/CREDITS.odt
+++ b/readlicense_oo/odt/CREDITS.odt
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index 13f3649d59..13f3649d59 100644..100755
--- a/readlicense_oo/odt/LICENSE.odt
+++ b/readlicense_oo/odt/LICENSE.odt
diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst
index ac5f3024fa..7f7166c799 100644..100755
--- a/readlicense_oo/prj/build.lst
+++ b/readlicense_oo/prj/build.lst
@@ -1,4 +1,4 @@
-ro  readlicense_oo : l10n l10ntools solenv LIBXSLT:libxslt NULL
+ro  readlicense_oo : L10N:l10n l10ntools solenv LIBXSLT:libxslt NULL
 ro  readlicense_oo		usr1 - all ro_root NULL
 ro  readlicense_oo\docs\readme	nmake - all ro_readme NULL
 ro  readlicense_oo		nmake - all ro_conv NULL
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index d4d5026dc0..d4d5026dc0 100644..100755
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 491dc5885a..491dc5885a 100644..100755
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
diff --git a/scripting/README b/scripting/README
index 686e4ad30f..686e4ad30f 100644..100755
--- a/scripting/README
+++ b/scripting/README
diff --git a/scripting/examples/basic/InsertColouredText.xba b/scripting/examples/basic/InsertColouredText.xba
index 791689a155..791689a155 100644..100755
--- a/scripting/examples/basic/InsertColouredText.xba
+++ b/scripting/examples/basic/InsertColouredText.xba
diff --git a/scripting/examples/basic/InsertColouredTextDialog.xdl b/scripting/examples/basic/InsertColouredTextDialog.xdl
index c2e8ace846..c2e8ace846 100644..100755
--- a/scripting/examples/basic/InsertColouredTextDialog.xdl
+++ b/scripting/examples/basic/InsertColouredTextDialog.xdl
diff --git a/scripting/examples/basic/SearchAndReplace.xba b/scripting/examples/basic/SearchAndReplace.xba
index d98369e9f3..d98369e9f3 100644..100755
--- a/scripting/examples/basic/SearchAndReplace.xba
+++ b/scripting/examples/basic/SearchAndReplace.xba
diff --git a/scripting/examples/basic/SearchAndReplaceDialog.xdl b/scripting/examples/basic/SearchAndReplaceDialog.xdl
index 7b0e90dd97..7b0e90dd97 100644..100755
--- a/scripting/examples/basic/SearchAndReplaceDialog.xdl
+++ b/scripting/examples/basic/SearchAndReplaceDialog.xdl
diff --git a/scripting/examples/basic/dialog.xlb b/scripting/examples/basic/dialog.xlb
index 95dc3a1236..95dc3a1236 100644..100755
--- a/scripting/examples/basic/dialog.xlb
+++ b/scripting/examples/basic/dialog.xlb
diff --git a/scripting/examples/basic/script.xlb b/scripting/examples/basic/script.xlb
index fa7dd61034..fa7dd61034 100644..100755
--- a/scripting/examples/basic/script.xlb
+++ b/scripting/examples/basic/script.xlb
diff --git a/scripting/examples/beanshell/Capitalise/capitalise.bsh b/scripting/examples/beanshell/Capitalise/capitalise.bsh
index c059d39908..c059d39908 100644..100755
--- a/scripting/examples/beanshell/Capitalise/capitalise.bsh
+++ b/scripting/examples/beanshell/Capitalise/capitalise.bsh
diff --git a/scripting/examples/beanshell/HelloWorld/helloworld.bsh b/scripting/examples/beanshell/HelloWorld/helloworld.bsh
index 2e76554866..2e76554866 100644..100755
--- a/scripting/examples/beanshell/HelloWorld/helloworld.bsh
+++ b/scripting/examples/beanshell/HelloWorld/helloworld.bsh
diff --git a/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh b/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh
index 363e12bb82..363e12bb82 100644..100755
--- a/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh
+++ b/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh
diff --git a/scripting/examples/beanshell/Highlight/ShowDialog.bsh b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
index e632c8f212..e632c8f212 100644..100755
--- a/scripting/examples/beanshell/Highlight/ShowDialog.bsh
+++ b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
diff --git a/scripting/examples/beanshell/Highlight/highlighter.bsh b/scripting/examples/beanshell/Highlight/highlighter.bsh
index 7424718443..7424718443 100644..100755
--- a/scripting/examples/beanshell/Highlight/highlighter.bsh
+++ b/scripting/examples/beanshell/Highlight/highlighter.bsh
diff --git a/scripting/examples/beanshell/InteractiveBeanShell/parcel-descriptor.xml b/scripting/examples/beanshell/InteractiveBeanShell/parcel-descriptor.xml
index 5c2ff6c182..5c2ff6c182 100644..100755
--- a/scripting/examples/beanshell/InteractiveBeanShell/parcel-descriptor.xml
+++ b/scripting/examples/beanshell/InteractiveBeanShell/parcel-descriptor.xml
diff --git a/scripting/examples/beanshell/MemoryUsage/memusage.bsh b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
index 2200b7b292..2200b7b292 100644..100755
--- a/scripting/examples/beanshell/MemoryUsage/memusage.bsh
+++ b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
diff --git a/scripting/examples/beanshell/MemoryUsage/parcel-descriptor.xml b/scripting/examples/beanshell/MemoryUsage/parcel-descriptor.xml
index f2783e9067..f2783e9067 100644..100755
--- a/scripting/examples/beanshell/MemoryUsage/parcel-descriptor.xml
+++ b/scripting/examples/beanshell/MemoryUsage/parcel-descriptor.xml
diff --git a/scripting/examples/beanshell/WordCount/wordcount.bsh b/scripting/examples/beanshell/WordCount/wordcount.bsh
index a2018c00d4..a2018c00d4 100644..100755
--- a/scripting/examples/beanshell/WordCount/wordcount.bsh
+++ b/scripting/examples/beanshell/WordCount/wordcount.bsh
diff --git a/scripting/examples/delzip b/scripting/examples/delzip
index 636fda90bf..636fda90bf 100644..100755
--- a/scripting/examples/delzip
+++ b/scripting/examples/delzip
diff --git a/scripting/examples/java/HelloWorld/HelloWorld.java b/scripting/examples/java/HelloWorld/HelloWorld.java
index eaed56fc60..eaed56fc60 100644..100755
--- a/scripting/examples/java/HelloWorld/HelloWorld.java
+++ b/scripting/examples/java/HelloWorld/HelloWorld.java
diff --git a/scripting/examples/java/HelloWorld/parcel-descriptor.xml b/scripting/examples/java/HelloWorld/parcel-descriptor.xml
index f1a085b797..f1a085b797 100644..100755
--- a/scripting/examples/java/HelloWorld/parcel-descriptor.xml
+++ b/scripting/examples/java/HelloWorld/parcel-descriptor.xml
diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java
index a60985a32a..a60985a32a 100644..100755
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java
index 727f94a929..727f94a929 100644..100755
--- a/scripting/examples/java/MemoryUsage/MemoryUsage.java
+++ b/scripting/examples/java/MemoryUsage/MemoryUsage.java
diff --git a/scripting/examples/java/MemoryUsage/parcel-descriptor.xml b/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
index e09bf4a815..e09bf4a815 100644..100755
--- a/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
+++ b/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
diff --git a/scripting/examples/java/Newsgroup/MimeConfiguration.java b/scripting/examples/java/Newsgroup/MimeConfiguration.java
index 32bb090369..32bb090369 100644..100755
--- a/scripting/examples/java/Newsgroup/MimeConfiguration.java
+++ b/scripting/examples/java/Newsgroup/MimeConfiguration.java
diff --git a/scripting/examples/java/Newsgroup/NewsGroup.java b/scripting/examples/java/Newsgroup/NewsGroup.java
index ca78954536..ca78954536 100644..100755
--- a/scripting/examples/java/Newsgroup/NewsGroup.java
+++ b/scripting/examples/java/Newsgroup/NewsGroup.java
diff --git a/scripting/examples/java/Newsgroup/OfficeAttachment.java b/scripting/examples/java/Newsgroup/OfficeAttachment.java
index ec3bef368f..ec3bef368f 100644..100755
--- a/scripting/examples/java/Newsgroup/OfficeAttachment.java
+++ b/scripting/examples/java/Newsgroup/OfficeAttachment.java
diff --git a/scripting/examples/java/Newsgroup/PostNewsgroup.java b/scripting/examples/java/Newsgroup/PostNewsgroup.java
index 53a9e75278..53a9e75278 100644..100755
--- a/scripting/examples/java/Newsgroup/PostNewsgroup.java
+++ b/scripting/examples/java/Newsgroup/PostNewsgroup.java
diff --git a/scripting/examples/java/Newsgroup/Sender.java b/scripting/examples/java/Newsgroup/Sender.java
index b1668cb4f2..b1668cb4f2 100644..100755
--- a/scripting/examples/java/Newsgroup/Sender.java
+++ b/scripting/examples/java/Newsgroup/Sender.java
diff --git a/scripting/examples/java/Newsgroup/StatusWindow.java b/scripting/examples/java/Newsgroup/StatusWindow.java
index bd8860a046..bd8860a046 100644..100755
--- a/scripting/examples/java/Newsgroup/StatusWindow.java
+++ b/scripting/examples/java/Newsgroup/StatusWindow.java
diff --git a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
index 60b935c327..60b935c327 100644..100755
--- a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
+++ b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
diff --git a/scripting/examples/java/debugger/DebugRunner.java b/scripting/examples/java/debugger/DebugRunner.java
index 4430b970b6..4430b970b6 100644..100755
--- a/scripting/examples/java/debugger/DebugRunner.java
+++ b/scripting/examples/java/debugger/DebugRunner.java
diff --git a/scripting/examples/java/debugger/OOBeanShellDebugger.java b/scripting/examples/java/debugger/OOBeanShellDebugger.java
index 2f165296f5..2f165296f5 100644..100755
--- a/scripting/examples/java/debugger/OOBeanShellDebugger.java
+++ b/scripting/examples/java/debugger/OOBeanShellDebugger.java
diff --git a/scripting/examples/java/debugger/OORhinoDebugger.java b/scripting/examples/java/debugger/OORhinoDebugger.java
index 0aea985cc5..0aea985cc5 100644..100755
--- a/scripting/examples/java/debugger/OORhinoDebugger.java
+++ b/scripting/examples/java/debugger/OORhinoDebugger.java
diff --git a/scripting/examples/java/debugger/OOScriptDebugger.java b/scripting/examples/java/debugger/OOScriptDebugger.java
index 67532e113f..67532e113f 100644..100755
--- a/scripting/examples/java/debugger/OOScriptDebugger.java
+++ b/scripting/examples/java/debugger/OOScriptDebugger.java
diff --git a/scripting/examples/java/debugger/parcel-descriptor.xml b/scripting/examples/java/debugger/parcel-descriptor.xml
index 285db1bb7b..285db1bb7b 100644..100755
--- a/scripting/examples/java/debugger/parcel-descriptor.xml
+++ b/scripting/examples/java/debugger/parcel-descriptor.xml
diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java
index fb15898606..fb15898606 100644..100755
--- a/scripting/examples/java/selector/ScriptSelector.java
+++ b/scripting/examples/java/selector/ScriptSelector.java
diff --git a/scripting/examples/java/selector/container.gif b/scripting/examples/java/selector/container.gif
index 3a345f9bf9..3a345f9bf9 100644..100755
--- a/scripting/examples/java/selector/container.gif
+++ b/scripting/examples/java/selector/container.gif
diff --git a/scripting/examples/java/selector/parcel-descriptor.xml b/scripting/examples/java/selector/parcel-descriptor.xml
index 8e3e70e8c6..8e3e70e8c6 100644..100755
--- a/scripting/examples/java/selector/parcel-descriptor.xml
+++ b/scripting/examples/java/selector/parcel-descriptor.xml
diff --git a/scripting/examples/java/selector/script.gif b/scripting/examples/java/selector/script.gif
index d3b3768cae..d3b3768cae 100644..100755
--- a/scripting/examples/java/selector/script.gif
+++ b/scripting/examples/java/selector/script.gif
diff --git a/scripting/examples/java/selector/soffice.gif b/scripting/examples/java/selector/soffice.gif
index 88124d87d1..88124d87d1 100644..100755
--- a/scripting/examples/java/selector/soffice.gif
+++ b/scripting/examples/java/selector/soffice.gif
diff --git a/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js b/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js
index a66d08a185..a66d08a185 100644..100755
--- a/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js
+++ b/scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js
diff --git a/scripting/examples/javascript/HelloWorld/helloworld.js b/scripting/examples/javascript/HelloWorld/helloworld.js
index aa170def23..aa170def23 100644..100755
--- a/scripting/examples/javascript/HelloWorld/helloworld.js
+++ b/scripting/examples/javascript/HelloWorld/helloworld.js
diff --git a/scripting/examples/javascript/Highlight/ButtonPressHandler.js b/scripting/examples/javascript/Highlight/ButtonPressHandler.js
index 306b999160..306b999160 100644..100755
--- a/scripting/examples/javascript/Highlight/ButtonPressHandler.js
+++ b/scripting/examples/javascript/Highlight/ButtonPressHandler.js
diff --git a/scripting/examples/javascript/Highlight/ShowDialog.js b/scripting/examples/javascript/Highlight/ShowDialog.js
index a6f9759d9a..a6f9759d9a 100644..100755
--- a/scripting/examples/javascript/Highlight/ShowDialog.js
+++ b/scripting/examples/javascript/Highlight/ShowDialog.js
diff --git a/scripting/examples/javascript/Highlight/parcel-descriptor.xml b/scripting/examples/javascript/Highlight/parcel-descriptor.xml
index a6e6396fbe..a6e6396fbe 100644..100755
--- a/scripting/examples/javascript/Highlight/parcel-descriptor.xml
+++ b/scripting/examples/javascript/Highlight/parcel-descriptor.xml
diff --git a/scripting/examples/python/Capitalise.py b/scripting/examples/python/Capitalise.py
index 195d74801b..195d74801b 100644..100755
--- a/scripting/examples/python/Capitalise.py
+++ b/scripting/examples/python/Capitalise.py
diff --git a/scripting/examples/python/HelloWorld.py b/scripting/examples/python/HelloWorld.py
index 7f5b45c8cd..7f5b45c8cd 100644..100755
--- a/scripting/examples/python/HelloWorld.py
+++ b/scripting/examples/python/HelloWorld.py
diff --git a/scripting/examples/python/pythonSamples/TableSample.py b/scripting/examples/python/pythonSamples/TableSample.py
index 793b79725a..793b79725a 100644..100755
--- a/scripting/examples/python/pythonSamples/TableSample.py
+++ b/scripting/examples/python/pythonSamples/TableSample.py
diff --git a/scripting/inc/makefile.mk b/scripting/inc/makefile.mk
index 1d23c96ac7..1d23c96ac7 100644..100755
--- a/scripting/inc/makefile.mk
+++ b/scripting/inc/makefile.mk
diff --git a/scripting/inc/pch/precompiled_scripting.cxx b/scripting/inc/pch/precompiled_scripting.cxx
index 563ae22e3f..563ae22e3f 100644..100755
--- a/scripting/inc/pch/precompiled_scripting.cxx
+++ b/scripting/inc/pch/precompiled_scripting.cxx
diff --git a/scripting/inc/pch/precompiled_scripting.hxx b/scripting/inc/pch/precompiled_scripting.hxx
index 1d707df6bb..1d707df6bb 100644..100755
--- a/scripting/inc/pch/precompiled_scripting.hxx
+++ b/scripting/inc/pch/precompiled_scripting.hxx
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index 8b3d4479ce..9003f5ee0e 100644..100755
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -215,11 +215,6 @@ XInitialization {
         return xSingleServiceFactory;
     }
 
-    public static boolean __writeRegistryServiceInfo( XRegistryKey regKey ) {
-        return FactoryHelper.writeRegistryServiceInfo(
-            SecurityDialog.class.getName(), SecurityDialog.__serviceName, regKey );
-    }
-    
     // XServiceInfo
     public String getImplementationName(  ) {
         return getClass().getName();
diff --git a/scripting/java/ScriptFramework.component b/scripting/java/ScriptFramework.component
new file mode 100755
index 0000000000..d6f9a8f62b
--- /dev/null
+++ b/scripting/java/ScriptFramework.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.script.framework.security.SecurityDialog">
+    <service name="com.sun.star.script.framework.security.SecurityDialog"/>
+  </implementation>
+</component>
diff --git a/scripting/java/ScriptProviderForBeanShell.component b/scripting/java/ScriptProviderForBeanShell.component
new file mode 100755
index 0000000000..fe040d71d9
--- /dev/null
+++ b/scripting/java/ScriptProviderForBeanShell.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell$_ScriptProviderForBeanShell">
+    <service name="com.sun.star.script.browse.BrowseNode"/>
+    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProviderForBeanShell"/>
+  </implementation>
+</component>
diff --git a/scripting/java/ScriptProviderForJava.component b/scripting/java/ScriptProviderForJava.component
new file mode 100755
index 0000000000..4ea6ea8a10
--- /dev/null
+++ b/scripting/java/ScriptProviderForJava.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.script.framework.provider.java.ScriptProviderForJava$_ScriptProviderForJava">
+    <service name="com.sun.star.script.browse.BrowseNode"/>
+    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProviderForJava"/>
+  </implementation>
+</component>
diff --git a/scripting/java/ScriptProviderForJavaScript.component b/scripting/java/ScriptProviderForJavaScript.component
new file mode 100755
index 0000000000..e9725d8659
--- /dev/null
+++ b/scripting/java/ScriptProviderForJavaScript.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript$_ScriptProviderForJavaScript">
+    <service name="com.sun.star.script.browse.BrowseNode"/>
+    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProviderForJavaScript"/>
+  </implementation>
+</component>
diff --git a/scripting/java/build.env b/scripting/java/build.env
index 5b055e0b84..5b055e0b84 100644..100755
--- a/scripting/java/build.env
+++ b/scripting/java/build.env
diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
index f59088d6cb..f59088d6cb 100644..100755
--- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
+++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index f2fe01bab6..f2fe01bab6 100644..100755
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 1f91e9cf68..1f91e9cf68 100644..100755
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 597789c062..597789c062 100644..100755
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 1c05308ab5..1c05308ab5 100644..100755
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index 084d35b749..084d35b749 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index f72e721b3e..f72e721b3e 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 4ae5b7f0e9..4ae5b7f0e9 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 5758684d52..5758684d52 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
diff --git a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
index fe06c189bc..fe06c189bc 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index f69fa9dc51..f69fa9dc51 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 72fc5f35c8..72fc5f35c8 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index fc1dec7f7d..fc1dec7f7d 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParser.java b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
index 0ee2c2eaef..0ee2c2eaef 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/XMLParser.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index bc19d79011..bc19d79011 100644..100755
--- a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 7b3930a8cb..7b3930a8cb 100644..100755
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 61c07e4cd5..61c07e4cd5 100644..100755
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
index 11c046d214..11c046d214 100644..100755
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index 8f681786f2..8f681786f2 100644..100755
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index bc77b62951..bc77b62951 100644..100755
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
diff --git a/scripting/java/com/sun/star/script/framework/log/LogUtils.java b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
index f7de0adf8b..f7de0adf8b 100644..100755
--- a/scripting/java/com/sun/star/script/framework/log/LogUtils.java
+++ b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
index 6c8db78a7a..6c8db78a7a 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 4b18ac7e88..4b18ac7e88 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index c88da58df8..c88da58df8 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
index e6654d2bd8..e6654d2bd8 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index e7bce06905..e7bce06905 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 3120487935..6a9a16f7b1 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -123,41 +123,6 @@ public class ScriptProviderForBeanShell
 
         return xSingleServiceFactory;
     }
-
-
-    /**
-     * Writes the service information into the given registry key.
-     * This method is called by the <code>JavaLoader</code>
-     * <p>
-     *
-     * @param  regKey  the registryKey
-     * @return         returns true if the operation succeeded
-     * @see            com.sun.star.comp.loader.JavaLoader
-     */
-    public static boolean __writeRegistryServiceInfo( XRegistryKey regKey )
-    {
-        String impl = "com.sun.star.script.framework.provider.beanshell." +
-            "ScriptProviderForBeanShell$_ScriptProviderForBeanShell";
-
-        String service1 = "com.sun.star.script.provider." +
-            "ScriptProvider";
-        String service2 = "com.sun.star.script.provider." +
-            "LanguageScriptProvider";
-        String service3 = "com.sun.star.script.provider." +
-            "ScriptProviderForBeanShell";
-        String service4 = "com.sun.star.script.browse." +
-            "BrowseNode";
-
-        if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
-        {
-                return true;
-        }
-        return false;
-    }
-
 }
 
 class ScriptImpl implements XScript
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index a0328b3710..a0328b3710 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
index ecc8eea747..ecc8eea747 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh b/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
index 03cb114d79..03cb114d79 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index c89285ffdf..ab5e51db82 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -134,41 +134,6 @@ public class ScriptProviderForJava
 
         return xSingleServiceFactory;
     }
-
-
-    /**
-     * Writes the service information into the given registry key.
-     * This method is called by the <code>JavaLoader</code>
-     * <p>
-     *
-     * @param  regKey  the registryKey
-     * @return         returns true if the operation succeeded
-     * @see            com.sun.star.comp.loader.JavaLoader
-     */
-    public static boolean __writeRegistryServiceInfo( XRegistryKey regKey )
-    {
-        String impl = "com.sun.star.script.framework.provider.java." +
-            "ScriptProviderForJava$_ScriptProviderForJava";
-
-        String service1 = "com.sun.star.script.provider." +
-            "ScriptProvider";
-        String service2 = "com.sun.star.script.provider." +
-            "LanguageScriptProvider";
-        String service3 = "com.sun.star.script.provider." +
-            "ScriptProviderForJava";
-        String service4 = "com.sun.star.script.browse." +
-            "BrowseNode";
-
-        if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
-        {
-              return true;
-        }
-        return false;
-    }
-
 }
 
 class ScriptImpl implements XScript
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index dde0286538..dde0286538 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index a90e4bc41a..e855bea4fb 100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -124,40 +124,6 @@ public class ScriptProviderForJavaScript
 
         return xSingleServiceFactory;
     }
-
-
-    /**
-     * Writes the service information into the given registry key.
-     * This method is called by the <code>JavaLoader</code>
-     * <p>
-     *
-     * @param  regKey  the registryKey
-     * @return         returns true if the operation succeeded
-     * @see            com.sun.star.comp.loader.JavaLoader
-     */
-    public static boolean __writeRegistryServiceInfo( XRegistryKey regKey )
-    {
-        String impl = "com.sun.star.script.framework.provider.javascript." +
-            "ScriptProviderForJavaScript$_ScriptProviderForJavaScript";
-
-        String service1 = "com.sun.star.script.provider." +
-            "ScriptProvider";
-        String service2 = "com.sun.star.script.provider." +
-            "LanguageScriptProvider";
-        String service3 = "com.sun.star.script.provider." +
-            "ScriptProviderForJavaScript";
-        String service4 = "com.sun.star.script.browse." +
-            "BrowseNode";
-
-        if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
-            FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
-        {
-                return true;
-        }
-        return false;
-    }
 }
 class ScriptImpl implements XScript
 {
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/template.js b/scripting/java/com/sun/star/script/framework/provider/javascript/template.js
index d992791e64..d992791e64 100644..100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/template.js
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/template.js
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
index 6a5a81bf97..dc8ee1abdc 100755
--- a/scripting/java/makefile.mk
+++ b/scripting/java/makefile.mk
@@ -36,3 +36,37 @@ TARGET=scriptruntimeforjava
 ALLTAR : ANTBUILD
 .ENDIF
 .ENDIF
+
+ALLTAR : \
+    $(MISC)/ScriptFramework.component \
+    $(MISC)/ScriptProviderForBeanShell.component \
+    $(MISC)/ScriptProviderForJava.component \
+    $(MISC)/ScriptProviderForJavaScript.component
+
+$(MISC)/ScriptFramework.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
+
+$(MISC)/ScriptProviderForBeanShell.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt \
+        ScriptProviderForBeanShell.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForBeanShell.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt \
+        ScriptProviderForBeanShell.component
+
+$(MISC)/ScriptProviderForJava.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJava.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
+
+$(MISC)/ScriptProviderForJavaScript.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt \
+        ScriptProviderForJavaScript.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJavaScript.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt \
+        ScriptProviderForJavaScript.component
diff --git a/scripting/java/manifest.mf b/scripting/java/manifest.mf
index ba14e301b3..ba14e301b3 100644..100755
--- a/scripting/java/manifest.mf
+++ b/scripting/java/manifest.mf
diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 872cbbf5c0..872cbbf5c0 100644..100755
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
diff --git a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
index 34e062a68b..34e062a68b 100644..100755
--- a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
+++ b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java
diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java b/scripting/java/org/openoffice/idesupport/JavaFinder.java
index 011fb27c15..011fb27c15 100644..100755
--- a/scripting/java/org/openoffice/idesupport/JavaFinder.java
+++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java
diff --git a/scripting/java/org/openoffice/idesupport/LocalOffice.java b/scripting/java/org/openoffice/idesupport/LocalOffice.java
index ef7a657f1e..ef7a657f1e 100644..100755
--- a/scripting/java/org/openoffice/idesupport/LocalOffice.java
+++ b/scripting/java/org/openoffice/idesupport/LocalOffice.java
diff --git a/scripting/java/org/openoffice/idesupport/MethodFinder.java b/scripting/java/org/openoffice/idesupport/MethodFinder.java
index 3bf85e3235..3bf85e3235 100644..100755
--- a/scripting/java/org/openoffice/idesupport/MethodFinder.java
+++ b/scripting/java/org/openoffice/idesupport/MethodFinder.java
diff --git a/scripting/java/org/openoffice/idesupport/OfficeDocument.java b/scripting/java/org/openoffice/idesupport/OfficeDocument.java
index dacb55d141..dacb55d141 100644..100755
--- a/scripting/java/org/openoffice/idesupport/OfficeDocument.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeDocument.java
diff --git a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
index 151e58289b..151e58289b 100644..100755
--- a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 43bf4c21df..43bf4c21df 100644..100755
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
diff --git a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
index 73b9f59d24..73b9f59d24 100644..100755
--- a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
diff --git a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
index b6e4b166c2..b6e4b166c2 100644..100755
--- a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
index 6874ff1d3d..6874ff1d3d 100644..100755
--- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
diff --git a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
index 64db62176a..64db62176a 100644..100755
--- a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
diff --git a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
index d7a3ddec97..d7a3ddec97 100644..100755
--- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
+++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
diff --git a/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
index a0850d0d28..a0850d0d28 100644..100755
--- a/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
diff --git a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
index 3c216b5723..3c216b5723 100644..100755
--- a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
index 44b80cf0a9..44b80cf0a9 100644..100755
--- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
diff --git a/scripting/java/org/openoffice/idesupport/ui/add.gif b/scripting/java/org/openoffice/idesupport/ui/add.gif
index e47c986ccf..e47c986ccf 100644..100755
--- a/scripting/java/org/openoffice/idesupport/ui/add.gif
+++ b/scripting/java/org/openoffice/idesupport/ui/add.gif
diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index 2821bbb92b..2821bbb92b 100644..100755
--- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
index 312a10abd0..312a10abd0 100644..100755
--- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
+++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
diff --git a/scripting/java/org/openoffice/netbeans/editor/JavaKit.java b/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
index 380ad7e80e..380ad7e80e 100644..100755
--- a/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
+++ b/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
diff --git a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
index 6e62c567f7..6e62c567f7 100644..100755
--- a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
+++ b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
diff --git a/scripting/java/org/openoffice/netbeans/editor/OOo.jcb b/scripting/java/org/openoffice/netbeans/editor/OOo.jcb
index 7286934fae..7286934fae 100644..100755
--- a/scripting/java/org/openoffice/netbeans/editor/OOo.jcb
+++ b/scripting/java/org/openoffice/netbeans/editor/OOo.jcb
diff --git a/scripting/java/org/openoffice/netbeans/editor/OOo.jcs b/scripting/java/org/openoffice/netbeans/editor/OOo.jcs
index c5cc334221..c5cc334221 100644..100755
--- a/scripting/java/org/openoffice/netbeans/editor/OOo.jcs
+++ b/scripting/java/org/openoffice/netbeans/editor/OOo.jcs
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/Bundle.properties
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/Bundle_en_US.properties b/scripting/java/org/openoffice/netbeans/modules/office/Bundle_en_US.properties
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/Bundle_en_US.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/Bundle_en_US.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
index 37d921c680..37d921c680 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
index 0f9e8848af..0f9e8848af 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
index cdc7b3762d..cdc7b3762d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index a8ecfef010..a8ecfef010 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
index 71601fa0c5..71601fa0c5 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
index 5420ef4eeb..5420ef4eeb 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
index 0f422605ad..0f422605ad 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
index b05601d5f3..b05601d5f3 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
index b9500a2ad4..b9500a2ad4 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
index 515f8e968c..515f8e968c 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
index 3e6bcbfff1..3e6bcbfff1 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
index 71bc99f6c4..71bc99f6c4 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
index 205b0637e2..205b0637e2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
index 41d1b8434d..41d1b8434d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
index ff032b327d..ff032b327d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties
index f776ff9e79..f776ff9e79 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle_en_US.properties b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle_en_US.properties
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle_en_US.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle_en_US.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
index 1a1ace62a0..1a1ace62a0 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
index 7947a827c5..7947a827c5 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties
index eab2fa1f3f..eab2fa1f3f 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
index 530ec93b1b..530ec93b1b 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
index 353bf3959d..353bf3959d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
index bba51237d4..bba51237d4 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
index 96df06251f..96df06251f 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
index b5088f2a91..b5088f2a91 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
index edc51685af..edc51685af 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
index d8ed1c5be5..d8ed1c5be5 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
index ed6a8b9cd5..ed6a8b9cd5 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
index 05766a4d50..05766a4d50 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
index d69d085299..d69d085299 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
index 49135e1ef9..49135e1ef9 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
index 7eb439c535..7eb439c535 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
index e742c4bd51..e742c4bd51 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
index 8e60eefd67..8e60eefd67 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
index 1c95351cef..1c95351cef 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
index e77c59ff4b..e77c59ff4b 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
index cfca5cce8d..cfca5cce8d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
index 2d166eb084..2d166eb084 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
index e921991a14..e921991a14 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
index 95ee695a57..95ee695a57 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
index 91f953cc97..91f953cc97 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/options/Bundle.properties
index 6a9112e8c7..6a9112e8c7 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index f493d03618..f493d03618 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
index 1e88c42d55..1e88c42d55 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon.gif b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon.gif
index 9bed852670..9bed852670 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon.gif
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon.gif
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon32.gif b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon32.gif
index 65bfc82bc2..65bfc82bc2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon32.gif
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon32.gif
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html b/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html
index ee576e74ce..ee576e74ce 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.settings b/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.settings
index b682273020..b682273020 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.settings
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.settings
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/resources/Bundle.properties
index 22aea6525f..22aea6525f 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html b/scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html
index f3c478c42a..f3c478c42a 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon.gif b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon.gif
index ec7507ef9e..ec7507ef9e 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon.gif
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon.gif
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon32.gif b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon32.gif
index 94fdab1eba..94fdab1eba 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon32.gif
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon32.gif
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeSettings.settings b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeSettings.settings
index df98da1165..df98da1165 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeSettings.settings
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeSettings.settings
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html
index 5a879388bb..5a879388bb 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.settings b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.settings
index 32a5bd490b..32a5bd490b 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.settings
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.settings
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon.png b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon.png
index a441019346..a441019346 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon.png
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon.png
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon32.png b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon32.png
index 1b2ee21e6d..1b2ee21e6d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon32.png
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon32.png
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/ParcelIcon.gif b/scripting/java/org/openoffice/netbeans/modules/office/resources/ParcelIcon.gif
index a889c2614e..a889c2614e 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/ParcelIcon.gif
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/ParcelIcon.gif
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html b/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html
index c0f489032b..c0f489032b 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html b/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html
index d753d5dfe9..d753d5dfe9 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/layer.xml b/scripting/java/org/openoffice/netbeans/modules/office/resources/layer.xml
index d2d1317b4d..d2d1317b4d 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/layer.xml
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/layer.xml
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/mime-resolver.xml b/scripting/java/org/openoffice/netbeans/modules/office/resources/mime-resolver.xml
index 55ba959857..55ba959857 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/mime-resolver.xml
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/mime-resolver.xml
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/office-scripting.url b/scripting/java/org/openoffice/netbeans/modules/office/resources/office-scripting.url
index f7be83c0ea..f7be83c0ea 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/office-scripting.url
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/office-scripting.url
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
index 9354dba121..9354dba121 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_
index cf997b0f10..cf997b0f10 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_
index 7c016c322e..7c016c322e 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_
index 36e66aeeb2..36e66aeeb2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_
index 81ffce04e3..81ffce04e3 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_
+++ b/scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
index baaacc524c..baaacc524c 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
index e0cf728a47..e0cf728a47 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
index fa048d3bb1..fa048d3bb1 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
index a5fa15bc01..a5fa15bc01 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
index 25f2af5a8f..25f2af5a8f 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
index 62f06c8a33..62f06c8a33 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle.properties b/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle.properties
index a40b4b3739..a40b4b3739 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle_en_US.properties b/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle_en_US.properties
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle_en_US.properties
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle_en_US.properties
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java
index a9a06589a7..a9a06589a7 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java
index 6ecc52817f..6ecc52817f 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
index aac32cafee..aac32cafee 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
index 0039387df1..0039387df1 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesPanel.java
index 47f8678566..47f8678566 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesPanel.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesPanel.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.form b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.form
index 0bfb183f50..0bfb183f50 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.form
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.form
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
index d7d3d80c9a..d7d3d80c9a 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
index f3770d53d2..f3770d53d2 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.form b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.form
index b054e349f3..b054e349f3 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.form
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.form
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
index 50336baecb..50336baecb 100644..100755
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index cdb51acd0c..50bb1f3d89 100755
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,4 +1,4 @@
-tc	scripting	:	filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
+tc	scripting	:	filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
 tc	scripting									usr1	-	all	tc1_mkout NULL
 tc	scripting\inc								nmake	-	all	tc1_inc NULL
 tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
index 30d5e1c345..3c67b2a360 100644..100755
--- a/scripting/prj/d.lst
+++ b/scripting/prj/d.lst
@@ -15,6 +15,18 @@ mkdir: %_DEST%\bin%_EXT%\pyuno
 ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml
 
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+..\%__SRC%\misc\mailmerge.component %_DEST%\xml%_EXT%\mailmerge.component
+..\%__SRC%\misc\pythonscript.component %_DEST%\xml%_EXT%\pythonscript.component
+..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml%_EXT%\ScriptFramework.component
+..\%__SRC%\misc\ScriptProviderForBeanShell.component %_DEST%\xml%_EXT%\ScriptProviderForBeanShell.component
+..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml%_EXT%\ScriptProviderForJava.component
+..\%__SRC%\misc\ScriptProviderForJavaScript.component %_DEST%\xml%_EXT%\ScriptProviderForJavaScript.component
+..\%__SRC%\misc\basprov.component %_DEST%\xml%_EXT%\basprov.component
+..\%__SRC%\misc\dlgprov.component %_DEST%\xml%_EXT%\dlgprov.component
+..\%__SRC%\misc\protocolhandler.component %_DEST%\xml%_EXT%\protocolhandler.component
+..\%__SRC%\misc\scriptframe.component %_DEST%\xml%_EXT%\scriptframe.component
+..\%__SRC%\misc\stringresource.component %_DEST%\xml%_EXT%\stringresource.component
+..\%__SRC%\misc\vbaevents.component %_DEST%\xml%_EXT%\vbaevents.component
 
 # Extensions
 ..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index 1e805bce43..1e805bce43 100644..100755
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 1e9b8167bd..1e9b8167bd 100644..100755
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 2638a3cc30..ee31f3ff84 100644..100755
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -219,7 +219,7 @@ namespace basprov
         if ( aFunctionName == BASPROV_PROPERTY_EDITABLE )
         {
             ::rtl::OUString sDocURL, sLibName, sModName;
-            USHORT nLine1 = 0, nLine2;
+            sal_uInt16 nLine1 = 0, nLine2;
 
             if ( !m_bIsAppScript )
             {
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 298447c2a8..298447c2a8 100644..100755
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index 0a68d53228..fd063cd443 100644..100755
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -101,7 +101,7 @@ namespace basprov
                 sal_Int32 nRealCount = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         ++nRealCount;
                 }
@@ -111,7 +111,7 @@ namespace basprov
                 sal_Int32 iTarget = 0;
                 for ( sal_Int32 i = 0; i < nCount; ++i )
                 {
-                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< USHORT >( i ) ) );
+                    SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Get( static_cast< sal_uInt16 >( i ) ) );
                     if ( pMethod && !pMethod->IsHidden() )
                         pChildNodes[iTarget++] = static_cast< browse::XBrowseNode* >( new BasicMethodNodeImpl( m_xContext, m_sScriptingContext, pMethod, m_bIsAppScript ) );
                 }
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 7dcfd964ed..7dcfd964ed 100644..100755
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
diff --git a/scripting/source/basprov/basprov.component b/scripting/source/basprov/basprov.component
new file mode 100755
index 0000000000..528ab6544e
--- /dev/null
+++ b/scripting/source/basprov/basprov.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.scripting.ScriptProviderForBasic">
+    <service name="com.sun.star.script.browse.BrowseNode"/>
+    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProviderForBasic"/>
+  </implementation>
+</component>
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index aa356b4b8e..c1fe17593c 100644..100755
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -412,7 +412,7 @@ namespace basprov
                 StarBASIC* pBasic = pBasicMgr->GetLib( aLibrary );
                 if ( !pBasic )
                 {
-                    USHORT nId = pBasicMgr->GetLibId( aLibrary );
+                    sal_uInt16 nId = pBasicMgr->GetLibId( aLibrary );
                     if ( nId != LIB_NOTFOUND )
                     {
                         pBasicMgr->LoadLib( nId );
@@ -605,13 +605,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, ::basprov::s_component_entries );
-    }
-
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 8507346561..8507346561 100644..100755
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
diff --git a/scripting/source/basprov/basprov.xml b/scripting/source/basprov/basprov.xml
index 7dd6a2c438..7dd6a2c438 100644..100755
--- a/scripting/source/basprov/basprov.xml
+++ b/scripting/source/basprov/basprov.xml
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index ccd0eb27a7..4145e32083 100644..100755
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -93,13 +93,34 @@ namespace basprov
         ,m_documentBasicManager( &documentBasicManager )
         ,m_xDocumentScriptContext( documentScriptContext )
     {
-    //
+        StartListening( *m_documentBasicManager );
         registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
     }
 
     // -----------------------------------------------------------------------------
     BasicScriptImpl::~BasicScriptImpl()
     {
+        if ( m_documentBasicManager )
+            EndListening( *m_documentBasicManager );
+    }
+
+    // -----------------------------------------------------------------------------
+    // SfxListener
+    // -----------------------------------------------------------------------------
+    void BasicScriptImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+    {
+        if ( &rBC != m_documentBasicManager )
+        {
+            OSL_ENSURE( false, "BasicScriptImpl::Notify: where does this come from?" );
+            // not interested in
+            return;
+        }
+        const SfxSimpleHint* pSimpleHint = PTR_CAST( SfxSimpleHint, &rHint );
+        if ( pSimpleHint && ( pSimpleHint->GetId() == SFX_HINT_DYING ) )
+        {
+            m_documentBasicManager = NULL;
+            EndListening( rBC );    // prevent multiple notifications
+        }
     }
 
     // -----------------------------------------------------------------------------
@@ -171,7 +192,7 @@ namespace basprov
             if ( pInfo )
             {
                 sal_Int32 nSbxOptional = 0;
-                USHORT n = 1;
+                sal_uInt16 n = 1;
                 for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
                 {
                     if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -204,7 +225,7 @@ namespace basprov
                 {
                     SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
                     unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
-                    xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+                    xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
 
                     // Enable passing by ref
                     if ( xSbxVar->GetType() != SbxVARIANT )
@@ -246,7 +267,7 @@ namespace basprov
                 if ( pInfo_ )
                 {
                     OutParamMap aOutParamMap;
-                    for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+                    for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
                     {
                         const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
                         if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 7684f98949..c445148491 100644..100755
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -36,6 +36,7 @@
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <basic/sbmeth.hxx>
+#include <svl/lstner.hxx>
 
 class BasicManager;
 
@@ -52,7 +53,7 @@ namespace basprov
         ::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
 
 
-    class BasicScriptImpl : public BasicScriptImpl_BASE,
+    class BasicScriptImpl : public BasicScriptImpl_BASE, public SfxListener,
                                 public ::scripting_helper::OMutexHolder,
                                 public ::scripting_helper::OBroadcastHelperHolder,
                                 public ::comphelper::OPropertyContainer,
@@ -106,6 +107,9 @@ namespace basprov
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
             throw (::com::sun::star::uno::RuntimeException);
+
+        // SfxListener
+        virtual void		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
     };
 
 //.........................................................................
diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk
index 5001e5db28..bde15f95d5 100644..100755
--- a/scripting/source/basprov/makefile.mk
+++ b/scripting/source/basprov/makefile.mk
@@ -58,6 +58,7 @@ SHL1STDLIBS= \
         $(SFX2LIB) \
         $(BASICLIB) \
         $(VCLLIB) \
+        $(SVLLIB) \
         $(TOOLSLIB) \
         $(UCBHELPERLIB) \
         $(COMPHELPERLIB) \
@@ -71,3 +72,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/basprov.component
+
+$(MISC)/basprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        basprov.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt basprov.component
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx
new file mode 100755
index 0000000000..d81f248830
--- /dev/null
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_scripting.hxx"
+
+#include "DialogModelProvider.hxx"
+#include "dlgprov.hxx"
+#include <com/sun/star/resource/XStringResourceManager.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+
+
+// component helper namespace
+namespace comp_DialogModelProvider {
+
+namespace css = ::com::sun::star;
+using namespace ::com::sun::star;
+using namespace awt;
+using namespace lang;
+using namespace uno;
+using namespace script;
+using namespace beans;
+
+
+// component and service helper functions:
+::rtl::OUString SAL_CALL _getImplementationName();
+css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
+css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context );
+
+} // closing component helper namespace
+
+
+
+/// anonymous implementation namespace
+namespace dlgprov {
+
+namespace css = ::com::sun::star;
+using namespace ::com::sun::star;
+using namespace awt;
+using namespace lang;
+using namespace uno;
+using namespace script;
+using namespace beans;
+
+
+DialogModelProvider::DialogModelProvider(Reference< XComponentContext > const & context) :
+    m_xContext(context)
+{}
+
+// lang::XInitialization:
+void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception)
+{
+    if ( aArguments.getLength() == 1 )
+    {
+        ::rtl::OUString sURL;
+        if ( !( aArguments[ 0 ] >>= sURL ))
+            throw css::lang::IllegalArgumentException();
+         // Try any other URL with SimpleFileAccess
+        Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< ucb::XSimpleFileAccess > xSFI =
+            Reference< ucb::XSimpleFileAccess >( xSMgr->createInstanceWithContext
+            ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), m_xContext ), UNO_QUERY );
+
+        try
+        {
+            Reference< io::XInputStream > xInput = xSFI->openFileRead( sURL );
+            Reference< resource::XStringResourceManager > xStringResourceManager;
+            if ( xInput.is() )
+            {
+                xStringResourceManager = dlgprov::lcl_getStringResourceManager(m_xContext,sURL);
+                Any aDialogSourceURLAny;
+                aDialogSourceURLAny <<= sURL;
+                
+                m_xDialogModel.set( dlgprov::lcl_createDialogModel( m_xContext,xInput , xStringResourceManager, aDialogSourceURLAny  ), UNO_QUERY_THROW);
+                m_xDialogModelProp.set(m_xDialogModel, UNO_QUERY_THROW);
+            }
+        }
+        catch( Exception& )
+        {}
+        //m_sURL = sURL;
+    }
+}
+
+// container::XElementAccess:
+uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::RuntimeException)
+{
+    return m_xDialogModel->getElementType();
+}
+
+::sal_Bool SAL_CALL DialogModelProvider::hasElements() throw (css::uno::RuntimeException)
+{    
+    return m_xDialogModel->hasElements();
+}
+
+// container::XNameAccess:
+uno::Any SAL_CALL DialogModelProvider::getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException)
+{
+    return m_xDialogModel->getByName(aName);
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException)
+{
+    return m_xDialogModel->getElementNames();
+}
+
+::sal_Bool SAL_CALL DialogModelProvider::hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException)
+{
+    return m_xDialogModel->hasByName(aName);
+}
+
+// container::XNameReplace:
+void SAL_CALL DialogModelProvider::replaceByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException)
+{
+    m_xDialogModel->replaceByName(aName,aElement);
+}
+
+// container::XNameContainer:
+void SAL_CALL DialogModelProvider::insertByName(const ::rtl::OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException)
+{
+    m_xDialogModel->insertByName(aName,aElement);
+}
+
+void SAL_CALL DialogModelProvider::removeByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException)
+{
+    m_xDialogModel->removeByName(aName);
+}
+uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo(  ) throw (uno::RuntimeException)
+{
+    return m_xDialogModelProp->getPropertySetInfo();
+}
+void SAL_CALL DialogModelProvider::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+}
+uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    return m_xDialogModelProp->getPropertyValue(PropertyName);
+}
+void SAL_CALL DialogModelProvider::addPropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+}
+void SAL_CALL DialogModelProvider::removePropertyChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+}
+void SAL_CALL DialogModelProvider::addVetoableChangeListener( const ::rtl::OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+}
+void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const ::rtl::OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+}
+
+// com.sun.star.uno.XServiceInfo:
+::rtl::OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException)
+{
+    return comp_DialogModelProvider::_getImplementationName();
+}
+
+::sal_Bool SAL_CALL DialogModelProvider::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< ::rtl::OUString > serviceNames = comp_DialogModelProvider::_getSupportedServiceNames();
+    for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {
+        if (serviceNames[i] == serviceName)
+            return sal_True;
+    }
+    return sal_False;
+}
+
+css::uno::Sequence< ::rtl::OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException)
+{
+    return comp_DialogModelProvider::_getSupportedServiceNames();
+}
+
+} // closing anonymous implementation namespace
+
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
new file mode 100755
index 0000000000..98d6159949
--- /dev/null
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * 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 "sal/config.h"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+
+/// anonymous implementation namespace
+namespace dlgprov{
+
+namespace css = ::com::sun::star;
+
+class DialogModelProvider:
+    public ::cppu::WeakImplHelper4<
+        css::lang::XInitialization,
+        css::container::XNameContainer,
+        css::beans::XPropertySet,
+        css::lang::XServiceInfo>
+{
+public:
+    explicit DialogModelProvider(css::uno::Reference< css::uno::XComponentContext > const & context);
+private:
+    // ::com::sun::star::lang::XInitialization:
+    virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception);
+
+    // ::com::sun::star::container::XElementAccess:
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
+
+    // ::com::sun::star::container::XNameAccess:
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException);
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasByName(const ::rtl::OUString & aName) throw (css::uno::RuntimeException);
+
+    // ::com::sun::star::container::XNameReplace:
+    virtual void SAL_CALL replaceByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException);
+
+    // ::com::sun::star::container::XNameContainer:
+    virtual void SAL_CALL insertByName(const ::rtl::OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException);
+    virtual void SAL_CALL removeByName(const ::rtl::OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException);
+
+    // ::com::sun::star::lang::XServiceInfo:
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException);
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+private:
+    DialogModelProvider(const DialogModelProvider &); // not defined
+    DialogModelProvider& operator=(const DialogModelProvider &); // not defined
+
+    // destructor is private and will be called indirectly by the release call    virtual ~DialogModelProvider() {}
+
+    css::uno::Reference< css::uno::XComponentContext >      m_xContext;
+    css::uno::Reference< css::container::XNameContainer>    m_xDialogModel;
+    css::uno::Reference< css::beans::XPropertySet>          m_xDialogModelProp;
+};
+} // closing anonymous implementation namespace
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 717e096f16..717e096f16 100644..100755
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 88e64ad0af..88e64ad0af 100644..100755
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
diff --git a/scripting/source/dlgprov/dlgprov.component b/scripting/source/dlgprov/dlgprov.component
new file mode 100755
index 0000000000..f7ceed336c
--- /dev/null
+++ b/scripting/source/dlgprov/dlgprov.component
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.scripting.DialogProvider">
+    <service name="com.sun.star.awt.ContainerWindowProvider"/>
+    <service name="com.sun.star.awt.DialogProvider"/>
+    <service name="com.sun.star.awt.DialogProvider2"/>
+  </implementation>
+</component>
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index caeead3b01..d5b76d89b7 100644..100755
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_scripting.hxx"
 
+#include "DialogModelProvider.hxx"
 #include "dlgprov.hxx"
 #include "dlgevtatt.hxx"
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -61,20 +62,103 @@
 #include <util/MiscUtils.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::document;
+using namespace awt;
+using namespace lang;
+using namespace uno;
+using namespace script;
+using namespace beans;
+using namespace document;
 using namespace ::sf_misc;
 
+// component helper namespace
+namespace comp_DialogModelProvider 
+{
+
+    ::rtl::OUString SAL_CALL _getImplementationName() 
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogModelProvider"));
+    }
+
+    uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+    {
+        uno::Sequence< ::rtl::OUString > s(1);
+        s[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModelProvider"));
+        return s;
+    }
+
+    uno::Reference< uno::XInterface > SAL_CALL _create(const uno::Reference< uno::XComponentContext > & context) SAL_THROW((uno::Exception))
+    {
+        return static_cast< ::cppu::OWeakObject * >(new dlgprov::DialogModelProvider(context));
+    }
+} // closing component helper namespace
 //.........................................................................
 namespace dlgprov
 {
 //.........................................................................
 
 static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver"));
+
+    Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL)
+    {
+        INetURLObject aInetObj( i_sURL );
+        ::rtl::OUString aDlgName = aInetObj.GetBase();
+        aInetObj.removeSegment();
+        ::rtl::OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
+        bool bReadOnly = true;
+        ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
+        ::rtl::OUString aComment;
+
+        Sequence<Any> aArgs( 6 );
+        aArgs[0] <<= aDlgLocation;
+        aArgs[1] <<= bReadOnly;
+        aArgs[2] <<= aLocale;
+        aArgs[3] <<= aDlgName;
+        aArgs[4] <<= aComment;
+
+        Reference< task::XInteractionHandler > xDummyHandler;
+        aArgs[5] <<= xDummyHandler;
+        Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW );
+        // TODO: Ctor
+        Reference< resource::XStringResourceManager > xStringResourceManager( xSMgr_->createInstanceWithContext
+            ( ::rtl::OUString::createFromAscii( "com.sun.star.resource.StringResourceWithLocation" ), 
+                i_xContext ), UNO_QUERY );
+        if( xStringResourceManager.is() )
+        {
+            Reference< XInitialization > xInit( xStringResourceManager, UNO_QUERY );
+            if( xInit.is() )
+                xInit->initialize( aArgs );
+        }
+        return xStringResourceManager;
+    }
+    Reference< container::XNameContainer > lcl_createControlModel(const Reference< XComponentContext >& i_xContext)
+    {
+        Reference< XMultiComponentFactory > xSMgr_( i_xContext->getServiceManager(), UNO_QUERY_THROW );
+        Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ), i_xContext ), UNO_QUERY_THROW );
+        return xControlModel;
+    }
+    Reference< container::XNameContainer > lcl_createDialogModel( const Reference< XComponentContext >& i_xContext,
+        const Reference< io::XInputStream >& xInput, 
+        const Reference< resource::XStringResourceManager >& xStringResourceManager,
+        const Any &aDialogSourceURL) throw ( Exception )
+    {
+        Reference< container::XNameContainer > xDialogModel(  lcl_createControlModel(i_xContext) );
+
+        ::rtl::OUString aDlgSrcUrlPropName( RTL_CONSTASCII_USTRINGPARAM( "DialogSourceURL" ) );
+        Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY );
+        xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL );
+
+        ::xmlscript::importDialogModel( xInput, xDialogModel, i_xContext );
+        // Set resource property
+        if( xStringResourceManager.is() )
+        {
+            Reference< beans::XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY );
+            Any aStringResourceManagerAny;
+            aStringResourceManagerAny <<= xStringResourceManager;
+            xDlgPSet->setPropertyValue( aResourceResolverPropName, aStringResourceManagerAny );
+        }
+    
+        return xDialogModel; 
+    }
     // =============================================================================
     // component operations
     // =============================================================================
@@ -174,9 +258,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
 
     Reference< container::XNameContainer > DialogProviderImpl::createControlModel() throw ( Exception )
     {
-        Reference< XMultiComponentFactory > xSMgr_( m_xContext->getServiceManager(), UNO_QUERY_THROW );
-        Reference< container::XNameContainer > xControlModel( xSMgr_->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ), m_xContext ), UNO_QUERY_THROW );
-        return xControlModel;
+        return lcl_createControlModel(m_xContext);
     }
 
     Reference< container::XNameContainer > DialogProviderImpl::createDialogModel(
@@ -184,14 +266,9 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
         const Reference< resource::XStringResourceManager >& xStringResourceManager,
         const Any &aDialogSourceURL) throw ( Exception )
     {
-        Reference< container::XNameContainer > xDialogModel(  createControlModel() );
-
-        ::rtl::OUString aDlgSrcUrlPropName( RTL_CONSTASCII_USTRINGPARAM( "DialogSourceURL" ) );
-        Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY );
-        xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL );
-
+        
+    
         // #TODO we really need to detect the source of the Dialog, is it
-        // located in the document or not. m_xModel need not be the location of
         // the dialog. E.g. if the dialog was created from basic ( then we just
         // can't tell  where its from )
         // If we are happy to always substitute the form model for the awt
@@ -199,16 +276,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
         // swapping out the models ( or perhaps we only want to do this
         // for vba mode ) there are a number of feasible and valid possibilities
         ::xmlscript::importDialogModel( xInput, xDialogModel, m_xContext, m_xModel );
-        // Set resource property
-        if( xStringResourceManager.is() )
-        {
-            Reference< beans::XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY );
-            Any aStringResourceManagerAny;
-            aStringResourceManagerAny <<= xStringResourceManager;
-            xDlgPSet->setPropertyValue( aResourceResolverPropName, aStringResourceManagerAny );
-        }
-
-        return xDialogModel;
+        return lcl_createDialogModel(m_xContext,xInput,xStringResourceManager,aDialogSourceURL); 
     }
 
     Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic() throw ( Exception )
@@ -289,8 +357,8 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
             bSingleDialog = true;
 
             // Try any other URL with SimpleFileAccess
-            Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSFI =
-                Reference< ::com::sun::star::ucb::XSimpleFileAccess >( xSMgr->createInstanceWithContext
+            Reference< ucb::XSimpleFileAccess > xSFI =
+                Reference< ucb::XSimpleFileAccess >( xSMgr->createInstanceWithContext
                 ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext ), UNO_QUERY );
 
             try
@@ -422,34 +490,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
             Reference< resource::XStringResourceManager > xStringResourceManager;
             if( bSingleDialog )
             {
-                INetURLObject aInetObj( aURL );
-                ::rtl::OUString aDlgName = aInetObj.GetBase();
-                aInetObj.removeSegment();
-                ::rtl::OUString aDlgLocation = aInetObj.GetMainURL( INetURLObject::NO_DECODE );
-                bool bReadOnly = true;
-                ::com::sun	::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
-                ::rtl::OUString aComment;
-
-                Sequence<Any> aArgs( 6 );
-                aArgs[0] <<= aDlgLocation;
-                aArgs[1] <<= bReadOnly;
-                aArgs[2] <<= aLocale;
-                aArgs[3] <<= aDlgName;
-                aArgs[4] <<= aComment;
-
-                Reference< task::XInteractionHandler > xDummyHandler;
-                aArgs[5] <<= xDummyHandler;
-                Reference< XMultiComponentFactory > xSMgr_( m_xContext->getServiceManager(), UNO_QUERY_THROW );
-                // TODO: Ctor
-                xStringResourceManager = Reference< resource::XStringResourceManager >( xSMgr_->createInstanceWithContext
-                    ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.resource.StringResourceWithLocation")),
-                        m_xContext ), UNO_QUERY );
-                if( xStringResourceManager.is() )
-                {
-                    Reference< XInitialization > xInit( xStringResourceManager, UNO_QUERY );
-                    if( xInit.is() )
-                        xInit->initialize( aArgs );
-                }
+                xStringResourceManager = lcl_getStringResourceManager(m_xContext,aURL);
             }
             else if( xDialogLib.is() )
             {
@@ -805,7 +846,7 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
     Reference< XWindow > DialogProviderImpl::createContainerWindow(
         const ::rtl::OUString& URL, const ::rtl::OUString& WindowType,
         const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler )
-            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+            throw (lang::IllegalArgumentException, RuntimeException)
     {
         (void)WindowType;	// for future use
         if( !xParent.is() )
@@ -835,11 +876,8 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re
 
     static struct ::cppu::ImplementationEntry s_component_entries [] =
     {
-        {
-            create_DialogProviderImpl, getImplementationName_DialogProviderImpl,
-            getSupportedServiceNames_DialogProviderImpl, ::cppu::createSingleComponentFactory,
-            0, 0
-        },
+        {create_DialogProviderImpl, getImplementationName_DialogProviderImpl,getSupportedServiceNames_DialogProviderImpl, ::cppu::createSingleComponentFactory,0, 0},
+        { &comp_DialogModelProvider::_create,&comp_DialogModelProvider::_getImplementationName,&comp_DialogModelProvider::_getSupportedServiceNames,&::cppu::createSingleComponentFactory, 0, 0 },
         { 0, 0, 0, 0, 0, 0 }
     };
 
@@ -864,13 +902,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo(
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, ::dlgprov::s_component_entries );
-    }
-
     void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 3c9c71728a..a721d46293 100644..100755
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -62,6 +62,13 @@ namespace dlgprov
     // =============================================================================
     // class DialogProviderImpl
     // =============================================================================
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createControlModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext);
+    ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > lcl_getStringResourceManager(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,const ::rtl::OUString& i_sURL);
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > lcl_createDialogModel( 
+                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_xContext,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInput, 
+                const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager,
+                const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception );
 
     typedef ::cppu::WeakImplHelper4<
         ::com::sun::star::lang::XServiceInfo,
diff --git a/scripting/source/dlgprov/dlgprov.xml b/scripting/source/dlgprov/dlgprov.xml
index e6bb3cb0e6..e6bb3cb0e6 100644..100755
--- a/scripting/source/dlgprov/dlgprov.xml
+++ b/scripting/source/dlgprov/dlgprov.xml
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
index 6c8ec298c7..51f8341321 100644..100755
--- a/scripting/source/dlgprov/makefile.mk
+++ b/scripting/source/dlgprov/makefile.mk
@@ -41,6 +41,7 @@ DLLPRE =
 
 SLOFILES= \
         $(SLO)$/dlgprov.obj \
+        $(SLO)$/DialogModelProvider.obj \
         $(SLO)$/dlgevtatt.obj
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
@@ -58,6 +59,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) \
         $(COMPHELPERLIB) \
         $(UCBHELPERLIB) \
+        $(VBAHELPERLIB)	\
         $(CPPULIB) \
         $(BASICLIB) \
         $(SALLIB)
@@ -80,3 +82,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
         +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
         echo $@
  
+
+ALLTAR : $(MISC)/dlgprov.component
+
+$(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dlgprov.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dlgprov.component
diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx
index 5d87a00801..5d87a00801 100644..100755
--- a/scripting/source/inc/bcholder.hxx
+++ b/scripting/source/inc/bcholder.hxx
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index ddedb48cfe..ddedb48cfe 100644..100755
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx
index 5153f4a45e..5153f4a45e 100644..100755
--- a/scripting/source/inc/util/scriptingconstants.hxx
+++ b/scripting/source/inc/util/scriptingconstants.hxx
diff --git a/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx
index fb3bcb062b..5b03f87ae9 100644..100755
--- a/scripting/source/inc/util/util.hxx
+++ b/scripting/source/inc/util/util.hxx
@@ -30,23 +30,8 @@
 #ifndef _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
 #define _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
 
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-
 #define OUSTR(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x) )
 
-namespace scripting_util
-{
-    inline void validateXRef(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRef, const sal_Char* Msg) throw (::com::sun::star::uno::RuntimeException)
-    {
-        OSL_ENSURE( xRef.is(), Msg );
-    
-        if(!xRef.is())
-        {
-            throw ::com::sun::star::uno::RuntimeException(::rtl::OUString::createFromAscii(Msg), ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
-        }
-    }
-}
 #endif //_COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/scripting/source/protocolhandler/exports.dxp
+++ b/scripting/source/protocolhandler/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk
index c782c1a188..5a2e92bbba 100644..100755
--- a/scripting/source/protocolhandler/makefile.mk
+++ b/scripting/source/protocolhandler/makefile.mk
@@ -45,6 +45,7 @@ SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
         $(SFXLIB)    \
+        $(FWELIB)    \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
         $(VCLLIB)		\
@@ -61,3 +62,11 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/protocolhandler.component
+
+$(MISC)/protocolhandler.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
diff --git a/scripting/source/protocolhandler/protocolhandler.component b/scripting/source/protocolhandler/protocolhandler.component
new file mode 100755
index 0000000000..db177a896c
--- /dev/null
+++ b/scripting/source/protocolhandler/protocolhandler.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ScriptProtocolHandler">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+</component>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index b7bce7b9c3..2e6bde2766 100644..100755
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -50,10 +50,12 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <vcl/abstdlg.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <util/util.hxx>
+#include <framework/documentundoguard.hxx>
 
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uri/XUriReference.hpp"
@@ -70,7 +72,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::script::provider;
 using namespace ::com::sun::star::document;
-using namespace ::scripting_util;
 
 namespace scripting_protocolhandler
 {
@@ -98,8 +99,7 @@ void SAL_CALL ScriptProtocolHandler::initialize(
         throw RuntimeException( temp, Reference< XInterface >() );
     }
 
-    validateXRef( m_xFactory,
-        "ScriptProtocolHandler::initialize: No Service Manager available" );
+    ENSURE_OR_THROW( m_xFactory.is(), "ScriptProtocolHandler::initialize: No Service Manager available" );
     m_bInitialised = true;
 }
 
@@ -156,14 +156,14 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
     sal_Bool bSuccess = sal_False;
     Any invokeResult;
-    bool bCaughtException = FALSE;
+    bool bCaughtException = sal_False;
     Any aException;
 
     if ( m_bInitialised )
     {
         try
         {
-            bool bIsDocumentScript = ( aURL.Complete.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document")) ) !=-1 );
+            bool bIsDocumentScript = ( aURL.Complete.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "document" ) ) !=-1 );
                 // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it?
 
             if ( bIsDocumentScript )
@@ -183,7 +183,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
             Reference< provider::XScript > xFunc =
                 m_xScriptProvider->getScript( aURL.Complete );
-            validateXRef( xFunc,
+            ENSURE_OR_THROW( xFunc.is(),
                 "ScriptProtocolHandler::dispatchWithNotification: validate xFunc - unable to obtain XScript interface" );
 
            
@@ -208,6 +208,11 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
                }
             }
 
+            // attempt to protect the document against the script tampering with its Undo Context
+            ::std::auto_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+            if ( bIsDocumentScript )
+                pUndoGuard.reset( new ::framework::DocumentUndoGuard( m_xScriptInvocation ) );
+
             bSuccess = sal_False;
             while ( !bSuccess )
             {
@@ -247,18 +252,8 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
             invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( e.Message );
 
-            bCaughtException = TRUE;
-        }
-#ifdef _DEBUG
-        catch ( ... )
-        {
-            ::rtl::OUString reason(RTL_CONSTASCII_USTRINGPARAM(
-                "ScriptProtocolHandler::dispatch: caught unknown exception" ));
-
-            invokeResult <<= reason;
+            bCaughtException = sal_True;
         }
-#endif
-
     }
     else
     {
@@ -359,13 +354,11 @@ ScriptProtocolHandler::getScriptInvocation()
     return m_xScriptInvocation.is();
 }
 
-void
-ScriptProtocolHandler::createScriptProvider() 
+void ScriptProtocolHandler::createScriptProvider() 
 {
     if ( m_xScriptProvider.is() )
-    {
         return;	
-    }
+
     try
     {
         // first, ask the component supporting the XScriptInvocationContext interface
@@ -398,6 +391,7 @@ ScriptProtocolHandler::createScriptProvider()
                 m_xScriptProvider = xSPS->getScriptProvider();
         }
 
+        // if nothing of this is successful, use the master script provider
         if ( !m_xScriptProvider.is() )
         {
             Reference< XPropertySet > xProps( m_xFactory, UNO_QUERY_THROW );
@@ -431,15 +425,6 @@ ScriptProtocolHandler::createScriptProvider()
         ::rtl::OUString temp = OUSTR( "ScriptProtocolHandler::createScriptProvider: " );
         throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
     }
-#ifdef _DEBUG
-    catch ( ... )
-    {
-        throw RuntimeException(
-        OUSTR( "ScriptProtocolHandler::createScriptProvider: UnknownException: " ),
-            Reference< XInterface > () );
-    }
-#endif
-        
 }
 
 ScriptProtocolHandler::ScriptProtocolHandler(
@@ -538,27 +523,6 @@ extern "C"
         *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void * pServiceManager ,
-                                           void * pRegistryKey )
-    {
-        (void)pServiceManager;
-
-        Reference< css::registry::XRegistryKey > xKey( 
-            reinterpret_cast< css::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-        ::rtl::OUString aStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-        aStr +=
-            ::scripting_protocolhandler::ScriptProtocolHandler::impl_getStaticImplementationName();
-
-        aStr += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) );
-        Reference< css::registry::XRegistryKey > xNewKey = xKey->createKey( aStr );
-        xNewKey->createKey( 
-            ::rtl::OUString::createFromAscii( ::scripting_protocolhandler::MYSERVICENAME )
-            );
-
-        return sal_True;
-    }
-
     void* SAL_CALL component_getFactory( const sal_Char * pImplementationName ,
                                          void * pServiceManager ,
                                          void * pRegistryKey )
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 8792bb066b..8792bb066b 100644..100755
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index e073e4f3dc..6c179ce014 100644..100755
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -50,7 +50,6 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::script;
-using namespace ::scripting_util;
 using namespace ::sf_misc;
 
 namespace func_provider
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 850d37e6b4..850d37e6b4 100644..100755
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 198a71a05f..198a71a05f 100644..100755
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index eec93fabe0..eec93fabe0 100644..100755
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index a6f029faf7..dedb00bdcb 100644..100755
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -34,6 +34,8 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
+#include <tools/diagnose_ex.h>
+
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
@@ -61,7 +63,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::document;
 using namespace ::sf_misc;
-using namespace ::scripting_util;
 
 namespace func_provider
 {
@@ -96,10 +97,9 @@ MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext >
         m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ),
         m_bIsPkgMSP( false ), m_pPCache( 0 )
 {
-    validateXRef( m_xContext, "MasterScriptProvider::MasterScriptProvider: No context available\n" );
+    ENSURE_OR_THROW( m_xContext.is(), "MasterScriptProvider::MasterScriptProvider: No context available\n" );
     m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr,
-                  "MasterScriptProvider::MasterScriptProvider: No service manager available\n" );
+    ENSURE_OR_THROW( m_xMgr.is(), "MasterScriptProvider::MasterScriptProvider: No service manager available\n" );
     m_bIsValid = true;
 }
 
@@ -982,42 +982,6 @@ extern "C"
     }
 
     /**
-     * This function creates an implementation section in the registry and another subkey
-     *
-     * for each supported service.
-     * @param pServiceManager   the service manager
-     * @param pRegistryKey      the registry key
-     */
-    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-            lang::XMultiServiceFactory * pServiceManager,
-            registry::XRegistryKey * pRegistryKey )
-    {
-        if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey,
-            ::scripting_runtimemgr::s_entries ))
-        {
-            try
-            {
-                // MasterScriptProviderFactory Mangager singleton
-                registry::XRegistryKey * pKey =
-                    reinterpret_cast< registry::XRegistryKey * >(pRegistryKey);
-
-                Reference< registry::XRegistryKey >xKey = pKey->createKey(
-                    OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory/UNO/SINGLETONS/com.sun.star.script.provider.theMasterScriptProviderFactory"));
-                xKey->setStringValue( OUSTR("com.sun.star.script.provider.MasterScriptProviderFactory") );
-                // BrowseNodeFactory Mangager singleton
-                xKey = pKey->createKey(
-                    OUSTR("com.sun.star.script.browse.BrowseNodeFactory/UNO/SINGLETONS/com.sun.star.script.browse.theBrowseNodeFactory"));
-                xKey->setStringValue( OUSTR("com.sun.star.script.browse.BrowseNodeFactory") );
-                return sal_True;
-            }
-            catch (Exception &)
-            {
-            }
-        }
-        return sal_False;
-    }
-
-    /**
      * This function is called to get service factories for an implementation.
      *
      * @param pImplName       name of implementation
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 1e075cd498..1e075cd498 100644..100755
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index e73a03edde..e73a03edde 100644..100755
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index c247c4bf9f..c247c4bf9f 100644..100755
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index d27e5d9e9b..ff95f49a6c 100644..100755
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_scripting.hxx"
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <util/scriptingconstants.hxx>
 #include <util/util.hxx>
@@ -40,7 +41,6 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::script;
-using namespace ::scripting_util;
 
 namespace func_provider
 {
@@ -52,7 +52,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
     // will use createContentEnumeration
     
     m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr, "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
+    ENSURE_OR_THROW( m_xMgr.is(), "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
     populateCache();
 }
 
@@ -65,7 +65,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
     // will use createContentEnumeration
     
     m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr, "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
+    ENSURE_OR_THROW( m_xMgr.is(), "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
     populateCache();
 }
 
@@ -164,14 +164,8 @@ ProviderCache::populateCache() throw ( RuntimeException )
         while ( xEnum->hasMoreElements() )
         {
 
-            Reference< lang::XSingleComponentFactory > factory;
-            if ( sal_False == ( xEnum->nextElement() >>= factory ) )
-            {
-                throw new RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("  error extracting XSingleComponentFactory from Content enumeration. ")), Reference< XInterface >() );
-            }
-            validateXRef( factory, "ProviderCache::populateCache() invalid factory" );
+            Reference< lang::XSingleComponentFactory > factory( xEnum->nextElement(), UNO_QUERY_THROW );
             Reference< lang::XServiceInfo > xServiceInfo( factory, UNO_QUERY_THROW );
-            validateXRef( xServiceInfo, "ProviderCache::populateCache() failed to get XServiceInfo from factory" );
 
             Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames();
                     
@@ -208,9 +202,8 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti
 { 
     try
     {
-        details.provider  = Reference< provider::XScriptProvider >(
+        details.provider.set(
             details.factory->createInstanceWithArgumentsAndContext( m_Sctx, m_xContext ), UNO_QUERY_THROW );
-        validateXRef( details.provider, "ProviderCache::createProvider, failed to create provider");
     }
     catch ( RuntimeException& e )
     {
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index a0c729ddba..a0c729ddba 100644..100755
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
diff --git a/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index c34675e3b4..de3d51dec0 100644..100755
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -47,15 +47,11 @@ ScriptImpl::ScriptImpl(
     const Reference< runtime::XScriptInvocation > & runtimeMgr,
     const ::rtl::OUString& scriptURI )
 throw ( RuntimeException ) :
-        m_XScriptingContext( scriptingContext ),
-        m_RunTimeManager( runtimeMgr ),
+        m_XScriptingContext( scriptingContext, UNO_SET_THROW ),
+        m_RunTimeManager( runtimeMgr, UNO_SET_THROW ),
         m_ScriptURI( scriptURI )
 {
     OSL_TRACE( "<!constucting a ScriptImpl>\n" );
-    validateXRef( m_XScriptingContext,
-                  "ScriptImpl::ScriptImpl: No XScriptingContext\n" );
-    validateXRef( m_RunTimeManager,
-                  "ScriptImpl::ScriptImpl: No XScriptInvocation\n" );
 }
 
 //*************************************************************************
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 56784d8721..56784d8721 100644..100755
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
index 87d6dbefd6..86e295e6a5 100644..100755
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -56,13 +56,10 @@ namespace func_provider
 //*************************************************************************
 ScriptingContext::ScriptingContext( const Reference< XComponentContext > & xContext ) : //ScriptingContextImpl_BASE( GetMutex()),
     OPropertyContainer( GetBroadcastHelper() ),
-        m_xContext( xContext )
+        m_xContext( xContext, UNO_SET_THROW )
 {
     OSL_TRACE( "< ScriptingContext ctor called >\n" );
 
-    validateXRef( m_xContext,
-                  "ScriptingContext::ScriptingContext: No context available\n" );
-
     Any nullAny;
 
     scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = 
diff --git a/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index e273567803..e273567803 100644..100755
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 0d3a6a998b..0d3a6a998b 100644..100755
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index c81c3d2375..c81c3d2375 100644..100755
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/scripting/source/provider/exports.dxp
+++ b/scripting/source/provider/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
index a63ae078d8..a63ae078d8 100644..100755
--- a/scripting/source/provider/makefile.mk
+++ b/scripting/source/provider/makefile.mk
diff --git a/scripting/source/pyprov/delzip b/scripting/source/pyprov/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/source/pyprov/delzip
+++ b/scripting/source/pyprov/delzip
diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml
index 1fe0a3d923..1fe0a3d923 100644..100755
--- a/scripting/source/pyprov/description.xml
+++ b/scripting/source/pyprov/description.xml
diff --git a/scripting/source/pyprov/mailmerge.component b/scripting/source/pyprov/mailmerge.component
new file mode 100755
index 0000000000..dd6a65e9a1
--- /dev/null
+++ b/scripting/source/pyprov/mailmerge.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Python"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.pyuno.MailMessage">
+    <service name="com.sun.star.mail.MailMessage"/>
+  </implementation>
+  <implementation name="org.openoffice.pyuno.MailServiceProvider">
+    <service name="com.sun.star.mail.MailServiceProvider"/>
+  </implementation>
+</component>
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 8fd697fee9..8fd697fee9 100644..100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index e9a065ad1e..f534cb5b3b 100644..100755
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -58,4 +58,18 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/mailmerge.component $(MISC)/pythonscript.component
+
+$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mailmerge.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mailmerge.component
+
+$(MISC)/pythonscript.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt pythonscript.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_PYTHON)pythonscript' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt pythonscript.component
+
 .ENDIF
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml
index 7e4e0456ea..7e4e0456ea 100644..100755
--- a/scripting/source/pyprov/manifest.xml
+++ b/scripting/source/pyprov/manifest.xml
diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
index 610ac5f9db..610ac5f9db 100644..100755
--- a/scripting/source/pyprov/officehelper.py
+++ b/scripting/source/pyprov/officehelper.py
diff --git a/scripting/source/pyprov/pythonscript.component b/scripting/source/pyprov/pythonscript.component
new file mode 100755
index 0000000000..08f8950972
--- /dev/null
+++ b/scripting/source/pyprov/pythonscript.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Python"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.pyuno.LanguageScriptProviderForPython">
+    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProviderForPython"/>
+  </implementation>
+</component>
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index 2ca46b0ef3..2ca46b0ef3 100644..100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
diff --git a/scripting/source/runtimemgr/ScriptExecDialog.hrc b/scripting/source/runtimemgr/ScriptExecDialog.hrc
index e4d65665bc..e4d65665bc 100644..100755
--- a/scripting/source/runtimemgr/ScriptExecDialog.hrc
+++ b/scripting/source/runtimemgr/ScriptExecDialog.hrc
diff --git a/scripting/source/runtimemgr/ScriptExecDialog.src b/scripting/source/runtimemgr/ScriptExecDialog.src
index 1daf2ea698..1daf2ea698 100644..100755
--- a/scripting/source/runtimemgr/ScriptExecDialog.src
+++ b/scripting/source/runtimemgr/ScriptExecDialog.src
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index f76b9aff3c..6c0cf559f9 100644..100755
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -71,13 +71,11 @@ static ::std::vector< sal_Int32 >* m_pSearchIDs = NULL;
 //*************************************************************************
 ScriptNameResolverImpl::ScriptNameResolverImpl(
     const Reference< XComponentContext > & xContext ) :
-    m_xContext( xContext )
+    m_xContext( xContext, UNO_SET_THROW )
 {
     OSL_TRACE( "< ScriptNameResolverImpl ctor called >\n" );
     validateXRef( m_xContext, "ScriptNameResolverImpl::ScriptNameResolverImpl: invalid context" );
-    m_xMultiComFac = m_xContext->getServiceManager();
-
-    validateXRef( m_xMultiComFac, "ScriptNameResolverImpl::ScriptNameResolverImpl: invalid XMultiComponentFactory " );
+    m_xMultiComFac.set( m_xContext->getServiceManager(), UNO_SET_THROW );
 
     if( !m_pSearchIDs )
     {
@@ -221,11 +219,14 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
             OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: " );
             throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
         }
-        Reference< XInterface > xInterface = m_xMultiComFac->createInstanceWithContext(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.ucb.SimpleFileAccess" )), m_xContext );
-        validateXRef( xInterface,
-            "ScriptProvider::initialise: cannot get SimpleFileAccess Service\n" );
+        Reference< XInterface > xInterface(
+            m_xMultiComFac->createInstanceWithContext(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.SimpleFileAccess" ),
+                m_xContext
+            ),
+            UNO_SET_THROW
+        );
         Reference < ucb::XSimpleFileAccess > xSimpleFileAccess = Reference <
                     ucb::XSimpleFileAccess > ( xInterface, UNO_QUERY_THROW );
 
@@ -237,15 +238,8 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
         try
         {
             // need to get the ScriptStorageManager
-            Any a = m_xContext->getValueByName( 
-                    scriptingConstantsPool.SCRIPTSTORAGEMANAGER_SERVICE );
-            if ( sal_False == ( a >>= xScriptStorageMgr ) )
-            {
-                OUString temp = OUSTR( "ScriptNameResolverImpl::resolve: failed to get ScriptStorageManager" );
-                throw RuntimeException( temp, Reference< XInterface >() );
-                // need to throw
-            }
-            validateXRef( xScriptStorageMgr, "Cannot get ScriptStorageManager" );
+            xScriptStorageMgr.set( m_xContext->getValueByName( 
+                    scriptingConstantsPool.SCRIPTSTORAGEMANAGER_SERVICE ), UNO_QUERY_THROW );
             filesysScriptStorageID =
                     xScriptStorageMgr->createScriptStorageWithURI( 
                         xSimpleFileAccess, filesysURL );
@@ -365,20 +359,12 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
         if( filesysScriptStorageID >  2 )
         {
             // get the filesys storage and dispose of it
-            Reference< XInterface > xScriptStorage =
-                xScriptStorageMgr->getScriptStorage( filesysScriptStorageID );
-            validateXRef( xScriptStorage,
-                          "ScriptNameResolverImpl::getStorageInstance: cannot get Script Storage service" );
+            Reference< XInterface > xScriptStorage( xScriptStorageMgr->getScriptStorage( filesysScriptStorageID ), UNO_SET_THROW );
             Reference< storage::XScriptInfoAccess > xScriptInfoAccess = Reference< 
                 storage::XScriptInfoAccess > ( xScriptStorage, UNO_QUERY_THROW );
-            validateXRef( xScriptInfoAccess,
-            "ScriptNameResolverImpl::resolveURIFromStorageID: cannot get XScriptInfoAccess" );
             Sequence< Reference< storage::XScriptInfo > > results =
                 xScriptInfoAccess->getAllImplementations( );
-            Reference < lang::XEventListener > xEL_ScriptStorageMgr =
-                Reference< lang::XEventListener > 
-                    ( xScriptStorageMgr ,UNO_QUERY_THROW );
-            validateXRef( xEL_ScriptStorageMgr, "ScriptNameResolverImpl::resolve: can't get ScriptStorageManager XEventListener interface when trying to dispose of filesystem storage" );
+            Reference < lang::XEventListener > xEL_ScriptStorageMgr(( xScriptStorageMgr ,UNO_QUERY_THROW );
             lang::EventObject event( results[ 0 ] );
             xEL_ScriptStorageMgr->disposing( event );
         }
@@ -448,9 +434,7 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
                 throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
             }
         }
-        Reference< storage::XScriptInfoAccess > storage = getStorageInstance( sid, permissionURI ); 
-        validateXRef( storage,
-        "ScriptNameResolverImpl::resolveURIFromStorageID: cannot get XScriptInfoAccess" );
+        Reference< storage::XScriptInfoAccess > storage( getStorageInstance( sid, permissionURI ), UNO_SET_THROW );
         Sequence< Reference< storage::XScriptInfo > > results =
             storage->getImplementations( scriptURI );
         
@@ -517,22 +501,10 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
     Reference< storage::XScriptInfoAccess > xScriptInfoAccess;
     try
     {
-        Reference< XInterface > xInterface;
-
-        Any a = m_xContext->getValueByName(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) );
-        if ( sal_False == ( a >>= xInterface ) )
-        {
-            throw RuntimeException( 
-                OUSTR( "ScriptNameResolverImpl::getStorageInstance: could not obtain ScriptStorageManager singleton" ),
-                Reference< XInterface >() );
-        }
-        validateXRef( xInterface,
-                      "ScriptNameResolverImpl::getStorageInstance: cannot get Storage service" );
+        Reference< XInterface > xInterface( m_xContext->getValueByName(
+                    OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ), UNO_QUERY_THROW );
         // check that we have permissions for this storage
         Reference< dcsssf::security::XScriptSecurity > xScriptSecurity( xInterface, UNO_QUERY_THROW );
-        validateXRef( xScriptSecurity,
-                      "ScriptNameResolverImpl::getStorageInstance:  cannot get Script Security service" );
         scripting_constants::ScriptingConstantsPool& scriptingConstantsPool = 
                 scripting_constants::ScriptingConstantsPool::instance();
         // if we dealing with a document storage (ie. not user or share
@@ -547,14 +519,8 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
             OSL_TRACE( "ScriptNameResolverImpl::getStorageInstance: got execute permission for ID=%d", sid );
         }
         Reference< storage::XScriptStorageManager > xScriptStorageManager( xInterface, UNO_QUERY_THROW );
-        validateXRef( xScriptStorageManager,
-                      "ScriptNameResolverImpl::getStorageInstance:  cannot get Script Storage Manager service" );
-        Reference< XInterface > xScriptStorage =
-            xScriptStorageManager->getScriptStorage( sid );
-        validateXRef( xScriptStorage,
-                      "ScriptNameResolverImpl::getStorageInstance: cannot get Script Storage service" );
-        xScriptInfoAccess = Reference< 
-            storage::XScriptInfoAccess > ( xScriptStorage, UNO_QUERY_THROW );
+        Reference< XInterface > xScriptStorage( ScriptStorageManager->getScriptStorage( sid ), UNO_SET_THROW );
+        xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW );
     }
     catch ( lang::IllegalArgumentException & e )
     {
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
index 089b300a1b..089b300a1b 100644..100755
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index 613d5edc20..0c1db9ea36 100644..100755
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -36,6 +36,7 @@
 #include <util/scriptingconstants.hxx>
 
 #include <cppuhelper/implementationentry.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -67,14 +68,10 @@ static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceNam
 // ScriptRuntimeManager Constructor
 ScriptRuntimeManager::ScriptRuntimeManager(
     const Reference< XComponentContext > & xContext ) :
-    m_xContext( xContext )
+    m_xContext( xContext, UNO_SET_THROW )
 {
     OSL_TRACE( "< ScriptRuntimeManager ctor called >\n" );
-    validateXRef( m_xContext,
-        "ScriptRuntimeManager::ScriptRuntimeManager: invalid context" );
-    m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr,
-        "ScriptRuntimeManager::ScriptRuntimeManager: cannot get ServiceManager" );
+    m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW );
     s_moduleCount.modCnt.acquire( &s_moduleCount.modCnt );
     // test
     //scripting_securitymgr::ScriptSecurityManager ssm(xContext);
@@ -105,22 +102,12 @@ throw( RuntimeException )
         Reference< storage::XScriptInfo > sinfo = 
             Reference< storage::XScriptInfo >( scriptInfo, UNO_QUERY_THROW );
 
-        OUStringBuffer *buf = new OUStringBuffer(80);
-        buf->appendAscii("/singletons/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeFor");
-        buf->append(sinfo->getLanguage());
+        OUStringBuffer* buf( 80 );
+        buf.appendAscii("/singletons/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeFor");
+        buf.append(sinfo->getLanguage());
 
-        Any a = m_xContext->getValueByName(buf->makeStringAndClear());
-
-        if ( sal_False == ( a >>= xInterface ) )
-        {
-            throw RuntimeException( 
-                sinfo->getLanguage().concat( OUSTR( " runtime support is not installed for this language" ) ),
-                Reference< XInterface >() );
-        }
-        validateXRef( xInterface,
-            "ScriptRuntimeManager::GetScriptRuntime: cannot get appropriate ScriptRuntime Service"
-        );
-        xScriptInvocation = Reference< runtime::XScriptInvocation >( xInterface, UNO_QUERY_THROW );
+        xInterface.set( m_xContext->getValueByName( buf.makeStringAndClear() ), UNO_QUERY_THROW );
+        xScriptInvocation.set( xInterface, UNO_QUERY_THROW );
     }
     catch ( Exception & e )
     {
@@ -142,13 +129,15 @@ throw( RuntimeException )
 
     try
     {
-        Reference< XInterface > xInterface = m_xMgr->createInstanceWithContext(
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" )),
-                m_xContext );
-        validateXRef( xInterface,
-            "ScriptRuntimeManager::GetScriptRuntime: cannot get instance of DefaultScriptNameResolver" );
-        xScriptNameResolver = Reference< runtime::XScriptNameResolver >( xInterface, UNO_QUERY_THROW );
+        Reference< XInterface > xInterface(
+            m_xMgr->createInstanceWithContext(
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" )),
+                m_xContext
+            ),
+            UNO_SET_THROW
+        );
+        xScriptNameResolver.set( xInterface, UNO_QUERY_THROW );
     }
     catch ( Exception & e )
     {
@@ -181,9 +170,8 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
 
     try
     {
-        Reference< storage::XScriptInfo > resolvedScript = resolve( scriptURI,
-            resolvedCtx );
-        validateXRef( resolvedScript, "ScriptRuntimeManager::invoke: No resolvedURI" );
+        Reference< storage::XScriptInfo > resolvedScript = resolve( scriptURI, resolvedCtx );
+        ENSURE_OR_THROW( resolvedScript.is(), "ScriptRuntimeManager::invoke: No resolvedURI" );
 
         Reference< beans::XPropertySet > xPropSetResolvedCtx;
         if ( sal_False == ( resolvedCtx >>= xPropSetResolvedCtx ) )
@@ -215,7 +203,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
 
         Reference< runtime::XScriptInvocation > xScriptInvocation =
             getScriptRuntime( resolvedScript );
-        validateXRef( xScriptInvocation,
+        ENSURE_OR_THROW( xScriptInvocation.is(),
             "ScriptRuntimeManager::invoke: cannot get instance of language specific runtime." );
 
         // the scriptURI is currently passed to the language-dept runtime but
@@ -231,13 +219,7 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
         {
             Any a = m_xContext->getValueByName( 
                     scriptingConstantsPool.SCRIPTSTORAGEMANAGER_SERVICE );   
-            Reference < lang::XEventListener > xEL_ScriptStorageManager;
-            if ( sal_False == ( a >>= xEL_ScriptStorageManager ) )
-            {
-                throw RuntimeException( OUSTR( "ScriptRuntimeManager::invoke: can't get ScriptStorageManager XEventListener interface when trying to dispose of filesystem storage" ),
-                        Reference< XInterface > () );
-            }
-            validateXRef( xEL_ScriptStorageManager, "Cannot get XEventListener from ScriptStorageManager" );
+            Reference < lang::XEventListener > xEL_ScriptStorageManager( a, UNO_QUERY_THROW );
             lang::EventObject event(resolvedScript);
             xEL_ScriptStorageManager->disposing( event );
         }
@@ -309,7 +291,7 @@ throw( lang::IllegalArgumentException, script::CannotConvertException, RuntimeEx
     Reference< storage::XScriptInfo > resolvedURI;
 
     Reference< runtime::XScriptNameResolver > xScriptNameResolver = getScriptNameResolver();
-    validateXRef( xScriptNameResolver,
+    ENSURE_OR_THROW( xScriptNameResolver.is(),
         "ScriptRuntimeManager::resolve: No ScriptNameResolver" );
 
     try
@@ -485,68 +467,6 @@ extern "C"
     }
 
     /**
-     * This function creates an implementation section in the registry and another subkey
-     *
-     * for each supported service.
-     * @param pServiceManager   the service manager
-     * @param pRegistryKey      the registry key
-     */
-    sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager,
-        registry::XRegistryKey * pRegistryKey )
-    {
-        if (::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey,
-            ::scripting_runtimemgr::s_entries ))
-        {
-            try
-            {
-                // register RuntimeManager singleton
-
-                registry::XRegistryKey * pKey =
-                    reinterpret_cast< registry::XRegistryKey * >(pRegistryKey);
-
-                Reference< registry::XRegistryKey > xKey(
-                    pKey->createKey(
- 
-                    OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeManager")));
-                    xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager") );
-
-                // ScriptStorage Mangaer singleton
-
-                xKey = pKey->createKey(
-                    OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager/UNO/SINGLETONS/drafts.com.sun.star.script.framework.storage.theScriptStorageManager"));
-                 xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.storage.ScriptStorageManager") );
-                // Singleton entries are not handled by the setup process
-                // below is the only alternative at the momement which 
-                // is to programmatically do this.
-
-                // "Java" Runtime singleton entry
-
-                xKey = pKey->createKey(
-                    OUSTR("com.sun.star.scripting.runtime.java.ScriptRuntimeForJava$_ScriptRuntimeForJava/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJava"));
-                 xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJava") );
-
-                // "JavaScript" Runtime singleton entry
-
-                xKey = pKey->createKey(
-                    OUSTR("com.sun.star.scripting.runtime.javascript.ScriptRuntimeForJavaScript$_ScriptRuntimeForJavaScript/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForJavaScript"));
-                 xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForJavaScript") );
-
-                // "BeanShell" Runtime singleton entry
-
-                xKey = pKey->createKey(
-                    OUSTR("com.sun.star.scripting.runtime.beanshell.ScriptRuntimeForBeanShell$_ScriptRuntimeForBeanShell/UNO/SINGLETONS/drafts.com.sun.star.script.framework.runtime.theScriptRuntimeForBeanShell"));
-                 xKey->setStringValue( OUSTR("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeForBeanShell") );
-
-                return sal_True;
-            }
-            catch (Exception & exc)
-            {
-            }
-        }
-        return sal_False;
-    }
-
-    /**
      * This function is called to get service factories for an implementation.
      *
      * @param pImplName       name of implementation
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
index 9f97f00bda..9f97f00bda 100644..100755
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index cdb705122c..b28dc7fb3b 100644..100755
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -55,9 +55,8 @@ const int STORAGEPROXY = 0;
 //*************************************************************************
 // StorageBridge Constructor
 StorageBridge::StorageBridge( const Reference< XComponentContext >& xContext,
-                              sal_Int32 sid ) : m_xContext( xContext ), m_sid( sid )
+                              sal_Int32 sid ) : m_xContext( xContext, UNO_SET_THROW ), m_sid( sid )
 {
-    validateXRef( m_xContext, "StorageBridge::StorageBridge: invalid context" );
     try
     {
         initStorage();
@@ -75,31 +74,12 @@ StorageBridge::initStorage() throw ( ::com::sun::star::uno::RuntimeException )
 {
     try
     {
-        Reference< lang::XMultiComponentFactory > xMultiComFac =
-            m_xContext->getServiceManager();
-        validateXRef( xMultiComFac,
-                      "StorageBridge::StorageBridge: cannot get multicomponentfactory from multiservice factory" );
-        Reference< XInterface > temp;
-
-        Any a = m_xContext->getValueByName(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) );
-        if ( sal_False == ( a >>= temp ) )
-        {
-            throw RuntimeException( 
-                OUSTR( "StorageBridge::StorageBridge: could not obtain ScriptStorageManager singleton" ),
-                Reference< XInterface >() );
-        }
-        validateXRef( temp,
-                      "StorageBridge::StorageBridge: cannot get Storage service" );
+        Reference< lang::XMultiComponentFactory > xMultiComFac( m_xContext->getServiceManager(), UNO_SET_THROW );
+        Reference< XInterface > temp( m_xContext->getValueByName(
+                    OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) ), UNO_QUERY_THROW );
         Reference< storage::XScriptStorageManager > xScriptStorageManager( temp, UNO_QUERY_THROW );
-        validateXRef( xScriptStorageManager,
-                      "StorageBridge::StorageBridge: cannot get Script Storage Manager service" );
-        Reference< XInterface > xScriptStorage =
-            xScriptStorageManager->getScriptStorage( m_sid );
-        validateXRef( xScriptStorage,
-                      "StorageBridge::StorageBridge: cannot get Script Storage service" );
-        m_xScriptInfoAccess =
-            Reference< storage::XScriptInfoAccess > ( xScriptStorage, UNO_QUERY_THROW );
+        Reference< XInterface > xScriptStorage( xScriptStorageManager->getScriptStorage( m_sid ), UNO_SET_THROW );
+        m_xScriptInfoAccess.set( xScriptStorage, UNO_QUERY_THROW );
     }
     catch ( RuntimeException & re )
     {
diff --git a/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx
index 7d0e0ca898..7d0e0ca898 100644..100755
--- a/scripting/source/runtimemgr/StorageBridge.hxx
+++ b/scripting/source/runtimemgr/StorageBridge.hxx
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.cxx b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
index 9392eaf751..9392eaf751 100644..100755
--- a/scripting/source/runtimemgr/StorageBridgeFactory.cxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
diff --git a/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
index 9631f9bb90..9631f9bb90 100644..100755
--- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/scripting/source/runtimemgr/exports.dxp
+++ b/scripting/source/runtimemgr/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/scripting/source/runtimemgr/makefile.mk b/scripting/source/runtimemgr/makefile.mk
index d802fd240a..d802fd240a 100644..100755
--- a/scripting/source/runtimemgr/makefile.mk
+++ b/scripting/source/runtimemgr/makefile.mk
diff --git a/scripting/source/storage/ScriptData.hxx b/scripting/source/storage/ScriptData.hxx
index 3374e2177c..3374e2177c 100644..100755
--- a/scripting/source/storage/ScriptData.hxx
+++ b/scripting/source/storage/ScriptData.hxx
diff --git a/scripting/source/storage/ScriptElement.cxx b/scripting/source/storage/ScriptElement.cxx
index 6552bbdc45..6552bbdc45 100644..100755
--- a/scripting/source/storage/ScriptElement.cxx
+++ b/scripting/source/storage/ScriptElement.cxx
diff --git a/scripting/source/storage/ScriptElement.hxx b/scripting/source/storage/ScriptElement.hxx
index d0a5976e52..d0a5976e52 100644..100755
--- a/scripting/source/storage/ScriptElement.hxx
+++ b/scripting/source/storage/ScriptElement.hxx
diff --git a/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx
index 02c9c1dd68..02c9c1dd68 100644..100755
--- a/scripting/source/storage/ScriptInfo.cxx
+++ b/scripting/source/storage/ScriptInfo.cxx
diff --git a/scripting/source/storage/ScriptInfo.hxx b/scripting/source/storage/ScriptInfo.hxx
index e87f244ab1..e87f244ab1 100644..100755
--- a/scripting/source/storage/ScriptInfo.hxx
+++ b/scripting/source/storage/ScriptInfo.hxx
diff --git a/scripting/source/storage/ScriptInfoImpl.hxx b/scripting/source/storage/ScriptInfoImpl.hxx
index ba033f2d74..ba033f2d74 100644..100755
--- a/scripting/source/storage/ScriptInfoImpl.hxx
+++ b/scripting/source/storage/ScriptInfoImpl.hxx
diff --git a/scripting/source/storage/ScriptMetadataImporter.cxx b/scripting/source/storage/ScriptMetadataImporter.cxx
index 0b5c439804..6a035eeedc 100644..100755
--- a/scripting/source/storage/ScriptMetadataImporter.cxx
+++ b/scripting/source/storage/ScriptMetadataImporter.cxx
@@ -39,7 +39,7 @@
 
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <rtl/string.h>
-
+#include <tools/diagnose_ex.h>
 
 #include <util/util.hxx>
 
@@ -83,31 +83,14 @@ void ScriptMetadataImporter::parseMetaData(
     ms_parcelURI = parcelURI;
 
     //Get the parser service
-    validateXRef( m_xContext,
+    ENSURE_OR_THROW( m_xContext.is(),
         "ScriptMetadataImporter::parseMetaData: No context available" );
 
-    Reference< lang::XMultiComponentFactory > xMgr = 
-        m_xContext->getServiceManager();
-        
-    validateXRef( xMgr,
-        "ScriptMetadataImporter::parseMetaData: No service manager available" );
-
-    Reference< XInterface > xInterface = xMgr->createInstanceWithContext(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")), m_xContext );
+    Reference< lang::XMultiComponentFactory > xMgr( m_xContext->getServiceManager(), UNO_SET_THROW );
 
-    validateXRef( xInterface, "ScriptMetadataImporter::parseMetaData: cannot get SAX Parser" );
-    Reference< xml::sax::XParser > xParser;
-    try
-    {
-        xParser.set( xInterface ,UNO_QUERY_THROW );
-    }
-    catch (RuntimeException & re )
-    {
-        OUString msg(RTL_CONSTASCII_USTRINGPARAM(
-            "ScriptMetadata:Importer::parserMetaData cannot get XParser" ));
-        msg.concat( re.Message );
-        throw RuntimeException( msg, Reference< XInterface > () );
-    }
+    Reference< xml::sax::XParser > xParser(
+        xMgr->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ), m_xContext ),
+        UNO_QUERY_THROW );
 
     // xxx todo: error handler, entity resolver omitted
     // This class is the document handler for the parser
diff --git a/scripting/source/storage/ScriptMetadataImporter.hxx b/scripting/source/storage/ScriptMetadataImporter.hxx
index e9d968c975..e9d968c975 100644..100755
--- a/scripting/source/storage/ScriptMetadataImporter.hxx
+++ b/scripting/source/storage/ScriptMetadataImporter.hxx
diff --git a/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx
index ae00c66c00..def3c63af0 100644..100755
--- a/scripting/source/storage/ScriptSecurityManager.cxx
+++ b/scripting/source/storage/ScriptSecurityManager.cxx
@@ -48,7 +48,7 @@
 #include "ScriptSecurityManager.hxx"
 #include <util/util.hxx>
 #include <util/scriptingconstants.hxx>
-
+#include <tools/diagnose_ex.h>
 
 using namespace ::rtl;
 using namespace ::osl;
@@ -86,28 +86,15 @@ static const int ADD_TO_PATH = 2;
 // ScriptSecurityManager Constructor
 ScriptSecurityManager::ScriptSecurityManager(
     const Reference< XComponentContext > & xContext ) throw ( RuntimeException )
-    : m_xContext( xContext)
+    : m_xContext( xContext, UNO_SET_THROW )
 {
     OSL_TRACE( "< ScriptSecurityManager ctor called >\n" );
-    validateXRef( m_xContext,
-        "ScriptSecurityManager::ScriptSecurityManager: invalid context" );
 
     // get the service manager from the context
-    Reference< lang::XMultiComponentFactory > xMgr = m_xContext->getServiceManager();
-    validateXRef( xMgr,
-        "ScriptSecurityManager::ScriptSecurityManager: cannot get ServiceManager" );
+    Reference< lang::XMultiComponentFactory > xMgr( m_xContext->getServiceManager(), UNO_SET_THROW );
 
     // create an instance of the ConfigurationProvider
-    Reference< XInterface > xInterface = xMgr->createInstanceWithContext(
-        s_configProv, m_xContext );
-    validateXRef( xInterface,
-        "ScriptSecurityManager::ScriptSecurityManager: cannot get ConfigurationProvider" );
-    // create an instance of the ConfigurationAccess for accessing the
-    // scripting security settings
-    m_xConfigProvFactory = Reference < lang::XMultiServiceFactory > ( xInterface, UNO_QUERY );
-    validateXRef( m_xConfigProvFactory,
-        "ScriptSecurityManager::ScriptSecurityManager: cannot get XMultiServiceFactory interface from ConfigurationProvider" );
-
+    m_xConfigProvFactory.set( xMgr->createInstanceWithContext( s_configProv, m_xContext ), UNO_QUERY_THROW );
 }
 
 void ScriptSecurityManager::addScriptStorage( rtl::OUString scriptStorageURL, 
@@ -289,17 +276,12 @@ throw ( RuntimeException )
     short result;
     try
     {
-        Reference< lang::XMultiComponentFactory > xMgr = m_xContext->getServiceManager();
-        validateXRef( xMgr,
-            "ScriptSecurityManager::executeDialog: cannot get ServiceManager" );
-        Reference< XInterface > xInterface =
-            xMgr->createInstanceWithArgumentsAndContext( s_securityDialog,
-                aArgs, m_xContext );
-        validateXRef( xInterface, "ScriptSecurityManager::executeDialog: Can't create SecurityDialog" );
-        Reference< awt::XDialog > xDialog( xInterface, UNO_QUERY_THROW );
+        Reference< lang::XMultiComponentFactory > xMgr( m_xContext->getServiceManager(), UNO_SET_THROW );
+        Reference< awt::XDialog > xDialog(
+            xMgr->createInstanceWithArgumentsAndContext( s_securityDialog, aArgs, m_xContext ),
+            UNO_QUERY_THROW );
         result = xDialog->execute();
-        Reference< lang::XComponent > xComponent( xInterface, UNO_QUERY_THROW );
-        validateXRef( xInterface, "ScriptSecurityManager::executeDialog: Can't get XComponent to dispose dialog" );
+        Reference< lang::XComponent > xComponent( xDialog, UNO_QUERY_THROW );
         xComponent->dispose();
     }
     catch ( RuntimeException & rte )
@@ -382,31 +364,20 @@ void ScriptSecurityManager::removePermissionSettings ( ::rtl::OUString & scriptS
 void ScriptSecurityManager::readConfiguration()
     throw ( RuntimeException)
 {
-    Reference< XInterface > xInterface;
     try 
     {
-    beans::PropertyValue configPath;
-    configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
-    configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Security/Scripting"));
-    Sequence < Any > aargs( 1 );
-    aargs[ 0 ] <<= configPath;
-    validateXRef( m_xConfigProvFactory,
-        "ScriptSecurityManager::readConfiguration: ConfigProviderFactory no longer valid!" );
-    xInterface = m_xConfigProvFactory->createInstanceWithArguments( s_configAccess, 
-            aargs );
-    validateXRef( xInterface,
-        "ScriptSecurityManager::readConfiguration: cannot get ConfigurationAccess" );
-    // get the XPropertySet interface from the ConfigurationAccess service
-    Reference < beans::XPropertySet > xPropSet( xInterface, UNO_QUERY );
-    Any value;
-
-        value=xPropSet->getPropertyValue( OUSTR( "Confirmation" ) );
-        if ( sal_False == ( value >>= m_confirmationRequired ) )
-        {
-            throw RuntimeException(
-                OUSTR( "ScriptSecurityManager:readConfiguration: can't get Confirmation setting" ),
-                Reference< XInterface > () );
-        }
+        beans::PropertyValue configPath;
+        configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+        configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Security/Scripting"));
+        Sequence < Any > aargs( 1 );
+        aargs[ 0 ] <<= configPath;
+        ENSURE_OR_THROW( m_xConfigProvFactory.is(),
+            "ScriptSecurityManager::readConfiguration: ConfigProviderFactory no longer valid!" );
+        // get the XPropertySet interface from the ConfigurationAccess service
+        Reference < beans::XPropertySet > xPropSet( m_xConfigProvFactory->createInstanceWithArguments( s_configAccess, aargs ), UNO_QUERY_THROW );
+
+        m_confirmationRequired = sal_True;
+        OSL_VERIFY( xPropSet->getPropertyValue( OUSTR( "Confirmation" ) ) >>= m_confirmationRequired );
         if ( m_confirmationRequired == sal_True ) 
         {
             OSL_TRACE( "ScriptSecurityManager:readConfiguration: confirmation is true" );
@@ -415,13 +386,10 @@ void ScriptSecurityManager::readConfiguration()
         {
             OSL_TRACE( "ScriptSecurityManager:readConfiguration: confirmation is false" );
         }
-        value=xPropSet->getPropertyValue( OUSTR( "Warning" ) );
-        if ( sal_False == ( value >>= m_warning ) )
-        {
-            throw RuntimeException(
-                OUSTR( "ScriptSecurityManager:readConfiguration: can't get Warning setting" ),
-                Reference< XInterface > () );
-        }
+
+        m_warning = true;
+        OSL_VERIFY( xPropSet->getPropertyValue( OUSTR( "Warning" ) ) >>= m_warning );
+
         if ( m_warning == sal_True ) 
         {
             OSL_TRACE( "ScriptSecurityManager:readConfiguration: warning is true" );
@@ -430,21 +398,13 @@ void ScriptSecurityManager::readConfiguration()
         {
             OSL_TRACE( "ScriptSecurityManager:readConfiguration: warning is false" );
         }
-        value=xPropSet->getPropertyValue( OUSTR( "OfficeBasic" ) );
-        if ( sal_False == ( value >>= m_runMacroSetting ) )
-        {
-            throw RuntimeException(
-                OUSTR( "ScriptSecurityManager:readConfiguration: can't get OfficeBasic setting" ),
-                Reference< XInterface > () );
-        }
+
+        m_runMacroSetting = sal_True;
+        OSL_VERIFY( xPropSet->getPropertyValue( OUSTR( "OfficeBasic" ) ) >>= m_runMacroSetting );
         OSL_TRACE( "ScriptSecurityManager:readConfiguration: OfficeBasic = %d", m_runMacroSetting );
-        value=xPropSet->getPropertyValue( OUSTR( "SecureURL" ) );
-        if ( sal_False == ( value >>= m_secureURL ) )
-        {
-            throw RuntimeException(
-                OUSTR( "ScriptSecurityManager:readConfiguration: can't get SecureURL setting" ),
-                Reference< XInterface > () );
-        }
+
+        m_secureURL = ::rtl::OUString();
+        OSL_VERIFY( xPropSet->getPropertyValue( OUSTR( "SecureURL" ) ) >>= m_secureURL );
     }
     catch ( beans::UnknownPropertyException & upe )
     {
@@ -480,18 +440,14 @@ void ScriptSecurityManager::readConfiguration()
     int length = m_secureURL.getLength();
 
     // PathSubstitution needed to interpret variables found in config
-    Reference< lang::XMultiComponentFactory > xMgr = m_xContext->getServiceManager();
-    validateXRef( xMgr,
-        "ScriptSecurityManager::readConfiguration: cannot get XMultiComponentFactory" );
-    xInterface = xMgr->createInstanceWithContext(  
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.util.PathSubstitution")), m_xContext);
-    validateXRef( xInterface,
-        "ScriptSecurityManager::readConfiguration: cannot get ConfigurationProvider" );
-    Reference< util::XStringSubstitution > xStringSubstitution( 
-        xInterface, UNO_QUERY);
-    validateXRef( xStringSubstitution,
-        "ScriptSecurityManager::readConfiguration: cannot get ConfigurationProvider" );
+    Reference< lang::XMultiComponentFactory > xMgr( m_xContext->getServiceManager(), UNO_SET_THROW );
+    Reference< XInterface > xInterface = );
+    Reference< util::XStringSubstitution > xStringSubstitution(
+        xMgr->createInstanceWithContext(
+            ::rtl::OUString::createFromAscii( "com.sun.star.util.PathSubstitution" ), m_xContext
+        ),
+        UNO_QUERY_THROW
+    );
     for( int i = 0; i < length; i++ )
     {
         OSL_TRACE( "ScriptSecurityManager:readConfiguration path = %s", 
@@ -524,16 +480,9 @@ throw ( RuntimeException )
     configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Security/Scripting"));
     Sequence < Any > aargs( 1 );
     aargs[ 0 ] <<= configPath;
-    Reference< XInterface > xInterface = m_xConfigProvFactory->createInstanceWithArguments( s_configUpdate, 
-            aargs );
-    validateXRef( xInterface,
-        "ScriptSecurityManager::addToSecurePaths: ScriptSecurityManager: cannot get ConfigurationUpdateAccess" );
-    Reference < container::XNameReplace > xNameReplace( xInterface, UNO_QUERY );
-    validateXRef( xNameReplace,
-        "ScriptSecurityManager::addToSecurePaths: ScriptSecurityManager: cannot get XNameReplace" );
-    Reference < util::XChangesBatch > xChangesBatch( xInterface, UNO_QUERY );
-    validateXRef( xChangesBatch,
-        "ScriptSecurityManager::addToSecurePaths: cannot get XChangesBatch" );
+    Reference < container::XNameReplace > xNameReplace(
+        m_xConfigProvFactory->createInstanceWithArguments( s_configUpdate, aargs ), UNO_QUERY_THROW );
+    Reference < util::XChangesBatch > xChangesBatch( xNameReplace, UNO_QUERY_THROW );
 
     OSL_TRACE( "--->ScriptSecurityManager::addToSecurePaths: after if stuff" );
     Reference < beans::XPropertySet > xPropSet( xInterface, UNO_QUERY );
diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
index 92b6699201..92b6699201 100644..100755
--- a/scripting/source/storage/ScriptSecurityManager.hxx
+++ b/scripting/source/storage/ScriptSecurityManager.hxx
diff --git a/scripting/source/storage/ScriptStorage.cxx b/scripting/source/storage/ScriptStorage.cxx
index 127346d5e3..585f1e6e28 100644..100755
--- a/scripting/source/storage/ScriptStorage.cxx
+++ b/scripting/source/storage/ScriptStorage.cxx
@@ -82,16 +82,11 @@ const sal_uInt16 NUMBER_STORAGE_INITIALIZE_ARGS = 3;
 ScriptStorage::ScriptStorage( const Reference <
                               XComponentContext > & xContext )
 throw ( RuntimeException )
-        : m_xContext( xContext ), m_bInitialised( false )
+        : m_xContext( xContext, UNO_SET_THROW ), m_bInitialised( false )
 {
     OSL_TRACE( "< ScriptStorage ctor called >\n" );
 
-    validateXRef( m_xContext, 
-        "ScriptStorage::ScriptStorage : cannot get component context" );
-
-    m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr, 
-        "ScriptStorage::ScriptStorage : cannot get service manager" );
+    m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW );
 
     if( !mh_scriptLangs )
     {
@@ -99,47 +94,31 @@ throw ( RuntimeException )
         if( !mh_scriptLangs )
         {
             mh_scriptLangs = new ScriptLanguages_hash();
-            Reference< XInterface > xInterface = 
-                m_xMgr->createInstanceWithContext( 
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.configuration.ConfigurationProvider" ))
-                        , m_xContext );
-            validateXRef( xInterface,
-                "ScriptStorage::ScriptStorage: cannot get ConfigurationProvider" );
+            Reference< lang::XMultiServiceFactory > xConfigProvFactory(
+                m_xMgr->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), m_xContext ),
+                UNO_QUERY_THROW );
             // create an instance of the ConfigurationAccess for accessing the
             // scripting runtime settings
-            Reference< lang::XMultiServiceFactory > xConfigProvFactory = 
-                Reference < lang::XMultiServiceFactory > 
-                    ( xInterface, UNO_QUERY_THROW );
-            validateXRef( xConfigProvFactory,
-                "ScriptStorage::ScriptStorage: cannot get XMultiServiceFactory interface from ConfigurationProvider" );
             beans::PropertyValue configPath;
             configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
             configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Scripting/ScriptRuntimes"));
             Sequence < Any > aargs( 1 );
             aargs[ 0 ] <<= configPath;
 
-            xInterface = xConfigProvFactory->createInstanceWithArguments( 
+            Reference< container::XNameAccess > xNameAccess(
+                xConfigProvFactory->createInstanceWithArguments(
                         OUString(RTL_CONSTASCII_USTRINGPARAM(
                             "com.sun.star.configuration.ConfigurationAccess")),
-                        aargs );
-            validateXRef( xInterface,
-                "ScriptStorage::ScriptStorage: cannot get ConfigurationAccess" );
-            Reference< container::XNameAccess > xNameAccess = 
-                Reference < container::XNameAccess > ( xInterface, 
-                                            UNO_QUERY_THROW );
-            validateXRef( xNameAccess,
-                "ScriptStorage::ScriptStorage: cannot get ConfigurationAccess" );
+                    aargs
+                ),
+                UNO_QUERY_THROW );
+
             Sequence< OUString > names = xNameAccess->getElementNames();
             for( int i = 0 ; i < names.getLength() ; i++ )
             {
                 OSL_TRACE(  "Getting propertyset for Lang=%s", 
                     ::rtl::OUStringToOString( names[i], RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-                Reference< beans::XPropertySet > xPropSet = 
-                    Reference< beans::XPropertySet >( xNameAccess->getByName(names[i]),
-                                            UNO_QUERY_THROW );
-                validateXRef( xPropSet,
-                    "ScriptStorage::ScriptStorage: cannot get XPropertySet for name" );
+                Reference< beans::XPropertySet > xPropSet( xNameAccess->getByName( names[i] ), UNO_QUERY_THROW );
                 Any aProp = xPropSet->getPropertyValue( 
                         OUString(RTL_CONSTASCII_USTRINGPARAM("SupportedFileExtensions")) );
                 Sequence< OUString > extns;
@@ -281,9 +260,7 @@ throw ( RuntimeException, Exception )
         OUString xStringUri(m_stringUri);
 
         ScriptMetadataImporter* SMI = new ScriptMetadataImporter( m_xContext );
-        Reference< xml::sax::XExtendedDocumentHandler > xSMI( SMI );
-
-        validateXRef( xSMI, "ScriptStorage::create: failed to obtain valid XExtendedDocumentHandler" );
+        Reference< xml::sax::XExtendedDocumentHandler > xSMI( SMI, UNO_SET_THROW );
 
         xStringUri = xStringUri.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             SCRIPT_DIR )) );
@@ -583,15 +560,14 @@ throw ( RuntimeException )
                         "/parcel.xml" )) ),
                         RTL_TEXTENCODING_ASCII_US ).pData->buffer );
 
-                    Reference< XInterface > xInterface =
+                    xHandler.set( 
                         m_xMgr->createInstanceWithContext(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")),
-                        m_xContext );
-                    validateXRef( xInterface, "ScriptStorage::save: cannot get sax.Writer" );
-                    xHandler = Reference<xml::sax::XExtendedDocumentHandler>( 
-                        xInterface, UNO_QUERY_THROW );
-                    xSource = Reference< io::XActiveDataSource >( 
-                        xHandler, UNO_QUERY_THROW );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")),
+                            m_xContext
+                        ),
+                        UNO_QUERY_THROW
+                    );
+                    xSource.set( xHandler, UNO_QUERY_THROW );
                     xSource->setOutputStream( xOS );
 
                     writeMetadataHeader( xHandler );
diff --git a/scripting/source/storage/ScriptStorage.hxx b/scripting/source/storage/ScriptStorage.hxx
index 995a0b2398..995a0b2398 100644..100755
--- a/scripting/source/storage/ScriptStorage.hxx
+++ b/scripting/source/storage/ScriptStorage.hxx
diff --git a/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx
index 768c63e72b..955126a2ff 100644..100755
--- a/scripting/source/storage/ScriptStorageManager.cxx
+++ b/scripting/source/storage/ScriptStorageManager.cxx
@@ -46,6 +46,7 @@
 #include "ScriptStorageManager.hxx"
 #include <util/util.hxx>
 #include <util/scriptingconstants.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -66,31 +67,18 @@ static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceNam
 // ScriptStorageManager Constructor
 ScriptStorageManager::ScriptStorageManager( const Reference<
         XComponentContext > & xContext ) SAL_THROW ( ( RuntimeException ) )
-        : m_xContext( xContext ), m_count( 0 ), m_securityMgr( xContext )
+        : m_xContext( xContext, UNO_SET_THROW ), m_count( 0 ), m_securityMgr( xContext )
 {
     OSL_TRACE( "< ScriptStorageManager ctor called >\n" );
 
-    validateXRef( m_xContext,
-                  "ScriptStorageManager::ScriptStorageManager : cannot get component context" );
-
-    m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr,
-                  "ScriptStorageManager::ScriptStorageManager : cannot get service manager" );
+    m_xMgr.set( m_xContext->getServiceManager(), UNO_SET_THROW );
 
     try
     {
         // obtain the macro expander singleton to use in determining the
         // location of the application script storage
-        Any aAny = m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                                   "/singletons/com.sun.star.util.theMacroExpander" )) );
-        Reference< util::XMacroExpander > xME;
-        if ( sal_False == ( aAny >>= xME ) )
-        {
-            throw RuntimeException(
-                OUSTR( "ScriptStorageManager::ScriptStorageManager: can't get XMacroExpander" ),
-                Reference< XInterface >() );
-        }
-        validateXRef( xME, "ScriptStorageManager constructor: can't get MacroExpander" );
+        Reference< util::XMacroExpander > xME( m_xContext->getValueByName( OUString::createFromAscii(
+                                                   "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY_THROW );
 
         OUString base(RTL_CONSTASCII_USTRINGPARAM(
                             SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" )) );
@@ -121,12 +109,13 @@ SAL_THROW ( ( RuntimeException ) )
 {
     try
     {
-        Reference< XInterface > xInterface =
+        Reference< ucb::XSimpleFileAccess > xSFA(
             m_xMgr->createInstanceWithContext(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext );
-        validateXRef( xInterface,
-                      "ScriptStorageManager constructor: can't get SimpleFileAccess XInterface" );
-        Reference< ucb::XSimpleFileAccess > xSFA( xInterface, UNO_QUERY_THROW );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
+                m_xContext
+            ),
+            UNO_QUERY_THROW
+        );
 
         setupAnyStorage( xSFA, xME->expandMacros( storageStr ), appStr );
     }
@@ -163,13 +152,15 @@ SAL_THROW ( ( RuntimeException ) )
                    ::rtl::OUStringToOString( storageStr,
                                              RTL_TEXTENCODING_ASCII_US ).pData->buffer );
 
-        Reference< XInterface > xInterface =
+        Reference< XInterface > xInterface(
             m_xMgr->createInstanceWithArgumentsAndContext(
                 OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "drafts.com.sun.star.script.framework.storage.ScriptStorage" )),
-                aArgs, m_xContext );
-
-        validateXRef( xInterface, "ScriptStorageManager:: setupAnyStorage: Can't create ScriptStorage for share" );
+                aArgs,
+                m_xContext
+            ),
+            UNO_QUERY_THROW
+        );
 
         // and place it in the boost::unordered_map. Increment the counter
         m_ScriptStorageMap[ m_count++ ] = xInterface;
@@ -209,8 +200,7 @@ ScriptStorageManager::createScriptStorage(
 throw ( RuntimeException )
 {
     OSL_TRACE( "** ==> ScriptStorageManager in createScriptingStorage\n" );
-    validateXRef( xSFA,
-                  "ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
+    ENSURE_OR_THROW( xSFA.is(), "ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
 
     return setupAnyStorage( xSFA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
                             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
@@ -223,7 +213,7 @@ ScriptStorageManager::createScriptStorageWithURI(
 throw ( RuntimeException )
 {
     OSL_TRACE( "** ==> ScriptStorageManager in createScriptingStorageWithURI\n" );
-    validateXRef( xSFA, "ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
+    ENSURE_OR_THROW( xSFA.is(), "ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
 
     // related to issue 11866
     // warning dialog gets launched when adding binding to script in doc
@@ -281,7 +271,7 @@ throw( RuntimeException )
             OUSTR( "ScriptStorageManager::getScriptStorage: invalid storage ID" ),
             Reference< XInterface >() );
     }
-    validateXRef( itr->second,
+    ENSURE_OR_THROW( itr->second.is(),
                   "ScriptStorageManager::getScriptStorage: Cannot get ScriptStorage from ScriptStorageHash" );
     return itr->second;
 }
diff --git a/scripting/source/storage/ScriptStorageManager.hxx b/scripting/source/storage/ScriptStorageManager.hxx
index 6c067a6e39..6c067a6e39 100644..100755
--- a/scripting/source/storage/ScriptStorageManager.hxx
+++ b/scripting/source/storage/ScriptStorageManager.hxx
diff --git a/scripting/source/storage/ScriptURI.cxx b/scripting/source/storage/ScriptURI.cxx
index 2bd588308d..2bd588308d 100644..100755
--- a/scripting/source/storage/ScriptURI.cxx
+++ b/scripting/source/storage/ScriptURI.cxx
diff --git a/scripting/source/storage/ScriptURI.hxx b/scripting/source/storage/ScriptURI.hxx
index 0d1ac98598..0d1ac98598 100644..100755
--- a/scripting/source/storage/ScriptURI.hxx
+++ b/scripting/source/storage/ScriptURI.hxx
diff --git a/scripting/source/storage/XMLElement.cxx b/scripting/source/storage/XMLElement.cxx
index 03e5976506..03e5976506 100644..100755
--- a/scripting/source/storage/XMLElement.cxx
+++ b/scripting/source/storage/XMLElement.cxx
diff --git a/scripting/source/storage/XMLElement.hxx b/scripting/source/storage/XMLElement.hxx
index 798e360b23..798e360b23 100644..100755
--- a/scripting/source/storage/XMLElement.hxx
+++ b/scripting/source/storage/XMLElement.hxx
diff --git a/scripting/source/storage/exports.dxp b/scripting/source/storage/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/scripting/source/storage/exports.dxp
+++ b/scripting/source/storage/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/scripting/source/storage/makefile.mk b/scripting/source/storage/makefile.mk
index 7ba35edf06..7ba35edf06 100644..100755
--- a/scripting/source/storage/makefile.mk
+++ b/scripting/source/storage/makefile.mk
diff --git a/scripting/source/storage/storage.xml b/scripting/source/storage/storage.xml
index 6438dc7006..6438dc7006 100644..100755
--- a/scripting/source/storage/storage.xml
+++ b/scripting/source/storage/storage.xml
diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk
index dfc2d19791..71f8ee39e7 100644..100755
--- a/scripting/source/stringresource/makefile.mk
+++ b/scripting/source/stringresource/makefile.mk
@@ -60,3 +60,11 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/stringresource.component
+
+$(MISC)/stringresource.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt stringresource.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt stringresource.component
diff --git a/scripting/source/stringresource/stringresource.component b/scripting/source/stringresource/stringresource.component
new file mode 100755
index 0000000000..6d64d95539
--- /dev/null
+++ b/scripting/source/stringresource/stringresource.component
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.scripting.StringResource">
+    <service name="com.sun.star.resource.StringResource"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.scripting.StringResourceWithLocation">
+    <service name="com.sun.star.resource.StringResourceWithLocation"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.scripting.StringResourceWithStorage">
+    <service name="com.sun.star.resource.StringResourceWithStorage"/>
+  </implementation>
+</component>
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index df355d5520..ec6f46cb29 100644..100755
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -3079,13 +3079,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( 
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, ::stringresource::s_component_entries );
-    }
-
     void * SAL_CALL component_getFactory( 
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 4ad9dbd248..4ad9dbd248 100644..100755
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
diff --git a/scripting/source/stringresource/stringresource.xml b/scripting/source/stringresource/stringresource.xml
index 08a558f68b..08a558f68b 100644..100755
--- a/scripting/source/stringresource/stringresource.xml
+++ b/scripting/source/stringresource/stringresource.xml
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index c5e29c015b..c5e29c015b 100644..100755
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk
index 09180a1c61..d7bca56b96 100644..100755
--- a/scripting/source/vbaevents/makefile.mk
+++ b/scripting/source/vbaevents/makefile.mk
@@ -29,11 +29,6 @@ PRJ=..$/..
 
 PRJNAME=scripting
 TARGET=vbaevents
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
-        @echo "not building vbaevents..."
-.ENDIF
-
 VISIBILITY_HIDDEN=TRUE
 NO_BSYMBOLIC=	TRUE
 ENABLE_EXCEPTIONS=TRUE
@@ -86,3 +81,11 @@ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
         +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
         echo $@
  
+
+ALLTAR : $(MISC)/vbaevents.component
+
+$(MISC)/vbaevents.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        vbaevents.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt vbaevents.component
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
index 3a706bd441..7d076b27cd 100644..100755
--- a/scripting/source/vbaevents/service.cxx
+++ b/scripting/source/vbaevents/service.cxx
@@ -108,16 +108,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    SAL_DLLPUBLIC_EXPORT  sal_Bool SAL_CALL component_writeInfo( 
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        OSL_TRACE("In component_writeInfo");
-        if ( ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, s_component_entries ) )
-            return sal_True;
-        return sal_False;
-    }
-
     SAL_DLLPUBLIC_EXPORT  void * SAL_CALL component_getFactory( 
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/scripting/source/vbaevents/vbaevents.component b/scripting/source/vbaevents/vbaevents.component
new file mode 100755
index 0000000000..e8cbf3d88f
--- /dev/null
+++ b/scripting/source/vbaevents/vbaevents.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="ooo.vba.EventListener">
+    <service name="ooo.vba.EventListener"/>
+  </implementation>
+  <implementation name="ooo.vba.VBAToOOEventDesc">
+    <service name="ooo.vba.VBAToOOEventDesc"/>
+  </implementation>
+</component>
diff --git a/scripting/source/vbaevents/vbamsformreturntypes.hxx b/scripting/source/vbaevents/vbamsformreturntypes.hxx
index 82e6ddce8f..82e6ddce8f 100644..100755
--- a/scripting/source/vbaevents/vbamsformreturntypes.hxx
+++ b/scripting/source/vbaevents/vbamsformreturntypes.hxx
diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/scripting/util/exports.dxp
+++ b/scripting/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk
index f18970f164..04435caab1 100644..100755
--- a/scripting/util/makefile.mk
+++ b/scripting/util/makefile.mk
@@ -65,3 +65,11 @@ DEF1EXPORTFILE= exports.dxp
 
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/scriptframe.component
+
+$(MISC)/scriptframe.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
diff --git a/scripting/util/provider/beanshell/delzip b/scripting/util/provider/beanshell/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/util/provider/beanshell/delzip
+++ b/scripting/util/provider/beanshell/delzip
diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml
index 6b053188bf..6b053188bf 100644..100755
--- a/scripting/util/provider/beanshell/description.xml
+++ b/scripting/util/provider/beanshell/description.xml
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
index cbb0c40e62..cbb0c40e62 100644..100755
--- a/scripting/util/provider/beanshell/makefile.mk
+++ b/scripting/util/provider/beanshell/makefile.mk
diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml
index da8e620281..da8e620281 100644..100755
--- a/scripting/util/provider/beanshell/manifest.xml
+++ b/scripting/util/provider/beanshell/manifest.xml
diff --git a/scripting/util/provider/javascript/delzip b/scripting/util/provider/javascript/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/scripting/util/provider/javascript/delzip
+++ b/scripting/util/provider/javascript/delzip
diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml
index 58f047891f..58f047891f 100644..100755
--- a/scripting/util/provider/javascript/description.xml
+++ b/scripting/util/provider/javascript/description.xml
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk
index f6443ad577..f6443ad577 100644..100755
--- a/scripting/util/provider/javascript/makefile.mk
+++ b/scripting/util/provider/javascript/makefile.mk
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml
index 4c61747f4d..4c61747f4d 100644..100755
--- a/scripting/util/provider/javascript/manifest.xml
+++ b/scripting/util/provider/javascript/manifest.xml
diff --git a/scripting/util/scriptframe.component b/scripting/util/scriptframe.component
new file mode 100755
index 0000000000..5b3fe8c396
--- /dev/null
+++ b/scripting/util/scriptframe.component
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.script.browse.BrowseNodeFactory">
+    <service name="com.sun.star.script.browse.BrowseNodeFactory"/>
+    <singleton name="com.sun.star.script.browse.theBrowseNodeFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.script.provider.MasterScriptProvider">
+    <service name="com.sun.star.script.browse.BrowseNode"/>
+    <service name="com.sun.star.script.provider.MasterScriptProvider"/>
+    <service name="com.sun.star.script.provider.ScriptProvider"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.script.provider.MasterScriptProviderFactory">
+    <service name="com.sun.star.script.provider.MasterScriptProviderFactory"/>
+    <singleton
+        name="com.sun.star.script.provider.theMasterScriptProviderFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.script.provider.ScriptURIHelper">
+    <service name="com.sun.star.script.provider.ScriptURIHelper"/>
+  </implementation>
+</component>
diff --git a/scripting/workben/bindings/EditDebug.xdl b/scripting/workben/bindings/EditDebug.xdl
index 226104b2d7..226104b2d7 100644..100755
--- a/scripting/workben/bindings/EditDebug.xdl
+++ b/scripting/workben/bindings/EditDebug.xdl
diff --git a/scripting/workben/bindings/EventsBinding.xdl b/scripting/workben/bindings/EventsBinding.xdl
index fe980b5ddf..fe980b5ddf 100644..100755
--- a/scripting/workben/bindings/EventsBinding.xdl
+++ b/scripting/workben/bindings/EventsBinding.xdl
diff --git a/scripting/workben/bindings/HelpBinding.xdl b/scripting/workben/bindings/HelpBinding.xdl
index 7d39670097..7d39670097 100644..100755
--- a/scripting/workben/bindings/HelpBinding.xdl
+++ b/scripting/workben/bindings/HelpBinding.xdl
diff --git a/scripting/workben/bindings/Highlight.xdl b/scripting/workben/bindings/Highlight.xdl
index 2d65de4228..2d65de4228 100644..100755
--- a/scripting/workben/bindings/Highlight.xdl
+++ b/scripting/workben/bindings/Highlight.xdl
diff --git a/scripting/workben/bindings/KeyBinding.xdl b/scripting/workben/bindings/KeyBinding.xdl
index 107adf2f1d..107adf2f1d 100644..100755
--- a/scripting/workben/bindings/KeyBinding.xdl
+++ b/scripting/workben/bindings/KeyBinding.xdl
diff --git a/scripting/workben/bindings/MacroEditor.xdl b/scripting/workben/bindings/MacroEditor.xdl
index b724bbb64a..b724bbb64a 100644..100755
--- a/scripting/workben/bindings/MacroEditor.xdl
+++ b/scripting/workben/bindings/MacroEditor.xdl
diff --git a/scripting/workben/bindings/MenuBinding.xdl b/scripting/workben/bindings/MenuBinding.xdl
index b4e0b0e753..b4e0b0e753 100644..100755
--- a/scripting/workben/bindings/MenuBinding.xdl
+++ b/scripting/workben/bindings/MenuBinding.xdl
diff --git a/scripting/workben/bindings/ScriptBinding.xba b/scripting/workben/bindings/ScriptBinding.xba
index 7f689d34f7..7f689d34f7 100644..100755
--- a/scripting/workben/bindings/ScriptBinding.xba
+++ b/scripting/workben/bindings/ScriptBinding.xba
diff --git a/scripting/workben/bindings/calckeybinding.xml b/scripting/workben/bindings/calckeybinding.xml
index 3e9b7ef486..3e9b7ef486 100644..100755
--- a/scripting/workben/bindings/calckeybinding.xml
+++ b/scripting/workben/bindings/calckeybinding.xml
diff --git a/scripting/workben/bindings/calcmenubar.xml b/scripting/workben/bindings/calcmenubar.xml
index 26b884cb60..26b884cb60 100644..100755
--- a/scripting/workben/bindings/calcmenubar.xml
+++ b/scripting/workben/bindings/calcmenubar.xml
diff --git a/scripting/workben/bindings/dialog.xlb b/scripting/workben/bindings/dialog.xlb
index 1445c98b8c..1445c98b8c 100644..100755
--- a/scripting/workben/bindings/dialog.xlb
+++ b/scripting/workben/bindings/dialog.xlb
diff --git a/scripting/workben/bindings/drawkeybinding.xml b/scripting/workben/bindings/drawkeybinding.xml
index e7d0bbf731..e7d0bbf731 100644..100755
--- a/scripting/workben/bindings/drawkeybinding.xml
+++ b/scripting/workben/bindings/drawkeybinding.xml
diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml
index 2fbfe54164..2fbfe54164 100644..100755
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
diff --git a/scripting/workben/bindings/eventbindings.xml b/scripting/workben/bindings/eventbindings.xml
index 96a5ddfeaa..96a5ddfeaa 100644..100755
--- a/scripting/workben/bindings/eventbindings.xml
+++ b/scripting/workben/bindings/eventbindings.xml
diff --git a/scripting/workben/bindings/impresskeybinding.xml b/scripting/workben/bindings/impresskeybinding.xml
index 25430801fc..25430801fc 100644..100755
--- a/scripting/workben/bindings/impresskeybinding.xml
+++ b/scripting/workben/bindings/impresskeybinding.xml
diff --git a/scripting/workben/bindings/impressmenubar.xml b/scripting/workben/bindings/impressmenubar.xml
index 627fd16815..627fd16815 100644..100755
--- a/scripting/workben/bindings/impressmenubar.xml
+++ b/scripting/workben/bindings/impressmenubar.xml
diff --git a/scripting/workben/bindings/manifest.xml b/scripting/workben/bindings/manifest.xml
index 093d19ff37..093d19ff37 100644..100755
--- a/scripting/workben/bindings/manifest.xml
+++ b/scripting/workben/bindings/manifest.xml
diff --git a/scripting/workben/bindings/script.xlb b/scripting/workben/bindings/script.xlb
index 33eb114b5b..33eb114b5b 100644..100755
--- a/scripting/workben/bindings/script.xlb
+++ b/scripting/workben/bindings/script.xlb
diff --git a/scripting/workben/bindings/writerkeybinding.xml b/scripting/workben/bindings/writerkeybinding.xml
index 65c7ceef42..65c7ceef42 100644..100755
--- a/scripting/workben/bindings/writerkeybinding.xml
+++ b/scripting/workben/bindings/writerkeybinding.xml
diff --git a/scripting/workben/bindings/writermenubar.xml b/scripting/workben/bindings/writermenubar.xml
index d2d6d880b7..d2d6d880b7 100644..100755
--- a/scripting/workben/bindings/writermenubar.xml
+++ b/scripting/workben/bindings/writermenubar.xml
diff --git a/scripting/workben/data/ExampleSpreadSheetLatest.sxc b/scripting/workben/data/ExampleSpreadSheetLatest.sxc
index 7be6c0d4be..7be6c0d4be 100644..100755
--- a/scripting/workben/data/ExampleSpreadSheetLatest.sxc
+++ b/scripting/workben/data/ExampleSpreadSheetLatest.sxc
diff --git a/scripting/workben/data/doc_with_beanshell_scripts.sxw b/scripting/workben/data/doc_with_beanshell_scripts.sxw
index f0066610d5..f0066610d5 100644..100755
--- a/scripting/workben/data/doc_with_beanshell_scripts.sxw
+++ b/scripting/workben/data/doc_with_beanshell_scripts.sxw
diff --git a/scripting/workben/data/doc_with_one_script.sxw b/scripting/workben/data/doc_with_one_script.sxw
index 7445f4afca..7445f4afca 100644..100755
--- a/scripting/workben/data/doc_with_one_script.sxw
+++ b/scripting/workben/data/doc_with_one_script.sxw
diff --git a/scripting/workben/data/doc_with_two_scripts.sxw b/scripting/workben/data/doc_with_two_scripts.sxw
index 23a12ac9f8..23a12ac9f8 100644..100755
--- a/scripting/workben/data/doc_with_two_scripts.sxw
+++ b/scripting/workben/data/doc_with_two_scripts.sxw
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.protocolhandler.Dispatch.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.protocolhandler.Dispatch.csv
index 614260db95..614260db95 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.protocolhandler.Dispatch.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.protocolhandler.Dispatch.csv
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.Function.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.Function.csv
index 8732752590..8732752590 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.Function.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.Function.csv
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.FunctionProvider.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.FunctionProvider.csv
index 0f1c41772c..0f1c41772c 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.FunctionProvider.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.FunctionProvider.csv
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptInfo.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptInfo.csv
index 79e8c91e19..79e8c91e19 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptInfo.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptInfo.csv
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorage.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorage.csv
index 69628462fe..69628462fe 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorage.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorage.csv
diff --git a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorageManager.csv b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorageManager.csv
index 6e255c869f..6e255c869f 100644..100755
--- a/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorageManager.csv
+++ b/scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorageManager.csv
diff --git a/scripting/workben/data/script_in_class_file.sxw b/scripting/workben/data/script_in_class_file.sxw
index ddb44c14d2..ddb44c14d2 100644..100755
--- a/scripting/workben/data/script_in_class_file.sxw
+++ b/scripting/workben/data/script_in_class_file.sxw
diff --git a/scripting/workben/data/script_in_jar_file.sxw b/scripting/workben/data/script_in_jar_file.sxw
index 93b10494d2..93b10494d2 100644..100755
--- a/scripting/workben/data/script_in_jar_file.sxw
+++ b/scripting/workben/data/script_in_jar_file.sxw
diff --git a/scripting/workben/data/share_scripts.zip b/scripting/workben/data/share_scripts.zip
index 7c7fec6229..7c7fec6229 100644..100755
--- a/scripting/workben/data/share_scripts.zip
+++ b/scripting/workben/data/share_scripts.zip
diff --git a/scripting/workben/data/testdata/Function.csv b/scripting/workben/data/testdata/Function.csv
index b924c86f4b..b924c86f4b 100644..100755
--- a/scripting/workben/data/testdata/Function.csv
+++ b/scripting/workben/data/testdata/Function.csv
diff --git a/scripting/workben/data/testdata/FunctionProvider.csv b/scripting/workben/data/testdata/FunctionProvider.csv
index 88dcfae118..88dcfae118 100644..100755
--- a/scripting/workben/data/testdata/FunctionProvider.csv
+++ b/scripting/workben/data/testdata/FunctionProvider.csv
diff --git a/scripting/workben/data/testdata/ScriptInfo.csv b/scripting/workben/data/testdata/ScriptInfo.csv
index a5fab2ad5d..a5fab2ad5d 100644..100755
--- a/scripting/workben/data/testdata/ScriptInfo.csv
+++ b/scripting/workben/data/testdata/ScriptInfo.csv
diff --git a/scripting/workben/data/testdata/ScriptRuntimeManager.csv b/scripting/workben/data/testdata/ScriptRuntimeManager.csv
index b5d049b5f4..b5d049b5f4 100644..100755
--- a/scripting/workben/data/testdata/ScriptRuntimeManager.csv
+++ b/scripting/workben/data/testdata/ScriptRuntimeManager.csv
diff --git a/scripting/workben/data/testdata/ScriptStorage.csv b/scripting/workben/data/testdata/ScriptStorage.csv
index a5b4589e6f..a5b4589e6f 100644..100755
--- a/scripting/workben/data/testdata/ScriptStorage.csv
+++ b/scripting/workben/data/testdata/ScriptStorage.csv
diff --git a/scripting/workben/data/testdata/ScriptStorageManager.csv b/scripting/workben/data/testdata/ScriptStorageManager.csv
index 9dc2a9b67b..9dc2a9b67b 100644..100755
--- a/scripting/workben/data/testdata/ScriptStorageManager.csv
+++ b/scripting/workben/data/testdata/ScriptStorageManager.csv
diff --git a/scripting/workben/data/user_scripts.zip b/scripting/workben/data/user_scripts.zip
index f5eed76573..f5eed76573 100644..100755
--- a/scripting/workben/data/user_scripts.zip
+++ b/scripting/workben/data/user_scripts.zip
diff --git a/scripting/workben/data/xscriptcontext_test_document.sxw b/scripting/workben/data/xscriptcontext_test_document.sxw
index da6dafb0b8..da6dafb0b8 100644..100755
--- a/scripting/workben/data/xscriptcontext_test_document.sxw
+++ b/scripting/workben/data/xscriptcontext_test_document.sxw
diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java
index 5339f785b3..5339f785b3 100644..100755
--- a/scripting/workben/ifc/scripting/ScriptingUtils.java
+++ b/scripting/workben/ifc/scripting/ScriptingUtils.java
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index 8722bcbe17..8722bcbe17 100644..100755
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
diff --git a/scripting/workben/ifc/scripting/_XFunction.java b/scripting/workben/ifc/scripting/_XFunction.java
index 8e16a6ed18..8e16a6ed18 100644..100755
--- a/scripting/workben/ifc/scripting/_XFunction.java
+++ b/scripting/workben/ifc/scripting/_XFunction.java
diff --git a/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java
index 3847bc3593..3847bc3593 100644..100755
--- a/scripting/workben/ifc/scripting/_XFunctionProvider.java
+++ b/scripting/workben/ifc/scripting/_XFunctionProvider.java
diff --git a/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java
index ddf503169e..ddf503169e 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptInfo.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfo.java
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index a554aac0e2..a554aac0e2 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index d2bd4cf03e..d2bd4cf03e 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index 76b02a1f6a..76b02a1f6a 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index 9456625fe2..9456625fe2 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index 0c9e16cd73..0c9e16cd73 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
index bed0e779f3..bed0e779f3 100644..100755
--- a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
diff --git a/scripting/workben/ifc/scripting/makefile.mk b/scripting/workben/ifc/scripting/makefile.mk
index 15c8492d8d..15c8492d8d 100644..100755
--- a/scripting/workben/ifc/scripting/makefile.mk
+++ b/scripting/workben/ifc/scripting/makefile.mk
diff --git a/scripting/workben/installer/Banner.java b/scripting/workben/installer/Banner.java
index fc02930ee2..fc02930ee2 100644..100755
--- a/scripting/workben/installer/Banner.java
+++ b/scripting/workben/installer/Banner.java
diff --git a/scripting/workben/installer/ExceptionTraceHelper.java b/scripting/workben/installer/ExceptionTraceHelper.java
index 041239963e..041239963e 100644..100755
--- a/scripting/workben/installer/ExceptionTraceHelper.java
+++ b/scripting/workben/installer/ExceptionTraceHelper.java
diff --git a/scripting/workben/installer/ExecCmd.java b/scripting/workben/installer/ExecCmd.java
index 8ec47ef61d..8ec47ef61d 100644..100755
--- a/scripting/workben/installer/ExecCmd.java
+++ b/scripting/workben/installer/ExecCmd.java
diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java
index fb1ae6188d..fb1ae6188d 100644..100755
--- a/scripting/workben/installer/FileUpdater.java
+++ b/scripting/workben/installer/FileUpdater.java
diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java
index 1beed4467b..1beed4467b 100644..100755
--- a/scripting/workben/installer/Final.java
+++ b/scripting/workben/installer/Final.java
diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java
index b072e106ca..b072e106ca 100644..100755
--- a/scripting/workben/installer/IdeFinal.java
+++ b/scripting/workben/installer/IdeFinal.java
diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java
index aff23fd92d..aff23fd92d 100644..100755
--- a/scripting/workben/installer/IdeUpdater.java
+++ b/scripting/workben/installer/IdeUpdater.java
diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java
index 17a5a7d013..17a5a7d013 100644..100755
--- a/scripting/workben/installer/IdeVersion.java
+++ b/scripting/workben/installer/IdeVersion.java
diff --git a/scripting/workben/installer/IdeWelcome.java b/scripting/workben/installer/IdeWelcome.java
index 1f298c1854..1f298c1854 100644..100755
--- a/scripting/workben/installer/IdeWelcome.java
+++ b/scripting/workben/installer/IdeWelcome.java
diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java
index 501463ef07..501463ef07 100644..100755
--- a/scripting/workben/installer/InstUtil.java
+++ b/scripting/workben/installer/InstUtil.java
diff --git a/scripting/workben/installer/InstallListener.java b/scripting/workben/installer/InstallListener.java
index eade1ef413..eade1ef413 100644..100755
--- a/scripting/workben/installer/InstallListener.java
+++ b/scripting/workben/installer/InstallListener.java
diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java
index 4501d2e4b5..4501d2e4b5 100644..100755
--- a/scripting/workben/installer/InstallWizard.java
+++ b/scripting/workben/installer/InstallWizard.java
diff --git a/scripting/workben/installer/InstallationEvent.java b/scripting/workben/installer/InstallationEvent.java
index d00dbe45a5..d00dbe45a5 100644..100755
--- a/scripting/workben/installer/InstallationEvent.java
+++ b/scripting/workben/installer/InstallationEvent.java
diff --git a/scripting/workben/installer/LogStream.java b/scripting/workben/installer/LogStream.java
index 9244859f5f..9244859f5f 100644..100755
--- a/scripting/workben/installer/LogStream.java
+++ b/scripting/workben/installer/LogStream.java
diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java
index f766da7c0e..f766da7c0e 100644..100755
--- a/scripting/workben/installer/NavPanel.java
+++ b/scripting/workben/installer/NavPanel.java
diff --git a/scripting/workben/installer/Navigation.java b/scripting/workben/installer/Navigation.java
index 609b437985..609b437985 100644..100755
--- a/scripting/workben/installer/Navigation.java
+++ b/scripting/workben/installer/Navigation.java
diff --git a/scripting/workben/installer/ProtocolHandler.xcu b/scripting/workben/installer/ProtocolHandler.xcu
index c4dafd6e67..c4dafd6e67 100644..100755
--- a/scripting/workben/installer/ProtocolHandler.xcu
+++ b/scripting/workben/installer/ProtocolHandler.xcu
diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java
index e6e792dfdf..e6e792dfdf 100644..100755
--- a/scripting/workben/installer/Register.java
+++ b/scripting/workben/installer/Register.java
diff --git a/scripting/workben/installer/Scripting.BeanShell.xcu b/scripting/workben/installer/Scripting.BeanShell.xcu
index d763aa8ff7..d763aa8ff7 100644..100755
--- a/scripting/workben/installer/Scripting.BeanShell.xcu
+++ b/scripting/workben/installer/Scripting.BeanShell.xcu
diff --git a/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs
index efac107699..efac107699 100644..100755
--- a/scripting/workben/installer/Scripting.xcs
+++ b/scripting/workben/installer/Scripting.xcs
diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java
index b872acef5b..b872acef5b 100644..100755
--- a/scripting/workben/installer/Version.java
+++ b/scripting/workben/installer/Version.java
diff --git a/scripting/workben/installer/Welcome.java b/scripting/workben/installer/Welcome.java
index 20b42566b1..20b42566b1 100644..100755
--- a/scripting/workben/installer/Welcome.java
+++ b/scripting/workben/installer/Welcome.java
diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java
index 4c83828831..4c83828831 100644..100755
--- a/scripting/workben/installer/XmlUpdater.java
+++ b/scripting/workben/installer/XmlUpdater.java
diff --git a/scripting/workben/installer/ZipData.java b/scripting/workben/installer/ZipData.java
index ef22bd0e44..ef22bd0e44 100644..100755
--- a/scripting/workben/installer/ZipData.java
+++ b/scripting/workben/installer/ZipData.java
diff --git a/scripting/workben/installer/sidebar.jpg b/scripting/workben/installer/sidebar.jpg
index c2b366f74e..c2b366f74e 100644..100755
--- a/scripting/workben/installer/sidebar.jpg
+++ b/scripting/workben/installer/sidebar.jpg
diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java
index aafa62afe9..aafa62afe9 100644..100755
--- a/scripting/workben/mod/_scripting/Dispatch.java
+++ b/scripting/workben/mod/_scripting/Dispatch.java
diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java
index f7ebf5d7d3..f7ebf5d7d3 100644..100755
--- a/scripting/workben/mod/_scripting/Function.java
+++ b/scripting/workben/mod/_scripting/Function.java
diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java
index f0be633eb5..f0be633eb5 100644..100755
--- a/scripting/workben/mod/_scripting/FunctionProvider.java
+++ b/scripting/workben/mod/_scripting/FunctionProvider.java
diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java
index 6162b515d6..6162b515d6 100644..100755
--- a/scripting/workben/mod/_scripting/ScriptInfo.java
+++ b/scripting/workben/mod/_scripting/ScriptInfo.java
diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
index bf154d7647..bf154d7647 100644..100755
--- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
+++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java
index 616d282640..616d282640 100644..100755
--- a/scripting/workben/mod/_scripting/ScriptStorage.java
+++ b/scripting/workben/mod/_scripting/ScriptStorage.java
diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java
index 255d676144..255d676144 100644..100755
--- a/scripting/workben/mod/_scripting/ScriptStorageManager.java
+++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java
diff --git a/scripting/workben/mod/_scripting/TestDataLoader.java b/scripting/workben/mod/_scripting/TestDataLoader.java
index 0b1814eda3..0b1814eda3 100644..100755
--- a/scripting/workben/mod/_scripting/TestDataLoader.java
+++ b/scripting/workben/mod/_scripting/TestDataLoader.java
diff --git a/scripting/workben/mod/_scripting/makefile.mk b/scripting/workben/mod/_scripting/makefile.mk
index 9d9e05d601..9d9e05d601 100644..100755
--- a/scripting/workben/mod/_scripting/makefile.mk
+++ b/scripting/workben/mod/_scripting/makefile.mk
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
new file mode 100755
index 0000000000..c49fd42cd9
--- /dev/null
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sfx,\
+    sfx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
+
+$(eval $(call gb_SrsTarget_set_include,sfx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(SRCDIR)/sfx2/source/dialog \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/ \
+    -I$(SRCDIR)/sfx2/inc/sfx \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sfx/res,\
+    sfx2/source/appl/app.src \
+    sfx2/source/appl/dde.src \
+    sfx2/source/appl/newhelp.src \
+    sfx2/source/appl/sfx.src \
+    sfx2/source/bastyp/bastyp.src \
+    sfx2/source/bastyp/fltfnc.src \
+    sfx2/source/dialog/alienwarn.src \
+    sfx2/source/dialog/dialog.src \
+    sfx2/source/dialog/dinfdlg.src \
+    sfx2/source/dialog/dinfedt.src \
+    sfx2/source/dialog/filedlghelper.src \
+    sfx2/source/dialog/mailwindow.src \
+    sfx2/source/dialog/mgetempl.src \
+    sfx2/source/dialog/newstyle.src \
+    sfx2/source/dialog/passwd.src \
+    sfx2/source/dialog/printopt.src \
+    sfx2/source/dialog/recfloat.src \
+    sfx2/source/dialog/securitypage.src \
+    sfx2/source/dialog/srchdlg.src \
+    sfx2/source/dialog/taskpane.src \
+    sfx2/source/dialog/templdlg.src \
+    sfx2/source/dialog/titledockwin.src \
+    sfx2/source/dialog/versdlg.src \
+    sfx2/source/doc/doc.src \
+    sfx2/source/doc/doctdlg.src \
+    sfx2/source/doc/doctempl.src \
+    sfx2/source/doc/docvor.src \
+    sfx2/source/doc/graphhelp.src \
+    sfx2/source/doc/new.src \
+    sfx2/source/menu/menu.src \
+    sfx2/source/view/view.src \
+))
+
+
diff --git a/editeng/source/xml/makefile.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index a1c530cb00..67d5a7f438 100644..100755
--- a/editeng/source/xml/makefile.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,22 +25,23 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-PRJNAME=editeng
-TARGET=xml
+$(eval $(call gb_CppunitTest_CppunitTest,sfx2_metadatable))
 
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \
+    sfx2/qa/cppunit/test_metadatable \
+))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
+    sal \
+    sfx \
+    stl \
+    $(gb_STDLIBS) \
+))
 
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
 
-# --- Files --------------------------------------------------------
-SLOFILES = \
-        $(SLO)$/xmltxtimp.obj		\
-        $(SLO)$/xmltxtexp.obj		
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
new file mode 100755
index 0000000000..800612a6c5
--- /dev/null
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
+
+$(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sfx2_complex,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/test-tools.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
+    sfx2/qa/complex/sfx2/tools/DialogThread \
+    sfx2/qa/complex/sfx2/tools/WriterHelper \
+    sfx2/qa/complex/sfx2/tools/TestDocument \
+    sfx2/qa/complex/sfx2/GlobalEventBroadcaster \
+    sfx2/qa/complex/sfx2/DocumentMetadataAccess \
+    sfx2/qa/complex/sfx2/DocumentProperties \
+    sfx2/qa/complex/sfx2/DocumentInfo \
+    sfx2/qa/complex/sfx2/StandaloneDocumentInfo \
+    sfx2/qa/complex/sfx2/UndoManager \
+    sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \
+    sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \
+    sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \
+    sfx2/qa/complex/sfx2/undo/CalcDocumentTest \
+    sfx2/qa/complex/sfx2/undo/ChartDocumentTest \
+    sfx2/qa/complex/sfx2/undo/DocumentTest \
+    sfx2/qa/complex/sfx2/undo/DocumentTestBase \
+    sfx2/qa/complex/sfx2/undo/DrawDocumentTest \
+    sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest \
+    sfx2/qa/complex/sfx2/undo/ImpressDocumentTest \
+    sfx2/qa/complex/sfx2/undo/WriterDocumentTest \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
+    complex.sfx2.DocumentInfo \
+    complex.sfx2.DocumentProperties \
+    complex.sfx2.DocumentMetadataAccess \
+    complex.sfx2.UndoManager \
+))
+# #i115674# fails currently: misses some OnUnfocus event
+#	complex.sfx2.GlobalEventBroadcaster \
+# breaks because binfilter export has been removed
+#	complex.sfx2.StandaloneDocumentInfo \
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
new file mode 100755
index 0000000000..33602a0b72
--- /dev/null
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -0,0 +1,53 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sfx2/qa/unoapi/sfx.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sfx2/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sfx2_unoapi,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\
+    sfx2/qa/unoapi/Test \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\
+    org.openoffice.sfx2.qa.unoapi.Test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
new file mode 100755
index 0000000000..2344d79746
--- /dev/null
+++ b/sfx2/Library_qstart.mk
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+
+$(eval $(call gb_Library_Library,qstart_gtk))
+
+$(eval $(call gb_Library_set_include,qstart_gtk,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(filter -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
+    $$(DEFS) \
+    -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+
+$(eval $(call gb_Library_set_cflags,qstart_gtk,\
+    $$(CFLAGS) \
+    $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
+    $$(LDFLAGS) \
+    $(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+    eggtray \
+    sfx \
+))
+
+$(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
+    sfx2/source/appl/shutdowniconunx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
new file mode 100755
index 0000000000..c18b46c8f1
--- /dev/null
+++ b/sfx2/Library_sfx.mk
@@ -0,0 +1,301 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sfx))
+
+$(eval $(call gb_Library_add_package_headers,sfx,\
+    sfx2_inc \
+    sfx2_sdi \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2))
+
+$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
+
+$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+
+$(eval $(call gb_Library_set_include,sfx,\
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/source/inc \
+    -I$(SRCDIR)/sfx2/inc/pch \
+    -I$(WORKDIR)/SdiTarget/sfx2/sdi \
+    -I$(WORKDIR)/inc/ \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+    $(LIBXML_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DSFX2_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    i18nisolang1 \
+    sal \
+    sax \
+    sb \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xml2 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/app \
+    sfx2/source/appl/appbas \
+    sfx2/source/appl/appbaslib \
+    sfx2/source/appl/appcfg \
+    sfx2/source/appl/appchild \
+    sfx2/source/appl/appdata \
+    sfx2/source/appl/appdde \
+    sfx2/source/appl/appinit \
+    sfx2/source/appl/appmain \
+    sfx2/source/appl/appmisc \
+    sfx2/source/appl/appopen \
+    sfx2/source/appl/appquit \
+    sfx2/source/appl/appreg \
+    sfx2/source/appl/appserv \
+    sfx2/source/appl/appuno \
+    sfx2/source/appl/childwin \
+    sfx2/source/appl/fileobj \
+    sfx2/source/appl/fwkhelper \
+    sfx2/source/appl/helpdispatch \
+    sfx2/source/appl/helpinterceptor \
+    sfx2/source/appl/imagemgr \
+    sfx2/source/appl/imestatuswindow \
+    sfx2/source/appl/impldde \
+    sfx2/source/appl/linkmgr2 \
+    sfx2/source/appl/linksrc \
+    sfx2/source/appl/lnkbase2 \
+    sfx2/source/appl/module \
+    sfx2/source/appl/newhelp \
+    sfx2/source/appl/opengrf \
+    sfx2/source/appl/sfxhelp \
+    sfx2/source/appl/sfxpicklist \
+    sfx2/source/appl/shutdownicon \
+    sfx2/source/appl/workwin \
+    sfx2/source/appl/xpackcreator \
+    sfx2/source/bastyp/bitset \
+    sfx2/source/bastyp/fltfnc \
+    sfx2/source/bastyp/fltlst \
+    sfx2/source/bastyp/frmhtml \
+    sfx2/source/bastyp/frmhtmlw \
+    sfx2/source/bastyp/helper \
+    sfx2/source/bastyp/mieclip \
+    sfx2/source/bastyp/minarray \
+    sfx2/source/bastyp/misc \
+    sfx2/source/bastyp/progress \
+    sfx2/source/bastyp/sfxhtml \
+    sfx2/source/bastyp/sfxresid \
+    sfx2/source/config/evntconf \
+    sfx2/source/control/bindings \
+    sfx2/source/control/ctrlitem \
+    sfx2/source/control/dispatch \
+    sfx2/source/control/macro \
+    sfx2/source/control/minfitem \
+    sfx2/source/control/msg \
+    sfx2/source/control/msgpool \
+    sfx2/source/control/objface \
+    sfx2/source/control/querystatus \
+    sfx2/source/control/request \
+    sfx2/source/control/sfxstatuslistener \
+    sfx2/source/control/shell \
+    sfx2/source/control/sorgitm \
+    sfx2/source/control/statcach \
+    sfx2/source/control/unoctitm \
+    sfx2/source/dialog/alienwarn \
+    sfx2/source/dialog/basedlgs \
+    sfx2/source/dialog/dinfdlg \
+    sfx2/source/dialog/dinfedt \
+    sfx2/source/dialog/dockwin \
+    sfx2/source/dialog/filedlghelper \
+    sfx2/source/dialog/filtergrouping \
+    sfx2/source/dialog/intro \
+    sfx2/source/dialog/itemconnect \
+    sfx2/source/dialog/mailmodel \
+    sfx2/source/dialog/mgetempl \
+    sfx2/source/dialog/navigat \
+    sfx2/source/dialog/newstyle \
+    sfx2/source/dialog/partwnd \
+    sfx2/source/dialog/passwd \
+    sfx2/source/dialog/printopt \
+    sfx2/source/dialog/recfloat \
+    sfx2/source/dialog/securitypage \
+    sfx2/source/dialog/sfxdlg \
+    sfx2/source/dialog/splitwin \
+    sfx2/source/dialog/srchdlg \
+    sfx2/source/dialog/styfitem \
+    sfx2/source/dialog/styledlg \
+    sfx2/source/dialog/tabdlg \
+    sfx2/source/dialog/taskpane \
+    sfx2/source/dialog/templdlg \
+    sfx2/source/dialog/titledockwin \
+    sfx2/source/dialog/tplcitem \
+    sfx2/source/dialog/tplpitem \
+    sfx2/source/dialog/versdlg \
+    sfx2/source/doc/DocumentMetadataAccess \
+    sfx2/source/doc/Metadatable \
+    sfx2/source/doc/QuerySaveDocument \
+    sfx2/source/doc/SfxDocumentMetaData \
+    sfx2/source/doc/docfac \
+    sfx2/source/doc/docfile \
+    sfx2/source/doc/docfilt \
+    sfx2/source/doc/docinf \
+    sfx2/source/doc/docinsert \
+    sfx2/source/doc/docmacromode \
+    sfx2/source/doc/docstoragemodifylistener \
+    sfx2/source/doc/doctdlg \
+    sfx2/source/doc/doctempl \
+    sfx2/source/doc/doctemplates \
+    sfx2/source/doc/doctemplateslocal \
+    sfx2/source/doc/docvor \
+    sfx2/source/doc/frmdescr \
+    sfx2/source/doc/graphhelp \
+    sfx2/source/doc/guisaveas \
+    sfx2/source/doc/iframe \
+    sfx2/source/doc/new \
+    sfx2/source/doc/objcont \
+    sfx2/source/doc/objembed \
+    sfx2/source/doc/objitem \
+    sfx2/source/doc/objmisc \
+    sfx2/source/doc/objserv \
+    sfx2/source/doc/objstor \
+    sfx2/source/doc/objuno \
+    sfx2/source/doc/objxtor \
+    sfx2/source/doc/oleprops \
+    sfx2/source/doc/ownsubfilterservice \
+    sfx2/source/doc/plugin \
+    sfx2/source/doc/printhelper \
+    sfx2/source/doc/querytemplate \
+    sfx2/source/doc/docundomanager \
+    sfx2/source/doc/sfxbasemodel \
+    sfx2/source/doc/sfxmodelfactory \
+    sfx2/source/doc/syspath \
+    sfx2/source/explorer/nochaos \
+    sfx2/source/inet/inettbc \
+    sfx2/source/menu/mnuitem \
+    sfx2/source/menu/mnumgr \
+    sfx2/source/menu/objmnctl \
+    sfx2/source/menu/thessubmenu \
+    sfx2/source/menu/virtmenu \
+    sfx2/source/notify/eventsupplier \
+    sfx2/source/notify/hintpost \
+    sfx2/source/statbar/stbitem \
+    sfx2/source/toolbox/imgmgr \
+    sfx2/source/toolbox/tbxitem \
+    sfx2/source/view/frame \
+    sfx2/source/view/frame2 \
+    sfx2/source/view/frmload \
+    sfx2/source/view/ipclient \
+    sfx2/source/view/orgmgr \
+    sfx2/source/view/printer \
+    sfx2/source/view/sfxbasecontroller \
+    sfx2/source/view/userinputinterception \
+    sfx2/source/view/viewfac \
+    sfx2/source/view/viewfrm \
+    sfx2/source/view/viewfrm2 \
+    sfx2/source/view/viewprn \
+    sfx2/source/view/viewsh \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
+
+$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/sfx2/inc \
+    -I$(SRCDIR)/sfx2/sdi \
+))
+
+ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
+$(eval $(call gb_Library_set_defs,sfx,\
+    $$(DEFS) \
+    -DENABLE_QUICKSTART_APPLET \
+))
+endif
+
+ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/appl/shutdowniconOs2.ob \
+))
+endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconaqua \
+))
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    objc \
+    Cocoa \
+))
+endif
+
+ifeq ($(OS),WNT)
+
+# workaround: disable PCH for these objects to avoid redeclaration
+# errors - needs to be fixed in module tools
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    sfx2/source/doc/syspathw32 \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sfx,\
+    gdi32 \
+    advapi32 \
+    ole32 \
+    shell32 \
+    user32 \
+    uuid \
+))
+
+else
+
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/appl/shutdowniconw32 \
+    sfx2/source/doc/sfxacldetect \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) \
+))
+
+endif
+# vim: set noet sw=4 ts=4:
+
diff --git a/sfx2/Makefile b/sfx2/Makefile
new file mode 100755
index 0000000000..a79aff8310
--- /dev/null
+++ b/sfx2/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
new file mode 100755
index 0000000000..b88e2581f2
--- /dev/null
+++ b/sfx2/Module_sfx2.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,sfx2))
+
+$(eval $(call gb_Module_add_targets,sfx2,\
+    AllLangResTarget_sfx2 \
+    Library_sfx \
+    Package_inc \
+    Package_sdi \
+))
+
+$(eval $(call gb_Module_add_check_targets,sfx2,\
+    CppunitTest_sfx2_metadatable \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
+    JunitTest_sfx2_complex \
+    JunitTest_sfx2_unoapi \
+))
+
+ifeq ($(OS),LINUX)
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Module_add_targets,sfx2,\
+    Library_qstart \
+))
+endif
+endif
+
+#todo: source/dialog BUILD_VER_STRING
+#todo: source/doc SYSTEM_LIBXML2
+#todo: ENABLE_LAYOUT
+#todo: clean up quickstarter stuff in both libraries
+#todo: move standard pool to svl
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
new file mode 100755
index 0000000000..5731762932
--- /dev/null
+++ b/sfx2/Package_inc.mk
@@ -0,0 +1,137 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxcommands.h,sfx2/sfxcommands.h))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/titledockwin.hxx,sfx2/titledockwin.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
new file mode 100755
index 0000000000..43e484b19a
--- /dev/null
+++ b/sfx2/Package_sdi.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi))
+$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi))
diff --git a/sfx2/README b/sfx2/README
index 3b160a2520..3b160a2520 100644..100755
--- a/sfx2/README
+++ b/sfx2/README
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
index cf3cab6190..cf3cab6190 100644..100755
--- a/sfx2/inc/about.hxx
+++ b/sfx2/inc/about.hxx
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index c7d181eb11..c7d181eb11 100644..100755
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index ecf64ebf30..15fa1e1a0e 100644..100755
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -36,54 +36,54 @@ class BitSet
 {
 private:
     void CopyFrom( const BitSet& rSet );
-    USHORT nBlocks;
-    USHORT nCount;
-    ULONG* pBitmap;
+    sal_uInt16 nBlocks;
+    sal_uInt16 nCount;
+    sal_uIntPtr* pBitmap;
 public:
-    BitSet operator<<( USHORT nOffset ) const;
-    BitSet operator>>( USHORT nOffset ) const;
-    static USHORT CountBits( ULONG nBits );
-    BOOL operator!() const;
+    BitSet operator<<( sal_uInt16 nOffset ) const;
+    BitSet operator>>( sal_uInt16 nOffset ) const;
+    static sal_uInt16 CountBits( sal_uIntPtr nBits );
+    sal_Bool operator!() const;
     BitSet();
     BitSet( const BitSet& rOrig );
-    BitSet( USHORT* pArray, USHORT nSize );
+    BitSet( sal_uInt16* pArray, sal_uInt16 nSize );
     ~BitSet();
     BitSet( const Range& rRange );
-    USHORT Count() const;
+    sal_uInt16 Count() const;
     BitSet& operator=( const BitSet& rOrig );
-    BitSet& operator=( USHORT nBit );
+    BitSet& operator=( sal_uInt16 nBit );
     BitSet operator|( const BitSet& rSet ) const;
-    BitSet operator|( USHORT nBit ) const;
+    BitSet operator|( sal_uInt16 nBit ) const;
     BitSet& operator|=( const BitSet& rSet );
-    BitSet& operator|=( USHORT nBit );
+    BitSet& operator|=( sal_uInt16 nBit );
     BitSet operator-( const BitSet& rSet ) const;
-    BitSet operator-( USHORT nId ) const;
+    BitSet operator-( sal_uInt16 nId ) const;
     BitSet& operator-=( const BitSet& rSet );
-    BitSet& operator-=( USHORT nBit );
+    BitSet& operator-=( sal_uInt16 nBit );
     BitSet operator&( const BitSet& rSet ) const;
     BitSet& operator&=( const BitSet& rSet );
     BitSet operator^( const BitSet& rSet ) const;
-    BitSet operator^( USHORT nBit ) const;
+    BitSet operator^( sal_uInt16 nBit ) const;
     BitSet& operator^=( const BitSet& rSet );
-    BitSet& operator^=( USHORT nBit );
-    BOOL IsRealSubSet( const BitSet& rSet ) const;
-    BOOL IsSubSet( const BitSet& rSet ) const;
-    BOOL IsRealSuperSet( const BitSet& rSet ) const;
-    BOOL Contains( USHORT nBit ) const;
-    BOOL IsSuperSet( const BitSet& rSet ) const;
-    BOOL operator==( const BitSet& rSet ) const;
-    BOOL operator==( USHORT nBit ) const;
-    BOOL operator!=( const BitSet& rSet ) const;
-    BOOL operator!=( USHORT nBit ) const;
+    BitSet& operator^=( sal_uInt16 nBit );
+    sal_Bool IsRealSubSet( const BitSet& rSet ) const;
+    sal_Bool IsSubSet( const BitSet& rSet ) const;
+    sal_Bool IsRealSuperSet( const BitSet& rSet ) const;
+    sal_Bool Contains( sal_uInt16 nBit ) const;
+    sal_Bool IsSuperSet( const BitSet& rSet ) const;
+    sal_Bool operator==( const BitSet& rSet ) const;
+    sal_Bool operator==( sal_uInt16 nBit ) const;
+    sal_Bool operator!=( const BitSet& rSet ) const;
+    sal_Bool operator!=( sal_uInt16 nBit ) const;
 
 };
 //--------------------------------------------------------------------
 
-// returns TRUE if the set is empty
+// returns sal_True if the set is empty
 
 
 
-inline BOOL BitSet::operator!() const
+inline sal_Bool BitSet::operator!() const
 {
     return nCount == 0;
 }
@@ -91,7 +91,7 @@ inline BOOL BitSet::operator!() const
 
 // returns the number of bits in the bitset
 
-inline USHORT BitSet::Count() const
+inline sal_uInt16 BitSet::Count() const
 {
     return nCount;
 }
@@ -107,7 +107,7 @@ inline BitSet BitSet::operator|( const BitSet& rSet ) const
 
 // creates the union of a bitset with a single bit
 
-inline BitSet BitSet::operator|( USHORT nBit ) const
+inline BitSet BitSet::operator|( sal_uInt16 nBit ) const
 {
     return BitSet(*this) |= nBit;
 }
@@ -124,7 +124,7 @@ inline BitSet BitSet::operator-( const BitSet& ) const
 // creates the asymetric difference with a single bit
 
 
-inline BitSet BitSet::operator-( USHORT ) const
+inline BitSet BitSet::operator-( sal_uInt16 ) const
 {
     return BitSet();
 }
@@ -165,7 +165,7 @@ inline BitSet BitSet::operator^( const BitSet& ) const
 
 // creates the symetric difference with a single bit
 
-inline BitSet BitSet::operator^( USHORT ) const
+inline BitSet BitSet::operator^( sal_uInt16 ) const
 {
     return BitSet();
 }
@@ -181,7 +181,7 @@ inline BitSet& BitSet::operator^=( const BitSet& )
 #ifdef BITSET_READY
 // builds the symetric difference with a single bit
 
-inline BitSet& BitSet::operator^=( USHORT )
+inline BitSet& BitSet::operator^=( sal_uInt16 )
 {
     // crash!!!
     return BitSet();
@@ -191,48 +191,48 @@ inline BitSet& BitSet::operator^=( USHORT )
 
 // determines if the other bitset is a real superset
 
-inline BOOL BitSet::IsRealSubSet( const BitSet& ) const
+inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // detsermines if the other bitset is a superset or equal
 
-inline BOOL BitSet::IsSubSet( const BitSet& ) const
+inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the other bitset is a real subset
 
-inline BOOL BitSet::IsRealSuperSet( const BitSet& ) const
+inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
 // determines if the other bitset is a subset or equal
 
-inline BOOL BitSet::IsSuperSet( const BitSet& ) const
+inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the bit is the only one in the bitset
 
-inline BOOL BitSet::operator==( USHORT ) const
+inline sal_Bool BitSet::operator==( sal_uInt16 ) const
 {
-    return FALSE;
+    return sal_False;
 }
 //--------------------------------------------------------------------
 
 // determines if the bitsets aren't equal
 
-inline BOOL BitSet::operator!=( const BitSet& rSet ) const
+inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
 {
     return !( *this == rSet );
 }
@@ -240,7 +240,7 @@ inline BOOL BitSet::operator!=( const BitSet& rSet ) const
 
 // determines if the bitset doesn't contain only this bit
 
-inline BOOL BitSet::operator!=( USHORT nBit ) const
+inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
 {
     return !( *this == nBit );
 }
@@ -249,8 +249,8 @@ inline BOOL BitSet::operator!=( USHORT nBit ) const
 class IndexBitSet : BitSet
 {
 public:
-  USHORT GetFreeIndex();
-  void ReleaseIndex(USHORT i){*this-=i;}
+  sal_uInt16 GetFreeIndex();
+  void ReleaseIndex(sal_uInt16 i){*this-=i;}
 };
 
 
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
index fab1de4403..fab1de4403 100644..100755
--- a/sfx2/inc/brokenpackageint.hxx
+++ b/sfx2/inc/brokenpackageint.hxx
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index f09485e962..f09485e962 100644..100755
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/configmgr.hxx
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 27d0815f91..aa014364a0 100644..100755
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -60,27 +60,27 @@ friend class SfxOrganizeDlg_Impl;
     SfxOrganizeMgr*			pMgr;
     SfxOrganizeDlg_Impl*	pDlg;
 
-    static BOOL				bDropMoveOk;
+    static sal_Bool				bDropMoveOk;
 
     DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* );
 
 protected:
-    virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection & );
-    virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
-    virtual BOOL NotifyMoving(SvLBoxEntry *pSource,
+    virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & );
+    virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const String& rNewText );
+    virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
-                            SvLBoxEntry *&pNewParent, ULONG &);
-    virtual BOOL NotifyCopying(SvLBoxEntry *pSource,
+                            SvLBoxEntry *&pNewParent, sal_uIntPtr &);
+    virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
-                            SvLBoxEntry *&pNewParent, ULONG &);
+                            SvLBoxEntry *&pNewParent, sal_uIntPtr &);
     virtual void RequestingChilds( SvLBoxEntry* pParent );
     virtual long ExpandingHdl();
-    virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE );
+    virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
 
         using SvLBox::ExecuteDrop;
     // new d&d
     virtual DragDropMode	NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* );
-    virtual BOOL			NotifyAcceptDrop( SvLBoxEntry* );
+    virtual sal_Bool			NotifyAcceptDrop( SvLBoxEntry* );
     virtual sal_Int8		AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8		ExecuteDrop( const ExecuteDropEvent& rEvt );
     virtual void            DragFinished( sal_Int8 nDropAction );
@@ -99,34 +99,34 @@ public:
     inline void SetBitmaps(
                     const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp
                     );
-    const Image &GetClosedBmp(USHORT nLevel) const;
-    const Image &GetOpenedBmp(USHORT nLevel) const;
+    const Image &GetClosedBmp(sal_uInt16 nLevel) const;
+    const Image &GetOpenedBmp(sal_uInt16 nLevel) const;
 
     virtual PopupMenu*	CreateContextMenu();
 
 private:
-    BOOL IsStandard_Impl( SvLBoxEntry *) const;
-    BOOL MoveOrCopyTemplates(SvLBox *pSourceBox,
+    sal_Bool IsStandard_Impl( SvLBoxEntry *) const;
+    sal_Bool MoveOrCopyTemplates(SvLBox *pSourceBox,
                             SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
                             SvLBoxEntry *&pNewParent,
-                            ULONG &rIdx,
-                            BOOL bCopy);
-    BOOL MoveOrCopyContents(SvLBox *pSourceBox,
+                            sal_uIntPtr &rIdx,
+                            sal_Bool bCopy);
+    sal_Bool MoveOrCopyContents(SvLBox *pSourceBox,
                             SvLBoxEntry *pSource,
                             SvLBoxEntry* pTarget,
                             SvLBoxEntry *&pNewParent,
-                            ULONG &rIdx,
-                            BOOL bCopy);
-    inline USHORT		GetDocLevel() const;
+                            sal_uIntPtr &rIdx,
+                            sal_Bool bCopy);
+    inline sal_uInt16		GetDocLevel() const;
     SfxObjectShellRef	GetObjectShell( const Path& );
-    BOOL				IsUniqName_Impl( const String &rText,
+    sal_Bool				IsUniqName_Impl( const String &rText,
                                          SvLBoxEntry* pParent, SvLBoxEntry* pEntry = 0 ) const;
-    USHORT				GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
+    sal_uInt16				GetLevelCount_Impl( SvLBoxEntry* pParent ) const;
 
     SvLBoxEntry*		InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
-                            SvLBoxEntry* pParent = NULL, BOOL bChildsOnDemand = FALSE,
-                            ULONG nPos = LIST_APPEND, void* pUserData = NULL );
+                            SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False,
+                            sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
 };
 
 #endif // _SFX_HXX
diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
index 948a063eb6..948a063eb6 100644..100755
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/filedlghelper.hrc
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index d4e1a88684..9afb4b300d 100644..100755
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -97,7 +97,7 @@ private:
                         ) const;
 
     sal_Bool            impl_createNewDocWithSlotParam(
-                            const USHORT _nSlotID,
+                            const sal_uInt16 _nSlotID,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rxFrame,
                             const bool i_bHidden
                         );
@@ -110,11 +110,11 @@ private:
                             ::comphelper::NamedValueCollection& io_rDescriptor
                         ) const;
 
-    USHORT              impl_findSlotParam(
+    sal_uInt16              impl_findSlotParam(
                             const ::rtl::OUString& i_rFactoryURL
                         ) const;
 
-    SfxObjectShellLock  impl_findObjectShell(
+    SfxObjectShellRef   impl_findObjectShell(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel2 >& i_rxDocument
                         ) const;
 
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index 1b23e4c2ba..1b23e4c2ba 100644..100755
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 77c6cb894e..0b442a34a7 100644..100755
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -80,12 +80,6 @@ public:
                     ::rtl::OUString aUserSelectedName,
                     sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES );
 
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
-                    const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
-                    sal_Int32 nMustFlags,
-                    sal_Int32 nDontFlags );
-
     static sal_Bool CheckFilterOptionsAppearence(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
                     const ::rtl::OUString& aFilterName );
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index 8583894972..9e0ea52bac 100644..100755
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -36,25 +36,25 @@
 class IdPool: private BitSet
 {
 private:
-    USHORT nNextFree;
-    USHORT nRange;
-    USHORT nOffset;
+    sal_uInt16 nNextFree;
+    sal_uInt16 nRange;
+    sal_uInt16 nOffset;
 public:
-    BOOL Lock( const BitSet& rLockSet );
-    BOOL IsLocked( USHORT nId ) const;
-    IdPool( USHORT nMin = 1, USHORT nMax = USHRT_MAX );
-    USHORT Get();
-    BOOL Put( USHORT nId );
-    BOOL Lock( const Range& rRange );
-    BOOL Lock( USHORT nId );
+    sal_Bool Lock( const BitSet& rLockSet );
+    sal_Bool IsLocked( sal_uInt16 nId ) const;
+    IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX );
+    sal_uInt16 Get();
+    sal_Bool Put( sal_uInt16 nId );
+    sal_Bool Lock( const Range& rRange );
+    sal_Bool Lock( sal_uInt16 nId );
 
 };
 
 //------------------------------------------------------------------------
 
-// returns TRUE if the id is locked
+// returns sal_True if the id is locked
 
-inline BOOL IdPool::IsLocked( USHORT nId ) const
+inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const
 {
     return ( this->Contains(nId-nOffset) );
 }
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 9089731f10..0b32fe0f27 100644..100755
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -47,7 +47,7 @@ private:
     ::svt::AcceleratorExecute*  pAccExec;
     
     SvtURLBox* 				GetURLBox() const;
-    void                    OpenURL( const String& rName, BOOL bNew ) const;
+    void                    OpenURL( const String& rName, sal_Bool bNew ) const;
 
     DECL_LINK(              OpenHdl, void* );
     DECL_LINK(              SelectHdl, void* );
@@ -66,11 +66,11 @@ public:
 
                             SFX_DECL_TOOLBOX_CONTROL();
 
-                            SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
     virtual                 ~SfxURLToolBoxControl_Impl();
 
     virtual Window* 		CreateItemWindow( Window* pParent );
-    virtual void			StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void			StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 };
 
 #endif
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 2e92ae7731..a7737b9c70 100644..100755
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -17,17 +17,17 @@ class SfxMacro;
 
 class SfxMacroStatement
 {
-    USHORT				nSlotId;	// ausgef"uhrte Slot-Id oder 0, wenn manuell
+    sal_uInt16				nSlotId;	// ausgef"uhrte Slot-Id oder 0, wenn manuell
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs;      // aktuelle Parameter, falls nSlotId != 0
     String				aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF)
-    BOOL				bDone;  	// auskommentieren wenn kein Done() gerufen
+    sal_Bool				bDone;  	// auskommentieren wenn kein Done() gerufen
     void*				pDummy;		// f"ur alle F"alle zum kompatibel bleiben
 
 #ifdef _SFXMACRO_HXX
 private:
     void				GenerateNameAndArgs_Impl( SfxMacro *pMacro,
                                                   const SfxSlot &rSlot,
-                                                  BOOL bRequestDone,
+                                                  sal_Bool bRequestDone,
                                                   ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 #endif
 
@@ -36,28 +36,28 @@ public:
 
                         SfxMacroStatement( const String &rTarget,
                                            const SfxSlot &rSlot,
-                                           BOOL bRequestDone,
+                                           sal_Bool bRequestDone,
                                            ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         SfxMacroStatement( const SfxShell &rShell,
                                            const String &rTarget,
-                                           BOOL bAbsolute,
+                                           sal_Bool bAbsolute,
                                            const SfxSlot &rSlot,
-                                           BOOL bRequestDone,
+                                           sal_Bool bRequestDone,
                                            ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         SfxMacroStatement( const String &rStatment );
                         ~SfxMacroStatement();
 
-    USHORT				GetSlotId() const;
+    sal_uInt16				GetSlotId() const;
     const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const;
-    BOOL				IsDone() const;
+    sal_Bool				IsDone() const;
     const String&		GetStatement() const;
 };
 
 //--------------------------------------------------------------------
 
-inline USHORT SfxMacroStatement::GetSlotId() const
+inline sal_uInt16 SfxMacroStatement::GetSlotId() const
 
 /*  [Beschreibung]
 
@@ -90,7 +90,7 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property
 
 //--------------------------------------------------------------------
 
-inline BOOL	SfxMacroStatement::IsDone() const
+inline sal_Bool	SfxMacroStatement::IsDone() const
 
 /*  [Beschreibung]
 
diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk
deleted file mode 100644
index b7aa547e2c..0000000000
--- a/sfx2/inc/makefile.mk
+++ /dev/null
@@ -1,48 +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=sfx2
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index 49bd6fba86..6d84bbb49a 100644..100755
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -40,8 +40,8 @@ struct SfxMsgAttachFile {
     int 				operator==( const SfxMsgAttachFile& rRec ) const
                         {
                             if( aName == rRec.aName && aFile == rRec.aFile )
-                                return TRUE;
-                            return FALSE;
+                                return sal_True;
+                            return sal_False;
                         }
 
                         SfxMsgAttachFile( const String& rFile, const String& rName)
@@ -66,8 +66,8 @@ struct SfxMsgReceiver {
     int 				operator==( const SfxMsgReceiver& rRec ) const
                         {
                             if( aName == rRec.aName && eRole == rRec.eRole )
-                                return TRUE;
-                            return FALSE;
+                                return sal_True;
+                            return sal_False;
                         }
 
                         SfxMsgReceiver( const String& rName, SfxMsgReceiverRole _eRole )
@@ -81,7 +81,7 @@ struct SfxMsgReceiver {
 
 class SfxMsgReceiverList_Impl : public List
 {
-    ULONG 			nRef;
+    sal_uIntPtr 			nRef;
                     ~SfxMsgReceiverList_Impl();
     SfxMsgReceiverList_Impl& operator=( const SfxMsgReceiverList_Impl&); //n.i.
 public:
@@ -92,7 +92,7 @@ public:
     void			Store( SvStream& ) const;
     void 			IncRef() { nRef++; }
     void 			DecRef() { nRef--; if( !nRef ) delete this; }
-    ULONG			GetRefCount() const { return nRef; }
+    sal_uIntPtr			GetRefCount() const { return nRef; }
     int 			operator==( const SfxMsgReceiverList_Impl& ) const;
 };
 
@@ -105,8 +105,8 @@ public:
                             TYPEINFO();
 
                             SfxMsgReceiverListItem();
-                            SfxMsgReceiverListItem( USHORT nWhich );
-                            SfxMsgReceiverListItem( USHORT nWhich, SvStream& rStream );
+                            SfxMsgReceiverListItem( sal_uInt16 nWhich );
+                            SfxMsgReceiverListItem( sal_uInt16 nWhich, SvStream& rStream );
                             SfxMsgReceiverListItem( const SfxMsgReceiverListItem& rItem );
                             ~SfxMsgReceiverListItem();
 
@@ -117,14 +117,14 @@ public:
                                     SfxMapUnit ePresMetric,
                                     XubString &rText ) const;
 
-    USHORT					Count() const;
-    SfxMsgReceiver*			GetObject( USHORT nPos );
-    void					Remove( USHORT nPos );
+    sal_uInt16					Count() const;
+    SfxMsgReceiver*			GetObject( sal_uInt16 nPos );
+    void					Remove( sal_uInt16 nPos );
     void					Add( const SfxMsgReceiver& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream &, sal_uInt16 nVersion ) const;
+    virtual SvStream&		Store( SvStream &, sal_uInt16 nItemVersion ) const;
 };
 
 
@@ -132,7 +132,7 @@ public:
 
 class SfxMsgAttachFileList_Impl : public List
 {
-    ULONG 			nRef;
+    sal_uIntPtr 			nRef;
                     ~SfxMsgAttachFileList_Impl();
     SfxMsgAttachFileList_Impl& operator=( const SfxMsgAttachFileList_Impl&); //n.i.
 
@@ -141,12 +141,12 @@ public:
                     SfxMsgAttachFileList_Impl(const SfxMsgAttachFileList_Impl&);
 
     int				operator==( const SfxMsgAttachFileList_Impl& rRec ) const;
-    SfxMsgAttachFile* GetReceiver(ULONG nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
+    SfxMsgAttachFile* GetReceiver(sal_uIntPtr nPos) { return (SfxMsgAttachFile*)List::GetObject(nPos); }
     void			Load( SvStream& );
     void			Store( SvStream& ) const;
     void 			IncRef() { nRef++; }
     void 			DecRef() { nRef--; if( !nRef ) delete this; }
-    ULONG			GetRefCount() const { return nRef; }
+    sal_uIntPtr			GetRefCount() const { return nRef; }
 };
 
 class SfxMsgAttachFileListItem : public SfxPoolItem
@@ -158,8 +158,8 @@ public:
                             TYPEINFO();
 
                             SfxMsgAttachFileListItem();
-                            SfxMsgAttachFileListItem( USHORT nWhich );
-                            SfxMsgAttachFileListItem( USHORT nWhich, SvStream& rStream );
+                            SfxMsgAttachFileListItem( sal_uInt16 nWhich );
+                            SfxMsgAttachFileListItem( sal_uInt16 nWhich, SvStream& rStream );
                             SfxMsgAttachFileListItem( const SfxMsgAttachFileListItem& rItem );
                             ~SfxMsgAttachFileListItem();
 
@@ -170,14 +170,14 @@ public:
                                     SfxMapUnit ePresMetric,
                                     XubString &rText ) const;
 
-    USHORT					Count() const;
-    SfxMsgAttachFile*		GetObject( USHORT nPos );
-    void					Remove( USHORT nPos );
+    sal_uInt16					Count() const;
+    SfxMsgAttachFile*		GetObject( sal_uInt16 nPos );
+    void					Remove( sal_uInt16 nPos );
     void					Add( const SfxMsgAttachFile& );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream &, USHORT nVersion ) const;
-    virtual SvStream&		Store( SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream &, sal_uInt16 nVersion ) const;
+    virtual SvStream&		Store( SvStream &, sal_uInt16 nItemVersion ) const;
 };
 
 
@@ -196,17 +196,17 @@ class SfxMsgPriorityItem : public SfxEnumItem
 public:
     TYPEINFO();
 
-    SfxMsgPriorityItem( USHORT nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL);
+    SfxMsgPriorityItem( sal_uInt16 nWhich, SfxMsgPriority = MSG_PRIORITY_NORMAL);
 
     virtual SfxPoolItem*	 	Clone( SfxItemPool* pPool=0 ) const;
-    virtual SfxPoolItem*	 	Create( SvStream&, USHORT ) const;
-    virtual SvStream&		 	Store( SvStream&, USHORT ) const;
+    virtual SfxPoolItem*	 	Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&		 	Store( SvStream&, sal_uInt16 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresentationMetric,
                                     String &rText ) const;
-    virtual USHORT			 	GetValueCount() const;
-    virtual String			 	GetValueTextByPos( USHORT nPos ) const;
+    virtual sal_uInt16			 	GetValueCount() const;
+    virtual String			 	GetValueTextByPos( sal_uInt16 nPos ) const;
 
     inline SfxMsgPriorityItem& operator=(const SfxMsgPriorityItem& rPrio)
     {
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 1e43b3eee2..a145673fa1 100644..100755
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -45,8 +45,8 @@ public:
     SfxObjectList();
     ~SfxObjectList();
 
-    const String&	GetBaseName( USHORT nId ) const;
-    const String&	GetFileName( USHORT nId ) const;
+    const String&	GetBaseName( sal_uInt16 nId ) const;
+    const String&	GetFileName( sal_uInt16 nId ) const;
 };
 
 class IntlWrapper;
@@ -67,8 +67,8 @@ private:
     SfxDocumentTemplates* 		pTemplates;
     SfxOrganizeListBox_Impl* 	pLeftBox;
     SfxOrganizeListBox_Impl* 	pRightBox;
-    BOOL						bDeleteTemplates	:1;
-    BOOL						bModified			:1;
+    sal_Bool						bDeleteTemplates	:1;
+    sal_Bool						bModified			:1;
 
     SfxOrganizeListBox_Impl*	GetOther( SfxOrganizeListBox_Impl* );
 
@@ -78,27 +78,27 @@ public:
                     SfxDocumentTemplates* pTempl = NULL );
     ~SfxOrganizeMgr();
 
-    BOOL	Copy( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx );
-    BOOL	Move( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx );
-    BOOL	Delete( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx );
-    BOOL	InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, USHORT nRegion );
-    BOOL	SetName( const String& rName, USHORT nRegion, USHORT nIdx = USHRT_MAX );
-    BOOL	CopyTo( USHORT nRegion, USHORT nIdx, const String& rName ) const;
-    BOOL	CopyFrom( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx, String& rName );
+    sal_Bool	Copy( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
+    sal_Bool	Move( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
+    sal_Bool	Delete( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx );
+    sal_Bool	InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, sal_uInt16 nRegion );
+    sal_Bool	SetName( const String& rName, sal_uInt16 nRegion, sal_uInt16 nIdx = USHRT_MAX );
+    sal_Bool	CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String& rName ) const;
+    sal_Bool	CopyFrom( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx, String& rName );
 
-    BOOL	Rescan();
-    BOOL	InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName );
+    sal_Bool	Rescan();
+    sal_Bool	InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName );
 
-    BOOL	IsModified() const { return bModified ? TRUE : FALSE; }
+    sal_Bool	IsModified() const { return bModified ? sal_True : sal_False; }
 
     const SfxDocumentTemplates*	GetTemplates() const { return pTemplates; }
     SfxObjectList&				GetObjectList() { return *pImpl->pDocList; }
     const SfxObjectList&		GetObjectList() const { return *pImpl->pDocList; }
 
-    SfxObjectShellRef	CreateObjectShell( USHORT nIdx );
-    SfxObjectShellRef	CreateObjectShell( USHORT nRegion, USHORT nIdx );
-    BOOL				DeleteObjectShell( USHORT );
-    BOOL				DeleteObjectShell( USHORT, USHORT );
+    SfxObjectShellRef	CreateObjectShell( sal_uInt16 nIdx );
+    SfxObjectShellRef	CreateObjectShell( sal_uInt16 nRegion, sal_uInt16 nIdx );
+    sal_Bool				DeleteObjectShell( sal_uInt16 );
+    sal_Bool				DeleteObjectShell( sal_uInt16, sal_uInt16 );
     void				SaveAll( Window* pParent );
 };
 
diff --git a/sfx2/inc/pch/precompiled_sfx2.cxx b/sfx2/inc/pch/precompiled_sfx2.cxx
index 01ca1c846a..01ca1c846a 100644..100755
--- a/sfx2/inc/pch/precompiled_sfx2.cxx
+++ b/sfx2/inc/pch/precompiled_sfx2.cxx
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 5bd28af472..5c4a41e7d6 100644..100755
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -545,7 +545,6 @@
 #include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
 #include "svl/poolitem.hxx"
 #include "svtools/printoptions.hxx"
 #include "unotools/printwarningoptions.hxx"
@@ -656,7 +655,7 @@
 #include "vcl/stdtext.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/unohelp.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "osl/diagnose.h"
 #include "osl/module.hxx"
 #include "osl/mutex.hxx"
diff --git a/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx
index 0bbbbdbe9c..0bbbbdbe9c 100644..100755
--- a/sfx2/inc/progind.hxx
+++ b/sfx2/inc/progind.hxx
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index a15abfa16a..6d323cb253 100644..100755
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/resmgr.hxx
@@ -43,30 +43,30 @@ class SfxResourceManager
 {
     SfxResMgrArr 				aResMgrArr;
     SfxResMgrArr 				aResMgrBmpArr;
-    USHORT		 				nEnterCount;
+    sal_uInt16		 				nEnterCount;
     SfxMessageTable*			pMessageTable;
 
 private:
     void						ClearMsgTable_Impl();
-    SfxMessageDescription*		MakeDesc_Impl(USHORT);
+    SfxMessageDescription*		MakeDesc_Impl(sal_uInt16);
 
 public:
                                 SfxResourceManager();
                                 ~SfxResourceManager();
 
-    USHORT						RegisterResource( const	char *pFileName);
-    void						ReleaseResource( USHORT	nRegisterId	);
+    sal_uInt16						RegisterResource( const	char *pFileName);
+    void						ReleaseResource( sal_uInt16	nRegisterId	);
 
-    USHORT						RegisterBitmap(const char *pMono, const char *pColor);
+    sal_uInt16						RegisterBitmap(const char *pMono, const char *pColor);
 
-    USHORT						RegisterBitmap(	const char *pSingleFile	);
-    void						ReleaseBitmap( USHORT nRegisterId );
+    sal_uInt16						RegisterBitmap(	const char *pSingleFile	);
+    void						ReleaseBitmap( sal_uInt16 nRegisterId );
 
-    Bitmap						GetAllBitmap( USHORT nBmpsPerRow );
+    Bitmap						GetAllBitmap( sal_uInt16 nBmpsPerRow );
 
     void						Enter();
     void						Leave();
-    SfxMessageDescription*		CreateDescription( USHORT nId );
+    SfxMessageDescription*		CreateDescription( sal_uInt16 nId );
 };
 
 
diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
index 4a8841437c..4a8841437c 100644..100755
--- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
+++ b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx
index 69e5231175..69e5231175 100644..100755
--- a/sfx2/inc/sfx2/Metadatable.hxx
+++ b/sfx2/inc/sfx2/Metadatable.hxx
diff --git a/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/sfx2/QuerySaveDocument.hxx
index bc4dbfc2d2..bc4dbfc2d2 100644..100755
--- a/sfx2/inc/QuerySaveDocument.hxx
+++ b/sfx2/inc/sfx2/QuerySaveDocument.hxx
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 38090e3546..38090e3546 100644..100755
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index b6cfd0e5d3..61cc6664f5 100644..100755
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -32,6 +32,7 @@
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
 #include <tools/solar.h>
+#include <tools/errcode.hxx>
 #include <svl/smplhint.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/image.hxx>
@@ -99,6 +100,8 @@ struct SfxStbCtrlFactory;
 struct SfxTbxCtrlFactory;
 class SimpleResMgr;
 class ModalDialog;
+class SbxArray;
+class SbxValue;
 
 typedef ::std::vector< SfxMedium* > SfxMediumList;
 
@@ -117,7 +120,7 @@ public:
     {   return new SfxLinkItem( *this ); }
     virtual int              operator==( const SfxPoolItem& rL) const
     {   return ((SfxLinkItem&)rL).aLink == aLink; }
-    SfxLinkItem( USHORT nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
+    SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
     {   aLink = rValue; }
     const Link&              GetValue() const { return aLink; }
 };
@@ -139,7 +142,7 @@ public:
     SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const;
     const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const;
     SfxPoolItem* Create(
-        const SvGlobalName& rName, USHORT nId, SvStream* pStrm = 0) const;
+        const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const;
     void         RegisterItemFactory(
         const SvGlobalName& rName, SfxItemCreateFunc );
 };
@@ -163,14 +166,13 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
     SfxAppData_Impl*            pAppData_Impl;
 
     DECL_DLLPRIVATE_LINK(       GlobalBasicErrorHdl_Impl, StarBASIC* );
-    SAL_DLLPRIVATE BOOL         SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
-    SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
-    SAL_DLLPRIVATE void			InitializeDisplayName_Impl();
+    SAL_DLLPRIVATE sal_Bool     SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False);
+    SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False);
 
     static SfxApplication*      Create();
     void                        Init();
     void                        Exit();
-    void                		SettingsChange( USHORT, const AppSettings & );
+    void                		SettingsChange( sal_uInt16, const AppSettings & );
     void                        Main( );
     void                		PreInit( );
     void                		Quit();
@@ -185,11 +187,9 @@ public:
     static SfxApplication*		GetOrCreate();
 
     // Resource Manager
-    bool                        InitLabelResMgr( const char* _pLabelPrefix, bool _bException = false );
     SfxResourceManager&         GetResourceManager() const;
     ResMgr*                     GetSfxResManager();
     SimpleResMgr*				GetSimpleResManager();
-    ResMgr*                     GetLabelResManager() const;
     static ResMgr*              CreateResManager( const char *pPrefix );
     SimpleResMgr*				CreateSimpleResManager();
 
@@ -202,14 +202,14 @@ public:
                                             const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
     ::sfx2::SvLinkSource*       DdeCreateLinkSource( const String& rItem );
-    BOOL                        InitializeDde();
+    sal_Bool                        InitializeDde();
     const DdeService*           GetDdeService() const;
     DdeService*                 GetDdeService();
     void                        AddDdeTopic( SfxObjectShell* );
     void                        RemoveDdeTopic( SfxObjectShell* );
 
     // "static" methods
-    ULONG                       LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, BOOL bCopy=TRUE, SfxItemSet* pArgs = 0 );
+    sal_uIntPtr                       LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 );
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
     SfxTemplateDialog*          GetTemplateDialog();
     Window*                     GetTopWindow() const;
@@ -219,40 +219,38 @@ public:
 
     // members
     SfxFilterMatcher&           GetFilterMatcher();
-    SfxMacroConfig*             GetMacroConfig() const;
     SfxProgress*                GetProgress() const;
     const String&               GetLastSaveDirectory() const;
-    USHORT                      GetFreeIndex();
-    void                        ReleaseIndex(USHORT i);
-    SfxEventConfiguration*      GetEventConfig() const;
+    sal_uInt16                  GetFreeIndex();
+    void                        ReleaseIndex(sal_uInt16 i);
 
     // Basic/Scripting
     static sal_Bool				IsXScriptURL( const String& rScriptURL );
     static ::rtl::OUString		ChooseScript();
-    static void         		MacroOrganizer( INT16 nTabId );
+    static void         		MacroOrganizer( sal_Int16 nTabId );
+    static ErrCode              CallBasic( const String&, BasicManager*, SbxArray *pArgs, SbxValue *pRet );
+    static ErrCode              CallAppBasic( const String& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL )
+                                { return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); }
     BasicManager*               GetBasicManager();
     com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
                                 GetDialogContainer();
     com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
                                 GetBasicContainer();
     StarBASIC*                  GetBasic();
-    USHORT                      SaveBasicManager() const;
-    USHORT                      SaveBasicAndDialogContainer() const;
-    void                        EnterBasicCall();
-    bool                        IsInBasicCall() const;
-    void                        LeaveBasicCall();
+    sal_uInt16                  SaveBasicManager() const;
+    sal_uInt16                  SaveBasicAndDialogContainer() const;
 
     // misc.
-    BOOL                        GetOptions(SfxItemSet &);
+    sal_Bool                        GetOptions(SfxItemSet &);
     void                        SetOptions(const SfxItemSet &);
-    virtual void                Invalidate(USHORT nId = 0);
+    virtual void                Invalidate(sal_uInt16 nId = 0);
     void                        NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
-    BOOL                        IsDowning() const;
-    BOOL                        IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
+    sal_Bool                        IsDowning() const;
+    sal_Bool                        IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
     static SfxObjectShellRef    DocAlreadyLoaded( const String &rName,
-                                                  BOOL bSilent,
-                                                  BOOL bActivate,
-                                                  BOOL bForbidVisible = FALSE,
+                                                  sal_Bool bSilent,
+                                                  sal_Bool bActivate,
+                                                  sal_Bool bForbidVisible = sal_False,
                                                   const String* pPostStr = 0);
     void                        ResetLastDir();
 
@@ -260,7 +258,7 @@ public:
     SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
     SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
 
-    SAL_DLLPRIVATE BOOL    		QueryExit_Impl();
+    SAL_DLLPRIVATE sal_Bool    		QueryExit_Impl();
     SAL_DLLPRIVATE void         SetOptions_Impl(const SfxItemSet &);
     SAL_DLLPRIVATE bool         Initialize_Impl();
 
@@ -268,7 +266,7 @@ public:
 
     // Object-Factories/global arrays
     SAL_DLLPRIVATE void         RegisterChildWindow_Impl(SfxModule*, SfxChildWinFactory*);
-    SAL_DLLPRIVATE void         RegisterChildWindowContext_Impl(SfxModule*, USHORT, SfxChildWinContextFactory*);
+    SAL_DLLPRIVATE void         RegisterChildWindowContext_Impl(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
     SAL_DLLPRIVATE void         RegisterStatusBarControl_Impl(SfxModule*, SfxStbCtrlFactory*);
     SAL_DLLPRIVATE void         RegisterMenuControl_Impl(SfxModule*, SfxMenuCtrlFactory*);
     SAL_DLLPRIVATE void         RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*);
@@ -290,8 +288,6 @@ public:
     SAL_DLLPRIVATE void         MiscState_Impl(SfxItemSet &);
     SAL_DLLPRIVATE void         PropExec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void         PropState_Impl(SfxItemSet &);
-    SAL_DLLPRIVATE void         MacroExec_Impl(SfxRequest &);
-    SAL_DLLPRIVATE void         MacroState_Impl(SfxItemSet &);
     SAL_DLLPRIVATE void         INetExecute_Impl(SfxRequest &);
     SAL_DLLPRIVATE void         INetState_Impl(SfxItemSet &);
     SAL_DLLPRIVATE void         OfaExec_Impl(SfxRequest &);
@@ -300,7 +296,6 @@ public:
     SAL_DLLPRIVATE void         SetProgress_Impl(SfxProgress *);
     SAL_DLLPRIVATE const String& GetLastDir_Impl() const;
     SAL_DLLPRIVATE void         SetLastDir_Impl( const String & );
-    SAL_DLLPRIVATE void         PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas );
 
     SAL_DLLPRIVATE void         EnterAsynchronCall_Impl();
     SAL_DLLPRIVATE bool         IsInAsynchronCall_Impl() const;
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index f614142bbc..f614142bbc 100644..100755
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 0d66d88c27..44fa49d2d5 100644..100755
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -66,7 +66,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
 {
     sal_uInt32				nUniqId;
     String					aExtraData;
-    Timer					aTimer;
     const SfxItemSet*		pInputSet;
     SfxItemSet*				pOutputSet;
 
@@ -74,8 +73,6 @@ private:
     SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined
     SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined
 
-    DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* );
-
     SAL_DLLPRIVATE void SetDialogData_Impl();
     SAL_DLLPRIVATE void GetDialogData_Impl();
     SAL_DLLPRIVATE void init();
@@ -115,7 +112,7 @@ protected:
                             SfxModelessDialog( SfxBindings*, SfxChildWindow*,
                                 Window*, WinBits nWinStyle = WB_STDMODELESS );
                             ~SfxModelessDialog();
-    virtual BOOL			Close();
+    virtual sal_Bool			Close();
     virtual void			Resize();
     virtual void            Move();
     virtual void            StateChanged( StateChangedType nStateChange );
@@ -154,7 +151,7 @@ protected:
                             ~SfxFloatingWindow();
 
     virtual void            StateChanged( StateChangedType nStateChange );
-    virtual BOOL			Close();
+    virtual sal_Bool			Close();
     virtual void			Resize();
     virtual void            Move();
     virtual long			Notify( NotifyEvent& rNEvt );
@@ -186,14 +183,14 @@ struct SingleTabDlgImpl
         m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ), m_pInfoImage( NULL ) {}
 };
 
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
 
 class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
 {
 public:
-    SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
-    SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const SfxItemSet* pInSet = 0 );
-    SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const String& rInfoURL );
+    SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
+    SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 );
+    SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL );
 
     virtual             ~SfxSingleTabDialog();
 
@@ -201,7 +198,7 @@ public:
     void                SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 );
     SfxTabPage*         GetTabPage() const { return pImpl->m_pSfxPage; }
 
-    const USHORT*		GetInputRanges( const SfxItemPool& rPool );
+    const sal_uInt16*		GetInputRanges( const SfxItemPool& rPool );
 //	void				SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; }
 //	const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
     OKButton*			GetOKButton() const { return pOKBtn; }
@@ -210,7 +207,7 @@ public:
 
 private:
     GetTabPageRanges    fnGetRanges;
-    USHORT*				pRanges;
+    sal_uInt16*				pRanges;
 
     OKButton*			pOKBtn;
     CancelButton*		pCancelBtn;
diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/sfx2/basmgr.hxx
index 4af881065e..291cad0afd 100644..100755
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/sfx2/basmgr.hxx
@@ -30,6 +30,7 @@
 #define _SFX_BASMGR_HXX
 
 #include <basic/basmgr.hxx>
+#include <svtools/svtools.hrc>
 
 #endif	//_SFX_BASMGR_HXX
 
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 8a60557653..3d0da52c18 100644..100755
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -120,7 +120,7 @@ friend class SfxBindings_Impl;
 
 private:
     SAL_DLLPRIVATE const SfxPoolItem*  Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
-                                    SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE);
+                                    SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False);
     SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
     SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren
     SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache,
@@ -200,18 +200,18 @@ public:
     SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId );
     SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); }
     SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding );
-    SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, BOOL );
+    SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, sal_Bool );
     SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const;
     SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
     SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( sal_Bool bTop = sal_False ) const;
     SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
     SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
     SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
-    SAL_DLLPRIVATE BOOL ExecuteCommand_Impl( const String& rCommand );
+    SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand );
     SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
-    SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId );
+    SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId );
     SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
-    SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId );
+    SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
 };
 
 #ifdef DBG_UTIL
diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/sfx2/inc/sfx2/brokenpackageint.hxx
new file mode 100755
index 0000000000..cadd5bd3e6
--- /dev/null
+++ b/sfx2/inc/sfx2/brokenpackageint.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * 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 "sal/config.h"
+#include "sfx2/dllapi.h"
+#include <com/sun/star/document/BrokenPackageRequest.hpp>
+#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/task/XInteractionDisapprove.hpp>
+
+class RequestPackageReparation_Impl;             
+class SFX2_DLLPUBLIC RequestPackageReparation
+{
+    RequestPackageReparation_Impl* pImp;
+public:
+    RequestPackageReparation( ::rtl::OUString aName );  
+    ~RequestPackageReparation();  
+    sal_Bool    isApproved();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+}; 
+
+class NotifyBrokenPackage_Impl;
+class SFX2_DLLPUBLIC NotifyBrokenPackage
+{
+    NotifyBrokenPackage_Impl* pImp;
+public:
+    NotifyBrokenPackage( ::rtl::OUString aName );
+    ~NotifyBrokenPackage();
+    sal_Bool    isAborted();
+    com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+};  
+
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 279a192c43..fd62dc4848 100644..100755
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/sfx2/inc/sfx2/chalign.hxx
@@ -56,7 +56,7 @@ enum SfxChildAlignment
 };
 
 // "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird
-inline BOOL SfxChildAlignValid( SfxChildAlignment eAlign )
+inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign )
 {
     return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT );
 }
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index ca2563075f..8fda445b56 100644..100755
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -153,7 +153,7 @@ public:
 
     virtual void        Resizing( Size& rSize );
     virtual sal_Bool		Close();
-    static void         RegisterChildWindowContext(SfxModule*, USHORT, SfxChildWinContextFactory*);
+    static void         RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*);
 };
 
 class SFX2_DLLPUBLIC SfxChildWindow
@@ -192,7 +192,7 @@ public:
     Point				GetPosPixel()
                         { return pWindow->GetPosPixel(); }
     virtual void				Hide();
-    virtual void                Show( USHORT nFlags );
+    virtual void                Show( sal_uInt16 nFlags );
     sal_uInt16          GetFlags() const
                         { return GetInfo().nFlags; }
     sal_Bool				CanGetFocus() const;
@@ -220,7 +220,7 @@ public:
     void				SetHideAtToggle( sal_Bool bOn );
     sal_Bool				IsHideAtToggle() const;
     sal_Bool				IsVisible() const;
-    void				SetWantsFocus( BOOL );
+    void				SetWantsFocus( sal_Bool );
     sal_Bool			WantsFocus() const;
 
     virtual sal_Bool	QueryClose();
@@ -259,7 +259,7 @@ public:
                 SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
         {	\
             SfxChildWindowContext *pContext = new Class(pParent, \
-                    /* cast is safe here! */static_cast< USHORT >(ShellClass::GetInterfaceId()), \
+                    /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()), \
                     pBindings,pInfo); \
             return pContext; \
         } \
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index 80e0265ff3..80e0265ff3 100644..100755
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 272536039d..bc31a709c9 100644..100755
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.hxx
@@ -49,9 +49,9 @@ namespace sfx {
 // ============================================================================
 
 /** List position type of VCL ListBox. */
-typedef USHORT ListBoxPosType;
+typedef sal_uInt16 ListBoxPosType;
 /** List position type of SVTOOLS ValueSet. */
-typedef USHORT ValueSetPosType;
+typedef sal_uInt16 ValueSetPosType;
 
 // ============================================================================
 // Helpers
@@ -246,7 +246,7 @@ public:
 
 /** A wrapper for the VCL CheckBox. */
 class SFX2_DLLPUBLIC CheckBoxWrapper:
-    public SingleControlWrapper< CheckBox, BOOL >
+    public SingleControlWrapper< CheckBox, sal_Bool >
 {
 public:
     explicit            CheckBoxWrapper( CheckBox& rCheckBox );
@@ -254,8 +254,8 @@ public:
     virtual bool        IsControlDontKnow() const;
     virtual void        SetControlDontKnow( bool bSet );
 
-    virtual BOOL        GetControlValue() const;
-    virtual void        SetControlValue( BOOL bValue );
+    virtual sal_Bool        GetControlValue() const;
+    virtual void        SetControlValue( sal_Bool bValue );
 };
 
 // ----------------------------------------------------------------------------
@@ -316,13 +316,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef NumericFieldWrapper< INT16 >  Int16NumericFieldWrapper;
-typedef NumericFieldWrapper< UINT16 > UInt16NumericFieldWrapper;
-typedef NumericFieldWrapper< INT32 >  Int32NumericFieldWrapper;
-typedef NumericFieldWrapper< UINT32 > UInt32NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_Int16 >  Int16NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_Int32 >  Int32NumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper;
 
-typedef NumericFieldWrapper< USHORT > UShortNumericFieldWrapper;
-typedef NumericFieldWrapper< ULONG >  ULongNumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper;
+typedef NumericFieldWrapper< sal_uIntPtr >  ULongNumericFieldWrapper;
 
 // ============================================================================
 
@@ -351,13 +351,13 @@ private:
 
 // ----------------------------------------------------------------------------
 
-typedef MetricFieldWrapper< INT16 >  Int16MetricFieldWrapper;
-typedef MetricFieldWrapper< UINT16 > UInt16MetricFieldWrapper;
-typedef MetricFieldWrapper< INT32 >  Int32MetricFieldWrapper;
-typedef MetricFieldWrapper< UINT32 > UInt32MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_Int16 >  Int16MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_Int32 >  Int32MetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper;
 
-typedef MetricFieldWrapper< USHORT > UShortMetricFieldWrapper;
-typedef MetricFieldWrapper< ULONG >  ULongMetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper;
+typedef MetricFieldWrapper< sal_uIntPtr >  ULongMetricFieldWrapper;
 
 // ============================================================================
 
@@ -393,13 +393,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ListBoxWrapper< INT16 >  Int16ListBoxWrapper;
-typedef ListBoxWrapper< UINT16 > UInt16ListBoxWrapper;
-typedef ListBoxWrapper< INT32 >  Int32ListBoxWrapper;
-typedef ListBoxWrapper< UINT32 > UInt32ListBoxWrapper;
+typedef ListBoxWrapper< sal_Int16 >  Int16ListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper;
+typedef ListBoxWrapper< sal_Int32 >  Int32ListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper;
 
-typedef ListBoxWrapper< USHORT > UShortListBoxWrapper;
-typedef ListBoxWrapper< ULONG >  ULongListBoxWrapper;
+typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper;
+typedef ListBoxWrapper< sal_uIntPtr >  ULongListBoxWrapper;
 
 // ============================================================================
 
@@ -435,13 +435,13 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ValueSetWrapper< INT16 >  Int16ValueSetWrapper;
-typedef ValueSetWrapper< UINT16 > UInt16ValueSetWrapper;
-typedef ValueSetWrapper< INT32 >  Int32ValueSetWrapper;
-typedef ValueSetWrapper< UINT32 > UInt32ValueSetWrapper;
+typedef ValueSetWrapper< sal_Int16 >  Int16ValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper;
+typedef ValueSetWrapper< sal_Int32 >  Int32ValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper;
 
-typedef ValueSetWrapper< USHORT > UShortValueSetWrapper;
-typedef ValueSetWrapper< ULONG >  ULongValueSetWrapper;
+typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper;
+typedef ValueSetWrapper< sal_uIntPtr >  ULongValueSetWrapper;
 
 // ============================================================================
 // Multi control wrappers
@@ -640,7 +640,7 @@ ValueT ListBoxWrapper< ValueT >::GetControlValue() const
 template< typename ValueT >
 void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    USHORT nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectEntryPos( nPos );
 }
@@ -656,7 +656,7 @@ ValueT ValueSetWrapper< ValueT >::GetControlValue() const
 template< typename ValueT >
 void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue )
 {
-    USHORT nPos = GetPosFromValue( nValue );
+    sal_uInt16 nPos = GetPosFromValue( nValue );
     if( nPos != this->GetNotFoundPos() )
         this->GetControl().SelectItem( nPos );
 }
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index 8b293995f3..f38516eee5 100644..100755
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -40,14 +40,14 @@ class SvStream;
 class SFX2_DLLPUBLIC SfxControllerItem
 {
 private:
-    USHORT				nId;
+    sal_uInt16				nId;
     SfxControllerItem*	pNext; // zu benachrichtigendes weiteres ControllerItem
     SfxBindings*		pBindings;
 
 protected:
 //#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE )
 #if defined( DBG_UTIL )
-    SAL_DLLPRIVATE void CheckConfigure_Impl( ULONG nType );
+    SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType );
 #endif
 
 public:
@@ -61,13 +61,13 @@ public:
                         }
 
                         SfxControllerItem(); // fuer arrays
-                        SfxControllerItem( USHORT nId, SfxBindings & );
+                        SfxControllerItem( sal_uInt16 nId, SfxBindings & );
     virtual 			~SfxControllerItem();
 
-    void				Bind( USHORT nNewId, SfxBindings * = 0);	// in SfxBindings registrieren
+    void				Bind( sal_uInt16 nNewId, SfxBindings * = 0);	// in SfxBindings registrieren
     void				UnBind();
     void				ReBind();
-    BOOL				IsBound() const;
+    sal_Bool				IsBound() const;
     void				UpdateSlot();
     void				ClearCache();
     void				SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; }
@@ -75,10 +75,10 @@ public:
     SfxControllerItem*	GetItemLink();
     SfxControllerItem*	ChangeItemLink( SfxControllerItem* pNewLink );
 
-    void                SetId( USHORT nItemId );
-    USHORT				GetId() const { return nId; }
+    void                SetId( sal_uInt16 nItemId );
+    sal_uInt16				GetId() const { return nId; }
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     virtual void        DeleteFloatingWindow();
 
@@ -86,9 +86,9 @@ public:
 
     static SfxItemState	GetItemState( const SfxPoolItem* pState );
 
-    SAL_DLLPRIVATE BOOL IsBindable_Impl() const
+    SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const
                         { return pBindings != NULL; }
-    SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* );
+    SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
 };
 
 //====================================================================
@@ -98,11 +98,11 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem
     SfxControllerItem*		pMaster;
 
 protected:
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
 
 public:
-                            SfxStatusForwarder( USHORT nSlotId,
+                            SfxStatusForwarder( sal_uInt16 nSlotId,
                                    SfxControllerItem&rMaster );
 };
 
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 653bf74647..653bf74647 100644..100755
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index cc7687adf3..cbeb4b37d0 100644..100755
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -163,8 +163,8 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual	bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool		PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool		PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 // class SfxDocumentPage -------------------------------------------------
@@ -208,7 +208,7 @@ private:
     String                      aUnknownSize;
     String                      aMultiSignedStr;
 
-    BOOL                        bEnableUseUserData  : 1,
+    sal_Bool                        bEnableUseUserData  : 1,
                                 bHandleDelete       : 1;
 
     DECL_LINK(          DeleteHdl, PushButton * );
@@ -218,7 +218,7 @@ private:
 protected:
     SfxDocumentPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL		FillItemSet( SfxItemSet& );
+    virtual sal_Bool		FillItemSet( SfxItemSet& );
     virtual void		Reset( const SfxItemSet& );
 
 public:
@@ -245,7 +245,7 @@ private:
 protected:
     SfxDocumentDescPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL        	FillItemSet( SfxItemSet& );
+    virtual sal_Bool        	FillItemSet( SfxItemSet& );
     virtual void        	Reset( const SfxItemSet& );
 
 public:
@@ -290,9 +290,9 @@ private:
 
     void					ChangeState( STATE eNewState );		// S_Init is not a valid value here
                                                                 // also checks corresponding radiobutton
-    void					EnableNoUpdate( BOOL bEnable );
-    void					EnableReload( BOOL bEnable );
-    void					EnableForward( BOOL bEnable );
+    void					EnableNoUpdate( sal_Bool bEnable );
+    void					EnableReload( sal_Bool bEnable );
+    void					EnableForward( sal_Bool bEnable );
 
     DECL_LINK( ClickHdlNoUpdate, Control* );
     DECL_LINK( ClickHdlReload, Control* );
@@ -306,7 +306,7 @@ protected:
     SfxInternetPage( Window* pParent, const SfxItemSet& );
     ~SfxInternetPage();
 
-    virtual BOOL			FillItemSet( SfxItemSet& );
+    virtual sal_Bool			FillItemSet( SfxItemSet& );
     virtual void			Reset( const SfxItemSet& );
     virtual int                     DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -319,7 +319,7 @@ public:
 class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog
 {
 protected:
-    virtual void	PageCreated( USHORT nId, SfxTabPage& rPage );
+    virtual void	PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
 
 public:
     SfxDocumentInfoDialog(	Window* pParent, const SfxItemSet& );
@@ -430,7 +430,7 @@ public:
 
     inline void     CheckYes() { m_aYesButton.Check(); }
     inline void     CheckNo() { m_aNoButton.Check(); }
-    inline bool     IsYesChecked() const { return m_aYesButton.IsChecked() != FALSE; }
+    inline bool     IsYesChecked() const { return m_aYesButton.IsChecked() != sal_False; }
 };
 
 // struct CustomPropertyLine ---------------------------------------------
@@ -502,7 +502,7 @@ public:
     ~CustomPropertiesWindow();
 
     void                InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
-    USHORT              GetVisibleLineCount() const;
+    sal_uInt16              GetVisibleLineCount() const;
     inline sal_Int32    GetLineHeight() const { return m_nLineHeight; }
     void                AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny );
     bool                AreAllLinesValid() const;
@@ -552,9 +552,9 @@ public:
 class SfxCustomPropertiesPage : public SfxTabPage
 {
 private:
-    FixedText               m_aPropertiesFT;
     CustomPropertiesControl m_aPropertiesCtrl;
     PushButton              m_aAddBtn;
+    FixedText               m_aPropertiesFT; // Sym2_5121----, Moved by Steve Yin
 
     DECL_LINK(  AddHdl, PushButton* );
 
@@ -563,7 +563,7 @@ private:
 protected:
     SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& );
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
 
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index 8d5827c4b6..8d5827c4b6 100644..100755
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.hxx
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 1578bf7692..b3d17457b4 100644..100755
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -83,23 +83,23 @@ typedef SfxItemPtrArray SfxItemArray_Impl;
 
 class SfxExecuteItem : public SfxItemPtrArray, public SfxPoolItem
 {
-    USHORT nSlot;
+    sal_uInt16 nSlot;
     SfxCallMode eCall;
-    USHORT nModifier;
+    sal_uInt16 nModifier;
 public:
-    USHORT                   GetSlot() const { return nSlot; }
-    USHORT                   GetModifier() const { return nModifier; }
-    void                     SetModifier( USHORT nModifierP ) { nModifier = nModifierP; }
+    sal_uInt16                   GetSlot() const { return nSlot; }
+    sal_uInt16                   GetModifier() const { return nModifier; }
+    void                     SetModifier( sal_uInt16 nModifierP ) { nModifier = nModifierP; }
     SfxCallMode              GetCallMode() const { return eCall; }
     void                     SetCallMode( SfxCallMode eMode ) { eCall = eMode; }
     virtual int 			 operator==( const SfxPoolItem& ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
                              SfxExecuteItem(
-                                 USHORT nWhich, USHORT nSlot, SfxCallMode eMode,
+                                 sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode,
                                  const SfxPoolItem *pArg1, ... );
                              SfxExecuteItem(
-                                 USHORT nWhich, USHORT nSlot, SfxCallMode eMode );
+                                 sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode );
                              SfxExecuteItem( const SfxExecuteItem& );
 };
 
@@ -108,11 +108,11 @@ public:
 class SFX2_DLLPUBLIC SfxDispatcher
 {
     SfxDispatcher_Impl* 			pImp;
-    BOOL							bFlushed;
+    sal_Bool							bFlushed;
 
 private:
     // auf temporaer ausgewerteten Todos suchen
-    SAL_DLLPRIVATE BOOL CheckVirtualStack( const SfxShell& rShell, BOOL bDeep );
+    SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep );
 
 #ifndef _SFX_HXX
 
@@ -122,8 +122,8 @@ friend class SfxViewFrame;
     DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * );
     DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
 
-    SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
-    SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
+    SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord );
+    SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*);
     SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
 
 protected:
@@ -133,15 +133,15 @@ friend class SfxPopupMenuManager;
 friend class SfxHelp;
                         // Fuer die Bindings: Finden einer Message; Level fuer
                         // erneuten Zugriff
-    SAL_DLLPRIVATE BOOL _TryIntercept_Impl( USHORT nId, SfxSlotServer &rServer, BOOL bModal );
-    BOOL				_FindServer( USHORT nId, SfxSlotServer &rServer, BOOL bModal );
-    BOOL				_FillState( const SfxSlotServer &rServer,
+    SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
+    sal_Bool				_FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
+    sal_Bool				_FillState( const SfxSlotServer &rServer,
                                     SfxItemSet &rState, const SfxSlot *pRealSlot );
     const SfxPoolItem*	_Execute( const SfxSlotServer &rServer );
     void				_Execute( SfxShell &rShell, const SfxSlot &rSlot,
                                   SfxRequest &rReq,
                                   SfxCallMode eCall = SFX_CALLMODE_STANDARD);
-    const SfxPoolItem*	_Execute( USHORT nSlot, SfxCallMode eCall,
+    const SfxPoolItem*	_Execute( sal_uInt16 nSlot, SfxCallMode eCall,
                                   va_list pArgs, const SfxPoolItem *pArg1 );
 
 #endif
@@ -157,48 +157,48 @@ public:
     virtual				~SfxDispatcher();
 
     const SfxPoolItem*  Execute( const SfxExecuteItem& rItem );
-    virtual	USHORT		ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs=0, USHORT nMode=0 );
-    USHORT              ExecuteFunction( USHORT nSID, const SfxItemSet& rArgs , USHORT nMode=0 );
+    virtual	sal_uInt16		ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs=0, sal_uInt16 nMode=0 );
+    sal_uInt16              ExecuteFunction( sal_uInt16 nSID, const SfxItemSet& rArgs , sal_uInt16 nMode=0 );
 
-    virtual void		SetExecuteMode( USHORT );
+    virtual void		SetExecuteMode( sal_uInt16 );
 
-    const SfxPoolItem*	Execute( USHORT nSlot,
+    const SfxPoolItem*	Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall = SFX_CALLMODE_SLOT,
                                  const SfxPoolItem **pArgs = 0,
-                                 USHORT nModi = 0,
+                                 sal_uInt16 nModi = 0,
                                  const SfxPoolItem **pInternalArgs = 0);
 
-    const SfxPoolItem*	Execute( USHORT nSlot,
+    const SfxPoolItem*	Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  SfxItemSet* pArgs,
                                  SfxItemSet* pInternalArgs,
-                                 USHORT nModi = 0);
+                                 sal_uInt16 nModi = 0);
 
-    const SfxPoolItem*	Execute( USHORT nSlot,
+    const SfxPoolItem*	Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  const SfxPoolItem *pArg1, ... );
 
-    const SfxPoolItem*	Execute( USHORT nSlot,
+    const SfxPoolItem*	Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
                                  const SfxItemSet &rArgs );
 
-    const SfxPoolItem*  Execute( USHORT nSlot,
+    const SfxPoolItem*  Execute( sal_uInt16 nSlot,
                                  SfxCallMode nCall,
-                                 USHORT nModi,
+                                 sal_uInt16 nModi,
                                  const SfxItemSet &rArgs );
 
-    USHORT				GetSlotId( const String& rCommand );
+    sal_uInt16				GetSlotId( const String& rCommand );
     const SfxSlot*      GetSlot( const String& rCommand );
 
-    BOOL				IsActive( const SfxShell& rShell );
-    BOOL				IsOnTop( const SfxShell& rShell );
-    USHORT				GetShellLevel( const SfxShell &rShell );
+    sal_Bool				IsActive( const SfxShell& rShell );
+    sal_Bool				IsOnTop( const SfxShell& rShell );
+    sal_uInt16				GetShellLevel( const SfxShell &rShell );
     SfxBindings*		GetBindings() const;
 
     void				Push( SfxShell& rShell );
-    void				Pop( SfxShell& rShell, USHORT nMode = 0 );
+    void				Pop( SfxShell& rShell, sal_uInt16 nMode = 0 );
 
-    SfxShell*			GetShell(USHORT nIdx) const;
+    SfxShell*			GetShell(sal_uInt16 nIdx) const;
     SfxViewFrame*       GetFrame() const;
     SfxModule*		GetModule() const;
     // caller has to clean up the Manager on his own
@@ -206,63 +206,60 @@ public:
 
     void				ExecutePopup( const ResId &rId,
                               Window *pWin = 0, const Point *pPosPixel = 0 );
-    static void 		ExecutePopup( USHORT nConfigId = 0,
+    static void 		ExecutePopup( sal_uInt16 nConfigId = 0,
                               Window *pWin = 0, const Point *pPosPixel = 0 );
-    static void 		ExecutePopup( USHORT nConfigId,
+    static void 		ExecutePopup( sal_uInt16 nConfigId,
                                       Window *pWin, const Point *pPosPixel,
                                       const SfxPoolItem *pArg1, ...  );
 
-    void				EnterAction( const String& rName );
-    void				LeaveAction();
-
-    BOOL				IsAppDispatcher() const;
-    BOOL				IsFlushed() const;
+    sal_Bool			IsAppDispatcher() const;
+    sal_Bool			IsFlushed() const;
     void				Flush();
-    void				Lock( BOOL bLock );
-    BOOL				IsLocked( USHORT nSID = 0 ) const;
-    void				SetSlotFilter( BOOL bEnable = FALSE,
-                                       USHORT nCount = 0, const USHORT *pSIDs = 0 );
+    void				Lock( sal_Bool bLock );
+    sal_Bool				IsLocked( sal_uInt16 nSID = 0 ) const;
+    void				SetSlotFilter( sal_Bool bEnable = sal_False,
+                                       sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 );
 
-    void				HideUI( BOOL bHide = TRUE );
-    void				ShowObjectBar(USHORT nId, SfxShell *pShell=0) const;
-    sal_uInt32			GetObjectBarId( USHORT nPos ) const;
+    void				HideUI( sal_Bool bHide = sal_True );
+    void				ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const;
+    sal_uInt32			GetObjectBarId( sal_uInt16 nPos ) const;
 
-    SfxItemState		QueryState( USHORT nSID, const SfxPoolItem* &rpState );
-    SfxItemState        QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny );
+    SfxItemState		QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState );
+    SfxItemState        QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny );
 
-    BOOL                IsAllowed( USHORT nSlot ) const;
+    sal_Bool                IsAllowed( sal_uInt16 nSlot ) const;
     ::com::sun::star::frame::XDispatch*          GetDispatchInterface( const String& );
     void				SetDisableFlags( sal_uInt32 nFlags );
     sal_uInt32				GetDisableFlags() const;
 
-    SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
+    SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 );
     SAL_DLLPRIVATE void SetMenu_Impl();
-    SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
-    SAL_DLLPRIVATE BOOL IsUpdated_Impl() const;
+    SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc.
+    SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
     SAL_DLLPRIVATE void DebugOutput_Impl() const;
     SAL_DLLPRIVATE void ResetObjectBars_Impl();
-    SAL_DLLPRIVATE int GetShellAndSlot_Impl( USHORT nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
-                                              BOOL bOwnShellsOnly, BOOL bModal, BOOL bRealSlot=TRUE );
-    SAL_DLLPRIVATE void LockUI_Impl( BOOL bLock = TRUE );
-    SAL_DLLPRIVATE void SetReadOnly_Impl( BOOL  bOn );
-    SAL_DLLPRIVATE BOOL GetReadOnly_Impl() const;
-    SAL_DLLPRIVATE BOOL IsSlotEnabledByFilter_Impl( USHORT nSID ) const;
-    SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL bOn );
-    SAL_DLLPRIVATE void SetModalMode_Impl( BOOL bOn );
-    SAL_DLLPRIVATE BOOL IsReadOnlyShell_Impl( USHORT nShell ) const;
+    SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
+                                              sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True );
+    SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True );
+    SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool  bOn );
+    SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const;
+    SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
     SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
-    SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, USHORT nPos );
+    SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos );
     SAL_DLLPRIVATE void DoParentActivate_Impl();
     SAL_DLLPRIVATE void DoParentDeactivate_Impl();
-    SAL_DLLPRIVATE void DoActivate_Impl( BOOL bMDI, SfxViewFrame* pOld );
-    SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew );
-    SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL);
-    SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr );
+    SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld );
+    SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew );
+    SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool);
+    SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, String *pStr );
 };
 
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsFlushed() const
+inline sal_Bool SfxDispatcher::IsFlushed() const
 
 /*	[Beschreibung]
 
@@ -283,9 +280,9 @@ inline void SfxDispatcher::Flush()
 
     Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus.
     F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird
-    <SfxShell::Activate(BOOL)> mit bMDI == TRUE aufgerufen, f"ur
-    SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(BOOL)>
-    mit bMDI == TRUE aufgerufen.
+    <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur
+    SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)>
+    mit bMDI == sal_True aufgerufen.
 */
 
 {
@@ -312,7 +309,7 @@ inline void SfxDispatcher::Push( SfxShell& rShell )
 
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell )
+inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell )
 
 /*	[Beschreibung]
 
@@ -321,22 +318,22 @@ inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell )
 
     [R"uckgabewert]
 
-    BOOL				TRUE
+    sal_Bool				sal_True
                         Die SfxShell-Instanz befindet sich auf dem
                         SfxDispatcher.
 
-                        FALSE
+                        sal_False
                         Die SfxShell-Instanz befindet sich nicht auf dem
                         SfxDispatcher.
 
 */
 
 {
-    return CheckVirtualStack( rShell, TRUE );
+    return CheckVirtualStack( rShell, sal_True );
 }
 //--------------------------------------------------------------------
 
-inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
+inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell )
 
 /*  [Beschreibung]
 
@@ -345,18 +342,18 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
 
     [R"uckgabewert]
 
-    BOOL				TRUE
+    sal_Bool				sal_True
                         Die SfxShell-Instanz befindet sich als oberste
                         SfxShell auf dem SfxDispatcher.
 
-                        FALSE
+                        sal_False
                         Die SfxShell-Instanz befindet sich nicht als
                         oberste SfxShell auf dem SfxDispatcher.
 
 */
 
 {
-    return CheckVirtualStack( rShell, FALSE );
+    return CheckVirtualStack( rShell, sal_False );
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/dllapi.h b/sfx2/inc/sfx2/dllapi.h
index b9c9cf5962..b9c9cf5962 100644..100755
--- a/sfx2/inc/sfx2/dllapi.h
+++ b/sfx2/inc/sfx2/dllapi.h
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 17c29a761c..24268437a4 100644..100755
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -88,12 +88,12 @@ public:
     String          GetModuleName() const;
     void			SetDocumentTypeNameResource( const ResId& rId );
     String			GetDocumentTypeName() const;
-    SfxFilterContainer *GetFilterContainer( BOOL bForceLoad = TRUE) const;
+    SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const;
 
     // Views
     void			RegisterViewFactory(SfxViewFactory &rFactory);
-    USHORT			GetViewFactoryCount() const;
-    SfxViewFactory& GetViewFactory(USHORT i = 0) const;
+    sal_uInt16			GetViewFactoryCount() const;
+    SfxViewFactory& GetViewFactory(sal_uInt16 i = 0) const;
 
     /// returns the view factory whose GetAPIViewName or GetLegacyViewName delivers the requested logical name
     SfxViewFactory* GetViewFactoryByViewName( const String& i_rViewName ) const;
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 7a2bc060d6..dc11131c56 100644..100755
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -64,7 +64,6 @@ class Timer;
 class SfxItemSet;
 class DateTime;
 class SvStringsDtor;
-class SvEaMgr;
 
 #define S2BS(s) ByteString( s, RTL_TEXTENCODING_MS_1252 )
 
@@ -78,7 +77,6 @@ class SvEaMgr;
 #define	OWEAKOBJECT					::cppu::OWeakObject
 #define	REFERENCE					::com::sun::star::uno::Reference
 #define	XINTERFACE					::com::sun::star::uno::XInterface
-#define	SEQUENCE					::com::sun::star::uno::Sequence
 #define	EXCEPTION					::com::sun::star::uno::Exception
 #define	RUNTIMEEXCEPTION			::com::sun::star::uno::RuntimeException
 #define	ANY							::com::sun::star::uno::Any
@@ -114,7 +112,7 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
     SAL_DLLPRIVATE void CloseStreams_Impl();
     DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * );
 
-    SAL_DLLPRIVATE void SetPasswordToStorage_Impl();
+    SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl();
 #endif
 
 public:
@@ -124,7 +122,7 @@ public:
                         SfxMedium();
                         SfxMedium( const String &rName,
                                    StreamMode nOpenMode,
-                                   sal_Bool bDirect=FALSE,
+                                   sal_Bool bDirect=sal_False,
                                    const SfxFilter *pFilter = 0,
                                    SfxItemSet *pSet = 0 );
 
@@ -138,7 +136,7 @@ public:
 
                         ~SfxMedium();
 
-    void                UseInteractionHandler( BOOL );
+    void                UseInteractionHandler( sal_Bool );
     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
                         GetInteractionHandler();
 
@@ -204,8 +202,6 @@ public:
     SvStream*           GetInStream();
     SvStream*           GetOutStream();
 
-    SvEaMgr*			GetEaMgr();
-
     sal_Bool            Commit();
     sal_Bool            IsStorage();
 
@@ -239,7 +235,7 @@ public:
     ::rtl::OUString     GetBaseURL( bool bForSaving=false );
 
 #if _SOLAR__PRIVATE
-    SAL_DLLPRIVATE BOOL HasStorage_Impl() const;
+    SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const;
 
     SAL_DLLPRIVATE void StorageBackup_Impl();
     SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl();
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 44503a2b92..c2f8eb3917 100644..100755
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -38,44 +38,9 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <tools/wldcrd.hxx>
 
-// TODO/LATER: The flags should be part of the UNO specification
-#define SFX_FILTER_IMPORT            0x00000001L
-#define SFX_FILTER_EXPORT            0x00000002L
-#define SFX_FILTER_TEMPLATE          0x00000004L
-#define SFX_FILTER_INTERNAL          0x00000008L
-#define SFX_FILTER_TEMPLATEPATH      0x00000010L
-#define SFX_FILTER_OWN 		         0x00000020L
-#define SFX_FILTER_ALIEN	         0x00000040L
-#define SFX_FILTER_USESOPTIONS       0x00000080L
-
-#define SFX_FILTER_DEFAULT           0x00000100L
-#define SFX_FILTER_EXECUTABLE        0x00000200L
-#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
-#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
-#define SFX_FILTER_NOTINFILEDLG      0x00001000L
-#define SFX_FILTER_NOTINCHOOSER      0x00002000L
-#define SFX_FILTER_ASYNC             0x00004000L
-// Legt Objekt nur an, kein Laden
-#define SFX_FILTER_CREATOR           0x00008000L
-#define SFX_FILTER_OPENREADONLY      0x00010000L
-#define SFX_FILTER_MUSTINSTALL		 0x00020000L
-#define SFX_FILTER_CONSULTSERVICE	 0x00040000L
-
-#define SFX_FILTER_STARONEFILTER	 0x00080000L
-#define SFX_FILTER_PACKED	 		 0x00100000L
-#define SFX_FILTER_SILENTEXPORT      0x00200000L
-
-#define SFX_FILTER_BROWSERPREFERED   0x00400000L
-
-#define SFX_FILTER_ENCRYPTION        0x01000000L
-#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
-
-#define SFX_FILTER_PREFERED          0x10000000L
+#include <comphelper/documentconstants.hxx>
 #define SFX_FILTER_STARTPRESENTATION 0x20000000L
 
-#define SFX_FILTER_VERSION_NONE      0
-#define SFX_FILTER_NOTINSTALLED		 SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
-
 #include <sfx2/sfxdefs.hxx>
 
 //========================================================================
@@ -86,16 +51,16 @@ class SFX2_DLLPUBLIC SfxFilter
 friend class SfxFilterContainer;
 
     WildCard		aWildCard;
-    ULONG			lFormat;
+    sal_uIntPtr			lFormat;
     String			aTypeName;
     String			aUserData;
     SfxFilterFlags	nFormatType;
-    USHORT          nDocIcon;
+    sal_uInt16          nDocIcon;
     String          aServiceName;
     String          aMimeType;
     String          aFilterName;
     String          aPattern;
-    ULONG           nVersion;
+    sal_uIntPtr           nVersion;
     String          aUIName;
     String          aDefaultTemplate;
 
@@ -105,7 +70,7 @@ public:
                                SfxFilterFlags nFormatType,
                                sal_uInt32 lFormat,
                                const String &rTypeName,
-                               USHORT nDocIcon,
+                               sal_uInt16 nDocIcon,
                                const String &rMimeType,
                                const String &rUserData,
                                const String& rServiceName );
@@ -124,19 +89,19 @@ public:
     const String&   GetName() const { return  aFilterName; }
     const WildCard& GetWildcard() const { return aWildCard; }
     const String&	GetRealTypeName() const { return aTypeName; }
-    ULONG			GetFormat() const { return lFormat; }
+    sal_uIntPtr			GetFormat() const { return lFormat; }
     const String&   GetTypeName() const { return aTypeName; }
     const String&   GetUIName() const { return aUIName; }
-    USHORT          GetDocIconId() const { return nDocIcon; }
+    sal_uInt16          GetDocIconId() const { return nDocIcon; }
     const String&	GetUserData() const { return aUserData; }
     const String&   GetDefaultTemplate() const { return aDefaultTemplate; }
     void            SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; }
-    BOOL			UsesStorage() const { return GetFormat() != 0; }
+    sal_Bool			UsesStorage() const { return GetFormat() != 0; }
     void            SetURLPattern( const String& rStr ) { aPattern = rStr; aPattern.ToLowerAscii(); }
     String          GetURLPattern() const { return aPattern; }
     void            SetUIName( const String& rName ) { aUIName = rName; }
-    void            SetVersion( ULONG nVersionP ) { nVersion = nVersionP; }
-    ULONG           GetVersion() const { return nVersion; }
+    void            SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; }
+    sal_uIntPtr           GetVersion() const { return nVersion; }
     String          GetSuffixes() const;
     String          GetDefaultExtension() const;
     const String&	GetServiceName() const { return aServiceName; }
@@ -147,7 +112,7 @@ public:
 
     static String   GetTypeFromStorage( const SotStorage& rStg );
     static String   GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage,
-                                        BOOL bTemplate = FALSE,
+                                        sal_Bool bTemplate = sal_False,
                                         String* pName=0 )
                         throw ( ::com::sun::star::beans::UnknownPropertyException,
                                 ::com::sun::star::lang::WrappedTargetException,
diff --git a/sfx2/inc/sfx2/docinf.hxx b/sfx2/inc/sfx2/docinf.hxx
index 267690b54e..267690b54e 100644..100755
--- a/sfx2/inc/sfx2/docinf.hxx
+++ b/sfx2/inc/sfx2/docinf.hxx
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/sfx2/docinsert.hxx
index 40969a76db..40969a76db 100644..100755
--- a/sfx2/inc/docinsert.hxx
+++ b/sfx2/inc/sfx2/docinsert.hxx
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 681865189e..0545322a82 100644..100755
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -67,14 +67,14 @@ protected:
                         CheckAlignment(SfxChildAlignment,SfxChildAlignment);
 
     virtual void        Resize();
-    virtual BOOL        PrepareToggleFloatingMode();
+    virtual sal_Bool        PrepareToggleFloatingMode();
     virtual void        ToggleFloatingMode();
     virtual void        StartDocking();
-    virtual BOOL        Docking( const Point& rPos, Rectangle& rRect );
-    virtual void        EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+    virtual sal_Bool        Docking( const Point& rPos, Rectangle& rRect );
+    virtual void        EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
     virtual void        Resizing( Size& rSize );
     virtual void        Paint( const Rectangle& rRect );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
     virtual void        Move();
 
     SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl()	{ return pMgr; }
@@ -99,7 +99,7 @@ public:
     const Rectangle&    GetInnerRect() const					{ return aInnerRect; }
     const Rectangle&    GetOuterRect() const					{ return aOuterRect; }
     SfxBindings&        GetBindings() const						{ return *pBindings; }
-    USHORT              GetType() const							{ return pMgr->GetType(); }
+    sal_uInt16              GetType() const							{ return pMgr->GetType(); }
     SfxChildAlignment   GetAlignment() const					{ return pMgr->GetAlignment(); }
     void                SetAlignment(SfxChildAlignment eAlign)	{ pMgr->SetAlignment(eAlign); }
     Size                GetFloatingSize() const					{ return aFloatSize; }
@@ -108,19 +108,19 @@ public:
     void                SetMinOutputSizePixel( const Size& rSize );
     Size                GetMinOutputSizePixel() const;
     virtual long		Notify( NotifyEvent& rNEvt );
-    virtual void        FadeIn( BOOL );
-    void                AutoShow( BOOL bShow = TRUE );
+    virtual void        FadeIn( sal_Bool );
+    void                AutoShow( sal_Bool bShow = sal_True );
     DECL_LINK( TimerHdl, Timer* );
 
     SAL_DLLPRIVATE void Initialize_Impl();
-    SAL_DLLPRIVATE USHORT GetWinBits_Impl() const;
+    SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const;
     SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
     SAL_DLLPRIVATE void Disappear_Impl();
     SAL_DLLPRIVATE void Reappear_Impl();
-    SAL_DLLPRIVATE BOOL IsAutoHide_Impl() const;
-    SAL_DLLPRIVATE BOOL IsPinned_Impl() const;
-    SAL_DLLPRIVATE void AutoShow_Impl( BOOL bShow = TRUE );
-    SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned );
+    SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsPinned_Impl() const;
+    SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True );
+    SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned );
     SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
     SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
 };
@@ -129,7 +129,7 @@ class SfxDockingWrapper : public SfxChildWindow
 {
     public:
         SfxDockingWrapper( Window* pParent ,
-                           USHORT nId ,
+                           sal_uInt16 nId ,
                            SfxBindings* pBindings ,
                            SfxChildWinInfo* pInfo );
 
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index d06434eee6..d06434eee6 100644..100755
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.hxx
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index c0dcf66ad4..c0dcf66ad4 100644..100755
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 7f19f244a4..6ed4c8d16a 100644..100755
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -77,7 +77,7 @@ public:
     { return aNameEd.GetText().EraseLeadingChars(); }
     String GetTemplatePath();
     void NewTemplate(const String &rPath);
-    USHORT GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
+    sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
     String GetRegionName() const { return aRegionLb.GetSelectEntry(); }
 };
 
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 0f2ac259df..56cadd0bff 100644..100755
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -57,70 +57,70 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates
 private:
     SfxDocTemplate_ImplRef	pImp;
 
-    SAL_DLLPRIVATE BOOL CopyOrMove( USHORT nTargetRegion, USHORT nTargetIdx,
-                                    USHORT nSourceRegion, USHORT nSourceIdx, BOOL bMove );
+    SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx,
+                                    sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove );
 public:
                         SfxDocumentTemplates();
                         SfxDocumentTemplates(const SfxDocumentTemplates &);
                         ~SfxDocumentTemplates();
 
-    BOOL				IsConstructed() { return pImp != NULL; }
+    sal_Bool				IsConstructed() { return pImp != NULL; }
     void				Construct();
 
-    static BOOL			SaveDir( /*SfxTemplateDir &rEntry */ ) ;
+    static sal_Bool			SaveDir( /*SfxTemplateDir &rEntry */ ) ;
     const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
 
-    BOOL				Rescan( );		// Aktualisieren
+    sal_Bool				Rescan( );		// Aktualisieren
     void                ReInitFromComponent();
 
-    BOOL                IsRegionLoaded( USHORT nIdx ) const;
-    USHORT				GetRegionCount() const;
-    const String&		GetRegionName(USHORT nIdx) const;					//dv!
-    String 				GetFullRegionName(USHORT nIdx) const;
-    USHORT				GetRegionNo( const String &rRegionName ) const;
+    sal_Bool                IsRegionLoaded( sal_uInt16 nIdx ) const;
+    sal_uInt16				GetRegionCount() const;
+    const String&		GetRegionName(sal_uInt16 nIdx) const;					//dv!
+    String 				GetFullRegionName(sal_uInt16 nIdx) const;
+    sal_uInt16				GetRegionNo( const String &rRegionName ) const;
 
-    USHORT				GetCount(USHORT nRegion) const;
-    USHORT				GetCount( const String &rName) const;
-    const String&		GetName(USHORT nRegion, USHORT nIdx) const;			//dv!
-    String				GetFileName(USHORT nRegion, USHORT nIdx) const;
-    String				GetPath(USHORT nRegion, USHORT nIdx) const;
+    sal_uInt16				GetCount(sal_uInt16 nRegion) const;
+    sal_uInt16				GetCount( const String &rName) const;
+    const String&		GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;			//dv!
+    String				GetFileName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
+    String				GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
 
     String				GetDefaultTemplatePath(const String &rLongName);
 
     // Pfad zur Vorlage geben lassen; logischer Name muss angegeben
     // werden, damit beim Ueberschreiben einer Vorlage der
     // richtige Dateiname gefunden werden kann
-    String				GetTemplatePath(USHORT nRegion, const String &rLongName) const;
+    String				GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const;
 
     // Allows to retrieve the target template URL from the UCB
     ::rtl::OUString		GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName,
                                                          const ::rtl::OUString& aTitle );
 
     // Speichern als Vorlage hat geklappt -> Aktualisieren
-    void			NewTemplate(USHORT nRegion,
+    void			NewTemplate(sal_uInt16 nRegion,
                                 const String &rLongName,
                                 const String &rFileName);
 
-    BOOL			Copy(USHORT nTargetRegion,
-                         USHORT nTargetIdx,
-                         USHORT nSourceRegion,
-                         USHORT nSourceIdx);
-    BOOL			Move(USHORT nTargetRegion,
-                         USHORT nTargetIdx,
-                         USHORT nSourceRegion,
-                         USHORT nSourceIdx);
-    BOOL			Delete(USHORT nRegion, USHORT nIdx);
-    BOOL			InsertDir(const String &rText, USHORT nRegion);
-    BOOL			SetName(const String &rName, USHORT nRegion, USHORT nIdx);
-
-    BOOL			CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const;
-    BOOL			CopyFrom(USHORT nRegion, USHORT nIdx, String &rName);
-
-    SfxObjectShellRef CreateObjectShell(USHORT nRegion, USHORT nIdx);
-    BOOL 			DeleteObjectShell(USHORT, USHORT);
-
-    BOOL 			GetFull( const String& rRegion, const String& rName, String& rPath );
-    BOOL 			GetLogicNames( const String& rPath, String& rRegion, String& rName ) const;
+    sal_Bool			Copy(sal_uInt16 nTargetRegion,
+                         sal_uInt16 nTargetIdx,
+                         sal_uInt16 nSourceRegion,
+                         sal_uInt16 nSourceIdx);
+    sal_Bool			Move(sal_uInt16 nTargetRegion,
+                         sal_uInt16 nTargetIdx,
+                         sal_uInt16 nSourceRegion,
+                         sal_uInt16 nSourceIdx);
+    sal_Bool			Delete(sal_uInt16 nRegion, sal_uInt16 nIdx);
+    sal_Bool			InsertDir(const String &rText, sal_uInt16 nRegion);
+    sal_Bool			SetName(const String &rName, sal_uInt16 nRegion, sal_uInt16 nIdx);
+
+    sal_Bool			CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const;
+    sal_Bool			CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName);
+
+    SfxObjectShellRef CreateObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx);
+    sal_Bool 			DeleteObjectShell(sal_uInt16, sal_uInt16);
+
+    sal_Bool 			GetFull( const String& rRegion, const String& rName, String& rPath );
+    sal_Bool 			GetLogicNames( const String& rPath, String& rRegion, String& rName ) const;
 
     /** updates the configuration where the document templates structure is stored.
 
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 71dc48ed9f..78277b9795 100644..100755
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -37,6 +37,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/frame/XController2.hpp>
 
 class SfxObjectShell;
 
@@ -46,17 +47,17 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
 {
     SfxObjectShell* 	pObjShell;
     ::rtl::OUString		aEventName;
-    USHORT				nEventId;
+    sal_uInt16				nEventId;
 
 public:
     TYPEINFO();
-    SfxEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 )
+    SfxEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 )
                         :	pObjShell(pObj),
                             aEventName(aName),
                             nEventId(nId)
                         {}
 
-    USHORT				GetEventId() const
+    sal_uInt16				GetEventId() const
                         { return nEventId; }
 
     ::rtl::OUString		GetEventName() const
@@ -68,6 +69,29 @@ public:
 
 //-------------------------------------------------------------------
 
+class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > xViewController;
+
+public:
+    TYPEINFO();
+
+    SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
+                        : SfxEventHint( nId, aName, pObj )
+                        , xViewController( xController, ::com::sun::star::uno::UNO_QUERY )  
+                        {}
+
+    SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController )
+                        : SfxEventHint( nId, aName, pObj )
+                        , xViewController( xController )  
+                        {}
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > GetController() const
+                        { return xViewController; }
+};
+
+//-------------------------------------------------------------------
+
 class SfxNamedHint : public SfxHint
 {
     String				_aEventName;
@@ -96,7 +120,6 @@ public:
     SfxObjectShell*     GetObjShell() const { return _pObjShell; }
 };
 
-class PrintDialog;
 class Printer;
 class SfxPrintingHint : public SfxHint
 {
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index b1e2f3b4b9..e16a2c85f5 100644..100755
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -47,10 +47,6 @@
 #include <svl/macitem.hxx>
 #include <vector>
 
-class SfxMacroInfo;
-class SfxMacroInfoArr_Impl;
-class SfxEventConfigItem_Impl;
-class SfxEventInfoArr_Impl;
 class SfxObjectShell;
 class SvxMacroTableDtor;
 
@@ -58,11 +54,11 @@ class SvxMacroTableDtor;
 
 struct SFX2_DLLPUBLIC SfxEventName
 {
-    USHORT  mnId;
+    sal_uInt16  mnId;
     String  maEventName;
     String  maUIName;
 
-            SfxEventName( USHORT nId,
+            SfxEventName( sal_uInt16 nId,
                              const String& rEventName,
                              const String& rUIName )
                 : mnId( nId )
@@ -99,7 +95,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SfxEventNamesItem ( const USHORT nId ) : SfxPoolItem( nId ) {}
+    SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -108,13 +104,13 @@ public:
                                     XubString &rText,
                                     const IntlWrapper * = 0 ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
-    virtual USHORT			GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
     const SfxEventNamesList& GetEvents() const { return aEventsList;}
     void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; }
-    void					AddEvent( const String&, const String&, USHORT );
+    void					AddEvent( const String&, const String&, sal_uInt16 );
 };
 
 // -----------------------------------------------------------------------
@@ -129,7 +125,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
 {
 public:
     static void							ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh);
-    static SvxMacro*					ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp );
+    static SvxMacro*					ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 3848073e66..70a820e4f8 100644..100755
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -50,7 +50,7 @@ class SfxFilterContainer_Impl;
 class SfxFrame;
 
 //#define SFX_FILTER_CONTAINER_FACTORY 1
-typedef USHORT SfxFilterContainerFlags;
+typedef sal_uInt16 SfxFilterContainerFlags;
 
 class SfxRefItem : public SfxPoolItem
 {
@@ -60,7 +60,7 @@ public:
     { 	return new SfxRefItem( *this ); }
     virtual int 			 operator==( const SfxPoolItem& rL) const
     {   return ((SfxRefItem&)rL).aRef == aRef; }
-    SfxRefItem( USHORT nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId )
+    SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId )
     {   aRef = rValue; }
     const SvRefBaseRef&      GetValue() const { return aRef; }
 
@@ -93,7 +93,7 @@ public:
     FactoryFunc GetFactory() { return pFunc; }
 };
 
-typedef ULONG (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
+typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
 
 class SFX2_DLLPUBLIC SfxFilterContainer
 {
@@ -116,11 +116,11 @@ public:
     const SfxFilter* 	GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     const SfxFilter* 	GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
 
-    SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE );
+    SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False );
     SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-                            BOOL bUpdate );
+                            sal_Bool bUpdate );
     SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
 };
 
@@ -135,13 +135,13 @@ public:
                         SfxFilterMatcher();
                         ~SfxFilterMatcher();
 
-    SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter );
+    SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
     DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* );
 
     sal_uInt32               GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     sal_uInt32               GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
     sal_uInt32               GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const;
-    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, BOOL bPlugIn, BOOL bAPI = FALSE ) const;
+    sal_uInt32               DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const;
 
     const SfxFilter*	GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const;
     const SfxFilter*    GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
@@ -158,7 +158,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
 {
     SfxFilterFlags nOrMask;
     SfxFilterFlags nAndMask;
-    USHORT nCurrent;
+    sal_uInt16 nCurrent;
     const SfxFilterMatcher_Impl *pMatch;
 
     SAL_DLLPRIVATE const SfxFilter* Find_Impl();
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index d584106a10..7155006a79 100644..100755
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -277,8 +277,7 @@ public:
             Pointer to an array of help ids. For each element in _pControlId, there must be
             a corresponding element herein.
     */
-    void					SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
-    void					SetDialogHelpId( const sal_Int32 _nHelpId );
+    void					SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
     void					CreateMatcher( const String& rName );
 
     /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index 0f9d3cc90c..a042085a52 100644..100755
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -139,7 +139,7 @@ public:
     static SfxFrame*    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
     static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
                         CreateBlankFrame();
-    static SfxFrame*    Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden );
+    static SfxFrame*    Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden );
 
     SvCompatWeakHdl*    GetHdl();
     Window&             GetWindow() const;
@@ -150,7 +150,7 @@ public:
     SfxFrame*	  		GetParentFrame() const
                         { return pParentFrame; }
 
-    void                SetPresentationMode( BOOL bSet );
+    void                SetPresentationMode( sal_Bool bSet );
     SystemWindow*       GetSystemWindow() const;
 
     static SfxFrame*    GetFirst();
@@ -219,9 +219,9 @@ public:
     SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
 
     SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc );
-    SAL_DLLPRIVATE void LockResize_Impl( BOOL bLock );
-    SAL_DLLPRIVATE void SetMenuBarOn_Impl( BOOL bOn );
-    SAL_DLLPRIVATE BOOL IsMenuBarOn_Impl() const;
+    SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock );
+    SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
+    SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
     SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
     SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
     SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
@@ -264,8 +264,8 @@ public:
     virtual String			GetValueText() const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool		    PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool		    PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     sal_Bool                FrameKilled() const { return &wFrame != pFrame; }
 
@@ -283,8 +283,8 @@ public:
                                 { return aValue; }
     virtual int                 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
@@ -301,8 +301,8 @@ public:
                                 { return m_xFrame; }
     virtual int                 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
-    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 typedef SfxUsrAnyItem SfxUnoAnyItem;
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index ac9331e414..2268464c97 100644..100755
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -91,12 +91,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
     long					nWidth;
     ScrollingMode			eScroll;
     SizeSelector			eSizeSelector;
-    USHORT					nHasBorder;
-    USHORT					nItemId;
-    BOOL					bResizeHorizontal;
-    BOOL					bResizeVertical;
-    BOOL					bHasUI;
-    BOOL                    bReadOnly;
+    sal_uInt16					nHasBorder;
+    sal_uInt16					nItemId;
+    sal_Bool					bResizeHorizontal;
+    sal_Bool					bResizeVertical;
+    sal_Bool					bHasUI;
+    sal_Bool                    bReadOnly;
     SfxFrameDescriptor_Impl* pImp;
     SvStrings*				pScripts;
     SvStrings*				pComments;
@@ -118,13 +118,13 @@ public:
                             { return aActualURL; }
     void					SetActualURL( const INetURLObject& rURL );
     void					SetActualURL( const String& rURL );
-    BOOL					CheckContent() const;
-    BOOL                    CompareOriginal( SfxFrameDescriptor& rSet ) const;
-    void					UnifyContent( BOOL );
-    void                    SetReadOnly( BOOL bSet ) { bReadOnly = bSet;}
-    BOOL                    IsReadOnly(  ) const { return bReadOnly;}
-    void                    SetEditable( BOOL bSet );
-    BOOL                    IsEditable() const;
+    sal_Bool					CheckContent() const;
+    sal_Bool                    CompareOriginal( SfxFrameDescriptor& rSet ) const;
+    void					UnifyContent( sal_Bool );
+    void                    SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
+    sal_Bool                    IsReadOnly(  ) const { return bReadOnly;}
+    void                    SetEditable( sal_Bool bSet );
+    sal_Bool                    IsEditable() const;
 
                             // Size
     void					SetWidth( long n )
@@ -139,9 +139,9 @@ public:
                             { return nWidth; }
     SizeSelector			GetSizeSelector() const
                             { return eSizeSelector; }
-    BOOL					IsResizable() const
+    sal_Bool					IsResizable() const
                             { return bResizeHorizontal && bResizeVertical; }
-    void					SetResizable( BOOL bRes )
+    void					SetResizable( sal_Bool bRes )
                             { bResizeHorizontal = bResizeVertical = bRes; }
 
                             // FrameName
@@ -163,38 +163,38 @@ public:
                             // FrameBorder
     void					SetWallpaper( const Wallpaper& rWallpaper );
     const Wallpaper*		GetWallpaper() const;
-    BOOL					HasFrameBorder() const;
+    sal_Bool					HasFrameBorder() const;
 
-    BOOL					IsFrameBorderOn() const
+    sal_Bool					IsFrameBorderOn() const
                             { return ( nHasBorder & BORDER_YES ) != 0; }
 
-    void					SetFrameBorder( BOOL bBorder )
+    void					SetFrameBorder( sal_Bool bBorder )
                             {
                                 nHasBorder = bBorder ?
                                             BORDER_YES | BORDER_SET :
                                             BORDER_NO | BORDER_SET;
                             }
-    BOOL					IsFrameBorderSet() const
+    sal_Bool					IsFrameBorderSet() const
                             { return (nHasBorder & BORDER_SET) != 0; }
     void					ResetBorder()
                             { nHasBorder = 0; }
 
-    BOOL					HasUI() const
+    sal_Bool					HasUI() const
                             { return bHasUI; }
-    void					SetHasUI( BOOL bOn )
+    void					SetHasUI( sal_Bool bOn )
                             { bHasUI = bOn; }
 
                             // Attribute f"ur das Splitwindow
-    USHORT					GetItemId() const
+    sal_uInt16					GetItemId() const
                             { return nItemId; }
-    void					SetItemId( USHORT nId )
+    void					SetItemId( sal_uInt16 nId )
                             { nItemId = nId; }
-    USHORT 					GetWinBits() const;
+    sal_uInt16 					GetWinBits() const;
     long					GetSize() const;
-    USHORT					GetItemPos() const;
+    sal_uInt16					GetItemPos() const;
 
                             // Kopie z.B. f"ur die Views
-    SfxFrameDescriptor*     Clone( BOOL bWithIds = TRUE ) const;
+    SfxFrameDescriptor*     Clone( sal_Bool bWithIds = sal_True ) const;
 };
 
 // Kein Bock, einen operator= zu implementieren...
@@ -211,13 +211,13 @@ struct SfxFrameProperties
     ScrollingMode						eScroll;
     SizeSelector						eSizeSelector;
     SizeSelector						eSetSizeSelector;
-    BOOL								bHasBorder;
-    BOOL								bBorderSet;
-    BOOL								bResizable;
-    BOOL								bSetResizable;
-    BOOL								bIsRootSet;
-    BOOL								bIsInColSet;
-    BOOL								bHasBorderInherited;
+    sal_Bool								bHasBorder;
+    sal_Bool								bBorderSet;
+    sal_Bool								bResizable;
+    sal_Bool								bSetResizable;
+    sal_Bool								bIsRootSet;
+    sal_Bool								bIsInColSet;
+    sal_Bool								bHasBorderInherited;
     SfxFrameDescriptor*              	pFrame;
 
 private:
@@ -233,13 +233,13 @@ public:
                                               eScroll( ScrollingAuto ),
                                               eSizeSelector( SIZE_REL ),
                                               eSetSizeSelector( SIZE_REL ),
-                                              bHasBorder( TRUE ),
-                                              bBorderSet( TRUE ),
-                                              bResizable( TRUE ),
-                                              bSetResizable( TRUE ),
-                                              bIsRootSet( FALSE ),
-                                              bIsInColSet( FALSE ),
-                                              bHasBorderInherited( TRUE ),
+                                              bHasBorder( sal_True ),
+                                              bBorderSet( sal_True ),
+                                              bResizable( sal_True ),
+                                              bSetResizable( sal_True ),
+                                              bIsRootSet( sal_False ),
+                                              bIsInColSet( sal_False ),
+                                              bHasBorderInherited( sal_True ),
                                               pFrame( 0 ) {}
 
                                         SfxFrameProperties( const SfxFrameDescriptor *pD );
@@ -255,12 +255,12 @@ class SfxFrameDescriptorItem : public SfxPoolItem
 public:
                                         TYPEINFO();
 
-                                        SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const USHORT nId = SID_FRAMEDESCRIPTOR )
+                                        SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
                                             : SfxPoolItem( nId )
                                             , aProperties( pD )
                                         {}
 
-                                        SfxFrameDescriptorItem ( const USHORT nId = SID_FRAMEDESCRIPTOR )
+                                        SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
                                             : SfxPoolItem( nId )
                                         {}
 
@@ -281,9 +281,9 @@ public:
                                             UniString &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*    			Clone( SfxItemPool *pPool = 0 ) const;
-    //virtual SfxPoolItem*    			Create(SvStream &, USHORT) const;
-    //virtual SvStream&					Store(SvStream &, USHORT nItemVersion ) const;
-    //virtual USHORT						GetVersion( USHORT nFileFormatVersion ) const;
+    //virtual SfxPoolItem*    			Create(SvStream &, sal_uInt16) const;
+    //virtual SvStream&					Store(SvStream &, sal_uInt16 nItemVersion ) const;
+    //virtual sal_uInt16						GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
     const SfxFrameProperties&			GetProperties() const
                                         { return aProperties; }
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index ea00089130..016a83b640 100644..100755
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -47,7 +47,7 @@ class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
     friend class _SfxFrameHTMLContext;
 
 protected:
-   SfxFrameHTMLParser( SvStream& rStream, BOOL bIsNewDoc=TRUE, SfxMedium *pMediumPtr=0 ):
+   SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ):
    SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
 
 public:
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 3d3dca2d08..b4f01d9420 100644..100755
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -54,12 +54,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
     SAL_DLLPRIVATE static const sal_Char sNewLine[];
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const String& rName,
-                                const String& rContent, BOOL bHTTPEquiv,
+                                const String& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars = 0 );
     SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
                                 const sal_Char *pIndent, const sal_Char *pName,
-                                const String& rContent, BOOL bHTTPEquiv,
+                                const String& rContent, sal_Bool bHTTPEquiv,
                                 rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars = 0 );
 
@@ -82,7 +82,7 @@ public:
 
 inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                             const sal_Char *pIndent, const sal_Char *pName,
-                            const String& rContent, BOOL bHTTPEquiv,
+                            const String& rContent, sal_Bool bHTTPEquiv,
                             rtl_TextEncoding eDestEnc,
                             String *pNonConvertableChars )
 {
diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx
index e1424a59a8..93097925c6 100644..100755
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/sfx2/inc/sfx2/genlink.hxx
@@ -47,8 +47,8 @@ public:
     GenLink& operator = ( const GenLink& rOrig )
         { pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; }
 
-    BOOL operator!() const { return !aLink && !pFunc; }
-    BOOL IsSet() const { return aLink.IsSet() || pFunc; }
+    sal_Bool operator!() const { return !aLink && !pFunc; }
+    sal_Bool IsSet() const { return aLink.IsSet() || pFunc; }
 
     long Call( void* pCaller )
          { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); }
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index fb3c072f7a..bd7a7a3d5d 100644..100755
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -53,7 +53,7 @@ class SfxHintPoster: public SvRefBase
 */
 
 {
-    ULONG			nId;
+    sal_uIntPtr			nId;
     GenLink 		aLink;
 
 private:
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index e841ad9143..e841ad9143 100644..100755
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx
index 8bdb07d681..0bbde7a0b4 100644..100755
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/sfx2/imagemgr.hxx
@@ -37,7 +37,7 @@
 SFX2_DLLPUBLIC Image SAL_CALL GetImage(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
-    BOOL bBig
+    bool bBig
 );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
index bb535f2787..bb535f2787 100644..100755
--- a/sfx2/inc/sfx2/imgdef.hxx
+++ b/sfx2/inc/sfx2/imgdef.hxx
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx
index 37daa8d566..896c40365f 100644..100755
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/sfx2/imgmgr.hxx
@@ -49,18 +49,18 @@ public:
                     SfxImageManager( SfxModule* pModule = 0 );
                     ~SfxImageManager();
 
-    void            RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF);
+    void            RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF);
     void            ReleaseToolBox( ToolBox *pBox );
 
                     // get images from resources
     void			SetImages( ToolBox& rToolBox );
-    void			SetImages( ToolBox& rToolBox, BOOL bLarge );
-    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge );
+    void			SetImages( ToolBox& rToolBox, bool bLarge );
+    void            SetImagesForceSize( ToolBox& rToolBox, bool bLarge );
 
-    Image           GetImage( USHORT nId, BOOL bLarge ) const;
-    Image           GetImage( USHORT nId) const;
-    Image           SeekImage( USHORT nId, BOOL bLarge ) const;
-    Image           SeekImage( USHORT nId ) const;
+    Image           GetImage( sal_uInt16 nId, bool bLarge ) const;
+    Image           GetImage( sal_uInt16 nId) const;
+    Image           SeekImage( sal_uInt16 nId, bool bLarge ) const;
+    Image           SeekImage( sal_uInt16 nId ) const;
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 7a86eea77e..d4975ab345 100644..100755
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/sfx2/inc/sfx2/ipclient.hxx
@@ -82,7 +82,7 @@ public:
     sal_Bool            IsObjectInPlaceActive() const;
     sal_Bool            IsObjectActive() const;
     void                DeactivateObject();
-    BOOL                SetObjArea( const Rectangle & );
+    sal_Bool                SetObjArea( const Rectangle & );
     Rectangle           GetObjArea() const;
     Rectangle           GetScaledObjArea() const;
     void                SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight );
@@ -97,11 +97,12 @@ public:
     ErrCode             DoVerb( long nVerb );
     void                VisAreaChanged();
     void                ResetObject();
-    BOOL                IsUIActive();
+    sal_Bool                IsUIActive();
 
     // used in Writer
     // Rectangle           PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const;
     // Rectangle           LogicObjAreaToPixel( const Rectangle & rRect ) const;
+    virtual void        FormatChanged(); // object format was changed (used for StarMath formulas aligning)
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index 2d5d858426..2d9ded19ed 100644..100755
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/sfx2/inc/sfx2/itemconnect.hxx
@@ -262,13 +262,13 @@ public:
 
     /** Receives pointer to a newly created control wrapper.
         @descr  Takes ownership of the control wrapper. */
-    explicit            ItemControlConnection( USHORT nSlot, ControlWrpT* pNewCtrlWrp,
+    explicit            ItemControlConnection( sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
     /** Convenience constructor. Receives reference to a control directly.
         @descr  May only be used, if ControlWrpT::ControlWrpT( ControlType& )
         constructor exists. */
-    explicit            ItemControlConnection( USHORT nSlot, ControlType& rControl,
+    explicit            ItemControlConnection( sal_uInt16 nSlot, ControlType& rControl,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
     virtual             ~ItemControlConnection();
@@ -300,7 +300,7 @@ class SFX2_DLLPUBLIC DummyItemConnection:
     public ItemConnectionBase, public DummyWindowWrapper
 {
 public:
-    explicit            DummyItemConnection( USHORT nSlot, Window& rWindow,
+    explicit            DummyItemConnection( sal_uInt16 nSlot, Window& rWindow,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
 protected:
@@ -309,7 +309,7 @@ protected:
     virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet );
 
 private:
-    USHORT              mnSlot;
+    sal_uInt16              mnSlot;
 };
 
 // ----------------------------------------------------------------------------
@@ -334,7 +334,7 @@ class NumericConnection : public ItemControlConnection< ItemWrpT,
 public:
     typedef typename ItemControlConnectionType::ControlWrapperType NumericFieldWrapperType;
 
-    explicit            NumericConnection( USHORT nSlot, NumericField& rField,
+    explicit            NumericConnection( sal_uInt16 nSlot, NumericField& rField,
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -365,7 +365,7 @@ class MetricConnection : public ItemControlConnection< ItemWrpT,
 public:
     typedef typename ItemControlConnectionType::ControlWrapperType MetricFieldWrapperType;
 
-    explicit            MetricConnection( USHORT nSlot, MetricField& rField,
+    explicit            MetricConnection( sal_uInt16 nSlot, MetricField& rField,
                             FieldUnit eItemUnit = FUNIT_NONE, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -397,7 +397,7 @@ public:
     typedef typename ItemControlConnectionType::ControlWrapperType  ListBoxWrapperType;
     typedef typename ListBoxWrapperType::MapEntryType               MapEntryType;
 
-    explicit            ListBoxConnection( USHORT nSlot, ListBox& rListBox,
+    explicit            ListBoxConnection( sal_uInt16 nSlot, ListBox& rListBox,
                             const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -429,7 +429,7 @@ public:
     typedef typename ItemControlConnectionType::ControlWrapperType  ValueSetWrapperType;
     typedef typename ValueSetWrapperType::MapEntryType              MapEntryType;
 
-    explicit            ValueSetConnection( USHORT nSlot, ValueSet& rValueSet,
+    explicit            ValueSetConnection( sal_uInt16 nSlot, ValueSet& rValueSet,
                             const MapEntryType* pMap = 0, ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 };
 
@@ -484,7 +484,7 @@ private:
 
 template< typename ItemWrpT, typename ControlWrpT >
 ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
-        USHORT nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ControlWrpT* pNewCtrlWrp, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     maItemWrp( nSlot ),
     mxCtrlWrp( pNewCtrlWrp )
@@ -493,7 +493,7 @@ ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
 
 template< typename ItemWrpT, typename ControlWrpT >
 ItemControlConnection< ItemWrpT, ControlWrpT >::ItemControlConnection(
-        USHORT nSlot, ControlType& rControl, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ControlType& rControl, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     maItemWrp( nSlot ),
     mxCtrlWrp( new ControlWrpT( rControl ) )
@@ -536,7 +536,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
         // do not rely on existence of ItemValueType::operator!=
         if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) )
         {
-            USHORT nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
+            sal_uInt16 nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
             std::auto_ptr< ItemType > xItem(
                 static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) );
             xItem->SetWhich( nWhich );
@@ -556,7 +556,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
 
 template< typename ItemWrpT >
 NumericConnection< ItemWrpT >::NumericConnection(
-        USHORT nSlot, NumericField& rField, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, NumericField& rField, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, rField, nFlags )
 {
 }
@@ -565,7 +565,7 @@ NumericConnection< ItemWrpT >::NumericConnection(
 
 template< typename ItemWrpT >
 MetricConnection< ItemWrpT >::MetricConnection(
-        USHORT nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, MetricField& rField, FieldUnit eItemUnit, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new MetricFieldWrapperType( rField, eItemUnit ), nFlags )
 {
 }
@@ -574,7 +574,7 @@ MetricConnection< ItemWrpT >::MetricConnection(
 
 template< typename ItemWrpT >
 ListBoxConnection< ItemWrpT >::ListBoxConnection(
-        USHORT nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ListBox& rListBox, const MapEntryType* pMap, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new ListBoxWrapperType( rListBox, pMap ), nFlags )
 {
 }
@@ -583,7 +583,7 @@ ListBoxConnection< ItemWrpT >::ListBoxConnection(
 
 template< typename ItemWrpT >
 ValueSetConnection< ItemWrpT >::ValueSetConnection(
-        USHORT nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) :
+        sal_uInt16 nSlot, ValueSet& rValueSet, const MapEntryType* pMap, ItemConnFlags nFlags ) :
     ItemControlConnectionType( nSlot, new ValueSetWrapperType( rValueSet, pMap ), nFlags )
 {
 }
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index 85cd42ae79..56ab847048 100644..100755
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -48,20 +48,20 @@ class SFX2_DLLPUBLIC ItemWrapperHelper
 {
 public:
     /** Returns the WID of the passed SID in the item set. */
-    static USHORT       GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot );
+    static sal_uInt16       GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns true, if the passed item set supports the SID. */
-    static bool         IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static bool         IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns an item from an item set, if it is not in "don't know" state.
         @return  Pointer to item, or 0 if it has "don't know" state. */
-    static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Returns the default item from the pool of the passed item set. */
-    static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot );
+    static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot );
 
     /** Removes an item from rDestSet, if it is default in rOldSet. */
-    static void         RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot );
+    static void         RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot );
 };
 
 // ============================================================================
@@ -103,10 +103,10 @@ public:
     typedef ValueT                              ItemValueType;
     typedef SingleItemWrapper< ItemT, ValueT >  SingleItemWrapperType;
 
-    inline explicit     SingleItemWrapper( USHORT nSlot ) : mnSlot( nSlot ) {}
+    inline explicit     SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {}
 
     /** Returns the SID this wrapper works on. */
-    inline USHORT       GetSlotId() const { return mnSlot; }
+    inline sal_uInt16       GetSlotId() const { return mnSlot; }
 
     /** Returns the item from an item set, if it is not in "don't know" state.
         @descr  Similar to ItemWrapperHelper::GetUniqueItem(), but works always
@@ -124,7 +124,7 @@ public:
     virtual void        SetItemValue( ItemT& rItem, ValueT aValue ) const = 0;
 
 private:
-    USHORT              mnSlot;     /// The SID of this item wrapper.
+    sal_uInt16              mnSlot;     /// The SID of this item wrapper.
 };
 
 // ============================================================================
@@ -143,7 +143,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT >
 class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT >
 {
 public:
-    inline explicit     ValueItemWrapper( USHORT nSlot ) :
+    inline explicit     ValueItemWrapper( sal_uInt16 nSlot ) :
                             SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
 
     virtual ValueT      GetItemValue( const ItemT& rItem ) const
@@ -154,11 +154,11 @@ public:
 
 // ----------------------------------------------------------------------------
 
-typedef ValueItemWrapper< SfxBoolItem,   BOOL >          BoolItemWrapper;
-typedef ValueItemWrapper< SfxInt16Item,  INT16 >         Int16ItemWrapper;
-typedef ValueItemWrapper< SfxUInt16Item, UINT16 >        UInt16ItemWrapper;
-typedef ValueItemWrapper< SfxInt32Item,  INT32 >         Int32ItemWrapper;
-typedef ValueItemWrapper< SfxUInt32Item, UINT32 >        UInt32ItemWrapper;
+typedef ValueItemWrapper< SfxBoolItem,   sal_Bool >          BoolItemWrapper;
+typedef ValueItemWrapper< SfxInt16Item,  sal_Int16 >         Int16ItemWrapper;
+typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 >        UInt16ItemWrapper;
+typedef ValueItemWrapper< SfxInt32Item,  sal_Int32 >         Int32ItemWrapper;
+typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 >        UInt32ItemWrapper;
 typedef ValueItemWrapper< SfxStringItem, const String& > StringItemWrapper;
 
 // ============================================================================
@@ -168,7 +168,7 @@ template< typename ItemT >
 class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& >
 {
 public:
-    inline explicit     IdentItemWrapper( USHORT nSlot ) :
+    inline explicit     IdentItemWrapper( sal_uInt16 nSlot ) :
                             SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {}
 
     virtual const ItemT& GetItemValue( const ItemT& rItem ) const
diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
index 95438e1d9e..95438e1d9e 100644..100755
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ b/sfx2/inc/sfx2/layout-post.hxx
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
index d92331f4c3..d92331f4c3 100644..100755
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ b/sfx2/inc/sfx2/layout-pre.hxx
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
index de480cbb50..de480cbb50 100644..100755
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ b/sfx2/inc/sfx2/layout-tabdlg.hxx
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index 914f9c9224..914f9c9224 100644..100755
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 651cfb30ab..95f10d4871 100644..100755
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -73,7 +73,7 @@ class SFX2_DLLPUBLIC LinkManager
 
     SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden
 protected:
-    BOOL 		InsertLink( SvBaseLink* pLink, USHORT nObjType, USHORT nUpdateType,
+    sal_Bool 		InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
                             const String* pName = 0 );
 public:
 
@@ -101,27 +101,27 @@ public:
     void        SetPersist( SfxObjectShell * p )   { pPersist = p; }
 
     void		Remove( SvBaseLink *pLink );
-    void		Remove( USHORT nPos, USHORT nCnt = 1 );
-    BOOL		Insert( SvBaseLink* pLink );
+    void		Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 );
+    sal_Bool		Insert( SvBaseLink* pLink );
 
                 // den Link mit einem SvLinkSource verbinden und in die Liste eintragen
-    BOOL 		InsertDDELink( SvBaseLink*,
+    sal_Bool 		InsertDDELink( SvBaseLink*,
                         const String& rServer,
                         const String& rTopic,
                         const String& rItem );
 
                 // falls am Link schon alles eingestellt ist !
-    BOOL 		InsertDDELink( SvBaseLink* );
+    sal_Bool 		InsertDDELink( SvBaseLink* );
 
     // den Link mit einem PseudoObject verbinden und in die Liste eintragen
-    BOOL InsertFileLink( sfx2::SvBaseLink&,
-                        USHORT nFileType,
+    sal_Bool InsertFileLink( sfx2::SvBaseLink&,
+                        sal_uInt16 nFileType,
                         const String& rTxt,
                         const String* pFilterNm = 0,
                         const String* pRange = 0 );
 
             // falls am Link schon alles eingestellt ist !
-    BOOL InsertFileLink( sfx2::SvBaseLink& );
+    sal_Bool InsertFileLink( sfx2::SvBaseLink& );
 
     void ReconnectDdeLink(SfxObjectShell& rServer);
 
@@ -135,7 +135,7 @@ public:
     void LinkServerShell(const ::rtl::OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const;
 
                 // erfrage die Strings fuer den Dialog
-    BOOL GetDisplayNames( const SvBaseLink *,
+    sal_Bool GetDisplayNames( const SvBaseLink *,
                                     String* pType,
                                     String* pFile = 0,
                                     String* pLink = 0,
@@ -143,9 +143,9 @@ public:
 
     SvLinkSourceRef CreateObj( SvBaseLink* );
 
-    void 		UpdateAllLinks( BOOL bAskUpdate = TRUE,
-                                BOOL bCallErrHdl = TRUE,
-                                BOOL bUpdateGrfLinks = FALSE,
+    void 		UpdateAllLinks( sal_Bool bAskUpdate = sal_True,
+                                sal_Bool bCallErrHdl = sal_True,
+                                sal_Bool bUpdateGrfLinks = sal_False,
                                 Window* pParentWin = 0 );
 
                 // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog)
@@ -156,9 +156,9 @@ public:
                 // Liste der zu serviereden Links erfragen
     const SvLinkSources& GetServers() const { return aServerTbl; }
                 // einen zu servierenden Link eintragen/loeschen
-    BOOL 		InsertServer( SvLinkSource* rObj );
+    sal_Bool 		InsertServer( SvLinkSource* rObj );
     void 		RemoveServer( SvLinkSource* rObj );
-    void 		RemoveServer( USHORT nPos, USHORT nCnt = 1 )
+    void 		RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 )
                 {	aServerTbl.Remove( nPos, nCnt ); }
 
     // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
@@ -170,11 +170,11 @@ public:
     // dann die entsprechenden Informationen als String.
     // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
     // - das braucht Informationen ueber Load/Abort/Error
-    static ULONG  RegisterStatusInfoId();
+    static sal_uIntPtr  RegisterStatusInfoId();
 
     // if the mimetype says graphic/bitmap/gdimetafile then get the
     // graphic from the Any. Return says no errors
-    static BOOL GetGraphicFromAny( const String& rMimeType,
+    static sal_Bool GetGraphicFromAny( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf );
 
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 25aededf8c..999d9d7c0b 100644..100755
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -72,12 +72,12 @@ public:
                         SvLinkSource();
     virtual				~SvLinkSource();
 
-    BOOL				HasDataLinks( const SvBaseLink* = 0 ) const;
+    sal_Bool				HasDataLinks( const SvBaseLink* = 0 ) const;
 
     void				Closed();
 
-    ULONG 				GetUpdateTimeout() const;
-    void				SetUpdateTimeout( ULONG nTime );
+    sal_uIntPtr 				GetUpdateTimeout() const;
+    void				SetUpdateTimeout( sal_uIntPtr nTime );
                         // notify the sink, the mime type is not
                         // a selection criterion
     void				DataChanged( const String & rMimeType,
@@ -85,22 +85,22 @@ public:
     void				SendDataChanged();
     void				NotifyDataChanged();
 
-    virtual BOOL        Connect( SvBaseLink* );
-    virtual BOOL		GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool        Connect( SvBaseLink* );
+    virtual sal_Bool		GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                                 const String & rMimeType,
-                                BOOL bSynchron = FALSE );
+                                sal_Bool bSynchron = sal_False );
 
-                        // TRUE => waitinmg for data
-    virtual BOOL		IsPending() const;
-                        // TRUE => data complete loaded
-    virtual BOOL		IsDataComplete() const;
+                        // sal_True => waitinmg for data
+    virtual sal_Bool		IsPending() const;
+                        // sal_True => data complete loaded
+    virtual sal_Bool		IsDataComplete() const;
 
     // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog
     virtual void        Edit( Window *, SvBaseLink *, const Link& rEndEditHdl );
 
 
     void				AddDataAdvise( SvBaseLink *, const String & rMimeType,
-                                        USHORT nAdviceMode );
+                                        sal_uInt16 nAdviceMode );
     void				RemoveAllDataAdvise( SvBaseLink * );
 
     void				AddConnectAdvise( SvBaseLink * );
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 5e84c335fd..45b3f9a5b7 100644..100755
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -81,18 +81,18 @@ private:
     SvLinkSourceRef			xObj;
     String					aLinkName;
     BaseLink_Impl*          pImpl;
-    USHORT 					nObjType;
-    BOOL					bVisible : 1;
-    BOOL					bSynchron : 1;
-    BOOL					bUseCache : 1;		// fuer GrafikLinks!
-    BOOL                    bWasLastEditOK : 1;
+    sal_uInt16 					nObjType;
+    sal_Bool					bVisible : 1;
+    sal_Bool					bSynchron : 1;
+    sal_Bool					bUseCache : 1;		// fuer GrafikLinks!
+    sal_Bool                    bWasLastEditOK : 1;
 
     DECL_LINK( EndEditHdl, String* );
 
     bool                    ExecuteEdit( const String& _rNewName );
 
 protected:
-    void			SetObjType( USHORT );
+    void			SetObjType( sal_uInt16 );
 
                     // setzen des LinkSourceName ohne aktion
     void			SetName( const String & rLn );
@@ -106,10 +106,10 @@ protected:
                         m_xInputStreamToLoadFrom;
 
                     SvBaseLink();
-                    SvBaseLink( USHORT nLinkType, ULONG nContentType = FORMAT_STRING );
+                    SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING );
     virtual 		~SvBaseLink();
 
-    void            _GetRealObject( BOOL bConnect = TRUE );
+    void            _GetRealObject( sal_Bool bConnect = sal_True );
 
     SvLinkSource*   GetRealObject()
                     {
@@ -122,10 +122,10 @@ public:
                     TYPEINFO();
                     // ask JP
     virtual void    Closed();
-                    SvBaseLink( const String& rNm, USHORT nObjectType,
+                    SvBaseLink( const String& rNm, sal_uInt16 nObjectType,
                                  SvLinkSource* );
 
-    USHORT			GetObjType() const { return nObjType; }
+    sal_uInt16			GetObjType() const { return nObjType; }
 
     void			SetObj( SvLinkSource * pObj );
     SvLinkSource*	GetObj() const	{ return xObj; }
@@ -136,30 +136,30 @@ public:
     virtual void 	DataChanged( const String & rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
 
-    void			SetUpdateMode( USHORT );
-    USHORT 			GetUpdateMode() const;
-    ULONG  			GetContentType() const;
-    BOOL 			SetContentType( ULONG nType );
+    void			SetUpdateMode( sal_uInt16 );
+    sal_uInt16 			GetUpdateMode() const;
+    sal_uIntPtr  			GetContentType() const;
+    sal_Bool 			SetContentType( sal_uIntPtr nType );
 
     LinkManager*          GetLinkManager();
     const LinkManager*    GetLinkManager() const;
     void                    SetLinkManager( LinkManager* _pMgr );
 
-    BOOL			Update();
+    sal_Bool			Update();
     void			Disconnect();
 
     // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
         // soll der Link im Dialog angezeigt werden ? (Links im Link im ...)
-    BOOL 	        IsVisible() const   		{ return bVisible; }
-    void 	        SetVisible( BOOL bFlag )	{ bVisible = bFlag; }
+    sal_Bool 	        IsVisible() const   		{ return bVisible; }
+    void 	        SetVisible( sal_Bool bFlag )	{ bVisible = bFlag; }
         // soll der Link synchron oder asynchron geladen werden?
-    BOOL 	        IsSynchron() const   		{ return bSynchron; }
-    void 	        SetSynchron( BOOL bFlag )	{ bSynchron = bFlag; }
+    sal_Bool 	        IsSynchron() const   		{ return bSynchron; }
+    void 	        SetSynchron( sal_Bool bFlag )	{ bSynchron = bFlag; }
 
-    BOOL 	        IsUseCache() const   		{ return bUseCache; }
-    void 			SetUseCache( BOOL bFlag )	{ bUseCache = bFlag; }
+    sal_Bool 	        IsUseCache() const   		{ return bUseCache; }
+    void 			SetUseCache( sal_Bool bFlag )	{ bUseCache = bFlag; }
 
     void            setStreamToLoadFrom(
                         const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
@@ -169,7 +169,7 @@ public:
     // #i88291#
     void            clearStreamToLoadFrom();
 
-    inline BOOL         WasLastEditOK() const       { return bWasLastEditOK; }
+    inline sal_Bool         WasLastEditOK() const       { return bWasLastEditOK; }
     FileDialogHelper*   GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const;
 };
 
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 7514d4c511..7514d4c511 100644..100755
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
new file mode 100755
index 0000000000..c3eb4a076a
--- /dev/null
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -0,0 +1,150 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _MACROPG_HXX
+#define _MACROPG_HXX
+
+#include "sal/config.h"
+#include "sfx2/dllapi.h"
+
+#include <sfx2/basedlgs.hxx>
+#include <sfx2/tabdlg.hxx>
+#include <svl/macitem.hxx>
+#include <vcl/lstbox.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
+
+class _SfxMacroTabPage;
+class SvStringsDtor;
+class SvTabListBox;
+class Edit;
+class String;
+class SfxObjectShell;
+
+typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage );
+typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange );
+
+class SfxConfigGroupListBox_Impl;
+class SfxConfigFunctionListBox_Impl;
+
+class _HeaderTabListBox;
+class _SfxMacroTabPage_Impl;
+
+class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
+{
+    SvxMacroTableDtor			aTbl;
+//#if 0 // _SOLAR__PRIVATE
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
+
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* );
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
+
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
+    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
+//#endif
+protected:
+    _SfxMacroTabPage_Impl*		mpImpl;
+
+                                _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
+
+    void						InitAndSetHandler();
+    void						FillEvents();
+    void						FillMacroList();
+    void						EnableButtons( const String& rLanguage );
+
+public:
+
+    virtual						~_SfxMacroTabPage();
+
+    void						AddEvent( const String & rEventName, sal_uInt16 nEventId );
+
+    const SvxMacroTableDtor&	GetMacroTbl() const;
+    void						SetMacroTbl( const SvxMacroTableDtor& rTbl );
+    void						ClearMacroTbl();
+
+    virtual void				ScriptChanged( const String& rLanguage );
+
+    // zum setzen / abfragen der Links
+    void						SetGetRangeLink( FNGetRangeHdl pFn );
+    FNGetRangeHdl				GetGetRangeLink() const;
+    void						SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
+    FNGetMacrosOfRangeHdl		GetGetMacrosOfRangeLink() const;
+
+    // --------- Erben aus der Basis -------------
+    virtual	sal_Bool				FillItemSet( SfxItemSet& rSet );
+    virtual	void				Reset( const SfxItemSet& rSet );
+
+    void						SetReadOnly( sal_Bool bSet );
+    sal_Bool						IsReadOnly() const;
+    void						SelectEvent( const String& rEventName, sal_uInt16 nEventId );
+};
+
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+{
+    return aTbl;
+}
+
+inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+{
+    aTbl = rTbl;
+}
+
+inline void _SfxMacroTabPage::ClearMacroTbl()
+{
+    aTbl.DelDtor();
+}
+
+class SFX2_DLLPUBLIC SfxMacroTabPage : public _SfxMacroTabPage
+{
+public:
+    SfxMacroTabPage(
+        Window* pParent,
+        const ResId& rId,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
+        const SfxItemSet& rSet
+    );
+
+    // --------- Erben aus der Basis -------------
+    static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+};
+
+class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxSingleTabDialog
+{
+public:
+    SfxMacroAssignDlg(
+        Window* pParent,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
+        SfxItemSet& rSet );
+    SfxMacroAssignDlg(
+        Window* pParent,
+        const SfxObjectShell* _pShell,
+        SfxItemSet& rSet );
+    virtual	~SfxMacroAssignDlg();
+};
+
+#endif
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index 927a6ff386..3e0caa30d7 100644..100755
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
@@ -139,7 +139,7 @@ public:
     sal_Bool			IsEmpty() const;
 };
 
-BOOL CreateFromAddress_Impl( String& rFrom );
+sal_Bool CreateFromAddress_Impl( String& rFrom );
 
 #endif // INCLUDED_SFX_MAILMODEL_HXX
 
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index e9d5ba7972..4a0a6e44a4 100644..100755
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -36,6 +36,9 @@
 
 #include <sfx2/tabdlg.hxx>
 
+#include <svtools/svmedit2.hxx>
+#include <svtools/svmedit.hxx>
+
 /* erwartet:
     SID_TEMPLATE_NAME   : 	In: StringItem, Name der Vorlage
     SID_TEMPLATE_FAMILY :	In: Familie der Vorlage
@@ -53,6 +56,8 @@ class SfxManageStyleSheetPage : public SfxTabPage
 {
     FixedText aNameFt;
     Edit aNameEd;
+    ExtMultiLineEdit aNameMLE;
+
     CheckBox	aAutoCB;
 
     FixedText aFollowFt;
@@ -64,21 +69,21 @@ class SfxManageStyleSheetPage : public SfxTabPage
     FixedText aFilterFt;
     ListBox aFilterLb;
 
+    FixedLine aDescGb;
     FixedInfo aDescFt;
     MultiLineEdit aDescED;
-    FixedLine aDescGb;
 
     SfxStyleSheetBase *pStyle;
     SfxStyleFamilies *pFamilies;
     const SfxStyleFamilyItem *pItem;
     String aBuf;
-    BOOL bModified;
+    sal_Bool bModified;
 
         // initiale Daten des Styles
     String aName;
     String aFollow;
     String aParent;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
 
 private:
 friend class SfxStyleDialog;
@@ -95,7 +100,7 @@ friend class SfxStyleDialog;
     static SfxTabPage*	Create(Window *pParent, const SfxItemSet &rAttrSet );
 
 protected:
-    virtual BOOL		FillItemSet(SfxItemSet &);
+    virtual sal_Bool		FillItemSet(SfxItemSet &);
     virtual void		Reset(const SfxItemSet &);
 
     using TabPage::ActivatePage;
diff --git a/sfx2/inc/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx
index dc24589304..dbff9d7b28 100644..100755
--- a/sfx2/inc/mieclip.hxx
+++ b/sfx2/inc/sfx2/mieclip.hxx
@@ -49,8 +49,8 @@ public:
     ~MSE40HTMLClipFormatObj();
 
 //JP 31.01.2001: old interfaces
-    SAL_DLLPRIVATE BOOL GetData( SotDataObject& );
-    SAL_DLLPRIVATE BOOL GetData( SvData& );
+    SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& );
+    SAL_DLLPRIVATE sal_Bool GetData( SvData& );
 //JP 31.01.2001: the new one
     SvStream* IsValid( SvStream& );
 
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index b66be5e15d..834436338e 100644..100755
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -47,42 +47,42 @@ class ARR\
 {\
 private:\
     T*	 pData;\
-    USHORT  nUsed;\
-    BYTE	nGrow;\
-    BYTE    nUnused;\
+    sal_uInt16  nUsed;\
+    sal_uInt8	nGrow;\
+    sal_uInt8    nUnused;\
 public:\
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG );\
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG );\
     ARR( const ARR& rOrig );\
     ~ARR();\
 \
     ARR& operator= ( const ARR& rOrig );\
 \
-    const T& GetObject( USHORT nPos ) const; \
-    T& GetObject( USHORT nPos ); \
+    const T& GetObject( sal_uInt16 nPos ) const; \
+    T& GetObject( sal_uInt16 nPos ); \
 \
-    void Insert( USHORT nPos, ARR& rIns, USHORT nStart = 0, USHORT nEnd = USHRT_MAX );\
-    void Insert( USHORT nPos, const T& rElem );\
-    void Insert( USHORT nPos, const T& rElems, USHORT nLen );\
+    void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\
+    void Insert( sal_uInt16 nPos, const T& rElem );\
+    void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\
     void Append( const T& rElem );\
 \
-    BOOL Remove( const T& rElem );\
-    USHORT Remove( USHORT nPos, USHORT nLen );\
+    sal_Bool Remove( const T& rElem );\
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );\
 \
-    USHORT Count() const { return nUsed; }\
+    sal_uInt16 Count() const { return nUsed; }\
     T* operator*();\
-    const T& operator[]( USHORT nPos ) const;\
-    T& operator[]( USHORT nPos );\
+    const T& operator[]( sal_uInt16 nPos ) const;\
+    T& operator[]( sal_uInt16 nPos );\
 \
-    BOOL Contains( const T& rItem ) const;\
+    sal_Bool Contains( const T& rItem ) const;\
     void Clear() { Remove( 0, Count() ); }\
 };\
 \
-inline void ARR::Insert( USHORT nPos, ARR& rIns, USHORT nStart, USHORT nEnd )\
+inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\
 {\
     Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\
 }\
 \
-inline void ARR::Insert( USHORT nPos, const T& rElem )\
+inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\
 {\
     Insert( nPos, rElem, 1 );\
 }\
@@ -91,24 +91,24 @@ inline T* ARR::operator*()\
 {\
     return ( nUsed==0 ? 0 : pData );\
 } \
-inline const T& ARR::operator[]( USHORT nPos ) const\
+inline const T& ARR::operator[]( sal_uInt16 nPos ) const\
 {\
     DBG_ASSERT( nPos < nUsed, "" ); \
     return *(pData+nPos);\
 } \
-inline T& ARR::operator [] (USHORT nPos) \
+inline T& ARR::operator [] (sal_uInt16 nPos) \
 {\
     DBG_ASSERT( nPos < nUsed, "" ); \
     return *(pData+nPos); \
 } \
-inline const T& ARR::GetObject( USHORT nPos ) const { return operator[](nPos); } \
-inline T& ARR::GetObject( USHORT nPos ) { return operator[](nPos); } \
+inline const T& ARR::GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+inline T& ARR::GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
 
 #ifndef _lint
 // String too long
 
 #define IMPL_OBJARRAY( ARR, T ) \
-ARR::ARR( BYTE nInitSize, BYTE nGrowSize ): \
+ARR::ARR( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ): \
     nUsed(0), \
     nGrow( nGrowSize ? nGrowSize : 1 ), \
     nUnused(nInitSize) \
@@ -134,7 +134,7 @@ ARR::ARR( const ARR& rOrig ) \
         size_t nBytes = (nUsed + nUnused) * sizeof(T); \
         pData = (T*) new char [ nBytes ]; \
         memset( pData, 0, nBytes ); \
-        for ( USHORT n = 0; n < nUsed; ++n ) \
+        for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
             *(pData+n) = *(rOrig.pData+n); \
     } \
     else \
@@ -143,14 +143,14 @@ ARR::ARR( const ARR& rOrig ) \
 \
 ARR::~ARR() \
 { \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
         ( pData+n )->T::~T(); \
     delete[] (char*) pData;\
 } \
 \
 ARR& ARR::operator= ( const ARR& rOrig )\
 { \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
         ( pData+n )->T::~T(); \
     delete[] (char*) pData;\
 \
@@ -163,7 +163,7 @@ ARR& ARR::operator= ( const ARR& rOrig )\
         size_t nBytes = (nUsed + nUnused) * sizeof(T); \
         pData = (T*) new char[ nBytes ]; \
         memset( pData, 0, nBytes ); \
-        for ( USHORT n = 0; n < nUsed; ++n ) \
+        for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
             *(pData+n) = *(rOrig.pData+n); \
     } \
     else \
@@ -176,7 +176,7 @@ void ARR::Append( const T& aElem ) \
      \
     if ( nUnused == 0 ) \
     { \
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \
         size_t nBytes = nNewSize * sizeof(T); \
         T* pNewData = (T*) new char[ nBytes ]; \
         memset( pNewData, 0, nBytes ); \
@@ -185,7 +185,7 @@ void ARR::Append( const T& aElem ) \
             memcpy( pNewData, pData, nUsed * sizeof(T) ); \
             delete[] (char*) pData;\
         } \
-        nUnused = (BYTE)(nNewSize-nUsed); \
+        nUnused = (sal_uInt8)(nNewSize-nUsed); \
         pData = pNewData; \
     } \
 \
@@ -195,17 +195,17 @@ void ARR::Append( const T& aElem ) \
     --nUnused; \
 } \
 \
-USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
+sal_uInt16 ARR::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) \
 { \
     DBG_ASSERT( (nPos+nLen) < (nUsed+1), "" ); \
     DBG_ASSERT( nLen > 0, "" ); \
 \
-    nLen = Min( (USHORT)(nUsed-nPos), (USHORT)nLen ); \
+    nLen = Min( (sal_uInt16)(nUsed-nPos), (sal_uInt16)nLen ); \
 \
     if ( nLen == 0 ) \
         return 0; \
 \
-    for ( USHORT n = nPos; n < (nPos+nLen); ++n ) \
+    for ( sal_uInt16 n = nPos; n < (nPos+nLen); ++n ) \
         ( pData+n )->T::~T(); \
 \
     if ( (nUsed-nLen) == 0 ) \
@@ -219,8 +219,8 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
 \
     if ( (nUnused+nLen) >= nGrow ) \
     { \
-        USHORT nNewUsed = nUsed-nLen; \
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \
+        sal_uInt16 nNewUsed = nUsed-nLen; \
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize, \
                     "shrink size computation failed" ); \
         size_t nBytes = nNewSize * sizeof(T); \
@@ -233,7 +233,7 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
         delete[] (char*) pData;\
         pData = pNewData; \
         nUsed = nNewUsed; \
-        nUnused = (BYTE)(nNewSize - nNewUsed); \
+        nUnused = (sal_uInt8)(nNewSize - nNewUsed); \
         return nLen; \
     } \
 \
@@ -243,39 +243,39 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \
         memmove(pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen) * sizeof(T));\
     } \
     nUsed = nUsed - nLen; \
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen); \
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen); \
     return nLen; \
 } \
 \
-BOOL ARR::Remove( const T& aElem ) \
+sal_Bool ARR::Remove( const T& aElem ) \
 { \
     if ( nUsed == 0 ) \
-        return FALSE; \
+        return sal_False; \
 \
     const T *pIter = pData + nUsed - 1; \
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter ) \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter ) \
         if ( *pIter == aElem ) \
         { \
             Remove(nUsed-n-1, 1); \
-            return TRUE; \
+            return sal_True; \
         } \
-    return FALSE; \
+    return sal_False; \
 } \
 \
-BOOL ARR::Contains( const T& rItem ) const \
+sal_Bool ARR::Contains( const T& rItem ) const \
 { \
     if ( !nUsed ) \
-        return FALSE; \
-    for ( USHORT n = 0; n < nUsed; ++n ) \
+        return sal_False; \
+    for ( sal_uInt16 n = 0; n < nUsed; ++n ) \
     { \
         const T& r2ndItem = GetObject(n); \
         if ( r2ndItem == rItem ) \
-            return TRUE; \
+            return sal_True; \
     } \
-    return FALSE; \
+    return sal_False; \
 } \
 \
-void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
+void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \
 { \
     DBG_ASSERT( nPos <= nUsed, "" ); \
      \
@@ -283,7 +283,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
     { \
         \
         /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \
-        USHORT nNewSize; \
+        sal_uInt16 nNewSize; \
         for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \
             /* empty loop */; \
         size_t nBytes = nNewSize * sizeof(T); \
@@ -296,7 +296,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
             memcpy( pNewData, pData, nUsed * sizeof(T) ); \
             delete (char*) pData;\
         } \
-        nUnused = (BYTE)(nNewSize-nUsed); \
+        nUnused = (sal_uInt8)(nNewSize-nUsed); \
         pData = pNewData; \
     } \
 \
@@ -308,7 +308,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \
 \
     memmove(pData+nPos, &rElems, sizeof(T) * nLen);	\
     nUsed = nUsed + nLen; \
-    nUnused = sal::static_int_cast< BYTE >(nUnused - nLen); \
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused - nLen); \
 }
 
 // _lint
@@ -318,26 +318,26 @@ class SFX2_DLLPUBLIC SfxPtrArr
 {
 private:
     void** pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    SfxPtrArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    SfxPtrArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     SfxPtrArr( const SfxPtrArr& rOrig );
     ~SfxPtrArr();
     SfxPtrArr& operator= ( const SfxPtrArr& rOrig );
-    void* GetObject( USHORT nPos ) const { return operator[](nPos); }
-    void*& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, void* rElem );
+    void* GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, void* rElem );
     void Append( void* rElem );
-    BOOL Replace( void* pOldElem, void* pNewElem );
-    BOOL Remove( void* rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Replace( void* pOldElem, void* pNewElem );
+    sal_Bool Remove( void* rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     inline void** operator*();
-    inline void* operator[]( USHORT nPos ) const;
-    inline void*& operator[]( USHORT nPos );
-    BOOL Contains( const void* rItem ) const;
+    inline void* operator[]( sal_uInt16 nPos ) const;
+    inline void*& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const void* rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -346,13 +346,13 @@ inline void** SfxPtrArr::operator*()
     return ( nUsed==0 ? 0 : pData );
 }
 
-inline void* SfxPtrArr::operator[]( USHORT nPos ) const
+inline void* SfxPtrArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < nUsed, "" );
     return *(pData+nPos);
 }
 
-inline void*& SfxPtrArr::operator [] (USHORT nPos)
+inline void*& SfxPtrArr::operator [] (sal_uInt16 nPos)
 {
     DBG_ASSERT( nPos < nUsed, "" );
     return *(pData+nPos);
@@ -363,35 +363,35 @@ inline void*& SfxPtrArr::operator [] (USHORT nPos)
 class ARR: public SfxPtrArr\
 {\
 public:\
-   ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\
+   ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
        SfxPtrArr(nIni,nGrowValue) \
    {}\
    ARR( const ARR& rOrig ):\
        SfxPtrArr(rOrig) \
    {}\
-   T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-   T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-   void Insert( USHORT nPos, T aElement ) {\
+   T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+   T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+   void Insert( sal_uInt16 nPos, T aElement ) {\
        SfxPtrArr::Insert(nPos,(void *)aElement);\
    }\
    void Append( T aElement ) {\
        SfxPtrArr::Append((void *)aElement);\
    }\
-   BOOL Replace( T aOldElem, T aNewElem ) {\
+   sal_Bool Replace( T aOldElem, T aNewElem ) {\
        return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\
    }\
    void Remove( T aElement ) {\
        SfxPtrArr::Remove((void*)aElement);\
    }\
-   void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+   void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
        SfxPtrArr::Remove( nPos, nLen ); \
    }\
    T* operator *() {\
        return (T*) SfxPtrArr::operator*();\
    }\
-   T operator[]( USHORT nPos ) const { \
+   T operator[]( sal_uInt16 nPos ) const { \
        return (T) SfxPtrArr::operator[](nPos); } \
-   T& operator[]( USHORT nPos ) { \
+   T& operator[]( sal_uInt16 nPos ) { \
        return (T&) SfxPtrArr::operator[](nPos); } \
    void Clear() { Remove( 0, Count() ); }\
 };
@@ -400,25 +400,25 @@ class ByteArr
 {
 private:
     char* pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    ByteArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    ByteArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     ByteArr( const ByteArr& rOrig );
     ~ByteArr();
     ByteArr& operator= ( const ByteArr& rOrig );
-    char GetObject( USHORT nPos ) const { return operator[](nPos); }
-    char& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, char rElem );
+    char GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    char& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, char rElem );
     void Append( char rElem );
-    BOOL Remove( char rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Remove( char rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     char* operator*();
-    char operator[]( USHORT nPos ) const;
-    char& operator[]( USHORT nPos );
-    BOOL Contains( const char rItem ) const;
+    char operator[]( sal_uInt16 nPos ) const;
+    char& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const char rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -431,15 +431,15 @@ inline char* ByteArr::operator*()
 class ARR: public ByteArr\
 {\
 public:\
-        ARR( BYTE nIni=nI, BYTE nGrow=nG ):\
+        ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrow=nG ):\
             ByteArr(nIni,nGrow) \
         {}\
         ARR( const ARR& rOrig ):\
             ByteArr(rOrig) \
         {}\
-        T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-        T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-        void Insert( USHORT nPos, T aElement ) {\
+        T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+        T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+        void Insert( sal_uInt16 nPos, T aElement ) {\
             ByteArr::Insert(nPos,(char)aElement);\
         }\
         void Append( T aElement ) {\
@@ -448,15 +448,15 @@ public:\
         void Remove( T aElement ) {\
             ByteArr::Remove((char)aElement);\
         }\
-        void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+        void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
             ByteArr::Remove( nPos, nLen ); \
         }\
         T* operator *() {\
             return (T*) ByteArr::operator*();\
         }\
-        T operator[]( USHORT nPos ) const { \
+        T operator[]( sal_uInt16 nPos ) const { \
             return (T) ByteArr::operator[](nPos); } \
-        T& operator[]( USHORT nPos ) { \
+        T& operator[]( sal_uInt16 nPos ) { \
             return (T&) ByteArr::operator[](nPos); } \
         void Clear() { Remove( 0, Count() ); }\
 };
@@ -465,25 +465,25 @@ class WordArr
 {
 private:
     short* pData;
-    USHORT nUsed;
-    BYTE nGrow;
-    BYTE nUnused;
+    sal_uInt16 nUsed;
+    sal_uInt8 nGrow;
+    sal_uInt8 nUnused;
 public:
-    WordArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 );
+    WordArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
     WordArr( const WordArr& rOrig );
     ~WordArr();
     WordArr& operator= ( const WordArr& rOrig );
-    short GetObject( USHORT nPos ) const { return operator[](nPos); }
-    short& GetObject( USHORT nPos ) { return operator[](nPos); }
-    void Insert( USHORT nPos, short rElem );
+    short GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
+    short& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
+    void Insert( sal_uInt16 nPos, short rElem );
     void Append( short rElem );
-    BOOL Remove( short rElem );
-    USHORT Remove( USHORT nPos, USHORT nLen );
-    USHORT Count() const { return nUsed; }
+    sal_Bool Remove( short rElem );
+    sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
+    sal_uInt16 Count() const { return nUsed; }
     short* operator*();
-    short operator[]( USHORT nPos ) const;
-    short& operator[]( USHORT nPos );
-    BOOL Contains( const short rItem ) const;
+    short operator[]( sal_uInt16 nPos ) const;
+    short& operator[]( sal_uInt16 nPos );
+    sal_Bool Contains( const short rItem ) const;
     void Clear() { Remove( 0, Count() ); }
 };
 
@@ -496,15 +496,15 @@ inline short* WordArr::operator*()
 class ARR: public WordArr\
 {\
 public:\
-        ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\
+        ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
             WordArr(nIni,nGrowValue) \
         {}\
         ARR( const ARR& rOrig ):\
             WordArr(rOrig) \
         {}\
-        T GetObject( USHORT nPos ) const { return operator[](nPos); } \
-        T& GetObject( USHORT nPos ) { return operator[](nPos); } \
-        void Insert( USHORT nPos, T aElement ) {\
+        T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
+        T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
+        void Insert( sal_uInt16 nPos, T aElement ) {\
             WordArr::Insert(nPos,(short)aElement);\
         }\
         void Append( T aElement ) {\
@@ -513,15 +513,15 @@ public:\
         void Remove( T aElement ) {\
             WordArr::Remove((short)aElement);\
         }\
-        void Remove( USHORT nPos, USHORT nLen = 1 ) {\
+        void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
             WordArr::Remove( nPos, nLen ); \
         }\
         T* operator *() {\
             return (T*) WordArr::operator*();\
         }\
-        T operator[]( USHORT nPos ) const { \
+        T operator[]( sal_uInt16 nPos ) const { \
             return (T) WordArr::operator[](nPos); } \
-        T& operator[]( USHORT nPos ) { \
+        T& operator[]( sal_uInt16 nPos ) { \
             return (T&) WordArr::operator[](nPos); } \
         void Clear() { Remove( 0, Count() ); }\
 };
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/sfx2/minfitem.hxx
index 77bafc2f4c..044ab8c8f0 100644..100755
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/sfx2/minfitem.hxx
@@ -44,7 +44,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
 
 public:
     TYPEINFO();
-    SfxMacroInfoItem( USHORT nWhich,
+    SfxMacroInfoItem( sal_uInt16 nWhich,
                     const BasicManager* pMgr,
                     const String &rLibName,
                     const String &rModuleName,
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index bcd6f7d21b..1a6f314d74 100644..100755
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -35,7 +35,7 @@ DECL_OBJARRAY( ARR##arr_, T, nI, nG ); \
 class ARR: private ARR##arr_ \
 { \
 public: \
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
         ARR##arr_( nInitSize, nGrowSize ) \
     {} \
 \
@@ -43,14 +43,14 @@ public: \
         ARR##arr_( rOrig ) \
     {} \
 \
-    USHORT		Count() const { return ARR##arr_::Count(); } \
+    sal_uInt16		Count() const { return ARR##arr_::Count(); } \
     void		Push( const T& rElem ) { Append( rElem ); } \
-    const T& Top( USHORT nLevel = 0 ) const \
+    const T& Top( sal_uInt16 nLevel = 0 ) const \
                 { return (*this)[Count()-nLevel-1]; } \
     const T& Bottom() const { return (*this)[0]; } \
     T		 Pop(); \
     void		Clear() { ARR##arr_::Clear(); } \
-    BOOL		Contains( const T& rItem ) const \
+    sal_Bool		Contains( const T& rItem ) const \
                 { return ARR##arr_::Contains( rItem ); } \
 }
 
@@ -68,7 +68,7 @@ DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \
 class ARR: private ARR##arr_ \
 { \
 public: \
-    ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \
+    ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
         ARR##arr_( nInitSize, nGrowSize ) \
     {} \
 \
@@ -76,11 +76,11 @@ public: \
         ARR##arr_( rOrig ) \
     {} \
 \
-    USHORT		Count() const { return ARR##arr_::Count(); } \
+    sal_uInt16		Count() const { return ARR##arr_::Count(); } \
     void		Push( T rElem ) { Append( rElem ); } \
-    BOOL        Replace( T rOldElem, T rNewElem ) \
+    sal_Bool        Replace( T rOldElem, T rNewElem ) \
                 { return ARR##arr_::Replace( rOldElem, rNewElem ); } \
-    T			Top( USHORT nLevel = 0 ) const \
+    T			Top( sal_uInt16 nLevel = 0 ) const \
                 { return (*this)[Count()-nLevel-1]; } \
     T			Bottom() const { return (*this)[0]; } \
     T			Pop() \
@@ -91,7 +91,7 @@ public: \
     T*		 operator*() \
                 { return &(*this)[Count()-1]; } \
     void		Clear() { ARR##arr_::Clear(); } \
-    BOOL		Contains( const T pItem ) const \
+    sal_Bool		Contains( const T pItem ) const \
                 { return ARR##arr_::Contains( pItem ); } \
 }
 
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 092d3a5333..849769f358 100644..100755
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -47,23 +47,23 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
     String					aTitle;
     SfxVirtualMenu* 		pOwnMenu;
     SfxVirtualMenu* 		pSubMenu;
-    BOOL					b_ShowStrings;
-    BOOL					b_UnusedDummy;
+    sal_Bool					b_ShowStrings;
+    sal_Bool					b_UnusedDummy;
 
 public:
                             SfxMenuControl();
-                            SfxMenuControl( BOOL bShowStrings );
-                            SfxMenuControl( USHORT, SfxBindings&);
+                            SfxMenuControl( sal_Bool bShowStrings );
+                            SfxMenuControl( sal_uInt16, SfxBindings&);
 
-    static SfxMenuControl* 	CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings );
-    static void 			RegisterControl( USHORT nSlotId = 0, SfxModule *pMod=NULL );
+    static SfxMenuControl* 	CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
+    static void 			RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
 
                             ~SfxMenuControl();
 
         using SfxControllerItem::Bind;
-    void					Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
+    void					Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
                                   const String& rTitle, SfxBindings& rBindings );
-    void					Bind( SfxVirtualMenu* pOwnMenu, USHORT nId,
+    void					Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
                                   SfxVirtualMenu& rSubMenu,
                                   const String& rTitle, SfxBindings& rBindings );
 
@@ -73,13 +73,13 @@ public:
     void					SetOwnMenu( SfxVirtualMenu* pMenu );
     void 					RemovePopup();
 
-    virtual void			StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void			StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
 
-    static SfxMenuControl*	  CreateControl( USHORT nId, Menu &, SfxBindings & );
-    static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, SfxBindings&, SfxVirtualMenu* );
-    static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
-    static BOOL             IsSpecialControl( USHORT nId, SfxModule* );
+    static SfxMenuControl*	  CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
+    static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
+    static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
+    static sal_Bool             IsSpecialControl( sal_uInt16 nId, SfxModule* );
     static void             RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
 
 };
@@ -88,25 +88,25 @@ class SfxUnoMenuControl : public SfxMenuControl
 {
     SfxUnoControllerItem*	pUnoCtrl;
 public:
-                            SfxUnoMenuControl( const String&, USHORT nId, Menu&,
+                            SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
                                                 SfxBindings&, SfxVirtualMenu* );
-                            SfxUnoMenuControl( const String&, USHORT nId, Menu&,
+                            SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
                                                const String&,
                                                 SfxBindings&, SfxVirtualMenu* );
                             ~SfxUnoMenuControl();
     void					Select();
 };
 
-typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & );
+typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & );
 
 struct SfxMenuCtrlFactory
 {
     SfxMenuControlCtor	pCtor;
     TypeId				nTypeId;
-    USHORT				nSlotId;
+    sal_uInt16				nSlotId;
 
     SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -124,13 +124,13 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
 }
 
 #define SFX_DECL_MENU_CONTROL() \
-        static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \
-        SfxMenuControl* Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \
+        SfxMenuControl* Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \
                { return new Class(nId, rMenu, rBindings); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
@@ -138,15 +138,15 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
 class SfxAppMenuControl_Impl : public SfxMenuControl
 {
     PopupMenu*	pMenu;
-    ULONG       m_nSymbolsStyle;
-    BOOL		m_bShowMenuImages;
+    sal_uIntPtr       m_nSymbolsStyle;
+    sal_Bool		m_bShowMenuImages;
 
 protected:
     DECL_LINK( Activate, Menu * );
 
 public:
     SFX_DECL_MENU_CONTROL();
-    SfxAppMenuControl_Impl( USHORT nPos, Menu& rMenu, SfxBindings& rBindings );
+    SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
     ~SfxAppMenuControl_Impl();
 };
 
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 3f5e6fb29d..f5f421e41e 100644..100755
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 
 #include <vcl/menu.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/link.hxx>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -59,11 +59,11 @@ friend class SfxPopupMenuManager;
 
     SfxVirtualMenu* 		pMenu;			// das eigentliche Menu
     SfxVirtualMenu* 		pOldMenu;		// only while reconfiguring
-    BOOL					bMenuBar;		// Popup oder MenuBar
+    sal_Bool					bMenuBar;		// Popup oder MenuBar
     SfxBindings*			pBindings;
     ResMgr* 				pResMgr;
     sal_uInt32              nType;
-    BOOL					bAddClipboardFuncs : 1;
+    sal_Bool					bAddClipboardFuncs : 1;
 
     void					Construct( SfxVirtualMenu& rMenu );
 
@@ -71,7 +71,7 @@ protected:
                             SfxMenuManager( Menu*, SfxBindings& );
                             SfxMenuManager( const ResId&, SfxBindings& );
                             ~SfxMenuManager();
-    USHORT                  GetItemPos( USHORT nId );
+    sal_uInt16                  GetItemPos( sal_uInt16 nId );
     sal_uInt32              GetType() { return nType; }
 public:
 
@@ -86,9 +86,9 @@ public:
     const SfxBindings&		GetBindings() const { return *pBindings; }
     void					SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*                 GetResMgr() const { return pResMgr; }
-    void					SetPopupMenu( USHORT nId, PopupMenu *pMenu );
+    void					SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
 
-    void			Construct_Impl( Menu* pMenu, BOOL bWithHelp );
+    void			Construct_Impl( Menu* pMenu, sal_Bool bWithHelp );
 };
 
 //--------------------------------------------------------------------
@@ -118,20 +118,20 @@ public:
     // Changing code which relies on Popup would need much more effort.
     static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow );
 
-    USHORT				Execute( const Point& rPos, Window *pWindow );
-    USHORT              Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
-    USHORT              Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
+    sal_uInt16				Execute( const Point& rPos, Window *pWindow );
+    sal_uInt16              Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 );
+    sal_uInt16              Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... );
 
     // @deprecated (start)!!
     // Don't use these methods any longer. The whole class will be removed in the future.
     // Changing code which relies on these methods would need much more effort!
     void                StartInsert();
     void				EndInsert();
-    void				CheckItem( USHORT, BOOL );
-    void				RemoveItem( USHORT );
-    void 				InsertItem( USHORT, const String&, MenuItemBits,
-                                USHORT nPos = MENU_APPEND );
-    void 				InsertSeparator( USHORT nPos = MENU_APPEND );
+    void				CheckItem( sal_uInt16, sal_Bool );
+    void				RemoveItem( sal_uInt16 );
+    void 				InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId,
+                                sal_uInt16 nPos = MENU_APPEND );
+    void 				InsertSeparator( sal_uInt16 nPos = MENU_APPEND );
     // @deprecated (end)
     
     void                RemoveDisabledEntries();
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 89528127b4..2ccfc00999 100644..100755
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -34,7 +34,7 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/imgdef.hxx>
 #include <sal/types.h>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 
 class ImageList;
 
@@ -89,10 +89,10 @@ public:
     virtual SfxTabPage*			CreateTabPage( sal_uInt16 nId,
                                                Window* pParent,
                                                const SfxItemSet& rSet );
-    virtual void                Invalidate(USHORT nId = 0);
-    BOOL						IsActive() const;
+    virtual void                Invalidate(sal_uInt16 nId = 0);
+    sal_Bool						IsActive() const;
 
-    /*virtual*/ bool            IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const;
+    /*virtual*/ bool            IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
 
     static SfxModule*           GetActiveModule( SfxViewFrame* pFrame=NULL );
     static FieldUnit			GetCurrentFieldUnit();
@@ -104,7 +104,7 @@ public:
     SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
-    SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
+    SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 997a033e9d..6cee03709e 100644..100755
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -30,6 +30,9 @@
 
 #include <tools/rtti.hxx>
 #include <sfx2/shell.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
 
 //--------------------------------------------------------------------
 
@@ -109,14 +112,14 @@ enum SfxSlotKind
 
 struct SfxTypeAttrib
 {
-    USHORT					nAID;
+    sal_uInt16					nAID;
     const char*	pName;
 };
 
 struct SfxType
 {
     TypeId			aTypeId;
-    USHORT			nAttribs;
+    sal_uInt16			nAttribs;
     SfxTypeAttrib	aAttrib[16];
 
     const TypeId&	Type() const
@@ -128,7 +131,7 @@ struct SfxType
 struct SfxType0
 {
     TypeId			aTypeId;
-    USHORT			nAttribs;
+    sal_uInt16			nAttribs;
 
     const TypeId&	Type() const
                     { return aTypeId; }
@@ -139,7 +142,7 @@ struct SfxType0
 #define SFX_DECL_TYPE(n)    struct SfxType##n                   \
                             { 									\
                                 TypeId			aTypeId; 		\
-                                USHORT			nAttribs; 		\
+                                sal_uInt16			nAttribs; 		\
                                 SfxTypeAttrib	aAttrib[n]; 	\
                             }
 
@@ -238,7 +241,7 @@ struct SfxFormalArgument
 {
     const SfxType*			pType;	// Typ des Parameters (SfxPoolItem Subklasse)
     const char*	pName;	// Name des Parameters
-    USHORT      			nSlotId;// Slot-Id zur Identifikation des Parameters
+    sal_uInt16      			nSlotId;// Slot-Id zur Identifikation des Parameters
 
     const TypeId&			Type() const
                             { return pType->aTypeId; }
@@ -251,13 +254,13 @@ struct SfxFormalArgument
 class SfxSlot
 {
 public:
-    USHORT						nSlotId;		// in Shell eindeutige Slot-Id
-    USHORT						nGroupId;		// f"ur Konfigurations-Bereich
-    ULONG						nHelpId;		// i.d.R. == nSlotId
-    ULONG						nFlags;			// artihm. veroderte Flags
+    sal_uInt16						nSlotId;		// in Shell eindeutige Slot-Id
+    sal_uInt16						nGroupId;		// f"ur Konfigurations-Bereich
+    sal_uIntPtr						nHelpId;		// i.d.R. == nSlotId
+    sal_uIntPtr						nFlags;			// artihm. veroderte Flags
 
-    USHORT						nMasterSlotId;	// Enum-Slot bzw. Which-Id
-    USHORT						nValue;			// Wert, falls Enum-Slot
+    sal_uInt16						nMasterSlotId;	// Enum-Slot bzw. Which-Id
+    sal_uInt16						nValue;			// Wert, falls Enum-Slot
 
     SfxExecFunc			        fnExec;			// Funktion zum Ausf"uhren
     SfxStateFunc		        fnState;		// Funktion f"ur Status
@@ -270,7 +273,7 @@ public:
     const SfxSlot*				pNextSlot;		// mit derselben Status-Methode
 
     const SfxFormalArgument*	pFirstArgDef;	// erste formale Argument-Definition
-    USHORT						nArgDefCount;	// Anzahl der formalen Argumente
+    sal_uInt16						nArgDefCount;	// Anzahl der formalen Argumente
     long						nDisableFlags;		// DisableFlags, die vorhanden sein
                                                 // m"ussen, damit der Slot enabled ist
     const char*		pUnoName;		// UnoName des Slots
@@ -278,19 +281,21 @@ public:
 public:
 
     SfxSlotKind 	GetKind() const;
-    USHORT			GetSlotId() const;
-    ULONG			GetHelpId() const;
-    ULONG			GetMode() const;
-    BOOL			IsMode( ULONG nMode ) const;
-    USHORT			GetGroupId() const;
-    USHORT			GetMasterSlotId() const { return nMasterSlotId; }
-    USHORT			GetWhich( const SfxItemPool &rPool ) const;
-    USHORT			GetValue() const { return nValue; }
+    sal_uInt16			GetSlotId() const;
+    sal_uIntPtr			GetHelpId() const;
+    sal_uIntPtr			GetMode() const;
+    sal_Bool			IsMode( sal_uIntPtr nMode ) const;
+    sal_uInt16			GetGroupId() const;
+    sal_uInt16			GetMasterSlotId() const { return nMasterSlotId; }
+    sal_uInt16			GetWhich( const SfxItemPool &rPool ) const;
+    sal_uInt16			GetValue() const { return nValue; }
     const SfxType*  GetType() const { return pType; }
     const char*		GetUnoName() const { return pUnoName; }
+    SFX2_DLLPUBLIC rtl::OString    GetCommand() const;
+    SFX2_DLLPUBLIC rtl::OUString    GetCommandString() const;
 
-    USHORT			GetFormalArgumentCount() const { return nArgDefCount; }
-    const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const
+    sal_uInt16			GetFormalArgumentCount() const { return nArgDefCount; }
+    const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const
                     { return pFirstArgDef[nNo]; }
 
     SfxExecFunc 	GetExecFnc() const { return fnExec; }
@@ -304,14 +309,14 @@ public:
 
 // returns the id of the function
 
-inline USHORT SfxSlot::GetSlotId() const
+inline sal_uInt16 SfxSlot::GetSlotId() const
 {
     return nSlotId;
 }
 //--------------------------------------------------------------------
 // returns the help-id of the slot
 
-inline ULONG SfxSlot::GetHelpId() const
+inline sal_uIntPtr SfxSlot::GetHelpId() const
 {
     return nHelpId;
 }
@@ -320,7 +325,7 @@ inline ULONG SfxSlot::GetHelpId() const
 
 // returns	a bitfield with	flags
 
-inline ULONG SfxSlot::GetMode() const
+inline sal_uIntPtr SfxSlot::GetMode() const
 {
     return nFlags;
 }
@@ -328,7 +333,7 @@ inline ULONG SfxSlot::GetMode() const
 
 // determines if the specified mode	is assigned
 
-inline BOOL SfxSlot::IsMode( ULONG nMode ) const
+inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const
 {
     return (nFlags & nMode)	!= 0;
 }
@@ -336,7 +341,7 @@ inline BOOL SfxSlot::IsMode( ULONG nMode ) const
 
 // returns the id of the associated	group
 
-inline USHORT SfxSlot::GetGroupId() const
+inline sal_uInt16 SfxSlot::GetGroupId() const
 {
     return nGroupId;
 
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 692c5a2f37..261faa7337 100644..100755
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -52,13 +52,13 @@ class SFX2_DLLPUBLIC SfxSlotPool
     SfxSlotPool*				_pParentPool;
     ResMgr*						_pResMgr;
     SfxInterfaceArr_Impl*		_pInterfaces;
-    USHORT						_nCurGroup;
-    USHORT						_nCurInterface;
-    USHORT						_nCurMsg;
+    sal_uInt16						_nCurGroup;
+    sal_uInt16						_nCurInterface;
+    sal_uInt16						_nCurMsg;
     SfxSlotArr_Impl*			_pUnoSlots;
 
 private:
-    const SfxSlot* SeekSlot( USHORT nObject );
+    const SfxSlot* SeekSlot( sal_uInt16 nObject );
 
 public:
                         SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0);
@@ -71,14 +71,14 @@ public:
 
     static SfxSlotPool& GetSlotPool( SfxViewFrame *pFrame=NULL );
 
-    USHORT				GetGroupCount();
-    String				SeekGroup( USHORT nNo );
+    sal_uInt16				GetGroupCount();
+    String				SeekGroup( sal_uInt16 nNo );
     const SfxSlot*		FirstSlot();
     const SfxSlot*		NextSlot();
-    const SfxSlot*		GetSlot( USHORT nId );
-    const SfxSlot*		GetUnoSlot( USHORT nId );
+    const SfxSlot*		GetSlot( sal_uInt16 nId );
+    const SfxSlot*		GetUnoSlot( sal_uInt16 nId );
     const SfxSlot*		GetUnoSlot( const String& rUnoName );
-    TypeId				GetSlotType( USHORT nSlotId ) const;
+    TypeId				GetSlotType( sal_uInt16 nSlotId ) const;
 };
 
 //--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx
index 34bcc891cb..932077fc2a 100644..100755
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/sfx2/inc/sfx2/navigat.hxx
@@ -39,7 +39,7 @@ class SfxNavigatorWrapper : public SfxChildWindow
 
 public:
                         SfxNavigatorWrapper( Window* pParent ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo );
 
@@ -58,7 +58,7 @@ public:
 
     virtual void 		Resize();
     virtual void        Resizing( Size& rSize );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index d9baf16824..bce4293b30 100644..100755
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -79,20 +79,20 @@ private:
 
 public:
 
-    SfxNewFileDialog(Window *pParent, USHORT nFlags = 0);
+    SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0);
     ~SfxNewFileDialog();
 
-        // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist
-        // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen
+        // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist
+        // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen
         // erfragt werden
-    BOOL IsTemplate() const;
+    sal_Bool IsTemplate() const;
     String GetTemplateRegion() const;
     String GetTemplateName() const;
     String GetTemplateFileName() const;
 
     // load template methods
-    USHORT  GetTemplateFlags()const;
-    void    SetTemplateFlags(USHORT nSet);
+    sal_uInt16  GetTemplateFlags()const;
+    void    SetTemplateFlags(sal_uInt16 nSet);
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index b7fa817b78..b7fa817b78 100644..100755
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index e7716f99c8..c39d2dcdc6 100644..100755
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -54,27 +54,27 @@ friend class SfxSlotPool;
     const char* 			pName;			// Sfx-internal name of interface
     const SfxInterface*     pGenoType;      // base interface
     SfxSlot*                pSlots;         // SlotMap
-    USHORT                  nCount;         // number of slots in SlotMap
+    sal_uInt16                  nCount;         // number of slots in SlotMap
     SfxInterfaceId			nClassId;		// Id of interface
     ResId					aNameResId; 	// ResId of external interface name
     SfxInterface_Impl*		pImpData;
 
-    SfxSlot*                operator[]( USHORT nPos ) const;
+    SfxSlot*                operator[]( sal_uInt16 nPos ) const;
 
 public:
                             SfxInterface( const char *pClass,
                                           const ResId& rResId,
                                           SfxInterfaceId nClassId,
                                           const SfxInterface* pGeno,
-                                          SfxSlot &rMessages, USHORT nMsgCount );
+                                          SfxSlot &rMessages, sal_uInt16 nMsgCount );
     virtual                 ~SfxInterface();
 
-    void                    SetSlotMap( SfxSlot& rMessages, USHORT nMsgCount );
-    inline USHORT           Count() const;
+    void                    SetSlotMap( SfxSlot& rMessages, sal_uInt16 nMsgCount );
+    inline sal_uInt16           Count() const;
 
     const SfxSlot*          GetRealSlot( const SfxSlot * ) const;
-    const SfxSlot*          GetRealSlot( USHORT nSlotId ) const;
-    virtual const SfxSlot*	GetSlot( USHORT nSlotId ) const;
+    const SfxSlot*          GetRealSlot( sal_uInt16 nSlotId ) const;
+    virtual const SfxSlot*	GetSlot( sal_uInt16 nSlotId ) const;
     const SfxSlot*			GetSlot( const String& rCommand ) const;
 
     const char*             GetClassName() const { return pName; }
@@ -87,21 +87,21 @@ public:
     const SfxInterface* 	GetGenoType() const { return pGenoType; }
     const SfxInterface*		GetRealInterfaceForSlot( const SfxSlot* ) const;
 
-    void					RegisterObjectBar( USHORT, const ResId&, const String* pST=0 );
-    void					RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
-    void					RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 );
-    void					RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 );
+    void					RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 );
+    void					RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
+    void					RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 );
+    void					RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 );
     void					RegisterStatusBar( const ResId& );
-    const ResId&			GetObjectBarResId( USHORT nNo ) const;
-    USHORT                  GetObjectBarPos( USHORT nNo ) const;
-    sal_uInt32              GetObjectBarFeature( USHORT nNo ) const;
-    USHORT					GetObjectBarCount() const;
-    void                    SetObjectBarPos( USHORT nPos, USHORT nId );
-    const String*           GetObjectBarName( USHORT nNo ) const;
-    BOOL					IsObjectBarVisible( USHORT nNo) const;
-    sal_uInt32				GetChildWindowFeature( USHORT nNo ) const;
-    sal_uInt32				GetChildWindowId( USHORT nNo ) const;
-    USHORT					GetChildWindowCount() const;
+    const ResId&			GetObjectBarResId( sal_uInt16 nNo ) const;
+    sal_uInt16                  GetObjectBarPos( sal_uInt16 nNo ) const;
+    sal_uInt32              GetObjectBarFeature( sal_uInt16 nNo ) const;
+    sal_uInt16					GetObjectBarCount() const;
+    void                    SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId );
+    const String*           GetObjectBarName( sal_uInt16 nNo ) const;
+    sal_Bool					IsObjectBarVisible( sal_uInt16 nNo) const;
+    sal_uInt32				GetChildWindowFeature( sal_uInt16 nNo ) const;
+    sal_uInt32				GetChildWindowId( sal_uInt16 nNo ) const;
+    sal_uInt16					GetChildWindowCount() const;
     void					RegisterPopupMenu( const ResId& );
     const ResId&			GetPopupMenuResId() const;
     const ResId&			GetStatusBarResId() const;
@@ -118,7 +118,7 @@ public:
 
 // returns the number of functions in this cluster
 
-inline USHORT SfxInterface::Count() const
+inline sal_uInt16 SfxInterface::Count() const
 {
     return nCount;
 }
@@ -127,7 +127,7 @@ inline USHORT SfxInterface::Count() const
 
 // returns a function by position in the array
 
-inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
+inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const
 {
     return nPos < nCount? pSlots+nPos: 0;
 }
@@ -135,15 +135,15 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
 class SfxIFConfig_Impl
 {
 friend class SfxInterface;
-    USHORT					nCount;
+    sal_uInt16					nCount;
     SfxObjectUIArr_Impl*	pObjectBars;
 
 public:
                     SfxIFConfig_Impl();
                     ~SfxIFConfig_Impl();
-    BOOL    		Store(SvStream&);
-    void            RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
-    USHORT          GetType();
+    sal_Bool    		Store(SvStream&);
+    void            RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
+    sal_uInt16          GetType();
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index d3988fd76c..e01f2664ac 100644..100755
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
 
 public:
                              TYPEINFO();
-                             SfxObjectItem( USHORT nWhich=0, SfxShell *pSh=0 );
+                             SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 );
 
     virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 38bf3ff1fd..50ab650fc8 100644..100755
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -69,7 +69,6 @@ class BasicManager;
 class SfxMedium;
 class SfxObjectFactory;
 class SfxDocumentInfoDialog;
-class SfxEventConfigItem_Impl;
 class SfxStyleSheetBasePool;
 class INote;
 class SfxStyleSheetPool;
@@ -157,11 +156,6 @@ typedef sal_uInt32 SfxObjectShellFlags;
 
 //--------------------------------------------------------------------
 
-#define	SEQUENCE				::com::sun::star::uno::Sequence
-#define	OUSTRING				::rtl::OUString
-
-//--------------------------------------------------------------------
-
 #define HIDDENINFORMATION_RECORDEDCHANGES       0x0001
 #define HIDDENINFORMATION_NOTES                 0x0002
 #define HIDDENINFORMATION_DOCUMENTVERSIONS      0x0004
@@ -194,12 +188,6 @@ in fremde Objekte integriert werden k"onnen.
 
 ----------------------------------------------------------------------*/
 
-enum SfxTitleQuery
-{
-    SFX_TITLE_QUERY_SAVE_NAME_PROPOSAL
-};
-
-
 class SfxToolBoxConfig;
 struct TransferableObjectDescriptor;
 
@@ -208,6 +196,7 @@ class SFX2_DLLPUBLIC SfxObjectShell :
     public ::comphelper::IEmbeddedHelper, public ::sfx2::IXmlIdRegistrySupplier
 {
 friend struct ModifyBlocker_Impl;
+friend class SfxObjectShellLock;
 
 private:
     struct SfxObjectShell_Impl* pImp;				// interne Daten
@@ -263,7 +252,7 @@ public:
                                 GetCurrentComponent();
     static void					SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
 
-    virtual	void                Invalidate(USHORT nId = 0);
+    virtual	void                Invalidate(sal_uInt16 nId = 0);
 
     void                        SetFlags( SfxObjectShellFlags eFlags );
     SfxObjectShellFlags         GetFlags( ) const ;
@@ -317,7 +306,7 @@ public:
     sal_Bool                    DoLoad( SfxMedium* pMedium );
     sal_Bool                    DoSave();
     sal_Bool                    DoSaveAs( SfxMedium &rNewStor );
-    sal_Bool                    DoSaveObjectAs( SfxMedium &rNewStor, BOOL bCommit );
+    sal_Bool                    DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit );
 
     // TODO/LATER: currently only overloaded in Calc, should be made non-virtual
     virtual sal_Bool            DoSaveCompleted( SfxMedium* pNewStor=0 );
@@ -344,9 +333,9 @@ public:
     void                        SetConfigOptionsChecked( sal_Bool bChecked );
 
     // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action
-    virtual sal_Bool            QuerySlotExecutable( USHORT nSlotId );
+    virtual sal_Bool            QuerySlotExecutable( sal_uInt16 nSlotId );
 
-    sal_Bool                    SaveChildren(BOOL bObjectsOnly=FALSE);
+    sal_Bool                    SaveChildren(sal_Bool bObjectsOnly=sal_False);
     sal_Bool                    SaveAsChildren( SfxMedium &rMedium );
     sal_Bool                    SwitchChildrenPersistance(
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
@@ -363,36 +352,11 @@ public:
     sal_uInt16                  GetScriptingSignatureState();
     void                        SignScriptingContent();
 
-    virtual String              QueryTitle( SfxTitleQuery ) const;
     virtual	SfxDocumentInfoDialog* CreateDocumentInfoDialog(
                                         Window *pParent, const SfxItemSet& );
-    sal_Bool                    IsBasic( const String & rCode, SbxObject * pVCtrl = NULL );
 
     ErrCode                     CallBasic( const String& rMacro, const String& rBasicName,
-                                    SbxObject* pVCtrl, SbxArray* pArgs = 0, SbxValue* pRet = 0 );
-    ErrCode                     Call( const String & rCode, sal_Bool bIsBasicReturn, SbxObject * pVCtrl = NULL );
-
-    ErrCode                     CallScript(
-        const String & rScriptType, const String & rCode, const void* pArgs = NULL, void* pRet = NULL );
-
-    /** calls a StarBasic script without magic
-    @param _rMacroName
-        specifies the name of the method to execute
-    @param _rLocation
-        specifies the location of the script to execute. Allowed values are "application" and "document".
-    @param _pArguments
-        This is a pointer to a Sequence< Any >. All elements of the Sequence are wrapped into Basic objects
-        and passed as arguments to the method specified by <arg>_rMacroName</arg>
-    @param _pReturn
-        If not <NULL/>, the Any pointed to by this argument contains the return value of the (synchronous) call
-        to the StarBasic macro
-    */
-    ErrCode     CallStarBasicScript(
-        const String& _rMacroName,
-        const String& _rLocation,
-        const void* _pArguments = NULL,
-        void* _pReturn = NULL
-    );
+                                    SbxArray* pArgs = 0, SbxValue* pRet = 0 );
 
     ErrCode     CallXScript(
         const String& rScriptURL,
@@ -496,7 +460,7 @@ public:
     SfxObjectCreateMode			GetCreateMode() const { return eCreateMode; }
     virtual void				MemoryError();
     SfxProgress*				GetProgress() const;
-    void                        SetWaitCursor( BOOL bSet ) const;
+    void                        SetWaitCursor( sal_Bool bSet ) const;
 
     // Naming Interface
     void                        SetTitle( const String& rTitle );
@@ -599,10 +563,10 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >	GetBaseModel() const;
     // Nur uebergangsweise fuer die Applikationen !!!
 
-    virtual SEQUENCE< OUSTRING >	GetEventNames();
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
 
     Window*                     GetDialogParent( SfxMedium* pMedium=0 );
-    String                      UpdateTitle( SfxMedium* pMed=NULL, USHORT nDocViewNo=0 );
+    String                      UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 );
     static SfxObjectShell*		CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
     static SfxObjectShell*		CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD );
     static SfxObjectShell*      CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 );
@@ -610,10 +574,10 @@ public:
                                 CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL );
     static SfxObjectShell*      GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp );
     static String				GetServiceNameFromFactory( const String& rFact );
-    BOOL						IsInPlaceActive();
-    BOOL						IsUIActive();
-    virtual void                InPlaceActivate( BOOL );
-    virtual void                UIActivate( BOOL );
+    sal_Bool						IsInPlaceActive();
+    sal_Bool						IsUIActive();
+    virtual void                InPlaceActivate( sal_Bool );
+    virtual void                UIActivate( sal_Bool );
 
     static sal_Bool             CopyStoragesOfUnknownMediaType(
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource,
@@ -655,11 +619,11 @@ public:
     virtual	Printer *		GetDocumentPrinter();
     virtual OutputDevice*    GetDocumentRefDev();
     virtual	void			OnDocumentPrinterChanged( Printer * pNewPrinter );
-    virtual Rectangle GetVisArea( USHORT nAspect ) const;
+    virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
     virtual void    SetVisArea( const Rectangle & rVisArea );
     const Rectangle & GetVisArea() const;
     void            SetVisAreaSize( const Size & rVisSize );
-    virtual ULONG	GetMiscStatus() const;
+    virtual sal_uIntPtr	GetMiscStatus() const;
 
     MapUnit         GetMapUnit() const;
     void            SetMapUnit( MapUnit nMUnit );
@@ -668,9 +632,9 @@ public:
     void            DoDraw( OutputDevice *, const Point & rObjPos,
                             const Size & rSize,
                             const JobSetup & rSetup,
-                            USHORT nAspect = ASPECT_CONTENT );
+                            sal_uInt16 nAspect = ASPECT_CONTENT );
     virtual void    Draw( OutputDevice *, const JobSetup & rSetup,
-                          USHORT nAspect = ASPECT_CONTENT ) = 0;
+                          sal_uInt16 nAspect = ASPECT_CONTENT ) = 0;
 
 
     virtual void    FillClass( SvGlobalName * pClassName,
@@ -734,7 +698,7 @@ public:
                                             const Fraction & rScaleX,
                                             const Fraction & rScaleY,
                                             const JobSetup & rSetup,
-                                            USHORT nAspect );
+                                            sal_uInt16 nAspect );
 
     // Shell Interface
     SAL_DLLPRIVATE void ExecFile_Impl(SfxRequest &);
@@ -773,9 +737,8 @@ public:
     SAL_DLLPRIVATE SfxObjectShell* GetParentShellByModel_Impl();
 
     // configuration items
-    SAL_DLLPRIVATE SfxEventConfigItem_Impl* GetEventConfig_Impl( sal_Bool bForce=sal_False );
     SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl();
-    SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
+    SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = sal_False );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
         ImplAnalyzeSignature(
@@ -783,7 +746,7 @@ public:
             const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
                 = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
 
-    SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE );
+    SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False );
     SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
 };
 
@@ -810,7 +773,6 @@ public:
 
 
 //--------------------------------------------------------------------
-
 #ifndef SFX_DECL_OBJECTSHELL_DEFINED
 #define SFX_DECL_OBJECTSHELL_DEFINED
 SV_DECL_REF(SfxObjectShell)
@@ -819,7 +781,6 @@ SV_DECL_LOCK(SfxObjectShell)
 SV_IMPL_LOCK(SfxObjectShell)
 SV_IMPL_REF(SfxObjectShell)
 
-SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, BOOL bWriting );
 //--------------------------------------------------------------------
 class AutoReloadTimer_Impl : public Timer
 {
@@ -858,8 +819,8 @@ public:
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual String			GetValueText() const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SfxObjectShell* 		GetObjectShell() const
                             { return pObjSh; }
 
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index 98618cc1d7..98618cc1d7 100644..100755
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.hxx
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index 77b03c87f9..5347ba83fa 100644..100755
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -55,10 +55,7 @@ public:
     String					GetCurrentFilter() const;
     void					SetCurrentFilter(const String&);
 
-    /// Set dialog help id at FileDlgHelper
-    void					SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId );
-    /// Set control help ids at FileDlgHelper
-    void					SetDialogHelpId( const INT32 _nHelpId );
+    void					SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
 private:
     // disable copy and assignment	
     SFX2_DLLPRIVATE SvxOpenGraphicDialog	(const SvxOpenGraphicDialog&);
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 0f6114d2c4..d75a80d789 100644..100755
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -29,25 +29,28 @@
 #define _SFX_PASSWD_HXX
 
 #include "sal/config.h"
-#include "sfx2/dllapi.h"
-
+#include <sfx2/dllapi.h>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
+#include <sfx2/app.hxx>
 
 // defines ---------------------------------------------------------------
 
-#define SHOWEXTRAS_NONE		((USHORT)0x0000)
-#define SHOWEXTRAS_USER		((USHORT)0x0001)
-#define SHOWEXTRAS_CONFIRM	((USHORT)0x0002)
-#define SHOWEXTRAS_ALL		((USHORT)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM))
+#define SHOWEXTRAS_NONE		 ((sal_uInt16)0x0000)
+#define SHOWEXTRAS_USER		 ((sal_uInt16)0x0001)
+#define SHOWEXTRAS_CONFIRM	 ((sal_uInt16)0x0002)
+#define SHOWEXTRAS_PASSWORD2 ((sal_uInt16)0x0004)
+#define SHOWEXTRAS_CONFIRM2  ((sal_uInt16)0x0008)
+#define SHOWEXTRAS_ALL		 ((sal_uInt16)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM))
 
 // class SfxPasswordDialog -----------------------------------------------
 
 class SFX2_DLLPUBLIC SfxPasswordDialog : public ModalDialog
 {
 private:
+    FixedLine       maPasswordBox;
     FixedText		maUserFT;
     Edit			maUserED;
     FixedText		maPasswordFT;
@@ -55,18 +58,22 @@ private:
     FixedText		maConfirmFT;
     Edit			maConfirmED;
     FixedText		maMinLengthFT;
-    FixedLine       maPasswordBox;
+    FixedLine       maPassword2Box;
+    FixedText		maPassword2FT;
+    Edit			maPassword2ED;
+    FixedText		maConfirm2FT;
+    Edit			maConfirm2ED;
 
     OKButton		maOKBtn;
     CancelButton	maCancelBtn;
     HelpButton		maHelpBtn;
 
     String			maConfirmStr;
-    USHORT			mnMinLen;
     String			maMinLenPwdStr;
     String			maEmptyPwdStr;
     String			maMainPwdStr;
-    USHORT			mnExtras;
+    sal_uInt16		mnMinLen;
+    sal_uInt16		mnExtras;
 
     bool            mbAsciiOnly;
     DECL_DLLPRIVATE_LINK( EditModifyHdl, Edit* );
@@ -80,11 +87,15 @@ public:
     String			GetUser() const	{ return maUserED.GetText(); }
     String			GetPassword() const { return maPasswordED.GetText(); }
     String			GetConfirm() const { return maConfirmED.GetText(); }
-
-    void 			SetMinLen( USHORT Len );
-    void            SetMaxLen( USHORT Len );
-    void			SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); }
-    void			ShowExtras( USHORT nExtras ) { mnExtras = nExtras; }
+    
+    String          GetPassword2() const { return maPassword2ED.GetText(); }
+    String          GetConfirm2() const { return maConfirm2ED.GetText(); }
+    void            SetGroup2Text( const String& i_rText ) { maPassword2Box.SetText( i_rText ); }
+
+    void 			SetMinLen( sal_uInt16 Len );
+    void            SetMaxLen( sal_uInt16 Len );
+    void			SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); }
+    void			ShowExtras( sal_uInt16 nExtras ) { mnExtras = nExtras; }
     void            AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; }
 
     virtual short	Execute();
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 73b6297eee..fe37d74d85 100644..100755
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -33,60 +33,11 @@
 #include "sal/types.h"
 #include <vcl/print.hxx>
 
-class SfxFont;
 class SfxTabPage;
 class SfxItemSet;
 
 struct SfxPrinter_Impl;
 
-#define SFX_RANGE_NOTSET	((USHORT)0xFFFF)
-
-// class SfxFontSizeInfo -------------------------------------------------
-
-class SfxFontSizeInfo
-{
-private:
-    static USHORT			pStaticSizes[];
-    Size*					pSizes;
-    USHORT					nSizes;
-    BOOL					bScalable;
-
-public:
-    SfxFontSizeInfo( const SfxFont& rFont, const OutputDevice& rDevice );
-    ~SfxFontSizeInfo();
-
-    BOOL					HasSize(const Size &rSize) const;
-    BOOL					IsScalable() const { return bScalable; }
-
-    USHORT					SizeCount() const { return nSizes; }
-    const Size& 			GetSize( USHORT nNo ) const
-                            { return pSizes[nNo]; }
-};
-
-// class SfxFont ---------------------------------------------------------
-
-class SFX2_DLLPUBLIC SfxFont
-{
-private:
-    String					aName;
-    FontFamily				eFamily;
-    FontPitch				ePitch;
-    CharSet 				eCharSet;
-
-    SfxFont&				operator=(const SfxFont& rFont); // not implemented
-
-public:
-    SfxFont( const FontFamily eFam,
-             const String& aName,
-             const FontPitch eFontPitch = PITCH_DONTKNOW,
-             const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW );
-    // ZugriffsMethoden:
-    inline const String&	GetName() const { return aName; }
-    inline FontFamily		GetFamily() const { return eFamily; }
-    inline FontPitch		GetPitch() const { return ePitch; }
-    inline CharSet			GetCharSet() const { return eCharSet; }
-};
-
 // class SfxPrinter ------------------------------------------------------
 
 class SFX2_DLLPUBLIC SfxPrinter : public Printer
@@ -95,7 +46,7 @@ private:
     JobSetup				aOrigJobSetup;
     SfxItemSet*				pOptions;
     SfxPrinter_Impl*		pImpl;
-    BOOL					bKnown;
+    sal_Bool					bKnown;
 
     SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined
 
@@ -124,19 +75,8 @@ public:
     const SfxItemSet&		GetOptions() const { return *pOptions; }
     void					SetOptions( const SfxItemSet &rNewOptions );
 
-    void					EnableRange( USHORT nRange );
-    void					DisableRange( USHORT nRange );
-    BOOL					IsRangeEnabled( USHORT nRange ) const;
-
-    BOOL					IsKnown() const { return bKnown; }
-    BOOL					IsOriginal() const { return bKnown; }
-
-        using OutputDevice::GetFont;
-    USHORT					GetFontCount();
-    const SfxFont*			GetFont( USHORT nNo ) const;
-    const SfxFont*          GetFontByName( const String &rFontName );
-
-    BOOL                    InitJob( Window* pUIParent, BOOL bAskAboutTransparentObjects );
+    sal_Bool					IsKnown() const { return bKnown; }
+    sal_Bool					IsOriginal() const { return bKnown; }
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 68272a58d1..bcbcbe0f92 100644..100755
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -114,7 +114,7 @@ public:
                         SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
                         ~SfxCommonPrintOptionsTabPage();
 
-    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	sal_Bool 		FillItemSet( SfxItemSet& rSet );
     virtual	void 		Reset( const SfxItemSet& rSet );
     virtual Window*		GetParentLabeledBy( const Window* pLabel ) const;
     virtual Window*		GetParentLabelFor( const Window* pLabel ) const;
@@ -140,7 +140,7 @@ public:
                     TransparencyPrintWarningBox( Window* pParent );
                     ~TransparencyPrintWarningBox();
 
-    BOOL			IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); }
+    sal_Bool			IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); }
 };
 
 #endif // #ifndef _SFX_PRINTOPT_HXX
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 8c0f3d5bff..5281cca9fd 100644..100755
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -64,7 +64,7 @@ public:
                                                    const SfxItemSet *rOptions );
     virtual                 ~SfxPrintOptionsDialog();
 
-    BOOL                    Construct();
+    sal_Bool                    Construct();
     virtual short           Execute();
     virtual long			Notify( NotifyEvent& rNEvt );
 
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 4ebc34a7d5..d8a580a7ba 100644..100755
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -48,24 +48,24 @@ struct SvProgressArg;
 class SFX2_DLLPUBLIC SfxProgress
 {
     SfxProgress_Impl*		pImp;
-    ULONG					nVal;
-    BOOL					bSuspended;
+    sal_uIntPtr					nVal;
+    sal_Bool					bSuspended;
 
 public:
                             SfxProgress( SfxObjectShell* pObjSh,
                                          const String& rText,
-                                         ULONG nRange, BOOL bAllDocs = FALSE,
-                                         BOOL bWait = TRUE );
+                                         sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False,
+                                         sal_Bool bWait = sal_True );
     virtual 				~SfxProgress();
 
     virtual void			SetText( const String& rText );
-    BOOL					SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 );
-    virtual BOOL			SetState( ULONG nVal, ULONG nNewRange = 0 );
-    ULONG					GetState() const { return nVal; }
+    sal_Bool					SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 );
+    virtual sal_Bool			SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
+    sal_uIntPtr					GetState() const { return nVal; }
 
     void					Resume();
     void					Suspend();
-    BOOL					IsSuspended() const { return bSuspended; }
+    sal_Bool					IsSuspended() const { return bSuspended; }
 
     void					Lock();
     void					UnLock();
@@ -73,8 +73,8 @@ public:
 
     void					Stop();
 
-    void					SetWaitMode( BOOL bWait );
-    BOOL					GetWaitMode() const;
+    void					SetWaitMode( sal_Bool bWait );
+    sal_Bool					GetWaitMode() const;
 
     static SfxProgress* 	GetActiveProgress( SfxObjectShell *pDocSh = 0 );
     static void				EnterLock();
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index 6dd771f424..d2563e961a 100644..100755
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -44,7 +44,7 @@ class SfxQueryStatus_Impl;
 class SFX2_DLLPUBLIC SfxQueryStatus
 {
     public:
-        SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         ~SfxQueryStatus();
 
         // Query method
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index c2d95ab6f7..6957b81667 100644..100755
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -57,7 +57,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint
 {
 friend struct SfxRequest_Impl;
 
-    USHORT				nSlot;
+    sal_uInt16				nSlot;
     SfxAllItemSet*		pArgs;
     SfxRequest_Impl*	pImp;
 
@@ -72,52 +72,52 @@ private:
     //---------------------------------------------------------------------
 
 public:
-                        SfxRequest( SfxViewFrame*, USHORT nSlotId );
-                        SfxRequest( USHORT nSlot, USHORT nCallMode, SfxItemPool &rPool );
+                        SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId );
+                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool );
                         SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs,
-                                            USHORT nCallMode, SfxItemPool &rPool );
-                        SfxRequest( USHORT nSlot, USHORT nCallMode, const SfxAllItemSet& rSfxArgs );
+                                            sal_uInt16 nCallMode, SfxItemPool &rPool );
+                        SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs );
                         SfxRequest( const SfxRequest& rOrig );
                         ~SfxRequest();
 
-    USHORT				GetSlot() const { return nSlot; }
-    void				SetSlot(USHORT nNewSlot) { nSlot = nNewSlot; }
+    sal_uInt16				GetSlot() const { return nSlot; }
+    void				SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; }
 
-    USHORT              GetModifier() const;
-    void                SetModifier( USHORT nModi );
+    sal_uInt16              GetModifier() const;
+    void                SetModifier( sal_uInt16 nModi );
     SAL_DLLPRIVATE void SetInternalArgs_Impl( const SfxAllItemSet& rArgs );
     SAL_DLLPRIVATE const SfxItemSet* GetInternalArgs_Impl() const;
     const SfxItemSet* 	GetArgs() const { return pArgs; }
     void				SetArgs( const SfxAllItemSet& rArgs );
     void				AppendItem(const SfxPoolItem &);
-    void				RemoveItem( USHORT nSlotId );
+    void				RemoveItem( sal_uInt16 nSlotId );
 
-    static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId,
+    static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId,
                                        bool bDeep = false,
                                        TypeId aType = 0 );
-    const SfxPoolItem*  GetArg( USHORT nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
+    const SfxPoolItem*  GetArg( sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
     void                ReleaseArgs();
     void				SetReturnValue(const SfxPoolItem &);
     const SfxPoolItem*	GetReturnValue() const;
 
     static SfxMacro*	GetRecordingMacro();
     static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
-    static BOOL         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
-    USHORT  			GetCallMode() const;
+    static sal_Bool         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
+    sal_uInt16  			GetCallMode() const;
     bool                IsRecording() const;
-    void                AllowRecording( BOOL );
-    BOOL                AllowsRecording() const;
-    BOOL				IsAPI() const;
-    BOOL                IsSynchronCall() const;
-    void                SetSynchronCall( BOOL bSynchron );
+    void                AllowRecording( sal_Bool );
+    sal_Bool                AllowsRecording() const;
+    sal_Bool				IsAPI() const;
+    sal_Bool                IsSynchronCall() const;
+    void                SetSynchronCall( sal_Bool bSynchron );
     void				SetTarget( const String &rTarget );
 
-    BOOL				IsDone() const;
-    void				Done( BOOL bRemove = FALSE );
+    sal_Bool				IsDone() const;
+    void				Done( sal_Bool bRemove = sal_False );
 
     void				Ignore();
     void				Cancel();
-    BOOL				IsCancelled() const;
+    sal_Bool				IsCancelled() const;
     void                Done(const SfxItemSet &, bool bKeep = true );
 
     void                ForgetAllArgs();
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
index 65adfb9c84..decdd7662c 100644..100755
--- a/sfx2/inc/sfx2/securitypage.hxx
+++ b/sfx2/inc/sfx2/securitypage.hxx
@@ -46,7 +46,7 @@ protected:
     SfxSecurityPage( Window* pParent, const SfxItemSet& );
     virtual ~SfxSecurityPage();
 
-    virtual BOOL            FillItemSet( SfxItemSet& );
+    virtual sal_Bool            FillItemSet( SfxItemSet& );
     virtual void            Reset( const SfxItemSet& );
 
 public:
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index a5f486af22..c2ed24e258 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -206,24 +206,13 @@
 
 #define RID_DEFAULTABOUT					(RID_SFX_START+0)
 
-#define ABOUT_BTN_OK                        1
-
-#define ABOUT_FTXT_VERSION                  1
-#define ABOUT_FTXT_COPYRIGHT                2
 #define ABOUT_FTXT_LINK                     3
-
-#define ABOUT_STR_DEVELOPER_ARY             1
-#define ABOUT_STR_FRENCH_COPYRIGHT          2
-#define ABOUT_STR_ACCEL                     3
 #define ABOUT_STR_VERSION					4
 #define ABOUT_STR_COPYRIGHT					5
 #define ABOUT_STR_LINK					    6
-
 #define RID_APPTITLE                        (RID_SFX_START+4)
-#define RID_BUILDVERSION                    (RID_SFX_START+5)
 
 #define RID_DOCALREADYLOADED_DLG            (RID_SFX_START+1)
-#define RID_CANTLOADDOC_DLG                 (RID_SFX_START+2)
 
 #define TP_DOCINFODESC                      (RID_SFX_START+3)
 #define TP_DOCINFODOC                       (RID_SFX_START+4)
@@ -258,14 +247,15 @@
 #define STR_MB								(RID_SFX_START+113)
 #define STR_GB								(RID_SFX_START+114)
 
-#define STR_VERSION_TYPE                    (RID_SFX_START+115)
-#define STR_VERSION_ID                    	(RID_SFX_START+116)
 #define STR_STANDARD_SHORTCUT               (RID_SFX_START+117)
 #define STR_REPAIREDDOCUMENT                (RID_SFX_START+118)
 
 #define STR_ERRUNOEVENTBINDUNG              (RID_SFX_START+119)
 #define STR_SHARED                          (RID_SFX_START+120)
 #define RID_XMLSEC_DOCUMENTSIGNED           (RID_SFX_START+121)
+// IAccessibility2 implementation 2009. ------ 
+#define STR_ACCTITLE_PRODUCTIVITYTOOLS		(RID_SFX_START+157)
+// ------ IAccessibility2 implementation 2009.
 
 //=========================================================================
 
@@ -313,16 +303,8 @@
 
 // ------------------------------------------------------------------------
 
-#define BMP_COLS        21
-#define BMP_SFX_SMALL   1
-#define BMP_SFX_LARGE   2
-
 #define RID_SFX_GLOBALS 1000
 
-#define BMP_SFX_COLOR                       (RID_SFX_GLOBALS + 1)
-#define BMP_SFX_MONO                        (RID_SFX_GLOBALS + 2)
-#define SFX_MSG_RES                         (RID_SFX_GLOBALS + 3)
-
 // =========================================================================
 
 #define RID_OPTIONS_START           (SID_LIB_START +    2000)
@@ -330,41 +312,17 @@
 
 // ResId's ------------------------------------------------------------------
 
-#define RID_SFXLANG_BEGIN			(RID_OPTIONS_START +  0)
-#define RID_SFXLANG_NO				(RID_SFXLANG_BEGIN +  0)
-#define RID_SFXLANG_GERMAN			(RID_SFXLANG_BEGIN +  1)
-#define RID_SFXLANG_SWISS_GERMAN	(RID_SFXLANG_BEGIN +  2)
-#define RID_SFXLANG_US_ENGLISH		(RID_SFXLANG_BEGIN +  3)
-#define RID_SFXLANG_UK_ENGLISH		(RID_SFXLANG_BEGIN +  4)
-#define RID_SFXLANG_FRENCH			(RID_SFXLANG_BEGIN +  5)
-#define RID_SFXLANG_ITALIAN			(RID_SFXLANG_BEGIN +  6)
-#define RID_SFXLANG_CAST_SPANISH	(RID_SFXLANG_BEGIN +  7)
-#define RID_SFXLANG_PORTUGUESE		(RID_SFXLANG_BEGIN +  8)
-#define RID_SFXLANG_DANISH			(RID_SFXLANG_BEGIN +  9)
-#define RID_SFXLANG_DUTCH			(RID_SFXLANG_BEGIN + 10)
-#define RID_SFXLANG_SWEDISH			(RID_SFXLANG_BEGIN + 11)
-#define RID_SFXLANG_FINNISH			(RID_SFXLANG_BEGIN + 12)
-#define RID_SFXLANG_NORWEG_BOKMAL	(RID_SFXLANG_BEGIN + 13)
-#define RID_SFXLANG_NORWEG_NYNORSK	(RID_SFXLANG_BEGIN + 14)
-#define RID_SFXLANG_ALL				(RID_SFXLANG_BEGIN + 15)
-
 #define RID_SFXPAGE_SAVE			(RID_OPTIONS_START +  0)
 #define RID_SFXPAGE_GENERAL			(RID_OPTIONS_START +  1)
 #define RID_SFXPAGE_SPELL			(RID_OPTIONS_START +  2)
-#define RID_SFXDLG_NEWDICT			(RID_OPTIONS_START +  3)
-#define RID_SFXDLG_EDITDICT			(RID_OPTIONS_START +  4)
-#define RID_SFXQB_DELDICT			(RID_OPTIONS_START +  5)
+#define RID_SFXDLG_NEWDICT          (RID_OPTIONS_START +  3)
+#define RID_SFXDLG_EDITDICT         (RID_OPTIONS_START +  4)
+#define RID_SFXQB_DELDICT           (RID_OPTIONS_START +  5)
 #define RID_SFXPAGE_PATH			(RID_OPTIONS_START +  6)
-#define RID_SFXPAGE_LINGU			(RID_OPTIONS_START +  7)
-#define RID_SFXPAGE_INET			(RID_OPTIONS_START +  8)
-#define RID_SFXQB_DEL_IGNORELIST	(RID_OPTIONS_START +  9)
-#define RID_SFXQB_SET_LANGUAGE		(RID_OPTIONS_START + 10)
-#define RID_ITEMLIST_LINGU			(RID_OPTIONS_START + 11)
-#define RID_SFXPAGE_PRINTOPTIONS	(RID_OPTIONS_START + 12)
-
-#define STR_UNDO							(RID_SFX_VIEW_START+11)
-#define STR_REDO							(RID_SFX_VIEW_START+12)
-#define STR_REPEAT							(RID_SFX_VIEW_START+13)
+#define RID_SFXPAGE_LINGU           (RID_OPTIONS_START +  7)
+#define RID_SFXQB_SET_LANGUAGE      (RID_OPTIONS_START + 10)
+#define RID_SFXPAGE_PRINTOPTIONS    (RID_OPTIONS_START + 12)
+
 #define RID_STR_NEW_TASK				    (RID_SFX_DOC_START+ 76)
 
 // Member-Ids ------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index b9aa1557c8..bf84790aa3 100644..100755
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -67,7 +67,6 @@
 // Some defines to write better code :-)
 #define	REFERENCE				::com::sun::star::uno::Reference
 #define	ANY						::com::sun::star::uno::Any
-#define	SEQUENCE				::com::sun::star::uno::Sequence
 #define	XDISPATCH				::com::sun::star::frame::XDispatch
 #define	DISPATCHDESCRIPTOR		::com::sun::star::frame::DispatchDescriptor
 #define	XMODEL					::com::sun::star::frame::XModel
@@ -305,7 +304,7 @@ public:
         @onerror	-
     */
 
-    virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
+    virtual ::com::sun::star::uno::Sequence< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
 
     //____________________________________________________________________________________________________
     //	XControllerBorder
@@ -389,9 +388,9 @@ public:
     // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
     // either the _Impl name should vanish or there should be an "official" API
     SfxViewShell* GetViewShell_Impl() const;
-    SAL_DLLPRIVATE BOOL HandleEvent_Impl( NotifyEvent& rEvent );
-    SAL_DLLPRIVATE BOOL HasKeyListeners_Impl();
-    SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent );
+    SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
     SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
 private:
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 306b959d4b..b414774d0b 100644..100755
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -40,15 +40,17 @@
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/document/XDocumentInfo.hpp>
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentRecovery.hpp>
+#include <com/sun/star/document/XUndoManagerSupplier.hpp>
 
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
 
 #include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
@@ -97,9 +99,9 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 //________________________________________________________________________________________________________
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30)
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_30
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 30
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
 #include <comphelper/implbase_var.hxx>
 #endif
 
@@ -144,6 +146,7 @@
 #define	XDOCUMENTINFO			::com::sun::star::document::XDocumentInfo
 #define	XDOCUMENTINFOSUPPLIER	::com::sun::star::document::XDocumentInfoSupplier
 #define	XEVENTBROADCASTER		::com::sun::star::document::XEventBroadcaster
+#define	XDOCUMENTEVENTBROADCASTER	::com::sun::star::document::XDocumentEventBroadcaster
 #define	XEVENTSSUPPLIER			::com::sun::star::document::XEventsSupplier
 #define XEMBEDDEDSCRIPTS        ::com::sun::star::document::XEmbeddedScripts
 #define XSCRIPTINVOCATIONCONTEXT    ::com::sun::star::document::XScriptInvocationContext
@@ -160,7 +163,6 @@
 #define	EVENTOBJECT				::com::sun::star::lang::EventObject
 #define	PROPERTYVALUE			::com::sun::star::beans::PropertyValue
 #define	REFERENCE				::com::sun::star::uno::Reference
-#define	SEQUENCE				::com::sun::star::uno::Sequence
 #define	MUTEX					::osl::Mutex
 #define	OUSTRING				::rtl::OUString
 #define	UNOTYPE					::com::sun::star::uno::Type
@@ -238,12 +240,14 @@ namespace sfx { namespace intern {
                  SfxListener
 */
 
-typedef ::comphelper::WeakImplHelper30  <   XCHILD
+typedef ::comphelper::WeakImplHelper32  <   XCHILD
                                         ,   XDOCUMENTINFOSUPPLIER
                                         ,   ::com::sun::star::document::XDocumentPropertiesSupplier
                                         ,   ::com::sun::star::rdf::XDocumentMetadataAccess
                                         ,   ::com::sun::star::document::XDocumentRecovery
+                                        ,   ::com::sun::star::document::XUndoManagerSupplier
                                         ,   XEVENTBROADCASTER
+                                        ,   XDOCUMENTEVENTBROADCASTER
                                         ,   XEVENTLISTENER
                                         ,   XEVENTSSUPPLIER
                                         ,   XEMBEDDEDSCRIPTS
@@ -383,7 +387,7 @@ public:
         @onerror	A RuntimeException is thrown.
     */
 
-    virtual SEQUENCE< UNOTYPE > SAL_CALL getTypes() throw( RUNTIMEEXCEPTION ) ;
+    virtual ::com::sun::star::uno::Sequence< UNOTYPE > SAL_CALL getTypes() throw( RUNTIMEEXCEPTION ) ;
 
     /**___________________________________________________________________________________________________
         @short		get implementation id
@@ -399,7 +403,7 @@ public:
         @onerror	A RuntimeException is thrown.
     */
 
-    virtual SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( RUNTIMEEXCEPTION ) ;
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( RUNTIMEEXCEPTION ) ;
 
 
     //____________________________________________________________________________________________________
@@ -578,7 +582,7 @@ public:
     */
 
     virtual sal_Bool SAL_CALL attachResource(	const	OUSTRING&					sURL	,
-                                                const	SEQUENCE< PROPERTYVALUE >&	aArgs	)
+                                                const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	aArgs	)
         throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
@@ -609,7 +613,7 @@ public:
         @onerror	-
     */
 
-    virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getArgs() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< PROPERTYVALUE > SAL_CALL getArgs() throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
         @short		-
@@ -859,7 +863,7 @@ public:
         @onerror	-
     */
 
-    virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< PROPERTYVALUE > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
         @short		-
@@ -874,7 +878,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL setPrinter( const SEQUENCE< PROPERTYVALUE >& seqPrinter )
+    virtual void SAL_CALL setPrinter( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqPrinter )
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     /**___________________________________________________________________________________________________
         @short		-
@@ -889,14 +893,14 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL print( const SEQUENCE< PROPERTYVALUE >& seqOptions )
+    virtual void SAL_CALL print( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqOptions )
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //____________________________________________________________________________________________________
     //	XStorable2
     //____________________________________________________________________________________________________
 
-    virtual void SAL_CALL storeSelf( const	SEQUENCE< PROPERTYVALUE >&	seqArguments	)
+    virtual void SAL_CALL storeSelf( const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	seqArguments	)
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     //____________________________________________________________________________________________________
@@ -977,7 +981,7 @@ public:
     */
 
     virtual void SAL_CALL storeAsURL(	const	OUSTRING&					sURL			,
-                                        const	SEQUENCE< PROPERTYVALUE >&	seqArguments	)
+                                        const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	seqArguments	)
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ;
 
     /**___________________________________________________________________________________________________
@@ -994,7 +998,7 @@ public:
     */
 
     virtual void SAL_CALL storeToURL(	const	OUSTRING&					sURL			,
-                                        const	SEQUENCE< PROPERTYVALUE >&	seqArguments	)
+                                        const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	seqArguments	)
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
 
@@ -1035,7 +1039,7 @@ public:
         @onerror	-
     */
 
-    virtual void SAL_CALL load(	const	SEQUENCE< PROPERTYVALUE >&	seqArguments )
+    virtual void SAL_CALL load(	const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	seqArguments )
         throw (::com::sun::star::frame::DoubleInitializationException,
                ::com::sun::star::io::IOException,
                ::com::sun::star::uno::RuntimeException,
@@ -1056,7 +1060,7 @@ public:
     //____________________________________________________________________________________________________
 
     virtual void SAL_CALL loadFromStorage( const REFERENCE< XSTORAGE >& xStorage,
-                                            const SEQUENCE< PROPERTYVALUE >& aMediaDescriptor )
+                                            const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor )
         throw ( ILLEGALARGUMENTEXCEPTION,
                 DOUBLEINITIALIZATIONEXCEPTION,
                 IOEXCEPTION,
@@ -1064,7 +1068,7 @@ public:
                 RUNTIMEEXCEPTION );
 
     virtual void SAL_CALL storeToStorage( const REFERENCE< XSTORAGE >& xStorage,
-                                            const SEQUENCE< PROPERTYVALUE >& aMediaDescriptor )
+                                            const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor )
         throw ( ILLEGALARGUMENTEXCEPTION,
                 IOEXCEPTION,
                 EXCEPTION,
@@ -1162,7 +1166,7 @@ public:
     */
 
 
-    virtual SEQUENCE< DATAFLAVOR > SAL_CALL getTransferDataFlavors()
+    virtual ::com::sun::star::uno::Sequence< DATAFLAVOR > SAL_CALL getTransferDataFlavors()
         throw (::com::sun::star::uno::RuntimeException);
 
     /**___________________________________________________________________________________________________
@@ -1250,6 +1254,18 @@ public:
 
     virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
 
+    //____________________________________________________________________________________________________
+    //	XDocumentEventBroadcaster
+    //____________________________________________________________________________________________________
+
+    virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+    //____________________________________________________________________________________________________
+    //	XUnoTunnel
+    //____________________________________________________________________________________________________
+
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
     // css.frame.XModule
@@ -1307,6 +1323,9 @@ public:
                 ::com::sun::star::io::IOException,
                 ::com::sun::star::lang::WrappedTargetException );
 
+    // css.document.XUndoManagerSupplier
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (::com::sun::star::uno::RuntimeException);
+
     //____________________________________________________________________________________________________
 
     // ::com::sun::star::rdf::XNode:
@@ -1471,22 +1490,11 @@ public:
     SfxObjectShell* GetObjectShell() const ;
     SAL_DLLPRIVATE SfxObjectShell* impl_getObjectShell() const ;
 
-    /**___________________________________________________________________________________________________
-        @short		-
-        @descr		-
-
-        @seealso	-
-
-        @param		-
-
-        @return		-
-
-        @onerror	-
-    */
-
     SAL_DLLPRIVATE sal_Bool impl_isDisposed() const ;
-    sal_Bool IsDisposed() const ;
     sal_Bool IsInitialized() const;
+    sal_Bool IsDisposed() const { return impl_isDisposed(); }
+    void MethodEntryCheck( const bool i_mustBeInitialized ) const;
+    ::osl::Mutex& getMutex() const { return m_aMutex; }
 
     ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw (::com::sun::star::uno::RuntimeException);
@@ -1531,9 +1539,11 @@ private:
     SAL_DLLPRIVATE ::rtl::OUString GetMediumFilterName_Impl();
 
     SAL_DLLPRIVATE void impl_store(	const	OUSTRING&					sURL			,
-                        const	SEQUENCE< PROPERTYVALUE >&	seqArguments	,
+                        const	::com::sun::star::uno::Sequence< PROPERTYVALUE >&	seqArguments	,
                                 sal_Bool					bSaveTo			) ;
-    SAL_DLLPRIVATE void postEvent_Impl( ::rtl::OUString );
+
+    SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >() );
+
     SAL_DLLPRIVATE String getEventName_Impl( long nID );
     SAL_DLLPRIVATE void NotifyStorageListeners_Impl();
        SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler );
@@ -1561,6 +1571,44 @@ private:
 
 } ;	// class SfxBaseModel
 
+/** base class for sub components of an SfxBaseModel, which share their ref count and lifetime with the SfxBaseModel
+*/
+class SFX2_DLLPUBLIC SfxModelSubComponent
+{
+public:
+    /** checks whether the instance is alive, i.e. properly initialized, and not yet disposed
+    */
+    void    MethodEntryCheck()
+    {
+        m_rModel.MethodEntryCheck( true );
+    }
+
+    // called when the SfxBaseModel which the component is superordinate of is being disposed
+    virtual void disposing();
+
+protected:
+    SfxModelSubComponent( SfxBaseModel& i_model )
+        :m_rModel( i_model )
+    {
+    }
+    virtual ~SfxModelSubComponent();
+
+    // helpers for implementing XInterface - delegates ref counting to the SfxBaseModel
+    void acquire()  {   m_rModel.acquire(); }
+    void release()  {   m_rModel.release(); }
+
+    bool isDisposed() const {   return m_rModel.IsDisposed();   }
+
+protected:
+    const SfxBaseModel& getBaseModel() const { return m_rModel; }
+          SfxBaseModel& getBaseModel()       { return m_rModel; }
+
+          ::osl::Mutex&  getMutex()          { return m_rModel.getMutex(); }
+
+private:
+    SfxBaseModel&   m_rModel;
+};
+
 class SFX2_DLLPUBLIC SfxModelGuard
 {
 public:
@@ -1575,15 +1623,22 @@ public:
     SfxModelGuard( SfxBaseModel& i_rModel, const AllowedModelState i_eState = E_FULLY_ALIVE )
         : m_aGuard()
     {
-        if ( i_rModel.IsDisposed() )
-            throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *&i_rModel );
-        if ( ( i_eState != E_INITIALIZING ) && !i_rModel.IsInitialized() )
-            throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *&i_rModel );
+        i_rModel.MethodEntryCheck( i_eState != E_INITIALIZING );
+    }
+    SfxModelGuard( SfxModelSubComponent& i_rSubComponent )
+        :m_aGuard( Application::GetSolarMutex() )
+    {
+        i_rSubComponent.MethodEntryCheck();
     }
     ~SfxModelGuard()
     {
     }
 
+    void reset()
+    {
+        m_aGuard.reset();
+    }
+
     void clear()
     {
         m_aGuard.clear();
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
new file mode 100755
index 0000000000..1ed1e846db
--- /dev/null
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -0,0 +1,342 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef SFX2_SFXCOMMANDS_HRC
+#define SFX2_SFXCOMMANDS_HRC
+
+#define CMD_SID_VIEWSHELL0                          ".uno:_SwitchViewShell0"
+#define CMD_SID_VIEWSHELL1                          ".uno:_SwitchViewShell1"
+#define CMD_SID_VIEWSHELL2                          ".uno:_SwitchViewShell2"
+#define CMD_SID_VIEWSHELL3                          ".uno:_SwitchViewShell3"
+#define CMD_SID_VIEWSHELL4                          ".uno:_SwitchViewShell4"
+#define CMD_SID_ABOUT                               ".uno:About"
+#define CMD_SID_ACTIVATE                            ".uno:Activate"
+#define CMD_SID_HELPBALLOONS                        ".uno:ActiveHelp"
+#define CMD_SID_STYLE_FAMILY                        ".uno:ActualStyleFamily"
+#define CMD_SID_NEWDOC                              ".uno:NewDoc"
+#define CMD_SID_CREATELINK                          ".uno:AddBookmark"
+#define CMD_SID_NEWDOCDIRECT                        ".uno:AddDirect"
+#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE           ".uno:AddressBookSource"
+#define CMD_SID_BASICIDE_ADDWATCH                   ".uno:AddWatch"
+#define CMD_SID_DOCINFO_AUTHOR                      ".uno:Author"
+#define CMD_SID_AUTOHIDE                            ".uno:AutoHide"
+#define CMD_SID_AUTOPILOTMENU                       ".uno:AutoPilotMenu"
+#define CMD_SID_GALLERY_BG_BRUSH                    ".uno:BackgroundImage"
+#define CMD_SID_BACKSPACE                           ".uno:Backspace"
+#define CMD_SID_BASICBREAK                          ".uno:BasicBreak"
+#define CMD_SID_BASICIDE_APPEAR                     ".uno:BasicIDEAppear"
+#define CMD_SID_BASICSTEPINTO                       ".uno:BasicStepInto"
+#define CMD_SID_BASICSTEPOUT                        ".uno:BasicStepOut"
+#define CMD_SID_BASICSTEPOVER                       ".uno:BasicStepOver"
+#define CMD_SID_BASICSTOP                           ".uno:BasicStop"
+#define CMD_SID_BROWSER                             ".uno:Beamer"
+#define CMD_SID_BASICIDE_BRKPNTSCHANGED             ".uno:BreakPointsChanged"
+#define CMD_SID_BROWSE_BACKWARD                     ".uno:BrowseBackward"
+#define CMD_SID_BROWSE_FORWARD                      ".uno:BrowseForward"
+#define CMD_SID_BROWSER_MODE                        ".uno:BrowseView"
+#define CMD_SID_BUILD_VERSION                       ".uno:BuildVersion"
+#define CMD_SID_CAPTION                             ".uno:Caption"
+#define CMD_SID_STYLE_FAMILY1                       ".uno:CharStyle"
+#define CMD_SID_CHECK_KEY                           ".uno:CheckKey"
+#define CMD_SID_BASICIDE_CHOOSEMACRO                ".uno:ChooseMacro"
+#define CMD_SID_CLEARHISTORY                        ".uno:ClearHistory"
+#define CMD_SID_CLOSEWINS                           ".uno:CloseWins"
+#define CMD_SID_CLOSEDOCS                           ".uno:CloseDocs"
+#define CMD_SID_CLOSEDOC                            ".uno:CloseDoc"
+#define CMD_SID_CLOSEWIN                            ".uno:CloseWin"
+#define CMD_SID_CLOSING                             ".uno:Closing"
+#define CMD_SID_DOCINFO_COMMENTS                    ".uno:Comments"
+#define CMD_SID_OFFICE_COMMERCIAL_USE               ".uno:CommercialUse"
+#define CMD_SID_DOCUMENT_COMPARE                    ".uno:CompareDocuments"
+#define CMD_SID_BASICCOMPILE                        ".uno:CompileBasic"
+#define CMD_SID_CONFIG                              ".uno:ConfigureDialog"
+#define CMD_SID_CONTEXT                             ".uno:Context"
+#define CMD_SID_COPY                                ".uno:Copy"
+#define CMD_SID_CRASH                               ".uno:Crash"
+#define CMD_SID_BASICIDE_CREATEMACRO                ".uno:CreateMacro"
+#define CMD_SID_CURRENT_URL                         ".uno:CurrentURL"
+#define CMD_SID_CURSORENDOFSCREEN                   ".uno:CursorEndOfScreen"
+#define CMD_SID_CURSORTOPOFSCREEN                   ".uno:CursorTopOfScreen"
+#define CMD_SID_OFFICE_CUSTOMERNUMBER               ".uno:CustomerNumber"
+#define CMD_SID_CUT                                 ".uno:Cut"
+#define CMD_SID_DEFAULTFILEPATH                     ".uno:DefaultFilePath"
+#define CMD_SID_DEFAULTFILENAME                     ".uno:DefaultFileName"
+#define CMD_SID_DELETE                              ".uno:Delete"
+#define CMD_SID_BASICIDE_DELETECURRENT              ".uno:DeleteCurrent"
+#define CMD_SID_STYLE_DELETE                        ".uno:DeleteStyle"
+#define CMD_SID_STYLE_DESIGNER                      ".uno:DesignerDialog"
+#define CMD_SID_STYLE_DRAGHIERARCHIE                ".uno:DragHierarchy"
+#define CMD_SID_EDITDOC                             ".uno:EditDoc"
+#define CMD_SID_BASICIDE_EDITMACRO                  ".uno:EditMacro"
+#define CMD_SID_STYLE_EDIT                          ".uno:EditStyle"
+#define CMD_FID_SEARCH_NOW                          ".uno:ExecuteSearch"
+#define CMD_SID_EXTENDEDHELP                        ".uno:ExtendedHelp"
+#define CMD_SID_FILE_NAME                           ".uno:FileName"
+#define CMD_SID_FOCUSURLBOX                         ".uno:FocusUrlBox"
+#define CMD_SID_FORMATMENU                          ".uno:FormatMenu"
+#define CMD_SID_STYLE_FAMILY3                       ".uno:FrameStyle"
+#define CMD_SID_FRAMETITLE                          ".uno:FrameTitle"
+#define CMD_SID_PROGFILENAME                        ".uno:FullName"
+#define CMD_SID_DOCFULLNAME                         ".uno:FullName"
+#define CMD_SID_WIN_FULLSCREEN                      ".uno:FullScreen"
+#define CMD_SID_FILLFRAME                           ".uno:GetFrameWindow"
+#define CMD_SID_CURSORDOWN                          ".uno:GoDown"
+#define CMD_SID_CURSORPAGEDOWN                      ".uno:GoDownBlock"
+#define CMD_SID_CURSORPAGEDOWN_SEL                  ".uno:GoDownBlockSel"
+#define CMD_SID_CURSORDOWN_SEL                      ".uno:GoDownSel"
+#define CMD_SID_CURSORLEFT                          ".uno:GoLeft"
+#define CMD_SID_CURSORPAGELEFT                      ".uno:GoLeftBlock"
+#define CMD_SID_CURSORPAGELEFT_SEL                  ".uno:GoLeftBlockSel"
+#define CMD_SID_CURSORLEFT_SEL                      ".uno:GoLeftSel"
+#define CMD_SID_CURSORRIGHT                         ".uno:GoRight"
+#define CMD_SID_CURSORRIGHT_SEL                     ".uno:GoRightSel"
+#define CMD_SID_CURSORENDOFFILE                     ".uno:GoToEndOfData"
+#define CMD_SID_CURSORENDOFFILE_SEL                 ".uno:GoToEndOfDataSel"
+#define CMD_SID_CURSOREND                           ".uno:GoToEndOfRow"
+#define CMD_SID_CURSOREND_SEL                       ".uno:GoToEndOfRowSel"
+#define CMD_SID_CURSORTOPOFFILE                     ".uno:GoToStart"
+#define CMD_SID_CURSORHOME                          ".uno:GoToStartOfRow"
+#define CMD_SID_CURSORHOME_SEL                      ".uno:GoToStartOfRowSel"
+#define CMD_SID_CURSORTOPOFFILE_SEL                 ".uno:GoToStartSel"
+#define CMD_SID_CURSORUP                            ".uno:GoUp"
+#define CMD_SID_CURSORPAGEUP                        ".uno:GoUpBlock"
+#define CMD_SID_CURSORPAGEUP_SEL                    ".uno:GoUpBlockSel"
+#define CMD_SID_CURSORUP_SEL                        ".uno:GoUpSel"
+#define CMD_SID_HELP_ANNOTATE                       ".uno:HelpAnnotate"
+#define CMD_SID_HELP_BOOKMARK                       ".uno:HelpBookmark"
+#define CMD_SID_HELP_HELPFILEBOX                    ".uno:HelpChooseFile"
+#define CMD_SID_HELP_DOWNLOAD                       ".uno:HelpDownload"
+#define CMD_SID_HELP_PI                             ".uno:HelperDialog"
+#define CMD_SID_HELPINDEX                           ".uno:HelpIndex"
+#define CMD_SID_HELPMENU                            ".uno:HelpMenu"
+#define CMD_SID_HELPONHELP                          ".uno:HelpOnHelp"
+#define CMD_SID_HELP_SEARCH                         ".uno:HelpSearch"
+#define CMD_SID_HELPTIPS                            ".uno:HelpTip"
+#define CMD_SID_HELP_ZOOMIN                         ".uno:HelpZoomIn"
+#define CMD_SID_HELP_ZOOMOUT                        ".uno:HelpZoomOut"
+#define CMD_SID_BASICIDE_HIDECURPAGE                ".uno:HideCurPage"
+#define CMD_SID_HYPERLINK_DIALOG                    ".uno:HyperlinkDialog"
+#define CMD_SID_INSERTDOC                           ".uno:InsertDoc"
+#define CMD_SID_HYPERLINK_INSERT                    ".uno:InsertHyperlink"
+#define CMD_SID_INSERT_FLOATINGFRAME                ".uno:InsertObjectFloatingFrame"
+#define CMD_SID_INTERNET_ONLINE                     ".uno:InternetOnline"
+#define CMD_SID_INTERNET_SEARCH                     ".uno:InternetSearch"
+#define CMD_SID_DOC_LOADING                         ".uno:IsLoading"
+#define CMD_SID_IMG_LOADING                         ".uno:IsLoadingImages"
+#define CMD_SID_PRINTOUT                            ".uno:IsPrinting"
+#define CMD_SID_JUMPTOMARK                          ".uno:JumpToMark"
+#define CMD_SID_DOCINFO_KEYWORDS                    ".uno:Keywords"
+#define CMD_SID_BASICIDE_LIBLOADED                  ".uno:LibLoaded"
+#define CMD_SID_BASICIDE_LIBREMOVED                 ".uno:LibRemoved"
+#define CMD_SID_BASICIDE_LIBSELECTED                ".uno:LibSelect"
+#define CMD_SID_BASICIDE_LIBSELECTOR                ".uno:LibSelector"
+#define CMD_SID_OFFICE_PLK                          ".uno:LicenceKey"
+#define CMD_SID_CONFIGACCEL                         ".uno:LoadAccel"
+#define CMD_SID_BASICLOAD                           ".uno:LoadBasic"
+#define CMD_SID_LOADCONFIG                          ".uno:LoadConfiguration"
+#define CMD_SID_CONFIGEVENT                         ".uno:LoadEvents"
+#define CMD_SID_CONFIGMENU                          ".uno:LoadMenu"
+#define CMD_SID_CONFIGSTATUSBAR                     ".uno:LoadStatusBar"
+#define CMD_SID_TOOLBOXOPTIONS                      ".uno:LoadToolBox"
+#define CMD_SID_LOGOUT                              ".uno:Logout"
+#define CMD_SID_SCRIPTORGANIZER                     ".uno:ScriptOrganizer"
+#define CMD_SID_MACROORGANIZER                      ".uno:MacroOrganizer"
+#define CMD_SID_RUNMACRO                            ".uno:RunMacro"
+#define CMD_SID_BASICCHOOSER                        ".uno:MacroDialog"
+#define CMD_SID_MAIL_NOTIFY                         ".uno:MailReceipt"
+#define CMD_SID_MAIL_CHILDWIN                       ".uno:MailWindow"
+#define CMD_SID_BASICIDE_MATCHGROUP                 ".uno:MatchGroup"
+#define CMD_SID_TOGGLE_MENUBAR                      ".uno:MenuBarVisible"
+#define CMD_SID_DOCUMENT_MERGE                      ".uno:MergeDocuments"
+#define CMD_SID_ATTR_METRIC                         ".uno:MetricUnit"
+#define CMD_SID_MODIFIED                            ".uno:Modified"
+#define CMD_SID_DOC_MODIFIED                        ".uno:ModifiedStatus"
+#define CMD_SID_BASICIDE_MODULEDLG                  ".uno:ModuleDialog"
+#define CMD_SID_BASICIDE_NAMECHANGEDONTAB           ".uno:NameChangedOnTab"
+#define CMD_SID_NAVIGATOR                           ".uno:Navigator"
+#define CMD_SID_RESTORE_EDITING_VIEW                ".uno:RestoreEditingView"
+#define CMD_SID_BASICIDE_NEWDIALOG                  ".uno:NewDialog"
+#define CMD_SID_BASICIDE_NEWMODULE                  ".uno:NewModule"
+#define CMD_SID_CREATE_BASICOBJECT                  ".uno:NewObject"
+#define CMD_SID_STYLE_NEW                           ".uno:NewStyle"
+#define CMD_SID_NEWWINDOW                           ".uno:NewWindow"
+#define CMD_SID_BASICIDE_OBJCAT                     ".uno:ObjectCatalog"
+#define CMD_SID_OBJECT                              ".uno:ObjectMenue"
+#define CMD_SID_OLD_PALK                            ".uno:OldPALK"
+#define CMD_SID_OPENDOC                             ".uno:Open"
+#define CMD_SID_WEBHTML                             ".uno:WebHtml"
+#define CMD_SID_OPENHYPERLINK                       ".uno:OpenHyperlink"
+#define CMD_SID_DOCINFO_TITLE                       ".uno:DocInfoTitle"
+#define CMD_SID_OPENTEMPLATE                        ".uno:OpenTemplate"
+#define CMD_SID_OPENURL                             ".uno:OpenUrl"
+#define CMD_SID_OPTIONS                             ".uno:Options"
+#define CMD_SID_ORGANIZER                           ".uno:Organizer"
+#define CMD_SID_STYLE_FAMILY4                       ".uno:PageStyle"
+#define CMD_SID_STYLE_FAMILY2                       ".uno:ParaStyle"
+#define CMD_SID_PARTWIN                             ".uno:PartWindow"
+#define CMD_SID_PASTE                               ".uno:Paste"
+#define CMD_SID_CLIPBOARD_FORMAT_ITEMS              ".uno:ClipboardFormatItems"
+#define CMD_SID_PASTE_SPECIAL                       ".uno:PasteSpecial"
+#define CMD_SID_DOCPATH                             ".uno:DocPath"
+#define CMD_SID_PICKLIST                            ".uno:PickList"
+#define CMD_SID_PLUGINS_ACTIVE                      ".uno:PlugInsActive"
+#define CMD_SID_PRINTDOC                            ".uno:Print"
+#define CMD_SID_PRINTDOCDIRECT                      ".uno:PrintDefault"
+#define CMD_SID_PRINTER_NAME                        ".uno:Printer"
+#define CMD_SID_SETUPPRINTER                        ".uno:PrinterSetup"
+#define CMD_SID_PRINTPREVIEW                        ".uno:PrintPreview"
+#define CMD_SID_OFFICE_PRIVATE_USE                  ".uno:PrivateUse"
+#define CMD_SID_DOCINFO                             ".uno:SetDocumentProperties"
+#define CMD_SID_QUITAPP                             ".uno:Quit"
+#define CMD_SID_DOC_READONLY                        ".uno:ReadOnly"
+#define CMD_SID_RECORDMACRO                         ".uno:MacroRecorder"
+#define CMD_SID_STOP_RECORDING                      ".uno:StopRecording"
+#define CMD_SID_RECORDING_FLOATWINDOW               ".uno:MacroRecordingFloat"
+#define CMD_SID_REDO                                ".uno:Redo"
+#define CMD_SID_DELETE_BASICOBJECT                  ".uno:ReleaseObject"
+#define CMD_SID_RELOAD                              ".uno:Reload"
+#define CMD_SID_BASICIDE_REMOVEWATCH                ".uno:RemoveWatch"
+#define CMD_SID_BASICIDE_RENAMECURRENT              ".uno:RenameCurrent"
+#define CMD_SID_REPAINT                             ".uno:Repaint"
+#define CMD_SID_REPEAT                              ".uno:RepeatAction"
+#define CMD_SID_RUBY_DIALOG                         ".uno:RubyDialog"
+#define CMD_SID_BASICRUN                            ".uno:RunBasic"
+#define CMD_SID_SAVEDOC                             ".uno:Save"
+#define CMD_SID_SAVEDOCS                            ".uno:SaveAll"
+#define CMD_SID_SAVEASDOC                           ".uno:SaveAs"
+#define CMD_SID_DOCTEMPLATE                         ".uno:SaveAsTemplate"
+#define CMD_SID_BASICSAVEAS                         ".uno:SaveBasicAs"
+#define CMD_SID_EXPORT_DIALOG                       ".uno:ExportDialog"
+#define CMD_SID_IMPORT_DIALOG                       ".uno:ImportDialog"
+#define CMD_SID_SAVECONFIG                          ".uno:SaveConfiguration"
+#define CMD_SID_DOC_SAVED                           ".uno:Saved"
+#define CMD_SID_BASICIDE_SBXDELETED                 ".uno:SbxDeleted"
+#define CMD_SID_BASICIDE_SBXINSERTED                ".uno:SbxInserted"
+#define CMD_SID_BASICIDE_SBXRENAMED                 ".uno:SbxRenamed"
+#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN            ".uno:ScrollBodyPageDown"
+#define CMD_SID_SEARCH_DLG                          ".uno:SearchDialog"
+#define CMD_SID_SEARCH_OPTIONS                      ".uno:SearchOptions"
+#define CMD_SID_SEARCH_ITEM                         ".uno:SearchProperties"
+#define CMD_SID_SELECTALL                           ".uno:SelectAll"
+#define CMD_FN_FAX                                  ".uno:SendFax"
+#define CMD_SID_MAIL_SENDDOC                        ".uno:SendMail"
+#define CMD_SID_MAIL_SENDDOCASPDF                   ".uno:SendMailDocAsPDF"
+#define CMD_SID_MAIL_SENDDOCASFORMAT                ".uno:SendMailDocAsFormat"
+#define CMD_SID_MAIL_SENDDOCASMS                    ".uno:SendMailDocAsMS"
+#define CMD_SID_MAIL_SENDDOCASOOO                   ".uno:SendMailDocAsOOo"
+#define CMD_SID_SETOPTIONS                          ".uno:SetOptions"
+#define CMD_SID_OFFICE_PALK                         ".uno:SetPALK"
+#define CMD_SID_SHOW_BROWSER                        ".uno:ShowBrowser"
+#define CMD_SID_SHOWPOPUPS                          ".uno:ShowPopups"
+#define CMD_SID_BASICIDE_SHOWSBX                    ".uno:ShowSbx"
+#define CMD_SID_SOURCEVIEW                          ".uno:SourceView"
+#define CMD_SID_ONLINE_REGISTRATION_DLG             ".uno:StartRegistrationDialog"
+#define CMD_SID_STATUSBARTEXT                       ".uno:StatusBar"
+#define CMD_SID_TOGGLESTATUSBAR                     ".uno:StatusBarVisible"
+#define CMD_SID_BASICIDE_STAT_DATE                  ".uno:StatusGetDate"
+#define CMD_SID_BASICIDE_STAT_POS                   ".uno:StatusGetPosition"
+#define CMD_SID_BASICIDE_STAT_TITLE                 ".uno:StatusGetTitle"
+#define CMD_SID_BASICIDE_STOREALLMODULESOURCES      ".uno:StoreAllModuleSources"
+#define CMD_SID_BASICIDE_STOREMODULESOURCE          ".uno:StoreModuleSource"
+#define CMD_SID_STYLE_APPLY                         ".uno:StyleApplyState"
+#define CMD_SID_STYLE_CATALOG                       ".uno:StyleCatalog"
+#define CMD_SID_STYLE_NEW_BY_EXAMPLE                ".uno:StyleNewByExample"
+#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE             ".uno:StyleUpdateByExample"
+#define CMD_SID_STYLE_WATERCAN                      ".uno:StyleWatercanMode"
+#define CMD_SID_VIEWSHELL                           ".uno:SwitchViewShell"
+#define CMD_SID_TASKBAR                             ".uno:TaskBarVisible"
+#define CMD_SID_STYLE_FAMILY5                       ".uno:ListStyle"
+#define CMD_SID_TIPWINDOW                           ".uno:TipsDialog"
+#define CMD_SID_DOCTITLE                            ".uno:Title"
+#define CMD_SID_TITLE                               ".uno:Title"
+#define CMD_SID_BASICIDE_TOGGLEBRKPNT               ".uno:ToggleBreakPoint"
+#define CMD_SID_BASICIDE_SHOWWINDOW                 ".uno:BasicIDEShowWindow"
+#define CMD_SID_UNDO                                ".uno:Undo"
+#define CMD_SID_FORMATPAINTBRUSH                    ".uno:FormatPaintbrush"
+#define CMD_SID_ATTR_UNDO_COUNT                     ".uno:UndoCount"
+#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES     ".uno:UpdateAllModuleSources"
+#define CMD_SID_BASICIDE_UPDATEMODULESOURCE         ".uno:UpdateModuleSource"
+#define CMD_SID_BASICIDE_MANAGEBRKPNTS              ".uno:ManageBreakPoints"
+#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED        ".uno:ToggleBreakPointEnabled"
+#define CMD_SID_UPDATE_VERSION                      ".uno:UpdateVersion"
+#define CMD_SID_VERSION                             ".uno:VersionDialog"
+#define CMD_SID_SIGNATURE                           ".uno:Signature"
+#define CMD_SID_MACRO_SIGNATURE                     ".uno:MacroSignature"
+#define CMD_SID_VERSION_VISIBLE                     ".uno:VersionVisible"
+#define CMD_SID_VIEW_DATA_SOURCE_BROWSER            ".uno:ViewDataSourceBrowser"
+#define CMD_SID_WIN_VISIBLE                         ".uno:WinVisible"
+#define CMD_SID_MDIWINDOWLIST                       ".uno:WindowList"
+#define CMD_SID_ZOOM_IN                             ".uno:ZoomMinus"
+#define CMD_SID_ZOOM                                ".uno:Zooming"
+#define CMD_SID_ZOOM_NEXT                           ".uno:ZoomNext"
+#define CMD_SID_ZOOM_OUT                            ".uno:ZoomPlus"
+#define CMD_SID_ZOOM_PREV                           ".uno:ZoomPrevious"
+#define CMD_SID_ZOOM_TOOLBOX                        ".uno:ZoomToolBox"
+#define CMD_SID_EXPORTDOC                           ".uno:ExportTo"
+#define CMD_SID_EXPORTDOCASPDF                      ".uno:ExportToPDF"
+#define CMD_SID_DIRECTEXPORTDOCASPDF                ".uno:ExportDirectToPDF"
+#define CMD_SID_IMAGE_ORIENTATION                   ".uno:ImageOrientation"
+#define CMD_SID_SAVE_VERSION_ON_CLOSE               ".uno:SaveVersionOnClose"
+#define CMD_SID_ADDONS                              ".uno:Addons"
+#define CMD_SID_SHOW_IME_STATUS_WINDOW              ".uno:ShowImeStatusWindow"
+#define CMD_SID_UPDATE_CONFIG                       ".uno:UpdateConfiguration"
+#define CMD_SID_HELP_SUPPORTPAGE                    ".uno:HelpSupport"
+#define CMD_SID_HELP_TUTORIALS                      ".uno:HelpTutorials"
+#define CMD_SID_ADDONHELP                           ".uno:AddonHelp"
+#define CMD_SID_FORMATMENUSTATE                     ".uno:FormatMenuState"
+#define CMD_SID_INET_DLG                            ".uno:InternetDialog"
+#define CMD_SID_ONLINE_REGISTRATION                 ".uno:OnlineRegistrationDlg"
+#define CMD_SID_OFFICE_CHECK_PLZ                    ".uno:CheckPLZ"
+#define CMD_SID_ADDRESS_DATA_SOURCE                 ".uno:AutoPilotAddressDataSource"
+#define CMD_FN_BUSINESS_CARD                        ".uno:InsertBusinessCard"
+#define CMD_FN_LABEL                                ".uno:InsertLabels"
+#define CMD_FN_XFORMS_INIT                          ".uno:NewXForms"
+#define CMD_SID_SD_AUTOPILOT                        ".uno:AutoPilotPresentations"
+#define CMD_SID_NEWSD                               ".uno:NewPresentation"
+#define CMD_SID_COMP_BIBLIOGRAPHY                   ".uno:BibliographyComponent"
+#define CMD_SID_MINIMIZED                           ".uno:Minimized"
+#define CMD_SID_AUTO_CORRECT_DLG                    ".uno:AutoCorrectDlg"
+#define CMD_SID_OPTIONS_TREEDIALOG                  ".uno:OptionsTreeDialog"
+#define CMD_SID_TERMINATE_INPLACEACTIVATION         ".uno:TerminateInplaceActivation"
+#define CMD_SID_RECENTFILELIST                      ".uno:RecentFileList"
+#define CMD_SID_AVAILABLE_TOOLBARS                  ".uno:AvailableToolbars"
+#define CMD_SID_AVMEDIA_PLAYER                      ".uno:AVMediaPlayer"
+#define CMD_SID_INSERT_AVMEDIA                      ".uno:InsertAVMedia"
+#define CMD_SID_MORE_DICTIONARIES                   ".uno:MoreDictionaries"
+#define CMD_SID_ACTIVATE_STYLE_APPLY                ".uno:ActivateStyleApply"
+#define CMD_SID_DOCKWIN_0                           ".uno:DockingWindow0"
+#define CMD_SID_DOCKWIN_1                           ".uno:DockingWindow1"
+#define CMD_SID_DOCKWIN_2                           ".uno:DockingWindow2"
+#define CMD_SID_DOCKWIN_3                           ".uno:DockingWindow3"
+#define CMD_SID_DOCKWIN_4                           ".uno:DockingWindow4"
+#define CMD_SID_DOCKWIN_5                           ".uno:DockingWindow5"
+#define CMD_SID_DOCKWIN_6                           ".uno:DockingWindow6"
+#define CMD_SID_DOCKWIN_7                           ".uno:DockingWindow7"
+#define CMD_SID_DOCKWIN_8                           ".uno:DockingWindow8"
+#define CMD_SID_DOCKWIN_9                           ".uno:DockingWindow9"
+#define CMD_SID_PASTE_UNFORMATTED                   ".uno:PasteUnformatted"
+
+#endif
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index eafbef21d4..dbd91d47be 100644..100755
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -33,7 +33,7 @@
 #define MESSAGEFILE_EXT		"smd"	// Extension der Single-Mail/News-Files
 #define MESSAGETEMPFILE_EXT	"sd~"	// Extension f"ur Mail/News-TempFiles
 
-#define SfxFilterFlags ULONG
+#define SfxFilterFlags sal_uLong
 #define PRODUCT_VERSION		"5.0"
 
 #endif
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 12c7a03f9c..3df69e1ac1 100644..100755
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -55,7 +55,7 @@ struct TransferableObjectDescriptor;
 
 #include <sfx2/tabdlg.hxx>
 //typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-//typedef USHORT*		(*GetTabPageRanges)();
+//typedef sal_uInt16*		(*GetTabPageRanges)();
 
 namespace sfx2
 {
@@ -77,8 +77,8 @@ public:
 class SfxAbstractTabDialog : public SfxAbstractDialog
 {
 public:
-    virtual void				SetCurPageId( USHORT nId ) = 0;
-    virtual const USHORT*		GetInputRanges( const SfxItemPool& ) = 0;
+    virtual void				SetCurPageId( sal_uInt16 nId ) = 0;
+    virtual const sal_uInt16*		GetInputRanges( const SfxItemPool& ) = 0;
     virtual void				SetInputSet( const SfxItemSet* pInSet ) = 0;
 };
 
@@ -87,7 +87,7 @@ class SfxAbstractInsertObjectDialog : public VclAbstractDialog
 public:
     virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0;
-    virtual BOOL IsCreateNew()=0;
+    virtual sal_Bool IsCreateNew()=0;
 };
 
 class SfxAbstractPasteDialog : public VclAbstractDialog
@@ -95,7 +95,7 @@ class SfxAbstractPasteDialog : public VclAbstractDialog
 public:
     virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ) = 0;
     virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName ) = 0;
-    virtual ULONG GetFormat( const TransferableDataHelper& aHelper,
+    virtual sal_uIntPtr GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 ) = 0;
 };
@@ -132,21 +132,21 @@ public:
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
                                             bool bEditFmt=false,
                                             const String *pUserButtonText=0 ) = 0;
-    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId ) = 0;
-    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId ) = 0;
-    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual CreateTabPage				GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
+    virtual GetTabPageRanges			GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
+    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList = 0 )=0;
-    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
     virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent )=0;
-    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
+    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0;
     virtual VclAbstractDialog *         CreateSvxScriptOrgDialog( Window* pParent,  const String& rLanguage ) = 0;
 
     virtual AbstractScriptSelectorDialog*
         CreateScriptSelectorDialog(
             Window* pParent,
-            BOOL bShowSlots,
+            sal_Bool bShowSlots,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
         ) = 0;
 
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx
index 1b85edf169..15b046fc6a 100644..100755
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfx2/sfxhelp.hxx
@@ -46,12 +46,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
     SfxHelp_Impl*   pImp;
 
 private:
-    SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow );
-    SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
-    SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId );
-
+    SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword );
+    SAL_DLLPRIVATE virtual sal_Bool	SearchKeyword( const XubString& rKeyWord );
+    SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow );
+    SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
     SAL_DLLPRIVATE String GetHelpModuleName_Impl();
-    SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName );
     SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
 
 public:
@@ -61,12 +60,11 @@ public:
     inline void             SetTicket( const String& rTicket )  { aTicket = rTicket; }
     inline void             SetUser( const String& rUser )      { aUser = rUser; }
 
-    virtual XubString       GetHelpText( ULONG nHelpId, const Window* pWindow );
     virtual XubString       GetHelpText( const String&, const Window* pWindow );
 
-    static String           CreateHelpURL( ULONG nHelpId, const String& rModuleName );
     static String           CreateHelpURL( const String& aCommandURL, const String& rModuleName );
-    static void             OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
+    using Help::OpenHelpAgent;
+    static void             OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId );
     static String           GetDefaultHelpModule();
     static ::rtl::OUString  GetCurrentModuleIdentifier();
 };
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 6a24421356..68182aa52b 100644..100755
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -50,32 +50,32 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
     SfxMedium*				pMedium;
     SfxMedium *pDLMedium;	// Medium fuer Download von Files
 
-    USHORT nMetaTags;		// Anzahl der bisher gelesenen Meta-Tags
+    sal_uInt16 nMetaTags;		// Anzahl der bisher gelesenen Meta-Tags
     ScriptType eScriptType;
 
     SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* );
 
 protected:
 
-    SfxHTMLParser( SvStream& rStream, BOOL bNewDoc=TRUE, SfxMedium *pMedium=0 );
+    SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 );
 
     virtual ~SfxHTMLParser();
 
 public:
     // Lesen der Optionen einer Image-Map
-    // <MAP>: TRUE = Image-Map hat einen Namen
-    // <AREA>: TRUE = Image-Map hat jetzt einen Bereich mehr
-    static BOOL ParseMapOptions(ImageMap * pImageMap,
+    // <MAP>: sal_True = Image-Map hat einen Namen
+    // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr
+    static sal_Bool ParseMapOptions(ImageMap * pImageMap,
                                 const HTMLOptions * pOptions );
-    BOOL ParseMapOptions(ImageMap * pImageMap)
+    sal_Bool ParseMapOptions(ImageMap * pImageMap)
     { return ParseMapOptions(pImageMap, GetOptions()); }
-    static BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+    static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
                                  const HTMLOptions * pOptions,
-                                 USHORT nEventMouseOver = 0,
-                                 USHORT nEventMouseOut = 0 );
-    inline BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
-                                 USHORT nEventMouseOver = 0,
-                                 USHORT nEventMouseOut = 0);
+                                 sal_uInt16 nEventMouseOver = 0,
+                                 sal_uInt16 nEventMouseOut = 0 );
+    inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+                                 sal_uInt16 nEventMouseOver = 0,
+                                 sal_uInt16 nEventMouseOut = 0);
 
     // <TD SDVAL="..." SDNUM="...">
     static double GetTableDataOptionsValNum( sal_uInt32& nNumForm,
@@ -99,14 +99,14 @@ protected:
     void StartFileDownload( const String& rURL, int nToken,
                             SfxObjectShell *pSh=0 );
 
-    // Beenden eines asynchronen File-Downloads. Gibt TRUE zurueck, wenn
+    // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn
     // der Download geklappt hat. Das gelesene File befindet sich dann in
     // dem uebergeben String.
-    BOOL FinishFileDownload( String& rStr );
+    sal_Bool FinishFileDownload( String& rStr );
 
-    // Gibt TRUE zurueck, wenn ein File downloaded wurde und
+    // Gibt sal_True zurueck, wenn ein File downloaded wurde und
     // FileDownloadFinished noch nicht gerufen wurde.
-    BOOL ShouldFinishFileDownload() const { return pDLMedium != 0; }
+    sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; }
 
     SfxMedium *GetMedium() { return pMedium; }
     const SfxMedium *GetMedium() const { return pMedium; }
@@ -116,9 +116,9 @@ protected:
     const String& GetScriptTypeString( SvKeyValueIterator* ) const;
 };
 
-inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
-                                            USHORT nEventMouseOver,
-                                            USHORT nEventMouseOut)
+inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+                                            sal_uInt16 nEventMouseOver,
+                                            sal_uInt16 nEventMouseOut)
 {
     return ParseAreaOptions( pImageMap, rBaseURL, GetOptions(),
                              nEventMouseOver, nEventMouseOut );
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index 597d3e9c54..597d3e9c54 100644..100755
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfx2/sfxresid.hxx
index 9a03507a3f..46737fe462 100644..100755
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfx2/sfxresid.hxx
@@ -29,13 +29,13 @@
 #define _SFX_SFXRESID_HXX
 
 #include <tools/string.hxx>
-
+#include "sfx2/dllapi.h"
 #include <tools/resid.hxx>
 
-class SfxResId: public ResId
+class SFX2_DLLPUBLIC SfxResId: public ResId
 {
 public:
-    SfxResId( USHORT nId );
+    SfxResId( sal_uInt16 nId );
     static ResMgr* GetResMgr();
     static void DeleteResMgr();
 };
@@ -46,7 +46,7 @@ class SfxSimpleResId
     String m_sText;
 
 public:
-    SfxSimpleResId(USHORT nID);
+    SfxSimpleResId(sal_uInt16 nID);
 
     String getText() const { return m_sText; }
 
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index b69d251934..07325dee61 100644..100755
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -94,6 +94,8 @@
 #define SID_MAIL_PRIORITY                   (SID_SFX_START + 337)
 
 #define SID_MAIL_ATTACH_FILE                (SID_SFX_START + 375)
+#define SID_MAIL_PREPAREEXPORT              (SID_SFX_START + 385)
+#define SID_MAIL_NEEDS_PREPAREEXPORT        (SID_SFX_START + 386)
 
 #define SID_MAIL_EXPORT_FINISHED            (SID_SFX_START + 388)
 #define SID_WEBHTML                         (SID_SFX_START + 393)
@@ -137,7 +139,7 @@
 #define SID_JUMPTOMARK                      (SID_SFX_START + 598)
 #define SID_OPENTEMPLATE                    (SID_SFX_START + 594)
 #define SID_SAVEASDOC                       (SID_SFX_START + 502)
-#define SID_CLOSING                       	(SID_SFX_START +1539)
+#define SID_CLOSING                         (SID_SFX_START +1539)
 #define SID_CLOSEDOC                        (SID_SFX_START + 503)
 #define SID_CLOSEDOCS                       (SID_SFX_START + 595)
 #define SID_CLOSEDOC_SAVE                   (SID_SFX_START +   1)
@@ -157,7 +159,7 @@
 #define SID_RELOAD                          (SID_SFX_START + 508)
 #define SID_PRINTDOCDIRECT                  (SID_SFX_START + 509)
 #define SID_PICKLIST                        (SID_SFX_START + 510)
-#define SID_ATTR_XWINDOW                	(SID_SFX_START + 777)
+#define SID_ATTR_XWINDOW                    (SID_SFX_START + 777)
 #define SID_PLUGIN_MODE                     (SID_SFX_START + 827)
 #define SID_EXPORTDOC                       (SID_SFX_START + 829)
 #define SID_EXPORTDOCASPDF					(SID_SFX_START + 1673)
@@ -192,17 +194,17 @@
 #define SID_EXPLORER_FILEPROPS_START        (SID_SFX_START + 1390)
 #define SID_EXPLORER_FILEPROPS_END          (SID_SFX_START + 1399)
 
-#define ID_FILETP_START 					SID_EXPLORER_FILEPROPS_START
-#define ID_FILETP_READONLY 					(ID_FILETP_START + 0)
-#define ID_FILETP_TITLE	  					(ID_FILETP_START + 1)
+#define ID_FILETP_START                     SID_EXPLORER_FILEPROPS_START
+#define ID_FILETP_READONLY                      (ID_FILETP_START + 0)
+#define ID_FILETP_TITLE	                    (ID_FILETP_START + 1)
 
 #define SID_EXPLORER_PROPS_START            (SID_SFX_START + 1410)
 #define SID_EXPLORER_PROPS_END              (SID_SFX_START + 1499)
 
-#define SID_AUTOLOAD            			(SID_SFX_START + 1509)
+#define SID_AUTOLOAD                        (SID_SFX_START + 1509)
 #define SID_FILLFRAME                       (SID_SFX_START + 1516)
 #define SID_BASEURL					        (SID_SFX_START + 1518)
-#define SID_TEMPLATE 				        (SID_SFX_START + 1519)
+#define SID_TEMPLATE                        (SID_SFX_START + 1519)
 
 #define SID_ONLINE_REGISTRATION				(SID_SFX_START + 1537)
 
@@ -226,10 +228,10 @@
 
 #define SID_OFFICE_PLK						(SID_SFX_START + 1601)
 #define SID_OFFICE_PALK						(SID_SFX_START + 1604)
-#define SID_CHECK_KEY                    	(SID_SFX_START + 1605)
-#define SID_OFFICE_PRIVATE_USE             	(SID_SFX_START + 1606)
-#define SID_OFFICE_COMMERCIAL_USE          	(SID_SFX_START + 1607)
-#define SID_OFFICE_CUSTOMERNUMBER          	(SID_SFX_START + 1608)
+#define SID_CHECK_KEY                       (SID_SFX_START + 1605)
+#define SID_OFFICE_PRIVATE_USE                  (SID_SFX_START + 1606)
+#define SID_OFFICE_COMMERCIAL_USE               (SID_SFX_START + 1607)
+#define SID_OFFICE_CUSTOMERNUMBER               (SID_SFX_START + 1608)
 #define SID_OFFICE_INVALIDATE_TITLE			(SID_SFX_START + 1609)
 #define SID_OFFICE_CHECK_PLZ                (SID_SFX_START + 1610)
 #define SID_INTERNET_SEARCH					(SID_SFX_START + 1611)
@@ -242,14 +244,14 @@
 #define SID_NEW_MSG_PARENT                  (SID_SFX_START + 1622)
 
 
-#define SID_PGP_ENCODE 			            (SID_SFX_START + 1625)
-#define SID_PGP_DECODE 			            (SID_SFX_START + 1626)
-#define SID_TIPWINDOW                  		(SID_SFX_START + 1632)
-#define SID_CHARSET                  		(SID_SFX_START + 1633)
-#define SID_OVERWRITE                  		(SID_SFX_START + 1634)
+#define SID_PGP_ENCODE                          (SID_SFX_START + 1625)
+#define SID_PGP_DECODE                          (SID_SFX_START + 1626)
+#define SID_TIPWINDOW                           (SID_SFX_START + 1632)
+#define SID_CHARSET                         (SID_SFX_START + 1633)
+#define SID_OVERWRITE                           (SID_SFX_START + 1634)
 #define SID_RENAME                          (SID_SFX_START + 1653)
-#define SID_PARTWIN                  		(SID_SFX_START + 1640)
-#define SID_CRASH                 			(SID_SFX_START + 1645)
+#define SID_PARTWIN                         (SID_SFX_START + 1640)
+#define SID_CRASH                           (SID_SFX_START + 1645)
 #define SID_FAIL_ON_WARNING                 (SID_SFX_START + 1646)
 #define SID_MAIL_CHILDWIN					(SID_SFX_START + 1647)
 #define SID_INPUTSTREAM                     (SID_SFX_START + 1648)
@@ -277,7 +279,7 @@
 #define SID_SHOW_IME_STATUS_WINDOW          (SID_SFX_START + 1680)
 #define SID_UPDATE_CONFIG                   (SID_SFX_START + 1681)
 #define SID_VIEWONLY                        (SID_SFX_START + 1682)
-#define SID_REPAIRPACKAGE          			(SID_SFX_START + 1683)
+#define SID_REPAIRPACKAGE                       (SID_SFX_START + 1683)
 #define SID_ADDONHELP						(SID_SFX_START + 1684)
 #define SID_OBJECTSHELL                     (SID_SFX_START + 1685)
 #define SID_MINIMIZED                       (SID_SFX_START + 1687)
@@ -287,7 +289,7 @@
 #define SID_MACROORGANIZER                  (SID_SFX_START + 1691)
 #define SID_RUNMACRO                        (SID_SFX_START + 1692)
 #define SID_AVMEDIA_TOOLBOX		            (SID_SFX_START + 1693)
-#define SID_AVMEDIA_PLAYER	            	(SID_SFX_START + 1694)
+#define SID_AVMEDIA_PLAYER	                (SID_SFX_START + 1694)
 #define SID_INSERT_AVMEDIA                  (SID_SFX_START + 1696)
 #define SID_RECENTFILELIST                  (SID_SFX_START + 1697)
 #define SID_AVAILABLE_TOOLBARS              (SID_SFX_START + 1698)
@@ -311,8 +313,12 @@
 #define SID_DEFAULTFILENAME                 (SID_SFX_START + 1717)
 #define SID_MODIFYPASSWORDINFO              (SID_SFX_START + 1718)
 #define SID_RECOMMENDREADONLY               (SID_SFX_START + 1719)
-#define SID_SFX_free_START                  (SID_SFX_START + 1720)
-#define SID_SFX_free_END  					(SID_SFX_START + 3999)
+#define SID_SUGGESTEDSAVEASDIR              (SID_SFX_START + 1720)
+#define SID_SUGGESTEDSAVEASNAME             (SID_SFX_START + 1721)
+#define SID_ENCRYPTIONDATA                  (SID_SFX_START + 1722)
+#define SID_PASSWORDINTERACTION             (SID_SFX_START + 1723)
+#define SID_SFX_free_START                  (SID_SFX_START + 1724)
+#define SID_SFX_free_END                    (SID_SFX_START + 3999)
 
 #define SID_OPEN_NEW_VIEW                   (SID_SFX_START + 520)
     // FREE, was SID_VIEW_ZOOM_MODE
@@ -424,7 +430,6 @@
 #define SID_INSERT_PLUGIN                   (SID_SFX_START + 672)
 #define SID_INSERT_SOUND                    (SID_SFX_START + 676)
 #define SID_INSERT_VIDEO                    (SID_SFX_START + 677)
-#define SID_INSERT_APPLET                   (SID_SFX_START + 673)
 
 #define SID_HYPERLINK_DIALOG				(SID_SFX_START + 678)
 
@@ -496,7 +501,7 @@
 #define SID_PASTE                           (SID_SFX_START + 712)
 
 // steht unter diesem Wert in chaos/cntids.hrc!!!
-//#define SID_DELETE   			(SID_SFX_START + 713)
+//#define SID_DELETE                (SID_SFX_START + 713)
 
 #define SID_BACKSPACE                       (SID_SFX_START + 714)
 #define SID_FORMATPAINTBRUSH                (SID_SFX_START + 715)
@@ -520,48 +525,36 @@
 #define SID_CURSORTOPOFSCREEN               (SID_SFX_START + 744)
 #define SID_CURSORHOME                      (SID_SFX_START + 745)
 #define SID_CURSOREND                       (SID_SFX_START + 746)
-#define SID_SCROLLDOWN                      (SID_SFX_START + 751)
-#define SID_SCROLLUP                        (SID_SFX_START + 752)
 #define SID_FORMATMENU                      (SID_SFX_START + 780)
 #define SID_OBJECTMENU0                     SID_FORMATMENU
 #define SID_OBJECTMENU1                     (SID_SFX_START + 781)
 #define SID_OBJECTMENU2                     (SID_SFX_START + 782)
 #define SID_OBJECTMENU3                     (SID_SFX_START + 783)
 #define SID_OBJECTMENU_LAST                 SID_OBJECTMENU3
-#define SID_EDITMENU                        (SID_SFX_START + 790)
 #define SID_FORMATMENUSTATE                 (SID_SFX_START + 791)
 
 // default-ids for macros
 #define SID_RECORDING_FLOATWINDOW           (SID_SFX_START + 800)
 #define SID_RECORDMACRO                     (SID_SFX_START + 1669)
-#define SID_PLAYMACRO                       (SID_SFX_START + 801)
-#define SID_EDITMACRO                       (SID_SFX_START + 802)
-#define SID_MACROLIBMANAGER                 (SID_SFX_START + 803)
-#define SID_LOADMACROLIB                    (SID_SFX_START + 804)
-#define SID_RELEASEMACROLIB                 (SID_SFX_START + 805)
-#define SID_BASICNAME                       (SID_SFX_START + 806)
-#define SID_LIBNAME                         (SID_SFX_START + 807)
-#define SID_MODULENAME                      (SID_SFX_START + 808)
-#define SID_STATEMENT                       (SID_SFX_START + 810)
+    // FREE: SID_SFX_START + 801
+    // FREE: SID_SFX_START + 802
+    // FREE: SID_SFX_START + 803
+    // FREE: SID_SFX_START + 804
+    // FREE: SID_SFX_START + 805
+    // FREE: SID_SFX_START + 806
+    // FREE: SID_SFX_START + 807
+    // FREE: SID_SFX_START + 808
+    // FREE: SID_SFX_START + 809
+    // FREE: SID_SFX_START + 810
 #define SID_ASYNCHRON                       (SID_SFX_START + 811)
 
-#define SID_START_APP                       (SID_SFX_START + 820)
-#define SID_START_BEGIN                     (SID_SFX_START + 821)
-#define SID_STARTSW                         SID_START_BEGIN
-#define SID_STARTSC                         (SID_START_BEGIN + 1)
-#define SID_STARTSD                         (SID_START_BEGIN + 2)
-#define SID_STARTSIM                        (SID_START_BEGIN + 3)
-#define SID_STARTSCH                        (SID_START_BEGIN + 4)
-#define SID_STARTSMA                        (SID_START_BEGIN + 5)
-#define SID_START_END                       SID_STARTSMA
-
 // default-ids for configuration
 #define SID_RESTOREMENU                     (SID_SFX_START + 901)
 #define SID_RESTOREACCELS                   (SID_SFX_START + 902)
 #define SID_RESTORETOOLBOX                  (SID_SFX_START + 903)
 #define SID_CONFIG                          (SID_SFX_START + 904)
 #define SID_TOGGLECOMMONTASKBAR             (SID_SFX_START + 928)
-#define SID_TOGGLEINETBAR             		(SID_SFX_START + 928)
+#define SID_TOGGLEINETBAR                   (SID_SFX_START + 928)
 #define SID_TOGGLEOBJECTBAR                 (SID_SFX_START + 905)
 #define SID_CONFIGTOOLBOX                   (SID_SFX_START + 906)
 #define SID_TOOLBOXOPTIONS                  (SID_SFX_START + 907)
@@ -620,11 +613,9 @@
 #define SID_OBJECTRESIZE                    (SID_SFX_START + 1000)
 #define SID_INSERT_TEXT                     (SID_SFX_START + 1001)
 
-#define SID_MACRO_START                     (SID_SFX_START + 1002)
-#define SID_MACRO_END                       (SID_SFX_START + 1100)
-#define SID_EVENTCONFIG                     (SID_MACRO_END + 1)
-#define SID_VERB_START                      (SID_MACRO_END + 2)
-#define SID_VERB_END                        (SID_MACRO_END + 21)
+#define SID_EVENTCONFIG                     (SID_SFX_START + 1101)
+#define SID_VERB_START                      (SID_SFX_START + 1100)
+#define SID_VERB_END                        (SID_SFX_START + 1121)
 
 #define SID_BROWSER_TASK                    (SID_MACRO_END + 22)
 
@@ -657,10 +648,10 @@
 
 #define SID_OPT_DESKTOP_PATH                (SID_SFX_START + 1558)
 #define SID_OPT_CACHE_PATH                  (SID_SFX_START + 1559)
-#define SID_OPT_HELP_PATH                	(SID_SFX_START + 1560)
+#define SID_OPT_HELP_PATH                   (SID_SFX_START + 1560)
 #define SID_OPT_BOOKMARKS_PATH              (SID_SFX_START + 1561)
 #define SID_OPT_GALLERY_PATH                (SID_SFX_START + 1562)
-#define SID_OPT_NEWDOC_PATH                	(SID_SFX_START + 1563)
+#define SID_OPT_NEWDOC_PATH                     (SID_SFX_START + 1563)
 #define SID_OPT_AGENTS_PATH                 (SID_SFX_START + 1564)
 #define SID_OPT_AUTOPILOT_PATH              (SID_SFX_START + 1565)
 #define SID_OPT_EXPLORER_PATH               (SID_SFX_START + 1566)
@@ -754,12 +745,12 @@
 #define SID_ATTR_AUTOHELPAGENT			(SID_OPTIONS_START + 67)
 #define SID_AUTOHELPAGENT_RESET			(SID_OPTIONS_START + 68)
 #define SID_HELPAGENT_TIMEOUT			(SID_OPTIONS_START + 93)
-#define SID_ATTR_WELCOMESCREEN 			(SID_OPTIONS_START + 81)
+#define SID_ATTR_WELCOMESCREEN              (SID_OPTIONS_START + 81)
 #define SID_WELCOMESCREEN_RESET			(SID_OPTIONS_START + 82)
-#define SID_RESTORE_EXPAND_STATE	   	(SID_OPTIONS_START + 83)
+#define SID_RESTORE_EXPAND_STATE	        (SID_OPTIONS_START + 83)
 #define SID_ATTR_QUICKLAUNCHER			(SID_OPTIONS_START + 74)
 #define SID_ATTR_YEAR2000				(SID_OPTIONS_START + 87)
-#define SID_ATTR_ALLOWFOLDERWEBVIEW   	(SID_OPTIONS_START + 92)
+#define SID_ATTR_ALLOWFOLDERWEBVIEW     (SID_OPTIONS_START + 92)
 #define SID_ATTR_APPLYCHARUNIT          (SID_OPTIONS_START + 88)
 
 
@@ -829,7 +820,7 @@
 
 #define SID_INET_CHANNELS_ONOFF         (SID_OPTIONS_START + 64)
 
-#define SID_INET_COOKIESHANDLE 			(SID_OPTIONS_START + 69)
+#define SID_INET_COOKIESHANDLE              (SID_OPTIONS_START + 69)
 
 #define SID_INET_CACHEJS				(SID_OPTIONS_START + 70)
 #define SID_INET_CACHEEXPIRED			(SID_OPTIONS_START + 71)
@@ -840,9 +831,9 @@
 #define SID_SAVEREL_FSYS                (SID_OPTIONS_START + 31)
 
 // Automatisches update von Styles - Verwalten-TabPage
-#define SID_ATTR_AUTO_STYLE_UPDATE    	(SID_OPTIONS_START + 65)
+#define SID_ATTR_AUTO_STYLE_UPDATE      (SID_OPTIONS_START + 65)
 
-#define SID_SECURE_URL   				(SID_OPTIONS_START + 66)
+#define SID_SECURE_URL                  (SID_OPTIONS_START + 66)
 
 
 #define SID_OPT_SCREENSCALING			(SID_OPTIONS_START + 78)
@@ -944,7 +935,7 @@
 #define SID_BASICIDE_ARG_COLUMN1			( SID_BASICIDE_START + 49 )
 #define SID_BASICIDE_ARG_COLUMN2			( SID_BASICIDE_START + 50 )
 #define SID_BASICIDE_ARG_DOCUMENT_MODEL     ( SID_BASICIDE_START + 51 )
-#define SID_BASICIDE_MANAGE_LANG        	( SID_BASICIDE_START + 52 )
+#define SID_BASICIDE_MANAGE_LANG            ( SID_BASICIDE_START + 52 )
 #define SID_BASICIDE_CURRENT_LANG			( SID_BASICIDE_START + 53 )
 
 // SlotIds f"ur Apps --------------------------------------------------------
@@ -992,7 +983,7 @@
 
 //-----------------------------------------------------------------------
 
-#define SID_ATTR_CHAR_FILLCOLOR		    	(SID_SFX_START + 1551)
+#define SID_ATTR_CHAR_FILLCOLOR		        (SID_SFX_START + 1551)
 
 // SfxScriptOrganizerItem
 #define MID_SCRIPT_ORGANIZER_LANGUAGE       1 // Don't use zero for MID's. It's forbidden to do it!
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 1a4d68d944..adb1547859 100644..100755
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -45,7 +45,7 @@
 class SfxStatusListenerInterface
 {
     public:
-        virtual void StateChanged( USHORT nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0;
+        virtual void StateChanged( sal_uInt16 nSlotId, SfxItemState eState, const SfxPoolItem* pState ) = 0;
 };
 
 class SFX2_DLLPUBLIC SfxStatusListener :
@@ -57,17 +57,17 @@ class SFX2_DLLPUBLIC SfxStatusListener :
     public:
         SFX_DECL_XINTERFACE_XTYPEPROVIDER
 
-        SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         virtual ~SfxStatusListener();
 
         // old methods from SfxControllerItem
-        USHORT  GetId() const { return m_nSlotID; }
+        sal_uInt16  GetId() const { return m_nSlotID; }
         void    Bind();
-        void    Bind( USHORT nSlotID, const rtl::OUString& rNewCommand );
+        void    Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand );
         void    UnBind();
         void    ReBind();
 
-        virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
         // XComponent
         virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxStatusListener :
         SfxStatusListener();
         SfxStatusListener& operator=( const SfxStatusListener& );
 
-        USHORT                                                                          m_nSlotID;
+        sal_uInt16                                                                          m_nSlotID;
         ::com::sun::star::util::URL                                                     m_aCommand;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >  m_xDispatchProvider;
         ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >            m_xDispatch;
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 683fa0c6be..06c81df1f2 100644..100755
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/task/ErrorCodeIOException.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 
 
 //________________________________________________________________________________________________________________________
@@ -72,7 +73,6 @@
 #define	UNOPROPERTYVALUE				::com::sun::star::beans::PropertyValue
 #define	UNOREFERENCE					::com::sun::star::uno::Reference
 #define	UNORUNTIMEEXCEPTION				::com::sun::star::uno::RuntimeException
-#define	UNOINVALIDREGISTRYEXCEPTION		::com::sun::star::registry::InvalidRegistryException
 #define	UNOSEQUENCE						::com::sun::star::uno::Sequence
 #define	UNOTYPE							::com::sun::star::uno::Type
 #define	UNOURL							::com::sun::star::util::URL
@@ -104,7 +104,7 @@ SFX2_DLLPUBLIC void TransformItems(			sal_uInt16							nSlotId		,
                                     UNOSEQUENCE< UNOPROPERTYVALUE >&	seqArgs		,
                             const	SfxSlot*							pSlot = 0	);
 
-sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd );
+bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData );
 
 #define FrameSearchFlags			sal_Int32
 
@@ -590,52 +590,6 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd );
     }
 
 //************************************************************************************************************************
-//	definition for "extern c component_writeInfo()"
-//************************************************************************************************************************
-#define	COMPONENT_INFO(CLASS)																							\
-                                                                                                                        \
-    try																													\
-    {                                                                                               					\
-        /* Set default result of follow operations !!! */																\
-        bReturn = sal_False ;                                                                       					\
-                                                                                                                        \
-        /* Do the follow only, if given key is valid ! */																\
-        if ( xKey.is () )                                                                         						\
-        {                                                                                           					\
-            /* Build new keyname */																						\
-            sKeyName	 =	UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/" ))			;		                   						\
-            sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
-            sKeyName	+=	UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));       	            						\
-                                                                                                                        \
-            /* Create new key with new name. */																			\
-             xNewKey = xKey->createKey( sKeyName );                                              						\
-                                                                                                                        \
-            /* If this new key valid ... */																				\
-            if ( xNewKey.is () )                                                                    					\
-            {                                                                                       					\
-                /* Get information about supported services. */															\
-                seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
-                pArray			=	seqServiceNames.getArray()						;           						\
-                nLength			=	seqServiceNames.getLength()						;           						\
-                nCounter		=	0												;           						\
-                                                                                                                        \
-                /* Then set this information on this key. */															\
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                					\
-                {                                                                                   					\
-                    xNewKey->createKey( pArray [nCounter] );                                      						\
-                }                                                                                   					\
-                                                                                                                        \
-                /* Result of this operations = OK. */																	\
-                bReturn = sal_True ;                                                                					\
-            }                                                                                       					\
-        }                                                                                           					\
-    }                                                                                               					\
-    catch( UNOINVALIDREGISTRYEXCEPTION& )                                                             					\
-    {                                                                                               					\
-        bReturn = sal_False ;                                                                       					\
-    }																													\
-
-//************************************************************************************************************************
 //	definition for "extern c component_getFactory()"
 //************************************************************************************************************************
 #define	CREATEFACTORY(CLASS)																							\
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index ab8afd59af..aff1544641 100644..100755
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -66,12 +66,16 @@ class SfxShellSubObject;
 class SfxDispatcher;
 class SfxViewFrame;
 class SfxSlot;
-class SfxUndoManager;
 class SfxRepeatTarget;
 class SbxVariable;
 class SbxBase;
 class SfxBindings;
 
+namespace svl
+{
+    class IUndoManager;
+}
+
 //====================================================================
 
 enum SfxInterfaceId
@@ -163,7 +167,7 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster
 
     SfxShell_Impl*				pImp;
     SfxItemPool*				pPool;
-    SfxUndoManager* 			pUndoMgr;
+    ::svl::IUndoManager*        pUndoMgr;
 
 private:
                                 SfxShell( const SfxShell & ); // n.i.
@@ -175,7 +179,7 @@ protected:
 
 #ifndef _SFXSH_HXX
     SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
-    SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, USHORT nId );
+    SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId );
     SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
     SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
 #endif
@@ -205,25 +209,26 @@ public:
     static void                 EmptyExecStub(SfxShell *pShell, SfxRequest &);
     static void                 EmptyStateStub(SfxShell *pShell, SfxItemSet &);
 
-    const SfxPoolItem*          GetSlotState( USHORT nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 );
+    const SfxPoolItem*          GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 );
     const SfxPoolItem*          ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 );
-    const SfxPoolItem*			ExecuteSlot( SfxRequest &rReq, BOOL bAsync );
-    ULONG                       ExecuteSlot( USHORT nSlot, USHORT nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
+    const SfxPoolItem*			ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync );
+    sal_uIntPtr                       ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
 
     inline SfxItemPool&         GetPool() const;
     inline void					SetPool( SfxItemPool *pNewPool ) ;
 
-    virtual SfxUndoManager*     GetUndoManager();
-    void						SetUndoManager( SfxUndoManager *pNewUndoMgr );
+    virtual ::svl::IUndoManager*
+                                GetUndoManager();
+    void						SetUndoManager( ::svl::IUndoManager *pNewUndoMgr );
 
     SfxRepeatTarget*			GetRepeatTarget() const;
     void					    SetRepeatTarget( SfxRepeatTarget *pTarget );
 
-    virtual void                Invalidate(USHORT nId = 0);
+    virtual void                Invalidate(sal_uInt16 nId = 0);
 
-    BOOL						IsActive() const;
-    virtual void                Activate(BOOL bMDI);
-    virtual void                Deactivate(BOOL bMDI);
+    sal_Bool						IsActive() const;
+    virtual void                Activate(sal_Bool bMDI);
+    virtual void                Deactivate(sal_Bool bMDI);
     virtual void           		ParentActivate();
     virtual	void           		ParentDeactivate();
 
@@ -234,30 +239,30 @@ public:
     void						UIFeatureChanged();
 
     // Items
-    const SfxPoolItem*			GetItem( USHORT nSlotId ) const;
+    const SfxPoolItem*			GetItem( sal_uInt16 nSlotId ) const;
     void						PutItem( const SfxPoolItem& rItem );
-    void						RemoveItem( USHORT nSlotId );
+    void						RemoveItem( sal_uInt16 nSlotId );
 
     // TODO/CLEANUP: still needed?!
     void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs);
     const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const;
     void						VerbExec (SfxRequest&);
     void						VerbState (SfxItemSet&);
-    SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(USHORT nId) const;
+    SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const;
 
-    void						SetHelpId(ULONG nId);
-    ULONG						GetHelpId() const;
+    void						SetHelpId(sal_uIntPtr nId);
+    sal_uIntPtr						GetHelpId() const;
     virtual	SfxObjectShell*		GetObjectShell();
-    void						SetDisableFlags( ULONG nFlags );
-    ULONG						GetDisableFlags() const;
+    void						SetDisableFlags( sal_uIntPtr nFlags );
+    sal_uIntPtr						GetDisableFlags() const;
 
-    virtual SfxItemSet*         CreateItemSet( USHORT nId );
-    virtual void                ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+    virtual SfxItemSet*         CreateItemSet( sal_uInt16 nId );
+    virtual void                ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
 
 #ifndef _SFXSH_HXX
     SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
-    SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
-    SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
+    SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
+    SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
 #endif
 };
 
@@ -332,7 +337,7 @@ inline void SfxShell::SetPool
             #Class, NameResId, GetInterfaceId(),                            \
             SuperClass::GetStaticInterface(),                               \
             a##Class##Slots_Impl[0],                                        \
-            (USHORT) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) );   \
+            (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) );   \
             InitInterface_Impl();                                           \
         }                                                                   \
         return pInterface;                                                  \
@@ -373,13 +378,13 @@ inline void SfxShell::SetPool
         GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature )
 
 #define SFX_CHILDWINDOW_REGISTRATION(nId) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False )
 
 #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE, nFeature )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False, nFeature )
 
 #define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \
-        GetStaticInterface()->RegisterChildWindow( nId, (BOOL) TRUE )
+        GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_True )
 
 #define SFX_POPUPMENU_REGISTRATION(rResId) \
         GetStaticInterface()->RegisterPopupMenu( rResId )
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx
index cf1d958fcb..cf1d958fcb 100644..100755
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/sfx2/inc/sfx2/signaturestate.hxx
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx
index a2feb6127e..63b6217c5a 100644..100755
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/sfx2/stbitem.hxx
@@ -45,16 +45,16 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     StatusBar* pStatusBar,
     unsigned short nID,
     const ::rtl::OUString& aCommandURL );
-typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( USHORT nSlotId, USHORT nId, StatusBar &rStb );
+typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb );
 
 struct SfxStbCtrlFactory
 {
     SfxStatusBarControlCtor pCtor;
     TypeId					nTypeId;
-    USHORT					nSlotId;
+    sal_uInt16					nSlotId;
 
     SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -69,8 +69,8 @@ class UserDrawEvent;
 
 class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
 {
-    USHORT          nSlotId;
-    USHORT          nId;
+    sal_uInt16          nSlotId;
+    sal_uInt16          nId;
     StatusBar*		pBar;
 
 protected:
@@ -105,29 +105,29 @@ protected:
     virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
 
     // Old sfx2 interface
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void	Click();
     virtual void	DoubleClick();
     virtual void	Command( const CommandEvent& rCEvt );
-    virtual BOOL	MouseButtonDown( const MouseEvent & );
-    virtual BOOL	MouseMove( const MouseEvent & );
-    virtual BOOL	MouseButtonUp( const MouseEvent & );
+    virtual sal_Bool	MouseButtonDown( const MouseEvent & );
+    virtual sal_Bool	MouseMove( const MouseEvent & );
+    virtual sal_Bool	MouseButtonUp( const MouseEvent & );
     virtual void	Paint( const UserDrawEvent &rUDEvt );
 
-    static USHORT   convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
+    static sal_uInt16   convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
 
 public:
-                    SfxStatusBarControl( USHORT nSlotID, USHORT nId, StatusBar& rBar );
+                    SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar );
     virtual 		~SfxStatusBarControl();
 
-    USHORT          GetSlotId() const { return nSlotId; }
-    USHORT          GetId() const { return nId; }
+    sal_uInt16          GetSlotId() const { return nSlotId; }
+    sal_uInt16          GetId() const { return nId; }
     StatusBar&		GetStatusBar() const { return *pBar; }
     void			CaptureMouse();
     void			ReleaseMouse();
 
-    static SfxStatusBarControl* CreateControl( USHORT nSlotID, USHORT nId, StatusBar *pBar, SfxModule* );
+    static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* );
     static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*);
 
 };
@@ -135,13 +135,13 @@ public:
 //------------------------------------------------------------------
 
 #define SFX_DECL_STATUSBAR_CONTROL() \
-        static SfxStatusBarControl* CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 #define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \
-        SfxStatusBarControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \
+        SfxStatusBarControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \
                { return new Class( nSlotId, nId, rStb ); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index c12fe61055..366cd1b4c9 100644..100755
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -39,7 +39,7 @@
 
 struct SfxFilterTupel {
     String aName;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
 };
 typedef ::std::vector< SfxFilterTupel* > SfxStyleFilter;
 
@@ -51,7 +51,7 @@ class SfxStyleFamilyItem: public Resource
     Bitmap          aBitmap;
     String          aText;
     String          aHelpText;
-    USHORT          nFamily;
+    sal_uInt16          nFamily;
     SfxStyleFilter  aFilterList;
 
 public:
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index 05d05baa3c..14b9a84f18 100644..100755
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -46,7 +46,7 @@ protected:
 public:
 #define ID_TABPAGE_MANAGESTYLES	1
     SfxStyleDialog( Window* pParent, const ResId& rResId, SfxStyleSheetBase&,
-                    BOOL bFreeRes = TRUE, const String* pUserBtnTxt = 0 );
+                    sal_Bool bFreeRes = sal_True, const String* pUserBtnTxt = 0 );
 
     ~SfxStyleDialog();
 
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 8afb111c7f..8115dfba2b 100644..100755
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -58,7 +58,7 @@ class SfxBindings;
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/
 
 typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT*		(*GetTabPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16*		(*GetTabPageRanges)(); // liefert internationale Which-Wert
 struct TabPageImpl;
 class SfxUs_Impl;
 
@@ -80,10 +80,10 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem
 {
 public:
     TYPEINFO();
-                            SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet );
+                            SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
                             SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL);
     virtual SfxPoolItem*    Clone(SfxItemPool* pToPool) const;
-    virtual SfxPoolItem*    Create(SvStream& rStream, USHORT nVersion) const;
+    virtual SfxPoolItem*    Create(SvStream& rStream, sal_uInt16 nVersion) const;
 };
 
 class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog
@@ -105,11 +105,11 @@ friend class SfxTabDialogController;
     const SfxItemSet*	pSet;
     SfxItemSet*			pOutSet;
     TabDlg_Impl*		pImpl;
-    USHORT*				pRanges;
+    sal_uInt16*				pRanges;
     sal_uInt32			nResId;
-    USHORT				nAppPageId;
-    BOOL				bItemsReset;
-    BOOL				bFmt;
+    sal_uInt16				nAppPageId;
+    sal_Bool				bItemsReset;
+    sal_Bool				bFmt;
 
     DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
     DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
@@ -118,80 +118,80 @@ friend class SfxTabDialogController;
     DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * );
     DECL_DLLPRIVATE_LINK( UserHdl, Button * );
     DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-    SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
+    SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
 
 protected:
     virtual short				Ok();
     // wird im Sfx gel"oscht!
-    virtual SfxItemSet*			CreateInputItemSet( USHORT nId );
+    virtual SfxItemSet*			CreateInputItemSet( sal_uInt16 nId );
     // wird *nicht* im Sfx gel"oscht!
     virtual const SfxItemSet*	GetRefreshedSet();
-    virtual void				PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void				PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
     virtual long                Notify( NotifyEvent& rNEvt );
 
     SfxItemSet*		pExampleSet;
     SfxItemSet*		GetInputSetImpl();
-    SfxTabPage*		GetTabPage( USHORT nPageId ) const;
+    SfxTabPage*		GetTabPage( sal_uInt16 nPageId ) const;
 
-    BOOL			IsInOK() const;
+    sal_Bool			IsInOK() const;
     /**	prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary),
         handles the item sets to copy.
-        @return TRUE if it is allowed to leave the current page, FALSE otherwise
+        @return sal_True if it is allowed to leave the current page, sal_False otherwise
     */
     bool PrepareLeaveCurrentPage();
 
 public:
-    SfxTabDialog( Window* pParent, const ResId &rResId, USHORT nSetId, SfxBindings& rBindings,
-                  BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 );
+    SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings,
+                  sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
     SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0,
-                  BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 );
+                  sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 );
     SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
-                  const SfxItemSet * = 0, BOOL bEditFmt = FALSE,
+                  const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
                   const String *pUserButtonText = 0 );
     ~SfxTabDialog();
 
-    void				AddTabPage( USHORT nId,
+    void				AddTabPage( sal_uInt16 nId,
                                     CreateTabPage pCreateFunc,		// != 0
                                     GetTabPageRanges pRangesFunc,	// darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE);
-    void				AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False);
+    void				AddTabPage( sal_uInt16 nId,
                                     const String &rRiderText,
                                     CreateTabPage pCreateFunc,		// != 0
                                     GetTabPageRanges pRangesFunc,	// darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
-    void				AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
+    void				AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
                                     CreateTabPage pCreateFunc,		// != 0
                                     GetTabPageRanges pRangesFunc,	// darf 0 sein
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
 
-    void				AddTabPage( USHORT nId,
-                                    BOOL bItemsOnDemand = FALSE);
-    void				AddTabPage( USHORT nId,
+    void				AddTabPage( sal_uInt16 nId,
+                                    sal_Bool bItemsOnDemand = sal_False);
+    void				AddTabPage( sal_uInt16 nId,
                                     const String &rRiderText,
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
-    void				AddTabPage( USHORT nId,
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
+    void				AddTabPage( sal_uInt16 nId,
                                     const Bitmap &rRiderBitmap,
-                                    BOOL bItemsOnDemand = FALSE,
-                                    USHORT nPos = TAB_APPEND);
+                                    sal_Bool bItemsOnDemand = sal_False,
+                                    sal_uInt16 nPos = TAB_APPEND);
 
-    void				RemoveTabPage( USHORT nId );
+    void				RemoveTabPage( sal_uInt16 nId );
 
-    void				SetCurPageId( USHORT nId ) { nAppPageId = nId; }
-    USHORT				GetCurPageId() const
+    void				SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; }
+    sal_uInt16				GetCurPageId() const
                             { return aTabCtrl.GetCurPageId(); }
-    void				ShowPage( USHORT nId );
+    void				ShowPage( sal_uInt16 nId );
 
                         // liefert ggf. per Map konvertierte lokale Slots
-    const USHORT*		GetInputRanges( const SfxItemPool& );
+    const sal_uInt16*		GetInputRanges( const SfxItemPool& );
     void				SetInputSet( const SfxItemSet* pInSet );
     const SfxItemSet*	GetOutputItemSet() const { return pOutSet; }
-    const SfxItemSet*	GetOutputItemSet( USHORT nId ) const;
+    const SfxItemSet*	GetOutputItemSet( sal_uInt16 nId ) const;
     int					FillOutputItemSet();
-    BOOL IsFormat() const { return bFmt; }
+    sal_Bool IsFormat() const { return bFmt; }
 
     const OKButton& 	GetOKButton() const { return aOKBtn; }
     OKButton&			GetOKButton() { return aOKBtn; }
@@ -211,7 +211,7 @@ public:
 
     short				Execute();
     void                StartExecuteModal( const Link& rEndDialogHdl );
-    void				Start( BOOL bShow = TRUE );
+    void				Start( sal_Bool bShow = sal_True );
 
 #if !ENABLE_LAYOUT_SFX_TABDIALOG
     const SfxItemSet*	GetExampleSet() const { return pExampleSet; }
@@ -220,13 +220,13 @@ public:
 #endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
     SfxViewFrame*		GetViewFrame() const { return pFrame; }
 
-    void				EnableApplyButton(BOOL bEnable = TRUE);
-    BOOL				IsApplyButtonEnabled() const;
+    void				EnableApplyButton(sal_Bool bEnable = sal_True);
+    sal_Bool				IsApplyButtonEnabled() const;
     void				SetApplyHandler(const Link& _rHdl);
     Link				GetApplyHandler() const;
 
     SAL_DLLPRIVATE void Start_Impl();
-    SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); }
+    SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
 };
 
 END_NAMESPACE_LAYOUT_SFX_TABDIALOG
@@ -249,7 +249,7 @@ friend class SfxTabDialog;
 private:
     const SfxItemSet*	pSet;
     String				aUserString;
-    BOOL				bHasExchangeSupport;
+    sal_Bool				bHasExchangeSupport;
     SfxTabDialog*		pTabDlg;
     TabPageImpl*		pImpl;
 
@@ -260,12 +260,12 @@ protected:
     SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
     SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet );
 
-    USHORT				GetSlot( USHORT nWhich ) const
+    sal_uInt16				GetSlot( sal_uInt16 nWhich ) const
                             { return pSet->GetPool()->GetSlotId( nWhich ); }
-    USHORT				GetWhich( USHORT nSlot, sal_Bool bDeep = sal_True ) const
+    sal_uInt16				GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const
                             { return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
-    const SfxPoolItem* 	GetOldItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
-    const SfxPoolItem* 	GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
+    const SfxPoolItem* 	GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
+    const SfxPoolItem* 	GetExchangeItem( const SfxItemSet& rSet, sal_uInt16 nSlot );
     SfxTabDialog*		GetTabDialog() const { return pTabDlg; }
 
     void                AddItemConnection( sfx::ItemConnectionBase* pConnection );
@@ -275,12 +275,12 @@ public:
 
     const SfxItemSet&	GetItemSet() const { return *pSet; }
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet& );
 
-    BOOL				HasExchangeSupport() const
+    sal_Bool				HasExchangeSupport() const
                             { return bHasExchangeSupport; }
-    void				SetExchangeSupport( BOOL bNew = TRUE )
+    void				SetExchangeSupport( sal_Bool bNew = sal_True )
                             { bHasExchangeSupport = bNew; }
 
     enum sfxpg {
@@ -301,9 +301,9 @@ public:
                             { aUserString = rString; }
     String				GetUserData() { return aUserString; }
     virtual void		FillUserData();
-    virtual BOOL		IsReadOnly() const;
+    virtual sal_Bool		IsReadOnly() const;
     virtual void PageCreated (SfxAllItemSet aSet);
-    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
+    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True );
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
diff --git a/sfx2/inc/sfx2/taskpane.hxx b/sfx2/inc/sfx2/taskpane.hxx
index a04ae16f20..15ee957c75 100644..100755
--- a/sfx2/inc/sfx2/taskpane.hxx
+++ b/sfx2/inc/sfx2/taskpane.hxx
@@ -66,7 +66,7 @@ namespace sfx2
     public:
         TaskPaneWrapper(
             Window* i_pParent,
-            USHORT i_nId,
+            sal_uInt16 i_nId,
             SfxBindings* i_pBindings,
             SfxChildWinInfo* i_pInfo
         );
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 0c792d0fd1..c1dc72ad6e 100644..100755
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -56,16 +56,16 @@ class SfxUnoControllerItem;
 
 svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
 
 struct SfxTbxCtrlFactory
 {
     SfxToolBoxControlCtor	pCtor;
     TypeId					nTypeId;
-    USHORT					nSlotId;
+    sal_uInt16					nSlotId;
 
     SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor,
-            TypeId nTheTypeId, USHORT nTheSlotId ):
+            TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
         pCtor(pTheCtor),
         nTypeId(nTheTypeId),
         nSlotId(nTheSlotId)
@@ -112,11 +112,11 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
 class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface
 {
 friend class SfxToolBox_Impl;
-    BOOL                                                                             m_bFloating;
-    ULONG                                                                            m_nEventId;
-    BOOL                                                                             m_bCascading;
+    sal_Bool                                                                             m_bFloating;
+    sal_uIntPtr                                                                            m_nEventId;
+    sal_Bool                                                                             m_bCascading;
     Link                                                                             m_aDeleteLink;
-    USHORT                                                                           m_nId;
+    sal_uInt16                                                                           m_nId;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
     SfxFrameStatusListener*                                                          m_pStatusListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >           m_xStatusListener;
@@ -131,10 +131,10 @@ private:
 
 protected:
     virtual void			PopupModeEnd();
-    virtual BOOL			Close();
+    virtual sal_Bool			Close();
     virtual void			DeleteFloatingWindow();
 
-    USHORT                  GetId() const { return m_nId; }
+    sal_uInt16                  GetId() const { return m_nId; }
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; }
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& GetServiceManager() const { return m_xServiceManager; }
 
@@ -146,21 +146,21 @@ protected:
 
     // SfxStatusListenerInterface
     using FloatingWindow::StateChanged;
-    virtual void			StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void			StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
 
 public:
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             WinBits nBits );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             const ResId &rId );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             Window* pParentWindow,
                                             const ResId &rId );
-                            SfxPopupWindow( USHORT nId,
+                            SfxPopupWindow( sal_uInt16 nId,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                                             Window* pParentWindow,
                                             WinBits nBits );
@@ -181,8 +181,8 @@ public:
 //------------------------------------------------------------------
 
 #define SFX_DECL_TOOLBOX_CONTROL() \
-        static SfxToolBoxControl* CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ); \
-        static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL)
+        static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \
+        static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL)
 
 /*	F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder
     aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass
@@ -214,9 +214,9 @@ protected:
     DECL_LINK( ClosePopupWindow, SfxPopupWindow * );
 
     // old SfxToolBoxControl methods
-    virtual void			   StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-    virtual void			   Select( BOOL bMod1 = FALSE );
-    virtual void			   Select( USHORT nModifier );
+    virtual void			   StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void			   Select( sal_Bool bMod1 = sal_False );
+    virtual void			   Select( sal_uInt16 nModifier );
 
     virtual void			   DoubleClick();
     virtual void			   Click();
@@ -279,7 +279,7 @@ protected:
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
 
-                               SfxToolBoxControl( USHORT nSlotID, USHORT nId, ToolBox& rBox, BOOL bShowStrings = FALSE );
+                               SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False );
     virtual 				   ~SfxToolBoxControl();
 
     ToolBox&				   GetToolBox() const;
@@ -293,21 +293,21 @@ public:
                                          ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
 
     static SfxItemState        GetItemState( const SfxPoolItem* pState );
-    static SfxToolBoxControl*  CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule *pMod );
+    static SfxToolBoxControl*  CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod );
     static void                RegisterToolBoxControl( SfxModule*, SfxTbxCtrlFactory*);
 };
 
 #define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \
-        SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+        SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
                { return new Class( nSlotId, nId, rTbx ); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
 #define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \
-        SfxToolBoxControl* Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \
+        SfxToolBoxControl* Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \
                { return new Class( nSlotId, nId, rTbx, Arg); } \
-        void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \
+        void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \
                { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \
                     Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
 
@@ -328,10 +328,10 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
 {
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxDragToolBoxControl_Impl( USHORT nId, ToolBox& rBox );
+                            SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
     virtual Window*         CreateItemWindow( Window *pParent );
     using SfxToolBoxControl::Select;
-    virtual void			Select( BOOL bMod1 = FALSE );
+    virtual void			Select( sal_Bool bMod1 = sal_False );
 };
 
 //------------------------------------------------------------------------
@@ -347,7 +347,7 @@ class SfxAppToolBoxControl_Impl : public SfxToolBoxControl
 {
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
                             ~SfxAppToolBoxControl_Impl();
     void					SetImage( const String& rFacName );
 
@@ -363,16 +363,16 @@ public:
 protected:
     virtual void            Click();
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL );
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            Select( sal_Bool );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindow* CreatePopupWindow();
                             DECL_LINK( Activate, Menu * );
 private:
     String                  aLastURL;
-    BOOL					bBigImages;
+    sal_Bool					bBigImages;
     PopupMenu*              pMenu;
-    ULONG                   m_nSymbolsStyle;
-    BOOL					m_bShowMenuImages;
+    sal_uIntPtr                   m_nSymbolsStyle;
+    sal_Bool					m_bShowMenuImages;
 };
 
 class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl
@@ -385,22 +385,22 @@ private:
 protected:
     virtual void			Click( );
     using SfxToolBoxControl::Select;
-    virtual void			Select( BOOL );
+    virtual void			Select( sal_Bool );
 
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxHistoryToolBoxControl_Impl( USHORT nId, ToolBox& rBox );
+                            SfxHistoryToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
 };
 
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
     protected:
         using SfxToolBoxControl::Select;
-        virtual void Select( USHORT nSelectModifier );
+        virtual void Select( sal_uInt16 nSelectModifier );
 
     public:
     SFX_DECL_TOOLBOX_CONTROL();
-        SfxReloadToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+        SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
 };
 
 class SfxPopupMenuManager;
@@ -413,19 +413,19 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
 */
 
 {
-    BOOL		bBigImages;
+    sal_Bool		bBigImages;
     PopupMenu*  pMenu;
-    BOOL		m_bShowMenuImages;
+    sal_Bool		m_bShowMenuImages;
 
 protected:
     virtual void            Click();
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL );
-    virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void            Select( sal_Bool );
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
                             DECL_LINK( Activate, Menu * );
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
-                            SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+                            SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
                             ~SfxAddonsToolBoxControl_Impl();
 
                             void RefreshMenuImages( Menu* pMenu );
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index c2df1318d6..fe403715a6 100644..100755
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -93,7 +93,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
 {
 public:
                 SfxTemplateDialogWrapper
-                    (Window*,USHORT,SfxBindings*,SfxChildWinInfo*);
+                    (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
                 SFX_DECL_CHILDWINDOW(SfxTemplateDialogWrapper);
 
     void            SetParagraphFamily();
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
index a2621026b3..07a4ab6853 100644..100755
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -77,7 +77,7 @@ namespace sfx2
             @return
                 the ID of the newly created toolbox item
         */
-        USHORT  AddDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+        sal_uInt16  AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
         {
             return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
         }
@@ -101,6 +101,11 @@ namespace sfx2
         ToolBox&        GetToolBox()        { return m_aToolbox; }
         const ToolBox&  GetToolBox() const  { return m_aToolbox; }
 
+        /** Return the border that is painted around the inner window as
+            decoration.
+        */
+        SvBorder        GetDecorationBorder (void) const  { return m_aBorder; }
+
     protected:
         // Window overridables
         virtual void Paint( const Rectangle& i_rArea );
@@ -110,7 +115,7 @@ namespace sfx2
         virtual void SetText( const String& i_rText );
 
         // DockingWindow overridables
-        void EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+        void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
 
         // own overridables
         virtual void onLayoutDone();
@@ -122,7 +127,7 @@ namespace sfx2
 
         /** internal version of AddDropDownToolBoxItem
         */
-        USHORT  impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback );
+        sal_uInt16  impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback );
 
         /** returns the current title.
 
@@ -154,6 +159,11 @@ namespace sfx2
             since the last Paint().
         */
         bool                m_bLayoutPending;
+
+        /** Height of the title bar.  Calculated in impl_layout().
+        */
+        int                 m_nTitleBarHeight;
+
     };
 
 //......................................................................................................................
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/sfx2/tplpitem.hxx
index aa2359eded..d0be4966e3 100644..100755
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/sfx2/tplpitem.hxx
@@ -40,18 +40,18 @@ class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 public:
     TYPEINFO();
     SfxTemplateItem();
-    SfxTemplateItem( USHORT nWhich,
+    SfxTemplateItem( sal_uInt16 nWhich,
                      const String &rStyle,
-                     USHORT nMask = 0xffff );
+                     sal_uInt16 nMask = 0xffff );
     SfxTemplateItem( const SfxTemplateItem& );
 
     const String&			GetStyleName() const { return aStyle; }
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
     virtual int 			operator==( const SfxPoolItem& ) const;
-    virtual BYTE 			GetFlagCount() const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_uInt8 			GetFlagCount() const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index dac15f7999..dac15f7999 100644..100755
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx
index 3cc9527519..3cc9527519 100644..100755
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/sfx2/inc/sfx2/userinputinterception.hxx
diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index ed5a51cb67..b3ba49f51c 100644..100755
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -45,13 +45,12 @@ class SFX2_DLLPUBLIC SfxViewFactory
 {
 public:
     SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
-                    USHORT nOrdinal, const sal_Char* asciiViewName );
+                    sal_uInt16 nOrdinal, const sal_Char* asciiViewName );
     ~SfxViewFactory();
 
     SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
     void		  InitFactory();
-
-    USHORT		  GetOrdinal() const { return nOrd; }
+    sal_uInt16		  GetOrdinal() const { return nOrd; }
 
     /// returns a legacy view name. This is "view" with an appended ordinal/ID.
     String        GetLegacyViewName() const;
@@ -66,7 +65,7 @@ public:
 private:
     SfxViewCtor fnCreate;
     SfxViewInit fnInit;
-    USHORT      nOrd;
+    sal_uInt16      nOrd;
     const String    m_sViewName;
 };
 
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index d4e2b89404..c4c5abf97c 100644..100755
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -81,7 +81,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
     SfxObjectShellRef			xObjSh;
     SfxDispatcher*				pDispatcher;
     SfxBindings*				pBindings;
-    USHORT						nAdjustPosPixelLock;
+    sal_uInt16						nAdjustPosPixelLock;
 
 private:
 #ifndef _SFX_HXX
@@ -105,21 +105,21 @@ public:
 
     static void             SetViewFrame( SfxViewFrame* );
 
-    static SfxViewFrame*    LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId );
-    static SfxViewFrame*    LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId );
-    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId = 0 );
-    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const USHORT i_nViewId = 0 );
-    static SfxViewFrame*    DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId = 0 );
+    static SfxViewFrame*    LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
+    static SfxViewFrame*    LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
+    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 );
+    static SfxViewFrame*    LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 );
+    static SfxViewFrame*    DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 );
 
     static SfxViewFrame*    Current();
-    static SfxViewFrame*	GetFirst( const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE );
-    static SfxViewFrame*    GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE );
-    static USHORT           Count();
+    static SfxViewFrame*	GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
+    static SfxViewFrame*    GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
+    static sal_uInt16           Count();
 
     static SfxViewFrame*    Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
 
-            void            DoActivate(BOOL bMDI, SfxViewFrame *pOld=NULL);
-            void            DoDeactivate(BOOL bMDI, SfxViewFrame *pOld=NULL);
+            void            DoActivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
+            void            DoDeactivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
 
     SfxViewFrame*			GetParentViewFrame() const;
 
@@ -148,12 +148,12 @@ public:
                                         const Point &rPos, const Size &rSize );
     void					Hide();
     void					Show();
-    BOOL                    IsVisible() const;
+    sal_Bool                    IsVisible() const;
     void					ToTop();
-    void					Enable( BOOL bEnable );
-    virtual BOOL            Close();
-    virtual void            Activate( BOOL bUI );
-    virtual void            Deactivate( BOOL bUI );
+    void					Enable( sal_Bool bEnable );
+    virtual sal_Bool            Close();
+    virtual void            Activate( sal_Bool bUI );
+    virtual void            Deactivate( sal_Bool bUI );
 
     // DDE-Interface
     virtual long			DdeExecute( const String& rCmd );
@@ -173,17 +173,17 @@ public:
     static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
 
     // interne Handler
-    SAL_DLLPRIVATE virtual BOOL SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
+    SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
     SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
     SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh );
 
     virtual SfxObjectShell*	GetObjectShell();
-    USHORT					GetCurViewId() const;
+    sal_uInt16					GetCurViewId() const;
     SfxFrame&				GetFrame() const;
     SfxViewFrame*			GetTopViewFrame() const;
 
-    BOOL					DoClose();
-    ULONG					GetFrameType() const
+    sal_Bool					DoClose();
+    sal_uIntPtr					GetFrameType() const
                             { return GetFrame().GetFrameType(); }
     SfxFrame&				GetTopFrame() const
                             { return GetFrame().GetTopFrame(); }
@@ -192,46 +192,46 @@ public:
     void                	CancelTransfers()
                             { GetFrame().CancelTransfers(); }
 
-    void					SetModalMode( BOOL );
-    BOOL                    IsInModalMode() const;
-    void                    Resize(BOOL bForce=FALSE);
-
-    //void                        SetChildWindow(USHORT nId, BOOL bVisible );
-    void                        SetChildWindow(USHORT nId, BOOL bVisible, BOOL bSetFocus=TRUE);
-    void                        ToggleChildWindow(USHORT);
-    BOOL                        HasChildWindow(USHORT);
-    BOOL                        KnowsChildWindow(USHORT);
-    void                        ShowChildWindow(USHORT,BOOL bVisible=TRUE);
-    SfxChildWindow*             GetChildWindow(USHORT);
+    void					SetModalMode( sal_Bool );
+    sal_Bool                    IsInModalMode() const;
+    void                    Resize(sal_Bool bForce=sal_False);
+
+    //void                        SetChildWindow(sal_uInt16 nId, sal_Bool bVisible );
+    void                        SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
+    void                        ToggleChildWindow(sal_uInt16);
+    sal_Bool                        HasChildWindow(sal_uInt16);
+    sal_Bool                        KnowsChildWindow(sal_uInt16);
+    void                        ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True);
+    SfxChildWindow*             GetChildWindow(sal_uInt16);
     void                        ChildWindowExecute(SfxRequest&);
     void                        ChildWindowState(SfxItemSet&);
 
     SAL_DLLPRIVATE void SetDowning_Impl();
     SAL_DLLPRIVATE void GetDocNumber_Impl();
-    SAL_DLLPRIVATE BOOL IsDowning_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const;
     SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh );
     SAL_DLLPRIVATE void ReleaseObjectShell_Impl();
 
     SAL_DLLPRIVATE void GetState_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq );
-    SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, BOOL bAsync );
+    SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, sal_Bool bAsync );
     SAL_DLLPRIVATE void StateReload_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecView_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
-    SAL_DLLPRIVATE void ForceOuterResize_Impl(BOOL bOn=TRUE);
-    SAL_DLLPRIVATE BOOL IsResizeInToOut_Impl() const;
-    SAL_DLLPRIVATE BOOL IsAdjustPosSizePixelLocked_Impl() const
+    SAL_DLLPRIVATE void ForceOuterResize_Impl(sal_Bool bOn=sal_True);
+    SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const
                             { return nAdjustPosPixelLock != 0; }
-    SAL_DLLPRIVATE void ForceInnerResize_Impl( BOOL bOn );
+    SAL_DLLPRIVATE void ForceInnerResize_Impl( sal_Bool bOn );
     SAL_DLLPRIVATE void UpdateDocument_Impl();
 
-    SAL_DLLPRIVATE void LockObjectShell_Impl(BOOL bLock=TRUE);
+    SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True);
 
-    SAL_DLLPRIVATE void MakeActive_Impl( BOOL bActivate );
-    SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL );
+    SAL_DLLPRIVATE void MakeActive_Impl( sal_Bool bActivate );
+    SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool );
     SAL_DLLPRIVATE const Size& GetMargin_Impl() const;
     SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* );
     SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const;
@@ -239,20 +239,20 @@ public:
     SAL_DLLPRIVATE static void CloseHiddenFrames_Impl();
     SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &);
-    SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( USHORT nId );
+    SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId );
     SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro);
 
     SAL_DLLPRIVATE void Exec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &);
     SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &);
 
-    SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID );
+    SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID );
     SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
 
 private:
-    SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE );
+    SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False );
     SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
-    SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const USHORT i_nNewViewId );
+    SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId );
 
     /** loads the given existing document into the given frame
 
@@ -275,7 +275,7 @@ private:
                             const SfxObjectShell& i_rDoc,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rLoadArgs,
-                            const USHORT i_nViewId,
+                            const sal_uInt16 i_nViewId,
                             const bool i_bHidden
                         );
 
@@ -297,7 +297,7 @@ private:
     SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow(
                             const SfxObjectShell& i_rDoc,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
-                            const USHORT i_nViewId,
+                            const sal_uInt16 i_nViewId,
                             const bool i_bHidden
                         );
 };
@@ -314,7 +314,7 @@ public:
                                 SfxPoolItem( 0 ),
                                 pFrame( pViewFrame)
                             {}
-                            SfxViewFrameItem( USHORT nWhichId, SfxViewFrame *pViewFrame ):
+                            SfxViewFrameItem( sal_uInt16 nWhichId, SfxViewFrame *pViewFrame ):
                                 SfxPoolItem( nWhichId ),
                                 pFrame( pViewFrame)
                             {}
@@ -333,16 +333,16 @@ class SfxVerbListItem : public SfxPoolItem
 
 public:
                             TYPEINFO();
-                            SfxVerbListItem( USHORT nWhichId = SID_OBJECT ) :
+                            SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) :
                                 SfxPoolItem( nWhichId )
                             {}
 
-                            SfxVerbListItem( USHORT nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
+                            SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
     const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; }
 };
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index f30d8aef18..34bb1ef56d 100644..100755
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -38,6 +38,7 @@
 #include <svl/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include "shell.hxx"
 #include <tools/gen.hxx>
@@ -61,7 +62,6 @@ class SfxItemPool;
 class SfxTabPage;
 class SfxPrintMonitor;
 class SfxFrameSetDescriptor;
-class PrintDialog;
 class Printer;
 class SfxPrinter;
 class SfxProgress;
@@ -122,7 +122,7 @@ private: \
     static SfxViewFactory *pFactory; \
 public: \
     static SfxViewShell  *CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView); \
-    static void 		  RegisterFactory( USHORT nPrio = USHRT_MAX ); \
+    static void 		  RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \
     static SfxViewFactory&Factory() { return *pFactory; } \
     static void           InitFactory()
 
@@ -130,7 +130,7 @@ public: \
     SfxViewFactory* Class::pFactory; \
     SfxViewShell* Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \
     { return new Class(pFrame, pOldView); } \
-    void Class::RegisterFactory( USHORT nPrio ) \
+    void Class::RegisterFactory( sal_uInt16 nPrio ) \
     { \
         pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\
         InitFactory(); \
@@ -161,11 +161,11 @@ friend class SfxPrinterController;
     SfxViewFrame*				pFrame;
     SfxShell*					pSubShell;
     Window*						pWindow;
-    BOOL						bNoNewWindow;
+    sal_Bool						bNoNewWindow;
 
 protected:
-    virtual void                Activate(BOOL IsMDIActivate);
-    virtual void                Deactivate(BOOL IsMDIActivate);
+    virtual void                Activate(sal_Bool IsMDIActivate);
+    virtual void                Deactivate(sal_Bool IsMDIActivate);
 
     virtual Size                GetOptimalSizePixel() const;
 
@@ -179,9 +179,9 @@ protected:
 
 public:
     // Iteration
-    static SfxViewShell*        GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
+    static SfxViewShell*        GetFirst( const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
     static SfxViewShell*        GetNext( const SfxViewShell& rPrev,
-                                         const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
+                                         const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
     static SfxViewShell*        Current();
 
     static SfxViewShell*        Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
@@ -190,7 +190,7 @@ public:
                                 TYPEINFO();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
 
-                                SfxViewShell( SfxViewFrame *pFrame, USHORT nFlags = 0 );
+                                SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 );
     virtual                     ~SfxViewShell();
 
     SfxInPlaceClient*           GetIPClient() const;
@@ -213,22 +213,23 @@ public:
     void						SetScrollingMode( SfxScrollingMode eMode );
 
     // Misc
-    virtual USHORT              PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
-    virtual String              GetSelectionText( BOOL bCompleteWords = FALSE );
-    virtual BOOL				HasSelection( BOOL bText = TRUE ) const;
+    virtual sal_uInt16              PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
+    virtual String              GetSelectionText( sal_Bool bCompleteWords = sal_False );
+    virtual sal_Bool				HasSelection( sal_Bool bText = sal_True ) const;
     virtual SdrView*			GetDrawView() const;
+
     void                        SetSubShell( SfxShell *pShell );
     SfxShell*                   GetSubShell() const { return pSubShell; }
     void						AddSubShell( SfxShell& rShell );
     void						RemoveSubShell( SfxShell *pShell=NULL );
-    SfxShell*					GetSubShell( USHORT );
+    SfxShell*					GetSubShell( sal_uInt16 );
 
     // Focus, KeyInput, Cursor
     void						GotFocus() const;
     inline void					LostFocus() const;
     virtual void				ShowCursor( bool bOn = true );
     virtual bool                KeyInput( const KeyEvent &rKeyEvent );
-    BOOL                        Escape();
+    sal_Bool                        Escape();
 
     // Viewing Interface
     Window*                     GetWindow() const { return pWindow; }
@@ -241,21 +242,17 @@ public:
     void						AdjustVisArea(const Rectangle& rRect);
 
     // Printing Interface
-    virtual void				PreparePrint( PrintDialog *pPrintDialog = 0 );
-    virtual ErrCode             DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI );
-    virtual USHORT              Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
-    virtual SfxPrinter*         GetPrinter( BOOL bCreate = FALSE );
-    virtual USHORT              SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE );
+    virtual SfxPrinter*         GetPrinter( sal_Bool bCreate = sal_False );
+    virtual sal_uInt16              SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False );
     virtual SfxTabPage*         CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    virtual PrintDialog*        CreatePrintDialog( Window *pParent );
-    void						LockPrinter( BOOL bLock = TRUE );
-    BOOL						IsPrinterLocked() const;
+    void						LockPrinter( sal_Bool bLock = sal_True );
+    sal_Bool					IsPrinterLocked() const;
     virtual JobSetup			GetJobSetup() const;
     Printer*                    GetActivePrinter() const;
 
     // Workingset
-    virtual void                WriteUserData( String&, BOOL bBrowse = FALSE );
-    virtual void                ReadUserData( const String&, BOOL bBrowse = FALSE );
+    virtual void                WriteUserData( String&, sal_Bool bBrowse = sal_False );
+    virtual void                ReadUserData( const String&, sal_Bool bBrowse = sal_False );
     virtual void                WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void                ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void				QueryObjAreaPixel( Rectangle& rRect ) const;
@@ -282,20 +279,21 @@ public:
     void						SetMargin( const Size& );
     void 						DisconnectAllClients();
     virtual SfxFrame*     		GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
-    BOOL						NewWindowAllowed() const			{ return !bNoNewWindow; }
-    void						SetNewWindowAllowed( BOOL bSet )	{ bNoNewWindow = !bSet; }
+    sal_Bool						NewWindowAllowed() const			{ return !bNoNewWindow; }
+    void						SetNewWindowAllowed( sal_Bool bSet )	{ bNoNewWindow = !bSet; }
 
     void                        SetController( SfxBaseController* pController );
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
 
     ::cppu::OInterfaceContainerHelper& GetContextMenuInterceptors() const;
-    BOOL                        TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
+    sal_Bool                        TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
 
     void						SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void						ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
 
-    void						AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL );
+    void						AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool );
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
 
 #if _SOLAR__PRIVATE
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
@@ -306,17 +304,17 @@ public:
     SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
                                 { GetIPClientList_Impl(TRUE)->push_back(pIPClient); }
     SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient );
-    SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const;
+    SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const;
     SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
     SAL_DLLPRIVATE void DiscardClients_Impl();
-    SAL_DLLPRIVATE BOOL PlugInsActive() const;
+    SAL_DLLPRIVATE sal_Bool PlugInsActive() const;
 
     SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter );
-    SAL_DLLPRIVATE BOOL IsShowView_Impl() const;
+    SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const;
 
     SAL_DLLPRIVATE long HandleNotifyEvent_Impl( NotifyEvent& rEvent );
-    SAL_DLLPRIVATE BOOL HasKeyListeners_Impl();
-    SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
+    SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
 
     SAL_DLLPRIVATE SfxBaseController*   GetBaseController_Impl() const;
 
@@ -327,12 +325,12 @@ public:
     SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const;
     SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*);
     SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& );
-    SAL_DLLPRIVATE void PushSubShells_Impl( BOOL bPush=TRUE );
-    SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( FALSE ); }
+    SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True );
+    SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); }
     SAL_DLLPRIVATE void TakeOwnerShip_Impl();
     SAL_DLLPRIVATE void CheckOwnerShip_Impl();
     SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl();
-    SAL_DLLPRIVATE BOOL ExecKey_Impl(const KeyEvent& aKey);
+    SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
 #endif
 };
 
@@ -383,4 +381,4 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const
 #endif // #ifndef _SFXVIEWSH_HXX
 
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx
index a3c46e39dd..a3c46e39dd 100644..100755
--- a/sfx2/inc/sfxbasic.hxx
+++ b/sfx2/inc/sfxbasic.hxx
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 9bae90cf55..0d23c98609 100644..100755
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -46,8 +46,8 @@ public:
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
-    virtual	bool          QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool          PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool          QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool          PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     String  getLanguage() { return aLanguage; };
 };
 
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 8398cacaba..aa8b7cd1c1 100644..100755
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -78,14 +78,14 @@ public:
 
     inline String		GetSearchText() const { return m_aSearchEdit.GetText(); }
     inline void			SetSearchText( const String& _rText ) { m_aSearchEdit.SetText( _rText ); }
-    inline bool			IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != FALSE ); }
-    inline bool			IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != FALSE ); }
-    inline bool			IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != FALSE ); }
-    inline bool			IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != FALSE ); }
+    inline bool			IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != sal_False ); }
+    inline bool			IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != sal_False ); }
+    inline bool			IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != sal_False ); }
+    inline bool			IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != sal_False ); }
 
     void				SetFocusOnEdit();
 
-    virtual BOOL		Close();
+    virtual sal_Bool		Close();
     virtual void		Move();
     virtual void		StateChanged( StateChangedType nStateChange );
 };
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index f00df5afb9..27a2e6edb2 100644..100755
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,25 +1,3 @@
-sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 NULL
-sf	sfx2									usr1	-	all	sf_mkout NULL
-sf	sfx2\inc								nmake	-	all	sf_inc NULL
-sf	sfx2\prj								get		-	all	sf_prj NULL
-sf	sfx2\mac\res							get		-	all	sf_mres NULL
-sf	sfx2\source\inc							get		-	all	sf_sinc NULL
-sf	sfx2\sdi								nmake	-	all	sf_sdi NULL
-sf	sfx2\source\appl						nmake	-	all	sf_appl sf_sdi sf_inc NULL
-sf	sfx2\source\view						nmake	-	all	sf_view sf_sdi sf_inc NULL
-sf	sfx2\source\bastyp						nmake	-	all	sf_bast sf_sdi sf_inc NULL
-sf	sfx2\source\config						nmake	-	all	sf_cnfg sf_sdi sf_inc NULL
-sf	sfx2\source\control						nmake	-	all	sf_ctrl sf_sdi sf_inc NULL
-sf	sfx2\source\dialog						nmake	-	all	sf_dlg sf_sdi sf_inc NULL
-sf	sfx2\source\doc							nmake	-	all	sf_doc sf_sdi sf_inc NULL
-sf	sfx2\source\layout						nmake	-	all	sf_layout sf_sdi sf_inc NULL
-sf	sfx2\source\menu						nmake	-	all	sf_menu sf_sdi sf_inc NULL
-sf	sfx2\source\notify						nmake	-	all	sf_noti sf_sdi sf_inc NULL
-sf	sfx2\source\statbar						nmake	-	all	sf_sbar sf_sdi sf_inc NULL
-sf	sfx2\source\toolbox						nmake	-	all	sf_tbox sf_sdi sf_inc NULL
-sf	sfx2\source\inet						nmake	-	all	sf_inet sf_sdi sf_inc NULL
-sf	sfx2\source\explorer					nmake	-	all	sf_expl sf_sdi sf_inc NULL
-sf	sfx2\workben\custompanel                nmake   -   all sf_wb_custompanel NULL
-sf      sfx2\util                                                               nmake   -       all     sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL
-sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL
-sf  sfx2\qa\cppunit							nmake	-	all sf_qa_cppunit sf_util NULL
+sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf	sfx2\prj								nmake	-	all	sf_prj NULL
+
diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 0748aa19cd..e69de29bb2 100644..100755
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -1,46 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\sfx2
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib
-..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib
-..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll
-..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res
-..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym
-..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map
-..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll
-..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs
-..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid
-..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs
-..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid
-..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
-..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
-
-..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h
-..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx
-..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc
-
-..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
-..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
-..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx
-..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx
-..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx
-..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
-..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx
-..\inc\sfxhelp.hxx %_DEST%\inc%_EXT%\sfx2\sfxhelp.hxx
-..\inc\stbitem.hxx %_DEST%\inc%_EXT%\sfx2\stbitem.hxx
-..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx
-..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx
-..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx
-..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx
-..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx
-..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx
-..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx
-
diff --git a/sfx2/util/makefile.pmk b/sfx2/prj/makefile.mk
index 03817cd477..e312a7ccab 100644..100755
--- a/sfx2/util/makefile.pmk
+++ b/sfx2/prj/makefile.mk
@@ -25,6 +25,16 @@
 #
 #*************************************************************************
 
-# Reduction of exported symbols:
-CDEFS += -DSFX2_DLLIMPLEMENTATION
-VISIBILITY_HIDDEN=TRUE
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
deleted file mode 100644
index 6ab5400ec4..0000000000
--- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
+++ /dev/null
@@ -1,243 +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.
- *
- ************************************************************************/
-package complex.framework;
-
-import com.sun.star.awt.XWindow;
-import com.sun.star.document.XEventBroadcaster;
-import com.sun.star.document.XEventListener;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import complex.framework.DocHelper.WriterHelper;
-import complexlib.ComplexTestCase;
-import java.util.ArrayList;
-import com.sun.star.task.XJobExecutor;
-import com.sun.star.util.URL;
-import util.UITools;
-
-/**
- * This testcase checks the GlobalEventBroadcaster
- * it will add an XEventListener and verify the Events
- * raised when opening/changing and closing Office Documents
- */
-public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase {
-    XMultiServiceFactory m_xMSF = null;
-    XEventBroadcaster m_xEventBroadcaster = null;
-    ArrayList notifyEvents = new ArrayList();
-    XTextDocument xTextDoc;
-    XSpreadsheetDocument xSheetDoc;
-    XEventListener m_xEventListener = new EventListenerImpl();
-
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "initialize", "checkWriter", "cleanup"
-        };
-    }
-
-    public void initialize() {
-        m_xMSF = (XMultiServiceFactory) param.getMSF();
-        log.println("check wether there is a valid MultiServiceFactory");
-
-        if (m_xMSF == null) {
-            assure("## Couldn't get MultiServiceFactory make sure your Office is started",
-                   true);
-        }
-
-        log.println("... done");
-
-        log.println(
-                "Create an instance of com.sun.star.frame.GlobalEventBroadcaster");
-
-        Object GlobalEventBroadcaster = null;
-        Object dispatcher = null;
-
-        try {
-            GlobalEventBroadcaster = m_xMSF.createInstance(
-                                             "com.sun.star.frame.GlobalEventBroadcaster");
-        } catch (com.sun.star.uno.Exception e) {
-            assure("## Exception while creating instance", false);
-        }
-
-        log.println("... done");
-
-        log.println("check wether the created instance is valid");
-
-        if (GlobalEventBroadcaster == null) {
-            assure("couldn't create service", false);
-        }
-
-        log.println("... done");
-
-        log.println(
-                "try to query the XEventBroadcaster from the gained Object");
-        m_xEventBroadcaster = (XEventBroadcaster) UnoRuntime.queryInterface(
-                                      XEventBroadcaster.class,
-                                      GlobalEventBroadcaster);
-
-        if (util.utils.isVoid(m_xEventBroadcaster)) {
-            assure("couldn't get XEventBroadcaster", false);
-        }
-
-        log.println("... done");
-
-        log.println("adding Listener");
-        m_xEventBroadcaster.addEventListener(m_xEventListener);
-        log.println("... done");
-    }
-
-    public void checkWriter() {
-        log.println("-- Checking Writer --");
-
-        WriterHelper wHelper = new WriterHelper(m_xMSF);
-        String[] expected;
-        boolean locRes = true;
-        log.println("opening an empty writer doc");
-        notifyEvents.clear();
-        xTextDoc = wHelper.openEmptyDoc();
-        shortWait();
-        expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" };
-
-        assure("Wrong events fired when opening empty doc",
-               proveExpectation(expected));
-        log.println("... done");
-
-        log.println("changing the writer doc");
-        notifyEvents.clear();
-        xTextDoc.getText().setString("GlobalEventBroadcaster");
-        shortWait();
-        expected = new String[] { "OnModifyChanged" };
-
-        assure("Wrong events fired when changing doc",
-               proveExpectation(expected));
-        log.println("... done");
-
-        log.println("closing the empty writer doc");
-        notifyEvents.clear();
-        wHelper.closeDoc(xTextDoc);
-        shortWait();
-        expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" };
-
-        assure("Wrong events fired when closing empty doc",
-               proveExpectation(expected));
-        log.println("... done");
-
-        log.println("opening an writer doc via Window-New Window");
-        notifyEvents.clear();
-        xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false);
-        shortWait();
-        expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", };
-
-        assure("Wrong events fired when opening an writer doc via Window-New Window",
-               proveExpectation(expected));
-        log.println("... done");
-
-        log.println("closing the created writer doc");
-        notifyEvents.clear();
-
-        wHelper.closeDoc(xTextDoc);
-        shortWait();
-        expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" };
-
-        assure("Wrong events fired when closing Window-New Window",
-               proveExpectation(expected));
-
-        log.println("... done");
-
-    log.println("Opening document with label wizard");
-    xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false);
-        shortWait();
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit ().getActiveTopWindow ());
-        UITools ut = new UITools(m_xMSF,xWindow);
-        notifyEvents.clear();
-        log.println("pressing button 'New Document'");
-        try{
-            ut.clickButton ("New Document");
-        } catch (Exception e) {
-            log.println("Couldn't press Button");
-        }
-        log.println("... done");
-        shortWait();
-        shortWait();
-    shortWait();
-        expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" };
-
-        assure("Wrong events fired when starting labels wizard",
-               proveExpectation(expected));
-
-        log.println("-- Done Writer --");
-    }
-
-    public void cleanup() {
-        log.println("removing Listener");
-        m_xEventBroadcaster.removeEventListener(m_xEventListener);
-        log.println("... done");
-    }
-
-    /**
-    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
-    * reset</code> call.
-    */
-    private void shortWait() {
-        try {
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            log.println("While waiting :" + e);
-        }
-    }
-
-    private boolean proveExpectation(String[] expected) {
-        boolean locRes = true;
-                boolean failure = false;
-
-        log.println("Fired Events:");
-        for (int k=0;k<notifyEvents.size();k++) {
-            System.out.println("\t- "+notifyEvents.get(k));
-        }
-
-        for (int i = 0; i < expected.length; i++) {
-            locRes = notifyEvents.contains(expected[i]);
-
-            if (!locRes) {
-                log.println("The event " + expected[i] + " isn't fired");
-                                failure = true;
-            }
-        }
-
-        return !failure;
-    }
-
-    public class EventListenerImpl implements XEventListener {
-        public void disposing(com.sun.star.lang.EventObject eventObject) {
-            log.println("disposing: " + eventObject.Source.toString());
-        }
-
-        public void notifyEvent(com.sun.star.document.EventObject eventObject) {
-            notifyEvents.add(eventObject.EventName);
-        }
-    }
-}
diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk
deleted file mode 100644
index 6b6ac9191c..0000000000
--- a/sfx2/qa/complex/DocHelper/makefile.mk
+++ /dev/null
@@ -1,46 +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 = ..$/..$/..
-TARGET  = DocHelper
-PRJNAME = $(TARGET)
-PACKAGE = complex$/framework$/dochelper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = DialogThread.java WriterHelper.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java
deleted file mode 100644
index 2f818b972b..0000000000
--- a/sfx2/qa/complex/docinfo/DocumentProperties.java
+++ /dev/null
@@ -1,269 +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.
- *
- ************************************************************************/
-package complex.docinfo;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertyContainer;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.document.XDocumentInfo;
-import com.sun.star.document.XDocumentInfoSupplier;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XStorable;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-import com.sun.star.util.Date;
-
-import complexlib.ComplexTestCase;
-
-import util.DesktopTools;
-import util.WriterTools;
-
-
-public class DocumentProperties extends ComplexTestCase {
-    XMultiServiceFactory m_xMSF = null;
-    XTextDocument xTextDoc = null;
-
-    public String[] getTestMethodNames() {
-        return new String[] {"checkDocInfo", "cleanup"};
-    }
-
-    public void checkDocInfo() {
-        m_xMSF = (XMultiServiceFactory) param.getMSF();
-
-        log.println(
-            "check wether there is a valid MultiServiceFactory");
-
-        if (m_xMSF == null) {
-            assure("## Couldn't get MultiServiceFactory make sure your Office is started",
-                true);
-        }
-
-        log.println("... done");
-
-        log.println("Opening a Writer document");
-        xTextDoc = WriterTools.createTextDoc(m_xMSF);
-        log.println("... done");
-
-        XDocumentInfoSupplier xDocInfoSup =
-            (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class,
-                xTextDoc);
-        XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo();
-        XPropertyContainer xPropContainer =
-            (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class,
-                xDocInfo);
-
-        log.println("Trying to add a existing property");
-
-        boolean worked =
-            addProperty(xPropContainer, "Author", (short) 0, "");
-        assure("Could set an existing property", !worked);
-        log.println("...done");
-
-        log.println("Trying to add a integer property");
-        worked =
-            addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY,
-                new Integer(17));
-        assure("Couldn't set an integer property", worked);
-        log.println("...done");
-
-        log.println("Trying to add a double property");
-        worked =
-            addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE ,
-                new Double(17.7));
-        assure("Couldn't set an double property", worked);
-        log.println("...done");
-
-        log.println("Trying to add a boolean property");
-        worked =
-            addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE,
-                Boolean.TRUE);
-        assure("Couldn't set an boolean property", worked);
-        log.println("...done");
-
-        log.println("Trying to add a date property");
-        worked =
-            addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE,
-                new Date());
-        assure("Couldn't set an date property", worked);
-        log.println("...done");
-        
-        log.println("trying to remove a read only Property");
-        try {
-            xPropContainer.removeProperty ("intValue");
-            assure("Could remove read only property", false);
-        } catch (Exception e) {
-            log.println("\tException was thrown "+e);
-            log.println("\t...OK");
-        }
-        log.println("...done");        
-        
-
-        String tempdir = System.getProperty("java.io.tmpdir");
-        String fs = System.getProperty("file.separator");
-
-        if (!tempdir.endsWith(fs)) {
-            tempdir += fs;
-        }
-
-        tempdir = util.utils.getFullURL(tempdir);
-
-        log.println("Storing the document");
-
-        try {
-            XStorable store =
-                (XStorable) UnoRuntime.queryInterface(XStorable.class,
-                    xTextDoc);
-            store.storeToURL(tempdir + "DocInfo.oot",
-                new PropertyValue[] {});
-            DesktopTools.closeDoc(xTextDoc);
-        } catch (Exception e) {
-            assure("Couldn't store document", false);
-        }
-
-        log.println("...done");
-
-        log.println("loading the document");
-
-        try {
-            XComponentLoader xCL =
-                (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class,
-                    m_xMSF.createInstance(
-                        "com.sun.star.frame.Desktop"));
-            XComponent xComp =
-                xCL.loadComponentFromURL(tempdir + "DocInfo.oot",
-                    "_blank", 0, new PropertyValue[] {});
-            xTextDoc =
-                (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class,
-                    xComp);
-        } catch (Exception e) {
-            assure("Couldn't load document", false);
-        }
-
-        log.println("...done");
-
-        xDocInfoSup =
-            (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class,
-                xTextDoc);
-        xDocInfo = xDocInfoSup.getDocumentInfo();
-
-        XPropertySet xProps =
-            (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,
-                xDocInfo);
-
-        assure("Integer doesn't work",
-            checkType(xProps, "intValue", "java.lang.Integer"));
-        assure("Double doesn't work",
-            checkType(xProps, "doubleValue", "java.lang.Double"));
-        assure("Boolean doesn't work",
-            checkType(xProps, "booleanValue", "java.lang.Boolean"));
-        assure("Date doesn't work",
-            checkType(xProps, "dateValue",
-                "com.sun.star.util.DateTime"));
-        
-                xPropContainer =
-            (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class,
-                xDocInfo);
-        
-        log.println("trying to remove a not user defined Property");
-        try {
-            xPropContainer.removeProperty ("Author");
-            assure("Could remove non user defined property", false);
-        } catch (Exception e) {
-            log.println("\tException was thrown "+e);
-            log.println("\t...OK");
-        }
-        log.println("...done");
-        
-        log.println("Trying to remove a user defined property");
-        try {
-            xPropContainer.removeProperty ("dateValue");
-            log.println("\t...OK");
-        } catch (Exception e) {
-            log.println("\tException was thrown "+e);
-            log.println("\t...FAILED");
-            assure("Could not remove user defined property", false);
-        }        
-        log.println("...done");
-        
-    }
-
-    public void cleanup() {
-        DesktopTools.closeDoc(xTextDoc);
-    }
-
-    private boolean checkType(XPropertySet xProps, String aName,
-        String expected) {
-        boolean ret = true;
-        log.println("Checking " + expected);
-
-        String getting =
-            getPropertyByName(xProps, aName).getClass().getName();
-
-        if (!getting.equals(expected)) {
-            log.println("\t Expected: " + expected);
-            log.println("\t Detting:  " + getting);
-            ret = false;
-        }
-
-        if (ret) {
-            log.println("...OK");
-        }
-
-        return ret;
-    }
-
-    private Object getPropertyByName(XPropertySet xProps, String aName) {
-        Object ret = null;
-
-        try {
-            ret = xProps.getPropertyValue(aName);
-        } catch (Exception e) {
-            log.println("\tCouldn't get Property " + aName);
-            log.println("\tMessage " + e);
-        }
-
-        return ret;
-    }
-
-    private boolean addProperty(XPropertyContainer xPropContainer,
-        String aName, short attr, Object defaults) {
-        boolean ret = true;
-
-        try {
-            xPropContainer.addProperty(aName, attr, defaults);
-        } catch (Exception e) {
-            ret = false;
-            log.println("\tCouldn't get Property " + aName);
-            log.println("\tMessage " + e);
-        }
-
-        return ret;
-    }
-}
diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
deleted file mode 100644
index 0c350f1a96..0000000000
--- a/sfx2/qa/complex/docinfo/makefile.mk
+++ /dev/null
@@ -1,56 +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 = ..$/..$/..
-TARGET  = DocumentProperties
-PRJNAME = sfx2
-PACKAGE = complex$/docinfo
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = DocumentProperties.java
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-run:
-    $(JAVAI) $(JAVAIFLAGS) -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b)
diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk
deleted file mode 100644
index b8bc897fcc..0000000000
--- a/sfx2/qa/complex/makefile.mk
+++ /dev/null
@@ -1,61 +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 = ..$/..
-TARGET  = CheckGlobalEventBroadcaster_writer1
-PRJNAME = $(TARGET)
-PACKAGE = complex$/framework
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = CheckGlobalEventBroadcaster_writer1.java \
-                  DocumentMetaData.java \
-                  DocumentMetadataAccessTest.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-SUBDIRS         = DocHelper
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-run:
-    +java -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -sce tests.sce -tdoc $(PWD)$/testdocuments
diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java b/sfx2/qa/complex/sfx2/DocumentInfo.java
new file mode 100755
index 0000000000..50fbc510bc
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/DocumentInfo.java
@@ -0,0 +1,362 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+package complex.sfx2;
+
+import com.sun.star.beans.PropertyAttribute;
+import com.sun.star.beans.Property;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertyContainer;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
+import com.sun.star.document.XDocumentInfo;
+import com.sun.star.document.XDocumentInfoSupplier;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.Date;
+
+
+
+import util.DesktopTools;
+import util.WriterTools;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public class DocumentInfo
+{
+    XMultiServiceFactory m_xMSF = null;
+    XTextDocument xTextDoc = null;
+    XTextDocument xTextDocSecond = null;
+
+    @Test public void checkDocInfo()
+    {
+        m_xMSF = getMSF();
+
+        System.out.println("check wether there is a valid MultiServiceFactory");
+
+        assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF);
+
+        // TODO: need other temp directory!
+        String tempdir = System.getProperty("java.io.tmpdir");
+        String fs = System.getProperty("file.separator");
+
+        if (!tempdir.endsWith(fs))
+        {
+            tempdir += fs;
+        }
+        tempdir = util.utils.getFullURL(tempdir);
+        final String sTempDocument = tempdir + "DocInfo.oot";
+
+        if (true)
+        {
+            System.out.println("... done");
+
+
+            System.out.println("Opening a Writer document");
+            xTextDoc = WriterTools.createTextDoc(m_xMSF);
+            System.out.println("... done");
+
+            XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc);
+            XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo();
+            XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo);
+
+            System.out.println("Trying to add a existing property");
+
+            boolean worked = addProperty(xPropContainer, "Author", (short) 0, "");
+            assertTrue("Could set an existing property", !worked);
+            System.out.println("...done");
+
+            System.out.println("Trying to add a integer property");
+            worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17));
+            assertTrue("Couldn't set an integer property", worked);
+            System.out.println("...done");
+
+            System.out.println("Trying to add a double property");
+            worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7));
+            assertTrue("Couldn't set an double property", worked);
+            System.out.println("...done");
+
+            System.out.println("Trying to add a boolean property");
+            worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE);
+            assertTrue("Couldn't set an boolean property", worked);
+            System.out.println("...done");
+
+            System.out.println("Trying to add a date property");
+            worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date());
+            assertTrue("Couldn't set an date property", worked);
+            System.out.println("...done");
+
+            System.out.println("trying to remove a read only Property");
+            try
+            {
+                xPropContainer.removeProperty("intValue");
+                fail("Could remove read only property");
+            }
+            catch (Exception e)
+            {
+                System.out.println("\tException was thrown " + e);
+                System.out.println("\t...OK");
+            }
+            System.out.println("...done");
+
+            XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer);
+            showPropertySet(xProps2);
+
+
+            System.out.println("Storing the document");
+            try
+            {
+                XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc);
+                store.storeToURL(sTempDocument, new PropertyValue[] {});
+                DesktopTools.closeDoc(xTextDoc);
+            }
+            catch (Exception e)
+            {
+                fail("Couldn't store document");
+            }
+
+            System.out.println("...done");
+        }
+
+
+        if (true)
+        {
+            System.out.println("loading the document");
+
+            try
+            {
+                XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop"));
+                XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {});
+                xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp);
+            }
+            catch (Exception e)
+            {
+                fail("Couldn't load document");
+            }
+
+            System.out.println("...done");
+
+            XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond);
+            XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo();
+            XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo);
+
+            XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo);
+            showPropertySet(xProps);
+
+            assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double"));
+            assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean"));
+
+            // TODO: dateValue does not exist.
+            // assertTrue("Date doesn't work",     checkType(xProps, "dateValue", "com.sun.star.util.DateTime"));
+
+            // TODO: is java.lang.Double
+            // assertTrue("Integer doesn't work",  checkType(xProps, "intValue", "java.lang.Integer"));
+
+            xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo);
+
+            System.out.println("trying to remove a not user defined Property");
+            try
+            {
+                xPropContainer.removeProperty("Author");
+                fail("Could remove non user defined property");
+            }
+            catch (Exception e)
+            {
+                System.out.println("\tException was thrown " + e);
+                System.out.println("\t...OK");
+            }
+            System.out.println("...done");
+
+
+            System.out.println("Trying to remove a user defined property");
+            try
+            {
+                xPropContainer.removeProperty("booleanValue");
+                System.out.println("\t...OK");
+            }
+            catch (Exception e)
+            {
+                System.out.println("\tException was thrown " + e);
+                System.out.println("\t...FAILED");
+                fail("Could not remove user defined property");
+            }
+            showPropertySet(xProps);
+            System.out.println("...done");
+        }
+    }
+
+    @After public void cleanup()
+    {
+        DesktopTools.closeDoc(xTextDocSecond);
+        DesktopTools.closeDoc(xTextDoc);
+    }
+
+    private void showPropertySet(XPropertySet xProps)
+        {
+            try
+            {
+                // get an XPropertySet, here the one of a text cursor
+                // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor);
+                
+                // get the property info interface of this XPropertySet
+                XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
+                
+                // get all properties (NOT the values) from XPropertySetInfo
+                Property[] aProps = xPropsInfo.getProperties();
+                int i;
+                for (i = 0; i < aProps.length; ++i) {
+                    // number of property within this info object
+                    System.out.print("Property #" + i);
+                    
+                    // name of property
+                    System.out.print(": Name<" + aProps[i].Name);
+                    
+                    // handle of property (only for XFastPropertySet)
+                    System.out.print("> Handle<" + aProps[i].Handle);
+                    
+                    // type of property
+                    System.out.print("> " + aProps[i].Type.toString());
+                    
+                    // attributes (flags)
+                    System.out.print(" Attributes<");
+                    short nAttribs = aProps[i].Attributes;
+                    if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0)
+                        System.out.print("MAYBEVOID|");
+                    if ((nAttribs & PropertyAttribute.BOUND) != 0)
+                        System.out.print("BOUND|");
+                    if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0)
+                        System.out.print("CONSTRAINED|");
+                    if ((nAttribs & PropertyAttribute.READONLY) != 0)
+                        System.out.print("READONLY|");
+                    if ((nAttribs & PropertyAttribute.TRANSIENT) != 0)
+                        System.out.print("TRANSIENT|");
+                    if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0)
+                        System.out.print("MAYBEAMBIGUOUS|");
+                    if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0)
+                        System.out.print("MAYBEDEFAULT|");
+                    if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0)
+                        System.out.print("REMOVEABLE|");
+                    System.out.println("0>");
+                }
+            } catch (Exception e) {
+                // If anything goes wrong, give the user a stack trace
+                e.printStackTrace(System.out);
+            }
+        }
+    
+    private boolean checkType(XPropertySet xProps, String aName,
+            String expected)
+    {
+        boolean ret = true;
+        System.out.println("Checking " + expected);
+
+        String getting =
+                getPropertyByName(xProps, aName).getClass().getName();
+
+        if (!getting.equals(expected))
+        {
+            System.out.println("\t Expected: " + expected);
+            System.out.println("\t Getting:  " + getting);
+            ret = false;
+        }
+
+        if (ret)
+        {
+            System.out.println("...OK");
+        }
+        return ret;
+    }
+
+    private Object getPropertyByName(XPropertySet xProps, String aName)
+    {
+        Object ret = null;
+
+        try
+        {
+            ret = xProps.getPropertyValue(aName);
+        }
+        catch (Exception e)
+        {
+            System.out.println("\tCouldn't get Property " + aName);
+            System.out.println("\tMessage " + e);
+        }
+
+        return ret;
+    }
+
+    private boolean addProperty(XPropertyContainer xPropContainer,
+            String aName, short attr, Object defaults)
+    {
+        boolean ret = true;
+
+        try
+        {
+            xPropContainer.addProperty(aName, attr, defaults);
+        }
+        catch (Exception e)
+        {
+            ret = false;
+            System.out.println("\tCouldn't get Property " + aName);
+            System.out.println("\tMessage " + e);
+        }
+
+        return ret;
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "starting class: " + DocumentInfo.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "finishing class: " + DocumentInfo.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index da9cfd6cf7..7920c04282 100644..100755
--- a/sfx2/qa/complex/DocumentMetadataAccessTest.java
+++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -25,38 +25,60 @@
  *
  ************************************************************************/
 
-package complex.framework;
+package complex.sfx2;
 
-import complexlib.ComplexTestCase;
+// import complexlib.ComplexTestCase;
+import com.sun.star.beans.Pair;
+import com.sun.star.rdf.Literal;
+import com.sun.star.rdf.XLiteral;
+import com.sun.star.rdf.XNamedGraph;
+import com.sun.star.rdf.BlankNode;
+import com.sun.star.rdf.XQuerySelectResult;
+import com.sun.star.rdf.XNode;
+import com.sun.star.rdf.XDocumentRepository;
+import com.sun.star.rdf.XMetadatable;
+import com.sun.star.rdf.Statement;
+import com.sun.star.rdf.FileFormat;
+import com.sun.star.rdf.URIs;
+import com.sun.star.rdf.URI;
+import com.sun.star.rdf.XDocumentMetadataAccess;
+import com.sun.star.rdf.XRepositorySupplier;
+import com.sun.star.rdf.XRepository;
+import com.sun.star.rdf.XBlankNode;
+import com.sun.star.rdf.XURI;
 import helper.StreamSimulator;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.Any;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XInitialization;
+
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.WrappedTargetRuntimeException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.Pair;
 import com.sun.star.beans.StringPair;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XEnumeration;
-import com.sun.star.container.ElementExistException;
-import com.sun.star.container.NoSuchElementException;
 import com.sun.star.io.XInputStream;
-import com.sun.star.io.XOutputStream;
 import com.sun.star.util.XCloseable;
 import com.sun.star.frame.XStorable;
-import com.sun.star.frame.XLoadable;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XText;
-import com.sun.star.rdf.*;
+import complex.sfx2.tools.TestDocument;
+import lib.TestParameters;
+
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /**
  * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess
@@ -68,7 +90,7 @@ import com.sun.star.rdf.*;
  * 
  * @author mst
  */
-public class DocumentMetadataAccessTest extends ComplexTestCase
+public class DocumentMetadataAccess
 {
     XMultiServiceFactory xMSF;
     XComponentContext xContext;
@@ -105,72 +127,77 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
     XRepositorySupplier xRS;
     XDocumentMetadataAccess xDMA;
 
-    public String[] getTestMethodNames ()
-    {
-        return new String[] { "check", "checkRDFa" };
-    }
+//    public String[] getTestMethodNames ()
+//    {
+//        return new String[] { "check", "checkRDFa" };
+//    }
+    /**
+     * The test parameters
+     */
+    private static TestParameters param = null;
 
-    public void before()
+    @Before public void before()
     {
         try {
 
-            xMSF = (XMultiServiceFactory) param.getMSF();
-            assure("could not create MultiServiceFactory.", xMSF != null);
-            XPropertySet xPropertySet = (XPropertySet)
-                UnoRuntime.queryInterface(XPropertySet.class, xMSF);
+            xMSF = getMSF();
+            param = new TestParameters();
+            param.put("ServiceFactory", xMSF);  // important for param.getMSF()
+
+            assertNotNull("could not create MultiServiceFactory.", xMSF);
+            XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF);
             Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext");
-            xContext = (XComponentContext)
-                UnoRuntime.queryInterface(XComponentContext.class, defaultCtx);
-            assure("could not get component context.", xContext != null);
+            xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx);
+            assertNotNull("could not get component context.", xContext);
 
             tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF);
-            log.println("tempdir: " + tempDir);
+            System.out.println("tempdir: " + tempDir);
 
             foo = URI.create(xContext, "uri:foo");
-            assure("foo", null != foo);
+            assertNotNull("foo", foo);
             bar = URI.create(xContext, "uri:bar");
-            assure("bar", null != bar);
+            assertNotNull("bar", bar);
             baz = URI.create(xContext, "uri:baz");
-            assure("baz", null != baz);
+            assertNotNull("baz", baz);
 
             blank1 = BlankNode.create(xContext, "_:1");
-            assure("blank1", null != blank1);
+            assertNotNull("blank1", blank1);
             blank2 = BlankNode.create(xContext, "_:2");
-            assure("blank2", null != blank2);
+            assertNotNull("blank2", blank2);
             blank3 = BlankNode.create(xContext, "_:3");
-            assure("blank3", null != blank3);
+            assertNotNull("blank3", blank3);
             blank4 = BlankNode.create(xContext, "_:4");
-            assure("blank4", null != blank4);
+            assertNotNull("blank4", blank4);
             rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE);
-            assure("rdf_type", null != rdf_type);
+            assertNotNull("rdf_type", rdf_type);
             rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL);
-            assure("rdfs_label", null != rdfs_label);
+            assertNotNull("rdfs_label", rdfs_label);
             pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT);
-            assure("pkg_Document", null != pkg_Document);
+            assertNotNull("pkg_Document", pkg_Document);
             pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART);
-            assure("pkg_hasPart", null != pkg_hasPart);
+            assertNotNull("pkg_hasPart", pkg_hasPart);
             pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE);
-            assure("pkg_MetadataFile", null != pkg_MetadataFile);
+            assertNotNull("pkg_MetadataFile", pkg_MetadataFile);
             odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE);
-            assure("odf_ContentFile", null != odf_ContentFile);
+            assertNotNull("odf_ContentFile", odf_ContentFile);
             odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE);
-            assure("odf_StylesFile", null != odf_StylesFile);
+            assertNotNull("odf_StylesFile", odf_StylesFile);
             odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT);
-            assure("odf_Element", null != odf_Element);
+            assertNotNull("odf_Element", odf_Element);
 
         } catch (Exception e) {
             report(e);
         }
     }
 
-    public void after()
+    @After public void after()
     {
         xRep = null;
         xRS  = null;
         xDMA = null;
     }
 
-    public void check()
+    @Test public void check()
     {
         XComponent xComp = null;
         XComponent xComp2 = null;
@@ -178,7 +205,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             XEnumeration xStmtsEnum;
             XNamedGraph xManifest;
 
-            log.println("Creating document with Repository...");
+            System.out.println("Creating document with Repository...");
 
             // we cannot create a XDMA directly, we must create
             // a document and get it from there :(
@@ -186,248 +213,241 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             PropertyValue[] loadProps = new PropertyValue[1];
             loadProps[0] = new PropertyValue();
             loadProps[0].Name = "Hidden";
-            loadProps[0].Value = new Boolean(true);
+            loadProps[0].Value = true;
             xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps);
-            XTextDocument xText = (XTextDocument) UnoRuntime.queryInterface(
-                        XTextDocument.class, xComp);
+            XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp);
 
-            XRepositorySupplier xRS = (XRepositorySupplier)
-                UnoRuntime.queryInterface(XRepositorySupplier.class, xComp);
-            assure("xRS null", null != xRS);
-            XDocumentMetadataAccess xDMA = (XDocumentMetadataAccess)
-                UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS);
-            assure("xDMA null", null != xDMA);
-            xRep = xRS.getRDFRepository();
-            assure("xRep null", null != xRep);
+            XRepositorySupplier xRepoSupplier = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp);
+            assertNotNull("xRS null", xRepoSupplier);
+            XDocumentMetadataAccess xDocMDAccess = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRepoSupplier);
+            assertNotNull("xDMA null", xDocMDAccess);
+            xRep = xRepoSupplier.getRDFRepository();
+            assertNotNull("xRep null", xRep);
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking that new repository is initialized...");
+            System.out.println("Checking that new repository is initialized...");
 
-            XURI xBaseURI = (XURI) xDMA;
+            XURI xBaseURI = (XURI) xDocMDAccess;
             String baseURI = xBaseURI.getStringValue();
-            assure("new: baseURI",
-                null != xBaseURI && !xBaseURI.getStringValue().equals(""));
+            assertNotNull("new: baseURI", xBaseURI );
+            assertTrue("new: baseURI", !xBaseURI.getStringValue().equals(""));
 
-            assure("new: # graphs", 1 == xRep.getGraphNames().length);
+            assertTrue("new: # graphs", 1 == xRep.getGraphNames().length);
             XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(),
                 manifestPath);
             xManifest = xRep.getGraph(manifest);
-            assure("new: manifest graph", null != xManifest);
+            assertTrue("new: manifest graph", null != xManifest);
 
             Statement[] manifestStmts = getManifestStmts(xBaseURI);
             xStmtsEnum = xRep.getStatements(null, null, null);
-            assure("new: manifest graph", eq(xStmtsEnum, manifestStmts));
+            assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking some invalid args...");
+            System.out.println("Checking some invalid args...");
 
             String content = "behold, for i am the content.";
             XTextRange xTR = new TestRange(content);
             XMetadatable xM = (XMetadatable) xTR;
 
             try {
-                xDMA.getElementByURI(null);
-                assure("getElementByURI: null allowed", false);
+                xDocMDAccess.getElementByURI(null);
+                fail("getElementByURI: null allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.getMetadataGraphsWithType(null);
-                assure("getMetadataGraphsWithType: null URI allowed", false);
+                xDocMDAccess.getMetadataGraphsWithType(null);
+                fail("getMetadataGraphsWithType: null URI allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("", new XURI[0]);
-                assure("addMetadataFile: empty filename allowed", false);
+                xDocMDAccess.addMetadataFile("", new XURI[0]);
+                fail("addMetadataFile: empty filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("/foo", new XURI[0]);
-                assure("addMetadataFile: absolute filename allowed", false);
+                xDocMDAccess.addMetadataFile("/foo", new XURI[0]);
+                fail("addMetadataFile: absolute filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("fo\"o", new XURI[0]);
-                assure("addMetadataFile: invalid filename allowed", false);
+                xDocMDAccess.addMetadataFile("fo\"o", new XURI[0]);
+                fail("addMetadataFile: invalid filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("../foo", new XURI[0]);
-                assure("addMetadataFile: filename with .. allowed", false);
+                xDocMDAccess.addMetadataFile("../foo", new XURI[0]);
+                fail("addMetadataFile: filename with .. allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("foo/../../bar", new XURI[0]);
-                assure("addMetadataFile: filename with nest .. allowed", false);
+                xDocMDAccess.addMetadataFile("foo/../../bar", new XURI[0]);
+                fail("addMetadataFile: filename with nest .. allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("foo/././bar", new XURI[0]);
-                assure("addMetadataFile: filename with nest . allowed", false);
+                xDocMDAccess.addMetadataFile("foo/././bar", new XURI[0]);
+                fail("addMetadataFile: filename with nest . allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("content.xml", new XURI[0]);
-                assure("addMetadataFile: content.xml allowed", false);
+                xDocMDAccess.addMetadataFile("content.xml", new XURI[0]);
+                fail("addMetadataFile: content.xml allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("styles.xml", new XURI[0]);
-                assure("addMetadataFile: styles.xml allowed", false);
+                xDocMDAccess.addMetadataFile("styles.xml", new XURI[0]);
+                fail("addMetadataFile: styles.xml allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("meta.xml", new XURI[0]);
-                assure("addMetadataFile: meta.xml allowed", false);
+                xDocMDAccess.addMetadataFile("meta.xml", new XURI[0]);
+                fail("addMetadataFile: meta.xml allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addMetadataFile("settings.xml", new XURI[0]);
-                assure("addMetadataFile: settings.xml allowed", false);
+                xDocMDAccess.addMetadataFile("settings.xml", new XURI[0]);
+                fail("addMetadataFile: settings.xml allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo",
+                xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, null, "foo",
                     foo, new XURI[0]);
-                assure("importMetadataFile: null stream allowed", false);
+                fail("importMetadataFile: null stream allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
+
+            final String sEmptyRDF = TestDocument.getUrl("empty.rdf");
             try {
-                XInputStream xFooIn =
-                    new StreamSimulator(tempDir + "empty.rdf", true, param);
-                xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "",
+                XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param);
+                xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, xFooIn, "",
                     foo, new XURI[0]);
-                assure("importMetadataFile: empty filename allowed", false);
+                fail("importMetadataFile: empty filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
                 XInputStream xFooIn =
-                    new StreamSimulator(tempDir + "empty.rdf", true, param);
-                xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml",
+                    new StreamSimulator(sEmptyRDF, true, param);
+                xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml",
                     foo, new XURI[0]);
-                assure("importMetadataFile: meta.xml filename allowed", false);
+                fail("importMetadataFile: meta.xml filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
                 XInputStream xFooIn =
-                    new StreamSimulator(tempDir + "empty.rdf", true, param);
-                xDMA.importMetadataFile(FileFormat.RDF_XML,
+                    new StreamSimulator(sEmptyRDF, true, param);
+                xDocMDAccess.importMetadataFile(FileFormat.RDF_XML,
                     xFooIn, "foo", null, new XURI[0]);
-                assure("importMetadataFile: null base URI allowed", false);
+                fail("importMetadataFile: null base URI allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
                 XInputStream xFooIn =
-                    new StreamSimulator(tempDir + "empty.rdf", true, param);
-                xDMA.importMetadataFile(FileFormat.RDF_XML,
+                    new StreamSimulator(sEmptyRDF, true, param);
+                xDocMDAccess.importMetadataFile(FileFormat.RDF_XML,
                     xFooIn, "foo", rdf_type, new XURI[0]);
-                assure("importMetadataFile: non-absolute base URI allowed",
-                    false);
+                fail("importMetadataFile: non-absolute base URI allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.removeMetadataFile(null);
-                assure("removeMetadataFile: null URI allowed", false);
+                xDocMDAccess.removeMetadataFile(null);
+                fail("removeMetadataFile: null URI allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addContentOrStylesFile("");
-                assure("addContentOrStylesFile: empty filename allowed",
-                    false);
+                xDocMDAccess.addContentOrStylesFile("");
+                fail("addContentOrStylesFile: empty filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addContentOrStylesFile("/content.xml");
-                assure("addContentOrStylesFile: absolute filename allowed",
-                    false);
+                xDocMDAccess.addContentOrStylesFile("/content.xml");
+                fail("addContentOrStylesFile: absolute filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.addContentOrStylesFile("foo.rdf");
-                assure("addContentOrStylesFile: invalid filename allowed",
-                    false);
+                xDocMDAccess.addContentOrStylesFile("foo.rdf");
+                fail("addContentOrStylesFile: invalid filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.removeContentOrStylesFile("");
-                assure("removeContentOrStylesFile: empty filename allowed",
-                    false);
+                xDocMDAccess.removeContentOrStylesFile("");
+                fail("removeContentOrStylesFile: empty filename allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.loadMetadataFromStorage(null, foo, null);
-                assure("loadMetadataFromStorage: null storage allowed", false);
+                xDocMDAccess.loadMetadataFromStorage(null, foo, null);
+                fail("loadMetadataFromStorage: null storage allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.storeMetadataToStorage(null/*, base*/);
-                assure("storeMetadataToStorage: null storage allowed", false);
+                xDocMDAccess.storeMetadataToStorage(null/*, base*/);
+                fail("storeMetadataToStorage: null storage allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.loadMetadataFromMedium(new PropertyValue[0]);
-                assure("loadMetadataFromMedium: empty medium allowed", false);
+                xDocMDAccess.loadMetadataFromMedium(new PropertyValue[0]);
+                fail("loadMetadataFromMedium: empty medium allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
             try {
-                xDMA.storeMetadataToMedium(new PropertyValue[0]);
-                assure("storeMetadataToMedium: empty medium allowed", false);
+                xDocMDAccess.storeMetadataToMedium(new PropertyValue[0]);
+                fail("storeMetadataToMedium: empty medium allowed");
             } catch (IllegalArgumentException e) {
                 // ignore
             }
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking file addition/removal...");
+            System.out.println("Checking file addition/removal...");
 
-            xDMA.removeContentOrStylesFile(contentPath);
+            xDocMDAccess.removeContentOrStylesFile(contentPath);
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("removeContentOrStylesFile (content)",
+            assertTrue("removeContentOrStylesFile (content)",
                 eq(xStmtsEnum, new Statement[] {
                         manifestStmts[0], manifestStmts[2], manifestStmts[4]
                     }));
 
-            xDMA.addContentOrStylesFile(contentPath);
+            xDocMDAccess.addContentOrStylesFile(contentPath);
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("addContentOrStylesFile (content)",
+            assertTrue("addContentOrStylesFile (content)",
                 eq(xStmtsEnum, manifestStmts));
 
-            xDMA.removeContentOrStylesFile(stylesPath);
+            xDocMDAccess.removeContentOrStylesFile(stylesPath);
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("removeContentOrStylesFile (styles)",
+            assertTrue("removeContentOrStylesFile (styles)",
                 eq(xStmtsEnum, new Statement[] {
                         manifestStmts[0], manifestStmts[1], manifestStmts[3]
                     }));
 
-            xDMA.addContentOrStylesFile(stylesPath);
+            xDocMDAccess.addContentOrStylesFile(stylesPath);
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("addContentOrStylesFile (styles)",
+            assertTrue("addContentOrStylesFile (styles)",
                 eq(xStmtsEnum, manifestStmts));
 
             XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(),
@@ -438,70 +458,67 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
                 new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest);
             Statement xM_FooTypeBar =
                 new Statement(xFoo, rdf_type, bar, manifest);
-            xDMA.addMetadataFile(fooPath, new XURI[] { bar });
+            xDocMDAccess.addMetadataFile(fooPath, new XURI[] { bar });
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("addMetadataFile",
+            assertTrue("addMetadataFile",
                 eq(xStmtsEnum, merge(manifestStmts, new Statement[] {
                         xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar
                     })));
 
-            XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar);
-            assure("getMetadataGraphsWithType",
+            XURI[] graphsBar = xDocMDAccess.getMetadataGraphsWithType(bar);
+            assertTrue("getMetadataGraphsWithType",
                 graphsBar.length == 1 && eq(graphsBar[0], xFoo));
 
 
-            xDMA.removeMetadataFile(xFoo);
+            xDocMDAccess.removeMetadataFile(xFoo);
             xStmtsEnum = xManifest.getStatements(null, null, null);
-            assure("removeMetadataFile",
+            assertTrue("removeMetadataFile",
                 eq(xStmtsEnum, manifestStmts));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking mapping...");
+            System.out.println("Checking mapping...");
 
-            XEnumerationAccess xTextEnum = (XEnumerationAccess)
-                UnoRuntime.queryInterface(XEnumerationAccess.class,
-                    xText.getText());
+            XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText());
             Object o = xTextEnum.createEnumeration().nextElement();
-            XMetadatable xMeta1 = (XMetadatable) UnoRuntime.queryInterface(
-                        XMetadatable.class, o);
+            XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o);
 
             XURI uri;
             XMetadatable xMeta;
-            xMeta = xDMA.getElementByURI(xMeta1);
-            assure("getElementByURI: null", null != xMeta);
+            xMeta = xDocMDAccess.getElementByURI(xMeta1);
+            assertTrue("getElementByURI: null", null != xMeta);
             String XmlId = xMeta.getMetadataReference().Second;
             String XmlId1 = xMeta1.getMetadataReference().Second;
-            assure("getElementByURI: no xml id", !XmlId.equals(""));
-            assure("getElementByURI: different xml id", XmlId.equals(XmlId1));
+            assertTrue("getElementByURI: no xml id", !XmlId.equals(""));
+            assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking storing and loading...");
+            System.out.println("Checking storing and loading...");
 
             XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(),
                 fooBarPath);
             Statement[] metadataStmts = getMetadataFileStmts(xBaseURI,
                 fooBarPath);
-            xDMA.addMetadataFile(fooBarPath, new XURI[0]);
+            xDocMDAccess.addMetadataFile(fooBarPath, new XURI[0]);
             xStmtsEnum = xRep.getStatements(null, null, null);
-            assure("addMetadataFile",
+            assertTrue("addMetadataFile",
                 eq(xStmtsEnum, merge(manifestStmts, metadataStmts )));
 
             Statement xFoobar_FooBarFoo =
                 new Statement(foo, bar, foo, xFoobar);
             xRep.getGraph(xFoobar).addStatement(foo, bar, foo);
             xStmtsEnum = xRep.getStatements(null, null, null);
-            assure("addStatement",
+            assertTrue("addStatement",
                 eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts,
                     new Statement[] { xFoobar_FooBarFoo }))));
 
             PropertyValue noMDNoContentFile = new PropertyValue();
             noMDNoContentFile.Name = "URL";
-            noMDNoContentFile.Value = util.utils.getFullTestURL("CUSTOM.odt");
+            noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt");
             PropertyValue noMDFile = new PropertyValue();
             noMDFile.Name = "URL";
-            noMDFile.Value = util.utils.getFullTestURL("TEST.odt");
+            noMDFile.Value = TestDocument.getUrl("TEST.odt");
             PropertyValue file = new PropertyValue();
             file.Name = "URL";
             file.Value = tempDir + "TESTDMA.odt";
@@ -520,76 +537,72 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             xStmtsEnum = xRep.getStatements(null, null, null);
             XURI[] graphs = xRep.getGraphNames();
 
-            xDMA.storeMetadataToMedium(args);
+            xDocMDAccess.storeMetadataToMedium(args);
 
             // this should re-init
-            xDMA.loadMetadataFromMedium(argsEmptyNoContent);
-            xRep = xRS.getRDFRepository();
-            assure("xRep null", null != xRep);
-            assure("baseURI still tdoc?",
-                !baseURI.equals(xDMA.getStringValue()));
-            Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA);
+            xDocMDAccess.loadMetadataFromMedium(argsEmptyNoContent);
+            xRep = xRepoSupplier.getRDFRepository();
+            assertTrue("xRep null", null != xRep);
+            assertTrue("baseURI still tdoc?",
+                !baseURI.equals(xDocMDAccess.getStringValue()));
+            Statement[] manifestStmts2 = getManifestStmts((XURI) xDocMDAccess);
             xStmtsEnum = xRep.getStatements(null, null, null);
             // there is no content or styles file in here, so we have just
             // the package stmt
-            assure("loadMetadataFromMedium (no metadata, no content)",
+            assertTrue("loadMetadataFromMedium (no metadata, no content)",
                 eq(xStmtsEnum, new Statement[] { manifestStmts2[0] }));
 
             // this should re-init
-            xDMA.loadMetadataFromMedium(argsEmpty);
-            xRep = xRS.getRDFRepository();
-            assure("xRep null", null != xRep);
-            assure("baseURI still tdoc?",
-                !baseURI.equals(xDMA.getStringValue()));
-            Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA);
+            xDocMDAccess.loadMetadataFromMedium(argsEmpty);
+            xRep = xRepoSupplier.getRDFRepository();
+            assertTrue("xRep null", null != xRep);
+            assertTrue("baseURI still tdoc?",
+                !baseURI.equals(xDocMDAccess.getStringValue()));
+            Statement[] manifestStmts3 = getManifestStmts((XURI) xDocMDAccess);
 
             xStmtsEnum = xRep.getStatements(null, null, null);
-            assure("loadMetadataFromMedium (no metadata)",
+            assertTrue("loadMetadataFromMedium (no metadata)",
                 eq(xStmtsEnum, manifestStmts3));
 
-            xDMA.loadMetadataFromMedium(args);
-            xRep = xRS.getRDFRepository();
-            assure("xRep null", null != xRep);
-            Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA);
-            Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA,
+            xDocMDAccess.loadMetadataFromMedium(args);
+            xRep = xRepoSupplier.getRDFRepository();
+            assertTrue("xRep null", null != xRep);
+            Statement[] manifestStmts4 = getManifestStmts((XURI) xDocMDAccess);
+            Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDocMDAccess,
                 fooBarPath);
 
             xStmtsEnum = xRep.getStatements(null, null, null);
-            assure("some graph(s) not reloaded",
+            assertTrue("some graph(s) not reloaded",
                 graphs.length == xRep.getGraphNames().length);
 
-            XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(),
+            XURI xFoobar4 = URI.createNS(xContext, xDocMDAccess.getStringValue(),
                 fooBarPath);
             Statement xFoobar_FooBarFoo4 =
                 new Statement(foo, bar, foo, xFoobar4);
-            assure("loadMetadataFromMedium (re-load)",
+            assertTrue("loadMetadataFromMedium (re-load)",
                 eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, 
                         new Statement[] { xFoobar_FooBarFoo4 }))));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking storing and loading via model...");
+            System.out.println("Checking storing and loading via model...");
 
             String f = tempDir + "TESTPARA.odt";
 
-            XStorable xStor = (XStorable) UnoRuntime.queryInterface(
-                        XStorable.class, xRS);
+            XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRepoSupplier);
 
             xStor.storeToURL(f, new PropertyValue[0]);
 
             xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps);
 
-            XDocumentMetadataAccess xDMA2 = (XDocumentMetadataAccess)
-                UnoRuntime.queryInterface(XDocumentMetadataAccess.class,
-                xComp2);
-            assure("xDMA2 null", null != xDMA2);
+            XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2);
+            assertTrue("xDMA2 null", null != xDMA2);
 
-            XRepositorySupplier xRS2 = (XRepositorySupplier)
-                UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2);
-            assure("xRS2 null", null != xRS2);
+            XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2);
+            assertTrue("xRS2 null", null != xRS2);
 
             XRepository xRep2 = xRS2.getRDFRepository();
-            assure("xRep2 null", null != xRep2);
+            assertTrue("xRep2 null", null != xRep2);
 
             Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2);
             Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2,
@@ -600,11 +613,11 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
                 new Statement(foo, bar, foo, xFoobar5);
             xStmtsEnum = xRep.getStatements(null, null, null);
             XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null);
-            assure("load: repository differs",
+            assertTrue("load: repository differs",
                 eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, 
                         new Statement[] { xFoobar_FooBarFoo5 }))));
 
-            log.println("...done");
+            System.out.println("...done");
 
         } catch (Exception e) {
             report(e);
@@ -614,99 +627,91 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         }
     }
 
-    public void checkRDFa()
+    @Test public void checkRDFa()
     {
         XComponent xComp = null;
-        String file;
         try {
-            file = util.utils.getFullTestURL("TESTRDFA.odt");
+            final String file = TestDocument.getUrl("TESTRDFA.odt");
             xComp = loadRDFa(file);
             if (xComp != null)
             {
-                file = tempDir + "TESTRDFA.odt";
-                storeRDFa(xComp, file);
+                final String sNewFile = tempDir + "TESTRDFA.odt";
+                storeRDFa(xComp, sNewFile);
                 close(xComp);
-                xComp = loadRDFa(file);
+
+                xComp = loadRDFa(sNewFile);
             }
         } finally {
             close(xComp);
         }
     }
 
-    public void storeRDFa(XComponent xComp, String file)
+    private void storeRDFa(XComponent xComp, String file)
     {
         try {
 
-            log.println("Storing test document...");
+            System.out.println("Storing test document...");
 
-            XStorable xStor = (XStorable) UnoRuntime.queryInterface(
-                        XStorable.class, xComp);
+            XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp);
 
             xStor.storeToURL(file, new PropertyValue[0]);
 
-            log.println("...done");
+            System.out.println("...done");
 
         } catch (Exception e) {
             report(e);
         }
     }
 
-    public XComponent loadRDFa(String file)
+    private XComponent loadRDFa(String file)
     {
         XComponent xComp = null;
         try {
 
-            log.println("Loading test document...");
+            System.out.println("Loading test document...");
 
             PropertyValue[] loadProps = new PropertyValue[1];
             loadProps[0] = new PropertyValue();
             loadProps[0].Name = "Hidden";
-            loadProps[0].Value = new Boolean(true);
+            loadProps[0].Value = true;
 
 
 
             xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps);
 
-            XRepositorySupplier xRS = (XRepositorySupplier)
-                UnoRuntime.queryInterface(XRepositorySupplier.class, xComp);
-            assure("xRS null", null != xRS);
+            XRepositorySupplier xRepoSupplier = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp);
+            assertTrue("xRS null", null != xRepoSupplier);
 
-            XDocumentRepository xRep = (XDocumentRepository)
-                UnoRuntime.queryInterface(XDocumentRepository.class,
-                    xRS.getRDFRepository());
-            assure("xRep null", null != xRep);
+            XDocumentRepository xDocRepository = UnoRuntime.queryInterface(XDocumentRepository.class, xRepoSupplier.getRDFRepository());
+            assertTrue("xRep null", null != xDocRepository);
 
-            XTextDocument xTextDoc = (XTextDocument)
-                UnoRuntime.queryInterface(XTextDocument.class, xComp);
+            XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp);
 
             XText xText = xTextDoc.getText();
 
-            XEnumerationAccess xEA = (XEnumerationAccess)
-                UnoRuntime.queryInterface(XEnumerationAccess.class, xText);
+            XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText);
             XEnumeration xEnum = xEA.createEnumeration();
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking RDFa in loaded test document...");
+            System.out.println("Checking RDFa in loaded test document...");
 
             XMetadatable xPara;
             Pair<Statement[], Boolean> result;
 
             Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 1",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 1",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit1
                     }));
 
             Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 2",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 2",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit2
@@ -714,54 +719,47 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
 
             Statement x_BlankBarLit3 =
                 new Statement(blank1, bar, mkLit("3"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 3",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 3",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_BlankBarLit3
                     }));
-            XBlankNode b3 = (XBlankNode) UnoRuntime.queryInterface(
-                XBlankNode.class, result.First[0].Subject);
+            XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject);
 
             Statement x_BlankBarLit4 =
                 new Statement(blank2, bar, mkLit("4"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 4",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 4",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_BlankBarLit4
                     }));
-            XBlankNode b4 = (XBlankNode) UnoRuntime.queryInterface(
-                XBlankNode.class, result.First[0].Subject);
+            XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject);
 
             Statement x_BlankBarLit5 =
                 new Statement(blank1, bar, mkLit("5"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 5",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 5",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_BlankBarLit5
                     }));
-            XBlankNode b5 = (XBlankNode) UnoRuntime.queryInterface(
-                XBlankNode.class, result.First[0].Subject);
+            XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject);
 
-            assure("RDFa: 3 != 4",
+            assertTrue("RDFa: 3 != 4",
                 !b3.getStringValue().equals(b4.getStringValue()));
-            assure("RDFa: 3 == 5",
+            assertTrue("RDFa: 3 == 5",
                  b3.getStringValue().equals(b5.getStringValue()));
 
             Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null);
             Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 6",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 6",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit6, x_FooBazLit6
@@ -770,10 +768,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null);
             Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null);
             Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 7",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 7",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit7, x_FooBazLit7, x_FooFooLit7
@@ -784,28 +781,25 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             Statement x_FooBarLit = new Statement(foo, bar, lit, null);
             Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null);
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 8",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 8",
                 result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit
                     }));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 9",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 9",
                 result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit
                     }));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 10",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 10",
                 result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLittype
@@ -813,10 +807,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
 
             Statement x_FooBarLit11
                 = new Statement(foo, bar, mkLit("11", bar), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 11",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 11",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit11
@@ -825,19 +818,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             XURI xFile = URI.createNS(xContext, file, "/" + contentPath);
             Statement x_FileBarLit12 =
                 new Statement(xFile, bar, mkLit("12"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 12",
+              xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 12",
                 !result.Second &&
                 eq(result.First, new Statement[] {
                         x_FileBarLit12
                     }));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 13",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 13",
                 result.Second &&
                 eq(result.First, new Statement[] {
                         x_FooBarLit
@@ -845,51 +836,45 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
 
             Statement x_FooLabelLit14 =
                 new Statement(foo, rdfs_label, mkLit("14"), null);
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 14",
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 14",
                 result.Second &&
                 eq(result.First, new Statement[] {
-                        x_FooBarLit
+                        /* x_FooLabelLit14 */ x_FooBarLit
                     }));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 15", eq(result.First, new Statement[] { } ));
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 15", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 16", eq(result.First, new Statement[] { } ));
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 16", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 17", eq(result.First, new Statement[] { } ));
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 17", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 18", eq(result.First, new Statement[] { } ));
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 18", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
-                XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 19", eq(result.First, new Statement[] { } ));
+            xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement());
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 19", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
+            xPara = UnoRuntime.queryInterface(
                 XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 20", eq(result.First, new Statement[] { } ));
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 20", eq(result.First, new Statement[] { } ));
 
-            xPara = (XMetadatable) UnoRuntime.queryInterface(
+            xPara = UnoRuntime.queryInterface(
                 XMetadatable.class, xEnum.nextElement());
-            result = xRep.getStatementRDFa(xPara);
-            assure("RDFa: 21", eq(result.First, new Statement[] { } ));
+            result = xDocRepository.getStatementRDFa(xPara);
+            assertTrue("RDFa: 21", eq(result.First, new Statement[] { } ));
 
-            log.println("...done");
+            System.out.println("...done");
 
         } catch (Exception e) {
             report(e);
@@ -905,33 +890,35 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
     {
         if (e instanceof WrappedTargetException)
         {
-            log.println("Cause:");
+            System.out.println("Cause:");
             Exception cause = (Exception)
                 (((WrappedTargetException)e).TargetException);
-            log.println(cause.toString());
+            System.out.println(cause.toString());
             report2(cause);
         } else if (e instanceof WrappedTargetRuntimeException) {
-            log.println("Cause:");
+            System.out.println("Cause:");
             Exception cause = (Exception)
                 (((WrappedTargetRuntimeException)e).TargetException);
-            log.println(cause.toString());
+            System.out.println(cause.toString());
             report2(cause);
         }
     }
 
     public void report(Exception e) {
-        log.println("Exception occurred:");
-        e.printStackTrace((java.io.PrintWriter) log);
+        System.out.println("Exception occurred:");
+        e.printStackTrace(System.out);
         report2(e);
-        failed();
+        fail();
     }
 
     static void close(XComponent i_comp)
     {
         try {
-            XCloseable xClos = (XCloseable) UnoRuntime.queryInterface(
-                        XCloseable.class, i_comp);
-            if (xClos != null) xClos.close(true);
+            XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp);
+            if (xClos != null)
+            {
+                xClos.close(true);
+            }
         } catch (Exception e) {
         }
     }
@@ -960,14 +947,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
     }
 
     public static String toS(XNode n) {
-        if (null == n) return "< null >";
+        if (null == n)
+        {
+            return "< null >";
+        }
         return n.getStringValue();
     }
 
     static boolean isBlank(XNode i_node)
     {
-        XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface(
-                    XBlankNode.class, i_node);
+        XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node);
         return blank != null;
     }
 
@@ -1000,7 +989,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         java.util.Collection c = new java.util.Vector();
         while (i_Enum.hasMoreElements()) {
             Statement s = (Statement) i_Enum.nextElement();
-//log.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
+//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + ".");
             c.add(s);
         }
 //        return (Statement[]) c.toArray();
@@ -1035,11 +1024,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         {
             XNode[] left = (XNode[]) i_Left;
             XNode[] right = (XNode[]) i_Right;
-            if (left.length != right.length) throw new RuntimeException();
+            if (left.length != right.length)
+            {
+                throw new RuntimeException();
+            }
             for (int i = 0; i < left.length; ++i) {
                 int eq = (left[i].getStringValue().compareTo(
                             right[i].getStringValue()));
-                if (eq != 0) return eq;
+                if (eq != 0)
+                {
+                    return eq;
+                }
             }
             return 0;
         }
@@ -1078,23 +1073,23 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         XURI lG = i_Left.Graph;
         XURI rG = i_Right.Graph;
         if (!eq(lG, rG)) {
-            log.println("Graphs differ: " + toS(lG) + " != " + toS(rG));
+            System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG));
             return false;
         }
         if (!eq(i_Left.Subject, i_Right.Subject)) {
-            log.println("Subjects differ: " +
+            System.out.println("Subjects differ: " +
                 i_Left.Subject.getStringValue() + " != " +
                 i_Right.Subject.getStringValue());
             return false;
         }
         if (!eq(i_Left.Predicate, i_Right.Predicate)) {
-            log.println("Predicates differ: " +
+            System.out.println("Predicates differ: " +
                 i_Left.Predicate.getStringValue() + " != " +
                 i_Right.Predicate.getStringValue());
             return false;
         }
         if (!eq(i_Left.Object, i_Right.Object)) {
-            log.println("Objects differ: " +
+            System.out.println("Objects differ: " +
                 i_Left.Object.getStringValue() + " != " +
                 i_Right.Object.getStringValue());
             return false;
@@ -1105,7 +1100,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
     static boolean eq(Statement[] i_Result, Statement[] i_Expected)
     {
         if (i_Result.length != i_Expected.length) {
-            log.println("eq: different lengths: " + i_Result.length + " " +
+            System.out.println("eq: different lengths: " + i_Result.length + " " +
                 i_Expected.length);
             return false;
         }
@@ -1113,8 +1108,13 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
             java.util.Arrays.asList(i_Expected).toArray();
         java.util.Arrays.sort(i_Result, new StmtComp());
         java.util.Arrays.sort(expected, new StmtComp());
-        for (int i = 0; i < expected.length; ++i) {
-            if (!eq(i_Result[i], expected[i])) return false;
+        for (int i = 0; i < expected.length; ++i)
+        {
+            // This is better for debug!
+            final Statement a = i_Result[i];
+            final Statement b = expected[i];
+            final boolean cond = eq(a, b);
+            if (!cond) return false;
         }
         return true;
     }
@@ -1141,15 +1141,15 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
     static boolean eq(XQuerySelectResult i_Result,
             String[] i_Vars, XNode[][] i_Bindings) throws Exception
     {
-        String[] vars = (String[]) i_Result.getBindingNames();
+        String[] vars =  i_Result.getBindingNames();
         XEnumeration iter = (XEnumeration) i_Result;
         XNode[][] bindings = toSeqs(iter);
         if (vars.length != i_Vars.length) {
-            log.println("var lengths differ");
+            System.out.println("var lengths differ");
             return false;
         }
         if (bindings.length != i_Bindings.length) {
-            log.println("binding lengths differ: " + i_Bindings.length +
+            System.out.println("binding lengths differ: " + i_Bindings.length +
                 " vs " + bindings.length );
             return false;
         }
@@ -1157,16 +1157,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         java.util.Arrays.sort(i_Bindings, new BindingComp());
         for (int i = 0; i < i_Bindings.length; ++i) {
             if (i_Bindings[i].length != i_Vars.length) {
-                log.println("TEST ERROR!");
+                System.out.println("TEST ERROR!");
                 throw new Exception();
             }
             if (bindings[i].length != i_Vars.length) {
-                log.println("binding length and var length differ");
+                System.out.println("binding length and var length differ");
                 return false;
             }
             for (int j = 0; j < i_Vars.length; ++j) {
                 if (!eq(bindings[i][j], i_Bindings[i][j])) {
-                    log.println("bindings differ: " +
+                    System.out.println("bindings differ: " +
                         toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j]));
                     return false;
                 }
@@ -1174,7 +1174,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         }
         for (int i = 0; i < i_Vars.length; ++i) {
             if (!vars[i].equals(i_Vars[i])) {
-                log.println("variable names differ: " +
+                System.out.println("variable names differ: " +
                     vars[i] + " != " + i_Vars[i]);
                 return false;
             }
@@ -1253,17 +1253,27 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         public String getLocalName() { return ""; }
 
         public StringPair getMetadataReference()
-            { return new StringPair(m_Stream, m_XmlId); }
+            {
+                return new StringPair(m_Stream, m_XmlId);
+            }
         public void setMetadataReference(StringPair i_Ref)
             throws IllegalArgumentException
-            { m_Stream = (String)i_Ref.First; m_XmlId = (String)i_Ref.Second; }
+            {
+                m_Stream = i_Ref.First;
+                m_XmlId = i_Ref.Second;
+            }
         public void ensureMetadataReference()
-            { m_Stream = "content.xml"; m_XmlId = "42"; }
+            {
+                m_Stream = "content.xml";
+                m_XmlId = "42";
+            }
 
         public String getImplementationName() { return null; }
         public String[] getSupportedServiceNames() { return null; }
         public boolean supportsService(String i_Svc)
-            { return i_Svc.equals("com.sun.star.text.Paragraph"); }
+            {
+                return i_Svc.equals("com.sun.star.text.Paragraph");
+            }
 
         public XText getText() { return null; }
         public XTextRange getStart() { return null; }
@@ -1271,5 +1281,33 @@ public class DocumentMetadataAccessTest extends ComplexTestCase
         public String getString() { return m_Text; }
         public void setString(String i_Str) { m_Text = i_Str; }
     }
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "starting class: " + DocumentMetadataAccess.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "finishing class: " + DocumentMetadataAccess.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
 
diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/sfx2/DocumentProperties.java
index e4ed104c4a..01ccaa2161 100644..100755
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -25,16 +25,14 @@
  *
  ************************************************************************/
 
-package complex.framework;
+package complex.sfx2;
 
-import complexlib.ComplexTestCase;
-import helper.StreamSimulator;
 
+import complex.sfx2.tools.TestDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.Any;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XSingleServiceFactory;
+
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.EventObject;
@@ -51,10 +49,15 @@ import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.embed.XStorage;
-import com.sun.star.io.XInputStream;
+
 import com.sun.star.document.XDocumentProperties;
 
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /**
  * Test case for the service com.sun.star.document.DocumentProperties.
@@ -63,13 +66,9 @@ import com.sun.star.document.XDocumentProperties;
  *
  * @author mst
  */
-public class DocumentMetaData extends ComplexTestCase
+public class DocumentProperties
 {
-    public String[] getTestMethodNames () {
-        return new String[] { "check", "cleanup" };
-    }
-
-    public void cleanup() {
+    @After public void cleanup() {
                 // nothing to do
     }
 
@@ -77,7 +76,7 @@ public class DocumentMetaData extends ComplexTestCase
     class Listener implements XModifyListener {
         private boolean m_Called;
 
-        public Listener() {
+        Listener() {
             m_Called = false;
         }
 
@@ -95,19 +94,18 @@ public class DocumentMetaData extends ComplexTestCase
         }
     }
 
-    public void check() {
+    @Test public void check() {
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF();
-            assure("could not create MultiServiceFactory.", xMSF != null);
-            XPropertySet xPropertySet = (XPropertySet)
-                UnoRuntime.queryInterface(XPropertySet.class, xMSF);
+            XMultiServiceFactory xMSF = getMSF();
+            assertNotNull("could not create MultiServiceFactory.", xMSF);
+            XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF);
             Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext");
-            XComponentContext xContext = (XComponentContext)
-                UnoRuntime.queryInterface(XComponentContext.class, defaultCtx);
-            assure("could not get component context.", xContext != null);
+            XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx);
+            assertNotNull("could not get component context.", xContext);
 
+            // TODO: Path to temp
             String temp = util.utils.getOfficeTemp/*Dir*/(xMSF);
-            log.println("tempdir: " + temp);
+            System.out.println("tempdir: " + temp);
 
             PropertyValue[] noArgs = { };
             PropertyValue mimetype = new PropertyValue();
@@ -120,61 +118,56 @@ public class DocumentMetaData extends ComplexTestCase
             cfile.Value = temp + "EMPTY.odt";
             PropertyValue[] mimeEmptyArgs = { mimetype, cfile };
 
-            log.println("Creating service DocumentProperties...");
+            System.out.println("Creating service DocumentProperties...");
 
             Object oDP =
 //                xMSF.createInstanceWithContext(
 //                    "com.sun.star.document.DocumentProperties", xContext);
                 xMSF.createInstance("com.sun.star.document.DocumentProperties");
-            XDocumentProperties xDP = (XDocumentProperties)
-                UnoRuntime.queryInterface(XDocumentProperties.class, oDP);
+            XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP);
 
-            log.println("...done");
+            System.out.println("...done");
 
 
-            log.println("Checking initialize ...");
+            System.out.println("Checking initialize ...");
 
-            XDocumentProperties xDP2 = (XDocumentProperties)
-                UnoRuntime.queryInterface(XDocumentProperties.class,
-                    xMSF.createInstance(
-                        "com.sun.star.document.DocumentProperties"));
-            XInitialization xInit = (XInitialization)
-                UnoRuntime.queryInterface(XInitialization.class, xDP2);
+            XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties"));
+            XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2);
             xInit.initialize(new Object[] { });
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking storing default-initialized meta data ...");
+            System.out.println("Checking storing default-initialized meta data ...");
 
 //            xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs);
             xDP2.storeToMedium("", mimeEmptyArgs);
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking loading default-initialized meta data ...");
+            System.out.println("Checking loading default-initialized meta data ...");
 
 //            xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs);
             xDP2.loadFromMedium("", mimeEmptyArgs);
-            assure ("Author", "".equals(xDP2.getAuthor()));
+            assertTrue ("Author", "".equals(xDP2.getAuthor()));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("(Not) Checking preservation of custom meta data ...");
+            System.out.println("(Not) Checking preservation of custom meta data ...");
 
-            xDP2.loadFromMedium(util.utils.getFullTestURL("CUSTOM.odt"),
+            xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"),
                 noArgs);
-            assure ("Author", "".equals(xDP2.getAuthor()));
+            assertTrue ("Author", "".equals(xDP2.getAuthor()));
             xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs);
 
             //FIXME: now what? comparing for binary equality seems useless
             // we could unzip the written file and grep for the custom stuff
             // but would that work on windows...
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking loading from test document...");
+            System.out.println("Checking loading from test document...");
 
-            String file = util.utils.getFullTestURL("TEST.odt");
+            String file = TestDocument.getUrl("TEST.odt");
             xDP.loadFromMedium(file, noArgs);
 /*            XInputStream xStream =
                 new StreamSimulator("./testdocuments/TEST.odt", true, param);
@@ -188,68 +181,67 @@ public class DocumentMetaData extends ComplexTestCase
                 XStorage.class, oStor);
             xDP.loadFromStorage(xStor);*/
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking meta-data import...");
+            System.out.println("Checking meta-data import...");
 
-            assure ("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor()));
-            assure ("Generator",
+            assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor()));
+            assertTrue("Generator",
             "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227"
                 .equals(xDP.getGenerator()));
-            assure ("CreationDate", 2007 == xDP.getCreationDate().Year);
-            assure ("Title", "Urgent Memo".equals(xDP.getTitle()));
-            assure ("Subject", "Wichtige Mitteilung".equals(xDP.getSubject()));
-            assure ("Description",
+            assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year);
+            assertTrue("Title", "Urgent Memo".equals(xDP.getTitle()));
+            assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject()));
+            assertTrue("Description",
                 "Modern internal company memorandum in full-blocked style"
                 .equals(xDP.getDescription()));
-//            assure ("Language", "".equals(xDP.getLanguage()));
-            assure ("ModifiedBy",
+//            assertTrue("Language", "".equals(xDP.getLanguage()));
+            assertTrue("ModifiedBy",
                 "Karl-Heinz Mustermann".equals(xDP.getModifiedBy()));
-            assure ("ModificationDate", 10 == xDP.getModificationDate().Month);
-            assure ("PrintedBy",
+            assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month);
+            assertTrue("PrintedBy",
                 "Karl-Heinz Mustermann".equals(xDP.getPrintedBy()));
-            assure ("PrintDate", 29 == xDP.getPrintDate().Day);
-            assure ("TemplateName",
+            assertTrue("PrintDate", 29 == xDP.getPrintDate().Day);
+            assertTrue("TemplateName",
                 "Modern Memo".equals(xDP.getTemplateName()));
-            assure ("TemplateURL",
+            assertTrue("TemplateURL",
                 xDP.getTemplateURL().endsWith("memmodern.ott"));
-            assure ("TemplateDate", 17 == xDP.getTemplateDate().Hours);
-            assure ("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL()));
-            assure ("AutoloadSecs", 0 == xDP.getAutoloadSecs());
-            assure ("DefaultTarget", "_blank".equals(xDP.getDefaultTarget()));
-            assure ("EditingCycles", 3 == xDP.getEditingCycles());
-            assure ("EditingDuration", 320 == xDP.getEditingDuration());
+            assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours);
+            assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL()));
+            assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs());
+            assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget()));
+            assertTrue("EditingCycles", 3 == xDP.getEditingCycles());
+            assertTrue("EditingDuration", 320 == xDP.getEditingDuration());
 
             String[] kws = xDP.getKeywords();
-            assure ("Keywords", fromArray(kws).containsAll(
+            assertTrue("Keywords", fromArray(kws).containsAll(
                     fromArray(new Object[] { "Asien", "Memo", "Reis" })));
 
             NamedValue[] ds = xDP.getDocumentStatistics();
 /*            for (int i = 0; i < ds.length; ++i) {
-                log.println("nv: " + ds[i].Name + " " + ds[i].Value);
+                System.out.println("nv: " + ds[i].Name + " " + ds[i].Value);
             }
             NamedValue nv1 = new NamedValue("WordCount", new Integer(23));
             NamedValue nv2 = new NamedValue("WordCount", new Integer(23));
-            log.println("eq: " + nv1.equals(nv2)); // grrr, this is false...
+            System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false...
 */
-            assure ("DocumentStatistics:WordCount", containsNV(ds,
+            assertTrue("DocumentStatistics:WordCount", containsNV(ds,
                         new NamedValue("WordCount", new Integer(23))));
-            assure ("DocumentStatistics:PageCount", containsNV(ds,
+            assertTrue("DocumentStatistics:PageCount", containsNV(ds,
                         new NamedValue("PageCount", new Integer(1))));
 
             XPropertyContainer udpc = xDP.getUserDefinedProperties();
-            XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface(
-                XPropertySet.class, udpc);
-            assure ("UserDefined 1", "Dies ist ein wichtiger Hinweis"
+            XPropertySet udps = UnoRuntime.queryInterface( XPropertySet.class, udpc );
+            assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis"
                     .equals(udps.getPropertyValue("Hinweis")));
-            assure ("UserDefined 2", ("Kann Spuren von N"
+            assertTrue("UserDefined 2", ("Kann Spuren von N"
                 + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8")
                 + "ssen enthalten")
                     .equals(udps.getPropertyValue("Warnung")));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking meta-data updates...");
+            System.out.println("Checking meta-data updates...");
 
             String str;
             DateTime dt = new DateTime();
@@ -258,75 +250,75 @@ public class DocumentMetaData extends ComplexTestCase
 
             str = "me";
             xDP.setAuthor(str);
-            assure ("setAuthor", str.equals(xDP.getAuthor()));
+            assertTrue("setAuthor", str.equals(xDP.getAuthor()));
             str = "the computa";
             xDP.setGenerator(str);
-            assure ("setGenerator", str.equals(xDP.getGenerator()));
+            assertTrue("setGenerator", str.equals(xDP.getGenerator()));
             dt.Year = 2038;
             dt.Month = 1;
             dt.Day = 1;
             xDP.setCreationDate(dt);
-            assure ("setCreationDate", dt.Year == xDP.getCreationDate().Year);
+            assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year);
             str = "El t'itulo";
             xDP.setTitle(str);
-            assure ("setTitle", str.equals(xDP.getTitle()));
+            assertTrue("setTitle", str.equals(xDP.getTitle()));
             str = "Ein verkommenes Subjekt";
             xDP.setSubject(str);
-            assure ("setSubject", str.equals(xDP.getSubject()));
+            assertTrue("setSubject", str.equals(xDP.getSubject()));
             str = "Este descripci'on no es importante";
             xDP.setDescription(str);
-            assure ("setDescription", str.equals(xDP.getDescription()));
+            assertTrue("setDescription", str.equals(xDP.getDescription()));
             l.Language = "en";
             l.Country = "GB";
             xDP.setLanguage(l);
             Locale l2 = xDP.getLanguage();
-            assure ("setLanguage Lang", l.Language.equals(l2.Language));
-            assure ("setLanguage Cty", l.Country.equals(l2.Country));
+            assertTrue("setLanguage Lang", l.Language.equals(l2.Language));
+            assertTrue("setLanguage Cty", l.Country.equals(l2.Country));
             str = "myself";
             xDP.setModifiedBy(str);
-            assure ("setModifiedBy", str.equals(xDP.getModifiedBy()));
+            assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy()));
             dt.Year = 2042;
             xDP.setModificationDate(dt);
-            assure ("setModificationDate",
+            assertTrue("setModificationDate",
                 dt.Year == xDP.getModificationDate().Year);
             str = "i didnt do it";
             xDP.setPrintedBy(str);
-            assure ("setPrintedBy", str.equals(xDP.getPrintedBy()));
+            assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy()));
             dt.Year = 2024;
             xDP.setPrintDate(dt);
-            assure ("setPrintDate", dt.Year == xDP.getPrintDate().Year);
+            assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year);
             str = "blah";
             xDP.setTemplateName(str);
-            assure ("setTemplateName", str.equals(xDP.getTemplateName()));
+            assertTrue("setTemplateName", str.equals(xDP.getTemplateName()));
             str = "gopher://some-hole-in-the-ground/";
             xDP.setTemplateURL(str);
-            assure ("setTemplateURL", str.equals(xDP.getTemplateURL()));
+            assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL()));
             dt.Year = 2043;
             xDP.setTemplateDate(dt);
-            assure ("setTemplateDate", dt.Year == xDP.getTemplateDate().Year);
+            assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year);
             str = "http://nowhere/";
             xDP.setAutoloadURL(str);
-            assure ("setAutoloadURL", str.equals(xDP.getAutoloadURL()));
+            assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL()));
             i = 3661; // this might not work (due to conversion via double...)
             xDP.setAutoloadSecs(i);
-//            log.println("set: " + i + " get: " + xDP.getAutoloadSecs());
-            assure ("setAutoloadSecs", i == xDP.getAutoloadSecs());
+//            System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs());
+            assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs());
             str = "_blank";
             xDP.setDefaultTarget(str);
-            assure ("setDefaultTarget", str.equals(xDP.getDefaultTarget()));
+            assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget()));
             i = 42;
             xDP.setEditingCycles((short) i);
-            assure ("setEditingCycles", i == xDP.getEditingCycles());
+            assertTrue("setEditingCycles", i == xDP.getEditingCycles());
             i = 84;
             xDP.setEditingDuration(i);
-            assure ("setEditingDuration", i == xDP.getEditingDuration());
+            assertTrue("setEditingDuration", i == xDP.getEditingDuration());
             str = "";
 
             String[] kws2 = new String[] {
                 "keywordly", "keywordlike", "keywordalicious" };
             xDP.setKeywords(kws2);
             kws = xDP.getKeywords();
-            assure ("setKeywords", fromArray(kws).containsAll(fromArray(kws2)));
+            assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2)));
 
             NamedValue[] ds2 = new NamedValue[] {
                     new NamedValue("SyllableCount", new Integer(9)),
@@ -334,16 +326,16 @@ public class DocumentMetaData extends ComplexTestCase
                     new NamedValue("SentenceCount", new Integer(7)) };
             xDP.setDocumentStatistics(ds2);
             ds = xDP.getDocumentStatistics();
-            assure ("setDocumentStatistics:SyllableCount", containsNV(ds,
+            assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds,
                         new NamedValue("SyllableCount", new Integer(9))));
-            assure ("setDocumentStatistics:FrameCount", containsNV(ds,
+            assertTrue("setDocumentStatistics:FrameCount", containsNV(ds,
                         new NamedValue("FrameCount", new Integer(2))));
-            assure ("setDocumentStatistics:SentenceCount", containsNV(ds,
+            assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds,
                         new NamedValue("SentenceCount", new Integer(7))));
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking user-defined meta-data updates...");
+            System.out.println("Checking user-defined meta-data updates...");
 
             // actually, this tests the PropertyBag service
             // but maybe the DocumentProperties service will be implemented
@@ -369,8 +361,7 @@ public class DocumentMetaData extends ComplexTestCase
             dur.Seconds = 555;
             dur.MilliSeconds = 444;
 
-            udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE,
-                new Boolean(b));
+            udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, b);
             udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur);
             udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t);
             udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date);
@@ -384,109 +375,106 @@ public class DocumentMetaData extends ComplexTestCase
                 udpc.removeProperty("Info 1");
                 udpc.removeProperty("Removed");
             } catch (UnknownPropertyException e) {
-                assure("removeProperty failed", false);
+                fail("removeProperty failed");
             }
 
             try {
                 udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE,
                     new String[] { "foo", "bar" });
-                assure("inserting value of non-supported type did not fail",
-                    false);
+                fail("inserting value of non-supported type did not fail");
             } catch (IllegalTypeException e) {
                 // ignore
             }
 
-            assure ("UserDefined bool", new Boolean(b).equals(
+            assertTrue("UserDefined bool", new Boolean(b).equals(
                     udps.getPropertyValue("Frobnicate")));
-            assure ("UserDefined duration", eqDuration(dur, (Duration)
+            assertTrue("UserDefined duration", eqDuration(dur, (Duration)
                     udps.getPropertyValue("FrobDuration")));
-            assure ("UserDefined time", eqTime(t, (Time)
+            assertTrue("UserDefined time", eqTime(t, (Time)
                     udps.getPropertyValue("FrobDuration2")));
-            assure ("UserDefined date", eqDate(date, (Date)
+            assertTrue("UserDefined date", eqDate(date, (Date)
                     udps.getPropertyValue("FrobEndDate")));
-            assure ("UserDefined datetime", eqDateTime(dt, (DateTime)
+            assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime)
                     udps.getPropertyValue("FrobStartTime")));
-            assure ("UserDefined float", new Double(d).equals(
+            assertTrue("UserDefined float", new Double(d).equals(
                     udps.getPropertyValue("Pi")));
-            assure ("UserDefined string", "bar".equals(
+            assertTrue("UserDefined string", "bar".equals(
                     udps.getPropertyValue("Foo")));
-            assure ("UserDefined empty name", "eeeeek".equals(
+            assertTrue("UserDefined empty name", "eeeeek".equals(
                     udps.getPropertyValue("")));
 
             try {
                 udps.getPropertyValue("Removed");
-                assure("UserDefined remove didn't", false);
+                fail("UserDefined remove didn't");
             } catch (UnknownPropertyException e) {
                 // ok
             }
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking storing meta-data to file...");
+            System.out.println("Checking storing meta-data to file...");
 
             xDP.storeToMedium(temp + "TEST.odt", mimeArgs);
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking loading meta-data from stored file...");
+            System.out.println("Checking loading meta-data from stored file...");
 
             xDP.loadFromMedium(temp + "TEST.odt", noArgs);
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking user-defined meta-data from stored file...");
+            System.out.println("Checking user-defined meta-data from stored file...");
 
             udpc = xDP.getUserDefinedProperties();
-            udps = (XPropertySet) UnoRuntime.queryInterface(
-                XPropertySet.class, udpc);
+            udps = UnoRuntime.queryInterface( XPropertySet.class, udpc );
 
-            assure ("UserDefined bool", new Boolean(b).equals(
+            assertTrue("UserDefined bool", new Boolean(b).equals(
                     udps.getPropertyValue("Frobnicate")));
-            assure ("UserDefined duration", eqDuration(dur, (Duration)
+            assertTrue("UserDefined duration", eqDuration(dur, (Duration)
                     udps.getPropertyValue("FrobDuration")));
             // this is now a Duration!
             Duration t_dur = new Duration(false, (short)0, (short)0, (short)0,
                     t.Hours, t.Minutes, t.Seconds,
                     (short)(10 * t.HundredthSeconds));
-            assure ("UserDefined time", eqDuration(t_dur, (Duration)
+            assertTrue("UserDefined time", eqDuration(t_dur, (Duration)
                     udps.getPropertyValue("FrobDuration2")));
-            assure ("UserDefined date", eqDate(date, (Date)
+            assertTrue("UserDefined date", eqDate(date, (Date)
                     udps.getPropertyValue("FrobEndDate")));
-            assure ("UserDefined datetime", eqDateTime(dt, (DateTime)
+            assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime)
                     udps.getPropertyValue("FrobStartTime")));
-            assure ("UserDefined float", new Double(d).equals(
+            assertTrue("UserDefined float", new Double(d).equals(
                     udps.getPropertyValue("Pi")));
-            assure ("UserDefined string", "bar".equals(
+            assertTrue("UserDefined string", "bar".equals(
                     udps.getPropertyValue("Foo")));
 
             try {
                 udps.getPropertyValue("Removed");
-                assure("UserDefined remove didn't", false);
+                fail("UserDefined remove didn't");
             } catch (UnknownPropertyException e) {
                 // ok
             }
 
-            log.println("...done");
+            System.out.println("...done");
 
-            log.println("Checking notification listener interface...");
+            System.out.println("Checking notification listener interface...");
 
             Listener listener = new Listener();
-            XModifyBroadcaster xMB = (XModifyBroadcaster)
-                UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP);
+            XModifyBroadcaster xMB = UnoRuntime.queryInterface( XModifyBroadcaster.class, xDP );
             xMB.addModifyListener(listener);
             xDP.setAuthor("not me");
-            assure ("Listener Author", listener.reset());
+            assertTrue("Listener Author", listener.reset());
             udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo");
-            assure ("Listener UserDefined Add", listener.reset());
+            assertTrue("Listener UserDefined Add", listener.reset());
             udps.setPropertyValue("Listener", "bar");
-            assure ("Listener UserDefined Set", listener.reset());
+            assertTrue("Listener UserDefined Set", listener.reset());
             udpc.removeProperty("Listener");
-            assure ("Listener UserDefined Remove", listener.reset());
+            assertTrue("Listener UserDefined Remove", listener.reset());
             xMB.removeModifyListener(listener);
             udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo");
-            assure ("Removed Listener UserDefined Add", !listener.reset());
+            assertTrue("Removed Listener UserDefined Add", !listener.reset());
 
-            log.println("...done");
+            System.out.println("...done");
 
         } catch (Exception e) {
             report(e);
@@ -538,9 +526,36 @@ public class DocumentMetaData extends ComplexTestCase
     }
 
     public void report(Exception e) {
-        log.println("Exception occurred:");
-        e.printStackTrace((java.io.PrintWriter) log);
-        failed();
+        System.out.println("Exception occurred:");
+        e.printStackTrace();
+        fail();
+    }
+
+
+        private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface( XMultiServiceFactory.class, connection.getComponentContext().getServiceManager() );
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "starting class: " + DocumentProperties.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.setUp();
     }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "finishing class: " + DocumentProperties.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
 
diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
new file mode 100755
index 0000000000..fa881701f8
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java
@@ -0,0 +1,273 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+package complex.sfx2;
+
+import com.sun.star.awt.XWindow;
+import com.sun.star.document.XEventBroadcaster;
+import com.sun.star.document.XEventListener;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sheet.XSpreadsheetDocument;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.UnoRuntime;
+import complex.sfx2.tools.WriterHelper;
+
+import java.util.ArrayList;
+
+import util.UITools;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+
+/**
+ * This testcase checks the GlobalEventBroadcaster
+ * it will add an XEventListener and verify the Events
+ * raised when opening/changing and closing Office Documents
+ */
+public class GlobalEventBroadcaster {
+    XMultiServiceFactory m_xMSF = null;
+    XEventBroadcaster m_xEventBroadcaster = null;
+    ArrayList notifyEvents = new ArrayList();
+    // XTextDocument xTextDoc;
+    XSpreadsheetDocument xSheetDoc;
+    XEventListener m_xEventListener = new EventListenerImpl();
+
+    @Before public void initialize() {
+        m_xMSF = getMSF();
+        System.out.println("check wether there is a valid MultiServiceFactory");
+
+        assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF);
+
+        System.out.println("... done");
+
+        System.out.println(
+                "Create an instance of com.sun.star.frame.GlobalEventBroadcaster");
+
+        Object GlobalEventBroadcaster = null;
+
+        try {
+            GlobalEventBroadcaster = m_xMSF.createInstance(
+                                             "com.sun.star.frame.GlobalEventBroadcaster");
+        } catch (com.sun.star.uno.Exception e) {
+            fail("## Exception while creating instance");
+        }
+
+        System.out.println("... done");
+
+        System.out.println("check wether the created instance is valid");
+
+        assertNotNull("couldn't create service", GlobalEventBroadcaster);
+
+        System.out.println("... done");
+
+        System.out.println(
+                "try to query the XEventBroadcaster from the gained Object");
+        m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster);
+
+        if (util.utils.isVoid(m_xEventBroadcaster)) {
+            fail("couldn't get XEventBroadcaster");
+        }
+
+        System.out.println("... done");
+
+        System.out.println("adding Listener");
+        m_xEventBroadcaster.addEventListener(m_xEventListener);
+        System.out.println("... done");
+    }
+
+    @Test public void checkWriter() {
+        System.out.println("-- Checking Writer --");
+
+        WriterHelper wHelper = new WriterHelper(m_xMSF);
+        String[] expected;
+        System.out.println("opening an empty writer doc");
+        notifyEvents.clear();
+        {
+            XTextDocument xTextDoc = wHelper.openEmptyDoc();
+            shortWait();
+            expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" };
+
+            assertTrue("Wrong events fired when opening empty doc",
+                   proveExpectation(expected));
+            System.out.println("... done");
+
+            System.out.println("changing the writer doc");
+            notifyEvents.clear();
+            xTextDoc.getText().setString("GlobalEventBroadcaster");
+            shortWait();
+            expected = new String[] { "OnModifyChanged" };
+
+            assertTrue("Wrong events fired when changing doc",
+                   proveExpectation(expected));
+            System.out.println("... done");
+
+            System.out.println("closing the empty writer doc");
+            notifyEvents.clear();
+            wHelper.closeDoc(xTextDoc);
+            shortWait();
+        }
+        expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" };
+
+        assertTrue("Wrong events fired when closing empty doc",
+               proveExpectation(expected));
+        System.out.println("... done");
+
+        System.out.println("opening an writer doc via Window-New Window");
+        notifyEvents.clear();
+        {
+            XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false);
+
+            shortWait();
+            expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", };
+
+            assertTrue("Wrong events fired when opening an writer doc via Window-New Window",
+                   proveExpectation(expected));
+            System.out.println("... done");
+
+            System.out.println("closing the created writer doc");
+            notifyEvents.clear();
+
+            wHelper.closeDoc(xTextDoc);
+            shortWait();
+        }
+        expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" };
+
+        assertTrue("Wrong events fired when closing Window-New Window",
+               proveExpectation(expected));
+
+        System.out.println("... done");
+        // TODO: It seems not possible to close the document without interactiv question
+        //       there the follow test will not be execute
+        if (false) {
+            System.out.println("Opening document with label wizard");
+            XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false);
+            shortWait();
+            XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow());
+            UITools ut = new UITools(m_xMSF,xWindow);
+            notifyEvents.clear();
+            System.out.println("pressing button 'New Document'");
+            try{
+                ut.clickButton ("New Document");
+            } catch (Exception e) {
+                System.out.println("Couldn't press Button");
+            }
+            System.out.println("... done");
+            shortWait();
+            shortWait();
+            shortWait();
+            expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" };
+
+            assertTrue("Wrong events fired when starting labels wizard",
+                   proveExpectation(expected));
+
+            System.out.println("Try to close document...");
+            wHelper.closeDoc(xTextDoc);
+            shortWait();
+            wHelper.closeFromDialog();
+            shortWait();
+            xTextDoc = null;
+        }
+       
+        System.out.println("-- Done Writer --");
+    }
+
+    @After public void cleanup() {
+        System.out.println("removing Listener");
+        m_xEventBroadcaster.removeEventListener(m_xEventListener);
+        System.out.println("... done");
+    }
+
+    /**
+    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
+    * reset</code> call.
+    */
+    private void shortWait() {
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            System.out.println("While waiting :" + e);
+        }
+    }
+
+    private boolean proveExpectation(String[] expected) {
+        boolean locRes = true;
+                boolean failure = false;
+
+        System.out.println("Fired Events:");
+        for (int k=0;k<notifyEvents.size();k++) {
+            System.out.println("\t- "+notifyEvents.get(k));
+        }
+
+        for (int i = 0; i < expected.length; i++) {
+            locRes = notifyEvents.contains(expected[i]);
+
+            if (!locRes) {
+                System.out.println("The event " + expected[i] + " isn't fired");
+                                failure = true;
+            }
+        }
+
+        return !failure;
+    }
+
+    public class EventListenerImpl implements XEventListener {
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+            System.out.println("disposing: " + eventObject.Source.toString());
+        }
+
+        public void notifyEvent(com.sun.star.document.EventObject eventObject) {
+            notifyEvents.add(eventObject.EventName);
+        }
+    }
+
+        private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection() CheckGlobalEventBroadcaster_writer1");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+}
diff --git a/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
new file mode 100755
index 0000000000..91376fe4c8
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+package complex.sfx2;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import complex.sfx2.standalonedocinfo.StandaloneDocumentInfoTest;
+import complex.sfx2.standalonedocinfo.Test01;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+/* Document here
+*/
+
+public class StandaloneDocumentInfo {
+    private XMultiServiceFactory m_xMSF = null;
+    
+    @Before public void before() {
+        try {
+            m_xMSF = getMSF();
+        } catch(Exception e) {
+            fail( "Failed to create service factory!" );
+        }
+        if( m_xMSF ==null ) {
+            fail( "Failed to create service factory!" );
+        }
+    }
+    
+    @After public void after() {
+        m_xMSF = null;
+    }
+    
+    @Test public void ExecuteTest01() {
+        StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF);
+        assertTrue( "Test01 failed!", aTest.test() );
+    }
+
+
+
+
+      private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "starting class: " + StandaloneDocumentInfo.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println( "------------------------------------------------------------" );
+        System.out.println( "finishing class: " + StandaloneDocumentInfo.class.getName() );
+        System.out.println( "------------------------------------------------------------" );
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+}
+
+
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
new file mode 100755
index 0000000000..afae8edfad
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -0,0 +1,1464 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+package complex.sfx2;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.awt.Point;
+import com.sun.star.awt.Size;
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XControlModel;
+import com.sun.star.beans.NamedValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XChild;
+import com.sun.star.container.XIndexContainer;
+import com.sun.star.container.XNameContainer;
+import com.sun.star.container.XNameReplace;
+import com.sun.star.container.XSet;
+import com.sun.star.document.EmptyUndoStackException;
+import com.sun.star.document.UndoContextNotClosedException;
+import com.sun.star.document.UndoFailedException;
+import com.sun.star.document.UndoManagerEvent;
+import com.sun.star.document.XEmbeddedScripts;
+import com.sun.star.document.XEventsSupplier;
+import com.sun.star.document.XUndoAction;
+import com.sun.star.lang.EventObject;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.lang.XEventListener;
+import java.lang.reflect.InvocationTargetException;
+import org.openoffice.test.tools.OfficeDocument;
+import com.sun.star.document.XUndoManagerSupplier;
+import com.sun.star.document.XUndoManager;
+import com.sun.star.document.XUndoManagerListener;
+import com.sun.star.drawing.XControlShape;
+import com.sun.star.drawing.XDrawPage;
+import com.sun.star.drawing.XDrawPageSupplier;
+import com.sun.star.drawing.XShapes;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.script.ScriptEventDescriptor;
+import com.sun.star.script.XEventAttacherManager;
+import com.sun.star.script.XLibraryContainer;
+import com.sun.star.task.XJob;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.util.InvalidStateException;
+import com.sun.star.util.NotLockedException;
+import com.sun.star.view.XControlAccess;
+import complex.sfx2.undo.CalcDocumentTest;
+import complex.sfx2.undo.ChartDocumentTest;
+import complex.sfx2.undo.DocumentTest;
+import complex.sfx2.undo.DrawDocumentTest;
+import complex.sfx2.undo.ImpressDocumentTest;
+import complex.sfx2.undo.WriterDocumentTest;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Stack;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.tools.DocumentType;
+import org.openoffice.test.tools.SpreadsheetDocument;
+
+/**
+ * Unit test for the UndoManager API
+ * 
+ * @author frank.schoenheit@oracle.com
+ */
+public class UndoManager
+{
+    // -----------------------------------------------------------------------------------------------------------------
+    @Before
+    public void beforeTest() throws com.sun.star.uno.Exception
+    {
+        m_currentTestCase = null;
+        m_currentDocument = null;
+        m_undoListener = null;
+
+        // at our service factory, insert a new factory for our CallbackComponent
+        // this will allow the Basic code in our test documents to call back into this test case
+        // here, by just instantiating this service
+        final XSet globalFactory = UnoRuntime.queryInterface( XSet.class, getORB() );
+        m_callbackFactory = new CallbackComponentFactory();
+        globalFactory.insert( m_callbackFactory );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkWriterUndo() throws Exception
+    {
+        m_currentTestCase = new WriterDocumentTest( getORB() );
+        impl_checkUndo();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkCalcUndo() throws Exception
+    {
+        m_currentTestCase = new CalcDocumentTest( getORB() );
+        impl_checkUndo();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkDrawUndo() throws Exception
+    {
+        m_currentTestCase = new DrawDocumentTest( getORB() );
+        impl_checkUndo();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkImpressUndo() throws Exception
+    {
+        m_currentTestCase = new ImpressDocumentTest( getORB() );
+        impl_checkUndo();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkChartUndo() throws Exception
+    {
+        m_currentTestCase = new ChartDocumentTest( getORB() );
+        impl_checkUndo();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+//#i116813# disabled   @Test
+    public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException
+    {
+        System.out.println( "testing: broken scripts" );
+
+        m_currentDocument = OfficeDocument.blankDocument( getORB(), DocumentType.CALC );
+        m_undoListener = new UndoListener();
+        getUndoManager().addUndoManagerListener( m_undoListener );
+
+        impl_setupBrokenBasicScript();
+        final String scriptURI = "vnd.sun.star.script:default.callbacks.brokenScript?language=Basic&location=document";
+
+        // .............................................................................................................
+        // scenario 1: Pressing a button which is bound to execute the script
+        // (This is one of the many cases where SfxObjectShell::CallXScript is invoked)
+
+        // set up the button
+        final XPropertySet buttonModel = impl_setupButton();
+        buttonModel.setPropertyValue( "Label", "exec broken script" );
+        impl_assignScript( buttonModel, "XActionListener", "actionPerformed",
+            scriptURI );
+
+        // switch the doc's view to form alive mode (so the button will actually work)
+        m_currentDocument.getCurrentView().dispatch( ".uno:SwitchControlDesignMode" );
+
+        // click the button
+        m_callbackCalled = false;
+        impl_clickButton( buttonModel );
+        // the macro is executed asynchronously by the button, so wait at most 2 seconds for the callback to be
+        // triggered
+        impl_waitFor( m_callbackCondition, 2000 );
+        // check the callback has actually been called
+        assertTrue( "clicking the test button did not work as expected - basic script not called", m_callbackCalled );
+
+        // again, since the script is executed asynchronously, we might arrive here while its execution
+        // is not completely finished. Give OOo another (at most) 2 seconds to finish it.
+        m_undoListener.waitForAllContextsClosed( 20000 );
+        // assure that the Undo Context Depth of the doc is still "0": The Basic script entered such a
+        // context, and didn't close it (thus it is broken), but the application framework should have
+        // auto-closed the context after the macro finished.
+        assertEquals( "undo context was not auto-closed as expected", 0, m_undoListener.getCurrentUndoContextDepth() );
+
+        // .............................................................................................................
+        // scenario 2: dispatching the script URL. Technically, this is equivalent to configuring the
+        // script into a menu or toolbar, and selecting the respective menu/toolbar item
+        m_callbackCalled = false;
+        m_currentDocument.getCurrentView().dispatch( scriptURI );
+        assertTrue( "dispatching the Script URL did not work as expected - basic script not called", m_callbackCalled );
+        // same as above: The script didn't close the context, but the OOo framework should have
+        assertEquals( "undo context was not auto-closed as expected", 0, m_undoListener.getCurrentUndoContextDepth() );
+
+        // .............................................................................................................
+        // scenario 3: assigning the script to some document event, and triggering this event
+        final XEventsSupplier eventSupplier = UnoRuntime.queryInterface( XEventsSupplier.class, m_currentDocument.getDocument() );
+        final XNameReplace events = UnoRuntime.queryInterface( XNameReplace.class, eventSupplier.getEvents() );
+        final NamedValue[] scriptDescriptor = new NamedValue[] {
+            new NamedValue( "EventType", "Script" ),
+            new NamedValue( "Script", scriptURI )
+        };
+        events.replaceByName( "OnViewCreated", scriptDescriptor );
+
+        // The below doesn't work: event notification is broken in m96, see http://www.openoffice.org/issues/show_bug.cgi?id=116313
+/*        m_callbackCalled = false;
+        m_currentDocument.getCurrentView().dispatch( ".uno:NewWindow" );
+        assertTrue( "triggering an event did not work as expected - basic script not called", m_callbackCalled );
+        // same as above: The script didn't close the context, but the OOo framework should have
+        assertEquals( "undo context was not auto-closed as expected", 0, m_undoListener.getCurrentUndoContextDepth() );
+ */
+
+        // .............................................................................................................
+        // scenario 4: let the script enter an Undo context, but not close it, as usual.
+        // Additionally, let the script close the document - the OOo framework code which cares for
+        // auto-closing of Undo contexts should survive this, ideally ...
+        m_closeAfterCallback = true;
+        m_callbackCalled = false;
+        m_currentDocument.getCurrentView().dispatch( scriptURI );
+        assertTrue( m_callbackCalled );
+        assertTrue( "The Basic script should have closed the document.", m_undoListener.isDisposed() );
+        m_currentDocument = null;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @Test
+    public void checkSerialization() throws com.sun.star.uno.Exception, InterruptedException
+    {
+        System.out.println( "testing: request serialization" );
+
+        m_currentDocument = OfficeDocument.blankDocument( getORB(), DocumentType.CALC );
+        final XUndoManager undoManager = getUndoManager();
+
+        final int threadCount = 10;
+        final int actionsPerThread = 10;
+        final int actionCount = threadCount * actionsPerThread;
+
+        // add some actions to the UndoManager, each knowing its position on the stack
+        final Object lock = new Object();
+        final Integer actionsUndone[] = new Integer[] { 0 };
+        for ( int i=actionCount; i>0; )
+            undoManager.addUndoAction( new CountingUndoAction( --i, lock, actionsUndone ) );
+
+        // some concurrent threads which undo the actions
+        Thread[] threads = new Thread[threadCount];
+        for ( int i=0; i<threadCount; ++i )
+        {
+            threads[i] = new Thread()
+            {
+                @Override
+                public void run()
+                {
+                    for ( int j=0; j<actionsPerThread; ++j )
+                    {
+                        try { undoManager.undo(); }
+                        catch ( final Exception e )
+                        {
+                            fail( "Those dummy actions are not expected to fail." );
+                            return;
+                        }
+                    }
+                }
+            };
+        }
+
+        // start the threads
+        for ( int i=0; i<threadCount; ++i )
+            threads[i].start();
+
+        // wait for them to be finished
+        for ( int i=0; i<threadCount; ++i )
+            threads[i].join();
+
+        // ensure all actions have been undone
+        assertEquals( "not all actions have been undone", actionCount, actionsUndone[0].intValue() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @After
+    public void afterTest()
+    {
+        if ( m_currentTestCase != null )
+            m_currentTestCase.closeDocument();
+        else if ( m_currentDocument != null )
+            m_currentDocument.close();
+        m_currentTestCase = null;
+        m_currentDocument = null;
+        m_callbackFactory.dispose();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    /**
+     * returns the undo manager belonging to a given document
+     * @return
+     */
+    private XUndoManager getUndoManager()
+    {
+        final XUndoManagerSupplier suppUndo = UnoRuntime.queryInterface( XUndoManagerSupplier.class, m_currentDocument.getDocument() );
+        final XUndoManager undoManager = suppUndo.getUndoManager();
+        assertTrue( UnoRuntime.areSame( undoManager.getParent(), m_currentDocument.getDocument() ) );
+        return undoManager;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_waitFor( final Object i_condition, final int i_milliSeconds ) throws InterruptedException
+    {
+        synchronized( i_condition )
+        {
+            i_condition.wait( i_milliSeconds );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_setupBrokenBasicScript()
+    {
+        try
+        {
+            final XEmbeddedScripts embeddedScripts = UnoRuntime.queryInterface( XEmbeddedScripts.class, m_currentDocument.getDocument() );
+            final XLibraryContainer basicLibs = embeddedScripts.getBasicLibraries();
+            final XNameContainer basicLib = basicLibs.createLibrary( "default" );
+
+            final String brokenScriptCode =
+                "Option Explicit\n" +
+                "\n" +
+                "Sub brokenScript\n" +
+                "    Dim callback as Object\n" +
+                "    ThisComponent.UndoManager.enterUndoContext( \"" + getCallbackUndoContextTitle() + "\" )\n" +
+                "\n" +
+                "    callback = createUnoService( \"" + getCallbackComponentServiceName() + "\" )\n" +
+                "    Dim emptyArgs() as new com.sun.star.beans.NamedValue\n" +
+                "    Dim result as String\n" +
+                "    result = callback.execute( emptyArgs() )\n" +
+                "    If result = \"close\" Then\n" +
+                "        ThisComponent.close( TRUE )\n" +
+                "    End If\n" +
+                "End Sub\n" +
+                "\n";
+
+            basicLib.insertByName( "callbacks", brokenScriptCode );
+        }
+        catch( com.sun.star.uno.Exception e )
+        {
+            fail( "caught an exception while setting up the script: " + e.toString() );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private XPropertySet impl_setupButton() throws com.sun.star.uno.Exception
+    {
+        // let the document create a shape
+        final XMultiServiceFactory docAsFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class,
+            m_currentDocument.getDocument() );
+        final XControlShape xShape = UnoRuntime.queryInterface( XControlShape.class,
+            docAsFactory.createInstance( "com.sun.star.drawing.ControlShape" ) );
+
+        // position and size of the shape
+        xShape.setSize( new Size( 28 * 100, 10 * 100 ) );
+        xShape.setPosition( new Point( 10 * 100, 10 * 100 ) );
+
+        // create the form component (the model of a form control)
+        final String sQualifiedComponentName = "com.sun.star.form.component.CommandButton";
+        final XControlModel controlModel = UnoRuntime.queryInterface( XControlModel.class,
+            getORB().createInstance( sQualifiedComponentName ) );
+
+        // knitt both
+        xShape.setControl( controlModel );
+
+        // add the shape to the shapes collection of the document
+        SpreadsheetDocument spreadsheetDoc = (SpreadsheetDocument)m_currentDocument;
+        final XDrawPageSupplier suppDrawPage = UnoRuntime.queryInterface( XDrawPageSupplier.class,
+            spreadsheetDoc.getSheet( 0 ) );
+        final XDrawPage insertIntoPage = suppDrawPage.getDrawPage();
+
+        final XShapes sheetShapes = UnoRuntime.queryInterface( XShapes.class, insertIntoPage );
+        sheetShapes.add( xShape );
+
+        return UnoRuntime.queryInterface( XPropertySet.class, controlModel );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_assignScript( final XPropertySet i_controlModel, final String i_interfaceName,
+        final String i_interfaceMethod, final String i_scriptURI )
+    {
+        try
+        {
+            final XChild modelAsChild = UnoRuntime.queryInterface( XChild.class, i_controlModel );
+            final XIndexContainer parentForm = UnoRuntime.queryInterface( XIndexContainer.class, modelAsChild.getParent() );
+
+            final XEventAttacherManager manager = UnoRuntime.queryInterface( XEventAttacherManager.class, parentForm );
+
+            int containerPosition = -1;
+            for ( int i = 0; i < parentForm.getCount(); ++i )
+            {
+                final XPropertySet child = UnoRuntime.queryInterface( XPropertySet.class, parentForm.getByIndex( i ) );
+                if ( UnoRuntime.areSame( child, i_controlModel ) )
+                {
+                    containerPosition = i;
+                    break;
+                }
+            }
+            assertFalse( "could not find the given control model within its parent", containerPosition == -1 );
+            manager.registerScriptEvent( containerPosition, new ScriptEventDescriptor(
+                i_interfaceName,
+                i_interfaceMethod,
+                "",
+                "Script",
+                i_scriptURI
+            ) );
+        }
+        catch( com.sun.star.uno.Exception e )
+        {
+            fail( "caught an exception while assigning the script event to the button: " + e.toString() );
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_clickButton( final XPropertySet i_buttonModel ) throws NoSuchElementException, IndexOutOfBoundsException
+    {
+        final XControlAccess controlAccess = UnoRuntime.queryInterface( XControlAccess.class,
+            m_currentDocument.getCurrentView().getController() );
+        final XControl control = controlAccess.getControl( UnoRuntime.queryInterface( XControlModel.class, i_buttonModel ) );
+        final XAccessible accessible = UnoRuntime.queryInterface( XAccessible.class, control );
+        final XAccessibleAction controlActions = UnoRuntime.queryInterface( XAccessibleAction.class, accessible.getAccessibleContext() );
+        for ( int i=0; i<controlActions.getAccessibleActionCount(); ++i )
+        {
+            if ( controlActions.getAccessibleActionDescription(i).equals( "click" ) )
+            {
+                controlActions.doAccessibleAction(i);
+                return;
+            }
+        }
+        fail( "did not find the accessible action named 'click'" );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static class UndoListener implements XUndoManagerListener
+    {
+        public void undoActionAdded( UndoManagerEvent i_event )
+        {
+            assertFalse( "|undoActionAdded| called after document was disposed", m_isDisposed );
+
+            ++m_undoActionsAdded;
+            m_mostRecentlyAddedAction = i_event.UndoActionTitle;
+        }
+
+        public void actionUndone( UndoManagerEvent i_event )
+        {
+            assertFalse( "|actionUndone| called after document was disposed", m_isDisposed );
+
+            ++m_undoCount;
+            m_mostRecentlyUndone = i_event.UndoActionTitle;
+        }
+
+        public void actionRedone( UndoManagerEvent i_event )
+        {
+            assertFalse( "|actionRedone| called after document was disposed", m_isDisposed );
+
+            ++m_redoCount;
+        }
+
+        public void allActionsCleared( EventObject eo )
+        {
+            assertFalse( "|allActionsCleared| called after document was disposed", m_isDisposed );
+
+            m_wasCleared = true;
+        }
+
+        public void redoActionsCleared( EventObject eo )
+        {
+            assertFalse( "|redoActionsCleared| called after document was disposed", m_isDisposed );
+
+            m_redoWasCleared = true;
+        }
+
+        public void resetAll( EventObject i_event )
+        {
+            assertFalse( "|resetAll| called after document was disposed", m_isDisposed );
+
+            m_managerWasReset = true;
+            m_activeUndoContexts.clear();
+        }
+
+        public void enteredContext( UndoManagerEvent i_event )
+        {
+            assertFalse( "|enteredContext| called after document was disposed", m_isDisposed );
+
+            m_activeUndoContexts.push( i_event.UndoActionTitle );
+            assertEquals( "different opinions on the context nesting level (after entering)",
+                m_activeUndoContexts.size(), i_event.UndoContextDepth );
+        }
+
+        public void enteredHiddenContext( UndoManagerEvent i_event )
+        {
+            assertFalse( "|enteredHiddenContext| called after document was disposed", m_isDisposed );
+
+            m_activeUndoContexts.push( i_event.UndoActionTitle );
+            assertEquals( "different opinions on the context nesting level (after entering hidden)",
+                m_activeUndoContexts.size(), i_event.UndoContextDepth );
+        }
+
+        public void leftContext( UndoManagerEvent i_event )
+        {
+            assertFalse( "|leftContext| called after document was disposed", m_isDisposed );
+
+            assertEquals( "nested undo context descriptions do not match", m_activeUndoContexts.pop(), i_event.UndoActionTitle );
+            assertEquals( "different opinions on the context nesting level (after leaving)",
+                m_activeUndoContexts.size(), i_event.UndoContextDepth );
+            m_leftContext = true;
+            impl_notifyContextDepth();
+        }
+
+        public void leftHiddenContext( UndoManagerEvent i_event )
+        {
+            assertFalse( "|leftHiddenContext| called after document was disposed", m_isDisposed );
+            assertEquals( "|leftHiddenContext| is not expected to notify an action title", 0, i_event.UndoActionTitle.length() );
+
+            m_activeUndoContexts.pop();
+            assertEquals( "different opinions on the context nesting level (after leaving)",
+                m_activeUndoContexts.size(), i_event.UndoContextDepth );
+            m_leftHiddenContext = true;
+            impl_notifyContextDepth();
+        }
+
+        public void cancelledContext( UndoManagerEvent i_event )
+        {
+            assertFalse( "|cancelledContext| called after document was disposed", m_isDisposed );
+            assertEquals( "|cancelledContext| is not expected to notify an action title", 0, i_event.UndoActionTitle.length() );
+
+            m_activeUndoContexts.pop();
+            assertEquals( "different opinions on the context nesting level (after cancelling)",
+                m_activeUndoContexts.size(), i_event.UndoContextDepth );
+            m_cancelledContext = true;
+            impl_notifyContextDepth();
+        }
+
+        public void disposing( EventObject i_event )
+        {
+            m_isDisposed = true;
+        }
+
+        public void waitForAllContextsClosed( final int i_milliSeconds ) throws InterruptedException
+        {
+            synchronized ( m_allContextsClosedCondition )
+            {
+                if ( m_activeUndoContexts.empty() )
+                    return;
+                m_allContextsClosedCondition.wait( i_milliSeconds );
+            }
+        }
+
+        private void impl_notifyContextDepth()
+        {
+            synchronized ( m_allContextsClosedCondition )
+            {
+                if ( m_activeUndoContexts.empty() )
+                {
+                    m_allContextsClosedCondition.notifyAll();
+                }
+            }
+        }
+
+        private int     getUndoActionsAdded() { return m_undoActionsAdded; }
+        private int     getUndoActionCount() { return m_undoCount; }
+        private int     getRedoActionCount() { return m_redoCount; }
+        private String  getCurrentUndoContextTitle() { return m_activeUndoContexts.peek(); }
+        private String  getMostRecentlyAddedActionTitle() { return m_mostRecentlyAddedAction; };
+        private String  getMostRecentlyUndoneTitle() { return m_mostRecentlyUndone; }
+        private int     getCurrentUndoContextDepth() { return m_activeUndoContexts.size(); }
+        private boolean isDisposed() { return m_isDisposed; }
+        private boolean wasContextLeft() { return m_leftContext; }
+        private boolean wasHiddenContextLeft() { return m_leftHiddenContext; }
+        private boolean hasContextBeenCancelled() { return m_cancelledContext; }
+        private boolean wereStacksCleared() { return m_wasCleared; }
+        private boolean wasRedoStackCleared() { return m_redoWasCleared; }
+        private boolean wasManagerReset() { return m_managerWasReset; }
+
+        void reset()
+        {
+            m_undoActionsAdded = m_undoCount = m_redoCount = 0;
+            m_activeUndoContexts.clear();
+            m_mostRecentlyAddedAction = m_mostRecentlyUndone = null;
+            // m_isDisposed is not cleared, intentionally
+            m_leftContext = m_leftHiddenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = m_managerWasReset = false;
+        }
+
+        private int     m_undoActionsAdded = 0;
+        private int     m_undoCount = 0;
+        private int     m_redoCount = 0;
+        private boolean m_isDisposed = false;
+        private boolean m_leftContext = false;
+        private boolean m_leftHiddenContext = false;
+        private boolean m_cancelledContext = false;
+        private boolean m_wasCleared = false;
+        private boolean m_redoWasCleared = false;
+        private boolean m_managerWasReset = false;
+        private Stack< String >
+                        m_activeUndoContexts = new Stack<String>();
+        private String  m_mostRecentlyAddedAction = null;
+        private String  m_mostRecentlyUndone = null;
+        private final Object    m_allContextsClosedCondition = new Object();
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_checkUndo() throws Exception
+    {
+        System.out.println( "testing: " + m_currentTestCase.getDocumentDescription() );
+        m_currentDocument = m_currentTestCase.getDocument();
+        m_currentTestCase.initializeDocument();
+        m_currentTestCase.verifyInitialDocumentState();
+
+        final XUndoManager undoManager = getUndoManager();
+        undoManager.clear();
+        assertFalse( "clearing the Undo manager should result in the impossibility to undo anything", undoManager.isUndoPossible() );
+        assertFalse( "clearing the Undo manager should result in the impossibility to redo anything", undoManager.isRedoPossible() );
+
+        m_undoListener = new UndoListener();
+        undoManager.addUndoManagerListener( m_undoListener );
+
+        impl_testSingleModification( undoManager );
+        impl_testMultipleModifications( undoManager );
+        impl_testCustomUndoActions( undoManager );
+        impl_testLocking( undoManager );
+        impl_testNestedContexts( undoManager );
+        impl_testErrorHandling( undoManager );
+        impl_testContextHandling( undoManager );
+        impl_testStackHandling( undoManager );
+        impl_testClearance( undoManager );
+        impl_testHiddenContexts( undoManager );
+
+        // close the document, ensure the Undo manager listener gets notified
+        m_currentTestCase.closeDocument();
+        m_currentTestCase = null;
+        m_currentDocument = null;
+        assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", m_undoListener.isDisposed() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testSingleModification( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        m_currentTestCase.doSingleModification();
+        m_currentTestCase.verifySingleModificationDocumentState();
+
+        // undo the modification, ensure the listener got the proper notifications
+        assertEquals( "We did not yet do a undo!", 0, m_undoListener.getUndoActionCount() );
+        i_undoManager.undo();
+        assertEquals( "A simple undo does not result in the proper Undo count.",
+            1, m_undoListener.getUndoActionCount() );
+
+        // verify the document is in its initial state, again
+        m_currentTestCase.verifyInitialDocumentState();
+
+        // redo the modification, ensure the listener got the proper notifications
+        assertEquals( "did not yet do a redo!", 0, m_undoListener.getRedoActionCount() );
+        i_undoManager.redo();
+        assertEquals( "did a redo, but got no notification of it!", 1, m_undoListener.getRedoActionCount() );
+        // ensure the document is in the proper state, again
+        m_currentTestCase.verifySingleModificationDocumentState();
+
+        // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as
+        // expected
+        m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" );
+        m_currentTestCase.verifyInitialDocumentState();
+        assertEquals( "UI-Undo does not notify the listener", 2, m_undoListener.getUndoActionCount() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testMultipleModifications( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        m_undoListener.reset();
+        assertEquals( "unexpected initial undo context depth", 0, m_undoListener.getCurrentUndoContextDepth() );
+        i_undoManager.enterUndoContext( "Batch Changes" );
+        assertEquals( "unexpected undo context depth after entering a context",
+            1, m_undoListener.getCurrentUndoContextDepth() );
+        assertEquals( "entering an Undo context has not been notified properly",
+            "Batch Changes", m_undoListener.getCurrentUndoContextTitle() );
+
+        final int modifications = m_currentTestCase.doMultipleModifications();
+        assertEquals( "unexpected number of undo actions while doing batch changes to the document",
+            modifications, m_undoListener.getUndoActionsAdded() );
+        assertEquals( "seems the document operations touched the undo context depth",
+            1, m_undoListener.getCurrentUndoContextDepth() );
+
+        i_undoManager.leaveUndoContext();
+        assertEquals( "unexpected undo context depth after leaving the last context",
+            0, m_undoListener.getCurrentUndoContextDepth() );
+        assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action",
+            0, m_undoListener.getUndoActionCount() );
+
+        i_undoManager.undo();
+        assertEquals( "Just did an undo - the listener should have been notified", 1, m_undoListener.getUndoActionCount() );
+        m_currentTestCase.verifyInitialDocumentState();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testCustomUndoActions( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.clear();
+        m_undoListener.reset();
+        assertFalse( "undo stack not empty after clearing the undo manager", i_undoManager.isUndoPossible() );
+        assertFalse( "redo stack not empty after clearing the undo manager", i_undoManager.isRedoPossible() );
+        assertArrayEquals( ">0 descriptions for an empty undo stack?",
+            new String[0], i_undoManager.getAllUndoActionTitles() );
+        assertArrayEquals( ">0 descriptions for an empty redo stack?",
+            new String[0], i_undoManager.getAllRedoActionTitles() );
+
+        // add two actions, one directly, one within a context
+        final CustomUndoAction action1 = new CustomUndoAction( "UndoAction1" );
+        i_undoManager.addUndoAction( action1 );
+        assertEquals( "Adding an undo action not observed by the listener", 1, m_undoListener.getUndoActionsAdded() );
+        assertEquals( "Adding an undo action did not notify the proper title",
+            action1.getTitle(), m_undoListener.getMostRecentlyAddedActionTitle() );
+        final String contextTitle = "Undo Context";
+        i_undoManager.enterUndoContext( contextTitle );
+        final CustomUndoAction action2 = new CustomUndoAction( "UndoAction2" );
+        i_undoManager.addUndoAction( action2 );
+        assertEquals( "Adding an undo action not observed by the listener",
+            2, m_undoListener.getUndoActionsAdded() );
+        assertEquals( "Adding an undo action did not notify the proper title",
+            action2.getTitle(), m_undoListener.getMostRecentlyAddedActionTitle() );
+        i_undoManager.leaveUndoContext();
+
+        // see if the manager has proper descriptions
+        assertArrayEquals( "unexpected Redo descriptions after adding two actions",
+            new String[0], i_undoManager.getAllRedoActionTitles() );
+        assertArrayEquals( "unexpected Undo descriptions after adding two actions",
+            new String[]{contextTitle, action1.getTitle()}, i_undoManager.getAllUndoActionTitles() );
+
+        // undo one action
+        i_undoManager.undo();
+        assertEquals( "improper action title notified during programmatic Undo",
+            contextTitle, m_undoListener.getMostRecentlyUndoneTitle() );
+        assertTrue( "nested custom undo action has not been undone as expected", action2.undoCalled() );
+        assertFalse( "nested custom undo action has not been undone as expected", action1.undoCalled() );
+        assertArrayEquals( "unexpected Redo descriptions after undoing a nested custom action",
+            new String[]{contextTitle}, i_undoManager.getAllRedoActionTitles() );
+        assertArrayEquals( "unexpected Undo descriptions after undoing a nested custom action",
+            new String[]{action1.getTitle()}, i_undoManager.getAllUndoActionTitles() );
+
+        // undo the second action, via UI dispatches
+        m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" );
+        assertEquals( "improper action title notified during UI Undo", action1.getTitle(), m_undoListener.getMostRecentlyUndoneTitle() );
+        assertTrue( "nested custom undo action has not been undone as expected", action1.undoCalled() );
+        assertArrayEquals( "unexpected Redo descriptions after undoing the second custom action",
+            new String[]{action1.getTitle(), contextTitle}, i_undoManager.getAllRedoActionTitles() );
+        assertArrayEquals( "unexpected Undo descriptions after undoing the second custom action",
+            new String[0], i_undoManager.getAllUndoActionTitles() );
+
+        // check the actions are disposed when the stacks are cleared
+        i_undoManager.clear();
+        assertTrue( action1.disposed() && action2.disposed() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testLocking( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        // implicit Undo actions, triggered by changes to the document
+        assertFalse( "unexpected initial locking state", i_undoManager.isLocked() );
+        i_undoManager.lock();
+        assertTrue( "just locked the manager, why does it lie?", i_undoManager.isLocked() );
+        m_currentTestCase.doSingleModification();
+        assertEquals( "when the Undo manager is locked, no implicit additions should happen",
+            0, m_undoListener.getUndoActionsAdded() );
+        i_undoManager.unlock();
+        assertEquals( "unlock is not expected to add collected actions - they should be discarded",
+            0, m_undoListener.getUndoActionsAdded() );
+        assertFalse( "just unlocked the manager, why does it lie?", i_undoManager.isLocked() );
+
+        // explicit Undo actions
+        i_undoManager.lock();
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.unlock();
+        assertEquals( "explicit Undo actions are expected to be ignored when the manager is locked",
+            0, m_undoListener.getUndoActionsAdded() );
+
+        // Undo contexts while being locked
+        i_undoManager.lock();
+        i_undoManager.enterUndoContext( "Dummy Context" );
+        i_undoManager.enterHiddenUndoContext();
+        assertEquals( "entering Undo contexts should be ignored when the manager is locked", 0, m_undoListener.getCurrentUndoContextDepth() );
+        i_undoManager.leaveUndoContext();
+        i_undoManager.leaveUndoContext();
+        i_undoManager.unlock();
+
+        // |unlock| error handling
+        assertFalse( "internal error: manager should not be locked at this point in time", i_undoManager.isLocked() );
+        boolean caughtExpected = false;
+        try { i_undoManager.unlock(); } catch ( final NotLockedException e ) { caughtExpected = true; }
+        assertTrue( "unlocking the manager when it is not locked should throw", caughtExpected );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testContextHandling( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        // .............................................................................................................
+        // part I: non-empty contexts
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        // put one action on the undo and one on the redo stack, as precondition for the following tests
+        final XUndoAction undoAction1 = new CustomUndoAction( "Undo Action 1" );
+        i_undoManager.addUndoAction( undoAction1 );
+        final XUndoAction undoAction2 = new CustomUndoAction( "Undo Action 2" );
+        i_undoManager.addUndoAction( undoAction2 );
+        i_undoManager.undo();
+        assertTrue( "precondition for context handling tests not met (1)", i_undoManager.isUndoPossible() );
+        assertTrue( "precondition for context handling tests not met (2)", i_undoManager.isRedoPossible() );
+        assertArrayEquals( new String[] { undoAction1.getTitle() }, i_undoManager.getAllUndoActionTitles() );
+        assertArrayEquals( new String[] { undoAction2.getTitle() }, i_undoManager.getAllRedoActionTitles() );
+
+        final String[] expectedRedoActionComments = new String[] { undoAction2.getTitle() };
+        assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() );
+
+        // enter a context
+        i_undoManager.enterUndoContext( "Undo Context" );
+        // this should not (yet) touch the redo stack
+        assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() );
+        assertEquals( "unexpected undo context depth after entering a context", 1, m_undoListener.getCurrentUndoContextDepth() );
+        // add a single action
+        XUndoAction undoAction3 = new CustomUndoAction( "Undo Action 3" );
+        i_undoManager.addUndoAction( undoAction3 );
+        // still, the redo stack should be untouched - added at a lower level does not affect it at all
+        assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() );
+
+        // while the context is open, its title should already contribute to the stack, ...
+        assertEquals( "Undo Context", i_undoManager.getCurrentUndoActionTitle() );
+        // ... getAllUndo/RedoActionTitles should operate on the top level, not on the level defined by the open
+        // context,  ...
+        assertArrayEquals( new String[] { "Undo Context", undoAction1.getTitle() },
+            i_undoManager.getAllUndoActionTitles() );
+        // ... but Undo and Redo should be impossible as long as the context is open
+        assertFalse( i_undoManager.isUndoPossible() );
+        assertFalse( i_undoManager.isRedoPossible() );
+
+        // leave the context, check the listener has been notified properly, and the notified context depth is correct
+        i_undoManager.leaveUndoContext();
+        assertTrue( m_undoListener.wasContextLeft() );
+        assertFalse( m_undoListener.wasHiddenContextLeft() );
+        assertFalse( m_undoListener.hasContextBeenCancelled() );
+        assertEquals( "unexpected undo context depth leaving a non-empty context", 0, m_undoListener.getCurrentUndoContextDepth() );
+        // leaving a non-empty context should have cleare the redo stack
+        assertArrayEquals( new String[0], i_undoManager.getAllRedoActionTitles() );
+        assertTrue( m_undoListener.wasRedoStackCleared() );
+
+        // .............................................................................................................
+        // part II: empty contexts
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        // enter a context, leave it immediately without adding an action to it
+        i_undoManager.enterUndoContext( "Undo Context" );
+        i_undoManager.leaveUndoContext();
+        assertFalse( m_undoListener.wasContextLeft() );
+        assertFalse( m_undoListener.wasHiddenContextLeft() );
+        assertTrue( m_undoListener.hasContextBeenCancelled() );
+        assertFalse( "leaving an empty context should silently remove it, and not contribute to the stack",
+            i_undoManager.isUndoPossible() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testNestedContexts( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+        i_undoManager.enterUndoContext( "context 1" );
+        i_undoManager.enterUndoContext( "context 1.1" );
+        final CustomUndoAction action1 = new CustomUndoAction( "action 1.1.1" );
+        i_undoManager.addUndoAction( action1 );
+        i_undoManager.enterUndoContext( "context 1.1.2" );
+        final CustomUndoAction action2 = new CustomUndoAction( "action 1.1.2.1" );
+        i_undoManager.addUndoAction( action2 );
+        i_undoManager.leaveUndoContext();
+        final CustomUndoAction action3 = new CustomUndoAction( "action 1.1.3" );
+        i_undoManager.addUndoAction( action3 );
+        i_undoManager.leaveUndoContext();
+        i_undoManager.leaveUndoContext();
+        final CustomUndoAction action4 = new CustomUndoAction( "action 1.2" );
+        i_undoManager.addUndoAction( action4 );
+
+        i_undoManager.undo();
+        assertEquals( "undoing a single action notifies a wrong title", action4.getTitle(), m_undoListener.getMostRecentlyUndoneTitle() );
+        assertTrue( "custom Undo not called", action4.undoCalled() );
+        assertFalse( "too many custom Undos called", action1.undoCalled() || action2.undoCalled() || action3.undoCalled() );
+        i_undoManager.undo();
+        assertTrue( "nested actions not properly undone", action1.undoCalled() && action2.undoCalled() && action3.undoCalled() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testErrorHandling( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        // try retrieving the comments for the current Undo/Redo - this should fail
+        boolean caughtExpected = false;
+        try { i_undoManager.getCurrentUndoActionTitle(); }
+        catch( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "trying the title of the current Undo action is expected to fail for an empty stack", caughtExpected );
+
+        caughtExpected = false;
+        try { i_undoManager.getCurrentRedoActionTitle(); }
+        catch( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "trying the title of the current Redo action is expected to fail for an empty stack", caughtExpected );
+
+        caughtExpected = false;
+        try { i_undoManager.undo(); } catch ( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "undo should throw if no Undo action is on the stack", caughtExpected );
+
+        caughtExpected = false;
+        try { i_undoManager.redo(); } catch ( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "redo should throw if no Redo action is on the stack", caughtExpected );
+
+        caughtExpected = false;
+        try { i_undoManager.leaveUndoContext(); } catch ( final InvalidStateException e ) { caughtExpected = true; }
+        assertTrue( "leaveUndoContext should throw if no context is currently open", caughtExpected );
+
+        caughtExpected = false;
+        try { i_undoManager.addUndoAction( null ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { caughtExpected = true; }
+        assertTrue( "adding a NULL action should be rejected", caughtExpected );
+
+        i_undoManager.reset();
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.undo();
+        i_undoManager.enterUndoContext( "Undo Context" );
+        // those methods should fail when a context is open:
+        final String[] methodNames = new String[] { "undo", "redo", "clear", "clearRedo" };
+        for ( int i=0; i<methodNames.length; ++i )
+        {
+            caughtExpected = false;
+            try
+            {
+                Method method = i_undoManager.getClass().getMethod( methodNames[i], new Class[0] );
+                method.invoke( i_undoManager, new Object[0] );
+            }
+            catch ( IllegalAccessException ex ) { }
+            catch ( IllegalArgumentException ex ) { }
+            catch ( InvocationTargetException ex )
+            {
+                Throwable targetException = ex.getTargetException();
+                caughtExpected = ( targetException instanceof UndoContextNotClosedException );
+            }
+            catch ( NoSuchMethodException ex ) { }
+            catch ( SecurityException ex ) { }
+
+            assertTrue( methodNames[i] + " should be rejected when there is an open context", caughtExpected );
+        }
+        i_undoManager.leaveUndoContext();
+
+        // try Undo actions which fail in their Undo/Redo
+        for ( int i=0; i<4; ++i )
+        {
+            final boolean undo = ( i < 2 );
+            final boolean doByAPI = ( i % 2 ) == 0;
+
+            i_undoManager.reset();
+            i_undoManager.addUndoAction( new CustomUndoAction() );
+            i_undoManager.addUndoAction( new FailingUndoAction( undo ? FAIL_UNDO : FAIL_REDO ) );
+            i_undoManager.addUndoAction( new CustomUndoAction() );
+            i_undoManager.undo();
+            if ( !undo )
+                i_undoManager.undo();
+            // assert preconditions for the below test
+            assertTrue( i_undoManager.isUndoPossible() );
+            assertTrue( i_undoManager.isRedoPossible() );
+
+            boolean caughtUndoFailed = false;
+            try
+            {
+                if ( undo )
+                    if ( doByAPI )
+                        i_undoManager.undo();
+                    else
+                        m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" );
+                else
+                    if ( doByAPI )
+                        i_undoManager.redo();
+                    else
+                        m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Redo" );
+            }
+            catch ( UndoFailedException e )
+            {
+                caughtUndoFailed = true;
+            }
+            if ( doByAPI )
+                assertTrue( "Exceptions in XUndoAction.undo should be propagated at the API", caughtUndoFailed );
+            else
+                assertFalse( "Undo/Redo by UI should not let escape Exceptions", caughtUndoFailed );
+            if ( undo )
+            {
+                assertFalse( "a failing Undo should clear the Undo stack", i_undoManager.isUndoPossible() );
+                assertTrue( "a failing Undo should /not/ clear the Redo stack", i_undoManager.isRedoPossible() );
+            }
+            else
+            {
+                assertTrue( "a failing Redo should /not/ clear the Undo stack", i_undoManager.isUndoPossible() );
+                assertFalse( "a failing Redo should clear the Redo stack", i_undoManager.isRedoPossible() );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testStackHandling( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        assertFalse( i_undoManager.isUndoPossible() );
+        assertFalse( i_undoManager.isRedoPossible() );
+
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertFalse( i_undoManager.isRedoPossible() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertFalse( i_undoManager.isRedoPossible() );
+        i_undoManager.undo();
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertTrue( i_undoManager.isRedoPossible() );
+        i_undoManager.undo();
+        assertFalse( i_undoManager.isUndoPossible() );
+        assertTrue( i_undoManager.isRedoPossible() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertFalse( "adding a new action should have cleared the Redo stack", i_undoManager.isRedoPossible() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testClearance( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+
+        // add an action, clear the stack, verify the listener has been called
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        assertFalse( "clearance listener unexpectedly called", m_undoListener.wereStacksCleared() );
+        assertFalse( "redo-clearance listener unexpectedly called", m_undoListener.wasRedoStackCleared() );
+        i_undoManager.clear();
+        assertTrue( "clearance listener not called as expected", m_undoListener.wereStacksCleared() );
+        assertFalse( "redo-clearance listener unexpectedly called (2)", m_undoListener.wasRedoStackCleared() );
+
+        // ensure the listener is also called if the stack is actually empty at the moment of the call
+        m_undoListener.reset();
+        assertFalse( i_undoManager.isUndoPossible() );
+        i_undoManager.clear();
+        assertTrue( "clearance listener is also expected to be called if the stack was empty before", m_undoListener.wereStacksCleared() );
+
+        // ensure the proper listeners are called for clearRedo
+        m_undoListener.reset();
+        i_undoManager.clearRedo();
+        assertFalse( m_undoListener.wereStacksCleared() );
+        assertTrue( m_undoListener.wasRedoStackCleared() );
+
+        // ensure the redo listener is also called upon implicit redo stack clearance
+        m_undoListener.reset();
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.undo();
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertTrue( i_undoManager.isRedoPossible() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        assertFalse( i_undoManager.isRedoPossible() );
+        assertTrue( "implicit clearance of the Redo stack does not notify listeners", m_undoListener.wasRedoStackCleared() );
+
+        // test resetting the manager
+        m_undoListener.reset();
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.undo();
+        assertTrue( i_undoManager.isUndoPossible() );
+        assertTrue( i_undoManager.isRedoPossible() );
+        i_undoManager.reset();
+        assertFalse( i_undoManager.isUndoPossible() );
+        assertFalse( i_undoManager.isRedoPossible() );
+        assertTrue( "|reset| does not properly notify", m_undoListener.wasManagerReset() );
+
+        // resetting the manager, with open undo contexts
+        m_undoListener.reset();
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.enterUndoContext( "Undo Context" );
+        i_undoManager.addUndoAction( new CustomUndoAction() );
+        i_undoManager.enterHiddenUndoContext();
+        i_undoManager.reset();
+        assertTrue( "|reset| while contexts are open does not properly notify", m_undoListener.wasManagerReset() );
+        // verify the manager really has the proper context depth now
+        i_undoManager.enterUndoContext( "Undo Context" );
+        assertEquals( "seems that |reset| did not really close the open contexts", 1, m_undoListener.getCurrentUndoContextDepth() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private void impl_testHiddenContexts( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception
+    {
+        i_undoManager.reset();
+        m_undoListener.reset();
+        assertFalse( "precondition for testing hidden undo contexts not met", i_undoManager.isUndoPossible() );
+
+        // entering a hidden context should be rejected if the stack is empty
+        boolean caughtExpected = false;
+        try { i_undoManager.enterHiddenUndoContext(); }
+        catch ( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "entering hidden contexts should be denied on an empty stack", caughtExpected );
+
+        // but it should be allowed if the context is not empty
+        final CustomUndoAction undoAction0 = new CustomUndoAction( "Step 0" );
+        i_undoManager.addUndoAction( undoAction0 );
+        final CustomUndoAction undoAction1 = new CustomUndoAction( "Step 1" );
+        i_undoManager.addUndoAction( undoAction1 );
+        i_undoManager.enterHiddenUndoContext();
+        final CustomUndoAction hiddenUndoAction = new CustomUndoAction( "hidden context action" );
+        i_undoManager.addUndoAction( hiddenUndoAction );
+        i_undoManager.leaveUndoContext();
+        assertFalse( "leaving a hidden should not call |leftUndocontext|", m_undoListener.wasContextLeft() );
+        assertTrue( "leaving a hidden does not call |leftHiddenUndocontext|", m_undoListener.wasHiddenContextLeft() );
+        assertFalse( "leaving a non-empty hidden context claims to have cancelled it", m_undoListener.hasContextBeenCancelled() );
+        assertEquals( "leaving a hidden context is not properly notified", 0, m_undoListener.getCurrentUndoContextDepth() );
+        assertArrayEquals( "unexpected Undo stack after leaving a hidden context",
+            new String[] { undoAction1.getTitle(), undoAction0.getTitle() },
+            i_undoManager.getAllUndoActionTitles() );
+
+        // and then calling |undo| once should not only undo everything in the hidden context, but also
+        // the previous action - but not more
+        i_undoManager.undo();
+        assertTrue( "Undo after leaving a hidden context does not actually undo the context actions",
+            hiddenUndoAction.undoCalled() );
+        assertTrue( "Undo after leaving a hidden context does not undo the predecessor action",
+            undoAction1.undoCalled() );
+        assertFalse( "Undo after leaving a hidden context undoes too much",
+            undoAction0.undoCalled() );
+
+        // leaving an empty hidden context should call the proper notification method
+        m_undoListener.reset();
+        i_undoManager.enterHiddenUndoContext();
+        i_undoManager.leaveUndoContext();
+        assertFalse( m_undoListener.wasContextLeft() );
+        assertFalse( m_undoListener.wasHiddenContextLeft() );
+        assertTrue( m_undoListener.hasContextBeenCancelled() );
+
+        // nesting hidden and normal contexts
+        m_undoListener.reset();
+        i_undoManager.reset();
+        final CustomUndoAction action0 = new CustomUndoAction( "action 0" );
+        i_undoManager.addUndoAction( action0 );
+        i_undoManager.enterUndoContext( "context 1" );
+        final CustomUndoAction action1 = new CustomUndoAction( "action 1" );
+        i_undoManager.addUndoAction( action1 );
+        i_undoManager.enterHiddenUndoContext();
+        final CustomUndoAction action2 = new CustomUndoAction( "action 2" );
+        i_undoManager.addUndoAction( action2 );
+        i_undoManager.enterUndoContext( "context 2" );
+        // is entering a hidden context rejected even at the nesting level > 0 (the above test was for nesting level == 0)?
+        caughtExpected = false;
+        try { i_undoManager.enterHiddenUndoContext(); }
+        catch( final EmptyUndoStackException e ) { caughtExpected = true; }
+        assertTrue( "at a nesting level > 0, denied hidden contexts does not work as expected", caughtExpected );
+        final CustomUndoAction action3 = new CustomUndoAction( "action 3" );
+        i_undoManager.addUndoAction( action3 );
+        i_undoManager.enterHiddenUndoContext();
+        assertEquals( "mixed hidden/normal context do are not properly notified", 4, m_undoListener.getCurrentUndoContextDepth() );
+        i_undoManager.leaveUndoContext();
+        assertTrue( "the left context was empty - why wasn't 'cancelled' notified?", m_undoListener.hasContextBeenCancelled() );
+        assertFalse( m_undoListener.wasContextLeft() );
+        assertFalse( m_undoListener.wasHiddenContextLeft() );
+        i_undoManager.leaveUndoContext();
+        i_undoManager.leaveUndoContext();
+        i_undoManager.leaveUndoContext();
+        i_undoManager.undo();
+        assertFalse( "one action too much has been undone", action0.undoCalled() );
+        assertTrue( action1.undoCalled() );
+        assertTrue( action2.undoCalled() );
+        assertTrue( action3.undoCalled() );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private XComponentContext getContext()
+    {
+        return m_connection.getComponentContext();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private XMultiServiceFactory getORB()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(
+            XMultiServiceFactory.class, getContext().getServiceManager() );
+        return xMSF1;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println( "--------------------------------------------------------------------------------" );
+        System.out.println( "starting class: " + UndoManager.class.getName() );
+        System.out.println( "connecting ..." );
+        m_connection.setUp();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println();
+        System.out.println( "tearing down connection" );
+        m_connection.tearDown();
+        System.out.println( "finished class: " + UndoManager.class.getName() );
+        System.out.println( "--------------------------------------------------------------------------------" );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static class CustomUndoAction implements XUndoAction, XComponent
+    {
+        CustomUndoAction()
+        {
+            m_title = "Custom Undo Action";
+        }
+
+        CustomUndoAction( final String i_title )
+        {
+            m_title = i_title;
+        }
+
+        public String getTitle()
+        {
+            return m_title;
+        }
+
+        public void undo() throws UndoFailedException
+        {
+            m_undoCalled = true;
+        }
+
+        public void redo() throws UndoFailedException
+        {
+            m_redoCalled = true;
+        }
+
+        public void dispose()
+        {
+            m_disposed = true;
+        }
+
+        public void addEventListener( XEventListener xl )
+        {
+            fail( "addEventListener is not expected to be called in the course of this test" );
+        }
+
+        public void removeEventListener( XEventListener xl )
+        {
+            fail( "removeEventListener is not expected to be called in the course of this test" );
+        }
+
+        boolean undoCalled() { return m_undoCalled; }
+        boolean redoCalled() { return m_redoCalled; }
+        boolean disposed() { return m_disposed; }
+
+        private final String    m_title;
+        private boolean         m_undoCalled = false;
+        private boolean         m_redoCalled = false;
+        private boolean         m_disposed = false;
+    }
+
+    private static short FAIL_UNDO = 1;
+    private static short FAIL_REDO = 2;
+
+    private static class FailingUndoAction implements XUndoAction
+    {
+        FailingUndoAction( final short i_failWhich )
+        {
+            m_failWhich = i_failWhich;
+        }
+
+        public String getTitle()
+        {
+            return "failing undo";
+        }
+
+        public void undo() throws UndoFailedException
+        {
+            if ( m_failWhich != FAIL_REDO )
+                impl_throw();
+        }
+
+        public void redo() throws UndoFailedException
+        {
+            if ( m_failWhich != FAIL_UNDO )
+                impl_throw();
+        }
+
+        private void impl_throw() throws UndoFailedException
+        {
+            throw new UndoFailedException();
+        }
+
+        private final short m_failWhich;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static class CountingUndoAction implements XUndoAction
+    {
+        CountingUndoAction( final int i_expectedOrder, final Object i_lock, final Integer[] i_actionsUndoneCounter )
+        {
+            m_expectedOrder = i_expectedOrder;
+            m_lock = i_lock;
+            m_actionsUndoneCounter = i_actionsUndoneCounter;
+        }
+
+        public String getTitle()
+        {
+            return "Counting Undo Action";
+        }
+
+        public void undo() throws UndoFailedException
+        {
+            synchronized( m_lock )
+            {
+                assertEquals( "Undo action called out of order", m_expectedOrder, m_actionsUndoneCounter[0].intValue() );
+                ++m_actionsUndoneCounter[0];
+            }
+        }
+
+        public void redo() throws UndoFailedException
+        {
+            fail( "CountingUndoAction.redo is not expected to be called in this test." );
+        }
+        private final int       m_expectedOrder;
+        private final Object    m_lock;
+        private Integer[]       m_actionsUndoneCounter;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static String getCallbackUndoContextTitle()
+    {
+        return "Some Unfinished Undo Context";
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private static String getCallbackComponentServiceName()
+    {
+        return "org.openoffice.complex.sfx2.Callback";
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    /**
+     * a factory for a callback component which, at OOo runtime, is inserted into OOo's "component repository"
+     */
+    private class CallbackComponentFactory implements XSingleComponentFactory, XServiceInfo, XComponent
+    {
+        public Object createInstanceWithContext( XComponentContext i_context ) throws com.sun.star.uno.Exception
+        {
+            return new CallbackComponent();
+        }
+
+        public Object createInstanceWithArgumentsAndContext( Object[] i_arguments, XComponentContext i_context ) throws com.sun.star.uno.Exception
+        {
+            return createInstanceWithContext( i_context );
+        }
+
+        public String getImplementationName()
+        {
+            return "org.openoffice.complex.sfx2.CallbackComponent";
+        }
+
+        public boolean supportsService( String i_serviceName )
+        {
+            return i_serviceName.equals( getCallbackComponentServiceName() );
+        }
+
+        public String[] getSupportedServiceNames()
+        {
+            return new String[] { getCallbackComponentServiceName() };
+        }
+
+        public void dispose()
+        {
+            final EventObject event = new EventObject( this );
+
+            final ArrayList eventListenersCopy = (ArrayList)m_eventListeners.clone();
+            final Iterator iter = eventListenersCopy.iterator();
+            while ( iter.hasNext() )
+            {
+                ((XEventListener)iter.next()).disposing( event );
+            }
+        }
+
+        public void addEventListener( XEventListener i_listener )
+        {
+            if ( i_listener != null )
+                m_eventListeners.add( i_listener );
+        }
+
+        public void removeEventListener( XEventListener i_listener )
+        {
+            m_eventListeners.remove( i_listener );
+        }
+
+        private final ArrayList m_eventListeners = new ArrayList();
+    };
+
+    // -----------------------------------------------------------------------------------------------------------------
+    private class CallbackComponent implements XJob, XTypeProvider
+    {
+        CallbackComponent()
+        {
+        }
+
+        public Object execute( NamedValue[] i_parameters ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.uno.Exception
+        {
+            // this method is called from within the Basic script which is to check whether the OOo framework
+            // properly cleans up unfinished Undo contexts. It is called immediately after the context has been
+            // entered, so verify the expected Undo manager state.
+            assertEquals( getCallbackUndoContextTitle(), m_undoListener.getCurrentUndoContextTitle() );
+            assertEquals( 1, m_undoListener.getCurrentUndoContextDepth() );
+
+            synchronized( m_callbackCondition )
+            {
+                m_callbackCalled = true;
+                m_callbackCondition.notifyAll();
+            }
+            return m_closeAfterCallback ? "close" : "";
+        }
+
+        public Type[] getTypes()
+        {
+            final Class interfaces[] = getClass().getInterfaces();
+            Type types[] = new Type[ interfaces.length ];
+            for ( int i = 0; i < interfaces.length; ++i )
+                types[i] = new Type(interfaces[i]);
+            return types;
+        }
+
+        public byte[] getImplementationId()
+        {
+            return getClass().toString().getBytes();
+        }
+    }
+
+    private static final OfficeConnection   m_connection = new OfficeConnection();
+    private DocumentTest                    m_currentTestCase;
+    private OfficeDocument                  m_currentDocument;
+    private UndoListener                    m_undoListener;
+    private CallbackComponentFactory        m_callbackFactory = null;
+    private boolean                         m_callbackCalled = false;
+    private boolean                         m_closeAfterCallback = false;
+    private final Object                    m_callbackCondition = new Object();
+}
diff --git a/framework/qa/complex/path_settings/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk
index 70af7817ac..20b170fba3 100755
--- a/framework/qa/complex/path_settings/makefile.mk
+++ b/sfx2/qa/complex/sfx2/makefile.mk
@@ -25,60 +25,60 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = PathSettings
-PRJNAME = $(TARGET)
-PACKAGE = complex$/path_settings
+.IF "$(OOO_JUNIT_JAR)" == ""
+nothing .PHONY:
+    @echo -----------------------------------------------------
+    @echo - JUnit not available, not building anything
+    @echo -----------------------------------------------------
+.ELSE   # IF "$(OOO_JUNIT_JAR)" != ""
+
+PRJ = ../../..
+PRJNAME = sfx2
+TARGET = qa_complex
+PACKAGE = complex/sfx2
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
 
-
 #----- compile .java files -----------------------------------------
 
-JARFILES =  ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-JAVAFILES       = PathSettingsTest.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
+JARFILES        = OOoRunnerLight.jar ridl.jar test.jar test-tools.jar unoil.jar
+EXTRAJARFILES   = $(OOO_JUNIT_JAR)
+JAVAFILES       = $(shell @$(FIND) . -name "*.java") \
 
-MAXLINELENGTH = 100000
+#----- create a jar from compiled files ----------------------------
 
-JARCLASSDIRS    = $(PACKAGE)
 JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+#----- JUnit tests class -------------------------------------------
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+JAVATESTFILES = \
+    DocumentInfo.java \
+    DocumentProperties.java \
+    StandaloneDocumentInfo.java \
+    DocumentMetadataAccess.java \
+    UndoManager.java \
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+# disabled: #i115674#
+#    GlobalEventBroadcaster.java \
 
 # --- Targets ------------------------------------------------------
 
-.IF "$(depend)" == ""
+.INCLUDE: target.mk
+
 ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
 
-.INCLUDE :  target.mk
+# --- subsequent tests ---------------------------------------------
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
+
+.INCLUDE: installationtest.mk
+
+ALLTAR : javatest
 
-RUN: run
+    # Sample how to debug
+    # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-run:
-    +java -version
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
+.END    # "$(OOO_SUBSEQUENT_TESTS)" == ""
 
+.END    # ELSE "$(OOO_JUNIT_JAR)" != ""
diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
index 8d58ca7f14..826389b3d4 100644..100755
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.standalonedocumentinfo;
+package complex.sfx2.standalonedocinfo;
 
 public interface StandaloneDocumentInfoTest {
     boolean test();
diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
index 16b85b3913..a26483ab9a 100644..100755
--- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java
@@ -24,16 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.standalonedocumentinfo;
-
-import com.sun.star.beans.Property;
-import com.sun.star.beans.XProperty;
-import com.sun.star.beans.XPropertySetInfo;
-import com.sun.star.io.IOException;
-import com.sun.star.io.XInputStream;
-import com.sun.star.io.XOutputStream;
-import complexlib.ComplexTestCase;
+package complex.sfx2.standalonedocinfo;
 
+import complex.sfx2.standalonedocinfo.TestHelper;
+import complex.sfx2.standalonedocinfo.StandaloneDocumentInfoTest;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.document.XStandaloneDocumentInfo;
 import com.sun.star.io.XTempFile;
@@ -43,19 +37,15 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.AnyConverter;
-import com.sun.star.task.ErrorCodeIOException;
-import java.util.Properties;
 
-import java.util.Random;
-import share.LogWriter;
 
 public class Test01 implements StandaloneDocumentInfoTest {
     XMultiServiceFactory m_xMSF = null;
     TestHelper m_aTestHelper = null;
     
-    public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) {
+    public Test01 ( XMultiServiceFactory xMSF ) {
         m_xMSF = xMSF;
-        m_aTestHelper = new TestHelper( aLogWriter, "Test01: " );
+        m_aTestHelper = new TestHelper( "Test01: " );
     }
     
     public boolean test() {
@@ -71,19 +61,16 @@ public class Test01 implements StandaloneDocumentInfoTest {
                 m_aTestHelper.Message ( "==============================" );
                 //create a new temporary file 
                 Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" );
-                XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface (
-                    XTempFile.class, oTempFile );
+                XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile);
                 
                 //create a text document and initiallize it
                 Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" );
-                XLoadable xLoadable = (XLoadable) UnoRuntime.queryInterface ( 
-                        XLoadable.class, oTextDocument );
+                XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument);
                 xLoadable.initNew();
                 m_aTestHelper.Message ( "New document initialized." );
                 
                 //store the instance to the temporary file URL
-                XStorable xStorable = (XStorable) UnoRuntime.queryInterface (
-                        XStorable.class, oTextDocument );
+                XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument);
                 String sURL = AnyConverter.toString ( xTempFile.getUri () );
                 PropertyValue aProps[] = new PropertyValue[2];
                 aProps[0] = new PropertyValue();
@@ -101,15 +88,13 @@ public class Test01 implements StandaloneDocumentInfoTest {
                 Object oStandaloneDocInfo = m_xMSF.createInstance ( 
                         "com.sun.star.document.StandaloneDocumentInfo" );
                 XStandaloneDocumentInfo xStandaloneDocInfo = 
-                        (XStandaloneDocumentInfo) UnoRuntime.queryInterface (
-                        XStandaloneDocumentInfo.class, oStandaloneDocInfo );
+                        UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo);
                 xStandaloneDocInfo.loadFromURL ( sURL );
                 m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." );
                 
                 //get the title from the object and check it
                 XPropertySet xPropSet = 
-                        (XPropertySet)UnoRuntime.queryInterface (
-                        XPropertySet.class, oStandaloneDocInfo );
+                        UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo);
                 String sTitle = xPropSet.getPropertyValue ( "Title" ).toString ();
                 m_aTestHelper.Message ( "Get title: " + sTitle );
                 if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) {
@@ -134,14 +119,12 @@ public class Test01 implements StandaloneDocumentInfoTest {
                 Object oStandaloneDocInfo_ = m_xMSF.createInstance (
                         "com.sun.star.document.StandaloneDocumentInfo" );
                 XStandaloneDocumentInfo xStandaloneDocInfo_ = 
-                        (XStandaloneDocumentInfo)UnoRuntime.queryInterface (
-                        XStandaloneDocumentInfo.class, oStandaloneDocInfo_ );
+                        UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_);
                 xStandaloneDocInfo_.loadFromURL ( sURL );
                 m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." );
                 
                 //get the title and check it
-                XPropertySet xPropSet_ = (XPropertySet)UnoRuntime.queryInterface (
-                        XPropertySet.class, oStandaloneDocInfo_ );
+                XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_);
                 String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString ();
                 m_aTestHelper.Message ( "Get new title: " + sTitle_ );
                 if ( sTitle_.compareTo ( sTitle ) != 0 ) {
diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
index 697bf726d9..0477b18b28 100644..100755
--- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
+++ b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java
@@ -24,25 +24,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.standalonedocumentinfo;
+package complex.sfx2.standalonedocinfo;
 
-import share.LogWriter;
 
 public class TestHelper {
-    LogWriter m_aLogWriter;
+
     String m_sTestPrefix;
     
-    /** Creates a new instance of TestHelper */
-    public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) {
-        m_aLogWriter = aLogWriter;
+    /** Creates a new instance of TestHelper
+     * @param sTestPrefix 
+     */
+    public TestHelper ( String sTestPrefix ) {
         m_sTestPrefix = sTestPrefix;
     }
     
     public void Error ( String sError ) {
-        m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError );
+        System.out.println ( m_sTestPrefix + "Error: " + sError );
     }
     
     public void Message ( String sMessage ) {
-        m_aLogWriter.println ( m_sTestPrefix + sMessage );
+        System.out.println ( m_sTestPrefix + sMessage );
     }
 }
diff --git a/sfx2/qa/complex/testdocuments/CUSTOM.odt b/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt
index 831a8f451d..831a8f451d 100644..100755
--- a/sfx2/qa/complex/testdocuments/CUSTOM.odt
+++ b/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt
diff --git a/sfx2/qa/complex/testdocuments/TEST.odt b/sfx2/qa/complex/sfx2/testdocuments/TEST.odt
index 7c6f0b60f7..7c6f0b60f7 100644..100755
--- a/sfx2/qa/complex/testdocuments/TEST.odt
+++ b/sfx2/qa/complex/sfx2/testdocuments/TEST.odt
diff --git a/sfx2/qa/complex/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt
index d59739142d..d59739142d 100644..100755
--- a/sfx2/qa/complex/testdocuments/TESTRDFA.odt
+++ b/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt
diff --git a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
new file mode 100755
index 0000000000..af62bab39d
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<RDF
+  xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:s="http://www.w3.org/2000/01/rdf-schema#">
+
+<!--
+  This is the RDF Schema for the RDF data model as described in the
+  Resource Description Framework (RDF) Model and Syntax Specification
+  http://www.w3.org/TR/REC-rdf-syntax -->
+
+</RDF>
diff --git a/sfx2/qa/complex/DocHelper/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java
index 19f5b32d3e..e7170d405c 100644..100755
--- a/sfx2/qa/complex/DocHelper/DialogThread.java
+++ b/sfx2/qa/complex/sfx2/tools/DialogThread.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.framework.DocHelper;
+package complex.sfx2.tools;
 
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XController;
@@ -37,9 +37,6 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
 
-import java.lang.Thread;
-
-
 /**
  * This class opens a given dialog in a separate Thread by dispatching an url
  * 
@@ -55,21 +52,17 @@ public class DialogThread extends Thread {
         this.m_url = url;
     }
 
+    @Override
     public void run() {
-        XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, 
-                                                           m_xDoc);
+        XModel aModel = UnoRuntime.queryInterface( XModel.class, m_xDoc );
 
         XController xController = aModel.getCurrentController();
 
         //Opening Dialog
         try {
-            XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface(
-                                                  XDispatchProvider.class, 
-                                                  xController.getFrame());
-            XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
-                                              XURLTransformer.class, 
-                                              m_xMSF.createInstance(
-                                                      "com.sun.star.util.URLTransformer"));
+            XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, xController.getFrame() );
+            XURLTransformer xParser = UnoRuntime.queryInterface( XURLTransformer.class,
+                m_xMSF.createInstance( "com.sun.star.util.URLTransformer" ) );
 
             // Because it's an in/out parameter
             // we must use an array of URL objects.
diff --git a/configmgr/source/span.hxx b/sfx2/qa/complex/sfx2/tools/TestDocument.java
index 20843be31e..8f2108df35 100644..100755
--- a/configmgr/source/span.hxx
+++ b/sfx2/qa/complex/sfx2/tools/TestDocument.java
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,42 +25,16 @@
 *
 ************************************************************************/
 
-#ifndef INCLUDED_CONFIGMGR_SOURCE_SPAN_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_SPAN_HXX
+package complex.sfx2.tools;
 
-#include "sal/config.h"
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
 
-#include "rtl/string.h"
-#include "sal/types.h"
-
-namespace configmgr {
-
-struct Span {
-    char const * begin;
-    sal_Int32 length;
-
-    inline Span(): begin(0), length(0) {}
-        // init length to avoid compiler warnings
-
-    inline Span(char const * theBegin, sal_Int32 theLength):
-        begin(theBegin), length(theLength) {}
-
-    inline void clear() throw() { begin = 0; }
-
-    inline bool is() const { return begin != 0; }
-
-    inline bool equals(Span const & text) const {
-        return rtl_str_compare_WithLength(
-            begin, length, text.begin, text.length) == 0;
-    }
-
-    inline bool equals(char const * textBegin, sal_Int32 textLength) const {
-        return equals(Span(textBegin, textLength));
+public final class TestDocument {
+    public static String getUrl(String name) {
+        return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
     }
-};
 
+    private TestDocument() {}
 }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
index 7b393677f7..181b75e40f 100644..100755
--- a/sfx2/qa/complex/DocHelper/WriterHelper.java
+++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.framework.DocHelper;
+package complex.sfx2.tools;
 
 import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
@@ -40,7 +40,6 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.XCloseable;
 
-import complex.framework.DocHelper.DialogThread;
 import java.io.PrintWriter;
 
 import util.AccessibilityTools;
@@ -73,19 +72,20 @@ public class WriterHelper {
      * @return if an error occurs the errormessage is returned and an empty String if not
      */
     public String closeDoc(XTextDocument xTextDoc) {
-        XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
-                                    XCloseable.class, xTextDoc);
+        XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc);
         String err = "";
 
         try {
             closer.close(true);
         } catch (com.sun.star.util.CloseVetoException e) {
             err = "couldn't close document " + e;
+            System.out.println(err);
         }
 
         return err;
     }
 
+    private XTextDocument xLocalDoc = null;
     /** a TextDocument is opened by pressing a button in a dialog given by uno-URL
      * @param url the uno-URL of the dialog to be opened
      * @param createButton the language dependend label of the button to be pressed
@@ -95,30 +95,25 @@ public class WriterHelper {
      */
     public XTextDocument openFromDialog(String url, String createButton, 
                                         boolean destroyLocal) {
-        XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF);
-        XComponent comp = (XComponent) UnoRuntime.queryInterface(
-                                  XComponent.class, xLocalDoc);
+        xLocalDoc = WriterTools.createTextDoc(m_xMSF);
+        XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc);
         DialogThread diagThread = new DialogThread(comp, m_xMSF, url);
         diagThread.start();
         shortWait();
 
         if (createButton.length() > 1) {
             XExtendedToolkit tk = getToolkit();
-            AccessibilityTools at = new AccessibilityTools();
             Object atw = tk.getActiveTopWindow();
 
-            XWindow xWindow = (XWindow) UnoRuntime.queryInterface(
-                                      XWindow.class, atw);
+            XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
 
-            XAccessible xRoot = at.getAccessibleObject(xWindow);
-            XAccessibleContext buttonContext = at.getAccessibleObjectForRole(
+            XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
+            XAccessibleContext buttonContext = AccessibilityTools.getAccessibleObjectForRole(
                                                        xRoot, 
                                                        AccessibleRole.PUSH_BUTTON, 
                                                        createButton);
 
-            XAccessibleAction buttonAction = (XAccessibleAction) UnoRuntime.queryInterface(
-                                                     XAccessibleAction.class, 
-                                                     buttonContext);
+            XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext);
 
             try {
                 System.out.println("Name: " + 
@@ -133,47 +128,52 @@ public class WriterHelper {
 
         XDesktop xDesktop = getDesktop();
 
-        XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface(
-                                          XTextDocument.class, 
-                                          xDesktop.getCurrentComponent());
+        XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent());
 
         if (destroyLocal) {
             closeDoc(xLocalDoc);
+            xLocalDoc = null;
         }
 
         return returnDoc;
     }
+    public void closeFromDialog()
+    {
+        closeDoc(xLocalDoc);
+        xLocalDoc = null;
+    }
+    public void kill()
+    {
+        XDesktop xDesktop = getDesktop();
+        xDesktop.terminate();
+    }
+
 
     public XTextDocument DocByAutopilot(XMultiServiceFactory msf, 
                                         int[] indexes, boolean destroyLocal, 
                                         String bName) {
-        XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF);
+        XTextDocument xTextDoc = WriterTools.createTextDoc(m_xMSF);
         Object toolkit = null;
 
         try {
             toolkit = msf.createInstance("com.sun.star.awt.Toolkit");
         } catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace();
+            e.printStackTrace( System.err );
         }
 
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, toolkit);
+        XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit);
 
         shortWait();
 
-        AccessibilityTools at = new AccessibilityTools();
-
         Object atw = tk.getActiveTopWindow();
 
-        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, 
-                                                              atw);
+        XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
 
-        XAccessible xRoot = at.getAccessibleObject(xWindow);
+        XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
-        XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, 
+        XAccessibleContext ARoot = AccessibilityTools.getAccessibleObjectForRole(xRoot,
                                                                  AccessibleRole.MENU_BAR);
-        XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface(
-                                           XAccessibleSelection.class, ARoot);
+        XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot);
 
         for (int k = 0; k < indexes.length; k++) {
             try {
@@ -181,8 +181,7 @@ public class WriterHelper {
                 shortWait();
                 ARoot = ARoot.getAccessibleChild(indexes[k])
                              .getAccessibleContext();
-                sel = (XAccessibleSelection) UnoRuntime.queryInterface(
-                              XAccessibleSelection.class, ARoot);
+                sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot);
             } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             }
         }
@@ -191,17 +190,13 @@ public class WriterHelper {
         
         atw = tk.getActiveTopWindow();
 
-        xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw);
+        xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
 
-        xRoot = at.getAccessibleObject(xWindow);
+        xRoot = AccessibilityTools.getAccessibleObject(xWindow);
         
         //at.printAccessibleTree(new PrintWriter(System.out),xRoot);
 
-        XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface(
-                                           XAccessibleAction.class, 
-                                           at.getAccessibleObjectForRole(xRoot, 
-                                                                         AccessibleRole.PUSH_BUTTON, 
-                                                                         bName));
+        XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName));
 
         try {
             action.doAccessibleAction(0);
@@ -212,17 +207,13 @@ public class WriterHelper {
         
         atw = tk.getActiveTopWindow();
 
-        xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw);
+        xWindow = UnoRuntime.queryInterface(XWindow.class, atw);
 
-        xRoot = at.getAccessibleObject(xWindow);
+        xRoot = AccessibilityTools.getAccessibleObject(xWindow);
         
-        at.printAccessibleTree(new PrintWriter(System.out),xRoot);
+        AccessibilityTools.printAccessibleTree(new PrintWriter(System.out),xRoot);
 
-        action = (XAccessibleAction) UnoRuntime.queryInterface(
-                                           XAccessibleAction.class, 
-                                           at.getAccessibleObjectForRole(xRoot, 
-                                                                         AccessibleRole.PUSH_BUTTON, 
-                                                                         "Yes"));
+        action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes"));
 
         try {
             if (action != null) action.doAccessibleAction(0);
@@ -233,12 +224,10 @@ public class WriterHelper {
 
         XDesktop xDesktop = getDesktop();
 
-        XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface(
-                                          XTextDocument.class, 
-                                          xDesktop.getCurrentComponent());
+        XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent());
 
         if (destroyLocal) {
-            closeDoc(xLocalDoc);
+            closeDoc(xTextDoc);
         }
 
         return returnDoc;
@@ -266,11 +255,10 @@ public class WriterHelper {
             toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit");
         } catch (com.sun.star.uno.Exception e) {
             System.out.println("Couldn't get toolkit");
-            e.printStackTrace();
+            e.printStackTrace( System.err );
         }
 
-        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
-                                      XExtendedToolkit.class, toolkit);
+        XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit);
 
         return tk;
     }
@@ -285,11 +273,10 @@ public class WriterHelper {
             desk = m_xMSF.createInstance("com.sun.star.frame.Desktop");
         } catch (com.sun.star.uno.Exception e) {
             System.out.println("Couldn't get desktop");
-            e.printStackTrace();
+            e.printStackTrace( System.err );
         }
 
-        XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface(
-                                    XDesktop.class, desk);
+        XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk);
 
         return xDesktop;
     }
diff --git a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java
new file mode 100755
index 0000000000..34825fdbad
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java
@@ -0,0 +1,96 @@
+package complex.sfx2.undo;
+
+import org.openoffice.test.tools.SpreadsheetDocument;
+import com.sun.star.table.XCellRange;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.table.XCell;
+import com.sun.star.uno.UnoRuntime;
+import org.openoffice.test.tools.DocumentType;
+import static org.junit.Assert.*;
+
+/**
+ * implements the {@link DocumentTest} interface on top of a spreadsheet document
+ * @author frank.schoenheit@oracle.com
+ */
+public class CalcDocumentTest extends DocumentTestBase
+{
+    public CalcDocumentTest( final XMultiServiceFactory i_orb ) throws Exception
+    {
+        super( i_orb, DocumentType.CALC );
+    }
+
+    public String getDocumentDescription()
+    {
+        return "spreadsheet document";
+    }
+
+    public void initializeDocument() throws com.sun.star.uno.Exception
+    {
+        final XCell cellA1 = getCellA1();
+        cellA1.setValue( INIT_VALUE );
+        assertEquals( "initializing the cell value didn't work", cellA1.getValue(), INIT_VALUE, 0 );
+
+        XCellRange range = UnoRuntime.queryInterface( XCellRange.class,
+            ((SpreadsheetDocument)m_document).getSheet(0) );
+
+        for ( int i=0; i<12; ++i )
+        {
+            XCell cell = range.getCellByPosition( 1, i );
+            cell.setFormula( "" );
+        }
+    }
+
+    public void doSingleModification() throws com.sun.star.uno.Exception
+    {
+        final XCell cellA1 = getCellA1();
+        assertEquals( "initial cell value not as expected", INIT_VALUE, cellA1.getValue(), 0 );
+        cellA1.setValue( MODIFIED_VALUE );
+        assertEquals( "modified cell value not as expected", MODIFIED_VALUE, cellA1.getValue(), 0 );
+    }
+
+    public void verifyInitialDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XCell cellA1 = getCellA1();
+        assertEquals( "cell A1 doesn't have its initial value", INIT_VALUE, cellA1.getValue(), 0 );
+
+        XCellRange range = UnoRuntime.queryInterface( XCellRange.class,
+            ((SpreadsheetDocument)m_document).getSheet(0) );
+        for ( int i=0; i<12; ++i )
+        {
+            final XCell cell = range.getCellByPosition( 1, i );
+            assertEquals( "Cell B" + (i+1) + " not having its initial value (an empty string)", "", cell.getFormula() );
+        }
+    }
+
+    public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XCell cellA1 = getCellA1();
+        assertEquals( "cell A1 doesn't have the value which we gave it", MODIFIED_VALUE, cellA1.getValue(), 0 );
+    }
+
+    public int doMultipleModifications() throws com.sun.star.uno.Exception
+    {
+        XCellRange range = UnoRuntime.queryInterface( XCellRange.class,
+            ((SpreadsheetDocument)m_document).getSheet(0) );
+
+        final String[] months = new String[] {
+            "January", "February", "March", "April", "May", "June", "July", "August",
+            "September", "October", "November", "December" };
+        for ( int i=0; i<12; ++i )
+        {
+            final XCell cell = range.getCellByPosition( 1, i );
+            cell.setFormula( months[i] );
+        }
+        return 12;
+    }
+
+    private XCell getCellA1() throws com.sun.star.uno.Exception
+    {
+        XCellRange range = UnoRuntime.queryInterface( XCellRange.class,
+            ((SpreadsheetDocument)m_document).getSheet(0) );
+        return range.getCellByPosition( 0, 0 );
+    }
+
+    private static final double INIT_VALUE = 100.0;
+    private static final double MODIFIED_VALUE = 200.0;
+}
diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
new file mode 100755
index 0000000000..fa9837321d
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
@@ -0,0 +1,277 @@
+/*************************************************************************
+ * 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.
+ * 
+ *************************************************************************/
+
+package complex.sfx2.undo;
+
+import com.sun.star.chart2.XAxis;
+import com.sun.star.chart2.XCoordinateSystem;
+import com.sun.star.chart2.XCoordinateSystemContainer;
+import com.sun.star.awt.Size;
+import com.sun.star.beans.NamedValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.chart2.XChartDocument;
+import com.sun.star.chart2.XDiagram;
+import com.sun.star.container.XIndexAccess;
+import com.sun.star.document.UndoFailedException;
+import com.sun.star.document.XUndoAction;
+import com.sun.star.document.XUndoManager;
+import com.sun.star.document.XUndoManagerSupplier;
+import com.sun.star.drawing.XShape;
+import com.sun.star.embed.EmbedStates;
+import com.sun.star.embed.EmbedVerbs;
+import com.sun.star.embed.VerbDescriptor;
+import com.sun.star.embed.WrongStateException;
+import com.sun.star.embed.XEmbeddedObject;
+import com.sun.star.embed.XStateChangeBroadcaster;
+import com.sun.star.embed.XStateChangeListener;
+import com.sun.star.lang.EventObject;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextRange;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.view.XSelectionSupplier;
+import org.openoffice.test.tools.DocumentType;
+import org.openoffice.test.tools.OfficeDocument;
+import static org.junit.Assert.*;
+
+/**
+ * @author frank.schoenheit@oracle.com
+ */
+public class ChartDocumentTest implements DocumentTest
+{
+    public ChartDocumentTest( final XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception, InterruptedException
+    {
+        m_textDocument = OfficeDocument.blankDocument( i_orb, DocumentType.WRITER );
+
+        // create a OLE shape in the document
+        final XMultiServiceFactory factory = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_textDocument.getDocument() );
+        final String shapeServiceName = "com.sun.star.text.TextEmbeddedObject";
+        final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, factory.createInstance( shapeServiceName ) );
+        shapeProps.setPropertyValue("CLSID", "12dcae26-281f-416f-a234-c3086127382e");
+
+        final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps );
+        shape.setSize( new Size( 16000, 9000 ) );
+
+        final XTextContent chartTextContent = UnoRuntime.queryInterface( XTextContent.class, shapeProps );
+
+        final XSelectionSupplier selSupplier = UnoRuntime.queryInterface( XSelectionSupplier.class,
+                m_textDocument.getCurrentView().getController() );
+        final Object selection = selSupplier.getSelection();
+        final XTextRange textRange = getAssociatedTextRange( selection );
+        if ( textRange == null )
+            throw new RuntimeException( "can't locate a text range" );
+
+        // insert the chart
+        textRange.getText().insertTextContent(textRange, chartTextContent, false);
+
+        // retrieve the chart model
+        XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, shapeProps.getPropertyValue( "Model" ) );
+        m_chartDocument = new OfficeDocument( i_orb, chartDoc );
+
+        // actually activate the object
+        final XEmbeddedObject embeddedChart = UnoRuntime.queryInterface( XEmbeddedObject.class,
+            shapeProps.getPropertyValue( "EmbeddedObject" ) );
+        embeddedChart.doVerb( EmbedVerbs.MS_OLEVERB_SHOW );
+
+        final int state = embeddedChart.getCurrentState();
+        if ( state != EmbedStates.UI_ACTIVE )
+            fail( "unable to activate the embedded chart" );
+    }
+
+    public String getDocumentDescription()
+    {
+        return "chart document";
+    }
+
+    public void initializeDocument() throws com.sun.star.uno.Exception
+    {
+        final XPropertySet wallProperties = impl_getWallProperties();
+        wallProperties.setPropertyValue( "FillStyle", com.sun.star.drawing.FillStyle.SOLID );
+        wallProperties.setPropertyValue( "FillColor", 0x00FFFFFF );
+    }
+
+    public void closeDocument()
+    {
+        m_textDocument.close();
+    }
+
+    private XPropertySet impl_getWallProperties()
+    {
+        final XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, m_chartDocument.getDocument() );
+        final XDiagram diagram = chartDoc.getFirstDiagram();
+        final XPropertySet wallProperties = diagram.getWall(); 
+        return wallProperties;
+    }
+
+    private XPropertySet impl_getYAxisProperties()
+    {
+        XPropertySet axisProperties = null;
+        try
+        {
+            final XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, m_chartDocument.getDocument() );
+            final XDiagram diagram = chartDoc.getFirstDiagram();
+            final XCoordinateSystemContainer coordContainer = UnoRuntime.queryInterface( XCoordinateSystemContainer.class, diagram );
+            final XCoordinateSystem[] coordSystems = coordContainer.getCoordinateSystems();
+            final XCoordinateSystem coordSystem = coordSystems[0];
+            final XAxis primaryYAxis = coordSystem.getAxisByDimension( 1, 0 );
+            axisProperties = UnoRuntime.queryInterface( XPropertySet.class, primaryYAxis );
+        }
+        catch ( Exception ex )
+        {
+            fail( "internal error: could not retrieve primary Y axis properties" );
+        }
+        return axisProperties;
+    }
+
+    private XUndoManager impl_getUndoManager()
+    {
+        final XUndoManagerSupplier undoManagerSupp = UnoRuntime.queryInterface( XUndoManagerSupplier.class, m_chartDocument.getDocument() );
+        final XUndoManager undoManager = undoManagerSupp.getUndoManager();
+        return undoManager;
+    }
+
+    public void doSingleModification() throws com.sun.star.uno.Exception
+    {
+        final XPropertySet wallProperties = impl_getWallProperties();
+
+        // simulate an Undo action, as long as the chart implementation doesn't add Undo actions itself
+        final XUndoManager undoManager = impl_getUndoManager();
+        undoManager.addUndoAction( new PropertyUndoAction( wallProperties, "FillColor", 0xCCFF44 ) );
+            // (the UndoAction will actually set the property value)
+    }
+
+    public void verifyInitialDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XPropertySet wallProperties = impl_getWallProperties();
+        assertEquals( 0x00FFFFFF, ((Integer)wallProperties.getPropertyValue( "FillColor" )).intValue() );
+    }
+
+    public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XPropertySet wallProperties = impl_getWallProperties();
+        assertEquals( 0xCCFF44, ((Integer)wallProperties.getPropertyValue( "FillColor" )).intValue() );
+    }
+
+    public int doMultipleModifications() throws com.sun.star.uno.Exception
+    {
+        final XPropertySet axisProperties = impl_getYAxisProperties();
+
+        final XUndoManager undoManager = impl_getUndoManager();
+        undoManager.addUndoAction( new PropertyUndoAction( axisProperties, "LineWidth", 300 ) );
+        undoManager.addUndoAction( new PropertyUndoAction( axisProperties, "LineColor", 0x000000 ) );
+
+        return 2;
+    }
+
+    public OfficeDocument getDocument()
+    {
+        return m_chartDocument;
+    }
+
+    private XTextRange getAssociatedTextRange( final Object i_object ) throws WrappedTargetException, IndexOutOfBoundsException
+    {
+        // possible cases:
+        // 1. a container of other objects - e.g. selection of 0 to n text portions, or 1 to n drawing objects
+        final XIndexAccess indexer = UnoRuntime.queryInterface( XIndexAccess.class, i_object );
+        if ((indexer != null) && indexer.getCount() > 0) {
+            final int count = indexer.getCount();
+            for (int i = 0; i < count; ++i) {
+                final XTextRange range = getAssociatedTextRange( indexer.getByIndex(i) );
+                if (range != null) {
+                    return range;
+                }
+            }
+        }
+        // 2. another TextContent, having an anchor we can use
+        final XTextContent textContent = UnoRuntime.queryInterface(XTextContent.class, i_object);
+        if (textContent != null) {
+            final XTextRange range = textContent.getAnchor();
+            if (range != null) {
+                return range;
+            }
+        }
+
+        // an object which supports XTextRange directly
+        final XTextRange range = UnoRuntime.queryInterface(XTextRange.class, i_object);
+        if (range != null) {
+            return range;
+        }
+
+        return null;
+    }
+
+    private static class PropertyUndoAction implements XUndoAction
+    {
+        PropertyUndoAction( final XPropertySet i_component, final String i_propertyName, final Object i_newValue ) throws com.sun.star.uno.Exception
+        {
+            m_component = i_component;
+            m_propertyName = i_propertyName;
+            m_newValue = i_newValue;
+
+            m_oldValue = i_component.getPropertyValue( m_propertyName );
+            i_component.setPropertyValue( m_propertyName, m_newValue );
+        }
+
+        public String getTitle()
+        {
+            return "some dummy Undo Action";
+        }
+
+        public void undo() throws UndoFailedException
+        {
+            try
+            {
+                m_component.setPropertyValue( m_propertyName, m_oldValue );
+            }
+            catch ( com.sun.star.uno.Exception ex )
+            {
+                throw new UndoFailedException( "", this, ex );
+            }
+        }
+
+        public void redo() throws UndoFailedException
+        {
+            try
+            {
+                m_component.setPropertyValue( m_propertyName, m_newValue );
+            }
+            catch ( com.sun.star.uno.Exception ex )
+            {
+                throw new UndoFailedException( "", this, ex );
+            }
+        }
+
+        private final XPropertySet  m_component;
+        private final String        m_propertyName;
+        private final Object        m_oldValue;
+        private final Object        m_newValue;
+    }
+
+    private final OfficeDocument    m_textDocument;
+    private final OfficeDocument    m_chartDocument;
+}
diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTest.java b/sfx2/qa/complex/sfx2/undo/DocumentTest.java
new file mode 100755
index 0000000000..ee3f12b6af
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/DocumentTest.java
@@ -0,0 +1,61 @@
+package complex.sfx2.undo;
+
+import org.openoffice.test.tools.OfficeDocument;
+
+/**
+ * wrapper around an OfficeDocument, for running a standardized test procedure (related do Undo functionality)
+ * on the document.
+ * 
+ * @author frank.schoenheit@oracle.com
+ */
+public interface DocumentTest
+{
+    /**
+     * returns a human-readable description for the document/type which the tests operates on
+     */
+    public String getDocumentDescription();
+
+    /**
+     * initializes the document to a state where the subsequent tests can be ran
+     */
+    public void initializeDocument() throws com.sun.star.uno.Exception;
+
+    /**
+     * closes the document which the test is based on
+     */
+    public void closeDocument();
+
+    /**
+     * does a simple modification to the document, which results in one Undo action being auto-generated
+     * by the OOo implementation
+     */
+    public void doSingleModification() throws com.sun.star.uno.Exception;
+
+    /**
+     * verifies the document is in the same state as after {@link #initializeDocument}
+     */
+    public void verifyInitialDocumentState() throws com.sun.star.uno.Exception;
+
+    /**
+     * verifies the document is in the state as expected after {@link #doSingleModification}
+     * @throws com.sun.star.uno.Exception
+     */
+    public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception;
+
+    /**
+     * does multiple modifications do the document, which would normally result in multiple Undo actions.
+     *
+     * The test framework will encapsulate the call into an {@link XUndoManager.enterUndoContext()} and
+     * {@link XUndoManager.leaveUndoContext()} call.
+     *
+     * @return
+     *  the number of modifications done to the document. The caller assumes (and asserts) that the number
+     *  of actions on the Undo stack equals this number.
+     */
+    public int doMultipleModifications() throws com.sun.star.uno.Exception;
+
+    /**
+     * returns the document which the test operates on
+     */
+    public OfficeDocument   getDocument();
+}
diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java
new file mode 100755
index 0000000000..11adc80c2e
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java
@@ -0,0 +1,29 @@
+package complex.sfx2.undo;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.Exception;
+import org.openoffice.test.tools.DocumentType;
+import org.openoffice.test.tools.OfficeDocument;
+
+/**
+ * @author frank.schoenheit@oracle.com
+ */
+abstract class DocumentTestBase implements DocumentTest
+{
+    DocumentTestBase( final XMultiServiceFactory i_orb, final DocumentType i_docType ) throws Exception
+    {
+        m_document = OfficeDocument.blankDocument( i_orb, i_docType );
+    }
+
+    public OfficeDocument getDocument()
+    {
+        return m_document;
+    }
+
+    public void closeDocument()
+    {
+        m_document.close();
+    }
+
+    protected final OfficeDocument  m_document;
+}
diff --git a/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java
new file mode 100755
index 0000000000..661907b995
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java
@@ -0,0 +1,46 @@
+/*************************************************************************
+ * 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.
+ * 
+ *************************************************************************/
+
+package complex.sfx2.undo;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import org.openoffice.test.tools.DocumentType;
+
+/**
+ * @author frank.schoenheit@oracle.com
+ */
+public class DrawDocumentTest extends DrawingOrPresentationDocumentTest
+{
+    public DrawDocumentTest( XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception
+    {
+        super( i_orb, DocumentType.DRAWING );
+    }
+
+    public String getDocumentDescription()
+    {
+        return "drawing document";
+    }
+}
diff --git a/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
new file mode 100755
index 0000000000..916e1908e9
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
@@ -0,0 +1,196 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package complex.sfx2.undo;
+
+import com.sun.star.awt.Rectangle;
+import com.sun.star.document.XUndoManager;
+import com.sun.star.document.XUndoManagerSupplier;
+import com.sun.star.document.XUndoAction;
+import com.sun.star.awt.Point;
+import com.sun.star.awt.Size;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.drawing.CircleKind;
+import com.sun.star.drawing.XDrawPages;
+import com.sun.star.drawing.XDrawPagesSupplier;
+import com.sun.star.drawing.XShape;
+import com.sun.star.drawing.XShapes;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import org.openoffice.test.tools.DocumentType;
+import static org.junit.Assert.*;
+
+/**
+ * implements the {@link DocumentTest} interface on top of a drawing document
+ * @author frank.schoenheit@oracle.com
+ */
+public abstract class DrawingOrPresentationDocumentTest extends DocumentTestBase
+{
+    public DrawingOrPresentationDocumentTest( XMultiServiceFactory i_orb, final DocumentType i_docType ) throws com.sun.star.uno.Exception
+    {
+        super( i_orb, i_docType );
+    }
+
+    public void initializeDocument() throws com.sun.star.uno.Exception
+    {
+        // remove all shapes - Impress has two default shapes in a new doc; just get rid of them
+        final XShapes firstPageShapes = getFirstPageShapes();
+        while ( firstPageShapes.getCount() > 0 )
+            firstPageShapes.remove( UnoRuntime.queryInterface( XShape.class, firstPageShapes.getByIndex( 0 ) ) );
+    }
+
+    public void doSingleModification() throws com.sun.star.uno.Exception
+    {
+        // add a simple centered shape to the first page
+        Rectangle pagePlayground = impl_getFirstPagePlayground();
+        impl_createCircleShape(
+            ( pagePlayground.X + ( pagePlayground.Width - BIG_CIRCLE_SIZE ) / 2 ),
+            ( pagePlayground.Y + ( pagePlayground.Height - BIG_CIRCLE_SIZE ) / 2 ),
+            BIG_CIRCLE_SIZE,
+            FILL_COLOR
+        );
+    }
+
+    public void verifyInitialDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XShapes firstPageShapes = getFirstPageShapes();
+        assertEquals( "there should be no shapes at all", 0, firstPageShapes.getCount() );
+    }
+
+    public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XShapes firstPageShapes = getFirstPageShapes();
+        assertEquals( "there should be one shape, not more, not less", 1, firstPageShapes.getCount() );
+
+        final Object shape = firstPageShapes.getByIndex(0);
+        verifyShapeGeometry( shape, BIG_CIRCLE_SIZE, BIG_CIRCLE_SIZE );
+        final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, shape );
+        assertEquals( "wrong circle tpye", CIRCLE_TYPE.getValue(), ((CircleKind)shapeProps.getPropertyValue( "CircleKind" )).getValue() );
+        //assertEquals( "wrong circle fill color", FILL_COLOR, ((Integer)shapeProps.getPropertyValue( "FillColor" )).intValue() );
+            // disable this particular check: A bug in the drawing layer API restores the FillColor to its
+            // default value upon re-insertion. This is issue #i115080#
+    }
+
+    public int doMultipleModifications() throws com.sun.star.uno.Exception
+    {
+        // add a simple centered shape to the first page
+        Rectangle pagePlayground = impl_getFirstPagePlayground();
+        impl_createCircleShape(
+            pagePlayground.X,
+            pagePlayground.Y,
+            SMALL_CIRCLE_SIZE,
+            ALTERNATE_FILL_COLOR
+        );
+        impl_createCircleShape(
+            pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE,
+            pagePlayground.Y,
+            SMALL_CIRCLE_SIZE,
+            ALTERNATE_FILL_COLOR
+        );
+        impl_createCircleShape(
+            pagePlayground.X,
+            pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE,
+            SMALL_CIRCLE_SIZE,
+            ALTERNATE_FILL_COLOR
+        );
+        impl_createCircleShape(
+            pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE,
+            pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE,
+            SMALL_CIRCLE_SIZE,
+            ALTERNATE_FILL_COLOR
+        );
+        return 4;
+    }
+
+    private void impl_createCircleShape( final int i_x, final int i_y, final int i_size, final int i_color ) throws com.sun.star.uno.Exception
+    {
+        final XPropertySet shapeProps = getDocument().createInstance( "com.sun.star.drawing.EllipseShape", XPropertySet.class );
+        shapeProps.setPropertyValue( "CircleKind", CIRCLE_TYPE );
+        shapeProps.setPropertyValue( "FillColor", i_color );
+
+        final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps );
+        final Size shapeSize = new Size( i_size, i_size );
+        shape.setSize( shapeSize );
+        final Point shapePos = new Point( i_x, i_y );
+        shape.setPosition( shapePos );
+
+        final XShapes pageShapes = UnoRuntime.queryInterface( XShapes.class, getFirstPageShapes() );
+        pageShapes.add( shape );
+
+        // Sadly, Draw/Impress currently do not create Undo actions for programmatic changes to the document.
+        // Which renders the test here slightly useless ... unless we fake the Undo actions ourself.
+        final XUndoManagerSupplier suppUndoManager = UnoRuntime.queryInterface( XUndoManagerSupplier.class, getDocument().getDocument() );
+        final XUndoManager undoManager = suppUndoManager.getUndoManager();
+        undoManager.addUndoAction( new ShapeInsertionUndoAction( shape, pageShapes ) );
+    }
+
+    private Rectangle impl_getFirstPagePlayground() throws com.sun.star.uno.Exception
+    {
+        final XShapes firstPageShapes = getFirstPageShapes();
+        final XPropertySet firstPageProps = UnoRuntime.queryInterface( XPropertySet.class, firstPageShapes );
+        final int pageWidth = ((Integer)firstPageProps.getPropertyValue( "Width" )).intValue();
+        final int pageHeight = ((Integer)firstPageProps.getPropertyValue( "Height" )).intValue();
+        final int borderLeft = ((Integer)firstPageProps.getPropertyValue( "BorderLeft" )).intValue();
+        final int borderTop = ((Integer)firstPageProps.getPropertyValue( "BorderTop" )).intValue();
+        final int borderRight = ((Integer)firstPageProps.getPropertyValue( "BorderRight" )).intValue();
+        final int borderBottom = ((Integer)firstPageProps.getPropertyValue( "BorderBottom" )).intValue();
+        return new Rectangle( borderLeft, borderTop, pageWidth - borderLeft - borderRight, pageHeight - borderTop - borderBottom );
+    }
+
+    /**
+     * returns the XShapes interface of the first page of our drawing document
+     */
+    private XShapes getFirstPageShapes() throws com.sun.star.uno.Exception
+    {
+        final XDrawPagesSupplier suppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument().getDocument() );
+        final XDrawPages pages = suppPages.getDrawPages();
+        return UnoRuntime.queryInterface( XShapes.class, pages.getByIndex( 0 ) );
+    }
+
+    /**
+     * verifies the given shape has the given size
+     */
+    private void verifyShapeGeometry( final Object i_shapeObject, final int i_expectedWidth, final int i_expectedHeight )
+         throws com.sun.star.uno.Exception
+    {
+        final XShape shape = UnoRuntime.queryInterface( XShape.class, i_shapeObject );
+        final Size shapeSize = shape.getSize();
+        assertEquals( "unexpected shape width", i_expectedWidth, shapeSize.Width );
+        assertEquals( "unexpected shape height", i_expectedHeight, shapeSize.Height );
+    }
+
+    private static class ShapeInsertionUndoAction implements XUndoAction
+    {
+        ShapeInsertionUndoAction( final XShape i_shape, final XShapes i_shapeCollection )
+        {
+            m_shape = i_shape;
+            m_shapeCollection = i_shapeCollection;
+        }
+
+        public String getTitle()
+        {
+            return "insert shape";
+        }
+
+        public void undo()
+        {
+            m_shapeCollection.remove( m_shape );
+        }
+
+        public void redo()
+        {
+            m_shapeCollection.add( m_shape );
+        }
+
+        private final XShape m_shape;
+        private final XShapes m_shapeCollection;
+    }
+
+    private static CircleKind   CIRCLE_TYPE = CircleKind.FULL;
+    private static int          FILL_COLOR = 0xCC2244;
+    private static int          ALTERNATE_FILL_COLOR = 0x44CC22;
+    private static int          BIG_CIRCLE_SIZE = 5000;
+    private static int          SMALL_CIRCLE_SIZE = 2000;
+}
diff --git a/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java
new file mode 100755
index 0000000000..c15fc760e0
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java
@@ -0,0 +1,46 @@
+/*************************************************************************
+ * 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.
+ *
+ *************************************************************************/
+
+package complex.sfx2.undo;
+
+import com.sun.star.lang.XMultiServiceFactory;
+import org.openoffice.test.tools.DocumentType;
+
+/**
+ * @author frank.schoenheit@oracle.com
+ */
+public class ImpressDocumentTest extends DrawingOrPresentationDocumentTest
+{
+    public ImpressDocumentTest( XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception
+    {
+        super( i_orb, DocumentType.PRESENTATION );
+    }
+
+    public String getDocumentDescription()
+    {
+        return "presentation document";
+    }
+}
diff --git a/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java b/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java
new file mode 100755
index 0000000000..702fb85ebb
--- /dev/null
+++ b/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java
@@ -0,0 +1,104 @@
+package complex.sfx2.undo;
+
+import com.sun.star.text.XTextRange;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.table.XCell;
+import com.sun.star.table.XCellRange;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextTable;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import org.openoffice.test.tools.DocumentType;
+import static org.junit.Assert.*;
+
+/**
+ * implements the {@link DocumentTest} interface on top of a spreadsheet document
+ * @author frank.schoenheit@oracle.com
+ */
+public class WriterDocumentTest extends DocumentTestBase
+{
+    public WriterDocumentTest( final XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception
+    {
+        super( i_orb, DocumentType.WRITER );
+    }
+
+    public String getDocumentDescription()
+    {
+        return "text document";
+    }
+
+    public void initializeDocument() throws com.sun.star.uno.Exception
+    {
+        // TODO?
+    }
+
+    public void doSingleModification() throws com.sun.star.uno.Exception
+    {
+        final XTextDocument textDoc = UnoRuntime.queryInterface( XTextDocument.class, getDocument().getDocument() );
+        final XText docText = textDoc.getText();
+        docText.setString( s_blindText );
+    }
+
+    public void verifyInitialDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XTextDocument textDoc = UnoRuntime.queryInterface( XTextDocument.class, getDocument().getDocument() );
+        final XText docText = textDoc.getText();
+        assertEquals( "document should be empty", "", docText.getString() );
+    }
+
+    public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception
+    {
+        final XTextDocument textDoc = UnoRuntime.queryInterface( XTextDocument.class, getDocument().getDocument() );
+        final XText docText = textDoc.getText();
+        assertEquals( "blind text not found", s_blindText, docText.getString() );
+    }
+
+    public int doMultipleModifications() throws com.sun.star.uno.Exception
+    {
+        final XTextDocument textDoc = UnoRuntime.queryInterface( XTextDocument.class, getDocument().getDocument() );
+        final XText docText = textDoc.getText();
+
+        int expectedUndoActions = 0;
+
+        // create a cursor
+        final XTextCursor cursor = docText.createTextCursor();
+
+        // create a table
+        final XTextTable textTable = UnoRuntime.queryInterface( XTextTable.class,
+            getDocument().createInstance( "com.sun.star.text.TextTable" ) );
+        textTable.initialize( 3, 3 );
+        final XPropertySet tableProps = UnoRuntime.queryInterface( XPropertySet.class, textTable );
+        tableProps.setPropertyValue( "BackColor", 0xCCFF44 );
+
+        // insert the table into the doc
+        docText.insertTextContent( cursor, textTable, false );
+        ++expectedUndoActions; //FIXME this will create 2 actions! currently the event is sent for every individual action; should it be sent for top-level actions only? how many internal actions are created is an implementation detail!
+        ++expectedUndoActions;
+
+        // write some content into the center cell
+        final XCellRange cellRange = UnoRuntime.queryInterface( XCellRange.class, textTable );
+        final XCell centerCell = cellRange.getCellByPosition( 1, 1 );
+        final XTextRange cellText = UnoRuntime.queryInterface( XTextRange.class, centerCell );
+        cellText.setString( "Undo Manager API Test" );
+        ++expectedUndoActions;
+
+        // give it another color
+        final XPropertySet cellProps = UnoRuntime.queryInterface( XPropertySet.class, centerCell );
+        cellProps.setPropertyValue( "BackColor", 0x44CCFF );
+        ++expectedUndoActions;
+
+        return expectedUndoActions;
+    }
+
+    private static final String s_blindText =
+        "Lorem ipsum dolor. Sit amet penatibus. A cum turpis. Aenean ac eu. " +
+        "Ligula est urna nulla vestibulum ullamcorper. Nec sit in amet tincidunt mus. " +
+        "Tellus sagittis mi. Suscipit cursus in vestibulum in eros ipsum felis cursus lectus " +
+        "nunc quis condimentum in risus nec wisi aenean luctus hendrerit magna habitasse commodo orci. " +
+        "Nisl etiam quis. Vestibulum justo eleifend aliquet luctus sed turpis volutpat ullamcorper " +
+        "aliquam penatibus sagittis pede tincidunt egestas. Nibh massa lectus. Sem mattis purus morbi " +
+        "scelerisque turpis donec urna phasellus. Quis at lacus. Viverra mauris mollis. " +
+        "Dolor tincidunt condimentum.";
+}
diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
deleted file mode 100644
index 89840e1cd4..0000000000
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
+++ /dev/null
@@ -1,69 +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.
- *
- ************************************************************************/
-package complex.standalonedocumentinfo;
-
-import complexlib.ComplexTestCase;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-
-/* Document here
-*/
-
-public class StandaloneDocumentInfoUnitTest extends ComplexTestCase {
-    private XMultiServiceFactory m_xMSF = null;
-    
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "ExecuteTest01"};
-    }
-    
-    public String[] getTestObjectNames() {
-        return new String[] {"StandaloneDocumentInfoUnitTest"};
-    }
-    
-    public void before() {
-        try {
-            m_xMSF = (XMultiServiceFactory)param.getMSF();
-        } catch(Exception e) {
-            failed( "Failed to create service factory!" );
-        }
-        if( m_xMSF ==null ) {
-            failed( "Failed to create service factory!" );
-        }
-    }
-    
-    public void after() {
-        m_xMSF = null;
-    }
-    
-    public void ExecuteTest01() {
-        StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF, log);
-        assure( "Test01 failed!", aTest.test() );
-    }
-}
-
-
diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
deleted file mode 100644
index c65556aeb7..0000000000
--- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
+++ /dev/null
@@ -1,85 +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 = ..$/..$/..
-TARGET = StandaloneDocumentInfoUnitTest
-PRJNAME = binfilter
-PACKAGE = complex$/standalonedocumentinfo
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-
-JAVAFILES       =\
-                                StandaloneDocumentInfoUnitTest.java\
-                                StandaloneDocumentInfoTest.java\
-                                Test01.java\
-                                TestHelper.java\
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE: target.mk
-
-RUN: run
-
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-
-
-
diff --git a/sfx2/qa/complex/tests.sce b/sfx2/qa/complex/tests.sce
deleted file mode 100644
index c38852927e..0000000000
--- a/sfx2/qa/complex/tests.sce
+++ /dev/null
@@ -1,3 +0,0 @@
--o complex.framework.DocumentMetaData
--o complex.framework.DocumentMetadataAccessTest
-#-o complex.framework.CheckGlobalEventBroadcaster_writer1
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
index 10e0eaa3d9..10e0eaa3d9 100644..100755
--- a/sfx2/qa/cppunit/makefile.mk
+++ b/sfx2/qa/cppunit/makefile.mk
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 9afb68f4d0..4a94890f21 100644..100755
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -26,13 +26,7 @@
  *
  ************************************************************************/
 
-#include "precompiled_sfx2.hxx"
-
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
+#include <sal/cppunit.h>
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/sfx2/qa/cppunit/version.map b/sfx2/qa/cppunit/version.map
index 0dbbcc5a73..0dbbcc5a73 100644..100755
--- a/sfx2/qa/cppunit/version.map
+++ b/sfx2/qa/cppunit/version.map
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java
index 4263985c13..c1231c975a 100644..100755
--- a/sfx2/qa/unoapi/Test.java
+++ b/sfx2/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.sfx2.qa.unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "sfx.sce", "-xcl", "knownissues.xcl", "-tdoc",
-                "testdocuments", "-cs", connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();
diff --git a/sfx2/qa/unoapi/knownissues.xcl b/sfx2/qa/unoapi/knownissues.xcl
index 1d87f84c96..1d87f84c96 100644..100755
--- a/sfx2/qa/unoapi/knownissues.xcl
+++ b/sfx2/qa/unoapi/knownissues.xcl
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
deleted file mode 100644
index ea91ba4d1c..0000000000
--- a/sfx2/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sfx2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sfx2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/qa/unoapi/sfx.sce b/sfx2/qa/unoapi/sfx.sce
index 6176c06687..ce72c463ee 100644..100755
--- a/sfx2/qa/unoapi/sfx.sce
+++ b/sfx2/qa/unoapi/sfx.sce
@@ -1,5 +1,5 @@
 -o sfx.AppDispatchProvider
--o sfx.DocumentTemplates
+#i113306 -o sfx.DocumentTemplates
 -o sfx.FrameLoader
 -o sfx.SfxMacroLoader
 #i111283 -o sfx.StandaloneDocumentInfo
diff --git a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
index c4b5672f96..c4b5672f96 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
+++ b/sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdw
diff --git a/sfx2/qa/unoapi/testdocuments/report.stw b/sfx2/qa/unoapi/testdocuments/report.stw
index 5b8efafa15..5b8efafa15 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report.stw
+++ b/sfx2/qa/unoapi/testdocuments/report.stw
diff --git a/sfx2/qa/unoapi/testdocuments/report2.stw b/sfx2/qa/unoapi/testdocuments/report2.stw
index 9ee0a7ee0e..9ee0a7ee0e 100644..100755
--- a/sfx2/qa/unoapi/testdocuments/report2.stw
+++ b/sfx2/qa/unoapi/testdocuments/report2.stw
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 026f8bb9a2..026f8bb9a2 100644..100755
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index bae825f8b7..330d43a232 100644..100755
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -171,11 +171,6 @@ interface OfficeDocument : Document
     [
         StateMethod = StateProps_Impl ;
     ]
-    SID_PLAYMACRO // ole(no) api(final/play/norec)
-    [
-        ExecMethod = ExecProps_Impl ;
-        StateMethod = StateProps_Impl ;
-    ]
     SID_VERSION
     [
         ExecMethod = ExecFile_Impl;
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 7f6621239b..7f6621239b 100644..100755
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
deleted file mode 100644
index 07e8a4b7fe..0000000000
--- a/sfx2/sdi/makefile.mk
+++ /dev/null
@@ -1,59 +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=sfx2
-TARGET=sfxslots
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(L10N_framework)"==""
-
-SDI1NAME=$(TARGET)
-SDI1EXPORT=sfx
-
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
-        $(PRJ)$/inc$/sfx2$/sfxsids.hrc \
-        sfx.sdi	\
-        appslots.sdi \
-        sfxslots.sdi \
-        docslots.sdi \
-        viwslots.sdi \
-                frmslots.sdi
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index bce76f2416..b40e8426df 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4635,31 +4635,6 @@ SfxVoidItem PickList SID_PICKLIST
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem PlayMacro SID_PLAYMACRO
-(SfxStringItem Statement SID_STATEMENT,SfxBoolItem Asynchron SID_ASYNCHRON)
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    NoRecord;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_MACRO;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem PlugInsActive SID_PLUGINS_ACTIVE
 
 [
@@ -5238,31 +5213,6 @@ SfxVoidItem RunBasic SID_BASICRUN
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem RunStarWriter SID_STARTSW
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem Save SID_SAVEDOC
 (SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author SID_DOCINFO_AUTHOR)
 [
@@ -5317,7 +5267,7 @@ SfxBoolItem SaveAll SID_SAVEDOCS
 
 //--------------------------------------------------------------------------
 SfxBoolItem SaveAs SID_SAVEASDOC
-(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
+(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxBoolItem PasswordInteraction SID_PASSWORDINTERACTION,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem VersionAuthor SID_DOCINFO_AUTHOR,SfxBoolItem Overwrite SID_OVERWRITE,SfxBoolItem Unpacked SID_UNPACK,SfxBoolItem SaveTo SID_SAVETO)
 [
     /* flags: */
     AutoUpdate = FALSE,
@@ -6411,7 +6361,7 @@ SfxBoolItem TaskBarVisible SID_TASKBAR
 ]
 
 //--------------------------------------------------------------------------
-SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5
+SfxTemplateItem ListStyle SID_STYLE_FAMILY5
 
 [
     /* flags: */
@@ -6570,31 +6520,6 @@ SfxVoidItem BasicIDEShowWindow SID_BASICIDE_SHOWWINDOW
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ToolsMacroEdit SID_EDITMACRO
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_MACRO;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem Undo SID_UNDO
 ( SfxUInt16Item Undo SID_UNDO )
 [
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index e191f4371f..e191f4371f 100644..100755
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index fc78c60a65..fc78c60a65 100644..100755
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 1bf1625e94..1bf1625e94 100644..100755
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 35184120d5..725b09d0ff 100644..100755
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -41,6 +41,8 @@
 #include <tools/simplerm.hxx>
 #include <tools/config.hxx>
 #include <basic/basrdll.hxx>
+#include <basic/sbmeth.hxx>
+#include <basic/sbmod.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/sound.hxx>
@@ -75,18 +77,15 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
-
 #include <basic/basmgr.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-
 #include <rtl/logfile.hxx>
-
 #include <sfx2/appuno.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/request.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/progress.hxx>
 #include <sfx2/objsh.hxx>
@@ -112,16 +111,17 @@
 #include <sfx2/module.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/sfxdlg.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "eventsupplier.hxx"
 #include <sfx2/dockwin.hxx>
+#include <tools/svlibrary.hxx>
 
 #ifdef DBG_UTIL
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/mnuitem.hxx>
 #endif
 
-#if defined( WIN ) || defined( WNT ) || defined( OS2 )
+#if defined( WNT ) || defined( OS2 )
 #define DDE_AVAILABLE
 #endif
 
@@ -226,7 +226,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
                             String aFactory = String::CreateFromAscii("private:factory/");
                             if ( pArgs && *pArgs )
                             {
-                                SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, FALSE );
+                                SFX_ITEMSET_ARG( &aSet, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, sal_False );
                                 if ( pFactoryName )
                                     aFactory += pFactoryName->GetValue();
                                 else
@@ -271,7 +271,7 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
 #include <framework/imageproducer.hxx>
 #include <framework/acceleratorinfo.hxx>
 #include <framework/sfxhelperfunctions.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include "fwkhelper.hxx"
 
 ::osl::Mutex SfxApplication::gMutex;
@@ -292,7 +292,7 @@ SfxApplication* SfxApplication::GetOrCreate()
         RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
         pApp = pNew;
 
-        // at the moment a bug may occur when Initialize_Impl returns FALSE, but this is only temporary because all code that may cause such a
+        // at the moment a bug may occur when Initialize_Impl returns sal_False, but this is only temporary because all code that may cause such a
         // fault will be moved outside the SFX
         pApp->Initialize_Impl();
 
@@ -351,20 +351,15 @@ SfxApplication::SfxApplication()
 #endif
 #endif
 
-    if ( !InitLabelResMgr( "iso" ) )
-        // no "iso" resource -> search for "ooo" resource
-        InitLabelResMgr( "ooo", true );
     pBasic   = new BasicDLL;
-
     StarBASIC::SetGlobalErrorHdl( LINK( this, SfxApplication, GlobalBasicErrorHdl_Impl ) );
-
-
-
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "} initialize DDE" );
 }
 
 SfxApplication::~SfxApplication()
 {
+    OSL_ENSURE( GetObjectShells_Impl().Count() == 0, "Memory leak: some object shells were not removed!" );
+
     Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
 
     SfxModule::DestroyModules_Impl();
@@ -466,12 +461,12 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
         // DocWinActivate : both frames belong to the same TopWindow
         // TopWinActivate : both frames belong to different TopWindows
 
-        BOOL bTaskActivate = pOldContainerFrame != pNewContainerFrame;
+        sal_Bool bTaskActivate = pOldContainerFrame != pNewContainerFrame;
 
         if ( pOldContainerFrame )
         {
             if ( bTaskActivate )
-                NotifyEvent( SfxEventHint( SFX_EVENT_DEACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_DEACTIVATEDOC), pOldContainerFrame->GetObjectShell() ) );
+                NotifyEvent( SfxViewEventHint( SFX_EVENT_DEACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_DEACTIVATEDOC), pOldContainerFrame->GetObjectShell(), pOldContainerFrame->GetFrame().GetController() ) );
             pOldContainerFrame->DoDeactivate( bTaskActivate, pFrame );
 
             if( pOldContainerFrame->GetProgress() )
@@ -486,7 +481,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
             if ( bTaskActivate && pNewContainerFrame->GetObjectShell() )
             {
                 pNewContainerFrame->GetObjectShell()->PostActivateEvent_Impl( pNewContainerFrame );
-                NotifyEvent(SfxEventHint(SFX_EVENT_ACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_ACTIVATEDOC), pNewContainerFrame->GetObjectShell() ) );
+                NotifyEvent(SfxViewEventHint(SFX_EVENT_ACTIVATEDOC, GlobalEventConfig::GetEventName(STR_EVENT_ACTIVATEDOC), pNewContainerFrame->GetObjectShell(), pNewContainerFrame->GetFrame().GetController() ) );
             }
 
             SfxProgress *pProgress = pNewContainerFrame->GetProgress();
@@ -563,13 +558,6 @@ ResMgr* SfxApplication::GetSfxResManager()
 
 //--------------------------------------------------------------------
 
-ResMgr* SfxApplication::GetLabelResManager() const
-{
-    return pAppData_Impl->pLabelResMgr;
-}
-
-//--------------------------------------------------------------------
-
 SimpleResMgr* SfxApplication::GetSimpleResManager()
 {
     if ( !pAppData_Impl->pSimpleResManager )
@@ -686,7 +674,7 @@ SfxObjectShellArr_Impl&     SfxApplication::GetObjectShells_Impl() const
     return *pAppData_Impl->pObjShells;
 }
 
-void SfxApplication::Invalidate( USHORT nId )
+void SfxApplication::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) )
         Invalidate_Impl( pFrame->GetBindings(), nId );
@@ -696,17 +684,15 @@ void SfxApplication::Invalidate( USHORT nId )
 #define STRING( x )				   			DOSTRING( x )
 
 typedef	long (SAL_CALL *basicide_handle_basic_error)(void*);
-typedef	rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, BOOL, rtl_uString*);
-typedef	void* (SAL_CALL *basicide_macro_organizer)(INT16);
+typedef	rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, rtl_uString*);
+typedef	void* (SAL_CALL *basicide_macro_organizer)(sal_Int16);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -724,7 +710,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
 
 sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
 {
-    sal_Bool result = FALSE;
+    sal_Bool result = sal_False;
 
     ::com::sun::star::uno::Reference
         < ::com::sun::star::lang::XMultiServiceFactory > xSMgr =
@@ -748,7 +734,7 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
 
             if ( xUrl.is() )
             {
-                result = TRUE;
+                result = sal_True;
             }
         }
         catch ( ::com::sun::star::uno::RuntimeException& )
@@ -774,11 +760,11 @@ SfxApplication::ChooseScript()
         uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
 
           AbstractScriptSelectorDialog* pDlg =
-            pFact->CreateScriptSelectorDialog( NULL, FALSE, xFrame );
+            pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
 
         OSL_TRACE("done, now exec it");
 
-          USHORT nRet = pDlg->Execute();
+          sal_uInt16 nRet = pDlg->Execute();
 
         OSL_TRACE("has returned");
 
@@ -792,12 +778,10 @@ SfxApplication::ChooseScript()
     return aScriptURL;
 }
 
-void SfxApplication::MacroOrganizer( INT16 nTabId )
+void SfxApplication::MacroOrganizer( sal_Int16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -811,4 +795,9 @@ void SfxApplication::MacroOrganizer( INT16 nTabId )
     pSymbol( nTabId );
 }
 
+ErrCode SfxApplication::CallBasic( const String& rCode, BasicManager* pMgr, SbxArray* pArgs, SbxValue* pRet )
+{
+    return pMgr->ExecuteMacro( rCode, pArgs, pRet);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 18872f5af6..e00b18a79b 100644..100755
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -32,105 +32,27 @@
 // #defines *****************************************************************
 
 #define ACC_IBM									(RID_SFX_APP_START+2)
-#define MSG_ERR_WRITE_CFG						(RID_SFX_APP_START+2)
-#define MSG_ERR_READ_CFG						(RID_SFX_APP_START+3)
-#define MSG_ERR_OPEN_CFG						(RID_SFX_APP_START+4)
-#define MSG_ERR_FILETYPE_CFG					(RID_SFX_APP_START+5)
-#define MSG_ERR_VERSION_CFG 					(RID_SFX_APP_START+6)
 #define MSG_ERR_NO_WEBBROWSER_FOUND			        (RID_SFX_APP_START+7)
 
 #define MSG_ISPRINTING_QUERYABORT				(RID_SFX_APP_START+9)
 #define MSG_CANT_QUIT							(RID_SFX_APP_START+10)
 #define STR_ISMODIFIED							(RID_SFX_APP_START+11)
-#define STR_AUTOSAVE                			(RID_SFX_APP_START+12)
-#define STR_MAIL								(RID_SFX_APP_START+13)
-#define MSG_ERR_WRITE_SBL						(RID_SFX_APP_START+14)
-#define MSG_IS_SERVER							(RID_SFX_APP_START+15)
-
-#define STR_RESEXCEPTION						(RID_SFX_APP_START+21)
-#define STR_SYSRESEXCEPTION 					(RID_SFX_APP_START+22)
-#define STR_DOUBLEEXCEPTION 					(RID_SFX_APP_START+23)
-#define STR_RESWARNING							(RID_SFX_APP_START+24)
-#define STR_ERR_NOTEMPLATE						(RID_SFX_APP_START+27)
-#define STR_RECOVER_TITLE   					(RID_SFX_APP_START+28)
-#define STR_RECOVER_QUERY   					(RID_SFX_APP_START+29)
-#define STR_RECOVER_PREPARED					(RID_SFX_APP_START+30)
-#define MSG_ERR_SOINIT							(RID_SFX_APP_START+31)
-
-#define MSG_IOERR_FILE_NOT_FOUND                (RID_SFX_APP_START+32)
-#define MSG_IOERR_PATH_NOT_FOUND                (RID_SFX_APP_START+33)
-#define MSG_IOERR_TOO_MANY_OPEN_FILES           (RID_SFX_APP_START+34)
-#define MSG_IOERR_ACCESS_DENIED                 (RID_SFX_APP_START+35)
-#define MSG_IOERR_INVALID_ACCESS                (RID_SFX_APP_START+36)
-#define MSG_IOERR_INVALID_HANDLE                (RID_SFX_APP_START+37)
-#define MSG_IOERR_CANNOT_MAKE                   (RID_SFX_APP_START+38)
-#define MSG_IOERR_SHARING                       (RID_SFX_APP_START+39)
-#define MSG_IOERR_INVALID_PARAMETER             (RID_SFX_APP_START+40)
-#define MSG_IOERR_GENERAL                       (RID_SFX_APP_START+41)
 
 #define RID_FULLSCREENTOOLBOX					(RID_SFX_APP_START+42)
 #define RID_RECORDINGTOOLBOX					(RID_SFX_APP_START+43)
 #define RID_ENVTOOLBOX          				(RID_SFX_APP_START+44)
 
 #define STR_QUITAPP 							(RID_SFX_APP_START+59)
-#define STR_EXITANDRETURN						(RID_SFX_APP_START+60)
-#define STR_ERR_NOFILE                          (RID_SFX_APP_START+61)
-#define STR_EXTHELPSTATUS						(RID_SFX_APP_START+62)
-
-#define STR_ADDRESS_NAME 						(RID_SFX_APP_START+65)
 
 #define RID_STR_HLPFILENOTEXIST					(RID_SFX_APP_START+68)
-#define RID_STR_HLPAPPNOTSTARTED				(RID_SFX_APP_START+69)
-
-#define STR_NODOUBLE                            (RID_SFX_APP_START+75)
-#define STR_NOPRINTER                           (RID_SFX_APP_START+76)
-
-#define MSG_SIGNAL                              (RID_SFX_APP_START+77)
 
 #define RID_STR_HELP							(RID_SFX_APP_START+79)
 #define RID_STR_NOAUTOSTARTHELPAGENT			(RID_SFX_APP_START+80)
 #define RID_HELPBAR								(RID_SFX_APP_START+81)
 #define RID_SPECIALCONFIG_ERROR					(RID_SFX_APP_START+82)
 
-#define STR_MEMINFO_HEADER			        (RID_SFX_APP_START+84)
-#define STR_MEMINFO_FOOTER			        (RID_SFX_APP_START+85)
-#define STR_MEMINFO_OBJINFO			        (RID_SFX_APP_START+86)
-
-#define RID_PLUGIN							(RID_SFX_APP_START+87)
-
-#define RID_WARN_POST_MAILTO				(RID_SFX_APP_START+88)
-
-#define RID_STR_NOWELCOMESCREEN				(RID_SFX_APP_START+91)
-
-#define STR_CORRUPT_INSTALLATION			(RID_SFX_APP_START+94)
-#define IDS_SBERR_STOREREF					(RID_SFX_APP_START+97)
-
 #define CONFIG_PATH_START               (RID_SFX_APP_START+98)
 
-#define STR_KEY_ADDINS_PATH             (CONFIG_PATH_START+0)
-#define STR_KEY_AUTOCORRECT_DIR         (CONFIG_PATH_START+1)
-#define STR_KEY_GLOSSARY_PATH           (CONFIG_PATH_START+2)
-#define STR_KEY_BACKUP_PATH             (CONFIG_PATH_START+3)
-#define STR_KEY_BASIC_PATH              (CONFIG_PATH_START+4)
-#define STR_KEY_BITMAP_PATH             (CONFIG_PATH_START+5)
-#define STR_KEY_CONFIG_DIR              (CONFIG_PATH_START+6)
-#define STR_KEY_DICTIONARY_PATH         (CONFIG_PATH_START+7)
-#define STR_KEY_FAVORITES_DIR           (CONFIG_PATH_START+8)
-#define STR_KEY_FILTER_PATH             (CONFIG_PATH_START+9)
-#define STR_KEY_GALLERY_DIR             (CONFIG_PATH_START+10)
-#define STR_KEY_GRAPHICS_PATH           (CONFIG_PATH_START+11)
-#define STR_KEY_HELP_DIR                (CONFIG_PATH_START+12)
-#define STR_KEY_LINGUISTIC_DIR          (CONFIG_PATH_START+13)
-#define STR_KEY_MODULES_PATH            (CONFIG_PATH_START+14)
-#define STR_KEY_PALETTE_PATH            (CONFIG_PATH_START+15)
-#define STR_KEY_PLUGINS_PATH            (CONFIG_PATH_START+16)
-#define STR_KEY_STORAGE_DIR             (CONFIG_PATH_START+17)
-#define STR_KEY_TEMP_PATH               (CONFIG_PATH_START+18)
-#define STR_KEY_TEMPLATE_PATH           (CONFIG_PATH_START+19)
-#define STR_KEY_USERCONFIG_PATH         (CONFIG_PATH_START+20)
-#define STR_KEY_USERDICTIONARY_DIR      (CONFIG_PATH_START+21)
-#define STR_KEY_WORK_PATH               (CONFIG_PATH_START+22)
-
 #define WIN_HELPINDEX							(RID_SFX_APP_START+99)
 #define TP_HELP_CONTENT							(RID_SFX_APP_START+100)
 #define TP_HELP_INDEX							(RID_SFX_APP_START+101)
@@ -155,11 +77,6 @@
 #define IMG_HELP_CONTENT_BOOK_CLOSED            (RID_SFX_APP_START+122)
 #define IMG_HELP_CONTENT_DOC                    (RID_SFX_APP_START+124)
 
-#define IMG_MISSING_1                           (RID_SFX_APP_START+126) // image
-#define IMG_MISSING_2                           (RID_SFX_APP_START+127) // image
-#define IMG_MISSING_3                           (RID_SFX_APP_START+128) // image
-#define IMG_MISSING_4                           (RID_SFX_APP_START+129) // image
-
 #define STR_HELP_WINDOW_TITLE                   (RID_SFX_APP_START+125) // string
 
 #define STR_HELP_BUTTON_INDEX_ON                (RID_SFX_APP_START+126)
@@ -203,8 +120,6 @@
 #define RID_SECURITY_WARNING_HYPERLINK			(RID_SFX_APP_START + 180)
 #define RID_SECURITY_WARNING_TITLE				(RID_SFX_APP_START + 181)
 
-#define RID_INVALID_URL_MSG                     (RID_SFX_APP_START + 182)
-#define RID_INVALID_URL_TITLE                   (RID_SFX_APP_START + 183)
 #define RID_DESKTOP                             (RID_SFX_APP_START + 184)
 
 #define RID_XMLSEC_QUERY_LOSINGSIGNATURE		(RID_SFX_APP_START + 186)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 9e6b9d0667..1e65c6270c 100644..100755
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -31,63 +31,48 @@
 #include "app.hrc"
 #include "helpid.hrc"
 
-InfoBox RID_DOCALREADYLOADED_DLG
+String STR_NONAME
 {
-    Message [ en-US ] = "Document already open." ;
+    Text [ en-US ] = "Untitled" ;
 };
-
-ErrorBox RID_CANTLOADDOC_DLG
+String STR_CLOSE
 {
-    Message [ en-US ] = "Cannot open document." ;
+    Text [ en-US ] = "Close" ;
 };
-
-ErrorBox MSG_ERR_READ_CFG
+String STR_STYLE_FILTER_AUTO
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Error reading configuration file." ;
+    Text [ en-US ] = "Automatic" ;
 };
-
-ErrorBox MSG_ERR_WRITE_CFG
+String STR_STANDARD_SHORTCUT
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Error writing configuration file." ;
+    Text [ en-US ] = "Standard" ;
 };
-
-ErrorBox MSG_ERR_OPEN_CFG
+String STR_BYTES
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Error opening configuration file." ;
+    Text [ en-US ] = "Bytes" ;
 };
-
-ErrorBox MSG_ERR_FILETYPE_CFG
+String STR_KB
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "File is not a configuration file." ;
+    Text [ en-US ] = "KB" ;
 };
-
-ErrorBox MSG_ERR_VERSION_CFG
+String STR_MB
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Configuration file contains the wrong version." ;
+    Text [ en-US ] = "MB" ;
 };
-
-ErrorBox MSG_ERR_WRITE_SBL
+String STR_GB
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "Error recording BASIC library in\n'@'." ;
+    Text [ en-US ] = "GB" ;
+};
+QueryBox MSG_QUERY_LASTVERSION
+{
+    Buttons = WB_YES_NO ;
+    DefButton = WB_DEF_NO ;
+    Message [ en-US ] = "Cancel all changes?" ;
 };
 
-ErrorBox MSG_SIGNAL
+InfoBox RID_DOCALREADYLOADED_DLG
 {
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_YES ;
-    Message [ en-US ] = "An unexpected program error has occurred.\n\nDo you want to try to save your changes in all open documents before the program is terminated?" ;
+    Message [ en-US ] = "Document already open." ;
 };
 
 ErrorBox MSG_ERR_NO_WEBBROWSER_FOUND
@@ -102,89 +87,6 @@ Resource SID_UNKNOWN
     String 1 "-" ;
 };
 
-Resource BMP_SFX_COLOR
-{
-    ExtraData =
-    {
-        SID_NEWDOC;             // 043
-        SID_OPENDOC;            // 044
-        SID_CLOSEDOC;           // 045
-        SID_RELOAD; 			// 046
-        SID_SAVEASDOC;          // 047
-        SID_PRINTDOC;           // 051
-        SID_SETUPPRINTER;       // 053
-        SID_QUITAPP;            // 054
-        SID_UNDO;               // 055
-        SID_REDO;               // 056
-        SID_REPEAT;             // 057
-        SID_CUT;                // 058
-        SID_COPY;               // 059
-        SID_PASTE;              // 060
-        SID_DELETE;             // 061
-        SID_SELECTALL;          // 062
-        SID_SAVEDOC;            // 063 vormals 046
-        SID_EXITANDRETURN;      // 064 vormals 054
-        SID_RECORDMACRO;        // 095
-        SID_EDITMACRO;          // 096
-        SID_HELPMENU;           // 098
-        SID_CONFIG;     		// 123
-        SID_CONFIGTOOLBOX;      // 124
-        0;
-    };
-    Bitmap BMP_SFX_SMALL { File = "sco.bmp" ; };
-    Bitmap BMP_SFX_LARGE { File = "lco.bmp" ; };
-};
-
-Resource BMP_SFX_MONO
-{
-    ExtraData =
-    {
-        SID_NEWDOC;             // 043
-        SID_OPENDOC;            // 044
-        SID_CLOSEDOC;           // 045
-        SID_RELOAD; 			// 046
-        SID_SAVEASDOC;          // 047
-        SID_PRINTDOC;           // 051
-        SID_SETUPPRINTER;       // 053
-        SID_QUITAPP;            // 054
-        SID_UNDO;               // 055
-        SID_REDO;               // 056
-        SID_REPEAT;             // 057
-        SID_CUT;                // 058
-        SID_COPY;               // 059
-        SID_PASTE;              // 060
-        SID_DELETE;             // 061
-        SID_SELECTALL;          // 062
-        SID_SAVEDOC;            // 063 vormals 046
-        SID_EXITANDRETURN;      // 064 vormals 054
-        SID_RECORDMACRO;        // 095
-        SID_EDITMACRO;          // 096
-        SID_HELPMENU;           // 098
-        SID_CONFIG;     		// 123
-        SID_CONFIGTOOLBOX;      // 124
-        0;
-    };
-    Bitmap BMP_SFX_SMALL { File = "smo.bmp" ; };
-    Bitmap BMP_SFX_LARGE { File = "lmo.bmp" ; };
-};
-
-WarningBox RID_WARN_POST_MAILTO
-{
-    BUTTONS = WB_OK_CANCEL ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "A form is to be sent by e-mail.\nThis means that the receiver will get to see your e-mail address." ;
-};
-
-String STR_RECOVER_TITLE
-{
-    Text [ en-US ] = "File Recovery" ;
-};
-
-String STR_RECOVER_QUERY
-{
-    Text [ en-US ] = "Should the file \"$1\" be restored?" ;
-};
-
 String GID_INTERN
 {
     Text [ en-US ] = "Internal" ;
@@ -315,155 +217,16 @@ String GID_CONTROLS
     Text [ en-US ] = "Controls" ;
 };
 
-TabDialog SID_OPTIONS
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 244 , 155 ) ;
-    Text [ en-US ] = "Options" ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    TabControl 1
-    {
-        SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 3 , 15 ) ;
-        Size = MAP_APPFONT ( 221 , 130 ) ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = RID_SFXPAGE_GENERAL ;
-                Text [ en-US ] = "General" ;
-                PageResID = 256 ;
-            };
-            PageItem
-            {
-                Identifier = RID_SFXPAGE_SAVE ;
-                Text [ en-US ] = "Save" ;
-                PageResID = 257 ;
-            };
-            PageItem
-            {
-                Identifier = RID_SFXPAGE_PATH ;
-                Text [ en-US ] = "Paths" ;
-                PageResID = 258 ;
-            };
-            PageItem
-            {
-                Identifier = RID_SFXPAGE_SPELL ;
-                Text [ en-US ] = "Spellcheck" ;
-                PageResID = 259 ;
-            };
-        };
-    };
-};
-
 InfoBox MSG_CANT_QUIT
 {
     Message [ en-US ] = "The application cannot be terminated at the moment.\nPlease wait until all print jobs and/or\nOLE actions have finished and close all dialogs." ;
 };
 
-QueryBox MSG_IS_SERVER
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "This application is as object or print server active.\nDo you want to terminate anyway?" ;
-};
-
-String STR_NODOUBLE
-{
-    Text [ en-US ] = "%PRODUCTNAME cannot be started more than once." ;
-};
-
-String STR_NOPRINTER
-{
-    Text [ en-US ] = "Some %PRODUCTNAME functions will not work properly without a printer driver.\nPlease install a printer driver." ;
-};
-
 String STR_ISMODIFIED
 {
     Text [ en-US ] = "Do you want to save the changes to %1?" ;
 };
 
-String STR_AUTOSAVE
-{
-    Text [ en-US ] = "AutoSave" ;
-};
-
-String STR_RESWARNING
-{
-    Text [ en-US ] = "Limited system resources. Please quit other applications or close some windows before continuing." ;
-};
-String STR_RESEXCEPTION
-{
-    Text [ en-US ] = "There are files missing. Please check application setup." ;
-};
-
-String STR_DOUBLEEXCEPTION
-{
-    Text [ en-US ] = "Another error occurred during the save recovery.\nPossibly, the data could not be entirely saved." ;
-};
-
-String STR_SYSRESEXCEPTION
-{
-    Text [ en-US ] = "System resources exhausted. Please restart the application." ;
-};
-
-ErrorBox MSG_ERR_SOINIT
-{
-    Message [ en-US ] = "Error initializing object-system." ;
-};
-
-String MSG_IOERR_FILE_NOT_FOUND
-{
-    Text [ en-US ] = "The file $(FILE) doesn't exist." ;
-};
-
-String MSG_IOERR_PATH_NOT_FOUND
-{
-    Text [ en-US ] = "The path to file $(FILE) doesn't exist." ;
-};
-
-String MSG_IOERR_TOO_MANY_OPEN_FILES
-{
-    Text [ en-US ] = "The file $(FILE) could not be opened,\nbecause too many files are open.\nPlease close some files and try again." ;
-};
-
-String MSG_IOERR_ACCESS_DENIED
-{
-    Text [ en-US ] = "The file $(FILE) could not be opened due to missing access rights." ;
-};
-
-String MSG_IOERR_INVALID_ACCESS
-{
-    Text [ en-US ] = "The file $(FILE) could not be accessed." ;
-};
-
-String MSG_IOERR_INVALID_HANDLE
-{
-    Text [ en-US ] = "The file $(FILE) could not be opened due to an invalid file handle." ;
-};
-
-String MSG_IOERR_CANNOT_MAKE
-{
-    Text [ en-US ] = "The file $(FILE) could not be created." ;
-};
-
-String MSG_IOERR_SHARING
-{
-    Text [ en-US ] = "Error by shared access to $(FILE)." ;
-};
-
-String MSG_IOERR_INVALID_PARAMETER
-{
-    Text [ en-US ] = "" ;
-};
-
-String MSG_IOERR_GENERAL
-{
-    Text [ en-US ] = "General I/O error accessing $(FILE)." ;
-};
-
 String RID_FULLSCREENTOOLBOX
 {
     Text  = "" ;
@@ -499,41 +262,11 @@ ToolBox RID_FULLSCREENTOOLBOX
     };
 };
 
-String STR_ERR_NOTEMPLATE
-{
-    Text [ en-US ] = "The selected template has an incorrect format" ;
-};
-
-String STR_ERR_NOFILE
-{
-    Text [ en-US ] = "Can't open file $." ;
-};
-
 String STR_QUITAPP
 {
     Text [ en-US ] = "E~xit" ;
 };
 
-String STR_EXITANDRETURN
-{
-    Text [ en-US ] = "E~xit & return to " ;
-};
-
-String STR_EXTHELPSTATUS
-{
-    Text [ en-US ] = "Select a command or click to select a theme." ;
-};
-
-String STR_MAIL
-{
-    Text [ en-US ] = "Mail" ;
-};
-
-String STR_ADDRESS_NAME
-{
-    Text [ en-US ] = "Addresses" ;
-};
-
 String RID_STR_HELP
 {
     Text [ en-US ] = "Help" ;
@@ -544,11 +277,6 @@ String RID_STR_NOAUTOSTARTHELPAGENT
     Text [ en-US ] = "No automatic start at 'XX'" ;
 };
 
-String RID_STR_NOWELCOMESCREEN
-{
-    Text [ en-US ] = "Don't display tips" ;
-};
-
 String RID_HELPBAR
 {
     Text [ en-US ] = "Help Bar" ;
@@ -614,11 +342,6 @@ String RID_STR_HLPFILENOTEXIST
     Text [ en-US ] = "The help file for this topic is not installed." ;
 };
 
-String RID_STR_HLPAPPNOTSTARTED
-{
-    Text [ en-US ] = "The help system could not be started" ;
-};
-
  //----------------------------------------------------------------------------
 
 String RID_ENVTOOLBOX
@@ -626,292 +349,11 @@ String RID_ENVTOOLBOX
     Text [ en-US ] = "Function Bar" ;
 };
 
-ToolBox RID_ENVTOOLBOX
-{
-    HelpId = RID_ENVTOOLBOX ;
-    ButtonType = BUTTON_SYMBOL ;
-    LineSpacing = TRUE ;
-    Border = TRUE ;
-    Scroll = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Customize = TRUE ;
-    FloatingMode = FALSE ;
-    Hide = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Align = BOXALIGN_TOP ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_OPENURL ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NEWDOCDIRECT ;
-            DropDown = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NEWDOC ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OPENDOC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SAVEDOC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SAVEASDOC ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EDITDOC ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_DIRECTEXPORTDOCASPDF ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_PRINTDOCDIRECT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FAX ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_CUT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_COPY ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_PASTE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_UNDO ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_REDO ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_NAVIGATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_STYLE_DESIGNER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_HYPERLINK_DIALOG ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_WIN_FULLSCREEN ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_RECORDMACRO;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_GALLERY ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_AVMEDIA_PLAYER ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_CLOSEDOC;
-            Hide = TRUE;
-        };
-    };
-};
-
 String RID_SPECIALCONFIG_ERROR
 {
     Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ;
 };
 
-String STR_MEMINFO_HEADER
-{
-};
-
-String STR_MEMINFO_FOOTER
-{
-    Text = "</table>" ;
-};
-
-String STR_MEMINFO_OBJINFO
-{
-    Text = "<tr><td >$(VISIBLE)</td><td>$(CACHED)</td><td>$(EXPIRE)</td><td>$(JSDIRTY)</td><td>$(JSEXEC)</td><td>$(FORBID)</td><td>$(FACTORY)</td><td>$(URL)</td><td>$(ORIGURL)</td><td>$(POSTSTRING)</td></tr>" ;
-};
-
-String RID_PLUGIN
-{
-    Text [ en-US ] = "Enable plug-ins" ;
-};
-
-String STR_CORRUPT_INSTALLATION
-{
-    Text [ en-US ] = "Important program components could not be initialized correctly.\nPlease start the setup program with the option /Repair." ;
-};
-
-String IDS_SBERR_STOREREF
-{
-    Text [ en-US ] = "Reference will not be saved: " ;
-};
-
-String STR_KEY_CONFIG_DIR
-{
-    Text [ en-US ] = "Configuration" ;
-};
-String STR_KEY_WORK_PATH
-{
-    Text [ en-US ] = "My Documents" ;
-};
-String STR_KEY_GRAPHICS_PATH
-{
-    Text [ en-US ] = "Graphics" ;
-};
-String STR_KEY_BITMAP_PATH
-{
-    Text [ en-US ] = "Icons" ;
-};
-String STR_KEY_BASIC_PATH
-{
-    Text = "BASIC" ;
-};
-
-String STR_KEY_PALETTE_PATH
-{
-    Text [ en-US ] = "Palettes" ;
-};
-String STR_KEY_BACKUP_PATH
-{
-    Text [ en-US ] = "Backups" ;
-};
-String STR_KEY_MODULES_PATH
-{
-    Text [ en-US ] = "Modules" ;
-};
-String STR_KEY_TEMPLATE_PATH
-{
-    Text [ en-US ] = "Templates" ;
-};
-String STR_KEY_GLOSSARY_PATH
-{
-    Text [ en-US ] = "AutoText" ;
-};
-String STR_KEY_DICTIONARY_PATH
-{
-    Text [ en-US ] = "Dictionaries" ;
-};
-String STR_KEY_HELP_DIR
-{
-    Text [ en-US ] = "Help" ;
-};
-String STR_KEY_GALLERY_DIR
-{
-    Text [ en-US ] = "Gallery" ;
-};
-
-String STR_KEY_STORAGE_DIR
-{
-    Text [ en-US ] = "Message Storage" ;
-};
-String STR_KEY_TEMP_PATH
-{
-    Text [ en-US ] = "Temporary files" ;
-};
-String STR_KEY_PLUGINS_PATH
-{
-    Text [ en-US ] = "Plug-ins" ;
-};
-String STR_KEY_FAVORITES_DIR
-{
-    Text [ en-US ] = "Folder Bookmarks" ;
-};
-String STR_KEY_FILTER_PATH
-{
-    Text [ en-US ] = "Filters" ;
-};
-String STR_KEY_ADDINS_PATH
-{
-    Text [ en-US ] = "Add-ins" ;
-};
-String STR_KEY_USERCONFIG_PATH
-{
-    Text [ en-US ] = "User Configuration" ;
-};
-String STR_KEY_USERDICTIONARY_DIR
-{
-    Text [ en-US ] = "User-defined dictionaries" ;
-};
-String STR_KEY_AUTOCORRECT_DIR
-{
-    Text [ en-US ] = "AutoCorrect" ;
-};
-String STR_KEY_LINGUISTIC_DIR
-{
-    Text [ en-US ] = "Writing aids" ;
-};
 String STR_QUICKSTART_EXIT
 {
     Text [ en-US ] = "Exit Quickstarter" ;
@@ -986,17 +428,6 @@ String RID_SECURITY_WARNING_TITLE
     Text [ en-US ] = "Security Warning" ;
 };
 
-ErrorBox RID_INVALID_URL_MSG
-{
-    Buttons = WB_OK ;
-    Message [ en-US ] = "The URL is not valid." ;
-};
-
-String RID_INVALID_URL_TITLE
-{
-    Text = "%PRODUCTNAME %PRODUCTVERSION" ;
-};
-
 String RID_DESKTOP
 {
     Text = "%PRODUCTNAME" ;
@@ -1029,39 +460,37 @@ String RID_XMLSEC_DOCUMENTSIGNED
     Text [ en-US ] = " (Signed)" ;
 };
 
-Image IMG_MISSING_1
-{
-    ImageBitmap = Bitmap { File = "sc05539.bmp" ; };
-};
-
-Image IMG_MISSING_2
-{
-    ImageBitmap = Bitmap { File = "sc05700.bmp" ; };
-};
-
-Image IMG_MISSING_3
+String STR_STANDARD
 {
-    ImageBitmap = Bitmap { File = "sc06302.bmp" ; };
+    Text [ en-US ] = "Standard" ;
 };
 
-Image IMG_MISSING_4
+String RID_SVXSTR_FILELINK
 {
-    ImageBitmap = Bitmap { File = "sn064.bmp" ; };
+    Text [ en-US ] = "Document" ;
 };
 
-String RID_SVXSTR_FILELINK
+String STR_NONE
 {
-    Text [ en-US ] = "Document" ;
+    Text [ en-US ] = "- None -" ;
 };
 String RID_SVXSTR_GRAFIKLINK
 {
     Text [ en-US ] = "Graphic" ;
 };
+String STR_SFX_FILTERNAME_ALL
+{
+    Text [ en-US ] = "All files (*.*)" ;
+};
 String RID_SVXSTR_EDITGRFLINK
 {
     Text [ en-US ] = "Link graphics" ;
 };
-
+// i66948 used in project scripting
+String STR_ERRUNOEVENTBINDUNG
+{
+    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
+};
 String RID_SVXSTR_GRFILTER_OPENERROR
 {
     Text [ en-US ] = "Graphics file cannot be opened" ;
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 8d3c1215de..356135e3e6 100644..100755
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -61,7 +61,7 @@
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
@@ -70,17 +70,16 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "tplpitem.hxx"
-#include "minfitem.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "app.hrc"
 #include <sfx2/evntconf.hxx>
-#include <sfx2/macrconf.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include "appdata.hxx"
 #include "appbas.hxx"
-#include "sfxhelp.hxx"
-#include "basmgr.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/basmgr.hxx"
 #include "sorgitm.hxx"
 #include "appbaslib.hxx"
 #include <basic/basicmanagerrepository.hxx>
@@ -147,10 +146,6 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
 
 BasicManager* SfxApplication::GetBasicManager()
 {
-    if ( pAppData_Impl->nBasicCallLevel == 0 )
-        // sicherheitshalber
-        EnterBasicCall();
-
     return BasicManagerRepository::getApplicationBasicManager( true );
 }
 
@@ -179,33 +174,6 @@ StarBASIC* SfxApplication::GetBasic()
     return GetBasicManager()->GetLib(0);
 }
 
-//--------------------------------------------------------------------
-
-bool SfxApplication::IsInBasicCall() const
-{
-    return 0 != pAppData_Impl->nBasicCallLevel;
-}
-
-//--------------------------------------------------------------------
-
-void SfxApplication::EnterBasicCall()
-{
-    if ( 1 == ++pAppData_Impl->nBasicCallLevel )
-    {
-        DBG_TRACE( "SfxShellObject: BASIC-on-demand" );
-
-        // zuerst das BASIC laden
-        GetBasic();
-    }
-}
-
-//--------------------------------------------------------------------
-
-void SfxApplication::LeaveBasicCall()
-{
-    --pAppData_Impl->nBasicCallLevel;
-}
-
 //-------------------------------------------------------------------------
 void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 {
@@ -253,10 +221,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
             break;
         }
 
-        case SID_PLAYMACRO:
-            PlayMacro_Impl( rReq, GetBasic() );
-            break;
-
         case SID_OFFICE_PRIVATE_USE:
         case SID_OFFICE_COMMERCIAL_USE:
         {
@@ -300,27 +264,13 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 break;
 
             case SID_ATTR_UNDO_COUNT:
-                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< UINT16 >( SvtUndoOptions().GetUndoCount() ) ) );
+                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< sal_uInt16 >( SvtUndoOptions().GetUndoCount() ) ) );
                 break;
 
             case SID_UPDATE_VERSION:
                 rSet.Put( SfxUInt32Item( SID_UPDATE_VERSION, SUPD ) );
                 break;
 
-            case SID_BUILD_VERSION:
-            {
-                String aVersion = lcl_GetVersionString();
-                rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) );
-                break;
-            }
-
-            case SID_OFFICE_PRIVATE_USE:
-            case SID_OFFICE_COMMERCIAL_USE:
-            {
-                DBG_ASSERT( sal_False, "SfxApplication::PropState_Impl()\nSID_OFFICE_PRIVATE_USE & SID_OFFICE_COMMERCIAL_USE are obsolete!\n" );
-                break;
-            }
-
             case SID_OFFICE_CUSTOMERNUMBER:
             {
                 rSet.Put( SfxStringItem( nSID, SvtUserOptions().GetCustomerNumber() ) );
@@ -330,69 +280,4 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
     }
 }
 
-//--------------------------------------------------------------------
-void SfxApplication::MacroExec_Impl( SfxRequest& rReq )
-{
-    DBG_MEMTEST();
-    if ( SfxMacroConfig::IsMacroSlot( rReq.GetSlot() ) )
-    {
-        // SlotId referenzieren, damit nicht im Execute der Slot abgeschossen
-        // werden kann
-        GetMacroConfig()->RegisterSlotId(rReq.GetSlot());
-        SFX_REQUEST_ARG(rReq, pArgs, SfxStringItem,
-                        rReq.GetSlot(), sal_False);
-        String aArgs;
-        if( pArgs ) aArgs = pArgs->GetValue();
-        if ( GetMacroConfig()->ExecuteMacro(rReq.GetSlot(), aArgs ) )
-            rReq.Done();
-        GetMacroConfig()->ReleaseSlotId(rReq.GetSlot());
-    }
-}
-
-//--------------------------------------------------------------------
-void SfxApplication::MacroState_Impl( SfxItemSet& )
-{
-    DBG_MEMTEST();
-}
-
-//-------------------------------------------------------------------------
-
-void SfxApplication::PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBasic )
-{
-    EnterBasicCall();
-    sal_Bool bOK = sal_False;
-
-    // Makro und asynch-Flag
-    SFX_REQUEST_ARG(rReq,pMacro,SfxStringItem,SID_STATEMENT,sal_False);
-    SFX_REQUEST_ARG(rReq,pAsynch,SfxBoolItem,SID_ASYNCHRON,sal_False);
-
-    if ( pAsynch && pAsynch->GetValue() )
-    {
-        // asynchron ausf"uhren
-        GetDispatcher_Impl()->Execute( SID_PLAYMACRO, SFX_CALLMODE_ASYNCHRON, pMacro, 0L );
-        rReq.Done();
-    }
-    else if ( pMacro )
-    {
-        // Statement aufbereiten
-        DBG_ASSERT( pBasic, "no BASIC found" ) ;
-        String aStatement( '[' );
-        aStatement += pMacro->GetValue();
-        aStatement += ']';
-
-        // P"aventiv den Request abschlie\sen, da er ggf. zerst"ort wird
-        rReq.Done();
-        rReq.ReleaseArgs();
-
-        // Statement ausf"uhren
-        pBasic->Execute( aStatement );
-        bOK = 0 == SbxBase::GetError();
-        SbxBase::ResetError();
-    }
-
-    LeaveBasicCall();
-    rReq.SetReturnValue(SfxBoolItem(0,bOK));
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index 3867404596..3591cf6199 100644..100755
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -26,6 +26,9 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
 #include "appbaslib.hxx"
 
 #include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index d1e1595ec1..fb07edfc52 100644..100755
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -75,7 +75,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
@@ -85,10 +85,9 @@
 #include <sfx2/evntconf.hxx>
 #include "appdata.hxx"
 #include "workwin.hxx"
-#include <sfx2/macrconf.hxx>
 #include "helper.hxx"	// SfxContentHelper::...
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "shutdownicon.hxx"
 
 using namespace ::com::sun::star::uno;
@@ -168,13 +167,13 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
 
 //--------------------------------------------------------------------
 
-BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
+sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SfxItemPool &rPool = GetPool();
     String aTRUEStr('1');
 
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
     SvtHelpOptions aHelpOptions;
@@ -184,91 +183,91 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
                 case SID_ATTR_BUTTON_OUTSTYLE3D :
                     if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_OUTSTYLE3D ),
                               aMiscOptions.GetToolboxStyle() != TOOLBOX_STYLE_FLAT)))
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_BUTTON_BIGSIZE :
                 {
                     if( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_BIGSIZE ), aMiscOptions.AreCurrentSymbolsLarge() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 }
                 case SID_ATTR_BACKUP :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_BACKUP))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BACKUP ),aSaveOptions.IsBackup())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_PRETTYPRINTING:
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), aSaveOptions.IsPrettyPrinting())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_WARNALIENFORMAT:
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), aSaveOptions.IsWarnAlienFormat())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVE :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVE))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVE ), aSaveOptions.IsAutoSave())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVEPROMPT :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVEPROMPT))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_AUTOSAVEPROMPT ), aSaveOptions.IsAutoSavePrompt())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_AUTOSAVEMINUTE :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME))
-                            if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (UINT16)aSaveOptions.GetAutoSaveTime())))
-                                bRet = FALSE;
+                            if (!rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aSaveOptions.GetAutoSaveTime())))
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_DOCINFO :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_DOCINFO ), aSaveOptions.IsDocInfoSave())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_WORKINGSET :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEWORKINGSET))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_WORKINGSET ), aSaveOptions.IsSaveWorkingSet())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_SAVEDOCVIEW :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVEDOCVIEW))
                             if (!rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_SAVEDOCVIEW ), aSaveOptions.IsSaveDocView())))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_ATTR_METRIC :
@@ -276,37 +275,37 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_HELPBALLOONS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
                                aHelpOptions.IsExtendedHelp() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELPTIPS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPTIPS ),
                                aHelpOptions.IsHelpTips() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_AUTOHELPAGENT :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_AUTOHELPAGENT ),
                                aHelpOptions.IsHelpAgentAutoStartMode() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELPAGENT_TIMEOUT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ),
                                                  aHelpOptions.GetHelpAgentTimeoutPeriod() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_WELCOMESCREEN :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_ATTR_WELCOMESCREEN ),
                                aHelpOptions.IsWelcomeScreen() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     break;
                 case SID_HELP_STYLESHEET :
                     if(rSet.Put( SfxStringItem ( rPool.GetWhich( SID_HELP_STYLESHEET ),
                                aHelpOptions.GetHelpStyleSheet() ) ) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                 break;
                 case SID_ATTR_UNDO_COUNT :
                     if(rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_ATTR_UNDO_COUNT ),
-                                 (UINT16)aUndoOptions.GetUndoCount() ) ) )
-                        bRet = TRUE;
+                                 (sal_uInt16)aUndoOptions.GetUndoCount() ) ) )
+                        bRet = sal_True;
                     break;
                 case SID_ATTR_QUICKLAUNCHER :
                 {
@@ -314,74 +313,74 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     {
                         if ( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ),
                                                     ShutdownIcon::GetAutostart() ) ) )
-                            bRet = TRUE;
+                            bRet = sal_True;
                     }
                     else
                     {
                         rSet.DisableItem( rPool.GetWhich( SID_ATTR_QUICKLAUNCHER ) );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                     break;
                 }
                 case SID_SAVEREL_INET :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELINET))
                             if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_INET ), aSaveOptions.IsSaveRelINet() )))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_SAVEREL_FSYS :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSaveOptions.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS))
                             if (!rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_SAVEREL_FSYS ), aSaveOptions.IsSaveRelFSys() )))
-                                bRet = FALSE;
+                                bRet = sal_False;
                     }
                     break;
                 case SID_BASIC_ENABLED :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_BASICMODE))
                         {
-                            if ( !rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), sal::static_int_cast< UINT16 >(aSecurityOptions.GetBasicMode()))))
-                                bRet = FALSE;
+                            if ( !rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_BASIC_ENABLED ), sal::static_int_cast< sal_uInt16 >(aSecurityOptions.GetBasicMode()))))
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_INET_EXE_PLUGIN  :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_EXECUTEPLUGINS))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_INET_EXE_PLUGIN, aSecurityOptions.IsExecutePlugins() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_MACRO_WARNING :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_WARNING))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_MACRO_WARNING, aSecurityOptions.IsWarningEnabled() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_MACRO_CONFIRMATION :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_CONFIRMATION))
                         {
                             if ( !rSet.Put( SfxBoolItem( SID_MACRO_CONFIRMATION, aSecurityOptions.IsConfirmationEnabled() ) ) )
-                                bRet = FALSE;
+                                bRet = sal_False;
                         }
                     }
                     break;
                 case SID_SECURE_URL :
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                         if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS))
                         {
                             ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs();
@@ -395,7 +394,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                             if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL),
                                     &aList ) ) )
                             {
-                                bRet = FALSE;
+                                bRet = sal_False;
                             }
                             for( nURL=0; nURL<nCount; ++nURL )
                             {
@@ -413,31 +412,31 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_INET_PROXY_TYPE :
                 {
                     if( rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_INET_PROXY_TYPE ),
-                        (UINT16)aInetOptions.GetProxyType() )))
-                            bRet = TRUE;
+                        (sal_uInt16)aInetOptions.GetProxyType() )))
+                            bRet = sal_True;
                     break;
                 }
                 case SID_INET_HTTP_PROXY_NAME :
                 {
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_HTTP_PROXY_NAME ),
                         aInetOptions.GetProxyHttpName() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 }
                 case SID_INET_HTTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_HTTP_PROXY_PORT ),
                         aInetOptions.GetProxyHttpPort() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_FTP_PROXY_NAME :
                     if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_FTP_PROXY_NAME ),
                         aInetOptions.GetProxyFtpName() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_FTP_PROXY_PORT :
                     if ( rSet.Put( SfxInt32Item ( rPool.GetWhich(SID_INET_FTP_PROXY_PORT ),
                         aInetOptions.GetProxyFtpPort() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_INET_SECURITY_PROXY_NAME :
                 case SID_INET_SECURITY_PROXY_PORT :
@@ -448,7 +447,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                 case SID_INET_NOPROXY :
                     if( rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_NOPROXY),
                         aInetOptions.GetProxyNoProxy() )))
-                            bRet = TRUE;
+                            bRet = sal_True;
                     break;
                 case SID_ATTR_PATHNAME :
                 case SID_ATTR_PATHGROUP :
@@ -456,7 +455,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     SfxAllEnumItem aNames(rPool.GetWhich(SID_ATTR_PATHGROUP));
                     SfxAllEnumItem aValues(rPool.GetWhich(SID_ATTR_PATHNAME));
                     SvtPathOptions aPathCfg;
-                    for ( USHORT nProp = SvtPathOptions::PATH_ADDIN;
+                    for ( sal_uInt16 nProp = SvtPathOptions::PATH_ADDIN;
                           nProp <= SvtPathOptions::PATH_WORK; nProp++ )
                     {
                         const String aName( SfxResId( CONFIG_PATH_START + nProp ) );
@@ -491,7 +490,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     }
 
                     if ( rSet.Put(aNames) || rSet.Put(aValues) )
-                        bRet = TRUE;
+                        bRet = sal_True;
                 }
 
                 default:
@@ -510,7 +509,7 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
 }
 
 //--------------------------------------------------------------------
-BOOL SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const
+sal_Bool SfxApplication::IsSecureURL( const INetURLObject& rURL, const String* pReferer ) const
 {
     return SvtSecurityOptions().IsSecureURL( rURL.GetMainURL( INetURLObject::NO_DECODE ), *pReferer );
 }
@@ -520,7 +519,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
 {
     const SfxPoolItem *pItem = 0;
     SfxItemPool &rPool = GetPool();
-    BOOL bResetSession = FALSE;
+    sal_Bool bResetSession = sal_False;
 
     SvtSaveOptions aSaveOptions;
     SvtUndoOptions aUndoOptions;
@@ -529,18 +528,18 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     SvtPathOptions aPathOptions;
     SvtInetOptions aInetOptions;
     SvtMiscOptions aMiscOptions;
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        USHORT nOutStyle =
+        sal_uInt16 nOutStyle =
             ( (const SfxBoolItem *)pItem)->GetValue() ? 0 : TOOLBOX_STYLE_FLAT;
         aMiscOptions.SetToolboxStyle( nOutStyle );
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        BOOL bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
+        sal_Bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
         aMiscOptions.SetSymbolsSize(
             sal::static_int_cast< sal_Int16 >(
                 bBigSize ? SFX_SYMBOLS_SIZE_LARGE : SFX_SYMBOLS_SIZE_SMALL ) );
@@ -555,144 +554,144 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     }
 
     // Backup
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BACKUP), TRUE, &pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BACKUP), sal_True, &pItem) )
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetBackup( ( (const SfxBoolItem*)pItem )->GetValue() );
     }
 
     // PrettyPrinting
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_PRETTYPRINTING ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA( SfxBoolItem ), "BoolItem expected" );
         aSaveOptions.SetPrettyPrinting( static_cast< const SfxBoolItem*> ( pItem )->GetValue() );
     }
 
     // WarnAlienFormat
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ATTR_WARNALIENFORMAT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA( SfxBoolItem ), "BoolItem expected" );
         aSaveOptions.SetWarnAlienFormat( static_cast< const SfxBoolItem*> ( pItem )->GetValue() );
     }
 
     // AutoSave
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVE), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetAutoSave( ( (const SfxBoolItem*)pItem )->GetValue() );
     }
 
     // AutoSave-Propt
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetAutoSavePrompt(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // AutoSave-Time
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEMINUTE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEMINUTE), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
         aSaveOptions.SetAutoSaveTime(((const SfxUInt16Item *)pItem)->GetValue());
     }
 
     // DocInfo
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_DOCINFO), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_DOCINFO), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetDocInfoSave(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // offende Dokumente merken
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WORKINGSET), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveWorkingSet(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Fenster-Einstellung speichern
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_SAVEDOCVIEW), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveDocView(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Metric
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
     }
 
     // HelpBalloons
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetExtendedHelp(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // HelpTips
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetHelpTips(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // AutoHelpAgent
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOHELPAGENT ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOHELPAGENT ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetHelpAgentAutoStartMode( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // help agent timeout
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_HELPAGENT_TIMEOUT ), sal_True, &pItem ) )
     {
         DBG_ASSERT(pItem->ISA(SfxInt32Item), "Int32Item expected");
         aHelpOptions.SetHelpAgentTimeoutPeriod( ( (const SfxInt32Item*)pItem )->GetValue() );
     }
 
     // WelcomeScreen
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_WELCOMESCREEN ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aHelpOptions.SetWelcomeScreen( ((const SfxBoolItem *)pItem)->GetValue() );
     }
 
     // WelcomeScreen
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        BOOL bReset = ((const SfxBoolItem *)pItem)->GetValue();
+        sal_Bool bReset = ((const SfxBoolItem *)pItem)->GetValue();
         if ( bReset )
         {
             OSL_FAIL( "Not implemented, may be EOL!" );
         }                                                   }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
         aHelpOptions.SetHelpStyleSheet( ((const SfxStringItem *)pItem)->GetValue() );
     }
 
     // SaveRelINet
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_INET), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveRelINet(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // SaveRelFSys
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_FSYS), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_SAVEREL_FSYS), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
         aSaveOptions.SetSaveRelFSys(((const SfxBoolItem *)pItem)->GetValue());
     }
 
     // Undo-Count
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_UNDO_COUNT), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_UNDO_COUNT), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
-        USHORT nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
+        sal_uInt16 nUndoCount = ((const SfxUInt16Item*)pItem)->GetValue();
         aUndoOptions.SetUndoCount( nUndoCount );
 
         // um alle Undo-Manager zu erwischen: "uber alle Frames iterieren
@@ -705,12 +704,12 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
             pDispat->Flush();
 
             // "uber alle SfxShells auf dem Stack des Dispatchers iterieren
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             for ( SfxShell *pSh = pDispat->GetShell(nIdx);
                   pSh;
                   ++nIdx, pSh = pDispat->GetShell(nIdx) )
             {
-                SfxUndoManager *pShUndoMgr = pSh->GetUndoManager();
+                ::svl::IUndoManager *pShUndoMgr = pSh->GetUndoManager();
                 if ( pShUndoMgr )
                     pShUndoMgr->SetMaxUndoActionCount( nUndoCount );
             }
@@ -718,67 +717,67 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     }
 
     // Office autostart
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_QUICKLAUNCHER), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_QUICKLAUNCHER), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
-        ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() != FALSE );
+        ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() != sal_False );
     }
 
     // StarBasic Enable
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_BASIC_ENABLED, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_BASIC_ENABLED, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "SfxInt16Item expected");
         aSecurityOptions.SetBasicMode( (EBasicSecurityMode)( (const SfxUInt16Item*)pItem )->GetValue() );
     }
 
     // Execute PlugIns
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_EXE_PLUGIN, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_EXE_PLUGIN, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetExecutePlugins( ( (const SfxBoolItem *)pItem )->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem))
     {
         DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
         aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
         aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
         aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
         aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) )
     {
         DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
         aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
         aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
-        bResetSession = TRUE;
+        bResetSession = sal_True;
     }
 
     // Secure-Referers
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, sal_True, &pItem))
     {
         DELETEZ(pAppData_Impl->pSecureURLs);
 
@@ -793,30 +792,25 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         aSecurityOptions.SetSecureURLs( seqURLs );
     }
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_WARNING, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_WARNING, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetWarningEnabled( ( (const SfxBoolItem *)pItem )->GetValue() );
     }
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_CONFIRMATION, TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(SID_MACRO_CONFIRMATION, sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxBoolItem), "SfxBoolItem expected");
         aSecurityOptions.SetConfirmationEnabled( ( (const SfxBoolItem *)pItem )->GetValue() );
     }
 
     // EnableMetafilePrint
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), TRUE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), sal_True, &pItem ) )
     {
 #ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
         DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nsoffice.ini key \"MetafilPrint\" not supported any longer!\n");
 #endif
     }
 
-    // INet Session neu aufsetzen
-    if ( bResetSession )
-    {
-    }
-
     // geaenderte Daten speichern
     aInetOptions.flush();
 }
@@ -833,7 +827,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
     SfxAllItemSet aSendSet( rSet );
 
     // PathName
-    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_PATHNAME), TRUE, &pItem))
+    if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_PATHNAME), sal_True, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxAllEnumItem), "AllEnumItem expected");
         const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem;
@@ -841,7 +835,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
         String aNoChangeStr( ' ' );
         for( sal_uInt32 nPath=0; nPath<nCount; ++nPath )
         {
-            String sValue = pEnumItem->GetValueTextByPos((USHORT)nPath);
+            String sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath);
             if ( sValue != aNoChangeStr )
             {
                 switch( nPath )
@@ -927,11 +921,11 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
 
 // alle Dokumente speichern
 
-BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
+sal_Bool SfxApplication::SaveAll_Impl(sal_Bool bPrompt, sal_Bool bAutoSave)
 {
-    bAutoSave = FALSE; // functionality moved to new AutoRecovery Service!
+    bAutoSave = sal_False; // functionality moved to new AutoRecovery Service!
 
-    BOOL bFunc = TRUE;
+    sal_Bool bFunc = sal_True;
     short nRet;
 
     for ( SfxObjectShell *pDoc = SfxObjectShell::GetFirst();
@@ -959,11 +953,11 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
                     const SfxPoolItem *pPoolItem = pDoc->ExecuteSlot( aReq );
                     if ( !pPoolItem || !pPoolItem->ISA(SfxBoolItem) ||
                         !( (const SfxBoolItem*) pPoolItem )->GetValue() )
-                        bFunc = FALSE;
+                        bFunc = sal_False;
                 }
                 else if ( nRet == RET_CANCEL )
                 {
-                    bFunc = FALSE;
+                    bFunc = sal_False;
                     break;
                 }
                 else if ( nRet == RET_NO )
@@ -978,25 +972,9 @@ BOOL SfxApplication::SaveAll_Impl(BOOL bPrompt, BOOL bAutoSave)
 
 //--------------------------------------------------------------------
 
-SfxMacroConfig* SfxApplication::GetMacroConfig() const
-{
-    return SfxMacroConfig::GetOrCreate();
-}
-
-//--------------------------------------------------------------------
-SfxEventConfiguration* SfxApplication::GetEventConfig() const
-{
-    if (!pAppData_Impl->pEventConfig)
-        pAppData_Impl->pEventConfig = new SfxEventConfiguration;
-    return pAppData_Impl->pEventConfig;
-}
-
-//--------------------------------------------------------------------
-
 //--------------------------------------------------------------------
 void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
-
     SfxObjectShell *pDoc = rEventHint.GetObjShell();
     if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
         return;
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 18b885ddf5..b5bbc96550 100644..100755
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -59,7 +59,7 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
     if (!pAppData_Impl->pFactArr)
         pAppData_Impl->pFactArr = new SfxChildWinFactArr_Impl;
 
-    for (USHORT nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
+    for (sal_uInt16 nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pAppData_Impl->pFactArr)[nFactory]->nId)
         {
@@ -71,7 +71,7 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
         SfxChildWinFactory, pFact, pAppData_Impl->pFactArr->Count() );
 }
 
-void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nId,
+void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt16 nId,
         SfxChildWinContextFactory *pFact)
 {
     SfxChildWinFactArr_Impl *pFactories;
@@ -82,8 +82,8 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
         pFactories = pMod->GetChildWinFactories_Impl();
         if ( pFactories )
         {
-            USHORT nCount = pFactories->Count();
-            for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+            sal_uInt16 nCount = pFactories->Count();
+            for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
             {
                 SfxChildWinFactory *pFac = (*pFactories)[nFactory];
                 if ( nId == pFac->nId )
@@ -103,8 +103,8 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, USHORT nI
         DBG_ASSERT( pAppData_Impl->pFactArr, "Keine Factories!" );
 
         pFactories = pAppData_Impl->pFactArr;
-        USHORT nCount = pFactories->Count();
-        for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+        sal_uInt16 nCount = pFactories->Count();
+        for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
         {
             SfxChildWinFactory *pFac = (*pFactories)[nFactory];
             if ( nId == pFac->nId )
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 1814a691a4..0eb99fa902 100644..100755
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -56,7 +56,7 @@
 #include <sfx2/request.hxx>
 #include "referers.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include <sfx2/appuno.hxx>
 #include "imestatuswindow.hxx"
@@ -97,11 +97,9 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) :
         pTopFrames( new SfxFrameArr_Impl ),
         pInitLinkList(0),
         pMatcher( 0 ),
-        pLabelResMgr( 0 ),
         pAppDispatch(NULL),
         pTemplates( 0 ),
         pPool(0),
-        pEventConfig(0),
         pDisabledSlotList( 0 ),
         pSecureURLs(0),
         pSaveOptions( 0 ),
@@ -111,7 +109,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) :
         pTemplateCommon( 0 ),
         nDocModalMode(0),
         nAutoTabPageId(0),
-        nBasicCallLevel(0),
         nRescheduleLocks(0),
         nInReschedule(0),
         nAsynchronCalls(0),
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 1615c299c9..273452b924 100644..100755
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -39,6 +39,7 @@
 #include <sfx2/linkmgr.hxx>
 
 #include <tools/urlobj.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/pathoptions.hxx>
 
 #include <sfx2/app.hxx>
@@ -73,11 +74,11 @@ public:
     ImplDdeService( const String& rNm )
         : DdeService( rNm )
     {}
-    virtual BOOL MakeTopic( const String& );
+    virtual sal_Bool MakeTopic( const String& );
 
     virtual String	Topics();
 
-    virtual BOOL SysTopicExecute( const String* pStr );
+    virtual sal_Bool SysTopicExecute( const String* pStr );
 };
 
 class SfxDdeTriggerTopic_Impl : public DdeTopic
@@ -87,7 +88,7 @@ public:
     : DdeTopic( DEFINE_CONST_UNICODE("TRIGGER") )
     {}
 
-    virtual BOOL Execute( const String* );
+    virtual sal_Bool Execute( const String* );
 };
 
 class SfxDdeDocTopic_Impl : public DdeTopic
@@ -101,11 +102,11 @@ public:
         : DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell )
     {}
 
-    virtual DdeData* Get( ULONG );
-    virtual BOOL Put( const DdeData* );
-    virtual BOOL Execute( const String* );
-    virtual BOOL StartAdviseLoop();
-    virtual BOOL MakeItem( const String& rItem );
+    virtual DdeData* Get( sal_uIntPtr );
+    virtual sal_Bool Put( const DdeData* );
+    virtual sal_Bool Execute( const String* );
+    virtual sal_Bool StartAdviseLoop();
+    virtual sal_Bool MakeItem( const String& rItem );
 
 };
 
@@ -115,7 +116,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *)
 
 //========================================================================
 
-BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
+sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
                        const String &rCmd, const String &rEvent )
 
 /*	[Beschreibung]
@@ -143,7 +144,7 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
         {
             // in das ApplicationEvent-Format wandeln
             aData.Erase( aData.Len()-1, 1 );
-            for ( USHORT n = 0; n < aData.Len(); ++n )
+            for ( sal_uInt16 n = 0; n < aData.Len(); ++n )
             {
                 if ( aData.GetChar(n) == 0x0022 ) // " = 22h
                     for ( ; aData.GetChar(++n) != 0x0022 ; )
@@ -154,11 +155,11 @@ BOOL SfxAppEvent_Impl( ApplicationEvent &rAppEvent,
             aData.EraseAllChars( 0x0022 );
             ApplicationAddress aAddr;
             rAppEvent = ApplicationEvent( String(), aAddr, U2S(rEvent), aData );
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -188,11 +189,9 @@ long SfxApplication::DdeExecute
     else
     {
         // alle anderen per BASIC
-        EnterBasicCall();
         StarBASIC* pBasic = GetBasic();
-        DBG_ASSERT( pBasic, "Wo ist mein Basic???" );
+        ENSURE_OR_RETURN( pBasic, "where's my basic?", 0 );
         SbxVariable* pRet = pBasic->Execute( rCmd );
-        LeaveBasicCall();
         if( !pRet )
         {
             SbxBase::ResetError();
@@ -464,7 +463,7 @@ long SfxViewFrame::DdeSetData
 
 //========================================================================
 
-BOOL SfxApplication::InitializeDde()
+sal_Bool SfxApplication::InitializeDde()
 {
     DBG_ASSERT( !pAppData_Impl->pDdeService,
                 "Dde kann nicht mehrfach initialisiert werden" );
@@ -510,15 +509,15 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 
     // doppeltes Eintragen verhindern
     String sShellNm;
-    BOOL bFnd = FALSE;
-    for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
+    sal_Bool bFnd = sal_False;
+    for( sal_uInt16 n = pAppData_Impl->pDocTopics->Count(); n; )
         if( (*pAppData_Impl->pDocTopics)[ --n ]->pSh == pSh )
         {
             //	falls das Document unbenannt wurde, ist trotzdem ein
             //	neues Topics anzulegen!
             if( !bFnd )
             {
-                bFnd = TRUE;
+                bFnd = sal_True;
                 (sShellNm = pSh->GetTitle(SFX_TITLE_FULLNAME)).ToLowerAscii();
             }
             String sNm( (*pAppData_Impl->pDocTopics)[ n ]->GetName() );
@@ -540,7 +539,7 @@ void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
         return;
 
     SfxDdeDocTopic_Impl* pTopic;
-    for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
+    for( sal_uInt16 n = pAppData_Impl->pDocTopics->Count(); n; )
         if( ( pTopic = (*pAppData_Impl->pDocTopics)[ --n ])->pSh == pSh )
         {
             pAppData_Impl->pDdeService->RemoveTopic( *pTopic );
@@ -560,17 +559,17 @@ DdeService* SfxApplication::GetDdeService()
 
 //--------------------------------------------------------------------
 
-BOOL ImplDdeService::MakeTopic( const String& rNm )
+sal_Bool ImplDdeService::MakeTopic( const String& rNm )
 {
     // Workaround gegen Event nach unserem Main() unter OS/2
     // passierte wenn man beim Beenden aus dem OffMgr die App neu startet
     if ( !Application::IsInExecute() )
-        return FALSE;
+        return sal_False;
 
     // das Topic rNm wird gesucht, haben wir es ?
     // erstmal nur ueber die ObjectShells laufen und die mit dem
     // Namen heraussuchen:
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String sNm( rNm );
     sNm.ToLowerAscii();
     TypeId aType( TYPE(SfxObjectShell) );
@@ -582,7 +581,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
         if( sTmp == sNm )		// die wollen wir haben
         {
             SFX_APP()->AddDdeTopic( pShell );
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
         pShell = SfxObjectShell::GetNext( *pShell, &aType );
@@ -599,9 +598,9 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
 
             // dann versuche die Datei zu laden:
             SfxStringItem aName( SID_FILE_NAME, aFile.GetMainURL( INetURLObject::NO_DECODE ) );
-            SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, TRUE);
+            SfxBoolItem aNewView(SID_OPEN_NEW_VIEW, sal_True);
 
-            SfxBoolItem aSilent(SID_SILENT, TRUE);
+            SfxBoolItem aSilent(SID_SILENT, sal_True);
             SfxDispatcher* pDispatcher = SFX_APP()->GetDispatcher_Impl();
             const SfxPoolItem* pRet = pDispatcher->Execute( SID_OPENDOC,
                     SFX_CALLMODE_SYNCHRON,
@@ -614,7 +613,7 @@ BOOL ImplDdeService::MakeTopic( const String& rNm )
                     ->GetFrame()->GetObjectShell() ) )
             {
                 SFX_APP()->AddDdeTopic( pShell );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -644,20 +643,20 @@ String ImplDdeService::Topics()
     return sRet;
 }
 
-BOOL ImplDdeService::SysTopicExecute( const String* pStr )
+sal_Bool ImplDdeService::SysTopicExecute( const String* pStr )
 {
-    return (BOOL)SFX_APP()->DdeExecute( *pStr );
+    return (sal_Bool)SFX_APP()->DdeExecute( *pStr );
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxDdeTriggerTopic_Impl::Execute( const String* )
+sal_Bool SfxDdeTriggerTopic_Impl::Execute( const String* )
 {
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
-DdeData* SfxDdeDocTopic_Impl::Get( ULONG nFormat )
+DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat )
 {
     String sMimeType( SotExchange::GetFormatMimeType( nFormat ));
     ::com::sun::star::uno::Any aValue;
@@ -671,11 +670,11 @@ DdeData* SfxDdeDocTopic_Impl::Get( ULONG nFormat )
     return 0;
 }
 
-BOOL SfxDdeDocTopic_Impl::Put( const DdeData* pData )
+sal_Bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
 {
     aSeq = ::com::sun::star::uno::Sequence< sal_Int8 >(
                             (sal_Int8*)(const void*)*pData, (long)*pData );
-    BOOL bRet;
+    sal_Bool bRet;
     if( aSeq.getLength() )
     {
         ::com::sun::star::uno::Any aValue;
@@ -684,25 +683,25 @@ BOOL SfxDdeDocTopic_Impl::Put( const DdeData* pData )
         bRet = 0 != pSh->DdeSetData( GetCurItem(), sMimeType, aValue );
     }
     else
-        bRet = FALSE;
+        bRet = sal_False;
     return bRet;
 }
 
-BOOL SfxDdeDocTopic_Impl::Execute( const String* pStr )
+sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr )
 {
     long nRet = pStr ? pSh->DdeExecute( *pStr ) : 0;
     return 0 != nRet;
 }
 
-BOOL SfxDdeDocTopic_Impl::MakeItem( const String& rItem )
+sal_Bool SfxDdeDocTopic_Impl::MakeItem( const String& rItem )
 {
     AddItem( DdeItem( rItem ) );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
+sal_Bool SfxDdeDocTopic_Impl::StartAdviseLoop()
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ::sfx2::SvLinkSource* pNewObj = pSh->DdeCreateLinkSource( GetCurItem() );
     if( pNewObj )
     {
@@ -710,7 +709,7 @@ BOOL SfxDdeDocTopic_Impl::StartAdviseLoop()
         String sNm, sTmp( Application::GetAppName() );
         ::sfx2::MakeLnkName( sNm, &sTmp, pSh->GetTitle(SFX_TITLE_FULLNAME), GetCurItem() );
         new ::sfx2::SvBaseLink( sNm, OBJECT_DDE_EXTERN, pNewObj );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2d3f3ecc87..52df0308ff 100644..100755
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -69,18 +69,18 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/evntconf.hxx>
 #include "intro.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
-#include "sfxhelp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
 #include <sfx2/fcontnr.hxx>
 #include "helper.hxx"	// SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
+#include <tools/svlibrary.hxx>
 
 #ifdef UNX
 #define stricmp(a,b) strcmp(a,b)
@@ -207,10 +207,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
     {
         bDetermineFunction = true;
 
-        String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-        sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
-
-        rtl::OUString aLibName( sLibName );
+        static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );
         oslModule handleMod = osl_loadModuleRelative(
             &thisModule, aLibName.pData, 0 );
 
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 4c570c5d23..e3f2010d2e 100644..100755
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -51,7 +51,7 @@
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/viewsh.hxx>
 #include "intro.hxx"
@@ -114,21 +114,6 @@ void SfxApplication::Init
     <SfxApplication::OpenClients()>
 */
 {
-#ifdef DDE_AVAILABLE
-#ifndef DBG_UTIL
-    InitializeDde();
-#else
-    if( !InitializeDde() )
-    {
-        ByteString aStr( "Kein DDE-Service moeglich. Fehler: " );
-        if( GetDdeService() )
-            aStr += GetDdeService()->GetError();
-        else
-            aStr += '?';
-        DBG_ASSERT( sal_False, aStr.GetBuffer() )
-    }
-#endif
-#endif
 }
 
 //--------------------------------------------------------------------
@@ -158,35 +143,6 @@ void SfxApplication::PreInit( )
 {
 }
 
-//---------------------------------------------------------------------------
-bool SfxApplication::InitLabelResMgr( const char* _pLabelPrefix, bool _bException )
-{
-    bool bRet = false;
-    // Label-DLL mit diversen Resourcen fuer OEM-Ver. etc. (Intro, Titel, About)
-    DBG_ASSERT( _pLabelPrefix, "Wrong initialisation!" );
-    if ( _pLabelPrefix )
-    {
-        // versuchen, die Label-DLL zu erzeugen
-        pAppData_Impl->pLabelResMgr = CreateResManager( _pLabelPrefix );
-
-        // keine separate Label-DLL vorhanden?
-        if ( !pAppData_Impl->pLabelResMgr )
-        {
-            if ( _bException )
-            {
-                // maybe corrupted installation
-                throw (::com::sun::star::uno::RuntimeException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("iso resource could not be loaded by SfxApplication")),
-                    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()));
-            }
-        }
-        else
-            bRet = true;
-    }
-
-    return bRet;
-}
-
 void SfxApplication::Main( )
 {
 }
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index a6f8121883..98f1797632 100644..100755
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -48,7 +48,6 @@
 #include <osl/mutex.hxx>
 #include <unotools/configmgr.hxx>
 #include <com/sun/star/frame/XDesktop.hpp>
-
 #include <unotools/ucbstreamhelper.hxx>
 #include <framework/menuconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
@@ -56,13 +55,14 @@
 #include <unotools/bootstrap.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <osl/file.hxx>
+#include <rtl/bootstrap.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/docfile.hxx>
@@ -152,38 +152,6 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP))
 }
 
 //--------------------------------------------------------------------
-
-void SfxApplication::InitializeDisplayName_Impl()
-{
-    SfxAppData_Impl* pAppData = Get_Impl();
-    if ( !pAppData->pLabelResMgr )
-        return;
-
-    String aTitle = Application::GetDisplayName();
-    if ( !aTitle.Len() )
-    {
-        osl::ClearableMutexGuard aGuard( osl::Mutex::getGlobalMutex() );
-
-        // load application title
-        aTitle = String( ResId( RID_APPTITLE, *pAppData->pLabelResMgr ) );
-        // merge version into title
-        aTitle.SearchAndReplaceAscii( "$(VER)", String() /*aVersion*/ );
-
-        aGuard.clear();
-
-#ifdef DBG_UTIL
-        ::rtl::OUString	aDefault;
-        aTitle += DEFINE_CONST_UNICODE(" [");
-
-        String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
-        aTitle += aVerId;
-        aTitle += ']';
-#endif
-        Application::SetDisplayName( aTitle );
-    }
-}
-
-//--------------------------------------------------------------------
 SfxProgress* SfxApplication::GetProgress() const
 
 /*  [Beschreibung]
@@ -222,8 +190,8 @@ SvUShorts* SfxApplication::GetDisabledSlotList_Impl()
             pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ );
         }
 
-        BOOL bSlotsEnabled = SvtInternalOptions().SlotCFGEnabled();
-        BOOL bSlots = ( pStream && !pStream->GetError() );
+        sal_Bool bSlotsEnabled = SvtInternalOptions().SlotCFGEnabled();
+        sal_Bool bSlots = ( pStream && !pStream->GetError() );
         if( bSlots && bSlotsEnabled )
         {
             // SlotDatei einlesen
@@ -290,7 +258,7 @@ SfxModule* SfxApplication::GetModule_Impl()
 {
     SfxModule* pModule = SfxModule::GetActiveModule();
     if ( !pModule )
-        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( FALSE ) );
+        pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( sal_False ) );
     if( pModule )
         return pModule;
     else
@@ -312,8 +280,76 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind
 }
 
 SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppData_Impl->pResMgr; }
-BOOL  SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
+sal_Bool  SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
 SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; }
 SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; }
 
+static bool impl_loadBitmap(
+    const rtl::OUString &rPath, const rtl::OUString &rBmpFileName,
+    Image &rLogo )
+{
+    rtl::OUString uri( rPath );
+    rtl::Bootstrap::expandMacros( uri );
+    INetURLObject aObj( uri );
+    aObj.insertName( rBmpFileName );
+    SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
+    if ( !aStrm.GetError() )
+    {
+        // Use graphic class to also support more graphic formats (bmp,png,...)
+        Graphic aGraphic;
+
+        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+        pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
+
+        // Default case, we load the intro bitmap from a seperate file
+        // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
+        BitmapEx aBmp = aGraphic.GetBitmapEx();
+        rLogo = Image( aBmp );
+        return true;
+    }
+    return false;
+}
+
+/** loads the application logo as used in the about dialog and impress slideshow pause screen */
+Image SfxApplication::GetApplicationLogo()
+{
+    Image aAppLogo;
+
+    rtl::OUString aAbouts;
+    bool bLoaded = false;
+    sal_Int32 nIndex = 0;
+    do
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+            aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
+    }
+    while ( !bLoaded && ( nIndex >= 0 ) );
+
+    // fallback to "about.bmp"
+    if ( !bLoaded )
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+    }
+
+    if ( !bLoaded )
+    {
+        bLoaded = impl_loadBitmap(
+            rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+            rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
+        if ( !bLoaded )
+            bLoaded = impl_loadBitmap(
+                rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
+                rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
+    }
+
+    return aAppLogo;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 97b3c37318..2bd2dff8e9 100644..100755
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -99,7 +99,7 @@
 #include <sfx2/passwd.hxx>
 #include "referers.hxx"
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include "app.hrc"
 #include <sfx2/viewfrm.hxx>
@@ -131,20 +131,20 @@ namespace css = ::com::sun::star;
 class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
 {
 public:
-    BOOL    bFinished;
-    BOOL    bSuccess;
+    sal_Bool    bFinished;
+    sal_Bool    bSuccess;
     virtual void SAL_CALL   dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException);
     virtual void SAL_CALL   disposing( const EventObject& Source ) throw(RuntimeException);
                             SfxOpenDocStatusListener_Impl()
-                                : bFinished( FALSE )
-                                , bSuccess( FALSE )
+                                : bFinished( sal_False )
+                                , bSuccess( sal_False )
                             {}
 };
 
 void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException)
 {
     bSuccess = ( aEvent.State == DispatchResultState::SUCCESS );
-    bFinished = TRUE;
+    bFinished = sal_True;
 }
 
 void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException)
@@ -154,9 +154,9 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) thr
 SfxObjectShellRef SfxApplication::DocAlreadyLoaded
 (
     const String&   rName,      // Name des Dokuments mit Pfad
-    BOOL            bSilent,    // TRUE: nicht nach neuer Sicht fragen
-    BOOL            bActivate,   // soll bestehende Sicht aktiviert werden
-    BOOL            bForbidVisible,
+    sal_Bool            bSilent,    // sal_True: nicht nach neuer Sicht fragen
+    sal_Bool            bActivate,   // soll bestehende Sicht aktiviert werden
+    sal_Bool            bForbidVisible,
     const String*   pPostStr
 )
 
@@ -184,7 +184,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
         // dann bei den normal geoeffneten Docs
         if ( !xDoc.Is() )
         {
-            xDoc = SfxObjectShell::GetFirst( 0, FALSE ); // auch hidden Docs
+            xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // auch hidden Docs
             while( xDoc.Is() )
             {
                 if ( xDoc->GetMedium() &&
@@ -194,13 +194,13 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
                     // Vergleiche anhand der URLs
                     INetURLObject aUrl( xDoc->GetMedium()->GetName() );
                     if ( !aUrl.HasError() && aUrl == aUrlToFind &&
-                         (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, TRUE )) &&
+                         (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, sal_True )) &&
                          !xDoc->IsLoading())
                     {
                             break;
                     }
                 }
-                xDoc = SfxObjectShell::GetNext( *xDoc, 0, FALSE );
+                xDoc = SfxObjectShell::GetNext( *xDoc, 0, sal_False );
             }
         }
     }
@@ -222,7 +222,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
                 InfoBox( 0, SfxResId(RID_DOCALREADYLOADED_DLG)).Execute();
             if ( bActivate )
             {
-                pFrame->MakeActive_Impl( TRUE );
+                pFrame->MakeActive_Impl( sal_True );
             }
         }
     }
@@ -240,8 +240,7 @@ void SetTemplate_Impl( const String &rFileName,
     pDoc->ResetFromTemplate( rLongName, rFileName );
 }
 
-//--------------------------------------------------------------------
-
+//====================================================================
 class SfxDocPasswordVerifier : public ::comphelper::IDocPasswordVerifier
 {
 public:
@@ -249,21 +248,33 @@ public:
                             mxStorage( rxStorage ) {}
 
     virtual ::comphelper::DocPasswordVerifierResult
-                        verifyPassword( const ::rtl::OUString& rPassword );
+                        verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData );
+    virtual ::comphelper::DocPasswordVerifierResult
+                        verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData );
+
 
 private:
     Reference< embed::XStorage > mxStorage;
 };
 
-::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const ::rtl::OUString& rPassword )
+//--------------------------------------------------------------------
+::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData )
+{
+    o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( rPassword );
+    return verifyEncryptionData( o_rEncryptionData );
+}
+
+
+//--------------------------------------------------------------------
+::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData )
 {
     ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
     try
     {
-        // check the password
-        // if the password correct is the stream will be opened successfuly
+        // check the encryption data
+        // if the data correct is the stream will be opened successfuly
         // and immediatelly closed
-        ::comphelper::OStorageHelper::SetCommonStoragePassword( mxStorage, rPassword );
+        ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( mxStorage, rEncryptionData );
 
         mxStorage->openStreamElement(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "content.xml" ) ),
@@ -284,6 +295,8 @@ private:
     return eResult;
 }
 
+//====================================================================
+
 //--------------------------------------------------------------------
 
 sal_uInt32 CheckPasswd_Impl
@@ -302,7 +315,7 @@ sal_uInt32 CheckPasswd_Impl
     des Mediums gesetzt; das Set wird, wenn nicht vorhanden, erzeugt.
 */
 {
-    ULONG nRet = ERRCODE_NONE;
+    sal_uIntPtr nRet = ERRCODE_NONE;
 
     if( ( !pFile->GetFilter() || pFile->IsStorage() ) )
     {
@@ -338,14 +351,28 @@ sal_uInt32 CheckPasswd_Impl
                         if( xInteractionHandler.is() )
                         {
                             // use the comphelper password helper to request a password
+                            ::rtl::OUString aPassword;
+                            SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False);
+                            if ( pPasswordItem )
+                                aPassword = pPasswordItem->GetValue();
+
+                            uno::Sequence< beans::NamedValue > aEncryptionData;
+                            SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False);
+                            if ( pEncryptionDataItem )
+                                pEncryptionDataItem->GetValue() >>= aEncryptionData;
+
                             ::rtl::OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+
                             SfxDocPasswordVerifier aVerifier( xStorage );
-                            ::rtl::OUString aPassword = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
-                                aVerifier, ::rtl::OUString(), xInteractionHandler, aDocumentName, comphelper::DocPasswordRequestType_STANDARD );
+                            aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
+                                aVerifier, aEncryptionData, aPassword, xInteractionHandler, aDocumentName, comphelper::DocPasswordRequestType_STANDARD );
+
+                            pSet->ClearItem( SID_PASSWORD );
+                            pSet->ClearItem( SID_ENCRYPTIONDATA );
 
-                            if ( aPassword.getLength() > 0 )
+                            if ( aEncryptionData.getLength() > 0 )
                             {
-                                pSet->Put( SfxStringItem( SID_PASSWORD, aPassword ) );
+                                pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) );
 
                                 try
                                 {
@@ -379,10 +406,10 @@ sal_uInt32 CheckPasswd_Impl
 //--------------------------------------------------------------------
 
 
-ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, BOOL bCopy, SfxItemSet* pSet )
+sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, sal_Bool bCopy, SfxItemSet* pSet )
 {
     const SfxFilter* pFilter = NULL;
-    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ), FALSE );
+    SfxMedium aMedium( rFileName,  ( STREAM_READ | STREAM_SHARE_DENYNONE ), sal_False );
 
     if ( !aMedium.GetStorage( sal_True ).is() )
         aMedium.GetInStream();
@@ -393,8 +420,8 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         return aMedium.GetErrorCode();
     }
 
-    aMedium.UseInteractionHandler( TRUE );
-    ULONG nErr = GetFilterMatcher().GuessFilter( aMedium,&pFilter,SFX_FILTER_TEMPLATE, 0 );
+    aMedium.UseInteractionHandler( sal_True );
+    sal_uIntPtr nErr = GetFilterMatcher().GuessFilter( aMedium,&pFilter,SFX_FILTER_TEMPLATE, 0 );
     if ( 0 != nErr)
     {
         delete pSet;
@@ -414,7 +441,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         SfxStringItem aName( SID_FILE_NAME, rFileName );
         SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
         SfxStringItem aFlags( SID_OPTIONS, String::CreateFromAscii("T") );
-        SfxBoolItem aHidden( SID_HIDDEN, TRUE );
+        SfxBoolItem aHidden( SID_HIDDEN, sal_True );
         const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L );
         const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet );
         if ( pObj )
@@ -438,7 +465,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         if ( !xDoc.Is() )
             xDoc = SfxObjectShell::CreateObject( pFilter->GetServiceName() );
 
-        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE, pFilter, pSet );
+        SfxMedium *pMedium = new SfxMedium( rFileName, STREAM_STD_READ, sal_False, pFilter, pSet );
         if(!xDoc->DoLoad(pMedium))
         {
             ErrCode nErrCode = xDoc->GetErrorCode();
@@ -479,7 +506,7 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
 
     xDoc->SetNoName();
     xDoc->InvalidateName();
-    xDoc->SetModified(FALSE);
+    xDoc->SetModified(sal_False);
     xDoc->ResetError();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >  xModel ( xDoc->GetModel(), ::com::sun::star::uno::UNO_QUERY );
@@ -507,7 +534,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
 
-    SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, FALSE);
+    SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
     String aFactName;
     if ( pFactoryItem )
         aFactName = pFactoryItem->GetValue();
@@ -523,10 +550,10 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
     aReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii( "_default" ) ) );
 
     // TODO/LATER: Should the other arguments be transfered as well?
-    SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, FALSE);
+    SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False);
     if ( pDefaultPathItem )
         aReq.AppendItem( *pDefaultPathItem );
-    SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, FALSE);
+    SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, sal_False);
     if ( pDefaultNameItem )
         aReq.AppendItem( *pDefaultNameItem );
 
@@ -543,14 +570,14 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     DBG_MEMTEST();
 
     // keine Parameter vom BASIC nur Factory angegeben?
-    SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE);
-    SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
-    SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
+    SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
+    SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
 
     SfxObjectShellLock xDoc;
 
     String  aTemplateRegion, aTemplateName, aTemplateFileName;
-    BOOL    bDirect = FALSE; // "uber FileName anstelle Region/Template
+    sal_Bool    bDirect = sal_False; // "uber FileName anstelle Region/Template
     SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
     if ( !pTemplNameItem && !pTemplFileNameItem )
     {
@@ -591,13 +618,13 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
         if ( pTemplFileNameItem )
         {
             aTemplateFileName = pTemplFileNameItem->GetValue();
-            bDirect = TRUE;
+            bDirect = sal_True;
         }
     }
 
-    ULONG lErr = 0;
+    sal_uIntPtr lErr = 0;
     SfxItemSet* pSet = new SfxAllItemSet( GetPool() );
-    pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+    pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
     if ( !bDirect )
     {
         SfxDocumentTemplates aTmpFac;
@@ -613,7 +640,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
 
     if ( lErr != ERRCODE_NONE )
     {
-        ULONG lFatalErr = ERRCODE_TOERROR(lErr);
+        sal_uIntPtr lFatalErr = ERRCODE_TOERROR(lErr);
         if ( lFatalErr )
             ErrorHandler::HandleError(lErr);
     }
@@ -673,8 +700,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
 
-    USHORT nSID = rReq.GetSlot();
-    SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+    sal_uInt16 nSID = rReq.GetSlot();
+    SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
     if ( pFileNameItem )
     {
         String aCommand( pFileNameItem->GetValue() );
@@ -688,7 +715,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             sal_Int32 nIndex = aCommand.SearchAscii("slot:");
             if ( !nIndex )
             {
-                USHORT nSlotId = (USHORT) String( aCommand, 5, aCommand.Len()-5 ).ToInt32();
+                sal_uInt16 nSlotId = (sal_uInt16) String( aCommand, 5, aCommand.Len()-5 ).ToInt32();
                 if ( nSlotId == SID_OPENDOC )
                     pFileNameItem = NULL;
             }
@@ -702,7 +729,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         String aFilter;
         SfxItemSet* pSet = NULL;
         String aPath;
-        SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, FALSE );
+        SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, sal_False );
         if ( pFolderNameItem )
             aPath = pFolderNameItem->GetValue();
         else if ( nSID == SID_OPENTEMPLATE )
@@ -716,24 +743,24 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         }
 
         sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG;
-        SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, FALSE );
+        SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, sal_False );
         if ( pSystemDialogItem )
             nDialog = pSystemDialogItem->GetValue() ? SFX2_IMPL_DIALOG_SYSTEM : SFX2_IMPL_DIALOG_OOO;
 
         String sStandardDir;
 
-        SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, FALSE );
+        SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, sal_False );
         if ( pStandardDirItem )
             sStandardDir = pStandardDirItem->GetValue();
 
         ::com::sun::star::uno::Sequence< ::rtl::OUString >	aBlackList;
 
-        SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, FALSE );
+        SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, sal_False );
         if ( pBlackListItem )
             pBlackListItem->GetStringList( aBlackList );
 
 
-        ULONG nErr = sfx2::FileOpenDialog_Impl(
+        sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl(
                 WB_OPEN | SFXWB_MULTISELECTION | SFXWB_SHOWVERSIONS, String(), pURLList, aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
 
         if ( nErr == ERRCODE_ABORT )
@@ -752,7 +779,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( pURLList->Count() )
         {
             if ( nSID == SID_OPENTEMPLATE )
-                rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
+                rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) );
 
             // This helper wraps an existing (or may new created InteractionHandler)
             // intercept all incoming interactions and provide usefull informations
@@ -763,7 +790,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             css::uno::Reference< css::task::XInteractionHandler >     xWrappedHandler;
 
             // wrap existing handler or create new UUI handler
-            SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
+            SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
             if (pInteractionItem)
             {
                 pInteractionItem->GetValue() >>= xWrappedHandler;
@@ -780,7 +807,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             ::framework::PreventDuplicateInteraction::InteractionInfo aRule        (aInteraction, 1);
             pHandler->addInteractionRule(aRule);
 
-            for ( USHORT i = 0; i < pURLList->Count(); ++i )
+            for ( sal_uInt16 i = 0; i < pURLList->Count(); ++i )
             {
                 String aURL = *(pURLList->GetObject(i));
                 rReq.RemoveItem( SID_FILE_NAME );
@@ -826,7 +853,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         // return;
     }
 
-    BOOL bHyperlinkUsed = FALSE;
+    sal_Bool bHyperlinkUsed = sal_False;
 
     if ( SID_OPENURL == nSID )
     {
@@ -836,7 +863,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     }
     else if ( nSID == SID_OPENTEMPLATE )
     {
-        rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, FALSE ) );
+        rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) );
     }
     // pass URL to OS by using ShellExecuter or open it internal
     // if it seams to be an own format.
@@ -849,28 +876,28 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     {
         rReq.SetSlot( SID_OPENDOC );
         nSID = SID_OPENDOC;
-        bHyperlinkUsed = TRUE;
+        bHyperlinkUsed = sal_True;
     }
 
     // no else here! It's optional ...
     if (!bHyperlinkUsed)
     {
-        SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, FALSE);
+        SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, sal_False);
         if ( pHyperLinkUsedItem )
             bHyperlinkUsed = pHyperLinkUsedItem->GetValue();
         // no "official" item, so remove it from ItemSet before using UNO-API
         rReq.RemoveItem( SID_BROWSE );
     }
 
-    SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, FALSE );
+    SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, sal_False );
     String aFileName = pFileName->GetValue();
 
     String aReferer;
-    SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, FALSE );
+    SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, sal_False );
     if ( pRefererItem )
         aReferer = pRefererItem->GetValue();
 
-    SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, FALSE);
+    SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, sal_False);
     if ( pFileFlagsItem )
     {
         String aFileFlags = pFileFlagsItem->GetValue();
@@ -878,25 +905,25 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0054 ) )               // T = 54h
         {
             rReq.RemoveItem( SID_TEMPLATE );
-            rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0048 ) )               // H = 48h
         {
             rReq.RemoveItem( SID_HIDDEN );
-            rReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0052 ) )               // R = 52h
         {
             rReq.RemoveItem( SID_DOC_READONLY );
-            rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
         }
 
         if ( STRING_NOTFOUND != aFileFlags.Search( 0x0042 ) )               // B = 42h
         {
             rReq.RemoveItem( SID_PREVIEW );
-            rReq.AppendItem( SfxBoolItem( SID_PREVIEW, TRUE ) );
+            rReq.AppendItem( SfxBoolItem( SID_PREVIEW, sal_True ) );
         }
 
         rReq.RemoveItem( SID_OPTIONS );
@@ -1032,7 +1059,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
                         if ( !bFound )
                         {
-                            BOOL bLoadInternal = FALSE;
+                            sal_Bool bLoadInternal = sal_False;
 
                             // security reservation: => we have to check the referer before executing
                             if (SFX_APP()->IsSecureURL(rtl::OUString(), &aReferer))
@@ -1062,7 +1089,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                                     {
                                         rReq.RemoveItem( SID_TARGETNAME );
                                         rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_default") ) );
-                                        bLoadInternal = TRUE;
+                                        bLoadInternal = sal_True;
                                     }
                                 }
                             }
@@ -1097,13 +1124,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     SfxFrame* pTargetFrame = NULL;
     Reference< XFrame > xTargetFrame;
 
-    SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False);
     if ( pFrameItem )
         pTargetFrame = pFrameItem->GetFrame();
 
     if ( !pTargetFrame )
     {
-        SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE);
+        SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False);
         if ( pUnoFrameItem )
             xTargetFrame = pUnoFrameItem->GetFrame();
     }
@@ -1112,7 +1139,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         pTargetFrame = &SfxViewFrame::Current()->GetFrame();
 
     // check if caller has set a callback
-    SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, FALSE );
+    SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False );
 
     // remove from Itemset, because it confuses the parameter transformation
     if ( pLinkItem )
@@ -1121,20 +1148,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     rReq.RemoveItem( SID_DONELINK );
 
     // check if the view must be hidden
-    BOOL bHidden = FALSE;
-    SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, FALSE);
+    sal_Bool bHidden = sal_False;
+    SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, sal_False);
     if ( pHidItem )
         bHidden = pHidItem->GetValue();
 
     // This request is a UI call. We have to set the right values inside the MediaDescriptor
     // for: InteractionHandler, StatusIndicator, MacroExecutionMode and DocTemplate.
     // But we have to look for already existing values or for real hidden requests.
-    SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, FALSE);
+    SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, sal_False);
     if (!bHidden && ( !pPreviewItem || !pPreviewItem->GetValue() ) )
     {
-        SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
-        SFX_REQUEST_ARG(rReq, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , FALSE);
-        SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , FALSE);
+        SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
+        SFX_REQUEST_ARG(rReq, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , sal_False);
+        SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , sal_False);
 
         if (!pInteractionItem)
         {
@@ -1150,12 +1177,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
     // extract target name
     ::rtl::OUString aTarget;
-    SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
+    SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False);
     if ( pTargetItem )
         aTarget = pTargetItem->GetValue();
     else
     {
-        SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, FALSE );
+        SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False );
         if ( pNewViewItem && pNewViewItem->GetValue() )
             aTarget = String::CreateFromAscii("_blank" );
     }
@@ -1182,7 +1209,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         }
 
         // make URL ready
-        SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, sal_False );
         aFileName = pURLItem->GetValue();
         if( aFileName.Len() && aFileName.GetChar(0) == '#' ) // Mark without URL
         {
@@ -1242,7 +1269,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     {
         // try to find the SfxFrame for the controller
         SfxFrame* pCntrFrame = NULL;
-        for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, FALSE ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, FALSE ) )
+        for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, sal_False ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, sal_False ) )
         {
             if ( pShell->GetController() == xController )
             {
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index c44cd04706..ac61a62b90 100644..100755
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -31,9 +31,6 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbstar.hxx>
 
-#ifdef WIN
-#define _TL_LANG_SPECIAL
-#endif
 #include <svl/svdde.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
@@ -43,15 +40,15 @@
 
 #include "app.hrc"
 #include <sfx2/app.hxx>
+#include <sfx2/evntconf.hxx>
 #include <sfx2/unoctitm.hxx>
 #include "appdata.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
-#include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/msgpool.hxx>
@@ -71,9 +68,9 @@
 using ::basic::BasicManagerRepository;
 
 //===================================================================
-BOOL SfxApplication::QueryExit_Impl()
+sal_Bool SfxApplication::QueryExit_Impl()
 {
-    BOOL bQuit = TRUE;
+    sal_Bool bQuit = sal_True;
 
     // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben?
     if ( !bQuit )
@@ -82,10 +79,10 @@ BOOL SfxApplication::QueryExit_Impl()
         InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) );
         aInfoBox.Execute();
         DBG_TRACE( "QueryExit => FALSE (in use)" );
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -104,7 +101,7 @@ void SfxApplication::Deinitialize()
 
     SaveBasicAndDialogContainer();
 
-    pAppData_Impl->bDowning = TRUE; // wegen Timer aus DecAliveCount und QueryExit
+    pAppData_Impl->bDowning = sal_True; // wegen Timer aus DecAliveCount und QueryExit
 
     DELETEZ( pAppData_Impl->pTemplates );
 
@@ -112,15 +109,15 @@ void SfxApplication::Deinitialize()
     // this method. Therefore this call makes no sense and is the source of
     // some stack traces, which we don't understand.
     // For more information see:
-    pAppData_Impl->bDowning = FALSE;
+    pAppData_Impl->bDowning = sal_False;
     DBG_ASSERT( !SfxViewFrame::GetFirst(),
                 "existing SfxViewFrame after Execute" );
     DBG_ASSERT( !SfxObjectShell::GetFirst(),
                 "existing SfxObjectShell after Execute" );
     pAppData_Impl->pAppDispat->Pop( *this, SFX_SHELL_POP_UNTIL );
     pAppData_Impl->pAppDispat->Flush();
-    pAppData_Impl->bDowning = TRUE;
-    pAppData_Impl->pAppDispat->DoDeactivate_Impl( TRUE, NULL );
+    pAppData_Impl->bDowning = sal_True;
+    pAppData_Impl->pAppDispat->DoDeactivate_Impl( sal_True, NULL );
 
     // call derived application-exit
     Exit();
@@ -143,11 +140,7 @@ void SfxApplication::Deinitialize()
     // ab hier d"urfen keine SvObjects mehr existieren
     DELETEZ(pAppData_Impl->pMatcher);
 
-    delete pAppData_Impl->pLabelResMgr;
-
     DELETEX(pAppData_Impl->pSlotPool);
-    DELETEX(pAppData_Impl->pEventConfig);
-    SfxMacroConfig::Release_Impl();
     DELETEX(pAppData_Impl->pFactArr);
     DELETEX(pAppData_Impl->pInitLinkList);
 
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index e8e426b5b0..c5fe655de1 100644..100755
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -34,11 +34,11 @@
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
 #include "arrdecl.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/templdlg.hxx>
 #include "objmnctl.hxx"
 #include "inettbc.hxx"
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/navigat.hxx>
 #include <sfx2/taskpane.hxx>
 #include <sfx2/module.hxx>
@@ -63,9 +63,9 @@ void SfxApplication::Registrations_Impl()
 
     // ChildWindows
     SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
-    SfxNavigatorWrapper::RegisterChildWindow( FALSE, NULL, SFX_CHILDWIN_NEVERHIDE );
+    SfxNavigatorWrapper::RegisterChildWindow( sal_False, NULL, SFX_CHILDWIN_NEVERHIDE );
     SfxPartChildWnd_Impl::RegisterChildWindow();
-    SfxTemplateDialogWrapper::RegisterChildWindow(TRUE);
+    SfxTemplateDialogWrapper::RegisterChildWindow(sal_True);
     SfxDockingWrapper::RegisterChildWindow();
 
     // Controller
@@ -86,7 +86,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pTbxCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pTbxCtrlFac->Count(); n++ )
     {
         SfxTbxCtrlFactory *pF = (*pAppData_Impl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -111,7 +111,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pStbCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pStbCtrlFac->Count(); n++ )
     {
         SfxStbCtrlFactory *pF = (*pAppData_Impl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -136,7 +136,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto
     }
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pAppData_Impl->pMenuCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pAppData_Impl->pMenuCtrlFac->Count(); n++ )
     {
         SfxMenuCtrlFactory *pF = (*pAppData_Impl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a3b44b9702..b99479c346 100644..100755
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -91,7 +91,6 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include "about.hxx"
 #include "frmload.hxx"
 #include "referers.hxx"
 #include <sfx2/app.hxx>
@@ -111,19 +110,17 @@
 #include <sfx2/new.hxx>
 #include <sfx2/templdlg.hxx>
 #include "sfxtypes.hxx"
-#include "sfxbasic.hxx"
 #include <sfx2/tabdlg.hxx>
 #include "arrdecl.hxx"
 #include "fltfnc.hxx"
 #include <sfx2/sfx.hrc>
 #include "app.hrc"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/childwin.hxx>
 #include "appdata.hxx"
-#include <sfx2/macrconf.hxx>
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -132,7 +129,8 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/dialogs.hrc>
 #include "sorgitm.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
+#include <tools/svlibrary.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -230,7 +228,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                         continue;
 
                     if ( pObjSh->PrepareClose(2) )
-                        pObjSh->SetModified( FALSE );
+                        pObjSh->SetModified( sal_False );
                     else
                         return;
                 }
@@ -256,16 +254,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             }
 
             // block reentrant calls
-            pAppData_Impl->bInQuit = TRUE;
+            pAppData_Impl->bInQuit = sal_True;
             Reference < XDesktop > xDesktop ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
 
             rReq.ForgetAllArgs();
 
-            // if terminate() failed, pAppData_Impl->bInQuit will now be FALSE, allowing further calls of SID_QUITAPP
-            BOOL bTerminated = xDesktop->terminate();
+            // if terminate() failed, pAppData_Impl->bInQuit will now be sal_False, allowing further calls of SID_QUITAPP
+            sal_Bool bTerminated = xDesktop->terminate();
             if (!bTerminated)
                 // if terminate() was successful, SfxApplication is now dead!
-                pAppData_Impl->bInQuit = FALSE;
+                pAppData_Impl->bInQuit = sal_False;
 
             // Returnwert setzten, ggf. terminieren
             rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) );
@@ -298,7 +296,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                 Reference< XFrame > xFrame;
                 const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
-                SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+                SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
                 if ( pFrameItem )
                     xFrame = pFrameItem->GetFrame();
 
@@ -348,7 +346,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             }
             while( sal_True );
 
-            BOOL bOk = ( n == 0);
+            sal_Bool bOk = ( n == 0);
             rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
             bDone = true;
             break;
@@ -356,7 +354,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
         case SID_SAVEDOCS:
         {
-            BOOL bOK = TRUE;
+            sal_Bool bOK = sal_True;
             for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
                   pObjSh;
                   pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
@@ -367,7 +365,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     pObjSh->ExecuteSlot( aReq );
                     SfxBoolItem *pItem = PTR_CAST( SfxBoolItem, aReq.GetReturnValue() );
                     if ( !pItem || !pItem->GetValue() )
-                        bOK = FALSE;
+                        bOK = sal_False;
                 }
             }
 
@@ -430,8 +428,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
             {
-                ULONG nHelpId =  0;
-                pHelp->Start( nHelpId, NULL ); // show start page
+                pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
                 bDone = true;
             }
             break;
@@ -441,7 +438,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELPTIPS:
         {
             // Parameter aus werten
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, sal_False);
             bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !Help::IsQuickHelpEnabled();
@@ -469,7 +466,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELPBALLOONS:
         {
             // Parameter auswerten
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, sal_False);
             bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !Help::IsBalloonHelpEnabled();
@@ -493,7 +490,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         case SID_HELP_PI:
         {
             SvtHelpOptions aHelpOpt;
-            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELP_PI, FALSE);
+            SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELP_PI, sal_False);
             sal_Bool bOn = pOnItem
                             ? ((SfxBoolItem*)pOnItem)->GetValue()
                             : !aHelpOpt.IsHelpAgentAutoStartMode();
@@ -506,85 +503,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_ABOUT:
         {
-            const String sCWSSchema( String::CreateFromAscii( "[CWS:" ) );
-            rtl::OUString sDefault;
-            String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
-            OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" );
-            if ( sBuildId.Len() > 0 && sBuildId.Search( sCWSSchema ) == STRING_NOTFOUND )
-            {
-                // no cws part in brand buildid -> try basis buildid
-                rtl::OUString sBasisBuildId( DEFINE_CONST_OUSTRING(
-                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
-                rtl::Bootstrap::expandMacros( sBasisBuildId );
-                sal_Int32 nIndex = sBasisBuildId.indexOf( sCWSSchema );
-                if ( nIndex != -1 )
-                    sBuildId += String( sBasisBuildId.copy( nIndex ) );
-            }
-
-            String sProductSource( utl::Bootstrap::getProductSource( sDefault ) );
-            OSL_ENSURE( sProductSource.Len() > 0, "No ProductSource in bootstrap file" );
-
-            // the product source is something like "DEV300", where the
-            // build id is something like "300m12(Build:12345)". For better readability,
-            // strip the duplicate UPD ("300").
-            if ( sProductSource.Len() )
-            {
-                bool bMatchingUPD =
-                        ( sProductSource.Len() >= 3 )
-                    &&  ( sBuildId.Len() >= 3 )
-                    &&  ( sProductSource.Copy( sProductSource.Len() - 3 ) == sBuildId.Copy( 0, 3 ) );
-                OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
-                if ( bMatchingUPD )
-                    sProductSource = sProductSource.Copy( 0, sProductSource.Len() - 3 );
-
-                // prepend the product source
-                sBuildId.Insert( sProductSource, 0 );
-            }
-
-            // Version information (in about box) (#i94693#)
-            /* if the build ids of the basis or ure layer are different from the build id
-             * of the brand layer then show them */
-            rtl::OUString aBasisProductBuildId( DEFINE_CONST_OUSTRING(
-                "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) );
-            rtl::Bootstrap::expandMacros( aBasisProductBuildId );
-            rtl::OUString aUREProductBuildId( DEFINE_CONST_OUSTRING(
-                "${$URE_BIN_DIR/" SAL_CONFIGFILE("version") ":ProductBuildid}" ) );
-            rtl::Bootstrap::expandMacros( aUREProductBuildId );
-            if ( sBuildId.Search( String( aBasisProductBuildId ) ) == STRING_NOTFOUND
-                || sBuildId.Search( String( aUREProductBuildId ) ) == STRING_NOTFOUND )
-            {
-                String sTemp( '-' );
-                sTemp += String( aBasisProductBuildId );
-                sTemp += '-';
-                sTemp += String( aUREProductBuildId );
-                sBuildId.Insert( sTemp, sBuildId.Search( ')' ) );
-            }
-
-            // the build id format is "milestone(build)[cwsname]". For readability, it would
-            // be nice to have some more spaces in there.
-            xub_StrLen nPos = 0;
-            if ( ( nPos = sBuildId.Search( sal_Unicode( '(' ) ) ) != STRING_NOTFOUND )
-                sBuildId.Insert( sal_Unicode( ' ' ), nPos );
-            if ( ( nPos = sBuildId.Search( sal_Unicode( '[' ) ) ) != STRING_NOTFOUND )
-                sBuildId.Insert( sal_Unicode( ' ' ), nPos );
-
-            // search for the resource of the about box
-            ResId aDialogResId( RID_DEFAULTABOUT, *pAppData_Impl->pLabelResMgr );
-            ResMgr* pResMgr = pAppData_Impl->pLabelResMgr;
-            if( ! pResMgr->IsAvailable( aDialogResId.SetRT( RSC_MODALDIALOG ) ) )
-                pResMgr = GetOffResManager_Impl();
-
-            aDialogResId.SetResMgr( pResMgr );
-            if ( !pResMgr->IsAvailable( aDialogResId ) )
+             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+            if ( pFact )
             {
-                DBG_ERRORFILE( "No RID_DEFAULTABOUT in label-resource-dll" );
-            }
-
-            // then show the about box
-            AboutDialog* pDlg = new AboutDialog( 0, aDialogResId, sBuildId );
-            pDlg->Execute();
-            delete pDlg;
+                VclAbstractDialog* pDlg = pFact->CreateVclDialog( 0, RID_DEFAULTABOUT );
+                pDlg->Execute();
+                delete pDlg;
             bDone = true;
+            }
             break;
         }
 
@@ -631,7 +557,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                                 TYPE(SfxBoolItem)));
                 bool bShow = pItem == 0
                     ? !pAppData_Impl->m_xImeStatusWindow->isShowing()
-                    : ( pItem->GetValue() == TRUE );
+                    : ( pItem->GetValue() == sal_True );
                 pAppData_Impl->m_xImeStatusWindow->show(bShow);
                 if (pItem == 0)
                     rReq.AppendItem(SfxBoolItem(SID_SHOW_IME_STATUS_WINDOW,
@@ -678,7 +604,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
                     // Parameter auswerten
                     rtl::OUString aToolbarName( aBuf.makeStringAndClear() );
-                    BOOL bShow( !xLayoutManager->isElementVisible( aToolbarName ));
+                    sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName ));
 
                     if ( bShow )
                     {
@@ -709,11 +635,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
     DBG_MEMTEST();
 
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
@@ -781,14 +707,14 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
                 case SID_SAVEDOCS:
                 {
-                    BOOL bModified = FALSE;
+                    sal_Bool bModified = sal_False;
                     for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
                           pObjSh;
                           pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
                     {
                         if ( pObjSh->IsModified() )
                         {
-                            bModified = TRUE;
+                            bModified = sal_True;
                             break;
                         }
                     }
@@ -823,20 +749,18 @@ static const ::rtl::OUString& getProductRegistrationServiceName( )
     return s_sServiceName;
 }
 
-typedef	rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, BOOL, rtl_uString*);
-typedef	void (SAL_CALL *basicide_macro_organizer)( INT16 );
+typedef	rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*);
+typedef	void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
 
 #define DOSTRING( x )			   			#x
 #define STRING( x )				   			DOSTRING( x )
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
-::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
+::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -853,12 +777,10 @@ extern "C" { static void SAL_CALL thisModule() {} }
     return aScriptURL;
 }
 
-void MacroOrganizer( INT16 nTabId )
+void MacroOrganizer( sal_Int16 nTabId )
 {
     // get basctl dllname
-    String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-    sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) );
-    ::rtl::OUString aLibName( sLibName );
+    static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
 
     // load module
     oslModule handleMod = osl_loadModuleRelative(
@@ -1102,7 +1024,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             {
                 SfxObjectShell* pBasicIDE = SfxObjectShell::CreateObject( lcl_getBasicIDEServiceName() );
                 pBasicIDE->DoInitNew( 0 );
-                pBasicIDE->SetModified( FALSE );
+                pBasicIDE->SetModified( sal_False );
                 try
                 {
                     // load the Basic IDE via direct access to the SFX frame loader. A generic loadComponentFromURL
@@ -1159,15 +1081,15 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
         {
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxPoolItem* pItem;
-            BOOL bChooseOnly = FALSE;
+            sal_Bool bChooseOnly = sal_False;
             Reference< XModel > xLimitToModel;
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_RECORDMACRO, sal_False, &pItem) )
             {
-                BOOL bRecord = ((SfxBoolItem*)pItem)->GetValue();
+                sal_Bool bRecord = ((SfxBoolItem*)pItem)->GetValue();
                 if ( bRecord )
                 {
                     // !Hack
-                    bChooseOnly = FALSE;
+                    bChooseOnly = sal_False;
                     SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
                     OSL_ENSURE( pCurrentShell, "macro recording outside an SFX document?" );
                     if ( pCurrentShell )
@@ -1185,7 +1107,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             OSL_TRACE("handling SID_MACROORGANIZER");
             const SfxItemSet* pArgs = rReq.GetArgs();
             const SfxPoolItem* pItem;
-            INT16 nTabId = 0;
+            sal_Int16 nTabId = 0;
             if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_MACROORGANIZER, sal_False, &pItem) )
             {
                 nTabId = ((SfxUInt16Item*)pItem)->GetValue();
@@ -1203,7 +1125,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
             Reference< XFrame > xFrame;
             const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
-            SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+            SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
             if ( pFrameItem )
                 xFrame = pFrameItem->GetFrame();
 
@@ -1217,7 +1139,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             do  // artificial loop for flow control
             {
                 AbstractScriptSelectorDialog* pDlg = pFact->CreateScriptSelectorDialog(
-                    lcl_getDialogParent( xFrame, GetTopWindow() ), FALSE, xFrame );
+                    lcl_getDialogParent( xFrame, GetTopWindow() ), sal_False, xFrame );
                 OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
                 if ( !pDlg )
                     break;
@@ -1285,7 +1207,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if ( pStringItem )
             {
                 String aPLZ = pStringItem->GetValue();
-                bRet = TRUE /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
+                bRet = sal_True /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
             }
             else
                 SbxBase::SetError( SbxERR_WRONG_ARGS );
@@ -1302,7 +1224,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 const SfxPoolItem* pItem=NULL;
                 const SfxItemSet* pSet = rReq.GetArgs();
                 SfxItemPool* pSetPool = pSet ? pSet->GetPool() : NULL;
-                if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), FALSE, &pItem ) == SFX_ITEM_SET )
+                if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), sal_False, &pItem ) == SFX_ITEM_SET )
                     aSet.Put( *pItem );
 
                   SfxAbstractTabDialog* pDlg = pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL );
@@ -1391,7 +1313,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 if (xDialog.is())
                     xDialog->execute();
                 else
-                    ShowServiceNotAvailableError(NULL, sDialogServiceName, TRUE);
+                    ShowServiceNotAvailableError(NULL, sDialogServiceName, sal_True);
             }
             catch(::com::sun::star::uno::Exception&)
             {
@@ -1412,11 +1334,11 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
 void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
 {
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index d418c9331f..2be075caf9 100644..100755
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -95,7 +95,9 @@
 #include <tools/cachestr.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
+#include <framework/documentundoguard.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <comphelper/interaction.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
@@ -116,7 +118,6 @@ using namespace ::com::sun::star::io;
 #include <sfx2/fcontnr.hxx>
 #include "frmload.hxx"
 #include <sfx2/frame.hxx>
-#include "sfxbasic.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/objuno.hxx>
 #include <sfx2/unoctitm.hxx>
@@ -127,7 +128,7 @@ using namespace ::com::sun::star::io;
 #include "fltoptint.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
-#include "brokenpackageint.hxx"
+#include <sfx2/brokenpackageint.hxx>
 #include "eventsupplier.hxx"
 #include "xpackcreator.hxx"
 #include "plugin.hxx"
@@ -135,7 +136,6 @@ using namespace ::com::sun::star::io;
 #include <ownsubfilterservice.hxx>
 #include "SfxDocumentMetaData.hxx"
 
-
 #define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
 static char const sTemplateRegionName[] = "TemplateRegionName";
@@ -161,7 +161,7 @@ static char const sDontEdit[] = "DontEdit";
 static char const sSilent[] = "Silent";
 static char const sJumpMark[] = "JumpMark";
 static char const sFileName[] = "FileName";
-static char const sSalvageURL[] = "SalvagedFile";
+static char const sSalvagedFile[] = "SalvagedFile";
 static char const sStatusInd[] = "StatusIndicator";
 static char const sModel[] = "Model";
 static char const sFrame[] = "Frame";
@@ -187,6 +187,10 @@ static char const sUseSystemDialog[] = "UseSystemDialog";
 static char const sStandardDir[] = "StandardDir";
 static char const sBlackList[] = "BlackList";
 static char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
+static char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
+static char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
+static char const sEncryptionData[] = "EncryptionData";
+
 
 void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs, SfxAllItemSet& rSet, const SfxSlot* pSlot )
 {
@@ -221,10 +225,10 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             return;
         }
 
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
-        BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
         pItem->SetWhich( nWhich );
-        USHORT nSubCount = pType->nAttribs;
+        sal_uInt16 nSubCount = pType->nAttribs;
 
         const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[0];
         String aName = rProp.Name;
@@ -269,11 +273,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             }
 #endif
             // complex property; collect sub items from the parameter set and reconstruct complex item
-            USHORT nFound=0;
+            sal_uInt16 nFound=0;
             for ( sal_uInt16 n=0; n<nCount; n++ )
             {
                 const ::com::sun::star::beans::PropertyValue& rPropValue = pPropsVal[n];
-                USHORT nSub;
+                sal_uInt16 nSub;
                 for ( nSub=0; nSub<nSubCount; nSub++ )
                 {
                     // search sub item by name
@@ -283,7 +287,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     const char* pName = aStr.GetBuffer();
                     if ( rPropValue.Name.compareToAscii( pName ) == COMPARE_EQUAL )
                     {
-                        BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[nSub].nAID;
+                        sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[nSub].nAID;
                         if ( bConvertTwips )
                             nSubId |= CONVERT_TWIPS;
                         if ( pItem->PutValue( rPropValue.Value, nSubId ) )
@@ -339,11 +343,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 return;
             }
 
-            USHORT nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId);
-            BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId);
+            sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
             pItem->SetWhich( nWhich );
             const SfxType* pType = rArg.pType;
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( nSubCount == 0 )
             {
                 // "simple" (base type) argument
@@ -374,14 +378,14 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
             else
             {
                 // complex argument, could be passed in one struct
-                BOOL bAsWholeItem = FALSE;
+                sal_Bool bAsWholeItem = sal_False;
                 for ( sal_uInt16 n=0; n<nCount; n++ )
                 {
                     const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
                     String aName = rProp.Name;
                     if ( aName.CompareToAscii(rArg.pName) == COMPARE_EQUAL )
                     {
-                        bAsWholeItem = TRUE;
+                        bAsWholeItem = sal_True;
 #ifdef DBG_UTIL
                         ++nFoundArgs;
 #endif
@@ -404,11 +408,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     // complex argument; collect sub items from argument array and reconstruct complex item
                     // only put item if at least one member was found and had the correct type
                     // (is this a good idea?! Should we ask for *all* members?)
-                    BOOL bRet = FALSE;
+                    sal_Bool bRet = sal_False;
                     for ( sal_uInt16 n=0; n<nCount; n++ )
                     {
                         const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n];
-                        for ( USHORT nSub=0; nSub<nSubCount; nSub++ )
+                        for ( sal_uInt16 nSub=0; nSub<nSubCount; nSub++ )
                         {
                             // search sub item by name
                             ByteString aStr( rArg.pName );
@@ -418,17 +422,17 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                             if ( rProp.Name.compareToAscii( pName ) == COMPARE_EQUAL )
                             {
                                 // at least one member found ...
-                                bRet = TRUE;
+                                bRet = sal_True;
 #ifdef DBG_UTIL
                                 ++nFoundArgs;
 #endif
-                                BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[nSub].nAID;
+                                sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[nSub].nAID;
                                 if ( bConvertTwips )
                                     nSubId |= CONVERT_TWIPS;
                                 if (!pItem->PutValue( rProp.Value, nSubId ) )
                                 {
                                     // ... but it was not convertable
-                                    bRet = FALSE;
+                                    bRet = sal_False;
 #ifdef DBG_UTIL
                                     ByteString aDbgStr( "Property not convertable: ");
                                     aDbgStr += rArg.pName;
@@ -689,7 +693,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for StanadardDir" );
+                    DBG_ASSERT( bOK, "invalid type or value for StandardDir" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
                 }
@@ -713,11 +717,11 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) );
                 }
-                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSalvageURL)) )
+                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSalvagedFile)) )
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" );
+                    DBG_ASSERT( bOK, "invalid type or value for SalvagedFile" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) );
                 }
@@ -725,7 +729,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" );
+                    DBG_ASSERT( bOK, "invalid type or value for FolderName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_PATH, sVal ) );
                 }
@@ -854,7 +858,27 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     rSet.Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, rProp.Value ) );
                 }
-#ifdef DBG_UTIL
+                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sEncryptionData)) )
+                {
+                    rSet.Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, rProp.Value ) );
+                }
+                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSuggestedSaveAsDir)) )
+                {
+                    ::rtl::OUString sVal;
+                    sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
+                    DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsDir" );
+                    if (bOK)
+                        rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASDIR, sVal ) );
+                }
+                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sSuggestedSaveAsName)) )
+                {
+                    ::rtl::OUString sVal;
+                    sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
+                    DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsName" );
+                    if (bOK)
+                        rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASNAME, sVal ) );
+                }
+#ifdef DBG_UTIL 
                 else
                     --nFoundArgs;
 #endif
@@ -919,10 +943,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( !pSlot->IsMode(SFX_SLOT_METHOD) )
     {
         // slot is a property
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
         if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
         {
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( nSubCount )
                 // it's a complex property, we want it split into simple types
                 // so we expect to get as many items as we have (sub) members
@@ -948,15 +972,15 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     else
     {
         // slot is a method
-        USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-        for ( USHORT nArg=0; nArg<nFormalArgs; ++nArg )
+        sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+        for ( sal_uInt16 nArg=0; nArg<nFormalArgs; ++nArg )
         {
             // check every formal argument of the method
             const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-            USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
             if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
             {
-                USHORT nSubCount = rArg.pType->nAttribs;
+                sal_uInt16 nSubCount = rArg.pType->nAttribs;
                 if ( nSubCount )
                     // argument has a complex type, we want it split into simple types
                     // so for this argument we expect to get as many items as we have (sub) members
@@ -1069,6 +1093,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 nAdditional++;
             if ( rSet.GetItemState( SID_MODIFYPASSWORDINFO ) == SFX_ITEM_SET )
                 nAdditional++;
+            if ( rSet.GetItemState( SID_SUGGESTEDSAVEASDIR ) == SFX_ITEM_SET )
+                nAdditional++;
+            if ( rSet.GetItemState( SID_ENCRYPTIONDATA ) == SFX_ITEM_SET )
+                nAdditional++;
+                nAdditional++;
+            if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME ) == SFX_ITEM_SET )
+                nAdditional++;
 
             // consider additional arguments
             nProps += nAdditional;
@@ -1084,10 +1115,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( rSet.Count() != nItems )
     {
         // detect unknown item and present error message
-        const USHORT *pRanges = rSet.GetRanges();
+        const sal_uInt16 *pRanges = rSet.GetRanges();
         while ( *pRanges )
         {
-            for(USHORT nId = *pRanges++; nId <= *pRanges; ++nId)
+            for(sal_uInt16 nId = *pRanges++; nId <= *pRanges; ++nId)
             {
                 if ( rSet.GetItemState(nId) < SFX_ITEM_SET ) //???
                     // not really set
@@ -1096,12 +1127,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 if ( !pSlot->IsMode(SFX_SLOT_METHOD) && nId == rSet.GetPool()->GetWhich( pSlot->GetSlotId() ) )
                     continue;
 
-                USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-                USHORT nArg;
+                sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+                sal_uInt16 nArg;
                 for ( nArg=0; nArg<nFormalArgs; ++nArg )
                 {
                     const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-                    USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+                    sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
                     if ( nId == nWhich )
                         break;
                 }
@@ -1204,12 +1235,18 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                         continue;
                     if ( nId == SID_NOAUTOSAVE )
                         continue;
+                     if ( nId == SID_ENCRYPTIONDATA )
+                        continue;
 
                     // used only internally
                     if ( nId == SID_SAVETO )
                         continue;
                      if ( nId == SID_MODIFYPASSWORDINFO )
                         continue;
+                     if ( nId == SID_SUGGESTEDSAVEASDIR )
+                        continue;
+                     if ( nId == SID_SUGGESTEDSAVEASNAME )
+                        continue;
                }
 
                 ByteString aDbg( "Unknown item detected: ");
@@ -1231,12 +1268,12 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     if ( !pSlot->IsMode(SFX_SLOT_METHOD) )
     {
         // slot is a property
-        USHORT nWhich = rSet.GetPool()->GetWhich(nSlotId);
-        BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+        sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
+        sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
         SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False );
         if ( pItem ) //???
         {
-            USHORT nSubCount = pType->nAttribs;
+            sal_uInt16 nSubCount = pType->nAttribs;
             if ( !nSubCount )
             {
                 pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ;
@@ -1250,9 +1287,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
             else
             {
                 // complex type, add a property value for every member of the struct
-                for ( USHORT n=1; n<=nSubCount; ++n )
+                for ( sal_uInt16 n=1; n<=nSubCount; ++n )
                 {
-                    BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[n-1].nAID;
+                    sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) pType->aAttrib[n-1].nAID;
                     if ( bConvertTwips )
                         nSubId |= CONVERT_TWIPS;
 
@@ -1276,16 +1313,16 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
     else
     {
         // slot is a method
-        USHORT nFormalArgs = pSlot->GetFormalArgumentCount();
-        for ( USHORT nArg=0; nArg<nFormalArgs; ++nArg )
+        sal_uInt16 nFormalArgs = pSlot->GetFormalArgumentCount();
+        for ( sal_uInt16 nArg=0; nArg<nFormalArgs; ++nArg )
         {
             const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
-            USHORT nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
-            BOOL bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+            sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
+            sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
             SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False );
             if ( pItem ) //???
             {
-                USHORT nSubCount = rArg.pType->nAttribs;
+                sal_uInt16 nSubCount = rArg.pType->nAttribs;
                 if ( !nSubCount )
                 {
                     pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ;
@@ -1299,9 +1336,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 else
                 {
                     // complex type, add a property value for every member of the struct
-                    for ( USHORT n = 1; n <= nSubCount; ++n )
+                    for ( sal_uInt16 n = 1; n <= nSubCount; ++n )
                     {
-                        BYTE nSubId = (BYTE) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
+                        sal_uInt8 nSubId = (sal_uInt8) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
                         if ( bConvertTwips )
                             nSubId |= CONVERT_TWIPS;
 
@@ -1483,7 +1520,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
             if ( rSet.GetItemState( SID_BLACK_LIST, sal_False, &pItem ) == SFX_ITEM_SET )
             {
                 pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sBlackList));
-                
+
                 com::sun::star::uno::Sequence< rtl::OUString > aList;
                 ((SfxStringListItem*)pItem)->GetStringList( aList );
                 pValue[nActProp++].Value <<= aList ;
@@ -1495,7 +1532,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
             }
             if ( rSet.GetItemState( SID_DOC_SALVAGE, sal_False, &pItem ) == SFX_ITEM_SET )
             {
-                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sSalvageURL));
+                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sSalvagedFile));
                 pValue[nActProp++].Value <<= (  ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) );
             }
             if ( rSet.GetItemState( SID_PATH, sal_False, &pItem ) == SFX_ITEM_SET )
@@ -1574,6 +1611,21 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sModifyPasswordInfo));
                 pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() );
             }
+            if ( rSet.GetItemState( SID_ENCRYPTIONDATA, sal_False, &pItem ) == SFX_ITEM_SET )
+            {
+                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sEncryptionData));
+                pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() );
+            }
+            if ( rSet.GetItemState( SID_SUGGESTEDSAVEASDIR, sal_False, &pItem ) == SFX_ITEM_SET )
+            {
+                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sSuggestedSaveAsDir));
+                pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) );
+            }
+            if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME, sal_False, &pItem ) == SFX_ITEM_SET )
+            {
+                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sSuggestedSaveAsName));
+                pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) );
+            }
         }
     }
 
@@ -1729,12 +1781,9 @@ void SAL_CALL SfxMacroLoader::removeStatusListener(
 {
 }
 
-// -----------------------------------------------------------------------
 ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh )
     throw ( ::com::sun::star::uno::RuntimeException )
 {
-    SfxApplication* pApp = SFX_APP();
-    pApp->EnterBasicCall();
     SfxObjectShell* pCurrent = pSh;
     if ( !pCurrent )
         // all not full qualified names use the BASIC of the given or current document
@@ -1780,18 +1829,21 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
 
         if ( pBasMgr )
         {
-            if ( pSh && pDoc )
+            const bool bIsAppBasic = ( pBasMgr == pAppMgr );
+            const bool bIsDocBasic = ( pBasMgr != pAppMgr );
+
+            if ( pDoc )
             {
-                // security check for macros from document basic if an SFX context (pSh) is given
+                // security check for macros from document basic if an SFX doc is given
                 if ( !pDoc->AdjustMacroMode( String() ) )
                     // check forbids execution
                     return ERRCODE_IO_ACCESSDENIED;
             }
-            else if ( pSh && pSh->GetMedium() )
+            else if ( pDoc && pDoc->GetMedium() )
             {
-                pSh->AdjustMacroMode( String() );
-                SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
-                SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pMacroExecModeItem, SfxUInt16Item, SID_MACROEXECMODE, sal_False);
+                pDoc->AdjustMacroMode( String() );
+                SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
+                SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pMacroExecModeItem, SfxUInt16Item, SID_MACROEXECMODE, sal_False);
                 if ( pUpdateDocItem && pMacroExecModeItem
                   && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE
                   && pMacroExecModeItem->GetValue() == document::MacroExecMode::NEVER_EXECUTE )
@@ -1808,76 +1860,49 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
                 aQualifiedMethod.Erase( nArgsPos - nHashPos - 1 );
             }
 
-            SbxMethod *pMethod = SfxQueryMacro( pBasMgr, aQualifiedMethod );
-            if ( pMethod )
+            if ( pBasMgr->HasMacro( aQualifiedMethod ) )
             {
-                // arguments must be quoted
-                String aQuotedArgs;
-                if ( aArgs.Len()<2 || aArgs.GetBuffer()[1] == '\"')
-                    // no args or already quoted args
-                    aQuotedArgs = aArgs;
-                else
+                Any aOldThisComponent;
+                const bool bSetDocMacroMode = ( pDoc != NULL ) && bIsDocBasic;
+                const bool bSetGlobalThisComponent = ( pDoc != NULL ) && bIsAppBasic;
+                if ( bSetDocMacroMode )
                 {
-                    // quote parameters
-                    aArgs.Erase(0,1);
-                    aArgs.Erase( aArgs.Len()-1,1);
-
-                    aQuotedArgs = '(';
-
-                    sal_uInt16 nCount = aArgs.GetTokenCount(',');
-                    for ( sal_uInt16 n=0; n<nCount; n++ )
-                    {
-                        aQuotedArgs += '\"';
-                        aQuotedArgs += aArgs.GetToken( n, ',' );
-                        aQuotedArgs += '\"';
-                        if ( n<nCount-1 )
-                            aQuotedArgs += ',';
-                    }
-
-                    aQuotedArgs += ')';
+                    // mark document: it executes an own macro, so it's in a modal mode
+                    pDoc->SetMacroMode_Impl( sal_True );
                 }
 
-                Any aOldThisComponent;
-                if ( pSh )
+                if ( bSetGlobalThisComponent )
                 {
-                    if ( pBasMgr != pAppMgr )
-                        // mark document: it executes an own macro, so it's in a modal mode
-                        pSh->SetMacroMode_Impl( TRUE );
-                    if ( pBasMgr == pAppMgr )
-                    {
-                        // document is executed via AppBASIC, adjust ThisComponent variable
-                        aOldThisComponent = pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pSh->GetModel() ) );
-                    }
+                    // document is executed via AppBASIC, adjust ThisComponent variable
+                    aOldThisComponent = pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pDoc->GetModel() ) );
                 }
 
-                // add quoted arguments and do the call
-                String aCall( '[' );
-                aCall += pMethod->GetName();
-                aCall += aQuotedArgs;
-                aCall += ']';
-
                 // just to let the shell be alive
-                SfxObjectShellRef rSh = pSh;
+                SfxObjectShellRef xKeepDocAlive = pDoc;
 
-                // execute function using its Sbx parent,
-                SbxVariable* pRet = pMethod->GetParent()->Execute( aCall );
-                if ( pRet )
                 {
-                    USHORT nFlags = pRet->GetFlags();
-                    pRet->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST );
-                    rRetval = sbxToUnoValue( pRet );
-                    pRet->SetFlags( nFlags );
+                    // attempt to protect the document against the script tampering with its Undo Context
+                    ::std::auto_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+                    if ( bIsDocBasic )
+                        pUndoGuard.reset( new ::framework::DocumentUndoGuard( pDoc->GetModel() ) );
+
+                    // execute the method
+                    SbxVariableRef retValRef = new SbxVariable;
+                    nErr = pBasMgr->ExecuteMacro( aQualifiedMethod, aArgs, retValRef );
+                    if ( nErr == ERRCODE_NONE )
+                        rRetval = sbxToUnoValue( retValRef );
                 }
 
-                nErr = SbxBase::GetError();
-                if ( ( pBasMgr == pAppMgr ) && pSh )
+                if ( bSetGlobalThisComponent )
                 {
                     pAppMgr->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
                 }
 
-                if ( pSh && pSh->GetModel().is() )
-                       // remove flag for modal mode
-                       pSh->SetMacroMode_Impl( FALSE );
+                if ( bSetDocMacroMode )
+                {
+                    // remove flag for modal mode
+                    pDoc->SetMacroMode_Impl( sal_False );
+                }
             }
             else
                 nErr = ERRCODE_BASIC_PROC_UNDEFINED;
@@ -1896,7 +1921,6 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
         nErr = SbxBase::GetError();
     }
 
-    pApp->LeaveBasicCall();
     SbxBase::ResetError();
     return nErr;
 }
@@ -1919,7 +1943,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     const ::rtl::OUString& /*sTargetFrameName*/,
     FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException )
 {
-    USHORT                  nId( 0 );
+    sal_uInt16                  nId( 0 );
     sal_Bool                bMasterCommand( sal_False );
     Reference < XDispatch > xDisp;
     const SfxSlot* pSlot = 0;
@@ -1927,9 +1951,9 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
     if ( aURL.Protocol.compareToAscii( "slot:" ) == COMPARE_EQUAL ||
          aURL.Protocol.compareToAscii( "commandId:" ) == COMPARE_EQUAL )
     {
-        nId = (USHORT) aURL.Path.toInt32();
+        nId = (sal_uInt16) aURL.Path.toInt32();
         SfxShell* pShell;
-        pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, TRUE, TRUE );
+        pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, sal_True, sal_True );
     }
     else if ( aURL.Protocol.compareToAscii( ".uno:" ) == COMPARE_EQUAL )
     {
@@ -1972,10 +1996,10 @@ throw (::com::sun::star::uno::RuntimeException)
     std::list< sal_Int16 > aGroupList;
     SfxSlotPool* pAppSlotPool = &SFX_APP()->GetAppSlotPool_Impl();
 
-    const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+    const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
     // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-    for ( USHORT i=0; i<pAppSlotPool->GetGroupCount(); i++ )
+    for ( sal_uInt16 i=0; i<pAppSlotPool->GetGroupCount(); i++ )
     {
         String aName = pAppSlotPool->SeekGroup( i );
         const SfxSlot* pSfxSlot = pAppSlotPool->FirstSlot();
@@ -2007,11 +2031,11 @@ throw (::com::sun::star::uno::RuntimeException)
 
     if ( pAppSlotPool )
     {
-        const ULONG   nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+        const sal_uIntPtr   nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
         rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
         // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-        for ( USHORT i=0; i<pAppSlotPool->GetGroupCount(); i++ )
+        for ( sal_uInt16 i=0; i<pAppSlotPool->GetGroupCount(); i++ )
         {
             String aName = pAppSlotPool->SeekGroup( i );
             const SfxSlot* pSfxSlot = pAppSlotPool->FirstSlot();
@@ -2126,151 +2150,6 @@ SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
-    void*	               ,
-    void*	pRegistryKey	)
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >		xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) )	;
-
-    // register actual implementations and their services
-    ::rtl::OUString aImpl;
-    ::rtl::OUString aTempStr;
-    ::rtl::OUString aKeyStr;
-    Reference< XRegistryKey > xNewKey;
-    Reference< XRegistryKey > xLoaderKey;
-
-    // PluginObject
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += ::sfx2::PluginObject::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SpecialEmbeddedObject")) );
-    
-    // IFrameObject
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SpecialEmbeddedObject")) );
-
-    // global app event broadcaster
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxGlobalEvents_Impl::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) );
-
-    // global app dispatcher
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxAppDispatchProvider::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ProtocolHandler")) );
-
-    // standalone document info
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxStandaloneDocumentInfoObject::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.StandaloneDocumentInfo")) );
-
-    // frame loader
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxFrameLoader_Impl::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    Sequence < ::rtl::OUString > aServices = SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames();
-    sal_Int32 nCount = aServices.getLength();
-    for ( sal_Int16 i=0; i<nCount; i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    // macro loader
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxMacroLoader::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ProtocolHandler")) );
-
-    // - sfx document templates
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxDocTplService::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DocumentTemplates")) );
-
-    // quickstart wrapper service
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += ShutdownIcon::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart")) );
-
-    // application script library container service
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxApplicationScriptLibraryContainer::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationScriptLibraryContainer")) );
-
-    // application dialog library container service
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += SfxApplicationDialogLibraryContainer::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationDialogLibraryContainer")) );
-
-    // converter of fs folders to packages
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += OPackageStructureCreator::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    Sequence< ::rtl::OUString > rServices = OPackageStructureCreator::impl_getStaticSupportedServiceNames();
-    for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-        xNewKey->createKey( rServices.getConstArray()[ind] );
-
-    // subfilter to parse a stream in OASIS format generated by the filter
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += ::sfx2::OwnSubFilterService::impl_getStaticImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    rServices = ::sfx2::OwnSubFilterService::impl_getStaticSupportedServiceNames();
-    for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-        xNewKey->createKey( rServices.getConstArray()[ind] );
-
-    // document meta data
-    aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aImpl += comp_SfxDocumentMetaData::_getImplementationName();
-
-    aTempStr = aImpl;
-    aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-    xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentProperties")) );
 
 
     // writer compatable document properties
@@ -2281,10 +2160,6 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
     xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties")) );
-
-    return sal_True;
-}
-
 SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
     const sal_Char*	pImplementationName	,
     void*           pServiceManager		,
@@ -2381,18 +2256,18 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::FilterOptionsRequest aOptionsRequest( temp,
-                                                                         temp2,
+                                                                      temp2,
                                                                       rModel,
                                                                       rProperties );
 
-       m_aRequest <<= aOptionsRequest;
+    m_aRequest <<= aOptionsRequest;
 
-       m_pAbort  = new ContinuationAbort;
-       m_pOptions = new FilterOptionsContinuation;
+    m_pAbort  = new comphelper::OInteractionAbort;
+    m_pOptions = new FilterOptionsContinuation;
 
-       m_lContinuations.realloc( 2 );
-       m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
-       m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
+    m_lContinuations.realloc( 2 );
+    m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
+    m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pOptions );
 }
 
 ::com::sun::star::uno::Any SAL_CALL RequestFilterOptions::getRequest()
@@ -2409,108 +2284,140 @@ RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::
 }
 
 //=========================================================================
+class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;     
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;       
+    comphelper::OInteractionApprove* m_pApprove;
+    comphelper::OInteractionDisapprove*  m_pDisapprove;
 
-RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
+public:
+    RequestPackageReparation_Impl( ::rtl::OUString aName );  
+    sal_Bool    isApproved();    
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() 
+        throw( ::com::sun::star::uno::RuntimeException );
+}; 
+
+RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
                                                                                  temp2,
                                                                               aName );
-
        m_aRequest <<= aBrokenPackageRequest;
-
-       m_pApprove = new ContinuationApprove;
-       m_pDisapprove = new ContinuationDisapprove;
-
+    m_pApprove = new comphelper::OInteractionApprove;
+    m_pDisapprove = new comphelper::OInteractionDisapprove;
        m_lContinuations.realloc( 2 );
        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pApprove );
        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
 }
 
-/*uno::*/Any SAL_CALL RequestPackageReparation::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
-{
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
-}
-
-void SAL_CALL RequestPackageReparation::acquire(  ) throw ()
-{
-    OWeakObject::acquire();
+sal_Bool RequestPackageReparation_Impl::isApproved()
+{        
+    return m_pApprove->wasSelected(); 
 }
 
-void SAL_CALL RequestPackageReparation::release(  ) throw ()
-{
-    OWeakObject::release();
-}
-
-::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest()
+::com::sun::star::uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest()
         throw( ::com::sun::star::uno::RuntimeException )
 {
     return m_aRequest;
 }
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL RequestPackageReparation::getContinuations()
+    SAL_CALL RequestPackageReparation_Impl::getContinuations()
         throw( ::com::sun::star::uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
+{
+    pImp = new RequestPackageReparation_Impl( aName );
+    pImp->acquire();
+}
+        
+RequestPackageReparation::~RequestPackageReparation()
+{
+    pImp->release();
+}           
+
+sal_Bool RequestPackageReparation::isApproved()
+{
+    return pImp->isApproved();
+}            
+
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > RequestPackageReparation::GetRequest()
+{
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
+}            
+
 //=========================================================================
+class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+{
+    ::com::sun::star::uno::Any m_aRequest;       
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > m_lContinuations;
+    comphelper::OInteractionAbort*  m_pAbort;
 
-NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
+public:
+    NotifyBrokenPackage_Impl( ::rtl::OUString aName );
+    sal_Bool    isAborted();       
+    virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() 
+        throw( ::com::sun::star::uno::RuntimeException );
+};  
+
+NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName )
 {
     ::rtl::OUString temp;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2;
     ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp,
                                                                                  temp2,
                                                                               aName );
-
        m_aRequest <<= aBrokenPackageRequest;
-
-       m_pAbort  = new ContinuationAbort;
-
+    m_pAbort  = new comphelper::OInteractionAbort;
        m_lContinuations.realloc( 1 );
        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
 }
 
-/*uno::*/Any SAL_CALL NotifyBrokenPackage::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
-{
-    return ::cppu::queryInterface ( rType,
-            // OWeakObject interfaces
-            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
-            static_cast< XWeak* > ( this ),
-            // my own interfaces
-            static_cast< XInteractionRequest*  > ( this ) );
-}
-
-void SAL_CALL NotifyBrokenPackage::acquire(  ) throw ()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL NotifyBrokenPackage::release(  ) throw ()
-{
-    OWeakObject::release();
+sal_Bool NotifyBrokenPackage_Impl::isAborted() 
+{ 
+    return m_pAbort->wasSelected(); 
 }
 
-::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest()
+::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest()
         throw( ::com::sun::star::uno::RuntimeException )
 {
     return m_aRequest;
 }
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >
-    SAL_CALL NotifyBrokenPackage::getContinuations()
+    SAL_CALL NotifyBrokenPackage_Impl::getContinuations()
         throw( ::com::sun::star::uno::RuntimeException )
 {
     return m_lContinuations;
 }
 
+NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
+{
+    pImp = new NotifyBrokenPackage_Impl( aName );
+    pImp->acquire();
+}
+            
+NotifyBrokenPackage::~NotifyBrokenPackage()
+{
+    pImp->release();
+}           
+
+sal_Bool NotifyBrokenPackage::isAborted()
+{
+    return pImp->isAborted();
+}            
+
+com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > NotifyBrokenPackage::GetRequest()
+{
+    return com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest >(pImp);
+}            
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 63da5fabc4..ff9664ef38 100644..100755
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -342,7 +342,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
     aInfo.aSize = pWindow->GetSizePixel();
     if ( pWindow->IsSystemWindow() )
     {
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( pWindow->GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         aInfo.aWinState = ((SystemWindow*)pWindow)->GetWindowState( nMask );
@@ -415,7 +415,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
         nPos = aWinData.Search( cToken );
         if (nPos != STRING_NOTFOUND)
         {
-            USHORT nNextPos = aWinData.Search( cToken, 2 );
+            sal_uInt16 nNextPos = aWinData.Search( cToken, 2 );
             if ( nNextPos != STRING_NOTFOUND )
             {
                 // es gibt noch Extra-Information
@@ -594,7 +594,7 @@ sal_Bool SfxChildWindow::IsHideAtToggle() const
     return pImp->bHideAtToggle;
 }
 
-void SfxChildWindow::SetWantsFocus( BOOL bSet )
+void SfxChildWindow::SetWantsFocus( sal_Bool bSet )
 {
     pImp->bWantsFocus = bSet;
 }
@@ -701,18 +701,18 @@ void SfxChildWindow::Hide()
 
 
 
-void SfxChildWindow::Show( USHORT nFlags )
+void SfxChildWindow::Show( sal_uInt16 nFlags )
 {
     switch ( pWindow->GetType() )
     {
         case RSC_DOCKINGWINDOW :
-            ((DockingWindow*)pWindow)->Show( TRUE, nFlags );
+            ((DockingWindow*)pWindow)->Show( sal_True, nFlags );
             break;
         case RSC_TOOLBOX :
-            ((ToolBox*)pWindow)->Show( TRUE, nFlags );
+            ((ToolBox*)pWindow)->Show( sal_True, nFlags );
             break;
         default:
-            pWindow->Show( TRUE, nFlags );
+            pWindow->Show( sal_True, nFlags );
             break;
     }
 }
@@ -789,7 +789,7 @@ sal_Bool SfxChildWindow::CanGetFocus() const
     return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS);
 }
 
-void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, USHORT nId, SfxChildWinContextFactory* pFact)
+void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, sal_uInt16 nId, SfxChildWinContextFactory* pFact)
 {
     SFX_APP()->RegisterChildWindowContext_Impl( pMod, nId, pFact );
 }
diff --git a/sfx2/source/appl/dde.hrc b/sfx2/source/appl/dde.hrc
index 63fa89ce2e..63fa89ce2e 100644..100755
--- a/sfx2/source/appl/dde.hrc
+++ b/sfx2/source/appl/dde.hrc
diff --git a/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src
index 9b87bb94e6..4c846078ae 100644..100755
--- a/sfx2/source/appl/dde.src
+++ b/sfx2/source/appl/dde.src
@@ -29,6 +29,7 @@
 
 ModalDialog MD_DDE_LINKEDIT
 {
+    HelpID = "sfx2:ModalDialog:MD_DDE_LINKEDIT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 223 , 74 ) ;
@@ -42,6 +43,7 @@ ModalDialog MD_DDE_LINKEDIT
     };
     Edit ED_DDE_APP
     {
+        HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 14 ) ;
         Size = MAP_APPFONT ( 100 , 12 ) ;
@@ -54,6 +56,7 @@ ModalDialog MD_DDE_LINKEDIT
     };
     Edit ED_DDE_TOPIC
     {
+        HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 32 ) ;
         Size = MAP_APPFONT ( 100 , 12 ) ;
@@ -66,6 +69,7 @@ ModalDialog MD_DDE_LINKEDIT
     };
     Edit ED_DDE_ITEM
     {
+        HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 50 ) ;
         Size = MAP_APPFONT ( 100 , 12 ) ;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 41f1a3e485..a64b741ffd 100644..100755
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -49,7 +49,7 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/opengrf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "fileobj.hxx"
 #include "app.hrc"
 
@@ -82,9 +82,9 @@ struct Impl_DownLoadData
 SvFileObject::SvFileObject() :
     pDownLoadData( NULL ), pOldParent( NULL ), nType( FILETYPE_TEXT )
 {
-    bLoadAgain = TRUE;
+    bLoadAgain = sal_True;
     bSynchron = bLoadError = bWaitForData = bDataReady = bNativFormat =
-    bClearMedium = bStateChangeCalled = bInCallDownLoad = FALSE;
+    bClearMedium = bStateChangeCalled = bInCallDownLoad = sal_False;
 }
 
 
@@ -100,11 +100,11 @@ SvFileObject::~SvFileObject()
 }
 
 
-BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
+sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                                 const String & rMimeType,
-                                BOOL bGetSynchron )
+                                sal_Bool bGetSynchron )
 {
-    ULONG nFmt = SotExchange::GetFormatStringId( rMimeType );
+    sal_uIntPtr nFmt = SotExchange::GetFormatStringId( rMimeType );
     switch( nType )
     {
     case FILETYPE_TEXT:
@@ -131,7 +131,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                 //		Ende das Flag zurueckgesetzt werden.
 // wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
 // GraphicNode entfernt wird.
-                BOOL bOldNativFormat = bNativFormat;
+                sal_Bool bOldNativFormat = bNativFormat;
 
                 // falls gedruckt werden soll, warten wir bis die
                 // Daten vorhanden sind
@@ -149,7 +149,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                             Application::Reschedule();
 
                         xMed = xTmpMed;
-                        bClearMedium = TRUE;
+                        bClearMedium = sal_True;
                     }
                 }
 
@@ -210,7 +210,7 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
                 if( xMed.Is() && !bSynchron && bClearMedium )
                 {
                     xMed.Clear();
-                    bClearMedium = FALSE;
+                    bClearMedium = sal_False;
                 }
             }
         }
@@ -226,10 +226,10 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
 
 
 
-BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
+sal_Bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
 {
     if( !pLink || !pLink->GetLinkManager() )
-        return FALSE;
+        return sal_False;
 
     // teste doch mal, ob nicht ein anderer Link mit der gleichen
     // Verbindung schon existiert
@@ -241,7 +241,7 @@ BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
         if( pShell.Is() )
         {
             if( pShell->IsAbortingImport() )
-                return FALSE;
+                return sal_False;
 
             if( pShell->GetMedium() )
                 sReferer = pShell->GetMedium()->GetName();
@@ -265,25 +265,25 @@ BOOL SvFileObject::Connect( sfx2::SvBaseLink* pLink )
         break;
 
     default:
-        return FALSE;
+        return sal_False;
     }
 
     SetUpdateTimeout( 0 );
 
     // und jetzt bei diesem oder gefundenem Pseudo-Object anmelden
     AddDataAdvise( pLink, SotExchange::GetFormatMimeType( pLink->GetContentType()), 0 );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvFileObject::LoadFile_Impl()
+sal_Bool SvFileObject::LoadFile_Impl()
 {
     // wir sind noch im Laden!!
     if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
-        return FALSE;
+        return sal_False;
 
     // z.Z. nur auf die aktuelle DocShell
-    xMed = new SfxMedium( sFileNm, STREAM_STD_READ, TRUE );
+    xMed = new SfxMedium( sFileNm, STREAM_STD_READ, sal_True );
     SvLinkSource::StreamToLoadFrom aStreamToLoadFrom =
         getStreamToLoadFrom();
     xMed->setStreamToLoadFrom(
@@ -294,14 +294,14 @@ BOOL SvFileObject::LoadFile_Impl()
 
     if( !bSynchron )
     {
-        bLoadAgain = bDataReady = bInNewData = FALSE;
-        bWaitForData = TRUE;
+        bLoadAgain = bDataReady = bInNewData = sal_False;
+        bWaitForData = sal_True;
 
         SfxMediumRef xTmpMed = xMed;
         xMed->SetDataAvailableLink( STATIC_LINK( this, SvFileObject, LoadGrfNewData_Impl ) );
-        bInCallDownLoad = TRUE;
+        bInCallDownLoad = sal_True;
         xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
-        bInCallDownLoad = FALSE;
+        bInCallDownLoad = sal_False;
 
         bClearMedium = !xMed.Is();
         if( bClearMedium )
@@ -309,24 +309,24 @@ BOOL SvFileObject::LoadFile_Impl()
         return bDataReady;
     }
 
-    bWaitForData = TRUE;
-    bDataReady = bInNewData = FALSE;
+    bWaitForData = sal_True;
+    bDataReady = bInNewData = sal_False;
     xMed->DownLoad();
     bLoadAgain = !xMed->IsRemote();
-    bWaitForData = FALSE;
+    bWaitForData = sal_False;
 
     // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
     SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
                         ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
+sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 {
     GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
 
-    const USHORT nFilter = sFilter.Len() && pGF->GetImportFormatCount()
+    const sal_uInt16 nFilter = sFilter.Len() && pGF->GetImportFormatCount()
                             ? pGF->GetImportFormatNumber( sFilter )
                             : GRFILTER_FORMAT_DONTKNOW;
 
@@ -364,10 +364,10 @@ BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
                 xMed->SetDataAvailableLink( Link() );
 //				xMed->SetDoneLink( Link() );
                 delete pDownLoadData, pDownLoadData = 0;
-                bDataReady = TRUE;
-                bWaitForData = FALSE;
+                bDataReady = sal_True;
+                bWaitForData = sal_False;
             }
-            else if( FALSE )
+            else if( sal_False )
             {
                 // Timer aufsetzen, um zurueck zukehren
                 pDownLoadData->aTimer.Start();
@@ -517,15 +517,15 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
 IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
 {
     // wenn wir von hier kommen, kann es kein Fehler mehr sein
-    pThis->bLoadError = FALSE;
-    pThis->bWaitForData = FALSE;
-    pThis->bInCallDownLoad = FALSE;
+    pThis->bLoadError = sal_False;
+    pThis->bWaitForData = sal_False;
+    pThis->bInCallDownLoad = sal_False;
 
     if( !pThis->bInNewData && !pThis->bDataReady )
     {
             // Grafik ist fertig, also DataChanged von der Status-
             // aederung schicken:
-        pThis->bDataReady = TRUE;
+        pThis->bDataReady = sal_True;
         pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
 
             // und dann nochmal die Daten senden
@@ -534,7 +534,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
 
     if( pThis->bDataReady )
     {
-        pThis->bLoadAgain = TRUE;
+        pThis->bLoadAgain = sal_True;
         if( pThis->xMed.Is() )
         {
             pThis->xMed->SetDataAvailableLink( Link() );
@@ -565,8 +565,8 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
     if( pThis->bInNewData )
         return 0;
 
-    pThis->bInNewData = TRUE;
-    pThis->bLoadError = FALSE;
+    pThis->bInNewData = sal_True;
+    pThis->bLoadError = sal_False;
 
     if( !pThis->pDownLoadData )
     {
@@ -597,7 +597,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
         // im DataChanged ein DataReady?
         else if( pThis->bWaitForData && pThis->pDownLoadData )
         {
-            pThis->bLoadError = TRUE;
+            pThis->bLoadError = sal_True;
         }
     }
 
@@ -608,7 +608,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
         pThis->SendStateChg_Impl( pStrm->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
     }
 
-    pThis->bInNewData = FALSE;
+    pThis->bInNewData = sal_False;
     return 0;
 }
 
@@ -647,28 +647,28 @@ IMPL_LINK( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
         ERRCODE_SO_PENDING		wenn sie noch nicht komplett gelesen wurde
         ERRCODE_SO_FALSE		sonst
 */
-BOOL SvFileObject::IsPending() const
+sal_Bool SvFileObject::IsPending() const
 {
     return FILETYPE_GRF == nType && !bLoadError &&
             ( pDownLoadData || bWaitForData );
 }
-BOOL SvFileObject::IsDataComplete() const
+sal_Bool SvFileObject::IsDataComplete() const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( FILETYPE_GRF != nType )
-        bRet = TRUE;
+        bRet = sal_True;
     else if( !bLoadError && ( !bWaitForData && !pDownLoadData ))
     {
         SvFileObject* pThis = (SvFileObject*)this;
         if( bDataReady ||
             ( bSynchron && pThis->LoadFile_Impl() && xMed.Is() ) )
-            bRet = TRUE;
+            bRet = sal_True;
         else
         {
             INetURLObject aUrl( sFileNm );
             if( aUrl.HasError() ||
                 INET_PROT_NOT_VALID == aUrl.GetProtocol() )
-                bRet = TRUE;
+                bRet = sal_True;
         }
     }
     return bRet;
@@ -682,8 +682,8 @@ void SvFileObject::CancelTransfers()
     if( !bDataReady )
     {
         // nicht noch mal aufsetzen
-        bLoadAgain = FALSE;
-        bDataReady = bLoadError = bWaitForData = TRUE;
+        bLoadAgain = sal_False;
+        bDataReady = bLoadError = bWaitForData = sal_True;
         SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
     }
 }
@@ -697,7 +697,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
         aAny <<= rtl::OUString::valueOf( (sal_Int32)nState );
         DataChanged( SotExchange::GetFormatName(
                         sfx2::LinkManager::RegisterStatusInfoId()), aAny );
-        bStateChangeCalled = TRUE;
+        bStateChangeCalled = sal_True;
     }
 }
 
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 622a125c81..0407b91890 100644..100755
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -47,22 +47,22 @@ class SvFileObject : public sfx2::SvLinkSource
     Impl_DownLoadData*  pDownLoadData;
     Window*             pOldParent;
 
-    BYTE nType;
-
-    BOOL bLoadAgain : 1;
-    BOOL bSynchron : 1;
-    BOOL bLoadError : 1;
-    BOOL bWaitForData : 1;
-    BOOL bInNewData : 1;
-    BOOL bDataReady : 1;
-    BOOL bMedUseCache : 1;
-    BOOL bNativFormat : 1;
-    BOOL bClearMedium : 1;
-    BOOL bStateChangeCalled : 1;
-    BOOL bInCallDownLoad : 1;
-
-    BOOL GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
-    BOOL LoadFile_Impl();
+    sal_uInt8 nType;
+
+    sal_Bool bLoadAgain : 1;
+    sal_Bool bSynchron : 1;
+    sal_Bool bLoadError : 1;
+    sal_Bool bWaitForData : 1;
+    sal_Bool bInNewData : 1;
+    sal_Bool bDataReady : 1;
+    sal_Bool bMedUseCache : 1;
+    sal_Bool bNativFormat : 1;
+    sal_Bool bClearMedium : 1;
+    sal_Bool bStateChangeCalled : 1;
+    sal_Bool bInCallDownLoad : 1;
+
+    sal_Bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
+    sal_Bool LoadFile_Impl();
     void SendStateChg_Impl( sfx2::LinkManager::LinkState nState );
 
     DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* );
@@ -76,17 +76,17 @@ protected:
 public:
     SvFileObject();
 
-    virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                             const String & rMimeType,
-                            BOOL bSynchron = FALSE );
+                            sal_Bool bSynchron = sal_False );
 
-    virtual BOOL    Connect( sfx2::SvBaseLink* );
+    virtual sal_Bool    Connect( sfx2::SvBaseLink* );
     virtual void    Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl );
 
     // erfrage ob das man direkt auf die Daten zugreifen kann oder ob das
     // erst angestossen werden muss
-    virtual BOOL IsPending() const;
-    virtual BOOL IsDataComplete() const;
+    virtual sal_Bool IsPending() const;
+    virtual sal_Bool IsDataComplete() const;
 
     void CancelTransfers();
 };
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index b0f3ffc20c..b0f3ffc20c 100644..100755
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 22e3e5d664..22e3e5d664 100644..100755
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index 685f2b8101..685f2b8101 100644..100755
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 80990d449f..d3ac6bc4ea 100644..100755
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -136,7 +136,7 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL )
     {
         m_pHistory = new HelpHistoryList_Impl;
         Any aEmptyViewData;
-        m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData ) );
+        m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData, (sal_uIntPtr)0x0 ) );
         m_nCurPos = m_pHistory->size() - 1;
 
         m_pWindow->UpdateToolbox();
@@ -277,7 +277,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
                 }
             }
 
-            ULONG nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
+            sal_uIntPtr nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
                                                     : ( !bBack && m_nCurPos < m_pHistory->size() - 1 )
                                                     ? ++m_nCurPos
                                                     : ULONG_MAX;
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 9131357886..db6f9ea659 100644..100755
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -74,7 +74,7 @@ friend class SfxHelpWindow_Impl;
 
     HelpHistoryList_Impl*		m_pHistory;
     SfxHelpWindow_Impl*			m_pWindow;
-    ULONG						m_nCurPos;
+    sal_uIntPtr						m_nCurPos;
     String						m_aCurrentURL;
     com::sun::star::uno::Any    m_aViewData;
 
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index c9c52342a1..d4c410a2a7 100644..100755
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -42,7 +42,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/logfile.hxx>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/dispatch.hxx>
@@ -71,7 +71,7 @@ typedef boost::unordered_map< ::rtl::OUString,
 Image SAL_CALL GetImage(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     const ::rtl::OUString& aURL,
-    BOOL bBig
+    bool bBig
 )
 {
     // TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
@@ -91,7 +91,7 @@ Image SAL_CALL GetImage(
     rtl::OUString aCommandURL( aURL );
     if ( nProtocol == INET_PROT_SLOT )
     {
-        USHORT nId = ( USHORT ) String(aURL).Copy(5).ToInt32();
+        sal_uInt16 nId = ( sal_uInt16 ) String(aURL).Copy(5).ToInt32();
         const SfxSlot* pSlot = 0;
         if ( xModel.is() )
         {
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index a9993b0b76..a9993b0b76 100644..100755
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 7c3ca11a15..7c3ca11a15 100644..100755
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 6ee5e26eca..3b7ffd2174 100644..100755
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #include <tools/svwin.h>
 #endif
 
@@ -46,7 +46,7 @@
 #include "dde.hrc"
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/linkmgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -132,7 +132,7 @@ SvDDEObject::SvDDEObject()
     : pConnection( 0 ), pLink( 0 ), pRequest( 0 ), pGetData( 0 ), nError( 0 )
 {
     SetUpdateTimeout( 100 );
-    bWaitForData = FALSE;
+    bWaitForData = sal_False;
 }
 
 SvDDEObject::~SvDDEObject()
@@ -142,12 +142,12 @@ SvDDEObject::~SvDDEObject()
     delete pConnection;
 }
 
-BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                             const String & rMimeType,
-                            BOOL bSynchron )
+                            sal_Bool bSynchron )
 {
     if( !pConnection )
-        return FALSE;
+        return sal_False;
 
     if( pConnection->GetError() )  // then we try once more
     {
@@ -161,10 +161,10 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
     }
 
     if( bWaitForData ) // we are in an rekursive loop, get out again
-        return FALSE;
+        return sal_False;
 
     // Lock against Reentrance
-    bWaitForData = TRUE;
+    bWaitForData = sal_True;
 
     // if you want to print, we'll wait until the data is available
     if( bSynchron )
@@ -182,7 +182,7 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
         if( pConnection->GetError() )
             nError = DDELINK_ERROR_DATA;
 
-        bWaitForData = FALSE;
+        bWaitForData = sal_False;
     }
     else
     {
@@ -206,12 +206,12 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
 }
 
 
-BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
+sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
 {
-#if defined(WIN) || defined(WNT)
-    static BOOL bInWinExec = FALSE;
+#if defined(WNT)
+    static sal_Bool bInWinExec = sal_False;
 #endif
-    USHORT nLinkType = pSvLink->GetUpdateMode();
+    sal_uInt16 nLinkType = pSvLink->GetUpdateMode();
     if( pConnection )           // Connection is already made
     {
         // well, then just add it as dependent
@@ -222,17 +222,17 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                         : 0 );
         AddConnectAdvise( pSvLink );
 
-        return TRUE;
+        return sal_True;
     }
 
     if( !pSvLink->GetLinkManager() )
-        return FALSE;
+        return sal_False;
 
     String sServer, sTopic;
     pSvLink->GetLinkManager()->GetDisplayNames( pSvLink, &sServer, &sTopic, &sItem );
 
     if( !sServer.Len() || !sTopic.Len() || !sItem.Len() )
-        return FALSE;
+        return sal_False;
 
     pConnection = new DdeConnection( sServer, sTopic );
     if( pConnection->GetError() )
@@ -243,7 +243,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
        // then the server is up, it just does not know the topic!
         if( sTopic.EqualsIgnoreCaseAscii( "SYSTEM" ) )
         {
-            BOOL bSysTopic;
+            sal_Bool bSysTopic;
             {
                 DdeConnection aTmp( sServer, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "SYSTEM" ) ) );
                 bSysTopic = !aTmp.GetError();
@@ -252,12 +252,12 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
             if( bSysTopic )
             {
                 nError = DDELINK_ERROR_DATA;
-                return FALSE;
+                return sal_False;
             }
             // otherwise in  Win/WinNT, start the Application directly
         }
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
         // Server not up, try once more to start it.
         if( !bInWinExec )
@@ -270,12 +270,12 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                 nError = DDELINK_ERROR_APP;
             else
             {
-                USHORT i;
+                sal_uInt16 i;
                 for( i=0; i<5; i++ )
                 {
-                    bInWinExec = TRUE;
+                    bInWinExec = sal_True;
                     Application::Reschedule();
-                    bInWinExec = FALSE;
+                    bInWinExec = sal_False;
 
                     delete pConnection;
                     pConnection = new DdeConnection( sServer, sTopic );
@@ -290,7 +290,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
             }
         }
         else
-#endif  // WIN / WNT
+#endif	// WNT
         {
             nError = DDELINK_ERROR_APP;
         }
@@ -307,7 +307,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
     }
 
     if( pConnection->GetError() )
-        return FALSE;
+        return sal_False;
 
     AddDataAdvise( pSvLink,
                 SotExchange::GetFormatMimeType( pSvLink->GetContentType()),
@@ -316,7 +316,7 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink )
                         : 0 );
     AddConnectAdvise( pSvLink );
     SetUpdateTimeout( 0 );
-    return TRUE;
+    return sal_True;
 }
 
 void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl )
@@ -329,9 +329,9 @@ void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link
     }
 }
 
-BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
+sal_Bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
 {
-    USHORT nFmt = 0;
+    sal_uInt16 nFmt = 0;
     switch( rReq.GetFormat() )
     {
     case FORMAT_RTF:
@@ -358,7 +358,7 @@ BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
     return 0 != nFmt;
 }
 
-BOOL SvDDEObject::IsPending() const
+sal_Bool SvDDEObject::IsPending() const
 /*  [Description]
 
     The method determines whether the data-object can be read from a DDE.
@@ -372,14 +372,14 @@ BOOL SvDDEObject::IsPending() const
     return bWaitForData;
 }
 
-BOOL SvDDEObject::IsDataComplete() const
+sal_Bool SvDDEObject::IsDataComplete() const
 {
     return bWaitForData;
 }
 
 IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
 {
-    ULONG nFmt = pData->GetFormat();
+    sal_uIntPtr nFmt = pData->GetFormat();
     switch( nFmt )
     {
     case FORMAT_GDIMETAFILE:
@@ -405,7 +405,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
                 aVal <<= aSeq;
                 DataChanged( SotExchange::GetFormatMimeType(
                                                 pData->GetFormat() ), aVal );
-                bWaitForData = FALSE;
+                bWaitForData = sal_False;
             }
         }
     }
@@ -415,7 +415,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
 
 IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
 {
-    BOOL bValid = (BOOL)(ULONG)pData;
+    sal_Bool bValid = (sal_Bool)(sal_uIntPtr)pData;
     if( !bValid && ( pRequest || pLink ))
     {
         DdeTransaction* pReq = 0;
@@ -432,13 +432,13 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
             }
             else if( pReq == pRequest )
             {
-                bWaitForData = FALSE;
+                bWaitForData = sal_False;
             }
         }
     }
     else
         // End waiting
-        bWaitForData = FALSE;
+        bWaitForData = sal_False;
 
     return 0;
 }
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 86734c6fe3..305cba2496 100644..100755
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -49,11 +49,11 @@ class SvDDEObject : public SvLinkSource
     DdeRequest* pRequest;
     ::com::sun::star::uno::Any * pGetData;
 
-    BYTE bWaitForData : 1;  // waiting for data?
-    BYTE nError       : 7;  // Error code for dialogue
+    sal_uInt8 bWaitForData : 1;  // waiting for data?
+    sal_uInt8 nError       : 7;  // Error code for dialogue
 
 
-    BOOL ImplHasOtherFormat( DdeTransaction& );
+    sal_Bool ImplHasOtherFormat( DdeTransaction& );
     DECL_LINK( ImplGetDDEData, DdeData* );
     DECL_LINK( ImplDoneDDEData, void* );
 
@@ -63,15 +63,15 @@ protected:
 public:
     SvDDEObject();
 
-    virtual BOOL	GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool	GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                                 const String & aMimeType,
-                                BOOL bSynchron = FALSE );
+                                sal_Bool bSynchron = sal_False );
 
-    virtual BOOL	Connect( SvBaseLink * );
+    virtual sal_Bool	Connect( SvBaseLink * );
     virtual void    Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl );
 
-    virtual BOOL	IsPending() const;
-    virtual BOOL	IsDataComplete() const;
+    virtual sal_Bool	IsPending() const;
+    virtual sal_Bool	IsDataComplete() const;
 };
 
 }
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 7b27b38b39..dfbf6e12b2 100644..100755
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -51,7 +51,7 @@
 #include "fileobj.hxx"
 #include "impldde.hxx"
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -74,7 +74,7 @@ class SvxInternalLink : public sfx2::SvLinkSource
 public:
     SvxInternalLink() {}
 
-    virtual BOOL Connect( sfx2::SvBaseLink* );
+    virtual sal_Bool Connect( sfx2::SvBaseLink* );
 };
 
 
@@ -89,7 +89,7 @@ LinkManager::LinkManager(SfxObjectShell* p)
 LinkManager::~LinkManager()
 {
     SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
-    for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
+    for( sal_uInt16 n = aLinkTbl.Count(); n; --n, ++ppRef )
     {
         if( (*ppRef)->Is() )
         {
@@ -128,16 +128,16 @@ void LinkManager::CloseCachedComps()
 void LinkManager::Remove( SvBaseLink *pLink )
 {
     // No duplicate links inserted
-    int bFound = FALSE;
+    int bFound = sal_False;
     SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
-    for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
+    for( sal_uInt16 n = aLinkTbl.Count(); n; --n, ++ppRef )
     {
         if( pLink == *(*ppRef) )
         {
             (*(*ppRef))->Disconnect();
             (*(*ppRef))->SetLinkManager( NULL );
             (*(*ppRef)).Clear();
-            bFound = TRUE;
+            bFound = sal_True;
         }
 
         // Remove emty ones if they exist
@@ -153,7 +153,7 @@ void LinkManager::Remove( SvBaseLink *pLink )
 }
 
 
-void LinkManager::Remove( USHORT nPos, USHORT nCnt )
+void LinkManager::Remove( sal_uInt16 nPos, sal_uInt16 nCnt )
 {
     if( nCnt && nPos < aLinkTbl.Count() )
     {
@@ -161,7 +161,7 @@ void LinkManager::Remove( USHORT nPos, USHORT nCnt )
             nCnt = aLinkTbl.Count() - nPos;
 
         SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData() + nPos;
-        for( USHORT n = nCnt; n; --n, ++ppRef )
+        for( sal_uInt16 n = nCnt; n; --n, ++ppRef )
         {
             if( (*ppRef)->Is() )
             {
@@ -175,29 +175,29 @@ void LinkManager::Remove( USHORT nPos, USHORT nCnt )
 }
 
 
-BOOL LinkManager::Insert( SvBaseLink* pLink )
+sal_Bool LinkManager::Insert( SvBaseLink* pLink )
 {
   // No duplicate links inserted
-    for( USHORT n = 0; n < aLinkTbl.Count(); ++n )
+    for( sal_uInt16 n = 0; n < aLinkTbl.Count(); ++n )
     {
         SvBaseLinkRef* pTmp = aLinkTbl[ n ];
         if( !pTmp->Is() )
             aLinkTbl.DeleteAndDestroy( n-- );
 
         if( pLink == *pTmp )
-            return FALSE;
+            return sal_False;
     }
 
     SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink );
     pLink->SetLinkManager( this );
     aLinkTbl.Insert( pTmp, aLinkTbl.Count() );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL LinkManager::InsertLink( SvBaseLink * pLink,
-                                USHORT nObjType,
-                                USHORT nUpdateMode,
+sal_Bool LinkManager::InsertLink( SvBaseLink * pLink,
+                                sal_uInt16 nObjType,
+                                sal_uInt16 nUpdateMode,
                                 const String* pName )
 {
     // This First
@@ -209,13 +209,13 @@ BOOL LinkManager::InsertLink( SvBaseLink * pLink,
 }
 
 
-BOOL LinkManager::InsertDDELink( SvBaseLink * pLink,
+sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink,
                                     const String& rServer,
                                     const String& rTopic,
                                     const String& rItem )
 {
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
-        return FALSE;
+        return sal_False;
 
     String sCmd;
     ::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem );
@@ -226,11 +226,11 @@ BOOL LinkManager::InsertDDELink( SvBaseLink * pLink,
 }
 
 
-BOOL LinkManager::InsertDDELink( SvBaseLink * pLink )
+sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink )
 {
     DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
-        return FALSE;
+        return sal_False;
 
     if( pLink->GetObjType() == OBJECT_CLIENT_SO )
         pLink->SetObjType( OBJECT_CLIENT_DDE );
@@ -240,13 +240,13 @@ BOOL LinkManager::InsertDDELink( SvBaseLink * pLink )
 
 
 // Obtain the string for the dialog
-BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
+sal_Bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                                         String* pType,
                                         String* pFile,
                                         String* pLinkStr,
                                         String* pFilter ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     const String sLNm( pLink->GetLinkSourceName() );
     if( sLNm.Len() )
     {
@@ -256,7 +256,7 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
             case OBJECT_CLIENT_GRF:
             case OBJECT_CLIENT_OLE:
                 {
-                    USHORT nPos = 0;
+                    sal_uInt16 nPos = 0;
                     String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
                     String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
 
@@ -275,12 +275,12 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                                             ? RID_SVXSTR_FILELINK
                                             : RID_SVXSTR_GRAFIKLINK ));
                     }
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 break;
             case OBJECT_CLIENT_DDE:
                 {
-                    USHORT nTmp = 0;
+                    sal_uInt16 nTmp = 0;
                     String sCmd( sLNm );
                     String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
                     String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
@@ -291,7 +291,7 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                         *pFile = sTopic;
                     if( pLinkStr )
                         *pLinkStr = sCmd.Copy( nTmp );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 break;
             default:
@@ -304,9 +304,9 @@ BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
 
 
 void LinkManager::UpdateAllLinks(
-    BOOL bAskUpdate,
-    BOOL /*bCallErrHdl*/,
-    BOOL bUpdateGrfLinks,
+    sal_Bool bAskUpdate, 
+    sal_Bool /*bCallErrHdl*/,
+    sal_Bool bUpdateGrfLinks, 
     Window* pParentWin )
 {
     SvStringsDtor aApps, aTopics, aItems;
@@ -315,7 +315,7 @@ void LinkManager::UpdateAllLinks(
     // First make a copy of the array in order to update links 
     // links in ... no contact between them!
     SvPtrarr aTmpArr( 255, 50 );
-    USHORT n;
+    sal_uInt16 n;
     for( n = 0; n < aLinkTbl.Count(); ++n )
     {
         SvBaseLink* pLink = *aLinkTbl[ n ];
@@ -332,8 +332,8 @@ void LinkManager::UpdateAllLinks(
         SvBaseLink* pLink = (SvBaseLink*)aTmpArr[ n ];
 
         // search first in the array after the entry
-        USHORT nFndPos = USHRT_MAX;
-        for( USHORT i = 0; i < aLinkTbl.Count(); ++i )
+        sal_uInt16 nFndPos = USHRT_MAX;
+        for( sal_uInt16 i = 0; i < aLinkTbl.Count(); ++i )
             if( pLink == *aLinkTbl[ i ] )
             {
                 nFndPos = i;
@@ -353,7 +353,7 @@ void LinkManager::UpdateAllLinks(
             int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute();
             if( RET_YES != nRet )
                 return ;         // nothing should be updated
-            bAskUpdate = FALSE;  // once is enough
+            bAskUpdate = sal_False  // once is enough
         }
 
         pLink->Update();
@@ -384,20 +384,20 @@ SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
        }
 }
 
-BOOL LinkManager::InsertServer( SvLinkSource* pObj )
+sal_Bool LinkManager::InsertServer( SvLinkSource* pObj )
 {
     // no duplicate inserts
     if( !pObj || USHRT_MAX != aServerTbl.GetPos( pObj ) )
-        return FALSE;
+        return sal_False;
 
     aServerTbl.Insert( pObj, aServerTbl.Count() );
-    return TRUE;
+    return sal_True;
 }
 
 
 void LinkManager::RemoveServer( SvLinkSource* pObj )
 {
-    USHORT nPos = aServerTbl.GetPos( pObj );
+    sal_uInt16 nPos = aServerTbl.GetPos( pObj );
     if( USHRT_MAX != nPos )
         aServerTbl.Remove( nPos, 1 );
 }
@@ -467,14 +467,14 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer
     }
 }
 
-BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
-                                    USHORT nFileType,
+bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
+                                    sal_uInt16 nFileType,
                                     const String& rFileNm,
                                     const String* pFilterNm,
                                     const String* pRange )
 {
     if( !( OBJECT_CLIENT_SO & rLink.GetObjType() ))
-        return FALSE;
+        return sal_False;
 
     String sCmd( rFileNm );
     sCmd += ::sfx2::cTokenSeperator;
@@ -486,11 +486,11 @@ BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
     return InsertLink( &rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &sCmd );
 }
 
-BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
+sal_Bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
 {
     if( OBJECT_CLIENT_FILE == ( OBJECT_CLIENT_FILE & rLink.GetObjType() ))
         return InsertLink( &rLink, rLink.GetObjType(), sfx2::LINKUPDATE_ONCALL );
-    return FALSE;
+    return sal_False;
 }
 
 // A transfer is aborted, so cancel all download media 
@@ -501,7 +501,7 @@ void LinkManager::CancelTransfers()
     sfx2::SvBaseLink* pLnk;
 
     const sfx2::SvBaseLinks& rLnks = GetLinks();
-    for( USHORT n = rLnks.Count(); n; )
+    for( sal_uInt16 n = rLnks.Count(); n; )
         if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
             OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
             0 != ( pFileObj = (SvFileObject*)pLnk->GetObj() ) )
@@ -512,9 +512,9 @@ void LinkManager::CancelTransfers()
     // gets the appropriate information as a string  
     // For now this is required for file object in conjunction with JavaScript
     // - needs information about Load/Abort/Error
-ULONG LinkManager::RegisterStatusInfoId()
+sal_uIntPtr LinkManager::RegisterStatusInfoId()
 {
-    static ULONG nFormat = 0;
+    static sal_uIntPtr nFormat = 0;
 
     if( !nFormat )
     {
@@ -529,11 +529,11 @@ ULONG LinkManager::RegisterStatusInfoId()
 
 // ----------------------------------------------------------------------
 
-BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
+sal_Bool LinkManager::GetGraphicFromAny( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
     if( rValue.hasValue() && ( rValue >>= aSeq ) )
     {
@@ -546,7 +546,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
         case SOT_FORMATSTR_ID_SVXB:
             {
                 aMemStm >> rGrf;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         case FORMAT_GDIMETAFILE:
@@ -554,7 +554,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
                 GDIMetaFile aMtf;
                 aMtf.Read( aMemStm );
                 rGrf = aMtf;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         case FORMAT_BITMAP:
@@ -562,7 +562,7 @@ BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
                 Bitmap aBmp;
                 aMemStm >> aBmp;
                 rGrf = aBmp;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             break;
         }
@@ -583,10 +583,10 @@ String lcl_DDE_RelToAbs( const String& rTopic, const String& rBaseURL )
     return sRet;
 }
 
-BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 {
     SfxObjectShell* pFndShell = 0;
-    USHORT nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
+    sal_uInt16 nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
     String sTopic, sItem, sReferer;
     LinkManager* pLinkMgr = pLink->GetLinkManager();
     if (pLinkMgr && pLinkMgr->GetDisplayNames(pLink, 0, &sTopic, &sItem) && sTopic.Len())
@@ -602,7 +602,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
         TypeId aType( TYPE(SfxObjectShell) );
 
-        BOOL bFirst = TRUE;
+        sal_Bool bFirst = sal_True;
         SfxObjectShell* pShell = pLinkMgr->GetPersist();
         if( pShell && pShell->GetMedium() )
         {
@@ -617,7 +617,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
         if ( !pShell )
         {
-            bFirst = FALSE;
+            bFirst = sal_False;
             pShell = SfxObjectShell::GetFirst( &aType, sal_False );
         }
 
@@ -639,7 +639,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
             if( bFirst )
             {
-                bFirst = FALSE;
+                bFirst = sal_False;
                 pShell = SfxObjectShell::GetFirst( &aType, sal_False );
             }
             else
@@ -651,7 +651,7 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 
     // empty topics are not allowed - which document is it
     if( !sTopic.Len() )
-        return FALSE;
+        return sal_False;
 
     if (pFndShell)
     {
@@ -679,8 +679,8 @@ BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
             INET_PROT_HTTP != aURL.GetProtocol() )
         {
             SfxStringItem aName( SID_FILE_NAME, sTopic );
-            SfxBoolItem aMinimized(SID_MINIMIZED, TRUE);
-            SfxBoolItem aHidden(SID_HIDDEN, TRUE);
+            SfxBoolItem aMinimized(SID_MINIMIZED, sal_True);
+            SfxBoolItem aHidden(SID_HIDDEN, sal_True);
             SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
             SfxStringItem aReferer( SID_REFERER, sReferer );
             SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index cbd000a3fd..5aa67ecf96 100644..100755
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -67,7 +67,7 @@ void SvLinkSourceTimer::Timeout()
 }
 
 static void StartTimer( SvLinkSourceTimer ** ppTimer, SvLinkSource * pOwner,
-                        ULONG nTimeout )
+                        sal_uIntPtr nTimeout )
 {
     if( !*ppTimer )
     {
@@ -82,17 +82,17 @@ struct SvLinkSource_Entry_Impl
 {
     SvBaseLinkRef		xSink;
     String				aDataMimeType;
-    USHORT				nAdviseModes;
-    BOOL 				bIsDataSink;
+    sal_uInt16				nAdviseModes;
+    sal_Bool 				bIsDataSink;
 
     SvLinkSource_Entry_Impl( SvBaseLink* pLink, const String& rMimeType,
-                                USHORT nAdvMode )
+                                sal_uInt16 nAdvMode )
         : xSink( pLink ), aDataMimeType( rMimeType ),
-            nAdviseModes( nAdvMode ), bIsDataSink( TRUE )
+            nAdviseModes( nAdvMode ), bIsDataSink( sal_True )
     {}
 
     SvLinkSource_Entry_Impl( SvBaseLink* pLink )
-        : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( FALSE )
+        : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( sal_False )
     {}
 
     ~SvLinkSource_Entry_Impl();
@@ -110,7 +110,7 @@ class SvLinkSource_EntryIter_Impl
 {
     SvLinkSource_Array_Impl aArr;
     const SvLinkSource_Array_Impl& rOrigArr;
-    USHORT nPos;
+    sal_uInt16 nPos;
 public:
     SvLinkSource_EntryIter_Impl( const SvLinkSource_Array_Impl& rArr );
     ~SvLinkSource_EntryIter_Impl();
@@ -168,7 +168,7 @@ struct SvLinkSource_Impl
     SvLinkSource_Array_Impl aArr;
     String				aDataMimeType;
     SvLinkSourceTimer *	pTimer;
-    ULONG				nTimeout;
+    sal_uIntPtr				nTimeout;
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
     m_xInputStreamToLoadFrom;
     sal_Bool m_bIsReadOnly;
@@ -222,12 +222,12 @@ void  SvLinkSource::Closed()
             p->xSink->Closed();
 }
 
-ULONG SvLinkSource::GetUpdateTimeout() const
+sal_uIntPtr SvLinkSource::GetUpdateTimeout() const
 {
     return pImpl->nTimeout;
 }
 
-void SvLinkSource::SetUpdateTimeout( ULONG nTimeout )
+void SvLinkSource::SetUpdateTimeout( sal_uIntPtr nTimeout )
 {
     pImpl->nTimeout = nTimeout;
     if( pImpl->pTimer )
@@ -247,7 +247,7 @@ void SvLinkSource::SendDataChanged()
 
             Any aVal;
             if( ( p->nAdviseModes & ADVISEMODE_NODATA ) ||
-                GetData( aVal, sDataMimeType, TRUE ) )
+                GetData( aVal, sDataMimeType, sal_True ) )
             {
                 p->xSink->DataChanged( sDataMimeType, aVal );
 
@@ -256,7 +256,7 @@ void SvLinkSource::SendDataChanged()
 
                 if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                 {
-                    USHORT nFndPos = pImpl->aArr.GetPos( p );
+                    sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                     if( USHRT_MAX != nFndPos )
                         pImpl->aArr.DeleteAndDestroy( nFndPos );
                 }
@@ -284,7 +284,7 @@ void SvLinkSource::NotifyDataChanged()
             {
                 Any aVal;
                 if( ( p->nAdviseModes & ADVISEMODE_NODATA ) ||
-                    GetData( aVal, p->aDataMimeType, TRUE ) )
+                    GetData( aVal, p->aDataMimeType, sal_True ) )
                 {
                     p->xSink->DataChanged( p->aDataMimeType, aVal );
 
@@ -293,7 +293,7 @@ void SvLinkSource::NotifyDataChanged()
 
                     if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                     {
-                        USHORT nFndPos = pImpl->aArr.GetPos( p );
+                        sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                         if( USHRT_MAX != nFndPos )
                             pImpl->aArr.DeleteAndDestroy( nFndPos );
                     }
@@ -333,7 +333,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
 
                 if( p->nAdviseModes & ADVISEMODE_ONLYONCE )
                 {
-                    USHORT nFndPos = pImpl->aArr.GetPos( p );
+                    sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
                     if( USHRT_MAX != nFndPos )
                         pImpl->aArr.DeleteAndDestroy( nFndPos );
                 }
@@ -351,7 +351,7 @@ void SvLinkSource::DataChanged( const String & rMimeType,
 
 // only one link is correct
 void SvLinkSource::AddDataAdvise( SvBaseLink * pLink, const String& rMimeType,
-                                    USHORT nAdviseModes )
+                                    sal_uInt16 nAdviseModes )
 {
     SvLinkSource_Entry_ImplPtr pNew = new SvLinkSource_Entry_Impl(
                     pLink, rMimeType, nAdviseModes );
@@ -364,7 +364,7 @@ void SvLinkSource::RemoveAllDataAdvise( SvBaseLink * pLink )
     for( SvLinkSource_Entry_ImplPtr p = aIter.Curr(); p; p = aIter.Next() )
         if( p->bIsDataSink && &p->xSink == pLink )
         {
-            USHORT nFndPos = pImpl->aArr.GetPos( p );
+            sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
             if( USHRT_MAX != nFndPos )
                 pImpl->aArr.DeleteAndDestroy( nFndPos );
         }
@@ -383,46 +383,46 @@ void SvLinkSource::RemoveConnectAdvise( SvBaseLink * pLink )
     for( SvLinkSource_Entry_ImplPtr p = aIter.Curr(); p; p = aIter.Next() )
         if( !p->bIsDataSink && &p->xSink == pLink )
         {
-            USHORT nFndPos = pImpl->aArr.GetPos( p );
+            sal_uInt16 nFndPos = pImpl->aArr.GetPos( p );
             if( USHRT_MAX != nFndPos )
                 pImpl->aArr.DeleteAndDestroy( nFndPos );
         }
 }
 
-BOOL SvLinkSource::HasDataLinks( const SvBaseLink* pLink ) const
+sal_Bool SvLinkSource::HasDataLinks( const SvBaseLink* pLink ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     const SvLinkSource_Entry_Impl* p;
-    for( USHORT n = 0, nEnd = pImpl->aArr.Count(); n < nEnd; ++n )
+    for( sal_uInt16 n = 0, nEnd = pImpl->aArr.Count(); n < nEnd; ++n )
         if( ( p = pImpl->aArr[ n ] )->bIsDataSink &&
             ( !pLink || &p->xSink == pLink ) )
         {
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         }
     return bRet;
 }
 
-// TRUE => waitinmg for data
-BOOL SvLinkSource::IsPending() const
+// sal_True => waitinmg for data
+sal_Bool SvLinkSource::IsPending() const
 {
-    return FALSE;
+    return sal_False;
 }
 
-// TRUE => data complete loaded
-BOOL SvLinkSource::IsDataComplete() const
+// sal_True => data complete loaded
+sal_Bool SvLinkSource::IsDataComplete() const
 {
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvLinkSource::Connect( SvBaseLink* )
+sal_Bool SvLinkSource::Connect( SvBaseLink* )
 {
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvLinkSource::GetData( ::com::sun::star::uno::Any &, const String &, BOOL )
+sal_Bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const String &, sal_Bool )
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& )
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 23711d6051..add0a01b95 100644..100755
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <vcl/svapp.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/filedlghelper.hxx>
 #include <tools/debug.hxx>
 #include <svl/svdde.hxx>
@@ -50,7 +50,7 @@ namespace sfx2
 
 TYPEINIT0( SvBaseLink )
 
-static DdeTopic* FindTopic( const String &, USHORT* = 0 );
+static DdeTopic* FindTopic( const String &, sal_uInt16* = 0 );
 
 class  ImplDdeItem;
 
@@ -79,10 +79,10 @@ struct ImplBaseLinkData
     struct tClientType
     {
         // applies for all links
-        ULONG   nCntntType;  // Update Format
+        sal_uIntPtr nCntntType; // Update Format
         // Not Ole-Links
-        BOOL    bIntrnlLnk;  // It is an internal link
-        USHORT  nUpdateMode; // UpdateMode
+        sal_Bool    bIntrnlLnk;  // It is an internal link
+        sal_uInt16  nUpdateMode; // UpdateMode
     };
 
     struct tDDEType
@@ -97,7 +97,7 @@ struct ImplBaseLinkData
     ImplBaseLinkData()
     {
         ClientType.nCntntType = 0;
-        ClientType.bIntrnlLnk = FALSE;
+        ClientType.bIntrnlLnk = sal_False;
         ClientType.nUpdateMode = 0;
         DDEType.pItem = NULL;
     }
@@ -109,26 +109,26 @@ class ImplDdeItem : public DdeGetPutItem
     SvBaseLink* pLink;
     DdeData aData;
     Sequence< sal_Int8 > aSeq;  // Datacontainer for DdeData !!!
-    BOOL bIsValidData : 1;
-    BOOL bIsInDTOR : 1;
+    sal_Bool bIsValidData : 1;
+    sal_Bool bIsInDTOR : 1;
 public:
     ImplDdeItem( SvBaseLink& rLink, const String& rStr )
-        : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( FALSE ),
-        bIsInDTOR( FALSE )
+        : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( sal_False ),
+        bIsInDTOR( sal_False )
     {}
     virtual ~ImplDdeItem();
 
-    virtual DdeData* Get( ULONG );
-    virtual BOOL Put( const DdeData* );
-    virtual void AdviseLoop( BOOL );
+    virtual DdeData* Get( sal_uIntPtr );
+    virtual sal_Bool Put( const DdeData* );
+    virtual void AdviseLoop( sal_Bool );
 
     void Notify()
     {
-        bIsValidData = FALSE;
+        bIsValidData = sal_False;
         DdeGetPutItem::NotifyClient();
     }
 
-    BOOL IsInDTOR() const { return bIsInDTOR; }
+    sal_Bool IsInDTOR() const { return bIsInDTOR; }
 };
 
 
@@ -143,8 +143,8 @@ SvBaseLink::SvBaseLink()
     pImpl = new BaseLink_Impl();
     nObjType = OBJECT_CLIENT_SO;
     pImplData = new ImplBaseLinkData;
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
 }
 
 /************************************************************************
@@ -153,18 +153,18 @@ SvBaseLink::SvBaseLink()
 |*        Description
 *************************************************************************/
 
-SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
+SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
 {
     pImpl = new BaseLink_Impl();
     nObjType = OBJECT_CLIENT_SO;
     pImplData = new ImplBaseLinkData;
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
 
     // It it going to be a Ole-Link,
     pImplData->ClientType.nUpdateMode = nUpdateMode;
     pImplData->ClientType.nCntntType = nContentType;
-    pImplData->ClientType.bIntrnlLnk = FALSE;
+    pImplData->ClientType.bIntrnlLnk = sal_False;
 }
 
 /************************************************************************
@@ -173,10 +173,10 @@ SvBaseLink::SvBaseLink( USHORT nUpdateMode, ULONG nContentType )
 |*        Description
 *************************************************************************/
 
-SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSource* pObj )
+SvBaseLink::SvBaseLink( const String& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
 {
-    bVisible = bSynchron = bUseCache = TRUE;
-    bWasLastEditOK = FALSE;
+    bVisible = bSynchron = bUseCache = sal_True;
+    bWasLastEditOK = sal_False;
     aLinkName = rLinkName;
     pImplData = new ImplBaseLinkData;
     nObjType = nObjectType;
@@ -189,7 +189,7 @@ SvBaseLink::SvBaseLink( const String& rLinkName, USHORT nObjectType, SvLinkSourc
 
     if( OBJECT_DDE_EXTERN == nObjType )
     {
-        USHORT nItemStt = 0;
+        sal_uInt16 nItemStt = 0;
         DdeTopic* pTopic = FindTopic( aLinkName, &nItemStt );
         if( pTopic )
         {
@@ -248,7 +248,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
 |*        Description
 *************************************************************************/
 
-void SvBaseLink::SetObjType( USHORT nObjTypeP )
+void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP )
 {
     DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" );
     DBG_ASSERT( !xObj.Is(), "object exist" );
@@ -333,7 +333,7 @@ String  SvBaseLink::GetLinkSourceName() const
 |*        Description
 *************************************************************************/
 
-void SvBaseLink::SetUpdateMode( USHORT nMode )
+void SvBaseLink::SetUpdateMode( sal_uInt16 nMode )
 {
     if( ( OBJECT_CLIENT_SO & nObjType ) &&
         pImplData->ClientType.nUpdateMode != nMode )
@@ -357,7 +357,7 @@ void SvBaseLink::clearStreamToLoadFrom()
     }
 }
 
-BOOL SvBaseLink::Update()
+sal_Bool SvBaseLink::Update()
 {
     if( OBJECT_CLIENT_SO & nObjType )
     {
@@ -380,13 +380,13 @@ BOOL SvBaseLink::Update()
                 if( OBJECT_CLIENT_DDE == nObjType &&
                     LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
                     xObj->RemoveAllDataAdvise( this );
-                return TRUE;
+                return sal_True;
             }
             if( xObj.Is() )
             {
                 // should be asynschron?
                 if( xObj->IsPending() )
-                    return TRUE;
+                    return sal_True;
 
                 // we do not need the object anymore
                 AddNextRef();
@@ -395,19 +395,19 @@ BOOL SvBaseLink::Update()
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-USHORT SvBaseLink::GetUpdateMode() const
+sal_uInt16 SvBaseLink::GetUpdateMode() const
 {
     return ( OBJECT_CLIENT_SO & nObjType )
             ? pImplData->ClientType.nUpdateMode
-            : sal::static_int_cast< USHORT >( LINKUPDATE_ONCALL );
+            : sal::static_int_cast< sal_uInt16 >( LINKUPDATE_ONCALL );
 }
 
 
-void SvBaseLink::_GetRealObject( BOOL bConnect)
+void SvBaseLink::_GetRealObject( sal_Bool bConnect)
 {
     if( !pImpl->m_pLinkMgr )
         return;
@@ -424,12 +424,12 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
             nObjType = OBJECT_INTERN;
             xObj = pImpl->m_pLinkMgr->CreateObj( this );
 
-            pImplData->ClientType.bIntrnlLnk = TRUE;
+            pImplData->ClientType.bIntrnlLnk = sal_True;
             nObjType = OBJECT_CLIENT_DDE;  // so we know what it once was!
         }
         else
         {
-            pImplData->ClientType.bIntrnlLnk = FALSE;
+            pImplData->ClientType.bIntrnlLnk = sal_False;
             xObj = pImpl->m_pLinkMgr->CreateObj( this );
         }
     }
@@ -440,7 +440,7 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
         Disconnect();
 }
 
-ULONG SvBaseLink::GetContentType() const
+sal_uIntPtr SvBaseLink::GetContentType() const
 {
     if( OBJECT_CLIENT_SO & nObjType )
         return pImplData->ClientType.nCntntType;
@@ -449,14 +449,14 @@ ULONG SvBaseLink::GetContentType() const
 }
 
 
-BOOL SvBaseLink::SetContentType( ULONG nType )
+sal_Bool SvBaseLink::SetContentType( sal_uIntPtr nType )
 {
     if( OBJECT_CLIENT_SO & nObjType )
     {
         pImplData->ClientType.nCntntType = nType;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 LinkManager* SvBaseLink::GetLinkManager()
@@ -527,7 +527,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl )
     if ( !bAsync )
     {
         ExecuteEdit( String() );
-        bWasLastEditOK = FALSE;
+        bWasLastEditOK = sal_False;
         if ( pImpl->m_aEndEditLink.IsSet() )
             pImpl->m_aEndEditLink.Call( this );
     }
@@ -546,7 +546,7 @@ bool SvBaseLink::ExecuteEdit( const String& _rNewName )
             {
                 sError = SfxResId( STR_DDE_ERROR );
 
-                USHORT nFndPos = sError.Search( '%' );
+                sal_uInt16 nFndPos = sError.Search( '%' );
                 if( STRING_NOTFOUND != nFndPos )
                 {
                     sError.Erase( nFndPos, 1 ).Insert( sApp, nFndPos );
@@ -588,13 +588,13 @@ FileDialogHelper* SvBaseLink::GetFileDialog( sal_uInt32 nFlags, const String& rF
 
 ImplDdeItem::~ImplDdeItem()
 {
-    bIsInDTOR = TRUE;
+    bIsInDTOR = sal_True;
     // So that no-one gets the idea to delete the pointer when Disconnecting!
     SvBaseLinkRef aRef( pLink );
     aRef->Disconnect();
 }
 
-DdeData* ImplDdeItem::Get( ULONG nFormat )
+DdeData* ImplDdeItem::Get( sal_uIntPtr nFormat )
 {
     if( pLink->GetObj() )
     {
@@ -610,25 +610,25 @@ DdeData* ImplDdeItem::Get( ULONG nFormat )
             {
                 aData = DdeData( (const char *)aSeq.getConstArray(), aSeq.getLength(), nFormat );
 
-                bIsValidData = TRUE;
+                bIsValidData = sal_True;
                 return &aData;
             }
         }
     }
     aSeq.realloc( 0 );
-    bIsValidData = FALSE;
+    bIsValidData = sal_False;
     return 0;
 }
 
 
-BOOL ImplDdeItem::Put( const DdeData*  )
+sal_Bool ImplDdeItem::Put( const DdeData*  )
 {
     OSL_FAIL( "ImplDdeItem::Put not implemented" );
-    return FALSE;
+    return sal_False;
 }
 
 
-void ImplDdeItem::AdviseLoop( BOOL bOpen )
+void ImplDdeItem::AdviseLoop( sal_Bool bOpen )
 {
     // Connection is closed, so also unsubscribe link
     if( pLink->GetObj() )
@@ -653,13 +653,13 @@ void ImplDdeItem::AdviseLoop( BOOL bOpen )
 }
 
 
-static DdeTopic* FindTopic( const String & rLinkName, USHORT* pItemStt )
+static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt )
 {
     if( 0 == rLinkName.Len() )
         return 0;
 
     String sNm( rLinkName );
-    USHORT nTokenPos = 0;
+    sal_uInt16 nTokenPos = 0;
     String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
 
     DdeServices& rSvc = DdeService::GetServices();
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
deleted file mode 100644
index b1e6334022..0000000000
--- a/sfx2/source/appl/makefile.mk
+++ /dev/null
@@ -1,163 +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=sfx2
-TARGET=appl
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# due to compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGS+=-DENABLE_QUICKSTART_APPLET
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-        CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST)
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-        PKGCONFIG_MODULES=gtk+-2.0
-.IF "$(ENABLE_GIO)"!=""
-        PKGCONFIG_MODULES+=gio-2.0
-        CDEFS+=-DENABLE_GIO
-.ENDIF
-        .INCLUDE: pkg_config.mk
-        CFLAGS+=$(PKGCONFIG_CFLAGS)
-        CFLAGS+=-DENABLE_QUICKSTART_APPLET
-        CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ELSE
-        CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=appl
-SRC1FILES =  \
-        app.src newhelp.src dde.src
-
-SRS2NAME=sfx
-SRC2FILES =  \
-        sfx.src
-
-SFX_OBJECTS = \
-    $(SLO)$/app.obj \
-    $(SLO)$/appbas.obj \
-    $(SLO)$/appcfg.obj \
-    $(SLO)$/appchild.obj \
-    $(SLO)$/appdata.obj \
-    $(SLO)$/appdde.obj \
-    $(SLO)$/appinit.obj \
-        $(SLO)$/appmain.obj \
-    $(SLO)$/appmisc.obj \
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appquit.obj \
-    $(SLO)$/appreg.obj \
-    $(SLO)$/appserv.obj \
-    $(SLO)$/appuno.obj \
-    $(SLO)$/appbaslib.obj \
-    $(SLO)$/childwin.obj \
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpdispatch.obj \
-    $(SLO)$/helpinterceptor.obj \
-    $(SLO)$/imagemgr.obj\
-        $(SLO)$/imestatuswindow.obj \
-        $(SLO)$/impldde.obj \
-        $(SLO)$/linkmgr2.obj \
-        $(SLO)$/linksrc.obj \
-        $(SLO)$/lnkbase2.obj \
-    $(SLO)$/module.obj \
-    $(SLO)$/newhelp.obj \
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxdll.obj \
-    $(SLO)$/sfxhelp.obj \
-    $(SLO)$/sfxpicklist.obj \
-    $(SLO)$/shutdownicon.obj \
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/workwin.obj \
-        $(SLO)$/xpackcreator.obj \
-    $(SLO)$/fwkhelper.obj
-
-.IF "$(GUI)"=="OS2"
-SFX_OBJECTS +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-SFX_OBJECTS += $(SLO)$/shutdowniconaqua.obj
-.ENDIF
-
-SLOFILES = $(SFX_OBJECTS)
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SFX_OBJECTS)
-
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-QUICKSTART_OBJECTS = $(SLO)$/shutdowniconunx.obj
-SLOFILES += $(QUICKSTART_OBJECTS)
-
-LIB2TARGET= $(SLB)$/quickstart.lib
-LIB2OBJFILES= $(QUICKSTART_OBJECTS)
-.ENDIF
-
-.IF "$(GUI)"=="OS2"
-SLOFILES +=  $(SLO)$/shutdowniconOs2.obj
-.ENDIF
-
-EXCEPTIONSFILES=\
-    $(SLO)$/imagemgr.obj		\
-    $(SLO)$/appopen.obj \
-    $(SLO)$/appmain.obj			\
-    $(SLO)$/appmisc.obj			\
-    $(SLO)$/appinit.obj			\
-    $(SLO)$/appcfg.obj			\
-    $(SLO)$/fileobj.obj			\
-    $(SLO)$/helpinterceptor.obj	\
-    $(SLO)$/newhelp.obj			\
-    $(SLO)$/opengrf.obj			\
-    $(SLO)$/sfxhelp.obj			\
-    $(SLO)$/shutdownicon.obj	\
-    $(SLO)$/shutdowniconw32.obj \
-    $(SLO)$/sfxpicklist.obj		\
-    $(SLO)$/helpdispatch.obj	\
-    $(SLO)$/xpackcreator.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 77d7c57bf1..e4472e4a52 100644..100755
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -36,10 +36,10 @@
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
 #include "arrdecl.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/mnumgr.hxx>
@@ -69,7 +69,7 @@ public:
 
                                 SfxModule_Impl();
                                 ~SfxModule_Impl();
-    ImageList*                  GetImageList( ResMgr* pResMgr, BOOL bBig );
+    ImageList*                  GetImageList( ResMgr* pResMgr, bool bBig );
 };
 
 SfxModule_Impl::SfxModule_Impl()
@@ -88,7 +88,7 @@ SfxModule_Impl::~SfxModule_Impl()
     delete pImgListBig;
 }
 
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig )
 {
     ImageList*& rpList = bBig ? pImgListBig : pImgListSmall;
     if ( !rpList )
@@ -124,7 +124,7 @@ ResMgr* SfxModule::GetResMgr()
 
 //====================================================================
 
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
+SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP,
                       SfxObjectFactory* pFactoryP, ... )
     : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
 {
@@ -170,7 +170,7 @@ SfxModule::~SfxModule()
             // The module will be destroyed before the Deinitialize, 
             // so remove from the array
             SfxModuleArr_Impl& rArr = GetModules_Impl();
-            for( USHORT nPos = rArr.Count(); nPos--; )
+            for( sal_uInt16 nPos = rArr.Count(); nPos--; )
             {
                 if( rArr[ nPos ] == this )
                 {
@@ -202,7 +202,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
     if (!pImpl->pFactArr)
         pImpl->pFactArr = new SfxChildWinFactArr_Impl;
 
-    for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
+    for (sal_uInt16 nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pImpl->pFactArr)[nFactory]->nId)
         {
@@ -218,13 +218,13 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
 
 //-------------------------------------------------------------------------
 
-void SfxModule::RegisterChildWindowContext( USHORT nId,
+void SfxModule::RegisterChildWindowContext( sal_uInt16 nId,
         SfxChildWinContextFactory *pFact)
 {
     DBG_ASSERT( pImpl, "No real Modul!" );
 
-    USHORT nCount = pImpl->pFactArr->Count();
-    for (USHORT nFactory=0; nFactory<nCount; ++nFactory)
+    sal_uInt16 nCount = pImpl->pFactArr->Count();
+    for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
     {
         SfxChildWinFactory *pF = (*pImpl->pFactArr)[nFactory];
         if ( nId == pF->nId )
@@ -247,7 +247,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
         pImpl->pTbxCtrlFac = new SfxTbxCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pTbxCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pTbxCtrlFac->Count(); n++ )
     {
         SfxTbxCtrlFactory *pF = (*pImpl->pTbxCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -269,7 +269,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
         pImpl->pStbCtrlFac = new SfxStbCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pStbCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pStbCtrlFac->Count(); n++ )
     {
         SfxStbCtrlFactory *pF = (*pImpl->pStbCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -291,7 +291,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
         pImpl->pMenuCtrlFac = new SfxMenuCtrlFactArr_Impl;
 
 #ifdef DBG_UTIL
-    for ( USHORT n=0; n<pImpl->pMenuCtrlFac->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImpl->pMenuCtrlFac->Count(); n++ )
     {
         SfxMenuCtrlFactory *pF = (*pImpl->pMenuCtrlFac)[n];
         if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId &&
@@ -333,12 +333,12 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
     return pImpl->pFactArr;
 }
 
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
+ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig )
 {
     return pImpl->GetImageList( pResMgr, bBig );
 }
 
-SfxTabPage*     SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
+SfxTabPage*     SfxModule::CreateTabPage( sal_uInt16 Window*, const SfxItemSet& )
 {
     return NULL;
 }
@@ -355,7 +355,7 @@ void SfxModule::DestroyModules_Impl()
     if ( pModules )
     {
         SfxModuleArr_Impl& rModules = *pModules;
-        for( USHORT nPos = rModules.Count(); nPos--; )
+        for( sal_uInt16 nPos = rModules.Count(); nPos--; )
     {
         SfxModule* pMod = rModules.GetObject(nPos);
         delete pMod;
@@ -363,22 +363,22 @@ void SfxModule::DestroyModules_Impl()
     }
 }
 
-void SfxModule::Invalidate( USHORT nId )
+void SfxModule::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) )
         if ( pFrame->GetObjectShell()->GetModule() == this )
             Invalidate_Impl( pFrame->GetBindings(), nId );
 }
 
-BOOL SfxModule::IsActive() const
+sal_Bool SfxModule::IsActive() const
 {
     SfxViewFrame* pFrame = SfxViewFrame::Current();
     if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
-bool SfxModule::IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const
+bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const
 {
     if ( i_nId != SID_TASKPANE )
         // by default, assume it is
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index c312a881a0..02d56aac6e 100644..100755
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -31,16 +31,16 @@
 
 #include "newhelp.hxx"
 #include <sfx2/sfxuno.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpinterceptor.hxx"
 #include "helper.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
 #include "panelist.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "srchdlg.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 
 #include "app.hrc"
 #include "newhelp.hrc"
@@ -182,7 +182,7 @@ namespace sfx2
 {
 //.........................................................................
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
     {
         Window* pParent = pWindow->GetParent();
         DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" );
@@ -224,7 +224,7 @@ namespace sfx2
         {
             nStartPos = aBoundary.endPos;
             String sSearchToken( rSearchString.Copy(
-                (USHORT)aBoundary.startPos, (USHORT)aBoundary.endPos - (USHORT)aBoundary.startPos ) );
+                (sal_uInt16)aBoundary.startPos, (sal_uInt16)aBoundary.endPos - (sal_uInt16)aBoundary.startPos ) );
             if ( sSearchToken.Len() > 0 && ( sSearchToken.Len() > 1 || sSearchToken.GetChar(0) != '.' ) )
             {
                 if ( bForSearch && sSearchToken.GetChar( sSearchToken.Len() - 1 ) != '*' )
@@ -266,7 +266,7 @@ struct IndexEntry_Impl
 };
 
 #define NEW_ENTRY( url, bool ) \
-    (void*)(ULONG)( new IndexEntry_Impl( url, bool ) )
+    (void*)(sal_uIntPtr)( new IndexEntry_Impl( url, bool ) )
 
 // struct ContentEntry_Impl ----------------------------------------------
 
@@ -290,7 +290,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
     aDocumentImage		( SfxResId( IMG_HELP_CONTENT_DOC ) )
 
 {
-    SetWindowBits( WB_HIDESELECTION | WB_HSCROLL );
+    SetStyle( GetStyle() | WB_HIDESELECTION | WB_HSCROLL );
 
     SetEntryHeight( 16 );
     SetSelectionMode( SINGLE_SELECTION );
@@ -307,7 +307,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
 
 ContentListBox_Impl::~ContentListBox_Impl()
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     SvLBoxEntry* pEntry = GetEntry( nPos++ );
     while ( pEntry )
     {
@@ -327,7 +327,7 @@ void ContentListBox_Impl::InitRoot()
         SfxContentHelper::GetHelpTreeViewContents( aHelpTreeviewURL );
 
     const ::rtl::OUString* pEntries  = aList.getConstArray();
-    UINT32 i, nCount = aList.getLength();
+    sal_uInt32 i, nCount = aList.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         String aRow( pEntries[i] );
@@ -337,7 +337,7 @@ void ContentListBox_Impl::InitRoot()
         aURL = aRow.GetToken( 0, '\t', nIdx );
         sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0);
         sal_Bool bIsFolder = ( '1' == cFolder );
-        SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, TRUE );
+        SvLBoxEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True );
         if ( bIsFolder )
             pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
     }
@@ -372,7 +372,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
                     SfxContentHelper::GetHelpTreeViewContents( aTmpURL );
 
                 const ::rtl::OUString* pEntries  = aList.getConstArray();
-                UINT32 i, nCount = aList.getLength();
+                sal_uInt32 i, nCount = aList.getLength();
                 for ( i = 0; i < nCount; ++i )
                 {
                     String aRow( pEntries[i] );
@@ -385,7 +385,7 @@ void ContentListBox_Impl::RequestingChilds( SvLBoxEntry* pParent )
                     SvLBoxEntry* pEntry = NULL;
                     if ( bIsFolder )
                     {
-                        pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, TRUE );
+                        pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, sal_True );
                         pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
                     }
                     else
@@ -490,15 +490,15 @@ IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) :
     ComboBox( pParent, rResId )
 
 {
-    EnableAutocomplete( TRUE );
-    EnableUserDraw( TRUE );
+    EnableAutocomplete( sal_True );
+    EnableUserDraw( sal_True );
 }
 
 // -----------------------------------------------------------------------
 
 void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( rUDEvt.GetItemId() );
+    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( rUDEvt.GetItemId() );
     if ( pEntry && pEntry->m_bSubEntry )
     {
         // indent sub entries
@@ -506,11 +506,11 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
         aPos.X() += 8;
         aPos.Y() += ( rUDEvt.GetRect().GetHeight() - rUDEvt.GetDevice()->GetTextHeight() ) / 2;
         String aEntry( GetEntry( rUDEvt.GetItemId() ) );
-        USHORT nPos = aEntry.Search( ';' );
+        sal_uInt16 nPos = aEntry.Search( ';' );
         rUDEvt.GetDevice()->DrawText( aPos, ( nPos != STRING_NOTFOUND ) ? aEntry.Copy( nPos + 1 ) : aEntry );
     }
     else
-        DrawEntry( rUDEvt, FALSE, TRUE, TRUE );
+        DrawEntry( rUDEvt, sal_False, sal_True, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -532,16 +532,16 @@ long IndexBox_Impl::Notify( NotifyEvent& rNEvt )
 
 void IndexBox_Impl::SelectExecutableEntry()
 {
-    USHORT nPos = GetEntryPos( GetText() );
+    sal_uInt16 nPos = GetEntryPos( GetText() );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
-        USHORT nOldPos = nPos;
+        sal_uInt16 nOldPos = nPos;
         String aEntryText;
-        IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( nPos );
-        USHORT nCount = GetEntryCount();
+        IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( nPos );
+        sal_uInt16 nCount = GetEntryCount();
         while ( nPos < nCount && ( !pEntry || pEntry->m_aURL.Len() == 0 ) )
         {
-            pEntry = (IndexEntry_Impl*)(ULONG)GetEntryData( ++nPos );
+            pEntry = (IndexEntry_Impl*)(sal_uIntPtr)GetEntryData( ++nPos );
             aEntryText = GetEntry( nPos );
         }
 
@@ -635,7 +635,7 @@ void IndexTabPage_Impl::InitializeIndex()
         append[k] = sal_Unicode( ' ' );
 
     sfx2::KeywordInfo aInfo;
-    aIndexCB.SetUpdateMode( FALSE );
+    aIndexCB.SetUpdateMode( sal_False );
 
     try
     {
@@ -669,7 +669,7 @@ void IndexTabPage_Impl::InitializeIndex()
                  ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) )
             {
                 sal_Bool insert;
-                USHORT nPos;
+                sal_uInt16 nPos;
                 int ndx,tmp;
                 ::rtl::OUString aIndex, aTempString;
                 ::rtl::OUStringBuffer aData( 128 );            // Capacity of up to 128 characters
@@ -735,7 +735,7 @@ void IndexTabPage_Impl::InitializeIndex()
         OSL_FAIL( "IndexTabPage_Impl::InitializeIndex(): unexpected exception" );
     }
 
-    aIndexCB.SetUpdateMode( TRUE );
+    aIndexCB.SetUpdateMode( sal_True );
 
     if ( sKeyword.Len() > 0 )
         aKeywordLink.Call( this );
@@ -748,9 +748,9 @@ void IndexTabPage_Impl::InitializeIndex()
 
 void IndexTabPage_Impl::ClearIndex()
 {
-    USHORT nCount = aIndexCB.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
-        delete (IndexEntry_Impl*)(ULONG)aIndexCB.GetEntryData(i);
+    sal_uInt16 nCount = aIndexCB.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
+        delete (IndexEntry_Impl*)(sal_uIntPtr)aIndexCB.GetEntryData(i);
     aIndexCB.Clear();
 }
 
@@ -859,7 +859,7 @@ void IndexTabPage_Impl::SetFactory( const String& rFactory )
 String IndexTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(ULONG)aIndexCB.GetEntryData( aIndexCB.GetEntryPos( aIndexCB.GetText() ) );
+    IndexEntry_Impl* pEntry = (IndexEntry_Impl*)(sal_uIntPtr)aIndexCB.GetEntryData( aIndexCB.GetEntryPos( aIndexCB.GetText() ) );
     if ( pEntry )
         aRet = pEntry->m_aURL;
     return aRet;
@@ -884,7 +884,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
     sal_Bool bRet = sal_False;
     if ( sKeyword.Len() > 0 )
     {
-        USHORT nPos = aIndexCB.GetEntryPos( sKeyword );
+        sal_uInt16 nPos = aIndexCB.GetEntryPos( sKeyword );
         bRet = ( nPos != LISTBOX_ENTRY_NOTFOUND );
     }
 
@@ -898,10 +898,10 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
     sal_Bool bRet = sal_False;
     if ( sKeyword.Len() > 0 )
     {
-        USHORT nEntries = aIndexCB.GetEntryCount();
+        sal_uInt16 nEntries = aIndexCB.GetEntryCount();
         String sIndexItem;
         const vcl::I18nHelper& rI18nHelper = GetSettings().GetLocaleI18nHelper();
-        for ( USHORT n = 0; n < nEntries; n++)
+        for ( sal_uInt16 n = 0; n < nEntries; n++)
         {
             sIndexItem = aIndexCB.GetEntry( n );
             if (rI18nHelper.MatchString( sIndexItem, sKeyword ))
@@ -1001,12 +1001,12 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl
         if ( aUserItem >>= aTemp )
         {
             aUserData = String( aTemp );
-            BOOL bChecked = ( 1 == aUserData.GetToken(0).ToInt32() ) ? TRUE : FALSE;
+            sal_Bool bChecked = ( 1 == aUserData.GetToken(0).ToInt32() ) ? sal_True : sal_False;
             aFullWordsCB.Check( bChecked );
-            bChecked = ( 1 == aUserData.GetToken(1).ToInt32() ) ? TRUE : FALSE;
+            bChecked = ( 1 == aUserData.GetToken(1).ToInt32() ) ? sal_True : sal_False;
             aScopeCB.Check( bChecked );
 
-            for ( USHORT i = 2; i < aUserData.GetTokenCount(); ++i )
+            for ( sal_uInt16 i = 2; i < aUserData.GetTokenCount(); ++i )
             {
                 String aToken = aUserData.GetToken(i);
                 aSearchED.InsertEntry( INetURLObject::decode(
@@ -1029,9 +1029,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
     nChecked = aScopeCB.IsChecked() ? 1 : 0;
     aUserData += String::CreateFromInt32( nChecked );
     aUserData += ';';
-    USHORT nCount = Min( aSearchED.GetEntryCount(), (USHORT)10 );  // save only 10 entries
+    sal_uInt16 nCount = Min( aSearchED.GetEntryCount(), (sal_uInt16)10 );  // save only 10 entries
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         rtl::OUString aText = aSearchED.GetEntry(i);
         aUserData += String(INetURLObject::encode(
@@ -1049,9 +1049,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
 
 void SearchTabPage_Impl::ClearSearchResults()
 {
-    USHORT nCount = aResultsLB.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
-        delete (String*)(ULONG)aResultsLB.GetEntryData(i);
+    sal_uInt16 nCount = aResultsLB.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
+        delete (String*)(sal_uIntPtr)aResultsLB.GetEntryData(i);
     aResultsLB.Clear();
     aResultsLB.Update();
 }
@@ -1060,7 +1060,7 @@ void SearchTabPage_Impl::ClearSearchResults()
 
 void SearchTabPage_Impl::RememberSearchText( const String& rSearchText )
 {
-    for ( USHORT i = 0; i < aSearchED.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aSearchED.GetEntryCount(); ++i )
     {
         if ( rSearchText == aSearchED.GetEntry(i) )
         {
@@ -1093,7 +1093,7 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
             aSearchURL += DEFINE_CONST_UNICODE("&Scope=Heading");
         Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aSearchURL );
         const ::rtl::OUString* pFacs  = aFactories.getConstArray();
-        UINT32 i, nCount = aFactories.getLength();
+        sal_uInt32 i, nCount = aFactories.getLength();
         for ( i = 0; i < nCount; ++i )
         {
             String aRow( pFacs[i] );
@@ -1102,8 +1102,8 @@ IMPL_LINK( SearchTabPage_Impl, SearchHdl, PushButton*, EMPTYARG )
             aTitle = aRow.GetToken( 0, '\t', nIdx );
             aType = aRow.GetToken( 0, '\t', nIdx );
             String* pURL = new String( aRow.GetToken( 0, '\t', nIdx ) );
-            USHORT nPos = aResultsLB.InsertEntry( aTitle );
-            aResultsLB.SetEntryData( nPos, (void*)(ULONG)pURL );
+            sal_uInt16 nPos = aResultsLB.InsertEntry( aTitle );
+            aResultsLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pURL );
         }
         LeaveWait();
 
@@ -1204,7 +1204,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 String SearchTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    String* pData = (String*)(ULONG)aResultsLB.GetEntryData( aResultsLB.GetSelectEntryPos() );
+    String* pData = (String*)(sal_uIntPtr)aResultsLB.GetEntryData( aResultsLB.GetSelectEntryPos() );
     if ( pData )
         aRet = String( *pData );
     return aRet;
@@ -1272,11 +1272,11 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
     SvtHistoryOptions aHistOpt;
     aHistOpt.Clear( eHELPBOOKMARKS );
     rtl::OUString sEmpty;
-    USHORT nCount = GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
+    sal_uInt16 nCount = GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         String aTitle = GetEntry(i);
-        String* pURL = (String*)(ULONG)GetEntryData(i);
+        String* pURL = (String*)(sal_uIntPtr)GetEntryData(i);
         aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty );
         delete pURL;
     }
@@ -1284,7 +1284,7 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
 
 // -----------------------------------------------------------------------
 
-void BookmarksBox_Impl::DoAction( USHORT nAction )
+void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 {
     switch ( nAction )
     {
@@ -1294,19 +1294,19 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 
         case MID_RENAME :
            {
-            USHORT nPos = GetSelectEntryPos();
+            sal_uInt16 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_True );
                 aDlg.SetTitle( GetEntry( nPos ) );
                 if ( aDlg.Execute() == RET_OK )
                 {
-                    String* pURL = (String*)(ULONG)GetEntryData( nPos );
+                    String* pURL = (String*)(sal_uIntPtr)GetEntryData( nPos );
                     RemoveEntry( nPos );
                     rtl::OUString aImageURL = IMAGE_URL;
                     aImageURL += INetURLObject( *pURL ).GetHost();
                     nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) );
-                    SetEntryData( nPos, (void*)(ULONG)( new String( *pURL ) ) );
+                    SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( *pURL ) ) );
                     SelectEntryPos( nPos );
                     delete pURL;
                 }
@@ -1316,11 +1316,11 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 
         case MID_DELETE :
         {
-            USHORT nPos = GetSelectEntryPos();
+            sal_uInt16 nPos = GetSelectEntryPos();
             if ( nPos != LISTBOX_ENTRY_NOTFOUND )
             {
                 RemoveEntry( nPos );
-                USHORT nCount = GetEntryCount();
+                sal_uInt16 nCount = GetEntryCount();
                 if ( nCount )
                 {
                     if ( nPos >= nCount )
@@ -1338,10 +1338,10 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
 long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     long nRet = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_KEYINPUT == nType )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
         if ( KEY_DELETE == nCode && GetEntryCount() > 0 )
         {
             DoAction( MID_DELETE );
@@ -1393,7 +1393,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo
     ::rtl::OUString aTitle;
     ::rtl::OUString aURL;
 
-    UINT32 i, nCount = aBookmarkSeq.getLength();
+    sal_uInt32 i, nCount = aBookmarkSeq.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         GetBookmarkEntry_Impl( aBookmarkSeq[i], aTitle, aURL );
@@ -1466,7 +1466,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 String BookmarksTabPage_Impl::GetSelectEntry() const
 {
     String aRet;
-    String* pData = (String*)(ULONG)aBookmarksBox.GetEntryData( aBookmarksBox.GetSelectEntryPos() );
+    String* pData = (String*)(sal_uIntPtr)aBookmarksBox.GetEntryData( aBookmarksBox.GetSelectEntryPos() );
     if ( pData )
         aRet = String( *pData );
     return aRet;
@@ -1478,8 +1478,8 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
 {
     rtl::OUString aImageURL = IMAGE_URL;
     aImageURL += INetURLObject( rURL ).GetHost();
-    USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) );
-    aBookmarksBox.SetEntryData( nPos, (void*)(ULONG)( new String( rURL ) ) );
+    sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) );
+    aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( rURL ) ) );
 }
 
 // class SfxHelpIndexWindow_Impl -----------------------------------------
@@ -1599,7 +1599,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* _pParent )
     SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
     if ( aViewOpt.Exists() )
         nPageId = aViewOpt.GetPageID();
-    aTabCtrl.SetCurPageId( (USHORT)nPageId );
+    aTabCtrl.SetCurPageId( (sal_uInt16)nPageId );
     ActivatePageHdl( &aTabCtrl );
     aActiveLB.SetSelectHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectHdl ) );
     nMinWidth = ( aActiveLB.GetSizePixel().Width() / 2 );
@@ -1620,8 +1620,8 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
     DELETEZ( pSPage );
     DELETEZ( pBPage );
 
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
-        delete (String*)(ULONG)aActiveLB.GetEntryData(i);
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
+        delete (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
 
     SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
     aViewOpt.SetPageID( (sal_Int32)aTabCtrl.GetCurPageId() );
@@ -1635,7 +1635,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
     AppendConfigToken( aHelpURL, sal_True );
     Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpURL );
     const ::rtl::OUString* pFacs  = aFactories.getConstArray();
-    UINT32 i, nCount = aFactories.getLength();
+    sal_uInt32 i, nCount = aFactories.getLength();
     for ( i = 0; i < nCount; ++i )
     {
         String aRow( pFacs[i] );
@@ -1645,11 +1645,11 @@ void SfxHelpIndexWindow_Impl::Initialize()
         aType = aRow.GetToken( 0, '\t', nIdx );
         aURL = aRow.GetToken( 0, '\t', nIdx );
         String* pFactory = new String( INetURLObject( aURL ).GetHost() );
-        USHORT nPos = aActiveLB.InsertEntry( aTitle );
-        aActiveLB.SetEntryData( nPos, (void*)(ULONG)pFactory );
+        sal_uInt16 nPos = aActiveLB.InsertEntry( aTitle );
+        aActiveLB.SetEntryData( nPos, (void*)(sal_uIntPtr)pFactory );
     }
 
-    aActiveLB.SetDropDownLineCount( (USHORT)nCount );
+    aActiveLB.SetDropDownLineCount( (sal_uInt16)nCount );
     if ( aActiveLB.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
         SetActiveFactory();
 }
@@ -1665,9 +1665,9 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
         InitHdl( NULL );
     }
 
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
     {
-        String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData(i);
+        String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
         pFactory->ToLowerAscii();
         if ( *pFactory == pIPage->GetFactory() )
         {
@@ -1683,7 +1683,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
 
 // -----------------------------------------------------------------------
 
-HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( USHORT& rCurId )
+HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
 {
     rCurId = aTabCtrl.GetCurPageId();
     HelpTabPage_Impl* pPage = NULL;
@@ -1723,7 +1723,7 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( USHORT& rCurId )
 
 IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
 {
-    USHORT nId = 0;
+    sal_uInt16 nId = 0;
     TabPage* pPage = GetCurrentPage( nId );
     pTabCtrl->SetTabPage( nId, pPage );
     return 0;
@@ -1756,7 +1756,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG )
 
 IMPL_LINK( SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, EMPTYARG )
 {
-    String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
+    String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
     if ( pFactory )
     {
         String aFactory( *pFactory );
@@ -1778,7 +1778,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG )
     if( !bIndex)
         bIndex = pIPage->HasKeywordIgnoreCase();
     // then set index or search page as current.
-    USHORT nPageId = ( bIndex ) ? HELP_INDEX_PAGE_INDEX :  HELP_INDEX_PAGE_SEARCH;
+    sal_uInt16 nPageId = ( bIndex ) ? HELP_INDEX_PAGE_INDEX :  HELP_INDEX_PAGE_SEARCH;
     if ( nPageId != aTabCtrl.GetCurPageId() )
     {
         aTabCtrl.SetCurPageId( nPageId );
@@ -1822,20 +1822,20 @@ void SfxHelpIndexWindow_Impl::Resize()
 long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
     {
          const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nCode = rKeyCode.GetCode();
 
         if (  KEY_TAB == nCode )
         {
             // don't exit index pane with <TAB>
-            USHORT nPageId = 0;
+            sal_uInt16 nPageId = 0;
             HelpTabPage_Impl* pCurPage = GetCurrentPage( nPageId );
             Control* pControl = pCurPage->GetLastFocusControl();
-            BOOL bShift = rKeyCode.IsShift();
-            BOOL bCtrl = rKeyCode.IsMod1();
+            sal_Bool bShift = rKeyCode.IsShift();
+            sal_Bool bCtrl = rKeyCode.IsMod1();
             if ( !bCtrl && bShift && aActiveLB.HasChildPathFocus() )
             {
                 pControl->GrabFocus();
@@ -1853,7 +1853,7 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     nPageId++;
                 else
                     nPageId = HELP_INDEX_PAGE_FIRST;
-                aTabCtrl.SetCurPageId( (USHORT)nPageId );
+                aTabCtrl.SetCurPageId( (sal_uInt16)nPageId );
                 ActivatePageHdl( &aTabCtrl );
                 nDone = 1;
             }
@@ -1951,9 +1951,9 @@ void SfxHelpIndexWindow_Impl::AddBookmarks( const String& rTitle, const String&
 bool SfxHelpIndexWindow_Impl::IsValidFactory( const String& _rFactory )
 {
     bool bValid = false;
-    for ( USHORT i = 0; i < aActiveLB.GetEntryCount(); ++i )
+    for ( sal_uInt16 i = 0; i < aActiveLB.GetEntryCount(); ++i )
     {
-        String* pFactory = (String*)(ULONG)aActiveLB.GetEntryData(i);
+        String* pFactory = (String*)(sal_uIntPtr)aActiveLB.GetEntryData(i);
         if ( *pFactory == _rFactory )
         {
             bValid = true;
@@ -2126,7 +2126,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
 
     SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
 
-    if ( aOnStartupCB.GetHelpId() == 0 )
+    if ( !aOnStartupCB.GetHelpId().getLength() )
         aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX );
 }
 
@@ -2216,7 +2216,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
 
     // Attention: This check boy knows two states:
     // 1) Reading of the config key fails with an exception or by getting an empty Any (!) => check box must be hidden
-    // 2) We read TRUE/FALSE => check box must be shown and enabled/disabled
+    // 2) We read sal_True/sal_False => check box must be shown and enabled/disabled
 
     bool bHideBox = true;
     sal_Bool bHelpAtStartup = sal_False;
@@ -2353,7 +2353,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
 bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
 {
     bool bRet = false;
-    USHORT nCode = _rKeyCode.GetCode();
+    sal_uInt16 nCode = _rKeyCode.GetCode();
 
     // the keys <STRG><A> (select all), <STRG><C> (copy),
     //			<STRG><F> (find), <STRG><P> (print) and <STRG><W> (close window)
@@ -2562,7 +2562,7 @@ void SfxHelpTextWindow_Impl::Resize()
 long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     long nDone = 0;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() )
     {
         const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent();
@@ -2640,8 +2640,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             aMenu.InsertItem( TBI_COPY,
                               String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
                               Image(  SfxResId( IMG_HELP_TOOLBOX_COPY   ) )
+            aMenu.SetHelpId( TBI_COPY, ".uno:Copy" );
             );
-            aMenu.SetHelpId( TBI_COPY, SID_COPY );
             aMenu.EnableItem( TBI_COPY, HasSelection() );
 
             if ( bIsDebug )
@@ -2653,7 +2653,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False )
                 aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
 
-            USHORT nId = aMenu.Execute( this, aPos );
+            sal_uInt16 nId = aMenu.Execute( this, aPos );
             pHelpWin->DoAction( nId );
             nDone = 1;
         }
@@ -2662,8 +2662,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     {
          const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
          const KeyCode& rKeyCode = pKEvt->GetKeyCode();
-        USHORT nKeyGroup = rKeyCode.GetGroup();
-        USHORT nKey = rKeyCode.GetCode();
+        sal_uInt16 nKeyGroup = rKeyCode.GetGroup();
+        sal_uInt16 nKey = rKeyCode.GetCode();
         if ( KEYGROUP_ALPHA == nKeyGroup &&  !isHandledKey( rKeyCode ) )
         {
             // do nothing disables the writer accelerators
@@ -2869,23 +2869,23 @@ void SfxHelpWindow_Impl::Split()
     nIndexSize = GetItemSize( INDEXWIN_ID );
     nTextSize = GetItemSize( TEXTWIN_ID );
 
-    BOOL		bMod = FALSE;
+    sal_Bool		bMod = sal_False;
     if( nIndexSize < nMinSplitSize )
     {
         nIndexSize = nMinSplitSize;
         nTextSize = nMaxSplitSize;
 
-        bMod = TRUE;
+        bMod = sal_True;
     }
     else if( nTextSize < nMinSplitSize )
     {
         nTextSize = nMinSplitSize;
         nIndexSize = nMaxSplitSize;
 
-        bMod = TRUE;
+        bMod = sal_True;
     }
     else
-        bMod = FALSE;
+        bMod = sal_False;
 
     if( bMod )
     {
@@ -2991,7 +2991,7 @@ void SfxHelpWindow_Impl::LoadConfig()
         {
             aUserData = String( aTemp );
             DBG_ASSERT( aUserData.GetTokenCount() == 6, "invalid user data" );
-            USHORT nIdx = 0;
+            sal_uInt16 nIdx = 0;
             nIndexSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
             nTextSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
             sal_Int32 nWidth = aUserData.GetToken( 0, ';', nIdx ).ToInt32();
@@ -3175,7 +3175,7 @@ void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL    ,
                 xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("PreventHelpTips"), aBoolAny );
                 xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny );
                 xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny );
-                xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:68245") ) );
+                xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) );
                 ::rtl::OUString sProperty( DEFINE_CONST_OUSTRING("IsExecuteHyperlinks") );
                 if ( xInfo->hasPropertyByName( sProperty ) )
                     xViewProps->setPropertyValue( sProperty, aBoolAny );
@@ -3261,7 +3261,7 @@ long SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     {
         // Backward == <ALT><LEFT> or <BACKSPACE> Forward == <ALT><RIGHT>
          const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey = rKeyCode.GetCode();
+        sal_uInt16 nKey = rKeyCode.GetCode();
         if ( ( rKeyCode.IsMod2() && ( KEY_LEFT == nKey || KEY_RIGHT == nKey ) ) ||
              ( !rKeyCode.GetModifier() && KEY_BACKSPACE == nKey && !pIndexWin->HasFocusOnEdit() ) )
         {
@@ -3304,7 +3304,7 @@ void SfxHelpWindow_Impl::SetHelpURL( const String& rURL )
 
 // -----------------------------------------------------------------------
 
-void SfxHelpWindow_Impl::DoAction( USHORT nActionId )
+void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId )
 {
     switch ( nActionId )
     {
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index d6c179a45b..d6c179a45b 100644..100755
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.hrc
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index cb3e94225f..b45e4d525e 100644..100755
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -65,7 +65,7 @@ private:
     String		m_sURL;
 
 public:
-    OpenStatusListener_Impl() : m_bFinished( FALSE ), m_bSuccess( FALSE ) {}
+    OpenStatusListener_Impl() : m_bFinished( sal_False ), m_bSuccess( sal_False ) {}
 
     virtual void SAL_CALL   dispatchFinished( const ::com::sun::star::frame::DispatchResultEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL	disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
@@ -268,7 +268,7 @@ public:
 class BookmarksBox_Impl : public ListBox
 {
 private:
-    void				DoAction( USHORT nAction );
+    void				DoAction( sal_uInt16 nAction );
 
 public:
     BookmarksBox_Impl( Window* pParent, const ResId& rResId );
@@ -332,7 +332,7 @@ private:
 
     void				Initialize();
     void                SetActiveFactory();
-    HelpTabPage_Impl*	GetCurrentPage( USHORT& rCurId );
+    HelpTabPage_Impl*	GetCurrentPage( sal_uInt16& rCurId );
 
     inline ContentTabPage_Impl*		GetContentPage();
     inline IndexTabPage_Impl*		GetIndexPage();
@@ -567,7 +567,7 @@ public:
 
     void				SetFactory( const String& rFactory );
     void				SetHelpURL( const String& rURL );
-    void				DoAction( USHORT nActionId );
+    void				DoAction( sal_uInt16 nActionId );
     void				CloseWindow();
 
     void				UpdateToolbox();
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index c59eb50b19..da59e0a35f 100644..100755
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -93,12 +93,14 @@ TabPage TP_HELP_INDEX
     };
     ComboBox CB_INDEX
     {
+        HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 108 , 97 ) ;
     };
     PushButton PB_OPEN_INDEX
     {
+        HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX";
         Pos = MAP_APPFONT ( 64 , 115 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Display" ;
@@ -119,6 +121,7 @@ TabPage TP_HELP_SEARCH
     };
     ComboBox ED_SEARCH
     {
+        HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH";
         Border = TRUE ;
         DropDown = TRUE;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
@@ -126,30 +129,35 @@ TabPage TP_HELP_SEARCH
     };
     PushButton PB_SEARCH
     {
+        HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH";
         Pos = MAP_APPFONT ( 101 , 17 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Find";
     };
     CheckBox CB_FULLWORDS
     {
+        HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS";
         Pos = MAP_APPFONT ( 6, 34 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         Text [ en-US ] = "~Complete words only";
     };
     CheckBox CB_SCOPE
     {
+        HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE";
         Pos = MAP_APPFONT ( 6, 47 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         Text [ en-US ] = "Find in ~headings only";
     };
     ListBox LB_RESULT
     {
+        HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 60 ) ;
         Size = MAP_APPFONT ( 128 , 30 ) ;
     };
     PushButton PB_OPEN_SEARCH
     {
+        HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH";
         Pos = MAP_APPFONT ( 84 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Display" ;
@@ -170,6 +178,7 @@ TabPage TP_HELP_BOOKMARKS
     };
     ListBox LB_BOOKMARKS
     {
+        HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS";
         Border = TRUE ;
         Sort = TRUE;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
@@ -177,6 +186,7 @@ TabPage TP_HELP_BOOKMARKS
     };
     PushButton PB_BOOKMARKS
     {
+        HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS";
         Pos = MAP_APPFONT ( 64 , 119 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Display" ;
@@ -346,6 +356,7 @@ String STR_HELP_MENU_TEXT_COPY
 
 ModalDialog DLG_HELP_ADDBOOKMARK
 {
+    HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK";
     Size = MAP_APPFONT ( 208 , 43 ) ;
     Text [ en-US ] = "Add to Bookmarks";
     MOVEABLE = TRUE ;
@@ -362,6 +373,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
     };
     Edit ED_BOOKMARK_TITLE
     {
+        HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE";
         PosSize = MAP_APPFONT ( 6 , 19 , 140 , 12 ) ;
         TABSTOP = TRUE ;
         BORDER = TRUE ;
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index f84bd3fadf..0a7833cfa0 100644..100755
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -55,7 +55,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/opengrf.hxx>
 #include "app.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 //-----------------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ using namespace ::cppu;
 
 //-----------------------------------------------------------------------------
 
-USHORT	SvxOpenGrfErr2ResId(	short	err		)
+sal_uInt16	SvxOpenGrfErr2ResId(	short	err		)
 {
     switch( err )
     {
@@ -119,10 +119,10 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog()
 
 short SvxOpenGraphicDialog::Execute()
 {
-    USHORT 	nImpRet;
-    BOOL	bQuitLoop(FALSE);
+    sal_uInt16 	nImpRet;
+    sal_Bool	bQuitLoop(sal_False);
 
-    while( bQuitLoop == FALSE &&
+    while( bQuitLoop == sal_False &&
            mpImpl->aFileDlg.Execute() == ERRCODE_NONE )
     {
         if( GetPath().Len() )
@@ -132,14 +132,14 @@ short SvxOpenGraphicDialog::Execute()
 
             // check whether we can load the graphic
             String	aCurFilter( GetCurrentFilter() );
-            USHORT 	nFormatNum = pFilter->GetImportFormatNumber( aCurFilter );
-            USHORT 	nRetFormat = 0;
-            USHORT	nFound = USHRT_MAX;
+            sal_uInt16 	nFormatNum = pFilter->GetImportFormatNumber( aCurFilter );
+            sal_uInt16 	nRetFormat = 0;
+            sal_uInt16	nFound = USHRT_MAX;
 
             // non-local?
             if ( INET_PROT_FILE != aObj.GetProtocol() )
             {
-                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
+                SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
                 aMed.DownLoad();
                 SvStream* pStream = aMed.GetInStream();
 
@@ -170,7 +170,7 @@ short SvxOpenGraphicDialog::Execute()
             if ( nFound == USHRT_MAX )
             {
                 WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, String( SfxResId( SvxOpenGrfErr2ResId(nImpRet) ) ) );
-                bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE;
+                bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True;
             }
             else
             {
@@ -285,14 +285,11 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String&	rStr)
     mpImpl->aFileDlg.SetCurrentFilter(rStr);
 }
 
-void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId )
+void SvxOpenGraphicDialog::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
 }
 
-void SvxOpenGraphicDialog::SetDialogHelpId( const INT32 _nHelpId )
-{
-    mpImpl->aFileDlg.SetDialogHelpId( _nHelpId );
-}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index fb48cd708d..2b105c5dba 100644..100755
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -34,17 +34,17 @@ namespace sfx2
 {
     // source in newhelp.cxx
 
-    void HandleTaskPaneList( Window* pWindow, BOOL bAddToList );
+    void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
         // pWindow: just a system window or something which is child of a system window
 
     inline void AddToTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, TRUE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_True );
     }
 
     inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
     {
-        HandleTaskPaneList( pWindowToBeHandled, FALSE );
+        HandleTaskPaneList( pWindowToBeHandled, sal_False );
     }
 }
 
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 6802197ee2..71c7c4cf98 100644..100755
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -27,107 +27,21 @@
 
 #include <sfx2/sfx.hrc>
 
-String STR_NONAME
-{
-    Text [ en-US ] = "Untitled" ;
-};
-
-String STR_NONE
-{
-    Text [ en-US ] = "- None -" ;
-};
-
-String STR_CLOSE
-{
-    Text [ en-US ] = "Close" ;
-};
-
-String STR_STYLE_FILTER_AUTO
-{
-    Text [ en-US ] = "Automatic" ;
-};
-
 String STR_STYLE_FILTER_USED
 {
     Text [ en-US ] = "Applied Styles" ;
 };
-
-
-
 String STR_STYLE_FILTER_USERDEF
 {
     Text [ en-US ] = "Custom Styles" ;
 };
-
 String STR_STYLE_FILTER_ALL
 {
     Text [ en-US ] = "All Styles" ;
 };
 
-String STR_STANDARD
-{
-    Text [ en-US ] = "Standard" ;
-};
-String STR_STANDARD_SHORTCUT
-{
-    Text [ en-US ] = "Standard" ;
-};
-
-String STR_SFX_FILTERNAME_ALL
-{
-    Text [ en-US ] = "All files (*.*)" ;
-};
-
-String STR_BYTES
-{
-    Text [ en-US ] = "Bytes" ;
-};
-
-String STR_KB
-{
-    Text [ en-US ] = "KB" ;
-};
-
-String STR_MB
-{
-    Text [ en-US ] = "MB" ;
-};
-
-
-String STR_GB
-{
-    Text [ en-US ] = "GB" ;
-};
-
-String STR_UNDO
-{
-    Text [ en-US ] = "Undo: " ;
-};
-
-String STR_REDO
-{
-    Text [ en-US ] = "Re~do: " ;
-};
-
-String STR_REPEAT
-{
-    Text [ en-US ] = "~Repeat: " ;
-};
-
-String RID_STR_NEW_TASK
-{
-    Text [ en-US ] = "New task";
-};
-QueryBox MSG_QUERY_LASTVERSION
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Cancel all changes?" ;
-};
-
-// i66948 used in project scripting
-String STR_ERRUNOEVENTBINDUNG
+String STR_ACCTITLE_PRODUCTIVITYTOOLS
 {
-    Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.";
+    Text [ en-US ] = "%PRODUCTNAME";	
 };
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 450fedf996..395ad6263a 100644..100755
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -29,8 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 
+#include <set>
 #include <algorithm>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -73,12 +74,15 @@
 #include <svl/svstdarr.hxx>
 
 #include "newhelp.hxx"
-#include "sfxresid.hxx"
+#include <sfx2/objsh.hxx>
+#include <sfx2/docfac.hxx>
+#include "sfx2/sfxresid.hxx"
 #include "helper.hxx"
 #include "app.hrc"
 #include <sfx2/sfxuno.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/frame.hxx>
+#include <rtl/string.hxx>
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -219,13 +223,13 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
 class SfxHelpOptions_Impl : public utl::ConfigItem
 {
 private:
-    SvULongsSort*   m_pIds;
+    std::set < rtl::OString > m_aIds;
 
 public:
                     SfxHelpOptions_Impl();
                     ~SfxHelpOptions_Impl();
 
-    BOOL            HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; }
+    bool            HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; }
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
     virtual void            Commit();
 };
@@ -271,11 +275,15 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
                         ::rtl::OUString aCodedList;
                         if ( pValues[nProp] >>= aCodedList )
                         {
-                            String aTmp( aCodedList );
-                            USHORT nCount = aTmp.GetTokenCount( ',' );
-                            m_pIds = new SvULongsSort();
-                            for ( USHORT n=0; n<nCount; n++ )
-                                m_pIds->Insert( (ULONG) aTmp.GetToken( n, ',' ).ToInt64() );
+                            rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+                            sal_Int32 nIndex = 0;
+                            do
+                            {
+                                rtl::OString aToken = aTmp.getToken( 0, ',', nIndex );
+                                if ( aToken.getLength() )
+                                    m_aIds.insert( aToken );
+                            }
+                            while ( nIndex >= 0 );
                         }
                         else {
                             DBG_ERRORFILE( "Wrong property type!" );
@@ -295,7 +303,6 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
 
 SfxHelpOptions_Impl::~SfxHelpOptions_Impl()
 {
-    delete m_pIds;
 }
 
 
@@ -320,8 +327,7 @@ public:
     ~SfxHelp_Impl();
 
     SfxHelpOptions_Impl*	GetOptions();
-    String					GetHelpText( ULONG nHelpId, const String& rModule );	// get "Active Help"
-    String                  GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
+    static String           GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
     sal_Bool				HasModule( const ::rtl::OUString& rModule );			// module installed
     sal_Bool				IsHelpInstalled();										// module list not empty
 };
@@ -364,16 +370,6 @@ void SfxHelp_Impl::Load()
     }
 }
 
-String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule )
-{
-    // create help url
-    String aHelpURL = SfxHelp::CreateHelpURL( nHelpId, rModule );
-    // added 'active' parameter
-    aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) );
-    // load help string
-    return SfxContentHelper::GetActiveHelpString( aHelpURL );
-}
-
 String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule )
 {
     // create help url
@@ -573,76 +569,6 @@ String SfxHelp::GetHelpModuleName_Impl()
     return sModuleName;
 }
 
-String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName )
-{
-    String aModuleName( rModuleName );
-    if ( aModuleName.Len() == 0 )
-        aModuleName = getDefaultModule_Impl();
-
-    // build up the help URL
-    String aHelpURL;
-    if ( aTicket.Len() )
-    {
-        // if there is a ticket, we are inside a plugin, so a special Help URL must be sent
-        aHelpURL = DEFINE_CONST_UNICODE("vnd.sun.star.cmd:help?");
-        aHelpURL += DEFINE_CONST_UNICODE("HELP_Request_Mode=contextIndex&HELP_Session_Mode=context&HELP_CallMode=portal&HELP_Device=html");
-
-        if ( !nHelpId )
-        {
-            // no help id -> start page
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=start");
-        }
-        else
-        {
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=");
-            aHelpURL += String::CreateFromInt64( nHelpId );
-        }
-
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_ProgramID=");
-        aHelpURL += aModuleName;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_User=");
-        aHelpURL += aUser;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_Ticket=");
-        aHelpURL += aTicket;
-        aHelpURL += DEFINE_CONST_UNICODE("&HELP_Language=");
-        aHelpURL += aLanguageStr;
-        if ( aCountryStr.Len() )
-        {
-            aHelpURL += DEFINE_CONST_UNICODE("&HELP_Country=");
-            aHelpURL += aCountryStr;
-        }
-    }
-    else
-    {
-        sal_Bool bHasAnchor = sal_False;
-        String aAnchor;
-        aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
-        aHelpURL += aModuleName;
-
-        if ( !nHelpId )
-            aHelpURL += String::CreateFromAscii("/start");
-        else
-        {
-            aHelpURL += '/';
-            aHelpURL += String::CreateFromInt64( nHelpId );
-
-            String aTempURL = aHelpURL;
-            AppendConfigToken( aTempURL, sal_True );
-            bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
-        }
-
-        AppendConfigToken( aHelpURL, sal_True );
-
-        if ( bHasAnchor )
-        {
-            aHelpURL += '#';
-            aHelpURL += aAnchor;
-        }
-    }
-
-    return aHelpURL;
-}
-
 String	SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName )
 {
     // build up the help URL
@@ -665,7 +591,7 @@ String	SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo
         aHelpURL += String( rtl::Uri::encode( aCommandURL,
                                               rtl_UriCharClassRelSegment,
                                               rtl_UriEncodeKeepEscapes,
-                                              RTL_TEXTENCODING_ASCII_US ));
+                                              RTL_TEXTENCODING_UTF8 ));
 
         String aTempURL = aHelpURL;
         AppendConfigToken( aTempURL, sal_True );
@@ -733,16 +659,68 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask   ,
     return pHelpWindow;
 }
 
+XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow )
+{ 
+    String sModuleName = GetHelpModuleName_Impl();
+    String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
+
+    ByteString aNewHelpId;
+
+    if ( pWindow && !sHelpText.Len() )
+    {
+        // no help text found -> try with parent help id.
+        Window* pParent = pWindow->GetParent();
+        while ( pParent )
+        {
+            aNewHelpId = pParent->GetHelpId();
+            sHelpText = pImp->GetHelpText( String( aNewHelpId, RTL_TEXTENCODING_UTF8 ), sModuleName );
+            if ( sHelpText.Len() > 0 )
+                pParent = NULL;
+            else
+                pParent = pParent->GetParent();
+        }
+
+        if ( bIsDebug && !sHelpText.Len() )
+            aNewHelpId.Erase();
+    }
+
+    // add some debug information?
+    if ( bIsDebug )
+    {
+        sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
+        sHelpText += String( sModuleName );
+        sHelpText += DEFINE_CONST_UNICODE(": ");
+        sHelpText += aCommandURL;
+        if ( aNewHelpId.Len() )
+        {
+            sHelpText += DEFINE_CONST_UNICODE(" - ");
+            sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 );
+        }
+    }
+
+    return sHelpText;
+}
+
 /// Check for built-in help
 static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() )
 {
     String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
-    AppendConfigToken( aHelpRootURL, sal_True, rLang );
+    AppendConfigToken_Impl( aHelpRootURL, sal_True );
     Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
 
     return ( aFactories.getLength() != 0 );
 }
 
+sal_Bool SfxHelp::SearchKeyword( const XubString& rKeyword )
+{
+    return Start_Impl( String(), NULL, rKeyword );
+}
+
+sal_Bool SfxHelp::Start( const String& rURL, const Window* pWindow )
+{
+    return Start_Impl( rURL, pWindow, String() );
+}
+
 /// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
 static bool impl_showOnlineHelp( const String& rURL )
 {
@@ -771,42 +749,66 @@ static bool impl_showOnlineHelp( const String& rURL )
     return false;
 }
 
-BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
+sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword )
 {
-    String aHelpURL( rURL );
-    INetURLObject aParser( aHelpURL );
+    String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
+    AppendConfigToken( aHelpRootURL, sal_True, rLang );
+    Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
+
+    /* rURL may be 
+        - a "real" URL
+        - a HelpID (formerly a long, now a string)
+       If rURL is a URL, CreateHelpURL should be called for this URL
+       If rURL is an arbitrary string, the same should happen, but the URL should be tried out
+       if it delivers real help content. In case only the Help Error Document is returned, the 
+       parent of the window for that help was called, is asked for its HelpID.
+       For compatibility reasons this upward search is not implemented for "real" URLs.
+       Help keyword search now is implemented as own method; in former versions it 
+       was done via Help::Start, but this implementation conflicted with the upward search.
+    */
+    String aHelpURL;
+    INetURLObject aParser( rURL );
     INetProtocol nProtocol = aParser.GetProtocol();
+    String aHelpModuleName( GetHelpModuleName_Impl() );
 
-    // check if it's an URL or a jump mark!
     ::rtl::OUString sKeyword;
-    if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP )
+    switch ( nProtocol )
     {
-        // #i90162 Accept anything that is not invalid as help id, as both
-        // uno: URLs used as commands/help ids in the Office and the scheme
-        // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton)
-        // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC
-        bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID );
-
-        // #i94891 As in some extensions help ids like foo.bar.dummy without
-        // any : have been used that worked before the fix of #i90162 (see
-        // above) strings containing . will be also accepted to avoid brea-
-        // king the help of existing extensions.
-        if( !bAcceptAsURL )
-            bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND );
-
-        if ( bAcceptAsURL )
-        {
-            aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) );
-        }
-        else
+        case INET_PROT_VND_SUN_STAR_HELP:
+            // already a vnd.sun.star.help URL -> nothing to do
+            aHelpURL = rURL;
+            break;
+        default:
         {
-            aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) );
+            // no URL, just a HelpID (maybe empty in case of keyword search)
+            aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName );
 
             // pb i91715: strings begin with ".HelpId:" are not words of the basic ide
             // they are helpid-strings used by the testtool -> so we ignore them
             static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") );
             if ( rURL.Search( sHelpIdScheme ) != 0 )
                 sKeyword = ::rtl::OUString( rURL );
+
+            if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+            {
+                // no help found -> try with parent help id.
+                Window* pParent = pWindow->GetParent();
+                while ( pParent )
+                {
+                    ByteString aHelpId = pParent->GetHelpId();
+                    aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName );
+                    if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+                        break;
+                    else
+                    {
+                        pParent = pParent->GetParent();
+                        if ( !pParent )
+                            // create help url of start page ( helpid == 0 -> start page)
+                            aHelpURL = CreateHelpURL( String(), aHelpModuleName );
+                    }
+                }
+            }
+            break;
         }
     }
 
@@ -825,15 +827,9 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
     Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
         DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
 
-    // check if help is still open
-    // If not - create new one and return acces directly
-    // to the internal sub frame, which shows the help content.
-
-    // Note further: We search for this sub frame here directly instead of
-    // the real top level help task ... It's needed to have the same
-    // sub frame available - so we can use it for loading (which is done
-    // in both cases)!
-
+    // check if help window is still open
+    // If not, create a new one and return access directly to the internal sub frame showing the help content
+    // search must be done here; search one desktop level could return an arbitraty frame
     Reference< XFrame > xHelp = xDesktop->findFrame(
         ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
         FrameSearchFlag::CHILDREN);
@@ -847,113 +843,24 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
     else
         pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
     if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
-        return FALSE;
+        return sal_False;
+
+#ifdef DBG_UTIL
+    ByteString aTmp("SfxHelp: HelpId = ");
+    aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
+    DBG_TRACE( aTmp.GetBuffer() );
+#endif
 
     pHelpWindow->SetHelpURL( aHelpURL );
     pHelpWindow->loadHelpContent(aHelpURL);
-    if ( sKeyword.getLength() > 0 )
-        pHelpWindow->OpenKeyword( sKeyword );
+    if ( rKeyword.Len() )
+        pHelpWindow->OpenKeyword( rKeyword );
 
     Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY );
     if ( xTopWindow.is() )
         xTopWindow->toFront();
 
-    return TRUE;
-}
-
-BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow )
-{
-    String aHelpModuleName( GetHelpModuleName_Impl() );
-    String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
-    if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
-    {
-        // no help found -> try with parent help id.
-        Window* pParent = pWindow->GetParent();
-        while ( pParent )
-        {
-            nHelpId = pParent->GetSmartUniqueOrHelpId().GetNum();
-            aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
-
-            if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
-                break;
-            else
-            {
-                pParent = pParent->GetParent();
-                if ( !pParent )
-                    // create help url of start page ( helpid == 0 -> start page)
-                    aHelpURL = CreateHelpURL( 0, aHelpModuleName );
-            }
-        }
-    }
-
-    return Start( aHelpURL, pWindow );
-}
-
-XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow )
-{
-    String aModuleName = GetHelpModuleName_Impl();
-    String aHelpText = pImp->GetHelpText( nHelpId, aModuleName );
-    ULONG nNewHelpId = 0;
-
-    if ( pWindow && aHelpText.Len() == 0 )
-    {
-        // no help text found -> try with parent help id.
-        Window* pParent = pWindow->GetParent();
-        while ( pParent )
-        {
-            nNewHelpId = pParent->GetHelpId();
-            aHelpText = pImp->GetHelpText( nNewHelpId, aModuleName );
-
-            if ( aHelpText.Len() > 0 )
-                pParent = NULL;
-            else
-                pParent = pParent->GetParent();
-        }
-
-        if ( bIsDebug && aHelpText.Len() == 0 )
-            nNewHelpId = 0;
-    }
-
-    if ( bIsDebug )
-    {
-        aHelpText += DEFINE_CONST_UNICODE("\n\n");
-        aHelpText += aModuleName;
-        aHelpText += DEFINE_CONST_UNICODE(" - ");
-        aHelpText += String::CreateFromInt64( nHelpId );
-        if ( nNewHelpId )
-        {
-            aHelpText += DEFINE_CONST_UNICODE(" - ");
-            aHelpText += String::CreateFromInt64( nNewHelpId );
-        }
-    }
-
-    return aHelpText;
-}
-
-XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* )
-{
-    String sModuleName = GetHelpModuleName_Impl();
-    String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
-
-    // add some debug information?
-    if ( bIsDebug )
-    {
-        sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
-        sHelpText += String( sModuleName );
-        sHelpText += DEFINE_CONST_UNICODE(": ");
-        sHelpText += aCommandURL;
-    }
-
-    return sHelpText;
-}
-
-String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName )
-{
-    String aURL;
-    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-    if ( pHelp )
-        aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName );
-    return aURL;
+    return sal_True;
 }
 
 String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
@@ -965,25 +872,25 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN
     return aURL;
 }
 
-void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId )
 {
-        SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-        if ( pHelp )
-            pHelp->OpenHelpAgent( nHelpId );
+    SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+    if ( pHelp )
+        pHelp->OpenHelpAgent( sHelpId );
 }
 
-void SfxHelp::OpenHelpAgent( ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
 {
     if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
     {
             SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
-            if ( !pOpt->HasId( nHelpId ) )
+            if ( !pOpt->HasId( sHelpId ) )
                 return;
 
             try
             {
                 URL aURL;
-                aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() );
+                aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
                 Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY );
                 xTrans->parseStrict(aURL);
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 1c9117fa08..62ca967c03 100644..100755
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -101,7 +101,7 @@ osl::Mutex*	SfxPickList::GetOrCreateMutex()
     return pMutex;
 }
 
-void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const String& aURLString, sal_uInt32 nNo )
+void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURLString, sal_uInt32 nNo )
 {
     String aPickEntry;
 
@@ -291,8 +291,8 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu )
     {
         PickListEntry* pEntry = GetPickListEntry( i );
 
-        pMenu->InsertItem( (USHORT)(START_ITEMID_PICKLIST + i), aEmptyString );
-        CreatePicklistMenuTitle( pMenu, (USHORT)(START_ITEMID_PICKLIST + i), pEntry->aName, i );
+        pMenu->InsertItem( (sal_uInt16)(START_ITEMID_PICKLIST + i), aEmptyString );
+        CreatePicklistMenuTitle( pMenu, (sal_uInt16)(START_ITEMID_PICKLIST + i), pEntry->aName, i );
     }
 
     bPickListMenuInitializing = sal_False;
@@ -313,7 +313,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
         String aFilter( pPick->aFilter );
         aGuard.clear();
 
-        USHORT nPos=aFilter.Search('|');
+        sal_uInt16 nPos=aFilter.Search('|');
         if( nPos != STRING_NOTFOUND )
         {
             String aOptions(aFilter.Copy( nPos ).GetBuffer()+1);
@@ -327,7 +327,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
     }
 }
 
-void SfxPickList::ExecuteMenuEntry( USHORT nId )
+void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId )
 {
     ExecuteEntry( (sal_uInt32)( nId - START_ITEMID_PICKLIST ) );
 }
@@ -445,7 +445,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     return;
 
                 // ignore hidden documents
-                if ( !SfxViewFrame::GetFirst( pDocSh, TRUE ) )
+                if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) )
                     return;
 
                 ::rtl::OUString	 aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST);
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index dc79b68d33..36dd915ca6 100644..100755
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -67,7 +67,7 @@
 #endif
 #include <vcl/timer.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -77,7 +77,11 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
+#ifdef WNT
+using ::rtl::OUString;
+#else
 using namespace ::rtl;
+#endif
 using namespace ::sfx2;
 
 #ifdef ENABLE_QUICKSTART_APPLET
@@ -86,6 +90,10 @@ extern "C" { static void SAL_CALL thisModule() {} }
 # endif
 #endif
 
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
+#define PLUGIN_NAME "libqstart_gtkli.so"
+#endif
+
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
 {
 public:
@@ -754,14 +762,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< :
 
 void ShutdownIcon::EnterModalMode()
 {
-    bModalMode = TRUE;
+    bModalMode = sal_True;
 }
 
 // -------------------------------
 
 void ShutdownIcon::LeaveModalMode()
 {
-    bModalMode = FALSE;
+    bModalMode = sal_False;
 }
 
 #ifdef WNT
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 09fc15f1ce..09fc15f1ce 100644..100755
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
index 653e89c4d0..653e89c4d0 100644..100755
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ b/sfx2/source/appl/shutdowniconOs2.cxx
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 8ce1927f80..8ce1927f80 100644..100755
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index bb296a5e98..d8c33ecbb6 100644..100755
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -83,7 +83,7 @@ static void menu_deactivate_cb( GtkWidget *pMenu )
     gtk_menu_popdown( GTK_MENU( pMenu ) );
 }
 
-static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
+static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
 {
     ResId aResId( SV_ICON_SMALL_START + nResId, *pVCLResMgr );
     BitmapEx aIcon( aResId );
@@ -128,7 +128,7 @@ static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
         pInSalAlpha.ReleaseAccess( pSalAlpha );
 
     return gdk_pixbuf_new_from_data( pPixbufData,
-        GDK_COLORSPACE_RGB, TRUE, 8,
+        GDK_COLORSPACE_RGB, sal_True, 8,
         aSize.Width(), aSize.Height(),
         aSize.Width() * 4,
         (GdkPixbufDestroyNotify) g_free,
@@ -146,7 +146,7 @@ static void oustring_delete (gpointer  data,
 
 static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
                       OUString *pOverrideLabel,
-                      USHORT nResId, GCallback pFnCallback )
+                      sal_uInt16 nResId, GCallback pFnCallback )
 {
     OUString *pURL = new OUString (OStringToOUString( pAsciiURL,
                                                       RTL_TEXTENCODING_UTF8 ));
@@ -179,7 +179,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
 static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
-                              USHORT nResId, GCallback pFnCallback )
+                              sal_uInt16 nResId, GCallback pFnCallback )
 {
     SvtDynamicMenuOptions aOpt;
     Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU );
@@ -304,7 +304,7 @@ static gboolean display_menu_cb( GtkWidget *,
                                  GdkEventButton *event, GtkWidget *pMenu )
 {
     if (event->button == 2)
-        return FALSE;
+        return sal_False;
 
     refresh_menu( pMenu );
 
@@ -312,7 +312,7 @@ static gboolean display_menu_cb( GtkWidget *,
                     gtk_status_icon_position_menu, pTrayIcon,
                     0, event->time );
 
-    return TRUE;
+    return sal_True;
 }
 
 #ifdef ENABLE_GIO
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 534a55a7cb..534a55a7cb 100644..100755
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4097661aaf..0488b47167 100644..100755
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/viewsh.hxx>
 #include "splitwin.hxx"
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>      // SFX_ITEMSET_SET
 #include <vcl/taskpanelist.hxx>
@@ -72,7 +72,7 @@ namespace css = ::com::sun::star;
 
 struct ResIdToResName
 {
-    USHORT      nId;
+    sal_uInt16      nId;
     const char* pName;
 };
 
@@ -302,23 +302,23 @@ throw (css::uno::RuntimeException)
     {
         if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE )
         {
-            m_pWrkWin->MakeVisible_Impl( TRUE );
+            m_pWrkWin->MakeVisible_Impl( sal_True );
             m_pWrkWin->ShowChilds_Impl();
-            m_pWrkWin->ArrangeChilds_Impl( TRUE );
+            m_pWrkWin->ArrangeChilds_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE )
         {
-            m_pWrkWin->MakeVisible_Impl( FALSE );
+            m_pWrkWin->MakeVisible_Impl( sal_False );
             m_pWrkWin->HideChilds_Impl();
-            m_pWrkWin->ArrangeChilds_Impl( TRUE );
+            m_pWrkWin->ArrangeChilds_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK )
         {
-            m_pWrkWin->Lock_Impl( TRUE );
+            m_pWrkWin->Lock_Impl( sal_True );
         }
         else if ( eLayoutEvent == css::frame::LayoutManagerEvents::UNLOCK )
         {
-            m_pWrkWin->Lock_Impl( FALSE );
+            m_pWrkWin->Lock_Impl( sal_False );
         }
     }
 }
@@ -330,7 +330,7 @@ typedef boost::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceU
 static sal_Bool bMapInitialized = sal_False;
 static ToolBarResIdToResourceURLMap aResIdToResourceURLMap;
 
-static rtl::OUString GetResourceURLFromResId( USHORT nResId )
+static rtl::OUString GetResourceURLFromResId( sal_uInt16 nResId )
 {
     if ( !bMapInitialized )
     {
@@ -356,20 +356,20 @@ static rtl::OUString GetResourceURLFromResId( USHORT nResId )
         return rtl::OUString();
 }
 
-BOOL IsAppWorkWinToolbox_Impl( USHORT nPos )
+sal_Bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
         case SFX_OBJECTBAR_APPLICATION :
         case SFX_OBJECTBAR_MACRO:
         case SFX_OBJECTBAR_FULLSCREEN:
-            return TRUE;
+            return sal_True;
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
-USHORT TbxMatch( USHORT nPos )
+sal_uInt16 TbxMatch( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
@@ -392,9 +392,9 @@ USHORT TbxMatch( USHORT nPos )
     }
 }
 
-USHORT ChildAlignValue(SfxChildAlignment eAlign)
+sal_uInt16 ChildAlignValue(SfxChildAlignment eAlign)
 {
-    USHORT ret = 17;
+    sal_uInt16 ret = 17;
 
     switch (eAlign)
     {
@@ -453,9 +453,9 @@ USHORT ChildAlignValue(SfxChildAlignment eAlign)
     return ret;
 }
 
-USHORT ChildTravelValue( SfxChildAlignment eAlign )
+sal_uInt16 ChildTravelValue( SfxChildAlignment eAlign )
 {
-    USHORT ret = 17;
+    sal_uInt16 ret = 17;
 
     switch (eAlign)
     {
@@ -517,12 +517,12 @@ USHORT ChildTravelValue( SfxChildAlignment eAlign )
 void SfxWorkWindow::Sort_Impl()
 {
     aSortedList.Remove(0, aSortedList.Count());
-    for (USHORT i=0; i<pChilds->Count(); i++)
+    for (sal_uInt16 i=0; i<pChilds->Count(); i++)
     {
         SfxChild_Impl *pCli = (*pChilds)[i];
         if (pCli)
         {
-            USHORT k;
+            sal_uInt16 k;
             for (k=0; k<aSortedList.Count(); k++)
                 if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
                     ChildAlignValue(pCli->eAlign))
@@ -531,7 +531,7 @@ void SfxWorkWindow::Sort_Impl()
         }
     }
 
-    bSorted = TRUE;
+    bSorted = sal_True;
 }
 
 
@@ -555,7 +555,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
     }
 
     // The required split windows (one for each side) can be created
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         // The SplitWindows excludes direct ChildWindows of the WorkWindows 
         // and receives the docked window.
@@ -584,12 +584,12 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     pActiveChild( 0 ),
     nChilds( 0 ),
     nOrigMode( 0 ),
-    bSorted( TRUE ),
-    bDockingAllowed(TRUE),
-    bInternalDockingAllowed(TRUE),
-    bAllChildsVisible(TRUE),
-    bIsFullScreen( FALSE ),
-    bShowStatusBar( TRUE ),
+    bSorted( sal_True ),
+    bDockingAllowed(sal_True),
+    bInternalDockingAllowed(sal_True),
+    bAllChildsVisible(sal_True),
+    bIsFullScreen( sal_False ),
+    bShowStatusBar( sal_True ),
     m_nLock( 0 ),
     m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" )),
     m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )),
@@ -607,7 +607,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
     // For the ObjectBars a integral place in the Childlist is reserved, 
     // so that they always come in a defined order.
     SfxChild_Impl* pChild=0;
-    for (USHORT n=0; n < SFX_OBJECTBAR_MAX; ++n)
+    for (sal_uInt16 n=0; n < SFX_OBJECTBAR_MAX; ++n)
         pChilds->Insert(0,pChild);
 
     // create and initialize layout manager listener
@@ -627,7 +627,7 @@ SfxWorkWindow::~SfxWorkWindow()
     DBG_DTOR(SfxWorkWindow, 0);
 
     // Delete SplitWindows 
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
         if (p->GetWindowCount())
@@ -652,7 +652,7 @@ SystemWindow* SfxWorkWindow::GetTopWindow() const
     return (SystemWindow*) pRet;
 }
 
-void SfxWorkWindow::Lock_Impl( BOOL bLock )
+void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
 {
     if ( bLock )
         m_nLock++;
@@ -672,7 +672,7 @@ void SfxWorkWindow::ChangeWindow_Impl( Window *pNew )
 {
     Window *pOld = pWorkWin;
     pWorkWin = pNew;
-    for ( USHORT nPos = 0; nPos < pChilds->Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         SfxChild_Impl *pCli = (*pChilds)[nPos];
         if ( pCli && pCli->pWin && pCli->pWin->GetParent() == pOld )
@@ -684,14 +684,14 @@ void SfxWorkWindow::ChangeWindow_Impl( Window *pNew )
 
 void SfxWorkWindow::SaveStatus_Impl()
 {
-    USHORT nCount = pChildWins->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pChildWins->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxChildWin_Impl* pCW = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if (pChild)
         {
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChild->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             SaveStatus_Impl(pChild, pCW->aInfo);
@@ -711,7 +711,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
 
     // Lock SplitWindows (which means supressing the Resize-Reaction of the 
     // DockingWindows)
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
@@ -773,10 +773,10 @@ void SfxWorkWindow::DeleteControllers_Impl()
 
         // Delete ObjectBars (this is done last, so that pChilds does not 
         // receive dead Pointers)
-        for ( USHORT i = 0; i < aObjBarList.size(); i++ )
+        for ( sal_uInt16 i = 0; i < aObjBarList.size(); i++ )
         {
             // Not every position must be occupied
-            USHORT nId = aObjBarList[i].nId;
+            sal_uInt16 nId = aObjBarList[i].nId;
             if ( nId )
                 aObjBarList[i].nId = 0;
         }
@@ -785,7 +785,7 @@ void SfxWorkWindow::DeleteControllers_Impl()
     // ObjectBars are all released at once, since they occupy a
     // fixed contiguous area in the array pChild
     pChilds->Remove(0, SFX_OBJECTBAR_MAX);
-    bSorted = FALSE;
+    bSorted = sal_False;
 
     nChilds = 0;
 }
@@ -793,12 +793,12 @@ void SfxWorkWindow::DeleteControllers_Impl()
 //====================================================================
 // Virtual method for placing the child window.
 
-void SfxWorkWindow::ArrangeChilds_Impl( BOOL /*bForce*/)
+void SfxWorkWindow::ArrangeChilds_Impl( sal_Bool /*bForce*/)
 {
     Arrange_Impl();
 }
 
-void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( BOOL bForce )
+void SfxFrameWorkWin_Impl::ArrangeChilds_Impl( sal_Bool bForce )
 {
     if ( pFrame->IsClosing_Impl() || ( m_nLock && !bForce ))
         return;
@@ -864,7 +864,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
     Size aSize;
     Rectangle aTmp( aClientArea );
 
-    for ( USHORT n=0; n<aSortedList.Count(); ++n )
+    for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
     {
         SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
         if ( !pCli->pWin )
@@ -883,7 +883,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
             aSize = pCli->pWin->GetSizePixel();
 
         SvBorder aTemp = aBorder;
-        BOOL bAllowHiding = TRUE;
+        sal_Bool bAllowHiding = sal_True;
         switch ( pCli->eAlign )
         {
             case SFX_ALIGN_HIGHESTTOP:
@@ -893,7 +893,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
                 aSize.Width() = aTmp.GetWidth();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
                     aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize );
-                bAllowHiding = FALSE;
+                bAllowHiding = sal_False;
                 aBorder.Top() += aSize.Height();
                 aPos = aTmp.TopLeft();
                 aTmp.Top() += aSize.Height();
@@ -923,7 +923,7 @@ SvBorder SfxWorkWindow::Arrange_Impl()
                 aSize.Height() = aTmp.GetHeight();
                 if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW )
                     aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize );
-                bAllowHiding = FALSE;
+                bAllowHiding = sal_False;
                 aBorder.Left() += aSize.Width();
                 aPos = aTmp.TopLeft();
                 aTmp.Left() += aSize.Width();
@@ -948,12 +948,12 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
             default:
                 pCli->aSize = pCli->pWin->GetSizePixel();
-                pCli->bResize = FALSE;
+                pCli->bResize = sal_False;
                 continue;
         }
 
         pCli->pWin->SetPosSizePixel( aPos, aSize );
-        pCli->bResize = FALSE;
+        pCli->bResize = sal_False;
         pCli->aSize = aSize;
         if( bAllowHiding && !RequestTopToolSpacePixel_Impl( aBorder ) )
         {
@@ -995,13 +995,13 @@ SvBorder SfxWorkWindow::Arrange_Impl()
 
 void SfxWorkWindow::Close_Impl()
 {
-    for (USHORT n=0; n<pChildWins->Count(); n++)
+    for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
     {
         SfxChildWin_Impl *pCW  = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if (pChild)
         {
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChild->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             SaveStatus_Impl(pChild, pCW->aInfo);
@@ -1009,23 +1009,23 @@ void SfxWorkWindow::Close_Impl()
     }
 }
 
-BOOL SfxWorkWindow::PrepareClose_Impl()
+sal_Bool SfxWorkWindow::PrepareClose_Impl()
 {
-    for (USHORT n=0; n<pChildWins->Count(); n++)
+    for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
     {
         SfxChildWin_Impl *pCW  = (*pChildWins)[n];
         SfxChildWindow *pChild = pCW->pWin;
         if ( pChild && !pChild->QueryClose() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
 SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
-                    SfxChildAlignment eAlign, BOOL bCanGetFocus )
+                    SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
 {
     DBG_CHKTHIS(SfxWorkWindow, 0);
     DBG_ASSERT( pChilds->Count() < 255, "too many childs" );
@@ -1041,7 +1041,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
     pChild->bCanGetFocus = bCanGetFocus;
 
     pChilds->Insert(pChilds->Count(), pChild);
-    bSorted = FALSE;
+    bSorted = sal_False;
     nChilds++;
     return (*pChilds)[pChilds->Count()-1];
 }
@@ -1059,11 +1059,11 @@ void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
     if ( pChild )
     {
         if (pChild->eAlign != eAlign)
-            bSorted = FALSE;
+            bSorted = sal_False;
 
         pChild->eAlign = eAlign;
         pChild->aSize = rNewSize;
-        pChild->bResize = TRUE;
+        pChild->bResize = sal_True;
     }
     else {
         OSL_FAIL( "aligning unregistered child" );
@@ -1077,7 +1077,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
     DBG_CHKTHIS(SfxWorkWindow, 0);
 
     SfxChild_Impl *pChild = 0;
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         pChild = (*pChilds)[nPos];
@@ -1088,7 +1088,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 
     if ( nPos < pChilds->Count() )
     {
-        bSorted = FALSE;
+        bSorted = sal_False;
         nChilds--;
         pChilds->Remove(nPos);
         delete pChild;
@@ -1105,8 +1105,8 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
     DBG_CHKTHIS(SfxWorkWindow, 0);
 
     SfxChild_Impl *pChild = 0;
-    USHORT nCount = pChilds->Count();
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    sal_uInt16 nCount = pChilds->Count();
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         pChild = (*pChilds)[nPos];
         if ( pChild )
@@ -1126,7 +1126,7 @@ void SfxWorkWindow::ShowChilds_Impl()
     bool bInvisible = ( !IsVisible_Impl() || ( !pWorkWin->IsReallyVisible() && !pWorkWin->IsReallyShown() ));
     
     SfxChild_Impl *pCli = 0;
-    for ( USHORT nPos = 0; nPos < pChilds->Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
     {
         SfxChildWin_Impl* pCW = 0;
         pCli = (*pChilds)[nPos];
@@ -1135,7 +1135,7 @@ void SfxWorkWindow::ShowChilds_Impl()
         {
             // We have to find the SfxChildWin_Impl to retrieve the
             // SFX_CHILDWIN flags that can influence visibility.
-            for (USHORT n=0; n<pChildWins->Count(); n++)
+            for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
             {
                 SfxChildWin_Impl* pCWin = (*pChildWins)[n];
                 SfxChild_Impl*    pChild  = pCWin->pCli;
@@ -1158,21 +1158,21 @@ void SfxWorkWindow::ShowChilds_Impl()
                 
             if ( CHILD_VISIBLE == (pCli->nVisible & CHILD_VISIBLE) && bVisible )
             {
-                USHORT nFlags = pCli->bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE;
+                sal_uInt16 nFlags = pCli->bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE;
                 switch ( pCli->pWin->GetType() )
                 {
                     case RSC_DOCKINGWINDOW :
-                        ((DockingWindow*)pCli->pWin)->Show( TRUE, nFlags );
+                        ((DockingWindow*)pCli->pWin)->Show( sal_True, nFlags );
                         break;
                     case RSC_SPLITWINDOW :
-                        ((SplitWindow*)pCli->pWin)->Show( TRUE, nFlags );
+                        ((SplitWindow*)pCli->pWin)->Show( sal_True, nFlags );
                         break;
                     default:
-                        pCli->pWin->Show( TRUE, nFlags );
+                        pCli->pWin->Show( sal_True, nFlags );
                         break;
                 }
 
-                pCli->bSetFocus = FALSE;
+                pCli->bSetFocus = sal_False;
             }
             else
             {
@@ -1195,7 +1195,7 @@ void SfxWorkWindow::ShowChilds_Impl()
 void SfxWorkWindow::HideChilds_Impl()
 {
     SfxChild_Impl *pChild = 0;
-    for ( USHORT nPos = pChilds->Count(); nPos > 0; --nPos )
+    for ( sal_uInt16 nPos = pChilds->Count(); nPos > 0; --nPos )
     {
         pChild = (*pChilds)[nPos-1];
         if (pChild && pChild->pWin)
@@ -1217,7 +1217,7 @@ void SfxWorkWindow::HideChilds_Impl()
 
 void SfxWorkWindow::ResetObjectBars_Impl()
 {
-    USHORT n;
+    sal_uInt16 n;
     for ( n = 0; n < aObjBarList.size(); n++ )
         aObjBarList[n].bDestroy = sal_True;
 
@@ -1225,24 +1225,24 @@ void SfxWorkWindow::ResetObjectBars_Impl()
         (*pChildWins)[n]->nId = 0;
 }
 
-void SfxWorkWindow::NextObjectBar_Impl( USHORT )
+void SfxWorkWindow::NextObjectBar_Impl( sal_uInt16 )
 {
 }
 
-USHORT SfxWorkWindow::HasNextObjectBar_Impl( USHORT, String* )
+sal_uInt16 SfxWorkWindow::HasNextObjectBar_Impl( sal_uInt16, String* )
 {
     return 0;
 }
 
 //------------------------------------------------------------------------
 
-void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
+void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
             SfxInterface* pIFace, const String *pName)
 {
     DBG_ASSERT( (nPos & SFX_POSITION_MASK) < SFX_OBJECTBAR_MAX,
                 "object bar position overflow" );
 
-    USHORT nRealPos = nPos & SFX_POSITION_MASK;
+    sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK;
     if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
     {
         pParent->SetObjectBar_Impl( nPos, nResId, pIFace, pName );
@@ -1251,7 +1251,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
 
     SfxObjectBar_Impl aObjBar;
     aObjBar.pIFace = pIFace;
-    aObjBar.nId = sal::static_int_cast<USHORT>(nResId);
+    aObjBar.nId = sal::static_int_cast<sal_uInt16>(nResId);
     aObjBar.nPos = nRealPos;
     aObjBar.nMode = (nPos & SFX_VISIBILITY_MASK);
     if (pName)
@@ -1259,7 +1259,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
     else
         aObjBar.aName.Erase();
 
-    for ( USHORT n=0; n<aObjBarList.size(); n++ )
+    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nId == aObjBar.nId )
         {
@@ -1273,7 +1273,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
 
 //------------------------------------------------------------------------
 
-bool SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
+bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
 
 /*  [Description]
 
@@ -1282,29 +1282,29 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
 */
 
 {
-    USHORT nRealPos = nPos & SFX_POSITION_MASK;
+    sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK;
     if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
         return pParent->KnowsObjectBar_Impl( nPos );
 
-    for ( USHORT n=0; n<aObjBarList.size(); n++ )
+    for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nPos == nRealPos )
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 //------------------------------------------------------------------------
 
-BOOL SfxWorkWindow::IsVisible_Impl( USHORT nMode ) const
+sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const
 {
     switch( nUpdateMode )
     {
         case SFX_VISIBILITY_STANDARD:
-            return TRUE;
+            return sal_True;
         case SFX_VISIBILITY_UNVISIBLE:
-            return FALSE;
+            return sal_False;
         case SFX_VISIBILITY_PLUGSERVER:
         case SFX_VISIBILITY_PLUGCLIENT:
         case SFX_VISIBILITY_CLIENT:
@@ -1316,7 +1316,7 @@ BOOL SfxWorkWindow::IsVisible_Impl( USHORT nMode ) const
     }
 }
 
-Window* SfxWorkWindow::GetObjectBar_Impl( USHORT, sal_uInt32 )
+Window* SfxWorkWindow::GetObjectBar_Impl( sal_uInt16, sal_uInt32 )
 {
     return NULL;
 }
@@ -1344,7 +1344,7 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
             pWork = pWork->GetParent_Impl();
         }
 
-        ArrangeChilds_Impl( FALSE );
+        ArrangeChilds_Impl( sal_False );
 
         pWork = pParent;
         while ( pWork )
@@ -1424,7 +1424,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
 {
     // Lock SplitWindows (which means supressing the Resize-Reaction of the 
     // DockingWindows)
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
@@ -1461,11 +1461,11 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
     xLayoutManager->lock();
     for ( n = 0; n < aObjBarList.size(); ++n )
     {
-        USHORT      nId      = aObjBarList[n].nId;
+        sal_uInt16      nId      = aObjBarList[n].nId;
         sal_Bool    bDestroy = aObjBarList[n].bDestroy;
 
         // Determine the vaild mode for the ToolBox
-        USHORT nTbxMode = aObjBarList[n].nMode;
+        sal_uInt16 nTbxMode = aObjBarList[n].nMode;
         bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
                                   ( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
         nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN;
@@ -1514,7 +1514,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
     {
         SfxSplitWindow *p = pSplit[n];
         if (p->GetWindowCount())
-            p->Lock(FALSE);
+            p->Lock(sal_False);
     }
 }
 
@@ -1531,11 +1531,11 @@ bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW
 void SfxWorkWindow::UpdateChildWindows_Impl()
 {
     // any current or in the context available Childwindows 
-   for ( USHORT n=0; n<pChildWins->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pChildWins->Count(); n++ )
     {
         SfxChildWin_Impl *pCW = (*pChildWins)[n];
         SfxChildWindow *pChildWin = pCW->pWin;
-        BOOL bCreate = FALSE;
+        sal_Bool bCreate = sal_False;
         if ( pCW->nId && !pCW->bDisabled  && (pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) )
         {
             // In the context is an appropriate ChildWindow allowed; 
@@ -1559,7 +1559,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                         bCreate = ( eAlign == SFX_ALIGN_NOALIGNMENT );
                 }
                 else
-                    bCreate = TRUE;
+                    bCreate = sal_True;
 
                 if ( bCreate )
                     bCreate = AllowChildWindowCreation_Impl( *pCW );
@@ -1567,7 +1567,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
                 // Currently, no window here, but it is enabled; windows 
                 // Create window and if possible theContext
                 if ( bCreate )
-                    CreateChildWin_Impl( pCW, FALSE );
+                    CreateChildWin_Impl( pCW, sal_False );
 
                 if ( !bAllChildsVisible )
                 {
@@ -1622,10 +1622,10 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
     }
 }
 
-void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
+void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFocus )
 {
     if ( pCW->aInfo.bVisible != 42 )
-        pCW->aInfo.bVisible = TRUE;
+        pCW->aInfo.bVisible = sal_True;
 
     SfxChildWindow *pChildWin = SfxChildWindow::CreateChildWindow( pCW->nId, pWorkWin, &GetBindings(), pCW->aInfo);
     if (pChildWin)
@@ -1644,7 +1644,7 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
         // The creation was successful
         GetBindings().Invalidate(pCW->nId);
 
-        USHORT nPos = pChildWin->GetPosition();
+        sal_uInt16 nPos = pChildWin->GetPosition();
         if (nPos != CHILDWIN_NOPOS)
         {
             DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
@@ -1687,11 +1687,11 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
 
 void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
 {
-    USHORT nId = pCW->nSaveId;
+    sal_uInt16 nId = pCW->nSaveId;
     SfxChildWindow *pChildWin = pCW->pWin;
 
     // Save the information in the INI file 
-    USHORT nFlags = pCW->aInfo.nFlags;
+    sal_uInt16 nFlags = pCW->aInfo.nFlags;
     pCW->aInfo = pChildWin->GetInfo();
     pCW->aInfo.nFlags |= nFlags;
     SaveStatus_Impl(pChildWin, pCW->aInfo);
@@ -1727,25 +1727,25 @@ void SfxWorkWindow::ResetStatusBar_Impl()
 void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings& )
 {
     if ( nResId && bShowStatusBar && IsVisible_Impl() )
-        aStatBar.nId = sal::static_int_cast<USHORT>(nResId);
+        aStatBar.nId = sal::static_int_cast<sal_uInt16>(nResId);
 }
 
 #define SFX_ITEMTYPE_STATBAR 4
 
-void SfxWorkWindow::SetTempStatusBar_Impl( BOOL bSet )
+void SfxWorkWindow::SetTempStatusBar_Impl( sal_Bool bSet )
 {
     if ( aStatBar.bTemp != bSet && bShowStatusBar && IsVisible_Impl() )
     {
-        BOOL bOn = FALSE;
-        BOOL bReset = FALSE;
+        sal_Bool bOn = sal_False;
+        sal_Bool bReset = sal_False;
         if ( bSet && !aStatBar.nId )
         {
-            bReset = TRUE;
+            bReset = sal_True;
             SetStatusBar_Impl( SFX_ITEMTYPE_STATBAR, SFX_APP(), GetBindings() );
         }
 
         if ( aStatBar.nId && aStatBar.bOn && !bIsFullScreen )
-            bOn = TRUE;
+            bOn = sal_True;
 
         aStatBar.bTemp = bSet;
         if ( !bOn || bReset || (!bSet && aStatBar.nId ) )
@@ -1789,7 +1789,7 @@ void SfxWorkWindow::UpdateStatusBar_Impl()
     }
 }
 
-void SfxWorkWindow::MakeVisible_Impl( BOOL bVis )
+void SfxWorkWindow::MakeVisible_Impl( sal_Bool bVis )
 {
     if ( bVis )
         nOrigMode = SFX_VISIBILITY_STANDARD;
@@ -1800,15 +1800,15 @@ void SfxWorkWindow::MakeVisible_Impl( BOOL bVis )
         nUpdateMode = nOrigMode;
 }
 
-BOOL SfxWorkWindow::IsVisible_Impl()
+sal_Bool SfxWorkWindow::IsVisible_Impl()
 {
     return nOrigMode != SFX_VISIBILITY_UNVISIBLE;
 }
 
 //------------------------------------------------------------------------
-void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
+void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 nId )
 {
-    for ( USHORT n = 0; n < pChildWins->Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pChildWins->Count(); ++n )
     {
         SfxChildWindow *pCW = (*pChildWins)[n]->pWin;
         if (pCW && pCW->GetAlignment() == SFX_ALIGN_NOALIGNMENT && pCW->GetType() != nId)
@@ -1836,10 +1836,10 @@ void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
 //------------------------------------------------------------------------
 
 void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
-            SfxDockingConfig eConfig, USHORT nId)
+            SfxDockingConfig eConfig, sal_uInt16 nId)
 {
     SfxDockingWindow* pDockWin=0;
-    USHORT nPos = USHRT_MAX;
+    sal_uInt16 nPos = USHRT_MAX;
     Window *pWin=0;
     SfxChildWin_Impl *pCW = 0;
 
@@ -1850,7 +1850,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
     else
     {
         // configure direct childwindow
-        for (USHORT n=0; n<pChildWins->Count(); n++)
+        for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
         {
             pCW = (*pChildWins)[n];
             SfxChildWindow *pChild = pCW->pWin;
@@ -1896,7 +1896,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                 pWin = pSplitWin->GetSplitWindow();
                 if ( pSplitWin->GetWindowCount() == 1 )
-                    ((SplitWindow*)pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+                    ((SplitWindow*)pWin)->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
         }
 
@@ -1913,7 +1913,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
         Sort_Impl();
 
     SfxChild_Impl *pChild = 0;
-    USHORT n;
+    sal_uInt16 n;
     for ( n=0; n<aSortedList.Count(); ++n )
     {
         pChild = (*pChilds)[aSortedList[n]];
@@ -1936,13 +1936,13 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             Rectangle aOuterRect( GetTopRect_Impl() );
             aOuterRect.SetPos( pWorkWin->OutputToScreenPixel( aOuterRect.TopLeft() ));
             Rectangle aInnerRect( aOuterRect );
-            BOOL bTbx = (eChild == SFX_CHILDWIN_OBJECTBAR);
+            sal_Bool bTbx = (eChild == SFX_CHILDWIN_OBJECTBAR);
 
             // The current affected window is included in the calculation of 
             // the inner rectangle!
-            for ( USHORT m=0; m<aSortedList.Count(); ++m )
+            for ( sal_uInt16 m=0; m<aSortedList.Count(); ++m )
             {
-                USHORT i=aSortedList[m];
+                sal_uInt16 i=aSortedList[m];
                 SfxChild_Impl* pCli = (*pChilds)[i];
 
                 if ( pCli && pCli->nVisible == CHILD_VISIBLE && pCli->pWin )
@@ -2061,7 +2061,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
                 if ( eChild == SFX_CHILDWIN_DOCKINGWINDOW || eAlign == SFX_ALIGN_NOALIGNMENT)
                 {
                     // configuration inside the SplitWindow, no change for the SplitWindows' configuration
-                    pCli->bResize = TRUE;
+                    pCli->bResize = sal_True;
                     pCli->aSize = pDockWin->GetSizePixel();
                 }
             }
@@ -2070,7 +2070,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             {
                 if( pCli->eAlign != eAlign )
                 {
-                    bSorted = FALSE;
+                    bSorted = sal_False;
                     pCli->eAlign = eAlign;
                 }
 
@@ -2081,7 +2081,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             if ( pCW && pCW->pWin )
             {
                 // store changed configuration
-                USHORT nFlags = pCW->aInfo.nFlags;
+                sal_uInt16 nFlags = pCW->aInfo.nFlags;
                 pCW->aInfo = pCW->pWin->GetInfo();
                 pCW->aInfo.nFlags |= nFlags;
                 if ( eConfig != SFX_MOVEDOCKINGWINDOW )
@@ -2095,10 +2095,10 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, USHORT nMode )
+void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnabled, sal_uInt16 nMode )
 {
-    USHORT nInter = (USHORT) ( lId >> 16 );
-    USHORT nId = (USHORT) ( lId & 0xFFFF );
+    sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 );
+    sal_uInt16 nId = (sal_uInt16) ( lId & 0xFFFF );
 
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2111,8 +2111,8 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
     if ( pWork )
     {
         // The Parent already known?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2123,8 +2123,8 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
     if ( !pCW )
     {
         // If no Parent or the Parent us still unknown, then search here
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2156,10 +2156,10 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
 //--------------------------------------------------------------------
 // The on/of-Status of a ChildWindows is switched
 
-void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
+void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nId == nId)
             break;
@@ -2186,15 +2186,15 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 {
                     if ( pChild->QueryClose() )
                     {
-                        pCW->bCreate = FALSE;
+                        pCW->bCreate = sal_False;
                         if ( pChild->IsHideAtToggle() )
                         {
-                            ShowChildWindow_Impl( nId, FALSE, bSetFocus );
+                            ShowChildWindow_Impl( nId, sal_False, bSetFocus );
                         }
                         else
                         {
                             // The Window should be switched off 
-                            pChild->SetVisible_Impl( FALSE );
+                            pChild->SetVisible_Impl( sal_False );
                             RemoveChildWin_Impl( pCW );
                         }
                     }
@@ -2202,7 +2202,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 else
                 {
                     // no actual Window exists, yet => just remember the "switched off" state
-                    pCW->bCreate = FALSE;
+                    pCW->bCreate = sal_False;
                 }
             }
             else
@@ -2212,7 +2212,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                 {
                     if ( pChild )
                     {
-                        ShowChildWindow_Impl( nId, TRUE, bSetFocus );
+                        ShowChildWindow_Impl( nId, sal_True, bSetFocus );
                     }
                     else
                     {
@@ -2220,7 +2220,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
                         CreateChildWin_Impl( pCW, bSetFocus );
                         if ( !pCW->pWin )
                             // no success
-                            pCW->bCreate = FALSE;
+                            pCW->bCreate = sal_False;
                     }
                 }
             }
@@ -2267,10 +2267,10 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
 
 //--------------------------------------------------------------------
 
-BOOL SfxWorkWindow::HasChildWindow_Impl(USHORT nId)
+sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
             break;
@@ -2285,10 +2285,10 @@ BOOL SfxWorkWindow::HasChildWindow_Impl(USHORT nId)
     if ( pParent )
         return pParent->HasChildWindow_Impl( nId );
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SfxWorkWindow::IsFloating( USHORT nId )
+sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
 {
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2301,8 +2301,8 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( pWork )
     {
         // The Parent already known?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2313,8 +2313,8 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( !pCW )
     {
         // If no Parent or the Parent us still unknown, then search here
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2327,7 +2327,7 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
         // If new, then initialize, add this here depending on the flag or 
         // the Parent  
         pCW = new SfxChildWin_Impl( nId );
-        pCW->bEnable = FALSE;
+        pCW->bEnable = sal_False;
         pCW->nId = 0;
         pCW->nVisibility = 0;
         InitializeChild_Impl( pCW );
@@ -2341,16 +2341,16 @@ BOOL SfxWorkWindow::IsFloating( USHORT nId )
     if ( pCW->aInfo.GetExtraData_Impl( &eAlign ) )
         return( eAlign == SFX_ALIGN_NOALIGNMENT );
     else
-        return TRUE;
+        return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxWorkWindow::KnowsChildWindow_Impl(USHORT nId)
+sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
 {
     SfxChildWin_Impl *pCW=0;
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
     {
         pCW = (*pChildWins)[n];
@@ -2361,18 +2361,18 @@ BOOL SfxWorkWindow::KnowsChildWindow_Impl(USHORT nId)
     if (n<nCount)
     {
         if ( !(pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE) && !IsVisible_Impl(  pCW->nVisibility ) )
-            return FALSE;
+            return sal_False;
         return pCW->bEnable;
     }
     else if ( pParent )
         return pParent->KnowsChildWindow_Impl( nId );
     else
-        return FALSE;
+        return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
+void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus)
 {
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2385,8 +2385,8 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
     if ( pWork )
     {
         // The Parent already known?
-        USHORT nCount = pWork->pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pWork->pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pWork->pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pWork->pChildWins)[n];
@@ -2397,8 +2397,8 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
     if ( !pCW )
     {
         // If no Parent or the Parent us still unknown, then search here
-        USHORT nCount = pChildWins->Count();
-        for (USHORT n=0; n<nCount; n++)
+        sal_uInt16 nCount = pChildWins->Count();
+        for (sal_uInt16 n=0; n<nCount; n++)
             if ((*pChildWins)[n]->nSaveId == nId)
             {
                 pCW = (*pChildWins)[n];
@@ -2424,11 +2424,11 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFocus)
+void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus)
 {
-    USHORT nCount = pChildWins->Count();
+    sal_uInt16 nCount = pChildWins->Count();
     SfxChildWin_Impl* pCW=0;
-    USHORT n;
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
     {
         pCW = (*pChildWins)[n];
@@ -2470,14 +2470,14 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
         }
         else if ( bVisible )
         {
-            SetChildWindow_Impl( nId, TRUE, bSetFocus );
+            SetChildWindow_Impl( nId, sal_True, bSetFocus );
             pChildWin = pCW->pWin;
         }
 
         if ( pChildWin )
         {
             pChildWin->SetVisible_Impl( bVisible );
-            USHORT nFlags = pCW->aInfo.nFlags;
+            sal_uInt16 nFlags = pCW->aInfo.nFlags;
             pCW->aInfo = pChildWin->GetInfo();
             pCW->aInfo.nFlags |= nFlags;
             if ( !pCW->bCreate )
@@ -2512,10 +2512,10 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFoc
 
 //--------------------------------------------------------------------
 
-SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
+SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
              break;
@@ -2532,10 +2532,10 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
 void SfxWorkWindow::ResetChildWindows_Impl()
 {
 
-    for ( USHORT n = 0; n < pChildWins->Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pChildWins->Count(); ++n )
     {
         (*pChildWins)[n]->nId = 0;
-        (*pChildWins)[n]->bEnable = FALSE;
+        (*pChildWins)[n]->bEnable = sal_False;
     }
 }
 
@@ -2561,14 +2561,14 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl()
 // Virtual method to find out if there is room for a ChildWindow in the 
 // client area of the parent.
 
-BOOL SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
+sal_Bool SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder )
 {
     if ( !IsDockingAllowed() ||
             aClientArea.GetWidth() < aBorder.Left() + aBorder.Right() ||
             aClientArea.GetHeight() < aBorder.Top() + aBorder.Bottom() )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;;
+        return sal_True;;
 }
 
 void SfxWorkWindow::SaveStatus_Impl(SfxChildWindow *pChild, const SfxChildWinInfo &rInfo)
@@ -2584,7 +2584,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
     SfxApplication *pApp = SFX_APP();
     {
         SfxChildWinFactArr_Impl &rFactories = pApp->GetChildWinFactories_Impl();
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
         {
             pFact = rFactories[nFactory];
             if ( pFact->nId == pCW->nSaveId )
@@ -2593,7 +2593,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
                 SfxChildWindow::InitializeChildWinFactory_Impl(
                                             pCW->nSaveId, pCW->aInfo);
                 pCW->bCreate = pCW->aInfo.bVisible;
-                USHORT nFlags = pFact->aInfo.nFlags;
+                sal_uInt16 nFlags = pFact->aInfo.nFlags;
                 if ( nFlags & SFX_CHILDWIN_TASK )
                     pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
                 if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
@@ -2614,7 +2614,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
         if ( pFactories )
         {
             SfxChildWinFactArr_Impl &rFactories = *pFactories;
-            for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+            for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             {
                 pFact = rFactories[nFactory];
                 if ( pFact->nId == pCW->nSaveId )
@@ -2623,7 +2623,7 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
                     SfxChildWindow::InitializeChildWinFactory_Impl(
                                                 pCW->nSaveId, pCW->aInfo);
                     pCW->bCreate = pCW->aInfo.bVisible;
-                    USHORT nFlags = pFact->aInfo.nFlags;
+                    sal_uInt16 nFlags = pFact->aInfo.nFlags;
                     if ( nFlags & SFX_CHILDWIN_TASK )
                         pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
                     if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
@@ -2661,7 +2661,7 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
     }
 }
 
-void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
+void SfxWorkWindow::MakeChildsVisible_Impl( sal_Bool bVis )
 {
     if ( pParent )
         pParent->MakeChildsVisible_Impl( bVis );
@@ -2671,7 +2671,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( USHORT n=0; n<aSortedList.Count(); ++n )
+        for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
         {
             SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
             if ( (pCli->eAlign == SFX_ALIGN_NOALIGNMENT) || (IsDockingAllowed() && bInternalDockingAllowed) )
@@ -2682,7 +2682,7 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     {
         if ( !bSorted )
             Sort_Impl();
-        for ( USHORT n=0; n<aSortedList.Count(); ++n )
+        for ( sal_uInt16 n=0; n<aSortedList.Count(); ++n )
         {
             SfxChild_Impl* pCli = (*pChilds)[aSortedList[n]];
             pCli->nVisible &= ~CHILD_ACTIVE;
@@ -2690,14 +2690,14 @@ void SfxWorkWindow::MakeChildsVisible_Impl( BOOL bVis )
     }
 }
 
-BOOL SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin )
+sal_Bool SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin )
 {
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
-        if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( TRUE ) )
-            return TRUE;
+        if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( sal_True ) )
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -2706,7 +2706,7 @@ void SfxWorkWindow::EndAutoShow_Impl( Point aPos )
     if ( pParent )
         pParent->EndAutoShow_Impl( aPos );
 
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         SfxSplitWindow *p = pSplit[n];
         if ( p && p->IsAutoHide() )
@@ -2729,14 +2729,14 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
         pParent->ArrangeAutoHideWindows( pActSplitWin );
 
     Rectangle aArea( aUpperClientArea );
-    for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
     {
         // Either dummy window or window in the auto-show-mode are processed
         // (not pinned, FadeIn). 
         // Only the abandoned window may be invisible, because perhaps its  
         // size is just beeing calculated before it is displayed.
         SfxSplitWindow* pSplitWin = pSplit[n];
-        BOOL bDummyWindow = !pSplitWin->IsFadeIn();
+        sal_Bool bDummyWindow = !pSplitWin->IsFadeIn();
         Window *pDummy = pSplitWin->GetSplitWindow();
         Window *pWin = bDummyWindow ? pDummy : pSplitWin;
         if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) )
@@ -2848,12 +2848,12 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin )
     }
 }
 
-Rectangle SfxWorkWindow::GetFreeArea( BOOL bAutoHide ) const
+Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const
 {
     if ( bAutoHide )
     {
         Rectangle aArea( aClientArea );
-        for ( USHORT n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+        for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
         {
             if ( pSplit[n]->IsPinned() || !pSplit[n]->IsVisible() )
                 continue;
@@ -2882,7 +2882,7 @@ Rectangle SfxWorkWindow::GetFreeArea( BOOL bAutoHide ) const
         return aClientArea;
 }
 
-SfxChildWinController_Impl::SfxChildWinController_Impl( USHORT nID, SfxWorkWindow *pWork )
+SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkWindow *pWork )
     : SfxControllerItem( nID, pWork->GetBindings() )
     , pWorkwin( pWork )
 {}
@@ -2893,15 +2893,15 @@ SfxChildWinController_Impl::SfxChildWinController_Impl( USHORT nID, SfxWorkWindo
 }
 
 void SfxChildWinController_Impl::StateChanged(
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* )
 {
     pWorkwin->DisableChildWindow_Impl( nSID, eState == SFX_ITEM_DISABLED );
 }
 
-void SfxWorkWindow::DisableChildWindow_Impl( USHORT nId, BOOL bDisable )
+void SfxWorkWindow::DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable )
 {
-    USHORT nCount = pChildWins->Count();
-    USHORT n;
+    sal_uInt16 nCount = pChildWins->Count();
+    sal_uInt16 n;
     for (n=0; n<nCount; n++)
         if ((*pChildWins)[n]->nSaveId == nId)
              break;
@@ -2924,16 +2924,16 @@ Window* SfxWorkWindow::GetActiveChild_Impl()
     return pActiveChild;
 }
 
-BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
+sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
 {
     // Sort all children under list
     SvUShorts aList;
-    for ( USHORT i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
+    for ( sal_uInt16 i=SFX_OBJECTBAR_MAX; i<pChilds->Count(); i++)
     {
         SfxChild_Impl *pCli = (*pChilds)[i];
         if ( pCli && pCli->bCanGetFocus && pCli->pWin )
         {
-            USHORT k;
+            sal_uInt16 k;
             for (k=0; k<aList.Count(); k++)
                 if ( ChildTravelValue((*pChilds)[aList[k]]->eAlign) > ChildTravelValue(pCli->eAlign) )
                     break;
@@ -2942,17 +2942,17 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
     }
 
     if ( aList.Count() == 0 )
-        return FALSE;
+        return sal_False;
 
-    USHORT nTopValue  = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
-    for ( USHORT i=0; i<aList.Count(); i++ )
+    sal_uInt16 nTopValue  = ChildTravelValue( SFX_ALIGN_LOWESTTOP );
+    for ( sal_uInt16 i=0; i<aList.Count(); i++ )
     {
         SfxChild_Impl* pCli = (*pChilds)[aList[i]];
         if ( pCli->pWin && ChildTravelValue( pCli->eAlign ) > nTopValue )
             break;
     }
 
-    USHORT n = bForward ? 0 : aList.Count()-1;
+    sal_uInt16 n = bForward ? 0 : aList.Count()-1;
     SfxChild_Impl *pAct=NULL;
     if ( pActiveChild )
     {
@@ -2974,14 +2974,14 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
     n = n + 1;
     if ( pAct )
     {
-        for ( USHORT i=0; i<SFX_SPLITWINDOWS_MAX; i++ )
+        for ( sal_uInt16 i=0; i<SFX_SPLITWINDOWS_MAX; i++ )
         {
             // Maybe the pNext is a Splitwindow
             SfxSplitWindow *p = pSplit[i];
             if ( pAct->pWin == p )
             {
                 if( p->ActivateNextChild_Impl( bForward ) )
-                    return TRUE;
+                    return sal_True;
                 break;
             }
         }
@@ -2994,7 +2994,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             n = n-1;
 
         if ( n == 0 || n == aList.Count()-1 )
-            return FALSE;
+            return sal_False;
     }
 
     for( ;; )
@@ -3003,7 +3003,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
         if ( pCli->pWin )
         {
             SfxChild_Impl* pNext = pCli;
-            for ( USHORT i=0; n<SFX_SPLITWINDOWS_MAX; n++ )
+            for ( sal_uInt16 i=0; n<SFX_SPLITWINDOWS_MAX; n++ )
             {
                 // Maybe the pNext is a Splitwindow
                 SfxSplitWindow *p = pSplit[i];
@@ -3013,7 +3013,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
                     p->SetActiveWindow_Impl( NULL );
                     pNext = NULL;
                     if( p->ActivateNextChild_Impl( bForward ) )
-                        return TRUE;
+                        return sal_True;
                     break;
                 }
             }
@@ -3022,7 +3022,7 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             {
                 pNext->pWin->GrabFocus();
                 pActiveChild = pNext->pWin;
-                return TRUE;
+                return sal_True;
             }
         }
 
@@ -3035,17 +3035,17 @@ BOOL SfxWorkWindow::ActivateNextChild_Impl( BOOL bForward )
             break;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( BOOL )
+void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( sal_Bool )
 {
 }
 
 void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
 {
-    USHORT n;
-    USHORT nCount = pChildWins->Count();
+    sal_uInt16 n;
+    sal_uInt16 nCount = pChildWins->Count();
     for (n=0; n<nCount; n++)
     {
         SfxChildWin_Impl*pCW = (*pChildWins)[n];
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 863c7786e1..863c7786e1 100644..100755
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx
index 1631d2eada..1631d2eada 100644..100755
--- a/sfx2/source/appl/xpackcreator.hxx
+++ b/sfx2/source/appl/xpackcreator.hxx
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index decf21c326..decf21c326 100644..100755
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.hrc
diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
index 3000584403..3000584403 100644..100755
--- a/sfx2/source/bastyp/bastyp.src
+++ b/sfx2/source/bastyp/bastyp.src
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 7c3aec2489..5b5ad21617 100644..100755
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -38,7 +38,7 @@
 //====================================================================
 // add nOffset to each bit-value in the set
 
-BitSet BitSet::operator<<( USHORT nOffset ) const
+BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
 {
     DBG_MEMTEST();
     // create a work-copy, return it if nothing to shift
@@ -47,17 +47,17 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
         return aSet;
 
     // compute the shiftment in long-words and bits
-    USHORT nBlockDiff = nOffset / 32;
-    ULONG nBitValDiff = nOffset % 32;
+    sal_uInt16 nBlockDiff = nOffset / 32;
+    sal_uIntPtr nBitValDiff = nOffset % 32;
 
     // compute the new number of bits
-    for ( USHORT nBlock = 0; nBlock < nBlockDiff; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nBlockDiff; ++nBlock )
         aSet.nCount = aSet.nCount - CountBits( *(aSet.pBitmap+nBlock) );
     aSet.nCount = aSet.nCount -
         CountBits( *(aSet.pBitmap+nBlockDiff) >> (32-nBitValDiff) );
 
     // shift complete long-words
-    USHORT nTarget, nSource;
+    sal_uInt16 nTarget, nSource;
     for ( nTarget = 0, nSource = nBlockDiff;
           (nSource+1) < aSet.nBlocks;
           ++nTarget, ++nSource )
@@ -75,7 +75,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
     // shorten the block-array
     if ( nTarget < aSet.nBlocks )
     {
-        ULONG* pNewMap = new ULONG[nTarget];
+        sal_uIntPtr* pNewMap = new sal_uIntPtr[nTarget];
         memcpy( pNewMap, aSet.pBitmap, 4 * nTarget );
         delete [] aSet.pBitmap;
         aSet.pBitmap = pNewMap;
@@ -89,7 +89,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
 
 // substracts nOffset from each bit-value in the set
 
-BitSet BitSet::operator>>( USHORT ) const
+BitSet BitSet::operator>>( sal_uInt16 ) const
 {
     DBG_MEMTEST();
     return BitSet();
@@ -107,7 +107,7 @@ void BitSet::CopyFrom( const BitSet& rSet )
     if ( rSet.nBlocks )
     {
         DBG_MEMTEST();
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
     }
     else
@@ -140,13 +140,13 @@ BitSet::BitSet( const BitSet& rOrig )
 
 // creates a bitset from an array
 
-BitSet::BitSet( USHORT* pArray, USHORT nSize ):
+BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ):
     nCount(nSize)
 {
     DBG_MEMTEST();
     // find the highest bit to set
-    USHORT nMax = 0;
-    for ( USHORT n = 0; n < nCount; ++n )
+    sal_uInt16 nMax = 0;
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
         if ( pArray[n] > nMax )
             nMax = pArray[n];
 
@@ -155,15 +155,15 @@ BitSet::BitSet( USHORT* pArray, USHORT nSize ):
     {
         // allocate memory for all blocks needed
         nBlocks = nMax / 32 + 1;
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memset( pBitmap, 0, 4 * nBlocks );
 
         // set all the bits
-        for ( USHORT n = 0; n < nCount; ++n )
+        for ( sal_uInt16 n = 0; n < nCount; ++n )
         {
             // compute the block no. and bitvalue
-            USHORT nBlock = n / 32;
-            ULONG nBitVal = 1L << (n % 32);
+            sal_uInt16 nBlock = n / 32;
+            sal_uIntPtr nBitVal = 1L << (n % 32);
 
             // set a single bit
             if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 )
@@ -219,16 +219,16 @@ BitSet& BitSet::operator=( const BitSet& rOrig )
 
 // assignment from a single bit
 
-BitSet& BitSet::operator=( USHORT nBit )
+BitSet& BitSet::operator=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
     delete [] pBitmap;
 
     nBlocks = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
     nCount = 1;
 
-    pBitmap = new ULONG[nBlocks];
+    pBitmap = new sal_uIntPtr[nBlocks];
     memset( pBitmap + nBlocks, 0, 4 * nBlocks );
 
     *(pBitmap+nBlocks) = nBitVal;
@@ -240,11 +240,11 @@ BitSet& BitSet::operator=( USHORT nBit )
 
 // creates the asymetric difference with another bitset
 
-BitSet& BitSet::operator-=(USHORT nBit)
+BitSet& BitSet::operator-=(sal_uInt16 nBit)
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
       return *this;
@@ -265,12 +265,12 @@ BitSet& BitSet::operator-=(USHORT nBit)
 BitSet& BitSet::operator|=( const BitSet& rSet )
 {
     DBG_MEMTEST();
-    USHORT nMax = Min(nBlocks, rSet.nBlocks);
+    sal_uInt16 nMax = Min(nBlocks, rSet.nBlocks);
 
     // expand the bitmap
     if ( nBlocks < rSet.nBlocks )
     {
-        ULONG *pNewMap = new ULONG[rSet.nBlocks];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[rSet.nBlocks];
         memset( pNewMap + nBlocks, 0, 4 * (rSet.nBlocks - nBlocks) );
 
         if ( pBitmap )
@@ -283,10 +283,10 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
     }
 
     // add the bits blocks by block
-    for ( USHORT nBlock = 0; nBlock < nMax; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nMax; ++nBlock )
     {
         // compute numberof additional bits
-        ULONG nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
+        sal_uIntPtr nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
         nCount = nCount + CountBits(nDiff);
 
         *(pBitmap+nBlock) |= *(rSet.pBitmap+nBlock);
@@ -299,15 +299,15 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
 
 // unites with a single bit
 
-BitSet& BitSet::operator|=( USHORT nBit )
+BitSet& BitSet::operator|=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
     {
-        ULONG *pNewMap = new ULONG[nBlock+1];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[nBlock+1];
         memset( pNewMap + nBlocks, 0, 4 * (nBlock - nBlocks + 1) );
 
         if ( pBitmap )
@@ -332,14 +332,14 @@ BitSet& BitSet::operator|=( USHORT nBit )
 
 // determines if the bit is set (may be the only one)
 
-BOOL BitSet::Contains( USHORT nBit ) const
+sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
-        return FALSE;
+        return sal_False;
     return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal;
 }
 
@@ -347,27 +347,27 @@ BOOL BitSet::Contains( USHORT nBit ) const
 
 // determines if the bitsets are equal
 
-BOOL BitSet::operator==( const BitSet& rSet ) const
+sal_Bool BitSet::operator==( const BitSet& rSet ) const
 {
     DBG_MEMTEST();
     if ( nBlocks != rSet.nBlocks )
-        return FALSE;
+        return sal_False;
 
-    USHORT nBlock = nBlocks;
+    sal_uInt16 nBlock = nBlocks;
     while ( nBlock-- > 0 )
         if ( *(pBitmap+nBlock) != *(rSet.pBitmap+nBlock) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
 // counts the number of 1-bits in the parameter
 
-USHORT BitSet::CountBits( ULONG nBits )
+sal_uInt16 BitSet::CountBits( sal_uIntPtr nBits )
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     int nBit = 32;
     while ( nBit-- && nBits )
     {   if ( ( (long)nBits ) < 0 )
@@ -379,15 +379,15 @@ USHORT BitSet::CountBits( ULONG nBits )
 
 //--------------------------------------------------------------------
 
-USHORT IndexBitSet::GetFreeIndex()
+sal_uInt16 IndexBitSet::GetFreeIndex()
 {
-  for(USHORT i=0;i<USHRT_MAX;i++)
+  for(sal_uInt16 i=0;i<USHRT_MAX;i++)
     if(!Contains(i))
       {
         *this|=i;
         return i;
       }
-  DBG_ASSERT(FALSE, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
+  DBG_ASSERT(sal_False, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
   return 0;
 }
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 42e2bdd251..c75267a6e9 100644..100755
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -101,8 +101,7 @@ using namespace ::com::sun::star::beans;
 #include <svtools/sfxecode.hxx>
 #include <unotools/syslocale.hxx>
 
-#include "sfxhelp.hxx"
-#include "sfxbasic.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
 #include "sfxtypes.hxx"
@@ -111,7 +110,7 @@ using namespace ::com::sun::star::beans;
 #include <sfx2/progress.hxx>
 #include "openflag.hxx"
 #include "bastyp.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/dispatch.hxx>
@@ -124,7 +123,7 @@ using namespace ::com::sun::star::beans;
 #include <sfx2/viewfrm.hxx>
 
 static SfxFilterList_Impl* pFilterArr = 0;
-static BOOL bFirstRead = TRUE;
+static sal_Bool bFirstRead = sal_True;
 
 static void CreateFilterArr()
 {
@@ -277,7 +276,7 @@ SfxFilterMatcher::SfxFilterMatcher( const String& rName )
 
     String aName = SfxObjectShell::GetServiceNameFromFactory( rName );
     DBG_ASSERT(aName.Len(), "Found boes type :-)");
-    for ( USHORT n=0; n<pImplArr->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
     {
         // find the impl-Data of any comparable FilterMatcher that was created before
         SfxFilterMatcher_Impl* pImp = pImplArr->GetObject(n);
@@ -539,7 +538,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
     const SfxFilter* pFilter = pOldFilter;
 
     sal_Bool bPreview = rMedium.IsPreview_Impl();
-    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, FALSE);
+    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False);
     if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) )
         return ERRCODE_ABORT;
 
@@ -584,7 +583,6 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
         if( STRING_NOTFOUND != aFlags.Search( 'H' ) )
             bHidden = sal_True;
     }
-
     *ppFilter = pFilter;
 
     if ( bHidden || (bAPI && nErr == ERRCODE_SFX_CONSULTUSER) )
@@ -767,7 +765,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4UIName( const String& rName, SfxFil
 const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
 {
     String aName( rName );
-    USHORT nIndex = aName.SearchAscii(": ");
+    sal_uInt16 nIndex = aName.SearchAscii(": ");
     if (  nIndex != STRING_NOTFOUND )
     {
         OSL_FAIL("Old filter name used!");
@@ -800,7 +798,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
                 }
             }
 
-            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, FALSE );
+            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, sal_False );
         }
     }
 
@@ -902,7 +900,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     const ::rtl::OUString& rName,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-    BOOL bUpdate
+    sal_Bool bUpdate
     )
 {
     ::rtl::OUString sFilterName( rName );
@@ -1043,16 +1041,16 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
         }
 
         SfxFilter* pFilter = bUpdate ? (SfxFilter*) SfxFilter::GetFilterByName( sFilterName ) : 0;
-        BOOL bNew = FALSE;
+        sal_Bool bNew = sal_False;
         if (!pFilter)
         {
-            bNew = TRUE;
+            bNew = sal_True;
             pFilter = new SfxFilter( sFilterName             ,
                                      sExtension              ,
                                      nFlags                  ,
                                      nClipboardId            ,
                                      sType                   ,
-                                     (USHORT)nDocumentIconId ,
+                                     (sal_uInt16)nDocumentIconId ,
                                      sMimeType               ,
                                      sUserData               ,
                                      sServiceName );
@@ -1064,7 +1062,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
             pFilter->nFormatType  = nFlags;
             pFilter->lFormat      = nClipboardId;
             pFilter->aTypeName    = sType;
-            pFilter->nDocIcon     = (USHORT)nDocumentIconId;
+            pFilter->nDocIcon     = (sal_uInt16)nDocumentIconId;
             pFilter->aMimeType    = sMimeType;
             pFilter->aUserData    = sUserData;
             pFilter->aServiceName = sServiceName;
@@ -1085,13 +1083,13 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     }
 }
 
-void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
+void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
 {
     RTL_LOGFILE_CONTEXT( aMeasure, "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
     if ( !pFilterArr )
         CreateFilterArr();
 
-    bFirstRead = FALSE;
+    bFirstRead = sal_False;
     SfxFilterList_Impl& rList = *pFilterArr;
 
     try
@@ -1121,7 +1119,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
                 // and change it back for all valid filters afterwards.
                 if( !rList.empty() )
                 {
-                    bUpdate = TRUE;
+                    bUpdate = sal_True;
                     SfxFilter* pFilter;
                     for ( size_t i = 0, n = rList.size(); i < n; ++i )
                     {
@@ -1152,7 +1150,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
     if ( pImplArr && bUpdate )
     {
         // global filter arry was modified, factory specific ones might need an update too
-        for ( USHORT n=0; n<pImplArr->Count(); n++ )
+        for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
             pImplArr->GetObject(n)->Update();
     }
 }
diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src
index a22ef47379..a22ef47379 100644..100755
--- a/sfx2/source/bastyp/fltfnc.src
+++ b/sfx2/source/bastyp/fltfnc.src
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index a9637faa62..1c84fdae03 100644..100755
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -103,7 +103,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
         (xContainer==m_xFilterCache)
       )
     {
-        SfxFilterContainer::ReadFilters_Impl( TRUE );
+        SfxFilterContainer::ReadFilters_Impl( sal_True );
     }
 }
 
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index b775d9d831..b775d9d831 100644..100755
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 31ee13fb95..cd22a3a2d2 100644..100755
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -75,10 +75,10 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
     // do like that for now. Netscape does however not aallow for a direct
     // seting to 0, while IE4.0 does
     // We will not mimic that bug !
-    BOOL bMarginWidth = FALSE, bMarginHeight = FALSE;
+    sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False;
 
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i=0; i<nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i=0; i<nArrLen; i++ )
     {
         const HTMLOption *pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -104,14 +104,14 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
 
             if( !bMarginHeight )
                 aMargin.Height() = 0;
-            bMarginWidth = TRUE;
+            bMarginWidth = sal_True;
             break;
         case HTML_O_MARGINHEIGHT:
             aMargin.Height() = pOption->GetNumber();
 
             if( !bMarginWidth )
                 aMargin.Width() = 0;
-            bMarginHeight = TRUE;
+            bMarginHeight = sal_True;
             break;
         case HTML_O_SCROLLING:
             pFrame->SetScrollingMode(
@@ -121,33 +121,33 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
         case HTML_O_FRAMEBORDER:
         {
             String aStr = pOption->GetString();
-            BOOL bBorder = TRUE;
+            sal_Bool bBorder = sal_True;
             if ( aStr.EqualsIgnoreCaseAscii("NO") ||
                  aStr.EqualsIgnoreCaseAscii("0") )
-                bBorder = FALSE;
+                bBorder = sal_False;
             pFrame->SetFrameBorder( bBorder );
             break;
         }
         case HTML_O_NORESIZE:
-            pFrame->SetResizable( FALSE );
+            pFrame->SetResizable( sal_False );
             break;
         default:
             if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_READONLY ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bReadonly = TRUE;
+                sal_Bool bReadonly = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bReadonly = FALSE;
+                    bReadonly = sal_False;
                 pFrame->SetReadOnly( bReadonly );
             }
             else if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_EDIT ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bEdit = TRUE;
+                sal_Bool bEdit = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bEdit = FALSE;
+                    bEdit = sal_False;
                 pFrame->SetEditable( bEdit );
             }
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index e4ee0b6ff5..f45cec8d1e 100644..100755
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfx.hrc>
 #include "bastyp.hrc"
@@ -74,7 +74,7 @@ const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012";
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                   const sal_Char *pIndent,
                                   const String& rName,
-                                  const String& rContent, BOOL bHTTPEquiv,
+                                  const String& rContent, sal_Bool bHTTPEquiv,
                                      rtl_TextEncoding eDestEnc,
                                   String *pNonConvertableChars	)
 {
@@ -108,7 +108,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     {
         String aContentType = String::CreateFromAscii( sHTML_MIME_text_html );
         aContentType.AppendAscii( pCharSet );
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, TRUE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True,
                  eDestEnc, pNonConvertableChars );
     }
 
@@ -123,7 +123,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         if( rTitle.Len() )
             HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars );
     }
-    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, FALSE );
+    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, sal_False );
 
     // Target-Frame
     if( i_xDocProps.is() )
@@ -146,7 +146,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     // Who we are
     String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
     sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) );
-    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars );
+    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
 
     if( i_xDocProps.is() )
     {
@@ -166,14 +166,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                         rBaseURL, rReloadURL));
             }
 
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, TRUE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, sal_True,
                      eDestEnc, pNonConvertableChars );
         }
 
         // Author
         const String& rAuthor = i_xDocProps->getAuthor();
         if( rAuthor.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // created
@@ -183,13 +183,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         String sOut = String::CreateFromInt32(aD.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // changedby
         const String& rChangedBy = i_xDocProps->getModifiedBy();
         if( rChangedBy.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // changed
@@ -199,26 +199,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         sOut = String::CreateFromInt32(aD2.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT2.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // Subject
         const String& rTheme = i_xDocProps->getSubject();
         if( rTheme.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // Description
         const String& rComment = i_xDocProps->getDescription();
         if( rComment.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         // Keywords
         String Keywords = ::comphelper::string::convertCommaSeparated(
             i_xDocProps->getKeywords());
         if( Keywords.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         uno::Reference < script::XTypeConverter > xConverter(
@@ -242,7 +242,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                 aStr >>= str;
                 String valstr(str);
                 valstr.EraseTrailingChars();
-                OutMeta( rStrm, pIndent, name, valstr, FALSE,
+                OutMeta( rStrm, pIndent, name, valstr, sal_False,
                          eDestEnc, pNonConvertableChars );
             } catch (uno::Exception &) {
                 // may happen with concurrent modification...
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index cee73183dd..123951f1bc 100644..100755
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -814,9 +814,9 @@ ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeB
 
 // -----------------------------------------------------------------------
 
-ULONG SfxContentHelper::GetSize( const String& rContent )
+sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
 {
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     sal_Int64 nTemp = 0;
     INetURLObject aObj( rContent );
     DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
@@ -833,7 +833,7 @@ ULONG SfxContentHelper::GetSize( const String& rContent )
     {
         DBG_ERRORFILE( "Any other exception" );
     }
-    nSize = (UINT32)nTemp;
+    nSize = (sal_uInt32)nTemp;
     return nSize;
 }
 
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index 203dcbfe04..6a962af0e6 100644..100755
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -34,7 +34,7 @@
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 
-#include <mieclip.hxx>
+#include <sfx2/mieclip.hxx>
 #include <sfx2/sfxuno.hxx>
 
 MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
@@ -44,13 +44,13 @@ MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
 
 SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( pStrm )
         delete pStrm, pStrm = 0;
 
     ByteString sLine, sVersion;
-    ULONG nStt = 0, nEnd = 0;
-    USHORT nIndex = 0;
+    sal_uIntPtr nStt = 0, nEnd = 0;
+    sal_uInt16 nIndex = 0;
 
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
     rStream.ResetError();
@@ -64,16 +64,16 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
             nIndex = 0;
             ByteString sTmp( sLine.GetToken( 0, ':', nIndex ) );
             if( sTmp == "StartHTML" )
-                nStt = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nStt = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "EndHTML" )
-                nEnd = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "SourceURL" )
                 sBaseURL = String(S2U(sLine.Erase( 0, nIndex )));
 
             if( nEnd && nStt &&
                 ( sBaseURL.Len() || rStream.Tell() >= nStt ))
             {
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             }
         }
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 7ed7c5239b..0642c54e75 100644..100755
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -33,13 +33,13 @@
 
 // -----------------------------------------------------------------------
 
-SfxPtrArr::SfxPtrArr( BYTE nInitSize, BYTE nGrowSize ):
+SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nMSCBug > 0 )
         pData = new void*[nMSCBug];
@@ -104,7 +104,7 @@ void SfxPtrArr::Append( void* aElem )
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
         if ( pData )
         {
@@ -112,7 +112,7 @@ void SfxPtrArr::Append( void* aElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -124,11 +124,11 @@ void SfxPtrArr::Append( void* aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -148,8 +148,8 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border 
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         void** pNewData = new void*[nNewSize];
@@ -164,7 +164,7 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -172,71 +172,71 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(void*) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Remove( void* aElem )
+sal_Bool SfxPtrArr::Remove( void* aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
+sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aOldElem )
         {
             pData[nUsed-n-1] = aNewElem;
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Contains( const void* rItem ) const
+sal_Bool SfxPtrArr::Contains( const void* rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         void* p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void SfxPtrArr::Insert( USHORT nPos, void* rElem )
+void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
 {
     DBG_MEMTEST();
     DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
@@ -244,7 +244,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
     if ( nUnused == 0 )
     {
         // increase (rounded up ) to the next Grow-border
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
 
         if ( pData )
@@ -253,7 +253,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -269,13 +269,13 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
 
 // class ByteArr ---------------------------------------------------------
 
-ByteArr::ByteArr( BYTE nInitSize, BYTE nGrowSize ):
+ByteArr::ByteArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new char[nMSCBug];
@@ -339,7 +339,7 @@ void ByteArr::Append( char aElem )
     // Does the Array have o be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         char* pNewData = new char[nNewSize];
         if ( pData )
         {
@@ -347,7 +347,7 @@ void ByteArr::Append( char aElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -359,11 +359,11 @@ void ByteArr::Append( char aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 ByteArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -383,8 +383,8 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border 
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         char* pNewData = new char[nNewSize];
@@ -399,7 +399,7 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -407,58 +407,58 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(char) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Remove( char aElem )
+sal_Bool ByteArr::Remove( char aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     char *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Contains( const char rItem ) const
+sal_Bool ByteArr::Contains( const char rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         char p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void ByteArr::Insert( USHORT nPos, char rElem )
+void ByteArr::Insert( sal_uInt16 nPos, char rElem )
 {
     DBG_MEMTEST();
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
         // increase (rounded up) to the next Grow-border 
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         char* pNewData = new char[nNewSize];
 
         if ( pData )
@@ -467,7 +467,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -483,7 +483,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
 
 // -----------------------------------------------------------------------
 
-char ByteArr::operator[]( USHORT nPos ) const
+char ByteArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -492,7 +492,7 @@ char ByteArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-char& ByteArr::operator [] (USHORT nPos)
+char& ByteArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -501,13 +501,13 @@ char& ByteArr::operator [] (USHORT nPos)
 
 // class WordArr ---------------------------------------------------------
 
-WordArr::WordArr( BYTE nInitSize, BYTE nGrowSize ):
+WordArr::WordArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new short[nMSCBug];
@@ -571,7 +571,7 @@ void WordArr::Append( short aElem )
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         short* pNewData = new short[nNewSize];
         if ( pData )
         {
@@ -579,7 +579,7 @@ void WordArr::Append( short aElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -591,11 +591,11 @@ void WordArr::Append( short aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 WordArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end 
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -615,8 +615,8 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border 
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         short* pNewData = new short[nNewSize];
@@ -631,7 +631,7 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
             delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -639,58 +639,58 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(short) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Remove( short aElem )
+sal_Bool WordArr::Remove( short aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     short *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Contains( const short rItem ) const
+sal_Bool WordArr::Contains( const short rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         short p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void WordArr::Insert( USHORT nPos, short rElem )
+void WordArr::Insert( sal_uInt16 nPos, short rElem )
 {
     DBG_MEMTEST();
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
         // increase (rounded up) to the next Grow-border 
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         short* pNewData = new short[nNewSize];
 
         if ( pData )
@@ -699,7 +699,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -715,7 +715,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
 
 // -----------------------------------------------------------------------
 
-short WordArr::operator[]( USHORT nPos ) const
+short WordArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -724,7 +724,7 @@ short WordArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-short& WordArr::operator [] (USHORT nPos)
+short& WordArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 73117c0543..f9ce14b55b 100644..100755
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -44,7 +44,7 @@ String SearchAndReplace( const String &rSource,
                          const String &rReplacement )
 {
     String aTarget( rSource );
-    USHORT nPos = rSource.Search( rToReplace );
+    sal_uInt16 nPos = rSource.Search( rToReplace );
     if ( nPos != STRING_NOTFOUND )
     {
         aTarget.Erase( nPos, rToReplace.Len() );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 508295afda..1d4c462493 100644..100755
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -49,7 +49,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "bastyp.hrc"
 #include <sfx2/msg.hxx>
 
@@ -79,14 +79,14 @@ struct SfxProgress_Impl
 {
     Reference < XStatusIndicator > xStatusInd;
     String                  aText, aStateText;
-    ULONG					nMax;
+    sal_uIntPtr					nMax;
     clock_t 				nCreate;
     clock_t					nNextReschedule;
-    BOOL					bLocked, bAllDocs;
-    BOOL					bWaitMode;
-    BOOL					bAllowRescheduling;
-    BOOL					bRunning;
-    BOOL                    bIsStatusText;
+    sal_Bool					bLocked, bAllDocs;
+    sal_Bool					bWaitMode;
+    sal_Bool					bAllowRescheduling;
+    sal_Bool					bRunning;
+    sal_Bool                    bIsStatusText;
 
     SfxProgress*            pActiveProgress;
     SfxObjectShellRef		xObjSh;
@@ -94,7 +94,7 @@ struct SfxProgress_Impl
     SfxViewFrame*           pView;
 
                             SfxProgress_Impl( const String& );
-    void                    Enable_Impl( BOOL );
+    void                    Enable_Impl( sal_Bool );
 
 };
 
@@ -116,7 +116,7 @@ extern sal_uInt32 Get10ThSec();
 
 // -----------------------------------------------------------------------
 
-void SfxProgress_Impl::Enable_Impl( BOOL bEnable )
+void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
 {
     SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
     SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
@@ -156,10 +156,10 @@ SfxProgress::SfxProgress
     const String&       rText,  /* Text, which appears before the Statusmonitor
                                   in the status line */
 
-    ULONG               nRange, /* Max value for range  */
+    sal_uIntPtr               nRange, /* Max value for range  */
 
-    BOOL                bAll    /* Disable all documents or only the document of the ViewFram */
-    ,BOOL               bWait   /* Aktivate the wait-Pointer initially (TRUE) */
+    sal_Bool                bAll,    /* Disable all documents or only the document of the ViewFram */
+    sal_Bool                bWait    /* Activate the wait-Pointer initially (TRUE) */
 )
 
 /*  [Description]
@@ -173,17 +173,17 @@ SfxProgress::SfxProgress
 
 :       pImp( new SfxProgress_Impl( rText ) ),
     nVal(0),
-    bSuspended(TRUE)
+    bSuspended(sal_True)
 {
-    pImp->bRunning = TRUE;
+    pImp->bRunning = sal_True;
     pImp->bAllowRescheduling = Application::IsInExecute();;
 
     pImp->xObjSh = pObjSh;
     pImp->aText = rText;
     pImp->nMax = nRange;
-    pImp->bLocked = FALSE;
+    pImp->bLocked = sal_False;
     pImp->bWaitMode = bWait;
-    pImp->bIsStatusText = FALSE;
+    pImp->bIsStatusText = sal_False;
     pImp->nCreate = Get10ThSec();
     pImp->nNextReschedule = pImp->nCreate;
     DBG( DbgOutf( "SfxProgress: created for '%s' at %luds",
@@ -215,7 +215,7 @@ SfxProgress::~SfxProgress()
     if ( pImp->xStatusInd.is() )
         pImp->xStatusInd->end();
 
-    if( pImp->bIsStatusText == TRUE )
+    if( pImp->bIsStatusText == sal_True )
         GetpApp()->HideStatusText( );
     delete pImp;
 }
@@ -239,7 +239,7 @@ void SfxProgress::Stop()
 
     if ( !pImp->bRunning )
         return;
-    pImp->bRunning = FALSE;
+    pImp->bRunning = sal_False;
     DBG( DbgOutf( "SfxProgress: destroyed at %luds", Get10ThSec() ) );
 
     Suspend();
@@ -248,7 +248,7 @@ void SfxProgress::Stop()
     else
         SFX_APP()->SetProgress_Impl(0);
     if ( pImp->bLocked )
-        pImp->Enable_Impl(TRUE);
+        pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -282,7 +282,7 @@ const String& SfxProgress::GetStateText_Impl() const
 // -----------------------------------------------------------------------
 
 // Required in App data
-static ULONG nLastTime = 0;
+static sal_uIntPtr nLastTime = 0;
 
 long TimeOut_Impl( void*, void* pArgV )
 {
@@ -299,11 +299,11 @@ long TimeOut_Impl( void*, void* pArgV )
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetStateText
+sal_Bool SfxProgress::SetStateText
 (
-    ULONG          nNewVal,     /* New value for the progress-bar */
+    sal_uLong      nNewVal,     /* New value for the progress-bar */
     const String&  rNewVal,     /* Status as Text */
-    ULONG          nNewRange    /* new maximum value, 0 for retaining the old */
+    sal_uLong      nNewRange    /* new maximum value, 0 for retaining the old */
 )
 
 {
@@ -313,11 +313,11 @@ BOOL SfxProgress::SetStateText
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetState
+sal_Bool SfxProgress::SetState
 (
-    ULONG	nNewVal,	/* new value for the progress bar */
+    sal_uLong	nNewVal,	/* new value for the progress bar */
 
-    ULONG	nNewRange	/* new maximum value, 0 for retaining the old */
+    sal_uLong	nNewRange	/* new maximum value, 0 for retaining the old */
 )
 /*	[Description]
 
@@ -325,7 +325,7 @@ BOOL SfxProgress::SetState
 
     [Return value]
 
-    BOOL				TRUE
+    sal_Bool				TRUE
                         Proceed with the action
 
                         FALSE
@@ -333,7 +333,7 @@ BOOL SfxProgress::SetState
 */
 
 {
-    if( pImp->pActiveProgress ) return TRUE;
+    if( pImp->pActiveProgress ) return sal_True;
 
     nVal = nNewVal;
 
@@ -362,11 +362,11 @@ BOOL SfxProgress::SetState
             {
                 // don't show status indicator for hidden documents (only valid while loading)
                 SfxMedium* pMedium = pObjSh->GetMedium();
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
                 if ( !pHiddenItem || !pHiddenItem->GetValue() )
                 {
                     {
-                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
+                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
                         Reference< XStatusIndicator > xInd;
                         if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) )
                             pImp->xStatusInd = xInd;
@@ -393,7 +393,7 @@ BOOL SfxProgress::SetState
         pImp->xStatusInd->setValue( nNewVal );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -438,7 +438,7 @@ void SfxProgress::Resume()
                 pFrame->GetBindings().ENTERREGISTRATIONS();
         }
 
-        bSuspended = FALSE;
+        bSuspended = sal_False;
     }
 }
 
@@ -460,7 +460,7 @@ void SfxProgress::Suspend()
     if ( !bSuspended )
     {
         DBG( DbgOutf( "SfxProgress: suspended" ) );
-        bSuspended = TRUE;
+        bSuspended = sal_True;
 
         if ( pImp->xStatusInd.is() )
         {
@@ -502,7 +502,7 @@ void SfxProgress::Lock()
                  ( eMode == SFX_CREATE_MODE_PREVIEW ) )
             {
                 DBG( DbgOutf( "SfxProgress: not locked because EMBEDDED/PREVIEW found" ) );
-                pImp->bAllowRescheduling = FALSE;
+                pImp->bAllowRescheduling = sal_False;
             }
         }
     }
@@ -513,14 +513,14 @@ void SfxProgress::Lock()
              ( eMode == SFX_CREATE_MODE_PREVIEW ) )
         {
             DBG( DbgOutf( "SfxProgress: not locked because ObjectShell is EMBEDDED/PREVIEW" ) );
-            pImp->bAllowRescheduling = FALSE;
+            pImp->bAllowRescheduling = sal_False;
         }
     }
 
-    pImp->Enable_Impl( FALSE );
+    pImp->Enable_Impl( sal_False );
 
     DBG( DbgOutf( "SfxProgress: locked" ) );
-    pImp->bLocked = TRUE;
+    pImp->bLocked = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -532,8 +532,8 @@ void SfxProgress::UnLock()
         return;
 
     DBG( DbgOutf( "SfxProgress: unlocked" ) );
-    pImp->bLocked = FALSE;
-    pImp->Enable_Impl(TRUE);
+    pImp->bLocked = sal_False;
+    pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -566,7 +566,7 @@ void SfxProgress::Reschedule()
 
 void SfxProgress::SetWaitMode
 (
-    BOOL        bWait  /*   TRUE  Wait-cursor is used 
+    sal_Bool	bWait		/*	TRUE
 
                             FALSE Wait-cursor not used */
 )
@@ -609,7 +609,7 @@ void SfxProgress::SetWaitMode
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::GetWaitMode() const
+sal_Bool SfxProgress::GetWaitMode() const
 
 /* [Description]
 
@@ -699,7 +699,7 @@ bool SfxProgress::StatusBarManagerGone_Impl
 */
 
 {
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index d51d7fed6f..dc2786549e 100644..100755
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -74,7 +74,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
     { 0,					0					}
 };
 
-SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
+SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
                               SfxMedium *pMed ) :
     HTMLParser( rStream, bIsNewDoc ),
     pMedium( pMed ), pDLMedium( 0 ),
@@ -90,7 +90,7 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
 
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 }
 
 SfxHTMLParser::~SfxHTMLParser()
@@ -99,7 +99,7 @@ SfxHTMLParser::~SfxHTMLParser()
     delete pDLMedium;
 }
 
-BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
+sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
                                     const HTMLOptions * pOptions)
 {
     DBG_ASSERT( pImageMap, "ParseMapOptions: No Image-Map" );
@@ -107,7 +107,7 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
 
     String aName;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -124,23 +124,23 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
     return aName.Len() > 0;
 }
 
-BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
                                      const HTMLOptions * pOptions,
-                                     USHORT nEventMouseOver,
-                                     USHORT nEventMouseOut )
+                                     sal_uInt16 nEventMouseOver,
+                                     sal_uInt16 nEventMouseOut )
 {
     DBG_ASSERT( pImageMap, "ParseAreaOptions: no Image-Map" );
     DBG_ASSERT( pOptions, "ParseAreaOptions: no Options" );
 
-    USHORT nShape = IMAP_OBJ_RECTANGLE;
+    sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
     SvULongs aCoords;
     String aName, aHRef, aAlt, aTarget, sEmpty;
-    BOOL bNoHRef = FALSE;
+    sal_Bool bNoHRef = sal_False;
     SvxMacroTableDtor aMacroTbl;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
-        USHORT nEvent = 0;
+        sal_uInt16 nEvent = 0;
         ScriptType eScrpType = STARBASIC;
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -152,13 +152,13 @@ BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseUR
             pOption->GetEnum( nShape, aAreaShapeOptEnums );
             break;
         case HTML_O_COORDS:
-            pOption->GetNumbers( aCoords, TRUE );
+            pOption->GetNumbers( aCoords, sal_True );
             break;
         case HTML_O_HREF:
             aHRef = INetURLObject::GetAbsURL( rBaseURL, pOption->GetString() );
             break;
         case HTML_O_NOHREF:
-            bNoHRef = TRUE;
+            bNoHRef = sal_True;
             break;
         case HTML_O_ALT:
             aAlt = pOption->GetString();
@@ -196,7 +196,7 @@ IMAPOBJ_SETEVENT:
     if( bNoHRef )
         aHRef.Erase();
 
-    BOOL bNewArea = TRUE;
+    sal_Bool bNewArea = sal_True;
     switch( nShape )
     {
     case IMAP_OBJ_RECTANGLE:
@@ -225,9 +225,9 @@ IMAPOBJ_SETEVENT:
     case IMAP_OBJ_POLYGON:
         if( aCoords.Count() >=6 )
         {
-            USHORT nCount = aCoords.Count() / 2;
+            sal_uInt16 nCount = aCoords.Count() / 2;
             Polygon aPoly( nCount );
-            for( USHORT i=0; i<nCount; i++ )
+            for( sal_uInt16 i=0; i<nCount; i++ )
                 aPoly[i] = Point( aCoords[2*i], aCoords[2*i+1] );
             IMapPolygonObject aMapPObj( aPoly, aHRef, aAlt, String(), aTarget, aName,
                                         !bNoHRef );
@@ -237,7 +237,7 @@ IMAPOBJ_SETEVENT:
         }
         break;
     default:
-        bNewArea = FALSE;
+        bNewArea = sal_False;
     }
 
     return bNewArea;
@@ -251,7 +251,7 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     if( pDLMedium )
         return;
 
-    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, FALSE );
+    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, sal_False );
     if( pSh )
     {
         // Register the medium, so that it can be stopped.
@@ -259,13 +259,13 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 
     // Push Download (Note: Can also be synchronous).
-    if ( TRUE /*pMedium->GetDoneLink() == Link()*/ )
+    if ( sal_True /*pMedium->GetDoneLink() == Link()*/ )
         pDLMedium->DownLoad();
     else
     {
         // Set Downloading-Flag to TRUE. When we get into the Pending-status 
         // we will then also have Data-Available-Links.
-        SetDownloadingFile( TRUE );
+        SetDownloadingFile( sal_True );
         pDLMedium->DownLoad( STATIC_LINK( this, SfxHTMLParser, FileDownloadDone ) );
 
         // If the Downloading-Flag is still set downloading will be done 
@@ -283,11 +283,11 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 }
 
-BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
+sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr )
 {
     String aStr;
 
-    BOOL bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
+    sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
     if( bOK )
     {
         SvStream* pStream = pDLMedium->GetInStream();
@@ -321,7 +321,7 @@ IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
 {
     // The Download is now completed. also the Data-Available-Link 
     // must or are allowed to be passed through.
-    pThis->SetDownloadingFile( FALSE );
+    pThis->SetDownloadingFile( sal_False );
 
     // ... and call once, thus will continue reading.
     pThis->CallAsyncCallLink();
@@ -336,7 +336,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
     if( pHTTPHeader )
     {
         SvKeyValue aKV;
-        for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont;
+        for( sal_Bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
              bCont = pHTTPHeader->GetNext( aKV ) )
         {
             if( aKV.GetKey().EqualsIgnoreCaseAscii(
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 22524f5c34..d48ce50972 100644..100755
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -31,14 +31,14 @@
 
 #include <tools/simplerm.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 
 // -----------------------------------------------------------------------
 
 static ResMgr* pMgr=NULL;
 
-SfxResId::SfxResId( USHORT nId ) :
+SfxResId::SfxResId( sal_uInt16 nId ) :
 
     ResId( nId, *GetResMgr() )
 {
@@ -50,7 +50,7 @@ SfxResId::SfxResId( USHORT nId ) :
 //
 //============================================================================
 
-SfxSimpleResId::SfxSimpleResId(USHORT nID):
+SfxSimpleResId::SfxSimpleResId(sal_uInt16 nID):
     m_sText( SFX_APP()->GetSimpleResManager()->ReadString(nID) )
 {}
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 7e69cf83db..5adbc48dcc 100644..100755
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -35,27 +35,20 @@
 #include <basic/sbmod.hxx>
 #include <tools/urlobj.hxx>
 #include <basic/sbx.hxx>
-
 #include <sot/storage.hxx>
 #include <unotools/securityoptions.hxx>
 
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.h>
-#endif
-
 #include <com/sun/star/uno/Any.hxx>
 #include <framework/eventsconfiguration.hxx>
 #include <comphelper/processfactory.hxx>
-
 #include <sfx2/evntconf.hxx>
 
-#include <sfx2/macrconf.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dispatch.hxx>
-#include "config.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "eventsupplier.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -67,6 +60,7 @@
 // -----------------------------------------------------------------------
 TYPEINIT1(SfxEventHint, SfxHint);
 TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
+TYPEINIT1(SfxViewEventHint, SfxHint);
 
 using namespace com::sun::star;
 
@@ -97,7 +91,7 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
     const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
 
     if ( rOwn.size() != rOther.size() )
-        return FALSE;
+        return sal_False;
 
     for ( size_t nNo = 0, nCnt = rOwn.size(); nNo < nCnt; ++nNo )
     {
@@ -106,10 +100,10 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
         if ( 	pOwn->mnId != pOther->mnId ||
                 pOwn->maEventName != pOther->maEventName ||
                 pOwn->maUIName != pOther->maUIName )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 
 }
 
@@ -128,25 +122,25 @@ SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
     return new SfxEventNamesItem(*this);
 }
 
-SfxPoolItem* SfxEventNamesItem::Create(SvStream &, USHORT) const
+SfxPoolItem* SfxEventNamesItem::Create(SvStream &, sal_uInt16) const
 {
     OSL_FAIL("not streamable!");
     return new SfxEventNamesItem(Which());
 }
 
-SvStream& SfxEventNamesItem::Store(SvStream &rStream, USHORT ) const
+SvStream& SfxEventNamesItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
     OSL_FAIL("not streamable!");
     return rStream;
 }
 
-USHORT SfxEventNamesItem::GetVersion( USHORT ) const
+sal_uInt16 SfxEventNamesItem::GetVersion( sal_uInt16 ) const
 {
     OSL_FAIL("not streamable!");
     return 0;
 }
 
-void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
+void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, sal_uInt16 nID )
 {
     aEventsList.push_back( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
 }
@@ -290,7 +284,7 @@ void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro&
 }
 
 // -------------------------------------------------------------------------------------------------------
-SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp )
+SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp )
 {
     return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
 }
diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk
deleted file mode 100644
index d090babd15..0000000000
--- a/sfx2/source/config/makefile.mk
+++ /dev/null
@@ -1,47 +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=sfx2
-TARGET=config
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/evntconf.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index e4bb59b867..bd9e574476 100644..100755
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -62,7 +62,6 @@
 #include <sfx2/objface.hxx>
 #include "sfxtypes.hxx"
 #include "workwin.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxuno.hxx>
@@ -90,7 +89,7 @@ DBG_NAME(SfxBindingsInvalidateAll)
 
 //====================================================================
 
-static USHORT nTimeOut = 300;
+static sal_uInt16 nTimeOut = 300;
 
 #define TIMEOUT_FIRST       nTimeOut
 #define TIMEOUT_UPDATING     20
@@ -397,7 +396,7 @@ void SfxBindings::Update_Impl
 {
     if( pCache->GetDispatch().is() && pCache->GetItemLink() )
     {
-        pCache->SetCachedState(TRUE);
+        pCache->SetCachedState(sal_True);
         if ( !pCache->GetInternalController() )
             return;
     }
@@ -466,7 +465,7 @@ void SfxBindings::InvalidateSlotsInMap_Impl()
 
 //--------------------------------------------------------------------
 
-void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( USHORT nId )
+void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId )
 {
     pImp->m_aInvalidateSlots[nId] = sal_True;
 }
@@ -499,10 +498,10 @@ void SfxBindings::Update
 
         if (pCache)
         {
-            BOOL bInternalUpdate = TRUE;
+            sal_Bool bInternalUpdate = sal_True;
             if( pCache->GetDispatch().is() && pCache->GetItemLink() )
             {
-                pCache->SetCachedState(TRUE);
+                pCache->SetCachedState(sal_True);
                 bInternalUpdate = ( pCache->GetInternalController() != 0 );
             }
 
@@ -1002,16 +1001,16 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
 //--------------------------------------------------------------------
 void SfxBindings::RegisterInternal_Impl( SfxControllerItem& rItem )
 {
-    Register_Impl( rItem, TRUE );
+    Register_Impl( rItem, sal_True );
 
 }
 
 void SfxBindings::Register( SfxControllerItem& rItem )
 {
-    Register_Impl( rItem, FALSE );
+    Register_Impl( rItem, sal_False );
 }
 
-void SfxBindings::Register_Impl( SfxControllerItem& rItem, BOOL bInternal )
+void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal )
 {
     DBG_MEMTEST();
     DBG_ASSERT( nRegLevel > 0, "registration without EnterRegistrations" );
@@ -1086,13 +1085,7 @@ void SfxBindings::Release( SfxControllerItem& rItem )
         // was this the last controller?
         if ( pCache->GetItemLink() == 0 && !pCache->GetInternalController() )
         {
-            if ( SfxMacroConfig::IsMacroSlot( nId ) )
-            {
-                delete (*pImp->pCaches)[nPos];
-                pImp->pCaches->Remove(nPos, 1);
-            }
-            else
-                pImp->bCtrlReleased = sal_True;
+            pImp->bCtrlReleased = sal_True;
         }
     }
 
@@ -1125,14 +1118,14 @@ sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_
     return ( pRet != 0 );
 }
 
-void SfxBindings::ExecuteGlobal_Impl( USHORT nId )
+void SfxBindings::ExecuteGlobal_Impl( sal_uInt16 nId )
 {
     if( nId && pDispatcher )
-        Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, TRUE );
+        Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, sal_True );
 }
 
 const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
-                        const SfxPoolItem **ppInternalArgs, BOOL bGlobalOnly )
+                        const SfxPoolItem **ppInternalArgs, sal_Bool bGlobalOnly )
 {
     SfxStateCache *pCache = GetStateCache( nId );
     if ( !pCache )
@@ -1350,10 +1343,10 @@ void SfxBindings::UpdateSlotServer_Impl()
         {
             ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
                 ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
-            pImp->bContextChanged = FALSE;
+            pImp->bContextChanged = sal_False;
         }
         else
-            pImp->bContextChanged = TRUE;
+            pImp->bContextChanged = sal_True;
     }
 
     const sal_uInt16 nCount = pImp->pCaches->Count();
@@ -1438,8 +1431,8 @@ SfxItemSet* SfxBindings::CreateSet_Impl
         pRealSlot->GetSlotId(), pRealSlot->GetWhich(rPool), pRealSlot, pCache );
     rFound.Insert( pFound );
 
-    USHORT nSlot = pRealSlot->GetSlotId();
-    if ( !SfxMacroConfig::IsMacroSlot( nSlot ) && !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) )
+    sal_uInt16 nSlot = pRealSlot->GetSlotId();
+    if ( !(nSlot >= SID_VERB_START && nSlot <= SID_VERB_END) )
     {
         pInterface = pInterface->GetRealInterfaceForSlot( pRealSlot );
         DBG_ASSERT (pInterface,"Slot in the given shell is not found");
@@ -1514,7 +1507,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     // Create a Set from the ranges
     sal_uInt16 *pRanges = new sal_uInt16[rFound.Count() * 2 + 1];
     int j = 0;
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while ( i < rFound.Count() )
     {
         pRanges[j++] = rFound[i]->nWhichId;
@@ -1862,7 +1855,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
     {
         if ( pImp->bContextChanged )
         {
-            pImp->bContextChanged = FALSE;
+            pImp->bContextChanged = sal_False;
         }
 
         SfxViewFrame* pFrame = pDispatcher->GetFrame();
@@ -2059,12 +2052,12 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
 
             if ( !pDisp )
             {
-                BOOL bDeleteCache = FALSE;
+                sal_Bool bDeleteCache = sal_False;
                 if ( !pCache )
                 {
                     pCache = new SfxStateCache( nSlot );
                     pCache->GetSlotServer( *GetDispatcher_Impl(), pImp->xProv );
-                    bDeleteCache = TRUE;
+                    bDeleteCache = sal_True;
                 }
 
                 SfxItemState eState = SFX_ITEM_SET;
@@ -2280,7 +2273,7 @@ SystemWindow* SfxBindings::GetSystemWindow() const
     return pTop->GetFrame().GetTopWindow_Impl();
 }
 
-BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
+sal_Bool SfxBindings::ExecuteCommand_Impl( const String& rCommand )
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = rCommand;
@@ -2309,10 +2302,10 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
             ::comphelper::UiEventsLogger::logDispatch(aURL, source);
         }
         new SfxAsyncExec_Impl( aURL, xDisp );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxBindings::GetRecorder() const
@@ -2329,7 +2322,7 @@ void SfxBindings::ContextChanged_Impl()
 {
     if ( !pImp->bInUpdate && ( !pImp->bContextChanged || !pImp->bAllMsgDirty ) )
     {
-        InvalidateAll( TRUE );
+        InvalidateAll( sal_True );
     }
 }
 
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index e5965d3cb7..177e42a900 100644..100755
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -44,7 +44,7 @@ DBG_NAME(SfxControllerItem);
 //--------------------------------------------------------------------
 #ifdef DBG_UTIL
 
-void SfxControllerItem::CheckConfigure_Impl( ULONG nType )
+void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
 {
     // Real Slot? (i.e. no Separator etc.)
     if ( !nId )
@@ -74,9 +74,9 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
 }
 
 //--------------------------------------------------------------------
-// returns TRUE if this binding is really bound to a function
+// returns sal_True if this binding is really bound to a function
 
-BOOL SfxControllerItem::IsBound() const
+sal_Bool SfxControllerItem::IsBound() const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -86,12 +86,12 @@ BOOL SfxControllerItem::IsBound() const
 //--------------------------------------------------------------------
 // returns the associated function-id or 0 if none
 
-// USHORT SfxControllerItem::GetId() const;
+// sal_uInt16 SfxControllerItem::GetId() const;
 
 //====================================================================
 // registeres with the id at the bindings
 
-void SfxControllerItem::Bind( USHORT nNewId, SfxBindings *pBindinx )
+void SfxControllerItem::Bind( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -110,7 +110,7 @@ void SfxControllerItem::Bind( USHORT nNewId, SfxBindings *pBindinx )
     pBindings->Register(*this);
 }
 
-void SfxControllerItem::BindInternal_Impl( USHORT nNewId, SfxBindings *pBindinx )
+void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBindinx )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -249,7 +249,7 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin
 //--------------------------------------------------------------------
 // changes the id of unbound functions (e.g. for sub-menu-ids)
 
-void SfxControllerItem::SetId( USHORT nItemId )
+void SfxControllerItem::SetId( sal_uInt16 nItemId )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxControllerItem, 0);
@@ -273,7 +273,7 @@ SfxControllerItem::SfxControllerItem():
 //--------------------------------------------------------------------
 // creates a representation of the function nId and registeres it
 
-SfxControllerItem::SfxControllerItem( USHORT nID, SfxBindings &rBindings ):
+SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
     nId(nID),
     pNext(this),
     pBindings(&rBindings)
@@ -298,7 +298,7 @@ SfxControllerItem::~SfxControllerItem()
 
 void SfxControllerItem::StateChanged
 (
-    USHORT,             // <SID> of the triggering slot
+    sal_uInt16,          // <SID> of the triggering slot
     SfxItemState,       // <SfxItemState> of 'pState'
     const SfxPoolItem*  // Slot-Status, NULL or IsInvalidItem()
 )
@@ -340,7 +340,7 @@ void SfxControllerItem::DeleteFloatingWindow()
 
 void SfxStatusForwarder::StateChanged
 (
-    USHORT              nSID,    // <SID> of the triggering slot        
+    sal_uInt16          nSID,    // <SID> of the triggering slot        
     SfxItemState        eState,  // <SfxItemState> of 'pState'          
     const SfxPoolItem*  pState   // Slot-Status, NULL or IsInvalidItem()
 )
@@ -352,7 +352,7 @@ void SfxStatusForwarder::StateChanged
 //--------------------------------------------------------------------
 
 SfxStatusForwarder::SfxStatusForwarder(
-            USHORT              nSlotId,
+            sal_uInt16              nSlotId,
             SfxControllerItem&  rMaster ):
     SfxControllerItem( nSlotId, rMaster.GetBindings() ),
     pMaster( &rMaster )
@@ -434,7 +434,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const
         {
             SfxShell *pSh = pDispat->GetShell( pServer->GetShellLevel() );
             SfxItemPool &rPool = pSh->GetPool();
-            USHORT nWhich = rPool.GetWhich( nId );
+            sal_uInt16 nWhich = rPool.GetWhich( nId );
             return rPool.GetMetric( nWhich );
         }
     }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 24f88cd3da..fae6058b8b 100644..100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -51,7 +51,7 @@
 
 // due to nAutoPageID
 #include "appdata.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/minstack.hxx>
 #include <sfx2/msg.hxx>
@@ -63,7 +63,6 @@
 #include "slotserv.hxx"
 #include <sfx2/ipclient.hxx>
 #include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/childwin.hxx>
@@ -270,7 +269,11 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
             if ( !pView )
                 pView = SfxViewFrame::Current();
             if ( pView )
-              SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() );
+            {
+                rtl::OString aCmd(".uno:");
+                aCmd += rSlot.GetUnoName();
+                SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd );
+            }
 
             SfxExecFunc pFunc = rSlot.GetExecFnc();
             rShell.CallExec( pFunc, rReq );
@@ -352,7 +355,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
     pImp->pParent = pParent;
 
     pImp->bInvalidateOnUnlock = sal_False;
-    pImp->nActionLevel = 0;
 
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         pImp->aObjBars[n].nResId = 0;
@@ -468,9 +470,6 @@ void SfxDispatcher::Pop
     DBG_MEMTEST();
     DBG_ASSERT( rShell.GetInterface(),
                 "pushing SfxShell without previous RegisterInterface()" );
-    DBG_ASSERT( pImp->nActionLevel == 0, "Push or Pop within Action" );
-//      DBG_ASSERT( SFX_APP()->IsInAsynchronCall_Impl(),
-//                                "Dispatcher Push/Pop in synchron-call-stack" );
 
     bool bDelete = (nMode & SFX_SHELL_POP_DELETE) == SFX_SHELL_POP_DELETE;
     bool bUntil = (nMode & SFX_SHELL_POP_UNTIL) == SFX_SHELL_POP_UNTIL;
@@ -778,11 +777,11 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
-            pBind->HidePopupCtrls_Impl( FALSE );
+            pBind->HidePopupCtrls_Impl( sal_False );
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( FALSE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_False, sal_False, 1 );
     }
 
     if ( pImp->aToDoStack.Count() )
@@ -864,7 +863,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
     for ( sal_uInt16 i = 0; i < pImp->aStack.Count(); ++i )
         pImp->aStack.Top(i)->DoDeactivate_Impl(pImp->pFrame, bMDI);
 
-    BOOL bHidePopups = bMDI && pImp->pFrame;
+    sal_Bool bHidePopups = bMDI && pImp->pFrame;
     if ( pNew && pImp->pFrame )
     {
         com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xOldFrame(
@@ -874,7 +873,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
             GetFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
 
         if ( xOldFrame == xMyFrame )
-            bHidePopups = FALSE;
+            bHidePopups = sal_False;
     }
 
     if ( bHidePopups )
@@ -882,11 +881,11 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
-            pBind->HidePopupCtrls_Impl( TRUE );
+            pBind->HidePopupCtrls_Impl( sal_True );
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( TRUE, FALSE, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_True, sal_False, 1 );
     }
 
     Flush();
@@ -973,10 +972,6 @@ void SfxDispatcher::_Execute
     if ( IsLocked( rSlot.GetSlotId() ) )
         return;
 
-    sal_uInt16 nSlot = rSlot.GetSlotId();
-    if ( SfxMacroConfig::IsMacroSlot( nSlot ) )
-        SFX_APP()->GetMacroConfig()->RegisterSlotId( nSlot );
-
     if ( (eCallMode & SFX_CALLMODE_ASYNCHRON) ||
          ( !(eCallMode & SFX_CALLMODE_SYNCHRON) &&
            rSlot.IsMode(SFX_SLOT_ASYNCHRON) ) )
@@ -990,7 +985,7 @@ void SfxDispatcher::_Execute
                 if ( &rShell == pDispat->pImp->aStack.Top(n) )
                 {
                     if ( eCallMode & SFX_CALLMODE_RECORD )
-                        rReq.AllowRecording( TRUE );
+                        rReq.AllowRecording( sal_True );
                     pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
                     return;
                 }
@@ -1221,11 +1216,11 @@ const SfxPoolItem* SfxDispatcher::Execute( const SfxExecuteItem& rItem )
 
 //--------------------------------------------------------------------
 const SfxPoolItem*	SfxDispatcher::Execute(
-    USHORT nSlot,
+    sal_uInt16 nSlot,
     SfxCallMode nCall,
     SfxItemSet* pArgs,
     SfxItemSet* pInternalArgs,
-    USHORT nModi)
+    sal_uInt16 nModi)
 {
     if ( IsLocked(nSlot) )
         return 0;
@@ -1343,9 +1338,9 @@ const SfxPoolItem* SfxDispatcher::Execute
 //--------------------------------------------------------------------
 const SfxPoolItem*  SfxDispatcher::Execute
 (
-    USHORT nSlot,
+    sal_uInt16 nSlot,
     SfxCallMode eCall,
-    USHORT nModi,
+    sal_uInt16 nModi,
     const SfxItemSet &rArgs
 )
 {
@@ -1530,38 +1525,6 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
     return 0;
 }
 //--------------------------------------------------------------------
-void SfxDispatcher::EnterAction( const String& rName )
-
-// marks the beginning of a block of actions
-
-{
-    DBG_MEMTEST();
-    Flush();
-    DBG_ASSERT( pImp->aStack.Count() > 0, "EnterAction on empty dispatcher stack" );
-    if ( ++pImp->nActionLevel == 1 )
-    {
-        SfxUndoManager *pUndoMgr = GetShell(0)->GetUndoManager();
-        if ( pUndoMgr )
-            pUndoMgr->EnterListAction( rName, rName HACK(RepeatComment), 0 HACK(ID) );
-    }
-}
-//--------------------------------------------------------------------
-void SfxDispatcher::LeaveAction()
-
-// marks the end of a block of actions
-
-{
-    DBG_MEMTEST();
-    DBG_ASSERT( pImp->nActionLevel > 0, "EnterAction without LeaveAction" );
-    if ( --pImp->nActionLevel == 0 )
-    {
-        SfxUndoManager *pUndoMgr = GetShell(0)->GetUndoManager();
-        if ( pUndoMgr )
-            pUndoMgr->LeaveListAction();
-    }
-}
-
-//--------------------------------------------------------------------
 void SfxDispatcher::SetMenu_Impl()
 {
     if ( pImp->pFrame )
@@ -1591,14 +1554,14 @@ void SfxDispatcher::SetMenu_Impl()
 }
 
 //--------------------------------------------------------------------
-long SfxDispatcher::Update_Impl( sal_Bool bForce )
+void SfxDispatcher::Update_Impl( sal_Bool bForce )
 {
     SFX_STACK(SfxDispatcher::Update_Impl);
 
     Flush();
 
     if ( !pImp->pFrame || pImp->bUILocked )
-        return 0;
+        return;
 
     SFX_APP();  // -Wall is this required???
     SfxDispatcher *pDisp = this;
@@ -1620,7 +1583,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     }
 
     if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() )
-        return 0;
+        return;
 
     SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL;
     sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
@@ -1694,12 +1657,11 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
     if ( xLayoutManager.is() )
         xLayoutManager->unlock();
 
-    return 1;
+    return;
 }
 
-sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
+void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
 {
-    sal_uInt32 nHelpId = 0;
     SFX_APP();
     SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
     sal_Bool bIsActive = sal_False;
@@ -1714,7 +1676,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     }
 
     if ( pImp->pParent && !pImp->bQuiet /* && bUIActive */ )
-        nHelpId = pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
+        pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
 
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         pImp->aObjBars[n].nResId = 0;
@@ -1723,7 +1685,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     // bQuiet : own shells aren't considered for UI and SlotServer
     // bNoUI: own Shells aren't considered fors UI
     if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) )
-        return nHelpId;
+        return;
 
     sal_uInt32 nStatBarId=0;
     SfxShell *pStatusBarShell = NULL;
@@ -1734,8 +1696,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
     {
         SfxShell *pShell = GetShell( nShell-1 );
         SfxInterface *pIFace = pShell->GetInterface();
-        if (pShell->GetHelpId())
-            nHelpId = pShell->GetHelpId();
 
         // don't consider shells if "Hidden" oder "Quiet"
         sal_Bool bReadOnlyShell = IsReadOnlyShell_Impl( nShell-1 );
@@ -1754,10 +1714,10 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
             // check for toolboxes that are exclusively for a viewer
             if ( pImp->pFrame)
             {
-                BOOL bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER );
+                sal_Bool bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER );
                 SfxObjectShell* pSh = pImp->pFrame->GetObjectShell();
                 SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False );
-                BOOL bIsViewer = pItem && pItem->GetValue();
+                sal_Bool bIsViewer = pItem && pItem->GetValue();
                 if ( bIsViewer != bViewerTbx )
                     continue;
             }
@@ -1866,8 +1826,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
             pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings );
         }
     }
-
-    return nHelpId;
 }
 
 //--------------------------------------------------------------------
@@ -2200,7 +2158,6 @@ sal_Bool SfxDispatcher::_FindServer
     SFX_STACK(SfxDispatcher::_FindServer);
 
     // Dispatcher locked? (nevertheless let SID_HELP_PI through)
-    SfxApplication *pSfxApp = SFX_APP();
     if ( IsLocked(nSlot) )
     {
         pImp->bInvalidateOnUnlock = sal_True;
@@ -2220,25 +2177,8 @@ sal_Bool SfxDispatcher::_FindServer
         }
     }
 
-    // Macro-Slot?
-    if ( SfxMacroConfig::IsMacroSlot( nSlot ) )
-    {
-        const SfxMacroInfo* pInfo = pSfxApp->GetMacroConfig()->GetMacroInfo(nSlot);
-        if ( pInfo )
-        {
-            const SfxSlot* pSlot = pInfo->GetSlot();
-            if ( pSlot )
-            {
-                rServer.SetShellLevel(nTotCount-1);
-                rServer.SetSlot( pSlot );
-                return sal_True;
-            }
-        }
-
-        return sal_False;
-    }
     // Verb-Slot?
-    else if (nSlot >= SID_VERB_START && nSlot <= SID_VERB_END)
+    if (nSlot >= SID_VERB_START && nSlot <= SID_VERB_END)
     {
         for ( sal_uInt16 nShell = 0;; ++nShell )
         {
@@ -2352,10 +2292,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
         nTotCount = nTotCount + pImp->aStack.Count();
     }
 
-    if ( SfxMacroConfig::IsMacroSlot( nSlot ) )
-        // Macro-Slot?
-        return sal_True;
-    else if (nSlot >= SID_VERB_START && nSlot <= SID_VERB_END)
+    if (nSlot >= SID_VERB_START && nSlot <= SID_VERB_END)
     {
         // Verb-Slot?
         for ( sal_uInt16 nShell = 0;; ++nShell )
@@ -2466,7 +2403,7 @@ sal_Bool SfxDispatcher::_FillState
     {
         DBG_ASSERT(bFlushed, "Dispatcher not flushed after retrieving slot servers!");
         if ( !bFlushed )
-            return FALSE;
+            return sal_False;
         // Flush();
 
         // Determine the object and call the Message of this object
@@ -2531,10 +2468,6 @@ const SfxPoolItem* SfxDispatcher::_Execute( const SfxSlotServer &rSvr )
     {
         Flush();
 
-        sal_uInt16 nSlot = pSlot->GetSlotId();
-        if ( SfxMacroConfig::IsMacroSlot( nSlot ) )
-            SFX_APP()->GetMacroConfig()->RegisterSlotId( nSlot );
-
         if ( pSlot->IsMode(SFX_SLOT_ASYNCHRON) )
             //! ignore rSvr
         {
@@ -2655,8 +2588,8 @@ void SfxDispatcher::Lock( sal_Bool bLock )
     pImp->bLocked = bLock;
     if ( !bLock )
     {
-        USHORT nCount = pImp->aReqArr.Count();
-        for ( USHORT i=0; i<nCount; i++ )
+        sal_uInt16 nCount = pImp->aReqArr.Count();
+        for ( sal_uInt16 i=0; i<nCount; i++ )
             pImp->xPoster->Post( pImp->aReqArr[i] );
         pImp->aReqArr.Remove( 0, nCount );
     }
@@ -2807,7 +2740,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rp
     return SFX_ITEM_DISABLED;
 }
 
-SfxItemState SfxDispatcher::QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny )
+SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny )
 {
     SfxShell *pShell = 0;
     const SfxSlot *pSlot = 0;
@@ -2823,12 +2756,12 @@ SfxItemState SfxDispatcher::QueryState( USHORT nSID, ::com::sun::star::uno::Any&
             ::com::sun::star::uno::Any aState;
             if ( !pItem->ISA(SfxVoidItem) )
             {
-                USHORT nSubId( 0 );
+                sal_uInt16 nSubId( 0 );
                 SfxItemPool& rPool = pShell->GetPool();
-                USHORT nWhich = rPool.GetWhich( nSID );
+                sal_uInt16 nWhich = rPool.GetWhich( nSID );
                 if ( rPool.GetMetric( nWhich ) == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;
-                pItem->QueryValue( aState, (BYTE)nSubId );
+                pItem->QueryValue( aState, (sal_uInt8)nSubId );
             }
             rAny = aState;
 
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 2027dc65c3..2027dc65c3 100644..100755
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 54204703c3..e65b47cf09 100644..100755
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -64,10 +64,10 @@ SfxMacroStatement::SfxMacroStatement
     const SfxShell& /*rShell*/,    // <SfxShell> which excexutes the Request
     const String&   /*rTarget*/,   // Name of the target object for the 
                                    // excecution
-    BOOL            /*bAbsolute*/, // obsolete
+    sal_Bool        /*bAbsolute*/, // obsolete
     const SfxSlot&  rSlot,         // the <SfxSlot>, which can read the
                                    // statement
-    BOOL            bRequestDone,  // Was the Request really excecuted
+    sal_Bool          bRequestDone,  // Was the Request really excecuted
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
 )
 
@@ -97,7 +97,7 @@ SfxMacroStatement::SfxMacroStatement
     die Selektion auch deskriptiv z.B. als 'CellSelection("A5-D8")')
     angesprochen werden, dazu mu\ jedoch vom Anwendungsprogrammierer der
     Konstruktor <SfxMacroStatement::SfxMacroStatement(const String&,
-    const SfxSlot&,BOOL,SfxArguments*)> verwendet werden.
+    const SfxSlot&,sal_Bool,SfxArguments*)> verwendet werden.
 
     For the so-called object is then, depending on the type of slots,
     expressed as an assignment to one of its properties or calling its methods. 
@@ -115,7 +115,7 @@ SfxMacroStatement::SfxMacroStatement
 
     [Cross-reference]
 
-    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
     <SfxMacroStatement::SfxMacroStatement(const String&)>
 */
 
@@ -140,7 +140,7 @@ SfxMacroStatement::SfxMacroStatement
 (
     const String&   rTarget,  // The Object which is addressed while playing
     const SfxSlot&  rSlot,    // The <SfxSlot>, which can playback the statement
-    BOOL            bRequestDone,  // was the Request actually performed
+    sal_Bool        bRequestDone,  // was the Request actually performed
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
 )
 
@@ -150,7 +150,7 @@ SfxMacroStatement::SfxMacroStatement
     [Cross-reference]
 
     <SfxMacroStatement::SfxMacroStatement(const String&)>
-    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,BOOL,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
 */
 
 :       nSlotId( rSlot.GetSlotId() ),
@@ -180,13 +180,13 @@ SfxMacroStatement::SfxMacroStatement
 
     [Cross-reference]
 
-    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,BOOL,SfxArguments*)>
-    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,BOOL,const SfxSlot&,BOOL,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
+    <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
 */
 
 :       nSlotId( 0 ),
        aStatement( rStatement ),
-    bDone( TRUE ),
+    bDone( sal_True ),
     pDummy( 0 )
 {
 }
@@ -230,7 +230,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 (
     SfxMacro*        /*pMacro*/,   // in this is recorded
     const SfxSlot&   rSlot,        // the slot, which can playback the statement
-    BOOL             bRequestDone, // TRUE=was executed, FALSE=cancelled
+    sal_Bool         bRequestDone, // TRUE=was executed, FALSE=cancelled
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& /*rArgs*/
 )
 
@@ -255,7 +255,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 
     // Print all required Parameters
     if ( aArgs.getLength() )
-        for ( USHORT nArg = 0; nArg < aArgs.getLength(); ++nArg )
+        for ( sal_uInt16 nArg = 0; nArg < aArgs.getLength(); ++nArg )
         {
             // represent the parameters textually 
             String aArg;
@@ -286,8 +286,8 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 
                 // Quotation marks are doubled
                 XubString aRecordable( sTemp );
-                USHORT nPos = 0;
-                while ( TRUE )
+                sal_uInt16 nPos = 0;
+                while ( sal_True )
                 {
                     nPos = aRecordable.SearchAndReplace( String('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
                     if ( STRING_NOTFOUND == nPos )
@@ -297,7 +297,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
 
                 // non-printable characters are written as chr $(...)
                 bool bPrevReplaced = false;
-                for ( USHORT n = 0; n < aRecordable.Len(); ++n )
+                for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n )
                 {
                     sal_Unicode cChar = aRecordable.GetChar(n);
                     if ( !( cChar>=32 && cChar!=127 ) ) // As replacement for String::IsPrintable()!
@@ -579,7 +579,7 @@ String SfxMacro::GenerateSource() const
 {
     DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
     String aSource;
-    for ( USHORT n = 0; n < pImp->aList.Count(); ++n )
+    for ( sal_uInt16 n = 0; n < pImp->aList.Count(); ++n )
     {
         aSource += pImp->aList.GetObject(n)->GetStatement();
         if ( (n+1) < pImp->aList.Count() )
diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
deleted file mode 100644
index 4dc271cadd..0000000000
--- a/sfx2/source/control/makefile.mk
+++ /dev/null
@@ -1,73 +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=sfx2
-TARGET=control
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# due to compilerbugs
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-CFLAGS+=-Od
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-CFLAGS+=-O0
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/bindings.obj \
-    $(SLO)$/ctrlitem.obj \
-    $(SLO)$/dispatch.obj \
-    $(SLO)$/macrconf.obj \
-        $(SLO)$/macro.obj \
-    $(SLO)$/minfitem.obj \
-    $(SLO)$/msg.obj \
-       $(SLO)$/msgpool.obj \
-       $(SLO)$/objface.obj \
-    $(SLO)$/querystatus.obj \
-    $(SLO)$/request.obj \
-        $(SLO)$/sfxstatuslistener.obj \
-    $(SLO)$/shell.obj \
-    $(SLO)$/sorgitm.obj \
-    $(SLO)$/statcach.obj \
-        $(SLO)$/unoctitm.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index d607dc7bcf..7769031d9e 100644..100755
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -31,7 +31,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -40,7 +40,7 @@ TYPEINIT1(SfxMacroInfoItem, SfxPoolItem);
 // -----------------------------------------------------------------------
 
 SfxMacroInfoItem::SfxMacroInfoItem(
-    USHORT nWhichId,            // Slot-ID
+    sal_uInt16 nWhichId,		// Slot-ID
     const BasicManager* pMgr,
     const String &rLibName,
     const String &rModuleName,
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index eefffe95e6..e3a210b8ad 100644..100755
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_sfx2.hxx"
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
-
 #include <sfx2/msg.hxx>
 
 //====================================================================
@@ -55,12 +54,24 @@ SfxSlotKind SfxSlot::GetKind() const
 
 //--------------------------------------------------------------------
 
-USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const
+sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
 {
     if ( !nMasterSlotId || nMasterSlotId == USHRT_MAX )
         ((SfxSlot*) this) -> nMasterSlotId = rPool.GetWhich(nSlotId);
     return nMasterSlotId;
 }
 
+::rtl::OString SfxSlot::GetCommand() const
+{ 
+    rtl::OString sRet(".uno:"); 
+    sRet += pUnoName; 
+    return sRet; 
+}
+
+::rtl::OUString SfxSlot::GetCommandString() const
+{ 
+    rtl::OString aCmd(GetCommand());
+    return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 1447b6546c..210c7ba9e7 100644..100755
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -39,8 +39,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/module.hxx>
 
@@ -50,15 +49,15 @@
 
 struct SfxSlotType_Impl
 {
-    USHORT  nId;
+    sal_uInt16  nId;
     TypeId  nType;
 
-    SfxSlotType_Impl( USHORT nTheId, TypeId nTheType ):
+    SfxSlotType_Impl( sal_uInt16 nTheId, TypeId nTheType ):
         nId(nTheId), nType(nTheType)
     {}
 };
 
-DECL_2BYTEARRAY(SfxSlotGroupArr_Impl, USHORT, 6, 4)
+DECL_2BYTEARRAY(SfxSlotGroupArr_Impl, sal_uInt16, 6, 4)
 DECL_PTRARRAY(SfxInterfaceArr_Impl, SfxInterface*, 6, 3)
 DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8)
 
@@ -91,7 +90,7 @@ SfxSlotPool::~SfxSlotPool()
     delete _pGroups;
     if ( _pTypes )
     {
-        for ( USHORT n =_pTypes->Count(); n--; )
+        for ( sal_uInt16 n =_pTypes->Count(); n--; )
             delete _pTypes->GetObject(n);
         delete _pTypes;
     }
@@ -123,14 +122,14 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
         {
             // The Groups in parent Slotpool are also known here
             SfxSlotGroupArr_Impl& rGroups = *_pParentPool->_pGroups;
-            for ( USHORT n=0; n<rGroups.Count(); n++ )
+            for ( sal_uInt16 n=0; n<rGroups.Count(); n++ )
                 _pGroups->Append( rGroups[n] );
         }
     }
 
     if ( !_pTypes )
         _pTypes = new SfxSlotTypeArr_Impl;
-    for ( USHORT nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
+    for ( sal_uInt16 nFunc = 0; nFunc < rInterface.Count(); ++nFunc )
     {
         SfxSlot *pDef = rInterface[nFunc];
         if ( pDef->GetGroupId() && /* pDef->GetGroupId() != GID_INTERN && */
@@ -146,7 +145,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
 
 //====================================================================
 
-TypeId SfxSlotPool::GetSlotType( USHORT nId ) const
+TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
 {
     const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId );
     return pSlot ? pSlot->GetType()->Type() : 0;
@@ -167,13 +166,13 @@ void SfxSlotPool::ReleaseInterface( SfxInterface& rInterface )
 
 // get the first SfxMessage for a special Id (e.g. for getting check-mode)
 
-const SfxSlot* SfxSlotPool::GetSlot( USHORT nId )
+const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // First, search their own interfaces
-    for ( USHORT nInterf = 0; nInterf < _pInterfaces->Count(); ++nInterf )
+    for ( sal_uInt16 nInterf = 0; nInterf < _pInterfaces->Count(); ++nInterf )
     {
         const SfxSlot *pDef = _pInterfaces->GetObject(nInterf)->GetSlot(nId);
         if ( pDef )
@@ -188,7 +187,7 @@ const SfxSlot* SfxSlotPool::GetSlot( USHORT nId )
 
 // skips to the next group
 
-String SfxSlotPool::SeekGroup( USHORT nNo )
+String SfxSlotPool::SeekGroup( sal_uInt16 nNo )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
@@ -200,14 +199,14 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
         if ( _pParentPool )
         {
             // In most cases, the order of the IDs agree
-            USHORT nParentCount = _pParentPool->_pGroups->Count();
+            sal_uInt16 nParentCount = _pParentPool->_pGroups->Count();
             if ( nNo < nParentCount && (*_pGroups)[nNo] == (*_pParentPool->_pGroups)[nNo] )
                 _pParentPool->_nCurGroup = nNo;
             else
             {
                 // Otherwise search. If the group is not found in the parent 
                 // pool, _nCurGroup is set outside the valid range
-                USHORT i;
+                sal_uInt16 i;
                 for ( i=1; i<nParentCount; i++ )
                     if ( (*_pGroups)[nNo] == (*_pParentPool->_pGroups)[i] )
                         break;
@@ -232,7 +231,7 @@ String SfxSlotPool::SeekGroup( USHORT nNo )
 
 //--------------------------------------------------------------------
 
-USHORT SfxSlotPool::GetGroupCount()
+sal_uInt16 SfxSlotPool::GetGroupCount()
 {
     return _pGroups->Count();
 }
@@ -242,13 +241,13 @@ USHORT SfxSlotPool::GetGroupCount()
 
 // internal search loop
 
-const SfxSlot* SfxSlotPool::SeekSlot( USHORT nStartInterface )
+const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
 {
     DBG_MEMTEST();
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // The numbering starts at the interfaces of the parent pool
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
 
     // have reached the end of the Parent-Pools?
     if ( nStartInterface < nFirstInterface &&
@@ -264,7 +263,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( USHORT nStartInterface )
     }
 
     // find the first func-def with the current group id
-    USHORT nCount = _pInterfaces->Count() + nFirstInterface;
+    sal_uInt16 nCount = _pInterfaces->Count() + nFirstInterface;
     for ( _nCurInterface = nStartInterface;
             _nCurInterface < nCount;
           ++_nCurInterface )
@@ -292,7 +291,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
     DBG_ASSERT( _pInterfaces != 0, "no Interfaces registered" );
 
     // The numbering starts at the interfaces of the parent pool
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
 
     if ( _nCurInterface < nFirstInterface && _nCurGroup >= _pParentPool->_pGroups->Count() )
         _nCurInterface = nFirstInterface;
@@ -309,7 +308,7 @@ const SfxSlot* SfxSlotPool::NextSlot()
             return SeekSlot( nFirstInterface );
     }
 
-    USHORT nInterface = _nCurInterface - nFirstInterface;
+    sal_uInt16 nInterface = _nCurInterface - nFirstInterface;
     // possibly we are already at the end
     if ( nInterface >= _pInterfaces->Count() )
         return 0;
@@ -345,17 +344,17 @@ SfxInterface* SfxSlotPool::FirstInterface()
 SfxInterface* SfxSlotPool::NextInterface()
 {
     _nCurInterface++;
-    USHORT nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
+    sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->Count() : 0;
     if ( _nCurInterface < nFirstInterface )
         return (*_pParentPool->_pInterfaces)[_nCurInterface];
-    USHORT nInterface = _nCurInterface - nFirstInterface;
+    sal_uInt16 nInterface = _nCurInterface - nFirstInterface;
     return nInterface < _pInterfaces->Count() ? (*_pInterfaces)[nInterface] : 0;
 }
 
 const SfxSlot* SfxSlotPool::GetUnoSlot( const String& rName )
 {
     const SfxSlot *pSlot = NULL;
-    for ( USHORT nInterface=0; nInterface<_pInterfaces->Count(); nInterface++ )
+    for ( sal_uInt16 nInterface=0; nInterface<_pInterfaces->Count(); nInterface++ )
     {
         pSlot = (*_pInterfaces)[nInterface]->GetSlot( rName );
         if ( pSlot )
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index aec2be3bb2..e62f971697 100644..100755
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/minarray.hxx>
 #include <sfx2/objsh.hxx>
 
@@ -68,18 +68,18 @@ SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger )
 
 struct SfxObjectUI_Impl
 {
-    USHORT	nPos;
+    sal_uInt16	nPos;
     ResId	aResId;
-    BOOL	bVisible;
-    BOOL	bContext;
+    sal_Bool	bVisible;
+    sal_Bool	bContext;
     String* pName;
     sal_uInt32	nFeature;
 
-    SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) :
+    SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, sal_Bool bVis, sal_uInt32 nFeat) :
         nPos(n),
         aResId(rResId.GetId(), *rResId.GetResMgr()),
         bVisible(bVis),
-        bContext(FALSE),
+        bContext(sal_False),
         pName(0),
         nFeature(nFeat)
     {
@@ -101,12 +101,12 @@ struct SfxInterface_Impl
     ResId					aPopupRes;		// registered PopupMenu
     ResId					aStatBarRes;	// registered StatusBar
     SfxModule*				pModule;
-    BOOL                    bRegistered;
+    sal_Bool                    bRegistered;
 
     SfxInterface_Impl() :
         aPopupRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()),
         aStatBarRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager())
-    , bRegistered(FALSE)
+    , bRegistered(sal_False)
     {
         pObjectBars   = new SfxObjectUIArr_Impl;
         pChildWindows = new SfxObjectUIArr_Impl;
@@ -114,7 +114,7 @@ struct SfxInterface_Impl
 
     ~SfxInterface_Impl()
     {
-        USHORT n;
+        sal_uInt16 n;
         for (n=0; n<pObjectBars->Count(); n++)
             delete (*pObjectBars)[n];
         delete pObjectBars;
@@ -125,7 +125,7 @@ struct SfxInterface_Impl
     }
 };
 
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
 
 //====================================================================
 
@@ -136,7 +136,7 @@ SfxInterface::SfxInterface( const char *pClassName,
                             const ResId& rNameResId,
                             SfxInterfaceId nId,
                             const SfxInterface* pParent,
-                            SfxSlot &rSlotMap, USHORT nSlotCount ):
+                            SfxSlot &rSlotMap, sal_uInt16 nSlotCount ):
     pName(pClassName),
     pGenoType(pParent),
     nClassId(nId),
@@ -149,7 +149,7 @@ SfxInterface::SfxInterface( const char *pClassName,
 
 void SfxInterface::Register( SfxModule* pMod )
 {
-    pImpData->bRegistered = TRUE;
+    pImpData->bRegistered = sal_True;
     pImpData->pModule = pMod;
     if ( pMod )
         pMod->GetSlotPool()->RegisterInterface(*this);
@@ -157,7 +157,7 @@ void SfxInterface::Register( SfxModule* pMod )
         SFX_APP()->GetAppSlotPool_Impl().RegisterInterface(*this);
 }
 
-void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
+void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
 {
     pSlots = &rSlotMap;
     nCount = nSlotCount;
@@ -171,7 +171,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
         qsort( pSlots, nCount, sizeof(SfxSlot), SfxCompareSlots_Impl );
 
         // link masters and slaves
-        USHORT nIter = 1;
+        sal_uInt16 nIter = 1;
         for ( pIter = pSlots; nIter <= nCount; ++pIter, ++nIter )
         {
 
@@ -192,7 +192,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
                 if ( 0 == pIter->GetNextSlot() )
                 {
                     SfxSlot *pLastSlot = pIter;
-                    for ( USHORT n = nIter; n < Count(); ++n )
+                    for ( sal_uInt16 n = nIter; n < Count(); ++n )
                     {
                         SfxSlot *pCurSlot = (pSlots+n);
                         if ( pCurSlot->nMasterSlotId == pIter->nMasterSlotId )
@@ -209,7 +209,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
                 // Slots refering in circle to the next with the same 
                 // Status method.
                 SfxSlot *pLastSlot = pIter;
-                for ( USHORT n = nIter; n < Count(); ++n )
+                for ( sal_uInt16 n = nIter; n < Count(); ++n )
                 {
                     SfxSlot *pCurSlot = (pSlots+n);
                     if ( pCurSlot->GetStateFnc() == pIter->GetStateFnc() )
@@ -225,7 +225,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
 #ifdef DBG_UTIL
     else
     {
-        USHORT nIter = 1;
+        sal_uInt16 nIter = 1;
         for ( SfxSlot *pNext = pIter+1; nIter < nCount; ++pNext, ++nIter )
         {
 
@@ -302,7 +302,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
 SfxInterface::~SfxInterface()
 {
     SfxModule *pMod = pImpData->pModule;
-    BOOL bRegistered = pImpData->bRegistered;
+    sal_Bool bRegistered = pImpData->bRegistered;
     delete pImpData;
     DBG_ASSERT( bRegistered, "Interface not registered!" );
     if ( bRegistered )
@@ -318,7 +318,7 @@ SfxInterface::~SfxInterface()
 
 // searches for the specified func
 
-const SfxSlot* SfxInterface::GetSlot( USHORT nFuncId ) const
+const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
@@ -341,7 +341,7 @@ const SfxSlot* SfxInterface::GetSlot( const String& rCommand ) const
     if ( aCommand.SearchAscii( UNO_COMMAND ) == 0 )
          aCommand.Erase( 0, sizeof( UNO_COMMAND )-1 );
 
-    for ( USHORT n=0; n<nCount; n++ )
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         if ( (pSlots+n)->pUnoName && 
              aCommand.CompareIgnoreCaseToAscii( (pSlots+n)->GetUnoName() ) == COMPARE_EQUAL )
@@ -372,7 +372,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 
 //--------------------------------------------------------------------
 
-const SfxSlot* SfxInterface::GetRealSlot( USHORT nSlotId ) const
+const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxInterface, 0);
@@ -400,26 +400,26 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
 
 //--------------------------------------------------------------------
 
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId,
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
         const String *pStr )
 {
     RegisterObjectBar( nPos, rResId, 0UL, pStr );
 }
 
 
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
 {
     SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
     if ( pUI )
         pImpData->pObjectBars->Append(pUI);
 }
 
-SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
 {
     if ((nPos & SFX_VISIBILITY_MASK) == 0)
         nPos |= SFX_VISIBILITY_STANDARD;
 
-    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, TRUE, nFeature);
+    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, sal_True, nFeature);
 
     if (pStr == 0)
     {
@@ -439,13 +439,13 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_
     return pUI;
 }
 
-const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
+const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetObjectBarResId( nNo );
@@ -454,7 +454,7 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->aResId;
@@ -463,13 +463,13 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
+sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetObjectBarPos( nNo );
@@ -478,7 +478,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->nPos;
@@ -487,7 +487,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetObjectBarCount() const
+sal_uInt16 SfxInterface::GetObjectBarCount() const
 {
     if (pGenoType && ! pGenoType->HasName())
         return pImpData->pObjectBars->Count() + pGenoType->GetObjectBarCount();
@@ -496,14 +496,14 @@ USHORT SfxInterface::GetObjectBarCount() const
 }
 
 //--------------------------------------------------------------------
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, const String* pChildWinName)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const String* pChildWinName)
 {
     RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
 }
 
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, sal_uInt32 nFeature, const String*)
 {
-    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), TRUE, nFeature);
+    SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), sal_True, nFeature);
     pUI->bContext = bContext;
     pImpData->pChildWindows->Append(pUI);
 }
@@ -514,12 +514,12 @@ void SfxInterface::RegisterStatusBar(const ResId& rResId)
 }
 
 
-sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
 {
     if ( pGenoType )
     {
         // Are there ChildWindows in der Superklasse?
-        USHORT nBaseCount = pGenoType->GetChildWindowCount();
+        sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetChildWindowId( nNo );
@@ -528,7 +528,7 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nCWCount = pImpData->pChildWindows->Count();
+    sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
     DBG_ASSERT( nNo<nCWCount,"ChildWindow is unknown!" );
 #endif
     sal_uInt32 nRet = (*pImpData->pChildWindows)[nNo]->aResId.GetId();
@@ -537,12 +537,12 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
     return nRet;
 }
 
-sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const
 {
     if ( pGenoType )
     {
         // Are there ChildWindows in der Superklasse?
-        USHORT nBaseCount = pGenoType->GetChildWindowCount();
+        sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetChildWindowFeature( nNo );
@@ -551,7 +551,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nCWCount = pImpData->pChildWindows->Count();
+    sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
     DBG_ASSERT( nNo<nCWCount,"ChildWindow is unknown!" );
 #endif
     return (*pImpData->pChildWindows)[nNo]->nFeature;
@@ -560,7 +560,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
 //--------------------------------------------------------------------
 
 
-USHORT SfxInterface::GetChildWindowCount() const
+sal_uInt16 SfxInterface::GetChildWindowCount() const
 {
     if (pGenoType)
         return pImpData->pChildWindows->Count() + pGenoType->GetChildWindowCount();
@@ -585,13 +585,13 @@ const ResId& SfxInterface::GetStatusBarResId() const
 
 
 
-const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
+const String* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetObjectBarName( nNo );
@@ -600,19 +600,19 @@ const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->pName;
 }
 
-sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
+sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->GetObjectBarFeature( nNo );
@@ -621,19 +621,19 @@ sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unknown!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->nFeature;
 }
 
-BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
+sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
 {
-    BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
-        USHORT nBaseCount = pGenoType->GetObjectBarCount();
+        sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
         if ( nNo < nBaseCount )
             // The Super class comes first
             return pGenoType->IsObjectBarVisible( nNo );
@@ -642,7 +642,7 @@ BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
     }
 
 #ifdef DBG_UTIL
-    USHORT nObjBarCount = pImpData->pObjectBars->Count();
+    sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
     DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
 #endif
     return (*pImpData->pObjectBars)[nNo]->bVisible;
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 5b360af829..ef0035dd28 100644..100755
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -60,7 +60,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener	,
     public:
         SFX_DECL_XINTERFACE_XTYPEPROVIDER
         
-        SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const rtl::OUString& aCommand );
+        SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand );
         virtual ~SfxQueryStatus_Impl();
         
         // Query method
@@ -80,7 +80,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener	,
         sal_Bool                                                                   m_bQueryInProgress;
         SfxItemState                                                               m_eState;
         SfxPoolItem*                                                               m_pItem;
-        USHORT                                                                     m_nSlotID;
+        sal_uInt16                                                                     m_nSlotID;
         osl::Condition                                                             m_aCondition;
         ::com::sun::star::util::URL                                                m_aCommand;
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >         m_xDispatch;
@@ -89,7 +89,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener	,
 SFX_IMPL_XINTERFACE_2( SfxQueryStatus_Impl, OWeakObject, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 SFX_IMPL_XTYPEPROVIDER_2( SfxQueryStatus_Impl, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 
-SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand ) :
+SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
     cppu::OWeakObject(),
     m_bQueryInProgress( sal_False ),
     m_eState( SFX_ITEM_DISABLED ),
@@ -223,7 +223,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
 
 //*************************************************************************
 
-SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand )
+SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand )
 {
     m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand );
     m_xStatusListener     = Reference< XStatusListener >( 
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 39b4083910..0fad4162d4 100644..100755
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -72,13 +72,13 @@ struct SfxRequest_Impl: public SfxListener
     SfxPoolItem*		pRetVal;	 // R"uckgabewert geh"ort sich selbst
     SfxShell*           pShell;      // ausgef"uhrt an dieser Shell
     const SfxSlot*		pSlot;		 // ausgef"uhrter Slot
-    USHORT              nModifier;   // welche Modifier waren gedrueckt?
-    BOOL				bDone;		 // "uberhaupt ausgef"uhrt
-    BOOL				bIgnored;	 // vom User abgebrochen
-    BOOL				bCancelled;	 // nicht mehr zustellen
-    BOOL				bUseTarget;	 // aTarget wurde von Applikation gesetzt
-    USHORT  			nCallMode;   // Synch/Asynch/API/Record
-    BOOL                bAllowRecording;
+    sal_uInt16              nModifier;   // welche Modifier waren gedrueckt?
+    sal_Bool				bDone;		 // "uberhaupt ausgef"uhrt
+    sal_Bool				bIgnored;	 // vom User abgebrochen
+    sal_Bool				bCancelled;	 // nicht mehr zustellen
+    sal_Bool				bUseTarget;	 // aTarget wurde von Applikation gesetzt
+    sal_uInt16  			nCallMode;   // Synch/Asynch/API/Record
+    sal_Bool                bAllowRecording;
     SfxAllItemSet*      pInternalArgs;
     SfxViewFrame*       pViewFrame;
 
@@ -88,9 +88,9 @@ struct SfxRequest_Impl: public SfxListener
                         : pAnti( pOwner)
                         , pPool(0)
                         , nModifier(0)
-                        , bCancelled(FALSE)
+                        , bCancelled(sal_False)
                         , nCallMode( SFX_CALLMODE_SYNCHRON )
-                        , bAllowRecording( FALSE )
+                        , bAllowRecording( sal_False )
                         , pInternalArgs( 0 )
                         , pViewFrame(0)
                         {}
@@ -158,8 +158,8 @@ SfxRequest::SfxRequest
     DBG_MEMTEST();
 
     pImp->bAllowRecording = rOrig.pImp->bAllowRecording;
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
@@ -182,7 +182,7 @@ SfxRequest::SfxRequest
 SfxRequest::SfxRequest
 (
     SfxViewFrame*   pViewFrame,
-    USHORT          nSlotId
+    sal_uInt16          nSlotId
 
 )
 
@@ -201,16 +201,16 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &pViewFrame->GetPool() );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = SFX_CALLMODE_SYNCHRON;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
     pImp->pViewFrame = pViewFrame;
-    if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, TRUE, TRUE ) )
+    if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, sal_True, sal_True ) )
     {
         pImp->SetPool( &pImp->pShell->GetPool() );
         pImp->xRecorder = SfxRequest::GetMacroRecorder( pViewFrame );
@@ -231,7 +231,7 @@ SfxRequest::SfxRequest
 
 SfxRequest::SfxRequest
 (
-    USHORT 			nSlotId, 	// auszuf"uhrende <Slot-Id>
+    sal_uInt16 			nSlotId, 	// auszuf"uhrende <Slot-Id>
     SfxCallMode 	nMode,		// Synch/API/...
     SfxItemPool&	rPool 		// ggf. f"ur das SfxItemSet f"ur Parameter
 )
@@ -244,14 +244,14 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
 }
 
 SfxRequest::SfxRequest
@@ -267,14 +267,14 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( &rPool );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
     TransformParameters( nSlot, rArgs, *pArgs, pSlot );
 }
 
@@ -282,8 +282,8 @@ SfxRequest::SfxRequest
 
 SfxRequest::SfxRequest
 (
-    USHORT 					nSlotId,
-    USHORT					nMode,
+    sal_uInt16 					nSlotId,
+    sal_uInt16					nMode,
     const SfxAllItemSet&	rSfxArgs
 )
 
@@ -295,37 +295,37 @@ SfxRequest::SfxRequest
 {
     DBG_MEMTEST();
 
-    pImp->bDone = FALSE;
-    pImp->bIgnored = FALSE;
+    pImp->bDone = sal_False;
+    pImp->bIgnored = sal_False;
     pImp->SetPool( rSfxArgs.GetPool() );
     pImp->pRetVal = 0;
     pImp->pShell = 0;
     pImp->pSlot = 0;
     pImp->nCallMode = nMode;
-    pImp->bUseTarget = FALSE;
+    pImp->bUseTarget = sal_False;
 }
 //--------------------------------------------------------------------
 
-USHORT SfxRequest::GetCallMode() const
+sal_uInt16 SfxRequest::GetCallMode() const
 {
     return pImp->nCallMode;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsSynchronCall() const
+sal_Bool SfxRequest::IsSynchronCall() const
 {
     return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
 }
 
 //--------------------------------------------------------------------
 
-void SfxRequest::SetSynchronCall( BOOL bSynchron )
+void SfxRequest::SetSynchronCall( sal_Bool bSynchron )
 {
     if ( bSynchron )
         pImp->nCallMode |= SFX_CALLMODE_SYNCHRON;
     else
-        pImp->nCallMode &= ~(USHORT) SFX_CALLMODE_SYNCHRON;
+        pImp->nCallMode &= ~(sal_uInt16) SFX_CALLMODE_SYNCHRON;
 }
 
 void SfxRequest::SetInternalArgs_Impl( const SfxAllItemSet& rArgs )
@@ -452,7 +452,7 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem)
 
 //--------------------------------------------------------------------
 
-void SfxRequest::RemoveItem( USHORT nID )
+void SfxRequest::RemoveItem( sal_uInt16 nID )
 {
     if (pArgs)
     {
@@ -466,8 +466,8 @@ void SfxRequest::RemoveItem( USHORT nID )
 
 const SfxPoolItem* SfxRequest::GetArg
 (
-    USHORT 			nSlotId, 	// Slot-Id oder Which-Id des Parameters
-    bool            bDeep,      // FALSE: nicht in Parent-ItemSets suchen
+    sal_uInt16 		nSlotId, 	// Slot-Id oder Which-Id des Parameters
+    bool 		    bDeep,	 	// false: nicht in Parent-ItemSets suchen
     TypeId			aType		// != 0:  RTTI Pruefung mit Assertion
 ) 	const
 {
@@ -479,7 +479,7 @@ const SfxPoolItem* SfxRequest::GetArg
 const SfxPoolItem* SfxRequest::GetItem
 (
     const SfxItemSet* pArgs,
-    USHORT 			nSlotId, 	// Slot-Id oder Which-Id des Parameters
+    sal_uInt16 			nSlotId, 	// Slot-Id oder Which-Id des Parameters
     bool    		bDeep,	 	// false: nicht in Parent-ItemSets suchen
     TypeId			aType		// != 0:  RTTI Pruefung mit Assertion
 )
@@ -505,12 +505,12 @@ const SfxPoolItem* SfxRequest::GetItem
                 ...
                 // ein Beispiel ohne Verwendung des Makros
                 const SfxInt32Item *pPosItem = (const SfxUInt32Item*)
-                    rReq.GetArg( SID_POS, FALSE, TYPE(SfxInt32Item) );
-                USHORT nPos = pPosItem ? pPosItem->GetValue() : 0;
+                    rReq.GetArg( SID_POS, sal_False, TYPE(SfxInt32Item) );
+                sal_uInt16 nPos = pPosItem ? pPosItem->GetValue() : 0;
 
                 // ein Beispiel mit Verwendung des Makros
-                SFX_REQUEST_ARG(rReq, pSizeItem, SfxInt32Item, SID_SIZE, FALSE);
-                USHORT nSize = pSizeItem ? pPosItem->GetValue() : 0;
+                SFX_REQUEST_ARG(rReq, pSizeItem, SfxInt32Item, SID_SIZE, sal_False);
+                sal_uInt16 nSize = pSizeItem ? pPosItem->GetValue() : 0;
 
                 ...
             }
@@ -524,7 +524,7 @@ const SfxPoolItem* SfxRequest::GetItem
     if ( pArgs )
     {
         // ggf. in Which-Id umrechnen
-        USHORT nWhich = pArgs->GetPool()->GetWhich(nSlotId);
+        sal_uInt16 nWhich = pArgs->GetPool()->GetWhich(nSlotId);
 
         // ist das Item gesetzt oder bei bDeep==TRUE verf"ugbar?
         const SfxPoolItem *pItem = 0;
@@ -570,11 +570,11 @@ void SfxRequest::Done
                                     erfragt wurden, ggf. 0 falls keine
                                     Parameter gesetzt wurden */
 
-    bool                bKeep   /*  TRUE (default)
+    bool 			bKeep	/*  true (default)
                                     'rSet' wird gepeichert und ist "uber
                                     GetArgs() abfragbar
 
-                                    FALSE
+                                    false
                                     'rSet' wird nicht kopiert (schneller) */
 )
 
@@ -630,7 +630,7 @@ void SfxRequest::Done
 //--------------------------------------------------------------------
 
 
-void SfxRequest::Done( BOOL bRelease )
+void SfxRequest::Done( sal_Bool bRelease )
 //	[<SfxRequest::Done(SfxItemSet&)>]
 {
     Done_Impl( pArgs );
@@ -648,7 +648,7 @@ void SfxRequest::ForgetAllArgs()
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsCancelled() const
+sal_Bool SfxRequest::IsCancelled() const
 {
     return pImp->bCancelled;
 }
@@ -664,7 +664,7 @@ void SfxRequest::Cancel()
 */
 
 {
-    pImp->bCancelled = TRUE;
+    pImp->bCancelled = sal_True;
     pImp->SetPool( 0 );
     DELETEZ( pArgs );
 }
@@ -690,7 +690,7 @@ void SfxRequest::Ignore()
 
 {
     // als tats"achlich ausgef"uhrt markieren
-    pImp->bIgnored = TRUE;
+    pImp->bIgnored = sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -711,7 +711,7 @@ void SfxRequest::Done_Impl
 
 {
     // als tats"achlich ausgef"uhrt markieren
-    pImp->bDone = TRUE;
+    pImp->bDone = sal_True;
 
     // nicht Recorden
     if ( !pImp->xRecorder.is() )
@@ -747,8 +747,8 @@ void SfxRequest::Done_Impl
     {
         // des Property als SfxPoolItem besorgen
         const SfxPoolItem *pItem;
-        USHORT nWhich = rPool.GetWhich(pImp->pSlot->GetSlotId());
-        SfxItemState eState = pSet ? pSet->GetItemState( nWhich, FALSE, &pItem ) : SFX_ITEM_UNKNOWN;
+        sal_uInt16 nWhich = rPool.GetWhich(pImp->pSlot->GetSlotId());
+        SfxItemState eState = pSet ? pSet->GetItemState( nWhich, sal_False, &pItem ) : SFX_ITEM_UNKNOWN;
 #ifdef DBG_UTIL
         if ( SFX_ITEM_SET != eState )
         {
@@ -782,13 +782,13 @@ void SfxRequest::Done_Impl
             for ( const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem() )
             {
                 // die Slot-Id f"ur das einzelne Item ermitteln
-                USHORT nSlotId = rPool.GetSlotId( pItem->Which() );
+                sal_uInt16 nSlotId = rPool.GetSlotId( pItem->Which() );
                 if ( nSlotId == nSlot )
                 {
                     // mit Hosentr"ager und G"urtel reparieren des falschen Flags
                     OSL_FAIL( "recursion RecordPerItem - use RecordPerSet!" );
                     SfxSlot *pSlot = (SfxSlot*) pImp->pSlot;
-                    pSlot->nFlags &= ~((ULONG)SFX_SLOT_RECORDPERITEM);
+                    pSlot->nFlags &= ~((sal_uIntPtr)SFX_SLOT_RECORDPERITEM);
                     pSlot->nFlags &=  SFX_SLOT_RECORDPERSET;
                 }
 
@@ -809,7 +809,7 @@ void SfxRequest::Done_Impl
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsDone() const
+sal_Bool SfxRequest::IsDone() const
 
 /*	[Beschreibung]
 
@@ -819,7 +819,7 @@ BOOL SfxRequest::IsDone() const
     der Kontext f"ur diesen Request falsch war, dieses aber nicht "uber
     eine separate <SfxShell> realisiert wurde.
 
-    SfxRequest-Instanzen, die hier FALSE liefern, werden nicht recorded.
+    SfxRequest-Instanzen, die hier sal_False liefern, werden nicht recorded.
 
 
     [Querverweise]
@@ -877,7 +877,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
     return xRecorder;
 }
 
-BOOL SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
+sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
 {
     return GetMacroRecorder( pView ).is();
 }
@@ -885,12 +885,12 @@ BOOL SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
 
 //--------------------------------------------------------------------
 
-BOOL SfxRequest::IsAPI() const
+sal_Bool SfxRequest::IsAPI() const
 
 /*	[Beschreibung]
 
-    Liefert TRUE, wenn dieser SfxRequest von einer API (z.B. BASIC)
-    erzeugt wurde, sonst FALSE.
+    Liefert sal_True, wenn dieser SfxRequest von einer API (z.B. BASIC)
+    erzeugt wurde, sonst sal_False.
 */
 
 {
@@ -904,11 +904,11 @@ bool SfxRequest::IsRecording() const
 
 /*	[Beschreibung]
 
-    Liefert TRUE, wenn dieser SfxRequest recorded werden soll, d.h.
+    Liefert sal_True, wenn dieser SfxRequest recorded werden soll, d.h.
     1. zu Zeit ein Makro aufgezeichnet wird
     2. dieser Request "uberhaupt aufgezeichnet wird
     3. der Request nicht von reiner API (z.B. BASIC) ausgeht,
-    sonst FALSE.
+    sonst sal_False.
 */
 
 {
@@ -916,13 +916,13 @@ bool SfxRequest::IsRecording() const
 }
 
 //--------------------------------------------------------------------
-void SfxRequest::SetModifier( USHORT nModi )
+void SfxRequest::SetModifier( sal_uInt16 nModi )
 {
     pImp->nModifier = nModi;
 }
 
 //--------------------------------------------------------------------
-USHORT SfxRequest::GetModifier() const
+sal_uInt16 SfxRequest::GetModifier() const
 {
     return pImp->nModifier;
 }
@@ -950,17 +950,17 @@ void SfxRequest::SetTarget( const String &rTarget )
 
 {
     pImp->aTarget = rTarget;
-    pImp->bUseTarget = TRUE;
+    pImp->bUseTarget = sal_True;
 }
 
-void SfxRequest::AllowRecording( BOOL bSet )
+void SfxRequest::AllowRecording( sal_Bool bSet )
 {
     pImp->bAllowRecording = bSet;
 }
 
-BOOL SfxRequest::AllowsRecording() const
+sal_Bool SfxRequest::AllowsRecording() const
 {
-    BOOL bAllow = pImp->bAllowRecording;
+    sal_Bool bAllow = pImp->bAllowRecording;
     if( !bAllow )
         bAllow = ( SFX_CALLMODE_API != ( SFX_CALLMODE_API & pImp->nCallMode ) ) &&
                  ( SFX_CALLMODE_RECORD == ( SFX_CALLMODE_RECORD & pImp->nCallMode ) );
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 2812c2c3e4..eef0e81a9f 100644..100755
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -51,7 +51,7 @@
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::util;
 SFX_IMPL_XINTERFACE_3( SfxStatusListener, OWeakObject, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 SFX_IMPL_XTYPEPROVIDER_3( SfxStatusListener, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
 
-SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, USHORT nSlotId, const OUString& rCommand ) :
+SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
     cppu::OWeakObject(),
     m_nSlotID( nSlotId ),
     m_xDispatchProvider( rDispatchProvider )
@@ -80,7 +80,7 @@ SfxStatusListener::~SfxStatusListener()
 }
 
 // old sfx controller item C++ API
-void SfxStatusListener::StateChanged( USHORT, SfxItemState, const SfxPoolItem* )
+void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* )
 {
     // must be implemented by sub class
 }
@@ -101,7 +101,7 @@ void SfxStatusListener::Bind()
     }
 }
 
-void SfxStatusListener::Bind( USHORT nSlotId, const rtl::OUString& rNewCommand )
+void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand )
 {
     // first remove old listener, if we have a dispatch object
     Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index f7165d82d2..d551184ed7 100644..100755
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -44,7 +44,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxbasic.hxx"
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
@@ -53,7 +52,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/mnumgr.hxx>
 #include "statcach.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/msgpool.hxx>
 
 //====================================================================
@@ -81,10 +79,10 @@ struct SfxShell_Impl: public SfxBroadcaster
     SfxViewShell*               pViewSh;    // SfxViewShell falls Shell ViewFrame/ViewShell/SubShell ist
     SfxViewFrame*               pFrame;     // Frame, falls <UI-aktiv>
     SfxRepeatTarget*            pRepeatTarget;
-    BOOL						bInAppBASIC;
-    BOOL                        bActive;
-    ULONG						nDisableFlags;
-    ULONG                       nHelpId;
+    sal_Bool						bInAppBASIC;
+    sal_Bool                        bActive;
+    sal_uIntPtr						nDisableFlags;
+    sal_uIntPtr                       nHelpId;
     svtools::AsynchronLink*     pExecuter;
     svtools::AsynchronLink*     pUpdater;
     SfxVerbSlotArr_Impl         aSlotArr;
@@ -148,9 +146,9 @@ SfxShell::SfxShell()
     pImp->pViewSh = 0;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = FALSE;
+    pImp->bInAppBASIC = sal_False;
     pImp->nHelpId = 0L;
-    pImp->bActive = FALSE;
+    pImp->bActive = sal_False;
     pImp->nDisableFlags = 0;
 }
 
@@ -174,9 +172,9 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
     pImp->pViewSh = pViewSh;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = FALSE;
+    pImp->bInAppBASIC = sal_False;
     pImp->nHelpId = 0L;
-    pImp->bActive = FALSE;
+    pImp->bActive = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -309,7 +307,7 @@ SfxViewFrame* SfxShell::GetFrame() const
 
 const SfxPoolItem* SfxShell::GetItem
 (
-    USHORT  nSlotId         // Slot-Id des zu erfragenden <SfxPoolItem>s
+    sal_uInt16  nSlotId         // Slot-Id des zu erfragenden <SfxPoolItem>s
 )   const
 
 /*  [Beschreibung]
@@ -326,11 +324,11 @@ const SfxPoolItem* SfxShell::GetItem
     [Querverweise]
 
     <SfxShell::PutItem(const SfxPoolItem&)>
-    <SfxShell::RemoveItem(USHORT)>
+    <SfxShell::RemoveItem(sal_uInt16)>
 */
 
 {
-    for ( USHORT nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
         if ( pImp->aItems.GetObject(nPos)->Which() == nSlotId )
             return pImp->aItems.GetObject(nPos);
     return 0;
@@ -340,7 +338,7 @@ const SfxPoolItem* SfxShell::GetItem
 
 void SfxShell::RemoveItem
 (
-    USHORT  nSlotId         // Slot-Id des zu l"oschenden <SfxPoolItem>s
+    sal_uInt16  nSlotId         // Slot-Id des zu l"oschenden <SfxPoolItem>s
 )
 
 /*  [Beschreibung]
@@ -355,11 +353,11 @@ void SfxShell::RemoveItem
     [Querverweise]
 
     <SfxShell::PutItem(const SfxPoolItem&)>
-    <SfxShell::GetItem(USHORT)>
+    <SfxShell::GetItem(sal_uInt16)>
 */
 
 {
-    for ( USHORT nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < pImp->aItems.Count(); ++nPos )
         if ( pImp->aItems.GetObject(nPos)->Which() == nSlotId )
         {
             // Item entfernen und l"oschen
@@ -399,8 +397,8 @@ void SfxShell::PutItem
 
     [Querverweise]
 
-    <SfxShell::RemoveItem(USHORT)>
-    <SfxShell::GetItem(USHORT)>
+    <SfxShell::RemoveItem(sal_uInt16)>
+    <SfxShell::GetItem(sal_uInt16)>
 */
 
 {
@@ -411,9 +409,9 @@ void SfxShell::PutItem
     // MSC auf WNT/W95 machte hier Mist, Vorsicht bei Umstellungen
     const SfxPoolItem *pItem = rItem.Clone();
     SfxPoolItemHint aItemHint( (SfxPoolItem*) pItem );
-    const USHORT nWhich = rItem.Which();
+    const sal_uInt16 nWhich = rItem.Which();
     SfxPoolItem **ppLoopItem = (SfxPoolItem**) pImp->aItems.GetData();
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < pImp->aItems.Count(); ++nPos, ++ppLoopItem )
     {
         if ( (*ppLoopItem)->Which() == nWhich )
@@ -429,12 +427,12 @@ void SfxShell::PutItem
             {
                 SfxBindings* pBindings = pDispat->GetBindings();
                 pBindings->Broadcast( aItemHint );
-                USHORT nSlotId = nWhich; //pItem->GetSlotId();
+                sal_uInt16 nSlotId = nWhich; //pItem->GetSlotId();
                 SfxStateCache* pCache = pBindings->GetStateCache( nSlotId );
                 if ( pCache )
                 {
-                    pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), TRUE );
-                    pCache->SetCachedState( TRUE );
+                    pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), sal_True );
+                    pCache->SetCachedState( sal_True );
                 }
             }
             return;
@@ -480,7 +478,7 @@ SfxBroadcaster* SfxShell::GetBroadcaster()
 
 //--------------------------------------------------------------------
 
-SfxUndoManager* SfxShell::GetUndoManager()
+::svl::IUndoManager* SfxShell::GetUndoManager()
 
 /*  [Beschreibung]
 
@@ -498,7 +496,7 @@ SfxUndoManager* SfxShell::GetUndoManager()
 
 //--------------------------------------------------------------------
 
-void SfxShell::SetUndoManager( SfxUndoManager *pNewUndoMgr )
+void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr )
 
 /*  [Beschreibung]
 
@@ -514,9 +512,15 @@ void SfxShell::SetUndoManager( SfxUndoManager *pNewUndoMgr )
 */
 
 {
+    OSL_ENSURE( ( pUndoMgr == NULL ) || ( pNewUndoMgr == NULL ) || ( pUndoMgr == pNewUndoMgr ),
+        "SfxShell::SetUndoManager: exchanging one non-NULL manager with another non-NULL manager? Suspicious!" );
+    // there's at least one client of our UndoManager - the DocumentUndoManager at the SfxBaseModel - which
+    // caches the UndoManager, and registers itself as listener. If exchanging non-NULL UndoManagers is really
+    // a supported scenario (/me thinks it is not), then we would need to notify all such clients instances.
+
     pUndoMgr = pNewUndoMgr;
     if ( pUndoMgr )
-        pUndoMgr->SetMaxUndoActionCount( (USHORT) SvtUndoOptions().GetUndoCount() );
+        pUndoMgr->SetMaxUndoActionCount( (sal_uInt16) SvtUndoOptions().GetUndoCount() );
 }
 
 //--------------------------------------------------------------------
@@ -572,7 +576,7 @@ void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget )
 
 void SfxShell::Invalidate
 (
-    USHORT          nId     /* Zu invalidierende Slot-Id oder Which-Id.
+    sal_uInt16          nId     /* Zu invalidierende Slot-Id oder Which-Id.
                                Falls diese 0 ist (default), werden
                                alle z.Zt. von dieser Shell bedienten
                                Slot-Ids invalidiert. */
@@ -585,8 +589,8 @@ void SfxShell::Invalidate
     die von der Subclass ererbt sind, werden ebenfalls invalidert.
 
     [Querverweise]
-    <SfxBindings::Invalidate(USHORT)>
-    <SfxBindings::InvalidateAll(BOOL)>
+    <SfxBindings::Invalidate(sal_uInt16)>
+    <SfxBindings::InvalidateAll(sal_Bool)>
 */
 
 {
@@ -599,11 +603,11 @@ void SfxShell::Invalidate
     Invalidate_Impl( GetViewShell()->GetViewFrame()->GetBindings(), nId );
 }
 
-void SfxShell::Invalidate_Impl( SfxBindings& rBindings, USHORT nId )
+void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId )
 {
     if ( nId == 0 )
     {
-        rBindings.InvalidateShell( *this, FALSE );
+        rBindings.InvalidateShell( *this, sal_False );
     }
     else
     {
@@ -639,12 +643,12 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, USHORT nId )
 
 //--------------------------------------------------------------------
 
-void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
+void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 /*  [Beschreibung]
 
     Diese Methode steuert die Aktivierung der SfxShell-Instanz. Zun"achst
-    wird durch Aufruf der virtuellen Methode <SfxShell::Activate(BOOL)>
+    wird durch Aufruf der virtuellen Methode <SfxShell::Activate(sal_Bool)>
     der Subclass die M"oglichkeit gegeben, auf das Event zu reagieren.
 
     Bei bMDI == TRUE wird das zugeh"orige SbxObject 'scharfgeschaltet',
@@ -672,7 +676,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     {
         // Frame merken, in dem aktiviert wird
         pImp->pFrame = pFrame;
-        pImp->bActive = TRUE;
+        pImp->bActive = sal_True;
     }
 
     // Subklasse benachrichtigen
@@ -681,7 +685,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 
 //--------------------------------------------------------------------
 
-void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
+void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 /*  [Beschreibung]
 
@@ -691,7 +695,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     k"onnen.
 
     Dann erh"alt in jedem Fall die Subclass durch Aufruf der virtuellen
-    Methode <SfxShell::Deactivate(BOOL)> die M"oglichkeit auf das Event
+    Methode <SfxShell::Deactivate(sal_Bool)> die M"oglichkeit auf das Event
     zu reagieren.
 */
 
@@ -716,7 +720,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
     {
         // austragen
         pImp->pFrame = 0;
-        pImp->bActive = FALSE;
+        pImp->bActive = sal_False;
     }
 
     // Subklasse benachrichtigen
@@ -725,7 +729,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI )
 
 //--------------------------------------------------------------------
 
-BOOL SfxShell::IsActive() const
+sal_Bool SfxShell::IsActive() const
 {
     return pImp->bActive;
 }
@@ -734,7 +738,7 @@ BOOL SfxShell::IsActive() const
 
 void SfxShell::Activate
 (
-    BOOL    /*bMDI*/        /*  TRUE
+    sal_Bool    /*bMDI*/        /*  TRUE
                             der <SfxDispatcher>, auf dem die SfxShell sich
                             befindet, ist aktiv geworden oder die SfxShell
                             Instanz wurde auf einen aktiven SfxDispatcher
@@ -757,7 +761,7 @@ void SfxShell::Activate
 
 
     [Querverweise]
-    StarView SystemWindow::Activate(BOOL)
+    StarView SystemWindow::Activate(sal_Bool)
 */
 
 {
@@ -767,7 +771,7 @@ void SfxShell::Activate
 
 void SfxShell::Deactivate
 (
-    BOOL    /*bMDI*/        /*  TRUE
+    sal_Bool    /*bMDI*/        /*  TRUE
                             der <SfxDispatcher>, auf dem die SfxShell sich
                             befindet, ist inaktiv geworden oder die SfxShell
                             Instanz wurde auf einen aktiven SfxDispatcher
@@ -790,7 +794,7 @@ void SfxShell::Deactivate
 
 
     [Querverweise]
-    StarView SystemWindow::Dectivate(BOOL)
+    StarView SystemWindow::Dectivate(sal_Bool)
 */
 
 {
@@ -860,7 +864,7 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 {
     // Slot-Status holen
     SfxItemPool &rPool = GetPool();
-    const USHORT nId = rSlot.GetWhich( rPool );
+    const sal_uInt16 nId = rSlot.GetWhich( rPool );
     SfxItemSet aSet(rPool, nId, nId);
     SfxStateFunc pFunc = rSlot.GetStateFnc();
     CallState( pFunc, aSet );
@@ -880,7 +884,7 @@ long ShellCall_Impl( void* pObj, void* pArg )
  */
 
 //--------------------------------------------------------------------
-const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, BOOL bAsync )
+const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync )
 {
     if( !bAsync )
         return ExecuteSlot( rReq, (SfxInterface*)0L );
@@ -931,26 +935,19 @@ const SfxPoolItem* SfxShell::ExecuteSlot
 
     [Querverweise]
 
-    <SfxShell::GetSlotState(USHORT,const SfxInterface*,SfxItemSet*)>
+    <SfxShell::GetSlotState(sal_uInt16,const SfxInterface*,SfxItemSet*)>
 */
 
 {
     if ( !pIF )
         pIF = GetInterface();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     const SfxSlot* pSlot = NULL;
     if ( nSlot >= SID_VERB_START && nSlot <= SID_VERB_END )
         pSlot = GetVerbSlot_Impl(nSlot);
     if ( !pSlot )
         pSlot = pIF->GetSlot(nSlot);
-    if ( !pSlot && SfxMacroConfig::IsMacroSlot( nSlot ) )
-    {
-        SfxMacroInfo* pInfo = SFX_APP()->GetMacroConfig()->GetMacroInfo(nSlot);
-        if ( pInfo )
-            pSlot = pInfo->GetSlot();
-    }
-
     DBG_ASSERT( pSlot, "slot not supported" );
 
     SfxExecFunc pFunc = pSlot->GetExecFnc();
@@ -964,7 +961,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot
 
 const SfxPoolItem* SfxShell::GetSlotState
 (
-    USHORT              nSlotId,    // Slot-Id des zu befragenden Slots
+    sal_uInt16              nSlotId,    // Slot-Id des zu befragenden Slots
     const SfxInterface* pIF,        // default = 0 bedeutet virtuell besorgen
     SfxItemSet*         pStateSet   // SfxItemSet der Slot-State-Methode
 )
@@ -1019,13 +1016,6 @@ const SfxPoolItem* SfxShell::GetSlotState
         pSlot = GetVerbSlot_Impl(nSlotId);
     if ( !pSlot )
         pSlot = pIF->GetSlot(nSlotId);
-    if ( !pSlot && SfxMacroConfig::IsMacroSlot( nSlotId ) )
-    {
-        SfxMacroInfo* pInfo = SFX_APP()->GetMacroConfig()->GetMacroInfo(nSlotId);
-        if ( pInfo )
-            pSlot = pInfo->GetSlot();
-    }
-
     if ( pSlot )
         // ggf. auf Which-Id mappen
         nSlotId = pSlot->GetWhich( rPool );
@@ -1039,7 +1029,7 @@ const SfxPoolItem* SfxShell::GetSlotState
         SfxStateFunc pFunc = pSlot->GetStateFnc();
         if ( pFunc )
             CallState( pFunc, aSet );
-        eState = aSet.GetItemState( nSlotId, TRUE, &pItem );
+        eState = aSet.GetItemState( nSlotId, sal_True, &pItem );
 
         // ggf. Default-Item besorgen
         if ( eState == SFX_ITEM_DEFAULT )
@@ -1096,18 +1086,18 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
     {
         SfxBindings *pBindings =
             pViewSh->GetViewFrame()->GetDispatcher()->GetBindings();
-        USHORT nCount = pImp->aSlotArr.Count();
-        for (USHORT n1=0; n1<nCount ; n1++)
+        sal_uInt16 nCount = pImp->aSlotArr.Count();
+        for (sal_uInt16 n1=0; n1<nCount ; n1++)
         {
-            USHORT nId = SID_VERB_START + n1;
-            pBindings->Invalidate(nId, FALSE, TRUE);
+            sal_uInt16 nId = SID_VERB_START + n1;
+            pBindings->Invalidate(nId, sal_False, sal_True);
         }
     }
 
-    USHORT nr=0;
+    sal_uInt16 nr=0;
     for (sal_Int32 n=0; n<aVerbs.getLength(); n++)
     {
-        USHORT nSlotId = SID_VERB_START + nr++;
+        sal_uInt16 nSlotId = SID_VERB_START + nr++;
         DBG_ASSERT(nSlotId <= SID_VERB_END, "Zuviele Verben!");
         if (nSlotId > SID_VERB_END)
             break;
@@ -1139,7 +1129,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
         else
             pNewSlot->pNextSlot = pNewSlot;
 
-        pImp->aSlotArr.Insert(pNewSlot, (USHORT) n);
+        pImp->aSlotArr.Insert(pNewSlot, (sal_uInt16) n);
     }
 
     pImp->aVerbList = aVerbs;
@@ -1150,7 +1140,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
         // abgeholt, es reicht also, ein neues StatusUpdate anzuregen
         SfxBindings *pBindings = pViewSh->GetViewFrame()->GetDispatcher()->
                 GetBindings();
-        pBindings->Invalidate( SID_OBJECT, TRUE, TRUE );
+        pBindings->Invalidate( SID_OBJECT, sal_True, sal_True );
     }
 }
 
@@ -1165,11 +1155,11 @@ const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& S
 
 void SfxShell::VerbExec(SfxRequest& rReq)
 {
-    USHORT nId = rReq.GetSlot();
+    sal_uInt16 nId = rReq.GetSlot();
     SfxViewShell *pViewShell = GetViewShell();
     if ( pViewShell )
     {
-        BOOL bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
+        sal_Bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
         com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs();
         for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++)
         {
@@ -1199,12 +1189,12 @@ void SfxShell::VerbState(SfxItemSet& )
 
 //--------------------------------------------------------------------
 
-const SfxSlot* SfxShell::GetVerbSlot_Impl(USHORT nId) const
+const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const
 {
     com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > rList = pImp->aVerbList;
 
     DBG_ASSERT(nId >= SID_VERB_START && nId <= SID_VERB_END,"Falsche VerbId!");
-    USHORT nIndex = nId - SID_VERB_START;
+    sal_uInt16 nIndex = nId - SID_VERB_START;
     DBG_ASSERT(nIndex < rList.getLength(),"Falsche VerbId!");
 
     if (nIndex < rList.getLength())
@@ -1215,14 +1205,14 @@ const SfxSlot* SfxShell::GetVerbSlot_Impl(USHORT nId) const
 
 //--------------------------------------------------------------------
 
-void SfxShell::SetHelpId(ULONG nId)
+void SfxShell::SetHelpId(sal_uIntPtr nId)
 {
     pImp->nHelpId = nId;
 }
 
 //--------------------------------------------------------------------
 
-ULONG SfxShell::GetHelpId() const
+sal_uIntPtr SfxShell::GetHelpId() const
 {
     return pImp->nHelpId;
 }
@@ -1246,8 +1236,8 @@ sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
 
 long DispatcherUpdate_Impl( void*, void* pArg )
 {
-    ((SfxDispatcher*) pArg)->Update_Impl( TRUE );
-    ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(FALSE);
+    ((SfxDispatcher*) pArg)->Update_Impl( sal_True );
+    ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(sal_False);
     return 0;
 }
 
@@ -1263,26 +1253,26 @@ void SfxShell::UIFeatureChanged()
             pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
 
         // Mehrfachaufrufe gestattet
-        pImp->pUpdater->Call( pFrame->GetDispatcher(), TRUE );
+        pImp->pUpdater->Call( pFrame->GetDispatcher(), sal_True );
     }
 }
 
-void SfxShell::SetDisableFlags( ULONG nFlags )
+void SfxShell::SetDisableFlags( sal_uIntPtr nFlags )
 {
     pImp->nDisableFlags = nFlags;
 }
 
-ULONG SfxShell::GetDisableFlags() const
+sal_uIntPtr SfxShell::GetDisableFlags() const
 {
     return pImp->nDisableFlags;
 }
 
-SfxItemSet*	SfxShell::CreateItemSet( USHORT )
+SfxItemSet*	SfxShell::CreateItemSet( sal_uInt16 )
 {
     return NULL;
 }
 
-void SfxShell::ApplyItemSet( USHORT, const SfxItemSet& )
+void SfxShell::ApplyItemSet( sal_uInt16, const SfxItemSet& )
 {
 }
 
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 7e117463bc..335d10f453 100644..100755
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -89,17 +89,17 @@ int SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
 }
 
 
-bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     String aValue;
-    BOOL bIsString = FALSE;
+    sal_Bool bIsString = sal_False;
     sal_Bool bValue = sal_False;
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
         case 0:
         case MID_SCRIPT_ORGANIZER_LANGUAGE:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = aLanguage;
             break;
         default:
@@ -114,7 +114,7 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nM
     return true;
 }
 
-bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     ::rtl::OUString aValue;
     sal_Bool bRet = false;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 1e10889bce..364a35a090 100644..100755
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -362,7 +362,7 @@ void SfxStateCache::SetState
 (
     SfxItemState		eState, 	// <SfxItemState> von 'pState'
     const SfxPoolItem*	pState,		// Status des Slots, ggf. 0 oder -1
-    BOOL bMaybeDirty
+    sal_Bool bMaybeDirty
 )
 
 /*	[Beschreibung]
@@ -380,7 +380,7 @@ void SfxStateCache::SetState
 
 //--------------------------------------------------------------------
 
-void SfxStateCache::SetVisibleState( BOOL bShow )
+void SfxStateCache::SetVisibleState( sal_Bool bShow )
 {
     SfxItemState		eState( SFX_ITEM_AVAILABLE );
     const SfxPoolItem*	pState( NULL );
@@ -403,7 +403,7 @@ void SfxStateCache::SetVisibleState( BOOL bShow )
         }
         else
         {
-            pState = new SfxVisibilityItem( nId, FALSE );
+            pState = new SfxVisibilityItem( nId, sal_False );
             bDeleteItem = sal_True;
         }
 
@@ -430,7 +430,7 @@ void SfxStateCache::SetState_Impl
 (
     SfxItemState		eState, 	// <SfxItemState> von 'pState'
     const SfxPoolItem*	pState,		// Status des Slots, ggf. 0 oder -1
-    BOOL bMaybeDirty
+    sal_Bool bMaybeDirty
 )
 {
     (void)bMaybeDirty; //unused
@@ -496,7 +496,7 @@ void SfxStateCache::SetState_Impl
 
 // alten Status in allen Controllern nochmal setzen
 
-void SfxStateCache::SetCachedState( BOOL bAlways )
+void SfxStateCache::SetCachedState( sal_Bool bAlways )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxStateCache, 0);
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 78b09c09ae..bc2d04a12a 100644..100755
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -435,7 +435,7 @@ void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet )
 sal_Bool SfxOfficeDispatch::IsMasterUnoCommand() const
 {
     if ( pControllerItem )
-        pControllerItem->isMasterSlaveCommand();
+        return pControllerItem->isMasterSlaveCommand();
     return sal_False;
 }
 
@@ -577,12 +577,12 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_BOOL], 4 ))
             {
-                // BOOL support
+                // sal_Bool support
                 rArgs[nLen].Value <<= aValue.toBoolean();
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_BYTE], 4 ))
             {
-                // BYTE support
+                // sal_uInt8 support
                 rArgs[nLen].Value <<= sal_Int8( aValue.toInt32() );
             }
             else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_LONG], 4 ))
@@ -622,7 +622,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util
 
 SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlotId )
 {
-    USHORT nWhich = rPool.GetWhich( nSlotId );
+    sal_uInt16 nWhich = rPool.GetWhich( nSlotId );
     return rPool.GetMetric( nWhich );
 }
 
@@ -738,7 +738,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             {
                 const SfxSlot *pSlot = 0;
                 if ( pDispatcher->GetShellAndSlot_Impl( GetId(), &pShell, &pSlot, sal_False,
-                        SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL), FALSE ) )
+                        SFX_CALLMODE_MODAL==(nCall&SFX_CALLMODE_MODAL), sal_False ) )
                 {
                     if ( bMasterSlave )
                     {
@@ -823,10 +823,10 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             aEvent.Source = (::com::sun::star::frame::XDispatch*) pDispatch;
             if ( bSuccess && pItem && !pItem->ISA(SfxVoidItem) )
             {
-                USHORT nSubId( 0 );
+                sal_uInt16 nSubId( 0 );
                 if ( eMapUnit == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;
-                pItem->QueryValue( aEvent.Result, (BYTE)nSubId );
+                pItem->QueryValue( aEvent.Result, (sal_uInt8)nSubId );
             }
 
             rListener->dispatchFinished( aEvent );
@@ -922,7 +922,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
         if ( ( eState >= SFX_ITEM_AVAILABLE ) && pState && !IsInvalidItem( pState ) && !pState->ISA(SfxVoidItem) )
         {
             // Retrieve metric from pool to have correct sub ID when calling QueryValue
-            USHORT     nSubId( 0 );
+            sal_uInt16     nSubId( 0 );
             SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
 
             // retrieve the core metric
@@ -940,7 +940,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
             if ( eMapUnit == SFX_MAPUNIT_TWIP )
                 nSubId |= CONVERT_TWIPS;
 
-            pState->QueryValue( aState, (BYTE)nSubId );
+            pState->QueryValue( aState, (sal_uInt8)nSubId );
         }
         else if ( eState == SFX_ITEM_DONTCARE )
         {
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index c701fdd8e4..c701fdd8e4 100644..100755
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 4c275010dd..14df5beece 100644..100755
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -31,7 +31,7 @@
 
 #include <sal/macros.h>
 #include "alienwarn.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "alienwarn.hrc"
diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc
index f4778f4700..f4778f4700 100644..100755
--- a/sfx2/source/dialog/alienwarn.hrc
+++ b/sfx2/source/dialog/alienwarn.hrc
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index 1d3bd34c44..df9392b34f 100644..100755
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -81,6 +81,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
     };
     CheckBox CB_WARNING_OFF
     {
+        HelpID = "sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF";
         Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 );
         Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT );
         WordBreak = TRUE ;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index eb623927b1..68451b7f5d 100644..100755
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -48,9 +48,9 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "dialog.hrc"
 
 using namespace ::com::sun::star::uno;
@@ -63,7 +63,7 @@ class SfxModelessDialog_Impl : public SfxListener
 public:
     ByteString      aWinState;
     SfxChildWindow* pMgr;
-    BOOL            bConstructed;
+    sal_Bool            bConstructed;
     void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     Timer           aMoveTimer;
@@ -87,7 +87,7 @@ class SfxFloatingWindow_Impl : public SfxListener
 public:
     ByteString      aWinState;
     SfxChildWindow* pMgr;
-    BOOL            bConstructed;
+    sal_Bool            bConstructed;
     Timer           aMoveTimer;
 
     void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -161,9 +161,6 @@ void SfxModalDialog::GetDialogData_Impl()
 void SfxModalDialog::init()
 {
     GetDialogData_Impl();
-    aTimer.SetTimeout( 100 );
-    aTimer.SetTimeoutHdl( LINK( this, SfxModalDialog, TimerHdl_Impl ) );
-    aTimer.Start();
 }
 
 // -----------------------------------------------------------------------
@@ -216,7 +213,6 @@ SfxModalDialog::~SfxModalDialog()
 
 {
     SetDialogData_Impl();
-    aTimer.Stop();
     delete pOutputSet;
 }
 
@@ -229,11 +225,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG )
-{
-    return 0L;
-}
-
 void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
 {
     DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
@@ -284,7 +275,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
             }
         }
 
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
     }
 
     ModelessDialog::StateChanged( nStateChange );
@@ -344,7 +335,7 @@ IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
     {
         if ( !IsRollUp() )
             aSize = GetSizePixel();
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         pImp->aWinState = GetWindowState( nMask );
@@ -363,10 +354,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
     pImp( new SfxModelessDialog_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
-    sal_uInt32 nId = GetHelpId();
-    SetHelpId(0);
-    SetUniqueId( nId );
+    pImp->bConstructed = sal_False;
+    SetUniqueId( GetHelpId() );
+    SetHelpId("");
     if ( pBindinx )
         pImp->StartListening( *pBindinx );
     pImp->aMoveTimer.SetTimeout(50);
@@ -383,10 +373,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
     pImp( new SfxModelessDialog_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
-    sal_uInt32 nId = GetHelpId();
-    SetHelpId(0);
-    SetUniqueId( nId );
+    pImp->bConstructed = sal_False;
+    SetUniqueId( GetHelpId() );
+    SetHelpId("");
     if ( pBindinx )
         pImp->StartListening( *pBindinx );
     pImp->aMoveTimer.SetTimeout(50);
@@ -409,15 +398,15 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt )
         pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
         pImp->pMgr->Activate_Impl();
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
     {
@@ -511,15 +500,15 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt )
         pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
         pImp->pMgr->Activate_Impl();
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS )
     {
@@ -551,10 +540,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp( new SfxFloatingWindow_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
-    sal_uInt32 nId = GetHelpId();
-    SetHelpId(0);
-    SetUniqueId( nId );
+    pImp->bConstructed = sal_False;
+    SetUniqueId( GetHelpId() );
+    SetHelpId("");
     if ( pBindinx )
         pImp->StartListening( *pBindinx );
     pImp->aMoveTimer.SetTimeout(50);
@@ -572,10 +560,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp( new SfxFloatingWindow_Impl )
 {
     pImp->pMgr = pCW;
-    pImp->bConstructed = FALSE;
-    sal_uInt32 nId = GetHelpId();
-    SetHelpId(0);
-    SetUniqueId( nId );
+    pImp->bConstructed = sal_False;
+    SetUniqueId( GetHelpId() );
+    SetHelpId("");
     if ( pBindinx )
         pImp->StartListening( *pBindinx );
     pImp->aMoveTimer.SetTimeout(50);
@@ -663,7 +650,7 @@ IMPL_LINK( SfxFloatingWindow, TimerHdl, Timer*, EMPTYARG)
     {
         if ( !IsRollUp() )
             aSize = GetSizePixel();
-        ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
+        sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE;
         if ( GetStyle() & WB_SIZEABLE )
             nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT );
         pImp->aWinState = GetWindowState( nMask );
@@ -680,7 +667,7 @@ void SfxFloatingWindow::StateChanged( StateChangedType nStateChange )
         // FloatingWindows are not centered by default
         if ( pImp->aWinState.Len() )
             SetWindowState( pImp->aWinState );
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
     }
 
     FloatingWindow::StateChanged( nStateChange );
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 993cbc4a51..993cbc4a51 100644..100755
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index d6b195855f..d6b195855f 100644..100755
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 43659982eb..8f1ff61070 100644..100755
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -117,26 +117,26 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight)
 
 TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
 
-const USHORT HI_NAME = 1;
-const USHORT HI_TYPE = 2;
-const USHORT HI_VALUE = 3;
-const USHORT HI_ACTION = 4;
+const sal_uInt16 HI_NAME = 1;
+const sal_uInt16 HI_TYPE = 2;
+const sal_uInt16 HI_VALUE = 3;
+const sal_uInt16 HI_ACTION = 4;
 
 static const char DOCUMENT_SIGNATURE_MENU_CMD[]      = "Signature";
 
 //------------------------------------------------------------------------
-String CreateSizeText( ULONG nSize, BOOL bExtraBytes = TRUE, BOOL bSmartExtraBytes = FALSE );
-String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes )
+String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True, sal_Bool bSmartExtraBytes = sal_False );
+String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes, sal_Bool bSmartExtraBytes )
 {
     String aUnitStr = ' ';
     aUnitStr += String( SfxResId(STR_BYTES) );
-    ULONG nSize1 = nSize;
-    ULONG nSize2 = nSize1;
-    ULONG nMega = 1024 * 1024;
-    ULONG nGiga = nMega * 1024;
+    sal_uIntPtr nSize1 = nSize;
+    sal_uIntPtr nSize2 = nSize1;
+    sal_uIntPtr nMega = 1024 * 1024;
+    sal_uIntPtr nGiga = nMega * 1024;
     double fSize = nSize;
     int nDec = 0;
-    BOOL bGB = FALSE;
+    sal_Bool bGB = sal_False;
 
     if ( nSize1 >= 10000 && nSize1 < nMega )
     {
@@ -159,7 +159,7 @@ String CreateSizeText( ULONG nSize, BOOL bExtraBytes, BOOL bSmartExtraBytes )
         nSize1 /= nGiga;
         aUnitStr = ' ';
         aUnitStr += String( SfxResId(STR_GB) );
-        bGB = TRUE;
+        bGB = sal_True;
         fSize /= nGiga;
         nDec = 3;
     }
@@ -199,7 +199,7 @@ String ConvertDateTime_Impl( const String& rName,
      const String pDelim ( DEFINE_CONST_UNICODE( ", "));
      String aStr( rWrapper.getDate( aD ) );
      aStr += pDelim;
-     aStr += rWrapper.getTime( aT, TRUE, FALSE );
+     aStr += rWrapper.getTime( aT, sal_True, sal_False );
      String aAuthor = rName;
      aAuthor.EraseLeadingChars();
      if ( aAuthor.Len() )
@@ -510,13 +510,13 @@ void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const
     m_aCustomProperties.push_back( pProp );
 }
 
-bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
+bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
 {
     String aValue;
     sal_Int32 nValue = 0;
     sal_Bool bValue = sal_False;
-    BOOL bIsInt = FALSE;
-    BOOL bIsString = FALSE;
+    sal_Bool bIsInt = sal_False;
+    sal_Bool bIsString = sal_False;
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
@@ -530,31 +530,31 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
             bValue = isAutoloadEnabled();
             break;
         case MID_DOCINFO_AUTOLOADSECS:
-            bIsInt = TRUE;
+            bIsInt = sal_True;
             nValue = getAutoloadDelay();
             break;
         case MID_DOCINFO_AUTOLOADURL:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getAutoloadURL();
             break;
         case MID_DOCINFO_DEFAULTTARGET:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getDefaultTarget();
             break;
         case MID_DOCINFO_DESCRIPTION:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getDescription();
             break;
         case MID_DOCINFO_KEYWORDS:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getKeywords();
             break;
         case MID_DOCINFO_SUBJECT:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getSubject();
             break;
         case MID_DOCINFO_TITLE:
-            bIsString = TRUE;
+            bIsString = sal_True;
             aValue = getTitle();
             break;
         default:
@@ -571,7 +571,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SfxDocumentInfoItem::PutValue( const Any& rVal, BYTE nMemberId )
+bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
 {
     ::rtl::OUString aValue;
     sal_Int32 nValue=0;
@@ -669,16 +669,16 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem
 
 //------------------------------------------------------------------------
 
-BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
+sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
 {
     // Pruefung, ob eine Aenderung vorliegt
-    const BOOL bTitleMod = aTitleEd.IsModified();
-    const BOOL bThemeMod = aThemaEd.IsModified();
-    const BOOL bKeywordsMod = aKeywordsEd.IsModified();
-    const BOOL bCommentMod = aCommentEd.IsModified();
+    const sal_Bool bTitleMod = aTitleEd.IsModified();
+    const sal_Bool bThemeMod = aThemaEd.IsModified();
+    const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
+    const sal_Bool bCommentMod = aCommentEd.IsModified();
     if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
     {
-        return FALSE;
+        return sal_False;
     }
 
     // Erzeugung der Ausgabedaten
@@ -690,7 +690,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     if ( pDlg )
         pExSet = pDlg->GetExampleSet();
 
-    if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+    if ( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         pInfo = pInfoItem;
     else if ( pItem )
         pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem *)pItem );
@@ -698,7 +698,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     if ( !pInfo )
     {
         DBG_ERRORFILE( "SfxDocumentDescPage::FillItemSet(): no item found" );
-        return FALSE;
+        return sal_False;
     }
 
     if( bTitleMod )
@@ -723,7 +723,7 @@ BOOL SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
         delete pInfo;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -737,13 +737,13 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
      aKeywordsEd.SetText( pInfoItem->getKeywords() );
      aCommentEd.SetText( pInfoItem->getDescription() );
 
-     SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+     SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
      if ( pROItem && pROItem->GetValue() )
      {
-        aTitleEd.SetReadOnly( TRUE );
-        aThemaEd.SetReadOnly( TRUE );
-        aKeywordsEd.SetReadOnly( TRUE );
-        aCommentEd.SetReadOnly( TRUE );
+        aTitleEd.SetReadOnly( sal_True );
+        aThemaEd.SetReadOnly( sal_True );
+        aKeywordsEd.SetReadOnly( sal_True );
+        aCommentEd.SetReadOnly( sal_True );
     }
 }
 
@@ -824,10 +824,11 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
     aUnknownSize	( SfxResId( STR_UNKNOWNSIZE ) ),
     aMultiSignedStr	( SfxResId( STR_MULTSIGNED ) ),
 
-    bEnableUseUserData	( FALSE ),
-    bHandleDelete		( FALSE )
+    bEnableUseUserData	( sal_False ),
+    bHandleDelete		( sal_False )
 
 {
+    aNameED.SetAccessibleName(String(SfxResId(EDIT_FILE_NAME)));
     FreeResource();
 
     ImplUpdateSignatures();
@@ -891,7 +892,7 @@ IMPL_LINK( SfxDocumentPage, DeleteHdl, PushButton*, EMPTYARG )
     const Time aTime( 0 );
     aTimeLogValFt.SetText( aLocaleWrapper.getDuration( aTime ) );
     aDocNoValFt.SetText( '1' );
-    bHandleDelete = TRUE;
+    bHandleDelete = sal_True;
     return 0;
 }
 
@@ -954,16 +955,16 @@ SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet
 
 void SfxDocumentPage::EnableUseUserData()
 {
-    bEnableUseUserData = TRUE;
+    bEnableUseUserData = sal_True;
     aUseUserDataCB.Show();
     aDeleteBtn.Show();
 }
 
 //------------------------------------------------------------------------
 
-BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if ( !bHandleDelete && bEnableUseUserData &&
          aUseUserDataCB.GetState() != aUseUserDataCB.GetSavedValue() &&
@@ -972,13 +973,13 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
         const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
 
-        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         {
             SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
-            BOOL bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() );
+            sal_Bool bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() );
             pInfoItem->SetUseUserData( bUseData );
             rSet.Put( SfxDocumentInfoItem( *pInfoItem ) );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -986,10 +987,10 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
     {
         const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+        if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         {
             SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
-            BOOL bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked();
+            sal_Bool bUseAuthor = bEnableUseUserData && aUseUserDataCB.IsChecked();
             SfxDocumentInfoItem newItem( *pInfoItem );
             newItem.resetUserData( bUseAuthor
                 ? SvtUserOptions().GetFullName()
@@ -997,22 +998,22 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             pInfoItem->SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() );
             newItem.SetUseUserData( STATE_CHECK == aUseUserDataCB.GetState() );
 
-            newItem.SetDeleteUserData( TRUE );
+            newItem.SetDeleteUserData( sal_True );
             rSet.Put( newItem );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
     if ( aNameED.IsModified() && aNameED.GetText().Len() )
     {
         rSet.Put( SfxStringItem( ID_FILETP_TITLE, aNameED.GetText() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
-    if ( /* aReadOnlyCB.IsModified() */ TRUE )
+    if ( /* aReadOnlyCB.IsModified() */ sal_True )
     {
         rSet.Put( SfxBoolItem( ID_FILETP_READONLY, aReadOnlyCB.IsChecked() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -1042,7 +1043,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     String aFactory( aFile );
     if ( aFile.Len() > 2 && aFile.GetChar(0) == '[' )
     {
-        USHORT nPos = aFile.Search( ']' );
+        sal_uInt16 nPos = aFile.Search( ']' );
         aFactory = aFile.Copy( 1, nPos-1  );
         aFile = aFile.Copy( nPos+1 );
     }
@@ -1050,13 +1051,13 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     // determine name
     String aName;
     const SfxPoolItem* pItem = 0;
-    if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, FALSE, &pItem ) )
+    if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, sal_False, &pItem ) )
     {
         INetURLObject aURL(aFile);
         aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET );
         if ( !aName.Len() || aURL.GetProtocol() == INET_PROT_PRIVATE )
             aName = String( SfxResId( STR_NONAME ) );
-        aNameED.SetReadOnly( TRUE );
+        aNameED.SetReadOnly( sal_True );
     }
     else
     {
@@ -1067,7 +1068,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     aNameED.ClearModifyFlag();
 
     // determine RO-Flag
-    if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, FALSE, &pItem )
+    if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, sal_False, &pItem )
          || !pItem )
         aReadOnlyCB.Hide();
     else
@@ -1078,7 +1079,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     aURL.SetSmartProtocol( INET_PROT_FILE );
     aURL.SetSmartURL( aFactory);
     const String& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
-    aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, TRUE ) );
+    aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, sal_True ) );
 
     // determine size and type
     String aSizeText( aUnknownSize );
@@ -1131,12 +1132,12 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     TriState eState = (TriState)m_bUseUserData;
 
     if ( STATE_DONTKNOW == eState )
-        aUseUserDataCB.EnableTriState( TRUE );
+        aUseUserDataCB.EnableTriState( sal_True );
 
     aUseUserDataCB.SetState( eState );
     aUseUserDataCB.SaveValue();
     aUseUserDataCB.Enable( bEnableUseUserData );
-    bHandleDelete = FALSE;
+    bHandleDelete = sal_False;
     aDeleteBtn.Enable( bEnableUseUserData );
 }
 
@@ -1219,30 +1220,30 @@ void SfxInternetPage::ChangeState( STATE eNewState )
     switch( eState )
     {
         case S_Init:
-            EnableNoUpdate( TRUE );
-            EnableReload( FALSE );
-            EnableForward( FALSE );
+            EnableNoUpdate( sal_True );
+            EnableReload( sal_False );
+            EnableForward( sal_False );
             break;
         case S_NoUpdate:
-            EnableNoUpdate( FALSE );
+            EnableNoUpdate( sal_False );
             if( eNewState == S_Reload )
-                EnableReload( TRUE );
+                EnableReload( sal_True );
             else
-                EnableForward( TRUE );
+                EnableForward( sal_True );
             break;
         case S_Reload:
-            EnableReload( FALSE );
+            EnableReload( sal_False );
             if( eNewState == S_NoUpdate )
-                EnableNoUpdate( TRUE );
+                EnableNoUpdate( sal_True );
             else
-                EnableForward( TRUE );
+                EnableForward( sal_True );
             break;
         case S_Forward:
-            EnableForward( FALSE );
+            EnableForward( sal_False );
             if( eNewState == S_NoUpdate )
-                EnableNoUpdate( TRUE );
+                EnableNoUpdate( sal_True );
             else
-                EnableReload( TRUE );
+                EnableReload( sal_True );
             break;
         default:
             OSL_FAIL( "*SfxInternetPage::SetState(): unhandled state!" );
@@ -1253,7 +1254,7 @@ void SfxInternetPage::ChangeState( STATE eNewState )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableNoUpdate( BOOL bEnable )
+void SfxInternetPage::EnableNoUpdate( sal_Bool bEnable )
 {
     if( bEnable )
         aRBNoAutoUpdate.Check();
@@ -1261,7 +1262,7 @@ void SfxInternetPage::EnableNoUpdate( BOOL bEnable )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableReload( BOOL bEnable )
+void SfxInternetPage::EnableReload( sal_Bool bEnable )
 {
     aFTEvery.Enable( bEnable );
     aNFReload.Enable( bEnable );
@@ -1273,7 +1274,7 @@ void SfxInternetPage::EnableReload( BOOL bEnable )
 
 //------------------------------------------------------------------------
 
-void SfxInternetPage::EnableForward( BOOL bEnable )
+void SfxInternetPage::EnableForward( sal_Bool bEnable )
 {
     aFTAfter.Enable( bEnable );
     aNFAfter.Enable( bEnable );
@@ -1341,7 +1342,7 @@ IMPL_LINK( SfxInternetPage, DialogClosedHdl, sfx2::FileDialogHelper*, EMPTYARG )
 
 //------------------------------------------------------------------------
 
-BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxInternetPage::FillItemSet( SfxItemSet& rSet )
 {
     const SfxPoolItem*			pItem = NULL;
     SfxDocumentInfoItem*		pInfo = NULL;
@@ -1351,7 +1352,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     if( pDlg )
         pExSet = pDlg->GetExampleSet();
 
-    if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+    if( pExSet && SFX_ITEM_SET != pExSet->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
         pInfo = pInfoItem;
     else if ( pItem )
         pInfo = new SfxDocumentInfoItem( *(const SfxDocumentInfoItem*)pItem );
@@ -1359,33 +1360,33 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     if ( !pInfo )
     {
         DBG_ERRORFILE( "SfxInternetPage::FillItemSet(): no item found" );
-        return FALSE;
+        return sal_False;
     }
 
     DBG_ASSERT( eState != S_Init, "*SfxInternetPage::FillItemSet(): state init is not acceptable at this point!" );
 
-    BOOL						bEnableReload = FALSE;
+    sal_Bool						bEnableReload = sal_False;
     ::std::auto_ptr< String >	aURL( NULL );
     ::std::auto_ptr< String >	aFrame( NULL );
-    ULONG						nDelay = 0;
+    sal_uIntPtr						nDelay = 0;
 
     switch( eState )
     {
         case S_NoUpdate:
             break;
         case S_Reload:
-            bEnableReload = TRUE;
+            bEnableReload = sal_True;
             aURL = ::std::auto_ptr< String >( new String() );
             aFrame = ::std::auto_ptr< String >( new String() );
-            nDelay = static_cast<ULONG>(aNFReload.GetValue());
+            nDelay = static_cast<sal_uIntPtr>(aNFReload.GetValue());
             break;
         case S_Forward:
             DBG_ASSERT( aEDForwardURL.GetText().Len(), "+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward option!" );
 
-            bEnableReload = TRUE;
+            bEnableReload = sal_True;
             aURL = ::std::auto_ptr< String >( new String( URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aEDForwardURL.GetText(), URIHelper::GetMaybeFileHdl(), true ) ) );
             aFrame = ::std::auto_ptr< String >( new String( aCBFrame.GetText() ) );
-            nDelay = static_cast<ULONG>(aNFAfter.GetValue());
+            nDelay = static_cast<sal_uIntPtr>(aNFAfter.GetValue());
             break;
               default:
                   break;
@@ -1403,7 +1404,7 @@ BOOL SfxInternetPage::FillItemSet( SfxItemSet& rSet )
     rSet.Put( *pInfo );
     if( pInfo != pInfoItem )
         delete pInfo;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -1418,7 +1419,7 @@ SfxTabPage *SfxInternetPage::Create( Window* pParent, const SfxItemSet& rItemSet
 void SfxInternetPage::Reset( const SfxItemSet& rSet )
 {
     pInfoItem = &( SfxDocumentInfoItem& ) rSet.Get( SID_DOCINFO );
-    SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE );
+    SFX_ITEMSET_ARG( &rSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False );
     DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" );
     if ( pURLItem )
         aBaseURL = pURLItem->GetValue();
@@ -1445,7 +1446,7 @@ void SfxInternetPage::Reset( const SfxItemSet& rSet )
 
     ChangeState( eNewState );
 
-    SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+    SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
     if ( pROItem && pROItem->GetValue() )
     {
         aRBNoAutoUpdate.Disable();
@@ -1496,7 +1497,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
         &(const SfxDocumentInfoItem &)rItemSet.Get( SID_DOCINFO );
 
 #ifdef DBG_UTIL
-    SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, FALSE );
+    SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False );
     DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" );
 #endif
 
@@ -1504,23 +1505,10 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
     const SfxPoolItem* pItem = 0;
     String aTitle( GetText() );
     if ( SFX_ITEM_SET !=
-         rItemSet.GetItemState( SID_EXPLORER_PROPS_START, FALSE, &pItem ) )
+         rItemSet.GetItemState( SID_EXPLORER_PROPS_START, sal_False, &pItem ) )
     {
         // Dateiname
         String aFile( pInfoItem->GetValue() );
-#ifdef WIN
-        if ( aFile.Len() <= 8 )
-        {
-            String sTmp( SfxResId( STR_NONAME ) );
-            USHORT nLen = Min( (USHORT)8, sTmp.Len() );
-
-            if ( sTmp.Copy( 0, nLen ).Lower() ==
-                 aFile.Copy( 0, nLen ).Lower() )
-            {
-                aFile = pInfoItem->GetValue();
-            }
-        }
-#endif
 
         INetURLObject aURL;
         aURL.SetSmartProtocol( INET_PROT_FILE );
@@ -1554,7 +1542,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
 
 // -----------------------------------------------------------------------
 
-void SfxDocumentInfoDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     if ( TP_DOCINFODOC == nId )
         ( (SfxDocumentPage&)rPage ).EnableUseUserData();
@@ -1792,6 +1780,11 @@ CustomPropertiesWindow::CustomPropertiesWindow( Window* pParent, const ResId& rR
     m_aEditLoseFocusTimer.SetTimeoutHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
     m_aBoxLoseFocusTimer.SetTimeout( 300 );
     m_aBoxLoseFocusTimer.SetTimeoutHdl( LINK( this, CustomPropertiesWindow, BoxTimeoutHdl ) );
+
+    ResMgr* pResMgr = rResId.GetResMgr();
+    m_aNameBox.SetAccessibleName( String( ResId( STR_HEADER_NAME, *pResMgr ) ) );
+    m_aTypeBox.SetAccessibleName( String( ResId( STR_HEADER_TYPE, *pResMgr ) ) );
+    m_aValueEdit.SetAccessibleName( String( ResId( STR_HEADER_VALUE, *pResMgr ) ) );
 }
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
@@ -1923,7 +1916,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const
     {
         sal_uInt32 nTemp = nIndex;
         bIsValid = const_cast< SvNumberFormatter& >(
-            m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != FALSE;
+            m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != sal_False;
         if ( bIsValid && nTemp != nIndex )
             // sValue is a number but the format doesn't match the index
             bIsValid = false;
@@ -1974,7 +1967,7 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
 
     Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL };
     Window** pCurrent = pWindows;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( *pCurrent )
     {
         Rectangle aRect = pHeaderBar->GetItemRect( pHeaderBar->GetItemId( nPos++ ) );
@@ -2015,9 +2008,9 @@ void CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa
         ( m_aRemoveButton.GetPosPixel().Y() * 2 ) + m_aRemoveButton.GetSizePixel().Height();
 }
 
-USHORT CustomPropertiesWindow::GetVisibleLineCount() const
+sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     std::vector< CustomPropertyLine* >::const_iterator pIter;
     for ( pIter = m_aCustomPropertiesLines.begin();
             pIter != m_aCustomPropertiesLines.end(); ++pIter )
@@ -2038,6 +2031,11 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
     //add lose focus handlers of date/time fields
 
     pNewLine->m_aTypeBox.SetLoseFocusHdl( LINK( this, CustomPropertiesWindow, BoxLoseFocusHdl ) );
+
+    pNewLine->m_aNameBox.SetAccessibleName(m_aNameBox.GetAccessibleName());
+    pNewLine->m_aTypeBox.SetAccessibleName(m_aTypeBox.GetAccessibleName());
+    pNewLine->m_aValueEdit.SetAccessibleName(m_aValueEdit.GetAccessibleName());
+
     long nPos = GetVisibleLineCount() * GetLineHeight();
     m_aCustomPropertiesLines.push_back( pNewLine );
     Window* pWindows[] = {  &m_aNameBox, &m_aTypeBox, &m_aValueEdit,
@@ -2228,7 +2226,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
                 double nValue = 0;
                 sal_uInt32 nIndex = const_cast< SvNumberFormatter& >(
                     m_aNumberFormatter ).GetFormatIndex( NF_NUMBER_SYSTEM );
-                BOOL bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
+                sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
                     IsNumberFormat( pLine->m_aValueEdit.GetText(), nIndex, nValue );
                 if ( bIsNum )
                     aPropertiesSeq[i].Value <<= makeAny( nValue );
@@ -2357,10 +2355,10 @@ void CustomPropertiesControl::AddLine( const ::rtl::OUString& sName, Any& rAny,
 SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) :
 
     SfxTabPage( pParent, SfxResId( TP_CUSTOMPROPERTIES ), rItemSet ),
-    m_aPropertiesFT     ( this, SfxResId( FT_PROPERTIES ) ),
     m_aPropertiesCtrl   ( this, SfxResId( CTRL_PROPERTIES ) ),
-    m_aAddBtn           ( this, SfxResId( BTN_ADD ) )
-
+    m_aAddBtn           ( this, SfxResId( BTN_ADD ) ),
+    m_aPropertiesFT     ( this, SfxResId( FT_PROPERTIES ) )
+    
 {
     FreeResource();
 
@@ -2374,9 +2372,9 @@ IMPL_LINK( SfxCustomPropertiesPage, AddHdl, PushButton*, EMPTYARG )
     return 0;
 }
 
-BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
 {
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
     const SfxPoolItem*      pItem = NULL;
     SfxDocumentInfoItem*    pInfo = NULL;
     bool                    bMustDelete = false;
@@ -2384,7 +2382,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
     if ( GetTabDialog() && GetTabDialog()->GetExampleSet() )
     {
         if( SFX_ITEM_SET !=
-                GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, TRUE, &pItem ) )
+                GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, sal_True, &pItem ) )
             pInfo = &( SfxDocumentInfoItem& )rSet.Get( SID_DOCINFO );
         else
         {
@@ -2405,7 +2403,7 @@ BOOL SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet )
         }
     }
 
-    bModified = TRUE; //!!!
+    bModified = sal_True; //!!!
     if ( bModified )
         rSet.Put( *pInfo );
     if ( bMustDelete )
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index 774b91b637..f710e13534 100644..100755
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.hrc
@@ -153,6 +153,10 @@
 #define STR_HEADER_VALUE    92
 #define STR_HEADER_ACTION   93
 
+//IAccessibility2 Implementation 2009-----
+#define EDIT_FILE_NAME		94
+//-----IAccessibility2 Implementation 2009
+
 #define PB_OK                   100
 #define PB_CANCEL               101
 #define PB_HELP                 102
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index f6cb7b7464..2e4b5abd9f 100755
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -53,6 +53,7 @@ TabPage TP_DOCINFODESC
     };
     Edit ED_TITLE
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 6 ) ;
         Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -68,6 +69,7 @@ TabPage TP_DOCINFODESC
     };
     Edit ED_THEMA
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 21 ) ;
         Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -83,6 +85,7 @@ TabPage TP_DOCINFODESC
     };
     Edit ED_KEYWORDS
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 36 ) ;
         Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -98,6 +101,7 @@ TabPage TP_DOCINFODESC
     };
     MultiLineEdit ED_COMMENT
     {
+        HelpID = "sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 51 ) ;
         Size = MAP_APPFONT ( 184 , 128 ) ;
@@ -121,6 +125,7 @@ TabPage TP_DOCINFODOC
     };
     Edit ED_FILE_NAME
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME";
         Pos = MAP_APPFONT ( 54 , 12 ) ;
         Size = MAP_APPFONT ( 200 , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
@@ -138,11 +143,13 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_FILE_SHOW_TYP
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_TYP";
         Pos = MAP_APPFONT ( 78 , 37 ) ;
         Size = MAP_APPFONT ( 106 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
     CheckBox CB_FILE_READONLY
     {
+        HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_FILE_READONLY";
         Pos = MAP_APPFONT ( 163 , 37 ) ;
         Size = MAP_APPFONT ( 91 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "~Read-only" ;
@@ -155,6 +162,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_FILE_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_VAL";
         Pos = MAP_APPFONT ( 78 , 49 ) ;
         Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -166,6 +174,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_FILE_SHOW_SIZE
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_SIZE";
         Pos = MAP_APPFONT ( 78 , 61 ) ;
         Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -182,6 +191,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_CREATE_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CREATE_VAL";
         Pos = MAP_APPFONT ( 78 , 80 ) ;
         Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -193,6 +203,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_CHANGE_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CHANGE_VAL";
         Pos = MAP_APPFONT ( 78 , 92 ) ;
         Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -204,11 +215,13 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_SIGNED_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_SIGNED_VAL";
         Pos = MAP_APPFONT ( 78 , 104 ) ;
         Size = MAP_APPFONT ( 123 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
     PushButton BTN_SIGNATURE
     {
+        HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE";
         Pos = MAP_APPFONT ( 204 , 101 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Digital Signature...";
@@ -225,6 +238,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_PRINT_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_PRINT_VAL";
         Pos = MAP_APPFONT ( 78 , 116 ) ;
         Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -236,6 +250,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_TIMELOG_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TIMELOG_VAL";
         Pos = MAP_APPFONT ( 78 , 128 ) ;
         Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -247,11 +262,13 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_DOCNO_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_DOCNO_VAL";
         Pos = MAP_APPFONT ( 78 , 140 ) ;
         Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
     PushButton BTN_DELETE
     {
+        HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE";
         Pos = MAP_APPFONT ( 204 , 150 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Hide = TRUE;
@@ -259,6 +276,7 @@ TabPage TP_DOCINFODOC
     };
     CheckBox CB_USE_USERDATA
     {
+        HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA";
         Pos = MAP_APPFONT ( 6 , 152 ) ;
         Size = MAP_APPFONT ( 192 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Hide = TRUE;
@@ -277,6 +295,7 @@ TabPage TP_DOCINFODOC
     };
     Edit FT_TEMPL_VAL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TEMPL_VAL";
         Pos = MAP_APPFONT ( 78 , 172 ) ;
         Size = MAP_APPFONT ( 180 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
     };
@@ -284,6 +303,10 @@ TabPage TP_DOCINFODOC
     {
         Text [ en-US ] = "unknown" ;
     };
+    String EDIT_FILE_NAME
+    {
+        Text [ en-US ] = "File Name" ;
+    };
 };
 
  // TP_DOCINFOUSER --------------------------------------------------------
@@ -301,6 +324,7 @@ TabPage TP_DOCINFOUSER
     };
     Edit ED_INFO1
     {
+        HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -314,6 +338,7 @@ TabPage TP_DOCINFOUSER
     };
     Edit ED_INFO2
     {
+        HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 43 ) ;
         Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -327,6 +352,7 @@ TabPage TP_DOCINFOUSER
     };
     Edit ED_INFO3
     {
+        HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 69 ) ;
         Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -340,6 +366,7 @@ TabPage TP_DOCINFOUSER
     };
     Edit ED_INFO4
     {
+        HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 95 ) ;
         Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -347,6 +374,7 @@ TabPage TP_DOCINFOUSER
     };
     PushButton BTN_EDITLABEL
     {
+        HelpID = "sfx2:PushButton:TP_DOCINFOUSER:BTN_EDITLABEL";
         Pos = MAP_APPFONT ( 194 , 165 ) ;
         Size = MAP_APPFONT ( 60 , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Info fields..." ;
@@ -362,6 +390,7 @@ TabPage TP_DOCINFORELOAD
     Size = MAP_APPFONT ( 260 , 185 ) ;
     RadioButton RB_NOAUTOUPDATE
     {
+        HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL_0 , ROW_0 ) ;
         Size = MAP_APPFONT( COL_7 - COL_1 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -370,6 +399,7 @@ TabPage TP_DOCINFORELOAD
 
     RadioButton RB_RELOADUPDATE
     {
+        HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL_0, ROW_1 ) ;
         Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -383,6 +413,7 @@ TabPage TP_DOCINFORELOAD
     };
     NumericField ED_RELOAD
     {
+        HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , ROW_2 - ROWDIFF_FT_EDTFLD ) ;
         Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -403,6 +434,7 @@ TabPage TP_DOCINFORELOAD
 
     RadioButton RB_FORWARDUPDATE
     {
+        HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL_0, ROW_3 ) ;
         Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -416,6 +448,7 @@ TabPage TP_DOCINFORELOAD
     };
     NumericField ED_FORWARD
     {
+        HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , ROW_4 - ROWDIFF_FT_EDTFLD ) ;
         Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -441,12 +474,14 @@ TabPage TP_DOCINFORELOAD
     };
     Edit ED_URL
     {
+        HelpID = "sfx2:Edit:TP_DOCINFORELOAD:ED_URL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , ROW_5 - ROWDIFF_FT_EDTFLD ) ;
         Size = MAP_APPFONT ( COL_5 - COL_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
     };
     PushButton PB_BROWSEURL
     {
+        HelpID = "sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL";
         Pos = MAP_APPFONT ( COL_6 , ROW_5 - ROWDIFF_FT_EDTFLD ) ;
         Size = MAP_APPFONT ( COL_7 - COL_6 , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text = "..." ;
@@ -459,6 +494,7 @@ TabPage TP_DOCINFORELOAD
     };
     ComboBox CB_FRAME
     {
+        HelpID = "sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME";
         Pos = MAP_APPFONT ( COL_2 , ROW_6 - ROWDIFF_FT_EDTFLD ) ;
         Size = MAP_APPFONT ( COL_7 - COL_2 , RSC_CD_DROPDOWN_HEIGHT * 10 ) ;
         DropDown = TRUE ;
@@ -524,6 +560,7 @@ TabPage TP_CUSTOMPROPERTIES
     };
     PushButton BTN_ADD
     {
+        HelpID = "sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD";
         Pos = MAP_APPFONT( 204 , 165 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "~Add";
@@ -751,6 +788,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     CheckBox CB_NEGATIVE
     {
+        HelpID = "sfx2:CheckBox:RID_EDIT_DURATIONS:CB_NEGATIVE";
         Pos = MAP_APPFONT ( 6 , 21 ) ;
         Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "~Negative" ;
@@ -764,6 +802,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_YEAR
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_YEAR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 36 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -784,6 +823,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_MONTH
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MONTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 50 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -804,6 +844,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_DAY
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_DAY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 64 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -824,6 +865,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_HOUR
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_HOUR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 78 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -844,6 +886,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_MINUTE
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MINUTE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70, 92) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -864,6 +907,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_SECOND
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_SECOND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 106 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -884,6 +928,7 @@ ModalDialog RID_EDIT_DURATIONS
     };
     NumericField ED_MSECOND
     {
+        HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MSECOND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 120 ) ;    
         Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 185846678b..aceeb17b02 100644..100755
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "dinfedt.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/dinfedt.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfx.hrc>
 #include "dinfedt.hrc"
diff --git a/sfx2/source/dialog/dinfedt.hrc b/sfx2/source/dialog/dinfedt.hrc
index 3df1dcd845..3df1dcd845 100644..100755
--- a/sfx2/source/dialog/dinfedt.hrc
+++ b/sfx2/source/dialog/dinfedt.hrc
diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
index ebc18731f7..476690de0b 100644..100755
--- a/sfx2/source/dialog/dinfedt.src
+++ b/sfx2/source/dialog/dinfedt.src
@@ -45,24 +45,28 @@ ModalDialog DLG_DOCINFO_EDT
     };
     Edit ED_INFO1
     {
+        HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
     };
     Edit ED_INFO2
     {
+        HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 29 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
     };
     Edit ED_INFO3
     {
+        HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
     };
     Edit ED_INFO4
     {
+        HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 59 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index c2c5d98d3d..1aaa868efe 100644..100755
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -45,8 +45,9 @@
 #include "workwin.hxx"
 #include "splitwin.hxx"
 #include <sfx2/viewsh.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/objsh.hxx>
+#include <sfx2/msgpool.hxx>
 
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -75,7 +76,7 @@ class SfxTitleDockingWindow;
 class SfxTitleDockingWindow : public SfxDockingWindow
 {
     Window*				m_pWrappedWindow;
-    USHORT              m_nID;
+    sal_uInt16              m_nID;
 
 public:
                         SfxTitleDockingWindow( 
@@ -83,7 +84,7 @@ public:
                             SfxChildWindow* pChildWin ,
                             Window* pParent ,
                             WinBits nBits,
-                            USHORT  nID);
+                            sal_uInt16  nID);
     virtual             ~SfxTitleDockingWindow();
 
     Window*				GetWrappedWindow() const { return m_pWrappedWindow; }
@@ -93,7 +94,7 @@ public:
     virtual long        Notify( NotifyEvent& rNEvt );
     virtual void 		Resize();
     virtual void        Resizing( Size& rSize );
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
 };
 
 namespace
@@ -135,7 +136,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >&
 }
 
 SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
-                                      USHORT nId ,
+                                      sal_uInt16 nId ,
                                       SfxBindings* pBindings ,
                                       SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd , nId )
@@ -243,7 +244,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxChildWindow*  SfxDockingWrapper::CreateImpl( 
@@ -264,7 +265,7 @@ void SfxDockingWrapper::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal
     // pre-register a couple of docking windows
     for (int i=0; i < NUM_OF_DOCKINGWINDOWS; i++ )
     {
-        USHORT nID = USHORT(SID_DOCKWIN_START+i);
+        sal_uInt16 nID = sal_uInt16(SID_DOCKWIN_START+i);
         SfxChildWinFactory *pFact = new SfxChildWinFactory( SfxDockingWrapper::CreateImpl, nID, 0xffff );   
         pFact->aInfo.nFlags |= nFlags; 
         pFact->aInfo.bVisible = bVis; 
@@ -283,7 +284,7 @@ SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind ,
                                               SfxChildWindow* pChildWin ,
                                               Window* pParent ,
                                               WinBits nBits,
-                                              USHORT  nID ) :
+                                              sal_uInt16  nID ) :
                           SfxDockingWindow( pBind ,
                                             pChildWin ,
                                             pParent ,
@@ -343,7 +344,7 @@ void SfxTitleDockingWindow::Resizing( Size &rSize )
         m_pWrappedWindow->SetSizePixel( GetOutputSizePixel() );
 }
 
-BOOL SfxTitleDockingWindow::Close()
+sal_Bool SfxTitleDockingWindow::Close()
 {
     return SfxDockingWindow::Close();
 }
@@ -353,9 +354,9 @@ namespace
     struct ChildrenRegisteredMap : public rtl::Static< bool, ChildrenRegisteredMap > {};
 }
 
-static bool lcl_checkDockingWindowID( USHORT nID )
+static bool lcl_checkDockingWindowID( sal_uInt16 nID )
 {
-    if (nID < SID_DOCKWIN_START || nID >= USHORT(SID_DOCKWIN_START+NUM_OF_DOCKINGWINDOWS))
+    if (nID < SID_DOCKWIN_START || nID >= sal_uInt16(SID_DOCKWIN_START+NUM_OF_DOCKINGWINDOWS))
         return false;
     else
         return true;
@@ -393,7 +394,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame::
 void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName )
 {
     SolarMutexGuard aGuard;
-    USHORT nID = USHORT(rDockingWindowName.toInt32());
+    sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32());
     
     // Check the range of the provided ID otherwise nothing will happen
     if ( lcl_checkDockingWindowID( nID ))
@@ -420,7 +421,7 @@ bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFr
 {
     SolarMutexGuard aGuard;
     
-    USHORT nID = USHORT(rDockingWindowName.toInt32());
+    sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32());
     
     // Check the range of the provided ID otherwise nothing will happen
     if ( lcl_checkDockingWindowID( nID ))
@@ -443,24 +444,24 @@ friend class SfxDockingWindow;
 
     SfxChildAlignment	eLastAlignment;
     SfxChildAlignment	eDockAlignment;
-    BOOL				bConstructed;
+    sal_Bool				bConstructed;
     Size				aMinSize;
     SfxSplitWindow*		pSplitWin;
-    BOOL				bSplitable;
+    sal_Bool				bSplitable;
     Timer               aMoveTimer;
 
     // Folgende members sind nur in der Zeit von StartDocking bis EndDocking
     // g"ultig:
-    BOOL				bEndDocked;
+    sal_Bool				bEndDocked;
     Size				aSplitSize;
     long                nHorizontalSize;
     long                nVerticalSize;
-    USHORT				nLine;
-    USHORT 				nPos;
-    USHORT 				nDockLine;
-    USHORT				nDockPos;
-    BOOL				bNewLine;
-    BOOL 				bDockingPrevented;
+    sal_uInt16				nLine;
+    sal_uInt16 				nPos;
+    sal_uInt16 				nDockLine;
+    sal_uInt16				nDockPos;
+    sal_Bool				bNewLine;
+    sal_Bool 				bDockingPrevented;
     ByteString          aWinState;
 
     SfxChildAlignment	GetLastAlignment() const
@@ -526,7 +527,7 @@ void SfxDockingWindow::Resize()
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::PrepareToggleFloatingMode()
+sal_Bool SfxDockingWindow::PrepareToggleFloatingMode()
 
 /*  [Beschreibung]
 
@@ -539,24 +540,24 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode()
 
 {
     if (!pImp->bConstructed)
-        return TRUE;
+        return sal_True;
 
     if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr )
-        return FALSE;
+        return sal_False;
 
     if ( pImp->bDockingPrevented )
-        return FALSE;
+        return sal_False;
 
     if (!IsFloatingMode())
     {
         // Testen, ob FloatingMode erlaubt ist
         if ( CheckAlignment(GetAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT )
-            return FALSE;
+            return sal_False;
 
         if ( pImp->pSplitWin )
         {
             // Das DockingWindow sitzt in einem SplitWindow und wird abgerissen
-            pImp->pSplitWin->RemoveWindow(this/*, FALSE*/);
+            pImp->pSplitWin->RemoveWindow(this/*, sal_False*/);
             pImp->pSplitWin = 0;
         }
     }
@@ -566,15 +567,15 @@ BOOL SfxDockingWindow::PrepareToggleFloatingMode()
 
         // Testen, ob es erlaubt ist, anzudocken
         if (CheckAlignment(GetAlignment(),pImp->GetLastAlignment()) == SFX_ALIGN_NOALIGNMENT)
-            return FALSE;
+            return sal_False;
 
         // Testen, ob das Workwindow gerade ein Andocken erlaubt
         SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
         if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -692,13 +693,13 @@ void SfxDockingWindow::StartDocking()
         pImp->pSplitWin->GetWindowPos(this, pImp->nLine, pImp->nPos);
         pImp->nDockLine = pImp->nLine;
         pImp->nDockPos = pImp->nPos;
-        pImp->bNewLine = FALSE;
+        pImp->bNewLine = sal_False;
     }
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
+sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
 /*  [Beschreibung]
 
@@ -709,7 +710,7 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 */
 {
     if ( Application::IsInModalMode() )
-        return TRUE;
+        return sal_True;
 
     if ( !pImp->bConstructed || !pMgr )
     {
@@ -719,16 +720,16 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
     SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
     if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bFloatMode = FALSE;
+    sal_Bool bFloatMode = sal_False;
 
     if ( GetOuterRect().IsInside( rPos ) && !IsDockingPrevented() )
     {
         // Maus innerhalb OuterRect : Alignment und Rectangle berechnen
         SfxChildAlignment eAlign = CalcAlignment(rPos, rRect);
         if (eAlign == SFX_ALIGN_NOALIGNMENT)
-            bFloatMode = TRUE;
+            bFloatMode = sal_True;
         pImp->SetDockAlignment(eAlign);
     }
     else
@@ -736,8 +737,8 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
         // Maus nicht innerhalb OuterRect : muss FloatingWindow sein
         // Ist das erlaubt ?
         if (CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT)
-            return FALSE;
-        bFloatMode = TRUE;
+            return sal_False;
+        bFloatMode = sal_True;
         if ( SFX_ALIGN_NOALIGNMENT != pImp->GetDockAlignment() )
         {
             // wg. SV-Bug darf rRect nur ver"andert werden, wenn sich das
@@ -801,7 +802,7 @@ BOOL SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
 //-------------------------------------------------------------------------
 
-void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
+void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
 
 /*  [Beschreibung]
 
@@ -815,7 +816,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
         return;
 
     SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
-    BOOL bReArrange = FALSE;
+    sal_Bool bReArrange = sal_False;
     if ( pImp->bSplitable )
     {
         // Wenn sich das Alignment "andert und das Fenster befindet sich
@@ -823,7 +824,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
         // Wenn neu angedockt wird, machen PrepareToggleFloatingMode()
         // und ToggleFloatingMode() das Ummelden.
         if ( !bFloatMode )
-            bReArrange = TRUE;
+            bReArrange = sal_True;
     }
 
     if ( bReArrange )
@@ -833,7 +834,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
             // Vor dem Show() mu\s das Ummelden passiert sein, daher kann nicht
             // die Basisklasse gerufen werden
             if ( IsFloatingMode() || !pImp->bSplitable )
-                Show( FALSE, SHOW_NOFOCUSCHANGE );
+                Show( sal_False, SHOW_NOFOCUSCHANGE );
 
             // Die Gr"o\se f"urs Toggeln setzen
             pImp->aSplitSize = rRect.GetSize();
@@ -841,11 +842,11 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
             {
                 SetFloatingMode( bFloatMode );
                 if ( IsFloatingMode() || !pImp->bSplitable )
-                    Show( TRUE, SHOW_NOFOCUSCHANGE );
+                    Show( sal_True, SHOW_NOFOCUSCHANGE );
             }
             else
             {
-                pImp->pSplitWin->RemoveWindow(this,FALSE);
+                pImp->pSplitWin->RemoveWindow(this,sal_False);
                 pImp->nLine = pImp->nDockLine;
                 pImp->nPos = pImp->nDockPos;
                 pImp->pSplitWin->ReleaseWindow_Impl(this);
@@ -865,9 +866,9 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode )
     }
     else
     {
-        pImp->bEndDocked = TRUE;
+        pImp->bEndDocked = sal_True;
         DockingWindow::EndDocking(rRect, bFloatMode);
-        pImp->bEndDocked = FALSE;
+        pImp->bEndDocked = sal_False;
     }
 
     SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() );
@@ -906,24 +907,36 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 */
 
 {
-    ULONG nId = GetHelpId();
-    if ( !nId && pCW )
-        nId = pCW->GetType();
-    SetHelpId( 0 );
-    SetUniqueId( nId );
+    if ( GetHelpId().getLength() )
+    {
+        SetUniqueId( GetHelpId() );
+        SetHelpId("");
+    }
+    else
+    {
+        SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+        SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+        const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+        if ( pSlot )
+        {
+            rtl::OString aCmd("SFXDOCKINGWINDOW_");
+            aCmd += pSlot->GetUnoName();
+            SetUniqueId( aCmd );
+        }
+    }
 
     pImp = new SfxDockingWindow_Impl;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     pImp->pSplitWin = 0;
-    pImp->bEndDocked = FALSE;
-    pImp->bDockingPrevented = FALSE;
+    pImp->bEndDocked = sal_False;
+    pImp->bDockingPrevented = sal_False;
 
-    pImp->bSplitable = TRUE;
+    pImp->bSplitable = sal_True;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
-    pImp->bNewLine = FALSE;
+    pImp->bNewLine = sal_False;
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -945,22 +958,36 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 */
 
 {
-    ULONG nId = GetHelpId();
-    SetHelpId(0);
-    SetUniqueId( nId );
+    if ( GetHelpId().getLength() )
+    {
+        SetUniqueId( GetHelpId() );
+        SetHelpId("");
+    }
+    else
+    {
+        SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+        SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+        const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+        if ( pSlot )
+        {
+            rtl::OString aCmd("SFXDOCKINGWINDOW_");
+            aCmd += pSlot->GetUnoName();
+            SetUniqueId( aCmd );
+        }
+    }
 
     pImp = new SfxDockingWindow_Impl;
-    pImp->bConstructed = FALSE;
+    pImp->bConstructed = sal_False;
     pImp->pSplitWin = 0;
-    pImp->bEndDocked = FALSE;
-    pImp->bDockingPrevented = FALSE;
+    pImp->bEndDocked = sal_False;
+    pImp->bDockingPrevented = sal_False;
 
-    pImp->bSplitable = TRUE;
+    pImp->bSplitable = sal_True;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
     pImp->nPos  = pImp->nDockPos = 0;
-    pImp->bNewLine = FALSE;
+    pImp->bNewLine = sal_False;
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
@@ -980,12 +1007,12 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
     if ( !pMgr )
     {
         pImp->SetDockAlignment( SFX_ALIGN_NOALIGNMENT );
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
         return;
     }
 
     if ( pInfo->nFlags & SFX_CHILDWIN_FORCEDOCK )
-        pImp->bDockingPrevented = TRUE;
+        pImp->bDockingPrevented = sal_True;
 
     pImp->aSplitSize = GetOutputSizePixel();
     if ( !GetFloatingSize().Width() )
@@ -1003,14 +1030,14 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
     {
         // get information about alignment, split size and position in SplitWindow
         String aStr;
-        USHORT nPos = pInfo->aExtraString.SearchAscii("AL:");
+        sal_uInt16 nPos = pInfo->aExtraString.SearchAscii("AL:");
         if ( nPos != STRING_NOTFOUND )
         {
             // alignment information
-            USHORT n1 = pInfo->aExtraString.Search('(', nPos);
+            sal_uInt16 n1 = pInfo->aExtraString.Search('(', nPos);
             if ( n1 != STRING_NOTFOUND )
             {
-                USHORT n2 = pInfo->aExtraString.Search(')', n1);
+                sal_uInt16 n2 = pInfo->aExtraString.Search(')', n1);
                 if ( n2 != STRING_NOTFOUND )
                 {
                     // extract alignment information from extrastring
@@ -1027,7 +1054,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
             pImp->aWinState = pInfo->aWinState;
 
             // check for valid alignment
-            SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (USHORT) aStr.ToInt32();
+            SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (sal_uInt16) aStr.ToInt32();
             if ( pImp->bDockingPrevented )
                 // docking prevented, ignore old configuration and take alignment from default
                 aStr.Erase();
@@ -1047,7 +1074,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
             if ( nPos != STRING_NOTFOUND )
             {
                 aStr.Erase(0, nPos+1);
-                pImp->SetLastAlignment( (SfxChildAlignment) (USHORT) aStr.ToInt32() );
+                pImp->SetLastAlignment( (SfxChildAlignment) (sal_uInt16) aStr.ToInt32() );
             }
 
             nPos = aStr.Search(',');
@@ -1058,8 +1085,8 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
                 aStr.Erase(0, nPos+1);
                 if ( GetPosSizeFromString( aStr, aPos, pImp->aSplitSize ) )
                 {
-                    pImp->nLine = pImp->nDockLine = (USHORT) aPos.X();
-                    pImp->nPos  = pImp->nDockPos  = (USHORT) aPos.Y();
+                    pImp->nLine = pImp->nDockLine = (sal_uInt16) aPos.X();
+                    pImp->nPos  = pImp->nDockPos  = (sal_uInt16) aPos.Y();
                     pImp->nVerticalSize = pImp->aSplitSize.Height();
                     pImp->nHorizontalSize = pImp->aSplitSize.Width();
                     if ( GetSplitSizeFromString( aStr, pImp->aSplitSize ))
@@ -1093,7 +1120,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
 
     // detect floating mode
     // toggeling mode will not execute code in handlers, because pImp->bConstructed is not set yet
-    BOOL bFloatMode = IsFloatingMode();
+    sal_Bool bFloatMode = IsFloatingMode();
     if ( bFloatMode != ((GetAlignment() == SFX_ALIGN_NOALIGNMENT)) )
     {
         bFloatMode = !bFloatMode;
@@ -1151,12 +1178,12 @@ void SfxDockingWindow::Initialize_Impl()
 {
     if ( !pMgr )
     {
-        pImp->bConstructed = TRUE;
+        pImp->bConstructed = sal_True;
         return;
     }
 
     FloatingWindow* pFloatWin = GetFloatingWindow();
-    BOOL bSet = FALSE;
+    sal_Bool bSet = sal_False;
     if ( pFloatWin )
     {
         bSet = !pFloatWin->IsDefaultPos();
@@ -1165,7 +1192,7 @@ void SfxDockingWindow::Initialize_Impl()
     {
         Point aPos = GetFloatingPos();
         if ( aPos != Point() )
-            bSet = TRUE;
+            bSet = sal_True;
     }
 
     if ( !bSet)
@@ -1195,7 +1222,7 @@ void SfxDockingWindow::Initialize_Impl()
     }
 
     // allow calling of docking handlers
-    pImp->bConstructed = TRUE;
+    pImp->bConstructed = sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1223,9 +1250,9 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
     rInfo.aWinState = pImp->aWinState;
     rInfo.aExtraString = DEFINE_CONST_UNICODE("AL:(");
-    rInfo.aExtraString += String::CreateFromInt32((USHORT) GetAlignment());
+    rInfo.aExtraString += String::CreateFromInt32((sal_uInt16) GetAlignment());
     rInfo.aExtraString += ',';
-    rInfo.aExtraString += String::CreateFromInt32 ((USHORT) pImp->GetLastAlignment());
+    rInfo.aExtraString += String::CreateFromInt32 ((sal_uInt16) pImp->GetLastAlignment());
     if ( pImp->bSplitable )
     {
         Point aPos(pImp->nLine, pImp->nPos);
@@ -1337,7 +1364,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         aInRect.Bottom() -= nTBBorder/2;
 
     // calculate alignment resulting from docking rectangle
-    BOOL bBecomesFloating = FALSE;
+    sal_Bool bBecomesFloating = sal_False;
     SfxChildAlignment eDockAlign = pImp->GetDockAlignment();
     Rectangle aDockingRect( rRect );
     if ( !IsFloatingMode() )
@@ -1356,7 +1383,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
     Rectangle aIntersect = GetOuterRect().GetIntersection( aDockingRect );
     if ( aIntersect.IsEmpty() )
         // docking rectangle completely outside docking area -> floating mode
-        bBecomesFloating = TRUE;
+        bBecomesFloating = sal_True;
     else
     {
         // create a small test rect around the mouse position and use this one
@@ -1370,7 +1397,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect );
         if ( aIntersectRect == aSmallDockingRect )
             // docking rectangle completely inside (shrinked) inner area -> floating mode
-            bBecomesFloating = TRUE;
+            bBecomesFloating = sal_True;
     }
 
     if ( bBecomesFloating )
@@ -1383,7 +1410,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         Point aInPosTL( aPos.X()-aInRect.Left(), aPos.Y()-aInRect.Top() );
         Point aInPosBR( aPos.X()-aInRect.Left() + aDockingRect.GetWidth(), aPos.Y()-aInRect.Top() + aDockingRect.GetHeight() );
         Size  aInSize = aInRect.GetSize();
-        BOOL  bNoChange = FALSE;
+        sal_Bool  bNoChange = sal_False;
 
         // check if alignment is still unchanged
         switch ( GetAlignment() )
@@ -1394,7 +1421,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if (aInPosTL.X() <= 0)
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_TOP:
@@ -1403,7 +1430,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosTL.Y() <= 0)
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_RIGHT:
@@ -1412,7 +1439,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosBR.X() >= aInSize.Width())
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             case SFX_ALIGN_BOTTOM:
@@ -1421,7 +1448,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 if ( aInPosBR.Y() >= aInSize.Height())
                 {
                     eDockAlign = GetAlignment();
-                    bNoChange = TRUE;
+                    bNoChange = sal_True;
                 }
                 break;
             default:
@@ -1431,7 +1458,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
         if ( !bNoChange )
         {
             // alignment will change, test alignment according to distance of the docking rectangles edges
-            BOOL bForbidden = TRUE;
+            sal_Bool bForbidden = sal_True;
             if ( aInPosTL.X() <= 0)
             {
                 eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_LEFT);
@@ -1480,7 +1507,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
     }
     else if ( pImp->bSplitable )
     {
-        USHORT nLine, nPos;
+        sal_uInt16 nLine, nPos;
         SfxSplitWindow *pSplitWin = pWorkWin->GetSplitWindow_Impl(eDockAlign);
         aPos = pSplitWin->ScreenToOutputPixel( aPos );
         if ( pSplitWin->GetWindowPos( aPos, nLine, nPos ) )
@@ -1488,7 +1515,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
             // mouse over splitwindow, get line and position
             pImp->nDockLine = nLine;
             pImp->nDockPos = nPos;
-            pImp->bNewLine = FALSE;
+            pImp->bNewLine = sal_False;
         }
         else
         {
@@ -1508,18 +1535,18 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
                 // if this window is the only one in the last line, it can't be docked as new line in the same splitwindow
                 pImp->nDockLine = pImp->nLine;
                 pImp->nDockPos = pImp->nPos;
-                pImp->bNewLine = FALSE;
+                pImp->bNewLine = sal_False;
             }
             else
             {
                 // create new line
                 pImp->nDockLine = pSplitWin->GetLineCount();
                 pImp->nDockPos = 0;
-                pImp->bNewLine = TRUE;
+                pImp->bNewLine = sal_True;
             }
         }
 
-        BOOL bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment();
+        sal_Bool bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment();
         if ( !bChanged && !IsFloatingMode() )
         {
             // window only sightly moved, no change of any property
@@ -1705,7 +1732,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxDockingWindow::Close()
+sal_Bool SfxDockingWindow::Close()
 
 /*	[Beschreibung]
 
@@ -1720,12 +1747,12 @@ BOOL SfxDockingWindow::Close()
     // Execute mit Parametern, da Toggle von einigen ChildWindows ignoriert
     // werden kann
     if ( !pMgr )
-        return TRUE;
+        return sal_True;
 
-    SfxBoolItem aValue( pMgr->GetType(), FALSE);
+    SfxBoolItem aValue( pMgr->GetType(), sal_False);
     pBindings->GetDispatcher_Impl()->Execute(
         pMgr->GetType(), SFX_CALLMODE_RECORD | SFX_CALLMODE_ASYNCHRON, &aValue, 0L );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1823,21 +1850,21 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
             pMgr->Activate_Impl();
 
         Window* pWindow = rEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
 
         // In VCL geht Notify zun"achst an das Fenster selbst,
         // also base class rufen, sonst erf"ahrt der parent nichts
         // if ( rEvt.GetWindow() == this )  PB: #i74693# not necessary any longer
         DockingWindow::Notify( rEvt );
-        return TRUE;
+        return sal_True;
     }
     else if( rEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -1845,7 +1872,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
         if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() )
             // dann auch global g"ultige Acceleratoren verwenden
             return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() );
-        return TRUE;
+        return sal_True;
     }
     else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
     {
@@ -1857,9 +1884,9 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
 }
 
 
-USHORT SfxDockingWindow::GetWinBits_Impl() const
+sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const
 {
-    USHORT nBits = 0;
+    sal_uInt16 nBits = 0;
     return nBits;
 }
 
@@ -1890,27 +1917,27 @@ void SfxDockingWindow::Reappear_Impl()
     }
 }
 
-BOOL SfxDockingWindow::IsAutoHide_Impl() const
+sal_Bool SfxDockingWindow::IsAutoHide_Impl() const
 {
     if ( pImp->pSplitWin )
         return !pImp->pSplitWin->IsFadeIn();
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL SfxDockingWindow::IsPinned_Impl() const
+sal_Bool SfxDockingWindow::IsPinned_Impl() const
 {
     if ( pImp->pSplitWin )
         return pImp->pSplitWin->IsPinned();
     else
-        return TRUE;
+        return sal_True;
 }
-void SfxDockingWindow::AutoShow( BOOL bShow )
+void SfxDockingWindow::AutoShow( sal_Bool bShow )
 {
     AutoShow_Impl(bShow);
 }
 
-void SfxDockingWindow::AutoShow_Impl( BOOL bShow )
+void SfxDockingWindow::AutoShow_Impl( sal_Bool bShow )
 {
     if ( pImp->pSplitWin )
     {
@@ -1926,7 +1953,7 @@ SfxSplitWindow* SfxDockingWindow::GetSplitWindow_Impl() const
     return pImp->pSplitWin;
 }
 
-void SfxDockingWindow::FadeIn( BOOL /*bFadeIn*/ )
+void SfxDockingWindow::FadeIn( sal_Bool /*bFadeIn*/ )
 {
 }
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 9793a279ac..6d4e2399df 100644..100755
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -80,7 +80,6 @@
 #include <unotools/viewoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/helpid.hrc>
-#include <svl/pickerhelper.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <ucbhelper/content.hxx>
@@ -93,13 +92,13 @@
 #include <sfx2/docfac.hxx>
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "filedlghelper.hrc"
 #include "filtergrouping.hxx"
 #include <sfx2/request.hxx>
 #include "filedlgimpl.hxx"
-
+#include <helpid.hrc>
 #include <sfxlocal.hrc>
 
 //-----------------------------------------------------------------------------
@@ -222,55 +221,55 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
 {
     //!!! todo: cache the help strings (here or TRA)
 
-    ULONG nHelpId = 0;
+    rtl::OString sHelpId;
     // mapping from element id -> help id
     switch ( aEvent.ElementId )
     {
         case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION :
-            nHelpId = HID_FILESAVE_AUTOEXTENSION;
+            sHelpId = HID_FILESAVE_AUTOEXTENSION;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD :
-            nHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
+            sHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS :
-            nHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
+            sHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_READONLY :
-            nHelpId = HID_FILEOPEN_READONLY;
+            sHelpId = HID_FILEOPEN_READONLY;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_LINK :
-            nHelpId = HID_FILEDLG_LINK_CB;
+            sHelpId = HID_FILEDLG_LINK_CB;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW :
-            nHelpId = HID_FILEDLG_PREVIEW_CB;
+            sHelpId = HID_FILEDLG_PREVIEW_CB;
             break;
 
         case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY :
-            nHelpId = HID_FILESAVE_DOPLAY;
+            sHelpId = HID_FILESAVE_DOPLAY;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_VERSION :
-            nHelpId = HID_FILEOPEN_VERSION;
+            sHelpId = HID_FILEOPEN_VERSION;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE :
-            nHelpId = HID_FILESAVE_TEMPLATE;
+            sHelpId = HID_FILESAVE_TEMPLATE;
             break;
 
         case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL :
         case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE :
-            nHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
+            sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
             break;
 
         case ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
-            nHelpId = HID_FILESAVE_SELECTION;
+            sHelpId = HID_FILESAVE_SELECTION;
             break;
 
         default:
@@ -280,7 +279,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
     OUString aHelpText;
     Help* pHelp = Application::GetHelp();
     if ( pHelp )
-        aHelpText = String( pHelp->GetHelpText( nHelpId, NULL ) );
+        aHelpText = String( pHelp->GetHelpText( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8), NULL ) );
     return aHelpText;
 }
 
@@ -1169,7 +1168,7 @@ void SAL_CALL PickerThread_Impl::run()
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     DBG_ASSERT( _pControlId && _pHelpId, "FileDialogHelper_Impl::setControlHelpIds: invalid array pointers!" );
     if ( !_pControlId || !_pHelpId )
@@ -1178,17 +1177,16 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
     // forward these ids to the file picker
     try
     {
-        const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
+        const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) );
         // the ids for the single controls
         uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY );
         if ( xControlAccess.is() )
         {
             while ( *_pControlId )
             {
-                // calc the help id of the element
+                DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
                 ::rtl::OUString sId( sHelpIdPrefix );
-                sId += ::rtl::OUString::valueOf( *_pHelpId );
-                // set the help id
+                sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 );
                 xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) );
 
                 ++_pControlId; ++_pHelpId;
@@ -1202,12 +1200,6 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setDialogHelpId( const sal_Int32 _nHelpId )
-{
-    svt::SetDialogHelpId( mxFileDlg, _nHelpId );
-}
-
-// ------------------------------------------------------------------------
 IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN )
 {
     (void)NOTINTERESTEDIN;
@@ -1362,8 +1354,8 @@ void lcl_saveLastURLs(SvStringsDtor*&                                    rpURLLi
                       ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs )
 {
     lLastURLs.clear();
-    USHORT c = rpURLList->Count();
-    USHORT i = 0;
+    sal_uInt16 c = rpURLList->Count();
+    sal_uInt16 i = 0;
     for (i=0; i<c; ++i)
         lLastURLs.push_back(*(rpURLList->GetObject(i)));
 }
@@ -1451,22 +1443,24 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
         // check password checkbox if the document had password before
         if( mbHasPassword )
         {
-            SFX_ITEMSET_ARG( rpSet, pPassItem, SfxStringItem, SID_PASSWORD, FALSE );
-            mbPwdCheckBoxState = ( pPassItem != NULL );
+            SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, sal_False );
+            mbPwdCheckBoxState = ( pPassItem != NULL && pPassItem->GetValue() );
 
             // in case the document has password to modify, the dialog should be shown
-            SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, FALSE );
+            SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False );
             mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() );
         }
 
-        SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE );
+        SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False );
         if ( pSelectItem )
             mbSelection = pSelectItem->GetValue();
         else
             mbSelectionEnabled = sal_False;
 
         // the password will be set in case user decide so
+        rpSet->ClearItem( SID_PASSWORDINTERACTION );
         rpSet->ClearItem( SID_PASSWORD );
+        rpSet->ClearItem( SID_ENCRYPTIONDATA );
         rpSet->ClearItem( SID_RECOMMENDREADONLY );
         rpSet->ClearItem( SID_MODIFYPASSWORDINFO );
 
@@ -1581,7 +1575,30 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
                         if ( pPasswordRequest->isPassword() )
                         {
                             if ( pPasswordRequest->getPassword().getLength() )
-                                rpSet->Put( SfxStringItem( SID_PASSWORD, pPasswordRequest->getPassword() ) );
+                            {
+                                // TODO/LATER: The filters should show the password dialog themself in future
+                                if ( bMSType )
+                                {
+                                    // all the current MS-filters use MSCodec_Std97 implementation
+                                    uno::Sequence< sal_Int8 > aUniqueID = ::comphelper::DocPasswordHelper::GenerateRandomByteSequence( 16 );
+                                    uno::Sequence< sal_Int8 > aEncryptionKey = ::comphelper::DocPasswordHelper::GenerateStd97Key( pPasswordRequest->getPassword(), aUniqueID );
+
+                                    if ( aEncryptionKey.getLength() )
+                                    {
+                                        ::comphelper::SequenceAsHashMap aHashData;
+                                        aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= aEncryptionKey;
+                                        aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= aUniqueID;
+
+                                        rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) );
+                                    }
+                                    else
+                                        return ERRCODE_IO_NOTSUPPORTED;
+                                }
+                                else
+                                {
+                                    rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( ::comphelper::OStorageHelper::CreatePackageEncryptionData( pPasswordRequest->getPassword() ) ) ) );
+                                }
+                            }
 
                             if ( pPasswordRequest->getRecommendReadOnly() )
                                 rpSet->Put( SfxBoolItem( SID_RECOMMENDREADONLY, sal_True ) );
@@ -1790,7 +1807,16 @@ void FileDialogHelper_Impl::addFilters( sal_Int64 nFlags,
     sQuery.appendAscii(":eflags="                                       );
     sQuery.append     (::rtl::OUString::valueOf((sal_Int32)m_nDontFlags));
 
-    uno::Reference< XEnumeration > xResult = xFilterCont->createSubSetEnumerationByQuery(sQuery.makeStringAndClear());
+    uno::Reference< XEnumeration > xResult;
+    try
+    {
+        xResult = xFilterCont->createSubSetEnumerationByQuery(sQuery.makeStringAndClear());
+    }
+    catch( uno::Exception& )
+    {    
+        DBG_ERRORFILE( "Could not get filters from the configuration!" );
+    }
+
     TSortedFilterList         aIter   (xResult);
 
     // no matcher any longer used ...
@@ -1846,7 +1872,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
 
     // create the list of filters
     mpGraphicFilter = new GraphicFilter;
-    USHORT i, j, nCount = mpGraphicFilter->GetImportFormatCount();
+    sal_uInt16 i, j, nCount = mpGraphicFilter->GetImportFormatCount();
 
     // compute the extension string for all known import filters
     String aExtensions;
@@ -1855,7 +1881,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
     {
         j = 0;
         String sWildcard;
-        while( TRUE )
+        while( sal_True )
         {
             sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ );
             if ( !sWildcard.Len() )
@@ -1869,7 +1895,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
         }
     }
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     if ( aExtensions.Len() > 240 )
         aExtensions = DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL );
 #endif
@@ -1895,7 +1921,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
         String aExt;
         j = 0;
         String sWildcard;
-        while( TRUE )
+        while( sal_True )
         {
             sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ );
             if ( !sWildcard.Len() )
@@ -2373,17 +2399,11 @@ void FileDialogHelper::CreateMatcher( const String& rFactory )
 }
 
 // ------------------------------------------------------------------------
-void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
 {
     mpImp->setControlHelpIds( _pControlId, _pHelpId );
 }
 
-// ------------------------------------------------------------------------
-void FileDialogHelper::SetDialogHelpId( const sal_Int32 _nHelpId )
-{
-    mpImp->setDialogHelpId( _nHelpId );
-}
-
 void FileDialogHelper::SetContext( Context _eNewContext )
 {
     mpImp->SetContext( _eNewContext );
diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src
index e25fa400f4..e25fa400f4 100644..100755
--- a/sfx2/source/dialog/filedlghelper.src
+++ b/sfx2/source/dialog/filedlghelper.src
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 7974bf60a2..69669a3636 100644..100755
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -85,7 +85,7 @@ namespace sfx2
         SfxFilterFlags				m_nMustFlags;
         SfxFilterFlags				m_nDontFlags;
 
-        ULONG						mnPostUserEventId;
+        sal_uIntPtr						mnPostUserEventId;
 
         ErrCode 					mnError;
 
@@ -143,8 +143,7 @@ namespace sfx2
 
         void					correctVirtualDialogType();
 
-        void					setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
-        void					setDialogHelpId( const sal_Int32 _nHelpId );
+        void					setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
 
         sal_Bool 				CheckFilterOptionsCapability( const SfxFilter* _pFilter );
 
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 67e4150db0..233b856a5e 100644..100755
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -33,7 +33,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfac.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <osl/thread.h>
 #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx
index d34ec4d615..d34ec4d615 100644..100755
--- a/sfx2/source/dialog/filtergrouping.hxx
+++ b/sfx2/source/dialog/filtergrouping.hxx
diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx
index 0583899880..0583899880 100644..100755
--- a/sfx2/source/dialog/intro.cxx
+++ b/sfx2/source/dialog/intro.cxx
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 9fb8990d5a..0876115df2 100644..100755
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -53,31 +53,31 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl
 
 // ----------------------------------------------------------------------------
 
-USHORT ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot )
+sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
     return rItemSet.GetPool()->GetWhich( nSlot );
 }
 
-bool ItemWrapperHelper::IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot )
+bool ItemWrapperHelper::IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
-    return rItemSet.GetItemState( GetWhichId( rItemSet, nSlot ), TRUE ) != SFX_ITEM_UNKNOWN;
+    return rItemSet.GetItemState( GetWhichId( rItemSet, nSlot ), sal_True ) != SFX_ITEM_UNKNOWN;
 }
 
-const SfxPoolItem* ItemWrapperHelper::GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot )
+const SfxPoolItem* ItemWrapperHelper::GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
-    USHORT nWhich = GetWhichId( rItemSet, nSlot );
-    return (rItemSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_DEFAULT) ? rItemSet.GetItem( nWhich, TRUE ) : 0;
+    sal_uInt16 nWhich = GetWhichId( rItemSet, nSlot );
+    return (rItemSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_DEFAULT) ? rItemSet.GetItem( nWhich, sal_True ) : 0;
 }
 
-const SfxPoolItem& ItemWrapperHelper::GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot )
+const SfxPoolItem& ItemWrapperHelper::GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
     return rItemSet.GetPool()->GetDefaultItem( GetWhichId( rItemSet, nSlot ) );
 }
 
-void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot )
+void ItemWrapperHelper::RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot )
 {
-    USHORT nWhich = GetWhichId( rDestSet, nSlot );
-    if( rOldSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_DEFAULT )
+    sal_uInt16 nWhich = GetWhichId( rDestSet, nSlot );
+    if( rOldSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_DEFAULT )
         rDestSet.ClearItem( nWhich );
 }
 
@@ -134,12 +134,12 @@ void CheckBoxWrapper::SetControlDontKnow( bool bSet )
     GetControl().SetState( bSet ? STATE_DONTKNOW : STATE_NOCHECK );
 }
 
-BOOL CheckBoxWrapper::GetControlValue() const
+sal_Bool CheckBoxWrapper::GetControlValue() const
 {
     return GetControl().IsChecked();
 }
 
-void CheckBoxWrapper::SetControlValue( BOOL bValue )
+void CheckBoxWrapper::SetControlValue( sal_Bool bValue )
 {
     GetControl().Check( bValue );
 }
@@ -303,7 +303,7 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const
 // Standard connections
 // ============================================================================
 
-DummyItemConnection::DummyItemConnection( USHORT nSlot, Window& rWindow, ItemConnFlags nFlags ) :
+DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) :
     ItemConnectionBase( nFlags ),
     DummyWindowWrapper( rWindow ),
     mnSlot( nSlot )
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index bff3f057fa..62c8e5b471 100644..100755
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -52,19 +52,19 @@
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-
 #include <rtl/textenc.h>
 #include <rtl/uri.h>
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <mailmodelapi.hxx>
+#include <sfx2/mailmodelapi.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxsids.hrc>
 #include "dialog.hrc"
 
@@ -81,6 +81,7 @@
 #include <comphelper/mediadescriptor.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <cppuhelper/implbase1.hxx>
 
 // --------------------------------------------------------------
 using namespace ::com::sun::star;
@@ -95,6 +96,54 @@ using namespace ::com::sun::star::system;
 using namespace ::rtl;
 
 namespace css = ::com::sun::star;
+// - class PrepareListener_Impl ------------------------------------------
+class PrepareListener_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+{
+    bool m_bState;
+public:
+        PrepareListener_Impl();
+        virtual ~PrepareListener_Impl();
+
+        // css.frame.XStatusListener
+        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent)
+          throw(css::uno::RuntimeException);
+
+        // css.lang.XEventListener
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
+          throw(css::uno::RuntimeException);
+
+        bool IsSet() const {return m_bState;}
+};
+
+/*-- 25.08.2010 14:32:49---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+PrepareListener_Impl::PrepareListener_Impl() : 
+    m_bState( false )
+{
+}
+/*-- 25.08.2010 14:32:51---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+PrepareListener_Impl::~PrepareListener_Impl()
+{
+}
+/*-- 25.08.2010 14:32:51---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw(css::uno::RuntimeException)
+{
+    if( rEvent.IsEnabled ) 
+        rEvent.State >>= m_bState;
+    else
+        m_bState = sal_False;
+}
+/*-- 25.08.2010 14:32:52---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) throw(css::uno::RuntimeException)
+{
+}
 
 // class SfxMailModel -----------------------------------------------
 
@@ -537,46 +586,68 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
                 aArgs[nNumArgs-1].Value = css::uno::makeAny( aPassword );
             }
 
-            if ( bModified || !bHasLocation || bStoreTo )
+            bool bNeedsPreparation = false;
+            css::util::URL aPrepareURL;
+            css::uno::Reference< css::frame::XDispatch > xPrepareDispatch;
+            css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xFrame, css::uno::UNO_QUERY );
+            css::uno::Reference< css::util::XURLTransformer > xURLTransformer(
+                        xSMGR->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
+                        css::uno::UNO_QUERY );
+            if( !bSendAsPDF )
             {
-                // Document is modified, is newly created or should be stored in a special format
                 try
                 {
-                    css::uno::Reference< css::util::XURLTransformer > xURLTransformer(
-                        xSMGR->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                        css::uno::UNO_QUERY );
+                    // check if the document needs to be prepared for sending as mail (embedding of links, removal of invisible content)
 
-                    css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xFrame, css::uno::UNO_QUERY );
-                    css::uno::Reference< css::frame::XDispatch > xDispatch;
-
-                    css::util::URL aURL;
-                    css::uno::Sequence< css::beans::PropertyValue > aDispatchArgs;
+                    if ( xURLTransformer.is() )
+                    {
+                        aPrepareURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrepareMailExport" ));
+                        xURLTransformer->parseStrict( aPrepareURL );
+                    }
 
-                    if( !bSendAsPDF )
+                    if ( xDispatchProvider.is() )
                     {
-                        if ( xURLTransformer.is() )
+                        xPrepareDispatch = css::uno::Reference< css::frame::XDispatch >(
+                            xDispatchProvider->queryDispatch( aPrepareURL, ::rtl::OUString(), 0 ));
+                        if ( xPrepareDispatch.is() )
                         {
-                            aURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrepareMailExport" ));
-                            xURLTransformer->parseStrict( aURL );
+                                PrepareListener_Impl* pPrepareListener;
+                                uno::Reference< css::frame::XStatusListener > xStatusListener = pPrepareListener = new PrepareListener_Impl;
+                                xPrepareDispatch->addStatusListener( xStatusListener, aPrepareURL );
+                                bNeedsPreparation = pPrepareListener->IsSet();
+                                xPrepareDispatch->removeStatusListener( xStatusListener, aPrepareURL );
                         }
-
-                        if ( xDispatchProvider.is() )
+                    }
+                }
+                catch ( css::uno::RuntimeException& )
+                {
+                    throw;
+                }
+                catch ( css::uno::Exception& )
+                {
+                }
+            }
+            
+            if ( bModified || !bHasLocation || bStoreTo || bNeedsPreparation )
+            {
+                // Document is modified, is newly created or should be stored in a special format
+                try
+                {
+                    if( bNeedsPreparation && xPrepareDispatch.is() )
+                    {
+                        if ( xPrepareDispatch.is() )
                         {
-                            xDispatch = css::uno::Reference< css::frame::XDispatch >(
-                                xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ));
-                            if ( xDispatch.is() )
+                            try
+                            {
+                                css::uno::Sequence< css::beans::PropertyValue > aDispatchArgs;
+                                xPrepareDispatch->dispatch( aPrepareURL, aDispatchArgs );
+                            }
+                            catch ( css::uno::RuntimeException& )
+                            {
+                                throw;
+                            }
+                            catch ( css::uno::Exception& )
                             {
-                                try
-                                {
-                                    xDispatch->dispatch( aURL, aDispatchArgs );
-                                }
-                                catch ( css::uno::RuntimeException& )
-                                {
-                                    throw;
-                                }
-                                catch ( css::uno::Exception& )
-                                {
-                                }
                             }
                         }
                     }
@@ -598,6 +669,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
 
                     if( !bSendAsPDF )
                     {
+                        css::util::URL aURL;
                         // #i30432# notify that export is finished - the Writer may want to restore removed content
                         if ( xURLTransformer.is() )
                         {
@@ -607,12 +679,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
 
                         if ( xDispatchProvider.is() )
                         {
-                            xDispatch = css::uno::Reference< css::frame::XDispatch >(
+                            css::uno::Reference< css::frame::XDispatch > xDispatch = css::uno::Reference< css::frame::XDispatch >(
                                 xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ));
                             if ( xDispatch.is() )
                             {
                                 try
                                 {
+                                    css::uno::Sequence< css::beans::PropertyValue > aDispatchArgs;
                                     xDispatch->dispatch( aURL, aDispatchArgs );
                                 }
                                 catch ( css::uno::RuntimeException& )
@@ -904,7 +977,7 @@ SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Referenc
 
 // functions -------------------------------------------------------------
 
-BOOL CreateFromAddress_Impl( String& rFrom )
+sal_Bool CreateFromAddress_Impl( String& rFrom )
 
 /*	[Beschreibung]
 
@@ -915,8 +988,8 @@ BOOL CreateFromAddress_Impl( String& rFrom )
 
     [R"uckgabewert]
 
-    TRUE:	Adresse konnte erzeugt werden.
-    FALSE:	Adresse konnte nicht erzeugt werden.
+    sal_True:	Adresse konnte erzeugt werden.
+    sal_False:	Adresse konnte nicht erzeugt werden.
 */
 
 {
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
deleted file mode 100644
index 6c104a2c61..0000000000
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ /dev/null
@@ -1,673 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-// includes --------------------------------------------------------------
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/mozilla/XPluginInstance.hpp>
-#include <com/sun/star/ucb/XDataContainer.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
-#include <com/sun/star/system/SimpleMailClientFlags.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <rtl/textench.h>
-#include <osl/mutex.hxx>
-#include <rtl/uri.h>
-#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <unotools/streamhelper.hxx>
-#include <unotools/configitem.hxx>
-#include <comphelper/mediadescriptor.hxx>
-#include <osl/thread.hxx>
-#include <vcl/msgbox.hxx>
-
-#include "mailmodelapi.hxx"
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfac.hxx>
-#include "sfxtypes.hxx"
-
-#include "dialog.hrc"
-#include "sfxresid.hxx"
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/fcontnr.hxx>
-#include "guisaveas.hxx"
-
-#include <unotools/tempfile.hxx>
-#include <vcl/svapp.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <unotools/useroptions.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/extract.hxx>
-#include <ucbhelper/content.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
-
-extern sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, String& rPasswd );
-
-// --------------------------------------------------------------
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::mozilla;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::system;
-using namespace ::rtl;
-
-namespace
-{
-    // functions -------------------------------------------------------------
-
-    BOOL CreateFromAddress_Impl( String& rFrom )
-
-    /*	[Beschreibung]
-
-        Diese Funktion versucht mit Hilfe des IniManagers eine From-Adresse
-        zu erzeugen. daf"ur werden die Felder 'Vorname', 'Name' und 'EMail'
-        aus der Applikations-Ini-Datei ausgelesen. Sollten diese Felder
-        nicht gesetzt sein, wird FALSE zur"uckgegeben.
-
-        [R"uckgabewert]
-
-        TRUE:	Adresse konnte erzeugt werden.
-        FALSE:	Adresse konnte nicht erzeugt werden.
-    */
-
-    {
-        SvtUserOptions aUserCFG;
-        String aName		= aUserCFG.GetLastName	();
-        String aFirstName	= aUserCFG.GetFirstName	();
-        if ( aFirstName.Len() || aName.Len() )
-        {
-            if ( aFirstName.Len() )
-            {
-                rFrom = TRIM( aFirstName );
-
-                if ( aName.Len() )
-                    rFrom += ' ';
-            }
-            rFrom += TRIM( aName );
-            // unerlaubte Zeichen entfernen
-            rFrom.EraseAllChars( '<' );
-            rFrom.EraseAllChars( '>' );
-            rFrom.EraseAllChars( '@' );
-        }
-        String aEmailName = aUserCFG.GetEmail();
-        // unerlaubte Zeichen entfernen
-        aEmailName.EraseAllChars( '<' );
-        aEmailName.EraseAllChars( '>' );
-
-        if ( aEmailName.Len() )
-        {
-            if ( rFrom.Len() )
-                rFrom += ' ';
-            ( ( rFrom += '<' ) += TRIM( aEmailName ) ) += '>';
-        }
-        else
-            rFrom.Erase();
-        return ( rFrom.Len() > 0 );
-    }
-
-}
-
-// class osl::Thread
-class OMailSendThreadImpl : public ::osl::Thread
-{
-    public:
-        OMailSendThreadImpl(
-                Reference< XSimpleMailClient > xSimpleMailClient,
-                Reference< XSimpleMailMessage > xSimpleMailMessage,
-                const Reference< XFrame >&	_xCurrentFrame,
-                long nSendFlags ) :
-            m_nSendFlags( nSendFlags ),
-            m_bSend( sal_False ),
-            m_xSimpleMailClient( xSimpleMailClient ),
-            m_xSimpleMailMessage( xSimpleMailMessage ),
-            m_xCurrentFrame(_xCurrentFrame) {}
-
-        virtual ~OMailSendThreadImpl();
-
-        virtual void SAL_CALL run();
-        virtual void SAL_CALL onTerminated();
-
-    private:
-        long		m_nSendFlags;
-        sal_Bool	m_bSend;
-        Reference< XSimpleMailClient > m_xSimpleMailClient;
-        Reference< XSimpleMailMessage > m_xSimpleMailMessage;
-        Reference< XFrame >	m_xCurrentFrame;
-};
-
-OMailSendThreadImpl::~OMailSendThreadImpl()
-{
-}
-
-void SAL_CALL OMailSendThreadImpl::run()
-{
-    try
-    {
-        m_xSimpleMailClient->sendSimpleMailMessage( m_xSimpleMailMessage, m_nSendFlags );
-        m_bSend = sal_True;
-    }
-    catch ( IllegalArgumentException& )
-    {
-        m_bSend = sal_False;
-    }
-    catch ( Exception& )
-    {
-        m_bSend = sal_False;
-    }
-
-    if ( m_bSend == sal_False )
-    {
-        SolarMutexGuard aGuard;
-        Reference< ::com::sun::star::awt::XWindow > xParentWindow = m_xCurrentFrame->getContainerWindow();
-        Window*                                     pParentWindow = VCLUnoHelper::GetWindow( xParentWindow );
-
-        ErrorBox aBox( pParentWindow, SfxResId( RID_ERRBOX_MAIL_CONFIG ));
-        aBox.Execute();
-    }
-}
-
-void SAL_CALL OMailSendThreadImpl::onTerminated()
-{
-    delete this;
-}
-
-// class SfxMailModel -----------------------------------------------
-
-void SfxMailModel::ClearList( AddressList_Impl* pList )
-{
-    if ( pList )
-    {
-        for ( size_t i = 0, nCount = pList->size(); i < nCount; ++i )
-            delete pList->at(i);
-        pList->clear();
-    }
-}
-
-void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
-{
-    rValueList.Erase();
-    if ( pList )
-    {
-        for ( size_t i = 0, nCount = pList->size(); i < nCount; ++i )
-        {
-            if ( rValueList.Len() > 0 )
-                rValueList += ',';
-            rValueList += *pList->at(i);
-        }
-    }
-}
-namespace
-{
-    String lcl_getFactoryName(const Reference<XInterface>& _xModel)
-    {
-        rtl::OUString sModuleIdentifier;
-        rtl::OUString sFactoryShortName;
-        Reference < XModuleManager > xModuleManager( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")) ), UNO_QUERY );
-
-        if ( _xModel.is() )
-        {
-            try
-            {
-                sModuleIdentifier = xModuleManager->identify( _xModel );
-            }
-            catch ( ::com::sun::star::frame::UnknownModuleException& )
-            {
-                DBG_WARNING( "SfxHelp::GetHelpModuleName_Impl(): unknown module (help in help?)" );
-            }
-            catch ( Exception& )
-            {
-                DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XModuleManager::identif        y()" );
-            }
-        }
-
-        return sModuleIdentifier;
-    }
-
-    String lcl_createTempFileName(const Reference < XModel >& _xModel,const ::rtl::OUString& _sAttachmentTitle)
-    {
-    // create temp file name with leading chars and extension
-        Reference < XStorable > xStor( _xModel, UNO_QUERY );
-        String		aLeadingStr;
-        if ( xStor.is() )
-        {
-            sal_Bool	bHasName = xStor->hasLocation();
-
-            if ( !bHasName )
-            {
-                if ( _sAttachmentTitle.getLength() )
-                    aLeadingStr = _sAttachmentTitle;
-                else
-                    aLeadingStr = String( DEFINE_CONST_UNICODE("noname") );
-            }
-            else
-            {
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                {
-                    aFileObj.removeExtension();
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-                else
-                {
-                    if ( _sAttachmentTitle.getLength() )
-                        aLeadingStr = _sAttachmentTitle;
-                    else
-                        aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                    aLeadingStr += String::CreateFromAscii( "_" );
-                }
-            }
-        }
-        return aLeadingStr;
-    }
-
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult			eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // detect filter
-            const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel));
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String*		pExt = NULL;
-                INetURLObject aFileObj(_xModel->getURL());
-                if ( aFileObj.hasExtension() )
-                    pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() );
-
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-
-                if ( pFilter && !pExt )
-                {
-                    pExt = new String( pFilter->GetWildcard()().GetToken(0) );
-                    // erase the '*' from the extension (e.g. "*.sdw")
-                    pExt->Erase( 0, 1 );
-                }
-
-                {
-                    ::utl::TempFile aTempFile( aLeadingStr, pExt );
-                    rFileName = aTempFile.GetURL();
-                }
-                delete pExt;
-                // save document to temp file
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                if ( pFilter )
-                {
-                    ::rtl::OUString sFilter(pFilter->GetFilterName());
-                    ::rtl::OUString sFilterName(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
-                    if ( !aMedia.createItemIfMissing(sFilterName,sFilter) )
-                        aMedia[sFilterName] <<= sFilter;
-                }
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-
-                ::rtl::OUString sSaveTo(RTL_CONSTASCII_USTRINGPARAM("SaveTo"));
-                if ( !aMedia.createItemIfMissing(sSaveTo,sal_True) )
-                    aMedia[sSaveTo] <<= sal_True;
-
-                ::rtl::OUString sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
-                if ( !aMedia.createItemIfMissing(sReadOnly,sal_False) )
-                    aMedia[sReadOnly] <<= sal_False;
-
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveAs")),aArgs, sal_False, ::rtl::OUString() );
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-            }
-
-            eRet = bRet ? SAVE_SUCCESSFULL : SAVE_ERROR;
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAttachmentTitle
-                                    , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
-                                    , String& rFileName)
-{
-    SaveResult eRet = SAVE_CANCELLED;
-    try
-    {
-        Reference<XModifiable> xMod(_xModel,UNO_QUERY);
-
-        // save the document
-        if ( xMod.is() )
-        {
-            // Get PDF Filter from document
-            ::rtl::OUString sPDFMediaType(RTL_CONSTASCII_USTRINGPARAM("application/pdf"));
-
-            sal_Bool bRet = sal_False;
-            // create temp file name with leading chars and extension
-            Reference < XStorable > xStor( _xModel, UNO_QUERY );
-            if ( xStor.is() )
-            {
-                String aLeadingStr = lcl_createTempFileName(_xModel,_sAttachmentTitle);
-                String aPDFExtension = String::CreateFromAscii( ".pdf" );
-                ::utl::TempFile aTempFile( aLeadingStr, &aPDFExtension );
-
-                rFileName = aTempFile.GetURL();
-
-                // save document to temp file
-                Sequence < PropertyValue > aArgs( _xModel->getArgs() );
-                ::comphelper::MediaDescriptor aMedia(aArgs);
-
-                ::rtl::OUString sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
-                if ( !aMedia.createItemIfMissing(sMediaType,sPDFMediaType) )
-                    aMedia[sMediaType] <<= sPDFMediaType;
-
-                ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL"));
-                if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) )
-                    aMedia[sURL] <<= ::rtl::OUString(rFileName);
-                aMedia >> aArgs;
-
-                try
-                {
-                    Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-                    SfxStoringHelper aHelper(xMgr);
-                    aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportToPDF")),aArgs, sal_False, ::rtl::OUString);
-                    bRet = sal_True;
-                }
-                catch(Exception&)
-                {
-                }
-
-                eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
-            }
-        }
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception catched!");
-    }
-
-    return eRet;
-}
-// -----------------------------------------------------------------------------
-SfxMailModel::SendMailResult SfxMailModel::AttachDocument(   MailDocType _eMailDocType
-                                    , const Reference< XModel >& _xModel
-                                    , const ::rtl::OUString& _sAttachmentTitle)
-{
-    SaveResult eSaveResult;
-    String aFileName;
-
-    if ( _eMailDocType == TYPE_SELF )
-        eSaveResult = SaveDocument( _sAttachmentTitle,_xModel,aFileName);
-    else
-        eSaveResult = SaveDocAsPDF( _sAttachmentTitle,_xModel,aFileName);
-
-    if ( eSaveResult == SAVE_SUCCESSFULL && aFileName.Len() )
-        maAttachedDocuments.push_back(aFileName);
-    return eSaveResult == SAVE_SUCCESSFULL ? SEND_MAIL_OK : SEND_MAIL_ERROR;
-}
-// -----------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxMailModel, DoneHdl, void*, EMPTYARG )
-{
-    mbLoadDone = sal_True;
-    return 0;
-}
-// -----------------------------------------------------------------------------
-IMPL_LINK_INLINE_END( SfxMailModel, DoneHdl, void*, EMPTYARG )
-
-SfxMailModel::SfxMailModel( const Reference< XFrame >& _xFrame) :
-
-    mpToList	( NULL ),
-    mpCcList	( NULL ),
-    mpBccList	( NULL ),
-    m_xCurrentFrame	( _xFrame ),
-    mePriority	( PRIO_NORMAL ),
-    mbLoadDone	( sal_True )
-
-{
-}
-
-SfxMailModel::~SfxMailModel()
-{
-    ClearList( mpToList );
-    delete mpToList;
-    ClearList( mpCcList );
-    delete mpCcList;
-    ClearList( mpBccList );
-    delete mpBccList;
-}
-
-void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole )
-{
-    // don't add a empty address
-    if ( rAddress.Len() > 0 )
-    {
-        AddressList_Impl* pList = NULL;
-        if ( ROLE_TO == eRole )
-        {
-            if ( !mpToList )
-                // create the list
-                mpToList = new AddressList_Impl();
-            pList = mpToList;
-        }
-        else if ( ROLE_CC == eRole )
-        {
-            if ( !mpCcList )
-                // create the list
-                mpCcList = new AddressList_Impl();
-            pList = mpCcList;
-        }
-        else if ( ROLE_BCC == eRole )
-        {
-            if ( !mpBccList )
-                // create the list
-                mpBccList = new AddressList_Impl();
-            pList = mpBccList;
-        }
-        else
-        {
-            DBG_ERRORFILE( "invalid address role" );
-        }
-
-        if ( pList )
-        {
-            // add address to list
-            AddressItemPtr_Impl pAddress = new String( rAddress );
-            pList->push_back( pAddress );
-        }
-    }
-}
-
-SfxMailModel::SendMailResult SfxMailModel::Send( )
-{
-    OSL_ENSURE(!maAttachedDocuments.empty(),"No document added!");
-    SendMailResult	eResult = SEND_MAIL_ERROR;
-    if ( !maAttachedDocuments.empty() )
-    {
-
-        Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
-        if ( xMgr.is() )
-        {
-            Reference< XSimpleMailClientSupplier >	xSimpleMailClientSupplier;
-
-            // Prefer the SimpleSystemMail service if available
-            xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))),
-                UNO_QUERY );
-
-            if ( ! xSimpleMailClientSupplier.is() )
-            {
-                xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >(
-                    xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleCommandMail" ))),
-                    UNO_QUERY );
-            }
-
-            if ( xSimpleMailClientSupplier.is() )
-            {
-                Reference< XSimpleMailClient > xSimpleMailClient = xSimpleMailClientSupplier->querySimpleMailClient();
-
-                if ( !xSimpleMailClient.is() )
-                {
-                    // no mail client support => message box!
-                    return SEND_MAIL_ERROR;
-                }
-
-                // we have a simple mail client
-                Reference< XSimpleMailMessage > xSimpleMailMessage = xSimpleMailClient->createSimpleMailMessage();
-                if ( xSimpleMailMessage.is() )
-                {
-                    sal_Int32 nSendFlags = SimpleMailClientFlags::DEFAULTS;
-                    if ( maFromAddress.Len() == 0 )
-                    {
-                        // from address not set, try figure out users e-mail address
-                        CreateFromAddress_Impl( maFromAddress );
-                    }
-                    xSimpleMailMessage->setOriginator( maFromAddress );
-
-                    sal_Int32 nToCount		= mpToList ? mpToList->Count() : 0;
-                    sal_Int32 nCcCount		= mpCcList ? mpCcList->Count() : 0;
-                    sal_Int32 nCcSeqCount	= nCcCount;
-
-                    // set recipient (only one) for this simple mail server!!
-                    if ( nToCount > 1 )
-                    {
-                        nCcSeqCount = nToCount - 1 + nCcCount;
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-                    else if ( nToCount == 1 )
-                    {
-                        xSimpleMailMessage->setRecipient( *mpToList->GetObject( 0 ));
-                        nSendFlags = SimpleMailClientFlags::NO_USER_INTERFACE;
-                    }
-
-                    // all other recipient must be handled with CC recipients!
-                    if ( nCcSeqCount > 0 )
-                    {
-                        sal_Int32				nIndex = 0;
-                        Sequence< OUString >	aCcRecipientSeq;
-
-                        aCcRecipientSeq.realloc( nCcSeqCount );
-                        if ( nCcSeqCount > nCcCount )
-                        {
-                            for ( sal_Int32 i = 1; i < nToCount; ++i )
-                            {
-                                aCcRecipientSeq[nIndex++] = *mpToList->GetObject(i);
-                            }
-                        }
-
-                        for ( sal_Int32 i = 0; i < nCcCount; i++ )
-                        {
-                            aCcRecipientSeq[nIndex++] = *mpCcList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setCcRecipient( aCcRecipientSeq );
-                    }
-
-                    sal_Int32 nBccCount = mpBccList ? mpBccList->Count() : 0;
-                    if ( nBccCount > 0 )
-                    {
-                        Sequence< OUString > aBccRecipientSeq( nBccCount );
-                        for ( sal_Int32 i = 0; i < nBccCount; ++i )
-                        {
-                            aBccRecipientSeq[i] = *mpBccList->GetObject(i);
-                        }
-                        xSimpleMailMessage->setBccRecipient( aBccRecipientSeq );
-                    }
-
-                    Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size());
-
-                    xSimpleMailMessage->setSubject( maSubject );
-                    xSimpleMailMessage->setAttachement( aAttachmentSeq );
-
-                    // Due to the current clipboard implementation we cannot stop the main thread
-                    // because the clipboard implementation calls the main thread from another thread
-                    // and this would result in a deadlock!
-                    // Currently we create a thread to send a message and process all remaining error
-                    // handling in this thread!!
-
-                    OMailSendThreadImpl* pMailSendThread = new OMailSendThreadImpl( xSimpleMailClient, xSimpleMailMessage, m_xCurrentFrame,nSendFlags );
-                    pMailSendThread->create();
-
-                    // Return always true as the real error handling occurss in the OMailSendThreadImpl-implementation!
-                    eResult = SEND_MAIL_OK;
-                }
-            }
-        }
-    }
-    else
-        eResult = SEND_MAIL_CANCELLED;
-
-    return eResult;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/mailwindow.src b/sfx2/source/dialog/mailwindow.src
index c54d513393..c54d513393 100644..100755
--- a/sfx2/source/dialog/mailwindow.src
+++ b/sfx2/source/dialog/mailwindow.src
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
deleted file mode 100755
index d223d5845c..0000000000
--- a/sfx2/source/dialog/makefile.mk
+++ /dev/null
@@ -1,115 +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=sfx2
-TARGET=dialog
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/about.obj		\
-        $(SLO)$/alienwarn.obj		\
-        $(SLO)$/basedlgs.obj		\
-        $(SLO)$/dinfdlg.obj		\
-        $(SLO)$/dinfedt.obj		\
-        $(SLO)$/dockwin.obj		\
-        $(SLO)$/filedlghelper.obj	\
-        $(SLO)$/filtergrouping.obj	\
-        $(SLO)$/intro.obj		\
-        $(SLO)$/itemconnect.obj		\
-        $(SLO)$/mailmodel.obj		\
-        $(SLO)$/mgetempl.obj		\
-        $(SLO)$/navigat.obj		\
-        $(SLO)$/newstyle.obj		\
-        $(SLO)$/partwnd.obj		\
-        $(SLO)$/passwd.obj		\
-        $(SLO)$/printopt.obj		\
-        $(SLO)$/recfloat.obj		\
-        $(SLO)$/securitypage.obj	\
-        $(SLO)$/sfxdlg.obj		\
-        $(SLO)$/splitwin.obj		\
-        $(SLO)$/srchdlg.obj		\
-        $(SLO)$/styledlg.obj		\
-        $(SLO)$/tabdlg.obj		\
-        $(SLO)$/taskpane.obj		\
-        $(SLO)$/templdlg.obj		\
-        $(SLO)$/titledockwin.obj	\
-        $(SLO)$/tplcitem.obj		\
-        $(SLO)$/versdlg.obj
-
-SLOFILES =\
-        $(EXCEPTIONSFILES)		\
-        $(SLO)$/styfitem.obj		\
-        $(SLO)$/tplpitem.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        recfloat.src		\
-        alienwarn.src       \
-        dialog.src			\
-        dinfdlg.src			\
-        dinfedt.src			\
-        filedlghelper.src	\
-        mailwindow.src		\
-        mgetempl.src		\
-        newstyle.src		\
-        passwd.src			\
-        templdlg.src		\
-        versdlg.src			\
-        printopt.src        \
-        srchdlg.src         \
-        securitypage.src    \
-        titledockwin.src    \
-        taskpane.src
-
-.IF "$(BUILD_VER_STRING)"!=""
-.IF "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING='"$(BUILD_VER_STRING)"'
-.ELSE # "$(GUI)"=="UNX"
-CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")"
-.ENDIF # "$(GUI)"=="UNX"
-.ENDIF
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(INCCOM)$/cuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    $(RM) $@
-    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 22586be091..dd58acf07d 100644..100755
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -42,7 +42,7 @@
 #include <sfx2/mgetempl.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/module.hxx>
 
 #include <sfx2/sfx.hrc>
@@ -59,6 +59,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
 
     aNameFt		( this, SfxResId( FT_NAME ) ),
     aNameEd		( this, SfxResId( ED_NAME ) ),
+    aNameMLE	( this, SfxResId( MLE_NAME ) ),
     aAutoCB     ( this, SfxResId( CB_AUTO ) ),
 
     aFollowFt	( this, SfxResId( FT_NEXT ) ),
@@ -70,14 +71,14 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
     aFilterFt	( this, SfxResId( FT_REGION ) ),
     aFilterLb	( this, SfxResId( LB_REGION ) ),
 
+    aDescGb		( this, SfxResId( GB_DESC ) ),
     aDescFt		( this, SfxResId( FT_DESC ) ),
     aDescED		( this, SfxResId( ED_DESC ) ),
-    aDescGb		( this, SfxResId( GB_DESC ) ),
 
     pStyle( &( (SfxStyleDialog*)pParent->GetParent() )->GetStyleSheet() ),
 
     pItem		( 0 ),
-    bModified	( FALSE ),
+    bModified	( sal_False ),
     aName		( pStyle->GetName() ),
     aFollow		( pStyle->GetFollow() ),
     aParent		( pStyle->GetParent() ),
@@ -123,7 +124,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
     {
         // NullString als Name -> Name generieren
         String aNoName( SfxResId( STR_NONAME ) );
-        USHORT nNo = 1;
+        sal_uInt16 nNo = 1;
         String aNo( aNoName );
         aNoName += String::CreateFromInt32( nNo );
         while ( pPool->Find( aNoName ) )
@@ -139,8 +140,17 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
     }
     aNameEd.SetText(pStyle->GetName());
 
-    if ( !pStyle->IsUserDefined() )
+    // Set the field read-only if it is NOT an user-defined style
+    // but allow selecting and copying
+    if ( !pStyle->IsUserDefined() ) {
         aNameEd.SetReadOnly();
+        aNameEd.Hide();
+
+        aNameMLE.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
+        aNameMLE.SetText( pStyle->GetName() );
+        aNameMLE.EnableCursor( sal_False );
+        aNameMLE.Show();
+    }
 
     if ( pStyle->HasFollowSupport() && pPool )
     {
@@ -203,12 +213,12 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
 
     if ( i < nCount )
     {
-        USHORT nStyleFilterIdx = 0xffff;
+        sal_uInt16 nStyleFilterIdx = 0xffff;
         // Filterflags
         const SfxStyleFilter& rList = pItem->GetFilterList();
         nCount = rList.size();
-        USHORT nIdx = 0;
-        USHORT nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
+        sal_uInt16 nIdx = 0;
+        sal_uInt16 nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
 
         if ( !nMask )	// Benutzervorlage?
             nMask = pStyle->GetMask();
@@ -297,7 +307,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
     if ( pBox->IsEnabled() )
     {
         // ist der aktuelle Eintrag, dessen Namen modifizieren wurde
-        const BOOL bSelect = pBox->GetSelectEntry() == aBuf;
+        const sal_Bool bSelect = pBox->GetSelectEntry() == aBuf;
         pBox->RemoveEntry( aBuf );
         pBox->InsertEntry( rNew );
 
@@ -382,7 +392,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 
 /*  [Beschreibung]
     Handler f"ur das Setzen der (modifizierten) Daten. Wird aus
@@ -392,9 +402,9 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
     SfxItemSet &rAttrSet		das Set, das die Daten entgegennimmt.
 
     [R"uckgabewert]
-    BOOL						TRUE:  es hat eine "Anderung der Daten
+    sal_Bool						sal_True:  es hat eine "Anderung der Daten
                                        stattgefunden
-                                FALSE: es hat keine "Anderung der Daten
+                                    sal_False: es hat keine "Anderung der Daten
                                        stattgefunden
 
     [Querverweise]
@@ -402,7 +412,7 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 */
 
 {
-    const USHORT nFilterIdx = aFilterLb.GetSelectEntryPos();
+    const sal_uInt16 nFilterIdx = aFilterLb.GetSelectEntryPos();
 
     // Filter setzen
 
@@ -410,14 +420,14 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
          nFilterIdx != aFilterLb.GetSavedValue() 	&&
          aFilterLb.IsEnabled() )
     {
-        bModified = TRUE;
+        bModified = sal_True;
         DBG_ASSERT( pItem, "kein Item" );
         // geht nur bei Benutzervorlagen
 #if OSL_DEBUG_LEVEL > 1
-        USHORT nIdx = (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx );
+        sal_uInt16 nIdx = (sal_uInt16)(long)aFilterLb.GetEntryData( nFilterIdx );
         SfxFilterTupel* p = pItem->GetFilterList()[ nIdx ];
 #endif
-        USHORT nMask = pItem->GetFilterList()[ (size_t)aFilterLb.GetEntryData( nFilterIdx ) ]->nFlags | SFXSTYLEBIT_USERDEF;
+        sal_uInt16 nMask = pItem->GetFilterList()[ (size_t)aFilterLb.GetEntryData( nFilterIdx ) ]->nFlags | SFXSTYLEBIT_USERDEF;
         pStyle->SetMask( nMask );
     }
     if(aAutoCB.IsVisible() &&
@@ -444,7 +454,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 */
 
 {
-    bModified = FALSE;
+    bModified = sal_False;
     String sCmp( pStyle->GetName() );
 
     if ( sCmp != aName )
@@ -486,7 +496,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 
     if ( aFilterLb.IsEnabled() )
     {
-        USHORT nCmp = pStyle->GetMask();
+        sal_uInt16 nCmp = pStyle->GetMask();
 
         if ( nCmp != nFlags )
             pStyle->SetMask( nFlags );
@@ -535,7 +545,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
     const SfxPoolItem* pPoolItem;
 
     if ( SFX_ITEM_SET ==
-         rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, FALSE, &pPoolItem ) )
+         rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, sal_False, &pPoolItem ) )
         aAutoCB.Check( ( (const SfxBoolItem*)pPoolItem )->GetValue() );
     aAutoCB.SaveValue();
 }
@@ -574,7 +584,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
             aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
             return SfxTabPage::KEEP_PAGE;
         }
-        bModified = TRUE;
+        bModified = sal_True;
     }
 
     if ( pStyle->HasFollowSupport() && aFollowLb.IsEnabled() )
@@ -590,7 +600,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
                 aFollowLb.GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
             }
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
 
@@ -610,7 +620,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
                 aBaseLb.GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
             }
-            bModified = TRUE;
+            bModified = sal_True;
             nRet |= (int)SfxTabPage::REFRESH_SET;
         }
     }
diff --git a/sfx2/source/dialog/mgetempl.hrc b/sfx2/source/dialog/mgetempl.hrc
index 950b748a88..cb07f9436b 100644..100755
--- a/sfx2/source/dialog/mgetempl.hrc
+++ b/sfx2/source/dialog/mgetempl.hrc
@@ -25,6 +25,7 @@
  *
  ************************************************************************/
 #define ED_NAME 2
+#define MLE_NAME 13
 #define LB_NEXT 4
 #define FT_BASE 5
 #define LB_BASE 6
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index a83fbcc5e1..73abe0dc3b 100644..100755
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -44,12 +44,22 @@ TabPage TP_MANAGE_STYLES
     };
     Edit ED_NAME
     {
+        HelpID = "sfx2:Edit:TP_MANAGE_STYLES:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 6  ) ;
         Size = MAP_APPFONT ( 184 , 12 ) ;
     };
+    MultiLineEdit MLE_NAME
+    {
+        Pos = MAP_APPFONT ( 70 , 8  ) ;
+        Size = MAP_APPFONT ( 80 , 12 ) ;
+        Border = FALSE;
+        ReadOnly = TRUE;
+        Hide = TRUE;
+    };
     CheckBox CB_AUTO
     {
+        HelpID = "sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO";
         Pos = MAP_APPFONT ( 164 , 8 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Hide = TRUE ;
@@ -63,6 +73,7 @@ TabPage TP_MANAGE_STYLES
     };
     ListBox LB_NEXT
     {
+        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 24 ) ;
         Size = MAP_APPFONT ( 184 , 65 ) ;
@@ -77,6 +88,7 @@ TabPage TP_MANAGE_STYLES
     };
     ListBox LB_BASE
     {
+        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 42 ) ;
         Size = MAP_APPFONT ( 184 , 65 ) ;
@@ -91,6 +103,7 @@ TabPage TP_MANAGE_STYLES
     };
     ListBox LB_REGION
     {
+        HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 60 ) ;
         Size = MAP_APPFONT ( 184 , 64 ) ;
@@ -105,6 +118,7 @@ TabPage TP_MANAGE_STYLES
     };
     MultiLineEdit ED_DESC
     {
+        HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC";
         Pos = MAP_APPFONT ( 12 , 88  ) ;
         Size = MAP_APPFONT ( 236 , 85 ) ;
         ReadOnly = TRUE ;
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index c8f6174588..e13da84c88 100644..100755
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -34,13 +34,13 @@
 #include <sfx2/navigat.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "helpid.hrc"
 
 SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR );
 
 SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd , nId )
@@ -53,7 +53,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
     pWindow->SetOutputSizePixel( Size( 270, 240 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,
@@ -86,14 +86,14 @@ void SfxNavigator::Resizing( Size &rSize )
         pCon->Resizing( rSize );
 }
 
-BOOL SfxNavigator::Close()
+sal_Bool SfxNavigator::Close()
 {
     SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl();
     DBG_ASSERT( pCon, "Kein Context!" );
     if ( !pCon || pCon->Close() )
         return SfxDockingWindow::Close();
     else
-        return FALSE;
+        return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 0efa5b08f1..5dfd8d04d4 100644..100755
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/newstyle.hxx>
 #include "dialog.hrc"
 #include "newstyle.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 // PRIVATE METHODES ------------------------------------------------------
 
@@ -90,6 +90,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool
     aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
     aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl));
     aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
+    aColBox.SetAccessibleName(SfxResId(FL_COL));
 
     SfxStyleSheetBase *pStyle = rPool.First();
     while ( pStyle )
diff --git a/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc
index 1720c39599..1720c39599 100644..100755
--- a/sfx2/source/dialog/newstyle.hrc
+++ b/sfx2/source/dialog/newstyle.hrc
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index b691c64fa7..28dddf7fd6 100644..100755
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -28,10 +28,11 @@
 #include <sfx2/sfx.hrc>
 #include "dialog.hrc"
 #include "newstyle.hrc"
+#include "sfx2/sfxcommands.h"
 
 ModalDialog DLG_NEW_STYLE_BY_EXAMPLE
 {
-    HelpId = SID_STYLE_NEW_BY_EXAMPLE ;
+    HelpId = CMD_SID_STYLE_NEW_BY_EXAMPLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 177 , 112 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE
     };
     ComboBox LB_COL
     {
+        HelpID = "sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 94 , 92 ) ;
         TabStop = TRUE ;
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 517dd0255e..9ddf814b09 100644..100755
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -81,7 +81,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
     pWindow->SetSizePixel( Size( 175, 175 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 80cde5441e..9da5724085 100644..100755
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -34,20 +34,21 @@
 
 #include <sfx2/passwd.hxx>
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "dialog.hrc"
 #include "passwd.hrc"
 
 #include "vcl/sound.hxx"
+#include "vcl/arrange.hxx"
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
+IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
 {
-    if( mbAsciiOnly )
+    if( mbAsciiOnly && (pEdit == &maPasswordED || pEdit == &maPassword2ED) )
     {
-        rtl::OUString aTest( maPasswordED.GetText() );
+        rtl::OUString aTest( pEdit->GetText() );
         const sal_Unicode* pTest = aTest.getStr();
         sal_Int32 nLen = aTest.getLength();
         rtl::OUStringBuffer aFilter( nLen );
@@ -63,12 +64,15 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
         if( bReset )
         {
             Sound::Beep( SOUND_ERROR );
-            maPasswordED.SetSelection( Selection( 0, nLen ) );
-            maPasswordED.ReplaceSelected( aFilter.makeStringAndClear() );
+            pEdit->SetSelection( Selection( 0, nLen ) );
+            pEdit->ReplaceSelected( aFilter.makeStringAndClear() );
         }
         
     }
-    maOKBtn.Enable( maPasswordED.GetText().Len() >= mnMinLen );
+    bool bEnable = maPasswordED.GetText().Len() >= mnMinLen;
+    if( maPassword2ED.IsVisible() )
+        bEnable = (bEnable && (maPassword2ED.GetText().Len() >= mnMinLen));
+    maOKBtn.Enable( bEnable );
     return 0;
 }
 IMPL_LINK_INLINE_END( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
@@ -77,8 +81,11 @@ IMPL_LINK_INLINE_END( SfxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
 
 IMPL_LINK( SfxPasswordDialog, OKHdl, OKButton *, EMPTYARG )
 {
-    if ( ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) &&
-         ( GetConfirm() != GetPassword() ) )
+    bool bConfirmFailed = ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) &&
+                            ( GetConfirm() != GetPassword() );
+    if( ( mnExtras & SHOWEXTRAS_CONFIRM2 ) == SHOWEXTRAS_CONFIRM2 && ( GetConfirm2() != GetPassword2() ) )
+        bConfirmFailed = true;
+    if ( bConfirmFailed )
     {
         ErrorBox aBox( this, SfxResId( MSG_ERROR_WRONG_CONFIRM ) );
         aBox.Execute();
@@ -96,20 +103,24 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText
 
     ModalDialog( pParent, SfxResId ( DLG_PASSWD ) ),
 
+    maPasswordBox	( this, SfxResId( GB_PASSWD_PASSWORD ) ),
     maUserFT		( this, SfxResId( FT_PASSWD_USER ) ),
     maUserED		( this, SfxResId( ED_PASSWD_USER ) ),
     maPasswordFT	( this, SfxResId( FT_PASSWD_PASSWORD ) ),
     maPasswordED	( this, SfxResId( ED_PASSWD_PASSWORD ) ),
     maConfirmFT		( this, SfxResId( FT_PASSWD_CONFIRM ) ),
     maConfirmED		( this, SfxResId( ED_PASSWD_CONFIRM ) ),
+
     maMinLengthFT	( this, SfxResId( FT_PASSWD_MINLEN ) ),
-    maPasswordBox	( this, SfxResId( GB_PASSWD_PASSWORD ) ),
+    maPassword2Box	( this, 0 ),
+    maPassword2FT	( this, SfxResId( FT_PASSWD_PASSWORD2 ) ),
+    maPassword2ED	( this, SfxResId( ED_PASSWD_PASSWORD2 ) ),
+    maConfirm2FT	( this, SfxResId( FT_PASSWD_CONFIRM2 ) ),
+    maConfirm2ED	( this, SfxResId( ED_PASSWD_CONFIRM2 ) ),
     maOKBtn			( this, SfxResId( BTN_PASSWD_OK ) ),
     maCancelBtn		( this, SfxResId( BTN_PASSWD_CANCEL ) ),
     maHelpBtn		( this, SfxResId( BTN_PASSWD_HELP ) ),
-    maConfirmStr	( 		SfxResId( STR_PASSWD_CONFIRM ) ),
 
-    mnMinLen		( 5 ),
     maMinLenPwdStr	( SfxResId( STR_PASSWD_MIN_LEN ) ),
     maEmptyPwdStr	( SfxResId( STR_PASSWD_EMPTY ) ),
     maMainPwdStr    ( ),
@@ -117,10 +128,63 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText
     mbAsciiOnly     ( false )
 
 {
+    maPasswordED.SetAccessibleName(String(SfxResId(TEXT_PASSWD)));
     FreeResource();
+    
+    // setup layout
+    boost::shared_ptr<vcl::RowOrColumn> xLayout =
+        boost::dynamic_pointer_cast<vcl::RowOrColumn>( getLayout() );
+    xLayout->setOuterBorder( 0 );
+
+    // get edit size, should be used as minimum
+    Size aEditSize( maUserED.GetSizePixel() );
+
+    // add labelcolumn for the labeled edit fields
+    boost::shared_ptr<vcl::LabelColumn> xEdits( new vcl::LabelColumn( xLayout.get() ) );
+    size_t nChildIndex = xLayout->addChild( xEdits );
+    xLayout->setBorders( nChildIndex, -2, -2, -2, 0 );
+    
+    // add group box
+    xEdits->addWindow( &maPasswordBox );
+    
+    // add user line
+    xEdits->addRow( &maUserFT, &maUserED, -2, aEditSize );
+
+    // add password line
+    xEdits->addRow( &maPasswordFT, &maPasswordED, -2, aEditSize );
+
+    // add confirm line
+    xEdits->addRow( &maConfirmFT, &maConfirmED, -2, aEditSize );
+    
+    // add second group box
+    xEdits->addWindow( &maPassword2Box );
+
+    // add second password line
+    xEdits->addRow( &maPassword2FT, &maPassword2ED, -2, aEditSize );
+
+    // add second confirm line
+    xEdits->addRow( &maConfirm2FT, &maConfirm2ED, -2, aEditSize );
+    
+    // add a FixedLine
+    FixedLine* pLine = new FixedLine( this, 0 );
+    pLine->Show();
+    addWindow( pLine, true );
+    xLayout->addWindow( pLine );
+
+    // add button column
+    Size aBtnSize( maCancelBtn.GetSizePixel() );
+    boost::shared_ptr<vcl::RowOrColumn> xButtons( new vcl::RowOrColumn( xLayout.get(), false ) );
+    nChildIndex = xLayout->addChild( xButtons );
+    xLayout->setBorders( nChildIndex, -2, 0, -2, -2 );
+
+    size_t nBtnIndex = xButtons->addWindow( &maHelpBtn, 0, aBtnSize );
+    xButtons->addChild( new vcl::Spacer( xButtons.get() ) );
+    nBtnIndex = xButtons->addWindow( &maOKBtn, 0, aBtnSize );
+    nBtnIndex = xButtons->addWindow( &maCancelBtn, 0, aBtnSize );
 
     Link aLink = LINK( this, SfxPasswordDialog, EditModifyHdl );
     maPasswordED.SetModifyHdl( aLink );
+    maPassword2ED.SetModifyHdl( aLink );
     aLink = LINK( this, SfxPasswordDialog, OKHdl );
     maOKBtn.SetClickHdl( aLink );
 
@@ -149,7 +213,7 @@ void SfxPasswordDialog::SetPasswdText( )
 
 // -----------------------------------------------------------------------
 
-void SfxPasswordDialog::SetMinLen( USHORT nLen )
+void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
 {
     mnMinLen = nLen;
     SetPasswdText();
@@ -158,7 +222,7 @@ void SfxPasswordDialog::SetMinLen( USHORT nLen )
 
 // -----------------------------------------------------------------------
 
-void SfxPasswordDialog::SetMaxLen( USHORT nLen )
+void SfxPasswordDialog::SetMaxLen( sal_uInt16 nLen )
 {
     maPasswordED.SetMaxTextLen( nLen );
     maConfirmED.SetMaxTextLen( nLen );
@@ -169,8 +233,23 @@ void SfxPasswordDialog::SetMaxLen( USHORT nLen )
 
 short SfxPasswordDialog::Execute()
 {
-    if ( mnExtras < SHOWEXTRAS_ALL )
+    maUserFT.Hide();
+    maUserED.Hide();
+    maConfirmFT.Hide();
+    maConfirmED.Hide();
+    maPasswordFT.Hide();
+    maPassword2Box.Hide();
+    maPassword2FT.Hide();
+    maPassword2ED.Hide();
+    maPassword2FT.Hide();
+    maConfirm2FT.Hide();
+    maConfirm2ED.Hide();
+
+    if( mnExtras != SHOWEXTRAS_NONE )
+        maPasswordFT.Show();
+    if( (mnExtras & SHOWEXTRAS_USER ) )
     {
+#warning Inevitably this layout logic will be wrong post merge until we can see the dialog to test it.
         Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
         Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
         long nMinHeight = maHelpBtn.GetPosPixel().Y() +
@@ -229,7 +308,30 @@ short SfxPasswordDialog::Execute()
         Size aDlgSize = GetOutputSizePixel();
         aDlgSize.Height() = nDlgHeight;
         SetOutputSizePixel( aDlgSize );
+
+        maUserFT.Show();
+        maUserED.Show();
+    }
+    if( (mnExtras & SHOWEXTRAS_CONFIRM ) )
+    {
+        maConfirmFT.Show();
+        maConfirmED.Show();
+    }
+    if( (mnExtras & SHOWEXTRAS_PASSWORD2) )
+    {
+        maPassword2Box.Show();
+        maPassword2FT.Show();
+        maPassword2ED.Show();
+    }
+    if( (mnExtras & SHOWEXTRAS_CONFIRM2 ) )
+    {
+        maConfirm2FT.Show();
+        maConfirm2ED.Show();
     }
+    
+    boost::shared_ptr<vcl::RowOrColumn> xLayout =
+        boost::dynamic_pointer_cast<vcl::RowOrColumn>( getLayout() );
+    SetSizePixel( xLayout->getOptimalSize( WINDOWSIZE_PREFERRED ) );
 
     return ModalDialog::Execute();
 }
diff --git a/sfx2/source/dialog/passwd.hrc b/sfx2/source/dialog/passwd.hrc
index 059619a435..7927355922 100644..100755
--- a/sfx2/source/dialog/passwd.hrc
+++ b/sfx2/source/dialog/passwd.hrc
@@ -42,11 +42,16 @@
 #define BTN_PASSWD_CANCEL 21
 #define BTN_PASSWD_HELP 22
 
-#define STR_PASSWD_CONFIRM 30
-#define STR_PASSWD_MIN_LEN	31
-#define STR_PASSWD_EMPTY	32
+#define FT_PASSWD_PASSWORD2 25
+#define ED_PASSWD_PASSWORD2 26
+#define FT_PASSWD_CONFIRM2 27
+#define ED_PASSWD_CONFIRM2 28
 
-#endif
+#define STR_PASSWD_CONFIRM 29
+#define STR_PASSWD_MIN_LEN	30
+#define STR_PASSWD_EMPTY	31
+
+#define TEXT_PASSWD		32
 
-// ******************************************************************* EOF
+#endif
 
diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src
index b335bf05a2..ce30406de3 100644..100755
--- a/sfx2/source/dialog/passwd.src
+++ b/sfx2/source/dialog/passwd.src
@@ -47,6 +47,7 @@ ModalDialog DLG_PASSWD
     };
     Edit ED_PASSWD_USER
     {
+        HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER";
         Border = TRUE;
         Pos = MAP_APPFONT( 57, 14 );
         Size = MAP_APPFONT( 75, 12 );
@@ -59,6 +60,7 @@ ModalDialog DLG_PASSWD
     };
     Edit ED_PASSWD_PASSWORD
     {
+        HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD";
         Border = TRUE;
         PassWord = TRUE;
         Pos = MAP_APPFONT( 57, 29 );
@@ -72,6 +74,7 @@ ModalDialog DLG_PASSWD
     };
     Edit ED_PASSWD_CONFIRM
     {
+        HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM";
         Border = TRUE;
         PassWord = TRUE;
         Pos = MAP_APPFONT( 57, 44 );
@@ -99,6 +102,32 @@ ModalDialog DLG_PASSWD
         Size = MAP_APPFONT( 132, 8 );
         Text [ en-US ] = "Password" ;
     };
+    FixedText FT_PASSWD_PASSWORD2
+    {
+        Pos = MAP_APPFONT( 12, 30 );
+        Size = MAP_APPFONT( 42, 10 );
+        Text [ en-US ] = "P~assword";
+    };
+    Edit ED_PASSWD_PASSWORD2
+    {
+        Border = TRUE;
+        PassWord = TRUE;
+        Pos = MAP_APPFONT( 57, 29 );
+        Size = MAP_APPFONT( 75, 12 );
+    };
+    FixedText FT_PASSWD_CONFIRM2
+    {
+        Pos = MAP_APPFONT( 12, 45 );
+        Size = MAP_APPFONT( 42, 10 );
+        Text [ en-US ] = "Confir~m";
+    };
+    Edit ED_PASSWD_CONFIRM2
+    {
+        Border = TRUE;
+        PassWord = TRUE;
+        Pos = MAP_APPFONT( 57, 44 );
+        Size = MAP_APPFONT( 75, 12 );
+    };
     OKButton BTN_PASSWD_OK
     {
         Disable = TRUE;
@@ -116,41 +145,10 @@ ModalDialog DLG_PASSWD
         Pos = MAP_APPFONT( 144, 43 );
         Size = MAP_APPFONT( 50, 14 );
     };
-    String STR_PASSWD_CONFIRM
+    String TEXT_PASSWD
     {
-        Text [ en-US ] = "Confirm password" ;
+        Text [ en-US ] = "Password" ;
     };
-};
-
-// ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+};
 
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 6501abfaf2..90a5cfe030 100644..100755
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -38,12 +38,12 @@
 
 #include "printopt.hrc"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/printopt.hxx>
 
-static USHORT   aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
-static BOOL     bOutputForPrinter = TRUE;
+static sal_uInt16   aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
+static sal_Bool     bOutputForPrinter = sal_True;
 
 SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage( pParent, SfxResId( TP_COMMONPRINTOPTIONS ), rSet ),
@@ -78,12 +78,12 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con
 
     if( bOutputForPrinter )
     {
-        aPrinterOutputRB.Check( TRUE );
+        aPrinterOutputRB.Check( sal_True );
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrinterOutputRB.GetText() ) );
     }
     else
     {
-        aPrintFileOutputRB.Check( TRUE );
+        aPrintFileOutputRB.Check( sal_True );
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( aPrintFileOutputRB.GetText() ) );
     }
 
@@ -143,12 +143,12 @@ Window*	SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow )
         return SfxTabPage::GetParentLabelFor( pWindow );
 }
 
-BOOL SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     SvtPrintWarningOptions  aWarnOptions;
     SvtPrinterOptions       aPrinterOptions;
     SvtPrintFileOptions     aPrintFileOptions;
-    BOOL                    bModified = FALSE;
+    sal_Bool                    bModified = sal_False;
 
 
     if( aPaperSizeCB.IsChecked() != aPaperSizeCB.GetSavedValue())
@@ -204,29 +204,29 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
     aReduceTransparencyCB.Check( pCurrentOptions->IsReduceTransparency() );
 
     if( pCurrentOptions->GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO )
-        aReduceTransparencyAutoRB.Check( TRUE );
+        aReduceTransparencyAutoRB.Check( sal_True );
     else
-        aReduceTransparencyNoneRB.Check( TRUE );
+        aReduceTransparencyNoneRB.Check( sal_True );
 
     aReduceGradientsCB.Check( pCurrentOptions->IsReduceGradients() );
 
     if( pCurrentOptions->GetReducedGradientMode() == PRINTER_GRADIENT_STRIPES )
-        aReduceGradientsStripesRB.Check( TRUE );
+        aReduceGradientsStripesRB.Check( sal_True );
     else
-        aReduceGradientsColorRB.Check( TRUE );
+        aReduceGradientsColorRB.Check( sal_True );
 
     aReduceGradientsStepCountNF.SetValue( pCurrentOptions->GetReducedGradientStepCount() );
 
     aReduceBitmapsCB.Check( pCurrentOptions->IsReduceBitmaps() );
 
     if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_OPTIMAL )
-        aReduceBitmapsOptimalRB.Check( TRUE );
+        aReduceBitmapsOptimalRB.Check( sal_True );
     else if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_NORMAL )
-        aReduceBitmapsNormalRB.Check( TRUE );
+        aReduceBitmapsNormalRB.Check( sal_True );
     else
-        aReduceBitmapsResolutionRB.Check( TRUE );
+        aReduceBitmapsResolutionRB.Check( sal_True );
 
-    const USHORT nDPI = pCurrentOptions->GetReducedBitmapResolution();
+    const sal_uInt16 nDPI = pCurrentOptions->GetReducedBitmapResolution();
 
     if( nDPI < aDPIArray[ 0 ] )
         aReduceBitmapsResolutionLB.SelectEntryPos( 0 );
@@ -236,7 +236,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
         {
             if( nDPI >= aDPIArray[ i ] )
             {
-                aReduceBitmapsResolutionLB.SelectEntryPos( (USHORT) i );
+                aReduceBitmapsResolutionLB.SelectEntryPos( (sal_uInt16) i );
                 i = -1;
             }
         }
@@ -356,12 +356,12 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
     pCurrentOptions->SetReducedTransparencyMode( aReduceTransparencyAutoRB.IsChecked() ? PRINTER_TRANSPARENCY_AUTO : PRINTER_TRANSPARENCY_NONE );
     pCurrentOptions->SetReduceGradients( aReduceGradientsCB.IsChecked() );
     pCurrentOptions->SetReducedGradientMode( aReduceGradientsStripesRB.IsChecked() ? PRINTER_GRADIENT_STRIPES : PRINTER_GRADIENT_COLOR  );
-    pCurrentOptions->SetReducedGradientStepCount( (USHORT) aReduceGradientsStepCountNF.GetValue() );
+    pCurrentOptions->SetReducedGradientStepCount( (sal_uInt16) aReduceGradientsStepCountNF.GetValue() );
     pCurrentOptions->SetReduceBitmaps( aReduceBitmapsCB.IsChecked() );
     pCurrentOptions->SetReducedBitmapMode( aReduceBitmapsOptimalRB.IsChecked() ? PRINTER_BITMAP_OPTIMAL :
                                            ( aReduceBitmapsNormalRB.IsChecked() ? PRINTER_BITMAP_NORMAL : PRINTER_BITMAP_RESOLUTION ) );
-    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (USHORT) aReduceBitmapsResolutionLB.GetSelectEntryPos(),
-                                                            (USHORT)( SAL_N_ELEMENTS( aDPIArray ) - 1 ) ) ] );
+    pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ Min( (sal_uInt16) aReduceBitmapsResolutionLB.GetSelectEntryPos(),
+                                                            (sal_uInt16)( SAL_N_ELEMENTS( aDPIArray ) - 1 ) ) ] );
     pCurrentOptions->SetReducedBitmapIncludesTransparency( aReduceBitmapsTransparencyCB.IsChecked() );
     pCurrentOptions->SetConvertToGreyscales( aConvertToGreyscalesCB.IsChecked() );
 }
@@ -369,7 +369,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bReduceTransparency = aReduceTransparencyCB.IsChecked();
+    const sal_Bool bReduceTransparency = aReduceTransparencyCB.IsChecked();
 
     aReduceTransparencyAutoRB.Enable( bReduceTransparency );
     aReduceTransparencyNoneRB.Enable( bReduceTransparency );
@@ -382,7 +382,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bEnable = aReduceGradientsCB.IsChecked();
+    const sal_Bool bEnable = aReduceGradientsCB.IsChecked();
 
     aReduceGradientsStripesRB.Enable( bEnable );
     aReduceGradientsColorRB.Enable( bEnable );
@@ -396,7 +396,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox )
 {
     (void)pBox; //unused
-    const BOOL bEnable = aReduceBitmapsCB.IsChecked();
+    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked();
 
     aReduceBitmapsOptimalRB.Enable( bEnable );
     aReduceBitmapsNormalRB.Enable( bEnable );
@@ -412,7 +412,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const BOOL bEnable = aReduceGradientsCB.IsChecked() && aReduceGradientsStripesRB.IsChecked();
+    const sal_Bool bEnable = aReduceGradientsCB.IsChecked() && aReduceGradientsStripesRB.IsChecked();
 
     aReduceGradientsStepCountNF.Enable( bEnable );
 
@@ -422,7 +422,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi
 IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton )
 {
     (void)pButton; //unused
-    const BOOL bEnable = aReduceBitmapsCB.IsChecked() && aReduceBitmapsResolutionRB.IsChecked();
+    const sal_Bool bEnable = aReduceBitmapsCB.IsChecked() && aReduceBitmapsResolutionRB.IsChecked();
 
     aReduceBitmapsResolutionLB.Enable( bEnable );
 
@@ -435,7 +435,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*,
     {
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrinterOptions );
-        bOutputForPrinter = TRUE;
+        bOutputForPrinter = sal_True;
         // #i63982#
         ImplSetAccessibleNames();
     }
@@ -451,7 +451,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
     {
         aOutputGB.SetText( OutputDevice::GetNonMnemonicString( pButton->GetText() ) );
         ImplUpdateControls( &maPrintFileOptions );
-        bOutputForPrinter = FALSE;
+        bOutputForPrinter = sal_False;
         // #i63982#
         ImplSetAccessibleNames();
     }
diff --git a/sfx2/source/dialog/printopt.hrc b/sfx2/source/dialog/printopt.hrc
index 2551baf686..2551baf686 100644..100755
--- a/sfx2/source/dialog/printopt.hrc
+++ b/sfx2/source/dialog/printopt.hrc
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index d5b1602e13..065cf926e1 100644..100755
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -60,6 +60,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_PRINTEROUTPUT
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 81, 14 ) ;
         Size = MAP_APPFONT ( 60, 10 ) ;
@@ -67,6 +68,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_PRINTFILEOUTPUT
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 142, 14 ) ;
         Size = MAP_APPFONT ( 100, 10 ) ;
@@ -83,6 +85,7 @@ TabPage TP_COMMONPRINTOPTIONS
 
     CheckBox CB_REDUCETRANSPARENCY
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 18, 38 ) ;
         Size = MAP_APPFONT ( 115, 10 ) ;
@@ -90,6 +93,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCETRANSPARENCY_AUTO
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 51 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
@@ -97,6 +101,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCETRANSPARENCY_NONE
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 64 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
@@ -107,6 +112,7 @@ TabPage TP_COMMONPRINTOPTIONS
 
     CheckBox CB_REDUCEGRADIENTS
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 136, 38 ) ;
         Size = MAP_APPFONT ( 121, 10 ) ;
@@ -114,6 +120,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCEGRADIENTS_STRIPES
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 146, 51 ) ;
         Size = MAP_APPFONT ( 77, 10 ) ;
@@ -121,6 +128,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     NumericField NF_REDUCEGRADIENTS_STEPCOUNT
     {
+        HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT";
         TabStop = TRUE;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 224, 49 ) ;
@@ -132,6 +140,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCEGRADIENTS_COLOR
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 146, 64 ) ;
         Size = MAP_APPFONT ( 108, 10 ) ;
@@ -142,6 +151,7 @@ TabPage TP_COMMONPRINTOPTIONS
 
     CheckBox CB_REDUCEBITMAPS
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 18, 80 ) ;
         Size = MAP_APPFONT ( 115, 10 ) ;
@@ -149,6 +159,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCEBITMAPS_OPTIMAL
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 93 ) ;
         Size = MAP_APPFONT ( 226, 10 ) ;
@@ -156,6 +167,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCEBITMAPS_NORMAL
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 106 ) ;
         Size = MAP_APPFONT ( 226, 10 ) ;
@@ -163,6 +175,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     RadioButton RB_REDUCEBITMAPS_RESOLUTION
     {
+        HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 119 ) ;
         Size = MAP_APPFONT ( 52, 10 ) ;
@@ -170,6 +183,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     ListBox LB_REDUCEBITMAPS_RESOLUTION
     {
+        HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION";
         TabStop = TRUE;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81, 117 ) ;
@@ -188,6 +202,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     CheckBox CB_REDUCEBITMAPS_TRANSPARENCY
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 28, 132 ) ;
         Size = MAP_APPFONT ( 226, 10 ) ;
@@ -198,6 +213,7 @@ TabPage TP_COMMONPRINTOPTIONS
 
     CheckBox CB_CONVERTTOGREYSCALES
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 136, 80 ) ;
         Size = MAP_APPFONT ( 123, 10 ) ;
@@ -214,6 +230,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     CheckBox CB_PAPERSIZE
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 12, 159 ) ;
         Size = MAP_APPFONT ( 123, 10 ) ;
@@ -221,6 +238,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     CheckBox CB_PAPERORIENTATION
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 12, 172 ) ;
         Size = MAP_APPFONT ( 123 , 10 ) ;
@@ -228,6 +246,7 @@ TabPage TP_COMMONPRINTOPTIONS
     };
     CheckBox CB_TRANSPARENCY
     {
+        HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY";
         TabStop = TRUE;
         Pos = MAP_APPFONT ( 136, 159 ) ;
         Size = MAP_APPFONT ( 123, 10 ) ;
@@ -241,6 +260,7 @@ TabPage TP_COMMONPRINTOPTIONS
 
 ModalDialog RID_WARN_PRINTTRANSPARENCY
 {
+    HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 195 , 85 ) ;
     Text [ en-US ] = "Warning" ;
@@ -266,6 +286,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY
     };
     PushButton BTN_PRINTTRANS_NO
     {
+        HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO";
         Pos = MAP_APPFONT ( 68 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~No" ;
@@ -278,6 +299,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY
     };
     CheckBox CBX_NOPRINTTRANSWARN
     {
+        HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN";
         Pos = MAP_APPFONT ( 6 , 68 ) ;
         Size = MAP_APPFONT ( 183 , 10 ) ;
         Text [ en-US ] = "~Do not show warning again" ;
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index b46cd564f9..eeae813eb9 100644..100755
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -43,13 +43,13 @@
 
 #include "recfloat.hxx"
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 using namespace ::com::sun::star;
 
@@ -149,21 +149,21 @@ static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, c
 SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW );
 
 SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBind ,
                                                 SfxChildWinInfo* pInfo )
                     : SfxChildWindow( pParentWnd, nId )
                     , pBindings( pBind )
 {
     pWindow = new SfxRecordingFloat_Impl( pBindings, this, pParentWnd );
-    SetWantsFocus( FALSE );
+    SetWantsFocus( sal_False );
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
     ( ( SfxFloatingWindow* ) pWindow )->Initialize( pInfo );
 }
 
 SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
 {
-    SfxBoolItem aItem( FN_PARAM_1, TRUE );
+    SfxBoolItem aItem( FN_PARAM_1, sal_True );
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
     if ( xRecorder.is() )
         pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
@@ -172,7 +172,7 @@ SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl()
 sal_Bool SfxRecordingFloatWrapper_Impl::QueryClose()
 {
     // asking for recorded macro should be replaced if index access is available!
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder();
     if ( xRecorder.is() && xRecorder->getRecordedMacro().getLength() )
     {
@@ -222,7 +222,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
     aTbx.SetSelectHdl( LINK( this, SfxRecordingFloat_Impl, Select ) );
 
     // start recording
-    SfxBoolItem aItem( SID_RECORDMACRO, TRUE );
+    SfxBoolItem aItem( SID_RECORDMACRO, sal_True );
     GetBindings().GetDispatcher()->Execute( SID_RECORDMACRO, SFX_CALLMODE_SYNCHRON, &aItem, 0L );
 }
 
@@ -241,9 +241,9 @@ SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl()
     }
 }
 
-BOOL SfxRecordingFloat_Impl::Close()
+sal_Bool SfxRecordingFloat_Impl::Close()
 {
-    BOOL bRet = SfxFloatingWindow::Close();
+    sal_Bool bRet = SfxFloatingWindow::Close();
     return bRet;
 }
 
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 228eaa8064..0790accae7 100644..100755
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -33,6 +33,7 @@
 
 FloatingWindow SID_RECORDING_FLOATWINDOW
 {
+    HelpID = "sfx2:FloatingWindow:SID_RECORDING_FLOATWINDOW";
     Moveable = TRUE ;
     Closeable = TRUE ;
     Hide = TRUE ;
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 604a092201..2b64abdb06 100644..100755
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -62,7 +62,7 @@ namespace
     enum RedliningMode  { RL_NONE, RL_WRITER, RL_CALC };
     enum RedlineFunc    { RF_ON, RF_PROTECT };
 
-    bool QueryState( USHORT _nSlot, bool& _rValue )
+    bool QueryState( sal_uInt16 _nSlot, bool& _rValue )
     {
         bool bRet = false;
         SfxViewShell* pViewSh = SfxViewShell::Current();
@@ -84,7 +84,7 @@ namespace
         bool bRet = false;
         if (_eMode != RL_NONE)
         {
-            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
+            sal_uInt16 nSlot = _eMode == RL_WRITER ? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
             bRet = QueryState( nSlot, _rValue );
         }
         return bRet;
@@ -96,7 +96,7 @@ namespace
         bool bRet = false;
         if (_eMode != RL_NONE)
         {
-            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_ON : FID_CHG_RECORD;
+            sal_uInt16 nSlot = _eMode == RL_WRITER ? FN_REDLINE_ON : FID_CHG_RECORD;
             bRet = QueryState( nSlot, _rValue );
         }
         return bRet;
@@ -183,7 +183,7 @@ struct SfxSecurityPage_Impl
     SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet );
     ~SfxSecurityPage_Impl();
     
-    BOOL    FillItemSet_Impl( SfxItemSet & );
+    sal_Bool    FillItemSet_Impl( SfxItemSet & );
     void    Reset_Impl( const SfxItemSet & );
 };    
 
@@ -262,7 +262,7 @@ SfxSecurityPage_Impl::~SfxSecurityPage_Impl()
 }
 
 
-BOOL SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
+sal_Bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
 {
     bool bModified = false;
     
@@ -334,7 +334,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
             SfxDispatcher* pDisp = pViewSh->GetDispatcher();
             if (SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ))
             {
-                USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
+                sal_uInt16 nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
                 bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 );
             }
         }
@@ -381,9 +381,9 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
             // A Calc document that is shared will have 'm_eRedlingMode == RL_NONE'
             // In shared documents change recording and protection must be disabled,
             // similar to documents that do not support change recording at all.
-            m_aRecordChangesCB.Check( FALSE );
+            m_aRecordChangesCB.Check( sal_False );
             m_aRecordChangesCB.Disable();
-            m_aChangeProtectionPB.Check( FALSE );
+            m_aChangeProtectionPB.Check( sal_False );
             m_aChangeProtectionPB.Disable();
         }
     }    
@@ -505,7 +505,7 @@ SfxSecurityPage::~SfxSecurityPage()
 }
 
 
-BOOL SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
+sal_Bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
 {
     bool bModified = false;
     DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src
index c118e9af4c..c118e9af4c 100644..100755
--- a/sfx2/source/dialog/securitypage.src
+++ b/sfx2/source/dialog/securitypage.src
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index fbd95f7587..43d1260c1e 100644..100755
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/sfxdlg.hxx>
-#include "cuilib.hxx"
+//#include "cuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 0ccda20cd4..a55b60d6c6 100644..100755
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/dockwin.hxx>
 #include <sfx2/app.hxx>
 #include "dialog.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/mnumgr.hxx>
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
@@ -60,10 +60,10 @@ using namespace ::rtl;
 
 struct SfxDock_Impl
 {
-    USHORT 				nType;
+    sal_uInt16 				nType;
     SfxDockingWindow*	pWin;			// SplitWindow hat dieses Fenster
-    BOOL				bNewLine;
-    BOOL				bHide;			// SplitWindow hatte dieses Fenster
+    sal_Bool				bNewLine;
+    sal_Bool				bHide;			// SplitWindow hatte dieses Fenster
     long				nSize;
 };
 
@@ -82,21 +82,21 @@ class SfxEmptySplitWin_Impl : public SplitWindow
 friend class SfxSplitWindow;
 
     SfxSplitWindow* 	pOwner;
-    BOOL				bFadeIn;
-    BOOL				bAutoHide;
-    BOOL				bSplit;
-    BOOL				bEndAutoHide;
+    sal_Bool				bFadeIn;
+    sal_Bool				bAutoHide;
+    sal_Bool				bSplit;
+    sal_Bool				bEndAutoHide;
     Timer				aTimer;
     Point				aLastPos;
-    USHORT				nState;
+    sal_uInt16				nState;
 
                         SfxEmptySplitWin_Impl( SfxSplitWindow *pParent )
                             : SplitWindow( pParent->GetParent(), WinBits( WB_BORDER | WB_3DLOOK ) )
                             , pOwner( pParent )
-                            , bFadeIn( FALSE )
-                            , bAutoHide( FALSE )
-                            , bSplit( FALSE )
-                            , bEndAutoHide( FALSE )
+                            , bFadeIn( sal_False )
+                            , bAutoHide( sal_False )
+                            , bSplit( sal_False )
+                            , bEndAutoHide( sal_False )
                             , nState( 1 )
                         {
                             aTimer.SetTimeoutHdl(
@@ -105,7 +105,7 @@ friend class SfxSplitWindow;
                             SetAlign( pOwner->GetAlign() );
                             Actualize();
                             ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() );
-                            ShowFadeInHideButton( TRUE );
+                            ShowFadeInHideButton( sal_True );
                         }
 
                         ~SfxEmptySplitWin_Impl()
@@ -141,7 +141,7 @@ void SfxEmptySplitWin_Impl::AutoHide()
 {
     pOwner->SetPinned_Impl( !pOwner->bPinned );
     pOwner->SaveConfig_Impl();
-    bAutoHide = TRUE;
+    bAutoHide = sal_True;
     FadeIn();
 }
 
@@ -149,7 +149,7 @@ void SfxEmptySplitWin_Impl::FadeIn()
 {
     if (!bAutoHide )
         bAutoHide = IsFadeNoButtonMode();
-    pOwner->SetFadeIn_Impl( TRUE );
+    pOwner->SetFadeIn_Impl( sal_True );
     pOwner->Show_Impl();
     if ( bAutoHide )
     {
@@ -179,7 +179,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt )
 //-------------------------------------------------------------------------
 
 SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
-        SfxWorkWindow *pW, BOOL bWithButtons, WinBits nBits )
+        SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits )
 
 /*  [Beschreibung]
 
@@ -193,15 +193,15 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     eAlign(eAl),
     pWorkWin(pW),
     pDockArr( new SfxDockArr_Impl ),
-    bLocked(FALSE),
-    bPinned(TRUE),
+    bLocked(sal_False),
+    bPinned(sal_True),
     pEmptyWin(NULL),
     pActive(NULL)
 {
     if ( bWithButtons )
     {
-        ShowAutoHideButton( FALSE );    // no autohide button (pin) anymore
-        ShowFadeOutButton( TRUE );
+        ShowAutoHideButton( sal_False );    // no autohide button (pin) anymore
+        ShowFadeOutButton( sal_True );
     }
 
     // SV-Alignment setzen
@@ -219,7 +219,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
             break;
         case SFX_ALIGN_BOTTOM:
             eTbxAlign = WINDOWALIGN_BOTTOM;
-            bPinned = TRUE;
+            bPinned = sal_True;
             break;
         default:
             eTbxAlign = WINDOWALIGN_TOP;  // some sort of default...
@@ -230,7 +230,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     pEmptyWin = new SfxEmptySplitWin_Impl( this );
     if ( bPinned )
     {
-        pEmptyWin->bFadeIn = TRUE;
+        pEmptyWin->bFadeIn = sal_True;
         pEmptyWin->nState = 2;
     }
 
@@ -245,26 +245,26 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
         OUString aTemp;
         if ( aUserItem >>= aTemp )
             aWinData = String( aTemp );
-        if ( aWinData.Len() && aWinData.GetChar( (USHORT) 0 ) == 'V' )
+        if ( aWinData.Len() && aWinData.GetChar( (sal_uInt16) 0 ) == 'V' )
         {
-            pEmptyWin->nState = (USHORT) aWinData.GetToken( 1, ',' ).ToInt32();
+            pEmptyWin->nState = (sal_uInt16) aWinData.GetToken( 1, ',' ).ToInt32();
             if ( pEmptyWin->nState & 2 )
-                pEmptyWin->bFadeIn = TRUE;
-            bPinned = TRUE; // always assume pinned - floating mode not used anymore
+                pEmptyWin->bFadeIn = sal_True;
+            bPinned = sal_True; // always assume pinned - floating mode not used anymore
 
-            USHORT i=2;
-            USHORT nCount = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
-            for ( USHORT n=0; n<nCount; n++ )
+            sal_uInt16 i=2;
+            sal_uInt16 nCount = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
+            for ( sal_uInt16 n=0; n<nCount; n++ )
             {
                 SfxDock_Impl *pDock = new SfxDock_Impl;
                 pDock->pWin = 0;
-                pDock->bNewLine = FALSE;
-                pDock->bHide = TRUE;
-                pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                pDock->bNewLine = sal_False;
+                pDock->bHide = sal_True;
+                pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
                 if ( !pDock->nType )
                 {
                     // K"onnte NewLine bedeuten
-                    pDock->nType = (USHORT) aWinData.GetToken(i++, ',').ToInt32();
+                    pDock->nType = (sal_uInt16) aWinData.GetToken(i++, ',').ToInt32();
                     if ( !pDock->nType )
                     {
                         // Lesefehler
@@ -272,7 +272,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
                         break;
                     }
                     else
-                        pDock->bNewLine = TRUE;
+                        pDock->bNewLine = sal_True;
                 }
 
                 pDockArr->Insert(pDock,n);
@@ -281,8 +281,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     }
     else
     {
-        bPinned = TRUE;
-        pEmptyWin->bFadeIn = TRUE;
+        bPinned = sal_True;
+        pEmptyWin->bFadeIn = sal_True;
         pEmptyWin->nState = 2;
     }
 
@@ -318,8 +318,8 @@ void SfxSplitWindow::SaveConfig_Impl()
     aWinData += String::CreateFromInt32( pEmptyWin->nState );
     aWinData += ',';
 
-    USHORT nCount = 0;
-    USHORT n;
+    sal_uInt16 nCount = 0;
+    sal_uInt16 n;
     for ( n=0; n<pDockArr->Count(); n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
@@ -355,8 +355,8 @@ void SfxSplitWindow::StartSplit()
 
     if ( pEmptyWin )
     {
-        pEmptyWin->bFadeIn = TRUE;
-        pEmptyWin->bSplit = TRUE;
+        pEmptyWin->bFadeIn = sal_True;
+        pEmptyWin->bSplit = sal_True;
     }
 
     Rectangle aRect = pWorkWin->GetFreeArea( !bPinned );
@@ -393,17 +393,17 @@ void SfxSplitWindow::SplitResize()
 void SfxSplitWindow::Split()
 {
     if ( pEmptyWin )
-        pEmptyWin->bSplit = FALSE;
+        pEmptyWin->bSplit = sal_False;
 
     SplitWindow::Split();
 
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pD = (*pDockArr)[n];
         if ( pD->pWin )
         {
-            USHORT nId = pD->nType;
+            sal_uInt16 nId = pD->nType;
             long nSize    = GetItemSize( nId, SWIB_FIXED );
             long nSetSize = GetItemSize( GetSet( nId ) );
             Size aSize;
@@ -439,13 +439,13 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 */
 {
     short nLine = -1;    	// damit erstes Fenster nLine auf 0 hochsetzen kann
-    USHORT nL;
-    USHORT nPos = 0;
-    BOOL bNewLine = TRUE;
-    BOOL bSaveConfig = FALSE;
+    sal_uInt16 nL;
+    sal_uInt16 nPos = 0;
+    sal_Bool bNewLine = sal_True;
+    sal_Bool bSaveConfig = sal_False;
     SfxDock_Impl *pFoundDock=0;
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
         if ( pDock->bNewLine )
@@ -457,7 +457,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
             // Neue Zeile
             nPos = 0;
-            bNewLine = TRUE;
+            bNewLine = sal_True;
         }
 
         if ( pDock->pWin )
@@ -477,7 +477,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
             }
 
             // Zeile ist schon er"offnet
-            bNewLine = FALSE;
+            bNewLine = sal_False;
             if ( pFoundDock )
                 break;
         }
@@ -503,18 +503,18 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
     {
         // Nicht gefunden, am Ende einf"ugen
         pFoundDock = new SfxDock_Impl;
-        pFoundDock->bHide = TRUE;
+        pFoundDock->bHide = sal_True;
         pDockArr->Insert( pFoundDock, nCount );
         pFoundDock->nType = pDockWin->GetType();
         nLine++;
         nPos = 0;
-        bNewLine = TRUE;
+        bNewLine = sal_True;
         pFoundDock->bNewLine = bNewLine;
-        bSaveConfig = TRUE;
+        bSaveConfig = sal_True;
     }
 
     pFoundDock->pWin = pDockWin;
-    pFoundDock->bHide = FALSE;
+    pFoundDock->bHide = sal_False;
     InsertWindow_Impl( pFoundDock, rSize, nLine, nPos, bNewLine );
     if ( bSaveConfig )
         SaveConfig_Impl();
@@ -522,7 +522,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
+void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave)
 
 /*  [Beschreibung]
 
@@ -531,18 +531,18 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
 
 {
     SfxDock_Impl *pDock=0;
-    USHORT nCount = pDockArr->Count();
-    BOOL bFound = FALSE;
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    sal_Bool bFound = sal_False;
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         pDock = (*pDockArr)[n];
         if ( pDock->nType == pDockWin->GetType() )
         {
             if ( pDock->bNewLine && n<nCount-1 )
-                (*pDockArr)[n+1]->bNewLine = TRUE;
+                (*pDockArr)[n+1]->bNewLine = sal_True;
 
             // Fenster hat schon eine Position, die vergessen wir
-            bFound = TRUE;
+            bFound = sal_True;
             pDockArr->Remove(n);
             break;
         }
@@ -558,7 +558,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, BOOL bSave)
 //-------------------------------------------------------------------------
 
 void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -567,7 +567,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
 */
 
 {
-    USHORT nL, nP;
+    sal_uInt16 nL, nP;
     GetWindowPos( pDockWin, nL, nP );
 
     if ( nLine > nL && GetItemCount( GetItemId( nL, 0 ) ) == 1 )
@@ -583,7 +583,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
 //-------------------------------------------------------------------------
 
 void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -592,9 +592,9 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 */
 {
-    ReleaseWindow_Impl( pDockWin, FALSE );
+    ReleaseWindow_Impl( pDockWin, sal_False );
     SfxDock_Impl *pDock = new SfxDock_Impl;
-    pDock->bHide = FALSE;
+    pDock->bHide = sal_False;
     pDock->nType = pDockWin->GetType();
     pDock->bNewLine = bNewLine;
     pDock->pWin = pDockWin;
@@ -605,12 +605,12 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
     // Das Fenster mu\s vor dem ersten Fenster eingef"ugt werden, das die
     // gleiche oder eine gr"o\sere Position hat als pDockWin.
-    USHORT nCount = pDockArr->Count();
+    sal_uInt16 nCount = pDockArr->Count();
     USHORT nLastWindowIdx(0);
 
     // Wenn gar kein Fenster gefunden wird, wird als erstes eingef"ugt
-    USHORT nInsertPos = 0;
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nInsertPos = 0;
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pD = (*pDockArr)[n];
 
@@ -621,7 +621,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
             // gefunden wird, wird am Ende eingef"ugt
             nInsertPos = nCount;
             nLastWindowIdx = n;
-            USHORT nL=0, nP=0;
+            sal_uInt16 nL=0, nP=0;
             GetWindowPos( pD->pWin, nL, nP );
 
             if ( (nL == nLine && nP == nPos) || nL > nLine )
@@ -632,8 +632,8 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
                     DBG_ASSERT(pD->bNewLine, "Keine neue Zeile?");
 
                     // Das Fenster wird auf nPos==0 eingeschoben
-                    pD->bNewLine = FALSE;
-                    pDock->bNewLine = TRUE;
+                    pD->bNewLine = sal_False;
+                    pDock->bNewLine = sal_True;
                 }
 
                 nInsertPos = n != 0 ? nLastWindowIdx + 1 : 0;    // ignore all non-windows after the last window
@@ -655,7 +655,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
 
 void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
                         const Size& rSize,
-                        USHORT nLine, USHORT nPos, BOOL bNewLine)
+                        sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
 
 /*  [Beschreibung]
 
@@ -666,7 +666,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 {
     SfxDockingWindow* pDockWin = pDock->pWin;
 
-    USHORT nItemBits = pDockWin->GetWinBits_Impl();
+    sal_uInt16 nItemBits = pDockWin->GetWinBits_Impl();
 
     long nWinSize, nSetSize;
     if ( IsHorizontal() )
@@ -682,24 +682,24 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 
     pDock->nSize = nWinSize;
 
-    BOOL bUpdateMode = IsUpdateMode();
+    sal_Bool bUpdateMode = IsUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
 
     if ( bNewLine || nLine == GetItemCount( 0 ) )
     {
         // Es soll nicht in eine vorhandene Zeile eingef"ugt werden, sondern
         // eine neue erzeugt werden
 
-        USHORT nId = 1;
-        for ( USHORT n=0; n<GetItemCount(0); n++ )
+        sal_uInt16 nId = 1;
+        for ( sal_uInt16 n=0; n<GetItemCount(0); n++ )
         {
             if ( GetItemId(n) >= nId )
                 nId = GetItemId(n)+1;
         }
 
         // Eine neue nLine-te Zeile erzeugen
-        USHORT nBits = nItemBits;
+        sal_uInt16 nBits = nItemBits;
         if ( GetAlign() == WINDOWALIGN_TOP || GetAlign() == WINDOWALIGN_BOTTOM )
             nBits |= SWIB_COLSET;
         InsertItem( nId, nSetSize, nLine, 0, nBits );
@@ -710,8 +710,8 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     // so macht, wie man erwartet; "Pixel" macht eigentlich nur Sinn, wenn
     // auch Items mit prozentualen oder relativen Gr"o\sen dabei sind.
     nItemBits |= SWIB_PERCENTSIZE;
-    bLocked = TRUE;
-    USHORT nSet = GetItemId( nLine );
+    bLocked = sal_True;
+    sal_uInt16 nSet = GetItemId( nLine );
     InsertItem( pDockWin->GetType(), pDockWin, nWinSize, nPos, nSet, nItemBits );
 
     // Splitwindows werden im SFX einmal angelegt und beim Einf"ugen des ersten
@@ -722,21 +722,21 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
         // wird vom SfxDockingwindow veranla\st (->SfxWorkWindow::ConfigChild_Impl)
         if ( !bPinned && !IsFloatingMode() )
         {
-            bPinned = TRUE;
-            BOOL bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
-            pEmptyWin->bFadeIn = FALSE;
-            SetPinned_Impl( FALSE );
+            bPinned = sal_True;
+            sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
+            pEmptyWin->bFadeIn = sal_False;
+            SetPinned_Impl( sal_False );
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             if ( bFadeIn )
                 FadeIn();
         }
         else
         {
-            BOOL bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
-            pEmptyWin->bFadeIn = FALSE;
+            sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0;
+            pEmptyWin->bFadeIn = sal_False;
             pEmptyWin->Actualize();
 #ifdef DBG_UTIL
             if ( !bPinned || !pEmptyWin->bFadeIn )
@@ -748,7 +748,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
                 DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" );
             }
 #endif
-            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             if ( bFadeIn )
                 FadeIn();
@@ -758,13 +758,13 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     }
 
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
-    bLocked = FALSE;
+        SetUpdateMode( sal_True );
+    bLocked = sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
+void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
 
 /*  [Beschreibung]
 
@@ -772,7 +772,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
     gehidet.
 */
 {
-    USHORT nSet = GetSet( pDockWin->GetType() );
+    sal_uInt16 nSet = GetSet( pDockWin->GetType() );
 
     // Splitwindows werden im SFX einmal angelegt und nach dem Entfernen
     // des letzten DockingWindows unsichtbar gemacht.
@@ -782,7 +782,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
         // veranla\st!
         Hide();
         pEmptyWin->aTimer.Stop();
-        USHORT nRealState = pEmptyWin->nState;
+        sal_uInt16 nRealState = pEmptyWin->nState;
         FadeOut_Impl();
         pEmptyWin->Hide();
 #ifdef DBG_UTIL
@@ -801,8 +801,8 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
     }
 
     SfxDock_Impl *pDock=0;
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         pDock = (*pDockArr)[n];
         if ( pDock->nType == pDockWin->GetType() )
@@ -815,10 +815,10 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
 
     // Fenster removen, und wenn es das letzte der Zeile war, auch die Zeile
     // ( Zeile = ItemSet )
-    BOOL bUpdateMode = IsUpdateMode();
+    sal_Bool bUpdateMode = IsUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
-    bLocked = TRUE;
+        SetUpdateMode( sal_False );
+    bLocked = sal_True;
 
     RemoveItem( pDockWin->GetType() );
 
@@ -826,14 +826,14 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide )
         RemoveItem( nSet );
 
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
-    bLocked = FALSE;
+        SetUpdateMode( sal_True );
+    bLocked = sal_False;
 };
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
-                                        USHORT& rLine, USHORT& rPos ) const
+sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
+                                        sal_uInt16& rLine, sal_uInt16& rPos ) const
 /*  [Beschreibung]
 
     Liefert die Id des Itemsets und die des Items f"ur das "ubergebene
@@ -841,19 +841,19 @@ BOOL SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
 */
 
 {
-    USHORT nSet = GetSet ( pWindow->GetType() );
+    sal_uInt16 nSet = GetSet ( pWindow->GetType() );
     if ( nSet == SPLITWINDOW_ITEM_NOTFOUND )
-        return FALSE;
+        return sal_False;
 
     rPos  = GetItemPos( pWindow->GetType(), nSet );
     rLine = GetItemPos( nSet );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::GetWindowPos( const Point& rTestPos,
-                                      USHORT& rLine, USHORT& rPos ) const
+sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const
 /*  [Beschreibung]
 
     Liefert die Id des Itemsets und die des Items f"ur das DockingWindow
@@ -862,19 +862,19 @@ BOOL SfxSplitWindow::GetWindowPos( const Point& rTestPos,
 */
 
 {
-    USHORT nId = GetItemId( rTestPos );
+    sal_uInt16 nId = GetItemId( rTestPos );
     if ( nId == 0 )
-        return FALSE;
+        return sal_False;
 
-    USHORT nSet = GetSet ( nId );
+    sal_uInt16 nSet = GetSet ( nId );
     rPos  = GetItemPos( nId, nSet );
     rLine = GetItemPos( nSet );
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetLineCount() const
+sal_uInt16 SfxSplitWindow::GetLineCount() const
 
 /*  [Beschreibung]
 
@@ -886,33 +886,33 @@ USHORT SfxSplitWindow::GetLineCount() const
 
 //-------------------------------------------------------------------------
 
-long SfxSplitWindow::GetLineSize( USHORT nLine ) const
+long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
 
 /*  [Beschreibung]
 
     Liefert die "Zeilenh"ohe" des nLine-ten Itemsets.
 */
 {
-    USHORT nId = GetItemId( nLine );
+    sal_uInt16 nId = GetItemId( nLine );
     return GetItemSize( nId );
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetWindowCount( USHORT nLine ) const
+sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
 
 /*  [Beschreibung]
 
     Liefert die
 */
 {
-    USHORT nId = GetItemId( nLine );
+    sal_uInt16 nId = GetItemId( nLine );
     return GetItemCount( nId );
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxSplitWindow::GetWindowCount() const
+sal_uInt16 SfxSplitWindow::GetWindowCount() const
 
 /*  [Beschreibung]
 
@@ -936,11 +936,11 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
     if ( pTimer )
         pTimer->Stop();
 
-    if ( CursorIsOverRect( FALSE ) || !pTimer )
+    if ( CursorIsOverRect( sal_False ) || !pTimer )
     {
         // Wenn der Mauszeiger innerhalb des Fensters liegt, SplitWindow anzeigen
         // und Timer zum Schlie\sen aufsetzen
-        pEmptyWin->bAutoHide = TRUE;
+        pEmptyWin->bAutoHide = sal_True;
         if ( !IsVisible() )
             pEmptyWin->FadeIn();
 
@@ -963,16 +963,16 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
         // (Benutzer ist einfach mit der Maus "uber pEmptyWin gefahren)
         if ( IsVisible() )
         {
-            pEmptyWin->bEndAutoHide = FALSE;
+            pEmptyWin->bEndAutoHide = sal_False;
             if ( !Application::IsInModalMode() &&
                   !PopupMenu::IsInExecute() &&
-                  !pEmptyWin->bSplit && !HasChildPathFocus( TRUE ) )
+                  !pEmptyWin->bSplit && !HasChildPathFocus( sal_True ) )
             {
                 // W"ahrend ein modaler Dialog oder ein Popupmenu offen sind
                 // oder w"ahrend des Splittens auf keinen Fall zumachen; auch
                 // solange eines der Children den Focus hat, bleibt das
                 // das Fenster offen
-                pEmptyWin->bEndAutoHide = TRUE;
+                pEmptyWin->bEndAutoHide = sal_True;
             }
 
             if ( pEmptyWin->bEndAutoHide )
@@ -1004,9 +1004,9 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
 
 //-------------------------------------------------------------------------
 
-BOOL SfxSplitWindow::CursorIsOverRect( BOOL bForceAdding ) const
+sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
 {
-    BOOL bVisible = IsVisible();
+    sal_Bool bVisible = IsVisible();
 
     // Auch das kollabierte SplitWindow ber"ucksichtigen
     Point aPos = pEmptyWin->GetParent()->OutputToScreenPixel( pEmptyWin->GetPosPixel() );
@@ -1039,8 +1039,8 @@ BOOL SfxSplitWindow::CursorIsOverRect( BOOL bForceAdding ) const
     }
 
     if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -1053,19 +1053,19 @@ SplitWindow* SfxSplitWindow::GetSplitWindow()
 }
 
 //-------------------------------------------------------------------------
-BOOL SfxSplitWindow::IsFadeIn() const
+sal_Bool SfxSplitWindow::IsFadeIn() const
 {
     return pEmptyWin->bFadeIn;
 }
 
-BOOL SfxSplitWindow::IsAutoHide( BOOL bSelf ) const
+sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const
 {
     return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide;
 }
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
+void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
 {
     if ( bPinned == bOn )
         return;
@@ -1085,13 +1085,13 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
             Hide();
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
         }
 
         Point aPos( GetPosPixel() );
         aPos = GetParent()->OutputToScreenPixel( aPos );
         SetFloatingPos( aPos );
-        SetFloatingMode( TRUE );
+        SetFloatingMode( sal_True );
         GetFloatingWindow()->SetOutputSizePixel( GetOutputSizePixel() );
 
         if ( pEmptyWin->bFadeIn )
@@ -1101,7 +1101,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
     {
         pEmptyWin->nState &= ~1;
         SetOutputSizePixel( GetFloatingWindow()->GetOutputSizePixel() );
-        SetFloatingMode( FALSE );
+        SetFloatingMode( sal_False );
 
         if ( pEmptyWin->bFadeIn )
         {
@@ -1110,7 +1110,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
             pWorkWin->ReleaseChild_Impl( *pEmptyWin );
             pEmptyWin->Hide();
             DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
         }
     }
 
@@ -1120,7 +1120,7 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn )
 
 //-------------------------------------------------------------------------
 
-void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
+void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
 {
     if ( bOn == pEmptyWin->bFadeIn )
         return;
@@ -1144,14 +1144,14 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
             pWorkWin->ReleaseChild_Impl( *pEmptyWin );
             pEmptyWin->Hide();
             DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             pWorkWin->ShowChilds_Impl();
         }
     }
     else
     {
-        pEmptyWin->bAutoHide = FALSE;
+        pEmptyWin->bAutoHide = sal_False;
         pEmptyWin->nState &= ~2;
         if ( !IsFloatingMode() )
         {
@@ -1161,7 +1161,7 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn )
             Hide();
             pEmptyWin->Actualize();
             DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" );
-            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE;
+            pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE;
             pWorkWin->ArrangeChilds_Impl();
             pWorkWin->ShowChilds_Impl();
             pWorkWin->ArrangeAutoHideWindows( this );
@@ -1181,13 +1181,13 @@ void SfxSplitWindow::AutoHide()
     if ( !bPinned )
     {
         // Es "schwebt", also wieder andocken
-        SetPinned_Impl( TRUE );
+        SetPinned_Impl( sal_True );
         pWorkWin->ArrangeChilds_Impl();
     }
     else
     {
         // In den "Schwebezustand" bringen
-        SetPinned_Impl( FALSE );
+        SetPinned_Impl( sal_False );
         pWorkWin->ArrangeChilds_Impl();
         pWorkWin->ArrangeAutoHideWindows( this );
     }
@@ -1200,11 +1200,11 @@ void SfxSplitWindow::FadeOut_Impl()
 {
     if ( pEmptyWin->aTimer.IsActive() )
     {
-        pEmptyWin->bAutoHide = FALSE;
+        pEmptyWin->bAutoHide = sal_False;
         pEmptyWin->aTimer.Stop();
     }
 
-    SetFadeIn_Impl( FALSE );
+    SetFadeIn_Impl( sal_False );
     Show_Impl();
 }
 
@@ -1216,14 +1216,14 @@ void SfxSplitWindow::FadeOut()
 
 void SfxSplitWindow::FadeIn()
 {
-    SetFadeIn_Impl( TRUE );
+    SetFadeIn_Impl( sal_True );
     Show_Impl();
 }
 
 void SfxSplitWindow::Show_Impl()
 {
-    USHORT nCount = pDockArr->Count();
-    for ( USHORT n=0; n<nCount; n++ )
+    sal_uInt16 nCount = pDockArr->Count();
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         SfxDock_Impl *pDock = (*pDockArr)[n];
         if ( pDock->pWin )
@@ -1231,11 +1231,11 @@ void SfxSplitWindow::Show_Impl()
     }
 }
 
-BOOL SfxSplitWindow::ActivateNextChild_Impl( BOOL bForward )
+sal_Bool SfxSplitWindow::ActivateNextChild_Impl( sal_Bool bForward )
 {
     // Wenn kein pActive, auf erstes bzw. letztes Fenster gehen ( bei !bForward wird erst in der loop dekrementiert )
-    USHORT nCount = pDockArr->Count();
-    USHORT n = bForward ? 0 : nCount;
+    sal_uInt16 nCount = pDockArr->Count();
+    sal_uInt16 n = bForward ? 0 : nCount;
 
     // Wenn Focus innerhalb, dann ein Fenster vor oder zur"uck, wenn m"oglich
     if ( pActive )
@@ -1256,31 +1256,31 @@ BOOL SfxSplitWindow::ActivateNextChild_Impl( BOOL bForward )
     if ( bForward )
     {
         // N"achstes Fenster suchen
-        for ( USHORT nNext=n; nNext<nCount; nNext++ )
+        for ( sal_uInt16 nNext=n; nNext<nCount; nNext++ )
         {
             SfxDock_Impl *pD = (*pDockArr)[nNext];
             if ( pD->pWin )
             {
                 pD->pWin->GrabFocus();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     else
     {
         // Vorheriges Fenster suchen
-        for ( USHORT nNext=n; nNext--; )
+        for ( sal_uInt16 nNext=n; nNext--; )
         {
             SfxDock_Impl *pD = (*pDockArr)[nNext];
             if ( pD->pWin )
             {
                 pD->pWin->GrabFocus();
-                return TRUE;
+                return sal_True;
             }
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SfxSplitWindow::SetActiveWindow_Impl( SfxDockingWindow* pWin )
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 1b33948834..6d915a7e4e 100644..100755
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include "srchdlg.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "srchdlg.hrc"
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno;
 namespace sfx2 {
 
 #define USERITEM_NAME		DEFINE_CONST_OUSTRING("UserItem")
-#define MAX_SAVE_COUNT		(USHORT)10
+#define MAX_SAVE_COUNT		(sal_uInt16)10
 
 // ============================================================================
 // SearchDialog
@@ -114,7 +114,7 @@ void SearchDialog::LoadConfig()
         }
     }
     else
-        m_aWrapAroundBox.Check( TRUE );
+        m_aWrapAroundBox.Check( sal_True );
 }
 
 void SearchDialog::SaveConfig()
@@ -122,7 +122,7 @@ void SearchDialog::SaveConfig()
     SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName );
     aViewOpt.SetWindowState( rtl::OUString::createFromAscii( m_sWinState.GetBuffer() ) );
     String sUserData;
-    USHORT i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT );
+    sal_uInt16 i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT );
     for ( ; i < nCount; ++i )
     {
         sUserData += m_aSearchEdit.GetEntry(i);
@@ -145,7 +145,7 @@ void SearchDialog::SaveConfig()
 IMPL_LINK( SearchDialog, FindHdl, PushButton*, EMPTYARG )
 {
     String sSrchTxt = m_aSearchEdit.GetText();
-    USHORT nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
+    sal_uInt16 nPos = m_aSearchEdit.GetEntryPos( sSrchTxt );
     if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND )
         m_aSearchEdit.RemoveEntry( nPos );
     if ( nPos > 0 )
@@ -169,9 +169,9 @@ void SearchDialog::SetFocusOnEdit()
     m_aSearchEdit.GrabFocus();
 }
 
-BOOL SearchDialog::Close()
+sal_Bool SearchDialog::Close()
 {
-    BOOL bRet = ModelessDialog::Close();
+    sal_Bool bRet = ModelessDialog::Close();
     m_aCloseHdl.Call( this );
     return bRet;
 }
@@ -182,7 +182,7 @@ void SearchDialog::StateChanged( StateChangedType nStateChange )
     {
         if ( m_sWinState.Len() )
             SetWindowState( m_sWinState );
-        m_bIsConstructed = TRUE;
+        m_bIsConstructed = sal_True;
     }
 
     ModelessDialog::StateChanged( nStateChange );
diff --git a/sfx2/source/dialog/srchdlg.hrc b/sfx2/source/dialog/srchdlg.hrc
index e5267db2ae..e5267db2ae 100644..100755
--- a/sfx2/source/dialog/srchdlg.hrc
+++ b/sfx2/source/dialog/srchdlg.hrc
diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src
index aaa367b1b1..8ffcadf4d6 100644..100755
--- a/sfx2/source/dialog/srchdlg.src
+++ b/sfx2/source/dialog/srchdlg.src
@@ -52,6 +52,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     ComboBox ED_SEARCH
     {
+        HelpID = "sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH";
         Border = TRUE;
         Pos = MAP_APPFONT( 6, 14 );
         Size = MAP_APPFONT( 150, 50 );
@@ -60,6 +61,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     CheckBox CB_WHOLEWORDS
     {
+        HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS";
         Pos = MAP_APPFONT( 6, 29 );
         Size = MAP_APPFONT( 150, 10 );
         Text [ en-US ] = "~Whole words only" ;
@@ -67,6 +69,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     CheckBox CB_MATCHCASE
     {
+        HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE";
         Pos = MAP_APPFONT( 6, 42 );
         Size = MAP_APPFONT( 150, 10 );
         Text[ en-US ] = "~Match case";
@@ -74,6 +77,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     CheckBox CB_WRAPAROUND
     {
+        HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND";
         Pos = MAP_APPFONT( 6, 55 );
         Size = MAP_APPFONT( 150, 10 );
         Text [ en-US ] = "Wrap ~around" ;
@@ -81,6 +85,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     CheckBox CB_BACKWARDS
     {
+        HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS";
         Pos = MAP_APPFONT( 6, 68 );
         Size = MAP_APPFONT( 150, 10 );
         Text [ en-US ] = "~Backwards" ;
@@ -88,6 +93,7 @@ ModelessDialog RID_DLG_SEARCH
     };
     PushButton PB_FIND
     {
+        HelpID = "sfx2:PushButton:RID_DLG_SEARCH:PB_FIND";
         Pos = MAP_APPFONT( 162, 6 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "~Find" ;
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 4567d34038..dfc6e33339 100644..100755
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -52,17 +52,17 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
     Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILY_ITEM ) )
 
 {
-    ULONG nMask = ReadLongRes();
+    sal_uIntPtr nMask = ReadLongRes();
 
     if(nMask & RSC_SFX_STYLE_ITEM_LIST)
     {
-        ULONG nCount = ReadLongRes();
-        for( ULONG i = 0; i < nCount; i++ )
+        sal_uIntPtr nCount = ReadLongRes();
+        for( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SfxFilterTupel *pTupel = new SfxFilterTupel;
             pTupel->aName = ReadStringRes();
             long lFlags = ReadLongRes();
-            pTupel->nFlags = (USHORT)lFlags;
+            pTupel->nFlags = (sal_uInt16)lFlags;
             aFilterList.push_back( pTupel );
         }
     }
@@ -81,7 +81,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
     }
     if(nMask & RSC_SFX_STYLE_ITEM_STYLEFAMILY)
     {
-        nFamily = (USHORT)ReadLongRes();
+        nFamily = (sal_uInt16)ReadLongRes();
     }
     else
         nFamily = SFX_STYLE_FAMILY_PARA;
@@ -110,10 +110,10 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem()
 // Implementierung des Resource-Konstruktors
 
 SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
-    Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( FALSE ) )
+    Resource( rResId.SetRT( RSC_SFX_STYLE_FAMILIES ).SetAutoRelease( false ) )
 {
-    ULONG nCount = ReadLongRes();
-    for( ULONG i = 0; i < nCount; i++ )
+    sal_uIntPtr nCount = ReadLongRes();
+    for( sal_uIntPtr i = 0; i < nCount; i++ )
     {
         const ResId aResId((RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr());
         SfxStyleFamilyItem *pItem = new SfxStyleFamilyItem(aResId);
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index bddc0b9ca2..614fee3817 100644..100755
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -36,7 +36,7 @@
 
 #include <sfx2/styledlg.hxx>
 #include <sfx2/mgetempl.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 
 #include "dialog.hrc"
@@ -48,7 +48,7 @@ SfxStyleDialog::SfxStyleDialog
     Window* pParent,			// Parent
     const ResId& rResId,		// ResId
     SfxStyleSheetBase& rStyle,	// zu bearbeitendes StyleSheet
-    BOOL bFreeRes,				// Flag Resourcen freigeben
+    sal_Bool bFreeRes,				// Flag Resourcen freigeben
     const String* pUserBtnTxt
 ) :
 
@@ -61,7 +61,7 @@ SfxStyleDialog::SfxStyleDialog
                   rStyle.GetItemSet().Clone(),
                   // auch ohne ParentSupport TRUE "ubergeben, aber erweitert
                   // um den StandardButton zu unterdr"ucken
-                  rStyle.HasParentSupport() ? TRUE : 2,
+                  rStyle.HasParentSupport() ? sal_True : 2,
                   pUserBtnTxt ),
 
     pStyle( &rStyle )
@@ -69,7 +69,7 @@ SfxStyleDialog::SfxStyleDialog
 {
     AddTabPage( ID_TABPAGE_MANAGESTYLES,
                 String( SfxResId( STR_TABPAGE_MANAGESTYLES ) ),
-                SfxManageStyleSheetPage::Create, 0, FALSE, 0 );
+                SfxManageStyleSheetPage::Create, 0, sal_False, 0 );
 
     // bei neuer Vorlage immer die Verwaltungsseite als aktuelle
     // Seite setzen
@@ -151,11 +151,11 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton )
 
     const SfxItemSet* pInSet = GetInputSetImpl();
     SfxWhichIter aIter( *pInSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
     while ( nWhich )
     {
-        SfxItemState eState = pInSet->GetItemState( nWhich, FALSE );
+        SfxItemState eState = pInSet->GetItemState( nWhich, sal_False );
 
         if ( SFX_ITEM_DEFAULT == eState )
             pExampleSet->ClearItem( nWhich );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 0bb54e62c4..203c1f83fc 100644..100755
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -43,8 +43,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
@@ -69,34 +69,34 @@ TYPEINIT1(LAYOUT_NS_SFX_TABDIALOG SfxTabDialogItem,SfxSetItem);
 
 struct TabPageImpl
 {
-    BOOL                        mbStandard;
+    sal_Bool                        mbStandard;
     sfx::ItemConnectionArray    maItemConn;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
-    TabPageImpl() : mbStandard( FALSE ) {}
+    TabPageImpl() : mbStandard( sal_False ) {}
 };
 
 NAMESPACE_LAYOUT_SFX_TABDIALOG
 
 struct Data_Impl
 {
-    USHORT nId;					 // Die ID
+    sal_uInt16 nId;					 // Die ID
     CreateTabPage fnCreatePage;	 // Pointer auf die Factory
     GetTabPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
     SfxTabPage* pTabPage;		 // die TabPage selber
-    BOOL bOnDemand;				 // Flag: ItemSet onDemand
-    BOOL bRefresh; 				 // Flag: Seite mu\s neu initialisiert werden
+    sal_Bool bOnDemand;				 // Flag: ItemSet onDemand
+    sal_Bool bRefresh; 				 // Flag: Seite mu\s neu initialisiert werden
 
     // Konstruktor
-    Data_Impl( USHORT Id, CreateTabPage fnPage,
-               GetTabPageRanges fnRanges, BOOL bDemand ) :
+    Data_Impl( sal_uInt16 Id, CreateTabPage fnPage,
+               GetTabPageRanges fnRanges, sal_Bool bDemand ) :
 
         nId			( Id ),
         fnCreatePage( fnPage ),
         fnGetRanges	( fnRanges ),
         pTabPage	( 0 ),
         bOnDemand	( bDemand ),
-        bRefresh	( FALSE )
+        bRefresh	( sal_False )
     {
         if ( !fnCreatePage  )
         {
@@ -115,7 +115,7 @@ SfxTabDialogItem::SfxTabDialogItem( const SfxTabDialogItem& rAttr, SfxItemPool*
 {
 }
 
-SfxTabDialogItem::SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet )
+SfxTabDialogItem::SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet )
     : SfxSetItem( nId, rItemSet )
 {
 }
@@ -125,7 +125,7 @@ SfxPoolItem* SfxTabDialogItem::Clone(SfxItemPool* pToPool) const
     return new SfxTabDialogItem( *this, pToPool );
 }
 
-SfxPoolItem* SfxTabDialogItem::Create(SvStream& /*rStream*/, USHORT /*nVersion*/) const
+SfxPoolItem* SfxTabDialogItem::Create(SvStream& /*rStream*/, sal_uInt16 /*nVersion*/) const
 {
     OSL_FAIL( "Use it only in UI!" );
     return NULL;
@@ -136,7 +136,7 @@ class SfxTabDialogController : public SfxControllerItem
     SfxTabDialog*   pDialog;
     const SfxItemSet*     pSet;
 public:
-                    SfxTabDialogController( USHORT nSlotId, SfxBindings& rBindings, SfxTabDialog* pDlg )
+                    SfxTabDialogController( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxTabDialog* pDlg )
                         : SfxControllerItem( nSlotId, rBindings )
                         , pDialog( pDlg )
                         , pSet( NULL )
@@ -145,7 +145,7 @@ public:
                     ~SfxTabDialogController();
 
     DECL_LINK(      Execute_Impl, void* );
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 };
 
 SfxTabDialogController::~SfxTabDialogController()
@@ -168,21 +168,21 @@ IMPL_LINK( SfxTabDialogController, Execute_Impl, void*, pVoid )
     return 0;
 }
 
-void SfxTabDialogController::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+void SfxTabDialogController::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxSetItem* pSetItem = PTR_CAST( SfxSetItem, pState );
     if ( pSetItem )
     {
         pSet = pDialog->pSet = pSetItem->GetItemSet().Clone();
-        BOOL bDialogStarted = FALSE;
-        for ( USHORT n=0; n<pDialog->aTabCtrl.GetPageCount(); n++ )
+        sal_Bool bDialogStarted = sal_False;
+        for ( sal_uInt16 n=0; n<pDialog->aTabCtrl.GetPageCount(); n++ )
         {
-            USHORT nPageId = pDialog->aTabCtrl.GetPageId( n );
+            sal_uInt16 nPageId = pDialog->aTabCtrl.GetPageId( n );
             SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pDialog->aTabCtrl.GetTabPage( nPageId ));
             if ( pTabPage )
             {
                 pTabPage->Reset( pSetItem->GetItemSet() );
-                bDialogStarted = TRUE;
+                bDialogStarted = sal_True;
             }
         }
 
@@ -197,7 +197,7 @@ DECL_PTRARRAY(SfxTabDlgData_Impl, Data_Impl *, 4,4)
 
 struct TabDlg_Impl
 {
-    BOOL				bModified		: 1,
+    sal_Bool				bModified		: 1,
                         bModal			: 1,
                         bInOK			: 1,
                         bHideResetBtn	: 1;
@@ -206,25 +206,25 @@ struct TabDlg_Impl
     PushButton*			pApplyButton;
     SfxTabDialogController* pController;
 
-    TabDlg_Impl( BYTE nCnt ) :
+    TabDlg_Impl( sal_uInt8 nCnt ) :
 
-        bModified		( FALSE ),
-        bModal			( TRUE ),
-        bInOK			( FALSE ),
-        bHideResetBtn	( FALSE ),
+        bModified		( sal_False ),
+        bModal			( sal_True ),
+        bInOK			( sal_False ),
+        bHideResetBtn	( sal_False ),
         pData			( new SfxTabDlgData_Impl( nCnt ) ),
         pApplyButton    ( NULL ),
         pController     ( NULL )
     {}
 };
 
-Data_Impl* Find( SfxTabDlgData_Impl& rArr, USHORT nId, USHORT* pPos = 0 );
+Data_Impl* Find( SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt16* pPos = 0 );
 
-Data_Impl* Find( SfxTabDlgData_Impl& rArr, USHORT nId, USHORT* pPos )
+Data_Impl* Find( SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt16* pPos )
 {
-    const USHORT nCount = rArr.Count();
+    const sal_uInt16 nCount = rArr.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pObj = rArr[i];
 
@@ -264,7 +264,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
     TabPage( pParent, rResId ),
 
     pSet				( &rAttrSet ),
-    bHasExchangeSupport	( FALSE ),
+    bHasExchangeSupport	( sal_False ),
     pTabDlg				( NULL ),
     pImpl				( new TabPageImpl )
 
@@ -274,7 +274,7 @@ SfxTabPage::SfxTabPage( Window *pParent,
 SfxTabPage:: SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ) :
     TabPage(pParent, nStyle),
     pSet				( &rAttrSet ),
-    bHasExchangeSupport	( FALSE ),
+    bHasExchangeSupport	( sal_False ),
     pTabDlg				( NULL ),
     pImpl				( new TabPageImpl )
 {
@@ -296,7 +296,7 @@ SfxTabPage::~SfxTabPage()
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
 {
     return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() );
 }
@@ -368,14 +368,14 @@ void SfxTabPage::FillUserData()
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabPage::IsReadOnly() const
+sal_Bool SfxTabPage::IsReadOnly() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep )
+const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep )
 
 /*  [Beschreibung]
 
@@ -386,7 +386,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sa
 
 {
     const SfxItemPool* pPool = rSet.GetPool();
-    USHORT nWh = pPool->GetWhich( nSlot, bDeep );
+    sal_uInt16 nWh = pPool->GetWhich( nSlot, bDeep );
     const SfxPoolItem* pItem = 0;
     rSet.GetItemState( nWh, TRUE, &pItem );
 
@@ -398,7 +398,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sa
 // -----------------------------------------------------------------------
 
 const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
-                                           USHORT nSlot, sal_Bool bDeep )
+                                           sal_uInt16 nSlot, sal_Bool bDeep )
 
 /*  [Beschreibung]
 
@@ -408,7 +408,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
 
 {
     const SfxItemSet& rOldSet = GetItemSet();
-    USHORT nWh = GetWhich( nSlot, bDeep );
+    sal_uInt16 nWh = GetWhich( nSlot, bDeep );
     const SfxPoolItem* pItem = 0;
 
     if ( pImpl->mbStandard && rOldSet.GetParent() )
@@ -424,7 +424,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
 // -----------------------------------------------------------------------
 
 const SfxPoolItem* SfxTabPage::GetExchangeItem( const SfxItemSet& rSet,
-                                                USHORT nSlot )
+                                                sal_uInt16 nSlot )
 
 /*  [Beschreibung]
 
@@ -480,11 +480,11 @@ void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
     aBaseFmtBtn	( this ),\
     pSet        ( ItemSetPtr ),\
     pOutSet		( 0 ),\
-    pImpl		( new TabDlg_Impl( (BYTE)aTabCtrl.GetPageCount() ) ), \
+    pImpl		( new TabDlg_Impl( (sal_uInt8)aTabCtrl.GetPageCount() ) ), \
     pRanges		( 0 ), \
     nResId		( rResId.GetId() ), \
     nAppPageId	( USHRT_MAX ), \
-    bItemsReset	( FALSE ),\
+    bItemsReset	( sal_False ),\
     bFmt		( bEditFmt ),\
     pExampleSet	( 0 )
 
@@ -503,7 +503,7 @@ SfxTabDialog::SfxTabDialog
     const ResId& rResId, 			// ResourceId
     const SfxItemSet* pItemSet,		// Itemset mit den Daten;
                                     // kann NULL sein, wenn Pages onDemand
-    BOOL bEditFmt,		// Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,		// Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText 	// Text fuer BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -529,7 +529,7 @@ SfxTabDialog::SfxTabDialog
     const ResId& rResId, 			// ResourceId
     const SfxItemSet* pItemSet,		// Itemset mit den Daten; kann NULL sein,
                                     // wenn Pages onDemand
-    BOOL bEditFmt,		// Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,		// Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText 	// Text f"ur BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -552,9 +552,9 @@ SfxTabDialog::SfxTabDialog
 (
     Window* pParent,				// Parent-Fenster
     const ResId& rResId, 			// ResourceId
-    USHORT nSetId,
+    sal_uInt16 nSetId,
     SfxBindings& rBindings,
-    BOOL bEditFmt,		// Flag: es werden Vorlagen bearbeitet
+    sal_Bool bEditFmt,		// Flag: es werden Vorlagen bearbeitet
                         // wenn ja -> zus"atzlicher Button f"ur Standard
     const String* pUserButtonText 	// Text f"ur BenutzerButton;
                                     // wenn != 0, wird der UserButton erzeugt
@@ -567,7 +567,7 @@ SfxTabDialog::SfxTabDialog
     pImpl->pController = new SfxTabDialogController( nSetId, rBindings, this );
     rBindings.LEAVEREGISTRATIONS();
 
-    EnableApplyButton( TRUE );
+    EnableApplyButton( sal_True );
     SetApplyHandler( LINK( pImpl->pController, SfxTabDialogController, Execute_Impl ) );
 
     rBindings.Invalidate( nSetId );
@@ -599,8 +599,8 @@ SfxTabDialog::~SfxTabDialog()
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
     aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
 
-    const USHORT nCount = pImpl->pData->Count();
-    for ( USHORT i = 0; i < nCount; ++i )
+    const sal_uInt16 nCount = pImpl->pData->Count();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
 
@@ -635,7 +635,7 @@ SfxTabDialog::~SfxTabDialog()
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
+void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText )
 
 /*  [Beschreibung]
 
@@ -674,13 +674,13 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
         aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN );
 
         // bFmt = tempor"ares Flag im Ctor() "ubergeben,
-        // wenn bFmt == 2, dann auch TRUE,
+        // wenn bFmt == 2, dann auch sal_True,
         // zus"atzlich Ausblendung vom StandardButton,
-        // nach der Initialisierung wieder auf TRUE setzen
+        // nach der Initialisierung wieder auf sal_True setzen
         if ( bFmtFlag != 2 )
             aBaseFmtBtn.Show();
         else
-            bFmtFlag = TRUE;
+            bFmtFlag = sal_True;
     }
 
     if ( pSet )
@@ -688,6 +688,11 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
         pExampleSet = new SfxItemSet( *pSet );
         pOutSet = new SfxItemSet( *pSet->GetPool(), pSet->GetRanges() );
     }
+
+    aOKBtn.SetAccessibleRelationMemberOf( &aOKBtn );
+    aCancelBtn.SetAccessibleRelationMemberOf( &aCancelBtn );
+    aHelpBtn.SetAccessibleRelationMemberOf( &aHelpBtn );
+    aResetBtn.SetAccessibleRelationMemberOf( &aResetBtn );
 }
 
 // -----------------------------------------------------------------------
@@ -695,7 +700,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText )
 void SfxTabDialog::RemoveResetButton()
 {
     aResetBtn.Hide();
-    pImpl->bHideResetBtn = TRUE;
+    pImpl->bHideResetBtn = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -729,10 +734,10 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::Start( BOOL bShow )
+void SfxTabDialog::Start( sal_Bool bShow )
 {
     aCancelBtn.SetClickHdl( LINK( this, SfxTabDialog, CancelHdl ) );
-    pImpl->bModal = FALSE;
+    pImpl->bModal = sal_False;
     Start_Impl();
 
     if ( bShow )
@@ -761,7 +766,7 @@ Link SfxTabDialog::GetApplyHandler() const
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::EnableApplyButton(BOOL bEnable)
+void SfxTabDialog::EnableApplyButton(sal_Bool bEnable)
 {
     if ( IsApplyButtonEnabled() == bEnable )
         // nothing to do
@@ -795,7 +800,7 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable)
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabDialog::IsApplyButtonEnabled() const
+sal_Bool SfxTabDialog::IsApplyButtonEnabled() const
 {
     return ( NULL != pImpl->pApplyButton );
 }
@@ -819,7 +824,7 @@ PushButton* SfxTabDialog::GetApplyButton()
 void SfxTabDialog::Start_Impl()
 {
     DBG_ASSERT( pImpl->pData->Count() == aTabCtrl.GetPageCount(), "not all pages registered" );
-    USHORT nActPage = aTabCtrl.GetPageId( 0 );
+    sal_uInt16 nActPage = aTabCtrl.GetPageId( 0 );
 
     // load old settings, when exists
     SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
@@ -830,13 +835,13 @@ void SfxTabDialog::Start_Impl()
 #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
 
         // initiale TabPage aus Programm/Hilfe/Konfig
-        nActPage = (USHORT)aDlgOpt.GetPageID();
+        nActPage = (sal_uInt16)aDlgOpt.GetPageID();
 
         if ( USHRT_MAX != nAppPageId )
             nActPage = nAppPageId;
         else
         {
-            USHORT nAutoTabPageId = SFX_APP()->Get_Impl()->nAutoTabPageId;
+            sal_uInt16 nAutoTabPageId = SFX_APP()->Get_Impl()->nAutoTabPageId;
             if ( nAutoTabPageId )
                 nActPage = nAutoTabPageId;
         }
@@ -851,19 +856,19 @@ void SfxTabDialog::Start_Impl()
     ActivatePageHdl( &aTabCtrl );
 }
 
-void SfxTabDialog::AddTabPage( USHORT nId, BOOL bItemsOnDemand )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, sal_Bool bItemsOnDemand )
 {
     AddTabPage( nId, 0, 0, bItemsOnDemand );
 }
 
-void SfxTabDialog::AddTabPage( USHORT nId, const String &rRiderText, BOOL bItemsOnDemand, USHORT nPos )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, const String &rRiderText, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
 {
     AddTabPage( nId, rRiderText, 0, 0, bItemsOnDemand, nPos );
 }
 
 #ifdef SV_HAS_RIDERBITMAPS
 
-void SfxTabDialog::AddTabPage( USHORT nId, const Bitmap &rRiderBitmap, BOOL bItemsOnDemand, USHORT nPos )
+void SfxTabDialog::AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, sal_Bool bItemsOnDemand, sal_uInt16 nPos )
 {
     AddTabPage( nId, rRiderBitmap, 0, 0, bItemsOnDemand, nPos );
 }
@@ -882,11 +887,11 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,						// ID der Seite
+    sal_uInt16 nId,						// ID der Seite
     CreateTabPage pCreateFunc,		// Pointer auf die Factory-Methode
     GetTabPageRanges pRangesFunc, 	// Pointer auf die Methode f"ur das
                                     // Erfragen der Ranges onDemand
-    BOOL bItemsOnDemand				// gibt an, ob das Set dieser Seite beim
+    sal_Bool bItemsOnDemand				// gibt an, ob das Set dieser Seite beim
                                     // Erzeugen der Seite erfragt wird
 )
 {
@@ -906,12 +911,12 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,
+    sal_uInt16 nId,
     const String& rRiderText,
     CreateTabPage pCreateFunc,
     GetTabPageRanges pRangesFunc,
-    BOOL bItemsOnDemand,
-    USHORT nPos
+    sal_Bool bItemsOnDemand,
+    sal_uInt16 nPos
 )
 {
     DBG_ASSERT( TAB_PAGE_NOTFOUND == aTabCtrl.GetPagePos( nId ),
@@ -934,12 +939,12 @@ void SfxTabDialog::AddTabPage
 */
 
 (
-    USHORT nId,
+    sal_uInt16 nId,
     const Bitmap &rRiderBitmap,
     CreateTabPage pCreateFunc,
     GetTabPageRanges pRangesFunc,
-    BOOL bItemsOnDemand,
-    USHORT nPos
+    sal_Bool bItemsOnDemand,
+    sal_uInt16 nPos
 )
 {
     DBG_ASSERT(	TAB_PAGE_NOTFOUND == aTabCtrl.GetPagePos( nId ),
@@ -952,7 +957,7 @@ void SfxTabDialog::AddTabPage
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::RemoveTabPage( USHORT nId )
+void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
 
 /*  [Beschreibung]
 
@@ -960,7 +965,7 @@ void SfxTabDialog::RemoveTabPage( USHORT nId )
 */
 
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     aTabCtrl.RemovePage( nId );
     Data_Impl* pDataObject = Find( *pImpl->pData, nId, &nPos );
 
@@ -1003,7 +1008,7 @@ void SfxTabDialog::PageCreated
 */
 
 (
-    USHORT,			// Id der erzeugten Seite
+    sal_uInt16,			// Id der erzeugten Seite
     SfxTabPage&		// Referenz auf die erzeugte Seite
 )
 {
@@ -1026,7 +1031,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl()
 
 // -----------------------------------------------------------------------
 
-SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
+SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
 
 /*  [Beschreibung]
 
@@ -1034,7 +1039,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
 */
 
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     Data_Impl* pDataObject = Find( *pImpl->pData, nPageId, &nPos );
 
     if ( pDataObject )
@@ -1044,7 +1049,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
 
 // -----------------------------------------------------------------------
 
-BOOL SfxTabDialog::IsInOK() const
+sal_Bool SfxTabDialog::IsInOK() const
 {
     return pImpl->bInOK;
 }
@@ -1063,25 +1068,25 @@ short SfxTabDialog::Ok()
 
     [R"uckgabewert]
 
-    RET_OK:	wenn mindestens eine Seite TRUE als Returnwert von
+    RET_OK:	wenn mindestens eine Seite sal_True als Returnwert von
             FillItemSet geliefert hat, sonst RET_CANCEL.
 */
 
 {
-    pImpl->bInOK = TRUE;
+    pImpl->bInOK = sal_True;
 
     if ( !pOutSet )
     {
         if ( !pExampleSet && pSet )
-            pOutSet = pSet->Clone( FALSE );	// ohne Items
+            pOutSet = pSet->Clone( sal_False );	// ohne Items
         else if ( pExampleSet )
             pOutSet = new SfxItemSet( *pExampleSet );
     }
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
 
-    const USHORT nCount = pImpl->pData->Count();
+    const sal_uInt16 nCount = pImpl->pData->Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
         SfxTabPage* pTabPage = pDataObject->pTabPage;
@@ -1100,7 +1105,7 @@ short SfxTabDialog::Ok()
 
                 if ( pTabPage->FillItemSet( aTmp ) )
                 {
-                    bModified |= TRUE;
+                    bModified |= sal_True;
                     pExampleSet->Put( aTmp );
                     pOutSet->Put( aTmp );
                 }
@@ -1109,10 +1114,10 @@ short SfxTabDialog::Ok()
     }
 
     if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) )
-        bModified |= TRUE;
+        bModified |= sal_True;
 
     if ( bFmt == 2 )
-        bModified |= TRUE;
+        bModified |= sal_True;
     return bModified ? RET_OK : RET_CANCEL;
 }
 
@@ -1127,7 +1132,7 @@ IMPL_LINK( SfxTabDialog, CancelHdl, Button*, pButton )
 
 // -----------------------------------------------------------------------
 
-SfxItemSet* SfxTabDialog::CreateInputItemSet( USHORT )
+SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
 
 /*  [Beschreibung]
 
@@ -1170,7 +1175,7 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
 */
 
 {
-    pImpl->bInOK = TRUE;
+    pImpl->bInOK = sal_True;
 
     if ( OK_Impl() )
     {
@@ -1189,7 +1194,7 @@ IMPL_LINK( SfxTabDialog, OkHdl, Button *, EMPTYARG )
 
 bool SfxTabDialog::PrepareLeaveCurrentPage()
 {
-    USHORT const nId = aTabCtrl.GetCurPageId();
+    sal_uInt16 const nId = aTabCtrl.GetCurPageId();
     SfxTabPage* pPage = dynamic_cast<SfxTabPage*> (aTabCtrl.GetTabPage( nId ));
     bool bEnd = !pPage;
 
@@ -1261,7 +1266,7 @@ IMPL_LINK( SfxTabDialog, ResetHdl, Button *, EMPTYARG )
 */
 
 {
-    const USHORT nId = aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = aTabCtrl.GetCurPageId();
     Data_Impl* pDataObject = Find( *pImpl->pData, nId );
     DBG_ASSERT( pDataObject, "Id nicht bekannt" );
 
@@ -1289,7 +1294,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
 */
 
 {
-    const USHORT nId = aTabCtrl.GetCurPageId();
+    const sal_uInt16 nId = aTabCtrl.GetCurPageId();
     Data_Impl* pDataObject = Find( *pImpl->pData, nId );
     DBG_ASSERT( pDataObject, "Id nicht bekannt" );
     bFmt = 2;
@@ -1300,17 +1305,17 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
             pExampleSet = new SfxItemSet( *pSet );
 
         const SfxItemPool* pPool = pSet->GetPool();
-        const USHORT* pTmpRanges = (pDataObject->fnGetRanges)();
+        const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
         SfxItemSet aTmpSet( *pExampleSet );
 
         while ( *pTmpRanges )
         {
-            const USHORT* pU = pTmpRanges + 1;
+            const sal_uInt16* pU = pTmpRanges + 1;
 
             if ( *pTmpRanges == *pU )
             {
                 // Range mit zwei gleichen Werten -> nur ein Item setzen
-                USHORT nWh = pPool->GetWhich( *pTmpRanges );
+                sal_uInt16 nWh = pPool->GetWhich( *pTmpRanges );
                 pExampleSet->ClearItem( nWh );
                 aTmpSet.ClearItem( nWh );
                 // am OutSet mit InvalidateItem,
@@ -1320,13 +1325,13 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
             else
             {
                 // richtiger Range mit mehreren Werten
-                USHORT nTmp = *pTmpRanges, nTmpEnd = *pU;
+                sal_uInt16 nTmp = *pTmpRanges, nTmpEnd = *pU;
                 DBG_ASSERT( nTmp <= nTmpEnd, "Range ist falsch sortiert" );
 
                 if ( nTmp > nTmpEnd )
                 {
                     // wenn wirklich falsch sortiert, dann neu setzen
-                    USHORT nTmp1 = nTmp;
+                    sal_uInt16 nTmp1 = nTmp;
                     nTmp = nTmpEnd;
                     nTmpEnd = nTmp1;
                 }
@@ -1334,7 +1339,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
                 while ( nTmp <= nTmpEnd )
                 {
                     // "uber den Range iterieren, und die Items setzen
-                    USHORT nWh = pPool->GetWhich( nTmp );
+                    sal_uInt16 nWh = pPool->GetWhich( nTmp );
                     pExampleSet->ClearItem( nWh );
                     aTmpSet.ClearItem( nWh );
                     // am OutSet mit InvalidateItem,
@@ -1349,7 +1354,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
         // alle Items neu gesetzt -> dann an der aktuellen Page Reset() rufen
         DBG_ASSERT( pDataObject->pTabPage, "die Page ist weg" );
         pDataObject->pTabPage->Reset( aTmpSet );
-        pDataObject->pTabPage->pImpl->mbStandard = TRUE;
+        pDataObject->pTabPage->pImpl->mbStandard = sal_True;
     }
     return 1;
 }
@@ -1369,14 +1374,14 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     Handler, der vor dem Umschalten auf eine andere Seite
     durch Starview gerufen wird.
     Existiert die Seite noch nicht, so wird sie erzeugt und
-    die virtuelle Methode <SfxTabDialog::PageCreated( USHORT, SfxTabPage &)>
+    die virtuelle Methode <SfxTabDialog::PageCreated( sal_uInt16, SfxTabPage &)>
     gerufen. Existiert die Seite bereits, so wird ggf.
     <SfxTabPage::Reset(const SfxItemSet &)> oder
     <SfxTabPage::ActivatePage(const SfxItemSet &)> gerufen.
 */
 
 {
-    USHORT const nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 const nId = pTabCtrl->GetCurPageId();
 
     DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
     SFX_APP();
@@ -1458,7 +1463,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     }
     else if ( pDataObject->bRefresh )
         pTabPage->Reset( *pSet );
-    pDataObject->bRefresh = FALSE;
+    pDataObject->bRefresh = sal_False;
 
 #if ENABLE_LAYOUT_SFX_TABDIALOG
     pTabCtrl->GetPagePos (nId);
@@ -1466,7 +1471,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
     if ( pExampleSet )
         pTabPage->ActivatePage( *pExampleSet );
-    BOOL bReadOnly = pTabPage->IsReadOnly();
+    sal_Bool bReadOnly = pTabPage->IsReadOnly();
     ( bReadOnly || pImpl->bHideResetBtn ) ? aResetBtn.Hide() : aResetBtn.Show();
     return 0;
 }
@@ -1485,7 +1490,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
 */
 
 {
-    USHORT nId = pTabCtrl->GetCurPageId();
+    sal_uInt16 nId = pTabCtrl->GetCurPageId();
     SFX_APP();
     SfxTabPage *pPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
     DBG_ASSERT( pPage, "keine aktive Page" );
@@ -1540,22 +1545,22 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
         pSet = GetRefreshedSet();
         DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" );
         // alle Pages als neu zu initialsieren flaggen
-        const USHORT nCount = pImpl->pData->Count();
+        const sal_uInt16 nCount = pImpl->pData->Count();
 
-        for ( USHORT i = 0; i < nCount; ++i )
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             Data_Impl* pObj = (*pImpl->pData)[i];
 
             if ( pObj->pTabPage != pPage ) // eigene Page nicht mehr refreshen
-                pObj->bRefresh = TRUE;
+                pObj->bRefresh = sal_True;
             else
-                pObj->bRefresh = FALSE;
+                pObj->bRefresh = sal_False;
         }
     }
     if ( nRet & SfxTabPage::LEAVE_PAGE )
-        return TRUE;
+        return sal_True;
     else
-        return FALSE;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -1568,13 +1573,13 @@ const SfxItemSet* SfxTabDialog::GetOutputItemSet
 
     [Querverweise]
 
-    <SfxTabDialog::AddTabPage(USHORT, CreateTabPage, GetTabPageRanges, BOOL)>
-    <SfxTabDialog::AddTabPage(USHORT, const String &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
-    <SfxTabDialog::AddTabPage(USHORT, const Bitmap &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
 */
 
 (
-    USHORT nId	// die Id, unter der die Seite bei AddTabPage()
+    sal_uInt16 nId	// die Id, unter der die Seite bei AddTabPage()
                 // hinzugef"ugt wurde.
 ) const
 {
@@ -1623,12 +1628,12 @@ extern "C" int TabDlgCmpUS_Impl( const void* p1, const void* p2 )
 */
 
 {
-    return *(USHORT*)p1 - *(USHORT*)p2;
+    return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
 }
 
 // -----------------------------------------------------------------------
 
-void SfxTabDialog::ShowPage( USHORT nId )
+void SfxTabDialog::ShowPage( sal_uInt16 nId )
 
 /*  [Beschreibung]
 
@@ -1642,7 +1647,7 @@ void SfxTabDialog::ShowPage( USHORT nId )
 
 // -----------------------------------------------------------------------
 
-const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
+const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
 /*  [Beschreibung]
 
@@ -1652,9 +1657,9 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
     [Querverweise]
 
-    <SfxTabDialog::AddTabPage(USHORT, CreateTabPage, GetTabPageRanges, BOOL)>
-    <SfxTabDialog::AddTabPage(USHORT, const String &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
-    <SfxTabDialog::AddTabPage(USHORT, const Bitmap &, CreateTabPage, GetTabPageRanges, BOOL, USHORT)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, CreateTabPage, GetTabPageRanges, sal_Bool)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const String &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
+    <SfxTabDialog::AddTabPage(sal_uInt16, const Bitmap &, CreateTabPage, GetTabPageRanges, sal_Bool, sal_uInt16)>
 
     [R"uckgabewert]
 
@@ -1673,19 +1678,19 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     if ( pRanges )
         return pRanges;
     SvUShorts aUS( 16, 16 );
-    USHORT nCount = pImpl->pData->Count();
+    sal_uInt16 nCount = pImpl->pData->Count();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < nCount; ++i )
     {
         Data_Impl* pDataObject = pImpl->pData->GetObject(i);
 
         if ( pDataObject->fnGetRanges )
         {
-            const USHORT* pTmpRanges = (pDataObject->fnGetRanges)();
-            const USHORT* pIter = pTmpRanges;
+            const sal_uInt16* pTmpRanges = (pDataObject->fnGetRanges)();
+            const sal_uInt16* pIter = pTmpRanges;
 
-            USHORT nLen;
+            sal_uInt16 nLen;
             for( nLen = 0; *pIter; ++nLen, ++pIter )
                 ;
             aUS.Insert( pTmpRanges, nLen, aUS.Count() );
@@ -1706,10 +1711,10 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     // sortieren
     if ( aUS.Count() > 1 )
         qsort( (void*)aUS.GetData(),
-               aUS.Count(), sizeof(USHORT), TabDlgCmpUS_Impl );
+               aUS.Count(), sizeof(sal_uInt16), TabDlgCmpUS_Impl );
 
-    pRanges = new USHORT[aUS.Count() + 1];
-    memcpy(pRanges, aUS.GetData(), sizeof(USHORT) * aUS.Count());
+    pRanges = new sal_uInt16[aUS.Count() + 1];
+    memcpy(pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count());
     pRanges[aUS.Count()] = 0;
     return pRanges;
 }
@@ -1744,15 +1749,15 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt )
         if ( pViewFrame )
         {
             Window* pWindow = rNEvt.GetWindow();
-            ULONG nHelpId  = 0;
-            while ( !nHelpId && pWindow )
+            rtl::OString sHelpId;
+            while ( !sHelpId.getLength() && pWindow )
             {
-                nHelpId = pWindow->GetHelpId();
+                sHelpId = pWindow->GetHelpId();
                 pWindow = pWindow->GetParent();
             }
 
-            if ( nHelpId )
-                SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), nHelpId );
+            if ( sHelpId.getLength() )
+                SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), sHelpId );
         }
     }
 
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index fa9126ebf3..b33b20b4b1 100644..100755
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -61,7 +61,7 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-
+#include <tools/urlobj.hxx>
 #include <boost/noncopyable.hpp>
 
 //......................................................................................................................
@@ -244,7 +244,7 @@ namespace sfx2
     SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE );
 
     //------------------------------------------------------------------------------------------------------------------
-    TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, USHORT i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
+    TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
         :SfxChildWindow( i_pParent, i_nId )
     {
         pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent,
@@ -255,7 +255,7 @@ namespace sfx2
         pWindow->SetOutputSizePixel( Size( 300, 450 ) );
 
         dynamic_cast< SfxDockingWindow* >( pWindow )->Initialize( i_pInfo );
-        SetHideNotDelete( TRUE );
+        SetHideNotDelete( sal_True );
 
         pWindow->Show();
     }
@@ -310,7 +310,7 @@ namespace sfx2
 
         virtual ::rtl::OUString GetDisplayName() const;
         virtual Image GetImage() const;
-        virtual SmartId GetHelpID() const;
+        virtual rtl::OString GetHelpID() const;
         virtual void Activate( Window& i_rParentWindow );
         virtual void Deactivate();
         virtual void SetSizePixel( const Size& i_rPanelWindowSize );
@@ -409,10 +409,19 @@ namespace sfx2
         return m_aPanelImage;
     }
 
+    static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL )
+    {
+        INetURLObject aHID( _rHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+            return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+        else
+            return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
+    }
+
     //------------------------------------------------------------------------------------------------------------------
-    SmartId CustomToolPanel::GetHelpID() const
+    rtl::OString CustomToolPanel::GetHelpID() const
     {
-        return SmartId( m_aPanelHelpURL );
+        return lcl_getHelpId( m_aPanelHelpURL );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -914,7 +923,7 @@ namespace sfx2
 
         ModuleTaskPane&         m_rTaskPane;
         TitledDockingWindow&    m_rDockingWindow;
-        USHORT                  m_nViewMenuID;
+        sal_uInt16                  m_nViewMenuID;
         PanelSelectorLayout     m_eCurrentLayout;
         PanelDescriptors        m_aPanelRepository;
         bool                    m_bTogglingPanelVisibility;
@@ -1033,11 +1042,11 @@ namespace sfx2
         switch ( i_pMenu->GetCurItemId() )
         {
             case MID_UNLOCK_TASK_PANEL:
-                m_rDockingWindow.SetFloatingMode( TRUE );
+                m_rDockingWindow.SetFloatingMode( sal_True );
                 break;
 
             case MID_LOCK_TASK_PANEL:
-                m_rDockingWindow.SetFloatingMode( FALSE );
+                m_rDockingWindow.SetFloatingMode( sal_False );
                 break;
 
             case MID_LAYOUT_DRAWERS:
@@ -1224,7 +1233,7 @@ namespace sfx2
 
         // Add one entry for every tool panel element to individually make
         // them visible or hide them.
-        USHORT nIndex = MID_FIRST_PANEL;
+        sal_uInt16 nIndex = MID_FIRST_PANEL;
         for ( size_t i=0; i<m_aPanelRepository.size(); ++i, ++nIndex )
         {
             const PanelDescriptor& rPanelDesc( m_aPanelRepository[i] );
@@ -1254,7 +1263,7 @@ namespace sfx2
                 String( SfxResId( STR_SFX_UNDOCK ) )
             );
 
-        pMenu->RemoveDisabledEntries( FALSE, FALSE );
+        pMenu->RemoveDisabledEntries( sal_False, sal_False );
                 
         return pMenu;
     }
diff --git a/sfx2/source/dialog/taskpane.src b/sfx2/source/dialog/taskpane.src
index 4d1a991c0c..4d1a991c0c 100644..100755
--- a/sfx2/source/dialog/taskpane.src
+++ b/sfx2/source/dialog/taskpane.src
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 50a51cc5b0..80769329ff 100644..100755
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
@@ -57,8 +57,8 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/newstyle.hxx>
-#include "tplpitem.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/tplpitem.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include "templdlg.hrc"
 #include <sfx2/sfx.hrc>
@@ -70,7 +70,7 @@
 #include "docvor.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/module.hxx>
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "helpid.hrc"
 #include "appdata.hxx"
 #include <sfx2/viewfrm.hxx>
@@ -95,7 +95,7 @@ using namespace ::com::sun::star::uno;
 #define SFX_TEMPLDLG_MIDVSPACE		3
 #define SFX_TEMPLDLG_FILTERHEIGHT	100
 
-static USHORT nLastItemId = USHRT_MAX;
+static sal_uInt16 nLastItemId = USHRT_MAX;
 
 // filter box has maximum 12 entries visible
 #define MAX_FILTER_ENTRIES          12
@@ -236,7 +236,7 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     nModifier = rMEvt.GetModifier();
 
-    BOOL bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), TRUE ) );
+    sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), sal_True ) );
     if( bHitEmptySpace && ( rMEvt.GetClicks() == 2 ) && rMEvt.IsMod1() )
         Control::MouseButtonDown( rMEvt );
     else
@@ -382,8 +382,8 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
 
     if( !( GetSelectionCount() > 0 ) )
     {
-        pDialog->EnableEdit( FALSE );
-        pDialog->EnableDel( FALSE );
+        pDialog->EnableEdit( sal_False );
+        pDialog->EnableDel( sal_False );
     }
     return pDialog->CreateContextMenu();
 }
@@ -391,7 +391,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
 //-------------------------------------------------------------------------
 
 SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd,
-        USHORT nId,  SfxBindings *p, SfxChildWinInfo *pInfo) :
+        sal_uInt16 nId,  SfxBindings *p, SfxChildWinInfo *pInfo) :
     SfxChildWindow(pParentWnd, nId)
 {
     SfxTemplateDialog *pWin = new SfxTemplateDialog(p, this, pParentWnd);
@@ -432,13 +432,13 @@ private:
 protected:
     virtual void    Command( const CommandEvent& rMEvt );
     virtual long 	Notify( NotifyEvent& rNEvt );
-    virtual BOOL    DoubleClickHdl();
+    virtual sal_Bool    DoubleClickHdl();
     virtual long    ExpandingHdl();
     virtual void    ExpandedHdl();
-    virtual BOOL    NotifyMoving(SvLBoxEntry*  pTarget,
+    virtual sal_Bool    NotifyMoving(SvLBoxEntry*  pTarget,
                                      SvLBoxEntry*  pEntry,
                                      SvLBoxEntry*& rpNewParent,
-                                     ULONG&        rNewChildPos);
+                                     sal_uIntPtr&        rNewChildPos);
 public:
     StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0);
 
@@ -458,7 +458,7 @@ public:
 void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries& rEntries) const
 {
     SvLBoxEntry *pEntry;
-    USHORT nCount=0;
+    sal_uInt16 nCount=0;
     for(pEntry=(SvLBoxEntry*)FirstVisible();pEntry;pEntry=(SvLBoxEntry*)NextVisible(pEntry))
     {
         if(IsExpanded(pEntry))
@@ -474,7 +474,7 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu()
     return pDialog->CreateContextMenu();
 }
 
-BOOL StyleTreeListBox_Impl::DoubleClickHdl()
+sal_Bool StyleTreeListBox_Impl::DoubleClickHdl()
 
 /*  [Beschreibung]
 
@@ -485,7 +485,7 @@ BOOL StyleTreeListBox_Impl::DoubleClickHdl()
 */
 {
     aDoubleClickLink.Call(this);
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -528,10 +528,10 @@ long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
 
 //-------------------------------------------------------------------------
 
-BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
+sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
                                          SvLBoxEntry*  pEntry,
                                          SvLBoxEntry*& rpNewParent,
-                                         ULONG& lPos)
+                                         sal_uIntPtr& lPos)
 /*  [Beschreibung]
 
     NotifyMoving Handler; dieser leitet per Link das Event an den Dialog
@@ -541,10 +541,10 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
 */
 {
     if(!pTarget || !pEntry)
-        return FALSE;
+        return sal_False;
     aParent = GetEntryText(pTarget);
     aStyle  = GetEntryText(pEntry);
-    const BOOL bRet = (BOOL)aDropLink.Call(this);
+    const sal_Bool bRet = (sal_Bool)aDropLink.Call(this);
     rpNewParent = pTarget;
     lPos=0;
     IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
@@ -554,7 +554,7 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry*  pTarget,
             GetEntryText(pTmpEntry),GetEntryText(pEntry));
         pTmpEntry=NextSibling(pTmpEntry),lPos++) ;
 
-    return bRet? (BOOL)2: FALSE;
+    return bRet? (sal_Bool)2: sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -572,7 +572,7 @@ long  StyleTreeListBox_Impl::ExpandingHdl()
 */
 {
     pCurEntry = GetCurEntry();
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -592,7 +592,7 @@ void  StyleTreeListBox_Impl::ExpandedHdl()
 {
     SvLBoxEntry *pEntry = GetHdlEntry();
     if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry())
-        SelectAll( FALSE );
+        SelectAll( sal_False );
     pCurEntry = 0;
 }
 
@@ -630,14 +630,14 @@ struct StyleTree_Impl
     String aName;
     String aParent;
     StyleTreeArr_Impl *pChilds;
-    BOOL bIsExpanded;
-    BOOL HasParent() const { return aParent.Len() != 0; }
+    sal_Bool bIsExpanded;
+    sal_Bool HasParent() const { return aParent.Len() != 0; }
 
     StyleTree_Impl(const String &rName, const String &rParent):
         aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {}
     ~StyleTree_Impl();
-    void Put(StyleTree_Impl* pIns, ULONG lPos=ULONG_MAX);
-    ULONG Count();
+    void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
+    sal_uIntPtr Count();
 };
 
 typedef StyleTree_Impl* StyleTree_ImplPtr;
@@ -645,7 +645,7 @@ SV_DECL_PTRARR_DEL(StyleTreeArr_Impl, StyleTree_ImplPtr, 16, 8)
 SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr)
 
 
-ULONG StyleTree_Impl::Count()
+sal_uIntPtr StyleTree_Impl::Count()
 {
     return pChilds ? pChilds->Count() : 0L;
 }
@@ -659,40 +659,40 @@ StyleTree_Impl::~StyleTree_Impl()
 
 //-------------------------------------------------------------------------
 
-void StyleTree_Impl::Put(StyleTree_Impl* pIns, ULONG lPos)
+void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
 {
     if ( !pChilds )
         pChilds = new StyleTreeArr_Impl;
 
     if ( ULONG_MAX == lPos )
         lPos = pChilds->Count();
-    pChilds->Insert( pIns, (USHORT)lPos );
+    pChilds->Insert( pIns, (sal_uInt16)lPos );
 }
 
 //-------------------------------------------------------------------------
 
 StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
 {
-    const USHORT nCount = rArr.Count();
+    const sal_uInt16 nCount = rArr.Count();
 
     comphelper::string::NaturalStringSorter aSorter(
         ::comphelper::getProcessComponentContext(),
         Application::GetSettings().GetLocale());
 
     // Alle unter ihren Parents einordnen
-    USHORT i;
+    sal_uInt16 i;
     for(i = 0; i < nCount; ++i)
     {
         StyleTree_ImplPtr pEntry = rArr[i];
         if(pEntry->HasParent())
         {
-            for(USHORT j = 0; j < nCount; ++j)
+            for(sal_uInt16 j = 0; j < nCount; ++j)
             {
                 StyleTree_ImplPtr pCmp = rArr[j];
                 if(pCmp->aName == pEntry->aParent)
                 {
                     // initial sortiert einfuegen
-                    USHORT nPos;
+                    sal_uInt16 ii;
                     for( nPos = 0 ; nPos < pCmp->Count() &&
                         aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++);
                     pCmp->Put(pEntry,nPos);
@@ -716,14 +716,14 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
 //-------------------------------------------------------------------------
 
 
-inline BOOL IsExpanded_Impl( const ExpandedEntries& rEntries,
+inline sal_Bool IsExpanded_Impl( const ExpandedEntries& rEntries,
                              const String &rStr)
 {
-    USHORT nCount=rEntries.Count();
-    for(USHORT n=0;n<nCount;n++)
+    sal_uInt16 nCount=rEntries.Count();
+    for(sal_uInt16 n=0;n<nCount;n++)
         if(*rEntries[n]==rStr)
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 
@@ -734,8 +734,8 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox,
                                  SvLBoxEntry* pParent = 0)
 {
     SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent);
-    const USHORT nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
-    for(USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry);
     return pNewEntry;
 }
@@ -759,31 +759,32 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx
                                 DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY ),
     pbDeleted               ( NULL ),
 
-    aFmtLb					( this, WB_BORDER | WB_TABSTOP ),
+    aFmtLb					( this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH ),
     aFilterLb				( pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP ),
 
     nActFamily				( 0xffff ),
     nActFilter				( 0 ),
     nAppFilter				( 0 ),
 
-    bDontUpdate				( FALSE ),
-    bIsWater				( FALSE ),
-    bEnabled				( TRUE ),
-    bUpdate					( FALSE ),
-    bUpdateFamily			( FALSE ),
-    bCanEdit				( FALSE ),
-    bCanDel					( FALSE ),
-    bCanNew					( TRUE ),
-    bWaterDisabled			( FALSE ),
-    bNewByExampleDisabled	( FALSE ),
-    bUpdateByExampleDisabled( FALSE ),
-    bTreeDrag				( TRUE ),
-    bHierarchical			( FALSE ),
-    bBindingUpdate			( TRUE )
-{
+    bDontUpdate				( sal_False ),
+    bIsWater				( sal_False ),
+    bEnabled				( sal_True ),
+    bUpdate					( sal_False ),
+    bUpdateFamily			( sal_False ),
+    bCanEdit				( sal_False ),
+    bCanDel					( sal_False ),
+    bCanNew					( sal_True ),
+    bWaterDisabled			( sal_False ),
+    bNewByExampleDisabled	( sal_False ),
+    bUpdateByExampleDisabled( sal_False ),
+    bTreeDrag				( sal_True ),
+    bHierarchical			( sal_False ),
+    bBindingUpdate			( sal_True )
+{
+    aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST));
     aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
     aFilterLb.SetHelpId( HID_TEMPLATE_FILTER );
-    aFmtLb.SetWindowBits( WB_HIDESELECTION );
+    aFmtLb.SetStyle( aFmtLb.GetStyle() | WB_SORT | WB_HIDESELECTION );
     Font aFont = aFmtLb.GetFont();
     aFont.SetWeight( WEIGHT_NORMAL );
     aFmtLb.SetFont( aFont );
@@ -810,28 +811,28 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
     nActFilter				( 0 ),
     nAppFilter				( 0 ),
 
-    bDontUpdate				( FALSE ),
-    bIsWater				( FALSE ),
-    bEnabled				( TRUE ),
-    bUpdate					( FALSE ),
-    bUpdateFamily			( FALSE ),
-    bCanEdit				( FALSE ),
-    bCanDel					( FALSE ),
-    bCanNew					( TRUE ),
-    bWaterDisabled			( FALSE ),
-    bNewByExampleDisabled	( FALSE ),
-    bUpdateByExampleDisabled( FALSE ),
-    bTreeDrag				( TRUE ),
-    bHierarchical			( FALSE ),
-    bBindingUpdate			( TRUE )
+    bDontUpdate				( sal_False ),
+    bIsWater				( sal_False ),
+    bEnabled				( sal_True ),
+    bUpdate					( sal_False ),
+    bUpdateFamily			( sal_False ),
+    bCanEdit				( sal_False ),
+    bCanDel					( sal_False ),
+    bCanNew					( sal_True ),
+    bWaterDisabled			( sal_False ),
+    bNewByExampleDisabled	( sal_False ),
+    bUpdateByExampleDisabled( sal_False ),
+    bTreeDrag				( sal_True ),
+    bHierarchical			( sal_False ),
+    bBindingUpdate			( sal_True )
 
 {
-    aFmtLb.SetWindowBits( WB_SORT );
+    aFmtLb.SetStyle( aFmtLb.GetStyle() | WB_SORT );
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
 {
     const SfxStyleFamilyItem *pItem = pStyleFamilies->at( nId );
     return SfxFamilyIdToNId(pItem->GetFamily())-1;
@@ -839,7 +840,7 @@ USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
+void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
 {
     SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
     if( !bEnable || !bUpdateByExampleDisabled )
@@ -849,7 +850,7 @@ void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
 //-------------------------------------------------------------------------
 
 
-USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId)
 {
     for ( size_t i = 0; i < pStyleFamilies->size(); i++ )
         if ( SfxFamilyIdToNId(pStyleFamilies->at( i )->GetFamily()) == nId+1 )
@@ -864,7 +865,8 @@ USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
 void SfxCommonTemplateDialog_Impl::ReadResource()
 {
     // globale Benutzer-Resource auslesen
-    for(USHORT i = 0; i < MAX_FAMILIES; ++i)
+    sal_uInt16 i;
+    for(i = 0; i < MAX_FAMILIES; ++i)
         pFamilyState[i] = 0;
 
     SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
@@ -879,7 +881,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     else
         pStyleFamilies = new SfxStyleFamilies( aFamId );
 
-    nActFilter = pCurObjShell ? static_cast< USHORT >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
+    nActFilter = pCurObjShell ? static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
     if ( pCurObjShell && 0xFFFF == nActFilter )
         nActFilter = pCurObjShell->GetAutoStyleFilterIndex();
 
@@ -892,7 +894,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     size_t i;
     for(i = 0; i < nCount; ++i)
     {
-        USHORT nSlot = 0;
+        sal_uInt16 nSlot = 0;
         switch( (USHORT)pStyleFamilies->at( i )->GetFamily() )
         {
             case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break;
@@ -945,14 +947,14 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     for( ; nCount--; )
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->at( nCount );
-        USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+        sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
         InsertFamilyItem( nId, pItem );
     }
 
     LoadedFamilies();
 
-    USHORT nStart = SID_STYLE_FAMILY1;
-    USHORT nEnd = SID_STYLE_FAMILY4;
+    sal_uInt16 nStart = SID_STYLE_FAMILY1;
+    sal_uInt16 nEnd = SID_STYLE_FAMILY4;
 
     for ( i = nStart; i <= nEnd; i++ )
         pBindings->Update(i);
@@ -966,7 +968,7 @@ void SfxCommonTemplateDialog_Impl::ClearResource()
 {
     ClearFamilyList();
     DELETEX(pStyleFamilies);
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < MAX_FAMILIES; ++i )
         DELETEX(pFamilyState[i]);
     for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1004,7 +1006,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
     GetWindow()->Hide();
     DELETEX(pStyleFamilies);
     DELETEZ( m_pStyleFamiliesId );
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < MAX_FAMILIES; ++i )
         DELETEX(pFamilyState[i]);
     for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1023,7 +1025,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 
 //-------------------------------------------------------------------------
 
-USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
+sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
 {
     switch ( nFamily )
     {
@@ -1038,10 +1040,10 @@ USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
 
 void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
 {
-    USHORT nCount = aFilterLb.GetEntryCount();
-    for ( USHORT i = 0; i < nCount; ++i )
+    sal_uInt16 nCount = aFilterLb.GetEntryCount();
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
-        ULONG nFlags = (ULONG)aFilterLb.GetEntryData(i);
+        sal_uIntPtr nFlags = (sal_uIntPtr)aFilterLb.GetEntryData(i);
         if ( SFXSTYLEBIT_AUTO == nFlags )
         {
             // automatic entry found -> select it
@@ -1062,7 +1064,7 @@ const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() con
     for(size_t i = 0; i < nCount; ++i)
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->at( i );
-        USHORT nId = SfxFamilyIdToNId(pItem->GetFamily());
+        sal_uInt16 nId = SfxFamilyIdToNId(pItem->GetFamily());
         if(nId == nActFamily)
             return pItem;
     }
@@ -1081,7 +1083,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
     if( pStyle )
         EnableEdit( !(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
     else
-        EnableEdit(FALSE);
+        EnableEdit(sal_False);
 
     if ( pTreeBox )
     {
@@ -1100,18 +1102,18 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
             }
         }
         else
-            pTreeBox->SelectAll( FALSE );
+            pTreeBox->SelectAll( sal_False );
     }
     else
     {
-        BOOL bSelect = ( rStr.Len() > 0 );
+        sal_Bool bSelect = ( rStr.Len() > 0 );
         if ( bSelect )
         {
             SvLBoxEntry* pEntry = (SvLBoxEntry*)aFmtLb.FirstVisible();
             while ( pEntry && aFmtLb.GetEntryText( pEntry ) != rStr )
                 pEntry = (SvLBoxEntry*)aFmtLb.NextVisible( pEntry );
             if ( !pEntry )
-                bSelect = FALSE;
+                bSelect = sal_False;
             else
             {
                 aFmtLb.MakeVisible( pEntry );
@@ -1123,8 +1125,8 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
 
         if ( !bSelect )
         {
-            aFmtLb.SelectAll( FALSE );
-            EnableEdit(FALSE);
+            aFmtLb.SelectAll( sal_False );
+            EnableEdit(sal_False);
         }
     }
 }
@@ -1151,7 +1153,7 @@ String SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
 
 //-------------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::EnableTreeDrag( BOOL bEnable )
+void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
 {
     if ( pStyleSheetPool )
     {
@@ -1194,13 +1196,13 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
         if(pTreeBox)
             ((const StyleTreeListBox_Impl *)pTreeBox)->
                 MakeExpanded_Impl( aEntries);
-        pTreeBox->SetUpdateMode( FALSE );
+        pTreeBox->SetUpdateMode( sal_False );
         pTreeBox->Clear();
-        const USHORT nCount = aArr.Count();
-        for(USHORT i = 0; i < nCount; ++i)
+        const sal_uInt16 nCount = aArr.Count();
+        for(sal_uInt16 i = 0; i < nCount; ++i)
             FillBox_Impl(pTreeBox, aArr[i], aEntries);
 ;
-        EnableItem(SID_STYLE_WATERCAN,FALSE);
+        EnableItem(SID_STYLE_WATERCAN,sal_False);
 
         SfxTemplateItem* pState = pFamilyState[nActFamily-1];
 
@@ -1213,7 +1215,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
                 pTreeBox->Expand( pEntry );
         }
 
-        pTreeBox->SetUpdateMode( TRUE );
+        pTreeBox->SetUpdateMode( sal_True );
 
         String aStyle;
         if(pState)  //Aktuellen Eintrag selektieren
@@ -1224,7 +1226,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
 }
 
 //-------------------------------------------------------------------------
-BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
+sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 {
     return pTreeBox? pTreeBox->FirstSelected() != 0:
             aFmtLb.GetSelectionCount() != 0;
@@ -1235,7 +1237,7 @@ BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 
 // internal: Refresh the display
 // nFlags: what we should update.
-void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
+void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
 {
     DBG_ASSERT(nFlags, "nothing to do");
     const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
@@ -1259,7 +1261,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
     const SfxStyleFamily eFam = pItem->GetFamily();
 
     SfxFilterTupel* pT = ( nActFilter < pItem->GetFilterList().size() ? pItem->GetFilterList()[nActFilter] : NULL );
-    USHORT nFilter     = pT ? pT->nFlags : 0;
+    sal_uInt16 nFilter     = pT ? pT->nFlags : 0;
     if(!nFilter)    // automatisch
         nFilter = nAppFilter;
 
@@ -1270,16 +1272,16 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
         pItem = GetFamilyItem_Impl();
         if((nFlags & UPDATE_FAMILY) == UPDATE_FAMILY)   // Update view type list (Hierarchical, All, etc.
         {
-            CheckItem(nActFamily, TRUE);    // Button in Toolbox checken
-            aFilterLb.SetUpdateMode(FALSE);
+            CheckItem(nActFamily, sal_True);    // Button in Toolbox checken
+            aFilterLb.SetUpdateMode(sal_False);
             aFilterLb.Clear();
             //insert hierarchical at the beginning
-            USHORT nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
-            aFilterLb.SetEntryData( nPos, (void*)(ULONG)SFXSTYLEBIT_ALL );
+            sal_uInt16 nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
+            aFilterLb.SetEntryData( nPos, (void*)(sal_uIntPtr)SFXSTYLEBIT_ALL );
             const SfxStyleFilter& rFilter = pItem->GetFilterList();
             for( size_t i = 0; i < rFilter.size(); ++i)
             {
-                ULONG nFilterFlags = rFilter[ i ]->nFlags;
+                sal_uIntPtr nFilterFlags = rFilter[ i ]->nFlags;
                 nPos = aFilterLb.InsertEntry( rFilter[ i ]->aName );
                 aFilterLb.SetEntryData( nPos, (void*)nFilterFlags );
             }
@@ -1290,7 +1292,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
                 nActFilter = 0;
                 aFilterLb.SelectEntryPos(1);
                 SfxFilterTupel* pActT = ( nActFilter < rFilter.size() ) ? rFilter[ nActFilter ] : NULL;
-                USHORT nFilterFlags = pActT ? pActT->nFlags : 0;
+                sal_uInt16 nFilterFlags = pActT ? pActT->nFlags : 0;
                 pStyleSheetPool->SetSearchMask(eFam, nFilterFlags);
             }
 
@@ -1300,7 +1302,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
 
             // show maximum 12 entries
             aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
-            aFilterLb.SetUpdateMode(TRUE);
+            aFilterLb.SetUpdateMode(sal_True);
         }
         else
         {
@@ -1315,7 +1317,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
 
         if(nFlags & UPDATE_FAMILY_LIST)
         {
-            EnableItem(SID_STYLE_WATERCAN,FALSE);
+            EnableItem(SID_STYLE_WATERCAN,sal_False);
 
             SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
             SvLBoxEntry* pEntry = aFmtLb.First();
@@ -1328,7 +1330,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
             while( pStyle )
             {
                 //Bubblesort
-                USHORT nPos;
+                sal_uInt16 nPos;
                 for( nPos = aStrings.Count() ; nPos &&
                     aSorter.compare(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--);
                 aStrings.Insert( new String( pStyle->GetName() ), nPos );
@@ -1336,8 +1338,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
             }
 
 
-            USHORT nCount = aStrings.Count();
-            USHORT nPos = 0;
+            sal_uInt16 nCount = aStrings.Count();
+            sal_uInt16 nPos = 0;
             while( nPos < nCount && pEntry &&
                    *aStrings[ nPos ] == aFmtLb.GetEntryText( pEntry ) )
             {
@@ -1348,7 +1350,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
             if( nPos < nCount || pEntry )
             {
                 // Fills the display box
-                aFmtLb.SetUpdateMode(FALSE);
+                aFmtLb.SetUpdateMode(sal_False);
                 aFmtLb.Clear();
 
                 nPos = 0;
@@ -1356,7 +1358,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
                 {
                     aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, FALSE, nPos);
                 }
-                aFmtLb.SetUpdateMode(TRUE);
+                aFmtLb.SetUpdateMode(true);
             }
             // Selects the current style if any
             SfxTemplateItem *pState = pFamilyState[nActFamily-1];
@@ -1382,13 +1384,13 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
     if(pItem && !bWaterDisabled)
     {
         CheckItem(SID_STYLE_WATERCAN, pItem->GetValue());
-        EnableItem( SID_STYLE_WATERCAN, TRUE );
+        EnableItem( SID_STYLE_WATERCAN, sal_True );
     }
     else
         if(!bWaterDisabled)
-            EnableItem(SID_STYLE_WATERCAN, TRUE);
+            EnableItem(SID_STYLE_WATERCAN, sal_True);
         else
-            EnableItem(SID_STYLE_WATERCAN, FALSE);
+            EnableItem(SID_STYLE_WATERCAN, sal_False);
 
 //Waehrend Giesskannenmodus Statusupdates ignorieren.
 
@@ -1397,7 +1399,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
     for(size_t n = 0; n < nCount; n++)
     {
         SfxControllerItem *pCItem=pBoundItems[n];
-        BOOL bChecked = pItem && pItem->GetValue();
+        sal_Bool bChecked = pItem && pItem->GetValue();
         if( pCItem->IsBound() == bChecked )
         {
             if( !bChecked )
@@ -1415,16 +1417,16 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
 // (Aktualisierung erfolgt, wenn alle Stati aktualisiert worden sind.
 // Siehe auch: <SfxBindings::AddDoneHdl(const Link &)>
 
-void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemplateItem* pItem )
+void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* pItem )
 {
-    USHORT nIdx = nSlotId - SID_STYLE_FAMILY_START;
+    sal_uInt16 nIdx = nSlotId - SID_STYLE_FAMILY_START;
     DELETEZ(pFamilyState[nIdx]);
     if ( pItem )
         pFamilyState[nIdx] = new SfxTemplateItem(*pItem);
-    bUpdate = TRUE;
+    bUpdate = sal_True;
 
     // Wenn verwendete Vorlagen ( wie zum Teufel findet man das heraus ?? )
-    bUpdateFamily = TRUE;
+    bUpdateFamily = sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1434,7 +1436,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemp
 
 void SfxCommonTemplateDialog_Impl::Update_Impl()
 {
-    BOOL bDocChanged=FALSE;
+    sal_Bool bDocChanged=sal_False;
     SfxStyleSheetBasePool* pNewPool = NULL;
     SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
     SfxObjectShell* pDocShell = pViewFrame->GetObjectShell();
@@ -1459,14 +1461,14 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
         {
             StartListening(*pNewPool);
             pStyleSheetPool = pNewPool;
-            bDocChanged=TRUE;
+            bDocChanged=sal_True;
         }
     }
 
     if (bUpdateFamily)
         UpdateFamily_Impl();
 
-    USHORT i;
+    sal_uInt16 i;
     for(i = 0; i < MAX_FAMILIES; ++i)
         if(pFamilyState[i])
             break;
@@ -1479,7 +1481,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      // oder Default
      if(nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1] ) )
      {
-         CheckItem(nActFamily, FALSE);
+         CheckItem(nActFamily, sal_False);
          SfxTemplateItem **ppItem = pFamilyState;
          const size_t nFamilyCount = pStyleFamilies->size();
          size_t n;
@@ -1495,8 +1497,8 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      else if( bDocChanged )
      {
          // andere DocShell -> alles neu
-         CheckItem( nActFamily, TRUE );
-         nActFilter = static_cast< USHORT >( LoadFactoryStyleFilter( pDocShell ) );
+         CheckItem( nActFamily, sal_True );
+         nActFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pDocShell ) );
          if ( 0xFFFF == nActFilter )
             nActFilter = pDocShell->GetAutoStyleFilterIndex();
 
@@ -1511,7 +1513,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      else
      {
          // anderer Filter fuer automatisch
-         CheckItem( nActFamily, TRUE );
+         CheckItem( nActFamily, sal_True );
          const SfxStyleFamilyItem *pStyleItem =  GetFamilyItem_Impl();
 #if OSL_DEBUG_LEVEL > 1
          SfxFilterTupel *pT;
@@ -1542,7 +1544,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
     (void)pTim; // unused
     if(!bDontUpdate)
     {
-        bDontUpdate=TRUE;
+        bDontUpdate=sal_True;
         if(!pTreeBox)
             UpdateStyles_Impl(UPDATE_FAMILY_LIST);
         else
@@ -1556,7 +1558,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
                 EnableDelete();
             }
         }
-        bDontUpdate=FALSE;
+        bDontUpdate=sal_False;
         DELETEZ(pTimer);
     }
     else
@@ -1585,7 +1587,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
                     )
                    )
                 {
-                    bUpdate = FALSE;
+                    bUpdate = sal_False;
                     Update_Impl();
                 }
                 else if ( bUpdateFamily )
@@ -1608,7 +1610,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
                             EnableEdit(
                                 !(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
                         else
-                            EnableEdit(FALSE);
+                            EnableEdit(sal_False);
                     }
                 }
                 break;
@@ -1618,7 +1620,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
         // Nicht sofort Update_Impl rufen, fuer den Fall da\s eines
         // der Dokumente ein internes InPlaceObjekt ist!
           case SFX_HINT_DOCCHANGED:
-            bUpdate = TRUE;
+            bUpdate = sal_True;
             break;
           case SFX_HINT_DYING:
           {
@@ -1633,7 +1635,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
     // es kann sein, da\s sich ein neuer erst anmeldet, nachdem der Timer
     // abgelaufen ist - macht sich schlecht in UpdateStyles_Impl() !
 
-    ULONG nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
+    sal_uIntPtr nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
 
     if(!bDontUpdate && nId != SFX_HINT_DYING &&
        (rHint.Type() == TYPE(SfxStyleSheetPoolHint)||
@@ -1658,8 +1660,8 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
 // oder als Folge von Neu oder Bearbeiten, wenn die aktuelle
 // Vorlage einem anderen Filter zugewiesen wurde.
 void SfxCommonTemplateDialog_Impl::FilterSelect(
-                USHORT nEntry,                  // Idx des neuen Filters
-                BOOL bForce )                   // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
+                sal_uInt16 nEntry,                  // Idx des neuen Filters
+                sal_Bool bForce )                   // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
 {
     if( nEntry != nActFilter || bForce )
     {
@@ -1689,9 +1691,9 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
 //-------------------------------------------------------------------------
 
 // Intern: Ausf"uhren von Funktionen "uber den Dispatcher
-BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
-    USHORT nId, const String &rStr, const String& rRefStr, USHORT nFamily,
-    USHORT nMask, USHORT *pIdx, const USHORT* pModifier)
+sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
+    sal_uInt16 nId, const String &rStr, const String& rRefStr, sal_uInt16 nFamily,
+    sal_uInt16 nMask, sal_uInt16 *pIdx, const sal_uInt16* pModifier)
 {
     SfxDispatcher &rDispatcher = *SFX_APP()->GetDispatcher_Impl();
     SfxStringItem aItem(nId, rStr);
@@ -1700,7 +1702,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
     SfxStringItem aUpdName(SID_STYLE_UPD_BY_EX_NAME, rStr);
     SfxStringItem aRefName( SID_STYLE_REFERENCE, rRefStr );
     const SfxPoolItem* pItems[ 6 ];
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     if( rStr.Len() )
         pItems[ nCount++ ] = &aItem;
     pItems[ nCount++ ] = &aFamily;
@@ -1720,20 +1722,20 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
 
     Deleted aDeleted;
     pbDeleted = &aDeleted;
-    USHORT nModi = pModifier ? *pModifier : 0;
+    sal_uInt16 nModi = pModifier ? *pModifier : 0;
     const SfxPoolItem* pItem = rDispatcher.Execute(
         nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
         pItems, nModi );
 
     // FIXME: Dialog can be destroyed while in Execute() check stack variable for dtor flag!
     if ( !pItem || aDeleted() )
-        return FALSE;
+        return sal_False;
 
     if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
     {
         SfxUInt16Item *pFilterItem = PTR_CAST(SfxUInt16Item, pItem);
         DBG_ASSERT(pFilterItem, "SfxUINT16Item erwartet");
-        USHORT nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
+        sal_uInt16 nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
         if(!nFilterFlags)       // Benutzervorlage?
             nFilterFlags = pFilterItem->GetValue();
         const SfxStyleFamilyItem *pFamilyItem = GetFamilyItem_Impl();
@@ -1752,7 +1754,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
     // where the local stack object is already destroyed. This would
     // overwrite objects on the stack!! See #i100110
     pbDeleted = NULL;
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -1765,14 +1767,14 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
         if ( !bHierarchical )
         {
             // TreeView einschalten
-            bHierarchical=TRUE;
+            bHierarchical=sal_True;
             const String aSelectEntry( GetSelectedEntry());
             aFmtLb.Hide();
 
             pTreeBox = new StyleTreeListBox_Impl(
                     this, WB_HASBUTTONS | WB_HASLINES |
                     WB_BORDER | WB_TABSTOP | WB_HASLINESATROOT |
-                    WB_HASBUTTONSATROOT | WB_HIDESELECTION );
+                    WB_HASBUTTONSATROOT | WB_HIDESELECTION | WB_QUICK_SEARCH );
             pTreeBox->SetFont( aFmtLb.GetFont() );
 
             pTreeBox->SetPosSizePixel(aFmtLb.GetPosPixel(), aFmtLb.GetSizePixel());
@@ -1791,6 +1793,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
                 SaveFactoryStyleFilter( pDocShell, HIERARCHICAL_FILTER_INDEX );
             FillTreeBox();
             SelectStyle(aSelectEntry);
+            pTreeBox->SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST));
             pTreeBox->Show();
         }
     }
@@ -1803,7 +1806,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
         // Falls bHierarchical, kann sich die Familie geaendert haben
         // minus one since hierarchical is inserted at the start
         FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical );
-        bHierarchical=FALSE;
+        bHierarchical=sal_False;
     }
 
     return 0;
@@ -1812,11 +1815,11 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
 //-------------------------------------------------------------------------
 
 // Select-Handler der Toolbox
-void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
 {
     if( nEntry != nActFamily )
     {
-        CheckItem( nActFamily, FALSE );
+        CheckItem( nActFamily, sal_False );
         nActFamily = nEntry;
         SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
         SfxUInt16Item aItem( SID_STYLE_FAMILY, nEntry );
@@ -1829,15 +1832,15 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
 
 //-------------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
 {
     String aEmpty;
     switch(nEntry)
     {
         case SID_STYLE_WATERCAN:
         {
-            const BOOL bState = IsCheckedItem(nEntry);
-            BOOL bCheck;
+            const sal_Bool bState = IsCheckedItem(nEntry);
+            sal_Bool bCheck;
             SfxBoolItem aBool;
             // wenn eine Vorlage ausgewaehlt ist.
             if(!bState && aFmtLb.GetSelectionCount())
@@ -1846,13 +1849,13 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
                     GetSelectedEntry());
                 Execute_Impl(
                     SID_STYLE_WATERCAN, aTemplName, aEmpty,
-                    (USHORT)GetFamilyItem_Impl()->GetFamily() );
-                bCheck = TRUE;
+                    (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
+                bCheck = sal_True;
             }
             else
             {
                 Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
-                bCheck = FALSE;
+                bCheck = sal_False;
             }
             CheckItem(nEntry, bCheck);
             aBool.SetValue(bCheck);
@@ -1865,7 +1868,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
             {
                 const SfxStyleFamily eFam=GetFamilyItem_Impl()->GetFamily();
                 const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
-                USHORT nFilter;
+                sal_uInt16 nFilter;
                 if( pItem && nActFilter != 0xffff )
                 {
                     nFilter = pItem->GetFilterList()[ nActFilter ]->nFlags;
@@ -1884,7 +1887,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
                     const String aTemplName(pDlg->GetName());
                     Execute_Impl(SID_STYLE_NEW_BY_EXAMPLE,
                                  aTemplName, aEmpty,
-                                 (USHORT)GetFamilyItem_Impl()->GetFamily(),
+                                 (sal_uInt16)GetFamilyItem_Impl()->GetFamily(),
                                  nFilter);
                 }
                 pStyleSheetPool->SetSearchMask( eFam, nFilter );
@@ -1896,7 +1899,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
         {
             Execute_Impl(SID_STYLE_UPDATE_BY_EXAMPLE,
                     aEmpty, aEmpty,
-                    (USHORT)GetFamilyItem_Impl()->GetFamily());
+                    (sal_uInt16)GetFamilyItem_Impl()->GetFamily());
             break;
         }
         case SID_TEMPLATE_LOAD:
@@ -1970,11 +1973,11 @@ void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pOb
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox )
 {
-    bDontUpdate=TRUE;
+    bDontUpdate=sal_True;
     const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
     const SfxStyleFamily eFam = pItem->GetFamily();
     long ret= pStyleSheetPool->SetParent(eFam,pBox->GetStyle(), pBox->GetParent())? 1L: 0L;
-    bDontUpdate=FALSE;
+    bDontUpdate=sal_False;
     return ret;
 }
 
@@ -1995,7 +1998,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
 
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam=pItem->GetFamily();
-        USHORT nMask;
+        sal_uInt16 nMask;
         if( pItem && nActFilter != 0xffff )
         {
             nMask = pItem->GetFilterList()[ nActFilter ]->nFlags;
@@ -2009,7 +2012,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
 
         Execute_Impl(SID_STYLE_NEW,
                      aEmpty, GetSelectedEntry(),
-                     ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+                     ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
                      nMask);
 
         Application::SetDefDialogParent( pTmp );
@@ -2024,7 +2027,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
 {
     if(IsInitialized() && HasSelectedStyle())
     {
-        USHORT nFilter = nActFilter;
+        sal_uInt16 nFilter = nActFilter;
         String aTemplName(GetSelectedEntry());
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam = pItem->GetFamily();
@@ -2038,7 +2041,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
         else
             Application::SetDefDialogParent( pWindow );
         if ( Execute_Impl( SID_STYLE_EDIT, aTemplName, String(),
-                          (USHORT)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
+                          (sal_uInt16)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
         {
         }
         Application::SetDefDialogParent( pTmp );
@@ -2074,15 +2077,15 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
 
                 if ( pTreeBox ) // Damit die Treelistbox beim L"oschen nicht zuklappt
                 {
-                    bDontUpdate = TRUE;
+                    bDontUpdate = sal_True;
                 }
                 Execute_Impl( SID_STYLE_DELETE, aTemplName,
-                              String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+                              String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
 
                 if ( pTreeBox )
                 {
                     pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() );
-                    bDontUpdate = FALSE;
+                    bDontUpdate = sal_False;
                 }
             }
         }
@@ -2099,7 +2102,7 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
         const String aTemplName(GetSelectedEntry());
         const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
         const SfxStyleFamily eFam = pItem->GetFamily();
-        USHORT nFilter = 0;
+        sal_uInt16 nFilter = 0;
         if(pItem->GetFilterList().size() > nActFilter)
             nFilter = pItem->GetFilterList()[ nActFilter ]->nFlags;
         if(!nFilter)    // automatisch
@@ -2110,16 +2113,16 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
         DBG_ASSERT(pStyle, "Style nicht gefunden");
         if(pStyle && pStyle->IsUserDefined())
         {
-            EnableDel(TRUE);
+            EnableDel(sal_True);
         }
         else
         {
-            EnableDel(FALSE);
+            EnableDel(sal_False);
         }
     }
     else
     {
-        EnableDel(FALSE);
+        EnableDel(sal_False);
     }
 }
 
@@ -2149,10 +2152,10 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
     if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] &&
          GetSelectedEntry().Len() )
     {
-        USHORT nModifier = aFmtLb.GetModifier();
+        sal_uInt16 nModifier = aFmtLb.GetModifier();
         Execute_Impl(SID_STYLE_APPLY,
                      GetSelectedEntry(), String(),
-                     ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+                     ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
                      0, 0, &nModifier );
         if(ISA(SfxTemplateCatalog_Impl))
             ((SfxTemplateCatalog_Impl*) this)->pReal->EndDialog(RET_OK);
@@ -2180,7 +2183,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
                          aEmpty, aEmpty, 0);
             Execute_Impl(SID_STYLE_WATERCAN,
                          GetSelectedEntry(), aEmpty,
-                         ( USHORT )GetFamilyItem_Impl()->GetFamily());
+                         ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily());
         }
         EnableItem(SID_STYLE_WATERCAN, !bWaterDisabled);
         EnableDelete();
@@ -2200,16 +2203,16 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
         nLastItemId = pMenu->GetCurItemId();
         Application::PostUserEvent(
             LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 );
-        return TRUE;
+        return sal_True;
     }
 
     switch(nLastItemId) {
     case ID_NEW: NewHdl(0); break;
     case ID_EDIT: EditHdl(0); break;
     case ID_DELETE: DeleteHdl(0); break;
-    default: return FALSE;
+    default: return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -2217,7 +2220,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
 void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
 {
     // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this!
-    DBG_ASSERT( FALSE, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
+    DBG_ASSERT( sal_False, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
 
     PopupMenu* pMenu = CreateContextMenu();
     pMenu->Execute( pWin, rPos );
@@ -2237,7 +2240,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
 
 // -----------------------------------------------------------------------
 
-void SfxCommonTemplateDialog_Impl::EnableExample_Impl(USHORT nId, BOOL bEnable)
+void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable)
 {
     if( nId == SID_STYLE_NEW_BY_EXAMPLE )
         bNewByExampleDisabled = !bEnable;
@@ -2256,9 +2259,9 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
 {
     if ( bBindingUpdate )
     {
-        pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+        pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
         pBindings->Update( SID_STYLE_NEW );
-        bBindingUpdate = FALSE;
+        bBindingUpdate = sal_False;
     }
     PopupMenu* pMenu = new PopupMenu( SfxResId( MN_CONTEXT_TEMPLDLG ) );
     pMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) );
@@ -2277,7 +2280,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
     SfxCommonTemplateDialog_Impl( pB, pDlgWindow ),
 
     m_pFloat			( pDlgWindow ),
-    m_bZoomIn			( FALSE ),
+    m_bZoomIn			( sal_False ),
     m_aActionTbL        ( pDlgWindow, this ),
     m_aActionTbR		( pDlgWindow, SfxResId( TB_ACTION ) )
 
@@ -2307,7 +2310,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
 
 // ------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     m_aActionTbL.EnableItem( nId, bEnable );
 }
@@ -2315,20 +2318,20 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
 //-------------------------------------------------------------------------
 // Insert element into dropdown filter "Frame Styles", "List Styles", etc.
 
-void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem)
+void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem)
 {
-    USHORT nHelpId = 0;
-    switch( (USHORT) pItem->GetFamily() )
+    rtl::OString sHelpId;
+    switch( (sal_uInt16) pItem->GetFamily() )
     {
-        case SFX_STYLE_FAMILY_CHAR: nHelpId = SID_STYLE_FAMILY1; break;
-        case SFX_STYLE_FAMILY_PARA: nHelpId = SID_STYLE_FAMILY2; break;
-        case SFX_STYLE_FAMILY_FRAME:nHelpId = SID_STYLE_FAMILY3; break;
-        case SFX_STYLE_FAMILY_PAGE: nHelpId = SID_STYLE_FAMILY4; break;
-        case SFX_STYLE_FAMILY_PSEUDO: nHelpId = SID_STYLE_FAMILY5; break;
+        case SFX_STYLE_FAMILY_CHAR:     sHelpId = ".uno:CharStyle"; break;
+        case SFX_STYLE_FAMILY_PARA:     sHelpId = ".uno:ParaStyle"; break;
+        case SFX_STYLE_FAMILY_FRAME:    sHelpId = ".uno:FrameStyle"; break;
+        case SFX_STYLE_FAMILY_PAGE:     sHelpId = ".uno:PageStyle"; break;
+        case SFX_STYLE_FAMILY_PSEUDO:   sHelpId = ".uno:ListStyle"; break;
         default: OSL_FAIL("unknown StyleFamily"); break;
     }
     m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0);
-    m_aActionTbL.SetHelpId( nId, nHelpId );
+    m_aActionTbL.SetHelpId( nId, sHelpId );
 }
 
 // ------------------------------------------------------------------------
@@ -2355,7 +2358,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
     for( ; nLoop--; )
     {
         const SfxStyleFamilyItem *pItem = pStyleFamilies->at( nLoop );
-        USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+        sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
         m_aActionTbL.SetItemImage( nId, pItem->GetImage() );
     }
 }
@@ -2377,15 +2380,15 @@ void SfxTemplateDialog_Impl::ClearFamilyList()
 
 void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 {
-    pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, TRUE, FALSE);
+    pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, sal_True, sal_False);
     pBindings->Update( SID_STYLE_NEW_BY_EXAMPLE );
-    pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, TRUE, FALSE);
+    pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, sal_True, sal_False);
     pBindings->Update( SID_STYLE_UPDATE_BY_EXAMPLE );
-    pBindings->Invalidate( SID_STYLE_WATERCAN, TRUE, FALSE);
+    pBindings->Invalidate( SID_STYLE_WATERCAN, sal_True, sal_False);
     pBindings->Update( SID_STYLE_WATERCAN );
-    pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+    pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
     pBindings->Update( SID_STYLE_NEW );
-    pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, TRUE, FALSE );
+    pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, sal_True, sal_False );
     pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
 }
 
@@ -2500,7 +2503,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
     String aEmpty;
     switch(nMesId)
@@ -2517,7 +2520,7 @@ void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
     switch(nMesId)
     {
@@ -2532,7 +2535,7 @@ void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
 
 //-------------------------------------------------------------------------
 
-BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
     switch(nMesId)
     {
@@ -2547,7 +2550,7 @@ BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
 
 IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     FamilySelect(nEntry);
     return 0;
 }
@@ -2575,7 +2578,7 @@ IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry != SID_STYLE_NEW_BY_EXAMPLE ||
             TIB_DROPDOWN != (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
         ActionSelect(nEntry);
@@ -2584,7 +2587,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 //-------------------------------------------------------------------------
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 {
-    const USHORT nEntry = pBox->GetCurItemId();
+    const sal_uInt16 nEntry = pBox->GetCurItemId();
     if(nEntry == SID_STYLE_NEW_BY_EXAMPLE &&
             TIB_DROPDOWN == (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
     {
@@ -2623,7 +2626,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
             aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LoadStyles")));
             sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
-            pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD);
+            pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");
 
             pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl));
             pMenu->Execute( pBox,
@@ -2642,7 +2645,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 //-------------------------------------------------------------------------
 IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
 {
-    USHORT nMenuId = pMenu->GetCurItemId();
+    sal_uInt16 nMenuId = pMenu->GetCurItemId();
     ActionSelect(nMenuId);
     return 0;
 }
@@ -2763,7 +2766,7 @@ IMPL_LINK( SfxTemplateCatalog_Impl, OrgHdl, Button *, pButton )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableEdit( sal_Bool bEnable )
 {
     SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
     aChangeBtn.Enable( bEnable );
@@ -2771,13 +2774,13 @@ void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableDel( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableDel( sal_Bool bEnable )
 {
     SfxCommonTemplateDialog_Impl::EnableDel( bEnable );
     aDelBtn.Enable( bEnable );
 }
 
-void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
+void SfxTemplateCatalog_Impl::EnableNew(sal_Bool bEnable)
 {
     SfxCommonTemplateDialog_Impl::EnableNew( bEnable );
     aNewBtn.Enable( bEnable );
@@ -2787,7 +2790,7 @@ void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
 
 IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
 {
-    const USHORT nEntry = aFamIds[pList->GetSelectEntryPos()];
+    const sal_uInt16 nEntry = aFamIds[pList->GetSelectEntryPos()];
     FamilySelect(nEntry);
     return 0;
 }
@@ -2795,7 +2798,7 @@ IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
+void SfxTemplateCatalog_Impl::EnableItem( sal_uInt16 nMesId, sal_Bool bCheck )
 {
     if ( nMesId == SID_STYLE_WATERCAN )
         aOkBtn.Enable( bCheck );
@@ -2805,22 +2808,22 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
 
 //-------------------------------------------------------------------------
 
-void SfxTemplateCatalog_Impl::CheckItem(USHORT nMesId, BOOL /*bCheck*/)
+void SfxTemplateCatalog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool /*bCheck*/)
 {
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
-    USHORT i;
+    sal_uInt16 i;
     for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ) ;
     aFamList.SelectEntryPos(i);
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
-        return FALSE;
-    USHORT i;
+        return sal_False;
+    sal_uInt16 i;
     for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ )
         ;
     return aFamList.IsEntrySelected( String::CreateFromInt32(i) );
@@ -2830,10 +2833,10 @@ BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
 
 // Der Katalog muss nur das Disablen beherrschen, da waehrend seiner
 // Lebenszeit keine Selektionsaenderungen vorgenommen werden koennen
-void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     if ( !bEnable )
-        for ( USHORT nPos = aFamIds.Count(); nPos--; )
+        for ( sal_uInt16 nPos = aFamIds.Count(); nPos--; )
             if ( aFamIds[ nPos ] == nId )
             {
                 aFamIds.Remove( nPos );
@@ -2841,7 +2844,7 @@ void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
             }
 }
 
-void SfxTemplateCatalog_Impl::InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pItem )
+void SfxTemplateCatalog_Impl::InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pItem )
 {
     if ( nId > SFX_STYLE_FAMILY_PSEUDO || nId < SFX_STYLE_FAMILY_CHAR )
         return;
@@ -2862,21 +2865,21 @@ void SfxTemplateCatalog_Impl::PrepareDeleteAction()
 }
 
 
-void SfxCommonTemplateDialog_Impl::SetFamily( USHORT nId )
+void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
 {
     if ( nId != nActFamily )
     {
         if ( nActFamily != 0xFFFF )
-            CheckItem( nActFamily, FALSE );
+            CheckItem( nActFamily, sal_False );
         nActFamily = nId;
         if ( nId != 0xFFFF )
-            bUpdateFamily = TRUE;
+            bUpdateFamily = sal_True;
     }
 }
 
 void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
 {
-    bUpdateFamily = FALSE;
+    bUpdateFamily = sal_False;
 
     SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
     SfxViewFrame *pViewFrame = pDispat->GetFrame();
@@ -2892,10 +2895,10 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
             StartListening(*pOldStyleSheetPool);
     }
 
-    bWaterDisabled = FALSE;
-    bCanNew = TRUE;
-    bTreeDrag = TRUE;
-    bUpdateByExampleDisabled = FALSE;
+    bWaterDisabled = sal_False;
+    bCanNew = sal_True;
+    bTreeDrag = sal_True;
+    bUpdateByExampleDisabled = sal_False;
 
     if ( pStyleSheetPool )
     {
@@ -2914,7 +2917,7 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
          // nur, wenn dieser Bereich erlaubt ist
          0 != pFamilyState[ nActFamily - 1 ] )
         Execute_Impl( SID_STYLE_APPLY, GetSelectedEntry(),
-                      String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+                      String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
 }
 void SfxCommonTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
@@ -2954,7 +2957,7 @@ DropToolBox_Impl::~DropToolBox_Impl()
 sal_Int8    DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     sal_Int8 nReturn = DND_ACTION_NONE;
-    USHORT nItemId = GetItemId( rEvt.maPosPixel );
+    sal_uInt16 nItemId = GetItemId( rEvt.maPosPixel );
     if(USHRT_MAX != nItemId && !IsItemChecked( nItemId ))
     {
         SetCurItemId(nItemId);
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index 60167fda76..60b21b342f 100644..100755
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -49,4 +49,7 @@
 #define BT_VLIST 9
 #define BT_TOOL 10
 
+//IAccessibility2 Implementation 2009-----
+#define STR_STYLE_ELEMTLIST	18
+//-----IAccessibility2 Implementation 2009
 
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 63e9f6e89f..6051f9f3fb 100644..100755
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -46,7 +46,7 @@ ImageList DLG_STYLE_DESIGNER
  // RID_STYLECATALOG ------------------------------------------------------
 ModalDialog RID_STYLECATALOG
 {
-    HelpId = SID_STYLE_CATALOG ;
+    HelpId = CMD_SID_STYLE_CATALOG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 181 , 134 ) ;
@@ -67,6 +67,7 @@ ModalDialog RID_STYLECATALOG
     };
     PushButton BT_ORG
     {
+        HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_ORG";
         Pos = MAP_APPFONT ( 123 , 97 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Organizer..." ;
@@ -74,6 +75,7 @@ ModalDialog RID_STYLECATALOG
     };
     PushButton BT_DEL
     {
+        HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_DEL";
         Pos = MAP_APPFONT ( 123 , 78 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -81,6 +83,7 @@ ModalDialog RID_STYLECATALOG
     };
     PushButton BT_EDIT
     {
+        HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_EDIT";
         Pos = MAP_APPFONT ( 123 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -88,6 +91,7 @@ ModalDialog RID_STYLECATALOG
     };
     PushButton BT_NEW
     {
+        HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_NEW";
         Pos = MAP_APPFONT ( 123 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -101,6 +105,7 @@ ModalDialog RID_STYLECATALOG
     };
     ListBox BT_TOOL
     {
+        HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_TOOL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 110 , 55 ) ;
@@ -117,6 +122,7 @@ ModalDialog RID_STYLECATALOG
     };
     ListBox BT_FLIST
     {
+        HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_FLIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 114 ) ;
         Size = MAP_APPFONT ( 110 , 77 ) ;
@@ -127,6 +133,10 @@ ModalDialog RID_STYLECATALOG
 };
 
  // Strings ---------------------------------------------------------------
+String STR_STYLE_ELEMTLIST
+{
+    Text [ en-US ] = "Style List" ;
+};
 String STR_STYLE_FILTER_HIERARCHICAL
 {
     Text [ en-US ] = "Hierarchical" ;
@@ -137,7 +147,7 @@ DockingWindow DLG_STYLE_DESIGNER
 {
     Text [ en-US ] = "Styles and Formatting" ;
 
-    HelpId = SID_STYLE_DESIGNER ;
+    HelpId = CMD_SID_STYLE_DESIGNER ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index fa80e98563..c0c7596ec0 100644..100755
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -52,6 +52,7 @@ namespace sfx2
         ,m_aContentWindow( this, WB_DIALOGCONTROL )
         ,m_aBorder( 3, 1, 3, 3 )
         ,m_bLayoutPending( false )
+        ,m_nTitleBarHeight(0)
     {
         impl_construct();
     }
@@ -140,23 +141,23 @@ namespace sfx2
         Size aWindowSize( GetOutputSizePixel() );
 
         // position the tool box
-        int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() );
-        if ( aToolBoxSize.Height() > nTitleBarHeight )
-            nTitleBarHeight = aToolBoxSize.Height();
+        m_nTitleBarHeight = GetSettings().GetStyleSettings().GetTitleHeight();
+        if ( aToolBoxSize.Height() > m_nTitleBarHeight )
+            m_nTitleBarHeight = aToolBoxSize.Height();
         m_aToolbox.SetPosSizePixel(
             Point(
                 aWindowSize.Width() - aToolBoxSize.Width(),
-                ( nTitleBarHeight - aToolBoxSize.Height() ) / 2
+                ( m_nTitleBarHeight - aToolBoxSize.Height() ) / 2
             ),
             aToolBoxSize
         );
 
         // Place the content window.
-        if ( nTitleBarHeight < aToolBoxSize.Height() )
-            nTitleBarHeight = aToolBoxSize.Height();
-        aWindowSize.Height() -= nTitleBarHeight;
+        if ( m_nTitleBarHeight < aToolBoxSize.Height() )
+            m_nTitleBarHeight = aToolBoxSize.Height();
+        aWindowSize.Height() -= m_nTitleBarHeight;
         m_aContentWindow.SetPosSizePixel(
-            Point( m_aBorder.Left(), nTitleBarHeight + m_aBorder.Top() ),
+            Point( m_aBorder.Left(), m_nTitleBarHeight + m_aBorder.Top() ),
             Size(
                 aWindowSize.Width() - m_aBorder.Left() - m_aBorder.Right(),
                 aWindowSize.Height() - m_aBorder.Top() - m_aBorder.Bottom()
@@ -176,11 +177,6 @@ namespace sfx2
 
         Push( PUSH_FONT | PUSH_FILLCOLOR | PUSH_LINECOLOR );
 
-        int nTitleBarHeight( GetSettings().GetStyleSettings().GetTitleHeight() );
-        const Size aToolBoxSize = m_aToolbox.CalcWindowSizePixel();
-        if ( aToolBoxSize.Height() > nTitleBarHeight )
-            nTitleBarHeight = aToolBoxSize.Height();
-
         SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() );
         SetLineColor();
 
@@ -195,7 +191,7 @@ namespace sfx2
         int nInnerLeft = nOuterLeft + m_aBorder.Left() - 1;
         int nOuterRight = aWindowSize.Width() - 1;
         int nInnerRight = nOuterRight - m_aBorder.Right() + 1;
-        int nInnerTop = nTitleBarHeight + m_aBorder.Top() - 1;
+        int nInnerTop = m_nTitleBarHeight + m_aBorder.Top() - 1;
         int nOuterBottom = aWindowSize.Height() - 1;
         int nInnerBottom = nOuterBottom - m_aBorder.Bottom() + 1;
 
@@ -256,11 +252,11 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    USHORT TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+    sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
     {
         // Add the menu before the closer button.
-        const USHORT nItemCount( m_aToolbox.GetItemCount() );
-        const USHORT nItemId( nItemCount + 1 );
+        const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() );
+        const sal_uInt16 nItemId( nItemCount + 1 );
         m_aToolbox.InsertItem( nItemId, i_rItemText, TIB_DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND );
         m_aToolbox.SetHelpId( nItemId, i_nHelpId );
         m_aToolbox.SetClickHdl( i_rCallback );
@@ -277,14 +273,14 @@ namespace sfx2
     //------------------------------------------------------------------------------------------------------------------
     IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
     {
-        const USHORT nId = pToolBox->GetCurItemId();
+        const sal_uInt16 nId = pToolBox->GetCurItemId();
 
         if ( nId == 1 )
         {
             // the closer
             EndTracking();
             const sal_uInt16 nChildWindowId( GetChildWindow_Impl()->GetType() );
-            const SfxBoolItem aVisibility( nChildWindowId, FALSE );
+            const SfxBoolItem aVisibility( nChildWindowId, sal_False );
             GetBindings().GetDispatcher()->Execute(
                 nChildWindowId,
                 SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
@@ -309,7 +305,7 @@ namespace sfx2
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, BOOL i_bFloatMode )
+    void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode )
     {
         SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode );
 
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
index ede6c4b8c4..ede6c4b8c4 100644..100755
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index ad4a570015..57b4352ff6 100644..100755
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -36,7 +36,7 @@
 
 #include <sfx2/templdlg.hxx>
 #include <sfx2/bindings.hxx>
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include "tplcitem.hxx"
 #include "templdgi.hxx"
 
@@ -48,7 +48,7 @@
 // Konstruktor
 
 SfxTemplateControllerItem::SfxTemplateControllerItem(
-        USHORT nSlotId,					// ID
+        sal_uInt16 nSlotId,					// ID
         SfxCommonTemplateDialog_Impl &rDlg,	// Controller-Instanz, dem dieses Item zugeordnet ist.
         SfxBindings &rBindings):
     SfxControllerItem(nSlotId, rBindings),
@@ -69,7 +69,7 @@ SfxTemplateControllerItem::~SfxTemplateControllerItem()
 // Benachrichtigung "uber Status"anderung; wird an den
 // im Konstruktor "ubergebenen Controller propagiert
 
-void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pItem )
 {
     switch(nSID)
@@ -89,9 +89,9 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
                 DBG_ASSERT(pStateItem != 0, "SfxTemplateItem erwartet");
                 rTemplateDlg.SetFamilyState( GetId(), pStateItem );
             }
-            BOOL bDisable = eState == SFX_ITEM_DISABLED;
+            sal_Bool bDisable = eState == SFX_ITEM_DISABLED;
             // Familie Disablen
-            USHORT nFamily = 0;
+            sal_uInt16 nFamily = 0;
             switch( GetId())
             {
                 case SID_STYLE_FAMILY1:
@@ -171,7 +171,7 @@ IMPL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
     {
         case 0 :
         case 1 :
-            pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? TRUE : FALSE);
+            pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? sal_True : sal_False);
         break;
     }
     pThis->rTemplateDlg.SetWaterCanState(pState);
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 56c568cb70..346c2f3047 100644..100755
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -31,7 +31,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
 #include <com/sun/star/frame/status/Template.hpp>
 
 
@@ -48,9 +48,9 @@ SfxTemplateItem::SfxTemplateItem() :
 
 SfxTemplateItem::SfxTemplateItem
 (
-    USHORT nWhichId,      // Slot-ID
+    sal_uInt16 nWhichId,      // Slot-ID
     const String& rStyle, // Name des aktuellen Styles
-    USHORT nValue         // Flags f"ur das Filtern bei automatischer Anzeige
+    sal_uInt16 nValue         // Flags f"ur das Filtern bei automatischer Anzeige
 ) :	SfxFlagItem( nWhichId, nValue ),
     aStyle( rStyle )
 {
@@ -85,7 +85,7 @@ SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const
 }
 
 //-------------------------------------------------------------------------
-bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     ::com::sun::star::frame::status::Template aTemplate;
 
@@ -97,13 +97,13 @@ bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMember
 }
 
 //-------------------------------------------------------------------------
-bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::Template aTemplate;
 
     if ( rVal >>= aTemplate )
     {
-        SetValue( sal::static_int_cast< USHORT >( aTemplate.Value ) );
+        SetValue( sal::static_int_cast< sal_uInt16 >( aTemplate.Value ) );
         aStyle = aTemplate.StyleName;
         return true;
     }
@@ -113,9 +113,9 @@ bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMe
 
 //-------------------------------------------------------------------------
 
-BYTE SfxTemplateItem::GetFlagCount() const
+sal_uInt8 SfxTemplateItem::GetFlagCount() const
 {
-    return sizeof(USHORT) * 8;
+    return sizeof(sal_uInt16) * 8;
 }
 
 
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index b9b0393604..b2b3f6d4be 100644..100755
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -45,7 +45,7 @@
 #include "versdlg.hrc"
 #include "versdlg.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxsids.hrc>
@@ -153,7 +153,7 @@ static String ConvertDateTime_Impl(const DateTime& rTime, const LocaleDataWrappe
      const String pDelim ( DEFINE_CONST_UNICODE( ", "));
      String aStr(rWrapper.getDate(rTime));
      aStr += pDelim;
-     aStr += rWrapper.getTime(rTime, TRUE, FALSE);
+     aStr += rWrapper.getTime(rTime, sal_True, sal_False);
      return aStr;
 }
 
@@ -201,7 +201,7 @@ SfxVersionsTabListBox_Impl::SfxVersionsTabListBox_Impl( Window* pParent, const R
 {
 }
 
-SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, BOOL bIsSaveVersionOnClose )
+SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVersionOnClose )
     : SfxModalDialog( NULL, SfxResId( DLG_VERSIONS ) )
     , aNewGroup( this, SfxResId( GB_NEWVERSIONS ) )
     , aSaveButton( this, SfxResId( PB_SAVE ) )
@@ -236,7 +236,7 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, BOOL bIsSaveVersion
     aVersionBox.SetDoubleClickHdl( LINK( this, SfxVersionDialog, DClickHdl_Impl ) );
 
     aVersionBox.GrabFocus();
-    aVersionBox.SetWindowBits( WB_HSCROLL | WB_CLIPCHILDREN );
+    aVersionBox.SetStyle( aVersionBox.GetStyle() | WB_HSCROLL | WB_CLIPCHILDREN );
     aVersionBox.SetSelectionMode( SINGLE_SELECTION );
     aVersionBox.SetTabs( &nTabs_Impl[0], MAP_APPFONT );
     aVersionBox.Resize();	// OS: Hack fuer richtige Selektion
@@ -297,7 +297,7 @@ void SfxVersionDialog::Init_Impl()
 
     aSaveCheckBox.Check( mbIsSaveVersionOnClose );
 
-    BOOL bEnable = !pObjShell->IsReadOnly();
+    sal_Bool bEnable = !pObjShell->IsReadOnly();
     aSaveButton.Enable( bEnable );
     aSaveCheckBox.Enable( bEnable );
 
@@ -320,19 +320,19 @@ void SfxVersionDialog::Open_Impl()
     SfxObjectShell *pObjShell = pViewFrame->GetObjectShell();
 
     SvLBoxEntry *pEntry = aVersionBox.FirstSelected();
-    ULONG nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
+    sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
     SfxInt16Item aItem( SID_VERSION, (short)nPos+1 );
     SfxStringItem aTarget( SID_TARGETNAME, DEFINE_CONST_UNICODE("_blank") );
     SfxStringItem aReferer( SID_REFERER, DEFINE_CONST_UNICODE("private:user") );
     SfxStringItem aFile( SID_FILE_NAME, pObjShell->GetMedium()->GetName() );
 
-    ::rtl::OUString aPassString;
-    if ( GetPasswd_Impl( pObjShell->GetMedium()->GetItemSet(), aPassString ) )
+    uno::Sequence< beans::NamedValue > aEncryptionData;
+    if ( GetEncryptionData_Impl( pObjShell->GetMedium()->GetItemSet(), aEncryptionData ) )
     {
         // there is a password, it should be used during the opening
-        SfxStringItem aPassItem( SID_PASSWORD, aPassString );
+        SfxUnoAnyItem aEncryptionDataItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) );
         pViewFrame->GetDispatcher()->Execute(
-            SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, &aPassItem, 0L );
+            SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aFile, &aItem, &aTarget, &aReferer, &aEncryptionDataItem, 0L );
     }
     else
         pViewFrame->GetDispatcher()->Execute(
@@ -407,20 +407,20 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     {
         SfxVersionInfo aInfo;
         aInfo.aAuthor = SvtUserOptions().GetFullName();
-        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, aInfo, TRUE );
+        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, aInfo, sal_True );
         short nRet = pDlg->Execute();
         if ( nRet == RET_OK )
         {
             SfxStringItem aComment( SID_DOCINFO_COMMENTS, aInfo.aComment );
-            pObjShell->SetModified( TRUE );
+            pObjShell->SetModified( sal_True );
             const SfxPoolItem* aItems[2];
             aItems[0] = &aComment;
             aItems[1] = NULL;
             pViewFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, aItems, 0 );
-            aVersionBox.SetUpdateMode( FALSE );
+            aVersionBox.SetUpdateMode( sal_False );
             aVersionBox.Clear();
             Init_Impl();
-            aVersionBox.SetUpdateMode( TRUE );
+            aVersionBox.SetUpdateMode( sal_True );
         }
 
         delete pDlg;
@@ -428,11 +428,11 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     if ( pButton == &aDeleteButton && pEntry )
     {
         pObjShell->GetMedium()->RemoveVersion_Impl( ((SfxVersionInfo*) pEntry->GetUserData())->aName );
-        pObjShell->SetModified( TRUE );
-        aVersionBox.SetUpdateMode( FALSE );
+        pObjShell->SetModified( sal_True );
+        aVersionBox.SetUpdateMode( sal_False );
         aVersionBox.Clear();
         Init_Impl();
-        aVersionBox.SetUpdateMode( TRUE );
+        aVersionBox.SetUpdateMode( sal_True );
     }
     else if ( pButton == &aOpenButton && pEntry )
     {
@@ -441,20 +441,20 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     else if ( pButton == &aViewButton && pEntry )
     {
         SfxVersionInfo* pInfo = (SfxVersionInfo*) pEntry->GetUserData();
-        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, *pInfo, FALSE );
+        SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl( this, *pInfo, sal_False );
         pDlg->Execute();
         delete pDlg;
     }
     else if ( pEntry && pButton == &aCompareButton )
     {
         SfxAllItemSet aSet( pObjShell->GetPool() );
-        ULONG nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
+        sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry );
         aSet.Put( SfxInt16Item( SID_VERSION, (short)nPos+1 ) );
         aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) );
 
         SfxItemSet* pSet = pObjShell->GetMedium()->GetItemSet();
-        SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, FALSE );
-        SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False );
+        SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False );
         if ( pFilterItem )
             aSet.Put( *pFilterItem );
         if ( pFilterOptItem )
@@ -467,7 +467,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton )
     return 0L;
 }
 
-SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersionInfo& rInfo, BOOL bEdit )
+SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersionInfo& rInfo, sal_Bool bEdit )
     : SfxModalDialog( pParent, SfxResId( DLG_COMMENTS ) )
     , aDateTimeText( this, SfxResId( FT_DATETIME ) )
     , aSavedByText( this, SfxResId( FT_SAVEDBY ) )
@@ -493,7 +493,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersi
     {
         aOKButton.Hide();
         aCancelButton.Hide();
-        aEdit.SetReadOnly( TRUE );
+        aEdit.SetReadOnly( sal_True );
     }
     else
         aCloseButton.Hide();
diff --git a/sfx2/source/dialog/versdlg.hrc b/sfx2/source/dialog/versdlg.hrc
index e39a783164..e39a783164 100644..100755
--- a/sfx2/source/dialog/versdlg.hrc
+++ b/sfx2/source/dialog/versdlg.hrc
diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src
index 5e0f35cf65..ff33b8d239 100644..100755
--- a/sfx2/source/dialog/versdlg.src
+++ b/sfx2/source/dialog/versdlg.src
@@ -28,6 +28,7 @@
 #include "versdlg.hrc"
 ModalDialog DLG_VERSIONS
 {
+    HelpID = "sfx2:ModalDialog:DLG_VERSIONS";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 340 , 184 ) ;
     SvLook = TRUE ;
@@ -41,6 +42,7 @@ ModalDialog DLG_VERSIONS
     };
     PushButton PB_SAVE
     {
+        HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_SAVE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 14 ) ;
         TabStop = TRUE ;
@@ -48,6 +50,7 @@ ModalDialog DLG_VERSIONS
     };
     CheckBox CB_SAVEONCLOSE
     {
+        HelpID = "sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE";
         Pos = MAP_APPFONT ( 108 , 16 ) ;
         Size = MAP_APPFONT ( 164 , 10 ) ;
         TabStop = TRUE ;
@@ -93,6 +96,7 @@ ModalDialog DLG_VERSIONS
     };
     PushButton PB_OPEN
     {
+        HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_OPEN";
         Pos = MAP_APPFONT ( 284 , 26 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -100,6 +104,7 @@ ModalDialog DLG_VERSIONS
     };
     PushButton PB_VIEW
     {
+        HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_VIEW";
         Pos = MAP_APPFONT ( 284 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -108,6 +113,7 @@ ModalDialog DLG_VERSIONS
     };
     PushButton PB_DELETE
     {
+        HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_DELETE";
         Pos = MAP_APPFONT ( 284 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -115,6 +121,7 @@ ModalDialog DLG_VERSIONS
     };
     PushButton PB_COMPARE
     {
+        HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_COMPARE";
         Pos = MAP_APPFONT ( 284 , 77 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -130,6 +137,7 @@ ModalDialog DLG_VERSIONS
 };
 ModalDialog DLG_COMMENTS
 {
+    HelpID = "sfx2:ModalDialog:DLG_COMMENTS";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 180 , 118 ) ;
     SvLook = TRUE ;
@@ -148,6 +156,7 @@ ModalDialog DLG_COMMENTS
     };
     MultiLineEdit ME_VERSIONS
     {
+        HelpID = "sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 32 ) ;
         Size = MAP_APPFONT ( 168 , 60 ) ;
@@ -168,6 +177,7 @@ ModalDialog DLG_COMMENTS
     };
     PushButton PB_CLOSE
     {
+        HelpID = "sfx2:PushButton:DLG_COMMENTS:PB_CLOSE";
         Pos = MAP_APPFONT ( 68 , 98 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 70083e684a..70083e684a 100644..100755
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 58f3d6ae40..58f3d6ae40 100644..100755
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index 4d23761595..e7c71c09d9 100644..100755
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -28,10 +28,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 
 #include <sfx2/sfx.hrc>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "doc.hrc"
 #include <vcl/msgbox.hxx>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f2b665f245..f2b665f245 100644..100755
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
deleted file mode 100644
index b4dbba56e9..0000000000
--- a/sfx2/source/doc/applet.cxx
+++ /dev/null
@@ -1,377 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#include "applet.hxx"
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/sfxsids.hrc>
-
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/factory.hxx"
-#include <tools/urlobj.hxx>
-#include <tools/debug.hxx>
-#include <sj2/sjapplet.hxx>
-#include <vcl/syschild.hxx>
-#include <rtl/ustring.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <unotools/javaoptions.hxx>
-#include <svtools/miscopt.hxx>
-#include <comphelper/TypeGeneration.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::comphelper;
-
-namespace sfx2
-{
-class AppletWindow_Impl : public SystemChildWindow
-{
-public:
-    SjApplet2* pApplet;
-    AppletWindow_Impl( Window* pParent, SjApplet2* pApp )
-     : SystemChildWindow( pParent, WB_CLIPCHILDREN )
-     , pApplet(pApp)
-     {}
-
-     virtual void Resize();
-};
-
-void AppletWindow_Impl::Resize()
-{
-    Size aSize( GetOutputSizePixel() );
-    if ( pApplet )
-        pApplet->setSizePixel( aSize );
-}
-
-class AppletWrapper_Impl : public SjApplet2
-{
-    virtual void appletResize( const Size & );
-    virtual void showDocument( const INetURLObject &, const XubString & );
-    virtual void showStatus( const XubString & );
-};
-
-void AppletWrapper_Impl::appletResize( const Size & ) {}
-void AppletWrapper_Impl::showDocument( const INetURLObject &, const XubString & ) {}
-void AppletWrapper_Impl::showStatus( const XubString & ) {}
-
-#define PROPERTY_UNBOUND 0
-#define PROPERTY_MAYBEVOID ::com::sun::star::beans::PropertyAttribute::MAYBEVOID
-
-#define WID_APPLET_CODE                 1
-#define WID_APPLET_CODEBASE             2
-#define WID_APPLET_COMMANDS             3
-#define WID_APPLET_DOCBASE              4
-#define WID_APPLET_ISSCRIPT             5
-#define WID_APPLET_NAME                 6
-const SfxItemPropertyMapEntry* lcl_GetAppletPropertyMap_Impl()
-{
-    static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] =
-    {
-        { MAP_CHAR_LEN("AppletCode")    , WID_APPLET_CODE     , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
-        { MAP_CHAR_LEN("AppletCodeBase"), WID_APPLET_CODEBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
-        { MAP_CHAR_LEN("AppletCommands"), WID_APPLET_COMMANDS , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_UNBOUND, 0 },
-        { MAP_CHAR_LEN("AppletDocBase"),  WID_APPLET_DOCBASE  , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
-        { MAP_CHAR_LEN("AppletIsScript"), WID_APPLET_ISSCRIPT , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_UNBOUND, 0 },
-        { MAP_CHAR_LEN("AppletName")    , WID_APPLET_NAME     , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
-        {0,0,0,0,0,0}
-    };
-return aAppletPropertyMap_Impl;
-}
-
-::rtl::OUString AppletObject::getImplementationName()
-    throw( ::com::sun::star::uno::RuntimeException )
-{
-    return impl_getStaticImplementationName();
-}
-
-::sal_Bool AppletObject::supportsService( const ::rtl::OUString& sServiceName )
-    throw( ::com::sun::star::uno::RuntimeException )
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames =
-          getSupportedServiceNames();
-    const ::rtl::OUString* pArray = seqServiceNames.getConstArray();
-    for ( ::sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength();
-          nCounter++ )
-    {
-        if ( pArray[nCounter] == sServiceName )
-        {
-            return sal_True ;
-        }
-    }
-    return sal_False ;
-}
-
-::com::sun::star::uno::Sequence< ::rtl::OUString >
-AppletObject::getSupportedServiceNames()
-    throw( ::com::sun::star::uno::RuntimeException )
-{
-    return impl_getStaticSupportedServiceNames();
-}
-
-::com::sun::star::uno::Sequence< ::rtl::OUString >
-AppletObject::impl_getStaticSupportedServiceNames()
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.embed.SpecialEmbeddedObject" ));
-    return seqServiceNames ;
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-AppletObject::impl_createInstance(
-    const ::com::sun::star::uno::Reference<
-    ::com::sun::star::uno::XComponentContext >& xContext )
-    throw( ::com::sun::star::uno::Exception )
-{
-    return static_cast< ::cppu::OWeakObject * >( new AppletObject( xContext ) );
-}
-
-::rtl::OUString AppletObject::impl_getStaticImplementationName()
-{
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.sfx2.AppletObject" ));
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-AppletObject::impl_createFactory()
-{
-    return uno::Reference< uno::XInterface >(
-        cppu::createSingleComponentFactory(
-            impl_createInstance, impl_getStaticImplementationName(),
-            impl_getStaticSupportedServiceNames() ),
-        uno::UNO_QUERY_THROW );
-}
-
-AppletObject::AppletObject(
-    const uno::Reference < uno::XComponentContext >& rContext )
-    : mxContext( rContext )
-    , maPropMap( lcl_GetAppletPropertyMap_Impl() )
-    , mpApplet( NULL )
-    , mbMayScript( FALSE )
-{
-}
-
-AppletObject::~AppletObject()
-{
-}
-
-void SAL_CALL AppletObject::initialize( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, uno::RuntimeException )
-{
-    if ( aArguments.getLength() )
-        aArguments[0] >>= mxObj;
-}
-
-sal_Bool SAL_CALL AppletObject::load(
-    const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/,
-    const uno::Reference < frame::XFrame >& xFrame )
-throw( uno::RuntimeException )
-{
-    if ( SvtJavaOptions().IsExecuteApplets() && SvtMiscOptions().IsPluginsEnabled() )
-    {
-        mpApplet = new AppletWrapper_Impl;
-
-        Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
-        Window* pWin = new AppletWindow_Impl( pParent, mpApplet );
-        pWin->SetBackground();
-        pWin->Show();
-
-        if( maName.getLength() )
-            maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "name" ) ), maName );
-
-        if( maCodeBase.getLength() )
-        {
-            for ( sal_uInt32 nParams=0; nParams<maCmdList.Count(); nParams++ )
-            {
-                if ( maCmdList[nParams].GetCommand().EqualsAscii("codebase") )
-                {
-                    maCmdList.Remove(nParams);
-                    break;
-                }
-            }
-
-            maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "codebase" ) ), maCodeBase );
-        }
-
-        if( maClass.getLength() )
-            maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "code" ) ), maClass );
-
-        if( mbMayScript )
-            maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "mayscript" ) ), String() );
-
-        INetURLObject aDocBase( maDocBase );
-        mpApplet->Init( mxContext, pWin, aDocBase, maCmdList );
-        uno::Reference < awt::XWindow > xWindow( pWin->GetComponentInterface(), uno::UNO_QUERY );
-
-        // we must destroy the applet before the parent is destroyed
-        xWindow->addEventListener( this );
-
-        xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-void SAL_CALL AppletObject::cancel() throw( com::sun::star::uno::RuntimeException )
-{
-    if ( mpApplet )
-    {
-        mpApplet->appletClose(); // reparenting window
-        DELETEZ( mpApplet );
-    }
-}
-
-void SAL_CALL AppletObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException)
-{
-    cancel();
-}
-
-uno::Reference< beans::XPropertySetInfo > SAL_CALL AppletObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException )
-{
-    static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap );
-    return xInfo;
-}
-
-void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny)
-    throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
-{
-
-    const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
-    if( !pEntry )
-         throw beans::UnknownPropertyException();
-    switch( pEntry->nWID )
-    {
-        case WID_APPLET_CODE      :
-            aAny >>= maClass;
-        break;
-        case WID_APPLET_CODEBASE  :
-            aAny >>= maCodeBase;
-        break;
-        case WID_APPLET_COMMANDS  :
-        {
-            maCmdList.Clear();
-            uno::Sequence < beans::PropertyValue > aCommandSequence;
-            if( aAny >>= aCommandSequence )
-                maCmdList.FillFromSequence( aCommandSequence );
-        }
-        break;
-        case WID_APPLET_DOCBASE   :
-            aAny >>= maDocBase;
-        break;
-        case WID_APPLET_ISSCRIPT  :
-            aAny >>= mbMayScript;
-        break;
-        case WID_APPLET_NAME      :
-            aAny >>= maName;
-        break;
-        default:;
-
-    }
-}
-
-uno::Any SAL_CALL AppletObject::getPropertyValue(const ::rtl::OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    uno::Any aAny;
-    const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
-    if( !pEntry )
-         throw beans::UnknownPropertyException();
-    switch( pEntry->nWID )
-    {
-        case WID_APPLET_CODE      :
-        aAny <<= maClass;
-        break;
-        case WID_APPLET_CODEBASE  :
-        aAny <<= maCodeBase;
-        break;
-        case WID_APPLET_COMMANDS  :
-        {
-            uno::Sequence< beans::PropertyValue > aCommandSequence;
-            maCmdList.FillSequence( aCommandSequence );
-            aAny <<= aCommandSequence;
-        }
-        break;
-        case WID_APPLET_DOCBASE   :
-        break;
-        case WID_APPLET_ISSCRIPT  :
-            aAny <<= mbMayScript;
-        break;
-        case WID_APPLET_NAME      :
-            aAny <<= maName;
-        break;
-        default:;
-
-    }
-    return aAny;
-}
-
-void SAL_CALL AppletObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-::sal_Int16 SAL_CALL AppletObject::execute() throw (::com::sun::star::uno::RuntimeException)
-{
-    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    uno::Reference < beans::XPropertySet > xSet( this );
-    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_APPLET, mxObj );
-    if ( pDlg )
-        pDlg->Execute();
-    return 0;
-}
-
-void SAL_CALL AppletObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException)
-{
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 56b8a73524..aa24f9ad5b 100644..100755
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -44,7 +44,6 @@
 #define STR_NOSTARTPRINTER					(RID_SFX_DOC_START+ 8)
 #define MSG_CONFIRM_FILTER					(RID_SFX_DOC_START+11)
 #define MSG_CONFIRM_OVERWRITE_TEMPLATE		(RID_SFX_DOC_START+12)
-#define MSG_QUERY_LOAD_TEMPLATE 			(RID_SFX_DOC_START+13)
 
 #define STR_DELETE_REGION					(RID_SFX_DOC_START+14)
 #define STR_DELETE_TEMPLATE					(RID_SFX_DOC_START+15)
@@ -137,7 +136,6 @@
 #define RID_CNT_STR_WAITING                 (RID_SFX_DOC_START+ 83)
 
 #define STR_OBJECT                          (RID_SFX_DOC_START+ 84)
-#define STR_EDITOBJECT                  	(RID_SFX_DOC_START+ 85)
 
 #define DLOAD_URL 1
 #define DLOAD_STATUS 2
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index fdd1c19a96..057d257241 100644..100755
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -43,14 +43,6 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE
     DefButton = WB_DEF_NO ;
     Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ;
 };
-QueryBox MSG_QUERY_LOAD_TEMPLATE
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    HelpId = MSG_QUERY_LOAD_TEMPLATE;
-
-    Message [ en-US ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?";
-};
 String STR_DELETE_REGION
 {
     Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ;
@@ -367,11 +359,6 @@ String STR_OBJECT
     Text [ en-US ] = "Object" ;
 };
 
-String STR_EDITOBJECT
-{
-    Text [ en-US ] = "~Edit";
-};
-
 QueryBox DLG_MACROQUERY
 {
     Buttons = WB_OK_CANCEL;
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index bbefb37943..36761a01c9 100644..100755
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -48,13 +48,13 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "fltfnc.hxx"
 #include "arrdecl.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/mnumgr.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfxuno.hxx>
 #include "syspath.hxx"
 #include <osl/file.hxx>
@@ -349,7 +349,7 @@ String SfxObjectFactory::GetStandardTemplate( const String& rServiceName )
 
 const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
 {
-    USHORT nVersion=0;
+    sal_uInt16 nVersion=0;
     SfxFilterMatcher aMatcher ( String::CreateFromAscii( pShortName ) );
     SfxFilterMatcherIter aIter( &aMatcher );
     const SfxFilter *pFilter = 0;
@@ -359,7 +359,7 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
         if( pTemp->IsOwnFormat() && pTemp->IsOwnTemplateFormat() && ( pTemp->GetVersion() > nVersion ) )
         {
             pFilter = pTemp;
-            nVersion = (USHORT) pTemp->GetVersion();
+            nVersion = (sal_uInt16) pTemp->GetVersion();
         }
 
         pTemp = aIter.Next();
@@ -444,7 +444,7 @@ sal_uInt16 SfxObjectFactory::GetViewNo_Impl( const sal_uInt16 i_nViewId, const s
 
 SfxViewFactory* SfxObjectFactory::GetViewFactoryByViewName( const String& i_rViewName ) const
 {
-    for (   USHORT nViewNo = 0;
+    for (   sal_uInt16 nViewNo = 0;
             nViewNo < GetViewFactoryCount();
             ++nViewNo
         )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 7a5ea62ab9..2a14eac144 100644..100755
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -80,6 +80,7 @@
 #include <unotools/tempfile.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <unotools/streamhelper.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -141,7 +142,7 @@ using namespace ::com::sun::star::io;
 #include <sfx2/docfac.hxx>       // GetFilterContainer
 #include "doc.hrc"
 #include "openflag.hxx"     // SFX_STREAM_READONLY etc.
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/appuno.hxx>
 #include "sfxacldetect.hxx"
 
@@ -718,7 +719,7 @@ const String& SfxMedium::GetPhysicalName() const
 //------------------------------------------------------------------
 void SfxMedium::CreateFileStream()
 {
-    ForceSynchronStream_Impl( TRUE );
+    ForceSynchronStream_Impl( sal_True );
     GetInStream();
     if( pInStream )
     {
@@ -758,7 +759,7 @@ sal_Bool SfxMedium::Commit()
 sal_Bool SfxMedium::IsStorage()
 {
     if ( pImp->xStorage.is() )
-        return TRUE;
+        return sal_True;
 
     if ( bTriedStorage )
         return pImp->bIsStorage;
@@ -772,13 +773,13 @@ sal_Bool SfxMedium::IsStorage()
         }
         pImp->bIsStorage = SotStorage::IsStorageFile( aURL ) && !SotStorage::IsOLEStorage( aURL);
         if ( !pImp->bIsStorage )
-            bTriedStorage = TRUE;
+            bTriedStorage = sal_True;
     }
     else if ( GetInStream() )
     {
         pImp->bIsStorage = SotStorage::IsStorageFile( pInStream ) && !SotStorage::IsOLEStorage( pInStream );
         if ( !pInStream->GetError() && !pImp->bIsStorage )
-            bTriedStorage = TRUE;
+            bTriedStorage = sal_True;
     }
 
     return pImp->bIsStorage;
@@ -873,17 +874,21 @@ uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
 }
 
 //------------------------------------------------------------------
-void SfxMedium::SetPasswordToStorage_Impl()
+void SfxMedium::SetEncryptionDataToStorage_Impl()
 {
     // in case media-descriptor contains password it should be used on opening
     if ( pImp->xStorage.is() && pSet )
     {
-        ::rtl::OUString aPasswd;
-        if ( GetPasswd_Impl( pSet, aPasswd ) )
+        uno::Sequence< beans::NamedValue > aEncryptionData;
+        if ( GetEncryptionData_Impl( pSet, aEncryptionData ) )
         {
+            // replace the password with encryption data
+            pSet->ClearItem( SID_PASSWORD );
+            pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) );
+
             try
             {
-                ::comphelper::OStorageHelper::SetCommonStoragePassword( pImp->xStorage, aPasswd );
+                ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( pImp->xStorage, aEncryptionData );
             }
             catch( uno::Exception& )
             {
@@ -1231,7 +1236,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
             // the error should be set in case it is storing process
             // or the document has been opened for editing explicitly
 
-            SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+        SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
             if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) )
                 SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
             else
@@ -1341,13 +1346,13 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
     // TODO/LATER: Get versionlist on demand
     if ( pImp->xStorage.is() )
     {
-        SetPasswordToStorage_Impl();
+        SetEncryptionDataToStorage_Impl();
         GetVersionList();
     }
 
     SFX_ITEMSET_ARG( pSet, pVersion, SfxInt16Item, SID_VERSION, sal_False);
 
-    BOOL bResetStorage = FALSE;
+    sal_Bool bResetStorage = sal_False;
     if ( pVersion && pVersion->GetValue() )
     {
         // Alle verf"ugbaren Versionen einlesen
@@ -1398,11 +1403,11 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
                     pImp->aVersions.realloc(0);
                 }
                 else
-                    bResetStorage = TRUE;
+                    bResetStorage = sal_True;
             }
         }
         else
-            bResetStorage = TRUE;
+            bResetStorage = sal_True;
     }
 
     if ( bResetStorage )
@@ -1653,7 +1658,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
             sal_Bool bTransactStarted = sal_False;
             SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, sal_False );
                SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, sal_False );
-            sal_Bool bRename = pRename ? pRename->GetValue() : FALSE;
+            sal_Bool bRename = pRename ? pRename->GetValue() : sal_False;
             sal_Bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename;
 
             try
@@ -2276,7 +2281,7 @@ void SfxMedium::GetMedium_Impl()
             {
                 GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, aFileName ) );
                 if( !(nStorOpenMode & STREAM_WRITE ) )
-                    GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+                    GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
                 if (xInteractionHandler.is())
                     GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny(xInteractionHandler) ) );
             }
@@ -2419,7 +2424,7 @@ void SfxMedium::Init_Impl()
     Reference< XOutputStream > rOutStream;
 
     // TODO/LATER: handle lifetime of storages
-    pImp->bDisposeStorage = FALSE;
+    pImp->bDisposeStorage = sal_False;
 
     SFX_ITEMSET_ARG( pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
     if ( pSalvageItem && !pSalvageItem->GetValue().Len() )
@@ -2475,7 +2480,7 @@ void SfxMedium::Init_Impl()
     if ( aLogicName.Len() )
     {
         // if the logic name is set it should be set in MediaDescriptor as well
-        SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
         if ( !pFileNameItem )
         {
             // let the ItemSet be created if necessary
@@ -2521,7 +2526,7 @@ SfxMedium::SfxMedium( const SfxMedium& rMedium, sal_Bool bTemporary )
 
 //------------------------------------------------------------------
 
-void SfxMedium::UseInteractionHandler( BOOL bUse )
+void SfxMedium::UseInteractionHandler( sal_Bool bUse )
 {
     pImp->bAllowDefaultIntHdl = bUse;
 }
@@ -2762,7 +2767,7 @@ void SfxMedium::SetIsRemote_Impl()
         case INET_PROT_NEWS:
         case INET_PROT_IMAP:
         case INET_PROT_VIM:
-            bRemote = TRUE; break;
+            bRemote = sal_True; break;
         default:
             bRemote = ( GetName().CompareToAscii( "private:msgid", 13 ) == COMPARE_EQUAL );
             break;
@@ -2839,8 +2844,8 @@ sal_Bool SfxMedium::Exists( sal_Bool /*bForceSession*/ )
 
 void SfxMedium::ReOpen()
 {
-    BOOL bUseInteractionHandler = pImp->bUseInteractionHandler;
-    pImp->bUseInteractionHandler = FALSE;
+    sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler;
+    pImp->bUseInteractionHandler = sal_False;
     GetMedium_Impl();
     pImp->bUseInteractionHandler = bUseInteractionHandler;
 }
@@ -2850,8 +2855,8 @@ void SfxMedium::ReOpen()
 void SfxMedium::CompleteReOpen()
 {
     // do not use temporary file for reopen and in case of success throw the temporary file away
-    BOOL bUseInteractionHandler = pImp->bUseInteractionHandler;
-    pImp->bUseInteractionHandler = FALSE;
+    sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler;
+    pImp->bUseInteractionHandler = sal_False;
 
     ::utl::TempFile* pTmpFile = NULL;
     if ( pImp->pTempFile )
@@ -2927,7 +2932,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
             // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file
             // that must be copied here
 
-            SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+            SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
             if (!pFileNameItem) throw uno::RuntimeException();
             ::rtl::OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() );
             if ( aNewTempFileURL.getLength() )
@@ -2944,16 +2949,16 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
         }
     }
 
-    BOOL bReadOnly = FALSE;
-    SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+    sal_Bool bReadOnly = sal_False;
+    SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
     if ( pReadOnlyItem && pReadOnlyItem->GetValue() )
-        bReadOnly = TRUE;
+        bReadOnly = sal_True;
 
-    SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
+    SFX_ITEMSET_ARG( pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False );
     if (!pFileNameItem) throw uno::RuntimeException();
     aLogicName = pFileNameItem->GetValue();
     nStorOpenMode = bReadOnly ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE;
-    bDirect = FALSE;
+    bDirect = sal_False;
     Init_Impl();
 }
 
@@ -2971,7 +2976,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
 
     Init_Impl();
     pImp->xStorage = rStor;
-    pImp->bDisposeStorage = FALSE;
+    pImp->bDisposeStorage = sal_False;
 
     // always take BaseURL first, could be overwritten by ItemSet
     GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
@@ -3213,7 +3218,7 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision )
 
         sal_uInt16 nKey;
         for ( nKey=0; nKey<aLongs.Count(); nKey++ )
-            if ( aLongs[nKey] > ( ULONG ) nKey+1 )
+            if ( aLongs[nKey] > ( sal_uIntPtr ) nKey+1 )
                 break;
 
         String aRevName = DEFINE_CONST_UNICODE( "Version" );
@@ -3504,7 +3509,7 @@ void SfxMedium::SetCharset( ::rtl::OUString aChs )
 
 sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature )
 {
-    sal_Bool bChanges = FALSE;
+    sal_Bool bChanges = sal_False;
 
     // the medium should be closed to be able to sign, the caller is responsible to close it
     if ( !IsOpen() && !GetError() )
@@ -3567,7 +3572,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
 
                             // the temporary file has been written, commit it to the original file
                             Commit();
-                            bChanges = TRUE;
+                            bChanges = sal_True;
                         }
                     }
                     else
@@ -3586,7 +3591,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::
 
                             // the temporary file has been written, commit it to the original file
                             Commit();
-                            bChanges = TRUE;
+                            bChanges = sal_True;
                         }
                     }
                 }
@@ -3631,12 +3636,12 @@ void SfxMedium::SetCachedSignatureState_Impl( sal_uInt16 nState )
     pImp->m_nSignatureState = nState;
 }
 
-BOOL SfxMedium::HasStorage_Impl() const
+sal_Bool SfxMedium::HasStorage_Impl() const
 {
     return pImp->xStorage.is();
 }
 
-BOOL SfxMedium::IsOpen() const
+sal_Bool SfxMedium::IsOpen() const
 {
     return pInStream || pOutStream || pImp->xStorage.is();
 }
@@ -3693,19 +3698,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction
         {
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( bAllowAbort ? 2 : 1 );
 
-            ::rtl::Reference< ::framework::ContinuationApprove > pApprove( new ::framework::ContinuationApprove() );
+            ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
             aContinuations[ 0 ] = pApprove.get();
 
             if ( bAllowAbort )
             {
-                ::rtl::Reference< ::framework::ContinuationAbort > pAbort( new ::framework::ContinuationAbort() );
+                ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort( new ::comphelper::OInteractionAbort );
                 aContinuations[ 1 ] = pAbort.get();
             }
 
-            uno::Reference< task::XInteractionRequest > xRequest( new ::framework::InteractionRequest( aRequest, aContinuations ) );
-            xHandler->handle( xRequest );
-
-            bResult = pApprove->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aRequest,aContinuations));
+            bResult = pApprove->wasSelected();
         }
         catch( const Exception& )
         {
@@ -3745,7 +3748,7 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction
                 // remove the readonly state
                 sal_Bool bWasReadonly = sal_False;
                 nStorOpenMode = SFX_STREAM_READWRITE;
-                SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+                SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
                 if ( pReadOnlyItem && pReadOnlyItem->GetValue() )
                     bWasReadonly = sal_True;
                 GetItemSet()->ClearItem( SID_DOC_READONLY );
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index fb7901575a..5a34f4b54c 100644..100755
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -177,7 +177,7 @@ String SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
     return pType ? String::CreateFromAscii(pType) : String();
 }
 
-String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, BOOL bTemplate,
+String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, sal_Bool bTemplate,
                                         String* pFilterName )
         throw ( beans::UnknownPropertyException,
                 lang::WrappedTargetException,
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index a6daa90a64..d416af4e45 100644..100755
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -313,7 +313,7 @@ uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(GDIMetaFile* i_pThumb)
         SvMemoryStream aStream;
 // magic value 160 taken from GraphicHelper::getThumbnailFormatFromGDI_Impl()
         if( i_pThumb->CreateThumbnail( 160, aBitmap ) ) {
-            aBitmap.GetBitmap().Write( aStream, FALSE, FALSE );
+            aBitmap.GetBitmap().Write( aStream, sal_False, sal_False );
             aStream.Seek(STREAM_SEEK_TO_END);
             uno::Sequence<sal_uInt8> aSeq(aStream.Tell());
             const sal_uInt8* pBlob(
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index f9c057442f..9b1ebfeb79 100644..100755
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sfx2.hxx"
 
 #include <sfx2/app.hxx>
-#include "docinsert.hxx"
+#include "sfx2/docinsert.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -112,9 +112,9 @@ SfxMedium* DocumentInserter::CreateMedium()
         DBG_ASSERT( m_pURLList->Count() == 1, "DocumentInserter::CreateMedium(): invalid URL list count" );
         String sURL = *( m_pURLList->GetObject(0) );
         pMedium = new SfxMedium(
-                sURL, SFX_STREAM_READONLY, FALSE,
+                sURL, SFX_STREAM_READONLY, sal_False,
                 SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
-        pMedium->UseInteractionHandler( TRUE );
+        pMedium->UseInteractionHandler( sal_True );
         SfxFilterMatcher* pMatcher = NULL;
         if ( m_sDocFactory.Len() )
             pMatcher = new SfxFilterMatcher( m_sDocFactory );
@@ -122,7 +122,7 @@ SfxMedium* DocumentInserter::CreateMedium()
             pMatcher = new SfxFilterMatcher();
 
         const SfxFilter* pFilter = NULL;
-        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, FALSE );
+        sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, sal_False );
         if ( nError == ERRCODE_NONE && pFilter )
             pMedium->SetFilter( pFilter );
         else
@@ -146,16 +146,16 @@ SfxMediumList* DocumentInserter::CreateMediumList()
         sal_Int32 nCount = m_pURLList->Count();
         for ( ; i < nCount; ++i )
         {
-            String sURL = *( m_pURLList->GetObject( static_cast< USHORT >(i) ) );
+            String sURL = *( m_pURLList->GetObject( static_cast< sal_uInt16 >(i) ) );
             SfxMedium* pMedium = new SfxMedium(
-                    sURL, SFX_STREAM_READONLY, FALSE,
+                    sURL, SFX_STREAM_READONLY, sal_False,
                     SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet );
 
-            pMedium->UseInteractionHandler( TRUE );
+            pMedium->UseInteractionHandler( sal_True );
 
             SfxFilterMatcher aMatcher( m_sDocFactory );
             const SfxFilter* pFilter = NULL;
-            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, FALSE );
+            sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, sal_False );
             if ( nError == ERRCODE_NONE && pFilter )
                 pMedium->SetFilter( pFilter );
             else
@@ -181,7 +181,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, SvStringsDtor*& _rpURL
     {
         _rpURLList = new SvStringsDtor;
 
-        for ( USHORT i = 0; i < aPathSeq.getLength(); ++i )
+        for ( sal_uInt16 i = 0; i < aPathSeq.getLength(); ++i )
         {
             INetURLObject aPathObj( aPathSeq[i] );
             String* pURL = new String( aPathObj.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index c57b048816..c57b048816 100644..100755
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 1da9832a4f..1da9832a4f 100644..100755
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 84da3f06a0..4496806bd8 100644..100755
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -34,7 +34,7 @@
 
 #include <sfx2/doctdlg.hxx>
 #include "docvor.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
@@ -109,8 +109,8 @@ void SfxDocumentTemplateDlg::Init()
     if(!pTemplates->IsConstructed())
         pTemplates->Construct();
 
-    const USHORT nCount = pTemplates->GetRegionCount();
-    for(USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = pTemplates->GetRegionCount();
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         aRegionLb.InsertEntry(pTemplates->GetFullRegionName(i));
     if(!nCount)
         aRegionLb.InsertEntry(String(SfxResId(STR_STANDARD)));
@@ -141,10 +141,10 @@ IMPL_LINK( SfxDocumentTemplateDlg, OrganizeHdl, Button *, pButton )
     if(RET_OK == nRet)
     {
         // View aktualisieren
-        aRegionLb.SetUpdateMode( FALSE );
+        aRegionLb.SetUpdateMode( sal_False );
         aRegionLb.Clear();
         Init();
-        aRegionLb.SetUpdateMode( TRUE );
+        aRegionLb.SetUpdateMode( sal_True );
         aRegionLb.Invalidate();
         aRegionLb.Update();
         aCancelBt.SetText(String(SfxResId(STR_CLOSE)));
@@ -174,14 +174,14 @@ IMPL_LINK( SfxDocumentTemplateDlg, OkHdl, Control *, pControl )
 
 IMPL_LINK( SfxDocumentTemplateDlg, RegionSelect, ListBox *, pBox )
 {
-    const USHORT nRegion = pBox->GetSelectEntryPos();
-    const USHORT nCount = pTemplates->GetCount(nRegion);
-    aTemplateLb.SetUpdateMode(FALSE);
+    const sal_uInt16 nRegion = pBox->GetSelectEntryPos();
+    const sal_uInt16 nCount = pTemplates->GetCount(nRegion);
+    aTemplateLb.SetUpdateMode(sal_False);
     aTemplateLb.Clear();
-    for(USHORT i = 0; i < nCount; ++i)
+    for(sal_uInt16 i = 0; i < nCount; ++i)
         aTemplateLb.InsertEntry(pTemplates->GetName(nRegion, i));
     aTemplateLb.SelectEntryPos(0);
-    aTemplateLb.SetUpdateMode(TRUE);
+    aTemplateLb.SetUpdateMode(sal_True);
     aTemplateLb.Invalidate();
     aTemplateLb.Update();
     return 0;
diff --git a/sfx2/source/doc/doctdlg.hrc b/sfx2/source/doc/doctdlg.hrc
index e01a0cfefa..e01a0cfefa 100644..100755
--- a/sfx2/source/doc/doctdlg.hrc
+++ b/sfx2/source/doc/doctdlg.hrc
diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
index ee878a85ca..8756da18cf 100644..100755
--- a/sfx2/source/doc/doctdlg.src
+++ b/sfx2/source/doc/doctdlg.src
@@ -28,10 +28,11 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "doctdlg.hrc"
+#include <sfx2/sfxcommands.h>
 
 ModalDialog DLG_DOC_TEMPLATE
 {
-    HelpId = SID_DOCTEMPLATE ;
+    HelpId = CMD_SID_DOCTEMPLATE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 280 , 128 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_DOC_TEMPLATE
     };
     Edit ED_NAME
     {
+        HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 200 , 12 ) ;
@@ -63,6 +65,7 @@ ModalDialog DLG_DOC_TEMPLATE
     };
     ListBox LB_SECTION
     {
+        HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 97 , 66 ) ;
@@ -75,6 +78,7 @@ ModalDialog DLG_DOC_TEMPLATE
     };
     ListBox LB_STYLESHEETS
     {
+        HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 115 , 56 ) ;
         Size = MAP_APPFONT ( 97 , 66 ) ;
@@ -98,12 +102,14 @@ ModalDialog DLG_DOC_TEMPLATE
     };
     PushButton BT_EDIT
     {
+        HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT";
         Pos = MAP_APPFONT ( 224 , 62 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit" ;
     };
     PushButton BT_ORGANIZE
     {
+        HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE";
         Pos = MAP_APPFONT ( 224 , 79 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Organizer..." ;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 99388aeda0..d461b3a17f 100644..100755
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -93,7 +93,7 @@ using namespace ::ucbhelper;
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/fcontnr.hxx>
 #include <svtools/templatefoldercache.hxx>
@@ -138,7 +138,11 @@ namespace DocTempl {
 class DocTempl_EntryData_Impl
 {
     RegionData_Impl*    mpParent;
+
+    // the following member must be SfxObjectShellLock since it controlls that SfxObjectShell lifetime by design
+    // and users of this class expect it to be so.
     SfxObjectShellLock  mxObjShell;
+
     OUString            maTitle;
     OUString            maOwnURL;
     OUString            maTargetURL;
@@ -314,7 +318,7 @@ static sal_Bool getTextProperty_Impl( Content& rContent,
 
 String SfxDocumentTemplates::GetFullRegionName
 (
-    USHORT nIdx                     // Index des Bereiches
+    sal_uInt16 nIdx                     // Index des Bereiches
 )   const
 
 /*  [Beschreibung]
@@ -351,7 +355,7 @@ String SfxDocumentTemplates::GetFullRegionName
 
 const String& SfxDocumentTemplates::GetRegionName
 (
-    USHORT nIdx                 // Index des Bereiches
+    sal_uInt16 nIdx                 // Index des Bereiches
 )   const
 
 /*  [Beschreibung]
@@ -387,7 +391,7 @@ const String& SfxDocumentTemplates::GetRegionName
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetRegionNo
+sal_uInt16 SfxDocumentTemplates::GetRegionNo
 (
     const String &rRegion       // Name der Region
 )   const
@@ -399,7 +403,7 @@ USHORT SfxDocumentTemplates::GetRegionNo
 
     [R"uckgabewert]
 
-    USHORT          Index von 'rRegion' oder USHRT_MAX falls unbekannt
+    sal_uInt16          Index von 'rRegion' oder USHRT_MAX falls unbekannt
 
 */
 {
@@ -412,7 +416,7 @@ USHORT SfxDocumentTemplates::GetRegionNo
     size_t      nIndex = pImp->GetRegionPos( rRegion, bFound );
 
     if ( bFound )
-        return (USHORT) nIndex;
+        return (sal_uInt16) nIndex;
     else
         return USHRT_MAX;
 }
@@ -420,7 +424,7 @@ USHORT SfxDocumentTemplates::GetRegionNo
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetRegionCount() const
+sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
 
 /*  [Beschreibung]
 
@@ -429,7 +433,7 @@ USHORT SfxDocumentTemplates::GetRegionCount() const
 
     [R"uckgabewert]
 
-    USHORT                  Anzahl der Bereiche
+    sal_uInt16                  Anzahl der Bereiche
 
 */
 {
@@ -438,14 +442,14 @@ USHORT SfxDocumentTemplates::GetRegionCount() const
     if ( !pImp->Construct() )
         return 0;
 
-    ULONG nCount = pImp->GetRegionCount();
+    sal_uIntPtr nCount = pImp->GetRegionCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
-sal_Bool SfxDocumentTemplates::IsRegionLoaded( USHORT nIdx ) const
+sal_Bool SfxDocumentTemplates::IsRegionLoaded( sal_uInt16 nIdx ) const
 {
     DocTemplLocker_Impl aLocker( *pImp );
 
@@ -462,7 +466,7 @@ sal_Bool SfxDocumentTemplates::IsRegionLoaded( USHORT nIdx ) const
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetCount
+sal_uInt16 SfxDocumentTemplates::GetCount
 (
     const String&   rName   /*  Name des Bereiches, dessen Eintrags-
                                 anzahl ermittelt werden soll */
@@ -487,19 +491,19 @@ USHORT SfxDocumentTemplates::GetCount
         return 0;
 
     RegionData_Impl *pData = pImp->GetRegion( rName );
-    ULONG            nCount = 0;
+    sal_uIntPtr            nCount = 0;
 
     if ( pData )
         nCount = pData->GetCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
-USHORT SfxDocumentTemplates::GetCount
+sal_uInt16 SfxDocumentTemplates::GetCount
 (
-    USHORT nRegion              /*  Index des Bereiches, dessen Eintrags-
+    sal_uInt16 nRegion              /*  Index des Bereiches, dessen Eintrags-
                                     anzahl ermittelt werden soll */
 
 )   const
@@ -520,20 +524,20 @@ USHORT SfxDocumentTemplates::GetCount
         return 0;
 
     RegionData_Impl *pData = pImp->GetRegion( nRegion );
-    ULONG            nCount = 0;
+    sal_uIntPtr            nCount = 0;
 
     if ( pData )
         nCount = pData->GetCount();
 
-    return (USHORT) nCount;
+    return (sal_uInt16) nCount;
 }
 
 //------------------------------------------------------------------------
 
 const String& SfxDocumentTemplates::GetName
 (
-    USHORT nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT nIdx         //  Index des Eintrags
+    sal_uInt16 nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16 nIdx         //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -575,8 +579,8 @@ const String& SfxDocumentTemplates::GetName
 
 String SfxDocumentTemplates::GetFileName
 (
-    USHORT nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT nIdx         //  Index des Eintrags
+    sal_uInt16 nRegion,     //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16 nIdx         //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -612,8 +616,8 @@ String SfxDocumentTemplates::GetFileName
 
 String SfxDocumentTemplates::GetPath
 (
-    USHORT  nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
-    USHORT  nIdx        //  Index des Eintrags
+    sal_uInt16  nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16  nIdx        //  Index des Eintrags
 )   const
 
 /*  [Beschreibung]
@@ -649,7 +653,7 @@ String SfxDocumentTemplates::GetPath
 
 String SfxDocumentTemplates::GetTemplatePath
 (
-    USHORT          nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
+    sal_uInt16          nRegion,    //  Index des Bereiches, in dem der Eintrag liegt
     const String&   rLongName   //  logischer Name des Eintrags
 )   const
 
@@ -819,7 +823,7 @@ sal_Bool SfxDocumentTemplates::SaveDir
 
 void SfxDocumentTemplates::NewTemplate
 (
-    USHORT          nRegion,    /*  Index des Bereiches, in dem die Vorlage
+    sal_uInt16          nRegion,    /*  Index des Bereiches, in dem die Vorlage
                                     angelegt werden soll */
 
     const String&   rLongName,  //  logischer Name der neuen Vorlage
@@ -863,10 +867,10 @@ void SfxDocumentTemplates::NewTemplate
 
 sal_Bool SfxDocumentTemplates::CopyOrMove
 (
-    USHORT  nTargetRegion,      //  Index des Zielbereiches
-    USHORT  nTargetIdx,         //  Index Zielposition
-    USHORT  nSourceRegion,      //  Index des Quellbereiches
-    USHORT  nSourceIdx,         /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16  nTargetRegion,      //  Index des Zielbereiches
+    sal_uInt16  nTargetIdx,         //  Index Zielposition
+    sal_uInt16  nSourceRegion,      //  Index des Quellbereiches
+    sal_uInt16  nSourceIdx,         /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
     sal_Bool    bMove               //  kopieren / verschieben
 )
@@ -884,8 +888,8 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
                                     Aktion konnte nicht ausgef2uhrt werden
     [Querverweise]
 
-    <SfxDocumentTemplates::Move(USHORT,USHORT,USHORT,USHORT)>
-    <SfxDocumentTemplates::Copy(USHORT,USHORT,USHORT,USHORT)>
+    <SfxDocumentTemplates::Move(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16)>
+    <SfxDocumentTemplates::Copy(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16)>
 */
 
 {
@@ -975,10 +979,10 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
 
 sal_Bool SfxDocumentTemplates::Move
 (
-    USHORT nTargetRegion,       //  Index des Zielbereiches
-    USHORT nTargetIdx,          //  Index Zielposition
-    USHORT nSourceRegion,       //  Index des Quellbereiches
-    USHORT nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16 nTargetRegion,       //  Index des Zielbereiches
+    sal_uInt16 nTargetIdx,          //  Index Zielposition
+    sal_uInt16 nSourceRegion,       //  Index des Quellbereiches
+    sal_uInt16 nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
 )
 
@@ -997,7 +1001,7 @@ sal_Bool SfxDocumentTemplates::Move
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyOrMove(USHORT,USHORT,USHORT,USHORT,sal_Bool)>
+    <SfxDocumentTemplates::CopyOrMove(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16,sal_Bool)>
 */
 {
     DocTemplLocker_Impl aLocker( *pImp );
@@ -1010,10 +1014,10 @@ sal_Bool SfxDocumentTemplates::Move
 
 sal_Bool SfxDocumentTemplates::Copy
 (
-    USHORT nTargetRegion,       //  Index des Zielbereiches
-    USHORT nTargetIdx,          //  Index Zielposition
-    USHORT nSourceRegion,       //  Index des Quellbereiches
-    USHORT nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
+    sal_uInt16 nTargetRegion,       //  Index des Zielbereiches
+    sal_uInt16 nTargetIdx,          //  Index Zielposition
+    sal_uInt16 nSourceRegion,       //  Index des Quellbereiches
+    sal_uInt16 nSourceIdx           /*  Index der zu kopierenden / zu verschiebenden
                                     Dokumentvorlage */
 )
 
@@ -1032,7 +1036,7 @@ sal_Bool SfxDocumentTemplates::Copy
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyOrMove(USHORT,USHORT,USHORT,USHORT,sal_Bool)>
+    <SfxDocumentTemplates::CopyOrMove(sal_uInt16,sal_uInt16,sal_uInt16,sal_uInt16,sal_Bool)>
 */
 
 {
@@ -1046,9 +1050,9 @@ sal_Bool SfxDocumentTemplates::Copy
 
 sal_Bool SfxDocumentTemplates::CopyTo
 (
-    USHORT          nRegion,    /*  Bereich der Vorlage, die exportiert werden
+    sal_uInt16          nRegion,    /*  Bereich der Vorlage, die exportiert werden
                                     soll  */
-    USHORT          nIdx,       /*  Index der Vorlage, die exportiert werden
+    sal_uInt16          nIdx,       /*  Index der Vorlage, die exportiert werden
                                     soll */
     const String&   rName       /*  Dateiname, unter dem die Vorlage angelegt
                                     werden soll */
@@ -1070,7 +1074,7 @@ sal_Bool SfxDocumentTemplates::CopyTo
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyFrom(USHORT,USHORT,String&)>
+    <SfxDocumentTemplates::CopyFrom(sal_uInt16,sal_uInt16,String&)>
 */
 
 {
@@ -1125,9 +1129,9 @@ sal_Bool SfxDocumentTemplates::CopyTo
 
 sal_Bool SfxDocumentTemplates::CopyFrom
 (
-    USHORT      nRegion,        /*  Bereich, in den die Vorlage importiert
+    sal_uInt16      nRegion,        /*  Bereich, in den die Vorlage importiert
                                     werden soll */
-    USHORT      nIdx,           //  Index der neuen Vorlage in diesem Bereich
+    sal_uInt16      nIdx,           //  Index der neuen Vorlage in diesem Bereich
     String&     rName           /*  Dateiname der Vorlage, die importiert
                                     werden soll, als out-Parameter der (auto-
                                     matisch aus dem Dateinamen generierte)
@@ -1149,7 +1153,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyTo(USHORT,USHORT,const String&)>
+    <SfxDocumentTemplates::CopyTo(sal_uInt16,sal_uInt16,const String&)>
 */
 
 {
@@ -1276,8 +1280,8 @@ sal_Bool SfxDocumentTemplates::CopyFrom
 
 sal_Bool SfxDocumentTemplates::Delete
 (
-    USHORT nRegion,             //  Index des Bereiches
-    USHORT nIdx                 /*  Index des Eintrags oder USHRT_MAX,
+    sal_uInt16 nRegion,             //  Index des Bereiches
+    sal_uInt16 nIdx                 /*  Index des Eintrags oder USHRT_MAX,
                                     wenn ein Verzeichnis gemeint ist. */
 )
 
@@ -1297,7 +1301,7 @@ sal_Bool SfxDocumentTemplates::Delete
 
     [Querverweise]
 
-    <SfxDocumentTemplates::InsertDir(const String&,USHORT)>
+    <SfxDocumentTemplates::InsertDir(const String&,sal_uInt16)>
     <SfxDocumentTemplates::KillDir(SfxTemplateDir&)>
     <SfxDocumentTemplates::SaveDir(SfxTemplateDir&)>
 */
@@ -1347,7 +1351,7 @@ sal_Bool SfxDocumentTemplates::Delete
 sal_Bool SfxDocumentTemplates::InsertDir
 (
     const String&   rText,      //  der logische Name des neuen Bereiches
-    USHORT          nRegion     //  Index des Bereiches
+    sal_uInt16          nRegion     //  Index des Bereiches
 )
 
 /*  [Beschreibung]
@@ -1401,8 +1405,8 @@ sal_Bool SfxDocumentTemplates::InsertDir
 sal_Bool SfxDocumentTemplates::SetName
 (
     const String&   rName,      //  Der zu setzende Name
-    USHORT          nRegion,    //  Index des Bereiches
-    USHORT          nIdx        /*  Index des Eintrags oder USHRT_MAX,
+    sal_uInt16          nRegion,    //  Index des Bereiches
+    sal_uInt16          nIdx        /*  Index des Eintrags oder USHRT_MAX,
                                     wenn ein Verzeichnis gemeint ist. */
 )
 
@@ -1513,8 +1517,8 @@ sal_Bool SfxDocumentTemplates::Rescan()
 
 SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
 (
-    USHORT nRegion,         //  Index des Bereiches
-    USHORT nIdx             //  Index des Eintrags
+    sal_uInt16 nRegion,         //  Index des Bereiches
+    sal_uInt16 nIdx             //  Index des Eintrags
 )
 
 /*  [Beschreibung]
@@ -1530,7 +1534,7 @@ SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
     [Querverweise]
 
     <SfxTemplateDirEntry::CreateObjectShell()>
-    <SfxDocumentTemplates::DeleteObjectShell(USHORT, USHORT)>
+    <SfxDocumentTemplates::DeleteObjectShell(sal_uInt16, sal_uInt16)>
 */
 
 {
@@ -1555,8 +1559,8 @@ SfxObjectShellRef SfxDocumentTemplates::CreateObjectShell
 
 sal_Bool SfxDocumentTemplates::DeleteObjectShell
 (
-    USHORT nRegion,         //  Index des Bereiches
-    USHORT nIdx             //  Index des Eintrags
+    sal_uInt16 nRegion,         //  Index des Bereiches
+    sal_uInt16 nIdx             //  Index des Eintrags
 )
 
 /*  [Beschreibung]
@@ -1575,7 +1579,7 @@ sal_Bool SfxDocumentTemplates::DeleteObjectShell
     [Querverweise]
 
     <SfxTemplateDirEntry::DeleteObjectShell()>
-    <SfxDocumentTemplates::CreateObjectShell(USHORT, USHORT)>
+    <SfxDocumentTemplates::CreateObjectShell(sal_uInt16, sal_uInt16)>
 */
 
 {
@@ -1636,9 +1640,9 @@ sal_Bool SfxDocumentTemplates::GetFull
         return sal_False;
 
     DocTempl_EntryData_Impl* pEntry = NULL;
-    const USHORT nCount = GetRegionCount();
+    const sal_uInt16 nCount = GetRegionCount();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         RegionData_Impl *pRegion = pImp->GetRegion( i );
 
@@ -1702,16 +1706,16 @@ sal_Bool SfxDocumentTemplates::GetLogicNames
     DocTempl_EntryData_Impl  *pEntry = NULL;
     sal_Bool         bFound = sal_False;
 
-    ULONG nCount = GetRegionCount();
+    sal_uIntPtr nCount = GetRegionCount();
 
-    for ( ULONG i=0; !bFound && (i<nCount); i++ )
+    for ( sal_uIntPtr i=0; !bFound && (i<nCount); i++ )
     {
         pData = pImp->GetRegion( i );
         if ( pData )
         {
-            ULONG nChildCount = pData->GetCount();
+            sal_uIntPtr nChildCount = pData->GetCount();
 
-            for ( ULONG j=0; !bFound && (j<nChildCount); j++ )
+            for ( sal_uIntPtr j=0; !bFound && (j<nChildCount); j++ )
             {
                 pEntry = pData->GetEntry( j );
                 if ( pEntry->GetTargetURL() == aPath )
@@ -1873,7 +1877,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
             SfxMedium *pMed=new SfxMedium(
                 aTargetURL,(STREAM_STD_READWRITE | STREAM_SHARE_DENYALL),  sal_False, 0 );
             const SfxFilter* pFilter = NULL;
-            pMed->UseInteractionHandler(TRUE);
+            pMed->UseInteractionHandler(sal_True);
             if( pSfxApp->GetFilterMatcher().GuessFilter(
                 *pMed, &pFilter, SFX_FILTER_TEMPLATE, 0 ) ||
                 (pFilter && !pFilter->IsOwnFormat()) ||
@@ -1883,7 +1887,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
                                      aTargetURL );
                 delete pMed;
                 mbDidConvert=sal_True;
-                ULONG lErr;
+                sal_uIntPtr lErr;
                 if ( mxObjShell.Is() ) {
                     lErr = pSfxApp->LoadTemplate( mxObjShell,aTargetURL);
                     if( lErr != ERRCODE_NONE )
@@ -1914,7 +1918,7 @@ SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell()
 }
 
 //------------------------------------------------------------------------
-BOOL DocTempl_EntryData_Impl::DeleteObjectShell()
+sal_Bool DocTempl_EntryData_Impl::DeleteObjectShell()
 {
     sal_Bool bRet = sal_True;
 
diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src
index de5e0baa40..de5e0baa40 100644..100755
--- a/sfx2/source/doc/doctempl.src
+++ b/sfx2/source/doc/doctempl.src
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c73d0c587e..26d1e34cf5 100644..100755
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -32,6 +32,7 @@
 #include "doctemplates.hxx"
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -41,6 +42,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/pathoptions.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/componentcontext.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -58,13 +60,12 @@
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
 
 #include <svtools/templatefoldercache.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbhelper.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxurlrelocator.hxx"
 #include "doctemplateslocal.hxx"
 #include <sfx2/docfac.hxx>
@@ -131,7 +132,7 @@ using ::std::vector;
 class WaitWindow_Impl : public WorkWindow
 {
     Rectangle   _aRect;
-    USHORT      _nTextStyle;
+    sal_uInt16      _nTextStyle;
     String      _aText;
 
     public:
@@ -545,9 +546,9 @@ void SfxDocTplService_Impl::readFolderList()
 
     NamePair_Impl*  pPair;
 
-    USHORT nCount = (USHORT)( Min( aShortNames.Count(), aLongNames.Count() ) );
+    sal_uInt16 nCount = (sal_uInt16)( Min( aShortNames.Count(), aLongNames.Count() ) );
 
-    for ( USHORT i=0; i<nCount; i++ )
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
         pPair = new NamePair_Impl;
         pPair->maShortName  = aShortNames.GetString( i );
@@ -588,11 +589,11 @@ void SfxDocTplService_Impl::getDirList()
     // TODO/LATER: let use service, register listener
     INetURLObject   aURL;
     String          aDirs = SvtPathOptions().GetTemplatePath();
-    USHORT          nCount = aDirs.GetTokenCount( C_DELIM );
+    sal_uInt16          nCount = aDirs.GetTokenCount( C_DELIM );
 
     maTemplateDirs = Sequence< OUString >( nCount );
 
-    for ( USHORT i=0; i<nCount; i++ )
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
         aURL.SetSmartProtocol( INET_PROT_FILE );
         aURL.SetURL( aDirs.GetToken( i, C_DELIM ) );
@@ -2453,7 +2454,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
         {
             while ( xResultSet->next() )
             {
-                BOOL             bUpdateType = sal_False;
+                sal_Bool             bUpdateType = sal_False;
                 DocTemplates_EntryData_Impl  *pData;
 
                 OUString aTitle( xRow->getString( 1 ) );
@@ -2723,8 +2724,8 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup )
         setProperty( aGroup, aAdditionalProp, makeAny( pGroup->getTargetURL() ) );
         pGroup->setHierarchyURL( aNewGroupURL );
 
-        ULONG nCount = pGroup->count();
-        for ( ULONG i=0; i<nCount; i++ )
+        sal_uIntPtr nCount = pGroup->count();
+        for ( sal_uIntPtr i=0; i<nCount; i++ )
         {
             DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i );
             addToHierarchy( pGroup, pData ); // add entry to hierarchy
@@ -2873,11 +2874,35 @@ void SfxURLRelocator_Impl::initOfficeInstDirs()
 }
 
 // -----------------------------------------------------------------------
+void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url )
+{
+    const INetURLObject aParser( io_url );
+    if ( aParser.GetProtocol() != INET_PROT_VND_SUN_STAR_EXPAND )
+        return;
+
+    io_url = aParser.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
+    try
+    {
+        if ( !mxMacroExpander.is() )
+        {
+            ::comphelper::ComponentContext aContext( mxFactory );
+            mxMacroExpander.set( aContext.getSingleton( "com.sun.star.util.theMacroExpander" ), UNO_QUERY_THROW );
+        }
+        io_url = mxMacroExpander->expandMacros( io_url );
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+}
+
+// -----------------------------------------------------------------------
 void SfxURLRelocator_Impl::makeRelocatableURL( rtl::OUString & rURL )
 {
     if ( rURL.getLength() > 0 )
     {
         initOfficeInstDirs();
+        implExpandURL( rURL );
         rURL = mxOfficeInstDirs->makeRelocatableURL( rURL );
     }
 }
@@ -2888,6 +2913,7 @@ void SfxURLRelocator_Impl::makeAbsoluteURL( rtl::OUString & rURL )
     if ( rURL.getLength() > 0 )
     {
         initOfficeInstDirs();
+        implExpandURL( rURL );
         rURL = mxOfficeInstDirs->makeAbsoluteURL( rURL );
     }
 }
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index 9357f907b4..9357f907b4 100644..100755
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 9a0e038d56..9a0e038d56 100644..100755
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
new file mode 100755
index 0000000000..05f2048456
--- /dev/null
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -0,0 +1,457 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+#include "docundomanager.hxx"
+#include "sfx2/sfxbasemodel.hxx"
+#include "sfx2/objsh.hxx"
+#include "sfx2/viewfrm.hxx"
+#include "sfx2/viewsh.hxx"
+#include "sfx2/bindings.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/XComponent.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/anytostring.hxx>
+#include <comphelper/flagguard.hxx>
+#include <svl/undo.hxx>
+#include <tools/diagnose_ex.h>
+#include <framework/undomanagerhelper.hxx>
+
+#include <boost/noncopyable.hpp>
+#include <stack>
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::util::InvalidStateException;
+    using ::com::sun::star::document::EmptyUndoStackException;
+    using ::com::sun::star::util::NotLockedException;
+    using ::com::sun::star::document::UndoContextNotClosedException;
+    using ::com::sun::star::document::XUndoAction;
+    using ::com::sun::star::document::XUndoManagerSupplier;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::lang::NotInitializedException;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::document::UndoManagerEvent;
+    using ::com::sun::star::document::XUndoManagerListener;
+    using ::com::sun::star::document::UndoFailedException;
+    using ::com::sun::star::document::XUndoManager;
+    using ::com::sun::star::lang::NoSupportException;
+    using ::com::sun::star::frame::XModel;
+    /** === end UNO using === **/
+
+    using ::svl::IUndoManager;
+
+    //==================================================================================================================
+    //= DocumentUndoManager_Impl
+    //==================================================================================================================
+    struct DocumentUndoManager_Impl : public ::framework::IUndoManagerImplementation
+    {
+        DocumentUndoManager&                rAntiImpl;
+        IUndoManager*                       pUndoManager;
+        ::framework::UndoManagerHelper      aUndoHelper;
+
+        DocumentUndoManager_Impl( DocumentUndoManager& i_antiImpl )
+            :rAntiImpl( i_antiImpl )
+            ,pUndoManager( impl_retrieveUndoManager( i_antiImpl.getBaseModel() ) )
+                // do this *before* the construction of aUndoHelper (which actually means: put pUndoManager before
+                // aUndoHelper in the member list)!
+            ,aUndoHelper( *this )
+        {
+        }
+
+        const SfxObjectShell* getObjectShell() const { return rAntiImpl.getBaseModel().GetObjectShell(); }
+              SfxObjectShell* getObjectShell()       { return rAntiImpl.getBaseModel().GetObjectShell(); }
+
+        // IUndoManagerImplementation
+        virtual ::svl::IUndoManager&        getImplUndoManager();
+        virtual Reference< XUndoManager >   getThis();
+
+        void disposing()
+        {
+            aUndoHelper.disposing();
+            ENSURE_OR_RETURN_VOID( pUndoManager, "DocumentUndoManager_Impl::disposing: already disposed!" );
+            pUndoManager = NULL;
+        }
+
+        void invalidateXDo_nolck();
+
+    private:
+        static IUndoManager* impl_retrieveUndoManager( SfxBaseModel& i_baseModel )
+        {
+            IUndoManager* pUndoManager( NULL );
+            SfxObjectShell* pObjectShell = i_baseModel.GetObjectShell();
+            if ( pObjectShell != NULL )
+                pUndoManager = pObjectShell->GetUndoManager();
+            if ( !pUndoManager )
+                throw NotInitializedException( ::rtl::OUString(), *&i_baseModel );
+            return pUndoManager;
+        }
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::svl::IUndoManager& DocumentUndoManager_Impl::getImplUndoManager()
+    {
+        ENSURE_OR_THROW( pUndoManager != NULL, "DocumentUndoManager_Impl::getImplUndoManager: no access to the doc's UndoManager implementation!" );
+
+#if OSL_DEBUG_LEVEL > 0
+        // in a non-product build, assert if the current UndoManager at the shell is not the same we obtained
+        // (and cached) at construction time
+        SfxObjectShell* pObjectShell = rAntiImpl.getBaseModel().GetObjectShell();
+        OSL_ENSURE( ( pObjectShell != NULL ) && ( pUndoManager == pObjectShell->GetUndoManager() ),
+            "DocumentUndoManager_Impl::getImplUndoManager: the UndoManager changed meanwhile - what about our listener?" );
+#endif
+
+        return *pUndoManager;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XUndoManager > DocumentUndoManager_Impl::getThis()
+    {
+        return static_cast< XUndoManager* >( &rAntiImpl );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DocumentUndoManager_Impl::invalidateXDo_nolck()
+    {
+        SfxModelGuard aGuard( rAntiImpl );
+
+        const SfxObjectShell* pDocShell = getObjectShell();
+        ENSURE_OR_THROW( pDocShell != NULL, "lcl_invalidateUndo: no access to the doc shell!" );
+        SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( pDocShell );
+        while ( pViewFrame )
+        {
+            pViewFrame->GetBindings().Invalidate( SID_UNDO );
+            pViewFrame->GetBindings().Invalidate( SID_REDO );
+            pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDocShell );
+        }
+    }
+
+    //==================================================================================================================
+    //= SolarMutexFacade
+    //==================================================================================================================
+    /** a facade for the SolarMutex, implementing ::framework::IMutex (as opposed to ::vos::IMutex)
+    */
+    class SolarMutexFacade : public ::framework::IMutex
+    {
+    public:
+        SolarMutexFacade()
+        {
+        }
+
+        virtual void acquire()
+        {
+            Application::GetSolarMutex().acquire();
+        }
+
+        virtual void release()
+        {
+            Application::GetSolarMutex().release();
+        }
+    };
+
+    //==================================================================================================================
+    //= UndoManagerGuard
+    //==================================================================================================================
+    class UndoManagerGuard  :public ::framework::IMutexGuard
+                            ,public ::boost::noncopyable
+    {
+    public:
+        UndoManagerGuard( DocumentUndoManager& i_undoManager )
+            :m_guard( i_undoManager )
+            ,m_solarMutexFacade()
+        {
+        }
+
+        ~UndoManagerGuard()
+        {
+        }
+
+        virtual void reset()
+        {
+            m_guard.reset();
+        }
+
+        virtual void clear()
+        {
+            m_guard.clear();
+        }
+
+        virtual ::framework::IMutex& getGuardedMutex()
+        {
+            // note that this means that we *know* that SfxModelGuard also locks the SolarMutex (nothing more, nothing less).
+            // If this ever changes, we need to adjust this code here, too.
+            return m_solarMutexFacade;
+        }
+
+    private:
+        SfxModelGuard       m_guard;
+        SolarMutexFacade    m_solarMutexFacade;
+    };
+
+    //==================================================================================================================
+    //= DocumentUndoManager
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DocumentUndoManager::DocumentUndoManager( SfxBaseModel& i_document )
+        :SfxModelSubComponent( i_document )
+        ,m_pImpl( new DocumentUndoManager_Impl( *this ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    DocumentUndoManager::~DocumentUndoManager()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void DocumentUndoManager::disposing()
+    {
+        m_pImpl->disposing();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool DocumentUndoManager::isInContext() const
+    {
+        // No mutex locking within this method, no disposal check - this is the responsibility of the owner.
+        return m_pImpl->getImplUndoManager().IsInListAction();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::acquire(  ) throw ()
+    {
+        SfxModelSubComponent::acquire();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::release(  ) throw ()
+    {
+        SfxModelSubComponent::release();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.enterUndoContext( i_title, aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.enterHiddenUndoContext( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.leaveUndoContext( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.addUndoAction( i_action, aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.undo( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.redo( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.isUndoPossible();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.isRedoPossible();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.getCurrentUndoActionTitle();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.getCurrentRedoActionTitle();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.getAllUndoActionTitles();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.getAllRedoActionTitles();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.clear( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.clearRedo( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException)
+    {
+        // SYNCHRONIZED --->
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.reset( aGuard );
+        // <--- SYNCHRONIZED
+        m_pImpl->invalidateXDo_nolck();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::lock(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.lock();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::unlock(  ) throw (RuntimeException, NotLockedException)
+    {
+        UndoManagerGuard aGuard( *this );
+        m_pImpl->aUndoHelper.unlock();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL DocumentUndoManager::isLocked(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.isLocked();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL DocumentUndoManager::getParent(  ) throw (RuntimeException)
+    {
+        UndoManagerGuard aGuard( *this );
+        return static_cast< XModel* >( &getBaseModel() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException)
+    {
+        (void)i_parent;
+        throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() );
+    }
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index adc3e0d603..45ca95ab71 100644..100755
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -63,7 +63,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 #include <sfx2/sfx.hrc>
 #include "docvor.hrc"
@@ -78,7 +78,7 @@
 #include <svl/svstdarr.hxx>
 
 static const char cDelim = ':';
-BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE;
+sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
 
 using namespace ::com::sun::star;
 
@@ -136,8 +136,8 @@ friend class SfxOrganizeListBox_Impl;
     bool                    bExecDropFinished;
 
     // save some variables for the asynchronous file dialog
-    USHORT                  m_nRegion;
-    USHORT                  m_nIndex;
+    sal_uInt16                  m_nRegion;
+    sal_uInt16                  m_nIndex;
     String                  m_sExtension4Save;
 
     SfxOrganizeListBox_Impl aLeftLb;
@@ -160,8 +160,8 @@ friend class SfxOrganizeListBox_Impl;
 
     SvStringsDtor* 			GetAllFactoryURLs_Impl() const;
     sal_Bool				GetServiceName_Impl( String& rFactoryURL, String& rFileURL ) const;
-    long                    Dispatch_Impl( USHORT nId, Menu* _pMenu );
-    String                  GetPath_Impl( BOOL bOpen, const String& rFileName );
+    long                    Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu );
+    String                  GetPath_Impl( sal_Bool bOpen, const String& rFileName );
     ::com::sun::star::uno::Sequence< ::rtl::OUString >
                             GetPaths_Impl( const String& rFileName );
     void					InitBitmaps( void );
@@ -179,7 +179,7 @@ friend class SfxOrganizeListBox_Impl;
     DECL_LINK( ExportHdl, sfx2::FileDialogHelper* );
     DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* );
 
-    BOOL        DontDelete_Impl( SvLBoxEntry* pEntry );
+    sal_Bool        DontDelete_Impl( SvLBoxEntry* pEntry );
     void        OkHdl( Button* );
 
 public:
@@ -298,8 +298,8 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
     aLeftLb.Show();
     aRightLb.Show();
 
-    aLeftLb.SelectAll( FALSE );
-    aRightLb.SelectAll( FALSE );
+    aLeftLb.SelectAll( sal_False );
+    aRightLb.SelectAll( sal_False );
     aRightLb.GrabFocus();
 }
 
@@ -325,8 +325,8 @@ void SfxOrganizeDlg_Impl::InitBitmaps( void )
 
 //=========================================================================
 
-BOOL QueryDelete_Impl(Window *pParent,      // Parent der QueryBox
-                             USHORT nId,            // Resource Id
+sal_Bool QueryDelete_Impl(Window *pParent,      // Parent der QueryBox
+                             sal_uInt16 nId,            // Resource Id
                              const String &rTemplateName)   // Name der zu l"oschenden Vorlage
 /*  [Beschreibung]
 
@@ -376,7 +376,7 @@ void ErrorDelete_Impl(Window *pParent, const String &rName, sal_Bool bFolder = s
 struct ImpPath_Impl
 {
     SvUShorts	aUS;
-    USHORT		nRef;
+    sal_uInt16		nRef;
 
     ImpPath_Impl();
     ImpPath_Impl( const ImpPath_Impl& rCopy );
@@ -392,13 +392,13 @@ ImpPath_Impl::ImpPath_Impl() : aUS(5), nRef(1)
 
 ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
 
-    aUS	( (BYTE)rCopy.aUS.Count() ),
+    aUS	( (sal_uInt8)rCopy.aUS.Count() ),
     nRef( 1 )
 
 {
-    const USHORT nCount = rCopy.aUS.Count();
+    const sal_uInt16 nCount = rCopy.aUS.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
         aUS.Insert( rCopy.aUS[i], i );
 }
 
@@ -407,7 +407,7 @@ ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
 /*  [Beschreibung]
 
     Implementierungsklasse; Darstellung einer Position in der Outline-
-    Listbox als USHORT-Array; dieses beschreibt die Position jeweil
+    Listbox als sal_uInt16-Array; dieses beschreibt die Position jeweil
     als relative Postion zum "ubergeordneten Eintrag
 
 */
@@ -437,8 +437,8 @@ public:
         if(!--pData->nRef)
             delete pData;
     }
-    USHORT Count() const { return pData->aUS.Count(); }
-    USHORT operator[]( USHORT i ) const
+    sal_uInt16 Count() const { return pData->aUS.Count(); }
+    sal_uInt16 operator[]( sal_uInt16 i ) const
     {
         return i < Count()? pData->aUS[i]: INDEX_IGNORE;
     }
@@ -454,7 +454,7 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
         return;
     SvLBoxEntry *pParent = pBox->GetParent(pEntry);
     do {
-        pData->aUS.Insert((USHORT)pBox->GetModel()->GetRelPos(pEntry), 0);
+        pData->aUS.Insert((sal_uInt16)pBox->GetModel()->GetRelPos(pEntry), 0);
         if(0 == pParent)
             break;
         pEntry = pParent;
@@ -466,8 +466,8 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
 
 SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
                                SvLBoxEntry *pEntry,
-                               USHORT &rRegion,
-                               USHORT &rOffset)
+                               sal_uInt16 &rRegion,
+                               sal_uInt16 &rOffset)
 /*  [Beschreibung]
 
     Bereich und Position innerhalb eines Bereiches f"ur eine
@@ -477,9 +477,9 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
 
     SvLBox *pBox            Listbox, an der das Ereignis auftrat
     SvLBoxEntry *pEntry     Eintrag, dessen Position ermittelt werden soll
-    USHORT &rRegion         der Bereich innerhalb der Bereiche der
+    sal_uInt16 &rRegion         der Bereich innerhalb der Bereiche der
                             Dokumentvorlagen (Out-Parameter)
-    USHORT &rOffset         die Position innerhalb des Bereiches
+    sal_uInt16 &rOffset         die Position innerhalb des Bereiches
                             Dokumentvorlagen (Out-Parameter)
 
     [Querverweise]
@@ -497,27 +497,30 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
     }
     if(0 == pBox->GetModel()->GetDepth(pEntry))
     {
-        rRegion = (USHORT)pBox->GetModel()->GetRelPos(pEntry);
+        rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
         rOffset = USHRT_MAX;
         return pEntry;
     }
     SvLBoxEntry *pParent = pBox->GetParent(pEntry);
-    rRegion = (USHORT)pBox->GetModel()->GetRelPos(pParent);
-    rOffset = (USHORT)pBox->GetModel()->GetRelPos(pEntry);
+    rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pParent);
+    rOffset = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
     return pEntry;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, BOOL bSelect )
+sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
 {
     if(!bSelect)
         return SvTreeListBox::Select(pEntry,bSelect);
-    USHORT nLevel = GetDocLevel();
+    sal_uInt16 nLevel = GetDocLevel();
     if(GetModel()->GetDepth(pEntry)+nLevel<3)
         return SvTreeListBox::Select(pEntry,bSelect);
 
     Path aPath(this, pEntry);
+
+    // it is ok to use the SfxObjectShellRef here since the object that
+    // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
     GetObjectShell(aPath)->TriggerHelpPI(
         aPath[nLevel+1], aPath[nLevel+2]);
     return SvTreeListBox::Select(pEntry,bSelect);
@@ -525,12 +528,12 @@ BOOL SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, BOOL bSelect )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)
 /*  [Beschreibung]
 
     Verschieben oder Kopieren von Dokumentvorlagen
@@ -542,11 +545,11 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
     SvLBoxEntry* pTarget        Ziel-Eintrag, auf den verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
-    BOOL bCopy                  Flag f"ur Kopieren / Verschieben
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
+    sal_Bool bCopy                  Flag f"ur Kopieren / Verschieben
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -554,27 +557,27 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     if(pSource)
     {
-        USHORT nTargetRegion = 0, nTargetIndex = 0;
+        sal_uInt16 nTargetRegion = 0, nTargetIndex = 0;
         GetIndices_Impl(this, pTarget, nTargetRegion, nTargetIndex);
 
-        USHORT nSourceRegion = 0, nSourceIndex = 0;
+        sal_uInt16 nSourceRegion = 0, nSourceIndex = 0;
         GetIndices_Impl(pSourceBox, pSource, nSourceRegion, nSourceIndex);
 
         bOk =  bCopy ?
@@ -616,12 +619,12 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)
 /*  [Beschreibung]
 
     Verschieben oder Kopieren von Dokumentinhalten
@@ -633,11 +636,11 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
     SvLBoxEntry* pTarget        Ziel-Eintrag, auf den verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
-    BOOL bCopy                  Flag f"ur Kopieren / Verschieben
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
+    sal_Bool bCopy                  Flag f"ur Kopieren / Verschieben
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -645,31 +648,33 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
     SfxErrorContext aEc( ERRCTX_SFX_MOVEORCOPYCONTENTS, this);
-    BOOL bOk = FALSE, bKeepExpansion = FALSE;
-    BOOL bRemovedFromSource = FALSE;
+    sal_Bool bOk = sal_False, bKeepExpansion = sal_False;
+    sal_Bool bRemovedFromSource = sal_False;
     Path aSource(pSourceBox, pSource);
     Path aTarget(this, pTarget);
-    SfxObjectShellRef aSourceDoc =
-        ((SfxOrganizeListBox_Impl *)pSourceBox)->GetObjectShell(aSource);
 
+    // it is ok to use the SfxObjectShellRef here since the object that
+    // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
+    SfxObjectShellRef aSourceDoc = ((SfxOrganizeListBox_Impl *)pSourceBox)->GetObjectShell(aSource);
     SfxObjectShellRef aTargetDoc = GetObjectShell(aTarget);
-    const USHORT nSLevel =
+
+    const sal_uInt16 nSLevel =
         ((SfxOrganizeListBox_Impl *)pSourceBox)->GetDocLevel();
-    const USHORT nTLevel = GetDocLevel();
+    const sal_uInt16 nTLevel = GetDocLevel();
 
     if(aSourceDoc.Is() && aTargetDoc.Is())
     {
@@ -680,8 +685,8 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
         if (aTargetDoc->GetStyleSheetPool())
             aTargetDoc->GetStyleSheetPool()->SetSearchMask(
                 SFX_STYLE_FAMILY_ALL, SFXSTYLEBIT_USERDEF | SFXSTYLEBIT_USED);
-        USHORT p[3];
-        USHORT nIdxDeleted = INDEX_IGNORE;
+        sal_uInt16 p[3];
+        sal_uInt16 nIdxDeleted = INDEX_IGNORE;
         p[0]=aTarget[nTLevel+1];
         p[1]=aTarget[nTLevel+2];
         if(p[1]!=INDEX_IGNORE)p[1]++;
@@ -708,12 +713,12 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                 RequestingChilds(pParentIter);
             SvLBoxEntry *pChildIter = 0;
 
-            USHORT i = 0;
+            sal_uInt16 i = 0;
             while(i < 2 && p[i+1] != INDEX_IGNORE)
             {
                 pChildIter = FirstChild(pParentIter);
                 // bis zum Index der aktuellen Ebene
-                for(USHORT j = 0; j < p[i]; ++j)
+                for(sal_uInt16 j = 0; j < p[i]; ++j)
                     pChildIter = NextSibling(pChildIter);
                 // gfs Fuellen bei Items onDemand
                 ++i;
@@ -729,7 +734,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                pNewParent->HasChildsOnDemand() &&
                !GetModel()->HasChilds(pNewParent))
             {
-                bOk = FALSE;
+                bOk = sal_False;
                 if(!bCopy)
                     pSourceBox->GetModel()->Remove(pSource);
             }
@@ -738,7 +743,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
             if(nIdxDeleted != INDEX_IGNORE)
             {
                 pChildIter = FirstChild(pParentIter);
-                for(USHORT j = 0; j < nIdxDeleted; ++j)
+                for(sal_uInt16 j = 0; j < nIdxDeleted; ++j)
                     pChildIter = NextSibling(pChildIter);
                 if( pChildIter && pChildIter != pSource )
                 {
@@ -746,7 +751,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                     GetModel()->Remove(pChildIter);
                 }
                 else
-                    bOk = FALSE;
+                    bOk = sal_False;
             }
             if(!bCopy && &aSourceDoc != &aTargetDoc)
             {
@@ -760,15 +765,15 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
         }
     }
     return (((rIdx != INDEX_IGNORE)|| bRemovedFromSource) && bOk )
-        ? bKeepExpansion? (BOOL)2: TRUE: FALSE;
+        ? bKeepExpansion? (sal_Bool)2: sal_True: sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                         SvLBoxEntry* pSource,
                                         SvLBoxEntry *&pNewParent,
-                                        ULONG &rIdx)
+                                        sal_uIntPtr &rIdx)
 
 /*  [Beschreibung]
 
@@ -781,10 +786,10 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
     SvLBoxEntry *pSource        Quell-Eintrag, der verschoben werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -792,22 +797,22 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
     <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 
 {
-    BOOL bOk =  FALSE;
+    sal_Bool bOk =  sal_False;
     SvLBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
@@ -817,19 +822,19 @@ BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
 
     if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
                       GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
-        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, FALSE );
+        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
     else
-        bOk = MoveOrCopyContents(pSourceBox, pSource, pTarget, pNewParent, rIdx, FALSE );
+        bOk = MoveOrCopyContents(pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
 
     return bOk;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
+sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                         SvLBoxEntry* pSource,
                                         SvLBoxEntry *&pNewParent,
-                                        ULONG &rIdx)
+                                        sal_uIntPtr &rIdx)
 /*  [Beschreibung]
 
     Benachrichtigung, da"s ein Eintrag kopiert werden soll
@@ -841,10 +846,10 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
     SvLBoxEntry *pSource        Quell-Eintrag, der kopiert werden soll
     SvLBoxEntry *&pNewParent    der Parent der an der Zielposition erzeugten
                                 Eintrags (Out-Parameter)
-    ULONG &rIdx                 Index des Zieleintrags
+    sal_uIntPtr &rIdx                 Index des Zieleintrags
 
 
-    [Returnwert]                BOOL: Erfolg oder Mi"serfolg
+    [Returnwert]                sal_Bool: Erfolg oder Mi"serfolg
 
     [Querverweise]
 
@@ -852,21 +857,21 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
     <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx,
-                                            BOOL bCopy)>
-    <BOOL SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
+                                            sal_uIntPtr &rIdx,
+                                            sal_Bool bCopy)>
+    <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
                                             SvLBoxEntry* pSource,
                                             SvLBoxEntry *&pNewParent,
-                                            ULONG &rIdx)>
+                                            sal_uIntPtr &rIdx)>
 */
 {
-    BOOL bOk =  FALSE;
+    sal_Bool bOk =  sal_False;
     SvLBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
@@ -875,16 +880,16 @@ BOOL SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
         pTarget = pDlg->pTargetEntry;
     if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
                      GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
-        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, TRUE );
+        bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
     else
-        bOk = MoveOrCopyContents( pSourceBox, pSource, pTarget, pNewParent, rIdx, TRUE );
+        bOk = MoveOrCopyContents( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
 
     return bOk;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
+sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
 
 /*  [Beschreibung]
 
@@ -900,14 +905,14 @@ BOOL SfxOrganizeListBox_Impl::EditingEntry( SvLBoxEntry* pEntry, Selection&  )
         GetModel()->GetDepth(pEntry) < 2 )
     {
         pDlg->pSuspend = new SuspendAccel( &pDlg->aEditAcc );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)
+sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rText)
 
 /*  [Beschreibung]
 
@@ -917,8 +922,8 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
 
     [Returnwert]
 
-    BOOL                TRUE: der Name soll in der Anzeige ge"andert werden
-                        FALSE:der Name soll nicht ge"andert werden
+    sal_Bool                sal_True: der Name soll in der Anzeige ge"andert werden
+                            sal_False:der Name soll nicht ge"andert werden
 
     [Querverweise]
     <SfxOrganizeListBox_Impl::EditingEntry(SvLBoxEntry* pEntry, const String& rText)>
@@ -934,16 +939,16 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         ErrorBox aBox( this, SfxResId( MSG_ERROR_EMPTY_NAME ) );
         aBox.GrabFocus();
         aBox.Execute();
-        return FALSE;
+        return sal_False;
     }
     if ( !IsUniqName_Impl( rText, pParent, pEntry ) )
     {
         ErrorBox aBox( this, SfxResId( MSG_ERROR_UNIQ_NAME ) );
         aBox.GrabFocus();
         aBox.Execute();
-        return FALSE;
+        return sal_False;
     }
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( this, pEntry, nRegion, nIndex );
     String aOldName;
     if ( USHRT_MAX != nIndex )
@@ -956,47 +961,47 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         SfxResId aResId( USHRT_MAX != nIndex ? MSG_ERROR_RENAME_TEMPLATE
                                              : MSG_ERROR_RENAME_TEMPLATE_REGION );
         ErrorBox( this, aResId ).Execute();
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
 DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
 {
-    USHORT nSourceLevel = GetModel()->GetDepth( pEntry );
+    sal_uInt16 nSourceLevel = GetModel()->GetDepth( pEntry );
     if ( VIEW_FILES == GetViewType() )
         ++nSourceLevel;
     if ( nSourceLevel >= 2 )
-        bDropMoveOk = FALSE;
+        bDropMoveOk = sal_False;
     else
-        bDropMoveOk = TRUE;
+        bDropMoveOk = sal_True;
 
     return GetDragDropMode();
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
+sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 {
     if(!pEntry)
-        return FALSE;
+        return sal_False;
     SvLBox *pSource = GetSourceView();
     SvLBoxEntry *pSourceEntry = pSource->FirstSelected();
     if(pEntry == pSourceEntry)
-        return FALSE;
-    USHORT nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
+        return sal_False;
+    sal_uInt16 nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
     if(VIEW_FILES == ((SfxOrganizeListBox_Impl *)pSource)->GetViewType())
         ++nSourceLevel;
-    USHORT nTargetLevel = GetModel()->GetDepth(pEntry);
+    sal_uInt16 nTargetLevel = GetModel()->GetDepth(pEntry);
     if(VIEW_FILES == GetViewType())
         ++nTargetLevel;
     Path aSource(pSource, pSourceEntry);
     Path aTarget(this, pEntry);
-    const USHORT SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
-    const USHORT TL = GetDocLevel();
+    const sal_uInt16 SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
+    const sal_uInt16 TL = GetDocLevel();
 
     return( (nSourceLevel == 1 && nTargetLevel == 0 &&
             VIEW_TEMPLATES ==
@@ -1035,7 +1040,7 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     TransferableDataHelper aHelper( rEvt.maDropEvent.Transferable );
     sal_uInt32 nFormatCount = aHelper.GetFormatCount();
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     for ( sal_uInt32 i = 0; i < nFormatCount; ++i )
     {
         String aFileName;
@@ -1047,7 +1052,7 @@ sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
             bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
         }
     }
-    bDropMoveOk = TRUE;
+    bDropMoveOk = sal_True;
     sal_Int8 nRet = rEvt.mnAction;
     if ( !bSuccess )
     {
@@ -1080,7 +1085,7 @@ void SfxOrganizeListBox_Impl::DragFinished( sal_Int8 nDropAction )
 
 //-------------------------------------------------------------------------
 
-inline USHORT SfxOrganizeListBox_Impl::GetDocLevel() const
+inline sal_uInt16 SfxOrganizeListBox_Impl::GetDocLevel() const
 
 /*  [Beschreibung]
 
@@ -1089,7 +1094,7 @@ inline USHORT SfxOrganizeListBox_Impl::GetDocLevel() const
 
     [Returnwert]
 
-    USHORT              Die Ebene der Dokumente
+    sal_uInt16              Die Ebene der Dokumente
 
 */
 
@@ -1157,19 +1162,22 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
         SfxErrorContext aEc(ERRCTX_SFX_CREATEOBJSH, pDlg->pDialog);
         if(VIEW_TEMPLATES == GetViewType() && 0 == GetModel()->GetDepth(pEntry))
         {
-            USHORT i = (USHORT)GetModel()->GetRelPos(pEntry);
-            const USHORT nEntryCount = pMgr->GetTemplates()->GetCount(i);
-            for(USHORT j = 0; j < nEntryCount; ++j)
-                InsertEntryByBmpType( pMgr->GetTemplates()->GetName( i, j ), BMPTYPE_DOC, pEntry, TRUE );
+            sal_uInt16 i = (sal_uInt16)GetModel()->GetRelPos(pEntry);
+            const sal_uInt16 nEntryCount = pMgr->GetTemplates()->GetCount(i);
+            for(sal_uInt16 j = 0; j < nEntryCount; ++j)
+                InsertEntryByBmpType( pMgr->GetTemplates()->GetName( i, j ), BMPTYPE_DOC, pEntry, sal_True );
         }
         else
         {
-            const USHORT nDocLevel = GetDocLevel();
+            const sal_uInt16 nDocLevel = GetDocLevel();
             Path aPath(this, pEntry);
+
+            // it is ok to use the SfxObjectShellRef here since the object that
+            // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
             SfxObjectShellRef aRef = GetObjectShell(aPath);
             if(aRef.Is())
             {
-                const USHORT nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
+                const sal_uInt16 nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
                 String aText;
                 Bitmap aClosedBmp, aOpenedBmp;
                 const bool bCanHaveChilds =
@@ -1214,7 +1222,7 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
     if ( !(nImpFlags & SVLBOX_IS_EXPANDING) )
     {
         SvLBoxEntry* pEntry  = GetHdlEntry();
-        const USHORT nLevel = GetModel()->GetDepth(pEntry);
+        const sal_uInt16 nLevel = GetModel()->GetDepth(pEntry);
         if((eViewType == VIEW_FILES && nLevel == 0) ||
            (eViewType == VIEW_TEMPLATES && nLevel == 1))
         {
@@ -1233,12 +1241,12 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
+sal_Bool SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
                                          SvLBoxEntry* pParent, SvLBoxEntry *pEntry) const
 
 /*  [Beschreibung]
@@ -1252,7 +1260,7 @@ BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
 
     [Returnwert]
 
-    BOOL                     TRUE, wenn der Name eindeutig ist, sonst FALSE
+    sal_Bool                     sal_True, wenn der Name eindeutig ist, sonst sal_False
 */
 
 {
@@ -1260,18 +1268,18 @@ BOOL SfxOrganizeListBox_Impl::IsUniqName_Impl(const String &rText,
     while(pChild)  {
         const String aEntryText(GetEntryText(pChild));
         if(COMPARE_EQUAL == aEntryText.CompareIgnoreCaseToAscii(rText)&&(!pEntry || pEntry!=pChild))
-            return FALSE;
+            return sal_False;
         pChild = NextSibling(pChild);
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-USHORT SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
+sal_uInt16 SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
 {
     SvLBoxEntry* pChild = FirstChild(pParent);
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while(pChild)  {
         pChild = NextSibling(pChild);
         ++nCount;
@@ -1285,8 +1293,8 @@ SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
     const XubString& rText,
     BMPTYPE eBmpType,
     SvLBoxEntry* pParent,
-    BOOL bChildsOnDemand,
-    ULONG nPos,
+    sal_Bool bChildsOnDemand,
+    sal_uIntPtr nPos,
     void* pUserData
 )
 {
@@ -1389,30 +1397,30 @@ void SfxOrganizeListBox_Impl::Reset()
 {
     DBG_ASSERT( pMgr != 0, "kein Manager" );
     // Inhalte l"oschen
-    SetUpdateMode(FALSE);
+    SetUpdateMode(sal_False);
     Clear();
     if ( VIEW_TEMPLATES == eViewType )
     {
-        const USHORT nCount = pMgr->GetTemplates()->GetRegionCount();
-        for ( USHORT i = 0; i < nCount; ++i )
-            InsertEntryByBmpType( pMgr->GetTemplates()->GetFullRegionName(i), BMPTYPE_FOLDER, 0, TRUE );
+        const sal_uInt16 nCount = pMgr->GetTemplates()->GetRegionCount();
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
+            InsertEntryByBmpType( pMgr->GetTemplates()->GetFullRegionName(i), BMPTYPE_FOLDER, 0, sal_True );
     }
     else
     {
         const SfxObjectList& rList = pMgr->GetObjectList();
-        const USHORT nCount = rList.Count();
-        for ( USHORT i = 0; i < nCount; ++i )
-            InsertEntryByBmpType( rList.GetBaseName(i), BMPTYPE_DOC, 0, TRUE );
+        const sal_uInt16 nCount = rList.Count();
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
+            InsertEntryByBmpType( rList.GetBaseName(i), BMPTYPE_DOC, 0, sal_True );
 
     }
-    SetUpdateMode(TRUE);
+    SetUpdateMode(sal_True);
     Invalidate();
     Update();
 }
 
 //-------------------------------------------------------------------------
 
-const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
+const Image &SfxOrganizeListBox_Impl::GetClosedBmp(sal_uInt16 nLevel) const
 
 /*  [Beschreibung]
 
@@ -1421,7 +1429,7 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 
     [Parameter]
 
-    USHORT nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
+    sal_uInt16 nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
 
     [Returnwert]
 
@@ -1447,7 +1455,7 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 
 //-------------------------------------------------------------------------
 
-const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
+const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(sal_uInt16 nLevel) const
 
 /*  [Beschreibung]
 
@@ -1456,7 +1464,7 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
 
     [Parameter]
 
-    USHORT nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
+    sal_uInt16 nLevel       Angabe der Ebene, 2 Ebenen sind erlaubt
 
     [Returnwert]
 
@@ -1489,7 +1497,7 @@ PopupMenu* SfxOrganizeListBox_Impl::CreateContextMenu()
 
 //-------------------------------------------------------------------------
 
-String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
+String SfxOrganizeDlg_Impl::GetPath_Impl( sal_Bool bOpen, const String& rFileName )
 
 /*  [Beschreibung]
 
@@ -1498,7 +1506,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
 
     [Parameter]
 
-    BOOL bOpen                      Flag: "Offnen / Speichern
+    sal_Bool bOpen                      Flag: "Offnen / Speichern
     const String& rFileName			aktueller Dateiname als Vorschlag
 
     [R"uckgabewert]                 Dateiname mit Pfad oder Leerstring, wenn
@@ -1679,9 +1687,9 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
+sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
 {
-    USHORT nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
+    sal_uInt16 nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
     if(SfxOrganizeListBox_Impl::VIEW_FILES ==
        pFocusBox->GetViewType())
         nDepth++;
@@ -1693,16 +1701,16 @@ BOOL SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
        (0 == nDepth && pFocusBox->GetLevelCount_Impl(0) < 2))
         //Mindestens eine Vorlage behalten
     {
-        return TRUE;
+        return sal_True;
     }
 
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
     const SfxDocumentTemplates* pTemplates = aMgr.GetTemplates();
     if ( !pTemplates || !pTemplates->HasUserContents( nRegion, nIndex ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 SvStringsDtor* SfxOrganizeDlg_Impl::GetAllFactoryURLs_Impl( ) const
@@ -1730,7 +1738,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
     sal_Bool bRet = sal_False;
     const SfxDocumentTemplates*	pTemplates = aMgr.GetTemplates();
     SvLBoxEntry* pEntry = pFocusBox ? pFocusBox->FirstSelected() : NULL;
-    USHORT nRegion = 0, nIndex = 0;
+    sal_uInt16 nRegion = 0, nIndex = 0;
     GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
     rFileURL = pTemplates->GetPath( nRegion, nIndex );
     if ( rFileURL.Len() > 0 )
@@ -1740,13 +1748,13 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
             uno::Reference< embed::XStorage > xStorage = ::comphelper::OStorageHelper::GetStorageFromURL(
                                                     rFileURL,
                                                     embed::ElementModes::READ );
-            ULONG nFormat = SotStorage::GetFormatID( xStorage );
+            sal_uIntPtr nFormat = SotStorage::GetFormatID( xStorage );
             const SfxFilter* pFilter =
                 SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( nFormat );
             if ( pFilter )
             {
                 rName = pFilter->GetServiceName();
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
         catch( uno::Exception& )
@@ -1756,7 +1764,7 @@ sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileU
     return bRet;
 }
 
-long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
+long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu )
 
 /*  [Beschreibung]
 
@@ -1764,7 +1772,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
 
     [Parameter]
 
-    USHORT nId                      ID des Events
+    sal_uInt16 nId                      ID des Events
 
     [R"uckgabewert]                 1: Event wurde verarbeitet,
                                     0: Event wurde nicht verarbeitet (SV-Menu)
@@ -1788,14 +1796,14 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
                     const String aNoName( SfxResId(STR_NONAME) );
                     SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry);
                     String aName(aNoName);
-                    USHORT n = 1;
+                    sal_uInt16 n = 1;
                     while(!pFocusBox->IsUniqName_Impl(aName, pParent))
                     {
                         aName = aNoName;
                         aName += String::CreateFromInt32( n++ );
                     }
                     aMgr.InsertDir( pFocusBox, aName,
-                            (USHORT)pFocusBox->GetModel()->GetRelPos(pEntry)+1);
+                            (sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1);
                 }
             }
             break;
@@ -1805,13 +1813,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
         {
             if(!pEntry || DontDelete_Impl(pEntry))
                 return 1;
-            const USHORT nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
+            const sal_uInt16 nDepth = pFocusBox->GetModel()->GetDepth(pEntry);
             if(nDepth < 2)
             {
                 if(0 == nDepth && pFocusBox->GetLevelCount_Impl(0) < 2) return 1;
                 if(SfxOrganizeListBox_Impl::VIEW_TEMPLATES == pFocusBox->GetViewType())
                 {
-                    USHORT nResId = nDepth? STR_DELETE_TEMPLATE :
+                    sal_uInt16 nResId = nDepth? STR_DELETE_TEMPLATE :
                                             STR_DELETE_REGION;
                     if( !QueryDelete_Impl(
                         pDialog, nResId, pFocusBox->GetEntryText(pEntry)))
@@ -1823,10 +1831,10 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
                         if(RET_NO == aQBox.Execute())
                             return 1;
                     }
-                    USHORT nRegion = 0, nIndex = 0;
+                    sal_uInt16 nRegion = 0, nIndex = 0;
                     GetIndices_Impl(pFocusBox, pEntry, nRegion, nIndex);
 
-                    USHORT nDeleteInd = ( STR_DELETE_REGION == nResId? USHRT_MAX: nIndex );
+                    sal_uInt16 nDeleteInd = ( STR_DELETE_REGION == nResId? USHRT_MAX: nIndex );
                     if ( !aMgr.Delete( pFocusBox, nRegion, nDeleteInd ) )
                         ErrorDelete_Impl(
                             pDialog,
@@ -1840,6 +1848,9 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
                 if(!QueryDelete_Impl(pDialog, STR_DELETE_TEMPLATE, pFocusBox->GetEntryText(pEntry)))
                     return 1;
                 Path aPath(pFocusBox, pEntry);
+
+                // it is ok to use the SfxObjectShellRef here since the object that
+                // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
                 SfxObjectShellRef aRef = pFocusBox->GetObjectShell(aPath);
                 if(aRef.Is() &&
                     aRef->Remove(aPath[1+pFocusBox->GetDocLevel()],
@@ -1856,7 +1867,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
         {
             if(!pEntry)
                 return 1;
-            USHORT nRegion = 0, nIndex = 0;
+            sal_uInt16 nRegion = 0, nIndex = 0;
             GetIndices_Impl( pFocusBox, pEntry, nRegion, nIndex );
             const SfxStringItem aName( SID_FILE_NAME, aMgr.GetTemplates()->GetPath( nRegion, nIndex ) );
             const SfxStringItem aLongName( SID_FILE_LONGNAME, pFocusBox->GetEntryText( pEntry ) );
@@ -1888,7 +1899,7 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
             m_nRegion = 0;
             m_nIndex = 0;
             GetIndices_Impl( pFocusBox, pEntry, m_nRegion, m_nIndex );
-            GetPath_Impl( FALSE, aMgr.GetTemplates()->GetFileName( m_nRegion, m_nIndex ) );
+            GetPath_Impl( sal_False, aMgr.GetTemplates()->GetFileName( m_nRegion, m_nIndex ) );
             break;
         }
 
@@ -1906,10 +1917,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu )
             if ( !pEntry )
                 return 1;
             Path aPath( pFocusBox, pEntry );
+
+            // it is ok to use the SfxObjectShellRef here since the object that
+            // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
             SfxObjectShellRef aRef = pFocusBox->GetObjectShell( aPath );
             if ( aRef.Is() )
             {
-                const USHORT nDocLevel = pFocusBox->GetDocLevel();
+                const sal_uInt16 nDocLevel = pFocusBox->GetDocLevel();
                 if ( !pPrt )
                     pPrt = new Printer;
                 SvLBoxEntry *pDocEntry = pEntry;
@@ -2010,7 +2024,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl, Accelerator *, pAccel )
 void SfxOrganizeDlg_Impl::OkHdl(Button *pButton)
 {
     if(pFocusBox && pFocusBox->IsEditingActive())
-        pFocusBox->EndEditing(FALSE);
+        pFocusBox->EndEditing(sal_False);
     pButton->Click();
 }
 
@@ -2032,12 +2046,12 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
 */
 {
     if ( pFocusBox && pFocusBox->IsEditingActive() )
-        pFocusBox->EndEditing( FALSE );
-    BOOL bEnable = ( pFocusBox && pFocusBox->GetSelectionCount() );
+        pFocusBox->EndEditing( sal_False );
+    sal_Bool bEnable = ( pFocusBox && pFocusBox->GetSelectionCount() );
     SvLBoxEntry* pEntry = bEnable ? pFocusBox->FirstSelected() : NULL;
-    const USHORT nDepth =
+    const sal_uInt16 nDepth =
         ( bEnable && pFocusBox->GetSelectionCount() ) ? pFocusBox->GetModel()->GetDepth( pEntry ) : 0;
-    const USHORT nDocLevel = bEnable ? pFocusBox->GetDocLevel() : 0;
+    const sal_uInt16 nDocLevel = bEnable ? pFocusBox->GetDocLevel() : 0;
     int eVT = pFocusBox ? pFocusBox->GetViewType() : 0;
         // nur Vorlagen anlegen
     pMenu->EnableItem( ID_NEW, bEnable && 0 == nDepth && SfxOrganizeListBox_Impl::VIEW_TEMPLATES == eVT );
@@ -2058,14 +2072,14 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
     pMenu->EnableItem( ID_RESCAN,
                        SfxOrganizeListBox_Impl::VIEW_TEMPLATES == aRightLb.GetViewType() ||
                        SfxOrganizeListBox_Impl::VIEW_TEMPLATES == aLeftLb.GetViewType() );
-    BOOL bPrint = bEnable && nDepth > pFocusBox->GetDocLevel();
+    sal_Bool bPrint = bEnable && nDepth > pFocusBox->GetDocLevel();
     if ( bPrint && pPrt )
         bPrint = !pPrt->IsPrinting() && !pPrt->IsJobActive();
     if ( bPrint && bEnable )
     {
         // only styles printable
         Path aPath( pFocusBox, pFocusBox->FirstSelected() );
-        USHORT nIndex = aPath[ nDocLevel + 1 ];
+        sal_uInt16 nIndex = aPath[ nDocLevel + 1 ];
         bPrint = ( nIndex == CONTENT_STYLE );
                 }
     pMenu->EnableItem( ID_PRINT, bPrint );
@@ -2076,17 +2090,17 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
         bEnable = GetServiceName_Impl( aFactoryURL, aFileURL );
     }
     else if ( bEnable )
-        bEnable = FALSE;
+        bEnable = sal_False;
     pMenu->EnableItem( ID_DEFAULT_TEMPLATE, bEnable );
 
     bEnable = sal_True;
     SvStringsDtor* pList = GetAllFactoryURLs_Impl();
-    USHORT nCount = pList->Count();
+    sal_uInt16 nCount = pList->Count();
     if ( nCount > 0 )
     {
         PopupMenu* pSubMenu = new PopupMenu;
-        USHORT nItemId = ID_RESET_DEFAULT_TEMPLATE + 1;
-        for ( USHORT i = 0; i < nCount; ++i )
+        sal_uInt16 nItemId = ID_RESET_DEFAULT_TEMPLATE + 1;
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             String aObjFacURL( *pList->GetObject(i) );
             String aTitle = SvFileInformationManager::GetDescription(
@@ -2126,7 +2140,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, GetFocus_Impl, SfxOrganizeListBox_Impl *, pBox )
 
 {
     if(pFocusBox && pFocusBox != pBox)
-        pFocusBox->SelectAll(FALSE);
+        pFocusBox->SelectAll(sal_False);
     pFocusBox = pBox;
     aFilesBtn.Enable( SfxOrganizeListBox_Impl::VIEW_FILES ==
                       pFocusBox->GetViewType() );
@@ -2331,7 +2345,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, ExportHdl, sfx2::FileDialogHelper *, EMPTYARG )
     {
         INetURLObject aPathObj( aPaths[0] );
         aPathObj.setFinalSlash();
-        for ( USHORT i = 1; i < nCount; ++i )
+        for ( sal_uInt16 i = 1; i < nCount; ++i )
         {
             if ( 1 == i )
                 aPathObj.Append( aPaths[i] );
diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index 3213a259c0..3213a259c0 100644..100755
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.hrc
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index e141d0da16..6271b903c0 100644..100755
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -37,7 +37,7 @@
 
 ModalDialog DLG_ORGANIZE
 {
-    HelpId = SID_ORGANIZER ;
+    HelpId = CMD_SID_ORGANIZER ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 271 , 162 ) ;
@@ -59,6 +59,7 @@ ModalDialog DLG_ORGANIZE
     };
     PushButton BTN_FILES
     {
+        HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_FILES";
         Pos = MAP_APPFONT ( 205 , 143 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~File..." ;
@@ -66,12 +67,14 @@ ModalDialog DLG_ORGANIZE
     };
     PushButton BTN_ADDRESSTEMPLATE
     {
+        HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE";
         Pos = MAP_APPFONT ( 205 , 124 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Address Book..." ;
     };
     ListBox LB_LEFT_TYP
     {
+        HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 3 , 144 ) ;
         Size = MAP_APPFONT ( 94 , 55 ) ;
@@ -86,6 +89,7 @@ ModalDialog DLG_ORGANIZE
     };
     ListBox LB_RIGHT_TYP
     {
+        HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 144 ) ;
         Size = MAP_APPFONT ( 94 , 55 ) ;
@@ -140,6 +144,7 @@ ModalDialog DLG_ORGANIZE
     };
     MenuButton BTN_EDIT
     {
+        HelpID = "sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT";
         Pos = MAP_APPFONT ( 205 , 23 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Commands" ;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 67188609a8..b995531b9e 100644..100755
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -39,15 +39,15 @@
 
 DBG_NAME(SfxFrameDescriptor);
 
-#define VERSION (USHORT) 3
+#define VERSION (sal_uInt16) 3
 
 struct SfxFrameDescriptor_Impl
 {
     Wallpaper*	pWallpaper;
     SfxItemSet*	pArgs;
-    BOOL		bEditable;
+    sal_Bool		bEditable;
 
-    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( TRUE ) {}
+    SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( sal_True ) {}
     ~SfxFrameDescriptor_Impl()
     {
         delete pWallpaper;
@@ -62,10 +62,10 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
     eSizeSelector( SIZE_ABS ),
     nHasBorder( BORDER_YES ),
     nItemId( 0 ),
-    bResizeHorizontal( TRUE ),
-    bResizeVertical( TRUE ),
-    bHasUI( TRUE ),
-    bReadOnly( FALSE )
+    bResizeHorizontal( sal_True ),
+    bResizeVertical( sal_True ),
+    bHasUI( sal_True ),
+    bReadOnly( sal_False )
 {
     DBG_CTOR(SfxFrameDescriptor, 0);
 
@@ -109,31 +109,31 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL )
     SetActualURL(String(rURL.GetMainURL( INetURLObject::DECODE_TO_IURI )));
 }
 
-void SfxFrameDescriptor::SetEditable( BOOL bSet )
+void SfxFrameDescriptor::SetEditable( sal_Bool bSet )
 {
     pImp->bEditable = bSet;
 }
 
-BOOL SfxFrameDescriptor::IsEditable() const
+sal_Bool SfxFrameDescriptor::IsEditable() const
 {
     return pImp->bEditable;
 }
 
-BOOL SfxFrameDescriptor::CompareOriginal( SfxFrameDescriptor& rDescr ) const
+sal_Bool SfxFrameDescriptor::CompareOriginal( SfxFrameDescriptor& rDescr ) const
 {
     if( aURL != rDescr.aURL )
-        return FALSE;
+        return sal_False;
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL SfxFrameDescriptor::CheckContent() const
+sal_Bool SfxFrameDescriptor::CheckContent() const
 {
-    BOOL bRet = !( aURL == aActualURL );
+    sal_Bool bRet = !( aURL == aActualURL );
     return bRet;
 }
 
-void SfxFrameDescriptor::UnifyContent( BOOL bTakeActual )
+void SfxFrameDescriptor::UnifyContent( sal_Bool bTakeActual )
 {
     if ( bTakeActual )
         aURL = aActualURL;
@@ -141,7 +141,7 @@ void SfxFrameDescriptor::UnifyContent( BOOL bTakeActual )
         aActualURL = aURL;
 }
 
-SfxFrameDescriptor* SfxFrameDescriptor::Clone( BOOL bWithIds ) const
+SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
 {
     SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
 
@@ -175,9 +175,9 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( BOOL bWithIds ) const
     return pFrame;
 }
 
-USHORT SfxFrameDescriptor::GetWinBits() const
+sal_uInt16 SfxFrameDescriptor::GetWinBits() const
 {
-    USHORT nBits = 0;
+    sal_uInt16 nBits = 0;
     if ( eSizeSelector == SIZE_REL )
         nBits |= SWIB_RELATIVESIZE;
     if ( eSizeSelector == SIZE_PERCENT )
@@ -189,7 +189,7 @@ USHORT SfxFrameDescriptor::GetWinBits() const
     return nBits;
 }
 
-BOOL SfxFrameDescriptor::HasFrameBorder() const
+sal_Bool SfxFrameDescriptor::HasFrameBorder() const
 {
     return (nHasBorder & BORDER_YES) != 0;
 }
@@ -227,7 +227,7 @@ const Wallpaper* SfxFrameDescriptor::GetWallpaper() const
     return pImp->pWallpaper;
 }
 
-USHORT SfxFrameDescriptor::GetItemPos() const
+sal_uInt16 SfxFrameDescriptor::GetItemPos() const
 {
     return USHRT_MAX;
 }
@@ -248,13 +248,13 @@ SfxFrameProperties::SfxFrameProperties( const SfxFrameDescriptor *pD )
     , bHasBorder( pD->HasFrameBorder() )
     , bBorderSet( pD->IsFrameBorderSet() )
     , bResizable( pD->IsResizable() )
-    , bSetResizable( FALSE )
-    , bIsRootSet( FALSE )
-    , bIsInColSet( FALSE )
-    , bHasBorderInherited( FALSE )
+    , bSetResizable( sal_False )
+    , bIsRootSet( sal_False )
+    , bIsInColSet( sal_False )
+    , bHasBorderInherited( sal_False )
     , pFrame( pD->Clone() )
 {
-    bBorderSet = TRUE;
+    bBorderSet = sal_True;
 }
 
 SfxFrameProperties&	SfxFrameProperties::operator =(
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index d2589e1888..30c0e218c5 100644..100755
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -79,7 +79,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "graphhelp.hxx"
 #include "doc.hrc"
 
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index d4d91d7e6f..d4d91d7e6f 100644..100755
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
diff --git a/sfx2/source/doc/graphhelp.src b/sfx2/source/doc/graphhelp.src
index cb9555a0da..cb9555a0da 100644..100755
--- a/sfx2/source/doc/graphhelp.src
+++ b/sfx2/source/doc/graphhelp.src
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 8db9828b34..8a8b2ea77e 100644..100755
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -73,13 +73,14 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/mimeconfighelper.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/window.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
 #include <sfx2/sfxsids.hrc>
 #include <doc.hrc>
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
@@ -509,7 +510,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sa
     aSearchRequest[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
     aSearchRequest[0].Value <<= GetDocServiceName();
 
-    return SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
+    return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
 }
 
 //-------------------------------------------------------------------------
@@ -529,7 +530,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
         aSearchRequest[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService"));
         aSearchRequest[1].Value <<= GetDocServiceName();
 
-        aFilterProps = SfxStoringHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
+        aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
     }
     else
     {
@@ -753,7 +754,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName )
         return STATUS_SAVEAS_STANDARDNAME;
     }
     else if ( ( !( nFiltFlags & SFX_FILTER_OWN ) || ( nFiltFlags & SFX_FILTER_ALIEN ) )
-           && !( nFiltFlags & SFX_FILTER_SILENTEXPORT ) && aDefFiltPropsHM.size()
+           && aDefFiltPropsHM.size()
            && ( nDefFiltFlags & SFX_FILTER_EXPORT ) && !( nDefFiltFlags & SFX_FILTER_INTERNAL ))
     {
         // the default filter is acceptable and the old filter is alian one
@@ -985,12 +986,11 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
                          NULL );
 
     const SfxPoolItem* pItem = NULL;
-    if ( bPreselectPassword && aDialogParams.GetItemState( SID_PASSWORD, sal_True, &pItem ) != SFX_ITEM_SET )
+    if ( bPreselectPassword && aDialogParams.GetItemState( SID_ENCRYPTIONDATA, sal_True, &pItem ) != SFX_ITEM_SET )
     {
-        // the file dialog preselects the password checkbox if the provided mediadescriptor has password entry
-        // after dialog execution the password entry will be either removed or replaced with the password
-        // entered by the user
-        aDialogParams.Put( SfxStringItem( SID_PASSWORD, String() ) );
+        // the file dialog preselects the password checkbox if the provided mediadescriptor has encryption data entry
+        // after dialog execution the password interaction flag will be either removed or not
+        aDialogParams.Put( SfxBoolItem( SID_PASSWORDINTERACTION, sal_True ) );
     }
 
     // aStringTypeFN is a pure output parameter, pDialogParams is an in/out parameter
@@ -1597,6 +1597,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
 
     DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(), aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED );
 
+    OSL_ENSURE( aModelData.GetMediaDescr().find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" );
     if ( aOptions.IsDocInfoSave()
       && ( !aModelData.GetStorable()->hasLocation()
           || INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL ) )
@@ -1657,47 +1658,6 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
 
 //-------------------------------------------------------------------------
 // static
-uno::Sequence< beans::PropertyValue > SfxStoringHelper::SearchForFilter(
-                                                        const uno::Reference< container::XContainerQuery >& xFilterQuery,
-                                                        const uno::Sequence< beans::NamedValue >& aSearchRequest,
-                                                        sal_Int32 nMustFlags,
-                                                        sal_Int32 nDontFlags )
-{
-    uno::Sequence< beans::PropertyValue > aFilterProps;
-    uno::Reference< container::XEnumeration > xFilterEnum =
-                                            xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
-
-    // the first default filter will be taken,
-    // if there is no filter with flag default the first acceptable filter will be taken
-    if ( xFilterEnum.is() )
-    {
-        while ( xFilterEnum->hasMoreElements() )
-        {
-            uno::Sequence< beans::PropertyValue > aProps;
-            if ( xFilterEnum->nextElement() >>= aProps )
-            {
-                ::comphelper::SequenceAsHashMap aPropsHM( aProps );
-                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
-                                                                        (sal_Int32)0 );
-                if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
-                {
-                    if ( ( nFlags & SFX_FILTER_DEFAULT ) == SFX_FILTER_DEFAULT )
-                    {
-                        aFilterProps = aProps;
-                        break;
-                    }
-                    else if ( !aFilterProps.getLength() )
-                        aFilterProps = aProps;
-                }
-            }
-        }
-    }
-
-    return aFilterProps;
-}
-
-//-------------------------------------------------------------------------
-// static
 sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence(
                                                     const uno::Reference< container::XNameAccess >& xFilterCFG,
                                                     const ::rtl::OUString& aFilterName )
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 16b7839a1a..6f2ef86921 100644..100755
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -185,10 +185,10 @@ throw( uno::RuntimeException )
         if ( xDisp.is() )
             xDisp->dispatch( aTargetURL, aProps );
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeException )
@@ -275,7 +275,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam
         sal_Bool bIsAutoBorder = sal_Bool();
         if ( (aAny >>= bIsAutoBorder) )
         {
-            BOOL bBorder = maFrmDescr.IsFrameBorderOn();
+            sal_Bool bBorder = maFrmDescr.IsFrameBorderOn();
             maFrmDescr.ResetBorder();
             if ( bIsAutoBorder )
                 maFrmDescr.SetFrameBorder( bBorder );
@@ -384,7 +384,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&,
 ::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException)
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_FLOATINGFRAME, mxObj );
+    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString::createFromAscii(".uno:InsertObjectFloatingFrame"), mxObj );
     if ( pDlg )
         pDlg->Execute();
     return 0;
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
deleted file mode 100644
index d663d34cf5..0000000000
--- a/sfx2/source/doc/makefile.mk
+++ /dev/null
@@ -1,103 +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=sfx2
-TARGET=doc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-        doc.src new.src doctdlg.src docvor.src doctempl.src graphhelp.src
-
-SLOFILES =	\
-        $(SLO)$/printhelper.obj \
-        $(SLO)$/docinf.obj \
-        $(SLO)$/oleprops.obj \
-        $(SLO)$/iframe.obj \
-        $(SLO)$/plugin.obj \
-        $(SLO)$/docfile.obj \
-        $(SLO)$/objuno.obj \
-        $(SLO)$/frmdescr.obj \
-        $(SLO)$/objxtor.obj \
-        $(SLO)$/objmisc.obj \
-        $(SLO)$/objstor.obj \
-        $(SLO)$/objcont.obj \
-        $(SLO)$/objserv.obj \
-        $(SLO)$/objitem.obj \
-        $(SLO)$/ownsubfilterservice.obj \
-        $(SLO)$/docfac.obj \
-        $(SLO)$/docfilt.obj \
-        $(SLO)$/doctempl.obj \
-        $(SLO)$/doctemplates.obj \
-        $(SLO)$/doctemplateslocal.obj \
-        $(SLO)$/docvor.obj \
-        $(SLO)$/new.obj \
-        $(SLO)$/doctdlg.obj \
-        $(SLO)$/sfxbasemodel.obj \
-        $(SLO)$/guisaveas.obj\
-        $(SLO)$/objembed.obj\
-        $(SLO)$/graphhelp.obj \
-        $(SLO)$/QuerySaveDocument.obj \
-        $(SLO)$/docinsert.obj \
-        $(SLO)$/docmacromode.obj \
-        $(SLO)$/SfxDocumentMetaData.obj \
-        $(SLO)$/DocumentMetadataAccess.obj \
-        $(SLO)$/Metadatable.obj \
-        $(SLO)$/sfxmodelfactory.obj \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/docstoragemodifylistener.obj \
-        $(SLO)$/querytemplate.obj \
-        $(SLO)$/syspath.obj \
-        $(SLO)$/syspathw32.obj
-
-.IF "$(GUI)" == "WNT"
-
-#HACK TO DISABLE PCH
-NOOPTFILES= \
-        $(SLO)$/sfxacldetect.obj \
-        $(SLO)$/syspathw32.obj
-.ENDIF        
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index f8abaa1e39..9a96191180 100644..100755
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -51,8 +51,8 @@
 #include <sfx2/objsh.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/viewsh.hxx>
-#include "viewfac.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/viewfac.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "preview.hxx"
 #include <sfx2/printer.hxx>
@@ -135,13 +135,13 @@ void SfxPreviewWin_Impl::ImpPaint(
     Point aPoint;
     if (dRatio>dRatioPreV)
     {
-        aSize=Size(nWidth, (USHORT)(nWidth/dRatio));
-        aPoint=Point( 0, (USHORT)((nHeight-aSize.Height())/2));
+        aSize=Size(nWidth, (sal_uInt16)(nWidth/dRatio));
+        aPoint=Point( 0, (sal_uInt16)((nHeight-aSize.Height())/2));
     }
     else
     {
-        aSize=Size((USHORT)(nHeight*dRatio), nHeight);
-        aPoint=Point((USHORT)((nWidth-aSize.Width())/2),0);
+        aSize=Size((sal_uInt16)(nHeight*dRatio), nHeight);
+        aPoint=Point((sal_uInt16)((nWidth-aSize.Width())/2),0);
     }
     Point bPoint=Point(nWidth,nHeight)-aPoint;
 
@@ -178,7 +178,7 @@ SfxPreviewWin::SfxPreviewWin(
 
     // This preview window is for document previews.  Therefore
     // right-to-left mode should be off
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 void SfxPreviewWin::Paint( const Rectangle& rRect )
@@ -198,7 +198,7 @@ void SfxPreviewWin::Paint( const Rectangle& rRect )
     DBG_ASSERT( aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
 
     aMtf.SetPrefSize( aTmpSize );
-    aDevice.EnableOutput( FALSE );
+    aDevice.EnableOutput( sal_False );
     aDevice.SetMapMode( rDocShell->GetMapUnit() );
     aDevice.SetDrawMode( GetDrawMode() );
     aMtf.Record( &aDevice );
@@ -254,7 +254,7 @@ class SfxNewFileDialog_Impl
     String aNone;
     String sLoadTemplate;
 
-    USHORT nFlags;
+    sal_uInt16 nFlags;
     SfxDocumentTemplates aTemplates;
     SfxObjectShellLock xDocShell;
     SfxNewFileDialog* pAntiImpl;
@@ -269,23 +269,23 @@ class SfxNewFileDialog_Impl
     DECL_LINK( Expand, MoreButton * );
     DECL_LINK( PreviewClick, CheckBox * );
     DECL_LINK( LoadFile, PushButton* );
-    USHORT  GetSelectedTemplatePos() const;
+    sal_uInt16  GetSelectedTemplatePos() const;
 
 public:
 
-    SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, USHORT nFlags );
+    SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, sal_uInt16 nFlags );
     ~SfxNewFileDialog_Impl();
 
-        // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist
-        // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen
+        // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist
+        // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen
         // erfragt werden
-    BOOL IsTemplate() const;
+    sal_Bool IsTemplate() const;
     String GetTemplateRegion() const;
     String GetTemplateName() const;
     String GetTemplateFileName() const;
 
-    USHORT  GetTemplateFlags()const;
-    void    SetTemplateFlags(USHORT nSet);
+    sal_uInt16  GetTemplateFlags()const;
+    void    SetTemplateFlags(sal_uInt16 nSet);
 };
 
 
@@ -307,11 +307,11 @@ IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
     if ( xDocShell.Is() )
     {
         if ( xDocShell->GetProgress() )
-            return FALSE;
+            return sal_False;
         xDocShell.Clear();
     }
 
-    const USHORT nEntry = GetSelectedTemplatePos();
+    const sal_uInt16 nEntry = GetSelectedTemplatePos();
     if(!nEntry)
     {
         ClearInfo();
@@ -355,24 +355,24 @@ IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
             Application::SetDefDialogParent( pAntiImpl );
             SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,pAntiImpl);
             SfxApplication *pSfxApp = SFX_APP();
-            ULONG lErr;
+            sal_uIntPtr lErr;
             SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() );
-            pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) );
-            pSet->Put( SfxBoolItem( SID_PREVIEW, TRUE ) );
-            lErr = pSfxApp->LoadTemplate( xDocShell, aFileName, TRUE, pSet );
+            pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
+            pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) );
+            lErr = pSfxApp->LoadTemplate( xDocShell, aFileName, sal_True, pSet );
             if( lErr )
                 ErrorHandler::HandleError(lErr);
             Application::SetDefDialogParent( pParent );
             if ( !xDocShell.Is() )
             {
                 aPreviewWin.SetObjectShell( 0 );
-                return FALSE;
+                return sal_False;
             }
         }
 
         aPreviewWin.SetObjectShell( xDocShell );
     }
-    return TRUE;
+    return sal_True;
 }
 
 //-------------------------------------------------------------------------
@@ -382,20 +382,20 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
     if ( xDocShell.Is() && xDocShell->GetProgress() )
         return 0;
 
-    const USHORT nRegion = pBox->GetSelectEntryPos();
-    const USHORT nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0;
-    aTemplateLb.SetUpdateMode(FALSE);
+    const sal_uInt16 nRegion = pBox->GetSelectEntryPos();
+    const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0;
+    aTemplateLb.SetUpdateMode(sal_False);
     aTemplateLb.Clear();
     String aSel=aRegionLb.GetSelectEntry();
-    USHORT nc=aSel.Search('(');
+    sal_uInt16 nc=aSel.Search('(');
     if (nc-1&&nc!=STRING_NOTFOUND)
         aSel.Erase(nc-1);
     if (aSel.CompareIgnoreCaseToAscii( String(SfxResId(STR_STANDARD)) )==COMPARE_EQUAL)
         aTemplateLb.InsertEntry(aNone);
-    for (USHORT i = 0; i < nCount; ++i)
+    for (sal_uInt16 i = 0; i < nCount; ++i)
         aTemplateLb.InsertEntry(aTemplates.GetName(nRegion, i));
     aTemplateLb.SelectEntryPos(0);
-    aTemplateLb.SetUpdateMode(TRUE);
+    aTemplateLb.SetUpdateMode(sal_True);
     aTemplateLb.Invalidate();
     aTemplateLb.Update();
     return 0;
@@ -417,7 +417,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox )
     if ( xDocShell.Is() && xDocShell->GetProgress() )
         return 0;
 
-    USHORT nEntry = GetSelectedTemplatePos();
+    sal_uInt16 nEntry = GetSelectedTemplatePos();
     if ( nEntry && pBox->IsChecked() )
     {
         if(!Update(0))
@@ -470,11 +470,11 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG
 IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, LoadFile, PushButton *, EMPTYARG )
 //-------------------------------------------------------------------------
 
-USHORT  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
+sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
 {
-    USHORT nEntry=aTemplateLb.GetSelectEntryPos();
+    sal_uInt16 nEntry=aTemplateLb.GetSelectEntryPos();
     String aSel=aRegionLb.GetSelectEntry().Copy();
-    USHORT nc=aSel.Search('(');
+    sal_uInt16 nc=aSel.Search('(');
     if (nc-1&&nc!=STRING_NOTFOUND)
         aSel.Erase(nc-1);
     if (aSel.CompareIgnoreCaseToAscii(String(SfxResId(STR_STANDARD)))!=COMPARE_EQUAL)
@@ -486,7 +486,7 @@ USHORT  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
 
 //-------------------------------------------------------------------------
 
-BOOL SfxNewFileDialog_Impl::IsTemplate() const
+sal_Bool SfxNewFileDialog_Impl::IsTemplate() const
 {
     return GetSelectedTemplatePos()!=0;
 
@@ -531,9 +531,9 @@ void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset)
     pWin->SetPosSizePixel(aPos, aSize);
 }
 //-------------------------------------------------------------------------
-USHORT  SfxNewFileDialog_Impl::GetTemplateFlags()const
+sal_uInt16  SfxNewFileDialog_Impl::GetTemplateFlags()const
 {
-    USHORT nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0;
+    sal_uInt16 nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0;
     if(aFrameStyleCB.IsChecked())
         nRet |= SFX_LOAD_FRAME_STYLES;
     if(aPageStyleCB.IsChecked())
@@ -545,7 +545,7 @@ USHORT  SfxNewFileDialog_Impl::GetTemplateFlags()const
     return nRet;
 }
 //-------------------------------------------------------------------------
-void    SfxNewFileDialog_Impl::SetTemplateFlags(USHORT nSet)
+void    SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet)
 {
     aTextStyleCB.Check(  0 != (nSet&SFX_LOAD_TEXT_STYLES ));
     aFrameStyleCB.Check( 0 != (nSet&SFX_LOAD_FRAME_STYLES));
@@ -557,7 +557,7 @@ void    SfxNewFileDialog_Impl::SetTemplateFlags(USHORT nSet)
 //-------------------------------------------------------------------------
 
 SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
-    SfxNewFileDialog* pAntiImplP, USHORT nFl)
+    SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl)
     :	aRegionFt( pAntiImplP, SfxResId( FT_REGION ) ),
         aRegionLb( pAntiImplP, SfxResId( LB_REGION ) ),
         aTemplateFt( pAntiImplP, SfxResId( FT_TEMPLATE ) ),
@@ -643,7 +643,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     }
 
     String &rExtra = pAntiImplP->GetExtraData();
-    USHORT nTokCount = rExtra.GetTokenCount( '|' );
+    sal_uInt16 nTokCount = rExtra.GetTokenCount( '|' );
     if( nTokCount > 0 && nFlags )
         MORE_BTN(SetState( rExtra.GetToken( 0, '|' ) == 'Y' ));
     if( nTokCount > 1 && nFlags )
@@ -657,10 +657,10 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
         aTemplates.Update( sal_True /* be smart */ );
     }
     // fill the list boxes
-    const USHORT nCount = aTemplates.GetRegionCount();
+    const sal_uInt16 nCount = aTemplates.GetRegionCount();
     if (nCount)
     {
-        for(USHORT i = 0; i < nCount; ++i)
+        for(sal_uInt16 i = 0; i < nCount; ++i)
             aRegionLb.InsertEntry(aTemplates.GetFullRegionName(i));
         aRegionLb.SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, RegionSelect));
     }
@@ -684,7 +684,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
     delete pMoreBt;
 }
 //-------------------------------------------------------------------------
-SfxNewFileDialog::SfxNewFileDialog(Window *pParent, USHORT nFlags)
+SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags)
     : SfxModalDialog( pParent, SfxResId( DLG_NEW_FILE ) )
 {
     pImpl = new SfxNewFileDialog_Impl( this, nFlags );
@@ -695,7 +695,7 @@ SfxNewFileDialog::~SfxNewFileDialog()
     delete pImpl;
 }
 //-------------------------------------------------------------------------
-BOOL SfxNewFileDialog::IsTemplate() const
+sal_Bool SfxNewFileDialog::IsTemplate() const
 {
     return pImpl->IsTemplate();
 }
@@ -715,13 +715,13 @@ String SfxNewFileDialog::GetTemplateFileName() const
     return pImpl->GetTemplateFileName();
 }
 //-------------------------------------------------------------------------
-USHORT SfxNewFileDialog::GetTemplateFlags()const
+sal_uInt16 SfxNewFileDialog::GetTemplateFlags()const
 {
     return pImpl->GetTemplateFlags();
 
 }
 //-------------------------------------------------------------------------
-void    SfxNewFileDialog::SetTemplateFlags(USHORT nSet)
+void    SfxNewFileDialog::SetTemplateFlags(sal_uInt16 nSet)
 {
     pImpl->SetTemplateFlags(nSet);
 }
diff --git a/sfx2/source/doc/new.hrc b/sfx2/source/doc/new.hrc
index 8df0a392e4..8df0a392e4 100644..100755
--- a/sfx2/source/doc/new.hrc
+++ b/sfx2/source/doc/new.hrc
diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src
index dc7bcac962..db53b1267f 100644..100755
--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.src
@@ -28,12 +28,14 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #include "new.hrc"
+#include <sfx2/sfxcommands.h>
+
  // pragma ----------------------------------------------------------------
 
  // DLG_NEW_FILE ----------------------------------------------------------
 ModalDialog DLG_NEW_FILE
 {
-    HelpId = SID_NEWDOC ;
+    HelpId = CMD_SID_NEWDOC ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 336 , 96 ) ;
@@ -57,6 +59,7 @@ ModalDialog DLG_NEW_FILE
     };
     ListBox LB_REGION
     {
+        HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_REGION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 18 ) ;
         Size = MAP_APPFONT ( 127 , 72 ) ;
@@ -78,6 +81,7 @@ ModalDialog DLG_NEW_FILE
     };
     ListBox LB_TEMPLATE
     {
+        HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 139 , 18 ) ;
         Size = MAP_APPFONT ( 127 , 72 ) ;
@@ -85,6 +89,7 @@ ModalDialog DLG_NEW_FILE
     };
     MoreButton BT_MORE
     {
+        HelpID = "sfx2:MoreButton:DLG_NEW_FILE:BT_MORE";
         Pos = MAP_APPFONT ( 274 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~More" ;
@@ -101,6 +106,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox BTN_PREVIEW
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW";
         Pos = MAP_APPFONT ( 6 , 96 ) ;
         Size = MAP_APPFONT ( 97 , 10 ) ;
         Text [ en-US ] = "Pre~view" ;
@@ -115,6 +121,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox CB_TEXT_STYLE
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE";
         Pos = MAP_APPFONT ( 6 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Hide = TRUE;
@@ -122,6 +129,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox CB_FRAME_STYLE
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE";
         Pos = MAP_APPFONT ( 60 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Hide = TRUE;
@@ -129,6 +137,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox CB_PAGE_STYLE
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE";
         Pos = MAP_APPFONT ( 114 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Hide = TRUE;
@@ -136,6 +145,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox CB_NUM_STYLE
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE";
         Pos = MAP_APPFONT ( 168 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Hide = TRUE;
@@ -143,6 +153,7 @@ ModalDialog DLG_NEW_FILE
     };
     CheckBox CB_MERGE_STYLE
     {
+        HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE";
         Pos = MAP_APPFONT ( 222 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Hide = TRUE;
@@ -150,6 +161,7 @@ ModalDialog DLG_NEW_FILE
     };
     PushButton PB_LOAD_FILE
     {
+        HelpID = "sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE";
         Pos = MAP_APPFONT ( 274 , 92 ) ;
         Size = MAP_APPFONT ( 56 , 14 ) ;
         Hide = TRUE;
@@ -168,6 +180,7 @@ ModalDialog DLG_NEW_FILE
     };
     Edit ED_TITLE
     {
+        HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 145 , 121 ) ;
         Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -183,6 +196,7 @@ ModalDialog DLG_NEW_FILE
     };
     Edit ED_THEMA
     {
+        HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_THEMA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 145 , 148 ) ;
         Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -198,6 +212,7 @@ ModalDialog DLG_NEW_FILE
     };
     Edit ED_KEYWORDS
     {
+        HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 145 , 175 ) ;
         Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -213,6 +228,7 @@ ModalDialog DLG_NEW_FILE
     };
     MultiLineEdit ED_DESC
     {
+        HelpID = "sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 144 , 202 ) ;
         Size = MAP_APPFONT ( 175 , 32 ) ;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 97484ebdbf..0f35c0a613 100644..100755
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -63,7 +63,7 @@
 #include <vcl/oldprintadaptor.hxx>
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appdata.hxx"
 #include <sfx2/dinfdlg.hxx>
 #include "fltfnc.hxx"
@@ -72,11 +72,11 @@
 #include <sfx2/objsh.hxx>
 #include "objshimp.hxx"
 #include <sfx2/evntconf.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
+#include "sfx2/basmgr.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "basmgr.hxx"
 #include <sfx2/doctempl.hxx>
 #include "doc.hrc"
 #include <sfx2/sfxbasemodel.hxx>
@@ -137,7 +137,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
     ::boost::shared_ptr<GDIMetaFile> pFile(new GDIMetaFile);
 
     VirtualDevice aDevice;
-    aDevice.EnableOutput( FALSE );
+    aDevice.EnableOutput( sal_False );
 
     MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() );
     aDevice.SetMapMode( aMode );
@@ -245,7 +245,7 @@ void SfxObjectShell::UpdateTime_Impl(
     // Initialize some local member! Its neccessary for wollow operations!
     DateTime	aNow					;	// Date and time at current moment
     Time		n24Time		(24,0,0,0)	;	// Time-value for 24 hours - see follow calculation
-    ULONG		nDays		= 0			;	// Count of days between now and last editing
+    sal_uIntPtr		nDays		= 0			;	// Count of days between now and last editing
     Time		nAddTime	(0)			;	// Value to add on aOldTime
 
     // Safe impossible cases!
@@ -344,7 +344,7 @@ sal_uInt16 SfxObjectShell::GetContentCount(sal_uInt16 nIdx)
 
 //--------------------------------------------------------------------
 //TODO/CLEANUP: remove this method
-void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2)
+void  SfxObjectShell::TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
 {
     if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets
     {
@@ -383,9 +383,9 @@ void SfxObjectShell::GetContent(String &rText,
     {
         case INDEX_IGNORE:
         {
-            USHORT nTextResId = 0;
-            USHORT nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
-            USHORT nOpenedBitmapResId = 0; // "     "       "   "
+            sal_uInt16 nTextResId = 0;
+            sal_uInt16 nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
+            sal_uInt16 nOpenedBitmapResId = 0; // "     "       "   "
             switch(i)
             {
                 case CONTENT_STYLE:
@@ -430,7 +430,7 @@ void SfxObjectShell::GetContent(String &rText,
 
 Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily)
 {
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     switch(eFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
@@ -459,16 +459,16 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily)
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
-                              USHORT nSourceIdx1,
-                              USHORT nSourceIdx2,
-                              USHORT /*nSourceIdx3*/,
-                              USHORT &nIdx1,
-                              USHORT &nIdx2,
-                              USHORT &/*nIdx3*/,
-                              USHORT &/*nDeleted*/)
+sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource,
+                              sal_uInt16 nSourceIdx1,
+                              sal_uInt16 nSourceIdx2,
+                              sal_uInt16 /*nSourceIdx3*/,
+                              sal_uInt16 &nIdx1,
+                              sal_uInt16 &nIdx2,
+                              sal_uInt16 &/*nIdx3*/,
+                              sal_uInt16 &/*nDeleted*/)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if (INDEX_IGNORE == nIdx1 && CONTENT_STYLE == nSourceIdx1)
         nIdx1 = CONTENT_STYLE;
@@ -499,8 +499,8 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
             SfxStyleFamily eOldFamily = pHisSheet->GetFamily();
 
             SfxStyleSheetBase* pExist = pMyPool->Find(aOldName, eOldFamily);
-            // USHORT nOldHelpId = pExist->GetHelpId(??? VB ueberlegt sich was);
-            BOOL bUsedOrUserDefined;
+            // sal_uInt16 nOldHelpId = pExist->GetHelpId(??? VB ueberlegt sich was);
+            sal_Bool bUsedOrUserDefined;
             if( pExist )
             {
                 bUsedOrUserDefined =
@@ -508,13 +508,13 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
                 if( ErrorHandler::HandleError(
                     *new MessageInfo( ERRCODE_SFXMSG_STYLEREPLACE, aOldName ) )
                     != ERRCODE_BUTTON_OK )
-                    return FALSE;
+                    return sal_False;
                 else
                 {
                     pMyPool->Replace( *pHisSheet, *pExist );
-                    SetModified( TRUE );
+                    SetModified( sal_True );
                     nIdx2 = nIdx1 = INDEX_IGNORE;
-                    return TRUE;
+                    return sal_True;
                 }
             }
 
@@ -578,13 +578,13 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
                 }
             }
 
-            SetModified( TRUE );
+            SetModified( sal_True );
             if( !bUsedOrUserDefined ) nIdx2 = nIdx1 = INDEX_IGNORE;
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
     return bRet;
@@ -592,14 +592,14 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Remove
+sal_Bool SfxObjectShell::Remove
 (
-    USHORT nIdx1,
-    USHORT nIdx2,
-    USHORT /*nIdx3*/
+    sal_uInt16 nIdx1,
+    sal_uInt16 nIdx2,
+    sal_uInt16 /*nIdx3*/
 )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if (CONTENT_STYLE == nIdx1)
     {
@@ -612,7 +612,7 @@ BOOL SfxObjectShell::Remove
         String aEmpty;
         SfxStyleFamily  eFamily = pMySheet->GetFamily();
         pMyPool->Remove(pMySheet);
-        bRet = TRUE;
+        bRet = sal_True;
 
         SfxStyleSheetBase* pTestSheet = pMyPool->First();
         while (pTestSheet)
@@ -634,7 +634,7 @@ BOOL SfxObjectShell::Remove
             pTestSheet = pMyPool->Next();
         }
 
-        SetModified( TRUE );
+        SetModified( sal_True );
     }
 
     return bRet;
@@ -642,12 +642,12 @@ BOOL SfxObjectShell::Remove
 
 //--------------------------------------------------------------------
 
-BOOL SfxObjectShell::Print
+sal_Bool SfxObjectShell::Print
 (
     Printer&        rPrt,
-    USHORT          nIdx1,
-    USHORT          /*nIdx2*/,
-    USHORT          /*nIdx3*/,
+    sal_uInt16          nIdx1,
+    sal_uInt16          /*nIdx2*/,
+    sal_uInt16          /*nIdx3*/,
     const String*   pObjectName
 )
 {
@@ -661,7 +661,7 @@ BOOL SfxObjectShell::Print
                 pStylePool->GetSearchFamily(), pStylePool->GetSearchMask() );
             SfxStyleSheetBase *pStyle = pIter->First();
             if ( !pStyle )
-                return TRUE;
+                return sal_True;
 
             // pepare adaptor for old style StartPage/EndPage printing
             boost::shared_ptr< Printer > pPrinter( new Printer( rPrt.GetJobSetup() ) );
@@ -675,8 +675,8 @@ BOOL SfxObjectShell::Print
             aFont.SetWeight(WEIGHT_BOLD);
             pPrinter->SetFont(aFont);
             const Size aPageSize(pPrinter->GetOutputSize());
-            const USHORT nXIndent = 200;
-            USHORT nYIndent = 200;
+            const sal_uInt16 nXIndent = 200;
+            sal_uInt16 nYIndent = 200;
             Point aOutPos(nXIndent, nYIndent);
             String aHeader(SfxResId(STR_PRINT_STYLES_HEADER));
             if ( pObjectName )
@@ -711,13 +711,13 @@ BOOL SfxObjectShell::Print
                 pPrinter->SetFont(aFont);
                 aStr = pStyle->GetDescription();
                 const char cDelim = ' ';
-                USHORT nStart = 0, nIdx = 0;
+                sal_uInt16 nStart = 0, nIdx = 0;
 
                 nTextHeight = pPrinter->GetTextHeight();
                 // break text into lines
                 while(nIdx < aStr.Len())
                 {
-                    USHORT	nOld = nIdx;
+                    sal_uInt16	nOld = nIdx;
                     long nTextWidth;
                     nIdx = aStr.Search(cDelim, nStart);
                     nTextWidth = pPrinter->GetTextWidth(aStr, nStart, nIdx-nStart);
@@ -738,7 +738,7 @@ BOOL SfxObjectShell::Print
                     }
                     else
                     {
-                        USHORT nChar = 1;
+                        sal_uInt16 nChar = 1;
                         while(
                             nStart + nChar < aStr.Len() &&
                             aOutPos.X() + pPrinter->GetTextWidth(
@@ -769,9 +769,9 @@ BOOL SfxObjectShell::Print
             break;
         }
       default:
-          return FALSE;
+          return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -805,7 +805,7 @@ void SfxObjectShell::LoadStyles
     DBG_ASSERT(pMyPool, "Dest-DocumentShell ohne StyleSheetPool");
     pSourcePool->SetSearchMask(SFX_STYLE_FAMILY_ALL, 0xffff);
     Styles_Impl *pFound = new Styles_Impl[pSourcePool->Count()];
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
 
     SfxStyleSheetBase *pSource = pSourcePool->First();
     while ( pSource )
@@ -824,7 +824,7 @@ void SfxObjectShell::LoadStyles
         pSource = pSourcePool->Next();
     }
 
-    for ( USHORT i = 0; i < nFound; ++i )
+    for ( sal_uInt16 i = 0; i < nFound; ++i )
     {
         pFound[i].pDest->GetItemSet().PutExtended(pFound[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT);
         if(pFound[i].pSource->HasParentSupport())
@@ -897,13 +897,13 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
     {
         // check existence of template storage
         aTemplURL = aFoundName;
-        BOOL bLoad = FALSE;
+        sal_Bool bLoad = sal_False;
 
         // should the document checked against changes in the template ?
         if ( IsQueryLoadTemplate() )
         {
             // load document info of template
-            BOOL bOK = FALSE;
+            sal_Bool bOK = sal_False;
             util::DateTime aTemplDate;
             try
             {
@@ -920,7 +920,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                 if ( aAny >>= aTemplDate )
                 {
                     // get modify date from document info
-                    bOK = TRUE;
+                    bOK = sal_True;
                 }
             }
             catch ( Exception& )
@@ -937,21 +937,21 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                     // ask user
                     if( bCanUpdateFromTemplate == document::UpdateDocMode::QUIET_UPDATE
                     || bCanUpdateFromTemplate == document::UpdateDocMode::FULL_UPDATE )
-                        bLoad = TRUE;
+                        bLoad = sal_True;
                     else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG )
                     {
                         String sMessage( SfxResId( STR_QRYTEMPL_MESSAGE ) );
                         sMessage.SearchAndReplace( String::CreateFromAscii("$(ARG1)"), aTemplName );
                         sfx2::QueryTemplateBox aBox( GetDialogParent(), sMessage );
                         if ( RET_YES == aBox.Execute() )
-                            bLoad = TRUE;
+                            bLoad = sal_True;
                     }
 
                     if( !bLoad )
                     {
                         // user refuses, so don't ask again for this document
-                        SetQueryLoadTemplate(FALSE);
-                        SetModified( TRUE );
+                        SetQueryLoadTemplate(sal_False);
+                        SetModified( sal_True );
                     }
                 }
             }
@@ -983,38 +983,6 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
     }
 }
 
-SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& aTargetURL, BOOL bForWriting )
-{
-    // check for own format
-    SfxObjectShellRef xDoc;
-    StreamMode nMode = bForWriting ? SFX_STREAM_READWRITE : SFX_STREAM_READONLY;
-    SfxMedium *pMed = new SfxMedium( aTargetURL, nMode, FALSE, 0 );
-    const SfxFilter* pFilter = NULL;
-    pMed->UseInteractionHandler(TRUE);
-    if( SFX_APP()->GetFilterMatcher().GuessFilter( *pMed, &pFilter ) == ERRCODE_NONE && pFilter && pFilter->IsOwnFormat() )
-    {
-        // create document
-        xDoc = SfxObjectShell::CreateObject( pFilter->GetServiceName(), SFX_CREATE_MODE_ORGANIZER );
-        if ( xDoc.Is() )
-        {
-            // partially load, so don't use DoLoad!
-            xDoc->DoInitNew(0);
-            // TODO/LATER: make sure that we don't use binary templates!
-            if( xDoc->LoadFrom( *pMed ) )
-            {
-                // connect to storage, abandon temp. storage
-                xDoc->DoSaveCompleted( pMed );
-            }
-            else
-                xDoc.Clear();
-        }
-    }
-    else
-        delete pMed;
-
-    return xDoc;
-}
-
 sal_Bool SfxObjectShell::IsHelpDocument() const
 {
     const SfxFilter* pFilter = GetMedium()->GetFilter();
@@ -1069,14 +1037,14 @@ sal_Bool SfxObjectShell::IsUseUserData() const
 void SfxObjectShell::SetQueryLoadTemplate( sal_Bool bNew )
 {
     if ( pImp->bQueryLoadTemplate != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bQueryLoadTemplate = bNew;
 }
 
 void SfxObjectShell::SetUseUserData( sal_Bool bNew )
 {
     if ( pImp->bUseUserData != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bUseUserData = bNew;
 }
 
@@ -1093,14 +1061,14 @@ sal_Bool SfxObjectShell::IsSaveVersionOnClose() const
 void SfxObjectShell::SetLoadReadonly( sal_Bool bNew )
 {
     if ( pImp->bLoadReadonly != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bLoadReadonly = bNew;
 }
 
 void SfxObjectShell::SetSaveVersionOnClose( sal_Bool bNew )
 {
     if ( pImp->bSaveVersionOnClose != bNew )
-        SetModified( TRUE );
+        SetModified( sal_True );
     pImp->bSaveVersionOnClose = bNew;
 }
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 6ca5bcc5d0..eb36a1474f 100644..100755
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -102,7 +102,7 @@ void SfxObjectShell::OnDocumentPrinterChanged( Printer* /*pNewPrinter*/ )
 }
 
 // -----------------------------------------------------------------------
-Rectangle SfxObjectShell::GetVisArea( USHORT nAspect ) const
+Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const
 {
     if( nAspect == ASPECT_CONTENT )
         return pImp->m_aVisArea;
@@ -132,7 +132,7 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
         if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
         {
             if ( IsEnableSetModified() )
-                SetModified( TRUE );
+                SetModified( sal_True );
 
                SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
         }
@@ -146,7 +146,7 @@ void SfxObjectShell::SetVisAreaSize( const Size & rVisSize )
 }
 
 // -----------------------------------------------------------------------
-ULONG SfxObjectShell::GetMiscStatus() const
+sal_uIntPtr SfxObjectShell::GetMiscStatus() const
 {
     return 0;
 }
@@ -175,7 +175,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
     rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MAP_100TH_MM );
     rDesc.maDragStartPos = Point();
     rDesc.maDisplayName = String();
-    rDesc.mbCanLink = FALSE;
+    rDesc.mbCanLink = sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -183,7 +183,7 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
                             const Point & rObjPos,
                             const Size & rSize,
                             const JobSetup & rSetup,
-                            USHORT nAspect )
+                            sal_uInt16 nAspect )
 {
     MapMode aMod = pDev->GetMapMode();
     Size aSize = GetVisArea( nAspect ).GetSize();
@@ -204,7 +204,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
                                const Fraction & rScaleX,
                                const Fraction & rScaleY,
                                const JobSetup & rSetup,
-                               USHORT nAspect )
+                               sal_uInt16 nAspect )
 {
     Rectangle aVisArea  = GetVisArea( nAspect );
     // MapUnit des Ziels
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 3cecbf41e9..d652a2059f 100644..100755
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -61,7 +61,7 @@ SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const
 
 //--------------------------------------------------------------------
 
-bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     if ( pObjSh )
     {
@@ -78,7 +78,7 @@ bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMem
 
 //--------------------------------------------------------------------
 
-bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This item MUST have a model. Please don't change this, there are UNO-based
     // implementations which need it!!
@@ -111,7 +111,7 @@ bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*
 
 //=========================================================================
 
-SfxObjectItem::SfxObjectItem( USHORT nWhichId, SfxShell *pSh )
+SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh )
 :	SfxPoolItem( nWhichId ),
     _pSh( pSh )
 {}
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 584be670f7..be990ff6f1 100644..100755
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -107,6 +107,8 @@ using namespace ::com::sun::star::container;
 #include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
 #include <framework/interaction.hxx>
+#include <framework/documentundoguard.hxx>
+#include <comphelper/interaction.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/documentconstants.hxx>
 
@@ -115,7 +117,7 @@ using namespace ::com::sun::star::container;
 #include "appdata.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
@@ -129,7 +131,6 @@ using namespace ::com::sun::star::container;
 #include <sfx2/ctrlitem.hxx>
 #include "arrdecl.hxx"
 #include <sfx2/module.hxx>
-#include <sfx2/macrconf.hxx>
 #include <sfx2/docfac.hxx>
 #include "helper.hxx"
 #include "doc.hrc"
@@ -1103,9 +1104,9 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame )
             sal_uInt16 nId = pImp->nEventId;
             pImp->nEventId = 0;
             if ( nId == SFX_EVENT_OPENDOC )
-                pSfxApp->NotifyEvent(SfxEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this ), sal_False);
+                pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this, pFrame->GetFrame().GetController() ), sal_False);
             else if (nId == SFX_EVENT_CREATEDOC )
-                pSfxApp->NotifyEvent(SfxEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this ), sal_False);
+                pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this, pFrame->GetFrame().GetController() ), sal_False);
         }
     }
 }
@@ -1584,15 +1585,8 @@ SfxModule* SfxObjectShell::GetModule() const
     return GetFactory().GetModule();
 }
 
-sal_Bool SfxObjectShell::IsBasic(
-    const String & rCode, SbxObject * pVCtrl )
-{
-    if( !rCode.Len() ) return sal_False;
-    return SfxMacroConfig::IsBasic( pVCtrl, rCode, GetBasicManager() );
-}
-
 ErrCode SfxObjectShell::CallBasic( const String& rMacro,
-    const String& rBasic, SbxObject* pVCtrl, SbxArray* pArgs,
+    const String& rBasic, SbxArray* pArgs,
     SbxValue* pRet )
 {
     SfxApplication* pApp = SFX_APP();
@@ -1602,23 +1596,13 @@ ErrCode SfxObjectShell::CallBasic( const String& rMacro,
             return ERRCODE_IO_ACCESSDENIED;
     }
 
-    pApp->EnterBasicCall();
     BasicManager *pMgr = GetBasicManager();
     if( pApp->GetName() == rBasic )
         pMgr = pApp->GetBasicManager();
-    ErrCode nRet = SfxMacroConfig::Call( pVCtrl, rMacro, pMgr, pArgs, pRet );
-    pApp->LeaveBasicCall();
+    ErrCode nRet = SfxApplication::CallBasic( rMacro, pMgr, pArgs, pRet );
     return nRet;
 }
 
-ErrCode SfxObjectShell::Call( const String & rCode, sal_Bool bIsBasicReturn, SbxObject * pVCtrl )
-{
-    ErrCode nErr = ERRCODE_NONE;
-    if ( bIsBasicReturn )
-        CallBasic( rCode, String(), pVCtrl );
-    return nErr;
-}
-
 namespace
 {
     static bool lcl_isScriptAccessAllowed_nothrow( const Reference< XInterface >& _rxScriptContext )
@@ -1672,6 +1656,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
             xScriptProvider.set( xScriptProviderFactory->createScriptProvider( makeAny( _rxScriptContext ) ), UNO_SET_THROW );
         }
 
+        // ry to protect the invocation context's undo manager (if present), just in case the script tampers with it
+        ::framework::DocumentUndoGuard aUndoGuard( _rxScriptContext.get() );
+
         // obtain the script, and execute it
         Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW );
         if ( pCaller && pCaller->hasValue() )
@@ -1689,7 +1676,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
     catch ( const uno::Exception& )
     {
         aException = ::cppu::getCaughtException();
-        bCaughtException = TRUE;
+        bCaughtException = sal_True;
         nErr = ERRCODE_BASIC_INTERNAL_ERROR;
     }
 
@@ -1723,118 +1710,6 @@ ErrCode SfxObjectShell::CallXScript( const String& rScriptURL,
 }
 
 //-------------------------------------------------------------------------
-namespace {
-    using namespace ::com::sun::star::uno;
-
-    //.....................................................................
-    static SbxArrayRef lcl_translateUno2Basic( const void* _pAnySequence )
-    {
-        SbxArrayRef xReturn;
-        if ( _pAnySequence )
-        {
-            // in real it's a sequence of Any (by convention)
-            const Sequence< Any >* pArguments = static_cast< const Sequence< Any >* >( _pAnySequence );
-
-            // do we have arguments ?
-            if ( pArguments->getLength() )
-            {
-                // yep
-                xReturn = new SbxArray;
-                String sEmptyName;
-
-                // loop through the sequence
-                const Any* pArg		=			pArguments->getConstArray();
-                const Any* pArgEnd	= pArg	+	pArguments->getLength();
-
-                for ( sal_uInt16 nArgPos=1; pArg != pArgEnd; ++pArg, ++nArgPos )
-                    // and create a Sb object for every Any
-                    xReturn->Put( GetSbUnoObject( sEmptyName, *pArg ), nArgPos );
-            }
-        }
-        return xReturn;
-    }
-    //.....................................................................
-    void lcl_translateBasic2Uno( const SbxVariableRef& _rBasicValue, void* _pAny )
-    {
-        if ( _pAny )
-            *static_cast< Any* >( _pAny ) = sbxToUnoValue( _rBasicValue );
-    }
-}
-//-------------------------------------------------------------------------
-ErrCode SfxObjectShell::CallStarBasicScript( const String& _rMacroName, const String& _rLocation,
-    const void* _pArguments, void* _pReturn )
-{
-    OSL_TRACE("in CallSBS");
-    SolarMutexGuard aSolarGuard;
-
-    // the arguments for the call
-    SbxArrayRef xMacroArguments = lcl_translateUno2Basic( _pArguments );
-
-    // the return value
-    SbxVariableRef xReturn = _pReturn ? new SbxVariable : NULL;
-
-    // the location (document or application)
-    String sMacroLocation;
-    if ( _rLocation.EqualsAscii( "application" ) )
-        sMacroLocation = SFX_APP()->GetName();
-#ifdef DBG_UTIL
-    else
-        DBG_ASSERT( _rLocation.EqualsAscii( "document" ),
-            "SfxObjectShell::CallStarBasicScript: invalid (unknown) location!" );
-#endif
-
-    // call the script
-    ErrCode eError = CallBasic( _rMacroName, sMacroLocation, NULL, xMacroArguments, xReturn );
-
-    // translate the return value
-    lcl_translateBasic2Uno( xReturn, _pReturn );
-
-    // outta here
-    return eError;
-}
-
-//-------------------------------------------------------------------------
-ErrCode SfxObjectShell::CallScript(
-    const String & rScriptType,
-    const String & rCode,
-    const void *pArgs,
-    void *pRet
-)
-{
-    SolarMutexGuard aSolarGuard;
-    ErrCode nErr = ERRCODE_NONE;
-    if( rScriptType.EqualsAscii( "StarBasic" ) )
-    {
-        // the arguments for the call
-        SbxArrayRef xMacroArguments = lcl_translateUno2Basic( pArgs );
-
-        // the return value
-        SbxVariableRef xReturn = pRet ? new SbxVariable : NULL;
-
-        // call the script
-        nErr = CallBasic( rCode, String(), NULL, xMacroArguments, xReturn );
-
-        // translate the return value
-        lcl_translateBasic2Uno( xReturn, pRet );
-
-        // did this fail because the method was not found?
-        if ( nErr == ERRCODE_BASIC_PROC_UNDEFINED )
-        {	// yep-> look in the application BASIC module
-            nErr = CallBasic( rCode, SFX_APP()->GetName(), NULL, xMacroArguments, xReturn );
-        }
-    }
-    else if( rScriptType.EqualsAscii( "JavaScript" ) )
-    {
-        OSL_FAIL( "JavaScript not allowed" );
-        return 0;
-    }
-    else
-    {
-        OSL_FAIL( "StarScript not allowed" );
-    }
-    return nErr;
-}
-
 SfxFrame* SfxObjectShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ )
 {
     return pSelf;
@@ -1852,25 +1727,6 @@ void SfxObjectShell::SetFlags( SfxObjectShellFlags eFlags )
     pImp->eFlags = eFlags;
 }
 
-String SfxObjectShell::QueryTitle( SfxTitleQuery eType ) const
-{
-    String aRet;
-
-    switch( eType )
-    {
-        case SFX_TITLE_QUERY_SAVE_NAME_PROPOSAL:
-        {
-            SfxMedium* pMed = GetMedium();
-            const INetURLObject aObj( pMed->GetName() );
-            aRet = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
-            if ( !aRet.Len() )
-                aRet = GetTitle( SFX_TITLE_CAPTION );
-            break;
-        }
-    }
-    return aRet;
-}
-
 void SfxHeaderAttributes_Impl::SetAttributes()
 {
     bAlert = sal_True;
@@ -2019,7 +1875,7 @@ sal_Bool SfxObjectShell::IsSecure()
         if ( GetMedium()->GetContent().is() )
         {
             Any aAny( ::utl::UCBContentHelper::GetProperty( aURL.GetMainURL( INetURLObject::NO_DECODE ), String( RTL_CONSTASCII_USTRINGPARAM("IsProtected")) ) );
-            sal_Bool bIsProtected = FALSE;
+            sal_Bool bIsProtected = sal_False;
             if ( ( aAny >>= bIsProtected ) && bIsProtected )
                 return sal_False;
             else
@@ -2032,7 +1888,7 @@ sal_Bool SfxObjectShell::IsSecure()
         return sal_False;
 }
 
-void SfxObjectShell::SetWaitCursor( BOOL bSet ) const
+void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
     {
@@ -2054,7 +1910,7 @@ String SfxObjectShell::GetAPIName() const
     return aName;
 }
 
-void SfxObjectShell::Invalidate( USHORT nId )
+void SfxObjectShell::Invalidate( sal_uInt16 nId )
 {
     for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, this ) )
         Invalidate_Impl( pFrame->GetBindings(), nId );
@@ -2077,7 +1933,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
 {
     Window* pWindow = 0;
     SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet();
-    SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
+    SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
     if ( pUnoItem )
     {
         uno::Reference < frame::XFrame > xFrame( pUnoItem->GetFrame() );
@@ -2087,7 +1943,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
     if ( !pWindow )
     {
         SfxFrame* pFrame = 0;
-        SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE );
+        SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False );
         if( pFrameItem && pFrameItem->GetFrame() )
             // get target frame from ItemSet
             pFrame = pFrameItem->GetFrame();
@@ -2121,7 +1977,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium )
     return pWindow;
 }
 
-String SfxObjectShell::UpdateTitle( SfxMedium* pMed, USHORT nDocViewNumber )
+String SfxObjectShell::UpdateTitle( SfxMedium* pMed, sal_uInt16 nDocViewNumber )
 {
     // Titel des Fensters
     String aTitle;
@@ -2162,29 +2018,29 @@ void SfxObjectShell::SetCreateMode_Impl( SfxObjectCreateMode nMode )
     eCreateMode = nMode;
 }
 
-BOOL SfxObjectShell::IsInPlaceActive()
+sal_Bool SfxObjectShell::IsInPlaceActive()
 {
     if ( eCreateMode != SFX_CREATE_MODE_EMBEDDED )
-        return FALSE;
+        return sal_False;
 
     SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
     return pFrame && pFrame->GetFrame().IsInPlace();
 }
 
-BOOL SfxObjectShell::IsUIActive()
+sal_Bool SfxObjectShell::IsUIActive()
 {
     if ( eCreateMode != SFX_CREATE_MODE_EMBEDDED )
-        return FALSE;
+        return sal_False;
 
     SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
     return pFrame && pFrame->GetFrame().IsInPlace() && pFrame->GetFrame().GetWorkWindow_Impl()->IsVisible_Impl();
 }
 
-void SfxObjectShell::UIActivate( BOOL )
+void SfxObjectShell::UIActivate( sal_Bool )
 {
 }
 
-void SfxObjectShell::InPlaceActivate( BOOL )
+void SfxObjectShell::InPlaceActivate( sal_Bool )
 {
 }
 
@@ -2200,8 +2056,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
         {
             uno::Any aInteraction;
             uno::Sequence< uno::Reference< task::XInteractionContinuation > > lContinuations(2);
-            ::framework::ContinuationAbort* pAbort = new ::framework::ContinuationAbort();
-            ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+            ::comphelper::OInteractionAbort* pAbort = new ::comphelper::OInteractionAbort();
+            ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
             lContinuations[0] = uno::Reference< task::XInteractionContinuation >(
                                  static_cast< task::XInteractionContinuation* >( pAbort ), uno::UNO_QUERY );
             lContinuations[1] = uno::Reference< task::XInteractionContinuation >(
@@ -2210,14 +2066,8 @@ sal_Bool SfxObjectShell::UseInteractionToHandleError(
             task::ErrorCodeRequest aErrorCode;
             aErrorCode.ErrCode = nError;
             aInteraction <<= aErrorCode;
-
-            ::framework::InteractionRequest* pRequest = new ::framework::InteractionRequest(aInteraction,lContinuations);
-            uno::Reference< task::XInteractionRequest > xRequest(
-                             static_cast< task::XInteractionRequest* >( pRequest ),
-                             uno::UNO_QUERY);
-
-            xHandler->handle(xRequest);
-            bResult = pAbort->isSelected();
+            xHandler->handle(::framework::InteractionRequest::CreateRequest (aInteraction,lContinuations));
+            bResult = pAbort->wasSelected();
         }
         catch( uno::Exception& )
         {}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 1753045b75..16f4555b34 100644..100755
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -71,7 +71,7 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/signaturestate.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
@@ -92,7 +92,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objface.hxx>
 
@@ -296,7 +296,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl
     SfxItemSet*	  aParams
 )
 {
-    BOOL bOk = sal_False;
+    sal_Bool bOk = sal_False;
 
     {DBG_CHKTHIS(SfxObjectShell, 0);}
 
@@ -346,7 +346,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl
         }
 
         // prevent picklist-entry
-        GetMedium()->SetUpdatePickList( FALSE );
+        GetMedium()->SetUpdatePickList( sal_False );
     }
 
     return bOk;
@@ -358,7 +358,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 {
     {DBG_CHKTHIS(SfxObjectShell, 0);}
 
-    USHORT nId = rReq.GetSlot();
+    sal_uInt16 nId = rReq.GetSlot();
 
     if( SID_SIGNATURE == nId || SID_MACRO_SIGNATURE == nId )
     {
@@ -407,7 +407,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_DOCINFO:
         {
-            SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, FALSE);
+            SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
             if ( pDocInfItem )
             {
                 // parameter, e.g. from replayed macro
@@ -417,8 +417,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             else
             {
                 // no argument containing DocInfo; check optional arguments
-                BOOL bReadOnly = IsReadOnly();
-                SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE);
+                sal_Bool bReadOnly = IsReadOnly();
+                SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False);
                 if ( pROItem )
                     // override readonly attribute of document
                     // e.g. if a readonly document is saved elsewhere and user asks for editing DocInfo before
@@ -443,7 +443,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     IsUseUserData() );
                 if ( !GetSlotState( SID_DOCTEMPLATE ) )
                     // templates not supported
-                    aDocInfoItem.SetTemplate(FALSE);
+                    aDocInfoItem.SetTemplate(sal_False);
 
                 SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY,
                                 SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL,
@@ -457,7 +457,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 SfxDocumentInfoDialog *pDlg = CreateDocumentInfoDialog(0, aSet);
                 if ( RET_OK == pDlg->Execute() )
                 {
-                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, FALSE);
+                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False);
                     if ( pDocInfoItem )
                     {
                         // user has done some changes to DocumentInfo
@@ -493,7 +493,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             // derived class may decide to abort this
             if( !QuerySlotExecutable( nId ) )
             {
-                rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
+                rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
                 return;
             }
 
@@ -518,7 +518,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 if ( nId == SID_SAVEASDOC )
                 {
                     // in case of plugin mode the SaveAs operation means SaveTo
-                    SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, FALSE );
+                    SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, sal_False );
                     if ( pViewOnlyItem && pViewOnlyItem->GetValue() )
                         rReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) );
                 }
@@ -526,7 +526,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 // TODO/LATER: do the following GUI related actions in standalown method
                 // ========================================================================================================
                 // Introduce a status indicator for GUI operation
-                SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
+                SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
                 if ( !pStatusIndicatorItem )
                 {
                     // get statusindicator
@@ -565,7 +565,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 }
 
                 // Introduce an interaction handler for GUI operation
-                SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE );
+                SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False );
                 if ( !pInteractionHandlerItem )
                 {
                     uno::Reference< task::XInteractionHandler > xInteract;
@@ -600,8 +600,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 // ========================================================================================================
 
                 sal_Bool bPreselectPassword = sal_False;
-                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, FALSE );
-                if ( pOldPasswordItem )
+                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False );
+                SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, sal_False );
+                if ( pOldEncryptionDataItem || pOldPasswordItem )
                     bPreselectPassword = sal_True;
 
                 uno::Sequence< beans::PropertyValue > aDispatchArgs;
@@ -643,7 +644,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                                      NULL );
                 rReq.SetArgs( aResultParams );
 
-                SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, FALSE );
+                SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False );
                 ::rtl::OUString aFilterName = pFilterNameItem ? ::rtl::OUString( pFilterNameItem->GetValue() )
                                                               : ::rtl::OUString();
                 const SfxFilter* pFilt = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
@@ -680,14 +681,14 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             // by default versions should be preserved always except in case of an explicit
             // SaveAs via GUI, so the flag must be reset to guarantee this
             pImp->bPreserveVersions = sal_True;
-            ULONG lErr=GetErrorCode();
+            sal_uIntPtr lErr=GetErrorCode();
 
             if ( !lErr && nErrorCode )
                 lErr = nErrorCode;
 
             if ( lErr && nErrorCode == ERRCODE_NONE )
             {
-                SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, FALSE );
+                SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, sal_False );
                 if ( pWarnItem && pWarnItem->GetValue() )
                     nErrorCode = lErr;
             }
@@ -730,8 +731,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 return;
             }
 
-            BOOL bInFrameSet = FALSE;
-            USHORT nFrames=0;
+            sal_Bool bInFrameSet = sal_False;
+            sal_uInt16 nFrames=0;
             pFrame = SfxViewFrame::GetFirst( this );
             while ( pFrame )
             {
@@ -740,7 +741,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     // Auf dieses Dokument existiert noch eine Sicht, die
                     // in einem FrameSet liegt; diese darf nat"urlich nicht
                     // geclosed werden
-                    bInFrameSet = TRUE;
+                    bInFrameSet = sal_True;
                 }
                 else
                     nFrames++;
@@ -761,8 +762,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
             }
 
             // Parameter auswerten
-            SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, FALSE);
-            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, FALSE);
+            SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, sal_False);
+            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, sal_False);
             if ( pSaveItem )
             {
                 if ( pSaveItem->GetValue() )
@@ -785,22 +786,22 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                     }
                 }
                 else
-                    SetModified(FALSE);
+                    SetModified(sal_False);
             }
 
             // Benutzer bricht ab?
             if ( !PrepareClose( 2 ) )
             {
-                rReq.SetReturnValue( SfxBoolItem(0, FALSE) );
+                rReq.SetReturnValue( SfxBoolItem(0, sal_False) );
                 rReq.Done();
                 return;
             }
 
-            SetModified( FALSE );
-            ULONG lErr = GetErrorCode();
+            SetModified( sal_False );
+            sal_uIntPtr lErr = GetErrorCode();
             ErrorHandler::HandleError(lErr);
 
-            rReq.SetReturnValue( SfxBoolItem(0, TRUE) );
+            rReq.SetReturnValue( SfxBoolItem(0, sal_True) );
             rReq.Done();
             rReq.ReleaseArgs(); // da der Pool in Close zerst"ort wird
             DoClose();
@@ -833,9 +834,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 }
             }
 
-            SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, FALSE);
-            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, FALSE);
-            SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, FALSE);
+            SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
+            SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
+            SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, sal_False);
             if ( (!pRegionItem && !pRegionNrItem ) || !pNameItem )
             {
                 DBG_ASSERT( rReq.IsAPI(), "non-API call without Arguments" );
@@ -891,10 +892,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
     // Picklisten-Eintrag verhindern
     if ( rReq.IsAPI() )
-        GetMedium()->SetUpdatePickList( FALSE );
+        GetMedium()->SetUpdatePickList( sal_False );
     else if ( rReq.GetArgs() )
     {
-        SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, FALSE );
+        SFX_ITEMSET_GET( *rReq.GetArgs(), pPicklistItem, SfxBoolItem, SID_PICKLIST, sal_False );
         if ( pPicklistItem )
             GetMedium()->SetUpdatePickList( pPicklistItem->GetValue() );
     }
@@ -910,7 +911,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
     DBG_CHKTHIS(SfxObjectShell, 0);
     SfxWhichIter aIter( rSet );
 
-    for ( USHORT nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
+    for ( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich; nWhich = aIter.NextWhich() )
     {
         switch ( nWhich )
         {
@@ -1060,13 +1061,6 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
             rReq.Done();
             break;
 
-        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_PLAYMACRO:
-        {
-            SFX_APP()->PlayMacro_Impl( rReq, GetBasic() );
-            break;
-        }
-
         case SID_DOCINFO_AUTHOR :
         {
             ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue();
@@ -1096,7 +1090,7 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
 void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet)
 {
     SfxWhichIter aIter(rSet);
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
+    for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
         switch ( nSID )
         {
@@ -1178,7 +1172,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
     {
         case SID_ACTIVATE:
         {
-            SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, TRUE );
+            SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_True );
             if ( pFrame )
                 pFrame->GetFrame().Appear();
             rReq.SetReturnValue( SfxObjectItem( 0, pFrame ) );
@@ -1197,7 +1191,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
                 if ( aFileName.Len() )
                 {
                     SfxStringItem aName( SID_FILE_NAME, aFileName );
-                    SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, TRUE );
+                    SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, sal_True );
                     SFX_APP()->GetAppDispatcher_Impl()->Execute(
                         SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aName,
                         &aCreateView, 0L);
@@ -1362,7 +1356,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent )
             if ( (bHasSign && QueryBox( NULL, SfxResId( MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN ) ).Execute() == RET_YES)
               || (!bHasSign && QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_SAVEBEFORESIGN ) ).Execute() == RET_YES) )
             {
-                USHORT nId = SID_SAVEDOC;
+                sal_uInt16 nId = SID_SAVEDOC;
                 if ( !GetMedium() || !GetMedium()->GetName().Len() )
                     nId = SID_SAVEASDOC;
                 SfxRequest aSaveRequest( nId, 0, GetPool() );
@@ -1450,22 +1444,22 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent )
 
 sal_uInt16 SfxObjectShell::GetDocumentSignatureState()
 {
-    return ImplGetSignatureState( FALSE );
+    return ImplGetSignatureState( sal_False );
 }
 
 void SfxObjectShell::SignDocumentContent()
 {
-    ImplSign( FALSE );
+    ImplSign( sal_False );
 }
 
 sal_uInt16 SfxObjectShell::GetScriptingSignatureState()
 {
-    return ImplGetSignatureState( TRUE );
+    return ImplGetSignatureState( sal_True );
 }
 
 void SfxObjectShell::SignScriptingContent()
 {
-    ImplSign( TRUE );
+    ImplSign( sal_True );
 }
 
 // static
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 46df49a69a..fd45e858bf 100644..100755
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -110,7 +110,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/request.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/docfile.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfilt.hxx>
@@ -194,23 +194,37 @@ sal_Bool SfxObjectShell::SaveAs( SfxMedium& rMedium )
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxObjectShell::QuerySlotExecutable( USHORT /*nSlotId*/ )
+sal_Bool SfxObjectShell::QuerySlotExecutable( sal_uInt16 /*nSlotId*/ )
 {
     return sal_True;
 }
 
 //-------------------------------------------------------------------------
 
-sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd )
+bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::NamedValue >& o_rEncryptionData )
 {
-    const SfxPoolItem* pItem = NULL;
-    if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_PASSWORD, sal_True, &pItem ) )
+    bool bResult = false;
+    if ( pSet )
     {
-        DBG_ASSERT( pItem->IsA( TYPE(SfxStringItem) ), "wrong item type" );
-        rPasswd = ( (const SfxStringItem*)pItem )->GetValue();
-        return sal_True;
+        SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False);
+        if ( pEncryptionDataItem )
+        {
+            pEncryptionDataItem->GetValue() >>= o_rEncryptionData;
+            bResult = true;
+        }
+        else
+        {
+            SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False);
+            if ( pPasswordItem )
+            {
+                ::rtl::OUString aPassword = pPasswordItem->GetValue();
+                o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPassword );
+                bResult = true;
+            }
+        }
     }
-    return sal_False;
+
+    return bResult;
 }
 
 //-------------------------------------------------------------------------
@@ -831,7 +845,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
 
         if( xFilterCFG.is() )
         {
-            BOOL bAbort = FALSE;
+            sal_Bool bAbort = sal_False;
             try {
                 const SfxFilter* pFilter = pMedium->GetFilter();
                 Sequence < PropertyValue > aProps;
@@ -891,7 +905,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
                                                 pSet->Put( *pFilterData );
                                     }
                                     else
-                                        bAbort = TRUE;
+                                        bAbort = sal_True;
                                 }
                             }
 
@@ -952,15 +966,15 @@ sal_Bool SfxObjectShell::DoSave()
 
         pImp->bIsSaving = sal_True;
 
-        ::rtl::OUString aPasswd;
+        uno::Sequence< beans::NamedValue > aEncryptionData;
         if ( IsPackageStorageFormat_Impl( *GetMedium() ) )
         {
-            if ( GetPasswd_Impl( GetMedium()->GetItemSet(), aPasswd ) )
+            if ( GetEncryptionData_Impl( GetMedium()->GetItemSet(), aEncryptionData ) )
             {
                 try
                 {
                     //TODO/MBA: GetOutputStorage?! Special mode, because it's "Save"?!
-                    ::comphelper::OStorageHelper::SetCommonStoragePassword( GetMedium()->GetStorage(), aPasswd );
+                    ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( GetMedium()->GetStorage(), aEncryptionData );
                     bOk = sal_True;
                 }
                 catch( uno::Exception& )
@@ -1020,7 +1034,7 @@ sal_Bool SfxObjectShell::DoSave()
     return bOk;
 }
 
-void Lock_Impl( SfxObjectShell* pDoc, BOOL bLock )
+void Lock_Impl( SfxObjectShell* pDoc, sal_Bool bLock )
 {
     SfxViewFrame *pFrame= SfxViewFrame::GetFirst( pDoc );
     while ( pFrame )
@@ -1339,13 +1353,13 @@ sal_Bool SfxObjectShell::SaveTo_Impl
         }
 
         // transfer password from the parameters to the storage
-        ::rtl::OUString aPasswd;
+        uno::Sequence< beans::NamedValue > aEncryptionData;
         sal_Bool bPasswdProvided = sal_False;
-        if ( GetPasswd_Impl( rMedium.GetItemSet(), aPasswd ) )
+        if ( GetEncryptionData_Impl( rMedium.GetItemSet(), aEncryptionData ) )
         {
             bPasswdProvided = sal_True;
             try {
-                ::comphelper::OStorageHelper::SetCommonStoragePassword( xMedStorage, aPasswd );
+                ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( xMedStorage, aEncryptionData );
                 bOk = sal_True;
             }
             catch( uno::Exception& )
@@ -1508,7 +1522,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 
         if( bOk && !bCopyTo )
             // we also don't touch any graphical replacements here
-            bOk = SaveChildren( TRUE );
+            bOk = SaveChildren( sal_True );
     }
 
     if ( bOk )
@@ -1708,8 +1722,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl
 #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer
             // Header for a single-valued ASCII EA data item
             typedef struct _EA_ASCII_header {
-            USHORT      usAttr;                 /* value: EAT_ASCII                        */
-            USHORT      usLen;                  /* length of data                          */
+            sal_uInt16      usAttr;                 /* value: EAT_ASCII                        */
+            sal_uInt16      usLen;                  /* length of data                          */
             CHAR        szType[_MAX_PATH];      /* ASCII data fits in here ...             */
             } EA_ASCII_HEADER;
             char   filePath[_MAX_PATH];
@@ -1751,7 +1765,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
             eaAscii.usLen = strlen( eaAscii.szType);
             // fill libc EA data structure
             eaType.flags = 0;
-            eaType.size = sizeof(USHORT)*2 + eaAscii.usLen;
+            eaType.size = sizeof(sal_uInt16)*2 + eaAscii.usLen;
             eaType.value = &eaAscii;
             // put EA to file
             rc = _ea_put( &eaType, filePath, 0, ".TYPE");
@@ -1904,7 +1918,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, BOOL bCommit )
+sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
 {
     sal_Bool bOk = sal_False;
     {
@@ -2227,7 +2241,7 @@ sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium )
         const OUString sInputStream ( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
 
         sal_Bool bHasInputStream = sal_False;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = lDescriptor.getLength();
 
@@ -2322,7 +2336,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium )
         const OUString sInputStream ( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
 
         sal_Bool bHasInputStream = sal_False;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = lDescriptor.getLength();
 
@@ -2413,9 +2427,9 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium )
         // put in the REAL file name, and copy all PropertyValues
         const OUString sOutputStream ( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) );
         const OUString sStream ( RTL_CONSTASCII_USTRINGPARAM ( "StreamForOutput" ) );
-        BOOL bHasOutputStream = FALSE;
-        BOOL bHasStream = FALSE;
-        BOOL bHasBaseURL = FALSE;
+        sal_Bool bHasOutputStream = sal_False;
+        sal_Bool bHasStream = sal_False;
+        sal_Bool bHasBaseURL = sal_False;
         sal_Int32 i;
         sal_Int32 nEnd = aOldArgs.getLength();
 
@@ -2608,7 +2622,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
     DBG_CHKTHIS(SfxObjectShell, 0);
 
     pImp->bIsSaving = sal_True;
-    sal_Bool bSaved = FALSE;
+    sal_Bool bSaved = sal_False;
     SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
     if ( pSalvageItem )
     {
@@ -2702,7 +2716,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
     SfxMedium *pActMed = GetMedium();
     const INetURLObject aActName(pActMed->GetName());
 
-    BOOL bWasReadonly = IsReadOnly();
+    sal_Bool bWasReadonly = IsReadOnly();
 
     if ( aURL == aActName && aURL != INetURLObject( OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")) )
         && IsReadOnly() )
@@ -2887,7 +2901,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
             if ( !bCopyTo )
             {
                 // reconnect to the old medium
-                BOOL bRet( FALSE );
+                sal_Bool bRet( sal_False );
                 bRet = DoSaveCompleted( pMedium );
                 DBG_ASSERT( bRet, "Error in DoSaveCompleted, can't be handled!");
                 (void)bRet;
@@ -2945,7 +2959,7 @@ sal_Bool SfxObjectShell::IsInformationLost()
     {
         const SfxFilter *pFilt = GetMedium()->GetFilter();
         DBG_ASSERT( pFilt && aFilterName.equals( pFilt->GetName() ), "MediaDescriptor contains wrong filter!\n" );
-        return ( pFilt && pFilt->IsAlienFormat() && !(pFilt->GetFilterFlags() & SFX_FILTER_SILENTEXPORT ) );
+        return ( pFilt && pFilt->IsAlienFormat() );
     }
 
     return sal_False;
@@ -2982,7 +2996,7 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates )
 sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent )
 {
     sal_Int16 nRet = RET_YES;
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     SvtSecurityOptions::EOption eOption = static_cast< SvtSecurityOptions::EOption >( -1 );
 
     switch ( eFact )
@@ -3088,13 +3102,13 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
         SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False );
         if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, SFX_APP()->GetPool(), pMedium ) )
         {
-            ::rtl::OUString aPasswd;
-            if ( GetPasswd_Impl(pMedium->GetItemSet(), aPasswd) )
+            uno::Sequence< beans::NamedValue > aEncryptionData;
+            if ( GetEncryptionData_Impl(pMedium->GetItemSet(), aEncryptionData) )
             {
                 try
                 {
                     // the following code must throw an exception in case of failure
-                    ::comphelper::OStorageHelper::SetCommonStoragePassword( xStorage, aPasswd );
+                    ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( xStorage, aEncryptionData );
                 }
                 catch( uno::Exception& )
                 {
@@ -3162,7 +3176,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage()
 }
 
 
-sal_Bool SfxObjectShell::SaveChildren( BOOL bObjectsOnly )
+sal_Bool SfxObjectShell::SaveChildren( sal_Bool bObjectsOnly )
 {
     RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxObjectShell::SaveChildren" );
 
@@ -3268,7 +3282,7 @@ sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >&
 
 #ifdef DBG_UTIL
     // check for wrong creation of object container
-    BOOL bHasContainer = ( pImp->mpObjectContainer != 0 );
+    sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
 #endif
 
     if ( !xStorage.is() || xStorage == GetStorage() )
@@ -3416,7 +3430,7 @@ sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorag
     sal_Bool bResult = sal_False;
 #ifdef DBG_UTIL
     // check for wrong creation of object container
-    BOOL bHasContainer = ( pImp->mpObjectContainer != 0 );
+    sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
 #endif
     if ( xStorage.is() )
     {
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 4ba2b1e919..0e105f364f 100644..100755
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -70,7 +70,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
 
 using namespace ::com::sun::star;
@@ -133,10 +133,10 @@ const SfxItemPropertyMapEntry* lcl_GetDocInfoPropertyMap()
     return aDocInfoPropertyMap_Impl;
 }
 
-static USHORT aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
+static sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
                                    31, 31, 30, 31, 30, 31 };
 
-inline USHORT DaysInMonth( USHORT nMonth, USHORT nYear )
+inline sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
 {
     if ( nMonth != 2 )
         return aDaysInMonth[nMonth-1];
@@ -713,7 +713,7 @@ void SAL_CALL SfxDocumentInfoObject::removeProperty(const ::rtl::OUString& sName
     return xPropSet->removeProperty(sName);
 }
 
-BOOL equalsDateTime( const util::DateTime& D1, const util::DateTime& D2 )
+sal_Bool equalsDateTime( const util::DateTime& D1, const util::DateTime& D2 )
 {
     return D1.HundredthSeconds == D2.HundredthSeconds &&
            D1.Seconds == D2.Seconds &&
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index ad06e20bf3..f9e3c1d4bb 100644..100755
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -49,7 +49,7 @@
 #include <svl/eitem.hxx>
 #include <tools/rtti.hxx>
 #include <svl/lstner.hxx>
-#include <sfxhelp.hxx>
+#include <sfx2/sfxhelp.hxx>
 #include <basic/sbstar.hxx>
 #include <svl/stritem.hxx>
 #include <basic/sbx.hxx>
@@ -87,7 +87,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
 #include "appbas.hxx"
 #include "sfxtypes.hxx"
@@ -98,8 +98,8 @@
 #include "appdata.hxx"
 #include <sfx2/appuno.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "basmgr.hxx"
-#include "QuerySaveDocument.hxx"
+#include "sfx2/basmgr.hxx"
+#include "sfx2/QuerySaveDocument.hxx"
 #include "helpid.hrc"
 #include <sfx2/msg.hxx>
 #include "appbaslib.hxx"
@@ -195,12 +195,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even
         SfxObjectShell::SetCurrentComponent( Reference< XInterface >() );
     }
 
-    if ( mpDoc->Get_Impl()->bHiddenLockedByAPI )
-    {
-        mpDoc->Get_Impl()->bHiddenLockedByAPI = FALSE;
-        mpDoc->OwnerLock(FALSE);
-    }
-    else if ( !mpDoc->Get_Impl()->bClosing )
+    if ( !mpDoc->Get_Impl()->bClosing )
         // GCC stuerzt ab, wenn schon im dtor, also vorher Flag abfragen
         mpDoc->DoClose();
 }
@@ -818,11 +813,33 @@ void SfxObjectShell::InitBasicManager_Impl()
 */
 
 {
+    /*  #163556# (DR) - Handling of recursive calls while creating the Bacic
+        manager.
+
+        It is possible that (while creating the Basic manager) the code that
+        imports the Basic storage wants to access the Basic manager again.
+        Especially in VBA compatibility mode, there is code that wants to
+        access the "VBA Globals" object which is stored as global UNO constant
+        in the Basic manager.
+
+        To achieve correct handling of the recursive calls of this function
+        from lcl_getBasicManagerForDocument(), the implementation of the
+        function BasicManagerRepository::getDocumentBasicManager() has been
+        changed to return the Basic manager currently under construction, when
+        called repeatedly.
+        
+        The variable pImp->bBasicInitialized will be set to sal_True after
+        construction now, to ensure that the recursive call of the function
+        lcl_getBasicManagerForDocument() will be routed into this function too.
+        
+        Calling BasicManagerHolder::reset() twice is not a big problem, as it
+        does not take ownership but stores only the raw pointer. Owner of all
+        Basic managers is the global BasicManagerRepository instance.
+     */
     DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicManager->isValid(), "Lokaler BasicManager bereits vorhanden");
-    pImp->bBasicInitialized = TRUE;
-
     pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) );
     DBG_ASSERT( pImp->pBasicManager->isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" );
+    pImp->bBasicInitialized = sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -848,7 +865,7 @@ SfxObjectShell* SfxObjectShell::GetObjectShell()
 
 //--------------------------------------------------------------------
 
-SEQUENCE< OUSTRING > SfxObjectShell::GetEventNames()
+uno::Sequence< ::rtl::OUString > SfxObjectShell::GetEventNames()
 {
     static uno::Sequence< ::rtl::OUString >* pEventNameContainer = NULL;
 
@@ -938,7 +955,7 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact )
     String aPrefix = String::CreateFromAscii( "private:factory/" );
     if ( aPrefix.Len() == aFact.Match( aPrefix ) )
         aFact.Erase( 0, aPrefix.Len() );
-    USHORT nPos = aFact.Search( '?' );
+    sal_uInt16 nPos = aFact.Search( '?' );
     String aParam;
     if ( nPos != STRING_NOTFOUND )
     {
@@ -1037,8 +1054,8 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte
 {
     uno::Sequence < beans::PropertyValue > aProps;
     TransformItems( SID_OPENDOC, rSet, aProps );
-    SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
-    SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
+    SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
+    SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False);
     ::rtl::OUString aURL;
     ::rtl::OUString aTarget(RTL_CONSTASCII_USTRINGPARAM("_blank"));
     if ( pFileNameItem )
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index b0bf446ce0..7f4b8bce87 100644..100755
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -591,14 +591,14 @@ void SfxOleFileTimeProperty::ImplSave( SvStream& rStrm )
 {
     DateTime aDateTimeUtc(
             Date(
-                static_cast< USHORT >( maDateTime.Day ),
-                static_cast< USHORT >( maDateTime.Month ),
-                static_cast< USHORT >( maDateTime.Year ) ),
+                static_cast< sal_uInt16 >( maDateTime.Day ),
+                static_cast< sal_uInt16 >( maDateTime.Month ),
+                static_cast< sal_uInt16 >( maDateTime.Year ) ),
             Time(
-                static_cast< ULONG >( maDateTime.Hours ),
-                static_cast< ULONG >( maDateTime.Minutes ),
-                static_cast< ULONG >( maDateTime.Seconds ),
-                static_cast< ULONG >( maDateTime.HundredthSeconds ) ) );
+                static_cast< sal_uIntPtr >( maDateTime.Hours ),
+                static_cast< sal_uIntPtr >( maDateTime.Minutes ),
+                static_cast< sal_uIntPtr >( maDateTime.Seconds ),
+                static_cast< sal_uIntPtr >( maDateTime.HundredthSeconds ) ) );
     // invalid time stamp is not converted to UTC
     // heuristic to detect editing durations (which we assume to be < 1 year):
     // check only the year, not the entire date
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 702369bfc1..702369bfc1 100644..100755
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 005ca6fe40..005ca6fe40 100644..100755
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index cb7c8100ef..6991aab6c7 100644..100755
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -106,7 +106,7 @@ throw( uno::RuntimeException )
 {
     uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
     if (!xPMgr.is() )
-        return FALSE;
+        return sal_False;
 
     if ( SvtMiscOptions().IsPluginsEnabled() )
     {
@@ -116,10 +116,10 @@ throw( uno::RuntimeException )
         pWin->SetBackground();
         pWin->Show();
 
-        ULONG nCount = maCmdList.Count();
+        sal_uIntPtr nCount = maCmdList.Count();
         uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount );
         ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray();
-        for( ULONG i = 0; i < nCount; i++ )
+        for( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SvCommand & rCmd = maCmdList.GetObject( i );
             pCmds[i] = rCmd.GetCommand();
@@ -137,7 +137,7 @@ throw( uno::RuntimeException )
             {
                 pWin->xWindow = xWindow;
                 pWin->Resize();
-                xWindow->setVisible( TRUE );
+                xWindow->setVisible( sal_True );
             }
 
             try
@@ -166,10 +166,10 @@ throw( uno::RuntimeException )
         // we must destroy the plugin before the parent is destroyed
         xWindow->addEventListener( this );
         xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
-        return mxPlugin.is() ? TRUE : FALSE;
+        return mxPlugin.is() ? sal_True : sal_False;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeException )
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 13f84459c8..4a1e6d3af4 100644..100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -54,7 +54,6 @@
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <osl/mutex.hxx>
-#include <svtools/printdlg.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 #include <sfx2/viewfrm.hxx>
@@ -346,7 +345,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
         // Name-Property?
         if ( rProp.Name.compareToAscii( "Name" ) == 0 )
         {
-            OUSTRING sTemp;
+            ::rtl::OUString sTemp;
             if ( ( rProp.Value >>= sTemp ) == sal_False )
                 throw ::com::sun::star::lang::IllegalArgumentException();
 
@@ -424,8 +423,8 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
             rtl::OUString aTmp;
             if ( ( rProp.Value >>= aTmp ) == sal_False )
                 throw ::com::sun::star::lang::IllegalArgumentException();
-            USHORT nCount = pPrinter->GetPaperBinCount();
-            for (USHORT nBin=0; nBin<nCount; nBin++)
+            sal_uInt16 nCount = pPrinter->GetPaperBinCount();
+            for (sal_uInt16 nBin=0; nBin<nCount; nBin++)
             {
                 ::rtl::OUString aName( pPrinter->GetPaperBinName(nBin) );
                 if ( aName == aTmp )
@@ -618,9 +617,9 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
         if ( rProp.Name.compareToAscii( "FileName" ) == 0 )
         {
             // unpack th URL and check for a valid and well known protocol
-            OUSTRING sTemp;
+            ::rtl::OUString sTemp;
             if (
-                ( rProp.Value.getValueType()!=::getCppuType((const OUSTRING*)0))  ||
+                ( rProp.Value.getValueType()!=::getCppuType((const ::rtl::OUString*)0))  ||
                 (!(rProp.Value>>=sTemp))
                )
             {
@@ -717,7 +716,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
         // Pages-Property
         else if ( rProp.Name.compareToAscii( "Pages" ) == 0 )
         {
-            OUSTRING sTemp;
+            ::rtl::OUString sTemp;
             if( rProp.Value >>= sTemp )
             {
                 aCheckedArgs[nProps].Name = rProp.Name;
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index 8149d7395c..8149d7395c 100644..100755
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index 7bf9ff54d9..d7a6afb78f 100644..100755
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -30,9 +30,9 @@
 #include "precompiled_sfx2.hxx"
 
 #include "querytemplate.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "doc.hrc"
-
+#include "helpid.hrc"
 #include <vcl/svapp.hxx>
 
 namespace sfx2
@@ -42,7 +42,7 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) :
     MessBox ( pParent, 0, Application::GetDisplayName(), rMessage )
 {
     SetImage( QueryBox::GetStandardImage() );
-    SetHelpId( MSG_QUERY_LOAD_TEMPLATE );
+    SetHelpId( HID_QUERY_LOAD_TEMPLATE );
 
     AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES,
             BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx
index ef7d06eb39..ef7d06eb39 100644..100755
--- a/sfx2/source/doc/querytemplate.hxx
+++ b/sfx2/source/doc/querytemplate.hxx
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index 0aa9cb9ddf..da29b7bae6 100644..100755
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include "sfxacldetect.hxx"
+
 
 #if EXTRA_ACL_CHECK
 
diff --git a/sfx2/source/doc/sfxacldetect.hxx b/sfx2/source/doc/sfxacldetect.hxx
index 40112f3b8b..40112f3b8b 100644..100755
--- a/sfx2/source/doc/sfxacldetect.hxx
+++ b/sfx2/source/doc/sfxacldetect.hxx
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 018f5195b2..f460ec946f 100644..100755
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -103,7 +103,7 @@
 //________________________________________________________________________________________________________
 
 #include <sfx2/sfxbasecontroller.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/sfxuno.hxx>
@@ -115,7 +115,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objuno.hxx>
 #include <sfx2/printer.hxx>
-#include <basmgr.hxx>
+#include <sfx2/basmgr.hxx>
 #include <sfx2/event.hxx>
 #include <eventsupplier.hxx>
 #include <sfx2/evntconf.hxx>
@@ -126,12 +126,13 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/fcontnr.hxx>
 #include "sfx2/docstoragemodifylistener.hxx"
-#include "brokenpackageint.hxx"
+#include "sfx2/brokenpackageint.hxx"
 #include "graphhelp.hxx"
+#include "docundomanager.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/DocumentMetadataAccess.hxx>
 
-#include <sfxresid.hxx>
+#include <sfx2/sfxresid.hxx>
 
 //________________________________________________________________________________________________________
 //	namespaces
@@ -150,6 +151,10 @@ using ::com::sun::star::lang::WrappedTargetException;
 using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::document::XDocumentRecovery;
+using ::com::sun::star::document::XUndoManager;
+using ::com::sun::star::document::XUndoAction;
+using ::com::sun::star::document::UndoFailedException;
+using ::com::sun::star::frame::XModel;
 
 /** This Listener is used to get notified when the XDocumentProperties of the
     XModel change.
@@ -218,15 +223,17 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
     sal_Bool                                                m_bSaving               ;
     sal_Bool                                                m_bSuicide              ;
     sal_Bool                                                m_bInitialized          ;
+    sal_Bool                                                m_bExternalTitle        ;
     sal_Bool                                                m_bModifiedSinceLastSave;
     uno::Reference< com::sun::star::view::XPrintable>       m_xPrintable            ;
     uno::Reference< script::provider::XScriptProvider >     m_xScriptProvider;
     uno::Reference< ui::XUIConfigurationManager >           m_xUIConfigurationManager;
     ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >   m_pStorageModifyListen;
-    ::rtl::OUString                                 m_sModuleIdentifier;
+    ::rtl::OUString                                         m_sModuleIdentifier;
     css::uno::Reference< css::frame::XTitle >               m_xTitleHelper;
     css::uno::Reference< css::frame::XUntitledNumbers >     m_xNumberedControllers;
-    uno::Reference< rdf::XDocumentMetadataAccess>   m_xDocumentMetadata;
+    uno::Reference< rdf::XDocumentMetadataAccess>           m_xDocumentMetadata;
+    ::rtl::Reference< ::sfx2::DocumentUndoManager >         m_pDocumentUndoManager;
 
 
     IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell )
@@ -238,11 +245,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
             ,   m_bSaving               ( sal_False     )
             ,   m_bSuicide              ( sal_False     )
             ,   m_bInitialized          ( sal_False     )
+            ,   m_bExternalTitle        ( sal_False     )
             ,   m_bModifiedSinceLastSave( sal_False     )
             ,	m_pStorageModifyListen	( NULL			)
             ,   m_xTitleHelper          ()
             ,   m_xNumberedControllers  ()
             ,   m_xDocumentMetadata     () // lazy
+            ,   m_pDocumentUndoManager  ()
     {
         // increase global instance counter.
         ++g_nInstanceCounter;
@@ -499,10 +508,10 @@ SfxSaveGuard::~SfxSaveGuard()
     m_pData->m_bSaving = sal_False;
 
     // m_bSuicide was set e.g. in case somewhere tried to close a document, while it was used for
-    // storing at the same time. Further m_bSuicide was set to TRUE only if close(TRUE) was called.
+    // storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called.
     // So the owner ship was delegated to the place where a veto exception was thrown.
     // Now we have to call close() again and delegate the owner ship to the next one, which
-    // cant accept that. Close(FALSE) cant work in this case. Because then the document will may be never closed ...
+    // cant accept that. Close(sal_False) cant work in this case. Because then the document will may be never closed ...
 
     if ( m_pData->m_bSuicide )
     {
@@ -783,6 +792,12 @@ void SAL_CALL SfxBaseModel::dispose() throw(::com::sun::star::uno::RuntimeExcept
         m_pData->m_pStorageModifyListen = NULL;
     }
 
+    if ( m_pData->m_pDocumentUndoManager.is() )
+    {
+        m_pData->m_pDocumentUndoManager->disposing();
+        m_pData->m_pDocumentUndoManager = NULL;
+    }
+
     lang::EventObject aEvent( (frame::XModel *)this );
     m_pData->m_aInterfaceContainer.disposeAndClear( aEvent );
 
@@ -982,6 +997,8 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const   ::rtl::OUString&
         aArgs.remove( "InputStream" );
         aArgs.remove( "URL" );
         aArgs.remove( "Frame" );
+        aArgs.remove( "Password" );
+        aArgs.remove( "EncryptionData" );
 
         // TODO/LATER: all the parameters that are accepted by ItemSet of the DocShell must be removed here
 
@@ -1183,6 +1200,51 @@ void SAL_CALL SfxBaseModel::disconnectController( const uno::Reference< frame::X
         m_pData->m_xCurrent = uno::Reference< frame::XController > ();
 }
 
+namespace
+{
+    typedef ::cppu::WeakImplHelper1< XUndoAction > ControllerLockUndoAction_Base;
+    class ControllerLockUndoAction : public ControllerLockUndoAction_Base
+    {
+    public:
+        ControllerLockUndoAction( const Reference< XModel >& i_model, const bool i_undoIsUnlock )
+            :m_xModel( i_model )
+            ,m_bUndoIsUnlock( i_undoIsUnlock )
+        {
+        }
+
+        // XUndoAction
+        virtual ::rtl::OUString SAL_CALL getTitle() throw (RuntimeException);
+        virtual void SAL_CALL undo(  ) throw (UndoFailedException, RuntimeException);
+        virtual void SAL_CALL redo(  ) throw (UndoFailedException, RuntimeException);
+
+    private:
+        const Reference< XModel >   m_xModel;
+        const bool                  m_bUndoIsUnlock;
+    };
+
+    ::rtl::OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException)
+    {
+        // this action is intended to be used within an UndoContext only, so nobody will ever see this title ...
+        return ::rtl::OUString();
+    }
+
+    void SAL_CALL ControllerLockUndoAction::undo(  ) throw (UndoFailedException, RuntimeException)
+    {
+        if ( m_bUndoIsUnlock )
+            m_xModel->unlockControllers();
+        else
+            m_xModel->lockControllers();
+    }
+
+    void SAL_CALL ControllerLockUndoAction::redo(  ) throw (UndoFailedException, RuntimeException)
+    {
+        if ( m_bUndoIsUnlock )
+            m_xModel->lockControllers();
+        else
+            m_xModel->unlockControllers();
+    }
+}
+
 //________________________________________________________________________________________________________
 //  frame::XModel
 //________________________________________________________________________________________________________
@@ -1192,6 +1254,14 @@ void SAL_CALL SfxBaseModel::lockControllers() throw(::com::sun::star::uno::Runti
     SfxModelGuard aGuard( *this );
 
     ++m_pData->m_nControllerLockCount ;
+
+    if  (   m_pData->m_pDocumentUndoManager.is()
+        &&  m_pData->m_pDocumentUndoManager->isInContext()
+        &&  !m_pData->m_pDocumentUndoManager->isLocked()
+        )
+    {
+        m_pData->m_pDocumentUndoManager->addUndoAction( new ControllerLockUndoAction( this, true ) );
+    }
 }
 
 //________________________________________________________________________________________________________
@@ -1203,6 +1273,14 @@ void SAL_CALL SfxBaseModel::unlockControllers() throw(::com::sun::star::uno::Run
     SfxModelGuard aGuard( *this );
 
     --m_pData->m_nControllerLockCount ;
+
+    if  (   m_pData->m_pDocumentUndoManager.is()
+        &&  m_pData->m_pDocumentUndoManager->isInContext()
+        &&  !m_pData->m_pDocumentUndoManager->isLocked()
+        )
+    {
+        m_pData->m_pDocumentUndoManager->addUndoAction( new ControllerLockUndoAction( this, false ) );
+    }
 }
 
 //________________________________________________________________________________________________________
@@ -1635,10 +1713,26 @@ void SAL_CALL SfxBaseModel::storeAsURL( const   ::rtl::OUString&
         uno::Sequence< beans::PropertyValue > aSequence ;
         TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence );
         attachResource( rURL, aSequence );
+
+#if OSL_DEBUG_LEVEL > 0
+        SFX_ITEMSET_ARG( m_pData->m_pObjectShell->GetMedium()->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False);
+        OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" );
+#endif
     }
 }
 
 //________________________________________________________________________________________________________
+//	XUndoManagerSupplier
+//________________________________________________________________________________________________________
+Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  ) throw (RuntimeException)
+{
+    SfxModelGuard aGuard( *this );
+    if ( !m_pData->m_pDocumentUndoManager.is() )
+        m_pData->m_pDocumentUndoManager.set( new ::sfx2::DocumentUndoManager( *this ) );
+    return m_pData->m_pDocumentUndoManager.get();
+}
+
+//________________________________________________________________________________________________________
 //	XStorable
 //________________________________________________________________________________________________________
 
@@ -1783,13 +1877,12 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
             if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() )
             {
                 ::rtl::OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, FALSE );
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False );
                 if ( !pRepairItem || !pRepairItem->GetValue() )
                 {
-                    RequestPackageReparation* pRequest = new RequestPackageReparation( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pRequest );
-                    xHandler->handle( xRequest );
-                    if( pRequest->isApproved() )
+                    RequestPackageReparation aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
+                    if( aRequest.isApproved() )
                     {
                         // broken package: try second loading and allow repair
                         pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) );
@@ -1809,9 +1902,8 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
                 if ( nError == ERRCODE_IO_BROKENPACKAGE )
                 {
                     // repair either not allowed or not successful
-                    NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocName );
-                    com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest > xRequest ( pNotifyRequest );
-                       xHandler->handle( xRequest );
+                    NotifyBrokenPackage aRequest( aDocName );
+                    xHandler->handle( aRequest.GetRequest() );
                 }
             }
         }
@@ -1844,12 +1936,12 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
 
         if ( nError )
         {
-            BOOL bSilent = FALSE;
+            sal_Bool bSilent = sal_False;
             SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
             if( pSilentItem )
                 bSilent = pSilentItem->GetValue();
 
-              BOOL bWarning = ((nError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
+              sal_Bool bWarning = ((nError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK);
             if ( nError != ERRCODE_IO_BROKENPACKAGE && !bSilent )
             {
                 // broken package was handled already
@@ -1875,10 +1967,15 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
             }
         }
 
-        BOOL bHidden = FALSE;
+        sal_Bool bHidden = sal_False;
         SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN, sal_False);
         if ( pHidItem )
             bHidden = pHidItem->GetValue();
+
+#if OSL_DEBUG_LEVEL > 0
+        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False);
+        OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" );
+#endif
         // !TODO: will be done by Framework!
         pMedium->SetUpdatePickList( !bHidden );
     }
@@ -1919,7 +2016,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
                 aDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapUnit, MAP_100TH_MM );
                 aDesc.maDragStartPos = Point();
                 aDesc.maDisplayName = String();
-                aDesc.mbCanLink = FALSE;
+                aDesc.mbCanLink = sal_False;
 
                 SvMemoryStream aMemStm( 1024, 1024 );
                 aMemStm << aDesc;
@@ -1935,7 +2032,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
                 try
                 {
                     utl::TempFile aTmp;
-                    aTmp.EnableKillingFile( TRUE );
+                    aTmp.EnableKillingFile( sal_True );
                     storeToURL( aTmp.GetURL(), uno::Sequence < beans::PropertyValue >() );
                     SvStream* pStream = aTmp.GetStream( STREAM_READ );
                     const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
@@ -2361,6 +2458,32 @@ void SAL_CALL SfxBaseModel::removeEventListener( const uno::Reference< XDOCEVENT
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0), aListener );
 }
 
+//--------------------------------------------------------------------------------------------------------
+//	XDocumentEventBroadcaster
+//--------------------------------------------------------------------------------------------------------
+// ---------------------------------
+void SAL_CALL SfxBaseModel::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& aListener )
+    throw ( uno::RuntimeException )
+{
+    SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
+    m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< document::XDocumentEventListener >*)0), aListener );
+}
+
+// ---------------------------------
+void SAL_CALL SfxBaseModel::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& aListener )
+    throw ( uno::RuntimeException )
+{
+    SfxModelGuard aGuard( *this );
+    m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference< document::XDocumentEventListener >*)0), aListener );
+}
+
+// ---------------------------------
+void SAL_CALL SfxBaseModel::notifyDocumentEvent( const ::rtl::OUString&, const uno::Reference< frame::XController2 >&, const uno::Any& )
+    throw ( lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException )
+{
+    throw lang::NoSupportException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SfxBaseModel controlls all the sent notifications itself!" ) ), uno::Reference< uno::XInterface >() );
+}
+
 //________________________________________________________________________________________________________
 //	SfxListener
 //________________________________________________________________________________________________________
@@ -2499,7 +2622,9 @@ void SfxBaseModel::Notify(			SfxBroadcaster&	rBC		,
             break;
             }
 
-            postEvent_Impl( pNamedHint->GetEventName() );
+
+            SfxViewEventHint* pViewHint = PTR_CAST( SfxViewEventHint, &rHint );
+            postEvent_Impl( pNamedHint->GetEventName(), pViewHint ? pViewHint->GetController() : uno::Reference< frame::XController2 >() );
         }
 
         if ( pSimpleHint )
@@ -2574,11 +2699,6 @@ SfxObjectShell* SfxBaseModel::impl_getObjectShell() const
 //	public impl.
 //________________________________________________________________________________________________________
 
-sal_Bool SfxBaseModel::IsDisposed() const
-{
-    return ( m_pData == NULL ) ;
-}
-
 sal_Bool SfxBaseModel::IsInitialized() const
 {
     if ( !m_pData || !m_pData->m_pObjectShell )
@@ -2590,6 +2710,14 @@ sal_Bool SfxBaseModel::IsInitialized() const
     return m_pData->m_pObjectShell->GetMedium() != NULL;
 }
 
+void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const
+{
+    if ( impl_isDisposed() )
+        throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) );
+    if ( i_mustBeInitialized && !IsInitialized() )
+        throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) );
+}
+
 sal_Bool SfxBaseModel::impl_isDisposed() const
 {
     return ( m_pData == NULL ) ;
@@ -2640,49 +2768,41 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
                     aArgHash.erase( aFilterString );
                     aArgHash.erase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
 
-                    // if the password is changed SaveAs should be done
-                    // no password for encrypted document is also a change here
-                    sal_Bool bPassChanged = sal_False;
-
-                    ::comphelper::SequenceAsHashMap::iterator aNewPassIter
-                        = aArgHash.find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ) );
-                    SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False );
-                    if ( pPasswordItem && aNewPassIter != aArgHash.end() )
+                    try
                     {
-                        ::rtl::OUString aNewPass;
-                        aNewPassIter->second >>= aNewPass;
-                        bPassChanged = !aNewPass.equals( pPasswordItem->GetValue() );
+                        storeSelf( aArgHash.getAsConstPropertyValueList() );
+                        bSaved = sal_True;
                     }
-                    else if ( pPasswordItem || aNewPassIter != aArgHash.end() )
-                        bPassChanged = sal_True;
-
-                    if ( !bPassChanged )
+                    catch( const lang::IllegalArgumentException& )
                     {
-                        try
+                        // some additional arguments do not allow to use saving, SaveAs should be done
+                        // but only for normal documents, the shared documents would be overwritten in this case
+                        // that would mean an information loss
+                        // TODO/LATER: need a new interaction for this case
+                        if ( m_pData->m_pObjectShell->IsDocShared() )
                         {
-                            storeSelf( aArgHash.getAsConstPropertyValueList() );
-                            bSaved = sal_True;
-                        }
-                        catch( const lang::IllegalArgumentException& )
-                        {
-                            // some additional arguments do not allow to use saving, SaveAs should be done
-                            // but only for normal documents, the shared documents would be overwritten in this case
-                            // that would mean an information loss
-                            // TODO/LATER: need a new interaction for this case
-                            if ( m_pData->m_pObjectShell->IsDocShared() )
+                            m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't store shared document!" ) ) );
+                            m_pData->m_pObjectShell->StoreLog();
+
+                            uno::Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionData" ) ), uno::Sequence< beans::NamedValue >() );
+                            if ( !aNewEncryptionData.getLength() )
                             {
-                                m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't store shared document!" ) ) );
-                                m_pData->m_pObjectShell->StoreLog();
+                                ::rtl::OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Password" ) ), ::rtl::OUString() );
+                                aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword );
+                            }
 
+                            uno::Sequence< beans::NamedValue > aOldEncryptionData;
+                            GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData );
+
+                            if ( !aOldEncryptionData.getLength() && !aNewEncryptionData.getLength() )
                                 throw;
+                            else
+                            {
+                                // if the password is changed a special error should be used in case of shared document
+                                throw task::ErrorCodeIOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change password for shared document." ) ), uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE );
                             }
                         }
                     }
-                    else if ( m_pData->m_pObjectShell->IsDocShared() )
-                    {
-                        // if the password is changed a special error should be used in case of shared document
-                        throw task::ErrorCodeIOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change password for shared document." ) ), uno::Reference< uno::XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE );
-                    }
                 }
             }
         }
@@ -2839,8 +2959,32 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
 }
 
 //********************************************************************************************************
+namespace {
+template< typename ListenerT, typename EventT >
+class NotifySingleListenerIgnoreRE
+{
+private:
+    typedef void ( SAL_CALL ListenerT::*NotificationMethod )( const EventT& );
+    NotificationMethod  m_pMethod;
+    const EventT&       m_rEvent;
+public:
+    NotifySingleListenerIgnoreRE( NotificationMethod method, const EventT& event ) : m_pMethod( method ), m_rEvent( event ) { }
 
-void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
+    void operator()( const uno::Reference<ListenerT>& listener ) const
+    {
+        try
+        {
+            (listener.get()->*m_pMethod)( m_rEvent );
+        }
+        catch( uno::RuntimeException& )
+        {
+            // this exception is ignored to avoid problems with invalid listeners, the listener should be probably thrown away in future
+        }
+    }
+};
+} // anonymous namespace
+
+void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const uno::Reference< frame::XController2 >& xController )
 {
     // object already disposed?
     if ( impl_isDisposed() )
@@ -2850,34 +2994,41 @@ void SfxBaseModel::postEvent_Impl( ::rtl::OUString aName )
     if (!aName.getLength())
         return;
 
-    ::cppu::OInterfaceContainerHelper* pIC = m_pData->m_aInterfaceContainer.getContainer(
-                                        ::getCppuType((const uno::Reference< XDOCEVENTLISTENER >*)0) );
-    if( pIC )
+    ::cppu::OInterfaceContainerHelper* pIC =
+        m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const uno::Reference< document::XDocumentEventListener >*)0 ) );
+    if ( pIC )
+    {
+#ifdef DBG_UTIL
+        ByteString aTmp( "SfxDocumentEvent: " );
+        aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
+        DBG_TRACE( aTmp.GetBuffer() );
+#endif
 
+        document::DocumentEvent aDocumentEvent( (frame::XModel*)this, aName, xController, uno::Any() );
+
+        pIC->forEach< document::XDocumentEventListener, NotifySingleListenerIgnoreRE< document::XDocumentEventListener, document::DocumentEvent > >(
+            NotifySingleListenerIgnoreRE< document::XDocumentEventListener, document::DocumentEvent >(
+                &document::XDocumentEventListener::documentEventOccured,
+                aDocumentEvent ) );
+    }
+
+    pIC = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ) );
+    if ( pIC )
     {
 #ifdef DBG_UTIL
-        ByteString aTmp( "SfxEvent: ");
+        ByteString aTmp( "SfxEvent: " );
         aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
         DBG_TRACE( aTmp.GetBuffer() );
 #endif
-        document::EventObject aEvent( (frame::XModel *)this, aName );
-        ::cppu::OInterfaceContainerHelper aIC( m_aMutex );
-        uno::Sequence < uno::Reference < uno::XInterface > > aElements = pIC->getElements();
-        for ( sal_Int32 nElem=0; nElem<aElements.getLength(); nElem++ )
-            aIC.addInterface( aElements[nElem] );
-        ::cppu::OInterfaceIteratorHelper aIt( aIC );
-        while( aIt.hasMoreElements() )
-        {
-            try
-            {
-                ((XDOCEVENTLISTENER *)aIt.next())->notifyEvent( aEvent );
-            }
-            catch( uno::RuntimeException& )
-            {
-                aIt.remove();
-            }
-        }
+
+        document::EventObject aEvent( (frame::XModel*)this, aName );
+
+        pIC->forEach< document::XEventListener, NotifySingleListenerIgnoreRE< document::XEventListener, document::EventObject > >(
+            NotifySingleListenerIgnoreRE< document::XEventListener, document::EventObject >(
+                &document::XEventListener::notifyEvent,
+                aEvent ) );
     }
+
 }
 
 uno::Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(::com::sun::star::uno::RuntimeException)
@@ -2912,7 +3063,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData()
         for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell ); pFrame;
                 pFrame = SfxViewFrame::GetNext( *pFrame, m_pData->m_pObjectShell ) )
         {
-            BOOL bIsActive = ( pFrame == pActFrame );
+            sal_Bool bIsActive = ( pFrame == pActFrame );
             pFrame->GetViewShell()->WriteUserDataSequence( aSeq );
             aAny <<= aSeq;
             xCont->insertByIndex( bIsActive ? 0 : nCount, aAny );
@@ -3179,7 +3330,7 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, uno::Reference< contai
                     rtl::OUString aSlot( aCommand.copy( 5 ));
 
                     // We have to replace the old "slot-Command" with our new ".uno:-Command"
-                    const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( USHORT( aSlot.toInt32() ));
+                    const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( sal_uInt16( aSlot.toInt32() ));
                     if ( pSlot )
                     {
                         rtl::OUStringBuffer aStrBuf( aUnoCmd );
@@ -3250,7 +3401,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
                     uno::Reference< lang::XMultiServiceFactory > xServiceMgr( ::comphelper::getProcessServiceFactory() );
                     uno::Sequence< uno::Reference< container::XIndexContainer > > rToolbars;
 
-                    sal_Bool bImported = UIConfigurationImporterOOo1x::ImportCustomToolbars(
+                    sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars(
                                             xNewUIConfMan, rToolbars, xServiceMgr, xOOo1ConfigStorage );
                     if ( bImported )
                     {
@@ -3414,12 +3565,12 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const uno::Reference< XSTORAGE >& x
     pMedium->GetItemSet()->Put( aSet );
 
     // allow to use an interactionhandler (if there is one)
-    pMedium->UseInteractionHandler( TRUE );
+    pMedium->UseInteractionHandler( sal_True );
 
     SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False);
-    BOOL bTemplate = pTemplateItem && pTemplateItem->GetValue();
+    sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
     m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC );
-    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE;
+    m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False;
 
     // load document
     if ( !m_pData->m_pObjectShell->DoLoad(pMedium) )
@@ -3472,11 +3623,11 @@ void SAL_CALL SfxBaseModel::storeToStorage( const uno::Reference< XSTORAGE >& xS
 
         // BaseURL is part of the ItemSet
         SfxMedium aMedium( xStorage, String(), &aSet );
-        aMedium.CanDisposeStorage_Impl( FALSE );
+        aMedium.CanDisposeStorage_Impl( sal_False );
         if ( aMedium.GetFilter() )
         {
             // storing without a valid filter will often crash
-            bSuccess = m_pData->m_pObjectShell->DoSaveObjectAs( aMedium, TRUE );
+            bSuccess = m_pData->m_pObjectShell->DoSaveObjectAs( aMedium, sal_True );
             m_pData->m_pObjectShell->DoSaveCompleted( NULL );
         }
     }
@@ -3646,7 +3797,7 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
     SfxModelGuard aGuard( *this );
 
     ::rtl::OUString aResult = impl_getTitleHelper()->getTitle ();
-    if ( m_pData->m_pObjectShell )
+    if ( !m_pData->m_bExternalTitle && m_pData->m_pObjectShell )
     {
         SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
         if ( pMedium )
@@ -3656,7 +3807,7 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
                 aResult += String( SfxResId(STR_REPAIREDDOCUMENT) );
         }
 
-        if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (m_pData->m_pObjectShell->GetMedium() && m_pData->m_pObjectShell->GetMedium()->IsReadOnly()) )
+        if ( m_pData->m_pObjectShell->IsReadOnlyUI() || (pMedium && pMedium->IsReadOnly()) )
             aResult += ::rtl::OUString( String( SfxResId(STR_READONLY) ) );
         else if ( m_pData->m_pObjectShell->IsDocShared() )
             aResult += ::rtl::OUString( String( SfxResId(STR_SHARED) ) );
@@ -3677,6 +3828,7 @@ void SAL_CALL SfxBaseModel::setTitle( const ::rtl::OUString& sTitle )
     SfxModelGuard aGuard( *this );
 
     impl_getTitleHelper()->setTitle (sTitle);
+    m_pData->m_bExternalTitle = sal_True;
 }
 
 //=============================================================================
@@ -3848,9 +4000,9 @@ namespace sfx { namespace intern {
 SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
 {
     SfxViewFrame* pViewFrame = NULL;
-    for (   pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), FALSE );
+    for (   pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), sal_False );
             pViewFrame;
-            pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), FALSE )
+            pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), sal_False )
         )
     {
         if ( pViewFrame->GetFrame().GetFrameInterface() == i_rFrame )
@@ -3957,18 +4109,18 @@ css::uno::Reference< css::frame::XController2 > SAL_CALL SfxBaseModel::createVie
     // some initial view settings, coming from our most recent attachResource call
     ::comphelper::NamedValueCollection aDocumentLoadArgs( getArgs() );
     if ( aDocumentLoadArgs.getOrDefault( "ViewOnly", false ) )
-        pViewFrame->GetFrame().SetMenuBarOn_Impl( FALSE );
+        pViewFrame->GetFrame().SetMenuBarOn_Impl( sal_False );
 
     const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode == 1 )
     {
-        pViewFrame->ForceOuterResize_Impl( FALSE );
-        pViewFrame->GetBindings().HidePopups( TRUE );
+        pViewFrame->ForceOuterResize_Impl( sal_False );
+        pViewFrame->GetBindings().HidePopups( sal_True );
 
         SfxFrame& rFrame = pViewFrame->GetFrame();
         // MBA: layoutmanager of inplace frame starts locked and invisible
-        rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( FALSE );
-        rFrame.GetWorkWindow_Impl()->Lock_Impl( TRUE );
+        rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( sal_False );
+        rFrame.GetWorkWindow_Impl()->Lock_Impl( sal_True );
 
         rFrame.GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
         pViewFrame->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
@@ -4270,4 +4422,17 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     return xDMA->storeMetadataToMedium(i_rMedium);
 }
 
+// =====================================================================================================================
+// = SfxModelSubComponent
+// =====================================================================================================================
+
+SfxModelSubComponent::~SfxModelSubComponent()
+{
+}
+
+void SfxModelSubComponent::disposing()
+{
+    // nothing to do here
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index 2b7c114484..2b7c114484 100644..100755
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
diff --git a/sfx2/source/doc/syspath.cxx b/sfx2/source/doc/syspath.cxx
index 68a1f8f474..68a1f8f474 100644..100755
--- a/sfx2/source/doc/syspath.cxx
+++ b/sfx2/source/doc/syspath.cxx
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index cd283bcb62..cd283bcb62 100644..100755
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx
index 6fc5b093d1..f0e41aca00 100644..100755
--- a/sfx2/source/doc/syspathw32.cxx
+++ b/sfx2/source/doc/syspathw32.cxx
@@ -26,6 +26,10 @@
 *
 ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+
 #ifdef WNT
 #ifdef _MSC_VER
 #pragma warning(disable:4917) 
diff --git a/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk
deleted file mode 100644
index 75a15ebdb8..0000000000
--- a/sfx2/source/explorer/makefile.mk
+++ /dev/null
@@ -1,47 +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=sfx2
-TARGET=explorer
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-                $(SLO)$/nochaos.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index dedac405ff..bb31f219df 100644..100755
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -73,7 +73,7 @@ public:
 class CntItemPool: public SfxItemPool
 {
     static CntItemPool* _pThePool;
-    USHORT              _nRefs;
+    sal_uInt16              _nRefs;
 
 protected:
              CntItemPool();
@@ -81,7 +81,7 @@ protected:
 
 public:
     static CntItemPool* Acquire();
-    static USHORT 		Release();
+    static sal_uInt16 		Release();
 };
 
 //----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ SfxItemPool* NoChaos::GetItemPool()
 
 //----------------------------------------------------------------------------
 // static
-USHORT NoChaos::ReleaseItemPool()
+sal_uInt16 NoChaos::ReleaseItemPool()
 {
     // Release CHAOS item pool.
     return CntItemPool::Release();
diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx
index 27ae280fd6..27ae280fd6 100644..100755
--- a/sfx2/source/inc/SfxDocumentMetaData.hxx
+++ b/sfx2/source/inc/SfxDocumentMetaData.hxx
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index 53300e2cd3..53300e2cd3 100644..100755
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 2fea537d06..c4a0050496 100644..100755
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -37,7 +37,7 @@ class SbxObject;
 //=========================================================================
 
 SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
-                   const char *pName, ULONG nSID, SbxDataType eType=SbxOBJECT,
+                   const char *pName, sal_uIntPtr nSID, SbxDataType eType=SbxOBJECT,
                    SbxClassType = SbxCLASS_PROPERTY );
 
 
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 6a38048702..6a38048702 100644..100755
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 8df0e41c35..ce5a20d452 100644..100755
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -116,7 +116,6 @@ public:
 
     // global pointers
     SfxItemPool*                        pPool;
-    SfxEventConfiguration*              pEventConfig;
     SvUShorts*                          pDisabledSlotList;
     SvStrings*                          pSecureURLs;
     SvtSaveOptions*                     pSaveOptions;
@@ -127,12 +126,11 @@ public:
     SfxProgress*                        pProgress;
     ISfxTemplateCommon*                 pTemplateCommon;
 
-    USHORT                              nDocModalMode;              // counts documents in modal mode
-    USHORT                              nAutoTabPageId;
-    USHORT                              nBasicCallLevel;
-    USHORT                              nRescheduleLocks;
-    USHORT                              nInReschedule;
-    USHORT                              nAsynchronCalls;
+    sal_uInt16                              nDocModalMode;              // counts documents in modal mode
+    sal_uInt16                              nAutoTabPageId;
+    sal_uInt16                              nRescheduleLocks;
+    sal_uInt16                              nInReschedule;
+    sal_uInt16                              nAsynchronCalls;
 
     rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow;
 
@@ -154,19 +152,19 @@ public:
     SfxDispatcher*              pAppDispat;     // Dispatcher falls kein Doc
     SfxInterface**              pInterfaces;
 
-    USHORT                      nDocNo;     		// Laufende Doc-Nummer (AutoName)
-    USHORT                      nInterfaces;
+    sal_uInt16                      nDocNo;     		// Laufende Doc-Nummer (AutoName)
+    sal_uInt16                      nInterfaces;
 
-    BOOL                        bDispatcherLocked:1;    // nichts ausf"uhren
-    BOOL                        bDowning:1;   // TRUE ab Exit und danach
-    BOOL                        bInQuit : 1;
-    BOOL                        bInvalidateOnUnlock : 1;
-    BOOL                        bODFVersionWarningLater : 1;
+    sal_Bool                        bDispatcherLocked:1;    // nichts ausf"uhren
+    sal_Bool                        bDowning:1;   // sal_True ab Exit und danach
+    sal_Bool                        bInQuit : 1;
+    sal_Bool                        bInvalidateOnUnlock : 1;
+    sal_Bool                        bODFVersionWarningLater : 1;
 
                                 SfxAppData_Impl( SfxApplication* );
                                 ~SfxAppData_Impl();
 
-    void                        UpdateApplicationSettings( BOOL bDontHide );
+    void                        UpdateApplicationSettings( sal_Bool bDontHide );
     SfxDocumentTemplates*       GetDocumentTemplates();
     void                        DeInitDDE();
 
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
deleted file mode 100644
index aee86797b0..0000000000
--- a/sfx2/source/inc/applet.hxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SFX_APPLET_HXX
-#define _SFX_APPLET_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <cppuhelper/implbase6.hxx>
-
-#include <rtl/ustring.hxx>
-#include <svl/ownlist.hxx>
-#include <svl/itemprop.hxx>
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-    class XInterface;
-} } } }
-
-class SjApplet2;
-namespace sfx2
-{
-
-class AppletObject : public ::cppu::WeakImplHelper6 <
-        com::sun::star::util::XCloseable,
-        com::sun::star::lang::XEventListener,
-        com::sun::star::frame::XSynchronousFrameLoader,
-        com::sun::star::ui::dialogs::XExecutableDialog,
-        com::sun::star::lang::XInitialization,
-        com::sun::star::beans::XPropertySet >
-{
-    com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >
-        mxContext;
-    com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj;
-    SfxItemPropertyMap  maPropMap;
-    SvCommandList       maCmdList;
-    ::rtl::OUString     maClass;
-    ::rtl::OUString     maName;
-    ::rtl::OUString     maCodeBase;
-    ::rtl::OUString     maDocBase;
-    SjApplet2*          mpApplet;
-    sal_Bool            mbMayScript;
-
-    AppletObject( AppletObject & ); // not defined
-    void operator =( AppletObject & ); // not defined
-
-                        AppletObject( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rContext );
-                        ~AppletObject();
-
-    virtual sal_Bool SAL_CALL load( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& lDescriptor,
-            const com::sun::star::uno::Reference < com::sun::star::frame::XFrame >& xFrame ) throw( com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL cancel() throw( com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ;
-    virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::sal_Bool SAL_CALL supportsService(
-        const ::rtl::OUString& sServiceName )
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
-
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >
-    impl_getStaticSupportedServiceNames();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-    SAL_CALL impl_createInstance(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::uno::XComponentContext >& xContext )
-        throw( ::com::sun::star::uno::Exception );
-
-public:
-    static ::rtl::OUString impl_getStaticImplementationName();
-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-    impl_createFactory();
-};
-
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index b1d9a61da7..b1d9a61da7 100644..100755
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
new file mode 100755
index 0000000000..9b37671662
--- /dev/null
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef DOCUMENT_UNDO_MANAGER_HXX
+#define DOCUMENT_UNDO_MANAGER_HXX
+
+#include "sfx2/sfxbasemodel.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/document/XUndoManager.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace svl
+{
+    class IUndoManager;
+}
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= DocumentUndoManager
+    //==================================================================================================================
+    typedef ::cppu::ImplHelper1 <   ::com::sun::star::document::XUndoManager
+                                >   DocumentUndoManager_Base;
+    struct DocumentUndoManager_Impl;
+    class DocumentUndoManager   :public DocumentUndoManager_Base
+                                ,public SfxModelSubComponent
+                                ,public ::boost::noncopyable
+    {
+        friend struct DocumentUndoManager_Impl;
+
+    public:
+        DocumentUndoManager( SfxBaseModel& i_document );
+        virtual ~DocumentUndoManager();
+
+        // SfxModelSubComponent overridables
+        virtual void    disposing();
+
+        // non-UNO API for our owner
+        /** determines whether we have an open Undo context. No mutex locking within this method, no disposal check - this
+            is the responsibility of the owner.
+        */
+        bool    isInContext() const;
+
+        // XInterface
+        virtual void SAL_CALL acquire(  ) throw ();
+        virtual void SAL_CALL release(  ) throw ();
+
+        // XUndoManager
+        virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL enterHiddenUndoContext(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL leaveUndoContext(  ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isUndoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isRedoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clear(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clearRedo(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL reset(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XLockable, base of XUndoManager
+        virtual void SAL_CALL lock(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL unlock(  ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isLocked(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XChild, base of XUndoManager
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+    private:
+        ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
+
+#endif // DOCUMENT_UNDO_MANAGER_HXX
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 4bee9a24bd..66643e8cb6 100644..100755
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -58,6 +58,11 @@
 #include <svl/lstner.hxx>
 #include <unotools/eventcfg.hxx>
 
+namespace comphelper
+{
+    class NamedValueCollection;
+}
+
 //--------------------------------------------------------------------------------------------------------
 
 #define NOSUCHELEMENTEXCEPTION		::com::sun::star::container::NoSuchElementException
@@ -126,8 +131,12 @@ public:
     virtual void SAL_CALL		disposing( const EVENTOBJECT& Source )
                                     throw( RUNTIMEEXCEPTION );
 
-    static SvxMacro*            ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, BOOL bBlowUp );
-    static void					BlowUpMacro( const ANY& rIn, ANY& rOut, SfxObjectShell* pDoc );
+    static SvxMacro*            ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro );
+    static void					NormalizeMacro( const ANY& rIn, ANY& rOut, SfxObjectShell* pDoc );
+    static void					NormalizeMacro(
+                                    const ::comphelper::NamedValueCollection& i_eventDescriptor,
+                                    ::comphelper::NamedValueCollection& o_normalizedDescriptor,
+                                    SfxObjectShell* i_document );
 };
 
 //=============================================================================
diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx
index 6d82667441..dfc68ba3ed 100644..100755
--- a/sfx2/source/inc/fltfnc.hxx
+++ b/sfx2/source/inc/fltfnc.hxx
@@ -30,7 +30,7 @@
 
 #include <sfx2/fcontnr.hxx>
 
-BOOL SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
+sal_Bool SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
 
 #endif
 
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index f8e32d1c4f..d3ae2d1b57 100644..100755
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -25,15 +25,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef SFX2_FLTOPTINT_HXX
+#define SFX2_FLTOPTINT_HXX
 
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
 
-using namespace ::framework;
+//using namespace ::framework;
  
-class FilterOptionsContinuation : public ContinuationBase< ::com::sun::star::document::XInteractionFilterOptions >
+class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::star::document::XInteractionFilterOptions >
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties;
 
@@ -50,7 +52,7 @@ class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::t
                     ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > 
                 > m_lContinuations;
         
-    ContinuationAbort*	m_pAbort;
+    comphelper::OInteractionAbort*  m_pAbort;
         
     FilterOptionsContinuation*	m_pOptions;
 
@@ -58,7 +60,7 @@ public:
     RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel,
                               ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties );
     
-    sal_Bool	isAbort() { return m_pAbort->isSelected(); }
+    sal_Bool    isAbort() { return m_pAbort->wasSelected(); }
         
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions()
     {
@@ -74,4 +76,5 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 };  
 
+#endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index a9761f4eb3..93389a87d7 100644..100755
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -67,7 +67,7 @@ public:
 
     static sal_Bool				MakeFolder( const String& rFolder );
     static ErrCode				QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes );
-    static ULONG				GetSize( const String& rContent );
+    static sal_uIntPtr				GetSize( const String& rContent );
 
     // please don't use this!
     static sal_Bool				Exists( const String& rContent );
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index b1c39a2cef..0e96396065 100755
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -28,342 +28,313 @@
 #define _SFX_HELPID_HRC
 
 // include ------------------------------------------------------------------
-
-#include <svl/solar.hrc>
+ 
+#include <sfx2/sfxcommands.h>
 
 // Help-Ids -----------------------------------------------------------------
 
-#define HID_GLOBAL_FALLBACK							0xFFFFFFFF
-
-#define HID_FILTER_SELECT							(HID_SFX_START +   0)
-#define HID_USERDEFBMP   							(HID_SFX_START +   1)
-#define HID_DOCINFO_EDT     						(HID_SFX_START +   2)
-#define HID_PASSWD          						(HID_SFX_START +   3)
-#define HID_PRINTMONITOR    						(HID_SFX_START +   4)
-#define HID_CONFIG_OBJECTBAR						(HID_SFX_START +   5)
-#define HID_MANAGE_STYLES      						(HID_SFX_START +   6)
-#define HID_CONFIG_EVENT       						(HID_SFX_START +   7)
-#define HID_DOCINFODESC       						(HID_SFX_START +   8)
-#define HID_DOCINFODOC       						(HID_SFX_START +   9)
-#define HID_DOCINFOUSER       						(HID_SFX_START +  10)
-#define HID_DOCINFOSECURITY                         (HID_SFX_START +  11)
-#define HID_BOOKMARKPROPS                           (HID_SFX_START +  14)
-#define HID_BOOKGROUPPROPS                          (HID_SFX_START +  15)
-#define HID_BOOKFILEPROPS                           (HID_SFX_START +  16)
-#define HID_NEWS_SERVERPROPS                        (HID_SFX_START +  20)
-#define HID_NEWS_RULEPAGE                          	(HID_SFX_START +  21)
-#define HID_MAILINTRAYPROPS                         (HID_SFX_START +  23)
-#define HID_DOCINFORELOAD      						(HID_SFX_START +  24)
-#define HID_NEWS_GROUPPAGE                          (HID_SFX_START +  25)
-#define HID_NEWS_SERVERPAGE                         (HID_SFX_START +  26)
-#define HID_FILEDLG_STANDARD                        (HID_SFX_START +  27)
-#define HID_FILEDLG_MANAGER                         (HID_SFX_START +  28)
-#define HID_FILEDLG_URL                             (HID_SFX_START +  29)
-#define HID_FILEDLG_FILE                            (HID_SFX_START +  30)
-#define HID_FILEDLG_USE_PASSWD                      (HID_SFX_START +  31)
-#define HID_FILEDLG_READ_ONLY                       (HID_SFX_START +  32)
-#define HID_EXPLORERCONTROL							(HID_SFX_START +  33)
-#define HID_BROWSERCONTROL							(HID_SFX_START +  34)
-#define HID_CTL_ORGANIZER_LEFT						(HID_SFX_START +  35)
-#define HID_CTL_ORGANIZER_RIGHT						(HID_SFX_START +  36)
-#define HID_EXPLMAILSRV_GENERAL_PAGE				(HID_SFX_START +  37)
-#define HID_EXPLMAILSRV_PROTOCOL_PAGE				(HID_SFX_START +  38)
-#define HID_EXPLMAILSRV_DATAMATCH_PAGE              (HID_SFX_START +  39)
-#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE            (HID_SFX_START +  40)
-#define HID_EXPLMAIL_GENERAL_PAGE                   (HID_SFX_START +  41)
-#define HID_NEWS_CTL_RULES							(HID_SFX_START +  42)
-#define HID_NEWS_CTL_GROUPS							(HID_SFX_START +  43)
-#define HID_CONFIG_OBJECTBAR_CTL					(HID_SFX_START +  44)
-#define HID_NEWS_QUICKSEARCH						(HID_SFX_START +  45)
-#define HID_NEWS_SERVERVIEWPROPS					(HID_SFX_START +  46)
-#define HID_NEWS_SHOWARTICLEPROPS					(HID_SFX_START +  47)
-#define HID_NEWS_SHOWGROUPPROPS						(HID_SFX_START +  48)
-#define HID_NEWS_USER								(HID_SFX_START +  49)
-#define HID_MULTISELECTION_GENERAL_PAGE				(HID_SFX_START +  50)
-#define HID_LINK_GENERAL_PAGE						(HID_SFX_START +  51)
-#define HID_LINK_ADDRESS_PAGE						(HID_SFX_START +  52)
-#define HID_FOLDER_GENERAL_PAGE						(HID_SFX_START +  53)
-#define HID_FILE_GENERAL_PAGE						(HID_SFX_START +  54)
-#define HID_FTP_GENERAL_PAGE						(HID_SFX_START +  55)
-#define HID_PRINT_OPTIONS   						(HID_SFX_START +  56)
-#define HID_PREVIEW_FRAME   						(HID_SFX_START +  57)
-#define HID_DOCINFO_FRAME   						(HID_SFX_START +  58)
-#define HID_EXPLORER_FRAME  						(HID_SFX_START +  59)
-#define HID_APP_WIN             					(HID_SFX_START +  60)
-#define HID_TEMPLATE_FMT          					(HID_SFX_START +  61)
-#define HID_TEMPLATE_FILTER        					(HID_SFX_START +  62)
-#define HID_FTPSERVER_PAGE                          (HID_SFX_START +  63)
-#define HID_DLG_SFX_EXP_SEARCH                      (HID_SFX_START +  65)
-#define HID_TP_SFX_EXP_SEARCH_CRITERIA              (HID_SFX_START +  66)
-#define HID_TP_SFX_EXP_SEARCH_PLACE                 (HID_SFX_START +  67)
-#define HID_SEARCH_DLG_TABLB                 		(HID_SFX_START +  68)
-#define HID_TEMPLDLG_NEWBYEXAMPLE             		(HID_SFX_START +  69)
-#define HID_TEMPLDLG_UPDATEBYEXAMPLE          		(HID_SFX_START +  70)
-#define HID_TEMPLDLG_WATERCAN              		    (HID_SFX_START +  71)
-#define HID_DESKTOP									(HID_SFX_START +  78)
-#define HID_EXPLORERTOOLSTOOLBOX        		    (HID_SFX_START +  79)
-#define HID_EXPLOREROBJECTTOOLBOX        		    (HID_SFX_START +  80)
-#define HID_RECORDINGTOOLBOX        		    	(HID_SFX_START +  81)
-#define HID_FULLSCREENTOOLBOX        		    	(HID_SFX_START +  82)
-#define HID_HELPBAR			        		    	(HID_SFX_START +  83)
-#define HID_ENVTOOLBOX   		     		    	(HID_SFX_START +  84)
-#define HID_FRAMESETEDIT_TOOLBOX  	 	     		(HID_SFX_START +  85)
-#define HID_NAVIGATOR_WINDOW						(HID_SFX_START +  86)
-#define HID_TABDLG_RESET_BTN						(HID_SFX_START +  89)
-#define HID_TABDLG_STANDARD_BTN						(HID_SFX_START +  90)
-#define HID_HELPAGENT_TIP_BOX   					(HID_SFX_START +  91)
-#define HID_TEMPLDLG_TOOLBOX_LEFT            		(HID_SFX_START +  92)
-#define HID_TEMPLDLG_TOOLBOX_RIGHT           		(HID_SFX_START +  93)
-#define HID_EXPLORER_SRCH_COUNT                     (HID_SFX_START +  94)
-#define HID_BEAMER_SORT_ASCENDING					(HID_SFX_START +  95)
-#define HID_BEAMER_SORT_DESCENDING					(HID_SFX_START +  96)
-#define HID_EXPLORER_SRCH_LATEST_COUNT              (HID_SFX_START +  97)
-#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_SFX_START +  98)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_SFX_START +  99)
-#define HID_ORGANIZE_NEW							(HID_SFX_START + 100)
-#define HID_ORGANIZE_DELETE							(HID_SFX_START + 101)
-#define HID_ORGANIZE_EDIT							(HID_SFX_START + 102)
-#define HID_ORGANIZE_COPY_FROM						(HID_SFX_START + 103)
-#define HID_ORGANIZE_COPY_TO						(HID_SFX_START + 104)
-#define HID_ORGANIZE_PRINT							(HID_SFX_START + 105)
-#define HID_ORGANIZE_PRINTER_SETUP					(HID_SFX_START + 106)
-#define HID_ORGANIZE_RESCAN							(HID_SFX_START + 107)
-#define HID_STYLIST_NEW							    (HID_SFX_START + 108)
-#define HID_STYLIST_EDIT							(HID_SFX_START + 109)
-#define HID_STYLIST_DELETE							(HID_SFX_START + 110)
-#define HID_EXPLORERMENU_ARRANGEICONS				(HID_SFX_START + 111)
-#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID		(HID_SFX_START + 112)
-#define HID_EXPLORERMENU_FIXEDICONPOS				(HID_SFX_START + 113)
-#define HID_EXPLORERMENU_OPEN						(HID_SFX_START + 114)
-#define HID_EXPLORERMENU_PRINT						(HID_SFX_START + 115)
-#define HID_EXPLORERMENU_SEARCH						(HID_SFX_START + 116)
-#define HID_EXPLORERMENU_COPY						(HID_SFX_START + 117)
-#define HID_EXPLORERMENU_DELETE						(HID_SFX_START + 118)
-#define HID_EXPLORERMENU_CREATELINK					(HID_SFX_START + 119)
-#define HID_EXPLORERMENU_EDITPROPERTIES				(HID_SFX_START + 120)
-#define HID_EXPLORERMENU_DOWNLOAD					(HID_SFX_START + 121)
-#define HID_EXPLORERMENU_STDTEMPLATE    			(HID_SFX_START + 122)
-#define HID_EXPLORERDLG_FILELIST                    (HID_SFX_START + 124)
-#define HID_PDFOLDERS_WORKPLACE                     (HID_SFX_START + 125)
-#define HID_PDFOLDERS_EXPLORER                      (HID_SFX_START + 126)
-#define HID_PDFOLDERS_STANDARD                      (HID_SFX_START + 127)
-#define HID_PDFOLDERS_ROOT                          (HID_SFX_START + 128)
-#define HID_PDFOLDERS_DESKTOP                       (HID_SFX_START + 129)
-#define HID_CNTMENU_REMOVE_GROUP       				(HID_SFX_START + 130)
-#define HID_CNTMENU_CLEAR_CACHE       				(HID_SFX_START + 131)
-#define HID_CNT_SYNC_INFO_DLG       				(HID_SFX_START + 132)
-#define HID_CNT_REMOVE_REMOVEDLIST					(HID_SFX_START + 133)
-#define HID_CNT_ABORT_DIALOG						(HID_SFX_START + 134)
-#define HID_CNT_PAGE_PRJ_DATAEXCHANGE				(HID_SFX_START + 135)
-#define HID_CHAOSDOC_OBJECTBAR_FILE					(HID_SFX_START + 136)
-#define HID_CHAOSDOC_OBJECTBAR_MESSAGE				(HID_SFX_START + 137)
-#define HID_CHAOSDOC_MN_PART_OPEN  					(HID_SFX_START + 138)
-#define HID_CHAOSDOC_MN_PART_DELETE					(HID_SFX_START + 139)
-#define HID_CHAOSDOC_MN_PART_RENAME					(HID_SFX_START + 140)
-#define HID_CHAOSDOC_MN_PART_SAVEAS					(HID_SFX_START + 141)
-#define HID_EXPLORER_DOCVIEW_ICON					(HID_SFX_START + 142)
-#define HID_EXPLORER_DOCVIEW_DETAILS				(HID_SFX_START + 143)
-#define HID_CHAOSDOC_WIN							(HID_SFX_START + 144)
-#define HID_CHAOSDOC_WIN_HEADER						(HID_SFX_START + 145)
-#define HID_CHAOSDOC_WIN_PARTS						(HID_SFX_START + 146)
-#define HID_CHAOSDOC_WIN_BODY						(HID_SFX_START + 147)
-#define HID_CNT_INSERT_COLUMN						(HID_SFX_START + 148)
-#define HID_CNT_REMOVE_COLUMN						(HID_SFX_START + 149)
-#define HID_CNT_OPT_WIDTH							(HID_SFX_START + 150)
-#define HID_CNT_SORT_ASC							(HID_SFX_START + 151)
-#define HID_CNT_SORT_DESC							(HID_SFX_START + 152)
-#define HID_CNT_RULEPG_OPEN_DIR						(HID_SFX_START + 153)
-#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK			(HID_SFX_START + 154)
-#define HID_CHAOSDOC_MN_HEADER_COPYLINK				(HID_SFX_START + 155)
-#define HID_CLEAN_CACHE								(HID_SFX_START + 156)
-#define HID_SBOX_LOCATION							(HID_SFX_START + 157)
-#define HID_SBOX_SUBSCRIBTION						(HID_SFX_START + 158)
-#define HID_SBOX_CDF_SUBSCRIBTION					(HID_SFX_START + 159)
-#define HID_SBOX_SCHEDULE							(HID_SFX_START + 160)
-#define HID_SBOX_NOTIFICATION						(HID_SFX_START + 161)
-#define HID_SBOX_SDC_GENERAL						(HID_SFX_START + 162)
-#define HID_BRWBOX_HEADERBAR						(HID_SFX_START + 163)
-#define HID_CANNOT_CREATE_BMK_HERE					(HID_SFX_START + 164)
-#define HID_CREATE_BOOKMARK							(HID_SFX_START + 165)
-#define HID_TASKBAR									(HID_SFX_START + 166)
-#define HID_TASKBUTTONBAR   						(HID_SFX_START + 167)
-#define HID_TASKTOOLBAR 							(HID_SFX_START + 168)
-#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION			(HID_SFX_START + 169)
-#define HID_CNT_FILE 						        (HID_SFX_START + 170)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK				(HID_SFX_START + 171)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK			(HID_SFX_START + 172)
-#define HID_CHAOSDOC_MN_BODY_DOWNLOAD				(HID_SFX_START + 173)
-#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK			(HID_SFX_START + 174)
-#define HID_OPEN_MENU_CNT							(HID_SFX_START + 175)
-#define HID_CNT_OPEN_AS_TEMPLATE					(HID_SFX_START + 176)
-#define HID_CNT_OPEN_AS_DOC							(HID_SFX_START + 177)
-#define HID_PDFOLDERS_TEMPLATE						(HID_SFX_START + 178)
-#define HID_EXPLORER_ROOT							(HID_SFX_START + 179)
-#define HID_RESET_URL								(HID_SFX_START + 180)
-#define HID_PHONE_DIALOG							(HID_SFX_START + 181)
-#define HID_QB_RESOLVE_LINK							(HID_SFX_START + 182)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD			(HID_SFX_START + 183)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC			(HID_SFX_START + 184)
-#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER			(HID_SFX_START + 185)
-#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER		(HID_SFX_START + 186)
-#define HID_CNT_MARK_THREAD_MARKED					(HID_SFX_START + 187)
-#define HID_CNT_MARK_THREAD_UNMARKED				(HID_SFX_START + 188)
-#define HID_CNT_DLG_SEARCH_BT_SHOW					(HID_SFX_START + 189)
-#define HID_CNT_DLG_SEARCH_BT_UPDATE				(HID_SFX_START + 190)
-#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE			(HID_SFX_START + 191)
-#define HID_CNT_DLG_SEARCH_BT_STOP					(HID_SFX_START + 192)
-#define HID_CNT_PAGE_HEADER							(HID_SFX_START + 193)
-#define HID_CNT_DLG_ADDRESS                         (HID_SFX_START + 194)
-#define HID_EXPLORERMENU_AUTO_ARRANGEICONS			(HID_SFX_START + 195)
-#define HID_EXPLORERMENU_AUTO_ADJUSTICONS			(HID_SFX_START + 196)
-#define HID_EXPLORERMENU_FREE_POSITIONING			(HID_SFX_START + 197)
-#define HID_CNT_TARGET_MENU							(HID_SFX_START + 198)
-#define HID_CNT_PAGE_DESCRIPTION					(HID_SFX_START + 199)
-#define HID_CNT_LB_HEADER							(HID_SFX_START + 200)
-#define HID_CNT_LB_DESCRIPTION						(HID_SFX_START + 201)
-#define HID_GROUPVIEW_BIG_SYMBOLS					(HID_SFX_START + 202)
-#define HID_GROUPVIEW_SMALL_SYMBOLS					(HID_SFX_START + 203)
-#define HID_GROUPVIEW_ADD_GROUP						(HID_SFX_START + 204)
-#define HID_GROUPVIEW_REMOVE_GROUP					(HID_SFX_START + 205)
-#define HID_GROUPVIEW_RENAME_GROUP					(HID_SFX_START + 206)
-#define HID_GROUPVIEW_ADD_BOOKMARK					(HID_SFX_START + 207)
-#define HID_GROUPVIEW_TREE							(HID_SFX_START + 208)
-#define HID_GROUPVIEW_ADD_AS_FOLDER					(HID_SFX_START + 209)
-#define HID_GROUPVIEW_ADD_AS_BMK					(HID_SFX_START + 210)
-#define HID_GROUPVIEW_REMOVE_BMK					(HID_SFX_START + 211)
-#define HID_GROUPVIEW_CONTENT_BIG					(HID_SFX_START + 212)
-#define HID_GROUPVIEW_CONTENT_SMALL					(HID_SFX_START + 213)
-#define HID_GROUPVIEW_CONTENT_TREE					(HID_SFX_START + 214)
-#define HID_GROUPVIEW_SHOW_DOCS						(HID_SFX_START + 215)
-#define HID_EDIT_TEMPLATE							(HID_SFX_START + 216)
-#define HID_PDFOLDERS_GRAPHICS						(HID_SFX_START + 217)
-#define HID_FILEDLG_AUTOCOMPLETEBOX					(HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN						(HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME					(HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE					(HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN						(HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN						(HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME					(HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN						(HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME					(HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN					(HID_SFX_START + 227)
-#define HID_PDFOLDERS_GROUPS						(HID_SFX_START + 228)
-#define HID_OPEN_CHOOSE_FILTER						(HID_SFX_START + 229)
-#define HID_PDFOLDERS_BOOKMARKS						(HID_SFX_START + 230)
-#define HID_PDFOLDERS_FAVORITES_ADD					(HID_SFX_START + 231)
-#define HID_PDFOLDERS_FAVORITES_REMOVE				(HID_SFX_START + 232)
-#define HID_PDFOLDERS_HISTORY						(HID_SFX_START + 233)
-#define HID_FILEDLG_EDIT_FAVORITES					(HID_SFX_START + 234)
-#define HID_FILEDLG_NEW_FAVORITE					(HID_SFX_START + 235)
-#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX			(HID_SFX_START + 236)
-#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR		(HID_SFX_START + 237)
-#define HID_CNT_CB_FORCE_BODY_EXPORT				(HID_SFX_START + 240)
-#define HID_CNT_PAGE_REPSTATE_CONTROL				(HID_SFX_START + 241)
-#define HID_TASKSTATUSBAR							(HID_SFX_START + 242)
-#define HID_CNT_PAGE_HEADER_TABBAR					(HID_SFX_START + 244)
-#define HID_CNT_PAGE_SUBSCR_TABBAR					(HID_SFX_START + 245)
-#define HID_CHAOSDOC_MN_PART_PRINT					(HID_SFX_START + 246)
-#define HID_STATUSINDICATOR_TEXT					(HID_SFX_START + 247)
-#define HID_STATUSINDICATOR_PROGRESS				(HID_SFX_START + 248)
-#define HID_CNT_VALUE_ADDED_NONE					(HID_SFX_START + 249)
-#define HID_CNT_VALUE_ADDED_DOCINFO					(HID_SFX_START + 250)
-#define HID_CNT_VALUE_ADDED_FULL					(HID_SFX_START + 251)
-#define HID_CNT_MESSAGE_STOREMODE_REMOTE			(HID_SFX_START + 252)
-#define HID_CNT_MESSAGE_STOREMODE_LOCAL				(HID_SFX_START + 253)
-#define HID_CNT_VIEW_ALL_ARTICLES					(HID_SFX_START + 254)
-#define HID_CNT_VIEW_UNREAD_ARTICLES				(HID_SFX_START + 255)
-#define HID_CNT_VIEW_READ_ARTICLES					(HID_SFX_START + 256)
-#define HID_CNT_VIEW_MARKED_ARTICLES				(HID_SFX_START + 257)
-#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES		(HID_SFX_START + 258)
-#define HID_CNT_VIEW_ALL_FOLDERS					(HID_SFX_START + 259)
-#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS				(HID_SFX_START + 260)
-#define HID_CNT_VIEW_ACTIVE_FOLDERS					(HID_SFX_START + 261)
-#define HID_CNT_SENT_VIEW_ALL_ARTICLES				(HID_SFX_START + 262)
-#define HID_CNT_SENT_VIEW_SENT_ARTICLES				(HID_SFX_START + 263)
-#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES			(HID_SFX_START + 264)
-#define HID_CNT_SENT_VIEW_MARKED_ARTICLES			(HID_SFX_START + 265)
-#define HID_MAILWIN_SEND_BUTTON						(HID_SFX_START + 266)
-#define HID_MAILWIN_CLOSE_BUTTON					(HID_SFX_START + 267)
-#define HID_MAILWIN_ROLE_BOX						(HID_SFX_START + 268)
-#define HID_MAILWIN_ADDRESS_EDIT					(HID_SFX_START + 269)
-#define HID_MAILWIN_ADDRESS_BOX						(HID_SFX_START + 270)
-#define HID_MAILWIN_SUBJECT_EDIT					(HID_SFX_START + 271)
-#define HID_MAILWIN_FROM_EDIT						(HID_SFX_START + 272)
-#define HID_MAILWIN_PRIO_BOX						(HID_SFX_START + 273)
-#define HID_TABDLG_APPLY_BTN						(HID_SFX_START + 274)
-#define HID_TP_COMMONPRINTOPTIONS					(HID_SFX_START + 275)
-#define HID_FILEDLG_LINK_CB     					(HID_SFX_START + 276)
-#define HID_FILEDLG_PREVIEW_CB  					(HID_SFX_START + 277)
-#define HID_HELP_WINDOW								(HID_SFX_START + 278)
-#define HID_HELP_LISTBOX							(HID_SFX_START + 279)
-#define HID_HELP_TABCONTROL							(HID_SFX_START + 280)
-#define HID_HELP_TOOLBOX							(HID_SFX_START + 281)
-#define HID_HELP_TOOLBOXITEM_INDEX					(HID_SFX_START + 282)
-#define HID_HELP_TOOLBOXITEM_START					(HID_SFX_START + 283)
-#define HID_HELP_TOOLBOXITEM_BACKWARD				(HID_SFX_START + 284)
-#define HID_HELP_TOOLBOXITEM_FORWARD				(HID_SFX_START + 285)
-#define HID_HELP_TOOLBOXITEM_PRINT					(HID_SFX_START + 286)
-#define HID_HELP_TOOLBOXITEM_BOOKMARKS				(HID_SFX_START + 287)
-#define HID_HELP_TABPAGE_CONTENTS					(HID_SFX_START + 288)
-#define HID_HELP_TABPAGE_INDEX						(HID_SFX_START + 289)
-#define HID_HELP_TABPAGE_SEARCH						(HID_SFX_START + 290)
-#define HID_HELP_TABPAGE_BOOKMARKS					(HID_SFX_START + 291)
-#define HID_TBXCONTROL_FILENEW                      (HID_SFX_START + 292)
-#define HID_ORGANIZE_STDTEMPLATE_ADD				(HID_SFX_START + 293)
-#define HID_ORGANIZE_STDTEMPLATE_DEL				(HID_SFX_START + 294)
-#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG			(HID_SFX_START + 295)
-#define HID_HELP_BOOKMARKS_OPEN						(HID_SFX_START + 296)
-#define HID_HELP_BOOKMARKS_RENAME					(HID_SFX_START + 297)
-#define HID_HELP_BOOKMARKS_DELETE					(HID_SFX_START + 298)
-#define HID_CLOSE_WARNING                           (HID_SFX_START + 299)
-#define HID_DID_SAVE_PACKED_XML						(HID_SFX_START + 300)
-#define HID_HELP_TREELISTBOX_CONTENTS				(HID_SFX_START + 301)
-#define HID_CUSTOMIZETOOLBOX						(HID_SFX_START + 302)
-#define HID_CUSTOMIZETOOLBOX_FUNCTIONS				(HID_SFX_START + 303)
-#define HID_CUSTOMIZETOOLBOX_TOOLBOX				(HID_SFX_START + 304)
-#define HID_HELP_TEXT_SELECTION_MODE                (HID_SFX_START + 305)
+#define HID_FILTER_SELECT                                     "SFX2_HID_FILTER_SELECT"
+#define HID_USERDEFBMP                                        "SFX2_HID_USERDEFBMP"
+#define HID_DOCINFO_EDT                                       "SFX2_HID_DOCINFO_EDT"
+#define HID_PASSWD                                            "SFX2_HID_PASSWD"
+#define HID_PRINTMONITOR                                      "SFX2_HID_PRINTMONITOR"
+#define HID_CONFIG_OBJECTBAR                                  "SFX2_HID_CONFIG_OBJECTBAR"
+#define HID_MANAGE_STYLES                                     "SFX2_HID_MANAGE_STYLES"
+#define HID_CONFIG_EVENT                                      "SFX2_HID_CONFIG_EVENT"
+#define HID_DOCINFODESC                                       "SFX2_HID_DOCINFODESC"
+#define HID_DOCINFODOC                                        "SFX2_HID_DOCINFODOC"
+#define HID_DOCINFOUSER                                       "SFX2_HID_DOCINFOUSER"
+#define HID_BOOKMARKPROPS                                     "SFX2_HID_BOOKMARKPROPS"
+#define HID_BOOKGROUPPROPS                                    "SFX2_HID_BOOKGROUPPROPS"
+#define HID_BOOKFILEPROPS                                     "SFX2_HID_BOOKFILEPROPS"
+#define HID_NEWS_SERVERPROPS                                  "SFX2_HID_NEWS_SERVERPROPS"
+#define HID_NEWS_RULEPAGE                                     "SFX2_HID_NEWS_RULEPAGE"
+#define HID_MAILINTRAYPROPS                                   "SFX2_HID_MAILINTRAYPROPS"
+#define HID_DOCINFORELOAD                                     "SFX2_HID_DOCINFORELOAD"
+#define HID_NEWS_GROUPPAGE                                    "SFX2_HID_NEWS_GROUPPAGE"
+#define HID_NEWS_SERVERPAGE                                   "SFX2_HID_NEWS_SERVERPAGE"
+#define HID_EXPLORERCONTROL                                   "SFX2_HID_EXPLORERCONTROL"
+#define HID_BROWSERCONTROL                                    "SFX2_HID_BROWSERCONTROL"
+#define HID_CTL_ORGANIZER_LEFT                                "SFX2_HID_CTL_ORGANIZER_LEFT"
+#define HID_CTL_ORGANIZER_RIGHT                               "SFX2_HID_CTL_ORGANIZER_RIGHT"
+#define HID_EXPLMAILSRV_GENERAL_PAGE                          "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE"
+#define HID_EXPLMAILSRV_PROTOCOL_PAGE                         "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE"
+#define HID_EXPLMAILSRV_DATAMATCH_PAGE                        "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE"
+#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE                      "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE"
+#define HID_EXPLMAIL_GENERAL_PAGE                             "SFX2_HID_EXPLMAIL_GENERAL_PAGE"
+#define HID_NEWS_CTL_RULES                                    "SFX2_HID_NEWS_CTL_RULES"
+#define HID_NEWS_CTL_GROUPS                                   "SFX2_HID_NEWS_CTL_GROUPS"
+#define HID_CONFIG_OBJECTBAR_CTL                              "SFX2_HID_CONFIG_OBJECTBAR_CTL"
+#define HID_NEWS_QUICKSEARCH                                  "SFX2_HID_NEWS_QUICKSEARCH"
+#define HID_NEWS_SERVERVIEWPROPS                              "SFX2_HID_NEWS_SERVERVIEWPROPS"
+#define HID_NEWS_SHOWARTICLEPROPS                             "SFX2_HID_NEWS_SHOWARTICLEPROPS"
+#define HID_NEWS_SHOWGROUPPROPS                               "SFX2_HID_NEWS_SHOWGROUPPROPS"
+#define HID_NEWS_USER                                         "SFX2_HID_NEWS_USER"
+#define HID_MULTISELECTION_GENERAL_PAGE                       "SFX2_HID_MULTISELECTION_GENERAL_PAGE"
+#define HID_LINK_GENERAL_PAGE                                 "SFX2_HID_LINK_GENERAL_PAGE"
+#define HID_LINK_ADDRESS_PAGE                                 "SFX2_HID_LINK_ADDRESS_PAGE"
+#define HID_FOLDER_GENERAL_PAGE                               "SFX2_HID_FOLDER_GENERAL_PAGE"
+#define HID_FILE_GENERAL_PAGE                                 "SFX2_HID_FILE_GENERAL_PAGE"
+#define HID_FTP_GENERAL_PAGE                                  "SFX2_HID_FTP_GENERAL_PAGE"
+#define HID_PRINT_OPTIONS                                     "SFX2_HID_PRINT_OPTIONS"
+#define HID_PREVIEW_FRAME                                     "SFX2_HID_PREVIEW_FRAME"
+#define HID_DOCINFO_FRAME                                     "SFX2_HID_DOCINFO_FRAME"
+#define HID_EXPLORER_FRAME                                    "SFX2_HID_EXPLORER_FRAME"
+#define HID_APP_WIN                                           "SFX2_HID_APP_WIN"
+#define HID_TEMPLATE_FMT                                      "SFX2_HID_TEMPLATE_FMT"
+#define HID_TEMPLATE_FILTER                                   "SFX2_HID_TEMPLATE_FILTER"
+#define HID_FTPSERVER_PAGE                                    "SFX2_HID_FTPSERVER_PAGE"
+#define HID_DLG_SFX_EXP_SEARCH                                "SFX2_HID_DLG_SFX_EXP_SEARCH"
+#define HID_TP_SFX_EXP_SEARCH_CRITERIA                        "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA"
+#define HID_TP_SFX_EXP_SEARCH_PLACE                           "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE"
+#define HID_SEARCH_DLG_TABLB                                  "SFX2_HID_SEARCH_DLG_TABLB"
+#define HID_TEMPLDLG_NEWBYEXAMPLE                             "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"
+#define HID_TEMPLDLG_UPDATEBYEXAMPLE                          "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
+#define HID_TEMPLDLG_WATERCAN                                 "SFX2_HID_TEMPLDLG_WATERCAN"
+#define HID_DESKTOP                                           "SFX2_HID_DESKTOP"
+#define HID_EXPLORERTOOLSTOOLBOX                              "SFX2_HID_EXPLORERTOOLSTOOLBOX"
+#define HID_EXPLOREROBJECTTOOLBOX                             "SFX2_HID_EXPLOREROBJECTTOOLBOX"
+#define HID_RECORDINGTOOLBOX                                  "SFX2_HID_RECORDINGTOOLBOX"
+#define HID_FULLSCREENTOOLBOX                                 "SFX2_HID_FULLSCREENTOOLBOX"
+#define HID_HELPBAR                                           "SFX2_HID_HELPBAR"
+#define HID_ENVTOOLBOX                                        "SFX2_HID_ENVTOOLBOX"
+#define HID_FRAMESETEDIT_TOOLBOX                              "SFX2_HID_FRAMESETEDIT_TOOLBOX"
+#define HID_NAVIGATOR_WINDOW                                  "SFX2_HID_NAVIGATOR_WINDOW"
+#define HID_TABDLG_RESET_BTN                                  "SFX2_HID_TABDLG_RESET_BTN"
+#define HID_TABDLG_STANDARD_BTN                               "SFX2_HID_TABDLG_STANDARD_BTN"
+#define HID_HELPAGENT_TIP_BOX                                 "SFX2_HID_HELPAGENT_TIP_BOX"
+#define HID_TEMPLDLG_TOOLBOX_LEFT                             "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
+#define HID_TEMPLDLG_TOOLBOX_RIGHT                            "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT"
+#define HID_EXPLORER_SRCH_COUNT                               "SFX2_HID_EXPLORER_SRCH_COUNT"
+#define HID_BEAMER_SORT_ASCENDING                             "SFX2_HID_BEAMER_SORT_ASCENDING"
+#define HID_BEAMER_SORT_DESCENDING                            "SFX2_HID_BEAMER_SORT_DESCENDING"
+#define HID_EXPLORER_SRCH_LATEST_COUNT                        "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT"
+#define HID_CONFIG_EVENT_OFFICE_BASED                         "SFX2_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED                       "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_ORGANIZE_NEW                                      "SFX2_HID_ORGANIZE_NEW"
+#define HID_ORGANIZE_DELETE                                   "SFX2_HID_ORGANIZE_DELETE"
+#define HID_ORGANIZE_EDIT                                     "SFX2_HID_ORGANIZE_EDIT"
+#define HID_ORGANIZE_COPY_FROM                                "SFX2_HID_ORGANIZE_COPY_FROM"
+#define HID_ORGANIZE_COPY_TO                                  "SFX2_HID_ORGANIZE_COPY_TO"
+#define HID_ORGANIZE_PRINT                                    "SFX2_HID_ORGANIZE_PRINT"
+#define HID_ORGANIZE_PRINTER_SETUP                            "SFX2_HID_ORGANIZE_PRINTER_SETUP"
+#define HID_ORGANIZE_RESCAN                                   "SFX2_HID_ORGANIZE_RESCAN"
+#define HID_STYLIST_NEW                                       "SFX2_HID_STYLIST_NEW"
+#define HID_STYLIST_EDIT                                      "SFX2_HID_STYLIST_EDIT"
+#define HID_STYLIST_DELETE                                    "SFX2_HID_STYLIST_DELETE"
+#define HID_EXPLORERMENU_ARRANGEICONS                         "SFX2_HID_EXPLORERMENU_ARRANGEICONS"
+#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID                  "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID"
+#define HID_EXPLORERMENU_FIXEDICONPOS                         "SFX2_HID_EXPLORERMENU_FIXEDICONPOS"
+#define HID_EXPLORERMENU_OPEN                                 "SFX2_HID_EXPLORERMENU_OPEN"
+#define HID_EXPLORERMENU_PRINT                                "SFX2_HID_EXPLORERMENU_PRINT"
+#define HID_EXPLORERMENU_SEARCH                               "SFX2_HID_EXPLORERMENU_SEARCH"
+#define HID_EXPLORERMENU_COPY                                 "SFX2_HID_EXPLORERMENU_COPY"
+#define HID_EXPLORERMENU_DELETE                               "SFX2_HID_EXPLORERMENU_DELETE"
+#define HID_EXPLORERMENU_CREATELINK                           "SFX2_HID_EXPLORERMENU_CREATELINK"
+#define HID_EXPLORERMENU_EDITPROPERTIES                       "SFX2_HID_EXPLORERMENU_EDITPROPERTIES"
+#define HID_EXPLORERMENU_DOWNLOAD                             "SFX2_HID_EXPLORERMENU_DOWNLOAD"
+#define HID_EXPLORERMENU_STDTEMPLATE                          "SFX2_HID_EXPLORERMENU_STDTEMPLATE"
+#define HID_EXPLORERDLG_FILELIST                              "SFX2_HID_EXPLORERDLG_FILELIST"
+#define HID_PDFOLDERS_WORKPLACE                               "SFX2_HID_PDFOLDERS_WORKPLACE"
+#define HID_PDFOLDERS_EXPLORER                                "SFX2_HID_PDFOLDERS_EXPLORER"
+#define HID_PDFOLDERS_STANDARD                                "SFX2_HID_PDFOLDERS_STANDARD"
+#define HID_PDFOLDERS_ROOT                                    "SFX2_HID_PDFOLDERS_ROOT"
+#define HID_PDFOLDERS_DESKTOP                                 "SFX2_HID_PDFOLDERS_DESKTOP"
+#define HID_CNTMENU_REMOVE_GROUP                              "SFX2_HID_CNTMENU_REMOVE_GROUP"
+#define HID_CNTMENU_CLEAR_CACHE                               "SFX2_HID_CNTMENU_CLEAR_CACHE"
+#define HID_CNT_SYNC_INFO_DLG                                 "SFX2_HID_CNT_SYNC_INFO_DLG"
+#define HID_CNT_REMOVE_REMOVEDLIST                            "SFX2_HID_CNT_REMOVE_REMOVEDLIST"
+#define HID_CNT_ABORT_DIALOG                                  "SFX2_HID_CNT_ABORT_DIALOG"
+#define HID_CNT_PAGE_PRJ_DATAEXCHANGE                         "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE"
+#define HID_CHAOSDOC_OBJECTBAR_FILE                           "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE"
+#define HID_CHAOSDOC_OBJECTBAR_MESSAGE                        "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE"
+#define HID_CHAOSDOC_MN_PART_OPEN                             "SFX2_HID_CHAOSDOC_MN_PART_OPEN"
+#define HID_CHAOSDOC_MN_PART_DELETE                           "SFX2_HID_CHAOSDOC_MN_PART_DELETE"
+#define HID_CHAOSDOC_MN_PART_RENAME                           "SFX2_HID_CHAOSDOC_MN_PART_RENAME"
+#define HID_CHAOSDOC_MN_PART_SAVEAS                           "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS"
+#define HID_EXPLORER_DOCVIEW_ICON                             "SFX2_HID_EXPLORER_DOCVIEW_ICON"
+#define HID_EXPLORER_DOCVIEW_DETAILS                          "SFX2_HID_EXPLORER_DOCVIEW_DETAILS"
+#define HID_CHAOSDOC_WIN                                      "SFX2_HID_CHAOSDOC_WIN"
+#define HID_CHAOSDOC_WIN_HEADER                               "SFX2_HID_CHAOSDOC_WIN_HEADER"
+#define HID_CHAOSDOC_WIN_PARTS                                "SFX2_HID_CHAOSDOC_WIN_PARTS"
+#define HID_CHAOSDOC_WIN_BODY                                 "SFX2_HID_CHAOSDOC_WIN_BODY"
+#define HID_CNT_INSERT_COLUMN                                 "SFX2_HID_CNT_INSERT_COLUMN"
+#define HID_CNT_REMOVE_COLUMN                                 "SFX2_HID_CNT_REMOVE_COLUMN"
+#define HID_CNT_OPT_WIDTH                                     "SFX2_HID_CNT_OPT_WIDTH"
+#define HID_CNT_SORT_ASC                                      "SFX2_HID_CNT_SORT_ASC"
+#define HID_CNT_SORT_DESC                                     "SFX2_HID_CNT_SORT_DESC"
+#define HID_CNT_RULEPG_OPEN_DIR                               "SFX2_HID_CNT_RULEPG_OPEN_DIR"
+#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK                    "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK"
+#define HID_CHAOSDOC_MN_HEADER_COPYLINK                       "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK"
+#define HID_CLEAN_CACHE                                       "SFX2_HID_CLEAN_CACHE"
+#define HID_SBOX_LOCATION                                     "SFX2_HID_SBOX_LOCATION"
+#define HID_SBOX_SUBSCRIBTION                                 "SFX2_HID_SBOX_SUBSCRIBTION"
+#define HID_SBOX_CDF_SUBSCRIBTION                             "SFX2_HID_SBOX_CDF_SUBSCRIBTION"
+#define HID_SBOX_SCHEDULE                                     "SFX2_HID_SBOX_SCHEDULE"
+#define HID_SBOX_NOTIFICATION                                 "SFX2_HID_SBOX_NOTIFICATION"
+#define HID_SBOX_SDC_GENERAL                                  "SFX2_HID_SBOX_SDC_GENERAL"
+#define HID_BRWBOX_HEADERBAR                                  "SFX2_HID_BRWBOX_HEADERBAR"
+#define HID_CANNOT_CREATE_BMK_HERE                            "SFX2_HID_CANNOT_CREATE_BMK_HERE"
+#define HID_CREATE_BOOKMARK                                   "SFX2_HID_CREATE_BOOKMARK"
+#define HID_TASKBAR                                           "SFX2_HID_TASKBAR"
+#define HID_TASKBUTTONBAR                                     "SFX2_HID_TASKBUTTONBAR"
+#define HID_TASKTOOLBAR                                       "SFX2_HID_TASKTOOLBAR"
+#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION                      "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION"
+#define HID_CNT_FILE                                          "SFX2_HID_CNT_FILE"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK                         "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK                   "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK"
+#define HID_CHAOSDOC_MN_BODY_DOWNLOAD                         "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD"
+#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK                      "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK"
+#define HID_OPEN_MENU_CNT                                     "SFX2_HID_OPEN_MENU_CNT"
+#define HID_CNT_OPEN_AS_TEMPLATE                              "SFX2_HID_CNT_OPEN_AS_TEMPLATE"
+#define HID_CNT_OPEN_AS_DOC                                   "SFX2_HID_CNT_OPEN_AS_DOC"
+#define HID_PDFOLDERS_TEMPLATE                                "SFX2_HID_PDFOLDERS_TEMPLATE"
+#define HID_EXPLORER_ROOT                                     "SFX2_HID_EXPLORER_ROOT"
+#define HID_RESET_URL                                         "SFX2_HID_RESET_URL"
+#define HID_PHONE_DIALOG                                      "SFX2_HID_PHONE_DIALOG"
+#define HID_QB_RESOLVE_LINK                                   "SFX2_HID_QB_RESOLVE_LINK"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD                      "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC                    "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC"
+#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER                     "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER"
+#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER                "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER"
+#define HID_CNT_MARK_THREAD_MARKED                            "SFX2_HID_CNT_MARK_THREAD_MARKED"
+#define HID_CNT_MARK_THREAD_UNMARKED                          "SFX2_HID_CNT_MARK_THREAD_UNMARKED"
+#define HID_CNT_DLG_SEARCH_BT_SHOW                            "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW"
+#define HID_CNT_DLG_SEARCH_BT_UPDATE                          "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE"
+#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE                     "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE"
+#define HID_CNT_DLG_SEARCH_BT_STOP                            "SFX2_HID_CNT_DLG_SEARCH_BT_STOP"
+#define HID_CNT_PAGE_HEADER                                   "SFX2_HID_CNT_PAGE_HEADER"
+#define HID_CNT_DLG_ADDRESS                                   "SFX2_HID_CNT_DLG_ADDRESS"
+#define HID_EXPLORERMENU_AUTO_ARRANGEICONS                    "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS"
+#define HID_EXPLORERMENU_AUTO_ADJUSTICONS                     "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS"
+#define HID_EXPLORERMENU_FREE_POSITIONING                     "SFX2_HID_EXPLORERMENU_FREE_POSITIONING"
+#define HID_CNT_TARGET_MENU                                   "SFX2_HID_CNT_TARGET_MENU"
+#define HID_CNT_PAGE_DESCRIPTION                              "SFX2_HID_CNT_PAGE_DESCRIPTION"
+#define HID_CNT_LB_HEADER                                     "SFX2_HID_CNT_LB_HEADER"
+#define HID_CNT_LB_DESCRIPTION                                "SFX2_HID_CNT_LB_DESCRIPTION"
+#define HID_GROUPVIEW_BIG_SYMBOLS                             "SFX2_HID_GROUPVIEW_BIG_SYMBOLS"
+#define HID_GROUPVIEW_SMALL_SYMBOLS                           "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS"
+#define HID_GROUPVIEW_ADD_GROUP                               "SFX2_HID_GROUPVIEW_ADD_GROUP"
+#define HID_GROUPVIEW_REMOVE_GROUP                            "SFX2_HID_GROUPVIEW_REMOVE_GROUP"
+#define HID_GROUPVIEW_RENAME_GROUP                            "SFX2_HID_GROUPVIEW_RENAME_GROUP"
+#define HID_GROUPVIEW_ADD_BOOKMARK                            "SFX2_HID_GROUPVIEW_ADD_BOOKMARK"
+#define HID_GROUPVIEW_TREE                                    "SFX2_HID_GROUPVIEW_TREE"
+#define HID_GROUPVIEW_ADD_AS_FOLDER                           "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER"
+#define HID_GROUPVIEW_ADD_AS_BMK                              "SFX2_HID_GROUPVIEW_ADD_AS_BMK"
+#define HID_GROUPVIEW_REMOVE_BMK                              "SFX2_HID_GROUPVIEW_REMOVE_BMK"
+#define HID_GROUPVIEW_CONTENT_BIG                             "SFX2_HID_GROUPVIEW_CONTENT_BIG"
+#define HID_GROUPVIEW_CONTENT_SMALL                           "SFX2_HID_GROUPVIEW_CONTENT_SMALL"
+#define HID_GROUPVIEW_CONTENT_TREE                            "SFX2_HID_GROUPVIEW_CONTENT_TREE"
+#define HID_GROUPVIEW_SHOW_DOCS                               "SFX2_HID_GROUPVIEW_SHOW_DOCS"
+#define HID_EDIT_TEMPLATE                                     "SFX2_HID_EDIT_TEMPLATE"
+#define HID_PDFOLDERS_GRAPHICS                                "SFX2_HID_PDFOLDERS_GRAPHICS"
+#define HID_PDFOLDERS_GROUPS                                  "SFX2_HID_PDFOLDERS_GROUPS"
+#define HID_OPEN_CHOOSE_FILTER                                "SFX2_HID_OPEN_CHOOSE_FILTER"
+#define HID_PDFOLDERS_BOOKMARKS                               "SFX2_HID_PDFOLDERS_BOOKMARKS"
+#define HID_PDFOLDERS_FAVORITES_ADD                           "SFX2_HID_PDFOLDERS_FAVORITES_ADD"
+#define HID_PDFOLDERS_FAVORITES_REMOVE                        "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE"
+#define HID_PDFOLDERS_HISTORY                                 "SFX2_HID_PDFOLDERS_HISTORY"
+#define HID_CNT_CB_FORCE_BODY_EXPORT                          "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT"
+#define HID_CNT_PAGE_REPSTATE_CONTROL                         "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL"
+#define HID_TASKSTATUSBAR                                     "SFX2_HID_TASKSTATUSBAR"
+#define HID_CNT_PAGE_HEADER_TABBAR                            "SFX2_HID_CNT_PAGE_HEADER_TABBAR"
+#define HID_CNT_PAGE_SUBSCR_TABBAR                            "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR"
+#define HID_CHAOSDOC_MN_PART_PRINT                            "SFX2_HID_CHAOSDOC_MN_PART_PRINT"
+#define HID_STATUSINDICATOR_TEXT                              "SFX2_HID_STATUSINDICATOR_TEXT"
+#define HID_STATUSINDICATOR_PROGRESS                          "SFX2_HID_STATUSINDICATOR_PROGRESS"
+#define HID_CNT_VALUE_ADDED_NONE                              "SFX2_HID_CNT_VALUE_ADDED_NONE"
+#define HID_CNT_VALUE_ADDED_DOCINFO                           "SFX2_HID_CNT_VALUE_ADDED_DOCINFO"
+#define HID_CNT_VALUE_ADDED_FULL                              "SFX2_HID_CNT_VALUE_ADDED_FULL"
+#define HID_CNT_MESSAGE_STOREMODE_REMOTE                      "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE"
+#define HID_CNT_MESSAGE_STOREMODE_LOCAL                       "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL"
+#define HID_CNT_VIEW_ALL_ARTICLES                             "SFX2_HID_CNT_VIEW_ALL_ARTICLES"
+#define HID_CNT_VIEW_UNREAD_ARTICLES                          "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_READ_ARTICLES                            "SFX2_HID_CNT_VIEW_READ_ARTICLES"
+#define HID_CNT_VIEW_MARKED_ARTICLES                          "SFX2_HID_CNT_VIEW_MARKED_ARTICLES"
+#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES               "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_ALL_FOLDERS                              "SFX2_HID_CNT_VIEW_ALL_FOLDERS"
+#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS                       "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS"
+#define HID_CNT_VIEW_ACTIVE_FOLDERS                           "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS"
+#define HID_CNT_SENT_VIEW_ALL_ARTICLES                        "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES"
+#define HID_CNT_SENT_VIEW_SENT_ARTICLES                       "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_MARKED_ARTICLES                     "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES"
+#define HID_MAILWIN_SEND_BUTTON                               "SFX2_HID_MAILWIN_SEND_BUTTON"
+#define HID_MAILWIN_CLOSE_BUTTON                              "SFX2_HID_MAILWIN_CLOSE_BUTTON"
+#define HID_MAILWIN_ROLE_BOX                                  "SFX2_HID_MAILWIN_ROLE_BOX"
+#define HID_MAILWIN_ADDRESS_EDIT                              "SFX2_HID_MAILWIN_ADDRESS_EDIT"
+#define HID_MAILWIN_ADDRESS_BOX                               "SFX2_HID_MAILWIN_ADDRESS_BOX"
+#define HID_MAILWIN_SUBJECT_EDIT                              "SFX2_HID_MAILWIN_SUBJECT_EDIT"
+#define HID_MAILWIN_FROM_EDIT                                 "SFX2_HID_MAILWIN_FROM_EDIT"
+#define HID_MAILWIN_PRIO_BOX                                  "SFX2_HID_MAILWIN_PRIO_BOX"
+#define HID_TABDLG_APPLY_BTN                                  "SFX2_HID_TABDLG_APPLY_BTN"
+#define HID_TP_COMMONPRINTOPTIONS                             "SFX2_HID_TP_COMMONPRINTOPTIONS"
+#define HID_HELP_WINDOW                                       "SFX2_HID_HELP_WINDOW"
+#define HID_HELP_LISTBOX                                      "SFX2_HID_HELP_LISTBOX"
+#define HID_HELP_TABCONTROL                                   "SFX2_HID_HELP_TABCONTROL"
+#define HID_HELP_TOOLBOX                                      "SFX2_HID_HELP_TOOLBOX"
+#define HID_HELP_TOOLBOXITEM_INDEX                            "SFX2_HID_HELP_TOOLBOXITEM_INDEX"
+#define HID_HELP_TOOLBOXITEM_START                            "SFX2_HID_HELP_TOOLBOXITEM_START"
+#define HID_HELP_TOOLBOXITEM_BACKWARD                         "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD"
+#define HID_HELP_TOOLBOXITEM_FORWARD                          "SFX2_HID_HELP_TOOLBOXITEM_FORWARD"
+#define HID_HELP_TOOLBOXITEM_PRINT                            "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
+#define HID_HELP_TOOLBOXITEM_BOOKMARKS                        "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
+#define HID_HELP_TABPAGE_CONTENTS                             "SFX2_HID_HELP_TABPAGE_CONTENTS"
+#define HID_HELP_TABPAGE_INDEX                                "SFX2_HID_HELP_TABPAGE_INDEX"
+#define HID_HELP_TABPAGE_SEARCH                               "SFX2_HID_HELP_TABPAGE_SEARCH"
+#define HID_HELP_TABPAGE_BOOKMARKS                            "SFX2_HID_HELP_TABPAGE_BOOKMARKS"
+#define HID_TBXCONTROL_FILENEW                                "SFX2_HID_TBXCONTROL_FILENEW"
+#define HID_ORGANIZE_STDTEMPLATE_ADD                          "SFX2_HID_ORGANIZE_STDTEMPLATE_ADD"
+#define HID_ORGANIZE_STDTEMPLATE_DEL                          "SFX2_HID_ORGANIZE_STDTEMPLATE_DEL"
+#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG                     "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
+#define HID_HELP_BOOKMARKS_OPEN                               "SFX2_HID_HELP_BOOKMARKS_OPEN"
+#define HID_HELP_BOOKMARKS_RENAME                             "SFX2_HID_HELP_BOOKMARKS_RENAME"
+#define HID_HELP_BOOKMARKS_DELETE                             "SFX2_HID_HELP_BOOKMARKS_DELETE"
+#define HID_CLOSE_WARNING                                     "SFX2_HID_CLOSE_WARNING"
+#define HID_DID_SAVE_PACKED_XML                               "SFX2_HID_DID_SAVE_PACKED_XML"
+#define HID_HELP_TREELISTBOX_CONTENTS                         "SFX2_HID_HELP_TREELISTBOX_CONTENTS"
+#define HID_CUSTOMIZETOOLBOX                                  "SFX2_HID_CUSTOMIZETOOLBOX"
+#define HID_CUSTOMIZETOOLBOX_FUNCTIONS                        "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS"
+#define HID_CUSTOMIZETOOLBOX_TOOLBOX                          "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX"
+#define HID_HELP_TEXT_SELECTION_MODE                          "SFX2_HID_HELP_TEXT_SELECTION_MODE"
 
-#define HID_WARNING_SECURITY_HYPERLINK				(HID_SFX_START + 306)
-#define HID_FILEDLG_EXPORTASPDF						(HID_SFX_START + 307)
-#define HID_USERDEFBMP_TOOLBOX						(HID_SFX_START + 308)
+#define HID_WARNING_SECURITY_HYPERLINK                        "SFX2_HID_WARNING_SECURITY_HYPERLINK"
+#define HID_USERDEFBMP_TOOLBOX                                "SFX2_HID_USERDEFBMP_TOOLBOX"
 
-#define	HID_CONFIG_LOAD								(HID_SFX_START + 309)
-#define	HID_CONFIG_SAVE								(HID_SFX_START + 310)
+#define HID_CONFIG_LOAD                                       "SFX2_HID_CONFIG_LOAD"
+#define HID_CONFIG_SAVE                                       "SFX2_HID_CONFIG_SAVE"
 
-#define HID_SEARCHDIALOG							(HID_SFX_START + 311)
-#define HID_TASKPANE_WINDOW                         (HID_SFX_START + 312)
-#define HID_TASKPANE_VIEW_MENU                      (HID_SFX_START + 313)
-#define HID_XMLSEC_WARNING_BROKENSIGNATURE          (HID_SFX_START + 314)
-#define HID_XMLSEC_QUERY_LOSINGSIGNATURE            (HID_SFX_START + 315)
-#define HID_XMLSEC_QUERY_SAVEBEFORESIGN             (HID_SFX_START + 316)
-#define HID_XMLSECDLG_MACROWARN                     (HID_SFX_START + 317)
-#define HID_XMLSEC_INFO_WRONGDOCFORMAT              (HID_SFX_START + 318)
-#define HID_WARNING_MACROSDISABLED                  (HID_SFX_START + 319)
-#define HID_WARNING_ALIENFORMAT                     (HID_SFX_START + 320)
-#define HID_HELP_ONSTARTUP_BOX                      (HID_SFX_START + 321)
-#define HID_DLG_CHECKFORONLINEUPDATE                (HID_SFX_START + 322)
-#define HID_TP_CUSTOMPROPERTIES                     (HID_SFX_START + 324)
-#define HID_CTRL_CUSTOMPROPERTIES                   (HID_SFX_START + 325)
-#define HID_CTRL_CUSTOMPROPS_YES_NO                 (HID_SFX_START + 326)
-#define HID_DLG_CUSTOMPROPS_DURATION                (HID_SFX_START + 327)
+#define HID_SEARCHDIALOG                                      "SFX2_HID_SEARCHDIALOG"
 
-#define HID_SECURITYTAB_PASSWORD_TO_OPEN            (HID_SFX_START + 328)
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN    (HID_SFX_START + 329)
-#define HID_SECURITYTAB_PASSWORD_TO_MODIFY          (HID_SFX_START + 330)
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY  (HID_SFX_START + 331)
-#define HID_SECURITYTAB_OPEN_FILE_READONLY          (HID_SFX_START + 332)
-#define HID_SECURITYTAB_RECORD_CHANGES              (HID_SFX_START + 333)
-#define HID_SECURITYTAB_PROTECTION                  (HID_SFX_START + 334)
+#define HID_XMLSEC_WARNING_BROKENSIGNATURE                    "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE"
+#define HID_XMLSEC_QUERY_LOSINGSIGNATURE                      "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE"
+#define HID_XMLSEC_QUERY_SAVEBEFORESIGN                       "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN"
+#define HID_XMLSECDLG_MACROWARN                               "SFX2_HID_XMLSECDLG_MACROWARN"
+#define HID_XMLSEC_INFO_WRONGDOCFORMAT                        "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT"
+#define HID_WARNING_MACROSDISABLED                            "SFX2_HID_WARNING_MACROSDISABLED"
+#define HID_WARNING_ALIENFORMAT                               "SFX2_HID_WARNING_ALIENFORMAT"
+#define HID_HELP_ONSTARTUP_BOX                                "SFX2_HID_HELP_ONSTARTUP_BOX"
+#define HID_DLG_CHECKFORONLINEUPDATE                          "SFX2_HID_DLG_CHECKFORONLINEUPDATE"
+#define HID_TP_CUSTOMPROPERTIES                               "SFX2_HID_TP_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPERTIES                             "SFX2_HID_CTRL_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPS_YES_NO                           "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
+#define HID_DLG_CUSTOMPROPS_DURATION                          "SFX2_HID_DLG_CUSTOMPROPS_DURATION"
 
-#define ACT_SFX_HID_END HID_SECURITYTAB_PROTECTION
+#define HID_HELP_ONHELP								          "SFX2_HID_HELP_ONHELP"
 
-// "Uberlaufpr"ufung --------------------------------------------------------
+#define HID_QUERY_LOAD_TEMPLATE                               "SFX2_HID_QUERY_LOAD_TEMPLATE"
 
-#if ACT_SFX_HID_END > HID_SFX_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_SECURITYTAB_PASSWORD_TO_OPEN                      "SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN"
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN              "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN"
+#define HID_SECURITYTAB_PASSWORD_TO_MODIFY                    "SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY"
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY            "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY"
+#define HID_SECURITYTAB_OPEN_FILE_READONLY                    "SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY"
+#define HID_SECURITYTAB_RECORD_CHANGES                        "SFX2_HID_SECURITYTAB_RECORD_CHANGES"
+#define HID_SECURITYTAB_PROTECTION                            "SFX2_HID_SECURITYTAB_PROTECTION"
 
-#define HID_HELP_ONHELP								68245
+#define HID_TASKPANE_WINDOW                                     "SFX2_HID_TASKPANE_WINDOW"
+#define HID_TASKPANE_VIEW_MENU                                  "SFX2_HID_TASKPANE_VIEW_MENU"
+#define HID_DOCINFOSECURITY                                     "SFX2_HID_DOCINFOSECURITY"
 
 #endif // #ifndef _SFX_HELPID_HRC
 
diff --git a/sfx2/source/inc/hexplwnd.hxx b/sfx2/source/inc/hexplwnd.hxx
index f0d9cbee44..f0d9cbee44 100644..100755
--- a/sfx2/source/inc/hexplwnd.hxx
+++ b/sfx2/source/inc/hexplwnd.hxx
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index c2c775b7b4..c2c775b7b4 100644..100755
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
diff --git a/sfx2/source/inc/intro.hxx b/sfx2/source/inc/intro.hxx
index 6b9212cdee..6b9212cdee 100644..100755
--- a/sfx2/source/inc/intro.hxx
+++ b/sfx2/source/inc/intro.hxx
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index 584a228ffc..a7536bc55e 100644..100755
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -101,7 +101,7 @@ public:
     SendMailResult		Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const rtl::OUString& rType );
 };
 
-BOOL CreateFromAddress_Impl( String& rFrom );
+sal_Bool CreateFromAddress_Impl( String& rFrom );
 
 #endif // INCLUDED_SFX_MAILMODEL_HXX
 
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index 5d80683975..d0ecb17e17 100644..100755
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -37,7 +37,7 @@ class SfxMenuCfgItemArr;
 
 struct SfxMenuCfgItem
 {
-    USHORT			   nId; 	   // id of the binding or 0 if none
+    sal_uInt16			   nId; 	   // id of the binding or 0 if none
     String			   aTitle;	   // title of the item
     String			   aHelpText;  // Hilfetext
     String				aCommand;
diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 208e473341..7e11f6ecbc 100644..100755
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -56,7 +56,7 @@ public:
     SfxFilterDialog( Window * pParent,
                      SfxMedium* pMed,
                      const SfxFilterMatcher &rMatcher,
-                     const String *pDefFilter, BOOL bShowConvert = TRUE );
+                     const String *pDefFilter, sal_Bool bShowConvert = sal_True );
 
     String GetSelectEntry() const;
 };
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index e270ddffdb..56508f6f11 100644..100755
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -34,7 +34,7 @@ class NoChaos
 {
 public:
     static SfxItemPool*		GetItemPool();
-    static USHORT			ReleaseItemPool();
+    static sal_uInt16			ReleaseItemPool();
 };
 
 #endif
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
index 1b535ebec1..9a3fde768a 100644..100755
--- a/sfx2/source/inc/objmnctl.hxx
+++ b/sfx2/source/inc/objmnctl.hxx
@@ -43,10 +43,10 @@ class SfxObjectVerbsControl: public SfxMenuControl
 private:
     void				FillMenu();
     DECL_LINK( MenuSelect, Menu * );
-    virtual 			void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual 			void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-                        SfxObjectVerbsControl(USHORT, Menu&, SfxBindings&);
+                        SfxObjectVerbsControl(sal_uInt16, Menu&, SfxBindings&);
                         ~SfxObjectVerbsControl();
     virtual PopupMenu*  GetPopup() const;
     SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index c7c1bc926d..c7c1bc926d 100644..100755
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
diff --git a/sfx2/source/inc/openflag.hxx b/sfx2/source/inc/openflag.hxx
index 70a5d7cd3a..70a5d7cd3a 100644..100755
--- a/sfx2/source/inc/openflag.hxx
+++ b/sfx2/source/inc/openflag.hxx
diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx
index 63e21234fb..63e21234fb 100644..100755
--- a/sfx2/source/inc/ownsubfilterservice.hxx
+++ b/sfx2/source/inc/ownsubfilterservice.hxx
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index ed7c9a9c9d..ed7c9a9c9d 100644..100755
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index c4951614dc..c4951614dc 100644..100755
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index e6feb4ef55..e6feb4ef55 100644..100755
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index f1db7cf16a..bcff37b01a 100644..100755
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -39,7 +39,7 @@ class SfxRecordingFloatWrapper_Impl : public SfxChildWindow
     SfxBindings*		pBindings;
 public:
                         SfxRecordingFloatWrapper_Impl( Window* pParent ,
-                                                USHORT nId ,
+                                                sal_uInt16 nId ,
                                                 SfxBindings* pBindings ,
                                                 SfxChildWinInfo* pInfo );
                         ~SfxRecordingFloatWrapper_Impl();
@@ -58,7 +58,7 @@ public:
                             SfxChildWindow* pChildWin ,
                             Window* pParent );
     virtual             ~SfxRecordingFloat_Impl();
-    virtual BOOL        Close();
+    virtual sal_Bool        Close();
     virtual void        FillInfo( SfxChildWinInfo& rInfo ) const;
     virtual void		StateChanged( StateChangedType nStateChange );
 
diff --git a/sfx2/source/inc/referers.hxx b/sfx2/source/inc/referers.hxx
index 3f42928ba8..3f42928ba8 100644..100755
--- a/sfx2/source/inc/referers.hxx
+++ b/sfx2/source/inc/referers.hxx
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 313c7c2ab8..f2afb54b16 100644..100755
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -24,11 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//============================================================================
-// Lokale  Resourcen
-//
-// (C) 1996 - 2000 Star Division GmbH, Hamburg, Germany
-//----------------------------------------------------------------------------
+
+// local resources
+
 #ifndef _SFXLOCAL_HRC
 #define _SFXLOCAL_HRC
 
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 9956a7ab04..0f906699e7 100644..100755
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -64,7 +64,7 @@ class SfxPickList : public SfxListener
 
     static osl::Mutex*		GetOrCreateMutex();
     
-    void					CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const String& aURL, sal_uInt32 nNo );
+    void					CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURL, sal_uInt32 nNo );
     PickListEntry*			GetPickListEntry( sal_uInt32 nIndex );
     void					CreatePickListEntries();
     void					RemovePickListEntries();
@@ -77,7 +77,7 @@ class SfxPickList : public SfxListener
         sal_uInt32			GetAllowedMenuSize() { return m_nAllowedMenuSize; }
         sal_uInt32			GetNumOfEntries() const { return m_aPicklistVector.size(); }
         void				CreateMenuEntries( Menu* pMenu );
-        void				ExecuteMenuEntry( USHORT nId );
+        void				ExecuteMenuEntry( sal_uInt16 nId );
         void				ExecuteEntry( sal_uInt32 nIndex );
         String				GetMenuEntryTitle( sal_uInt32 nIndex );
 
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index b1396539e4..8ac1b797e0 100644..100755
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -53,12 +53,6 @@
 class SfxShell;
 class Timer;
 
-#if !defined(_SFX_APPCTOR_CXX) && defined(WNT)
-#ifndef _DLL_
-#error _DLL_ mal wieder nicht defined => GetpApp() == 0
-#endif
-#endif
-
 //------------------------------------------------------------------------
 
 // Macro fuer den Call-Profiler unter WinNT
@@ -152,29 +146,29 @@ struct StringList_Impl : private Resource
 
     ResId aResId;
 
-    StringList_Impl( const ResId& rErrIdP,  USHORT nId)
+    StringList_Impl( const ResId& rErrIdP,  sal_uInt16 nId)
         : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){}
     ~StringList_Impl() { FreeResource(); }
 
     String GetString(){ return String( aResId ); }
-    operator BOOL(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+    operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
 
 };
 
 #define SFX_DEL_PTRARR(pArr) 									\
             {                                                   \
-                for ( USHORT n = (pArr)->Count(); n--; )        \
+                for ( sal_uInt16 n = (pArr)->Count(); n--; )        \
                     delete (pArr)->GetObject(n);                \
                 DELETEX(pArr);                                  \
             }
 
 class SfxBoolResetter
 {
-    BOOL&				_rVar;
-    BOOL				_bOld;
+    sal_Bool&				_rVar;
+    sal_Bool				_bOld;
 
 public:
-                        SfxBoolResetter( BOOL &rVar )
+                        SfxBoolResetter( sal_Bool &rVar )
                         :	_rVar( rVar ),
                             _bOld( rVar )
                         {}
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 0bea52f42b..8f760c0a76 100644..100755
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -31,6 +31,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XMacroExpander.hpp>
 
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
@@ -40,6 +41,7 @@ class SfxURLRelocator_Impl
     ::osl::Mutex maMutex;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >           mxFactory;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > mxOfficeInstDirs;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander >                 mxMacroExpander;
 
 public:
     static bool                 propertyCanContainOfficeDir( const rtl::OUString & rPropName );
@@ -49,6 +51,9 @@ public:
 
     SfxURLRelocator_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
     ~SfxURLRelocator_Impl();
+
+private:
+    void implExpandURL( ::rtl::OUString& io_url );
 };
 
 #endif
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 65f297e3c6..22fb458756 100644..100755
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -36,14 +36,14 @@ class SfxSlotServer
 {
 private:
     const SfxSlot*		_pSlot;
-    USHORT				_nShellLevel;
+    sal_uInt16				_nShellLevel;
 
 public:
-                        SfxSlotServer( const SfxSlot &rSlot, USHORT nShell );
+                        SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell );
                         SfxSlotServer();
 
-    USHORT				GetShellLevel() const;
-    void				SetShellLevel(USHORT nLevel) { _nShellLevel = nLevel; }
+    sal_uInt16				GetShellLevel() const;
+    void				SetShellLevel(sal_uInt16 nLevel) { _nShellLevel = nLevel; }
     void				SetSlot(const SfxSlot* pSlot) {
                             _pSlot = pSlot;
                         }
@@ -53,7 +53,7 @@ public:
 
 //--------------------------------------------------------------------
 
-inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, USHORT nShell ):
+inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ):
     _pSlot( &rSlot),
     _nShellLevel( nShell )
 {
@@ -69,7 +69,7 @@ inline SfxSlotServer::SfxSlotServer():
 
 //--------------------------------------------------------------------
 
-inline USHORT SfxSlotServer::GetShellLevel() const
+inline sal_uInt16 SfxSlotServer::GetShellLevel() const
 {
     return _nShellLevel;
 }
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 30a4170f15..3f318662ab 100644..100755
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -45,21 +45,21 @@ private:
     SfxChildAlignment 	eAlign;
     SfxWorkWindow*		pWorkWin;
     SfxDockArr_Impl*	pDockArr;
-    BOOL				bLocked;
-    BOOL				bPinned;
+    sal_Bool				bLocked;
+    sal_Bool				bPinned;
     SfxEmptySplitWin_Impl*	pEmptyWin;
     SfxDockingWindow*	pActive;
 
     void				InsertWindow_Impl( SfxDock_Impl* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
     DECL_LINK(			TimerHdl, Timer* );
-    BOOL				CursorIsOverRect( BOOL bForceAdding = FALSE ) const;
-    void				SetPinned_Impl( BOOL );
-    void				SetFadeIn_Impl( BOOL );
+    sal_Bool				CursorIsOverRect( sal_Bool bForceAdding = sal_False ) const;
+    void				SetPinned_Impl( sal_Bool );
+    void				SetFadeIn_Impl( sal_Bool );
     void				SaveConfig_Impl();
     void				FadeOut_Impl();
 
@@ -73,57 +73,57 @@ protected:
 
 public:
                         SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
-                            SfxWorkWindow *pW, BOOL bWithButtons,
+                            SfxWorkWindow *pW, sal_Bool bWithButtons,
                             WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK );
 
                         ~SfxSplitWindow();
 
-    void				ReleaseWindow_Impl(SfxDockingWindow *pWin, BOOL bSaveConfig=TRUE);
+    void				ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True);
 
     void				InsertWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize);
 
     void				InsertWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
     void				MoveWindow( SfxDockingWindow* pDockWin,
                             const Size& rSize,
-                            USHORT nLine,
-                            USHORT nPos,
-                            BOOL bNewLine=FALSE );
+                            sal_uInt16 nLine,
+                            sal_uInt16 nPos,
+                            sal_Bool bNewLine=sal_False );
 
-    void				RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide=TRUE);
+    void				RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide=sal_True);
 
-    void				Lock( BOOL bLock=TRUE )
+    void				Lock( sal_Bool bLock=sal_True )
                         {
                             bLocked = bLock;
                             SetUpdateMode( !bLock );
                         }
         using Window::IsLocked;
-    BOOL				IsLocked() const { return bLocked; }
-    BOOL				GetWindowPos( const SfxDockingWindow* pWindow,
-                                      USHORT& rLine, USHORT& rPos ) const;
-    BOOL				GetWindowPos( const Point& rTestPos,
-                                      USHORT& rLine, USHORT& rPos ) const;
-    USHORT				GetLineCount() const;
-    long				GetLineSize( USHORT ) const;
-    USHORT				GetWindowCount(USHORT nLine) const;
-    USHORT				GetWindowCount() const;
-
-    BOOL				IsPinned() const { return bPinned; }
-    BOOL				IsFadeIn() const;
-    BOOL				IsAutoHide( BOOL bSelf = FALSE ) const;
+    sal_Bool				IsLocked() const { return bLocked; }
+    sal_Bool				GetWindowPos( const SfxDockingWindow* pWindow,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const;
+    sal_Bool				GetWindowPos( const Point& rTestPos,
+                                      sal_uInt16& rLine, sal_uInt16& rPos ) const;
+    sal_uInt16				GetLineCount() const;
+    long				GetLineSize( sal_uInt16 ) const;
+    sal_uInt16				GetWindowCount(sal_uInt16 nLine) const;
+    sal_uInt16				GetWindowCount() const;
+
+    sal_Bool				IsPinned() const { return bPinned; }
+    sal_Bool				IsFadeIn() const;
+    sal_Bool				IsAutoHide( sal_Bool bSelf = sal_False ) const;
     SplitWindow*		GetSplitWindow();
 
     virtual void		AutoHide();
     virtual void		FadeOut();
     virtual void		FadeIn();
     void				Show_Impl();
-    void				Pin_Impl( BOOL bPinned );
-    BOOL				ActivateNextChild_Impl( BOOL bForward = TRUE );
+    void				Pin_Impl( sal_Bool bPinned );
+    sal_Bool				ActivateNextChild_Impl( sal_Bool bForward = sal_True );
     void				SetActiveWindow_Impl( SfxDockingWindow* pWin );
 };
 
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 955c805885..31b3ee7937 100644..100755
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -92,7 +92,7 @@ friend class BindDispatch_Impl;
 
 private:
                             SfxStateCache( const SfxStateCache& rOrig ); // n.i.
-    void					SetState_Impl( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
+    void					SetState_Impl( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
 
 public:
                             SfxStateCache( sal_uInt16 nFuncId );
@@ -110,11 +110,11 @@ public:
     SfxPoolItem*			GetItem() const { return pLastItem; }
     void					ClearCache();
 
-    void					SetState( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
-    void					SetCachedState(BOOL bAlways = FALSE);
+    void					SetState( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
+    void					SetCachedState(sal_Bool bAlways = sal_False);
     void					DeleteFloatingWindows();
     void					Invalidate( sal_Bool bWithSlot );
-    void                    SetVisibleState( BOOL bShow=TRUE );
+    void                    SetVisibleState( sal_Bool bShow=sal_True );
 
     SfxControllerItem*		ChangeItemLink( SfxControllerItem* pNewBinding );
     SfxControllerItem*		GetItemLink() const;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 295dd2d6d4..6469b408aa 100644..100755
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -70,7 +70,7 @@ private:
 
 protected:
     SfxCommonTemplateDialog_Impl* pDialog;
-    USHORT                        nModifier;
+    sal_uInt16                        nModifier;
 
 public:
     DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) :
@@ -83,7 +83,7 @@ public:
     using SvLBox::ExecuteDrop;
     virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
 
-    USHORT           GetModifier() const { return nModifier; }
+    sal_uInt16           GetModifier() const { return nModifier; }
 
     virtual long     Notify( NotifyEvent& rNEvt );
 };
@@ -161,11 +161,11 @@ protected:
     ListBox						aFilterLb;
     Size						aSize;
 
-    USHORT						nActFamily;	// Id in der ToolBox = Position - 1
-    USHORT						nActFilter;	// FilterIdx
-    USHORT						nAppFilter;	// Filter, den die Applikation gesetzt hat (fuer automatisch)
+    sal_uInt16						nActFamily;	// Id in der ToolBox = Position - 1
+    sal_uInt16						nActFilter;	// FilterIdx
+    sal_uInt16						nAppFilter;	// Filter, den die Applikation gesetzt hat (fuer automatisch)
 
-    BOOL						bDontUpdate				:1,
+    sal_Bool						bDontUpdate				:1,
                                 bIsWater				:1,
                                 bEnabled				:1,
                                 bUpdate					:1,
@@ -187,14 +187,14 @@ protected:
     DECL_LINK( TimeOut, Timer * );
 
 
-    virtual void		EnableItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
-    virtual void		CheckItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
-    virtual BOOL		IsCheckedItem( USHORT /*nMesId*/ ) { return TRUE; }
+    virtual void		EnableItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+    virtual void		CheckItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+    virtual sal_Bool		IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return sal_True; }
     virtual void		LoadedFamilies() {}
     virtual void		Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); }
     virtual void		InvalidateBindings();
-    virtual void		InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten ) = 0;
-    virtual void		EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE ) = 0;
+    virtual void		InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0;
+    virtual void		EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) = 0;
     virtual void		ClearFamilyList() = 0;
     virtual void        ReplaceUpdateButtonByMenu();
 
@@ -202,37 +202,37 @@ protected:
     void				EditHdl( void* );
     void				DeleteHdl( void* );
 
-    BOOL				Execute_Impl( USHORT nId, const String& rStr, const String& rRefStr,
-                                      USHORT nFamily, USHORT nMask = 0,
-                                      USHORT* pIdx = NULL, const USHORT* pModifier = NULL );
+    sal_Bool				Execute_Impl( sal_uInt16 nId, const String& rStr, const String& rRefStr,
+                                      sal_uInt16 nFamily, sal_uInt16 nMask = 0,
+                                      sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = NULL );
 
-    void						UpdateStyles_Impl(USHORT nFlags);
+    void						UpdateStyles_Impl(sal_uInt16 nFlags);
     const SfxStyleFamilyItem*	GetFamilyItem_Impl() const;
-    BOOL						IsInitialized() { return nActFamily != 0xffff; }
+    sal_Bool						IsInitialized() { return nActFamily != 0xffff; }
     void						ResetFocus();
     void						EnableDelete();
     void						Initialize();
 
-    void				FilterSelect( USHORT nFilterIdx, BOOL bForce = FALSE );
-    void				SetFamilyState( USHORT nSlotId, const SfxTemplateItem* );
+    void				FilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = sal_False );
+    void				SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* );
     void				SetWaterCanState( const SfxBoolItem* pItem );
 
     void				SelectStyle( const String& rStyle );
-    BOOL				HasSelectedStyle() const;
+    sal_Bool				HasSelectedStyle() const;
     void				FillTreeBox();
     void				Update_Impl();
     void				UpdateFamily_Impl();
 
     // In welchem FamilyState muss ich nachsehen, um die Info der i-ten
     // Family in der pStyleFamilies zu bekommen.
-    USHORT				StyleNrToInfoOffset( USHORT i );
-    USHORT				InfoOffsetToStyleNr( USHORT i );
+    sal_uInt16				StyleNrToInfoOffset( sal_uInt16 i );
+    sal_uInt16				InfoOffsetToStyleNr( sal_uInt16 i );
 
     void				Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void				FamilySelect( USHORT nId );
-    void				SetFamily( USHORT nId );
-    void				ActionSelect( USHORT nId );
+    void				FamilySelect( sal_uInt16 nId );
+    void				SetFamily( sal_uInt16 nId );
+    void				ActionSelect( sal_uInt16 nId );
 
     sal_Int32           LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh );
     void                SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter );
@@ -246,31 +246,31 @@ public:
 
     DECL_LINK( MenuSelectHdl, Menu * );
 
-    virtual void		EnableEdit( BOOL b = TRUE )	{ bCanEdit = b; }
-    virtual void		EnableDel( BOOL b = TRUE )	{ bCanDel = b; }
-    virtual void		EnableNew( BOOL b = TRUE )	{ bCanNew = b; }
+    virtual void		EnableEdit( sal_Bool b = sal_True )	{ bCanEdit = b; }
+    virtual void		EnableDel( sal_Bool b = sal_True )	{ bCanDel = b; }
+    virtual void		EnableNew( sal_Bool b = sal_True )	{ bCanNew = b; }
 
     ISfxTemplateCommon*	GetISfxTemplateCommon() { return &aISfxTemplateCommon; }
     Window*				GetWindow() { return pWindow; }
 
-    void				EnableTreeDrag( BOOL b = TRUE );
+    void				EnableTreeDrag( sal_Bool b = sal_True );
     void				ExecuteContextMenu_Impl( const Point& rPos, Window* pWin );
-    void				EnableExample_Impl( USHORT nId, BOOL bEnable );
+    void				EnableExample_Impl( sal_uInt16 nId, sal_Bool bEnable );
     SfxStyleFamily		GetActualFamily() const;
     String				GetSelectedEntry() const;
     SfxObjectShell*		GetObjectShell() const { return pCurObjShell; }
 
     virtual void		PrepareDeleteAction();	// disable buttons, change button text, etc. when del is going to happen
 
-    inline BOOL			CanEdit( void ) const	{ return bCanEdit; }
-    inline BOOL			CanDel( void ) const	{ return bCanDel; }
-    inline BOOL			CanNew( void ) const	{ return bCanNew; }
+    inline sal_Bool			CanEdit( void ) const	{ return bCanEdit; }
+    inline sal_Bool			CanDel( void ) const	{ return bCanDel; }
+    inline sal_Bool			CanNew( void ) const	{ return bCanNew; }
 
     // normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus
     virtual PopupMenu*	CreateContextMenu( void );
 
     // Rechnet von den SFX_STYLE_FAMILY Ids auf 1-5 um
-    static USHORT       SfxFamilyIdToNId( SfxStyleFamily nFamily );
+    static sal_uInt16       SfxFamilyIdToNId( SfxStyleFamily nFamily );
 
     void                SetAutomaticFilter();
 };
@@ -295,7 +295,7 @@ private:
     friend class DropToolBox_Impl;
 
     SfxTemplateDialog*	m_pFloat;
-    BOOL				m_bZoomIn;
+    sal_Bool				m_bZoomIn;
     DropToolBox_Impl    m_aActionTbL;
     ToolBox				m_aActionTbR;
 
@@ -306,13 +306,13 @@ private:
 
 protected:
     virtual void	Command( const CommandEvent& rMEvt );
-    virtual void	EnableEdit( BOOL = TRUE );
-    virtual void	EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual void	CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual BOOL	IsCheckedItem( USHORT nMesId );
+    virtual void	EnableEdit( sal_Bool = sal_True );
+    virtual void	EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual void	CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual sal_Bool	IsCheckedItem( sal_uInt16 nMesId );
     virtual void	LoadedFamilies();
-    virtual void	InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
-    virtual void	EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+    virtual void	InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+    virtual void	EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
     virtual void	ClearFamilyList();
     virtual void    ReplaceUpdateButtonByMenu();
 
@@ -352,15 +352,15 @@ private:
     SfxModalDefParentHelper	aHelper;
 
 protected:
-    virtual void	EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual void	CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
-    virtual BOOL	IsCheckedItem( USHORT nMesId );
-    virtual void	InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
-    virtual void	EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+    virtual void	EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual void	CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+    virtual sal_Bool	IsCheckedItem( sal_uInt16 nMesId );
+    virtual void	InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+    virtual void	EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
     virtual void	ClearFamilyList();
-    virtual void	EnableEdit( BOOL = TRUE );
-    virtual void	EnableDel( BOOL = TRUE );
-    virtual void	EnableNew( BOOL = TRUE );
+    virtual void	EnableEdit( sal_Bool = sal_True );
+    virtual void	EnableDel( sal_Bool = sal_True );
+    virtual void	EnableNew( sal_Bool = sal_True );
 
         using SfxCommonTemplateDialog_Impl::NewHdl;
     DECL_LINK( FamListSelect, ListBox * );
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index da2c3b2549..bcd2e06e9c 100644..100755
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -35,17 +35,17 @@ class SfxCommonTemplateDialog_Impl;
 
 class SfxTemplateControllerItem: public SfxControllerItem {
     SfxCommonTemplateDialog_Impl  &rTemplateDlg;
-    BYTE                            nWaterCanState;
+    sal_uInt8                            nWaterCanState;
     long                            nUserEventId;
 
     DECL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
                                 SfxTemplateControllerItem*);
 
 protected:
-    virtual void	StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void	StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SfxTemplateControllerItem( USHORT nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
+    SfxTemplateControllerItem( sal_uInt16 nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
     ~SfxTemplateControllerItem();
 };
 
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index df486fc25a..df486fc25a 100644..100755
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 41dab39d52..b9abe7af6f 100644..100755
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -98,7 +98,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog
 
 public:
                                 SfxViewVersionDialog_Impl( Window *pParent,
-                                    SfxVersionInfo& rInfo, BOOL bEdit );
+                                    SfxVersionInfo& rInfo, sal_Bool bEdit );
  };
 
 #endif
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 6fedf28a63..33e2fe1da3 100644..100755
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -55,16 +55,16 @@ private:
     PopupMenu*      pPickMenu;
     PopupMenu*		pAddonsMenu;
     Timer*			pAutoDeactivate; // Hack fuer QAP-Bug
-    USHORT          nVisibleItems;
-    USHORT          nId;
-    USHORT          nCount;
-    USHORT			nLocks;
-    BOOL            bResCtor : 1; // SV Menu created from resource
-    BOOL			bOLE : 1;	  // InPlaceMenu
-    BOOL			bHelpInitialized : 1;
-    BOOL			bIsActive : 1;
-    BOOL			bControllersUnBound : 1;
-    BOOL			bIsAddonPopupMenu : 1;
+    sal_uInt16          nVisibleItems;
+    sal_uInt16          nId;
+    sal_uInt16          nCount;
+    sal_uInt16			nLocks;
+    sal_Bool            bResCtor : 1; // SV Menu created from resource
+    sal_Bool			bOLE : 1;	  // InPlaceMenu
+    sal_Bool			bHelpInitialized : 1;
+    sal_Bool			bIsActive : 1;
+    sal_Bool			bControllersUnBound : 1;
+    sal_Bool			bIsAddonPopupMenu : 1;
 
 private:
     void			Construct_Impl();
@@ -77,8 +77,8 @@ private:
     void			BindControllers();
 
 protected:
-    SfxVirtualMenu( USHORT nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, BOOL bWithHelp,
-                        SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
+    SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, sal_Bool bWithHelp,
+                        SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
 
     void            CreateFromSVMenu();
     DECL_LINK( Highlight, Menu * );
@@ -93,21 +93,21 @@ protected:
 
 public:
                     ~SfxVirtualMenu();
-                    SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
-                        SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
-    void            CheckItem( USHORT nItemId, BOOL bCheck );
-    void            EnableItem( USHORT nItemId, BOOL bEnable );
-    void            SetItemText( USHORT nItemId, const String& rText );
+                    SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+                        SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
+    void            CheckItem( sal_uInt16 nItemId, sal_Bool bCheck );
+    void            EnableItem( sal_uInt16 nItemId, sal_Bool bEnable );
+    void            SetItemText( sal_uInt16 nItemId, const String& rText );
 
-    USHORT          GetItemPos( USHORT nItemId ) const;
+    sal_uInt16          GetItemPos( sal_uInt16 nItemId ) const;
 
-    USHORT          GetItemCount() const;
+    sal_uInt16          GetItemCount() const;
     Menu*           GetSVMenu() const;
-    SfxMenuControl& operator[]( USHORT nPos ) const;
+    SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
 
-    USHORT          GetItemId( USHORT nPos ) const;
-    SfxVirtualMenu* GetPopupMenu( USHORT nId ) const;
-    String          GetItemText( USHORT nId ) const;
+    sal_uInt16          GetItemId( sal_uInt16 nPos ) const;
+    SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const;
+    String          GetItemText( sal_uInt16 nId ) const;
 
     //void            InvalidateKeyCodes();
 
@@ -115,10 +115,10 @@ public:
     void			SetParentMenu( SfxVirtualMenu* pNewParent )
                     { pParent = pNewParent; }
 
-    void			SetPopupMenu( USHORT nId, PopupMenu *pMenu );
-    BOOL			IsFromResource() const
+    void			SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
+    sal_Bool			IsFromResource() const
                     { return bResCtor; }
-    void			InitPopup(USHORT nPos, BOOL bOLE = TRUE);
+    void			InitPopup(sal_uInt16 nPos, sal_Bool bOLE = sal_True);
     void 			InitializeHelp();
     void			SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*			GetResMgr() { return pResMgr; }
@@ -132,7 +132,7 @@ public:
 
 // return the number of virtual items in this menu
 
-inline USHORT SfxVirtualMenu::GetItemCount() const
+inline sal_uInt16 SfxVirtualMenu::GetItemCount() const
 {
     return nCount;
 }
@@ -140,7 +140,7 @@ inline USHORT SfxVirtualMenu::GetItemCount() const
 
 //
 
-inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
+inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const
 {
     return *(pItems+nPos);
 }
@@ -148,7 +148,7 @@ inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
 
 // returns the item id at position nPos in the menu (or 0 if sep.)
 
-inline USHORT SfxVirtualMenu::GetItemId( USHORT nPos ) const
+inline sal_uInt16 SfxVirtualMenu::GetItemId( sal_uInt16 nPos ) const
 {
     return pItems ? pItems[nPos].GetId() : 0;
 }
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 88e2ca87ab..6b859d19aa 100644..100755
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -29,6 +29,7 @@
 #define _SFXWORKWIN_HXX
 
 #include <vector>
+#include <deque>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
@@ -59,10 +60,10 @@ class SfxWorkWindow;
 
 struct SfxObjectBar_Impl
 {
-    USHORT        nId;   // Resource - und ConfigId der Toolbox
-    USHORT        nMode; // spezielle Sichtbarkeitsflags
-    USHORT        nPos;
-    USHORT        nIndex;
+    sal_uInt16        nId;   // Resource - und ConfigId der Toolbox
+    sal_uInt16        nMode; // spezielle Sichtbarkeitsflags
+    sal_uInt16        nPos;
+    sal_uInt16        nIndex;
     sal_Bool      bDestroy;
     String        aName;
     SfxInterface* pIFace;
@@ -79,14 +80,14 @@ struct SfxObjectBar_Impl
 // Dieser struct h"alt alle relevanten Informationen "uber die Statuszeile bereit.
 struct SfxStatBar_Impl
 {
-    USHORT					nId;
-    BOOL					bOn;
-    BOOL					bTemp;
+    sal_uInt16					nId;
+    sal_Bool					bOn;
+    sal_Bool					bTemp;
 
     SfxStatBar_Impl() :
         nId(0),
-        bOn(TRUE),
-        bTemp(FALSE)
+        bOn(sal_True),
+        bTemp(sal_False)
     {}
 };
 
@@ -104,15 +105,15 @@ struct SfxChild_Impl
     Window*             			pWin;
     Size                			aSize;
     SfxChildAlignment				eAlign;
-    USHORT							nVisible;
-    BOOL							bResize;
-    BOOL							bCanGetFocus;
-    BOOL							bSetFocus;
+    sal_uInt16							nVisible;
+    sal_Bool							bResize;
+    sal_Bool							bCanGetFocus;
+    sal_Bool							bSetFocus;
 
     SfxChild_Impl( Window& rChild, const Size& rSize,
-                   SfxChildAlignment eAlignment, BOOL bIsVisible ):
-        pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(FALSE),
-        bCanGetFocus( FALSE ), bSetFocus( FALSE )
+                   SfxChildAlignment eAlignment, sal_Bool bIsVisible ):
+        pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(sal_False),
+        bCanGetFocus( sal_False ), bSetFocus( sal_False )
     {
         nVisible = bIsVisible ? CHILD_VISIBLE : CHILD_NOT_VISIBLE;
     }
@@ -124,34 +125,34 @@ class SfxChildWinController_Impl : public SfxControllerItem
     SfxWorkWindow*	pWorkwin;
 
     public:
-                    SfxChildWinController_Impl( USHORT nId, SfxWorkWindow *pWin );
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+                    SfxChildWinController_Impl( sal_uInt16 nId, SfxWorkWindow *pWin );
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                             const SfxPoolItem* pState );
 };
 
 struct SfxChildWin_Impl
 {
-    USHORT							nSaveId;		// die ChildWindow-Id
-    USHORT							nInterfaceId;	// der aktuelle Context
-    USHORT							nId;        	// aktuelle Id
+    sal_uInt16							nSaveId;		// die ChildWindow-Id
+    sal_uInt16							nInterfaceId;	// der aktuelle Context
+    sal_uInt16							nId;        	// aktuelle Id
     SfxChildWindow* 				pWin;
-    BOOL							bCreate;
+    sal_Bool							bCreate;
     SfxChildWinInfo					aInfo;
     SfxChild_Impl*					pCli;			// != 0 bei direkten Children
-    USHORT							nVisibility;
-    BOOL							bEnable;
-    BOOL							bDisabled;
+    sal_uInt16							nVisibility;
+    sal_Bool							bEnable;
+    sal_Bool							bDisabled;
 
     SfxChildWin_Impl( sal_uInt32 nID ) :
-        nSaveId((USHORT) (nID & 0xFFFF) ),
-        nInterfaceId((USHORT) (nID >> 16)),
+        nSaveId((sal_uInt16) (nID & 0xFFFF) ),
+        nInterfaceId((sal_uInt16) (nID >> 16)),
         nId(nSaveId),
         pWin(0),
-        bCreate(FALSE),
+        bCreate(sal_False),
         pCli(0),
-        nVisibility( FALSE ),
-        bEnable( TRUE ),
-        bDisabled( FALSE )
+        nVisibility( sal_False ),
+        bEnable( sal_True ),
+        bDisabled( sal_False )
     {}
 };
 
@@ -174,14 +175,13 @@ enum SfxDockingConfig
 DECL_PTRARRAY( SfxChildList_Impl, SfxChild_Impl*, 2, 2 )
 DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 )
 
-SV_DECL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl, 1, 2 )
 
 struct SfxObjectBarList_Impl
 {
-    SfxObjectBarArr_Impl	aArr;
-    USHORT 					nAct;
+    std::deque<SfxObjectBar_Impl>	aArr;
+    sal_uInt16 					nAct;
 
-    SfxObjectBar_Impl 		operator[] ( USHORT n )
+    SfxObjectBar_Impl 		operator[] ( sal_uInt16 n )
                             { return aArr[n]; }
     SfxObjectBar_Impl 		Actual()
                             { return aArr[nAct]; }
@@ -257,15 +257,15 @@ protected:
     Window*					pWorkWin;
     SfxShell*				pConfigShell;
     Window*					pActiveChild;
-    USHORT					nUpdateMode;
-    USHORT					nChilds;
-    USHORT					nOrigMode;
-    BOOL                    bSorted : 1;
-    BOOL                    bDockingAllowed : 1;
-    BOOL                    bInternalDockingAllowed : 1;
-    BOOL                    bAllChildsVisible : 1;
-    BOOL                    bIsFullScreen : 1;
-    BOOL                    bShowStatusBar : 1;
+    sal_uInt16					nUpdateMode;
+    sal_uInt16					nChilds;
+    sal_uInt16					nOrigMode;
+    sal_Bool                    bSorted : 1;
+    sal_Bool                    bDockingAllowed : 1;
+    sal_Bool                    bInternalDockingAllowed : 1;
+    sal_Bool                    bAllChildsVisible : 1;
+    sal_Bool                    bIsFullScreen : 1;
+    sal_Bool                    bShowStatusBar : 1;
     sal_Int32               m_nLock;
     rtl::OUString           m_aStatusBarResName;
     rtl::OUString           m_aLayoutManagerPropName;
@@ -274,13 +274,13 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener;
 
 protected:
-    void					CreateChildWin_Impl(SfxChildWin_Impl*,BOOL);
+    void					CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool);
     void					RemoveChildWin_Impl(SfxChildWin_Impl*);
     void				  	Sort_Impl();
     void            		AlignChild_Impl( Window& rWindow, const Size& rNewSize,
                                      SfxChildAlignment eAlign );
     SfxChild_Impl* 			FindChild_Impl( const Window& rWindow ) const;
-    virtual BOOL			RequestTopToolSpacePixel_Impl( SvBorder aBorder );
+    virtual sal_Bool			RequestTopToolSpacePixel_Impl( SvBorder aBorder );
     virtual Rectangle       GetTopRect_Impl();
     SvBorder                Arrange_Impl();
     virtual void			SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&);
@@ -294,14 +294,14 @@ public:
                             { return *pBindings; }
     Window*					GetWindow() const
                             { return pWorkWin; }
-    Rectangle				GetFreeArea( BOOL bAutoHide ) const;
-    void					SetDockingAllowed(BOOL bSet)
+    Rectangle				GetFreeArea( sal_Bool bAutoHide ) const;
+    void					SetDockingAllowed(sal_Bool bSet)
                             { bDockingAllowed = bSet; }
-    void                    SetInternalDockingAllowed(BOOL bSet)
+    void                    SetInternalDockingAllowed(sal_Bool bSet)
                             { bInternalDockingAllowed = bSet; }
-    BOOL					IsDockingAllowed() const
+    sal_Bool					IsDockingAllowed() const
                             { return bDockingAllowed; }
-    BOOL                    IsInternalDockingAllowed() const
+    sal_Bool                    IsInternalDockingAllowed() const
                             { return bInternalDockingAllowed; }
     SfxWorkWindow*			GetParent_Impl() const
                             { return pParent; }
@@ -310,64 +310,64 @@ public:
     // Methoden f"ur alle Child-Fenster
     void                    DataChanged_Impl( const DataChangedEvent& rDCEvt );
     void            		ReleaseChild_Impl( Window& rWindow );
-    SfxChild_Impl*          RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, BOOL bCanGetFocus=FALSE );
+    SfxChild_Impl*          RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
     void					ShowChilds_Impl();
     void					HideChilds_Impl();
     void    				Close_Impl();
-    BOOL    				PrepareClose_Impl();
-    virtual void			ArrangeChilds_Impl( BOOL bForce = TRUE );
+    sal_Bool    				PrepareClose_Impl();
+    virtual void			ArrangeChilds_Impl( sal_Bool bForce = sal_True );
     void					DeleteControllers_Impl();
     void                    SaveStatus_Impl();
-    void 					HidePopups_Impl(BOOL bHide, BOOL bParent=FALSE, USHORT nId=0);
+    void 					HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
     void            		ConfigChild_Impl(SfxChildIdentifier,
-                                             SfxDockingConfig, USHORT);
-    void					MakeChildsVisible_Impl( BOOL bVis );
+                                             SfxDockingConfig, sal_uInt16);
+    void					MakeChildsVisible_Impl( sal_Bool bVis );
     void					ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
-    BOOL					IsAutoHideMode( const SfxSplitWindow *pSplit );
+    sal_Bool					IsAutoHideMode( const SfxSplitWindow *pSplit );
     void                    EndAutoShow_Impl( Point aPos );
-    void                    SetFullScreen_Impl( BOOL bSet ) { bIsFullScreen = bSet; }
-    BOOL                    IsFullScreen_Impl() const { return bIsFullScreen; }
+    void                    SetFullScreen_Impl( sal_Bool bSet ) { bIsFullScreen = bSet; }
+    sal_Bool                    IsFullScreen_Impl() const { return bIsFullScreen; }
 
     // Methoden f"ur Objectbars
     virtual void            UpdateObjectBars_Impl();
     void            		ResetObjectBars_Impl();
-    void					SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
+    void					SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
                                     SfxInterface *pIFace, const String* pName=0 );
-    Window* 				GetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId );
-    bool                    KnowsObjectBar_Impl( USHORT nPos ) const;
-    BOOL                    IsVisible_Impl();
-    void                    MakeVisible_Impl( BOOL );
-    void					SetObjectBarVisibility_Impl( USHORT nVis );
-    BOOL					IsContainer_Impl() const;
-    void                    Lock_Impl( BOOL );
-    void					NextObjectBar_Impl( USHORT nPos );
-    USHORT  				HasNextObjectBar_Impl( USHORT nPos, String* pStr=0 );
-    void                    SetObjectBarCustomizeMode_Impl( BOOL );
+    Window* 				GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId );
+    bool    				KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
+    sal_Bool                    IsVisible_Impl();
+    void                    MakeVisible_Impl( sal_Bool );
+    void					SetObjectBarVisibility_Impl( sal_uInt16 nVis );
+    sal_Bool					IsContainer_Impl() const;
+    void                    Lock_Impl( sal_Bool );
+    void					NextObjectBar_Impl( sal_uInt16 nPos );
+    sal_uInt16  				HasNextObjectBar_Impl( sal_uInt16 nPos, String* pStr=0 );
+    void                    SetObjectBarCustomizeMode_Impl( sal_Bool );
 
     // Methoden f"ur ChildWindows
     void            		UpdateChildWindows_Impl();
     void					ResetChildWindows_Impl();
-    void					SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT );
-    void                    ToggleChildWindow_Impl(USHORT,BOOL);
-    BOOL					HasChildWindow_Impl(USHORT);
-    BOOL					KnowsChildWindow_Impl(USHORT);
-    void                    ShowChildWindow_Impl(USHORT, BOOL bVisible, BOOL bSetFocus);
-    void                    SetChildWindow_Impl(USHORT, BOOL bOn, BOOL bSetFocus);
-    SfxChildWindow* 		GetChildWindow_Impl(USHORT);
+    void					SetChildWindowVisible_Impl( sal_uInt32, sal_Bool, sal_uInt16 );
+    void                    ToggleChildWindow_Impl(sal_uInt16,sal_Bool);
+    sal_Bool					HasChildWindow_Impl(sal_uInt16);
+    sal_Bool					KnowsChildWindow_Impl(sal_uInt16);
+    void                    ShowChildWindow_Impl(sal_uInt16, sal_Bool bVisible, sal_Bool bSetFocus);
+    void                    SetChildWindow_Impl(sal_uInt16, sal_Bool bOn, sal_Bool bSetFocus);
+    SfxChildWindow* 		GetChildWindow_Impl(sal_uInt16);
     virtual void			InitializeChild_Impl(SfxChildWin_Impl*);
     SfxSplitWindow*			GetSplitWindow_Impl(SfxChildAlignment);
 
-    BOOL                    IsVisible_Impl( USHORT nMode ) const;
-    void 					DisableChildWindow_Impl( USHORT nId, BOOL bDisable );
-    BOOL					IsFloating( USHORT nId );
+    sal_Bool                    IsVisible_Impl( sal_uInt16 nMode ) const;
+    void 					DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable );
+    sal_Bool					IsFloating( sal_uInt16 nId );
     void 					ChangeWindow_Impl( Window *pNew );
     void					SetActiveChild_Impl( Window *pChild );
     Window*					GetActiveChild_Impl();
-    virtual BOOL			ActivateNextChild_Impl( BOOL bForward = TRUE );
+    virtual sal_Bool			ActivateNextChild_Impl( sal_Bool bForward = sal_True );
     bool                    AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
 
     // Methoden f"ur StatusBar
-    void                    SetTempStatusBar_Impl( BOOL bSet );
+    void                    SetTempStatusBar_Impl( sal_Bool bSet );
     void					ResetStatusBar_Impl();
     void					SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& );
     void					UpdateStatusBar_Impl();
@@ -381,7 +381,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
     SfxFrame*           pFrame;
 public:
                         SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
-    virtual void        ArrangeChilds_Impl( BOOL bForce = TRUE );
+    virtual void        ArrangeChilds_Impl( sal_Bool bForce = sal_True );
     virtual void        UpdateObjectBars_Impl();
     virtual Rectangle   GetTopRect_Impl();
 };
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 3ab1142066..4fba505b6e 100644..100755
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::task;
 
 SFX_IMPL_TOOLBOX_CONTROL(SfxURLToolBoxControl_Impl,SfxStringItem)
 
-SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox )
+SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox ),
     pAccExec( 0 )
 {
@@ -92,7 +92,7 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const
 
 //***************************************************************************
 
-void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) const
+void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ ) const
 {
     String aName;
     String aFilter;
@@ -181,7 +181,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, SelectHdl, void*, EMPTYARG )
     String aName( pURLBox->GetURL() );
 
     if ( !pURLBox->IsTravelSelect() && aName.Len() )
-        OpenURL( aName, FALSE );
+        OpenURL( aName, sal_False );
 
     return 1L;
 }
@@ -231,7 +231,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEve
 
 void SfxURLToolBoxControl_Impl::StateChanged
 (
-    USHORT              nSID,
+    sal_uInt16              nSID,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
diff --git a/sfx2/source/inet/makefile.mk b/sfx2/source/inet/makefile.mk
deleted file mode 100644
index 9347e68a2c..0000000000
--- a/sfx2/source/inet/makefile.mk
+++ /dev/null
@@ -1,48 +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=sfx2
-TARGET=inet
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-                $(SLO)$/inettbc.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/layout/factory.cxx b/sfx2/source/layout/factory.cxx
index 87a24531d0..87a24531d0 100644..100755
--- a/sfx2/source/layout/factory.cxx
+++ b/sfx2/source/layout/factory.cxx
diff --git a/sfx2/source/layout/sfxdialog.cxx b/sfx2/source/layout/sfxdialog.cxx
index c4b08357b4..c4b08357b4 100644..100755
--- a/sfx2/source/layout/sfxdialog.cxx
+++ b/sfx2/source/layout/sfxdialog.cxx
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index ad1ca52446..d3b91172d7 100644..100755
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -43,8 +43,8 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxresid.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxdlg.hxx>
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
index f2e3b713bc..f2e3b713bc 100644..100755
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ b/sfx2/source/layout/sfxtabpage.cxx
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
deleted file mode 100644
index 8b55bd0840..0000000000
--- a/sfx2/source/menu/makefile.mk
+++ /dev/null
@@ -1,55 +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=sfx2
-TARGET=menu
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = menu.src
-
-SLOFILES =	\
-        $(SLO)$/mnuitem.obj \
-        $(SLO)$/mnumgr.obj \
-        $(SLO)$/objmnctl.obj \
-        $(SLO)$/thessubmenu.obj \
-        $(SLO)$/virtmenu.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index 3b89f474c3..3b89f474c3 100644..100755
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.hrc
diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index cf13af67c3..17008794bd 100644..100755
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/menu.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "menu.hrc"
+#include <sfx2/sfxcommands.h>
 
 String STR_MENU_CFGITEM
 {
@@ -44,19 +45,19 @@ Menu MN_CLIPBOARDFUNCS
         MenuItem
         {
             Identifier = SID_CUT ;
-            HelpID = SID_CUT ;
+            HelpID = CMD_SID_CUT ;
             Text [ en-US ] = "Cu~t" ;
         };
         MenuItem
         {
             Identifier = SID_COPY ;
-            HelpID = SID_COPY ;
+            HelpID = CMD_SID_COPY ;
             Text [ en-US ] = "~Copy" ;
         };
         MenuItem
         {
             Identifier = SID_PASTE ;
-            HelpID = SID_PASTE ;
+            HelpID = CMD_SID_PASTE ;
             Text [ en-US ] = "~Paste" ;
         };
     };
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 13ec119033..22f164b04b 100644..100755
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -58,7 +58,6 @@
 #include <sfx2/dispatch.hxx>
 #include "idpool.hxx"
 #include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
 #include "virtmenu.hxx"
 #include <sfx2/mnuitem.hxx>
 #include <sfx2/tbxctrl.hxx>
@@ -66,9 +65,9 @@
 #include <sfx2/module.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "imgmgr.hxx"
-#include "imagemgr.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "../doc/doc.hrc"
 
 using namespace ::com::sun::star::uno;
@@ -80,7 +79,7 @@ using namespace ::com::sun::star::util;
 
 class SfxEnumMenu: public PopupMenu
 {
-    USHORT			nSlot;
+    sal_uInt16			nSlot;
     SfxEnumItem    *pItem;
     SfxBindings*    pBindings;
 
@@ -88,20 +87,20 @@ protected:
     virtual void	Select();
 
 public:
-                    SfxEnumMenu( USHORT nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
+                    SfxEnumMenu( sal_uInt16 nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
                     ~SfxEnumMenu();
 };
 
 //=========================================================================
 
-SfxEnumMenu::SfxEnumMenu( USHORT nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
+SfxEnumMenu::SfxEnumMenu( sal_uInt16 nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
     nSlot( nSlotId ),
     pItem( (SfxEnumItem*) rItem.Clone() ),
     pBindings( pBind )
 {
-    for ( USHORT nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
+    for ( sal_uInt16 nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
         InsertItem( nVal+1, pItem->GetValueTextByPos(nVal) );
-    CheckItem( pItem->GetValue() + 1, TRUE );
+    CheckItem( pItem->GetValue() + 1, sal_True );
 }
 
 //-------------------------------------------------------------------------
@@ -137,7 +136,7 @@ void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu )
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const String& rTitle,
     SfxBindings &rBindings )
 {
@@ -161,7 +160,7 @@ void SfxMenuControl::Bind(
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     SfxVirtualMenu& rMenu,
     const String& rTitle,
     SfxBindings &rBindings )
@@ -178,7 +177,7 @@ void SfxMenuControl::Bind(
 
 // ctor for explicit registration
 
-SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
+SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
 :	pOwnMenu(0),
     pSubMenu(0),
     b_ShowStrings(bShowStrings)
@@ -191,18 +190,18 @@ SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
 SfxMenuControl::SfxMenuControl():
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
 
-SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
+SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
     SfxControllerItem(nSlotId, rBindings),
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 
@@ -218,8 +217,6 @@ SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
 
 SfxMenuControl::~SfxMenuControl()
 {
-    if ( SfxMacroConfig::IsMacroSlot( GetId() ) )
-        SFX_APP()->GetMacroConfig()->ReleaseSlotId(GetId());
     delete pSubMenu;
 }
 
@@ -234,7 +231,7 @@ void SfxMenuControl::RemovePopup()
 
 void SfxMenuControl::StateChanged
 (
-    USHORT 				nSID,
+    sal_uInt16 				nSID,
     SfxItemState		eState,
     const SfxPoolItem* 	pState
 )
@@ -251,7 +248,7 @@ void SfxMenuControl::StateChanged
 
 #ifdef UNIX
     if (nSID == SID_PASTE)
-        pOwnMenu->EnableItem( GetId(), TRUE );
+        pOwnMenu->EnableItem( GetId(), sal_True );
     else
 #endif
     pOwnMenu->EnableItem( GetId(), bIsObjMenu
@@ -262,7 +259,7 @@ void SfxMenuControl::StateChanged
     {
         // checken nur bei nicht-Object-Menus
         if ( !bIsObjMenu )
-            pOwnMenu->CheckItem( GetId(), FALSE );
+            pOwnMenu->CheckItem( GetId(), sal_False );
 
         if ( pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() )
         {
@@ -323,14 +320,14 @@ void SfxMenuControl::StateChanged
 
 //--------------------------------------------------------------------
 
-SfxMenuControl* SfxMenuControl::CreateImpl( USHORT /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
+SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
 {
-    return new SfxMenuControl( TRUE );
+    return new SfxMenuControl( sal_True );
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuControl::RegisterControl( USHORT nSlotId, SfxModule *pMod )
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
 {
     RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
                 SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
@@ -342,7 +339,7 @@ void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pF
     SFX_APP()->RegisterMenuControl_Impl( pMod, pFact );
 }
 
-SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindings &rBindings )
+SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
     if ( aSlotType )
@@ -356,7 +353,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -366,7 +363,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
 
         SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -375,7 +372,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
     return 0;
 }
 
-BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
+sal_Bool SfxMenuControl::IsSpecialControl( sal_uInt16 nId, SfxModule* pMod  )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType( nId );
     if ( aSlotType )
@@ -386,21 +383,21 @@ BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
-                        return TRUE;
+                        return sal_True;
             }
         }
 
         SfxMenuCtrlFactArr_Impl &rFactories = SFX_APP()->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
-                return TRUE;
+                return sal_True;
     }
     return 0;
 }
@@ -420,7 +417,7 @@ long Select_Impl( void* pHdl, void* pVoid );
 SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem );
 
 SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
-    USHORT nPos, Menu& rMenu, SfxBindings& rBindings )
+    sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
     : SfxMenuControl( nPos, rBindings ), pMenu(0)
 {
     String aText = rMenu.GetItemText( nPos );
@@ -452,8 +449,8 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
     if ( pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
-        BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+        sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle();
+        sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bShowMenuImages != m_bShowMenuImages ))
@@ -461,10 +458,10 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             m_nSymbolsStyle         = nSymbolsStyle;
             m_bShowMenuImages		= bShowMenuImages;
 
-            USHORT nCount = pActMenu->GetItemCount();
-            for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
+            sal_uInt16 nCount = pActMenu->GetItemCount();
+            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
             {
-                USHORT nItemId = pActMenu->GetItemId( nSVPos );
+                sal_uInt16 nItemId = pActMenu->GetItemId( nSVPos );
                 if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
                 {
                     if ( bShowMenuImages )
@@ -480,7 +477,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE );
+                            Image aImage = GetImage( xFrame, aImageId, false );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -492,7 +489,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE );
+                                INetURLObject(aCmd), false );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nItemId, aImage );
                         }
@@ -503,26 +500,26 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
+        sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, const String& sItemText,
+        sal_uInt16 nId, Menu& rMenu, const String& sItemText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, rBindings, pVirt);
 }
 
-SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
+SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId,
     Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt )
     : SfxMenuControl( nSlotId, rBindings )
 {
@@ -534,7 +531,7 @@ SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
 }
 
 SfxUnoMenuControl::SfxUnoMenuControl(
-    const String& rCmd, USHORT nSlotId, Menu& /*rMenu*/,
+    const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
     const String& rItemText,
     SfxBindings& rBindings, SfxVirtualMenu* pVirt)
     : SfxMenuControl( nSlotId, rBindings )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 780aa03801..b04902dfba 100644..100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -56,6 +56,7 @@
 #include <osl/file.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/filter.hxx>
+#include <svl/lngmisc.hxx>
 
 #include <sfx2/mnumgr.hxx>
 
@@ -71,8 +72,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/bindings.hxx>
 #include "mnucfga.hxx"
-#include "sfxresid.hxx"
-#include <sfx2/macrconf.hxx>
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfx.hrc>
 #include "menu.hrc"
@@ -82,8 +82,8 @@
 #include "thessubmenu.hxx"
 
 
-static const USHORT nCompatVersion = 4;
-static const USHORT nVersion = 5;
+static const sal_uInt16 nCompatVersion = 4;
+static const sal_uInt16 nVersion = 5;
 
 // static member initialization
 PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
@@ -114,7 +114,7 @@ SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings )
     pResMgr(rResId.GetResMgr()),
     nType( rResId.GetId() )
 {
-    bAddClipboardFuncs = FALSE;
+    bAddClipboardFuncs = sal_False;
     DBG_MEMTEST();
 }
 
@@ -149,8 +149,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
     {
         SfxObjectShell* pDoc = pView->GetObjectShell();
         pMenu->InsertSeparator();
-        USHORT nr=0;
-        for ( USHORT n = 0; n < aVerbs.getLength(); ++n )
+        sal_uInt16 nr=0;
+        for ( sal_uInt16 n = 0; n < aVerbs.getLength(); ++n )
         {
             // check for ReadOnly verbs
             if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -161,14 +161,13 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
                 continue;
 
             // neue Id vergeben
-            USHORT nId = SID_VERB_START + nr++;
+            sal_uInt16 nId = SID_VERB_START + nr++;
             DBG_ASSERT(nId <= SID_VERB_END, "Zuviele Verben!");
             if ( nId > SID_VERB_END )
                 break;
 
             // einf"ugen
             pMenu->InsertItem( nId, aVerbs[n].VerbName );
-            pMenu->SetHelpId( nId, (ULONG) nId );
         }
     }
 }
@@ -234,12 +233,12 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
             if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
-            for (USHORT i = 0; (size_t)i < nNumSynonyms; ++i)
+            for (sal_uInt16 i = 0; (size_t)i < nNumSynonyms; ++i)
             {
                 //! item ids should start with values > 0, since 0 has special meaning
-                const USHORT nId = i + 1;
+                const sal_uInt16 nId = i + 1;
                 
-                String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
+                String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
                 ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusFromContext?WordReplace:string=") );
                 aCmd += aItemText;
@@ -291,10 +290,10 @@ void SfxMenuManager::UseDefault()
 
         if ( bAddClipboardFuncs )
         {
-            USHORT n, nCount = pSVMenu->GetItemCount();
+            sal_uInt16 n, nCount = pSVMenu->GetItemCount();
             for ( n=0; n<nCount; n++ )
             {
-                USHORT nId = pSVMenu->GetItemId( n );
+                sal_uInt16 nId = pSVMenu->GetItemId( n );
                 if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
                     break;
             }
@@ -306,13 +305,13 @@ void SfxMenuManager::UseDefault()
                 pSVMenu->InsertSeparator();
                 for ( n=0; n<nCount; n++ )
                 {
-                    USHORT nId = aPop.GetItemId( n );
+                    sal_uInt16 nId = aPop.GetItemId( n );
                     pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
                 }
             }
         }
 
-        pVMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+        pVMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     }
 
     Construct(*pVMenu);
@@ -330,7 +329,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
 {
     DBG_MEMTEST();
 
-    USHORT nId = (USHORT) pSelMenu->GetCurItemId();
+    sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId();
     String aCommand = pSelMenu->GetItemCommand( nId );
     if ( !aCommand.Len() && pBindings )
     {
@@ -353,12 +352,12 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
         // special menu function
         pBindings->GetDispatcher_Impl()->Execute( nId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
+void SfxMenuManager::Construct_Impl( Menu* pSVMenu, sal_Bool bWithHelp )
 {
     SfxVirtualMenu *pOldVirtMenu=0;
     if ( pMenu )
@@ -369,7 +368,7 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
     }
 
     TryToHideDisabledEntries_Impl( pSVMenu );
-    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, TRUE );
+    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, sal_True );
     Construct(*pVMenu);
 
     if ( pOldVirtMenu )
@@ -403,10 +402,10 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
     DBG_MEMTEST();
-    USHORT nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+    sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
     delete pStaticThesSubMenu;  pStaticThesSubMenu = NULL;
     return nVal;
 }
@@ -422,13 +421,13 @@ IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
 {
     DBG_MEMTEST();
 
     PopupMenu* pPopMenu = ( (PopupMenu*)GetMenu()->GetSVMenu() );
     pPopMenu->SetSelectHdl( LINK( this, SfxPopupMenuManager, SelectHdl ) );
-    USHORT nId = pPopMenu->Execute( pWindow, rPoint );
+    sal_uInt16 nId = pPopMenu->Execute( pWindow, rPoint );
     pPopMenu->SetSelectHdl( Link() );
 
     if ( nId )
@@ -439,7 +438,7 @@ USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_li
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
 {
     DBG_MEMTEST();
 
@@ -464,43 +463,43 @@ void SfxPopupMenuManager::StartInsert()
 void SfxPopupMenuManager::EndInsert()
 {
     pBindings->ENTERREGISTRATIONS();
-    pMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+    pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     Construct( *pMenu );
     pBindings->LEAVEREGISTRATIONS();
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertSeparator( USHORT nPos )
+void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos )
 {
     pSVMenu->InsertSeparator( nPos );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos )
+void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos )
 {
     pSVMenu->InsertItem( nId, rName, nBits,nPos );
-    pSVMenu->SetHelpId( nId, (ULONG) nId );
+    pSVMenu->SetHelpId( nId, rHelpId );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::RemoveItem( USHORT nId )
+void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId )
 {
     pSVMenu->RemoveItem( nId );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::CheckItem( USHORT nId, BOOL bCheck )
+void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck )
 {
     pSVMenu->CheckItem( nId, bCheck );
 }
 
 void SfxPopupMenuManager::AddClipboardFunctions()
 {
-    bAddClipboardFuncs = TRUE;
+    bAddClipboardFuncs = sal_True;
 }
 
 SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
@@ -510,8 +509,8 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
     pResMgr(NULL),
     nType(0)
 {
-    bAddClipboardFuncs = FALSE;
-    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, FALSE, rBindings, TRUE, TRUE );
+    bAddClipboardFuncs = sal_False;
+    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True );
     Construct(*pVMenu);
 }
 
@@ -524,10 +523,10 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin
 SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -543,7 +542,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
@@ -576,10 +575,10 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
 void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -593,7 +592,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index 71417ac914..d95f106cd6 100644..100755
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star;
     in seinen Parent ein.
  */
 
-SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings)
+SfxObjectVerbsControl::SfxObjectVerbsControl(sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings)
     : SfxMenuControl( nSlotId, rBindings )
     , pMenu(new PopupMenu)
     , rParent(rMenu)
@@ -79,8 +79,8 @@ void SfxObjectVerbsControl::FillMenu()
         const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs =  pView->GetVerbs();
         if ( aVerbs.getLength() )
         {
-            USHORT nSlotId = SID_VERB_START;
-            for (USHORT n=0; n<aVerbs.getLength(); n++)
+            sal_uInt16 nSlotId = SID_VERB_START;
+            for (sal_uInt16 n=0; n<aVerbs.getLength(); n++)
             {
                 // check for ReadOnly verbs
                 if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -99,7 +99,7 @@ void SfxObjectVerbsControl::FillMenu()
         }
     }
 
-    rParent.EnableItem( GetId(), (BOOL)pMenu->GetItemCount() );
+    rParent.EnableItem( GetId(), (sal_Bool)pMenu->GetItemCount() );
 }
 
 //--------------------------------------------------------------------
@@ -113,7 +113,7 @@ void SfxObjectVerbsControl::FillMenu()
  */
 
 void SfxObjectVerbsControl::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/, 
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 {
@@ -131,7 +131,7 @@ void SfxObjectVerbsControl::StateChanged(
 
 IMPL_LINK_INLINE_START( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu )
 {
-    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
     if( nSlotId )
         GetBindings().Execute(nSlotId);
     return 1;
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 5c2a1658c4..a84f298fad 100644..100755
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -59,45 +59,12 @@ SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem);
 
 ////////////////////////////////////////////////////////////
 
-String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText )
-{
-    // The strings returned by the thesaurus sometimes have some
-    // explanation text put in between '(' and ')' or a trailing '*'.
-    // These parts should not be put in the ReplaceEdit Text that may get
-    // inserted into the document. Thus we strip them from the text.
- 
-    String aText( rText );
-
-    xub_StrLen nPos = aText.Search( sal_Unicode('(') );
-    while (STRING_NOTFOUND != nPos)
-    {
-        xub_StrLen nEnd = aText.Search( sal_Unicode(')'), nPos );
-        if (STRING_NOTFOUND != nEnd)
-            aText.Erase( nPos, nEnd-nPos+1 );
-        else
-            break;
-        nPos = aText.Search( sal_Unicode('(') );
-    }
-
-    nPos = aText.Search( sal_Unicode('*') );
-    if (STRING_NOTFOUND != nPos)
-        aText.Erase( nPos );
-
-    // remove any possible remaining ' ' that may confuse the thesaurus
-    // when it gets called with the text
-    aText.EraseLeadingAndTrailingChars( sal_Unicode(' ') );
-    
-    return aText;
-}
-
-////////////////////////////////////////////////////////////
-
 
 /*
     Ctor; setzt Select-Handler am Menu und traegt Menu
     in seinen Parent ein.
  */
-SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings )
+SfxThesSubMenuControl::SfxThesSubMenuControl( sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings )
     : SfxMenuControl( nSlotId, rBindings ),
     pMenu(new PopupMenu),
     rParent(rMenu)
@@ -105,7 +72,7 @@ SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBi
     rMenu.SetPopupMenu(nSlotId, pMenu);
     pMenu->SetSelectHdl(LINK(this, SfxThesSubMenuControl, MenuSelect));
     pMenu->Clear();
-    rParent.EnableItem( GetId(), FALSE );
+    rParent.EnableItem( GetId(), sal_False );
 }
 
 
@@ -121,7 +88,7 @@ SfxThesSubMenuControl::~SfxThesSubMenuControl()
     Menueeintrag im Parentmenu disabled, andernfalls wird er enabled.
  */
 void SfxThesSubMenuControl::StateChanged( 
-    USHORT /*nSID*/, 
+    sal_uInt16 /*nSID*/, 
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 {
@@ -135,7 +102,7 @@ void SfxThesSubMenuControl::StateChanged(
  */
 IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu )
 {
-    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
     if( nSlotId )
         GetBindings().Execute(nSlotId);
     return 1;
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index bc9ee8a49b..5552697928 100644..100755
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -44,21 +44,17 @@ namespace css = ::com::sun::star;
 
 ////////////////////////////////////////////////////////////
 
-String GetThesaurusReplaceText_Impl( const ::rtl::OUString &rText );
-
-////////////////////////////////////////////////////////////
-
 class SfxThesSubMenuControl : public SfxMenuControl
 {
     PopupMenu*			pMenu;
     Menu&				rParent;
 
 private:
-    virtual void    StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
     DECL_LINK( MenuSelect, Menu * );
 
 public:
-    SfxThesSubMenuControl(USHORT, Menu&, SfxBindings&);
+    SfxThesSubMenuControl(sal_uInt16, Menu&, SfxBindings&);
     ~SfxThesSubMenuControl();
     
     virtual PopupMenu*  GetPopup() const;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 07937e7855..ee8641312d 100644..100755
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -55,10 +55,9 @@
 #include <sfx2/sfx.hrc>
 #include <sfx2/viewsh.hxx>
 #include "sfxpicklist.hxx"
-#include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "menu.hrc"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <framework/addonsoptions.hxx>
@@ -83,21 +82,21 @@ class SfxMenuImageControl_Impl : public SfxControllerItem
 {
     SfxVirtualMenu*     pMenu;
     long                lRotation;
-    BOOL                bIsMirrored;
+    sal_Bool                bIsMirrored;
 
 protected:
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 public:
-                        SfxMenuImageControl_Impl( USHORT nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
+                        SfxMenuImageControl_Impl( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
                             : SfxControllerItem( nSlotId, rBindings )
                             , pMenu( pVMenu )
                             , lRotation( 0 )
-                            , bIsMirrored( FALSE )
+                            , bIsMirrored( sal_False )
                         {}
     void                Update();
 };
 
-void SfxMenuImageControl_Impl::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+void SfxMenuImageControl_Impl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxImageItem* pItem = PTR_CAST( SfxImageItem, pState );
     if ( pItem )
@@ -114,13 +113,13 @@ void SfxMenuImageControl_Impl::Update()
     SfxModule* pModule = pViewFrame->GetObjectShell()->GetModule();
     SfxSlotPool* pPool = pModule->GetSlotPool();
     Menu* pSVMenu = pMenu->GetSVMenu();
-    for (USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
+    for (sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
     {
-        USHORT nslotId = pSVMenu->GetItemId( nPos );
+        sal_uInt16 nslotId = pSVMenu->GetItemId( nPos );
         const SfxSlot* pSlot = pPool->GetSlot( nslotId );
         if ( pSlot && pSlot->IsMode( SFX_SLOT_IMAGEROTATION ) )
         {
-            pSVMenu->SetItemImageMirrorMode( nslotId, FALSE );
+            pSVMenu->SetItemImageMirrorMode( nslotId, sal_False );
             pSVMenu->SetItemImageAngle( nslotId, lRotation );
         }
 
@@ -134,7 +133,7 @@ void SfxMenuImageControl_Impl::Update()
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                                  const rtl::OUString& aImageId,
                                  const rtl::OUString& aURL,
-                                 BOOL bBigImage
+                                 bool bBigImage
 )
 {
     Image aImage;
@@ -160,7 +159,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr
     darauf, ob die Applikation OLE-Server ist oder nicht.
 */
 
-BOOL IsItemHidden_Impl( USHORT nItemId, int bOleServer, int bMac )
+sal_Bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac )
 {
     return ( bMac &&
              ( nItemId == SID_MINIMIZED ) ) ||
@@ -187,9 +186,9 @@ void SfxVirtualMenu::Construct_Impl()
 
 //--------------------------------------------------------------------
 
-SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
-                SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
-                SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
+                SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp,
+                SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -212,19 +211,19 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
 
 // creates a virtual menu from a StarView MenuBar or PopupMenu
 
-SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
-                    SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+                    SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -248,11 +247,11 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -273,7 +272,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
 
     if ( bIsActive )
     {
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
 
     // QAP-Hack
@@ -325,11 +324,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     // Merge Addon popup menus into the SV Menu
-    Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface() );
+    SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+    SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+    Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( pSVMenu->IsMenuBar() )
     {
-        USHORT nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
+        sal_uInt16 nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
         if ( nPos != MENU_ITEM_NOTFOUND && xFrame.is() )
         {
             // Retrieve addon popup menus and add them to our menu bar
@@ -370,8 +371,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     // remember some values
     SFX_APP();
-    const int bOleServer = FALSE;
-    const int bMac = FALSE;
+    const int bOleServer = sal_False;
+    const int bMac = sal_False;
     SvtMenuOptions aOptions;
     aOptions.AddListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
 
@@ -379,10 +380,10 @@ void SfxVirtualMenu::CreateFromSVMenu()
     pBindings->ENTERREGISTRATIONS(); ++nLocks;
     pImageControl = new SfxMenuImageControl_Impl( SID_IMAGE_ORIENTATION, *pBindings, this );
 
-    USHORT nSVPos = 0;
-    for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
+    sal_uInt16 nSVPos = 0;
+    for ( sal_uInt16 nPos=0; nPos<nCount; ++nPos, ++nSVPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nSVPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nSVPos);
         PopupMenu* pPopup = pSVMenu->GetPopupMenu(nSlotId);
         if( pPopup && nSlotId >= SID_OBJECTMENU0 && nSlotId <= SID_OBJECTMENU_LAST )
         {
@@ -418,13 +419,12 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    Image aImage = GetImage( xFrame, aSlotURL, FALSE );
+                    Image aImage = GetImage( xFrame, aSlotURL, false );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
             }
             else
             {
-                pSVMenu->SetHelpId( nSlotId, 0L );
                 pMnuCtrl = pItems+nPos;
 
                 // normalerweise jetzt erst im Activate-Handler
@@ -447,24 +447,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 {
                     SfxMenuControl *pMnuCtrl=0;
                     String aCmd( pSVMenu->GetItemCommand( nSlotId ) );
-                    if ( aCmd.CompareToAscii("slot:", 5) == 0 )
-                    {
-                        SfxMacroConfig* pCfg = SFX_APP()->GetMacroConfig();
-                        if ( pCfg->IsMacroSlot( nSlotId ) )
-                        {
-                            if ( pCfg->GetMacroInfo( nSlotId ) )
-                            {
-                                pCfg->RegisterSlotId( nSlotId );
-                                pSVMenu->SetItemCommand( nSlotId, String() );
-                                aCmd.Erase();
-                            }
-                            else
-                            {
-                                pSVMenu->SetItemCommand( nSlotId, String::CreateFromAscii("macro:///macro.not.founc") );
-                            }
-                        }
-                    }
-
                     if ( aCmd.Len() && (( nSlotId < SID_SFX_START ) || ( nSlotId > SHRT_MAX )) )
                     {
                         // try to create control via comand name
@@ -507,13 +489,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
                             if ( pMenuAttributes )
                                 aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE );
+                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, false );
                         }
                         else
                         {
                             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                             aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                            aImage = GetImage( xFrame, aSlotURL, FALSE );
+                            aImage = GetImage( xFrame, aSlotURL, false );
                         }
 
                         if ( !!aImage )
@@ -559,21 +541,21 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
             pAutoDeactivate->Stop();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 {
-    USHORT nItemCount = pSVMenu->GetItemCount();
+    sal_uInt16 nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( !bIsAddonPopupMenu )
     {
-        for ( USHORT nSVPos=0; nSVPos<nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos<nItemCount; ++nSVPos )
         {
-            USHORT          nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16          nSlotId = pSVMenu->GetItemId( nSVPos );
             MenuItemType    nType   = pSVMenu->GetItemType( nSVPos );
             if ( nType == MENUITEM_STRING && bIcons )
             {
@@ -589,13 +571,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
                 }
             }
             else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -632,17 +614,17 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 
 void SfxVirtualMenu::UpdateImages()
 {
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
 
     if ( bIcons )
     {
-        USHORT			nItemCount          = pSVMenu->GetItemCount();
+        sal_uInt16			nItemCount          = pSVMenu->GetItemCount();
         SfxViewFrame *	pViewFrame          = pBindings->GetDispatcher()->GetFrame();
         Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nSVPos=0; nSVPos < nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos )
         {
-            USHORT nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos );
             if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE )
             {
                 if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
@@ -657,13 +639,13 @@ void SfxVirtualMenu::UpdateImages()
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
                 }
             }
         }
@@ -682,15 +664,15 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
 
     framework::AddonsOptions	aAddonOptions;
 
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     if ( bIcons )
     {
-        USHORT			nItemCount			= pMenu->GetItemCount();
+        sal_uInt16			nItemCount			= pMenu->GetItemCount();
         Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+        for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
         {
-            USHORT nSlotId = pMenu->GetItemId( nPos );
+            sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
             PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
             if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
             {
@@ -702,7 +684,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
                 if ( pMenuAttributes )
                     aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE ));
+                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), false ));
             }
 
             if ( pPopup )
@@ -721,10 +703,10 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
     if ( !pMenu )
         return;
 
-    USHORT nItemCount = pMenu->GetItemCount();
-    for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
+    for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
     {
-        USHORT nSlotId = pMenu->GetItemId( nPos );
+        sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
         PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
         if ( pMenu->GetItemType( nPos ) == MENUITEM_STRINGIMAGE )
             pMenu->SetItemImage( nSlotId, Image() );
@@ -737,16 +719,16 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
 
 bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 {
-    // Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
+    // Selber suchen, da SV mit 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' immer
     // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
     // CurItem des Parent-Menus zu tun hat.
     sal_uInt32 nAddonsPopupPrefixLen = ADDONSPOPUPMENU_URL_PREFIX.getLength();
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         // angesprochenes Sub-Menu gefunden?
         bool bFound = false;
-        USHORT nSID = pSVMenu->GetItemId(nPos);
+        sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
         SfxMenuControl &rCtrl = pItems[nPos];
         bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -756,7 +738,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
             // Nur ein gebundener Menu-Controller hat schon seine Id!
             if ( !rCtrl.GetId() )
             {
-                bIsAddonPopupMenu = FALSE;
+                bIsAddonPopupMenu = sal_False;
                 DBG_ASSERT( !pSubMenu, "Popup schon vorhanden!");
 
                 // Check if the popup is an Add-On popup menu
@@ -766,12 +748,12 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
                      ( nSID == SID_ADDONHELP ) ||
                      (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) &&
                       ( aCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
-                    bIsAddonPopupMenu = TRUE;
+                    bIsAddonPopupMenu = sal_True;
 
                 // VirtualMenu f"ur Sub-Menu erzeugen
-                BOOL bRes = bResCtor;
+                sal_Bool bRes = bResCtor;
                 pSubMenu = new SfxVirtualMenu( nSID, this,
-                        *pMenu, FALSE, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
+                        *pMenu, sal_False, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
 
                 DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -789,18 +771,18 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 
         // gefunden, dann abbrechen
         if ( bFound )
-            return TRUE;
+            return true;
     }
 
     // nicht in diesem Untermenu gefunden
-    return FALSE;
+    return false;
 }
 
 void SfxVirtualMenu::BindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl& rCtrl = pItems[nPos];
@@ -812,20 +794,20 @@ void SfxVirtualMenu::BindControllers()
     for ( nPos=0; nPos<rCtrlArr.Count(); nPos++ )
     {
         SfxMenuControl* pCtrl = rCtrlArr[nPos];
-        USHORT nSlotId = pCtrl->GetId();
+        sal_uInt16 nSlotId = pCtrl->GetId();
         if ( !pSVMenu->GetItemCommand(nSlotId).Len() )
             pCtrl->ReBind();
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = FALSE;
+    bControllersUnBound = sal_False;
 }
 
 void SfxVirtualMenu::UnbindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl &rCtrl = pItems[nPos];
@@ -843,7 +825,7 @@ void SfxVirtualMenu::UnbindControllers()
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = TRUE;
+    bControllersUnBound = sal_True;
 }
 
 
@@ -867,7 +849,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
     // Create menu item at the end of the tools popup menu for the addons popup menu
     if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 )
     {
-        USHORT nItemCount = pMenu->GetItemCount();
+        sal_uInt16 nItemCount = pMenu->GetItemCount();
         String aAddonsTitle( SfxResId( STR_MENU_ADDONS ));
         if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR )
             pMenu->InsertSeparator();
@@ -878,7 +860,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         {
                rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
-         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE ));
+         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false ));
         }
     }
     else
@@ -914,7 +896,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
     {
         // doppelt-Activate verhindern
         if ( bIsActive )
-            return TRUE;
+            return sal_True;
 
         // ggf. Pick-Menu erzeugen
         if ( pParent && pSVMenu == pParent->pPickMenu )
@@ -931,8 +913,8 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
             Reference< XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
                                             DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
 
-            USHORT	nActiveItemId = 0;
-            USHORT	nItemId = START_ITEMID_WINDOWLIST;
+            sal_uInt16	nActiveItemId = 0;
+            sal_uInt16	nItemId = START_ITEMID_WINDOWLIST;
 
             if ( xDesktop.is() )
             {
@@ -1001,9 +983,9 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
         //InvalidateKeyCodes();
         pBindings->GetDispatcher_Impl()->Flush();
-        for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
-            USHORT nSlotId = (pItems+nPos)->GetId();
+            sal_uInt16 nSlotId = (pItems+nPos)->GetId();
             if ( nSlotId && nSlotId > END_ITEMID_WINDOWLIST )
                 pBindings->Update(nSlotId);
         }
@@ -1011,13 +993,13 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         pBindings->Update( SID_IMAGE_ORIENTATION );
 
         // bis zum Deactivate die Statusupdates unterdr"ucken
-        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = TRUE;
+        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = sal_True;
 
         if ( pAutoDeactivate ) // QAP-Hack
             pAutoDeactivate->Start();
 
         // erledigt
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -1046,9 +1028,9 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
         // das Menue deaktiviert ( = zugeklappt ) wird
         if ( pParent )
             UnbindControllers();
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 //--------------------------------------------------------------------
 
@@ -1056,7 +1038,7 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 {
-    USHORT nSlotId = (USHORT) pMenu->GetCurItemId();
+    sal_uInt16 nSlotId = (sal_uInt16) pMenu->GetCurItemId();
     DBG_OUTF( ("SfxVirtualMenu %lx selected %u from %lx", this, nSlotId, pMenu) );
 
     if ( nSlotId >= START_ITEMID_WINDOWLIST && nSlotId <= END_ITEMID_WINDOWLIST )
@@ -1066,7 +1048,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
                                         DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
         if ( xDesktop.is() )
         {
-            USHORT nTaskId = START_ITEMID_WINDOWLIST;
+            sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
             Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
             sal_Int32 nFrameCount = xList->getCount();
             for ( sal_Int32 i=0; i<nFrameCount; ++i )
@@ -1085,7 +1067,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
     else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST )
     {
@@ -1098,7 +1080,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
     else
         pBindings->Execute( nSlotId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1117,12 +1099,12 @@ Menu* SfxVirtualMenu::GetSVMenu() const
 
 // return the position of the specified item
 
-USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
+sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         if ( (pItems+nPos)->GetId() == nItemId )
             return nPos;
     return MENU_ITEM_NOTFOUND;
@@ -1132,12 +1114,12 @@ USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
 
 // returns the popup-menu assigned to the item or 0 if none
 
-SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
+SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nItemId);
+    sal_uInt16 nPos = GetItemPos(nItemId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetPopupMenu();
     return 0;
@@ -1146,12 +1128,12 @@ SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
 
 // returns the text of the item as currently shown in the menu
 
-String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
+String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nSlotId);
+    sal_uInt16 nPos = GetItemPos(nSlotId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetTitle();
     return String();
@@ -1160,7 +1142,7 @@ String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
 
 // set the checkmark of the specified item
 
-void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
+void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1173,7 +1155,7 @@ void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
 
 // set the enabled-state of the specified item
 
-void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
+void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1187,7 +1169,7 @@ void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
 
 // set the text of the specified item
 
-void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
+void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1201,14 +1183,14 @@ void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
 
 //
 
-void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
+void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         GetSVMenu()->SetPopupMenu( nItemId, pMenu );
-    for ( USHORT n = 0; n < nCount; ++n )
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
     {
         SfxVirtualMenu *pSubMenu = (pItems+n)->GetPopupMenu();
         if ( pSubMenu )
@@ -1220,12 +1202,12 @@ void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
 
 // Erzwingt die Initialisierung, die sonst nur im Activate kommt
 
-void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
+void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nSID = pSVMenu->GetItemId(nPos);
+    sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
     PopupMenu *pMenu = pSVMenu->GetPopupMenu( nSID );
 
     DBG_ASSERT( pMenu, "Hier gibt es kein Popup!");
@@ -1234,9 +1216,9 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
     if ( !rCtrl.GetId() )
     {
         // VirtualMenu f"ur Sub-Menu erzeugen
-        BOOL bRes = bResCtor;
+        sal_Bool bRes = bResCtor;
         SfxVirtualMenu *pSubMenu =
-            new SfxVirtualMenu(nSID, this, *pMenu, FALSE, *pBindings, bOLE, bRes);
+            new SfxVirtualMenu(nSID, this, *pMenu, sal_False, *pBindings, bOLE, bRes);
 
         DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -1246,13 +1228,13 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
 
 void SfxVirtualMenu::InitializeHelp()
 {
-    for ( USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nPos);
         SfxMenuControl &rCtrl = pItems[nPos];
         if ( nSlotId && !rCtrl.GetId() )
         {
-            InitPopup( nPos, TRUE );
+            InitPopup( nPos, sal_True );
         }
 
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -1260,10 +1242,10 @@ void SfxVirtualMenu::InitializeHelp()
             pSubMenu->InitializeHelp();
     }
 
-    bHelpInitialized = TRUE;
+    bHelpInitialized = sal_True;
 }
 
-typedef ULONG (__LOADONCALLAPI *HelpIdFunc) ( const String& );
+typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& );
 
 void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
 {
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 2e5ed45aec..8d53079c1f 100644..100755
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -45,10 +45,11 @@
 
 #include <unotools/securityoptions.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/namedvaluecollection.hxx>
 #include "eventsupplier.hxx"
 
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 
 #include <sfx2/sfxsids.hrc>
 #include "sfxlocal.hrc"
@@ -85,41 +86,37 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY &
     {
         if ( maEventNames[i] == aName )
         {
-            Sequence< PropertyValue > aProperties;
+            const ::comphelper::NamedValueCollection aEventDescriptor( rElement );
             // check for correct type of the element
-            if ( rElement.hasValue() && !( rElement >>= aProperties ) )
+            if ( rElement.hasValue() && aEventDescriptor.empty() )
                 throw ILLEGALARGUMENTEXCEPTION();
 
             // create Configuration at first, creation might call this method also and that would overwrite everything
             // we might have stored before!
             if ( mpObjShell && !mpObjShell->IsLoading() )
-                mpObjShell->SetModified( TRUE );
+                mpObjShell->SetModified( sal_True );
 
-            if ( aProperties.getLength() )
+            ::comphelper::NamedValueCollection aNormalizedDescriptor;
+            NormalizeMacro( aEventDescriptor, aNormalizedDescriptor, mpObjShell );
+
+            ::rtl::OUString sType;
+            if  (   ( aNormalizedDescriptor.size() == 1 )
+                &&  ( aProperties[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)) )
+                &&  ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType )
+                &&  ( sType.getLength() == 0 )
+                )
             {
-                // "normalize" the macro descriptor
-                ANY aValue;
-                BlowUpMacro( rElement, aValue, mpObjShell );
-                aValue >>= aProperties;
-
-                ::rtl::OUString sType;
-                if  (   ( aProperties.getLength() == 1 )
-                    &&  ( aProperties[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)) )
-                    &&  ( aProperties[0].Value >>= sType )
-                    &&  ( sType.getLength() == 0 )
-                    )
-                {
-                    // An empty event type means no binding. Therefore reset data
-                    // to reflect that state.
-                    // (that's for compatibility only. Nowadays, the Tools/Customize dialog should
-                    // set an empty sequence to indicate the request for resetting the assignment.)
-                    aProperties.realloc( 0 );
-                }
+                // An empty event type means no binding. Therefore reset data
+                // to reflect that state.
+                // (that's for compatibility only. Nowadays, the Tools/Customize dialog should
+                // set an empty sequence to indicate the request for resetting the assignment.)
+                OSL_ENSURE( false, "legacy event assignment format detected" );
+                aNormalizedDescriptor.clear();
             }
 
-            if ( aProperties.getLength() )
+            if ( !aNormalizedDescriptor.empty() )
             {
-                maEventData[i] = makeAny( aProperties );
+                maEventData[i] <<= aNormalizedDescriptor.getPropertyValues();
             }
             else
             {
@@ -375,13 +372,13 @@ SfxEvents_Impl::~SfxEvents_Impl()
 }
 
 //--------------------------------------------------------------------------------------------------------
-SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* pObjShell, BOOL bBlowUp )
+SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* pObjShell, sal_Bool bNormalizeMacro )
 {
     SvxMacro* pMacro = NULL;
     SEQUENCE < PROPERTYVALUE > aProperties;
     ANY aAny;
-    if ( bBlowUp )
-        BlowUpMacro( rElement, aAny, pObjShell );
+    if ( bNormalizeMacro )
+        NormalizeMacro( rElement, aAny, pObjShell );
     else
         aAny = rElement;
 
@@ -441,58 +438,38 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const ANY& rElement, SfxObjectShell* p
     return pMacro;
 }
 
-void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell* pDoc )
+void SfxEvents_Impl::NormalizeMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell* pDoc )
 {
-    if ( !pDoc )
-        pDoc = SfxObjectShell::Current();
-
-    SEQUENCE < PROPERTYVALUE > aInProps;
-    SEQUENCE < PROPERTYVALUE > aOutProps(2);
-
-    if ( !( rEvent >>= aInProps ) )
-        return;
+    const ::comphelper::NamedValueCollection aEventDescriptor( rEvent );
+    ::comphelper::NamedValueCollection aEventDescriptorOut;
 
-    sal_Int32 nCount = aInProps.getLength();
+    NormalizeMacro( aEventDescriptor, aEventDescriptorOut, pDoc );
 
-    if ( !nCount )
-        return;
+    rRet <<= aEventDescriptorOut.getPropertyValues();
+}
 
-    OUSTRING aType;
-    OUSTRING aScript;
-    OUSTRING aLibrary;
-    OUSTRING aMacroName;
+void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i_eventDescriptor,
+        ::comphelper::NamedValueCollection& o_normalizedDescriptor, SfxObjectShell* i_document )
+{
+    SfxObjectShell* pDoc = i_document;
+    if ( !pDoc )
+        pDoc = SfxObjectShell::Current();
 
-    sal_Int32 nIndex = 0;
+    ::rtl::OUString aType = i_eventDescriptor.getOrDefault( PROP_EVENT_TYPE, ::rtl::OUString() );
+    ::rtl::OUString aScript = i_eventDescriptor.getOrDefault( PROP_SCRIPT, ::rtl::OUString() );
+    ::rtl::OUString aLibrary = i_eventDescriptor.getOrDefault( PROP_LIBRARY, ::rtl::OUString() );
+    ::rtl::OUString aMacroName = i_eventDescriptor.getOrDefault( PROP_MACRO_NAME, ::rtl::OUString() );
 
-    while ( nIndex < nCount )
-    {
-        if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)))
-        {
-            aInProps[nIndex].Value >>= aType;
-            aOutProps[0] = aInProps[nIndex];
-        }
-        else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_SCRIPT)))
-        {
-            aInProps[nIndex].Value >>= aScript;
-            aOutProps[1] = aInProps[nIndex];
-        }
-        else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_LIBRARY)))
-        {
-            aInProps[ nIndex ].Value >>= aLibrary;
-        }
-        else if (aInProps[ nIndex ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_MACRO_NAME)))
-        {
-            aInProps[ nIndex ].Value >>= aMacroName;
-        }
-        nIndex += 1;
-    }
+    if ( aType.getLength() )
+        o_normalizedDescriptor.put( PROP_EVENT_TYPE, aType );
+    if ( aScript.getLength() )
+        o_normalizedDescriptor.put( PROP_SCRIPT, aScript );
 
     if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STAR_BASIC)))
     {
-        aOutProps.realloc(4);
         if ( aScript.getLength() )
         {
-            if( ! aMacroName.getLength() || ! aLibrary.getLength() )
+            if ( !aMacroName.getLength() || !aLibrary.getLength() )
             {
                 sal_Int32 nHashPos = aScript.indexOf( '/', 8 );
                 sal_Int32 nArgsPos = aScript.indexOf( '(' );
@@ -539,22 +516,9 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
                 aLibrary = String::CreateFromAscii("application");
         }
 
-        aOutProps[1].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
-        aOutProps[1].Value <<= aScript;
-        aOutProps[2].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
-        aOutProps[2].Value <<= aLibrary;
-        aOutProps[3].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
-        aOutProps[3].Value <<= aMacroName;
-        rRet <<= aOutProps;
-    }
-    else if (aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT)))
-    {
-        aOutProps[1] = aInProps[1];
-        rRet <<= aOutProps;
-    }
-    else
-    {
-        rRet <<= aOutProps;
+        o_normalizedDescriptor.put( PROP_SCRIPT, aScript );
+        o_normalizedDescriptor.put( PROP_LIBRARY, aLibrary );
+        o_normalizedDescriptor.put( PROP_MACRO_NAME, aMacroName );
     }
 }
 
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index f77d03071e..f77d03071e 100644..100755
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
diff --git a/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk
deleted file mode 100644
index b13857cf10..0000000000
--- a/sfx2/source/notify/makefile.mk
+++ /dev/null
@@ -1,50 +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=sfx2
-TARGET=notify
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-	$(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES =	\
-	$(SLO)$/eventsupplier.obj \
-	$(SLO)$/hintpost.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
deleted file mode 100644
index f99c8fcdaa..0000000000
--- a/sfx2/source/statbar/makefile.mk
+++ /dev/null
@@ -1,47 +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=sfx2
-TARGET=statbar
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =						\
-                $(SLO)$/stbitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 1a5dbd912d..5342578065 100644..100755
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -40,7 +40,7 @@
 #include <vcl/status.hxx>
 
 #include <sfx2/app.hxx>
-#include "stbitem.hxx"
+#include "sfx2/stbitem.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/msg.hxx>
 #include "arrdecl.hxx"
@@ -63,9 +63,9 @@ using namespace ::com::sun::star;
 
 //--------------------------------------------------------------------
 
-USHORT SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons )
+sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons )
 {
-    USHORT nVCLMouseButtons( 0 );
+    sal_uInt16 nVCLMouseButtons( 0 );
 
     if ( nAwtMouseButtons & awt::MouseButton::LEFT )
         nVCLMouseButtons |= MOUSE_LEFT;
@@ -127,9 +127,14 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path );
     if ( pSlot )
     {
-        USHORT nSlotId = pSlot->GetSlotId();
+        sal_uInt16 nSlotId = pSlot->GetSlotId();
         if ( nSlotId > 0 )
+        {
+            rtl::OString aCmd(".uno:");
+            aCmd += pSlot->GetUnoName();
+            pStatusBar->SetHelpId( nSlotId, aCmd );
             return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule );
+        }
     }
 
     return NULL;
@@ -139,12 +144,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
 
 SfxStatusBarControl::SfxStatusBarControl
 (
-    USHORT		nSlotID,			/* Slot-Id, mit der diese Instanz
+    sal_uInt16		nSlotID,			/* Slot-Id, mit der diese Instanz
                                        verbunden wird. Wurde bei der
                                        Registrierung eine Slot-Id != 0
                                        angegeben, ist dies immer die dort
                                        angegebene. */
-    USHORT      nCtrlID,            /* ID of this controller in the status bar */
+    sal_uInt16      nCtrlID,            /* ID of this controller in the status bar */
 
     StatusBar&	rBar				/* Referenz auf die StatusBar, f"ur die
                                        dieses Control erzeugt wurde. */
@@ -243,7 +248,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotID = 0;
+    sal_uInt16 nSlotID = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -329,7 +334,7 @@ throw ( uno::RuntimeException )
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -347,7 +352,7 @@ throw (uno::RuntimeException)
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -364,7 +369,7 @@ throw ( uno::RuntimeException )
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
 
     ::MouseEvent aMouseEvent( aPos,
-                              (USHORT)rMouseEvent.ClickCount,
+                              (sal_uInt16)rMouseEvent.ClickCount,
                               0,
                               convertAwtToVCLMouseButtons( rMouseEvent.Buttons ),
                               0 );
@@ -382,7 +387,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
     ::Point aPos( rPos.X, rPos.Y );
-    CommandEvent aCmdEvent( aPos, (USHORT)nCommand, TRUE, NULL );
+    CommandEvent aCmdEvent( aPos, (sal_uInt16)nCommand, sal_True, NULL );
 
     Command( aCmdEvent );
 }
@@ -402,7 +407,7 @@ throw ( ::uno::RuntimeException )
     if ( pOutDev )
     {
         ::Rectangle aRect = VCLRectangle( rOutputRectangle );
-        UserDrawEvent aUserDrawEvent( pOutDev, aRect, (USHORT)nItemId, (USHORT)nStyle );
+        UserDrawEvent aUserDrawEvent( pOutDev, aRect, (sal_uInt16)nItemId, (sal_uInt16)nStyle );
         Paint( aUserDrawEvent );
     }
 }
@@ -431,7 +436,7 @@ throw ( uno::RuntimeException )
 
 void SfxStatusBarControl::StateChanged
 (
-    USHORT				nSID,
+    sal_uInt16				nSID,
     SfxItemState		eState,
     const SfxPoolItem* 	pState	/* Zeiger auf ein SfxPoolItem, welches nur
                                    innerhalb dieses Methodenaufrufs g"ultig
@@ -466,7 +471,7 @@ void SfxStatusBarControl::StateChanged
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 
 /*	[Beschreibung]
 
@@ -480,7 +485,7 @@ BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL				TRUE
+    sal_Bool				TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -490,12 +495,12 @@ BOOL SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
 
 /*	[Beschreibung]
 
@@ -509,7 +514,7 @@ BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL				TRUE
+    sal_Bool				TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -519,12 +524,12 @@ BOOL SfxStatusBarControl::MouseMove( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
+sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
 /*	[Beschreibung]
 
@@ -538,7 +543,7 @@ BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
     [Rueckgabewert]
 
-    BOOL				TRUE
+    sal_Bool				TRUE
                         das Event wurde bearbeitet und soll nicht an
                         die StatusBar weitergeleitet werden
 
@@ -548,7 +553,7 @@ BOOL SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -633,8 +638,8 @@ void SfxStatusBarControl::ReleaseMouse()
 
 SfxStatusBarControl* SfxStatusBarControl::CreateControl
 (
-    USHORT     nSlotID,
-    USHORT     nStbId,
+    sal_uInt16     nSlotID,
+    sal_uInt16     nStbId,
     StatusBar* pBar,
     SfxModule* pMod
 )
@@ -657,7 +662,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
             if ( pFactories )
             {
                 SfxStbCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                 if ( rFactories[nFactory]->nTypeId == aSlotType &&
                      ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                      ( rFactories[nFactory]->nSlotId == nSlotID) ) )
@@ -666,7 +671,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
         }
 
         SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl();
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
         if ( rFactories[nFactory]->nTypeId == aSlotType &&
              ( ( rFactories[nFactory]->nSlotId == 0 ) ||
              ( rFactories[nFactory]->nSlotId == nSlotID) ) )
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 022c62677c..9744d4ba8c 100644..100755
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -32,10 +32,10 @@
 #include <stdio.h>
 #include <boost/unordered_map.hpp>
 
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/bindings.hxx>
 #include "statcach.hxx"
 #include <sfx2/module.hxx>
@@ -54,7 +54,7 @@ const sal_uInt32 IMAGELIST_COUNT = 4; // small, small-hi, large, large-hi
 struct ToolBoxInf_Impl
 {
     ToolBox* pToolBox;
-    USHORT   nFlags;
+    sal_uInt16   nFlags;
 };
 
 class SfxImageManager_Impl
@@ -66,8 +66,8 @@ public:
     ImageList*                      m_pImageList[IMAGELIST_COUNT];
     SfxModule*                      m_pModule;
 
-    ImageList*              GetImageList( BOOL bBig );
-    Image                   GetImage( USHORT nId, BOOL bBig );
+    ImageList*              GetImageList( bool bBig );
+    Image                   GetImage( sal_uInt16 nId, bool bBig );
     void                    SetSymbolsSize_Impl( sal_Int16 );
     
     DECL_LINK( OptionsChanged_Impl, void* );
@@ -114,7 +114,7 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 }
 
 // Global image list
-static ImageList* GetImageList( BOOL bBig )
+static ImageList* GetImageList( bool bBig )
 {
     SolarMutexGuard aGuard;
     ImageList* rpList = NULL;
@@ -169,7 +169,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
 
 //-------------------------------------------------------------------------
 
-ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig )
+ImageList* SfxImageManager_Impl::GetImageList( bool bBig )
 {
     sal_Int32 nIndex = impl_convertBools( bBig );
     if ( !m_pImageList[nIndex] )
@@ -185,7 +185,7 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig )
+Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig )
 {
     ImageList* pImageList = GetImageList( bBig );
     if ( pImageList )
@@ -202,7 +202,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
     if ( nNewSymbolsSize != m_nSymbolsSize )
     {
         m_nSymbolsSize = nNewSymbolsSize;
-        BOOL bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
+        sal_Bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
 
         for ( sal_uInt32 n=0; n < m_aToolBoxes.size(); n++ )
         {
@@ -210,10 +210,10 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
             if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
             {
                 ToolBox *pBox       = pInf->pToolBox;
-                USHORT  nCount      = pBox->GetItemCount();
-                for ( USHORT nPos=0; nPos<nCount; nPos++ )
+                sal_uInt16  nCount      = pBox->GetItemCount();
+                for ( sal_uInt16 nPos=0; nPos<nCount; nPos++ )
                 {
-                    USHORT nId = pBox->GetItemId( nPos );
+                    sal_uInt16 nId = pBox->GetItemId( nPos );
                     if ( pBox->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
                     {
                         pBox->SetItemImage( nId, GetImage( nId, bLarge ) );
@@ -295,7 +295,7 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bBig ) const
+Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
 {
     ImageList* pImageList = pImp->GetImageList( bBig );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
@@ -305,15 +305,15 @@ Image SfxImageManager::GetImage( USHORT nId, BOOL bBig ) const
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId ) const
+Image SfxImageManager::GetImage( sal_uInt16 nId ) const
 {
-    BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
     return GetImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig ) const
+Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const
 {
     sal_Bool bGlobal = ( pImp->m_pModule == 0 );
     ImageList* pImageList = pImp->GetImageList( bBig );
@@ -330,15 +330,15 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig ) const
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId ) const
+Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
 {
-    BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
     return SeekImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
+void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
 {
     SolarMutexGuard aGuard;
     
@@ -367,21 +367,21 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bLarge )
+void SfxImageManager::SetImages( ToolBox& rToolBox, bool bLarge )
 {
     SetImagesForceSize( rToolBox, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge )
+void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, bool bLarge )
 {
     ImageList* pImageList = pImp->GetImageList( bLarge );
 
-    USHORT nCount = rToolBox.GetItemCount();
-    for (USHORT n=0; n<nCount; n++)
+    sal_uInt16 nCount = rToolBox.GetItemCount();
+    for (sal_uInt16 n=0; n<nCount; n++)
     {
-        USHORT nId = rToolBox.GetItemId(n);
+        sal_uInt16 nId = rToolBox.GetItemId(n);
         switch ( rToolBox.GetItemType(n) )
         {
             case TOOLBOXITEM_BUTTON:
@@ -403,7 +403,7 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge )
 
 void SfxImageManager::SetImages( ToolBox& rToolBox )
 {
-    BOOL bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
+    sal_Bool bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
     SetImagesForceSize( rToolBox, bLarge );
 }
 
diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk
deleted file mode 100644
index ce4f011e60..0000000000
--- a/sfx2/source/toolbox/makefile.mk
+++ /dev/null
@@ -1,48 +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=sfx2
-TARGET=toolbox
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-                $(SLO)$/tbxitem.obj \
-                $(SLO)$/imgmgr.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f4dab73304..48e60ab4fe 100644..100755
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -85,9 +85,8 @@
 #include <sfx2/viewfrm.hxx>
 #include "arrdecl.hxx"
 #include "sfxtypes.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/genlink.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/sfx.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/docfile.hxx>
@@ -98,11 +97,11 @@
 #include <sfx2/unoctitm.hxx>
 #include "helpid.hrc"
 #include "workwin.hxx"
-#include "imgmgr.hxx"
+#include "sfx2/imgmgr.hxx"
 #include "virtmenu.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 
 #include <comphelper/uieventslogger.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -119,7 +118,7 @@ using namespace ::com::sun::star::ui;
 
 //====================================================================
 
-SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, TRUE);
+SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, sal_True);
 SFX_IMPL_TOOLBOX_CONTROL(SfxAppToolBoxControl_Impl, SfxStringItem);
 
 static Window* GetTopMostParentSystemWindow( Window* pWindow )
@@ -190,7 +189,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
     const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path );
     if ( pSlot )
     {
-        USHORT nSlotId = pSlot->GetSlotId();
+        sal_uInt16 nSlotId = pSlot->GetSlotId();
         if ( nSlotId > 0 )
             return SfxToolBoxControl::CreateControl( nSlotId, nID, pToolbox, pModule );
     }
@@ -201,11 +200,11 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 struct SfxToolBoxControl_Impl
 {
     ToolBox*				pBox;
-    BOOL					bShowString;
-    USHORT                  nSelectModifier;
+    sal_Bool					bShowString;
+    sal_uInt16                  nSelectModifier;
     SfxTbxCtrlFactory*		pFact;
-    USHORT                  nTbxId;
-    USHORT                  nSlotId;
+    sal_uInt16                  nTbxId;
+    sal_uInt16                  nSlotId;
     SfxPopupWindow*         mpFloatingWindow;
     SfxPopupWindow*         mpPopupWindow;
     Reference< XUIElement > mxUIElement;
@@ -235,10 +234,10 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
 //--------------------------------------------------------------------
 
 SfxToolBoxControl::SfxToolBoxControl(
-    USHORT          nSlotID,
-    USHORT          nID,
+    sal_uInt16          nSlotID,
+    sal_uInt16          nID,
     ToolBox&        rBox,
-    BOOL            bShowStringItems     )
+    sal_Bool            bShowStringItems     )
 :   svt::ToolboxController()
 {
     pImpl = new SfxToolBoxControl_Impl;
@@ -322,7 +321,7 @@ void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFacto
     SFX_APP()->RegisterToolBoxControl_Impl( pMod, pFact );
 }
 
-SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule* pMod  )
+SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule* pMod  )
 {
     SolarMutexGuard aGuard;
 
@@ -343,8 +342,8 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx
             if ( pFactories )
             {
                 SfxTbxCtrlFactArr_Impl &rFactories = *pFactories;
-                USHORT nFactory;
-                const USHORT nCount = rFactories.Count();
+                sal_uInt16 nFactory;
+                const sal_uInt16 nCount = rFactories.Count();
 
                 // search for a factory with the given slot id
                 for( nFactory = 0; nFactory < nCount; ++nFactory )
@@ -370,8 +369,8 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx
         }
 
         SfxTbxCtrlFactArr_Impl &rFactories = pApp->GetTbxCtrlFactories_Impl();
-        USHORT nFactory;
-        const USHORT nCount = rFactories.Count();
+        sal_uInt16 nFactory;
+        const sal_uInt16 nCount = rFactories.Count();
 
         for( nFactory = 0; nFactory < nCount; ++nFactory )
             if( (rFactories[nFactory]->nTypeId == aSlotType) && (rFactories[nFactory]->nSlotId == nSlotId) )
@@ -556,7 +555,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotId = 0;
+    sal_uInt16 nSlotId = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -664,7 +663,7 @@ void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::Run
 void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    Select( (USHORT)KeyModifier );
+    Select( (sal_uInt16)KeyModifier );
 }
 void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -818,7 +817,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
     {
         static WeakReference< XUIElementFactory > xWeakUIElementFactory;
 
-        USHORT nItemId = pImpl->pBox->GetDownItemId();
+        sal_uInt16 nItemId = pImpl->pBox->GetDownItemId();
 
         if ( !nItemId )
             return;
@@ -953,7 +952,7 @@ IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow )
 
 void SfxToolBoxControl::StateChanged
 (
-    USHORT              nId,
+    sal_uInt16              nId,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -967,7 +966,7 @@ void SfxToolBoxControl::StateChanged
     // enabled/disabled-Flag pauschal korrigieren
     pImpl->pBox->EnableItem( GetId(), eState != SFX_ITEM_DISABLED );
 
-    USHORT nItemBits = pImpl->pBox->GetItemBits( GetId() );
+    sal_uInt16 nItemBits = pImpl->pBox->GetItemBits( GetId() );
     nItemBits &= ~TIB_CHECKABLE;
     TriState eTri = STATE_NOCHECK;
     switch ( eState )
@@ -1007,15 +1006,15 @@ void SfxToolBoxControl::StateChanged
 
 //--------------------------------------------------------------------
 
-void SfxToolBoxControl::Select( USHORT nModifier )
+void SfxToolBoxControl::Select( sal_uInt16 nModifier )
 {
     pImpl->nSelectModifier = nModifier;
-    Select( BOOL((nModifier & KEY_MOD1)!=0) );
+    Select( sal_Bool((nModifier & KEY_MOD1)!=0) );
 }
 
 //--------------------------------------------------------------------
 
-void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
+void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ )
 {
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# #i102805#
     {
@@ -1126,7 +1125,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         }
     }
 
-    USHORT nSlotId = 0;
+    sal_uInt16 nSlotId = 0;
     SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame );
     const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path );
     if ( pSlot )
@@ -1214,12 +1213,12 @@ throw ( ::com::sun::star::uno::RuntimeException )
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     WinBits nBits ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), nBits )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1234,12 +1233,12 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     const ResId &rId ) :
     FloatingWindow( SFX_APP()->GetTopWindow(), rId )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1254,13 +1253,13 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const Reference< XFrame >& rFrame,
     Window* pParentWindow,
     WinBits nBits ) :
     FloatingWindow( pParentWindow, nBits )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1275,13 +1274,13 @@ SfxPopupWindow::SfxPopupWindow(
 //--------------------------------------------------------------------
 
 SfxPopupWindow::SfxPopupWindow(
-    USHORT nId,
+    sal_uInt16 nId,
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
     Window* pParentWindow,
     const ResId &rId ) :
     FloatingWindow( pParentWindow, rId )
-    , m_bFloating(FALSE)
-    , m_bCascading( FALSE )
+    , m_bFloating(sal_False)
+    , m_bCascading( sal_False )
     , m_nId( nId )
     , m_xFrame( rFrame )
     , m_pStatusListener( 0 )
@@ -1372,13 +1371,13 @@ void SfxPopupWindow::UpdateStatus( const rtl::OUString& rCommandURL )
 
 //--------------------------------------------------------------------
 
-BOOL SfxPopupWindow::Close()
+sal_Bool SfxPopupWindow::Close()
 {
-    m_bFloating = FALSE;
+    m_bFloating = sal_False;
     FloatingWindow::Close();
 
     Delete(0);
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1392,7 +1391,7 @@ void SfxPopupWindow::PopupModeEnd()
     {
         // wurde abgerissen
         DeleteFloatingWindow();
-        m_bFloating = TRUE;
+        m_bFloating = sal_True;
     }
     else
         Close();
@@ -1413,14 +1412,14 @@ void SfxPopupWindow::DeleteFloatingWindow()
 
 void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 {
-    if ( m_bCascading == FALSE )
+    if ( m_bCascading == sal_False )
         FloatingWindow::MouseMove( rMEvt );
     else
     {
         // MouseMove-Event an die Children forwarden
         ::Point       aPos = rMEvt.GetPosPixel();
         ::Point       aScrPos = OutputToScreenPixel( aPos );
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         Window* pWindow = GetChild( i );
         while ( pWindow )
         {
@@ -1439,12 +1438,12 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 
 void SfxPopupWindow::StartCascading()
 {
-    m_bCascading= TRUE;
+    m_bCascading= sal_True;
 }
 
 void SfxPopupWindow::EndCascading()
 {
-    m_bCascading = FALSE;
+    m_bCascading = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -1468,7 +1467,7 @@ SfxPopupWindow* SfxPopupWindow::Clone() const
 //--------------------------------------------------------------------
 
 void SfxPopupWindow::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/,
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 /*  [Bescheibung]
@@ -1490,7 +1489,7 @@ void SfxPopupWindow::StateChanged(
     }
     else if ( m_bFloating )
     {
-        Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+        Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
     }
 }
 
@@ -1506,9 +1505,9 @@ IMPL_LINK( SfxPopupWindow, Delete, void *, EMPTYARG )
 
 //--------------------------------------------------------------------
 
-SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox )
+SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox )
-    , bBigImages( FALSE )
+    , bBigImages( sal_False )
     , pMenu( 0 )
 {
     rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
@@ -1532,8 +1531,8 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
     it return the existing state of the given URL in the popupmenu of this toolbox control.
 
     If the given URL can be located as an action command of one menu item of the
-    popup menu of this control, we return TRUE. Otherwhise we return FALSE.
-    Further we return a fallback URL, in case we have to return FALSE. Because
+    popup menu of this control, we return sal_True. Otherwhise we return sal_False.
+    Further we return a fallback URL, in case we have to return sal_False. Because
     the outside code must select a valid item of the popup menu everytime ...
     and we define it here. By the way this m ethod was written to handle
     error situations gracefully. E.g. it can be called during creation time
@@ -1554,34 +1553,34 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
     @param  pImage
                 contains the image of the menu for the URL.
 
-    @return TRUE - if URL could be located as an item of the popup menu.
-            FALSE - otherwhise.
+    @return sal_True - if URL could be located as an item of the popup menu.
+            sal_False - otherwhise.
 */
-BOOL Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
+sal_Bool Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
                                 String    &sURL      ,
                                 String    *pFallback ,
                                 Image     *pImage    )
 {
-    BOOL bValidFallback = FALSE;
+    sal_Bool bValidFallback = sal_False;
     if (pMenu && sURL.Len())
     {
-        USHORT c = pMenu->GetItemCount();
-        for (USHORT p=0; p<c; ++p)
+        sal_uInt16 c = pMenu->GetItemCount();
+        for (sal_uInt16 p=0; p<c; ++p)
         {
-            USHORT nId = pMenu->GetItemId(p);
+            sal_uInt16 nId = pMenu->GetItemId(p);
             String aCmd( pMenu->GetItemCommand(nId) );
 
             if (!bValidFallback && aCmd.Len())
             {
                 *pFallback = aCmd;
-                bValidFallback = TRUE;
+                bValidFallback = sal_True;
             }
 
             if (aCmd.Search(sURL)==0)//match even if the menu command is more detailed (maybe an additional query) #i28667#
             {
                 sURL = aCmd;
                 *pImage = pMenu->GetItemImage( nId );
-                return TRUE;
+                return sal_True;
             }
         }
     }
@@ -1592,7 +1591,7 @@ BOOL Impl_ExistURLInMenu( const PopupMenu *pMenu     ,
         *pFallback += String(SvtModuleOptions().GetDefaultModuleName());
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 long Select_Impl( void* pHdl, void* pVoid );
@@ -1615,15 +1614,15 @@ SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow()
     {
         pMenu->SetSelectHdl( Link( NULL, Select_Impl ) );
         pMenu->SetActivateHdl( LINK( this, SfxAppToolBoxControl_Impl, Activate ));
-        rBox.SetItemDown( GetId(), TRUE );
-        USHORT nSelected = pMenu->Execute( &rBox, aRect, POPUPMENU_EXECUTE_DOWN );
+        rBox.SetItemDown( GetId(), sal_True );
+        sal_uInt16 nSelected = pMenu->Execute( &rBox, aRect, POPUPMENU_EXECUTE_DOWN );
         if ( nSelected )
         {
             aLastURL = pMenu->GetItemCommand( nSelected );
             SetImage( pMenu->GetItemCommand( nSelected ) );
         }
 
-        rBox.SetItemDown( GetId(), FALSE );
+        rBox.SetItemDown( GetId(), sal_False );
     }
 
     return 0;
@@ -1636,11 +1635,11 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
     String aURL = rURL;
     String sFallback;
     Image aMenuImage;
-    BOOL bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback,&aMenuImage);
+    sal_Bool bValid = Impl_ExistURLInMenu(pMenu,aURL,&sFallback,&aMenuImage);
     if (!bValid)
         aURL = sFallback;
 
-    BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
+    sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
     Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig );
     if ( !aImage )
         aImage = !!aMenuImage ? aMenuImage :
@@ -1659,7 +1658,7 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
 
 void SfxAppToolBoxControl_Impl::StateChanged
 (
-    USHORT              nSlotId,
+    sal_uInt16              nSlotId,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -1689,7 +1688,7 @@ void SfxAppToolBoxControl_Impl::StateChanged
 
 //--------------------------------------------------------------------
 
-void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
+void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
 {
     if( aLastURL.Len() )
     {
@@ -1782,7 +1781,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
         Application::PostUserEvent( STATIC_LINK( 0, SfxAppToolBoxControl_Impl, ExecuteHdl_Impl), pExecuteInfo );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
@@ -1790,8 +1789,8 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
     if ( pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        ULONG nSymbolsStyle     = rSettings.GetSymbolsStyle();
-        BOOL bShowMenuImages	= rSettings.GetUseImagesInMenus();
+        sal_uIntPtr nSymbolsStyle     = rSettings.GetSymbolsStyle();
+        sal_Bool bShowMenuImages	= rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bShowMenuImages != m_bShowMenuImages ))
@@ -1799,10 +1798,10 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
             m_nSymbolsStyle      = nSymbolsStyle;
             m_bShowMenuImages	 = bShowMenuImages;
 
-            USHORT nCount = pActMenu->GetItemCount();
-            for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
+            sal_uInt16 nCount = pActMenu->GetItemCount();
+            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
             {
-                USHORT nId = pActMenu->GetItemId( nSVPos );
+                sal_uInt16 nId = pActMenu->GetItemId( nSVPos );
                 if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
                 {
                     if ( bShowMenuImages )
@@ -1818,7 +1817,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE );
+                            Image aImage = GetImage( xFrame, aImageId, false );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -1830,7 +1829,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE );
+                                INetURLObject(aCmd), false );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nId, aImage );
                         }
@@ -1841,10 +1840,10 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 41452da24c..263358ca0a 100644..100755
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -135,14 +135,14 @@ SfxFrame::~SfxFrame()
 sal_Bool SfxFrame::DoClose()
 {
     // Eigentlich wird noch ein PrepareClose gebraucht !!!
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( !pImp->bClosing )
     {
         pImp->bClosing = sal_True;
         CancelTransfers();
 
         // now close frame; it will be deleted if this call is successful, so don't use any members after that!
-        bRet = TRUE;
+        bRet = sal_True;
         try
         {
             Reference< XCloseable > xCloseable  ( pImp->xFrame, UNO_QUERY );
@@ -160,7 +160,7 @@ sal_Bool SfxFrame::DoClose()
         catch( ::com::sun::star::util::CloseVetoException& )
         {
             pImp->bClosing = sal_False;
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( ::com::sun::star::lang::DisposedException& )
         {
@@ -224,7 +224,7 @@ sal_uInt16 SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
                 bOther = ( &pFrame->GetFrame() != this );
             }
 
-            SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEVIEW ), pCur) );
+            SFX_APP()->NotifyEvent( SfxViewEventHint(SFX_EVENT_PREPARECLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_PREPARECLOSEVIEW ), pCur, GetController() ) );
 
             if ( bOther )
                 // if there are other views only the current view of this frame must be asked
@@ -237,7 +237,7 @@ sal_uInt16 SfxFrame::PrepareClose_Impl( sal_Bool bUI, sal_Bool bForBrowsing )
         if ( nRet == RET_OK )
         {
             // if this frame has child frames, ask them too
-            for( USHORT nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; )
+            for( sal_uInt16 nPos = GetChildFrameCount(); nRet == RET_OK && nPos--; )
                 nRet = pChildArr->GetObject( nPos )->PrepareClose_Impl( bUI, bForBrowsing );
         }
 
@@ -286,7 +286,7 @@ sal_Bool SfxFrame::IsClosing_Impl() const
 
 void SfxFrame::SetIsClosing_Impl()
 {
-    pImp->bClosing = TRUE;
+    pImp->bClosing = sal_True;
 }
 
 sal_uInt16 SfxFrame::GetChildFrameCount() const
@@ -587,10 +587,10 @@ bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
     if ( wFrame )
     {
         rVal <<= wFrame->GetFrameInterface();
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
@@ -604,15 +604,15 @@ bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
             if ( pFr->GetFrameInterface() == xFrame )
             {
                 wFrame = pFrame = pFr;
-                return TRUE;
+                return sal_True;
             }
 
             pFr = SfxFrame::GetNext( *pFr );
         }
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -633,13 +633,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const
     return new SfxUsrAnyItem( Which(), aValue );
 }
 
-bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal = aValue;
     return sal_True;
 }
 
-bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     aValue = rVal;
     return sal_True;
@@ -667,13 +667,13 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const
     return new SfxUnoFrameItem( Which(), m_xFrame );
 }
 
-bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= m_xFrame;
     return sal_True;
 }
 
-bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     return ( rVal >>= m_xFrame );
 }
@@ -968,7 +968,7 @@ SfxFrame* SfxFrame::GetFirst()
 
 SfxFrame* SfxFrame::GetNext( SfxFrame& rFrame )
 {
-    USHORT nPos = pFramesArr_Impl->GetPos( &rFrame );
+    sal_uInt16 nPos = pFramesArr_Impl->GetPos( &rFrame );
     if ( nPos+1 < pFramesArr_Impl->Count() )
         return pFramesArr_Impl->GetObject(nPos+1);
     else
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 8778427429..6a0daa3ac8 100644..100755
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -31,7 +31,7 @@
 
 #include "impframe.hxx"
 #include "objshimp.hxx"
-#include "sfxhelp.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
@@ -123,20 +123,20 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
         if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() )
         {
             DBG_TRACE("SfxFrame: GotFocus");
-            pView->MakeActive_Impl( FALSE );
+            pView->MakeActive_Impl( sal_False );
         }
 
         // TODO/LATER: do we still need this code?
         Window* pWindow = rNEvt.GetWindow();
-        ULONG nHelpId  = 0;
-        while ( !nHelpId && pWindow )
+        rtl::OString sHelpId;
+        while ( !sHelpId.getLength() && pWindow )
         {
-            nHelpId = pWindow->GetHelpId();
+            sHelpId = pWindow->GetHelpId();
             pWindow = pWindow->GetParent();
         }
 
-        if ( nHelpId )
-            SfxHelp::OpenHelpAgent( pFrame, nHelpId );
+        if ( sHelpId.getLength() )
+            SfxHelp::OpenHelpAgent( pFrame, sHelpId );
 
         // if focus was on an external window, the clipboard content might have been changed
         pView->GetBindings().Invalidate( SID_PASTE );
@@ -146,7 +146,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
     else if( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) )
-            return TRUE;
+            return sal_True;
     }
     else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ )
     {
@@ -165,7 +165,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
 
 long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP )
     {
         SfxViewFrame* pView = pFrame->GetCurrentViewFrame();
@@ -200,7 +200,7 @@ long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 void SfxFrameWindow_Impl::GetFocus()
 {
     if ( pFrame && !pFrame->IsClosing_Impl() && pFrame->GetCurrentViewFrame() && pFrame->GetFrameInterface().is() )
-        pFrame->GetCurrentViewFrame()->MakeActive_Impl( TRUE );
+        pFrame->GetCurrentViewFrame()->MakeActive_Impl( sal_True );
 }
 
 void SfxFrameWindow_Impl::Resize()
@@ -213,7 +213,7 @@ void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_INITSHOW )
     {
-        pFrame->pImp->bHidden = FALSE;
+        pFrame->pImp->bHidden = sal_False;
         if ( pFrame->IsInPlace() )
             // TODO/MBA: workaround for bug in LayoutManager: the final resize does not get through because the
             // LayoutManager works asynchronously and between resize and time execution the DockingAcceptor was exchanged so that
@@ -251,7 +251,7 @@ Reference < XFrame > SfxFrame::CreateBlankFrame()
     return xFrame;
 }
 
-SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden )
+SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden )
 {
     SfxFrame* pFrame = NULL;
     try
@@ -342,7 +342,7 @@ SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden )
     pWindow->Show();
 }
 
-void SfxFrame::SetPresentationMode( BOOL bSet )
+void SfxFrame::SetPresentationMode( sal_Bool bSet )
 {
     if ( GetCurrentViewFrame() )
         GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WINDOW_BORDER_NOBORDER : WINDOW_BORDER_NORMAL );
@@ -363,7 +363,7 @@ void SfxFrame::SetPresentationMode( BOOL bSet )
     if ( GetWorkWindow_Impl() )
         GetWorkWindow_Impl()->SetDockingAllowed( !bSet );
     if ( GetCurrentViewFrame() )
-        GetCurrentViewFrame()->GetDispatcher()->Update_Impl( TRUE );
+        GetCurrentViewFrame()->GetDispatcher()->Update_Impl( sal_True );
 }
 
 SystemWindow* SfxFrame::GetSystemWindow() const
@@ -390,14 +390,14 @@ sal_Bool SfxFrame::Close()
     return sal_True;
 }
 
-void SfxFrame::LockResize_Impl( BOOL bLock )
+void SfxFrame::LockResize_Impl( sal_Bool bLock )
 {
     pImp->bLockResize = bLock;
 }
 
 IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
 {
-    if ( pFrame && !pFrame->PrepareClose_Impl( TRUE ) )
+    if ( pFrame && !pFrame->PrepareClose_Impl( sal_True ) )
         return 0L;
 
     if ( pFrame )
@@ -405,7 +405,7 @@ IMPL_LINK( SfxFrameWindow_Impl, CloserHdl, void*, EMPTYARG )
     return 0L;
 }
 
-void SfxFrame::SetMenuBarOn_Impl( BOOL bOn )
+void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
 {
     pImp->bMenuBarOn = bOn;
 
@@ -429,7 +429,7 @@ void SfxFrame::SetMenuBarOn_Impl( BOOL bOn )
     }
 }
 
-BOOL SfxFrame::IsMenuBarOn_Impl() const
+sal_Bool SfxFrame::IsMenuBarOn_Impl() const
 {
     return pImp->bMenuBarOn;
 }
@@ -473,7 +473,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
     // plugin mode
     sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
     if ( nPluginMode && ( nPluginMode != 2 ) )
-        SetInPlace_Impl( TRUE );
+        SetInPlace_Impl( sal_True );
 }
 
 bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 38a32020a8..33ba38674f 100644..100755
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -32,7 +32,6 @@
 #include <sal/macros.h>
 #include "frmload.hxx"
 #include "objshimp.hxx"
-#include "viewfac.hxx"
 #include "sfx2/app.hxx"
 #include "sfx2/dispatch.hxx"
 #include "sfx2/docfac.hxx"
@@ -47,6 +46,7 @@
 #include "sfx2/sfxuno.hxx"
 #include "sfx2/viewfrm.hxx"
 #include "sfx2/viewsh.hxx"
+#include "sfx2/viewfac.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XContainerQuery.hpp>
@@ -218,11 +218,10 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con
     ::rtl::OUString sFilterName;
     try
     {
-        ::framework::RequestFilterSelect* pRequest = new ::framework::RequestFilterSelect( i_rDocumentURL );
-        Reference< XInteractionRequest > xRequest ( pRequest );
-        i_rxHandler->handle( xRequest );
-        if( !pRequest->isAbort() )
-            sFilterName = pRequest->getFilter();
+        ::framework::RequestFilterSelect aRequest( i_rDocumentURL );
+        i_rxHandler->handle( aRequest.GetRequest() );
+        if( !aRequest.isAbort() )
+            sFilterName = aRequest.getFilter();
     }
     catch( const Exception& )
     {
@@ -255,36 +254,17 @@ namespace
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const USHORT _nSlotID, const Reference< XFrame >& i_rxFrame,
+sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame,
                                                               const bool i_bHidden )
 {
     SfxRequest aRequest( _nSlotID, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() );
     aRequest.AppendItem( SfxUnoFrameItem( SID_FILLFRAME, i_rxFrame ) );
     if ( i_bHidden )
-        aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
+        aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) );
     return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) );
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-void SfxFrameLoader_Impl::impl_lockHiddenDocument( SfxObjectShell& i_rDocument, const ::comphelper::NamedValueCollection& i_rDescriptor ) const
-{
-    const sal_Bool bHidden = i_rDescriptor.getOrDefault( "Hidden", sal_False );
-    if ( !bHidden )
-        return;
-
-    const SfxViewFrame* pExistingViewFrame = SfxViewFrame::GetFirst( &i_rDocument );
-    if ( pExistingViewFrame )
-        return;
-
-    // the document is to be loaded hidden, and it is not yet displayed in any other frame
-    // To prevent it from being closed when the loader returns, increase its OwnerLock
-    // (the OwnerLock is normally increased by every frame in which the document is displayed, and by this loader)
-    i_rDocument.RestoreNoDelete();
-    i_rDocument.OwnerLock( TRUE );
-    i_rDocument.Get_Impl()->bHiddenLockedByAPI = TRUE;
-}
-
-// --------------------------------------------------------------------------------------------------------------------
 void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const
 {
     const ::rtl::OUString     sURL         = io_rDescriptor.getOrDefault( "URL",                ::rtl::OUString() );
@@ -334,9 +314,9 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-SfxObjectShellLock SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const
+SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const
 {
-    for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, FALSE ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, FALSE ) )
+    for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, sal_False ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, sal_False ) )
     {
         if ( i_rxDocument == pDoc->GetModel() )
         {
@@ -394,7 +374,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-USHORT SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const
+sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const
 {
     ::rtl::OUString sSlotParam;
     const sal_Int32 nParamPos = i_rFactoryURL.indexOf( '?' );
@@ -407,7 +387,7 @@ USHORT SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactor
     }
 
     if ( sSlotParam.getLength() )
-        return USHORT( sSlotParam.toInt32() );
+        return sal_uInt16( sSlotParam.toInt32() );
 
     return 0;
 }
@@ -574,7 +554,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
     {
         const ::rtl::OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 );
         // special handling for some weird factory URLs a la private:factory/swriter?slot=21053
-        const USHORT nSlotParam = impl_findSlotParam( sFactory );
+        const sal_uInt16 nSlotParam = impl_findSlotParam( sFactory );
         if ( nSlotParam != 0 )
         {
             return impl_createNewDocWithSlotParam( nSlotParam, _rTargetFrame, aDescriptor.getOrDefault( "Hidden", false ) );
@@ -638,15 +618,12 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
             // tell the doc its (current) load args.
             impl_removeLoaderArguments( aDescriptor );
             xModel->attachResource( xModel->getURL(), aDescriptor.getPropertyValues() );
-                // TODO: not sure this is correct. The original, pre-refactoring code did it this way. However, I could
-                // imagine scenarios where it is *not* correct to overrule the *existing* model args (XModel::getArgs)
-                // with the ones passed to the loader here. For instance, what about the MacroExecutionMode? The document
-                // might have a mode other than the one passed to the loader, and we always overwrite the former with
-                // the latter.
         }
 
         // get the SfxObjectShell (still needed at the moment)
-        const SfxObjectShellLock xDoc = impl_findObjectShell( xModel );
+        // SfxObjectShellRef is used here ( instead of ...Lock ) since the model is closed below if necessary
+        // SfxObjectShellLock would be even dangerous here, since the lifetime control should be done outside in case of success
+        const SfxObjectShellRef xDoc = impl_findObjectShell( xModel );
         ENSURE_OR_THROW( xDoc.Is(), "no SfxObjectShell for the given model" );
 
         // ensure the ID of the to-be-created view is in the descriptor, if possible
@@ -654,16 +631,6 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
         const sal_Int16 nViewNo = xDoc->GetFactory().GetViewNo_Impl( nViewId, 0 );
         const ::rtl::OUString sViewName( xDoc->GetFactory().GetViewFactory( nViewNo ).GetAPIViewName() );
 
-        // if the document is created hidden, prevent it from being deleted until it is shown or disposed
-        impl_lockHiddenDocument( *xDoc, aDescriptor );
-            // TODO; if we wouldn't use a SfxObjectShellLock instance for xDoc, but a simple SfxObjectShellRef,
-            // then this would not be necessary, /me thinks. That is, the *Lock classes inc/dec a "Lock" counter
-            // (additional to the ref counter) in their ctor/dtor, and if the lock counter goes to 0, the
-            // object is closed (DoClose). The impl_lockHiddenDocument is to prevent exactly that premature
-            // closing. However, a *Ref object wouldn't close, anyway. And in case of unsuccessfull loading, the
-            // code at the very end of this method cares for closing the XModel, which should also close the
-            // ObjectShell.
-
         // plug the document into the frame
         impl_createDocumentView( xModel, _rTargetFrame, aViewCreationArgs, sViewName );
         bLoadSuccess = sal_True;
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index cee90cd7ce..cee90cd7ce 100644..100755
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 4cfe4aece9..e8bfbc455b 100644..100755
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -79,13 +79,13 @@ struct SfxViewFrame_Impl
 
 class SfxFrameViewWindow_Impl : public Window
 {
-    BOOL            bActive;
+    sal_Bool            bActive;
     SfxViewFrame*   pFrame;
 
 public:
                         SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) :
                             Window( &rParent, nBits | WB_BORDER | WB_CLIPCHILDREN ),
-                            bActive( FALSE ),
+                            bActive( sal_False ),
                             pFrame( p )
                         {
                             p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER );
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 62c3957718..1f8abfe673 100644..100755
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -221,6 +221,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a
 
     if ( m_pClient && aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnVisAreaChanged")) && m_nAspect != embed::Aspects::MSOLE_ICON )
     {
+        m_pClient->FormatChanged(); // for Writer when format of the object is changed with the area
         m_pClient->ViewChanged();
         m_pClient->Invalidate();
     }
@@ -399,7 +400,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
         throw uno::RuntimeException();
 
     m_pClient->GetViewShell()->ResetAllClients_Impl(m_pClient);
-    m_bUIActive = TRUE;
+    m_bUIActive = sal_True;
     m_pClient->GetViewShell()->UIActivating( m_pClient );
 }
 
@@ -423,7 +424,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
         throw uno::RuntimeException();
 
     m_pClient->GetViewShell()->UIDeactivated( m_pClient );
-    m_bUIActive = FALSE;
+    m_bUIActive = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -771,7 +772,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
 }
 
 //--------------------------------------------------------------------
-BOOL SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
+sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
 {
     if( rArea != m_pImp->m_aObjArea )
     {
@@ -779,10 +780,10 @@ BOOL SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
         m_pImp->SizeHasChanged();
 
         Invalidate();
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -992,7 +993,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
             {
 
                 if ( m_pViewSh )
-                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(TRUE);
+                    m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
                 try
                 {
                     m_pImp->m_xObject->setClientSite( m_pImp->m_xClient );
@@ -1042,7 +1043,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
                 if ( m_pViewSh )
                 {
                     SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
-                    pFrame->GetTopFrame().LockResize_Impl(FALSE);
+                    pFrame->GetTopFrame().LockResize_Impl(sal_False);
                     pFrame->GetTopFrame().Resize();
                 }
             }
@@ -1083,14 +1084,19 @@ void SfxInPlaceClient::MakeVisible()
     // dummy implementation
 }
 
+void SfxInPlaceClient::FormatChanged()
+{
+    // dummy implementation
+}
+
 void SfxInPlaceClient::DeactivateObject()
 {
     if ( GetObject().is() )
     {
         try
         {
-            m_pImp->m_bUIActive = FALSE;
-            BOOL bHasFocus = FALSE;
+            m_pImp->m_bUIActive = sal_False;
+            sal_Bool bHasFocus = sal_False;
             uno::Reference< frame::XModel > xModel( m_pImp->m_xObject->getComponent(), uno::UNO_QUERY );
             if ( xModel.is() )
             {
@@ -1098,12 +1104,12 @@ void SfxInPlaceClient::DeactivateObject()
                 if ( xController.is() )
                 {
                     Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() );
-                    bHasFocus = pWindow->HasChildPathFocus( TRUE );
+                    bHasFocus = pWindow->HasChildPathFocus( sal_True );
                 }
             }
 
             if ( m_pViewSh )
-                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(TRUE);
+                m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
 
             if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
             {
@@ -1125,7 +1131,7 @@ void SfxInPlaceClient::DeactivateObject()
             {
                 SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
                 SfxViewFrame::SetViewFrame( pFrame );
-                pFrame->GetTopFrame().LockResize_Impl(FALSE);
+                pFrame->GetTopFrame().LockResize_Impl(sal_False);
                 pFrame->GetTopFrame().Resize();
             }
         }
@@ -1140,7 +1146,7 @@ void SfxInPlaceClient::ResetObject()
     {
         try
         {
-            m_pImp->m_bUIActive = FALSE;
+            m_pImp->m_bUIActive = sal_False;
             if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
                 m_pImp->m_xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE );
             else
@@ -1158,7 +1164,7 @@ void SfxInPlaceClient::ResetObject()
     }
 }
 
-BOOL SfxInPlaceClient::IsUIActive()
+sal_Bool SfxInPlaceClient::IsUIActive()
 {
     return m_pImp->m_bUIActive;
 }
diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
deleted file mode 100644
index 9c257f4c9f..0000000000
--- a/sfx2/source/view/makefile.mk
+++ /dev/null
@@ -1,65 +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=			sfx2
-TARGET=				view
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-                view.src
-
-SLOFILES =	\
-        $(SLO)$/ipclient.obj \
-        $(SLO)$/viewsh.obj \
-        $(SLO)$/frmload.obj \
-        $(SLO)$/frame.obj \
-        $(SLO)$/frame2.obj \
-        $(SLO)$/printer.obj \
-        $(SLO)$/viewprn.obj \
-        $(SLO)$/viewfac.obj \
-        $(SLO)$/orgmgr.obj \
-        $(SLO)$/viewfrm.obj \
-        $(SLO)$/viewfrm2.obj \
-        $(SLO)$/sfxbasecontroller.obj \
-        $(SLO)$/userinputinterception.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index ac26dd0824..b6ffd425af 100644..100755
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -48,7 +48,7 @@
 #include "docvor.hxx"
 #include "orgmgr.hxx"
 #include "sfxtypes.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 #include <sfx2/docfilt.hxx>
 #include "fltfnc.hxx"
@@ -70,12 +70,12 @@ struct _FileListEntry
     const CollatorWrapper* pCollator;
     SfxObjectShellLock aDocShell; // ObjectShell als Ref-Klasse
 
-    BOOL bFile;					// als Datei auf Platte
+    sal_Bool bFile;					// als Datei auf Platte
                                 // (!= unbenannt1, nicht als Dok. geladen;
                                 // diese werden nicht gespeichert!)
-    BOOL bOwner;				// selbst erzeugt
-    BOOL bNoName;
-    BOOL bOwnFormat;
+    sal_Bool bOwner;				// selbst erzeugt
+    sal_Bool bNoName;
+    sal_Bool bOwnFormat;
 
     _FileListEntry( const String& rFileName,
                     const CollatorWrapper* pColl, const String* pTitle = NULL );
@@ -83,7 +83,7 @@ struct _FileListEntry
 
     int operator==( const _FileListEntry &rCmp) const;
     int operator< ( const _FileListEntry &rCmp) const;
-    BOOL DeleteObjectShell();
+    sal_Bool DeleteObjectShell();
 };
 
 //-------------------------------------------------------------------------
@@ -109,10 +109,10 @@ _FileListEntry::_FileListEntry( const String& rFileName,
 
     aFileName   ( rFileName ),
     pCollator   ( pColl ),
-    bFile       ( FALSE ),
-    bOwner      ( FALSE ),
-    bNoName     ( TRUE ),
-    bOwnFormat  ( TRUE )
+    bFile       ( sal_False ),
+    bOwner      ( sal_False ),
+    bNoName     ( sal_True ),
+    bOwnFormat  ( sal_True )
 {
     if ( pTitle )
         aBaseName = *pTitle;
@@ -137,20 +137,20 @@ SV_IMPL_OP_PTRARR_SORT(_SfxObjectList, _FileListEntry*)
 
 //=========================================================================
 
-BOOL _FileListEntry::DeleteObjectShell()
+sal_Bool _FileListEntry::DeleteObjectShell()
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell
 
-    [Returnwert]			TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]			sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
 
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     //Falls wir die Shell angelegt haben und sie veraendert wurde
     if(bOwner && aDocShell.Is() && aDocShell->IsModified())
     {
@@ -158,7 +158,7 @@ BOOL _FileListEntry::DeleteObjectShell()
         if( bOwnFormat )
         {
             if(!aDocShell->Save() )
-                bRet = FALSE;
+                bRet = sal_False;
             else
             {
                 try {
@@ -210,14 +210,14 @@ SfxObjectList::~SfxObjectList()
 
 //-------------------------------------------------------------------------
 
-const String &SfxObjectList::GetBaseName(USHORT i) const
+const String &SfxObjectList::GetBaseName(sal_uInt16 i) const
 {
     return (*this)[i]->aBaseName;
 }
 
 //-------------------------------------------------------------------------
 
-const String& SfxObjectList::GetFileName( USHORT i ) const
+const String& SfxObjectList::GetFileName( sal_uInt16 i ) const
 {
     return (*this)[i]->aFileName;
 }
@@ -273,7 +273,7 @@ SfxOrganizeMgr::~SfxOrganizeMgr()
 
 //-------------------------------------------------------------------------
 
-SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
+SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( sal_uInt16 nIdx )
 
 /*  [Beschreibung]
 
@@ -289,17 +289,17 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
     if ( !pEntry->aDocShell.Is() )
     {
         INetURLObject aFileObj( pEntry->aFileName );
-        BOOL bDum = FALSE;
+        sal_Bool bDum = sal_False;
         SfxApplication* pSfxApp = SFX_APP();
         String aFilePath = aFileObj.GetMainURL( INetURLObject::NO_DECODE );
-        pEntry->aDocShell = pSfxApp->DocAlreadyLoaded( aFilePath, FALSE, bDum );
+        pEntry->aDocShell = pSfxApp->DocAlreadyLoaded( aFilePath, sal_False, bDum );
         if ( !pEntry->aDocShell.Is() )
         {
-            pEntry->bOwner = TRUE;
+            pEntry->bOwner = sal_True;
             SfxMedium* pMed = new SfxMedium(
-                aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), FALSE, 0 );
+                aFilePath, ( STREAM_READ | STREAM_SHARE_DENYWRITE ), sal_False, 0 );
             const SfxFilter* pFilter = NULL;
-            pMed->UseInteractionHandler(TRUE);
+            pMed->UseInteractionHandler(sal_True);
             if (
                 pSfxApp->GetFilterMatcher().GuessFilter(*pMed, &pFilter, SFX_FILTER_TEMPLATE, 0) ||
                 (pFilter && !pFilter->IsOwnFormat()) ||
@@ -307,7 +307,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
                )
             {
                 pSfxApp->LoadTemplate( pEntry->aDocShell, aFilePath );
-                pEntry->bOwnFormat = FALSE;
+                pEntry->bOwnFormat = sal_False;
                 delete pMed;
                 if ( pEntry->aDocShell.Is() )
                     return (SfxObjectShellRef)(SfxObjectShell*)(pEntry->aDocShell);
@@ -316,7 +316,7 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
             {
                 if ( pFilter )
                 {
-                    pEntry->bOwnFormat = TRUE;
+                    pEntry->bOwnFormat = sal_True;
                     pEntry->aDocShell = SfxObjectShell::CreateObject( pFilter->GetServiceName(), SFX_CREATE_MODE_ORGANIZER );
                     if ( pEntry->aDocShell.Is() )
                     {
@@ -334,14 +334,14 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx )
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nIdx)
+sal_Bool SfxOrganizeMgr::DeleteObjectShell(sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell an der Position nIdx
 
-    [Returnwert]			TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]			sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
@@ -351,8 +351,8 @@ BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nIdx)
 
 //-------------------------------------------------------------------------
 
-SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion,
-                                                        USHORT nIdx)
+SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(sal_uInt16 nRegion,
+                                                        sal_uInt16 nIdx)
 /*  [Beschreibung]
 
     Zugriff auf die DokumentShell an der Position nIdx im Bereich
@@ -367,15 +367,15 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nRegion, USHORT nIdx)
+sal_Bool SfxOrganizeMgr::DeleteObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
     Freigabe der DokumentShell an der Position nIdx im Bereich
     nRegion (Dokumentvorlage)
 
-    [Returnwert]			TRUE: alles Ok
-                            FALSE: es ist ein Fehler aufgetreten (das
+    [Returnwert]			sal_True: alles Ok
+                            sal_False: es ist ein Fehler aufgetreten (das
                             Dokument konnte nicht gesichert werden)
 
 */
@@ -386,10 +386,10 @@ BOOL SfxOrganizeMgr::DeleteObjectShell(USHORT nRegion, USHORT nIdx)
 
 //-------------------------------------------------------------------------
 
-BOOL	SfxOrganizeMgr::Copy(USHORT nTargetRegion,
-                            USHORT nTargetIdx,
-                            USHORT nSourceRegion,
-                            USHORT nSourceIdx)
+sal_Bool	SfxOrganizeMgr::Copy(sal_uInt16 nTargetRegion,
+                            sal_uInt16 nTargetIdx,
+                            sal_uInt16 nSourceRegion,
+                            sal_uInt16 nSourceIdx)
 
 /*  [Beschreibung]
 
@@ -397,10 +397,10 @@ BOOL	SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
     [Parameter]
 
-    USHORT nTargetRegion			Index des Zielbereiches
-    USHORT nTargetIdx				Index Zielposition
-    USHORT nSourceRegion			Index des Quellbereiches
-    USHORT nSourceIdx				Index der zu kopierenden / z uverschiebenden
+    sal_uInt16 nTargetRegion			Index des Zielbereiches
+    sal_uInt16 nTargetIdx				Index Zielposition
+    sal_uInt16 nSourceRegion			Index des Quellbereiches
+    sal_uInt16 nSourceIdx				Index der zu kopierenden / z uverschiebenden
                                     Dokumentvorlage
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -408,17 +408,17 @@ BOOL	SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Copy(USHORT nTargetRegion,
-                                USHORT nTargetIdx,
-                                USHORT nSourceRegion,
-                                USHORT nSourceIdx)>
+    <SfxDocumentTemplates::Copy(sal_uInt16 nTargetRegion,
+                                sal_uInt16 nTargetIdx,
+                                sal_uInt16 nSourceRegion,
+                                sal_uInt16 nSourceIdx)>
 
 */
 
 {
     if(nSourceIdx == USHRT_MAX)	// keine Verzeichnisse kopieren
-        return FALSE ;
-    const BOOL bOk = pTemplates->Copy(nTargetRegion, nTargetIdx,
+        return sal_False ;
+    const sal_Bool bOk = pTemplates->Copy(nTargetRegion, nTargetIdx,
                                         nSourceRegion, nSourceIdx);
     if(bOk)
         bModified = 1;
@@ -427,10 +427,10 @@ BOOL	SfxOrganizeMgr::Copy(USHORT nTargetRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL	SfxOrganizeMgr::Move(USHORT nTargetRegion,
-                            USHORT nTargetIdx,
-                            USHORT nSourceRegion,
-                            USHORT nSourceIdx)
+sal_Bool	SfxOrganizeMgr::Move(sal_uInt16 nTargetRegion,
+                            sal_uInt16 nTargetIdx,
+                            sal_uInt16 nSourceRegion,
+                            sal_uInt16 nSourceIdx)
 
 /*  [Beschreibung]
 
@@ -438,10 +438,10 @@ BOOL	SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
     [Parameter]
 
-    USHORT nTargetRegion			Index des Zielbereiches
-    USHORT nTargetIdx				Index Zielposition
-    USHORT nSourceRegion			Index des Quellbereiches
-    USHORT nSourceIdx				Index der zu kopierenden / z uverschiebenden
+    sal_uInt16 nTargetRegion			Index des Zielbereiches
+    sal_uInt16 nTargetIdx				Index Zielposition
+    sal_uInt16 nSourceRegion			Index des Quellbereiches
+    sal_uInt16 nSourceIdx				Index der zu kopierenden / z uverschiebenden
                                     Dokumentvorlage
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -449,17 +449,17 @@ BOOL	SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Move(USHORT nTargetRegion,
-                                USHORT nTargetIdx,
-                                USHORT nSourceRegion,
-                                USHORT nSourceIdx)>
+    <SfxDocumentTemplates::Move(sal_uInt16 nTargetRegion,
+                                sal_uInt16 nTargetIdx,
+                                sal_uInt16 nSourceRegion,
+                                sal_uInt16 nSourceIdx)>
 
 */
 
 {
     if(nSourceIdx == USHRT_MAX)	// keine Verzeichnisse verschieben
-        return FALSE ;
-    const BOOL bOk = pTemplates->Move(nTargetRegion, nTargetIdx,
+        return sal_False ;
+    const sal_Bool bOk = pTemplates->Move(nTargetRegion, nTargetIdx,
                                         nSourceRegion, nSourceIdx);
     if(bOk)
         bModified = 1;
@@ -468,8 +468,8 @@ BOOL	SfxOrganizeMgr::Move(USHORT nTargetRegion,
 
 //-------------------------------------------------------------------------
 
-BOOL	SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
-                                USHORT nRegion, USHORT nIdx)
+sal_Bool	SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
+                                sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
@@ -482,20 +482,20 @@ BOOL	SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
                                     durch das Keyboard angetriggert wird,
                                     mu"s das Model der ListBox anschlie"send
                                     aktualisiert werden.
-    USHORT nRegion					Index des Bereiches
-    USHORT nIdx						Index der Dokumentvorlage
+    sal_uInt16 nRegion					Index des Bereiches
+    sal_uInt16 nIdx						Index der Dokumentvorlage
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::Delete(USHORT nRegion, USHORT nIdx)>
+    <SfxDocumentTemplates::Delete(sal_uInt16 nRegion, sal_uInt16 nIdx)>
 
 */
 
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     if ( USHRT_MAX == nIdx )
     {
@@ -504,11 +504,11 @@ BOOL	SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
         SvLBoxEntry *pGroupToDelete = pCaller->SvLBox::GetEntry(nRegion);
         if ( pGroupToDelete )
         {
-            USHORT nItemNum = (USHORT)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
-            USHORT nToDeleteNum = 0;
+            sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
+            sal_uInt16 nToDeleteNum = 0;
             SvLBoxEntry **pEntriesToDelete = new SvLBoxEntry*[nItemNum];
 
-            USHORT nInd = 0;
+            sal_uInt16 nInd = 0;
             for ( nInd = 0; nInd < nItemNum; nInd++ )
                 pEntriesToDelete[nInd] = NULL;
 
@@ -553,7 +553,7 @@ BOOL	SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
 
 //-------------------------------------------------------------------------
 
-BOOL	SfxOrganizeMgr::InsertDir
+sal_Bool	SfxOrganizeMgr::InsertDir
 (
     SfxOrganizeListBox_Impl*	pCaller,/*	rufende ListBox; da dieses Event
                                             durch das Men"u oder durch das
@@ -561,7 +561,7 @@ BOOL	SfxOrganizeMgr::InsertDir
                                             mu\s das Model der ListBox
                                             anschlie\send aktualisiert werden */
     const String&				rText,	//	logischer Name des Bereiches
-    USHORT						nRegion //	Index des Bereiches
+    sal_uInt16						nRegion //	Index des Bereiches
 )
 
 /*	[Beschreibung]
@@ -571,23 +571,23 @@ BOOL	SfxOrganizeMgr::InsertDir
 
     [R"uckgabewert]
 
-    Erfolg (TRUE) oder Mi\serfolg (FALSE)
+    Erfolg (sal_True) oder Mi\serfolg (sal_False)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::InsertDir(const String &, USHORT nRegion)>
+    <SfxDocumentTemplates::InsertDir(const String &, sal_uInt16 nRegion)>
 */
 
 {
-    const BOOL bOk = pTemplates->InsertDir(rText, nRegion);
+    const sal_Bool bOk = pTemplates->InsertDir(rText, nRegion);
     if(bOk)
     {
         bModified = 1;
         SvLBoxEntry *pEntry = pCaller->InsertEntry(rText,
                                                    pCaller->GetOpenedBmp(0),
                                                    pCaller->GetClosedBmp(0),
-                                                   0, TRUE, nRegion);
+                                                   0, sal_True, nRegion);
         pCaller->Update();
         pCaller->EditEntry(pEntry);
     }
@@ -596,8 +596,8 @@ BOOL	SfxOrganizeMgr::InsertDir
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::SetName(const String &rName,
-                             USHORT nRegion, USHORT nIdx)
+sal_Bool SfxOrganizeMgr::SetName(const String &rName,
+                             sal_uInt16 nRegion, sal_uInt16 nIdx)
 
 /*  [Beschreibung]
 
@@ -606,20 +606,20 @@ BOOL SfxOrganizeMgr::SetName(const String &rName,
     [Parameter]
 
     const String &rName				der neue Name
-    USHORT nRegion					Index des Bereiches
-    USHORT nIdx						Index der Dokumentvorlage
+    sal_uInt16 nRegion					Index des Bereiches
+    sal_uInt16 nIdx						Index der Dokumentvorlage
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
 
 
     [Querverweise]
 
-    <SfxDocumentTemplates::SetName(const String &, USHORT nRegion, USHORT nIdx)>
+    <SfxDocumentTemplates::SetName(const String &, sal_uInt16 nRegion, sal_uInt16 nIdx)>
 
 */
 
 {
-    const BOOL bOk = pTemplates->SetName(rName, nRegion, nIdx);
+    const sal_Bool bOk = pTemplates->SetName(rName, nRegion, nIdx);
     if(bOk)
         bModified = 1;
     return bOk;
@@ -627,7 +627,7 @@ BOOL SfxOrganizeMgr::SetName(const String &rName,
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const
+sal_Bool SfxOrganizeMgr::CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const
 
 /*  [Beschreibung]
 
@@ -635,8 +635,8 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
     [Parameter]
 
-    USHORT nRegion					Index des Bereiches
-    USHORT nIdx						Index der Dokumentvorlage
+    sal_uInt16 nRegion					Index des Bereiches
+    sal_uInt16 nIdx						Index der Dokumentvorlage
     const String &rName				Dateiname
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -644,7 +644,7 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyTo( USHORT nRegion, USHORT nIdx, const String &)>
+    <SfxDocumentTemplates::CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String &)>
 
 */
 
@@ -654,8 +654,8 @@ BOOL SfxOrganizeMgr::CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) co
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
-                              USHORT nRegion, USHORT nIdx, String &rName)
+sal_Bool SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
+                              sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName)
 
 /*  [Beschreibung]
 
@@ -667,8 +667,8 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
                                     Event durch das Men"u angetriggert wird,
                                     mu"s das Model der ListBox anschlie"send
                                     aktualisiert werden.
-    USHORT nRegion					Index des Bereiches
-    USHORT nIdx						Index der Dokumentvorlage
+    sal_uInt16 nRegion					Index des Bereiches
+    sal_uInt16 nIdx						Index der Dokumentvorlage
     String &rName					Dateiname
 
     [R"uckgabewert]					Erfolg (TRUE) oder Mi"serfolg (FALSE)
@@ -676,7 +676,7 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
 
     [Querverweise]
 
-    <SfxDocumentTemplates::CopyFrom( USHORT nRegion, USHORT nIdx, const String &)>
+    <SfxDocumentTemplates::CopyFrom( sal_uInt16 nRegion, sal_uInt16 nIdx, const String &)>
 
 */
 
@@ -695,20 +695,20 @@ BOOL SfxOrganizeMgr::CopyFrom(SfxOrganizeListBox_Impl *pCaller,
                               pCaller->GetOpenedBmp(1),
                               pCaller->GetClosedBmp(1),
                               pParent,
-                              TRUE,
+                              sal_True,
                               nIdx);
         pCaller->Update();
         // pCaller->EditEntry( pEntry );
         pCaller->Expand( pParent );
-        bModified = TRUE;
-        return TRUE;
+        bModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName )
+sal_Bool SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName )
 
 /*  [Beschreibung]
 
@@ -731,18 +731,18 @@ BOOL SfxOrganizeMgr::InsertFile( SfxOrganizeListBox_Impl* pCaller, const String&
     _FileListEntry* pEntry = new _FileListEntry( rFileName, pCollator );
     if ( pImpl->pDocList->C40_PTR_INSERT( _FileListEntry, pEntry ) )
     {
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         pImpl->pDocList->Seek_Entry( pEntry, &nPos );
         pCaller->InsertEntry( pEntry->aBaseName, pCaller->GetOpenedBmp(1),
-                              pCaller->GetClosedBmp(1), 0, TRUE, nPos );
-        return TRUE;
+                              pCaller->GetClosedBmp(1), 0, sal_True, nPos );
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
 
-BOOL SfxOrganizeMgr::Rescan()
+sal_Bool SfxOrganizeMgr::Rescan()
 
 /*  [Beschreibung]
 
@@ -750,7 +750,7 @@ BOOL SfxOrganizeMgr::Rescan()
 
     [R"uckgabewert]
 
-    TRUE					es bestanden Unterschiede
+    sal_True					es bestanden Unterschiede
     FALSE					keine "Anderung
 
     [Querverweise]
@@ -761,10 +761,10 @@ BOOL SfxOrganizeMgr::Rescan()
 {
     if(pTemplates->Rescan())
     {
-        bModified = TRUE;
-        return TRUE;
+        bModified = sal_True;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //-------------------------------------------------------------------------
@@ -782,14 +782,14 @@ void SfxOrganizeMgr::SaveAll(Window *pParent)
 */
 
 {
-    USHORT nRangeCount = pTemplates->GetRegionCount();
-    USHORT i;
+    sal_uInt16 nRangeCount = pTemplates->GetRegionCount();
+    sal_uInt16 i;
     for(i = 0; i < nRangeCount; ++i)
     {
         if( pTemplates->IsRegionLoaded( i ))
         {
-            const USHORT nCount = pTemplates->GetCount(i);
-            for(USHORT j = 0; j < nCount; ++j)
+            const sal_uInt16 nCount = pTemplates->GetCount(i);
+            for(sal_uInt16 j = 0; j < nCount; ++j)
             {
                 if(!pTemplates->DeleteObjectShell(i, j))
                 {
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index d3c56d535c..ac529295e3 100644..100755
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -31,7 +31,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/printdlg.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
 #include <vector>
@@ -42,57 +41,26 @@
 #include <sfx2/prnmon.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/tabdlg.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "view.hrc"
 
-#ifdef MSC
-// der ist buggy
-#define NEW_OBJECTS(Class, nCount) ((Class*) new char[ sizeof(Class) * (nCount) ])
-#else
-#define NEW_OBJECTS(Class, nCount) (new Class[nCount])
-#endif
-
-
-USHORT SfxFontSizeInfo::pStaticSizes[] =
-{
-    60,
-    80,
-    100,
-    120,
-    140,
-    180,
-    240,
-    360,
-    480,
-    600,
-    720
-};
-
-//--------------------------------------------------------------------
-
-SV_DECL_PTRARR_DEL(SfxFontArr_Impl,SfxFont*,10,5)
-
 // struct SfxPrinter_Impl ------------------------------------------------
 
 struct SfxPrinter_Impl
 {
-    SfxFontArr_Impl*	mpFonts;
-    BOOL				mbAll;
-    BOOL				mbSelection;
-    BOOL				mbFromTo;
-    BOOL				mbRange;
+    sal_Bool			mbAll;
+    sal_Bool			mbSelection;
+    sal_Bool			mbFromTo;
+    sal_Bool			mbRange;
 
     SfxPrinter_Impl() :
-        mpFonts		( NULL ),
-        mbAll		( TRUE ),
-        mbSelection ( TRUE ),
-        mbFromTo	( TRUE ),
-        mbRange 	( TRUE ) {}
-    ~SfxPrinter_Impl() { delete mpFonts; }
+        mbAll		( sal_True ),
+        mbSelection ( sal_True ),
+        mbFromTo	( sal_True ),
+        mbRange 	( sal_True ) {}
+    ~SfxPrinter_Impl() {}
 };
 
-#define FONTS()	pImpl->mpFonts
-
 struct SfxPrintOptDlg_Impl
 {
     sal_Bool		mbHelpDisabled;
@@ -101,98 +69,6 @@ struct SfxPrintOptDlg_Impl
         mbHelpDisabled	( sal_False ) {}
 };
 
-//--------------------------------------------------------------------
-
-SfxFontSizeInfo::SfxFontSizeInfo( const SfxFont &rFont,
-                                  const OutputDevice &rDevice ) :
-
-    pSizes(0),
-    nSizes(0),
-    bScalable(TRUE)
-
-{
-    if ( 0 == rDevice.GetDevFontCount() )
-        bScalable = FALSE;
-    else
-    {
-        OutputDevice &rDev = (OutputDevice&) rDevice;
-        Font aFont(rFont.GetName(), Size(0,12));
-        aFont.SetFamily(rFont.GetFamily());
-        aFont.SetPitch(rFont.GetPitch());
-        aFont.SetCharSet(rFont.GetCharSet());
-
-        // verfuegbare Groessen in die Liste eintragen, Groesse in 10tel Punkt
-        int nSizeCount = rDev.GetDevFontSizeCount(aFont);
-        pSizes = NEW_OBJECTS(Size, nSizeCount);
-        const MapMode aOldMapMode = rDev.GetMapMode();
-        MapMode aMap(aOldMapMode);
-        aMap.SetMapUnit(MAP_POINT);
-        const Fraction aTen(1, 10);
-        aMap.SetScaleX(aTen);
-        aMap.SetScaleY(aTen);
-        rDev.SetMapMode(aMap);
-
-        // Es gibt Fonts mit Bitmaps und skalierbaren Groessen
-        // In diesem Fall wird der Fonts als skalierbar behandelt.
-        BOOL bFoundScalable = FALSE;
-        for ( int i = 0; i < nSizeCount; ++i )
-        {
-            const Size aSize( rDev.GetDevFontSize(aFont, i) );
-            if ( aSize.Height() != 0 )
-                pSizes[nSizes++] = aSize;
-            else
-                bFoundScalable |= TRUE;
-        }
-        if( !bFoundScalable )
-            bScalable = FALSE;
-        else
-        {
-            // statische Font-Sizes verwenden
-            delete [] pSizes;
-            nSizes = 0;
-        }
-        rDev.SetMapMode(aOldMapMode);
-    }
-
-    if ( 0 == nSizes )
-    {
-        nSizes = sizeof(pStaticSizes) / sizeof(USHORT);
-        pSizes = NEW_OBJECTS(Size, nSizes);
-        for ( USHORT nPos = 0; nPos <nSizes; ++nPos )
-           pSizes[nPos] = Size( 0, pStaticSizes[nPos] );
-    }
-}
-
-//--------------------------------------------------------------------
-
-SfxFontSizeInfo::~SfxFontSizeInfo()
-{
-    delete [] pSizes;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxFontSizeInfo::HasSize(const Size &rSize) const
-{
-    if ( bScalable )
-        return TRUE;
-    for ( USHORT i = 0; i < nSizes; ++i)
-        if ( pSizes[i] == rSize )
-            return TRUE;
-    return FALSE;
-}
-
-//--------------------------------------------------------------------
-
-SfxFont::SfxFont( const FontFamily eFontFamily, const String& aFontName,
-                  const FontPitch eFontPitch, const CharSet eFontCharSet ):
-    aName( aFontName ),
-    eFamily( eFontFamily ),
-        ePitch( eFontPitch ),
-    eCharSet( eFontCharSet )
-{
-}
-
 // class SfxPrinter ------------------------------------------------------
 
 SfxPrinter* SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions )
@@ -333,194 +209,6 @@ void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions )
 
 //--------------------------------------------------------------------
 
-void SfxPrinter::EnableRange( USHORT nRange )
-{
-    PrintDialogRange eRange	= (PrintDialogRange)nRange;
-
-    if ( eRange == PRINTDIALOG_ALL )
-        pImpl->mbAll = TRUE;
-    else if ( eRange == PRINTDIALOG_SELECTION )
-        pImpl->mbSelection = TRUE;
-    else if ( eRange == PRINTDIALOG_FROMTO )
-        pImpl->mbFromTo = TRUE;
-    else if ( eRange == PRINTDIALOG_RANGE )
-        pImpl->mbRange = TRUE;
-}
-
-//--------------------------------------------------------------------
-
-void SfxPrinter::DisableRange( USHORT nRange )
-{
-    PrintDialogRange eRange	= (PrintDialogRange)nRange;
-
-    if ( eRange == PRINTDIALOG_ALL )
-        pImpl->mbAll = FALSE;
-    else if ( eRange == PRINTDIALOG_SELECTION )
-        pImpl->mbSelection = FALSE;
-    else if ( eRange == PRINTDIALOG_FROMTO )
-        pImpl->mbFromTo = FALSE;
-    else if ( eRange == PRINTDIALOG_RANGE )
-        pImpl->mbRange = FALSE;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxPrinter::IsRangeEnabled( USHORT nRange ) const
-{
-    PrintDialogRange eRange	= (PrintDialogRange)nRange;
-    BOOL bRet = FALSE;
-
-    if ( eRange == PRINTDIALOG_ALL )
-        bRet = pImpl->mbAll;
-    else if ( eRange == PRINTDIALOG_SELECTION )
-        bRet = pImpl->mbSelection;
-    else if ( eRange == PRINTDIALOG_FROMTO )
-        bRet = pImpl->mbFromTo;
-    else if ( eRange == PRINTDIALOG_RANGE )
-        bRet = pImpl->mbRange;
-
-    return bRet;
-}
-
-//--------------------------------------------------------------------
-
-SV_IMPL_PTRARR(SfxFontArr_Impl,SfxFont*)
-
-//--------------------------------------------------------------------
-
-const SfxFont* SfxFindFont_Impl( const SfxFontArr_Impl& rArr,
-                                 const String& rName )
-{
-    const USHORT nCount = rArr.Count();
-    for ( USHORT i = 0; i < nCount; ++i )
-    {
-        const SfxFont *pFont = rArr[i];
-        if ( pFont->GetName() == rName )
-            return pFont;
-    }
-    return NULL;
-}
-
-//--------------------------------------------------------------------
-
-void SfxPrinter::UpdateFonts_Impl()
-{
-    VirtualDevice *pVirDev = 0;
-    const OutputDevice *pOut = this;
-
-        // falls kein Drucker gefunden werden konnte, ein
-        // temp. Device erzeugen fuer das Erfragen der Fonts
-    if( !IsValid() )
-        pOut = pVirDev = new VirtualDevice;
-
-    int nCount = pOut->GetDevFontCount();
-    FONTS() =  new SfxFontArr_Impl((BYTE)nCount);
-
-    std::vector< Font > aNonRegularFonts;
-    for(int i = 0;i < nCount;++i)
-    {
-        Font aFont(pOut->GetDevFont(i));
-        if ( (aFont.GetItalic() != ITALIC_NONE) ||
-             (aFont.GetWeight() != WEIGHT_MEDIUM) )
-        {
-            // First: Don't add non-regular fonts. The font name is not unique so we have
-            // to filter the device font list.
-            aNonRegularFonts.push_back( aFont );
-        }
-        else if ( FONTS()->Count() == 0 ||
-             (*FONTS())[FONTS()->Count()-1]->GetName() != aFont.GetName() )
-        {
-            DBG_ASSERT(0 == SfxFindFont_Impl(*FONTS(), aFont.GetName()), "Doppelte Fonts vom SV-Device!");
-            SfxFont* pTmp = new SfxFont( aFont.GetFamily(), aFont.GetName(),
-                                         aFont.GetPitch(), aFont.GetCharSet() );
-            FONTS()->C40_INSERT(SfxFont, pTmp, FONTS()->Count());
-        }
-    }
-    delete pVirDev;
-
-    // Try to add all non-regular fonts. It could be that there was no regular font
-    // with the same name added.
-    std::vector< Font >::const_iterator pIter;
-    for ( pIter = aNonRegularFonts.begin(); pIter != aNonRegularFonts.end(); ++pIter )
-    {
-        if ( SfxFindFont_Impl( *FONTS(), pIter->GetName() ) == 0 )
-        {
-            SfxFont* pTmp = new SfxFont( pIter->GetFamily(), pIter->GetName(),
-                                         pIter->GetPitch(), pIter->GetCharSet() );
-            FONTS()->C40_INSERT( SfxFont, pTmp, FONTS()->Count() );
-        }
-    }
-}
-
-//--------------------------------------------------------------------
-
-USHORT SfxPrinter::GetFontCount()
-{
-    if ( !FONTS() )
-        UpdateFonts_Impl();
-    return FONTS()->Count();
-}
-
-//--------------------------------------------------------------------
-
-const SfxFont* SfxPrinter::GetFont( USHORT nNo ) const
-{
-    DBG_ASSERT( FONTS(), "bitte erst GetFontCount() abfragen!" );
-    return (*FONTS())[ nNo ];
-}
-
-//--------------------------------------------------------------------
-
-const SfxFont* SfxPrinter::GetFontByName( const String &rFontName )
-{
-    if ( !FONTS() )
-        UpdateFonts_Impl();
-    return SfxFindFont_Impl(*FONTS(), rFontName);
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxPrinter::InitJob( Window* pUIParent, BOOL bAskAboutTransparentObjects )
-{
-    const SvtPrinterOptions     aPrinterOpt;
-    const SvtPrintFileOptions   aPrintFileOpt;
-    const SvtBasePrintOptions*  pPrinterOpt = &aPrinterOpt;
-    const SvtBasePrintOptions*  pPrintFileOpt = &aPrintFileOpt;
-    PrinterOptions              aNewPrinterOptions;
-    BOOL                        bRet = TRUE;
-
-    ( ( IsPrintFileEnabled() && GetPrintFile().Len() ) ? pPrintFileOpt : pPrinterOpt )->GetPrinterOptions( aNewPrinterOptions );
-
-    if( bAskAboutTransparentObjects && !aNewPrinterOptions.IsReduceTransparency() )
-    {
-        if ( !Application::IsHeadlessModeEnabled() )
-        {
-            SvtPrintWarningOptions aWarnOpt;
-
-            if( aWarnOpt.IsTransparency() )
-            {
-                TransparencyPrintWarningBox	aWarnBox( pUIParent );
-                const USHORT				nRet = aWarnBox.Execute();
-
-                if( nRet == RET_CANCEL )
-                    bRet = FALSE;
-                else
-                {
-                    aNewPrinterOptions.SetReduceTransparency( nRet != RET_NO );
-                    aWarnOpt.SetTransparency( !aWarnBox.IsNoWarningChecked() );
-                }
-            }
-        }
-    }
-
-    if( bRet )
-        SetPrinterOptions( aNewPrinterOptions );
-
-    return bRet;
-}
-
-//--------------------------------------------------------------------
-
 SfxPrintOptionsDialog::SfxPrintOptionsDialog( Window *pParent,
                                               SfxViewShell *pViewShell,
                                               const SfxItemSet *pSet ) :
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
deleted file mode 100644
index 6bab763dc1..0000000000
--- a/sfx2/source/view/prnmon.cxx
+++ /dev/null
@@ -1,488 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-#include <com/sun/star/view/PrintableState.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
-#include <vcl/fixed.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/asynclink.hxx>
-
-#include <unotools/printwarningoptions.hxx>
-#include <svl/eitem.hxx>
-
-#include <sfx2/prnmon.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfile.hxx>
-#include "sfxtypes.hxx"
-#include <sfx2/progress.hxx>
-#include <sfx2/bindings.hxx>
-#include "sfxresid.hxx"
-#include <sfx2/event.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/app.hxx>
-
-#include "view.hrc"
-
-//------------------------------------------------------------------------
-
-#define SFX_TITLE_MAXLEN_PRINTMONITOR	22
-
-//------------------------------------------------------------------------
-
-struct SfxPrintMonitor_Impl: public ModelessDialog
-{
-
-    SfxPrintMonitor_Impl( Window *pParent, SfxViewShell *rpViewShell );
-    virtual BOOL Close();
-
-    SfxViewShell*           pViewShell;
-    FixedText				aDocName;
-    FixedText				aPrinting;
-    FixedText				aPrinter;
-    FixedText				aPrintInfo;
-    CancelButton			aCancel;
-};
-
-//-------------------------------------------------------------------------
-
-struct SfxPrintProgress_Impl : public SfxListener
-{
-    SfxPrintMonitor_Impl* 	pMonitor;
-    SfxViewShell*			pViewShell;
-    SfxPrinter* 			pPrinter;
-    SfxPrinter* 			pOldPrinter;
-    USHORT					nLastPage;
-    BOOL					bRunning;
-    BOOL					bCancel;
-    BOOL					bDeleteOnEndPrint;
-    BOOL					bShow;
-    BOOL					bCallbacks;
-    BOOL					bOldEnablePrintFile;
-    BOOL                    bOldFlag;
-    BOOL                    bRestoreFlag;
-    BOOL					bAborted;
-    svtools::AsynchronLink  aDeleteLink;
-    Link					aCancelHdl;
-
-private:
-    DECL_LINK( CancelHdl, Button * );
-    DECL_STATIC_LINK( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress * );
-
-public:
-    SfxPrintProgress_Impl( SfxViewShell* pTheViewShell, SfxPrinter* pThePrinter );
-    ~SfxPrintProgress_Impl();
-
-    void            		Delete( SfxPrintProgress* pAntiImpl ) { aDeleteLink.Call( pAntiImpl ); }
-    SfxViewShell*			GetViewShell() const { return pViewShell; }
-    BOOL					SetPage( USHORT nPage, const String &rPage );
-    void                    CreateMonitor();
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-};
-
-void SfxPrintProgress_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
-{
-    SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
-    if ( pPrintHint )
-    {
-        if ( pPrintHint->GetWhich() == -2 )
-            CancelHdl(0);
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintMonitor_Impl::SfxPrintMonitor_Impl( Window* pParent, SfxViewShell* rpViewShell ) :
-    ModelessDialog( pParent, SfxResId( DLG_PRINTMONITOR ) ),
-    pViewShell  ( rpViewShell ),
-    aDocName    ( this, SfxResId( FT_DOCNAME ) ),
-    aPrinting   ( this, SfxResId( FT_PRINTING ) ),
-    aPrinter    ( this, SfxResId( FT_PRINTER ) ),
-    aPrintInfo  ( this, SfxResId( FT_PRINTINFO ) ),
-    aCancel     ( this, SfxResId( PB_CANCELPRNMON ) )
-{
-    if( rpViewShell->GetPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) != 0 )
-    {
-        String aPrep( SfxResId( STR_FT_PREPARATION ) );
-        aPrinting.SetText( aPrep );
-        aPrinter.Show( FALSE );
-    }
-    FreeResource();
-}
-
-//------------------------------------------------------------------------
-
-IMPL_STATIC_LINK_NOINSTANCE( SfxPrintProgress_Impl, DeleteHdl, SfxPrintProgress*, pAntiImpl )
-{
-    delete pAntiImpl;
-    return 0;
-}
-
-void actualizePrintCancelState(CancelButton& rButton, const SfxObjectShell* pShell)
-{
-    sal_Bool bEnableCancelButton = sal_True;
-    if (pShell)
-        bEnableCancelButton = pShell->Stamp_GetPrintCancelState();
-
-    if (!bEnableCancelButton)
-        rButton.Disable();
-    else
-        rButton.Enable();
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::SfxPrintProgress_Impl( SfxViewShell* pTheViewShell,
-                                              SfxPrinter* pThePrinter ) :
-
-    pMonitor            ( 0 ),
-    pViewShell			( pTheViewShell ),
-    pPrinter			( pThePrinter ),
-    pOldPrinter			( NULL ),
-    nLastPage			( 0 ),
-    bRunning			( TRUE ),
-    bCancel				( FALSE ),
-    bDeleteOnEndPrint	( FALSE ),
-    bShow               ( FALSE ),
-    bCallbacks			( FALSE ),
-    bOldEnablePrintFile	( FALSE ),
-    bOldFlag            ( TRUE ),
-    bRestoreFlag        ( FALSE ),
-    bAborted			( FALSE ),
-    aDeleteLink			( STATIC_LINK( this, SfxPrintProgress_Impl, DeleteHdl ) )
-{
-    StartListening( *pViewShell->GetObjectShell() );
-}
-
-void SfxPrintProgress_Impl::CreateMonitor()
-{
-    // mark monitor to been shown in first status indication
-    bShow = TRUE;
-
-    if ( !pMonitor )
-    {
-        Window* pParent = pViewShell->GetWindow();
-        pMonitor = new SfxPrintMonitor_Impl( pParent, pViewShell );
-        pMonitor->aDocName.SetText( pViewShell->GetObjectShell()->GetTitle( SFX_TITLE_MAXLEN_PRINTMONITOR ) );
-        pMonitor->aPrinter.SetText( pViewShell->GetPrinter()->GetName() );
-
-        // Stampit enable/dsiable cancel button
-        actualizePrintCancelState( pMonitor->aCancel, pViewShell->GetObjectShell() );
-        pMonitor->aCancel.SetClickHdl( LINK( this, SfxPrintProgress_Impl, CancelHdl ) );
-    }
-}
-
-//------------------------------------------------------------------------
-
-SfxPrintProgress_Impl::~SfxPrintProgress_Impl()
-{
-}
-
-//------------------------------------------------------------------------
-
-BOOL SfxPrintProgress_Impl::SetPage( USHORT nPage, const String &rPage )
-{
-    // wurde der Druckauftrag abgebrochen?
-    if ( bCancel || !pMonitor )
-        return FALSE;
-
-    // Stampit enable/dsiable cancel button
-    actualizePrintCancelState(pMonitor->aCancel, pViewShell->GetObjectShell());
-
-    nLastPage = nPage;
-    String aStrPrintInfo = String( SfxResId( STR_PAGE ) );
-    if ( !rPage.Len() )
-        aStrPrintInfo += String::CreateFromInt32( nLastPage );
-    else
-        aStrPrintInfo += rPage;
-    pMonitor->aPrintInfo.SetText( aStrPrintInfo );
-    pMonitor->Update();
-    return TRUE;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress_Impl, CancelHdl, Button *, EMPTYARG )
-{
-    if ( !pViewShell->GetPrinter()->IsJobActive() && pViewShell->GetPrinter()->IsPrinting() )
-        // we are still in StartJob, cancelling now might lead to a crash
-        return 0;
-
-    if ( pMonitor )
-        pMonitor->Hide();
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_ABORTED, NULL, NULL ) );
-    pViewShell->GetPrinter()->AbortJob();
-    bCancel = TRUE;
-
-    if ( aCancelHdl.IsSet() )
-        aCancelHdl.Call( this );
-
-    bAborted = TRUE;
-    return 0;
-}
-
-BOOL SfxPrintMonitor_Impl::Close()
-{
-    BOOL bAgree = pViewShell ? pViewShell->GetObjectShell()->Stamp_GetPrintCancelState() : TRUE;
-    if (!bAgree)
-        return FALSE;
-    else
-        return ModelessDialog::Close();
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, bool bShow )
-:   SfxProgress( pViewSh->GetViewFrame()->GetObjectShell(),
-                 String(SfxResId(STR_PRINTING)), 1, FALSE ),
-    pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
-{
-    SfxObjectShell* pDoc = pViewSh->GetObjectShell();
-    SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
-    if ( pItem && pItem->GetValue() )
-        bShow = FALSE;
-
-    if ( bShow )
-        pImp->CreateMonitor();
-
-    Lock();
-    if ( !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
-    {
-        pImp->bRestoreFlag = TRUE;
-        pImp->bOldFlag = pDoc->IsEnableSetModified();
-        if ( pImp->bOldFlag )
-            pDoc->EnableSetModified( FALSE );
-    }
-}
-
-//--------------------------------------------------------------------
-
-SfxPrintProgress::~SfxPrintProgress()
-{
-    // k"onnte auch schon weg sein (in EndPrintNotify)
-    DELETEZ(pImp->pMonitor);
-
-    // ggf. Callbacks entfermen
-    if ( pImp->bCallbacks )
-    {
-        // pImp->pPrinter->SetEndPrintHdl( Link() );
-        pImp->pPrinter->SetErrorHdl( Link() );
-        pImp->bCallbacks = FALSE;
-    }
-
-    // ggf. vorherigen Drucker wieder einsetzen
-    if ( pImp->pOldPrinter )
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pImp->pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // EndPrint-Notification an Frame
-    //pImp->pViewShell->GetViewFrame()->GetFrame().Lock_Impl(FALSE);
-    pImp->EndListening( *(pImp->pViewShell->GetObjectShell()) );
-
-    // the following call might destroy the view or even the document
-    pImp->pViewShell->CheckOwnerShip_Impl();
-    delete pImp;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxPrintProgress::SetState( ULONG nValue, ULONG nNewRange )
-{
-    if ( pImp->bShow )
-    {
-        pImp->bShow = FALSE;
-        if ( pImp->pMonitor )
-        {
-            pImp->pMonitor->Show();
-            pImp->pMonitor->Update();
-        }
-    }
-
-    return pImp->SetPage( (USHORT)nValue, GetStateText_Impl() ) &&
-           SfxProgress::SetState( nValue, nNewRange );
-}
-
-//--------------------------------------------------------------------
-
-void SfxPrintProgress::SetText( const String& rText )
-{
-    if ( pImp->pMonitor )
-    {
-        pImp->pMonitor->SetText( rText );
-        pImp->pMonitor->Update();
-    }
-    SfxProgress::SetText( rText );
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-    // AbortJob calls EndPrint hdl, so do not delete pImp just now
-    BOOL bWasDeleteOnEndPrint = pImp->bDeleteOnEndPrint;
-    pImp->bDeleteOnEndPrint = FALSE;
-    pImp->pPrinter->AbortJob();
-    InfoBox( pImp->GetViewShell()->GetWindow(),
-             String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
-    if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pImp->pViewShell->GetObjectShell()->EnableSetModified( pImp->bOldFlag );
-    pImp->GetViewShell()->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_FAILED, NULL, NULL ) );
-    // now we can clean up like normally EndPrint hdl does
-    if( bWasDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SfxPrintProgress, PrintErrorNotify, void *, EMPTYARG )
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( SfxPrintProgress, StartPrintNotify, void *, EMPTYARG )
-{
-    SfxObjectShell *pObjShell = pImp->pViewShell->GetObjectShell();
-    SFX_APP()->NotifyEvent(SfxEventHint(SFX_EVENT_PRINTDOC, GlobalEventConfig::GetEventName( STR_EVENT_PRINTDOC ), pObjShell));
-    pObjShell->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_STARTED, NULL, NULL ) );
-    return 0;
-}
-
-IMPL_LINK( SfxPrintProgress, EndPrintNotify, void *, EMPTYARG )
-{
-    if ( pImp->pMonitor )
-        pImp->pMonitor->Hide();
-
-    SfxViewShell* pViewShell = pImp->pViewShell;
-
-    // Slots enablen
-    pViewShell->Invalidate( SID_PRINTDOC );
-    pViewShell->Invalidate( SID_PRINTDOCDIRECT );
-    pViewShell->Invalidate( SID_SETUPPRINTER );
-
-    // . . . falls der Printer im System umgestellt wurde, hier Aenderung
-    // nachziehen.
-    //! if( pMDI->IsPrinterChanged() ) pMDI->Changed( 0L );
-
-    // Callbacks rausnehmen
-    // pImp->pPrinter->SetEndPrintHdl( Link() );
-    pImp->pPrinter->SetErrorHdl( Link() );
-    pImp->bCallbacks = FALSE;
-
-    // ggf. alten Printer wieder einsetzen
-    if ( pImp->pOldPrinter )
-    {
-        // Fix #59613#: niemals den aktuellen Printer synchron abschiessen !
-        // Da sowieso immer bDeleteOnEndPrint gesetzt wird, wird der der Drucker im
-        // dtor vom Printprogress ( dann aber asynchron !! ) zur"uckgesetzt.
-/*
-        pImp->pViewShell->SetPrinter( pImp->pOldPrinter, SFX_PRINTER_PRINTER );
-        pImp->pOldPrinter = 0;
-        pImp->pPrinter = 0;
- */
-    }
-    else
-        // ggf. vorherigen Print-To-File-Status zuruecksetzen
-        pViewShell->GetPrinter()->EnablePrintFile( pImp->bOldEnablePrintFile );
-
-    // it is possible that after printing the document or view is deleted (because the VieShell got the ownership)
-    // so first clean up
-    if ( pImp->bRestoreFlag && pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-        pViewShell->GetObjectShell()->EnableSetModified( TRUE );
-
-    pViewShell->GetObjectShell()->Broadcast( SfxPrintingHint( com::sun::star::view::PrintableState_JOB_COMPLETED, NULL, NULL ) );
-    if ( pImp->bDeleteOnEndPrint )
-    {
-        DELETEZ(pImp->pMonitor);
-        delete this;
-    }
-    else
-    {
-        DBG_ASSERT( !pImp->pOldPrinter, "Unable to restore printer!" );
-        pImp->bRunning = FALSE;
-    }
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::DeleteOnEndPrint()
-{
-    UnLock(); // jetzt schon, wg. Drucken im Thread
-#ifndef WNT
-    // da das Drucken im 'Thread' unter Windows zu undefiniert ist bleibt der
-    // Print-Monitor dort stehen, auf den anderen Plattformen kann man dann
-    // weiterarbeiten, also kommt das Teil weg
-    DELETEZ( pImp->pMonitor );
-#endif
-
-    pImp->bDeleteOnEndPrint = TRUE;
-    if ( !pImp->bRunning )
-        delete this;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter,
-                                          BOOL bOldEnablePrintFile )
-{
-    pImp->pOldPrinter = pOldPrinter;
-    pImp->bOldEnablePrintFile = bOldEnablePrintFile;
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::RestoreOnEndPrint( SfxPrinter *pOldPrinter )
-{
-    RestoreOnEndPrint( pOldPrinter, FALSE );
-}
-
-//------------------------------------------------------------------------
-
-void SfxPrintProgress::SetCancelHdl( const Link& aCancelHdl )
-{
-    pImp->aCancelHdl = aCancelHdl;
-}
-
-BOOL SfxPrintProgress::IsAborted() const
-{
-    return pImp->bAborted;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 5a9c4bd917..857f1e503b 100644..100755
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -94,7 +94,7 @@
 #include <boost/unordered_map.hpp>
 
 #include <sfx2/event.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 
 #define	OMULTITYPEINTERFACECONTAINERHELPER		::cppu::OMultiTypeInterfaceContainerHelper
 #define OINTERFACECONTAINERHELPER               ::cppu::OInterfaceContainerHelper
@@ -425,7 +425,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV
     SfxViewShell* pShell = m_pController->GetViewShell_Impl();
     if  ( m_pController !=  NULL &&  pShell )
     {
-        BOOL bCanClose = (BOOL) pShell->PrepareClose( FALSE );
+        sal_Bool bCanClose = (sal_Bool) pShell->PrepareClose( sal_False );
         if ( !bCanClose )
         {
             if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) )
@@ -515,7 +515,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT
         if ( aEvent.Action == ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED )
         {
             if ( !m_pController->GetViewShell_Impl()->GetUIActiveIPClient_Impl() )
-                m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( FALSE );
+                m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( sal_False );
         }
         else if ( aEvent.Action == ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED )
         {
@@ -640,7 +640,7 @@ void SAL_CALL SfxBaseController::attachFrame( const REFERENCE< XFRAME >& xFrame
             ConnectSfxFrame_Impl( E_CONNECT );
 
             // attaching the frame to the controller is the last step in the creation of a new view, so notify this
-            SfxEventHint aHint( SFX_EVENT_VIEWCREATED, GlobalEventConfig::GetEventName( STR_EVENT_VIEWCREATED ), m_pData->m_pViewShell->GetObjectShell() );
+            SfxViewEventHint aHint( SFX_EVENT_VIEWCREATED, GlobalEventConfig::GetEventName( STR_EVENT_VIEWCREATED ), m_pData->m_pViewShell->GetObjectShell(), uno::Reference< frame::XController2 >( this ) );
             SFX_APP()->NotifyEvent( aHint );
         }
     }
@@ -699,7 +699,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( ::com::
         for ( const SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );	!bOther && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ) )
             bOther = (pFrame != pActFrame);
 
-        BOOL bRet = bOther || pDocShell->PrepareClose();
+        sal_Bool bRet = bOther || pDocShell->PrepareClose();
         if ( bRet )
         {
             ConnectSfxFrame_Impl( E_DISCONNECT );
@@ -735,7 +735,7 @@ ANY SfxBaseController::getViewData() throw( ::com::sun::star::uno::RuntimeExcept
     if ( m_pData->m_pViewShell )
     {
         m_pData->m_pViewShell->WriteUserData( sData1 ) ;
-        OUSTRING    sData( sData1 );
+        ::rtl::OUString    sData( sData1 );
         aAny <<= sData ;
     }
 
@@ -751,7 +751,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const ANY& aValue ) throw( ::c
     SolarMutexGuard aGuard;
     if ( m_pData->m_pViewShell )
     {
-        OUSTRING sData;
+        ::rtl::OUString sData;
         aValue >>= sData ;
         m_pData->m_pViewShell->ReadUserData( sData ) ;
     }
@@ -782,7 +782,7 @@ REFERENCE< XMODEL > SAL_CALL SfxBaseController::getModel() throw( ::com::sun::st
 //________________________________________________________________________________________________________
 
 REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(	const	UNOURL&				aURL			,
-                                                                    const	OUSTRING&			sTargetFrameName,
+                                                                    const	::rtl::OUString&			sTargetFrameName,
                                                                             sal_Int32			eSearchFlags	) throw( RUNTIMEEXCEPTION )
 {
     SolarMutexGuard aGuard;
@@ -796,7 +796,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(	const	UNOURL&
             {
                 SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame();
                 if ( eSearchFlags & ( ::com::sun::star::frame::FrameSearchFlag::CREATE ))
-                    pFrame->SetChildWindow( SID_BROWSER, TRUE );
+                    pFrame->SetChildWindow( SID_BROWSER, sal_True );
                 SfxChildWindow* pChildWin = pFrame->GetChildWindow( SID_BROWSER );
                 REFERENCE < XFRAME > xFrame;
                 if ( pChildWin )
@@ -867,7 +867,7 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(	const	UNOURL&
             }
             else if ( aURL.Protocol.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("slot:")) )
             {
-                USHORT nId = (USHORT) aURL.Path.toInt32();
+                sal_uInt16 nId = (sal_uInt16) aURL.Path.toInt32();
 
                 pAct = m_pData->m_pViewShell->GetViewFrame() ;
                 if (nId >= SID_VERB_START && nId <= SID_VERB_END)
@@ -939,12 +939,12 @@ REFERENCE< XDISPATCH > SAL_CALL SfxBaseController::queryDispatch(	const	UNOURL&
 //	SfxBaseController -> XDispatchProvider
 //________________________________________________________________________________________________________
 
-SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SfxBaseController::queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescripts ) throw( ::com::sun::star::uno::RuntimeException )
+uno::Sequence< REFERENCE< XDISPATCH > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< DISPATCHDESCRIPTOR >& seqDescripts ) throw( ::com::sun::star::uno::RuntimeException )
 {
     // Create return list - which must have same size then the given descriptor
     // It's not allowed to pack it!
     sal_Int32 nCount = seqDescripts.getLength();
-    SEQUENCE< REFERENCE< XDISPATCH > > lDispatcher( nCount );
+    uno::Sequence< REFERENCE< XDISPATCH > > lDispatcher( nCount );
 
     for( sal_Int32 i=0; i<nCount; ++i )
     {
@@ -1053,7 +1053,7 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime
         if ( pFrame && pFrame->GetViewShell() == m_pData->m_pViewShell )
             pFrame->GetFrame().SetIsClosing_Impl();
         m_pData->m_pViewShell->DiscardClients_Impl();
-        m_pData->m_pViewShell->pImp->bControllerSet = sal_False ;
+        m_pData->m_pViewShell->pImp->m_bControllerSet = false;
 
         if ( pFrame )
         {
@@ -1070,7 +1070,7 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime
                 pView = SfxViewFrame::GetNext( *pView, pDoc );
             }
 
-            SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_CLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEVIEW ), pDoc ) );
+            SFX_APP()->NotifyEvent( SfxViewEventHint(SFX_EVENT_CLOSEVIEW, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEVIEW ), pDoc, uno::Reference< frame::XController2 >( this ) ) );
             if ( !pView )
                 SFX_APP()->NotifyEvent( SfxEventHint(SFX_EVENT_CLOSEDOC, GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ), pDoc) );
 
@@ -1207,10 +1207,10 @@ throw (::com::sun::star::uno::RuntimeException)
     SfxSlotPool*  pPool = &SfxSlotPool::GetSlotPool( pViewFrame );
 
     SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
-    const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+    const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
     // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-    for ( USHORT i=0; i<pSlotPool->GetGroupCount(); i++ )
+    for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ )
     {
         String aName = pSlotPool->SeekGroup( i );
         const SfxSlot* pSfxSlot = pSlotPool->FirstSlot();
@@ -1239,14 +1239,14 @@ throw (::com::sun::star::uno::RuntimeException)
     SolarMutexGuard aGuard;
     if ( m_pData->m_pViewShell )
     {
-        const ULONG nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
+        const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG );
 
         SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() );
         SfxSlotPool*  pPool( &SfxSlotPool::GetSlotPool( pViewFrame ));
         rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
         SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
-        for ( USHORT i=0; i<pSlotPool->GetGroupCount(); i++ )
+        for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ )
         {
             String aName = pSlotPool->SeekGroup( i );
             const SfxSlot* pSfxSlot = pSlotPool->FirstSlot();
@@ -1279,17 +1279,17 @@ throw (::com::sun::star::uno::RuntimeException)
     return aSeq;
 }
 
-BOOL SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
+sal_Bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
 {
     return m_pData->m_aUserInputInterception.handleNotifyEvent( rEvent );
 }
 
-BOOL SfxBaseController::HasKeyListeners_Impl()
+sal_Bool SfxBaseController::HasKeyListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasKeyHandlers();
 }
 
-BOOL SfxBaseController::HasMouseClickListeners_Impl()
+sal_Bool SfxBaseController::HasMouseClickListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasMouseClickListeners();
 }
@@ -1368,15 +1368,15 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
             if ( !rFrame.IsMarkedHidden_Impl() )
             {
                 if ( rDoc.IsHelpDocument() || ( nPluginMode == 2 ) )
-                    pViewFrame->GetDispatcher()->HideUI( TRUE );
+                    pViewFrame->GetDispatcher()->HideUI( sal_True );
                 else
-                    pViewFrame->GetDispatcher()->HideUI( FALSE );
+                    pViewFrame->GetDispatcher()->HideUI( sal_False );
 
                 if ( rFrame.IsInPlace() )
                     pViewFrame->LockAdjustPosSizePixel();
 
                 if ( nPluginMode == 3 )
-                    rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( FALSE );
+                    rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( sal_False );
 
                 if ( !rFrame.IsInPlace() )
                     pViewFrame->GetDispatcher()->Update_Impl();
@@ -1391,7 +1391,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                     // force resize for OLE server to fix layout problems of writer and math
                     // see i53651
                     if ( nPluginMode == 3 )
-                        pViewFrame->Resize( TRUE );
+                        pViewFrame->Resize( sal_True );
                 }
             }
             else
@@ -1404,7 +1404,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
             pViewFrame->UpdateTitle();
 
             if ( !rFrame.IsInPlace() )
-                pViewFrame->Resize( TRUE );
+                pViewFrame->Resize( sal_True );
 
             // if there's a JumpMark given, then, well, jump to it
             ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() );
@@ -1439,11 +1439,11 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                 try
                 {
                     Reference< XViewDataSupplier > xViewDataSupplier( getModel(), UNO_QUERY_THROW );
-                    Reference< XIndexAccess > xViewData( xViewDataSupplier->getViewData(), UNO_SET_THROW );
+                    Reference< XIndexAccess > xViewData( xViewDataSupplier->getViewData() );
 
                     // find the view data item whose ViewId matches the ID of the view we're just connecting to
                     const SfxObjectFactory& rDocFactory( rDoc.GetFactory() );
-                    const sal_Int32 nCount = xViewData->getCount();
+                    const sal_Int32 nCount = xViewData.is() ? xViewData->getCount() : 0;
                     sal_Int32 nViewDataIndex = 0;
                     for ( sal_Int32 i=0; i<nCount; ++i )
                     {
@@ -1467,7 +1467,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                         Sequence< PropertyValue > aViewData;
                         OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) >>= aViewData );
                         if ( aViewData.getLength() > 0 )
-                            m_pData->m_pViewShell->ReadUserDataSequence( aViewData, TRUE );
+                            m_pData->m_pViewShell->ReadUserDataSequence( aViewData, sal_True );
                     }
                 }
                 catch( const Exception& )
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index a05b94fb69..c88fc097e1 100644..100755
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -185,7 +185,7 @@ namespace sfx2
     {
         Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl );
 
-        USHORT nType = _rEvent.GetType();
+        sal_uInt16 nType = _rEvent.GetType();
         bool bHandled = false;
 
         switch ( nType )
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 167566555c..cdeba10cc3 100644..100755
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.hrc
@@ -41,12 +41,6 @@
 #define STR_NOSTARTPRINTER					(RID_SFX_VIEW_START+ 9)
 #define STR_PRINTING						(RID_SFX_VIEW_START+10)
 
-#ifndef STR_UNDO
-#define STR_UNDO							(RID_SFX_VIEW_START+11)
-#define STR_REDO							(RID_SFX_VIEW_START+12)
-#define STR_REPEAT							(RID_SFX_VIEW_START+13)
-#endif
-
 #define DLG_PRINTMONITOR					(RID_SFX_VIEW_START)
 #define FT_DOCNAME						1
 #define FT_PRINTING                     2
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index ca066ea63d..ca066ea63d 100644..100755
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index a770ad2976..0b539ada7b 100644..100755
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -31,8 +31,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <sfx2/app.hxx>
+#include "sfx2/viewfac.hxx"
 #include <rtl/ustrbuf.hxx>
-#include "viewfac.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -72,7 +72,7 @@ String SfxViewFactory::GetAPIViewName() const
 // CTOR / DTOR -----------------------------------------------------------
 
 SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI,
-                                USHORT nOrdinal, const sal_Char* asciiViewName ):
+                                sal_uInt16 nOrdinal, const sal_Char* asciiViewName ):
     fnCreate(fnC),
     fnInit(fnI),
     nOrd(nOrdinal),
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c0f7be76d1..0499f775ff 100644..100755
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -94,6 +94,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
 #include <svl/sharecontrolfile.hxx>
+#include <svtools/svtools.hrc>
+#include <svtools/svtdata.hxx>
 #include <framework/framelistanalyzer.hxx>
 
 #include <boost/optional.hpp>
@@ -125,10 +127,10 @@ namespace css = ::com::sun::star;
 #include <sfx2/request.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/ipclient.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "appbas.hxx"
 #include <sfx2/objitem.hxx>
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include <sfx2/event.hxx>
 #include "fltfnc.hxx"
 #include <sfx2/docfile.hxx>
@@ -145,7 +147,7 @@ namespace css = ::com::sun::star;
 #include "workwin.hxx"
 #include "helper.hxx"
 #include "macro.hxx"
-#include "minfitem.hxx"
+#include "sfx2/minfitem.hxx"
 #include "../appl/app.hrc"
 #include "impviewframe.hxx"
 
@@ -604,7 +606,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 bForEdit = !bForEdit;
 
             // ggf. beim User nachfragen
-            sal_Bool bDo = ( GetViewShell()->PrepareClose() != FALSE );
+            sal_Bool bDo = ( GetViewShell()->PrepareClose() != sal_False );
             SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
             if ( bDo && GetFrame().DocIsModified_Impl() &&
                  !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) )
@@ -631,7 +633,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 // collect the views of the document
                 // TODO: when UNO ViewFactories are available for SFX-based documents, the below code should
                 // be UNOized, too
-                typedef ::std::pair< Reference< XFrame >, USHORT >  ViewDescriptor;
+                typedef ::std::pair< Reference< XFrame >, sal_uInt16 >  ViewDescriptor;
                 ::std::list< ViewDescriptor > aViewFrames;
                 SfxViewFrame *pView = GetFirst( xOldObj );
                 while ( pView )
@@ -708,9 +710,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 if ( pSilentItem && pSilentItem->GetValue() )
                     pNewSet->Put( SfxBoolItem( SID_SILENT, sal_True ) );
 
-                SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, FALSE);
-                SFX_ITEMSET_ARG(pNewSet, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , FALSE);
-                SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , FALSE);
+                SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False);
+                SFX_ITEMSET_ARG(pNewSet, pMacroExecItem  , SfxUInt16Item, SID_MACROEXECMODE     , sal_False);
+                SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE     , sal_False);
 
                 if (!pInteractionItem)
                 {
@@ -951,7 +953,7 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq )
 {
     // gibt es an der obersten Shell einen Undo-Manager?
     SfxShell *pSh = GetDispatcher()->GetShell(0);
-    SfxUndoManager* pShUndoMgr = pSh->GetUndoManager();
+    ::svl::IUndoManager* pShUndoMgr = pSh->GetUndoManager();
     sal_Bool bOK = sal_False;
     if ( pShUndoMgr )
     {
@@ -963,20 +965,20 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq )
                 break;
 
             case SID_UNDO:
-                pShUndoMgr->Undo(0);
+                pShUndoMgr->Undo();
                 GetBindings().InvalidateAll(sal_False);
                 bOK = sal_True;
                 break;
 
             case SID_REDO:
-                pShUndoMgr->Redo(0);
+                pShUndoMgr->Redo();
                 GetBindings().InvalidateAll(sal_False);
                 bOK = sal_True;
                 break;
 
             case SID_REPEAT:
                 if ( pSh->GetRepeatTarget() )
-                    pShUndoMgr->Repeat( *pSh->GetRepeatTarget(), 0);
+                    pShUndoMgr->Repeat( *pSh->GetRepeatTarget() );
                 bOK = sal_True;
                 break;
         }
@@ -1002,7 +1004,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
         // Ich bin gerade am Reloaden und Yielde so vor mich hin ...
         return;
 
-    SfxUndoManager *pShUndoMgr = pSh->GetUndoManager();
+    ::svl::IUndoManager *pShUndoMgr = pSh->GetUndoManager();
     if ( !pShUndoMgr )
     {
         // der SW hat eigenes Undo an der View
@@ -1021,8 +1023,8 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() )
     {
-        String aTmp( SfxResId( STR_UNDO ) );
-        aTmp += pShUndoMgr->GetUndoActionComment(0);
+        String aTmp( SvtResId( STR_UNDO ) );
+        aTmp+= pShUndoMgr->GetUndoActionComment(0);
         rSet.Put( SfxStringItem( SID_UNDO, aTmp ) );
     }
     else
@@ -1030,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 
     if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() )
     {
-        String aTmp( SfxResId(STR_REDO) );
+        String aTmp( SvtResId(STR_REDO) );
         aTmp += pShUndoMgr->GetRedoActionComment(0);
         rSet.Put( SfxStringItem( SID_REDO, aTmp ) );
     }
@@ -1038,10 +1040,10 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
         rSet.DisableItem( SID_REDO );
     SfxRepeatTarget *pTarget = pSh->GetRepeatTarget();
     if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() &&
-         pShUndoMgr->CanRepeat(*pTarget, 0) )
+         pShUndoMgr->CanRepeat(*pTarget) )
     {
-        String aTmp( SfxResId(STR_REPEAT) );
-        aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget, 0);
+        String aTmp( SvtResId(STR_REPEAT) );
+        aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget);
         rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) );
     }
     else
@@ -1175,10 +1177,6 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
     DBG_CHKTHIS(SfxViewFrame, 0);
     SFX_APP();
 
-#ifdef WIN
-    pSfxApp->TestFreeResources_Impl();
-#endif
-
     pDispatcher->DoActivate_Impl( bUI, pOldFrame );
 
     // Wenn ich einen parent habe und dieser ist kein parent des alten
@@ -1214,9 +1212,6 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
             pFrame = pFrame->GetParentViewFrame();
         }
     }
-#ifdef WIN
-    pSfxApp->TestFreeResources_Impl();
-#endif
 }
 
 //------------------------------------------------------------------------
@@ -1805,7 +1800,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable )
             if ( !bEnable )
                 pImp->bWindowWasEnabled = pWindow->IsInputEnabled();
             if ( !bEnable || pImp->bWindowWasEnabled )
-                pWindow->EnableInput( bEnable, TRUE );
+                pWindow->EnableInput( bEnable, sal_True );
         }
 
         // cursor and focus
@@ -1861,8 +1856,8 @@ void SfxViewFrame::Show()
 
     if ( xObjSh.Is() && xObjSh->Get_Impl()->bHiddenLockedByAPI )
     {
-        xObjSh->Get_Impl()->bHiddenLockedByAPI = FALSE;
-        xObjSh->OwnerLock(FALSE);
+        xObjSh->Get_Impl()->bHiddenLockedByAPI = sal_False;
+        xObjSh->OwnerLock(sal_False);
     }
 }
 
@@ -1891,7 +1886,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock )
 }
 
 //--------------------------------------------------------------------
-void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
+void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus )
 {
     if ( GetViewShell() && !GetFrame().IsClosing_Impl() )
     {
@@ -1899,10 +1894,10 @@ void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
         {
             if ( GetViewShell() )
             {
-                BOOL bPreview = FALSE;
+                sal_Bool bPreview = sal_False;
                 if ( GetObjectShell()->IsPreview() )
                 {
-                    bPreview = TRUE;
+                    bPreview = sal_True;
                 }
                 else
                 {
@@ -1935,7 +1930,7 @@ void SfxViewFrame::MakeActive_Impl( BOOL bGrabFocus )
                 {
                     GetBindings().SetDispatcher( GetDispatcher() );
                     GetBindings().SetActiveFrame( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > () );
-                    GetDispatcher()->Update_Impl( FALSE );
+                    GetDispatcher()->Update_Impl( sal_False );
                 }
             }
         }
@@ -1988,7 +1983,7 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
 
 //--------------------------------------------------------------------
 SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
-                                                   const USHORT i_nViewId, const bool i_bHidden )
+                                                   const sal_uInt16 i_nViewId, const bool i_bHidden )
 {
     Reference< XFrame > xFrame( i_rFrame );
     bool bOwnFrame = false;
@@ -2061,7 +2056,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell
 
 //--------------------------------------------------------------------
 SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
-                                           const Sequence< PropertyValue >& i_rLoadArgs, const USHORT i_nViewId,
+                                           const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId,
                                            const bool i_bHidden )
 {
     Reference< XModel > xDocument( i_rDoc.GetModel(), UNO_SET_THROW );
@@ -2091,37 +2086,37 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
 
-SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false );
 }
 
 //--------------------------------------------------------------------
-SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId )
+SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId )
 {
-    SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE );
-    SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
+    SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False );
+    SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
 
     return LoadViewIntoFrame_Impl_NoThrow(
         i_rDoc,
@@ -2153,9 +2148,9 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
     }
 
     SfxViewFrame* pViewFrame = NULL;
-    for (   pViewFrame = SfxViewFrame::GetFirst( pDoc, FALSE );
+    for (   pViewFrame = SfxViewFrame::GetFirst( pDoc, sal_False );
             pViewFrame;
-            pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, FALSE )
+            pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, sal_False )
         )
     {
         if ( pViewFrame->GetViewShell()->GetController() == i_rController )
@@ -2167,7 +2162,7 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::SaveCurrentViewData_Impl( const USHORT i_nNewViewId )
+void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
 {
     SfxViewShell* pCurrentShell = GetViewShell();
     ENSURE_OR_RETURN_VOID( pCurrentShell != NULL, "SfxViewFrame::SaveCurrentViewData_Impl: no current view shell -> no current view data!" );
@@ -2281,7 +2276,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
         if ( pOldSh )
         {
             // ask wether it can be closed
-            if ( !pOldSh->PrepareClose( TRUE ) )
+            if ( !pOldSh->PrepareClose( sal_True ) )
                 return sal_False;
 
             // remove sub shells from Dispatcher before switching to new ViewShell
@@ -2293,7 +2288,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
 
         // ID of the new view
         SfxObjectFactory& rDocFact = GetObjectShell()->GetFactory();
-        const USHORT nViewId = ( bIsIndex || !nViewIdOrNo ) ? rDocFact.GetViewFactory( nViewIdOrNo ).GetOrdinal() : nViewIdOrNo;
+        const sal_uInt16 nViewId = ( bIsIndex || !nViewIdOrNo ) ? rDocFact.GetViewFactory( nViewIdOrNo ).GetOrdinal() : nViewIdOrNo;
 
         // save the view data of the old view, so it can be restored later on (when needed)
         SaveCurrentViewData_Impl( nViewId );
@@ -2329,7 +2324,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
 }
 
 //-------------------------------------------------------------------------
-void SfxViewFrame::SetCurViewId_Impl( const USHORT i_nID )
+void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID )
 {
     pImp->nCurViewId = i_nID;
 }
@@ -2377,7 +2372,7 @@ void SfxViewFrame::ExecView_Impl
                 )
             {
                 const sal_uInt16 nViewId = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
-                BOOL bSuccess = SwitchToViewShell_Impl( nViewId );
+                sal_Bool bSuccess = SwitchToViewShell_Impl( nViewId );
                 rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) );
             }
             break;
@@ -2390,7 +2385,7 @@ void SfxViewFrame::ExecView_Impl
         case SID_VIEWSHELL4:
         {
             const sal_uInt16 nViewNo = rReq.GetSlot() - SID_VIEWSHELL0;
-            BOOL bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True );
+            sal_Bool bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True );
             rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) );
             break;
         }
@@ -2413,7 +2408,7 @@ void SfxViewFrame::ExecView_Impl
 
             // the view ID (optional arg. TODO: this is currently not supported in the slot definition ...)
             SFX_REQUEST_ARG( rReq, pViewIdItem, SfxUInt16Item, SID_VIEW_ID, sal_False );
-            const USHORT nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId();
+            const sal_uInt16 nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId();
 
             Reference < XFrame > xFrame;
             // the frame (optional arg. TODO: this is currently not supported in the slot definition ...)
@@ -2659,12 +2654,12 @@ void SfxViewFrame::SetModalMode( sal_Bool bModal )
     }
 }
 
-BOOL SfxViewFrame::IsInModalMode() const
+sal_Bool SfxViewFrame::IsInModalMode() const
 {
     return pImp->bModal || GetFrame().GetWindow().IsInModalMode();
 }
 
-void SfxViewFrame::Resize( BOOL bForce )
+void SfxViewFrame::Resize( sal_Bool bForce )
 {
     Size aSize = GetWindow().GetOutputSizePixel();
     if ( bForce || aSize != pImp->aSize )
@@ -2688,7 +2683,7 @@ void SfxViewFrame::Resize( BOOL bForce )
 
 #define LINE_SEP 0x0A
 
-void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines )
+void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines )
 {
     sal_Int32 nStartPos = 0;
     sal_Int32 nLine = 0;
@@ -2746,7 +2741,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 
     SfxApplication* pSfxApp = SFX_APP();
     SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pSfxApp->GetPool() );
-    aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,TRUE) );
+    aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,sal_True) );
     const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot( aReq );
     String aScriptURL;
     if ( pRet )
@@ -2783,8 +2778,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
             }
         }
 
-        pSfxApp->EnterBasicCall();
-
         BasicManager* pBasMgr = 0;
         if ( aLocation.EqualsIgnoreCaseAscii( "application" ) )
         {
@@ -2807,11 +2800,11 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                 {
                     SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Find( aMacroName, SbxCLASS_METHOD );
                     aOUSource = pModule->GetSource32();
-                    USHORT nStart, nEnd;
+                    sal_uInt16 nStart, nEnd;
                     pMethod->GetLineRange( nStart, nEnd );
-                    ULONG nlStart = nStart;
-                    ULONG nlEnd = nEnd;
-                    CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, TRUE );
+                    sal_uIntPtr nlStart = nStart;
+                    sal_uIntPtr nlEnd = nEnd;
+                    CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, sal_True );
                 }
             }
         }
@@ -2859,7 +2852,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
         ::rtl::OUString sCode;
         ::rtl::OUStringBuffer sRoutine(10000);
         ::rtl::OUString sMacroName( aMacroName );
-        BOOL bReplace = FALSE;
+        sal_Bool bReplace = sal_False;
 
         // get module
         ::rtl::OUString sModule( aModuleName );
@@ -2876,7 +2869,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                 sRoutine.append( sCode );
             }
 
-            bReplace = TRUE;
+            bReplace = sal_True;
         }
 
         // append new method
@@ -2917,8 +2910,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                 }
             }
         }
-
-        pSfxApp->LeaveBasicCall();
     }
     else
     {
@@ -2949,7 +2940,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             if (xSupplier.is())
                 xRecorder = xSupplier->getDispatchRecorder();
 
-            BOOL bIsRecording = xRecorder.is();
+            sal_Bool bIsRecording = xRecorder.is();
             SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, sal_False);
             if ( pItem && pItem->GetValue() == bIsRecording )
                 return;
@@ -2969,7 +2960,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                 xRecorder = NULL;
                 GetBindings().SetRecorder_Impl( xRecorder );
 
-                SetChildWindow( SID_RECORDING_FLOATWINDOW, FALSE );
+                SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_False );
                 if ( rReq.GetSlot() != SID_RECORDMACRO )
                     GetBindings().Invalidate( SID_RECORDMACRO );
             }
@@ -2993,7 +2984,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                 aProp <<= xSupplier;
                 xSet->setPropertyValue(sProperty,aProp);
                 GetBindings().SetRecorder_Impl( xRecorder );
-                SetChildWindow( SID_RECORDING_FLOATWINDOW, TRUE );
+                SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_True );
             }
 
             rReq.Done();
@@ -3024,8 +3015,8 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             {
                 rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
                 // Parameter auswerten
-                SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), FALSE);
-                BOOL bShow( TRUE );
+                SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False);
+                sal_Bool bShow( sal_True );
                 if ( !pShowItem )
                     bShow = xLayoutManager->isElementVisible( aStatusbarResString );
                 else
@@ -3049,7 +3040,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_WIN_FULLSCREEN:
         {
-            SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), FALSE);
+            SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), sal_False);
             SfxViewFrame *pTop = GetTopViewFrame();
             if ( pTop )
             {
@@ -3074,7 +3065,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                         }
                     }
 
-                    BOOL bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode();
+                    sal_Bool bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode();
                     if ( bNewFullScreenMode != pWork->IsFullScreenMode() )
                     {
                         Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet( xLayoutManager, UNO_QUERY );
@@ -3104,24 +3095,21 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             else
                 rReq.Ignore();
 
-            GetDispatcher()->Update_Impl( TRUE );
+            GetDispatcher()->Update_Impl( sal_True );
             break;
         }
     }
-
-    if ( bDone )
-        rReq.Done();
 }
 
 void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
 {
     DBG_MEMTEST();
 
-    const USHORT *pRanges = rSet.GetRanges();
+    const sal_uInt16 *pRanges = rSet.GetRanges();
     DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
     while ( *pRanges )
     {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
+        for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
         {
             switch(nWhich)
             {
@@ -3193,11 +3181,11 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
 
                     if ( !( aProp >>= xLayoutManager ))
-                        rSet.Put( SfxBoolItem( nWhich, FALSE ));
+                        rSet.Put( SfxBoolItem( nWhich, sal_False ));
                     else
                     {
                         rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
-                        BOOL bShow = xLayoutManager->isElementVisible( aStatusbarResString );
+                        sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString );
                         rSet.Put( SfxBoolItem( nWhich, bShow ));
                     }
                     break;
@@ -3250,17 +3238,17 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
 
 {
     // Parameter auswerten
-    USHORT nSID = rReq.GetSlot();
+    sal_uInt16 nSID = rReq.GetSlot();
 
-    SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, FALSE);
+    SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, sal_False);
     if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER )
     {
         if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
             return;
         Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface();
         Reference < XFrame > xBeamer( xFrame->findFrame( DEFINE_CONST_UNICODE("_beamer"), FrameSearchFlag::CHILDREN ) );
-        BOOL bShow = FALSE;
-        BOOL bHasChild = xBeamer.is();
+        sal_Bool bShow = sal_False;
+        sal_Bool bHasChild = xBeamer.is();
         bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
         if ( pShowItem )
         {
@@ -3272,7 +3260,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
 
         if ( !bShow )
         {
-            SetChildWindow( SID_BROWSER, FALSE );
+            SetChildWindow( SID_BROWSER, sal_False );
         }
         else
         {
@@ -3299,8 +3287,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         return;
     }
 
-    BOOL bShow = FALSE;
-    BOOL bHasChild = HasChildWindow(nSID);
+    sal_Bool bShow = sal_False;
+    sal_Bool bHasChild = HasChildWindow(nSID);
     bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
 
     // ausf"uhren
@@ -3308,7 +3296,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         ToggleChildWindow( nSID );
 
     GetBindings().Invalidate( nSID );
-    GetDispatcher()->Update_Impl( TRUE );
+    GetDispatcher()->Update_Impl( sal_True );
 
     // ggf. recorden
     if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )
@@ -3336,7 +3324,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
 
 {
     SfxWhichIter aIter( rState );
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
+    for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
         if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER )
         {
@@ -3389,14 +3377,14 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
 }
 
 //--------------------------------------------------------------------
-SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( USHORT /*nId*/ )
+SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ )
 {
     SfxWorkWindow* pWork = 0;
     pWork = GetFrame().GetWorkWindow_Impl();
     return pWork;
 }
 
-void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
+void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
@@ -3405,44 +3393,44 @@ void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::ToggleChildWindow(USHORT nId)
+void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
-        pWork->ToggleChildWindow_Impl( nId, TRUE );
+        pWork->ToggleChildWindow_Impl( nId, sal_True );
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewFrame::HasChildWindow( USHORT nId )
+sal_Bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
-    return pWork ? pWork->HasChildWindow_Impl(nId) : FALSE;
+    return pWork ? pWork->HasChildWindow_Impl(nId) : sal_False;
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewFrame::KnowsChildWindow( USHORT nId )
+sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
-    return pWork ? pWork->KnowsChildWindow_Impl(nId) : FALSE;
+    return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False;
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewFrame::ShowChildWindow( USHORT nId, BOOL bVisible )
+void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible )
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     if ( pWork )
     {
         GetDispatcher()->Update_Impl(sal_True);
-        pWork->ShowChildWindow_Impl(nId, bVisible, TRUE );
+        pWork->ShowChildWindow_Impl(nId, bVisible, sal_True );
     }
 }
 
 //--------------------------------------------------------------------
 
-SfxChildWindow* SfxViewFrame::GetChildWindow(USHORT nId)
+SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId)
 {
     SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
     return pWork ? pWork->GetChildWindow_Impl(nId) : NULL;
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index bac8490e5d..b456cfcb7e 100644..100755
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -31,7 +31,7 @@
 
 #include "impviewframe.hxx"
 #include "statcach.hxx"
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
@@ -279,10 +279,10 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
     {
         case SID_SHOWPOPUPS :
         {
-            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, FALSE);
-            BOOL bShow = pShowItem ? pShowItem->GetValue() : TRUE;
-            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, FALSE);
-            USHORT nId = pIdItem ? pIdItem->GetValue() : 0;
+            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, sal_False);
+            sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
+            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, sal_False);
+            sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0;
 
             // ausfuehren
             SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl();
@@ -290,7 +290,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
             {
                 // Zuerst die Floats auch anzeigbar machen
                 pWorkWin->MakeChildsVisible_Impl( bShow );
-                GetDispatcher()->Update_Impl( TRUE );
+                GetDispatcher()->Update_Impl( sal_True );
 
                 // Dann anzeigen
                 GetBindings().HidePopups( !bShow );
@@ -305,7 +305,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
                     pBind = pBind->GetSubBindings_Impl();
                 }
 
-                pWorkWin->HidePopups_Impl( !bShow, TRUE, nId );
+                pWorkWin->HidePopups_Impl( !bShow, sal_True, nId );
                 pWorkWin->MakeChildsVisible_Impl( bShow );
             }
 
@@ -316,14 +316,14 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
         case SID_ACTIVATE:
         {
-            MakeActive_Impl( TRUE );
+            MakeActive_Impl( sal_True );
             rReq.SetReturnValue( SfxObjectItem( 0, this ) );
             break;
         }
 
         case SID_NEWDOCDIRECT :
         {
-            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, FALSE);
+            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
             String aFactName;
             if ( pFactoryItem )
                 aFactName = pFactoryItem->GetValue();
@@ -367,11 +367,11 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
                 // Doc braucht nur gefragt zu werden, wenn keine weitere View
                 sal_Bool bClosed = sal_False;
-                sal_Bool bUI = TRUE;
+                sal_Bool bUI = sal_True;
                 if ( ( bOther || pDocSh->PrepareClose( bUI ) ) )
                 {
                     if ( !bOther )
-                        pDocSh->SetModified( FALSE );
+                        pDocSh->SetModified( sal_False );
                     rReq.Done(); // unbedingt vor Close() rufen!
                     bClosed = sal_False;
                     try
@@ -441,7 +441,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
                 {
                     uno::Any aAny;
                     aAny <<= GetViewShell()->GetVerbs();
-                    rSet.Put( SfxUnoAnyItem( USHORT( SID_OBJECT ), aAny ) );
+                    rSet.Put( SfxUnoAnyItem( sal_uInt16( SID_OBJECT ), aAny ) );
                 }
                 else
                     rSet.DisableItem( SID_OBJECT );
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index d0fe5db6b8..af9d7e9988 100644..100755
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef _VIEWIMP_HXX
-#define _VIEWIMP_HXX
+#ifndef SFX_VIEWIMP_HXX
+#define SFX_VIEWIMP_HXX
 
 // include ---------------------------------------------------------------
 
@@ -57,28 +57,29 @@ struct SfxViewShell_Impl
 {
     ::osl::Mutex                aMutex;
     ::cppu::OInterfaceContainerHelper aInterceptorContainer;
-    BOOL						bControllerSet;
+    bool                        m_bControllerSet;
     SfxShellArr_Impl			aArr;
     SvBorder                    aBorder;
     Size                        aOptimalSize;
     Size						aMargin;
-    USHORT						nPrinterLocks;
-    BOOL						bCanPrint;
-    BOOL                        bHasPrintOptions;
-    BOOL						bPlugInsActive;
-    BOOL						bIsShowView;
-    BOOL                        bOwnsMenu;
-    BOOL                        bGotOwnerShip;
-    BOOL                        bGotFrameOwnerShip;
-    SfxScrollingMode			eScroll;
-    USHORT						nFamily;
-    SfxBaseController*          pController;
-    ::svt::AcceleratorExecute*  pAccExec;
+    sal_uInt16                      m_nPrinterLocks;
+    bool                        m_bCanPrint;
+    bool                        m_bHasPrintOptions;
+    bool                        m_bPlugInsActive;
+    bool                        m_bIsShowView;
+    // FIXME UNUSED ???
+    //bool                        m_bOwnsMenu;
+    bool                        m_bGotOwnership;
+    bool                        m_bGotFrameOwnership;
+    SfxScrollingMode            m_eScroll;
+    sal_uInt16                      m_nFamily;
+    ::rtl::Reference<SfxBaseController> m_pController;
+    ::std::auto_ptr< ::svt::AcceleratorExecute >    m_pAccExec;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts;
     ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
     ::boost::shared_ptr< vcl::PrinterController > m_pPrinterController;
 
-    SfxViewShell_Impl();
+    SfxViewShell_Impl(sal_uInt16 const nFlags);
 };
 
 #endif
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index e7f855e264..890e13ffbb 100644..100755
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -35,7 +35,6 @@
 
 #include <svl/itempool.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/printdlg.hxx>
 #include <svtools/prnsetup.hxx>
 #include <svl/flagitem.hxx>
 #include <svl/stritem.hxx>
@@ -51,7 +50,7 @@
 #include "viewimp.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/prnmon.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/objsh.hxx>
 #include "sfxtypes.hxx"
@@ -353,30 +352,6 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt
     }
 }
 
-// -----------------------------------------------------------------------
-
-void DisableRanges( PrintDialog& rDlg, SfxPrinter* pPrinter )
-
-/*      [Beschreibung]
-
-    Mit dieser Funktion werden die nicht verf"ugbaren Ranges
-    vom Printer zum PrintDialog geforwarded.
-*/
-
-{
-    if ( !pPrinter )
-        return;
-
-    if ( !pPrinter->IsRangeEnabled( PRINTDIALOG_ALL ) )
-        rDlg.DisableRange( PRINTDIALOG_ALL );
-    if ( !pPrinter->IsRangeEnabled( PRINTDIALOG_SELECTION ) )
-        rDlg.DisableRange( PRINTDIALOG_SELECTION );
-    if ( !pPrinter->IsRangeEnabled( PRINTDIALOG_FROMTO ) )
-        rDlg.DisableRange( PRINTDIALOG_FROMTO );
-    if ( !pPrinter->IsRangeEnabled( PRINTDIALOG_RANGE ) )
-        rDlg.DisableRange( PRINTDIALOG_RANGE );
-}
-
 //====================================================================
 
 class SfxDialogExecutor_Impl
@@ -393,7 +368,6 @@ class SfxDialogExecutor_Impl
 {
 private:
     SfxViewShell*           _pViewSh;
-    PrintDialog*            _pPrintParent;
     PrinterSetupDialog*     _pSetupParent;
     SfxItemSet*             _pOptions;
     sal_Bool                _bModified;
@@ -402,7 +376,6 @@ private:
     DECL_LINK( Execute, void * );
 
 public:
-            SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrintDialog* pParent );
             SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent );
             ~SfxDialogExecutor_Impl() { delete _pOptions; }
 
@@ -413,22 +386,9 @@ public:
 
 //--------------------------------------------------------------------
 
-SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrintDialog* pParent ) :
-
-    _pViewSh		( pViewSh ),
-    _pPrintParent	( pParent ),
-    _pSetupParent	( NULL ),
-    _pOptions		( NULL ),
-    _bModified		( sal_False ),
-    _bHelpDisabled	( sal_False )
-
-{
-}
-
 SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ) :
 
     _pViewSh		( pViewSh ),
-    _pPrintParent	( NULL ),
     _pSetupParent	( pParent ),
     _pOptions		( NULL ),
     _bModified		( sal_False ),
@@ -444,27 +404,13 @@ IMPL_LINK( SfxDialogExecutor_Impl, Execute, void *, EMPTYARG )
     // Options lokal merken
     if ( !_pOptions )
     {
-        DBG_ASSERT( _pPrintParent || _pSetupParent, "no dialog parent" );
-        if( _pPrintParent )
-            _pOptions = ( (SfxPrinter*)_pPrintParent->GetPrinter() )->GetOptions().Clone();
-        else if( _pSetupParent )
+        DBG_ASSERT( _pSetupParent, "no dialog parent" );
+        if( _pSetupParent )
             _pOptions = ( (SfxPrinter*)_pSetupParent->GetPrinter() )->GetOptions().Clone();
     }
 
-    if ( _pOptions && _pPrintParent && _pPrintParent->IsSheetRangeAvailable() )
-    {
-        SfxItemState eState = _pOptions->GetItemState( SID_PRINT_SELECTEDSHEET );
-        if ( eState != SFX_ITEM_UNKNOWN )
-        {
-            PrintSheetRange eRange = _pPrintParent->GetCheckedSheetRange();
-            BOOL bValue = ( PRINTSHEETS_ALL != eRange );
-            _pOptions->Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, bValue ) );
-        }
-    }
-
     // Dialog ausf"uhren
-    SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pPrintParent ? static_cast<Window*>(_pPrintParent)
-                                                                           : static_cast<Window*>(_pSetupParent),
+    SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( static_cast<Window*>(_pSetupParent),
                                                              _pViewSh, _pOptions );
     if ( _bHelpDisabled )
         pDlg->DisableHelp();
@@ -473,15 +419,6 @@ IMPL_LINK( SfxDialogExecutor_Impl, Execute, void *, EMPTYARG )
         delete _pOptions;
         _pOptions = pDlg->GetOptions().Clone();
 
-        if ( _pOptions && _pPrintParent && _pPrintParent->IsSheetRangeAvailable() )
-        {
-            const SfxPoolItem* pItem;
-            if ( SFX_ITEM_SET == _pOptions->GetItemState( SID_PRINT_SELECTEDSHEET, FALSE , &pItem ) )
-            {
-                _pPrintParent->CheckSheetRange( ( (const SfxBoolItem*)pItem )->GetValue()
-                    ? PRINTSHEETS_SELECTED_SHEETS : PRINTSHEETS_ALL );
-            }
-        }
     }
     delete pDlg;
 
@@ -505,11 +442,11 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     bool bSizeToDoc = false;
     if ( &pDocPrinter->GetOptions() )
     {
-        USHORT nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
+        sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
         const SfxFlagItem *pFlagItem = 0;
-        pDocPrinter->GetOptions().GetItemState( nWhich, FALSE, (const SfxPoolItem**) &pFlagItem );
-        bOriToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_ORIENTATION) : FALSE;
-        bSizeToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_SIZE) : FALSE;
+        pDocPrinter->GetOptions().GetItemState( nWhich, sal_False, (const SfxPoolItem**) &pFlagItem );
+        bOriToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_ORIENTATION) : sal_False;
+        bSizeToDoc = pFlagItem ? (pFlagItem->GetValue() & SFX_PRINTER_CHG_SIZE) : sal_False;
     }
 
     // vorheriges Format und Size feststellen
@@ -521,8 +458,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     Size aNewPgSz = pNewPrinter->GetPaperSizePixel();
 
     // "Anderungen am Seitenformat feststellen
-    BOOL bOriChg = (eOldOri != eNewOri) && bOriToDoc;
-    BOOL bPgSzChg = ( aOldPgSz.Height() !=
+    sal_Bool bOriChg = (eOldOri != eNewOri) && bOriToDoc;
+    sal_Bool bPgSzChg = ( aOldPgSz.Height() !=
             ( bOriChg ? aNewPgSz.Width() : aNewPgSz.Height() ) ||
             aOldPgSz.Width() !=
             ( bOriChg ? aNewPgSz.Height() : aNewPgSz.Width() ) ) &&
@@ -530,7 +467,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
 
     // Message und Flags f"ur Seitenformat-"Anderung zusammenstellen
     String aMsg;
-    USHORT nNewOpt=0;
+    sal_uInt16 nNewOpt=0;
     if( bOriChg && bPgSzChg )
     {
         aMsg = String(SfxResId(STR_PRINT_NEWORISIZE));
@@ -548,7 +485,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     }
 
     // in dieser Variable sammeln, was sich so ge"aendert hat
-    USHORT nChangedFlags = 0;
+    sal_uInt16 nChangedFlags = 0;
 
     // ggf. Nachfrage, ob Seitenformat vom Drucker "ubernommen werden soll
     if ( ( bOriChg  || bPgSzChg ) &&
@@ -639,7 +576,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
                         makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
 
     // FIXME: job setup
-    SfxPrinter* pDocPrt = GetPrinter(FALSE);
+    SfxPrinter* pDocPrt = GetPrinter(sal_False);
     JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
     if( bIsDirect )
         aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
@@ -656,17 +593,16 @@ Printer* SfxViewShell::GetActivePrinter() const
 
 void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 {
-    // USHORT                  nCopies=1;
-    USHORT                  nDialogRet = RET_CANCEL;
-    // BOOL                    bCollate=FALSE;
+    // sal_uInt16                  nCopies=1;
+    sal_uInt16                  nDialogRet = RET_CANCEL;
+    // sal_Bool                    bCollate=sal_False;
     SfxPrinter*             pPrinter = 0;
-    PrintDialog*            pPrintDlg = 0;
     SfxDialogExecutor_Impl* pExecutor = 0;
     bool                    bSilent = false;
-    BOOL bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count();
+    sal_Bool bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count();
     if ( bIsAPI )
     {
-        SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE);
+        SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
         bSilent = pSilentItem && pSilentItem->GetValue();
     }
 
@@ -679,7 +615,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
     const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL;
     sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName );
 
-    const USHORT nId = rReq.GetSlot();
+    const sal_uInt16 nId = rReq.GetSlot();
     switch( nId )
     {
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -691,7 +627,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             // derived class may decide to abort this
             if( !pDoc->QuerySlotExecutable( nId ) )
             {
-                rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
+                rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
                 return;
             }
 
@@ -699,10 +635,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
                 break;
 
-            SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE);
+            SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False);
             sal_Bool bSelection = pSelectItem && pSelectItem->GetValue();
             if( pSelectItem && rReq.GetArgs()->Count() == 1 )
-                bIsAPI = FALSE;
+                bIsAPI = sal_False;
 
             uno::Sequence < beans::PropertyValue > aProps;
             if ( bIsAPI )
@@ -757,10 +693,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
         case SID_PRINTER_NAME : // only for recorded macros
         {
             // get printer and printer settings from the document
-            SfxPrinter *pDocPrinter = GetPrinter(TRUE);
+            SfxPrinter *pDocPrinter = GetPrinter(sal_True);
 
             // look for printer in parameters
-            SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, FALSE );
+            SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, sal_False );
             if ( pPrinterItem )
             {
                 // use PrinterName parameter to create a printer
@@ -789,7 +725,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // no valid printer either in ItemSet or at the document
                 if ( bSilent )
                 {
-                    rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                    rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                     break;
                 }
                 else
@@ -802,7 +738,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // if printer is busy, abort printing
                 if ( !bSilent )
                     InfoBox( NULL, String( SfxResId( STR_ERROR_PRINTER_BUSY ) ) ).Execute();
-                rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                 break;
             }
 
@@ -816,7 +752,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 // execute PrinterSetupDialog
                 PrinterSetupDialog* pPrintSetupDlg = new PrinterSetupDialog( GetWindow() );
 
-                if ( pImp->bHasPrintOptions )
+                if (pImp->m_bHasPrintOptions)
                 {
                     // additional controls for dialog
                     pExecutor = new SfxDialogExecutor_Impl( this, pPrintSetupDlg );
@@ -865,19 +801,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                     // forget new printer, it was taken over (as pPrinter) or deleted
                     pDlgPrinter = NULL;
 
-                    /* Now lets reset the Dialog printer, since its freed */
-                    if (pPrintDlg)
-                        pPrintDlg->SetPrinter (pPrinter);
                 }
                 else
                 {
                     // PrinterDialog is used to transfer information on printing,
                     // so it will only be deleted here if dialog was cancelled
                     DELETEZ( pDlgPrinter );
-                    DELETEZ( pPrintDlg );
                     rReq.Ignore();
                     if ( SID_PRINTDOC == nId )
-                        rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+                        rReq.SetReturnValue(SfxBoolItem(0,sal_False));
                     if ( nId == SID_SETUPPRINTER )
                     {
                         rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, FALSE ) );
@@ -897,52 +829,24 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 
 //--------------------------------------------------------------------
 
-PrintDialog* SfxViewShell::CreatePrintDialog( Window* /*pParent*/ )
-
-/*  [Beschreibung]
-
-    Diese Methode kann "uberladen werden, um einen speziellen PrintDialog
-    zu erzeugen. Dies ist z.B. notwendig wenn spezielle <StarView> Features
-    wie drucken von Seitenbereichen.
-*/
-
-{
-    return NULL;
-}
-
-//--------------------------------------------------------------------
-
-void SfxViewShell::PreparePrint( PrintDialog * )
+sal_Bool SfxViewShell::IsPrinterLocked() const
 {
+    return pImp->m_nPrinterLocks > 0;
 }
 
 //--------------------------------------------------------------------
 
-
-ErrCode SfxViewShell::DoPrint( SfxPrinter* /*pPrinter*/,
-                               PrintDialog* /*pPrintDlg*/,
-                               BOOL /*bSilent*/, BOOL /*bIsAPI*/ )
+void SfxViewShell::LockPrinter( sal_Bool bLock)
 {
-    OSL_FAIL( "DoPrint called, dead code !" );
-    return ERRCODE_IO_NOTSUPPORTED;
-}
-
-//--------------------------------------------------------------------
-
-BOOL SfxViewShell::IsPrinterLocked() const
-{
-    return pImp->nPrinterLocks > 0;
-}
-
-//--------------------------------------------------------------------
-
-void SfxViewShell::LockPrinter( BOOL bLock)
-{
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if ( bLock )
-        bChanged = 1 == ++pImp->nPrinterLocks;
+    {
+        bChanged = 1 == ++pImp->m_nPrinterLocks;
+    }
     else
-        bChanged = 0 == --pImp->nPrinterLocks;
+    {
+        bChanged = 0 == --pImp->m_nPrinterLocks;
+    }
 
     if ( bChanged )
     {
@@ -954,21 +858,14 @@ void SfxViewShell::LockPrinter( BOOL bLock)
 
 //--------------------------------------------------------------------
 
-USHORT SfxViewShell::Print( SfxProgress& /*rProgress*/, BOOL /*bIsAPI*/, PrintDialog* /*pDlg*/ )
-{
-    return 0;
-}
-
-//--------------------------------------------------------------------
-
-SfxPrinter* SfxViewShell::GetPrinter( BOOL /*bCreate*/ )
+SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ )
 {
     return 0;
 }
 
 //--------------------------------------------------------------------
 
-USHORT SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, USHORT /*nDiffFlags*/, bool )
+sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, sal_uInt16 /*nDiffFlags*/, bool )
 {
     return 0;
 }
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index e257f285bc..81d9e7dc10 100644..100755
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <cppuhelper/implbase1.hxx>
 
@@ -71,7 +70,7 @@
 #include "view.hrc"
 #include <sfx2/viewsh.hxx>
 #include "viewimp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/templdlg.hxx>
 #include <sfx2/printer.hxx>
@@ -82,8 +81,8 @@
 #include "view.hrc"
 #include "sfxlocal.hrc"
 #include <sfx2/sfxbasecontroller.hxx>
+#include "sfx2/mailmodelapi.hxx"
 #include <sfx2/viewfrm.hxx>
-#include "mailmodelapi.hxx"
 #include <sfx2/event.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/ipclient.hxx>
@@ -114,7 +113,9 @@ DBG_NAME(SfxViewShell)
 class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1<
     datatransfer::clipboard::XClipboardListener >
 {
-    SfxViewShell* pViewShell;
+public:
+    SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr );
+    virtual ~SfxClipboardChangeListener();
 
     // XEventListener
     virtual void SAL_CALL disposing( const lang::EventObject& rEventObject )
@@ -124,21 +125,46 @@ class SfxClipboardChangeListener : public ::cppu::WeakImplHelper1<
     virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject )
         throw ( uno::RuntimeException );
 
-public:
-    SfxClipboardChangeListener( SfxViewShell* pView );
-    virtual	~SfxClipboardChangeListener();
+    void DisconnectViewShell() { m_pViewShell = NULL; }
+    void ChangedContents();
+
+    enum AsyncExecuteCmd
+    {
+        ASYNCEXECUTE_CMD_DISPOSING,
+        ASYNCEXECUTE_CMD_CHANGEDCONTENTS
+    };
+
+    struct AsyncExecuteInfo
+    {
+        AsyncExecuteInfo( AsyncExecuteCmd eCmd, uno::Reference< datatransfer::clipboard::XClipboardListener > xThis, SfxClipboardChangeListener* pListener ) : 
+            m_eCmd( eCmd ), m_xThis( xThis ), m_pListener( pListener ) {}
 
-    void DisconnectViewShell() { pViewShell = NULL; }
+        AsyncExecuteCmd m_eCmd;
+        uno::Reference< datatransfer::clipboard::XClipboardListener > m_xThis;
+        SfxClipboardChangeListener* m_pListener;
+    };
+    
+private:
+    SfxViewShell* m_pViewShell;
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > m_xClpbrdNtfr; 
+    uno::Reference< lang::XComponent > m_xCtrl;
+
+    DECL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo* );
 };
 
-SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView )
-: pViewShell( 0 )
+SfxClipboardChangeListener::SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr )
+  : m_pViewShell( 0 ), m_xClpbrdNtfr( xClpbrdNtfr )
 {
-    uno::Reference < lang::XComponent > xCtrl( pView->GetController(), uno::UNO_QUERY );
-    if ( xCtrl.is() )
+    m_xCtrl = uno::Reference < lang::XComponent >( pView->GetController(), uno::UNO_QUERY );
+    if ( m_xCtrl.is() )
     {
-        xCtrl->addEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
-        pViewShell = pView;
+        m_xCtrl->addEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
+        m_pViewShell = pView;
+    }
+    if ( m_xClpbrdNtfr.is() )
+    {
+        m_xClpbrdNtfr->addClipboardListener( uno::Reference< datatransfer::clipboard::XClipboardListener >(
+            static_cast< datatransfer::clipboard::XClipboardListener* >( this )));
     }
 }
 
@@ -146,34 +172,68 @@ SfxClipboardChangeListener::~SfxClipboardChangeListener()
 {
 }
 
-void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ )
-throw ( uno::RuntimeException )
+void SfxClipboardChangeListener::ChangedContents()
 {
-    // either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
     const SolarMutexGuard aGuard;
-    if ( pViewShell )
+    if( m_pViewShell )
     {
-        uno::Reference < lang::XComponent > xCtrl( pViewShell->GetController(), uno::UNO_QUERY );
-        if ( xCtrl.is() )
-            xCtrl->removeEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this ) ) );
-        pViewShell->AddRemoveClipboardListener( uno::Reference < datatransfer::clipboard::XClipboardListener > (this), FALSE );
-        pViewShell = 0;
+        SfxBindings& rBind = m_pViewShell->GetViewFrame()->GetBindings();
+        rBind.Invalidate( SID_PASTE );
+        rBind.Invalidate( SID_PASTE_SPECIAL );
+        rBind.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
     }
 }
 
-void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
-    throw ( RuntimeException )
+IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, AsyncExecuteInfo*, pAsyncExecuteInfo )
 {
-    const SolarMutexGuard aGuard;
-    if( pViewShell )
+    if ( pAsyncExecuteInfo )
     {
-        SfxBindings& rBind = pViewShell->GetViewFrame()->GetBindings();
-        rBind.Invalidate( SID_PASTE );
-        rBind.Invalidate( SID_PASTE_SPECIAL );
-        rBind.Invalidate( SID_CLIPBOARD_FORMAT_ITEMS );
+        uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( pAsyncExecuteInfo->m_xThis );
+        if ( pAsyncExecuteInfo->m_pListener )
+        {
+            if ( pAsyncExecuteInfo->m_eCmd == ASYNCEXECUTE_CMD_DISPOSING )
+                pAsyncExecuteInfo->m_pListener->DisconnectViewShell();
+            else if ( pAsyncExecuteInfo->m_eCmd == ASYNCEXECUTE_CMD_CHANGEDCONTENTS )
+                pAsyncExecuteInfo->m_pListener->ChangedContents();
+        }
     }
+    delete pAsyncExecuteInfo;
+    
+    return 0;
 }
 
+void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ )
+throw ( uno::RuntimeException )
+{
+    // Either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
+    uno::Reference< lang::XComponent > xCtrl( m_xCtrl );
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > xNotify( m_xClpbrdNtfr );
+    
+    uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
+    if ( xCtrl.is() )
+        xCtrl->removeEventListener( uno::Reference < lang::XEventListener > ( static_cast < lang::XEventListener* >( this )));
+    if ( xNotify.is() )
+        xNotify->removeClipboardListener( xThis );
+
+    // Make asynchronous call to avoid locking SolarMutex which is the
+    // root for many deadlocks, especially in conjuction with the "Windows"
+    // based single thread apartment clipboard code!
+    AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_DISPOSING, xThis, this );
+    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+}
+
+void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
+        throw ( RuntimeException )
+{
+    // Make asynchronous call to avoid locking SolarMutex which is the
+    // root for many deadlocks, especially in conjuction with the "Windows"
+    // based single thread apartment clipboard code!
+    uno::Reference< datatransfer::clipboard::XClipboardListener > xThis( static_cast< datatransfer::clipboard::XClipboardListener* >( this ));
+    AsyncExecuteInfo* pInfo = new AsyncExecuteInfo( ASYNCEXECUTE_CMD_CHANGEDCONTENTS, xThis, this );
+    Application::PostUserEvent( STATIC_LINK( 0, SfxClipboardChangeListener, AsyncExecuteHdl_Impl ), pInfo );
+}
+
+//=========================================================================
 
 static ::rtl::OUString RetrieveLabelFromCommand(
     const ::rtl::OUString& rCommandURL,
@@ -239,15 +299,27 @@ static ::rtl::OUString RetrieveLabelFromCommand(
 }
 
 //=========================================================================
-SfxViewShell_Impl::SfxViewShell_Impl()
+SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags)
 : aInterceptorContainer( aMutex )
-, pAccExec(0)
+,   m_bControllerSet(false)
+,   m_nPrinterLocks(0)
+,   m_bCanPrint(SFX_VIEW_CAN_PRINT == (nFlags & SFX_VIEW_CAN_PRINT))
+,   m_bHasPrintOptions(
+        SFX_VIEW_HAS_PRINTOPTIONS == (nFlags & SFX_VIEW_HAS_PRINTOPTIONS))
+,   m_bPlugInsActive(true)
+,   m_bIsShowView(SFX_VIEW_NO_SHOW != (nFlags & SFX_VIEW_NO_SHOW))
+,   m_bGotOwnership(false)
+,   m_bGotFrameOwnership(false)
+,   m_eScroll(SCROLLING_DEFAULT)
+,   m_nFamily(0xFFFF)   // undefined, default set by TemplateDialog
+,   m_pController(0)
+,   m_pAccExec(0)
 {}
 
 //=========================================================================
 SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
 {
-    SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
+        SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
 }
 
 TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
@@ -384,25 +456,27 @@ SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient
 
 void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 {
-    const USHORT nId = rReq.GetSlot();
-    switch( nId )
-    {
-        case SID_STYLE_FAMILY :
+        const sal_uInt16 nId = rReq.GetSlot();
+        switch( nId )
         {
-            SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, FALSE);
-            if (pItem)
-                pImp->nFamily = pItem->GetValue();
-            break;
-        }
+                case SID_STYLE_FAMILY :
+                {
+                        SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, sal_False);
+                        if (pItem)
+            {
+                pImp->m_nFamily = pItem->GetValue();
+            }
+                        break;
+                }
 
-        case SID_STYLE_CATALOG:
-        {
-            SfxTemplateCatalog aCatalog(
-                SFX_APP()->GetTopWindow(), &GetViewFrame()->GetBindings());
-            aCatalog.Execute();
+                case SID_STYLE_CATALOG:
+                {
+                        SfxTemplateCatalog aCatalog(
+                                SFX_APP()->GetTopWindow(), &GetViewFrame()->GetBindings());
+                        aCatalog.Execute();
             rReq.Ignore();
-            break;
-        }
+                        break;
+                }
         case SID_ACTIVATE_STYLE_APPLY:
         {
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
@@ -438,10 +512,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                             ToolBox* pTextToolbox = dynamic_cast< ToolBox* >( pWin );
                             if( pTextToolbox )
                             {
-                                USHORT nItemCount = pTextToolbox->GetItemCount();
-                                for( USHORT nItem = 0; nItem < nItemCount; ++nItem )
+                                sal_uInt16 nItemCount = pTextToolbox->GetItemCount();
+                                for( sal_uInt16 nItem = 0; nItem < nItemCount; ++nItem )
                                 {
-                                    USHORT nItemId = pTextToolbox->GetItemId( nItem );
+                                    sal_uInt16 nItemId = pTextToolbox->GetItemId( nItem );
                                     const XubString& rCommand = pTextToolbox->GetItemCommand( nItemId );
                                     if( rCommand.EqualsAscii( ".uno:StyleApply" ) )
                                     {
@@ -462,85 +536,85 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             rReq.Done();
         }
         break;
-        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+                // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-        case SID_MAIL_SENDDOCASMS:
-        case SID_MAIL_SENDDOCASOOO:
-        case SID_MAIL_SENDDOCASPDF:
-        case SID_MAIL_SENDDOC:
+                case SID_MAIL_SENDDOCASMS:
+                case SID_MAIL_SENDDOCASOOO:
+                case SID_MAIL_SENDDOCASPDF:
+                case SID_MAIL_SENDDOC:
         case SID_MAIL_SENDDOCASFORMAT:
-        {
-            SfxObjectShell* pDoc = GetObjectShell();
-            if ( pDoc && pDoc->QueryHiddenInformation(
-                            WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES )
-                break;
+                {
+                        SfxObjectShell* pDoc = GetObjectShell();
+                        if ( pDoc && pDoc->QueryHiddenInformation(
+                                                        WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES )
+                                break;
 
-            if ( SvtInternalOptions().MailUIEnabled() )
+                        if ( SvtInternalOptions().MailUIEnabled() )
             {
-                GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, TRUE );
+                GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, sal_True );
             }
             else
             {
-                SfxMailModel  aModel;
+                                SfxMailModel  aModel;
                 rtl::OUString aDocType;
 
-                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, FALSE );
-                if ( pMailSubject )
-                    aModel.SetSubject( pMailSubject->GetValue() );
+                                SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, sal_False );
+                                if ( pMailSubject )
+                                        aModel.SetSubject( pMailSubject->GetValue() );
 
-                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, FALSE );
-                if ( pMailRecipient )
-                {
-                    String aRecipient( pMailRecipient->GetValue() );
-                    String aMailToStr( String::CreateFromAscii( "mailto:" ));
+                                SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, sal_False );
+                                if ( pMailRecipient )
+                                {
+                                        String aRecipient( pMailRecipient->GetValue() );
+                                        String aMailToStr( String::CreateFromAscii( "mailto:" ));
 
-                    if ( aRecipient.Search( aMailToStr ) == 0 )
-                        aRecipient = aRecipient.Erase( 0, aMailToStr.Len() );
-                    aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO );
-                }
-                SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, FALSE );
+                                        if ( aRecipient.Search( aMailToStr ) == 0 )
+                                                aRecipient = aRecipient.Erase( 0, aMailToStr.Len() );
+                                        aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO );
+                                }
+                SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, sal_False );
                 if ( pMailDocType )
                     aDocType = pMailDocType->GetValue();
 
                 uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() );
-                SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR;
+                                SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR;
 
                 if ( nId == SID_MAIL_SENDDOC )
-                    eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
-                else
-                if ( nId == SID_MAIL_SENDDOCASPDF )
+                                        eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
+                                else
+                                if ( nId == SID_MAIL_SENDDOCASPDF )
                     eResult = aModel.SaveAndSend( xFrame, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf_Portable_Document_Format" )));
                 else
-                if ( nId == SID_MAIL_SENDDOCASMS )
+                                if ( nId == SID_MAIL_SENDDOCASMS )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC);
                     if (aDocType.getLength() > 0)
                         eResult = aModel.SaveAndSend( xFrame, aDocType );
                 }
                 else
-                if ( nId == SID_MAIL_SENDDOCASOOO )
+                                if ( nId == SID_MAIL_SENDDOCASOOO )
                 {
                     aDocType = impl_searchFormatTypeForApp(xFrame, E_OOO_DOC);
                     if (aDocType.getLength() > 0)
                         eResult = aModel.SaveAndSend( xFrame, aDocType );
                 }
 
-                if ( eResult == SfxMailModel::SEND_MAIL_ERROR )
-                {
-                    InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
-                    aBox.Execute();
+                                if ( eResult == SfxMailModel::SEND_MAIL_ERROR )
+                                {
+                                        InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
+                                        aBox.Execute();
                     rReq.Ignore();
-                }
+                                }
                 else
                     rReq.Done();
-            }
+                        }
 
-            break;
-        }
+                        break;
+                }
 
-         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_WEBHTML:
-        {
+                // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+                case SID_WEBHTML:
+                {
             static const char HTML_DOCUMENT_TYPE[] = "writer_web_HTML";
             static const char HTML_GRAPHIC_TYPE[]  = "graphic_HTML";
             const sal_Int32   FILTERFLAG_EXPORT    = 0x00000002;
@@ -553,7 +627,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance( aModuleManager ), css::uno::UNO_QUERY_THROW );
             if ( !xModuleManager.is() )
             {
-                rReq.Done(FALSE);
+                rReq.Done(sal_False);
                 return;
             }
 
@@ -611,7 +685,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 // No type and no location => error
                 if (( aFilterName.getLength() == 0 ) || ( aTypeName.getLength() == 0 ))
                 {
-                    rReq.Done(FALSE);
+                    rReq.Done(sal_False);
                     return;
                 }
 
@@ -652,7 +726,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 }
                 catch ( com::sun::star::io::IOException& )
                 {
-                    rReq.Done(FALSE);
+                    rReq.Done(sal_False);
                     return;
                 }
 
@@ -660,126 +734,128 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
                     css::uno::UNO_QUERY );
 
-                BOOL bRet( TRUE );
+                        sal_Bool bRet( sal_True );
                 if ( xSystemShellExecute.is() )
                 {
                     try
                     {
-                        xSystemShellExecute->execute(
-                            aFileURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
+                                xSystemShellExecute->execute(
+                                                    aFileURL, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
                     }
                     catch ( uno::Exception& )
                     {
                         SolarMutexGuard aGuard;
                         Window *pParent = SFX_APP()->GetTopWindow();
-                        ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
-                        bRet = FALSE;
+                                            ErrorBox( pParent, SfxResId( MSG_ERROR_NO_WEBBROWSER_FOUND )).Execute();
+                        bRet = sal_False;
                     }
                 }
 
                 rReq.Done(bRet);
-                break;
+                            break;
             }
             else
             {
-                rReq.Done(FALSE);
+                rReq.Done(sal_False);
                 return;
             }
         }
 
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_PLUGINS_ACTIVE:
-        {
-            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, FALSE);
-            BOOL bActive = pShowItem ? pShowItem->GetValue() : !pImp->bPlugInsActive;
-            // ggf. recorden
-            if ( !rReq.IsAPI() )
-                rReq.AppendItem( SfxBoolItem( nId, bActive ) );
-
-            // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
-            // benutzen, der demn"achst weg ist
-            rReq.Done(TRUE);
-
-            // ausfuehren
-            if ( !pShowItem || bActive != pImp->bPlugInsActive )
-            {
-                SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
-                if ( pTopFrame != &GetFrame()->GetFrame() )
-                {
-                    // FramesetDocument
-                    SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                    if ( pShell->GetInterface()->GetSlot( nId ) )
-                        pShell->ExecuteSlot( rReq );
-                    break;
-                }
-
-                SfxFrameIterator aIter( *pTopFrame );
-                while ( pTopFrame )
+                case SID_PLUGINS_ACTIVE:
                 {
-                    if ( pTopFrame->GetCurrentViewFrame() )
-                    {
-                        SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                        if ( pView )
+                        SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, sal_False);
+            bool const bActive = (pShowItem)
+                ? pShowItem->GetValue()
+                : !pImp->m_bPlugInsActive;
+                        // ggf. recorden
+                        if ( !rReq.IsAPI() )
+                                rReq.AppendItem( SfxBoolItem( nId, bActive ) );
+
+                        // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
+                        // benutzen, der demn"achst weg ist
+                        rReq.Done(sal_True);
+
+                        // ausfuehren
+            if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
                         {
-                            pView->pImp->bPlugInsActive = bActive;
+                                SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
+                                if ( pTopFrame != &GetFrame()->GetFrame() )
+                                {
+                                        // FramesetDocument
+                                        SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
+                                        if ( pShell->GetInterface()->GetSlot( nId ) )
+                                                pShell->ExecuteSlot( rReq );
+                                        break;
+                                }
+
+                                SfxFrameIterator aIter( *pTopFrame );
+                                while ( pTopFrame )
+                                {
+                                        if ( pTopFrame->GetCurrentViewFrame() )
+                                        {
+                                                SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
+                                                if ( pView )
+                                                {
+                            pView->pImp->m_bPlugInsActive = bActive;
                             Rectangle aVisArea = GetObjectShell()->GetVisArea();
                             VisAreaChanged(aVisArea);
 
-                            // the plugins might need change in their state
-                            SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(FALSE);
-                            if ( pClients )
-                            {
-                                for ( size_t n = 0; n < pClients->size(); n++)
-                                {
-                                    SfxInPlaceClient* pIPClient = pClients->at( n );
-                                    if ( pIPClient )
-                                        pView->CheckIPClient_Impl( pIPClient, aVisArea );
+                                                        // the plugins might need change in their state
+                                                        SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(sal_False);
+                                                        if ( pClients )
+                                                        {
+                                                                for ( size_t n = 0; n < pClients->size(); n++)
+                                                                {
+                                                                        SfxInPlaceClient* pIPClient = pClients->at( n );
+                                                                        if ( pIPClient )
+                                                                                pView->CheckIPClient_Impl( pIPClient, aVisArea );
+                                                                }
+                                                        }
+                                                }
+                                        }
+
+                                        if ( !pTopFrame->GetParentFrame() )
+                                                pTopFrame = aIter.FirstFrame();
+                                        else
+                                                pTopFrame = aIter.NextFrame( *pTopFrame );
                                 }
-                            }
                         }
-                    }
 
-                    if ( !pTopFrame->GetParentFrame() )
-                        pTopFrame = aIter.FirstFrame();
-                    else
-                        pTopFrame = aIter.NextFrame( *pTopFrame );
+                        break;
                 }
-            }
-
-            break;
         }
-    }
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 
-    SfxWhichIter aIter( rSet );
-    for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
-    {
-        switch ( nSID )
+        SfxWhichIter aIter( rSet );
+        for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
         {
-            case SID_STYLE_CATALOG:
-            {
+                switch ( nSID )
+                {
+                        case SID_STYLE_CATALOG:
+                        {
                 if ( !GetViewFrame()->KnowsChildWindow( SID_STYLE_DESIGNER ) )
-                    rSet.DisableItem( nSID );
-                break;
-            }
+                                        rSet.DisableItem( nSID );
+                                break;
+                        }
 
-            // Printer-Funktionen
-            case SID_PRINTDOC:
-            case SID_PRINTDOCDIRECT:
-            case SID_SETUPPRINTER:
-            case SID_PRINTER_NAME:
-            {
-                BOOL bEnabled = pImp->bCanPrint && !pImp->nPrinterLocks;
-                bEnabled = bEnabled  && !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
+                        // Printer-Funktionen
+                        case SID_PRINTDOC:
+                        case SID_PRINTDOCDIRECT:
+                        case SID_SETUPPRINTER:
+                        case SID_PRINTER_NAME:
+                        {
+                bool bEnabled = pImp->m_bCanPrint && !pImp->m_nPrinterLocks;
+                                bEnabled = bEnabled  && !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
                 if ( bEnabled )
                 {
-                    SfxPrinter *pPrinter = GetPrinter(FALSE);
+                    SfxPrinter *pPrinter = GetPrinter(sal_False);
 
                     if ( SID_PRINTDOCDIRECT == nSID )
                     {
@@ -805,67 +881,68 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                     }
                     bEnabled = !pPrinter || !pPrinter->IsPrinting();
                 }
-                if ( !bEnabled )
-                {
-                    // will now be handled by requeing the request
-                /*	rSet.DisableItem( SID_PRINTDOC );
-                    rSet.DisableItem( SID_PRINTDOCDIRECT );
-                    rSet.DisableItem( SID_SETUPPRINTER ); */
-                }
-                break;
-            }
+                                if ( !bEnabled )
+                                {
+                                        // will now be handled by requeing the request
+                                /*      rSet.DisableItem( SID_PRINTDOC );
+                                        rSet.DisableItem( SID_PRINTDOCDIRECT );
+                                        rSet.DisableItem( SID_SETUPPRINTER ); */
+                                }
+                                break;
+                        }
 
-            // Mail-Funktionen
-            case SID_MAIL_SENDDOCASPDF:
-            case SID_MAIL_SENDDOC:
+                        // Mail-Funktionen
+                        case SID_MAIL_SENDDOCASPDF:
+                        case SID_MAIL_SENDDOC:
             case SID_MAIL_SENDDOCASFORMAT:
-            {
-                BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
-                if ( !bEnable )
-                    rSet.DisableItem( nSID );
-                break;
-            }
+                        {
+                sal_Bool bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
+                                if ( !bEnable )
+                                        rSet.DisableItem( nSID );
+                                break;
+                        }
 
-            // PlugIns running
-            case SID_PLUGINS_ACTIVE:
-            {
-                rSet.Put( SfxBoolItem( SID_PLUGINS_ACTIVE, !pImp->bPlugInsActive) );
-                break;
-            }
+                        // PlugIns running
+                        case SID_PLUGINS_ACTIVE:
+                        {
+                rSet.Put( SfxBoolItem( SID_PLUGINS_ACTIVE,
+                                        !pImp->m_bPlugInsActive) );
+                                break;
+                        }
 /*
-            // SelectionText
-            case SID_SELECTION_TEXT:
-            {
-                rSet.Put( SfxStringItem( SID_SELECTION_TEXT, GetSelectionText() ) );
-                break;
-            }
+                        // SelectionText
+                        case SID_SELECTION_TEXT:
+                        {
+                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT, GetSelectionText() ) );
+                                break;
+                        }
 
-            // SelectionTextExt
-            case SID_SELECTION_TEXT_EXT:
-            {
-                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(TRUE) ) );
-                break;
-            }
+                        // SelectionTextExt
+                        case SID_SELECTION_TEXT_EXT:
+                        {
+                                rSet.Put( SfxStringItem( SID_SELECTION_TEXT_EXT, GetSelectionText(sal_True) ) );
+                                break;
+                        }
 */
-            case SID_STYLE_FAMILY :
-            {
-                rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->nFamily ) );
-                break;
-            }
+                        case SID_STYLE_FAMILY :
+                        {
+                rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->m_nFamily ) );
+                                break;
+                        }
+                }
         }
-    }
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
-                                  const Fraction &rZoomY )
+                                                                  const Fraction &rZoomY )
 {
-    DBG_ASSERT( GetWindow(), "no window" );
-    MapMode aMap( GetWindow()->GetMapMode() );
-    aMap.SetScaleX( rZoomX );
-    aMap.SetScaleY( rZoomY );
-    GetWindow()->SetMapMode( aMap );
+        DBG_ASSERT( GetWindow(), "no window" );
+        MapMode aMap( GetWindow()->GetMapMode() );
+        aMap.SetScaleX( rZoomX );
+        aMap.SetScaleY( rZoomY );
+        GetWindow()->SetMapMode( aMap );
 }
 
 //--------------------------------------------------------------------
@@ -873,37 +950,37 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/)
 
 /*  [Beschreibung]
 
-    Virtuelle Methode, um am selektierten Objekt ein Verb auszuf"uhren.
+        Virtuelle Methode, um am selektierten Objekt ein Verb auszuf"uhren.
     Da dieses Objekt nur den abgeleiteten Klassen bekannt ist, muss DoVerb
     dort "uberschrieben werden.
 
 */
 
 {
-    return ERRCODE_SO_NOVERBS;
+        return ERRCODE_SO_NOVERBS;
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ )
 {
-    if ( !bActive )
-        GetFrame()->GetFrame().Appear();
+        if ( !bActive )
+                GetFrame()->GetFrame().Appear();
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ )
 {
-    // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved,
-    // but may be the bug will not affect the real office vcl windows, then it is not required
+        // TODO/LATER: painting of the bitmap can be stopped, it is required if CLIPCHILDREN problem #i25788# is not solved,
+        // but may be the bug will not affect the real office vcl windows, then it is not required
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
-    // TODO/LATER: paint the replacement image in normal way if the painting was stopped
+        // TODO/LATER: paint the replacement image in normal way if the painting was stopped
 }
 
 //--------------------------------------------------------------------
@@ -915,8 +992,8 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
     if ( xParentFrame.is() )
         xParentFrame->setActiveFrame( xOwnFrame );
 
-    pFrame->GetBindings().HidePopups(TRUE);
-    pFrame->GetDispatcher()->Update_Impl( TRUE );
+    pFrame->GetBindings().HidePopups(sal_True);
+    pFrame->GetDispatcher()->Update_Impl( sal_True );
 }
 
 //--------------------------------------------------------------------
@@ -925,8 +1002,8 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
     if ( !pFrame->GetFrame().IsClosing_Impl() ||
         SfxViewFrame::Current() != pFrame )
-            pFrame->GetDispatcher()->Update_Impl( TRUE );
-    pFrame->GetBindings().HidePopups(FALSE);
+            pFrame->GetDispatcher()->Update_Impl( sal_True );
+    pFrame->GetBindings().HidePopups(sal_False);
 
     // uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() );
     // uno::Reference < frame::XFramesSupplier > xParentFrame( xOwnFrame->getCreator(), uno::UNO_QUERY );
@@ -942,12 +1019,12 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
     Window*             pObjParentWin
 )   const
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
+        if ( !pClients )
+                return 0;
 
-    if( !pObjParentWin )
-        pObjParentWin = GetWindow();
+        if( !pObjParentWin )
+                pObjParentWin = GetWindow();
     for ( size_t n = 0; n < pClients->size(); n++)
     {
         SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->at( n );
@@ -962,7 +1039,7 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
 
 SfxInPlaceClient* SfxViewShell::GetIPClient() const
 {
-    return GetUIActiveClient();
+        return GetUIActiveClient();
 }
 
 //--------------------------------------------------------------------
@@ -970,9 +1047,9 @@ SfxInPlaceClient* SfxViewShell::GetIPClient() const
 SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 {
     // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize)
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
+        if ( !pClients )
+                return 0;
 
     for ( size_t n = 0; n < pClients->size(); n++)
     {
@@ -986,52 +1063,52 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 
 SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
-    if ( !pClients )
-        return 0;
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
+        if ( !pClients )
+                return 0;
 
     for ( size_t n = 0; n < pClients->size(); n++)
-    {
+        {
         SfxInPlaceClient* pIPClient = pClients->at( n );
         if ( pIPClient->IsObjectUIActive() )
             return pIPClient;
-    }
+        }
 
     return NULL;
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::Activate( BOOL bMDI )
+void SfxViewShell::Activate( sal_Bool bMDI )
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
-    if ( bMDI )
-    {
-        SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
-        if ( pSh->GetModel().is() )
-            pSh->GetModel()->setCurrentController( GetViewFrame()->GetFrame().GetController() );
+        DBG_CHKTHIS(SfxViewShell, 0);
+        if ( bMDI )
+        {
+                SfxObjectShell *pSh = GetViewFrame()->GetObjectShell();
+                if ( pSh->GetModel().is() )
+                        pSh->GetModel()->setCurrentController( GetViewFrame()->GetFrame().GetController() );
 
         SetCurrentDocument();
-    }
+        }
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::Deactivate(BOOL /*bMDI*/)
+void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::AdjustPosSizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
 )
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
+        DBG_CHKTHIS(SfxViewShell, 0);
 }
 
 //--------------------------------------------------------------------
@@ -1040,18 +1117,18 @@ void SfxViewShell::Move()
 
 /*  [Beschreibung]
 
-    Diese virtuelle Methode wird gerufen, wenn das Fenster, in dem die
-    SfxViewShell dargestellt wird eine StarView-Move() Nachricht erh"alt.
+        Diese virtuelle Methode wird gerufen, wenn das Fenster, in dem die
+        SfxViewShell dargestellt wird eine StarView-Move() Nachricht erh"alt.
 
-    Die Basisimplementierung braucht nicht gerufen zu werden.
+        Die Basisimplementierung braucht nicht gerufen zu werden.
 
 
-    [Anmerkung]
+        [Anmerkung]
 
-    Diese Methode kann dazu verwendet werden, eine Selektion abzubrechen,
-    um durch das Moven des Fensters erzeugte Maus-Bewegungen anzufangen.
+        Diese Methode kann dazu verwendet werden, eine Selektion abzubrechen,
+        um durch das Moven des Fensters erzeugte Maus-Bewegungen anzufangen.
 
-    Zur Zeit funktioniert die Benachrichtigung nicht In-Place.
+        Zur Zeit funktioniert die Benachrichtigung nicht In-Place.
 */
 
 {
@@ -1061,102 +1138,102 @@ void SfxViewShell::Move()
 
 void SfxViewShell::OuterResizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // gesamte zur Verf"ugung stehende Gr"o\se
 )
 
 /*  [Beschreibung]
 
     Diese Methode muss ueberladen werden, um auf "Anderungen der Groesse
-    der View zu reagieren. Dabei definieren wir die View als das Edit-Window
-    zuz"uglich der um das Edit-Window angeordnenten Tools (z.B. Lineale).
+        der View zu reagieren. Dabei definieren wir die View als das Edit-Window
+        zuz"uglich der um das Edit-Window angeordnenten Tools (z.B. Lineale).
 
-    Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
+        Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
 
-    Die Vis-Area der SfxObjectShell, dessen Skalierung und Position
-    d"urfen hier ver"andert werden. Der Hauptanwendungsfall ist dabei,
-    das Ver"andern der Gr"o\se der Vis-Area.
+        Die Vis-Area der SfxObjectShell, dessen Skalierung und Position
+        d"urfen hier ver"andert werden. Der Hauptanwendungsfall ist dabei,
+        das Ver"andern der Gr"o\se der Vis-Area.
 
-    "Andert sich durch die neue Berechnung der Border, so mu\s dieser
-    mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
-    Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
-    Tools erlaubt.
+        "Andert sich durch die neue Berechnung der Border, so mu\s dieser
+        mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
+        Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
+        Tools erlaubt.
 
 
-    [Beispiel]
+        [Beispiel]
 
-    void AppViewSh::OuterViewResizePixel( const Point &rOfs, const Size &rSz )
-    {
-        // Tool-Positionen und Gr"o\sen von au\sen berechnen, NICHT setzen!
-        // (wegen folgender Border-Berechnung)
-        Point aHLinPos...; Size aHLinSz...;
-        ...
-
-        // Border f"ur Tools passend zu rSize berechnen und setzen
-        SvBorder aBorder...
-        SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
-
-        // Tools anordnen
-        pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
-        ...
-    }
+        void AppViewSh::OuterViewResizePixel( const Point &rOfs, const Size &rSz )
+        {
+                // Tool-Positionen und Gr"o\sen von au\sen berechnen, NICHT setzen!
+                // (wegen folgender Border-Berechnung)
+                Point aHLinPos...; Size aHLinSz...;
+                ...
+
+                // Border f"ur Tools passend zu rSize berechnen und setzen
+                SvBorder aBorder...
+                SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
+
+                // Tools anordnen
+                pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
+                ...
+        }
 
 
-    [Querverweise]
+        [Querverweise]
 
-    <SfxViewShell::InnerResizePixel(const Point&,const Size& rSize)>
+        <SfxViewShell::InnerResizePixel(const Point&,const Size& rSize)>
 */
 
 {
-    DBG_CHKTHIS(SfxViewShell, 0);
-    SetBorderPixel( SvBorder() );
+        DBG_CHKTHIS(SfxViewShell, 0);
+        SetBorderPixel( SvBorder() );
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::InnerResizePixel
 (
-    const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
-    const Size&     /*rSize*/       // dem Edit-Win zur Verf"ugung stehende Gr"o\se
+        const Point&    /*rToolOffset*/,// linke obere Ecke der Tools im Frame-Window
+        const Size&     /*rSize*/       // dem Edit-Win zur Verf"ugung stehende Gr"o\se
 )
 
 /*  [Beschreibung]
 
     Diese Methode muss ueberladen werden, um auf "Anderungen der Groesse
-    des Edit-Windows zu reagieren.
+        des Edit-Windows zu reagieren.
 
-    Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
-    Weder die Vis-Area der SfxObjectShell noch dessen Skalierung oder
-    Position d"urfen ver"andert werden.
+        Das Edit-Window darf weder in Gr"o\se noch Position ver"andert werden.
+        Weder die Vis-Area der SfxObjectShell noch dessen Skalierung oder
+        Position d"urfen ver"andert werden.
 
-    "Andert sich durch die neue Berechnung der Border, so mu\s dieser
-    mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
-    Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
-    Tools erlaubt.
+        "Andert sich durch die neue Berechnung der Border, so mu\s dieser
+        mit <SfxViewShell::SetBorderPixel(const SvBorder&)> gesetzt werden.
+        Erst nach Aufruf von 'SetBorderPixel' ist das Positionieren von
+        Tools erlaubt.
 
 
-    [Beispiel]
+        [Beispiel]
 
-    void AppViewSh::InnerViewResizePixel( const Point &rOfs, const Size &rSz )
-    {
-        // Tool-Positionen und Gr"o\sen von innen berechnen, NICHT setzen!
-        // (wegen folgender Border-Berechnung)
-        Point aHLinPos...; Size aHLinSz...;
-        ...
-
-        // Border f"ur Tools passend zu rSz berechnen und setzen
-        SvBorder aBorder...
-        SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
-
-        // Tools anordnen
-        pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
-        ...
-    }
+        void AppViewSh::InnerViewResizePixel( const Point &rOfs, const Size &rSz )
+        {
+                // Tool-Positionen und Gr"o\sen von innen berechnen, NICHT setzen!
+                // (wegen folgender Border-Berechnung)
+                Point aHLinPos...; Size aHLinSz...;
+                ...
+
+                // Border f"ur Tools passend zu rSz berechnen und setzen
+                SvBorder aBorder...
+                SetBorderPixel( aBorder ); // ab jetzt sind Positionierungen erlaubt
+
+                // Tools anordnen
+                pHLin->SetPosSizePixel( aHLinPos, aHLinSz );
+                ...
+        }
 
 
-    [Querverweise]
+        [Querverweise]
 
-    <SfxViewShell::OuterResizePixel(const Point&,const Size& rSize)>
+        <SfxViewShell::OuterResizePixel(const Point&,const Size& rSize)>
 */
 
 {
@@ -1172,8 +1249,10 @@ void SfxViewShell::InvalidateBorder()
     DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" );
 
     GetViewFrame()->InvalidateBorderImpl( this );
-    if ( pImp->pController )
-        pImp->pController->BorderWidthsChanged_Impl();
+    if (pImp->m_pController.is())
+    {
+        pImp->m_pController->BorderWidthsChanged_Impl();
+    }
 }
 
 //--------------------------------------------------------------------
@@ -1188,8 +1267,10 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder )
         GetViewFrame()->SetBorderPixelImpl( this, rBorder );
 
         // notify related controller that border size is changed
-        if ( pImp->pController )
-            pImp->pController->BorderWidthsChanged_Impl();
+        if (pImp->m_pController.is())
+        {
+            pImp->m_pController->BorderWidthsChanged_Impl();
+        }
     }
 }
 
@@ -1212,11 +1293,11 @@ void SfxViewShell::SetWindow
 
 /*  [Beschreibung]
 
-    Mit dieser Methode wird der SfxViewShell das Datenfenster mitgeteilt.
-    Dieses wird f"ur den In-Place-Container und f"ur das korrekte
-    Wiederherstellen des Focus ben"otigt.
+        Mit dieser Methode wird der SfxViewShell das Datenfenster mitgeteilt.
+        Dieses wird f"ur den In-Place-Container und f"ur das korrekte
+        Wiederherstellen des Focus ben"otigt.
 
-    Selbst In-Place-aktiv ist das Umsetzen des ViewPort-Windows verboten.
+        Selbst In-Place-aktiv ist das Umsetzen des ViewPort-Windows verboten.
 */
 
 {
@@ -1230,20 +1311,20 @@ void SfxViewShell::SetWindow
     DiscardClients_Impl();
 
     // View-Port austauschen
-    BOOL bHadFocus = pWindow ? pWindow->HasChildPathFocus( TRUE ) : FALSE;
+    sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( sal_True ) : sal_False;
     pWindow = pViewPort;
 
     if( pWindow )
     {
         // Disable automatic GUI mirroring (right-to-left) for document windows
-        pWindow->EnableRTL( FALSE );
+        pWindow->EnableRTL( sal_False );
     }
 
     if ( bHadFocus && pWindow )
         pWindow->GrabFocus();
-        //TODO/CLEANUP
-        //brauchen wir die Methode doch noch?!
-        //SFX_APP()->GrabFocus( pWindow );
+    //TODO/CLEANUP
+    //brauchen wir die Methode doch noch?!
+    //SFX_APP()->GrabFocus( pWindow );
 }
 
 //--------------------------------------------------------------------
@@ -1258,38 +1339,27 @@ Size SfxViewShell::GetOptimalSizePixel() const
 
 SfxViewShell::SfxViewShell
 (
-    SfxViewFrame*   pViewFrame,     /*  <SfxViewFrame>, in dem diese View
-                                        dargestellt wird */
-    USHORT          nFlags          /*  siehe <SfxViewShell-Flags> */
+    SfxViewFrame*   pViewFrame,     /*  <SfxViewFrame>, in dem diese View dargestellt wird */
+    sal_uInt16          nFlags          /*  siehe <SfxViewShell-Flags> */
 )
 
 :   SfxShell(this)
-    ,pImp( new SfxViewShell_Impl )
-    ,pIPClientList( 0 )
-    ,pFrame(pViewFrame)
-    ,pSubShell(0)
-    ,pWindow(0)
-    ,bNoNewWindow( 0 != (nFlags & SFX_VIEW_NO_NEWWINDOW) )
+,   pImp( new SfxViewShell_Impl(nFlags) )
+        ,pIPClientList( 0 )
+        ,pFrame(pViewFrame)
+        ,pSubShell(0)
+        ,pWindow(0)
+        ,bNoNewWindow( 0 != (nFlags & SFX_VIEW_NO_NEWWINDOW) )
 {
     DBG_CTOR(SfxViewShell, 0);
 
     //pImp->pPrinterCommandQueue = new SfxAsyncPrintExec_Impl( this );
-    pImp->pController = 0;
-    pImp->bIsShowView =
-        !(SFX_VIEW_NO_SHOW == (nFlags & SFX_VIEW_NO_SHOW));
-
-    pImp->bCanPrint = SFX_VIEW_CAN_PRINT == (nFlags & SFX_VIEW_CAN_PRINT);
-    pImp->bHasPrintOptions =
-        SFX_VIEW_HAS_PRINTOPTIONS == (nFlags & SFX_VIEW_HAS_PRINTOPTIONS);
-    pImp->bPlugInsActive = TRUE;
-    pImp->bGotOwnerShip = FALSE;
-    pImp->bGotFrameOwnerShip = FALSE;
+
     if ( pViewFrame->GetParentViewFrame() )
-        pImp->bPlugInsActive = pViewFrame->GetParentViewFrame()->GetViewShell()->pImp->bPlugInsActive;
-    pImp->eScroll = SCROLLING_DEFAULT;
-    pImp->nPrinterLocks = 0;
-    pImp->bControllerSet = FALSE;
-    pImp->nFamily = 0xFFFF;					// undefined, default set by TemplateDialog
+    {
+        pImp->m_bPlugInsActive = pViewFrame->GetParentViewFrame()
+            ->GetViewShell()->pImp->m_bPlugInsActive;
+    }
     SetMargin( pViewFrame->GetMargin_Impl() );
 
     SetPool( &pViewFrame->GetObjectShell()->GetPool() );
@@ -1318,16 +1388,10 @@ SfxViewShell::~SfxViewShell()
         pImp->xClipboardListener = NULL;
     }
 
-    if ( pImp->pController )
-    {
-        pImp->pController->ReleaseShell_Impl();
-        pImp->pController->release();
-        pImp->pController = NULL;
-    }
-
-    if (pImp->pAccExec)
+    if (pImp->m_pController.is())
     {
-        DELETEZ( pImp->pAccExec );
+        pImp->m_pController->ReleaseShell_Impl();
+        pImp->m_pController.clear();
     }
 
     //DELETEZ( pImp->pPrinterCommandQueue );
@@ -1337,10 +1401,10 @@ SfxViewShell::~SfxViewShell()
 
 //--------------------------------------------------------------------
 
-USHORT SfxViewShell::PrepareClose
+sal_uInt16 SfxViewShell::PrepareClose
 (
-    BOOL bUI,     // TRUE: Dialoge etc. erlaubt, FALSE: silent-mode
-    BOOL /*bForBrowsing*/
+    sal_Bool bUI,     // sal_True: Dialoge etc. erlaubt, sal_False: silent-mode
+    sal_Bool /*bForBrowsing*/
 )
 {
     SfxPrinter *pPrinter = GetPrinter();
@@ -1352,16 +1416,16 @@ USHORT SfxViewShell::PrepareClose
             aInfoBox.Execute();
         }
 
-        return FALSE;
+        return sal_False;
     }
 
     if( GetViewFrame()->IsInModalMode() )
-        return FALSE;
+        return sal_False;
 
     if( bUI && GetViewFrame()->GetDispatcher()->IsLocked() )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1379,9 +1443,9 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
     if ( !i_rController.is() )
         return NULL;
 
-    for (   SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, FALSE );
+    for (   SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, sal_False );
             pViewShell;
-            pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, FALSE )
+            pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, sal_False )
         )
     {
         if ( pViewShell->GetController() == i_rController )
@@ -1394,12 +1458,12 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
 
 SdrView* SfxViewShell::GetDrawView() const
 
-/*	[Beschreibung]
+/*      [Beschreibung]
 
-    Diese virtuelle Methode mu\s von den Subklassen "uberladen werden, wenn
-    der Property-Editor zur Verf"ugung stehen soll.
+        Diese virtuelle Methode mu\s von den Subklassen "uberladen werden, wenn
+        der Property-Editor zur Verf"ugung stehen soll.
 
-    Die Default-Implementierung liefert immer 0.
+        Die Default-Implementierung liefert immer 0.
 */
 
 {
@@ -1410,27 +1474,27 @@ SdrView* SfxViewShell::GetDrawView() const
 
 String SfxViewShell::GetSelectionText
 (
-    BOOL /*bCompleteWords*/		/* 	FALSE (default)
-                                Nur der tats"achlich selektierte Text wird
-                                zur"uckgegeben.
-
-                                TRUE
-                                Der selektierte Text wird soweit erweitert,
-                                da\s nur ganze W"orter zur"uckgegeben werden.
-                                Als Worttrenner gelten White-Spaces und die
+    sal_Bool /*bCompleteWords*/         /*      sal_False (default)
+                                                                Nur der tats"achlich selektierte Text wird
+                                                                zur"uckgegeben.
+
+                                                                TRUE
+                                                                Der selektierte Text wird soweit erweitert,
+                                                                da\s nur ganze W"orter zur"uckgegeben werden.
+                                                                Als Worttrenner gelten White-Spaces und die
                                 Satzzeichen ".,;" sowie einfache und doppelte
-                                Anf"uhrungszeichen.
-                            */
+                                                                Anf"uhrungszeichen.
+                                                        */
 )
 
 /*  [Beschreibung]
 
-    Diese Methode kann von Anwendungsprogrammierer "uberladen werden,
-    um einen Text zur"uckzuliefern, der in der aktuellen Selektion
-    steht. Dieser wird z.B. beim Versenden (email) verwendet.
+        Diese Methode kann von Anwendungsprogrammierer "uberladen werden,
+        um einen Text zur"uckzuliefern, der in der aktuellen Selektion
+        steht. Dieser wird z.B. beim Versenden (email) verwendet.
 
     Mit "CompleteWords == TRUE" ger"ufen, reicht z.B. auch der Cursor,
-    der in einer URL steht, um die gesamte URL zu liefern.
+        der in einer URL steht, um die gesamte URL zu liefern.
 */
 
 {
@@ -1439,17 +1503,17 @@ String SfxViewShell::GetSelectionText
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::HasSelection( BOOL ) const
+sal_Bool SfxViewShell::HasSelection( sal_Bool ) const
 
 /*  [Beschreibung]
 
-    Mit dieser virtuellen Methode kann z.B. ein Dialog abfragen, ob in der
-    aktuellen View etwas selektiert ist. Wenn der Parameter <BOOL> TRUE ist,
-    wird abgefragt, ob Text selektiert ist.
+        Mit dieser virtuellen Methode kann z.B. ein Dialog abfragen, ob in der
+        aktuellen View etwas selektiert ist. Wenn der Parameter <sal_Bool> sal_True ist,
+        wird abgefragt, ob Text selektiert ist.
 */
 
 {
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -1458,16 +1522,16 @@ void SfxViewShell::SetSubShell( SfxShell *pShell )
 
 /*  [Beschreibung]
 
-    Mit dieser Methode kann eine Selektions- oder Cursor-Shell angemeldet
-    werden, die automatisch unmittelbar nach der SfxViewShell auf den
-    SfxDispatcher gepusht wird, und automatisch umittelbar vor ihr
-    gepoppt wird.
+        Mit dieser Methode kann eine Selektions- oder Cursor-Shell angemeldet
+        werden, die automatisch unmittelbar nach der SfxViewShell auf den
+        SfxDispatcher gepusht wird, und automatisch umittelbar vor ihr
+        gepoppt wird.
 
-    Ist die SfxViewShell-Instanz bereits gepusht, dann wird pShell
-    sofort ebenfalls gepusht. Wird mit SetSubShell eine andere SfxShell
-    Instanz angemeldet, als vorher angemeldet war, wird die zuvor angemeldete
-    ggf. automatisch gepoppt. Mit pShell==0 kann daher die aktuelle
-    Sub-Shell abgemeldet werden.
+        Ist die SfxViewShell-Instanz bereits gepusht, dann wird pShell
+        sofort ebenfalls gepusht. Wird mit SetSubShell eine andere SfxShell
+        Instanz angemeldet, als vorher angemeldet war, wird die zuvor angemeldete
+        ggf. automatisch gepoppt. Mit pShell==0 kann daher die aktuelle
+        Sub-Shell abgemeldet werden.
 */
 
 {
@@ -1502,10 +1566,10 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     SfxDispatcher *pDisp = pFrame->GetDispatcher();
     if ( !pShell )
     {
-        USHORT nCount = pImp->aArr.Count();
+        sal_uInt16 nCount = pImp->aArr.Count();
         if ( pDisp->IsActive(*this) )
         {
-            for ( USHORT n=nCount; n>0; n-- )
+            for ( sal_uInt16 n=nCount; n>0; n-- )
                 pDisp->Pop( *pImp->aArr[n-1] );
             pDisp->Flush();
         }
@@ -1514,7 +1578,7 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     }
     else
     {
-        USHORT nPos = pImp->aArr.GetPos( pShell );
+        sal_uInt16 nPos = pImp->aArr.GetPos( pShell );
         if ( nPos != 0xFFFF )
         {
             pImp->aArr.Remove( nPos );
@@ -1527,21 +1591,21 @@ void SfxViewShell::RemoveSubShell( SfxShell* pShell )
     }
 }
 
-SfxShell* SfxViewShell::GetSubShell( USHORT nNo )
+SfxShell* SfxViewShell::GetSubShell( sal_uInt16 nNo )
 {
-    USHORT nCount = pImp->aArr.Count();
+    sal_uInt16 nCount = pImp->aArr.Count();
     if ( nNo<nCount )
         return pImp->aArr[nCount-nNo-1];
     return NULL;
 }
 
-void SfxViewShell::PushSubShells_Impl( BOOL bPush )
+void SfxViewShell::PushSubShells_Impl( sal_Bool bPush )
 {
-    USHORT nCount = pImp->aArr.Count();
+    sal_uInt16 nCount = pImp->aArr.Count();
     SfxDispatcher *pDisp = pFrame->GetDispatcher();
     if ( bPush )
     {
-        for ( USHORT n=0; n<nCount; n++ )
+        for ( sal_uInt16 n=0; n<nCount; n++ )
             pDisp->Push( *pImp->aArr[n] );
     }
     else if ( nCount )
@@ -1556,19 +1620,20 @@ void SfxViewShell::PushSubShells_Impl( BOOL bPush )
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::WriteUserData( String&, BOOL )
+void SfxViewShell::WriteUserData( String&, sal_Bool )
 {
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::ReadUserData(const String&, BOOL )
+void SfxViewShell::ReadUserData(const String&, sal_Bool )
 {
 }
 
 void SfxViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool )
 {
 }
+
 void SfxViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool )
 {
 }
@@ -1579,14 +1644,14 @@ void SfxViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::c
 
 SfxViewShell* SfxViewShell::GetFirst
 (
-    const TypeId*	pType,
-    BOOL			bOnlyVisible
+    const TypeId* pType,
+    sal_Bool          bOnlyVisible
 )
 {
     // search for a SfxViewShell of the specified type
     SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl();
     SfxViewFrameArr_Impl &rFrames = SFX_APP()->GetViewFrames_Impl();
-    for ( USHORT nPos = 0; nPos < rShells.Count(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < rShells.Count(); ++nPos )
     {
         SfxViewShell *pShell = rShells.GetObject(nPos);
         if ( pShell )
@@ -1616,14 +1681,14 @@ SfxViewShell* SfxViewShell::GetFirst
 
 SfxViewShell* SfxViewShell::GetNext
 (
-    const SfxViewShell&	rPrev,
-    const TypeId*		pType,
-    BOOL				bOnlyVisible
+    const SfxViewShell& rPrev,
+    const TypeId*       pType,
+    sal_Bool                bOnlyVisible
 )
 {
     SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl();
     SfxViewFrameArr_Impl &rFrames = SFX_APP()->GetViewFrames_Impl();
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < rShells.Count(); ++nPos )
         if ( rShells.GetObject(nPos) == &rPrev )
             break;
@@ -1677,7 +1742,8 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC,
                             SFX_ITEMSET_ARG( pSet, pItem, SfxUnoAnyItem, SID_VIEW_DATA, sal_False );
                             if ( pItem )
                             {
-                                pImp->pController->restoreViewData( pItem->GetValue() );
+                                pImp->m_pController->restoreViewData(
+                                        pItem->GetValue() );
                                 pSet->ClearItem( SID_VIEW_DATA );
                             }
 
@@ -1694,15 +1760,17 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC,
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
+sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
 {
-    if (!pImp->pAccExec)
+    if (!pImp->m_pAccExec.get())
     {
-        pImp->pAccExec = ::svt::AcceleratorExecute::createAcceleratorHelper();
-        pImp->pAccExec->init(::comphelper::getProcessServiceFactory(), pFrame->GetFrame().GetFrameInterface());
+        pImp->m_pAccExec.reset(
+                ::svt::AcceleratorExecute::createAcceleratorHelper() );
+        pImp->m_pAccExec->init(::comphelper::getProcessServiceFactory(),
+                pFrame->GetFrame().GetFrameInterface());
     }
 
-    return pImp->pAccExec->execute(aKey.GetKeyCode());
+    return pImp->m_pAccExec->execute(aKey.GetKeyCode());
 }
 
 //--------------------------------------------------------------------
@@ -1711,24 +1779,24 @@ bool SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
 /*  [Beschreibung]
 
-    Diese Methode f"uhrt das KeyEvent 'rKeyEvent' "uber die an dieser
-    SfxViewShell direkt oder indirekt (z.B. via Applikation) konfigurierten
-    Tasten (Accelerator) aus.
+        Diese Methode f"uhrt das KeyEvent 'rKeyEvent' "uber die an dieser
+        SfxViewShell direkt oder indirekt (z.B. via Applikation) konfigurierten
+        Tasten (Accelerator) aus.
 
 
-    [R"uckgabewert]
+        [R"uckgabewert]
 
     bool                    TRUE
-                            die Taste ist konfiguriert, der betreffende
-                            Handler wurde gerufen
+                                                        die Taste ist konfiguriert, der betreffende
+                                                        Handler wurde gerufen
 
-                            FALSE
-                            die Taste ist nicht konfiguriert, es konnte
-                            also kein Handler gerufen werden
+                                                        FALSE
+                                                        die Taste ist nicht konfiguriert, es konnte
+                                                        also kein Handler gerufen werden
 
 
-    [Querverweise]
-    <SfxApplication::KeyInput(const KeyEvent&)>
+        [Querverweise]
+        <SfxApplication::KeyInput(const KeyEvent&)>
 */
 {
     return ExecKey_Impl(rKeyEvent);
@@ -1745,9 +1813,9 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ )
 
 /*  [Beschreibung]
 
-    Diese Methode mu\s von Subklassen "uberladen werden, damit vom SFx
-    aus der Cursor ein- und ausgeschaltet werden kann. Dies geschieht
-    z.B. bei laufendem <SfxProgress>.
+        Diese Methode mu\s von Subklassen "uberladen werden, damit vom SFx
+        aus der Cursor ein- und ausgeschaltet werden kann. Dies geschieht
+        z.B. bei laufendem <SfxProgress>.
 */
 
 {
@@ -1759,15 +1827,15 @@ void SfxViewShell::GotFocus() const
 
 /*  [Beschreibung]
 
-    Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn
-    das Edit-Window den Focus erhalten hat. Der SFx hat so z.B. die
-    M"oglichkeit, den Accelerator einzuschalten.
+        Diese Methode mu\s vom Applikationsentwickler gerufen werden, wenn
+        das Edit-Window den Focus erhalten hat. Der SFx hat so z.B. die
+        M"oglichkeit, den Accelerator einzuschalten.
 
 
-    [Anmerkung]
+        [Anmerkung]
 
-    <StarView> liefert leider keine M"oglichkeit, solche Events
-    'von der Seite' einzuh"angen.
+        <StarView> liefert leider keine M"oglichkeit, solche Events
+        'von der Seite' einzuh"angen.
 */
 
 {
@@ -1777,7 +1845,7 @@ void SfxViewShell::GotFocus() const
 void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 {
 
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
@@ -1793,7 +1861,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 
 void SfxViewShell::DisconnectAllClients()
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
@@ -1820,7 +1888,7 @@ void SfxViewShell::AdjustVisArea(const Rectangle& rRect)
 
 void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
@@ -1845,12 +1913,12 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
         ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 );
 
     // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked
-    if ( !pIPClient->IsObjectInPlaceActive() && pImp->bPlugInsActive )
+    if ( !pIPClient->IsObjectInPlaceActive() && pImp->m_bPlugInsActive )
     {
-           // object in client is currently not active
-           // check if the object wants to be activated always or when it becomes at least partially visible
-           // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
-           if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
+        // object in client is currently not active
+        // check if the object wants to be activated always or when it becomes at least partially visible
+        // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
+        if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
         {
             try
             {
@@ -1861,21 +1929,21 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
             }
         }
     }
-    else if ( !pImp->bPlugInsActive )
+    else if (!pImp->m_bPlugInsActive)
     {
-           // object in client is currently active and "Edit/Plugins" checkbox is selected
-           // check if the object wants to be activated always or when it becomes at least partially visible
+        // object in client is currently active and "Edit/Plugins" checkbox is selected
+        // check if the object wants to be activated always or when it becomes at least partially visible
         // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
-           if ( bAlwaysActive || bActiveWhenVisible )
-               pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
+        if ( bAlwaysActive || bActiveWhenVisible )
+            pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
     }
 }
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::PlugInsActive() const
+sal_Bool SfxViewShell::PlugInsActive() const
 {
-    return pImp->bPlugInsActive;
+    return pImp->m_bPlugInsActive;
 }
 
 //--------------------------------------------------------------------
@@ -1883,13 +1951,13 @@ void SfxViewShell::DiscardClients_Impl()
 
 /*  [Beschreibung]
 
-    Diese Methode dient dazu, vor dem Schlie\sen eines Dokuments das
-    Speichern der Objekte zu verhindern, wenn der Benutzer Schlie\en ohne
-    Speichern gew"ahlt hatte.
+        Diese Methode dient dazu, vor dem Schlie\sen eines Dokuments das
+        Speichern der Objekte zu verhindern, wenn der Benutzer Schlie\en ohne
+        Speichern gew"ahlt hatte.
 */
 
 {
-    SfxInPlaceClientList *pClients = GetIPClientList_Impl(FALSE);
+    SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False);
     if ( !pClients )
         return;
 
@@ -1901,14 +1969,14 @@ void SfxViewShell::DiscardClients_Impl()
 
 SfxScrollingMode SfxViewShell::GetScrollingMode() const
 {
-    return pImp->eScroll;
+    return pImp->m_eScroll;
 }
 
 //--------------------------------------------------------------------
 
 void SfxViewShell::SetScrollingMode( SfxScrollingMode eMode )
 {
-    pImp->eScroll = eMode;
+    pImp->m_eScroll = eMode;
 }
 
 //--------------------------------------------------------------------
@@ -1973,9 +2041,9 @@ void SfxViewShell::MarginChanged()
 
 //--------------------------------------------------------------------
 
-BOOL SfxViewShell::IsShowView_Impl() const
+sal_Bool SfxViewShell::IsShowView_Impl() const
 {
-    return pImp->bIsShowView;
+    return pImp->m_bIsShowView;
 }
 
 //--------------------------------------------------------------------
@@ -1991,14 +2059,14 @@ void SfxViewShell::JumpToMark( const String& rMark )
 {
     SfxStringItem aMarkItem( SID_JUMPTOMARK, rMark );
     GetViewFrame()->GetDispatcher()->Execute(
-            SID_JUMPTOMARK,
-            SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
-            &aMarkItem, 0L );
+        SID_JUMPTOMARK,
+        SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD,
+        &aMarkItem, 0L );
 }
 
 //------------------------------------------------------------------------
 
-SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( BOOL bCreate ) const
+SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const
 {
     if ( !pIPClientList && bCreate )
         ( (SfxViewShell*) this )->pIPClientList = new SfxInPlaceClientList;
@@ -2007,26 +2075,24 @@ SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( BOOL bCreate ) const
 
 void SfxViewShell::SetController( SfxBaseController* pController )
 {
-    pImp->pController = pController;
-    pImp->pController->acquire();
-    pImp->bControllerSet = TRUE;
-    
+    pImp->m_pController = pController;
+    pImp->m_bControllerSet = true;
+
     // there should be no old listener, but if there is one, it should be disconnected
     if (  pImp->xClipboardListener.is() )
         pImp->xClipboardListener->DisconnectViewShell();
 
-    pImp->xClipboardListener = new SfxClipboardChangeListener( this );
-    AddRemoveClipboardListener( pImp->xClipboardListener.get(), TRUE );
+    pImp->xClipboardListener = new SfxClipboardChangeListener( this, GetClipboardNotifier() );
 }
 
 Reference < XController > SfxViewShell::GetController()
 {
-    return pImp->pController;
+    return pImp->m_pController.get();
 }
 
 SfxBaseController* SfxViewShell::GetBaseController_Impl() const
 {
-    return pImp->pController;
+    return pImp->m_pController.get();
 }
 
 void SfxViewShell::AddContextMenuInterceptor_Impl( const REFERENCE< XCONTEXTMENUINTERCEPTOR >& xInterceptor )
@@ -2047,10 +2113,10 @@ void SfxViewShell::RemoveContextMenuInterceptor_Impl( const REFERENCE< XCONTEXTM
 void Change( Menu* pMenu, SfxViewShell* pView )
 {
     SfxDispatcher *pDisp = pView->GetViewFrame()->GetDispatcher();
-    USHORT nCount = pMenu->GetItemCount();
-    for ( USHORT nPos=0; nPos<nCount; ++nPos )
+    sal_uInt16 nCount = pMenu->GetItemCount();
+    for ( sal_uInt16 nPos=0; nPos<nCount; ++nPos )
     {
-        USHORT nId = pMenu->GetItemId(nPos);
+        sal_uInt16 nId = pMenu->GetItemId(nPos);
         String aCmd = pMenu->GetItemCommand(nId);
         PopupMenu* pPopup = pMenu->GetPopupMenu(nId);
         if ( pPopup )
@@ -2061,7 +2127,7 @@ void Change( Menu* pMenu, SfxViewShell* pView )
         {
             if ( aCmd.CompareToAscii(".uno:", 5) == 0 )
             {
-                for (USHORT nIdx=0;;)
+                for (sal_uInt16 nIdx=0;;)
                 {
                     SfxShell *pShell=pDisp->GetShell(nIdx++);
                     if (pShell == NULL)
@@ -2071,6 +2137,7 @@ void Change( Menu* pMenu, SfxViewShell* pView )
                     if ( pSlot )
                     {
                         pMenu->InsertItem( pSlot->GetSlotId(), pMenu->GetItemText( nId ), pMenu->GetItemBits( nId ), nPos );
+                        pMenu->SetItemCommand( pSlot->GetSlotId(), aCmd );
                         pMenu->RemoveItem( nPos+1 );
                         break;
                     }
@@ -2081,19 +2148,19 @@ void Change( Menu* pMenu, SfxViewShell* pView )
 }
 
 
-BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent )
+sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent )
 {
     rpOut = NULL;
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
 
     // create container from menu
-    // #110897#
+        // #110897#
     // aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( &rIn );
     aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
         ::comphelper::getProcessServiceFactory(), &rIn, &rMenuIdentifier );
 
     // get selection from controller
-    aEvent.Selection = ::com::sun::star::uno::Reference < ::com::sun::star::view::XSelectionSupplier > ( GetController(), ::com::sun::star::uno::UNO_QUERY );
+    aEvent.Selection = uno::Reference < view::XSelectionSupplier > ( GetController(), uno::UNO_QUERY );
 
     // call interceptors
     ::cppu::OInterfaceIteratorHelper aIt( pImp->aInterceptorContainer );
@@ -2101,22 +2168,22 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
     {
         try
         {
-            ::com::sun::star::ui::ContextMenuInterceptorAction eAction =
-                ((::com::sun::star::ui::XContextMenuInterceptor*)aIt.next())->notifyContextMenuExecute( aEvent );
+            ui::ContextMenuInterceptorAction eAction =
+                ((ui::XContextMenuInterceptor*)aIt.next())->notifyContextMenuExecute( aEvent );
             switch ( eAction )
             {
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_CANCELLED :
+                case ui::ContextMenuInterceptorAction_CANCELLED :
                     // interceptor does not want execution
-                    return FALSE;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED :
+                    return sal_False;
+                case ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED :
                     // interceptor wants his modified menu to be executed
-                    bModified = TRUE;
+                    bModified = sal_True;
                     break;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED :
+                case ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED :
                     // interceptor has modified menu, but allows for calling other interceptors
-                    bModified = TRUE;
+                    bModified = sal_True;
                     continue;
-                case ::com::sun::star::ui::ContextMenuInterceptorAction_IGNORED :
+                case ui::ContextMenuInterceptorAction_IGNORED :
                     // interceptor is indifferent
                     continue;
                 default:
@@ -2124,7 +2191,7 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
                     continue;
             }
         }
-        catch( ::com::sun::star::uno::RuntimeException& )
+        catch( uno::RuntimeException& )
         {
             aIt.remove();
         }
@@ -2141,56 +2208,56 @@ BOOL SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString&
         Change( rpOut, this );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void SfxViewShell::TakeOwnerShip_Impl()
 {
     // currently there is only one reason to take OwnerShip: a hidden frame is printed
     // so the ViewShell will check this on EndPrint (->prnmon.cxx)
-    pImp->bGotOwnerShip = TRUE;
+    pImp->m_bGotOwnership = true;
 }
 
 void SfxViewShell::TakeFrameOwnerShip_Impl()
 {
     // currently there is only one reason to take OwnerShip: a hidden frame is printed
     // so the ViewShell will check this on EndPrint (->prnmon.cxx)
-    pImp->bGotFrameOwnerShip = TRUE;
+    pImp->m_bGotFrameOwnership = true;
 }
 
 void SfxViewShell::CheckOwnerShip_Impl()
 {
-    BOOL bSuccess = FALSE;
-    if( pImp->bGotOwnerShip )
+    sal_Bool bSuccess = sal_False;
+    if (pImp->m_bGotOwnership)
     {
-        com::sun::star::uno::Reference < com::sun::star::util::XCloseable > xModel(
-                GetObjectShell()->GetModel(), com::sun::star::uno::UNO_QUERY );
+        uno::Reference < util::XCloseable > xModel(
+            GetObjectShell()->GetModel(), uno::UNO_QUERY );
         if ( xModel.is() )
         {
             try
             {
                 // this call will destroy this object in case of success!
                 xModel->close( sal_True );
-                bSuccess = TRUE;
+                bSuccess = sal_True;
             }
-            catch ( com::sun::star::util::CloseVetoException& )
+            catch ( util::CloseVetoException& )
             {
             }
         }
     }
 
-    if( !bSuccess && pImp->bGotFrameOwnerShip )
+    if (!bSuccess && pImp->m_bGotFrameOwnership)
     {
         // document couldn't be closed or it shouldn't, now try at least to close the frame
-        com::sun::star::uno::Reference < com::sun::star::util::XCloseable > xFrame(
-                GetViewFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
+        uno::Reference < util::XCloseable > xFrame(
+            GetViewFrame()->GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY );
         if ( xFrame.is() )
         {
             try
             {
                 xFrame->close( sal_True );
             }
-            catch ( com::sun::star::util::CloseVetoException& )
+            catch ( util::CloseVetoException& )
             {
             }
         }
@@ -2199,28 +2266,30 @@ void SfxViewShell::CheckOwnerShip_Impl()
 
 long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
 {
-    if ( pImp->pController )
-        return pImp->pController->HandleEvent_Impl( rEvent );
+    if (pImp->m_pController.is())
+        return pImp->m_pController->HandleEvent_Impl( rEvent );
     return 0;
 }
 
-BOOL SfxViewShell::HasKeyListeners_Impl()
+sal_Bool SfxViewShell::HasKeyListeners_Impl()
 {
-    return pImp->pController ? pImp->pController->HasKeyListeners_Impl() : FALSE;
+    return (pImp->m_pController.is())
+        ? pImp->m_pController->HasKeyListeners_Impl() : sal_False;
 }
 
-BOOL SfxViewShell::HasMouseClickListeners_Impl()
+sal_Bool SfxViewShell::HasMouseClickListeners_Impl()
 {
-    return pImp->pController ? pImp->pController->HasMouseClickListeners_Impl() : FALSE;
+    return (pImp->m_pController.is())
+        ? pImp->m_pController->HasMouseClickListeners_Impl() : sal_False;
 }
 
 void SfxViewShell::SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
 {
     pImp->aPrintOpts = rOpts;
-// 	GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
+//      GetObjectShell()->Broadcast( SfxPrintingHint( -3, NULL, NULL, rOpts ) );
 }
 
-BOOL SfxViewShell::Escape()
+sal_Bool SfxViewShell::Escape()
 {
     return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION );
 }
@@ -2233,12 +2302,21 @@ Reference< view::XRenderable > SfxViewShell::GetRenderable()
     {
         Reference< frame::XModel > xModel( pObj->GetModel() );
         if( xModel.is() )
-        xRender = Reference< view::XRenderable >( xModel, UNO_QUERY );
+            xRender = Reference< view::XRenderable >( xModel, UNO_QUERY );
     }
     return xRender;
 }
 
-void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, BOOL bAdd )
+uno::Reference< datatransfer::clipboard::XClipboardNotifier > SfxViewShell::GetClipboardNotifier()
+{
+    uno::Reference< datatransfer::clipboard::XClipboardNotifier > xClipboardNotifier;
+    if ( GetViewFrame() )
+      xClipboardNotifier = uno::Reference< datatransfer::clipboard::XClipboardNotifier >( GetViewFrame()->GetWindow().GetClipboard(), uno::UNO_QUERY );
+
+    return xClipboardNotifier;
+}
+
+void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, sal_Bool bAdd )
 {
     try
     {
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 81633539dc..d0ea3dc928 100644..100755
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -26,41 +26,20 @@
  ************************************************************************/
 
 #include "../source/inc/helpid.hrc"         // HID_XXX
-#include "../inc/sfx2/sfxsids.hrc"               // SID_XXX
-#include "../inc/sfx2/sfx.hrc"
-
 
 hidspecial HID_APP_WIN							{ HelpID = HID_APP_WIN; };
 hidspecial HID_DESKTOP							{ HelpID = HID_DESKTOP; };
 hidspecial HID_DOCINFO_FRAME					{ HelpID = HID_DOCINFO_FRAME; };
 hidspecial HID_EXPLORER_FRAME					{ HelpID = HID_EXPLORER_FRAME; };
-hidspecial HID_FILEDLG_FILE 					{ HelpID = HID_FILEDLG_FILE; };
-hidspecial HID_FILEDLG_MANAGER					{ HelpID = HID_FILEDLG_MANAGER; };
-hidspecial HID_FILEDLG_READ_ONLY				{ HelpID = HID_FILEDLG_READ_ONLY; };
-hidspecial HID_FILEDLG_STANDARD 				{ HelpID = HID_FILEDLG_STANDARD; };
-hidspecial HID_FILEDLG_URL						{ HelpID = HID_FILEDLG_URL; };
-hidspecial HID_FILEDLG_USE_PASSWD				{ HelpID = HID_FILEDLG_USE_PASSWD; };
-hidspecial HID_INTERFACE_SFXMAILVIEW			{ HelpID = HID_INTERFACE_SFXMAILVIEW; };
-hidspecial HID_INTERFACE_SFXEXPLVIEWSH			{ HelpID = HID_INTERFACE_SFXEXPLVIEWSH; };
-hidspecial HID_INTERFACE_SFXFRAMESETVIEW  		{ HelpID = HID_INTERFACE_SFXFRAMESETVIEW; };
-hidspecial HID_INTERFACE_SFXFRAMESETSOURCEVIEW	{ HelpID = HID_INTERFACE_SFXFRAMESETSOURCEVIEW; };
-hidspecial HID_INTERFACE_SFXHELP_VIEWSH			{ HelpID = HID_INTERFACE_SFXHELP_VIEWSH; };
 hidspecial HID_PREVIEW_FRAME					{ HelpID = HID_PREVIEW_FRAME; };
 hidspecial HID_PRINT_OPTIONS					{ HelpID = HID_PRINT_OPTIONS; };
 hidspecial HID_TEMPLATE_FILTER					{ HelpID = HID_TEMPLATE_FILTER; };
 hidspecial HID_TEMPLATE_FMT 					{ HelpID = HID_TEMPLATE_FMT; };
 hidspecial HID_SEARCH_DLG_TABLB         		{ HelpID = HID_SEARCH_DLG_TABLB; };
-hidspecial SID_STYLE_FAMILY1     				{ HelpID = SID_STYLE_FAMILY1; };
-hidspecial SID_STYLE_FAMILY2     				{ HelpID = SID_STYLE_FAMILY2; };
-hidspecial SID_STYLE_FAMILY3     				{ HelpID = SID_STYLE_FAMILY3; };
-hidspecial SID_STYLE_FAMILY4     				{ HelpID = SID_STYLE_FAMILY4; };
-hidspecial SID_STYLE_FAMILY5     				{ HelpID = SID_STYLE_FAMILY5; };
-hidspecial SID_FILTER_NAME						{ HelpID = SID_FILTER_NAME; };
 hidspecial HID_NAVIGATOR_WINDOW					{ HelpID = HID_NAVIGATOR_WINDOW; };
 hidspecial HID_HELPAGENT_TIP_BOX				{ HelpId = HID_HELPAGENT_TIP_BOX; };
 hidspecial HID_TEMPLDLG_TOOLBOX_LEFT 			{ HelpId = HID_TEMPLDLG_TOOLBOX_LEFT;};
 hidspecial HID_EXPLORER_SRCH_COUNT 				{ HelpId = HID_EXPLORER_SRCH_COUNT;};
-hidspecial HID_INTERFACE_SFXPLUGINVIEW			{ HelpID = HID_INTERFACE_SFXPLUGINVIEW; };
 hidspecial HID_TABDLG_RESET_BTN 				{ HelpID = HID_TABDLG_RESET_BTN; };
 hidspecial HID_TABDLG_STANDARD_BTN				{ HelpID = HID_TABDLG_STANDARD_BTN; };
 hidspecial HID_CONFIG_EVENT_OFFICE_BASED		{ HelpID = HID_CONFIG_EVENT_OFFICE_BASED; };
@@ -70,35 +49,10 @@ hidspecial HID_EXPLORERMENU_ARRANGEICONS		{ HelpID = HID_EXPLORERMENU_ARRANGEICO
 hidspecial HID_EXPLORERMENU_STDTEMPLATE	  	    { HelpID = HID_EXPLORERMENU_STDTEMPLATE; };
 hidspecial HID_EXPLORER_DOCVIEW_ICON			{ HelpID = HID_EXPLORER_DOCVIEW_ICON; };
 hidspecial HID_EXPLORER_DOCVIEW_DETAILS			{ HelpID = HID_EXPLORER_DOCVIEW_DETAILS; };
-hidspecial HID_CHAOSDOC_WIN						{ HelpID = HID_CHAOSDOC_WIN; };
-hidspecial HID_CHAOSDOC_WIN_HEADER				{ HelpID = HID_CHAOSDOC_WIN_HEADER; };
-hidspecial HID_CHAOSDOC_WIN_PARTS				{ HelpID = HID_CHAOSDOC_WIN_PARTS; };
-hidspecial HID_CHAOSDOC_WIN_BODY				{ HelpID = HID_CHAOSDOC_WIN_BODY; };
 hidspecial HID_BRWBOX_HEADERBAR					{ HelpID = HID_BRWBOX_HEADERBAR; };
 hidspecial HID_TASKBAR							{ HelpID = HID_TASKBAR; };
 hidspecial HID_TASKBUTTONBAR		  			{ HelpID = HID_TASKBUTTONBAR; };
 hidspecial HID_TASKTOOLBAR						{ HelpID = HID_TASKTOOLBAR; };
-hidspecial HID_CHAOS_NEW_IMAP_BOX				{ HelpID = HID_CHAOS_NEW_IMAP_BOX; };
-hidspecial HID_CHAOS_NEW_IMAP_MSG				{ HelpID = HID_CHAOS_NEW_IMAP_MSG; };
-hidspecial HID_CHAOS_NEW_IMAP_FLD				{ HelpID = HID_CHAOS_NEW_IMAP_FLD; };
-hidspecial HID_CHAOS_NEW_NEWS_BOX				{ HelpID = HID_CHAOS_NEW_NEWS_BOX; };
-hidspecial HID_CHAOS_NEW_NEWS_MSG				{ HelpID = HID_CHAOS_NEW_NEWS_MSG; };
-hidspecial HID_CHAOS_NEW_IMAP_BOX				{ HelpID = HID_CHAOS_NEW_IMAP_BOX; };
-hidspecial HID_CHAOS_NEW_FSYS_FLD				{ HelpID = HID_CHAOS_NEW_FSYS_FLD; };
-hidspecial HID_CHAOS_NEW_FSYS_LNK				{ HelpID = HID_CHAOS_NEW_FSYS_LNK; };
-hidspecial HID_CHAOS_NEW_FTP_BOX				{ HelpID = HID_CHAOS_NEW_FTP_BOX; };
-hidspecial HID_CHAOS_NEW_FTP_FLD				{ HelpID = HID_CHAOS_NEW_FTP_FLD; };
-hidspecial HID_CHAOS_NEW_OUT_BOX				{ HelpID = HID_CHAOS_NEW_OUT_BOX; };
-hidspecial HID_CHAOS_NEW_OUT_MSG				{ HelpID = HID_CHAOS_NEW_OUT_MSG; };
-hidspecial HID_CHAOS_NEW_POP3_BOX				{ HelpID = HID_CHAOS_NEW_POP3_BOX; };
-hidspecial HID_CHAOS_NEW_POP3_MSG				{ HelpID = HID_CHAOS_NEW_POP3_MSG; };
-hidspecial HID_CHAOS_NEW_SEARCH					{ HelpID = HID_CHAOS_NEW_SEARCH; };
-hidspecial HID_CHAOS_NEW_VIM_BOX				{ HelpID = HID_CHAOS_NEW_VIM_BOX; };
-hidspecial HID_CHAOS_NEW_VIM_MSG				{ HelpID = HID_CHAOS_NEW_VIM_MSG; };
-hidspecial HID_CHAOS_NEW_SUBSCR_BOX				{ HelpID = HID_CHAOS_NEW_SUBSCR_BOX; };
-hidspecial HID_CHAOS_NEW_BOOKMARK				{ HelpID = HID_CHAOS_NEW_BOOKMARK; };
-hidspecial HID_CHAOS_NEW_PUB_BOX				{ HelpID = HID_CHAOS_NEW_PUB_BOX; };
-hidspecial HID_UUI_END							{ HelpID = HID_UUI_END; }; // aka HID_CHAOS_NEW_DATABASE
 hidspecial HID_CNT_DLG_SEARCH_BT_SHOW			{ HelpID = HID_CNT_DLG_SEARCH_BT_SHOW; };
 hidspecial HID_CNT_DLG_SEARCH_BT_UPDATE			{ HelpID = HID_CNT_DLG_SEARCH_BT_UPDATE; };
 hidspecial HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE	{ HelpID = HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE; };
@@ -107,22 +61,9 @@ hidspecial HID_CNT_PAGE_HEADER					{ HelpID = HID_CNT_PAGE_HEADER; };
 hidspecial HID_CNT_PAGE_DESCRIPTION				{ HelpID = HID_CNT_PAGE_DESCRIPTION; };
 hidspecial HID_CNT_LB_HEADER					{ HelpID = HID_CNT_LB_HEADER; };
 hidspecial HID_CNT_LB_DESCRIPTION				{ HelpID = HID_CNT_LB_DESCRIPTION; };
-hidspecial SID_GROUPVIEW						{ HelpID = SID_GROUPVIEW; };
 hidspecial HID_GROUPVIEW_CONTENT_BIG			{ HelpID = HID_GROUPVIEW_CONTENT_BIG; };
 hidspecial HID_GROUPVIEW_CONTENT_SMALL			{ HelpID = HID_GROUPVIEW_CONTENT_SMALL; };
 hidspecial HID_GROUPVIEW_CONTENT_TREE			{ HelpID = HID_GROUPVIEW_CONTENT_TREE; };
-hidspecial HID_FILEDLG_AUTOCOMPLETEBOX			{ HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; };
-hidspecial HID_FILEDLG_SAVE_BTN					{ HelpID = HID_FILEDLG_SAVE_BTN; };
-hidspecial HID_FILEDLG_SAVE_FILENAME            { HelpID = HID_FILEDLG_SAVE_FILENAME; };
-hidspecial HID_FILEDLG_SAVE_FILETYPE            { HelpID = HID_FILEDLG_SAVE_FILETYPE; };
-hidspecial HID_FILEDLG_INSERT_BTN               { HelpID = HID_FILEDLG_INSERT_BTN; };
-hidspecial HID_FILEDLG_PATH_BTN                 { HelpID = HID_FILEDLG_PATH_BTN; };
-hidspecial HID_FILEDLG_PATH_FILENAME            { HelpID = HID_FILEDLG_PATH_FILENAME; };
-hidspecial HID_FILEDLG_FOLDER_BTN               { HelpID = HID_FILEDLG_FOLDER_BTN; };
-hidspecial HID_FILEDLG_FOLDER_FILENAME          { HelpID = HID_FILEDLG_FOLDER_FILENAME; };
-hidspecial HID_FILEDLG_SRCHFOLDER_BTN           { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX	{ HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; };
 hidspecial HID_BROWSERCONTROL					{ HelpID = HID_BROWSERCONTROL; };
 hidspecial HID_TASKSTATUSBAR					{ HelpID = HID_TASKSTATUSBAR; };
 hidspecial HID_CNT_PAGE_HEADER_TABBAR			{ HelpID = HID_CNT_PAGE_HEADER_TABBAR; };
@@ -147,8 +88,6 @@ hidspecial HID_CNT_SENT_VIEW_SENT_ARTICLES		{ HelpID = HID_CNT_SENT_VIEW_SENT_AR
 hidspecial HID_CNT_SENT_VIEW_UNSENT_ARTICLES	{ HelpID = HID_CNT_SENT_VIEW_UNSENT_ARTICLES; };
 hidspecial HID_CNT_SENT_VIEW_MARKED_ARTICLES	{ HelpID = HID_CNT_SENT_VIEW_MARKED_ARTICLES; };
 hidspecial HID_TABDLG_APPLY_BTN					{ HelpID = HID_TABDLG_APPLY_BTN; };
-hidspecial HID_FILEDLG_LINK_CB					{ HelpID = HID_FILEDLG_LINK_CB; };
-hidspecial HID_FILEDLG_PREVIEW_CB				{ HelpID = HID_FILEDLG_PREVIEW_CB; };
 hidspecial HID_HELP_WINDOW						{ HelpID = HID_HELP_WINDOW; };
 hidspecial HID_HELP_TOOLBOX						{ HelpID = HID_HELP_TOOLBOX; };
 hidspecial HID_HELP_TOOLBOXITEM_INDEX           { HelpID = HID_HELP_TOOLBOXITEM_INDEX; };
@@ -159,7 +98,6 @@ hidspecial HID_HELP_TOOLBOXITEM_PRINT           { HelpID = HID_HELP_TOOLBOXITEM_
 hidspecial HID_HELP_TOOLBOXITEM_BOOKMARKS       { HelpID = HID_HELP_TOOLBOXITEM_BOOKMARKS; };
 hidspecial HID_HELP_TOOLBOXITEM_SEARCHDIALOG	{ HelpID = HID_HELP_TOOLBOXITEM_SEARCHDIALOG; };
 hidspecial HID_TBXCONTROL_FILENEW       		{ HelpID = HID_TBXCONTROL_FILENEW; };
-hidspecial HID_GLOBAL_FALLBACK					{ HelpID = HID_GLOBAL_FALLBACK; };
 hidspecial HID_CLOSE_WARNING                    { HelpID = HID_CLOSE_WARNING; };
 hidspecial HID_DID_SAVE_PACKED_XML				{ HelpID = HID_DID_SAVE_PACKED_XML; };
 hidspecial HID_HELP_ONHELP						{ HelpID = HID_HELP_ONHELP; };
diff --git a/sfx2/util/make_tco.btm b/sfx2/util/make_tco.btm
index d25dad24a6..d25dad24a6 100644..100755
--- a/sfx2/util/make_tco.btm
+++ b/sfx2/util/make_tco.btm
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
deleted file mode 100644
index 9e20a82d42..0000000000
--- a/sfx2/util/makefile.mk
+++ /dev/null
@@ -1,160 +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=..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=sfx2
-TARGET=sfx
-#sfx.hid generieren
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=  $(SLB)$/appl.lib		\
-            $(SLB)$/explorer.lib	\
-            $(SLB)$/doc.lib			\
-            $(SLB)$/view.lib		\
-            $(SLB)$/control.lib		\
-            $(SLB)$/notify.lib		\
-            $(SLB)$/menu.lib		\
-            $(SLB)$/inet.lib		\
-            $(SLB)$/toolbox.lib		\
-            $(SLB)$/statbar.lib		\
-            $(SLB)$/dialog.lib		\
-            $(SLB)$/bastyp.lib		\
-            $(SLB)$/config.lib
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-LIB1FILES += $(SLB)$/layout.lib
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-HELPIDFILES=\
-            ..\inc\sfx2\sfxsids.hrc	\
-            ..\source\inc\helpid.hrc
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/$(TARGET).lib
-LIB2FILES=  $(LB)$/isfx.lib
-LIB2DEPN=$(SHL1TARGETN)
-.ENDIF
-
-SHL1TARGET= sfx$(DLLPOSTFIX)
-SHL1IMPLIB= isfx
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS+=\
-        $(FWELIB) \
-        $(BASICLIB) \
-        $(SVTOOLLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVLLIB)	\
-        $(SOTLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB) \
-        $(SAXLIB) \
-        $(COMPHELPERLIB) \
-        $(UCBHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB) \
-        $(LIBXML2LIB) \
-
-
-.IF "$(GUI)"=="WNT"
-
-SHL1STDLIBS+=\
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB) \
-        $(SHELL32LIB) \
-        $(GDI32LIB) \
-        $(OLE32LIB) \
-        $(UUIDLIB)
-.ELSE # WNT
-.IF "$(OS)" == "MACOSX"
-SHL1STDLIBS+= -framework Cocoa
-.ENDIF # MACOSX
-.ENDIF # WNT
-
-
-SHL1DEPN += $(shell @$(FIND) $(SLO) -type f -name "*.OBJ" -print)
-
-SHL1LIBS=   $(LIB1TARGET)
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME	=$(SHL1TARGET)
-DEFLIB1NAME	=sfx
-DEF1DES		=Sfx
-
-SFXSRSLIST=\
-        $(SRS)$/appl.srs \
-        $(SRS)$/sfx.srs \
-        $(SRS)$/doc.srs \
-        $(SRS)$/view.srs \
-        $(SRS)$/menu.srs \
-        $(SRS)$/dialog.srs \
-                $(SRS)$/bastyp.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(SFXSRSLIST)
-
-# gtk quick-starter
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-CFLAGS+=$(PKGCONFIG_CFLAGS)
-
-SHL3TARGET=qstart_gtk$(DLLPOSTFIX)
-SHL3LIBS=$(SLB)$/quickstart.lib
-SHL3DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
-# libs for gtk plugin
-SHL3STDLIBS=$(SHL1STDLIBS) $(SFX2LIB)
-SHL3STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-SHL3SONAME+=-z nodefs
-SHL3NOCHECK=TRUE
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
-.ENDIF # "$(GUI)"=="UNX"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sfx2/util/mkdemo.pl b/sfx2/util/mkdemo.pl
index fd4a2d9cec..fd4a2d9cec 100644..100755
--- a/sfx2/util/mkdemo.pl
+++ b/sfx2/util/mkdemo.pl
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
new file mode 100755
index 0000000000..1c28afd417
--- /dev/null
+++ b/sfx2/util/sfx.component
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="SfxDocumentMetaData">
+    <service name="com.sun.star.document.DocumentProperties"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.desktop.QuickstartWrapper">
+    <service name="com.sun.star.office.Quickstart"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.document.OwnSubFilter">
+    <service name="com.sun.star.comp.document.OwnSubFilter"/>
+    <service name="com.sun.star.document.OwnSubFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.PackageStructureCreator">
+    <service name="com.sun.star.comp.embed.PackageStructureCreator"/>
+    <service name="com.sun.star.embed.PackageStructureCreator"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.office.FrameLoader">
+    <service name="com.sun.star.frame.SynchronousFrameLoader"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.AppDispatchProvider">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer">
+    <service name="com.sun.star.script.ApplicationDialogLibraryContainer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer">
+    <service name="com.sun.star.script.ApplicationScriptLibraryContainer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.DocumentTemplates">
+    <service name="com.sun.star.frame.DocumentTemplates"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.GlobalEventBroadcaster">
+    <service name="com.sun.star.frame.GlobalEventBroadcaster"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.IFrameObject">
+    <service name="com.sun.star.frame.SpecialEmbeddedObject"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.PluginObject">
+    <service name="com.sun.star.frame.SpecialEmbeddedObject"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.SfxMacroLoader">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sfx2.StandaloneDocumentInfo">
+    <service name="com.sun.star.document.StandaloneDocumentInfo"/>
+  </implementation>
+</component>
diff --git a/sfx2/util/sfx.xml b/sfx2/util/sfx.xml
index 681f500053..681f500053 100644..100755
--- a/sfx2/util/sfx.xml
+++ b/sfx2/util/sfx.xml
diff --git a/sfx2/workben/custompanel/CalcWindowState.xcu b/sfx2/workben/custompanel/CalcWindowState.xcu
index 17629c0bf6..17629c0bf6 100644..100755
--- a/sfx2/workben/custompanel/CalcWindowState.xcu
+++ b/sfx2/workben/custompanel/CalcWindowState.xcu
diff --git a/sfx2/workben/custompanel/DrawWindowState.xcu b/sfx2/workben/custompanel/DrawWindowState.xcu
index 6037a3f5a0..6037a3f5a0 100644..100755
--- a/sfx2/workben/custompanel/DrawWindowState.xcu
+++ b/sfx2/workben/custompanel/DrawWindowState.xcu
diff --git a/sfx2/workben/custompanel/Factories.xcu b/sfx2/workben/custompanel/Factories.xcu
index f8df23e9f4..f8df23e9f4 100644..100755
--- a/sfx2/workben/custompanel/Factories.xcu
+++ b/sfx2/workben/custompanel/Factories.xcu
diff --git a/sfx2/workben/custompanel/ImpressWindowState.xcu b/sfx2/workben/custompanel/ImpressWindowState.xcu
index a8fea859bb..a8fea859bb 100644..100755
--- a/sfx2/workben/custompanel/ImpressWindowState.xcu
+++ b/sfx2/workben/custompanel/ImpressWindowState.xcu
diff --git a/sfx2/workben/custompanel/WriterWindowState.xcu b/sfx2/workben/custompanel/WriterWindowState.xcu
index 248a2e14a3..248a2e14a3 100644..100755
--- a/sfx2/workben/custompanel/WriterWindowState.xcu
+++ b/sfx2/workben/custompanel/WriterWindowState.xcu
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx
index 419671da51..419671da51 100644..100755
--- a/sfx2/workben/custompanel/ctp_factory.cxx
+++ b/sfx2/workben/custompanel/ctp_factory.cxx
diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx
index be6507d91a..be6507d91a 100644..100755
--- a/sfx2/workben/custompanel/ctp_factory.hxx
+++ b/sfx2/workben/custompanel/ctp_factory.hxx
diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx
index be82c1ceb0..be82c1ceb0 100644..100755
--- a/sfx2/workben/custompanel/ctp_panel.cxx
+++ b/sfx2/workben/custompanel/ctp_panel.cxx
diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx
index 03a511c9e1..03a511c9e1 100644..100755
--- a/sfx2/workben/custompanel/ctp_panel.hxx
+++ b/sfx2/workben/custompanel/ctp_panel.hxx
diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx
index 20c65d7aa0..20c65d7aa0 100644..100755
--- a/sfx2/workben/custompanel/ctp_services.cxx
+++ b/sfx2/workben/custompanel/ctp_services.cxx
diff --git a/sfx2/workben/custompanel/delzip b/sfx2/workben/custompanel/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/sfx2/workben/custompanel/delzip
+++ b/sfx2/workben/custompanel/delzip
diff --git a/sfx2/workben/custompanel/description.xml b/sfx2/workben/custompanel/description.xml
index a90aa73a77..a90aa73a77 100644..100755
--- a/sfx2/workben/custompanel/description.xml
+++ b/sfx2/workben/custompanel/description.xml
diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk
deleted file mode 100644
index 20780a0655..0000000000
--- a/sfx2/workben/custompanel/makefile.mk
+++ /dev/null
@@ -1,120 +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=sfx2
-
-TARGET=custompanel
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-EXTENSIONNAME:=custom-tool-panel
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#-------------------------------------------------------------------
-
-#---- extension version
-EXTENSION_VERSION_BASE=0.1
-.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
-
-#---- extension title package name
-EXTENSION_TITLE=Custom Tool Panel Example
-EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l)
-
-#--------------------------------------------------
-
-SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
-LIB1TARGET=$(SLB)/$(SHL1TARGET).lib
-LIB1OBJFILES= \
-        $(SLO)/ctp_factory.obj \
-        $(SLO)/ctp_services.obj \
-        $(SLO)/ctp_panel.obj
-
-SHL1STDLIBS= \
-        $(CPPULIB)          \
-        $(SALLIB)           \
-        $(SALHELPERLIB)     \
-        $(CPPUHELPERLIB)
-
-SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/component.map
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)/$(SHL1TARGET).def
-SHL1RPATH=  OXT
-DEF1NAME=	$(SHL1TARGET)
-
-# create Extension -----------------------------
-
-COMPONENT_CONFIGDEST=.
-
-COMPONENT_XCU = \
-    $(EXTENSIONDIR)/WriterWindowState.xcu \
-    $(EXTENSIONDIR)/CalcWindowState.xcu \
-    $(EXTENSIONDIR)/DrawWindowState.xcu \
-    $(EXTENSIONDIR)/ImpressWindowState.xcu \
-    $(EXTENSIONDIR)/Factories.xcu
-
-COMPONENT_LIBRARIES = \
-        $(EXTENSIONDIR)/$(SHL1TARGET)$(DLLPOST)
-
-COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)/panel.png
-
-# ........ dependencies for packaging the extension ........
-EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_XCU) $(COMPONENT_LIBRARIES) $(COMPONENT_IMAGES)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-$(EXTENSIONDIR)/%.png : ./%.png
-    @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
-
-$(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu
-
-$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu
-
-$(EXTENSIONDIR)/DrawWindowState.xcu: ./DrawWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./DrawWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/DrawWindowState.xcu
-
-$(EXTENSIONDIR)/ImpressWindowState.xcu: ./ImpressWindowState.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(TYPE) ./ImpressWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/ImpressWindowState.xcu
-
diff --git a/sfx2/workben/custompanel/manifest.xml b/sfx2/workben/custompanel/manifest.xml
index 9122d16a41..9122d16a41 100644..100755
--- a/sfx2/workben/custompanel/manifest.xml
+++ b/sfx2/workben/custompanel/manifest.xml
diff --git a/sfx2/workben/custompanel/panel.png b/sfx2/workben/custompanel/panel.png
index 2438714af8..2438714af8 100644..100755
--- a/sfx2/workben/custompanel/panel.png
+++ b/sfx2/workben/custompanel/panel.png
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index 24bdeb5efb..24bdeb5efb 100644..100755
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx
index 7263f5c225..7263f5c225 100644..100755
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/internal/columninfo.hxx
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 873c6582e1..873c6582e1 100644..100755
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index bb44910323..bb44910323 100644..100755
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx
index b9d0795237..b9d0795237 100644..100755
--- a/shell/inc/internal/dbgmacros.hxx
+++ b/shell/inc/internal/dbgmacros.hxx
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index f60769c671..f60769c671 100644..100755
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index 68f0d2e270..68f0d2e270 100644..100755
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx
index a5d6d419c1..a5d6d419c1 100644..100755
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/internal/i_xml_parser_event_handler.hxx
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx
index 16c72d88fb..16c72d88fb 100644..100755
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/internal/infotips.hxx
diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx
index f10a3ccd27..f10a3ccd27 100644..100755
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/internal/iso8601_converter.hxx
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index aad1437e09..aad1437e09 100644..100755
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx
index 842d6dabd4..842d6dabd4 100644..100755
--- a/shell/inc/internal/propertyhdl.hxx
+++ b/shell/inc/internal/propertyhdl.hxx
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index 28b79d08a7..28b79d08a7 100644..100755
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx
index 623ec5fcbf..623ec5fcbf 100644..100755
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/internal/registry.hxx
diff --git a/shell/inc/internal/resource.h b/shell/inc/internal/resource.h
index d9426185b6..d9426185b6 100644..100755
--- a/shell/inc/internal/resource.h
+++ b/shell/inc/internal/resource.h
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx
index 3b15cbcf78..3b15cbcf78 100644..100755
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/internal/shlxthdl.hxx
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx
index 41a328b71d..41a328b71d 100644..100755
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/internal/stream_helper.hxx
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index c33b6cca5c..c33b6cca5c 100644..100755
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index c23fbd3647..c23fbd3647 100644..100755
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index f5b581ef7b..d9b1978a25 100644..100755
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -85,6 +85,12 @@ bool HasOnlySpaces(const std::wstring& String);
         Windows Locale Identifier corresponding to input LocaleSet.
 */
 
+//---------------------------------
+/** Convert a long path name using Windows api call GetShortPathName
+*/
+std::wstring getShortPathName( const std::wstring& aLongName );
+
+
 #ifndef OS2
 LCID LocaleSetToLCID( const LocaleSet_t & Locale );
 #endif
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index d721631296..d721631296 100644..100755
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 5536740aba..5536740aba 100644..100755
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h
index 797a12f7d7..797a12f7d7 100644..100755
--- a/shell/inc/kde_headers.h
+++ b/shell/inc/kde_headers.h
diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk
index c297cb4f77..c297cb4f77 100644..100755
--- a/shell/inc/makefile.mk
+++ b/shell/inc/makefile.mk
diff --git a/shell/inc/pch/precompiled_shell.cxx b/shell/inc/pch/precompiled_shell.cxx
index e06f0e972c..e06f0e972c 100644..100755
--- a/shell/inc/pch/precompiled_shell.cxx
+++ b/shell/inc/pch/precompiled_shell.cxx
diff --git a/shell/inc/pch/precompiled_shell.hxx b/shell/inc/pch/precompiled_shell.hxx
index e6a23b848d..e6a23b848d 100644..100755
--- a/shell/inc/pch/precompiled_shell.hxx
+++ b/shell/inc/pch/precompiled_shell.hxx
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 9a5bf35dde..abf9af0c0c 100755
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,4 +1,4 @@
-sl    shell	:    l10n offuh rdbmaker tools sal EXPAT:expat NULL
+sl    shell	:    L10N:l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
 sl    shell\inc			                           nmake   -   all sl_inc NULL
 sl    shell\source\win32                           nmake   -   w   sl_win32 sl_inc NULL
 sl    shell\source\win32\simplemail                nmake   -   w   sl_win32_simplemail sl_inc NULL
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index ea8be0bbaf..3ef183dbdf 100644..100755
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -10,6 +10,7 @@
 ..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\misc\cmdmail.component %_DEST%\xml%_EXT%\cmdmail.component
 
 ..\%__SRC%\bin\open-url %_DEST%\bin%_EXT%\open-url
 ..\%__SRC%\bin\cde-open-url %_DEST%\bin%_EXT%\cde-open-url
@@ -21,5 +22,13 @@
 
 ..\%__SRC%\misc\*.xml %_DEST%\xml%_EXT%\*.xml
 
-..\%__SRC%\misc\*-ucd.txt  %_DEST%\bin%_EXT%\*-ucd.txt
+..\%__SRC%\misc\desktopbe1.component  %_DEST%\xml%_EXT%\desktopbe1.component
+..\%__SRC%\misc\gconfbe1.component  %_DEST%\xml%_EXT%\gconfbe1.component
+..\%__SRC%\misc\kde4be1.component  %_DEST%\xml%_EXT%\kde4be1.component
+..\%__SRC%\misc\kdebe1.component  %_DEST%\xml%_EXT%\kdebe1.component
 ..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h
+..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component
+..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component
+..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component
+..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component
+..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component
diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx
index 18a1037cce..18a1037cce 100644..100755
--- a/shell/qa/i_xml_parser_event_handler.hxx
+++ b/shell/qa/i_xml_parser_event_handler.hxx
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk
index 30b0bd1869..1420d3881d 100755
--- a/shell/qa/makefile.mk
+++ b/shell/qa/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..
 
 PRJNAME=shell
 TARGET=qa
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index cbcf3e35cf..cbcf3e35cf 100644..100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
diff --git a/shell/source/all/ooofilereader/autostyletag.cxx b/shell/source/all/ooofilereader/autostyletag.cxx
index 6bee41fff1..6bee41fff1 100644..100755
--- a/shell/source/all/ooofilereader/autostyletag.cxx
+++ b/shell/source/all/ooofilereader/autostyletag.cxx
diff --git a/shell/source/all/ooofilereader/autostyletag.hxx b/shell/source/all/ooofilereader/autostyletag.hxx
index a6374d9d62..a6374d9d62 100644..100755
--- a/shell/source/all/ooofilereader/autostyletag.hxx
+++ b/shell/source/all/ooofilereader/autostyletag.hxx
diff --git a/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx
index fd0c6074ad..fd0c6074ad 100644..100755
--- a/shell/source/all/ooofilereader/basereader.cxx
+++ b/shell/source/all/ooofilereader/basereader.cxx
diff --git a/shell/source/all/ooofilereader/contentreader.cxx b/shell/source/all/ooofilereader/contentreader.cxx
index 14ca0f34a7..14ca0f34a7 100644..100755
--- a/shell/source/all/ooofilereader/contentreader.cxx
+++ b/shell/source/all/ooofilereader/contentreader.cxx
diff --git a/shell/source/all/ooofilereader/dummytag.hxx b/shell/source/all/ooofilereader/dummytag.hxx
index 5edcb453e3..5edcb453e3 100644..100755
--- a/shell/source/all/ooofilereader/dummytag.hxx
+++ b/shell/source/all/ooofilereader/dummytag.hxx
diff --git a/shell/source/all/ooofilereader/itag.hxx b/shell/source/all/ooofilereader/itag.hxx
index 3f31436b7a..3f31436b7a 100644..100755
--- a/shell/source/all/ooofilereader/itag.hxx
+++ b/shell/source/all/ooofilereader/itag.hxx
diff --git a/shell/source/all/ooofilereader/keywordstag.cxx b/shell/source/all/ooofilereader/keywordstag.cxx
index ecb58b257e..ecb58b257e 100644..100755
--- a/shell/source/all/ooofilereader/keywordstag.cxx
+++ b/shell/source/all/ooofilereader/keywordstag.cxx
diff --git a/shell/source/all/ooofilereader/keywordstag.hxx b/shell/source/all/ooofilereader/keywordstag.hxx
index 41b44877e0..41b44877e0 100644..100755
--- a/shell/source/all/ooofilereader/keywordstag.hxx
+++ b/shell/source/all/ooofilereader/keywordstag.hxx
diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index bf6365526e..bf6365526e 100644..100755
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx
index eb0d0c5343..eb0d0c5343 100644..100755
--- a/shell/source/all/ooofilereader/metainforeader.cxx
+++ b/shell/source/all/ooofilereader/metainforeader.cxx
diff --git a/shell/source/all/ooofilereader/simpletag.cxx b/shell/source/all/ooofilereader/simpletag.cxx
index 9972a18455..9972a18455 100644..100755
--- a/shell/source/all/ooofilereader/simpletag.cxx
+++ b/shell/source/all/ooofilereader/simpletag.cxx
diff --git a/shell/source/all/ooofilereader/simpletag.hxx b/shell/source/all/ooofilereader/simpletag.hxx
index e0f0c2ebaf..e0f0c2ebaf 100644..100755
--- a/shell/source/all/ooofilereader/simpletag.hxx
+++ b/shell/source/all/ooofilereader/simpletag.hxx
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index c2712b2189..c2712b2189 100644..100755
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
diff --git a/shell/source/all/zipfile/makefile.mk b/shell/source/all/zipfile/makefile.mk
index 4e0af28910..4e0af28910 100644..100755
--- a/shell/source/all/zipfile/makefile.mk
+++ b/shell/source/all/zipfile/makefile.mk
diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx
index f9d985ce68..f9d985ce68 100644..100755
--- a/shell/source/all/zipfile/zipexcptn.cxx
+++ b/shell/source/all/zipfile/zipexcptn.cxx
diff --git a/shell/source/all/zipfile/zipexcptn.hxx b/shell/source/all/zipfile/zipexcptn.hxx
index a668105a93..a668105a93 100644..100755
--- a/shell/source/all/zipfile/zipexcptn.hxx
+++ b/shell/source/all/zipfile/zipexcptn.hxx
diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx
index 14941f90ca..14941f90ca 100644..100755
--- a/shell/source/all/zipfile/zipfile.cxx
+++ b/shell/source/all/zipfile/zipfile.cxx
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index faf31f9d7c..61f37d9eef 100644..100755
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -284,10 +284,5 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
-}
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/shell/source/backends/desktopbe/desktopbe1-ucd.txt b/shell/source/backends/desktopbe/desktopbe1-ucd.txt
deleted file mode 100644
index fd874a82ea..0000000000
--- a/shell/source/backends/desktopbe/desktopbe1-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.configuration.backend.DesktopBackend
-ComponentName=desktopbe1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.configuration.backend.DesktopBackend
diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component
new file mode 100755
index 0000000000..9ef1421076
--- /dev/null
+++ b/shell/source/backends/desktopbe/desktopbe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend">
+    <service name="com.sun.star.configuration.backend.DesktopBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk
index 29260821d5..66ad8cf99e 100644..100755
--- a/shell/source/backends/desktopbe/makefile.mk
+++ b/shell/source/backends/desktopbe/makefile.mk
@@ -48,6 +48,12 @@ SHL1TARGET = desktopbe1.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
-UNIXTEXT = $(MISC)/desktopbe1-ucd.txt
-
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/desktopbe1.component
+
+$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        desktopbe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 2613680b3b..2613680b3b 100644..100755
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
index 6c45ef5497..6c45ef5497 100644..100755
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 70e39f3987..711f41dc7d 100644..100755
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -235,10 +235,5 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
-}
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/shell/source/backends/gconfbe/gconfbe1-ucd.txt b/shell/source/backends/gconfbe/gconfbe1-ucd.txt
deleted file mode 100644
index daa5444ff0..0000000000
--- a/shell/source/backends/gconfbe/gconfbe1-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.configuration.backend.GconfBackend
-ComponentName=gconfbe1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.configuration.backend.GconfBackend
diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component
new file mode 100755
index 0000000000..7638e05b54
--- /dev/null
+++ b/shell/source/backends/gconfbe/gconfbe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.GconfBackend">
+    <service name="com.sun.star.configuration.backend.GconfBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
index a8d9b23aa9..9e77a0867a 100644..100755
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -39,7 +39,6 @@ VISIBILITY_HIDDEN=TRUE
 
 # no "lib" prefix
 DLLPRE =
-UCDSRCEXT = txt
 
 .IF "$(ENABLE_LOCKDOWN)" == "YES"
 CFLAGS+=-DENABLE_LOCKDOWN
@@ -89,8 +88,10 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
-ALLTAR : $(MISC)/$(TARGET)1-ucd.txt
-
-$(MISC)/$(TARGET)1-ucd.txt : $$(@:b).$(UCDSRCEXT)
-    cat $< | tr -d "\015" > $@
+ALLTAR : $(MISC)/gconfbe1.component
 
+$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        gconfbe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component
diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h
index 6da8690a33..6da8690a33 100644..100755
--- a/shell/source/backends/gconfbe/orbit.h
+++ b/shell/source/backends/gconfbe/orbit.h
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 03ffb03ed2..03ffb03ed2 100644..100755
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx
index 4b6f405b8b..4b6f405b8b 100644..100755
--- a/shell/source/backends/kde4be/kde4access.hxx
+++ b/shell/source/backends/kde4be/kde4access.hxx
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 7206191034..706785c50e 100644..100755
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -252,10 +252,5 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
-}
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/shell/source/backends/kde4be/kde4be1-ucd.txt b/shell/source/backends/kde4be/kde4be1-ucd.txt
deleted file mode 100644
index 9671199b26..0000000000
--- a/shell/source/backends/kde4be/kde4be1-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.configuration.backend.KDE4Backend
-ComponentName=kde4be1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.configuration.backend.KDE4Backend
diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component
new file mode 100755
index 0000000000..8ea7ae1210
--- /dev/null
+++ b/shell/source/backends/kde4be/kde4be1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend">
+    <service name="com.sun.star.configuration.backend.KDE4Backend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk
index 1f9093a95a..477e47ca61 100644..100755
--- a/shell/source/backends/kde4be/makefile.mk
+++ b/shell/source/backends/kde4be/makefile.mk
@@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE
 CFLAGSCXX+=-Wno-shadow
 .ENDIF
 
-UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt
-
 # no "lib" prefix
 DLLPRE =
 
@@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ---
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/kde4be1.component
+
+$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        kde4be1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt kde4be1.component
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
index 22f110be96..22f110be96 100644..100755
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/backends/kdebe/kdeaccess.hxx
index 76a4b85447..76a4b85447 100644..100755
--- a/shell/source/backends/kdebe/kdeaccess.hxx
+++ b/shell/source/backends/kdebe/kdeaccess.hxx
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index f13247ea2f..0c374460a2 100644..100755
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -252,10 +252,5 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey)
-{
-    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
-}
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/shell/source/backends/kdebe/kdebe1-ucd.txt b/shell/source/backends/kdebe/kdebe1-ucd.txt
deleted file mode 100644
index adf7e17431..0000000000
--- a/shell/source/backends/kdebe/kdebe1-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.configuration.backend.KDEBackend
-ComponentName=kdebe1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.configuration.backend.KDEBackend
diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component
new file mode 100755
index 0000000000..393fbc80d5
--- /dev/null
+++ b/shell/source/backends/kdebe/kdebe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.KDEBackend">
+    <service name="com.sun.star.configuration.backend.KDEBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
index 31bf77b47b..b1b12ad3c6 100644..100755
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
@@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE
 CFLAGSCXX+=-Wno-shadow
 .ENDIF
 
-UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt
-
 # no "lib" prefix
 DLLPRE =
 
@@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ---
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/kdebe1.component
+
+$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        kdebe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt kdebe1.component
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 13625c5045..13625c5045 100644..100755
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index db109a45f8..db109a45f8 100644..100755
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml
index fe641db7fc..fe641db7fc 100644..100755
--- a/shell/source/backends/localebe/localebe.xml
+++ b/shell/source/backends/localebe/localebe.xml
diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component
new file mode 100755
index 0000000000..7236a61982
--- /dev/null
+++ b/shell/source/backends/localebe/localebe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend">
+    <service name="com.sun.star.configuration.backend.LocaleBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index d554a308d4..6afbaf4c62 100644..100755
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -71,13 +71,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
-    return cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, kImplementations_entries);
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *component_getFactory( const sal_Char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk
index bd12bcdb28..1efe3ed5e4 100644..100755
--- a/shell/source/backends/localebe/makefile.mk
+++ b/shell/source/backends/localebe/makefile.mk
@@ -70,3 +70,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/localebe1.component
+
+$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        localebe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt localebe1.component
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 8d523ff6d3..8d523ff6d3 100644..100755
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index d43aeb7124..d43aeb7124 100644..100755
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
diff --git a/shell/source/backends/macbe/macbe.xml b/shell/source/backends/macbe/macbe.xml
index 7cee5bb14d..7cee5bb14d 100644..100755
--- a/shell/source/backends/macbe/macbe.xml
+++ b/shell/source/backends/macbe/macbe.xml
diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component
new file mode 100755
index 0000000000..10bac2e2b6
--- /dev/null
+++ b/shell/source/backends/macbe/macbe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend">
+    <service name="com.sun.star.configuration.backend.MacOSXBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index 1c130be5f0..8789d228e0 100644..100755
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
-    return cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, kImplementations_entries);
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey)
 {
 
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index c3a58ec9f5..dd20834b26 100644..100755
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
@@ -76,3 +76,11 @@ DEF1NAME=$(SHL1TARGET)
 .INCLUDE : target.mk
 
 .ENDIF # "$(OS)" != "MACOSX"
+
+ALLTAR : $(MISC)/macbe1.component
+
+$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        macbe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt macbe1.component
diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk
index 9f79fa706f..7d8a6be14b 100644..100755
--- a/shell/source/backends/wininetbe/makefile.mk
+++ b/shell/source/backends/wininetbe/makefile.mk
@@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/wininetbe1.component
+
+$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        wininetbe1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 5a32183c01..5a32183c01 100644..100755
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 04254336af..04254336af 100644..100755
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml
index 070ac5111a..070ac5111a 100644..100755
--- a/shell/source/backends/wininetbe/wininetbe.xml
+++ b/shell/source/backends/wininetbe/wininetbe.xml
diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component
new file mode 100755
index 0000000000..d8930280fb
--- /dev/null
+++ b/shell/source/backends/wininetbe/wininetbe1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend">
+    <service name="com.sun.star.configuration.backend.WinInetBackend"/>
+  </implementation>
+</component>
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 103fdef325..2d043c7ca6 100644..100755
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
-    return cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, kImplementations_entries);
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *component_getFactory( const sal_Char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component
new file mode 100755
index 0000000000..7e56741d16
--- /dev/null
+++ b/shell/source/cmdmail/cmdmail.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.system.SimpleCommandMail">
+    <service name="com.sun.star.system.SimpleCommandMail"/>
+  </implementation>
+</component>
diff --git a/shell/source/cmdmail/cmdmail.xml b/shell/source/cmdmail/cmdmail.xml
index a006713f76..a006713f76 100644..100755
--- a/shell/source/cmdmail/cmdmail.xml
+++ b/shell/source/cmdmail/cmdmail.xml
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 036d15763e..3bb7f4fced 100644..100755
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -55,7 +55,6 @@ using com::sun::star::system::XSimpleMailClientSupplier;
 
 #define COMP_SERVICE_NAME  "com.sun.star.system.SimpleCommandMail"
 #define COMP_IMPL_NAME     "com.sun.star.comp.system.SimpleCommandMail"
-#define COMP_REGKEY_NAME   "/com.sun.star.comp.system.SimpleCommandMail/UNO/SERVICES/com.sun.star.system.SimpleCommandMail"
 
 //-----------------------------------------------------------------------
 // 
@@ -86,29 +85,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
-            pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME ) ) );
-            return sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
-        }
-    }
-
-    return sal_False;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 //----------------------------------------------------------------------
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index ffc7b569ef..ffc7b569ef 100644..100755
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index 17857c239e..17857c239e 100644..100755
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 6deaba3e1c..6deaba3e1c 100644..100755
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 2c789da969..2c789da969 100644..100755
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
index 028ac41759..f0e1c69934 100644..100755
--- a/shell/source/cmdmail/exports.dxp
+++ b/shell/source/cmdmail/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo	
 component_getFactory
diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index 5781afe8f5..e4d5ec48b9 100644..100755
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
@@ -62,3 +62,10 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+ALLTAR : $(MISC)/cmdmail.component
+
+$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        cmdmail.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt cmdmail.component
diff --git a/shell/source/mingw_intel.map b/shell/source/mingw_intel.map
index 7713d456ab..7713d456ab 100644..100755
--- a/shell/source/mingw_intel.map
+++ b/shell/source/mingw_intel.map
diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx
index b687a62e34..b687a62e34 100644..100755
--- a/shell/source/tools/lngconvex/cmdline.cxx
+++ b/shell/source/tools/lngconvex/cmdline.cxx
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index 123a7257c2..123a7257c2 100644..100755
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
diff --git a/shell/source/tools/lngconvex/defs.hxx b/shell/source/tools/lngconvex/defs.hxx
index 8b2dbb218c..8b2dbb218c 100644..100755
--- a/shell/source/tools/lngconvex/defs.hxx
+++ b/shell/source/tools/lngconvex/defs.hxx
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index eda00b907d..eda00b907d 100644..100755
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index da28e5ff68..3ee6298e74 100644..100755
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -58,8 +58,8 @@ APP1STDLIBS= $(SALLIB)\
             $(I18NISOLANGLIB)
 
 .IF "$(COM)"!="GCC"
-APP1STDLIBS+= $(TOOLSLIBST) \
-            msvcprt.lib
+APP1STDLIBS+= msvcprt.lib
+#$(TOOLSLIBST) 
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk
index 2eb8dbf484..2eb8dbf484 100644..100755
--- a/shell/source/tools/regsvrex/makefile.mk
+++ b/shell/source/tools/regsvrex/makefile.mk
diff --git a/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index 3f3889a5ef..3f3889a5ef 100644..100755
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 4bf77436f6..1a26d377b1 100644..100755
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -88,3 +88,11 @@ run_test : $(BIN)$/$(TESTAPP1).sh
 $(BIN)$/$(TESTAPP1).sh : $$(@:f)
     $(COPY) $< $@
     -chmod +x $@ 
+
+ALLTAR : $(MISC)/syssh.component
+
+$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        syssh.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt syssh.component
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index b6eb6040cf..b6eb6040cf 100644..100755
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index e58aa9013a..e58aa9013a 100644..100755
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index f77da88986..a9c3d5b828 100644..100755
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -84,29 +84,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//-----------------------------------------------------------------------
-// component_writeInfo
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
-            pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_REGKEY_NAME ) ) );
-            return sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
-    }
-    }
-
-    return sal_False;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 //----------------------------------------------------------------------
diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component
new file mode 100755
index 0000000000..030240dff3
--- /dev/null
+++ b/shell/source/unix/exec/syssh.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.system.SystemShellExecute">
+    <service name="com.sun.star.system.SystemShellExecute"/>
+  </implementation>
+</component>
diff --git a/shell/source/unix/exec/syssh.xml b/shell/source/unix/exec/syssh.xml
index 60d90d0826..60d90d0826 100644..100755
--- a/shell/source/unix/exec/syssh.xml
+++ b/shell/source/unix/exec/syssh.xml
diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx
index 7c1038bf9d..7c1038bf9d 100644..100755
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
diff --git a/shell/source/unix/exec/urltest.sh b/shell/source/unix/exec/urltest.sh
index ce55ee6941..ce55ee6941 100644..100755
--- a/shell/source/unix/exec/urltest.sh
+++ b/shell/source/unix/exec/urltest.sh
diff --git a/shell/source/unix/exec/urltest.txt b/shell/source/unix/exec/urltest.txt
index e69a8cfaf9..e69a8cfaf9 100644..100755
--- a/shell/source/unix/exec/urltest.txt
+++ b/shell/source/unix/exec/urltest.txt
diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c
index 0c3058da7c..0c3058da7c 100644..100755
--- a/shell/source/unix/misc/gnome-open-url.c
+++ b/shell/source/unix/misc/gnome-open-url.c
diff --git a/shell/source/unix/misc/gnome-open-url.sh b/shell/source/unix/misc/gnome-open-url.sh
index ab730d169a..ab730d169a 100644..100755
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ b/shell/source/unix/misc/gnome-open-url.sh
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 6ad3797e65..6ad3797e65 100644..100755
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
diff --git a/shell/source/unix/misc/open-url.c b/shell/source/unix/misc/open-url.c
index 2b80929395..2b80929395 100644..100755
--- a/shell/source/unix/misc/open-url.c
+++ b/shell/source/unix/misc/open-url.c
diff --git a/shell/source/unix/misc/open-url.def b/shell/source/unix/misc/open-url.def
index 3a26831e2a..3a26831e2a 100644..100755
--- a/shell/source/unix/misc/open-url.def
+++ b/shell/source/unix/misc/open-url.def
diff --git a/shell/source/unix/misc/senddoc.c b/shell/source/unix/misc/senddoc.c
index aa595a67da..aa595a67da 100644..100755
--- a/shell/source/unix/misc/senddoc.c
+++ b/shell/source/unix/misc/senddoc.c
diff --git a/shell/source/unix/misc/senddoc.def b/shell/source/unix/misc/senddoc.def
index 0abf1553a4..0abf1553a4 100644..100755
--- a/shell/source/unix/misc/senddoc.def
+++ b/shell/source/unix/misc/senddoc.def
diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
index fb5c0ced86..fb5c0ced86 100644..100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
diff --git a/shell/source/unix/misc/uri-encode.c b/shell/source/unix/misc/uri-encode.c
index 4c1ab9ad20..4c1ab9ad20 100644..100755
--- a/shell/source/unix/misc/uri-encode.c
+++ b/shell/source/unix/misc/uri-encode.c
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 2656fdb855..2656fdb855 100644..100755
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 4638fd3c07..4638fd3c07 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index f4f5265bb4..f4f5265bb4 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index c144dbbda5..c144dbbda5 100644..100755
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 620d98f0f0..620d98f0f0 100644..100755
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 928d519bf8..928d519bf8 100644..100755
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index f598ff28da..ea0e547475 100644..100755
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -86,32 +86,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine";
 }
 
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
-            pXNewKey->createKey( 
-                OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_REGKEY_NAME )) );
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
index 028ac41759..f0e1c69934 100644..100755
--- a/shell/source/win32/exports.dxp
+++ b/shell/source/win32/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo	
 component_getFactory
diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index 9a9564ed76..7a01eefed8 100644..100755
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -67,3 +67,11 @@ DEF1EXPORTFILE=	exports.dxp
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
 .EXPORT : INCLUDE
 
+
+ALLTAR : $(MISC)/syssh.component
+
+$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        syssh.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt syssh.component
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index 3c7dcc1369..3c7dcc1369 100644..100755
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index 28f5c38eb1..28f5c38eb1 100644..100755
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 10bf0793aa..643ba26338 100644..100755
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -154,14 +154,15 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO
 // 
 //-----------------------------
 
- HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
+HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
 {
     if (IsOOFileExtension(pscd->pwszExt))
     {
         try
         {
+            std::wstring fname = getShortPathName( std::wstring( pscd->wszFile ) );
 
-            CMetaInfoReader meta_info_accessor(WStringToString(pscd->wszFile));
+            CMetaInfoReader meta_info_accessor(WStringToString(fname));
             
             VariantClear(pvarData);
 
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 868a711e00..868a711e00 100644..100755
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp
index 953039ccc9..953039ccc9 100644..100755
--- a/shell/source/win32/shlxthandler/exports.dxp
+++ b/shell/source/win32/shlxthandler/exports.dxp
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index b5a2e24ca1..73eea7c1b5 100644..100755
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -353,14 +353,16 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/
     std::wstring::iterator end   = fname.end();
 
     m_FileNameOnly = std::wstring(begin, end);
-    
+
+    fname = getShortPathName( fname );
+
     std::string fnameA = WStringToString(fname);
 
     // #115531#
     // ZeroMemory because strncpy doesn't '\0'-terminates the destination
     // string; reserve the last place in the buffer for the final '\0' 
     // that's why '(sizeof(m_szFileName) - 1)'
-    ZeroMemory(m_szFileName, sizeof(m_szFileName));    
+    ZeroMemory(m_szFileName, sizeof(m_szFileName));
     strncpy(m_szFileName, fnameA.c_str(), (sizeof(m_szFileName) - 1));
 
     return S_OK;
diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index f69f2cf2fd..f69f2cf2fd 100644..100755
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index fdaa1c43d9..fdaa1c43d9 100644..100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
index 953039ccc9..953039ccc9 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp
+++ b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index fd1bc503cc..fd1bc503cc 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 9762516e4b..c879db7e5c 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -657,7 +657,8 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty()
 SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/)
 {
     // Load just sets the filename for GetChunk to read and ignores the mode
-    m_pwszFileName = pszFileName;
+    m_pwszFileName = getShortPathName( pszFileName );
+
     // Open the file previously specified in call to IPersistFile::Load and get content.
     try
     {
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index 78811f3694..78811f3694 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index 019415eb15..019415eb15 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index 04943e8d12..04943e8d12 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 819f9d0d01..819f9d0d01 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index dc6d0e1590..dc6d0e1590 100644..100755
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 3563d725a8..d5807b6bad 100644..100755
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -239,14 +239,14 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM
         try
         {
             pMetaInfoReader = new CMetaInfoReader( (void*)pStream, &z_filefunc );
+            LoadProperties( pMetaInfoReader );
+            delete pMetaInfoReader;
         }
         catch (const std::exception& e)
         {
             OutputDebugStringFormat( "CPropertyHdl::Initialize: Caught exception [%s]", e.what() );
             return E_FAIL;
         }
-
-        LoadProperties( pMetaInfoReader );
 /*
     // load extended properties and search content
     _LoadExtendedProperties();
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index f4c6b747fb..f4c6b747fb 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 695d7ea756..695d7ea756 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 02310ec069..02310ec069 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index fbb0010169..fbb0010169 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 55a31c9c59..55a31c9c59 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 648c91c3b0..d3ce8bc922 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -76,7 +76,7 @@ CPropertySheet::CPropertySheet(long RefCnt) :
 //-----------------------------
 
 CPropertySheet::~CPropertySheet()
-{	
+{
     OutputDebugStringFormat("CPropertySheet::DTor [%d], [%d]", m_RefCnt, g_DllRefCnt );
     InterlockedDecrement(&g_DllRefCnt);
 }
@@ -156,13 +156,26 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
             NULL, 
             0))) 
     {
-        DragQueryFileA(
-            reinterpret_cast<HDROP>(medium.hGlobal), 
-            0, 
-            m_szFileName, 
-            sizeof(m_szFileName));
-
-        hr = S_OK;
+        UINT size = DragQueryFile( reinterpret_cast<HDROP>(medium.hGlobal), 0, 0, 0 );
+        if ( size != 0 )
+        {
+            TCHAR * buffer = new TCHAR[ size + 1 ];
+            UINT result_size = DragQueryFile( reinterpret_cast<HDROP>(medium.hGlobal),
+                                              0, buffer, size + 1 );
+            if ( result_size != 0 )
+            {
+                std::wstring fname = getShortPathName( buffer );
+                std::string fnameA = WStringToString( fname );
+                ZeroMemory( m_szFileName, sizeof( m_szFileName ) );
+                strncpy( m_szFileName, fnameA.c_str(), ( sizeof( m_szFileName ) - 1 ) );
+                hr = S_OK;
+            }
+            else
+                hr = E_INVALIDARG;
+            delete [] buffer;
+        }
+        else
+            hr = E_INVALIDARG;
     }
     else
         hr = E_INVALIDARG;
@@ -319,48 +332,54 @@ BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPAR
 //##################################
 void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
 {
-    CMetaInfoReader metaInfo(m_szFileName);
-
-    SetWindowText(GetDlgItem(hwnd,IDC_TITLE),    metaInfo.getTagData( META_INFO_TITLE ).c_str() );
-    SetWindowText(GetDlgItem(hwnd,IDC_AUTHOR),   metaInfo.getTagData( META_INFO_AUTHOR ).c_str() );
-    SetWindowText(GetDlgItem(hwnd,IDC_SUBJECT),  metaInfo.getTagData( META_INFO_SUBJECT ).c_str() );
-    SetWindowText(GetDlgItem(hwnd,IDC_KEYWORDS), metaInfo.getTagData( META_INFO_KEYWORDS ).c_str() );
-
-    // comments read from meta.xml use "\n" for return, but this will not displayable in Edit control, add
-    // "\r" before "\n" to form "\r\n" in order to display return in Edit control.
-    std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION ).c_str();
-    std::wstring::size_type itor = tempStr.find ( L"\n" , 0 );
-    while (itor != std::wstring::npos)
+    try
+    {
+        CMetaInfoReader metaInfo(m_szFileName);
+
+        SetWindowText(GetDlgItem(hwnd,IDC_TITLE),    metaInfo.getTagData( META_INFO_TITLE ).c_str() );
+        SetWindowText(GetDlgItem(hwnd,IDC_AUTHOR),   metaInfo.getTagData( META_INFO_AUTHOR ).c_str() );
+        SetWindowText(GetDlgItem(hwnd,IDC_SUBJECT),  metaInfo.getTagData( META_INFO_SUBJECT ).c_str() );
+        SetWindowText(GetDlgItem(hwnd,IDC_KEYWORDS), metaInfo.getTagData( META_INFO_KEYWORDS ).c_str() );
+
+        // comments read from meta.xml use "\n" for return, but this will not displayable in Edit control, add
+        // "\r" before "\n" to form "\r\n" in order to display return in Edit control.
+        std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION ).c_str();
+        std::wstring::size_type itor = tempStr.find ( L"\n" , 0 );
+        while (itor != std::wstring::npos)
+        {
+            tempStr.insert(itor, L"\r");
+            itor = tempStr.find(L"\n", itor + 2);
+        }
+        SetWindowText(GetDlgItem(hwnd,IDC_COMMENTS), tempStr.c_str());
+    }
+    catch (const std::exception&)
     {
-        tempStr.insert(itor, L"\r");
-        itor = tempStr.find(L"\n", itor + 2);
     }
-    SetWindowText(GetDlgItem(hwnd,IDC_COMMENTS), tempStr.c_str());	
-
 }
 
 //---------------------------------
 /**
 */
 void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
-{	
-    CMetaInfoReader metaInfo(m_szFileName);
-
-    document_statistic_reader_ptr doc_stat_reader = create_document_statistic_reader(m_szFileName, &metaInfo);
-    
-    statistic_group_list_t sgl;
-    doc_stat_reader->read(&sgl);
-    
-    list_view_builder_ptr lv_builder = create_list_view_builder(
-        GetDlgItem(hwnd, IDC_STATISTICSLIST), 
-        GetResString(IDS_PROPERTY), 
-        GetResString(IDS_PROPERTY_VALUE));         
-        
-    lv_builder->build(sgl);  	
-
-}
+{
+    try
+    {
+        CMetaInfoReader metaInfo(m_szFileName);
 
+        document_statistic_reader_ptr doc_stat_reader = create_document_statistic_reader(m_szFileName, &metaInfo);
 
+        statistic_group_list_t sgl;
+        doc_stat_reader->read(&sgl);
 
+        list_view_builder_ptr lv_builder = create_list_view_builder(
+            GetDlgItem(hwnd, IDC_STATISTICSLIST),
+            GetResString(IDS_PROPERTY),
+            GetResString(IDS_PROPERTY_VALUE));         
 
+        lv_builder->build(sgl);
+    }
+    catch (const std::exception&)
+    {
+    }
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/res/ctrylnglist.txt b/shell/source/win32/shlxthandler/res/ctrylnglist.txt
index ec2196e4da..ec2196e4da 100644..100755
--- a/shell/source/win32/shlxthandler/res/ctrylnglist.txt
+++ b/shell/source/win32/shlxthandler/res/ctrylnglist.txt
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index ec05290151..ec05290151 100644..100755
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
diff --git a/shell/source/win32/shlxthandler/res/prop_img.bmp b/shell/source/win32/shlxthandler/res/prop_img.bmp
index 1849a8bb62..1849a8bb62 100644..100755
--- a/shell/source/win32/shlxthandler/res/prop_img.bmp
+++ b/shell/source/win32/shlxthandler/res/prop_img.bmp
diff --git a/shell/source/win32/shlxthandler/res/rcfooter.txt b/shell/source/win32/shlxthandler/res/rcfooter.txt
index ce333b32a1..ce333b32a1 100644..100755
--- a/shell/source/win32/shlxthandler/res/rcfooter.txt
+++ b/shell/source/win32/shlxthandler/res/rcfooter.txt
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt
index fac9fa31f2..fac9fa31f2 100644..100755
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
diff --git a/shell/source/win32/shlxthandler/res/rctmpl.txt b/shell/source/win32/shlxthandler/res/rctmpl.txt
index a512c69dd9..a512c69dd9 100644..100755
--- a/shell/source/win32/shlxthandler/res/rctmpl.txt
+++ b/shell/source/win32/shlxthandler/res/rctmpl.txt
diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
index a785006a96..a785006a96 100644..100755
--- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.ulf b/shell/source/win32/shlxthandler/res/shlxthdl.ulf
index c0e879724e..c0e879724e 100644..100755
--- a/shell/source/win32/shlxthandler/res/shlxthdl.ulf
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.ulf
diff --git a/shell/source/win32/shlxthandler/res/signet.png b/shell/source/win32/shlxthandler/res/signet.png
index bccaaff817..bccaaff817 100644..100755
--- a/shell/source/win32/shlxthandler/res/signet.png
+++ b/shell/source/win32/shlxthandler/res/signet.png
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 1f6e3017d2..1f6e3017d2 100644..100755
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index 01936460fa..01936460fa 100644..100755
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 02975b1dc2..b623e59047 100644..100755
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -366,7 +366,8 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage)
      
     try
     {
-        std::auto_ptr<ZipFile> zipfile(new ZipFile(WStringToString(filename_)));        
+        std::wstring fname = getShortPathName( filename_ );
+        std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );        
         
         if (zipfile->HasContent(THUMBNAIL_CONTENT))
         {                                                             
diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
index 832a8c2164..832a8c2164 100644..100755
--- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx
+++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index b5baed8d96..f51d79eb10 100644..100755
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
+#include "algorithm"
 #include "internal/fileextensions.hxx"
 #include <sal/macros.h>
 
@@ -89,10 +90,18 @@ std::string get_file_name_extension(const std::string& file_name)
 /** Return the type of a file
 */
 
+char easytolower( char in )
+{
+    if( in<='Z' && in>='A' )
+        return in-('Z'-'z');
+    return in;
+}
+
 File_Type_t get_file_type(const std::string& file_name)
 {
     std::string fext = get_file_name_extension(file_name);
-    
+    std::transform(fext.begin(), fext.end(), fext.begin(), easytolower);
+
     if (std::string::npos != WRITER_FILE_EXTENSIONS.find(fext))
         return WRITER;
     else if (std::string::npos != CALC_FILE_EXTENSIONS.find(fext))
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index 4c0fcebb8d..4c0fcebb8d 100644..100755
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index 195bf9fac6..195bf9fac6 100644..100755
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/util/makefile.mk
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index f2b2bdbf44..f2b2bdbf44 100644..100755
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 626fc80a6a..703d448192 100644..100755
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -149,6 +149,28 @@ bool HasOnlySpaces(const std::wstring& String)
     return true;
 }
 
+//---------------------------------
+/** helper function to convert windows pathes to short form.
+    @returns
+        shortend path.
+*/
+
+std::wstring getShortPathName( const std::wstring& aLongName )
+{
+    std::wstring shortName = aLongName;
+    long         length    = GetShortPathName( aLongName.c_str(), NULL, 0 );
+
+    if ( length != 0 )
+    {
+        TCHAR* buffer = new TCHAR[ length+1 ];
+        length = GetShortPathName( aLongName.c_str(), buffer, length );
+        if ( length != 0 )
+            shortName = std::wstring( buffer );
+        delete [] buffer;
+    }
+    return shortName;
+}
+
 /** convert LocaleSet pair into Microsoft List of Locale ID (LCID) 
     according to ISO-639 and ISO-3166.
     http://etext.lib.virginia.edu/tei/iso639.html
diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp
index 028ac41759..f0e1c69934 100644..100755
--- a/shell/source/win32/simplemail/exports.dxp
+++ b/shell/source/win32/simplemail/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo	
 component_getFactory
diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index 84a209e4c0..abd35e408e 100644..100755
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
@@ -77,3 +77,11 @@ APP1DEF=$(MISC)$/$(APP1TARGET).def
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/smplmail.component
+
+$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        smplmail.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt smplmail.component
diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 93e6d36acf..8097c70ab3 100644..100755
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -183,7 +183,7 @@ void initMapiMessage(
     }
     pMapiMessage->lpszNoteText = (gBody.length() ? const_cast<char*>(gBody.c_str()) : NULL);
     pMapiMessage->lpOriginator = aMapiOriginator;       
-    pMapiMessage->lpRecips = &aMapiRecipientList[0];
+    pMapiMessage->lpRecips = aMapiRecipientList.size() ? &aMapiRecipientList[0] : 0;
     pMapiMessage->nRecipCount = aMapiRecipientList.size();    
     pMapiMessage->lpFiles = &aMapiAttachmentList[0];
     pMapiMessage->nFileCount = aMapiAttachmentList.size();                    
diff --git a/shell/source/win32/simplemail/simplemapi.cxx b/shell/source/win32/simplemail/simplemapi.cxx
index d4fad7fc9b..d4fad7fc9b 100644..100755
--- a/shell/source/win32/simplemail/simplemapi.cxx
+++ b/shell/source/win32/simplemail/simplemapi.cxx
diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx
index d47b0882b1..d47b0882b1 100644..100755
--- a/shell/source/win32/simplemail/simplemapi.hxx
+++ b/shell/source/win32/simplemail/simplemapi.hxx
diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component
new file mode 100755
index 0000000000..59246c6d15
--- /dev/null
+++ b/shell/source/win32/simplemail/smplmail.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.system.SimpleSystemMail">
+    <service name="com.sun.star.system.SimpleSystemMail"/>
+  </implementation>
+</component>
diff --git a/shell/source/win32/simplemail/smplmail.xml b/shell/source/win32/simplemail/smplmail.xml
index 5b3617f3c6..5b3617f3c6 100644..100755
--- a/shell/source/win32/simplemail/smplmail.xml
+++ b/shell/source/win32/simplemail/smplmail.xml
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 21eac5b12a..21eac5b12a 100644..100755
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 9a403b57aa..9a403b57aa 100644..100755
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 6244fb98c6..b3dbaed324 100644..100755
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -86,32 +86,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//-----------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------
-
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRetVal = sal_True;
-
-    if ( pRegistryKey )
-    {
-        try
-        {
-            Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );							
-            pXNewKey->createKey( 
-                OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME )) );
-        }
-        catch( InvalidRegistryException& )
-        {			
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");			
-            bRetVal = sal_False;
-        }
-    }
-
-    return bRetVal;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index e934a7aded..e934a7aded 100644..100755
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index d95d686cef..d95d686cef 100644..100755
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index e9ccfa3e45..e9ccfa3e45 100644..100755
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 0261b9d0d9..0261b9d0d9 100644..100755
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
diff --git a/shell/source/win32/syssh.component b/shell/source/win32/syssh.component
new file mode 100755
index 0000000000..1e783f5221
--- /dev/null
+++ b/shell/source/win32/syssh.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.system.SystemShellExecute">
+    <service name="com.sun.star.system.SystemShellExecute"/>
+  </implementation>
+</component>
diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml
index 964d08721f..964d08721f 100644..100755
--- a/shell/source/win32/syssh.xml
+++ b/shell/source/win32/syssh.xml
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index e65deece1e..e65deece1e 100644..100755
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 09f11925c2..09f11925c2 100644..100755
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 797947e1cd..797947e1cd 100644..100755
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk
index 9d9c7945b9..9d9c7945b9 100644..100755
--- a/shell/source/win32/workbench/makefile.mk
+++ b/shell/source/win32/workbench/makefile.mk
diff --git a/framework/inc/makefile.mk b/svx/AllLangResTarget_about.mk
index e2f1bedf4e..0d08c00756 100644..100755
--- a/framework/inc/makefile.mk
+++ b/svx/AllLangResTarget_about.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,24 +24,22 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=framework
-TARGET=inc
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,about))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx))
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,svx/about))
 
-.INCLUDE :  target.mk
+$(eval $(call gb_SrsTarget_set_include,svx/about,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(SRCDIR)/svx/inc/ \
+))
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+$(eval $(call gb_SrsTarget_add_files,svx/about,\
+    svx/source/intro/about_ooo.src \
+))
 
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
new file mode 100755
index 0000000000..eb0b5b15c4
--- /dev/null
+++ b/svx/AllLangResTarget_gal.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,gal))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,gal,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
+
+$(eval $(call gb_SrsTarget_set_include,svx/gal,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(SRCDIR)/svx/source/gallery \
+    -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/gal,\
+    svx/source/gallery2/gallery.src \
+    svx/source/gallery2/galtheme.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/source/application/makefile.mk b/svx/AllLangResTarget_ofa.mk
index 96bd84de23..964b6562b3 100644..100755
--- a/framework/source/application/makefile.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,22 +24,23 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=			framework
-TARGET=				framework
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx))
 
-.INCLUDE :	settings.mk
+$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
 
-SLOFILES=	$(SLO)$/login.obj
+$(eval $(call gb_SrsTarget_set_include,svx/ofa,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(SRCDIR)/svx/inc/ \
+))
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
+$(eval $(call gb_SrsTarget_add_files,svx/ofa,\
+    svx/source/src/errtxt.src \
+    svx/source/src/app.src \
+))
 
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
new file mode 100755
index 0000000000..b2707b01a6
--- /dev/null
+++ b/svx/AllLangResTarget_svx.mk
@@ -0,0 +1,136 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,svx))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,svx,\
+    svx/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/res))
+
+$(eval $(call gb_SrsTarget_set_include,svx/res,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(WORKDIR)/inc \
+    -I$(WORKDIR)/inc/svx \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/source/dialog \
+    -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/res,\
+    svx/source/accessibility/accessibility.src \
+    svx/source/dialog/bmpmask.src \
+    svx/source/dialog/contdlg.src \
+    svx/source/dialog/ctredlin.src \
+    svx/source/dialog/dlgctrl.src \
+    svx/source/dialog/docrecovery.src \
+    svx/source/dialog/fontwork.src \
+    svx/source/dialog/frmsel.src \
+    svx/source/dialog/hdft.src \
+    svx/source/dialog/hyprlink.src \
+    svx/source/dialog/imapdlg.src \
+    svx/source/dialog/langbox.src \
+    svx/source/dialog/language.src \
+    svx/source/dialog/optgrid.src \
+    svx/source/dialog/passwd.src \
+    svx/source/dialog/prtqry.src \
+    svx/source/dialog/rubydialog.src \
+    svx/source/dialog/ruler.src \
+    svx/source/dialog/sdstring.src \
+    svx/source/dialog/srchdlg.src \
+    svx/source/dialog/svxbmpnumvalueset.src \
+    svx/source/dialog/swframeposstrings.src \
+    svx/source/dialog/txenctab.src \
+    svx/source/dialog/ucsubset.src \
+    svx/source/engine3d/float3d.src \
+    svx/source/engine3d/string3d.src \
+    svx/source/fmcomp/gridctrl.src \
+    svx/source/form/datanavi.src \
+    svx/source/form/filtnav.src \
+    svx/source/form/fmexpl.src \
+    svx/source/form/fmstring.src \
+    svx/source/form/formshell.src \
+    svx/source/items/svxerr.src \
+    svx/source/items/svxitems.src \
+    svx/source/mnuctrls/mnuctrls.src \
+    svx/source/stbctrls/stbctrls.src \
+    svx/source/svdraw/svdstr.src \
+    svx/source/table/table.src \
+    svx/source/tbxctrls/colrctrl.src \
+    svx/source/tbxctrls/extrusioncontrols.src \
+    svx/source/tbxctrls/fontworkgallery.src \
+    svx/source/tbxctrls/grafctrl.src \
+    svx/source/tbxctrls/lboxctrl.src \
+    svx/source/tbxctrls/linectrl.src \
+    svx/source/tbxctrls/tbcontrl.src \
+    svx/source/tbxctrls/tbunosearchcontrollers.src \
+    svx/source/toolbars/extrusionbar.src \
+    svx/source/toolbars/fontworkbar.src \
+    svx/source/unodraw/unodraw.src \
+))
+
+$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+
+# hack !!!
+# just a temporary - globlmn.hrc about to be removed!
+ifeq ($(strip $(WITH_LANG)),)
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
+    echo copying $@
+    -mkdir -p $(WORKDIR)/inc/svx
+    cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk 
+else
+-include $(WORKDIR)/inc/svx/lastrun.mk
+ifneq ($(gb_lastrun_globlmn),MERGED)
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc
+endif
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
+    echo merging $@
+    -mkdir -p $(WORKDIR)/inc/svx
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk
+    echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
+    $(call gb_Helper_abbreviate_dirs_native, \
+        $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+        -p svx \
+         -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
+endif
+
+.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
+$(WORKDIR)/inc/svx/globlmn.hrc_clean :
+    rm -f $(WORKDIR)/inc/svx/lastrun.mk \
+        $(WORKDIR)/inc/svx/globlmn.hrc
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
new file mode 100755
index 0000000000..d30ccd4064
--- /dev/null
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,textconversiondlgs))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,textconversiondlgs,svx))
+
+$(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\
+    svx/textconversiondlgs \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs))
+
+$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(SRCDIR)/svx/inc/ \
+))
+
+$(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\
+    svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \
+))
+
diff --git a/sfx2/source/layout/makefile.mk b/svx/JunitTest_svx_unoapi.mk
index a11ba76a15..d6597f85e8 100644..100755
--- a/sfx2/source/layout/makefile.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -1,8 +1,8 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,32 +25,29 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=layout
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-SLOFILES = \
-        $(SLO)$/sfxdialog.obj
-#
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
 
-SLOFILES += $(SLO)$/sfxtabdialog.obj \
-    $(SLO)$/factory.obj \
-        $(SLO)$/sfxtabpage.obj
+$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svx/qa/unoapi/svx.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svx/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \
+))
 
-.ENDIF # ENABLE_LAYOUT == TRUE
+$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
 
-# --- Tagets -------------------------------------------------------
+$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\
+    svx/qa/unoapi/Test \
+))
 
-.INCLUDE :  target.mk
+$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\
+    org.openoffice.svx.qa.unoapi.Test \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
new file mode 100755
index 0000000000..4ce5250f77
--- /dev/null
+++ b/svx/Library_svx.mk
@@ -0,0 +1,236 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,svx))
+
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
+
+$(eval $(call gb_Library_set_include,svx,\
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/source/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    $$(SOLARINC) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,svx,\
+    $$(DEFS) \
+    -DSVX_DLLIMPLEMENTATION \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    icuuc \
+    sal \
+    sfx \
+    sot \
+    stl \
+    svl \
+    svt \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+    xcr \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/accessibility/AccessibleControlShape \
+    svx/source/accessibility/AccessibleEmptyEditSource \
+    svx/source/accessibility/AccessibleFrameSelector \
+    svx/source/accessibility/AccessibleGraphicShape \
+    svx/source/accessibility/AccessibleOLEShape \
+    svx/source/accessibility/AccessibleShape \
+    svx/source/accessibility/AccessibleShapeInfo \
+    svx/source/accessibility/AccessibleShapeTreeInfo \
+    svx/source/accessibility/AccessibleTextEventQueue \
+    svx/source/accessibility/AccessibleTextHelper \
+    svx/source/accessibility/charmapacc \
+    svx/source/accessibility/ChildrenManager \
+    svx/source/accessibility/ChildrenManagerImpl \
+    svx/source/accessibility/DescriptionGenerator \
+    svx/source/accessibility/DGColorNameLookUp \
+    svx/source/accessibility/GraphCtlAccessibleContext \
+    svx/source/accessibility/ShapeTypeHandler \
+    svx/source/accessibility/svxrectctaccessiblecontext \
+    svx/source/accessibility/SvxShapeTypes \
+    svx/source/customshapes/EnhancedCustomShape3d \
+    svx/source/customshapes/EnhancedCustomShapeEngine \
+    svx/source/customshapes/EnhancedCustomShapeFontWork \
+    svx/source/customshapes/EnhancedCustomShapeHandle \
+    svx/source/customshapes/tbxcustomshapes \
+    svx/source/dialog/_bmpmask \
+    svx/source/dialog/charmap \
+    svx/source/dialog/connctrl \
+    svx/source/dialog/_contdlg \
+    svx/source/dialog/contwnd \
+    svx/source/dialog/ctredlin \
+    svx/source/dialog/databaseregistrationui \
+    svx/source/dialog/dialcontrol \
+    svx/source/dialog/dlgctl3d \
+    svx/source/dialog/dlgctrl \
+    svx/source/dialog/docrecovery \
+    svx/source/dialog/fntctrl \
+    svx/source/dialog/fontlb \
+    svx/source/dialog/fontwork \
+    svx/source/dialog/framelinkarray \
+    svx/source/dialog/frmdirlbox \
+    svx/source/dialog/frmsel \
+    svx/source/dialog/graphctl \
+    svx/source/dialog/grfflt \
+    svx/source/dialog/hdft \
+    svx/source/dialog/hyperdlg \
+    svx/source/dialog/hyprlink \
+    svx/source/dialog/imapdlg \
+    svx/source/dialog/imapwnd \
+    svx/source/dialog/measctrl \
+    svx/source/dialog/optgrid \
+    svx/source/dialog/orienthelper \
+    svx/source/dialog/pagectrl \
+    svx/source/dialog/paraprev \
+    svx/source/dialog/passwd \
+    svx/source/dialog/pfiledlg \
+    svx/source/dialog/prtqry \
+    svx/source/dialog/relfld \
+    svx/source/dialog/rlrcitem \
+    svx/source/dialog/rubydialog \
+    svx/source/dialog/rulritem \
+    svx/source/dialog/SpellDialogChildWindow \
+    svx/source/dialog/srchctrl \
+    svx/source/dialog/srchdlg \
+    svx/source/dialog/strarray \
+    svx/source/dialog/svxbmpnumvalueset \
+    svx/source/dialog/svxgrahicitem \
+    svx/source/dialog/svxruler \
+    svx/source/dialog/swframeexample \
+    svx/source/dialog/swframeposstrings \
+    svx/source/dialog/txencbox \
+    svx/source/dialog/txenctab \
+    svx/source/dialog/wrapfield \
+    svx/source/engine3d/float3d \
+    svx/source/fmcomp/dbaobjectex \
+    svx/source/form/databaselocationinput \
+    svx/source/form/dbcharsethelper \
+    svx/source/form/filtnav \
+    svx/source/form/fmobjfac \
+    svx/source/form/fmPropBrw \
+    svx/source/form/fmsrccfg \
+    svx/source/form/fmsrcimp \
+    svx/source/form/tabwin \
+    svx/source/form/tbxform \
+    svx/source/items/algitem \
+    svx/source/items/hlnkitem \
+    svx/source/items/numfmtsh \
+    svx/source/items/numinf \
+    svx/source/items/ofaitem \
+    svx/source/items/pageitem \
+    svx/source/items/postattr \
+    svx/source/items/rotmodit \
+    svx/source/items/SmartTagItem \
+    svx/source/items/svxempty \
+    svx/source/items/svxerr \
+    svx/source/items/viewlayoutitem \
+    svx/source/items/zoomitem \
+    svx/source/items/zoomslideritem \
+    svx/source/mnuctrls/clipboardctl \
+    svx/source/mnuctrls/fntctl \
+    svx/source/mnuctrls/fntszctl \
+    svx/source/mnuctrls/SmartTagCtl \
+    svx/source/stbctrls/pszctrl \
+    svx/source/stbctrls/insctrl \
+    svx/source/stbctrls/selctrl \
+    svx/source/stbctrls/xmlsecctrl \
+    svx/source/stbctrls/modctrl \
+    svx/source/stbctrls/zoomsliderctrl \
+    svx/source/stbctrls/zoomctrl \
+    svx/source/svdraw/ActionDescriptionProvider \
+    svx/source/smarttags/SmartTagMgr \
+    svx/source/svdraw/impgrfll \
+    svx/source/table/accessiblecell \
+    svx/source/table/accessibletableshape \
+    svx/source/table/celleditsource \
+    svx/source/table/tabledesign \
+    svx/source/table/tablertfexporter \
+    svx/source/table/tablertfimporter \
+    svx/source/tbxctrls/colrctrl \
+    svx/source/tbxctrls/fillctrl \
+    svx/source/tbxctrls/formatpaintbrushctrl \
+    svx/source/tbxctrls/grafctrl \
+    svx/source/tbxctrls/itemwin \
+    svx/source/tbxctrls/layctrl \
+    svx/source/tbxctrls/lboxctrl \
+    svx/source/tbxctrls/linectrl \
+    svx/source/tbxctrls/subtoolboxcontrol \
+    svx/source/tbxctrls/tbunocontroller \
+    svx/source/tbxctrls/tbunosearchcontrollers \
+    svx/source/tbxctrls/tbxalign \
+    svx/source/tbxctrls/tbxcolor \
+    svx/source/tbxctrls/tbxdrctl \
+    svx/source/tbxctrls/verttexttbxctrl \
+    svx/source/unodraw/recoveryui \
+    svx/source/unodraw/unoctabl \
+    svx/source/unodraw/UnoNamespaceMap \
+    svx/source/unodraw/unopool \
+    svx/source/unodraw/unoshcol \
+    svx/source/unogallery/unogalitem \
+    svx/source/unogallery/unogaltheme \
+    svx/source/unogallery/unogalthemeprovider \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportunx \
+))
+else
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,svx,\
+    advapi32 \
+))
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportw32 \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,svx,\
+    svx/source/dialog/sendreportgen \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
new file mode 100755
index 0000000000..dd31e6b4bd
--- /dev/null
+++ b/svx/Library_svxcore.mk
@@ -0,0 +1,455 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,svxcore))
+
+$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
+
+$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+
+$(eval $(call gb_Library_add_package_headers,svxcore,\
+    svx_inc \
+    svx_sdi \
+))
+
+$(eval $(call gb_Library_set_include,svxcore,\
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    -I$(SRCDIR)/svx/source/inc \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(WORKDIR)/SdiTarget/svx/sdi \
+))
+
+#BOOST switch in customshapes
+#dialog: 
+#.IF "$(GUI)"=="WNT"
+#CFLAGS+= -DUNICODE -D_UNICODE
+#.ENDIF
+
+$(eval $(call gb_Library_set_defs,svxcore,\
+    $$(DEFS) \
+    -DSVX_DLLIMPLEMENTATION \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,svxcore,\
+    avmedia \
+    basegfx \
+    sb \
+    comphelper \
+    cppuhelper \
+    cppu \
+    drawinglayer \
+    editeng \
+    fwe \
+    i18nisolang1 \
+    icuuc \
+    lng \
+    sal \
+    sfx \
+    sot \
+    stl \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    vos3 \
+    xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,svxcore,\
+    svx/source/core/coreservices \
+    svx/source/customshapes/EnhancedCustomShape2d \
+    svx/source/customshapes/EnhancedCustomShapeGeometry \
+    svx/source/customshapes/EnhancedCustomShapeTypeNames \
+    svx/source/dialog/checklbx \
+    svx/source/dialog/dialmgr \
+    svx/source/dialog/dlgutil \
+    svx/source/dialog/framelink \
+    svx/source/dialog/langbox \
+    svx/source/dialog/simptabl \
+    svx/source/dialog/stddlg \
+    svx/source/dialog/svxdlg \
+    svx/source/engine3d/camera3d \
+    svx/source/engine3d/cube3d \
+    svx/source/engine3d/deflt3d \
+    svx/source/engine3d/dragmt3d \
+    svx/source/engine3d/e3dsceneupdater \
+    svx/source/engine3d/e3dundo \
+    svx/source/engine3d/extrud3d \
+    svx/source/engine3d/helperhittest3d \
+    svx/source/engine3d/helperminimaldepth3d \
+    svx/source/engine3d/lathe3d \
+    svx/source/engine3d/obj3d \
+    svx/source/engine3d/objfac3d \
+    svx/source/engine3d/polygn3d \
+    svx/source/engine3d/polysc3d \
+    svx/source/engine3d/scene3d \
+    svx/source/engine3d/sphere3d \
+    svx/source/engine3d/svx3ditems \
+    svx/source/engine3d/view3d \
+    svx/source/engine3d/view3d1 \
+    svx/source/engine3d/viewpt3d2 \
+    svx/source/fmcomp/dbaexchange \
+    svx/source/fmcomp/fmgridcl \
+    svx/source/fmcomp/fmgridif \
+    svx/source/fmcomp/gridcell \
+    svx/source/fmcomp/gridcols \
+    svx/source/fmcomp/gridctrl \
+    svx/source/fmcomp/trace \
+    svx/source/fmcomp/xmlexchg \
+    svx/source/form/dataaccessdescriptor \
+    svx/source/form/datalistener \
+    svx/source/form/datanavi \
+    svx/source/form/dbtoolsclient \
+    svx/source/form/delayedevent \
+    svx/source/form/fmcontrolbordermanager \
+    svx/source/form/fmcontrollayout \
+    svx/source/form/fmdmod \
+    svx/source/form/fmdocumentclassification \
+    svx/source/form/fmdpage \
+    svx/source/form/fmexch \
+    svx/source/form/fmexpl \
+    svx/source/form/fmitems \
+    svx/source/form/fmmodel \
+    svx/source/form/fmobj \
+    svx/source/form/fmpage \
+    svx/source/form/fmpgeimp \
+    svx/source/form/fmscriptingenv \
+    svx/source/form/fmservs \
+    svx/source/form/fmshell \
+    svx/source/form/fmshimp \
+    svx/source/form/fmtextcontroldialogs \
+    svx/source/form/fmtextcontrolfeature \
+    svx/source/form/fmtextcontrolshell \
+    svx/source/form/fmtools \
+    svx/source/form/fmundo \
+    svx/source/form/fmview \
+    svx/source/form/fmvwimp \
+    svx/source/form/formcontrolfactory \
+    svx/source/form/formcontroller \
+    svx/source/form/formcontrolling \
+    svx/source/form/formdispatchinterceptor \
+    svx/source/form/formfeaturedispatcher \
+    svx/source/form/formtoolbars \
+    svx/source/form/legacyformcontroller \
+    svx/source/form/navigatortree \
+    svx/source/form/navigatortreemodel \
+    svx/source/form/ParseContext \
+    svx/source/form/sdbdatacolumn \
+    svx/source/form/sqlparserclient \
+    svx/source/form/stringlistresource \
+    svx/source/form/typeconversionclient \
+    svx/source/form/typemap \
+    svx/source/form/xfm_addcondition \
+    svx/source/gallery2/codec \
+    svx/source/gallery2/galbrws \
+    svx/source/gallery2/galbrws1 \
+    svx/source/gallery2/galbrws2 \
+    svx/source/gallery2/galctrl \
+    svx/source/gallery2/galexpl \
+    svx/source/gallery2/gallery1 \
+    svx/source/gallery2/galmisc \
+    svx/source/gallery2/galobj \
+    svx/source/gallery2/galtheme \
+    svx/source/items/chrtitem \
+    svx/source/items/clipfmtitem \
+    svx/source/items/customshapeitem \
+    svx/source/items/drawitem \
+    svx/source/items/e3ditem \
+    svx/source/items/grfitem \
+    svx/source/sdr/animation/scheduler \
+    svx/source/sdr/animation/objectanimator \
+    svx/source/sdr/animation/animationstate \
+    svx/source/sdr/attribute/sdrlinefillshadowtextattribute \
+    svx/source/sdr/attribute/sdrfilltextattribute \
+    svx/source/sdr/attribute/sdrshadowtextattribute \
+    svx/source/sdr/attribute/sdrtextattribute \
+    svx/source/sdr/attribute/sdrlineshadowtextattribute \
+    svx/source/sdr/attribute/sdrformtextattribute \
+    svx/source/sdr/attribute/sdrformtextoutlineattribute \
+    svx/source/sdr/contact/viewobjectcontactofgroup \
+    svx/source/sdr/contact/viewobjectcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofpageobj \
+    svx/source/sdr/contact/viewcontactofe3d \
+    svx/source/sdr/contact/viewcontactofe3dcube \
+    svx/source/sdr/contact/viewcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewobjectcontactofpageobj \
+    svx/source/sdr/contact/viewobjectcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofgraphic \
+    svx/source/sdr/contact/viewobjectcontactredirector \
+    svx/source/sdr/contact/viewcontactofsdrcircobj \
+    svx/source/sdr/contact/viewcontactofgroup \
+    svx/source/sdr/contact/viewcontactofunocontrol \
+    svx/source/sdr/contact/viewcontactofsdrobjcustomshape \
+    svx/source/sdr/contact/viewcontactofsdrobj \
+    svx/source/sdr/contact/objectcontact \
+    svx/source/sdr/contact/viewcontactoftextobj \
+    svx/source/sdr/contact/viewcontactofe3dlathe \
+    svx/source/sdr/contact/viewcontactofsdrpage \
+    svx/source/sdr/contact/viewcontactofe3dextrude \
+    svx/source/sdr/contact/viewcontactofmasterpagedescriptor \
+    svx/source/sdr/contact/viewcontact \
+    svx/source/sdr/contact/viewcontactofsdrole2obj \
+    svx/source/sdr/contact/displayinfo \
+    svx/source/sdr/contact/objectcontacttools \
+    svx/source/sdr/contact/viewcontactofe3dscene \
+    svx/source/sdr/contact/viewcontactofsdrrectobj \
+    svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
+    svx/source/sdr/contact/viewobjectcontactofunocontrol \
+    svx/source/sdr/contact/viewobjectcontactofgraphic \
+    svx/source/sdr/contact/sdrmediawindow \
+    svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \
+    svx/source/sdr/contact/viewcontactofsdrcaptionobj \
+    svx/source/sdr/contact/viewcontactofvirtobj \
+    svx/source/sdr/contact/viewcontactofe3dsphere \
+    svx/source/sdr/contact/viewcontactofe3dpolygon \
+    svx/source/sdr/contact/viewcontactofsdredgeobj \
+    svx/source/sdr/contact/viewobjectcontact \
+    svx/source/sdr/contact/viewobjectcontactofsdrobj \
+    svx/source/sdr/contact/objectcontactofpageview \
+    svx/source/sdr/contact/viewcontactofsdrpathobj \
+    svx/source/sdr/contact/viewcontactofsdrmeasureobj \
+    svx/source/sdr/contact/objectcontactofobjlistpainter \
+    svx/source/sdr/contact/viewobjectcontactofe3d \
+    svx/source/sdr/event/eventhandler \
+    svx/source/sdr/overlay/overlayline \
+    svx/source/sdr/overlay/overlaycrosshair \
+    svx/source/sdr/overlay/overlayrollingrectangle \
+    svx/source/sdr/overlay/overlaytriangle \
+    svx/source/sdr/overlay/overlayselection \
+    svx/source/sdr/overlay/overlayhatchrect \
+    svx/source/sdr/overlay/overlaybitmapex \
+    svx/source/sdr/overlay/overlaymanagerbuffered \
+    svx/source/sdr/overlay/overlayhelpline \
+    svx/source/sdr/overlay/overlayanimatedbitmapex \
+    svx/source/sdr/overlay/overlaypolypolygon \
+    svx/source/sdr/overlay/overlayobjectcell \
+    svx/source/sdr/overlay/overlaytools \
+    svx/source/sdr/overlay/overlayprimitive2dsequenceobject \
+    svx/source/sdr/overlay/overlayobject \
+    svx/source/sdr/overlay/overlaymanager \
+    svx/source/sdr/overlay/overlayobjectlist \
+    svx/source/sdr/primitive2d/sdrellipseprimitive2d \
+    svx/source/sdr/primitive2d/sdrprimitivetools \
+    svx/source/sdr/primitive2d/sdrtextprimitive2d \
+    svx/source/sdr/primitive2d/primitivefactory2d \
+    svx/source/sdr/primitive2d/sdrolecontentprimitive2d \
+    svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \
+    svx/source/sdr/primitive2d/sdrgrafprimitive2d \
+    svx/source/sdr/primitive2d/sdrole2primitive2d \
+    svx/source/sdr/primitive2d/sdrpathprimitive2d \
+    svx/source/sdr/primitive2d/sdrrectangleprimitive2d \
+    svx/source/sdr/primitive2d/sdrcaptionprimitive2d \
+    svx/source/sdr/primitive2d/sdrconnectorprimitive2d \
+    svx/source/sdr/primitive2d/sdrmeasureprimitive2d \
+    svx/source/sdr/primitive2d/sdrattributecreator \
+    svx/source/sdr/primitive2d/sdrdecompositiontools \
+    svx/source/sdr/primitive3d/sdrattributecreator3d \
+    svx/source/sdr/properties/pageproperties \
+    svx/source/sdr/properties/e3dsceneproperties \
+    svx/source/sdr/properties/itemsettools \
+    svx/source/sdr/properties/captionproperties \
+    svx/source/sdr/properties/e3dextrudeproperties \
+    svx/source/sdr/properties/e3dproperties \
+    svx/source/sdr/properties/measureproperties \
+    svx/source/sdr/properties/customshapeproperties \
+    svx/source/sdr/properties/rectangleproperties \
+    svx/source/sdr/properties/groupproperties \
+    svx/source/sdr/properties/properties \
+    svx/source/sdr/properties/e3dlatheproperties \
+    svx/source/sdr/properties/graphicproperties \
+    svx/source/sdr/properties/circleproperties \
+    svx/source/sdr/properties/emptyproperties \
+    svx/source/sdr/properties/e3dsphereproperties \
+    svx/source/sdr/properties/defaultproperties \
+    svx/source/sdr/properties/textproperties \
+    svx/source/sdr/properties/attributeproperties \
+    svx/source/sdr/properties/connectorproperties \
+    svx/source/sdr/properties/e3dcompoundproperties \
+    svx/source/sdr/properties/oleproperties \
+    svx/source/svdraw/clonelist \
+    svx/source/svdraw/gradtrns \
+    svx/source/svdraw/polypolygoneditor \
+    svx/source/svdraw/sdrcomment \
+    svx/source/svdraw/sdrhittesthelper \
+    svx/source/svdraw/sdrmasterpagedescriptor \
+    svx/source/svdraw/sdrpagewindow \
+    svx/source/svdraw/sdrpaintwindow \
+    svx/source/svdraw/selectioncontroller \
+    svx/source/svdraw/svdattr \
+    svx/source/svdraw/svdcrtv \
+    svx/source/svdraw/svddrag \
+    svx/source/svdraw/svddrgmt \
+    svx/source/svdraw/svddrgv \
+    svx/source/svdraw/svdedtv \
+    svx/source/svdraw/svdedtv1 \
+    svx/source/svdraw/svdedtv2 \
+    svx/source/svdraw/svdedxv \
+    svx/source/svdraw/svdetc \
+    svx/source/svdraw/svdfmtf \
+    svx/source/svdraw/svdglev \
+    svx/source/svdraw/svdglue \
+    svx/source/svdraw/svdhdl \
+    svx/source/svdraw/svdhlpln \
+    svx/source/svdraw/svdibrow \
+    svx/source/svdraw/svditer \
+    svx/source/svdraw/svdlayer \
+    svx/source/svdraw/svdmark \
+    svx/source/svdraw/svdmodel \
+    svx/source/svdraw/svdmrkv \
+    svx/source/svdraw/svdmrkv1 \
+    svx/source/svdraw/svdoashp \
+    svx/source/svdraw/svdoattr \
+    svx/source/svdraw/svdobj \
+    svx/source/svdraw/svdocapt \
+    svx/source/svdraw/svdocirc \
+    svx/source/svdraw/svdoedge \
+    svx/source/svdraw/svdograf \
+    svx/source/svdraw/svdogrp \
+    svx/source/svdraw/svdomeas \
+    svx/source/svdraw/svdomedia \
+    svx/source/svdraw/svdoole2 \
+    svx/source/svdraw/svdopage \
+    svx/source/svdraw/svdopath \
+    svx/source/svdraw/svdorect \
+    svx/source/svdraw/svdotext \
+    svx/source/svdraw/svdotextdecomposition \
+    svx/source/svdraw/svdotextpathdecomposition \
+    svx/source/svdraw/svdotxat \
+    svx/source/svdraw/svdotxdr \
+    svx/source/svdraw/svdotxed \
+    svx/source/svdraw/svdotxfl \
+    svx/source/svdraw/svdotxln \
+    svx/source/svdraw/svdotxtr \
+    svx/source/svdraw/svdouno \
+    svx/source/svdraw/svdoutl \
+    svx/source/svdraw/svdoutlinercache \
+    svx/source/svdraw/svdovirt \
+    svx/source/svdraw/svdpage \
+    svx/source/svdraw/svdpagv \
+    svx/source/svdraw/svdpntv \
+    svx/source/svdraw/svdpoev \
+    svx/source/svdraw/svdsnpv \
+    svx/source/svdraw/svdtext \
+    svx/source/svdraw/svdtrans \
+    svx/source/svdraw/svdundo \
+    svx/source/svdraw/svdview \
+    svx/source/svdraw/svdviter \
+    svx/source/svdraw/svdxcgv \
+    svx/source/table/cell \
+    svx/source/table/cellcursor \
+    svx/source/table/cellrange \
+    svx/source/table/propertyset \
+    svx/source/table/svdotable \
+    svx/source/table/tablecolumn \
+    svx/source/table/tablecolumns \
+    svx/source/table/tablecontroller \
+    svx/source/table/tablehandles \
+    svx/source/table/tablelayouter \
+    svx/source/table/tablemodel \
+    svx/source/table/tablerow \
+    svx/source/table/tablerows \
+    svx/source/table/tableundo \
+    svx/source/table/viewcontactoftableobj \
+    svx/source/tbxctrls/extrusioncontrols \
+    svx/source/tbxctrls/fontworkgallery \
+    svx/source/tbxctrls/tbcontrl \
+    svx/source/tbxctrls/tbxcolorupdate \
+    svx/source/toolbars/extrusionbar \
+    svx/source/toolbars/fontworkbar \
+    svx/source/unodraw/gluepts \
+    svx/source/unodraw/shapepropertynotifier \
+    svx/source/unodraw/tableshape \
+    svx/source/unodraw/unobtabl \
+    svx/source/unodraw/unodtabl \
+    svx/source/unodraw/UnoGraphicExporter \
+    svx/source/unodraw/unogtabl \
+    svx/source/unodraw/unohtabl \
+    svx/source/unodraw/unomlstr \
+    svx/source/unodraw/unomod \
+    svx/source/unodraw/unomtabl \
+    svx/source/unodraw/UnoNameItemTable \
+    svx/source/unodraw/unopage \
+    svx/source/unodraw/unoprov \
+    svx/source/unodraw/unoshap2 \
+    svx/source/unodraw/unoshap3 \
+    svx/source/unodraw/unoshap4 \
+    svx/source/unodraw/unoshape \
+    svx/source/unodraw/unoshtxt \
+    svx/source/unodraw/unottabl \
+    svx/source/unodraw/XPropertyTable \
+    svx/source/xml/xmleohlp \
+    svx/source/xml/xmlexport \
+    svx/source/xml/xmlgrhlp \
+    svx/source/xml/xmlxtexp \
+    svx/source/xml/xmlxtimp \
+    svx/source/xoutdev/xattr \
+    svx/source/xoutdev/xattr2 \
+    svx/source/xoutdev/xattrbmp \
+    svx/source/xoutdev/xexch \
+    svx/source/xoutdev/_xoutbmp \
+    svx/source/xoutdev/_xpoly \
+    svx/source/xoutdev/xpool \
+    svx/source/xoutdev/xtabbtmp \
+    svx/source/xoutdev/xtabcolr \
+    svx/source/xoutdev/xtabdash \
+    svx/source/xoutdev/xtabgrdt \
+    svx/source/xoutdev/xtabhtch \
+    svx/source/xoutdev/xtable \
+    svx/source/xoutdev/xtablend \
+))
+
+# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS)))
+$(eval $(call gb_Library_add_exception_objects,svxcore,\
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,svxcore,\
+    svx/source/customshapes/EnhancedCustomShapeFunctionParser \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
+
+$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/sdi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/bastyp/makefile.mk b/svx/Library_textconversiondlgs.mk
index 75c0cace40..c2ddae4fe1 100644..100755
--- a/sfx2/source/bastyp/makefile.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,42 +25,42 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+$(eval $(call gb_Library_Library,textconversiondlgs))
 
-PRJNAME=sfx2
-TARGET=bastyp
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Library_set_include,textconversiondlgs,\
+    -I$(SRCDIR)/svx/inc \
+    -I$(SRCDIR)/svx/inc/pch \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Library_set_defs,textconversiondlgs,\
+    $$(DEFS) \
+))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
+    comphelper \
+    cppuhelper \
+    cppu \
+    sal \
+    svl \
+    svt \
+    stl \
+    tk \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
 
-SLOFILES =\
-        $(SLO)$/sfxhtml.obj				\
-        $(SLO)$/frmhtml.obj				\
-        $(SLO)$/frmhtmlw.obj				\
-        $(SLO)$/misc.obj				\
-        $(SLO)$/progress.obj			\
-        $(SLO)$/sfxresid.obj			\
-        $(SLO)$/bitset.obj				\
-        $(SLO)$/minarray.obj			\
-        $(SLO)$/fltfnc.obj				\
-        $(SLO)$/mieclip.obj				\
-        $(SLO)$/fltlst.obj				\
-        $(SLO)$/helper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        fltfnc.src	\
-                bastyp.src
-
-EXCEPTIONSFILES =\
-    $(SLO)$/helper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\
+    svx/source/unodialogs/textconversiondlgs/services \
+    svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \
+    svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \
+    svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \
+    svx/source/unodialogs/textconversiondlgs/resid \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/svx/Makefile b/svx/Makefile
new file mode 100755
index 0000000000..90947b2e5f
--- /dev/null
+++ b/svx/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/source/outliner/makefile.mk b/svx/Module_svx.mk
index df1c795801..d9288ea9e6 100644..100755
--- a/editeng/source/outliner/makefile.mk
+++ b/svx/Module_svx.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,36 +25,28 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=outliner
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=outl_pch
-PROJECTPCHSOURCE=outl_pch
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------------
-
-SLOFILES=	\
-            $(SLO)$/outlundo.obj	\
-            $(SLO)$/outliner.obj 	\
-            $(SLO)$/outlin2.obj		\
-            $(SLO)$/paralist.obj 	\
-            $(SLO)$/outlvw.obj 		\
-            $(SLO)$/outleeng.obj 	\
-            $(SLO)$/outlobj.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	outliner.src
-
-.INCLUDE :  target.mk
-
+$(eval $(call gb_Module_Module,svx))
+
+$(eval $(call gb_Module_add_targets,svx,\
+    Library_svx \
+    Library_svxcore \
+    Library_textconversiondlgs \
+    AllLangResTarget_svx \
+    AllLangResTarget_ofa \
+    AllLangResTarget_gal \
+    AllLangResTarget_about \
+    AllLangResTarget_textconversiondlgs \
+    Package_inc \
+    Package_sdi \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
+    JunitTest_svx_unoapi \
+))
+
+#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
+#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
+#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
+#todo: globlmn.hrc
+#todo: component file
+# vim: set noet ts=4 sw=4:
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
new file mode 100755
index 0000000000..81066e9c7b
--- /dev/null
+++ b/svx/Package_inc.mk
@@ -0,0 +1,560 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,svx_inc,$(SRCDIR)/svx/inc))
+
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsoitm.hxx,svx/sxsoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshtitm.hxx,svx/sdshtitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polysc3d.hxx,svx/polysc3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dataaccessdescriptor.hxx,svx/dataaccessdescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoashp.hxx,svx/svdoashp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaobjectex.hxx,svx/dbaobjectex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeTypeNames.hxx,svx/EnhancedCustomShapeTypeNames.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxcommands.h,svx/svxcommands.h))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdview.hxx,svx/svdview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxraitm.hxx,svx/sxraitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxroaitm.hxx,svx/sxroaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTableShape.hxx,svx/AccessibleTableShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsxy.hxx,svx/xflbmsxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctl3d.hxx,svx/dlgctl3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaiitm.hxx,svx/sdtaiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit.hxx,svx/xtextit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionParser.hxx,svx/EnhancedCustomShapeFunctionParser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/orienthelper.hxx,svx/orienthelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxonitm.hxx,svx/sxonitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmpit.hxx,svx/xflbmpit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit.hxx,svx/xlineit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagItem.hxx,svx/SmartTagItem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpoly.hxx,svx/xpoly.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ParseContext.hxx,svx/ParseContext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numinf.hxx,svx/numinf.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/objfac3d.hxx,svx/objfac3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolorupdate.hxx,svx/tbxcolorupdate.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhdl.hxx,svx/svdhdl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedxv.hxx,svx/svdedxv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagMgr.hxx,svx/SmartTagMgr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapeproperty.hxx,svx/shapeproperty.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/anchorid.hxx,svx/anchorid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshprp.hxx,svx/unoshprp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewlayoutitem.hxx,svx/viewlayoutitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmmodel.hxx,svx/fmmodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/scene3d.hxx,svx/scene3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridif.hxx,svx/fmgridif.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyprlink.hxx,svx/hyprlink.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfsitm.hxx,svx/sdtfsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txencbox.hxx,svx/txencbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3ditem.hxx,svx/e3ditem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xoutbmp.hxx,svx/xoutbmp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotable.hxx,svx/svdotable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshcit.hxx,svx/xftshcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlogitm.hxx,svx/sxlogitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxrooitm.hxx,svx/sxrooitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontwork.hxx,svx/fontwork.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcecitm.hxx,svx/sxcecitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdginitm.hxx,svx/sdginitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpntv.hxx,svx/svdpntv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontlb.hxx,svx/fontlb.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit0.hxx,svx/xfillit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsflclit.hxx,svx/xsflclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpageuser.hxx,svx/sdrpageuser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbtmpit.hxx,svx/xbtmpit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxids.hrc,svx/svxids.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmfsitm.hxx,svx/sxmfsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusioncolorcontrol.hxx,svx/extrusioncolorcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrccfg.hxx,svx/fmsrccfg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pageitem.hxx,svx/pageitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpaintwindow.hxx,svx/sdrpaintwindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmkitm.hxx,svx/sxmkitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit.hxx,svx/xfillit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflftrit.hxx,svx/xflftrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxopitm.hxx,svx/sxopitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomitem.hxx,svx/zoomitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntszctl.hxx,svx/fntszctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsiitm.hxx,svx/sxsiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlayitm.hxx,svx/sxlayitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomid.hxx,svx/unomid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmsel.hxx,svx/frmsel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dsceneupdater.hxx,svx/e3dsceneupdater.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdcrtv.hxx,svx/svdcrtv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itemwin.hxx,svx/itemwin.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfchim.hxx,svx/sdtfchim.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/wrapfield.hxx,svx/wrapfield.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctrl.hxx,svx/fntctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdxcgv.hxx,svx/svdxcgv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbtoolsclient.hxx,svx/dbtoolsclient.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rotmodit.hxx,svx/rotmodit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/layctrl.hxx,svx/layctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rectenum.hxx,svx/rectenum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopath.hxx,svx/svdopath.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshtxt.hxx,svx/unoshtxt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopage.hxx,svx/svdopage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftadit.hxx,svx/xftadit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstcit.hxx,svx/xlnstcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/splitcelldlg.hxx,svx/splitcelldlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdynitm.hxx,svx/sdynitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rulritem.hxx,svx/rulritem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fillctrl.hxx,svx/fillctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SvxShapeTypes.hxx,svx/SvxShapeTypes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galctrl.hxx,svx/galctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdmod.hxx,svx/fmdmod.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/exthelpid.hrc,svx/exthelpid.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsearch.hxx,svx/fmsearch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pfiledlg.hxx,svx/pfiledlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmovitm.hxx,svx/sxmovitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrcimp.hxx,svx/fmsrcimp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsalitm.hxx,svx/sxsalitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoole2.hxx,svx/svdoole2.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsnpv.hxx,svx/svdsnpv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery1.hxx,svx/gallery1.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/passwd.hxx,svx/passwd.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrscit.hxx,svx/xgrscit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglev.hxx,svx/svdglev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkbar.hxx,svx/fontworkbar.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeGeometry.hxx,svx/EnhancedCustomShapeGeometry.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxitems.hrc,svx/svxitems.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmpage.hxx,svx/fmpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbexch.hrc,svx/dbexch.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/volume3d.hxx,svx/volume3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhelpline.hxx,svx/sdr/overlay/overlayhelpline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectcell.hxx,svx/sdr/overlay/overlayobjectcell.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanager.hxx,svx/sdr/overlay/overlaymanager.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx,svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectlist.hxx,svx/sdr/overlay/overlayobjectlist.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhatchrect.hxx,svx/sdr/overlay/overlayhatchrect.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytools.hxx,svx/sdr/overlay/overlaytools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayselection.hxx,svx/sdr/overlay/overlayselection.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytriangle.hxx,svx/sdr/overlay/overlaytriangle.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaypolypolygon.hxx,svx/sdr/overlay/overlaypolypolygon.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanagerbuffered.hxx,svx/sdr/overlay/overlaymanagerbuffered.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayrollingrectangle.hxx,svx/sdr/overlay/overlayrollingrectangle.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayline.hxx,svx/sdr/overlay/overlayline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaycrosshair.hxx,svx/sdr/overlay/overlaycrosshair.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobject.hxx,svx/sdr/overlay/overlayobject.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx,svx/sdr/overlay/overlayanimatedbitmapex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaybitmapex.hxx,svx/sdr/overlay/overlaybitmapex.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/event/eventhandler.hxx,svx/sdr/event/eventhandler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/itemsettools.hxx,svx/sdr/properties/itemsettools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/connectorproperties.hxx,svx/sdr/properties/connectorproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dlatheproperties.hxx,svx/sdr/properties/e3dlatheproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/circleproperties.hxx,svx/sdr/properties/circleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsphereproperties.hxx,svx/sdr/properties/e3dsphereproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/captionproperties.hxx,svx/sdr/properties/captionproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/customshapeproperties.hxx,svx/sdr/properties/customshapeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/attributeproperties.hxx,svx/sdr/properties/attributeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/rectangleproperties.hxx,svx/sdr/properties/rectangleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/pageproperties.hxx,svx/sdr/properties/pageproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/oleproperties.hxx,svx/sdr/properties/oleproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/textproperties.hxx,svx/sdr/properties/textproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/emptyproperties.hxx,svx/sdr/properties/emptyproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dextrudeproperties.hxx,svx/sdr/properties/e3dextrudeproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/properties.hxx,svx/sdr/properties/properties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/defaultproperties.hxx,svx/sdr/properties/defaultproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dproperties.hxx,svx/sdr/properties/e3dproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/groupproperties.hxx,svx/sdr/properties/groupproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/graphicproperties.hxx,svx/sdr/properties/graphicproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dcompoundproperties.hxx,svx/sdr/properties/e3dcompoundproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsceneproperties.hxx,svx/sdr/properties/e3dsceneproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/measureproperties.hxx,svx/sdr/properties/measureproperties.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/table/tabledesign.hxx,svx/sdr/table/tabledesign.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/primitiveFactory2d.hxx,svx/sdr/primitive2d/primitiveFactory2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx,svx/sdr/primitive2d/sdrpathprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx,svx/sdr/primitive2d/sdrtextprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrprimitivetools.hxx,svx/sdr/primitive2d/sdrprimitivetools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx,svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx,svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx,svx/sdr/primitive2d/svx_primitivetypes2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx,svx/sdr/primitive2d/sdrdecompositiontools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx,svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx,svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx,svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx,svx/sdr/primitive2d/sdrellipseprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx,svx/sdr/primitive2d/sdrole2primitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrattributecreator.hxx,svx/sdr/primitive2d/sdrattributecreator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx,svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx,svx/sdr/primitive2d/sdrgrafprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx,svx/sdr/primitive3d/sdrattributecreator3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx,svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx,svx/sdr/contact/viewobjectcontactofunocontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofpageview.hxx,svx/sdr/contact/objectcontactofpageview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx,svx/sdr/contact/viewcontactofe3dpolygon.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx,svx/sdr/contact/viewobjectcontactofsdrpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx,svx/sdr/contact/viewobjectcontactofsdrobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx,svx/sdr/contact/objectcontactofobjlistpainter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx,svx/sdr/contact/viewobjectcontactofe3dscene.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontact.hxx,svx/sdr/contact/viewcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx,svx/sdr/contact/viewobjectcontactofpageobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx,svx/sdr/contact/viewcontactofsdrcaptionobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx,svx/sdr/contact/viewcontactofsdrcircobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx,svx/sdr/contact/viewcontactofsdrole2obj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactoftextobj.hxx,svx/sdr/contact/viewcontactoftextobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpage.hxx,svx/sdr/contact/viewcontactofsdrpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofunocontrol.hxx,svx/sdr/contact/viewcontactofunocontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx,svx/sdr/contact/viewcontactofsdredgeobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3d.hxx,svx/sdr/contact/viewobjectcontactofe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dsphere.hxx,svx/sdr/contact/viewcontactofe3dsphere.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx,svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3d.hxx,svx/sdr/contact/viewcontactofe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontact.hxx,svx/sdr/contact/viewobjectcontact.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx,svx/sdr/contact/viewcontactofsdrpathobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx,svx/sdr/contact/viewcontactofsdrmediaobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dlathe.hxx,svx/sdr/contact/viewcontactofe3dlathe.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx,svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgraphic.hxx,svx/sdr/contact/viewcontactofgraphic.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactredirector.hxx,svx/sdr/contact/viewobjectcontactredirector.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx,svx/sdr/contact/viewobjectcontactofgraphic.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgroup.hxx,svx/sdr/contact/viewcontactofgroup.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/displayinfo.hxx,svx/sdr/contact/displayinfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobj.hxx,svx/sdr/contact/viewcontactofsdrobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx,svx/sdr/contact/viewcontactofsdrmeasureobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx,svx/sdr/contact/viewcontactofsdrrectobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgroup.hxx,svx/sdr/contact/viewobjectcontactofgroup.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx,svx/sdr/attribute/sdrformtextoutlineattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextattribute.hxx,svx/sdr/attribute/sdrformtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx,svx/sdr/attribute/sdrlineshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrfilltextattribute.hxx,svx/sdr/attribute/sdrfilltextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx,svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrshadowtextattribute.hxx,svx/sdr/attribute/sdrshadowtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrtextattribute.hxx,svx/sdr/attribute/sdrtextattribute.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialcontrol.hxx,svx/dialcontrol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoom_def.hxx,svx/zoom_def.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charmap.hxx,svx/charmap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/connctrl.hxx,svx/connctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtacitm.hxx,svx/sdtacitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyperdlg.hxx,svx/hyperdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxctl.hxx,svx/tbxctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/f3dchild.hxx,svx/f3dchild.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdogrp.hxx,svx/svdogrp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/simptabl.hxx,svx/simptabl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxelditm.hxx,svx/sxelditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomslideritem.hxx,svx/zoomslideritem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshtit.hxx,svx/xftshtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/float3d.hxx,svx/float3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlntrit.hxx,svx/xlntrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmodel.hxx,svx/svdmodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtext.hxx,svx/svdtext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTextHelper.hxx,svx/AccessibleTextHelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtayitm.hxx,svx/sdtayitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtmfitm.hxx,svx/sdtmfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomsliderctrl.hxx,svx/zoomsliderctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polygn3d.hxx,svx/polygn3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglob.hxx,svx/svdglob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpool.hxx,svx/xpool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelink.hxx,svx/framelink.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoprov.hxx,svx/unoprov.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/checklbx.hxx,svx/checklbx.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selctrl.hxx,svx/selctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdggaitm.hxx,svx/sdggaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbtoxy.hxx,svx/xflbtoxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabline.hxx,svx/tabline.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpool.hxx,svx/svdpool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/stddlg.hxx,svx/stddlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaseregistrationui.hxx,svx/databaseregistrationui.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdef.hxx,svx/xdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/algitem.hxx,svx/algitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxfiitm.hxx,svx/sxfiitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfflt.hxx,svx/grfflt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaselocationinput.hxx,svx/databaselocationinput.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsuitm.hxx,svx/sxmsuitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialmgr.hxx,svx/dialmgr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdash.hxx,svx/xdash.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit0.hxx,svx/xlineit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/htmlmode.hxx,svx/htmlmode.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/measctrl.hxx,svx/measctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdooitm.hxx,svx/sdooitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpage.hxx,svx/svdpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsob.hxx,svx/svdsob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshcitm.hxx,svx/sdshcitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaitm.hxx,svx/sdtaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtrans.hxx,svx/svdtrans.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgtritm.hxx,svx/sdgtritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxdraw.hxx,svx/tbxdraw.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdprcitm.hxx,svx/sdprcitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomodel.hxx,svx/unomodel.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarderListener.hxx,svx/IAccessibleViewForwarderListener.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdlayer.hxx,svx/svdlayer.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflasit.hxx,svx/xflasit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflclit.hxx,svx/xflclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsaitm.hxx,svx/sxsaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/verttexttbxctrl.hxx,svx/verttexttbxctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/contdlg.hxx,svx/contdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxerr.hxx,svx/svxerr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpagv.hxx,svx/svdpagv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocapt.hxx,svx/svdocapt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pagectrl.hxx,svx/pagectrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreoitm.hxx,svx/sxreoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtypes.hxx,svx/svdtypes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hrc,svx/ucsubset.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pszctrl.hxx,svx/pszctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattrx.hxx,svx/svdattrx.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtditm.hxx,svx/sdtditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframevalidation.hxx,svx/swframevalidation.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrad.hxx,svx/xgrad.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpoev.hxx,svx/svdpoev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbckit.hxx,svx/xflbckit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit0.hxx,svx/xtextit0.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreaitm.hxx,svx/sxreaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galbrws.hxx,svx/galbrws.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomod.hxx,svx/unomod.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnclit.hxx,svx/xlnclit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/deflt3d.hxx,svx/deflt3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dundo.hxx,svx/e3dundo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ChildrenManager.hxx,svx/ChildrenManager.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridcl.hxx,svx/fmgridcl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdobj.hxx,svx/svdobj.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtaitm.hxx,svx/sxmtaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipboardctl.hxx,svx/clipboardctl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtable.hxx,svx/xtable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcoitm.hxx,svx/sdgcoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdovirt.hxx,svx/svdovirt.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmshell.hxx,svx/fmshell.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleParent.hxx,svx/IAccessibleParent.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmark.hxx,svx/svdmark.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/strarray.hxx,svx/strarray.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgluitm.hxx,svx/sdgluitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtakitm.hxx,svx/sdtakitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SpellDialogChildWindow.hxx,svx/SpellDialogChildWindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xexch.hxx,svx/xexch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery.hxx,svx/gallery.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctrl.hxx,svx/dlgctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/DescriptionGenerator.hxx,svx/DescriptionGenerator.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xenum.hxx,svx/xenum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numfmtsh.hxx,svx/numfmtsh.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmglob.hxx,svx/fmglob.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framebordertype.hxx,svx/framebordertype.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomeas.hxx,svx/svdomeas.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/insctrl.hxx,svx/insctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoedge.hxx,svx/svdoedge.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/bmpmask.hxx,svx/bmpmask.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshitm.hxx,svx/sdshitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddef.hxx,svx/svddef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbcontrl.hxx,svx/tbcontrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dstribut_enum.hxx,svx/dstribut_enum.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcllitm.hxx,svx/sxcllitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rubydialog.hxx,svx/rubydialog.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ipolypolygoneditorcontroller.hxx,svx/ipolypolygoneditorcontroller.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleOLEShape.hxx,svx/AccessibleOLEShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusionbar.hxx,svx/extrusionbar.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleControlShape.hxx,svx/AccessibleControlShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/paraprev.hxx,svx/paraprev.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshxy.hxx,svx/xftshxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcustomshapes.hxx,svx/tbxcustomshapes.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrhittesthelper.hxx,svx/sdrhittesthelper.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdviter.hxx,svx/svdviter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ofaitem.hxx,svx/ofaitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmdirlbox.hxx,svx/frmdirlbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShape2d.hxx,svx/EnhancedCustomShape2d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxoneitm.hxx,svx/sxoneitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/msdffdef.hxx,svx/msdffdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xattr.hxx,svx/xattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmuitm.hxx,svx/sxmuitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdsxyitm.hxx,svx/sdsxyitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/postattr.hxx,svx/postattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoattr.hxx,svx/svdoattr.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/prtqry.hxx,svx/prtqry.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sphere3d.hxx,svx/sphere3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomedia.hxx,svx/svdomedia.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflboxy.hxx,svx/xflboxy.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeposstrings.hxx,svx/swframeposstrings.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditer.hxx,svx/svditer.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmspitm.hxx,svx/sxmspitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmobjfac.hxx,svx/fmobjfac.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocirc.hxx,svx/svdocirc.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdlg.hxx,svx/svxdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxenditm.hxx,svx/sxenditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/def3d.hxx,svx/def3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/UnoNamespaceMap.hxx,svx/UnoNamespaceMap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxciaitm.hxx,svx/sxciaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polypolygoneditor.hxx,svx/polypolygoneditor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgmoitm.hxx,svx/sdgmoitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linectrl.hxx,svx/linectrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedcit.hxx,svx/xlnedcit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsitm.hxx,svx/sxmsitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaditm.hxx,svx/sdtaditm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotext.hxx,svx/svdotext.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/chrtitem.hxx,svx/chrtitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbitmap.hxx,svx/xbitmap.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxallitm.hxx,svx/sxallitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgutil.hxx,svx/dlgutil.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopage.hxx,svx/unopage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrag.hxx,svx/svddrag.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeTreeInfo.hxx,svx/AccessibleShapeTreeInfo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcgitm.hxx,svx/sxcgitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedwit.hxx,svx/xlnedwit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdouno.hxx,svx/svdouno.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrmasterpagedescriptor.hxx,svx/sdrmasterpagedescriptor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcikitm.hxx,svx/sxcikitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoutl.hxx,svx/svdoutl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapepropertynotifier.hxx,svx/shapepropertynotifier.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxctitm.hxx,svx/sxctitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaexchange.hxx,svx/dbaexchange.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtritm.hxx,svx/sxmtritm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectuser.hxx,svx/sdrobjectuser.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShape.hxx,svx/AccessibleShape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hlnkitem.hxx,svx/hlnkitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xhatch.hxx,svx/xhatch.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeexample.hxx,svx/swframeexample.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstwit.hxx,svx/xlnstwit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xit.hxx,svx/xit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhlpln.hxx,svx/svdhlpln.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ctredlin.hxx,svx/ctredlin.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lathe3d.hxx,svx/lathe3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgrid.hxx,svx/optgrid.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/langbox.hxx,svx/langbox.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipfmtitem.hxx,svx/clipfmtitem.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsetit.hxx,svx/xsetit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabarea.hxx,svx/tabarea.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagCtl.hxx,svx/SmartTagCtl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolor.hxx,svx/tbxcolor.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmrkv.hxx,svx/svdmrkv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/modctrl.hxx,svx/modctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoapi.hxx,svx/unoapi.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ruler.hxx,svx/ruler.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectfilter.hxx,svx/sdrobjectfilter.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtfitm.hxx,svx/sxmtfitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdundo.hxx,svx/svdundo.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hdft.hxx,svx/hdft.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlexchg.hxx,svx/xmlexchg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarder.hxx,svx/IAccessibleViewForwarder.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialogs.hrc,svx/dialogs.hrc))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrud3d.hxx,svx/extrud3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopool.hxx,svx/unopool.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflhtit.hxx,svx/xflhtit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedit.hxx,svx/xlnedit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmleohlp.hxx,svx/xmleohlp.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ifaceids.hxx,svx/ifaceids.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftouit.hxx,svx/xftouit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selectioncontroller.hxx,svx/selectioncontroller.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpagewindow.hxx,svx/sdrpagewindow.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcpitm.hxx,svx/sdgcpitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/view3d.hxx,svx/view3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshape.hxx,svx/unoshape.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svimbase.hxx,svx/svimbase.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftstit.hxx,svx/xftstit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglue.hxx,svx/svdglue.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/helperhittest3d.hxx,svx/helperhittest3d.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/flagsdef.hxx,svx/flagsdef.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaaitm.hxx,svx/sdtaaitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmview.hxx,svx/fmview.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
+
diff --git a/editeng/util/makefile.pmk b/svx/Package_sdi.mk
index 73050245fd..0a43a1ae7b 100644..100755
--- a/editeng/util/makefile.pmk
+++ b/svx/Package_sdi.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,19 +25,9 @@
 #
 #*************************************************************************
 
-# define EDITENG_DLLIMPLEMENTATION (see @ editengdllapi.h)
-CDEFS += -DEDITENG_DLLIMPLEMENTATION
+$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi))
+$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi))
 
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
 
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
-.ENDIF
-
-VISIBILITY_HIDDEN=TRUE
diff --git a/svx/doc/UML/edit_engine_UNO_implementation.zuml b/svx/doc/UML/edit_engine_UNO_implementation.zuml
index d0faf5adec..d0faf5adec 100644..100755
--- a/svx/doc/UML/edit_engine_UNO_implementation.zuml
+++ b/svx/doc/UML/edit_engine_UNO_implementation.zuml
diff --git a/svx/doc/UML/grid_control_implementation.zuml b/svx/doc/UML/grid_control_implementation.zuml
index 139cd3fd8b..139cd3fd8b 100644..100755
--- a/svx/doc/UML/grid_control_implementation.zuml
+++ b/svx/doc/UML/grid_control_implementation.zuml
diff --git a/svx/doc/UML/readme.txt b/svx/doc/UML/readme.txt
index 7b9fc0a73a..7b9fc0a73a 100644..100755
--- a/svx/doc/UML/readme.txt
+++ b/svx/doc/UML/readme.txt
diff --git a/svx/doc/drawing_layer_UNO_objects.odg b/svx/doc/drawing_layer_UNO_objects.odg
index 69b0ceb44f..69b0ceb44f 100644..100755
--- a/svx/doc/drawing_layer_UNO_objects.odg
+++ b/svx/doc/drawing_layer_UNO_objects.odg
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index 372bddd215..372bddd215 100644..100755
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.hrc
diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx
index 18436c3ac4..18436c3ac4 100644..100755
--- a/svx/inc/dgdefs_.hxx
+++ b/svx/inc/dgdefs_.hxx
diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx
index 7d01b3cc9c..7d01b3cc9c 100644..100755
--- a/svx/inc/dialdll.hxx
+++ b/svx/inc/dialdll.hxx
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 5226f35838..575e415970 100644..100755
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -88,7 +88,7 @@ public:
         SdrDragView &rView,
         const SdrMarkList& rMark,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void TakeSdrDragComment(String& rStr) const;
     virtual bool BeginSdrDrag();
@@ -119,7 +119,7 @@ public:
         SdrDragView &rView,
         const SdrMarkList& rMark,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void MoveSdrDrag(const Point& rPnt);
     virtual Pointer GetSdrDragPointer() const;
@@ -144,7 +144,7 @@ public:
         const SdrMarkList& rMark,
         SdrHdlKind eDrgHdl = HDL_MOVE,
         E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
-        BOOL bFull = FALSE);
+        sal_Bool bFull = sal_False);
 
     virtual void MoveSdrDrag(const Point& rPnt);
     virtual Pointer GetSdrDragPointer() const;
diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx
index 84bc939055..84bc939055 100644..100755
--- a/svx/inc/drawuiks.hxx
+++ b/svx/inc/drawuiks.hxx
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 475622c3f3..475622c3f3 100644..100755
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index 18856789be..1ca50e09fa 100644..100755
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -141,3 +141,6 @@
 #define FL_MAT_SPECULAR             123
 #define FT_MAT_FAVORITES   			124
 #define LB_MAT_FAVORITES   			125
+
+// IAccessibility2 implementation
+#define STR_COLOR_LIGHT_PRE				162
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index f40993facc..5458ab9a04 100644..100755
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -27,91 +27,87 @@
 #ifndef _SVX_FMHELP_HRC
 #define _SVX_FMHELP_HRC
 
-// include	   -----------------------------------------------------------
-#include <svl/solar.hrc>
-
-// in solar.hrc
-//#define HID_FORMS_START		 		(HID_LIB_START+4000)
-//#define HID_FORMS_END					(HID_LIB_START+4999)
-
 // Help-Ids --------------------------------------------------------------
-#define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
-#define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
-#define HID_FORM_NAVIGATOR_WIN                  ( HID_FORMS_START +   3)
-#define HID_FIELD_SEL                           ( HID_FORMS_START +   4)
-#define HID_FIELD_SEL_WIN                       ( HID_FORMS_START +   5)
-#define HID_FILTER_NAVIGATOR                    ( HID_FORMS_START +   6)
-#define HID_FILTER_NAVIGATOR_WIN                ( HID_FORMS_START +   7)
-#define HID_FM_DLG_SEARCH                       ( HID_FORMS_START +   8)
-#define HID_SEARCH_TEXT                         ( HID_FORMS_START +   9)
-#define HID_SEARCH_ALLFIELDS                    ( HID_FORMS_START +  10)
-//#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
-#define HID_SEARCH_FIELDSELECTION               ( HID_FORMS_START +  12)
-#define HID_SEARCH_POSITION                     ( HID_FORMS_START +  13)
-#define HID_SEARCH_FORMATTER                    ( HID_FORMS_START +  14)
-#define HID_SEARCH_CASE                         ( HID_FORMS_START +  15)
-#define HID_SEARCH_BACKWARD                     ( HID_FORMS_START +  16)
-#define HID_SEARCH_STARTOVER                    ( HID_FORMS_START +  17)
-#define HID_SEARCH_WILDCARD                     ( HID_FORMS_START +  18)
-#define HID_SEARCH_REGULAR                      ( HID_FORMS_START +  19)
-#define HID_SEARCH_APPROX                       ( HID_FORMS_START +  20)
-#define HID_SEARCH_APPROXSETTINGS               ( HID_FORMS_START +  21)
-#define HID_SEARCH_BTN_SEARCH                   ( HID_FORMS_START +  22)
-#define HID_SEARCH_BTN_CLOSE                    ( HID_FORMS_START +  23)
-#define	HID_CONTROLS_DATE_N_TIME				( HID_FORMS_START +  24)
-#define HID_GRID_TRAVEL_FIRST                   ( HID_FORMS_START +  25)
-#define HID_GRID_TRAVEL_PREV                    ( HID_FORMS_START +  26)
-#define HID_GRID_TRAVEL_NEXT                    ( HID_FORMS_START +  27)
-#define HID_GRID_TRAVEL_LAST                    ( HID_FORMS_START +  28)
-#define HID_GRID_TRAVEL_NEW                     ( HID_FORMS_START +  29)
-#define HID_GRID_TRAVEL_ABSOLUTE                ( HID_FORMS_START +  30)
-#define HID_GRID_NUMBEROFRECORDS                ( HID_FORMS_START +  31)
-#define UID_SEARCH_RECORDSTATUS                 ( HID_FORMS_START +  32)
-#define UID_FORMPROPBROWSER_FRAME               ( HID_FORMS_START +  33)
-#define UID_ABSOLUTE_RECORD_WINDOW              ( HID_FORMS_START +  34)
-#define HID_DATA_NAVIGATOR_WIN                  ( HID_FORMS_START +  35)
-#define HID_XFORMS_ADDDATAITEM_DLG              ( HID_FORMS_START +  36)
-#define HID_XFORMS_ADDCONDITION_DLG             ( HID_FORMS_START +  37)
-#define HID_XFORMS_NAMESPACEITEM_DLG            ( HID_FORMS_START +  38)
-#define HID_XFORMS_NAMESPACEITEM_LIST           ( HID_FORMS_START +  39)
-#define HID_XFORMS_MANAGENAMESPACE_DLG          ( HID_FORMS_START +  40)
-//#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
-//#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
-//#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
-#define HID_MN_XFORMS_MODELS_ADD                ( HID_FORMS_START +  44)
-#define HID_MN_XFORMS_MODELS_EDIT               ( HID_FORMS_START +  45)
-#define HID_MN_XFORMS_MODELS_REMOVE             ( HID_FORMS_START +  46)
-#define HID_MN_XFORMS_INSTANCES_ADD             ( HID_FORMS_START +  47)
-#define HID_MN_XFORMS_INSTANCES_EDIT            ( HID_FORMS_START +  48)
-#define HID_MN_XFORMS_INSTANCES_REMOVE          ( HID_FORMS_START +  49)
-#define HID_MN_XFORMS_SHOW_DETAILS              ( HID_FORMS_START +  50)
-#define HID_XFORMS_TOOLBOX                      ( HID_FORMS_START +  51)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD             ( HID_FORMS_START +  52)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     ( HID_FORMS_START +  53)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   ( HID_FORMS_START +  54)
-#define HID_XFORMS_TOOLBOX_ITEM_EDIT            ( HID_FORMS_START +  55)
-#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          ( HID_FORMS_START +  56)
-#define HID_XFORMS_ITEMS_LIST                   ( HID_FORMS_START +  57)
-#define HID_XFORMS_MODELS_LIST                  ( HID_FORMS_START +  58)
-#define HID_XFORMS_MODELS_MENUBTN               ( HID_FORMS_START +  59)
-#define HID_XFORMS_INSTANCES_MENUBTN            ( HID_FORMS_START +  60)
-#define HID_XFORMS_ADDSUBMISSION_DLG            ( HID_FORMS_START +  61)
-#define HID_XFORMS_ADDMODEL_DLG                 ( HID_FORMS_START +  62)
-#define HID_XFORMS_ADDINSTANCE_DLG              ( HID_FORMS_START +  63)
-#define HID_XFORMS_MID_INSERT_CONTROL           ( HID_FORMS_START +  64)
-#define HID_XFORMS_TAB_CONTROL                  ( HID_FORMS_START +  65)
-    // if you add a new define here, please adjust the overflow check
-    // at the end of the file!!
-
-// -----------------------------------------------------------------------
-// Overflow check --------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_FM_HID_END      HID_XFORMS_TAB_CONTROL
-
-#if ACT_FM_HID_END > HID_FORMS_END
-#error Resource overflow in #line, #file
-#endif
+#define HID_DLG_DBMSG                                         "SVX_HID_DLG_DBMSG"
+#define HID_FORM_NAVIGATOR                                    "SVX_HID_FORM_NAVIGATOR"
+#define HID_FORM_NAVIGATOR_WIN                                "SVX_HID_FORM_NAVIGATOR_WIN"
+#define HID_FIELD_SEL                                         "SVX_HID_FIELD_SEL"
+#define HID_FIELD_SEL_WIN                                     "SVX_HID_FIELD_SEL_WIN"
+#define HID_FILTER_NAVIGATOR                                  "SVX_HID_FILTER_NAVIGATOR"
+#define HID_FILTER_NAVIGATOR_WIN                              "SVX_HID_FILTER_NAVIGATOR_WIN"
+#define HID_FM_DLG_SEARCH                                     "SVX_HID_FM_DLG_SEARCH"
+#define HID_SEARCH_TEXT                                       "SVX_HID_SEARCH_TEXT"
+#define HID_SEARCH_ALLFIELDS                                  "SVX_HID_SEARCH_ALLFIELDS"
+#define HID_SEARCH_FIELDSELECTION                             "SVX_HID_SEARCH_FIELDSELECTION"
+#define HID_SEARCH_POSITION                                   "SVX_HID_SEARCH_POSITION"
+#define HID_SEARCH_FORMATTER                                  "SVX_HID_SEARCH_FORMATTER"
+#define HID_SEARCH_CASE                                       "SVX_HID_SEARCH_CASE"
+#define HID_SEARCH_BACKWARD                                   "SVX_HID_SEARCH_BACKWARD"
+#define HID_SEARCH_STARTOVER                                  "SVX_HID_SEARCH_STARTOVER"
+#define HID_SEARCH_WILDCARD                                   "SVX_HID_SEARCH_WILDCARD"
+#define HID_SEARCH_REGULAR                                    "SVX_HID_SEARCH_REGULAR"
+#define HID_SEARCH_APPROX                                     "SVX_HID_SEARCH_APPROX"
+#define HID_SEARCH_APPROXSETTINGS                             "SVX_HID_SEARCH_APPROXSETTINGS"
+#define HID_SEARCH_BTN_SEARCH                                 "SVX_HID_SEARCH_BTN_SEARCH"
+#define HID_SEARCH_BTN_CLOSE                                  "SVX_HID_SEARCH_BTN_CLOSE"
+#define HID_CONTROLS_DATE_N_TIME                              "SVX_HID_CONTROLS_DATE_N_TIME"
+#define HID_GRID_TRAVEL_FIRST                                 "SVX_HID_GRID_TRAVEL_FIRST"
+#define HID_GRID_TRAVEL_PREV                                  "SVX_HID_GRID_TRAVEL_PREV"
+#define HID_GRID_TRAVEL_NEXT                                  "SVX_HID_GRID_TRAVEL_NEXT"
+#define HID_GRID_TRAVEL_LAST                                  "SVX_HID_GRID_TRAVEL_LAST"
+#define HID_GRID_TRAVEL_NEW                                   "SVX_HID_GRID_TRAVEL_NEW"
+#define HID_GRID_TRAVEL_ABSOLUTE                              "SVX_HID_GRID_TRAVEL_ABSOLUTE"
+#define HID_GRID_NUMBEROFRECORDS                              "SVX_HID_GRID_NUMBEROFRECORDS"
+#define UID_SEARCH_RECORDSTATUS                               "SVX_UID_SEARCH_RECORDSTATUS"
+#define UID_FORMPROPBROWSER_FRAME                             "SVX_UID_FORMPROPBROWSER_FRAME"
+#define UID_ABSOLUTE_RECORD_WINDOW                            "SVX_UID_ABSOLUTE_RECORD_WINDOW"
+#define HID_DATA_NAVIGATOR_WIN                                "SVX_HID_DATA_NAVIGATOR_WIN"
+#define HID_XFORMS_ADDDATAITEM_DLG                            "SVX_HID_XFORMS_ADDDATAITEM_DLG"
+#define HID_XFORMS_ADDCONDITION_DLG                           "SVX_HID_XFORMS_ADDCONDITION_DLG"
+#define HID_XFORMS_NAMESPACEITEM_DLG                          "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
+#define HID_XFORMS_NAMESPACEITEM_LIST                         "SVX_HID_XFORMS_NAMESPACEITEM_LIST"
+#define HID_XFORMS_MANAGENAMESPACE_DLG                        "SVX_HID_XFORMS_MANAGENAMESPACE_DLG"
+#define HID_MN_XFORMS_MODELS_ADD                              "SVX_HID_MN_XFORMS_MODELS_ADD"
+#define HID_MN_XFORMS_MODELS_EDIT                             "SVX_HID_MN_XFORMS_MODELS_EDIT"
+#define HID_MN_XFORMS_MODELS_REMOVE                           "SVX_HID_MN_XFORMS_MODELS_REMOVE"
+#define HID_MN_XFORMS_INSTANCES_ADD                           "SVX_HID_MN_XFORMS_INSTANCES_ADD"
+#define HID_MN_XFORMS_INSTANCES_EDIT                          "SVX_HID_MN_XFORMS_INSTANCES_EDIT"
+#define HID_MN_XFORMS_INSTANCES_REMOVE                        "SVX_HID_MN_XFORMS_INSTANCES_REMOVE"
+#define HID_MN_XFORMS_SHOW_DETAILS                            "SVX_HID_MN_XFORMS_SHOW_DETAILS"
+#define HID_XFORMS_TOOLBOX                                    "SVX_HID_XFORMS_TOOLBOX"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD                           "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT                   "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE                 "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE"
+#define HID_XFORMS_TOOLBOX_ITEM_EDIT                          "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT"
+#define HID_XFORMS_TOOLBOX_ITEM_REMOVE                        "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE"
+#define HID_XFORMS_ITEMS_LIST                                 "SVX_HID_XFORMS_ITEMS_LIST"
+#define HID_XFORMS_MODELS_LIST                                "SVX_HID_XFORMS_MODELS_LIST"
+#define HID_XFORMS_MODELS_MENUBTN                             "SVX_HID_XFORMS_MODELS_MENUBTN"
+#define HID_XFORMS_INSTANCES_MENUBTN                          "SVX_HID_XFORMS_INSTANCES_MENUBTN"
+#define HID_XFORMS_ADDSUBMISSION_DLG                          "SVX_HID_XFORMS_ADDSUBMISSION_DLG"
+#define HID_XFORMS_ADDMODEL_DLG                               "SVX_HID_XFORMS_ADDMODEL_DLG"
+#define HID_XFORMS_ADDINSTANCE_DLG                            "SVX_HID_XFORMS_ADDINSTANCE_DLG"
+#define HID_XFORMS_MID_INSERT_CONTROL                         "SVX_HID_XFORMS_MID_INSERT_CONTROL"
+#define HID_XFORMS_TAB_CONTROL                                "SVX_HID_XFORMS_TAB_CONTROL"
+#define HID_FM_DELETEROWS                                     "SVX_HID_FM_DELETEROWS"
+#define HID_FM_INSERTCOL                                      "SVX_HID_FM_INSERTCOL"
+#define HID_FM_CHANGECOL                                      "SVX_HID_FM_CHANGECOL" 
+#define HID_FM_DELETECOL                                      "SVX_HID_FM_DELETECOL" 
+#define HID_FM_HIDECOL                                        "SVX_HID_FM_HIDECOL" 
+#define HID_FM_SHOWCOLS                                       "SVX_HID_FM_SHOWCOLS"  
+#define HID_FM_SHOWCOLS_MORE                                  "SVX_HID_FM_SHOWCOLS_MORE"
+#define HID_FM_SHOWALLCOLS                                    "SVX_HID_FM_SHOWALLCOLS"
+#define HID_FM_DELETE                                         "SVX_HID_FM_DELETE"
+#define HID_FM_FILTER_EDIT                                    "SVX_HID_FM_EDIT"
+#define HID_FM_FILTER_IS_NULL                                 "SVX_HID_FM_FILTER_IS_NULL"
+#define HID_FM_FILTER_IS_NOT_NULL                             "SVX_HID_FM_IS_NOT_NULL"
+#define HID_FM_NEW                                            "SVX_HID_FM_NEW"
+#define HID_FM_NEW_FORM                                       "SVX_HID_FM_NEW_FORM"
+#define HID_FM_NEW_HIDDEN                                     "SVX_HID_FM_NEW_HIDDEN"
+#define HID_FM_RENAME_OBJECT                                  "SVX_HID_FM_RENAME_OBJECT"
+#define HID_MENU_FM_TEXTATTRIBUTES_STYLE                      "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE"
+#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT                  "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT"
+#define HID_MENU_FM_TEXTATTRIBUTES_SPACING                    "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING"
 
 #endif
 
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 6288c7beea..6288c7beea 100644..100755
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index dab48bd18a..20306605a7 100644..100755
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -37,7 +37,7 @@
 #include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
 #include <svtools/miscopt.hxx>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // ----------------------
 // - GalleryBrowserMode -
@@ -118,18 +118,18 @@ private:
     FixedLine           maSeparator;
     FixedText			maInfoBar;
     Point				maDragStartPos;
-    ULONG				mnCurActionPos;
+    sal_uIntPtr				mnCurActionPos;
     GalleryBrowserMode  meMode;
     GalleryBrowserMode  meLastMode;
-    BOOL				mbCurActionIsLinkage;
+    sal_Bool				mbCurActionIsLinkage;
 
     void                InitSettings();
 
-    void				ImplUpdateViews( USHORT nSelectionId );
+    void				ImplUpdateViews( sal_uInt16 nSelectionId );
     void				ImplUpdateInfoBar();
-    ULONG               ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
-    void                ImplSelectItemId( ULONG nItemId );
-    void                ImplExecute( USHORT nId );
+    sal_uIntPtr               ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
+    void                ImplSelectItemId( sal_uIntPtr nItemId );
+    void                ImplExecute( sal_uInt16 nId );
 
     // Control
     virtual void		Resize();
@@ -149,7 +149,7 @@ private:
 
 public:
 
-    static String		GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags );
+    static String		GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags );
 
 public:
 
@@ -168,15 +168,15 @@ public:
     INetURLObject		GetURL() const;
     String				GetFilterName() const;
     Graphic				GetGraphic() const;
-    BOOL				GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL				IsLinkage() const;
+    sal_Bool				GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool				IsLinkage() const;
 
     sal_Int8			AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
     sal_Int8			ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
     void                StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
     void                TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
     void                ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
-    BOOL                KeyInput( const KeyEvent& rEvt, Window* pWindow );
+    sal_Bool                KeyInput( const KeyEvent& rEvt, Window* pWindow );
 };
 
 #endif
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 2a02de4ccb..2a02de4ccb 100644..100755
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 91de8cf4cf..eb175c0bd6 100644..100755
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -84,13 +84,13 @@ protected:
     INetURLObject			aURL;
     String					aUserName;
     String					aTitle;
-    BOOL					bIsValid;
-    BOOL					bIsThumbBmp;
+    sal_Bool					bIsValid;
+    sal_Bool					bIsThumbBmp;
 
     virtual void 			WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void 			ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void 			ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    BOOL					CreateThumb( const Graphic& rGraphic );
+    sal_Bool					CreateThumb( const Graphic& rGraphic );
 
 public:
 
@@ -98,13 +98,13 @@ public:
     virtual					~SgaObject() {};
 
     virtual SgaObjKind		GetObjKind() const = 0;
-    virtual UINT16			GetVersion() const = 0;
+    virtual sal_uInt16			GetVersion() const = 0;
 
     virtual Bitmap 			GetThumbBmp() const { return aThumbBmp; }
     const GDIMetaFile&		GetThumbMtf() const { return aThumbMtf; }
     const INetURLObject&	GetURL() const { return aURL; }
-    BOOL					IsValid() const { return bIsValid; }
-    BOOL					IsThumbBitmap() const { return bIsThumbBmp; }
+    sal_Bool					IsValid() const { return bIsValid; }
+    sal_Bool					IsThumbBitmap() const { return bIsThumbBmp; }
 
     const String            GetTitle() const;
     void                    SetTitle( const String& rTitle );
@@ -124,9 +124,9 @@ private:
     GalSoundType		eSoundType;
 
     virtual void 		WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void 		ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void 		ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16		GetVersion() const { return 6; }
+    virtual sal_uInt16		GetVersion() const { return 6; }
 
 public:
 
@@ -151,12 +151,12 @@ class SgaObjectSvDraw : public SgaObject
 
 private:
 
-    BOOL				CreateThumb( const FmFormModel& rModel );
+    sal_Bool				CreateThumb( const FmFormModel& rModel );
 
     virtual void 		WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void 		ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void 		ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16		GetVersion() const { return 5; }
+    virtual sal_uInt16		GetVersion() const { return 5; }
 
 public:
 
@@ -169,7 +169,7 @@ public:
 
 public:
 
-    static BOOL         DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+    static sal_Bool         DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
 };
 
 // ----------------
@@ -183,9 +183,9 @@ private:
     void				Init( const Graphic& rGraphic, const INetURLObject& rURL );
 
     virtual void   		WriteData( SvStream& rOut, const String& rDestDir ) const;
-    virtual void   		ReadData( SvStream& rIn, UINT16& rReadVersion );
+    virtual void   		ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
 
-    virtual UINT16		GetVersion() const { return 5; }
+    virtual sal_uInt16		GetVersion() const { return 5; }
 
 public:
 
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index adf0837dbb..adf0837dbb 100644..100755
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
deleted file mode 100644
index b51334d0f8..0000000000
--- a/svx/inc/globlac.hrc
+++ /dev/null
@@ -1,223 +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.
- *
- ************************************************************************/
-
-#ifndef _GLOBALACC_SRC
-#define _GLOBALACC_SRC
-
-#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \
-                    AcceleratorItem { Identifier = Id; \
-                            Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; };
-
-#define ACC_FUNC( Id, f ) \
-                AcceleratorItem { Identifier = Id; \
-                    Key = KeyCode { Function = f ; }; };
-
-#define ACC_KEY( language, c, bSh, bM1, bM2 ) \
-                    Key[ language ] = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \
-                    Key = KeyCode { Code = c ; \
-                                Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-
-#define AI_HELPINDEX				ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_CHAR				ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE )
-// new shortcut F9 for starting slide-show (see #73417#)
-#define AI_PRESENTATION 			ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE )
-// formerly used shortcut Ctrl-F2.  Still used (in sd) for compatibility
-#define AI_PRESENTATION_COMPAT 		ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE )
-#define AI_ENTER_GROUP				ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE )
-#define AI_COPYOBJECTS				ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE )
-#define AI_LEAVE_GROUP				ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE )
-#define AI_ATTR_TRANSFORM			ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE )
-#define AI_NAVIGATOR				ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE )
-#define AI_SPELLING                 ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE )
-#define AI_THESAURUS				ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE )
-#define AI_BEZIER_EDIT				ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE )
-#define AI_ATTR_TEXT_FITTOSIZE		ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE )
-#define AI_STYLE_DESIGNER			ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE )
-#define AI_OUTLINEMODE				ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE )
-#define AI_DRAWINGMODE				ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE )
-
-#define AI_ATTR_PARA_LINESPACE_10	ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_20	ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE )
-#define AI_ATTR_PARA_LINESPACE_15	ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE )
-#define AI_SHOW_ITEMBROWSER 		ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE )
-
-#define AI_ATTR_PARA_ADJUST_BLOCK	AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\
-                                        ACC_DEF_KEY(        KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,		KEY_J, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,		KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_CENTER	AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\
-                                        ACC_DEF_KEY(     	KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_E, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_C, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_J, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_WEIGHT 		AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\
-                                        ACC_DEF_KEY(        KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_N, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,		KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,		KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru,		KEY_B, FALSE, TRUE, FALSE ) };
-
-#define AI_SEARCH_DLG				AcceleratorItem { Identifier = SID_SEARCH_DLG;\
-                                        ACC_DEF_KEY(    	KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_B, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_G, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_F, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_F, FALSE, TRUE, FALSE ) };
-
-#define AI_GROUP					ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE )
-#define AI_UNGROUP					ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE )
-
-// Weitersuchen ...
-#define AI_SET_SUPER_SCRIPT 		AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\
-                                        ACC_DEF_KEY(    	KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( de	,		KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_P, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_H, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_H, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_POSTURE		AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\
-                                        ACC_DEF_KEY(		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da ,		KEY_K, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl ,		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,		KEY_I, FALSE, TRUE, FALSE ) };
-
-#define AI_COMBINE					ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE )
-#define AI_DISMANTLE				ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE )
-#define AI_ATTR_PARA_ADJUST_LEFT	AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\
-                                        ACC_DEF_KEY(		KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_L, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_I, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_G, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_L, FALSE, TRUE, FALSE ) };
-
-#define AI_ATTR_PARA_ADJUST_RIGHT	AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\
-                                        ACC_DEF_KEY(		KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_R, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_D, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_D, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_R, FALSE, TRUE, FALSE ) };
-
-#define AI_SET_SUB_SCRIPT			AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\
-                                        ACC_DEF_KEY(		KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY(	de ,		KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_B, TRUE,  TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_T, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_P, TRUE,  TRUE, FALSE ) };
-
-#define AI_ATTR_CHAR_UNDERLINE		AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\
-                                        ACC_DEF_KEY(		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( de ,			KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( en-US ,	KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( it ,		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( es ,		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( fr ,		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( nl , 		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( da,		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( pl,		KEY_U, FALSE, TRUE, FALSE ) \
-                                        ACC_KEY( ru ,		KEY_U, FALSE, TRUE, FALSE ) };
-
-#define AI_STYLE_CATALOG            ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE )
-#define AI_WIN_FULLSCREEN			ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE )
-
-#define AI_FOCUSURLBOX				ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE )
-#define AI_SELECTALL				ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE )
-
-// Anordnung
-#define AI_FRAME_TO_TOP 			ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE )
-#define AI_MOREFRONT				ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE )
-#define AI_FRAME_TO_BOTTOM			ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE )
-#define AI_MOREBACK 				ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE )
-
-// sonstige Acceleratoren
-#define AI_NEWDOC                   ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE )
-#define AI_NEWDOCDIRECT             ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE )
-#define AI_OPENDOC                  ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE )
-#define AI_CLOSEWIN                 ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE )
-#define AI_SAVEDOC                  ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE )
-#define AI_PRINTDOC                 ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE )
-#define AI_QUITAPP                  ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE )
-#define AI_CUT                      ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE )
-#define AI_COPY                     ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE )
-#define AI_PASTE                    ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \
-                                    ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE )
-#define AI_UNDO                     ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \
-                                    ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \
-                                    ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE )
-#define AI_REDO                     ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE )
-#define AI_REPEAT                   ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE )
-#define AI_DELETE                   ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE )
-
-#endif // _GLOBLACC_SRC
-
-
-
-
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 6d4309e788..1b88228905 100644..100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -38,288 +38,242 @@
 #define ITEM_FORM_CONTROL_PROPERTIES\
     Identifier = SID_FM_CTL_PROPERTIES ; \
     Command = ".uno:ControlProperties" ; \
-    HelpID = SID_FM_CTL_PROPERTIES ; \
     Text [ en-US ] = "Con~trol..." ; \
 
 #define ITEM_FORM_PROPERTIES\
     Identifier = SID_FM_PROPERTIES ; \
     Command = ".uno:FormProperties" ; \
-    HelpID = SID_FM_PROPERTIES ; \
     Text [ en-US ] = "For~m..." ; \
 
 #define ITEM_REPLACE_CONTROL\
     Identifier = SID_FM_CHANGECONTROLTYPE ;\
     Command = ".uno:ChangeControlType" ; \
-    HelpID = SID_FM_CHANGECONTROLTYPE ; \
         Text [ en-US ] = "~Replace with";	\
 
 #define ITEM_FORMAT_TEMPLATECATALOG \
     Identifier = SID_STYLE_CATALOG ; \
     Command = ".uno:StyleCatalog" ; \
-    HelpID = SID_STYLE_CATALOG ; \
     Text [ en-US ] = "~Catalog..." ; \
 
 #define ITEM_FORMAT_TEMPLATE \
     Identifier = SID_STYLE_DESIGNER ; \
     Command = ".uno:DesignerDialog" ; \
-    HelpID = SID_STYLE_DESIGNER ; \
     Text [ en-US ] = "St~ylist" ; \
 
 #define ITEM_FORMAT_AUTOFORMAT \
     Identifier = SID_AUTOFORMAT ; \
     Command = ".uno:AutoFormat" ; \
-    HelpID = SID_AUTOFORMAT ; \
     Text [ en-US ] = "Auto~Format..." ;\
 
 #define ITEM_FORMAT_CHAR_DLG \
     Identifier = SID_CHAR_DLG ; \
     Command = ".uno:FontDialog" ; \
-    HelpID = SID_CHAR_DLG ; \
     Text [ en-US ] = "C~haracter..." ;\
 
 #define ITEM_FORMAT_PARA_DLG \
     Identifier = SID_PARA_DLG ; \
     Command = ".uno:ParagraphDialog" ; \
-    HelpID = SID_PARA_DLG ; \
     Text [ en-US ] = "P~aragraph..." ;\
 
 #define ITEM_FORMAT_FONTWORK \
     Identifier = SID_FONTWORK ; \
     Command = ".uno:FontWork" ; \
-    HelpID = SID_FONTWORK ; \
     Text [ en-US ] = "F~ontwork" ;\
 
 #define ITEM_EDIT_CUT \
     Identifier = SID_CUT ; \
     Command = ".uno:Cut" ; \
-    HelpID = SID_CUT ; \
     Text [ en-US ] = "Cu~t" ;\
 
 #define ITEM_EDIT_COPY \
     Identifier = SID_COPY ; \
     Command = ".uno:Copy" ; \
-    HelpID = SID_COPY ; \
     Text [ en-US ] = "~Copy" ;\
 
 #define ITEM_EDIT_DELETE \
     Identifier = SID_DELETE ; \
     Command = ".uno:Delete" ; \
-    HelpID = SID_DELETE ; \
     Text [ en-US ] = "~Delete" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_FONT \
     Identifier = SID_ATTR_CHAR_FONT ; \
     Command = ".uno:CharFontName" ; \
-    HelpID = SID_ATTR_CHAR_FONT ; \
     Text [ en-US ] = "Font" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \
     Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
     Command = ".uno:FontHeight" ; \
-    HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \
     Text [ en-US ] = "Size" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_WEIGHT \
     Identifier = SID_ATTR_CHAR_WEIGHT ; \
     Command = ".uno:Bold" ; \
-    HelpID = SID_ATTR_CHAR_WEIGHT ; \
     Text [ en-US ] = "Bold" ; \
 
 #define ITEM_FORMAT_ATTR_CHAR_POSTURE \
     Identifier = SID_ATTR_CHAR_POSTURE ; \
     Command = ".uno:Italic" ; \
-    HelpID = SID_ATTR_CHAR_POSTURE ; \
     Text [ en-US ] = "Italic" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \
     Identifier = SID_ATTR_CHAR_UNDERLINE ; \
     Command = ".uno:Underline" ; \
-    HelpID = SID_ATTR_CHAR_UNDERLINE ; \
     Text [ en-US ] = "Underline" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_OVERLINE \
     Identifier = SID_ATTR_CHAR_OVERLINE ; \
         Command = ".uno:Overline" ; \
-    HelpID = SID_ATTR_CHAR_OVERLINE ; \
     Text [ en-US ] = "Overline" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \
     Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
     Command = ".uno:Strikeout" ; \
-    HelpID = SID_ATTR_CHAR_STRIKEOUT ; \
     Text [ en-US ] = "Strikethrough" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_SHADOWED \
     Identifier = SID_ATTR_CHAR_SHADOWED ; \
     Command = ".uno:Shadowed" ; \
-    HelpID = SID_ATTR_CHAR_SHADOWED ; \
     Text [ en-US ] = "Shadow" ;\
 
 #define ITEM_FORMAT_ATTR_CHAR_CONTOUR \
     Identifier = SID_ATTR_CHAR_CONTOUR ; \
     Command = ".uno:OutlineFont" ; \
-    HelpID = SID_ATTR_CHAR_CONTOUR ; \
     Text [ en-US ] = "Outline" ;\
 
 #define ITEM_FORMAT_SET_SUPER_SCRIPT \
     Identifier = SID_SET_SUPER_SCRIPT; \
-    HelpID = SID_SET_SUPER_SCRIPT; \
+    Command = CMD_SID_SET_SUPER_SCRIPT; \
     Text [ en-US  ] = "Su~perscript"; \
 
 #define ITEM_FORMAT_SET_SUB_SCRIPT \
     Identifier = SID_SET_SUB_SCRIPT; \
-    HelpID = SID_SET_SUB_SCRIPT; \
+    Command = CMD_SID_SET_SUB_SCRIPT; \
     Text [ en-US ] = "Su~bscript"; \
 
 
 #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \
     Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
     Command = ".uno:LeftPara" ; \
-    HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \
     Text [ en-US ] = "~Left" ;\
 
 #define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \
     Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
     Command = ".uno:RightPara" ; \
-    HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \
     Text [ en-US ] = "~Right" ;\
 
 #define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \
     Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
     Command = ".uno:CenterPara" ; \
-    HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \
     Text [ en-US ] = "~Centered" ;\
 
 #define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \
     Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
     Command = ".uno:JustifyPara" ; \
-    HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
     Text [ en-US ] = "Justified" ;\
 
 #define ITEM_FORMAT_PARA_LINESPACE_10 \
     Identifier = SID_ATTR_PARA_LINESPACE_10 ; \
     Command = ".uno:SpacePara1" ; \
-    HelpID = SID_ATTR_PARA_LINESPACE_10 ; \
     Text [ en-US ] = "Single" ;\
 
 #define ITEM_FORMAT_PARA_LINESPACE_15 \
     Identifier = SID_ATTR_PARA_LINESPACE_15 ; \
     Command = ".uno:SpacePara15" ; \
-    HelpID = SID_ATTR_PARA_LINESPACE_15 ; \
     Text [ en-US ] = "1.5 lines" ;\
     
 #define ITEM_FORMAT_PARA_LINESPACE_20 \
     Identifier = SID_ATTR_PARA_LINESPACE_20 ; \
     Command = ".uno:SpacePara2" ; \
-    HelpID = SID_ATTR_PARA_LINESPACE_20 ; \
     Text [ en-US ] = "~Double" ;\
     
 #define ITEM_FORMAT_FRAME_TO_TOP \
     Identifier = SID_FRAME_TO_TOP ; \
     Command = ".uno:BringToFront" ; \
-    HelpID = SID_FRAME_TO_TOP ; \
     Text [ en-US ] = "~Bring to Front" ;\
 
 #define ITEM_FORMAT_FRAME_TO_BOTTOM \
     Identifier = SID_FRAME_TO_BOTTOM ; \
     Command = ".uno:SendToBack" ; \
-    HelpID = SID_FRAME_TO_BOTTOM ; \
     Text [ en-US ] = "~Send to Back" ;\
 
 #define ITEM_FORMAT_OBJECT_ALIGN \
     Identifier = SID_OBJECT_ALIGN ; \
     Command = ".uno:ObjectAlign" ; \
-    HelpID = SID_OBJECT_ALIGN ; \
     Text [ en-US ] = "A~lignment" ;\
     
 #define ITEM_FORMAT_OBJECT_ALIGN_LEFT \
     Identifier = SID_OBJECT_ALIGN_LEFT ; \
     Command = ".uno:ObjectAlignLeft" ; \
-    HelpID = SID_OBJECT_ALIGN_LEFT ; \
     Text [ en-US ] = "~Left" ;\
     
 #define ITEM_FORMAT_OBJECT_ALIGN_CENTER \
     Identifier = SID_OBJECT_ALIGN_CENTER ; \
     Command = ".uno:AlignCenter" ; \
-    HelpID = SID_OBJECT_ALIGN_CENTER ; \
     Text [ en-US ] = "~Centered" ;\
 
 #define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \
     Identifier = SID_OBJECT_ALIGN_RIGHT ; \
     Command = ".uno:ObjectAlignRight" ; \
-    HelpID = SID_OBJECT_ALIGN_RIGHT ; \
     Text [ en-US ] = "~Right" ;\
     
 #define ITEM_FORMAT_OBJECT_ALIGN_UP \
     Identifier = SID_OBJECT_ALIGN_UP ; \
     Command = ".uno:AlignUp" ; \
-    HelpID = SID_OBJECT_ALIGN_UP ; \
     Text [ en-US ] = "~Top" ;\
     
 #define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \
     Identifier = SID_OBJECT_ALIGN_MIDDLE ; \
     Command = ".uno:AlignMiddle" ; \
-    HelpID = SID_OBJECT_ALIGN_MIDDLE ; \
     Text [ en-US ] = "C~enter" ;\
     
 #define ITEM_FORMAT_OBJECT_ALIGN_DOWN \
     Identifier = SID_OBJECT_ALIGN_DOWN ; \
     Command = ".uno:AlignDown" ; \
-    HelpID = SID_OBJECT_ALIGN_DOWN ; \
     Text [ en-US ] = "~Bottom" ;\
 
 #define ITEM_FORMAT_ATTRIBUTES_LINE \
     Identifier = SID_ATTRIBUTES_LINE ; \
     Command = ".uno:FormatLine" ; \
-    HelpID = SID_ATTRIBUTES_LINE ; \
     Text [ en-US ] = "L~ine..." ;\
 
 #define ITEM_FORMAT_ATTRIBUTES_AREA \
     Identifier = SID_ATTRIBUTES_AREA ; \
     Command = ".uno:FormatArea" ; \
-    HelpID = SID_ATTRIBUTES_AREA ; \
     Text [ en-US ] = "A~rea..." ;\
 
 #define ITEM_FORMAT_ATTR_TRANSFORM \
     Identifier = SID_ATTR_TRANSFORM ; \
     Command = ".uno:TransformDialog" ; \
-    HelpID = SID_ATTR_TRANSFORM ; \
     Text [ en-US ] = "Position and Si~ze..." ;\
     
 #define ITEM_FORMAT_OBJECT_HEAVEN \
     Identifier = SID_OBJECT_HEAVEN ; \
     Command = ".uno:SetObjectToForeground" ; \
-    HelpID = SID_OBJECT_HEAVEN ; \
     Text [ en-US ] = "~To Foreground" ;\
 
 #define ITEM_FORMAT_OBJECT_HELL \
     Identifier = SID_OBJECT_HELL ; \
     Command = ".uno:SetObjectToBackground" ; \
-    HelpID = SID_OBJECT_HELL ; \
     Text [ en-US ] = "T~o Background" ;\
 
 #define ITEM_FORMAT_BEZIER_EDIT \
     Identifier = SID_BEZIER_EDIT ; \
     Command = ".uno:ToggleObjectBezierMode" ; \
-    HelpID = SID_BEZIER_EDIT ; \
     Text [ en-US ] = "Edit ~Points" ;\
     
 #define ITEM_FILE_PICKLIST \
     Identifier = SID_PICKLIST ; \
     Command = ".uno:PickList" ; \
-    HelpID = SID_PICKLIST ; \
     Text [ en-US ] = "~File" ;	\
 
 #define ITEM_FILE_NEWDOC \
     Identifier = SID_NEWDOCDIRECT ; \
     Command = ".uno:AddDirect" ; \
-    HelpID = SID_NEWDOCDIRECT ; \
     Text [ en-US ] = "~New" ;\
     
 #define ITEM_FILE_OPENDOC \
     Identifier = SID_OPENDOC ; \
     Command = ".uno:Open" ; \
-    HelpID = SID_OPENDOC ; \
     Text [ en-US ] = "~Open..." ;\
     
 
@@ -328,62 +282,52 @@
     {\
         Identifier = SID_AUTOPILOTMENU ; \
         Command = ".uno:AutoPilotMenu" ; \
-        HelpID = SID_AUTOPILOTMENU ; \
         Text [ en-US ] = "A~utoPilot" ; \
             };
 
 #define ITEM_FILE_CLOSEDOC \
     Identifier = SID_CLOSEDOC ; \
     Command = ".uno:CloseDoc" ; \
-    HelpID = SID_CLOSEDOC ; \
     Text [ en-US ] = "~Close" ;\
     
 #define ITEM_FILE_SAVEDOC \
     Identifier = SID_SAVEDOC ; \
     Command = ".uno:Save" ; \
-    HelpID = SID_SAVEDOC ; \
     Text [ en-US ] = "~Save" ;	\
     
 #define ITEM_FILE_SAVEDOCS \
     Identifier = SID_SAVEDOCS ; \
     Command = ".uno:SaveAll" ; \
-    HelpID = SID_SAVEDOCS ; \
     Text [ en-US ] = "Sa~ve All" ; \
     
 #define ITEM_FILE_SAVEASDOC \
     Identifier = SID_SAVEASDOC ; \
     Command = ".uno:SaveAs" ; \
-    HelpID = SID_SAVEASDOC ; \
     Text [ en-US ] = "Save ~As..." ;	\
     
 #define ITEM_FILE_EXPORTDOC \
     Identifier = SID_EXPORTDOC ; \
     Command = ".uno:ExportTo" ; \
-    HelpID = SID_EXPORTDOC ; \
     Text [ en-US ] = "Expor~t..." ;   \
 
 #define ITEM_FILE_EXPORTDOCASPDF \
     Identifier = SID_EXPORTDOCASPDF ; \
     Command = ".uno:ExportToPDF" ; \
-    HelpID = SID_EXPORTDOCASPDF ; \
     Text [ en-US ] = "Export as P~DF..." ;  \
 
 #define ITEM_FILE_VERSIONDIALOG \
     Identifier = SID_VERSION ; \
     Command = ".uno:VersionDialog" ; \
-    HelpID = SID_VERSION ; \
     Text [ en-US ] = "Versions..." ; \
     
 #define ITEM_FILE_LASTVERSIONDOC \
     Identifier = SID_RELOAD ; \
     Command = ".uno:Reload" ; \
-    HelpID = SID_RELOAD ; \
     Text [ en-US ] = "Reload" ;\
     
 #define ITEM_FILE_DOCINFO \
     Identifier = SID_DOCINFO ; \
     Command = ".uno:SetDocumentProperties" ; \
-    HelpID = SID_DOCINFO ; \
     Text [ en-US ] = "Propert~ies..." ;\
     
 #define ITEM_FILE_DOCTEMPLATE \
@@ -398,28 +342,24 @@
             {                               \
                 Identifier = SID_ORGANIZER ; \
                 Command = ".uno:Organizer" ; \
-                HelpId = SID_ORGANIZER ;     \
                 Text [ en-US ] = "~Organize...";\
             };                                      \
             MenuItem	\
             {	\
                 Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE;	\
                 Command = ".uno:AddressBookSource" ; \
-                HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE;	\
                                 Text [ en-US ] = "~Address Book Source...";	\
             };	\
             MenuItem                                \
             {                                       \
                 Identifier = SID_DOCTEMPLATE ;      \
                 Command = ".uno:SaveAsTemplate" ;		\
-                HelpId = SID_DOCTEMPLATE ;          \
                 Text [ en-US ] = "~Save...";\
             };                                      \
             MenuItem                                \
             {                                       \
                 Identifier = SID_OPENTEMPLATE ;     \
                 Command = ".uno:OpenTemplate" ;		\
-                HelpId = SID_OPENTEMPLATE ;         \
                 Text [ en-US ] = "~Edit...";\
             };                                      \
         };                                          \
@@ -428,164 +368,138 @@
 #define ITEM_FILE_PRINTPREVIEW \
     Identifier = SID_PRINTPREVIEW ; \
     Command = ".uno:PrintPreview" ; \
-    HelpID = SID_PRINTPREVIEW ; \
     Text [ en-US ] = "Pa~ge Preview" ;\
     
 #define ITEM_FILE_SETUPPRINTER \
     Identifier = SID_SETUPPRINTER ; \
     Command = ".uno:PrinterSetup" ; \
-    HelpID = SID_SETUPPRINTER ; \
     Text [ en-US ] = "P~rinter Settings..." ;	\
     
 #define ITEM_FILE_PRINTDOC \
     Identifier = SID_PRINTDOC ; \
     Command = ".uno:Print" ; \
-    HelpID = SID_PRINTDOC ; \
     Text [ en-US ] = "~Print..." ;	\
     
 #define ITEM_FILE_MAIL_SENDDOC \
     Identifier = SID_MAIL_SENDDOC ; \
     Command = ".uno:SendMail" ; \
-    HelpID = SID_MAIL_SENDDOC ; \
     Text [ en-US ] = "Document as ~E-mail..." ; \
     
 #define ITEM_FILE_MAIL_SENDDOCASPDF \
     Identifier = SID_MAIL_SENDDOCASPDF ; \
     Command = ".uno:SendMailDocAsPDF" ; \
-    HelpID = SID_MAIL_SENDDOCASPDF ; \
     Text [ en-US ] = "Document as P~DF Attachment..." ;	\
 
 
 #define ITEM_FILE_QUITAPP \
     Identifier = SID_QUITAPP ; \
     Command = ".uno:Quit" ; \
-    HelpID = SID_QUITAPP ; \
     Text [ en-US ] = "E~xit" ; \
     
 #define ITEM_FILE_LOGOUT \
     Identifier = SID_LOGOUT ; \
     Command = ".uno:Logout" ; \
-    HelpID = SID_LOGOUT ; \
     Text [ en-US ] = "Logout" ;	\
 
 #define ITEM_EDIT_UNDO \
     Identifier = SID_UNDO ; \
     Command = ".uno:UndoAction" ; \
-    HelpID = SID_UNDO ; \
     Text [ en-US ] = "Undo" ;	\
     
 #define ITEM_EDIT_REDO \
     Identifier = SID_REDO ; \
     Command = ".uno:Redo" ; \
-    HelpID = SID_REDO ; \
     Text [ en-US ] = "Redo" ; \
     
 #define ITEM_EDIT_REPEAT \
     Identifier = SID_REPEAT ; \
     Command = ".uno:Repeat" ; \
-    HelpID = SID_REPEAT ; \
     Text [ en-US ] = "~Repeat" ; \
     
 #define ITEM_EDIT_PASTE \
     Identifier = SID_PASTE ; \
     Command = ".uno:Paste" ; \
-    HelpID = SID_PASTE ; \
     Text [ en-US ] = "~Paste" ;	\
     
 #define ITEM_EDIT_SELECTALL \
     Identifier = SID_SELECTALL ; \
     Command = ".uno:SelectAll" ; \
-    HelpID = SID_SELECTALL ; \
     Text [ en-US ] = "Select ~All" ; \
 
 #define ITEM_EDIT_SEARCH_DLG \
     Identifier = SID_SEARCH_DLG ; \
     Command = ".uno:SearchDialog" ; \
-    HelpID = SID_SEARCH_DLG ; \
     Text [ en-US ] = "~Find & Replace..." ; \
 
 #define ITEM_EDIT_NAVIGATOR \
     Identifier = SID_NAVIGATOR ; \
     Command = ".uno:Navigator" ; \
-    HelpID = SID_NAVIGATOR ; \
     Text [ en-US ] = "~Navigator" ; \
 
 
 #define ITEM_EDIT_BIBLIOGRAPHY \
     Identifier = SID_COMP_BIBLIOGRAPHY ; \
     Command = ".uno:BibliographyComponent" ; \
-    HelpID = SID_COMP_BIBLIOGRAPHY ; \
     Text [ en-US ] = "~Bibliography Database";	\
 
 #define ITEM_EDIT_PLUGINS_ACTIVE \
     Identifier = SID_PLUGINS_ACTIVE ; \
     Command = ".uno:PlugInsActive" ; \
-    HelpID = SID_PLUGINS_ACTIVE ; \
     Text [ en-US ] = "P~lug-in" ; \
 
 #define ITEM_EDIT_IMAP \
     Identifier = SID_IMAP ; \
     Command = ".uno:ImageMapDialog" ; \
-    HelpID = SID_IMAP ; \
     Text [ en-US ] = "ImageMap" ; \
     
 #define ITEM_EDIT_OBJECT \
     Identifier = SID_OBJECT ; \
     Command = ".uno:ObjectMenue" ; \
-    HelpID = SID_OBJECT ; \
     Text [ en-US ] = "~Object" ; \
     
 #define ITEM_VIEW_ATTR_ZOOM \
     Identifier = SID_ATTR_ZOOM ; \
     Command = ".uno:Zoom" ; \
-    HelpID = SID_ATTR_ZOOM ; \
     Text [ en-US ] = "~Zoom..." ; \
     
 #define ITEM_VIEW_TOGGLEFUNCTIONBAR \
     Identifier = SID_TOGGLEFUNCTIONBAR ; \
     Command = ".uno:FunctionBarVisible" ; \
-    HelpID = SID_TOGGLEFUNCTIONBAR ; \
     Text [ en-US ] = "~Function Bar" ; \
     
 #define ITEM_VIEW_TOGGLEOBJECTBAR \
     Identifier = SID_TOGGLEOBJECTBAR ; \
     Command = ".uno:ObjectBarVisible" ; \
-    HelpID = SID_TOGGLEOBJECTBAR ; \
     Text [ en-US ] = "~Object Bar" ; \
     
 #define ITEM_VIEW_TOGGLEINETBAR \
     Identifier = SID_TOGGLEINETBAR ; \
-    HelpID = SID_TOGGLEINETBAR ; \
+    Command = CMD_SID_TOGGLEINETBAR; \
     Text [ en-US ] = "Internet Bar" ; \
     
 #define ITEM_VIEW_TOGGLESTATUSBAR \
     Identifier = SID_TOGGLESTATUSBAR ; \
     Command = ".uno:StatusBarVisible" ; \
-    HelpID = SID_TOGGLESTATUSBAR ; \
     Text [ en-US ] = "~Status Bar" ; \
     
 #define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \
     Identifier = SID_SHOW_IME_STATUS_WINDOW ; \
     Command = ".uno:ShowImeStatusWindow" ; \
-    HelpID = SID_SHOW_IME_STATUS_WINDOW ; \
     Text [ en-US ] = "~Input Method Status";	\
 
 #define ITEM_VIEW_TASKBAR \
     Identifier = SID_TASKBAR ; \
     Command = ".uno:TaskBarVisible" ; \
-    HelpID = SID_TASKBAR ; \
     Text [ en-US ] = "~Status Bar" ; \
     
 #define ITEM_VIEW_COLORBAR \
     Identifier = SID_COLOR_CONTROL ; \
     Command = ".uno:ColorControl" ; \
-    HelpID = SID_COLOR_CONTROL ; \
     Text [ en-US ] = "~Color Bar" ; \
     
 #define ITEM_VIEW_FULLSCREEN \
     Identifier = SID_WIN_FULLSCREEN ; \
     Command = ".uno:FullScreen" ; \
-    HelpID = SID_WIN_FULLSCREEN ; \
     Text [ en-US ] = "F~ull Screen" ; \
     
 
@@ -598,19 +512,16 @@
 #define ITEM_VIEW_BROWSER_MODE \
     Identifier = SID_BROWSER_MODE ; \
     Command = ".uno:BrowseView" ; \
-    HelpID = SID_BROWSER_MODE ; \
     Text [ en-US ] = "~Online Layout" ; \
     
 #define ITEM_VIEW_BROWSER \
     Identifier = SID_BROWSER ; \
     Command = ".uno:Beamer" ; \
-    HelpID = SID_BROWSER ; \
     Text [ en-US ] = "~Beamer" ; \
 
 #define ITEM_INSERT_INSERT_GRAPHIC \
     Identifier = SID_INSERT_GRAPHIC ; \
     Command = ".uno:InsertGraphic" ; \
-    HelpID = SID_INSERT_GRAPHIC ; \
     Text [ en-US ] = "~Graphics..." ; \
     
 #define ITEM_INSERT_TWAIN_SELECT \
@@ -618,7 +529,6 @@
     {\
         Identifier = SID_TWAIN_SELECT ; \
         Command = ".uno:TwainSelect" ; \
-        HelpID = SID_TWAIN_SELECT ; \
         Text [ en-US ] = "~Select Source..." ; \
             };
 
@@ -627,7 +537,6 @@
     {\
         Identifier = SID_TWAIN_TRANSFER ; \
         Command = ".uno:TwainTransfer" ; \
-        HelpID = SID_TWAIN_TRANSFER ; \
         Text [ en-US ] = "~Request..." ; \
             };
 
@@ -636,7 +545,6 @@
     {\
         Identifier = SID_SCAN ; \
         Command = ".uno:Scan" ; \
-        HelpID = SID_SCAN ; \
         Text [ en-US ] = "Scan" ; \
         SubMenu = Menu\
         {\
@@ -651,19 +559,16 @@
 #define ITEM_INSERT_INSERT_DIAGRAM \
     Identifier = SID_INSERT_DIAGRAM ; \
     Command = ".uno:InsertObjectChart" ; \
-    HelpID = SID_INSERT_DIAGRAM ; \
     Text [ en-US ] = "~Chart..." ; \
     
 #define ITEM_INSERT_GALLERY \
     Identifier = SID_GALLERY ; \
     Command = ".uno:Gallery" ; \
-    HelpID = SID_GALLERY ; \
     Text [ en-US ] = "~Gallery" ; \
     
 #define ITEM_INSERT_INSERTDOC \
     Identifier = SID_INSERTDOC ; \
     Command = ".uno:InsertDoc" ; \
-    HelpID = SID_INSERTDOC ; \
     Text [ en-US ] = "~File..." ; \
     
 #define TMP_SID_INSERT_PLUGIN \
@@ -671,7 +576,6 @@
     {\
         Identifier = SID_INSERT_PLUGIN ; \
         Command = ".uno:InsertPlugin" ; \
-        HelpID = SID_INSERT_PLUGIN ; \
         Text [ en-US ] = "~Plug-in..." ; \
             };
 
@@ -680,7 +584,6 @@
     {\
         Identifier = SID_INSERT_SOUND ; \
         Command = ".uno:InsertSound" ; \
-        HelpID = SID_INSERT_SOUND ; \
         Text [ en-US ] = "~Sound..." ; \
     };
 
@@ -689,27 +592,13 @@
     {\
         Identifier = SID_INSERT_VIDEO ; \
         Command = ".uno:InsertVideo" ; \
-        HelpID = SID_INSERT_VIDEO ; \
         Text [ en-US ] = "~Video..." ; \
     };
 
-#ifdef SOLAR_JAVA
-#define TMP_SID_INSERT_APPLET \
-    MenuItem\
-    {\
-        Identifier = SID_INSERT_APPLET ; \
-        Command = ".uno:InsertApplet" ; \
-        HelpID = SID_INSERT_APPLET ; \
-        Text [ en-US ] = "~Applet..." ; \
-            };
-#else
-#define TMP_SID_INSERT_APPLET
-#endif
 #define ITEM_INSERT_OBJECT_MN \
     MenuItem\
     {\
         Identifier = SID_MN_INSERT_OBJECT_DLGS ; \
-        HelpID = SID_MN_INSERT_OBJECT_DLGS ; \
         Command = ".uno:ObjectMenu" ; \
         Text [ en-US ] = "~Object" ; \
         SubMenu = Menu\
@@ -720,18 +609,15 @@
                 {\
                     Identifier = SID_INSERT_OBJECT ; \
                     Command = ".uno:InsertObject" ; \
-                    HelpID = SID_INSERT_OBJECT ; \
                     Text [ en-US ] = "~OLE Object..." ; \
                                     };\
                 TMP_SID_INSERT_PLUGIN\
                 TMP_SID_INSERT_SOUND\
                 TMP_SID_INSERT_VIDEO\
-                TMP_SID_INSERT_APPLET\
                 MenuItem\
                 {\
                     Identifier = SID_INSERT_MATH ; \
                     Command = ".uno:InsertMath" ; \
-                    HelpID = SID_INSERT_MATH ; \
                     Text [ en-US ] = "~Formula..." ; \
                                     };\
             };\
@@ -742,7 +628,6 @@
     MenuItem\
     {\
         Identifier = SID_MN_INSERT_OBJECT_DLGS ; \
-        HelpID = SID_MN_INSERT_OBJECT_DLGS ; \
         Command = ".uno:ObjectMenu" ; \
         Text [ en-US ] = "~Object" ; \
         SubMenu = Menu\
@@ -753,14 +638,12 @@
                 {\
                     Identifier = SID_INSERT_OBJECT ; \
                     Command = ".uno:InsertObject" ; \
-                    HelpID = SID_INSERT_OBJECT ; \
                     Text [ en-US ] = "~OLE Object..." ; \
                                     };\
                 MenuItem\
                 {\
                     Identifier = SID_INSERT_MATH ; \
                     Command = ".uno:InsertMath" ; \
-                    HelpID = SID_INSERT_MATH ; \
                     Text [ en-US ] = "~Formula" ; \
                                     };\
             };\
@@ -771,7 +654,6 @@
     MenuItem\
     {\
         Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
-        HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
         Text [ en-US ] = "~Numbering/Bullets..." ; \
             };
 
@@ -779,7 +661,6 @@
 
 #define ITEM_FORMAT \
     Identifier = SID_OBJECTMENU0 ; \
-    HelpID = SID_OBJECTMENU0 ; \
     Command = ".uno:FormatMenu" ; \
     Text [ en-US ] = "F~ormat" ; \
     
@@ -787,7 +668,6 @@
 
 #define ITEM_TOOLS_MACROS								\
     Identifier = SID_SCRIPTORGANIZER ;			\
-    HelpId = SID_SCRIPTORGANIZER ;			\
     Command = ".uno:ScriptOrganizer" ;                       \
         Text [ en-US ] = "Scripts/Macros" ;					\
 
@@ -803,13 +683,11 @@
             {											\
                 Identifier = SID_RECORDMACRO ;			\
                 Command = ".uno:MacroRecorder" ;	\
-                HelpId = SID_RECORDMACRO ;			\
                                 Text [ en-US ] = "Record Macro"; 			};											\
             MenuItem									\
             {											\
                 Identifier = SID_BASICCHOOSER ;			\
                 Command = ".uno:MacroDialog" ;			\
-                HelpID = SID_BASICCHOOSER ;				\
                                 Text [ en-US ] = "~Macro..." ; \
                             };											\
         };												\
@@ -822,7 +700,6 @@
 #define ITEM_TOOLS_CONFIG \
     Identifier = SID_CONFIG ; \
     Command = ".uno:ConfigureDialog"; \
-    HelpID = SID_CONFIG ; \
     Text [ en-US ] = "~Configure..." ; \
     
 
@@ -831,7 +708,6 @@
     {\
         Identifier = SID_AUTO_CORRECT_DLG ; \
         Command = ".uno:AutoCorrectDlg" ; \
-        HelpID = SID_AUTO_CORRECT_DLG ; \
         Text [ en-US ] = "~AutoCorrect..." ; \
             };
 
@@ -840,7 +716,6 @@
     {\
         Identifier = SID_SD_GRAPHIC_OPTIONS ; \
         Command = ".uno:SdGraphicOptions" ; \
-        HelpID = SID_SD_GRAPHIC_OPTIONS ; \
         Text [ en-US ] = "~Drawing..." ; \
             };
 
@@ -849,7 +724,6 @@
     {\
         Identifier = SID_OPTIONS_TREEDIALOG ; \
         Command = ".uno:OptionsTreeDialog" ; \
-        HelpID = SID_OPTIONS_TREEDIALOG ; \
         Text [ en-US ] = "~Options..." ; \
             };
 
@@ -860,13 +734,11 @@
 #define ITEM_WINDOW_MDIWINDOWLIST \
     Identifier = SID_MDIWINDOWLIST ; \
     Command = ".uno:WindowList" ; \
-    HelpID = SID_MDIWINDOWLIST ; \
     Text [ en-US ] = "~Window" ; \
     
 #define ITEM_WINDOW_CLONEWIN \
     Identifier = SID_NEWWINDOW ; \
     Command = ".uno:NewWindow" ; \
-    HelpID = SID_NEWWINDOW ; \
     Text [ en-US ] = "~New Window" ; \
     
 #define ITEM_WINDOW_CASCADEWINS \
@@ -874,7 +746,6 @@
     {\
         Identifier = SID_CASCADEWINS ; \
         Command = ".uno:Cascade" ; \
-        HelpID = SID_CASCADEWINS ; \
         Text [ en-US ] = "~Cascade" ; \
             };
 
@@ -883,7 +754,6 @@
     {\
         Identifier = SID_TILEWINS ; \
         Command = ".uno:Tile" ; \
-        HelpID = SID_TILEWINS ; \
         Text [ en-US ] = "~Tile" ; \
             };
 
@@ -892,7 +762,6 @@
     {\
         Identifier = SID_HORIZONTALWINS ; \
         Command = ".uno:ArrangeHorizontal" ; \
-        HelpID = SID_HORIZONTALWINS ; \
         Text [ en-US ] = "~Horizontally" ; \
             };
 
@@ -901,14 +770,12 @@
     {\
         Identifier = SID_VERTICALWINS ; \
         Command = ".uno:ArrangeVertical" ; \
-        HelpID = SID_VERTICALWINS ; \
         Text [ en-US ] = "~Vertically" ; \
             };
 
 #define ITEM_WINDOW_CLOSEWIN \
     Identifier = SID_CLOSEWIN ; \
     Command = ".uno:CloseWin" ; \
-    HelpID = SID_CLOSEWIN ; \
     Text [ en-US ] = "Close Window" ; \
     
 #define ITEM_HYPERLINK_DIALOG \
@@ -916,7 +783,6 @@
     {\
         Identifier = SID_HYPERLINK_DIALOG ; \
         Command = ".uno:HyperlinkDialog" ; \
-        HelpID = SID_HYPERLINK_DIALOG ; \
                 Text [ en-US ] = "~Hyperlink" ; \
             } ;
 
@@ -925,7 +791,6 @@
     {\
         Identifier = SID_POLY_MERGE ; \
         Command = ".uno:Merge" ; \
-        HelpID = SID_POLY_MERGE ; \
         Text [ en-US ] = "~Merge" ; \
     };
 #define ITEM_POLY_SUBSTRACT \
@@ -933,7 +798,6 @@
     {\
         Identifier = SID_POLY_SUBSTRACT ; \
         Command = ".uno:Substract" ; \
-        HelpID = SID_POLY_SUBSTRACT ; \
         Text [ en-US ] = "~Subtract" ; \
         };
 #define ITEM_POLY_INTERSECT \
@@ -941,7 +805,6 @@
     {\
         Identifier = SID_POLY_INTERSECT ; \
         Command = ".uno:Intersect" ; \
-        HelpID = SID_POLY_INTERSECT ; \
         Text [ en-US ] = "I~ntersect" ; \
             };
 
@@ -950,7 +813,6 @@
     { \
         Identifier = SID_POLY_FORMEN ; \
         Command = ".uno:PolyFormen" ; \
-        HelpID = SID_POLY_FORMEN ; \
                 Text [ en-US ] = "~Shapes" ; \
         SubMenu = Menu \
         {\
@@ -1009,43 +871,36 @@
 #define ITEM_HELP_HELPMENU \
     Identifier = SID_HELPMENU ; \
     Command = ".uno:HelpMenu" ; \
-    HelpID = SID_HELPMENU ; \
     Text [ en-US ] = "~Help" ; \
     
 #define ITEM_HELP_HELPINDEX \
     Identifier = SID_HELPINDEX ; \
     Command = ".uno:HelpIndex" ; \
-    HelpID = SID_HELPINDEX ; \
     Text [ en-US ] = "~Contents" ;	\
     
 #define ITEM_HELP_HELPONHELP \
     Identifier = SID_HELPONHELP ; \
     Command = ".uno:HelpOnHelp" ; \
-    HelpID = SID_HELPONHELP ; \
     Text [ en-US ] = "Using Help" ; \
     
 #define ITEM_HELP_HELP_PI \
     Identifier = SID_HELP_PI ; \
     Command = ".uno:HelperDialog" ; \
-    HelpID = SID_HELP_PI ; \
     Text [ en-US ] = "Help ~Agent" ; \
     
 #define ITEM_HELP_HELPTIPS \
     Identifier = SID_HELPTIPS ; \
     Command = ".uno:HelpTip" ; \
-    HelpID = SID_HELPTIPS ; \
     Text [ en-US ] = "~Tips" ; \
     
 #define ITEM_HELP_BALLOONHELP \
     Identifier = SID_HELPBALLOONS ; \
     Command = ".uno:ActiveHelp" ; \
-    HelpID = SID_HELPBALLOONS ; \
     Text [ en-US ] = "~Extended Tips" ; \
     
 #define ITEM_SHOW_LICENSE \
     Identifier = SID_SHOW_LICENSE ; \
     Command = ".uno:ShowLicense" ; \
-    HelpID = SID_SHOW_LICENSE ; \
     Text [ en-US ] = "License information..." ;	\
 
 #define ITEM_SHOW_CREDITS \
@@ -1057,14 +912,12 @@
 #define ITEM_HELP_ONLINE_REGISTRATION \
     Identifier = SID_ONLINE_REGISTRATION ; \
     Command = ".uno:OnlineRegistrationDlg" ; \
-    HelpID = SID_ONLINE_REGISTRATION ; \
     Text [ en-US ] = "~Registration..." ; \
     
 
 #define ITEM_HELP_ABOUT \
     Identifier = SID_ABOUT ; \
     Command = ".uno:About" ; \
-    HelpID = SID_ABOUT ; \
     Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \
     
 /*------------------------------------------------------------------------
@@ -1130,39 +983,33 @@
 #define ITEM_POPUP_TEMPLATE_EDIT \
     Identifier = SID_STYLE_EDIT ; \
     Command = ".uno:EditStyle" ; \
-    HelpID = SID_STYLE_EDIT ; \
     Text [ en-US ] = "Edit Paragraph Style..." ; \
     
  // Gruppen-/Kombination-Funktionen
 #define ITEM_POPUP_GROUP \
     Identifier = SID_GROUP ; \
     Command = ".uno:FormatGroup" ; \
-    HelpID = SID_GROUP ; \
     Text [ en-US ] = "~Group" ; \
     
 #define ITEM_POPUP_UNGROUP \
     Identifier = SID_UNGROUP ; \
     Command = ".uno:FormatUngroup" ; \
-    HelpID = SID_UNGROUP ; \
     Text [ en-US ] = "~Ungroup" ; \
     
 #define ITEM_POPUP_ENTER_GROUP \
     Identifier = SID_ENTER_GROUP ; \
     Command = ".uno:EnterGroup" ; \
-    HelpID = SID_ENTER_GROUP ; \
     Text [ en-US ] = "~Edit Group" ; \
     
 #define ITEM_POPUP_LEAVE_GROUP \
     Identifier = SID_LEAVE_GROUP ; \
     Command = ".uno:LeaveGroup" ; \
-    HelpID = SID_LEAVE_GROUP ; \
     Text [ en-US ] = "E~xit Group" ; \
     
 #define ITEM_GROUP_MENU \
     MenuItem\
     {\
         Identifier = SID_MN_GROUP ; \
-        HelpID = SID_MN_GROUP ; \
         Command = ".uno:GroupMenu" ; \
         SubMenu = Menu\
         {\
@@ -1194,14 +1041,12 @@
     { \
         Identifier = SID_DATASOURCE_ADMINISTRATION ; \
         Command = ".uno:DatasourceAdministration" ; \
-        HelpID = SID_DATASOURCE_ADMINISTRATION ; \
         Text [ en-US ] = "~Data Sources..." ; \
     };
 
 #define ITEM_VIEW_DATA_SOURCE_BROWSER \
     Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \
     Command = ".uno:ViewDataSourceBrowser" ; \
-    HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \
         Text [ en-US ] = "~Data Sources" ; \
 
 /*------------------------------------------------------------------------
@@ -1210,112 +1055,92 @@
 #define ITEM_TOOLBAR_SET_JUSTIFY_PARA \
     Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
     Command = ".uno:JustifyPara" ; \
-    HelpID = SID_ATTR_PARA_ADJUST_BLOCK ;
 
 #define ITEM_TOOLBAR_NEWDOCDIRECT \
     Identifier = SID_NEWDOCDIRECT ; \
     Command = ".uno:AddDirect" ; \
-    HelpID = SID_NEWDOCDIRECT ;
 
 #define ITEM_TOOLBAR_PRINTDOCDIRECT \
     Identifier = SID_PRINTDOCDIRECT ; \
     Command = ".uno:PrintDefault" ; \
-    HelpID = SID_PRINTDOCDIRECT ;
 
 #define ITEM_TOOLBAR_INSERT_DRAW \
     Identifier = SID_INSERT_DRAW ; \
     Command = ".uno:InsertDraw" ; \
-    HelpID = SID_INSERT_DRAW ; \
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_CHOOSE_CONTROLS \
     Identifier = SID_CHOOSE_CONTROLS ; \
     Command = ".uno:ChooseControls" ; \
-    HelpID = SID_CHOOSE_CONTROLS ; \
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_AUTOSPELL_CHECK \
     Identifier = SID_AUTOSPELL_CHECK ; \
     Command = ".uno:SpellOnline" ; \
-    HelpID = SID_AUTOSPELL_CHECK ;
 
 #define ITEM_TOOLBAR_TEMPLATE_APPLY \
     Identifier = SID_STYLE_APPLY ; \
     Command = ".uno:StyleApply" ; \
-    HelpID = SID_STYLE_APPLY ;
 
 #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \
     Identifier = SID_ATTR_CHAR_COLOR ; \
     Command = ".uno:Color" ; \
-    HelpID = SID_ATTR_CHAR_COLOR ;\
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_BACKGROUND_PATTERN \
     Identifier = SID_BACKGROUND_PATTERN ; \
     Command = ".uno:BackgroundPatternController" ; \
-    HelpID = SID_BACKGROUND_PATTERN ;\
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_BACKGROUND_COLOR \
     Identifier = SID_BACKGROUND_COLOR ; \
     Command = ".uno:BackgroundColor" ; \
-    HelpID = SID_BACKGROUND_COLOR ;\
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_ATTR_BORDER \
     Identifier = SID_ATTR_BORDER ; \
     Command = ".uno:BorderStyle" ; \
-    HelpID = SID_ATTR_BORDER ;
 
 #define ITEM_TOOLBAR_FRAME_LINESTYLE \
     Identifier = SID_FRAME_LINESTYLE ; \
     Command = ".uno:LineStyle" ; \
-    HelpID = SID_FRAME_LINESTYLE ;
 
 #define ITEM_TOOLBAR_FRAME_LINECOLOR \
     Identifier = SID_FRAME_LINECOLOR ; \
     Command = ".uno:FrameLineColor" ; \
-    HelpID = SID_FRAME_LINECOLOR ;
 
 #define ITEM_TOOLBAR_SIM_START \
     Identifier = SID_SIM_START ; \
     Command = ".uno:LaunchStarImage" ; \
-    HelpID = SID_SIM_START ;
 
 #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \
     Identifier = SID_ATTR_LINEEND_STYLE ; \
     Command = ".uno:LineEndStyle" ; \
-    HelpID = SID_ATTR_LINEEND_STYLE ; \
     DropDown = TRUE ;
 
 #define ITEM_TOOLBAR_ATTR_LINE_STYLE \
     Identifier = SID_ATTR_LINE_STYLE ; \
     Command = ".uno:XLineStyle" ; \
-    HelpID = SID_ATTR_LINE_STYLE ;
 
 #define ITEM_TOOLBAR_ATTR_LINE_WIDTH \
     Identifier = SID_ATTR_LINE_WIDTH ; \
     Command = ".uno:LineWidth" ; \
-    HelpID = SID_ATTR_LINE_WIDTH ;
 
 #define ITEM_TOOLBAR_ATTR_LINE_COLOR \
     Identifier = SID_ATTR_LINE_COLOR ; \
     Command = ".uno:XLineColor" ; \
-    HelpID = SID_ATTR_LINE_COLOR ;
 
 #define ITEM_TOOLBAR_ATTR_FILL_STYLE \
     Identifier = SID_ATTR_FILL_STYLE ; \
     Command = ".uno:FillStyle" ; \
-    HelpID = SID_ATTR_FILL_STYLE ;
 
 #define ITEM_TOOLBAR_OBJECT_ROTATE \
     Identifier = SID_OBJECT_ROTATE ; \
     Command = ".uno:ToggleObjectRotateMode" ; \
-    HelpID = SID_OBJECT_ROTATE ;
 
 #define ITEM_VIEW_OFFICEBAR \
     Identifier = SID_GROUPVIEW; \
-    HelpID = SID_GROUPVIEW; \
+    Command = CMD_SID_GROUPVIEW; \
     Text [ en-US ] = "~Office Bar" ; \
     
 
@@ -1323,7 +1148,6 @@
     MenuItem\
     {\
         Identifier = SID_MN_SUB_TRANSLITERATE ; \
-        HelpID = SID_MN_SUB_TRANSLITERATE ; \
         Command = ".uno:TransliterateMenu" ; \
         SubMenu = Menu\
         {\
@@ -1333,63 +1157,54 @@
                 {\
                     Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \
                     Command = ".uno:ChangeCaseToSentenceCase" ; \
-                    HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \
                     Text [ en-US ] = "~Sentence case";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_LOWER; \
                     Command = ".uno:ChangeCaseToLower" ; \
-                    HelpID = SID_TRANSLITERATE_LOWER; \
                     Text [ en-US ] = "~lowercase";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_UPPER ; \
                     Command = ".uno:ChangeCaseToUpper" ; \
-                    HelpID = SID_TRANSLITERATE_UPPER ; \
                     Text [ en-US ] = "~UPPERCASE";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_TITLE_CASE; \
                     Command = ".uno:ChangeCaseToTitleCase" ; \
-                    HelpID = SID_TRANSLITERATE_TITLE_CASE; \
                     Text [ en-US ] = "~Capitalize Every Word";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \
                     Command = ".uno:ChangeCaseToToggleCase" ; \
-                    HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \
                     Text [ en-US ] = "~tOGGLE cASE";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_HALFWIDTH; \
                     Command = ".uno:ChangeCaseToHalfWidth" ; \
-                    HelpID = SID_TRANSLITERATE_HALFWIDTH; \
                     Text [ en-US ] = "H~alf-width";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_FULLWIDTH; \
                     Command = ".uno:ChangeCaseToFullWidth" ; \
-                    HelpID = SID_TRANSLITERATE_FULLWIDTH; \
                     Text [ en-US ] = "Full-width";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_HIRAGANA; \
                     Command = ".uno:ChangeCaseToHiragana" ; \
-                    HelpID = SID_TRANSLITERATE_HIRAGANA; \
                     Text [ en-US ] = "~Hiragana";\
                 };\
                 MenuItem\
                 {\
                     Identifier = SID_TRANSLITERATE_KATAGANA; \
                     Command = ".uno:ChangeCaseToKatakana" ; \
-                    HelpID = SID_TRANSLITERATE_KATAGANA; \
                     Text [ en-US ] = "~Katakana";\
                 };\
             };\
@@ -1399,23 +1214,23 @@
 
 #define ITEM_OPEN_HYPERLINK \
     Identifier = SID_OPEN_HYPERLINK ; \
-    HelpID = SID_OPEN_HYPERLINK ; \
+    Command = CMD_SID_OPEN_HYPERLINK; \
     Text [ en-US ] = "~Open Hyperlink" ;	\
 
 #define ITEM_OPEN_SMARTTAGMENU \
     Identifier = SID_OPEN_SMARTTAGMENU ; \
-    HelpID = SID_OPEN_SMARTTAGMENU ; \
+    Command = CMD_SID_OPEN_SMARTTAGMENU; \
     Text [ en-US ] = "Open ~Smart Tag Menu" ;	\
 
     
 #define ITEM_OPEN_XML_FILTERSETTINGS \
     Identifier = SID_OPEN_XML_FILTERSETTINGS ; \
-    HelpID = SID_OPEN_XML_FILTERSETTINGS ; \
+    Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \
         Text [ en-US ] = "~XML Filter Settings...";	\
 
 #define ITEM_HANGUL_HANJA_CONVERSION \
     Identifier = SID_HANGUL_HANJA_CONVERSION; \
-    HelpId = SID_HANGUL_HANJA_CONVERSION; \
+    Command = CMD_SID_HANGUL_HANJA_CONVERSION; \
     Text [ en-US ] = "Hangul/Hanja Conversion...";     \
 
 #endif // #ifndef _GLOBLMN_HRC
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 573f7a9b71..fcab99591f 100644..100755
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -26,270 +26,258 @@
  ************************************************************************/
 #ifndef _SVX_HELPID_HRC
 #define _SVX_HELPID_HRC
-// include ---------------------------------------------------------------
-
-#include <svl/solar.hrc>
 
 #include <svx/exthelpid.hrc>
+#include <svx/svxcommands.h>
+#include <sfx2/sfxcommands.h>
 
 // Help-Ids --------------------------------------------------------------
-#define HID_ALIGN_TBX                                               (HID_SVX_START +   1)
-#define HID_BMPMASK_CTL_PIPETTE                                     (HID_SVX_START +   4)
-#define HID_BMPMASK_CTL_QCOL_1                                      (HID_SVX_START +   5)
-#define HID_BMPMASK_TBI_PIPETTE                                     (HID_SVX_START +   6)
-#define HID_COLOR_CTL_COLORS                                        (HID_SVX_START +   7)
-#define HID_CONTDLG_APPLY                                           (HID_SVX_START +   8)
-#define HID_CONTDLG_AUTOCONTOUR                                     (HID_SVX_START +   9)
-#define HID_CONTDLG_CIRCLE                                          (HID_SVX_START +  10)
-#define HID_CONTDLG_FREEPOLY                                        (HID_SVX_START +  11)
-#define HID_CONTDLG_GRAPHWND                                        (HID_SVX_START +  12)
-#define HID_CONTDLG_PIPETTE                                         (HID_SVX_START +  13)
-#define HID_CONTDLG_POLY                                            (HID_SVX_START +  14)
-#define HID_CONTDLG_POLYDELETE                                      (HID_SVX_START +  15)
-#define HID_CONTDLG_POLYEDIT                                        (HID_SVX_START +  16)
-#define HID_CONTDLG_POLYINSERT                                      (HID_SVX_START +  17)
-#define HID_CONTDLG_POLYMOVE                                        (HID_SVX_START +  18)
-#define HID_CONTDLG_RECT                                            (HID_SVX_START +  19)
-#define HID_CONTDLG_REDO                                            (HID_SVX_START +  20)
-#define HID_CONTDLG_SELECT                                          (HID_SVX_START +  21)
-#define HID_CONTDLG_TOOLBOX                                         (HID_SVX_START +  22)
-#define HID_CONTDLG_UNDO                                            (HID_SVX_START +  23)
-#define HID_CONTDLG_WORKPLACE                                       (HID_SVX_START +  24)
-#define HID_CTL_FONTWORK_FAVORITES                                  (HID_SVX_START +  25)
-#define HID_CTRL3D_HSCROLL                                          (HID_SVX_START +  26)
-#define HID_CTRL3D_SWITCHER                                         (HID_SVX_START +  27)
-#define HID_CTRL3D_VSCROLL                                          (HID_SVX_START +  28)
-#define HID_CTRL_COLOR                                              (HID_SVX_START +  29)
-#define HID_DRAWTOOL_TBX                                            (HID_SVX_START +  30)
-#define HID_EDITENG_SPELLER_ADDWORD                                 (HID_SVX_START +  31)
-#define HID_EDITENG_SPELLER_AUTOCORRECT                             (HID_SVX_START +  32)
-#define HID_EDITENG_SPELLER_IGNORE                                  (HID_SVX_START +  33)
-#define HID_EDITENG_SPELLER_PARALANGUAGE                            (HID_SVX_START +  34)
-#define HID_EDITENG_SPELLER_START                                   (HID_SVX_START +  35)
-#define HID_EDITENG_SPELLER_WORDLANGUAGE                            (HID_SVX_START +  36)
-#define HID_FILL_ATTR_LISTBOX                                       (HID_SVX_START +  37) 
-#define HID_FILL_TYPE_LISTBOX                                       (HID_SVX_START +  38)
-#define HID_FONTWORK_CTL_FORMS                                      (HID_SVX_START +  39)
-#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE                            (HID_SVX_START +  40)
-#define HID_FONTWORK_TBI_ADJUST_CENTER                              (HID_SVX_START +  41)
-#define HID_FONTWORK_TBI_ADJUST_LEFT                                (HID_SVX_START +  42)
-#define HID_FONTWORK_TBI_ADJUST_MIRROR                              (HID_SVX_START +  43)
-#define HID_FONTWORK_TBI_ADJUST_RIGHT                               (HID_SVX_START +  44)
-#define HID_FONTWORK_TBI_OUTLINE                                    (HID_SVX_START +  45)
-#define HID_FONTWORK_TBI_SHADOW_NORMAL                              (HID_SVX_START +  46)
-#define HID_FONTWORK_TBI_SHADOW_OFF                                 (HID_SVX_START +  47)
-#define HID_FONTWORK_TBI_SHADOW_SLANT                               (HID_SVX_START +  48)
-#define HID_FONTWORK_TBI_SHOWFORM                                   (HID_SVX_START +  49)
-#define HID_FONTWORK_TBI_STYLE_OFF                                  (HID_SVX_START +  50)
-#define HID_FONTWORK_TBI_STYLE_ROTATE                               (HID_SVX_START +  51)
-#define HID_FONTWORK_TBI_STYLE_SLANTX                               (HID_SVX_START +  52)
-#define HID_FONTWORK_TBI_STYLE_SLANTY                               (HID_SVX_START +  53)
-#define HID_FONTWORK_TBI_STYLE_UPRIGHT                              (HID_SVX_START +  54)
-#define HID_FORMAT_FOOTER                                           (HID_SVX_START +  55)
-#define HID_FORMAT_HEADER                                           (HID_SVX_START +  56)
+#define HID_ALIGN_TBX                                         "SVX_HID_ALIGN_TBX"
+#define HID_BMPMASK_CTL_PIPETTE                               "SVX_HID_BMPMASK_CTL_PIPETTE"
+#define HID_BMPMASK_CTL_QCOL_1                                "SVX_HID_BMPMASK_CTL_QCOL_1"
+#define HID_BMPMASK_TBI_PIPETTE                               "SVX_HID_BMPMASK_TBI_PIPETTE"
+#define HID_COLOR_CTL_COLORS                                  "SVX_HID_COLOR_CTL_COLORS"
+#define HID_CONTDLG_APPLY                                     "SVX_HID_CONTDLG_APPLY"
+#define HID_CONTDLG_AUTOCONTOUR                               "SVX_HID_CONTDLG_AUTOCONTOUR"
+#define HID_CONTDLG_CIRCLE                                    "SVX_HID_CONTDLG_CIRCLE"
+#define HID_CONTDLG_FREEPOLY                                  "SVX_HID_CONTDLG_FREEPOLY"
+#define HID_CONTDLG_GRAPHWND                                  "SVX_HID_CONTDLG_GRAPHWND"
+#define HID_CONTDLG_PIPETTE                                   "SVX_HID_CONTDLG_PIPETTE"
+#define HID_CONTDLG_POLY                                      "SVX_HID_CONTDLG_POLY"
+#define HID_CONTDLG_POLYDELETE                                "SVX_HID_CONTDLG_POLYDELETE"
+#define HID_CONTDLG_POLYEDIT                                  "SVX_HID_CONTDLG_POLYEDIT"
+#define HID_CONTDLG_POLYINSERT                                "SVX_HID_CONTDLG_POLYINSERT"
+#define HID_CONTDLG_POLYMOVE                                  "SVX_HID_CONTDLG_POLYMOVE"
+#define HID_CONTDLG_RECT                                      "SVX_HID_CONTDLG_RECT"
+#define HID_CONTDLG_REDO                                      "SVX_HID_CONTDLG_REDO"
+#define HID_CONTDLG_SELECT                                    "SVX_HID_CONTDLG_SELECT"
+#define HID_CONTDLG_TOOLBOX                                   "SVX_HID_CONTDLG_TOOLBOX"
+#define HID_CONTDLG_UNDO                                      "SVX_HID_CONTDLG_UNDO"
+#define HID_CONTDLG_WORKPLACE                                 "SVX_HID_CONTDLG_WORKPLACE"
+#define HID_CTL_FONTWORK_FAVORITES                            "SVX_HID_CTL_FONTWORK_FAVORITES"
+#define HID_CTRL3D_HSCROLL                                    "SVX_HID_CTRL3D_HSCROLL"
+#define HID_CTRL3D_SWITCHER                                   "SVX_HID_CTRL3D_SWITCHER"
+#define HID_CTRL3D_VSCROLL                                    "SVX_HID_CTRL3D_VSCROLL"
+#define HID_CTRL_COLOR                                        "SVX_HID_CTRL_COLOR"
+#define HID_DRAWTOOL_TBX                                      "SVX_HID_DRAWTOOL_TBX"
+#define HID_EDITENG_SPELLER_ADDWORD                           "SVX_HID_EDITENG_SPELLER_ADDWORD"
+#define HID_EDITENG_SPELLER_AUTOCORRECT                       "SVX_HID_EDITENG_SPELLER_AUTOCORRECT"
+#define HID_EDITENG_SPELLER_IGNORE                            "SVX_HID_EDITENG_SPELLER_IGNORE"
+#define HID_EDITENG_SPELLER_PARALANGUAGE                      "SVX_HID_EDITENG_SPELLER_PARALANGUAGE"
+#define HID_EDITENG_SPELLER_START                             "SVX_HID_EDITENG_SPELLER_START"
+#define HID_EDITENG_SPELLER_WORDLANGUAGE                      "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE"
+#define HID_FILL_ATTR_LISTBOX                                "SVX_HID_FILL_ATTR_LISTBOX" 
+#define HID_FILL_TYPE_LISTBOX                                 "SVX_HID_FILL_TYPE_LISTBOX"
+#define HID_FONTWORK_CTL_FORMS                                "SVX_HID_FONTWORK_CTL_FORMS"
+#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE                      "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE"
+#define HID_FONTWORK_TBI_ADJUST_CENTER                        "SVX_HID_FONTWORK_TBI_ADJUST_CENTER"
+#define HID_FONTWORK_TBI_ADJUST_LEFT                          "SVX_HID_FONTWORK_TBI_ADJUST_LEFT"
+#define HID_FONTWORK_TBI_ADJUST_MIRROR                        "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR"
+#define HID_FONTWORK_TBI_ADJUST_RIGHT                         "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT"
+#define HID_FONTWORK_TBI_OUTLINE                              "SVX_HID_FONTWORK_TBI_OUTLINE"
+#define HID_FONTWORK_TBI_SHADOW_NORMAL                        "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL"
+#define HID_FONTWORK_TBI_SHADOW_OFF                           "SVX_HID_FONTWORK_TBI_SHADOW_OFF"
+#define HID_FONTWORK_TBI_SHADOW_SLANT                         "SVX_HID_FONTWORK_TBI_SHADOW_SLANT"
+#define HID_FONTWORK_TBI_SHOWFORM                             "SVX_HID_FONTWORK_TBI_SHOWFORM"
+#define HID_FONTWORK_TBI_STYLE_OFF                            "SVX_HID_FONTWORK_TBI_STYLE_OFF"
+#define HID_FONTWORK_TBI_STYLE_ROTATE                         "SVX_HID_FONTWORK_TBI_STYLE_ROTATE"
+#define HID_FONTWORK_TBI_STYLE_SLANTX                         "SVX_HID_FONTWORK_TBI_STYLE_SLANTX"
+#define HID_FONTWORK_TBI_STYLE_SLANTY                         "SVX_HID_FONTWORK_TBI_STYLE_SLANTY"
+#define HID_FONTWORK_TBI_STYLE_UPRIGHT                        "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT"
+#define HID_FORMAT_FOOTER                                     "SVX_HID_FORMAT_FOOTER"
+#define HID_FORMAT_HEADER                                     "SVX_HID_FORMAT_HEADER"
 // free
-#define HID_GALLERY_ICONVIEW                                        (HID_SVX_START +  58)
-#define HID_GALLERY_LISTVIEW                                        (HID_SVX_START +  59)
-#define HID_GALLERY_MN_ADD                                          (HID_SVX_START +  60)
-#define HID_GALLERY_MN_ADDMENU                                      (HID_SVX_START +  61)
-#define HID_GALLERY_MN_ADD_LINK                                     (HID_SVX_START +  62)
-#define HID_GALLERY_MN_BACKGROUND                                   (HID_SVX_START +  63)
-#define HID_GALLERY_MN_COPYCLIPBOARD                                (HID_SVX_START +  64)
-#define HID_GALLERY_MN_DELETE                                       (HID_SVX_START +  65)
-#define HID_GALLERY_MN_PASTECLIPBOARD                               (HID_SVX_START +  66)
-#define HID_GALLERY_MN_PREVIEW                                      (HID_SVX_START +  67)
-#define HID_GALLERY_NEWTHEME                                        (HID_SVX_START +  68)
-#define HID_GALLERY_PREVIEW                                         (HID_SVX_START +  69)
-#define HID_GALLERY_PROPERTIES                                      (HID_SVX_START +  70)
-#define HID_GALLERY_RENAME                                          (HID_SVX_START +  71)
-#define HID_GALLERY_THEMELIST                                       (HID_SVX_START +  72)
+#define HID_GALLERY_ICONVIEW                                  "SVX_HID_GALLERY_ICONVIEW"
+#define HID_GALLERY_LISTVIEW                                  "SVX_HID_GALLERY_LISTVIEW"
+#define HID_GALLERY_MN_ADD                                    "SVX_HID_GALLERY_MN_ADD"
+#define HID_GALLERY_MN_ADDMENU                                "SVX_HID_GALLERY_MN_ADDMENU"
+#define HID_GALLERY_MN_ADD_LINK                               "SVX_HID_GALLERY_MN_ADD_LINK"
+#define HID_GALLERY_MN_BACKGROUND                             "SVX_HID_GALLERY_MN_BACKGROUND"
+#define HID_GALLERY_MN_COPYCLIPBOARD                          "SVX_HID_GALLERY_MN_COPYCLIPBOARD"
+#define HID_GALLERY_MN_DELETE                                 "SVX_HID_GALLERY_MN_DELETE"
+#define HID_GALLERY_MN_PASTECLIPBOARD                         "SVX_HID_GALLERY_MN_PASTECLIPBOARD"
+#define HID_GALLERY_MN_PREVIEW                                "SVX_HID_GALLERY_MN_PREVIEW"
+#define HID_GALLERY_NEWTHEME                                  "SVX_HID_GALLERY_NEWTHEME"
+#define HID_GALLERY_PREVIEW                                   "SVX_HID_GALLERY_PREVIEW"
+#define HID_GALLERY_PROPERTIES                                "SVX_HID_GALLERY_PROPERTIES"
+#define HID_GALLERY_RENAME                                    "SVX_HID_GALLERY_RENAME"
+#define HID_GALLERY_THEMELIST                                 "SVX_HID_GALLERY_THEMELIST"
 // free
-#define HID_GALLERY_WINDOW                                          (HID_SVX_START +  74)
-#define HID_GRFFILTER                                               (HID_SVX_START +  75)
-#define HID_GRFFILTER_EMBOSS                                        (HID_SVX_START +  76)
-#define HID_GRFFILTER_INVERT                                        (HID_SVX_START +  77)
-#define HID_GRFFILTER_MOSAIC                                        (HID_SVX_START +  78)
-#define HID_GRFFILTER_POPART                                        (HID_SVX_START +  79)
-#define HID_GRFFILTER_POSTER                                        (HID_SVX_START +  80)
-#define HID_GRFFILTER_REMOVENOISE                                   (HID_SVX_START +  81)
-#define HID_GRFFILTER_SEPIA                                         (HID_SVX_START +  82)
-#define HID_GRFFILTER_SHARPEN                                       (HID_SVX_START +  83)
-#define HID_GRFFILTER_SMOOTH                                        (HID_SVX_START +  84)
-#define HID_GRFFILTER_SOBEL                                         (HID_SVX_START +  85)
-#define HID_GRFFILTER_SOLARIZE                                      (HID_SVX_START +  86)
-
-#define HID_IMAPDLG_ACTIVE                                          (HID_SVX_START +  88)
-#define HID_IMAPDLG_APPLY                                           (HID_SVX_START +  89)
-#define HID_IMAPDLG_CIRCLE                                          (HID_SVX_START +  90)
-#define HID_IMAPDLG_FREEPOLY                                        (HID_SVX_START +  91)
-#define HID_IMAPDLG_GRAPHWND                                        (HID_SVX_START +  92)
-#define HID_IMAPDLG_MACRO                                           (HID_SVX_START +  93)
-#define HID_IMAPDLG_OPEN                                            (HID_SVX_START +  94)
-#define HID_IMAPDLG_POLY                                            (HID_SVX_START +  95)
-#define HID_IMAPDLG_POLYDELETE                                      (HID_SVX_START +  96)
-#define HID_IMAPDLG_POLYEDIT                                        (HID_SVX_START +  97)
-#define HID_IMAPDLG_POLYINSERT                                      (HID_SVX_START +  98)
-#define HID_IMAPDLG_POLYMOVE                                        (HID_SVX_START +  99)
-#define HID_IMAPDLG_PROPERTY                                        (HID_SVX_START + 100)
-#define HID_IMAPDLG_RECT                                            (HID_SVX_START + 101)
-#define HID_IMAPDLG_REDO                                            (HID_SVX_START + 102)
-#define HID_IMAPDLG_SAVEAS                                          (HID_SVX_START + 103)
-#define HID_IMAPDLG_SELECT                                          (HID_SVX_START + 104)
-#define HID_IMAPDLG_TOOLBOX                                         (HID_SVX_START + 105)
-#define HID_IMAPDLG_UNDO                                            (HID_SVX_START + 106)
-#define HID_MENU_EXTRUSION_DEPTH                                    (HID_SVX_START + 107)
-#define HID_MENU_EXTRUSION_DIRECTION                                (HID_SVX_START + 108)
-#define HID_MENU_EXTRUSION_LIGHTING                                 (HID_SVX_START + 109)
-#define HID_MENU_EXTRUSION_SURFACE                                  (HID_SVX_START + 110)
-#define HID_MNU_FUNC_AVG                                            (HID_SVX_START + 111)
-#define HID_MNU_FUNC_COUNT                                          (HID_SVX_START + 112)
-#define HID_MNU_FUNC_COUNT2                                         (HID_SVX_START + 113)
-#define HID_MNU_FUNC_MAX                                            (HID_SVX_START + 114)
-#define HID_MNU_FUNC_MIN                                            (HID_SVX_START + 115)
-#define HID_MNU_FUNC_NONE                                           (HID_SVX_START + 116)
-#define HID_MNU_FUNC_SUM                                            (HID_SVX_START + 117)
-#define HID_MNU_ZOOM_100                                            (HID_SVX_START + 118)
-#define HID_MNU_ZOOM_150                                            (HID_SVX_START + 119)
-#define HID_MNU_ZOOM_200                                            (HID_SVX_START + 120)
-#define HID_MNU_ZOOM_50                                             (HID_SVX_START + 121)
-#define HID_MNU_ZOOM_75                                             (HID_SVX_START + 122)
-#define HID_MNU_ZOOM_OPTIMAL                                        (HID_SVX_START + 123)
-#define HID_MNU_ZOOM_PAGE_WIDTH                                     (HID_SVX_START + 124)
-#define HID_MNU_ZOOM_WHOLE_PAGE                                     (HID_SVX_START + 125)
-#define HID_OPTIONS_GRID                                            (HID_SVX_START + 126)
-#define HID_PASSWORD                                                (HID_SVX_START + 127)
-#define HID_POPUP_COLOR                                             (HID_SVX_START + 128)
-#define HID_POPUP_COLOR_CTRL                                        (HID_SVX_START + 129)
-#define HID_POPUP_EXTRUSION_DEPTH                                   (HID_SVX_START + 130)
-#define HID_POPUP_EXTRUSION_DIRECTION                               (HID_SVX_START + 131)
-#define HID_POPUP_EXTRUSION_LIGHTING                                (HID_SVX_START + 132)
-#define HID_POPUP_EXTRUSION_SURFACE                                 (HID_SVX_START + 133)
-#define HID_POPUP_FONTWORK_ALIGN                                    (HID_SVX_START + 134)
-#define HID_POPUP_FONTWORK_CHARSPACE                                (HID_SVX_START + 135)
-#define HID_POPUP_FRAME                                             (HID_SVX_START + 136)
-#define HID_POPUP_LINE                                              (HID_SVX_START + 137)
-#define HID_POPUP_LINEEND                                           (HID_SVX_START + 138)
-#define HID_POPUP_LINEEND_CTRL                                      (HID_SVX_START + 139)
-#define HID_REDLINING_FILTER_BTN_REF                                (HID_SVX_START + 140)
-#define HID_REDLINING_FILTER_CB_ACTION                              (HID_SVX_START + 141)
-#define HID_REDLINING_FILTER_CB_AUTOR                               (HID_SVX_START + 142)
-#define HID_REDLINING_FILTER_CB_COMMENT                             (HID_SVX_START + 143)
-#define HID_REDLINING_FILTER_CB_DATE                                (HID_SVX_START + 144)
-#define HID_REDLINING_FILTER_CB_RANGE                               (HID_SVX_START + 145)
-#define HID_REDLINING_FILTER_DF_DATE                                (HID_SVX_START + 146)
-#define HID_REDLINING_FILTER_DF_DATE2                               (HID_SVX_START + 147)
-#define HID_REDLINING_FILTER_ED_COMMENT                             (HID_SVX_START + 148)
-#define HID_REDLINING_FILTER_ED_RANGE                               (HID_SVX_START + 149)
-#define HID_REDLINING_FILTER_IB_CLOCK                               (HID_SVX_START + 150)
-#define HID_REDLINING_FILTER_IB_CLOCK2                              (HID_SVX_START + 151)
-#define HID_REDLINING_FILTER_LB_ACTION                              (HID_SVX_START + 152)
-#define HID_REDLINING_FILTER_LB_AUTOR                               (HID_SVX_START + 153)
-#define HID_REDLINING_FILTER_LB_DATE                                (HID_SVX_START + 154)
-#define HID_REDLINING_FILTER_PAGE                                   (HID_SVX_START + 155)
-#define HID_REDLINING_FILTER_TF_DATE                                (HID_SVX_START + 156)
-#define HID_REDLINING_FILTER_TF_DATE2                               (HID_SVX_START + 157)
-#define HID_REDLINING_TABCONTROL                                    (HID_SVX_START + 158)
-#define HID_REDLINING_VIEW_DG_VIEW                                  (HID_SVX_START + 159)
-#define HID_REDLINING_VIEW_DG_VIEW_HEADER                           (HID_SVX_START + 160)
-#define HID_REDLINING_VIEW_DG_VIEW_TABLE                            (HID_SVX_START + 161)
-#define HID_REDLINING_VIEW_PAGE                                     (HID_SVX_START + 162)
-#define HID_REDLINING_VIEW_PB_ACCEPT                                (HID_SVX_START + 163)
-#define HID_REDLINING_VIEW_PB_ACCEPTALL                             (HID_SVX_START + 164)
-#define HID_REDLINING_VIEW_PB_REJECT                                (HID_SVX_START + 165)
-#define HID_REDLINING_VIEW_PB_REJECTALL                             (HID_SVX_START + 166)
-#define HID_REDLINING_VIEW_PB_UNDO                                  (HID_SVX_START + 167)
-#define HID_RUBY_DIALOG                                             (HID_SVX_START + 168)
-#define HID_STYLE_LISTBOX                                           (HID_SVX_START + 169)
-#define HID_SVXTBX_ALIGNMENT                                        (HID_SVX_START + 170)
-#define HID_SVXTBX_DRAW                                             (HID_SVX_START + 171)
-#define HID_SVXTBX_UNDO_REDO_CTRL                                   (HID_SVX_START + 172)
-#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE                       (HID_SVX_START + 173)
-#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER                        (HID_SVX_START + 174)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED                 (HID_SVX_START + 175)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL                (HID_SVX_START + 176)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED      (HID_SVX_START + 177)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL     (HID_SVX_START + 178)
-#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS                 (HID_SVX_START + 179)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED     (HID_SVX_START + 180)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL    (HID_SVX_START + 181)
-#define HID_SVX_MDLG_DOCRECOVERY_BROKEN                             (HID_SVX_START + 182)
-#define HID_SVX_MDLG_DOCRECOVERY_PROGR                              (HID_SVX_START + 183)
-#define HID_SVX_MDLG_ERR_REP_OPTIONS                                (HID_SVX_START + 184)
-#define HID_SVX_MDLG_ERR_REP_PREVIEW                                (HID_SVX_START + 185)
-#define HID_SVX_TABDLG_DOCRECOVERY                                  (HID_SVX_START + 186)
-#define HID_SVX_TP_DOCRECOVERY_RECOVER                              (HID_SVX_START + 187)
-#define HID_SVX_TP_DOCRECOVERY_SAVE                                 (HID_SVX_START + 188)
-#define HID_SVX_TP_ERR_REP_SEND                                     (HID_SVX_START + 189)
-#define HID_SVX_TP_ERR_REP_WELCOME                                  (HID_SVX_START + 190)
-
-#define HID_VALUESET_EXTRUSION_DIRECTION                            (HID_SVX_START + 192)
-#define HID_VALUESET_EXTRUSION_LIGHTING                             (HID_SVX_START + 193)
-#define HID_WIN_FONTWORK_ALIGN                                      (HID_SVX_START + 194)
-#define HID_WIN_FONTWORK_CHARSPACE                                  (HID_SVX_START + 195)
-#define HID_XMLSEC_CALL                                             (HID_SVX_START + 196)
-#define HID_OFA_HYPERLINK_DLG                                       (HID_SVX_START + 197)
-#define HID_OFA_HYPERLINK_NAME                                      (HID_SVX_START + 198)
-#define HID_OFA_HYPERLINK_SEARCH                                    (HID_SVX_START + 199)
-#define HID_OFA_HYPERLINK_TARGET                                    (HID_SVX_START + 200)
-#define HID_OFA_HYPERLINK_URL                                       (HID_SVX_START + 201)
-#define HID_OFA_HYPERLINK_URL_TXT                                   (HID_SVX_START + 202)
-#define HID_AUTOCORR_DLG                                            (HID_SVX_START + 203)
-#define HID_SVXCTL_MAIL_ATTACH                                      (HID_SVX_START + 204)
-#define HID_SVXDLG_REGISTRATION                                     (HID_SVX_START + 205)
-#define HID_SVXDLG_TREE_BASE                                        (HID_SVX_START + 206)
-#define HID_SVXDLG_TREE_CHART                                       (HID_SVX_START + 207)
-#define HID_SVXDLG_TREE_FILTER                                      (HID_SVX_START + 208)
-#define HID_SVXDLG_TREE_LANGUAGE                                    (HID_SVX_START + 209)
-#define HID_SVXWIN_MAIL_ATTACH                                      (HID_SVX_START + 210)
-#define HID_SVXWIN_MAIL_HEADER                                      (HID_SVX_START + 211)
-#define HID_SVX_DLGFORMNEW                                          (HID_SVX_START + 212)
-#define HID_SVX_DLGTABNEW                                           (HID_SVX_START + 213)
-#define HID_SVX_HYPERLINK                                           (HID_SVX_START + 214)
-#define HID_SVX_MAILATTACH_ASCII_CB                                 (HID_SVX_START + 215)
-#define HID_SVX_MAILATTACH_HTML_CB                                  (HID_SVX_START + 216)
-#define HID_SVX_MAILATTACH_OFFICE_CB                                (HID_SVX_START + 217)
-#define HID_SVX_MAILATTACH_PRIORITY_LB                              (HID_SVX_START + 218)
-#define HID_SVX_MAILATTACH_RECEIPT_CB                               (HID_SVX_START + 219)
-#define HID_SVX_MAILATTACH_RTF_CB                                   (HID_SVX_START + 220)
-#define HID_SVX_MAILHEAD_HEAD_WIN                                   (HID_SVX_START + 221)
-#define HID_SVX_MAILHEAD_PRIORITY_LB                                (HID_SVX_START + 222)
-#define HID_SVX_MAILHEAD_PROTOCOL_LB                                (HID_SVX_START + 223)
-#define HID_SVX_MAILHEAD_RCPT_CB                                    (HID_SVX_START + 224)
-#define HID_SVX_MAILHEAD_RCPT_ED                                    (HID_SVX_START + 225)
-#define HID_SVX_MAILHEAD_RCPT_LB                                    (HID_SVX_START + 226)
-#define HID_SVX_MAILHEAD_RECEIPT_CB                                 (HID_SVX_START + 227)
-#define HID_SVX_MAILHEAD_ROLE_LB                                    (HID_SVX_START + 228)
-#define HID_SVX_MAILHEAD_SUBJECT_ED                                 (HID_SVX_START + 229)
-#define HID_SVX_MAILMENU_ADDADDRESS                                 (HID_SVX_START + 230)
-#define HID_SVX_MAILMENU_COPYLINK                                   (HID_SVX_START + 231)
-#define HID_SVX_MAILMENU_DELETE                                     (HID_SVX_START + 232)
-#define HID_SVX_MAILMENU_FILE                                       (HID_SVX_START + 233)
-#define HID_SVX_MAILMENU_OPEN                                       (HID_SVX_START + 234)
-#define HID_SVX_MAILMENU_RENAME                                     (HID_SVX_START + 235)
-#define HID_SVX_MAILMENU_SAVEAS                                     (HID_SVX_START + 236)
-#define HID_SVX_MAILMENU_SIG1                                       (HID_SVX_START + 237)
-#define HID_SVX_MAILMENU_SIG2                                       (HID_SVX_START + 238)
-#define HID_SVX_MAILMENU_SIG3                                       (HID_SVX_START + 239)
-#define HID_SVX_MAILMENU_SIG4                                       (HID_SVX_START + 240)
-#define HID_SVX_MAILTOOLBOX                                         (HID_SVX_START + 241)
-#define HID_SVX_SENDMENU_ENCRYPT                                    (HID_SVX_START + 242)
-#define HID_SVX_SENDMENU_PLAIN                                      (HID_SVX_START + 243)
-#define HID_SVX_SENDMENU_SIGN                                       (HID_SVX_START + 244)
-#define HID_SVX_SENDMENU_SIGNANDENCRYPT                             (HID_SVX_START + 245)
-#define HID_SVX_TP_APPEARANCE                                       (HID_SVX_START + 246)
-#define HID_SVX_TP_DESKTOP                                          (HID_SVX_START + 247)
-#define HID_CT_THES_ALTERNATIVES									(HID_SVX_START + 248)
+#define HID_GALLERY_WINDOW                                    "SVX_HID_GALLERY_WINDOW"
+#define HID_GRFFILTER                                         "SVX_HID_GRFFILTER"
+#define HID_GRFFILTER_EMBOSS                                  "SVX_HID_GRFFILTER_EMBOSS"
+#define HID_GRFFILTER_INVERT                                  "SVX_HID_GRFFILTER_INVERT"
+#define HID_GRFFILTER_MOSAIC                                  "SVX_HID_GRFFILTER_MOSAIC"
+#define HID_GRFFILTER_POPART                                  "SVX_HID_GRFFILTER_POPART"
+#define HID_GRFFILTER_POSTER                                  "SVX_HID_GRFFILTER_POSTER"
+#define HID_GRFFILTER_REMOVENOISE                             "SVX_HID_GRFFILTER_REMOVENOISE"
+#define HID_GRFFILTER_SEPIA                                   "SVX_HID_GRFFILTER_SEPIA"
+#define HID_GRFFILTER_SHARPEN                                 "SVX_HID_GRFFILTER_SHARPEN"
+#define HID_GRFFILTER_SMOOTH                                  "SVX_HID_GRFFILTER_SMOOTH"
+#define HID_GRFFILTER_SOBEL                                   "SVX_HID_GRFFILTER_SOBEL"
+#define HID_GRFFILTER_SOLARIZE                                "SVX_HID_GRFFILTER_SOLARIZE"
 
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
+#define HID_IMAPDLG_ACTIVE                                    "SVX_HID_IMAPDLG_ACTIVE"
+#define HID_IMAPDLG_APPLY                                     "SVX_HID_IMAPDLG_APPLY"
+#define HID_IMAPDLG_CIRCLE                                    "SVX_HID_IMAPDLG_CIRCLE"
+#define HID_IMAPDLG_FREEPOLY                                  "SVX_HID_IMAPDLG_FREEPOLY"
+#define HID_IMAPDLG_GRAPHWND                                  "SVX_HID_IMAPDLG_GRAPHWND"
+#define HID_IMAPDLG_MACRO                                     "SVX_HID_IMAPDLG_MACRO"
+#define HID_IMAPDLG_OPEN                                      "SVX_HID_IMAPDLG_OPEN"
+#define HID_IMAPDLG_POLY                                      "SVX_HID_IMAPDLG_POLY"
+#define HID_IMAPDLG_POLYDELETE                                "SVX_HID_IMAPDLG_POLYDELETE"
+#define HID_IMAPDLG_POLYEDIT                                  "SVX_HID_IMAPDLG_POLYEDIT"
+#define HID_IMAPDLG_POLYINSERT                                "SVX_HID_IMAPDLG_POLYINSERT"
+#define HID_IMAPDLG_POLYMOVE                                  "SVX_HID_IMAPDLG_POLYMOVE"
+#define HID_IMAPDLG_PROPERTY                                  "SVX_HID_IMAPDLG_PROPERTY"
+#define HID_IMAPDLG_RECT                                      "SVX_HID_IMAPDLG_RECT"
+#define HID_IMAPDLG_REDO                                      "SVX_HID_IMAPDLG_REDO"
+#define HID_IMAPDLG_SAVEAS                                    "SVX_HID_IMAPDLG_SAVEAS"
+#define HID_IMAPDLG_SELECT                                    "SVX_HID_IMAPDLG_SELECT"
+#define HID_IMAPDLG_TOOLBOX                                   "SVX_HID_IMAPDLG_TOOLBOX"
+#define HID_IMAPDLG_UNDO                                      "SVX_HID_IMAPDLG_UNDO"
+#define HID_MENU_EXTRUSION_DEPTH                              "SVX_HID_MENU_EXTRUSION_DEPTH"
+#define HID_MENU_EXTRUSION_DIRECTION                          "SVX_HID_MENU_EXTRUSION_DIRECTION"
+#define HID_MENU_EXTRUSION_LIGHTING                           "SVX_HID_MENU_EXTRUSION_LIGHTING"
+#define HID_MENU_EXTRUSION_SURFACE                            "SVX_HID_MENU_EXTRUSION_SURFACE"
+#define HID_MNU_FUNC_AVG                                      "SVX_HID_MNU_FUNC_AVG"
+#define HID_MNU_FUNC_COUNT                                    "SVX_HID_MNU_FUNC_COUNT"
+#define HID_MNU_FUNC_COUNT2                                   "SVX_HID_MNU_FUNC_COUNT2"
+#define HID_MNU_FUNC_MAX                                      "SVX_HID_MNU_FUNC_MAX"
+#define HID_MNU_FUNC_MIN                                      "SVX_HID_MNU_FUNC_MIN"
+#define HID_MNU_FUNC_NONE                                     "SVX_HID_MNU_FUNC_NONE"
+#define HID_MNU_FUNC_SUM                                      "SVX_HID_MNU_FUNC_SUM"
+#define HID_MNU_ZOOM_100                                      "SVX_HID_MNU_ZOOM_100"
+#define HID_MNU_ZOOM_150                                      "SVX_HID_MNU_ZOOM_150"
+#define HID_MNU_ZOOM_200                                      "SVX_HID_MNU_ZOOM_200"
+#define HID_MNU_ZOOM_50                                       "SVX_HID_MNU_ZOOM_50"
+#define HID_MNU_ZOOM_75                                       "SVX_HID_MNU_ZOOM_75"
+#define HID_MNU_ZOOM_OPTIMAL                                  "SVX_HID_MNU_ZOOM_OPTIMAL"
+#define HID_MNU_ZOOM_PAGE_WIDTH                               "SVX_HID_MNU_ZOOM_PAGE_WIDTH"
+#define HID_MNU_ZOOM_WHOLE_PAGE                               "SVX_HID_MNU_ZOOM_WHOLE_PAGE"
+#define HID_OPTIONS_GRID                                      "SVX_HID_OPTIONS_GRID"
+#define HID_PASSWORD                                          "SVX_HID_PASSWORD"
+#define HID_POPUP_COLOR                                       "SVX_HID_POPUP_COLOR"
+#define HID_POPUP_COLOR_CTRL                                  "SVX_HID_POPUP_COLOR_CTRL"
+#define HID_POPUP_EXTRUSION_DEPTH                             "SVX_HID_POPUP_EXTRUSION_DEPTH"
+#define HID_POPUP_EXTRUSION_DIRECTION                         "SVX_HID_POPUP_EXTRUSION_DIRECTION"
+#define HID_POPUP_EXTRUSION_LIGHTING                          "SVX_HID_POPUP_EXTRUSION_LIGHTING"
+#define HID_POPUP_EXTRUSION_SURFACE                           "SVX_HID_POPUP_EXTRUSION_SURFACE"
+#define HID_POPUP_FONTWORK_ALIGN                              "SVX_HID_POPUP_FONTWORK_ALIGN"
+#define HID_POPUP_FONTWORK_CHARSPACE                          "SVX_HID_POPUP_FONTWORK_CHARSPACE"
+#define HID_POPUP_FRAME                                       "SVX_HID_POPUP_FRAME"
+#define HID_POPUP_LINE                                        "SVX_HID_POPUP_LINE"
+#define HID_POPUP_LINEEND                                     "SVX_HID_POPUP_LINEEND"
+#define HID_POPUP_LINEEND_CTRL                                "SVX_HID_POPUP_LINEEND_CTRL"
+#define HID_REDLINING_FILTER_BTN_REF                          "SVX_HID_REDLINING_FILTER_BTN_REF"
+#define HID_REDLINING_FILTER_CB_ACTION                        "SVX_HID_REDLINING_FILTER_CB_ACTION"
+#define HID_REDLINING_FILTER_CB_AUTOR                         "SVX_HID_REDLINING_FILTER_CB_AUTOR"
+#define HID_REDLINING_FILTER_CB_COMMENT                       "SVX_HID_REDLINING_FILTER_CB_COMMENT"
+#define HID_REDLINING_FILTER_CB_DATE                          "SVX_HID_REDLINING_FILTER_CB_DATE"
+#define HID_REDLINING_FILTER_CB_RANGE                         "SVX_HID_REDLINING_FILTER_CB_RANGE"
+#define HID_REDLINING_FILTER_DF_DATE                          "SVX_HID_REDLINING_FILTER_DF_DATE"
+#define HID_REDLINING_FILTER_DF_DATE2                         "SVX_HID_REDLINING_FILTER_DF_DATE2"
+#define HID_REDLINING_FILTER_ED_COMMENT                       "SVX_HID_REDLINING_FILTER_ED_COMMENT"
+#define HID_REDLINING_FILTER_ED_RANGE                         "SVX_HID_REDLINING_FILTER_ED_RANGE"
+#define HID_REDLINING_FILTER_IB_CLOCK                         "SVX_HID_REDLINING_FILTER_IB_CLOCK"
+#define HID_REDLINING_FILTER_IB_CLOCK2                        "SVX_HID_REDLINING_FILTER_IB_CLOCK2"
+#define HID_REDLINING_FILTER_LB_ACTION                        "SVX_HID_REDLINING_FILTER_LB_ACTION"
+#define HID_REDLINING_FILTER_LB_AUTOR                         "SVX_HID_REDLINING_FILTER_LB_AUTOR"
+#define HID_REDLINING_FILTER_LB_DATE                          "SVX_HID_REDLINING_FILTER_LB_DATE"
+#define HID_REDLINING_FILTER_PAGE                             "SVX_HID_REDLINING_FILTER_PAGE"
+#define HID_REDLINING_FILTER_TF_DATE                          "SVX_HID_REDLINING_FILTER_TF_DATE"
+#define HID_REDLINING_FILTER_TF_DATE2                         "SVX_HID_REDLINING_FILTER_TF_DATE2"
+#define HID_REDLINING_TABCONTROL                              "SVX_HID_REDLINING_TABCONTROL"
+#define HID_REDLINING_VIEW_DG_VIEW                            "SVX_HID_REDLINING_VIEW_DG_VIEW"
+#define HID_REDLINING_VIEW_DG_VIEW_HEADER                     "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER"
+#define HID_REDLINING_VIEW_DG_VIEW_TABLE                      "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE"
+#define HID_REDLINING_VIEW_PAGE                               "SVX_HID_REDLINING_VIEW_PAGE"
+#define HID_REDLINING_VIEW_PB_ACCEPT                          "SVX_HID_REDLINING_VIEW_PB_ACCEPT"
+#define HID_REDLINING_VIEW_PB_ACCEPTALL                       "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL"
+#define HID_REDLINING_VIEW_PB_REJECT                          "SVX_HID_REDLINING_VIEW_PB_REJECT"
+#define HID_REDLINING_VIEW_PB_REJECTALL                       "SVX_HID_REDLINING_VIEW_PB_REJECTALL"
+#define HID_REDLINING_VIEW_PB_UNDO                            "SVX_HID_REDLINING_VIEW_PB_UNDO"
+#define HID_RUBY_DIALOG                                       "SVX_HID_RUBY_DIALOG"
+#define HID_STYLE_LISTBOX                                     "SVX_HID_STYLE_LISTBOX"
+#define HID_SVXTBX_ALIGNMENT                                  "SVX_HID_SVXTBX_ALIGNMENT"
+#define HID_SVXTBX_DRAW                                       "SVX_HID_SVXTBX_DRAW"
+#define HID_SVXTBX_UNDO_REDO_CTRL                             "SVX_HID_SVXTBX_UNDO_REDO_CTRL"
+#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE                 "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE"
+#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER                  "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER"
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED           "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL          "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL"
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL"
+#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS           "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS"
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL"
+#define HID_SVX_MDLG_DOCRECOVERY_BROKEN                       "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN"
+#define HID_SVX_MDLG_DOCRECOVERY_PROGR                        "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR"
+#define HID_SVX_MDLG_ERR_REP_OPTIONS                          "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS"
+#define HID_SVX_MDLG_ERR_REP_PREVIEW                          "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW"
+#define HID_SVX_TABDLG_DOCRECOVERY                            "SVX_HID_SVX_TABDLG_DOCRECOVERY"
+#define HID_SVX_TP_DOCRECOVERY_RECOVER                        "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER"
+#define HID_SVX_TP_DOCRECOVERY_SAVE                           "SVX_HID_SVX_TP_DOCRECOVERY_SAVE"
+#define HID_SVX_TP_ERR_REP_SEND                               "SVX_HID_SVX_TP_ERR_REP_SEND"
+#define HID_SVX_TP_ERR_REP_WELCOME                            "SVX_HID_SVX_TP_ERR_REP_WELCOME"
 
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_HID_END		(HID_SVX_START+248)
-#if ACT_SVX_HID_END > HID_SVX_END
-#error Resource overflow in #line, #file
-#endif
+#define HID_VALUESET_EXTRUSION_DIRECTION                      "SVX_HID_VALUESET_EXTRUSION_DIRECTION"
+#define HID_VALUESET_EXTRUSION_LIGHTING                       "SVX_HID_VALUESET_EXTRUSION_LIGHTING"
+#define HID_WIN_FONTWORK_ALIGN                                "SVX_HID_WIN_FONTWORK_ALIGN"
+#define HID_WIN_FONTWORK_CHARSPACE                            "SVX_HID_WIN_FONTWORK_CHARSPACE"
+#define HID_XMLSEC_CALL                                       "SVX_HID_XMLSEC_CALL"
+#define HID_OFA_HYPERLINK_DLG                                 "SVX_HID_OFA_HYPERLINK_DLG"
+#define HID_OFA_HYPERLINK_NAME                                "SVX_HID_OFA_HYPERLINK_NAME"
+#define HID_OFA_HYPERLINK_SEARCH                              "SVX_HID_OFA_HYPERLINK_SEARCH"
+#define HID_OFA_HYPERLINK_TARGET                              "SVX_HID_OFA_HYPERLINK_TARGET"
+#define HID_OFA_HYPERLINK_URL                                 "SVX_HID_OFA_HYPERLINK_URL"
+#define HID_OFA_HYPERLINK_URL_TXT                             "SVX_HID_OFA_HYPERLINK_URL_TXT"
+#define HID_AUTOCORR_DLG                                      "SVX_HID_AUTOCORR_DLG"
+#define HID_SVXCTL_MAIL_ATTACH                                "SVX_HID_SVXCTL_MAIL_ATTACH"
+#define HID_SVXDLG_REGISTRATION                               "SVX_HID_SVXDLG_REGISTRATION"
+#define HID_SVXDLG_TREE_BASE                                  "SVX_HID_SVXDLG_TREE_BASE"
+#define HID_SVXDLG_TREE_CHART                                 "SVX_HID_SVXDLG_TREE_CHART"
+#define HID_SVXDLG_TREE_FILTER                                "SVX_HID_SVXDLG_TREE_FILTER"
+#define HID_SVXDLG_TREE_LANGUAGE                              "SVX_HID_SVXDLG_TREE_LANGUAGE"
+#define HID_SVXWIN_MAIL_ATTACH                                "SVX_HID_SVXWIN_MAIL_ATTACH"
+#define HID_SVXWIN_MAIL_HEADER                                "SVX_HID_SVXWIN_MAIL_HEADER"
+#define HID_SVX_DLGFORMNEW                                    "SVX_HID_SVX_DLGFORMNEW"
+#define HID_SVX_DLGTABNEW                                     "SVX_HID_SVX_DLGTABNEW"
+#define HID_SVX_HYPERLINK                                     "SVX_HID_SVX_HYPERLINK"
+#define HID_SVX_MAILATTACH_ASCII_CB                           "SVX_HID_SVX_MAILATTACH_ASCII_CB"
+#define HID_SVX_MAILATTACH_HTML_CB                            "SVX_HID_SVX_MAILATTACH_HTML_CB"
+#define HID_SVX_MAILATTACH_OFFICE_CB                          "SVX_HID_SVX_MAILATTACH_OFFICE_CB"
+#define HID_SVX_MAILATTACH_PRIORITY_LB                        "SVX_HID_SVX_MAILATTACH_PRIORITY_LB"
+#define HID_SVX_MAILATTACH_RECEIPT_CB                         "SVX_HID_SVX_MAILATTACH_RECEIPT_CB"
+#define HID_SVX_MAILATTACH_RTF_CB                             "SVX_HID_SVX_MAILATTACH_RTF_CB"
+#define HID_SVX_MAILHEAD_HEAD_WIN                             "SVX_HID_SVX_MAILHEAD_HEAD_WIN"
+#define HID_SVX_MAILHEAD_PRIORITY_LB                          "SVX_HID_SVX_MAILHEAD_PRIORITY_LB"
+#define HID_SVX_MAILHEAD_PROTOCOL_LB                          "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB"
+#define HID_SVX_MAILHEAD_RCPT_CB                              "SVX_HID_SVX_MAILHEAD_RCPT_CB"
+#define HID_SVX_MAILHEAD_RCPT_ED                              "SVX_HID_SVX_MAILHEAD_RCPT_ED"
+#define HID_SVX_MAILHEAD_RCPT_LB                              "SVX_HID_SVX_MAILHEAD_RCPT_LB"
+#define HID_SVX_MAILHEAD_RECEIPT_CB                           "SVX_HID_SVX_MAILHEAD_RECEIPT_CB"
+#define HID_SVX_MAILHEAD_ROLE_LB                              "SVX_HID_SVX_MAILHEAD_ROLE_LB"
+#define HID_SVX_MAILHEAD_SUBJECT_ED                           "SVX_HID_SVX_MAILHEAD_SUBJECT_ED"
+#define HID_SVX_MAILMENU_ADDADDRESS                           "SVX_HID_SVX_MAILMENU_ADDADDRESS"
+#define HID_SVX_MAILMENU_COPYLINK                             "SVX_HID_SVX_MAILMENU_COPYLINK"
+#define HID_SVX_MAILMENU_DELETE                               "SVX_HID_SVX_MAILMENU_DELETE"
+#define HID_SVX_MAILMENU_FILE                                 "SVX_HID_SVX_MAILMENU_FILE"
+#define HID_SVX_MAILMENU_OPEN                                 "SVX_HID_SVX_MAILMENU_OPEN"
+#define HID_SVX_MAILMENU_RENAME                               "SVX_HID_SVX_MAILMENU_RENAME"
+#define HID_SVX_MAILMENU_SAVEAS                               "SVX_HID_SVX_MAILMENU_SAVEAS"
+#define HID_SVX_MAILMENU_SIG1                                 "SVX_HID_SVX_MAILMENU_SIG1"
+#define HID_SVX_MAILMENU_SIG2                                 "SVX_HID_SVX_MAILMENU_SIG2"
+#define HID_SVX_MAILMENU_SIG3                                 "SVX_HID_SVX_MAILMENU_SIG3"
+#define HID_SVX_MAILMENU_SIG4                                 "SVX_HID_SVX_MAILMENU_SIG4"
+#define HID_SVX_MAILTOOLBOX                                   "SVX_HID_SVX_MAILTOOLBOX"
+#define HID_SVX_SENDMENU_ENCRYPT                              "SVX_HID_SVX_SENDMENU_ENCRYPT"
+#define HID_SVX_SENDMENU_PLAIN                                "SVX_HID_SVX_SENDMENU_PLAIN"
+#define HID_SVX_SENDMENU_SIGN                                 "SVX_HID_SVX_SENDMENU_SIGN"
+#define HID_SVX_SENDMENU_SIGNANDENCRYPT                       "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT"
+#define HID_SVX_TP_APPEARANCE                                 "SVX_HID_SVX_TP_APPEARANCE"
+#define HID_SVX_TP_DESKTOP                                    "SVX_HID_SVX_TP_DESKTOP"
+#define HID_CT_THES_ALTERNATIVES				              "SVX_HID_CT_THES_ALTERNATIVES"
 
 #endif
 
diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index b179163289..b179163289 100644..100755
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk
deleted file mode 100644
index 37a079a68a..0000000000
--- a/svx/inc/makefile.mk
+++ /dev/null
@@ -1,50 +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=svx
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LOCALIZE_ME=globlmn_tmpl.hrc
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx
index 88354384ce..88354384ce 100644..100755
--- a/svx/inc/pch/precompiled_svx.cxx
+++ b/svx/inc/pch/precompiled_svx.cxx
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index f9e3f6a5bd..787699cebc 100644..100755
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -808,7 +808,6 @@
 #include "svtools/parhtml.hxx"
 #include "svtools/parrtf.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
 #include "svl/poolitem.hxx"
 #include "unotools/printwarningoptions.hxx"
 #include "svl/ptitem.hxx"
@@ -923,7 +922,7 @@
 #include "vcl/cursor.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
 #include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
@@ -942,7 +941,7 @@
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "osl/mutex.hxx"
 #include "xmloff/DashStyle.hxx"
 #include "xmloff/GradientStyle.hxx"
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 42af07adde..e91603880c 100644..100755
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -130,10 +130,10 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC
     virtual String   	getValue() const;
     virtual String   	getType() const;
 
-    virtual BOOL		getChecked() const;
-    virtual void		setChecked( BOOL bCheck );
-    virtual BOOL		getDefaultChecked() const;
-    virtual void		setDefaultChecked( BOOL bCheck );
+    virtual sal_Bool		getChecked() const;
+    virtual void		setChecked( sal_Bool bCheck );
+    virtual sal_Bool		getDefaultChecked() const;
+    virtual void		setDefaultChecked( sal_Bool bCheck );
     virtual void    	setValue( const String & aStrg );
 
     // Methods of the object
@@ -159,8 +159,8 @@ class ImpSjJScriptRadioArray: public SjJSbxArrayObject
 {
     VCRadioManager*	pMgr;
 public:
-    INT32 ImpSjJScriptRadioArray::getLength() const;
-    SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const;
+    sal_Int32 ImpSjJScriptRadioArray::getLength() const;
+    SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const;
     SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const;
 
     // construktor
@@ -181,10 +181,10 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
     virtual String   	getType() const;
 
     // Properties of SjJScriptCheckboxObject
-    virtual BOOL		getChecked() const;
-    virtual void		setChecked( BOOL bCheck );
-    virtual BOOL		getDefaultChecked() const;
-    virtual void		setDefaultChecked( BOOL bCheck );
+    virtual sal_Bool		getChecked() const;
+    virtual void		setChecked( sal_Bool bCheck );
+    virtual sal_Bool		getDefaultChecked() const;
+    virtual void		setDefaultChecked( sal_Bool bCheck );
     virtual void    	setValue( const String & aStrg );
 
     // Methods of the object
@@ -215,9 +215,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
     virtual String   	getValue() const;
     virtual String   	getType() const;
 
-    virtual INT32		getLength();
-    virtual INT32		getSelectedIndex() const;
-    virtual void    	setSelectedIndex( INT32 nNo );
+    virtual sal_Int32		getLength();
+    virtual sal_Int32		getSelectedIndex() const;
+    virtual void    	setSelectedIndex( sal_Int32 nNo );
 
     // Methods of the object
     virtual void		focus();
@@ -243,42 +243,42 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
             void 		onFocus();
 
     // SjJSbxArrayObject methods
-    virtual INT32			getLength() const;
+    virtual sal_Int32			getLength() const;
     // Access through the index
-    virtual SjJSbxObject * 	getElement( INT32 nIndex ) const;
+    virtual SjJSbxObject * 	getElement( sal_Int32 nIndex ) const;
 
     // Constructor
     ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p );
 
     // for setting entries of the object (to be called from Java)
-    virtual void		setOption( INT32 nIndex, const String & aOptionText,
+    virtual void		setOption( sal_Int32 nIndex, const String & aOptionText,
                                    const String	& aOptionValue,
-                                   BOOL bDefaultSelected, BOOL bSelected );
+                                   sal_Bool bDefaultSelected, sal_Bool bSelected );
 
     // interface for the properties of the option objects
-    virtual BOOL    	getOptionDefaultSelected( INT32 nIndex ) const;
-    virtual void		setOptionDefaultSelected( BOOL bSelected, INT32 nIndex );
-    virtual BOOL    	getOptionSelected( INT32 nIndex ) const;
-    virtual void		setOptionSelected( BOOL bSelected, INT32 nIndex );
-    virtual String		getOptionText( INT32 nIndex ) const;
-    virtual void		setOptionText( const String & sText, INT32 nIndex );
-    virtual void		setOptionValue( const String & sText, INT32 nIndex );
-    virtual String		getOptionValue( INT32 nIndex ) const;
+    virtual sal_Bool    	getOptionDefaultSelected( sal_Int32 nIndex ) const;
+    virtual void		setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex );
+    virtual sal_Bool    	getOptionSelected( sal_Int32 nIndex ) const;
+    virtual void		setOptionSelected( sal_Bool bSelected, sal_Int32 nIndex );
+    virtual String		getOptionText( sal_Int32 nIndex ) const;
+    virtual void		setOptionText( const String & sText, sal_Int32 nIndex );
+    virtual void		setOptionValue( const String & sText, sal_Int32 nIndex );
+    virtual String		getOptionValue( sal_Int32 nIndex ) const;
 };
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase
 {
-    USHORT				nListBoxIndex;
+    sal_uInt16				nListBoxIndex;
   public:
     // Methods from Java --> C++ (for properties)
     //--------------------------------------------
-    virtual BOOL  		getdefaultSelected() const;
-    virtual void		setdefaultSelected( BOOL bSelected );
-    virtual INT32		getIndex() const;
-    virtual BOOL    	getSelected() const;
-    virtual void    	setSelected( BOOL bSelected );
+    virtual sal_Bool  		getdefaultSelected() const;
+    virtual void		setdefaultSelected( sal_Bool bSelected );
+    virtual sal_Int32		getIndex() const;
+    virtual sal_Bool    	getSelected() const;
+    virtual void    	setSelected( sal_Bool bSelected );
 
     virtual String		getText() const;
     virtual void		setText( const String & sText );
@@ -298,7 +298,7 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr
     // none !
 
     // Constructor
-    ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex );
+    ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex );
 };
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -310,9 +310,9 @@ class SjJSbxFormsArray: public SfxJSArray
 
   public:
     // SjJSbxArrayObject methods
-    virtual INT32			getLength() const;
+    virtual sal_Int32			getLength() const;
     // access through the index
-    virtual SjJSbxObject * 	getElement( INT32 nIndex ) const;
+    virtual SjJSbxObject * 	getElement( sal_Int32 nIndex ) const;
     // access through the name
     // cannot overload native java methods (yet)
     virtual SjJSbxObject * 	getElement_String( const String & aName ) const;
@@ -557,8 +557,8 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
     virtual void		setTarget( const String & sValue );
 
     // SjJSbxArrayObject methods
-    INT32				getLength() const;
-    SjJSbxObject*		getElement( INT32 nIndex ) const;
+    sal_Int32				getLength() const;
+    SjJSbxObject*		getElement( sal_Int32 nIndex ) const;
     SjJSbxObject*		getElement_String( const String & aName ) const;
 
     // Methods of the object
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index b46d695f3f..3015c6bdb9 100644..100755
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -48,9 +48,9 @@ friend class ImpItemEdit;
     Link aSetDirtyHdl;
     ImpItemListRow* pAktChangeEntry;
     long   nLastWhichOfs;
-    USHORT nLastWhich;
-    USHORT nLastWhichOben;
-    USHORT nLastWhichUnten;
+    sal_uInt16 nLastWhich;
+    sal_uInt16 nLastWhichOben;
+    sal_uInt16 nLastWhichUnten;
     bool bWhichesButNames;
     bool bDontHideIneffectiveItems;
     bool bDontSortItems;
@@ -59,15 +59,15 @@ friend class ImpItemEdit;
 private:
 #if _SOLAR__PRIVATE
     void ImpCtor();
-    void ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum);
-    ImpItemListRow* ImpGetEntry(ULONG nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
+    void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum);
+    ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
     void ImpSaveWhich();
     void ImpRestoreWhich();
 #endif // __PRIVATE
 protected:
     virtual long GetRowCount() const;
-    virtual BOOL SeekRow(long nRow);
-    virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const;
+    virtual sal_Bool SeekRow(long nRow);
+    virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const;
     virtual void DoubleClick(const BrowserMouseEvent&);
     virtual void KeyInput(const KeyEvent& rEvt);
     virtual void Select();
@@ -79,8 +79,8 @@ public:
     virtual ~_SdrItemBrowserControl();
     void Clear();
     void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
-    ULONG GetCurrentPos() const;
-    USHORT GetCurrentWhich() const;
+    sal_uIntPtr GetCurrentPos() const;
+    sal_uInt16 GetCurrentWhich() const;
     virtual bool BegChangeEntry(ULONG nPos);
     virtual bool EndChangeEntry();
     virtual void     BrkChangeEntry();
@@ -93,7 +93,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String	GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String	GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
     XubString GetNewEntryValue() const                 { return pEditControl->GetText(); }
diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx
index 8a35638621..8a35638621 100644..100755
--- a/svx/inc/svdpomv.hxx
+++ b/svx/inc/svdpomv.hxx
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx
index 42518561c8..42518561c8 100644..100755
--- a/svx/inc/svx/AccessibleControlShape.hxx
+++ b/svx/inc/svx/AccessibleControlShape.hxx
diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx
index efd568138f..efd568138f 100644..100755
--- a/svx/inc/svx/AccessibleGraphicShape.hxx
+++ b/svx/inc/svx/AccessibleGraphicShape.hxx
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx
index 77aead6fd3..77aead6fd3 100644..100755
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/svx/inc/svx/AccessibleOLEShape.hxx
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index edd01a314f..edd01a314f 100644..100755
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx
index 15271ef95a..15271ef95a 100644..100755
--- a/svx/inc/svx/AccessibleShapeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeInfo.hxx
diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
index 1ba7fa48bd..1ba7fa48bd 100644..100755
--- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx
index 2da3859c44..2da3859c44 100644..100755
--- a/svx/inc/svx/AccessibleTableShape.hxx
+++ b/svx/inc/svx/AccessibleTableShape.hxx
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx
index ae52362029..ae52362029 100644..100755
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/svx/inc/svx/AccessibleTextHelper.hxx
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx
index 95e61a649f..95e61a649f 100644..100755
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/svx/ActionDescriptionProvider.hxx
diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx
index 8230d566df..8230d566df 100644..100755
--- a/svx/inc/svx/ChildrenManager.hxx
+++ b/svx/inc/svx/ChildrenManager.hxx
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx
index 4b951aaee0..4b951aaee0 100644..100755
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/svx/DescriptionGenerator.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index 568f533385..568f533385 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
index 7383bfa5f5..7383bfa5f5 100644..100755
--- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
index 4c16eb1bf7..4c16eb1bf7 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
index 4432c7a8a1..4432c7a8a1 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx
index 2f07103ef5..2f07103ef5 100644..100755
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/svx/inc/svx/IAccessibleParent.hxx
diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx
index ee787a9a8e..ee787a9a8e 100644..100755
--- a/svx/inc/svx/IAccessibleViewForwarder.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarder.hxx
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index db771fa8b3..db771fa8b3 100644..100755
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx
index fa90223515..fa90223515 100644..100755
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/svx/ParseContext.hxx
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index 9b0237c8e5..9b0237c8e5 100644..100755
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index e0c12228f6..fa06b4ba35 100644..100755
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -73,11 +73,11 @@ private:
 
     void			FillMenu();
     DECL_LINK( MenuSelect, PopupMenu * );
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
 public:
-    SvxSmartTagsControl( USHORT nId, Menu&, SfxBindings& );
+    SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxSmartTagsControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index 898d2407aa..58cb835e02 100644..100755
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -64,7 +64,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxSmartTagItem( const USHORT nId,
+    SvxSmartTagItem( const sal_uInt16 nId,
                      const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
                      const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
                      const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -77,10 +77,10 @@ public:
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	 Create(SvStream &, USHORT) const; // leer
-    virtual SvStream&		 Store(SvStream &, USHORT nItemVersion) const; // leer 
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer
+    virtual SfxPoolItem*	 Create(SvStream &, sal_uInt16) const; // leer
+    virtual SvStream&		 Store(SvStream &, sal_uInt16 nItemVersion) const; // leer 
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; }
     const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; }
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 1559cad536..1559cad536 100644..100755
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index af440c0e8a..c3240fb7a5 100644..100755
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -59,7 +59,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow
 public:
     SpellDialogChildWindow (
         Window*pParent,
-        USHORT nId,
+        sal_uInt16 nId,
         SfxBindings* pBindings,
         SfxChildWinInfo* pInfo);
     virtual ~SpellDialogChildWindow ();
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index 1f7f08faf2..1f7f08faf2 100644..100755
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.hxx
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx
index eaa7712863..eaa7712863 100644..100755
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/svx/UnoNamespaceMap.hxx
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx
index 45d8db0f25..45d8db0f25 100644..100755
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/svx/XPropertyTable.hxx
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index cb14fa25f0..a4a1e3b17e 100644..100755
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -47,24 +47,24 @@ public:
 
     SvxOrientationItem(
         const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
-        const USHORT nId );
+        const sal_uInt16 nId );
 
     SvxOrientationItem(
-        INT32 nRotation, BOOL bStacked,
-        const USHORT nId );
+        sal_Int32 nRotation, sal_Bool bStacked,
+        const sal_uInt16 nId );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual USHORT          GetValueCount() const;
-    virtual String          GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16          GetValueCount() const;
+    virtual String          GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     inline  SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation)
             {
@@ -72,28 +72,28 @@ public:
                 return *this;
             }
 
-    /** Returns TRUE, if the item represents STACKED state. */
-    BOOL                    IsStacked() const;
+    /** Returns sal_True, if the item represents STACKED state. */
+    sal_Bool                    IsStacked() const;
     /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */
-    INT32                   GetRotation( INT32 nStdAngle = 0 ) const;
+    sal_Int32                   GetRotation( sal_Int32 nStdAngle = 0 ) const;
     /** Fills this item according to passed item values. */
-    void                    SetFromRotation( INT32 nRotation, BOOL bStacked );
+    void                    SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked );
 };
 
 //------------------------------------------------------------------------
 
 class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
 {
-    INT16       nLeftMargin;
-    INT16       nTopMargin;
-    INT16       nRightMargin;
-    INT16       nBottomMargin;
+    sal_Int16       nLeftMargin;
+    sal_Int16       nTopMargin;
+    sal_Int16       nRightMargin;
+    sal_Int16       nBottomMargin;
 public:
     TYPEINFO();
-    SvxMarginItem( const USHORT nId  );
-    SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/,
-                   INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/,
-                   const USHORT nId  );
+    SvxMarginItem( const sal_uInt16 nId  );
+    SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
+                   sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
+                   const sal_uInt16 nId  );
     SvxMarginItem( const SvxMarginItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -103,20 +103,20 @@ public:
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
-    virtual SvStream&		 Store( SvStream&, USHORT nItemVersion ) const;
-
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-            INT16           GetLeftMargin() const {return nLeftMargin; }
-            BOOL            SetLeftMargin(INT16 nLeft);
-            INT16           GetTopMargin() const {return nTopMargin; }
-            BOOL            SetTopMargin(INT16 nTop);
-            INT16           GetRightMargin() const {return nRightMargin; }
-            BOOL            SetRightMargin(INT16 nRight);
-            INT16           GetBottomMargin() const {return nBottomMargin; }
-            BOOL            SetBottomMargin(INT16 nBottom);
+    virtual SfxPoolItem*     Create( SvStream& rStream, sal_uInt16 nVer ) const;
+    virtual SvStream&		 Store( SvStream&, sal_uInt16 nItemVersion ) const;
+
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+            sal_Int16           GetLeftMargin() const {return nLeftMargin; }
+            sal_Bool            SetLeftMargin(sal_Int16 nLeft);
+            sal_Int16           GetTopMargin() const {return nTopMargin; }
+            sal_Bool            SetTopMargin(sal_Int16 nTop);
+            sal_Int16           GetRightMargin() const {return nRightMargin; }
+            sal_Bool            SetRightMargin(sal_Int16 nRight);
+            sal_Int16           GetBottomMargin() const {return nBottomMargin; }
+            sal_Bool            SetBottomMargin(sal_Int16 nBottom);
 
     inline  SvxMarginItem& operator=(const SvxMarginItem& rMargin)
             {
diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx
index 516aebd18b..516aebd18b 100644..100755
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/svx/anchorid.hxx
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index d6b0b0c66b..af00d01078 100644..100755
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -51,11 +51,11 @@ private:
     SvxBmpMask  &rBmpMask;
 
 protected:
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 
 public:
-    SvxBmpMaskSelectItem( USHORT nId, SvxBmpMask& rMask,
+    SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask,
                           SfxBindings& rBindings );
 };
 
@@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow
 {
  public:
                             SvxBmpMaskChildWindow( Window*,
-                                                   USHORT, SfxBindings*,
+                                                   sal_uInt16, SfxBindings*,
                                                    SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow);
@@ -97,6 +97,9 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     PushButton			aBtnExec;
     FixedLine           aGrpQ;
 
+    FixedText			aFt1;
+    FixedText			aFt2;
+    FixedText			aFt3;
     CheckBox			aCbx1;
     MaskSet*			pQSet1;
     MetricField			aSp1;
@@ -120,21 +123,19 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     MaskData*			pData;
     CheckBox			aCbxTrans;
     ColorLB				aLbColorTrans;
-    FixedText			aFt1;
-    FixedText			aFt2;
-    FixedText			aFt3;
+
     const XColorTable* 	pColTab;
     Color				aPipetteColor;
     SvxBmpMaskSelectItem aSelItem;
 
     Image				maImgPipette;
 
-    virtual BOOL 		Close();
+    virtual sal_Bool 		Close();
 
 #ifdef BMPMASK_PRIVATE
 
-    USHORT				InitColorArrays( Color* pSrcCols, Color* pDstCols,
-                                         ULONG* pTols );
+    sal_uInt16				InitColorArrays( Color* pSrcCols, Color* pDstCols,
+                                         sal_uIntPtr* pTols );
 
     Bitmap 				ImpMask( const Bitmap& rBitmap );
     BitmapEx			ImpMask( const BitmapEx& rBitmapEx );
@@ -163,14 +164,14 @@ public:
     void				SetColor( const Color& rColor );
     void				PipetteClicked();
 
-    BOOL				NeedsColorTable() const;
+    sal_Bool				NeedsColorTable() const;
     void 				SetColorTable( const XColorTable* pColorTable );
 
-    void				SetExecState( BOOL bEnable );
+    void				SetExecState( sal_Bool bEnable );
 
     Graphic 			Mask( const Graphic& rGraphic );
 
-    BOOL				IsEyedropping() const;
+    sal_Bool				IsEyedropping() const;
 
     void				onSelect( MaskSet* pSet );
 
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 0f1a8aba37..0f1a8aba37 100644..100755
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index ba66b9df30..ccbc488865 100644..100755
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -59,7 +59,7 @@ public:
 
     void            SetFont( const Font& rFont );
 
-    void            SelectCharacter( sal_uInt32 cNew, BOOL bFocus = FALSE );
+    void            SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False );
     sal_UCS4        GetSelectCharacter() const;
 
     Link            GetDoubleClickHdl() const { return aDoubleClkHdl; }
@@ -77,12 +77,12 @@ public:
     int							FirstInView( void) const;
     int							LastInView( void) const;
     int							PixelToMapIndex( const Point&) const;
-    void						SelectIndex( int index, BOOL bFocus = FALSE );
+    void						SelectIndex( int index, sal_Bool bFocus = sal_False );
     void						DeSelect();
-    inline sal_Bool				IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; }
-    inline USHORT				GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); }
-    USHORT						GetRowPos(USHORT _nPos) const;
-    USHORT						GetColumnPos(USHORT _nPos) const;
+    inline sal_Bool				IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
+    inline sal_uInt16				GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
+    sal_uInt16						GetRowPos(sal_uInt16 _nPos) const;
+    sal_uInt16						GetColumnPos(sal_uInt16 _nPos) const;
 
     void						ImplFireAccessibleEvent( short nEventId,
                                                          const ::com::sun::star::uno::Any& rOldValue,
@@ -120,7 +120,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible;
     long	        nX;
     long			nY;
-    BOOL            bDrag;
+    sal_Bool            bDrag;
 
     sal_Int32		nSelectedIndex;
 
@@ -131,7 +131,7 @@ private:
 
 private:
     void            DrawChars_Impl( int n1, int n2);
-    void            InitSettings( BOOL bForeground, BOOL bBackground);
+    void            InitSettings( sal_Bool bForeground, sal_Bool bBackground);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
     DECL_LINK( VscrollHdl, ScrollBar* );
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index c69f9bd390..9be32da323 100644..100755
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -53,8 +53,8 @@ private:
     using SvTreeListBox::InsertEntry;
     // Avoid ambiguity with new InsertEntry:
     virtual SvLBoxEntry*	InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
-                                         BOOL bChildsOnDemand,
-                                         ULONG nPos, void* pUserData,
+                                         sal_Bool bChildsOnDemand,
+                                         sal_uIntPtr nPos, void* pUserData,
                                          SvLBoxButtonKind eButtonKind );
 
 public:
@@ -65,23 +65,23 @@ public:
     ~SvxCheckListBox();
 
     void			InsertEntry			( const String& rStr,
-                                          USHORT nPos = LISTBOX_APPEND,
+                                          sal_uInt16 nPos = LISTBOX_APPEND,
                                           void* pUserData = NULL,
                                           SvLBoxButtonKind eButtonKind =
                                               SvLBoxButtonKind_enabledCheckbox );
-    void			RemoveEntry			( USHORT nPos );
+    void			RemoveEntry			( sal_uInt16 nPos );
 
-    void			SelectEntryPos		( USHORT nPos, BOOL bSelect = TRUE );
-    USHORT			GetSelectEntryPos	() const;
+    void			SelectEntryPos		( sal_uInt16 nPos, sal_Bool bSelect = sal_True );
+    sal_uInt16			GetSelectEntryPos	() const;
 
-    String			GetText				( USHORT nPos ) const;
-    USHORT			GetCheckedEntryCount() const;
-    void			CheckEntryPos		( USHORT nPos, BOOL bCheck = TRUE );
-    BOOL			IsChecked			( USHORT nPos ) const;
+    String			GetText				( sal_uInt16 nPos ) const;
+    sal_uInt16			GetCheckedEntryCount() const;
+    void			CheckEntryPos		( sal_uInt16 nPos, sal_Bool bCheck = sal_True );
+    sal_Bool			IsChecked			( sal_uInt16 nPos ) const;
     void			ToggleCheckButton	( SvLBoxEntry* pEntry );
 
-    void*			SetEntryData		( USHORT nPos, void* pNewData );
-    void*			GetEntryData		( USHORT nPos ) const;
+    void*			SetEntryData		( sal_uInt16 nPos, void* pNewData );
+    void*			GetEntryData		( sal_uInt16 nPos ) const;
 
     virtual void 	MouseButtonDown		( const MouseEvent& rMEvt );
     virtual void	KeyInput			( const KeyEvent& rKEvt );
diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 4ce6daea7b..edbc1fadfd 100644..100755
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -115,21 +115,6 @@ enum SvxChartDataDescr
 
 #define CHDESCR_COUNT	(CHDESCR_TEXTANDVALUE + 1)
 
-enum SvxChartLegendPos
-{
-    CHLEGEND_NONE,
-    CHLEGEND_LEFT,
-    CHLEGEND_TOP,
-    CHLEGEND_RIGHT,
-    CHLEGEND_BOTTOM,
-    CHLEGEND_NONE_TOP,
-    CHLEGEND_NONE_LEFT,
-    CHLEGEND_NONE_RIGHT,
-    CHLEGEND_NONE_BOTTOM
-};
-
-#define CHLEGEND_COUNT	(CHLEGEND_BOTTOM + 1)
-
 enum SvxChartTextOrder
 {
     CHTXTORDER_SIDEBYSIDE,
@@ -193,13 +178,13 @@ class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
-                      USHORT nId );
-    SvxChartStyleItem(SvStream& rIn, USHORT nId );
+                      sal_uInt16 nId );
+    SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHSTYLE_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; }
     SvxChartStyle GetValue() const
         { return (SvxChartStyle)SfxEnumItem::GetValue(); }
 };
@@ -211,16 +196,16 @@ class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
-                        USHORT nId );
-    SvxChartRegressItem(SvStream& rIn, USHORT nId );
+                        sal_uInt16 nId );
+    SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHREGRESS_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; }
     SvxChartRegress GetValue() const
         { return (SvxChartRegress)SfxEnumItem::GetValue(); }
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -230,55 +215,36 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/,
-                          USHORT nId );
+                          sal_uInt16 nId );
     SvxChartDataDescrItem(SvStream& rIn,
-                          USHORT nId );
+                          sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHDESCR_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; }
     SvxChartDataDescr GetValue() const
         { return (SvxChartDataDescr)SfxEnumItem::GetValue(); }
 };
 
 //------------------------------------------------------------------
 
-class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem
-{
-public:
-    TYPEINFO();
-    SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/,
-                          USHORT nId );
-    SvxChartLegendPosItem(SvStream& rIn,
-                          USHORT nId );
-
-    virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-
-    USHORT GetValueCount() const { return CHLEGEND_COUNT; }
-    SvxChartLegendPos GetValue() const
-        { return (SvxChartLegendPos)SfxEnumItem::GetValue(); }
-};
-
-//------------------------------------------------------------------
-
 class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
     SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
-                          USHORT nId );
+                          sal_uInt16 nId );
     SvxChartTextOrderItem(SvStream& rIn,
-                          USHORT nId );
+                          sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool         QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool         PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool         QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool         PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
     SvxChartTextOrder GetValue() const
         { return (SvxChartTextOrder)SfxEnumItem::GetValue(); }
 };
@@ -290,14 +256,14 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartTextOrientItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
     SvxChartTextOrient GetValue() const
         { return (SvxChartTextOrient)SfxEnumItem::GetValue(); }
 };
@@ -309,18 +275,18 @@ class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartKindErrorItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHERROR_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHERROR_COUNT; }
     SvxChartKindError GetValue() const
         { return (SvxChartKindError)SfxEnumItem::GetValue(); }
 
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -330,18 +296,18 @@ class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
 public:
     TYPEINFO();
     SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
-                           USHORT nId );
+                           sal_uInt16 nId );
     SvxChartIndicateItem(SvStream& rIn,
-                           USHORT nId );
+                           sal_uInt16 nId );
 
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    USHORT GetValueCount() const { return CHINDICATE_COUNT; }
+    sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; }
     SvxChartIndicate GetValue() const
         { return (SvxChartIndicate)SfxEnumItem::GetValue(); }
 
-    USHORT GetVersion (USHORT nFileFormatVersion) const;
+    sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 //------------------------------------------------------------------
@@ -352,12 +318,12 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
 
 public:
     TYPEINFO();
-    SvxDoubleItem(double fValue /*= 0.0*/, USHORT nId );
-    SvxDoubleItem(SvStream& rIn, USHORT nId );
+    SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
+    SvxDoubleItem(SvStream& rIn, sal_uInt16 nId );
     SvxDoubleItem(const SvxDoubleItem& rItem);
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String GetValueText() const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
@@ -367,8 +333,8 @@ public:
 
     virtual int 			 operator == (const SfxPoolItem&) const;
     virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const;
-    virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const;
+    virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
     virtual double GetMin() const;
     virtual double GetMax() const;
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 48651a9e26..cd64e3cb41 100644..100755
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
@@ -44,20 +44,20 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
 {
     SfxPoolItem*            pClipboardFmtItem;
     PopupMenu*				pPopup;
-    USHORT					nItemId;
-    BOOL                    bDisabled;
+    sal_uInt16					nItemId;
+    sal_Bool                    bDisabled;
 
     void					DelPopup();
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxClipBoardControl();
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow* 	CreatePopupWindow();
-    virtual void				StateChanged( USHORT nSID,
+    virtual void				StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 03b9bc6aee..5be51aeed0 100644..100755
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
@@ -47,20 +47,20 @@ protected:
 
 public:
     TYPEINFO();
-    SvxClipboardFmtItem( USHORT nId = 0 );
+    SvxClipboardFmtItem( sal_uInt16 nId = 0 );
     SvxClipboardFmtItem( const SvxClipboardFmtItem& );
     virtual ~SvxClipboardFmtItem();
 
-    virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
-    virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const;
+    virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
-    void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX );
-    void AddClipbrdFormat( ULONG nId, const String& rName,
-                            USHORT nPos = USHRT_MAX );
-    USHORT Count() const;
+    void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX );
+    void AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+                            sal_uInt16 nPos = USHRT_MAX );
+    sal_uInt16 Count() const;
 
-    ULONG GetClipbrdFormatId( USHORT nPos ) const;
-    const String& GetClipbrdFormatName( USHORT nPos ) const;
+    sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const;
+    const String& GetClipbrdFormatName( sal_uInt16 nPos ) const;
 };
 
 
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index e37363a95b..54772a54c6 100644..100755
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -50,7 +50,7 @@ class SvxColorValueSet : public ValueSet, public DragSourceHelper
 
 private:
 
-    BOOL			bLeft;
+    sal_Bool			bLeft;
     Point           aDragPosPixel;
 
 protected:
@@ -71,7 +71,7 @@ public:
                     SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
                     SvxColorValueSet( Window* pParent, const ResId& rResId );
 
-    BOOL			IsLeftButton() const { return bLeft; }
+    sal_Bool			IsLeftButton() const { return bLeft; }
 };
 
 /*************************************************************************
@@ -83,7 +83,7 @@ public:
 class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
 {
  public:
-    SvxColorChildWindow( Window*, USHORT, SfxBindings*,
+    SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*,
                          SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(SvxColorChildWindow);
@@ -102,10 +102,10 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
 private:
     XColorTable*		pColorTable;
     SvxColorValueSet	aColorSet;
-    USHORT				nLeftSlot;
-    USHORT				nRightSlot;
-    USHORT				nCols;
-    USHORT				nLines;
+    sal_uInt16				nLeftSlot;
+    sal_uInt16				nRightSlot;
+    sal_uInt16				nCols;
+    sal_uInt16				nLines;
     long				nCount;
     Size				aColorSize;
     Size				aItemSize;
@@ -121,7 +121,7 @@ private:
     virtual void GetFocus (void);
 
 protected:
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     virtual void	Resize();
     virtual void	Resizing( Size& rSize );
 
@@ -134,7 +134,7 @@ public:
 
     virtual void 	Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void			SetSlotIDs( USHORT nLeft, USHORT nRight )
+    void			SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight )
                         { nLeftSlot = nLeft; nRightSlot = nRight; }
 
     virtual long	Notify( NotifyEvent& rNEvt );
diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 5bd0160031..ab642162ce 100644..100755
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
@@ -63,7 +63,7 @@ public:
     virtual void MouseButtonDown( const MouseEvent& rMEvt );
 
     void		 SetAttributes( const SfxItemSet& rInAttrs );
-    USHORT		 GetLineDeltaAnz();
+    sal_uInt16		 GetLineDeltaAnz();
 
     void 		 Construct();
     void		 SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 742e16b66e..757ea46206 100644..100755
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -46,11 +46,11 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxContourDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow );
 
-    static void UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+    static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                   const PolyPolygon* pPolyPoly = NULL,
                                   void* pEditingObj = NULL );
 };
@@ -66,11 +66,11 @@ class SvxContourDlgItem : public SfxControllerItem
 
 protected:
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                        SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
+                        SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
 };
 
 class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow
@@ -90,12 +90,12 @@ public:
                                        Window* pParent, const ResId& rResId );
                         ~SvxContourDlg();
 
-    void				SetExecState( BOOL bEnable );
+    void				SetExecState( sal_Bool bEnable );
 
     void				SetGraphic( const Graphic& rGraphic );
-    void				SetGraphicLinked( BOOL bLinked );
+    void				SetGraphicLinked( sal_Bool bLinked );
     const Graphic&		GetGraphic() const;
-    BOOL				IsGraphicChanged() const;
+    sal_Bool				IsGraphicChanged() const;
 
     void				SetPolyPolygon( const PolyPolygon& rPolyPoly );
     PolyPolygon			GetPolyPolygon();
@@ -103,12 +103,12 @@ public:
     void				SetEditingObject( void* pObj );
     const void*			GetEditingObject() const;
 
-    void				Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+    void				Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                 const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL );
 
     static PolyPolygon	CreateAutoContour( 	const Graphic& rGraphic,
                                             const Rectangle* pRect = NULL,
-                                            const ULONG nFlags = 0L );
+                                            const sal_uIntPtr nFlags = 0L );
     static void			ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic,
                                       const MapUnit eUnit, const Size& rDisplaySize );
 };
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 56a561b1ac..3801daf060 100644..100755
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC RedlinData
 public:
                     RedlinData();
     virtual			~RedlinData();
-    BOOL			bDisabled;
+    sal_Bool			bDisabled;
     DateTime		aDateTime;
     void*			pData;
 };
@@ -81,12 +81,12 @@ private:
     Color			aPrivColor;
 
 public:
-                    SvLBoxColorString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr,
+                    SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr,
                                     const Color& rCol);
                     SvLBoxColorString();
                     ~SvLBoxColorString();
 
-    void			Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+    void			Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
     SvLBoxItem* 	Create() const;
 };
 
@@ -96,12 +96,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable
 
 private:
 
-    BOOL			bIsCalc;
-    USHORT			nDatePos;
-    BOOL			bAuthor;
-    BOOL			bDate;
-    BOOL			bComment;
-    USHORT			nDaTiMode;
+    sal_Bool			bIsCalc;
+    sal_uInt16			nDatePos;
+    sal_Bool			bAuthor;
+    sal_Bool			bDate;
+    sal_Bool			bComment;
+    sal_uInt16			nDaTiMode;
     DateTime		aDaTiFirst;
     DateTime		aDaTiLast;
     DateTime		aDaTiFilterFirst;
@@ -126,35 +126,35 @@ public:
                     ~SvxRedlinTable();
 
     // For FilterPage only {
-    void			SetFilterDate(BOOL bFlag=TRUE);
-    void			SetDateTimeMode(USHORT nMode);
+    void			SetFilterDate(sal_Bool bFlag=sal_True);
+    void			SetDateTimeMode(sal_uInt16 nMode);
     void			SetFirstDate(const Date&);
     void			SetLastDate(const Date&);
     void			SetFirstTime(const Time&);
     void			SetLastTime(const Time&);
-    void			SetFilterAuthor(BOOL bFlag=TRUE);
+    void			SetFilterAuthor(sal_Bool bFlag=sal_True);
     void			SetAuthor(const String &);
-    void			SetFilterComment(BOOL bFlag=TRUE);
+    void			SetFilterComment(sal_Bool bFlag=sal_True);
     void			SetCommentParams( const utl::SearchParam* pSearchPara );
 
     void			UpdateFilterTest();
     // } For FilterPage only
 
-    void			SetCalcView(BOOL bFlag=TRUE);
-    BOOL			IsValidCalcEntry(const String& ,RedlinData *pUserData);
-    BOOL			IsValidWriterEntry(const String& ,RedlinData *pUserData);
+    void			SetCalcView(sal_Bool bFlag=sal_True);
+    sal_Bool			IsValidCalcEntry(const String& ,RedlinData *pUserData);
+    sal_Bool			IsValidWriterEntry(const String& ,RedlinData *pUserData);
 
     // no NULL-pointer checking {
-    BOOL			IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
-    BOOL			IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
-    BOOL			IsValidComment(const String* pComment);
+    sal_Bool			IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
+    sal_Bool			IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
+    sal_Bool			IsValidComment(const String* pComment);
     // }
 
     SvLBoxEntry*	InsertEntry(const String& ,RedlinData *pUserData,
-                                SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+                                SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
 
     SvLBoxEntry*	InsertEntry(const String& ,RedlinData *pUserData,const Color&,
-                                SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+                                SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
 
 
     virtual	SvLBoxEntry* CreateEntry() const;
@@ -201,7 +201,7 @@ private:
     String			aActionStr;
     String			aRangeStr;
     String			aStrMyName;
-    BOOL			bModified;
+    sal_Bool			bModified;
 
     DECL_LINK( SelDateHdl, ListBox* );
     DECL_LINK( RowEnableHdl, CheckBox* );
@@ -213,9 +213,9 @@ private:
 
 protected:
 
-    void			ShowDateFields(USHORT nKind);
-    void			EnableDateLine1(BOOL bFlag);
-    void			EnableDateLine2(BOOL bFlag);
+    void			ShowDateFields(sal_uInt16 nKind);
+    void			EnableDateLine1(sal_Bool bFlag);
+    void			EnableDateLine2(sal_Bool bFlag);
 
 public:
                     SvxTPFilter( Window * pParent);
@@ -234,15 +234,15 @@ public:
     Time			GetLastTime() const;
     void			SetLastTime(const Time &aTime);
 
-    void			SetDateMode(USHORT nMode);
-    USHORT			GetDateMode();
+    void			SetDateMode(sal_uInt16 nMode);
+    sal_uInt16			GetDateMode();
 
     void			ClearAuthors();
-    void			InsertAuthor( const String& rString, USHORT nPos = LISTBOX_APPEND );
-    USHORT			GetSelectedAuthorPos();
+    void			InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16			GetSelectedAuthorPos();
     String			GetSelectedAuthor()const;
-    void			SelectedAuthorPos(USHORT nPos);
-    USHORT			SelectAuthor(const String& aString);
+    void			SelectedAuthorPos(sal_uInt16 nPos);
+    sal_uInt16			SelectAuthor(const String& aString);
     void			SetComment(const String &rComment);
     String			GetComment()const;
 
@@ -250,27 +250,27 @@ public:
     // Methods for Calc {
     void			SetRange(const String& rString);
     String			GetRange() const;
-    void			HideRange(BOOL bHide=TRUE);
-    void			DisableRange(BOOL bFlag=TRUE);
+    void			HideRange(sal_Bool bHide=sal_True);
+    void			DisableRange(sal_Bool bFlag=sal_True);
     void			SetFocusToRange();
     // } Methods for Calc
 
-    void			HideClocks(BOOL bHide=TRUE);
-    void			DisableRef(BOOL bFlag);
+    void			HideClocks(sal_Bool bHide=sal_True);
+    void			DisableRef(sal_Bool bFlag);
 
-    BOOL			IsDate();
-    BOOL			IsAuthor();
-    BOOL			IsRange();
-    BOOL			IsAction();
-    BOOL			IsComment();
+    sal_Bool			IsDate();
+    sal_Bool			IsAuthor();
+    sal_Bool			IsRange();
+    sal_Bool			IsAction();
+    sal_Bool			IsComment();
 
-    void			ShowAction(BOOL bShow=TRUE);
+    void			ShowAction(sal_Bool bShow=sal_True);
 
-    void			CheckDate(BOOL bFlag=TRUE);
-    void			CheckAuthor(BOOL bFlag=TRUE);
-    void			CheckRange(BOOL bFlag=TRUE);
-    void			CheckAction(BOOL bFlag=TRUE);
-    void			CheckComment(BOOL bFlag=TRUE);
+    void			CheckDate(sal_Bool bFlag=sal_True);
+    void			CheckAuthor(sal_Bool bFlag=sal_True);
+    void			CheckRange(sal_Bool bFlag=sal_True);
+    void			CheckAction(sal_Bool bFlag=sal_True);
+    void			CheckComment(sal_Bool bFlag=sal_True);
 
     ListBox*		GetLbAction();
 
@@ -349,21 +349,21 @@ public:
     void			InsertCalcHeader();
     SvxRedlinTable* GetTableControl();
 
-    void			EnableAccept(BOOL nFlag=TRUE);
-    void			EnableAcceptAll(BOOL nFlag=TRUE);
-    void			EnableReject(BOOL nFlag=TRUE);
-    void			EnableRejectAll(BOOL nFlag=TRUE);
-    void			EnableUndo(BOOL nFlag=TRUE);
+    void			EnableAccept(sal_Bool nFlag=sal_True);
+    void			EnableAcceptAll(sal_Bool nFlag=sal_True);
+    void			EnableReject(sal_Bool nFlag=sal_True);
+    void			EnableRejectAll(sal_Bool nFlag=sal_True);
+    void			EnableUndo(sal_Bool nFlag=sal_True);
 
-    void			DisableAccept()		{EnableAccept(FALSE);}
-    void			DisableAcceptAll()	{EnableAcceptAll(FALSE);}
-    void			DisableReject()		{EnableReject(FALSE);}
-    void			DisableRejectAll()	{EnableRejectAll(FALSE);}
-    void			DisableUndo()		{EnableUndo(FALSE);}
+    void			DisableAccept()		{EnableAccept(sal_False);}
+    void			DisableAcceptAll()	{EnableAcceptAll(sal_False);}
+    void			DisableReject()		{EnableReject(sal_False);}
+    void			DisableRejectAll()	{EnableRejectAll(sal_False);}
+    void			DisableUndo()		{EnableUndo(sal_False);}
 
-    void			ShowUndo(BOOL nFlag=TRUE);
-    void			HideUndo()			{ShowUndo(FALSE);}
-    BOOL			IsUndoVisible();
+    void			ShowUndo(sal_Bool nFlag=sal_True);
+    void			HideUndo()			{ShowUndo(sal_False);}
+    sal_Bool			IsUndoVisible();
 
     Size			GetMinSizePixel();
 
@@ -412,8 +412,8 @@ public:
     void			ShowFilterPage();
     void			ShowViewPage();
 
-    BOOL			IsFilterPageVisible();
-    BOOL			IsViewPageVisible();
+    sal_Bool			IsFilterPageVisible();
+    sal_Bool			IsViewPageVisible();
 
     SvxTPFilter*	GetFilterPage();
     SvxTPView*		GetViewPage();
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index 5049bda27c..c3aca2e648 100644..100755
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -56,7 +56,7 @@ private:
     // Parameter
     basegfx::B3DPoint					aCubePos;
     basegfx::B3DVector					aCubeSize;
-    UINT16								nSideFlags;
+    sal_uInt16								nSideFlags;
 
     // BOOLeans
     unsigned							bPosIsCenter : 1;
@@ -70,8 +70,8 @@ public:
     E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize);
     E3dCubeObj();
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
@@ -82,11 +82,11 @@ public:
     void SetCubeSize(const basegfx::B3DVector& rNew);
     const basegfx::B3DVector& GetCubeSize() { return aCubeSize; }
 
-    void SetPosIsCenter(BOOL bNew);
-    BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; }
+    void SetPosIsCenter(sal_Bool bNew);
+    sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; }
 
-    void SetSideFlags(UINT16 nNew);
-    UINT16 GetSideFlags() { return nSideFlags; }
+    void SetSideFlags(sal_uInt16 nNew);
+    sal_uInt16 GetSideFlags() { return nSideFlags; }
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual void TakeObjNameSingul(String& rName) const;
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx
index ec972e0dd8..ec972e0dd8 100644..100755
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/svx/inc/svx/dataaccessdescriptor.hxx
diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index adbaf9ed5a..adbaf9ed5a 100644..100755
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 352913bf5e..9b758e8f5e 100644..100755
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,12 +44,10 @@ namespace svx
 
     /** opens a dialog which allows the user to administrate the database registrations
     */
-    USHORT  SVX_DLLPUBLIC  administrateDatabaseRegistration( Window* _parentWindow );
+    sal_uInt16  SVX_DLLPUBLIC  administrateDatabaseRegistration( Window* _parentWindow );
 
 //........................................................................
 }   // namespace svx
 //........................................................................
 
 #endif // SVX_DATABASE_REGISTRATION_UI_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx
index 7a6ce675f3..7a6ce675f3 100644..100755
--- a/svx/inc/svx/dbaexchange.hxx
+++ b/svx/inc/svx/dbaexchange.hxx
diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx
index 446822a2e4..446822a2e4 100644..100755
--- a/svx/inc/svx/dbaobjectex.hxx
+++ b/svx/inc/svx/dbaobjectex.hxx
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index ce6bffd3a9..ce6bffd3a9 100644..100755
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc
index 1909ece6de..1909ece6de 100644..100755
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/svx/dbexch.hrc
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 9144f64cda..7e2cc64314 100644..100755
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -58,7 +58,7 @@ namespace svxform
         static ::connectivity::simple::createDataAccessToolsFactoryFunction
                                 s_pFactoryCreationFunc;
 
-        mutable BOOL            m_bCreateAlready;
+        mutable sal_Bool            m_bCreateAlready;
 
     private:
         mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory >	m_xDataAccessFactory;
diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx
index 93931feca6..93931feca6 100644..100755
--- a/svx/inc/svx/def3d.hxx
+++ b/svx/inc/svx/def3d.hxx
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 41e8754e68..ac6b8583b7 100644..100755
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -45,14 +45,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes
 private:
     // Compound object
     Color				aDefaultAmbientColor;
-    BOOL				bDefaultCreateNormals;
-    BOOL				bDefaultCreateTexture;
+    sal_Bool				bDefaultCreateNormals;
+    sal_Bool				bDefaultCreateTexture;
 
     // Cube object
     basegfx::B3DPoint	aDefaultCubePos;
     basegfx::B3DVector	aDefaultCubeSize;
-    UINT16				nDefaultCubeSideFlags;
-    BOOL				bDefaultCubePosIsCenter;
+    sal_uInt16				nDefaultCubeSideFlags;
+    sal_Bool				bDefaultCubePosIsCenter;
 
     // Sphere object
     basegfx::B3DPoint	aDefaultSphereCenter;
@@ -60,18 +60,18 @@ private:
 
     // Lathe object
     long				nDefaultLatheEndAngle;
-    BOOL				bDefaultLatheSmoothed;
-    BOOL				bDefaultLatheSmoothFrontBack;
-    BOOL				bDefaultLatheCharacterMode;
-    BOOL				bDefaultLatheCloseFront;
-    BOOL				bDefaultLatheCloseBack;
+    sal_Bool				bDefaultLatheSmoothed;
+    sal_Bool				bDefaultLatheSmoothFrontBack;
+    sal_Bool				bDefaultLatheCharacterMode;
+    sal_Bool				bDefaultLatheCloseFront;
+    sal_Bool				bDefaultLatheCloseBack;
 
     // Extrude object
-    BOOL				bDefaultExtrudeSmoothed;
-    BOOL				bDefaultExtrudeSmoothFrontBack;
-    BOOL				bDefaultExtrudeCharacterMode;
-    BOOL				bDefaultExtrudeCloseFront;
-    BOOL				bDefaultExtrudeCloseBack;
+    sal_Bool				bDefaultExtrudeSmoothed;
+    sal_Bool				bDefaultExtrudeSmoothFrontBack;
+    sal_Bool				bDefaultExtrudeCharacterMode;
+    sal_Bool				bDefaultExtrudeCloseFront;
+    sal_Bool				bDefaultExtrudeCloseBack;
 
 public:
     // Construktor
@@ -85,20 +85,20 @@ public:
     const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
     void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
     
-    BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
-    void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; }
-    BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
-    void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
+    sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
+    void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; }
+    sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
+    void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; }
 
     // Cube object
     const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
     void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
     const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
     void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
-    UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
-    void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; }
-    BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
-    void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
+    sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
+    void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
+    sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
+    void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; }
 
     // Sphere object
     const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
@@ -109,28 +109,28 @@ public:
     // Lathe object
     long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
     void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
-    BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
-    void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; }
-    BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
-    void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; }
-    BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
-    void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; }
-    BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
-    void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; }
-    BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
-    void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
+    sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
+    void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; }
+    sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
+    void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
+    sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
+    void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; }
+    sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
+    void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; }
+    sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
+    void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; }
 
     // Extrude object
-    BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
-    void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
-    BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
-    void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
-    BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
-    void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; }
-    BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
-    void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; }
-    BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
-    void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; }
+    sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
+    void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; }
+    sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
+    void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
+    sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
+    void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
+    sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
+    void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; }
+    sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
+    void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; }
 };
 
 #endif			// _E3D_DEFLT3D_HXX
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx
index 5ead2c2b68..5ead2c2b68 100644..100755
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/svx/dialcontrol.hxx
diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 0cc242191c..0cc242191c 100644..100755
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 56c29612da..e9773a8a55 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -52,6 +52,14 @@
 #define RID_SVXSTR_LINESTYLE                (RID_SVX_START + 173)
 #define RID_SVXSTR_FIELDUNIT_TABLE			(RID_SVX_START + 311)
 #define RID_SVXSTR_COLOR_USER               (RID_SVX_START + 250)
+//IAccessibility2 Implementation 2009-----
+#define RID_SVXSTR_GALLERYPROPS_GALTHEME	(RID_SVX_START + 251)
+#define RID_SVXSTR_GALLERY_THEMEITEMS		(RID_SVX_START + 252)
+#define RID_SVXSTR_GALLERY_THEMENAME		(RID_SVX_START + 253)
+#define RID_SVXSTR_GALLERY_FILESFOUND		(RID_SVX_START + 254)
+#define RID_SVXSTR_GALLERY_PREVIEW			(RID_SVX_START + 255)
+//-----IAccessibility2 Implementation 2009
+
 
 // factory IDs of tabpages implemented in CUI
 #define RID_SVXPAGE_CHAR_TWOLINES			(RID_SVX_START + 242)
@@ -306,10 +314,6 @@
 #define RID_SVXBMP_3D_FOCAL_LENGTH_09       (RID_SVX_START + 180)
 #define RID_SVXBMP_3D_FOCAL_LENGTH_10		(RID_SVX_START + 181)
 
-// for ToolboxControls alignment and draw objects
-#define RID_SVXTBX_DRAW						(RID_SVX_START + 189)
-#define RID_SVXTBX_ALIGNMENT				(RID_SVX_START + 190)
-
 // Ids fuer auto correction
 #define RID_SVX_AUTOCORR					(RID_SVX_START + 192)
 
@@ -925,6 +929,9 @@
 
 #define RID_SVXSTR_NEXTFREE                                 (RID_SVX_START + 1191)
 
+//IAccessibility2 Implementation 2009-----
+#define RID_SVXSTR_TEXTCOLOR								(RID_SVX_START + 1178)
+//-----IAccessibility2 Implementation 2009
 // ----------------------------------------------------------------------------
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be
@@ -1000,8 +1007,10 @@
 #define SID_SC_TP_MISC					(RID_OFA_START + 239)
 #define OFA_TP_TABPROPERTIES_TEXT	    (RID_OFA_START + 245)
 #define OFA_TP_HELPERPROG               (RID_OFA_START + 249)
-#define SID_SC_TP_FORMULA               (RID_OFA_START + 257)
-#define SID_SC_TP_COMPATIBILITY         (RID_OFA_START + 258)
+#define STR_COLORTABLE					(RID_OFA_START + 257)
+#define STR_SWITCH						(RID_OFA_START + 258)
+#define SID_SC_TP_FORMULA               (RID_OFA_START + 259)
+#define SID_SC_TP_COMPATIBILITY         (RID_OFA_START + 260)
 
 // ----------------------------------------------------------------------------
 // ooo-build specific resources
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index d56a3991f8..d56a3991f8 100644..100755
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 9c4fffd326..4a66cd9bcf 100644..100755
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -83,7 +83,7 @@ public:
 |* an object
 |*
 \************************************************************************/
-typedef UINT16 CTL_STATE;
+typedef sal_uInt16 CTL_STATE;
 #define CS_NOHORZ	1		// no horizontal input information is used
 #define CS_NOVERT	2		// no vertikal input information is used
 
@@ -92,15 +92,15 @@ class SvxRectCtlAccessibleContext;
 class SVX_DLLPUBLIC SvxRectCtl : public Control
 {
 private:
-    SVX_DLLPRIVATE void				InitSettings( BOOL bForeground, BOOL bBackground );
+    SVX_DLLPRIVATE void				InitSettings( sal_Bool bForeground, sal_Bool bBackground );
     SVX_DLLPRIVATE void				InitRectBitmap( void );
     SVX_DLLPRIVATE Bitmap&          GetRectBitmap( void );
     SVX_DLLPRIVATE void             Resize_Impl();
 
 protected:
     SvxRectCtlAccessibleContext*	pAccContext;
-    USHORT							nBorderWidth;
-    USHORT							nRadius;
+    sal_uInt16							nBorderWidth;
+    sal_uInt16							nRadius;
     Size							aSize;
     Point							aPtLT, aPtMT, aPtRT;
     Point							aPtLM, aPtMM, aPtRM;
@@ -124,7 +124,7 @@ protected:
     Point				GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const;
 public:
     SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
-                USHORT nBorder = 200, USHORT nCircle = 80, CTL_STYLE eStyle = CS_RECT );
+                sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
     virtual ~SvxRectCtl();
 
     virtual void 		Paint( const Rectangle& rRect );
@@ -140,7 +140,7 @@ public:
 
     void				SetState( CTL_STATE nState );
 
-    UINT8				GetNumOfChilds( void ) const;	// returns number of usable radio buttons
+    sal_uInt8				GetNumOfChilds( void ) const;	// returns number of usable radio buttons
 
     Rectangle			CalculateFocusRectangle( void ) const;
     Rectangle			CalculateFocusRectangle( RECT_POINT eRectPoint ) const;
@@ -167,7 +167,7 @@ private:
 protected:
     Font	aFont;
     Size	aFontSize;
-    BOOL	bPositive;
+    sal_Bool	bPositive;
 
 public:
             SvxAngleCtl( Window* pParent, const ResId& rResId );
@@ -188,9 +188,9 @@ class SVX_DLLPUBLIC SvxBitmapCtl
 {
 protected:
     Size			aSize;
-    USHORT			nLines;
+    sal_uInt16			nLines;
     Color			aPixelColor, aBackgroundColor;
-    const USHORT*	pBmpArray;
+    const sal_uInt16*	pBmpArray;
 
 public:
             SvxBitmapCtl( Window* pParent, const Size& rSize );
@@ -198,8 +198,8 @@ public:
 
     XOBitmap	GetXBitmap();
 
-    void	SetBmpArray( const USHORT* pPixel ) { pBmpArray = pPixel; }
-    void	SetLines( USHORT nLns ) { nLines = nLns; }
+    void	SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
+    void	SetLines( sal_uInt16 nLns ) { nLines = nLns; }
     void	SetPixelColor( Color aColor ) { aPixelColor = aColor; }
     void	SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
 };
@@ -215,19 +215,19 @@ private:
     using OutputDevice::SetLineColor;
 
 protected:
-    USHORT		nLines, nSquares;
+    sal_uInt16		nLines, nSquares;
     Color		aPixelColor;
     Color		aBackgroundColor;
     Color		aLineColor;
     Size		aRectSize;
-    USHORT* 	pPixel;
-    BOOL		bPaintable;
+    sal_uInt16* 	pPixel;
+    sal_Bool		bPaintable;
 
-    void	ChangePixel( USHORT nPixel );
+    void	ChangePixel( sal_uInt16 nPixel );
 
 public:
             SvxPixelCtl( Window* pParent, const ResId& rResId,
-                        USHORT nNumber = 8 );
+                        sal_uInt16 nNumber = 8 );
             ~SvxPixelCtl();
 
     virtual void Paint( const Rectangle& rRect );
@@ -239,14 +239,14 @@ public:
     void	SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; }
     void	SetLineColor( const Color& rCol ) { aLineColor = rCol; }
 
-    USHORT	GetLineCount() const { return nLines; }
+    sal_uInt16	GetLineCount() const { return nLines; }
     Color	GetPixelColor() const { return aPixelColor; }
     Color	GetBackgroundColor() const { return aBackgroundColor; }
 
-    USHORT	GetBitmapPixel( const USHORT nPixelNumber );
-    USHORT* GetBitmapPixelPtr() { return pPixel; }
+    sal_uInt16	GetBitmapPixel( const sal_uInt16 nPixelNumber );
+    sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
 
-    void	SetPaintable( BOOL bTmp ) { bPaintable = bTmp; }
+    void	SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
     void	Reset();
 };
 
@@ -265,7 +265,7 @@ public:
     virtual void Fill( const XColorTable* pTab );
 
     void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL );
-    void Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
 };
 
 /*************************************************************************
@@ -277,20 +277,20 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox
 {
 
 public:
-         HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
-         HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+         HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+         HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XHatchList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void	Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL );
-    void	Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void	Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void	SelectEntryByList( const XHatchList* pList, const String& rStr,
-                        const XHatch& rXHatch, USHORT nDist = 0 );
+                        const XHatch& rXHatch, sal_uInt16 nDist = 0 );
 
 private:
     XHatchList*		mpList;
-    BOOL			mbUserDraw;
+    sal_Bool			mbUserDraw;
 };
 
 /*************************************************************************
@@ -301,20 +301,20 @@ private:
 class SVX_DLLPUBLIC GradientLB : public ListBox
 {
 public:
-    GradientLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
-    GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+    GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+    GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XGradientList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void	Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL );
-    void	Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void	Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void	SelectEntryByList( const XGradientList* pList, const String& rStr,
-                        const XGradient& rXGradient, USHORT nDist = 0 );
+                        const XGradient& rXGradient, sal_uInt16 nDist = 0 );
 
 private:
     XGradientList* mpList;
-    BOOL			mbUserDraw;
+    sal_Bool			mbUserDraw;
 };
 
 /*************************************************************************
@@ -325,13 +325,13 @@ private:
 class SVX_DLLPUBLIC BitmapLB : public ListBox
 {
 public:
-         BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
+         BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
 
     virtual void Fill( const XBitmapList* pList );
     virtual void UserDraw( const UserDrawEvent& rUDEvt );
 
     void	Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL );
-    void	Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void	Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void	SelectEntryByList( const XBitmapList* pList, const String& rStr,
                         const Bitmap& rBmp);
 
@@ -340,7 +340,7 @@ private:
     Bitmap			aBitmap;
 
     XBitmapList*	mpList;
-    BOOL			mbUserDraw;
+    sal_Bool			mbUserDraw;
 
     SVX_DLLPRIVATE void SetVirtualDevice();
 };
@@ -401,9 +401,9 @@ public:
     virtual void Fill( const XDashList* pList );
 
     void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL );
-    void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+    void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
     void SelectEntryByList( const XDashList* pList, const String& rStr,
-                            const XDash& rDash, USHORT nDist = 0 );
+                            const XDash& rDash, sal_uInt16 nDist = 0 );
     void FillStyles();
 };
 
@@ -419,12 +419,12 @@ public:
          LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
          LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {}
 
-    virtual void Fill( const XLineEndList* pList, BOOL bStart = TRUE );
+    virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True );
 
     void	Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL,
-                    BOOL bStart = TRUE );
-    void	Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL,
-                    BOOL bStart = TRUE );
+                    sal_Bool bStart = sal_True );
+    void	Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL,
+                    sal_Bool bStart = sal_True );
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -483,7 +483,7 @@ public:
 
     void SetLineAttributes(const SfxItemSet& rItemSet);
 
-    void ShowSymbol( BOOL b ) { mbWithSymbol = b; };
+    void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; };
     void SetSymbol( Graphic* p, const Size& s );
     void ResizeSymbol( const Size& s );
 
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx
index 039fa22476..039fa22476 100644..100755
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/svx/dlgutil.hxx
diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index cac8a37b87..e63017285e 100644..100755
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -49,7 +49,7 @@ public:
                             TYPEINFO();
                             SvxColorTableItem();
                             SvxColorTableItem( XColorTable* pTable,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxColorTableItem( const SvxColorTableItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -59,8 +59,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XColorTable*			GetColorTable() const { return pColorTable; }
     void			 		SetColorTable( XColorTable* pTable ) {
@@ -83,7 +83,7 @@ public:
                             TYPEINFO();
                             SvxGradientListItem();
                             SvxGradientListItem( XGradientList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxGradientListItem( const SvxGradientListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -93,8 +93,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XGradientList*			GetGradientList() const { return pGradientList; }
     void			 		SetGradientList( XGradientList* pList ) {
@@ -118,7 +118,7 @@ public:
                             TYPEINFO();
                             SvxHatchListItem();
                             SvxHatchListItem( XHatchList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxHatchListItem( const SvxHatchListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -128,8 +128,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XHatchList*				GetHatchList() const { return pHatchList; }
     void			 		SetHatchList( XHatchList* pList ) {
@@ -153,7 +153,7 @@ public:
                             TYPEINFO();
                             SvxBitmapListItem();
                             SvxBitmapListItem( XBitmapList* pBL,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxBitmapListItem( const SvxBitmapListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -163,8 +163,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XBitmapList*			GetBitmapList() const { return pBitmapList; }
     void			 		SetBitmapList( XBitmapList* pList ) {
@@ -188,7 +188,7 @@ public:
                             TYPEINFO();
                             SvxDashListItem();
                             SvxDashListItem( XDashList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxDashListItem( const SvxDashListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -198,8 +198,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XDashList*	  			GetDashList() const { return pDashList; }
     void			 		SetDashList( XDashList* pList );
@@ -222,7 +222,7 @@ public:
                             TYPEINFO();
                             SvxLineEndListItem();
                             SvxLineEndListItem( XLineEndList* pList,
-                                    USHORT nWhich  );
+                                    sal_uInt16 nWhich  );
                             SvxLineEndListItem( const SvxLineEndListItem& );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -232,8 +232,8 @@ public:
 
     virtual int 			operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
 
     XLineEndList*			GetLineEndList() const { return pLineEndList; }
     void			 		SetLineEndList( XLineEndList* pList ) {
diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx
index 6238bf991f..6238bf991f 100644..100755
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/svx/inc/svx/dstribut_enum.hxx
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 266cdbaeda..42926ddab9 100644..100755
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -45,18 +45,18 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
 public:
                             TYPEINFO();
                             SvxB3DVectorItem();
-                            SvxB3DVectorItem( USHORT nWhich, const basegfx::B3DVector& rVal );
-                            SvxB3DVectorItem( USHORT nWhich, SvStream & );
+                            SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
+                            SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & );
                             SvxB3DVectorItem( const SvxB3DVectorItem& );
                             ~SvxB3DVectorItem();
 
     virtual int				operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream&		Store(SvStream &, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create(SvStream &, sal_uInt16 nVersion) const;
+    virtual SvStream&		Store(SvStream &, sal_uInt16 nItemVersion ) const;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const basegfx::B3DVector&			GetValue() const { return aVal; }
             void			SetValue( const basegfx::B3DVector& rNewVal ) {
@@ -64,7 +64,7 @@ public:
                                  aVal = rNewVal;
                              }
 
-    virtual USHORT GetVersion (USHORT nFileFormatVersion) const;
+    virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
 };
 
 #endif
diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx
index 473ca1f230..473ca1f230 100644..100755
--- a/svx/inc/svx/e3dsceneupdater.hxx
+++ b/svx/inc/svx/e3dsceneupdater.hxx
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index 131c4aac6d..76f32e52da 100644..100755
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -58,7 +58,7 @@ class E3dUndoAction : public SdrUndoAction
 
         virtual ~E3dUndoAction ();
 
-        virtual BOOL CanRepeat(SfxRepeatTarget&) const;
+        virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
 };
 
 /************************************************************************\
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
 
     SdrObject*	pObject;
     E3dView*	pView;
-    BOOL		bUseSubObjects;
+    sal_Bool		bUseSubObjects;
 
     const SfxItemSet aNewSet;
     const SfxItemSet aOldSet;
@@ -112,11 +112,11 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
             E3dObject* pInObject,
             const SfxItemSet& rNewSet,
             const SfxItemSet& rOldSet,
-            BOOL bUseSubObj);
+            sal_Bool bUseSubObj);
 
         virtual ~E3dAttributesUndoAction();
 
-        virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+        virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
         virtual void Undo();
         virtual void Redo();
         virtual void Repeat();
diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc
index 2008375dde..828ed6c124 100644..100755
--- a/svx/inc/svx/exthelpid.hrc
+++ b/svx/inc/svx/exthelpid.hrc
@@ -28,8 +28,6 @@
 #define _SVX_EXTHELPID_HRC
 // include ---------------------------------------------------------------
 
-#include <svl/solar.hrc>
-
 // these HIDs are used in SVX and also in other modules, mainly CUI
 // the reason is that different controls have the same help texts assigned 
 // but are implemented in different libraries
@@ -37,19 +35,8 @@
 // are moved to this exported (delivered) hrc file
 
 // Help-Ids --------------------------------------------------------------
-#define HID_GALLERY_ACTUALIZE                     (HID_SVX_EXT0_START +  0)
-#define HID_GALLERY_TITLE						  (HID_SVX_EXT0_START +  1)
-
-// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_EXT_HID_END		(HID_SVX_EXT0_START +  1)
-#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_GALLERY_ACTUALIZE                     "SVX_HID_GALLERY_ACTUALIZE"
+#define HID_GALLERY_TITLE						  "SVX_HID_GALLERY_TITLE"
 
 #endif
 
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index 8454acf04d..0df8d1eac5 100644..100755
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -90,7 +90,7 @@ public:
     sal_Bool GetCloseBack() const 
         { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void operator=(const SdrObject&);
 
@@ -102,7 +102,7 @@ public:
     void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
     const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; }
 
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx
index f33748836b..f33748836b 100644..100755
--- a/svx/inc/svx/extrusionbar.hxx
+++ b/svx/inc/svx/extrusionbar.hxx
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx
index 4b79b8819c..f7f26d96e7 100644..100755
--- a/svx/inc/svx/extrusioncolorcontrol.hxx
+++ b/svx/inc/svx/extrusioncolorcontrol.hxx
@@ -43,10 +43,10 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~ExtrusionColorControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index bcfc8dcc05..0063b4a940 100644..100755
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -43,7 +43,7 @@
 class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
 {
  public:
-    Svx3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(Svx3DChildWindow);
 };
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 73b5c69a54..c52eac07e3 100644..100755
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -62,17 +62,17 @@ private:
     SvxFillTypeBox*		pFillTypeLB;
     SvxFillAttrBox*		pFillAttrLB;
 
-    BOOL				bUpdate;
-    BOOL                bIgnoreStatusUpdate;
-    USHORT				eLastXFS;
+    sal_Bool				bUpdate;
+    sal_Bool                bIgnoreStatusUpdate;
+    sal_uInt16				eLastXFS;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFillToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void 		        Update( const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 46f0375801..61831831f4 100644..100755
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
@@ -46,13 +46,13 @@
 #define SVX_HIDESHADOWCTL	0x01
 
 // copy from chardlg.hxx
-#define DISABLE_CASEMAP				((USHORT)0x0001)
-#define DISABLE_WORDLINE			((USHORT)0x0002)
-#define DISABLE_BLINK				((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR		((USHORT)0x0008)
+#define DISABLE_CASEMAP				((sal_uInt16)0x0001)
+#define DISABLE_WORDLINE			((sal_uInt16)0x0002)
+#define DISABLE_BLINK				((sal_uInt16)0x0004)
+#define DISABLE_UNDERLINE_COLOR		((sal_uInt16)0x0008)
 
-#define DISABLE_LANGUAGE			((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE		((USHORT)0x0020)
+#define DISABLE_LANGUAGE			((sal_uInt16)0x0010)
+#define DISABLE_HIDE_LANGUAGE		((sal_uInt16)0x0020)
 
 // flags for SvxCharBasePage's child class
 #define SVX_PREVIEW_CHARACTER 	0x01
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 7f6eb2c26d..b0763924af 100644..100755
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -33,7 +33,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <sfx2/dockwin.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/stdctrl.hxx>
 #include "svx/svxdllapi.h"
@@ -80,6 +80,7 @@ private:
     ImageButton			aBtnAssign;
 
 // geometry
+    FixedLine           aFLGeometrie;
     FixedText			aFtPercentDiagonal;
     MetricField			aMtrPercentDiagonal;
     FixedText			aFtBackscale;
@@ -88,36 +89,35 @@ private:
     MetricField			aMtrEndAngle;
     FixedText			aFtDepth;
     MetricField			aMtrDepth;
-    FixedLine           aFLGeometrie;
+      FixedLine           aFLSegments;
 
     FixedText			aFtHorizontal;
     NumericField		aNumHorizontal;
     FixedText			aFtVertical;
     NumericField		aNumVertical;
-    FixedLine           aFLSegments;
+       FixedLine           aFLNormals;
 
     ImageButton			aBtnNormalsObj;
     ImageButton			aBtnNormalsFlat;
     ImageButton			aBtnNormalsSphere;
     ImageButton			aBtnNormalsInvert;
     ImageButton			aBtnTwoSidedLighting;
-    FixedLine           aFLNormals;
 
     ImageButton			aBtnDoubleSided;
-
+    FixedLine           aFLRepresentation;
 // presentation
     FixedText			aFtShademode;
     ListBox				aLbShademode;
+    FixedLine           aFLShadow;
     ImageButton			aBtnShadow3d;
     FixedText			aFtSlant;
     MetricField			aMtrSlant;
-    FixedLine           aFLShadow;
     FixedText			aFtDistance;
     MetricField			aMtrDistance;
     FixedText			aFtFocalLeng;
     MetricField			aMtrFocalLength;
     FixedLine           aFLCamera;
-    FixedLine           aFLRepresentation;
+    FixedLine           aFLLight;
 
 // lighting
     ImageButton			aBtnLight1;
@@ -128,6 +128,7 @@ private:
     ImageButton			aBtnLight6;
     ImageButton			aBtnLight7;
     ImageButton			aBtnLight8;
+    FixedText           aFTLightsource;
     ColorLB				aLbLight1;
     ColorLB				aLbLight2;
     ColorLB				aLbLight3;
@@ -138,7 +139,6 @@ private:
     ColorLB				aLbLight8;
 
     ImageButton			aBtnLightColor;
-    FixedText           aFTLightsource;
 
     // #99694# Keyboard shortcuts activate the next control, so the
     // order needed to be changed here
@@ -146,7 +146,7 @@ private:
     ColorLB				aLbAmbientlight;	// ListBox
     ImageButton			aBtnAmbientColor;	// color button
 
-    FixedLine           aFLLight;
+       FixedLine           aFLTexture;
 
 // Textures
     FixedText			aFtTexKind;
@@ -166,10 +166,10 @@ private:
     ImageButton			aBtnTexCircleY;
     FixedText			aFtTexFilter;
     ImageButton			aBtnTexFilter;
-    FixedLine           aFLTexture;
 
 // material
 // material editor
+       FixedLine           aFLMaterial;	
     FixedText			aFtMatFavorites;
     ListBox  			aLbMatFavorites;
     FixedText			aFtMatColor;
@@ -178,25 +178,25 @@ private:
     FixedText			aFtMatEmission;
     ColorLB				aLbMatEmission;
     ImageButton			aBtnEmissionColor;
+       FixedLine           aFLMatSpecular;
     FixedText			aFtMatSpecular;
     ColorLB				aLbMatSpecular;
     ImageButton			aBtnSpecularColor;
     FixedText			aFtMatSpecularIntensity;
     MetricField			aMtrMatSpecularIntensity;
-    FixedLine           aFLMatSpecular;
-    FixedLine           aFLMaterial;
+
+    Svx3DPreviewControl	aCtlPreview;
+    SvxLightCtl3D		aCtlLightPreview;
 
 // bottom part
     ImageButton			aBtnConvertTo3D;
     ImageButton			aBtnLatheObject;
     ImageButton			aBtnPerspective;
-    Svx3DPreviewControl	aCtlPreview;
-    SvxLightCtl3D		aCtlLightPreview;
 
 // the rest ...
     Image				aImgLightOn;
     Image				aImgLightOff;
-    BOOL				bUpdate;
+    sal_Bool				bUpdate;
     ViewType3D			eViewType;
     Size				aSize;
 
@@ -221,7 +221,7 @@ private:
     // ItemSet used to remember set 2d attributes
     SfxItemSet*			mpRemember2DAttributes;
 
-    BOOL				bOnly3DChanged;
+    sal_Bool				bOnly3DChanged;
 
     //------------------------------------
 
@@ -242,8 +242,8 @@ private:
     SVX_DLLPRIVATE void			Construct();
     SVX_DLLPRIVATE void			Reset();
 
-    SVX_DLLPRIVATE BOOL			LBSelectColor( ColorLB* pLb, const Color& rColor );
-    SVX_DLLPRIVATE USHORT			GetLightSource( const PushButton* pBtn = NULL );
+    SVX_DLLPRIVATE sal_Bool			LBSelectColor( ColorLB* pLb, const Color& rColor );
+    SVX_DLLPRIVATE sal_uInt16			GetLightSource( const PushButton* pBtn = NULL );
     SVX_DLLPRIVATE ColorLB*		GetLbByButton( const PushButton* pBtn = NULL );
 
     SVX_DLLPRIVATE bool			GetUILightState( ImageButton& aBtn ) const;
@@ -258,7 +258,7 @@ public:
             ~Svx3DWin();
 
     void	InitColorLB( const SdrModel* pDoc );
-    BOOL	IsUpdateMode() const { return bUpdate; }
+    sal_Bool	IsUpdateMode() const { return bUpdate; }
 
     void	Update( SfxItemSet& rSet );
     void	GetAttr( SfxItemSet& rSet );
@@ -278,11 +278,11 @@ class Svx3DCtrlItem : public SfxControllerItem
     Svx3DWin* p3DWin;
 
  protected:
-    virtual void StateChanged( USHORT nSId, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
                                 const SfxPoolItem* pState );
 
  public:
-    Svx3DCtrlItem( USHORT, Svx3DWin*, SfxBindings* );
+    Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* );
 };
 
 /*************************************************************************
@@ -294,14 +294,14 @@ class Svx3DCtrlItem : public SfxControllerItem
 
 class SvxConvertTo3DItem : public SfxControllerItem
 {
-    BOOL						bState;
+    sal_Bool						bState;
 
 protected:
-    virtual void StateChanged(UINT16 nSId, SfxItemState eState, const SfxPoolItem* pState);
+    virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState);
 
 public:
-    SvxConvertTo3DItem(UINT16 nId, SfxBindings* pBindings);
-    BOOL GetState() const { return bState; }
+    SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings);
+    sal_Bool GetState() const { return bState; }
 };
 
 #endif		// _SVX_FLOAT3D_HXX
diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx
index a38f561d6d..a38f561d6d 100644..100755
--- a/svx/inc/svx/fmdmod.hxx
+++ b/svx/inc/svx/fmdmod.hxx
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index 990c90c4be..990c90c4be 100644..100755
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx
index c2289cbe51..c2289cbe51 100644..100755
--- a/svx/inc/svx/fmglob.hxx
+++ b/svx/inc/svx/fmglob.hxx
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index 054cccfe4e..054cccfe4e 100644..100755
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 9c0cbedfb2..c6a9d2d967 100644..100755
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
@@ -50,7 +50,7 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index d4dfef4951..aaa5294230 100644..100755
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -70,7 +70,7 @@ public:
     virtual SdrPage* AllocPage(bool bMasterPage);
     virtual void     InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
     virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
-    virtual void     MovePage(USHORT nPgNum, USHORT nNewPos);
+    virtual void     MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     virtual void     InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
     virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
 
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index b2767b6258..7e59fa175b 100644..100755
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,4 +49,3 @@ public:
 
 #endif          // _FM_FMOBJFAC_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 0160e22c50..c013f3a493 100644..100755
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -62,10 +62,10 @@ public:
     virtual SdrPage* Clone() const;
     using SdrPage::Clone;
 
-    virtual void	InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND,
+    virtual void	InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND,
                                     const SdrInsertReason* pReason=NULL);
 
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual SdrObject* RemoveObject(sal_uLong nObjNum);
 
     // access to all forms
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc
index 07e994bb62..07e994bb62 100644..100755
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/inc/svx/fmresids.hrc
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index b943e452af..b943e452af 100644..100755
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index 9f7380e031..9f7380e031 100644..100755
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx
index 6ba0bd062f..6ba0bd062f 100644..100755
--- a/svx/source/inc/fmsrccfg.hxx
+++ b/svx/inc/svx/fmsrccfg.hxx
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx
index 85d6ee43ee..3748a69e18 100644..100755
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/inc/svx/fmsrcimp.hxx
@@ -47,15 +47,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <osl/thread.hxx>
 
-#ifndef _SVSTDARR_ULONGS
-#define _SVSTDARR_ULONGS
-#include <svl/svstdarr.hxx>
-#endif
-
-// ===================================================================================================
-// Hilfsstrukturen
-
-SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16)
+#include <deque>
 
 // ===================================================================================================
 // = class FmSearchThread - wie der Name schon sagt
@@ -190,8 +182,8 @@ class SVX_DLLPUBLIC FmSearchEngine
     enum SEARCHFOR_TYPE { SEARCHFOR_STRING, SEARCHFOR_NULL, SEARCHFOR_NOTNULL };
 
     // zugrundeliegende Daten
-    CursorWrapper			m_xSearchCursor;
-    SvInt32Array			m_arrFieldMapping;
+    CursorWrapper                   m_xSearchCursor;
+    std::deque<sal_Int32>           m_arrFieldMapping;
         // da der Iterator durchaus mehr Spalten haben kann, als ich eigentlich verwalte (in meiner Feld-Listbox),
         // muss ich mir hier ein Mapping dieser ::com::sun::star::form-Schluessel auf die Indizies der entsprechenden Spalten im Iterator halten
 
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index 4cffe7f4a5..3d4ef3b930 100644..100755
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -72,7 +72,7 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index dda53d3ab5..48bcefecc9 100644..100755
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -98,8 +98,8 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
         sal_uInt16 _nControlObjectID,
         const ::rtl::OUString& _rFieldPostfix,
-        UINT32 _nInventor,
-        UINT16 _nLabelObjectID,
+        sal_uInt32 _nInventor,
+        sal_uInt16 _nLabelObjectID,
         SdrPage* _pLabelPage,
         SdrPage* _pControlPage,
         SdrModel* _pModel,
@@ -115,7 +115,7 @@ public:
     using E3dView::Paste;
     virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
-    virtual BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
 
     /** grab the focus to the first form control on the view
         @param _bForceSync
@@ -129,7 +129,7 @@ public:
             GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
 
     // SdrView
-    BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
 
     /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL"
     FmFormPage* GetCurPage();
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index e94329ef52..33583c4d8a 100644..100755
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -49,12 +49,12 @@ private:
 
     SVX_DLLPRIVATE void			FillMenu();
     DECL_LINK( MenuSelect, FontNameMenu * );
-    SVX_DLLPRIVATE virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    SVX_DLLPRIVATE virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     SVX_DLLPRIVATE virtual void 	Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 public:
-    SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& );
+    SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxFontMenuControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 3690d291e8..c9a4c34c75 100644..100755
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window
 private:
     FontPrevWin_Impl*   pImpl;
 
-    SVX_DLLPRIVATE void				InitSettings( BOOL bForeground, BOOL bBackground );
+    SVX_DLLPRIVATE void				InitSettings( sal_Bool bForeground, sal_Bool bBackground );
 
 public:
                         SvxFontPrevWindow( Window* pParent, const ResId& rId );
@@ -69,15 +69,15 @@ public:
     void  				SetColor( const Color& rColor );
     void                ResetColor();
     void                SetBackColor( const Color& rColor );
-    void                UseResourceText( BOOL bUse = TRUE );
+    void                UseResourceText( sal_Bool bUse = sal_True );
     void  				Paint( const Rectangle& );
 
-    BOOL				IsTwoLines() const;
-    void				SetTwoLines(BOOL bSet);
+    sal_Bool				IsTwoLines() const;
+    void				SetTwoLines(sal_Bool bSet);
 
     void				SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
 
-    void				SetFontWidthScale( UINT16 nScaleInPercent );
+    void				SetFontWidthScale( sal_uInt16 nScaleInPercent );
 
     void				AutoCorrectFontColor( void );
 
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index 1413e39751..296b9bb566 100644..100755
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -50,11 +50,11 @@ private:
     DECL_LINK( MenuSelect, FontSizeMenu * );
 
 protected:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
 public:
-    SvxFontSizeMenuControl(	USHORT nId, Menu&, SfxBindings& );
+    SvxFontSizeMenuControl(	sal_uInt16 nId, Menu&, SfxBindings& );
     ~SvxFontSizeMenuControl();
 
     virtual PopupMenu*  GetPopup() const;
diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 6cbcee90dd..7cf56e506d 100644..100755
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -95,7 +95,7 @@ public:
     void                        SetNoSelection();
 
     /** Returns the position of the entry currently selected or LIST_APPEND. */
-    ULONG                       GetSelectEntryPos() const;
+    sal_uLong                       GetSelectEntryPos() const;
     /** Returns the text of the selected entry or an empty string. */
     XubString                   GetSelectEntry() const;
 
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 0eb718bf4c..561caaf3af 100644..100755
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -70,11 +70,11 @@ class SvxFontWorkControllerItem : public SfxControllerItem
     SvxFontWorkDialog  &rFontWorkDlg;
 
 protected:
-    virtual void StateChanged(USHORT nSID, SfxItemState eState,
+    virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState);
 
 public:
-    SvxFontWorkControllerItem(USHORT nId, SvxFontWorkDialog&, SfxBindings&);
+    SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&);
 };
 
 /*************************************************************************
@@ -86,7 +86,7 @@ public:
 class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
 {
  public:
-    SvxFontWorkChildWindow(Window*, USHORT, SfxBindings*, SfxChildWinInfo*);
+    SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
     SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow);
 };
 
@@ -123,11 +123,11 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 
     SfxBindings&	rBindings;
     Timer			aInputTimer;
-    BOOL			bUserZoomedIn;
+    sal_Bool			bUserZoomedIn;
 
-    USHORT			nLastStyleTbxId;
-    USHORT			nLastAdjustTbxId;
-    USHORT			nLastShadowTbxId;
+    sal_uInt16			nLastStyleTbxId;
+    sal_uInt16			nLastAdjustTbxId;
+    sal_uInt16			nLastShadowTbxId;
     long			nSaveShadowX;
     long			nSaveShadowY;
     long			nSaveShadowAngle;
@@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     void SetShowForm_Impl(const XFormTextHideFormItem*);
     void SetOutline_Impl(const XFormTextOutlineItem*);
     void SetShadow_Impl(const XFormTextShadowItem*,
-                        BOOL bRestoreValues = FALSE);
+                        sal_Bool bRestoreValues = sal_False);
     void SetShadowColor_Impl(const XFormTextShadowColorItem*);
     void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
     void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@@ -182,7 +182,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     ~SvxFontWorkDialog();
 
     void SetColorTable(const XColorTable* pTable);
-    void SetActive(BOOL bActivate = TRUE);
+    void SetActive(sal_Bool bActivate = sal_True);
 
     void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
                           const SfxItemSet& rAttr, SdrObject& rOldObj,
diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx
index 24ed76812e..24ed76812e 100644..100755
--- a/svx/inc/svx/fontworkbar.hxx
+++ b/svx/inc/svx/fontworkbar.hxx
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 51c9901ab0..315d882fd8 100644..100755
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
@@ -64,10 +64,10 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~FontWorkShapeTypeControl();
 
-    virtual void				Select( BOOL bMod1 = FALSE );
+    virtual void				Select( sal_Bool bMod1 = sal_False );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
 };
@@ -92,8 +92,8 @@ public:
 
 class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
 {
-    ValueSet			maCtlFavorites;
     FixedLine			maFLFavorites;
+    ValueSet			maCtlFavorites;
     OKButton			maOKButton;
     CancelButton		maCancelButton;
     HelpButton			maHelpButton;
diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index 6f73ecd1a4..d7b3716546 100644..100755
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
@@ -50,14 +50,14 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~FormatPaintBrushToolBoxControl();
 
     virtual void	DoubleClick();
     virtual void    Click();
-    virtual void	Select( BOOL bMod1 = FALSE );
+    virtual void	Select( sal_Bool bMod1 = sal_False );
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 private:
     DECL_LINK( WaitDoubleClickHdl, void* );
diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx
index e35cdd19a4..e35cdd19a4 100644..100755
--- a/svx/inc/svx/framebordertype.hxx
+++ b/svx/inc/svx/framebordertype.hxx
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index 5e30028ce4..5e30028ce4 100644..100755
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx
index 2b0e7b0c82..2b0e7b0c82 100644..100755
--- a/svx/inc/svx/framelinkarray.hxx
+++ b/svx/inc/svx/framelinkarray.hxx
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx
index b9239ccfb5..b9239ccfb5 100644..100755
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/svx/inc/svx/frmdirlbox.hxx
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index 20a3fad699..07c6ccae97 100644..100755
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -130,7 +130,7 @@ public:
     /** Returns true, if all visible frame borders have equal widths.
         @descr  Ignores hidden and "don't care" frame borders. On success,
         returns the widths in the passed parameters. */
-    bool                GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec,
+    bool                GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec,
                                          SvxBorderStyle& rnStyle ) const;
     /** Returns true, if all visible frame borders have equal color.
         @descr  Ignores hidden and "don't care" frame borders. On success,
@@ -162,7 +162,7 @@ public:
     void                SelectAllVisibleBorders( bool bSelect = true );
 
     /** Sets the passed line widths to all selected frame borders (in twips). */
-    void                SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec,
+    void                SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec,
                                              SvxBorderStyle nStyle );
     /** Sets the passed color to all selected frame borders. */
     void                SetColorToSelection( const Color& rColor );
diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index a639fd7ac6..769fa119ba 100644..100755
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -48,7 +48,7 @@
 class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow
 {
 public:
-                        GalleryChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+                        GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
                         ~GalleryChildWindow();
                             
                         SFX_DECL_CHILDWINDOW( GalleryChildWindow );
@@ -89,7 +89,7 @@ private:
 
     void                    InitSettings();
 
-    virtual BOOL 			Close();
+    virtual sal_Bool 			Close();
     virtual void			Resize();
     virtual void			GetFocus();
 
@@ -108,10 +108,10 @@ public:
     INetURLObject			GetURL() const;
     String					GetFilterName() const;
     Graphic					GetGraphic() const;
-    BOOL					GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL					IsLinkage() const;
+    sal_Bool					GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool					IsLinkage() const;
 
-    BOOL                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+    sal_Bool                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
 
 #endif // _SVX_GALBRWS_HXX_
diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 9352bfbc53..de1049e379 100644..100755
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
@@ -66,7 +66,7 @@ private:
     Rectangle			aPreviewRect;
     GalleryTheme*       mpTheme;
                         
-    SVX_DLLPRIVATE BOOL				ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+    SVX_DLLPRIVATE sal_Bool				ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
     SVX_DLLPRIVATE void                InitSettings();
                         
     // Window
@@ -146,14 +146,14 @@ private:
 
     Link                maSelectHdl;
     GalleryTheme*		mpTheme;
-    ULONG               mnCurRow;
-    BOOL                mbInit;
+    sal_uIntPtr               mnCurRow;
+    sal_Bool                mbInit;
 
     void                InitSettings();
 
     // BrowseBox
-    virtual BOOL        SeekRow( long nRow );
-    virtual void        PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const;
+    virtual sal_Bool        SeekRow( long nRow );
+    virtual void        PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const;
     virtual void        DoubleClick( const BrowserMouseEvent& rEvt );
     virtual void        Select();
     virtual sal_Int8    AcceptDrop( const BrowserAcceptDropEvent& rEvt );
@@ -182,7 +182,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String	GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String	GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     // from IAccessibleTableProvider
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx
index 726db2396b..181780b6c0 100644..100755
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -225,57 +225,57 @@ public:
     INetURLObject				GetURL() const;
     String						GetFilterName() const;
     Graphic						GetGraphic() const;
-    BOOL						GetVCDrawModel( FmFormModel& rModel ) const;
-    BOOL						IsLinkage() const;
+    sal_Bool						GetVCDrawModel( FmFormModel& rModel ) const;
+    sal_Bool						IsLinkage() const;
 
     static bool					FillThemeList( std::vector<String>& rThemeList );
 
                                 // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
-    static BOOL					FillObjList( const String& rThemeName, List& rObjList );
-    static BOOL					FillObjList( ULONG nThemeId, List& rObjList );
+    static sal_Bool					FillObjList( const String& rThemeName, List& rObjList );
+    static sal_Bool					FillObjList( sal_uIntPtr nThemeId, List& rObjList );
 
                                 // FillObjTitleList is filling the rList with the title for each gallery object
     static sal_Bool				FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList );
 
-    static BOOL					InsertURL( const String& rThemeName, const String& rURL );
-    static BOOL					InsertURL( ULONG nThemeId, const String& rURL );
+    static sal_Bool					InsertURL( const String& rThemeName, const String& rURL );
+    static sal_Bool					InsertURL( sal_uIntPtr nThemeId, const String& rURL );
 
-    static BOOL					InsertURL( const String& rThemeName, const String& rURL,
-                                           const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
-    static BOOL					InsertURL( ULONG nThemeId, const String& rURL,
-                                           const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
+    static sal_Bool					InsertURL( const String& rThemeName, const String& rURL,
+                                           const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
+    static sal_Bool					InsertURL( sal_uIntPtr nThemeId, const String& rURL,
+                                           const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
 
-    static ULONG				GetObjCount( const String& rThemeName );
-    static ULONG				GetObjCount( ULONG nThemeId );
+    static sal_uIntPtr				GetObjCount( const String& rThemeName );
+    static sal_uIntPtr				GetObjCount( sal_uIntPtr nThemeId );
 
-    static BOOL					GetGraphicObj( const String& rThemeName, ULONG nPos,
+    static sal_Bool					GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
-                                               BOOL bProgess = FALSE );
-    static BOOL					GetGraphicObj( ULONG nThemeId, ULONG nPos,
+                                               sal_Bool bProgess = sal_False );
+    static sal_Bool					GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
-                                               BOOL bProgess = FALSE );
+                                               sal_Bool bProgess = sal_False );
 
-    static BOOL					InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
-    static BOOL					InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic );
+    static sal_Bool					InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
+    static sal_Bool					InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic );
 
-    static ULONG				GetSdrObjCount( const String& rThemeName );
-    static ULONG				GetSdrObjCount( ULONG nThemeId );
+    static sal_uIntPtr				GetSdrObjCount( const String& rThemeName );
+    static sal_uIntPtr				GetSdrObjCount( sal_uIntPtr nThemeId );
 
-    static BOOL					GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+    static sal_Bool					GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
-    static BOOL					GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+    static sal_Bool					GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
 
-    static BOOL					InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
-    static BOOL					InsertSdrObj( ULONG nThemeId, FmFormModel& rModel );
+    static sal_Bool					InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
+    static sal_Bool					InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel );
 
-    static BOOL					BeginLocking( const String& rThemeName );
-    static BOOL					BeginLocking( ULONG nThemeId );
+    static sal_Bool					BeginLocking( const String& rThemeName );
+    static sal_Bool					BeginLocking( sal_uIntPtr nThemeId );
 
-    static BOOL					EndLocking( const String& rThemeName );
-    static BOOL					EndLocking( ULONG nThemeId );
+    static sal_Bool					EndLocking( const String& rThemeName );
+    static sal_Bool					EndLocking( sal_uIntPtr nThemeId );
 
-    static BOOL					DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+    static sal_Bool					DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
 };
 
 #endif // _GALLERY_HXX_
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 58b6eafaca..ca708cf39c 100644..100755
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -51,12 +51,12 @@ private:
     INetURLObject			aThmURL;
     INetURLObject			aSdgURL;
     INetURLObject			aSdvURL;
-    UINT32					nFileNumber;
-    UINT32					nId;
-    BOOL					bReadOnly;
-    BOOL					bImported;
-    BOOL					bModified;
-    BOOL					bThemeNameFromResource;
+    sal_uInt32					nFileNumber;
+    sal_uInt32					nId;
+    sal_Bool					bReadOnly;
+    sal_Bool					bImported;
+    sal_Bool					bModified;
+    sal_Bool					bThemeNameFromResource;
 
                             GalleryThemeEntry();
     INetURLObject			ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
@@ -64,31 +64,31 @@ private:
 public:
 
                             GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
-                                               UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported,
-                                               BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource );
+                                               sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported,
+                                               sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource );
                             ~GalleryThemeEntry() {};
 
     const String&			GetThemeName() const { return aName; }
-    UINT32					GetFileNumber() const { return nFileNumber; }
+    sal_uInt32					GetFileNumber() const { return nFileNumber; }
 
     const INetURLObject&	GetThmURL() const { return aThmURL; }
     const INetURLObject&	GetSdgURL() const { return aSdgURL; }
     const INetURLObject&	GetSdvURL() const { return aSdvURL; }
 
-    BOOL					IsImported() const { return bImported; }
-    BOOL					IsReadOnly() const { return bReadOnly; }
-    BOOL					IsDefault() const;
+    sal_Bool					IsImported() const { return bImported; }
+    sal_Bool					IsReadOnly() const { return bReadOnly; }
+    sal_Bool					IsDefault() const;
 
-    BOOL					IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
+    sal_Bool					IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
 
-    BOOL					IsModified() const { return bModified; }
-    void					SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
+    sal_Bool					IsModified() const { return bModified; }
+    void					SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
 
     void					SetName( const String& rNewName );
-    BOOL					IsNameFromResource() const { return bThemeNameFromResource; }
+    sal_Bool					IsNameFromResource() const { return bThemeNameFromResource; }
 
-    UINT32					GetId() const { return nId; }
-    void					SetId( UINT32 nNewId, BOOL bResetThemeName );
+    sal_uInt32					GetId() const { return nId; }
+    void					SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
 };
 
 typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList;
@@ -136,8 +136,8 @@ private:
     INetURLObject				aRelURL;
     INetURLObject				aUserURL;
     rtl_TextEncoding			nReadTextEncoding;
-    ULONG						nLastFileNumber;
-    BOOL						bMultiPath;
+    sal_uIntPtr						nLastFileNumber;
+    sal_Bool						bMultiPath;
                                 
     void						ImplLoad( const String& rMultiPath );
     void						ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
@@ -145,7 +145,7 @@ private:
     void 						ImplWriteImportList();
     
     SVX_DLLPUBLIC GalleryThemeEntry*			ImplGetThemeEntry( const String& rThemeName );
-    GalleryThemeEntry* 			ImplGetThemeEntry( ULONG nThemeId );
+    GalleryThemeEntry* 			ImplGetThemeEntry( sal_uIntPtr nThemeId );
     GalleryImportThemeEntry*	ImplGetImportThemeEntry( const String& rImportName );
 
     GalleryTheme*				ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
@@ -163,13 +163,13 @@ public:
                                 { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; }
     const GalleryThemeEntry*	GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
-    SVX_DLLPUBLIC BOOL			HasTheme( const String& rThemeName );
-    String						GetThemeName( ULONG nThemeId ) const;
+    SVX_DLLPUBLIC sal_Bool			HasTheme( const String& rThemeName );
+    String						GetThemeName( sal_uIntPtr nThemeId ) const;
 
-    SVX_DLLPUBLIC BOOL			CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 );
-    BOOL						CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
-    BOOL						RenameTheme( const String& rOldName, const String& rNewName );
-    SVX_DLLPUBLIC BOOL						RemoveTheme( const String& rThemeName );
+    SVX_DLLPUBLIC sal_Bool			CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 );
+    sal_Bool						CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
+    sal_Bool						RenameTheme( const String& rOldName, const String& rNewName );
+    SVX_DLLPUBLIC sal_Bool						RemoveTheme( const String& rThemeName );
 
     SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener );
     SVX_DLLPUBLIC void			ReleaseTheme( GalleryTheme*	pTheme, SfxListener& rListener );
@@ -181,7 +181,7 @@ public:
     const INetURLObject&		GetUserURL() const { return aUserURL; }
     const INetURLObject&		GetRelativeURL() const { return aRelURL; }
     
-    BOOL						IsMultiPath() const { return bMultiPath; }
+    sal_Bool						IsMultiPath() const { return bMultiPath; }
 };
 
 #endif // _SVX_GALLERY1_HXX_
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index d1e7192396..a2781317d9 100644..100755
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -74,7 +74,7 @@ enum SgaObjKind
 // - Defines -
 // -----------
 
-#define IV_IMAPINFO			    (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000)
+#define IV_IMAPINFO			    (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000)
 #define	ID_IMAPINFO			    2
 
 #define USERDATA_HDL()		    (LINK(this,SgaUserDataFactory,MakeUserData))
@@ -105,16 +105,16 @@ class ImageMap;
 class Gallery;
 
 SVX_DLLPUBLIC ResMgr*			GetGalleryResMgr();
-USHORT			GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE );
-BOOL			GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
-BOOL			CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
-SVX_DLLPUBLIC String			GetReducedString( const INetURLObject& rURL, ULONG nMaxLen );
+sal_uInt16			GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False );
+sal_Bool			GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
+sal_Bool			CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
+SVX_DLLPUBLIC String			GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen );
 String			GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
 
-BOOL			FileExists( const INetURLObject& rURL );
-BOOL			CreateDir(  const INetURLObject& rURL );
-BOOL			CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
-BOOL			KillFile( const INetURLObject& rURL );
+sal_Bool			FileExists( const INetURLObject& rURL );
+sal_Bool			CreateDir(  const INetURLObject& rURL );
+sal_Bool			CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
+sal_Bool			KillFile( const INetURLObject& rURL );
 BitmapEx		GalleryResGetBitmapEx( sal_uInt32 nId );
 
 
@@ -174,7 +174,7 @@ class SVX_DLLPUBLIC GalleryProgress
                                     GalleryProgress( GraphicFilter* pFilter = NULL );
                                     ~GalleryProgress();
 
-    void							Update( ULONG nVal, ULONG nMaxVal );
+    void							Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal );
 };
 
 // -----------------------
@@ -202,7 +202,7 @@ private:
 
 protected:
 
-                                    GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy );
+                                    GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy );
                                     ~GalleryTransferable();
 
     void							InitData( bool bLazy );
@@ -239,25 +239,25 @@ class GalleryHint : public SfxHint
 {
 private:
 
-    ULONG			mnType;
+    sal_uIntPtr			mnType;
     String			maThemeName;
     String			maStringData;
-    ULONG			mnData1;
-    ULONG			mnData2;
+    sal_uIntPtr			mnData1;
+    sal_uIntPtr			mnData2;
 
 public:
 
-                    GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {}
 
-                    GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {}
 
-    ULONG			GetType() const { return mnType; }
+    sal_uIntPtr			GetType() const { return mnType; }
     const String&	GetThemeName() const { return maThemeName; }
     const String&	GetStringData() const { return maStringData; }
-    ULONG			GetData1() const { return mnData1; }
-    ULONG			GetData2() const { return mnData2; }
+    sal_uIntPtr			GetData1() const { return mnData1; }
+    sal_uIntPtr			GetData2() const { return mnData2; }
 };
 
     #endif
diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index 6b3310a70d..4eccac2d36 100644..100755
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
@@ -56,7 +56,7 @@ struct GalleryObject
     INetURLObject	aURL;
     sal_uInt32		nOffset;
     SgaObjKind		eObjKind;
-    BOOL			bDummy;
+    sal_Bool			bDummy;
 };
 
 typedef ::std::vector< GalleryObject* > GalleryObjectList;
@@ -73,7 +73,7 @@ class ListBox;
 struct GalDragParams
 {
     Region		aDragRegion;
-    ULONG		nDragObjPos;
+    sal_uIntPtr		nDragObjPos;
     String		aThemeName;
     String		aFileName;
     SgaObjKind	eObjKind;
@@ -106,11 +106,11 @@ private:
     SotStorageRef				aSvDrawStorageRef;
     Gallery*					pParent;
     GalleryThemeEntry*			pThm;
-    ULONG                       mnThemeLockCount;
-    ULONG						mnBroadcasterLockCount;
-    ULONG						nDragPos;
-    BOOL						bDragging;
-    BOOL						bAbortActualize;
+    sal_uIntPtr                       mnThemeLockCount;
+    sal_uIntPtr						mnBroadcasterLockCount;
+    sal_uIntPtr						nDragPos;
+    sal_Bool						bDragging;
+    sal_Bool						bAbortActualize;
 
     void						ImplCreateSvDrawStorage();
     SVX_DLLPUBLIC SgaObject*					ImplReadSgaObject( GalleryObject* pEntry );
@@ -129,9 +129,9 @@ private:
                                     return size_t(-1);
                                 }
     INetURLObject				ImplGetURL( const GalleryObject* pObject ) const;
-    INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
-    void						ImplSetModified( BOOL bModified );
-    void						ImplBroadcast( ULONG nUpdatePos );
+    INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
+    void						ImplSetModified( sal_Bool bModified );
+    void						ImplBroadcast( sal_uIntPtr nUpdatePos );
 
                                 GalleryTheme();
                                 GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry );
@@ -139,14 +139,14 @@ private:
 
 public:
 
-    static GalleryThemeEntry*	CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly );
+    static GalleryThemeEntry*	CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly );
 
     size_t                      GetObjectCount() const { return aObjectList.size(); }
 
     SVX_DLLPUBLIC SgaObject*    AcquireObject( size_t nPos );
     SVX_DLLPUBLIC void						ReleaseObject( SgaObject* pObj );
 
-    SVX_DLLPUBLIC BOOL						InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool						InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND );
     SVX_DLLPUBLIC BOOL          RemoveObject( size_t nPos );
     BOOL                        ChangeObjectPos( size_t nOldPos, size_t nNewPos );
 
@@ -162,69 +162,69 @@ public:
     SVX_DLLPUBLIC const INetURLObject&		GetSdgURL() const;
     const INetURLObject&		GetSdvURL() const;
 
-    SVX_DLLPUBLIC UINT32		GetId() const;
-    void						SetId( UINT32 nNewId, BOOL bResetThemeName );
+    SVX_DLLPUBLIC sal_uInt32		GetId() const;
+    void						SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
 
-    void						SetDragging( BOOL bSet ) { bDragging = bSet; }
-    BOOL						IsDragging() const { return bDragging; }
+    void						SetDragging( sal_Bool bSet ) { bDragging = bSet; }
+    sal_Bool						IsDragging() const { return bDragging; }
 
     void                        LockTheme() { ++mnThemeLockCount; }
-    BOOL                        UnlockTheme();
+    sal_Bool                        UnlockTheme();
 
     void						LockBroadcaster() { mnBroadcasterLockCount++; }
-    SVX_DLLPUBLIC void			UnlockBroadcaster( ULONG nUpdatePos = 0 );
-    BOOL						IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
+    SVX_DLLPUBLIC void			UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
+    sal_Bool						IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
     
-    void						SetDragPos( ULONG nPos ) { nDragPos = nPos; }
-    ULONG						GetDragPos() const { return nDragPos; }
+    void						SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
+    sal_uIntPtr						GetDragPos() const { return nDragPos; }
 
-    BOOL						IsThemeNameFromResource() const;
+    sal_Bool						IsThemeNameFromResource() const;
 
-    SVX_DLLPUBLIC BOOL			IsImported() const;
-    SVX_DLLPUBLIC BOOL			IsReadOnly() const;
-    SVX_DLLPUBLIC BOOL			IsDefault() const;
-    BOOL						IsModified() const;
+    SVX_DLLPUBLIC sal_Bool			IsImported() const;
+    SVX_DLLPUBLIC sal_Bool			IsReadOnly() const;
+    SVX_DLLPUBLIC sal_Bool			IsDefault() const;
+    sal_Bool						IsModified() const;
 
     SVX_DLLPUBLIC void						Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
-    void						AbortActualize() { bAbortActualize = TRUE; }
+    void						AbortActualize() { bAbortActualize = sal_True; }
 
     Gallery*					GetParent() const { return pParent; }
     SotStorageRef				GetSvDrawStorage() const { return aSvDrawStorageRef; }
 
 public:
 
-    SgaObjKind					GetObjectKind( ULONG nPos ) const
+    SgaObjKind					GetObjectKind( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->eObjKind;
                                 }
 
 
-    const INetURLObject&		GetObjectURL( ULONG nPos ) const
+    const INetURLObject&		GetObjectURL( sal_uIntPtr nPos ) const
                                 {
                                     DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
                                     return ImplGetGalleryObject( nPos )->aURL;
                                 }
 
-    BOOL						GetThumb( ULONG nPos, Bitmap& rBmp, BOOL bProgress = FALSE );
+    sal_Bool						GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False );
 
-    SVX_DLLPUBLIC BOOL						GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL						InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool						GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool						InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    SVX_DLLPUBLIC BOOL						GetModel( ULONG nPos, SdrModel& rModel, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL						InsertModel( const FmFormModel& rModel, ULONG nInsertPos = LIST_APPEND );
+    SVX_DLLPUBLIC sal_Bool						GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool						InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL						GetModelStream( ULONG nPos, SotStorageStreamRef& rModelStreamRef, BOOL bProgress = FALSE );
-    BOOL						InsertModelStream( const SotStorageStreamRef& rModelStream, ULONG nInsertPos = LIST_APPEND );
+    sal_Bool						GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False );
+    sal_Bool						InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL						GetURL( ULONG nPos, INetURLObject& rURL, BOOL bProgress = FALSE );
-    SVX_DLLPUBLIC BOOL						InsertURL( const INetURLObject& rURL, ULONG nInsertPos = LIST_APPEND );
-    BOOL                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos = LIST_APPEND );
+    sal_Bool						GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False );
+    SVX_DLLPUBLIC sal_Bool						InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = LIST_APPEND );
+    sal_Bool                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = LIST_APPEND );
 
-    BOOL						InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos );
+    sal_Bool						InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
 
-    void						CopyToClipboard( Window* pWindow, ULONG nPos );
-    void						StartDrag( Window* pWindow, ULONG nPos );
+    void						CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
+    void						StartDrag( Window* pWindow, sal_uIntPtr nPos );
 
 public:
 
diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx
index 4ec9f1ba2d..2dce3db186 100644..100755
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/svx/globl3d.hxx
@@ -35,20 +35,20 @@
 
 const double PrecisionLimit = 1.0e-14;
 
-const UINT32 E3dInventor = UINT32('E')*0x00000001+
-                           UINT32('3')*0x00000100+
-                           UINT32('D')*0x00010000+
-                           UINT32('1')*0x01000000;
-
-const UINT16 E3D_SCENE_ID		= 1;
-const UINT16 E3D_POLYSCENE_ID	= 2;
-const UINT16 E3D_OBJECT_ID		= 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
-const UINT16 E3D_CUBEOBJ_ID 	= 4;
-const UINT16 E3D_SPHEREOBJ_ID	= 5;
-const UINT16 E3D_EXTRUDEOBJ_ID	= 6;
-const UINT16 E3D_LATHEOBJ_ID	= 7;
-const UINT16 E3D_COMPOUNDOBJ_ID = 8;
-const UINT16 E3D_POLYGONOBJ_ID 	= 9;
+const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+
+                           sal_uInt32('3')*0x00000100+
+                           sal_uInt32('D')*0x00010000+
+                           sal_uInt32('1')*0x01000000;
+
+const sal_uInt16 E3D_SCENE_ID		= 1;
+const sal_uInt16 E3D_POLYSCENE_ID	= 2;
+const sal_uInt16 E3D_OBJECT_ID		= 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject
+const sal_uInt16 E3D_CUBEOBJ_ID 	= 4;
+const sal_uInt16 E3D_SPHEREOBJ_ID	= 5;
+const sal_uInt16 E3D_EXTRUDEOBJ_ID	= 6;
+const sal_uInt16 E3D_LATHEOBJ_ID	= 7;
+const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8;
+const sal_uInt16 E3D_POLYGONOBJ_ID 	= 9;
 
 #endif		// _E3D_GLOBL3D_HXX
 
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index f621e9ddd5..18023dd6a9 100644..100755
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            TbxImageItem( USHORT nWhich = 0, UINT16 nImage = 0 );
+                            TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = 0 ) const;
     virtual int 			operator==( const SfxPoolItem& ) const;
@@ -58,10 +58,10 @@ public:
 
                                 SFX_DECL_TOOLBOX_CONTROL();
                                 
-                                SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                                SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                                 ~SvxGrafFilterToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
 };
@@ -75,10 +75,10 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl
 public:
 
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                         ~SvxGrafToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
 };
 
@@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ------------------------------
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -----------------------------
@@ -112,7 +112,7 @@ class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ----------------------------------
@@ -123,7 +123,7 @@ class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxContro
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ---------------------------------
@@ -134,7 +134,7 @@ class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // ------------------------------
@@ -145,7 +145,7 @@ class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -------------------------------------
@@ -156,7 +156,7 @@ class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxCon
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 // -----------------------------
@@ -167,10 +167,10 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public
 {
 public:
                         SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+                        SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
                         ~SvxGrafModeToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
 };
 
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index 6a19b85bfc..3c9dea8586 100644..100755
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -60,10 +60,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
     GraphCtrlUserCall*	pUserCall;
     WinBits				nWinStyle;
     SdrObjKind			eObjKind;
-    USHORT				nPolyEdit;
-    BOOL				bEditMode;
-    BOOL				bSdrMode;
-    BOOL				bAnim;
+    sal_uInt16				nPolyEdit;
+    sal_Bool				bEditMode;
+    sal_Bool				bSdrMode;
+    sal_Bool				bAnim;
 
                         DECL_LINK( UpdateHdl, Timer* );
 
@@ -98,17 +98,17 @@ public:
     void				SetWinStyle( WinBits nWinBits );
     WinBits				GetWinStyle() const { return nWinStyle; }
 
-    void				SetGraphic( const Graphic& rGraphic, BOOL bNewModel = TRUE );
+    void				SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True );
     const Graphic&		GetGraphic() const { return aGraphic; }
     const Size&			GetGraphicSize() const { return aGraphSize; }
 
     const Point&		GetMousePos() const { return aMousePos; }
 
-    void				SetEditMode( const BOOL bEditMode );
-    BOOL				IsEditMode() const { return bEditMode; }
+    void				SetEditMode( const sal_Bool bEditMode );
+    sal_Bool				IsEditMode() const { return bEditMode; }
 
-    void				SetPolyEditMode( const USHORT nPolyEdit );
-    USHORT				GetPolyEditMode() const { return nPolyEdit; }
+    void				SetPolyEditMode( const sal_uInt16 nPolyEdit );
+    sal_uInt16				GetPolyEditMode() const { return nPolyEdit; }
 
     void				SetObjKind( const SdrObjKind eObjKind );
     SdrObjKind			GetObjKind() const { return eObjKind; }
@@ -116,7 +116,7 @@ public:
     SdrModel*			GetSdrModel() const { return pModel; }
     SdrView*			GetSdrView() const { return pView; }
     SdrObject*			GetSelectedSdrObject() const;
-    BOOL				IsChanged() const { return bSdrMode ? pModel->IsChanged() : FALSE; }
+    sal_Bool				IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; }
 
     void				SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; }
     const Link&			GetMousePosLink() const { return aMousePosLink; }
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index 8d42a26cda..e70c890d10 100644..100755
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -39,25 +39,25 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
 {
     sal_Int32	nLeft, nRight, nTop, nBottom;
 public:
-    SvxGrfCrop( USHORT  );
+    SvxGrfCrop( sal_uInt16  );
     SvxGrfCrop( sal_Int32 nLeft,	sal_Int32 nRight,
                 sal_Int32 nTop,		sal_Int32 nBottom,
-                USHORT  );
+                sal_uInt16  );
     virtual ~SvxGrfCrop();
 
     // "pure virtual methods" from SfxPoolItem
     virtual int            		operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*		Create(SvStream &, USHORT nVer) const;
-    virtual SvStream&			Store(SvStream &, USHORT nIVer) const;
+    virtual SfxPoolItem*		Create(SvStream &, sal_uInt16 nVer) const;
+    virtual SvStream&			Store(SvStream &, sal_uInt16 nIVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
                                     const IntlWrapper* pIntl = 0 ) const;
     virtual	bool QueryValue( com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 ) const;
+                             sal_uInt8 nMemberId = 0 ) const;
     virtual	bool PutValue( const com::sun::star::uno::Any& rVal,
-                           BYTE nMemberId = 0 );
+                           sal_uInt8 nMemberId = 0 );
 
     void SetLeft( sal_Int32 nVal )		{ nLeft = nVal; }
     void SetRight( sal_Int32 nVal )		{ nRight = nVal; }
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 599261c3ad..5a38f6abbf 100644..100755
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter
 {
 public:
 
-    static ULONG	ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+    static sal_uLong	ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
     static void		DisableGraphicFilterSlots( SfxItemSet& rSet );
 };
 
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 660e5dfae8..8187508501 100644..100755
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -285,7 +285,7 @@ private:
     sal_uInt16			m_nOptionMask;		// the mask of options to be enabled in setDataSource
                                         // (with respect to the data source capabilities)
                                         // defaults to (insert | update | delete)
-    USHORT              m_nLastColId;
+    sal_uInt16              m_nLastColId;
     long                m_nLastRowId;
 
     sal_Bool			m_bDesignMode : 1;		// default = sal_False
@@ -390,7 +390,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String	GetCellText(long _nRow, USHORT _nColId) const;
+    virtual String	GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     void RemoveRows(sal_Bool bNewCursor);
 
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index fb1087370d..45a4a4a4e5 100644..100755
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -49,22 +49,23 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage
 
 public:
 
-    virtual BOOL 	FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool 	FillItemSet( SfxItemSet& rOutSet );
     virtual void	Reset( const SfxItemSet& rSet );
 
     virtual 		~SvxHFPage();
 
-    void			DisableDeleteQueryBox() { bDisableQueryBox = TRUE; }
-    void			EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; }
+    void			DisableDeleteQueryBox() { bDisableQueryBox = sal_True; }
+    void			EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; }
     void            EnableDynamicSpacing();
 
 protected:
     virtual void	ActivatePage( const SfxItemSet& rSet );
     virtual int		DeactivatePage( SfxItemSet* pSet = 0 );
 
-    SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet,
-               USHORT nSetId );
+    SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet,
+               sal_uInt16 nSetId );
 
+    FixedLine       aFrm;
     CheckBox        aTurnOnBox;
     CheckBox        aCntSharedBox;
     FixedText       aLMLbl;
@@ -77,14 +78,13 @@ protected:
     FixedText		aHeightFT;
     MetricField     aHeightEdit;
     CheckBox     	aHeightDynBtn;
-    FixedLine       aFrm;
     SvxPageWindow	aBspWin;
     PushButton		aBackgroundBtn;
 
-    USHORT			nId;
+    sal_uInt16			nId;
     SfxItemSet*		pBBSet;
-    BOOL			bDisableQueryBox;
-    BOOL			bEnableBackgroundSelector;
+    sal_Bool			bDisableQueryBox;
+    sal_Bool			bEnableBackgroundSelector;
     bool            bInReset;
 
     void 			InitHandler();
@@ -109,7 +109,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
 {
 public:
     static SfxTabPage* 	Create(	Window* pParent, const SfxItemSet& rSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     SvxHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -121,7 +121,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 {
 public:
     static SfxTabPage* 	Create(	Window* pParent, const SfxItemSet& rSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     SVX_DLLPRIVATE SvxFooterPage( 	Window* pParent, const SfxItemSet& rSet );
diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx
index 630f6cd4f8..630f6cd4f8 100644..100755
--- a/svx/inc/svx/helperhittest3d.hxx
+++ b/svx/inc/svx/helperhittest3d.hxx
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index 13b6b1d8d7..5e3933a22c 100644..100755
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
@@ -56,18 +56,18 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
     String sIntName;
     SvxMacroTableDtor*	pMacroTable;
 
-    USHORT nMacroEvents;
+    sal_uInt16 nMacroEvents;
 
 public:
     TYPEINFO();
 
-    SvxHyperlinkItem( USHORT _nWhich = SID_HYPERLINK_GETLINK ):
+    SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
                 SfxPoolItem(_nWhich), pMacroTable(NULL)	{ eType = HLINK_DEFAULT; nMacroEvents=0; };
     SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem );
-    SvxHyperlinkItem( USHORT nWhich, String& rName, String& rURL,
+    SvxHyperlinkItem( sal_uInt16 nWhich, String& rName, String& rURL,
                                     String& rTarget, String& rIntName,
                                     SvxLinkInsertMode eTyp = HLINK_FIELD,
-                                    USHORT nEvents = 0,
+                                    sal_uInt16 nEvents = 0,
                                     SvxMacroTableDtor *pMacroTbl =NULL );
     virtual	~SvxHyperlinkItem () { delete pMacroTable; }
 
@@ -75,8 +75,8 @@ public:
 
     virtual int 			 operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const	String& GetName() const { return sName; }
     void	SetName(const String& rName) { sName = rName; }
@@ -93,16 +93,16 @@ public:
     SvxLinkInsertMode GetInsertMode() const { return eType; }
     void	SetInsertMode( SvxLinkInsertMode eNew ) { eType = eNew; }
 
-    void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
+    void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
 
     void SetMacroTable( const SvxMacroTableDtor& rTbl );
     const SvxMacroTableDtor* GetMacroTbl() const	{ return pMacroTable; }
 
-    void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; }
-    USHORT GetMacroEvents() const { return nMacroEvents; }
+    void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
+    sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
 
-    virtual SvStream&			Store( SvStream &, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*		Create( SvStream &, USHORT nVer ) const;
+    virtual SvStream&			Store( SvStream &, sal_uInt16 nItemVersion ) const;
+    virtual SfxPoolItem*		Create( SvStream &, sal_uInt16 nVer ) const;
 
 };
 
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx
index d7c4d9588f..d7c4d9588f 100644..100755
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/svx/htmlmode.hxx
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc286e2389..344177966c 100644..100755
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
@@ -48,7 +48,7 @@ private:
     AbstractSvxHpLinkDlg*   mpDlg;
 
 public:
-    SvxHlinkDlgWrapper( Window*pParent, USHORT nId,
+    SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
                         SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
     SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper);
diff --git a/uui/source/passcrtdlg.hrc b/svx/inc/svx/hyprlink.hxx
index 8e3740abf0..dd7836f2ed 100644..100755
--- a/uui/source/passcrtdlg.hrc
+++ b/svx/inc/svx/hyprlink.hxx
@@ -24,20 +24,20 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _SVX_DLG_HYPERLINK_HXX
+#define _SVX_DLG_HYPERLINK_HXX
 
-#ifndef UUI_PASSCRTDLG_HRC
-#define UUI_PASSCRTDLG_HRC
+#include <sfx2/childwin.hxx>
+#include "svx/svxdllapi.h"
+
+// class SvxHyperlinkDialogWrapper ---------------------------------------
+class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
+{
+public:
+    SvxHyperlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
+                            SfxBindings* pBindings, SfxChildWinInfo* pInfo );
+    SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
+};
+#endif // _SVX_DLG_HYPERLINK_HXX
 
-// local identifiers
-#define BTN_PASSCRT_CANCEL 1
-#define ED_PASSWORD_CRT     2
-#define FT_PASSWORD_REPEAT          3
-#define FT_PASSWORD_WARNING          4
-#define ED_PASSWORD_REPEAT     5
-#define FL_FIXED_LINE_1     6
-#define BTN_PASSCRT_OK 7
-#define BTN_PASSCRT_HELP 8
-#define FT_PASSWORD_CRT          9
-#define FT_MSPASSWORD_WARNING 10
 
-#endif // UUI_PASSCRTDLG_HRC
diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx
index 58001a9b9b..58001a9b9b 100644..100755
--- a/svx/inc/svx/ifaceids.hxx
+++ b/svx/inc/svx/ifaceids.hxx
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index 05e30ee342..603ab0c588 100644..100755
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxIMapDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow );
 
@@ -93,13 +93,13 @@ class SvxIMapDlgItem : public SfxControllerItem
 
 protected:
 
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 
 
 public:
 
-    SvxIMapDlgItem( USHORT nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
+    SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
 };
 
 
@@ -135,7 +135,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
     SvxIMapDlgItem		aIMapItem;
 
     virtual	void		Resize();
-    virtual BOOL 		Close();
+    virtual sal_Bool 		Close();
 
 #ifdef _IMAPDLG_PRIVATE
 
@@ -151,7 +151,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
                         DECL_LINK( MiscHdl, void* );
 
     void				DoOpen();
-    BOOL				DoSave();
+    sal_Bool				DoSave();
 
 #endif
 
@@ -162,7 +162,7 @@ public:
                                     Window* pParent, const ResId& rResId );
                         ~SvxIMapDlg();
 
-    void				SetExecState( BOOL bEnable );
+    void				SetExecState( sal_Bool bEnable );
 
     void				SetGraphic( const Graphic& rGraphic );
 
diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index 139b0197e2..8c4748f0fc 100644..100755
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -38,20 +38,20 @@
 class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl
 {
 public:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void	Click();
     virtual void    Paint( const UserDrawEvent& rEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxInsertStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxInsertStatusBarControl();
 
-    static	ULONG	GetDefItemWidth(const StatusBar& rStb);
+    static	sal_uIntPtr	GetDefItemWidth(const StatusBar& rStb);
 
 private:
-    BOOL	bInsert;
+    sal_Bool	bInsert;
 
 #ifdef _SVX_INSCTRL_CXX
     SVX_DLLPRIVATE void	DrawItemText_Impl();
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index a35f29c44d..1a7f0dbd76 100644..100755
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -55,20 +55,20 @@ class IPolyPolygonEditorController
 {
 public:
     virtual void DeleteMarkedPoints() = 0;
-    virtual BOOL IsDeleteMarkedPointsPossible() const = 0;
+    virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0;
 
     virtual	void RipUpAtMarkedPoints() = 0;
     virtual bool IsRipUpAtMarkedPointsPossible() const = 0;
 
-    virtual BOOL IsSetMarkedSegmentsKindPossible() const = 0;
+    virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0;
     virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0;
     virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0;
 
-    virtual BOOL IsSetMarkedPointsSmoothPossible() const = 0;
+    virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0;
     virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0;
     virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0;
         
-    virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ) = 0;
+    virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0;
     virtual bool IsOpenCloseMarkedObjectsPossible() const = 0;
     virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0;
 };
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index e731deb650..1d892f3741 100644..100755
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -43,10 +43,10 @@ class SfxObjectShell;
 
 class SvxLineBox : public LineLB
 {
-    USHORT			nCurPos;
+    sal_uInt16			nCurPos;
     Timer			aDelayTimer;
     Size            aLogicalSize;
-    BOOL            bRelease;
+    sal_Bool            bRelease;
     SfxObjectShell* mpSh;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -77,11 +77,11 @@ class SvxColorBox : public ColorLB
 {
     using Window::Update;
 
-    USHORT			nCurPos;
-    USHORT			nId;
+    sal_uInt16			nCurPos;
+    sal_uInt16			nId;
     Timer			aDelayTimer;
     Size            aLogicalSize;
-    BOOL            bRelease;
+    sal_Bool            bRelease;
     ::rtl::OUString maCommand;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -152,17 +152,17 @@ public:
     SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
     ~SvxFillTypeBox();
 
-    void			Selected() { bSelect = TRUE; }
-    BOOL            IsRelease() { return bRelease;}
+    void			Selected() { bSelect = sal_True; }
+    sal_Bool            IsRelease() { return bRelease;}
 
 protected:
     virtual long	PreNotify( NotifyEvent& rNEvt );
     virtual long	Notify( NotifyEvent& rNEvt );
 
 private:
-    USHORT			nCurPos;
-    BOOL			bSelect;
-    BOOL            bRelease;
+    sal_uInt16			nCurPos;
+    sal_Bool			bSelect;
+    sal_Bool            bRelease;
 
 #ifdef _SVX_ITEMWIN_CXX
     void			ReleaseFocus_Impl();
@@ -177,7 +177,7 @@ public:
     SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
     ~SvxFillAttrBox();
 
-    BOOL            IsRelease() { return bRelease;}
+    sal_Bool            IsRelease() { return bRelease;}
 
 protected:
     virtual long	PreNotify( NotifyEvent& rNEvt );
@@ -185,8 +185,8 @@ protected:
     virtual void	Select();
 
 private:
-    USHORT			nCurPos;
-    BOOL            bRelease;
+    sal_uInt16			nCurPos;
+    sal_Bool            bRelease;
 
 #ifdef _SVX_ITEMWIN_CXX
     void			ReleaseFocus_Impl();
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index a57524e170..05855cdaa6 100644..100755
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -59,7 +59,7 @@ class SvtLanguageTable;
 
 
 // load language strings from resource
-SVX_DLLPUBLIC String 	GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg );
+SVX_DLLPUBLIC String 	GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg );
 
 class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
 {
@@ -69,34 +69,34 @@ private:
     Image					m_aNotCheckedImage;
     Image					m_aCheckedImage;
     String					m_aAllString;
-    com::sun::star::uno::Sequence< INT16 >  *m_pSpellUsedLang;
+    com::sun::star::uno::Sequence< sal_Int16 >  *m_pSpellUsedLang;
     SvtLanguageTable*       m_pLangTable;
-    INT16					m_nLangList;
-    BOOL                    m_bHasLangNone;
-    BOOL					m_bLangNoneIsLangAll;
-    BOOL					m_bWithCheckmark;
+    sal_Int16					m_nLangList;
+    sal_Bool                    m_bHasLangNone;
+    sal_Bool					m_bLangNoneIsLangAll;
+    sal_Bool					m_bWithCheckmark;
 
     SVX_DLLPRIVATE void                    Init();
-    SVX_DLLPRIVATE USHORT                  ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
-    SVX_DLLPRIVATE USHORT                  ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
+    SVX_DLLPRIVATE sal_uInt16                  ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked );
+    SVX_DLLPRIVATE sal_uInt16                  ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 );
 
 public:
-    SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
-    SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck = FALSE);
+    SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False);
+    SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False);
     ~SvxLanguageBox();
 
-    void			SetLanguageList( INT16 nLangList,
-                            BOOL bHasLangNone, BOOL bLangNoneIsLangAll = FALSE,
-                            BOOL bCheckSpellAvail = FALSE );
+    void			SetLanguageList( sal_Int16 nLangList,
+                            sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False,
+                            sal_Bool bCheckSpellAvail = sal_False );
 
-    USHORT			InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
-    USHORT			InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
-    USHORT          InsertLanguage( const LanguageType eLangType,
-                            BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
+    sal_uInt16			InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16			InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND );
+    sal_uInt16          InsertLanguage( const LanguageType eLangType,
+                            sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND );
     void			RemoveLanguage( const LanguageType eLangType );
-    void			SelectLanguage( const LanguageType eLangType, BOOL bSelect = TRUE );
+    void			SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True );
     LanguageType	GetSelectLanguage() const;
-    BOOL			IsLanguageSelected( const LanguageType eLangType ) const;
+    sal_Bool			IsLanguageSelected( const LanguageType eLangType ) const;
 };
 
 #if ENABLE_LAYOUT
@@ -106,7 +106,7 @@ class SvxLanguageBoxImpl;
 class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
 {
 public:
-    SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE );
+    SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False );
     ~SvxLanguageBox ();
     void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
 
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index 2657881dd9..5e5e86ab30 100644..100755
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -99,12 +99,12 @@ private:
     sal_Bool GetCloseBack() const 
         { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     void    ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs);
 
     virtual void operator=(const SdrObject&);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual void TakeObjNameSingul(String& rName) const;
@@ -115,7 +115,7 @@ private:
     const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; }
 
     // break up
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 37beb62cb3..cadf1418aa 100644..100755
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
@@ -45,13 +45,13 @@ public:
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow* 	CreatePopupWindow();
     virtual SfxPopupWindow* 	CreatePopupWindowCascading();
-    virtual void				StateChanged( USHORT nSID,
+    virtual void				StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxTableToolBoxControl();
 };
 
@@ -67,10 +67,10 @@ public:
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxColumnsToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID,
+    virtual void				StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 8483146ab4..e5f01b6da3 100644..100755
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -45,7 +45,7 @@ protected:
     String                  aActionStr;
     SvxPopupWindowListBox *	pPopupWin;
 
-    void    Impl_SetInfo( USHORT nCount );
+    void    Impl_SetInfo( sal_uInt16 nCount );
 
     DECL_LINK( PopupModeEndHdl, void * );
     DECL_LINK( SelectHdl, void * );
@@ -53,12 +53,12 @@ protected:
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxListBoxControl();
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow* 	CreatePopupWindow();
-    virtual void				StateChanged( USHORT nSID,
+    virtual void				StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
@@ -73,10 +73,10 @@ class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual ~SvxUndoRedoControl();
-    virtual void StateChanged( USHORT nSID,
+    virtual void StateChanged( sal_uInt16 nSID,
                                SfxItemState eState,
                                const SfxPoolItem* pState );
 
diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 3045a55141..63433bbf51 100644..100755
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
@@ -51,15 +51,15 @@ private:
     XLineStyleItem*		pStyleItem;
     XLineDashItem* 		pDashItem;
 
-    BOOL				bUpdate;
+    sal_Bool				bUpdate;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineStyleToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void 		        Update( const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
@@ -74,10 +74,10 @@ class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineWidthToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineWidthToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
 };
@@ -91,10 +91,10 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxLineColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineColorToolBoxControl();
 
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pState );
     void 		        Update( const SfxPoolItem* pState );
     virtual Window*		CreateItemWindow( Window *pParent );
@@ -110,11 +110,11 @@ class SvxLineEndWindow : public SfxPopupWindow
 private:
     XLineEndList*	pLineEndList;
     ValueSet		aLineEndSet;
-    USHORT			nCols;
-    USHORT			nLines;
-    ULONG 			nLineEndWidth;
+    sal_uInt16			nCols;
+    sal_uInt16			nLines;
+    sal_uIntPtr 			nLineEndWidth;
     Size			aBmpSize;
-    BOOL			bPopupMode;
+    sal_Bool			bPopupMode;
     bool			mbInResize;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
 
@@ -127,7 +127,7 @@ private:
 protected:
     virtual void	Resizing( Size& rSize );
     virtual void    Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     virtual void	PopupModeEnd();
 
     /** This function is called when the window gets the focus.  It grabs
@@ -137,10 +137,10 @@ protected:
     virtual void GetFocus (void);
 
 public:
-    SvxLineEndWindow( USHORT nId, 
+    SvxLineEndWindow( sal_uInt16 nId, 
                       const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, 
                       const String& rWndTitle );
-    SvxLineEndWindow( USHORT nId, 
+    SvxLineEndWindow( sal_uInt16 nId, 
                       const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, 
                       Window* pParentWindow,
                       const String& rWndTitle );
@@ -148,7 +148,7 @@ public:
 
     void            StartSelection();
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual SfxPopupWindow* Clone() const;
 };
@@ -161,10 +161,10 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxLineEndToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx
index 79efb8e1d6..79efb8e1d6 100644..100755
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/svx/measctrl.hxx
diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd4133083c..b97d1066ba 100644..100755
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
@@ -40,16 +40,16 @@
 class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
 {
 public:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rUsrEvt );
     virtual void    DoubleClick();
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxModifyControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static	ULONG	GetDefItemWidth(const StatusBar& rStb);
+    static	sal_uIntPtr	GetDefItemWidth(const StatusBar& rStb);
 
 private:
     struct ImplData;
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index dfc33044ad..81d5b3b2e2 100644..100755
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -272,15 +272,15 @@ enum DFF_TextHeader {
 // Transform
 #define DFF_Prop_Rotation                      4  //  Fixed Point 16.16 degrees
 // Protection
-#define DFF_Prop_LockRotation                119  //  BOOL              No rotation
-#define DFF_Prop_LockAspectRatio             120  //  BOOL              Don't allow changes in aspect ratio
-#define DFF_Prop_LockPosition                121  //  BOOL              Don't allow the shape to be moved
-#define DFF_Prop_LockAgainstSelect           122  //  BOOL              Shape may not be selected
-#define DFF_Prop_LockCropping                123  //  BOOL              No cropping this shape
-#define DFF_Prop_LockVertices                124  //  BOOL              Edit Points not allowed
-#define DFF_Prop_LockText                    125  //  BOOL              Do not edit text
-#define DFF_Prop_LockAdjustHandles           126  //  BOOL              Do not adjust
-#define DFF_Prop_LockAgainstGrouping         127  //  BOOL              Do not group this shape
+#define DFF_Prop_LockRotation                119  //  sal_Bool              No rotation
+#define DFF_Prop_LockAspectRatio             120  //  sal_Bool              Don't allow changes in aspect ratio
+#define DFF_Prop_LockPosition                121  //  sal_Bool              Don't allow the shape to be moved
+#define DFF_Prop_LockAgainstSelect           122  //  sal_Bool              Shape may not be selected
+#define DFF_Prop_LockCropping                123  //  sal_Bool              No cropping this shape
+#define DFF_Prop_LockVertices                124  //  sal_Bool              Edit Points not allowed
+#define DFF_Prop_LockText                    125  //  sal_Bool              Do not edit text
+#define DFF_Prop_LockAdjustHandles           126  //  sal_Bool              Do not adjust
+#define DFF_Prop_LockAgainstGrouping         127  //  sal_Bool              Do not group this shape
 // Text
 #define DFF_Prop_lTxid                       128  //  LONG              id for the text, value determined by the host
 #define DFF_Prop_dxTextLeft                  129  //  LONG              margins relative to shape's inscribed text rectangle (in EMUs)
@@ -294,11 +294,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_cdirFont                    137  //  MSO_CDIR           Font rotation
 #define DFF_Prop_hspNext                     138  //  MSO_HSP            ID of the next shape (used by Word for linked textboxes)
 #define DFF_Prop_txdir                       139  //  MSO_TXDIR          Bi-Di Text direction
-#define DFF_Prop_SelectText                  187  //  BOOL              TRUE if single click selects text, FALSE if two clicks
-#define DFF_Prop_AutoTextMargin              188  //  BOOL              use host's margin calculations
-#define DFF_Prop_RotateText                  189  //  BOOL              Rotate text with shape
-#define DFF_Prop_FitShapeToText              190  //  BOOL              Size shape to fit text size
-#define DFF_Prop_FitTextToShape              191  //  BOOL              Size text to fit shape size
+#define DFF_Prop_SelectText                  187  //  sal_Bool              sal_True if single click selects text, sal_False if two clicks
+#define DFF_Prop_AutoTextMargin              188  //  sal_Bool              use host's margin calculations
+#define DFF_Prop_RotateText                  189  //  sal_Bool              Rotate text with shape
+#define DFF_Prop_FitShapeToText              190  //  sal_Bool              Size shape to fit text size
+#define DFF_Prop_FitTextToShape              191  //  sal_Bool              Size text to fit shape size
 // GeoText
 #define DFF_Prop_gtextUNICODE                192  //  WCHAR*            UNICODE text string
 #define DFF_Prop_gtextRTF                    193  //  char*             RTF text string
@@ -306,22 +306,22 @@ enum DFF_TextHeader {
 #define DFF_Prop_gtextSize                   195  //  LONG              default point size
 #define DFF_Prop_gtextSpacing                196  //  LONG              fixed point 16.16
 #define DFF_Prop_gtextFont                   197  //  WCHAR*            font family name
-#define DFF_Prop_gtextFReverseRows           240  //  BOOL  8000        Reverse row order
-#define DFF_Prop_fGtext                      241  //  BOOL  4000        Has text effect
-#define DFF_Prop_gtextFVertical              242  //  BOOL  2000        Rotate characters
-#define DFF_Prop_gtextFKern                  243  //  BOOL  1000        Kern characters
-#define DFF_Prop_gtextFTight                 244  //  BOOL   800        Tightening or tracking
-#define DFF_Prop_gtextFStretch               245  //  BOOL   400        Stretch to fit shape
-#define DFF_Prop_gtextFShrinkFit             246  //  BOOL   200        Char bounding box
-#define DFF_Prop_gtextFBestFit               247  //  BOOL   100        Scale text-on-path
-#define DFF_Prop_gtextFNormalize             248  //  BOOL    80        Stretch char height
-#define DFF_Prop_gtextFDxMeasure             249  //  BOOL    40        Do not measure along path
-#define DFF_Prop_gtextFBold                  250  //  BOOL    20        Bold font
-#define DFF_Prop_gtextFItalic                251  //  BOOL    10        Italic font
-#define DFF_Prop_gtextFUnderline             252  //  BOOL     8        Underline font
-#define DFF_Prop_gtextFShadow                253  //  BOOL     4        Shadow font
-#define DFF_Prop_gtextFSmallcaps             254  //  BOOL     2        Small caps font
-#define DFF_Prop_gtextFStrikethrough         255  //  BOOL     1        Strike through font
+#define DFF_Prop_gtextFReverseRows           240  //  sal_Bool  8000        Reverse row order
+#define DFF_Prop_fGtext                      241  //  sal_Bool  4000        Has text effect
+#define DFF_Prop_gtextFVertical              242  //  sal_Bool  2000        Rotate characters
+#define DFF_Prop_gtextFKern                  243  //  sal_Bool  1000        Kern characters
+#define DFF_Prop_gtextFTight                 244  //  sal_Bool   800        Tightening or tracking
+#define DFF_Prop_gtextFStretch               245  //  sal_Bool   400        Stretch to fit shape
+#define DFF_Prop_gtextFShrinkFit             246  //  sal_Bool   200        Char bounding box
+#define DFF_Prop_gtextFBestFit               247  //  sal_Bool   100        Scale text-on-path
+#define DFF_Prop_gtextFNormalize             248  //  sal_Bool    80        Stretch char height
+#define DFF_Prop_gtextFDxMeasure             249  //  sal_Bool    40        Do not measure along path
+#define DFF_Prop_gtextFBold                  250  //  sal_Bool    20        Bold font
+#define DFF_Prop_gtextFItalic                251  //  sal_Bool    10        Italic font
+#define DFF_Prop_gtextFUnderline             252  //  sal_Bool     8        Underline font
+#define DFF_Prop_gtextFShadow                253  //  sal_Bool     4        Shadow font
+#define DFF_Prop_gtextFSmallcaps             254  //  sal_Bool     2        Small caps font
+#define DFF_Prop_gtextFStrikethrough         255  //  sal_Bool     1        Strike through font
 // Blip
 #define DFF_Prop_cropFromTop                 256  //  LONG              16.16 fraction times total image width or height, as appropriate.
 #define DFF_Prop_cropFromBottom              257  //  LONG
@@ -341,10 +341,10 @@ enum DFF_TextHeader {
 #define DFF_Prop_pibPrint                    271  //  IMsoBlip*         Blip to display when printing
 #define DFF_Prop_pibPrintName                272  //  WCHAR*            Blip file name
 #define DFF_Prop_pibPrintFlags               273  //  MSO_BLIPFLAGS      Blip flags
-#define DFF_Prop_fNoHitTestPicture           316  //  BOOL              Do not hit test the picture
-#define DFF_Prop_pictureGray                 317  //  BOOL              grayscale display
-#define DFF_Prop_pictureBiLevel              318  //  BOOL              bi-level display
-#define DFF_Prop_pictureActive               319  //  BOOL              Server is active (OLE objects only)
+#define DFF_Prop_fNoHitTestPicture           316  //  sal_Bool              Do not hit test the picture
+#define DFF_Prop_pictureGray                 317  //  sal_Bool              grayscale display
+#define DFF_Prop_pictureBiLevel              318  //  sal_Bool              bi-level display
+#define DFF_Prop_pictureActive               319  //  sal_Bool              Server is active (OLE objects only)
 // Geometry
 #define DFF_Prop_geoLeft                     320  //  LONG              Defines the G (geometry) coordinate space.
 #define DFF_Prop_geoTop                      321  //  LONG
@@ -370,12 +370,12 @@ enum DFF_TextHeader {
 #define DFF_Prop_pFormulas					 342  //  LONG
 #define DFF_Prop_textRectangles			     343  //  LONG
 #define DFF_Prop_connectorType				 344  //  LONG				->0=none, 1=segments, 2=custom, 3=rect
-#define DFF_Prop_fShadowOK                   378  //  BOOL              Shadow may be set
-#define DFF_Prop_f3DOK                       379  //  BOOL              3D may be set
-#define DFF_Prop_fLineOK                     380  //  BOOL              Line style may be set
-#define DFF_Prop_fGtextOK                    381  //  BOOL              Text effect (FontWork) supported
+#define DFF_Prop_fShadowOK                   378  //  sal_Bool              Shadow may be set
+#define DFF_Prop_f3DOK                       379  //  sal_Bool              3D may be set
+#define DFF_Prop_fLineOK                     380  //  sal_Bool              Line style may be set
+#define DFF_Prop_fGtextOK                    381  //  sal_Bool              Text effect (FontWork) supported
 #define DFF_Prop_fFillShadeShapeOK           382  //  BOOL
-#define DFF_Prop_fFillOK                     383  //  BOOL              OK to fill the shape through the UI or VBA?
+#define DFF_Prop_fFillOK                     383  //  sal_Bool              OK to fill the shape through the UI or VBA?
 // FillStyle
 #define DFF_Prop_fillType                    384  //  MSO_FILLTYPE       Type of fill
 #define DFF_Prop_fillColor                   385  //  MSO_CLR            Foreground color
@@ -406,11 +406,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_fillShapeOriginX            410  //  LONG
 #define DFF_Prop_fillShapeOriginY            411  //  LONG
 #define DFF_Prop_fillShadeType               412  //  MSO_SHADETYPE      Type of shading, if a shaded (gradient) fill.
-#define DFF_Prop_fFilled                     443  //  BOOL              Is shape filled?
-#define DFF_Prop_fHitTestFill                444  //  BOOL              Should we hit test fill?
-#define DFF_Prop_fillShape                   445  //  BOOL              Register pattern on shape
-#define DFF_Prop_fillUseRect                 446  //  BOOL              Use the large rect?
-#define DFF_Prop_fNoFillHitTest              447  //  BOOL              Hit test a shape as though filled
+#define DFF_Prop_fFilled                     443  //  sal_Bool              Is shape filled?
+#define DFF_Prop_fHitTestFill                444  //  sal_Bool              Should we hit test fill?
+#define DFF_Prop_fillShape                   445  //  sal_Bool              Register pattern on shape
+#define DFF_Prop_fillUseRect                 446  //  sal_Bool              Use the large rect?
+#define DFF_Prop_fNoFillHitTest              447  //  sal_Bool              Hit test a shape as though filled
 // LineStyle
 #define DFF_Prop_lineColor                   448  //  MSO_CLR            Color of line
 #define DFF_Prop_lineOpacity                 449  //  LONG              Not implemented
@@ -436,11 +436,11 @@ enum DFF_TextHeader {
 #define DFF_Prop_lineEndArrowLength          469  //  MSO_LINEENDLENGTH  Arrow at end
 #define DFF_Prop_lineJoinStyle               470  //  MSO_LINEJOIN       How to join lines
 #define DFF_Prop_lineEndCapStyle             471  //  MSO_LINECAP        How to end lines
-#define DFF_Prop_fArrowheadsOK               507  //  BOOL              Allow arrowheads if prop. is set
-#define DFF_Prop_fLine                       508  //  BOOL              Any line?
-#define DFF_Prop_fHitTestLine                509  //  BOOL              Should we hit test lines?
-#define DFF_Prop_lineFillShape               510  //  BOOL              Register pattern on shape
-#define DFF_Prop_fNoLineDrawDash             511  //  BOOL              Draw a dashed line if no line
+#define DFF_Prop_fArrowheadsOK               507  //  sal_Bool              Allow arrowheads if prop. is set
+#define DFF_Prop_fLine                       508  //  sal_Bool              Any line?
+#define DFF_Prop_fHitTestLine                509  //  sal_Bool              Should we hit test lines?
+#define DFF_Prop_lineFillShape               510  //  sal_Bool              Register pattern on shape
+#define DFF_Prop_fNoLineDrawDash             511  //  sal_Bool              Draw a dashed line if no line
 // ShadowStyle
 #define DFF_Prop_shadowType                  512  //  MSO_SHADOWTYPE     Type of effect
 #define DFF_Prop_shadowColor                 513  //  MSO_CLR            Foreground color
@@ -460,8 +460,8 @@ enum DFF_TextHeader {
 #define DFF_Prop_shadowWeight                527  //  LONG              scaling factor
 #define DFF_Prop_shadowOriginX               528  //  LONG
 #define DFF_Prop_shadowOriginY               529  //  LONG
-#define DFF_Prop_fShadow                     574  //  BOOL              Any shadow?
-#define DFF_Prop_fshadowObscured             575  //  BOOL              Excel5-style shadow
+#define DFF_Prop_fShadow                     574  //  sal_Bool              Any shadow?
+#define DFF_Prop_fshadowObscured             575  //  sal_Bool              Excel5-style shadow
 // PerspectiveStyle
 #define DFF_Prop_perspectiveType             576  //  MSO_XFORMTYPE      Where transform applies
 #define DFF_Prop_perspectiveOffsetX          577  //  LONG              The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter.
@@ -475,7 +475,7 @@ enum DFF_TextHeader {
 #define DFF_Prop_perspectiveWeight           585  //  LONG              Scaling factor
 #define DFF_Prop_perspectiveOriginX          586  //  LONG
 #define DFF_Prop_perspectiveOriginY          587  //  LONG
-#define DFF_Prop_fPerspective                639  //  BOOL              On/off
+#define DFF_Prop_fPerspective                639  //  sal_Bool              On/off
 // 3D Object
 #define DFF_Prop_c3DSpecularAmt              640  //  LONG         Fixed-point 16.16
 #define DFF_Prop_c3DDiffuseAmt               641  //  LONG         Fixed-point 16.16
@@ -486,8 +486,8 @@ enum DFF_TextHeader {
 #define DFF_Prop_c3DExtrudePlane             646  //  LONG         Extrusion direction
 #define DFF_Prop_c3DExtrusionColor           647  //  MSO_CLR       Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
 #define DFF_Prop_c3DCrMod                    648  //  MSO_CLR       Modification for BW views
-#define DFF_Prop_f3D                         700  //  BOOL         Does this shape have a 3D effect?
-#define DFF_Prop_fc3DMetallic                701  //  BOOL         Use metallic specularity?
+#define DFF_Prop_f3D                         700  //  sal_Bool         Does this shape have a 3D effect?
+#define DFF_Prop_fc3DMetallic                701  //  sal_Bool         Use metallic specularity?
 #define DFF_Prop_fc3DUseExtrusionColor       702  //  BOOL
 #define DFF_Prop_fc3DLightFace               703  //  BOOL
 // 3D Style
@@ -520,20 +520,20 @@ enum DFF_TextHeader {
 #define DFF_Prop_c3DFillIntensity            730  //  LONG            Fixed point intensity
 #define DFF_Prop_fc3DConstrainRotation       763  //  BOOL
 #define DFF_Prop_fc3DRotationCenterAuto      764  //  BOOL
-#define DFF_Prop_fc3DParallel                765  //  BOOL            Parallel projection?
-#define DFF_Prop_fc3DKeyHarsh                766  //  BOOL            Is key lighting harsh?
-#define DFF_Prop_fc3DFillHarsh               767  //  BOOL            Is fill lighting harsh?
+#define DFF_Prop_fc3DParallel                765  //  sal_Bool            Parallel projection?
+#define DFF_Prop_fc3DKeyHarsh                766  //  sal_Bool            Is key lighting harsh?
+#define DFF_Prop_fc3DFillHarsh               767  //  sal_Bool            Is fill lighting harsh?
 // Shape
 #define DFF_Prop_hspMaster                   769  //  MSO_HSP          master shape
 #define DFF_Prop_cxstyle                     771  //  MSO_CXSTYLE      Type of connector
 #define DFF_Prop_bWMode                      772  //  MSO_BWMODE       Settings for modifications to be made when in different forms of black-and-white mode.
 #define DFF_Prop_bWModePureBW                773  //  MSO_BWMODE
 #define DFF_Prop_bWModeBW                    774  //  MSO_BWMODE
-#define DFF_Prop_fOleIcon                    826  //  BOOL            For OLE objects, whether the object is in icon form
-#define DFF_Prop_fPreferRelativeResize       827  //  BOOL            For UI only. Prefer relative resizing.
-#define DFF_Prop_fLockShapeType              828  //  BOOL            Lock the shape type (don't allow Change Shape)
+#define DFF_Prop_fOleIcon                    826  //  sal_Bool            For OLE objects, whether the object is in icon form
+#define DFF_Prop_fPreferRelativeResize       827  //  sal_Bool            For UI only. Prefer relative resizing.
+#define DFF_Prop_fLockShapeType              828  //  sal_Bool            Lock the shape type (don't allow Change Shape)
 #define DFF_Prop_fDeleteAttachedObject       830  //  BOOL
-#define DFF_Prop_fBackground                 831  //  BOOL            If TRUE, this is the background shape.
+#define DFF_Prop_fBackground                 831  //  sal_Bool            If sal_True, this is the background shape.
 
 // Callout
 #define DFF_Prop_spcot                       832  //  MSO_SPCOT        Callout type
@@ -542,13 +542,13 @@ enum DFF_TextHeader {
 #define DFF_Prop_spcod                       835  //  MSO_SPCOD        Callout drop type
 #define DFF_Prop_dxyCalloutDropSpecified     836  //  LONG            if mso_spcodSpecified, the actual drop distance
 #define DFF_Prop_dxyCalloutLengthSpecified   837  //  LONG            if fCalloutLengthSpecified, the actual distance
-#define DFF_Prop_fCallout                    889  //  BOOL            Is the shape a callout?
-#define DFF_Prop_fCalloutAccentBar           890  //  BOOL            does callout have accent bar
-#define DFF_Prop_fCalloutTextBorder          891  //  BOOL            does callout have a text border
+#define DFF_Prop_fCallout                    889  //  sal_Bool            Is the shape a callout?
+#define DFF_Prop_fCalloutAccentBar           890  //  sal_Bool            does callout have accent bar
+#define DFF_Prop_fCalloutTextBorder          891  //  sal_Bool            does callout have a text border
 #define DFF_Prop_fCalloutMinusX              892  //  BOOL
 #define DFF_Prop_fCalloutMinusY              893  //  BOOL
-#define DFF_Prop_fCalloutDropAuto            894  //  BOOL            If true, then we occasionally invert the drop distance
-#define DFF_Prop_fCalloutLengthSpecified     895  //  BOOL            if true, we look at dxyCalloutLengthSpecified
+#define DFF_Prop_fCalloutDropAuto            894  //  sal_Bool            If true, then we occasionally invert the drop distance
+#define DFF_Prop_fCalloutLengthSpecified     895  //  sal_Bool            if true, we look at dxyCalloutLengthSpecified
 
 // GroupShape
 #define DFF_Prop_wzName                      896  //  WCHAR*          Shape Name (present only if explicitly set)
@@ -562,13 +562,13 @@ enum DFF_TextHeader {
 #define DFF_Prop_lidRegroup                  904  //  LONG            Regroup ID
 #define DFF_Prop_tableProperties			 927  //  LONG
 #define DFF_Prop_tableRowProperties			 928  //  LONG*
-#define DFF_Prop_fEditedWrap                 953  //  BOOL            Has the wrap polygon been edited?
-#define DFF_Prop_fBehindDocument             954  //  BOOL            Word-only (shape is behind text)
-#define DFF_Prop_fOnDblClickNotify           955  //  BOOL            Notify client on a double click
-#define DFF_Prop_fIsButton                   956  //  BOOL            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
-#define DFF_Prop_fOneD                       957  //  BOOL            1D adjustment
-#define DFF_Prop_fHidden                     958  //  BOOL            Do not display
-#define DFF_Prop_fPrint                      959  //  BOOL            Print this shape
+#define DFF_Prop_fEditedWrap                 953  //  sal_Bool            Has the wrap polygon been edited?
+#define DFF_Prop_fBehindDocument             954  //  sal_Bool            Word-only (shape is behind text)
+#define DFF_Prop_fOnDblClickNotify           955  //  sal_Bool            Notify client on a double click
+#define DFF_Prop_fIsButton                   956  //  sal_Bool            A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
+#define DFF_Prop_fOneD                       957  //  sal_Bool            1D adjustment
+#define DFF_Prop_fHidden                     958  //  sal_Bool            Do not display
+#define DFF_Prop_fPrint                      959  //  sal_Bool            Print this shape
 // entsprechende BitFlags
 #define DFF_PBit_EditedWrap			0x00000040
 #define DFF_PBit_BehindDocument		0x00000020
@@ -1077,17 +1077,17 @@ enum MSO_LineCap {
 // BStore-Container
 // FBSE - File Blip Store Entry
 typedef struct _MSOF_BSE {
-   BYTE      btWin32;    // Required type on Win32
-   BYTE      btMacOS;    // Required type on Mac
-   BYTE      rgbUid[16]; // Identifier of blip
-   USHORT    tag;        // currently unused
-   ULONG     size;       // Blip size in stream
-   ULONG     cRef;       // Reference count on the blip
-   ULONG /*MSOFO*/ foDelay;    // File offset in the delay stream
-   BYTE      usage;      // How this blip is used (MSOBLIPUSAGE)
-   BYTE      cbName;     // length of the blip name
-   BYTE      unused2;    // for the future
-   BYTE      unused3;    // for the future
+   sal_uInt8      btWin32;    // Required type on Win32
+   sal_uInt8      btMacOS;    // Required type on Mac
+   sal_uInt8      rgbUid[16]; // Identifier of blip
+   sal_uInt16    tag;        // currently unused
+   sal_uIntPtr     size;       // Blip size in stream
+   sal_uIntPtr     cRef;       // Reference count on the blip
+   sal_uIntPtr /*MSOFO*/ foDelay;    // File offset in the delay stream
+   sal_uInt8      usage;      // How this blip is used (MSOBLIPUSAGE)
+   sal_uInt8      cbName;     // length of the blip name
+   sal_uInt8      unused2;    // for the future
+   sal_uInt8      unused3;    // for the future
 } MSO_FBSE;
 
 typedef enum {
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index bf69daaa18..a7c6f958d2 100644..100755
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -125,14 +125,14 @@ public:
                                               const String*		 pNumStr = NULL );
 
 
-    void				GetInitSettings( USHORT&       nCatLbPos,
+    void				GetInitSettings( sal_uInt16&       nCatLbPos,
                                         LanguageType& rLangType,
-                                         USHORT&       nFmtLbSelPos,
+                                         sal_uInt16&       nFmtLbSelPos,
                                          SvStrings&    rFmtEntries,
                                          String&	   rPrevString,
                                          Color*&       rpPrevColor );
 
-    void				CategoryChanged( USHORT     nCatLbPos,
+    void				CategoryChanged( sal_uInt16     nCatLbPos,
                                         short&     rFmtSelPos,
                                          SvStrings& rFmtEntries );
 
@@ -140,34 +140,34 @@ public:
                                          short&       rFmtSelPos,
                                          SvStrings&   rFmtEntries );
 
-    void				FormatChanged( USHORT  nFmtLbPos,
+    void				FormatChanged( sal_uInt16  nFmtLbPos,
                                        String& rPreviewStr,
                                        Color*& rpFontColor );
 
-    BOOL				AddFormat( String&    rFormat,
+    sal_Bool				AddFormat( String&    rFormat,
                                    xub_StrLen& rErrPos,
-                                   USHORT&    rCatLbSelPos,
+                                   sal_uInt16&    rCatLbSelPos,
                                    short&     rFmtSelPos,
                                    SvStrings& rFmtEntries );
 
-    BOOL				RemoveFormat( const String&	rFormat,
-                                      USHORT&       rCatLbSelPos,
+    sal_Bool				RemoveFormat( const String&	rFormat,
+                                      sal_uInt16&       rCatLbSelPos,
                                       short&        rFmtSelPos,
                                       SvStrings&    rFmtEntries );
 
     void				MakeFormat( String& rFormat,
-                                    BOOL    bThousand,
-                                    BOOL    bNegRed,
-                                    USHORT  nPrecision,
-                                    USHORT  nLeadingZeroes,
-                                    USHORT  nCurrencyEntryPos);
+                                    sal_Bool    bThousand,
+                                    sal_Bool    bNegRed,
+                                    sal_uInt16  nPrecision,
+                                    sal_uInt16  nLeadingZeroes,
+                                    sal_uInt16  nCurrencyEntryPos);
 
     void				GetOptions( const String& rFormat,
-                                    BOOL&         rThousand,
-                                    BOOL&         rNegRed,
-                                    USHORT&       rPrecision,
-                                    USHORT&       rLeadingZeroes,
-                                    USHORT&       rCatLbPos );
+                                    sal_Bool&         rThousand,
+                                    sal_Bool&         rNegRed,
+                                    sal_uInt16&       rPrecision,
+                                    sal_uInt16&       rLeadingZeroes,
+                                    sal_uInt16&       rCatLbPos );
 
     void				MakePreviewString( const String& rFormatStr,
                                            String&       rPreviewStr,
@@ -178,11 +178,11 @@ public:
                                                 Color*& rpFontColor,
                                                 double	nValue);
 
-    BOOL				IsUserDefined( const String& rFmtString );
-    BOOL				IsTmpCurrencyFormat( const String& rFmtString );
-    BOOL				FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
+    sal_Bool				IsUserDefined( const String& rFmtString );
+    sal_Bool				IsTmpCurrencyFormat( const String& rFmtString );
+    sal_Bool				FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
 
-    void				ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; }
+    void				ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; }
     sal_uInt32			GetUpdateDataCount() const;
     void				GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize );
 
@@ -197,25 +197,25 @@ public:
 
     String				GetComment4Entry(short nEntry);
     short				GetCategory4Entry(short nEntry);
-    BOOL				GetUserDefined4Entry(short nEntry);
+    sal_Bool				GetUserDefined4Entry(short nEntry);
     String				GetFormat4Entry(short nEntry);
     void				SetComment4Entry(short nEntry,String aCommentString);
 
-    BOOL				IsBankingSymbol(USHORT nPos);
-    void				SetCurrencySymbol(USHORT nPos);
+    sal_Bool				IsBankingSymbol(sal_uInt16 nPos);
+    void				SetCurrencySymbol(sal_uInt16 nPos);
     sal_uInt32			GetCurrencySymbol();
-    USHORT				FindCurrencyFormat( const String& rFmtString );
-    USHORT				FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking);
+    sal_uInt16				FindCurrencyFormat( const String& rFmtString );
+    sal_uInt16				FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,sal_Bool bTmpBanking);
     NfCurrencyEntry*	GetCurCurrencyEntry();
     void				SetCurCurrencyEntry(NfCurrencyEntry*);
     short				GetListPos4Entry(sal_uInt32 nIdx);
     short				GetListPos4Entry( const String& rFmtString );
 
-    void				GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos );
-    void				GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag );
+    void				GetCurrencySymbols( SvStringsDtor& rList, sal_uInt16* pPos );
+    void				GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bFlag );
 
-    USHORT				FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking );
-    BOOL				IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString);
+    sal_uInt16				FindCurrencyTableEntry( const String& rFmtString, sal_Bool &bTestBanking );
+    sal_Bool				IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,const String &rFmtString);
 
     void				GetCurrencyFormats(SvStrings& rList);
 
@@ -227,7 +227,7 @@ private:
     SvxNumberValueType		eValType;
     String					aValStr;
     double					nValNum;
-    BOOL					bUndoAddList;
+    sal_Bool					bUndoAddList;
     SvULongs				aAddList;
     SvULongs				aDelList;
     SvULongs				aCurEntryList;
@@ -237,13 +237,13 @@ private:
     LanguageType			eCurLanguage;
     SvUShorts				aCurCurrencyList;
     NfCurrencyEntry*		pCurCurrencyEntry;
-    BOOL					bBankingSymbol;
-    USHORT					nCurCurrencyEntryPos;
+    sal_Bool					bBankingSymbol;
+    sal_uInt16					nCurCurrencyEntryPos;
     SvStrings				aCurrencyFormatList;
 
 #ifdef _SVX_NUMFMTSH_CXX
     SVX_DLLPRIVATE short					FillEntryList_Impl( SvStrings& rList );
-    SVX_DLLPRIVATE void					FillEListWithStd_Impl( SvStrings& rList,USHORT aPrivCat, short &Pos);
+    SVX_DLLPRIVATE void					FillEListWithStd_Impl( SvStrings& rList,sal_uInt16 aPrivCat, short &Pos);
     SVX_DLLPRIVATE short					FillEListWithFormats_Impl( SvStrings& rList,short nSelPos,
                                                        NfIndexTableOffset eOffsetStart,
                                                        NfIndexTableOffset eOffsetEnd);
@@ -255,12 +255,12 @@ private:
     SVX_DLLPRIVATE short					FillEListWithUserCurrencys( SvStrings& rList,short nSelPos);
 
     SVX_DLLPRIVATE short					FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos );
-    SVX_DLLPRIVATE BOOL					IsRemoved_Impl( sal_uInt32 nKey );
-    SVX_DLLPRIVATE BOOL					IsAdded_Impl( sal_uInt32 nKey );
+    SVX_DLLPRIVATE sal_Bool					IsRemoved_Impl( sal_uInt32 nKey );
+    SVX_DLLPRIVATE sal_Bool					IsAdded_Impl( sal_uInt32 nKey );
     SVX_DLLPRIVATE void					GetPreviewString_Impl( String& rString,
                                                    Color*& rpColor );
-    SVX_DLLPRIVATE void					PosToCategory_Impl( USHORT nPos, short& rCategory );
-    SVX_DLLPRIVATE void					CategoryToPos_Impl( short nCategory, USHORT& rPos );
+    SVX_DLLPRIVATE void					PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
+    SVX_DLLPRIVATE void					CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );
 #endif
 };
 
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 0ecde44dc5..4cc6b26713 100644..100755
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -47,23 +47,23 @@ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    SvxNumberInfoItem( const USHORT nId  );
+    SvxNumberInfoItem( const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const USHORT nId  );
+                       const sal_uInt16 nId  );
     // if both double and String are supplied, String is used for text formats
     SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
-                       const String& rValueStr, const USHORT nId );
+                       const String& rValueStr, const sal_uInt16 nId );
     SvxNumberInfoItem( const SvxNumberInfoItem& );
     ~SvxNumberInfoItem();
 
     virtual int              operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*     Create( SvStream& rStream, USHORT nVer ) const;
-    virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*     Create( SvStream& rStream, sal_uInt16 nVer ) const;
+    virtual SvStream&		 Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx
index 69600123d4..498ea28af9 100644..100755
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -56,14 +56,14 @@ class SvxNumRule;
 struct SvxBmpItemInfo
 {
     SvxBrushItem* 	pBrushItem;
-    USHORT 			nItemId;
+    sal_uInt16 			nItemId;
 };
 
 class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
 {
     Color 			aLineColor;
-    USHORT 			nPageType;
-    BOOL			bHTMLMode;
+    sal_uInt16 			nPageType;
+    sal_Bool			bHTMLMode;
     Rectangle		aOrgRect;
     VirtualDevice* 	pVDev;
 
@@ -78,12 +78,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
         com::sun::star::uno::Reference<
             com::sun::star::container::XIndexAccess> > aOutlineSettings;
     public:
-        SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType );
+        SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
         ~SvxNumValueSet();
 
     virtual void	UserDraw( const UserDrawEvent& rUDEvt );
 
-    void			SetHTMLMode(BOOL bSet) {bHTMLMode = bSet;}
+    void			SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;}
     void			SetNumberingSettings(
         const com::sun::star::uno::Sequence<
             com::sun::star::uno::Sequence<
@@ -103,13 +103,13 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 {
     String      sBullets;
     Timer 		aFormatTimer;
-    BOOL		bGrfNotFound;
+    sal_Bool		bGrfNotFound;
 
     protected:
         DECL_LINK(FormatHdl_Impl, Timer*);
 
-    void			SetGrfNotFound(BOOL bSet) {bGrfNotFound = bSet;}
-    BOOL			IsGrfNotFound()const {return bGrfNotFound;}
+    void			SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;}
+    sal_Bool			IsGrfNotFound()const {return bGrfNotFound;}
 
     Timer&			GetFormatTimer() {return aFormatTimer;}
 
@@ -127,8 +127,8 @@ class SvxNumberingPreview : public Window
     Font 				aStdFont;
     long				nPageWidth;
     const String* 		pOutlineNames;
-    BOOL				bPosition;
-    UINT16 				nActLevel;
+    sal_Bool				bPosition;
+    sal_uInt16 				nActLevel;
 
     protected:
         virtual void		Paint( const Rectangle& rRect );
@@ -136,7 +136,7 @@ class SvxNumberingPreview : public Window
     public:
         SvxNumberingPreview(Window* pParent, const ResId& rResId ) :
             Window(pParent, rResId),
-            pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX)
+            pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX)
             { SetBorderStyle( WINDOW_BORDER_MONO ); }
 
         void	SetNumRule(const SvxNumRule* pNum)
@@ -146,8 +146,8 @@ class SvxNumberingPreview : public Window
         void	SetOutlineNames(const String* pNames)
                         {pOutlineNames = pNames;}
         void	SetPositionMode()
-                        { bPosition = TRUE;}
-        void	SetLevel(USHORT nSet) {nActLevel = nSet;}
+                        { bPosition = sal_True;}
+        void	SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
 
 };
 
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 3dd361b215..953a9cd8c8 100644..100755
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -93,10 +93,10 @@ public:
     SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList);
     SVX_DLLPUBLIC virtual ~E3dObjList();
 
-    virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
-    virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
-    virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+    virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+    virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+    virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
 };
 
 /*************************************************************************
@@ -142,7 +142,7 @@ protected:
     // and no instances should be created from anyone, so i move the constructors 
     // to protected area
     E3dObject();
-    E3dObject(BOOL bIsFromChart);
+    E3dObject(sal_Bool bIsFromChart);
 
 public:
     TYPEINFO();
@@ -151,8 +151,8 @@ public:
 
     virtual ~E3dObject();
 
-    virtual UINT32	GetObjInventor() const;
-    virtual UINT16	GetObjIdentifier() const;
+    virtual sal_uInt32	GetObjInventor() const;
+    virtual sal_uInt16	GetObjIdentifier() const;
 
     virtual void	TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
@@ -195,7 +195,7 @@ public:
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
-    USHORT GetLogicalGroup() { return 0; }
+    sal_uInt16 GetLogicalGroup() { return 0; }
     virtual void operator=(const SdrObject&);
 
     virtual SdrObjGeoData *NewGeoData() const;
@@ -207,7 +207,7 @@ public:
     void SetSelected(bool bNew);
 
     // break up
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
     virtual SdrAttrObj* GetBreakObj();
 };
 
@@ -257,28 +257,28 @@ public :
     virtual sal_uInt32 GetHdlCount() const;
     virtual void	AddToHdlList(SdrHdlList& rHdlList) const;
     
-    // DoubleSided: TRUE/FALSE
-    BOOL GetDoubleSided() const
+    // DoubleSided: sal_True/FALSE
+    sal_Bool GetDoubleSided() const
         { return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
 
-    // NormalsKind: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetNormalsKind() const
         { return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); }
 
-    // NormalsInvert: TRUE/FALSE
-    BOOL GetNormalsInvert() const
+    // NormalsInvert: sal_True/FALSE
+    sal_Bool GetNormalsInvert() const
         { return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
 
-    // TextureProjX: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetTextureProjectionX() const
         { return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); }
 
-    // TextureProjY: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+    // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
     sal_uInt16 GetTextureProjectionY() const
         { return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); }
 
-    // Shadow3D: TRUE/FALSE
-    BOOL GetShadow3D() const
+    // Shadow3D: sal_True/FALSE
+    sal_Bool GetShadow3D() const
         { return ((const Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); }
 
     // MaterialColor: Color
@@ -297,24 +297,24 @@ public :
     sal_uInt16 GetMaterialSpecularIntensity() const
         { return ((const Svx3DMaterialSpecularIntensityItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); }
 
-    // TextureFilter: TRUE/FALSE
-    BOOL GetTextureFilter() const
+    // TextureFilter: sal_True/FALSE
+    sal_Bool GetTextureFilter() const
         { return ((const Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); }
 
     // #i28528#
     // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
-    BOOL GetReducedLineGeometry() const
+    sal_Bool GetReducedLineGeometry() const
         { return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void RecalcSnapRect();
 
     // set/get parameters for geometry creation
-    BOOL GetCreateNormals() const { return bCreateNormals; }
-    void SetCreateNormals(BOOL bNew);
+    sal_Bool GetCreateNormals() const { return bCreateNormals; }
+    void SetCreateNormals(sal_Bool bNew);
 
-    BOOL GetCreateTexture() const { return bCreateTexture; }
-    void SetCreateTexture(BOOL bNew);
+    sal_Bool GetCreateTexture() const { return bCreateTexture; }
+    void SetCreateTexture(sal_Bool bNew);
 
     // copy operator
     virtual void operator=(const SdrObject&);
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx
index 9cb7ecb526..9cb7ecb526 100644..100755
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/svx/objfac3d.hxx
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 766c8ee776..b56512c1fa 100644..100755
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
@@ -41,7 +41,7 @@ private:
     void* pPtr;
 
 public:
-                             OfaPtrItem( USHORT nWhich, void *pPtr );
+                             OfaPtrItem( sal_uInt16 nWhich, void *pPtr );
                              OfaPtrItem( const OfaPtrItem& );
 
     virtual int				 operator==( const SfxPoolItem& ) const;
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 85efb6104a..a51add08b1 100644..100755
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
@@ -29,22 +29,22 @@
 #define _SVX_OPTGENRL_HXX
 
 // Defines for setting the focus of a Edit via a slot from external.
-#define	UNKNOWN_EDIT	((USHORT)0)
-#define COMPANY_EDIT	((USHORT)1)
-#define FIRSTNAME_EDIT	((USHORT)2)
-#define LASTNAME_EDIT	((USHORT)3)
-#define STREET_EDIT		((USHORT)4)
-#define COUNTRY_EDIT	((USHORT)5)
-#define PLZ_EDIT		((USHORT)6)
-#define CITY_EDIT		((USHORT)7)
-#define STATE_EDIT		((USHORT)8)
-#define TITLE_EDIT		((USHORT)9)
-#define POSITION_EDIT	((USHORT)10)
-#define SHORTNAME_EDIT	((USHORT)11)
-#define TELPRIV_EDIT	((USHORT)12)
-#define TELCOMPANY_EDIT	((USHORT)13)
-#define FAX_EDIT		((USHORT)14)
-#define EMAIL_EDIT		((USHORT)15)
+#define	UNKNOWN_EDIT	((sal_uInt16)0)
+#define COMPANY_EDIT	((sal_uInt16)1)
+#define FIRSTNAME_EDIT	((sal_uInt16)2)
+#define LASTNAME_EDIT	((sal_uInt16)3)
+#define STREET_EDIT		((sal_uInt16)4)
+#define COUNTRY_EDIT	((sal_uInt16)5)
+#define PLZ_EDIT		((sal_uInt16)6)
+#define CITY_EDIT		((sal_uInt16)7)
+#define STATE_EDIT		((sal_uInt16)8)
+#define TITLE_EDIT		((sal_uInt16)9)
+#define POSITION_EDIT	((sal_uInt16)10)
+#define SHORTNAME_EDIT	((sal_uInt16)11)
+#define TELPRIV_EDIT	((sal_uInt16)12)
+#define TELCOMPANY_EDIT	((sal_uInt16)13)
+#define FAX_EDIT		((sal_uInt16)14)
+#define EMAIL_EDIT		((sal_uInt16)15)
 
 #endif // #ifndef _SVX_OPTGENRL_HXX
 
diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index f10267b02f..293a592127 100644..100755
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
@@ -44,42 +44,42 @@ class SvxGridTabPage;
 class SVX_DLLPUBLIC SvxOptionsGrid
 {
 protected:
-    UINT32	nFldDrawX;
-    UINT32 	nFldDivisionX;
-    UINT32	nFldDrawY;
-    UINT32 	nFldDivisionY;
-    UINT32	nFldSnapX;
-    UINT32	nFldSnapY;
-    BOOL	bUseGridsnap:1;
-    BOOL	bSynchronize:1;
-    BOOL	bGridVisible:1;
-    BOOL	bEqualGrid:	 1;
+    sal_uInt32	nFldDrawX;
+    sal_uInt32 	nFldDivisionX;
+    sal_uInt32	nFldDrawY;
+    sal_uInt32 	nFldDivisionY;
+    sal_uInt32	nFldSnapX;
+    sal_uInt32	nFldSnapY;
+    sal_Bool	bUseGridsnap:1;
+    sal_Bool	bSynchronize:1;
+    sal_Bool	bGridVisible:1;
+    sal_Bool	bEqualGrid:	 1;
 
 public:
     SvxOptionsGrid();
     ~SvxOptionsGrid();
 
-    void 	SetFldDrawX(	UINT32 nSet){nFldDrawX 		= nSet;}
-    void 	SetFldDivisionX(UINT32 nSet){nFldDivisionX  = nSet;}
-    void 	SetFldDrawY   (	UINT32 nSet){nFldDrawY      = nSet;}
-    void 	SetFldDivisionY(UINT32 nSet){nFldDivisionY  = nSet;}
-    void 	SetFldSnapX(	UINT32 nSet){nFldSnapX 		= nSet;}
-    void 	SetFldSnapY   (	UINT32 nSet){nFldSnapY      = nSet;}
-    void 	SetUseGridSnap( BOOL bSet ) {bUseGridsnap	= bSet;}
-    void 	SetSynchronize( BOOL bSet ) {bSynchronize	= bSet;}
-    void 	SetGridVisible( BOOL bSet ) {bGridVisible	= bSet;}
-    void 	SetEqualGrid( BOOL bSet )	{bEqualGrid		= bSet;}
-
-    UINT32	GetFldDrawX(	) const {  return nFldDrawX;    }
-    UINT32 	GetFldDivisionX() const {  return nFldDivisionX;}
-    UINT32	GetFldDrawY   (	) const {  return nFldDrawY;    }
-    UINT32 	GetFldDivisionY() const {  return nFldDivisionY;}
-    UINT32	GetFldSnapX(	) const {  return nFldSnapX;    }
-    UINT32	GetFldSnapY   (	) const {  return nFldSnapY;    }
-    BOOL	GetUseGridSnap( ) const {  return bUseGridsnap; }
-    BOOL	GetSynchronize( ) const {  return bSynchronize; }
-    BOOL	GetGridVisible( ) const {  return bGridVisible; }
-    BOOL	GetEqualGrid()	  const {  return bEqualGrid;   }
+    void 	SetFldDrawX(	sal_uInt32 nSet){nFldDrawX 		= nSet;}
+    void 	SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
+    void 	SetFldDrawY   (	sal_uInt32 nSet){nFldDrawY      = nSet;}
+    void 	SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY  = nSet;}
+    void 	SetFldSnapX(	sal_uInt32 nSet){nFldSnapX 		= nSet;}
+    void 	SetFldSnapY   (	sal_uInt32 nSet){nFldSnapY      = nSet;}
+    void 	SetUseGridSnap( sal_Bool bSet ) {bUseGridsnap	= bSet;}
+    void 	SetSynchronize( sal_Bool bSet ) {bSynchronize	= bSet;}
+    void 	SetGridVisible( sal_Bool bSet ) {bGridVisible	= bSet;}
+    void 	SetEqualGrid( sal_Bool bSet )	{bEqualGrid		= bSet;}
+
+    sal_uInt32	GetFldDrawX(	) const {  return nFldDrawX;    }
+    sal_uInt32 	GetFldDivisionX() const {  return nFldDivisionX;}
+    sal_uInt32	GetFldDrawY   (	) const {  return nFldDrawY;    }
+    sal_uInt32 	GetFldDivisionY() const {  return nFldDivisionY;}
+    sal_uInt32	GetFldSnapX(	) const {  return nFldSnapX;    }
+    sal_uInt32	GetFldSnapY   (	) const {  return nFldSnapY;    }
+    sal_Bool	GetUseGridSnap( ) const {  return bUseGridsnap; }
+    sal_Bool	GetSynchronize( ) const {  return bSynchronize; }
+    sal_Bool	GetGridVisible( ) const {  return bGridVisible; }
+    sal_Bool	GetEqualGrid()	  const {  return bEqualGrid;   }
 };
 
 // class SvxGridItem -----------------------------------------------------
@@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
     friend class SvxGridTabPage;
 
 public:
-    SvxGridItem( USHORT _nWhich) : SfxPoolItem(_nWhich){};
+    SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){};
     SvxGridItem( const SvxGridItem& pTestItem );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
@@ -115,7 +115,7 @@ public:
 
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	sal_Bool 		FillItemSet( SfxItemSet& rSet );
     virtual	void 		Reset( const SfxItemSet& rSet );
 
     virtual void 		ActivatePage( const SfxItemSet& rSet );
@@ -164,7 +164,7 @@ protected:
     MetricField 	aMtrFldBezAngle;
 
 private:
-    BOOL                bAttrModified;
+    sal_Bool                bAttrModified;
 
 #ifdef _SVX_OPTGRID_CXX
     DECL_LINK( ClickRotateHdl_Impl, void * );
diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx
index 0b315add63..0b315add63 100644..100755
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/svx/orienthelper.hxx
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 0f35022d5c..a8bab4dbb5 100644..100755
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -70,13 +70,13 @@ private:
     Color		aFtColor;
     SvxBoxItem*	pFtBorder;
 
-    BOOL		bFooter	:1;
-    BOOL		bHeader	:1;
-    BOOL		bTable	:1;
-    BOOL		bHorz	:1;
-    BOOL		bVert	:1;
+    sal_Bool		bFooter	:1;
+    sal_Bool		bHeader	:1;
+    sal_Bool		bTable	:1;
+    sal_Bool		bHorz	:1;
+    sal_Bool		bVert	:1;
 
-    USHORT		eUsage;
+    sal_uInt16		eUsage;
 
     String		aLeftText;
     String		aRightText;
@@ -85,8 +85,8 @@ protected:
     virtual void Paint( const Rectangle& rRect );
 
     virtual void DrawPage( const Point& rPoint,
-                           const BOOL bSecond,
-                           const BOOL bEnabled );
+                           const sal_Bool bSecond,
+                           const sal_Bool bEnabled );
 
 public:
     SvxPageWindow( Window* pParent, const ResId& rId );
@@ -144,20 +144,20 @@ public:
     const Color& 		GetFtColor() const				{ return aFtColor; }
     const SvxBoxItem& 	GetFtBorder() const				{ return *pFtBorder; }
 
-    void		SetUsage( USHORT eU )					{ eUsage = eU;  }
-    USHORT		GetUsage() const						{ return eUsage;}
+    void		SetUsage( sal_uInt16 eU )					{ eUsage = eU;  }
+    sal_uInt16		GetUsage() const						{ return eUsage;}
 
-    void 		SetHeader( BOOL bNew )  				{ bHeader = bNew; }
-    BOOL		GetHeader() const						{ return bHeader;}
-    void		SetFooter( BOOL bNew )					{ bFooter = bNew; }
-    BOOL		GetFooter() const						{ return bFooter;}
+    void 		SetHeader( sal_Bool bNew )  				{ bHeader = bNew; }
+    sal_Bool		GetHeader() const						{ return bHeader;}
+    void		SetFooter( sal_Bool bNew )					{ bFooter = bNew; }
+    sal_Bool		GetFooter() const						{ return bFooter;}
 
-    void 		SetTable( BOOL bNew )					{ bTable = bNew; }
-    BOOL		GetTable() const						{ return bTable;}
-    void		SetHorz( BOOL bNew )					{ bHorz = bNew; }
-    BOOL		GetHorz() const							{ return bHorz;}
-    void 		SetVert( BOOL bNew )		   			{ bVert = bNew; }
-    BOOL		GetVert() const				   			{ return bVert;}
+    void 		SetTable( sal_Bool bNew )					{ bTable = bNew; }
+    sal_Bool		GetTable() const						{ return bTable;}
+    void		SetHorz( sal_Bool bNew )					{ bHorz = bNew; }
+    sal_Bool		GetHorz() const							{ return bHorz;}
+    void 		SetVert( sal_Bool bNew )		   			{ bVert = bNew; }
+    sal_Bool		GetVert() const				   			{ return bVert;}
 
     void        EnableFrameDirection(sal_Bool bEnable);
     //uses enum SvxFrameDirection
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 68d774674a..20bfd03ac5 100644..100755
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -75,13 +75,13 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
 private:
     String			aDescName;			// name of the template
     SvxNumType		eNumType;			// enumeration
-    BOOL			bLandscape;     	// portrait / landscape
-    USHORT			eUse;				// layout
+    sal_Bool			bLandscape;     	// Portrait / Landscape
+    sal_uInt16			eUse;				// Layout
 
 public:
 
     TYPEINFO();
-    SvxPageItem( const USHORT nId );
+    SvxPageItem( const sal_uInt16 nId );
     SvxPageItem( const SvxPageItem& rItem );
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
@@ -92,17 +92,17 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual SfxPoolItem*     Create( SvStream&, USHORT ) const;
-    virtual SvStream&		 Store( SvStream& , USHORT nItemVersion ) const;
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 ) const;
+    virtual SvStream&		 Store( SvStream& , sal_uInt16 nItemVersion ) const;
 
     // orientation
-    USHORT 			GetPageUsage() const 				{ return eUse; 		 }
-    void			SetPageUsage(USHORT eU)				{ eUse= eU; 		 }
+    sal_uInt16 			GetPageUsage() const 				{ return eUse; 		 }
+    void			SetPageUsage(sal_uInt16 eU)				{ eUse= eU; 		 }
 
-    BOOL			IsLandscape() const 				{ return bLandscape; }
-    void			SetLandscape(BOOL bL)				{ bLandscape = bL; 	 }
+    sal_Bool			IsLandscape() const 				{ return bLandscape; }
+    void			SetLandscape(sal_Bool bL)				{ bLandscape = bL; 	 }
 
     // enumeration
     SvxNumType		GetNumType() const 					{ return eNumType;	 }
@@ -122,9 +122,9 @@ public:
 class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem
 {
 public:
-    SvxSetItem( const USHORT nId, const SfxItemSet& rSet );
+    SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet );
     SvxSetItem( const SvxSetItem& rItem );
-    SvxSetItem( const USHORT nId, SfxItemSet* pSet );
+    SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
@@ -133,8 +133,8 @@ public:
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual SfxPoolItem*	Create( SvStream&, USHORT nVersion ) const;
-    virtual SvStream&		Store( SvStream&, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream&, sal_uInt16 nVersion ) const;
+    virtual SvStream&		Store( SvStream&, sal_uInt16 nItemVersion ) const;
 };
 
 
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index 70f5aa720d..e2d615b7a3 100644..100755
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -60,15 +60,15 @@ private:
     long				nRightMargin;
     short	   			nFirstLineOfst;
     // distances
-    USHORT				nUpper;
-    USHORT				nLower;
+    sal_uInt16				nUpper;
+    sal_uInt16				nLower;
     // adjustment
     SvxAdjust			eAdjust;
     // last line in justification
     SvxAdjust			eLastLine;
     // line distance
     SvxPrevLineSpace	eLine;
-    USHORT				nLineVal;
+    sal_uInt16				nLineVal;
 
     String				aText;
     Rectangle			Lines[9];
@@ -76,7 +76,7 @@ private:
 protected:
     virtual void Paint( const Rectangle& rRect );
 
-    void DrawParagraph( BOOL bAll );
+    void DrawParagraph( sal_Bool bAll );
 
 public:
     SvxParaPrevWindow( Window* pParent, const ResId& rId );
@@ -84,11 +84,11 @@ public:
     void		SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; }
     void		SetLeftMargin( long nNew ) 	{ nLeftMargin = nNew; }
     void		SetRightMargin( long nNew )	{ nRightMargin = nNew; }
-    void		SetUpper( USHORT nNew )			{ nUpper = nNew; }
-    void		SetLower( USHORT nNew )			{ nLower = nNew; }
+    void		SetUpper( sal_uInt16 nNew )			{ nUpper = nNew; }
+    void		SetLower( sal_uInt16 nNew )			{ nLower = nNew; }
     void		SetAdjust( SvxAdjust eNew )		{ eAdjust = eNew; }
     void		SetLastLine( SvxAdjust eNew )	{ eLastLine = eNew; }
-    void		SetLineSpace( SvxPrevLineSpace eNew, USHORT nNew = 0 )
+    void		SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 )
                     {   eLine = eNew; nLineVal = nNew; }
     void        SetText( const String& rStr )	{ aText = rStr; }
     void		SetSize( Size aNew )			{ aSize = aNew; }
@@ -96,18 +96,18 @@ public:
     short		GetFirstLineOfst() const 		{ return nFirstLineOfst; }
     long		GetLeftMargin() const			{ return nLeftMargin; }
     long		GetRightMargin() const			{ return nRightMargin; }
-    USHORT		GetUpper() const				{ return nUpper; }
-    USHORT		GetLower() const				{ return nLower; }
+    sal_uInt16		GetUpper() const				{ return nUpper; }
+    sal_uInt16		GetLower() const				{ return nLower; }
     SvxAdjust	GetAdjust() const				{ return eAdjust; }
 
     SvxPrevLineSpace	GetLineEnum() const 	{ return eLine; }
-    USHORT				GetLineValue() const	{ return nLineVal; }
+    sal_uInt16				GetLineValue() const	{ return nLineVal; }
     String				GetText() const			{ return aText; }
     Size				GetSize() const			{ return aSize; }
 
     void		OutputSizeChanged();
 
-    void 		Draw( BOOL bAll ) 				{ DrawParagraph( bAll ); }
+    void 		Draw( sal_Bool bAll ) 				{ DrawParagraph( bAll ); }
 };
 
 #endif
diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx
index 5913851720..9082a09ca8 100644..100755
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
@@ -61,13 +61,13 @@ private:
 
     Link            aCheckPasswordHdl;
 
-    BOOL		    bEmpty;
+    sal_Bool		    bEmpty;
 
     DECL_LINK( ButtonHdl, OKButton * );
     DECL_LINK( EditModifyHdl, Edit * );
 
 public:
-                    SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords = FALSE, BOOL bDisableOldPassword = FALSE );
+                    SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
                     ~SvxPasswordDialog();
 
     String			GetOldPassword() const { return aOldPasswdED.GetText(); }
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 86f47c4136..9b6a5b0df0 100644..100755
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
@@ -47,16 +47,14 @@ private:
 public:
     // with nKind = SID_INSERT_SOUND    or
     //      nKind = SID_INSERT_VIDEO
-    SvxPluginFileDlg (Window *pParent, USHORT nKind );
+    SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind );
     ~SvxPluginFileDlg ();
 
     ErrCode					 Execute();
     String					 GetPath() const;
 
-    static bool IsAvailable (USHORT nKind);
+    static bool IsAvailable (sal_uInt16 nKind);
 
-    // setting HelpId and/or context of FileDialogHelper
-    void					SetDialogHelpId( const sal_Int32 nHelpId );
     void					SetContext( sfx2::FileDialogHelper::Context eNewContext );
 };
 
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index e36b1dd84e..907cb69ecb 100644..100755
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -39,7 +39,7 @@ private:
     basegfx::B3DPolyPolygon	aPolyPoly3D;
     basegfx::B3DPolyPolygon	aPolyNormals3D;
     basegfx::B2DPolyPolygon	aPolyTexture2D;
-    BOOL			bLineOnly;
+    sal_Bool			bLineOnly;
 
     SVX_DLLPRIVATE void CreateDefaultNormals();
     SVX_DLLPRIVATE void CreateDefaultTexture();
@@ -57,18 +57,18 @@ public:
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault, 
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault, 
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
         const basegfx::B3DPolyPolygon& rPolyNormals3D, 
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
     E3dPolygonObj(
         E3dDefaultAttributes& rDefault, 
         const basegfx::B3DPolyPolygon& rPolyPoly3D,
         const basegfx::B3DPolyPolygon& rPolyNormals3D, 
         const basegfx::B2DPolyPolygon& rPolyTexture2D, 
-        BOOL bLinOnly=FALSE);
+        sal_Bool bLinOnly=sal_False);
 
     E3dPolygonObj();
     virtual ~E3dPolygonObj();
@@ -77,14 +77,14 @@ public:
     const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
     const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
     // LineOnly?
-    BOOL GetLineOnly() { return bLineOnly; }
-    void SetLineOnly(BOOL bNew);
+    sal_Bool GetLineOnly() { return bLineOnly; }
+    void SetLineOnly(sal_Bool bNew);
 };
 
 #endif			// _E3D_POLYGON3D_HXX
diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx
index 1fc8ba162e..1fc8ba162e 100644..100755
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/svx/inc/svx/polypolygoneditor.hxx
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index 0471fe9e46..f31929a387 100644..100755
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -45,7 +45,7 @@ public:
     E3dPolyScene();
     E3dPolyScene(E3dDefaultAttributes& rDefault);
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 };
 
 #endif          // _E3D_POLYSC3D_HXX
diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx
index 15d9456229..c892ec724c 100644..100755
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
@@ -46,9 +46,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItAuthorItem( USHORT nWhich  );
+    SvxPostItAuthorItem( sal_uInt16 nWhich  );
 
-    SvxPostItAuthorItem( const String& rAuthor, USHORT nWhich  );
+    SvxPostItAuthorItem( const String& rAuthor, sal_uInt16 nWhich  );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -77,9 +77,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItDateItem( USHORT nWhich  );
+    SvxPostItDateItem( sal_uInt16 nWhich  );
 
-    SvxPostItDateItem( const String& rDate, USHORT nWhich  );
+    SvxPostItDateItem( const String& rDate, sal_uInt16 nWhich  );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -107,9 +107,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
 public:
     TYPEINFO();
 
-    SvxPostItTextItem( USHORT nWhich  );
+    SvxPostItTextItem( sal_uInt16 nWhich  );
 
-    SvxPostItTextItem( const String& rText, USHORT nWhich  );
+    SvxPostItTextItem( const String& rText, sal_uInt16 nWhich  );
     // "pure virtual methods" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx
index 29d61a419c..29d61a419c 100644..100755
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/svx/prtqry.hxx
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 08f49670f2..7087265d40 100644..100755
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
@@ -48,14 +48,14 @@ private:
 public:
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxPosSizeStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
     ~SvxPosSizeStatusBarControl();
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void	Command( const CommandEvent& rCEvt );
 
-    static ULONG	GetDefItemWidth( const StatusBar& rStb );
+    static sal_uIntPtr	GetDefItemWidth( const StatusBar& rStb );
 };
 
 
diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx
index d8edbc5511..d8edbc5511 100644..100755
--- a/svx/inc/svx/rectenum.hxx
+++ b/svx/inc/svx/rectenum.hxx
diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx
index 1a5e9dd913..d083f7b7dc 100644..100755
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
@@ -39,12 +39,12 @@
 class SVX_DLLPUBLIC SvxRelativeField : public MetricField
 {
 private:
-    USHORT          nRelMin;
-    USHORT          nRelMax;
-    USHORT          nRelStep;
-    BOOL            bRelativeMode;
-    BOOL            bRelative;
-    BOOL            bNegativeEnabled;
+    sal_uInt16          nRelMin;
+    sal_uInt16          nRelMax;
+    sal_uInt16          nRelStep;
+    sal_Bool            bRelativeMode;
+    sal_Bool            bRelative;
+    sal_Bool            bNegativeEnabled;
 
 protected:
     void            Modify();
@@ -53,12 +53,12 @@ public:
     SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 );
     SvxRelativeField( Window* pParent, const ResId& rResId );
 
-    void            EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
-                                        USHORT nStep = 5 );
-    BOOL            IsRelativeMode() const { return bRelativeMode; }
-    void            SetRelative( BOOL bRelative = FALSE );
-    BOOL            IsRelative() const { return bRelative; }
-    void            EnableNegativeMode() {bNegativeEnabled = TRUE;}
+    void            EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
+                                        sal_uInt16 nStep = 5 );
+    sal_Bool            IsRelativeMode() const { return bRelativeMode; }
+    void            SetRelative( sal_Bool bRelative = sal_False );
+    sal_Bool            IsRelative() const { return bRelative; }
+    void            EnableNegativeMode() {bNegativeEnabled = sal_True;}
 };
 
 
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 157ab6e715..9dcdff4f10 100644..100755
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
@@ -48,21 +48,21 @@ class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
 public:
                 TYPEINFO();
 
-                SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, USHORT nWhich=0);
+                SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0);
                 SvxRotateModeItem( const SvxRotateModeItem& rItem );
                 ~SvxRotateModeItem();
 
-    virtual USHORT				GetValueCount() const;
-    virtual String				GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16				GetValueCount() const;
+    virtual String				GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*		Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*		Create(SvStream &, USHORT) const;
-    virtual USHORT				GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*		Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16				GetVersion( sal_uInt16 nFileVersion ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
                                                  String& rText, const IntlWrapper * = 0 ) const;
-    virtual	bool                QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool                PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index 2a1453b5ea..5eca1615f6 100644..100755
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
 {
  public:
 
-    SvxRubyChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW( SvxRubyChildWindow );
 
@@ -125,7 +125,7 @@ class SvxRubyDialog : public SfxModelessDialog
     long 				nLastPos;
     long 				nCurrentEdit;
 
-    BOOL				bModified;
+    sal_Bool				bModified;
 
     com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
     SfxBindings*    pBindings;
@@ -149,13 +149,13 @@ class SvxRubyDialog : public SfxModelessDialog
     void                AssertOneEntry();
 
     void				Update();
-    virtual BOOL 		Close();
+    virtual sal_Bool 		Close();
 
     long 				GetLastPos() const {return nLastPos;}
     void				SetLastPos(long nSet) {nLastPos = nSet;}
 
-    BOOL 				IsModified() const {return bModified;}
-    void				SetModified(BOOL bSet) {bModified = bSet;}
+    sal_Bool 				IsModified() const {return bModified;}
+    void				SetModified(sal_Bool bSet) {bModified = bSet;}
 
     void EnableControls(sal_Bool bEnable)
         {
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index 67dc379f09..4c9f647497 100644..100755
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -64,13 +64,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     SvxObjectItem *pObjectItem;    // object
     Window *pEditWin;
     SvxRuler_Impl *pRuler_Imp;
-    BOOL bAppSetNullOffset :1;
-    BOOL bHorz :1;
+    sal_Bool bAppSetNullOffset :1;
+    sal_Bool bHorz :1;
     long lLogicNullOffset;      // in logic coordinates
     long lAppNullOffset;        // in logic coordinates
     long lMinFrame;             // minimal frame width in pixels
     long lInitialDragPos;
-    USHORT nFlags;
+    sal_uInt16 nFlags;
     enum {
         NONE = 0x0000,
         DRAG_OBJECT =  0x0001,
@@ -83,27 +83,27 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
         DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL
         }
     nDragType;
-    USHORT nDefTabType;
-    USHORT nTabCount;
-    USHORT nTabBufSize;
+    sal_uInt16 nDefTabType;
+    sal_uInt16 nTabCount;
+    sal_uInt16 nTabBufSize;
     long lDefTabDist;
     long lTabPos;
     RulerTab *pTabs;            // tab positions in pixel
     RulerIndent *pIndents;      // paragraph margins in pixel
     RulerBorder *pBorders;
-    USHORT nBorderCount;
+    sal_uInt16 nBorderCount;
     RulerBorder *pObjectBorders;
     SfxBindings *pBindings;
     long nDragOffset;
     long nMaxLeft;
     long nMaxRight;
-    BOOL bValid;
-    BOOL bListening;
-    BOOL bActive;
+    sal_Bool bValid;
+    sal_Bool bListening;
+    sal_Bool bActive;
     void StartListening_Impl();
-    long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE );
-    void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE);
-    USHORT GetObjectBordersOff(USHORT nIdx) const;
+    long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True );
+    void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True);
+    sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const;
 
     // page borders or surrounding frame
     void UpdateFrame(const SvxLongLRSpaceItem *);
@@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     // page position and width
     void Update(const SvxPagePosSizeItem *);
     // columns
-    void Update(const SvxColumnItem *, USHORT nSID);
+    void Update(const SvxColumnItem *, sal_uInt16 nSID);
     // object selection
     void Update(const SvxObjectItem *);
     // protect
@@ -190,8 +190,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     DECL_LINK( MenuSelect, Menu * );
     void PrepareProportional_Impl(RulerType);
 
-    USHORT GetNextVisible(USHORT nColumn);
-    USHORT GetPrevVisible(USHORT nColumn);
+    sal_uInt16 GetNextVisible(sal_uInt16 nColumn);
+    sal_uInt16 GetPrevVisible(sal_uInt16 nColumn);
 
     void Update();
 
@@ -214,16 +214,16 @@ protected:
 
     // calculation of boundary values for object borders
     // values refer to the page
-    virtual BOOL    CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const;
-    BOOL IsActLastColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ;
-    BOOL IsActFirstColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const;
-    USHORT GetActLeftColumn(
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
-    USHORT GetActRightColumn (
-        BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
-    long CalcPropMaxRight(USHORT nCol=USHRT_MAX) const;
+    virtual sal_Bool    CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const;
+    sal_Bool IsActLastColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ;
+    sal_Bool IsActFirstColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const;
+    sal_uInt16 GetActLeftColumn(
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+    sal_uInt16 GetActRightColumn (
+        sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+    long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const;
 
 public:
 #define     SVXRULER_SUPPORT_TABS                       0x0001
@@ -237,7 +237,7 @@ public:
 
     SvxRuler(Window* pParent,
              Window *pEditWin,
-             USHORT nRulerFlags,
+             sal_uInt16 nRulerFlags,
              SfxBindings &rBindings,
              WinBits nWinStyle = WB_STDRULER);
     ~SvxRuler();
@@ -245,7 +245,7 @@ public:
     void SetMinFrameSize(long lSize);
     long GetMinFrameSize() const ;
 
-    USHORT GetRulerFlags() const { return nFlags; }
+    sal_uInt16 GetRulerFlags() const { return nFlags; }
 
     void SetDefTabDist(long);
     long GetDefTabDist() const;
@@ -254,13 +254,13 @@ public:
     void SetNullOffsetLogic(long lOff = 0);
     long GetNullOffsetLogic() const { return lAppNullOffset; }
 
-    void SetActive(BOOL bOn = TRUE);
-    BOOL IsActive() const { return bActive; }
+    void SetActive(sal_Bool bOn = sal_True);
+    sal_Bool IsActive() const { return bActive; }
 
     void ForceUpdate() { Update(); }
 
     //#i24363# tab stops relative to indent
-    void SetTabsRelativeToIndent( BOOL bRel = TRUE );
+    void SetTabsRelativeToIndent( sal_Bool bRel = sal_True );
 };
 
 #endif
diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index e7a9a43d8d..89d5702610 100644..100755
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -45,8 +45,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
   protected:
 
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String			 GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -61,7 +61,7 @@ private:
 
 public:
     TYPEINFO();
-    SvxLongLRSpaceItem(long lLeft, long lRight, USHORT nId);
+    SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
     SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
     SvxLongLRSpaceItem();
 
@@ -81,8 +81,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
   protected:
 
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String			 GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -97,7 +97,7 @@ private:
 
 public:
     TYPEINFO();
-    SvxLongULSpaceItem(long lUpper, long lLower, USHORT nId);
+    SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
     SvxLongULSpaceItem(const SvxLongULSpaceItem &);
     SvxLongULSpaceItem();
 
@@ -116,8 +116,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
     long lHeight;
 protected:
     virtual int 			 operator==( const SfxPoolItem& ) const;
-    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual String			 GetValueText() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -146,13 +146,13 @@ struct SvxColumnDescription
 {
     long nStart;                    /* Start of the column */
     long nEnd;                      /* End of the column */
-    BOOL   bVisible;				   /* Visibility */
+    sal_Bool bVisible;				/* Visibility */
 
     long nEndMin;         //min. possible position of end
     long nEndMax;         //max. possible position of end
 
     SvxColumnDescription():
-        nStart(0), nEnd(0), bVisible(TRUE), nEndMin(0), nEndMax(0) {}
+        nStart(0), nEnd(0), bVisible(sal_True), nEndMin(0), nEndMax(0) {}
 
     SvxColumnDescription(const SvxColumnDescription &rCopy) :
         nStart(rCopy.nStart), nEnd(rCopy.nEnd),
@@ -160,13 +160,13 @@ struct SvxColumnDescription
         nEndMin(rCopy.nEndMin), nEndMax(rCopy.nEndMax)
          {}
 
-    SvxColumnDescription(long start, long end, BOOL bVis = TRUE):
+    SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True):
         nStart(start), nEnd(end), 
         bVisible(bVis), 
         nEndMin(0), nEndMax(0) {}
     
     SvxColumnDescription(long start, long end, 
-                        long endMin, long endMax, BOOL bVis = TRUE):
+                        long endMin, long endMax, sal_Bool bVis = sal_True):
         nStart(start), nEnd(end), 
         bVisible(bVis), 
         nEndMin(endMin), nEndMax(endMax)
@@ -195,9 +195,9 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
     long	nLeft,		// Left edge for the table
            nRight;		// Right edge for the table; for columns always
                                 // equal to the surrounding frame
-    USHORT nActColumn;	// the current column
-    BOOL    bTable;		// table?
-    BOOL	bOrtho;     // evenly spread columns
+    sal_uInt16 nActColumn;	// the current column
+    sal_uInt8  bTable;		// table?
+    sal_uInt8  bOrtho;     // evenly spread columns
 
     void DeleteAndDestroyColumns();
 
@@ -211,47 +211,47 @@ protected:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool        	 QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool			 PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 public:
     TYPEINFO();
     // right edge of the surrounding frame
     // nLeft, nRight each the distance to the surrounding frame
-    SvxColumnItem(USHORT nAct = 0); // columns
-    SvxColumnItem(USHORT nActCol,
-                  USHORT nLeft, USHORT nRight = 0);	// table with borders
+    SvxColumnItem(sal_uInt16 nAct = 0); // columns
+    SvxColumnItem(sal_uInt16 nActCol,
+                  sal_uInt16 nLeft, sal_uInt16 nRight = 0);	// Table with borders
     SvxColumnItem(const	SvxColumnItem &);
     ~SvxColumnItem();
 
     const SvxColumnItem &operator=(const SvxColumnItem &);
 
-    USHORT Count() const { return aColumns.Count(); }
-    SvxColumnDescription &operator[](USHORT i)
+    sal_uInt16 Count() const { return aColumns.Count(); }
+    SvxColumnDescription &operator[](sal_uInt16 i)
         { return *(SvxColumnDescription*)aColumns[i]; }
-    const SvxColumnDescription &operator[](USHORT i) const
+    const SvxColumnDescription &operator[](sal_uInt16 i) const
         { return *(SvxColumnDescription*)aColumns[i]; }
-    void Insert(const SvxColumnDescription &rDesc, USHORT nPos) {
+    void Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos) {
         SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc);
         aColumns.Insert(pDesc, nPos);
     }
     void   Append(const SvxColumnDescription &rDesc) { Insert(rDesc, Count()); }
     void   SetLeft(long left) { nLeft = left; }
     void   SetRight(long right) { nRight = right; }
-    void   SetActColumn(USHORT nCol) { nActColumn = nCol; }
+    void   SetActColumn(sal_uInt16 nCol) { nActColumn = nCol; }
 
-    USHORT GetActColumn() const { return nActColumn; }
-    BOOL   IsFirstAct() const { return nActColumn == 0; }
-    BOOL   IsLastAct() const { return nActColumn == Count()-1; }
+    sal_uInt16 GetActColumn() const { return nActColumn; }
+    sal_Bool   IsFirstAct() const { return nActColumn == 0; }
+    sal_Bool   IsLastAct() const { return nActColumn == Count()-1; }
     long GetLeft() { return nLeft; }
     long GetRight() { return nRight; }
 
-    BOOL   IsTable() const { return bTable; }
+    sal_Bool   IsTable() const { return bTable; }
 
-    BOOL   CalcOrtho() const;
-    void   SetOrtho(BOOL bVal) { bOrtho = bVal; }
-    BOOL   IsOrtho () const { return FALSE ; }
+    sal_Bool   CalcOrtho() const;
+    void   SetOrtho(sal_Bool bVal) { bOrtho = bVal; }
+    sal_Bool   IsOrtho () const { return sal_False ; }
 
-    BOOL IsConsistent() const  { return nActColumn < aColumns.Count(); }
+    sal_Bool IsConsistent() const  { return nActColumn < aColumns.Count(); }
     long   GetVisibleRight() const;// right visible edge of the current column
 };
 
@@ -264,7 +264,7 @@ private:
     long   nEndX;					   /* End in x direction */
     long   nStartY;                    /* Start in y direction */
     long   nEndY;                      /* Ende in y direction */
-    BOOL   bLimits;					   /* boundary limit control by the application */
+    sal_Bool bLimits;			       /* boundary limit control by the application */
 protected:
     virtual int 			 operator==( const SfxPoolItem& ) const;
 
@@ -275,18 +275,18 @@ protected:
                                     String &rText, const IntlWrapper * = 0 ) const;
 
     virtual SfxPoolItem*	 Clone( SfxItemPool *pPool = 0 ) const;
-    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool             QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool             PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 private:
     SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
 public:
     TYPEINFO();
     SvxObjectItem(long nStartX, long nEndX,
                   long nStartY, long nEndY,
-                  BOOL bLimits = FALSE);
+                  sal_Bool bLimits = sal_False);
     SvxObjectItem(const SvxObjectItem &);
 
-    BOOL   HasLimits() const { return bLimits; }
+    sal_Bool   HasLimits() const { return bLimits; }
 
     long   GetStartX() const { return nStartX; }
     long   GetEndX() const { return nEndX; }
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 579d9a8d32..e56f8bb0b4 100644..100755
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -125,7 +125,7 @@ public:
         { return ((const Svx3DFocalLengthItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); }
 
     // Two sided lighting:
-    BOOL GetTwoSidedLighting() const
+    sal_Bool GetTwoSidedLighting() const
         { return ((const Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); }
 
     // Lightcolor:
@@ -151,21 +151,21 @@ public:
         { return ((const Svx3DAmbientcolorItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); }
 
     // Light on/off:
-    BOOL GetLightOnOff1() const
+    sal_Bool GetLightOnOff1() const
         { return ((const Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); }
-    BOOL GetLightOnOff2() const
+    sal_Bool GetLightOnOff2() const
         { return ((const Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); }
-    BOOL GetLightOnOff3() const
+    sal_Bool GetLightOnOff3() const
         { return ((const Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); }
-    BOOL GetLightOnOff4() const
+    sal_Bool GetLightOnOff4() const
         { return ((const Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); }
-    BOOL GetLightOnOff5() const
+    sal_Bool GetLightOnOff5() const
         { return ((const Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); }
-    BOOL GetLightOnOff6() const
+    sal_Bool GetLightOnOff6() const
         { return ((const Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); }
-    BOOL GetLightOnOff7() const
+    sal_Bool GetLightOnOff7() const
         { return ((const Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); }
-    BOOL GetLightOnOff8() const
+    sal_Bool GetLightOnOff8() const
         { return ((const Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); }
 
     // Light direction:
@@ -195,9 +195,9 @@ public:
         { return ((const Svx3DShadeModeItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); }
 
     // set flag to draw only selected
-    void SetDrawOnlySelected(BOOL bNew) { bDrawOnlySelected = bNew; }
+    void SetDrawOnlySelected(sal_Bool bNew) { bDrawOnlySelected = bNew; }
     bool GetDrawOnlySelected() const { return bDrawOnlySelected; }
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void	NbcSetSnapRect(const Rectangle& rRect);
     virtual void	NbcMove(const Size& rSize);
@@ -230,7 +230,7 @@ public:
     B3dCamera& GetCameraSet() { return aCameraSet; }
 
     // break up
-    virtual BOOL IsBreakObjPossible();
+    virtual sal_Bool IsBreakObjPossible();
 
     basegfx::B3DVector GetShadowPlaneDirection() const;
     void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index 2ca6713df8..d3132ffd4e 100644..100755
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -39,10 +39,10 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
 public:
     TYPEINFO();
     SdrAngleItem(): SfxInt32Item() {}
-    SdrAngleItem(USHORT nId, INT32 nAngle=0): SfxInt32Item(nId,nAngle) {}
-    SdrAngleItem(USHORT nId, SvStream& rIn):  SfxInt32Item(nId,rIn) {}
+    SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {}
+    SdrAngleItem(sal_uInt16 nId, SvStream& rIn):  SfxInt32Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
                                                 SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index 8e98620e33..2c128f2fe9 100644..100755
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -66,8 +66,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
             virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
             virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-            virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-            virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+            virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+            virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
             sal_uInt32							GetCount() const { return aAdjustmentValueList.size(); };
             SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue&	GetValue( sal_uInt32 nIndex ) const;
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 314e6fbc8b..e66228d5c6 100644..100755
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -100,8 +100,8 @@ private:
             virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
             virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-            virtual	bool                QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-            virtual	bool                PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+            virtual	bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+            virtual	bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
             const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
 
@@ -127,7 +127,7 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem
 //---------------------------
 class SdrTextWordWrapItem : public SdrOnOffItem {
 public:
-    SdrTextWordWrapItem( BOOL bAuto = FALSE ):	SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
+    SdrTextWordWrapItem( sal_Bool bAuto = sal_False ):	SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
     SdrTextWordWrapItem( SvStream& rIn )  :		SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn )   {}
 };
 
@@ -136,7 +136,7 @@ public:
 //-------------------------------
 class SdrTextAutoGrowSizeItem : public SdrOnOffItem {
 public:
-    SdrTextAutoGrowSizeItem( BOOL bAuto = FALSE ):		SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
+    SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ):		SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
     SdrTextAutoGrowSizeItem( SvStream& rIn )   :		SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn )   {}
 };
 
diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx
index 6f3d8b7bb3..6f3d8b7bb3 100644..100755
--- a/svx/inc/svx/sderitm.hxx
+++ b/svx/inc/svx/sderitm.hxx
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index 7cf1431b77..927769891d 100644..100755
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -47,7 +47,7 @@ public:
                             SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //-------------------
@@ -64,7 +64,7 @@ public:
                             SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //-------------------
@@ -81,7 +81,7 @@ public:
                             SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGCOITM_HXX
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index 24fc7cf6ce..13548357e6 100644..100755
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -44,12 +44,12 @@ public:
 
                             SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
                                              sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
-                                             USHORT nWhichId = SDRATTR_GRAFCROP ) :
+                                             sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) :
                                 SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
-    virtual USHORT			GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual sal_uInt16			GetVersion( sal_uInt16 nFileVersion ) const;
 };
 
 #endif // _SDGCPITM_HXX
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index e25e5beecf..3d063e6e67 100644..100755
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -43,14 +43,14 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafGamma100Item( ULONG nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
+                            SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
                             SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif // _SDGGAITM_HXX
diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx
index c20f7298e6..e3ef16f75a 100644..100755
--- a/svx/inc/svx/sdginitm.hxx
+++ b/svx/inc/svx/sdginitm.hxx
@@ -43,11 +43,11 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafInvertItem( BOOL bInvert = FALSE ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
+                            SdrGrafInvertItem( sal_Bool bInvert = sal_False ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
                             SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGINITM_HXX
diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx
index 27103ded00..3047591fbf 100644..100755
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/svx/inc/svx/sdgluitm.hxx
@@ -47,7 +47,7 @@ public:
                             SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 //----------------------
@@ -64,7 +64,7 @@ public:
                             SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGLUITM_HXX
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index d5b1163a51..54f94ed029 100644..100755
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -44,15 +44,15 @@ public:
 
                             TYPEINFO();
 
-                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (USHORT)eMode ) {}
+                            SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
                             SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
-    virtual USHORT			GetValueCount() const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual sal_uInt16			GetValueCount() const;
     GraphicDrawMode			GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
 
-    virtual String			GetValueTextByPos( USHORT nPos ) const;
+    virtual String			GetValueTextByPos( sal_uInt16 nPos ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx
index 7b981fc670..67995df089 100644..100755
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/svx/inc/svx/sdgtritm.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
 public:
 
                             TYPEINFO();
-                            SdrGrafTransparenceItem( USHORT nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
+                            SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
                             SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
 
     virtual SfxPoolItem*	Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*	Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*	Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
 #endif // _SDGTRITM_HXX
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 3ef6fa520d..ca5d83dba3 100644..100755
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
 public:
     TYPEINFO();
     SdrMetricItem(): SfxInt32Item() {}
-    SdrMetricItem(USHORT nId, INT32 nVal=0):  SfxInt32Item(nId,nVal) {}
-    SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
+    SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0):  SfxInt32Item(nId,nVal) {}
+    SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual bool HasMetrics() const;
     virtual bool ScaleMetrics(long nMul, long nDiv);
 
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 193edd3015..3abb402fce 100644..100755
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -41,12 +41,12 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
 public:
     TYPEINFO();
     SdrOnOffItem(): SfxBoolItem() {}
-    SdrOnOffItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
-    SdrOnOffItem(USHORT nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
+    SdrOnOffItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+    SdrOnOffItem(sal_uInt16 nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual String  GetValueTextByVal(BOOL bVal) const;
+    virtual String  GetValueTextByVal(sal_Bool bVal) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index 79b3b64546..baec57268a 100644..100755
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -42,10 +42,10 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
 public:
     TYPEINFO();
     SdrPercentItem(): SfxUInt16Item() {}
-    SdrPercentItem(USHORT nId, UINT16 nVal=0): SfxUInt16Item(nId,nVal) {}
-    SdrPercentItem(USHORT nId, SvStream& rIn):  SfxUInt16Item(nId,rIn) {}
+    SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {}
+    SdrPercentItem(sal_uInt16 nId, SvStream& rIn):  SfxUInt16Item(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
@@ -60,10 +60,10 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
 public:
     TYPEINFO();
     SdrSignedPercentItem(): SfxInt16Item() {}
-    SdrSignedPercentItem( USHORT nId, INT16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
-    SdrSignedPercentItem( USHORT nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
+    SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
+    SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
     virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const;
 };
diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx
index 92ceb14ecd..92ceb14ecd 100644..100755
--- a/svx/inc/svx/sdr/animation/animationstate.hxx
+++ b/svx/inc/svx/sdr/animation/animationstate.hxx
diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx
index 0b4e1de23c..0b4e1de23c 100644..100755
--- a/svx/inc/svx/sdr/animation/objectanimator.hxx
+++ b/svx/inc/svx/sdr/animation/objectanimator.hxx
diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx
index 82efaf6f3d..82efaf6f3d 100644..100755
--- a/svx/inc/svx/sdr/animation/scheduler.hxx
+++ b/svx/inc/svx/sdr/animation/scheduler.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
index ea9955a13c..ea9955a13c 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
index 4f91c9123e..4f91c9123e 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
index 15fd5e93df..15fd5e93df 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
index ea2fb4f096..ea2fb4f096 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
index fb8d8d51be..fb8d8d51be 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx
index 9fed857c00..9fed857c00 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index 00e53dad46..00e53dad46 100644..100755
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx
index 6d4535d9d5..6d4535d9d5 100644..100755
--- a/svx/inc/svx/sdr/contact/displayinfo.hxx
+++ b/svx/inc/svx/sdr/contact/displayinfo.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx
index 28fc931423..28fc931423 100644..100755
--- a/svx/inc/svx/sdr/contact/objectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 48de837682..14a607cf4d 100644..100755
--- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -96,6 +96,15 @@ namespace sdr
             // Process the whole displaying
             virtual void ProcessDisplay(DisplayInfo& rDisplayInfo);
 
+            // VirtualDevice? Default is false
+            virtual bool isOutputToVirtualDevice() const;
+
+            // recording MetaFile? Default is false
+            virtual bool isOutputToRecordingMetaFile() const;
+
+            // pdf export? Default is false
+            virtual bool isOutputToPDFFile() const;
+
             // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
             virtual OutputDevice* TryToGetOutputDevice() const;
         };
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
index c8badbcf26..c8badbcf26 100644..100755
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx
index 3b46a26085..3b46a26085 100644..100755
--- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index d61b7defff..d61b7defff 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
index 08cf6a1436..08cf6a1436 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
index 8e6abc00f4..8e6abc00f4 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
index bb847b5a31..bb847b5a31 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
index 40b55a3245..40b55a3245 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 5edcda4924..5edcda4924 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
index 25b6947553..25b6947553 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
index cfed0a6fbd..cfed0a6fbd 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
index 308cb76c44..308cb76c44 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
index 03dc36135d..03dc36135d 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index fdd039d25f..fdd039d25f 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
index 322ed7c3c6..322ed7c3c6 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
index a2e4067017..a2e4067017 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
index 96cb4ccbf1..96cb4ccbf1 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
index babcb8ce48..babcb8ce48 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 0d4339b6bd..0d4339b6bd 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 3b7816cc7d..3b7816cc7d 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
index c3600d1b14..c3600d1b14 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 614e5f04fd..614e5f04fd 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index c67fae1e91..c67fae1e91 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
index ad4c9ca95d..ad4c9ca95d 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
index 5265910ab6..5265910ab6 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index f8de886596..f8de886596 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
index 470a2339cc..470a2339cc 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
index a85051fecb..a85051fecb 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
index 13e18311d9..13e18311d9 100644..100755
--- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index 3b586068a1..3b586068a1 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
index b559ff59ab..b559ff59ab 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
index be1b344481..be1b344481 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
index 2b9ba7bcce..2b9ba7bcce 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
index b654aea38f..b654aea38f 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 29464cbff9..29464cbff9 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 2dc87105a7..2dc87105a7 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 1db6c82185..1db6c82185 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 2e31417ba3..2e31417ba3 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 5baef0b96a..5baef0b96a 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
index 9e6aa4d086..9e6aa4d086 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 4dbb923cfc..4dbb923cfc 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
index dfdc079150..dfdc079150 100644..100755
--- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx
index a64c5639a4..a64c5639a4 100644..100755
--- a/svx/inc/svx/sdr/event/eventhandler.hxx
+++ b/svx/inc/svx/sdr/event/eventhandler.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index cb1a553496..cb1a553496 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index cdd5e73626..cdd5e73626 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
index 70f004bf3e..70f004bf3e 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 2c441efa41..2c441efa41 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
index 7b91f547c1..7b91f547c1 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx
index 3810f48b4a..3810f48b4a 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayline.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx
index ba8bfdd142..ba8bfdd142 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 6bc231f9eb..6bc231f9eb 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx
index 7d8aee9331..7d8aee9331 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
index 68d3338f28..68d3338f28 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 6de641a5ab..6de641a5ab 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
index 90e8e90c92..90e8e90c92 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index af8de0f536..af8de0f536 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
index 04cd459441..04cd459441 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx
index 019e33ff78..019e33ff78 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlayselection.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx
index 924e4fdb01..924e4fdb01 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
index eea5d4e095..eea5d4e095 100644..100755
--- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
index 7aa8ea03fa..7aa8ea03fa 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
index c1e9b87bc6..c1e9b87bc6 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 9ec9276099..9ec9276099 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 85808f592d..85808f592d 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index dfa235b7ea..dfa235b7ea 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index 30cd545b1a..30cd545b1a 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index fcbc65c8b0..fcbc65c8b0 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 5aa15b3bd4..5aa15b3bd4 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 2d314f13b6..2d314f13b6 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index b85cca7b35..b85cca7b35 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 66015d4a97..66015d4a97 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index cee3071dcf..cee3071dcf 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 67a314fd8b..67a314fd8b 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index a201132212..a201132212 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index d5d9b45980..d5d9b45980 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index d0dbd968f8..d0dbd968f8 100644..100755
--- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
index 8859a77925..8859a77925 100644..100755
--- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx
index bb7343ab21..bb7343ab21 100644..100755
--- a/svx/inc/svx/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx
index e3aaee1b8a..e3aaee1b8a 100644..100755
--- a/svx/inc/svx/sdr/properties/captionproperties.hxx
+++ b/svx/inc/svx/sdr/properties/captionproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx
index abca379f97..abca379f97 100644..100755
--- a/svx/inc/svx/sdr/properties/circleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/circleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx
index d68a96bfba..d68a96bfba 100644..100755
--- a/svx/inc/svx/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
index 397635d375..397635d375 100644..100755
--- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx
index e150fd6d47..e150fd6d47 100644..100755
--- a/svx/inc/svx/sdr/properties/defaultproperties.hxx
+++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
index 07667f0afd..07667f0afd 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
index 9e1bff92eb..9e1bff92eb 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
index fe859472d1..fe859472d1 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx
index 22dc6f83dc..22dc6f83dc 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
index cd45eb59b5..cd45eb59b5 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
index 2b8baf09cf..2b8baf09cf 100644..100755
--- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx
index 598f087c85..598f087c85 100644..100755
--- a/svx/inc/svx/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx
index 8fe3fa2b48..8fe3fa2b48 100644..100755
--- a/svx/inc/svx/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx
index 8c74997b2f..8c74997b2f 100644..100755
--- a/svx/inc/svx/sdr/properties/groupproperties.hxx
+++ b/svx/inc/svx/sdr/properties/groupproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx
index 65a3fe53c5..65a3fe53c5 100644..100755
--- a/svx/inc/svx/sdr/properties/itemsettools.hxx
+++ b/svx/inc/svx/sdr/properties/itemsettools.hxx
diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx
index 93f1d040a8..93f1d040a8 100644..100755
--- a/svx/inc/svx/sdr/properties/measureproperties.hxx
+++ b/svx/inc/svx/sdr/properties/measureproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/oleproperties.hxx b/svx/inc/svx/sdr/properties/oleproperties.hxx
index 145a0dc7c1..145a0dc7c1 100644..100755
--- a/svx/inc/svx/sdr/properties/oleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/oleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx
index 6463cc3988..6463cc3988 100644..100755
--- a/svx/inc/svx/sdr/properties/pageproperties.hxx
+++ b/svx/inc/svx/sdr/properties/pageproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx
index 63b7209e91..63b7209e91 100644..100755
--- a/svx/inc/svx/sdr/properties/properties.hxx
+++ b/svx/inc/svx/sdr/properties/properties.hxx
diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
index abb0deada2..abb0deada2 100644..100755
--- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx
index e8b25922dd..e8b25922dd 100644..100755
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx
index 6751143307..6751143307 100644..100755
--- a/svx/inc/svx/sdr/table/tabledesign.hxx
+++ b/svx/inc/svx/sdr/table/tabledesign.hxx
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
index 85c30e7e27..85c30e7e27 100644..100755
--- a/svx/inc/svx/sdrcomment.hxx
+++ b/svx/inc/svx/sdrcomment.hxx
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx
index 16c5bcaf69..16c5bcaf69 100644..100755
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/svx/inc/svx/sdrhittesthelper.hxx
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index ea2974a867..ea2974a867 100644..100755
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/svx/inc/svx/sdrobjectfilter.hxx
index f2dd3ffe28..f2dd3ffe28 100644..100755
--- a/svx/inc/svx/sdrobjectfilter.hxx
+++ b/svx/inc/svx/sdrobjectfilter.hxx
diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx
index bc2a26f56c..bc2a26f56c 100644..100755
--- a/svx/inc/svx/sdrobjectuser.hxx
+++ b/svx/inc/svx/sdrobjectuser.hxx
diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx
index da0d42669a..da0d42669a 100644..100755
--- a/svx/inc/svx/sdrpageuser.hxx
+++ b/svx/inc/svx/sdrpageuser.hxx
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index 2d9a197efb..7d28e5c936 100644..100755
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -117,6 +117,7 @@ public:
     void PrepareRedraw(const Region& rReg);
     void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const;
     void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const;
+    void PostPaint();
 
     // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
     void InvalidatePageWindow(const basegfx::B2DRange& rRange);
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index 8be3874bbf..8be3874bbf 100644..100755
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx
index 2ba0f39a44..2ba0f39a44 100644..100755
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/svx/inc/svx/sdshcitm.hxx
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index 64ad547cb3..fa76e53578 100644..100755
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -36,7 +36,7 @@
 //------------------------------
 class SdrShadowItem: public SdrOnOffItem {
 public:
-    SdrShadowItem(BOOL bShadow=FALSE): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
+    SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
     SdrShadowItem(SvStream& rIn):      SdrOnOffItem(SDRATTR_SHADOW, rIn)     {}
 };
 
diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx
index 200a352a67..cb54c7e07a 100644..100755
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/svx/inc/svx/sdshtitm.hxx
@@ -36,7 +36,7 @@
 //---------------------
 class SdrShadowTransparenceItem: public SdrPercentItem {
 public:
-    SdrShadowTransparenceItem(USHORT nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
+    SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
     SdrShadowTransparenceItem(SvStream& rIn)   : SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,rIn)     {}
 };
 
diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx
index 5a1a70c2a2..5a1a70c2a2 100644..100755
--- a/svx/inc/svx/sdsxyitm.hxx
+++ b/svx/inc/svx/sdsxyitm.hxx
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index 773cf0207e..7e46724207 100644..100755
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -35,10 +35,10 @@
 class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item {
 public:
     TYPEINFO();
-    SdrTextAniAmountItem(INT16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
+    SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
     SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual bool HasMetrics() const;
     virtual bool ScaleMetrics(long nMul, long nDiv);
 
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index bde531d20f..19da878a48 100644..100755
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -34,7 +34,7 @@
 // Number of loops. 0=infinite.
 class SdrTextAniCountItem: public SfxUInt16Item {
 public:
-    SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
+    SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
     SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index b44e5ecc6e..21fdc6f06b 100644..100755
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -44,17 +44,17 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT,
 class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(USHORT)eDir) {}
+    SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
     SdrTextAniDirectionItem(SvStream& rIn)                           : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn)  {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const;
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const;
     SdrTextAniDirection GetValue() const      { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx
index 2b873350fd..28ebc78f56 100644..100755
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/svx/inc/svx/sdtagitm.hxx
@@ -36,7 +36,7 @@
 //------------------------------------
 class SdrTextAutoGrowHeightItem: public SdrOnOffItem {
 public:
-    SdrTextAutoGrowHeightItem(BOOL bAuto=TRUE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
+    SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
     SdrTextAutoGrowHeightItem(SvStream& rIn)  : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn)   {}
 };
 
@@ -45,7 +45,7 @@ public:
 //------------------------------------
 class SdrTextAutoGrowWidthItem: public SdrOnOffItem {
 public:
-    SdrTextAutoGrowWidthItem(BOOL bAuto=FALSE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
+    SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
     SdrTextAutoGrowWidthItem(SvStream& rIn)   : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn)   {}
 };
 
diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx
index d1c7c0ff95..b3f941fc0b 100644..100755
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/svx/inc/svx/sdtaiitm.hxx
@@ -33,13 +33,13 @@
 
 class SdrTextAniStartInsideItem: public SdrYesNoItem {
 public:
-    SdrTextAniStartInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
+    SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
     SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
 };
 
 class SdrTextAniStopInsideItem: public SdrYesNoItem {
 public:
-    SdrTextAniStopInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
+    SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
     SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
 };
 
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index 45d063fbe3..40394f3022 100644..100755
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -45,17 +45,17 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP,      // aligned to top (normally
 class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(USHORT)eAdj) {}
+    SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
     SdrTextVertAdjustItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16            GetValueCount() const; // { return 5; }
             SdrTextVertAdjust GetValue() const      { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
@@ -72,17 +72,17 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT,     // left adjusted
 class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(USHORT)eAdj) {}
+    SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
     SdrTextHorzAdjustItem(SvStream& rIn)                                 : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const;
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16        GetValueCount() const;
             SdrTextHorzAdjust GetValue() const      { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index ff00264f9d..0b51c7d90d 100644..100755
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -46,8 +46,8 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Einfach nur Blinken. Direction und Amount ohne Wirkung.
 //   Frequenz siehe Delay, 0=0.5Hz (Delay=250).
 //   Count=Anzahl der blinker. 0=Endlos.
-//   StartInside: FALSE=beginnend mit Pause, TRUE=Beginnend mit Puls
-//   StopInside:  FALSE=Nach Count blinkern nicht sichtbar, TRUE=sichtbar
+//   StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls
+//   StopInside:  sal_False=Nach Count blinkern nicht sichtbar, sal_True=sichtbar
 //                (nur wenn Count!=0)
 // - SDRTEXTANI_SCROLL:
 //   Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden
@@ -55,12 +55,12 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz)
 //   Count=Durchlaufanzahl (0=Endlos)
 //   Direction: ist eben die Richtung in die gescrollt wird.
-//   StartInside: FALSE=Schrift wird auch beim ersten Durchlauf reingescrollt
-//                TRUE=Der linke Teil der Schrift steht beim ersten Durchlauf
+//   StartInside: sal_False=Schrift wird auch beim ersten Durchlauf reingescrollt
+//                sal_True=Der linke Teil der Schrift steht beim ersten Durchlauf
 //                     bereits da (im sichtbaren "Scrollbereich")
-//   StopInside:  FALSE=Schrift wird auch beim letzten Durchlauf vollstaendig
+//   StopInside:  sal_False=Schrift wird auch beim letzten Durchlauf vollstaendig
 //                      rausgescrollt
-//                TRUE=Schrift wird beim letzten Durchlauf nicht rausgescrollt
+//                sal_True=Schrift wird beim letzten Durchlauf nicht rausgescrollt
 //                (nur wenn Count!=0)
 //   Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten
 //           Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf
@@ -75,31 +75,31 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
 //   Alle andern Parameter wie SDRTEXTANI_SCROLL
 // - SDRTEXTANI_SLIDE:
 //   Schrift wird nur reingeschoben bis zur Originalposition.
-//   -> also wie SCROLL mit StartInside=FALSE, StopInside=TRUE
+//   -> also wie SCROLL mit StartInside=sal_False, StopInside=TRUE
 //   und Count=1. Count=0 wird als Count=1 interpretiert.
 //   Fuer jeden Count>1 wird der Text jedoch ruekwaerts wieder vollstaendig
 //   rausgeschoben (aehnlich wie ALTERNATE) und dann wieder reingeschoben.
 //   StopInside wird nicht ausgewertet, weil immer Inside gestoppt wird.
 //   StartInside wird nicht ausgewertet, weil immer Outside gestartet wird.
 //   Alle andern Parameter wie SDRTEXTANI_SCROLL
-// StartInside,StopInside: Bei TRUE ist die anfaengliche/entgueltige
+// StartInside,StopInside: Bei sal_True ist die anfaengliche/entgueltige
 // Textposition abhaengig von der Textverankerung am Zeichenobjekt. Sie
 // entspricht der Textposition bei normalem Paint (ohne Laufschrift).
 
 class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(USHORT)eKind) {}
+    SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
     SdrTextAniKindItem(SvStream& rIn)                       : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn)  {}
     virtual SfxPoolItem*      Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*      Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT            GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*      Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16            GetValueCount() const; // { return 5; }
             SdrTextAniKind GetValue() const      { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index bbeaa28bb0..85093691d3 100644..100755
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -35,10 +35,10 @@
 class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item {
 public:
     TYPEINFO();
-    SdrTextAniDelayItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
+    SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
     SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn)  {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx
index 7ccddfcd9d..4cf6d36b86 100644..100755
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/svx/inc/svx/sdtcfitm.hxx
@@ -36,7 +36,7 @@
 //------------------------------------
 class SdrTextContourFrameItem: public SdrOnOffItem {
 public:
-    SdrTextContourFrameItem(BOOL bOn=FALSE): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
+    SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
     SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {}
 };
 
diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx
index 3c4b9b74d8..3c4b9b74d8 100644..100755
--- a/svx/inc/svx/sdtditm.hxx
+++ b/svx/inc/svx/sdtditm.hxx
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index db42edd7e8..763c08d1d6 100644..100755
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
 public:
 
     TYPEINFO();
-    SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
+    SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False );
     SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
@@ -47,8 +47,8 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*		Clone( SfxItemPool* pPool = NULL ) const;
     SVX_DLLPRIVATE virtual	sal_uInt16			GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 45fec5134b..d1b353b8b2 100644..100755
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -54,21 +54,21 @@ enum SdrFitToSizeType {
 class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(USHORT)eFit) {}
+    SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
     SdrTextFitToSizeTypeItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*     Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT           GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16           GetValueCount() const; // { return 4; }
             SdrFitToSizeType GetValue() const      { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
     virtual int              HasBoolValue() const;
-    virtual BOOL             GetBoolValue() const;
-    virtual void             SetBoolValue(BOOL bVal);
+    virtual sal_Bool             GetBoolValue() const;
+    virtual void             SetBoolValue(sal_Bool bVal);
 };
 
 #endif
diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx
index 00d8c4f14f..00d8c4f14f 100644..100755
--- a/svx/inc/svx/sdtmfitm.hxx
+++ b/svx/inc/svx/sdtmfitm.hxx
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 2d84a5f4fb..5e1942d3c5 100644..100755
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
 public:
     TYPEINFO();
     SdrYesNoItem(): SfxBoolItem() {}
-    SdrYesNoItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
-    SdrYesNoItem(USHORT nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
+    SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+    SdrYesNoItem(sal_uInt16 nId, SvStream& rIn):  SfxBoolItem(nId,rIn) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual String  GetValueTextByVal(BOOL bVal) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual String  GetValueTextByVal(sal_Bool bVal) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index ab22210bde..c618931660 100644..100755
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
@@ -38,19 +38,19 @@
 class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl
 {
 public:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void	Click();
     virtual void    Paint( const UserDrawEvent& rEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxSelectionModeControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static	ULONG	GetDefItemWidth(const StatusBar& rStb);
+    static	sal_uIntPtr	GetDefItemWidth(const StatusBar& rStb);
 
 private:
-    USHORT	nState;
+    sal_uInt16	nState;
 
 #ifdef _SVX_SELCTRL_CXX
     SVX_DLLPRIVATE void	DrawItemText_Impl();
diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx
index 3a114ea7c6..3a114ea7c6 100644..100755
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/svx/inc/svx/selectioncontroller.hxx
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index be8c710520..be8c710520 100644..100755
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx
index 504bcae8d5..504bcae8d5 100644..100755
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/svx/inc/svx/shapepropertynotifier.hxx
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 8c4ebfbd09..0dfbc5b275 100644..100755
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -67,11 +67,11 @@ private:
     SvxSimpTblContainer	aPrivContainer;
     HeaderBar			aHeaderBar;
     long				nOldPos;
-    USHORT				nHeaderItemId;
-    BOOL				bResizeFlag;
-    BOOL				bPaintFlag;
-    BOOL				bSortDirection;
-    USHORT				nSortCol;
+    sal_uInt16				nHeaderItemId;
+    sal_Bool				bResizeFlag;
+    sal_Bool				bPaintFlag;
+    sal_Bool				bSortDirection;
+    sal_uInt16				nSortCol;
     Window*				pMyParentWin;
 
     DECL_LINK( StartDragHdl, HeaderBar* );
@@ -107,7 +107,7 @@ public:
     ~SvxSimpleTable();
 
     void			InsertHeaderEntry(const XubString& rText,
-                            USHORT nCol=HEADERBAR_APPEND,
+                            sal_uInt16 nCol=HEADERBAR_APPEND,
                             HeaderBarItemBits nBits = HIB_STDSTYLE);
 
     void			SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
@@ -132,11 +132,11 @@ public:
     
     void            ShowTable();
     void            HideTable();
-    BOOL            IsVisible() const;
+    sal_Bool            IsVisible() const;
 
     void            EnableTable();
     void            DisableTable();
-    BOOL            IsEnabled() const;
+    sal_Bool            IsEnabled() const;
 
     void            TableToTop();
     void			SetPosPixel( const Point& rNewPos );
@@ -149,11 +149,11 @@ public:
     Size			GetSizePixel() const;
     Size			GetOutputSizePixel() const;
 
-    USHORT	        GetSelectedCol();
-    void			SortByCol(USHORT,BOOL bDir=TRUE);
-    BOOL			GetSortDirection(){ return bSortDirection;}
-    USHORT			GetSortedCol(){ return nSortCol;}
-    SvLBoxItem*		GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const;
+    sal_uInt16	        GetSelectedCol();
+    void			SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
+    sal_Bool			GetSortDirection(){ return bSortDirection;}
+    sal_uInt16			GetSortedCol(){ return nSortCol;}
+    SvLBoxItem*		GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const;
 
     CommandEvent	GetCommandEvent()const;
     inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
@@ -167,7 +167,7 @@ public:
     void            SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; }
     const Link&     GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; }
 
-    void            SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);}
+    void            SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);}
 };
 
 
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 99c6730289..6c71b797ee 100644..100755
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -68,8 +68,8 @@ public:
     sal_uInt32 GetVerticalSegments() const 
         { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
 
-    virtual UINT16 GetObjIdentifier() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void operator=(const SdrObject&);
 
diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx
index 58ed1b9c08..0bbf42a8de 100644..100755
--- a/svx/inc/svx/splitcelldlg.hxx
+++ b/svx/inc/svx/splitcelldlg.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/button.hxx>
 
 #include <svx/stddlg.hxx>
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 85adcf8a09..a4d1c008ee 100644..100755
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -65,7 +65,7 @@ struct SearchDlg_Impl;
 
 struct SearchAttrItem
 {
-    USHORT 			nSlot;
+    sal_uInt16 			nSlot;
     SfxPoolItem* 	pItem;
 };
 
@@ -83,17 +83,17 @@ public:
     void            Put( const SfxItemSet& rSet );
     SfxItemSet&     Get( SfxItemSet& rSet );
     void            Clear();
-    USHORT          Count() const { return SrchAttrItemList::Count(); }
-    SearchAttrItem& operator[](USHORT nPos) const
+    sal_uInt16          Count() const { return SrchAttrItemList::Count(); }
+    SearchAttrItem& operator[](sal_uInt16 nPos) const
                         { return SrchAttrItemList::operator[]( nPos ); }
-    SearchAttrItem& GetObject( USHORT nPos ) const
+    SearchAttrItem& GetObject( sal_uInt16 nPos ) const
                         { return SrchAttrItemList::GetObject( nPos ); }
 
     // the pointer to the item is not being copierd, so don't delete
     void Insert( const SearchAttrItem& rItem )
         { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); }
     // deletes the pointer to the items
-    void Remove( USHORT nPos, USHORT nLen = 1 );
+    void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
 };
 
 #ifndef SV_NODIALOG
@@ -108,7 +108,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
 {
     SvxSearchDialog *dialog;
 public:
-    SvxSearchDialogWrapper( Window*pParent, USHORT nId,
+    SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
 
     ~SvxSearchDialogWrapper ();
@@ -119,7 +119,7 @@ public:
 // class SvxSearchDialog -------------------------------------------------
 
 /*
-    {k:\svx\prototyp\dialog\srchdlg.hxx}
+    {k:\svx\prototyp\dialog\svx/srchdlg.hxx}
 
     [Description]
     In this modeless dialog the attributes for a search are configured
@@ -141,7 +141,7 @@ public:
     SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
     ~SvxSearchDialog();
 
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
     // Window
     virtual void	Activate();
@@ -154,12 +154,12 @@ public:
     const SearchAttrItemList*   GetReplaceItemList() const
                                     { return pReplaceList; }
 
-    inline BOOL 	HasSearchAttributes() const;
-    inline BOOL 	HasReplaceAttributes() const;
+    inline sal_Bool 	HasSearchAttributes() const;
+    inline sal_Bool 	HasReplaceAttributes() const;
 
     PushButton&     GetReplaceBtn() { return aReplaceBtn; }
 
-    INT32			GetTransliterationFlags() const;
+    sal_Int32			GetTransliterationFlags() const;
 
     void            SetSaveToModule(bool b);
 
@@ -217,14 +217,14 @@ private:
     CheckBox        aAllSheetsCB;
 
     SfxBindings&    rBindings;
-    BOOL            bWriter;
-    BOOL            bSearch;
-    BOOL            bFormat;
-    USHORT          nOptions;
+    sal_Bool            bWriter;
+    sal_Bool            bSearch;
+    sal_Bool            bFormat;
+    sal_uInt16          nOptions;
     bool            bSet;
     bool            bReadOnly;
     bool            bConstruct;
-    ULONG			nModifyFlag;
+    sal_uIntPtr			nModifyFlag;
     String          aStylesStr;
     String			aLayoutStr;
     LocalizedString aCalcStr;
@@ -243,7 +243,7 @@ private:
     SvxSearchController*    pSearchSetController;
     SvxSearchController*    pReplaceSetController;
 
-    mutable INT32			nTransliterationFlags;
+    mutable sal_Int32			nTransliterationFlags;
 
 #ifdef _SVX_SRCHDLG_CXX
     DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit );
@@ -263,31 +263,31 @@ private:
     void            Init_Impl( int bHasItemSet );
     void            InitAttrList_Impl( const SfxItemSet* pSSet,
                                        const SfxItemSet* pRSet );
-    void            Remember_Impl( const String &rStr,BOOL bSearch );
+    void            Remember_Impl( const String &rStr,sal_Bool bSearch );
     void            PaintAttrText_Impl();
-    String&         BuildAttrText_Impl( String& rStr, BOOL bSrchFlag ) const;
+    String&         BuildAttrText_Impl( String& rStr, sal_Bool bSrchFlag ) const;
 
     void            TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool );
-    void            EnableControls_Impl( const USHORT nFlags );
+    void            EnableControls_Impl( const sal_uInt16 nFlags );
     void            EnableControl_Impl( Control* pCtrl );
     void            SetItem_Impl( const SvxSearchItem* pItem );
 
     void			SetModifyFlag_Impl( const Control* pCtrl );
     void			SaveToModule_Impl();
 
-    void			ApplyTransliterationFlags_Impl( INT32 nSettings );
+    void			ApplyTransliterationFlags_Impl( sal_Int32 nSettings );
 #endif
 };
 
 #include <sfx2/layout-post.hxx>
 
-inline BOOL SvxSearchDialog::HasSearchAttributes() const
+inline sal_Bool SvxSearchDialog::HasSearchAttributes() const
 {
     int bLen = aSearchAttrText.GetText().Len();
     return ( aSearchAttrText.IsEnabled() && bLen );
 }
 
-inline BOOL SvxSearchDialog::HasReplaceAttributes() const
+inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const
 {
     int bLen = aReplaceAttrText.GetText().Len();
     return ( aReplaceAttrText.IsEnabled() && bLen );
diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx
index 5b6faca80c..5b6faca80c 100644..100755
--- a/svx/inc/svx/stddlg.hxx
+++ b/svx/inc/svx/stddlg.hxx
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx
index 6b5eb42c6d..6b5eb42c6d 100644..100755
--- a/svx/inc/svx/strarray.hxx
+++ b/svx/inc/svx/strarray.hxx
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx
index eb041e478a..b089519ad0 100644..100755
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/svx/inc/svx/subtoolboxcontrol.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxSubToolBoxControl();
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx
index a10d84a463..a10d84a463 100644..100755
--- a/svx/inc/svx/svdattr.hxx
+++ b/svx/inc/svx/svdattr.hxx
diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx
index 188824c381..188824c381 100644..100755
--- a/svx/inc/svx/svdattrx.hxx
+++ b/svx/inc/svx/svdattrx.hxx
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index fac8f2ab78..f60cb602e1 100644..100755
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -72,10 +72,10 @@ protected:
 
     Pointer						aAktCreatePointer;
 
-    INT32						nAutoCloseDistPix;
-    INT32						nFreeHandMinDistPix;
-    UINT32						nAktInvent;     // Aktuell eingestelltes
-    UINT16						nAktIdent;      // Obj fuer Neuerzeugung
+    sal_Int32						nAutoCloseDistPix;
+    sal_Int32						nFreeHandMinDistPix;
+    sal_uInt32						nAktInvent;     // Aktuell eingestelltes
+    sal_uInt16						nAktIdent;      // Obj fuer Neuerzeugung
 
     unsigned					bAutoTextEdit : 1; // Textedit nach dem erzeugen eines Textrahmens starten
     unsigned					b1stPointAsCenter : 1;
@@ -93,9 +93,9 @@ protected:
     sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
         sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
 
-    void ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
-    void HideCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
-    BOOL CheckEdgeMode();
+    void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+    void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+    sal_Bool CheckEdgeMode();
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -103,14 +103,14 @@ protected:
     virtual ~SdrCreateView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
     virtual void BrkAction();
     virtual void TakeActionRect(Rectangle& rRect) const;
 
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     void SetActiveLayer(const String& rName) { aAktLayer=rName; }
     const String& GetActiveLayer() const { return aAktLayer; }
@@ -120,70 +120,70 @@ public:
     // Ist der MeasureLayer nicht gesetzt (Leerstring), so
     // wird der ActiveLayer auch fuer Bemassung verwendet.
     void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
-    void SetEditMode(BOOL bOn=TRUE) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
-    void SetCreateMode(BOOL bOn=TRUE) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
-    void SetGluePointEditMode(BOOL bOn=TRUE) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
+    void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
+    void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
+    void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
 
     // Feststellen, ob Textwerkzeug aktiviert
-    BOOL IsTextTool() const;
+    sal_Bool IsTextTool() const;
 
     // Feststellen, ob Objektverbinderwerkzeug aktiviert
-    BOOL IsEdgeTool() const;
+    sal_Bool IsEdgeTool() const;
 
     // Feststellen, ob Bemassungswerkzeug aktiviert
-    BOOL IsMeasureTool() const;
+    sal_Bool IsMeasureTool() const;
 
-    void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor);
-    void TakeCurrentObj(UINT16& nIdent, UINT32& nInvent) const  { nInvent=nAktInvent; nIdent=nAktIdent; }
-    UINT32 GetCurrentObjInventor() const { return nAktInvent; }
-    UINT16 GetCurrentObjIdentifier() const { return nAktIdent; }
+    void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor);
+    void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const  { nInvent=nAktInvent; nIdent=nAktIdent; }
+    sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; }
+    sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
 
     // Starten des normalen Create
-    BOOL BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+    sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
     sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
     void MovCreateObj(const Point& rPnt);
-    BOOL EndCreateObj(SdrCreateCmd eCmd);
+    sal_Bool EndCreateObj(SdrCreateCmd eCmd);
     void BckCreateObj();  // z.B. wieder 1 Polygonpunkt zurueck.
     void BrkCreateObj();
-    BOOL IsCreateObj() const { return pAktCreate!=NULL; }
+    sal_Bool IsCreateObj() const { return pAktCreate!=NULL; }
     SdrObject* GetCreateObj() const { return pAktCreate; }
 
     // BegCreateCaptionObj() erzeugt ein SdrCaptionObj (Legendenobjekt).
     // rObjSiz ist die anfaengliche Groesse des Legenden-Textrahmens.
     // gedraggd wird lediglich die Laenge des Zipfel.
-    BOOL BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+    sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
 
-    // Wenn TextEditAfterCreate auf TRUE steht (das ist der Default),
+    // Wenn TextEditAfterCreate auf sal_True steht (das ist der Default),
     // dann wird nach dem erzeugen eines Textrahmenobjekts (OBJ_TEXT,
     // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
     // automatisch ein TextEdit (SdrObjEditView::SdrBeginTextEdit) gestartet.
-    BOOL IsTextEditAfterCreate() const { return bAutoTextEdit; }
-    void SetTextEditAfterCreate(BOOL bOn) { bAutoTextEdit = bOn; }
+    sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
+    void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
 
     // Erzeugen eines Kreises/Rechtecks/Textrahmens wobei der 1. Punkt
     // nicht die linke obere Ecke, sondern das Zentrum des Objekts vorgibt.
     // Persistentes Flag. Default=FALSE.
-    BOOL IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
-    void SetCreate1stPointAsCenter(BOOL bOn) { b1stPointAsCenter = bOn; }
+    sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
+    void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; }
 
     // Fuer Polylines (OBJ_PLIN) und Freihandlinien (OBJ_FREELINE). Ist dieses
-    // Flag TRUE, werden diese beiden Objekttypen implizit geschlossen und in
+    // Flag sal_True, werden diese beiden Objekttypen implizit geschlossen und in
     // Polygon (OBJ_POLY) bzw. Freihandflaeche (OBJ_FREEFILL) gewandelt falls
     // zum Ende des Create die Distanz zwischen Startpunkt und Endpunkt des
     // Objekts <=n Pixel ist, wobei SetAutoCloseDistPix vorgegeben wird.
     // Default=TRUE.
-    BOOL IsAutoClosePolys() const { return bAutoClosePolys; }
-    void SetAutoClosePolys(BOOL bOn) { bAutoClosePolys=bOn; }
+    sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
+    void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
 
     // Default=5 Pixel.
-    USHORT GetAutoCloseDistPix() const { return USHORT(nAutoCloseDistPix); }
-    void SetAutoCloseDistPix(USHORT nVal) { nAutoCloseDistPix=nVal; }
+    sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
+    void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; }
 
     // Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der
     // Erzeugung einer Freihandlinie.
     // Default=10 Pixel.
-    USHORT GetFreeHandMinDistPix() const { return USHORT(nFreeHandMinDistPix); }
-    void SetFreeHandMinDistPix(USHORT nVal) { nFreeHandMinDistPix=nVal; }
+    sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); }
+    void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; }
 
     // Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible
     // Create-Interface am PathObj beibehalten moechte muss das nachfolgende
@@ -191,19 +191,19 @@ public:
     //     OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL
     // Dieses Flag hat nur voruebergehenden Character. Die betroffenen
     // Applikationen sollten alsbald umgestellt werden.
-    // Default=FALSE;
-    BOOL IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
-    void SetUseIncompatiblePathCreateInterface(BOOL bOn) { bUseIncompatiblePathCreateInterface = bOn; }
+    // Default=sal_False;
+    sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
+    void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
     void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
     void HideConnectMarker();
 
     // Attribute des ggf. gerade in der Erzeugung befindlichen Objekts
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 };
 
 #endif //_SVDCRTV_HXX
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index 08902c1980..da812645be 100644..100755
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -96,7 +96,7 @@
 #define SDRATTR_MISC_FIRST              (SDRATTR_CAPTION_LAST + 1)  /* 1097   */ /* 1097   */ /* 1080   */ /* Pool V1: 1053 */
 #define SDRATTR_ECKENRADIUS             (SDRATTR_MISC_FIRST + 0)   /*   1097 */ /*   1097 */ /*   1080 long, def=0       */
 #define SDRATTR_TEXT_MINFRAMEHEIGHT     (SDRATTR_MISC_FIRST + 1)   /*   1098 */ /*   1098 */ /*   1081 long, def=0       */
-#define SDRATTR_TEXT_AUTOGROWHEIGHT     (SDRATTR_MISC_FIRST + 2)   /*   1099 */ /*   1099 */ /*   1082 BOOL, def=TRUE    */
+#define SDRATTR_TEXT_AUTOGROWHEIGHT     (SDRATTR_MISC_FIRST + 2)   /*   1099 */ /*   1099 */ /*   1082 sal_Bool, def=sal_True    */
 #define SDRATTR_TEXT_FITTOSIZE          (SDRATTR_MISC_FIRST + 3)   /*   1100 */ /*   1100 */ /*   1083 enum, def=SDRTEXTFIT_NONE */
 #define SDRATTR_TEXT_LEFTDIST           (SDRATTR_MISC_FIRST + 4)   /*   1101 */ /*   1101 */ /*   1084 long, def=0 */ /* Pool V2 */
 #define SDRATTR_TEXT_RIGHTDIST          (SDRATTR_MISC_FIRST + 5)   /*   1102 */ /*   1102 */ /*   1085 long, def=0 */ /* Pool V2 */
@@ -106,15 +106,15 @@
 #define SDRATTR_TEXT_MAXFRAMEHEIGHT     (SDRATTR_MISC_FIRST + 9)   /*   1106 */ /*   1106 */ /*   1089 long, def=0     - Pool V2 */
 #define SDRATTR_TEXT_MINFRAMEWIDTH      (SDRATTR_MISC_FIRST +10)   /*   1107 */ /*   1107 */ /*   1090 long, def=0     - Pool V2 */
 #define SDRATTR_TEXT_MAXFRAMEWIDTH      (SDRATTR_MISC_FIRST +11)   /*   1108 */ /*   1108 */ /*   1091 long, def=0     - Pool V2 */
-#define SDRATTR_TEXT_AUTOGROWWIDTH      (SDRATTR_MISC_FIRST +12)   /*   1109 */ /*   1109 */ /*   1092 BOOL, def=FALSE - Pool V2 */
+#define SDRATTR_TEXT_AUTOGROWWIDTH      (SDRATTR_MISC_FIRST +12)   /*   1109 */ /*   1109 */ /*   1092 sal_Bool, def=sal_False - Pool V2 */
 #define SDRATTR_TEXT_HORZADJUST         (SDRATTR_MISC_FIRST +13)   /*   1110 */ /*   1110 */ /*   1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */
 #define SDRATTR_TEXT_ANIKIND            (SDRATTR_MISC_FIRST +14)   /*   1111 */ /*   1111 */ /*   1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */
 #define SDRATTR_TEXT_ANIDIRECTION       (SDRATTR_MISC_FIRST +15)   /*   1112 */ /*   1112 */ /*   1095 enum, def=SDRTEXTANI_LEFT - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTARTINSIDE     (SDRATTR_MISC_FIRST +16)   /*   1113 */ /*   1113 */ /*   1096 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTOPINSIDE      (SDRATTR_MISC_FIRST +17)   /*   1114 */ /*   1114 */ /*   1097 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANICOUNT           (SDRATTR_MISC_FIRST +18)   /*   1115 */ /*   1115 */ /*   1098 USHORT, def=0   - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIDELAY           (SDRATTR_MISC_FIRST +19)   /*   1116 */ /*   1116 */ /*   1099 USHORT, def=0   - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIAMOUNT          (SDRATTR_MISC_FIRST +20)   /*   1117 */ /*   1117 */ /*   1100 USHORT, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTARTINSIDE     (SDRATTR_MISC_FIRST +16)   /*   1113 */ /*   1113 */ /*   1096 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTOPINSIDE      (SDRATTR_MISC_FIRST +17)   /*   1114 */ /*   1114 */ /*   1097 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANICOUNT           (SDRATTR_MISC_FIRST +18)   /*   1115 */ /*   1115 */ /*   1098 sal_uInt16, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIDELAY           (SDRATTR_MISC_FIRST +19)   /*   1116 */ /*   1116 */ /*   1099 sal_uInt16, def=0   - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIAMOUNT          (SDRATTR_MISC_FIRST +20)   /*   1117 */ /*   1117 */ /*   1100 sal_uInt16, def=0   - Pool V2/V4 */
 #define SDRATTR_TEXT_CONTOURFRAME       (SDRATTR_MISC_FIRST +21)   /*   1118 */ /*   1118 */ /*   1101 */             /* Pool V2 */
 #define SDRATTR_CUSTOMSHAPE_ADJUSTMENT	(SDRATTR_MISC_FIRST +22)   /*   1119 */ /*   1119 */ /*   1102 */             /* Pool V2 */
 #define SDRATTR_XMLATTRIBUTES           (SDRATTR_MISC_FIRST +23)   /*   1120 */ /*   1120 */ /*   1103 */             /* Pool V2 */
@@ -169,10 +169,10 @@
 
 // Nur fuer Interfaceing, not implemented yet.                     /*  V4+   */
 #define SDRATTR_NOTPERSIST_FIRST    (SDRATTR_CIRC_LAST + 1)          /* 1180   */ /* 1172   */ /* 1127   */ /* 1110   */ /* Pool V1: 1058 */
-#define SDRATTR_OBJMOVEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 0)  /*   1180  BOOL,   def=FALSE */
-#define SDRATTR_OBJSIZEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 1)  /*   1181  BOOL,   def=FALSE */
-#define SDRATTR_OBJPRINTABLE        (SDRATTR_NOTPERSIST_FIRST+ 2)  /*   1182  BOOL,   def=TRUE  */
-#define SDRATTR_LAYERID             (SDRATTR_NOTPERSIST_FIRST+ 3)  /*   1183  USHORT, def=0     */
+#define SDRATTR_OBJMOVEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 0)  /*   1180  sal_Bool,   def=sal_False */
+#define SDRATTR_OBJSIZEPROTECT      (SDRATTR_NOTPERSIST_FIRST+ 1)  /*   1181  sal_Bool,   def=sal_False */
+#define SDRATTR_OBJPRINTABLE        (SDRATTR_NOTPERSIST_FIRST+ 2)  /*   1182  sal_Bool,   def=sal_True  */
+#define SDRATTR_LAYERID             (SDRATTR_NOTPERSIST_FIRST+ 3)  /*   1183  sal_uInt16, def=0     */
 #define SDRATTR_LAYERNAME           (SDRATTR_NOTPERSIST_FIRST+ 4)  /*   1184  String, def=""    */
 #define SDRATTR_OBJECTNAME          (SDRATTR_NOTPERSIST_FIRST+ 5)  /*   1185  String, def=""    */
 #define SDRATTR_ALLPOSITIONX        (SDRATTR_NOTPERSIST_FIRST+ 6)  /*   1186  long,   def=0     */
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index c2d4248a6e..5fad1dd2a9 100644..100755
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -85,7 +85,7 @@ protected:
     void*     aReservePtr4;
 
     bool      bShown;    // Xor sichrbar?
-    USHORT    nMinMov;   // Soviel muss erstmal minimal bewegt werden
+    sal_uInt16    nMinMov;   // Soviel muss erstmal minimal bewegt werden
     bool      bMinMoved; // MinMove durchbrochen?
 
     bool      bHorFixed; // nur Vertikal draggen
@@ -99,19 +99,19 @@ protected:
 
 protected:
     void Clear(bool bLeaveOne);
-    Point& Pnt(ULONG nNum)                           { return *((Point*)aPnts.GetObject(nNum)); }
+    Point& Pnt(sal_uIntPtr nNum)                           { return *((Point*)aPnts.GetObject(nNum)); }
 //public:
     SdrDragStatUserData*    pUser;     // Userdata
 public:
     SdrDragStat(): aPnts(1024,16,16)                 { pUser=NULL; Reset(); }
-    ~SdrDragStat()                                   { Clear(FALSE); }
+    ~SdrDragStat()                                   { Clear(sal_False); }
     void         Reset();
     SdrView*     GetView() const                     { return pView; }
     void         SetView(SdrView* pV)                { pView=pV; }
     SdrPageView* GetPageView() const                 { return pPageView; }
     void         SetPageView(SdrPageView* pPV)       { pPageView=pPV; }
-    const Point& GetPoint(ULONG nNum) const          { return *((Point*)aPnts.GetObject(nNum)); }
-    ULONG        GetPointAnz() const                 { return aPnts.Count(); }
+    const Point& GetPoint(sal_uIntPtr nNum) const          { return *((Point*)aPnts.GetObject(nNum)); }
+    sal_uIntPtr        GetPointAnz() const                 { return aPnts.Count(); }
     const Point& GetStart() const                    { return GetPoint(0); }
     Point&       Start()                             { return Pnt(0); }
     const Point& GetPrev() const                     { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
@@ -134,10 +134,10 @@ public:
     void         SetShown(bool bOn)                  { bShown=bOn; }
 
     bool         IsMinMoved() const                  { return bMinMoved; }
-    void         SetMinMoved()                       { bMinMoved=TRUE; }
-    void         ResetMinMoved()                     { bMinMoved=FALSE; }
-    void         SetMinMove(USHORT nDist)            { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
-    USHORT       GetMinMove() const                  { return nMinMov; }
+    void         SetMinMoved()                       { bMinMoved=sal_True; }
+    void         ResetMinMoved()                     { bMinMoved=sal_False; }
+    void         SetMinMove(sal_uInt16 nDist)            { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
+    sal_uInt16       GetMinMove() const                  { return nMinMov; }
 
     bool         IsHorFixed() const                  { return bHorFixed; }
     void         SetHorFixed(bool bOn)               { bHorFixed=bOn; }
@@ -171,7 +171,7 @@ public:
     Point KorregPos(const Point& rNow, const Point& rPrev) const;
     void  Reset(const Point& rPnt);
     void  NextMove(const Point& rPnt);
-    void  NextPoint(bool bSaveReal=FALSE);
+    void  NextPoint(bool bSaveReal=sal_False);
     void  PrevPoint();
     bool CheckMinMoved(const Point& rPnt);
     long  GetDX() const                     { return GetNow().X()-GetPrev().X(); }
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index 2e5f7ffaf6..2e5f7ffaf6 100644..100755
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/svx/inc/svx/svddrgmt.hxx
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index 9b0accba03..91722c302f 100644..100755
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -68,10 +68,10 @@ protected:
     SdrMarkList					aFollowingEdges; // Wenn Knoten gedraggd werden, sollen alle Kanten als Xor folgen
     SdrHdlKind					eDragHdl;
 
-    ULONG						nDragXorPolyLimit;
-    ULONG						nDragXorPointLimit;
-    USHORT						nRubberEdgeDraggingLimit;
-    USHORT						nDetailedEdgeDraggingLimit;
+    sal_uIntPtr						nDragXorPolyLimit;
+    sal_uIntPtr						nDragXorPointLimit;
+    sal_uInt16						nRubberEdgeDraggingLimit;
+    sal_uInt16						nDetailedEdgeDraggingLimit;
 
     unsigned					bFramDrag : 1;        // z.Zt. FrameDrag
     unsigned					bDragSpecial : 1;     // z.Zt. Special Obj-Dragging
@@ -111,7 +111,7 @@ protected:
     virtual ~SdrDragView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -125,72 +125,72 @@ public:
     // In der Regel ist das die linke obere Ecke des zu erwartenden neuen
     // SnapRects. Ausnahme: CaptionObj. Dort ist es die Position des
     // "Schwanzendes".
-    // Bei Returncode FALSE konnte ich die Position nicht bestimmen
+    // Bei Returncode sal_False konnte ich die Position nicht bestimmen
     // (z.B. Punktverschiebung, Mehrfachselektion, Schieben der
     // Spiegelschse, ...)
-    BOOL TakeDragObjAnchorPos(Point& rPos, BOOL bTopRight = FALSE ) const;
+    sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const;
 
     // Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese
     // Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und
     // wird zum Ende des Draggings destruiert.
-    virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
+    virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
     void MovDragObj(const Point& rPnt);
-    BOOL EndDragObj(BOOL bCopy=FALSE);
+    sal_Bool EndDragObj(sal_Bool bCopy=sal_False);
     void BrkDragObj();
-    BOOL IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
+    sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
     SdrHdl* GetDragHdl() const { return pDragHdl; }
     SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
-    BOOL IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
-    BOOL IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
+    sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
+    sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
 
     // Wer das beim BegDrag oder mittendrin schon festlegen will.
-    // (Wird bei jedem BegDrag auf FALSE zurueckgesetzt, also nach
+    // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach
     // BegDrag setzen.)
-    void SetDragWithCopy(BOOL bOn) { bDragWithCopy = bOn; }
-    BOOL IsDragWithCopy() const { return bDragWithCopy; }
+    void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; }
+    sal_Bool IsDragWithCopy() const { return bDragWithCopy; }
 
-    void SetInsertGluePoint(BOOL bOn) { bInsGluePoint = bOn; }
-    BOOL IsInsertGluePoint() const { return bInsGluePoint; }
+    void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; }
+    sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
 
     // Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
-    BOOL IsInsObjPointPossible() const;
-    BOOL IsInsPointPossible() const { return IsInsObjPointPossible(); }
+    sal_Bool IsInsObjPointPossible() const;
+    sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); }
     sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
     void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
-    BOOL EndInsObjPoint(SdrCreateCmd eCmd);
+    sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
     void BrkInsObjPoint() { BrkDragObj(); }
-    BOOL IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+    sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
 
     // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
     // spaeter vielleicht einen passenden Pointer dafuer liefern
-    void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; }
-    BOOL IsInsObjPointMode() const { return bInsObjPointMode; }
+    void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; }
+    sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; }
 
-    BOOL IsInsGluePointPossible() const;
-    BOOL BegInsGluePoint(const Point& rPnt);
+    sal_Bool IsInsGluePointPossible() const;
+    sal_Bool BegInsGluePoint(const Point& rPnt);
     void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
-    BOOL EndInsGluePoint() { return EndDragObj(); }
+    sal_Bool EndInsGluePoint() { return EndDragObj(); }
     void BrkInsGluePoint() { BrkDragObj(); }
-    BOOL IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
+    sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
 
     // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
     // spaeter vielleicht einen passenden Pointer dafuer liefern
-    void SetInsGluePointMode(BOOL bOn) { bInsGluePointMode = bOn; }
-    BOOL IsInsGluePointMode() const { return bInsGluePointMode; }
+    void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; }
+    sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; }
 
     // Begrenzungslinien ueber's gesamte Win waehrend des Draggens
     // Persistent. Default=FALSE.
-    void SetDragStripes(BOOL bOn);
-    BOOL IsDragStripes() const { return bDragStripes; }
+    void SetDragStripes(sal_Bool bOn);
+    sal_Bool IsDragStripes() const { return bDragStripes; }
 
     // Handles waehrend des Draggens verstecken
-    //HMHvoid SetDragHdlHide(BOOL bOn);
+    //HMHvoid SetDragHdlHide(sal_Bool bOn);
     //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
 
     // Beim Draggen von Polygonpunkten und Klebepunkten
     // die Maus verstecken. Default=FALSE
-    void SetMouseHideWhileDraggingPoints(BOOL bOn) { bMouseHideWhileDraggingPoints = bOn; }
-    BOOL IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
+    void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
+    sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
 
     // Beim Draggen werden i.d.R. die Konturen der markierten Objekte
     // als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt,
@@ -199,22 +199,22 @@ public:
     // hat diese Einstellung keine Auswirkung.
     // Auch waerend des Draggens umschaltbar.
     // Default=Off
-    void SetNoDragXorPolys(BOOL bOn);
-    BOOL IsNoDragXorPolys() const { return bNoDragXorPolys; }
+    void SetNoDragXorPolys(sal_Bool bOn);
+    sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
 
     // Uebersteigt die Anzahl der markierten Objekte den hier eingestellten
     // Wert, wird implizit (temporaer) auf NoDragPolys geschaltet.
     // PolyPolygone etc werden entsprechend als mehrere Objekte gewertet.
     // Default=100
-    void  SetDragXorPolyLimit(ULONG nObjAnz) { nDragXorPolyLimit=nObjAnz; }
-    ULONG GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
+    void  SetDragXorPolyLimit(sal_uIntPtr nObjAnz) { nDragXorPolyLimit=nObjAnz; }
+    sal_uIntPtr GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
 
     // Wie DragXorPolyLimit, jedoch bezogen auf die Gesamtpunktanzahl
     // aller Polygone. Default=500.
     // Auf NoDragPolys wird (temporaer) geschaltet, wenn eins der Limits
     // ueberstiegen wird.
-    void  SetDragXorPointLimit(ULONG nPntAnz) { nDragXorPointLimit=nPntAnz; }
-    ULONG GetDragXorPointLimit() const { return nDragXorPointLimit; }
+    void  SetDragXorPointLimit(sal_uIntPtr nPntAnz) { nDragXorPointLimit=nPntAnz; }
+    sal_uIntPtr GetDragXorPointLimit() const { return nDragXorPointLimit; }
 
     void SetSolidDragging(bool bOn);
     bool IsSolidDragging() const;
@@ -222,14 +222,14 @@ public:
     // Dragging/Creating von Verbindern:
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Verbinder an Objektscheitelpunkte ankleben
-    // Default=TRUE=Ja
-    void SetAutoVertexConnectors(BOOL bOn) { bAutoVertexCon = bOn; }
-    BOOL IsAutoVertexConnectors() const { return bAutoVertexCon; }
+    // Default=sal_True=Ja
+    void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; }
+    sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
 
     // Verbinder an Objektecken ankleben
-    // Default=FALSE=Nein
-    void SetAutoCornerConnectors(BOOL bOn) { bAutoCornerCon = bOn; }
-    BOOL IsAutoCornerConnectors() const { return bAutoCornerCon; }
+    // Default=sal_False=Nein
+    void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; }
+    sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
 
     // Dragging von verbundenen Objekten (Nodes):
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -238,22 +238,22 @@ public:
     // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar.
     // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich.
     // Defaultwert ist 10
-    void SetDetailedEdgeDragging(BOOL bOn); // Default an
-    BOOL IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
+    void SetDetailedEdgeDragging(sal_Bool bOn); // Default an
+    sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
 
-    void SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz);
-    USHORT GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
+    void SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+    sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
 
     // EdgeDraggingLimit: Sind mehr als nEdgeObjAnz Kanten betroffen, werden
     // diese beim interaktiven Draggen nicht mit angezeigt.
     // Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen
     // als die kompletten Neuberechnungen beim DetailedEdgeDragging.
     // Defaultwert ist 100
-    void SetRubberEdgeDragging(BOOL bOn);  // Default an
-    BOOL IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
+    void SetRubberEdgeDragging(sal_Bool bOn);  // Default an
+    sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
 
-    void SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz);
-    USHORT GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
+    void SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+    sal_uInt16 GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
 
     // Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen):
     // - Sind bis max 10 Verbinder betroffen werden diese bei jedem
@@ -265,29 +265,29 @@ public:
 
     // Ist ein spezieller Dragmode eingeschaltet, wie Rotate, Mirror oder Crook,
     // dann leitet ein Hit auf das markierte Objekt genau dieses Dragging ein.
-    // Setzt man MarkedHitMovesAlways auf TRUE, so leitet ein Hit auf das
+    // Setzt man MarkedHitMovesAlways auf sal_True, so leitet ein Hit auf das
     // markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode.
     // Dieses Flag ist persistent und sollte von der App fuer den Anwender
     // konfigurierbar sein!
-    void SetMarkedHitMovesAlways(BOOL bOn) { bMarkedHitMovesAlways = bOn; }
-    BOOL IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
+    void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; }
+    sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
 
     // Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte
     // als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE.
-    void SetMirrRefDragObj(BOOL bOn) { bMirrRefDragObj = bOn; }
-    BOOL IsMirrRefDragObj() const { return bMirrRefDragObj; }
+    void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; }
+    sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
 
-    BOOL IsOrthoDesired() const;
+    sal_Bool IsOrthoDesired() const;
 
     // Beim Resize die Mitte als Referenz
     // Default=FALSE.
-    BOOL IsResizeAtCenter() const { return bResizeAtCenter; }
-    void SetResizeAtCenter(BOOL bOn) { bResizeAtCenter = bOn; }
+    sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; }
+    void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; }
 
     // Symmetrisches Crook
     // Default=FALSE.
-    BOOL IsCrookAtCenter() const { return bCrookAtCenter; }
-    void SetCrookAtCenter(BOOL bOn) { bCrookAtCenter = bOn; }
+    sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; }
+    void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; }
 
     // Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die
     // View, nicht auf die einzelnen PageViews. Von der View wird diese
@@ -306,7 +306,7 @@ public:
 
     // Das DragLimit ist bezogen auf die Page des Objekts.
     // (Oder auf die View??? Muss ich mal^^^^recherchieren. Joe.)
-    // FALSE=Kein Limit.
+    // sal_False=Kein Limit.
     // Das Rueckgabe-Rect muss absolute Koordinaten enthalten. Der Maximale
     // Dragbereich wird von der View dann so gewaehlt, dass das SnapRect des
     // Objekts bis Maximal auf die Kante des LimitRects gemoved bzw. gesized
@@ -315,7 +315,7 @@ public:
     // Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal
     // ueberschritten werden koennte...
     // Implementiert fuer Move und Resize.
-    virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+    virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
 };
 
 #endif //_SVDDRGV_HXX
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 6314eced08..9488d6dfab 100644..100755
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -150,12 +150,12 @@ protected:
     void ImpBroadcastEdgesOfMarkedNodes();
 
     // Konvertierung der markierten Objekte in Poly bzw. Bezier.
-    void ImpConvertTo(BOOL bPath, BOOL bLineToArea);
+    void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea);
 
     // Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und
     // fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein
     // MarkEntry noch ein ModelChgBroadcast generiert.
-    SdrObject* ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea);
+    SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea);
 
     // Setzen der beiden Flags bToTopPossible und bToBtmPossible.
     // bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig
@@ -178,11 +178,11 @@ protected:
     // fuer DismantleMarkedObjects
     sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const;
     sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const;
-    void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines);
+    void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines);
     void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
-        BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect);
-    void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion);
-    BOOL ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
+        sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect);
+    void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion);
+    sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
     void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
 
     // Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo.
@@ -209,7 +209,6 @@ public:
     // verwendet. NotifyNewUndoAction() wird in diesem Fall erst beim letzten
     // EndUndo() gerufen. NotifyNewUndoAction() wird nicht gerufen bei einer
     // leeren Klammerung.
-#ifndef WIN
     void BegUndo()                       { pMod->BegUndo();         } // Undo-Klammerung auf
     void BegUndo(const String& rComment) { pMod->BegUndo(rComment); } // Undo-Klammerung auf
     void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // Undo-Klammerung auf
@@ -219,28 +218,17 @@ public:
     // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
     void SetUndoComment(const String& rComment) { pMod->SetUndoComment(rComment); }
     void SetUndoComment(const String& rComment, const String& rObjDescr) { pMod->SetUndoComment(rComment,rObjDescr); }
-#else  // ifndef WIN
-    void BegUndo();
-    void BegUndo(const String& rComment);
-    void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE);
-    void BegUndo(SdrUndoGroup* pUndoGrp);
-    void EndUndo();                                                   // Undo-Klammerung zu (inkl BroadcastEdges)
-    void AddUndo(SdrUndoAction* pUndo);
-    // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
-    void SetUndoComment(const String& rComment);
-    void SetUndoComment(const String& rComment, const String& rObjDescr);
-#endif
     bool IsUndoEnabled() const;
 
     std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO );
     void AddUndoActions( std::vector< SdrUndoAction* >& );
 
     // Layerverwaltung. Mit Undo.
-    SdrLayer* InsertNewLayer(const String& rName, USHORT nPos=0xFFFF);
+    SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
     // Loeschen eines Layer inkl. aller darauf befindlichen Objekte
     void      DeleteLayer(const String& rName);
     // Verschieben eines Layer (Layerreihenfolge aendern)
-    void      MoveLayer(const String& rName, USHORT nNewPos);
+    void      MoveLayer(const String& rName, sal_uInt16 nNewPos);
 
     // Markierte Objekte die ausserhalb ihrer Page liegen
     // werden ggf. einer anderen Page zugewiesen
@@ -248,23 +236,23 @@ public:
     void ForceMarkedObjToAnotherPage();
     void ForceMarkedToAnotherPage()   { ForceMarkedObjToAnotherPage(); }
 
-    BOOL IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
+    sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
 
     // Loeschen aller markierten Objekte
     void DeleteMarkedObj();
-    BOOL IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
+    sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
 
     // Logisch- umschliessendes Rect aller markierten Objekte setzen.
     // Das das wirklich geschieht ist nicht garantiert, denn eine
     // waagerechte Linie hat z.B. immer eine Hoehe von 0.
-    void SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy=FALSE);
+    void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
     void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
     void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
     long GetMarkedObjRotate() const;
     void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
     void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
-    void MirrorMarkedObjHorizontal(BOOL bCopy=FALSE);
-    void MirrorMarkedObjVertical(BOOL bCopy=FALSE);
+    void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False);
+    void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False);
     long GetMarkedObjShear() const;
     void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
     void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
@@ -272,28 +260,28 @@ public:
 
     // Markierte Objekte kopieren und anstelle der alten markieren
     void CopyMarkedObj();
-    void SetAllMarkedRect(const Rectangle& rRect, BOOL bCopy=FALSE) { SetMarkedObjRect(rRect,bCopy); }
-    void MoveAllMarked(const Size& rSiz, BOOL bCopy=FALSE) { MoveMarkedObj   (rSiz,bCopy); }
-    void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, BOOL bCopy=FALSE) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
+    void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); }
+    void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj   (rSiz,bCopy); }
+    void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
     long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
-    void RotateAllMarked(const Point& rRef, long nWink, BOOL bCopy=FALSE) { RotateMarkedObj(rRef,nWink,bCopy); }
-    void MirrorAllMarked(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
-    void MirrorAllMarkedHorizontal(BOOL bCopy=FALSE) { MirrorMarkedObjHorizontal(bCopy); }
-    void MirrorAllMarkedVertical(BOOL bCopy=FALSE) { MirrorMarkedObjVertical(bCopy); }
+    void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); }
+    void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
+    void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); }
+    void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); }
     long GetAllMarkedShear() const { return GetMarkedObjShear(); }
-    void ShearAllMarked(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
-    void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
+    void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
+    void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
     void CopyMarked() { CopyMarkedObj(); }
-    BOOL IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
-    BOOL IsResizeAllowed(BOOL bProp=FALSE) const;
-    BOOL IsRotateAllowed(BOOL b90Deg=FALSE) const;
-    BOOL IsMirrorAllowed(BOOL b45Deg=FALSE, BOOL b90Deg=FALSE) const;
-    BOOL IsTransparenceAllowed() const;
-    BOOL IsGradientAllowed() const;
-    BOOL IsShearAllowed() const;
-    BOOL IsEdgeRadiusAllowed() const;
-    BOOL IsCrookAllowed(BOOL bNoContortion=FALSE) const;
-    BOOL IsDistortAllowed(BOOL bNoContortion=FALSE) const;
+    sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
+    sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const;
+    sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const;
+    sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const;
+    sal_Bool IsTransparenceAllowed() const;
+    sal_Bool IsGradientAllowed() const;
+    sal_Bool IsShearAllowed() const;
+    sal_Bool IsEdgeRadiusAllowed() const;
+    sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const;
+    sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const;
 
     // Vereinigen mehrerer Objekte zu einem PolyPolygon:
     // - Rechtecke/Kreise/Text... werden implizit gewandelt.
@@ -319,9 +307,9 @@ public:
     // Memberobjekten um PathObjs handelt.
     // bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw.
     //                  Beziersegmente zerlegt
-    void DismantleMarkedObjects(BOOL bMakeLines=FALSE);
-    BOOL IsCombinePossible(BOOL bNoPolyPoly=FALSE) const;
-    BOOL IsDismantlePossible(BOOL bMakeLines=FALSE) const;
+    void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False);
+    sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const;
+    sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const;
 
     // Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert
     // anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt
@@ -330,7 +318,7 @@ public:
     // wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall
     // returniert die Methode mit FALSE.
     // Die Methode generiert u.a. auch eine Undo-Action.
-    BOOL InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
+    sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
 
     // Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert
     // anschliessend mir, *pOldObj wandert ins Undo.
@@ -340,13 +328,13 @@ public:
     // ReplaceObject(...);
     // ...
     // EndUndo();
-    void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark=TRUE);
+    void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True);
 
-    void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
-    void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
-    void MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
-    SfxItemSet GetAttrFromMarked(BOOL bOnlyHardAttr) const;
-    void SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
+    void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+    void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+    void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+    SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const;
+    void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
 
     // Geometrische Attribute (Position, Groesse, Drehwinkel)
     // Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt.
@@ -361,14 +349,14 @@ public:
     SfxStyleSheet* GetStyleSheetFromMarked() const;
 
     // z.Zt. noch ohne Undo :(
-    void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     // Alle markierten Objekte zu einer Gruppe zusammenfassen.
     // Anschliessend wird die neue Gruppe markiert. Bei einer
@@ -386,25 +374,25 @@ public:
     // zusaetzlich markiert.
     void UnGroupMarked();
 
-    BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
-    BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
-    BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
+    sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
+    sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
+    sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
 
-    // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die BOOL-
-    // Funktionen returnen TRUE, wenn wenigstens eins der markierten
+    // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool-
+    // Funktionen returnen sal_True, wenn wenigstens eins der markierten
     // Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten
     // werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX.
-    BOOL IsConvertToPathObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
-    BOOL IsConvertToPolyObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
-    BOOL IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
-    void ConvertMarkedToPathObj(BOOL bLineToArea);
-    void ConvertMarkedToPolyObj(BOOL bLineToArea);
+    sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
+    sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
+    sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
+    void ConvertMarkedToPathObj(sal_Bool bLineToArea);
+    void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
 
     // Alle markierten Objekte untereinander ausrichten. Normalerweise werden
-    // das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen
+    // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen
     // die BoundRects ausgerichtet.
-    void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects=FALSE);
-    BOOL IsAlignPossible() const;
+    void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False);
+    sal_Bool IsAlignPossible() const;
 
     // Markierte Objekte etwas nach "oben" holen
     void MovMarkedToTop();
@@ -432,12 +420,12 @@ public:
     // Feststellen, ob nach vorn/hinten stellen moeglich ist
     // GetMaxToTop/BtmObj() wird von diesen Methoden nur begrenzt
     // beruecksichtigt, d.h. es kann vorkommen dass IsToTopPossible()
-    // TRUE liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
+    // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
     // Mehrfachselektion), weil eine von der abgeleiteten View ueber
     // GetMaxToTopObj() auferlegte Restriktion dies verhindert.
-    BOOL IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
-    BOOL IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
-    BOOL IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
+    sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
+    sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
+    sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
 
     // Ueber diese Methoden stellt die View fest, wie weit ein Objekt
     // nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das
@@ -449,21 +437,21 @@ public:
     // Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die
     // Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach
     // jedem SdrObjList::SetObjectOrdNum(nOldPos,nNewPos);
-    virtual void ObjOrderChanged(SdrObject* pObj, ULONG nOldPos, ULONG nNewPos);
+    virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos);
 
     // Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj
     // markiert sind und diese in der Lage sind ein StarView-Metafile zu
     // liefern, konvertiert diese Methode das Metafile in Drawingobjekte.
     // Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt.
     void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL);
-    BOOL IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
+    sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
 
     // Wird der Modus VirtualObjectBundling eingeschaltet, werden beim
     // ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren
     // in ihrer Z-Order buendig zusammengehalten (Writer).
-    // Defaulteinstellung ist FALSE=ausgeschaltet.
-    void SetVirtualObjectBundling(BOOL bOn) { bBundleVirtObj=bOn; }
-    BOOL IsVirtualObjectBundling() const { return bBundleVirtObj; }
+    // Defaulteinstellung ist sal_False=ausgeschaltet.
+    void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; }
+    sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
 
     // von der SdrMarkView ueberladen fuer den internen gebrauch
     virtual void MarkListHasChanged();
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 6f66e12829..701ad84f03 100644..100755
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -106,7 +106,7 @@ protected:
     Link						aOldCalcFieldValueLink; // Zum rufen des alten Handlers
     Point						aMacroDownPos;
 
-    USHORT						nMacroTol;
+    sal_uInt16						nMacroTol;
 
     unsigned					bTextEditDontDelete : 1;   // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung)
     unsigned					bTextEditOnlyOneView : 1;  // Nur eine OutlinerView (f. Rechtschreibpruefung)
@@ -126,13 +126,13 @@ protected:
 
     // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen.
     // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein.
-    OutlinerView* ImpMakeOutlinerView(Window* pWin, BOOL bNoPaint, OutlinerView* pGivenView) const;
+    OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const;
     void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect) const;
     void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
 
-    // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn
+    // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn
     // kein Text vorhanden ist.
-    BOOL ImpIsTextEditAllSelected() const;
+    sal_Bool ImpIsTextEditAllSelected() const;
     void ImpMakeTextCursorAreaVisible();
 
     // Handler fuer AutoGrowing Text bei aktivem Outliner
@@ -152,7 +152,7 @@ protected:
 
 public:
     // Actionhandling fuer Macromodus
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BrkAction();
@@ -167,8 +167,8 @@ public:
     //************************************************************************
     // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken
     // editiert werden sollen. Default=TRUE. Persistent.
-    void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; }
-    BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; }
+    void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; }
+    sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
 
     // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View
     // angemeldete Win verwendet.
@@ -179,7 +179,7 @@ public:
     // Ueber den Parameter pEditOutliner kann die Applikation einen eigenen
     // Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert
     // nach Aufruf von SdrBeginTextEdit der SdrObjEditView und wird von dieser
-    // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die
+    // spaeter via delete zerstoert (falls bDontDeleteOutliner=sal_False). Die
     // SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an
     // dieser Instanz und ausserdem auch den StatusEventHdl.
     // Ebenso kann eine spezifische OutlinerView vorgegeben werden.
@@ -195,23 +195,23 @@ public:
     virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
     virtual bool IsTextEdit() const;
 
-    // TRUE=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
+    // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
     // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem
     // der Text ja bekanntlich hor. und vert. zentriert wird.
-    BOOL IsTextEditFrame() const;
+    sal_Bool IsTextEditFrame() const;
 
-    // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb der
+    // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
     // des Objektbereichs oder der OutlinerView liegt.
-    BOOL IsTextEditHit(const Point& rHit, short nTol) const;
+    sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
 
-    // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb des
+    // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des
     // Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames
     // umschliesst.
-    BOOL IsTextEditFrameHit(const Point& rHit) const;
+    sal_Bool IsTextEditFrameHit(const Point& rHit) const;
 
     // Bei aktiver Selektion, also zwischen MouseButtonDown und
     // MouseButtonUp liefert diese Methode immer TRUE.
-    BOOL IsTextEditInSelectionMode() const;
+    sal_Bool IsTextEditInSelectionMode() const;
 
     // Folgende Methode addiert einen passenden Offset zum MouseEvent
     // um diesen an den Outliner weiterzureichen.
@@ -235,24 +235,24 @@ public:
     const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; }
     OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
 
-    virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
-    BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
-    BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
-    BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
+    sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+    sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+    sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
 
     // #97766# make virtual to change implementation e.g. for SdOutlineView
     virtual sal_uInt16 GetScriptType() const;
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     // Intern: Beim Splitteraufziehen neue OutlinerView...
     virtual void AddWindowToPaintView(OutputDevice* pNewWin);
@@ -263,16 +263,16 @@ public:
     //************************************************************************
     // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei
     // SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument
-    // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE).
-    void SetMacroMode(BOOL bOn) { bMacroMode=bOn; }
-    BOOL IsMacroMode() const { return bMacroMode; }
-    BOOL BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
-    BOOL BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
+    // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True).
+    void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; }
+    sal_Bool IsMacroMode() const { return bMacroMode; }
+    sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
+    sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
     void MovMacroObj(const Point& rPnt);
     void BrkMacroObj();
-    BOOL EndMacroObj();
-    BOOL IsMacroObj() const { return pMacroObj!=NULL; }
-    BOOL IsMacroObjDown() const { return bMacroDown; }
+    sal_Bool EndMacroObj();
+    sal_Bool IsMacroObj() const { return pMacroObj!=NULL; }
+    sal_Bool IsMacroObjDown() const { return bMacroDown; }
 
     /** fills the given any with a XTextCursor for the current text selection.
         Leaves the any untouched if there currently is no text selected */
@@ -283,7 +283,7 @@ public:
     rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
 
     /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
-    virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+    virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const;
     
     /** returns a format paint brush set from the current selection */
     virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index d649bd7683..2a8f92ec19 100644..100755
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -40,11 +40,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per
-//   static BOOL CopyData(pData,nLen,nFormat);
+//   static sal_Bool CopyData(pData,nLen,nFormat);
 // bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in
 // dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das
-// Flag SdrModel::SetStreamingSdrModel(TRUE) gesetzt wird.
-// ULONG SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
+// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird.
+// sal_uIntPtr SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
 
 class SdrOutliner;
 class SdrModel;
@@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star { namespace lang {
 // Ist pMod<>NULL, dann wird der MapMode des uebergebenen
 // Models verwendet. Die resultierende Default-Fonthoehe bleibt
 // jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
-SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
 
 // Globale Defaulteinstellungen fuer die DrawingEngine.
 // Diese Einstellungen sollte man direkt beim Applikationsstart
@@ -72,7 +72,7 @@ friend class SdrAttrObj;
     String     aFontName;
     FontFamily eFontFamily;
     Color      aFontColor;
-    ULONG      nFontHeight;
+    sal_uIntPtr      nFontHeight;
     MapUnit    eMapUnit;
     Fraction   aMapFraction;
 
@@ -95,8 +95,8 @@ public:
     // 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen
     // beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss
     // man als Fonthoehe 480 angeben um 24 Point als default zu erhalten.
-    static void       SetFontHeight(ULONG nHeight)         { GetDefaults().nFontHeight=nHeight; }
-    static ULONG      GetFontHeight()                      { return GetDefaults().nFontHeight; }
+    static void       SetFontHeight(sal_uIntPtr nHeight)         { GetDefaults().nFontHeight=nHeight; }
+    static sal_uIntPtr      GetFontHeight()                      { return GetDefaults().nFontHeight; }
     // Der MapMode wird fuer den globalen Outliner benoetigt.
     // Gleichzeitig bekommt auch jedes neu instanziierte SdrModel
     // diesen MapMode default zugewiesen.
@@ -118,26 +118,26 @@ public:
     // Ist pMod<>NULL, dann wird der MapMode des uebergebenen
     // Models verwendet. Die resultierende Default-Fonthoehe bleibt
     // jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
-    friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+    friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
 };
 
 class SfxItemSet;
 // Liefert eine Ersatzdarstellung fuer einen XFillStyle
-// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert.
+// Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert.
 SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
 
 // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array)
 class UShortCont {
     Container aArr;
 public:
-    UShortCont(USHORT nBlock, USHORT nInit, USHORT nResize): aArr(nBlock,nInit,nResize) {}
+    UShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize): aArr(nBlock,nInit,nResize) {}
     void   Clear()                                           { aArr.Clear(); }
-    void   Insert(USHORT nElem, ULONG nPos=CONTAINER_APPEND) { aArr.Insert((void*)ULONG(nElem),nPos); }
-    void   Remove(ULONG nPos)                                { aArr.Remove(nPos); }
-    void   Replace(USHORT nElem, ULONG nPos)                 { aArr.Replace((void*)ULONG(nElem),nPos); }
-    USHORT GetObject(ULONG nPos)                       const { return USHORT(ULONG(aArr.GetObject(nPos))); }
-    ULONG  GetPos(USHORT nElem)                        const { return aArr.GetPos((void*)(ULONG)nElem); }
-    ULONG  GetCount()                                  const { return aArr.Count(); }
+    void   Insert(sal_uInt16 nElem, sal_uIntPtr nPos=CONTAINER_APPEND) { aArr.Insert((void*)sal_uIntPtr(nElem),nPos); }
+    void   Remove(sal_uIntPtr nPos)                                { aArr.Remove(nPos); }
+    void   Replace(sal_uInt16 nElem, sal_uIntPtr nPos)                 { aArr.Replace((void*)sal_uIntPtr(nElem),nPos); }
+    sal_uInt16 GetObject(sal_uIntPtr nPos)                       const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); }
+    sal_uIntPtr  GetPos(sal_uInt16 nElem)                        const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); }
+    sal_uIntPtr  GetCount()                                  const { return aArr.Count(); }
     void   Sort();
 };
 
@@ -148,7 +148,7 @@ private:
     void ImpSubSort(long nL, long nR) const;
 public:
     ContainerSorter(Container& rNewCont): rCont(rNewCont) {}
-    void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const;
+    void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const;
 
     // Compare() has to return:
     //  -1 if *pElem1<*pElem2
@@ -178,24 +178,24 @@ class ImpSdrHdcMerk
     ImpColorMerk* pFarbMerk;
     ImpClipMerk*  pClipMerk;
     Color*		  pLineColorMerk;
-    USHORT        nMode;
+    sal_uInt16        nMode;
 public:
-    ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true);
+    ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true);
     ~ImpSdrHdcMerk();
     void Save(const OutputDevice& rOut);
     bool IsSaved() const                 { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
-    void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const;
+    void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen
-// Liefert TRUE, wenn der Set solchen Items enthaelt.
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE=NULL);
+// Liefert sal_True, wenn der Set solchen Items enthaelt.
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL);
 
 // zurueck erhaelt man einen neuen WhichTable den
 // man dann irgendwann mit delete platthauen muss.
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd);
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -210,46 +210,46 @@ class Link;
 class SVX_DLLPUBLIC SvdProgressInfo
 {
 private:
-    ULONG nSumActionCount;	// Summe aller Actions
-    ULONG nSumCurAction;	// Summe aller bearbeiteten Actions
+    sal_uIntPtr nSumActionCount;	// Summe aller Actions
+    sal_uIntPtr nSumCurAction;	// Summe aller bearbeiteten Actions
 
-    ULONG nActionCount;		// Anzahl der Actions im akt. Obj.
-    ULONG nCurAction;		// Anzahl bearbeiteter Act. im akt. Obj.
+    sal_uIntPtr nActionCount;		// Anzahl der Actions im akt. Obj.
+    sal_uIntPtr nCurAction;		// Anzahl bearbeiteter Act. im akt. Obj.
 
-    ULONG nInsertCount;		// Anzahl einzufuegender Act. im akt. Obj.
-    ULONG nCurInsert;		// Anzahl bereits eingefuegter Actions
+    sal_uIntPtr nInsertCount;		// Anzahl einzufuegender Act. im akt. Obj.
+    sal_uIntPtr nCurInsert;		// Anzahl bereits eingefuegter Actions
 
-    ULONG nObjCount;		// Anzahl der selektierten Objekte
-    ULONG nCurObj;			// Aktuelles Objekt
+    sal_uIntPtr nObjCount;		// Anzahl der selektierten Objekte
+    sal_uIntPtr nCurObj;			// Aktuelles Objekt
 
     Link *pLink;
 
 public:
     SvdProgressInfo( Link *_pLink );
 
-    void Init( ULONG _nSumActionCount, ULONG _nObjCount );
+    void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
 
-    BOOL SetNextObject();
+    sal_Bool SetNextObject();
 
-    void SetActionCount( ULONG _nActionCount );
-    void SetInsertCount( ULONG _nInsertCount );
+    void SetActionCount( sal_uIntPtr _nActionCount );
+    void SetInsertCount( sal_uIntPtr _nInsertCount );
 
-    BOOL ReportActions( ULONG nAnzActions );
-    BOOL ReportInserts( ULONG nAnzInserts );
+    sal_Bool ReportActions( sal_uIntPtr nAnzActions );
+    sal_Bool ReportInserts( sal_uIntPtr nAnzInserts );
 
-    ULONG GetSumActionCount() const { return nSumActionCount; };
-    ULONG GetSumCurAction() const { return nSumCurAction; };
-    ULONG GetObjCount() const { return nObjCount; };
-    ULONG GetCurObj() const { return nCurObj; };
+    sal_uIntPtr GetSumActionCount() const { return nSumActionCount; };
+    sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
+    sal_uIntPtr GetObjCount() const { return nObjCount; };
+    sal_uIntPtr GetCurObj() const { return nCurObj; };
 
-    ULONG GetActionCount() const { return nActionCount; };
-    ULONG GetCurAction() const { return nCurAction; };
+    sal_uIntPtr GetActionCount() const { return nActionCount; };
+    sal_uIntPtr GetCurAction() const { return nCurAction; };
 
-    ULONG GetInsertCount() const { return nInsertCount; };
-    ULONG GetCurInsert() const { return nCurInsert; };
+    sal_uIntPtr GetInsertCount() const { return nInsertCount; };
+    sal_uIntPtr GetCurInsert() const { return nCurInsert; };
 
     void ReportError();
-    BOOL ReportRescales( ULONG nAnzRescales );
+    sal_Bool ReportRescales( sal_uIntPtr nAnzRescales );
 };
 
 
@@ -280,18 +280,18 @@ class AutoTimer;
 
 class OLEObjCache : public Container
 {
-    ULONG				nSize;
+    sal_uIntPtr				nSize;
     AutoTimer*          pTimer;
 
     void UnloadOnDemand();
-    BOOL UnloadObj( SdrOle2Obj* pObj );
+    sal_Bool UnloadObj( SdrOle2Obj* pObj );
     DECL_LINK( UnloadCheckHdl, AutoTimer* );
 
 public:
     OLEObjCache();
     SVX_DLLPUBLIC ~OLEObjCache();
 
-    void SetSize(ULONG nNewSize);
+    void SetSize(sal_uIntPtr nNewSize);
     void InsertObj(SdrOle2Obj* pObj);
     void RemoveObj(SdrOle2Obj* pObj);
 };
@@ -308,7 +308,7 @@ public:
     SdrOutliner*       	pOutliner;
     SdrEngineDefaults* 	pDefaults;
     ResMgr*            	pResMgr;
-    ULONG              	nExchangeFormat;
+    sal_uIntPtr              	nExchangeFormat;
     OLEObjCache			aOLEObjCache;
     
 
diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx
index bb323a7bb5..bb323a7bb5 100644..100755
--- a/svx/inc/svx/svdfield.hxx
+++ b/svx/inc/svx/svdfield.hxx
diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx
index d47f01fc70..71a9ed18f1 100644..100755
--- a/svx/inc/svx/svdglev.hxx
+++ b/svx/inc/svx/svdglev.hxx
@@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
     void ImpCopyMarkedGluePoints();
     typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
     typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
-    void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
+    void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
     void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
 
 protected:
@@ -75,15 +75,15 @@ public:
     // checken bzw. setzen/loeschen will.
     // Moegliche Werte fuer nThisEsc sind z.Zt.
     // SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM
-    TRISTATE IsMarkedGluePointsEscDir(USHORT nThisEsc) const;
-    void SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn);
-    BOOL IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
+    void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn);
+    sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // Checken/setzen, ob die Klebepunktpositionen relativ zur
-    // Objektgroesse sind (Percent=TRUE) oder nicht (Percent=FALSE)
+    // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
     TRISTATE IsMarkedGluePointsPercent() const;
-    void SetMarkedGluePointsPercent(BOOL bOn);
-    BOOL IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    void SetMarkedGluePointsPercent(sal_Bool bOn);
+    sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // bVert=FALSE: Horizontales Alignment checken/setzen
     //      SDRHORZALIGN_CENTER
@@ -95,23 +95,23 @@ public:
     //      SDRVERTALIGN_TOP
     //      SDRVERTALIGN_BOTTOM
     //      SDRVERTALIGN_DONTCARE (nur bei Get())
-    USHORT GetMarkedGluePointsAlign(BOOL bVert) const;
-    void SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign);
-    BOOL IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+    sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const;
+    void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign);
+    sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
 
     // Alle merkierten Klebepunkte entfernen
     void DeleteMarkedGluePoints();
-    BOOL IsDeleteMarkedGluePointsPossible() const;
+    sal_Bool IsDeleteMarkedGluePointsPossible() const;
 
     void MoveMarkedGluePoints  (const Size& rSiz, bool bCopy=false);
     void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
     void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
-    void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE);
-    void MirrorMarkedGluePointsHorizontal(BOOL bCopy=FALSE);
-    void MirrorMarkedGluePointsVertical(BOOL bCopy=FALSE);
-    void ShearMarkedGluePoints(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE);
-    void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
-    void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
+    void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False);
+    void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False);
+    void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False);
+    void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False);
+    void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
+    void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
 
     void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
 };
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 8aca60b0e0..4c1e7838db 100644..100755
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
@@ -54,7 +54,7 @@ ResMgr* ImpGetResMgr();
 
 class SdrResId: ResId {
 public:
-    SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {}
+    SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {}
 };
 
 // ResourceCache for frequently used strings.
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index 6be0640aea..8324e24f61 100644..100755
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -65,25 +65,25 @@ class SdrObject;
 class SVX_DLLPUBLIC SdrGluePoint {
     // Bezugspunkt ist SdrObject::GetSnapRect().Center()
     // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align)
-    // bNoPercent=TRUE : Position ist in log Einh, rel zum Bezugspunkt
+    // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt
     Point    aPos;
-    USHORT   nEscDir;
-    USHORT   nId;
-    USHORT   nAlign;
+    sal_uInt16   nEscDir;
+    sal_uInt16   nId;
+    sal_uInt16   nAlign;
     sal_uInt8 bNoPercent:1;
     sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
     sal_uInt8 bUserDefined:1; // #i38892#
 public:
-    SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
-    SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
+    SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
+    SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
     bool operator==(const SdrGluePoint& rCmpGP) const   { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; }
     bool operator!=(const SdrGluePoint& rCmpGP) const   { return !operator==(rCmpGP); }
     const Point& GetPos() const                             { return aPos; }
     void         SetPos(const Point& rNewPos)               { aPos=rNewPos; }
-    USHORT       GetEscDir() const                          { return nEscDir; }
-    void         SetEscDir(USHORT nNewEsc)                  { nEscDir=nNewEsc; }
-    USHORT       GetId() const                              { return nId; }
-    void         SetId(USHORT nNewId)                       { nId=nNewId; }
+    sal_uInt16       GetEscDir() const                          { return nEscDir; }
+    void         SetEscDir(sal_uInt16 nNewEsc)                  { nEscDir=nNewEsc; }
+    sal_uInt16       GetId() const                              { return nId; }
+    void         SetId(sal_uInt16 nNewId)                       { nId=nNewId; }
     bool         IsPercent() const                          { return bNoPercent ? false : true; }
     void         SetPercent(bool bOn)                   { bNoPercent  = !bOn; }
     // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
@@ -94,12 +94,12 @@ public:
     bool         IsUserDefined() const                      { return bUserDefined ? true : false; }
     void         SetUserDefined(bool bNew)              { bUserDefined = bNew ? true : false; }
 
-    USHORT       GetAlign() const                           { return nAlign; }
-    void         SetAlign(USHORT nAlg)                      { nAlign=nAlg; }
-    USHORT       GetHorzAlign() const                       { return nAlign&0x00FF; }
-    void         SetHorzAlign(USHORT nAlg)                  { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
-    USHORT       GetVertAlign() const                       { return nAlign&0xFF00; }
-    void         SetVertAlign(USHORT nAlg)                  { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
+    sal_uInt16       GetAlign() const                           { return nAlign; }
+    void         SetAlign(sal_uInt16 nAlg)                      { nAlign=nAlg; }
+    sal_uInt16       GetHorzAlign() const                       { return nAlign&0x00FF; }
+    void         SetHorzAlign(sal_uInt16 nAlg)                  { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
+    sal_uInt16       GetVertAlign() const                       { return nAlign&0xFF00; }
+    void         SetVertAlign(sal_uInt16 nAlg)                  { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
     void         Draw(OutputDevice& rOut, const SdrObject* pObj) const;
     bool         IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
     void         Invalidate(Window& rWin, const SdrObject* pObj) const;
@@ -107,8 +107,8 @@ public:
     void         SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
     long         GetAlignAngle() const;
     void         SetAlignAngle(long nWink);
-    long         EscDirToAngle(USHORT nEsc) const;
-    USHORT       EscAngleToDir(long nWink) const;
+    long         EscDirToAngle(sal_uInt16 nEsc) const;
+    sal_uInt16       EscAngleToDir(long nWink) const;
     void         Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
     void         Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
     void         Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
@@ -120,22 +120,22 @@ public:
 class SVX_DLLPUBLIC SdrGluePointList {
     Container aList;
 protected:
-    SdrGluePoint* GetObject(USHORT i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
+    SdrGluePoint* GetObject(sal_uInt16 i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
 public:
     SdrGluePointList(): aList(1024,4,4) {}
     SdrGluePointList(const SdrGluePointList& rSrcList): aList(1024,4,4)     { *this=rSrcList; }
     ~SdrGluePointList()                                                     { Clear(); }
     void                Clear();
     void                operator=(const SdrGluePointList& rSrcList);
-    USHORT              GetCount() const                                    { return USHORT(aList.Count()); }
+    sal_uInt16              GetCount() const                                    { return sal_uInt16(aList.Count()); }
     // Beim Insert wird dem Objekt (also dem GluePoint) automatisch eine Id zugewiesen.
     // ReturnCode ist der Index des neuen GluePoints in der Liste
-    USHORT              Insert(const SdrGluePoint& rGP);
-    void                Delete(USHORT nPos)                                 { delete (SdrGluePoint*)aList.Remove(nPos); }
-    SdrGluePoint&       operator[](USHORT nPos)                             { return *GetObject(nPos); }
-    const SdrGluePoint& operator[](USHORT nPos) const                       { return *GetObject(nPos); }
-    USHORT              FindGluePoint(USHORT nId) const;
-    USHORT              HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack=FALSE, bool bNext = false, USHORT nId0=0) const;
+    sal_uInt16              Insert(const SdrGluePoint& rGP);
+    void                Delete(sal_uInt16 nPos)                                 { delete (SdrGluePoint*)aList.Remove(nPos); }
+    SdrGluePoint&       operator[](sal_uInt16 nPos)                             { return *GetObject(nPos); }
+    const SdrGluePoint& operator[](sal_uInt16 nPos) const                       { return *GetObject(nPos); }
+    sal_uInt16          FindGluePoint(sal_uInt16 nId) const;
+    sal_uInt16          HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const;
     void                Invalidate(Window& rWin, const SdrObject* pObj) const;
     // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
     void                SetReallyAbsolute(bool bOn, const SdrObject& rObj);
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 018e6b274a..722a674176 100644..100755
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -211,14 +211,14 @@ public:
     SdrObject* GetObj() const { return pObj;  }
     void SetObj(SdrObject* pNewObj);
 
-    BOOL IsSelected() const { return bSelect; }
-    void SetSelected(BOOL bJa=TRUE);
+    sal_Bool IsSelected() const { return bSelect; }
+    void SetSelected(sal_Bool bJa=sal_True);
 
-    void Set1PixMore(BOOL bJa=TRUE);
+    void Set1PixMore(sal_Bool bJa=sal_True);
     void SetDrehWink(long n);
 
-    BOOL IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
-    BOOL IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT  || eKind==HDL_RIGHT; }
+    sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
+    sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT  || eKind==HDL_RIGHT; }
 
     void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; }
     sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; }
@@ -229,8 +229,8 @@ public:
     void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; }
     sal_uInt32 GetPointNum() const { return nPPntNum; }
 
-    void SetPlusHdl(BOOL bOn) { bPlusHdl=bOn; }
-    BOOL IsPlusHdl() const { return bPlusHdl; }
+    void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; }
+    sal_Bool IsPlusHdl() const { return bPlusHdl; }
 
     void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; }
     sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; }
@@ -239,7 +239,7 @@ public:
     bool IsHdlHit(const Point& rPnt) const;
 
     // #97016# II
-    virtual BOOL IsFocusHdl() const;
+    virtual sal_Bool IsFocusHdl() const;
 
     void SetMoveOutside( bool bMoveOutside );
 
@@ -283,13 +283,13 @@ private:
     SVX_DLLPRIVATE void CallColorChangeLink();
 
 public:
-    SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), BOOL bLum = FALSE);
+    SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False);
     virtual ~SdrHdlColor();
 
-    BOOL IsUseLuminance() const { return bUseLuminance; }
+    sal_Bool IsUseLuminance() const { return bUseLuminance; }
 
     Color GetColor() const { return aMarkerColor; }
-    void SetColor(Color aNew, BOOL bCallLink = FALSE);
+    void SetColor(Color aNew, sal_Bool bCallLink = sal_False);
 
     const Size& GetSize() const { return aMarkerSize; }
     void SetSize(const Size& rNew);
@@ -321,10 +321,10 @@ private:
     virtual void CreateB2dIAObject();
 
 public:
-    SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad = TRUE);
+    SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True);
     virtual ~SdrHdlGradient();
 
-    BOOL IsGradient() const { return bGradient; }
+    sal_Bool IsGradient() const { return bGradient; }
 
     // set the associated color handles
     void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; }
@@ -338,13 +338,13 @@ public:
     DECL_LINK(ColorChangeHdl, SdrHdl*);
 
     // transformation call, create gradient from this handle
-    void FromIAOToItem(SdrObject* pObj, BOOL bSetItemOnObject, BOOL bUndo);
+    void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo);
 
     // selection flags for interaction
-    BOOL IsMoveSingleHandle() const { return bMoveSingleHandle; }
-    void SetMoveSingleHandle(BOOL bNew) { bMoveSingleHandle = bNew; }
-    BOOL IsMoveFirstHandle() const { return bMoveFirstHandle; }
-    void SetMoveFirstHandle(BOOL bNew) { bMoveFirstHandle = bNew; }
+    sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
+    void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; }
+    sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
+    void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -411,7 +411,7 @@ public:
 
     void SetLineCode(SdrEdgeLineCode eCode);
     SdrEdgeLineCode GetLineCode() const     { return eLineCode; }
-    BOOL IsHorzDrag() const;
+    sal_Bool IsHorzDrag() const;
     virtual Pointer GetPointer() const;
 };
 
@@ -452,10 +452,10 @@ class ImplHdlListData;
 class SVX_DLLPUBLIC SdrHdlList
 {
 protected:
-    ULONG					mnFocusIndex;
+    sal_uIntPtr					mnFocusIndex;
     SdrMarkView*				pView;
     Container					aList;
-    USHORT						nHdlSize;
+    sal_uInt16						nHdlSize;
 
     unsigned					bRotateShear : 1;
     unsigned					bDistortShear : 1;
@@ -465,8 +465,8 @@ protected:
 private:
     SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64)  {}
     SVX_DLLPRIVATE void operator=(const SdrHdlList&)                 {}
-    SVX_DLLPRIVATE BOOL operator==(const SdrHdlList&) const      { return FALSE; }
-    SVX_DLLPRIVATE BOOL operator!=(const SdrHdlList&) const      { return FALSE; }
+    SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const      { return sal_False; }
+    SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const      { return sal_False; }
 
 public:
     SdrHdlList(SdrMarkView* pV);
@@ -486,28 +486,28 @@ public:
     //             2.Level PageView (Pointer)
     //             3.Level Position (x+y)
     void     Sort();
-    ULONG    GetHdlCount() const                       { return aList.Count(); }
-    SdrHdl*  GetHdl(ULONG nNum) const                  { return (SdrHdl*)(aList.GetObject(nNum)); }
-    ULONG    GetHdlNum(const SdrHdl* pHdl) const;
-    void     SetHdlSize(USHORT nSiz);
-    USHORT   GetHdlSize() const                        { return nHdlSize; }
-    void     SetMoveOutside(BOOL bOn);
-    BOOL IsMoveOutside() const                     { return bMoveOutside; }
-    void     SetRotateShear(BOOL bOn);
-    BOOL IsRotateShear() const                     { return bRotateShear; }
-    void     SetDistortShear(BOOL bOn);
-    BOOL IsDistortShear() const                    { return bDistortShear; }
-    void     SetFineHdl(BOOL bOn);
-    BOOL IsFineHdl() const                        { return bFineHandles; }
+    sal_uIntPtr    GetHdlCount() const                       { return aList.Count(); }
+    SdrHdl*  GetHdl(sal_uIntPtr nNum) const                  { return (SdrHdl*)(aList.GetObject(nNum)); }
+    sal_uIntPtr    GetHdlNum(const SdrHdl* pHdl) const;
+    void     SetHdlSize(sal_uInt16 nSiz);
+    sal_uInt16   GetHdlSize() const                        { return nHdlSize; }
+    void     SetMoveOutside(sal_Bool bOn);
+    sal_Bool IsMoveOutside() const                     { return bMoveOutside; }
+    void     SetRotateShear(sal_Bool bOn);
+    sal_Bool IsRotateShear() const                     { return bRotateShear; }
+    void     SetDistortShear(sal_Bool bOn);
+    sal_Bool IsDistortShear() const                    { return bDistortShear; }
+    void     SetFineHdl(sal_Bool bOn);
+    sal_Bool IsFineHdl() const                        { return bFineHandles; }
 
     // AddHdl uebernimmt das Handle in sein Eigentum. Es muss
     // also auf dem Heap stehen, da Clear() ein delete macht.
-    void    AddHdl(SdrHdl* pHdl, BOOL bAtBegin=FALSE);
-    SdrHdl* RemoveHdl(ULONG nNum);
+    void    AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
+    SdrHdl* RemoveHdl(sal_uIntPtr nNum);
 
     // Zuletzt eingefuegte Handles werden am ehesten getroffen
     // (wenn Handles uebereinander liegen).
-    SdrHdl* IsHdlListHit(const Point& rPnt, BOOL bBack=FALSE, BOOL bNext=FALSE, SdrHdl* pHdl0=NULL) const;
+    SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const;
     SdrHdl* GetHdl(SdrHdlKind eKind1) const;
 };
 
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index c5782d167b..5ac4d6a3da 100644..100755
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -67,7 +67,7 @@ public:
     const Point&    GetPos() const                    { return aPos; }
 
     Pointer         GetPointer() const;
-    bool            IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+    bool            IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
     // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben
     Rectangle       GetBoundRect(const OutputDevice& rOut) const;
 
@@ -82,7 +82,7 @@ public:
 class SVX_DLLPUBLIC SdrHelpLineList {
     Container aList;
 protected:
-    SdrHelpLine* GetObject(USHORT i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
+    SdrHelpLine* GetObject(sal_uInt16 i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
 public:
     SdrHelpLineList(): aList(1024,4,4) {}
     SdrHelpLineList(const SdrHelpLineList& rSrcList): aList(1024,4,4)      { *this=rSrcList; }
@@ -91,13 +91,13 @@ public:
     void               operator=(const SdrHelpLineList& rSrcList);
     bool operator==(const SdrHelpLineList& rCmp) const;
     bool operator!=(const SdrHelpLineList& rCmp) const                 { return !operator==(rCmp); }
-    USHORT             GetCount() const                                    { return USHORT(aList.Count()); }
-    void               Insert(const SdrHelpLine& rHL, USHORT nPos=0xFFFF)  { aList.Insert(new SdrHelpLine(rHL),nPos); }
-    void               Delete(USHORT nPos)                                 { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
-    void               Move(USHORT nPos, USHORT nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
-    SdrHelpLine&       operator[](USHORT nPos)                             { return *GetObject(nPos); }
-    const SdrHelpLine& operator[](USHORT nPos) const                       { return *GetObject(nPos); }
-    USHORT             HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+    sal_uInt16             GetCount() const                                    { return sal_uInt16(aList.Count()); }
+    void               Insert(const SdrHelpLine& rHL, sal_uInt16 nPos=0xFFFF)  { aList.Insert(new SdrHelpLine(rHL),nPos); }
+    void               Delete(sal_uInt16 nPos)                                 { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
+    void               Move(sal_uInt16 nPos, sal_uInt16 nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
+    SdrHelpLine&       operator[](sal_uInt16 nPos)                             { return *GetObject(nPos); }
+    const SdrHelpLine& operator[](sal_uInt16 nPos) const                       { return *GetObject(nPos); }
+    sal_uInt16             HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx
index 5d8e2c24a4..077857225d 100644..100755
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
@@ -47,14 +47,14 @@ class SVX_DLLPUBLIC SdrObjListIter
 {
     List						maObjList;
     sal_uInt32					mnIndex;
-    BOOL						mbReverse;
+    sal_Bool						mbReverse;
 
-    void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder);
+    void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder);
     void ImpProcessMarkList(const SdrMarkList& rMarkList, SdrIterMode eMode);
-    void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder);
+    void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder);
 
 public:
-    SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
     /** This variant lets the user choose the order in which to travel over
         the objects.
         @param bUseZOrder
@@ -62,17 +62,17 @@ public:
             Otherwise the navigation position as returned by
             SdrObject::GetNavigationPosition() is used.
     */
-    SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     /* SJ: the following function can now be used with every
        SdrObject and is no longer limited to group objects */
-    SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     /** Iterates over a list of marked objects received from the SdrMarkView. */
-    SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+    SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
 
     void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); }
-    BOOL IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
+    sal_Bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
     SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); }
     
     sal_uInt32 Count() { return maObjList.Count(); }
diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx
index a2d3169aeb..a2d3169aeb 100644..100755
--- a/svx/source/svdraw/svditext.hxx
+++ b/svx/inc/svx/svditext.hxx
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index a32ca1b8eb..b85afc8fa5 100644..100755
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -45,7 +45,7 @@ protected:
     String		maTitle;
     String		maDescription;
     SdrModel*  pModel; // zum Broadcasten
-    UINT16     nType;  // 0=Userdefined,1=Standardlayer
+    sal_uInt16     nType;  // 0=Userdefined,1=Standardlayer
     SdrLayerID nID;
 protected:
     SdrLayer(SdrLayerID nNewID, const String& rNewName)       { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; }
@@ -106,30 +106,30 @@ public:
     void                 SetParent(SdrLayerAdmin* pNewParent)                        { pParent=pNewParent; }
     void                 SetModel(SdrModel* pNewModel);
     SdrModel*            GetModel() const                                            { return pModel; }
-    void                 InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF)           { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
-    SdrLayer*            RemoveLayer(USHORT nPos);
+    void                 InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF)           { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
+    SdrLayer*            RemoveLayer(sal_uInt16 nPos);
     // Alle Layer loeschen
     void               ClearLayer();
     // Neuer Layer wird angelegt und eingefuegt
-    SdrLayer*          NewLayer(const String& rName, USHORT nPos=0xFFFF);
+    SdrLayer*          NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
     void               DeleteLayer(SdrLayer* pLayer)                                 { aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
-    void               MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF);
-    SdrLayer*          MoveLayer(USHORT nPos, USHORT nNewPos);
+    void               MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF);
+    SdrLayer*          MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
     // Neuer Layer, Name wird aus der Resource geholt
-    SdrLayer*          NewStandardLayer(USHORT nPos=0xFFFF);
+    SdrLayer*          NewStandardLayer(sal_uInt16 nPos=0xFFFF);
 
     // Iterieren ueber alle Layer
-    USHORT             GetLayerCount() const                                         { return USHORT(aLayer.Count()); }
-    SdrLayer*          GetLayer(USHORT i)                                            { return (SdrLayer*)(aLayer.GetObject(i)); }
-    const SdrLayer*    GetLayer(USHORT i) const                                      { return (SdrLayer*)(aLayer.GetObject(i)); }
+    sal_uInt16             GetLayerCount() const                                         { return sal_uInt16(aLayer.Count()); }
+    SdrLayer*          GetLayer(sal_uInt16 i)                                            { return (SdrLayer*)(aLayer.GetObject(i)); }
+    const SdrLayer*    GetLayer(sal_uInt16 i) const                                      { return (SdrLayer*)(aLayer.GetObject(i)); }
 
-    USHORT             GetLayerPos(SdrLayer* pLayer) const;
+    sal_uInt16             GetLayerPos(SdrLayer* pLayer) const;
 
     SdrLayer*          GetLayer(const String& rName, bool bInherited)            { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
     const SdrLayer*    GetLayer(const String& rName, bool bInherited) const;
           SdrLayerID   GetLayerID(const String& rName, bool bInherited) const;
-          SdrLayer*    GetLayerPerID(USHORT nID)                                     { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
-    const SdrLayer*    GetLayerPerID(USHORT nID) const;
+          SdrLayer*    GetLayerPerID(sal_uInt16 nID)                                     { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
+    const SdrLayer*    GetLayerPerID(sal_uInt16 nID) const;
 
     void     	       SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; }
     const String& 	   GetControlLayerName() const                 { return aControlLayerName; }
@@ -153,7 +153,7 @@ bInherited:
     TRUE: Wird der Layer/LayerSet nicht gefunden, so wird im Parent-LayerAdmin
           nachgesehen, ob es dort einen entsprechende Definition gibt.
     FALSE: Es wird nur dieser LayerAdmin durchsucht.
-    Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, nämlich den des
+    Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, n�mlich den des
     Model. Das Model selbst hat keinen Parent.
 */
 
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index b9d3aaa016..f65be24306 100644..100755
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SdrUShortCont
     sal_Bool											mbSorted;
 
 private:
-    void CheckSort(ULONG nPos);
+    void CheckSort(sal_uLong nPos);
 
 public:
     SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize)
@@ -100,9 +100,9 @@ public:
         }
     }
 
-    void Insert(sal_uInt16 nElem, ULONG nPos = CONTAINER_APPEND)
+    void Insert(sal_uInt16 nElem, sal_uLong nPos = CONTAINER_APPEND) 
     {
-        maArray.Insert((void*)ULONG(nElem),nPos);
+        maArray.Insert((void*)sal_uLong(nElem),nPos); 
 
         if(mbSorted)
         {
@@ -110,14 +110,14 @@ public:
         }
     }
 
-    void Remove(ULONG nPos)
+    void Remove(sal_uLong nPos) 
     {
         maArray.Remove(nPos);
     }
 
-    void Replace(sal_uInt16 nElem, ULONG nPos)
+    void Replace(sal_uInt16 nElem, sal_uLong nPos)
     {
-        maArray.Replace((void*)ULONG(nElem), nPos);
+        maArray.Replace((void*)sal_uLong(nElem), nPos); 
 
         if(mbSorted)
         {
@@ -125,24 +125,24 @@ public:
         }
     }
 
-    sal_uInt16 GetObject(ULONG nPos) const
+    sal_uInt16 GetObject(sal_uLong nPos) const 
     {
         return sal_uInt16(sal_uIntPtr(maArray.GetObject(nPos)));
     }
 
-    ULONG GetPos(sal_uInt16 nElem) const
+    sal_uLong GetPos(sal_uInt16 nElem) const
     {
-        return maArray.GetPos((void*)(ULONG)nElem);
+        return maArray.GetPos((void*)(sal_uLong)nElem); 
     }
 
-    ULONG GetCount() const
+    sal_uLong GetCount() const
     {
         return maArray.Count();
     }
 
     sal_Bool Exist(sal_uInt16 nElem) const
     {
-        return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(ULONG)nElem));
+        return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(sal_uLong)nElem)); 
     }
 };
 
@@ -323,20 +323,20 @@ public:
         mbSorted = sal_False;
     }
 
-    ULONG GetMarkCount() const
+    sal_uLong GetMarkCount() const 
     {
         return maList.Count();
     }
 
-    SdrMark* GetMark(ULONG nNum) const
+    SdrMark* GetMark(sal_uLong nNum) const 
     {
         return (SdrMark*)(maList.GetObject(nNum));
     }
 
-    ULONG FindObject(const SdrObject* pObj) const;
+    sal_uLong FindObject(const SdrObject* pObj) const;
     void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
-    void DeleteMark(ULONG nNum);
-    void ReplaceMark(const SdrMark& rNewMark, ULONG nNum);
+    void DeleteMark(sal_uLong nNum);
+    void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum);
     void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False);
     sal_Bool DeletePageView(const SdrPageView& rPV);
     sal_Bool InsertPageView(const SdrPageView& rPV);
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 4369b3994d..4d1be3add1 100644..100755
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -54,11 +54,11 @@ class OutputDevice;
 
 #include <rtl/ref.hxx>
 
-#if defined(UNX) || defined(WIN) || defined(WNT)
+#if defined(UNX) || defined(WNT)
 #define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
 #endif
 
-#if defined(DOS) || defined(OS2)
+#if defined(OS2)
 #define DEGREE_CHAR ((sal_Unicode)248)   /* 0xF8 = IBM PC (Erw. ASCII) */
 #endif
 
@@ -167,7 +167,7 @@ public:
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts
-// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv
+// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv
 #define LOADREFCOUNTS (false)
 
 struct SdrDocumentStreamInfo
@@ -175,7 +175,7 @@ struct SdrDocumentStreamInfo
     bool            mbDeleteAfterUse;
     String		    maUserData;
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef;
-    BOOL		    mbDummy1 : 1;
+    sal_Bool		    mbDummy1 : 1;
 };
 
 struct SdrModelImpl;
@@ -206,21 +206,21 @@ protected:
                     m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell
     SdrOutliner*    pDrawOutliner;  // ein Outliner zur Textausgabe
     SdrOutliner*    pHitTestOutliner;// ein Outliner fuer den HitTest
-    ULONG           nDefTextHgt;    // Default Texthoehe in logischen Einheiten
+    sal_uIntPtr           nDefTextHgt;    // Default Texthoehe in logischen Einheiten
     OutputDevice*   pRefOutDev;     // ReferenzDevice fuer die EditEngine
-    ULONG           nProgressAkt;   // fuer den
-    ULONG           nProgressMax;   // ProgressBar-
-    ULONG           nProgressOfs;   // -Handler
+    sal_uIntPtr           nProgressAkt;   // fuer den
+    sal_uIntPtr           nProgressMax;   // ProgressBar-
+    sal_uIntPtr           nProgressOfs;   // -Handler
     rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
     SfxStyleSheet*	pDefaultStyleSheet;
     sfx2::LinkManager* pLinkManager;   // LinkManager
     Container*      pUndoStack;
     Container*      pRedoStack;
     SdrUndoGroup*   pAktUndoGroup;  // Fuer mehrstufige
-    USHORT          nUndoLevel;     // Undo-Klammerung
+    sal_uInt16          nUndoLevel;     // Undo-Klammerung
     bool			mbUndoEnabled;	// If false no undo is recorded or we are during the execution of an undo action
-    USHORT          nProgressPercent; // fuer den ProgressBar-Handler
-    USHORT          nLoadVersion;   // Versionsnummer der geladenen Datei
+    sal_uInt16          nProgressPercent; // fuer den ProgressBar-Handler
+    sal_uInt16          nLoadVersion;   // Versionsnummer der geladenen Datei
     bool            bExtColorTable; // Keinen eigenen ColorTable
     sal_Bool        mbChanged;
     bool            bInfoChanged;
@@ -235,12 +235,12 @@ protected:
     bool            bSwapGraphics;
     bool            bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
     bool    		bSaveOLEPreview;      // save preview metafile of OLE objects
-    UINT16          nStreamCompressMode;  // Komprimiert schreiben?
-    UINT16          nStreamNumberFormat;
-    UINT16          nDefaultTabulator;
-    UINT32          nMaxUndoCount;
+    sal_uInt16          nStreamCompressMode;  // Komprimiert schreiben?
+    sal_uInt16          nStreamNumberFormat;
+    sal_uInt16          nDefaultTabulator;
+    sal_uInt32          nMaxUndoCount;
     bool            bSaveNative;
-    BOOL            bStarDrawPreviewMode;
+    sal_Bool            bStarDrawPreviewMode;
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -267,18 +267,18 @@ public:
     bool IsAllowShapePropertyChangeListener() const;
     void SetAllowShapePropertyChangeListener( bool bAllow );
 
-    UINT16          nStarDrawPreviewMasterPageNum;
+    sal_uInt16          nStarDrawPreviewMasterPageNum;
     // Reserven fuer kompatible Erweiterungen
     SotStorage*		pModelStorage;
     SvxForbiddenCharactersTable* mpForbiddenCharactersTable;
-    ULONG			nSwapGraphicsMode;
+    sal_uIntPtr			nSwapGraphicsMode;
 
     SdrOutlinerCache* mpOutlinerCache;
     SdrModelImpl*	mpImpl;
-    UINT16          mnCharCompressType;
-    UINT16          mnHandoutPageCount;
-    UINT16          nReserveUInt6;
-    UINT16          nReserveUInt7;
+    sal_uInt16          mnCharCompressType;
+    sal_uInt16          mnHandoutPageCount;
+    sal_uInt16          nReserveUInt6;
+    sal_uInt16          nReserveUInt7;
     bool            mbModelLocked;
     bool            mbKernAsianPunctuation;
     bool            mbAddExtLeading;
@@ -299,8 +299,8 @@ public:
 public:
     const SvNumberFormatter& GetNumberFormatter() const;
 
-    UINT16 getHandoutPageCount() const { return mnHandoutPageCount; }
-    void setHandoutPageCount( UINT16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
+    sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; }
+    void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
 
 protected:
 
@@ -313,7 +313,7 @@ private:
     SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const;
     SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
     SVX_DLLPRIVATE void ImpSetUIUnit();
-    SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE );
+    SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False );
     SVX_DLLPRIVATE void ImpReformatAllTextObjects();
     SVX_DLLPRIVATE void ImpReformatAllEdgeObjects();	// #103122#
     SVX_DLLPRIVATE void ImpCreateTables();
@@ -349,7 +349,7 @@ public:
     // Hier kann man erfragen, ob das Model gerade eingrstreamt wird
     bool IsLoading() const                  { return sal_False /*BFS01 bLoading */; }
     // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken
-    // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird
+    // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird
     // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert.
     // Wenn diese Methode NULL liefert, wird zum Swappen eine temporaere
     // Datei angelegt.
@@ -381,7 +381,7 @@ public:
     const SdrTextObj*    GetFormattingTextObj() const;
     // Die TextDefaults (Font,Hoehe,Farbe) in ein Set putten
     void         		 SetTextDefaults() const;
-    static void    		 SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt );
+    static void    		 SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
 
     // ReferenzDevice fuer die EditEngine
     void                 SetRefDevice(OutputDevice* pDev);
@@ -389,11 +389,11 @@ public:
     // Wenn ein neuer MapMode am RefDevice gesetzt wird o.ae.
     void                 RefDeviceChanged(); // noch nicht implementiert
     // Default-Schrifthoehe in logischen Einheiten
-    void                 SetDefaultFontHeight(ULONG nVal);
-    ULONG                GetDefaultFontHeight() const           { return nDefTextHgt; }
+    void                 SetDefaultFontHeight(sal_uIntPtr nVal);
+    sal_uIntPtr                GetDefaultFontHeight() const           { return nDefTextHgt; }
     // Default-Tabulatorweite fuer die EditEngine
-    void                 SetDefaultTabulator(USHORT nVal);
-    USHORT               GetDefaultTabulator() const            { return nDefaultTabulator; }
+    void                 SetDefaultTabulator(sal_uInt16 nVal);
+    sal_uInt16               GetDefaultTabulator() const            { return nDefaultTabulator; }
 
     // Der DefaultStyleSheet wird jedem Zeichenobjekt verbraten das in diesem
     // Model eingefuegt wird und kein StyleSheet gesetzt hat.
@@ -457,11 +457,11 @@ public:
     bool         IsMPgNumsDirty() const                     { return bMPgNumsDirty; };
     void             RecalcPageNums(bool bMaster);
     // Nach dem Insert gehoert die Page dem SdrModel.
-    virtual void     InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
-    virtual void     DeletePage(USHORT nPgNum);
+    virtual void     InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+    virtual void     DeletePage(sal_uInt16 nPgNum);
     // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
-    virtual SdrPage* RemovePage(USHORT nPgNum);
-    virtual void     MovePage(USHORT nPgNum, USHORT nNewPos);
+    virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
+    virtual void     MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     const SdrPage* GetPage(sal_uInt16 nPgNum) const;
     SdrPage* GetPage(sal_uInt16 nPgNum);
     sal_uInt16 GetPageCount() const;
@@ -469,11 +469,11 @@ public:
     virtual void PageListChanged();
 
     // Masterpages
-    virtual void     InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
-    virtual void     DeleteMasterPage(USHORT nPgNum);
+    virtual void     InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+    virtual void     DeleteMasterPage(sal_uInt16 nPgNum);
     // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
-    virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
-    virtual void     MoveMasterPage(USHORT nPgNum, USHORT nNewPos);
+    virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
+    virtual void     MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
     const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const;
     SdrPage* GetMasterPage(sal_uInt16 nPgNum);
     sal_uInt16 GetMasterPageCount() const;
@@ -492,27 +492,27 @@ public:
     bool            IsPageNotValid() const                     { return bPageNotValid; }
     void            SetPageNotValid(bool bJa = true)           { bPageNotValid=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte
+    // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte
     // portabel gespeichert. Es findet dann beim Speichern ggf.
     // eine implizite Wandlung von Metafiles statt.
     // Default=FALSE. Flag ist nicht persistent.
     bool            IsSavePortable() const                     { return bSavePortable; }
     void            SetSavePortable(bool bJa = true)           { bSavePortable=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden
+    // Schaltet man dieses Flag auf sal_True, so werden
     // Pixelobjekte (stark) komprimiert gespeichert.
     // Default=FALSE. Flag ist nicht persistent.
     bool            IsSaveCompressed() const                   { return bSaveCompressed; }
     void            SetSaveCompressed(bool bJa = true)         { bSaveCompressed=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden
+    // Schaltet man dieses Flag auf sal_True, so werden
     // Grafikobjekte mit gesetztem Native-Link
     // native gespeichert.
     // Default=FALSE. Flag ist nicht persistent.
     bool            IsSaveNative() const                       { return bSaveNative; }
     void            SetSaveNative(bool bJa = true)             { bSaveNative=bJa; }
 
-    // Schaltet man dieses Flag auf TRUE, so werden die Grafiken
+    // Schaltet man dieses Flag auf sal_True, so werden die Grafiken
     // von Grafikobjekten:
     // - beim Laden eines Dokuments nicht sofort mitgeladen,
     //   sondern erst wenn sie gebraucht (z.B. angezeigt) werden.
@@ -523,8 +523,8 @@ public:
     // Default=FALSE. Flag ist nicht persistent.
     bool            IsSwapGraphics() const { return bSwapGraphics; }
     void            SetSwapGraphics(bool bJa = true);
-    void			SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; }
-    ULONG			GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
+    void			SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; }
+    sal_uIntPtr			GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
 
     bool            IsSaveOLEPreview() const          { return bSaveOLEPreview; }
     void            SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; }
@@ -539,7 +539,7 @@ public:
     bool            IsBitmapCaching() const                     { return !bNoBitmapCaching; }
     void            SetBitmapCaching(bool bJa = true)           { bNoBitmapCaching=!bJa; }
 
-    // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch
+    // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch
     // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie
     // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet.
     bool            IsPickThroughTransparentTextFrames() const  { return bTransparentTextFrames; }
@@ -549,7 +549,7 @@ public:
     // Wird nur von den Possibility-Methoden der View ausgewerdet.
     // Direkte Manipulationen am Model, ... berueksichtigen dieses Flag nicht.
     // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files
-    // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag
+    // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag
     // verwenden!).
     virtual bool IsReadOnly() const;
     virtual void     SetReadOnly(bool bYes);
@@ -559,25 +559,25 @@ public:
     // rSourceModel ist anschliessend u.U. weitgehend leer.
     // nFirstPageNum,nLastPageNum: Die aus rSourceModel zu uebernehmenden Seiten
     // nDestPos..................: Einfuegeposition
-    // bMergeMasterPages.........: TRUE =benoetigte MasterPages werden aus
+    // bMergeMasterPages.........: sal_True =benoetigte MasterPages werden aus
     //                                   rSourceModel ebenfalls uebernommen
-    //                             FALSE=Die MasterPageDescriptoren der Seiten
+    //                             sal_False=Die MasterPageDescriptoren der Seiten
     //                                   aus rSourceModel werden auf die
     //                                   vorhandenen MasterPages gemappt.
     // bUndo.....................: Fuer das Merging wird eine UndoAction generiert.
     //                             Undo ist nur fuer das ZielModel, nicht fuer
     //                             rSourceModel.
-    // bTreadSourceAsConst.......: TRUE=Das SourceModel wird nicht veraendert,.
+    // bTreadSourceAsConst.......: sal_True=Das SourceModel wird nicht veraendert,.
     //                             d.h die Seiten werden kopiert.
     virtual void Merge(SdrModel& rSourceModel,
-               USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF,
-               USHORT nDestPos=0xFFFF,
+               sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+               sal_uInt16 nDestPos=0xFFFF,
                bool bMergeMasterPages = false, bool bAllMasterPages = false,
                bool bUndo = true, bool bTreadSourceAsConst = false);
 
-    // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy);
-    void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
-                   USHORT nDestPos,
+    // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy);
+    void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                   sal_uInt16 nDestPos,
                    bool bUndo = true, bool bMoveNoCopy = false);
 
     // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions
@@ -594,7 +594,7 @@ public:
     void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf
     void EndUndo();                       // Undo-Klammerung zu
     void AddUndo(SdrUndoAction* pUndo);
-    USHORT GetUndoBracketLevel() const                       { return nUndoLevel; }
+    sal_uInt16 GetUndoBracketLevel() const                       { return nUndoLevel; }
     const SdrUndoGroup* GetAktUndoGroup() const              { return pAktUndoGroup; }
     // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
     void SetUndoComment(const String& rComment);
@@ -603,15 +603,15 @@ public:
     // Das Undo-Managment findet nur statt, wenn kein NotifyUndoAction-Handler
     // gesetzt ist.
     // Default ist 16. Minimaler MaxUndoActionCount ist 1!
-    void  SetMaxUndoActionCount(ULONG nAnz);
-    ULONG GetMaxUndoActionCount() const { return nMaxUndoCount; }
+    void  SetMaxUndoActionCount(sal_uIntPtr nAnz);
+    sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
     void  ClearUndoBuffer();
     // UndoAction(0) ist die aktuelle (also die zuletzt eingegangene)
-    ULONG GetUndoActionCount() const                      { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
-    const SfxUndoAction* GetUndoAction(ULONG nNum) const  { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
+    sal_uIntPtr GetUndoActionCount() const                      { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
+    const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const  { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
     // RedoAction(0) ist die aktuelle (also die des letzten Undo)
-    ULONG GetRedoActionCount() const                      { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
-    const SfxUndoAction* GetRedoAction(ULONG nNum) const  { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
+    sal_uIntPtr GetRedoActionCount() const                      { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
+    const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const  { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
 
     bool Undo();
     bool Redo();
@@ -628,6 +628,7 @@ public:
     /** application can set it's own undo manager, BegUndo, EndUndo and AddUndoAction
         calls are routet to this interface if given */
     void SetSdrUndoManager( SfxUndoManager*	pUndoManager );
+    SfxUndoManager* GetSdrUndoManager() const;
 
     /** applications can set their own undo factory to overide creation of
         undo actions. The SdrModel will become owner of the given SdrUndoFactory
@@ -674,13 +675,13 @@ public:
     // durch. Geprueft wird insbesondere die Verkettung von Verschachtelten
     // Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page*
     // der Objects, SubLists und Pages. Bei korrekter Struktur liefert die
-    // Methode TRUE, andernfalls FALSE.
+    // Methode sal_True, andernfalls FALSE.
     // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL
     // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni)
     bool CheckConsistence() const;
 
-    void 	SetStarDrawPreviewMode(BOOL bPreview);
-    BOOL 	IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
+    void 	SetStarDrawPreviewMode(sal_Bool bPreview);
+    sal_Bool 	IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
 
     SotStorage*	GetModelStorage() const { return pModelStorage; }
     void		SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; }
@@ -696,8 +697,8 @@ public:
     void			SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
     rtl::Reference<SvxForbiddenCharactersTable>	GetForbiddenCharsTable() const;
 
-    void SetCharCompressType( UINT16 nType );
-    UINT16 GetCharCompressType() const { return mnCharCompressType; }
+    void SetCharCompressType( sal_uInt16 nType );
+    sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
 
     void SetKernAsianPunctuation( sal_Bool bEnabled );
     sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; }
@@ -707,9 +708,9 @@ public:
 
     void ReformatAllTextObjects();
 
-    bool HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+    bool HasTransparentObjects( sal_bool bCheckForAlphaChannel = sal_False ) const;
 
-    SdrOutliner* createOutliner( USHORT nOutlinerMode );
+    SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
     void disposeOutliner( SdrOutliner* pOutliner );
 
     sal_Bool IsWriter() const { return !bMyPool; }
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index 30da68ed00..b2630127e0 100644..100755
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -135,9 +135,9 @@ protected:
     Rectangle					aMarkedPointsRect;
     Rectangle					aMarkedGluePointsRect;
 
-    USHORT						nFrameHandlesLimit;
-    ULONG					mnInsPointNum;      // Nummer des InsPoint
-    ULONG						nMarkableObjCount;
+    sal_uInt16						nFrameHandlesLimit;
+    sal_uIntPtr					mnInsPointNum;      // Nummer des InsPoint
+    sal_uIntPtr						nMarkableObjCount;
 
     SdrDragMode					eDragMode;        // Persistent
     SdrViewEditMode				eEditMode;      // Persistent
@@ -170,7 +170,7 @@ protected:
     virtual void SetMarkRects();                                             // Rects an den PageViews
     virtual void CheckMarked();                                              // MarkList nach Del und Lock Layer durchsuchen...
     virtual void AddDragModeHdl(SdrDragMode eMode);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
     // add custom handles (used by other apps, e.g. AnchorPos)
     virtual void AddCustomHdl();
@@ -179,18 +179,18 @@ protected:
     void ForceUndirtyMrkPnt() const                                       { if (bMrkPntDirty) UndirtyMrkPnt(); }
 
     //HMHvoid ImpShowMarkHdl(bool bNoRefHdl);
-    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
-    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
-    BOOL ImpIsFrameHandles() const;
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0, USHORT nOpt=0) const;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const;
+    virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
+    sal_Bool ImpIsFrameHandles() const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const;
 
     // Macht aus einer Winkelangabe in 1/100deg einen String inkl. Grad-Zeichen
-    BOOL ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
-    virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark);
-    BOOL MarkGluePoints(const Rectangle* pRect, BOOL bUnmark);
+    sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
+    virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
+    sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
 
-    void SetMoveOutside(BOOL bOn);
-    BOOL IsMoveOutside() const;
+    void SetMoveOutside(sal_Bool bOn);
+    sal_Bool IsMoveOutside() const;
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -198,7 +198,7 @@ protected:
     virtual ~SdrMarkView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -207,9 +207,9 @@ public:
 
     virtual void ClearPageView();
     virtual void HideSdrPage();
-    virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+    virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
 
-    // Liefert TRUE wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
+    // Liefert sal_True wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
     // selektiert werden (solange wie der Rahmen aufgezogen wird).
     sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
 
@@ -225,35 +225,35 @@ public:
     // Das Interface wird hier evtl noch geaendert wg. Ortho-Drag
     void SetDragMode(SdrDragMode eMode);
     SdrDragMode GetDragMode() const { return eDragMode; }
-    BOOL ChkDragMode(SdrDragMode eMode) const;
-    void SetFrameHandles(BOOL bOn);
-    BOOL IsFrameHandles() const { return bForceFrameHandles; }
+    sal_Bool ChkDragMode(SdrDragMode eMode) const;
+    void SetFrameHandles(sal_Bool bOn);
+    sal_Bool IsFrameHandles() const { return bForceFrameHandles; }
     
     // Limit, ab wann implizit auf FrameHandles umgeschaltet wird. default=50.
-    void SetFrameHandlesLimit(USHORT nAnz) { nFrameHandlesLimit=nAnz; }
-    USHORT GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
+    void SetFrameHandlesLimit(sal_uInt16 nAnz) { nFrameHandlesLimit=nAnz; }
+    sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
 
     void SetEditMode(SdrViewEditMode eMode);
     SdrViewEditMode GetEditMode() const { return eEditMode; }
 
-    void SetEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
-    BOOL IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
-    void SetCreateMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
-    BOOL IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
-    void SetGluePointEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
-    BOOL IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
+    void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
+    sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
+    void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
+    sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
+    void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
+    sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
 
-    void SetDesignMode(BOOL bOn=TRUE);
-    BOOL IsDesignMode() const { return bDesignMode; }
+    void SetDesignMode(sal_Bool bOn=sal_True);
+    sal_Bool IsDesignMode() const { return bDesignMode; }
 
-    void SetFrameDragSingles(BOOL bOn=TRUE) { SetFrameHandles(bOn); }
-    BOOL IsFrameDragSingles() const { return IsFrameHandles(); }
+    void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
+    sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
 
     // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt
     // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special).
     SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const;
-    BOOL HasMarkableObj() const;
-    ULONG GetMarkableObjCount() const;
+    sal_Bool HasMarkableObj() const;
+    sal_uIntPtr GetMarkableObjCount() const;
     //HMHvoid ShowMarkHdl(bool bNoRefHdl = false);
     //HMHvoid HideMarkHdl(bool bNoRefHdl = false);
     //HMHBOOL IsMarkHdlShown() const { return bHdlShown; }
@@ -269,11 +269,11 @@ protected:
 public:
     // all available const methods for read access to selection
     const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); }
-    ULONG TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
-    SdrPageView* GetSdrPageViewOfMarkedByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
-    SdrMark* GetSdrMarkByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum); }
-    SdrObject* GetMarkedObjectByIndex(ULONG nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
-    ULONG GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
+    sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
+    SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
+    SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); }
+    SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
+    sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
     void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
     sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
     String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
@@ -297,47 +297,47 @@ public:
     void showMarkHandles();
     bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; }
 
-    BOOL IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
-    BOOL IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
+    sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
+    sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
 
     // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD (ni)
-    SdrHdl* PickHandle(const Point& rPnt, ULONG nOptions=0, SdrHdl* pHdl0=NULL) const;
+    SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const;
     
     // Pick: Unterstuetzte Optionen fuer nOptions sind:
     // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT
     // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED
     // SDRSEARCH_WHOLEPAGE
-    virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const;
-    virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const;
-    // BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
-    BOOL MarkObj(const Point& rPnt, short nTol=-2, BOOL bToggle=FALSE, BOOL bDeep=FALSE);
+    virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+    virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+    // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
+    sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False);
 
     // Pick: Unterstuetzte Optionen fuer nOptions sind SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST
-    BOOL PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum=NULL, ULONG nOptions=0) const;
+    sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
     
     // Sucht sich das Oberste der markierten Objekte (O1) und sucht von dort
     // aus in Richtung nach Unten dann das erste nichtmarkierte Objekt (O2).
     // Bei Erfolg wird die Markierung von O1 entfernt, an O2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextObj(BOOL bPrev=FALSE);
+    sal_Bool MarkNextObj(sal_Bool bPrev=sal_False);
     
     // Sucht sich das Oberste der markierten Objekte (O1) das von rPnt/nTol
     // getroffen wird und sucht von dort aus in Richtung nach Unten dann das
     // erste nichtmarkierte Objekt (O2). Bei Erfolg wird die Markierung von
-    // O1 entfernt, an O2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextObj(const Point& rPnt, short nTol=-2, BOOL bPrev=FALSE);
+    // O1 entfernt, an O2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False);
     
     // Alle Objekte innerhalb eines rechteckigen Bereichs markieren
     // Markiert werden nur Objekte, die vollstaendig eingeschlossen sind.
-    BOOL MarkObj(const Rectangle& rRect, BOOL bUnmark=FALSE);
-    void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE);
+    sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False);
+    void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False);
     void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
     void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
     
     // Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss.
-    BOOL IsObjMarked(SdrObject* pObj) const;
+    sal_Bool IsObjMarked(SdrObject* pObj) const;
     // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline
     void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); }
 
@@ -345,8 +345,8 @@ public:
     // Der Wert ist als Kantenlaenge zu betrachten. Gerade Werte werden
     // auf Ungerade aufgerundet: 3->3, 4->5, 5->5, 6->7, 7->7, ...
     // Defaultwert ist 7, Mindestwert 3 Pixel.
-    USHORT GetMarkHdlSizePixel() const;
-    void SetMarkHdlSizePixel(USHORT nSiz);
+    sal_uInt16 GetMarkHdlSizePixel() const;
+    void SetMarkHdlSizePixel(sal_uInt16 nSiz);
     
     // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung
     // und die Groesse des Bereichs der markierten Objekte so angepasst, dass
@@ -354,53 +354,53 @@ public:
     // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der
     // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben.
     // Defaultwert ist 3, Mindestwert 3 Pixel.
-    BOOL IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
-    void SetSolidMarkHdl(BOOL bOn);
+    sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
+    void SetSolidMarkHdl(sal_Bool bOn);
 
-    virtual BOOL HasMarkablePoints() const;
-    virtual ULONG GetMarkablePointCount() const;
-    virtual BOOL HasMarkedPoints() const;
-    virtual ULONG GetMarkedPointCount() const;
+    virtual sal_Bool HasMarkablePoints() const;
+    virtual sal_uIntPtr GetMarkablePointCount() const;
+    virtual sal_Bool HasMarkedPoints() const;
+    virtual sal_uIntPtr GetMarkedPointCount() const;
 
     // Nicht alle Punkte lassen sich markieren:
-    virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const;
-    virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE);
+    virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const;
+    virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
     
     /** should only be used from outside svx for special ui elements */
-    BOOL MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
+    sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
 
     // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
-    BOOL MarkPoints(const Rectangle& rRect, BOOL bUnmark=FALSE) { return MarkPoints(&rRect,bUnmark); }
-    BOOL UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
-    BOOL UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
-    BOOL IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
-    BOOL MarkAllPoints() { return MarkPoints(NULL,FALSE); }
-    BOOL UnmarkAllPoints() { return MarkPoints(NULL,TRUE); }
-    BOOL UnMarkAllPoints() { return MarkPoints(NULL,TRUE); }
+    sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); }
+    sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+    sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+    sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
+    sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); }
+    sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); }
+    sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); }
     
     // Sucht sich den ersten markierten Punkt (P1) und sucht von dort
     // aus in den ersten nichtmarkierte Punkt (P2).
     // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextPoint(BOOL bPrev=FALSE);
+    sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False);
     
     // Sucht sich den ersten markierten Punkt (P1) das von rPnt
     // getroffen wird und sucht von dort aus den
     // ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von
-    // P1 entfernt, an P2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextPoint(const Point& rPnt, BOOL bPrev=FALSE);
+    // P1 entfernt, an P2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False);
     
     // Die Nummer des passenden Handles raussuchen. Nicht gefunden
     // liefert CONTAINER_ENTRY_NOTFOUND.
-    ULONG GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
-    SdrHdl* GetHdl(ULONG nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
+    sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
+    SdrHdl* GetHdl(sal_uIntPtr nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
     const SdrHdlList& GetHdlList() const { return aHdl; }
 
     // Selektionsrahmen fuer Punktmarkierung aufziehen.
-    // Wird nur gestartet, wenn HasMarkablePoints() TRUE liefert.
-    // BOOL BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
+    // Wird nur gestartet, wenn HasMarkablePoints() sal_True liefert.
+    // sal_Bool BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
     sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
     void MovMarkPoints(const Point& rPnt);
     sal_Bool EndMarkPoints();
@@ -408,21 +408,21 @@ public:
     sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
 
     // Zusatzhandles dauerhaft sichtbar schalten
-    void SetPlusHandlesAlwaysVisible(BOOL bOn);
-    BOOL IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
+    void SetPlusHandlesAlwaysVisible(sal_Bool bOn);
+    sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
 
     // Handles sichrbar waerend TextEdit (in doppelter Groesse)?
     // Persistent, default=FALSE
-    void SetMarkHdlWhenTextEdit(BOOL bOn) { bMarkHdlWhenTextEdit=bOn; }
-    BOOL IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
+    void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; }
+    sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
     
-    BOOL HasMarkableGluePoints() const;
-    ULONG GetMarkableGluePointCount() const;
-    BOOL HasMarkedGluePoints() const;
-    ULONG GetMarkedGluePointCount() const;
+    sal_Bool HasMarkableGluePoints() const;
+    sal_uIntPtr GetMarkableGluePointCount() const;
+    sal_Bool HasMarkedGluePoints() const;
+    sal_uIntPtr GetMarkedGluePointCount() const;
 
     // Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject
-    // (dem er zugehoert) sowie einem USHORT nId (da jedes SdrObject je
+    // (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je
     // mehrere Klebepunkte haben kann. Hier an der View kommt zudem noch
     // eine SdrPageView, die stets korrekt gesetzt sein sollte.
     // Alternativ kann ein Klebepunkt durch ein SdrHdl bezeichnet werden.
@@ -433,52 +433,52 @@ public:
     // Handleliste erneut berechnet. Alle vorher gemerkten SdrHdl* sind
     // damit ungueltig, ebenso die Punkt-Id's!
     // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD
-    BOOL PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions=0) const;
-    BOOL MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV, BOOL bUnmark=FALSE);
-    BOOL UnmarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,TRUE); }
-    BOOL IsGluePointMarked(const SdrObject* pObj, USHORT nId) const;
-    BOOL UnmarkGluePoint(const SdrHdl& rHdl);
+    sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+    sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False);
+    sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); }
+    sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
+    sal_Bool UnmarkGluePoint(const SdrHdl& rHdl);
 
     // Hdl eines markierten GluePoints holen. Nicht markierte
     // GluePoints haben keine Handles
-    SdrHdl* GetGluePointHdl(const SdrObject* pObj, USHORT nId) const;
-    BOOL IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
+    SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
+    sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
     
     // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
-    BOOL MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,FALSE); }
-    BOOL UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,TRUE); }
-    BOOL MarkAllGluePoints() { return MarkGluePoints(NULL,FALSE); }
-    BOOL UnmarkAllGluePoints() { return MarkGluePoints(NULL,TRUE); }
+    sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); }
+    sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); }
+    sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); }
+    sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); }
     
     // Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort
     // aus in den ersten nichtmarkierte Klebepunkt (P2).
     // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-    // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+    // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
     // andere Richtung.
-    BOOL MarkNextGluePoint(BOOL bPrev=FALSE);
+    sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False);
     
     // Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt
     // getroffen wird und sucht von dort aus den
     // ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung
-    // von P1 entfernt, an P2 gesetzt und TRUE returniert.
-    // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
-    BOOL MarkNextGluePoint(const Point& rPnt, BOOL bPrev=FALSE);
+    // von P1 entfernt, an P2 gesetzt und sal_True returniert.
+    // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+    sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False);
 
     // Selektionsrahmen fuer Klebepunktmarkierung aufziehen.
-    // Wird nur gestartet, wenn HasMarkableGluePoints() TRUE liefert.
-    // Der GlueEditMode TRUE wird nicht abgefragt.
-    // BOOL BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
+    // Wird nur gestartet, wenn HasMarkableGluePoints() sal_True liefert.
+    // Der GlueEditMode sal_True wird nicht abgefragt.
+    // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
     sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
     void MovMarkGluePoints(const Point& rPnt);
     sal_Bool EndMarkGluePoints();
     void BrkMarkGluePoints();
     sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
     
-    // bRestraintPaint=FALSE bewirkt, dass die Handles nicht sofort wieder gemalt werden.
+    // bRestraintPaint=sal_False bewirkt, dass die Handles nicht sofort wieder gemalt werden.
     // AdjustMarkHdl wird eh' nur gerufen, wenn was geaendert wurde; was idR ein Invalidate
     // zur Folge hat. Am Ende von des Redraw werden die Handles automatisch gezeichnet.
-    // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb TRUE!
-    void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=TRUE);
+    // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb sal_True!
+    void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=sal_True);
 
     const Rectangle& GetMarkedObjRect() const; // SnapRects der Objekte, ohne Strichstaerke
     Rectangle GetMarkedObjBoundRect() const;   // inkl. Strichstaerke, ueberstehende Fetzen, ...
@@ -498,9 +498,9 @@ public:
     // liegen alle Memberobjekte der Gruppe im direkten Zugriff. Alle anderen
     // Objekte koennen waerendessen nicht bearbeitet werden (bis zum naechsten
     // LeaveGroup()). Bei einer seitenuebergreifenden Markierung wird jede Page
-    // separat abgearbeitet. Die Methode liefert TRUE, wenn wenigstens eine
+    // separat abgearbeitet. Die Methode liefert sal_True, wenn wenigstens eine
     // Gruppe betreten wurde.
-    BOOL EnterMarkedGroup();
+    sal_Bool EnterMarkedGroup();
 
     // Den Mittelpunkt des letzten Crook-Dragging abholen. Den kann man
     // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 239f345909..1f05850ad2 100644..100755
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -175,7 +175,7 @@ public:
     };
     sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
     virtual void SetModel(SdrModel* pNewModel);
@@ -200,7 +200,7 @@ public:
     virtual void NbcSetSnapRect(const Rectangle& rRect);
     virtual void NbcSetLogicRect(const Rectangle& rRect);
 
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
 
     virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr );
 
@@ -224,7 +224,7 @@ public:
     virtual void EndTextEdit( SdrOutliner& rOutl );
     virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
     virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void operator=(const SdrObject& rObj);
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -237,7 +237,7 @@ public:
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void SetPage( SdrPage* pNewPage );
 
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index 63899a2ae9..71494b37b4 100644..100755
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -75,10 +75,10 @@ public:
     TYPEINFO();
 
     // Feststellen, ob bFilledObj && Fuellung!=FillNone
-    BOOL HasFill() const;
+    sal_Bool HasFill() const;
 
     // Feststellen, ob Linie!=LineNone
-    BOOL HasLine() const;
+    sal_Bool HasLine() const;
 
     virtual const Rectangle& GetSnapRect() const;
 
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 8dd6551c3a..f1660702ef 100644..100755
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -183,7 +183,7 @@ public:
     OutputDevice*				pOut;
     const SetOfByte*			pVisiLayer;
     const SdrPageView*			pPageView;
-    USHORT						nTol;
+    sal_uInt16						nTol;
     bool                        bDown;
 
 public:
@@ -192,7 +192,7 @@ public:
         pVisiLayer(NULL),
         pPageView(NULL),
         nTol(0),
-        bDown(FALSE)
+        bDown(sal_False)
     {}
 };
 
@@ -209,9 +209,9 @@ public:
 class SVX_DLLPUBLIC SdrObjUserData
 {
 protected:
-    UINT32						nInventor;
-    UINT16						nIdentifier;
-    UINT16						nVersion;
+    sal_uInt32						nInventor;
+    sal_uInt16						nIdentifier;
+    sal_uInt16						nVersion;
 
 private:
     SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData);        // nicht implementiert
@@ -221,7 +221,7 @@ private:
 public:
     TYPEINFO();
 
-    SdrObjUserData(UINT32 nInv, UINT16 nId, UINT16 nVer)
+    SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer)
     :	nInventor(nInv),
         nIdentifier(nId),
         nVersion(nVer)
@@ -234,8 +234,8 @@ public:
     virtual ~SdrObjUserData();
 
     virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
-    UINT32  GetInventor() const { return nInventor; }
-    UINT16  GetId() const { return nIdentifier; }
+    sal_uInt32  GetInventor() const { return nInventor; }
+    sal_uInt16  GetId() const { return nIdentifier; }
 
     virtual bool HasMacro (const SdrObject* pObj) const;
     virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
@@ -260,17 +260,17 @@ public:
     ~SdrObjUserDataList() { Clear(); }
 
     void Clear();
-    USHORT GetUserDataCount() const { return USHORT(aList.Count()); }
-    SdrObjUserData* GetUserData(USHORT nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
-    void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF) { aList.Insert(pData,nPos); }
-    SdrObjUserData* RemoveUserData(USHORT nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
-    void DeleteUserData(USHORT nNum) { delete RemoveUserData(nNum); }
+    sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); }
+    SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
+    void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); }
+    SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
+    void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); }
 };
 
 //************************************************************
 //   Hilfsklasse SdrObjGeoData
 //
-// Alle geometrischen Daten eines beliebigen Objektes zur Übergabe an's Undo/Redo
+// Alle geometrischen Daten eines beliebigen Objektes zur �bergabe an's Undo/Redo
 //
 //************************************************************
 
@@ -280,10 +280,10 @@ public:
     Rectangle					aBoundRect;
     Point						aAnchor;
     SdrGluePointList*			pGPL;
-    BOOL						bMovProt;
-    BOOL						bSizProt;
-    BOOL						bNoPrint;
-    BOOL						bClosedObj;
+    sal_Bool						bMovProt;
+    sal_Bool						bSizProt;
+    sal_Bool						bNoPrint;
+    sal_Bool						bClosedObj;
     bool						mbVisible;
     SdrLayerID					mnLayerID;
 
@@ -304,7 +304,7 @@ class SdrObjPlusData
     friend class				SdrObject;
 
 public:
-    SfxBroadcaster*				pBroadcast;    // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc.
+    SfxBroadcaster*				pBroadcast;    // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc.
     SdrObjUserDataList*			pUserDataList; // applikationsspeziefische Daten
     SdrGluePointList*			pGluePoints;   // Klebepunkte zum Ankleben von Objektverbindern
     AutoTimer*					pAutoTimer;
@@ -335,49 +335,49 @@ public:
 class SdrObjTransformInfoRec
 {
 public:
-    unsigned					bSelectAllowed : 1;     // FALSE=Obj kann nicht selektiert werden
-    unsigned					bMoveAllowed : 1;       // FALSE=Obj kann nicht verschoben werden
-    unsigned					bResizeFreeAllowed : 1; // FALSE=Obj kann nicht frei resized werden
-    unsigned					bResizePropAllowed : 1; // FALSE=Obj kann nichtmal proportional resized werden
-    unsigned					bRotateFreeAllowed : 1; // FALSE=Obj kann nicht frei gedreht werden
-    unsigned					bRotate90Allowed : 1;   // FALSE=Obj kann nichtmal im 90deg Raster gedreht werden
-    unsigned					bMirrorFreeAllowed : 1; // FALSE=Obj kann nicht frei gespiegelt werden
-    unsigned					bMirror45Allowed : 1;   // FALSE=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
-    unsigned					bMirror90Allowed : 1;   // FALSE=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
-    unsigned					bTransparenceAllowed : 1; // FALSE=Obj does not have an interactive transparence control
-    unsigned					bGradientAllowed : 1; // FALSE=Obj dooes not have an interactive gradient control
-    unsigned					bShearAllowed : 1;      // FALSE=Obj kann nicht verzerrt werden
+    unsigned					bSelectAllowed : 1;     // sal_False=Obj kann nicht selektiert werden
+    unsigned					bMoveAllowed : 1;       // sal_False=Obj kann nicht verschoben werden
+    unsigned					bResizeFreeAllowed : 1; // sal_False=Obj kann nicht frei resized werden
+    unsigned					bResizePropAllowed : 1; // sal_False=Obj kann nichtmal proportional resized werden
+    unsigned					bRotateFreeAllowed : 1; // sal_False=Obj kann nicht frei gedreht werden
+    unsigned					bRotate90Allowed : 1;   // sal_False=Obj kann nichtmal im 90deg Raster gedreht werden
+    unsigned					bMirrorFreeAllowed : 1; // sal_False=Obj kann nicht frei gespiegelt werden
+    unsigned					bMirror45Allowed : 1;   // sal_False=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
+    unsigned					bMirror90Allowed : 1;   // sal_False=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
+    unsigned					bTransparenceAllowed : 1; // sal_False=Obj does not have an interactive transparence control
+    unsigned					bGradientAllowed : 1; // sal_False=Obj dooes not have an interactive gradient control
+    unsigned					bShearAllowed : 1;      // sal_False=Obj kann nicht verzerrt werden
     unsigned					bEdgeRadiusAllowed : 1;
-    unsigned					bNoOrthoDesired : 1;    // TRUE bei Rect; ... FALSE bei BMP,MTF;
-    unsigned					bNoContortion : 1;      // FALSE=Kein verzerren (bei Crook) moeglich (nur TRUE bei PathObj und Gruppierten PathObjs)
-    unsigned					bCanConvToPath : 1;     // FALSE=Keine Konvertierung in PathObj moeglich
-    unsigned					bCanConvToPoly : 1;     // FALSE=Keine Konvertierung in PolyObj moeglich
-    unsigned					bCanConvToContour : 1;     // FALSE=no conversion down to whole contour possible
-    unsigned					bCanConvToPathLineToArea : 1; // FALSE=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
-    unsigned					bCanConvToPolyLineToArea : 1; // FALSE=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
+    unsigned					bNoOrthoDesired : 1;    // sal_True bei Rect; ... sal_False bei BMP,MTF;
+    unsigned					bNoContortion : 1;      // sal_False=Kein verzerren (bei Crook) moeglich (nur sal_True bei PathObj und Gruppierten PathObjs)
+    unsigned					bCanConvToPath : 1;     // sal_False=Keine Konvertierung in PathObj moeglich
+    unsigned					bCanConvToPoly : 1;     // sal_False=Keine Konvertierung in PolyObj moeglich
+    unsigned					bCanConvToContour : 1;     // sal_False=no conversion down to whole contour possible
+    unsigned					bCanConvToPathLineToArea : 1; // sal_False=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
+    unsigned					bCanConvToPolyLineToArea : 1; // sal_False=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
 
 public:
     SdrObjTransformInfoRec()
-    :	bSelectAllowed(TRUE),
-        bMoveAllowed(TRUE),
-        bResizeFreeAllowed(TRUE),
-        bResizePropAllowed(TRUE),
-        bRotateFreeAllowed(TRUE),
-        bRotate90Allowed(TRUE),
-        bMirrorFreeAllowed(TRUE),
-        bMirror45Allowed(TRUE),
-        bMirror90Allowed(TRUE),
-        bTransparenceAllowed(TRUE),
-        bGradientAllowed(TRUE),
-        bShearAllowed(TRUE),
-        bEdgeRadiusAllowed(TRUE),
-        bNoOrthoDesired(TRUE),
-        bNoContortion(TRUE),
-        bCanConvToPath(TRUE),
-        bCanConvToPoly(TRUE),
-        bCanConvToContour(FALSE),
-        bCanConvToPathLineToArea(TRUE),
-        bCanConvToPolyLineToArea(TRUE)
+    :	bSelectAllowed(sal_True),
+        bMoveAllowed(sal_True),
+        bResizeFreeAllowed(sal_True),
+        bResizePropAllowed(sal_True),
+        bRotateFreeAllowed(sal_True),
+        bRotate90Allowed(sal_True),
+        bMirrorFreeAllowed(sal_True),
+        bMirror45Allowed(sal_True),
+        bMirror90Allowed(sal_True),
+        bTransparenceAllowed(sal_True),
+        bGradientAllowed(sal_True),
+        bShearAllowed(sal_True),
+        bEdgeRadiusAllowed(sal_True),
+        bNoOrthoDesired(sal_True),
+        bNoContortion(sal_True),
+        bCanConvToPath(sal_True),
+        bCanConvToPoly(sal_True),
+        bCanConvToContour(sal_False),
+        bCanConvToPathLineToArea(sal_True),
+        bCanConvToPolyLineToArea(sal_True)
     {}
 };
 
@@ -467,7 +467,7 @@ protected:
     unsigned					bVirtObj : 1;
     unsigned					bSnapRectDirty : 1;
     unsigned					bNetLock : 1;   // ni
-    unsigned					bInserted : 1;  // nur wenn TRUE gibt's RepaintBroadcast & SetModify
+    unsigned					bInserted : 1;  // nur wenn sal_True gibt's RepaintBroadcast & SetModify
     unsigned					bGrouped : 1;   // Member eines GroupObjektes?
 
     // Die folgende Flags werden gestreamt
@@ -475,7 +475,7 @@ protected:
     unsigned					bSizProt : 1; // If true, the size is protected
     unsigned					bNoPrint : 1; // If true, the object is not printed.
     unsigned					mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint
-    // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein
+    // Wenn bEmptyPresObj sal_True ist, handelt es sich um ein
     // Praesentationsobjekt, dem noch kein Inhalt zugewiesen
     // wurde. Default ist das Flag auf FALSE. Die Verwaltung
     // uebernimmt die Applikation. Im Zuweisungsoperator sowie
@@ -483,10 +483,10 @@ protected:
     // Das Flag ist persistent.
     unsigned					bEmptyPresObj : 1;     // Leeres Praesentationsobjekt (Draw)
 
-    // TRUE=Objekt ist als Objekt der MasterPage nicht sichtbar
+    // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar
     unsigned					bNotVisibleAsMaster : 1;
 
-    // TRUE=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
+    // sal_True=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
     unsigned					bClosedObj : 1;
 
     unsigned					bIsEdge : 1;
@@ -519,14 +519,14 @@ protected:
     Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
 
     // Fuer GetDragComment
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0) const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const;
 
     void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); }
 
     String GetWinkStr(long nWink, bool bNoDegChar = false) const;
     String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const;
 
-    // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
+    // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
     // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
     // i.d.R. gleich mit um die Neuberechnung zu sparen.
 public:
@@ -578,8 +578,8 @@ public:
 
     virtual void AddReference(SdrVirtObj& rVrtObj);
     virtual void DelReference(SdrVirtObj& rVrtObj);
-    virtual UINT32 GetObjInventor() const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
     // Layer interface
@@ -627,15 +627,15 @@ public:
     // Wird die Reihenfolge der Objekte in der Liste veraendert, so wird ein
     // Dirty-Flag gesetzt (an der Page). Beim naechsten SdrObject::GetOrdNum()
     // werden die Ordnungsnummer aller Objekte der Liste neu bestimmt.
-    UINT32 GetOrdNum() const;
+    sal_uInt32 GetOrdNum() const;
 
     // Diese Methode sollte nur verwendet werden, wenn man ganz  genau weiss,
     // was man macht:
-    UINT32 GetOrdNumDirect() const { return nOrdNum; }
+    sal_uInt32 GetOrdNumDirect() const { return nOrdNum; }
 
     // Das Setzen der Ordnungsnummer sollte nur vom Model bzw. von der Page
     // geschehen.
-    void SetOrdNum(UINT32 nNum) { nOrdNum=nNum; }
+    void SetOrdNum(sal_uInt32 nNum) { nOrdNum=nNum; }
 
     /** Return the position in the navigation order for the called object.
         Note that this method may update the navigation position of the
@@ -684,7 +684,7 @@ public:
     // Tooling for painting a single object to a OutputDevice. This will be needed as long
     // as not all painting is changed to use DrawContact objects.
     sal_Bool SingleObjectPainter(OutputDevice& rOut) const;
-    BOOL LineGeometryUsageIsNecessary() const;
+    sal_Bool LineGeometryUsageIsNecessary() const;
 
     // Clone() soll eine komplette Kopie des Objektes erzeugen.
     virtual SdrObject* Clone() const;
@@ -711,7 +711,7 @@ public:
     // Polygon wird das wohl ein einfacher Selektionshandle sein, bei einer
     // Bezierkurve dagegen koennen das schon bis zu 3 Handles werden (inkl Gewichte).
     // GetHdl() und GetPlusHdl() muessen Handleinstanzen mit new erzeugen!
-    // Ein Objekt, das bei HasSpacialDrag() TRUE liefert muss diese Methoden
+    // Ein Objekt, das bei HasSpacialDrag() sal_True liefert muss diese Methoden
     // zur Verfuegung stellen (inkl. FillHdlList).
     virtual sal_uInt32 GetHdlCount() const;
     virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
@@ -725,8 +725,8 @@ public:
     // Stuetzstellen bei Splines, Gewichte bei Bezierkurven und Pointer von
     // Labelobjekten muss vom Objekt selbst gehandled werden. Um das Model
     // Statusfrei zu halten werden die Statusdaten an der View gehalten und dem
-    // Objekt dann uebergeben. EndDrag liefrt im Normalfall TRUE fuer Erfolg.
-    // FALSE kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
+    // Objekt dann uebergeben. EndDrag liefrt im Normalfall sal_True fuer Erfolg.
+    // sal_False kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
     // veraendert hat, wobei dir evtl. Tatsache das die Maus nicht bewegt wurde
     // bereits von der View abgefangen wird.
     virtual bool hasSpecialDrag() const;
@@ -750,14 +750,14 @@ public:
     // BegCreate()-Methode gerufen. Bei jedem MausMode wird dann MovCreate
     // gerufen. BrkCreate() bedeutet, dass der User die interaktive Objekt-
     // erzeugung abgebrochen hat. EndCreate() wird gerufen beim MouseUp-Event.
-    // Liefert EndCreate() ein TRUE, so ist die Objekterzeugung abgeschlossen;
+    // Liefert EndCreate() ein sal_True, so ist die Objekterzeugung abgeschlossen;
     // das Objekt wird in die entsprechende Liste eingefuegt. Andernfalls
-    // (EndCreate()==FALSE) gehe ich davon aus, dass weitere Punkte zur
+    // (EndCreate()==sal_False) gehe ich davon aus, dass weitere Punkte zur
     // Objekterzeugung notwendig sind (Polygon,...). Der Parameter eCmd
     // enthaelt die Anzahl der Mausklicks (so die App diese durchreicht).
     // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten
     // Polygonpunkt wieder loeschen).
-    // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen.
+    // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen.
     virtual bool BegCreate(SdrDragStat& rStat);
     virtual bool MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
     virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
@@ -923,10 +923,10 @@ public:
     // Automatische Klebepunkte:
     // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern
     // i.d.R. 0=oben, 1=rechts, 2=unten, 3=links
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
 
     // i.d.R. 0=linksoben, 1=rechtsoben, 2=rechtsunten, 3=linksunten
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
 
     // Liste aller Klebepunkte. Kann NULL sein.
     virtual const SdrGluePointList* GetGluePointList() const;
@@ -971,9 +971,9 @@ public:
     // Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden
     // Methoden ueberladen werden.
     // Z.B. Ein RectObj mit Strichstaerke 10, SOLID_PEN in Polygon wandeln:
-    // Im Modus bLineToArea=FALSE soll ein PolyObj mit 4 Stuetzstellen,
+    // Im Modus bLineToArea=sal_False soll ein PolyObj mit 4 Stuetzstellen,
     // Strichstaerke 10 und SOLiD_PEN erzeugt werden.
-    // Im Modus bLineToArea=TRUE dagegen soll das generierte Obj immer ein
+    // Im Modus bLineToArea=sal_True dagegen soll das generierte Obj immer ein
     // LinienAttribut NULL_PEN haben, und die Linie (auch Linienmuster) selbst
     // durch Polygonflaechen emuliert werden, die dadurch anschliessend vom
     // Anwender manipuliert werden koennen. Das RectObj kann sich somit also
@@ -985,21 +985,21 @@ public:
     // Der Returnwert ist jeweils ein SdrObject*, da als Rueckgabe zur Not
     // auch Gruppenobjekte erlaubt sind (z.B. fuer SdrTextObj).
     // Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein,
-    // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind.
+    // dass beide Modi (bLineToArea=sal_True/sal_False) identisch sind.
     // Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL).
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
-    SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
+    SdrObject* ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const;
 
     // convert this path object to contour object; bForceLineDash converts even
     // when there is no filled new polygon created from line-to-polygon conversion,
     // specially used for XLINE_DASH and 3D conversion
-    SdrObject* ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
-    SdrObject* ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
+    SdrObject* ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
+    SdrObject* ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
 
     // TRUE: Referenz auf ein Obj
     sal_Bool IsVirtualObj() const { return bVirtObj; }
 
-    // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben.
+    // sal_True=Obj kann warsch. gefuellt werden; sal_False=Obj kann warsch. Linienenden haben.
     // ungueltig, wenn es sich um ein GroupObj handelt.
     sal_Bool IsClosedObj() const { return bClosedObj; }
 
@@ -1007,8 +1007,8 @@ public:
     sal_Bool Is3DObj() const { return bIs3DObj; }
     sal_Bool IsUnoObj() const { return bIsUnoObj; }
     sal_Bool IsMasterCachable() const { return !bNotMasterCachable; }
-    sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=TRUE; return r; }
-    void ShareUnlock() { bNetLock=FALSE; }
+    sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=sal_True; return r; }
+    void ShareUnlock() { bNetLock=sal_False; }
     sal_Bool IsShareLock() const { return bNetLock; }
     void SetMarkProtect(sal_Bool bProt) { bMarkProt=bProt; }
     sal_Bool IsMarkProtect() const { return bMarkProt; }
@@ -1036,16 +1036,16 @@ public:
     sal_Bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange; }
 
     // applikationsspeziefische Daten
-    USHORT GetUserDataCount() const;
-    SdrObjUserData* GetUserData(USHORT nNum) const;
+    sal_uInt16 GetUserDataCount() const;
+    SdrObjUserData* GetUserData(sal_uInt16 nNum) const;
 
     // Insert uebernimmt den auf dem Heap angelegten Record in den Besitz
     // des Zeichenobjekts
-    void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF);
+    void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF);
 
     // Delete entfernt den Record aus der Liste und ruft
     // ein delete (FreeMem+Dtor).
-    void DeleteUserData(USHORT nNum);
+    void DeleteUserData(sal_uInt16 nNum);
 
     // ItemPool fuer dieses Objekt wechseln
     void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
@@ -1109,7 +1109,7 @@ public:
     // to use (0,0) as upper left and will be scaled to the given size in the matrix.
     virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
 
-    sal_Bool IsTransparent( BOOL bCheckForAlphaChannel = FALSE ) const;
+    sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const;
 
     // #116168#
     // Give info if object is in destruction
@@ -1156,8 +1156,8 @@ private:
 class SVX_DLLPUBLIC SdrObjFactory
 {
 public:
-    UINT32						nInventor;
-    UINT16						nIdentifier;
+    sal_uInt32						nInventor;
+    sal_uInt16						nIdentifier;
 
     // fuer MakeNewObj():
     SdrPage*					pPage;
@@ -1169,14 +1169,14 @@ public:
     SdrObjUserData*				pNewData;
 
 private:
-    SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
-    SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1);
+    SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
+    SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1);
 
 public:
-    static SdrObject* MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
+    static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
     static void InsertMakeObjectHdl(const Link& rLink);
     static void RemoveMakeObjectHdl(const Link& rLink);
-    static SdrObjUserData* MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj);
+    static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj);
     static void InsertMakeUserDataHdl(const Link& rLink);
     static void RemoveMakeUserDataHdl(const Link& rLink);
 };
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index 4a6ae09b98..454a6b1471 100644..100755
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -93,15 +93,15 @@ public:
     virtual ~SdrCaptionObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void operator=(const SdrObject& rObj);
 
     // for calc: special shadow only for text box
-    void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = TRUE; }
+    void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; }
     sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
 
     // for calc: fixed note tail position. 
-    void SetFixedTail() { mbFixedTail = TRUE; }
+    void SetFixedTail() { mbFixedTail = sal_True; }
 
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
@@ -150,7 +150,7 @@ protected:
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
 
 public:
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     const Point& GetTailPos() const;
     void SetTailPos(const Point& rPos);
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index 0d692db288..9b65e459fd 100644..100755
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -82,7 +82,7 @@ private:
     SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren
     SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren
 
-    // Liefert TRUE, wenn das Painten ein XPolygon erfordert.
+    // Liefert sal_True, wenn das Painten ein XPolygon erfordert.
     SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
     SVX_DLLPRIVATE virtual void RecalcXPoly();
 
@@ -104,7 +104,7 @@ public:
     virtual ~SdrCircObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -138,7 +138,7 @@ public:
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
     virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
     virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
 protected:
     virtual SdrObjGeoData* NewGeoData() const;
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 9ebd7028fb..6186670b85 100644..100755
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -59,13 +59,13 @@ protected:
     SdrObject*					pObj;          // Referenziertes Objekt
     long						nXDist;        // Hor. Objektabstand wenn bXDistOvr=TRUE
     long						nYDist;        // Vert. Objektabstand wenn bYDistOvr=TRUE
-    USHORT						nConId;        // Konnektornummer
+    sal_uInt16						nConId;        // Konnektornummer
 
     // bitfield
-    unsigned					bBestConn : 1;   // TRUE= es wird der guenstigste Konnektor gesucht
-    unsigned					bBestVertex : 1; // TRUE= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
-    unsigned					bXDistOvr : 1;   // TRUE= Hor. Objektabstand wurde gedragt (Overwrite)
-    unsigned					bYDistOvr : 1;   // TRUE= Vert. Objektabstand wurde gedragt (Overwrite)
+    unsigned					bBestConn : 1;   // sal_True= es wird der guenstigste Konnektor gesucht
+    unsigned					bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
+    unsigned					bXDistOvr : 1;   // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
+    unsigned					bYDistOvr : 1;   // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
     unsigned					bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
     unsigned					bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
 
@@ -76,14 +76,14 @@ public:
     void ResetVars();
     bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const;
 
-    inline void SetBestConnection( BOOL rB ) { bBestConn = rB; };
-    inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; };
-    inline void SetAutoVertex( BOOL rB ) { bAutoVertex = rB; };
-    inline void SetConnectorId( USHORT nId ) { nConId = nId; };
+    inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; };
+    inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; };
+    inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; };
+    inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
 
-    inline BOOL IsBestConnection() const { return bBestConn; };
-    inline BOOL IsBestVertex() const { return bBestVertex; };
-    inline BOOL IsAutoVertex() const { return bAutoVertex; };
+    inline sal_Bool IsBestConnection() const { return bBestConn; };
+    inline sal_Bool IsBestVertex() const { return bBestVertex; };
+    inline sal_Bool IsAutoVertex() const { return bAutoVertex; };
     inline sal_uInt16 GetConnectorId() const { return nConId; };
     inline SdrObject* GetObject() const { return pObj; }
 };
@@ -109,9 +109,9 @@ public:
     // Nachfolgende Werte werden von ImpCalcEdgeTrack gesetzt
     long						nAngle1;           // Austrittswinkel am Obj1
     long						nAngle2;           // Austrittswinkel am Obj2
-    USHORT						nObj1Lines;        // 1..3
-    USHORT						nObj2Lines;        // 1..3
-    USHORT						nMiddleLine;       // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
+    sal_uInt16						nObj1Lines;        // 1..3
+    sal_uInt16						nObj2Lines;        // 1..3
+    sal_uInt16						nMiddleLine;       // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
     char						cOrthoForm;        // Form des Ortho-Verbindes, z.B. 'Z','U',I','L','S',...
 
 public:
@@ -126,7 +126,7 @@ public:
 
     Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode);
     const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); }
-    USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
+    sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
     bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
     void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal);
     long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
@@ -142,7 +142,7 @@ public:
     SdrObjConnection			aCon1;  // Verbindungszustand des Linienanfangs
     SdrObjConnection			aCon2;  // Verbindungszustand des Linienendes
     XPolygon*					pEdgeTrack;
-    sal_Bool					bEdgeTrackDirty;// TRUE=Verbindungsverlauf muss neu berechnet werden.
+    sal_Bool					bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden.
     sal_Bool					bEdgeTrackUserDefined;
     SdrEdgeInfoRec				aEdgeInfo;
 
@@ -176,7 +176,7 @@ protected:
     SdrEdgeInfoRec				aEdgeInfo;
 
     // bitfield
-    unsigned					bEdgeTrackDirty : 1; // TRUE=Verbindungsverlauf muss neu berechnet werden.
+    unsigned					bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden.
     unsigned					bEdgeTrackUserDefined : 1;
 
     // #109007#
@@ -208,9 +208,9 @@ protected:
     XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const;
     XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
         const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
-        ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const;
+        sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
     static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL);
-    USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
+    sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
     bool ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte
     void ImpSetTailPoint(bool bTail1, const Point& rPt);
     void ImpUndirtyEdgeTrack();  // eventuelle Neuberechnung des Verbindungsverlaufs
@@ -226,19 +226,19 @@ public:
 
     SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); }
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual const Rectangle& GetCurrentBoundRect() const;
     virtual const Rectangle& GetSnapRect() const;
     virtual bool IsNode() const;
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
     virtual const SdrGluePointList* GetGluePointList() const;
     virtual SdrGluePointList* ForceGluePointList();
     virtual bool IsEdge() const;
 
     // bTail1=TRUE: Linienanfang, sonst LinienEnde
     // pObj=NULL: Disconnect
-    void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; }
+    void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; }
     void ConnectToNode(bool bTail1, SdrObject* pObj);
     void DisconnectFromNode(bool bTail1);
     SdrObject* GetConnectedNode(bool bTail1) const;
@@ -281,7 +281,7 @@ public:
     virtual void BrkCreate(SdrDragStat& rStat);
     virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
     virtual Pointer GetCreatePointer() const;
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual sal_uInt32 GetSnapPointCount() const;
     virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -301,8 +301,8 @@ public:
     void Reformat();
 
     // helper methods for the StarOffice api
-    Point GetTailPoint( BOOL bTail ) const;
-    void SetTailPoint( BOOL bTail, const Point& rPt );
+    Point GetTailPoint( sal_Bool bTail ) const;
+    void SetTailPoint( sal_Bool bTail, const Point& rPt );
     void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 );
     sal_Int32 getGluePointIndex( sal_Bool bTail );
 
@@ -321,24 +321,24 @@ public:
 //
 // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet:
 //
-//  USHORT EdgeFlowAngle       Default 9000 (=90.00 Deg), min 0, max 9000
+//  sal_uInt16 EdgeFlowAngle       Default 9000 (=90.00 Deg), min 0, max 9000
 //      Verlauffreiheitswinkel.
 //      Der Winkel, in dem die Verbindungslinie verlaufen darf.
 //
-//  USHORT EdgeEscAngle        Default 9000 (=90.00 Deg), min 0, max 9000
+//  sal_uInt16 EdgeEscAngle        Default 9000 (=90.00 Deg), min 0, max 9000
 //      Objektaustrittswinkel.
 //      Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf.
 //
-//  BOOL   EdgeEscAsRay        Default FALSE
-//      TRUE= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
+//  sal_Bool   EdgeEscAsRay        Default FALSE
+//      sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
 //      Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor.
 //
-//  BOOL   EdgeEscUseObjAngle  Default FALSE
+//  sal_Bool   EdgeEscUseObjAngle  Default FALSE
 //      Objektdrehwinkelberuecksichtigung.
-//      TRUE= Bei der Bestimmung des Objektaustrittswinkels wird der
+//      sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der
 //      Drehwinkel des Objekts als Offset beruecksichtigt.
 //
-//  ULONG  EdgeFlowDefDist     Default 0, min 0, max ?
+//  sal_uIntPtr  EdgeFlowDefDist     Default 0, min 0, max ?
 //      Das ist der Default-Mindestabstand der bei der Berechnung der
 //      Verbindungslinie zu den angedockten Objekten in logischen Einheiten.
 //      Dieser Abstand wird innerhalb des Objektes "ueberschrieben", sobald
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 232755f390..f361f01adc 100644..100755
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -121,7 +121,8 @@ protected:
 
     void					ImpLinkAnmeldung();
     void					ImpLinkAbmeldung();
-    sal_Bool				ImpUpdateGraphicLink() const;
+    sal_Bool				ImpUpdateGraphicLink( sal_Bool bAsynchron = sal_True ) const;
+    void					ImpSetLinkedGraphic( const Graphic& rGraphic );
                             DECL_LINK( ImpSwapHdl, GraphicObject* );
 
 public:
@@ -140,7 +141,7 @@ public:
     void					SetGraphic(const Graphic& rGrf);
     const Graphic&			GetGraphic() const;
 
-    Graphic					GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
+    Graphic					GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
 
     GraphicType				GetGraphicType() const;
 
@@ -161,7 +162,7 @@ public:
 
     void					SetGraphicLink(const String& rFileName, const String& rFilterName);
     void					ReleaseGraphicLink();
-    sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); }
+    sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); }
 
     void					SetFileName(const String& rFileName);
     const String&			GetFileName() const { return aFileName; }
@@ -172,7 +173,7 @@ public:
     void					StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
 
     virtual void			TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16			GetObjIdentifier() const;
+    virtual sal_uInt16			GetObjIdentifier() const;
 
     virtual void			TakeObjNameSingul(String& rName) const;
     virtual void			TakeObjNamePlural(String& rName) const;
@@ -201,7 +202,7 @@ public:
     virtual void			SetPage(SdrPage* pNewPage);
     virtual void			SetModel(SdrModel* pNewModel);
 
-    virtual SdrObject*		DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject*		DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void			AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
 
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 1f3a6046a3..c34ff7210f 100644..100755
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -65,7 +65,7 @@ public:
     virtual ~SdrObjGroup();
 
     virtual void SetBoundRectDirty();
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual SdrLayerID GetLayer() const;
     virtual void NbcSetLayer(SdrLayerID nLayer);
@@ -119,7 +119,7 @@ public:
     virtual void NbcReformatText();
     virtual void ReformatText();
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 };
 
 #endif //_SVDOGRP_HXX
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index ddab8e37a1..129ad66c30 100644..100755
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -86,7 +86,7 @@ protected:
     void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
     basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
     void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
-    void SetTextDirty() { bTextDirty=TRUE; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
+    void SetTextDirty() { bTextDirty=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
     void UndirtyText() const;
 
     virtual SdrObjGeoData* NewGeoData() const;
@@ -100,7 +100,7 @@ public:
     virtual ~SdrMeasureObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual void operator=(const SdrObject& rObj);
 
@@ -141,19 +141,19 @@ public:
     virtual Point GetPoint(sal_uInt32 i) const;
     virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
     virtual const Size& GetTextSize() const;
     virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
     virtual OutlinerParaObject* GetOutlinerParaObject() const;
 
-    virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+    virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
         bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
 
     // #i97878#
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index cccd7e308c..87ed2f5e78 100644..100755
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -57,7 +57,7 @@ public:
         virtual bool                HasTextEdit() const;
 
         virtual void				TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-        virtual UINT16				GetObjIdentifier() const;
+        virtual sal_uInt16				GetObjIdentifier() const;
 
         virtual void 				TakeObjNameSingul(String& rName) const;
         virtual void 				TakeObjNamePlural(String& rName) const;
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 3f3cf3b911..515ad8d214 100644..100755
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -69,8 +69,8 @@ protected:
     String						aProgName;
 
     // wg. Kompatibilitaet erstmal am SdrTextObj
-    BOOL						bFrame : 1;
-    BOOL						bInDestruction : 1;
+    sal_Bool						bFrame : 1;
+    sal_Bool						bInDestruction : 1;
     mutable bool                m_bTypeAsked;
     mutable bool                m_bChart;
 
@@ -141,7 +141,7 @@ public:
     virtual SdrObject* getFullDragClone() const;
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjNameSingul(String& rName) const;
     virtual void TakeObjNamePlural(String& rName) const;
 
@@ -156,7 +156,7 @@ public:
     static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
                                          sal_Int64 nAspect );
     static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
-    BOOL Unload();
+    sal_Bool Unload();
     void Connect();
     void Disconnect();
     void ObjectLoaded();
diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx
index 789251ccb2..31c607edb0 100644..100755
--- a/svx/inc/svx/svdopage.hxx
+++ b/svx/inc/svx/svdopage.hxx
@@ -63,7 +63,7 @@ public:
     // #i96598#
     virtual void SetBoundRectDirty();
 
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual void operator=(const SdrObject& rObj);
 
diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx
index 3327719875..57ebf01e81 100644..100755
--- a/svx/inc/svx/svdopath.hxx
+++ b/svx/inc/svx/svdopath.hxx
@@ -94,7 +94,7 @@ public:
     virtual ~SdrPathObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual void operator=(const SdrObject& rObj);
 
@@ -155,7 +155,7 @@ protected:
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
 
 public:
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     // Bezierpolygon holen/setzen
     const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; }
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index 354afb7552..e17bd4a205 100644..100755
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -63,7 +63,7 @@ protected:
     XPolygon*					mpXPoly;
 
 protected:
-    // Liefert TRUE, wenn das Painten ein Polygon erfordert.
+    // Liefert sal_True, wenn das Painten ein Polygon erfordert.
     bool PaintNeedsXPoly(long nEckRad) const;
 
 protected:
@@ -88,12 +88,12 @@ public:
     // Konstruktion eines Textrahmens
     SdrRectObj(SdrObjKind eNewTextKind);
     SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect);
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
     virtual ~SdrRectObj();
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual void TakeObjNameSingul(String& rName) const;
@@ -126,10 +126,10 @@ public:
     virtual bool DoMacro(const SdrObjMacroHitRec& rRec);
     virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
 
-    virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
-    virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+    virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+    virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 };
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index 9c67f4e872..66dd81303c 100644..100755
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -202,8 +202,8 @@ public:
 
     // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
     // der des EditOutliners) und die PaperSize gesetzt.
-    virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
-    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+    virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
+    virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth = sal_True ) const;
     virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const;
     virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
 
@@ -219,7 +219,7 @@ public:
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pNewModel);
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual void SetChanged();
 
     virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
@@ -266,7 +266,7 @@ public:
     virtual void EndTextEdit(SdrOutliner& rOutl);
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
     virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
 
     virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
 
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 967a7ddcc9..cd4ea83011 100644..100755
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -180,8 +180,8 @@ private:
 
 protected:
     // Das aRect ist gleichzeig auch das Rect vom RectObj und CircObj.
-    // Bei bTextFrame=TRUE wird der Text in dieses Rect hineinformatiert.
-    // Bei bTextFrame=FALSE wird der Text am Mittelpunkt des Rect zentriert.
+    // Bei bTextFrame=sal_True wird der Text in dieses Rect hineinformatiert.
+    // Bei bTextFrame=sal_False wird der Text am Mittelpunkt des Rect zentriert.
     Rectangle					aRect;
 
     // Der GeoStat enthaelt den Drehwinkel und einen Shearwinkel
@@ -208,7 +208,7 @@ protected:
     //     OBJ_TEXTEXT      Textfortsetzungsrahmen
     //     OBJ_TITLETEXT    TitleText fuer StarDraw-Praesentation
     //     OBJ_OUTLINETEXT  OutlineText fuer StarDraw-Praesentation
-    // eTextKind hat nur Bedeutung, wenn bTextFrame=TRUE, da es sich sonst
+    // eTextKind hat nur Bedeutung, wenn bTextFrame=sal_True, da es sich sonst
     // um ein beschriftetes Grafikobjekt handelt.
     SdrObjKind					eTextKind;
 
@@ -225,36 +225,36 @@ public:
 protected:
     // Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock
     // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
-    // TRUE wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
-    // ist durch ein SdrRectObj mit bTextFrame=TRUE realisiert.
-    BOOL						bTextFrame : 1;
-    BOOL						bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
-    BOOL						bNoShear : 1;            // Obj darf nicht gesheart werden   (->Graf+Ole+TextFrame)
-    BOOL						bNoRotate : 1;           // Obj darf nicht gedreht werden    (->Ole)
-    BOOL						bNoMirror : 1;           // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
-    BOOL						bTextSizeDirty : 1;
+    // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
+    // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert.
+    sal_Bool						bTextFrame : 1;
+    sal_Bool						bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
+    sal_Bool						bNoShear : 1;            // Obj darf nicht gesheart werden   (->Graf+Ole+TextFrame)
+    sal_Bool						bNoRotate : 1;           // Obj darf nicht gedreht werden    (->Ole)
+    sal_Bool						bNoMirror : 1;           // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
+    sal_Bool						bTextSizeDirty : 1;
 
     // #101684#
-    BOOL						mbInEditMode : 1;	// Is this text obejct in edit mode?
+    sal_Bool						mbInEditMode : 1;	// Is this text obejct in edit mode?
 
     // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom
     // der App beim Create gesetzt.
     // Wenn das Objekt dann spaeter in der Breite resized wird, wird
-    // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird
-    // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend
+    // AutoGrowWidth abgeschaltet (Hart auf sal_False attributiert). Das Flag wird
+    // dann ebenfalls auf sal_False gesetzt, sodass sich das Objekt anschliessend
     // wie ein normales Textobjekt verhaelt.
     // Resize in der Breite kann sein:
     // - Interaktives Resize in Einfach- oder Mehrfachselektion
     // - Positions+Groesse Dialog
-    BOOL						bDisableAutoWidthOnDragging : 1;
+    sal_Bool						bDisableAutoWidthOnDragging : 1;
 
     // #111096#
     // Allow text suppression
-    BOOL						mbTextHidden : 1;
+    sal_Bool						mbTextHidden : 1;
 
     // #111096#
     // Flag for allowing text animation. Default is sal_true.
-    BOOL						mbTextAnimationAllowed : 1;
+    sal_Bool						mbTextAnimationAllowed : 1;
 
     // flag for preventing recursive onEditOutlinerStatusEvent calls
     BOOL					    mbInDownScale : 1;
@@ -290,10 +290,10 @@ protected:
     void ImpCheckShear();
     Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
     void ImpSetTextEditParams() const;
-    void SetTextSizeDirty() { bTextSizeDirty=TRUE; }
+    void SetTextSizeDirty() { bTextSizeDirty=sal_True; }
 
     // rAnchorRect ist InOut-Parameter!
-    void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const;
+    void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const;
 
     virtual SdrObjGeoData* NewGeoData() const;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
@@ -315,15 +315,15 @@ protected:
     SdrTextObj(SdrObjKind eNewTextKind);
     SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect);
 
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
     virtual ~SdrTextObj();
 
 public:
     TYPEINFO();
 
     // #101684#
-    BOOL IsInEditMode() const { return mbInEditMode; }
+    sal_Bool IsInEditMode() const { return mbInEditMode; }
 
     // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden.
     // Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet.
@@ -379,8 +379,8 @@ public:
     bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
     void NbcSetText(const String& rStr);
     void SetText(const String& rStr);
-    void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
-    void SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+    void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
+    void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
 
     // FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt!
     virtual const Size& GetTextSize() const;
@@ -389,7 +389,7 @@ public:
     // Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
     // der des EditOutliners) und die PaperSize gesetzt.
     virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
-        Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+        Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
     virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
     const GeoStat& GetGeoStat() const { return aGeo; }
 
@@ -432,7 +432,7 @@ public:
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pNewModel);
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     // Wird zur Bestimmung des Textankerbereichs benoetigt
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
@@ -477,7 +477,7 @@ public:
     virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
     virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
     virtual void EndTextEdit(SdrOutliner& rOutl);
-    virtual USHORT GetOutlinerViewAnchorMode() const;
+    virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
 
     void StartTextAnimation(OutputDevice* pOutDev, const Point& rOffset, long nExtraData=0L);
     void StopTextAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
@@ -491,10 +491,10 @@ public:
     virtual void NbcReformatText();
     virtual void ReformatText();
 
-    virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+    virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
         bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
 
-    virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+    virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
 
     void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
 
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index 36a53e7554..09acde6f16 100644..100755
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj
 
     String						aUnoControlModelTypeName;
     String						aUnoControlTypeName;
-    BOOL						bOwnUnoControlModel;
+    sal_Bool						bOwnUnoControlModel;
 
 protected:
     ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden
@@ -75,17 +75,17 @@ private:
 public:
     TYPEINFO();
 
-    SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE);
+    SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True);
     SdrUnoObj(const String& rModelName, 
         const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, 
-        BOOL bOwnsModel = TRUE);
+        sal_Bool bOwnsModel = sal_True);
     virtual ~SdrUnoObj();
 
     virtual void SetPage(SdrPage* pNewPage);
     virtual void SetModel(SdrModel* pModel);
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
 
     virtual void operator = (const SdrObject& rObj);
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx
index b0ff54caab..0e309d633c 100644..100755
--- a/svx/inc/svx/svdoutl.hxx
+++ b/svx/inc/svx/svdoutl.hxx
@@ -44,7 +44,7 @@ protected:
     const SdrPage* mpVisualizedPage;
 
 public:
-    SdrOutliner( SfxItemPool* pItemPool, USHORT nMode );
+    SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode );
     virtual ~SdrOutliner() ;
 
     void  SetTextObj( const SdrTextObj* pObj );
@@ -54,7 +54,7 @@ public:
     void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; }
     const SdrPage* getVisualizedPage() const { return mpVisualizedPage; }
 
-    virtual String  CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor);
+    virtual String  CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor);
 };
 
 #endif //_SVDOUTL_HXX
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index d92b57e72d..022638e498 100644..100755
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -71,8 +71,8 @@ public:
     virtual void SetModel(SdrModel* pNewModel);
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
-    virtual UINT32 GetObjInventor() const;
-    virtual UINT16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
     virtual SdrObjList* GetSubList() const;
 
     virtual const Rectangle& GetCurrentBoundRect() const;
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index dfc4899ce8..d44fa604da 100644..100755
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -114,7 +114,7 @@ public:
     // !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!!
 
     // #110094# This should not be needed (!)
-    void SetObjOrdNumsDirty()                           { bObjOrdNumsDirty=TRUE; }
+    void SetObjOrdNumsDirty()                           { bObjOrdNumsDirty=sal_True; }
     // pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert!
     void operator=(const SdrObjList& rSrcList);
     void CopyObjects(const SdrObjList& rSrcList);
@@ -133,23 +133,23 @@ public:
     // Neuberechnung der Objekt-Ordnungsnummern
     void     RecalcObjOrdNums();
     bool IsObjOrdNumsDirty() const        { return bObjOrdNumsDirty; }
-    virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+    virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
                                  , const SdrInsertReason* pReason=NULL
                                                                       );
-    virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+    virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
                               , const SdrInsertReason* pReason=NULL
                                                                      );
     // aus Liste entfernen ohne delete
-    virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+    virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
     // Vorhandenes Objekt durch ein anderes ersetzen.
     // Wie Remove&Insert jedoch performanter, da die Ordnungsnummern
     // nicht Dirty gesetzt werden muessen.
-    virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
-    virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
+    virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
+    virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
     // Die Z-Order eines Objekts veraendern
-    virtual SdrObject* NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
-    virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
+    virtual SdrObject* NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
+    virtual SdrObject* SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
 
     virtual void SetRectsDirty();
 
@@ -166,14 +166,14 @@ public:
     // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
     void BurnInStyleSheetAttributes();
 
-    ULONG      GetObjCount() const;
-    SdrObject* GetObj(ULONG nNum) const;
+    sal_uIntPtr      GetObjCount() const;
+    SdrObject* GetObj(sal_uIntPtr nNum) const;
 
     // Gelinkte Seite oder gelinktes Gruppenobjekt
     virtual bool IsReadOnly() const;
 
     // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ...
-    ULONG   CountAllObjects() const;
+    sal_uIntPtr   CountAllObjects() const;
 
     // Alle aufgelagerten Teile (z.B. Grafiken) der Liste in den
     // Speicher laden.
@@ -200,7 +200,7 @@ public:
         operation is performed recursively, such that the content of
         the given object contains no groups afterwards.
      */
-    virtual void UnGroupObj( ULONG nObjNum );
+    virtual void UnGroupObj( sal_uIntPtr nObjNum );
 
     /** Return whether there is an explicit, user defined, object navigation
         order.  When there is one this method returns <TRUE/> and the
@@ -343,17 +343,17 @@ private:
     SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList);      // never implemented
     SVX_DLLPRIVATE void           operator=(const SdrPageGridFrameList& rSrcList);  // never implemented
 protected:
-    SdrPageGridFrame* GetObject(USHORT i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
+    SdrPageGridFrame* GetObject(sal_uInt16 i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
 public:
     SdrPageGridFrameList(): aList(1024,4,4)                            {}
     ~SdrPageGridFrameList()                                            { Clear(); }
     void           Clear();
-    USHORT         GetCount() const                                    { return USHORT(aList.Count()); }
-    void           Insert(const SdrPageGridFrame& rGF, USHORT nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
-    void           Delete(USHORT nPos)                                 { delete (SdrPageGridFrame*)aList.Remove(nPos); }
-    void           Move(USHORT nPos, USHORT nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
-    SdrPageGridFrame&       operator[](USHORT nPos)                    { return *GetObject(nPos); }
-    const SdrPageGridFrame& operator[](USHORT nPos) const              { return *GetObject(nPos); }
+    sal_uInt16         GetCount() const                                    { return sal_uInt16(aList.Count()); }
+    void           Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
+    void           Delete(sal_uInt16 nPos)                                 { delete (SdrPageGridFrame*)aList.Remove(nPos); }
+    void           Move(sal_uInt16 nPos, sal_uInt16 nNewPos)                   { aList.Insert(aList.Remove(nPos),nNewPos); }
+    SdrPageGridFrame&       operator[](sal_uInt16 nPos)                    { return *GetObject(nPos); }
+    const SdrPageGridFrame& operator[](sal_uInt16 nPos) const              { return *GetObject(nPos); }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -431,12 +431,12 @@ public:
 // and thus has to set mxUnoPage
 friend class ChXChartDocument;
 
-    INT32 nWdt;     // Seitengroesse
-    INT32 nHgt;     // Seitengroesse
-    INT32 nBordLft; // Seitenrand links
-    INT32 nBordUpp; // Seitenrand oben
-    INT32 nBordRgt; // Seitenrand rechts
-    INT32 nBordLwr; // Seitenrand unten
+    sal_Int32 nWdt;     // Seitengroesse
+    sal_Int32 nHgt;     // Seitengroesse
+    sal_Int32 nBordLft; // Seitenrand links
+    sal_Int32 nBordUpp; // Seitenrand oben
+    sal_Int32 nBordRgt; // Seitenrand rechts
+    sal_Int32 nBordLwr; // Seitenrand unten
 
     // this is a weak reference to a possible living api wrapper for this page
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage;
@@ -456,7 +456,7 @@ protected:
     ::sdr::MasterPageDescriptor*					mpMasterPageDescriptor;
 
     SetOfByte  aPrefVisiLayers;
-    USHORT     nPageNum;
+    sal_uInt16     nPageNum;
 
     // bitfield
     unsigned            mbMaster : 1;               // flag if this is a MasterPage
@@ -497,17 +497,17 @@ public:
     virtual Size GetSize() const;
     virtual void SetOrientation(Orientation eOri);
     virtual Orientation GetOrientation() const;
-    virtual INT32 GetWdt() const;
-    virtual INT32 GetHgt() const;
-    virtual void  SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr);
-    virtual void  SetLftBorder(INT32 nBorder);
-    virtual void  SetUppBorder(INT32 nBorder);
-    virtual void  SetRgtBorder(INT32 nBorder);
-    virtual void  SetLwrBorder(INT32 nBorder);
-    virtual INT32 GetLftBorder() const;
-    virtual INT32 GetUppBorder() const;
-    virtual INT32 GetRgtBorder() const;
-    virtual INT32 GetLwrBorder() const;
+    virtual sal_Int32 GetWdt() const;
+    virtual sal_Int32 GetHgt() const;
+    virtual void  SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr);
+    virtual void  SetLftBorder(sal_Int32 nBorder);
+    virtual void  SetUppBorder(sal_Int32 nBorder);
+    virtual void  SetRgtBorder(sal_Int32 nBorder);
+    virtual void  SetLwrBorder(sal_Int32 nBorder);
+    virtual sal_Int32 GetLftBorder() const;
+    virtual sal_Int32 GetUppBorder() const;
+    virtual sal_Int32 GetRgtBorder() const;
+    virtual sal_Int32 GetLwrBorder() const;
 
     virtual void SetModel(SdrModel* pNewModel);
 
@@ -558,7 +558,7 @@ public:
 
     virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const;
 
-    bool HasTransparentObjects( BOOL bCheckForAlphaChannel = false ) const;
+    bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const;
 
     /** *deprecated* returns an averaged background color of this page */
     // #i75566# GetBackgroundColor -> GetPageBackgroundColor
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 9c6b09e168..af32187316 100644..100755
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -129,7 +129,7 @@ private:
     SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
 
 protected:
-    void ImpInvalidateHelpLineArea(USHORT nNum) const;
+    void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
 
 protected:
     void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
@@ -180,11 +180,14 @@ public:
     void InvalidateAllWin();
 
     // rRect bezieht sich auf die Page
-    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=FALSE);
+    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
 
     // PrePaint call forwarded from app windows
     void PrePaint();
 
+    // PostPaint call forwarded from app windows
+    void PostPaint();
+
     // rReg bezieht sich auf's OutDev, nicht auf die Page
     void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
 
@@ -247,13 +250,13 @@ public:
 
     const SdrHelpLineList& GetHelpLines() const { return aHelpLines; }
     void SetHelpLines(const SdrHelpLineList& rHLL);
-    //void SetHelpLinePos(USHORT nNum, const Point& rNewPos);
-    void SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine);
-    void DeleteHelpLine(USHORT nNum);
-    void InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum=0xFFFF);
-    void MoveHelpLine(USHORT nNum, USHORT nNewNum) { aHelpLines.Move(nNum,nNewNum); }
+    //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos);
+    void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
+    void DeleteHelpLine(sal_uInt16 nNum);
+    void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF);
+    void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); }
 
-    // Liefert TRUE, wenn Layer des Obj sichtbar und nicht gesperrt.
+    // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt.
     // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
     // gesperrt sein darf keiner.
     sal_Bool IsObjMarkable(SdrObject* pObj) const;
@@ -271,7 +274,7 @@ public:
     void LeaveAllGroup();
 
     // Feststellen, wie weit hinabgestiegen wurde (0=Root(Page))
-    USHORT GetEnteredLevel() const;
+    sal_uInt16 GetEnteredLevel() const;
 
     // Name der aktuellen Objektgruppe
     String GetActualGroupName() const;
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index eae3543a20..cb9c97e70a 100644..100755
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -163,12 +163,12 @@ protected:
     
     SdrAnimationMode			eAnimationMode;
 
-    USHORT						nHitTolPix;
-    USHORT						nMinMovPix;
-    USHORT						nHitTolLog;
-    USHORT						nMinMovLog;
-    ULONG						nMasterCacheMode;	
-    ULONG                       nGraphicManagerDrawMode;
+    sal_uInt16						nHitTolPix;
+    sal_uInt16						nMinMovPix;
+    sal_uInt16						nHitTolLog;
+    sal_uInt16						nMinMovLog;
+    sal_uIntPtr						nMasterCacheMode;	
+    sal_uIntPtr                       nGraphicManagerDrawMode;
 
     // hold an incarnation of Drawinglayer configuration options
     SvtOptionsDrawinglayer		maDrawinglayerOpt;
@@ -189,9 +189,9 @@ protected:
     unsigned					bSwapAsynchron : 1;
     unsigned					bPrintPreview : 1;
 
-    // BOOL fuer die Verwaltung des anzuzeigenden Status
-    // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber
-    // beispielsweise beim Chart auf FALSE gesetzt, da dort
+    // sal_Bool fuer die Verwaltung des anzuzeigenden Status
+    // Gruppe Betreten/Verlassen. Default ist sal_True, wird aber
+    // beispielsweise beim Chart auf sal_False gesetzt, da dort
     // die Ghosted-Effekte zur Darstellug unerwuenscht sind.
     unsigned					bVisualizeEnteredGroup : 1;
     unsigned					bAnimationPause : 1;
@@ -255,8 +255,8 @@ private:
     DECL_LINK(ImpComeBackHdl,Timer*);
 
 protected:
-    USHORT ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
-    USHORT ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
+    sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
+    sal_uInt16 ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
 
     // Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt):
     void FlushComeBackTimer() const;
@@ -264,12 +264,12 @@ protected:
     void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
     void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
     void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
-    BOOL ImpIsGlueVisible2() const { return bGlueVisible2; }
-    BOOL ImpIsGlueVisible3() const { return bGlueVisible3; }
-    BOOL ImpIsGlueVisible4() const { return bGlueVisible4; }
+    sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; }
+    sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; }
+    sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; }
 
 public:
-    BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
+    sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
 protected:
 
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -297,7 +297,7 @@ public:
 //	virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
     SdrModel* GetModel() const { return pMod; }
 
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -315,18 +315,18 @@ public:
     // jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen
     // Pixelwerten logische Werte berechnen kann.
     void SetActualWin(const OutputDevice* pWin);
-    void SetMinMoveDistancePixel(USHORT nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
-    USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; }
-    void SetHitTolerancePixel(USHORT nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
-    USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; }
+    void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
+    sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; }
+    void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
+    sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; }
 
     // data read access on logic HitTolerance and MinMoveTolerance
-    USHORT getHitTolLog() const { return nHitTolLog; }
-    USHORT getMinMovLog() const { return nMinMovLog; }
+    sal_uInt16 getHitTolLog() const { return nHitTolLog; }
+    sal_uInt16 getMinMovLog() const { return nMinMovLog; }
 
     // Flag zur Visualisierung von Gruppen abfragen/testen
-    BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
-    void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; }
+    sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
+    void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; }
 
     // Am DragStatus laesst sich beispielsweise erfragen, welche
     // entfernung bereits gedraggd wurde, etc.
@@ -342,8 +342,8 @@ public:
     virtual void HideSdrPage();
 
     // Iterieren ueber alle angemeldeten PageViews
-//	USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); }
-//	SdrPageView* GetPageViewByIndex(USHORT nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
+//	sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); }
+//	SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
     SdrPageView* GetSdrPageView() const { return mpPageView; }
 
     // Pageview einer bestimmten Seite ermitteln
@@ -361,21 +361,24 @@ public:
     virtual void AddWindowToPaintView(OutputDevice* pNewWin);
     virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
 
-    void SetLayerVisible(const String& rName, BOOL bShow=TRUE);
+    void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True);
     bool IsLayerVisible(const String& rName) const;
-    void SetAllLayersVisible(BOOL bShow=TRUE);
+    void SetAllLayersVisible(sal_Bool bShow=sal_True);
 
-    void SetLayerLocked(const String& rName, BOOL bLock=TRUE);
+    void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
     bool IsLayerLocked(const String& rName) const;
-    void SetAllLayersLocked(BOOL bLock=TRUE);
+    void SetAllLayersLocked(sal_Bool bLock=sal_True);
 
-    void SetLayerPrintable(const String& rName, BOOL bPrn=TRUE);
+    void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True);
     bool IsLayerPrintable(const String& rName) const;
-    void SetAllLayersPrintable(BOOL bPrn=TRUE);
+    void SetAllLayersPrintable(sal_Bool bPrn=sal_True);
 
     // PrePaint call forwarded from app windows
     void PrePaint();
 
+    // PostPaint call forwarded from app windows
+    void PostPaint();
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // used internally for Draw/Impress/sch/chart2
     virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
@@ -410,14 +413,14 @@ protected:
     void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const;
 
 public:
-    BOOL IsPageVisible() const { return bPageVisible; }             // Seite (weisse Flaeche) malen oder nicht
-    BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
-    BOOL IsBordVisible() const { return bBordVisible; }             // Seitenrandlinie malen oder nicht
-    BOOL IsGridVisible() const { return bGridVisible; }             // Rastergitter malen oder nicht
-    BOOL IsGridFront() const { return bGridFront  ; }               // Rastergitter ueber die Objekte druebermalen oder dahinter
-    BOOL IsHlplVisible() const { return bHlplVisible; }             // Hilfslinien der Seiten malen oder nicht
-    BOOL IsHlplFront() const { return bHlplFront  ; }               // Hilfslinie ueber die Objekte druebermalen oder dahinter
-    BOOL IsGlueVisible() const { return bGlueVisible; }             // Konnektoren der objekte sichtbar oder nicht
+    sal_Bool IsPageVisible() const { return bPageVisible; }             // Seite (weisse Flaeche) malen oder nicht
+    sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
+    sal_Bool IsBordVisible() const { return bBordVisible; }             // Seitenrandlinie malen oder nicht
+    sal_Bool IsGridVisible() const { return bGridVisible; }             // Rastergitter malen oder nicht
+    sal_Bool IsGridFront() const { return bGridFront  ; }               // Rastergitter ueber die Objekte druebermalen oder dahinter
+    sal_Bool IsHlplVisible() const { return bHlplVisible; }             // Hilfslinien der Seiten malen oder nicht
+    sal_Bool IsHlplFront() const { return bHlplFront  ; }               // Hilfslinie ueber die Objekte druebermalen oder dahinter
+    sal_Bool IsGlueVisible() const { return bGlueVisible; }             // Konnektoren der objekte sichtbar oder nicht
     Color GetGridColor() const;
     void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
     void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
@@ -448,7 +451,7 @@ public:
     const Size& GetGridFine() const { return aGridFin; }
 
     void InvalidateAllWin();
-    void InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix=FALSE);
+    void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
 
     // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
     // man diese beiden folgenden Methoden ueberladen und entsprechend anders
@@ -472,13 +475,13 @@ public:
 
     // DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese
     // Attribute direkt nach dem Erzeugen erstmal zugewiesen.
-    void SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
+    void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
     const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; }
-    void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
     SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; }
 
-    void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
-    void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
+    void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+    void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
 
     // Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische
     // Verwendung. Alle Positionsangaben in logischen View-Koordinaten.
@@ -492,32 +495,32 @@ public:
     sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); }
 
     // use this mode as mode to draw all internal GraphicManager objects with
-    ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
-    void SetGraphicManagerDrawMode( ULONG nMode ) { nGraphicManagerDrawMode = nMode; }
+    sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
+    void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; }
 
     // SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht
     // beim Paint sofort nachladen, sondern dort das Nachladen anstossen.
     // Nach Abschluss des Nachladens wird das Objekt dann angezeigt.
     // Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist.
     // Default=FALSE. Flag ist nicht persistent.
-    BOOL IsSwapAsynchron() const { return bSwapAsynchron; }
-    void SetSwapAsynchron(BOOL bJa=TRUE) { bSwapAsynchron=bJa; }
-    virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-
-    virtual BOOL MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
-    virtual BOOL Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return FALSE; }
-    BOOL Cut(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
-    BOOL Yank(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
-    BOOL Paste(Window* /*pWin*/=NULL, ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
+    sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; }
+    void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; }
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+
+    virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+    virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; }
+    sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+    sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+    sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
-    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+    SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 
     virtual void MakeVisible(const Rectangle& rRect, Window& rWin);
 
@@ -527,8 +530,8 @@ public:
     // Animation aktivieren/deaktivieren fuer ::Paint
     // wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt
     // Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt
-    BOOL IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
-    void SetAnimationEnabled( BOOL bEnable=TRUE );
+    sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
+    void SetAnimationEnabled( sal_Bool bEnable=sal_True );
 
     // set/unset pause state for animations
     bool IsAnimationPause() const { return bAnimationPause; }
@@ -541,10 +544,10 @@ public:
     void SetAnimationMode( const SdrAnimationMode eMode );
     SdrAnimationMode GetAnimationMode() const { return eAnimationMode; }
 
-    // bei bShow=FALSE wird der Browser destruiert
+    // bei bShow=sal_False wird der Browser destruiert
 #ifdef DBG_UTIL
-    void ShowItemBrowser(BOOL bShow=TRUE);
-    BOOL IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
+    void ShowItemBrowser(sal_Bool bShow=sal_True);
+    sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
     Window* GetItemBrowser() const { return (Window*)pItemBrowser; }
 #endif
 
@@ -553,7 +556,7 @@ public:
     void VisAreaChanged(const OutputDevice* pOut=NULL);
     void VisAreaChanged(const SdrPageWindow& rWindow);
 
-    BOOL IsPrintPreview() const { return bPrintPreview; }
+    sal_Bool IsPrintPreview() const { return bPrintPreview; }
     void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
 
     const svtools::ColorConfig& getColorConfig() const;
diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index 65641a2174..0b6e75229a 100644..100755
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -53,8 +53,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit
     friend class				SdrEditView;
 
 protected:
-    BOOL						bSetMarkedPointsSmoothPossible : 1;
-    BOOL						bSetMarkedSegmentsKindPossible : 1;
+    sal_Bool						bSetMarkedPointsSmoothPossible : 1;
+    sal_Bool						bSetMarkedSegmentsKindPossible : 1;
 
     SdrPathSmoothKind			eMarkedPointsSmooth;
     SdrPathSegmentKind			eMarkedSegmentsKind;
@@ -76,18 +76,18 @@ protected:
     virtual ~SdrPolyEditView();
 
 public:
-    BOOL IsSetMarkedPointsSmoothPossible() const;
+    sal_Bool IsSetMarkedPointsSmoothPossible() const;
     SdrPathSmoothKind GetMarkedPointsSmooth() const;
     void SetMarkedPointsSmooth(SdrPathSmoothKind eKind);
 
     // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein.
-    BOOL IsSetMarkedSegmentsKindPossible() const;
+    sal_Bool IsSetMarkedSegmentsKindPossible() const;
     SdrPathSegmentKind GetMarkedSegmentsKind() const;
     void SetMarkedSegmentsKind(SdrPathSegmentKind eKind);
 
     // Moeglicherweise ist das Obj hinterher geloescht:
     void DeleteMarkedPoints();
-    BOOL IsDeleteMarkedPointsPossible() const;
+    sal_Bool IsDeleteMarkedPointsPossible() const;
 
     void MoveMarkedPoints(const Size& rSiz, bool bCopy=false);
     void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
@@ -100,7 +100,7 @@ public:
     // Alle markierten Polylines werden zu Polygonen, alle offenen
     // Bezierkurven zu geschlossenen.
     void ShutMarkedObjects();
-    void CloseMarkedObjects(BOOL bToggle=FALSE, BOOL bOpen=FALSE); // , long nOpenDistance=0);
+    void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0);
     bool IsOpenCloseMarkedObjectsPossible() const;
     SdrObjClosedKind GetMarkedObjectsClosedState() const;
 
diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx
index 7cec1665cc..7cec1665cc 100644..100755
--- a/svx/inc/svx/svdpool.hxx
+++ b/svx/inc/svx/svdpool.hxx
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 6c1ac12259..727f317895 100644..100755
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -79,7 +79,7 @@ protected:
     Fraction					aSnapWdtX;
     Fraction					aSnapWdtY;
 
-    USHORT						nMagnSizPix;
+    sal_uInt16						nMagnSizPix;
     long						nSnapAngle;
     long						nEliminatePolyPointLimitAngle;
 
@@ -104,7 +104,7 @@ protected:
     unsigned					bMoveOnlyDragging : 1;       // Objekte nur verschieben bei Resize/Rotate/...
     unsigned					bSlantButShear : 1;          // Slant anstelle von Shear anwenden
     unsigned					bCrookNoContortion : 1;      // Objekte bei Crook nicht verzerren
-    unsigned					bHlplFixed : 1;       // TRUE=Hilfslinien fixiert, also nicht verschiebbar
+    unsigned					bHlplFixed : 1;       // sal_True=Hilfslinien fixiert, also nicht verschiebbar
     unsigned					bEliminatePolyPoints : 1;
 
 private:
@@ -116,7 +116,7 @@ protected:
     virtual ~SdrSnapView();
 
 public:
-    virtual BOOL IsAction() const;
+    virtual sal_Bool IsAction() const;
     virtual void MovAction(const Point& rPnt);
     virtual void EndAction();
     virtual void BckAction();
@@ -129,8 +129,8 @@ public:
 
     void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } }
     const Size& GetSnapMagnetic() const { return aMagnSiz; }
-    void SetSnapMagneticPixel(USHORT nPix) { nMagnSizPix=nPix; }
-    USHORT GetSnapMagneticPixel() const { return nMagnSizPix; }
+    void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; }
+    sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; }
 
     // RecalcLogicSnapMagnetic muss bei jedem Wechsel des OutputDevices
     // sowie bei jedem Wechsel des MapModes gerufen werden!
@@ -140,48 +140,48 @@ public:
     // Auf die View bezogene Koordinaten!
     // Rueckgabewerte sind SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED,
     // SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED
-    USHORT SnapPos(Point& rPnt, const SdrPageView* pPV) const;
+    sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const;
     Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const;
-    USHORT SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
+    sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
     void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
 
     // Alle Fangeinstellungen sind Persistent.
-    BOOL IsSnapEnabled() const { return bSnapEnab; }
-    BOOL IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
-    BOOL IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
-    BOOL IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
-    BOOL IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
-    BOOL IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
-    BOOL IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
-    void SetSnapEnabled(BOOL bOn) { bSnapEnab=bOn; }
-    void SetGridSnap(BOOL bOn) { bGridSnap=bOn; }
-    void SetBordSnap(BOOL bOn) { bBordSnap=bOn; }
-    void SetHlplSnap(BOOL bOn) { bHlplSnap=bOn; }
-    void SetOFrmSnap(BOOL bOn) { bOFrmSnap=bOn; }
-    void SetOPntSnap(BOOL bOn) { bOPntSnap=bOn; }
-    void SetOConSnap(BOOL bOn) { bOConSnap=bOn; }
+    sal_Bool IsSnapEnabled() const { return bSnapEnab; }
+    sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
+    sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
+    sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
+    sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
+    sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
+    sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
+    void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; }
+    void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; }
+    void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; }
+    void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; }
+    void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; }
+    void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; }
+    void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; }
 
     // Normalerweise werden beim Move-Dragging von Zeichenobjekten alle
     // 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit,
     // wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor):
     // Persistent, Default=FALSE.
-    void SetMoveSnapOnlyTopLeft(BOOL bOn) { bMoveSnapOnlyTopLeft=bOn; }
-    BOOL IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
+    void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
+    sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
 
     // Hilfslinien fixiert (nicht verschiebbar)
     // Persistent, Default=FALSE.
-    BOOL IsHlplFixed() const { return bHlplFixed; }
-    void SetHlplFixed(BOOL bOn) { bHlplFixed=bOn; }
+    sal_Bool IsHlplFixed() const { return bHlplFixed; }
+    void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; }
 
-    BOOL IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
-    BOOL IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
-    BOOL IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
-    BOOL IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
+    sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
+    sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
+    sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
+    sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
 
-    void SetMoveMFrmSnap(BOOL bOn) { bMoveMFrmSnap=bOn; }
-    void SetMoveOFrmSnap(BOOL bOn) { bMoveOFrmSnap=bOn; }
-    void SetMoveOPntSnap(BOOL bOn) { bMoveOPntSnap=bOn; }
-    void SetMoveOConSnap(BOOL bOn) { bMoveOConSnap=bOn; }
+    void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; }
+    void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; }
+    void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; }
+    void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; }
 
     // #114409#-1 Migrate PageOrigin
     sal_Bool BegSetPageOrg(const Point& rPnt);
@@ -190,12 +190,12 @@ public:
     void BrkSetPageOrg();
     sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); }
 
-    // HitTest. Bei TRUE steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
+    // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
     // die zugehoerige PageView.
-    sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const;
+    sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const;
 
     // Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden.
-    sal_Bool BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV);
+    sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV);
     // Interaktives einfuegen einer neuen Hilfslinie
     sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind);
     Pointer GetDraggedHelpLinePointer() const;
@@ -209,7 +209,7 @@ public:
 
     // SnapAngle ist fuer Winkel im Kreis, RotateDragging, ...
     // Der Winkelfang wird unterdrueckt, wenn er mit
-    // durch SetAngleSnapEnabled(FALSE) ausgeschaltet ist.
+    // durch SetAngleSnapEnabled(sal_False) ausgeschaltet ist.
     // Der Winkelfang ist unabhaengig vom Koordinatenfang
     // und somit von der Einstellung IsSnapEnabled()
     // Es sollten nur Werte angegeben werden fuer die gilt:
@@ -219,8 +219,8 @@ public:
     // - Shear (Dragging)
     // - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging)
     // Persistent.
-    void SetAngleSnapEnabled(BOOL bOn) { bAngleSnapEnab=bOn; }
-    BOOL IsAngleSnapEnabled() const { return bAngleSnapEnab; }
+    void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; }
+    sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
     void SetSnapAngle(long nWink) { nSnapAngle=nWink; }
     long GetSnapAngle() const { return nSnapAngle; }
 
@@ -260,20 +260,20 @@ public:
     void SetBigOrtho(bool bOn) { bBigOrtho=bOn; }
     bool IsBigOrtho() const { return bBigOrtho; }
 
-    // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook
+    // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook
     // nur das Zentrum der markierten Objekte transformiert. Groesse, Form
     // und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen
     // aendern sich. Persistent. Default=FALSE. (ni)
-    void SetMoveOnlyDragging(BOOL bOn) { bMoveOnlyDragging=bOn; }
-    BOOL IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
+    void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; }
+    sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
 
     // Slant anstelle von Shear anwenden. Persistent. Default=FALSE.
-    void SetSlantButShear(BOOL bOn) { bSlantButShear=bOn; }
-    BOOL IsSlantButShear() const { return bSlantButShear; }
+    void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; }
+    sal_Bool IsSlantButShear() const { return bSlantButShear; }
 
     // Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni)
-    void SetCrookNoContortion(BOOL bOn) { bCrookNoContortion=bOn; }
-    BOOL IsCrookNoContortion() const { return bCrookNoContortion; }
+    void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; }
+    sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; }
 
     // Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni)
     void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
@@ -282,8 +282,8 @@ public:
     // Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser
     // geloescht, wenn seine beiden angrenzenden Linien eh' fast eine
     // durchgehende Linie sind.
-    void SetEliminatePolyPoints(BOOL bOn) { bEliminatePolyPoints=bOn; }
-    BOOL IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
+    void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; }
+    sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
     void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; }
     long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; }
 };
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index 5b75195028..5b75195028 100644..100755
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index 841f987a1a..2264f86656 100644..100755
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
@@ -181,8 +181,12 @@
 #define STR_ObjNameSingulMEDIA				(STR_ObjNameBegin + 143)
 #define STR_ObjNamePluralMEDIA				(STR_ObjNameBegin + 144)
 
-#define STR_ObjNameEnd               (STR_ObjNamePluralMEDIA)
-
+//#define STR_ObjNameEnd               (STR_ObjNamePluralMEDIA)
+//IAccessibility2 Implementation 2009-----
+#define STR_ObjNameSingulFONTWORK			(STR_ObjNameBegin+145)
+#define STR_ObjNamePluralFONTWORK			(STR_ObjNameBegin+146)
+#define STR_ObjNameEnd               		(STR_ObjNamePluralFONTWORK)
+//-----IAccessibility2 Implementation 2009
 #define STR_EditBegin                (STR_ObjNameEnd+1)
 #define STR_EditWithCopy             (STR_EditBegin  +  0)
 #define STR_EditPosSize              (STR_EditBegin  +  1)
@@ -697,6 +701,7 @@
 #define SIP_SA_GRAFRESERVE6					(SIP_Begin + 257)
 
 #define SIP_SA_MARKERS						(SIP_Begin + 258)
+#define SIP_SA_PAGESHADOW35X35				(SIP_Begin + 259)
 #define SIP_SA_FINE_MARKERS					(SIP_Begin + 260)
 
 #define BMP_SVXOLEOBJ						(SIP_Begin + 261)
diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx
index 0443012b00..5cff1a9fb9 100644..100755
--- a/svx/inc/svx/svdtext.hxx
+++ b/svx/inc/svx/svdtext.hxx
@@ -55,7 +55,7 @@ public:
     virtual ~SdrText();
 
     virtual void SetModel(SdrModel* pNewModel);
-    virtual void ForceOutlinerParaObject( USHORT nOutlMode );
+    virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode );
 
     virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject );
     virtual OutlinerParaObject* GetOutlinerParaObject() const;
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index c7718fcb27..568212a228 100644..100755
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -179,7 +179,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
 SVX_DLLPUBLIC long GetAngle(const Point& rPnt);
 long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99
 SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf    0.00..359.99
-USHORT GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
+sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
 // Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2
 // Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert.
 long GetLen(const Point& rPnt);
@@ -304,14 +304,14 @@ private:
     SVX_DLLPRIVATE void Undirty();
     SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); }
 public:
-    SdrFormatter(MapUnit eSrc, MapUnit eDst)     { eSrcMU=eSrc; bSrcFU=FALSE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    SdrFormatter(MapUnit eSrc, FieldUnit eDst)   { eSrcMU=eSrc; bSrcFU=FALSE; eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
-    SdrFormatter(FieldUnit eSrc, MapUnit eDst)   { eSrcFU=eSrc; bSrcFU=TRUE;  eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE;  eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
-    void SetSourceUnit(MapUnit eSrc)        { eSrcMU=eSrc; bSrcFU=FALSE; bDirty=TRUE; }
-    void SetSourceUnit(FieldUnit eSrc)      { eSrcFU=eSrc; bSrcFU=TRUE;  bDirty=TRUE; }
-    void SetDestinationUnit(MapUnit eDst)   { eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; }
-    void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=TRUE;  bDirty=TRUE; }
+    SdrFormatter(MapUnit eSrc, MapUnit eDst)     { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    SdrFormatter(MapUnit eSrc, FieldUnit eDst)   { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
+    SdrFormatter(FieldUnit eSrc, MapUnit eDst)   { eSrcFU=eSrc; bSrcFU=sal_True;  eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True;  eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
+    void SetSourceUnit(MapUnit eSrc)        { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; }
+    void SetSourceUnit(FieldUnit eSrc)      { eSrcFU=eSrc; bSrcFU=sal_True;  bDirty=sal_True; }
+    void SetDestinationUnit(MapUnit eDst)   { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; }
+    void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True;  bDirty=sal_True; }
     void TakeStr(long nVal, XubString& rStr) const;
     static void TakeUnitStr(MapUnit eUnit, XubString& rStr);
     static void TakeUnitStr(FieldUnit eUnit, XubString& rStr);
diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx
index 75ed074a60..c2478e19c3 100644..100755
--- a/svx/inc/svx/svdtypes.hxx
+++ b/svx/inc/svx/svdtypes.hxx
@@ -41,10 +41,10 @@
 //  @@@@  @@@@@  @@  @@   @@@@  @@@@@   @@@@  @@@@@  @@@@    @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const UINT32 SdrInventor=UINT32('S')*0x00000001+
-                         UINT32('V')*0x00000100+
-                         UINT32('D')*0x00010000+
-                         UINT32('r')*0x01000000;
+const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+
+                         sal_uInt32('V')*0x00000100+
+                         sal_uInt32('D')*0x00010000+
+                         sal_uInt32('r')*0x01000000;
 
 // Kommandos fuer EndCreate()
 enum SdrCreateCmd {SDRCREATE_NEXTPOINT,     // Naechster Polygonpunkt, Kreissegment: Naechste Koordinate
@@ -91,10 +91,10 @@ enum SdrConvertType {SDRCONVERT_POLY,   // reines Polygon erzeugen
 // dann diesen Wert:
 #define SDRLAYER_NOTFOUND 0xFF
 // Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet
-// zuwerfen, bekommt dann jedoch immer FALSE, bzw. tut die Methode nix.
+// zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix.
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Typdeklaration fuer Layer-IDs
-typedef BYTE SdrLayerID;
+typedef sal_uInt8 SdrLayerID;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 5f2d509d71..227179b8b5 100644..100755
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -73,7 +73,7 @@ protected:
 
 public:
     TYPEINFO();
-    virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+    virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
     virtual void Repeat(SfxRepeatTarget& rView);
 
     virtual String GetRepeatComment(SfxRepeatTarget& rView) const;
@@ -110,8 +110,8 @@ public:
     virtual ~SdrUndoGroup();
 
     void Clear();
-    ULONG GetActionCount() const { return aBuf.Count(); }
-    SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
+    sal_uIntPtr GetActionCount() const { return aBuf.Count(); }
+    SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
     void AddAction(SdrUndoAction* pAct);
     void push_front( SdrUndoAction* pAct );
 
@@ -146,7 +146,7 @@ protected:
 
     void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, bool bRepeat = false) const;
 
-    static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat = false );
+    static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false );
 
     // #94278# new method for evtl. PageChange at UNDO/REDO
     void ImpShowPageOfThisObject();
@@ -269,7 +269,7 @@ protected:
     SdrObjList*					pObjList;
     SdrView*					pView;      // um bei ObjDel, Undo die
     SdrPageView*				pPageView;  // Selektion widerherstellen zu koennen
-    UINT32						nOrdNum;
+    sal_uInt32						nOrdNum;
     // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
     // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
 
@@ -332,7 +332,7 @@ class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
 {
 public:
     SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false)
-    :	SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); }
+    :	SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); }
 
     virtual void Undo();
     virtual void Redo();
@@ -381,7 +381,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
 
 protected:
     SdrObjList*					pObjList;
-    UINT32						nOrdNum;
+    sal_uInt32						nOrdNum;
     SdrObject*					pNewObj;
 
 public:
@@ -422,11 +422,11 @@ public:
 class SdrUndoObjOrdNum : public SdrUndoObj
 {
 protected:
-    UINT32						nOldOrdNum;
-    UINT32						nNewOrdNum;
+    sal_uInt32						nOldOrdNum;
+    sal_uInt32						nNewOrdNum;
 
 public:
-    SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1);
+    SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
 
     virtual void Undo();
     virtual void Redo();
@@ -460,7 +460,7 @@ protected:
     OutlinerParaObject*			pOldText;
     OutlinerParaObject*			pNewText;
     bool                        bNewTextAvailable;
-    BOOL						bEmptyPresObj;
+    sal_Bool						bEmptyPresObj;
     sal_Int32					mnText;
 
 public:
@@ -532,11 +532,11 @@ class SdrUndoLayer : public SdrUndoAction
 protected:
     SdrLayer*					pLayer;
     SdrLayerAdmin*				pLayerAdmin;
-    USHORT						nNum;
+    sal_uInt16						nNum;
     bool                        bItsMine;
 
 protected:
-    SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
+    SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
     virtual ~SdrUndoLayer();
 };
 
@@ -550,7 +550,7 @@ protected:
 class SdrUndoNewLayer : public SdrUndoLayer
 {
 public:
-    SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+    SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
     : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {}
 
     virtual void Undo();
@@ -569,8 +569,8 @@ public:
 class SdrUndoDelLayer : public SdrUndoLayer
 {
 public:
-    SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
-    : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; }
+    SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+    : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; }
 
     virtual void Undo();
     virtual void Redo();
@@ -587,10 +587,10 @@ public:
 
 class SdrUndoMoveLayer : public SdrUndoLayer
 {
-    USHORT						nNeuPos;
+    sal_uInt16						nNeuPos;
 
 public:
-    SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1)
+    SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
     :	SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {}
 
     virtual void Undo();
@@ -624,14 +624,14 @@ protected:
     SdrPage&					mrPage;
 
 protected:
-    void ImpInsertPage(USHORT nNum);
-    void ImpRemovePage(USHORT nNum);
-    void ImpMovePage(USHORT nOldNum, USHORT nNewNum);
+    void ImpInsertPage(sal_uInt16 nNum);
+    void ImpRemovePage(sal_uInt16 nNum);
+    void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum);
 
 protected:
     SdrUndoPage(SdrPage& rNewPg);
 
-    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, bool bRepeat = false) const;
+    void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const;
 };
 
 //************************************************************
@@ -645,7 +645,7 @@ protected:
 class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
 {
 protected:
-    USHORT						nPageNum;
+    sal_uInt16						nPageNum;
 
     // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page
     // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE
@@ -734,11 +734,11 @@ public:
 class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage
 {
 protected:
-    USHORT						nOldPageNum;
-    USHORT						nNewPageNum;
+    sal_uInt16						nOldPageNum;
+    sal_uInt16						nNewPageNum;
 
 public:
-    SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1)
+    SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1)
     :	SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {}
 
     virtual void Undo();
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 0786a2e3cb..7123ba1baa 100644..100755
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -123,11 +123,11 @@ struct SVX_DLLPUBLIC SdrViewEvent
     SdrHdlKind					eHdlKind;
     SdrCreateCmd				eEndCreateCmd;   // auch fuer EndInsPoint
 
-    UINT16						nMouseClicks;
-    UINT16						nMouseMode;
-    UINT16						nMouseCode;
-    UINT16						nHlplIdx;
-    UINT16						nGlueId;
+    sal_uInt16						nMouseClicks;
+    sal_uInt16						nMouseMode;
+    sal_uInt16						nMouseCode;
+    sal_uInt16						nHlplIdx;
+    sal_uInt16						nGlueId;
 
     unsigned					bMouseDown : 1;
     unsigned					bMouseUp : 1;
@@ -149,7 +149,7 @@ public:
     ~SdrViewEvent();
 
     // nEventKind ist SDRMOUSEBUTTONDOWN, SDRMOUSEMOVE oder SDRMOUSEBUTTONUP
-    void SetMouseEvent(const MouseEvent& rMEvt, USHORT nEventKind);
+    void SetMouseEvent(const MouseEvent& rMEvt, sal_uInt16 nEventKind);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -211,44 +211,44 @@ public:
     //      pSdrView->DoMouseEvent(aVEvt);
     //      SetPointer(GetPreferedPointer(...))
     //      CaptureMouse(...)
-    void EnableExtendedMouseEventDispatcher(BOOL bOn) { bNoExtendedMouseDispatcher = !bOn; }
-    BOOL IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
+    void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; }
+    sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
 
-    void EnableExtendedKeyInputDispatcher(BOOL bOn) { bNoExtendedKeyDispatcher=!bOn; }
-    BOOL IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
+    void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; }
+    sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
 
-    void EnableExtendedCommandEventDispatcher(BOOL bOn) { bNoExtendedCommandDispatcher=!bOn; }
-    BOOL IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
+    void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
+    sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
 
-    void EnableTextEditOnObjectsWithoutTextIfTextTool(BOOL bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
-    BOOL IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
+    void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
+    sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
 
     void SetMasterPagePaintCaching(sal_Bool bOn);
     sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
 
-    BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-    virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+    sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+    virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
 
     virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
-    BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
-    BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
+    sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
+    sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
 
     /* new interface src537 */
-    BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+    sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
 
     SfxStyleSheet* GetStyleSheet() const;
 
     // unvollstaendige Implementation:
     // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann.
     // Bei NULL wird das 1. angemeldete Win verwendet.
-    Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier=0, BOOL bLeftDown=FALSE) const;
-    SdrHitKind PickAnything(const MouseEvent& rMEvt, USHORT nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
+    Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const;
+    SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
     SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const;
-    BOOL DoMouseEvent(const SdrViewEvent& rVEvt);
+    sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt);
     virtual SdrViewContext GetContext() const;
 
     // Die Methoden beruecksichtigen den jeweiligen Kontex:
@@ -257,27 +257,27 @@ public:
     // - Klebepunkt-Editmode
     // - TextEdit
     // - ... to be continued
-    BOOL IsMarkPossible() const;
+    sal_Bool IsMarkPossible() const;
     void MarkAll();
     void UnmarkAll();
-    BOOL IsAllMarked() const;
-    BOOL IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
-    BOOL MarkNext(BOOL bPrev=FALSE);
-    BOOL MarkNext(const Point& rPnt, BOOL bPrev=FALSE);
+    sal_Bool IsAllMarked() const;
+    sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
+    sal_Bool MarkNext(sal_Bool bPrev=sal_False);
+    sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
 
     const Rectangle& GetMarkedRect() const;
     void SetMarkedRect(const Rectangle& rRect);
 
     virtual void DeleteMarked();
-    BOOL IsDeleteMarkedPossible() const;
-    BOOL IsDeletePossible() const { return IsDeleteMarkedPossible(); }
+    sal_Bool IsDeleteMarkedPossible() const;
+    sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); }
 
     // Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View-
     // Kontext) durch Aufziehen eines Selektionsrahmens.
     //   bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift)
     //   bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb
     //                 des aufgezogenen Rahmens liegen werden deselektiert.
-    BOOL BegMark(const Point& rPnt, BOOL bAddMark=FALSE, BOOL bUnmark=FALSE);
+    sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False);
 
     // Folgende Actions sind moeglich:
     //   - ObjectCreating
@@ -312,28 +312,28 @@ public:
 // ~~~~~~~~~~~~~~~~~~~~
 //   Einfache Events:
 //   ~~~~~~~~~~~~~~~~
-//     BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-//     BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-//     BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+//     sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+//     sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+//     sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
 //
 //   Exchange (Clipboard derzeit noch ohne SdrPrivateData):
 //   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//     BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
-//     BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
-//     BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+//     sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+//     sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+//     sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
 //
 //   SfxItems:
 //   ~~~~~~~~~
-//     BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
-//     BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
+//     sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+//     sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
 //     SfxStyleSheet* GetStyleSheet() const;
-//     BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+//     sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 //
 //   Sonstiges:
 //   ~~~~~~~~~~
-//     Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nTol=0) const;
+//     Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const;
 //     String  GetStatusText();
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx
index 922d0221ac..922d0221ac 100644..100755
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svx/svdviter.hxx
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 363e3bd040..76cc67b2b1 100644..100755
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -55,12 +55,12 @@ class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView
 protected:
 
     void                ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
-    void                ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions);
-    BOOL                ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
+    void                ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
+    sal_Bool                ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
     Point               GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL);
 
     // liefert True, wenn rPt geaendert wurde
-    BOOL                ImpLimitToWorkArea(Point& rPt) const;
+    sal_Bool                ImpLimitToWorkArea(Point& rPt) const;
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -74,11 +74,11 @@ public:
     // Alle markierten Objekte in ein Metafile stecken. Z.Zt. noch etwas
     // buggee (Offset..., Fremdgrafikobjekte (SdrGrafObj), Virtuelle
     // Objektkopien (SdrVirtObj) mit Ankerpos<>(0,0)).
-    virtual GDIMetaFile GetMarkedObjMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const;
+    virtual GDIMetaFile GetMarkedObjMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const;
 
     // Alle markierten Objekte auf eine Bitmap malen. Diese hat die Farbtiefe
     // und Aufloesung des Bildschirms.
-    virtual Bitmap      GetMarkedObjBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const;
+    virtual Bitmap      GetMarkedObjBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const;
 
     // Alle markierten Objekte in ein neues Model kopieren. Dieses neue Model
     // hat dann genau eine Page. Das Flag PageNotValid an diesem Model ist
@@ -92,8 +92,8 @@ public:
     // der Default-Layer zugewiesen (Layer 0, (dokumentglobaler Standardlayer).
     virtual SdrModel*   GetMarkedObjModel() const;
 
-    GDIMetaFile     GetAllMarkedMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
-    Bitmap          GetAllMarkedBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
+    GDIMetaFile     GetAllMarkedMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
+    Bitmap          GetAllMarkedBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
     Graphic         GetAllMarkedGraphic() const;
     SdrModel*       GetAllMarkedModel() const { return GetMarkedObjModel(); }
 
@@ -116,7 +116,7 @@ public:
     Point           GetViewCenter(const OutputDevice* pOut=NULL) const;
 
     // Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert.
-    // Wird der Parameter bAddMark auf TRUE gesetzt, so werden die neuen
+    // Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen
     // DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert".
     // Dieser Fall ist fuer Drag&Drop mit mehreren Items gedacht.
     // Die Methoden mit Point-Parameter fuegen neue Objekte zentriert an
@@ -125,37 +125,37 @@ public:
     // eingefuegt. Die Positionierung (rPos bzw. Zentrierung) bezieht sich
     // dann nichtmehr auf die View sondern auf die Page.
     // Hinweis: SdrObjList ist Basisklasse von SdrPage.
-    // Die Methoden liefern TRUE, wenn die Objekte erfolgreich erzeugt und
-    // eingefuegt wurden. Bei pLst=FALSE und kein TextEdit aktiv kann man
+    // Die Methoden liefern sal_True, wenn die Objekte erfolgreich erzeugt und
+    // eingefuegt wurden. Bei pLst=sal_False und kein TextEdit aktiv kann man
     // sich dann auch darauf verlassen, dass diese an der View markiert sind.
     // Andernfalls erfolgt die Markierung nur, wenn pLst z.Zt. auch an der
     // View angezeigt wird.
     // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
     // SDRINSERT_ADDMARK (siehe svdedtv.hxx).
-    BOOL            Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
-    virtual BOOL    Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    BOOL            Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
-    // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
-    BOOL            Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
-    BOOL            Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+    sal_Bool            Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
+    virtual sal_Bool    Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    sal_Bool            Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+    // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+    sal_Bool            Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
+    sal_Bool            Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
     // Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's
     // Clipboard angenommen werden kann.
-    BOOL            IsExchangeFormatSupported(ULONG nFormat) const;
+    sal_Bool            IsExchangeFormatSupported(sal_uIntPtr nFormat) const;
 
-    BOOL            Cut( ULONG nFormat = SDR_ANYFORMAT );
-    void            CutMarked( ULONG nFormat=SDR_ANYFORMAT );
+    sal_Bool            Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    void            CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
 
-    BOOL            Yank( ULONG nFormat = SDR_ANYFORMAT );
-    void            YankMarked( ULONG nFormat=SDR_ANYFORMAT );
+    sal_Bool            Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    void            YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
 
-    BOOL            Paste( Window* pWin = NULL, ULONG nFormat = SDR_ANYFORMAT );
-    BOOL            PasteClipboard( OutputDevice* pOut = NULL, ULONG nFormat = SDR_ANYFORMAT, UINT32 nOptions = 0 );
+    sal_Bool            Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
+    sal_Bool            PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
 };
 
 #endif //_SVDXCGV_HXX
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index 5b8e893613..3e2653adff 100644..100755
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
@@ -37,11 +37,7 @@
 // - Defines -
 // -----------
 
-#ifdef WIN
-#define _SVHUGE huge
-#else
 #define _SVHUGE
-#endif
 
 // ----------------
 // - SimDepthType -
@@ -61,14 +57,14 @@ enum SimDepthType
 
 struct SimColor
 {
-    BYTE cBlue;
-    BYTE cGreen;
-    BYTE cRed;
+    sal_uInt8 cBlue;
+    sal_uInt8 cGreen;
+    sal_uInt8 cRed;
 };
 
 // ------------------------------------------------------------------------
 
-inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
+inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 )
 {
     return ( ( rCol1.cRed == rCol2.cRed ) &&
              ( rCol1.cGreen == rCol2.cGreen ) &&
@@ -81,7 +77,7 @@ inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
 
 struct SimPalette
 {
-    ULONG		nColors;
+    sal_uIntPtr		nColors;
     SimColor	aColorArray[ 256 ];
 };
 
@@ -107,39 +103,39 @@ private:
     SimPalette*			pPal2;
     SimPalette*			pPal3;
     SimPalette*			pPal4;
-    ULONG				nWidth1;
-    ULONG				nWidth2;
-    ULONG				nWidth3;
-    ULONG				nWidth4;
-    ULONG				nHeight1;
-    ULONG				nHeight2;
-    ULONG				nHeight3;
-    ULONG				nHeight4;
-    ULONG				nAlignedWidth1;
-    ULONG				nAlignedWidth2;
-    ULONG				nAlignedWidth3;
-    ULONG				nAlignedWidth4;
-    ULONG				nWhichOrg;
+    sal_uIntPtr				nWidth1;
+    sal_uIntPtr				nWidth2;
+    sal_uIntPtr				nWidth3;
+    sal_uIntPtr				nWidth4;
+    sal_uIntPtr				nHeight1;
+    sal_uIntPtr				nHeight2;
+    sal_uIntPtr				nHeight3;
+    sal_uIntPtr				nHeight4;
+    sal_uIntPtr				nAlignedWidth1;
+    sal_uIntPtr				nAlignedWidth2;
+    sal_uIntPtr				nAlignedWidth3;
+    sal_uIntPtr				nAlignedWidth4;
+    sal_uIntPtr				nWhichOrg;
     SimDepthType		eOrgDepth;
     SimDepthType		eUndoDepth;
     SimDepthType		eRedoDepth;
-    BOOL				bIsUndo;
-    BOOL				bIsRedo;
-    BOOL				bCreateUndo;
-    BOOL				bValid;
-    BOOL				bDitherAll;
-
-    HPBYTE				BitmapToArray24( const Bitmap& rBitmap, ULONG* pWidth,
-                                         ULONG* pHeight, ULONG* pAlignedWidth,
+    sal_Bool				bIsUndo;
+    sal_Bool				bIsRedo;
+    sal_Bool				bCreateUndo;
+    sal_Bool				bValid;
+    sal_Bool				bDitherAll;
+
+    HPBYTE				BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth,
+                                         sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth,
                                          SfxViewFrame *pFrame = NULL );
-    BOOL				Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
-                                         const ULONG nWidth, const ULONG nHeight,
-                                         const ULONG nColorCount = 256,
-                                         ULONG nLast = 0, SfxProgress* pProgress = NULL );
+    sal_Bool				Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
+                                         const sal_uIntPtr nWidth, const sal_uIntPtr nHeight,
+                                         const sal_uIntPtr nColorCount = 256,
+                                         sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
 
     Bitmap				CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL );
 
-    HPBYTE				CreateArray24( ULONG nWidth, ULONG nHeight );
+    HPBYTE				CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight );
     void				DeleteArray( HPBYTE pArray );
 
                         SvImageBase(const SvImageBase& rSvImageBase);
@@ -149,23 +145,23 @@ public:
 
                         SvImageBase();
                         SvImageBase( const Bitmap& rBitmap,
-                                     const ULONG nColorCount = 256,
-                                     ULONG nLast = 0, SfxProgress* pProgress = NULL );
+                                     const sal_uIntPtr nColorCount = 256,
+                                     sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
                         ~SvImageBase();
 
-    BOOL				IsValid() { return bValid; }
+    sal_Bool				IsValid() { return bValid; }
 
-    ULONG				GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
-    ULONG				GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
+    sal_uIntPtr				GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
+    sal_uIntPtr				GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
 
-    ULONG				GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
-    ULONG				GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
+    sal_uIntPtr				GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
+    sal_uIntPtr				GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
 
-    ULONG				GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
-    ULONG				GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
+    sal_uIntPtr				GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
+    sal_uIntPtr				GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
 
-    ULONG				GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
-    ULONG				GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
+    sal_uIntPtr				GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
+    sal_uIntPtr				GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
 
     // Get and set the color depth of the origin picture
     SimDepthType		GetDepth() const { return eOrgDepth; }
@@ -178,20 +174,20 @@ public:
     SimDepthType		GetRedoDepth() const { return eRedoDepth; }
     void				SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; }
 
-    BOOL				BeginProcessing( BOOL bUndo = TRUE );
+    sal_Bool				BeginProcessing( sal_Bool bUndo = sal_True );
     void				EndProcessing();
 
-    BOOL				BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE);
+    sal_Bool				BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True);
     void				EndProcessingExt() { EndProcessing(); }
 
     HPBYTE				GetOrgPointer() { return pOrgArray; }
     HPBYTE				GetDestPointer() { return pDestArray; }
 
-    BOOL				CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0,
+    sal_Bool				CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0,
                                          SfxProgress* pProgress = NULL );
 
-    BOOL				DoUndo( SfxProgress* pProgress = NULL );
-    BOOL				DoRedo( SfxProgress* pProgress = NULL );
+    sal_Bool				DoUndo( SfxProgress* pProgress = NULL );
+    sal_Bool				DoRedo( SfxProgress* pProgress = NULL );
 
     const Bitmap&		GetOutBitmap() const;
 
@@ -205,7 +201,7 @@ public:
 // - DitherBitmap -
 // ----------------
 
-BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE );
+sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False );
 
 #endif // _SVIMBASE_HXX
 
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index e02b98fab6..2bdf028db0 100644..100755
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -71,14 +71,14 @@ public:
 
 class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem {
 public:
-    Svx3DDoubleSidedItem(BOOL bVal = 0);
+    Svx3DDoubleSidedItem(sal_Bool bVal = 0);
 };
 
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
 class Svx3DReducedLineGeometryItem : public SfxBoolItem {
 public:
-    Svx3DReducedLineGeometryItem(BOOL bVal = 0);
+    Svx3DReducedLineGeometryItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -88,14 +88,14 @@ public:
     Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
 
     // use drawing::NormalsKind
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DNormalsInvertItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DNormalsInvertItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
@@ -103,8 +103,8 @@ public:
     Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
 
     // use drawing::TextureProjectionMode
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -113,14 +113,14 @@ public:
     Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
 
     // use drawing::TextureProjectionMode
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DShadow3DItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DShadow3DItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0);
 };
 
 class Svx3DMaterialColorItem : public SvxColorItem {
@@ -148,8 +148,8 @@ public:
     Svx3DTextureKindItem(sal_uInt16 nVal = 3);
 
     // use drawing::TextureKind
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -158,14 +158,14 @@ public:
     Svx3DTextureModeItem(sal_uInt16 nVal = 2);
 
     // use drawing:TextureMode
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
 class Svx3DTextureFilterItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DTextureFilterItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0);
 };
 
 // Svx3D _3DSCENE_ Items
@@ -174,8 +174,8 @@ public:
     Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE);
 
     // use drawing::ProjectionMode
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -191,7 +191,7 @@ public:
 
 class Svx3DTwoSidedLightingItem : public SfxBoolItem {
 public:
-    SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(BOOL bVal = 0);
+    SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem {
@@ -241,42 +241,42 @@ public:
 
 class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff1Item(BOOL bVal = 1);
+    Svx3DLightOnOff1Item(sal_Bool bVal = 1);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff2Item(BOOL bVal = 0);
+    Svx3DLightOnOff2Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff3Item(BOOL bVal = 0);
+    Svx3DLightOnOff3Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff4Item(BOOL bVal = 0);
+    Svx3DLightOnOff4Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff5Item(BOOL bVal = 0);
+    Svx3DLightOnOff5Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff6Item(BOOL bVal = 0);
+    Svx3DLightOnOff6Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff7Item(BOOL bVal = 0);
+    Svx3DLightOnOff7Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem {
 public:
-    Svx3DLightOnOff8Item(BOOL bVal = 0);
+    Svx3DLightOnOff8Item(sal_Bool bVal = 0);
 };
 
 class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem {
@@ -329,8 +329,8 @@ public:
     Svx3DShadeModeItem(sal_uInt16 nVal = 2);
 
     // use drawing::ShadeMode
-    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    SVX_DLLPRIVATE virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    SVX_DLLPRIVATE virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
 };
 
@@ -338,7 +338,7 @@ public:
 // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed
 class Svx3DSmoothNormalsItem : public SfxBoolItem {
 public:
-    Svx3DSmoothNormalsItem(BOOL bVal = 1);
+    Svx3DSmoothNormalsItem(sal_Bool bVal = 1);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -346,7 +346,7 @@ public:
 // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack
 class Svx3DSmoothLidsItem : public SfxBoolItem {
 public:
-    Svx3DSmoothLidsItem(BOOL bVal = 0);
+    Svx3DSmoothLidsItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -354,7 +354,7 @@ public:
 // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode
 class Svx3DCharacterModeItem : public SfxBoolItem {
 public:
-    Svx3DCharacterModeItem(BOOL bVal = 0);
+    Svx3DCharacterModeItem(sal_Bool bVal = 0);
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -362,7 +362,7 @@ public:
 // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront
 class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem {
 public:
-    Svx3DCloseFrontItem(BOOL bVal = 1);
+    Svx3DCloseFrontItem(sal_Bool bVal = 1);
     SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
@@ -370,7 +370,7 @@ public:
 // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack
 class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem {
 public:
-    Svx3DCloseBackItem(BOOL bVal = 1);
+    Svx3DCloseBackItem(sal_Bool bVal = 1);
     SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h
new file mode 100755
index 0000000000..01ff0bcd95
--- /dev/null
+++ b/svx/inc/svx/svxcommands.h
@@ -0,0 +1,604 @@
+/*************************************************************************

+ *

+ * 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.

+ *

+ ************************************************************************/

+#ifndef SVX_SVXCOMMANDS_HRC

+#define SVX_SVXCOMMANDS_HRC

+

+#define CMD_SID_INET_DLG                            ".uno:InternetDialog"

+#define CMD_SID_FM_RECORD_ABSOLUTE                  ".uno:AbsoluteRecord"

+#define CMD_SID_FM_ADD_FIELD                        ".uno:AddField"

+#define CMD_SID_FM_ADDTABLE                         ".uno:AddTable"

+#define CMD_SID_OBJECT_ALIGN_CENTER                 ".uno:AlignCenter"

+#define CMD_SID_OBJECT_ALIGN_DOWN                   ".uno:AlignDown"

+#define CMD_SID_OBJECT_ALIGN_LEFT                   ".uno:ObjectAlignLeft"

+#define CMD_SID_ATTR_PARA_ADJUST                    ".uno:Alignment"

+#define CMD_SID_OBJECT_ALIGN_MIDDLE                 ".uno:AlignMiddle"

+#define CMD_SID_OBJECT_ALIGN_RIGHT                  ".uno:ObjectAlignRight"

+#define CMD_SID_OBJECT_ALIGN_UP                     ".uno:AlignUp"

+#define CMD_SID_DRAW_ARC                            ".uno:Arc"

+#define CMD_SID_3D_ASSIGN                           ".uno:Assign3D"

+#define CMD_SID_FM_AUTOCONTROLFOCUS                 ".uno:AutoControlFocus"

+#define CMD_SID_FM_AUTOFILTER                       ".uno:AutoFilter"

+#define CMD_SID_AUTOFORMAT                          ".uno:AutoFormat"

+#define CMD_SID_TABLE_STYLE                         ".uno:TableStyle"

+#define CMD_SID_TABLE_STYLE_SETTINGS                ".uno:TableStyleSettings"

+#define CMD_SID_TABLEDESIGN                         ".uno:TableDesign"

+#define CMD_SID_BACKGROUND_COLOR                    ".uno:BackgroundColor"

+#define CMD_SID_ATTR_BRUSH                          ".uno:BackgroundPattern"

+#define CMD_SID_BACKGROUND_PATTERN                  ".uno:BackgroundPatternController"

+#define CMD_SID_DRAW_BEZIER_NOFILL                  ".uno:Bezier_Unfilled"

+#define CMD_SID_BEZIER_APPEND                       ".uno:BezierAppend"

+#define CMD_SID_BEZIER_CLOSE                        ".uno:BezierClose"

+#define CMD_SID_BEZIER_CONVERT                      ".uno:BezierConvert"

+#define CMD_SID_BEZIER_CUTLINE                      ".uno:BezierCutLine"

+#define CMD_SID_BEZIER_DELETE                       ".uno:BezierDelete"

+#define CMD_SID_BEZIER_EDGE                         ".uno:BezierEdge"

+#define CMD_SID_BEZIER_ELIMINATE_POINTS             ".uno:BezierEliminatePoints"

+#define CMD_SID_DRAW_BEZIER_FILL                    ".uno:BezierFill"

+#define CMD_SID_BEZIER_INSERT                       ".uno:BezierInsert"

+#define CMD_SID_BEZIER_MOVE                         ".uno:BezierMove"

+#define CMD_SID_BEZIER_SMOOTH                       ".uno:BezierSmooth"

+#define CMD_SID_BEZIER_SYMMTR                       ".uno:BezierSymmetric"

+#define CMD_SID_BEZIERTO                            ".uno:BezierTo"

+#define CMD_SID_BMPMASK                             ".uno:BmpMask"

+#define CMD_SID_BMPMASK_EXEC                        ".uno:BmpMaskExec"

+#define CMD_SID_BMPMASK_PIPETTE                     ".uno:BmpMaskPipette"

+#define CMD_SID_ATTR_CHAR_WEIGHT                    ".uno:Bold"

+#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT              ".uno:BoldLatin"

+#define CMD_SID_ATTR_CHAR_CJK_WEIGHT                ".uno:BoldCJK"

+#define CMD_SID_ATTR_CHAR_CTL_WEIGHT                ".uno:BoldCTL"

+#define CMD_SID_BORDER_OBJECT                       ".uno:Border"

+#define CMD_SID_ATTR_BORDER_INNER                   ".uno:BorderInner"

+#define CMD_SID_ATTR_BORDER_OUTER                   ".uno:BorderOuter"

+#define CMD_SID_ATTR_BORDER                         ".uno:SetBorderStyle"

+#define CMD_SID_FRAME_TO_TOP                        ".uno:BringToFront"

+#define CMD_SID_DRAW_CAPTION                        ".uno:DrawCaption"

+#define CMD_SID_ATTR_CHAR_CASEMAP                   ".uno:CaseMap"

+#define CMD_SID_ATTR_PARA_ADJUST_CENTER             ".uno:CenterPara"

+#define CMD_SID_TRANSLITERATE_FULLWIDTH             ".uno:ChangeCaseToFullWidth"

+#define CMD_SID_TRANSLITERATE_HALFWIDTH             ".uno:ChangeCaseToHalfWidth"

+#define CMD_SID_TRANSLITERATE_HIRAGANA              ".uno:ChangeCaseToHiragana"

+#define CMD_SID_TRANSLITERATE_KATAGANA              ".uno:ChangeCaseToKatakana"

+#define CMD_SID_TRANSLITERATE_LOWER                 ".uno:ChangeCaseToLower"

+#define CMD_SID_TRANSLITERATE_UPPER                 ".uno:ChangeCaseToUpper"

+#define CMD_SID_FM_CHANGECONTROLTYPE                ".uno:ChangeControlType"

+#define CMD_SID_ATTR_CHAR_FONT                      ".uno:CharFontName"

+#define CMD_SID_ATTR_CHAR_LATIN_FONT                ".uno:CharFontNameLatin"

+#define CMD_SID_ATTR_CHAR_CJK_FONT                  ".uno:CharFontNameCJK"

+#define CMD_SID_ATTR_CHAR_CTL_FONT                  ".uno:CharFontNameCTL"

+#define CMD_SID_INSERT_CHECKBOX                     ".uno:Checkbox"

+#define CMD_SID_FM_CHECKBOX                         ".uno:CheckBox"

+#define CMD_SID_CHOOSE_CONTROLS                     ".uno:ChooseControls"

+#define CMD_SID_CHOOSE_POLYGON                      ".uno:ChoosePolygon"

+#define CMD_SID_DRAW_CIRCLE                         ".uno:Circle"

+#define CMD_SID_DRAW_CIRCLE_NOFILL                  ".uno:Circle_Unfilled"

+#define CMD_SID_DRAW_CIRCLEARC                      ".uno:CircleArc"

+#define CMD_SID_DRAW_CIRCLECUT                      ".uno:CircleCut"

+#define CMD_SID_DRAW_CIRCLECUT_NOFILL               ".uno:CircleCut_Unfilled"

+#define CMD_SID_DRAW_CIRCLEPIE                      ".uno:CirclePie"

+#define CMD_SID_DRAW_CIRCLEPIE_NOFILL               ".uno:CirclePie_Unfilled"

+#define CMD_SID_OUTLINE_DELETEALL                   ".uno:ClearOutline"

+#define CMD_SID_ATTR_CHAR_COLOR                     ".uno:Color"

+#define CMD_SID_COLOR_CONTROL                       ".uno:ColorControl"

+#define CMD_SID_FM_COMBOBOX                         ".uno:ComboBox"

+#define CMD_SID_FM_NAVIGATIONBAR                    ".uno:NavigationBar"

+#define CMD_SID_INSERT_COMBOBOX                     ".uno:Combobox"

+#define CMD_SID_FM_CONFIG                           ".uno:Config"

+#define CMD_SID_FM_MORE_CONTROLS                    ".uno:MoreControls"

+#define CMD_SID_FM_FORM_DESIGN_TOOLS                ".uno:FormDesignTools"

+#define CMD_SID_CONTOUR_DLG                         ".uno:ContourDialog"

+#define CMD_SID_CONTOUR_EXEC                        ".uno:ContourExecute"

+#define CMD_SID_FM_CTL_PROPERTIES                   ".uno:ControlProperties"

+#define CMD_SID_FM_CONVERTTO_BUTTON                 ".uno:ConvertToButton"

+#define CMD_SID_FM_CONVERTTO_CHECKBOX               ".uno:ConvertToCheckBox"

+#define CMD_SID_FM_CONVERTTO_COMBOBOX               ".uno:ConvertToCombo"

+#define CMD_SID_FM_CONVERTTO_CURRENCY               ".uno:ConvertToCurrency"

+#define CMD_SID_FM_CONVERTTO_DATE                   ".uno:ConvertToDate"

+#define CMD_SID_FM_CONVERTTO_EDIT                   ".uno:ConvertToEdit"

+#define CMD_SID_FM_CONVERTTO_FILECONTROL            ".uno:ConvertToFileControl"

+#define CMD_SID_FM_CONVERTTO_FIXEDTEXT              ".uno:ConvertToFixed"

+#define CMD_SID_FM_CONVERTTO_FORMATTED              ".uno:ConvertToFormatted"

+#define CMD_SID_FM_CONVERTTO_SCROLLBAR              ".uno:ConvertToScrollBar"

+#define CMD_SID_FM_CONVERTTO_SPINBUTTON             ".uno:ConvertToSpinButton"

+#define CMD_SID_FM_CONVERTTO_GROUPBOX               ".uno:ConvertToGroup"

+#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON            ".uno:ConvertToImageBtn"

+#define CMD_SID_FM_CONVERTTO_IMAGECONTROL           ".uno:ConvertToImageControl"

+#define CMD_SID_FM_CONVERTTO_LISTBOX                ".uno:ConvertToList"

+#define CMD_SID_FM_CONVERTTO_NUMERIC                ".uno:ConvertToNumeric"

+#define CMD_SID_FM_CONVERTTO_PATTERN                ".uno:ConvertToPattern"

+#define CMD_SID_FM_CONVERTTO_RADIOBUTTON            ".uno:ConvertToRadio"

+#define CMD_SID_FM_CONVERTTO_TIME                   ".uno:ConvertToTime"

+#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR          ".uno:ConvertToNavigationBar"

+#define CMD_SID_FM_COUNTALL                         ".uno:CountAll"

+#define CMD_SID_FM_CREATE_CONTROL                   ".uno:CreateControl"

+#define CMD_SID_INSERT_CURRENCYFIELD                ".uno:InsertCurrencyField"

+#define CMD_SID_FM_CURRENCYFIELD                    ".uno:CurrencyField"

+#define CMD_SID_DASH                                ".uno:Dash"

+#define CMD_SID_INSERT_DATEFIELD                    ".uno:AddDateField"

+#define CMD_SID_FM_DATEFIELD                        ".uno:DateField"

+#define CMD_FN_NUM_BULLET_ON                        ".uno:DefaultBullet"

+#define CMD_SID_FM_RECORD_DELETE                    ".uno:DeleteRecord"

+#define CMD_SID_FM_DESIGN_MODE                      ".uno:SwitchControlDesignMode"

+#define CMD_SID_DISTRIBUTE_DLG                      ".uno:DistributeSelection"

+#define CMD_SID_DRAW_SELECT                         ".uno:DrawSelect"

+#define CMD_SID_INSERT_DRAW                         ".uno:InsertDraw"

+#define CMD_SID_DSBROWSER_EXPLORER                  ".uno:DSBrowserExplorer"

+#define CMD_SID_FM_EDIT                             ".uno:Edit"

+#define CMD_SID_INSERT_EDIT                         ".uno:InsertEdit"

+#define CMD_SID_DRAW_ELLIPSE                        ".uno:Ellipse"

+#define CMD_SID_DRAW_ELLIPSE_NOFILL                 ".uno:Ellipse_Unfilled"

+#define CMD_SID_DRAW_ELLIPSECUT                     ".uno:EllipseCut"

+#define CMD_SID_DRAW_ELLIPSECUT_NOFILL              ".uno:EllipseCut_Unfilled"

+#define CMD_SID_ENTER_GROUP                         ".uno:EnterGroup"

+#define CMD_SID_ATTR_CHAR_ESCAPEMENT                ".uno:Escapement"

+#define CMD_SID_FM_FIELDS_CONTROL                   ".uno:FieldController"

+#define CMD_SID_FM_FILECONTROL                      ".uno:FileControl"

+#define CMD_SID_INSERT_FILECONTROL                  ".uno:InsertFileControl"

+#define CMD_SID_INSERT_TREECONTROL                  ".uno:InsertTreeControl"

+#define CMD_SID_ATTR_FILL_BITMAP                    ".uno:FillBitmap"

+#define CMD_SID_ATTR_FILL_COLOR                     ".uno:FillColor"

+#define CMD_SID_ATTR_FILL_GRADIENT                  ".uno:FillGradient"

+#define CMD_SID_ATTR_FILL_HATCH                     ".uno:FillHatch"

+#define CMD_SID_ATTR_FILL_STYLE                     ".uno:FillStyle"

+#define CMD_SID_FM_FILTERCRIT                       ".uno:FilterCrit"

+#define CMD_SID_FM_RECORD_FIRST                     ".uno:FirstRecord"

+#define CMD_SID_ATTR_FLASH                          ".uno:Flash"

+#define CMD_SID_FM_FMEXPLORER_CONTROL               ".uno:FmExplorerController"

+#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL         ".uno:FmFilterNavigatorController"

+#define CMD_SID_CHAR_DLG                            ".uno:FontDialog"

+#define CMD_SID_ATTR_CHAR_FONTHEIGHT                ".uno:FontHeight"

+#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT          ".uno:FontHeighLatin"

+#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT            ".uno:FontHeightCJK"

+#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT            ".uno:FontHeightCTL"

+#define CMD_SID_FONTWORK                            ".uno:FontWork"

+#define CMD_SID_FORMTEXT_ADJUST                     ".uno:FontWorkTextAdjust"

+#define CMD_SID_FORMTEXT_STDFORM                    ".uno:FontWorkTextClearAttributes"

+#define CMD_SID_FORMTEXT_DISTANCE                   ".uno:FontWorkTextDistance"

+#define CMD_SID_FORMTEXT_MIRROR                     ".uno:FontWorkTextMirror"

+#define CMD_SID_FORMTEXT_OUTLINE                    ".uno:FontWorkTextOutline"

+#define CMD_SID_FORMTEXT_SHADOW                     ".uno:FontWorkTextShadow"

+#define CMD_SID_FORMTEXT_SHDWCOLOR                  ".uno:FontWorkTextShadowColor"

+#define CMD_SID_FORMTEXT_SHDWXVAL                   ".uno:FontWorkTextShadowXVal"

+#define CMD_SID_FORMTEXT_SHDWYVAL                   ".uno:FontWorkTextShadowYVal"

+#define CMD_SID_FORMTEXT_START                      ".uno:FontWorkTextStart"

+#define CMD_SID_FORMTEXT_STYLE                      ".uno:FontWorkTextStyle"

+#define CMD_SID_ATTRIBUTES_AREA                     ".uno:FormatArea"

+#define CMD_SID_FORMTEXT_HIDEFORM                   ".uno:FormatFontWorkClose"

+#define CMD_SID_GROUP                               ".uno:FormatGroup"

+#define CMD_SID_ATTRIBUTES_LINE                     ".uno:FormatLine"

+#define CMD_SID_FM_FORMATTEDFIELD                   ".uno:FormattedField"

+#define CMD_SID_FM_SCROLLBAR                        ".uno:ScrollBar"

+#define CMD_SID_FM_SPINBUTTON                       ".uno:SpinButton"

+#define CMD_SID_INSERT_FORMATTEDFIELD               ".uno:InsertFormattedField"

+#define CMD_SID_UNGROUP                             ".uno:FormatUngroup"

+#define CMD_SID_FM_FILTER_START                     ".uno:FormFilter"

+#define CMD_SID_FM_FORM_FILTERED                    ".uno:FormFiltered"

+#define CMD_SID_FM_FILTER_EXECUTE                   ".uno:FormFilterExecute"

+#define CMD_SID_FM_FILTER_EXIT                      ".uno:FormFilterExit"

+#define CMD_SID_FM_FILTER_NAVIGATOR                 ".uno:FormFilterNavigator"

+#define CMD_SID_FM_PROPERTIES                       ".uno:FormProperties"

+#define CMD_SID_DRAW_FREELINE                       ".uno:Freeline"

+#define CMD_SID_DRAW_FREELINE_NOFILL                ".uno:Freeline_Unfilled"

+#define CMD_SID_ATTR_AUTO_COLOR_INVALID             ".uno:AutoColorInvalid"

+#define CMD_SID_GALLERY                             ".uno:Gallery"

+#define CMD_SID_GALLERY_ENABLE_ADDCOPY              ".uno:GalleryEnableAddCopy"

+#define CMD_SID_GETREDOSTRINGS                      ".uno:GetRedoStrings"

+#define CMD_SID_GETUNDOSTRINGS                      ".uno:GetUndoStrings"

+#define CMD_SID_ATTR_GRAF_CROP                      ".uno:GrafAttrCrop"

+#define CMD_SID_ATTR_GRAF_BLUE                      ".uno:GrafBlue"

+#define CMD_SID_ATTR_GRAF_CONTRAST                  ".uno:GrafContrast"

+#define CMD_SID_ATTR_GRAF_GAMMA                     ".uno:GrafGamma"

+#define CMD_SID_ATTR_GRAF_GREEN                     ".uno:GrafGreen"

+#define CMD_SID_ATTR_GRAF_INVERT                    ".uno:GrafInvert"

+#define CMD_SID_ATTR_GRAF_LUMINANCE                 ".uno:GrafLuminance"

+#define CMD_SID_ATTR_GRAF_MODE                      ".uno:GrafMode"

+#define CMD_SID_ATTR_GRAF_RED                       ".uno:GrafRed"

+#define CMD_SID_ATTR_GRAF_TRANSPARENCE              ".uno:GrafTransparence"

+#define CMD_SID_GRFFILTER_INVERT                    ".uno:GraphicFilterInvert"

+#define CMD_SID_GRFFILTER_MOSAIC                    ".uno:GraphicFilterMosaic"

+#define CMD_SID_GRFFILTER_POPART                    ".uno:GraphicFilterPopart"

+#define CMD_SID_GRFFILTER_POSTER                    ".uno:GraphicFilterPoster"

+#define CMD_SID_GRFFILTER_EMBOSS                    ".uno:GraphicFilterRelief"

+#define CMD_SID_GRFFILTER_REMOVENOISE               ".uno:GraphicFilterRemoveNoise"

+#define CMD_SID_GRFFILTER_SEPIA                     ".uno:GraphicFilterSepia"

+#define CMD_SID_GRFFILTER_SHARPEN                   ".uno:GraphicFilterSharpen"

+#define CMD_SID_GRFFILTER_SMOOTH                    ".uno:GraphicFilterSmooth"

+#define CMD_SID_GRFFILTER_SOBEL                     ".uno:GraphicFilterSobel"

+#define CMD_SID_GRFFILTER_SOLARIZE                  ".uno:GraphicFilterSolarize"

+#define CMD_SID_GRFFILTER                           ".uno:GraphicFilterToolbox"

+#define CMD_SID_FM_DBGRID                           ".uno:Grid"

+#define CMD_SID_GRID_USE                            ".uno:GridUse"

+#define CMD_SID_GRID_VISIBLE                        ".uno:GridVisible"

+#define CMD_SID_OUTLINE_MAKE                        ".uno:Group"

+#define CMD_SID_FM_GROUPBOX                         ".uno:GroupBox"

+#define CMD_SID_INSERT_GROUPBOX                     ".uno:Groupbox"

+#define CMD_SID_RULER_LR_MIN_MAX                    ".uno:HeaderFooterBorder"

+#define CMD_SID_HELPLINES_MOVE                      ".uno:HelplinesMove"

+#define CMD_SID_INSERT_HFIXEDLINE                   ".uno:HFixedLine"

+#define CMD_SID_OUTLINE_HIDE                        ".uno:HideDetail"

+#define CMD_SID_INSERT_HSCROLLBAR                   ".uno:HScrollbar"

+#define CMD_SID_HYPERLINK_GETLINK                   ".uno:Hyperlink"

+#define CMD_SID_FM_IMAGEBUTTON                      ".uno:Imagebutton"

+#define CMD_SID_FM_IMAGECONTROL                     ".uno:ImageControl"

+#define CMD_SID_INSERT_IMAGECONTROL                 ".uno:InsertImageControl"

+#define CMD_SID_IMAP                                ".uno:ImageMapDialog"

+#define CMD_SID_IMAP_EXEC                           ".uno:ImageMapExecute"

+#define CMD_SID_3D_INIT                             ".uno:Init3D"

+#define CMD_SID_OBJECTRESIZE                        ".uno:InPlaceObjectResize"

+#define CMD_SID_ENTER_STRING                        ".uno:EnterString"

+#define CMD_SID_INSERT_POSTIT                       ".uno:InsertAnnotation"

+#define CMD_SID_SHOW_POSTIT                         ".uno:ShowAnnotations"

+#define CMD_SID_REPLYTO_POSTIT                      ".uno:ReplyToAnnotation"

+#define CMD_SID_DELETE_POSTIT                       ".uno:DeleteAnnotation"

+#define CMD_SID_DELETEALL_POSTIT                    ".uno:DeleteAllAnnotation"

+#define CMD_SID_DELETEALLBYAUTHOR_POSTIT            ".uno:DeleteAllAnnotationByAuthor"

+#define CMD_SID_NEXT_POSTIT                         ".uno:NextAnnotation"

+#define CMD_SID_PREVIOUS_POSTIT                     ".uno:PreviousAnnotation"

+#define CMD_SID_INSERT_APPLET                       ".uno:InsertApplet"

+#define CMD_SID_GALLERY_FORMATS                     ".uno:InsertGalleryPic"

+#define CMD_SID_INSERT_GRAPHIC                      ".uno:InsertGraphic"

+#define CMD_SID_INSERT_IMAGE                        ".uno:InsertImage"

+#define CMD_SID_INSERT_MATH                         ".uno:InsertMath"

+#define CMD_SID_ATTR_INSERT                         ".uno:InsertMode"

+#define CMD_FN_NUM_NUMBERING_ON                     ".uno:DefaultNumbering"

+#define CMD_SID_INSERT_OBJECT                       ".uno:InsertObject"

+#define CMD_SID_INSERT_DIAGRAM                      ".uno:InsertObjectChart"

+#define CMD_SID_INSERT_PLUGIN                       ".uno:InsertPlugin"

+#define CMD_SID_INSERT_SOUND                        ".uno:InsertSound"

+#define CMD_SID_CHARMAP                             ".uno:InsertSymbol"

+#define CMD_SID_ATTR_TABLE                          ".uno:InsertSpreadsheet"

+#define CMD_SID_INSERT_TABLE                        ".uno:InsertTable"

+#define CMD_SID_INSERT_FRAME                        ".uno:InsertTextFrame"

+#define CMD_SID_INSERT_VIDEO                        ".uno:InsertVideo"

+#define CMD_SID_POLY_INTERSECT                      ".uno:Intersect"

+#define CMD_SID_ATTR_CHAR_POSTURE                   ".uno:Italic"

+#define CMD_SID_ATTR_CHAR_LATIN_POSTURE             ".uno:ItalicLatin"

+#define CMD_SID_ATTR_CHAR_CJK_POSTURE               ".uno:ItalicCJK"

+#define CMD_SID_ATTR_CHAR_CTL_POSTURE               ".uno:ItalicCTL"

+#define CMD_SID_ATTR_PARA_ADJUST_BLOCK              ".uno:JustifyPara"

+#define CMD_SID_INSERT_FIXEDTEXT                    ".uno:InsertFixedText"

+#define CMD_SID_FM_FIXEDTEXT                        ".uno:Label"

+#define CMD_SID_ATTR_CHAR_LANGUAGE                  ".uno:Language"

+#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE            ".uno:LanguageLatin"

+#define CMD_SID_FM_RECORD_LAST                      ".uno:LastRecord"

+#define CMD_SID_FM_LEAVE_CREATE                     ".uno:LeaveFMCreateMode"

+#define CMD_SID_LEAVE_GROUP                         ".uno:LeaveGroup"

+#define CMD_SID_ATTR_PARA_ADJUST_LEFT               ".uno:LeftPara"

+#define CMD_SID_ATTR_LRSPACE                        ".uno:LeftRightMargin"

+#define CMD_SID_ATTR_PARA_LRSPACE                   ".uno:LeftRightParaMargin"

+#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL          ".uno:LeftRightParaMargin_Vertical"

+#define CMD_SID_DRAW_LINE                           ".uno:Line"

+#define CMD_SID_DRAW_XLINE                          ".uno:Line_Diagonal"

+#define CMD_SID_FRAME_LINECOLOR                     ".uno:FrameLineColor"

+#define CMD_SID_ATTR_LINE_DASH                      ".uno:LineDash"

+#define CMD_SID_ATTR_LINEEND_STYLE                  ".uno:LineEndStyle"

+#define CMD_SID_ATTR_PARA_LINESPACE                 ".uno:LineSpacing"

+#define CMD_SID_FRAME_LINESTYLE                     ".uno:LineStyle"

+#define CMD_SID_ATTR_LINE_WIDTH                     ".uno:LineWidth"

+#define CMD_SID_FM_LISTBOX                          ".uno:ListBox"

+#define CMD_SID_INSERT_LISTBOX                      ".uno:InsertListbox"

+#define CMD_SID_POLY_MERGE                          ".uno:Merge"

+#define CMD_SID_BASICIDE_NEWJAVAMODULE              ".uno:NewJavaModule"

+#define CMD_SID_FM_RECORD_NEW                       ".uno:NewRecord"

+#define CMD_SID_FM_RECORD_NEXT                      ".uno:NextRecord"

+#define CMD_SID_FM_NUMERICFIELD                     ".uno:NumericField"

+#define CMD_SID_INSERT_NUMERICFIELD                 ".uno:InsertNumericField"

+#define CMD_SID_OBJECT_ALIGN                        ".uno:ObjectAlign"

+#define CMD_SID_FRAME_DOWN                          ".uno:ObjectBackOne"

+#define CMD_SID_FRAME_UP                            ".uno:ObjectForwardOne"

+#define CMD_SID_FM_OPEN_READONLY                    ".uno:OpenReadOnly"

+#define CMD_SID_FM_ORDERCRIT                        ".uno:OrderCrit"

+#define CMD_SID_ATTR_PARA_ORPHANS                   ".uno:Orphan"

+#define CMD_SID_OUTLINE_BULLET                      ".uno:OutlineBullet"

+#define CMD_SID_OUTLINE_COLLAPSE                    ".uno:OutlineCollapse"

+#define CMD_SID_OUTLINE_COLLAPSE_ALL                ".uno:OutlineCollapseAll"

+#define CMD_SID_OUTLINE_DOWN                        ".uno:OutlineDown"

+#define CMD_SID_OUTLINE_EXPAND                      ".uno:OutlineExpand"

+#define CMD_SID_OUTLINE_EXPAND_ALL                  ".uno:OutlineExpandAll"

+#define CMD_SID_ATTR_CHAR_CONTOUR                   ".uno:OutlineFont"

+#define CMD_SID_OUTLINE_FORMAT                      ".uno:OutlineFormat"

+#define CMD_SID_OUTLINE_LEFT                        ".uno:OutlineLeft"

+#define CMD_SID_OUTLINE_RIGHT                       ".uno:OutlineRight"

+#define CMD_SID_OUTLINE_UP                          ".uno:OutlineUp"

+#define CMD_SID_ATTR_PARA_PAGEBREAK                 ".uno:Pagebreak"

+#define CMD_SID_ATTR_PAGE_PAPERBIN                  ".uno:PagePaperBin"

+#define CMD_SID_ATTR_PAGE_SIZE                      ".uno:AttributePageSize"

+#define CMD_SID_ATTR_PARA_MODEL                     ".uno:AttributeParaModel"

+#define CMD_SID_ATTR_PAGE                           ".uno:AttributePage"

+#define CMD_SID_ATTR_CHAR_AUTOKERN                  ".uno:PairKerning"

+#define CMD_SID_PARA_DLG                            ".uno:ParagraphDialog"

+#define CMD_SID_ATTR_PARA_KEEP                      ".uno:ParaKeepTogether"

+#define CMD_SID_ATTR_PARA_SPLIT                     ".uno:ParaSplit"

+#define CMD_SID_INSERT_PATTERNFIELD                 ".uno:InsertPatternField"

+#define CMD_SID_FM_PATTERNFIELD                     ".uno:PatternField"

+#define CMD_SID_DRAW_PIE                            ".uno:Pie"

+#define CMD_SID_DRAW_PIE_NOFILL                     ".uno:Pie_Unfilled"

+#define CMD_SID_POLY_FORMEN                         ".uno:PolyFormen"

+#define CMD_SID_DRAW_XPOLYGON                       ".uno:Polygon_Diagonal"

+#define CMD_SID_DRAW_XPOLYGON_NOFILL                ".uno:Polygon_Diagonal_Unfilled"

+#define CMD_SID_DRAW_POLYGON_NOFILL                 ".uno:Polygon_Unfilled"

+#define CMD_SID_ATTR_POSITION                       ".uno:Position"

+#define CMD_SID_INSERT_PREVIEW                      ".uno:Preview"

+#define CMD_SID_FM_RECORD_PREV                      ".uno:PrevRecord"

+#define CMD_SID_INSERT_PROGRESSBAR                  ".uno:ProgressBar"

+#define CMD_SID_FM_PROPERTY_CONTROL                 ".uno:PropertyController"

+#define CMD_SID_FM_PUSHBUTTON                       ".uno:Pushbutton"

+#define CMD_SID_INSERT_PUSHBUTTON                   ".uno:InsertPushbutton"

+#define CMD_SID_INSERT_RADIOBUTTON                  ".uno:Radiobutton"

+#define CMD_SID_FM_RADIOBUTTON                      ".uno:RadioButton"

+#define CMD_SID_READONLY_MODE                       ".uno:ReadOnlyMode"

+#define CMD_SID_FM_RECORD_FROM_TEXT                 ".uno:RecFromText"

+#define CMD_SID_FM_RECORD_SAVE                      ".uno:RecSave"

+#define CMD_SID_FM_SEARCH                           ".uno:RecSearch"

+#define CMD_SID_DRAW_RECT                           ".uno:Rect"

+#define CMD_SID_DRAW_RECT_ROUND                     ".uno:Rect_Rounded"

+#define CMD_SID_DRAW_RECT_ROUND_NOFILL              ".uno:Rect_Rounded_Unfilled"

+#define CMD_SID_DRAW_RECT_NOFILL                    ".uno:Rect_Unfilled"

+#define CMD_SID_FM_RECORD_TEXT                      ".uno:RecText"

+#define CMD_SID_FM_RECORD_TOTAL                     ".uno:RecTotal"

+#define CMD_SID_FM_RECORD_UNDO                      ".uno:RecUndo"

+#define CMD_SID_FM_REFRESH                          ".uno:Refresh"

+#define CMD_SID_FM_REFRESH_FORM_CONTROL             ".uno:RefreshFormControl"

+#define CMD_SID_FM_FILTER_REMOVE                    ".uno:RemoveFilter"

+#define CMD_SID_FM_REMOVE_FILTER_SORT               ".uno:RemoveFilterSort"

+#define CMD_FID_SEARCH_REPLACESET                   ".uno:ReplaceSet"

+#define CMD_SID_ATTR_PARA_ADJUST_RIGHT              ".uno:RightPara"

+#define CMD_SID_RULER_BORDER_DISTANCE               ".uno:RulerBorderDistance"

+#define CMD_SID_RULER_BORDERS                       ".uno:RulerBorders"

+#define CMD_SID_RULER_BORDERS_VERTICAL              ".uno:RulerBordersVertical"

+#define CMD_SID_RULER_NULL_OFFSET                   ".uno:RulerNullOffset"

+#define CMD_SID_RULER_PAGE_POS                      ".uno:RulerPagePos"

+#define CMD_SID_RULER_PROTECT                       ".uno:RulerProtect"

+#define CMD_SID_FM_EXECUTE                          ".uno:SbaExecuteSql"

+#define CMD_SID_FM_NATIVESQL                        ".uno:SbaNativeSql"

+#define CMD_SID_SCAN                                ".uno:Scan"

+#define CMD_SID_SC_EDITOPTIONS                      ".uno:ScEditOptions"

+#define CMD_SID_SCH_EDITOPTIONS                     ".uno:SchEditOptions"

+#define CMD_SID_SD_EDITOPTIONS                      ".uno:SdEditOptions"

+#define CMD_SID_SD_GRAPHIC_OPTIONS                  ".uno:SdGraphicOptions"

+#define CMD_FID_SEARCH_OFF                          ".uno:SearchOff"

+#define CMD_FID_SEARCH_ON                           ".uno:SearchOn"

+#define CMD_FID_SEARCH_SEARCHSET                    ".uno:SearchSet"

+#define CMD_SID_SELECT                              ".uno:Select"

+#define CMD_SID_FRAME_TO_BOTTOM                     ".uno:SendToBack"

+#define CMD_SID_SET_DEFAULT                         ".uno:SetDefault"

+#define CMD_SID_HYPERLINK_SETLINK                   ".uno:SetHyperlink"

+#define CMD_SID_ATTR_PARA_HYPHENZONE                ".uno:SetHyphenZone"

+#define CMD_SID_ATTR_LONG_LRSPACE                   ".uno:SetLongLeftRightMargin"

+#define CMD_SID_ATTR_LONG_ULSPACE                   ".uno:SetLongTopBottomMargin"

+#define CMD_SID_OBJECT_HELL                         ".uno:SetObjectToBackground"

+#define CMD_SID_OBJECT_HEAVEN                       ".uno:SetObjectToForeground"

+#define CMD_SID_ATTR_PAGE_MAXSIZE                   ".uno:SetPageMaxSize"

+#define CMD_SID_ATTR_BORDER_SHADOW                  ".uno:BorderShadow"

+#define CMD_SID_ATTR_FILL_SHADOW                    ".uno:FillShadow"

+#define CMD_SID_ATTR_CHAR_SHADOWED                  ".uno:Shadowed"

+#define CMD_SID_OUTLINE_SHOW                        ".uno:ShowDetail"

+#define CMD_SID_FM_SHOW_FMEXPLORER                  ".uno:ShowFmExplorer"

+#define CMD_SID_SHOW_ITEMBROWSER                    ".uno:ShowItemBrowser"

+#define CMD_SID_SHOW_PROPERTYBROWSER                ".uno:ShowPropBrowser"

+#define CMD_SID_FM_SHOW_PROPERTIES                  ".uno:ShowProperties"

+#define CMD_SID_FM_SHOW_PROPERTY_BROWSER            ".uno:ShowPropertyBrowser"

+#define CMD_SID_RULER                               ".uno:ShowRuler"

+#define CMD_SID_SIM_EDITOPTIONS                     ".uno:SimEditOptions"

+#define CMD_SID_ATTR_SIZE                           ".uno:Size"

+#define CMD_SID_SM_EDITOPTIONS                      ".uno:SmEditOptions"

+#define CMD_SID_FM_SORTDOWN                         ".uno:SortDown"

+#define CMD_SID_FM_SORTUP                           ".uno:Sortup"

+#define CMD_SID_ATTR_PARA_LINESPACE_10              ".uno:SpacePara1"

+#define CMD_SID_ATTR_PARA_LINESPACE_15              ".uno:SpacePara15"

+#define CMD_SID_ATTR_PARA_LINESPACE_20              ".uno:SpacePara2"

+#define CMD_SID_ATTR_CHAR_KERNING                   ".uno:Spacing"

+#define CMD_SID_AUTOSPELL_CHECK                     ".uno:SpellOnline"

+#define CMD_SID_INSERT_SPINBUTTON                   ".uno:Spinbutton"

+#define CMD_SID_DRAW_SQUARE                         ".uno:Square"

+#define CMD_SID_DRAW_SQUARE_ROUND                   ".uno:Square_Rounded"

+#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL            ".uno:Square_Rounded_Unfilled"

+#define CMD_SID_DRAW_SQUARE_NOFILL                  ".uno:Square_Unfilled"

+#define CMD_SID_3D_STATE                            ".uno:State3D"

+#define CMD_SID_ATTR_CHAR_STRIKEOUT                 ".uno:Strikeout"

+#define CMD_SID_SET_SUB_SCRIPT                      ".uno:SubScript"

+#define CMD_SID_POLY_SUBSTRACT                      ".uno:Substract"

+#define CMD_SID_SET_SUPER_SCRIPT                    ".uno:SuperScript"

+#define CMD_SID_SW_EDITOPTIONS                      ".uno:SwEditOptions"

+#define CMD_SID_FM_TAB_DIALOG                       ".uno:TabDialog"

+#define CMD_SID_ATTR_TABSTOP                        ".uno:Tabstops"

+#define CMD_SID_ATTR_TABSTOP_VERTICAL               ".uno:TabstopsVertical"

+#define CMD_SID_DIALOG_TESTMODE                     ".uno:TestMode"

+#define CMD_SID_ATTR_CHAR                           ".uno:Text"

+#define CMD_SID_DRAW_TEXT                           ".uno:DrawText"

+#define CMD_SID_DRAW_TEXT_MARQUEE                   ".uno:Text_Marquee"

+#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT         ".uno:TextdirectionLeftToRight"

+#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM         ".uno:TextdirectionTopToBottom"

+#define CMD_SID_ATTR_TEXT_FITTOSIZE                 ".uno:TextFitToSize"

+#define CMD_SID_THESAURUS                           ".uno:ThesaurusDialog"

+#define CMD_SID_INSERT_TIMEFIELD                    ".uno:InsertTimeField"

+#define CMD_SID_FM_TIMEFIELD                        ".uno:TimeField"

+#define CMD_SID_BEZIER_EDIT                         ".uno:ToggleObjectBezierMode"

+#define CMD_SID_OBJECT_ROTATE                       ".uno:ToggleObjectRotateMode"

+#define CMD_SID_TEXTEDIT                            ".uno:ToolEdit"

+#define CMD_SID_OBJECT_SELECT                       ".uno:SelectObject"

+#define CMD_SID_ATTR_ULSPACE                        ".uno:TopBottomMargin"

+#define CMD_SID_ATTR_TRANSFORM                      ".uno:TransformDialog"

+#define CMD_SID_TWAIN_SELECT                        ".uno:TwainSelect"

+#define CMD_SID_TWAIN_TRANSFER                      ".uno:TwainTransfer"

+#define CMD_SID_ATTR_CHAR_UNDERLINE                 ".uno:Underline"

+#define CMD_SID_ATTR_CHAR_OVERLINE                  ".uno:Overline"

+#define CMD_SID_OUTLINE_REMOVE                      ".uno:Ungroup"

+#define CMD_SID_INSERT_URLBUTTON                    ".uno:URLButton"

+#define CMD_SID_FM_USE_WIZARDS                      ".uno:UseWizards"

+#define CMD_SID_DRAW_CAPTION_VERTICAL               ".uno:VerticalCaption"

+#define CMD_SID_DRAW_TEXT_VERTICAL                  ".uno:VerticalText"

+#define CMD_SID_INSERT_VFIXEDLINE                   ".uno:VFixedLine"

+#define CMD_SID_FM_VIEW_AS_GRID                     ".uno:ViewFormAsGrid"

+#define CMD_SID_INSERT_VSCROLLBAR                   ".uno:VScrollbar"

+#define CMD_SID_ATTR_PARA_WIDOWS                    ".uno:Widow"

+#define CMD_SID_3D_WIN                              ".uno:Window3D"

+#define CMD_SID_ATTR_CHAR_WORDLINEMODE              ".uno:WordMode"

+#define CMD_SID_ATTR_LINE_COLOR                     ".uno:XLineColor"

+#define CMD_SID_ATTR_LINE_STYLE                     ".uno:XLineStyle"

+#define CMD_SID_ATTR_ZOOM                           ".uno:Zoom"

+#define CMD_SID_SIZE_REAL                           ".uno:Zoom100Percent"

+#define CMD_SID_SIZE_OPTIMAL                        ".uno:ZoomObjects"

+#define CMD_SID_SIZE_ALL                            ".uno:ZoomOptimal"

+#define CMD_SID_SIZE_PAGE                           ".uno:ZoomPage"

+#define CMD_SID_SIZE_PAGE_WIDTH                     ".uno:ZoomPageWidth"

+#define CMD_SID_SIZE_VISAREA                        ".uno:ZoomVisArea"

+#define CMD_SID_FM_GRABCONTROLFOCUS                 ".uno:GrabControlFocus"

+#define CMD_SID_FM_CREATE_FIELDCONTROL              ".uno:CreateFieldControl"

+#define CMD_SID_INSERT_SELECT                       ".uno:SelectMode"

+#define CMD_SID_PARA_VERTALIGN                      ".uno:VerticalParagraphAlignment"

+#define CMD_SID_ATTR_CHAR_RELIEF                    ".uno:CharacterRelief"

+#define CMD_SID_ATTR_BRUSH_CHAR                     ".uno:CharacterBackgroundPattern"

+#define CMD_SID_ATTR_CHAR_ROTATED                   ".uno:CharacterRotation"

+#define CMD_SID_ATTR_CHAR_SCALEWIDTH                ".uno:CharacterWidthScalingFactor"

+#define CMD_SID_ATTR_NUMBERFORMAT_VALUE             ".uno:NumberFormatValue"

+#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY              ".uno:HorizontalJustification"

+#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY              ".uno:VerticalJustification"

+#define CMD_SID_ATTR_ALIGN_INDENT                   ".uno:AlignmentIndent"

+#define CMD_SID_ATTR_ALIGN_HYPHENATION              ".uno:AlignmentHyphenation"

+#define CMD_SID_ATTR_ALIGN_DEGREES                  ".uno:AlignmentRotation"

+#define CMD_SID_ATTR_ALIGN_LOCKPOS                  ".uno:AlignmentRotationMode"

+#define CMD_SID_ATTR_ALIGN_MARGIN                   ".uno:AlignmentMargin"

+#define CMD_SID_ATTR_ALIGN_STACKED                  ".uno:AlignmentStacked"

+#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT             ".uno:ParaLeftToRight"

+#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT             ".uno:ParaRightToLeft"

+#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT            ".uno:TextRTL"

+#define CMD_SID_OPEN_HYPERLINK                      ".uno:OpenHyperlinkOnCursor"

+#define CMD_SID_CTLFONT_STATE                       ".uno:CTLFontState"

+#define CMD_SID_VERTICALTEXT_STATE                  ".uno:VerticalTextState"

+#define CMD_SID_OPEN_XML_FILTERSETTINGS             ".uno:OpenXMLFilterSettings"

+#define CMD_SID_HANGUL_HANJA_CONVERSION             ".uno:HangulHanjaConversion"

+#define CMD_SID_CHINESE_CONVERSION                  ".uno:ChineseConversion"

+#define CMD_SID_SPELL_DIALOG                        ".uno:SpellDialog"

+#define CMD_SID_RULER_ROWS                          ".uno:RulerRows"

+#define CMD_SID_RULER_ROWS_VERTICAL                 ".uno:RulerRowsVertical"

+#define CMD_SID_ATTR_CHAR_FONTLIST                  ".uno:FontNameList"

+#define CMD_SID_EXTRUSION_TOOGLE                    ".uno:ExtrusionToggle"

+#define CMD_SID_EXTRUSION_TILT_DOWN                 ".uno:ExtrusionTiltDown"

+#define CMD_SID_EXTRUSION_TILT_UP                   ".uno:ExtrusionTiltUp"

+#define CMD_SID_EXTRUSION_TILT_LEFT                 ".uno:ExtrusionTiltLeft"

+#define CMD_SID_EXTRUSION_TILT_RIGHT                ".uno:ExtrusionTiltRight"

+#define CMD_SID_EXTRUSION_DEPTH_FLOATER             ".uno:ExtrusionDepthFloater"

+#define CMD_SID_EXTRUSION_DEPTH_DIALOG              ".uno:ExtrusionDepthDialog"

+#define CMD_SID_EXTRUSION_DIRECTION_FLOATER         ".uno:ExtrusionDirectionFloater"

+#define CMD_SID_EXTRUSION_LIGHTING_FLOATER          ".uno:ExtrusionLightingFloater"

+#define CMD_SID_EXTRUSION_SURFACE_FLOATER           ".uno:ExtrusionSurfaceFloater"

+#define CMD_SID_EXTRUSION_3D_COLOR                  ".uno:Extrusion3DColor"

+#define CMD_SID_EXTRUSION_DEPTH                     ".uno:ExtrusionDepth"

+#define CMD_SID_EXTRUSION_DIRECTION                 ".uno:ExtrusionDirection"

+#define CMD_SID_EXTRUSION_PROJECTION                ".uno:ExtrusionProjection"

+#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION        ".uno:ExtrusionLightingDirection"

+#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY        ".uno:ExtrusionLightingIntensity"

+#define CMD_SID_EXTRUSION_SURFACE                   ".uno:ExtrusionSurface"

+#define CMD_SID_FONTWORK_GALLERY_FLOATER            ".uno:FontworkGalleryFloater"

+#define CMD_SID_FONTWORK_SHAPE_TYPE                 ".uno:FontworkShapeType"

+#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS        ".uno:FontworkSameLetterHeights"

+#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER          ".uno:FontworkAlignmentFloater"

+#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER  ".uno:FontworkCharacterSpacingFloater"

+#define CMD_SID_FONTWORK_SHAPE                      ".uno:FontworkShape"

+#define CMD_SID_FONTWORK_ALIGNMENT                  ".uno:FontworkAlignment"

+#define CMD_SID_FONTWORK_CHARACTER_SPACING          ".uno:FontworkCharacterSpacing"

+#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG   ".uno:FontworkCharacterSpacingDialog"

+#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS       ".uno:FontworkKernCharacterPairs"

+#define CMD_SID_GET_COLORTABLE                      ".uno:GetColorTable"

+#define CMD_SID_SPELLCHECKER_CHANGED                ".uno:SpellCheckerChanged"

+#define CMD_SID_ATTR_YEAR2000                       ".uno:Year2000"

+#define CMD_SID_INC_INDENT                          ".uno:IncrementIndent"

+#define CMD_SID_DEC_INDENT                          ".uno:DecrementIndent"

+#define CMD_SID_TABLE_CELL                          ".uno:StateTableCell"

+#define CMD_SID_OUTLINE_TO_IMPRESS                  ".uno:SendOutlineToImpress"

+#define CMD_SID_ATTR_DEFTABSTOP                     ".uno:DefTabStop"

+#define CMD_SID_ATTR_LANGUAGE                       ".uno:DocumentLanguage"

+#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE              ".uno:DocumentLanguageCJK"

+#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE              ".uno:DocumentLanguageCTL"

+#define CMD_SID_OPT_LOCALE_CHANGED                  ".uno:OptionsLocaleChanged"

+#define CMD_SID_SBA_BRW_INSERT                      ".uno:SbaBrwInsert"

+#define CMD_SID_DRAWTBX_CS_BASIC                    ".uno:BasicShapes"

+#define CMD_SID_DRAWTBX_CS_SYMBOL                   ".uno:SymbolShapes"

+#define CMD_SID_DRAWTBX_CS_ARROW                    ".uno:ArrowShapes"

+#define CMD_SID_DRAWTBX_CS_FLOWCHART                ".uno:FlowChartShapes"

+#define CMD_SID_DRAWTBX_CS_CALLOUT                  ".uno:CalloutShapes"

+#define CMD_SID_DRAWTBX_CS_STAR                     ".uno:StarShapes"

+#define CMD_SID_DRAW_CS_ID                          ".uno:CustomShape"

+#define CMD_SID_DASH_LIST                           ".uno:DashListState"

+#define CMD_SID_LINEEND_LIST                        ".uno:LineEndListState"

+#define CMD_SID_COLOR_TABLE                         ".uno:ColorTableState"

+#define CMD_SID_GRADIENT_LIST                       ".uno:GradientListState"

+#define CMD_SID_HATCH_LIST                          ".uno:HatchListState"

+#define CMD_SID_BITMAP_LIST                         ".uno:BitmapListState"

+#define CMD_SID_ATTR_CHAR_EMPHASISMARK              ".uno:EmphasisMark"

+#define CMD_SID_FM_SHOW_DATANAVIGATOR               ".uno:ShowDataNavigator"

+#define CMD_SID_FM_DATANAVIGATOR_CONTROL            ".uno:FmDataNavigatorController"

+#define CMD_SID_ALIGN_ANY_LEFT                      ".uno:CommonAlignLeft"

+#define CMD_SID_ALIGN_ANY_HCENTER                   ".uno:CommonAlignHorizontalCenter"

+#define CMD_SID_ALIGN_ANY_RIGHT                     ".uno:CommonAlignRight"

+#define CMD_SID_ALIGN_ANY_JUSTIFIED                 ".uno:CommonAlignJustified"

+#define CMD_SID_ALIGN_ANY_TOP                       ".uno:CommonAlignTop"

+#define CMD_SID_ALIGN_ANY_VCENTER                   ".uno:CommonAlignVerticalCenter"

+#define CMD_SID_ALIGN_ANY_BOTTOM                    ".uno:CommonAlignBottom"

+#define CMD_SID_ALIGN_ANY_HDEFAULT                  ".uno:CommonAlignHorizontalDefault"

+#define CMD_SID_ALIGN_ANY_VDEFAULT                  ".uno:CommonAlignVerticalDefault"

+#define CMD_SID_AVMEDIA_TOOLBOX                     ".uno:AVMediaToolBox"

+#define CMD_SID_BORDER_REDUCED_MODE                 ".uno:BorderReducedMode"

+#define CMD_SID_COLOR_SETTINGS                      ".uno:ColorSettings"

+#define CMD_SID_MAIL_EXPORT_FINISHED                ".uno:MailExportFinished"

+#define CMD_SID_INSERT_ZWSP                         ".uno:InsertZWSP"

+#define CMD_SID_INSERT_ZWNBSP                       ".uno:InsertZWNBSP"

+#define CMD_SID_INSERT_LRM                          ".uno:InsertLRM"

+#define CMD_SID_INSERT_RLM                          ".uno:InsertRLM"

+#define CMD_FN_INSERT_SOFT_HYPHEN                   ".uno:InsertSoftHyphen"

+#define CMD_FN_INSERT_HARDHYPHEN                    ".uno:InsertHardHyphen"

+#define CMD_FN_INSERT_HARD_SPACE                    ".uno:InsertNonBreakingSpace"

+#define CMD_SID_BASICIDE_MANAGE_LANG                ".uno:ManageLanguage"

+#define CMD_SID_BASICIDE_CURRENT_LANG               ".uno:CurrentLanguage"

+#define CMD_SID_TABLE_MERGE_CELLS                   ".uno:MergeCells"

+#define CMD_SID_TABLE_SPLIT_CELLS                   ".uno:SplitCell"

+#define CMD_SID_OPTIMIZE_TABLE                      ".uno:OptimizeTable"

+#define CMD_SID_TABLE_VERT_BOTTOM                   ".uno:CellVertBottom"

+#define CMD_SID_TABLE_VERT_CENTER                   ".uno:CellVertCenter"

+#define CMD_SID_TABLE_VERT_NONE                     ".uno:CellVertTop"

+#define CMD_SID_TABLE_INSERT_ROW                    ".uno:InsertRows"

+#define CMD_SID_TABLE_INSERT_COL                    ".uno:InsertColumns"

+#define CMD_SID_TABLE_DELETE_ROW                    ".uno:DeleteRows"

+#define CMD_SID_TABLE_DELETE_COL                    ".uno:DeleteColumns"

+#define CMD_SID_TABLE_SELECT_ALL                    ".uno:SelectTable"

+#define CMD_SID_TABLE_SELECT_COL                    ".uno:EntireColumn"

+#define CMD_SID_TABLE_SELECT_ROW                    ".uno:EntireRow"

+#define CMD_SID_FORMAT_TABLE_DLG                    ".uno:TableDialog"

+#define CMD_SID_TABLE_AUTOSUM                       ".uno:AutoSum"

+#define CMD_SID_TABLE_SORT_DIALOG                   ".uno:TableSort"

+#define CMD_SID_OPEN_SMARTTAGMENU                   ".uno:OpenSmartTagMenuOnCursor"

+#define CMD_SID_ATTR_ZOOMSLIDER                     ".uno:ZoomSlider"

+#define CMD_SID_FONTNAMELIST                        ".uno:FontNameStringList"

+#define CMD_SID_LANGUAGE_STATUS                     ".uno:LanguageStatus"

+#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH              ".uno:FontDialogForParagraph"

+#define CMD_SID_GROW_FONT_SIZE                      ".uno:Grow"

+#define CMD_SID_SHRINK_FONT_SIZE                    ".uno:Shrink"

+#define CMD_SID_RECHECK_DOCUMENT                    ".uno:RecheckDocument"

+#define CMD_SID_TABLE_INSERT_COL_DLG                ".uno:InsertColumnDialog"

+#define CMD_SID_TABLE_INSERT_ROW_DLG                ".uno:InsertRowDialog"

+

+#endif

diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index e62565cd75..1858d1ee27 100644..100755
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -52,7 +52,7 @@ namespace linguistic2{
 }}}}
 class SvxSpellWrapper; //add for SvxSpellCheckDialog
 typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-typedef USHORT*		(*DialogGetRanges)();
+typedef sal_uInt16*		(*DialogGetRanges)();
 
 struct ExchangeData;
 class INetURLObject;
@@ -87,8 +87,8 @@ class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDi
 class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog
 {
  public:
-    virtual void	SetLimits( USHORT nMin, USHORT nMax ) = 0;
-    virtual void	HideButton( USHORT nBtnId )= 0;
+    virtual void	SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0;
+    virtual void	HideButton( sal_uInt16 nBtnId )= 0;
     virtual const SfxItemSet*	GetOutputItemSet() const = 0 ;
 };
 
@@ -128,7 +128,7 @@ public:
 class AbstractGalleryIdDialog :public VclAbstractDialog  //add for GalleryIdDialog
 {
 public:
-    virtual ULONG	GetId() const =0;
+    virtual sal_uIntPtr	GetId() const =0;
 };
 
 class AbstractURLDlg :public VclAbstractDialog  //add for URLDlg
@@ -144,17 +144,17 @@ public:
 class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog  //add for SvxHlinkDlgMarkWnd
 {
 public:
-    virtual BOOL	MoveTo ( Point aNewPos )const = 0;
-    virtual BOOL	ConnectToDialog( BOOL bDoit = TRUE )const = 0;
+    virtual sal_Bool	MoveTo ( Point aNewPos )const = 0;
+    virtual sal_Bool	ConnectToDialog( sal_Bool bDoit = sal_True )const = 0;
     virtual void	RefreshTree ( String aStrURL ) = 0;
     virtual void	SelectEntry ( String aStrMark ) = 0;
-    virtual USHORT	SetError( USHORT nError) = 0;
+    virtual sal_uInt16	SetError( sal_uInt16 nError) = 0;
     // in class Window
     virtual void    SetSizePixel( const Size& rNewSize ) = 0;
     virtual Size    GetSizePixel() const = 0;
-    virtual void	Hide( USHORT nFlags = 0 ) = 0;
-    virtual BOOL    IsVisible() const = 0;
-    virtual void    Invalidate( USHORT nFlags = 0 ) = 0;
+    virtual void	Hide( sal_uInt16 nFlags = 0 ) = 0;
+    virtual sal_Bool    IsVisible() const = 0;
+    virtual void    Invalidate( sal_uInt16 nFlags = 0 ) = 0;
 };
 
 class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog	//for SvxSearchFormatDialog
@@ -168,16 +168,16 @@ public:
 class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog  //add for SvxSearchSimilarityDialog
 {
 public:
-    virtual USHORT	GetOther() =0 ;
-    virtual USHORT	GetShorter() =0 ;
-    virtual USHORT	GetLonger() =0 ;
-    virtual BOOL 	IsRelaxed() =0 ;
+    virtual sal_uInt16	GetOther() =0 ;
+    virtual sal_uInt16	GetShorter() =0 ;
+    virtual sal_uInt16	GetLonger() =0 ;
+    virtual sal_Bool 	IsRelaxed() =0 ;
 };
 
 class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog  //add for SvxJSearchOptionsDialog
 {
 public:
-    virtual INT32			GetTransliterationFlags() const = 0;
+    virtual sal_Int32			GetTransliterationFlags() const = 0;
 };
 
 class AbstractFmInputRecordNoDialog :public VclAbstractDialog  //add for FmInputRecordNoDialog
@@ -198,9 +198,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog  //add for SvxNameDialog
 public:
     virtual void    GetName( String& rName ) = 0;
     virtual void    SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0;
-    virtual void    SetEditHelpId(ULONG nHelpId) = 0;
+    virtual void    SetEditHelpId(const rtl::OString&) = 0;
     //from class Window
-    virtual void    SetHelpId( ULONG nHelpId ) = 0;
+    virtual void    SetHelpId( const rtl::OString& ) = 0;
     virtual void    SetText( const XubString& rStr ) = 0;
 };
 
@@ -226,7 +226,7 @@ public:
 class AbstractSvxMessDialog :public VclAbstractDialog  //add for SvxMessDialog
 {
 public:
-    virtual void	SetButtonText( USHORT nBtnId, const String& rNewTxt ) = 0;
+    virtual void	SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0;
 };
 
 class AbstractSvxMultiPathDialog :public VclAbstractDialog  //add for SvxMultiPathDialog
@@ -246,7 +246,7 @@ public:
     //from SvxMultiPathDialog
     virtual void	SetClassPathMode() = 0;
     //From Class Window
-    virtual void    SetHelpId( ULONG nHelpId ) = 0;
+    virtual void    SetHelpId( const rtl::OString& ) = 0;
 };
 
 class AbstractSvxHpLinkDlg : public VclAbstractDialog  //add for SvxHpLinkDlg
@@ -295,14 +295,14 @@ public:
     virtual const SfxItemSet*   GetOutputItemSet() const = 0;
     virtual void                SetPrevHdl( const Link& rLink ) = 0;
     virtual void                SetNextHdl( const Link& rLink ) = 0;
-    virtual void				EnableTravel(BOOL bNext, BOOL bPrev) = 0;
+    virtual void				EnableTravel(sal_Bool bNext, sal_Bool bPrev) = 0;
     virtual String				GetNote()  = 0;
     virtual void				SetNote(const String& rTxt)  = 0;
     virtual void				ShowLastAuthor(const String& rAuthor, const String& rDate) = 0;
     virtual void				DontChangeAuthor() = 0;
     virtual void				HideAuthor() = 0;
-    virtual void				SetReadonlyPostIt(BOOL bDisable) = 0;
-    virtual BOOL 				IsOkEnabled() const  = 0;
+    virtual void				SetReadonlyPostIt(sal_Bool bDisable) = 0;
+    virtual sal_Bool 				IsOkEnabled() const  = 0;
     virtual Window *			GetWindow() = 0;
 };
 
@@ -349,7 +349,7 @@ public:
 
     virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
                                         const SdrView* pView,
-                                        USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog
+                                        sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog
 
     virtual	AbstractSvxDistributeDialog* 	CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
@@ -388,19 +388,19 @@ public:
                                             sal_uInt32 nResId) = 0;
     virtual VclAbstractDialog* 		CreateSvxSearchAttributeDialog( Window* pParent,  //add for SvxSearchAttributeDialog
                                             SearchAttrItemList& rLst,
-                                            const USHORT* pWhRanges)=0;
+                                            const sal_uInt16* pWhRanges)=0;
     virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,  //add for SvxSearchSimilarityDialog
-                                                            BOOL bRelax,
-                                                            USHORT nOther,
-                                                            USHORT nShorter,
-                                                            USHORT nLonger ) = 0;
+                                                            sal_Bool bRelax,
+                                                            sal_uInt16 nOther,
+                                                            sal_uInt16 nShorter,
+                                                            sal_uInt16 nLonger ) = 0;
     virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
                                             const SfxItemSet& rCoreSet,
-                                            BOOL bEnableSelector = FALSE) = 0;
+                                            sal_Bool bEnableSelector = sal_False) = 0;
     virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pView,
-                                                                USHORT nAnchorTypes = 0) = 0;
+                                                                sal_uInt16 nAnchorTypes = 0) = 0;
     virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent,  //add for SchTransformTabDialog
                                                                 const SfxItemSet* pAttr,
                                                                 const SdrView* pSdrView,
@@ -409,7 +409,7 @@ public:
                                                                  )=0;
     virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
                                                             const SfxItemSet& rOptionsSet,
-                                                            INT32 nInitialFlags )=0;
+                                                            sal_Int32 nInitialFlags )=0;
     virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0;
     virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpl,
@@ -429,8 +429,8 @@ public:
                                             const String& rText, const String& rDesc,
                                             Image* pImg = NULL ) = 0; //add for SvxMessDialog
 
-    virtual AbstractSvxMultiPathDialog *	CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog
-    virtual AbstractSvxMultiFileDialog *	CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog
+    virtual AbstractSvxMultiPathDialog *	CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog
+    virtual AbstractSvxMultiFileDialog *	CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog
     virtual AbstractSvxHpLinkDlg *	CreateSvxHpLinkDlg (Window* pParent,  //add for SvxMultiFileDialog
                                             SfxBindings* pBindings,
                                             sal_uInt32 nResId)=0;
@@ -444,14 +444,14 @@ public:
                                                 RECT_POINT eLightSource, sal_uInt32 nResId )=0;
     virtual AbstractGraphicFilterDialog *	CreateGraphicFilterPosterSepia (Window* pParent,  //add for GraphicFilterPoster & GraphicFilterSepia
                                                 const Graphic& rGraphic,
-                                                USHORT nCount,
+                                                sal_uInt16 nCount,
                                                 sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *	CreateGraphicFilterSolarize (Window* pParent,  //add for GraphicFilterSolarize
                                                 const Graphic& rGraphic,
-                                                BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0;
+                                                sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0;
     virtual AbstractGraphicFilterDialog *	CreateGraphicFilterMosaic (Window* pParent,  //add for GraphicFilterMosaic
                                                 const Graphic& rGraphic,
-                                                USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0;
+                                                sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0;
     virtual AbstractSvxAreaTabDialog* 		CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
@@ -459,7 +459,7 @@ public:
     virtual SfxAbstractTabDialog*			CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
                                                                  SdrModel* pModel,
                                                                  const SdrObject* pObj = NULL,
-                                                                BOOL bHasObj = TRUE )=0;
+                                                                sal_Bool bHasObj = sal_True )=0;
     virtual VclAbstractDialog*				CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
     virtual SfxAbstractDialog*				CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
                                                                         const SfxItemSet& rAttr,
@@ -473,16 +473,16 @@ public:
                                                                         )=0;
     virtual AbstractSvxPostItDialog*		CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
                                                                         const SfxItemSet& rCoreSet,
-                                                                        BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0;
+                                                                        sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False )=0;
     virtual VclAbstractDialog*    		CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0;
 
     virtual CreateSvxDistributePage		GetSvxDistributePageCreatorFunc() = 0; //  add for SvxDistributePage
-    virtual DialogGetRanges			GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog
+    virtual DialogGetRanges			GetDialogGetRangesFunc( sal_uInt16 nId ) = 0; //add for SvxPostItDialog
 
     virtual AbstractScriptSelectorDialog*
         CreateScriptSelectorDialog(
             Window* pParent,
-            BOOL bShowSlots,
+            sal_Bool bShowSlots,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
         ) = 0;
 
@@ -503,7 +503,7 @@ public:
 
     virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0;
     
-    virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0;
+    virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0;
 };
 
 #endif
diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h
index ad39812fc4..ad39812fc4 100644..100755
--- a/svx/inc/svx/svxdllapi.h
+++ b/svx/inc/svx/svxdllapi.h
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx
index eef4adafca..eef4adafca 100644..100755
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svx/svxerr.hxx
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index 03fe3a6abc..748e5b8332 100644..100755
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
 public:
                             TYPEINFO();
                             SvxGraphicItem();
-                            SvxGraphicItem( USHORT nWhich ,const Graphic& rGraphic);									
+                            SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);									
                             SvxGraphicItem( const SvxGraphicItem& );
 
     
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 8a1a2cd3d6..8a1a2cd3d6 100644..100755
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 543a5575a3..f161be7421 100644..100755
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
@@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window
 
     short       nWrap;
     short       nAnchor;
-    BOOL 		bTrans;
+    sal_Bool 		bTrans;
 
     Point		aRelPos;
 
@@ -84,7 +84,7 @@ public:
     SvxSwFrameExample(Window* pParent, const ResId& rResID);
     ~SvxSwFrameExample();
 
-    inline void SetWrap(USHORT nW) 			{ nWrap 	= nW; }
+    inline void SetWrap(sal_uInt16 nW) 			{ nWrap 	= nW; }
 
     inline void SetHAlign(short nH)      { nHAlign   = nH; }
     inline void SetHoriRel(short nR)         { nHRel     = nR; }
@@ -92,7 +92,7 @@ public:
     inline void SetVAlign(short nV)      { nVAlign   = nV; }
     inline void SetVertRel(short nR)         { nVRel     = nR; }
 
-    inline void SetTransparent(BOOL bT)		{ bTrans 	= bT; }
+    inline void SetTransparent(sal_Bool bT)		{ bTrans 	= bT; }
     inline void SetAnchor(short nA)          { nAnchor   = nA; }
 
     void SetRelPos(const Point& rP);
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx
index 71fe439ef8..71fe439ef8 100644..100755
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/svx/swframeposstrings.hxx
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx
index ded6a1cda4..ded6a1cda4 100644..100755
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/svx/swframevalidation.hxx
diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx
index da6b6ac7b3..da6b6ac7b3 100644..100755
--- a/svx/inc/svx/sxallitm.hxx
+++ b/svx/inc/svx/sxallitm.hxx
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index da4c5b3670..9b6dd2a2e0 100644..100755
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -35,12 +35,12 @@
 
 //------------------------------------
 // class SdrCaptionFixedAngleItem
-// TRUE=Winkel durch SdrCaptionAngleItem vorgegeben
-// FALSE=Freier Winkel
+// sal_True=Winkel durch SdrCaptionAngleItem vorgegeben
+// sal_False=Freier Winkel
 //------------------------------------
 class SdrCaptionFixedAngleItem: public SdrOnOffItem {
 public:
-    SdrCaptionFixedAngleItem(BOOL bFix=TRUE): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
+    SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
     SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index d2c8d11069..8f3e3467ea 100644..100755
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -42,26 +42,26 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST
 class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< USHORT >(eDir)) {}
+    SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
     SdrCaptionEscDirItem(SvStream& rIn)                              : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn)  {}
     virtual SfxPoolItem*     Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*     Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT           GetValueCount() const; // { return 3; }
+    virtual SfxPoolItem*     Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16           GetValueCount() const; // { return 3; }
     SdrCaptionEscDir GetValue() const      { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
 
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
 //------------------------------------
 // class SdrCaptionEscIsRelItem
-// TRUE=Linienaustrittsposition relativ
-// FALSE=Linienaustrittsposition absolut
+// sal_True=Linienaustrittsposition relativ
+// sal_False=Linienaustrittsposition absolut
 //------------------------------------
 class SdrCaptionEscIsRelItem: public SdrYesNoItem {
 public:
-    SdrCaptionEscIsRelItem(BOOL bRel=TRUE): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
+    SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
     SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn)  {}
 };
 
diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx
index 74e11d812c..74e11d812c 100644..100755
--- a/svx/inc/svx/sxcgitm.hxx
+++ b/svx/inc/svx/sxcgitm.hxx
diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx
index 2ebd236973..2ebd236973 100644..100755
--- a/svx/inc/svx/sxciaitm.hxx
+++ b/svx/inc/svx/sxciaitm.hxx
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index 006bd0b6e4..47d5f395e5 100644..100755
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -39,17 +39,17 @@ enum SdrCircKind {SDRCIRC_FULL,
 class SdrCircKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< USHORT >(eKind)) {}
+    SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
     SdrCircKindItem(SvStream& rIn)                 : SfxEnumItem(SDRATTR_CIRCKIND,rIn)   {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 4; }
             SdrCircKind  GetValue() const      { return (SdrCircKind)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx
index 915c39e60e..0ff81593b6 100644..100755
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/svx/inc/svx/sxcllitm.hxx
@@ -52,7 +52,7 @@ public:
 //------------------------------------
 class SdrCaptionFitLineLenItem: public SdrYesNoItem {
 public:
-    SdrCaptionFitLineLenItem(BOOL bBestFit=TRUE): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
+    SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
     SdrCaptionFitLineLenItem(SvStream& rIn)     : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn)      {}
 };
 
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index 568328ddaa..12ceec6a73 100644..100755
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -40,13 +40,13 @@ enum SdrCaptionType   {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};
 class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< USHORT >(eStyle)) {}
+    SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
     SdrCaptionTypeItem(SvStream& rIn)                      : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn)    {}
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const; // { return 4; }
             SdrCaptionType  GetValue() const      { return (SdrCaptionType)SfxEnumItem::GetValue(); }
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index 99face04ea..7edb6762d9 100644..100755
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -44,15 +44,15 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES,
 class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< USHORT >(eStyle)) {}
+    SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
     SdrEdgeKindItem(SvStream& rIn)                        : SfxEnumItem(SDRATTR_EDGEKIND,rIn)    {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 5; }
             SdrEdgeKind  GetValue() const      { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
index 0d9f294867..b0e3b70cd3 100644..100755
--- a/svx/inc/svx/sxelditm.hxx
+++ b/svx/inc/svx/sxelditm.hxx
@@ -34,7 +34,7 @@
 
 class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item {
 public:
-    SdrEdgeLineDeltaAnzItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
+    SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
     SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn)  {}
 };
 
@@ -42,24 +42,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
     SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal)  {}
     SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem {
 public:
     SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal)  {}
     SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
index 403dff7f33..76d136d761 100644..100755
--- a/svx/inc/svx/sxenditm.hxx
+++ b/svx/inc/svx/sxenditm.hxx
@@ -36,32 +36,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal)  {}
     SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal)  {}
     SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal)  {}
     SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem {
 public:
     SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal)  {}
     SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {}
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 class SdrEdgeNode1GlueDistItem: public SdrMetricItem {
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 42b94506e1..603aa18210 100644..100755
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -39,13 +39,13 @@ class SdrFractionItem: public SfxPoolItem {
     Fraction nValue;
 public:
     TYPEINFO_VISIBILITY( SVX_DLLPUBLIC );
-    SdrFractionItem(USHORT nId=0): SfxPoolItem(nId) {}
-    SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
-    SdrFractionItem(USHORT nId, SvStream& rIn);
+    SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
+    SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
+    SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
     virtual int              operator==(const SfxPoolItem&) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
-    virtual SfxPoolItem*     Create(SvStream&, USHORT nVer) const;
-    virtual SvStream&        Store(SvStream&, USHORT nItemVers) const;
+    virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const;
+    virtual SvStream&        Store(SvStream&, sal_uInt16 nItemVers) const;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=NULL) const;
             const Fraction&  GetValue() const { return nValue; }
             void             SetValue(const Fraction& rVal) { nValue = rVal; }
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index 9bb548df81..3cba5b4145 100644..100755
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -38,7 +38,7 @@
 //------------------------------
 class SdrLayerIdItem: public SfxUInt16Item {
 public:
-    SdrLayerIdItem(USHORT nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId)  {}
+    SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId)  {}
     SdrLayerIdItem(SvStream& rIn): SfxUInt16Item(SDRATTR_LAYERID,rIn) {}
     SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); }
 };
diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx
index ccf0ef8209..ccf0ef8209 100644..100755
--- a/svx/inc/svx/sxlogitm.hxx
+++ b/svx/inc/svx/sxlogitm.hxx
diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx
index 04141d4784..04141d4784 100644..100755
--- a/svx/inc/svx/sxmbritm.hxx
+++ b/svx/inc/svx/sxmbritm.hxx
diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx
index b977813587..b977813587 100644..100755
--- a/svx/inc/svx/sxmfsitm.hxx
+++ b/svx/inc/svx/sxmfsitm.hxx
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index 9c172e35f9..abe4fe2593 100644..100755
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -39,17 +39,17 @@ enum SdrMeasureKind     {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
 class SdrMeasureKindItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< USHORT >(eKind)) {}
+    SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
     SdrMeasureKindItem(SvStream& rIn)                      : SfxEnumItem(SDRATTR_MEASUREKIND,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 2; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 2; }
             SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); }
 
-    virtual	bool           QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool           PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool           QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool           PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx
index 608d004f7d..608d004f7d 100644..100755
--- a/svx/inc/svx/sxmlhitm.hxx
+++ b/svx/inc/svx/sxmlhitm.hxx
diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx
index 6c7d8f7525..6c7d8f7525 100644..100755
--- a/svx/inc/svx/sxmoitm.hxx
+++ b/svx/inc/svx/sxmoitm.hxx
diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx
index 2fe2d0989d..2fe2d0989d 100644..100755
--- a/svx/inc/svx/sxmovitm.hxx
+++ b/svx/inc/svx/sxmovitm.hxx
diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx
index 07b31963fd..07b31963fd 100644..100755
--- a/svx/inc/svx/sxmsitm.hxx
+++ b/svx/inc/svx/sxmsitm.hxx
diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx
index 41753b4b93..41753b4b93 100644..100755
--- a/svx/inc/svx/sxmspitm.hxx
+++ b/svx/inc/svx/sxmspitm.hxx
diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx
index af9109caf8..af9109caf8 100644..100755
--- a/svx/inc/svx/sxmsuitm.hxx
+++ b/svx/inc/svx/sxmsuitm.hxx
diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx
index 8d60ba3c7c..8c0932e679 100644..100755
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/svx/inc/svx/sxmtaitm.hxx
@@ -34,7 +34,7 @@
 
 // Den Text automatisch zurechtdrehen (Automatisches UpsideDown).
 // TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht
-// den Text bei TRUE nochmal.
+// den Text bei sal_True nochmal.
 class SdrMeasureTextAutoAngleItem: public SdrYesNoItem {
 public:
     SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {}
diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx
index d358bf7555..ae3ef057b6 100644..100755
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/svx/inc/svx/sxmtfitm.hxx
@@ -52,7 +52,7 @@ public:
 // The decimal places used for the measure value
 class SdrMeasureDecimalPlacesItem: public SfxInt16Item {
 public:
-    SdrMeasureDecimalPlacesItem(INT16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal)  {}
+    SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal)  {}
     SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {}
 };
 
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index edd37c9b08..88fab8d7e7 100644..100755
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -41,17 +41,17 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR
 class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< USHORT >(ePos)) {}
+    SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
     SdrMeasureTextHPosItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 4; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 4; }
             SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
@@ -61,17 +61,17 @@ public:
 class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< USHORT >(ePos)) {}
+    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
     SdrMeasureTextVPosItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem*   Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT         GetValueCount() const; // { return 5; }
+    virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16         GetValueCount() const; // { return 5; }
             SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx
index 89581fa28d..89581fa28d 100644..100755
--- a/svx/inc/svx/sxmtritm.hxx
+++ b/svx/inc/svx/sxmtritm.hxx
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index a0dec32fd3..ba17f3765b 100644..100755
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -38,17 +38,17 @@
 class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
 public:
     TYPEINFO();
-    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {}
+    SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
     SdrMeasureUnitItem(SvStream& rIn)             : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn)   {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT       GetValueCount() const; // { return 14; }
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16       GetValueCount() const; // { return 14; }
             FieldUnit    GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-    virtual String  GetValueTextByPos(USHORT nPos) const;
+    virtual String  GetValueTextByPos(sal_uInt16 nPos) const;
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
 };
 
diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx
index a80bc692a5..a80bc692a5 100644..100755
--- a/svx/inc/svx/sxoneitm.hxx
+++ b/svx/inc/svx/sxoneitm.hxx
diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx
index de3a855e25..de3a855e25 100644..100755
--- a/svx/inc/svx/sxonitm.hxx
+++ b/svx/inc/svx/sxonitm.hxx
diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx
index 4bb7954dd8..4bb7954dd8 100644..100755
--- a/svx/inc/svx/sxopitm.hxx
+++ b/svx/inc/svx/sxopitm.hxx
diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx
index 2edebe2d6d..2edebe2d6d 100644..100755
--- a/svx/inc/svx/sxraitm.hxx
+++ b/svx/inc/svx/sxraitm.hxx
diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx
index 727b85df72..727b85df72 100644..100755
--- a/svx/inc/svx/sxreaitm.hxx
+++ b/svx/inc/svx/sxreaitm.hxx
diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx
index d33fea2dee..d33fea2dee 100644..100755
--- a/svx/inc/svx/sxreoitm.hxx
+++ b/svx/inc/svx/sxreoitm.hxx
diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx
index a257e399fe..a257e399fe 100644..100755
--- a/svx/inc/svx/sxroaitm.hxx
+++ b/svx/inc/svx/sxroaitm.hxx
diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx
index fa1614efa0..fa1614efa0 100644..100755
--- a/svx/inc/svx/sxrooitm.hxx
+++ b/svx/inc/svx/sxrooitm.hxx
diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx
index 7648722da8..7648722da8 100644..100755
--- a/svx/inc/svx/sxsaitm.hxx
+++ b/svx/inc/svx/sxsaitm.hxx
diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx
index c2d40dbe44..c2d40dbe44 100644..100755
--- a/svx/inc/svx/sxsalitm.hxx
+++ b/svx/inc/svx/sxsalitm.hxx
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index 5a1cc93447..ddcd2552d9 100644..100755
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -33,11 +33,11 @@
 class SdrScaleItem: public SdrFractionItem {
 public:
     TYPEINFO();
-    SdrScaleItem(USHORT nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
-    SdrScaleItem(USHORT nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
-    SdrScaleItem(USHORT nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
+    SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
+    SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
+    SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
     virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
-    virtual SfxPoolItem*     Create(SvStream&, USHORT nVer) const;
+    virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=NULL) const;
 };
 
diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx
index b4ed5ec88d..b4ed5ec88d 100644..100755
--- a/svx/inc/svx/sxsoitm.hxx
+++ b/svx/inc/svx/sxsoitm.hxx
diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx
index 2b2bb6c4be..2b2bb6c4be 100644..100755
--- a/svx/inc/svx/sxtraitm.hxx
+++ b/svx/inc/svx/sxtraitm.hxx
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index 34fba7567c..2cc2510b06 100644..100755
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -31,7 +31,7 @@
 // include ---------------------------------------------------------------
 
 #include <svtools/valueset.hxx>
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/xsetit.hxx>
@@ -59,7 +59,7 @@ enum PageType
 
 // define ----------------------------------------------------------------
 
-typedef USHORT ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
 
 #define CT_NONE                 ( (ChangeType) 0x0000 )
 #define CT_MODIFIED             ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 1e9830079b..9aa117fec3 100644..100755
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -30,7 +30,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svx/svdpage.hxx>
@@ -42,7 +42,7 @@
 class SvxBrushItem;
 // define ----------------------------------------------------------------
 
-typedef USHORT ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
 
 #define CT_NONE                 ( (ChangeType) 0x0000 )
 #define CT_MODIFIED             ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index fd1fb8aca4..37793b8b0c 100644..100755
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -187,12 +187,12 @@ class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxStyleToolBoxControl();
 
     virtual Window*	CreateItemWindow( Window *pParent );
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 
     DECL_LINK( VisibilityNotification, void* );
@@ -214,11 +214,11 @@ private:
     SfxStyleControllerItem_Impl*        pBoundItems [MAX_FAMILIES];
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES];
     SfxTemplateItem*			        pFamilyState[MAX_FAMILIES];
-    USHORT					 	        nActFamily;	// Id in der ToolBox = Position - 1
-    USHORT						        nActFilter;	// FilterIdx
-    USHORT						        nAppFilter;	// Filter, den die App gesetzt hat
+    sal_uInt16					 	        nActFamily;	// Id in der ToolBox = Position - 1
+    sal_uInt16						        nActFilter;	// FilterIdx
+    sal_uInt16						        nAppFilter;	// Filter, den die App gesetzt hat
     String						        aCurSel;
-    BOOL						        bListening;
+    sal_Bool						        bListening;
     Impl*								pImpl;
 
     SVX_DLLPRIVATE void	Update();
@@ -227,7 +227,7 @@ private:
 
 friend class SfxStyleControllerItem_Impl;
 
-    SVX_DLLPRIVATE void			SetFamilyState	( USHORT nIdx, const SfxTemplateItem* pItem );
+    SVX_DLLPRIVATE void			SetFamilyState	( sal_uInt16 nIdx, const SfxTemplateItem* pItem );
     SVX_DLLPRIVATE SfxStyleFamily	GetActFamily	();
 };
 
@@ -240,9 +240,9 @@ class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontNameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
-    virtual void	StateChanged		( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged		( sal_uInt16 nSID, SfxItemState eState,
                                           const SfxPoolItem* pState );
     virtual Window*	CreateItemWindow	( Window *pParent );
 };
@@ -265,7 +265,7 @@ class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontHeightToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontHeightToolBoxControl();
 
     // new controller API
@@ -291,10 +291,10 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontColorToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
@@ -319,14 +319,14 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontColorExtToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFontColorExtToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
-    virtual void				Select( BOOL bMod1 = FALSE );
+    virtual void				Select( sal_Bool bMod1 = sal_False );
 
 };
 
@@ -344,10 +344,10 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxColorToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
@@ -364,11 +364,11 @@ class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 
 };
@@ -384,11 +384,11 @@ class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
 
@@ -406,12 +406,12 @@ class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxFrameLineColorToolBoxControl( USHORT nSlotId,
-                                     USHORT nId,
+    SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId,
+                                     sal_uInt16 nId,
                                      ToolBox& rTbx );
     ~SvxFrameLineColorToolBoxControl();
 
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
@@ -427,13 +427,13 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxReloadControllerItem( USHORT nSlotId,
-                             USHORT nId,
+    SvxReloadControllerItem( sal_uInt16 nSlotId,
+                             sal_uInt16 nId,
                              ToolBox& rTbx );
     ~SvxReloadControllerItem();
 
 protected:
-    virtual void StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                const SfxPoolItem* pState );
 };
 
@@ -444,10 +444,10 @@ private:
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxSimpleUndoRedoController();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
 
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 6e97892565..863a9da58c 100644..100755
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
@@ -45,7 +45,7 @@ public:
 
             SFX_DECL_TOOLBOX_CONTROL();
 
-            SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+            SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
             ~SvxTbxCtlAlign() {}
 private:
     rtl::OUString m_aSubTbName;
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx
index b06afcfe7e..3581093654 100644..100755
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/svx/tbxcolor.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,4 +69,3 @@ namespace svx
 
 #endif // #ifndef _SVX_TBXCOLOR_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx
index c2f61b8ae3..ee67d2c172 100644..100755
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/svx/inc/svx/tbxcolorupdate.hxx
@@ -57,10 +57,10 @@ namespace svx
     class SVX_DLLPUBLIC ToolboxButtonColorUpdater
     {
     public:
-                    ToolboxButtonColorUpdater( USHORT   nSlotId,
-                                                USHORT   nTbxBtnId,
+                    ToolboxButtonColorUpdater( sal_uInt16   nSlotId,
+                                                sal_uInt16   nTbxBtnId,
                                                 ToolBox* ptrTbx, 
-                                                USHORT   nMode = 0 );
+                                                sal_uInt16   nMode = 0 );
                     ~ToolboxButtonColorUpdater();
 
         void 		Update( const Color& rColor );
@@ -69,14 +69,14 @@ namespace svx
         void 		DrawChar(VirtualDevice&, const Color&);
 
     private:
-        USHORT		mnDrawMode;
-        USHORT		mnBtnId;
-        USHORT      mnSlotId;
+        sal_uInt16		mnDrawMode;
+        sal_uInt16		mnBtnId;
+        sal_uInt16      mnSlotId;
         ToolBox*	mpTbx;
         Color		maCurColor;
         Rectangle	maUpdRect;
         Size		maBmpSize;
-        BOOL		mbWasHiContrastMode;
+        sal_Bool		mbWasHiContrastMode;
     };
 
 //........................................................................
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index e3a5c155fa..8391ac8e91 100644..100755
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
@@ -48,13 +48,13 @@ protected:
     using SfxToolBoxControl::Select;
 
 public:
-    SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxTbxCtlDraw() {}
 
     SFX_DECL_TOOLBOX_CONTROL();
 
-    virtual void				Select( BOOL bMod1 = FALSE );
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				Select( sal_Bool bMod1 = sal_False );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
 };
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 581d7ed52b..c4ba218ca1 100644..100755
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
@@ -41,15 +41,15 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
 {
 public:
     using SfxToolBoxControl::Select;
-    virtual void				Select( BOOL bMod1 = FALSE );
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				Select( sal_Bool bMod1 = sal_False );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
 
             SFX_DECL_TOOLBOX_CONTROL();
 
-            SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+            SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
             ~SvxTbxCtlCustomShapes() {}
 
     //interface XSubToolbarController:
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 6ca407184b..5d5cc97bef 100644..100755
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
@@ -50,17 +50,17 @@ protected:
     using SfxPopupWindow::StateChanged;
 
 public:
-    SvxPopupWindowTbxMgr( 	USHORT nId,
+    SvxPopupWindowTbxMgr( 	sal_uInt16 nId,
                             SfxToolBoxControl* pTbxCtl,
                             ResId aRIdWin,
                             ResId aRIdTbx );
-    SvxPopupWindowTbxMgr( 	USHORT nId,
+    SvxPopupWindowTbxMgr( 	sal_uInt16 nId,
                             WindowAlign eAlign,
                             ResId aRIdWin,
                             ResId aRIdTbx );
     ~SvxPopupWindowTbxMgr();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState);
     virtual SfxPopupWindow* 	Clone() const;
     virtual void 				PopupModeEnd();
@@ -68,7 +68,7 @@ public:
     void 						StartSelection();
 
     // toolbox click or execute may chage the default selection in the tools toolbox
-    virtual void                UserEvent( ULONG nEvent, void* pEventData );
+    virtual void                UserEvent( sal_uIntPtr nEvent, void* pEventData );
 };
 
 
diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index 80462b6aa2..63e9c34540 100644..100755
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
 private:
     const SvxTextEncodingTable*		m_pEncTable;
 
-    SVX_DLLPRIVATE USHORT				EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
+    SVX_DLLPRIVATE sal_uInt16				EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
 
 public:
                         SvxTextEncodingBox( Window* pParent, const ResId& rResId );
@@ -63,7 +63,7 @@ public:
             RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
             <TRUE/> whenever the box is used in import dialogs. */
     void				FillFromTextEncodingTable(
-                            sal_Bool bExcludeImportSubsets = FALSE,
+                            sal_Bool bExcludeImportSubsets = sal_False,
                             sal_uInt32 nExcludeInfoFlags = 0,
                             sal_uInt32 nButIncludeInfoFlags = 0
                             );
@@ -84,7 +84,7 @@ public:
             RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
             <TRUE/> whenever the box is used in import dialogs. */
     void                FillFromDbTextEncodingMap(
-                            sal_Bool bExcludeImportSubsets = FALSE,
+                            sal_Bool bExcludeImportSubsets = sal_False,
                             sal_uInt32 nExcludeInfoFlags = 0,
                             sal_uInt32 nButIncludeInfoFlags = 0
                             );
@@ -98,22 +98,22 @@ public:
                             { return m_pEncTable; }
 
     void				InsertTextEncoding( const rtl_TextEncoding nEnc,
-                            USHORT nPos = LISTBOX_APPEND );
+                            sal_uInt16 nPos = LISTBOX_APPEND );
 
     void				InsertTextEncoding( const rtl_TextEncoding nEnc,
                             const String& rEntry,
-                            USHORT nPos = LISTBOX_APPEND );
+                            sal_uInt16 nPos = LISTBOX_APPEND );
 
     void				RemoveTextEncoding( const rtl_TextEncoding nEnc );
 
     void				SelectTextEncoding( const rtl_TextEncoding nEnc,
-                            BOOL bSelect = TRUE );
+                            sal_Bool bSelect = sal_True );
 
     rtl_TextEncoding	GetSelectTextEncoding() const;
 
     const String&		GetSelectTextString() const;
 
-    BOOL				IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
+    sal_Bool				IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
 };
 
 #endif
diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx
index 5baa6444f4..5baa6444f4 100644..100755
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/svx/txenctab.hxx
diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc
index d7e79490fd..d7e79490fd 100644..100755
--- a/svx/inc/svx/ucsubset.hrc
+++ b/svx/inc/svx/ucsubset.hrc
diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx
index 22e8ce7f1e..22e8ce7f1e 100644..100755
--- a/svx/inc/svx/ucsubset.hxx
+++ b/svx/inc/svx/ucsubset.hxx
diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx
index c40e276702..c40e276702 100644..100755
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/svx/unoapi.hxx
diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx
index 3f05501d0c..3f05501d0c 100644..100755
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/svx/unofill.hxx
diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx
index e34ab41ed3..e34ab41ed3 100644..100755
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/svx/unomaster.hxx
diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx
index 5d991e6a0e..5d991e6a0e 100644..100755
--- a/svx/inc/svx/unomid.hxx
+++ b/svx/inc/svx/unomid.hxx
diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx
index 3daaf4af36..3daaf4af36 100644..100755
--- a/svx/inc/svx/unomod.hxx
+++ b/svx/inc/svx/unomod.hxx
diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx
index dd0b5cce99..dd0b5cce99 100644..100755
--- a/svx/inc/svx/unomodel.hxx
+++ b/svx/inc/svx/unomodel.hxx
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index dcd32409e4..dcd32409e4 100644..100755
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx
index d74003faf4..d74003faf4 100644..100755
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/svx/unopool.hxx
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 3e787fd07f..45697daa95 100644..100755
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -41,7 +41,7 @@ class SfxItemPool;
 * class UHashMap                                                       *
 ***********************************************************************/
 
-#define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0)
+#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0)
 class UHashMap
 {
     UHashMap() {}
@@ -89,12 +89,12 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
 {
     SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
     SvxItemPropertySet* aSetArr[SVXMAP_END];
-//	void Sort(USHORT nId);
+//	void Sort(sal_uInt16 nId);
 public:
     SvxUnoPropertyMapProvider();
     ~SvxUnoPropertyMapProvider();
-    const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId);
-    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool);
+    const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId);
+    const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool);
 };
 
 /***********************************************************************
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 2e3df7a9b4..aa11c77c2b 100644..100755
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -192,7 +192,7 @@ public:
     const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; }
     SdrObject* GetSdrObject() const {return mpObj.get();}
     void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; }
-    ::com::sun::star::uno::Any GetBitmap( BOOL bMetaFile = FALSE ) const throw ();
+    ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw ();
     static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw ();
 
     ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx
index 711d317664..711d317664 100644..100755
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/svx/unoshcol.hxx
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index bf3291ab5b..bf3291ab5b 100644..100755
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index 88db2f36b4..c1cc552f22 100644..100755
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -84,13 +84,15 @@ public:
 //	static sal_Bool hasLevels( const SdrObject* pObject );
 
     // the SvxViewForwarder interface
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point		PixelToLogic( const Point&, const MapMode& ) const;
 
     void ChangeModel( SdrModel* pNewModel );
 
+    void UpdateOutliner();
+
 private:
     SVX_DLLPRIVATE SvxTextEditSource( SvxTextEditSourceImpl* pImpl );
 
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 0401ac43f3..cfddce7e1d 100644..100755
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
@@ -38,10 +38,10 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl
 {
     sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked
 public:
-    SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxVertCTLTextTbxCtrl();
 
-    virtual void                StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     void    SetVert(sal_Bool bSet) {bCheckVertical = bSet;}
 
@@ -51,14 +51,14 @@ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
 };
 
 #endif
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index e335daeb10..05cf956eb0 100644..100755
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -75,17 +75,17 @@ protected:
     // Migrate selections
     Impl3DMirrorConstructOverlay*					mpMirrorOverlay;
 
-    BOOL						bDoubleSided;
+    sal_Bool						bDoubleSided;
 
     void InitView();
 
-    void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
-    void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+    void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+    void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
     void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj);
     void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj);
 
     void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ);
-    void ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, BOOL& rGroupSelected) const;
+    void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const;
     void BreakSingle3DObj(E3dObject* pObj);
 
 public:
@@ -98,7 +98,7 @@ public:
 
     // Zugriff auf die Default-Attribute
     E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
-    virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
+    virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
     virtual	void CheckPossibilities();
 
     // Event setzen/rausruecken
@@ -112,21 +112,21 @@ public:
     // Bei Paste muss - falls in eine Scene eingefuegt wird - die
     // Objekte der Szene eingefuegt werden, die Szene selbst aber nicht
     using SdrView::Paste;
-    virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+    virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 
     // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-    BOOL ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
+    sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
 
-    BOOL HasMarkedScene();
+    sal_Bool HasMarkedScene();
     E3dScene* GetMarkedScene();
 
-    BOOL IsConvertTo3DObjPossible() const;
-    void ConvertMarkedObjTo3D(BOOL bExtrude=TRUE, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
+    sal_Bool IsConvertTo3DObjPossible() const;
+    void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
 
     // Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer
     // bestimmten Tiefensortierung anzulegen
     void DoDepthArrange(E3dScene* pScene, double fDepth);
-    void ConvertMarkedToPolyObj(BOOL bLineToArea);
+    void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
     E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
     void Start3DCreation();
 
@@ -134,7 +134,7 @@ public:
     sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
 
     virtual void MovAction(const Point& rPnt);
-    void End3DCreation(BOOL bUseDefaultValuesForMirrorAxes=FALSE);
+    void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False);
     void ResetCreationActive();
 
     double GetDefaultCamPosZ();
@@ -257,22 +257,22 @@ public:
     long GetVDefaultSegments() const { return nVDefaultSegments; }
     void SetVDefaultSegments(long nSegs) { nVDefaultSegments = nSegs; }
 
-    BOOL IsBreak3DObjPossible() const;
+    sal_Bool IsBreak3DObjPossible() const;
     void Break3DObj();
 
-    BOOL DoubleSided () const
+    sal_Bool DoubleSided () const
     {
         return bDoubleSided;
     }
 
-    BOOL &DoubleSided ()
+    sal_Bool &DoubleSided ()
     {
         return bDoubleSided;
     }
 
     void MergeScenes();
-    SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE) const;
-    void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE);
+    SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const;
+    void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
 };
 
 #endif			// _E3D_VIEW3D_HXX
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index 2c0b4034ef..90bc9472fd 100644..100755
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxViewLayoutItem( USHORT nColumns = 0, bool bBookMode = false, USHORT nWhich = SID_ATTR_VIEWLAYOUT );
+    SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
     SvxViewLayoutItem( const SvxViewLayoutItem& );
     ~SvxViewLayoutItem();
 
@@ -51,10 +51,10 @@ public:
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
-    virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );   // leer
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const;                       // leer
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;                   // leer
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );   // leer
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index 35340aa97d..2090a5b331 100644..100755
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -79,7 +79,7 @@ class SVX_DLLPUBLIC Viewport3D
 
     basegfx::B3DPoint		aViewPoint;		// Beobachterstandpunkt in Weltkoordinaten;
                                     // wird mit der Transformation berechnet
-    BOOL			bTfValid;	 	// Flag, ob Transformation gueltig ist
+    sal_Bool			bTfValid;	 	// Flag, ob Transformation gueltig ist
 
     double fWRatio;					// Device/View-Seitenverhaeltnisse
     double fHRatio;
@@ -106,11 +106,11 @@ class SVX_DLLPUBLIC Viewport3D
     double	GetFarClipDist() const	{ return fFarClipDist; }
 
     void SetProjection(ProjectionType ePrj)
-        { eProjection = ePrj; bTfValid = FALSE; }
+        { eProjection = ePrj; bTfValid = sal_False; }
     ProjectionType GetProjection() const { return(eProjection); }
 
     void SetAspectMapping(AspectMapType eAsp)
-        { eAspectMapping = eAsp; bTfValid = FALSE; }
+        { eAspectMapping = eAsp; bTfValid = sal_False; }
     AspectMapType GetAspectMapping() { return eAspectMapping; }
 
     void SetViewWindow(double fX, double fY, double fW, double fH);
diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx
index 513fa53527..513fa53527 100644..100755
--- a/svx/inc/svx/volume3d.hxx
+++ b/svx/inc/svx/volume3d.hxx
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx
index 8270fb1091..8270fb1091 100644..100755
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/svx/wrapfield.hxx
diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx
index 30f9981804..30f9981804 100644..100755
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 97fad001e8..c3ff68a765 100644..100755
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -45,17 +45,17 @@ protected:
     XBitmapType     eType;
     XBitmapStyle    eStyle;
     GraphicObject	aGraphicObject;
-    USHORT*         pPixelArray;
+    sal_uInt16*         pPixelArray;
     Size            aArraySize;
     Color           aPixelColor;
     Color           aBckgrColor;
-    BOOL            bGraphicDirty;
+    sal_Bool            bGraphicDirty;
 
 public:
     XOBitmap();
     XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
     XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
-    XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+    XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
              const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
              XBitmapStyle eStyle = XBITMAP_TILE );
     XOBitmap( const XOBitmap& rXBmp );
@@ -67,20 +67,20 @@ public:
     void Bitmap2Array();
     void Array2Bitmap();
 
-    void SetGraphicObject( const GraphicObject& rObj )	{ aGraphicObject = rObj; bGraphicDirty = FALSE; }
-    void SetBitmap( const Bitmap& rBmp )				{ aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; }
+    void SetGraphicObject( const GraphicObject& rObj )	{ aGraphicObject = rObj; bGraphicDirty = sal_False; }
+    void SetBitmap( const Bitmap& rBmp )				{ aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; }
     void SetBitmapType( XBitmapType eNewType )			{ eType = eNewType; }
     void SetBitmapStyle( XBitmapStyle eNewStyle )		{ eStyle = eNewStyle; }
-    void SetPixelArray( const USHORT* pArray );
-    void SetPixelSize( const Size& rSize )				{ aArraySize  = rSize;  bGraphicDirty = TRUE; }
-    void SetPixelColor( const Color& rColor )			{ aPixelColor = rColor; bGraphicDirty = TRUE; }
-    void SetBackgroundColor( const Color& rColor )		{ aBckgrColor = rColor; bGraphicDirty = TRUE; }
+    void SetPixelArray( const sal_uInt16* pArray );
+    void SetPixelSize( const Size& rSize )				{ aArraySize  = rSize;  bGraphicDirty = sal_True; }
+    void SetPixelColor( const Color& rColor )			{ aPixelColor = rColor; bGraphicDirty = sal_True; }
+    void SetBackgroundColor( const Color& rColor )		{ aBckgrColor = rColor; bGraphicDirty = sal_True; }
 
     XBitmapType				GetBitmapType() const				{ return eType; }
     XBitmapStyle			GetBitmapStyle() const				{ return eStyle; }
     const GraphicObject&	GetGraphicObject() const;
     Bitmap					GetBitmap() const;
-    USHORT*					GetPixelArray() const				{ return pPixelArray; }
+    sal_uInt16*					GetPixelArray() const				{ return pPixelArray; }
     Color					GetPixelColor() const				{ return aPixelColor; }
     Color					GetBackgroundColor() const			{ return aBckgrColor; }
 };
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index f604b99493..aefe801f44 100644..100755
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -51,16 +51,16 @@ public:
             XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap );
             XFillBitmapItem( SfxItemPool* pPool );
             XFillBitmapItem( const XFillBitmapItem& rItem );
-            XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 );
+            XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 );
 
     virtual int             operator==( const SfxPoolItem& rItem ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
-    virtual SvStream&       Store( SvStream& rOut, USHORT nItemVersion  ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
+    virtual SvStream&       Store( SvStream& rOut, sal_uInt16 nItemVersion  ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -70,7 +70,7 @@ public:
     const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue
     void  SetBitmapValue( const XOBitmap& rNew )  { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index 884da1e411..0be2dcb1cd 100644..100755
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -46,19 +46,19 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex
 public:
             TYPEINFO();
             XColorItem() {}
-            XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
+            XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
-            XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor);
-            XColorItem(USHORT nWhich, SvStream& rIn);
+            XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor);
+            XColorItem(sal_uInt16 nWhich, SvStream& rIn);
             XColorItem(const XColorItem& rItem);
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
     const Color&    GetColorValue(const XColorTable* pTable = 0) const;
     void            SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx
index 151e89edeb..a736c5dea4 100644..100755
--- a/svx/inc/svx/xdash.hxx
+++ b/svx/inc/svx/xdash.hxx
@@ -42,32 +42,32 @@ class SVX_DLLPUBLIC XDash
 {
 protected:
     XDashStyle  eDash;
-    USHORT      nDots;
-    ULONG       nDotLen;
-    USHORT      nDashes;
-    ULONG       nDashLen;
-    ULONG       nDistance;
+    sal_uInt16      nDots;
+    sal_uIntPtr       nDotLen;
+    sal_uInt16      nDashes;
+    sal_uIntPtr       nDashLen;
+    sal_uIntPtr       nDistance;
 
 public:
           XDash(XDashStyle eDash = XDASH_RECT,
-                USHORT nDots = 1, ULONG nDotLen = 20,
-                USHORT nDashes = 1, ULONG nDashLen = 20, ULONG nDistance = 20);
+                sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20,
+                sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20);
 
     bool operator==(const XDash& rDash) const;
 
     void SetDashStyle(XDashStyle eNewStyle) { eDash = eNewStyle; }
-    void SetDots(USHORT nNewDots)           { nDots = nNewDots; }
-    void SetDotLen(ULONG nNewDotLen)        { nDotLen = nNewDotLen; }
-    void SetDashes(USHORT nNewDashes)       { nDashes = nNewDashes; }
-    void SetDashLen(ULONG nNewDashLen)      { nDashLen = nNewDashLen; }
-    void SetDistance(ULONG nNewDistance)    { nDistance = nNewDistance; }
+    void SetDots(sal_uInt16 nNewDots)           { nDots = nNewDots; }
+    void SetDotLen(sal_uIntPtr nNewDotLen)        { nDotLen = nNewDotLen; }
+    void SetDashes(sal_uInt16 nNewDashes)       { nDashes = nNewDashes; }
+    void SetDashLen(sal_uIntPtr nNewDashLen)      { nDashLen = nNewDashLen; }
+    void SetDistance(sal_uIntPtr nNewDistance)    { nDistance = nNewDistance; }
 
     XDashStyle  GetDashStyle() const        { return eDash; }
-    USHORT      GetDots() const             { return nDots; }
-    ULONG       GetDotLen() const           { return nDotLen; }
-    USHORT      GetDashes() const           { return nDashes; }
-    ULONG       GetDashLen() const          { return nDashLen; }
-    ULONG       GetDistance() const         { return nDistance; }
+    sal_uInt16      GetDots() const             { return nDots; }
+    sal_uIntPtr       GetDotLen() const           { return nDotLen; }
+    sal_uInt16      GetDashes() const           { return nDashes; }
+    sal_uIntPtr       GetDashLen() const          { return nDashLen; }
+    sal_uIntPtr       GetDistance() const         { return nDistance; }
 
     // XDash is translated into an array of doubles which describe the lengths of the 
     // dashes, dots and empty passages. It returns the complete length of the full DashDot 
diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 3b9f5c0cc1..6600a8e202 100644..100755
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -37,7 +37,8 @@
 |*
 \************************************************************************/
 
-#define COL_DEFAULT_SHAPE_FILLING	RGB_COLORDATA( 153, 204, 255 )	// blue 8
+#define COL_DEFAULT_SHAPE_FILLING	RGB_COLORDATA( 0xCF, 0xE7, 0xE5 )
+#define COL_DEFAULT_SHAPE_STROKE	RGB_COLORDATA( 128, 128, 128 )
 
 #define XATTR_START             1000
 
diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx
index 6a19588533..6a19588533 100644..100755
--- a/svx/inc/svx/xenum.hxx
+++ b/svx/inc/svx/xenum.hxx
diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx
index ae997866e0..1b2092625d 100644..100755
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/svx/xexch.hxx
@@ -60,7 +60,7 @@ public:
     SVX_DLLPUBLIC friend SvStream&    operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData );
     SVX_DLLPUBLIC friend SvStream&    operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData );
 
-    static ULONG        RegisterClipboardFormatName();
+    static sal_uLong        RegisterClipboardFormatName();
     XFillAttrSetItem*   GetXFillAttrSetItem() { return pXFillAttrSetItem; }
 };
 
diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx
index 3a0d9aa7b7..3a0d9aa7b7 100644..100755
--- a/svx/inc/svx/xfillit.hxx
+++ b/svx/inc/svx/xfillit.hxx
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index 50e63a0137..1d00fc03de 100644..100755
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -47,16 +47,16 @@ public:
                             XFillStyleItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XFillStyle				GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 363463cdd0..2a8b7350dd 100644..100755
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -48,8 +48,8 @@ public:
                             XFillAttrSetItem(const XFillAttrSetItem& rAttr,
                                              SfxItemPool* pItemPool);
     virtual SfxPoolItem*    Clone( SfxItemPool* pToPool ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream& rStream, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index 5c74202fa5..05643f7eea 100644..100755
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -43,12 +43,12 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
 public:
                             TYPEINFO();
 
-                            XFillBackgroundItem( BOOL bFill = FALSE );
+                            XFillBackgroundItem( sal_Bool bFill = sal_False );
                             SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
 
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index d4591193cd..f354477929 100644..100755
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -46,14 +46,14 @@ public:
                             SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    SVX_DLLPRIVATE virtual USHORT			GetValueCount() const;
+    SVX_DLLPRIVATE virtual sal_uInt16			GetValueCount() const;
     SVX_DLLPRIVATE RECT_POINT 				GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index f420c1f7bc..9bcbe5f638 100644..100755
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpSizeLogItem( BOOL bLog = TRUE );
+                            XFillBmpSizeLogItem( sal_Bool bLog = sal_True );
                             SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index 2007430545..98f6eacaff 100644..100755
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -46,7 +46,7 @@ public:
                             SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -73,7 +73,7 @@ public:
                             SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index e2c1f81821..d712a6f74a 100644..100755
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileItem( BOOL bTile = TRUE );
+                            XFillBmpTileItem( sal_Bool bTile = sal_True );
                             XFillBmpTileItem( SvStream& rIn );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index eb9b5173a9..280f6aeeb1 100644..100755
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
+                            XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 );
                             SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,11 +65,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
+                            XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 );
                             SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index 804582933a..d4b7d321f9 100644..100755
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFillBmpStretchItem( BOOL bStretch = TRUE );
+                            XFillBmpStretchItem( sal_Bool bStretch = sal_True );
                             XFillBmpStretchItem( SvStream& rIn );
 
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 4fe87bcffe..c6a15c5b76 100644..100755
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
+                            XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 );
                             SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -65,11 +65,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
+                            XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 );
                             SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
index b6194eb9b5..b11aae9a50 100644..100755
--- a/svx/inc/svx/xflclit.hxx
+++ b/svx/inc/svx/xflclit.hxx
@@ -44,15 +44,15 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem
 public:
             TYPEINFO();
             XFillColorItem() {}
-            XFillColorItem(INT32 nIndex, const Color& rTheColor);
+            XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XFillColorItem(const String& rName, const Color& rTheColor);
             XFillColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index 92c85b6304..6288f4c9d4 100644..100755
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -42,31 +42,31 @@ private:
 
     long					nDummy1;
     long					nDummy2;
-    BOOL					bEnabled;
+    sal_Bool					bEnabled;
 
 public:
                             TYPEINFO();
 
                             XFillFloatTransparenceItem();
-                            XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
-                            XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE );
-                            XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE );
+                            XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+                            XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+                            XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
                             XFillFloatTransparenceItem(SfxItemPool* pPool );
                             XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
 
     virtual int             operator==( const SfxPoolItem& rItem ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const;
 
-    BOOL					IsEnabled() const { return bEnabled; }
-    void					SetEnabled( BOOL bEnable ) { bEnabled = bEnable; }
+    sal_Bool					IsEnabled() const { return bEnabled; }
+    void					SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; }
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
index a3fb726ffc..324a6a589c 100644..100755
--- a/svx/inc/svx/xflgrit.hxx
+++ b/svx/inc/svx/xflgrit.hxx
@@ -45,21 +45,21 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
 public:
             TYPEINFO();
             XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
-            XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient);
+            XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
             XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
             XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient);
             XFillGradientItem(SfxItemPool* pPool );
             XFillGradientItem(const XFillGradientItem& rItem);
-            XFillGradientItem(SvStream& rIn, USHORT nVer = 0);
+            XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0);
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
-    virtual USHORT          GetVersion( USHORT nFileFormatVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
+    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -67,7 +67,7 @@ public:
     const XGradient&		GetGradientValue(const XGradientTable* pTable = 0) const; // GetValue -> GetGradientValue
     void					SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index ce12f8a832..be27b4136e 100644..100755
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
 public:
                             TYPEINFO();
                             XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
-                            XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch);
+                            XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch);
                             XFillHatchItem(const String& rName, const XHatch& rTheHatch);
                             XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
                             XFillHatchItem(SfxItemPool* pPool );
@@ -54,11 +54,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -69,7 +69,7 @@ public:
     const XHatch&			GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue
     void					SetHatchValue(const XHatch& rNew)  { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index a6d9b11e57..4c9a229273 100644..100755
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFillTransparenceItem(USHORT nFillTransparence = 0);
+                            XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
                             XFillTransparenceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index 0973c0c596..021135bca8 100644..100755
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -45,12 +45,12 @@ public:
                             XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER);
                             XFormTextAdjustItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextAdjust			GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index 5236533d6c..f0de84f397 100644..100755
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -45,7 +45,7 @@ public:
                             XFormTextDistanceItem(long nDist = 0);
                             XFormTextDistanceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index 7a549d1500..2a2d431bef 100644..100755
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextMirrorItem(BOOL bMirror = FALSE);
+                            XFormTextMirrorItem(sal_Bool bMirror = sal_False);
                             XFormTextMirrorItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx
index e7f05862f8..54db94c896 100644..100755
--- a/svx/inc/svx/xftouit.hxx
+++ b/svx/inc/svx/xftouit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextOutlineItem(BOOL bOutline = FALSE);
+                            XFormTextOutlineItem(sal_Bool bOutline = sal_False);
                             XFormTextOutlineItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
index 58ee833d2d..d929d43f19 100644..100755
--- a/svx/inc/svx/xftsfit.hxx
+++ b/svx/inc/svx/xftsfit.hxx
@@ -44,12 +44,12 @@ public:
                             XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE);
                             XFormTextStdFormItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextStdForm		GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index eb8d670750..c924a81d11 100644..100755
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -43,12 +43,12 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
 public:
             TYPEINFO();
             XFormTextShadowColorItem() {}
-            XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor);
+            XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
             XFormTextShadowColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index 5d098153af..c4646666fb 100644..100755
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -45,12 +45,12 @@ public:
                             XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
                             XFormTextShadowItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextShadow			GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 #endif
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index 0abb9a3a4d..d641a34565 100644..100755
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -41,10 +41,10 @@ class XFormTextShadowTranspItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XFormTextShadowTranspItem(USHORT nShdwTransparence = 0);
+                            XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
                             XFormTextShadowTranspItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index 7c5dbae59b..f46dfb5c8a 100644..100755
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -45,7 +45,7 @@ public:
                             XFormTextShadowXValItem(long nVal = 0);
                             XFormTextShadowXValItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 /*************************************************************************
@@ -61,7 +61,7 @@ public:
                             XFormTextShadowYValItem(long nVal = 0);
                             XFormTextShadowYValItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index 5cc74b2979..23c06d56dc 100644..100755
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -45,7 +45,7 @@ public:
                             XFormTextStartItem(long nStart = 0);
                             XFormTextStartItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx
index f905c3b0c0..62ba584480 100644..100755
--- a/svx/inc/svx/xgrad.hxx
+++ b/svx/inc/svx/xgrad.hxx
@@ -44,20 +44,20 @@ protected:
     Color           aStartColor;
     Color           aEndColor;
     long            nAngle;
-    USHORT          nBorder;
-    USHORT          nOfsX;
-    USHORT          nOfsY;
-    USHORT          nIntensStart;
-    USHORT          nIntensEnd;
-    USHORT          nStepCount;
+    sal_uInt16          nBorder;
+    sal_uInt16          nOfsX;
+    sal_uInt16          nOfsY;
+    sal_uInt16          nIntensStart;
+    sal_uInt16          nIntensEnd;
+    sal_uInt16          nStepCount;
 
 public:
     XGradient();
     XGradient( const Color& rStart, const Color& rEnd,
                XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0,
-               USHORT nXOfs = 50, USHORT nYOfs = 50, USHORT nBorder = 0,
-               USHORT nStartIntens = 100, USHORT nEndIntens = 100,
-               USHORT nSteps = 0 );
+               sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0,
+               sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100,
+               sal_uInt16 nSteps = 0 );
 
     bool operator==(const XGradient& rGradient) const;
 
@@ -65,23 +65,23 @@ public:
     void SetStartColor(const Color& rColor)         { aStartColor = rColor; }
     void SetEndColor(const Color& rColor)           { aEndColor = rColor; }
     void SetAngle(long nNewAngle)                   { nAngle = nNewAngle; }
-    void SetBorder(USHORT nNewBorder)               { nBorder = nNewBorder; }
-    void SetXOffset(USHORT nNewOffset)              { nOfsX = nNewOffset; }
-    void SetYOffset(USHORT nNewOffset)              { nOfsY = nNewOffset; }
-    void SetStartIntens(USHORT nNewIntens)          { nIntensStart = nNewIntens; }
-    void SetEndIntens(USHORT nNewIntens)            { nIntensEnd = nNewIntens; }
-    void SetSteps(USHORT nSteps)                    { nStepCount = nSteps; }
+    void SetBorder(sal_uInt16 nNewBorder)               { nBorder = nNewBorder; }
+    void SetXOffset(sal_uInt16 nNewOffset)              { nOfsX = nNewOffset; }
+    void SetYOffset(sal_uInt16 nNewOffset)              { nOfsY = nNewOffset; }
+    void SetStartIntens(sal_uInt16 nNewIntens)          { nIntensStart = nNewIntens; }
+    void SetEndIntens(sal_uInt16 nNewIntens)            { nIntensEnd = nNewIntens; }
+    void SetSteps(sal_uInt16 nSteps)                    { nStepCount = nSteps; }
 
     XGradientStyle GetGradientStyle() const         { return eStyle; }
     Color          GetStartColor() const            { return aStartColor; }
     Color          GetEndColor() const              { return aEndColor; }
     long           GetAngle() const                 { return nAngle; }
-    USHORT         GetBorder() const                { return nBorder; }
-    USHORT         GetXOffset() const               { return nOfsX; }
-    USHORT         GetYOffset() const               { return nOfsY; }
-    USHORT         GetStartIntens() const           { return nIntensStart; }
-    USHORT         GetEndIntens() const             { return nIntensEnd; }
-    USHORT         GetSteps() const                 { return nStepCount; }
+    sal_uInt16         GetBorder() const                { return nBorder; }
+    sal_uInt16         GetXOffset() const               { return nOfsX; }
+    sal_uInt16         GetYOffset() const               { return nOfsY; }
+    sal_uInt16         GetStartIntens() const           { return nIntensStart; }
+    sal_uInt16         GetEndIntens() const             { return nIntensEnd; }
+    sal_uInt16         GetSteps() const                 { return nStepCount; }
 };
 
 #endif
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index 43f0b476b3..3af33c8447 100644..100755
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XGradientStepCountItem( USHORT nStepCount = 0 );
+                            XGradientStepCountItem( sal_uInt16 nStepCount = 0 );
                             XGradientStepCountItem( SvStream& rIn );
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx
index 4c1761a01d..4c1761a01d 100644..100755
--- a/svx/inc/svx/xhatch.hxx
+++ b/svx/inc/svx/xhatch.hxx
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index a825b84237..0ce35e8cda 100644..100755
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -45,14 +45,14 @@ class SfxItemPool;
 class NameOrIndex;
 class XPropertyList;
 
-typedef BOOL (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
+typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
 
 //-------------------
 // class NameOrIndex
 //-------------------
 class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
 {
-    INT32    nPalIndex;
+    sal_Int32    nPalIndex;
 
 protected:
     void    Detach()    { nPalIndex = -1; }
@@ -60,30 +60,30 @@ protected:
 public:
             TYPEINFO();
             NameOrIndex() { nPalIndex = -1; }
-            NameOrIndex(USHORT nWhich, INT32 nIndex);
-            NameOrIndex(USHORT nWhich,
+            NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
+            NameOrIndex(sal_uInt16 nWhich,
                         const String& rName= String());
-            NameOrIndex(USHORT nWhich, SvStream& rIn);
+            NameOrIndex(sal_uInt16 nWhich, SvStream& rIn);
             NameOrIndex(const NameOrIndex& rNameOrIndex);
            ~NameOrIndex() {};
 
     virtual int          operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&    Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&    Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
             String       GetName() const              { return GetValue();   }
             void         SetName(const String& rName) { SetValue(rName);     }
-            INT32        GetIndex() const             { return nPalIndex;    }
-            void         SetIndex(INT32 nIndex)        { nPalIndex = nIndex;  }
-            BOOL         IsIndex() const          { return (nPalIndex >= 0); }
+            sal_Int32        GetIndex() const             { return nPalIndex;    }
+            void         SetIndex(sal_Int32 nIndex)        { nPalIndex = nIndex;  }
+            sal_Bool         IsIndex() const          { return (nPalIndex >= 0); }
 
     /** this static checks if the given NameOrIndex item has a unique name for its value.
         The returned String is a unique name for an item with this value in both given pools.
         Argument pPool2 can be null.
         If returned string equals NameOrIndex->GetName(), the name was already unique.
     */
-    static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults = NULL );
+    static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults = NULL );
 };
 
 #endif
diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx
index d9afba2cfa..d9afba2cfa 100644..100755
--- a/svx/inc/svx/xlineit.hxx
+++ b/svx/inc/svx/xlineit.hxx
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index 26f5027db4..2a3ca2d0da 100644..100755
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -43,16 +43,16 @@ public:
                             XLineStyleItem(XLineStyle = XLINE_SOLID);
                             XLineStyleItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XLineStyle				GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index 5680d2b26b..1f14ca05b3 100644..100755
--- a/svx/inc/svx/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
@@ -44,17 +44,17 @@ public:
                             XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND );
                             XLineJointItem( SvStream& rIn );
 
-    virtual USHORT           GetVersion( USHORT nFileFormatVersion ) const;
+    virtual sal_uInt16           GetVersion( sal_uInt16 nFileFormatVersion ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rIn, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    virtual USHORT          GetValueCount() const;
+    virtual sal_uInt16          GetValueCount() const;
     XLineJoint				GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
 };
 
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index 8a09266e3a..6c60814ba6 100644..100755
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -49,8 +49,8 @@ public:
                             XLineAttrSetItem(const XLineAttrSetItem& rAttr,
                                              SfxItemPool* pItemPool);
     virtual SfxPoolItem*    Clone( SfxItemPool* pToPool ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVersion ) const;
-    virtual SvStream&       Store( SvStream& rStream, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+    virtual SvStream&       Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
 };
 
 #endif
diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
index e5b930c3ba..c9fafe788d 100644..100755
--- a/svx/inc/svx/xlnclit.hxx
+++ b/svx/inc/svx/xlnclit.hxx
@@ -40,15 +40,15 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem
 public:
             TYPEINFO();
             XLineColorItem() {}
-            XLineColorItem(INT32 nIndex, const Color& rTheColor);
+            XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XLineColorItem(const String& rName, const Color& rTheColor);
             XLineColorItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index d091ea9cc7..d66e130049 100644..100755
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -46,7 +46,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
 public:
                             TYPEINFO();
                             XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
-                            XLineDashItem(INT32 nIndex, const XDash& rTheDash);
+                            XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash);
                             XLineDashItem(const String& rName, const XDash& rTheDash);
                             XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
                             XLineDashItem(SfxItemPool* pPool );
@@ -55,11 +55,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -71,7 +71,7 @@ public:
     const XDash&			GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue
     void					SetDashValue(const XDash& rNew)   { aDash = rNew; Detach(); } // SetValue -> SetDashValue
 
-    static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+    static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
     XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const;
 };
 
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index 13a9bd9897..40e517e066 100644..100755
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -39,13 +39,13 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XLineEndCenterItem(BOOL bEndCenter = FALSE);
+                            XLineEndCenterItem(sal_Bool bEndCenter = sal_False);
                             XLineEndCenterItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index e9f131e2e1..57a761c326 100644..100755
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex
 
 public:
             TYPEINFO();
-            XLineEndItem(INT32 nIndex = -1);
+            XLineEndItem(sal_Int32 nIndex = -1);
             XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineEndItem(SfxItemPool* pPool );
@@ -53,11 +53,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index de84722e46..855f2ce30f 100644..100755
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -45,10 +45,10 @@ public:
                             XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT);
                             XLineEndWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index 3e4a8da2fd..c46423b471 100644..100755
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -39,13 +39,13 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XLineStartCenterItem(BOOL bStartCenter = FALSE);
+                            XLineStartCenterItem(sal_Bool bStartCenter = sal_False);
                             XLineStartCenterItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index 393a68367a..fdb54a1411 100644..100755
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex
 
 public:
             TYPEINFO();
-            XLineStartItem(INT32 nIndex = -1);
+            XLineStartItem(sal_Int32 nIndex = -1);
             XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
             XLineStartItem(SfxItemPool* pPool );
@@ -53,11 +53,11 @@ public:
 
     virtual int             operator==(const SfxPoolItem& rItem) const;
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual SvStream&       Store(SvStream& rOut, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual SvStream&       Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index 6f17e4ff8b..4001ee39ed 100644..100755
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -44,10 +44,10 @@ public:
             XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT);
             XLineStartWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index 213ac41478..bf9af91f61 100644..100755
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item
 {
 public:
                             TYPEINFO();
-                            XLineTransparenceItem(USHORT nLineTransparence = 0);
+                            XLineTransparenceItem(sal_uInt16 nLineTransparence = 0);
                             XLineTransparenceItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = NULL) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index 3ba8daf089..f12e356145 100644..100755
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -42,10 +42,10 @@ public:
                             XLineWidthItem(long nWidth = 0);
                             XLineWidthItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx
index aa532d2388..aa532d2388 100644..100755
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/svx/xmleohlp.hxx
diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx
index 08e753adf6..08e753adf6 100644..100755
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/svx/xmlexchg.hxx
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index 67c637f8cf..669c3b8855 100644..100755
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
@@ -86,7 +86,7 @@ private:
     SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName );
     SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
                                                       const ::rtl::OUString& rPictureStreamName,
-                                                      BOOL bTruncate );
+                                                      sal_Bool bTruncate );
     SVX_DLLPRIVATE String                      ImplGetGraphicMimeType( const String& rFileName ) const;
     SVX_DLLPRIVATE Graphic						ImplReadGraphic( const ::rtl::OUString& rPictureStorageName,
                                                  const ::rtl::OUString& rPictureStreamName );
@@ -100,7 +100,7 @@ protected:
                                 ~SvXMLGraphicHelper();
     void                        Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage,
                                       SvXMLGraphicHelperMode eCreateMode,
-                                      BOOL bDirect );
+                                      sal_Bool bDirect );
 
     virtual void SAL_CALL		disposing();
 
@@ -109,7 +109,7 @@ public:
 
     static SvXMLGraphicHelper*  Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage,
                                         SvXMLGraphicHelperMode eCreateMode,
-                                        BOOL bDirect = TRUE );
+                                        sal_Bool bDirect = sal_True );
     static SvXMLGraphicHelper*	Create( SvXMLGraphicHelperMode eCreateMode );
 
     static void					Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper );
@@ -137,7 +137,7 @@ namespace svx
 
     You should call dispose after you no longer need this component.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == TRUE in
+    uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
@@ -153,7 +153,7 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio
     To write the Pictures stream, you have to call dispose at this component.
     Make sure you call dipose before you commit the parent storage.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == TRUE in
+    uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index f6da616aee..70a0620dac 100644..100755
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
@@ -47,10 +47,10 @@ private:
 public:
     SFX_DECL_STATUSBAR_CONTROL();
 
-    XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+    XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     ~XmlSecStatusBarControl();
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void	Paint( const UserDrawEvent& rEvt );
     virtual void	Command( const CommandEvent& rCEvt );
     static long		GetDefItemWidth( StatusBar& _rStatusBar );
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index d531947f0d..7a01ac7af6 100644..100755
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
@@ -68,24 +68,24 @@ public:
     static BitmapEx		CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
                                                  const MapMode& rMapMode, const Size& rLogSize,
                                                  const Point& rPoint, const Size& rSize );
-    static Graphic		MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags );
-    static Animation	MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr );
-    static USHORT		WriteGraphic( const Graphic& rGraphic, String& rFileName,
-                                      const String& rFilterName, const ULONG nFlags = 0L,
+    static Graphic		MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
+    static Animation	MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
+    static sal_uInt16		WriteGraphic( const Graphic& rGraphic, String& rFileName,
+                                      const String& rFilterName, const sal_uIntPtr nFlags = 0L,
                                       const Size* pMtfSize_100TH_MM = NULL );
     static void			DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
                                                const Size& rSize, const BitmapEx& rBmpEx );
     static void			DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize,
                                            const Rectangle& rTileRect, const BitmapEx& rBmpEx );
 
-    static USHORT		ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
-                                       GraphicFilter& rFilter, const USHORT nFormat,
+    static sal_uInt16		ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+                                       GraphicFilter& rFilter, const sal_uInt16 nFormat,
                                        const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
 
-    static Bitmap		DetectEdges( const Bitmap& rBmp, const BYTE cThreshold );
+    static Bitmap		DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
 
-    static Polygon		GetCountour( const Bitmap& rBmp, const ULONG nContourFlags,
-                                     const BYTE cEdgeDetectThreshold = 50,
+    static Polygon		GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags,
+                                     const sal_uInt8 cEdgeDetectThreshold = 50,
                                      const Rectangle* pWorkRect = NULL );
 };
 
@@ -93,7 +93,7 @@ public:
 // - DitherBitmap -
 // ----------------
 
-SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap );
+SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap );
 
 #endif // _XOUTBMP_HXX
 
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 0b41e3fd8f..42c783a79b 100644..100755
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -46,11 +46,7 @@ class OutputDevice;
 #define XPOLYPOLY_APPEND     0xFFFF
 #define XPOLY_APPEND         0xFFFF
 
-#ifdef WIN // Windows 16 Bit
-#define XPOLY_MAXPOINTS      8160   /* =0xFF00/sizeof(Point), also mit etwas Platz! */
-#else
 #define XPOLY_MAXPOINTS      0xFFF0 /* Auch fuer die 32-Bitter etwas Luft lassen */
-#endif
 
 /************************************************************************/
 // Punktstile im XPolygon:
@@ -80,59 +76,59 @@ protected:
     void    CheckReference();
 
     // Hilfsfunktionen fuer Bezierkonvertierung
-    void    SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT);
+    void    SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT);
     void    GenBezArc(const Point& rCenter, long nRx, long nRy,
-                      long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
-                      USHORT nQuad, USHORT nFirst);
-    BOOL    CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2);
+                      long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+                      sal_uInt16 nQuad, sal_uInt16 nFirst);
+    sal_Bool    CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
 
 public:
-    XPolygon( USHORT nSize=16, USHORT nResize=16 );
+    XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
     XPolygon( const XPolygon& rXPoly );
     XPolygon( const Polygon& rPoly );
     XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 );
     XPolygon( const Point& rCenter, long nRx, long nRy,
-              USHORT nStartAngle = 0, USHORT nEndAngle = 3600,
-              BOOL bClose = TRUE );
+              sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600,
+              sal_Bool bClose = sal_True );
 
     ~XPolygon();
 
-    void        SetSize( USHORT nSize );
-    USHORT      GetSize() const;
+    void        SetSize( sal_uInt16 nSize );
+    sal_uInt16      GetSize() const;
 
-    void        SetPointCount( USHORT nPoints );
-    USHORT      GetPointCount() const;
+    void        SetPointCount( sal_uInt16 nPoints );
+    sal_uInt16      GetPointCount() const;
 
-    void        Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags );
-    void        Insert( USHORT nPos, const XPolygon& rXPoly );
-    void        Insert( USHORT nPos, const Polygon& rPoly );
-    void        Remove( USHORT nPos, USHORT nCount );
+    void        Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags );
+    void        Insert( sal_uInt16 nPos, const XPolygon& rXPoly );
+    void        Insert( sal_uInt16 nPos, const Polygon& rPoly );
+    void        Remove( sal_uInt16 nPos, sal_uInt16 nCount );
     void        Move( long nHorzMove, long nVertMove );
     Rectangle   GetBoundRect() const;
 
-    const Point&    operator[]( USHORT nPos ) const;
-          Point&    operator[]( USHORT nPos );
+    const Point&    operator[]( sal_uInt16 nPos ) const;
+          Point&    operator[]( sal_uInt16 nPos );
     XPolygon&       operator=( const XPolygon& rXPoly );
-    BOOL            operator==( const XPolygon& rXPoly ) const;
-    BOOL            operator!=( const XPolygon& rXPoly ) const;
+    sal_Bool            operator==( const XPolygon& rXPoly ) const;
+    sal_Bool            operator!=( const XPolygon& rXPoly ) const;
 
-    XPolyFlags  GetFlags( USHORT nPos ) const;
-    void        SetFlags( USHORT nPos, XPolyFlags eFlags );
-    BOOL        IsControl(USHORT nPos) const;
-    BOOL        IsSmooth(USHORT nPos) const;
+    XPolyFlags  GetFlags( sal_uInt16 nPos ) const;
+    void        SetFlags( sal_uInt16 nPos, XPolyFlags eFlags );
+    sal_Bool        IsControl(sal_uInt16 nPos) const;
+    sal_Bool        IsSmooth(sal_uInt16 nPos) const;
 
     // Abstand zwischen zwei Punkten
-    double  CalcDistance(USHORT nP1, USHORT nP2);
+    double  CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2);
 
     // Bezierkonvertierungen
-    void CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt);
-    void CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext);
-    void PointsToBezier(USHORT nFirst);
+    void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt);
+    void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext);
+    void PointsToBezier(sal_uInt16 nFirst);
 
     // Transformationen
     void Translate(const Point& rTrans);
     void Rotate(const Point& rCenter, double fSin, double fCos);
-    void Rotate(const Point& rCenter, USHORT nAngle);
+    void Rotate(const Point& rCenter, sal_uInt16 nAngle);
     void Scale(double fSx, double fSy);
     void SlantX(long nYRef, double fSin, double fCos);
     void SlantY(long nXRef, double fSin, double fCos);
@@ -165,7 +161,7 @@ protected:
     void    CheckReference();
 
 public:
-                    XPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 );
+                    XPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
                     XPolyPolygon( const XPolygon& rXPoly );
                     XPolyPolygon( const XPolyPolygon& rXPolyPoly );
                     XPolyPolygon( const PolyPolygon& rPolyPoly);
@@ -173,31 +169,31 @@ public:
                     ~XPolyPolygon();
 
     void            Insert( const XPolygon& rXPoly,
-                            USHORT nPos = XPOLYPOLY_APPEND );
+                            sal_uInt16 nPos = XPOLYPOLY_APPEND );
     void            Insert( const XPolyPolygon& rXPoly,
-                            USHORT nPos=XPOLYPOLY_APPEND );
-    XPolygon        Remove( USHORT nPos );
-    XPolygon        Replace( const XPolygon& rXPoly, USHORT nPos );
-    const XPolygon& GetObject( USHORT nPos ) const;
+                            sal_uInt16 nPos=XPOLYPOLY_APPEND );
+    XPolygon        Remove( sal_uInt16 nPos );
+    XPolygon        Replace( const XPolygon& rXPoly, sal_uInt16 nPos );
+    const XPolygon& GetObject( sal_uInt16 nPos ) const;
 
     void            Clear();
-    USHORT          Count() const;
+    sal_uInt16          Count() const;
 
     void            Move( long nHorzMove, long nVertMove );
     Rectangle       GetBoundRect() const;
 
-    const XPolygon& operator[]( USHORT nPos ) const
+    const XPolygon& operator[]( sal_uInt16 nPos ) const
                         { return GetObject( nPos ); }
-    XPolygon&       operator[]( USHORT nPos );
+    XPolygon&       operator[]( sal_uInt16 nPos );
 
     XPolyPolygon&   operator=( const XPolyPolygon& rXPolyPoly );
-    BOOL            operator==( const XPolyPolygon& rXPolyPoly ) const;
-    BOOL            operator!=( const XPolyPolygon& rXPolyPoly ) const;
+    sal_Bool            operator==( const XPolyPolygon& rXPolyPoly ) const;
+    sal_Bool            operator!=( const XPolyPolygon& rXPolyPoly ) const;
 
     // Transformationen
     void Translate(const Point& rTrans);
     void Rotate(const Point& rCenter, double fSin, double fCos);
-    void Rotate(const Point& rCenter, USHORT nAngle);
+    void Rotate(const Point& rCenter, sal_uInt16 nAngle);
     void Scale(double fSx, double fSy);
     void SlantX(long nYRef, double fSin, double fCos);
     void SlantY(long nXRef, double fSin, double fCos);
diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx
index 0fee8edfae..0fee8edfae 100644..100755
--- a/svx/inc/svx/xpool.hxx
+++ b/svx/inc/svx/xpool.hxx
diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx
index c964684bf4..c964684bf4 100644..100755
--- a/svx/inc/svx/xsetit.hxx
+++ b/svx/inc/svx/xsetit.hxx
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index f3838dc39c..7d179c3cd8 100644..100755
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -39,19 +39,19 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
 public:
             TYPEINFO();
             SVX_DLLPRIVATE XSecondaryFillColorItem() {}
-            SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
+            SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
             XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
             SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
 
     SVX_DLLPRIVATE virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    SVX_DLLPRIVATE virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    SVX_DLLPRIVATE virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 
     SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText, const IntlWrapper * = 0 ) const;
 
-    SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+    SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
 };
 
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 053bf1303e..5a26bff796 100644..100755
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -198,14 +198,14 @@ protected:
     Table               aTable;
     Table*              pBmpTable;
 
-    BOOL                bTableDirty;
-    BOOL                bBitmapsDirty;
-    BOOL                bOwnPool;
+    sal_Bool                bTableDirty;
+    sal_Bool                bBitmapsDirty;
+    sal_Bool                bOwnPool;
 
                         XPropertyTable( const String& rPath,
                                         XOutdevItemPool* pXPool = NULL,
-                                        USHORT nInitSize = 16,
-                                        USHORT nReSize = 16 );
+                                        sal_uInt16 nInitSize = 16,
+                                        sal_uInt16 nReSize = 16 );
                         XPropertyTable( SvStream& rIn );
     void                Clear();
 
@@ -214,10 +214,10 @@ public:
 
     long                Count() const;
 
-    BOOL                Insert(long nIndex, XPropertyEntry* pEntry);
+    sal_Bool                Insert(long nIndex, XPropertyEntry* pEntry);
     XPropertyEntry*     Replace(long nIndex, XPropertyEntry* pEntry);
-    XPropertyEntry*     Remove(long nIndex, USHORT nDummy);
-    XPropertyEntry*     Get( long nIndex, USHORT nDummy ) const;
+    XPropertyEntry*     Remove(long nIndex, sal_uInt16 nDummy);
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
 
     long                Get(const String& rName);
     Bitmap*             GetBitmap( long nIndex ) const;
@@ -226,15 +226,15 @@ public:
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    BOOL                IsDirty() const { return bTableDirty && bBitmapsDirty; }
-    void                SetDirty( BOOL bDirty = TRUE )
+    sal_Bool                IsDirty() const { return bTableDirty && bBitmapsDirty; }
+    void                SetDirty( sal_Bool bDirty = sal_True )
                             { bTableDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual BOOL        Load() = 0;
-    virtual BOOL        Save() = 0;
-    virtual BOOL        Create() = 0;
-    virtual BOOL        CreateBitmapsForUI() = 0;
-    virtual Bitmap*     CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+    virtual sal_Bool        Load() = 0;
+    virtual sal_Bool        Save() = 0;
+    virtual sal_Bool        Create() = 0;
+    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
 // --------------------
@@ -251,14 +251,14 @@ protected:
     List                aList;
     List*               pBmpList;
 
-    BOOL                bListDirty;
-    BOOL                bBitmapsDirty;
-    BOOL                bOwnPool;
+    sal_Bool                bListDirty;
+    sal_Bool                bBitmapsDirty;
+    sal_Bool                bOwnPool;
 
                         XPropertyList(  const String& rPath,
                                         XOutdevItemPool* pXPool = NULL,
-                                        USHORT nInitSize = 16,
-                                        USHORT nReSize = 16 );
+                                        sal_uInt16 nInitSize = 16,
+                                        sal_uInt16 nReSize = 16 );
                         XPropertyList( SvStream& rIn );
     void                Clear();
 
@@ -269,8 +269,8 @@ public:
 
     void                Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND );
     XPropertyEntry*     Replace( XPropertyEntry* pEntry, long nIndex );
-    XPropertyEntry*     Remove( long nIndex, USHORT nDummy );
-    XPropertyEntry*     Get( long nIndex, USHORT nDummy ) const;
+    XPropertyEntry*     Remove( long nIndex, sal_uInt16 nDummy );
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
 
     long                Get(const String& rName);
     Bitmap*             GetBitmap( long nIndex ) const;
@@ -279,15 +279,15 @@ public:
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    BOOL                IsDirty() const { return bListDirty && bBitmapsDirty; }
-    void                SetDirty( BOOL bDirty = TRUE )
+    sal_Bool                IsDirty() const { return bListDirty && bBitmapsDirty; }
+    void                SetDirty( sal_Bool bDirty = sal_True )
                             { bListDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual BOOL        Load() = 0;
-    virtual BOOL        Save() = 0;
-    virtual BOOL        Create() = 0;
-    virtual BOOL        CreateBitmapsForUI() = 0;
-    virtual Bitmap*     CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+    virtual sal_Bool        Load() = 0;
+    virtual sal_Bool        Save() = 0;
+    virtual sal_Bool        Create() = 0;
+    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
 // ------------------
@@ -299,8 +299,8 @@ class SVX_DLLPUBLIC XColorTable : public XPropertyTable
 public:
     explicit        XColorTable( const String& rPath,
                                  XOutdevItemPool* pXPool = NULL,
-                                 USHORT nInitSize = 16,
-                                 USHORT nReSize = 16 );
+                                 sal_uInt16 nInitSize = 16,
+                                 sal_uInt16 nReSize = 16 );
     virtual			~XColorTable();
 
     using XPropertyTable::Replace;
@@ -310,11 +310,11 @@ public:
     using XPropertyTable::Get;
     XColorEntry*    GetColor(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 
     static XColorTable*	GetStdColorTable();
 };
@@ -328,8 +328,8 @@ class XColorList : public XPropertyList
 public:
     explicit        XColorList( const String& rPath,
                                 XOutdevItemPool* pXPool = NULL,
-                                USHORT nInitSize = 16,
-                                USHORT nReSize = 16 );
+                                sal_uInt16 nInitSize = 16,
+                                sal_uInt16 nReSize = 16 );
     virtual			~XColorList();
 
     using XPropertyList::Replace;
@@ -339,11 +339,11 @@ public:
     using XPropertyList::Get;
     XColorEntry*    GetColor(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // --------------------
@@ -355,8 +355,8 @@ class XLineEndTable : public XPropertyTable
 public:
     explicit        XLineEndTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual			~XLineEndTable();
 
     using XPropertyTable::Replace;
@@ -366,11 +366,11 @@ public:
     using XPropertyTable::Get;
     XLineEndEntry*  GetLineEnd(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -397,11 +397,11 @@ public:
     using XPropertyList::Get;
     XLineEndEntry* GetLineEnd(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // --------------------
@@ -413,8 +413,8 @@ class XDashTable : public XPropertyTable
 public:
     explicit        XDashTable( const String& rPath,
                                 XOutdevItemPool* pXPool = NULL,
-                                USHORT nInitSize = 16,
-                                USHORT nReSize = 16 );
+                                sal_uInt16 nInitSize = 16,
+                                sal_uInt16 nReSize = 16 );
     virtual			~XDashTable();
 
     using XPropertyTable::Replace;
@@ -424,11 +424,11 @@ public:
     using XPropertyTable::Get;
     XDashEntry*     GetDash(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -455,11 +455,11 @@ public:
     using XPropertyList::Get;
     XDashEntry* GetDash(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // --------------------
@@ -471,8 +471,8 @@ class XHatchTable : public XPropertyTable
 public:
     explicit        XHatchTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual			~XHatchTable();
 
     using XPropertyTable::Replace;
@@ -482,11 +482,11 @@ public:
     using XPropertyTable::Get;
     XHatchEntry*    GetHatch(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -513,11 +513,11 @@ public:
     using XPropertyList::Get;
     XHatchEntry* GetHatch(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // ---------------------
@@ -529,8 +529,8 @@ class XGradientTable : public XPropertyTable
 public:
     explicit        XGradientTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual			~XGradientTable();
 
     using XPropertyTable::Replace;
@@ -540,11 +540,11 @@ public:
     using XPropertyTable::Get;
     XGradientEntry* GetGradient(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -571,11 +571,11 @@ public:
     using XPropertyList::Get;
     XGradientEntry* GetGradient(long nIndex) const;
 
-    virtual BOOL Load();
-    virtual BOOL Save();
-    virtual BOOL Create();
-    virtual BOOL CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+    virtual sal_Bool Load();
+    virtual sal_Bool Save();
+    virtual sal_Bool Create();
+    virtual sal_Bool CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // ---------------------
@@ -587,8 +587,8 @@ class XBitmapTable : public XPropertyTable
 public:
     explicit        XBitmapTable( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual			~XBitmapTable();
 
     using XPropertyTable::Replace;
@@ -598,11 +598,11 @@ public:
     using XPropertyTable::Get;
     XBitmapEntry*   GetBitmap(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -614,8 +614,8 @@ class SVX_DLLPUBLIC XBitmapList : public XPropertyList
 public:
     explicit        XBitmapList( const String& rPath,
                                     XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
+                                    sal_uInt16 nInitSize = 16,
+                                    sal_uInt16 nReSize = 16 );
     virtual			~XBitmapList();
 
     using XPropertyList::Replace;
@@ -625,11 +625,11 @@ public:
     using XPropertyList::Get;
     XBitmapEntry*   GetBitmap(long nIndex) const;
 
-    virtual BOOL    Load();
-    virtual BOOL    Save();
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 #endif // _XTABLE_HXX
diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx
index f8a4d39d34..f8a4d39d34 100644..100755
--- a/svx/inc/svx/xtextit.hxx
+++ b/svx/inc/svx/xtextit.hxx
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index 1edf46edca..50ce6fea8c 100644..100755
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -46,12 +46,12 @@ public:
                             XFormTextStyleItem(XFormTextStyle = XFT_NONE);
                             XFormTextStyleItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
-    virtual USHORT          GetValueCount() const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
+    virtual sal_uInt16          GetValueCount() const;
     XFormTextStyle			GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
     // #FontWork#
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 /*************************************************************************
@@ -64,10 +64,10 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
 {
 public:
                             TYPEINFO();
-                            XFormTextHideFormItem(BOOL bHide = FALSE);
+                            XFormTextHideFormItem(sal_Bool bHide = sal_False);
                             XFormTextHideFormItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
-    virtual SfxPoolItem*    Create(SvStream& rIn, USHORT nVer) const;
+    virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const;
 };
 
 #endif
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
new file mode 100755
index 0000000000..e16fe1b14d
--- /dev/null
+++ b/svx/inc/svx/zoom_def.hxx
@@ -0,0 +1,8 @@
+#ifndef _SVX_ZOOM_DEF_HXX
+#define _SVX_ZOOM_DEF_HXX
+
+#define	ZOOMBTN_OPTIMAL		((sal_uInt16)0x0001)
+#define ZOOMBTN_PAGEWIDTH	((sal_uInt16)0x0002)
+#define ZOOMBTN_WHOLEPAGE	((sal_uInt16)0x0004)
+
+#endif
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index 42dc766639..09b8139161 100644..100755
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx
@@ -38,20 +38,20 @@
 class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl
 {
 private:
-    USHORT	nZoom;
-    USHORT  nValueSet;
+    sal_uInt16	nZoom;
+    sal_uInt16  nValueSet;
 
 public:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual void    Paint( const UserDrawEvent& rEvt );
     virtual void	Command( const CommandEvent& rCEvt );
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxZoomStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+    SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static	ULONG	GetDefItemWidth(const StatusBar& rStb);
+    static	sal_uIntPtr	GetDefItemWidth(const StatusBar& rStb);
 
 };
 
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index f3b73832ef..58c09f6d0b 100644..100755
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -47,20 +47,20 @@ enum SvxZoomType
 
 class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
 {
-    USHORT					nValueSet;	// erlaubte Werte (siehe #defines unten)
+    sal_uInt16					nValueSet;	// erlaubte Werte (siehe #defines unten)
     SvxZoomType				eType;
 
 public:
     TYPEINFO();
 
     SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT,
-                 USHORT nVal = 0, USHORT nWhich = SID_ATTR_ZOOM );
+                 sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );
     SvxZoomItem( const SvxZoomItem& );
     ~SvxZoomItem();
 
-    void					SetValueSet( USHORT nValues ) { nValueSet = nValues; }
-    USHORT					GetValueSet() const { return nValueSet; }
-    bool                    IsValueAllowed( USHORT nValue ) const
+    void					SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; }
+    sal_uInt16					GetValueSet() const { return nValueSet; }
+    bool                    IsValueAllowed( sal_uInt16 nValue ) const
                             { return nValue == ( nValue & nValueSet ); }
 
     SvxZoomType 			GetType() const { return eType; }
@@ -68,11 +68,11 @@ public:
                             { eType = eNewType; }
 
     virtual SfxPoolItem*	Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*	Create( SvStream& rStrm, USHORT nVersion ) const;
-    virtual SvStream&		Store( SvStream& rStrm , USHORT nItemVersion ) const;
+    virtual SfxPoolItem*	Create( SvStream& rStrm, sal_uInt16 nVersion ) const;
+    virtual SvStream&		Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;
     virtual int				operator==( const SfxPoolItem& ) const;
-    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx
index 6db597a455..ff7331455f 100644..100755
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/svx/inc/svx/zoomsliderctrl.hxx
@@ -43,20 +43,20 @@ private:
     struct SvxZoomSliderControl_Impl;
     SvxZoomSliderControl_Impl* mpImpl;
 
-    USHORT Offset2Zoom( long nOffset ) const;
-    long Zoom2Offset( USHORT nZoom ) const;
+    sal_uInt16 Offset2Zoom( long nOffset ) const;
+    long Zoom2Offset( sal_uInt16 nZoom ) const;
 
 public:
 
     SFX_DECL_STATUSBAR_CONTROL();
 
-    SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+    SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
     ~SvxZoomSliderControl();
 
-    virtual void  StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual void  Paint( const UserDrawEvent& rEvt );
-    virtual BOOL  MouseButtonDown( const MouseEvent & );
-    virtual BOOL  MouseMove( const MouseEvent & rEvt );
+    virtual sal_Bool  MouseButtonDown( const MouseEvent & );
+    virtual sal_Bool  MouseMove( const MouseEvent & rEvt );
 };
 
 #endif
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index be1d6ade10..b8df939fff 100644..100755
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -38,28 +38,28 @@
 class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item
 {
     com::sun::star::uno::Sequence < sal_Int32 > maValues;
-    USHORT mnMinZoom;
-    USHORT mnMaxZoom;
+    sal_uInt16 mnMinZoom;
+    sal_uInt16 mnMaxZoom;
 
 public:
     TYPEINFO();
 
-    SvxZoomSliderItem( USHORT nCurrentZoom = 100, USHORT nMinZoom = 20, USHORT nMaxZoom = 600, USHORT nWhich = SID_ATTR_ZOOMSLIDER );
+    SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
     SvxZoomSliderItem( const SvxZoomSliderItem& );
     ~SvxZoomSliderItem();
 
     void AddSnappingPoint( sal_Int32 nNew );
     const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const;
-    USHORT GetMinZoom() const {return mnMinZoom;}
-    USHORT GetMaxZoom() const {return mnMaxZoom;}
+    sal_uInt16 GetMinZoom() const {return mnMinZoom;}
+    sal_uInt16 GetMaxZoom() const {return mnMaxZoom;}
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, USHORT nVersion ) const;                       // leer
-    virtual SvStream&       Store( SvStream& rStrm , USHORT nItemVersion ) const;                   // leer
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const;                       // leer
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;                   // leer
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
 //------------------------------------------------------------------------
diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx
index 4c40416ea9..4c40416ea9 100644..100755
--- a/svx/inc/svxempty.hxx
+++ b/svx/inc/svxempty.hxx
diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index d85c051818..d85c051818 100644..100755
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index b6e23f509a..c480ccfcb0 100644..100755
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -140,8 +140,8 @@ private:
 
     FindTextFieldControl* m_pFindTextFieldControl;
 
-    USHORT m_nDownSearchId; // item position of findbar
-    USHORT m_nUpSearchId;   // item position of findbar
+    sal_uInt16 m_nDownSearchId; // item position of findbar
+    sal_uInt16 m_nUpSearchId;   // item position of findbar
 
 };
 
diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx
index 6bbd772519..6bbd772519 100644..100755
--- a/svx/inc/uiks.hxx
+++ b/svx/inc/uiks.hxx
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index ab00693e71..ab00693e71 100644..100755
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index 1b347942db..89bb149e32 100644..100755
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -37,15 +37,15 @@ class ImpXPolygon
 {
 public:
     Point*          pPointAry;
-    BYTE*           pFlagAry;
+    sal_uInt8*           pFlagAry;
     Point*          pOldPointAry;
-    BOOL            bDeleteOldPoints;
-    USHORT          nSize;
-    USHORT          nResize;
-    USHORT          nPoints;
-    USHORT          nRefCount;
+    sal_Bool            bDeleteOldPoints;
+    sal_uInt16          nSize;
+    sal_uInt16          nResize;
+    sal_uInt16          nPoints;
+    sal_uInt16          nRefCount;
 
-    ImpXPolygon( USHORT nInitSize = 16, USHORT nResize=16 );
+    ImpXPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize=16 );
     ImpXPolygon( const ImpXPolygon& rImpXPoly );
     ~ImpXPolygon();
 
@@ -57,13 +57,13 @@ public:
         if ( bDeleteOldPoints )
         {
             delete[] (char*)pOldPointAry;
-            bDeleteOldPoints = FALSE;
+            bDeleteOldPoints = sal_False;
         }
     }
 
-    void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE );
-    void InsertSpace( USHORT nPos, USHORT nCount );
-    void Remove( USHORT nPos, USHORT nCount );
+    void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True );
+    void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount );
+    void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
 };
 
 typedef ::std::vector< XPolygon* > XPolygonList;
@@ -72,7 +72,7 @@ class ImpXPolyPolygon
 {
 public:
     XPolygonList aXPolyList;
-    USHORT       nRefCount;
+    sal_uInt16       nRefCount;
 
                 ImpXPolyPolygon() { nRefCount = 1; }
                 ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly );
diff --git a/svx/inc/zoom_def.hxx b/svx/inc/zoom_def.hxx
deleted file mode 100644
index a377b6ece1..0000000000
--- a/svx/inc/zoom_def.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SVX_ZOOM_DEF_HXX
-#define _SVX_ZOOM_DEF_HXX
-
-#define	ZOOMBTN_OPTIMAL		((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH	((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE	((USHORT)0x0004)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 9f75974886..641f4e5287 100644..100755
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,39 +1,2 @@
-sx	svx	:	sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL
-sx	svx										usr1	-	all	sx_mkout NULL
-sx	svx\inc									nmake	-	all	sx_inc NULL
-sx	svx\uiconfig\layout						nmake	-	all	sx_layout NULL
-sx	svx\source\unodialogs\textconversiondlgs   	nmake	-	all	sx_textconversiondlgs sx_inc NULL
-sx	svx\sdi									nmake	-	all	sx_sdi sx_inc NULL
-sx	svx\source\src							nmake	-	all	sx_src sx_inc sx_sdi NULL
-sx	svx\source\intro						nmake	-	all	sx_intro sx_inc NULL
-sx	svx\source\items						nmake	-	all	sx_items sx_inc sx_sdi NULL
-sx	svx\source\xoutdev						nmake	-	all	sx_xout sx_items sx_inc NULL
-sx	svx\source\svdraw						nmake	-	all	sx_draw sx_inc NULL
-sx	svx\source\sdr\attribute				nmake	-	all	sx_attribute sx_inc NULL
-sx	svx\source\sdr\primitive2d				nmake	-	all	sx_primitive2d sx_inc NULL
-sx	svx\source\sdr\primitive3d				nmake	-	all	sx_primitive3d sx_inc NULL
-sx  svx\source\table						nmake	-	all sx_table sx_inc NULL
-sx	svx\source\sdr\properties				nmake	-	all	sx_properties sx_inc NULL
-sx	svx\source\sdr\contact					nmake	-	all	sx_contact sx_inc NULL
-sx	svx\source\sdr\event					nmake	-	all	sx_event sx_inc NULL
-sx	svx\source\sdr\animation				nmake	-	all	sx_animation sx_inc NULL
-sx	svx\source\sdr\overlay					nmake	-	all	sx_overlay sx_inc NULL
-sx	svx\source\smarttags					nmake	-	all	sx_smarttags sx_inc NULL
-sx	svx\source\stbctrls						nmake	-	all	sx_stbc sx_inc NULL
-sx	svx\source\mnuctrls						nmake	-	all	sx_mnuc sx_inc NULL
-sx	svx\source\engine3d						nmake	-	all	sx_3deng sx_inc NULL
-sx	svx\source\form							nmake	-	all	sx_form sx_sdi sx_inc NULL
-sx	svx\source\fmcomp						nmake	-	all	sx_fmcmp sx_sdi sx_inc NULL
-sx	svx\source\tbxctrls						nmake	-	all	sx_tbxc sx_inc NULL
-sx  svx\source\dialog                                               nmake   -       all     sx_dlg sx_inc NULL
-sx	svx\source\unodraw						nmake	-	all	sx_undrw sx_inc NULL
-sx	svx\source\unogallery					nmake	-	all	sx_ungal sx_inc NULL
-sx	svx\source\gallery2						nmake	-	all	sx_gall sx_inc NULL
-sx	svx\source\xml							nmake	-	all	sx_xml sx_inc NULL
-sx	svx\source\core							nmake	-	all	sx_core sx_inc NULL
-sx	svx\source\accessibility				nmake	-	all	sx_accessibility sx_inc NULL
-sx	svx\source\customshapes					nmake	-	all sx_customshapes sx_inc NULL
-sx	svx\source\toolbars						nmake	-	all sx_toolbars sx_inc NULL
-sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
-sx	svx\source\gengal						nmake	-	all	sx_gengal sx_util NULL
-sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL
+sx	svx	:	sfx2 L10N:l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
+sx	svx\prj								nmake	-	all	sx_prj NULL
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index 3d6092f5ac..a52a9074f4 100644..100755
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -1,558 +1,5 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\global
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib
-..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal*
-..\%__SRC%\bin\gengalrc %_DEST%\bin%_EXT%\gengal.ini
-..\%__SRC%\bin\cui*.dll %_DEST%\bin%_EXT%\cui*.dll
-..\%__SRC%\bin\svx*.dll %_DEST%\bin%_EXT%\svx*.dll
-..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll
-..\%__SRC%\bin\txcnv*.dll %_DEST%\bin%_EXT%\txcnv*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-mkdir: %_DEST%\inc%_EXT%\svx
-..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi
-..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
-..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
-
-..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx
-..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx
-..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx
-..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx
-..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx
-..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx
-..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx
-..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc
-
-..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx
-..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
-..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
-..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
-
-../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
-../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
-../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx
-../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx
-../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx
-../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx
-../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx
-
-..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx
-..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx
-..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx
-..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx
-..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx
-..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx
-..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx
-..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc
-..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx
-..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx
-..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx
-..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx
-..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx
-..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx
-..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx
-..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx
-..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx
-..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx
-..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx
-..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx
-..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx
-..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx
-..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx
-..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx
-..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc
-..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx
-..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx
-..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx
-..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx
-..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx
-..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx
-..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx
-..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx
-..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx
-..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx
-..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx
-..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx
-..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx
-..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx
-..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx
-..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx
-..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx
-..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx
-..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx
-..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx
-..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx
-..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx
-..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx
-..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx
-..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx
-..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx
-..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx
-..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx
-..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx
-..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx
-..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx
-..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx
-..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx
-..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc
-..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx
-..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx
-..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx
-..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx
-..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx
-..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx
-..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx
-..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx
-..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx
-..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx
-..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx
-..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx
-..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx
-..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx
-..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx
-..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx
-..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx
-..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx
-..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx
-..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx
-..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx
-..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx
-..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx
-..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx
-..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx
-..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx
-..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx
-..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx
-..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx
-..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx
-..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
-
-..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx
-..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx
-..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx
-..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc
-..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx
-..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx
-..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx
-..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx
-..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx
-..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx
-..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
-..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
-..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx
 ..\inc\svx\linkwarn.hxx %_DEST%\inc%_EXT%\svx\linkwarn.hxx
 ..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx
 ..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx
 ..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx
 ..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx
-..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx
-..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx
-..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx
-..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx
-..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx
-..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx
-..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx
-..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx
-..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx
-..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx
-..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx
-..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx
-..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx
-..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx
-..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx
-..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx
-..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx
-..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx
-..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc
-..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx
-..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx
-..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx
-..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx
-..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx
-..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx
-..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx
-..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx
-..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx
-..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx
-..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx
-..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx
-..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx
-..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx
-..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx
-..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx
-..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx
-..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx
-..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx
-..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx
-..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx
-..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx
-..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx
-..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx
-..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx
-..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx
-..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx
-..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx
-..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx
-..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx
-..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx
-..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx
-..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx
-..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx
-..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx
-..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx
-..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx
-..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx
-..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx
-..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx
-..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx
-..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx
-..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx
-..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx
-..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx
-..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx
-..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx
-..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx
-..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx
-..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx
-..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx
-..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx
-..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx
-..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx
-..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx
-..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx
-..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx
-..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx
-..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx
-..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx
-..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx
-..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx
-..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx
-..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx
-..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx
-..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx
-..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx
-..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx
-..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx
-..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx
-..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx
-..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx
-..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx
-..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx
-..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx
-..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx
-..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx
-..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx
-..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx
-..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx
-..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx
-..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx
-..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx
-..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx
-..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx
-..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx
-..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx
-..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx
-..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx
-..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx
-..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx
-..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx
-..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx
-..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx
-..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx
-..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx
-..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx
-..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx
-..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx
-..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx
-..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx
-..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx
-..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx
-..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx
-..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx
-..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx
-..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx
-..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx
-..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx
-..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx
-..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc
-..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx
-..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx
-..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx
-..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx
-..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx
-..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx
-..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx
-..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx
-..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx
-..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx
-..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx
-..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx
-..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx
-..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx
-..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx
-..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx
-..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx
-..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx
-..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx
-..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx
-..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx
-..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx
-..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx
-..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx
-..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx
-..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx
-..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx
-..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx
-..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx
-..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx
-..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx
-..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx
-..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx
-..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx
-..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx
-..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx
-..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx
-..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx
-..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx
-..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx
-..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx
-..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx
-..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx
-..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx
-..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx
-..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx
-..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx
-..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx
-..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx
-..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx
-..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx
-..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx
-..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx
-..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx
-..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx
-..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx
-..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx
-..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx
-..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx
-..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx
-..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx
-..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx
-..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx
-..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx
-..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx
-..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx
-..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx
-..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx
-..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx
-..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx
-..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx
-..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx
-..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx
-..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx
-..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx
-..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx
-..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx
-..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx
-..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx
-..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx
-..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx
-..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx
-..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx
-..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx
-..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx
-..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx
-..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx
-..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx
-..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx
-..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx
-..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx
-..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx
-..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx
-..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx
-..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx
-..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx
-..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx
-..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx
-..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx
-..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx
-..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx
-..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx
-..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx
-..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx
-..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx
-..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx
-..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx
-..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
-..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
-..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
-..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
-..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx
-
-..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx
-..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx
-..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx
-..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx
-..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx
-..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx
-..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx
-..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx
-..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx
-..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx
-..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx
-..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx
-..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx
-..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx
-..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx
-..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx
-..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx
-..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx
-..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx
-..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx
-..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx
-..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx
-..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx
-..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc
-..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx
-..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx
-..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx
-..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx
-..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx
-..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx
-..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx
-..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx
-..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx
-..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx
-..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx
-..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx
-..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx
-..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx
-..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx
-..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx
-..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx
-..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx
-..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx
-..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h
-..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx
-..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx
-..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx
-..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx
-..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx
-..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx
-..\inc\svx\sdrobjectfilter.hxx %_DEST%\inc%_EXT%\svx\sdrobjectfilter.hxx
-
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties
-..\inc\svx\sdr\properties\properties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\properties.hxx
-..\inc\svx\sdr\properties\emptyproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\emptyproperties.hxx
-..\inc\svx\sdr\properties\e3dlatheproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dlatheproperties.hxx
-..\inc\svx\sdr\properties\e3dextrudeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dextrudeproperties.hxx
-..\inc\svx\sdr\properties\e3dcompoundproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dcompoundproperties.hxx
-..\inc\svx\sdr\properties\e3dproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dproperties.hxx
-..\inc\svx\sdr\properties\rectangleproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\rectangleproperties.hxx
-..\inc\svx\sdr\properties\attributeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\attributeproperties.hxx
-..\inc\svx\sdr\properties\defaultproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\defaultproperties.hxx
-..\inc\svx\sdr\properties\textproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\textproperties.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact
-..\inc\svx\sdr\contact\displayinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\displayinfo.hxx
-..\inc\svx\sdr\contact\objectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontact.hxx
-..\inc\svx\sdr\contact\objectcontactofpageview.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofpageview.hxx
-..\inc\svx\sdr\contact\viewcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontact.hxx
-..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx
-..\inc\svx\sdr\contact\viewcontactofsdrmediaobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrmediaobj.hxx
-..\inc\svx\sdr\contact\viewcontactofe3dscene.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofe3dscene.hxx
-..\inc\svx\sdr\contact\viewcontactofgraphic.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgraphic.hxx
-..\inc\svx\sdr\contact\viewcontactofgroup.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgroup.hxx
-..\inc\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx
-..\inc\svx\sdr\contact\viewcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofpageobj.hxx
-..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx
-..\inc\svx\sdr\contact\viewcontactofsdrpage.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrpage.hxx
-..\inc\svx\sdr\contact\viewcontactoftextobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactoftextobj.hxx
-..\inc\svx\sdr\contact\viewcontactofvirtobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofvirtobj.hxx
-..\inc\svx\sdr\contact\viewobjectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontact.hxx
-..\inc\svx\sdr\contact\objectcontactofobjlistpainter.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofobjlistpainter.hxx
-..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx
-..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx
-..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay
-..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx
-..\inc\svx\sdr\overlay\overlaybitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaybitmapex.hxx
-..\inc\svx\sdr\overlay\overlayline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayline.hxx
-..\inc\svx\sdr\overlay\overlayhelpline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayhelpline.hxx
-..\inc\svx\sdr\overlay\overlaymanager.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanager.hxx
-..\inc\svx\sdr\overlay\overlaymanagerbuffered.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanagerbuffered.hxx
-..\inc\svx\sdr\overlay\overlayobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobject.hxx
-..\inc\svx\sdr\overlay\overlayobjectlist.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectlist.hxx
-..\inc\svx\sdr\overlay\overlaytriangle.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytriangle.hxx
-..\inc\svx\sdr\overlay\overlaypolypolygon.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaypolypolygon.hxx
-..\inc\svx\sdr\overlay\overlayobjectcell.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectcell.hxx
-..\inc\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx
-..\inc\svx\sdr\overlay\overlayselection.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayselection.hxx
-..\inc\svx\sdr\overlay\overlaytools.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytools.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d
-..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation
-..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx
-..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx
-..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx
-
-mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
-..\inc\svx\sdr\table\tabledesign.hxx %_DEST%\inc%_EXT%\svx\sdr\table\tabledesign.hxx
-
-..\xml\SvxDrawPage.xml %_DEST%\xml%_EXT%\SvxDrawPage.xml
-..\xml\SvxGraphicObject.xml %_DEST%\xml%_EXT%\SvxGraphicObject.xml
-..\xml\SvxShape.xml %_DEST%\xml%_EXT%\SvxShape.xml
-..\xml\SvxShapeCircle.xml %_DEST%\xml%_EXT%\SvxShapeCircle.xml
-..\xml\SvxShapeCollection.xml %_DEST%\xml%_EXT%\SvxShapeCollection.xml
-..\xml\SvxShapeConnector.xml %_DEST%\xml%_EXT%\SvxShapeConnector.xml
-..\xml\SvxShapeControl.xml %_DEST%\xml%_EXT%\SvxShapeControl.xml
-..\xml\SvxShapeDimensioning.xml %_DEST%\xml%_EXT%\SvxShapeDimensioning.xml
-..\xml\SvxShapeGroup.xml %_DEST%\xml%_EXT%\SvxShapeGroup.xml
-..\xml\SvxShapePolyPolygon.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygon.xml
-..\xml\SvxShapePolyPolygonBezier.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygonBezier.xml
-..\xml\SvxUnoNumberingRules.xml %_DEST%\xml%_EXT%\SvxUnoNumberingRules.xml
-..\xml\SvxUnoText.xml %_DEST%\xml%_EXT%\SvxUnoText.xml
-..\xml\SvxUnoTextContent.xml %_DEST%\xml%_EXT%\SvxUnoTextContent.xml
-..\xml\SvxUnoTextContentEnum.xml %_DEST%\xml%_EXT%\SvxUnoTextContentEnum.xml
-..\xml\SvxUnoTextCursor.xml %_DEST%\xml%_EXT%\SvxUnoTextCursor.xml
-..\xml\SvxUnoTextField.xml %_DEST%\xml%_EXT%\SvxUnoTextField.xml
-..\xml\SvxUnoTextRange.xml %_DEST%\xml%_EXT%\SvxUnoTextRange.xml
-..\xml\SvxUnoTextRangeEnumeration.xml %_DEST%\xml%_EXT%\SvxUnoTextRangeEnumeration.xml
-..\xml\SvxGraphicExporter.xml %_DEST%\xml%_EXT%\SvxGraphicExporter.xml
-..\xml\SvxGraphCtrlAccessibleContext.xml %_DEST%\xml%_EXT%\SvxGraphCtrlAccessibleContext.xml
-..\xml\AccessibleShape.xml %_DEST%\xml%_EXT%\AccessibleShape.xml
-..\xml\AccessibleGraphicShape.xml %_DEST%\xml%_EXT%\AccessibleGraphicShape.xml
-..\xml\AccessibleOLEShape.xml %_DEST%\xml%_EXT%\AccessibleOLEShape.xml
-..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml
-..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml
-
-..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx
-..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
-..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
-..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
-..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx
-
-..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
diff --git a/xmloff/util/makefile.pmk b/svx/prj/makefile.mk
index faf070e2d5..e312a7ccab 100644..100755
--- a/xmloff/util/makefile.pmk
+++ b/svx/prj/makefile.mk
@@ -25,6 +25,16 @@
 #
 #*************************************************************************
 
-# Reduction of exported symbols:
-CDEFS += -DXMLOFF_DLLIMPLEMENTATION
-VISIBILITY_HIDDEN=TRUE
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java
index 90abd12776..2f7581e22e 100644..100755
--- a/svx/qa/unoapi/Test.java
+++ b/svx/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc",
-                "testdocuments", "-cs", connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();
diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl
index 89369160bb..b26db6b7f9 100644..100755
--- a/svx/qa/unoapi/knownissues.xcl
+++ b/svx/qa/unoapi/knownissues.xcl
@@ -85,3 +85,6 @@ svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleCo
 
 ### i111169 ###
 svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent
+
+### i114642 ###
+svx.SvxUnoTextContent::com::sun::star::style::CharacterProperties
diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk
deleted file mode 100644
index 133e9a3458..0000000000
--- a/svx/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = svx
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/svx/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
index 82ee2ea6b1..82ee2ea6b1 100644..100755
--- a/svx/qa/unoapi/svx.sce
+++ b/svx/qa/unoapi/svx.sce
diff --git a/svx/qa/unoapi/testdocuments/SvxShape.sxd b/svx/qa/unoapi/testdocuments/SvxShape.sxd
index 27f06d5416..27f06d5416 100644..100755
--- a/svx/qa/unoapi/testdocuments/SvxShape.sxd
+++ b/svx/qa/unoapi/testdocuments/SvxShape.sxd
diff --git a/svx/qa/unoapi/testdocuments/crazy-blue.jpg b/svx/qa/unoapi/testdocuments/crazy-blue.jpg
index 001c88b63d..001c88b63d 100644..100755
--- a/svx/qa/unoapi/testdocuments/crazy-blue.jpg
+++ b/svx/qa/unoapi/testdocuments/crazy-blue.jpg
diff --git a/svx/qa/unoapi/testdocuments/space-metal.jpg b/svx/qa/unoapi/testdocuments/space-metal.jpg
index d233443890..d233443890 100644..100755
--- a/svx/qa/unoapi/testdocuments/space-metal.jpg
+++ b/svx/qa/unoapi/testdocuments/space-metal.jpg
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index 2ba8bbaff1..2ba8bbaff1 100644..100755
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk
deleted file mode 100644
index be41593be7..0000000000
--- a/svx/sdi/makefile.mk
+++ /dev/null
@@ -1,57 +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=svx
-TARGET=svxslots
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(L10N_framework)"==""
-
-SDI1NAME=$(TARGET)
-SDI1EXPORT=svx
-
-# --- Files --------------------------------------------------------
-
-SVSDI1DEPEND= \
-        $(SOLARINCXDIR)$/sfx2/sfx.sdi \
-        $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
-        svxitems.sdi \
-    fmslots.sdi \
-    svx.sdi	\
-    xoitems.sdi \
-    svxitems.sdi
-
-# --- Targets -------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
-
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c5069ad2eb..cd23586cc6 100644..100755
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6205,33 +6205,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem InsertApplet SID_INSERT_APPLET
-(SfxStringItem Class FN_PARAM_1,
- SfxStringItem ClassLocation FN_PARAM_2,
- SfxStringItem Commands FN_PARAM_3)
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-        AccelConfig = FALSE,
-        MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-        ToolBoxConfig = FALSE,
-    GroupId = GID_INSERT;
-]
-
-//--------------------------------------------------------------------------
 SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS
 ()
 [
@@ -15135,3 +15108,31 @@ SfxVoidItem InsertRowDialog SID_TABLE_INSERT_ROW_DLG
     ToolBoxConfig = FALSE,
     GroupId = GID_TABLE;
 ]
+//--------------------------------------------------------------------------
+SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* status: */
+    SlotType = SfxBoolItem
+    
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_EXPLORER;
+]
+
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index d88807e38d..d88807e38d 100644..100755
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc
index b6756506e9..b6756506e9 100644..100755
--- a/svx/sdi/svxslots.hrc
+++ b/svx/sdi/svxslots.hrc
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index c8a6d80135..c8a6d80135 100644..100755
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index cbc9342227..cbc9342227 100644..100755
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 791df84e66..3c93d42f4f 100644..100755
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -40,14 +40,14 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <svx/svdouno.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <algorithm>
 
 using namespace ::comphelper;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index cb1e23c6a5..c39c11238b 100644..100755
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -106,23 +106,23 @@ namespace accessibility
         SfxBroadcaster&			GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
 
         // SvxTextForwarder
-        USHORT			GetParagraphCount() const { return 1; }
-        USHORT			GetTextLen( USHORT /*nParagraph*/ ) const { return 0; }
+        sal_uInt16			GetParagraphCount() const { return 1; }
+        sal_uInt16			GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; }
         String			GetText( const ESelection& /*rSel*/ ) const { return String(); }
-        SfxItemSet		GetAttribs( const ESelection& /*rSel*/, BOOL /*bOnlyHardAttrib*/ = 0 ) const
+        SfxItemSet		GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
         {
             // AW: Very dangerous: The former implementation used a SfxItemPool created on the
             // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
             // a deleted Pool by design.
             return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
         }
-        SfxItemSet		GetParaAttribs( USHORT /*nPara*/ ) const { return GetAttribs(ESelection()); }
-        void			SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
+        SfxItemSet		GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); }
+        void			SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
         void            RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){}
-        void			GetPortions( USHORT /*nPara*/, SvUShorts& /*rList*/ ) const {}
+        void			GetPortions( sal_uInt16 /*nPara*/, SvUShorts& /*rList*/ ) const {}
 
-        USHORT			GetItemState( const ESelection& /*rSel*/, USHORT /*nWhich*/ ) const { return 0; }
-        USHORT			GetItemState( USHORT /*nPara*/, USHORT /*nWhich*/ ) const { return 0; }
+        sal_uInt16			GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
+        sal_uInt16			GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
         
         SfxItemPool* 	GetPool() const { return NULL; }
 
@@ -134,35 +134,35 @@ namespace accessibility
         const SfxItemSet * GetEmptyItemSetPtr() { return 0; }
 
         void        AppendParagraph() {}
-        xub_StrLen  AppendTextPortion( USHORT /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
+        xub_StrLen  AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
 
         //XTextCopy
         void        CopyText(const SvxTextForwarder& ){} 
 
-        XubString		CalcFieldValue( const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
+        XubString		CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
         {
             return  XubString();
         }
-        void            FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen ) {;}
+        void            FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;}
 
-        BOOL			IsValid() const { return sal_True; }
+        sal_Bool			IsValid() const { return sal_True; }
 
         void 			SetNotifyHdl( const Link& ) {}
-        LanguageType 	GetLanguage( USHORT, USHORT ) const { return LANGUAGE_DONTKNOW; }
-        USHORT			GetFieldCount( USHORT ) const { return 0; }
-        EFieldInfo		GetFieldInfo( USHORT, USHORT ) const { return EFieldInfo(); }
-        EBulletInfo     GetBulletInfo( USHORT ) const { return EBulletInfo(); }
-        Rectangle		GetCharBounds( USHORT, USHORT ) const { return Rectangle(); }
-        Rectangle		GetParaBounds( USHORT ) const { return Rectangle(); }
+        LanguageType 	GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; }
+        sal_uInt16			GetFieldCount( sal_uInt16 ) const { return 0; }
+        EFieldInfo		GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); }
+        EBulletInfo     GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); }
+        Rectangle		GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); }
+        Rectangle		GetParaBounds( sal_uInt16 ) const { return Rectangle(); }
         MapMode		 	GetMapMode() const { return MapMode(); }
         OutputDevice*	GetRefDevice() const { return NULL; }
-        sal_Bool		GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const { return sal_False; }
-        sal_Bool		GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const { return sal_False; }
-        sal_Bool 		GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const { return sal_False; }
-        USHORT			GetLineCount( USHORT nPara ) const { return nPara == 0 ? 1 : 0; }
-        USHORT			GetLineLen( USHORT, USHORT ) const { return 0; }
-        void            GetLineBoundaries( /*out*/USHORT & rStart, /*out*/USHORT & rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const  { rStart = rEnd = 0; }
-        USHORT          GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const   { return 0; }
+        sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+        sal_Bool		GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+        sal_Bool 		GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; }
+        sal_uInt16			GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; }
+        sal_uInt16			GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; }
+        void            GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const  { rStart = rEnd = 0; }
+        sal_uInt16          GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const   { return 0; }
 
         // the following two methods would, strictly speaking, require
         // a switch to a real EditSource, too. Fortunately, the
@@ -174,9 +174,9 @@ namespace accessibility
         // shapes).
         sal_Bool		Delete( const ESelection& ) { return sal_False; }
         sal_Bool		InsertText( const String&, const ESelection& ) { return sal_False; }
-        sal_Bool		QuickFormatDoc( BOOL ) { return sal_True; }
-        sal_Int16		GetDepth( USHORT ) const { return -1; }
-        sal_Bool		SetDepth( USHORT, sal_Int16 ) { return sal_True; }
+        sal_Bool		QuickFormatDoc( sal_Bool ) { return sal_True; }
+        sal_Int16		GetDepth( sal_uInt16 ) const { return -1; }
+        sal_Bool		SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; }
 
         Rectangle		GetVisArea() const { return Rectangle(); }
         Point			LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index b2d6765847..b2d6765847 100644..100755
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 6cbf92362b..c953d0529f 100644..100755
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -170,7 +170,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
         Window* pTabPage = mpFrameSel->GetParent();
         sal_Int32 nChildren = pTabPage->GetChildCount();
         for( nIdx = 0; nIdx < nChildren; ++nIdx )
-            if( pTabPage->GetChild( static_cast< USHORT >( nIdx ) ) == mpFrameSel )
+            if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel )
                 break;
     }
     else
@@ -610,7 +610,7 @@ void    AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
     aEvent.FocusFlags = 0;
     if(bGetFocus)
     {
-        USHORT nFocusFlags = mpFrameSel->GetGetFocusFlags();
+        sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags();
         if(nFocusFlags&GETFOCUS_TAB)
             aEvent.FocusFlags |= AwtFocusChangeReason::TAB;
         if(nFocusFlags&GETFOCUS_CURSOR)
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index a3cfcbf1d9..a3cfcbf1d9 100644..100755
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 764d4d8bfa..764d4d8bfa 100644..100755
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 5682ada391..230705a11c 100644..100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/AccessibleShape.hxx>
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <svx/AccessibleShapeInfo.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <rtl/uuid.h>
@@ -48,13 +48,13 @@
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/uno/Exception.hpp>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 
 #include "accessibility.hrc"
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
@@ -249,7 +249,7 @@ void AccessibleShape::UpdateStates (void)
     // XXX fix_me this has to be done with an extra interface later on
     if ( m_pShape && maShapeTreeInfo.GetSdrView() )
     {
-        bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE;
+        bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True;
     }
 
     if (bShapeIsSelected)
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx
index 756a02f145..756a02f145 100644..100755
--- a/svx/source/accessibility/AccessibleShapeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeInfo.cxx
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 879f7ed637..879f7ed637 100644..100755
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 894c8d004a..894c8d004a 100644..100755
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 3fab23b063..3fab23b063 100644..100755
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index d9f7fb7e9e..923f740933 100644..100755
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -577,7 +577,7 @@ namespace accessibility
                         DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
                     }
 
-                    USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 );
+                    sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 );
 
                     // notify all affected paragraphs (TODO: may be suboptimal,
                     // since some paragraphs might stay selected)
@@ -846,7 +846,7 @@ namespace accessibility
                 DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX,
                            "AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow");
 
-                aTmpBB = rCacheTF.GetParaBounds( static_cast< USHORT >( nCurrPara ) );
+                aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) );
 
                 // convert to screen coordinates
                 aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
@@ -1704,7 +1704,7 @@ namespace accessibility
             DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX,
                        "AccessibleTextHelper_Impl::getAccessibleAt: index value overflow");
 
-            Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< USHORT > (nChild) ) );
+            Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) );
 
             if( aParaBounds.IsInside( aLogPoint ) )
                 return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() );
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 20328e658e..20328e658e 100644..100755
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 5ed4deae99..5ed4deae99 100644..100755
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index c863721f21..c863721f21 100644..100755
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 7dc583f834..7dc583f834 100644..100755
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 54c288a044..e6c245279b 100644..100755
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -51,12 +51,12 @@
 
 // Includes for string resources.
 #include "accessibility.hrc"
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/dialmgr.hxx>
 #include <tools/string.hxx>
 
 #include <svx/xdef.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "accessibility.hrc"
 #include "DGColorNameLookUp.hxx"
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 1d05ca3351..5e76aa8b9f 100644..100755
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -46,7 +46,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <svtools/colorcfg.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //===== local includes ========================================================
 #include <svx/ShapeTypeHandler.hxx>
@@ -554,7 +554,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
     svtools::ColorConfig aColorConfig;
-    UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+    sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
     return static_cast<sal_Int32>(nColor);
 }
 
@@ -564,7 +564,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void)
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+    sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 3103305e47..66d9ed1ef4 100644..100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -36,7 +36,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 
 
 using namespace ::rtl;
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index cacfde900b..cacfde900b 100644..100755
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 0fd5579898..0fd5579898 100644..100755
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.src
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 8cee0d84e2..879adecf6e 100644..100755
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -101,9 +101,9 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::
     ensureAlive();
 
     uno::Reference< accessibility::XAccessible >    xRet;
-    const USHORT nItemId = sal::static_int_cast<USHORT>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
+    const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
 
-    if( USHORT(-1) != nItemId )
+    if( sal_uInt16(-1) != nItemId )
     {
         if ( !m_pTable )
             m_pTable = new SvxShowCharSetAcc(this);
@@ -250,7 +250,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
 // - SvxShowCharSetItem -
 // ----------------
 
-SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*	_pParent,USHORT _nPos ) :
+SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*	_pParent,sal_uInt16 _nPos ) :
     mrParent( rParent )
     ,mnId( _nPos )
     ,m_pItem(NULL)
@@ -334,7 +334,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper,
 sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
 {
     return m_pParent && m_pParent->getCharSetControl()->IsSelected(
-        sal::static_int_cast<USHORT>(nAccessibleChildIndex));
+        sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
 }
 // -----------------------------------------------------------------------------
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
@@ -386,7 +386,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
     OExternalLockGuard aGuard( this );
     ensureAlive();
     uno::Reference< accessibility::XAccessible >    xRet;
-    SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< USHORT >( i ) );
+    SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< sal_uInt16 >( i ) );
 
     if( pItem )
     {
@@ -484,10 +484,10 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
     ensureAlive();
 
     uno::Reference< accessibility::XAccessible >    xRet;
-    const USHORT nItemId = sal::static_int_cast<USHORT>(
+    const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(
         m_pParent->getCharSetControl()->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
 
-    if( USHORT(-1) != nItemId )
+    if( sal_uInt16(-1) != nItemId )
     {
         SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( nItemId );
         xRet = pItem->GetAccessible();
@@ -591,7 +591,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In
     OExternalLockGuard aGuard( this );
     ensureAlive();
     ::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( 
-        sal::static_int_cast<USHORT>(getAccessibleIndex(nRow,nColumn) ));
+        sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) ));
     if ( !pItem  )
         throw IndexOutOfBoundsException();
     return pItem->GetAccessible();
@@ -623,14 +623,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
-    return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<USHORT>(nChildIndex));
+    return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
 // -----------------------------------------------------------------------------
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
-    return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<USHORT>(nChildIndex));
+    return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
deleted file mode 100755
index 9ac9cff08a..0000000000
--- a/svx/source/accessibility/makefile.mk
+++ /dev/null
@@ -1,68 +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=svx
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/charmapacc.obj						\
-    $(SLO)$/svxrectctaccessiblecontext.obj		\
-    $(SLO)$/GraphCtlAccessibleContext.obj		\
-    $(SLO)$/ChildrenManager.obj 				\
-    $(SLO)$/ChildrenManagerImpl.obj 			\
-    $(SLO)$/DescriptionGenerator.obj 			\
-    $(SLO)$/AccessibleShape.obj					\
-    $(SLO)$/AccessibleGraphicShape.obj			\
-    $(SLO)$/AccessibleOLEShape.obj				\
-    $(SLO)$/AccessibleShapeInfo.obj				\
-    $(SLO)$/AccessibleShapeTreeInfo.obj			\
-    $(SLO)$/AccessibleTextHelper.obj			\
-    $(SLO)$/AccessibleEmptyEditSource.obj		\
-    $(SLO)$/AccessibleTextEventQueue.obj		\
-    $(SLO)$/ShapeTypeHandler.obj				\
-    $(SLO)$/SvxShapeTypes.obj					\
-    $(SLO)$/AccessibleControlShape.obj			\
-    $(SLO)$/DGColorNameLookUp.obj				\
-    $(SLO)$/AccessibleFrameSelector.obj
-    
-SRS2NAME = accessibility
-SRC2FILES = accessibility.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 3cfd980247..3cfd980247 100644..100755
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index c6073aea39..0e88b287c5 100644..100755
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -78,44 +78,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-static void writeInfo (
-    XRegistryKey * pRegistryKey,
-    const OUString& rImplementationName,
-    const Sequence< OUString >& rServices)
-{
-    Reference< XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * , void * pRegistryKey)
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey );
-
-            writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() );
-        }
-        catch (InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
diff --git a/svx/source/core/makefile.mk b/svx/source/core/makefile.mk
deleted file mode 100644
index da874894ba..0000000000
--- a/svx/source/core/makefile.mk
+++ /dev/null
@@ -1,47 +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=svx
-TARGET=core
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-        $(SLO)$/coreservices.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 7e5f9d6b24..74a474c3c2 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -28,9 +28,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 8276e78234..72498fe6d9 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <tools/poly.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svl/poolitem.hxx>
@@ -348,8 +348,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE );
         // pShape2d Convert in scenes which include 3D Objects
         E3dDefaultAttributes a3DDefaultAttr;
-        a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE );
-        a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE );
+        a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True );
+        a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True );
 
         E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr );
 
@@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
         {
             aSet.Put( XLineStyleItem( XLINE_SOLID ) );
             aSet.Put( XFillStyleItem ( XFILL_NONE ) );
-            aSet.Put( Svx3DDoubleSidedItem( TRUE ) );
+            aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
         }
         else
         {
@@ -410,7 +410,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             }
             else
             {
-                SdrObject* pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+                SdrObject* pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
                 SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
                 if ( pPath )
                     aPolyPoly = pPath->GetPathPoly();
@@ -516,7 +516,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
             double fW = rVolume.getWidth();
             double fH = rVolume.getHeight();
 
-            rCamera.SetAutoAdjustProjection( FALSE );
+            rCamera.SetAutoAdjustProjection( sal_False );
             rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
             basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 );
             basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 );
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 8007d9829b..8007d9829b 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index fb6beaa98a..b8e557ed8a 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeEngine.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include "EnhancedCustomShape3d.hxx"
 #include "EnhancedCustomShapeFontWork.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <svx/unoshape.hxx>
 #include "svx/unopage.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
@@ -48,7 +48,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "unopolyhelper.hxx"
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -315,7 +315,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
                     nShearWink = -nShearWink;
                     nTan = -nTan;
                 }
-                pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, FALSE);
+                pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
             }
             if( nRotateAngle )
             {
@@ -398,7 +398,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
                     nShearWink = -nShearWink;
                     nTan = -nTan;
                 }
-                pObj->Shear( aRect.Center(), nShearWink, nTan, FALSE);
+                pObj->Shear( aRect.Center(), nShearWink, nTan, sal_False);
             }
             sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
             if( nRotateAngle )
@@ -434,7 +434,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
                 }
                 else
                 {
-                    pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE );
+                    pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
                     SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
                     if ( pPath )
                         aPP = pPath->GetPathPoly();
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index 919f1a11f6..919f1a11f6 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 957f24c603..a56ca8e9a6 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -39,7 +39,7 @@
 #include <svx/sdasaitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <vcl/virdev.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
@@ -47,7 +47,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/charscaleitem.hxx>
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
 #include <editeng/outliner.hxx>
@@ -236,7 +236,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
         if ( rText.getLength() )
         {
             // generating vcl/font
-            USHORT nScriptType = i18n::ScriptType::LATIN;
+            sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
             Reference< i18n::XBreakIterator > xBI( EnhancedCustomShapeFontWork::GetBreakIterator() );
             if ( xBI.is() )
             {
@@ -251,7 +251,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                         nScriptType = i18n::ScriptType::LATIN;
                 }
             }
-            UINT16 nFntItm = EE_CHAR_FONTINFO;
+            sal_uInt16 nFntItm = EE_CHAR_FONTINFO;
             if ( nScriptType == i18n::ScriptType::COMPLEX )
                 nFntItm = EE_CHAR_FONTINFO_CTL;
             else if ( nScriptType == i18n::ScriptType::ASIAN )
@@ -296,7 +296,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                 {
                     FWCharacterData aCharacterData;
                     rtl::OUString aCharText( (sal_Unicode)rText[ i ] );
-                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+                    if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
                     {
                         sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN );
                         std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
@@ -354,7 +354,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
                     aVirDev.SetFont( aFont );
                 }
                 FWCharacterData aCharacterData;
-                if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+                if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
                 {
                     aParagraphIter->vCharacters.push_back( aCharacterData );
                 }
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
index 4b3a90e0dc..4b3a90e0dc 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 1996f6b545..19b3eaf333 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 278246a308..0714bf2a56 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
 #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
 /*
 static const SvxMSDffVertPair Vert[] =
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 6b2f8699b7..db094d5862 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "EnhancedCustomShape2d.hxx"
-#include "unoapi.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
+#include "svx/unoapi.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 68ac2bc784..68ac2bc784 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 8239fffdbe..b7afa68e36 100644..100755
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
 
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk
deleted file mode 100644
index 3feca8f250..0000000000
--- a/svx/source/customshapes/makefile.mk
+++ /dev/null
@@ -1,71 +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=svx
-TARGET=customshapes
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Types -------------------------------------
-
-# Disable optimization for SunCC SPARC and MACOSX (funny loops
-# when parsing e.g. "x+width/2"),
-# also http://gcc.gnu.org/PR22392
-.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") 
-NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-.ENDIF
-
-ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
-
-# --- Files -------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-            $(SLO)$/EnhancedCustomShapeTypeNames.obj		\
-            $(SLO)$/EnhancedCustomShapeGeometry.obj			\
-            $(SLO)$/EnhancedCustomShape2d.obj				\
-            $(SLO)$/EnhancedCustomShapeFunctionParser.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-            $(SLO)$/EnhancedCustomShapeEngine.obj			\
-            $(SLO)$/EnhancedCustomShape3d.obj				\
-            $(SLO)$/EnhancedCustomShapeFontWork.obj			\
-            $(SLO)$/EnhancedCustomShapeHandle.obj			\
-            $(SLO)$/tbxcustomshapes.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 49ff258200..511a7987fc 100644..100755
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -42,7 +42,7 @@
 
 #include <sfx2/imagemgr.hxx>
 #include <vcl/svapp.hxx>
-#include "tbxcustomshapes.hxx"
+#include "svx/tbxcustomshapes.hxx"
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 
@@ -52,7 +52,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
 |*
 \************************************************************************/
 
-SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) )
 {
@@ -112,7 +112,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBo
 |*
 \************************************************************************/
 
-void SvxTbxCtlCustomShapes::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
 {
     SfxToolBoxControl::StateChanged( nSID, eState, pState );
@@ -145,7 +145,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlCustomShapes::Select( BOOL /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
 {
      if ( m_aCommand.getLength() > 0 )
     {
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 9b9751888e..824a75d3e3 100644..100755
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -39,7 +39,7 @@ namespace svx {
   -----------------------------------------------------------------------*/
 SpellDialogChildWindow::SpellDialogChildWindow (
     Window* _pParent, 
-    USHORT nId,
+    sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* /*pInfo*/)
     : SfxChildWindow (_pParent, nId)
@@ -53,7 +53,7 @@ SpellDialogChildWindow::SpellDialogChildWindow (
                                             this );
     pWindow = m_pAbstractSpellDialog->GetWindow();
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-    SetHideNotDelete (TRUE);
+    SetHideNotDelete (sal_True);
 }
 /*-------------------------------------------------------------------------
     
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index ad0b1b04a8..d16a5b9397 100644..100755
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -62,7 +62,7 @@
              ( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) &&			\
              ( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) )				\
         {															\
-            aCol = pDstCols[i];	bReplace = TRUE; break;				\
+            aCol = pDstCols[i];	bReplace = sal_True; break;				\
         }															\
     }																\
 }
@@ -187,16 +187,16 @@ void MaskSet::onEditColor()
 class MaskData
 {
     SvxBmpMask*		pMask;
-    BOOL			bIsReady;
-    BOOL			bExecState;
+    sal_Bool			bIsReady;
+    sal_Bool			bExecState;
     SfxBindings&	rBindings;
 
 public:
                 MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind );
 
-    BOOL		IsCbxReady() const { return bIsReady; }
-    void		SetExecState( BOOL bState ) { bExecState = bState; }
-    BOOL		IsExecReady() const { return bExecState; }
+    sal_Bool		IsCbxReady() const { return bIsReady; }
+    void		SetExecState( sal_Bool bState ) { bExecState = bState; }
+    sal_Bool		IsExecReady() const { return bExecState; }
 
                 DECL_LINK( PipetteHdl, ToolBox* pTbx );
                 DECL_LINK( CbxHdl, CheckBox* pCbx );
@@ -210,8 +210,8 @@ public:
 MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
 
     pMask       ( pBmpMask ),
-    bIsReady    ( FALSE ),
-    bExecState  ( FALSE ),
+    bIsReady    ( sal_False ),
+    bExecState  ( sal_False ),
     rBindings	( rBind )
 
 {
@@ -258,7 +258,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
         pSet->SelectItem( 1 );
         pSet->Select();
 
-        pMask->aTbxPipette.CheckItem( TBI_PIPETTE, TRUE );
+        pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True );
         PipetteHdl( &( pMask->aTbxPipette ) );
     }
 
@@ -344,7 +344,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
 
 IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG )
 {
-    SfxBoolItem aBItem( SID_BMPMASK_EXEC, TRUE );
+    SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True );
     rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
 
     return 0L;
@@ -368,7 +368,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ )
 
 //-------------------------------------------------------------------------
 
-SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
+SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
                                             SfxBindings& rBindings ) :
             SfxControllerItem   ( nId_, rBindings ),
             rBmpMask            ( rMask)
@@ -377,7 +377,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
                                          const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_BMPMASK_EXEC ) && pItem )
@@ -392,7 +392,7 @@ void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
 
 //-------------------------------------------------------------------------
 
-SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, USHORT nId,
+SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId,
                                               SfxBindings* pBindings,
                                               SfxChildWinInfo* pInfo ) :
         SfxChildWindow( pParent_, nId )
@@ -418,6 +418,10 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
         aBtnExec			( this, BMP_RESID( BTN_EXEC ) ),
         aGrpQ				( this, BMP_RESID( GRP_Q ) ),
 
+        aFt1				( this, BMP_RESID ( FT_1 ) ),
+        aFt2				( this, BMP_RESID ( FT_2 ) ),
+        aFt3				( this, BMP_RESID ( FT_3 ) ),
+
         aCbx1				( this, BMP_RESID( CBX_1 ) ),
         pQSet1				( new MaskSet( this, BMP_RESID( QCOL_1 ) ) ),
         aSp1				( this, BMP_RESID( SP_1 ) ),
@@ -441,9 +445,6 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
         pData				( new MaskData( this, *pBindinx ) ),
         aCbxTrans			( this, BMP_RESID( CBX_TRANS ) ),
         aLbColorTrans		( this, BMP_RESID ( LB_TRANS ) ),
-        aFt1				( this, BMP_RESID ( FT_1 ) ),
-        aFt2				( this, BMP_RESID ( FT_2 ) ),
-        aFt3				( this, BMP_RESID ( FT_3 ) ),
         pColTab				( NULL ),
         aPipetteColor		( COL_WHITE ),
         aSelItem			( SID_BMPMASK_EXEC, *this, *pBindinx ),
@@ -504,6 +505,42 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
     pQSet2->Show();
     pQSet3->Show();
     pQSet4->Show();
+
+    aCbx1.SetAccessibleRelationMemberOf( &aGrpQ );
+    pQSet1->SetAccessibleRelationMemberOf( &aGrpQ );
+    aSp1.SetAccessibleRelationMemberOf( &aGrpQ );
+    aLbColor1.SetAccessibleRelationMemberOf( &aGrpQ );
+    aCbx1.SetAccessibleRelationLabeledBy( &aFt1 );
+    pQSet1->SetAccessibleRelationLabeledBy( &aFt1 );
+    aSp1.SetAccessibleRelationLabeledBy( &aFt2 );
+    aLbColor1.SetAccessibleRelationLabeledBy( &aFt3 );
+    aCbx2.SetAccessibleRelationMemberOf( &aGrpQ );
+    pQSet2->SetAccessibleRelationMemberOf( &aGrpQ );
+    aSp2.SetAccessibleRelationMemberOf( &aGrpQ );
+    aLbColor2.SetAccessibleRelationMemberOf( &aGrpQ );
+    aCbx2.SetAccessibleRelationLabeledBy( &aFt1 );
+    pQSet2->SetAccessibleRelationLabeledBy( &aFt1 );
+    aSp2.SetAccessibleRelationLabeledBy( &aFt2 );
+    aLbColor2.SetAccessibleRelationLabeledBy( &aFt3 );
+    aCbx3.SetAccessibleRelationMemberOf( &aGrpQ );
+    pQSet3->SetAccessibleRelationMemberOf( &aGrpQ );
+    aSp3.SetAccessibleRelationMemberOf( &aGrpQ );
+    aLbColor3.SetAccessibleRelationMemberOf( &aGrpQ );
+    aCbx3.SetAccessibleRelationLabeledBy( &aFt1 );
+    pQSet3->SetAccessibleRelationLabeledBy( &aFt1 );
+    aSp3.SetAccessibleRelationLabeledBy( &aFt2 );
+    aLbColor3.SetAccessibleRelationLabeledBy( &aFt3 );
+    aCbx4.SetAccessibleRelationMemberOf( &aGrpQ );
+    pQSet4->SetAccessibleRelationMemberOf( &aGrpQ );
+    aSp4.SetAccessibleRelationMemberOf( &aGrpQ );
+    aLbColor4.SetAccessibleRelationMemberOf( &aGrpQ );
+    aCbx4.SetAccessibleRelationLabeledBy( &aFt1 );
+    pQSet4->SetAccessibleRelationLabeledBy( &aFt1 );
+    aSp4.SetAccessibleRelationLabeledBy( &aFt2 );
+    aLbColor4.SetAccessibleRelationLabeledBy( &aFt3 );
+    aLbColorTrans.SetAccessibleRelationLabeledBy( &aCbxTrans );
+    aLbColorTrans.SetAccessibleRelationMemberOf( &aGrpQ );
+    aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ );
 }
 
 //-------------------------------------------------------------------------
@@ -539,9 +576,9 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::Close()
+sal_Bool SvxBmpMask::Close()
 {
-    SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, FALSE );
+    SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False );
     GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L );
 
     return SfxDockingWindow::Close();
@@ -549,7 +586,7 @@ BOOL SvxBmpMask::Close()
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::NeedsColorTable() const
+sal_Bool SvxBmpMask::NeedsColorTable() const
 {
     return ( aLbColor1.GetEntryCount() == 0 );
 }
@@ -599,36 +636,36 @@ void SvxBmpMask::PipetteClicked()
 {
     if( pQSet1->GetSelectItemId() == 1 )
     {
-        aCbx1.Check( TRUE );
+        aCbx1.Check( sal_True );
         pData->CbxHdl( &aCbx1 );
         pQSet1->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet2->GetSelectItemId() == 1 )
     {
-        aCbx2.Check( TRUE );
+        aCbx2.Check( sal_True );
         pData->CbxHdl( &aCbx2 );
         pQSet2->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet3->GetSelectItemId() == 1 )
     {
-        aCbx3.Check( TRUE );
+        aCbx3.Check( sal_True );
         pData->CbxHdl( &aCbx3 );
         pQSet3->SetItemColor( 1, aPipetteColor );
     }
     else if( pQSet4->GetSelectItemId() == 1 )
     {
-        aCbx4.Check( TRUE );
+        aCbx4.Check( sal_True );
         pData->CbxHdl( &aCbx4 );
         pQSet4->SetItemColor( 1, aPipetteColor );
     }
 
-    aTbxPipette.CheckItem( TBI_PIPETTE, FALSE );
+    aTbxPipette.CheckItem( TBI_PIPETTE, sal_False );
     pData->PipetteHdl( &aTbxPipette );
 }
 
 //-------------------------------------------------------------------------
 
-void SvxBmpMask::SetExecState( BOOL bEnable )
+void SvxBmpMask::SetExecState( sal_Bool bEnable )
 {
     pData->SetExecState( bEnable );
 
@@ -640,36 +677,36 @@ void SvxBmpMask::SetExecState( BOOL bEnable )
 
 //-------------------------------------------------------------------------
 
-USHORT SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, ULONG* pTols )
+sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols )
 {
-    USHORT  nCount = 0;
+    sal_uInt16  nCount = 0;
 
     if ( aCbx1.IsChecked() )
     {
         pSrcCols[nCount] = pQSet1->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor1.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp1.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp1.GetValue());
     }
 
     if ( aCbx2.IsChecked() )
     {
         pSrcCols[nCount] = pQSet2->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor2.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp2.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp2.GetValue());
     }
 
     if ( aCbx3.IsChecked() )
     {
         pSrcCols[nCount] = pQSet3->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor3.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp3.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp3.GetValue());
     }
 
     if ( aCbx4.IsChecked() )
     {
         pSrcCols[nCount] = pQSet4->GetItemColor( 1 );
         pDstCols[nCount] = aLbColor4.GetSelectEntryColor();
-        pTols[nCount++] = static_cast<ULONG>(aSp4.GetValue());
+        pTols[nCount++] = static_cast<sal_uIntPtr>(aSp4.GetValue());
     }
 
     return nCount;
@@ -682,8 +719,8 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
     Bitmap			aBitmap( rBitmap );
     Color			pSrcCols[4];
     Color			pDstCols[4];
-    ULONG			pTols[4];
-    const USHORT	nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+    sal_uIntPtr			pTols[4];
+    const sal_uInt16	nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
 
     EnterWait();
     aBitmap.Replace( pSrcCols, pDstCols, nCount, pTols );
@@ -724,11 +761,11 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation )
     Animation	aAnimation( rAnimation );
     Color		pSrcCols[4];
     Color		pDstCols[4];
-    ULONG		pTols[4];
+    sal_uIntPtr		pTols[4];
     InitColorArrays( pSrcCols, pDstCols, pTols );
-    USHORT		nAnimationCount = aAnimation.Count();
+    sal_uInt16		nAnimationCount = aAnimation.Count();
 
-    for( USHORT i = 0; i < nAnimationCount; i++ )
+    for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
     {
         AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
         aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx();
@@ -745,9 +782,9 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
     GDIMetaFile aMtf;
     Color		pSrcCols[4];
     Color		pDstCols[4];
-    ULONG		pTols[4];
-    USHORT      nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
-    BOOL		pTrans[4];
+    sal_uIntPtr		pTols[4];
+    sal_uInt16      nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+    sal_Bool		pTrans[4];
 
     // If no color is selected, we copy only the Mtf
     if( !nCount )
@@ -766,8 +803,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
         long*       pMaxG = new long[nCount];
         long*       pMinB = new long[nCount];
         long*       pMaxB = new long[nCount];
-        USHORT      i;
-        BOOL        bReplace;
+        sal_uInt16      i;
+        sal_Bool        bReplace;
 
         aMtf.SetPrefSize( rMtf.GetPrefSize() );
         aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() );
@@ -793,11 +830,11 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
         }
 
         // Investigate actions and if necessary replace colors
-        for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
+        for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
         {
             MetaAction* pAction = rMtf.GetAction( nAct );
 
-            bReplace = FALSE;
+            bReplace = sal_False;
 
             switch( pAction->GetType() )
             {
@@ -1024,9 +1061,9 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color
 Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor )
 {
     Animation	aAnimation( rAnim );
-    USHORT		nAnimationCount = aAnimation.Count();
+    sal_uInt16		nAnimationCount = aAnimation.Count();
 
-    for( USHORT i = 0; i < nAnimationCount; i++ )
+    for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
     {
         AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
         aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor );
@@ -1044,9 +1081,9 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
     GDIMetaFile		aMtf;
     const MapMode&	rPrefMap = rMtf.GetPrefMapMode();
     const Size&		rPrefSize = rMtf.GetPrefSize();
-    const ULONG		nActionCount = rMtf.GetActionCount();
+    const sal_uIntPtr		nActionCount = rMtf.GetActionCount();
 
-    aVDev.EnableOutput( FALSE );
+    aVDev.EnableOutput( sal_False );
     aMtf.Record( &aVDev );
     aMtf.SetPrefSize( rPrefSize );
     aMtf.SetPrefMapMode( rPrefMap );
@@ -1056,7 +1093,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
     // retrieve one action at the time; first
     // set the whole area to the replacement color.
     aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) );
-    for ( ULONG i = 0; i < nActionCount; i++ )
+    for ( sal_uIntPtr i = 0; i < nActionCount; i++ )
     {
         MetaAction* pAct = rMtf.GetAction( i );
 
@@ -1107,13 +1144,13 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
                 {
                     Color	pSrcCols[4];
                     Color	pDstCols[4];
-                    ULONG	pTols[4];
-                    USHORT	nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+                    sal_uIntPtr	pTols[4];
+                    sal_uInt16	nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
 
                     if( nCount )
                     {
                         // first set all transparent colors
-                        for( USHORT i = 0; i < nCount; i++ )
+                        for( sal_uInt16 i = 0; i < nCount; i++ )
                         {
                             // Do we have a transparent color?
                             if( pDstCols[i] == TRANSP_COL )
@@ -1178,7 +1215,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
 
 //-------------------------------------------------------------------------
 
-BOOL SvxBmpMask::IsEyedropping() const
+sal_Bool SvxBmpMask::IsEyedropping() const
 {
     return aTbxPipette.IsItemChecked( TBI_PIPETTE );
 }
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index bfcb6945fd..f18c83b3aa 100644..100755
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -51,7 +51,7 @@
 #define _XOUTBMP_STATICS_ONLY
 
 #include <svx/dialmgr.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
@@ -60,7 +60,7 @@
 #include "contwnd.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <vcl/svapp.hxx>
 
 /******************************************************************************/
@@ -88,13 +88,13 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 
 /******************************************************************************/
 
-SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
+SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
             SfxControllerItem   ( _nId, rBindings ),
             rDlg				( rContourDlg )
 {
 }
 
-void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
+void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
 {
     if ( pItem && ( SID_CONTOUR_EXEC == nSID ) )
     {
@@ -109,7 +109,7 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons
 
 /******************************************************************************/
 
-SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId,
+SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId,
                                                     SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
             SfxChildWindow( _pParent, nId )
 {
@@ -124,7 +124,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId
     pDlg->Initialize( pInfo );
 }
 
-void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                                  const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     if ( SfxViewFrame::Current() &&
@@ -146,10 +146,10 @@ SvxContourDlg::~SvxContourDlg()
 
 PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
                                               const Rectangle* pRect,
-                                              const ULONG nFlags )
+                                              const sal_uIntPtr nFlags )
 {
     Bitmap	aBmp;
-    ULONG	nContourFlags = XOUTBMP_CONTOUR_HORZ;
+    sal_uIntPtr	nContourFlags = XOUTBMP_CONTOUR_HORZ;
 
     if ( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -160,14 +160,14 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
             PolyPolygon			aAnimPolyPoly;
             const Animation		aAnim( rGraphic.GetAnimation() );
             const Size&			rSizePix = aAnim.GetDisplaySizePixel();
-            const USHORT		nCount = aAnim.Count();
+            const sal_uInt16		nCount = aAnim.Count();
 
             if ( aVDev.SetOutputSizePixel( rSizePix ) )
             {
                 aVDev.SetLineColor( Color( COL_BLACK ) );
                 aVDev.SetFillColor( Color( COL_BLACK ) );
 
-                for( USHORT i = 0; i < nCount; i++ )
+                for( sal_uInt16 i = 0; i < nCount; i++ )
                 {
                     const AnimationBitmap& rStepBmp = aAnim.Get( i );
 
@@ -235,7 +235,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
     const Size		aGrfSize( rGraphic.GetPrefSize() );
     Size			aOrgSize;
     Point			aNewPoint;
-    BOOL			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+    sal_Bool			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
     if ( bPixelMap )
         aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap );
@@ -247,11 +247,11 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
         double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
         double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
 
-        for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
+        for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
         {
             Polygon& rPoly = rContour[ j ];
 
-            for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+            for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
             {
                 if ( bPixelMap )
                     aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap  );
@@ -267,7 +267,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
 // Loop through to super class, no virtual Methods to not become incompatible
 // due to IF changes
 
-void SvxContourDlg::SetExecState( BOOL bEnable )
+void SvxContourDlg::SetExecState( sal_Bool bEnable )
 {
     pSuperClass->SetExecState( bEnable );
 }
@@ -277,7 +277,7 @@ void SvxContourDlg::SetGraphic( const Graphic& rGraphic )
     pSuperClass->SetGraphic( rGraphic );
 }
 
-void SvxContourDlg::SetGraphicLinked( BOOL bGraphicLinked )
+void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
 {
     pSuperClass->SetGraphicLinked( bGraphicLinked );
 }
@@ -287,7 +287,7 @@ const Graphic& SvxContourDlg::GetGraphic() const
     return pSuperClass->GetGraphic();
 }
 
-BOOL SvxContourDlg::IsGraphicChanged() const
+sal_Bool SvxContourDlg::IsGraphicChanged() const
 {
     return pSuperClass->IsGraphicChanged();
 }
@@ -299,7 +299,7 @@ void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 
 PolyPolygon SvxContourDlg::GetPolyPolygon()
 {
-    return pSuperClass->GetPolyPolygon( TRUE );
+    return pSuperClass->GetPolyPolygon( sal_True );
 }
 
 void SvxContourDlg::SetEditingObject( void* pObj )
@@ -312,7 +312,7 @@ const void* SvxContourDlg::GetEditingObject() const
     return pSuperClass->GetEditingObject();
 }
 
-void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                             const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
@@ -328,8 +328,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
         aContourWnd			( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ),
         aStbStatus          ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
         nGrfChanged         ( 0UL ),
-        bExecState          ( FALSE ),
-        bGraphicLinked		( FALSE ),
+        bExecState          ( sal_False ),
+        bGraphicLinked		( sal_False ),
         maImageList			( SVX_RES( CD_IMAPDLG ) )
 {
     ApplyImageList();
@@ -408,9 +408,9 @@ void SvxSuperContourDlg::Resize()
 
 // Close methods
 
-BOOL SvxSuperContourDlg::Close()
+sal_Bool SvxSuperContourDlg::Close()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
     {
@@ -420,20 +420,20 @@ BOOL SvxSuperContourDlg::Close()
 
         if ( nRet == RET_YES )
         {
-            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
         else if ( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
-    return( bRet ? SfxFloatingWindow::Close() : FALSE );
+    return( bRet ? SfxFloatingWindow::Close() : sal_False );
 }
 
 // Enabled or disabled all Controls
 
-void SvxSuperContourDlg::SetExecState( BOOL bEnable )
+void SvxSuperContourDlg::SetExecState( sal_Bool bEnable )
 {
     bExecState = bEnable;
 }
@@ -454,13 +454,13 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
     const MapMode	aMap100( MAP_100TH_MM );
     const MapMode	aGrfMap( aGraphic.GetPrefMapMode() );
     OutputDevice*	pOutDev = Application::GetDefaultDevice();
-    BOOL			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+    sal_Bool			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
-    for ( USHORT j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
+    for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
     {
         Polygon& rPoly = aPolyPoly[ j ];
 
-        for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+        for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
         {
             Point& rPt = rPoly[ i ];
 
@@ -475,7 +475,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
     aContourWnd.GetSdrModel()->SetChanged( sal_True );
 }
 
-PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
+PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic )
 {
     PolyPolygon	aRetPolyPoly( aContourWnd.GetPolyPolygon() );
 
@@ -484,13 +484,13 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
         const MapMode	aMap100( MAP_100TH_MM );
         const MapMode	aGrfMap( aGraphic.GetPrefMapMode() );
         OutputDevice*	pOutDev = Application::GetDefaultDevice();
-        BOOL			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+        sal_Bool			bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
 
-        for ( USHORT j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
+        for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
         {
             Polygon& rPoly = aRetPolyPoly[ j ];
 
-            for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+            for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
             {
                 Point& rPt = rPoly[ i ];
 
@@ -505,7 +505,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
     return aRetPolyPoly;
 }
 
-void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked,
+void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked,
                                  const PolyPolygon* pPolyPoly, void* pEditingObj )
 {
     aUpdateGraphic = rGraphic;
@@ -520,12 +520,12 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL
     aUpdateTimer.Start();
 }
 
-BOOL SvxSuperContourDlg::IsUndoPossible() const
+sal_Bool SvxSuperContourDlg::IsUndoPossible() const
 {
     return aUndoGraphic.GetType() != GRAPHIC_NONE;
 }
 
-BOOL SvxSuperContourDlg::IsRedoPossible() const
+sal_Bool SvxSuperContourDlg::IsRedoPossible() const
 {
     return aRedoGraphic.GetType() != GRAPHIC_NONE;
 }
@@ -537,7 +537,7 @@ void SvxSuperContourDlg::DoAutoCreate()
 
 void SvxSuperContourDlg::ReducePoints( const long nTol )
 {
-    PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) );
+    PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) );
 
     if ( aPolyPoly.Count() )
     {
@@ -546,13 +546,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
         Polygon&		rPoly = aPolyPoly[ 0 ];
         OutputDevice*	pOutDev = Application::GetDefaultDevice();
         Point			aPtPix;
-        const USHORT	nSize = rPoly.GetSize();
-        USHORT			nCounter = 0;
+        const sal_uInt16	nSize = rPoly.GetSize();
+        sal_uInt16			nCounter = 0;
 
         if ( nSize )
             aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode );
 
-        for( USHORT i = 1; i < nSize; i++ )
+        for( sal_uInt16 i = 1; i < nSize; i++ )
         {
             const Point&	rNewPt = rPoly[ i ];
             const Point		aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) );
@@ -578,13 +578,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
 
 IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 {
-    USHORT nNewItemId = pTbx->GetCurItemId();
+    sal_uInt16 nNewItemId = pTbx->GetCurItemId();
 
     switch( pTbx->GetCurItemId() )
     {
         case( TBI_APPLY ):
         {
-            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
@@ -597,32 +597,32 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
                 QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) );
 
                 if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) )
-                    aContourWnd.SetWorkplaceMode( TRUE );
+                    aContourWnd.SetWorkplaceMode( sal_True );
                 else
-                    aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
+                    aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
             }
             else
-                aContourWnd.SetWorkplaceMode( FALSE );
+                aContourWnd.SetWorkplaceMode( sal_False );
         }
         break;
 
         case( TBI_SELECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
-            aContourWnd.SetEditMode( TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
+            aContourWnd.SetEditMode( sal_True );
         }
         break;
 
         case( TBI_RECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_RECT );
         }
         break;
 
         case( TBI_CIRCLE ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_CIRC );
 
         }
@@ -630,14 +630,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
         case( TBI_POLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_POLY );
         }
         break;
 
         case( TBI_FREEPOLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             aContourWnd.SetObjKind( OBJ_FREEFILL );
         }
         break;
@@ -664,7 +664,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
             aRedoGraphic = aGraphic;
             aGraphic = aUndoGraphic;
             aUndoGraphic = Graphic();
-            aContourWnd.SetGraphic( aGraphic, FALSE );
+            aContourWnd.SetGraphic( aGraphic, sal_False );
         }
         break;
 
@@ -674,7 +674,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
             aUndoGraphic = aGraphic;
             aGraphic = aRedoGraphic;
             aRedoGraphic = Graphic();
-            aContourWnd.SetGraphic( aGraphic, FALSE );
+            aContourWnd.SetGraphic( aGraphic, sal_False );
         }
         break;
 
@@ -684,7 +684,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
         case( TBI_PIPETTE ):
         {
-            BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+            sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
 
             if ( !bPipette )
                 aStbStatus.Invalidate();
@@ -694,7 +694,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 
                 if ( aQBox.Execute() != RET_YES )
                 {
-                    aTbx1.CheckItem( TBI_PIPETTE, bPipette = FALSE );
+                    aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False );
                     aStbStatus.Invalidate();
                 }
             }
@@ -760,7 +760,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
 
         aUpdateGraphic = Graphic();
         aUpdatePolyPoly = PolyPolygon();
-        bUpdateGraphicLinked = FALSE;
+        bUpdateGraphicLinked = sal_False;
 
         aContourWnd.GetSdrModel()->SetChanged( sal_False );
     }
@@ -776,7 +776,7 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
 
     const Rectangle	aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) );
     const Graphic&	rGraphic = aContourWnd.GetGraphic();
-    const BOOL		bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
+    const sal_Bool		bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
 
     EnterWait();
     SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) );
@@ -789,12 +789,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
 {
     const SdrObject*	pObj = pWnd->GetSelectedSdrObject();
     const SdrView*		pView = pWnd->GetSdrView();
-    const BOOL			bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
-    const BOOL			bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
-    const BOOL			bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
-    const BOOL			bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
-    const BOOL			bDontHide = !( bPipette || bWorkplace );
-    const BOOL			bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
+    const sal_Bool			bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+    const sal_Bool			bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
+    const sal_Bool			bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+    const sal_Bool			bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
+    const sal_Bool			bDontHide = !( bPipette || bWorkplace );
+    const sal_Bool			bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
 
     aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() );
 
@@ -819,7 +819,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
 
     if ( bPolyEdit )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
 
         switch( pWnd->GetPolyEditMode() )
         {
@@ -830,13 +830,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
             break;
         }
 
-        aTbx1.CheckItem( nId, TRUE );
+        aTbx1.CheckItem( nId, sal_True );
     }
     else
     {
-        aTbx1.CheckItem( TBI_POLYEDIT, FALSE );
-        aTbx1.CheckItem( TBI_POLYMOVE, TRUE );
-        aTbx1.CheckItem( TBI_POLYINSERT, FALSE );
+        aTbx1.CheckItem( TBI_POLYEDIT, sal_False );
+        aTbx1.CheckItem( TBI_POLYMOVE, sal_True );
+        aTbx1.CheckItem( TBI_POLYINSERT, sal_False );
         pWnd->SetPolyEditMode( 0 );
     }
 
@@ -889,7 +889,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
             if( !!aMask )
             {
                 QueryBox	aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) );
-                BOOL		bNewContour;
+                sal_Bool		bNewContour;
 
                 aRedoGraphic = Graphic();
                 aUndoGraphic = aGraphic;
@@ -907,8 +907,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
         LeaveWait();
     }
 
-    aTbx1.CheckItem( TBI_PIPETTE, FALSE );
-    pWnd->SetPipetteMode( FALSE );
+    aTbx1.CheckItem( TBI_PIPETTE, sal_False );
+    pWnd->SetPipetteMode( sal_False );
     aStbStatus.Invalidate();
 
     return 0L;
@@ -916,9 +916,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
 
 IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
 {
-    aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
-    aTbx1.CheckItem( TBI_SELECT, TRUE );
-    pWnd->SetWorkplaceMode( FALSE );
+    aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
+    aTbx1.CheckItem( TBI_SELECT, sal_True );
+    pWnd->SetWorkplaceMode( sal_False );
 
     return 0L;
 }
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index eaad8ea459..1a4d825679 100644..100755
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -27,7 +27,11 @@
 #define RID_SVXDLG_BMPMASK				(RID_SVX_BMPMASK_START)
 #define RID_SVXDLG_BMPMASK_STR_TRANSP	(RID_SVX_BMPMASK_START + 1)
 #define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR	(RID_SVX_BMPMASK_START + 2)
-
+/*IAccessibility2 Implementation 2009-----*/
+#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
+#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4)
+#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5)
+/*-----IAccessibility2 Implementation 2009*/
 #define GRP_Q 1
 #define CTR_PIPETTE 1
 #define CBX_1 1
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index b92a3626a7..0971a55647 100644..100755
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -37,7 +37,7 @@
  // RID_SVXDLG_BMPMASK ----------------------------------------------------
 DockingWindow RID_SVXDLG_BMPMASK
 {
-    HelpId = SID_BMPMASK ;
+    HelpId = CMD_SID_BMPMASK ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     CheckBox CBX_1
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1";
         Pos = MAP_APPFONT ( 12 , 50 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
@@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     MetricField SP_1
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 58 , 48 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     ListBox LB_1
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 93 , 48 ) ;
         Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     CheckBox CBX_2
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2";
         Pos = MAP_APPFONT ( 12 , 65 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
@@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     MetricField SP_2
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 58 , 63 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     ListBox LB_2
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 93 , 63 ) ;
         Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     CheckBox CBX_3
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3";
         Pos = MAP_APPFONT ( 12 , 80 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
@@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     MetricField SP_3
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 58, 78 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     ListBox LB_3
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 93 , 78 ) ;
         Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     CheckBox CBX_4
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4";
         Pos = MAP_APPFONT ( 12 , 95 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
@@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     MetricField SP_4
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 58 , 93 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK
     };
     ListBox LB_4
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 93 , 93 ) ;
         Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     CheckBox CBX_TRANS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS";
         Pos = MAP_APPFONT ( 12 , 110 ) ;
         Size = MAP_APPFONT ( 71 , 10 ) ;
         TabStop = TRUE ;
@@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     PushButton BTN_EXEC
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC";
         Pos = MAP_APPFONT ( 93 , 6 ) ;
         Size = MAP_APPFONT ( 64 , 14 ) ;
         Text [ en-US ] = "~Replace" ;
@@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK
 
     ListBox LB_TRANS
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 93 , 108 ) ;
         Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -274,7 +289,7 @@ DockingWindow RID_SVXDLG_BMPMASK
                     ImageBitmap = Bitmap { File = "sc10350.bmp" ; };
                     MASKCOLOR
                 };
-                Text [ en-US ] = "Eyedropper" ;
+                Text [ en-US ] = "Pipette" ;
             };
         };
     };
@@ -285,7 +300,7 @@ DockingWindow RID_SVXDLG_BMPMASK
         Pos = MAP_APPFONT ( 22 , 6 ) ;
         Size = MAP_APPFONT ( 43 , 14 ) ;
     };
-    Text [ en-US ] = "Eyedropper" ;
+    Text [ en-US ] = "Color Replacer" ;
 
     Image IMG_PIPETTE
     {
@@ -307,47 +322,16 @@ String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR
     Text [ en-US ] = "Source Color";
 };
 
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String RID_SVXDLG_BMPMASK_STR_PALETTE
+{
+    Text [ en-US ] = "Color Palette";
+};
+String RID_SVXDLG_BMPMASK_STR_TOLERANCE
+{
+    Text [ en-US ] = "Tolerance";
+};
+String RID_SVXDLG_BMPMASK_STR_REPLACEWITH
+{
+    Text [ en-US ] = "Replace with";
+};
 
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index df7d2affe2..57b508ddba 100644..100755
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -82,11 +82,11 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
 
     SetStyle( GetStyle() | WB_CLIPCHILDREN );
     aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) );
-    aVscrollSB.EnableDrag( TRUE );
+    aVscrollSB.EnableDrag( sal_True );
     // other settings like aVscroll depend on selected font => see SetFont
 
-    bDrag = FALSE;
-    InitSettings( TRUE, TRUE );
+    bDrag = sal_False;
+    InitSettings( sal_True, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -94,7 +94,7 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
 void SvxShowCharSet::GetFocus()
 {
     Control::GetFocus();
-    SelectIndex( nSelectedIndex, TRUE );
+    SelectIndex( nSelectedIndex, sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -102,7 +102,7 @@ void SvxShowCharSet::GetFocus()
 void SvxShowCharSet::LoseFocus()
 {
     Control::LoseFocus();
-    SelectIndex( nSelectedIndex, FALSE );
+    SelectIndex( nSelectedIndex, sal_False );
 }
 
 // -----------------------------------------------------------------------
@@ -110,9 +110,9 @@ void SvxShowCharSet::LoseFocus()
 void SvxShowCharSet::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Control::StateChanged( nType );
 }
@@ -123,7 +123,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS )
       && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Control::DataChanged( rDCEvt );
 }
@@ -137,7 +137,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt )
         if ( rMEvt.GetClicks() == 1 )
         {
             GrabFocus();
-            bDrag = TRUE;
+            bDrag = sal_True;
             CaptureMouse();
 
             int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() );
@@ -159,7 +159,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt )
         if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel()))
             aSelectHdl.Call( this );
         ReleaseMouse();
-        bDrag = FALSE;
+        bDrag = sal_False;
     }
 }
 
@@ -196,14 +196,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt )
 
 // -----------------------------------------------------------------------------
 
-USHORT SvxShowCharSet::GetRowPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const
 {
     return _nPos / COLUMN_COUNT ;
 }
 
 // -----------------------------------------------------------------------------
 
-USHORT SvxShowCharSet::GetColumnPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const
 {
     return _nPos % COLUMN_COUNT ;
 }
@@ -222,9 +222,9 @@ int SvxShowCharSet::FirstInView( void ) const
 
 int SvxShowCharSet::LastInView( void ) const
 {
-    ULONG nIndex = FirstInView();
+    sal_uIntPtr nIndex = FirstInView();
     nIndex += ROW_COUNT * COLUMN_COUNT - 1;
-    ULONG nCompare = sal::static_int_cast<ULONG>( maFontCharMap.GetCharCount() - 1 );
+    sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>( maFontCharMap.GetCharCount() - 1 );
     if( nIndex > nCompare )
         nIndex = nCompare;
     return nIndex;
@@ -311,7 +311,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt )
 
     if ( tmpSelected >= 0 )
     {
-        SelectIndex( tmpSelected, TRUE );
+        SelectIndex( tmpSelected, sal_True );
         aPreSelectHdl.Call( this );
     }
 }
@@ -441,7 +441,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -487,12 +487,12 @@ void SvxShowCharSet::SetFont( const Font& rFont )
     aFont.SetAlign( ALIGN_TOP );
     int nFontHeight = (aOrigSize.Height() - 5) * 2 / (3 * ROW_COUNT);
     aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     Control::SetFont( aFont );
     GetFontCharMap( maFontCharMap );
 
     // hide scrollbar when there is nothing to scroll
-    BOOL bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
+    sal_Bool bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
 
     nX = (aOrigSize.Width() - (bNeedVscroll ? SBWIDTH : 0)) / COLUMN_COUNT;
     nY = aOrigSize.Height() / ROW_COUNT;
@@ -523,7 +523,7 @@ void SvxShowCharSet::SetFont( const Font& rFont )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
+void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus )
 {
     if( nNewIndex < 0 )
     {
@@ -608,7 +608,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
 
 // -----------------------------------------------------------------------
 
-void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, BOOL bFocus )
+void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
 {
     // get next available char of current font
     sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 );
@@ -679,7 +679,7 @@ void SvxShowCharSet::ReleaseAccessible()
     if ( aFind == m_aItems.end() )
     {
         OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?");
-        aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< USHORT >(_nPos)))).first;
+        aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first;
         rtl::OUStringBuffer buf;
         buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) );
         aFind->second->maText = buf.makeStringAndClear();
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 7d7f97518c..7422365b18 100644..100755
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -87,17 +87,17 @@ void SvxCheckListBox::Init_Impl()
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos,
+void SvxCheckListBox::InsertEntry( const String& rStr, sal_uInt16 nPos,
                                    void* pUserData,
                                    SvLBoxButtonKind eButtonKind )
 {
-    SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData,
+    SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData,
                                 eButtonKind );
 }
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::RemoveEntry( USHORT nPos )
+void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
 {
     if ( nPos < GetEntryCount() )
         SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) );
@@ -105,7 +105,7 @@ void SvxCheckListBox::RemoveEntry( USHORT nPos )
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
+void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
 {
     if ( nPos < GetEntryCount() )
         Select( GetEntry( nPos ), bSelect );
@@ -113,18 +113,18 @@ void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCheckListBox::GetSelectEntryPos() const
+sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
 {
     SvLBoxEntry* pEntry = GetCurEntry();
 
     if ( pEntry )
-        return (USHORT)GetModel()->GetAbsPos( pEntry );
+        return (sal_uInt16)GetModel()->GetAbsPos( pEntry );
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
 // -----------------------------------------------------------------------
 
-String SvxCheckListBox::GetText( USHORT nPos ) const
+String SvxCheckListBox::GetText( sal_uInt16 nPos ) const
 {
     SvLBoxEntry* pEntry = GetEntry( nPos );
 
@@ -135,12 +135,12 @@ String SvxCheckListBox::GetText( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-USHORT SvxCheckListBox::GetCheckedEntryCount() const
+sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
 {
-    USHORT nCheckCount = 0;
-    USHORT nCount = (USHORT)GetEntryCount();
+    sal_uInt16 nCheckCount = 0;
+    sal_uInt16 nCount = (sal_uInt16)GetEntryCount();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
     {
         if ( IsChecked( i ) )
             nCheckCount++;
@@ -150,7 +150,7 @@ USHORT SvxCheckListBox::GetCheckedEntryCount() const
 
 // -----------------------------------------------------------------------
 
-void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
+void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
 {
     if ( nPos < GetEntryCount() )
         SetCheckButtonState(
@@ -160,17 +160,17 @@ void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxCheckListBox::IsChecked( USHORT nPos ) const
+sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
 {
     if ( nPos < GetEntryCount() )
         return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED);
     else
-        return FALSE;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void* SvxCheckListBox::SetEntryData	( USHORT nPos, void* pNewData )
+void* SvxCheckListBox::SetEntryData	( sal_uInt16 nPos, void* pNewData )
 {
     void* pOld = NULL;
 
@@ -184,7 +184,7 @@ void* SvxCheckListBox::SetEntryData	( USHORT nPos, void* pNewData )
 
 // -----------------------------------------------------------------------
 
-void* SvxCheckListBox::GetEntryData( USHORT nPos ) const
+void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
 {
     if ( nPos < GetEntryCount() )
         return GetEntry( nPos )->GetUserData();
@@ -216,13 +216,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
 
         if ( pEntry )
         {
-            BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() );
 
             if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON )
             {
                 SvTreeListBox::MouseButtonDown( rMEvt );
-                Select( pEntry, TRUE );
+                Select( pEntry, sal_True );
                 return;
             }
             else
@@ -257,7 +257,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 
         if ( pEntry )
         {
-            BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             ToggleCheckButton( pEntry );
             if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
                 CheckButtonHdl();
@@ -269,7 +269,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 
 // -----------------------------------------------------------------------
 
-SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
 {
     return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind );
 }
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 6f410b356c..f4e3a7d45f 100644..100755
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -38,9 +38,9 @@
 
 #include <svx/svdpage.hxx> // SdrObjList
 
-#include "connctrl.hxx"
+#include "svx/connctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 
@@ -69,33 +69,33 @@ void SvxXConnectionPreview::Construct()
     DBG_ASSERT( pView, "No valid view is passed on! ");
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uIntPtr nMarkCount = rMarkList.GetMarkCount();
 
     if( nMarkCount >= 1 )
     {
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
 
 
-        for( USHORT i = 0; i < nMarkCount && !bFound; i++ )
+        for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ )
         {
             pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
-            UINT32 nInv = pObj->GetObjInventor();
-            UINT16 nId = pObj->GetObjIdentifier();
+            sal_uInt32 nInv = pObj->GetObjInventor();
+            sal_uInt16 nId = pObj->GetObjIdentifier();
             if( nInv == SdrInventor && nId == OBJ_EDGE )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj;
                 pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
 
-                SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( TRUE );
-                SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( FALSE );
+                SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True );
+                SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False );
 
-                rConn1 = pTmpEdgeObj->GetConnection( TRUE );
-                rConn2 = pTmpEdgeObj->GetConnection( FALSE );
+                rConn1 = pTmpEdgeObj->GetConnection( sal_True );
+                rConn2 = pTmpEdgeObj->GetConnection( sal_False );
 
-                SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE );
-                SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE );
+                SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True );
+                SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False );
 
                 // potential memory leak here (!). Create SdrObjList only when there is
                 // not yet one.
@@ -108,13 +108,13 @@ void SvxXConnectionPreview::Construct()
                 {
                     SdrObject* pObj1 = pTmpObj1->Clone();
                     pObjList->InsertObject( pObj1 );
-                    pEdgeObj->ConnectToNode( TRUE, pObj1 );
+                    pEdgeObj->ConnectToNode( sal_True, pObj1 );
                 }
                 if( pTmpObj2 )
                 {
                     SdrObject* pObj2 = pTmpObj2->Clone();
                     pObjList->InsertObject( pObj2 );
-                    pEdgeObj->ConnectToNode( FALSE, pObj2 );
+                    pEdgeObj->ConnectToNode( sal_False, pObj2 );
                 }
                 pObjList->InsertObject( pEdgeObj );
             }
@@ -223,7 +223,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs )
 
 // Get number of lines which are offset based on the preview object
 
-USHORT SvxXConnectionPreview::GetLineDeltaAnz()
+sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz()
 {
     const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet();
     sal_uInt16 nCount(0);
@@ -236,9 +236,9 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz()
 
 void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    BOOL bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
-    BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
-    BOOL bCtrl	  = rMEvt.IsMod1();
+    sal_Bool bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
+    sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+    sal_Bool bCtrl	  = rMEvt.IsMod1();
 
     if( bZoomIn || bZoomOut )
     {
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index 1cbe9ba62f..1cbe9ba62f 100644..100755
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index a5d9599aef..e50aae0056 100644..100755
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -33,6 +33,7 @@
  // RID_SVXDLG_CONTOUR ----------------------------------------------------
 FloatingWindow RID_SVXDLG_CONTOUR
 {
+    HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR";
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -169,13 +170,14 @@ FloatingWindow RID_SVXDLG_CONTOUR
             {
                 Identifier = TBI_PIPETTE ;
                 HelpId = HID_CONTDLG_PIPETTE ;
-                Text [ en-US ] = "Eyedropper" ;
+                Text [ en-US ] = "Pipette" ;
                 AutoCheck = TRUE ;
             };
         };
     };
     MetricField MTF_TOLERANCE
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 0 , 0 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 74b81837fb..9d2fa9ef93 100644..100755
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -54,16 +54,16 @@ class SvxSuperContourDlg : public SvxContourDlg
     MetricField			aMtfTolerance;
     ContourWindow		aContourWnd;
     StatusBar			aStbStatus;
-    ULONG				nGrfChanged;
-    BOOL				bExecState;
-    BOOL				bPipetteMode;
-    BOOL				bWorkplaceMode;
-    BOOL				bUpdateGraphicLinked;
-    BOOL				bGraphicLinked;
+    sal_uIntPtr				nGrfChanged;
+    sal_Bool				bExecState;
+    sal_Bool				bPipetteMode;
+    sal_Bool				bWorkplaceMode;
+    sal_Bool				bUpdateGraphicLinked;
+    sal_Bool				bGraphicLinked;
     ImageList			maImageList;
 
     virtual	void		Resize();
-    virtual BOOL 		Close();
+    virtual sal_Bool 		Close();
 
     void				DoAutoCreate();
     void				ReducePoints( const long nTol = 8 );
@@ -85,23 +85,23 @@ public:
                                             Window* pParent, const ResId& rResId );
                         ~SvxSuperContourDlg();
 
-    void				SetExecState( BOOL bEnable );
+    void				SetExecState( sal_Bool bEnable );
 
     void				SetGraphic( const Graphic& rGraphic );
-    void				SetGraphicLinked( BOOL bLinked ) { bGraphicLinked = bLinked; }
+    void				SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; }
     const Graphic&		GetGraphic() const { return aGraphic; }
-    BOOL				IsGraphicChanged() const { return nGrfChanged > 0UL; }
+    sal_Bool				IsGraphicChanged() const { return nGrfChanged > 0UL; }
 
     void				SetPolyPolygon( const PolyPolygon& rPolyPoly );
-    PolyPolygon			GetPolyPolygon( BOOL bRescaleToGraphic = TRUE );
+    PolyPolygon			GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True );
 
     void				SetEditingObject( void* pObj ) { pCheckObj = pObj; }
     const void*			GetEditingObject() const { return pCheckObj; }
 
-    BOOL				IsUndoPossible() const;
-    BOOL				IsRedoPossible() const;
+    sal_Bool				IsUndoPossible() const;
+    sal_Bool				IsRedoPossible() const;
 
-    void				UpdateGraphic( const Graphic& rGraphic, BOOL bGraphicLinked,
+    void				UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked,
                                 const PolyPolygon* pPolyPoly = NULL,
                                 void* pEditingObj = NULL );
 
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index b42dda058e..997df95ac6 100644..100755
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <contdlg.hrc>
@@ -41,16 +41,16 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 // #i75482#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 #define TRANSCOL Color( COL_WHITE )
 
 ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
             GraphCtrl		( pParent, rResId ),
             aWorkRect		( 0, 0, 0, 0 ),
-            bPipetteMode	( FALSE ),
-            bWorkplaceMode	( FALSE ),
-            bClickValid		( FALSE )
+            bPipetteMode	( sal_False ),
+            bWorkplaceMode	( sal_False ),
+            bClickValid		( sal_False )
 {
     SetWinStyle( WB_SDRMODE );
 }
@@ -62,7 +62,7 @@ ContourWindow::~ContourWindow()
 void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 {
     SdrPage*		pPage = (SdrPage*) pModel->GetPage( 0 );
-    const USHORT	nPolyCount = rPolyPoly.Count();
+    const sal_uInt16	nPolyCount = rPolyPoly.Count();
 
     // First delete all drawing objects
     aPolyPoly = rPolyPoly;
@@ -73,7 +73,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
 
     pPage->Clear();
 
-    for ( USHORT i = 0; i < nPolyCount; i++ )
+    for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
     {
         basegfx::B2DPolyPolygon aPolyPolygon;
         aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon());
@@ -134,7 +134,7 @@ void ContourWindow::InitSdrModel()
     aSet.Put( XFillColorItem( String(), TRANSCOL ) );
     aSet.Put( XFillTransparenceItem( 50 ) );
     pView->SetAttributes( aSet );
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
 }
 
 void ContourWindow::SdrObjCreated( const SdrObject&  )
@@ -143,10 +143,10 @@ void ContourWindow::SdrObjCreated( const SdrObject&  )
     pView->CombineMarkedObjects( sal_False );
 }
 
-BOOL ContourWindow::IsContourChanged() const
+sal_Bool ContourWindow::IsContourChanged() const
 {
     SdrPage*	pPage = (SdrPage*) pModel->GetPage( 0 );
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if ( pPage && pPage->GetObjCount() )
         bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged();
@@ -163,7 +163,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
         SetPolyPolygon( PolyPolygon() );
         aWorkRect = Rectangle( aLogPt, aLogPt );
         Paint( Rectangle( Point(), GetGraphicSize() ) );
-        SetEditMode( TRUE );
+        SetEditMode( sal_True );
     }
 
     if ( !bPipetteMode )
@@ -172,7 +172,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
 void ContourWindow::MouseMove( const MouseEvent& rMEvt )
 {
-    bClickValid = FALSE;
+    bClickValid = sal_False;
 
     if ( bPipetteMode )
     {
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index fb6b963f28..d27597bdcb 100644..100755
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -40,9 +40,9 @@ class ContourWindow : public GraphCtrl
     Link				aPipetteLink;
     Link				aPipetteClickLink;
     Link				aWorkplaceClickLink;
-    BOOL				bPipetteMode;
-    BOOL				bWorkplaceMode;
-    BOOL				bClickValid;
+    sal_Bool				bPipetteMode;
+    sal_Bool				bWorkplaceMode;
+    sal_Bool				bClickValid;
 
 protected:
 
@@ -63,15 +63,15 @@ public:
     void				SetPolyPolygon( const PolyPolygon& rPolyPoly );
     const PolyPolygon&	GetPolyPolygon();
 
-    void				SetPipetteMode( const BOOL bPipette ) { bPipetteMode = bPipette; }
-    BOOL				IsPipetteMode() const { return bPipetteMode; }
+    void				SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; }
+    sal_Bool				IsPipetteMode() const { return bPipetteMode; }
     const Color&		GetPipetteColor() const { return aPipetteColor; }
 
-    BOOL				IsClickValid() const { return bClickValid; }
-    BOOL				IsContourChanged() const;
+    sal_Bool				IsClickValid() const { return bClickValid; }
+    sal_Bool				IsContourChanged() const;
 
-    void				SetWorkplaceMode( const BOOL bWorkplace ) { bWorkplaceMode = bWorkplace; }
-    BOOL				IsWorkplaceMode() const { return bWorkplaceMode; }
+    void				SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
+    sal_Bool				IsWorkplaceMode() const { return bWorkplaceMode; }
     const Rectangle&	GetWorkRect() const { return aWorkRect; }
 
     void				SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 68580c6710..4c5db4a756 100644..100755
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -47,7 +47,7 @@
 //	Local Defines and Function
 //----------------------------------------------------------------------------
 
-inline void EnableDisable( Window& rWin, BOOL bEnable )
+inline void EnableDisable( Window& rWin, sal_Bool bEnable )
 {
     if (bEnable)
         rWin.Enable();
@@ -68,7 +68,7 @@ static long nStaticTabs[]=
 
 RedlinData::RedlinData()
 {
-    bDisabled=FALSE;
+    bDisabled=sal_False;
     pData=NULL;
 }
 RedlinData::~RedlinData()
@@ -97,7 +97,7 @@ SvxRedlinEntry::~SvxRedlinEntry()
 
 DBG_NAME(SvLBoxColorString);
 
-SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr,
+SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr,
                                     const Color& rCol)
 
 : SvLBoxString( pEntry, nFlags, rStr )
@@ -125,7 +125,7 @@ SvLBoxItem* SvLBoxColorString::Create() const
 }
 
 void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
-                             USHORT nFlags,	SvLBoxEntry* pEntry )
+                             sal_uInt16 nFlags,	SvLBoxEntry* pEntry )
 /* [Description]
 
    Paint function of the SvLBoxColorString class. The relevant text with the
@@ -150,10 +150,10 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
 SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
         SvxSimpleTable(pParent,nBits )
 {
-    bAuthor=FALSE;
-    bDate=FALSE;
-    bIsCalc=FALSE;
-    bComment=FALSE;
+    bAuthor=sal_False;
+    bDate=sal_False;
+    bIsCalc=sal_False;
+    bComment=sal_False;
     nDatePos=WRITER_DATE;
     pCommentSearcher=NULL;
     SetNodeDefaultImages();
@@ -162,10 +162,10 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
 SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId):
         SvxSimpleTable(pParent,rResId)
 {
-    bAuthor=FALSE;
-    bDate=FALSE;
-    bIsCalc=FALSE;
-    bComment=FALSE;
+    bAuthor=sal_False;
+    bDate=sal_False;
+    bIsCalc=sal_False;
+    bComment=sal_False;
     nDatePos=WRITER_DATE;
     pCommentSearcher=NULL;
     SetNodeDefaultImages();
@@ -218,7 +218,7 @@ StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
 
     return eCompare;
 }
-void SvxRedlinTable::SetCalcView(BOOL bFlag)
+void SvxRedlinTable::SetCalcView(sal_Bool bFlag)
 {
     bIsCalc=bFlag;
     if(bFlag)
@@ -235,7 +235,7 @@ void SvxRedlinTable::SetCalcView(BOOL bFlag)
 void SvxRedlinTable::UpdateFilterTest()
 {
     Date aDateMax;
-    USHORT nYEAR=aDateMax.GetYear()+100;
+    sal_uInt16 nYEAR=aDateMax.GetYear()+100;
     aDateMax.SetYear(nYEAR);
     Date aDateMin(1,1,1989);
     Time aTMin(0);
@@ -276,12 +276,12 @@ void SvxRedlinTable::UpdateFilterTest()
 }
 
 
-void SvxRedlinTable::SetFilterDate(BOOL bFlag)
+void SvxRedlinTable::SetFilterDate(sal_Bool bFlag)
 {
     bDate=bFlag;
 }
 
-void SvxRedlinTable::SetDateTimeMode(USHORT nMode)
+void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode)
 {
     nDaTiMode=nMode;
 }
@@ -306,7 +306,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime)
     aDaTiLast.SetTime(aTime.GetTime());
 }
 
-void SvxRedlinTable::SetFilterAuthor(BOOL bFlag)
+void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag)
 {
     bAuthor=bFlag;
 }
@@ -316,7 +316,7 @@ void SvxRedlinTable::SetAuthor(const String &aString)
     aAuthor=aString;
 }
 
-void SvxRedlinTable::SetFilterComment(BOOL bFlag)
+void SvxRedlinTable::SetFilterComment(sal_Bool bFlag)
 {
     bComment=bFlag;
 }
@@ -331,18 +331,18 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
     }
 }
 
-BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     String aString=rString.GetToken(WRITER_AUTHOR,'\t');
     if(pUserData==NULL)
     {
         if(bAuthor)
         {
             if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=TRUE;
+                nTheFlag=sal_True;
             else
-                nTheFlag=FALSE;
+                nTheFlag=sal_False;
         }
     }
     else
@@ -353,18 +353,18 @@ BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserD
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     String aString=rString.GetToken(CALC_AUTHOR,'\t');
     if(pUserData==NULL)
     {
         if(bAuthor)
         {
             if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
-                nTheFlag=TRUE;
+                nTheFlag=sal_True;
             else
-                nTheFlag=FALSE;
+                nTheFlag=sal_False;
         }
     }
     else
@@ -375,7 +375,7 @@ BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserDat
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
                                   const DateTime *pDateTime,const String* pCommentStr)
 {
     bool nTheFlag=true;
@@ -404,15 +404,15 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
     if(bAuthor)
     {
         if(aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL)
-            nTheFlag=TRUE;
+            nTheFlag=sal_True;
         else
-            nTheFlag=FALSE;
+            nTheFlag=sal_False;
     }
     if(bDate && nTheFlag)
     {
@@ -428,7 +428,7 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDate
     return nTheFlag;
 }
 
-BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
+sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr)
 {
     bool nTheFlag=true;
 
@@ -443,7 +443,7 @@ BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
 }
 
 SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,
-                                SvLBoxEntry* pParent,ULONG nPos)
+                                SvLBoxEntry* pParent,sal_uIntPtr nPos)
 {
     aEntryColor=GetTextColor();
     if(pUserData!=NULL)
@@ -465,12 +465,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 
 }
 
 SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor,
-                                SvLBoxEntry* pParent,ULONG nPos)
+                                SvLBoxEntry* pParent,sal_uIntPtr nPos)
 {
     aEntryColor=aColor;
 
@@ -487,7 +487,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 }
 
 SvLBoxEntry* SvxRedlinTable::CreateEntry() const
@@ -518,11 +518,11 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
     XubString aToken;
 
     xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer();
-    USHORT nCurTokenLen;
+    sal_uInt16 nCurTokenLen;
     xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen );
-    USHORT nCount = TabCount(); nCount--;
+    sal_uInt16 nCount = TabCount(); nCount--;
 
-    for( USHORT nToken = 0; nToken < nCount; nToken++ )
+    for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
     {
         if( pCurToken && nCurTokenLen )
             aToken = XubString( pCurToken, nCurTokenLen );
@@ -562,6 +562,7 @@ SvxTPView::SvxTPView( Window * pParent)
     aTitle5		( SVX_RES( STR_TITLE5 ) ),
     aStrMyName	( SVX_RES( STR_VIEW) )
 {
+    aViewData.SetAccessibleName(String(SVX_RES(STR_TREE)));
     FreeResource();
 
     aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE);
@@ -646,32 +647,32 @@ void SvxTPView::InsertCalcHeader()
     aViewData.InsertHeaderEntry(aString);
 }
 
-void SvxTPView::EnableAccept(BOOL nFlag)
+void SvxTPView::EnableAccept(sal_Bool nFlag)
 {
     PbAccept.Enable(nFlag);
 }
 
-void SvxTPView::EnableAcceptAll(BOOL nFlag)
+void SvxTPView::EnableAcceptAll(sal_Bool nFlag)
 {
     PbAcceptAll.Enable(nFlag);
 }
 
-void SvxTPView::EnableReject(BOOL nFlag)
+void SvxTPView::EnableReject(sal_Bool nFlag)
 {
     PbReject.Enable(nFlag);
 }
 
-void SvxTPView::EnableRejectAll(BOOL nFlag)
+void SvxTPView::EnableRejectAll(sal_Bool nFlag)
 {
     PbRejectAll.Enable(nFlag);
 }
 
-void SvxTPView::ShowUndo(BOOL nFlag)
+void SvxTPView::ShowUndo(sal_Bool nFlag)
 {
     PbUndo.Show(nFlag);
 }
 
-void SvxTPView::EnableUndo(BOOL nFlag)
+void SvxTPView::EnableUndo(sal_Bool nFlag)
 {
     PbUndo.Enable(nFlag);
 }
@@ -681,7 +682,7 @@ Size SvxTPView::GetMinSizePixel()
     Size aSize=aMinSize;
     if(PbUndo.IsVisible())
     {
-        ULONG nSize=PbUndo.GetSizePixel().Width()
+        sal_uIntPtr nSize=PbUndo.GetSizePixel().Width()
                     +PbUndo.GetPosPixel().X()
                     +PbAccept.GetPosPixel().X();
 
@@ -752,12 +753,20 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aEdComment	( this, SVX_RES( ED_COMMENT) ),
     aActionStr  (       SVX_RES( STR_ACTION) ),
     aStrMyName  (       SVX_RES( STR_FILTER) ),
-    bModified   (FALSE)
-{
+    bModified   (sal_False)
+{
+    aLbDate.SetAccessibleName( String( SVX_RES( STR_DATE_COMBOX) ) );
+    aDfDate.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN) ) );
+    aTfDate.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN) ) );
+    aDfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN1) ) );
+    aTfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN1) ) );
+    aLbAuthor.SetAccessibleName(aCbAuthor.GetText());
+    aLbAction.SetAccessibleName( String( SVX_RES( STR_ACTION) ) );
+    aEdComment.SetAccessibleName(aCbComment.GetText());
     FreeResource();
 
-    aDfDate.SetShowDateCentury( TRUE );
-    aDfDate2.SetShowDateCentury( TRUE );
+    aDfDate.SetShowDateCentury( sal_True );
+    aDfDate2.SetShowDateCentury( sal_True );
 
     aRangeStr=aCbRange.GetText();
     aLbDate.SelectEntryPos(0);
@@ -797,7 +806,16 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aTfDate2.SetTime(aTime);
     HideRange();
     ShowAction();
-    bModified=FALSE;
+    bModified=sal_False;
+
+    aLbDate.SetAccessibleRelationLabeledBy(&aCbDate);
+    aLbAuthor.SetAccessibleRelationLabeledBy(&aCbAuthor);
+    aLbAction.SetAccessibleRelationLabeledBy(&aCbRange);
+    aEdRange.SetAccessibleRelationLabeledBy(&aCbRange);
+    aBtnRange.SetAccessibleRelationLabeledBy(&aCbRange);
+    aEdComment.SetAccessibleRelationLabeledBy(&aCbComment);
+    aDfDate2.SetAccessibleRelationLabeledBy(&aDfDate2);
+    aTfDate2.SetAccessibleRelationLabeledBy(&aTfDate2);
 }
 
 void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
@@ -810,7 +828,7 @@ String SvxTPFilter::GetMyName() const
     return aStrMyName;
 }
 
-void SvxTPFilter::DisableRange(BOOL bFlag)
+void SvxTPFilter::DisableRange(sal_Bool bFlag)
 {
     if(bFlag)
     {
@@ -826,43 +844,43 @@ void SvxTPFilter::DisableRange(BOOL bFlag)
     }
 }
 
-void SvxTPFilter::ShowDateFields(USHORT nKind)
+void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
 {
     String aEmpty;
     switch(nKind)
     {
         case FLT_DATE_BEFORE:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_SINCE:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_EQUAL:
-                EnableDateLine1(TRUE);
+                EnableDateLine1(sal_True);
                 aTfDate.Disable();
                 aTfDate.SetText(aEmpty);
-                EnableDateLine2(FALSE);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_NOTEQUAL:
-                EnableDateLine1(TRUE);
+                EnableDateLine1(sal_True);
                 aTfDate.Disable();
                 aTfDate.SetText(aEmpty);
-                EnableDateLine2(FALSE);
+                EnableDateLine2(sal_False);
                 break;
         case FLT_DATE_BETWEEN:
-                EnableDateLine1(TRUE);
-                EnableDateLine2(TRUE);
+                EnableDateLine1(sal_True);
+                EnableDateLine2(sal_True);
                 break;
         case FLT_DATE_SAVE:
-                EnableDateLine1(FALSE);
-                EnableDateLine2(FALSE);
+                EnableDateLine1(sal_False);
+                EnableDateLine2(sal_False);
                 break;
     }
 }
 
-void SvxTPFilter::EnableDateLine1(BOOL bFlag)
+void SvxTPFilter::EnableDateLine1(sal_Bool bFlag)
 {
     if(bFlag && aCbDate.IsChecked())
     {
@@ -877,7 +895,7 @@ void SvxTPFilter::EnableDateLine1(BOOL bFlag)
         aIbClock.Disable();
     }
 }
-void SvxTPFilter::EnableDateLine2(BOOL bFlag)
+void SvxTPFilter::EnableDateLine2(sal_Bool bFlag)
 {
     String aEmpty;
     if(bFlag && aCbDate.IsChecked())
@@ -939,22 +957,22 @@ void SvxTPFilter::SetLastTime(const Time &aTime)
     aTfDate2.SetTime(aTime);
 }
 
-void SvxTPFilter::SetDateMode(USHORT nMode)
+void SvxTPFilter::SetDateMode(sal_uInt16 nMode)
 {
     aLbDate.SelectEntryPos(nMode);
     SelDateHdl(&aLbDate);
 }
 
-USHORT SvxTPFilter::GetDateMode()
+sal_uInt16 SvxTPFilter::GetDateMode()
 {
-    return (USHORT) aLbDate.GetSelectEntryPos();
+    return (sal_uInt16) aLbDate.GetSelectEntryPos();
 }
 void SvxTPFilter::ClearAuthors()
 {
     aLbAuthor.Clear();
 }
 
-void SvxTPFilter::InsertAuthor( const String& rString, USHORT nPos)
+void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos)
 {
     aLbAuthor.InsertEntry(rString,nPos);
 }
@@ -964,17 +982,17 @@ String SvxTPFilter::GetSelectedAuthor()	const
     return aLbAuthor.GetSelectEntry();
 }
 
-USHORT	SvxTPFilter::GetSelectedAuthorPos()
+sal_uInt16	SvxTPFilter::GetSelectedAuthorPos()
 {
-    return (USHORT) aLbAuthor.GetSelectEntryPos();
+    return (sal_uInt16) aLbAuthor.GetSelectEntryPos();
 }
 
-void SvxTPFilter::SelectedAuthorPos(USHORT nPos)
+void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
 {
     aLbAuthor.SelectEntryPos(nPos);
 }
 
-USHORT SvxTPFilter::SelectAuthor(const String& aString)
+sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString)
 {
     aLbAuthor.SelectEntry(aString);
     return aLbAuthor.GetSelectEntryPos();
@@ -995,7 +1013,7 @@ void SvxTPFilter::SetFocusToRange()
     aEdRange.GrabFocus();
 }
 
-void SvxTPFilter::HideRange(BOOL bHide)
+void SvxTPFilter::HideRange(sal_Bool bHide)
 {
     if(bHide)
     {
@@ -1005,7 +1023,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
     }
     else
     {
-        ShowAction(FALSE);
+        ShowAction(sal_False);
         aCbRange.SetText(aRangeStr);
         aCbRange.Show();
         aEdRange.Show();
@@ -1013,7 +1031,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
     }
 }
 
-void SvxTPFilter::HideClocks(BOOL bHide)
+void SvxTPFilter::HideClocks(sal_Bool bHide)
 {
     if(bHide)
     {
@@ -1036,66 +1054,66 @@ String SvxTPFilter::GetComment()const
     return aEdComment.GetText();
 }
 
-BOOL SvxTPFilter::IsDate()
+sal_Bool SvxTPFilter::IsDate()
 {
     return aCbDate.IsChecked();
 }
 
-BOOL SvxTPFilter::IsAuthor()
+sal_Bool SvxTPFilter::IsAuthor()
 {
     return aCbAuthor.IsChecked();
 }
 
-BOOL SvxTPFilter::IsRange()
+sal_Bool SvxTPFilter::IsRange()
 {
     return aCbRange.IsChecked();
 }
-BOOL SvxTPFilter::IsAction()
+sal_Bool SvxTPFilter::IsAction()
 {
     return aCbRange.IsChecked();
 }
 
-BOOL SvxTPFilter::IsComment()
+sal_Bool SvxTPFilter::IsComment()
 {
     return aCbComment.IsChecked();
 }
 
-void SvxTPFilter::CheckDate(BOOL bFlag)
+void SvxTPFilter::CheckDate(sal_Bool bFlag)
 {
     aCbDate.Check(bFlag);
     RowEnableHdl(&aCbDate);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckAuthor(BOOL bFlag)
+void SvxTPFilter::CheckAuthor(sal_Bool bFlag)
 {
     aCbAuthor.Check(bFlag);
     RowEnableHdl(&aCbAuthor);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckRange(BOOL bFlag)
+void SvxTPFilter::CheckRange(sal_Bool bFlag)
 {
     aCbRange.Check(bFlag);
     RowEnableHdl(&aCbRange);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckAction(BOOL bFlag)
+void SvxTPFilter::CheckAction(sal_Bool bFlag)
 {
     aCbRange.Check(bFlag);
     RowEnableHdl(&aCbRange);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::CheckComment(BOOL bFlag)
+void SvxTPFilter::CheckComment(sal_Bool bFlag)
 {
     aCbComment.Check(bFlag);
     RowEnableHdl(&aCbComment);
-    bModified=FALSE;
+    bModified=sal_False;
 }
 
-void SvxTPFilter::ShowAction(BOOL bShow)
+void SvxTPFilter::ShowAction(sal_Bool bShow)
 {
     if(!bShow)
     {
@@ -1121,7 +1139,7 @@ ListBox* SvxTPFilter::GetLbAction()
 
 IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb )
 {
-    ShowDateFields((USHORT)aLbDate.GetSelectEntryPos());
+    ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos());
     ModifyHdl(pLb);
     return 0;
 }
@@ -1132,8 +1150,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
     {
         aLbDate.Enable(aCbDate.IsChecked());
         aLbDate.Invalidate();
-        EnableDateLine1(FALSE);
-        EnableDateLine2(FALSE);
+        EnableDateLine1(sal_False);
+        EnableDateLine2(sal_False);
         if(aCbDate.IsChecked()) SelDateHdl(&aLbDate);
     }
     else if(pCB==&aCbAuthor)
@@ -1202,7 +1220,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
             aModifyComLink.Call(this);
         }
 
-        bModified=TRUE;
+        bModified=sal_True;
         aModifyLink.Call(this);
     }
     return 0;
@@ -1226,7 +1244,7 @@ void SvxTPFilter::DeactivatePage()
             pRedlinTable->SetFilterComment(IsComment());
 
             utl::SearchParam aSearchParam( aEdComment.GetText(),
-                    utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE );
+                    utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
 
             pRedlinTable->SetCommentParams(&aSearchParam);
 
@@ -1235,7 +1253,7 @@ void SvxTPFilter::DeactivatePage()
 
         aReadyLink.Call(this);
     }
-    bModified=FALSE;
+    bModified=sal_False;
     TabPage::DeactivatePage();
 }
 
@@ -1378,17 +1396,17 @@ void SvxAcceptChgCtr::Resize()
 {
     aMinSize=pTPView->GetMinSizePixel();
     Size aSize=GetOutputSizePixel();
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     if(aMinSize.Height()>aSize.Height())
     {
         aSize.Height()=aMinSize.Height();
-        bFlag=TRUE;
+        bFlag=sal_True;
     }
     if(aMinSize.Width()>aSize.Width())
     {
         aSize.Width()=aMinSize.Width();
-        bFlag=TRUE;
+        bFlag=sal_True;
     }
 
     if(bFlag)
@@ -1420,12 +1438,12 @@ void SvxAcceptChgCtr::ShowViewPage()
     aTCAccept.SetCurPageId(TP_VIEW);
 }
 
-BOOL SvxAcceptChgCtr::IsFilterPageVisible()
+sal_Bool SvxAcceptChgCtr::IsFilterPageVisible()
 {
     return (aTCAccept.GetCurPageId()==TP_FILTER);
 }
 
-BOOL SvxAcceptChgCtr::IsViewPageVisible()
+sal_Bool SvxAcceptChgCtr::IsViewPageVisible()
 {
     return (aTCAccept.GetCurPageId()==TP_VIEW);
 }
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index aa8fb0ccb3..d88a660037 100644..100755
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -65,3 +65,11 @@
 #define	STR_TITLE3		3
 #define	STR_TITLE4		4
 #define	STR_TITLE5		5
+//IAccessibility2 Implementation 2009-----
+#define STR_DATE_COMBOX 6
+#define STR_DATE_SPIN   7
+#define STR_DATE_SPIN1  8
+#define STR_DATE_TIME_SPIN 9
+#define STR_DATE_TIME_SPIN1 10
+#define STR_TREE     		11
+//-----IAccessibility2 Implementation 2009
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index ab82e92304..0edd5e5398 100644..100755
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -114,7 +114,10 @@ TabPage SID_REDLIN_FILTER_PAGE
             ImageBitmap = Bitmap { File = "time.bmp" ; };
             MASKCOLOR
         };
-        QuickHelpText [ en-US ] = "Set Date/Time" ;
+        // IAccessibility2 implementation 2009. ------
+        //QuickHelpText [ en-US ] = "Set Date/Time" ;
+        QuickHelpText [ en-US ] = "Set Start Date/Time" ;
+        // ------ IAccessibility2 implementation 2009.
     };
     FixedText FT_DATE2
     {
@@ -170,7 +173,10 @@ TabPage SID_REDLIN_FILTER_PAGE
             ImageBitmap = Bitmap { File = "time.bmp" ; };
             MASKCOLOR
         };
-        QuickHelpText [ en-US ] = "Set Date/Time" ;
+        // IAccessibility2 implementation 2009. ------
+        //QuickHelpText [ en-US ] = "Set Date/Time" ;
+        QuickHelpText [ en-US ] = "Set End Date/Time" ;
+        // ------ IAccessibility2 implementation 2009.
     };
     CheckBox CB_AUTOR
     {
@@ -249,6 +255,32 @@ TabPage SID_REDLIN_FILTER_PAGE
         Size = MAP_APPFONT ( 178 , 12 ) ;
         TabStop = TRUE ;
     };
+        /*IAccessibility2 Implementation 2009-----*/
+    String STR_DATE_COMBOX
+    {
+        Text [ en-US ] = "Date Condition" ;
+    };
+    String STR_DATE_SPIN
+    {
+        Text [ en-US ] = "Start Date" ;
+    };
+    String STR_DATE_SPIN1
+    {
+        Text [ en-US ] = "End Date" ;
+    };
+    String STR_DATE_TIME_SPIN
+    {
+        Text [ en-US ] = "Start Time" ;
+    };
+    String STR_DATE_TIME_SPIN1
+    {
+        Text [ en-US ] = "End Time" ;
+    };
+    String STR_TREE
+    {
+        Text [ en-US ] = "Changes" ;
+    };
+    /*-----IAccessibility2 Implementation 2009*/
 };
 TabPage SID_REDLIN_VIEW_PAGE
 {
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index ce496d4272..0dbac557b0 100644..100755
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 // === includes (declaration) ============================================
-#include "databaseregistrationui.hxx"
+#include "svx/databaseregistrationui.hxx"
 
 // === includes (project) ================================================
 #include <svx/svxdlg.hxx>
@@ -44,9 +44,9 @@
 
 namespace svx
 {
-    USHORT administrateDatabaseRegistration( Window* _parentWindow )
+    sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow )
     {
-        USHORT nResult = RET_CANCEL;
+        sal_uInt16 nResult = RET_CANCEL;
 
         SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
 
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 39c6758375..315c1052b7 100644..100755
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 #include <math.h>
 #include <vcl/virdev.hxx>
@@ -81,7 +81,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) :
     mnCenterY(0),
     mbEnabled( true )
 {
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 void DialControlBmp::InitBitmap( const Size& rSize, const Font& rFont )
@@ -186,7 +186,7 @@ void DialControlBmp::DrawBackground()
     SetFillColor();
     Erase();
 
-    EnableRTL( TRUE ); // draw 3D effect in correct direction
+    EnableRTL( sal_True ); // draw 3D effect in correct direction
 
     sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10;
     Color aColor;
@@ -213,7 +213,7 @@ void DialControlBmp::DrawBackground()
     SetFillColor( aColor );
     DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() );
 
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 
     // *** calibration ***
 
@@ -282,7 +282,7 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont )
 
     mnCenterX = maWinSize.Width() / 2;
     mnCenterY = maWinSize.Height() / 2;
-    maWinFont.SetTransparent( TRUE );
+    maWinFont.SetTransparent( sal_True );
 
     maBmpEnabled.DrawBackground( maWinSize, true );
     maBmpDisabled.DrawBackground( maWinSize, false );
@@ -456,7 +456,7 @@ const Link& DialControl::GetModifyHdl() const
 void DialControl::Init( const Size& rWinSize, const Font& rWinFont )
 {
     mpImpl->Init( rWinSize, rWinFont );
-    EnableRTL( FALSE ); // don't mirror mouse handling
+    EnableRTL( sal_False ); // don't mirror mouse handling
     SetOutputSizePixel( mpImpl->maWinSize );
     SetBackground();
 }
diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index 0b3c259338..0b3c259338 100644..100755
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 67a2c1c99f..6ff8d02705 100644..100755
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -46,6 +46,7 @@
 #include <svx/xlnwtit.hxx>
 #include "helpid.hrc"
 #include <algorithm>
+#include <svx/dialmgr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -91,7 +92,7 @@ void Svx3DPreviewControl::Construct()
 {
     // Do never mirror the preview window.  This explicitly includes right
     // to left writing environments.
-    EnableRTL (FALSE);
+    EnableRTL (sal_False);
     SetMapMode( MAP_100TH_MM );
 
     // Model
@@ -120,7 +121,7 @@ void Svx3DPreviewControl::Construct()
     double fH = rVolume.getHeight();
     double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
 
-    rCamera.SetAutoAdjustProjection(FALSE);
+    rCamera.SetAutoAdjustProjection(sal_False);
     rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
     basegfx::B3DPoint aLookAt;
     double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -388,7 +389,7 @@ void Svx3DLightControl::Construct2()
         double fH = rVolume.getHeight();
         double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
 
-        rCamera.SetAutoAdjustProjection(FALSE);
+        rCamera.SetAutoAdjustProjection(sal_False);
         rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
         basegfx::B3DPoint aLookAt;
         double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -1012,6 +1013,7 @@ void SvxLightCtl3D::Init()
     maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL);
     maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL);
     maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER);
+    maSwitcher.SetAccessibleName(String(SVX_RES(STR_SWITCH)));
 
     // Light preview
     maLightControl.Show();
@@ -1095,8 +1097,8 @@ void SvxLightCtl3D::CheckSelection()
     {
         double fHor, fVer;
         maLightControl.GetPosition(fHor, fVer);
-        maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-        maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+        maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+        maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
     }
 }
 
@@ -1115,8 +1117,8 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer )
         return;
 
     maLightControl.SetPosition(fHor, fVer);
-    maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-    maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+    maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+    maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
 
     if(maUserInteractiveChangeCallback.IsSet())
     {
@@ -1296,8 +1298,8 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG)
     double fHor, fVer;
 
     maLightControl.GetPosition(fHor, fVer);
-    maHorScroller.SetThumbPos( INT32(fHor * 100.0) );
-    maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) );
+    maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) );
+    maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) );
 
     if(maUserInteractiveChangeCallback.IsSet())
     {
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index eeb4bc4dc7..b0610c2fbe 100644..100755
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -77,7 +77,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void )
 }
 
 SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
-                        USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) :
+                        sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) :
 
     Control( pParent, rResId ),
 
@@ -150,7 +150,7 @@ void SvxRectCtl::Resize_Impl()
         break;
     }
     Reset();
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 }
 // -----------------------------------------------------------------------
 
@@ -183,18 +183,18 @@ void SvxRectCtl::InitRectBitmap( void )
     aColorAry2[6] = rStyles.GetDialogColor();
 
 #ifdef DBG_UTIL
-    static BOOL		bModify = FALSE;
-    BOOL&			rModify = bModify;
+    static sal_Bool		bModify = sal_False;
+    sal_Bool&			rModify = bModify;
     if( rModify )
     {
         static int		n = 0;
-        static UINT8	r = 0xFF;
-        static UINT8	g = 0x00;
-        static UINT8	b = 0xFF;
+        static sal_uInt8	r = 0xFF;
+        static sal_uInt8	g = 0x00;
+        static sal_uInt8	b = 0xFF;
         int&			rn = n;
-        UINT8&			rr = r;
-        UINT8&			rg = g;
-        UINT8&			rb = b;
+        sal_uInt8&			rr = r;
+        sal_uInt8&			rg = g;
+        sal_uInt8&			rb = b;
         aColorAry2[ rn ] = Color( rr, rg, rb );
     }
 #endif
@@ -204,7 +204,7 @@ void SvxRectCtl::InitRectBitmap( void )
 
 // -----------------------------------------------------------------------
 
-void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -271,7 +271,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
     if(!IsCompletelyDisabled())
     {
         RECT_POINT eNewRP = eRP;
-        BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
+        sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
 
         switch( rKeyEvt.GetKeyCode().GetCode() )
         {
@@ -356,9 +356,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
 void SvxRectCtl::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Window::StateChanged( nType );
 }
@@ -368,7 +368,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
 void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Window::DataChanged( rDCEvt );
 }
@@ -449,8 +449,8 @@ void SvxRectCtl::Paint( const Rectangle& )
     Point aBtnPnt2( 11,0 );
     Point aBtnPnt3( 22,0 );
 
-    BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0;
-    BOOL bNoVert = (m_nState & CS_NOVERT) != 0;
+    sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
+    sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0;
 
     Bitmap&			rBitmap = GetRectBitmap();
 
@@ -661,7 +661,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
         ( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
 }
 
-UINT8 SvxRectCtl::GetNumOfChilds( void ) const
+sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const
 {
     return ( eCS == CS_ANGLE )? 8 : 9;
 }
@@ -750,11 +750,11 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
 
 void SvxAngleCtl::Initialize()
 {
-    bPositive = TRUE;
+    bPositive = sal_True;
 
     aFont.SetSize( aFontSize );
     aFont.SetWeight( WEIGHT_NORMAL );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
 
     SetFont( aFont );
 }
@@ -813,10 +813,10 @@ void SvxAngleCtl::Paint( const Rectangle& )
 
 // Control for editing bitmaps
 
-SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) :
+SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) :
                         Control		( pParent, rResId ),
                         nLines		( nNumber ),
-                        bPaintable	( TRUE )
+                        bPaintable	( sal_True )
 {
     aRectSize = GetOutputSize();
 
@@ -825,8 +825,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber )
     SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() );
 
     nSquares = nLines * nLines;
-    pPixel = new USHORT[ nSquares ];
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    pPixel = new sal_uInt16[ nSquares ];
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
 }
 
 // Destructor dealocating the dynamic array
@@ -838,7 +838,7 @@ SvxPixelCtl::~SvxPixelCtl( )
 
 // Changes the foreground or Background color
 
-void SvxPixelCtl::ChangePixel( USHORT nPixel )
+void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
 {
     if( *( pPixel + nPixel) == 0 )
         *( pPixel + nPixel) = 1; //  could be extended to more colors
@@ -852,10 +852,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
     Point aPtTl, aPtBr;
-    USHORT	nX, nY;
+    sal_uInt16	nX, nY;
 
-    nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() );
-    nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() );
+    nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
+    nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
 
     ChangePixel( nX + nY * nLines );
 
@@ -874,7 +874,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
 
 void SvxPixelCtl::Paint( const Rectangle& )
 {
-    USHORT	i, j, nTmp;
+    sal_uInt16	i, j, nTmp;
     Point	aPtTl, aPtBr;
 
     if( bPaintable )
@@ -884,16 +884,16 @@ void SvxPixelCtl::Paint( const Rectangle& )
         for( i = 1; i < nLines; i++)
         {
             // horizontal
-            nTmp = (USHORT) ( aRectSize.Height() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines );
             DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
             // vertically
-            nTmp = (USHORT) ( aRectSize.Width() * i / nLines );
+            nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines );
             DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
         }
 
         //Draw Rectangles (squares)
         Control::SetLineColor();
-        USHORT nLastPixel = *pPixel ? 0 : 1;
+        sal_uInt16 nLastPixel = *pPixel ? 0 : 1;
 
         for( i = 0; i < nLines; i++)
         {
@@ -931,16 +931,16 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
         aPixelColor = rXBmp.GetPixelColor();
         aBackgroundColor = rXBmp.GetBackgroundColor();
 
-        USHORT* pArray = rXBmp.GetPixelArray();
+        sal_uInt16* pArray = rXBmp.GetPixelArray();
 
-        for( USHORT i = 0; i < nSquares; i++ )
+        for( sal_uInt16 i = 0; i < nSquares; i++ )
             *( pPixel + i ) = *( pArray + i );
     }
 }
 
 // Returns a specific pixel
 
-USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
+sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
 {
     return( *( pPixel + nPixel ) );
 }
@@ -950,7 +950,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
 void SvxPixelCtl::Reset()
 {
     // clear pixel area
-    rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+    rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
     Invalidate();
 }
 
@@ -980,14 +980,14 @@ void ColorLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -999,7 +999,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* )
 
 /************************************************************************/
 
-void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap*  )
+void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap*  )
 {
     RemoveEntry( nPos );
     InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos );
@@ -1011,19 +1011,19 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
 {
     long nCount = pColorTab->Count();
     XColorEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
         pEntry = pColorTab->GetColor( i );
         InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 // Fills the listbox (provisional) with strings
 
-HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1031,7 +1031,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw );
 }
 
-HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList ( NULL ),
   mbUserDraw( bUserDraw )
@@ -1045,7 +1045,7 @@ void HatchingLB::Fill( const XHatchList* pList )
     XHatchEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1065,7 +1065,7 @@ void HatchingLB::Fill( const XHatchList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1081,7 +1081,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
         {
             OutputDevice* pDevice = rUDEvt.GetDevice();
 
-            ULONG nOldDrawMode = pDevice->GetDrawMode();
+            sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode();
             pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
 
             XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
@@ -1118,7 +1118,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1131,11 +1131,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
-                                    const XHatch& rHatch, USHORT nDist )
+                                    const XHatch& rHatch, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1146,10 +1146,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rHatch == pEntry->GetHatch() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 // Fills the listbox (provisional) with strings
@@ -1158,7 +1158,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
 {
     long nCount = pList->Count();
     XHatchEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1169,12 +1169,12 @@ void FillAttrLB::Fill( const XHatchList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 // Fills the listbox (provisional) with strings
 
-GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1182,7 +1182,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
     EnableUserDraw( mbUserDraw);
 }
 
-GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, aWB ),
   mpList(NULL),
   mbUserDraw( bUserDraw )
@@ -1196,7 +1196,7 @@ void GradientLB::Fill( const XGradientList* pList )
     XGradientEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1216,7 +1216,7 @@ void GradientLB::Fill( const XGradientList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1234,7 +1234,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
 
             XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
             Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() );
-            aGradient.SetAngle( (USHORT)rXGrad.GetAngle() );
+            aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
             aGradient.SetBorder( rXGrad.GetBorder() );
             aGradient.SetOfsX( rXGrad.GetXOffset() );
             aGradient.SetOfsY( rXGrad.GetYOffset() );
@@ -1248,14 +1248,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
             {
                 long nWidth = pDevice->GetOutputSize().Width();
 
-                pWin->EnableRTL( FALSE );
+                pWin->EnableRTL( sal_False );
                 
                 Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ),
                                        aRect.GetSize() );
 
                 pDevice->DrawGradient( aMirrorRect, aGradient );
 
-                pWin->EnableRTL( TRUE );
+                pWin->EnableRTL( sal_True );
             }
             else
                 pDevice->DrawGradient( aRect, aGradient );
@@ -1282,7 +1282,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1295,11 +1295,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr,
-                                const XGradient& rGradient, USHORT nDist )
+                                const XGradient& rGradient, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
 
     long i;
@@ -1310,10 +1310,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS
         aStr = pEntry->GetName();
 
         if( rStr == aStr && rGradient == pEntry->GetGradient() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 // Fills the listbox (provisional) with strings
@@ -1322,7 +1322,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
 {
     long nCount = pList->Count();
     XGradientEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1333,12 +1333,12 @@ void FillAttrLB::Fill( const XGradientList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 // BitmapLB Constructor
 
-BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
 : ListBox( pParent, Id ),
   mpList( NULL ),
   mbUserDraw( bUserDraw )
@@ -1377,7 +1377,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
     XBitmapEntry* pEntry;
     long nCount = pList->Count();
 
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     if( mbUserDraw )
     {
@@ -1397,7 +1397,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
         }
     }
 
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1462,7 +1462,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1484,7 +1484,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1495,11 +1495,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 // FillAttrLB Constructor
@@ -1546,7 +1546,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    ListBox::SetUpdateMode( FALSE );
+    ListBox::SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1557,7 +1557,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
 
         ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) );
     }
-    ListBox::SetUpdateMode( TRUE );
+    ListBox::SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
@@ -1567,7 +1567,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 {
     long nCount = pList->Count();
     XBitmapEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     long i;
     for( i = 0; i < nCount && !bFound; i++ )
@@ -1578,24 +1578,24 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
 
         if( rStr == aStr )
         {
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 ) );
 }
 
 // Fills the listbox (provisional) with strings
 
 void FillTypeLB::Fill()
 {
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
     InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) );
     InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) );
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 // Fills the listbox (provisional) with strings
@@ -1604,7 +1604,7 @@ void LineLB::Fill( const XDashList* pList )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1618,7 +1618,7 @@ void LineLB::Fill( const XDashList* pList )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 void LineLB::FillStyles()
@@ -1657,7 +1657,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp )
 
 /************************************************************************/
 
-void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
 {
     RemoveEntry( nPos );
 
@@ -1670,11 +1670,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
 /************************************************************************/
 
 void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
-                                const XDash& rDash, USHORT nDist )
+                                const XDash& rDash, sal_uInt16 nDist )
 {
     long nCount = pList->Count();
     XDashEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     String aStr;
     XDash aDash;
 
@@ -1687,20 +1687,20 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
         aDash = pEntry->GetDash();
 
         if( rStr == aStr && rDash == aDash )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if( bFound )
-        SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+        SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
 }
 
 // Fills the listbox (provisional) with strings
 
-void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
+void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
 {
     long nCount = pList->Count();
     XLineEndEntry* pEntry;
     VirtualDevice aVD;
-    SetUpdateMode( FALSE );
+    SetUpdateMode( sal_False );
 
     for( long i = 0; i < nCount; i++ )
     {
@@ -1709,7 +1709,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         if( pBitmap )
         {
             Size aBmpSize( pBitmap->GetSizePixel() );
-            aVD.SetOutputSizePixel( aBmpSize, FALSE );
+            aVD.SetOutputSizePixel( aBmpSize, sal_False );
             aVD.DrawBitmap( Point(), *pBitmap );
             InsertEntry( pEntry->GetName(),
                 aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1720,20 +1720,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
         else
             InsertEntry( pEntry->GetName() );
     }
-    SetUpdateMode( TRUE );
+    SetUpdateMode( sal_True );
 }
 
 /************************************************************************/
 
 void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
-                        BOOL bStart )
+                        sal_Bool bStart )
 {
     if( pBmp )
     {
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1745,8 +1745,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
 
 /************************************************************************/
 
-void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
-                        BOOL bStart )
+void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp,
+                        sal_Bool bStart )
 {
     RemoveEntry( nPos );
 
@@ -1755,7 +1755,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
         VirtualDevice aVD;
         Size aBmpSize( pBmp->GetSizePixel() );
 
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aVD.DrawBitmap( Point(), *pBmp );
         InsertEntry( pEntry->GetName(),
             aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1894,7 +1894,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
     mbWithSymbol( sal_False )
 {
     const Size aOutputSize(GetOutputSize());
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
 
     const sal_Int32 nDistance(500L);
     const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src
index e5bd607efd..636b6213d3 100644..100755
--- a/svx/source/dialog/dlgctrl.src
+++ b/svx/source/dialog/dlgctrl.src
@@ -31,4 +31,9 @@ Bitmap RID_SVXCTRL_RECTBTNS
 {
     File = "rectbtns.bmp" ;
 };
-
+/*IAccessibility2 Implementation 2009-----*/
+String STR_SWITCH
+{
+    Text [ en-US ] = "Switch" ;
+};
+/*-----IAccessibility2 Implementation 2009*/
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index f80a4fed2d..61d74da1de 100644..100755
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -31,7 +31,7 @@
 
 // include ---------------------------------------------------------------
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svl/itemset.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
@@ -46,7 +46,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
 {
     FieldUnit eUnit = FUNIT_INCH;
     const SfxPoolItem* pItem = NULL;
-    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) )
         eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue();
     else 
     {
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 5c7e77cf9a..7f5e17ba80 100644..100755
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -894,7 +894,7 @@ void SaveProgressDialog::end()
 
 //===============================================
 RecovDocListEntry::RecovDocListEntry(      SvLBoxEntry* pEntry,
-                                           USHORT       nFlags,
+                                           sal_uInt16       nFlags,
                                      const String&      sText )
     : SvLBoxString( pEntry, nFlags, sText )
 {
@@ -903,7 +903,7 @@ RecovDocListEntry::RecovDocListEntry(      SvLBoxEntry* pEntry,
 //===============================================
 void RecovDocListEntry::Paint(const Point&       aPos   ,
                                     SvLBox&      aDevice,
-                                    USHORT       /*nFlags */,
+                                    sal_uInt16       /*nFlags */,
                                     SvLBoxEntry* pEntry )
 {
     const Image*        pImg  = 0;
@@ -1071,7 +1071,7 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
 
     m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() );
 
-    m_aNextBtn.Enable(TRUE);
+    m_aNextBtn.Enable(sal_True);
     m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
     m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
 
@@ -1114,8 +1114,8 @@ short RecoveryDialog::execute()
                 // Dialog was started first time ...
                 // wait for user decision ("start" or "cancel" recovery)
                 // This decision will be made inside the NextBtn handler.
-                m_aNextBtn.Enable(TRUE);
-                m_aCancelBtn.Enable(TRUE);
+                m_aNextBtn.Enable(sal_True);
+                m_aCancelBtn.Enable(sal_True);
                 m_bWaitForUser = sal_True;
                 while(m_bWaitForUser)
                     Application::Yield();
@@ -1133,8 +1133,8 @@ short RecoveryDialog::execute()
                 // do it asynchronous (to allow repaints)
                 // and wait for this asynchronous operation.
                 m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
-                m_aNextBtn.Enable(FALSE);
-                m_aCancelBtn.Enable(FALSE);
+                m_aNextBtn.Enable(sal_False);
+                m_aCancelBtn.Enable(sal_False);
                 m_pCore->setProgressHandler(m_xProgress);
                 m_pCore->setUpdateListener(this);
                 m_pCore->doRecovery();
@@ -1156,15 +1156,15 @@ short RecoveryDialog::execute()
                  {
                      m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr);
                      m_aNextBtn.SetText(m_aRecoveryOnlyFinish);
-                     m_aNextBtn.Enable(TRUE);
-                     m_aCancelBtn.Enable(FALSE);
+                     m_aNextBtn.Enable(sal_True);
+                     m_aCancelBtn.Enable(sal_False);
                  }
                  else
                  {
                     m_aDescrFT.SetText(m_aTitleRecoveryReport);
                     m_aNextBtn.SetText(m_aNextStr);
-                    m_aNextBtn.Enable(TRUE);
-                    m_aCancelBtn.Enable(TRUE);
+                    m_aNextBtn.Enable(sal_True);
+                    m_aCancelBtn.Enable(sal_True);
                  }
 
                  m_bWaitForUser = sal_True;
@@ -1341,8 +1341,8 @@ void RecoveryDialog::start()
 //===============================================
 void RecoveryDialog::updateItems()
 {
-    ULONG c = m_aFileListLB.GetEntryCount();
-    ULONG i = 0;
+    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr i = 0;
     for ( i=0; i<c; ++i )
     {
         SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1365,8 +1365,8 @@ void RecoveryDialog::updateItems()
 //===============================================
 void RecoveryDialog::stepNext(TURLInfo* pItem)
 {
-    ULONG c = m_aFileListLB.GetEntryCount();
-    ULONG i = 0;
+    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr i = 0;
     for (i=0; i<c; ++i)
     {
         SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1516,7 +1516,7 @@ void BrokenRecoveryDialog::impl_refresh()
 
         m_bExecutionNeeded = sal_True;
 
-        USHORT nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
+        sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
         m_aFileListLB.SetEntryData( nPos, (void*)&rInfo );
     }
     m_sSavePath = ::rtl::OUString();
@@ -1568,7 +1568,6 @@ void BrokenRecoveryDialog::impl_askForSavePath()
 {
     css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker(
         m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW);
-//  svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
 
     INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
     xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE));
@@ -1681,13 +1680,13 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             ExtTextEngine* pTextEngine = GetTextEngine();
             DBG_ASSERT( pTextEngine, "no text engine" );
 
-            ULONG i, nParaCount = pTextEngine->GetParagraphCount();
-            USHORT nLineCount = 0;
+            sal_uIntPtr i, nParaCount = pTextEngine->GetParagraphCount();
+            sal_uInt16 nLineCount = 0;
 
             for ( i = 0; i < nParaCount; ++i )
                 nLineCount = nLineCount + pTextEngine->GetLineCount(i);
 
-            USHORT nVisCols = 0, nVisLines = 0;
+            sal_uInt16 nVisCols = 0, nVisLines = 0;
             GetMaxVisColumnsAndLines( nVisCols, nVisLines );
             GetVScrollBar()->Show( nLineCount > nVisLines );
 
@@ -1928,14 +1927,14 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             default:
 #ifdef WNT
             case 0:
-                maSystemBtn.Check( TRUE );
+                maSystemBtn.Check( sal_True );
                 break;
 #endif
             case 1:
-                maDirectBtn.Check( TRUE );
+                maDirectBtn.Check( sal_True );
                 break;
             case 2:
-                maManualBtn.Check( TRUE );
+                maManualBtn.Check( sal_True );
                 break;
             }
 
@@ -1997,7 +1996,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             GetTextEngine()->SetFont( aFont );
 
             // no blinking cursor and a little left margin
-            EnableCursor( FALSE );
+            EnableCursor( sal_False );
             SetLeftMargin( 4 );
         }
 
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 2e4d03981d..594b863084 100644..100755
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -36,7 +36,7 @@
 
 // TabDialog
 #define TABDLG_WIDTH                290
-#define TABDLG_HEIGHT               278
+#define TABDLG_HEIGHT               238
 
 // TabPage CrashSave
 
@@ -52,7 +52,7 @@
 
 
 #define SAVE_WIDTH                  290
-#define SAVE_HEIGHT                 278
+#define SAVE_HEIGHT                 238
 #define SAVE_TITLEWINHEIGHT         36
 #define SAVE_DESCRHEIGHT            48
 #define SAVE_COL0					(RSC_SP_DLG_INNERBORDER_LEFT)
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 2da85bc8c5..1279d8b7fa 100644..100755
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE
     };
     ListBox LB_SAVE_FILELIST
     {
+        HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST";
         Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 );
         Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT );
         Border = TRUE;
@@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
     };
     PushButton BTN_RECOV_NEXT
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT";
         Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT );
         Text[ en-US ] = "~Start Recovery >";
@@ -288,6 +290,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN
     };
     ListBox LB_BROKEN_FILELIST
     {
+        HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST";
         Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 );
         Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) );
         Border = TRUE;
@@ -301,12 +304,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN
     };
     Edit ED_BROKEN_SAVEDIR
     {
+        HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR";
         Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton
         Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT );
         Border = TRUE;
     };
     PushButton BTN_BROKEN_SAVEDIR
     {
+        HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR";
         Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Chan~ge...";
@@ -367,6 +372,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME
     };
     PushButton BTN_RECOV_PREV
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV";
         Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text[ en-US ] = "< ~Back";
@@ -425,6 +431,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
     };
     Edit ED_ERRSEND_DOCTYPE
     {
+        HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE";
         Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT );
         Border = TRUE;
@@ -437,6 +444,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
     };
     MultiLineEdit ML_ERRSEND_USING
     {
+        HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING";
         Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) );
         VScroll = TRUE;
@@ -445,18 +453,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
     };
     PushButton BTN_ERRSEND_SHOWREP
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP";
         Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text[ en-US ] = "Show ~Report";
     };
     PushButton BTN_ERRSEND_OPT
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT";
         Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text[ en-US ] = "~Options...";
     };
     CheckBox CB_ERRSEND_CONTACT
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT";
         Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT );
         Check = FALSE;
@@ -470,6 +481,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
     };
     Edit ED_ERRSEND_EMAILADDR
     {
+        HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR";
         Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT );
         Border = TRUE;
@@ -481,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
     };
     PushButton BTN_RECOV_PREV
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV";
         Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text[ en-US ] = "< ~Back";
@@ -518,6 +531,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
 
     RadioButton BTN_ERROPT_SYSTEM
     {
+        HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM";
         Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 );
         Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
         Text[ en-US ] = "Use ~system settings";
@@ -525,6 +539,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
 
     RadioButton BTN_ERROPT_DIRECT
     {
+        HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT";
         Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 );
         Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
         Text[ en-US ] = "Use ~direct connection to the Internet";
@@ -532,6 +547,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
 
     RadioButton BTN_ERROPT_MANUAL
     {
+        HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL";
         Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 );
         Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
         Text[ en-US ] = "Use ~manual settings";
@@ -546,6 +562,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
 
     Edit ED_ERROPT_PROXYSERVER
     {
+        HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER";
         Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 );
         Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
         Border = TRUE;
@@ -560,6 +577,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
 
     Edit ED_ERROPT_PROXYPORT
     {
+        HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT";
         Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 );
         Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
         Border = TRUE;
@@ -606,6 +624,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW
 
     MultiLineEdit ML_ERRPREVIEW_CONTENT
     {
+        HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT";
         Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 );
         Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 );
         VScroll = TRUE;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 8aa54eaba6..a34cae1d30 100644..100755
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -71,7 +71,7 @@ namespace
     // -----------------------------------------------------------------------
     void initFont(Font& _rFont)
     {
-        _rFont.SetTransparent(TRUE);
+        _rFont.SetTransparent(sal_True);
         _rFont.SetAlign(ALIGN_BASELINE);
     }
     // -----------------------------------------------------------------------
@@ -97,7 +97,7 @@ namespace
     void setFont( const SvxFont& rNewFont, SvxFont& rImplFont )
     {
         rImplFont = rNewFont;
-        rImplFont.SetTransparent( TRUE );
+        rImplFont.SetTransparent( sal_True );
         rImplFont.SetAlign( ALIGN_BASELINE );
     }
 
@@ -113,7 +113,7 @@ class FontPrevWin_Impl
 
     SvxFont         				aFont;
     Printer*        				pPrinter;
-    BOOL            				bDelPrinter;
+    sal_Bool            				bDelPrinter;
 
     Reference < XBreakIterator >	xBreak;
     SvULongs						aTextWidth;
@@ -132,9 +132,9 @@ class FontPrevWin_Impl
     long							n100PercentFontWidth;		// initial -1 -> not set yet
     long							n100PercentFontWidthCJK;
     long							n100PercentFontWidthCTL;
-    UINT16							nFontWidthScale;
+    sal_uInt16							nFontWidthScale;
 
-    BOOL							bSelection		: 1,
+    sal_Bool							bSelection		: 1,
                                     bGetSelection   : 1,
                                     bUseResText     : 1,
                                     bTwoLines       : 1,
@@ -146,13 +146,13 @@ class FontPrevWin_Impl
     void				_CheckScript();
 public:
     inline FontPrevWin_Impl() :
-        pPrinter( NULL ), bDelPrinter( FALSE ),
+        pPrinter( NULL ), bDelPrinter( sal_False ),
         pColor( NULL ), pBackColor( 0 ), nAscent( 0 ),
         cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
-        bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ),
-        bTwoLines( FALSE ),
-        bIsCJKUI( FALSE ), bIsCTLUI( FALSE ),
-        bUseFontNameAsText( FALSE ), bTextInited( FALSE )
+        bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ),
+        bTwoLines( sal_False ),
+        bIsCJKUI( sal_False ), bIsCTLUI( sal_False ),
+        bUseFontNameAsText( sal_False ), bTextInited( sal_False )
         {
             Invalidate100PercentFontWidth();
         }
@@ -169,9 +169,9 @@ public:
     Size				CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont );
     void				DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont );
 
-    BOOL				SetFontWidthScale( UINT16 nScaleInPercent );
+    sal_Bool				SetFontWidthScale( sal_uInt16 nScaleInPercent );
     inline void			Invalidate100PercentFontWidth();
-    inline BOOL			Is100PercentFontWidthValid() const;
+    inline sal_Bool			Is100PercentFontWidthValid() const;
     void				ScaleFontWidth( const OutputDevice& rOutDev );
                             // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and
                             //  sets the 100%-Font-Widths
@@ -188,7 +188,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth()
     n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1;
 }
 
-inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const
+inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
 {
     DBG_ASSERT(	( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) ||
                 ( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) ||
@@ -211,10 +211,10 @@ inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const
 void FontPrevWin_Impl::_CheckScript()
 {
     aScriptText = aText;
-    USHORT nCnt = aScriptChg.Count();
+    size_t nCnt = aScriptChg.size();
     if( nCnt )
     {
-        aScriptChg.Remove( 0, nCnt );
+        aScriptChg.clear();
         aScriptType.Remove( 0, nCnt );
         aTextWidth.Remove( 0, nCnt );
         nCnt = 0;
@@ -227,8 +227,8 @@ void FontPrevWin_Impl::_CheckScript()
     }
     if( xBreak.is() )
     {
-        USHORT nScript = xBreak->getScriptType( aText, 0 );
-        USHORT nChg = 0;
+        sal_uInt16 nScript = xBreak->getScriptType( aText, 0 );
+        sal_uInt16 nChg = 0;
         if( com::sun::star::i18n::ScriptType::WEAK == nScript )
         {
             nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript );
@@ -249,25 +249,25 @@ void FontPrevWin_Impl::_CheckScript()
                 if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK ||
                     nType == U_COMBINING_SPACING_MARK )
                 {
-                    aScriptChg.Insert( nChg - 1, nCnt );
+                    aScriptChg.push_back( nChg - 1 );
                 }
                 else
                 {
-                    aScriptChg.Insert( nChg, nCnt );
+                    aScriptChg.push_back( nChg );
                 }
             }
             else
             {
-                aScriptChg.Insert( nChg, nCnt );
+                aScriptChg.push_back( nChg );
             }
             aScriptType.Insert( nScript, nCnt );
-            aTextWidth.Insert( ULONG(0), nCnt++ );
+            aTextWidth.Insert( sal_uIntPtr(0), nCnt++ );
 
             if( nChg < aText.Len() )
                 nScript = xBreak->getScriptType( aText, nChg );
             else
                 break;
-        } while( TRUE );
+        } while( sal_True );
     }
 }
 
@@ -284,11 +284,11 @@ void FontPrevWin_Impl::_CheckScript()
 Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter,
     SvxFont &rFont )
 {
-    USHORT nScript;
-    USHORT nIdx = 0;
+    sal_uInt16 nScript;
+    sal_uInt16 nIdx = 0;
     xub_StrLen nStart = 0;
     xub_StrLen nEnd;
-    USHORT nCnt = aScriptChg.Count();
+    size_t nCnt = aScriptChg.size();
     if( nCnt )
     {
         nEnd = aScriptChg[ nIdx ];
@@ -309,7 +309,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
     do
     {
         SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont);
-        ULONG nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
+        sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
                        Width();
         aTextWidth[ nIdx++ ] = nWidth;
         nTxtWidth += nWidth;
@@ -334,7 +334,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     nHeight -= nAscent;
     nCJKHeight -= nCJKAscent;
     nCTLHeight -= nCTLAscent;
@@ -363,11 +363,11 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
     Point &rPt, SvxFont &rFont )
 {
     Font aOldFont = _pPrinter->GetFont();
-    USHORT nScript;
-    USHORT nIdx = 0;
+    sal_uInt16 nScript;
+    sal_uInt16 nIdx = 0;
     xub_StrLen nStart = 0;
     xub_StrLen nEnd;
-    USHORT nCnt = aScriptChg.Count();
+    size_t nCnt = aScriptChg.size();
     if( nCnt )
     {
         nEnd = aScriptChg[ nIdx ];
@@ -395,21 +395,21 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
         else
             break;
     }
-    while( TRUE );
+    while( sal_True );
     _pPrinter->SetFont( aOldFont );
 }
 
 // -----------------------------------------------------------------------
 
-BOOL FontPrevWin_Impl::SetFontWidthScale( UINT16 nScale )
+sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale )
 {
     if( nFontWidthScale != nScale )
     {
         nFontWidthScale = nScale;
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -431,7 +431,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev )
 
 // class SvxFontPrevWindow -----------------------------------------------
 
-void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
 
@@ -470,13 +470,13 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
     if ( !pImpl->pPrinter )
     {
         pImpl->pPrinter = new Printer;
-        pImpl->bDelPrinter = TRUE;
+        pImpl->bDelPrinter = sal_True;
     }
     SetMapMode( MapMode( MAP_TWIP ) );
     initFont(pImpl->aFont);
     initFont(pImpl->aCJKFont);
     initFont(pImpl->aCTLFont);
-    InitSettings( TRUE, TRUE );
+    InitSettings( sal_True, sal_True );
     SetBorderStyle( WINDOW_BORDER_MONO );
 
     LanguageType eLanguage = Application::GetSettings().GetUILanguage();
@@ -527,9 +527,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
 void SvxFontPrevWindow::StateChanged( StateChangedType nType )
 {
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
-        InitSettings( TRUE, FALSE );
+        InitSettings( sal_True, sal_False );
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
-        InitSettings( FALSE, TRUE );
+        InitSettings( sal_False, sal_True );
 
     Window::StateChanged( nType );
 }
@@ -539,7 +539,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType )
 void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
-        InitSettings( TRUE, TRUE );
+        InitSettings( sal_True, sal_True );
     else
         Window::DataChanged( rDCEvt );
 }
@@ -560,14 +560,14 @@ const SvxFont& SvxFontPrevWindow::GetFont() const
 void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString )
 {
     pImpl->aText = rString;
-    pImpl->bTextInited = TRUE;
+    pImpl->bTextInited = sal_True;
 }
 
 // -----------------------------------------------------------------------
 
 void SvxFontPrevWindow::SetFontNameAsPreviewText()
 {
-    pImpl->bUseFontNameAsText = TRUE;
+    pImpl->bUseFontNameAsText = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -639,7 +639,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor)
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::UseResourceText( BOOL bUse )
+void SvxFontPrevWindow::UseResourceText( sal_Bool bUse )
 {
     pImpl->bUseResText = bUse;
 }
@@ -662,7 +662,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
         if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText )
         {
             pImpl->aText = pSh->GetSelectionText();
-            pImpl->bGetSelection = TRUE;
+            pImpl->bGetSelection = sal_True;
             pImpl->bSelection = pImpl->aText.Len() != 0;
 
         }
@@ -803,12 +803,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
     }
 }
 
-BOOL SvxFontPrevWindow::IsTwoLines() const
+sal_Bool SvxFontPrevWindow::IsTwoLines() const
 {
     return pImpl->bTwoLines;
 }
 
-void SvxFontPrevWindow::SetTwoLines(BOOL bSet)
+void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
 {
     pImpl->bTwoLines = bSet;}
 
@@ -821,7 +821,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
 
 // -----------------------------------------------------------------------
 
-void SvxFontPrevWindow::SetFontWidthScale( UINT16 n )
+void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
 {
     if( pImpl->SetFontWidthScale( n ) )
         Invalidate();
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 98c815a95c..3077587bff 100644..100755
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fontlb.hxx"
+#include "svx/fontlb.hxx"
 #include <vcl/svapp.hxx>
 
 // ============================================================================
@@ -100,7 +100,7 @@ SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) :
     maStdFont( GetFont() ),
     mbUseFont( false )
 {
-    maStdFont.SetTransparent( TRUE );
+    maStdFont.SetTransparent( sal_True );
     maEntryFont = maStdFont;
 }
 
@@ -125,10 +125,10 @@ void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
 
 void SvxFontListBox::SetNoSelection()
 {
-    SelectAll( FALSE, TRUE );
+    SelectAll( sal_False, sal_True );
 }
 
-ULONG SvxFontListBox::GetSelectEntryPos() const
+sal_uLong SvxFontListBox::GetSelectEntryPos() const
 {
     SvLBoxEntry* pSvLBoxEntry = FirstSelected();
     return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index de827145af..458986034d 100644..100755
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -42,7 +42,7 @@
 #include <svx/xtextit.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 #include <svx/dialogs.hrc>
 #include "fontwork.hrc"
@@ -57,7 +57,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK );
 
 SvxFontWorkControllerItem::SvxFontWorkControllerItem
 (
-    USHORT _nId,
+    sal_uInt16 _nId,
     SvxFontWorkDialog& rDlg,
     SfxBindings& rBindings
 ) :
@@ -70,7 +70,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
 
 // StateChanged method for FontWork items
 
-void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/,
+void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/,
                                               const SfxPoolItem* pItem )
 {
     switch ( GetId() )
@@ -179,7 +179,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
 SvxFontWorkChildWindow::SvxFontWorkChildWindow
 (
     Window* _pParent,
-    USHORT nId,
+    sal_uInt16 nId,
     SfxBindings* pBindings,
     SfxChildWinInfo* pInfo
 ) :
@@ -274,10 +274,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
 
     // Set System metric
     const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
-    SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
-    SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+    SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+    SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
     if( eDlgUnit == FUNIT_MM )
     {
         aMtrFldDistance.SetSpinSize( 50 );
@@ -309,7 +309,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
 
 SvxFontWorkDialog::~SvxFontWorkDialog()
 {
-    for (USHORT i = 0; i < CONTROLLER_COUNT; i++)
+    for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++)
         DELETEZ(pCtrlItems[i]);
 }
 
@@ -363,7 +363,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
 {
     if ( pItem )
     {
-        USHORT nId = TBI_STYLE_OFF;
+        sal_uInt16 nId = TBI_STYLE_OFF;
 
         switch ( pItem->GetValue() )
         {
@@ -378,16 +378,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
         // Make sure that there is allways exactly one checked toolbox item.
         if ( pItem->GetValue() == XFT_NONE )
         {
-            aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE);
-            aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE);
+            aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False);
+            aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False);
 
-            aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE);
+            aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True);
         }
         else
         {
-            aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE);
+            aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False);
             aTbxStyle.CheckItem(nId);
         }
 
@@ -403,7 +403,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
 {
     if ( pItem )
     {
-        USHORT nId;
+        sal_uInt16 nId;
 
         aTbxAdjust.Enable();
         aMtrFldDistance.Enable();
@@ -476,7 +476,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
 
         if ( pItem->GetValue() != XFTFORM_NONE )
             aFormSet.SelectItem(
-                sal::static_int_cast< USHORT >(pItem->GetValue()));
+                sal::static_int_cast< sal_uInt16 >(pItem->GetValue()));
     }
     else
         aFormSet.Disable();
@@ -501,11 +501,11 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
 // Set shadow buttons
 
 void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
-                                        BOOL bRestoreValues)
+                                        sal_Bool bRestoreValues)
 {
     if ( pItem )
     {
-        USHORT nId;
+        sal_uInt16 nId;
 
         aTbxShadow.Enable();
 
@@ -622,7 +622,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
     if ( pItem && !aMtrFldShadowX.HasChildPathFocus() )
     {
         // #i19251#
-        // INT32 nValue = pItem->GetValue();
+        // sal_Int32 nValue = pItem->GetValue();
         
         // #i19251#
         // The two involved fields/items are used double and contain/give different
@@ -669,7 +669,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
 
 IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxStyle.GetCurItemId();
+    sal_uInt16 nId = aTbxStyle.GetCurItemId();
 
     // Execute this block when a different toolbox item has been clicked or
     // when the off item has been clicked.  The later is necessary to
@@ -697,7 +697,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxAdjust.GetCurItemId();
+    sal_uInt16 nId = aTbxAdjust.GetCurItemId();
 
     if ( nId == TBI_ADJUST_MIRROR )
     {
@@ -724,7 +724,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nId = aTbxShadow.GetCurItemId();
+    sal_uInt16 nId = aTbxShadow.GetCurItemId();
 
     if ( nId == TBI_SHOWFORM )
     {
@@ -757,7 +757,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
 
         XFormTextShadowItem aItem(eShadow);
         GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L );
-        SetShadow_Impl(&aItem, TRUE);
+        SetShadow_Impl(&aItem, sal_True);
     }
     return 0;
 }
@@ -777,16 +777,16 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
     const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
     if( eDlgUnit != aMtrFldDistance.GetUnit() )
     {
-        SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
-        SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
+        SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+        SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
         aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
         aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
     }
     if( eDlgUnit != aMtrFldShadowX.GetUnit() &&
         aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) )
     {
-        SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
-        SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+        SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+        SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
         aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
         aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
     }
@@ -854,7 +854,7 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable)
     }
 }
 
-void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/)
+void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/)
 {
 }
 
@@ -953,8 +953,8 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
             basegfx::B2DPolyPolygon aPolyPolygon;
             basegfx::B2DPolygon aLine;
             long nR = aRect.GetWidth() / 2;
-            basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon());
-            basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon());
+            basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon());
+            basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon());
 
             // Close Polygon
             aTopArc.setClosed(true);
@@ -984,7 +984,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
             if ( eForm == XFTFORM_BUTTON4 )
             {
-                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, FALSE).getB2DPolygon());
+                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon());
                 aNewArc.setClosed(true);
                 aPolyPolygon.append(aNewArc);
                 eAdjust = XFT_CENTER;
@@ -1007,7 +1007,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
             if ( eForm == XFTFORM_BUTTON4 )
             {
-                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, FALSE).getB2DPolygon());
+                basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon());
                 aNewArc.setClosed(true);
                 aPolyPolygon.append(aNewArc);
             }
@@ -1041,7 +1041,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
 
         rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) );
         OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject();
-        BOOL bHide = TRUE;
+        sal_Bool bHide = sal_True;
 
         if ( pPara != NULL )
         {
@@ -1049,9 +1049,9 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
             pNewObj->SetOutlinerParaObject(pPara);
         }
         else
-            bHide = FALSE;
+            bHide = sal_False;
 
-        rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, TRUE);
+        rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True);
         pNewObj->SetLayer(rOldObj.GetLayer());
         aAttr.Put(XFormTextHideFormItem(bHide));
         aAttr.Put(XFormTextAdjustItem(eAdjust));
@@ -1091,11 +1091,11 @@ void SvxFontWorkDialog::ApplyImageList()
     ResMgr* _pMgr = &DIALOG_MGR();
 
     USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1;
-    USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1;
+    sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1;
 
     bool bInit = aFormSet.GetItemCount() == 0;
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
     {
         if( bInit )
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index 085c9f1324..085c9f1324 100644..100755
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.hrc
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 893674bf02..076f95a82e 100644..100755
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -34,7 +34,7 @@
  // RID_SVXDLG_FONTWORK ---------------------------------------------------
 DockingWindow RID_SVXDLG_FONTWORK
 {
-    HelpId = SID_FONTWORK ;
+    HelpId = CMD_SID_FONTWORK ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 29 , 85 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK
     };
     MetricField MTR_FLD_TEXTSTART
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 29 , 100 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK
     };
     MetricField MTR_FLD_SHADOW_X
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 29 , 144 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK
     };
     MetricField MTR_FLD_SHADOW_Y
     {
+        HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 29 , 159 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK
     };
     ListBox CLB_SHADOW_COLOR
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 174 ) ;
         Size = MAP_APPFONT ( 71 , 60 ) ;
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 6074b40ba2..1f3887ae92 100644..100755
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -715,7 +715,7 @@ inline Point lclToMapUnit( long nSubXPos, long nSubYPos )
 /** Returns a polygon constructed from a vector of points. */
 inline Polygon lclCreatePolygon( const PointVec& rPoints )
 {
-    return Polygon( static_cast< USHORT >( rPoints.size() ), &rPoints[ 0 ] );
+    return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] );
 }
 
 /** Returns a polygon constructed from the four passed points. */
@@ -1133,9 +1133,9 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
 {
     maColor = rBorder.GetColor();
 
-    USHORT nPrim = rBorder.GetOutWidth();
-    USHORT nDist = rBorder.GetDistance();
-    USHORT nSecn = rBorder.GetInWidth();
+    sal_uInt16 nPrim = rBorder.GetOutWidth();
+    sal_uInt16 nDist = rBorder.GetDistance();
+    sal_uInt16 nSecn = rBorder.GetInWidth();
 
     if( !nSecn )    // no or single frame border
     {
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index e778abca89..e778abca89 100644..100755
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 03b1eec8a2..03b1eec8a2 100644..100755
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index cc26be12c9..bedb2cc61b 100644..100755
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -108,7 +108,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder )
 }
 
 /** Converts an SvxBorderLine line width (in twips) to a pixel line width. */
-inline sal_uInt16 lclGetPixel( USHORT nWidth )
+inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth )
 {
     // convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel
     return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0;
@@ -216,7 +216,7 @@ void FrameBorder::SetKeyboardNeighbors(
     meKeyBottom = eBottom;
 }
 
-FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const
+FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const
 {
     FrameBorderType eBorder = FRAMEBORDER_NONE;
     switch( nKeyCode )
@@ -423,7 +423,7 @@ void FrameSelectorImpl::InitBorderGeometry()
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Bottom() - nDiagFocusOffsY ) );
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Bottom() + mnFocusOffs     ) );
             aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs     ) );
-            maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+            maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
 
             aFocusVec.clear();
             aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs,     aRect.Top()    + nDiagFocusOffsY ) );
@@ -432,7 +432,7 @@ void FrameSelectorImpl::InitBorderGeometry()
             aFocusVec.push_back( Point( aRect.Left()  - mnFocusOffs,     aRect.Bottom() - nDiagFocusOffsY ) );
             aFocusVec.push_back( Point( aRect.Left()  - mnFocusOffs,     aRect.Bottom() + mnFocusOffs     ) );
             aFocusVec.push_back( Point( aRect.Left()  + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs     ) );
-            maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+            maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
         }
     }
 
@@ -574,7 +574,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
     long nTLPos = 0;
     long nBRPos = mnCtrlSize - mnArrowSize;
     Point aPos1, aPos2;
-    USHORT nImgId1 = 0, nImgId2 = 0;
+    sal_uInt16 nImgId1 = 0, nImgId2 = 0;
     switch( rBorder.GetType() )
     {
         case FRAMEBORDER_LEFT:
@@ -603,7 +603,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
     }
 
     // Arrow or marker? Do not draw arrows into disabled control.
-    USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
+    sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
     maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) );
     maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) );
 }
@@ -697,7 +697,7 @@ void FrameSelectorImpl::DrawAllTrackingRects()
         aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) );
 
     aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
-    for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
+    for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
         mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
 }
 
@@ -879,7 +879,7 @@ void FrameSelector::HideAllBorders()
         mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
 }
 
-bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn,
+bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn,
                         SvxBorderStyle& rnStyle ) const
 {
     VisFrameBorderCIter aIt( mxImpl->maEnabBorders );
@@ -961,7 +961,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
         mxImpl->SelectBorder( **aIt, bSelect );
 }
 
-void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn,
+void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn,
         SvxBorderStyle nStyle )
 {
     mxImpl->maCurrStyle.SetOutWidth( nPrim );
@@ -1133,7 +1133,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt )
     KeyCode aKeyCode = rKEvt.GetKeyCode();
     if( !aKeyCode.GetModifier() )
     {
-        USHORT nCode = aKeyCode.GetCode();
+        sal_uInt16 nCode = aKeyCode.GetCode();
         switch( nCode )
         {
             case KEY_SPACE:
diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index 4f85f5eff9..4f85f5eff9 100644..100755
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.src
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 8f2a0cb735..2841dad023 100644..100755
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -40,12 +40,12 @@
 
 #include <svx/graphctl.hxx>
 #include "GraphCtlAccessibleContext.hxx"
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svx/svxids.hrc>
 #include <svx/svdpage.hxx>
 
 // #i72889#
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ )
 {
@@ -70,8 +70,8 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
             aMap100			( MAP_100TH_MM ),
             eObjKind        ( OBJ_NONE ),
             nPolyEdit		( 0 ),
-            bEditMode		( FALSE ),
-            bSdrMode		( FALSE ),
+            bEditMode		( sal_False ),
+            bSdrMode		( sal_False ),
             mpAccContext    ( NULL ),
             pModel          ( NULL ),
             pView           ( NULL )
@@ -83,7 +83,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
 
     SetWinStyle( nWinBits );
 
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
@@ -92,9 +92,9 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
             nWinStyle       ( 0 ),
             eObjKind        ( OBJ_NONE ),
             nPolyEdit		( 0 ),
-            bEditMode       ( FALSE ),
-            bSdrMode        ( FALSE ),
-            bAnim           ( FALSE ),
+            bEditMode       ( sal_False ),
+            bSdrMode        ( sal_False ),
+            bAnim           ( sal_False ),
             mpAccContext    ( NULL ),
             pModel          ( NULL ),
             pView           ( NULL )
@@ -103,7 +103,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
     aUpdateTimer.SetTimeout( 500 );
     aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) );
     aUpdateTimer.Start();
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 GraphCtrl::~GraphCtrl()
@@ -165,11 +165,11 @@ void GraphCtrl::InitSdrModel()
     // Creating a View
     pView = new GraphCtrlView( pModel, this );
     pView->SetWorkArea( Rectangle( Point(), aGraphSize ) );
-    pView->EnableExtendedMouseEventDispatcher( TRUE );
+    pView->EnableExtendedMouseEventDispatcher( sal_True );
     pView->ShowSdrPage(pView->GetModel()->GetPage(0));
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
     pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
-    pView->SetEditMode( TRUE );
+    pView->SetEditMode( sal_True );
 
     // #i72889# set neeeded flags
     pView->SetPagePaintingAllowed(false);
@@ -181,7 +181,7 @@ void GraphCtrl::InitSdrModel()
         mpAccContext->setModelAndView (pModel, pView);
 }
 
-void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel )
+void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel )
 {
     // If possible we dither bitmaps for the display
     if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP )  )
@@ -310,7 +310,7 @@ void GraphCtrl::MarkListHasChanged()
 void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
 {
     KeyCode aCode( rKEvt.GetKeyCode() );
-    BOOL	bProc = FALSE;
+    sal_Bool	bProc = sal_False;
 
     switch ( aCode.GetCode() )
     {
@@ -320,7 +320,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             if ( bSdrMode )
             {
                 pView->DeleteMarked();
-                bProc = TRUE;
+                bProc = sal_True;
                 if( !pView->AreObjectsMarked() )
                     ((Dialog*)GetParent())->GrabFocusToFirstControl();
             }
@@ -353,7 +353,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                 {
                     ((Dialog*)GetParent())->GrabFocusToFirstControl();
                 }
-                bProc = TRUE;
+                bProc = sal_True;
             }
         }
         break;
@@ -374,7 +374,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         pView->UnmarkAllObj();
                         pView->MarkNextObj (bForward);
                     }
-                    bProc = TRUE;
+                    bProc = sal_True;
                 }
                 else if(aCode.IsMod1())
                 {
@@ -397,7 +397,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             {
                 // mark last object
                 pView->UnmarkAllObj();
-                pView->MarkNextObj(FALSE);
+                pView->MarkNextObj(sal_False);
 
                 bProc = true;
             }
@@ -409,7 +409,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
             if ( aCode.IsMod1() )
             {
                 pView->UnmarkAllObj();
-                pView->MarkNextObj(TRUE);
+                pView->MarkNextObj(sal_True);
 
                 bProc = true;
             }
@@ -525,13 +525,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         if(pView->IsDragObj())
                         {
                             bool bWasNoSnap = rDragStat.IsNoSnap();
-                            BOOL bWasSnapEnabled = pView->IsSnapEnabled();
+                            sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
 
                             // switch snapping off
                             if(!bWasNoSnap)
-                                ((SdrDragStat&)rDragStat).SetNoSnap(TRUE);
+                                ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
                             if(bWasSnapEnabled)
-                                pView->SetSnapEnabled(FALSE);
+                                pView->SetSnapEnabled(sal_False);
 
                             pView->MovAction(aEndPoint);
                             pView->EndDragObj();
@@ -604,7 +604,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
                         }
                     }
 
-                    bProc = TRUE;
+                    bProc = sal_True;
                 }
             }
         }
@@ -721,20 +721,20 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const
     return pSdrObj;
 }
 
-void GraphCtrl::SetEditMode( const BOOL _bEditMode )
+void GraphCtrl::SetEditMode( const sal_Bool _bEditMode )
 {
     if ( bSdrMode )
     {
         bEditMode = _bEditMode;
         pView->SetEditMode( bEditMode );
         eObjKind = OBJ_NONE;
-        pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
     }
     else
-        bEditMode = FALSE;
+        bEditMode = sal_False;
 }
 
-void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit )
+void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit )
 {
     if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) )
     {
@@ -749,10 +749,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
 {
     if ( bSdrMode )
     {
-        bEditMode = FALSE;
+        bEditMode = sal_False;
         pView->SetEditMode( bEditMode );
         eObjKind = _eObjKind;
-        pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
     }
     else
         eObjKind = OBJ_NONE;
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 7e154d1a9f..12707992ec 100644..100755
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -44,10 +44,10 @@
 // - SvxGraphicFilter -
 // --------------------
 
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
+sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
 {
     const Graphic&	rGraphic = rFilterObject.GetGraphic();
-    ULONG			nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
+    sal_uIntPtr			nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
 
     if( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -61,7 +61,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
             case( SID_GRFFILTER_INVERT ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -79,14 +79,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SMOOTH ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -104,14 +104,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SHARPEN ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -129,14 +129,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_REMOVENOISE ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -154,14 +154,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
             case( SID_GRFFILTER_SOBEL ):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -179,7 +179,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
@@ -188,7 +188,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC);
+                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC);
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");
                     if( aDlg->Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -228,7 +228,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
             case( SID_GRFFILTER_POPART	):
             {
                 if( pShell )
-                    pShell->SetWaitCursor( TRUE );
+                    pShell->SetWaitCursor( sal_True );
 
                 if( rGraphic.IsAnimated() )
                 {
@@ -246,7 +246,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 }
 
                 if( pShell )
-                    pShell->SetWaitCursor( FALSE );
+                    pShell->SetWaitCursor( sal_False );
             }
             break;
 
@@ -269,7 +269,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if(pFact)
                 {
-                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, FALSE, RID_SVX_GRFFILTER_DLG_SOLARIZE );
+                    AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE );
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");
                     if( aDlg->Execute() == RET_OK )
                         aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index ee074a36a6..2fcc00fa0b 100644..100755
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -49,9 +49,9 @@
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 
 #include <editeng/brshitem.hxx>
 #include <editeng/lrspitem.hxx>
@@ -71,7 +71,7 @@ static const long MINBODY = 56;  // 1mm in twips rounded
 static const long DEF_DIST_WRITER = 500;	// 5mm (Writer)
 static const long DEF_DIST_CALC = 250;		// 2.5mm (Calc)
 
-static USHORT pRanges[] =
+static sal_uInt16 pRanges[] =
 {
     SID_ATTR_BRUSH,			 SID_ATTR_BRUSH,
     SID_ATTR_BORDER_OUTER,	 SID_ATTR_BORDER_OUTER,
@@ -92,7 +92,7 @@ static USHORT pRanges[] =
 // returns the Which values to the range
 
 
-USHORT* SvxHeaderPage::GetRanges()
+sal_uInt16* SvxHeaderPage::GetRanges()
 {
     return pRanges;
 }
@@ -106,7 +106,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
 
 //------------------------------------------------------------------------
 
-USHORT* SvxFooterPage::GetRanges()
+sal_uInt16* SvxFooterPage::GetRanges()
 {
     return pRanges;
 }
@@ -138,10 +138,11 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
 
 // -----------------------------------------------------------------------
 
-SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) :
+SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) :
 
     SfxTabPage( pParent, SVX_RES( nResId ), rAttr ),
 
+    aFrm            ( this, SVX_RES( FL_FRAME ) ),
     aTurnOnBox		( this, SVX_RES( CB_TURNON ) ),
     aCntSharedBox   ( this, SVX_RES( CB_SHARED ) ),
     aLMLbl          ( this, SVX_RES( FT_LMARGIN ) ),
@@ -154,18 +155,17 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
     aHeightFT       ( this, SVX_RES( FT_HEIGHT ) ),
     aHeightEdit		( this, SVX_RES( ED_HEIGHT ) ),
     aHeightDynBtn	( this, SVX_RES( CB_HEIGHT_DYN ) ),
-    aFrm            ( this, SVX_RES( FL_FRAME ) ),
     aBspWin			( this, SVX_RES( WN_BSP ) ),
     aBackgroundBtn	( this, SVX_RES( BTN_EXTRAS ) ),
 
     nId                         ( nSetId ),
     pBBSet                      ( NULL ),
-    bDisableQueryBox            ( FALSE ),
-    bEnableBackgroundSelector	( TRUE )
+    bDisableQueryBox            ( sal_False ),
+    bEnableBackgroundSelector	( sal_True )
 
 {
     InitHandler();
-    aBspWin.EnableRTL( FALSE );
+    aBspWin.EnableRTL( sal_False );
 
     // This Page needs ExchangeSupport
     SetExchangeSupport();
@@ -178,6 +178,20 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
     SetFieldUnit( aHeightEdit, eFUnit );
     SetFieldUnit( aLMEdit, eFUnit );
     SetFieldUnit( aRMEdit, eFUnit );
+
+    aTurnOnBox.SetAccessibleRelationMemberOf( &aFrm );
+    aCntSharedBox.SetAccessibleRelationMemberOf( &aFrm );
+    aLMLbl.SetAccessibleRelationMemberOf( &aFrm );
+    aLMEdit.SetAccessibleRelationMemberOf( &aFrm );
+    aRMLbl.SetAccessibleRelationMemberOf( &aFrm );
+    aRMEdit.SetAccessibleRelationMemberOf( &aFrm );
+    aDistFT.SetAccessibleRelationMemberOf( &aFrm );
+    aDistEdit.SetAccessibleRelationMemberOf( &aFrm );
+    aDynSpacingCB.SetAccessibleRelationMemberOf( &aFrm );
+    aHeightFT.SetAccessibleRelationMemberOf( &aFrm );
+    aHeightEdit.SetAccessibleRelationMemberOf( &aFrm );
+    aHeightDynBtn.SetAccessibleRelationMemberOf( &aFrm );
+    aBackgroundBtn.SetAccessibleRelationMemberOf(&aFrm);
 }
 
 // -----------------------------------------------------------------------
@@ -189,20 +203,20 @@ SvxHFPage::~SvxHFPage()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
 {
-    const USHORT		nWSize		= GetWhich( SID_ATTR_PAGE_SIZE );
-    const USHORT		nWLRSpace	= GetWhich( SID_ATTR_LRSPACE );
-    const USHORT		nWULSpace	= GetWhich( SID_ATTR_ULSPACE );
-    const USHORT		nWOn		= GetWhich( SID_ATTR_PAGE_ON );
-    const USHORT		nWDynamic	= GetWhich( SID_ATTR_PAGE_DYNAMIC );
-    const USHORT        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
-    const USHORT		nWShared	= GetWhich( SID_ATTR_PAGE_SHARED );
-    const USHORT		nWBrush		= GetWhich( SID_ATTR_BRUSH );
-    const USHORT		nWBox		= GetWhich( SID_ATTR_BORDER_OUTER );
-    const USHORT		nWBoxInfo	= GetWhich( SID_ATTR_BORDER_INNER );
-    const USHORT		nWShadow	= GetWhich( SID_ATTR_BORDER_SHADOW );
-    const USHORT		aWhichTab[] = { nWSize,		nWSize,
+    const sal_uInt16		nWSize		= GetWhich( SID_ATTR_PAGE_SIZE );
+    const sal_uInt16		nWLRSpace	= GetWhich( SID_ATTR_LRSPACE );
+    const sal_uInt16		nWULSpace	= GetWhich( SID_ATTR_ULSPACE );
+    const sal_uInt16		nWOn		= GetWhich( SID_ATTR_PAGE_ON );
+    const sal_uInt16		nWDynamic	= GetWhich( SID_ATTR_PAGE_DYNAMIC );
+    const sal_uInt16        nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
+    const sal_uInt16		nWShared	= GetWhich( SID_ATTR_PAGE_SHARED );
+    const sal_uInt16		nWBrush		= GetWhich( SID_ATTR_BRUSH );
+    const sal_uInt16		nWBox		= GetWhich( SID_ATTR_BORDER_OUTER );
+    const sal_uInt16		nWBoxInfo	= GetWhich( SID_ATTR_BORDER_INNER );
+    const sal_uInt16		nWShadow	= GetWhich( SID_ATTR_BORDER_SHADOW );
+    const sal_uInt16		aWhichTab[] = { nWSize,		nWSize,
                                         nWLRSpace,	nWLRSpace,
                                         nWULSpace,	nWULSpace,
                                         nWOn,		nWOn,
@@ -246,15 +260,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
 
     // Margins
     SvxLRSpaceItem aLR( nWLRSpace );
-    aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) );
-    aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) );
+    aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) );
+    aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) );
     aSet.Put( aLR );
 
     SvxULSpaceItem aUL( nWULSpace );
     if ( nId == SID_ATTR_PAGE_HEADERSET )
-        aUL.SetLower( (USHORT)nDist );
+        aUL.SetLower( (sal_uInt16)nDist );
     else
-        aUL.SetUpper( (USHORT)nDist );
+        aUL.SetUpper( (sal_uInt16)nDist );
     aSet.Put( aUL );
 
     // Background and border?
@@ -266,7 +280,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
         {
             _pSet = &( (SvxSetItem*)pItem )->GetItemSet();
 
@@ -285,7 +299,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
     SvxSetItem aSetItem( GetWhich( nId ), aSet );
     rSet.Put( aSetItem );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -301,7 +315,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
     // Evaluate header-/footer- attributes
     const SvxSetItem* pSetItem = 0;
 
-    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE,
+    if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -365,9 +379,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aTurnOnBox.Check( FALSE );
-        aHeightDynBtn.Check( TRUE );
-        aCntSharedBox.Check( TRUE );
+        aTurnOnBox.Check( sal_False );
+        aHeightDynBtn.Check( sal_True );
+        aCntSharedBox.Check( sal_True );
     }
 
     TurnOnHdl(0);
@@ -383,11 +397,11 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
 
     const SfxPoolItem* pItem = 0;
     SfxObjectShell* pShell;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+    if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
         ( 0 != (pShell = SfxObjectShell::Current()) &&
                     0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
     {
-        USHORT nHtmlMode = 0;
+        sal_uInt16 nHtmlMode = 0;
         nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
         if(nHtmlMode && HTMLMODE_ON)
         {
@@ -429,7 +443,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
         aRMLbl.Enable();
         aRMEdit.Enable();
 
-        USHORT nUsage = aBspWin.GetUsage();
+        sal_uInt16 nUsage = aBspWin.GetUsage();
 
         if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT )
             aCntSharedBox.Disable();
@@ -439,16 +453,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
     }
     else
     {
-        BOOL bDelete = TRUE;
+        sal_Bool bDelete = sal_True;
 
-        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE )
+        if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True )
             bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES );
 
         if ( bDelete )
         {
             aDistFT.Disable();
             aDistEdit.Disable();
-            aDynSpacingCB.Enable(FALSE);
+            aDynSpacingCB.Enable(sal_False);
             aHeightFT.Disable();
             aHeightEdit.Disable();
             aHeightDynBtn.Disable();
@@ -495,10 +509,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
     if ( !pBBSet )
     {
         // Use only the necessary items for border and background
-        USHORT nBrush = GetWhich( SID_ATTR_BRUSH );
-        USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
-        USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
-        USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
+        sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH );
+        sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
+        sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+        sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
 
         // Create an empty set
         pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush,
@@ -507,12 +521,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
         const SfxPoolItem* pItem;
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+             GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
             // if there is one that is already set, then use this
             pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() );
 
         if ( SFX_ITEM_SET ==
-             GetItemSet().GetItemState( nInner, FALSE, &pItem ) )
+             GetItemSet().GetItemState( nInner, sal_False, &pItem ) )
             // The set InfoItem is always required
             pBBSet->Put( *pItem );
     }
@@ -536,7 +550,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
 
             //----------------------------------------------------------------
 
-            USHORT nWhich = GetWhich( SID_ATTR_BRUSH );
+            sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
 
             if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET )
             {
@@ -591,12 +605,12 @@ void SvxHFPage::UpdateExample()
 
 void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 {
-    USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
+    sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -623,10 +637,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
 
     nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET );
 
-    if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
     {
         const SvxSetItem& rSetItem =
-            (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+            (const SvxSetItem&)rSet.Get( nWhich, sal_False );
         const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
         const SfxBoolItem& rOn =
             (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -709,7 +723,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
         aBspWin.SetBottom( 0 );
     }
 
-    USHORT nUsage = SVX_PAGE_ALL;
+    sal_uInt16 nUsage = SVX_PAGE_ALL;
     pItem = GetItem( rSet, SID_ATTR_PAGE );
 
     if ( pItem )
@@ -735,7 +749,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     const SvxSetItem* pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -756,7 +770,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetHdDist( nDist );
             aBspWin.SetHdLeft( rLR.GetLeft() );
             aBspWin.SetHdRight( rLR.GetRight() );
-            aBspWin.SetHeader( TRUE );
+            aBspWin.SetHeader( sal_True );
         }
         else
             pSetItem = 0;
@@ -764,7 +778,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetHeader( FALSE );
+        aBspWin.SetHeader( sal_False );
 
         if ( SID_ATTR_PAGE_HEADERSET == nId )
             aCntSharedBox.Disable();
@@ -772,7 +786,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     pSetItem = 0;
 
     if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
-                                            FALSE,
+                                            sal_False,
                                             (const SfxPoolItem**)&pSetItem ) )
     {
         const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
@@ -793,7 +807,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
             aBspWin.SetFtDist( nDist );
             aBspWin.SetFtLeft( rLR.GetLeft() );
             aBspWin.SetFtRight( rLR.GetRight() );
-            aBspWin.SetFooter( TRUE );
+            aBspWin.SetFooter( sal_True );
         }
         else
             pSetItem = 0;
@@ -801,7 +815,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( !pSetItem )
     {
-        aBspWin.SetFooter( FALSE );
+        aBspWin.SetFooter( sal_False );
 
         if ( SID_ATTR_PAGE_FOOTERSET == nId )
             aCntSharedBox.Disable();
@@ -811,7 +825,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() );
     }
 
@@ -819,7 +833,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 
     if ( pItem && pItem->ISA(SfxBoolItem) )
     {
-        aBspWin.SetTable( TRUE );
+        aBspWin.SetTable( sal_True );
         aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() );
     }
     ResetBackground_Impl( rSet );
diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc
index fe221189fc..fe221189fc 100644..100755
--- a/svx/source/dialog/hdft.hrc
+++ b/svx/source/dialog/hdft.hrc
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index adb89ce3bf..f2f2f7c6d0 100644..100755
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_TURNON
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "Hea~der on" ;
     };
     CheckBox CB_SHARED
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED";
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "Same ~content left/right" ;
@@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     MetricField ED_LMARGIN
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     MetricField ED_RMARGIN
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 62 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     MetricField ED_DIST
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 80 ) ;
@@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     CheckBox CB_DYNSPACING
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING";
         Pos = MAP_APPFONT ( 12 , 96 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Hide = TRUE;
@@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     MetricField ED_HEIGHT
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 96 ) ;
@@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     CheckBox CB_HEIGHT_DYN
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN";
         Pos = MAP_APPFONT ( 12 , 112 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "~AutoFit height" ;
@@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     PushButton BTN_EXTRAS
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS";
         Pos = MAP_APPFONT ( 12 , 130 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~More..." ;
@@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_TURNON
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "~Footer on" ;
     };
     CheckBox CB_SHARED
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED";
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "Same ~content left/right" ;
@@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     MetricField ED_LMARGIN
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     MetricField ED_RMARGIN
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 62 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     MetricField ED_DIST
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 80 ) ;
@@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     CheckBox CB_DYNSPACING
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING";
         Pos = MAP_APPFONT ( 12 , 96 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Hide = TRUE;
@@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     MetricField ED_HEIGHT
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 96 ) ;
@@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     CheckBox CB_HEIGHT_DYN
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN";
         Pos = MAP_APPFONT ( 12 , 112 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "~AutoFit height" ;
@@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     PushButton BTN_EXTRAS
     {
+        HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS";
         Pos = MAP_APPFONT ( 12 , 130 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~More..." ;
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index e21927f0b9..ee787d076e 100644..100755
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -32,7 +32,7 @@
 // include ---------------------------------------------------------------
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
-#include "hyperdlg.hxx"
+#include "svx/hyperdlg.hxx"
 #include <svx/svxdlg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
@@ -58,7 +58,7 @@ struct MyStruct
     SfxWorkWindow*		pWorkWin;
 };
 
-SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
+SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* pBindings,
                                                 SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId ),
@@ -71,7 +71,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
     mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
     DBG_ASSERT(mpDlg, "Dialogdiet fail!");
     pWindow = mpDlg->GetWindow();
-    ((MyStruct*)pImp)->bVisible = FALSE;
+    ((MyStruct*)pImp)->bVisible = sal_False;
 
     Window* pTopWindow = 0;
     if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && 
@@ -92,7 +92,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
 
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
 
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
new file mode 100755
index 0000000000..9f7afb0cab
--- /dev/null
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _SVX_DLG_HYPERDLG_HXX
+#define _SVX_DLG_HYPERDLG_HXX
+
+#include <vcl/combobox.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/menu.hxx>
+#include <svtools/stdctrl.hxx>
+#include <sfx2/ctrlitem.hxx>
+#include <svl/srchcfg.hxx>
+#include <sfx2/tbxctrl.hxx>
+
+class SvxHyperlinkDlg;
+class SfxViewFrame;
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+class HyperCombo : public ComboBox
+{
+    SvxHyperlinkDlg *pDlg;
+    long			nMaxWidth;
+    long			nMinWidth;
+    long			nRatio;
+
+    virtual long Notify( NotifyEvent& rNEvt );
+    virtual long PreNotify( NotifyEvent& rNEvt );
+
+public:
+    HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId );
+
+    inline void	SetRatio( long nR ) { nRatio = nR; }
+    inline long	GetRatio()			{ return nRatio; }
+    long		CalcResizeWidth( long nW );
+    inline long	GetResizeWidth()	{ return (nMaxWidth - nMinWidth); }
+    void		DoResize( long nW );
+};
+
+class HyperFixedText : public FixedInfo
+{
+    SvxHyperlinkDlg *pDlg;
+
+public:
+    HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId );
+
+};
+
+/*--------------------------------------------------------------------
+    Beschreibung: Dialog zum Einf�gen/Žndern eines Hyperlink
+ --------------------------------------------------------------------*/
+
+class SvxHyperlinkDlg : public ToolBox, public SfxControllerItem
+{
+    friend class HyperCombo;
+    friend class HyperFixedText;
+    using ToolBox::StateChanged;
+
+private:
+    SfxStatusForwarder	aForwarder;
+    SfxStatusForwarder	aHyperlinkDlgForward;
+    HyperCombo			aNameCB;
+    HyperFixedText		aUrlFT;
+    HyperCombo			aUrlCB;
+
+    SvxSearchConfig     aSearchConfig;
+
+    String              sAddress;
+    String				sExplorer;
+    String				sOldName;
+    String 				sSearchTitle;
+    PopupMenu			aLinkPopup;
+    PopupMenu			*pTargetMenu;
+    sal_Bool				bNoDoc;
+    sal_Bool				bSend;
+    sal_Bool				bHasOldName;
+    long				nMaxWidth;
+    long				nMinWidth;
+    long				nMaxHeight;
+    sal_Bool				bHtmlMode;
+
+    SfxImageManager*	mpManager;
+ 
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,	const SfxPoolItem* pState );
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
+
+    // DockingWindow
+    virtual void Resize();
+    virtual void Resizing(Size& rSize);
+
+    // Drag&Drop
+    sal_Bool 		 GetDragData(sal_uInt16 nItem, sal_uIntPtr nDDFormatId, String& rBuffer);
+
+    DECL_LINK(TBClickHdl, ToolBox *);
+    DECL_LINK(TBSelectHdl, ToolBox *);
+    DECL_LINK(DropdownClick, ToolBox * );
+    DECL_LINK(LinkPopupSelectHdl, Menu *);
+    DECL_LINK(SearchPopupSelectHdl, Menu *);
+    DECL_LINK(ComboSelectHdl, ComboBox *);
+    DECL_LINK(ComboModifyHdl, ComboBox *);
+    DECL_LINK(BookmarkFoundHdl, String *);
+
+    void    OpenDoc( const String& rURL, SfxViewFrame* pViewFrame );
+    void    EnableLink();
+    void	SendToApp(sal_uInt16 nType);
+    void	AddToHistory(const String& rName, const String& rURL);
+    void	TargetMenu(const String& rSelEntry, sal_Bool bExecute);
+    String	GetSelTarget();
+
+    void	SetImages();
+public:
+    SvxHyperlinkDlg(SfxBindings *pBindings, Window* pWindow);
+    ~SvxHyperlinkDlg();
+};
+
+
+#endif // _SVX_DLG_HYPERDLG_HXX
+
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
new file mode 100755
index 0000000000..c874ca2121
--- /dev/null
+++ b/svx/source/dialog/hyprlink.cxx
@@ -0,0 +1,999 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svx.hxx"
+#include <tools/urlobj.hxx>
+#include <vcl/msgbox.hxx>
+#include <unotools/configitem.hxx>
+#include <unotools/cmdoptions.hxx>
+#include <svtools/inetimg.hxx>
+#include <svl/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/imgmgr.hxx>
+#include <sfx2/dispatch.hxx>
+#include <svl/urihelper.hxx>
+#include <sfx2/objsh.hxx>
+#include <comphelper/processfactory.hxx>
+
+#include "svx/hlnkitem.hxx"
+#include <svx/dialogs.hrc>
+#include "hyprlink.hrc"
+#include <svx/dialmgr.hxx>
+#include "svx/hyprlink.hxx"
+#include "hyprdlg.hxx"
+
+using namespace ::rtl;
+using namespace ::com::sun::star;
+
+// -----------------------------------------------------------------------
+
+class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem
+{
+    OUString    sDefaultEngine;
+public:
+    SearchDefaultConfigItem_Impl();
+    ~SearchDefaultConfigItem_Impl();
+
+    const OUString&    GetDefaultSearchEngine(){ return sDefaultEngine;}
+    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+    virtual void            Commit();
+};
+
+/*-- 11.11.2003 14:20:59---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() :
+        ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine"))
+{
+    uno::Sequence<OUString> aNames(1);
+    aNames.getArray()[0] = OUString::createFromAscii("Name");
+    uno::Sequence< uno::Any > aValues = GetProperties(aNames);
+    aValues.getConstArray()[0] >>= sDefaultEngine;
+}
+/*-- 11.11.2003 14:21:00---------------------------------------------------
+
+  -----------------------------------------------------------------------*/
+SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl()
+{
+}
+
+void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
+void SearchDefaultConfigItem_Impl::Commit()
+{
+}
+
+/*************************************************************************
+|*
+|* Dialog zum Einf"ugen/"Andern eines Hyperlink
+|*
+\************************************************************************/
+
+SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
+
+    ToolBox             ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ),
+    SfxControllerItem   ( SID_HYPERLINK_SETLINK, *_pBindings ),
+
+    aForwarder			( SID_HYPERLINK_GETLINK, *this ),
+    aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this),
+
+    aNameCB				( this, SVX_RES( CB_NAME ) ),
+    aUrlFT				( this, SVX_RES( FT_URL ) ),
+    aUrlCB				( this, SVX_RES( CB_URL ) ),
+    aSearchConfig       (sal_True),
+    sAddress			( SVX_RES( STR_ADDRESS ) ),
+    sExplorer			( SVX_RES( STR_EXPLORER ) ),
+    sSearchTitle		( SVX_RES( STR_BOOKMARK_SEARCH ) ),
+    aLinkPopup			( SVX_RES( RID_SVXMN_HYPERLINK ) ),
+    pTargetMenu			( NULL ),
+
+    bNoDoc              ( sal_True ),
+    bSend               ( sal_False ),
+    bHasOldName         ( sal_False ),
+    bHtmlMode           ( sal_False )
+
+{
+    FreeResource();
+
+    mpManager = SfxImageManager::GetImageManager( 0 );
+    mpManager->RegisterToolBox( this );
+
+    SetImages();
+
+    // save initial size
+    nMaxWidth = GetSizePixel().Width();
+    nMaxHeight = GetSizePixel().Height();
+
+
+    InsertSeparator( 0 );
+    InsertWindow( CB_URL, &aUrlCB, 0, 0 );
+    // we need an item text for accessibility
+    String sItemText = aUrlCB.GetText();
+    if ( sItemText.Len() == 0 )
+        sItemText = aUrlCB.GetQuickHelpText();
+    if ( sItemText.Len() > 0 )
+    {
+        SetItemText( CB_URL, sItemText );
+        sItemText.Erase();
+    }
+    InsertWindow( FT_URL, &aUrlFT, 0, 0 );
+    InsertSeparator( 0 );
+    InsertWindow( CB_NAME, &aNameCB, 0, 0 );
+    sItemText = aNameCB.GetText();
+    if ( sItemText.Len() == 0 )
+        sItemText = aNameCB.GetQuickHelpText();
+    if ( sItemText.Len() > 0 )
+        SetItemText( CB_NAME, sItemText );
+
+    SetSizePixel(CalcWindowSizePixel());	// Groesse initialisieren
+
+    nMaxHeight = GetSizePixel().Height();	// Hoehe nochmal merken, da sie veraendert wurde
+                                            // SetSizePixel ruft Resize-Handler!
+
+    Show();
+    Resize();
+
+    long nUrlWidth = aUrlCB.GetResizeWidth();
+    long nNameWidth = aNameCB.GetResizeWidth();
+    long nSum = nUrlWidth + nNameWidth;
+
+    aUrlCB.SetRatio((nUrlWidth * 100L) / nSum);
+    aNameCB.SetRatio((nNameWidth * 100L) / nSum);
+
+    SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) );
+    SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) );
+    SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) );
+
+    SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
+    SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN );
+    SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
+
+    aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl));
+
+    Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl);
+    aNameCB.SetSelectHdl(aLk);
+    aUrlCB.SetSelectHdl(aLk);
+
+    aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl);
+    aNameCB.SetModifyHdl(aLk);
+    aUrlCB.SetModifyHdl(aLk);
+
+    // Accessibility: Set the quick help text as accessible name for the
+    // drop down lists.
+    aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText());
+    aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText());
+
+    // Hide button according to config item.
+    SvtCommandOptions aCmdOpts;
+    if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
+                          rtl::OUString(
+                              RTL_CONSTASCII_USTRINGPARAM(
+                                  "InternetSearch" ) ) ) )
+        HideItem( BTN_INET_SEARCH );
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+SvxHyperlinkDlg::~SvxHyperlinkDlg()
+{
+    SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this);
+
+    if (pTargetMenu != NULL)
+        delete pTargetMenu;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit
+    verkleinert werden
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::Resize()
+{
+    long nWidth = GetSizePixel().Width();
+
+    ToolBox::Resize();
+
+    if (nWidth)	// nWidth ist manchmal 0
+    {
+        long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1;
+
+        long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW);
+        long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW);
+
+        if (nNewUrlWidth && nNewNameWidth)	// Flackern reduzieren
+        {
+            SetUpdateMode(sal_False);
+
+            // Comboboxen resizen
+            aUrlCB.DoResize(nNewUrlWidth);
+            aNameCB.DoResize(nNewNameWidth);
+            RecalcItems();	// Alle Elemente neu anordnen
+
+            SetUpdateMode(sal_True);
+        }
+    }
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::Resizing(Size& rSize)
+{
+    if (rSize.Height() > nMaxHeight)
+        rSize.Height() = nMaxHeight;
+
+    if (rSize.Width() > nMaxWidth)
+        rSize.Width() = nMaxWidth;
+
+    ToolBox::Resizing(rSize);
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState,
+                                                    const SfxPoolItem* pState )
+{
+    if ( nSID == SID_HYPERLINK_DIALOG )
+    {
+        if( eState != SFX_ITEM_DISABLED)
+        {
+            EnableItem( BTN_OPENDIALOG, sal_True );
+
+            sal_Bool bItem = sal_False;
+            if ( pState && eState == SFX_ITEM_AVAILABLE )
+                    bItem = ((SfxBoolItem*)pState)->GetValue();
+            SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK );
+        }
+        else
+        {
+            SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK );
+            EnableItem( BTN_OPENDIALOG, sal_False );
+        }
+    }
+
+    if (nSID == SID_HYPERLINK_SETLINK)
+    {
+        if (eState == SFX_ITEM_DISABLED)
+            bNoDoc = sal_True;
+        else
+            bNoDoc = sal_False;
+        EnableItem(BTN_TARGET, !bNoDoc);
+        EnableLink();
+    }
+
+    if (nSID == SID_HYPERLINK_GETLINK)
+    {
+        if (eState == SFX_ITEM_AVAILABLE)
+        {
+            const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState);
+
+            sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
+            sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
+            sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND;
+
+            if (!bHasOldName &&
+                (nNamePos == nNotFound || nUrlPos == nNotFound))
+            {
+                sOldName = aNameCB.GetText();
+                bHasOldName = sal_True;
+            }
+            if (rHLnkItem.GetName().Len())
+            {
+                aNameCB.SetText(rHLnkItem.GetName());
+                ComboModifyHdl(&aNameCB);
+            }
+            if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len())
+            {
+                String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass();
+                aUrlCB.SetText(sUrl);
+            }
+            else if (aUrlCB.GetEntryCount())
+            {	// Letzten Eintrag wieder selektieren
+                aNameCB.SetText(aNameCB.GetEntry(0));
+                aUrlCB.SetText(aUrlCB.GetEntry(0));
+            }
+
+            TargetMenu(rHLnkItem.GetTargetFrame(), sal_False);
+            bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0;
+        }
+        else
+            return;
+
+        ComboModifyHdl(&aUrlCB);
+    }
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
+{
+    switch (pBox->GetCurItemId())
+    {
+        case BTN_LINK:
+        {
+            if (!bSend)	// Link ins Dokument einfuegen
+                SendToApp(HLINK_DEFAULT);
+        }
+        break;
+
+        case BTN_OPENDIALOG:
+        {
+            GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG );
+        }
+        break;
+    }
+
+    return sal_True;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
+{
+    switch (pBox->GetCurItemId())
+    {
+        // Link als Bookmark im Explorer eintragen
+        // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl
+        case BTN_INSERT_BOOKMARK:
+        {
+            String sName = aNameCB.GetText();
+            if ( !sName.Len() )
+                sName = aUrlCB.GetText();
+
+            String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
+            SfxStringItem aName( SID_BOOKMARK_TITLE, sName );
+            SfxStringItem aURL( SID_BOOKMARK_URL,
+                                URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(), URIHelper::GetMaybeFileHdl(), true, false,
+                                                          INetURLObject::WAS_ENCODED,
+                                                          INetURLObject::DECODE_UNAMBIGUOUS ) );
+            GetBindings().GetDispatcher()->Execute(
+                SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L );
+        }
+        break;
+    }
+
+    return sal_True;
+}
+
+IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
+{
+    switch (pBox->GetCurItemId())
+    {
+        case BTN_LINK:
+        {
+            // Link-Popup anstossen
+            EndSelection();	// Vor dem Execute, damit Popup den Focus bekommt
+            aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode);
+            aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN );
+        }
+        break;
+
+        case BTN_INET_SEARCH:
+        {
+            // Search-Engines per Popup auswaehlen
+            PopupMenu *pMenu = new PopupMenu;
+            pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl));
+            SearchDefaultConfigItem_Impl aDefaultEngine;
+            String sDefault(aDefaultEngine.GetDefaultSearchEngine());
+            sDefault.ToLowerAscii();
+            const bool bHasDefault = sDefault.Len() > 0;
+
+            sal_uInt16         nCount = aSearchConfig.Count();
+            String sFound;
+            for (sal_uInt16 i = 0; i < nCount; i++)
+            {
+                const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
+                //check if it's the configured default search engine
+                String sTest(rData.sEngineName);
+                sTest.ToLowerAscii();
+                bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault );
+                //then put it at the top
+                if(i && bIsDefaultEngine)
+                {
+                    pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0);
+                    pMenu->InsertSeparator(1);
+                }
+                else
+                {
+                    if (i)
+                        pMenu->InsertSeparator();
+                    pMenu->InsertItem( i + 1, rData.sEngineName);
+                }
+            }
+            pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True);
+            pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN );
+            pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True);
+            EndSelection();
+            delete pMenu;
+        }
+        break;
+
+        case BTN_TARGET:
+        {
+            // Target Frame einstellen
+            TargetMenu(GetSelTarget(), sal_True);
+            EndSelection();
+        }
+        break;
+    }
+
+    return sal_True;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute)
+{
+    if (pTargetMenu && !bExecute)
+    {
+        for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
+        {
+            if (pTargetMenu->GetItemText(i) == rSelEntry)
+            {
+                pTargetMenu->CheckItem(i);
+                return;
+            }
+        }
+    }
+
+    SfxViewFrame* pVwFrm = SfxViewFrame::Current();
+
+    if (pVwFrm)	// Alle moeglichen Target Frames zusammensammeln und anzeigen
+    {
+        TargetList aList;
+        pVwFrm->GetTopFrame().GetTargetList(aList);
+
+        sal_uInt16 nCount = (sal_uInt16)aList.Count();
+        if( nCount )
+        {
+            sal_Bool bChecked = sal_False;
+
+            if (pTargetMenu != NULL)
+                delete pTargetMenu;
+
+            pTargetMenu = new PopupMenu;
+            pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() |
+                                       MENU_FLAG_NOAUTOMNEMONICS );
+            sal_uInt16 i;
+            for ( i = 0; i < nCount; i++ )
+            {
+                String sEntry(*aList.GetObject(i));
+                pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK);
+
+                if (sEntry == rSelEntry)
+                {
+                    pTargetMenu->CheckItem(i + 1);
+                    bChecked = sal_True;
+                }
+            }
+            for ( i = nCount; i; i-- )
+                delete aList.GetObject( i - 1 );
+
+            if (!bChecked)
+                pTargetMenu->CheckItem(1);
+
+            if (bExecute)
+            {
+                sal_uInt16 nEntry = pTargetMenu->Execute(
+                    this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN );
+                if ( nEntry )
+                    pTargetMenu->CheckItem( nEntry );
+            }
+        }
+    }
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
+{
+    switch (pMenu->GetCurItemId())
+    {
+        case MN_FIELD:	// URL als Hyperlink ins Dok einfuegen
+            SendToApp(HLINK_FIELD);
+            break;
+        case MN_BUTTON:	// URL als Button ins Dok einfuegen
+            SendToApp(HLINK_BUTTON);
+            break;
+    }
+
+    return sal_True;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
+{
+    const SvxSearchEngineData&  rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1);
+    String sText(aNameCB.GetText());
+    sText.EraseLeadingChars().EraseTrailingChars();
+
+    rtl::OUString   sPrefix;
+    rtl::OUString   sSuffix;
+    rtl::OUString   sSeparator;
+    sal_Int32       nCaseMatch;
+    sal_Unicode cToken = 0;
+
+    if (sText.Search(' ') != STRING_NOTFOUND)
+    {
+        sPrefix = rData.sExactPrefix;
+        sSuffix = rData.sExactSuffix;
+        sSeparator = rData.sExactSeparator;
+        nCaseMatch = rData.nExactCaseMatch;
+        cToken = ' ';
+    }
+    else if (sText.Search('+') != STRING_NOTFOUND)
+    {
+        sPrefix = rData.sAndPrefix;
+        sSuffix = rData.sAndSuffix;
+        sSeparator = rData.sAndSeparator;
+        nCaseMatch = rData.nAndCaseMatch;
+        cToken = '+';
+    }
+    else if (sText.Search(',') != STRING_NOTFOUND)
+    {
+        sPrefix = rData.sOrPrefix;
+        sSuffix = rData.sOrSuffix;
+        sSeparator = rData.sOrSeparator;
+        nCaseMatch = rData.nOrCaseMatch;
+        cToken = ',';
+    }
+    else
+    {
+        sPrefix = rData.sExactPrefix;
+        sSuffix = rData.sExactSuffix;
+        nCaseMatch = rData.nExactCaseMatch;
+        cToken = 0;
+    }
+
+    String sURL = sPrefix;
+    xub_StrLen nTok;
+
+    if(1 == nCaseMatch)
+        sText.ToUpperAscii();
+    else if(2 == nCaseMatch)
+        sText.ToLowerAscii();
+
+    if ((nTok = sText.GetTokenCount(cToken)) > 1)
+    {
+        for (sal_uInt16 i = 0; i < nTok; i++)
+        {
+            sURL += sText.GetToken(i, cToken);
+            if(i < nTok -1)
+                sURL += (String)sSeparator;
+        }
+        sURL += (String)sSuffix;
+    }
+    else
+    {
+        sURL += sText;
+        sURL += (String)sSuffix;
+    }
+    sURL.EraseAllChars();   // remove all spaces
+    SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+    if ( pViewFrame )
+        pViewFrame = pViewFrame->GetTopViewFrame();
+    OpenDoc( sURL, pViewFrame );
+
+    return sal_True;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
+{
+    if (pUrl && pUrl->Len())
+    {
+        aUrlCB.SetText(*pUrl);
+        ComboModifyHdl(&aUrlCB);
+    }
+
+    return sal_True;
+}
+/*--------------------------------------------------------------------
+    Beschreibung: Link-Button enablen/disablen
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::EnableLink()
+{
+    sal_Bool bEnable = aUrlCB.GetText().Len() != 0;
+
+    EnableItem(BTN_LINK, (!bNoDoc) & bEnable);
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: URL im Dokument einfuegen
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
+{
+    sal_Bool bIsFile = sal_False;
+    bSend = sal_True;
+    String sURL( aUrlCB.GetText() );
+
+    if ( !sURL.Len() )
+        return;
+
+    String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
+    INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, URIHelper::GetMaybeFileHdl(), true, false,
+                                                  INetURLObject::WAS_ENCODED,
+                                                  INetURLObject::DECODE_UNAMBIGUOUS ) );
+    sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
+    if ( aObj.GetProtocol() == INET_PROT_FILE )
+        bIsFile = sal_True;
+
+    if ( bIsFile )
+    {
+        EnterWait();
+        SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True );
+        if ( aMedium.Exists( sal_False ) == sal_False )
+        {
+            LeaveWait();
+            QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
+            if ( aBox.Execute() == RET_NO )
+                return;
+        }
+        else
+            LeaveWait();
+    }
+
+    SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK );
+
+    if (aNameCB.GetText().Len())
+        aItem.SetName( aNameCB.GetText() );
+    else
+        aItem.SetName( sURL );
+
+    sOldName = aNameCB.GetText();
+
+    aItem.SetURL(sURL);
+    aItem.SetInsertMode( (SvxLinkInsertMode)nType );
+    aItem.SetTargetFrame( GetSelTarget() );
+
+    GetBindings().GetDispatcher()->Execute(
+        SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
+
+    AddToHistory( aNameCB.GetText(), sURL );
+
+    if ( sURL != aUrlCB.GetText() )
+        aUrlCB.SetText( sURL );
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln
+ --------------------------------------------------------------------*/
+
+String SvxHyperlinkDlg::GetSelTarget()
+{
+    String sTarget;
+
+    if (pTargetMenu != NULL)
+    {
+        for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
+        {
+            if (pTargetMenu->IsItemChecked(i))
+            {
+                sTarget = pTargetMenu->GetItemText(i);
+                break;
+            }
+        }
+    }
+
+    return sTarget;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: URL in History der Leiste aufnehmen
+ --------------------------------------------------------------------*/
+
+void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
+{
+    String sName(rName);
+
+    if (bHasOldName && sOldName.Len())
+    {
+        sName = sOldName;
+        bHasOldName = sal_False;
+    }
+
+    if (!sName.Len())
+        sName = rURL;
+
+    if (rURL.Len())
+    {
+        sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName);
+        sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL);
+        sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND;
+
+        if (nNamePos != COMBOBOX_ENTRY_NOTFOUND)
+            nPos = nNamePos;
+        else
+            nPos = nUrlPos;
+
+        // Alten Eintrag durch neuen Eintrag ersetzen
+        if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+        {
+            aNameCB.RemoveEntry(nPos);
+            aUrlCB.RemoveEntry(nPos);
+            aNameCB.SetText(rName);
+            aUrlCB.SetText(rURL);
+        }
+
+        aNameCB.InsertEntry(sName, 0);
+        aUrlCB.InsertEntry(rURL, 0);
+    }
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Bookmark und Search-Button enablen/disablen
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
+{
+    sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText());
+
+    if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+    {
+        aNameCB.SetText(aNameCB.GetEntry(nPos));
+        aUrlCB.SetText(aUrlCB.GetEntry(nPos));
+
+        EnableLink();
+        EnableItem(BTN_INSERT_BOOKMARK, sal_True);
+        EnableItem(BTN_INET_SEARCH, sal_True);
+    }
+    return sal_True;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
+{
+    sal_Bool bEnable = sal_True;
+
+    if (!pCombo->GetText().Len())
+        bEnable = sal_False;
+
+    if (pCombo == &aNameCB)
+    {
+        if (IsItemEnabled(BTN_INET_SEARCH) != bEnable)
+            EnableItem(BTN_INET_SEARCH, bEnable);
+    }
+
+    EnableLink();
+
+    if (aUrlCB.GetText().Len())
+        bEnable = sal_True;
+    else
+        bEnable = sal_False;
+
+    if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable)
+        EnableItem(BTN_INSERT_BOOKMARK, bEnable);
+
+    return sal_True;
+}
+
+// --------------------------------------------------------------------
+
+void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt )
+{
+    ToolBox::DataChanged( rDCEvt );
+
+    if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE))
+        SetImages();
+}
+
+// --------------------------------------------------------------------
+
+void SvxHyperlinkDlg::SetImages()
+{
+    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
+
+    SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) );
+    SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) );
+    SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) );
+    SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) );
+    SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) );
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Comboboxen
+ --------------------------------------------------------------------*/
+
+HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
+        ComboBox( (Window *)pDialog, rResId )
+{
+    pDlg = pDialog;
+
+    nMaxWidth = GetSizePixel().Width();
+    if (this == &pDlg->aUrlCB)
+        nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww"));
+    else
+        nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww"));
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Comboboxen KeyInput
+ --------------------------------------------------------------------*/
+
+long HyperCombo::Notify( NotifyEvent& rNEvt )
+{
+    long nHandled = 0;
+    static sal_Bool bLocked = sal_False;
+
+    if (bLocked)	// Keine weiteren RETURNs annehmen (nicht Reentrant!)
+        return nHandled;
+
+    bLocked = sal_True;
+
+    if ( rNEvt.GetType() == EVENT_KEYINPUT )
+    {
+        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
+        const KeyCode aKeyCode = pKEvt->GetKeyCode();
+
+        if (aKeyCode.GetCode() == KEY_RETURN)
+        {
+            pDlg->SendToApp(HLINK_DEFAULT);
+            nHandled = 1;
+        }
+    }
+    if (this == &pDlg->aNameCB)
+        pDlg->sOldName = GetText();
+
+    if (!nHandled)
+        nHandled = ComboBox::Notify( rNEvt );
+
+    bLocked = sal_False;
+
+    return nHandled;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten
+ --------------------------------------------------------------------*/
+
+long HyperCombo::PreNotify( NotifyEvent& rNEvt )
+{
+    long nHandled = 0;
+
+    nHandled = ComboBox::PreNotify( rNEvt );
+
+    return nHandled;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+long HyperCombo::CalcResizeWidth( long nW )
+{
+    long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth);
+
+    if (nNewWidth > nMaxWidth)
+        nNewWidth = nMaxWidth;
+
+    if (nNewWidth != GetSizePixel().Width())
+        return nNewWidth;
+    else
+        return 0;	// Kein Resize notwendig
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+void HyperCombo::DoResize( long nNewWidth )
+{
+    SetSizePixel(Size(nNewWidth, GetSizePixel().Height()));
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: FixedText
+ --------------------------------------------------------------------*/
+
+HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
+        FixedInfo( (Window *)pDialog, rResId )
+{
+    pDlg = pDialog;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen
+ --------------------------------------------------------------------*/
+void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
+{
+    SfxStringItem aName( SID_FILE_NAME, rURL );
+    SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
+    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
+    SfxBoolItem aSilent( SID_SILENT, sal_True );
+    SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
+    SfxBoolItem aExternal( SID_BROWSE, sal_True );
+    SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL;
+
+    if ( pViewFrame )
+    {
+        SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL );
+        if ( pDisp )
+            pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                            &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer, &aExternal, 0L );
+    }
+    else if ( pDisp )
+        pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
+                        &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L );
+}
+// class SvxHyperlinkDialogWrapper ------------------------------------------
+
+SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT)
+
+/*--------------------------------------------------------------------
+    Beschreibung: Wrapper fuer Hyperlinkleiste
+ --------------------------------------------------------------------*/
+
+SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
+                                                SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) :
+
+    SfxChildWindow( _pParent, nId )
+
+{
+    pWindow = new SvxHyperlinkDlg( _pBindings, _pParent );
+    eChildAlignment = SFX_ALIGN_TOP;
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung:
+ --------------------------------------------------------------------*/
+
+SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const
+{
+    SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
+    return aInfo;
+}
+
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
new file mode 100755
index 0000000000..4554a5f0bd
--- /dev/null
+++ b/svx/source/dialog/hyprlink.src
@@ -0,0 +1,167 @@
+/*************************************************************************
+ *
+ * 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 <svx/dialogs.hrc>
+#include "hyprlink.hrc"
+#include "helpid.hrc"
+#include <svx/svxids.hrc>
+
+ // pragma -------------------------------------------------------------------
+
+ // RID_SVXDLG_HYPERLINK ------------------------------------------------------
+ToolBox RID_SVXDLG_HYPERLINK
+{
+    OutputSize = TRUE ;
+    Hide = TRUE;
+
+    //     Dockable = TRUE ;
+    //     Closeable = TRUE ;
+    //     Moveable = TRUE ;
+    //     Sizeable = TRUE ;
+    //     EnableResizing = TRUE ;
+
+    SVLook = TRUE ;
+    Border = TRUE ;
+    Size = MAP_APPFONT ( 410 , 17 ) ;
+    Scroll = TRUE ;
+    HelpID = HID_OFA_HYPERLINK_DLG ;
+
+    Text [ en-US ] = "Insert Hyperlink" ;
+
+    ComboBox CB_NAME
+    {
+        HelpID = HID_OFA_HYPERLINK_NAME ;
+        Pos = MAP_APPFONT ( 2 , 3 ) ;
+        Size = MAP_APPFONT ( 100 , 60 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        AutoSize = TRUE ;
+        AutoHScroll = TRUE ;
+        DDExtraWidth = TRUE ;
+        QuickHelpText [ en-US ] = "URL Name" ;
+    };
+    FixedText FT_URL
+    {
+        HelpID = HID_OFA_HYPERLINK_URL_TXT ;
+        Pos = MAP_APPFONT ( 105 , 5 ) ;
+        Size = MAP_APPFONT ( 16 , 10 ) ;
+        Text [ en-US ] = "URL:" ;
+    };
+    ComboBox CB_URL
+    {
+        HelpID = HID_OFA_HYPERLINK_URL ;
+        Pos = MAP_APPFONT ( 121 , 3 ) ;
+        Size = MAP_APPFONT ( 204 , 60 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        AutoSize = TRUE ;
+        AutoHScroll = TRUE ;
+        DDExtraWidth = TRUE ;
+        QuickHelpText [ en-US ] = "Internet URLs" ;
+    };
+    ItemList =
+    {
+        ToolBoxItem
+        {
+            HelpID = HID_OFA_HYPERLINK_TARGET ;
+            Identifier = BTN_TARGET ;
+            DropDown = TRUE ;
+            Text [ en-US ] = "Target Frame" ;
+        };
+        ToolBoxItem
+        {
+            Type = TOOLBOXITEM_SEPARATOR ;
+        };
+        ToolBoxItem
+        {
+            HelpID = CMD_SID_HYPERLINK_SETLINK ;
+            Identifier = BTN_LINK ;
+            Disable = TRUE ;
+            DropDown = TRUE ;
+            Text [ en-US ] = "Hyperlink" ;
+        };
+        ToolBoxItem
+        {
+            HelpID = CMD_SID_CREATELINK ;
+            Identifier = BTN_INSERT_BOOKMARK ;
+            Disable = TRUE ;
+            Hide = TRUE;
+            Text [ en-US ] = "Link" ;
+        };
+        ToolBoxItem
+        {
+            HelpID = HID_OFA_HYPERLINK_SEARCH ;
+            Identifier = BTN_INET_SEARCH ;
+            Disable = TRUE ;
+            DropDown = TRUE ;
+            Text [ en-US ] = "Find" ;
+        };
+    };
+    String STR_ADDRESS
+    {
+        Text [ en-US ] = "Address Book" ;
+    };
+    String STR_EXPLORER
+    {
+        Text [ en-US ] = "Bookmark folder" ;
+    };
+    String STR_BOOKMARK_SEARCH
+    {
+        Text [ en-US ] = "Search in bookmarks";
+    };
+};
+ // PopupMenu -------------------------------------------------------------
+Menu RID_SVXMN_HYPERLINK
+{
+    ItemList =
+    {
+        MenuItem
+        {
+            Identifier = MN_FIELD ;
+            Text [ en-US ] = "As Text" ;
+        };
+        MenuItem
+        {
+            Identifier = MN_BUTTON ;
+            Text [ en-US ] = "As Button" ;
+        };
+    };
+};
+QueryBox RID_SVXQB_DONTEXIST
+{
+    BUTTONS = WB_YES_NO ;
+    DEFBUTTON = WB_DEF_YES ;
+    Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ;
+};
+
+
+
+
+
+
+
+
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 86f80e405c..130da44ea3 100644..100755
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -63,7 +63,7 @@
 #include <comphelper/processfactory.hxx>
 
 #define _IMAPDLG_PRIVATE
-#include "imapdlg.hxx"
+#include "svx/imapdlg.hxx"
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -71,7 +71,7 @@
 #include "imapdlg.hrc"
 #include "imapwnd.hxx"
 #include "imapimp.hxx"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
@@ -111,13 +111,13 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS
 
 // ControllerItem
 
-SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
+SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
             SfxControllerItem   ( _nId, rBindings ),
             rIMap				( rIMapDlg )
 {
 }
 
-void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
                                    const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_IMAP_EXEC ) && pItem )
@@ -131,7 +131,7 @@ void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
     }
 }
 
-SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, USHORT nId,
+SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId,
                                               SfxBindings* pBindings,
                                               SfxChildWinInfo* pInfo ) :
             SfxChildWindow( _pParent, nId )
@@ -196,7 +196,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
     aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() );
     aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) );
-    aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
+    aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
     TbxClickHdl( &aTbxIMapDlg1 );
 
     SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
@@ -211,16 +211,16 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
     aEdtText.Disable();
     maFtTarget.Disable();
     maCbbTarget.Disable();
-    pOwnData->bExecState = FALSE;
+    pOwnData->bExecState = sal_False;
 
     Resize();
 
     pOwnData->aTimer.SetTimeout( 100 );
     pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
 
-    aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
-    aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
-    aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+    aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+    aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+    aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
 }
 
 SvxIMapDlg::~SvxIMapDlg()
@@ -255,9 +255,9 @@ void SvxIMapDlg::Resize()
     }
 }
 
-BOOL SvxIMapDlg::Close()
+sal_Bool SvxIMapDlg::Close()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
     {
@@ -267,12 +267,12 @@ BOOL SvxIMapDlg::Close()
 
         if( nRet == RET_YES )
         {
-            SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
         else if( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
     else if( pIMapWnd->IsChanged() )
     {
@@ -283,15 +283,15 @@ BOOL SvxIMapDlg::Close()
         if( nRet == RET_YES )
             bRet = DoSave();
         else if( nRet == RET_CANCEL )
-            bRet = FALSE;
+            bRet = sal_False;
     }
 
-    return( bRet ? SfxModelessDialog::Close() : FALSE );
+    return( bRet ? SfxModelessDialog::Close() : sal_False );
 }
 
 // Enabled or disable all Controls
 
-void SvxIMapDlg::SetExecState( BOOL bEnable )
+void SvxIMapDlg::SetExecState( sal_Bool bEnable )
 {
     pOwnData->bExecState = bEnable;
 }
@@ -370,14 +370,14 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt )
 
 IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 {
-    USHORT nNewItemId = pTbx->GetCurItemId();
+    sal_uInt16 nNewItemId = pTbx->GetCurItemId();
 
     switch( pTbx->GetCurItemId() )
     {
         case( TBI_APPLY ):
         {
             URLLoseFocusHdl( NULL );
-            SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+            SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
             GetBindings().GetDispatcher()->Execute(
                 SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
         }
@@ -393,8 +393,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_SELECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
-            pIMapWnd->SetEditMode( TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
+            pIMapWnd->SetEditMode( sal_True );
             if( pTbx->IsKeyEvent() )
             {
                 if((pTbx->GetKeyModifier() & KEY_MOD1) != 0)
@@ -407,7 +407,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_RECT ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_RECT );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -419,7 +419,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_CIRCLE ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_CIRC );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -431,7 +431,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_POLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_POLY );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -443,7 +443,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
 
         case( TBI_FREEPOLY ):
         {
-            pTbx->CheckItem( nNewItemId, TRUE );
+            pTbx->CheckItem( nNewItemId, sal_True );
             pIMapWnd->SetObjKind( OBJ_FREEFILL );
             if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
             {
@@ -456,7 +456,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
         case( TBI_ACTIVE ):
         {
             URLLoseFocusHdl( NULL );
-            BOOL bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
+            sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
             pTbx->CheckItem( TBI_ACTIVE, bNewState );
             pIMapWnd->SetCurrentObjState( !bNewState );
         }
@@ -550,7 +550,7 @@ void SvxIMapDlg::DoOpen()
     }
 }
 
-BOOL SvxIMapDlg::DoSave()
+sal_Bool SvxIMapDlg::DoSave()
 {
        ::sfx2::FileDialogHelper aDlg(
         com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -560,7 +560,7 @@ BOOL SvxIMapDlg::DoSave()
     const String	aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) );
     SdrModel*		pModel = pIMapWnd->GetSdrModel();
     const sal_Bool bChanged = pModel->IsChanged();
-    BOOL			bRet = false;
+    sal_Bool			bRet = false;
 
     aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
     aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
@@ -573,7 +573,7 @@ BOOL SvxIMapDlg::DoSave()
     {
         const String	aFilter( aDlg.GetCurrentFilter() );
         String			aExt;
-        ULONG			nFormat;
+        sal_uIntPtr			nFormat;
 
         if ( aFilter == aBinFilter )
         {
@@ -592,7 +592,7 @@ BOOL SvxIMapDlg::DoSave()
         }
         else
         {
-            return FALSE;
+            return sal_False;
         }
 
         INetURLObject aURL( aDlg.GetPath() );
@@ -616,7 +616,7 @@ BOOL SvxIMapDlg::DoSave()
 
                 delete pOStm;
                 pModel->SetChanged( bChanged );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -645,10 +645,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
 
     if ( !rInfo.bOneMarked )
     {
-        aTbxIMapDlg1.CheckItem( TBI_ACTIVE, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
-        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+        aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
         aStbStatus.SetItemText( 1, aStr );
 
         aFtURL.Disable();
@@ -663,10 +663,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
     }
     else
     {
-        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, TRUE );
+        aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True );
         aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated );
-        aTbxIMapDlg1.EnableItem( TBI_MACRO, TRUE );
-        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, TRUE );
+        aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True );
+        aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True );
 
         aFtURL.Enable();
         maURLBox.Enable();
@@ -786,8 +786,8 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG )
         SetEditingObject( pOwnData->pUpdateEditingObject );
 
         // After changes => default selection
-        aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
-        pIMapWnd->SetEditMode( TRUE );
+        aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
+        pIMapWnd->SetEditMode( sal_True );
     }
 
     // Delete the copied list again in the Update method 
@@ -805,8 +805,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
     const SdrObject*	pObj = pWnd->GetSelectedSdrObject();
     const SdrModel*		pModel = pWnd->GetSdrModel();
     const SdrView*		pView = pWnd->GetSdrView();
-    const BOOL			bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
-    const BOOL			bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
+    const sal_Bool			bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+    const sal_Bool			bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
 
     aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() );
 
@@ -828,7 +828,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
 
     if ( bPolyEdit )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
 
         switch( pWnd->GetPolyEditMode() )
         {
@@ -839,13 +839,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
             break;
         }
 
-        aTbxIMapDlg1.CheckItem( nId, TRUE );
+        aTbxIMapDlg1.CheckItem( nId, sal_True );
     }
     else
     {
-        aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, FALSE );
-        aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, TRUE );
-        aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, FALSE );
+        aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False );
+        aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True );
+        aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False );
         pWnd->SetPolyEditMode( 0 );
     }
 
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 2628486198..2628486198 100644..100755
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index f71ac40484..08468d77b3 100644..100755
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -32,6 +32,7 @@
  // RID_SVXDLG_IMAP ----------------------------------------------------
 ModelessDialog RID_SVXDLG_IMAP
 {
+    HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP";
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP
     };
     ComboBox CBB_URL
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL";
         Pos = MAP_APPFONT ( 39 , 23 ) ;
         Size = MAP_APPFONT ( 225 , 69 ) ;
         TabStop = TRUE ;
@@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP
     };
     Edit EDT_TEXT
     {
+        HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 39 , 41 ) ;
@@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP
      // nur temporaer
     ComboBox RID_SVXCTL_CBB_TARGET
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET";
         Border = TRUE ;
         Sort = TRUE ;
         Pos = MAP_APPFONT ( 213 , 41 ) ;
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 51ebf403f9..d6b273958c 100644..100755
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -48,7 +48,7 @@ public:
     ImageMap		aUpdateImageMap;
     TargetList		aUpdateTargetList;
     void*			pUpdateEditingObject;
-    BOOL			bExecState;
+    sal_Bool			bExecState;
 
                     IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap	( pIMapDlg ), pUpdateEditingObject( NULL )  {}
 };
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 2830da4581..68a6e3da08 100644..100755
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -38,7 +38,7 @@
 #include <svtools/imappoly.hxx>
 #include <svl/urlbmk.hxx>
 
-#include <xoutbmp.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
@@ -93,10 +93,10 @@ IMapWindow::~IMapWindow()
 
 void IMapWindow::SetImageMap( const ImageMap& rImageMap )
 {
-    ReplaceImageMap( rImageMap, FALSE );
+    ReplaceImageMap( rImageMap, sal_False );
 }
 
-void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGraphic*/ )
+void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ )
 {
     SdrPage* pPage = 0;
     aIMap = rImageMap;
@@ -120,9 +120,9 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
     }
 
     // create new drawing objects
-    const USHORT nCount(rImageMap.GetIMapObjectCount());
+    const sal_uInt16 nCount(rImageMap.GetIMapObjectCount());
 
-    for ( USHORT i(nCount); i > 0; i-- )
+    for ( sal_uInt16 i(nCount); i > 0; i-- )
     {
         SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( i - 1 ) );
 
@@ -133,11 +133,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
     }
 }
 
-BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
+sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
 {
     const SdrObject*	pSdrObj = GetSelectedSdrObject();
     IMapObject*			pIMapObj;
-    BOOL				bRet = FALSE;
+    sal_Bool				bRet = sal_False;
 
     if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) )
     {
@@ -145,9 +145,9 @@ BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
         pIMapObj->SetAltText( rNewInfo.aMarkAltText );
         pIMapObj->SetTarget( rNewInfo.aMarkTarget );
         pModel->SetChanged( sal_True );
-        UpdateInfo( FALSE );
+        UpdateInfo( sal_False );
 
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -201,7 +201,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
         case( IMAP_OBJ_RECTANGLE ):
         {
             IMapRectangleObject*	pIMapRectObj = (IMapRectangleObject*) pIMapObj;
-            Rectangle				aDrawRect( pIMapRectObj->GetRectangle( FALSE ) );
+            Rectangle				aDrawRect( pIMapRectObj->GetRectangle( sal_False ) );
 
             // clipped on CanvasPane
             aDrawRect.Intersection( aClipRect );
@@ -214,8 +214,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
         case( IMAP_OBJ_CIRCLE ):
         {
             IMapCircleObject*	pIMapCircleObj = (IMapCircleObject*) pIMapObj;
-            const Point			aCenter( pIMapCircleObj->GetCenter( FALSE ) );
-            const long			nRadius = pIMapCircleObj->GetRadius( FALSE );
+            const Point			aCenter( pIMapCircleObj->GetCenter( sal_False ) );
+            const long			nRadius = pIMapCircleObj->GetRadius( sal_False );
             const Point			aOffset( nRadius, nRadius );
             Rectangle			aCircle( aCenter - aOffset, aCenter + aOffset );
 
@@ -243,7 +243,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
             }
             else
             {
-                const Polygon& 	rPoly = pIMapPolyObj->GetPolygon( FALSE );
+                const Polygon& 	rPoly = pIMapPolyObj->GetPolygon( sal_False );
                 Polygon         aDrawPoly( rPoly );
 
                 // clipped on CanvasPane
@@ -298,7 +298,7 @@ void IMapWindow::InitSdrModel()
     aSet.Put( XFillColorItem( String(), TRANSCOL ) );
     aSet.Put( XFillTransparenceItem( 50 ) );
     pView->SetAttributes( aSet );
-    pView->SetFrameDragSingles( TRUE );
+    pView->SetFrameDragSingles( sal_True );
 }
 
 void IMapWindow::SdrObjCreated( const SdrObject& rObj )
@@ -309,7 +309,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
         {
             SdrRectObj*			 pRectObj = (SdrRectObj*) &rObj;
             IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(),
-                String(), String(), String(), String(), String(), TRUE, FALSE );
+                String(), String(), String(), String(), String(), sal_True, sal_False );
 
             pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
         }
@@ -318,11 +318,11 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
         case( OBJ_CIRC ):
         {
             SdrCircObj* pCircObj = (SdrCircObj*) &rObj;
-            SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( FALSE, FALSE );
+            SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False );
             Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
             delete pPathObj;
 
-            IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(),  TRUE, FALSE );
+            IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(),  sal_True, sal_False );
             pObj->SetExtraEllipse( aPoly.GetBoundRect() );
             pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
         }
@@ -339,7 +339,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
             if ( rXPolyPoly.count() )
             {
                 Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
-                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(),  TRUE, FALSE );
+                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(),  sal_True, sal_False );
                 pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
             }
         }
@@ -361,7 +361,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
         String			aDesc;
         String			aTarget;
         IMapObjectPtr	pIMapObj = pUserData->GetObject();
-        BOOL			bActive = TRUE;
+        sal_Bool			bActive = sal_True;
 
         if ( pIMapObj.get() )
         {
@@ -377,17 +377,17 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
             case( OBJ_RECT ):
             {
                 pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
-                          aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ) ) );
+                          aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) );
             }
             break;
 
             case( OBJ_CIRC ):
             {
                 const SdrCircObj& rCircObj = (const SdrCircObj&) rObj;
-                SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( FALSE, FALSE );
+                SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False );
                 Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
 
-                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+                IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
                 pObj->SetExtraEllipse( aPoly.GetBoundRect() );
 
                 // was only created by us temporarily
@@ -407,7 +407,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
                 if ( rXPolyPoly.count() )
                 {
                     Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
-                    IMapPolygonObject*	pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+                    IMapPolygonObject*	pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
                     pUserData->ReplaceObject( IMapObjectPtr(pObj) );
                 }
             }
@@ -422,13 +422,13 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
 void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
 {
     GraphCtrl::MouseButtonUp( rMEvt );
-    UpdateInfo( TRUE );
+    UpdateInfo( sal_True );
 }
 
 void IMapWindow::MarkListHasChanged()
 {
     GraphCtrl::MarkListHasChanged();
-    UpdateInfo( FALSE );
+    UpdateInfo( sal_False );
 }
 
 SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
@@ -439,7 +439,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
     if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) )
     {
         SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
-        ULONG	 nCount;
+        sal_uIntPtr	 nCount;
 
         if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
         {
@@ -479,11 +479,11 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const
 {
     SdrObject*	pSdrObj = NULL;
     SdrPage*	pPage = (SdrPage*) pModel->GetPage( 0 );
-    ULONG		nCount;
+    sal_uIntPtr		nCount;
 
     if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
     {
-        for ( ULONG i = 0; i < nCount; i++ )
+        for ( sal_uIntPtr i = 0; i < nCount; i++ )
         {
             SdrObject* pTestObj = pPage->GetObj( i );
 
@@ -506,21 +506,21 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
     {
         PopupMenu			aMenu( SVX_RES( RID_SVXMN_IMAP ) );
         const SdrMarkList&	rMarkList = pView->GetMarkedObjectList();
-        ULONG				nMarked = rMarkList.GetMarkCount();
+        sal_uIntPtr				nMarked = rMarkList.GetMarkCount();
 
-        aMenu.EnableItem( MN_URL, FALSE );
-        aMenu.EnableItem( MN_ACTIVATE, FALSE );
-        aMenu.EnableItem( MN_MACRO, FALSE );
+        aMenu.EnableItem( MN_URL, sal_False );
+        aMenu.EnableItem( MN_ACTIVATE, sal_False );
+        aMenu.EnableItem( MN_MACRO, sal_False );
         aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() );
 
         if ( !nMarked )
         {
-            aMenu.EnableItem( MN_POSITION, FALSE );
-            aMenu.EnableItem( MN_FRAME_TO_TOP, FALSE );
-            aMenu.EnableItem( MN_MOREFRONT, FALSE );
-            aMenu.EnableItem( MN_MOREBACK, FALSE );
-            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, FALSE );
-            aMenu.EnableItem( MN_DELETE1, FALSE );
+            aMenu.EnableItem( MN_POSITION, sal_False );
+            aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False );
+            aMenu.EnableItem( MN_MOREFRONT, sal_False );
+            aMenu.EnableItem( MN_MOREBACK, sal_False );
+            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False );
+            aMenu.EnableItem( MN_DELETE1, sal_False );
         }
         else
         {
@@ -528,18 +528,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
             {
                 SdrObject*	pSdrObj = GetSelectedSdrObject();
 
-                aMenu.EnableItem( MN_URL, TRUE );
-                aMenu.EnableItem( MN_ACTIVATE, TRUE );
-                aMenu.EnableItem( MN_MACRO, TRUE );
+                aMenu.EnableItem( MN_URL, sal_True );
+                aMenu.EnableItem( MN_ACTIVATE, sal_True );
+                aMenu.EnableItem( MN_MACRO, sal_True );
                 aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() );
             }
 
-            aMenu.EnableItem( MN_POSITION, TRUE );
-            aMenu.EnableItem( MN_FRAME_TO_TOP, TRUE );
-            aMenu.EnableItem( MN_MOREFRONT, TRUE );
-            aMenu.EnableItem( MN_MOREBACK, TRUE );
-            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, TRUE );
-            aMenu.EnableItem( MN_DELETE1, TRUE );
+            aMenu.EnableItem( MN_POSITION, sal_True );
+            aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True );
+            aMenu.EnableItem( MN_MOREFRONT, sal_True );
+            aMenu.EnableItem( MN_MOREBACK, sal_True );
+            aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True );
+            aMenu.EnableItem( MN_DELETE1, sal_True );
         }
 
         aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) );
@@ -573,7 +573,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
             pModel->SetChanged( sal_True );
             pView->UnmarkAll();
             pView->MarkObj( pSdrObj, pView->GetSdrPageView() );
-            UpdateInfo( TRUE );
+            UpdateInfo( sal_True );
             nRet =  rEvt.mnAction;
         }
     }
@@ -612,7 +612,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
     }
 }
 
-void IMapWindow::SetCurrentObjState( BOOL bActive )
+void IMapWindow::SetCurrentObjState( sal_Bool bActive )
 {
     SdrObject* pObj = GetSelectedSdrObject();
 
@@ -635,11 +635,11 @@ void IMapWindow::SetCurrentObjState( BOOL bActive )
             aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) );
         }
 
-        pView->SetAttributes( aSet, FALSE );
+        pView->SetAttributes( aSet, sal_False );
     }
 }
 
-void IMapWindow::UpdateInfo( BOOL bNewObj )
+void IMapWindow::UpdateInfo( sal_Bool bNewObj )
 {
     if ( aInfoLink.IsSet() )
     {
@@ -650,7 +650,7 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
 
         if ( pIMapObj )
         {
-            aInfo.bOneMarked = TRUE;
+            aInfo.bOneMarked = sal_True;
             aInfo.aMarkURL = pIMapObj->GetURL();
             aInfo.aMarkAltText = pIMapObj->GetAltText();
             aInfo.aMarkTarget = pIMapObj->GetTarget();
@@ -660,8 +660,8 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
         else
         {
             aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String();
-            aInfo.bOneMarked = FALSE;
-            aInfo.bActivated = FALSE;
+            aInfo.bOneMarked = sal_False;
+            aInfo.bActivated = sal_False;
         }
 
         aInfoLink.Call( this );
@@ -694,7 +694,7 @@ void IMapWindow::DoMacroAssign()
             const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
             pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
             pModel->SetChanged( sal_True );
-            UpdateInfo( FALSE );
+            UpdateInfo( sal_False );
         }
 
         delete pMacroDlg;
@@ -732,7 +732,7 @@ void IMapWindow::DoPropertyDialog()
                 pIMapObj->SetTarget( aDlg->GetTarget() );
                 pIMapObj->SetName( aDlg->GetName() );
                 pModel->SetChanged( sal_True );
-                UpdateInfo( TRUE );
+                UpdateInfo( sal_True );
             }
             delete aDlg;
         }
@@ -743,7 +743,7 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
 {
     if (pMenu)
     {
-        USHORT  nId = pMenu->GetCurItemId();
+        sal_uInt16  nId = pMenu->GetCurItemId();
 
         switch(nId)
         {
@@ -757,11 +757,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
 
             case( MN_ACTIVATE ):
             {
-                const BOOL bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+                const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
 
                 pMenu->CheckItem( MN_ACTIVATE, bNewState );
                 SetCurrentObjState( bNewState );
-                UpdateInfo( FALSE );
+                UpdateInfo( sal_False );
             }
 
             case( MN_FRAME_TO_TOP ):
@@ -860,7 +860,7 @@ void IMapWindow::SelectFirstObject()
     {
         GrabFocus();
         pView->UnmarkAllObj();
-        pView->MarkNextObj(TRUE);
+        pView->MarkNextObj(sal_True);
     }
 }
 
@@ -869,7 +869,7 @@ void IMapWindow::StartPolyEdit()
     GrabFocus();
 
     if( !pView->AreObjectsMarked() )
-        pView->MarkNextObj(TRUE);
+        pView->MarkNextObj(sal_True);
 
     const SdrHdlList& rHdlList = pView->GetHdlList();
     SdrHdl* pHdl = rHdlList.GetFocusHdl();
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 534e504804..189398bdbf 100644..100755
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -46,9 +46,9 @@ struct NotifyInfo
     String	aMarkURL;
     String  aMarkAltText;
     String	aMarkTarget;
-    BOOL	bNewObj;
-    BOOL	bOneMarked;
-    BOOL	bActivated;
+    sal_Bool	bNewObj;
+    sal_Bool	bOneMarked;
+    sal_Bool	bActivated;
 };
 
 
@@ -56,16 +56,16 @@ struct NotifyPosSize
 {
     Size	aPictureSize;
     Point	aMousePos;
-    BOOL	bPictureSize;
-    BOOL	bMousePos;
+    sal_Bool	bPictureSize;
+    sal_Bool	bMousePos;
 };
 
 #define SVD_IMAP_USERDATA	0x0001
 
-const UINT32 IMapInventor = UINT32('I') * 0x00000001+
-                            UINT32('M') * 0x00000100+
-                            UINT32('A') * 0x00010000+
-                            UINT32('P') * 0x01000000;
+const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
+                            sal_uInt32('M') * 0x00000100+
+                            sal_uInt32('A') * 0x00010000+
+                            sal_uInt32('P') * 0x01000000;
 
 
 typedef boost::shared_ptr< IMapObject > IMapObjectPtr;
@@ -128,7 +128,7 @@ protected:
     virtual sal_Int8	ExecuteDrop( const ExecuteDropEvent& rEvt );
 
     void				CreateImageMap();
-    void				ReplaceImageMap( const ImageMap& rNewImageMap, BOOL bScaleToGraphic );
+    void				ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic );
 
     void				ClearTargetList();
 
@@ -137,19 +137,19 @@ protected:
     SdrObject*			GetSdrObj( const IMapObject* pIMapObj ) const;
     SdrObject*			GetHitSdrObj( const Point& rPosPixel ) const;
 
-    void				UpdateInfo( BOOL bNewObj );
+    void				UpdateInfo( sal_Bool bNewObj );
 
 public:
 
                         IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
                         ~IMapWindow();
 
-    BOOL				ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
+    sal_Bool				ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
 
     void				SetImageMap( const ImageMap& rImageMap );
     const ImageMap&		GetImageMap();
 
-    void				SetCurrentObjState( BOOL bActive );
+    void				SetCurrentObjState( sal_Bool bActive );
     void				DoMacroAssign();
     void				DoPropertyDialog();
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b8c1ecb0f3..55d0d39ef4 100644..100755
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno;
 
 // -----------------------------------------------------------------------
 
-String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
+String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg )
 {
     INetURLObject aURLObj;
     aURLObj.SetSmartProtocol( INET_PROT_FILE );
@@ -85,14 +85,14 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
 //	misc local helper functions
 //========================================================================
 
-static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
+static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
 {
     const Locale *pLocale = rSeq.getConstArray();
-    INT32 nCount = rSeq.getLength();
+    sal_Int32 nCount = rSeq.getLength();
 
-    Sequence< INT16 >	aLangs( nCount );
-    INT16 *pLang = aLangs.getArray();
-    for (INT32 i = 0;  i < nCount;  ++i)
+    Sequence< sal_Int16 >	aLangs( nCount );
+    sal_Int16 *pLang = aLangs.getArray();
+    for (sal_Int32 i = 0;  i < nCount;  ++i)
     {
         pLang[i] = SvxLocaleToLanguage( pLocale[i] );
 
@@ -102,13 +102,13 @@ static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
 }
 
 
-static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
+static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang )
 {
-    INT32 i = -1;
-    INT32 nLen = rLangSeq.getLength();
+    sal_Int32 i = -1;
+    sal_Int32 nLen = rLangSeq.getLength();
     if (nLen)
     {
-        const INT16 *pLang = rLangSeq.getConstArray();
+        const sal_Int16 *pLang = rLangSeq.getConstArray();
         for (i = 0;  i < nLen;  ++i)
         {
             if (nLang == pLang[i])
@@ -122,20 +122,20 @@ static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
 //	class SvxLanguageBox
 //========================================================================
 
-USHORT TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
+sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
 {
-    USHORT	nPos   = LISTBOX_ENTRY_NOTFOUND;
-    USHORT	nCount = rLb.GetEntryCount();
+    sal_uInt16	nPos   = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16	nCount = rLb.GetEntryCount();
 
-    for ( USHORT i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
-        if ( eType == LanguageType((ULONG)rLb.GetEntryData(i)) )
+    for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
+        if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) )
             nPos = i;
 
     return nPos;
 }
 
 //-----------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) :
     ListBox( pParent, nWinStyle ),
     m_pSpellUsedLang( NULL ),
     m_bWithCheckmark( bCheck )
@@ -143,7 +143,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck
     Init();
 }
 //------------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) :
     ListBox( pParent, rResId ),
     m_pSpellUsedLang( NULL ),
     m_bWithCheckmark( bCheck )
@@ -158,8 +158,8 @@ void SvxLanguageBox::Init()
     m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
     m_aAllString			= String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
     m_nLangList				= LANG_LIST_EMPTY;
-    m_bHasLangNone			= FALSE;
-    m_bLangNoneIsLangAll	= FALSE;
+    m_bHasLangNone			= sal_False;
+    m_bLangNoneIsLangAll	= sal_False;
 
     // display entries sorted
     SetStyle( GetStyle() | WB_SORT );
@@ -172,12 +172,12 @@ void SvxLanguageBox::Init()
         {
             LanguageType nLangType = aLangTable.GetTypeAtIndex( i );
 
-            BOOL bInsert = TRUE;
+            sal_Bool bInsert = sal_True;
             if ((LANGUAGE_DONTKNOW == nLangType)  ||
                 (LANGUAGE_SYSTEM   == nLangType)  ||
                 (LANGUAGE_USER1 <= nLangType  &&  nLangType <= LANGUAGE_USER9))
             {
-                bInsert = FALSE;
+                bInsert = sal_False;
             }
 
             if ( bInsert )
@@ -196,9 +196,9 @@ SvxLanguageBox::~SvxLanguageBox()
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked )
+sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked )
 {
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
     if( !bChecked )
         nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
     else
@@ -208,8 +208,8 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo
 
 //------------------------------------------------------------------------
 
-void SvxLanguageBox::SetLanguageList( INT16 nLangList,
-        BOOL bHasLangNone, BOOL bLangNoneIsLangAll, BOOL bCheckSpellAvail )
+void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
+        sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail )
 {
     Clear();
 
@@ -220,12 +220,12 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
 
     if ( LANG_LIST_EMPTY != nLangList )
     {
-        Sequence< INT16 > aSpellAvailLang;
-        Sequence< INT16 > aHyphAvailLang;
-        Sequence< INT16 > aThesAvailLang;
-        Sequence< INT16 > aSpellUsedLang;
-        Sequence< INT16 > aHyphUsedLang;
-        Sequence< INT16 > aThesUsedLang;
+        Sequence< sal_Int16 > aSpellAvailLang;
+        Sequence< sal_Int16 > aHyphAvailLang;
+        Sequence< sal_Int16 > aThesAvailLang;
+        Sequence< sal_Int16 > aSpellUsedLang;
+        Sequence< sal_Int16 > aHyphUsedLang;
+        Sequence< sal_Int16 > aThesUsedLang;
         Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY );
         if (xAvail.is())
         {
@@ -332,14 +332,14 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
+sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType )
 {
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the
@@ -347,7 +347,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
     // string as would be returned by SvtLanguageTable::GetString().
     if (nLang != nLangType)
     {
-        USHORT nAt = TypeToPos_Impl( nLang, *this );
+        sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
         if ( nAt != LISTBOX_ENTRY_NOTFOUND )
             return nAt;
     }
@@ -366,7 +366,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
 
     aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
 
-    USHORT nAt = 0;
+    sal_uInt16 nAt = 0;
     if ( m_bWithCheckmark )
     {
         sal_Bool bFound = sal_False;
@@ -375,31 +375,31 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
         {
             Reference< XSpellChecker1 > xSpell( SvxGetSpellChecker(), UNO_QUERY );
             if ( xSpell.is() )
-                m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
+                m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() );
         }
         bFound = m_pSpellUsedLang ?
-            lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE;
+            lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False;
 
         nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
     }
     else
         nAt = InsertEntry( aStrEntry, nPos );
 
-    SetEntryData( nAt, (void*)(ULONG)nLangType );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nLangType );
     return nAt;
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
-        BOOL bCheckEntry, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
+        sal_Bool bCheckEntry, sal_uInt16 nPos )
 {
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
     // For obsolete and to be replaced languages check whether an entry of the
@@ -407,7 +407,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
     // string as would be returned by SvtLanguageTable::GetString().
     if (nLang != nLangType)
     {
-        USHORT nAt = TypeToPos_Impl( nLang, *this );
+        sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
         if ( nAt != LISTBOX_ENTRY_NOTFOUND )
             return nAt;
     }
@@ -416,8 +416,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
     if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
         aStrEntry = m_aAllString;
 
-    USHORT nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
-    SetEntryData( nAt, (void*)(ULONG)nLang );
+    sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nLang );
 
     return nAt;
 }
@@ -426,7 +426,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
 
 void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
 {
-    USHORT nAt = TypeToPos_Impl( eLangType, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         RemoveEntry( nAt );
@@ -436,23 +436,23 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
 
 LanguageType SvxLanguageBox::GetSelectLanguage() const
 {
-    USHORT 		 nPos	= GetSelectEntryPos();
+    sal_uInt16 		 nPos	= GetSelectEntryPos();
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return LanguageType( (ULONG)GetEntryData(nPos) );
+        return LanguageType( (sal_uIntPtr)GetEntryData(nPos) );
     else
         return LanguageType( LANGUAGE_DONTKNOW );
 }
 
 //------------------------------------------------------------------------
 
-void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect )
+void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect )
 {
     // If the core uses a LangID of an imported MS document and wants to select
     // a language that is replaced, we need to select the replacement instead.
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
 
-    USHORT nAt = TypeToPos_Impl( nLang, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         SelectEntryPos( nAt, bSelect );
@@ -460,17 +460,17 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect
 
 //------------------------------------------------------------------------
 
-BOOL SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
+sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
 {
     // Same here, work on the replacement if applicable.
     LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
 
-    USHORT nAt = TypeToPos_Impl( nLang, *this );
+    sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         return IsEntryPosSelected( nAt );
     else
-        return FALSE;
+        return sal_False;
 }
 
 #if ENABLE_LAYOUT
@@ -482,7 +482,7 @@ SvxLanguageBox::~SvxLanguageBox ()
 {
 }
 
-SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, BOOL bCheck )
+SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck )
 : ListBox ( pParent, pFile, bCheck )
 {
 }
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index b7cc9c40fc..b7cc9c40fc 100644..100755
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src
index 9cd239996e..9cd239996e 100644..100755
--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.src
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index d69ddda72b..d69ddda72b 100644..100755
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
diff --git a/svx/source/dialog/linkwarn.hrc b/svx/source/dialog/linkwarn.hrc
deleted file mode 100644
index d01dc88d8e..0000000000
--- a/svx/source/dialog/linkwarn.hrc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * Copyright 2010 Novell, Inc.
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef _SVX_LINKWARN_HRC
-#define _SVX_LINKWARN_HRC
-
-#include <svtools/controldims.hrc>
-
-// dialog ids
-#define FI_QUERY        10
-#define FT_INFOTEXT     11
-#define PB_OK          12
-#define PB_NO           13
-#define FL_OPTION       15
-#define CB_WARNING_OFF  16
-
-// --------- general metrics ---------
-
-#define SYMBOL_EDGE         20
-#define DIALOG_WIDTH        220
-#define INFO_TEXT_LINES     11
-
-#define AW_COL_1            (RSC_SP_DLG_INNERBORDER_LEFT)
-#define AW_COL_2            (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X)
-#define AW_COL_3            (AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X)
-#define AW_COL_4            (DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define AW_ROW_1            (RSC_SP_DLG_INNERBORDER_TOP)
-#define AW_ROW_2            (AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
-#define AW_ROW_3            (AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define AW_ROW_4            (AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-
-#define DIALOG_HEIGHT       (AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM)
-
-#endif
diff --git a/svx/source/dialog/linkwarn.src b/svx/source/dialog/linkwarn.src
index 100b53cb6e..100b53cb6e 100644..100755
--- a/svx/source/dialog/linkwarn.src
+++ b/svx/source/dialog/linkwarn.src
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 2f1d36c85c..2f1d36c85c 100644..100755
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 47c08a9da9..5a1a24bcce 100644..100755
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -34,9 +34,9 @@
 #include <svx/svdomeas.hxx>
 #include <svx/svdmodel.hxx>
 
-#include "measctrl.hxx"
+#include "svx/measctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 SvxXMeasurePreview::SvxXMeasurePreview
 (
@@ -100,9 +100,9 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs )
 
 void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    BOOL bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
-    BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
-    BOOL bCtrl	  = rMEvt.IsMod1();
+    sal_Bool bZoomIn  = rMEvt.IsLeft() && !rMEvt.IsShift();
+    sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+    sal_Bool bCtrl	  = rMEvt.IsMod1();
 
     if( bZoomIn || bZoomOut )
     {
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 4c618013e9..ca583eb551 100644..100755
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -39,10 +39,10 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include "optgrid.hxx"
+#include "svx/optgrid.hxx"
 #include <svx/dialogs.hrc>
 #include "optgrid.hrc"
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 
 // local functions
 void	lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax)
@@ -185,7 +185,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     aFtBezAngle         ( this, SVX_RES( FT_BEZ_ANGLE ) ),
     aMtrFldBezAngle     ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ),
 
-    bAttrModified( FALSE )
+    bAttrModified( sal_False )
 {
     // This page requires exchange Support
     SetExchangeSupport();
@@ -198,11 +198,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
     long nFirst, nLast, nMin, nMax;
 
     lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
-    SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+    SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
     lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
 
     lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
-    SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+    SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
     lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
 
 
@@ -219,6 +219,17 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
         LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
     aNumFldDivisionY.SetModifyHdl(
         LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
+
+    ::rtl::OUString sFlResolution( aFlResolution.GetDisplayText() );
+    ::rtl::OUString sFtDrawX(aFtDrawX.GetDisplayText());
+    ::rtl::OUString sFtDrawY(aFtDrawY.GetDisplayText());
+    aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution   );
+    aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution   );
+    ::rtl::OUString sFlDivision( aFlDivision.GetDisplayText() );
+    ::rtl::OUString sFtDivisionX(aFtDivisionX.GetDisplayText());
+    ::rtl::OUString sFtDivisionY(aFtDivisionY.GetDisplayText());
+    aNumFldDivisionX.SetAccessibleName(  sFtDivisionX + sFlDivision );
+    aNumFldDivisionY.SetAccessibleName(  sFtDivisionY + sFlDivision );
 }
 
 //------------------------------------------------------------------------
@@ -230,7 +241,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
 
 //------------------------------------------------------------------------
 
-BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
     if ( bAttrModified )
     {
@@ -245,10 +256,10 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
         long nX =GetCoreValue(	aMtrFldDrawX, eUnit );
         long nY = GetCoreValue(	aMtrFldDrawY, eUnit );
 
-        aGridItem.nFldDrawX    = (UINT32) nX;
-        aGridItem.nFldDrawY    = (UINT32) nY;
-        aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue());
-        aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue());
+        aGridItem.nFldDrawX    = (sal_uInt32) nX;
+        aGridItem.nFldDrawY    = (sal_uInt32) nY;
+        aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1);
+        aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1);
 
         rCoreSet.Put( aGridItem );
     }
@@ -261,7 +272,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pAttr = 0;
 
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
@@ -274,12 +285,12 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
         SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
         SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
 
-        aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX );
-        aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY );
+        aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 );
+        aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 );
     }
 
     ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
-    bAttrModified = FALSE;
+    bAttrModified = sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -287,7 +298,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pAttr = NULL;
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
@@ -298,7 +309,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
 
     // Metric Change if necessary (as TabPage is in the dialog, where the
     // metric can be set
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE,
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
                                     (const SfxPoolItem**)&pAttr ))
     {
         const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
@@ -312,14 +323,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
             long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) ));
 
             lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
-            SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+            SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
             lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
 
             aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP );
 
             nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) ));
             lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
-            SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+            SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
             lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
             aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP );
 
@@ -337,7 +348,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
 //------------------------------------------------------------------------
 IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     if( aCbxSynchronize.IsChecked() )
     {
         if(pField == &aMtrFldDrawX)
@@ -363,7 +374,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     if( aCbxSynchronize.IsChecked() )
     {
         if(&aNumFldDivisionX == pField)
@@ -377,7 +388,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 
 IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG )
 {
-    bAttrModified = TRUE;
+    bAttrModified = sal_True;
     return 0;
 }
 
diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc
index f010dbb6a6..f010dbb6a6 100644..100755
--- a/svx/source/dialog/optgrid.hrc
+++ b/svx/source/dialog/optgrid.hrc
diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src
index e427ddfd08..c2bb8ef1c4 100644..100755
--- a/svx/source/dialog/optgrid.src
+++ b/svx/source/dialog/optgrid.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_USE_GRIDSNAP
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 204 , 10 ) ;
         TabStop = TRUE ;
@@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_GRID_VISIBLE
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 204 , 10 ) ;
         TabStop = TRUE ;
@@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID
     };
     MetricField MTR_FLD_DRAW_X
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 54 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID
     };
     MetricField MTR_FLD_DRAW_Y
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 69 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -129,12 +133,14 @@ TabPage RID_SVXPAGE_GRID
     };
     NumericField NUM_FLD_DIVISION_X
     {
+        HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 195 , 54 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
+        Minimum = 1 ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
@@ -144,16 +150,18 @@ TabPage RID_SVXPAGE_GRID
     {
         Pos = MAP_APPFONT ( 223 , 56 ) ;
         Size = MAP_APPFONT ( 29 , 8 ) ;
-        Text [ en-US ] = "point(s)" ;
+        Text [ en-US ] = "space(s)" ;
     };
     NumericField NUM_FLD_DIVISION_Y
     {
+        HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 195 , 69 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
+        Minimum = 1 ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
@@ -167,6 +175,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_SYNCHRONIZE
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 127 , 10 ) ;
         TabStop = TRUE ;
@@ -182,6 +191,7 @@ TabPage RID_SVXPAGE_GRID
 
     CheckBox CBX_SNAP_HELPLINES
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES";
         Pos = MAP_APPFONT ( 12 , 111  ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Hide = TRUE;
@@ -190,6 +200,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_SNAP_BORDER
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER";
         Hide = TRUE;
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 125  ) ;
@@ -198,6 +209,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_SNAP_FRAME
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME";
         Pos = MAP_APPFONT ( 12 , 139  ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Hide = TRUE;
@@ -206,6 +218,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_SNAP_POINTS
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS";
         Pos = MAP_APPFONT ( 12 , 153  ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Hide = TRUE;
@@ -221,6 +234,7 @@ TabPage RID_SVXPAGE_GRID
     };
     MetricField MTR_FLD_SNAP_AREA
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 83 , 167  ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -252,6 +266,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_ORTHO
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO";
         Pos = MAP_APPFONT ( 136 , 111  ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Hide = TRUE;
@@ -260,6 +275,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_BIGORTHO
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO";
         Pos = MAP_APPFONT ( 136 , 125  ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Hide = TRUE;
@@ -268,6 +284,7 @@ TabPage RID_SVXPAGE_GRID
     };
     CheckBox CBX_ROTATE
     {
+        HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE";
         Pos = MAP_APPFONT ( 136 , 139  ) ;
          // 136, 111
         Size = MAP_APPFONT ( 55 , 10 ) ;
@@ -277,6 +294,7 @@ TabPage RID_SVXPAGE_GRID
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 194 , 137  ) ;
          // 190, 111
@@ -302,6 +320,7 @@ TabPage RID_SVXPAGE_GRID
     };
     MetricField MTR_FLD_BEZ_ANGLE
     {
+        HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 194 , 154  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index 713ca089ba..a291fc94ff 100644..100755
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -28,13 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "orienthelper.hxx"
+#include "svx/orienthelper.hxx"
 
 #include <vector>
 #include <utility>
 
 #include <vcl/button.hxx>
-#include "dialcontrol.hxx"
+#include "svx/dialcontrol.hxx"
 
 namespace svx {
 
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 7e27de2bb9..bda7ec5a9f 100644..100755
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -54,7 +54,7 @@ struct PageWindow_Impl
 
     PageWindow_Impl() :
         pBorder(0),
-        bBitmap(FALSE),
+        bBitmap(sal_False),
         bResetBackground(sal_False),
         bFrameDirection(sal_False),
         nFrameDirection(0) {}
@@ -92,11 +92,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) :
     nFtHeight	( 0 ),
     aFtColor    ( COL_TRANSPARENT ),
     pFtBorder 	( 0 ),
-    bFooter		( FALSE ),
-    bHeader		( FALSE ),
-    bTable		( FALSE ),
-    bHorz		( FALSE ),
-    bVert		( FALSE ),
+    bFooter		( sal_False ),
+    bHeader		( sal_False ),
+    bTable		( sal_False ),
+    bHorz		( sal_False ),
+    bVert		( sal_False ),
     eUsage		( SVX_PAGE_ALL )
 
 {
@@ -160,23 +160,23 @@ void SvxPageWindow::Paint( const Rectangle& )
             aSz = PixelToLogic( GetSizePixel() );
             nYPos = ( aSz.Height() - aSize.Height() ) / 2;
             long nXPos = ( aSz.Width() - aSize.Width() ) / 2;
-            DrawPage( Point( nXPos, nYPos ), TRUE, TRUE );
+            DrawPage( Point( nXPos, nYPos ), sal_True, sal_True );
         }
         else
             // Portrait
-            DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), TRUE, TRUE );
+            DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True );
     }
     else
     {
         // Left and right page are different -> draw two pages if possible
-        DrawPage( Point( 0, nYPos ), FALSE, (BOOL)( eUsage & SVX_PAGE_LEFT ) );
-        DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), TRUE,
-                  (BOOL)( eUsage & SVX_PAGE_RIGHT ) );
+        DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) );
+        DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True,
+                  (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) );
     }
 }
 
 // -----------------------------------------------------------------------
-void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL bEnabled )
+void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rFieldColor = rStyleSettings.GetFieldColor();
@@ -311,12 +311,12 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
             break;
         }
         sText.Append(cArrow);
-        for(USHORT i = 0; i < sText.Len(); i++)
+        for(sal_uInt16 i = 0; i < sText.Len(); i++)
         {
             String sDraw(sText.GetChar(i));
             long nHDiff = 0;
             long nCharWidth = GetTextWidth(sDraw);
-            BOOL bHorizontal = 0 == aMove.Y();
+            sal_Bool bHorizontal = 0 == aMove.Y();
             if(!bHorizontal)
             {
                 nHDiff = (nAWidth - nCharWidth)/2;
@@ -348,14 +348,14 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
         long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top();
         Rectangle aCellRect( Point( _nLeft, _nTop ), Size( CELL_WIDTH, CELL_HEIGHT ) );
 
-        for ( USHORT i = 0; i < 3; ++i )
+        for ( sal_uInt16 i = 0; i < 3; ++i )
         {
             aCellRect.Left() = _nLeft;
             aCellRect.Right() = _nLeft + CELL_WIDTH;
             if ( i > 0 )
                 aCellRect.Move( 0, CELL_HEIGHT );
 
-            for ( USHORT j = 0; j < 3; ++j )
+            for ( sal_uInt16 j = 0; j < 3; ++j )
             {
                 if ( j > 0 )
                     aCellRect.Move( CELL_WIDTH, 0 );
@@ -380,10 +380,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp )
     if ( pBmp )
     {
         pImpl->aBitmap = *pBmp;
-        pImpl->bBitmap = TRUE;
+        pImpl->bBitmap = sal_True;
     }
     else
-        pImpl->bBitmap = FALSE;
+        pImpl->bBitmap = sal_False;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 28d9aba686..85708dfa68 100644..100755
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -72,14 +72,14 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
 
 void SvxParaPrevWindow::Paint( const Rectangle& )
 {
-    DrawParagraph( TRUE );
+    DrawParagraph( sal_True );
 }
 
 // -----------------------------------------------------------------------
 
 #define DEF_MARGIN	120
 
-void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
+void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     const Color& rWinColor = rStyleSettings.GetWindowColor();
@@ -98,7 +98,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
     aPnt.X() = DEF_MARGIN / 2;
     SetFillColor( aGrayColor );
 
-    for ( USHORT i = 0; i < 9; ++i )
+    for ( sal_uInt16 i = 0; i < 9; ++i )
     {
         if ( 3 == i )
         {
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index eae5fbb231..24af01fb1f 100644..100755
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -35,7 +35,7 @@
 
 #define _SVX_PASSWD_CXX
 
-#include "passwd.hxx"
+#include "svx/passwd.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include "passwd.hrc"
@@ -44,7 +44,7 @@
 
 IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
 {
-    BOOL bOK = TRUE;
+    sal_Bool bOK = sal_True;
     short nRet = RET_OK;
     String aEmpty;
 
@@ -54,7 +54,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
         aNewPasswdED.SetText( aEmpty );
         aRepeatPasswdED.SetText( aEmpty );
         aNewPasswdED.GrabFocus();
-        bOK = FALSE;
+        bOK = sal_False;
     }
 
     if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
@@ -62,7 +62,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
         ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute();
         aOldPasswdED.SetText( aEmpty );
         aOldPasswdED.GrabFocus();
-        bOK = FALSE;
+        bOK = sal_False;
     }
         
     if ( bOK )
@@ -92,7 +92,7 @@ IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-SvxPasswordDialog::SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords, BOOL bDisableOldPassword ) :
+SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword ) :
     SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_PASSWORD ) ),
     aOldFL          ( this, SVX_RES( FL_OLD_PASSWD ) ),
     aOldPasswdFT    ( this, SVX_RES( FT_OLD_PASSWD ) ),
diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc
index f840be4c9a..f840be4c9a 100644..100755
--- a/svx/source/dialog/passwd.hrc
+++ b/svx/source/dialog/passwd.hrc
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
index 587150bc85..800c20c95d 100644..100755
--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.src
@@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD
     };
     Edit ED_OLD_PASSWD
     {
+        HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 71 , 14 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD
     };
     Edit ED_NEW_PASSWD
     {
+        HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 71 , 43 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD
     };
     Edit ED_REPEAT_PASSWD
     {
+        HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 71 , 59 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index fc0381bfd3..0600482a0f 100644..100755
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -36,7 +36,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include "pfiledlg.hxx"
+#include "svx/pfiledlg.hxx"
 #include <svx/dialogs.hrc>
 
 #include <svx/dialmgr.hxx>
@@ -265,11 +265,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind)
     return bFound;
 }
 
-void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId )
-{
-    maFileDlg.SetDialogHelpId( _nHelpId );
-}
-
 void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext )
 {
     maFileDlg.SetContext( _eNewContext );
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 290a21ef8a..9708f14852 100644..100755
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/dialogs.hrc>
-#include <prtqry.hxx>
+#include <svx/prtqry.hxx>
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
 
diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
index 3f8c04cea9..3f8c04cea9 100644..100755
--- a/svx/source/dialog/prtqry.src
+++ b/svx/source/dialog/prtqry.src
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 9c2c15306b..94a1e1b8e4 100644..100755
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -32,16 +32,16 @@
 // include ---------------------------------------------------------------
 
 #include <tools/ref.hxx>
-#include "relfld.hxx"
+#include "svx/relfld.hxx"
 
 // -----------------------------------------------------------------------
 
 SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
     MetricField( pParent, nWinSize )
 {
-    bNegativeEnabled = FALSE;
-    bRelativeMode = FALSE;
-    bRelative 	  = FALSE;
+    bNegativeEnabled = sal_False;
+    bRelativeMode = sal_False;
+    bRelative 	  = sal_False;
 
     SetDecimalDigits( 2 );
     SetMin( 0 );
@@ -53,9 +53,9 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
 SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) :
     MetricField( pParent, rResId )
 {
-    bNegativeEnabled = FALSE;
-    bRelativeMode = FALSE;
-    bRelative	  = FALSE;
+    bNegativeEnabled = sal_False;
+    bRelativeMode = sal_False;
+    bRelative	  = sal_False;
 
     SetDecimalDigits( 2 );
     SetMin( 0 );
@@ -71,7 +71,7 @@ void SvxRelativeField::Modify()
     if ( bRelativeMode )
     {
         String  aStr = GetText();
-        BOOL    bNewMode = bRelative;
+        sal_Bool    bNewMode = bRelative;
 
         if ( bRelative )
         {
@@ -82,7 +82,7 @@ void SvxRelativeField::Modify()
                 if( ( ( *pStr < sal_Unicode( '0' ) ) || ( *pStr > sal_Unicode( '9' ) ) ) &&
                     ( *pStr != sal_Unicode( '%' ) ) )
                 {
-                    bNewMode = FALSE;
+                    bNewMode = sal_False;
                     break;
                 }
                 pStr++;
@@ -93,7 +93,7 @@ void SvxRelativeField::Modify()
             xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) );
 
             if ( nPos != STRING_NOTFOUND )
-                bNewMode = TRUE;
+                bNewMode = sal_True;
         }
 
         if ( bNewMode != bRelative )
@@ -105,10 +105,10 @@ void SvxRelativeField::Modify()
 
 // -----------------------------------------------------------------------
 
-void SvxRelativeField::EnableRelativeMode( USHORT nMin,
-                                           USHORT nMax, USHORT nStep )
+void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
+                                           sal_uInt16 nMax, sal_uInt16 nStep )
 {
-    bRelativeMode = TRUE;
+    bRelativeMode = sal_True;
     nRelMin       = nMin;
     nRelMax       = nMax;
     nRelStep      = nStep;
@@ -117,14 +117,14 @@ void SvxRelativeField::EnableRelativeMode( USHORT nMin,
 
 // -----------------------------------------------------------------------
 
-void SvxRelativeField::SetRelative( BOOL bNewRelative )
+void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
 {
     Selection aSelection = GetSelection();
     String aStr = GetText();
 
     if ( bNewRelative )
     {
-        bRelative = TRUE;
+        bRelative = sal_True;
         SetDecimalDigits( 0 );
         SetMin( nRelMin );
         SetMax( nRelMax );
@@ -133,7 +133,7 @@ void SvxRelativeField::SetRelative( BOOL bNewRelative )
     }
     else
     {
-        bRelative = FALSE;
+        bRelative = sal_False;
         SetDecimalDigits( 2 );
         SetMin( bNegativeEnabled ? -9999 : 0 );
         SetMax( 9999 );
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 582761ba49..9254dc58a4 100644..100755
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -45,12 +45,12 @@
 #include <editeng/tstpitem.hxx>
 #include "editeng/protitem.hxx"
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <svl/eitem.hxx>
 
 // class SvxRulerItem ----------------------------------------------------
 
-SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
+SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings)
 : SfxControllerItem(_nId, rBindings),
   rRuler(rRul)
 {
@@ -58,7 +58,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
 
 // -----------------------------------------------------------------------
 
-void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                  const SfxPoolItem* pState)
 {
     // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index 7c643c4f73..153aed4965 100644..100755
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -40,11 +40,11 @@ private:
     SvxRuler& rRuler;
 
 protected:
-    virtual void StateChanged( USHORT,
+    virtual void StateChanged( sal_uInt16,
                                SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& );
+    SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& );
 };
 
 
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index dc5c68f0bb..6db9435003 100644..100755
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <rubydialog.hxx>
+#include <svx/rubydialog.hxx>
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -75,7 +75,7 @@ static const sal_Char cDisplayName[] = "DisplayName";
 static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName";
 static const sal_Char cRubies[] = "Rubies";
 
-SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId,
+SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId,
     SfxBindings* pBindings, SfxChildWinInfo* pInfo) :
     SfxChildWindow(_pParent, nId)
 {
@@ -234,7 +234,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     aHelpPB(this, 				ResId(PB_HELP,*rResId.GetResMgr()			)),
     nLastPos(0),
     nCurrentEdit(0),
-    bModified(FALSE),
+    bModified(sal_False),
     pBindings(pBind)
 {
     xImpl = pImpl = new SvxRubyData_Impl;
@@ -261,7 +261,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
     Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl));
     Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl));
-    for(USHORT i = 0; i < 8; i++)
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         aEditArr[i]->SetModifyHdl(aEditLk);
         aEditArr[i]->SetJumpHdl(aJumpLk);
@@ -270,6 +270,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     }
 
     UpdateColors();
+
+    String leftLabelName = aLeftFT.GetText(), rightLabelName = aRightFT.GetText();
+    aLeft2ED.SetAccessibleName(leftLabelName);
+    aLeft3ED.SetAccessibleName(leftLabelName);
+    aLeft4ED.SetAccessibleName(leftLabelName);
+    aRight2ED.SetAccessibleName(rightLabelName);
+    aRight3ED.SetAccessibleName(rightLabelName);
+    aRight4ED.SetAccessibleName(rightLabelName);
 }
 
 SvxRubyDialog::~SvxRubyDialog()
@@ -281,7 +289,7 @@ SvxRubyDialog::~SvxRubyDialog()
 
 void SvxRubyDialog::ClearCharStyleList()
 {
-    for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+    for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
     {
         void* pData = aCharStyleLB.GetEntryData(i);
         delete (OUString*)pData;
@@ -289,12 +297,12 @@ void SvxRubyDialog::ClearCharStyleList()
     aCharStyleLB.Clear();
 }
 
-BOOL 	SvxRubyDialog::Close()
+sal_Bool 	SvxRubyDialog::Close()
 {
     pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG,
                               SFX_CALLMODE_ASYNCHRON |
                               SFX_CALLMODE_RECORD);
-    return TRUE;
+    return sal_True;
 }
 
 void SvxRubyDialog::Activate()
@@ -357,7 +365,7 @@ void SvxRubyDialog::Activate()
                             }
                             if(sName.getLength())
                             {
-                                USHORT nPos = aCharStyleLB.InsertEntry(sName);
+                                sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName);
                                 aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) );
 
                             }
@@ -388,7 +396,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
 {
     OUString sLeft, sRight;
     const Sequence<PropertyValues>&  aRubyValues = pImpl->GetRubyValues();
-    BOOL bEnable = aRubyValues.getLength() > nPos;
+    sal_Bool bEnable = aRubyValues.getLength() > nPos;
     if(bEnable)
     {
         const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos];
@@ -402,7 +410,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
         }
     }
     else if(!nPos)
-        bEnable = TRUE;
+        bEnable = sal_True;
     rLeft.Enable(bEnable);
     rRight.Enable(bEnable);
     rLeft.SetText(sLeft);
@@ -422,7 +430,7 @@ void SvxRubyDialog::GetText()
         {
             Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
             DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" );
-            SetModified(TRUE);
+            SetModified(sal_True);
             Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos];
             PropertyValue* pProps = rProps.getArray();
             for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
@@ -444,7 +452,7 @@ void SvxRubyDialog::Update()
     aScrollSB.SetRange( Range(0, nLen > 4 ? nLen - 4 : 0));
     aScrollSB.SetThumbPos(0);
     SetLastPos(0);
-    SetModified(FALSE);
+    SetModified(sal_False);
 
     sal_Int16 nAdjust = -1;
     sal_Int16 nPosition = -1;
@@ -502,7 +510,7 @@ void SvxRubyDialog::Update()
         sCharStyleName = C2U(cRubies);
     if(sCharStyleName.getLength())
     {
-        for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+        for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
         {
             const OUString* pCoreName = (const OUString*)aCharStyleLB.GetEntryData(i);
             if(pCoreName && sCharStyleName == *pCoreName)
@@ -609,7 +617,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
             if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust)))
                 pProps[nProp].Value <<= nAdjust;
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     aPreviewWin.Invalidate();
     return 0;
@@ -630,7 +638,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
             if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove)))
                 pProps[nProp].Value.setValue(&bAbove, rType);
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     aPreviewWin.Invalidate();
     return 0;
@@ -654,14 +662,14 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
                 pProps[nProp].Value <<= sStyleName;
             }
         }
-        SetModified(TRUE);
+        SetModified(sal_True);
     }
     return 0;
 }
 
 IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
 {
-    for(USHORT i = 0; i < 8; i++)
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         if(pEdit == aEditArr[i])
         {
@@ -703,8 +711,8 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam)
 
 IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam)
 {
-    USHORT nIndex = USHRT_MAX;
-    for(USHORT i = 0; i < 8; i++)
+    sal_uInt16 nIndex = USHRT_MAX;
+    for(sal_uInt16 i = 0; i < 8; i++)
     {
         if(aEditArr[i]->HasFocus())
             nIndex = i;
@@ -814,7 +822,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     long nRubyWidth = GetTextWidth(sRubyText);
     SetFont(aSaveFont);
 
-    USHORT nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
+    sal_uInt16 nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
     //use center if no adjustment is available
     if(nAdjust > 4)
         nAdjust = 1;
@@ -830,7 +838,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
 
     //use above also if no selection is set
-    BOOL bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
+    sal_Bool bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
     if(!bAbove)
     {
         long nTmp = nYRuby;
@@ -913,8 +921,8 @@ long  RubyEdit::PreNotify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         const KeyCode&  rKeyCode = pKEvt->GetKeyCode();
-        USHORT nMod = rKeyCode.GetModifier();
-        USHORT nCode = rKeyCode.GetCode();
+        sal_uInt16 nMod = rKeyCode.GetModifier();
+        sal_uInt16 nCode = rKeyCode.GetCode();
         if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod))
         {
             sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1;
diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc
index 76839aeb85..76839aeb85 100644..100755
--- a/svx/source/dialog/rubydialog.hrc
+++ b/svx/source/dialog/rubydialog.hrc
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index b1537c1fa7..e44b68046c 100644..100755
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY
     Closeable = TRUE ;
     CheckBox CB_AUTO_DETECT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT";
         Pos = MAP_APPFONT ( 6, 6 ) ;
         Size = MAP_APPFONT ( 186 , 12 ) ;
         Text [ en-US ] = "Automatic detection";
@@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     Edit ED_LEFT_1
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1";
         Pos = MAP_APPFONT ( 6 , 30 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Hide = False;
@@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     Edit ED_RIGHT_1
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1";
         Pos = MAP_APPFONT ( 109 , 30 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_LEFT_2
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2";
         Pos = MAP_APPFONT ( 6 ,  42) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_RIGHT_2
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2";
         Pos = MAP_APPFONT ( 109 , 42 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_LEFT_3
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3";
         Pos = MAP_APPFONT ( 6 , 54 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_RIGHT_3
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3";
         Pos = MAP_APPFONT ( 109 , 54 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_LEFT_4
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4";
         Pos = MAP_APPFONT ( 6 , 66 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
     };
     Edit ED_RIGHT_4
     {
+        HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4";
         Pos = MAP_APPFONT ( 109 , 66 ) ;
         Size = MAP_APPFONT ( 102 , 12 ) ;
         Border = TRUE;
@@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     ListBox LB_ADJUST
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST";
         Pos = MAP_APPFONT ( 6 , 93) ;
         Size = MAP_APPFONT ( 35 , 60 ) ;
         DropDown = TRUE;
@@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     ListBox LB_POSITION
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION";
         Pos = MAP_APPFONT ( 43 , 93) ;
         Size = MAP_APPFONT ( 35 , 60 ) ;
         DropDown = TRUE;
@@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     ListBox LB_CHAR_STYLE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE";
         Pos = MAP_APPFONT ( 80 , 93) ;
         Size = MAP_APPFONT ( 89 , 60 ) ;
         DropDown = TRUE;
@@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     PushButton PB_STYLIST
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST";
         Pos = MAP_APPFONT ( 171 , 92 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Styles";
@@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY
     };
     PushButton PB_CLOSE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE";
         Pos = MAP_APPFONT (  118, 175 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Close";
diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc
index 3381bc1a0b..3381bc1a0b 100644..100755
--- a/svx/source/dialog/ruler.hrc
+++ b/svx/source/dialog/ruler.hrc
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index 13d3045f0f..13d3045f0f 100644..100755
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.src
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index c4a0b0cb60..2ef8db9a6c 100644..100755
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -31,7 +31,7 @@
 #include <tools/string.hxx>
 
 #include <svx/dialogs.hrc>
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/frame/status/LeftRightMargin.hpp>
 #include <com/sun/star/frame/status/UpperLowerMargin.hpp>
@@ -64,7 +64,7 @@ String SvxLongLRSpaceItem::GetValueText() const
 #define TWIP_TO_MM100(TWIP) 	((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 #define MM100_TO_TWIP(MM100)	((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
 
-bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -78,7 +78,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
             aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
             aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
             rVal <<= aLeftRightMargin;
-            return TRUE;
+            return sal_True;
         }
 
         case MID_LEFT: nVal = lLeft; break;
@@ -94,7 +94,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
 }
 
 // -----------------------------------------------------------------------
-bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -151,7 +151,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
 
 //------------------------------------------------------------------------
 
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId)
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId)
     : SfxPoolItem(nId),
     lLeft(lL),
     lRight(lR)
@@ -190,7 +190,7 @@ String SvxLongULSpaceItem::GetValueText() const
     return String();
 }
 
-bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -220,7 +220,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
 }
 
 // -----------------------------------------------------------------------
-bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -276,7 +276,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
 
 //------------------------------------------------------------------------
 
-SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId)
+SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId)
     : SfxPoolItem(nId),
     lLeft(lL),
     lRight(lR)
@@ -308,7 +308,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
             lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
 }
 
-bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -338,7 +338,7 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
     return true;
 }
 
-bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -433,7 +433,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem()
 
 void SvxColumnItem::DeleteAndDestroyColumns()
 {
-    for( USHORT i = aColumns.Count(); i>0; )
+    for( sal_uInt16 i = aColumns.Count(); i>0; )
     {
         SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i];
         aColumns.Remove( i );
@@ -451,19 +451,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
        nRight != ((const SvxColumnItem&)rCmp).nRight ||
        bTable != ((const SvxColumnItem&)rCmp).bTable ||
        Count() != ((const SvxColumnItem&)rCmp).Count())
-        return FALSE;
+        return sal_False;
 
-    const USHORT nCount = ((const SvxColumnItem&)rCmp).Count();
-    for(USHORT i = 0; i < nCount;++i) {
+    const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
+    for(sal_uInt16 i = 0; i < nCount;++i) {
 #if OSL_DEBUG_LEVEL > 1
         SvxColumnDescription *p1, *p2;
         p1 = (SvxColumnDescription *)aColumns[i];
         p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i];
 #endif
         if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -495,30 +495,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-SvxColumnItem::SvxColumnItem( USHORT nAct ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
 
     SfxPoolItem( SID_RULER_BORDERS ),
 
     nLeft       ( 0 ),
     nRight		( 0 ),
     nActColumn  ( nAct ),
-    bTable      ( FALSE ),
-    bOrtho      (TRUE )
+    bTable      ( sal_False ),
+    bOrtho      (sal_True )
 
 {
 }
 
 //------------------------------------------------------------------------
 
-SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) :
 
     SfxPoolItem( SID_RULER_BORDERS ),
 
     nLeft       ( left ),
     nRight		( right ),
     nActColumn  ( nActCol ),
-    bTable      ( TRUE ),
-    bOrtho      ( TRUE )
+    bTable      ( sal_True ),
+    bOrtho      ( sal_True )
 {
 }
 
@@ -528,7 +528,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
 
     SfxPoolItem( rCopy ),
 
-      aColumns  ( (BYTE)rCopy.Count() ),
+      aColumns  ( (sal_uInt8)rCopy.Count() ),
       nLeft     ( rCopy.nLeft ),
       nRight	( rCopy.nRight ),
       nActColumn( rCopy.nActColumn ),
@@ -536,9 +536,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
       bOrtho    ( rCopy.bOrtho )
 
 {
-    const USHORT nCount = rCopy.Count();
+    const sal_uInt16 nCount = rCopy.Count();
 
-    for ( USHORT i = 0; i < nCount; ++i )
+    for ( sal_uInt16 i = 0; i < nCount; ++i )
         Append( rCopy[i] );
 }
 
@@ -558,37 +558,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy)
     bTable = rCopy.bTable;
     nActColumn = rCopy.nActColumn;
     DeleteAndDestroyColumns();
-    const USHORT nCount = rCopy.Count();
-    for(USHORT i = 0; i < nCount;++i)
+    const sal_uInt16 nCount = rCopy.Count();
+    for(sal_uInt16 i = 0; i < nCount;++i)
         Insert(rCopy[i], i);
     return *this;
 }
 
 //------------------------------------------------------------------------
 
-BOOL SvxColumnItem::CalcOrtho() const
+sal_Bool SvxColumnItem::CalcOrtho() const
 {
-    const USHORT nCount = Count();
+    const sal_uInt16 nCount = Count();
     DBG_ASSERT(nCount >= 2, "no columns");
     if(nCount < 2)
-        return FALSE;
+        return sal_False;
 
     long nColWidth = (*this)[0].GetWidth();
-    for(USHORT i = 1; i < nCount; ++i) {
+    for(sal_uInt16 i = 1; i < nCount; ++i) {
         if( (*this)[i].GetWidth() != nColWidth)
-            return FALSE;
+            return sal_False;
     }
     //!! Wide divider
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
 long SvxColumnItem::GetVisibleRight() const
 {
-    USHORT nIdx = 0;
+    sal_uInt16 nIdx = 0;
 
-    for ( USHORT i = 0; i < nActColumn; ++i )
+    for ( sal_uInt16 i = 0; i < nActColumn; ++i )
     {
         if ( (*this)[i].bVisible )
             ++nIdx;
@@ -596,7 +596,7 @@ long SvxColumnItem::GetVisibleRight() const
     return (*this)[nIdx].nEnd;
 }
 
-bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -616,7 +616,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId )
     return true;
 }
 
-bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     sal_Int32 nVal = 0;
@@ -628,9 +628,9 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember
         }
         case MID_RIGHT: rVal >>= nRight; break;
         case MID_LEFT: rVal >>= nLeft; break;
-        case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break;
-        case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break;
-        case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break;
+        case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break;
+        case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break;
+        case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break;
         default: OSL_FAIL("Wrong MemberId!"); return sal_False;
     }
 
@@ -679,7 +679,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
 //------------------------------------------------------------------------
 
 SvxObjectItem::SvxObjectItem( long nSX, long nEX,
-                              long nSY, long nEY, BOOL limits ) :
+                              long nSY, long nEY, sal_Bool limits ) :
 
     SfxPoolItem( SID_RULER_OBJECT ),
 
@@ -707,7 +707,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
 {
 }
 
-bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -725,7 +725,7 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId )
     return true;
 }
 
-bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     BOOL bRet = false;
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 4ee48748b5..d4f696183d 100644..100755
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1182,103 +1182,26 @@ String RID_SVXSTR_COLOR_USER
     Text [ en-US ] = "User" ;
 };
 
+String RID_SVXSTR_GALLERYPROPS_GALTHEME
+{
+    Text [ en-US ] = "Gallery Theme" ;
+};
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+//IAccessibility2 Implementation 2009-----
+String RID_SVXSTR_GALLERY_THEMEITEMS
+{
+    Text [ en-US ] = "Theme Items";
+};
+String RID_SVXSTR_GALLERY_THEMENAME
+{
+    Text [ en-US ] = "Theme Name";
+};
+String RID_SVXSTR_GALLERY_FILESFOUND
+{
+    Text [ en-US ] = "Files Found";
+};
+String RID_SVXSTR_GALLERY_PREVIEW
+{
+    Text [ en-US ] = "Preview";
+};
+//-----IAccessibility2 Implementation 2009
diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx
index 75c8d9eb9e..75c8d9eb9e 100644..100755
--- a/svx/source/dialog/sendreportgen.cxx
+++ b/svx/source/dialog/sendreportgen.cxx
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index 2362cc3bea..2362cc3bea 100644..100755
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index b50dc0c0ca..2a80b80cbd 100644..100755
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -81,7 +81,7 @@ static LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName,
 
     if ( ERROR_SUCCESS == lResult )
     {
-        lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST BYTE *)lpData, cbData );
+        lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST sal_uInt8 *)lpData, cbData );
         RegCloseKey( hKey );
     }
 
@@ -125,14 +125,14 @@ namespace svx{
                 sizeof(szBuffer) ) )
                 maEMailAddrED.SetText( (sal_Unicode *)szBuffer );
 
-            DWORD	fAllowContact = FALSE;
+            DWORD	fAllowContact = sal_False;
             RegReadValue(
                 HKEY_CURRENT_USER,
                 TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
                 TEXT("AllowContact"),
                 &fAllowContact,
                 sizeof(fAllowContact) );
-            maContactCB.Check( (BOOL)fAllowContact );
+            maContactCB.Check( (sal_Bool)fAllowContact );
 
             DWORD	uInternetConnection = 0;
             RegReadValue(
@@ -237,7 +237,7 @@ namespace svx{
                         szBuffer,
                         NULL,
                         NULL,
-                        FALSE,
+                        sal_False,
                         0,
                         NULL, NULL, &StartupInfo, &ProcessInfo )
                     )
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 30d2c4214e..f4ef702224 100644..100755
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -53,11 +53,11 @@ SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId):
 
 long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt )
 {
-    long nResult = TRUE;
+    long nResult = sal_True;
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-        USHORT nKey = aKeyCode.GetCode();
+        sal_uInt16 nKey = aKeyCode.GetCode();
         if ( nKey == KEY_TAB )
             GetParent()->Notify( rNEvt );
         else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) )
@@ -79,10 +79,10 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ):
         aPrivContainer(pParent,nBits|WB_DIALOGCONTROL),
         aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
         nHeaderItemId(1),
-        bResizeFlag(FALSE),
-        bPaintFlag(TRUE)
+        bResizeFlag(sal_False),
+        bPaintFlag(sal_True)
 {
-    bSortDirection=TRUE;
+    bSortDirection=sal_True;
     nSortCol=0xFFFF;
     nOldPos=0;
 
@@ -110,11 +110,11 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
         aPrivContainer(pParent,rResId),
         aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER  | WB_TABSTOP),
         nHeaderItemId(1),
-        bResizeFlag(TRUE),
-        bPaintFlag(TRUE)
+        bResizeFlag(sal_True),
+        bPaintFlag(sal_True)
 {
 
-    bSortDirection=TRUE;
+    bSortDirection=sal_True;
     nOldPos=0;
     nSortCol=0xFFFF;
 
@@ -151,7 +151,6 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
     InitHeaderBar( &aHeaderBar );
 
     aHeaderBar.Show();
-    SetWindowBits(WB_CLIPCHILDREN | WB_HSCROLL);
     SvHeaderTabListBox::Show();
 }
 
@@ -198,18 +197,18 @@ void SvxSimpleTable::SetTabs()
 {
     SvHeaderTabListBox::SetTabs();
 
-    USHORT nPrivTabCount = TabCount();
+    sal_uInt16 nPrivTabCount = TabCount();
     if ( nPrivTabCount )
     {
         if ( nPrivTabCount > aHeaderBar.GetItemCount() )
             nPrivTabCount = aHeaderBar.GetItemCount();
 
-        USHORT i, nNewSize = static_cast< USHORT >( GetTab(0) ), nPos = 0;
+        sal_uInt16 i, nNewSize = static_cast< sal_uInt16 >( GetTab(0) ), nPos = 0;
         for ( i = 1; i < nPrivTabCount; ++i )
         {
-            nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+            nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
             aHeaderBar.SetItemSize( i, nNewSize );
-            nPos = (USHORT)GetTab(i);
+            nPos = (sal_uInt16)GetTab(i);
         }
 
         aHeaderBar.SetItemSize( i, HEADERBAR_FULLSIZE ); // because no tab for last entry
@@ -225,8 +224,8 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
 {
     SvHeaderTabListBox::Paint(rRect );
 
-    USHORT nPrivTabCount = TabCount();
-    USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0;
+    sal_uInt16 nPrivTabCount = TabCount();
+    sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0;
 
     long nOffset=-GetXOffset();
     nOldPos=nOffset;
@@ -239,17 +238,17 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
         if(nPrivTabCount>aHeaderBar.GetItemCount())
                 nPrivTabCount=aHeaderBar.GetItemCount();
 
-        USHORT nPos = 0;
-        for(USHORT i=1;i<nPrivTabCount;i++)
+        sal_uInt16 nPos = 0;
+        for(sal_uInt16 i=1;i<nPrivTabCount;i++)
         {
-            nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+            nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
             aHeaderBar.SetItemSize( i, nNewSize );
-            nPos= static_cast< USHORT >( GetTab(i) );
+            nPos= static_cast< sal_uInt16 >( GetTab(i) );
         }
     }
-    bPaintFlag=TRUE;
+    bPaintFlag=sal_True;
 }
-void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,USHORT nCol,
+void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,sal_uInt16 nCol,
                                        HeaderBarItemBits nBits)
 {
     xub_StrLen nEnd = rText.Search( sal_Unicode( '\t' ) );
@@ -290,7 +289,7 @@ void SvxSimpleTable::HideTable()
     aPrivContainer.Hide();
 }
 
-BOOL SvxSimpleTable::IsVisible() const
+sal_Bool SvxSimpleTable::IsVisible() const
 {
     return aPrivContainer.IsVisible();
 }
@@ -305,7 +304,7 @@ void SvxSimpleTable::DisableTable()
     aPrivContainer.Disable();
 }
 
-BOOL SvxSimpleTable::IsEnabled() const
+sal_Bool SvxSimpleTable::IsEnabled() const
 {
     return aPrivContainer.IsEnabled();
 }
@@ -359,12 +358,12 @@ void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize )
     UpdateViewSize();
 }
 
-USHORT SvxSimpleTable::GetSelectedCol()
+sal_uInt16 SvxSimpleTable::GetSelectedCol()
 {
     return (aHeaderBar.GetCurItemId()-1);
 }
 
-void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
+void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir)
 {
     bSortDirection=bDir;
     if(nSortCol!=0xFFFF)
@@ -393,7 +392,7 @@ void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
 
 void SvxSimpleTable::HBarClick()
 {
-    USHORT nId=aHeaderBar.GetCurItemId();
+    sal_uInt16 nId=aHeaderBar.GetCurItemId();
 
     if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE)
     {
@@ -441,23 +440,23 @@ void SvxSimpleTable::HBarDrag()
 void SvxSimpleTable::HBarEndDrag()
 {
     HideTracking();
-    USHORT nPrivTabCount=TabCount();
+    sal_uInt16 nPrivTabCount=TabCount();
 
     if(nPrivTabCount)
     {
         if(nPrivTabCount>aHeaderBar.GetItemCount())
                 nPrivTabCount=aHeaderBar.GetItemCount();
 
-        USHORT nPos=0;
-        USHORT nNewSize=0;
-        for(USHORT i=1;i<nPrivTabCount;i++)
+        sal_uInt16 nPos=0;
+        sal_uInt16 nNewSize=0;
+        for(sal_uInt16 i=1;i<nPrivTabCount;i++)
         {
-            nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos;
+            nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos;
             SetTab( i, nNewSize, MAP_PIXEL );
             nPos = nNewSize;
         }
     }
-    bPaintFlag=FALSE;
+    bPaintFlag=sal_False;
     Invalidate();
     Update();
 }
@@ -519,14 +518,14 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr)
     return 0;
 }
 
-SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const
+SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const
 {
     DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
     SvLBoxItem* pItem = NULL;
 
     if( pEntry )
     {
-        USHORT nCount = pEntry->ItemCount();
+        sal_uInt16 nCount = pEntry->ItemCount();
 
         nPos++;
 
@@ -550,8 +549,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
 
     if(pLeftItem != NULL && pRightItem != NULL)
     {
-        USHORT nLeftKind=pLeftItem->IsA();
-        USHORT nRightKind=pRightItem->IsA();
+        sal_uInt16 nLeftKind=pLeftItem->IsA();
+        sal_uInt16 nRightKind=pRightItem->IsA();
 
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index a4cbc709bb..3782832d23 100644..100755
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -41,14 +41,14 @@
 
 
 #include "srchctrl.hxx"
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 #include <svl/srchitem.hxx>
 
 // class SvxSearchFamilyControllerItem -----------------------------------
 
 SvxSearchController::SvxSearchController
 (
-    USHORT _nId,
+    sal_uInt16 _nId,
     SfxBindings& rBind,
     SvxSearchDialog& rDlg
 ) :
@@ -60,7 +60,7 @@ SvxSearchController::SvxSearchController
 
 // -----------------------------------------------------------------------
 
-void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                         const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE == eState )
@@ -75,7 +75,7 @@ void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
         else if ( SID_SEARCH_OPTIONS == nSID )
         {
             DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" );
-            USHORT nFlags = (USHORT)( (SfxUInt16Item*)pState )->GetValue();
+            sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState )->GetValue();
             rSrchDlg.EnableControls_Impl( nFlags );
         }
         else if ( SID_SEARCH_ITEM == nSID )
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 3547c3ea8b..419e04283b 100644..100755
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -41,10 +41,10 @@ class SvxSearchController : public SfxControllerItem
     SvxSearchDialog&	rSrchDlg;
 
 protected:
-    virtual void		StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void		StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SvxSearchController( USHORT nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
+    SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
 };
 
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 3a6fede0f3..81a712fd34 100644..100755
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -57,7 +57,7 @@
 #include <toolkit/unohlp.hxx>
 
 #define _SVX_SRCHDLG_CXX
-#include "srchdlg.hxx"
+#include "svx/srchdlg.hxx"
 
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
@@ -70,7 +70,7 @@
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <editeng/brshitem.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx>
@@ -105,7 +105,7 @@ using namespace comphelper;
 SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
 
 #define GetCheckBoxValue( rBox )								\
-    rBox.IsEnabled() ? rBox.IsChecked() : FALSE
+    rBox.IsEnabled() ? rBox.IsChecked() : sal_False
 
 #if ENABLE_LAYOUT
 #undef SVX_RES
@@ -117,11 +117,11 @@ struct SearchDlg_Impl
     FixedText	aSearchFormats;
     FixedText	aReplaceFormats;
 
-    BOOL        bMultiLineEdit   : 1,
+    sal_Bool        bMultiLineEdit   : 1,
                 bSaveToModule    : 1,
                 bFocusOnSearch   : 1,
                 bDeltaCalculated : 1;
-    USHORT*		pRanges;
+    sal_uInt16*		pRanges;
     Timer		aSelectionTimer;
 
     uno::Reference< frame::XDispatch > xCommand1Dispatch;
@@ -136,10 +136,10 @@ struct SearchDlg_Impl
 #endif /* !ENABLE_LAYOUT */
         aSearchFormats  ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
         aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
-        bMultiLineEdit  ( FALSE ),
-        bSaveToModule   ( TRUE ),
-        bFocusOnSearch  ( TRUE ),
-        bDeltaCalculated( FALSE ),
+        bMultiLineEdit  ( sal_False ),
+        bSaveToModule   ( sal_True ),
+        bFocusOnSearch  ( sal_True ),
+        bDeltaCalculated( sal_False ),
         pRanges         ( NULL )
         {
             aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1"));
@@ -154,14 +154,14 @@ struct SearchDlg_Impl
 
 // -----------------------------------------------------------------------
 
-void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
+void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
 {
     SfxStringListItem* pSrchItem =
         (SfxStringListItem*)SFX_APP()->GetItem( nId );
     List* pLst = pSrchItem ? pSrchItem->GetList() : 0;
 
     if ( pLst )
-        for ( USHORT i = 0; i < pLst->Count(); ++i )
+        for ( sal_uInt16 i = 0; i < pLst->Count(); ++i )
         {
             String* pTmp = new String( *(String*)( pLst->GetObject(i) ) );
             rStrLst.Insert( pTmp, rStrLst.Count() );
@@ -171,12 +171,12 @@ void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
 
 // -----------------------------------------------------------------------
 
-void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
+void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst )
 {
     DBG_ASSERT( rStrLst.Count(), "check in advance");
     List aLst;
 
-    for ( USHORT i = 0; i < rStrLst.Count(); ++i )
+    for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i )
         aLst.Insert( rStrLst[ i ], LIST_APPEND );
 
     SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) );
@@ -186,13 +186,13 @@ void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
 
 SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
 
-    SrchAttrItemList( (BYTE)rList.Count() )
+    SrchAttrItemList( (sal_uInt8)rList.Count() )
 
 {
     SrchAttrItemList::Insert( &rList, 0 );
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             _pData->pItem = _pData->pItem->Clone();
 }
@@ -215,9 +215,9 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet )
     SfxItemIter aIter( rSet );
     SearchAttrItem aItem;
     const SfxPoolItem* pItem = aIter.GetCurItem();
-    USHORT nWhich;
+    sal_uInt16 nWhich;
 
-    while ( TRUE )
+    while ( sal_True )
     {
         // only test that it is available?
         if( IsInvalidItem( pItem ) )
@@ -247,7 +247,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
     SfxItemPool* pPool = rSet.GetPool();
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( IsInvalidItem( _pData->pItem ) )
             rSet.InvalidateItem( pPool->GetWhich( _pData->nSlot ) );
         else
@@ -261,7 +261,7 @@ void SearchAttrItemList::Clear()
 {
     SearchAttrItem* _pData = (SearchAttrItem*)GetData();
 
-    for ( USHORT i = Count(); i; --i, ++_pData )
+    for ( sal_uInt16 i = Count(); i; --i, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             delete _pData->pItem;
     SrchAttrItemList::Remove( 0, Count() );
@@ -270,13 +270,13 @@ void SearchAttrItemList::Clear()
 // -----------------------------------------------------------------------
 
 // Deletes the pointer to the items
-void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
+void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     if ( nPos + nLen > Count() )
         nLen = Count() - nPos;
     SearchAttrItem* _pData = (SearchAttrItem*)GetData() + nPos;
 
-    for ( USHORT n = nLen; n; --n, ++_pData )
+    for ( sal_uInt16 n = nLen; n; --n, ++_pData )
         if ( !IsInvalidItem( _pData->pItem ) )
             delete _pData->pItem;
 
@@ -339,13 +339,13 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
     aColumnsBtn     ( this, SVX_RES( RB_CALC_COLUMNS ) ),                     \
     aAllSheetsCB    ( this, SVX_RES( CB_ALL_SHEETS ) ),                       \
     rBindings       ( rBind ),                                              \
-    bWriter         ( FALSE ),                                              \
-    bSearch         ( TRUE ),                                               \
-    bFormat 		( FALSE ),												\
+    bWriter         ( sal_False ),                                              \
+    bSearch         ( sal_True ),                                               \
+    bFormat 		( sal_False ),												\
     nOptions		( USHRT_MAX ),											\
-    bSet			( FALSE ),												\
-    bReadOnly		( FALSE ),												\
-    bConstruct		( TRUE ),												\
+    bSet			( sal_False ),												\
+    bReadOnly		( sal_False ),												\
+    bConstruct		( sal_True ),												\
     nModifyFlag		( 0 ),													\
     aCalcStr        ( THIS_SVX_RES( STR_WORDCALC ) ),                       \
     pImpl           ( NULL ),                                               \
@@ -425,7 +425,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
 void SvxSearchDialog::Construct_Impl()
 {
 #if ENABLE_LAYOUT
-    SetHelpId (SID_SEARCH_DLG);
+    SetHelpId (".uno:SearchDialog");
 #endif /* ENABLE_LAYOUT */
 
     // temporary to avoid incompatibility
@@ -484,7 +484,7 @@ void SvxSearchDialog::Construct_Impl()
     SvtCJKOptions aCJKOptions;
     if(!aCJKOptions.IsJapaneseFindEnabled())
     {
-        aJapOptionsCB.Check( FALSE );
+        aJapOptionsCB.Check( sal_False );
         aJapOptionsCB.Hide();
         aJapOptionsBtn.Hide();
     }
@@ -492,6 +492,14 @@ void SvxSearchDialog::Construct_Impl()
     {
         aJapMatchFullHalfWidthCB.Hide();
     }
+
+    aSimilarityBtn.SetAccessibleRelationLabeledBy(&aSimilarityBox);
+    aSimilarityBtn.SetAccessibleRelationMemberOf(&aOptionsFL);
+    aJapOptionsBtn.SetAccessibleRelationLabeledBy(&aJapOptionsCB);
+    aJapOptionsBtn.SetAccessibleRelationMemberOf(&aOptionsFL);
+    aRowsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT); 
+    aColumnsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT);
+
     //component extension - show component search buttons if the commands
     // vnd.sun.star::SearchViaComponent1 and 2 are supported
     const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame();
@@ -610,7 +618,7 @@ void SvxSearchDialog::Construct_Impl()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxSearchDialog::Close()
+sal_Bool SvxSearchDialog::Close()
 {
     // remember strings speichern
     if ( aSearchStrings.Count() )
@@ -633,12 +641,12 @@ BOOL SvxSearchDialog::Close()
     rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs );
     rBindings.Execute( SID_SEARCH_DLG );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-INT32 SvxSearchDialog::GetTransliterationFlags() const
+sal_Int32 SvxSearchDialog::GetTransliterationFlags() const
 {
     if (!aMatchCaseCB.IsChecked())
         nTransliterationFlags |=  TransliterationModules_IGNORE_CASE;
@@ -658,10 +666,10 @@ void SvxSearchDialog::SetSaveToModule(bool b)
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings )
+void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
 {
     nTransliterationFlags = nSettings;
-    BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
+    sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
     aMatchCaseCB            .Check(!bVal );
     bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
     aJapMatchFullHalfWidthCB.Check( !bVal );
@@ -685,9 +693,9 @@ void SvxSearchDialog::Activate()
 void SvxSearchDialog::InitControls_Impl()
 {
     // CaseSensitives AutoComplete
-    aSearchLB.EnableAutocomplete( TRUE, TRUE );
+    aSearchLB.EnableAutocomplete( sal_True, sal_True );
     aSearchLB.Show();
-    aReplaceLB.EnableAutocomplete( TRUE, TRUE );
+    aReplaceLB.EnableAutocomplete( sal_True, sal_True );
     aReplaceLB.Show();
 
     aFormatBtn.Disable();
@@ -787,9 +795,9 @@ void SvxSearchDialog::CalculateDelta_Impl()
     if ( pImpl->bDeltaCalculated )
         return;
     else
-        pImpl->bDeltaCalculated = TRUE;
+        pImpl->bDeltaCalculated = sal_True;
 
-    ULONG nDelta = 187, nOffset = 0;
+    sal_uIntPtr nDelta = 187, nOffset = 0;
     SvtCJKOptions aCJKOptions;
 
     pMoreBtn->AddWindow( &aOptionsFL );
@@ -955,7 +963,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
     bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER );
 
-    pImpl->bMultiLineEdit = FALSE;
+    pImpl->bMultiLineEdit = sal_False;
 
     if ( !pImpl->bMultiLineEdit )
     {
@@ -1003,7 +1011,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
     CalculateDelta_Impl();
 
-    bool bDraw = FALSE;
+    bool bDraw = false;
     if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC )
     {
         Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
@@ -1061,7 +1069,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
             aFormatBtn.Hide();
             aNoFormatBtn.Hide();
             aAttributeBtn.Hide();
-            bDraw = TRUE;
+            bDraw = sal_True;
         }
         else
         {
@@ -1093,23 +1101,23 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
     // similarity search?
     if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 )
         aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
-    bSet = TRUE;
+    bSet = sal_True;
 
     FlagHdl_Impl( &aSimilarityBox );
     FlagHdl_Impl( &aJapOptionsCB );
 
-    bool bDisableSearch = FALSE;
+    bool bDisableSearch = false;
     SfxViewShell* pViewShell = SfxViewShell::Current();
 
     if ( pViewShell )
     {
-        BOOL bText = !bSearchPattern;
+        sal_Bool bText = !bSearchPattern;
 
         if ( pViewShell->HasSelection( bText ) )
             EnableControl_Impl( &aSelectionBtn );
         else
         {
-            aSelectionBtn.Check( FALSE );
+            aSelectionBtn.Check( sal_False );
             aSelectionBtn.Disable();
         }
     }
@@ -1247,9 +1255,9 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
 
     if ( aLayoutBtn.IsChecked() )
     {
-        pImpl->bSaveToModule = FALSE;
+        pImpl->bSaveToModule = sal_False;
         TemplateHdl_Impl( &aLayoutBtn );
-        pImpl->bSaveToModule = TRUE;
+        pImpl->bSaveToModule = sal_True;
     }
 }
 
@@ -1264,8 +1272,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
     if ( !pImpl->pRanges && pSSet )
     {
         sal_sSize nCnt = 0;
-        const USHORT* pPtr = pSSet->GetRanges();
-        const USHORT* pTmp = pPtr;
+        const sal_uInt16* pPtr = pSSet->GetRanges();
+        const sal_uInt16* pTmp = pPtr;
 
         while( *pPtr )
         {
@@ -1273,8 +1281,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pPtr += 2;
         }
         nCnt = pPtr - pTmp + 1;
-        pImpl->pRanges = new USHORT[nCnt];
-        memcpy( pImpl->pRanges, pTmp, sizeof(USHORT) * nCnt );
+        pImpl->pRanges = new sal_uInt16[nCnt];
+        memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt );
     }
 
     // See to it that are the texts of the attributes are correct
@@ -1290,12 +1298,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pSearchList->Put( *pSSet );
 
             if ( !pImpl->bMultiLineEdit )
-                aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+                aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
             else
-                pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+                pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
 
             if ( aDesc.Len() )
-                bFormat |= TRUE;
+                bFormat |= sal_True;
         }
     }
 
@@ -1309,12 +1317,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             pReplaceList->Put( *pRSet );
 
             if ( !pImpl->bMultiLineEdit )
-                aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+                aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
             else
-                pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+                pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
 
             if ( aDesc.Len() )
-                bFormat |= TRUE;
+                bFormat |= sal_True;
         }
     }
 }
@@ -1326,23 +1334,23 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
     if ( pCtrl && !bSet )
         SetModifyFlag_Impl( pCtrl );
     else
-        bSet = FALSE;
+        bSet = sal_False;
 
     if ( pCtrl == &aSimilarityBox )
     {
-        BOOL bIsChecked = aSimilarityBox.IsChecked();
+        sal_Bool bIsChecked = aSimilarityBox.IsChecked();
 
         if ( bIsChecked )
         {
             aSimilarityBtn.Enable();
-            aRegExpBtn.Check( FALSE );
+            aRegExpBtn.Check( sal_False );
             aRegExpBtn.Disable();
             EnableControl_Impl( &aWordBtn );
 
             if ( aLayoutBtn.IsChecked() )
             {
                 EnableControl_Impl( &aMatchCaseCB );
-                aLayoutBtn.Check( FALSE );
+                aLayoutBtn.Check( sal_False );
             }
             aRegExpBtn.Disable();
             aLayoutBtn.Disable();
@@ -1380,11 +1388,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
     {
         if ( aLayoutBtn.IsChecked() && !bFormat )
         {
-            aWordBtn.Check( FALSE );
+            aWordBtn.Check( sal_False );
             aWordBtn.Disable();
-            aRegExpBtn.Check( FALSE );
+            aRegExpBtn.Check( sal_False );
             aRegExpBtn.Disable();
-            aMatchCaseCB.Check( FALSE );
+            aMatchCaseCB.Check( sal_False );
             aMatchCaseCB.Disable();
             aNotesBtn.Disable();
 
@@ -1404,7 +1412,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
 
             if ( aRegExpBtn.IsChecked() )
             {
-                aWordBtn.Check( FALSE );
+                aWordBtn.Check( sal_False );
                 aWordBtn.Disable();
                 aSimilarityBox.Disable();
                 aSimilarityBtn.Disable();
@@ -1416,7 +1424,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
             }
 
             // Search-string in place? then enable Buttons
-            bSet = TRUE;
+            bSet = sal_True;
             ModifyHdl_Impl( &aSearchLB );
         }
     }
@@ -1427,14 +1435,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
             aSearchAllBtn.Disable();
         else
         {
-            bSet = TRUE;
+            bSet = sal_True;
             ModifyHdl_Impl( &aSearchLB );
         }
     }
 
     if ( &aJapOptionsCB == pCtrl )
     {
-        BOOL bEnableJapOpt = aJapOptionsCB.IsChecked();
+        sal_Bool bEnableJapOpt = aJapOptionsCB.IsChecked();
         aMatchCaseCB			.Enable(!bEnableJapOpt );
         aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt );
         aJapOptionsBtn			.Enable( bEnableJapOpt );
@@ -1467,22 +1475,22 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             pSearchItem->SetReplaceString( aReplaceLB.GetText() );
 
             if ( pBtn == &aReplaceBtn )
-                Remember_Impl( aReplaceLB.GetText(), FALSE );
+                Remember_Impl( aReplaceLB.GetText(), sal_False );
             else
             {
-                Remember_Impl( aSearchLB.GetText(), TRUE );
+                Remember_Impl( aSearchLB.GetText(), sal_True );
 
                 if ( pBtn == &aReplaceAllBtn )
-                    Remember_Impl( aReplaceLB.GetText(), FALSE );
+                    Remember_Impl( aReplaceLB.GetText(), sal_False );
             }
         }
 
-        pSearchItem->SetRegExp( FALSE );
-        pSearchItem->SetLevenshtein( FALSE );
+        pSearchItem->SetRegExp( sal_False );
+        pSearchItem->SetLevenshtein( sal_False );
         if (GetCheckBoxValue( aRegExpBtn ))
-            pSearchItem->SetRegExp( TRUE );
+            pSearchItem->SetRegExp( sal_True );
         else if (GetCheckBoxValue( aSimilarityBox ))
-            pSearchItem->SetLevenshtein( TRUE );
+            pSearchItem->SetLevenshtein( sal_True );
 
         pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
         pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -1491,7 +1499,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
         pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
         pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
-        INT32 nFlags = GetTransliterationFlags();
+        sal_Int32 nFlags = GetTransliterationFlags();
         if( !pSearchItem->IsUseAsianOptions())
             nFlags &= (TransliterationModules_IGNORE_CASE |
                        TransliterationModules_IGNORE_WIDTH );
@@ -1535,11 +1543,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             String aStr( aSearchLB.GetText() );
 
             if ( aStr.Len() )
-                Remember_Impl( aStr, TRUE );
+                Remember_Impl( aStr, sal_True );
             aStr = aReplaceLB.GetText();
 
             if ( aStr.Len() )
-                Remember_Impl( aStr, FALSE );
+                Remember_Impl( aStr, sal_False );
         }
         SaveToModule_Impl();
         Close();
@@ -1579,7 +1587,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
             int nRet = aDlg->Execute();
             if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
             {
-                INT32 nFlags = aDlg->GetTransliterationFlags();
+                sal_Int32 nFlags = aDlg->GetTransliterationFlags();
                 pSearchItem->SetTransliterationFlags( nFlags );
                 ApplyTransliterationFlags_Impl( nFlags );
             }
@@ -1616,7 +1624,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
     if ( !bSet )
         SetModifyFlag_Impl( pEd );
     else
-        bSet = FALSE;
+        bSet = sal_False;
 
     // Calc allows searching for empty cells.
     bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC);
@@ -1673,7 +1681,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
     {
         if ( !pFamilyController )
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             // Enable templates controller
             switch ( pSearchItem->GetFamily() )
@@ -1740,13 +1748,13 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
 
         if ( !pImpl->bMultiLineEdit )
         {
-            aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
-            aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+            aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+            aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
         }
         else
         {
-            pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
-            pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+            pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+            pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
         }
 
         EnableControl_Impl( &aFormatBtn );
@@ -1755,16 +1763,16 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
 
         FocusHdl_Impl( bSearch ? &aSearchLB : &aReplaceLB );
     }
-    bSet = TRUE;
-    pImpl->bSaveToModule = FALSE;
+    bSet = sal_True;
+    pImpl->bSaveToModule = sal_False;
     FlagHdl_Impl( &aLayoutBtn );
-    pImpl->bSaveToModule = TRUE;
+    pImpl->bSaveToModule = sal_True;
     return 0;
 }
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
+void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch )
 {
     if ( !rStr.Len() )
         return;
@@ -1773,7 +1781,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
     ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB;
 
     // ignore identical strings
-    for ( USHORT i = 0; i < pArr->Count(); ++i )
+    for ( sal_uInt16 i = 0; i < pArr->Count(); ++i )
     {
         if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) )
             return;
@@ -1785,7 +1793,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
     if ( pArr->Count() >= REMEMBER_SIZE )
     {
         pInsStr = (*pArr)[REMEMBER_SIZE - 1];
-        pListBox->RemoveEntry( USHORT(REMEMBER_SIZE - 1) );
+        pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) );
         pArr->Remove( REMEMBER_SIZE - 1 );
         *pInsStr = rStr;
     }
@@ -1805,8 +1813,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
     aSearchTmplLB .Clear();
     aReplaceTmplLB.Clear();
     rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL );
-    aSearchTmplLB.SetUpdateMode( FALSE );
-    aReplaceTmplLB.SetUpdateMode( FALSE );
+    aSearchTmplLB.SetUpdateMode( sal_False );
+    aReplaceTmplLB.SetUpdateMode( sal_False );
     SfxStyleSheetBase* pBase = rPool.First();
 
     while ( pBase )
@@ -1816,8 +1824,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
         aReplaceTmplLB.InsertEntry( pBase->GetName() );
         pBase = rPool.Next();
     }
-    aSearchTmplLB.SetUpdateMode( TRUE );
-    aReplaceTmplLB.SetUpdateMode( TRUE );
+    aSearchTmplLB.SetUpdateMode( sal_True );
+    aReplaceTmplLB.SetUpdateMode( sal_True );
     aSearchTmplLB.SelectEntryPos(0);
 
     if ( aOldSrch.Len() )
@@ -1838,7 +1846,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
 
 // -----------------------------------------------------------------------
 
-void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
+void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
 {
     if ( nFlags == nOptions )
         return;
@@ -2073,9 +2081,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
     if ( pCtrl == &aSearchLB || pCtrl == &pImpl->aSearchFormats )
     {
         if ( pCtrl->HasChildPathFocus() )
-            pImpl->bFocusOnSearch = TRUE;
+            pImpl->bFocusOnSearch = sal_True;
         pCtrl = &aSearchLB;
-        bSearch = TRUE;
+        bSearch = sal_True;
 
         if( nTxtLen )
             EnableControl_Impl( &aNoFormatBtn );
@@ -2085,9 +2093,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
     }
     else
     {
-        pImpl->bFocusOnSearch = FALSE;
+        pImpl->bFocusOnSearch = sal_False;
         pCtrl = &aReplaceLB;
-        bSearch = FALSE;
+        bSearch = sal_False;
 
         if ( ( !pImpl->bMultiLineEdit && aReplaceAttrText.GetText().Len() ) ||
                 ( pImpl->bMultiLineEdit && pImpl->aReplaceFormats.GetText().Len() ) )
@@ -2096,7 +2104,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
             aNoFormatBtn.Disable();
         aAttributeBtn.Disable();
     }
-    bSet = TRUE;
+    bSet = sal_True;
 
     aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
@@ -2126,14 +2134,14 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
         return 0;
 
     sal_sSize nCnt = 0;
-    const USHORT* pPtr = pImpl->pRanges;
-    const USHORT* pTmp = pPtr;
+    const sal_uInt16* pPtr = pImpl->pRanges;
+    const sal_uInt16* pTmp = pPtr;
 
     while( *pTmp )
         pTmp++;
     nCnt = pTmp - pPtr + 7;
-    USHORT* pWhRanges = new USHORT[nCnt];
-    USHORT nPos = 0;
+    sal_uInt16* pWhRanges = new sal_uInt16[nCnt];
+    sal_uInt16 nPos = 0;
 
     while( *pPtr )
     {
@@ -2143,7 +2151,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
     pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
     pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
 
-    USHORT nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
+    sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
     pWhRanges[nPos++] = nBrushWhich;
     pWhRanges[nPos++] = nBrushWhich;
     pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION;
@@ -2189,10 +2197,10 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
 
             SearchAttrItem* pAItem;
             const SfxPoolItem* pItem;
-            for( USHORT n = 0; n < pList->Count(); ++n )
+            for( sal_uInt16 n = 0; n < pList->Count(); ++n )
                 if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) &&
                     SFX_ITEM_SET == aOutSet.GetItemState(
-                        pAItem->pItem->Which(), FALSE, &pItem ) )
+                        pAItem->pItem->Which(), sal_False, &pItem ) )
                 {
                     delete pAItem->pItem;
                     pAItem->pItem = pItem->Clone();
@@ -2215,8 +2223,8 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
 IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
 {
     aLayoutBtn.SetText( aStylesStr );
-    bFormat = FALSE;
-    aLayoutBtn.Check( FALSE );
+    bFormat = sal_False;
+    aLayoutBtn.Check( sal_False );
 
     if ( bSearch )
     {
@@ -2234,9 +2242,9 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
             pImpl->aReplaceFormats.SetText( String() );
         pReplaceList->Clear();
     }
-    pImpl->bSaveToModule = FALSE;
+    pImpl->bSaveToModule = sal_False;
     TemplateHdl_Impl( &aLayoutBtn );
-    pImpl->bSaveToModule = TRUE;
+    pImpl->bSaveToModule = sal_True;
     aNoFormatBtn.Disable();
     return 0;
 }
@@ -2272,7 +2280,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
             EnableControl_Impl( &aSelectionBtn );
         else
         {
-            aSelectionBtn.Check( FALSE );
+            aSelectionBtn.Check( sal_False );
             aSelectionBtn.Disable();
         }
     }
@@ -2314,7 +2322,7 @@ void SvxSearchDialog::GetReplaceItems( SfxItemSet& rSet )
 // -----------------------------------------------------------------------
 
 String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
-                                             BOOL bSrchFlag ) const
+                                             sal_Bool bSrchFlag ) const
 {
     if ( rStr.Len() )
         rStr.Erase();
@@ -2352,7 +2360,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
     
     ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
 
-    for ( USHORT i = 0; i < pList->Count(); ++i )
+    for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
     {
         const SearchAttrItem& rItem = pList->GetObject(i);
 
@@ -2390,7 +2398,7 @@ void SvxSearchDialog::PaintAttrText_Impl()
     BuildAttrText_Impl( aDesc, bSearch );
 
     if ( !bFormat && aDesc.Len() )
-        bFormat = TRUE;
+        bFormat = sal_True;
 
     if ( bSearch )
     {
@@ -2464,15 +2472,15 @@ void SvxSearchDialog::SaveToModule_Impl()
     {
         pSearchItem->SetSearchString ( aSearchLB.GetText() );
         pSearchItem->SetReplaceString( aReplaceLB.GetText() );
-        Remember_Impl( aSearchLB.GetText(), TRUE );
+        Remember_Impl( aSearchLB.GetText(), sal_True );
     }
 
-    pSearchItem->SetRegExp( FALSE );
-    pSearchItem->SetLevenshtein( FALSE );
+    pSearchItem->SetRegExp( sal_False );
+    pSearchItem->SetLevenshtein( sal_False );
     if (GetCheckBoxValue( aRegExpBtn ))
-        pSearchItem->SetRegExp( TRUE );
+        pSearchItem->SetRegExp( sal_True );
     else if (GetCheckBoxValue( aSimilarityBox ))
-        pSearchItem->SetLevenshtein( TRUE );
+        pSearchItem->SetLevenshtein( sal_True );
 
     pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
     pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -2481,7 +2489,7 @@ void SvxSearchDialog::SaveToModule_Impl()
     pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
 
     pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
-    INT32 nFlags = GetTransliterationFlags();
+    sal_Int32 nFlags = GetTransliterationFlags();
     if( !pSearchItem->IsUseAsianOptions())
         nFlags &= (TransliterationModules_IGNORE_CASE |
                    TransliterationModules_IGNORE_WIDTH );
@@ -2508,7 +2516,7 @@ SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG);
 
 // -----------------------------------------------------------------------
 
-SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
+SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* pBindings,
                                                 SfxChildWinInfo* pInfo )
     : SfxChildWindow( _pParent, nId )
@@ -2522,7 +2530,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
     pBindings->Update( SID_SEARCH_SEARCHSET );
     pBindings->Update( SID_SEARCH_REPLACESET );
     eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-    dialog->bConstruct = FALSE;
+    dialog->bConstruct = sal_False;
 }
 
 SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc
index 90ce20f467..90ce20f467 100644..100755
--- a/svx/source/dialog/srchdlg.hrc
+++ b/svx/source/dialog/srchdlg.hrc
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index f00a6c8093..c3ddec8bfb 100644..100755
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -29,6 +29,7 @@
 
 #include <svx/dialogs.hrc>
 #include "srchdlg.hrc"
+#include <sfx2/sfxcommands.h>
 
 #define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
 
@@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE
 
 ModelessDialog RID_SVXDLG_SEARCH
 {
-    HelpId = SID_SEARCH_DLG ;
+    HelpId = CMD_SID_SEARCH_DLG ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SvLook = TRUE ;
@@ -66,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     ComboBox ED_SEARCH
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH";
         Pos = MAP_APPFONT ( 6 , 18 ) ;
         Size = MAP_APPFONT ( 132 , 98 ) ;
         TabStop = TRUE ;
@@ -73,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     ListBox LB_SEARCH
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 18 ) ;
         Size = MAP_APPFONT ( 132 , 98 ) ;
@@ -103,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     ComboBox ED_REPLACE
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE";
         Pos = MAP_APPFONT ( 6 , 65 ) ;
         Size = MAP_APPFONT ( 132 , 98 ) ;
         TabStop = TRUE ;
@@ -110,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     ListBox LB_REPLACE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 65 ) ;
         Size = MAP_APPFONT ( 132 , 98 ) ;
@@ -134,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_SEARCH
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH";
         Pos = MAP_APPFONT ( 144 , 9 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Find" ;
@@ -142,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_SEARCH_ALL
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL";
         Pos = MAP_APPFONT ( 144 , 26 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Find ~All" ;
@@ -154,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_REPLACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE";
         Pos = MAP_APPFONT ( 144 , 56 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Replace" ;
@@ -161,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_REPLACE_ALL
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL";
         Pos = MAP_APPFONT ( 144 , 73 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Replace A~ll" ;
@@ -174,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_COMPONENT_1
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -181,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_COMPONENT_2
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -188,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_MATCH_CASE
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE";
         Pos = MAP_APPFONT ( 12 , 101 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         TabStop = TRUE ;
@@ -195,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_WHOLE_WORDS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS";
         Pos = MAP_APPFONT ( 12 , 114 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Whole wor~ds only" ;
@@ -207,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     MoreButton BTN_MORE
     {
+        HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE";
         Pos = MAP_APPFONT ( 6 , 135 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -235,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_SELECTIONS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS";
         Pos = MAP_APPFONT ( 12 , 163 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "C~urrent selection only" ;
@@ -243,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_BACKWARDS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS";
         Pos = MAP_APPFONT ( 12 , 176 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Bac~kwards" ;
@@ -251,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_REGEXP
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP";
         Pos = MAP_APPFONT ( 12 , 189 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Regular e~xpressions" ;
@@ -259,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_SIMILARITY
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY";
         Pos = MAP_APPFONT ( 12 , 204 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Text [ en-US ] = "S~imilarity search" ;
@@ -267,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton PB_SIMILARITY
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY";
         Pos = MAP_APPFONT ( 124 , 202 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -275,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_LAYOUTS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS";
         Pos = MAP_APPFONT ( 12 , 219 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Search for St~yles" ;
@@ -283,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_NOTES
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES";
         Pos = MAP_APPFONT ( 12 , 232 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         TabStop = TRUE ;
@@ -290,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH";
         Pos = MAP_APPFONT ( 12 , 247 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         TabStop = TRUE ;
@@ -298,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_JAP_SOUNDS_LIKE
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE";
         Pos = MAP_APPFONT ( 12 , 260 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         TabStop = TRUE ;
@@ -306,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton PB_JAP_OPTIONS
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS";
         Pos = MAP_APPFONT ( 124 , 258 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "..." ;
@@ -314,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_ATTRIBUTE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE";
         Pos = MAP_APPFONT ( 144 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Attri~butes..." ;
@@ -322,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_FORMAT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT";
         Pos = MAP_APPFONT ( 144 , 180 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "For~mat..." ;
@@ -330,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     PushButton BTN_NOFORMAT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT";
         Pos = MAP_APPFONT ( 144 , 197 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~No Format" ;
@@ -351,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     ListBox LB_CALC_SEARCHIN
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 283 ) ;
         Size = MAP_APPFONT ( 63 , 48 ) ;
@@ -373,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     RadioButton RB_CALC_ROWS
     {
+        HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS";
         Pos = MAP_APPFONT ( 75 , 300 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "Ro~ws" ;
@@ -380,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     RadioButton RB_CALC_COLUMNS
     {
+        HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS";
         Pos = MAP_APPFONT ( 75 , 313 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "Colu~mns" ;
@@ -387,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     CheckBox CB_ALL_SHEETS
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS";
         Pos = MAP_APPFONT ( 12 , 326 ) ;
         Size = MAP_APPFONT ( 126 , 10 ) ;
         Text [ en-US ] = "Search in all sheets" ;
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index 16d0853b98..16d0853b98 100644..100755
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index 4ac0736121..4ac0736121 100644..100755
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index e5acd253e9..d437fc710a 100644..100755
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -38,7 +38,7 @@
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/brshitem.hxx>
 #include <svl/intitem.hxx>
@@ -46,14 +46,14 @@
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
 #include <editeng/flstitem.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #ifndef _XTABLE_HXX //autogen
 
 #include <svx/xtable.hxx>
 #endif
-#include <drawitem.hxx>
-#include <numvset.hxx>
-#include <htmlmode.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/numvset.hxx>
+#include <svx/htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
 #include <editeng/unolingu.hxx>
@@ -115,7 +115,7 @@ static const sal_Unicode aBulletTypes[] =
 
 static Font& lcl_GetDefaultBulletFont()
 {
-    static BOOL bInit = 0;
+    static sal_Bool bInit = 0;
     static Font aDefBulletFont( UniString::CreateFromAscii(
                                 RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
                                 String(), Size( 0, 14 ) );
@@ -125,8 +125,8 @@ static Font& lcl_GetDefaultBulletFont()
         aDefBulletFont.SetFamily( FAMILY_DONTKNOW );
         aDefBulletFont.SetPitch( PITCH_DONTKNOW );
         aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
-        aDefBulletFont.SetTransparent( TRUE );
-        bInit = TRUE;
+        aDefBulletFont.SetTransparent( sal_True );
+        bInit = sal_True;
     }
     return aDefBulletFont;
 }
@@ -152,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
 }
 void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    static USHORT const aLinesArr[] =
+    static sal_uInt16 aLinesArr[] =
     {
         15, 10,
         20, 30,
@@ -172,7 +172,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
     OutputDevice*  pDev = rUDEvt.GetDevice();
     Rectangle aRect = rUDEvt.GetRect();
-    USHORT	nItemId = rUDEvt.GetItemId();
+    sal_uInt16	nItemId = rUDEvt.GetItemId();
     long nRectWidth = aRect.GetWidth();
     long nRectHeight = aRect.GetHeight();
     Size aRectSize(nRectWidth, aRect.GetHeight());
@@ -221,7 +221,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
         {
             Point aStart(aBLPos.X() + nRectWidth *25 / 100,0);
             Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
-            for( USHORT i = 11; i < 100; i += 33)
+            for( sal_uInt16 i = 11; i < 100; i += 33)
             {
                 aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight  * i / 100;
                 pVDev->DrawLine(aStart, aEnd);
@@ -239,9 +239,9 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
             NUM_PAGETYPE_BULLET == nPageType )
     {
         Point aStart(aBLPos.X() + nRectWidth / 9,0);
-        for( USHORT i = 0; i < 3; i++ )
+        for( sal_uInt16 i = 0; i < 3; i++ )
         {
-            USHORT nY = 11 + i * 33;
+            sal_uInt16 nY = 11 + i * 33;
             aStart.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
             String sText;
             if(nPageType == NUM_PAGETYPE_BULLET)
@@ -394,7 +394,7 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 #ifdef DBG_UTIL
             catch(Exception&)
             {
-                static sal_Bool bAssert = FALSE;
+                static sal_Bool bAssert = sal_False;
                 if(!bAssert)
                 {
                     OSL_FAIL("exception in ::UserDraw");
@@ -416,13 +416,13 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     pDev->SetLineColor(aOldColor);
 }
 
-SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ) :
+SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) :
 
     ValueSet( pParent, rResId ),
 
     aLineColor  ( COL_LIGHTGRAY ),
     nPageType   ( nType ),
-    bHTMLMode   ( FALSE ),
+    bHTMLMode   ( sal_False ),
     pVDev       ( NULL )
 {
     SetColCount( 4 );
@@ -430,7 +430,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy
     SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
     if(NUM_PAGETYPE_BULLET == nType)
     {
-        for	( USHORT i = 0; i < 8; i++ )
+        for	( sal_uInt16 i = 0; i < 8; i++ )
         {
             InsertItem( i + 1, i );
             SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) );
@@ -453,7 +453,7 @@ void SvxNumValueSet::SetNumberingSettings(
     aLocale = rLocale;
     if(aNum.getLength() > 8)
             SetStyle( GetStyle()|WB_VSCROLL);
-    for ( USHORT i = 0; i < aNum.getLength(); i++ )
+    for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
     {
             InsertItem( i + 1, i );
             if( i < 8 )
@@ -482,7 +482,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings(
 SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) :
 
     SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
-    bGrfNotFound( FALSE )
+    bGrfNotFound( sal_False )
 
 {
     GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
@@ -504,7 +504,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
     Rectangle aRect = rUDEvt.GetRect();
     OutputDevice*  pDev = rUDEvt.GetDevice();
-    USHORT	nItemId = rUDEvt.GetItemId();
+    sal_uInt16	nItemId = rUDEvt.GetItemId();
     Point aBLPos = aRect.TopLeft();
 
     int nRectHeight = aRect.GetHeight();
@@ -514,14 +514,14 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
                         &aGraphic, NULL))
     {
-        bGrfNotFound = TRUE;
+        bGrfNotFound = sal_True;
     }
     else
     {
         Point aPos(aBLPos.X() + 5, 0);
-        for( USHORT i = 0; i < 3; i++ )
+        for( sal_uInt16 i = 0; i < 3; i++ )
         {
-            USHORT nY = 11 + i * 33;
+            sal_uInt16 nY = 11 + i * 33;
             aPos.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
             aGraphic.Draw( pDev, aPos, aSize );
         }
@@ -533,7 +533,7 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
     // only when a graphics was not there, it needs to be formatted
     if(bGrfNotFound)
     {
-        bGrfNotFound = FALSE;
+        bGrfNotFound = sal_False;
         Format();
     }
     Invalidate();
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
index ad43a5ee9e..ad43a5ee9e 100644..100755
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ b/svx/source/dialog/svxbmpnumvalueset.src
diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx
index da5caf40e5..da5caf40e5 100644..100755
--- a/svx/source/dialog/svxdlg.cxx
+++ b/svx/source/dialog/svxdlg.cxx
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index f2e248e338..670f0217eb 100644..100755
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -28,9 +28,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svxgrahicitem.hxx"
+#include "svx/svxgrahicitem.hxx"
 TYPEINIT1(SvxGraphicItem,SfxPoolItem);
-SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic )
+SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic )
     : SfxPoolItem( _nWhich ), aGraphic( rGraphic )
 {
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 513a5d73a7..ccf2de495a 100644..100755
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -49,15 +49,37 @@
 #include <svx/dialmgr.hxx>
 #include <svx/ruler.hxx>
 #include "rlrcitem.hxx"
-#include "rulritem.hxx"
+#include "svx/rulritem.hxx"
 #include <editeng/tstpitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include "editeng/protitem.hxx"
 #include <vcl/svapp.hxx>
 #ifndef RULER_TAB_RTL
-#define RULER_TAB_RTL           ((USHORT)0x0010)
+#define RULER_TAB_RTL           ((sal_uInt16)0x0010)
 #endif
 
+#include <comphelper/uieventslogger.hxx>
+
+namespace
+{
+    void lcl_logRulerUse(const ::rtl::OUString& sURL) //#i99729#
+    {
+        using namespace ::com::sun::star;
+        util::URL aTargetURL;
+        aTargetURL.Complete = sURL;
+        aTargetURL.Main = sURL;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        {
+            ::rtl::OUString sAppName;
+            uno::Sequence<beans::PropertyValue> source;
+            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler"));
+            ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
+        }
+    }
+}
+
+
+
 // STATIC DATA -----------------------------------------------------------
 
 #define CTRL_ITEM_COUNT 14
@@ -89,7 +111,7 @@ void Debug_Impl(Window *pWin, SvxColumnItem& rColItem)
     aTmp +=  String(ToMM(pWin, rColItem.GetLeft()));
     aTmp += "   ColRight: ";
     aTmp +=  String(ToMM(pWin, rColItem.GetRight()));
-    for(USHORT i = 0; i < rColItem.Count(); ++i) {
+    for(sal_uInt16 i = 0; i < rColItem.Count(); ++i) {
         aTmp += " Start: ";
         aTmp += String(ToMM(pWin, rColItem[i].nStart));
         aTmp += " End: ";
@@ -123,7 +145,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs)
     String aTmp("Tabs: ");
 
     // Delete Def Tabs 
-    for(USHORT i = 0; i < rTabs.Count(); ++i)
+    for(sal_uInt16 i = 0; i < rTabs.Count(); ++i)
     {
         aTmp += String(rTabs[i].GetTabPos() / 56);
         aTmp += " : ";
@@ -187,7 +209,7 @@ void     RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
     }
     String sContent(String::CreateFromAscii(pDescription));
     sContent += rText;
-    USHORT nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
+    sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
     pDebugWindow->GetLBox().SelectEntryPos(nPos);
     pDebugWindow->GrabFocus();
 }
@@ -205,9 +227,9 @@ void     RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
 #endif
 
 struct SvxRuler_Impl  {
-    USHORT *pPercBuf;
-    USHORT *pBlockBuf;
-    USHORT nPercSize;
+    sal_uInt16 *pPercBuf;
+    sal_uInt16 *pBlockBuf;
+    sal_uInt16 nPercSize;
     long   nTotalDist;
     long   lOldWinPos;
     long   lMaxLeftLogic;
@@ -216,15 +238,15 @@ struct SvxRuler_Impl  {
     long   lLastRMargin;
     SvxProtectItem aProtectItem;
     SfxBoolItem* pTextRTLItem;
-    USHORT nControlerItems;
-    USHORT nIdx;
-    USHORT nColLeftPix, nColRightPix; // Pixel values for left / right edge
+    sal_uInt16 nControlerItems;
+    sal_uInt16 nIdx;
+    sal_uInt16 nColLeftPix, nColRightPix; // Pixel values for left / right edge
                                       // For columns; buffered to prevent 
                                       // recalculation errors
                                       // May be has to be widen for future values
-    BOOL bIsTableRows : 1;      // pColumnItem contains table rows instead of columns
+    sal_Bool bIsTableRows : 1;      // pColumnItem contains table rows instead of columns
     //#i24363# tab stops relative to indent
-    BOOL bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
+    sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
     SvxRuler_Impl() :
     pPercBuf(0), pBlockBuf(0),
     nPercSize(0), nTotalDist(0),
@@ -236,8 +258,8 @@ struct SvxRuler_Impl  {
     nIdx(0),
     nColLeftPix(0), nColRightPix(0),
 
-    bIsTableRows(FALSE),
-    bIsTabsRelativeToIndent(TRUE)
+    bIsTableRows(sal_False),
+    bIsTabsRelativeToIndent(sal_True)
     {
     }
     ~SvxRuler_Impl()
@@ -246,22 +268,22 @@ struct SvxRuler_Impl  {
         delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0;
         delete pTextRTLItem;
     }
-    void SetPercSize(USHORT nSize);
+    void SetPercSize(sal_uInt16 nSize);
 
 };
 
 
 
-void SvxRuler_Impl::SetPercSize(USHORT nSize)
+void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize)
 {
     if(nSize > nPercSize)
     {
         delete[] pPercBuf;
         delete[] pBlockBuf;
-        pPercBuf = new USHORT[nPercSize = nSize];
-        pBlockBuf = new USHORT[nPercSize = nSize];
+        pPercBuf = new sal_uInt16[nPercSize = nSize];
+        pBlockBuf = new sal_uInt16[nPercSize = nSize];
     }
-    size_t nSize2 = sizeof(USHORT) * nPercSize;
+    size_t nSize2 = sizeof(sal_uInt16) * nPercSize;
     memset(pPercBuf, 0, nSize2);
     memset(pBlockBuf, 0, nSize2);
 }
@@ -297,7 +319,7 @@ SvxRuler::SvxRuler
  Window* pParent,                               // StarView Parent
  Window* pWin,            // Output window: is used for conversion 
                           // logical units <-> pixels
- USHORT  flags,           // Display flags, see ruler.hxx
+ sal_uInt16  flags,       // Display flags, see ruler.hxx
  SfxBindings &rBindings,  // associated Bindings
  WinBits nWinStyle                              // StarView WinBits
 )
@@ -314,7 +336,7 @@ SvxRuler::SvxRuler
   pObjectItem(0),
   pEditWin(pWin),
   pRuler_Imp(new SvxRuler_Impl),
-  bAppSetNullOffset(FALSE),  // Is the 0-offset of the ruler set by the application?
+  bAppSetNullOffset(sal_False),  // Is the 0-offset of the ruler set by the application?
   lLogicNullOffset(0),
   lAppNullOffset(LONG_MAX),
   lMinFrame(5),
@@ -335,9 +357,9 @@ SvxRuler::SvxRuler
   nDragOffset(0),
   nMaxLeft(0),
   nMaxRight(0),
-  bValid(FALSE),
-  bListening(FALSE),
-  bActive(TRUE)
+  bValid(sal_False),
+  bListening(sal_False),
+  bActive(sal_True)
 
 /* [Description]
 
@@ -349,18 +371,18 @@ SvxRuler::SvxRuler
     rBindings.EnterRegistrations();
 
     // Create Supported Items 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     // Page edges
 
     pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings);
     if((nWinStyle & WB_VSCROLL) == WB_VSCROLL)
     {
-        bHorz = FALSE;
+        bHorz = sal_False;
         pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_ULSPACE, *this, rBindings);
     }
     else
     {
-        bHorz = TRUE;
+        bHorz = sal_True;
         pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings);
     }
 
@@ -369,7 +391,7 @@ SvxRuler::SvxRuler
 
     if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
     {
-        USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+        sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
         pCtrlItem[i++] = new SvxRulerItem(nTabStopId, *this, rBindings);
         SetExtraType(RULER_EXTRA_TAB, nDefTabType);
     }
@@ -390,7 +412,7 @@ SvxRuler::SvxRuler
         pIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM;
         pIndents[INDENT_LEFT_BORDER].nStyle = RULER_INDENT_BORDER;
         pIndents[INDENT_RIGHT_BORDER].nStyle = RULER_INDENT_BORDER;
-        for(USHORT nIn = 0; nIn < 7; nIn++)
+        for(sal_uInt16 nIn = 0; nIn < 7; nIn++)
             pIndents[nIn].nPos = 0;
     }
 
@@ -408,7 +430,7 @@ SvxRuler::SvxRuler
         pObjectBorders = new RulerBorder[OBJECT_BORDER_COUNT];
         size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT;
         memset(pObjectBorders, 0, nSize);
-        for(USHORT nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
+        for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
         {
             pObjectBorders[nBorder].nPos   = 0;
             pObjectBorders[nBorder].nWidth = 0;
@@ -441,7 +463,7 @@ SvxRuler::~SvxRuler()
 
     pBindings->EnterRegistrations();
 
-    for(USHORT i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
+    for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
         delete pCtrlItem[i];
     delete[] pCtrlItem;
 
@@ -554,7 +576,7 @@ long SvxRuler::PixelAdjust(long nVal, long nValOld) const
 }
 
 
-inline USHORT SvxRuler::GetObjectBordersOff(USHORT nIdx) const
+inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const
 {
     return bHorz? nIdx: nIdx + 2;
 }
@@ -569,7 +591,7 @@ void SvxRuler::UpdateFrame()
 */
 
 {
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         ( pRuler_Imp->aProtectItem.IsSizeProtected() ||
           pRuler_Imp->aProtectItem.IsPosProtected() ) ?
         0 : RULER_MARGIN_SIZEABLE;
@@ -597,7 +619,7 @@ void SvxRuler::UpdateFrame()
         else
             lRight = pLRSpaceItem->GetRight();
 
-        ULONG aWidth=
+        sal_uIntPtr aWidth=
             ConvertHPosPixel(pPagePosItem->GetWidth() - lRight -
                                     lLogicNullOffset + lAppNullOffset);
         SetMargin2( aWidth, nMarginStyle );
@@ -634,8 +656,8 @@ void SvxRuler::UpdateFrame()
     }
     if(pColumnItem)
     {
-        pRuler_Imp->nColLeftPix = (USHORT) ConvertSizePixel(pColumnItem->GetLeft());
-        pRuler_Imp->nColRightPix = (USHORT) ConvertSizePixel(pColumnItem->GetRight());
+        pRuler_Imp->nColLeftPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetLeft());
+        pRuler_Imp->nColRightPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetRight());
     }
 
 }
@@ -661,9 +683,9 @@ void SvxRuler::StartListening_Impl()
 {
     if(!bListening)
     {
-        bValid = FALSE;
+        bValid = sal_False;
         StartListening(*pBindings);
-        bListening = TRUE;
+        bListening = sal_True;
     }
 }
 
@@ -749,7 +771,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem)
 void SvxRuler::Update
 (
  const SvxColumnItem *pItem,  // new value
- USHORT nSID //Slot Id to identify NULL items
+ sal_uInt16 nSID //Slot Id to identify NULL items
 )
 
 /* [Description]
@@ -777,7 +799,7 @@ void SvxRuler::Update
         //must not delete it
         {
             delete pColumnItem; pColumnItem = 0;
-            pRuler_Imp->bIsTableRows = FALSE;
+            pRuler_Imp->bIsTableRows = sal_False;
         }
         StartListening_Impl();
     }
@@ -799,8 +821,8 @@ void SvxRuler::UpdateColumns()
             nBorderCount = pColumnItem->Count();
             pBorders = new RulerBorder[nBorderCount];
         }
-        USHORT _nFlags = RULER_BORDER_VARIABLE;
-        BOOL bProtectColumns =
+        sal_uInt16 _nFlags = RULER_BORDER_VARIABLE;
+        sal_Bool bProtectColumns =
             pRuler_Imp->aProtectItem.IsSizeProtected() ||
             pRuler_Imp->aProtectItem.IsPosProtected();
         if( !bProtectColumns )
@@ -811,10 +833,10 @@ void SvxRuler::UpdateColumns()
             if ( !bProtectColumns )
                 _nFlags |= RULER_BORDER_SIZEABLE;
 
-        USHORT nBorders = pColumnItem->Count();
+        sal_uInt16 nBorders = pColumnItem->Count();
         if(!pRuler_Imp->bIsTableRows)
             --nBorders;
-        for(USHORT i = 0; i < nBorders; ++i)
+        for(sal_uInt16 i = 0; i < nBorders; ++i)
         {
             pBorders[i].nStyle = _nFlags;
             if(!(*pColumnItem)[i].bVisible)
@@ -872,7 +894,7 @@ void SvxRuler::UpdateObject()
         pObjectBorders[3].nPos =
             ConvertPosPixel(pObjectItem->GetEndY() - nMargin + lAppNullOffset);
 
-        const USHORT nOff = GetObjectBordersOff(0);
+        const sal_uInt16 nOff = GetObjectBordersOff(0);
         SetBorders(2, pObjectBorders + nOff);
     }
     else
@@ -902,7 +924,7 @@ void SvxRuler::UpdatePara()
     // Dependence on PagePosItem
     if(pParaItem && pPagePosItem && !pObjectItem)
     {
-        BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         // First-line indent is negative to the left paragraph margin
         long nLeftFrameMargin = GetLeftFrameMargin();
         long nRightFrameMargin = GetRightFrameMargin();
@@ -1120,7 +1142,7 @@ long SvxRuler::GetDefTabDist() const
 }
 
 
-USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
+sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
 
 /* [Description]
 
@@ -1140,7 +1162,7 @@ USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
 }
 
 
-SvxTabAdjust ToAttrTab_Impl(USHORT eAdj)
+SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj)
 {
     switch(eAdj) {
     case RULER_TAB_LEFT:    return SVX_TAB_ADJUST_LEFT    ;
@@ -1167,7 +1189,7 @@ void SvxRuler::UpdateTabs()
     {
         // buffer for DefaultTabStop
         // Distance last Tab <-> Right paragraph margin / DefaultTabDist
-        BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         long nLeftFrameMargin = GetLeftFrameMargin();
         long nRightFrameMargin = GetRightFrameMargin();
 
@@ -1186,10 +1208,10 @@ void SvxRuler::UpdateTabs()
         long nDefTabDist = ConvertHPosPixel(lDefTabDist);
         if( !nDefTabDist )
             nDefTabDist = 1;
-        const USHORT nDefTabBuf = lPosPixel > lRightIndent ||
+        const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent ||
             lLastTab > lRightIndent
                 ? 0
-                : (USHORT)( (lRightIndent - lPosPixel) / nDefTabDist );
+                : (sal_uInt16)( (lRightIndent - lPosPixel) / nDefTabDist );
 
         if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize)
         {
@@ -1200,7 +1222,7 @@ void SvxRuler::UpdateTabs()
         }
 
         nTabCount = 0;
-        USHORT j;
+        sal_uInt16 j;
         //#i24363# tab stops relative to indent
         const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - nParaItemTxtLeft );
         const long lParaIndentPix = ConvertSizePixel(lParaIndent);
@@ -1341,7 +1363,7 @@ void SvxRuler::SetNullOffsetLogic
 )
 {
     lAppNullOffset = lLogicNullOffset - lVal;
-    bAppSetNullOffset = TRUE;
+    bAppSetNullOffset = sal_True;
     Ruler::SetNullOffset(ConvertSizePixel(lVal));
     Update();
 }
@@ -1400,7 +1422,7 @@ inline void SvxRuler::SetFrameLeft(long l)
 */
 
 {
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
     if(bAppSetNullOffset)
@@ -1501,9 +1523,9 @@ long SvxRuler::GetRightFrameMargin() const
 {
     if(pColumnItem)
     {
-        if(!IsActLastColumn( TRUE ))
+        if(!IsActLastColumn( sal_True ))
         {
-            long nRet = (*pColumnItem)[GetActRightColumn( TRUE )].nEnd;
+            long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd;
             if(pColumnItem->IsTable() && pParaBorderItem)
                 nRet -= pParaBorderItem->GetRight();
             return nRet;
@@ -1521,7 +1543,7 @@ long SvxRuler::GetRightFrameMargin() const
         l += pULSpaceItem->GetLower();
 
     if(pParaBorderItem &&
-        (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( TRUE )))
+        (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( sal_True )))
         l += pParaBorderItem->GetRight();
 
     if(bHorz)
@@ -1535,7 +1557,7 @@ long SvxRuler::GetRightFrameMargin() const
                    SVXRULER_SUPPORT_NEGATIVE_MARGINS )
 #define TAB_FLAG ( pColumnItem && pColumnItem->IsTable() )
 
-long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
+long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight )
 
 /* [Description]
 
@@ -1547,7 +1569,7 @@ long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
     const long lNullPix = Ruler::GetNullOffset();
     long lDragPos = GetDragPos() + lNullPix;
 ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
-     BOOL bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
+     sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
     if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft)
         lDragPos = nMaxLeft;
     else if((bRight||bHoriRows) && lDragPos > nMaxRight)
@@ -1559,7 +1581,7 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
 
 void ModifyTabs_Impl
 (
- USHORT nCount,                                 // Number of Tabs
+ sal_uInt16 nCount,                             // Number of Tabs
  RulerTab *pTabs,                               // Tab buffer
  long lDiff                                     // difference to be added
  )
@@ -1570,7 +1592,7 @@ void ModifyTabs_Impl
 */
 {
     if( pTabs )
-        for(USHORT i = 0; i < nCount; ++i)	pTabs[i].nPos += lDiff;
+        for(sal_uInt16 i = 0; i < nCount; ++i)	pTabs[i].nPos += lDiff;
 }
 
 
@@ -1582,7 +1604,7 @@ void SvxRuler::DragMargin1()
    Dragging the left edge of frame
 */
 {
-    const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, TRUE );
+    const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True );
     DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz);
     if(pColumnItem&&
        (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL))
@@ -1593,11 +1615,11 @@ void SvxRuler::AdjustMargin1(long lDiff)
 {
     const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset();
     const long lDragPos = lDiff;
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
 
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
 
     if(!bAppSetNullOffset)
@@ -1622,7 +1644,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
             }
             if(pColumnItem)
             {
-                for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+                for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
                     pBorders[i].nPos -= _lDiff;
                 SetBorders(pColumnItem->Count()-1, pBorders);
                 if(pColumnItem->IsFirstAct())
@@ -1671,7 +1693,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
 
             if(pColumnItem)
             {
-                for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+                for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
                     pBorders[i].nPos += _lDiff;
                 SetBorders(pColumnItem->Count()-1, pBorders);
                 if(pColumnItem->IsFirstAct())
@@ -1712,7 +1734,7 @@ void SvxRuler::DragMargin2()
    Dragging the right edge of frame
 */
 {
-    const long lDragPos = GetCorrectedDragPos( TRUE, !TAB_FLAG || !NEG_FLAG);
+    const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG);
     DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz);
     long lDiff = lDragPos - GetMargin2();
 
@@ -1720,10 +1742,10 @@ void SvxRuler::DragMargin2()
        (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL))
         DragBorders();
 
-    BOOL bProtectColumns =
+    sal_Bool bProtectColumns =
         pRuler_Imp->aProtectItem.IsSizeProtected() ||
         pRuler_Imp->aProtectItem.IsPosProtected();
-    const USHORT nMarginStyle =
+    const sal_uInt16 nMarginStyle =
         bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
     SetMargin2( lDragPos, nMarginStyle );
 
@@ -1744,7 +1766,7 @@ void SvxRuler::DragIndents()
 */
 {
     const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos();
-    const USHORT nIdx = GetDragAryPos()+INDENT_GAP;
+    const sal_uInt16 nIdx = GetDragAryPos()+INDENT_GAP;
     const long lDiff = pIndents[nIdx].nPos - lDragPos;
 
     if((nIdx == INDENT_FIRST_LINE ||
@@ -1760,7 +1782,7 @@ void SvxRuler::DragIndents()
 }
 
 
-void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, BOOL Hori)
+void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori)
 
 /* [Description]
 
@@ -1827,9 +1849,9 @@ void SvxRuler::DragTabs()
 */
 {
 
-    long lDragPos = GetCorrectedDragPos(TRUE, FALSE);
+    long lDragPos = GetCorrectedDragPos(sal_True, sal_False);
 
-    USHORT nIdx = GetDragAryPos()+TAB_GAP;
+    sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
     DrawLine_Impl(lTabPos, 7, bHorz);
 
     long nDiff = lDragPos - pTabs[nIdx].nPos;
@@ -1837,7 +1859,7 @@ void SvxRuler::DragTabs()
     if(nDragType & DRAG_OBJECT_SIZE_LINEAR)
     {
 
-        for(USHORT i = nIdx; i < nTabCount; ++i)
+        for(sal_uInt16 i = nIdx; i < nTabCount; ++i)
         {
             pTabs[i].nPos += nDiff;
             // limit on maximum
@@ -1851,7 +1873,7 @@ void SvxRuler::DragTabs()
     {
         pRuler_Imp->nTotalDist -= nDiff;
         pTabs[nIdx].nPos = lDragPos;
-        for(USHORT i = nIdx+1; i < nTabCount; ++i)
+        for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
         {
             if(pTabs[i].nStyle & RULER_TAB_DEFAULT)
                 // can be canceled at the DefaultTabs
@@ -1877,7 +1899,7 @@ void SvxRuler::DragTabs()
 
 
 
-void SvxRuler::SetActive(BOOL bOn)
+void SvxRuler::SetActive(sal_Bool bOn)
 {
     if(bOn)
     {
@@ -1889,10 +1911,10 @@ void SvxRuler::SetActive(BOOL bOn)
     {
         pBindings->EnterRegistrations();
         if(bOn)
-            for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+            for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
                 pCtrlItem[i]->ReBind();
         else
-            for(USHORT j=0;j<pRuler_Imp->nControlerItems;j++)
+            for(sal_uInt16 j=0;j<pRuler_Imp->nControlerItems;j++)
                 pCtrlItem[j]->UnBind();
         pBindings->LeaveRegistrations();
     }
@@ -1926,7 +1948,7 @@ void SvxRuler::UpdateParaContents_Impl
             pIndents[INDENT_LEFT_MARGIN].nPos += l;
             if ( pTabs )
             {
-                for(USHORT i = 0; i < nTabCount+TAB_GAP;++i)
+                for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP;++i)
                     pTabs[i].nPos += l;
                 SetTabs(nTabCount, pTabs+TAB_GAP);
             }
@@ -1944,7 +1966,7 @@ void SvxRuler::DragBorders()
    Dragging of Borders (Tables and other columns)
 */
 {
-    BOOL bLeftIndentsCorrected = FALSE, bRightIndentsCorrected = FALSE;
+    sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False;
     int nIdx;
 
     if(GetDragType()==RULER_TYPE_BORDER)
@@ -1955,7 +1977,7 @@ void SvxRuler::DragBorders()
     else
         nIdx=0;
 
-    USHORT nDragSize = GetDragSize();
+    sal_uInt16 nDragSize = GetDragSize();
     long lDiff = 0;
 
     // the drag position has to be corrected to be able to prevent borders from passing each other
@@ -1984,13 +2006,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
                     if(i == GetActRightColumn())
                     {
                         UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
-                        bRightIndentsCorrected = TRUE;
+                        bRightIndentsCorrected = sal_True;
                     }
                     // LAR, EZE update the column
                     else if(i == GetActLeftColumn())
                     {
                         UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
-                        bLeftIndentsCorrected = TRUE;
+                        bLeftIndentsCorrected = sal_True;
                     }
                 }
             }
@@ -2056,13 +2078,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
                         if(i == GetActRightColumn())
                         {
                             UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
-                            bRightIndentsCorrected = TRUE;
+                            bRightIndentsCorrected = sal_True;
                         }
                         // LAR, EZE update the column
                         else if(i == GetActLeftColumn())
                         {
                             UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
-                            bLeftIndentsCorrected = TRUE;
+                            bLeftIndentsCorrected = sal_True;
                         }
                     }
                 }
@@ -2165,7 +2187,7 @@ void SvxRuler::DragObjectBorder()
     if(RULER_DRAGSIZE_MOVE == GetDragSize())
     {
         const long lPos = GetCorrectedDragPos();
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         pObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPos;
         SetBorders(2, pObjectBorders + GetObjectBordersOff(0));
         DrawLine_Impl(lTabPos, 7, bHorz);
@@ -2182,7 +2204,7 @@ void SvxRuler::ApplyMargins()
 */
 {
     const SfxPoolItem *pItem = 0;
-    USHORT nId = SID_ATTR_LONG_LRSPACE;
+    sal_uInt16 nId = SID_ATTR_LONG_LRSPACE;
     if(bHorz)
     {
         const long lOldNull = lLogicNullOffset;
@@ -2246,9 +2268,9 @@ void SvxRuler::ApplyIndents()
 */
 {
     long nNewTxtLeft;
-    if(pColumnItem&&!IsActFirstColumn( TRUE ))
+    if(pColumnItem&&!IsActFirstColumn( sal_True ))
     {
-        long nLeftCol=GetActLeftColumn( TRUE );
+        long nLeftCol=GetActLeftColumn( sal_True );
         nNewTxtLeft =
             PixelHAdjust(
                 ConvertHPosLogic(
@@ -2263,7 +2285,7 @@ void SvxRuler::ApplyIndents()
                 ConvertHPosLogic(pIndents[INDENT_LEFT_MARGIN].nPos),
                 pParaItem->GetTxtLeft());
 
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
 
     long nNewFirstLineOffset;
     if(bRTL)
@@ -2302,11 +2324,11 @@ void SvxRuler::ApplyIndents()
         sal::static_int_cast< short >(nNewFirstLineOffset));
     pParaItem->SetTxtLeft(nNewTxtLeft);
 
-    if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn())))
+    if(pColumnItem && ((!bRTL && !IsActLastColumn( sal_True ))|| (bRTL && !IsActFirstColumn())))
     {
         if(bRTL)
         {
-            long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos;
+            long nActBorder = pBorders[GetActLeftColumn( sal_True )].nPos;
             long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos;
             long nConvert = ConvertHPosLogic( nRightMargin - nActBorder );
             pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) );
@@ -2316,7 +2338,7 @@ void SvxRuler::ApplyIndents()
             pParaItem->SetRight(
                 PixelHAdjust(
                     ConvertHPosLogic(
-                        pBorders[GetActRightColumn( TRUE )].nPos -
+                        pBorders[GetActRightColumn( sal_True )].nPos -
                         pIndents[INDENT_RIGHT_MARGIN].nPos) -
                     lAppNullOffset,
                     pParaItem->GetRight()));
@@ -2341,7 +2363,7 @@ void SvxRuler::ApplyIndents()
                 lAppNullOffset,	pParaItem->GetRight()));
         }
     }
-    USHORT nParaId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
+    sal_uInt16 nParaId  = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
     pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L );
     UpdateTabs();
 }
@@ -2354,8 +2376,8 @@ void SvxRuler::ApplyTabs()
    Apply tab settings, changed by dragging.
 */
 {
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
-    const USHORT nCoreIdx = GetDragAryPos();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    const sal_uInt16 nCoreIdx = GetDragAryPos();
     if(IsDragDelete())
     {
         pTabStopItem->Remove(nCoreIdx);
@@ -2365,7 +2387,7 @@ void SvxRuler::ApplyTabs()
     {
         SvxTabStopItem *pItem = new SvxTabStopItem(pTabStopItem->Which());
         //remove default tab stops
-        for ( USHORT i = 0; i < pItem->Count(); )
+        for ( sal_uInt16 i = 0; i < pItem->Count(); )
         {
             if ( SVX_TAB_ADJUST_DEFAULT == (*pItem)[i].GetAdjustment() )
             {
@@ -2375,7 +2397,7 @@ void SvxRuler::ApplyTabs()
             ++i;
         }
 
-        USHORT j;
+        sal_uInt16 j;
         for(j = 0; j < nCoreIdx; ++j)
         {
             pItem->Insert((*pTabStopItem)[j]);
@@ -2429,7 +2451,7 @@ void SvxRuler::ApplyTabs()
         pTabStopItem->Remove(nCoreIdx);
         pTabStopItem->Insert(aTabStop);
     }
-    USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+    sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
     pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
     UpdateTabs();
 }
@@ -2457,7 +2479,7 @@ void SvxRuler::ApplyBorders()
                     lAppNullOffset, pColumnItem->GetRight() ) );
         }
     }
-    for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+    for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
     {
         long& nEnd = (*pColumnItem)[i].nEnd;
         nEnd = PIXEL_H_ADJUST(
@@ -2478,8 +2500,8 @@ void SvxRuler::ApplyBorders()
         Debug_Impl(pEditWin,*pColumnItem);
 #endif // DEBUGLIN
     SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
-                      nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: FALSE);
-    USHORT nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
+                      nDragType & DRAG_OBJECT_ACTLINE_ONLY? sal_True : sal_False);
+    sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
                             (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
     pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L );
 }
@@ -2534,8 +2556,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
 
             long lPos;
             long lWidth=0;
-            USHORT nStart;
-            USHORT nIdx=GetDragAryPos();
+            sal_uInt16 nStart;
+            sal_uInt16 nIdx=GetDragAryPos();
             lWidth=0;
             long lActWidth=0;
             long lActBorderSum;
@@ -2567,8 +2589,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
             //because the height of the table changes while dragging
             if(pRuler_Imp->bIsTableRows && RULER_TYPE_BORDER == eType)
             {
-                USHORT nStartBorder;
-                USHORT nEndBorder;
+                sal_uInt16 nStartBorder;
+                sal_uInt16 nEndBorder;
                 if(bHorz)
                 {
                     nStartBorder = nIdx + 1;
@@ -2586,7 +2608,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                 pRuler_Imp->nTotalDist = lWidth;
                 lPos = lOrigLPos = pBorders[nIdx].nPos;
 
-                for(USHORT i = nStartBorder; i < nEndBorder; ++i)
+                for(sal_uInt16 i = nStartBorder; i < nEndBorder; ++i)
                 {
                     if(bHorz)
                     {
@@ -2595,16 +2617,16 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                     }
                     else
                         lActWidth = pBorders[i].nPos;
-                    pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+                    pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
                                                     / pRuler_Imp->nTotalDist);
-                    pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+                    pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
                     lActBorderSum += pBorders[i].nWidth;
                 }
             }
             else
             {
                 lPos = lOrigLPos;
-                for(USHORT ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
+                for(sal_uInt16 ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
                 {
                     lWidth += pBorders[ii].nPos - lPos;
                     lPos = pBorders[ii].nPos + pBorders[ii].nWidth;
@@ -2614,13 +2636,13 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
                 pRuler_Imp->nTotalDist = lWidth;
                 lPos = lOrigLPos;
 
-                for(USHORT i = nStart; i < pColumnItem->Count() - 1; ++i)
+                for(sal_uInt16 i = nStart; i < pColumnItem->Count() - 1; ++i)
                 {
                     lActWidth += pBorders[i].nPos - lPos;
                     lPos = pBorders[i].nPos + pBorders[i].nWidth;
-                    pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+                    pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
                                                     / pRuler_Imp->nTotalDist);
-                    pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+                    pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
                     lActBorderSum += pBorders[i].nWidth;
                 }
             }
@@ -2628,14 +2650,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
         break;
         case RULER_TYPE_TAB:
         {
-            const USHORT nIdx = GetDragAryPos()+TAB_GAP;
+            const sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
             pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos;
             pRuler_Imp->SetPercSize(nTabCount);
-            for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
-            for(USHORT i = nIdx+1; i < nTabCount; ++i)
+            for(sal_uInt16 n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
+            for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
             {
                 const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos;
-                pRuler_Imp->pPercBuf[i] = (USHORT)((nDelta * 1000) / pRuler_Imp->nTotalDist);
+                pRuler_Imp->pPercBuf[i] = (sal_uInt16)((nDelta * 1000) / pRuler_Imp->nTotalDist);
             }
             break;
         }
@@ -2657,7 +2679,7 @@ void SvxRuler::EvalModifier()
 */
 
 {
-    USHORT nModifier = GetDragModifier();
+    sal_uInt16 nModifier = GetDragModifier();
     if(pRuler_Imp->bIsTableRows)
     {
         //rows can only be moved in one way, additionally current column is possible
@@ -2697,6 +2719,7 @@ void SvxRuler::Click()
 */
 
 {
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click"));
     Ruler::Click();
     if( bActive )
     {
@@ -2712,11 +2735,11 @@ void SvxRuler::Click()
         pBindings->Update( SID_RULER_PROTECT );
         pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL );
     }
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     if(pTabStopItem &&
        (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
     {
-        BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+        sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
         if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2745,11 +2768,11 @@ void SvxRuler::Click()
 }
 
 
-BOOL SvxRuler::CalcLimits
+sal_Bool SvxRuler::CalcLimits
 (
  long &nMax1,                                   // minimum value to be set
  long &nMax2,                                   // minimum value to be set
- BOOL
+ sal_Bool
 ) const
 
 /* [Description]
@@ -2760,7 +2783,7 @@ BOOL SvxRuler::CalcLimits
 {
     nMax1 = LONG_MIN;
     nMax2 = LONG_MAX;
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -2773,7 +2796,7 @@ void SvxRuler::CalcMinMax()
 */
 
 {
-    BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+    sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
     const long lNullPix = ConvertPosPixel(lLogicNullOffset);
     pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1;
     switch(GetDragType())
@@ -2946,7 +2969,7 @@ void SvxRuler::CalcMinMax()
     }
     case RULER_TYPE_BORDER:
     {                // Table, column (Modifier)
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         switch(GetDragSize())
         {
           case RULER_DRAGSIZE_1 :
@@ -2987,13 +3010,13 @@ void SvxRuler::CalcMinMax()
                 {
                     //nIdx contains the position of the currently moved item
                     //next visible separator on the left
-                    USHORT nLeftCol=GetActLeftColumn(FALSE, nIdx);
+                    sal_uInt16 nLeftCol=GetActLeftColumn(sal_False, nIdx);
                     //next visible separator on the right
-                    USHORT nRightCol=GetActRightColumn(FALSE, nIdx);
+                    sal_uInt16 nRightCol=GetActRightColumn(sal_False, nIdx);
                     //next separator on the left - regardless if visible or not
-                    USHORT nActLeftCol=GetActLeftColumn();
+                    sal_uInt16 nActLeftCol=GetActLeftColumn();
                     //next separator on the right - regardless if visible or not
-                    USHORT nActRightCol=GetActRightColumn();
+                    sal_uInt16 nActRightCol=GetActRightColumn();
                     if(pColumnItem->IsTable())
                     {
                         if(nDragType & DRAG_OBJECT_ACTLINE_ONLY)
@@ -3113,8 +3136,8 @@ void SvxRuler::CalcMinMax()
                             else
                             {
                                 nMaxRight = lNullPix + pBorders[nRightCol].nPos;
-                                USHORT nNotHiddenRightCol =
-                                    GetActRightColumn(TRUE, nIdx);
+                                sal_uInt16 nNotHiddenRightCol =
+                                    GetActRightColumn(sal_True, nIdx);
 
                                 if( nActLeftCol == nIdx )
                                 {
@@ -3148,7 +3171,7 @@ void SvxRuler::CalcMinMax()
                 {
                     if(pObjectItem->HasLimits())
                     {
-                        if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: TRUE))
+                        if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True))
                         {
                             nMaxLeft = ConvertPosPixel(nMaxLeft);
                             nMaxRight = ConvertPosPixel(nMaxRight);
@@ -3196,7 +3219,7 @@ void SvxRuler::CalcMinMax()
     }
       case RULER_TYPE_INDENT:
         {
-        const USHORT nIdx = GetDragAryPos();
+        const sal_uInt16 nIdx = GetDragAryPos();
         switch(nIdx) {
         case INDENT_FIRST_LINE - INDENT_GAP:
         case INDENT_LEFT_MARGIN - INDENT_GAP:
@@ -3251,8 +3274,8 @@ void SvxRuler::CalcMinMax()
                     nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
                     if(pColumnItem)
                     {
-                        USHORT nRightCol=GetActRightColumn( TRUE );
-                        if(!IsActLastColumn( TRUE ))
+                        sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+                        if(!IsActLastColumn( sal_True ))
                             nMaxRight += pBorders[nRightCol].nPos;
                         else
                             nMaxRight += GetMargin2();
@@ -3268,8 +3291,8 @@ void SvxRuler::CalcMinMax()
                     nMaxRight = lNullPix;
                     if(pColumnItem)
                     {
-                        USHORT nRightCol=GetActRightColumn( TRUE );
-                        if(!IsActLastColumn( TRUE ))
+                        sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+                        if(!IsActLastColumn( sal_True ))
                             nMaxRight += pBorders[nRightCol].nPos;
                         else
                             nMaxRight += GetMargin2();
@@ -3326,9 +3349,10 @@ long SvxRuler::StartDrag()
 */
 
 {
-    BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag"));
+    sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
     if(!bValid)
-        return FALSE;
+        return sal_False;
 
     pRuler_Imp->lLastLMargin=GetMargin1();
     pRuler_Imp->lLastRMargin=GetMargin2();
@@ -3348,7 +3372,7 @@ long SvxRuler::StartDrag()
                     nDragType = DRAG_OBJECT;
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
             break;
         case RULER_TYPE_BORDER:                // Table, column (Modifier)
             if(pColumnItem)
@@ -3363,8 +3387,8 @@ long SvxRuler::StartDrag()
             break;
         case RULER_TYPE_INDENT: {                // Paragraph indents (Modifier)
             if( bContentProtected )
-                return FALSE;
-            USHORT nIndent = INDENT_LEFT_MARGIN;
+                return sal_False;
+            sal_uInt16 nIndent = INDENT_LEFT_MARGIN;
             if((nIndent) == GetDragAryPos() + INDENT_GAP) {  // Left paragraph indent
                 pIndents[0] = pIndents[INDENT_FIRST_LINE];
                 pIndents[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3377,7 +3401,7 @@ long SvxRuler::StartDrag()
             break;
         }
         case RULER_TYPE_TAB:                // Tabs (Modifier)
-            if( bContentProtected ) return FALSE;
+            if( bContentProtected ) return sal_False;
             EvalModifier();
             pTabs[0] = pTabs[GetDragAryPos()+1];
             pTabs[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3442,7 +3466,8 @@ void SvxRuler::EndDrag()
    data to the application.
 */
 {
-    const BOOL bUndo = IsDragCanceled();
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag"));
+    const sal_Bool bUndo = IsDragCanceled();
     const long lPos = GetDragPos();
     DrawLine_Impl(lTabPos, 6, bHorz);
     lTabPos=-1;
@@ -3493,7 +3518,7 @@ void SvxRuler::EndDrag()
     nDragType = NONE;
     Ruler::EndDrag();
     if(bUndo)
-        for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+        for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
         {
             pCtrlItem[i]->ClearCache();
             pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId());
@@ -3536,8 +3561,8 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
      ((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) {
         Update();
         EndListening(*pBindings);
-        bValid = TRUE;
-        bListening = FALSE;
+        bValid = sal_True;
+        bListening = sal_False;
     }
 }
 
@@ -3570,7 +3595,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
         aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1);
         pTabStopItem->Remove(pRuler_Imp->nIdx);
         pTabStopItem->Insert(aTabStop);
-        USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+        sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
         pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
         UpdateTabs();
         pRuler_Imp->nIdx = 0;
@@ -3590,7 +3615,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
     if ( COMMAND_CONTEXTMENU == rCEvt.GetCommand() )
     {
         CancelDrag();
-        BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+        sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
         if ( pTabs &&
              RULER_TYPE_TAB ==
              GetType( rCEvt.GetMousePosPixel(), &pRuler_Imp->nIdx ) &&
@@ -3604,10 +3629,10 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
             aDev.SetBackground(Wallpaper(Color(COL_WHITE)));
             const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
 
-            for ( USHORT i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
+            for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
             {
-                USHORT nStyle = bRTL ? i|RULER_TAB_RTL : i;
-                nStyle |= (USHORT)(bHorz ? WB_HORZ : WB_VERT);
+                sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
+                nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT);
                 DrawTab(&aDev, aPt, nStyle);
                 aMenu.InsertItem(i+1,
                                  String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())),
@@ -3622,13 +3647,13 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
             PopupMenu aMenu(ResId(RID_SVXMN_RULER, DIALOG_MGR()));
             aMenu.SetSelectHdl(LINK(this, SvxRuler, MenuSelect));
             FieldUnit eUnit = GetUnit();
-            const USHORT nCount = aMenu.GetItemCount();
+            const sal_uInt16 nCount = aMenu.GetItemCount();
 
-            BOOL bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
-            for ( USHORT i = nCount; i; --i )
+            sal_Bool bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
+            for ( sal_uInt16 i = nCount; i; --i )
             {
-                const USHORT nId = aMenu.GetItemId(i - 1);
-                aMenu.CheckItem(nId, nId == (USHORT)eUnit);
+                const sal_uInt16 nId = aMenu.GetItemId(i - 1);
+                aMenu.CheckItem(nId, nId == (sal_uInt16)eUnit);
                 if(bReduceMetric &&
                         (nId == FUNIT_M ||
                          nId == FUNIT_KM ||
@@ -3653,14 +3678,14 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
 }
 
 
-USHORT SvxRuler::GetActRightColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActRightColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
 {
     if( nAct == USHRT_MAX )
         nAct = pColumnItem->GetActColumn();
     else nAct++; //To be able to pass on the ActDrag
 
-    BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+    sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
         !( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
 
     while( nAct < pColumnItem->Count() - 1 )
@@ -3675,15 +3700,15 @@ USHORT SvxRuler::GetActRightColumn(
 
 
 
-USHORT SvxRuler::GetActLeftColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActLeftColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
 {
     if(nAct==USHRT_MAX)
         nAct=pColumnItem->GetActColumn();
 
-    USHORT nLOffs=1;
+    sal_uInt16 nLOffs=1;
 
-    BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+    sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
         !( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
 
     while(nAct>=nLOffs)
@@ -3697,19 +3722,19 @@ USHORT SvxRuler::GetActLeftColumn(
 }
 
 
-BOOL SvxRuler::IsActLastColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActLastColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
 {
     return GetActRightColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
 }
 
-BOOL SvxRuler::IsActFirstColumn(
-    BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActFirstColumn(
+    sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
 {
     return GetActLeftColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
 }
 
-long SvxRuler::CalcPropMaxRight(USHORT nCol) const
+long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
 {
 
     if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR))
@@ -3722,7 +3747,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
         long lMinSpace=USHRT_MAX;
         long lOldPos;
         long lColumns=0;
-        USHORT nStart;
+        sal_uInt16 nStart;
         if(!pColumnItem->IsTable())
         {
             if(nCol==USHRT_MAX)
@@ -3737,7 +3762,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
                 lFences=pBorders[nCol].nWidth;
             }
 
-            for(USHORT i = nStart; i < nBorderCount-1; ++i)
+            for(sal_uInt16 i = nStart; i < nBorderCount-1; ++i)
             {
                 long lWidth=pBorders[i].nPos-lOldPos;
                 lColumns+=lWidth;
@@ -3753,7 +3778,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
         }
         else
         {
-            USHORT nActCol;
+            sal_uInt16 nActCol;
             if(nCol==USHRT_MAX) //CalcMinMax for LeftMargin
             {
                 lOldPos=GetMargin1();
@@ -3767,7 +3792,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
             lFences=0;
             while(nActCol<nBorderCount||nActCol==USHRT_MAX)
             {
-                USHORT nRight;
+                sal_uInt16 nRight;
                 if(nActCol==USHRT_MAX)
                 {
                     nRight=0;
@@ -3775,7 +3800,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
                         nRight++;
                 }
                 else
-                    nRight=GetActRightColumn(FALSE, nActCol);
+                    nRight=GetActRightColumn(sal_False, nActCol);
                 long lWidth;
                 if(nRight!=USHRT_MAX)
                 {
@@ -3799,19 +3824,19 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
     {
         if(pColumnItem->IsTable())
         {
-            USHORT nVisCols=0;
-            for(USHORT i=GetActRightColumn(FALSE, nCol);i<nBorderCount;)
+            sal_uInt16 nVisCols=0;
+            for(sal_uInt16 i=GetActRightColumn(sal_False, nCol);i<nBorderCount;)
             {
                 if((*pColumnItem)[i].bVisible)
                     nVisCols++;
-                i=GetActRightColumn(FALSE, i);
+                i=GetActRightColumn(sal_False, i);
             }
             return GetMargin2()-GetMargin1()-(nVisCols+1)*lMinFrame;
         }
         else
         {
             long lWidth=0;
-            for(USHORT i=nCol;i<nBorderCount-1;i++)
+            for(sal_uInt16 i=nCol;i<nBorderCount-1;i++)
             {
                 lWidth+=lMinFrame+pBorders[i].nWidth;
             }
@@ -3821,7 +3846,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
 }
 
 // Tab stops relative to indent (#i24363#)
-void SvxRuler::SetTabsRelativeToIndent( BOOL bRel )
+void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel )
 {
     pRuler_Imp->bIsTabsRelativeToIndent = bRel;
 }
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index fcb0e0f790..bf98274790 100644..100755
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -34,7 +34,7 @@
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/colorcfg.hxx>
-#include <swframeexample.hxx>
+#include <svx/swframeexample.hxx>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
@@ -58,7 +58,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) :
     nVRel       (RelOrientation::PRINT_AREA),
     nWrap       (WrapTextMode_NONE),
     nAnchor     (TextContentAnchorType_AT_PAGE),
-    bTrans      (FALSE),
+    bTrans      (sal_False),
     aRelPos     (Point(0,0))
 {
     InitColors_Impl();
@@ -74,7 +74,7 @@ void SvxSwFrameExample::InitColors_Impl( void )
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
     m_aBgCol = Color( rSettings.GetWindowColor() );
 
-    BOOL bHC = rSettings.GetHighContrastMode();
+    sal_Bool bHC = rSettings.GetHighContrastMode();
 
     m_aFrameColor = Color( COL_LIGHTGREEN );
     m_aAlignColor = Color( COL_LIGHTRED );
@@ -101,19 +101,19 @@ void SvxSwFrameExample::InitAllRects_Impl()
 {
     aPage.SetSize( GetOutputSizePixel() );
 
-    ULONG nOutWPix = aPage.GetWidth();
-    ULONG nOutHPix = aPage.GetHeight();
+    sal_uIntPtr nOutWPix = aPage.GetWidth();
+    sal_uIntPtr nOutHPix = aPage.GetHeight();
 
     // PrintArea
-    ULONG nLBorder;
-    ULONG nRBorder;
-    ULONG nTBorder;
-    ULONG nBBorder;
+    sal_uIntPtr nLBorder;
+    sal_uIntPtr nRBorder;
+    sal_uIntPtr nTBorder;
+    sal_uIntPtr nBBorder;
 
-    ULONG nLTxtBorder;
-    ULONG nRTxtBorder;
-    ULONG nTTxtBorder;
-    ULONG nBTxtBorder;
+    sal_uIntPtr nLTxtBorder;
+    sal_uIntPtr nRTxtBorder;
+    sal_uIntPtr nTTxtBorder;
+    sal_uIntPtr nBTxtBorder;
 
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
     {
@@ -150,7 +150,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
     aTextLine.Move(0, nTTxtBorder);
 
     // Rectangle to edges including paragraph
-    USHORT nLines = (USHORT)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
+    sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
              / (aTextLine.GetHeight() + 2));
     aPara = aPagePrtArea;
     aPara.SetSize(Size(aPara.GetWidth(),
@@ -198,8 +198,8 @@ void SvxSwFrameExample::InitAllRects_Impl()
     // Size of the frame to be positioned
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
     {
-        ULONG nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
-        ULONG nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
+        sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
+        sal_uIntPtr nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
 
         switch (nHRel)
         {
@@ -222,7 +222,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
     }
     else
     {
-        ULONG nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
+        sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
 
         aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3);
         aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L)));
@@ -456,9 +456,9 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C
         // Testabsatz zeichnen
         Rectangle aTxt(aTextLine);
         sal_Int32 nStep = aTxt.GetHeight() + 2;
-        USHORT nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+        sal_uInt16 nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
 
-        for (USHORT i = 0; i < nLines; i++)
+        for (sal_uInt16 i = 0; i < nLines; i++)
         {
             if (i == nLines - 1)
                 aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -605,7 +605,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
     const long nTxtLineHeight = aTextLine.GetHeight();
     Rectangle aTxt(aTextLine);
     sal_Int32 nStep;
-    USHORT nLines;
+    sal_uInt16 nLines;
 
     if (nAnchor == TextContentAnchorType_AT_FRAME)
     {
@@ -615,13 +615,13 @@ void SvxSwFrameExample::Paint(const Rectangle&)
         aTxt.Bottom() = aTxt.Top() + aTextLine.GetHeight() - 1;
 
         nStep = aTxt.GetHeight() + 2;
-        nLines = (USHORT)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
+        nLines = (sal_uInt16)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
                  / (aTxt.GetHeight() + 2));
     }
     else
     {
         nStep = aTxt.GetHeight() + 2;
-        nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+        nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
     }
 
     if (nAnchor != TextContentAnchorType_AS_CHARACTER)
@@ -635,7 +635,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
                            ( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR ||
                              nVRel == RelOrientation::TEXT_LINE );
 
-        for (USHORT i = 0; i < nLines; ++i)
+        for (sal_uInt16 i = 0; i < nLines; ++i)
         {
             if (i == (nLines - 1))
                 aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -670,7 +670,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
         if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom())
         {
             // Text has been replaced by frame, so adjust parameters height
-            ULONG nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
+            sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
             aParaPrtArea.Bottom() += nDiff;
             aPara.Bottom() += nDiff;
 
@@ -692,7 +692,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
     DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor);
 
     // Frame View
-    BOOL bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? TRUE : bTrans;
+    sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans;
     DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor );
 }
 
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index aa6b87a180..64ce2d13ca 100644..100755
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <swframeposstrings.hxx>
+#include <svx/swframeposstrings.hxx>
 #include <tools/rc.hxx>
 #include <tools/debug.hxx>
 #include <svx/dialmgr.hxx>
@@ -44,7 +44,7 @@ public:
 SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() :
     Resource(SVX_RES(RID_SVXSW_FRAMEPOSITIONS))
 {
-    for(USHORT i = 0; i < SvxSwFramePosString::STR_MAX; i++)
+    for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++)
     {
         //string ids have to start at 1
         aStrings[i] = String(SVX_RES(i + 1));
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index 60e616c894..fec49dc5d4 100644..100755
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include <svx/dialogs.hrc>
 
-//the following defines have to match the (enum values + 1) in swframeposstrings.hxx!
+//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx!
 #define STR_LEFT                                1
 #define STR_RIGHT                               2
 #define STR_FROMLEFT                            3
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 581f5f8f08..9611d85c15 100644..100755
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "txencbox.hxx"
-#include "txenctab.hxx"
+#include "svx/txencbox.hxx"
+#include "svx/txenctab.hxx"
 #include <svx/dialogs.hrc>
 #include "svx/dbcharsethelper.hxx"
 #include <vcl/svapp.hxx>
@@ -58,12 +58,12 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
 
 //------------------------------------------------------------------------
 
-USHORT SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
+sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
 {
-    USHORT nCount = GetEntryCount();
-    for ( USHORT i=0; i<nCount; i++ )
+    sal_uInt16 nCount = GetEntryCount();
+    for ( sal_uInt16 i=0; i<nCount; i++ )
     {
-        if ( nEnc == rtl_TextEncoding( (ULONG)GetEntryData(i) ) )
+        if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) )
             return i;
     }
     return LISTBOX_ENTRY_NOTFOUND;
@@ -80,12 +80,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
     sal_uInt32 nCount = m_pEncTable->Count();
     for ( sal_uInt32 j=0; j<nCount; j++ )
     {
-        BOOL bInsert = TRUE;
+        sal_Bool bInsert = sal_True;
         rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
         if ( nExcludeInfoFlags )
         {
             if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
-                bInsert = FALSE;
+                bInsert = sal_False;
             else
             {
                 if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -93,10 +93,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
                     if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
                             ((nEnc == RTL_TEXTENCODING_UCS2) ||
                             nEnc == RTL_TEXTENCODING_UCS4) )
-                        bInsert = FALSE;    // InfoFlags don't work for Unicode :-(
+                        bInsert = sal_False;    // InfoFlags don't work for Unicode :-(
                 }
                 else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
-                    bInsert = FALSE;
+                    bInsert = sal_False;
             }
         }
         if ( bInsert )
@@ -109,7 +109,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
                     case RTL_TEXTENCODING_GB_2312 :
                     case RTL_TEXTENCODING_GBK :
                     case RTL_TEXTENCODING_MS_936 :
-                        bInsert = FALSE;
+                        bInsert = sal_False;
                     break;
                 }
             }
@@ -130,14 +130,14 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
     svxform::ODataAccessCharsetHelper aCSH;
     ::std::vector< rtl_TextEncoding > aEncs;
     sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs );
-    for ( USHORT j=0; j<nCount; j++ )
+    for ( sal_uInt16 j=0; j<nCount; j++ )
     {
-        BOOL bInsert = TRUE;
+        sal_Bool bInsert = sal_True;
         rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] );
         if ( nExcludeInfoFlags )
         {
             if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
-                bInsert = FALSE;
+                bInsert = sal_False;
             else
             {
                 if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -145,10 +145,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
                     if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
                             ((nEnc == RTL_TEXTENCODING_UCS2) ||
                             nEnc == RTL_TEXTENCODING_UCS4) )
-                        bInsert = FALSE;    // InfoFlags don't work for Unicode :-(
+                        bInsert = sal_False;    // InfoFlags don't work for Unicode :-(
                 }
                 else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
-                    bInsert = FALSE;
+                    bInsert = sal_False;
             }
         }
         if ( bInsert )
@@ -161,7 +161,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
                     case RTL_TEXTENCODING_GB_2312 :
                     case RTL_TEXTENCODING_GBK :
                     case RTL_TEXTENCODING_MS_936 :
-                        bInsert = FALSE;
+                        bInsert = sal_False;
                     break;
                 }
             }
@@ -186,15 +186,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
 //------------------------------------------------------------------------
 
 void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
-            const String& rEntry, USHORT nPos )
+            const String& rEntry, sal_uInt16 nPos )
 {
-    USHORT nAt = InsertEntry( rEntry, nPos );
-    SetEntryData( nAt, (void*)(ULONG)nEnc );
+    sal_uInt16 nAt = InsertEntry( rEntry, nPos );
+    SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
 }
 
 //------------------------------------------------------------------------
 
-void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos )
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
 {
     const String& rEntry = m_pEncTable->GetTextString( nEnc );
     if ( rEntry.Len() )
@@ -213,7 +213,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT
 
 void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         RemoveEntry( nAt );
@@ -223,19 +223,19 @@ void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
 
 rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
 {
-    USHORT nPos = GetSelectEntryPos();
+    sal_uInt16 nPos = GetSelectEntryPos();
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-        return rtl_TextEncoding( (ULONG)GetEntryData(nPos) );
+        return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) );
     else
         return RTL_TEXTENCODING_DONTKNOW;
 }
 
 //------------------------------------------------------------------------
 
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL bSelect )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         SelectEntryPos( nAt, bSelect );
@@ -243,14 +243,14 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL b
 
 //------------------------------------------------------------------------
 
-BOOL SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
+sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
 {
-    USHORT nAt = EncodingToPos_Impl( nEnc );
+    sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
 
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         return IsEntryPosSelected( nAt );
     else
-        return FALSE;
+        return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index b06f31ec4a..d211cf0ba1 100644..100755
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -31,7 +31,7 @@
 
 #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE
 #include <svx/dialmgr.hxx>
-#include "txenctab.hxx"
+#include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
 
 //------------------------------------------------------------------------
diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
index 7cc40bbcd2..7cc40bbcd2 100644..100755
--- a/svx/source/dialog/txenctab.src
+++ b/svx/source/dialog/txenctab.src
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 2d4256d162..a965fdf341 100644..100755
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "wrapfield.hxx"
+#include "svx/wrapfield.hxx"
 
 namespace svx {
 
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 639a9c1f9e..4bfd481186 100644..100755
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -38,7 +38,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook
     fResetFocalLength(fFocalLen),
     fResetBankAngle(fBankAng),
     fBankAngle(fBankAng),
-    bAutoAdjustProjection(TRUE)
+    bAutoAdjustProjection(sal_True)
 {
     SetVPD(0);
     SetPosition(rPos);
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 444d031ee7..fc45231b3c 100644..100755
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -29,10 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/cube3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <svx/sdr/contact/viewcontactofe3dcube.hxx>
@@ -88,7 +88,7 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dCubeObj::GetObjIdentifier() const
+sal_uInt16 E3dCubeObj::GetObjIdentifier() const
 {
     return E3D_CUBEOBJ_ID;
 }
@@ -99,7 +99,7 @@ UINT16 E3dCubeObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -148,7 +148,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
     }
 }
 
-void E3dCubeObj::SetPosIsCenter(BOOL bNew)
+void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
 {
     if(bPosIsCenter != bNew)
     {
@@ -157,7 +157,7 @@ void E3dCubeObj::SetPosIsCenter(BOOL bNew)
     }
 }
 
-void E3dCubeObj::SetSideFlags(UINT16 nNew)
+void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
 {
     if(nSideFlags != nNew)
     {
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index ae5f9bc8be..9aabe84ac3 100644..100755
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -50,14 +50,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
 void E3dDefaultAttributes::Reset()
 {
     // Compound-Objekt
-    bDefaultCreateNormals = TRUE;
-    bDefaultCreateTexture = TRUE;
+    bDefaultCreateNormals = sal_True;
+    bDefaultCreateTexture = sal_True;
 
     // Cube-Objekt
     aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
     aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
     nDefaultCubeSideFlags = CUBE_FULL;
-    bDefaultCubePosIsCenter = FALSE;
+    bDefaultCubePosIsCenter = sal_False;
 
     // Sphere-Objekt
     aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
@@ -65,18 +65,18 @@ void E3dDefaultAttributes::Reset()
 
     // Lathe-Objekt
     nDefaultLatheEndAngle = 3600;
-    bDefaultLatheSmoothed = TRUE;
-    bDefaultLatheSmoothFrontBack = FALSE;
-    bDefaultLatheCharacterMode = FALSE;
-    bDefaultLatheCloseFront = TRUE;
-    bDefaultLatheCloseBack = TRUE;
+    bDefaultLatheSmoothed = sal_True;
+    bDefaultLatheSmoothFrontBack = sal_False;
+    bDefaultLatheCharacterMode = sal_False;
+    bDefaultLatheCloseFront = sal_True;
+    bDefaultLatheCloseBack = sal_True;
 
     // Extrude-Objekt
-    bDefaultExtrudeSmoothed = TRUE;
-    bDefaultExtrudeSmoothFrontBack = FALSE;
-    bDefaultExtrudeCharacterMode = FALSE;
-    bDefaultExtrudeCloseFront = TRUE;
-    bDefaultExtrudeCloseBack = TRUE;
+    bDefaultExtrudeSmoothed = sal_True;
+    bDefaultExtrudeSmoothFrontBack = sal_False;
+    bDefaultExtrudeCharacterMode = sal_False;
+    bDefaultExtrudeCloseFront = sal_True;
+    bDefaultExtrudeCloseBack = sal_True;
 }
 
 // eof
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index e55f7975d4..d358176f2a 100644..100755
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -58,11 +58,11 @@ E3dDragMethod::E3dDragMethod (
     SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :	SdrDragMethod(_rView),
     meConstraint(eConstr),
     mbMoveFull(bFull),
-    mbMovedAtAll(FALSE)
+    mbMovedAtAll(sal_False)
 {
     // Fuer alle in der selektion befindlichen 3D-Objekte
     // eine Unit anlegen
@@ -176,7 +176,7 @@ bool E3dDragMethod::BeginSdrDrag()
         Show();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -219,7 +219,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
             getSdrDragView().EndUndo();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -322,7 +322,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod);
 E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :	E3dDragMethod(_rView, rMark, eConstr, bFull)
 {
     // Zentrum aller selektierten Objekte in Augkoordinaten holen
@@ -422,7 +422,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
             }
             long nSnap = 0;
 
-            if(!getSdrDragView().IsRotateAllowed(FALSE))
+            if(!getSdrDragView().IsRotateAllowed(sal_False))
                 nSnap = 90;
 
             if(nSnap != 0)
@@ -515,7 +515,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
     const SdrMarkList& rMark,
     SdrHdlKind eDrgHdl,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :	E3dDragMethod(_rView, rMark, eConstr, bFull),
     meWhatDragHdl(eDrgHdl)
 {
diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx
index f5b71fc859..f5b71fc859 100644..100755
--- a/svx/source/engine3d/e3dsceneupdater.cxx
+++ b/svx/source/engine3d/e3dsceneupdater.cxx
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index aaba36b066..4d59b700e5 100644..100755
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -53,9 +53,9 @@ E3dUndoAction::~E3dUndoAction ()
 |* Repeat gibt es nicht
 |*
 \************************************************************************/
-BOOL E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
+sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /************************************************************************/
@@ -117,7 +117,7 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel,
     E3dObject*	pInObject,
     const SfxItemSet& rNewSet,
     const SfxItemSet& rOldSet,
-    BOOL bUseSubObj)
+    sal_Bool bUseSubObj)
 :	SdrUndoAction( rModel ),
     pObject	 	 ( pInObject ),
     pView		 ( p3dView ),
@@ -165,9 +165,9 @@ void E3dAttributesUndoAction::Redo()
 |* Mehrfaches Undo nicht moeglich
 |*
 \************************************************************************/
-BOOL E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
+sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 112606f89a..d0cabc2fee 100644..100755
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -29,10 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/extrud3d.hxx>
 #include <svx/scene3d.hxx>
 
@@ -117,7 +117,7 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dExtrudeObj::GetObjIdentifier() const
+sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const
 {
     return E3D_EXTRUDEOBJ_ID;
 }
@@ -191,9 +191,9 @@ void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dExtrudeObj::IsBreakObjPossible()
+sal_Bool E3dExtrudeObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dExtrudeObj::GetBreakObj()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 562a75f397..589f03542f 100644..100755
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -38,7 +38,7 @@
 #include <tools/shl.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/svdmodel.hxx>
-#include <globl3d.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/view3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -49,9 +49,9 @@
 #include <svx/polysc3d.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/style.hxx>
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 
-#include <dlgutil.hxx>
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/viewpt3d.hxx> // ProjectionType
 
@@ -61,7 +61,7 @@
 #include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 
-#include <gallery.hxx>
+#include <svx/gallery.hxx>
 #define GALLERY_THEME "3D"
 #include <svl/whiter.hxx>
 
@@ -111,6 +111,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aBtnMaterial        ( this, SVX_RES( BTN_MATERIAL ) ),
         aBtnUpdate          ( this, SVX_RES( BTN_UPDATE ) ),
         aBtnAssign          ( this, SVX_RES( BTN_ASSIGN ) ),
+        aFLGeometrie       ( this, SVX_RES( FL_GEOMETRIE ) ),
 
         // Geometrie
         aFtPercentDiagonal  ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ),
@@ -121,36 +122,36 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aMtrEndAngle        ( this, SVX_RES( MTR_END_ANGLE ) ),
         aFtDepth            ( this, SVX_RES( FT_DEPTH ) ),
         aMtrDepth           ( this, SVX_RES( MTR_DEPTH ) ),
-        aFLGeometrie        ( this, SVX_RES( FL_GEOMETRIE ) ),
+        aFLSegments        ( this, SVX_RES( FL_SEGMENTS ) ),
 
         aFtHorizontal       ( this, SVX_RES( FT_HORIZONTAL ) ),
         aNumHorizontal      ( this, SVX_RES( NUM_HORIZONTAL ) ),
         aFtVertical         ( this, SVX_RES( FT_VERTICAL ) ),
         aNumVertical        ( this, SVX_RES( NUM_VERTICAL ) ),
-        aFLSegments         ( this, SVX_RES( FL_SEGMENTS ) ),
 
+        aFLNormals         ( this, SVX_RES( FL_NORMALS ) ),
         aBtnNormalsObj      ( this, SVX_RES( BTN_NORMALS_OBJ ) ),
         aBtnNormalsFlat     ( this, SVX_RES( BTN_NORMALS_FLAT ) ),
         aBtnNormalsSphere   ( this, SVX_RES( BTN_NORMALS_SPHERE ) ),
         aBtnNormalsInvert   ( this, SVX_RES( BTN_NORMALS_INVERT ) ),
         aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ),
-        aFLNormals          ( this, SVX_RES( FL_NORMALS ) ),
 
         aBtnDoubleSided   	( this, SVX_RES( BTN_DOUBLE_SIDED ) ),
 
         // Darstellung
+        aFLRepresentation  ( this, SVX_RES( FL_REPRESENTATION ) ),
         aFtShademode        ( this, SVX_RES( FT_SHADEMODE ) ),
         aLbShademode        ( this, SVX_RES( LB_SHADEMODE ) ),
+        aFLShadow          ( this, SVX_RES( FL_SHADOW ) ),
         aBtnShadow3d        ( this, SVX_RES( BTN_SHADOW_3D ) ),
         aFtSlant      	    ( this, SVX_RES( FT_SLANT ) ),
         aMtrSlant           ( this, SVX_RES( MTR_SLANT ) ),
-        aFLShadow           ( this, SVX_RES( FL_SHADOW ) ),
-        aFtDistance         ( this, SVX_RES( FT_DISTANCE ) ),
-        aMtrDistance        ( this, SVX_RES( MTR_DISTANCE ) ),
-        aFtFocalLeng        ( this, SVX_RES( FT_FOCAL_LENGTH ) ),
-        aMtrFocalLength     ( this, SVX_RES( MTR_FOCAL_LENGTH ) ),
-        aFLCamera           ( this, SVX_RES( FL_CAMERA ) ),
-        aFLRepresentation   ( this, SVX_RES( FL_REPRESENTATION ) ),
+        aFtDistance			( this, SVX_RES( FT_DISTANCE ) ),
+        aMtrDistance		( this, SVX_RES( MTR_DISTANCE ) ),
+        aFtFocalLeng		( this, SVX_RES( FT_FOCAL_LENGTH ) ),
+        aMtrFocalLength		( this, SVX_RES( MTR_FOCAL_LENGTH ) ),
+        aFLCamera          ( this, SVX_RES( FL_CAMERA ) ),
+        aFLLight           ( this, SVX_RES( FL_LIGHT ) ),
 
         // Beleuchtung
         aBtnLight1          ( this, SVX_RES( BTN_LIGHT_1 ) ),
@@ -161,6 +162,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aBtnLight6          ( this, SVX_RES( BTN_LIGHT_6 ) ),
         aBtnLight7          ( this, SVX_RES( BTN_LIGHT_7 ) ),
         aBtnLight8          ( this, SVX_RES( BTN_LIGHT_8 ) ),
+        aFTLightsource     ( this, SVX_RES( FT_LIGHTSOURCE ) ),
         aLbLight1           ( this, SVX_RES( LB_LIGHT_1 ) ),
         aLbLight2           ( this, SVX_RES( LB_LIGHT_2 ) ),
         aLbLight3           ( this, SVX_RES( LB_LIGHT_3 ) ),
@@ -171,16 +173,14 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aLbLight8           ( this, SVX_RES( LB_LIGHT_8 ) ),
 
         aBtnLightColor      ( this, SVX_RES( BTN_LIGHT_COLOR ) ),
-        aFTLightsource      ( this, SVX_RES( FT_LIGHTSOURCE ) ),
 
         // #99694# Keyboard shortcuts activate the next control, so the
         // order needed to be changed here
         aFTAmbientlight     ( this, SVX_RES( FT_AMBIENTLIGHT ) ),	// Text label
         aLbAmbientlight     ( this, SVX_RES( LB_AMBIENTLIGHT ) ),	// ListBox
         aBtnAmbientColor    ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button
-
-        aFLLight            ( this, SVX_RES( FL_LIGHT ) ),
-
+        aFLTexture         ( this, SVX_RES( FL_TEXTURE ) ),
+        
         // Textures
         aFtTexKind          ( this, SVX_RES( FT_TEX_KIND ) ),
         aBtnTexLuminance    ( this, SVX_RES( BTN_TEX_LUMINANCE ) ),
@@ -199,7 +199,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aBtnTexCircleY      ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ),
         aFtTexFilter        ( this, SVX_RES( FT_TEX_FILTER ) ),
         aBtnTexFilter       ( this, SVX_RES( BTN_TEX_FILTER ) ),
-        aFLTexture          ( this, SVX_RES( FL_TEXTURE ) ),
+        aFLMaterial        ( this, SVX_RES( FL_MATERIAL ) ),
 
         // Material
         aFtMatFavorites     ( this, SVX_RES( FT_MAT_FAVORITES ) ),
@@ -210,25 +210,24 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aFtMatEmission      ( this, SVX_RES( FT_MAT_EMISSION ) ),
         aLbMatEmission      ( this, SVX_RES( LB_MAT_EMISSION ) ),
         aBtnEmissionColor   ( this, SVX_RES( BTN_EMISSION_COLOR ) ),
+        aFLMatSpecular     ( this, SVX_RES( FL_MAT_SPECULAR ) ),
         aFtMatSpecular      ( this, SVX_RES( FT_MAT_SPECULAR ) ),
         aLbMatSpecular      ( this, SVX_RES( LB_MAT_SPECULAR ) ),
         aBtnSpecularColor   ( this, SVX_RES( BTN_SPECULAR_COLOR ) ),
         aFtMatSpecularIntensity( this, SVX_RES( FT_MAT_SPECULAR_INTENSITY ) ),
         aMtrMatSpecularIntensity( this, SVX_RES( MTR_MAT_SPECULAR_INTENSITY ) ),
-        aFLMatSpecular     ( this, SVX_RES( FL_MAT_SPECULAR ) ),
-        aFLMaterial        ( this, SVX_RES( FL_MATERIAL ) ),
+        aCtlPreview 		( this, SVX_RES( CTL_PREVIEW ) ),
+        aCtlLightPreview 	( this, SVX_RES( CTL_LIGHT_PREVIEW ) ),
 
         // Unterer Bereich
         aBtnConvertTo3D		( this, SVX_RES( BTN_CHANGE_TO_3D ) ),
         aBtnLatheObject		( this, SVX_RES( BTN_LATHE_OBJ ) ),
         aBtnPerspective		( this, SVX_RES( BTN_PERSPECTIVE ) ),
-        aCtlPreview 		( this, SVX_RES( CTL_PREVIEW ) ),
-        aCtlLightPreview 	( this, SVX_RES( CTL_LIGHT_PREVIEW ) ),
 
         aImgLightOn			( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ),
         aImgLightOff		( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ),
 
-        bUpdate				( FALSE ),
+        bUpdate				( sal_False ),
         eViewType			( VIEWTYPE_GEO ),
 
         pModel				( NULL ),
@@ -244,8 +243,13 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         pConvertTo3DLatheItem(0L),
         mpImpl				( new Svx3DWinImpl() ),
         mpRemember2DAttributes(NULL),
-        bOnly3DChanged		( FALSE )
+        bOnly3DChanged		( sal_False )
 {
+    String accname(SVX_RES(STR_COLOR_LIGHT_PRE));
+    aCtlLightPreview.SetAccessibleName(accname);
+    aCtlPreview.SetAccessibleName(accname);
+    aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText());
+
     mpImpl->pPool = NULL;
     FreeResource();
 
@@ -356,12 +360,92 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_INIT, TRUE );
+        SfxBoolItem aItem( SID_3D_INIT, sal_True );
         pDispatcher->Execute(
             SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
 
     Reset();
+
+    aBtnNormalsObj.SetAccessibleRelationMemberOf( &aFLNormals );
+    aBtnNormalsFlat.SetAccessibleRelationMemberOf( &aFLNormals );
+    aBtnNormalsSphere.SetAccessibleRelationMemberOf( &aFLNormals );
+    aBtnNormalsInvert.SetAccessibleRelationMemberOf( &aFLNormals );
+    aBtnTwoSidedLighting.SetAccessibleRelationMemberOf( &aFLNormals );
+    aBtnDoubleSided.SetAccessibleRelationMemberOf( &aFLNormals );
+
+    aBtnLight1.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight2.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight3.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight4.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight5.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight6.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight7.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLight8.SetAccessibleRelationMemberOf( &aFLLight );
+
+    aBtnLight1.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight2.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight3.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight4.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight5.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight6.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight7.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLight8.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnLightColor.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnLightColor.SetAccessibleRelationLabeledBy( &aFTLightsource );
+    aBtnAmbientColor.SetAccessibleRelationMemberOf( &aFLLight );
+    aBtnAmbientColor.SetAccessibleRelationLabeledBy( &aFTAmbientlight );
+
+    aBtnSpecularColor.SetAccessibleRelationLabeledBy( &aFtMatSpecular );
+    aBtnMatColor.SetAccessibleRelationLabeledBy( &aFtMatColor );
+    aBtnEmissionColor.SetAccessibleRelationLabeledBy( &aFtMatEmission );
+    aBtnTexLuminance.SetAccessibleRelationLabeledBy( &aFtTexKind );
+    aBtnTexColor.SetAccessibleRelationLabeledBy( &aFtTexKind );
+    aBtnTexReplace.SetAccessibleRelationLabeledBy( &aFtTexMode );
+    aBtnTexModulate.SetAccessibleRelationLabeledBy( &aFtTexMode );
+    aBtnTexBlend.SetAccessibleRelationLabeledBy( &aFtTexMode );	
+    aBtnTexObjectX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX );
+    aBtnTexParallelX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX );
+    aBtnTexCircleX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX );	
+    aBtnTexObjectY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY );	
+    aBtnTexParallelY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY );
+    aBtnTexCircleY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY );	
+    aBtnTexFilter.SetAccessibleRelationLabeledBy( &aFtTexFilter );		
+    aCtlLightPreview.SetAccessibleRelationLabeledBy( &aCtlLightPreview );
+    aBtnNormalsObj.SetAccessibleRelationMemberOf(&aFLNormals);
+    aBtnNormalsFlat.SetAccessibleRelationMemberOf(&aFLNormals);
+    aBtnNormalsSphere.SetAccessibleRelationMemberOf(&aFLNormals);
+    aBtnNormalsInvert.SetAccessibleRelationMemberOf(&aFLNormals);
+    aBtnTwoSidedLighting.SetAccessibleRelationMemberOf(&aFLNormals);
+
+    aBtnShadow3d.SetAccessibleRelationMemberOf(&aFLShadow);
+
+    aBtnLight1.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight2.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight3.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight4.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight5.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight6.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight7.SetAccessibleRelationMemberOf(&aFLLight);
+    aBtnLight8.SetAccessibleRelationMemberOf(&aFLLight);	
+
+    aBtnTexLuminance.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexColor.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexReplace.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexModulate.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexBlend.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexObjectX.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexParallelX.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexCircleX.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexObjectY.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexParallelY.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexCircleY.SetAccessibleRelationMemberOf(&aFLTexture);
+    aBtnTexFilter.SetAccessibleRelationMemberOf(&aFLTexture);
+
+    aBtnMatColor.SetAccessibleRelationMemberOf(&aFLMaterial);
+    aBtnEmissionColor.SetAccessibleRelationMemberOf(&aFLMaterial);
+    
+    aBtnSpecularColor.SetAccessibleRelationMemberOf(&aFLMatSpecular);
 }
 
 // -----------------------------------------------------------------------
@@ -432,11 +516,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
     while(nWhich)
     {
-        SfxItemState eState = rAttrs.GetItemState(nWhich, FALSE);
+        SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False);
         if(SFX_ITEM_DONTCARE == eState)
             mpRemember2DAttributes->InvalidateItem(nWhich);
         else if(SFX_ITEM_SET == eState)
-            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, FALSE));
+            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False));
 
         nWhich = aIter.NextWhich();
     }
@@ -455,16 +539,16 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
 
 // Segmentanzahl aenderbar ? und andere Stati
-    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, FALSE, &pItem );
+    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem );
     if( SFX_ITEM_SET == eState )
     {
-        UINT32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
-        //BOOL bLathe   = (BOOL) ( nState & 1 );
-        BOOL bExtrude = (BOOL) ( nState & 2 );
-        BOOL bSphere  = (BOOL) ( nState & 4 );
-        BOOL bCube    = (BOOL) ( nState & 8 );
+        sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
+        //sal_Bool bLathe   = (sal_Bool) ( nState & 1 );
+        sal_Bool bExtrude = (sal_Bool) ( nState & 2 );
+        sal_Bool bSphere  = (sal_Bool) ( nState & 4 );
+        sal_Bool bCube    = (sal_Bool) ( nState & 8 );
 
-        BOOL bChart = (BOOL) ( nState & 32 ); // Chart
+        sal_Bool bChart = (sal_Bool) ( nState & 32 ); // Chart
 
         if( !bChart )
         {
@@ -502,41 +586,41 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         else
         {
             // Geometrie
-            aFtHorizontal.Enable( FALSE );
-            aNumHorizontal.Enable( FALSE );
+            aFtHorizontal.Enable( sal_False );
+            aNumHorizontal.Enable( sal_False );
             aNumHorizontal.SetEmptyFieldValue();
-            aFtVertical.Enable( FALSE );
-            aNumVertical.Enable( FALSE );
+            aFtVertical.Enable( sal_False );
+            aNumVertical.Enable( sal_False );
             aNumVertical.SetEmptyFieldValue();
-            aFLSegments.Enable( FALSE );
-            aFtEndAngle.Enable( FALSE );
-            aMtrEndAngle.Enable( FALSE );
+            aFLSegments.Enable( sal_False );
+            aFtEndAngle.Enable( sal_False );
+            aMtrEndAngle.Enable( sal_False );
             aMtrEndAngle.SetEmptyFieldValue();
-            aFtDepth.Enable( FALSE );
-            aMtrDepth.Enable( FALSE );
+            aFtDepth.Enable( sal_False );
+            aMtrDepth.Enable( sal_False );
             aMtrDepth.SetEmptyFieldValue();
 
             // Darstellung
-            aBtnShadow3d.Enable( FALSE );
-            aFtSlant.Enable( FALSE );
-            aMtrSlant.Enable( FALSE );
-            aFLShadow.Enable( FALSE );
+            aBtnShadow3d.Enable( sal_False );
+            aFtSlant.Enable( sal_False );
+            aMtrSlant.Enable( sal_False );
+            aFLShadow.Enable( sal_False );
 
-            aFtDistance.Enable( FALSE );
-            aMtrDistance.Enable( FALSE );
+            aFtDistance.Enable( sal_False );
+            aMtrDistance.Enable( sal_False );
             aMtrDistance.SetEmptyFieldValue();
-            aFtFocalLeng.Enable( FALSE );
-            aMtrFocalLength.Enable( FALSE );
+            aFtFocalLeng.Enable( sal_False );
+            aMtrFocalLength.Enable( sal_False );
             aMtrFocalLength.SetEmptyFieldValue();
-            aFLCamera.Enable( FALSE );
+            aFLCamera.Enable( sal_False );
 
             // Unterer Bereich
-            aBtnConvertTo3D.Enable( FALSE );
-            aBtnLatheObject.Enable( FALSE );
+            aBtnConvertTo3D.Enable( sal_False );
+            aBtnLatheObject.Enable( sal_False );
         }
     }
 // Bitmapfuellung ? -> Status
-    BOOL bBitmap(FALSE);
+    sal_Bool bBitmap(sal_False);
     eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
     if(eState != SFX_ITEM_DONTCARE)
     {
@@ -576,8 +660,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             {
                 aNumHorizontal.SetValue( nValue );
                 // evtl. am Ende...
-                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumHorizontal.IsEmptyFieldValue() )
                 aNumHorizontal.SetValue( nValue );
@@ -587,7 +671,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumHorizontal.IsEmptyFieldValue() )
             {
                 aNumHorizontal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -598,13 +682,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
-            if( nValue != (UINT32) aNumVertical.GetValue() )
+            sal_uInt32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
+            if( nValue != (sal_uInt32) aNumVertical.GetValue() )
             {
                 aNumVertical.SetValue( nValue );
                 // evtl. am Ende...
-                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumVertical.IsEmptyFieldValue() )
                 aNumVertical.SetValue( nValue );
@@ -614,7 +698,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumVertical.IsEmptyFieldValue() )
             {
                 aNumVertical.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -625,15 +709,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
-            UINT32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
+            sal_uInt32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
+            sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
             if( nValue != nValue2 )
             {
                 if( eFUnit != aMtrDepth.GetUnit() )
                     SetFieldUnit( aMtrDepth, eFUnit );
 
                 SetMetricValue( aMtrDepth, nValue, ePoolUnit );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrDepth.IsEmptyFieldValue() )
                 aMtrDepth.SetValue( aMtrDepth.GetValue() );
@@ -643,7 +727,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrDepth.IsEmptyFieldValue() )
             {
                 aMtrDepth.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -652,11 +736,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+        sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
         if( bValue != aBtnDoubleSided.IsChecked() )
         {
             aBtnDoubleSided.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnDoubleSided.GetState() == STATE_DONTKNOW )
             aBtnDoubleSided.Check( bValue );
@@ -666,7 +750,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnDoubleSided.GetState() != STATE_DONTKNOW )
         {
             aBtnDoubleSided.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -676,11 +760,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
             if( nValue != aMtrPercentDiagonal.GetValue() )
             {
                 aMtrPercentDiagonal.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrPercentDiagonal.IsEmptyFieldValue() )
                 aMtrPercentDiagonal.SetValue( nValue );
@@ -690,7 +774,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
             {
                 aMtrPercentDiagonal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -701,11 +785,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
             if( nValue != aMtrBackscale.GetValue() )
             {
                 aMtrBackscale.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrBackscale.IsEmptyFieldValue() )
                 aMtrBackscale.SetValue( nValue );
@@ -715,7 +799,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrBackscale.IsEmptyFieldValue() )
             {
                 aMtrBackscale.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -726,11 +810,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
+            sal_Int32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
             if( nValue != aMtrEndAngle.GetValue() )
             {
                 aMtrEndAngle.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -738,7 +822,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrEndAngle.IsEmptyFieldValue() )
             {
                 aMtrEndAngle.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -747,7 +831,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
 
         if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) ||
             ( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) ||
@@ -756,7 +840,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsObj.Check( nValue == 0 );
             aBtnNormalsFlat.Check( nValue == 1 );
             aBtnNormalsSphere.Check( nValue == 2 );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -765,10 +849,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsFlat.IsChecked() ||
             aBtnNormalsSphere.IsChecked() )
         {
-            aBtnNormalsObj.Check( FALSE );
-            aBtnNormalsFlat.Check( FALSE );
-            aBtnNormalsSphere.Check( FALSE );
-            bUpdate = TRUE;
+            aBtnNormalsObj.Check( sal_False );
+            aBtnNormalsFlat.Check( sal_False );
+            aBtnNormalsSphere.Check( sal_False );
+            bUpdate = sal_True;
         }
     }
 
@@ -776,11 +860,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+        sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
         if( bValue != aBtnNormalsInvert.IsChecked() )
         {
             aBtnNormalsInvert.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnNormalsInvert.GetState() == STATE_DONTKNOW )
             aBtnNormalsInvert.Check( bValue );
@@ -790,7 +874,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnNormalsInvert.GetState() != STATE_DONTKNOW )
         {
             aBtnNormalsInvert.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -798,11 +882,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+        sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
         if( bValue != aBtnTwoSidedLighting.IsChecked() )
         {
             aBtnTwoSidedLighting.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnTwoSidedLighting.GetState() == STATE_DONTKNOW )
             aBtnTwoSidedLighting.Check( bValue );
@@ -812,7 +896,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnTwoSidedLighting.GetState() != STATE_DONTKNOW )
         {
             aBtnTwoSidedLighting.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -821,11 +905,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
         if( nValue != aLbShademode.GetSelectEntryPos() )
         {
             aLbShademode.SelectEntryPos( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -833,7 +917,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbShademode.GetSelectEntryCount() != 0 )
         {
             aLbShademode.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -841,13 +925,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+        sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
         if( bValue != aBtnShadow3d.IsChecked() )
         {
             aBtnShadow3d.Check( bValue );
             aFtSlant.Enable( bValue );
             aMtrSlant.Enable( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnShadow3d.GetState() == STATE_DONTKNOW )
             aBtnShadow3d.Check( bValue );
@@ -857,7 +941,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnShadow3d.GetState() != STATE_DONTKNOW )
         {
             aBtnShadow3d.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -865,11 +949,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
         if( nValue != aMtrSlant.GetValue() )
         {
             aMtrSlant.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -877,7 +961,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrSlant.IsEmptyFieldValue() )
         {
             aMtrSlant.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -885,15 +969,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrDistance.GetUnit() )
                 SetFieldUnit( aMtrDistance, eFUnit );
 
             SetMetricValue( aMtrDistance, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -901,7 +985,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrDepth.IsEmptyFieldValue() )
         {
             aMtrDepth.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -909,15 +993,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrFocalLength.GetUnit() )
                 SetFieldUnit( aMtrFocalLength, eFUnit );
 
             SetMetricValue( aMtrFocalLength, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -925,7 +1009,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrFocalLength.IsEmptyFieldValue() )
         {
             aMtrFocalLength.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -941,7 +1025,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -949,7 +1033,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight1.GetSelectEntryCount() != 0 )
         {
             aLbLight1.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (an/aus)
@@ -961,7 +1045,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight1 )) )
         {
             SetUILightState( aBtnLight1, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight1.GetState() == STATE_DONTKNOW )
             aBtnLight1.Check( aBtnLight1.IsChecked() );
@@ -971,14 +1055,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight1.GetState() != STATE_DONTKNOW )
         {
             aBtnLight1.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 2 (Farbe)
@@ -990,7 +1074,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -998,7 +1082,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight2.GetSelectEntryCount() != 0 )
         {
             aLbLight2.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (an/aus)
@@ -1010,7 +1094,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight2 )) )
         {
             SetUILightState( aBtnLight2, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight2.GetState() == STATE_DONTKNOW )
             aBtnLight2.Check( aBtnLight2.IsChecked() );
@@ -1020,14 +1104,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight2.GetState() != STATE_DONTKNOW )
         {
             aBtnLight2.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 3 (Farbe)
@@ -1039,7 +1123,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1047,7 +1131,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight3.GetSelectEntryCount() != 0 )
         {
             aLbLight3.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (an/aus)
@@ -1059,7 +1143,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight3)) )
         {
             SetUILightState( aBtnLight3, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight3.GetState() == STATE_DONTKNOW )
             aBtnLight3.Check( aBtnLight3.IsChecked() );
@@ -1069,14 +1153,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight3.GetState() != STATE_DONTKNOW )
         {
             aBtnLight3.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 4 (Farbe)
@@ -1088,7 +1172,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1096,7 +1180,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight4.GetSelectEntryCount() != 0 )
         {
             aLbLight4.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (an/aus)
@@ -1108,7 +1192,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight4 )) )
         {
             SetUILightState( aBtnLight4, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight4.GetState() == STATE_DONTKNOW )
             aBtnLight4.Check( aBtnLight4.IsChecked() );
@@ -1118,14 +1202,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight4.GetState() != STATE_DONTKNOW )
         {
             aBtnLight4.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 5 (Farbe)
@@ -1137,7 +1221,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1145,7 +1229,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight5.GetSelectEntryCount() != 0 )
         {
             aLbLight5.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (an/aus)
@@ -1157,7 +1241,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight5 )) )
         {
             SetUILightState( aBtnLight5, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight5.GetState() == STATE_DONTKNOW )
             aBtnLight5.Check( aBtnLight5.IsChecked() );
@@ -1167,14 +1251,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight5.GetState() != STATE_DONTKNOW )
         {
             aBtnLight5.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 6 (Farbe)
@@ -1186,7 +1270,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1194,7 +1278,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight6.GetSelectEntryCount() != 0 )
         {
             aLbLight6.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (an/aus)
@@ -1206,7 +1290,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight6 )) )
         {
             SetUILightState( aBtnLight6, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight6.GetState() == STATE_DONTKNOW )
             aBtnLight6.Check( aBtnLight6.IsChecked() );
@@ -1216,14 +1300,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight6.GetState() != STATE_DONTKNOW )
         {
             aBtnLight6.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 7 (Farbe)
@@ -1235,7 +1319,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1243,7 +1327,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight7.GetSelectEntryCount() != 0 )
         {
             aLbLight7.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (an/aus)
@@ -1255,7 +1339,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight7 )) )
         {
             SetUILightState( aBtnLight7	, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight7.GetState() == STATE_DONTKNOW )
             aBtnLight7.Check( aBtnLight7.IsChecked() );
@@ -1265,14 +1349,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight7.GetState() != STATE_DONTKNOW )
         {
             aBtnLight7.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 8 (Farbe)
@@ -1284,7 +1368,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1292,7 +1376,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight8.GetSelectEntryCount() != 0 )
         {
             aLbLight8.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (an/aus)
@@ -1304,7 +1388,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight8 )) )
         {
             SetUILightState( aBtnLight8, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight8.GetState() == STATE_DONTKNOW )
             aBtnLight8.Check( aBtnLight8.IsChecked() );
@@ -1314,14 +1398,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight8.GetState() != STATE_DONTKNOW )
         {
             aBtnLight8.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Umgebungslicht
@@ -1333,7 +1417,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1341,7 +1425,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbAmbientlight.GetSelectEntryCount() != 0 )
         {
             aLbAmbientlight.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1353,14 +1437,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
 
             if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexColor.IsChecked() && nValue == 3 ) )
             {
                 aBtnTexLuminance.Check( nValue == 1 );
                 aBtnTexColor.Check( nValue == 3 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1368,9 +1452,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexLuminance.IsChecked() ||
                 aBtnTexColor.IsChecked() )
             {
-                aBtnTexLuminance.Check( FALSE );
-                aBtnTexColor.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexLuminance.Check( sal_False );
+                aBtnTexColor.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1378,7 +1462,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
 
             if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexModulate.IsChecked() && nValue == 2 ) )
@@ -1386,7 +1470,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexReplace.Check( nValue == 1 );
                 aBtnTexModulate.Check( nValue == 2 );
                 //aBtnTexBlend.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1394,10 +1478,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexReplace.IsChecked() ||
                 aBtnTexModulate.IsChecked() )
             {
-                aBtnTexReplace.Check( FALSE );
-                aBtnTexModulate.Check( FALSE );
-                //aBtnTexBlend.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexReplace.Check( sal_False );
+                aBtnTexModulate.Check( sal_False );
+                //aBtnTexBlend.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1405,7 +1489,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
 
             if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelX.IsChecked() && nValue == 1 ) ||
@@ -1414,7 +1498,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectX.Check( nValue == 0 );
                 aBtnTexParallelX.Check( nValue == 1 );
                 aBtnTexCircleX.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1423,10 +1507,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelX.IsChecked() ||
                 aBtnTexCircleX.IsChecked() )
             {
-                aBtnTexObjectX.Check( FALSE );
-                aBtnTexParallelX.Check( FALSE );
-                aBtnTexCircleX.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectX.Check( sal_False );
+                aBtnTexParallelX.Check( sal_False );
+                aBtnTexCircleX.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1434,7 +1518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
 
             if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelY.IsChecked() && nValue == 1 ) ||
@@ -1443,7 +1527,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectY.Check( nValue == 0 );
                 aBtnTexParallelY.Check( nValue == 1 );
                 aBtnTexCircleY.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1452,10 +1536,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelY.IsChecked() ||
                 aBtnTexCircleY.IsChecked() )
             {
-                aBtnTexObjectY.Check( FALSE );
-                aBtnTexParallelY.Check( FALSE );
-                aBtnTexCircleY.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectY.Check( sal_False );
+                aBtnTexParallelY.Check( sal_False );
+                aBtnTexCircleY.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1463,11 +1547,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            BOOL bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+            sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
             if( bValue != aBtnTexFilter.IsChecked() )
             {
                 aBtnTexFilter.Check( bValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             if( aBtnTexFilter.GetState() == STATE_DONTKNOW )
                 aBtnTexFilter.Check( bValue );
@@ -1477,7 +1561,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexFilter.GetState() != STATE_DONTKNOW )
             {
                 aBtnTexFilter.SetState( STATE_DONTKNOW );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -1495,7 +1579,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1503,7 +1587,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatColor.GetSelectEntryCount() != 0 )
         {
             aLbMatColor.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1516,7 +1600,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1524,7 +1608,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatEmission.GetSelectEntryCount() != 0 )
         {
             aLbMatEmission.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1537,7 +1621,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1545,7 +1629,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatSpecular.GetSelectEntryCount() != 0 )
         {
             aLbMatSpecular.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1553,11 +1637,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
         if( nValue != aMtrMatSpecularIntensity.GetValue() )
         {
             aMtrMatSpecularIntensity.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1565,7 +1649,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
         {
             aMtrMatSpecularIntensity.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1580,7 +1664,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
         {
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnPerspective.GetState() == STATE_DONTKNOW )
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
@@ -1590,7 +1674,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnPerspective.GetState() != STATE_DONTKNOW )
         {
             aBtnPerspective.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1600,7 +1684,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         // diese und entscheide
 
 
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     if( bUpdate || bOnly3DChanged )
@@ -1610,12 +1694,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
         // set LineStyle hard to XLINE_NONE when it's not set so that
         // the default (XLINE_SOLID) is not used for 3d preview
-        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, FALSE))
+        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False))
             aSet.Put(XLineStyleItem(XLINE_NONE));
 
         // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
         // the default (Blue7) is not used for 3d preview
-        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, FALSE))
+        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
             aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
 
         aCtlPreview.Set3DAttributes(aSet);
@@ -1663,11 +1747,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
 
         while(nWhich)
         {
-            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, FALSE);
+            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False);
             if(SFX_ITEM_DONTCARE == eState)
                 rAttrs.InvalidateItem(nWhich);
             else if(SFX_ITEM_SET == eState)
-                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, FALSE));
+                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False));
 
             nWhich = aIter.NextWhich();
         }
@@ -1677,7 +1761,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Perspektive
     if( aBtnPerspective.GetState() != STATE_DONTKNOW )
     {
-        UINT16 nValue;
+        sal_uInt16 nValue;
         if( aBtnPerspective.IsChecked() )
             nValue = PR_PERSPECTIVE;
         else
@@ -1711,7 +1795,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Anzahl Segmente (vertikal)
     if( !aNumVertical.IsEmptyFieldValue() )
     {
-        UINT32 nValue = static_cast<UINT32>(aNumVertical.GetValue());
+        sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue());
         rAttrs.Put(Svx3DVerticalSegmentsItem(nValue));
     }
     else
@@ -1720,7 +1804,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefe
     if( !aMtrDepth.IsEmptyFieldValue() )
     {
-        UINT32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
+        sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
         rAttrs.Put(Svx3DDepthItem(nValue));
     }
     else
@@ -1730,7 +1814,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     TriState eState = aBtnDoubleSided.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DDoubleSidedItem(bValue));
     }
     else
@@ -1739,7 +1823,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Kantenrundung
     if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16) aMtrPercentDiagonal.GetValue();
+        sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue();
         rAttrs.Put(Svx3DPercentDiagonalItem(nValue));
     }
     else
@@ -1748,7 +1832,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefenskalierung
     if( !aMtrBackscale.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrBackscale.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue();
         rAttrs.Put(Svx3DBackscaleItem(nValue));
     }
     else
@@ -1757,14 +1841,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Endwinkel
     if( !aMtrEndAngle.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrEndAngle.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue();
         rAttrs.Put(Svx3DEndAngleItem(nValue));
     }
     else
         rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE);
 
     // Normalentyp
-    UINT16 nValue = 99;
+    sal_uInt16 nValue = 99;
     if( aBtnNormalsObj.IsChecked() )
         nValue = 0;
     else if( aBtnNormalsFlat.IsChecked() )
@@ -1781,7 +1865,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnNormalsInvert.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DNormalsInvertItem(bValue));
     }
     else
@@ -1791,7 +1875,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTwoSidedLighting.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
     }
     else
@@ -1811,7 +1895,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnShadow3d.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DShadow3DItem(bValue));
         rAttrs.Put(SdrShadowItem(bValue));
     }
@@ -1824,7 +1908,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Neigung (Schatten)
     if( !aMtrSlant.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrSlant.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue();
         rAttrs.Put(Svx3DShadowSlantItem(nValue2));
     }
     else
@@ -1833,7 +1917,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Distanz
     if( !aMtrDistance.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         rAttrs.Put(Svx3DDistanceItem(nValue2));
     }
     else
@@ -1842,7 +1926,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Brennweite
     if( !aMtrFocalLength.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         rAttrs.Put(Svx3DFocalLengthItem(nValue2));
     }
     else
@@ -1866,7 +1950,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight1.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight1 );
+        sal_Bool bValue = GetUILightState( aBtnLight1 );
         rAttrs.Put(Svx3DLightOnOff1Item(bValue));
 
         // Licht 1 (Richtung)
@@ -1891,7 +1975,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight2.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight2 );
+        sal_Bool bValue = GetUILightState( aBtnLight2 );
         rAttrs.Put(Svx3DLightOnOff2Item(bValue));
 
         // Licht 2 (Richtung)
@@ -1915,7 +1999,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight3.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight3 );
+        sal_Bool bValue = GetUILightState( aBtnLight3 );
         rAttrs.Put(Svx3DLightOnOff3Item(bValue));
 
         // Licht 3 (Richtung)
@@ -1939,7 +2023,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight4.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight4 );
+        sal_Bool bValue = GetUILightState( aBtnLight4 );
         rAttrs.Put(Svx3DLightOnOff4Item(bValue));
 
         // Licht 4 (Richtung)
@@ -1963,7 +2047,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight5.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight5 );
+        sal_Bool bValue = GetUILightState( aBtnLight5 );
         rAttrs.Put(Svx3DLightOnOff5Item(bValue));
 
         // Licht 5 (Richtung)
@@ -1987,7 +2071,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight6.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight6 );
+        sal_Bool bValue = GetUILightState( aBtnLight6 );
         rAttrs.Put(Svx3DLightOnOff6Item(bValue));
 
         // Licht 6 (Richtung)
@@ -2011,7 +2095,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight7.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight7 );
+        sal_Bool bValue = GetUILightState( aBtnLight7 );
         rAttrs.Put(Svx3DLightOnOff7Item(bValue));
 
         // Licht 7 (Richtung)
@@ -2035,7 +2119,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight8.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight8 );
+        sal_Bool bValue = GetUILightState( aBtnLight8 );
         rAttrs.Put(Svx3DLightOnOff8Item(bValue));
 
         // Licht 8 (Richtung)
@@ -2117,7 +2201,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTexFilter.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTextureFilterItem(bValue));
     }
     else
@@ -2157,7 +2241,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Glanzpunkt Intensitaet
     if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrMatSpecularIntensity.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue();
         rAttrs.Put(Svx3DMaterialSpecularIntensityItem(nValue2));
     }
     else
@@ -2268,7 +2352,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
@@ -2287,7 +2371,7 @@ IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG )
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_ASSIGN, TRUE );
+        SfxBoolItem aItem( SID_3D_ASSIGN, sal_True );
         pDispatcher->Execute(
             SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
@@ -2303,7 +2387,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
     if( pBtn )
     {
         // Da das permanente Updaten der Preview zu teuer waere
-        BOOL bUpdatePreview = aBtnLight.IsChecked();
+        sal_Bool bUpdatePreview = aBtnLight.IsChecked();
 
         aBtnGeo.Check( &aBtnGeo	== pBtn );
         aBtnRepresentation.Check( &aBtnRepresentation == pBtn );
@@ -2567,11 +2651,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 {
-    BOOL bUpdatePreview = FALSE;
+    sal_Bool bUpdatePreview = sal_False;
 
     if( pBtn )
     {
-        USHORT nSId = 0;
+        sal_uInt16 nSId = 0;
 
         if( pBtn == &aBtnConvertTo3D )
         {
@@ -2589,7 +2673,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj );
             aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat );
             aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnLight1 ||
                  pBtn == &aBtnLight2 ||
@@ -2614,51 +2698,51 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 
                 if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() )
                 {
-                    aBtnLight1.Check( FALSE );
+                    aBtnLight1.Check( sal_False );
                     aLbLight1.Hide();
                 }
                 if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() )
                 {
-                    aBtnLight2.Check( FALSE );
+                    aBtnLight2.Check( sal_False );
                     aLbLight2.Hide();
                 }
                 if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() )
                 {
-                    aBtnLight3.Check( FALSE );
+                    aBtnLight3.Check( sal_False );
                     aLbLight3.Hide();
                 }
                 if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() )
                 {
-                    aBtnLight4.Check( FALSE );
+                    aBtnLight4.Check( sal_False );
                     aLbLight4.Hide();
                 }
                 if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() )
                 {
-                    aBtnLight5.Check( FALSE );
+                    aBtnLight5.Check( sal_False );
                     aLbLight5.Hide();
                 }
                 if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() )
                 {
-                    aBtnLight6.Check( FALSE );
+                    aBtnLight6.Check( sal_False );
                     aLbLight6.Hide();
                 }
                 if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() )
                 {
-                    aBtnLight7.Check( FALSE );
+                    aBtnLight7.Check( sal_False );
                     aLbLight7.Hide();
                 }
                 if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() )
                 {
-                    aBtnLight8.Check( FALSE );
+                    aBtnLight8.Check( sal_False );
                     aLbLight8.Hide();
                 }
             }
-            BOOL bEnable = GetUILightState( *(ImageButton*)pBtn );
+            sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn );
             aBtnLightColor.Enable( bEnable );
             pLb->Enable( bEnable );
 
             ClickLightHdl( pBtn );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Textures
         else if( pBtn == &aBtnTexLuminance ||
@@ -2666,7 +2750,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
         {
             aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance );
             aBtnTexColor.Check( pBtn == &aBtnTexColor );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexReplace ||
                  pBtn == &aBtnTexModulate )// ||
@@ -2675,7 +2759,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexReplace.Check( pBtn == &aBtnTexReplace );
             aBtnTexModulate.Check( pBtn == &aBtnTexModulate );
             //aBtnTexBlend.Check( pBtn == &aBtnTexBlend );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelX ||
                  pBtn == &aBtnTexCircleX ||
@@ -2684,7 +2768,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX );
             aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX );
             aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelY ||
                  pBtn == &aBtnTexCircleY ||
@@ -2693,20 +2777,20 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY );
             aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY );
             aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnShadow3d  )
         {
             pBtn->Check( !pBtn->IsChecked() );
             aFtSlant.Enable( pBtn->IsChecked() );
             aMtrSlant.Enable( pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Sonstige (keine Gruppen)
         else if( pBtn != NULL )
         {
             pBtn->Check( !pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
         if( nSId > 0 )
@@ -2714,12 +2798,12 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
             if (pDispatcher != NULL)
             {
-                SfxBoolItem aItem( nSId, TRUE );
+                SfxBoolItem aItem( nSId, sal_True );
                 pDispatcher->Execute(
                     nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
-        else if( bUpdatePreview == TRUE )
+        else if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2761,7 +2845,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
     if( p )
     {
         Color aColor;
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( p == &aLbMatFavorites )
@@ -2769,9 +2853,9 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             Color aColObj( COL_WHITE );
             Color aColEmis( COL_BLACK );
             Color aColSpec( COL_WHITE );
-            USHORT nSpecIntens = 20;
+            sal_uInt16 nSpecIntens = 20;
 
-            USHORT nPos = aLbMatFavorites.GetSelectEntryPos();
+            sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos();
             switch( nPos )
             {
                 case 1: // Metall
@@ -2824,19 +2908,19 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             LBSelectColor( &aLbMatSpecular, aColSpec );
             aMtrMatSpecularIntensity.SetValue( nSpecIntens );
 
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbMatColor ||
                  p == &aLbMatEmission ||
                  p == &aLbMatSpecular )
         {
             aLbMatFavorites.SelectEntryPos( 0 );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Beleuchtung
         else if( p == &aLbAmbientlight )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbLight1 ||
                  p == &aLbLight2 ||
@@ -2847,12 +2931,12 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
                  p == &aLbLight7 ||
                  p == &aLbLight8 )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbShademode )
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2863,27 +2947,27 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
 {
     if( pField )
     {
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( pField == &aMtrMatSpecularIntensity )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumHorizontal )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumVertical )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aMtrSlant )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2896,7 +2980,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 
     if( pBtn )
     {
-        USHORT nLightSource = GetLightSource( pBtn );
+        sal_uInt16 nLightSource = GetLightSource( pBtn );
         ColorLB* pLb = GetLbByButton( pBtn );
         Color aColor( pLb->GetSelectEntryColor() );
         SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes());
@@ -2926,7 +3010,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
 {
-    //USHORT nItemId = aCtlFavorites.GetSelectItemId();
+    //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId();
 
     //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 );
     //Update( *pSet );
@@ -2972,45 +3056,45 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
         // Zustand: Keine Lampe selektiert
         if( aBtnLight1.IsChecked() )
         {
-            aBtnLight1.Check( FALSE );
-            aLbLight1.Enable( FALSE );
+            aBtnLight1.Check( sal_False );
+            aLbLight1.Enable( sal_False );
         }
         else if( aBtnLight2.IsChecked() )
         {
-            aBtnLight2.Check( FALSE );
-            aLbLight2.Enable( FALSE );
+            aBtnLight2.Check( sal_False );
+            aLbLight2.Enable( sal_False );
         }
         else if( aBtnLight3.IsChecked() )
         {
-            aBtnLight3.Check( FALSE );
-            aLbLight3.Enable( FALSE );
+            aBtnLight3.Check( sal_False );
+            aLbLight3.Enable( sal_False );
         }
         else if( aBtnLight4.IsChecked() )
         {
-            aBtnLight4.Check( FALSE );
-            aLbLight4.Enable( FALSE );
+            aBtnLight4.Check( sal_False );
+            aLbLight4.Enable( sal_False );
         }
         else if( aBtnLight5.IsChecked() )
         {
-            aBtnLight5.Check( FALSE );
-            aLbLight5.Enable( FALSE );
+            aBtnLight5.Check( sal_False );
+            aLbLight5.Enable( sal_False );
         }
         else if( aBtnLight6.IsChecked() )
         {
-            aBtnLight6.Check( FALSE );
-            aLbLight6.Enable( FALSE );
+            aBtnLight6.Check( sal_False );
+            aLbLight6.Enable( sal_False );
         }
         else if( aBtnLight7.IsChecked() )
         {
-            aBtnLight7.Check( FALSE );
-            aLbLight7.Enable( FALSE );
+            aBtnLight7.Check( sal_False );
+            aLbLight7.Enable( sal_False );
         }
         else if( aBtnLight8.IsChecked() )
         {
-            aBtnLight8.Check( FALSE );
-            aLbLight8.Enable( FALSE );
+            aBtnLight8.Check( sal_False );
+            aLbLight8.Enable( sal_False );
         }
-        aBtnLightColor.Enable( FALSE );
+        aBtnLightColor.Enable( sal_False );
     }
 
     return( 0L );
@@ -3018,11 +3102,11 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 // Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist
-// Liefert TRUE zurueck, falls Farbe hinzugefuegt wurde
+// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde
 // -----------------------------------------------------------------------
-BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
+sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     pLb->SetNoSelection();
     pLb->SelectEntry( rColor );
@@ -3030,17 +3114,17 @@ BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
     {
         String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
 
-        aStr += String::CreateFromInt32((INT32)rColor.GetRed());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
-        aStr += String::CreateFromInt32((INT32)rColor.GetGreen());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
-        aStr += String::CreateFromInt32((INT32)rColor.GetBlue());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
 
-        USHORT nPos = pLb->InsertEntry( rColor, aStr );
+        sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr );
         pLb->SelectEntryPos( nPos );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return( bRet );
 }
@@ -3057,12 +3141,12 @@ void Svx3DWin::UpdatePreview()
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
         // Flag zuruecksetzen
-        bOnly3DChanged = FALSE;
+        bOnly3DChanged = sal_False;
     }
 
     // ItemSet besorgen
@@ -3117,9 +3201,9 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc )
 }
 
 // -----------------------------------------------------------------------
-USHORT Svx3DWin::GetLightSource( const PushButton* pBtn )
+sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 {
-    USHORT nLight = 8;
+    sal_uInt16 nLight = 8;
 
     if( pBtn == NULL )
     {
@@ -3214,7 +3298,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 |*
 \************************************************************************/
 Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
-                                                         USHORT nId,
+                                                         sal_uInt16 nId,
                                                          SfxBindings* pBindings,
                                                          SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -3232,7 +3316,7 @@ Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
 |* ControllerItem fuer 3DStatus
 |*
 \************************************************************************/
-Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
+Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
                                 Svx3DWin* pWin,
                                 SfxBindings* _pBindings) :
     SfxControllerItem( _nId, *_pBindings ),
@@ -3241,7 +3325,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
 }
 
 // -----------------------------------------------------------------------
-void Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
+void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
                         SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
 {
 }
@@ -3252,22 +3336,22 @@ void Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
 |*
 \************************************************************************/
 
-SvxConvertTo3DItem::SvxConvertTo3DItem(UINT16 _nId, SfxBindings* _pBindings)
+SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
 :	SfxControllerItem(_nId, *_pBindings),
-    bState(FALSE)
+    bState(sal_False)
 {
 }
 
-void SvxConvertTo3DItem::StateChanged(UINT16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
+void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
 {
-    BOOL bNewState = (eState != SFX_ITEM_DISABLED);
+    sal_Bool bNewState = (eState != SFX_ITEM_DISABLED);
     if(bNewState != bState)
     {
         bState = bNewState;
         SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
         }
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index fe559a493d..c272a374a3 100644..100755
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -27,6 +27,8 @@
 
 #include <svx/dialogs.hrc>
 #include "float3d.hrc"
+#include <svx/svxcommands.h>
+
 #define WIDTH 				158
 #define HEIGHT 				209
 #define BORDER 				3
@@ -64,7 +66,7 @@
 
 DockingWindow RID_SVXFLOAT_3D
 {
-    HelpID = SID_3D_WIN ;
+    HelpID = CMD_SID_3D_WIN ;
     Border = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -81,6 +83,7 @@ DockingWindow RID_SVXFLOAT_3D
 
     ImageButton BTN_GEO
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO";
         Pos = MAP_APPFONT ( 4 , BORDER ) ;
         Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -93,6 +96,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_REPRESENTATION
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION";
         Pos = MAP_APPFONT ( 22 , BORDER ) ;
         Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -105,6 +109,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT";
         Pos = MAP_APPFONT ( 40 , BORDER ) ;
         Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -117,6 +122,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEXTURE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE";
         Pos = MAP_APPFONT ( 58 , BORDER ) ;
         Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
         ButtonImage = Image
@@ -129,6 +135,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_MATERIAL
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL";
         Pos = MAP_APPFONT ( 76 , BORDER ) ;
         Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -142,6 +149,7 @@ DockingWindow RID_SVXFLOAT_3D
 
     ImageButton BTN_UPDATE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE";
         Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -154,6 +162,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_ASSIGN
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN";
         Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -167,6 +176,7 @@ DockingWindow RID_SVXFLOAT_3D
      // Unterer Teil
     ImageButton BTN_CHANGE_TO_3D
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D";
         Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -180,6 +190,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LATHE_OBJ
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ";
         Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -193,6 +204,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_PERSPECTIVE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE";
         Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -232,6 +244,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_PERCENT_DIAGONAL
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -252,6 +265,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_BACKSCALE
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
                             FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
@@ -273,6 +287,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_END_ANGLE
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
                             FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
@@ -295,6 +310,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_DEPTH
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
                             FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ;
@@ -326,6 +342,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     NumericField NUM_HORIZONTAL
     {
+        HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ;
         Size = MAP_APPFONT ( 22 , 12 ) ;
@@ -345,6 +362,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     NumericField NUM_VERTICAL
     {
+        HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ;
         Size = MAP_APPFONT ( 22 , 12 ) ;
@@ -365,6 +383,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_NORMALS_OBJ
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ";
         Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ;
         Size = IMG_BUTTON_SIZE;
         ButtonImage = Image
@@ -377,6 +396,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_NORMALS_FLAT
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT";
         Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ;
         Size = IMG_BUTTON_SIZE;
         ButtonImage = Image
@@ -389,6 +409,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_NORMALS_SPHERE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE";
         Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ;
         Size = IMG_BUTTON_SIZE;
         ButtonImage = Image
@@ -401,6 +422,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_NORMALS_INVERT
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT";
         Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ;
         Size = IMG_BUTTON_SIZE;
         ButtonImage = Image
@@ -413,6 +435,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TWO_SIDED_LIGHTING
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING";
         Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 ,
                             NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ;
         Size = IMG_BUTTON_SIZE;
@@ -426,6 +449,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_DOUBLE_SIDED
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED";
         Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ;
         Size = IMG_BUTTON_SIZE;
         ButtonImage = Image
@@ -446,6 +470,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_SHADEMODE
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 30 ) ;
         Size = MAP_APPFONT ( 83 , 100 ) ;
@@ -466,6 +491,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_SHADOW_3D
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D";
         Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ;
         Size = IMG_BUTTON_SIZE;
         TabStop = TRUE ;
@@ -486,6 +512,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_SLANT
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -513,6 +540,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_DISTANCE
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 ,
                             CAMERA_START_Y + 11 - 2 ) ;
@@ -537,6 +565,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_FOCAL_LENGTH
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 ,
                             CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ;
@@ -568,6 +597,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_1
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1";
         Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -580,6 +610,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_2
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2";
         Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -592,6 +623,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_3
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3";
         Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -604,6 +636,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_4
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4";
         Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -616,6 +649,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_5
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5";
         Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -628,6 +662,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_6
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6";
         Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -640,6 +675,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_7
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7";
         Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -652,6 +688,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_8
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8";
         Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -664,6 +701,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_1
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -672,6 +710,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_2
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -680,6 +719,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_3
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -688,6 +728,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_4
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -696,6 +737,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_5
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -704,6 +746,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_6
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -712,6 +755,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_7
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -720,6 +764,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_LIGHT_8
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -728,6 +773,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_LIGHT_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR";
         Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -746,6 +792,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_AMBIENTLIGHT
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -754,6 +801,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_AMBIENT_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR";
         Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
         ButtonImage = Image
@@ -780,6 +828,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_LUMINANCE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -793,6 +842,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
                             FIRST_FT_START_Y - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -812,6 +862,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_REPLACE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -825,6 +876,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_MODULATE
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
                             FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -838,6 +890,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_BLEND
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
                             FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -857,6 +910,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_OBJECT_X
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -870,6 +924,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_PARALLEL_X
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
                             FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -883,6 +938,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_CIRCLE_X
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
                             FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -902,6 +958,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_OBJECT_Y
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -915,6 +972,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_PARALLEL_Y
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
                             FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -928,6 +986,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_CIRCLE_Y
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
                             FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -947,6 +1006,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_TEX_FILTER
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ;
         Size = IMG_BUTTON_SIZE;
@@ -974,6 +1034,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_MAT_FAVORITES
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
                             FIRST_FT_START_Y - 2 ) ;
@@ -998,6 +1059,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_MAT_COLOR
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
                             FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
@@ -1007,6 +1069,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_MAT_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 ,
                             FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
         Size = MAP_APPFONT ( 12, 14 ) ;
@@ -1026,6 +1089,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_MAT_EMISSION
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
                             FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
@@ -1035,6 +1099,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_EMISSION_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR";
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 ,
                             FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
         Size = MAP_APPFONT ( 12, 14 ) ;
@@ -1061,6 +1126,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ListBox LB_MAT_SPECULAR
     {
+        HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ;
         Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -1069,6 +1135,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     ImageButton BTN_SPECULAR_COLOR
     {
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR";
         Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ;
         Size = MAP_APPFONT ( 12, 14 ) ;
         ButtonImage = Image
@@ -1087,6 +1154,7 @@ DockingWindow RID_SVXFLOAT_3D
     };
     MetricField MTR_MAT_SPECULAR_INTENSITY
     {
+        HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
                             SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ;
@@ -1102,6 +1170,8 @@ DockingWindow RID_SVXFLOAT_3D
         Last = 100 ;
         SpinSize = 1 ;
     };
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES";
+        HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR";
     FixedLine FL_MATERIAL
     {
         Pos = TOP_FIXED_LINE_POS;
@@ -1163,3 +1233,8 @@ String RID_SVXFLOAT3D_FIX_B
 {
     Text [ en-US ] = "B:";
 };
+String STR_COLOR_LIGHT_PRE
+{
+    Text [ en-US ] = "Color Light Preview";
+};
+
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index a7177f1cc0..c7f461ded8 100644..100755
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -33,7 +33,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor3d/cutfindprocessor3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx
index bbe70996a5..bbe70996a5 100644..100755
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index 9a7fd359c8..9a7fd359c8 100644..100755
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 681520a145..e4f6afb1aa 100644..100755
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -29,11 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/lathe3d.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svxids.hrc>
@@ -131,7 +131,7 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dLatheObj::GetObjIdentifier() const
+sal_uInt16 E3dLatheObj::GetObjIdentifier() const
 {
     return E3D_LATHEOBJ_ID;
 }
@@ -159,7 +159,7 @@ void E3dLatheObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-SdrObject *E3dLatheObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -249,9 +249,9 @@ void E3dLatheObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dLatheObj::IsBreakObjPossible()
+sal_Bool E3dLatheObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dLatheObj::GetBreakObj()
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
deleted file mode 100644
index 71916df4a8..0000000000
--- a/svx/source/engine3d/makefile.mk
+++ /dev/null
@@ -1,76 +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=svx
-TARGET=engine3d
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-        $(SLO)$/e3dsceneupdater.obj \
-        $(SLO)$/helperminimaldepth3d.obj	\
-        $(SLO)$/helperhittest3d.obj			\
-        $(SLO)$/obj3d.obj 		\
-        $(SLO)$/scene3d.obj		\
-        $(SLO)$/polysc3d.obj	\
-        $(SLO)$/cube3d.obj		\
-        $(SLO)$/sphere3d.obj	\
-        $(SLO)$/extrud3d.obj    \
-        $(SLO)$/lathe3d.obj		\
-        $(SLO)$/polygn3d.obj 	\
-        $(SLO)$/svx3ditems.obj	\
-        $(SLO)$/deflt3d.obj		\
-        $(SLO)$/e3dundo.obj     \
-        $(SLO)$/viewpt3d2.obj	\
-        $(SLO)$/camera3d.obj	\
-        $(SLO)$/objfac3d.obj 	\
-        $(SLO)$/dragmt3d.obj	\
-        $(SLO)$/view3d.obj		\
-        $(SLO)$/view3d1.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-        $(SLO)$/float3d.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=engine3d
-SRC1FILES=\
-        string3d.src	\
-        float3d.src
-
-.INCLUDE :  target.mk
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 5516022c17..7f4570db82 100644..100755
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svditer.hxx"
-#include "globl3d.hxx"
+#include "svx/svditer.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/camera3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/polysc3d.hxx>
@@ -118,7 +118,7 @@ E3dObjList::~E3dObjList()
 {
 }
 
-void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     // Owner holen
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject");
@@ -137,7 +137,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
     }
 }
 
-void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -152,7 +152,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
     }
 }
 
-SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
 {
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -169,7 +169,7 @@ SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
     return pRetval;
 }
 
-SdrObject* E3dObjList::RemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -257,9 +257,9 @@ void E3dObject::SetSelected(bool bNew)
 |*
 \************************************************************************/
 
-BOOL E3dObject::IsBreakObjPossible()
+sal_Bool E3dObject::IsBreakObjPossible()
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrAttrObj* E3dObject::GetBreakObj()
@@ -295,7 +295,7 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself)
 |*
 \************************************************************************/
 
-UINT32 E3dObject::GetObjInventor() const
+sal_uInt32 E3dObject::GetObjInventor() const
 {
     return E3dInventor;
 }
@@ -306,7 +306,7 @@ UINT32 E3dObject::GetObjInventor() const
 |*
 \************************************************************************/
 
-UINT16 E3dObject::GetObjIdentifier() const
+sal_uInt16 E3dObject::GetObjIdentifier() const
 {
     return E3D_OBJECT_ID;
 }
@@ -319,19 +319,19 @@ UINT16 E3dObject::GetObjIdentifier() const
 
 void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bResizeFreeAllowed    = TRUE;
-    rInfo.bResizePropAllowed    = TRUE;
-    rInfo.bRotateFreeAllowed    = TRUE;
-    rInfo.bRotate90Allowed      = TRUE;
-    rInfo.bMirrorFreeAllowed    = FALSE;
-    rInfo.bMirror45Allowed      = FALSE;
-    rInfo.bMirror90Allowed      = FALSE;
-    rInfo.bShearAllowed         = FALSE;
-    rInfo.bEdgeRadiusAllowed	= FALSE;
-    rInfo.bCanConvToPath        = FALSE;
+    rInfo.bResizeFreeAllowed    = sal_True;
+    rInfo.bResizePropAllowed    = sal_True;
+    rInfo.bRotateFreeAllowed    = sal_True;
+    rInfo.bRotate90Allowed      = sal_True;
+    rInfo.bMirrorFreeAllowed    = sal_False;
+    rInfo.bMirror45Allowed      = sal_False;
+    rInfo.bMirror90Allowed      = sal_False;
+    rInfo.bShearAllowed         = sal_False;
+    rInfo.bEdgeRadiusAllowed	= sal_False;
+    rInfo.bCanConvToPath        = sal_False;
 
     // no transparence for 3d objects
-    rInfo.bTransparenceAllowed = FALSE;
+    rInfo.bTransparenceAllowed = sal_False;
 
     // gradient depends on fillstyle
     // BM *** check if SetItem is NULL ***
@@ -345,10 +345,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     // also bei Durchdringugnen auch gegeneinander geschnitten werden
     // muessten. Auch die Texturkoorinaten waeren ein ungeloestes
     // Problem.
-    rInfo.bCanConvToPoly = FALSE;
-    rInfo.bCanConvToContour = FALSE;
-    rInfo.bCanConvToPathLineToArea = FALSE;
-    rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bCanConvToPoly = sal_False;
+    rInfo.bCanConvToContour = sal_False;
+    rInfo.bCanConvToPathLineToArea = sal_False;
+    rInfo.bCanConvToPolyLineToArea = sal_False;
 }
 
 /*************************************************************************
@@ -952,7 +952,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // SendRepaintBroadcast();
     double fWinkelInRad = nWink/100 * F_PI180;
@@ -964,7 +964,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
 }
 
 /*************************************************************************/
@@ -1128,7 +1128,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
 |*
 \************************************************************************/
 
-UINT16 E3dCompoundObject::GetObjIdentifier() const
+sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
 {
     return E3D_COMPOUNDOBJ_ID;
 }
@@ -1208,7 +1208,7 @@ void E3dCompoundObject::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dCompoundObject::SetCreateNormals(BOOL bNew)
+void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
 {
     if(bCreateNormals != bNew)
     {
@@ -1217,7 +1217,7 @@ void E3dCompoundObject::SetCreateNormals(BOOL bNew)
     }
 }
 
-void E3dCompoundObject::SetCreateTexture(BOOL bNew)
+void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
 {
     if(bCreateTexture != bNew)
     {
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 0244032b1f..cf7cb6cb4d 100644..100755
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/polygn3d.hxx>
-#include "objfac3d.hxx"
+#include "svx/objfac3d.hxx"
 #include <svx/svdobj.hxx>
 
 /*************************************************************************
@@ -45,14 +45,14 @@
 |*
 \************************************************************************/
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 E3dObjFactory::E3dObjFactory()
 {
     if ( !bInit )
     {
         SdrObjFactory::InsertMakeObjectHdl(LINK(this, E3dObjFactory, MakeObject));
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 4dd347c544..fd19f55e95 100644..100755
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/polygn3d.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <basegfx/point/b3dpoint.hxx>
 #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
@@ -55,7 +55,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
 E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :	E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -79,7 +79,7 @@ E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :	E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -102,7 +102,7 @@ E3dPolygonObj::E3dPolygonObj(
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
     const basegfx::B2DPolyPolygon& rPolyTexture2D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :	E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -189,7 +189,7 @@ void E3dPolygonObj::CreateDefaultTexture()
 
         // Entscheiden, welche Koordinaten als Source fuer das
         // Mapping benutzt werden sollen
-        UINT16 nSourceMode = 0;
+        sal_uInt16 nSourceMode = 0;
 
         // Groessten Freiheitsgrad ermitteln
         if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ()))
@@ -266,7 +266,7 @@ E3dPolygonObj::~E3dPolygonObj()
 |*
 \************************************************************************/
 
-UINT16 E3dPolygonObj::GetObjIdentifier() const
+sal_uInt16 E3dPolygonObj::GetObjIdentifier() const
 {
     return E3D_POLYGONOBJ_ID;
 }
@@ -319,7 +319,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText
 |*
 \************************************************************************/
 
-SdrObject *E3dPolygonObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -350,7 +350,7 @@ void E3dPolygonObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dPolygonObj::SetLineOnly(BOOL bNew)
+void E3dPolygonObj::SetLineOnly(sal_Bool bNew)
 {
     if(bNew != bLineOnly)
     {
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 86e251a9c3..0855f085eb 100644..100755
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -31,14 +31,14 @@
 #include <svx/xfillit.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdetc.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
 #include <svl/style.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/xlnclit.hxx>
 #include <svl/metitem.hxx>
@@ -67,7 +67,7 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dPolyScene::GetObjIdentifier() const
+sal_uInt16 E3dPolyScene::GetObjIdentifier() const
 {
     return E3D_POLYSCENE_ID;
 }
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 0988535b16..646b33e627 100644..100755
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
-#include "svditer.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svditer.hxx"
 
 #if defined( UNX ) || defined( ICC )
 #include <stdlib.h>
 #endif
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdpage.hxx>
 #include <svl/style.hxx>
 #include <svx/scene3d.hxx>
@@ -242,7 +242,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/)
 #endif
 
     // Fuer WIN95/NT die FP-Exceptions abschalten
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
 #define SC_FPEXCEPTIONS_ON()	_control87( _MCW_EM, 0 )
 #define SC_FPEXCEPTIONS_OFF()	_control87( _MCW_EM, _MCW_EM )
     SC_FPEXCEPTIONS_OFF();
@@ -331,7 +331,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const
 |*
 \************************************************************************/
 
-UINT16 E3dScene::GetObjIdentifier() const
+sal_uInt16 E3dScene::GetObjIdentifier() const
 {
     return E3D_SCENE_ID;
 }
@@ -753,7 +753,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // So dass war die Szene, ab jetzt kommen die Objekte in der Szene
     // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen
@@ -772,7 +772,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
     SetRectsDirty();
 }
 
@@ -807,7 +807,7 @@ void E3dScene::RecalcSnapRect()
 |*
 \************************************************************************/
 
-BOOL E3dScene::IsBreakObjPossible()
+sal_Bool E3dScene::IsBreakObjPossible()
 {
     // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind
     SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS);
@@ -817,10 +817,10 @@ BOOL E3dScene::IsBreakObjPossible()
         E3dObject* pObj = (E3dObject*) a3DIterator.Next();
         DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!");
         if(!pObj->IsBreakObjPossible())
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
@@ -833,7 +833,7 @@ basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
 
 void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
 {
-    UINT16 nSceneShadowSlant = (UINT16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
+    sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
     GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
 }
 
@@ -849,7 +849,7 @@ bool E3dScene::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
-    return TRUE;
+    return sal_True;
 }
 
 bool E3dScene::MovCreate(SdrDragStat& rStat)
@@ -860,8 +860,8 @@ bool E3dScene::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -876,7 +876,7 @@ bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 bool E3dScene::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void E3dScene::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 7ee6a34618..3d7b0a6b09 100644..100755
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -29,11 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/sphere3d.hxx>
 
 #include <svx/svxids.hrc>
@@ -118,7 +118,7 @@ void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dSphereObj::GetObjIdentifier() const
+sal_uInt16 E3dSphereObj::GetObjIdentifier() const
 {
     return E3D_SPHEREOBJ_ID;
 }
@@ -129,7 +129,7 @@ UINT16 E3dSphereObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
index ec3f208719..ec3f208719 100644..100755
--- a/svx/source/engine3d/string3d.src
+++ b/svx/source/engine3d/string3d.src
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index fba7365d12..5e2cd71c61 100644..100755
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -67,7 +67,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
 :	SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
 {}
 
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
 {}
 
@@ -75,7 +75,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
 
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
 {}
 
@@ -103,7 +103,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
 :	SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
 {}
 
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
 {}
 
@@ -115,7 +115,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
 :	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
 {}
 
-Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
 {}
 
@@ -143,7 +143,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
 :	SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
 {}
 
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
 {}
 
@@ -159,7 +159,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
 :	SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
 {}
 
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
 {}
 
@@ -199,35 +199,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
 :	SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
 {}
 
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
 {}
 
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
 {}
 
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
 {}
 
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
 {}
 
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
 {}
 
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
 {}
 
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
 {}
 
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
 {}
 
@@ -274,7 +274,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
 {}
 
@@ -299,7 +299,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
 {}
 
@@ -324,7 +324,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
 {}
 
@@ -349,7 +349,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
 {}
 
@@ -374,7 +374,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal) 
 :	SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
 {}
 
@@ -399,13 +399,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 
 // Svx3DNormalsKindItem: use drawing::NormalsKind
-bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::NormalsKind)GetValue();
     return true;
 }
 
-bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::NormalsKind eVar;
     if(!(rVal >>= eVar))
@@ -420,13 +420,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return true;
 }
 
-bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -441,13 +441,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return true;
 }
 
-bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -462,13 +462,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureKindItem: use drawing::TextureKind
-bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureKind)GetValue();
     return true;
 }
 
-bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureKind eVar;
     if(!(rVal >>= eVar))
@@ -483,13 +483,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureModeItem: use drawing:TextureMode
-bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureMode)GetValue();
     return true;
 }
 
-bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureMode eVar;
     if(!(rVal >>= eVar))
@@ -504,13 +504,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DPerspectiveItem: use drawing::ProjectionMode
-bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ProjectionMode)GetValue();
     return true;
 }
 
-bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -525,13 +525,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DShadeModeItem: use drawing::ShadeMode
-bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ShadeMode)GetValue();
     return true;
 }
 
-bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ShadeMode eVar;
     if(!(rVal >>= eVar))
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 185d5ed098..54557abd05 100644..100755
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -33,7 +33,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdmodel.hxx>
@@ -44,7 +44,7 @@
 #include <svx/svdview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/sphere3d.hxx>
@@ -65,7 +65,7 @@
 #include <svx/xlnwtit.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/sdrpagewindow.hxx>
@@ -255,7 +255,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) :
 void E3dView::DrawMarkedObj(OutputDevice& rOut) const
 {
     // Existieren 3D-Objekte, deren Szenen nicht selektiert sind?
-    BOOL bSpecialHandling = FALSE;
+    sal_Bool bSpecialHandling = sal_False;
     E3dScene *pScene = NULL;
 
     long nCnt = GetMarkedObjectCount();
@@ -267,14 +267,14 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // zugehoerige Szene
             pScene = ((E3dCompoundObject*)pObj)->GetScene();
             if(pScene && !IsObjMarked(pScene))
-                bSpecialHandling = TRUE;
+                bSpecialHandling = sal_True;
         }
         // Alle SelectionFlags zuruecksetzen
         if(pObj && pObj->ISA(E3dObject))
         {
             pScene = ((E3dObject*)pObj)->GetScene();
             if(pScene)
-                pScene->SetSelected(FALSE);
+                pScene->SetSelected(sal_False);
         }
     }
 
@@ -291,7 +291,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
 
@@ -302,7 +302,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             {
                 // Objekt markieren
                 E3dObject* p3DObj = (E3dObject*)pObj;
-                p3DObj->SetSelected(TRUE);
+                p3DObj->SetSelected(sal_True);
                 pScene = p3DObj->GetScene();
             }
         }
@@ -312,9 +312,9 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // code from parent
             SortMarkedObjects();
 
-            pScene->SetDrawOnlySelected(TRUE);
+            pScene->SetDrawOnlySelected(sal_True);
             pScene->SingleObjectPainter(rOut); // #110094#-17
-            pScene->SetDrawOnlySelected(FALSE);
+            pScene->SetDrawOnlySelected(sal_False);
         }
 
         // SelectionFlag zuruecksetzen
@@ -326,7 +326,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
     }
@@ -421,7 +421,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
             
             if(pScene && !IsObjMarked(pScene) && GetSdrPageView())
             {
-                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), FALSE, TRUE);
+                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True);
             }
         }
     }
@@ -470,9 +470,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
 |*
 \************************************************************************/
 
-BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
-    BOOL bRetval = FALSE;
+    sal_Bool bRetval = sal_False;
 
     // Liste holen
     Point aPos(rPos);
@@ -480,7 +480,7 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
     ImpGetPasteObjList(aPos, pDstList);
     
     if(!pDstList)
-        return FALSE;
+        return sal_False;
 
     // Owner der Liste holen
     SdrObject* pOwner = pDstList->GetOwnerObj();
@@ -523,9 +523,9 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
 }
 
 // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
+sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
 {
-    BOOL bRetval(FALSE);
+    sal_Bool bRetval(sal_False);
 
     if(pSrcScene && pDstScene)
     {
@@ -620,7 +620,7 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
                     pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer());
                     pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
                     pDstScene->Insert3DObj(pNewCompoundObj);
-                    bRetval = TRUE;
+                    bRetval = sal_True;
 
                     // Undo anlegen
                     if( GetModel()->IsUndoEnabled() )
@@ -639,11 +639,11 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
 |*
 \************************************************************************/
 
-BOOL E3dView::IsConvertTo3DObjPossible() const
+sal_Bool E3dView::IsConvertTo3DObjPossible() const
 {
-    BOOL bAny3D(FALSE);
-    BOOL bGroupSelected(FALSE);
-    BOOL bRetval(TRUE);
+    sal_Bool bAny3D(sal_False);
+    sal_Bool bGroupSelected(sal_False);
+    sal_Bool bRetval(sal_True);
 
     for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++)
     {
@@ -656,20 +656,20 @@ BOOL E3dView::IsConvertTo3DObjPossible() const
 
     bRetval = !bAny3D
         && (
-           IsConvertToPolyObjPossible(FALSE)
-        || IsConvertToPathObjPossible(FALSE)
+           IsConvertToPolyObjPossible(sal_False)
+        || IsConvertToPathObjPossible(sal_False)
         || IsImportMtfPossible());
     return bRetval;
 }
 
-void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
-    BOOL& rGroupSelected) const
+void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
+    sal_Bool& rGroupSelected) const
 {
     if(pObj)
     {
         if(pObj->ISA(E3dObject))
         {
-            rAny3D = TRUE;
+            rAny3D = sal_True;
         }
         else
         {
@@ -681,7 +681,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
                     SdrObject* pNewObj = aIter.Next();
                     ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected);
                 }
-                rGroupSelected = TRUE;
+                rGroupSelected = sal_True;
             }
         }
     }
@@ -741,7 +741,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
     }
 }
 
-void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     // Einzelnes PathObject, dieses umwanden
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -750,9 +750,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     {
         E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
         if(bExtrude)
-            aDefault.SetDefaultExtrudeCharacterMode(TRUE);
+            aDefault.SetDefaultExtrudeCharacterMode(sal_True);
         else
-            aDefault.SetDefaultLatheCharacterMode(TRUE);
+            aDefault.SetDefaultLatheCharacterMode(sal_True);
 
         // ItemSet des Ursprungsobjektes holen
         SfxItemSet aSet(pObj->GetMergedItemSet());
@@ -768,10 +768,10 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
             // Das SdrPathObj ist nicht gefuellt, lasse die
             // vordere und hintere Flaeche weg. Ausserdem ist
             // eine beidseitige Darstellung notwendig.
-            aDefault.SetDefaultExtrudeCloseFront(FALSE);
-            aDefault.SetDefaultExtrudeCloseBack(FALSE);
+            aDefault.SetDefaultExtrudeCloseFront(sal_False);
+            aDefault.SetDefaultExtrudeCloseBack(sal_False);
 
-            aSet.Put(Svx3DDoubleSidedItem(TRUE));
+            aSet.Put(Svx3DDoubleSidedItem(sal_True));
 
             // Fuellattribut setzen
             aSet.Put(XFillStyleItem(XFILL_SOLID));
@@ -810,7 +810,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     }
 }
 
-void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     if(pObj)
     {
@@ -828,7 +828,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
             ImpChangeSomeAttributesFor3DConversion(pObj);
         
         // convert completely to path objects
-        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(FALSE, FALSE);
+        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False);
 
         if(pNewObj1)
         {
@@ -846,7 +846,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
                 ImpChangeSomeAttributesFor3DConversion2(pNewObj1);
             
             // convert completely to path objects
-            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, TRUE);
+            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True);
 
             if(pNewObj2)
             {
@@ -881,7 +881,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
+void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
 {
     if(AreObjectsMarked())
     {
@@ -948,7 +948,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
             // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse
             // erweitern
-            for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+            for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
             {
                 SdrMark* pMark = GetSdrMarkByIndex(a);
                 SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -988,7 +988,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
         // Ueber die Selektion gehen und in 3D wandeln, komplett mit
         // Umwandeln in SdrPathObject, auch Schriften
-        for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+        for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
         {
             SdrMark* pMark = GetSdrMarkByIndex(a);
             SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1018,8 +1018,8 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
             // und alle alten Objekte weghauen
             SdrObject* pRepObj = GetMarkedObjectByIndex(0);
             SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0);
-            MarkObj(pRepObj, pPV, TRUE);
-            ReplaceObjectAtView(pRepObj, *pPV, pScene, FALSE);
+            MarkObj(pRepObj, pPV, sal_True);
+            ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False);
             DeleteMarked();
             MarkObj(pScene, pPV);
 
@@ -1106,7 +1106,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
         SdrObjListIter aIter(*pSubList, IM_FLAT);
         E3dDepthLayer* pBaseLayer = NULL;
         E3dDepthLayer* pLayer = NULL;
-        INT32 nNumLayers = 0;
+        sal_Int32 nNumLayers = 0;
 
         while(aIter.IsMore())
         {
@@ -1153,12 +1153,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 
                                     if(aCompareColor == aLocalColor)
                                     {
-                                        bOverlap = FALSE;
+                                        bOverlap = sal_False;
                                     }
                                 }
                                 else if(eLocalFillStyle == XFILL_NONE)
                                 {
-                                    bOverlap = FALSE;
+                                    bOverlap = sal_False;
                                 }
                             }
                         }
@@ -1243,7 +1243,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 |*
 \************************************************************************/
 
-BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
+sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     SdrHdl* pHdl, short nMinMov,
     SdrDragMethod* pForcedMeth)
 {
@@ -1254,25 +1254,25 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     }
     else
     {
-        BOOL bOwnActionNecessary;
+        sal_Bool bOwnActionNecessary;
         if (pHdl == NULL)
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else if (pHdl->IsVertexHdl() || pHdl->IsCornerHdl())
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else
         {
-           bOwnActionNecessary = FALSE;
+           bOwnActionNecessary = sal_False;
         }
 
         if(bOwnActionNecessary && GetMarkedObjectCount() >= 1)
         {
             E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ;
-            BOOL bThereAreRootScenes = FALSE;
-            BOOL bThereAre3DObjects = FALSE;
+            sal_Bool bThereAreRootScenes = sal_False;
+            sal_Bool bThereAre3DObjects = sal_False;
             long nCnt = GetMarkedObjectCount();
             for(long nObjs = 0;nObjs < nCnt;nObjs++)
             {
@@ -1280,9 +1280,9 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                 if(pObj)
                 {
                     if(pObj->ISA(E3dScene) && ((E3dScene*)pObj)->GetScene() == pObj)
-                        bThereAreRootScenes = TRUE;
+                        bThereAreRootScenes = sal_True;
                     if(pObj->ISA(E3dObject))
-                        bThereAre3DObjects = TRUE;
+                        bThereAre3DObjects = sal_True;
                 }
             }
             if( bThereAre3DObjects )
@@ -1358,7 +1358,7 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
 |*
 \************************************************************************/
 
-BOOL E3dView::HasMarkedScene()
+sal_Bool E3dView::HasMarkedScene()
 {
     return (GetMarkedScene() != NULL);
 }
@@ -1371,9 +1371,9 @@ BOOL E3dView::HasMarkedScene()
 
 E3dScene* E3dView::GetMarkedScene()
 {
-    ULONG nCnt = GetMarkedObjectCount();
+    sal_uIntPtr nCnt = GetMarkedObjectCount();
 
-    for ( ULONG i = 0; i < nCnt; i++ )
+    for ( sal_uIntPtr i = 0; i < nCnt; i++ )
         if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
             return (E3dScene*) GetMarkedObjectByIndex(i);
 
@@ -1419,7 +1419,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ)
 {
     Camera3D aCam(pScene->GetCamera());
 
-    aCam.SetAutoAdjustProjection(FALSE);
+    aCam.SetAutoAdjustProjection(sal_False);
     aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
     basegfx::B3DPoint aLookAt;
 
@@ -1583,14 +1583,14 @@ void E3dView::MovAction(const Point& rPnt)
 /*************************************************************************
 |*
 |* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen
-|*          [FG] Mit dem Parameterwert TRUE (SDefault: FALSE) wird einfach ein
+|*          [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein
 |*               Rotationskoerper erzeugt, ohne den Benutzer die Lage der
 |*               Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls
 |*               ein Objekt selektiert ist. (keine Initialisierung noetig)
 |*
 \************************************************************************/
 
-void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
+void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
 {
     ResetCreationActive();
 
@@ -1607,7 +1607,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
             basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
         else
         {
@@ -1620,7 +1620,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y());
             basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
     }
 }
@@ -1672,7 +1672,7 @@ void E3dView::InitView ()
     nVDefaultSegments        = 12;
     aDefaultLightColor       = RGB_Color(COL_WHITE);
     aDefaultAmbientColor     = RGB_Color(COL_BLACK);
-    bDoubleSided             = FALSE;
+    bDoubleSided             = sal_False;
     mpMirrorOverlay = 0L;
 }
 
@@ -1682,13 +1682,13 @@ void E3dView::InitView ()
 |*
 \************************************************************************/
 
-BOOL E3dView::IsBreak3DObjPossible() const
+sal_Bool E3dView::IsBreak3DObjPossible() const
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG i = 0;
+        sal_uIntPtr i = 0;
 
         while (i < nCount)
         {
@@ -1697,11 +1697,11 @@ BOOL E3dView::IsBreak3DObjPossible() const
             if (pObj && pObj->ISA(E3dObject))
             {
                 if(!(((E3dObject*)pObj)->IsBreakObjPossible()))
-                    return FALSE;
+                    return sal_False;
             }
             else
             {
-                return FALSE;
+                return sal_False;
             }
 
             i++;
@@ -1709,10 +1709,10 @@ BOOL E3dView::IsBreak3DObjPossible() const
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -1726,10 +1726,10 @@ void E3dView::Break3DObj()
     if(IsBreak3DObjPossible())
     {
         // ALLE selektierten Objekte werden gewandelt
-        UINT32 nCount = GetMarkedObjectCount();
+        sal_uInt32 nCount = GetMarkedObjectCount();
 
         BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
-        for(UINT32 a=0;a<nCount;a++)
+        for(sal_uInt32 a=0;a<nCount;a++)
         {
             E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);
             BreakSingle3DObj(pObj);
@@ -1772,11 +1772,11 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
 
 void E3dView::MergeScenes ()
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG     nObj    = 0;
+        sal_uIntPtr     nObj    = 0;
         SdrObject *pObj   = GetMarkedObjectByIndex(nObj);
         E3dScene  *pScene = new E3dPolyScene(Get3DDefaultAttributes());
         basegfx::B3DRange aBoundVol;
@@ -1895,29 +1895,29 @@ void E3dView::CheckPossibilities()
     // Weitere Flags bewerten
     if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible)
     {
-        INT32 nMarkCnt = GetMarkedObjectCount();
-        BOOL bCoumpound = FALSE;
-        BOOL b3DObject = FALSE;
-        for(INT32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
+        sal_Int32 nMarkCnt = GetMarkedObjectCount();
+        sal_Bool bCoumpound = sal_False;
+        sal_Bool b3DObject = sal_False;
+        for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
         {
             SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
             if(pObj && pObj->ISA(E3dCompoundObject))
-                bCoumpound = TRUE;
+                bCoumpound = sal_True;
             if(pObj && pObj->ISA(E3dObject))
-                b3DObject = TRUE;
+                b3DObject = sal_True;
         }
 
         // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert.
         // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja,
         // das Gruppieren verbieten.
         if(bGroupPossible && bCoumpound)
-            bGroupPossible = FALSE;
+            bGroupPossible = sal_False;
 
         if(bUnGroupPossible && b3DObject)
-            bUnGroupPossible = FALSE;
+            bUnGroupPossible = sal_False;
 
         if(bGrpEnterPossible && bCoumpound)
-            bGrpEnterPossible = FALSE;
+            bGrpEnterPossible = sal_False;
     }
 }
 
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 8e34e7e997..99a36e453e 100644..100755
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <tools/shl.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
@@ -38,7 +38,7 @@
 #include <svx/fmview.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/e3ditem.hxx>
@@ -59,7 +59,7 @@
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
 {
     SdrObject* pNewObj = NULL;
 
@@ -69,7 +69,7 @@ void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
 
         if (pObj && pObj->ISA(E3dPolyScene))
         {
-            BOOL bBezier = FALSE;
+            sal_Bool bBezier = sal_False;
             pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea);
 
             if (pNewObj)
@@ -119,7 +119,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
     }
 }
 
-SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene,	BOOL /*bOnly3DAttr*/) const
+SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene,	sal_Bool /*bOnly3DAttr*/) const
 {
     // ItemSet mit entspr. Bereich anlegen
     SfxItemSet aSet(
@@ -138,7 +138,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene,	BOOL /*bOnly3DAttr*/) co
     else
     {
         // get attributes from all selected objects
-        MergeAttrFromMarked(aSet, FALSE);
+        MergeAttrFromMarked(aSet, sal_False);
 
         // calc flags for SID_ATTR_3D_INTERN
         const SdrMarkList& rMarkList = GetMarkedObjectList();
@@ -180,7 +180,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene,	BOOL /*bOnly3DAttr*/) co
 |*
 \************************************************************************/
 
-void E3dView::Set3DAttributes( const SfxItemSet& rAttr,	E3dScene* pInScene, BOOL bReplaceAll)
+void E3dView::Set3DAttributes( const SfxItemSet& rAttr,	E3dScene* pInScene, sal_Bool bReplaceAll)
 {
     sal_uInt32 nSelectedItems(0L);
 
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index cb3b42b9f5..557e253b8d 100644..100755
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -186,7 +186,7 @@ void Viewport3D::MakeTransform(void)
             aViewTf *= aTemp;
         }
 
-        bTfValid = TRUE;
+        bTfValid = sal_True;
     }
 }
 
@@ -314,7 +314,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
 void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
 {
     aVRP = rNewVRP;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -327,7 +327,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 {
     aVPN = rNewVPN;
     aVPN.normalize();
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -339,7 +339,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV)
 {
     aVUV = rNewVUV;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -353,7 +353,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
     aPRP = rNewPRP;
     aPRP.setX(0.0);
     aPRP.setY(0.0);
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -365,7 +365,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
 void Viewport3D::SetVPD(double fNewVPD)
 {
     fVPD = fNewVPD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -377,7 +377,7 @@ void Viewport3D::SetVPD(double fNewVPD)
 void Viewport3D::SetNearClipDist(double fNewNCD)
 {
     fNearClipDist = fNewNCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -389,7 +389,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD)
 void Viewport3D::SetFarClipDist(double fNewFCD)
 {
     fFarClipDist = fNewFCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 // eof
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 57e812cd3e..4f6805fdf9 100644..100755
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -388,7 +388,7 @@ namespace svx
             {
                 Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
                 _pContainer->CopyAny(
-                    sal::static_int_cast< USHORT >( getDescriptorFormatId() ),
+                    sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ),
                     aContent );
             }
         }
@@ -494,7 +494,7 @@ namespace svx
     // -----------------------------------------------------------------------------
     sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
     {
-        ULONG nFormat = SotExchange::GetFormat(rFlavor);
+        sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
         switch (nFormat)
         {
             case SOT_FORMATSTR_ID_DBACCESS_TABLE:
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 8f50991d31..8f50991d31 100644..100755
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 6d646171d1..b7550cf018 100644..100755
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -29,12 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "dbexch.hrc"
-#include "fmgridif.hxx"
+#include "svx/dbexch.hrc"
+#include "svx/fmgridif.hxx"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
 #include "svx/fmtools.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmurl.hxx"
 #include "formcontrolfactory.hxx"
@@ -987,7 +987,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         if ( eInspectorAction != eNone )
         {
             FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
-            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE );
+            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
 
             pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
                                       &aIFaceItem, &aShowItem, 0L );
@@ -1060,7 +1060,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
             if	( 1 == GetSelectColumnCount() || IsDesignMode() )
             {
                 sal_uInt16 nSelId = GetColumnId(
-                    sal::static_int_cast< USHORT >( FirstSelectedColumn() ) );
+                    sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
                 ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
 
                 Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
@@ -1272,7 +1272,7 @@ void FmGridControl::DeleteSelectedRows()
 
         // now delete the row
         Sequence <sal_Int32> aDeletedRows;
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
         try
         {
             aDeletedRows = xDeleteThem->deleteRows(aBookmarks);
@@ -1280,7 +1280,7 @@ void FmGridControl::DeleteSelectedRows()
         catch(SQLException&)
         {
         }
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 
         // how many rows are deleted?
         sal_Int32 nDeletedRows = 0;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 51705d673a..3080d773b4 100644..100755
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmgridif.hxx"
+#include "svx/fmgridif.hxx"
 #include "fmprop.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
@@ -39,6 +39,7 @@
 #include "sdbdatacolumn.hxx"
 #include "svx/fmgridcl.hxx"
 #include "svx/svxids.hrc"
+#include <tools/urlobj.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/PosSize.hpp>
@@ -366,7 +367,8 @@ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference
 DBG_NAME(FmXGridControl )
 //------------------------------------------------------------------------------
 FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFactory)
-               :m_aModifyListeners(*this, GetMutex())
+               :UnoControl( _rxFactory)
+               ,m_aModifyListeners(*this, GetMutex())
                ,m_aUpdateListeners(*this, GetMutex())
                ,m_aContainerListeners(*this, GetMutex())
                ,m_aSelectionListeners(*this, GetMutex())
@@ -1973,14 +1975,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) )
     {
-        String sHelpURL(::comphelper::getString(Value));
-        String sPattern;
-        sPattern.AssignAscii("HID:");
-        if (sHelpURL.Equals(sPattern, 0, sPattern.Len()))
-        {
-            String sID = sHelpURL.Copy(sPattern.Len());
-            pGrid->SetHelpId(sID.ToInt32());
-        }
+        ::rtl::OUString sHelpURL;
+        OSL_VERIFY( Value >>= sHelpURL );
+        INetURLObject aHID( sHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+            sHelpURL = aHID.GetURLPath();
+        pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) )
     {
@@ -2076,25 +2076,28 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_HASNAVIGATION ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-            pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue());
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableNavigationBar( bValue );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_RECORDMARKER ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-            pGrid->EnableHandle(*(sal_Bool*)Value.getValue());
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableHandle( bValue );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_ENABLED ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-        {
-            // Im DesignModus nur das Datenfenster disablen
-            // Sonst kann das Control nicht mehr konfiguriert werden
-            if (isDesignMode())
-                pGrid->GetDataWindow().Enable(*(sal_Bool*)Value.getValue());
-            else
-                pGrid->Enable(*(sal_Bool*)Value.getValue());
-        }
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableHandle( bValue );
+
+        // Im DesignModus nur das Datenfenster disablen
+        // Sonst kann das Control nicht mehr konfiguriert werden
+        if (isDesignMode())
+            pGrid->GetDataWindow().Enable( bValue );
+        else
+            pGrid->Enable( bValue );
     }
     else
         VCLXWindow::setProperty( PropertyName, Value );
@@ -2109,7 +2112,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
     Window* pGrid = GetWindow();
     if ( pGrid )
     {
-        Reference< XAccessible > xAcc( pGrid->GetAccessible( TRUE ) );
+        Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) );
         if ( xAcc.is() )
             xContext = xAcc->getAccessibleContext();
         // TODO: this has a slight conceptual problem:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 226dabfb26..2e9ee2bd9a 100644..100755
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -31,7 +31,7 @@
 
 #include <sal/macros.h>
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
 #include "gridcell.hxx"
 #include "gridcols.hxx"
@@ -899,7 +899,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
             {
                 sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY;
                 OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior );
-                USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
+                sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
                 switch ( nWheelBehavior )
                 {
                 case MouseWheelBehavior::SCROLL_DISABLED:   nVclSetting = MOUSE_WHEEL_DISABLE; break;
@@ -914,7 +914,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
                 MouseSettings aMouseSettings = aSettings.GetMouseSettings();
                 aMouseSettings.SetWheelBehavior( nVclSetting );
                 aSettings.SetMouseSettings( aMouseSettings );
-                m_pWindow->SetSettings( aSettings, TRUE );
+                m_pWindow->SetSettings( aSettings, sal_True );
             }
         }
         catch( const Exception& )
@@ -987,7 +987,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
         m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
 
         Font aFont( _rDev.GetFont() );
-        aFont.SetTransparent( TRUE );
+        aFont.SetTransparent( sal_True );
         m_pPainter->SetFont( aFont );
 
         m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
@@ -1194,7 +1194,7 @@ String DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Re
     if ( _rxField.is() )
         try
         {
-            aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType);
+            aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType);
         }
         catch( const Exception& )
         {
@@ -1535,7 +1535,7 @@ String DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::X
             // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst
             // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann
             // ich den Rest (die Formatierung) dem FormattedField ueberlassen.
-            double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType);
+            double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() );
             if (_rxField->wasNull())
                 return aText;
             ((FormattedField*)m_pPainter)->SetValue(dValue);
@@ -1579,7 +1579,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X
             // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst
             // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann
             // ich den Rest (die Formatierung) dem FormattedField ueberlassen.
-            double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType);
+            double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() );
             if (_rxField->wasNull())
                 m_pWindow->SetText(String());
             else
@@ -1654,11 +1654,14 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
 
 namespace
 {
-    void setCheckBoxStyle( Window* _pWindow, USHORT nStyle )
+    void setCheckBoxStyle( Window* _pWindow, bool bMono )
     {
         AllSettings aSettings = _pWindow->GetSettings();
         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-        aStyleSettings.SetCheckBoxStyle( nStyle );
+        if( bMono )
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
+        else
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) );
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );
     }
@@ -1684,8 +1687,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
         sal_Int16 nStyle = awt::VisualEffect::LOOK3D;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle );
 
-        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
-        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
+        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT );
+        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT );
 
         sal_Bool bTristate = sal_True;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate );
@@ -2272,13 +2275,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< DateField* >( m_pWindow )->SetMin( nMin );
         static_cast< DateField* >( m_pWindow )->SetMax( nMax );
         static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat );
         static_cast< DateField* >( m_pPainter )->SetMin( nMin );
         static_cast< DateField* >( m_pPainter )->SetMax( nMax );
         static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -2382,13 +2385,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< TimeField* >( m_pWindow )->SetMin( nMin );
         static_cast< TimeField* >( m_pWindow )->SetMax( nMax );
         static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
         static_cast< TimeField* >( m_pPainter )->SetMin( nMin );
         static_cast< TimeField* >( m_pPainter )->SetMax( nMax );
         static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -2554,7 +2557,7 @@ String DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn
     if (_rxField.is())
         try
         {
-            aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType );
+            aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType );
         }
         catch( const Exception& )
         {
@@ -2953,13 +2956,13 @@ sal_Bool DbFilterField::commitControl()
         case ::com::sun::star::form::FormComponentType::CHECKBOX:
             return sal_True;
         case ::com::sun::star::form::FormComponentType::LISTBOX:
+            aText.Erase();
             if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount())
             {
                 sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos();
-                aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos];
+                if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) )
+                    aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos];
             }
-            else
-                aText.Erase();
 
             if (m_aText != aText)
             {
@@ -3164,7 +3167,7 @@ void DbFilterField::Update()
 
             while (!xListCursor->isAfterLast() && i++ < SHRT_MAX) // max anzahl eintraege
             {
-                aStr = getValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType);
+                aStr = getFormattedValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType);
                 aStringList.push_back(aStr);
                 xListCursor->next();
             }
@@ -3496,7 +3499,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -3905,7 +3908,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4063,7 +4066,7 @@ Window* FmXCheckBoxCell::getEventWindow() const
 }
 
 //------------------------------------------------------------------
-void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4400,7 +4403,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
 }
 
 //------------------------------------------------------------------
-void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     if  (   ( &_rWindow == m_pBox )
         &&  ( _nEventId == VCLEVENT_LISTBOX_SELECT )
@@ -4614,7 +4617,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
 }
 
 //------------------------------------------------------------------------------
-void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
 
     switch ( _nEventId )
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index aa6c9132ed..aa6c9132ed 100644..100755
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 47a8a1ff9a..a6d4458991 100644..100755
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -58,7 +58,7 @@
 #include <vcl/sound.hxx>
 #include <vcl/menu.hxx>
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 #include <svx/svxids.hrc>
 #include <tools/shl.hxx>
@@ -777,7 +777,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
     {
         case STATE_CHANGE_MIRRORING:
         {
-            BOOL bIsRTLEnabled = IsRTLEnabled();
+            sal_Bool bIsRTLEnabled = IsRTLEnabled();
             for ( size_t i=0; i < SAL_N_ELEMENTS( pWindows ); ++i )
                 pWindows[i]->EnableRTL( bIsRTLEnabled );
         }
@@ -938,7 +938,7 @@ DbGridControl::DbGridControl(
             ,m_nDeleteEvent(0)
             ,m_nOptions(OPT_READONLY)
             ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE)
-            ,m_nLastColId((USHORT)-1)
+            ,m_nLastColId((sal_uInt16)-1)
             ,m_nLastRowId(-1)
             ,m_bDesignMode(sal_False)
             ,m_bRecordCountFinal(sal_False)
@@ -2334,7 +2334,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
     if (nNewPos < 0)	// keine Position gefunden
         return;
 
-    m_bInAdjustDataSource = TRUE;
+    m_bInAdjustDataSource = sal_True;
     if (nNewPos != m_nCurrentPos)
     {
         if (m_bSynchDisplay)
@@ -2352,7 +2352,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
         SetCurrent(nNewPos);
         RowModified(nNewPos);
     }
-    m_bInAdjustDataSource = FALSE;
+    m_bInAdjustDataSource = sal_False;
 
     // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben
     SetNoSelection();
@@ -2745,7 +2745,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
     }
 }
 // -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const
+String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     size_t Location = GetModelColumnPos( _nColId );
     DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
@@ -3649,7 +3649,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const
 }
 
 //------------------------------------------------------------------------------
-void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
+void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows)
 {
     TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
     ::osl::MutexGuard aGuard(m_aAdjustSafety);
@@ -3882,7 +3882,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde
 // -----------------------------------------------------------------------------
 Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
-    USHORT nColumnId = GetColumnId( _nColumnPos );
+    sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
     size_t Location = GetModelColumnPos(nColumnId);
     DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
     if ( pColumn )
@@ -3904,7 +3904,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
                     eValue = STATE_DONTKNOW;
                     break;
             }
-            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE );
+            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True );
         }
     }
     return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos );
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index f6e4c16404..611df77f0b 100644..100755
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -25,10 +25,12 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include "globlmn.hrc"
 #include "fmhelp.hrc"
+#include <svx/svxcommands.h>
+
 Menu RID_SVXMNU_ROWS
 {
     ItemList =
@@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS
         MenuItem
         {
             Identifier = SID_FM_DELETEROWS ;
-            HelpID = SID_FM_DELETEROWS ;
+            HelpId = HID_FM_DELETEROWS ;
             Text [ en-US ] = "Delete Rows" ;
         };
         MenuItem
         {
             Identifier = SID_FM_RECORD_SAVE ;
-            HelpID = SID_FM_RECORD_SAVE ;
+            HelpId = CMD_SID_FM_RECORD_SAVE ;
             Text [ en-US ] = "Save Record" ;
         };
         MenuItem
         {
             Identifier = SID_FM_RECORD_UNDO ;
-            HelpID = SID_FM_RECORD_UNDO ;
+            HelpId = CMD_SID_FM_RECORD_UNDO ;
             Text [ en-US ] = "Undo: Data entry" ;
         };
     };
@@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS
         MenuItem
         {
             Identifier = SID_FM_INSERTCOL ;
-            HelpID = SID_FM_INSERTCOL ;
+            HelpId = HID_FM_INSERTCOL ;
             Text [ en-US ] = "Insert ~Column" ;
             SubMenu = Menu
             {
@@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS
                     MenuItem
                     {
                         Identifier = SID_FM_EDIT ;
-                        HelpID = SID_FM_EDIT ;
+                        HelpId = CMD_SID_FM_EDIT ;
                         Text [ en-US ] = "Text Box" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_CHECKBOX ;
-                        HelpID = SID_FM_CHECKBOX ;
+                        HelpId = CMD_SID_FM_CHECKBOX ;
                         Text [ en-US ] = "Check Box" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_COMBOBOX ;
-                        HelpID = SID_FM_COMBOBOX ;
+                        HelpId = CMD_SID_FM_COMBOBOX ;
                         Text [ en-US ] = "Combo Box" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_LISTBOX ;
-                        HelpID = SID_FM_LISTBOX ;
+                        HelpId = CMD_SID_FM_LISTBOX ;
                         Text [ en-US ] = "List Box" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_DATEFIELD ;
-                        HelpID = SID_FM_DATEFIELD ;
+                        HelpId = CMD_SID_FM_DATEFIELD ;
                         Text [ en-US ] = "Date Field" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_TIMEFIELD ;
-                        HelpID = SID_FM_TIMEFIELD ;
+                        HelpId = CMD_SID_FM_TIMEFIELD ;
                         Text [ en-US ] = "Time Field" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_NUMERICFIELD ;
-                        HelpID = SID_FM_NUMERICFIELD ;
+                        HelpId = CMD_SID_FM_NUMERICFIELD ;
                         Text [ en-US ] = "Numeric Field" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_CURRENCYFIELD ;
-                        HelpID = SID_FM_CURRENCYFIELD ;
+                        HelpId = CMD_SID_FM_CURRENCYFIELD ;
                         Text [ en-US ] = "Currency Field" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_PATTERNFIELD ;
-                        HelpID = SID_FM_PATTERNFIELD ;
+                        HelpId = CMD_SID_FM_PATTERNFIELD ;
                         Text [ en-US ] = "Pattern Field" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_FORMATTEDFIELD ;
-                        HelpID = SID_FM_FORMATTEDFIELD ;
+                        HelpId = CMD_SID_FM_FORMATTEDFIELD ;
                         Text [ en-US ] = "Formatted Field" ;
                     };
                     MenuItem
@@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS
         MenuItem
         {
             Identifier = SID_FM_CHANGECOL ;
-            HelpID = SID_FM_CHANGECOL ;
+            HelpId = HID_FM_CHANGECOL ;
             Text [ en-US ] = "~Replace with" ;
         };
         MenuItem
         {
             Identifier = SID_FM_DELETECOL ;
-            HelpID = SID_FM_DELETECOL ;
+            HelpId = HID_FM_DELETECOL ;
             Text [ en-US ] = "Delete Column" ;
         };
         MenuItem
         {
             Identifier = SID_FM_HIDECOL ;
-            HelpID = SID_FM_HIDECOL ;
+            HelpId = HID_FM_HIDECOL ;
             Text [ en-US ] = "~Hide Column";
         };
         MenuItem
         {
             Identifier = SID_FM_SHOWCOLS ;
-            HelpID = SID_FM_SHOWCOLS ;
+            HelpId = HID_FM_SHOWCOLS ;
             SubMenu = Menu
             {
                 ItemList =
@@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS
                     MenuItem
                     {
                         Identifier = SID_FM_SHOWCOLS_MORE ;
-                        HelpID = SID_FM_SHOWCOLS_MORE ;
+                        HelpId = HID_FM_SHOWCOLS_MORE ;
                         Text [ en-US ] = "~More...";
                     };
                     MenuItem
@@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS
                     MenuItem
                     {
                         Identifier = SID_FM_SHOWALLCOLS ;
-                        HelpID = SID_FM_SHOWALLCOLS ;
+                        HelpId = HID_FM_SHOWALLCOLS ;
                         Text [ en-US ] = "~All";
                     };
                 };
@@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS
         MenuItem
         {
             Identifier = SID_FM_SHOW_PROPERTY_BROWSER ;
-            HelpID = SID_FM_SHOW_PROPERTY_BROWSER ;
+            HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ;
             Text [ en-US ] = "Column..." ;
         };
     };
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
deleted file mode 100644
index aa4e9eaba1..0000000000
--- a/svx/source/fmcomp/makefile.mk
+++ /dev/null
@@ -1,63 +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=svx
-TARGET=fmcomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=fmcomp
-SRC1FILES= \
-    gridctrl.src	
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-    $(SLO)$/dbaexchange.obj	\
-    $(SLO)$/gridcols.obj	\
-    $(SLO)$/gridctrl.obj	\
-    $(SLO)$/gridcell.obj	\
-    $(SLO)$/fmgridcl.obj	\
-    $(SLO)$/fmgridif.obj	\
-    $(SLO)$/trace.obj       \
-    $(SLO)$/xmlexchg.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-    $(SLO)$/dbaobjectex.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index b43aece3d8..c1e0e387dc 100644..100755
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -37,7 +37,7 @@
 
 //------------------------------------------------------------------------------
 ::osl::Mutex Tracer::s_aMapSafety;
-::std::map< ::oslThreadIdentifier, INT32, ::std::less< oslThreadIdentifier > >
+::std::map< ::oslThreadIdentifier, sal_Int32, ::std::less< oslThreadIdentifier > >
         Tracer::s_aThreadIndents;
 
 //------------------------------------------------------------------------------
@@ -45,13 +45,13 @@ Tracer::Tracer(const char* _pBlockDescription)
     :m_sBlockDescription(_pBlockDescription)
 {
     ::osl::MutexGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
+    sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -65,13 +65,13 @@ Tracer::Tracer(const char* _pBlockDescription)
 Tracer::~Tracer()
 {
     ::osl::MutexGuard aGuard(s_aMapSafety);
-    INT32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -85,13 +85,13 @@ Tracer::~Tracer()
 void Tracer::TraceString(const char* _pMessage)
 {
     ::osl::MutexGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -106,13 +106,13 @@ void Tracer::TraceString(const char* _pMessage)
 void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
 {
     ::osl::MutexGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index c1d1bc43aa..a04aedb430 100644..100755
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 8e74a34e82..b04a0b7340 100644..100755
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -30,9 +30,9 @@
 #include "precompiled_svx.hxx"
 
 #include <sal/macros.h>
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include "stringlistresource.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 #include <svx/dialmgr.hxx>
 
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 5b75dbe2f3..5b75dbe2f3 100644..100755
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index ce6842e9b8..19fc170b93 100644..100755
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -32,7 +32,7 @@
 #include "svx/databaselocationinput.hxx"
 #include "svx/dialmgr.hxx"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 7488ea83c8..7488ea83c8 100644..100755
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 4609a56d36..08459034e4 100644..100755
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -34,12 +34,12 @@
 #include "fmservs.hxx"
 
 #include "datanavi.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxids.hrc>
 #include <tools/rcid.h>
 #include <tools/diagnose_ex.h>
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/fmshell.hxx>
 #include <svtools/miscopt.hxx>
@@ -267,7 +267,7 @@ namespace svxform
         return pMenu;
     }
 
-    void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+    void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
     {
         m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry );
     }
@@ -283,7 +283,7 @@ namespace svxform
 
     void DataTreeListBox::DeleteAndClear()
     {
-        ULONG i, nCount = GetEntryCount();
+        sal_uIntPtr i, nCount = GetEntryCount();
         for ( i = 0; i < nCount; ++i )
         {
             SvLBoxEntry* pEntry = GetEntry(i);
@@ -352,7 +352,7 @@ namespace svxform
         WinBits nBits = WB_BORDER | WB_TABSTOP | WB_HIDESELECTION | WB_NOINITIALSELECTION;
         if ( DGTInstance == m_eGroup || DGTSubmission == m_eGroup )
             nBits |= WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT;
-        m_aItemList.SetWindowBits( m_aItemList.GetStyle() | nBits  );
+        m_aItemList.SetStyle( m_aItemList.GetStyle() | nBits  );
         m_aItemList.Show();
         ItemSelectHdl( &m_aItemList );
     }
@@ -411,7 +411,7 @@ namespace svxform
                     {
                         ItemNode* pNode = new ItemNode( xChild );
                         SvLBoxEntry* pEntry = m_aItemList.InsertEntry(
-                            sName, aExpImg, aCollImg, _pParent, FALSE, LIST_APPEND, pNode );
+                            sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode );
                         if ( xChild->hasAttributes() )
                         {
                             Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
@@ -427,7 +427,7 @@ namespace svxform
                                         m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails );
                                     m_aItemList.InsertEntry(
                                         sAttrName, aExpImg, aCollImg,
-                                        pEntry, FALSE, LIST_APPEND, pNode );
+                                        pEntry, sal_False, LIST_APPEND, pNode );
                                 }
                             }
                         }
@@ -443,7 +443,7 @@ namespace svxform
         }
     }
     //------------------------------------------------------------------------
-    bool XFormsPage::DoToolBoxAction( USHORT _nToolBoxID ) {
+    bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) {
 
         bool bHandled = false;
         bool bIsDocModified = false;
@@ -470,7 +470,7 @@ namespace svxform
                         xSubmissions->insert( makeAny( xNewSubmission ) );
                         Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY );
                         SvLBoxEntry* pEntry = AddEntry( xNewPropSet );
-                        m_aItemList.Select( pEntry, TRUE );
+                        m_aItemList.Select( pEntry, sal_True );
                         bIsDocModified = true;
                     }
                     catch ( Exception& )
@@ -486,7 +486,7 @@ namespace svxform
                 ItemNode* pNode = NULL;
                 Reference< css::xml::dom::XNode > xParentNode;
                 Reference< XPropertySet > xNewBinding;
-                USHORT nResId = 0;
+                sal_uInt16 nResId = 0;
                 bool bIsElement = true;
                 if ( DGTInstance == m_eGroup )
                 {
@@ -597,7 +597,7 @@ namespace svxform
                     {
                         SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement );
                         m_aItemList.MakeVisible( pNewEntry );
-                        m_aItemList.Select( pNewEntry, TRUE );
+                        m_aItemList.Select( pNewEntry, sal_True );
                         bIsDocModified = true;
                     }
                     else
@@ -623,7 +623,7 @@ namespace svxform
                     if ( RET_OK == nReturn )
                     {
                         SvLBoxEntry* pNewEntry = AddEntry( xNewBinding );
-                        m_aItemList.Select( pNewEntry, TRUE );
+                        m_aItemList.Select( pNewEntry, sal_True );
                         bIsDocModified = true;
                     }
                     else
@@ -664,7 +664,7 @@ namespace svxform
 
                     AddDataItemDialog aDlg( this, pNode, m_xUIHelper );
                     DataItemType eType = DITElement;
-                    USHORT nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+                    sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
                     if ( pNode && pNode->m_xNode.is() )
                     {
                         try
@@ -776,7 +776,7 @@ namespace svxform
     {
         SvLBoxEntry* pParent = m_aItemList.FirstSelected();
         const ImageList& rImageList = m_pNaviWin->GetItemImageList();
-        USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
+        sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
         Image aImage = rImageList.GetImage( nImageID );
         ::rtl::OUString sName;
         try
@@ -789,7 +789,7 @@ namespace svxform
             DBG_UNHANDLED_EXCEPTION();
         }
         return m_aItemList.InsertEntry(
-            sName, aImage, aImage, pParent, FALSE, LIST_APPEND, _pNewNode );
+            sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode );
     }
     //------------------------------------------------------------------------
     class lcl_ResourceString
@@ -993,7 +993,7 @@ namespace svxform
             {
                 // ID
                 _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
-                pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+                pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
                 // Action
                 _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
                 String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
@@ -1037,7 +1037,7 @@ namespace svxform
                 _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp;
                 sName += String( sTemp );
                 pEntry = m_aItemList.InsertEntry(
-                    sName, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+                    sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
             }
             catch ( Exception& )
             {
@@ -1074,7 +1074,7 @@ namespace svxform
                 _rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
                 String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
                 sEntry += String( sTemp );
-                ULONG nPos = 0;
+                sal_uIntPtr nPos = 0;
                 SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ );
                 m_aItemList.SetEntryText( pChild, sEntry );
                 _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -1125,7 +1125,7 @@ namespace svxform
                     DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
                     css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
-                    USHORT nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
+                    sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
                     String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME;
                     QueryBox aQBox( this, SVX_RES( nResId ) );
                     String sMessText = aQBox.GetMessText();
@@ -1157,7 +1157,7 @@ namespace svxform
             {
                 DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
                 bool bSubmission = ( DGTSubmission == m_eGroup );
-                USHORT nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
+                sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
                 rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
                 String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME;
                 rtl::OUString sName;
@@ -1204,7 +1204,7 @@ namespace svxform
 
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
         {
-            USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+            sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
             switch ( nCode )
             {
@@ -1228,7 +1228,7 @@ namespace svxform
         m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize );
     }
     //------------------------------------------------------------------------
-    String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, USHORT _nPagePos )
+    String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos )
     {
         DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" );
 
@@ -1254,7 +1254,7 @@ namespace svxform
                         Reference < XEnumeration > xNum = xNumAccess->createEnumeration();
                         if ( xNum.is() && xNum->hasMoreElements() )
                         {
-                            USHORT nIter = 0;
+                            sal_uInt16 nIter = 0;
                             while ( xNum->hasMoreElements() )
                             {
                                 if ( nIter == _nPagePos )
@@ -1351,7 +1351,7 @@ namespace svxform
 
                                     ItemNode* pNode = new ItemNode( xPropSet );
                                     m_aItemList.InsertEntry(
-                                        sEntry, aImage1, aImage2, NULL, FALSE, LIST_APPEND, pNode );
+                                        sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode );
                                 }
                             }
                         }
@@ -1428,7 +1428,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    bool XFormsPage::DoMenuAction( USHORT _nMenuID )
+    bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
     {
         return DoToolBoxAction( _nMenuID );
     }
@@ -1436,14 +1436,14 @@ namespace svxform
     //------------------------------------------------------------------------
     void XFormsPage::EnableMenuItems( Menu* _pMenu )
     {
-        BOOL bEnableAdd = FALSE;
-        BOOL bEnableEdit = FALSE;
-        BOOL bEnableRemove = FALSE;
+        sal_Bool bEnableAdd = sal_False;
+        sal_Bool bEnableEdit = sal_False;
+        sal_Bool bEnableRemove = sal_False;
 
         SvLBoxEntry* pEntry = m_aItemList.FirstSelected();
         if ( pEntry )
         {
-            bEnableAdd = TRUE;
+            bEnableAdd = sal_True;
             bool bSubmitChild = false;
             if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) )
             {
@@ -1453,10 +1453,10 @@ namespace svxform
             ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
             if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
             {
-                bEnableEdit = TRUE;
+                bEnableEdit = sal_True;
                 bEnableRemove = ( bSubmitChild != true );
                 if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) )
-                    bEnableRemove = FALSE;
+                    bEnableRemove = sal_False;
                 if ( pNode->m_xNode.is() )
                 {
                     try
@@ -1465,7 +1465,7 @@ namespace svxform
                         if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE
                             && eChildType != css::xml::dom::NodeType_DOCUMENT_NODE )
                         {
-                            bEnableAdd = FALSE;
+                            bEnableAdd = sal_False;
                         }
                     }
                     catch ( Exception& )
@@ -1476,7 +1476,7 @@ namespace svxform
             }
         }
         else if ( m_eGroup != DGTInstance )
-            bEnableAdd = TRUE;
+            bEnableAdd = sal_True;
 
         m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd );
         m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd );
@@ -1494,8 +1494,8 @@ namespace svxform
         }
         if ( DGTInstance == m_eGroup )
         {
-            USHORT nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
-            USHORT nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+            sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+            sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
             if ( pEntry )
             {
                 ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1592,7 +1592,7 @@ namespace svxform
         pMenu->SetItemBits( MID_SHOW_DETAILS, MIB_CHECKABLE );
         pMenu->CheckItem( MID_SHOW_DETAILS, m_bShowDetails );
 
-        m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nPageId ) );
+        m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nPageId ) );
         ActivatePageHdl( &m_aTabCtrl );
 
         // get our frame
@@ -1636,7 +1636,7 @@ namespace svxform
     // -----------------------------------------------------------------------
     IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox )
     {
-        USHORT nPos = m_aModelsBox.GetSelectEntryPos();
+        sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos();
         // pBox == NULL, if you want to force a new fill.
         if ( nPos != m_nLastSelectedPos || !pBox )
         {
@@ -1653,7 +1653,7 @@ namespace svxform
     {
         bool bIsDocModified = false;
         Reference< css::xforms::XFormsUIHelper1 > xUIHelper;
-        USHORT nSelectedPos = m_aModelsBox.GetSelectEntryPos();
+        sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos();
         ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
         Reference< css::xforms::XModel > xModel;
         try
@@ -1709,7 +1709,7 @@ namespace svxform
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ),
                                         makeAny( sal_Bool( !bDocumentData ) ) );
 
-                                    USHORT nNewPos = m_aModelsBox.InsertEntry( sNewName );
+                                    sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName );
                                     m_aModelsBox.SelectEntryPos( nNewPos );
                                     ModelSelectHdl( &m_aModelsBox );
                                     bIsDocModified = true;
@@ -1826,7 +1826,7 @@ namespace svxform
                     AddInstanceDialog aDlg( this, false );
                     if ( aDlg.Execute() == RET_OK )
                     {
-                        USHORT nInst = GetNewPageId();
+                        sal_uInt16 nInst = GetNewPageId();
                         ::rtl::OUString sName = aDlg.GetName();
                         ::rtl::OUString sURL = aDlg.GetURL();
                         bool bLinkOnce = aDlg.IsLinkInstance();
@@ -1852,7 +1852,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_EDIT :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1889,7 +1889,7 @@ namespace svxform
                 }
                 case MID_INSTANCES_REMOVE :
                 {
-                    USHORT nId = 0;
+                    sal_uInt16 nId = 0;
                     XFormsPage* pPage = GetCurrentPage( nId );
                     if ( pPage )
                     {
@@ -1989,7 +1989,7 @@ namespace svxform
     // -----------------------------------------------------------------------
     IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
     {
-        USHORT nId = 0;
+        sal_uInt16 nId = 0;
         XFormsPage* pPage = GetCurrentPage( nId );
         if ( pPage )
         {
@@ -2007,7 +2007,7 @@ namespace svxform
         return 0;
     }
     // -----------------------------------------------------------------------
-    XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId )
+    XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
     {
         rCurId = m_aTabCtrl.GetCurPageId();
         XFormsPage* pPage = NULL;
@@ -2040,7 +2040,7 @@ namespace svxform
 
         if ( rCurId > TID_INSTANCE )
         {
-            USHORT nPos = m_aTabCtrl.GetPagePos( rCurId );
+            sal_uInt16 nPos = m_aTabCtrl.GetPagePos( rCurId );
             if ( HasFirstInstancePage() && nPos > 0 )
                 nPos--;
             if ( m_aPageList.size() > nPos )
@@ -2121,8 +2121,8 @@ namespace svxform
             Reference< css::xforms::XModel > xFormsModel;
             if ( aAny >>= xFormsModel )
             {
-                USHORT nPagePos = TAB_PAGE_NOTFOUND;
-                USHORT nId = 0;
+                sal_uInt16 nPagePos = TAB_PAGE_NOTFOUND;
+                sal_uInt16 nId = 0;
                 XFormsPage* pPage = GetCurrentPage( nId );
                 DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" );
                 if ( nId >= TID_INSTANCE )
@@ -2235,7 +2235,7 @@ namespace svxform
             }
         }
 
-        USHORT nPageId = GetNewPageId();
+        sal_uInt16 nPageId = GetNewPageId();
         if ( sInstName.getLength() == 0 )
         {
             DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
@@ -2253,9 +2253,9 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    USHORT DataNavigatorWindow::GetNewPageId() const
+    sal_uInt16 DataNavigatorWindow::GetNewPageId() const
     {
-        USHORT i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
+        sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
         for ( i = 0; i < nCount; ++i )
         {
             if ( nMax < m_aTabCtrl.GetPageId(i) )
@@ -2591,7 +2591,7 @@ namespace svxform
                 sPropName = PN_READONLY_EXPR;
             else if ( &m_aCalculateCB == pBox )
                 sPropName = PN_CALCULATE_EXPR;
-            bool bIsChecked = ( pBox->IsChecked() != FALSE );
+            bool bIsChecked = ( pBox->IsChecked() != sal_False );
             m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
             if ( bIsChecked && sTemp.getLength() == 0 )
                 sTemp = TRUE_VALUE;
@@ -2883,19 +2883,19 @@ namespace svxform
                 {
                     if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aRequiredCB.Check( TRUE );
+                        m_aRequiredCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aRelevantCB.Check( TRUE );
+                        m_aRelevantCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aConstraintCB.Check( TRUE );
+                        m_aConstraintCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aReadonlyCB.Check( TRUE );
+                        m_aReadonlyCB.Check( sal_True );
                     if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
                         && sTemp.getLength() > 0 )
-                        m_aCalculateCB.Check( TRUE );
+                        m_aCalculateCB.Check( sal_True );
                 }
                 catch ( Exception& )
                 {
@@ -2965,7 +2965,7 @@ namespace svxform
                         rtl::OUString sTemp;
                         if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
                         {
-                            USHORT nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
+                            sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
                             if ( LISTBOX_ENTRY_NOTFOUND == nPos )
                                 nPos = m_aDataTypeLB.InsertEntry( sTemp );
                             m_aDataTypeLB.SelectEntryPos( nPos );
@@ -3200,7 +3200,7 @@ namespace svxform
     //------------------------------------------------------------------------
     IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *,  EMPTYARG )
     {
-        BOOL bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
+        sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
         m_aEditNamespaceBtn.Enable( bEnable );
         m_aDeleteNamespaceBtn.Enable( bEnable );
 
@@ -3589,7 +3589,7 @@ namespace svxform
 
                 m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
                 sTemp = lcl_MethodString::get().toUI( sTemp );
-                USHORT nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
+                sal_uInt16 nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
                 if ( LISTBOX_ENTRY_NOTFOUND == nPos )
                     nPos = m_aMethodLB.InsertEntry( sTemp );
                 m_aMethodLB.SelectEntryPos( nPos );
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 904d2fefb9..1040d3af19 100644..100755
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -27,13 +27,14 @@
 
 #include "datanavi.hrc"
 #include "globlmn.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
 #define MASKCOLOR	MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 
 TabPage RID_SVX_XFORMS_TABPAGES
 {
+    HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES";
     Hide = TRUE ;
     DialogControl = TRUE;
     Size = MAP_APPFONT ( 63 , 100 ) ;
@@ -336,6 +337,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     Edit ED_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME";
         Pos = MAP_APPFONT ( 78 , 14 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -349,12 +351,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     Edit ED_DEFAULT
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT";
         Pos = MAP_APPFONT ( 78 , 29 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_DEFAULT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT";
         Pos = MAP_APPFONT ( 160 , 29 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -376,6 +380,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     ListBox LB_DATATYPE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE";
         Pos = MAP_APPFONT ( 78 , 55 ) ;
         Size = MAP_APPFONT ( 96 , 45 ) ;
         Border = TRUE ;
@@ -383,6 +388,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_REQUIRED
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED";
         Pos = MAP_APPFONT ( 6 , 72 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -390,6 +396,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_REQUIRED
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED";
         Pos = MAP_APPFONT ( 78 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -397,6 +404,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_RELEVANT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT";
         Pos = MAP_APPFONT ( 6 , 89 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -404,6 +412,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_RELEVANT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT";
         Pos = MAP_APPFONT ( 78 , 87 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -411,6 +420,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_CONSTRAINT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT";
         Pos = MAP_APPFONT ( 6 , 106 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -418,6 +428,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_CONSTRAINT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT";
         Pos = MAP_APPFONT ( 78 , 104 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -425,6 +436,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_READONLY
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY";
         Pos = MAP_APPFONT ( 6 , 123 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -432,6 +444,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_READONLY
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY";
         Pos = MAP_APPFONT ( 78 , 121 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -439,6 +452,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_CALCULATE
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE";
         Pos = MAP_APPFONT ( 6 , 140 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -446,6 +460,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_CALCULATE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE";
         Pos = MAP_APPFONT ( 78 , 138 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -562,6 +577,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
     };
     MultiLineEdit ED_CONDITION
     {
+        HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 198 , 34 ) ;
@@ -587,6 +603,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
     };
     PushButton PB_EDIT_NAMESPACES
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES";
         Pos = MAP_APPFONT ( 132 , 102 ) ;
         Size = MAP_APPFONT ( 72 , 14 ) ;
         TabStop = TRUE ;
@@ -643,6 +660,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_ADD_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -650,6 +668,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_EDIT_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -657,6 +676,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_DELETE_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -713,6 +733,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
     };
     Edit ED_PREFIX
     {
+        HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE;
@@ -726,6 +747,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
     };
     Edit ED_URL
     {
+        HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL";
         Pos = MAP_APPFONT ( 54 , 14 ) ;
         Size = MAP_APPFONT ( 150 , 12 ) ;
         Border = TRUE;
@@ -783,6 +805,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME";
         Pos = MAP_APPFONT ( 78 , 14 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -796,6 +819,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_ACTION
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION";
         Pos = MAP_APPFONT ( 78 , 29 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -809,6 +833,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_METHOD
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD";
         Pos = MAP_APPFONT ( 78 , 44 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -823,12 +848,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_REF
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF";
         Pos = MAP_APPFONT ( 78 , 60 ) ;
         Size = MAP_APPFONT ( 79, 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_SUBMIT_REF
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF";
         Pos = MAP_APPFONT ( 159 , 59 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -843,6 +870,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_BIND
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND";
         Pos = MAP_APPFONT ( 78 , 75 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -857,6 +885,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_REPLACE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE";
         Pos = MAP_APPFONT ( 78 , 90 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -937,12 +966,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL
     };
     Edit ED_INST_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME";
         Pos = MAP_APPFONT ( 60 , 14 ) ;
         Size = MAP_APPFONT ( 114 , 12 ) ;
         Border = TRUE ;
     };
     CheckBox CB_MODIFIES_DOCUMENT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT";
         Pos = MAP_APPFONT( 6, 32 );
         Size = MAP_APPFONT( 168, 16 );
         Top = TRUE;
@@ -1003,6 +1034,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     Edit ED_INST_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME";
         Pos = MAP_APPFONT ( 60 , 14 ) ;
         Size = MAP_APPFONT ( 144 , 12 ) ;
         Border = TRUE ;
@@ -1016,6 +1048,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     ComboBox ED_INST_URL
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL";
         Pos = MAP_APPFONT ( 60 , 29 ) ;
         Size = MAP_APPFONT ( 127 , 48 ) ;
         DropDown = TRUE ;
@@ -1023,6 +1056,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     PushButton PB_FILEPICKER
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER";
         Pos = MAP_APPFONT ( 190 , 28 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -1030,6 +1064,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     CheckBox CB_INST_LINKINST
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST";
         Pos = MAP_APPFONT ( 6 , 44 ) ;
         Size = MAP_APPFONT ( 198 , 10 ) ;
         TabStop = TRUE ;
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index 3e9b4ff8a5..3e9b4ff8a5 100644..100755
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index f97f0b230b..5693b175f9 100644..100755
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -62,7 +62,7 @@ namespace svxform
     //--------------------------------------------------------------------
     ODbtoolsClient::ODbtoolsClient()
     {
-        m_bCreateAlready = FALSE;
+        m_bCreateAlready = sal_False;
     }
 
     //--------------------------------------------------------------------
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 95a08c1589..95a08c1589 100644..100755
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 7651129109..72aeda302c 100644..100755
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -35,7 +35,7 @@
 #include "fmhelp.hrc"
 #include "fmitems.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -1250,7 +1250,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r
     if (aText.Len() == 0)
     {
         // deleting the entry asynchron
-        ULONG nEvent;
+        sal_uLong nEvent;
         PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnRemove), pEntry);
     }
     else
@@ -1899,7 +1899,7 @@ void FmFilterNavigator::DeleteSelection()
     }
 
     // Remove the selection
-    SelectAll(FALSE);
+    SelectAll(sal_False);
 
     for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin();
         // link problems with operator ==
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index 36c12a001e..dc4e64388b 100644..100755
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -26,7 +26,9 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
+#include "fmhelp.hrc"
+
 Menu RID_FM_FILTER_MENU
 {
     ItemList =
@@ -34,54 +36,27 @@ Menu RID_FM_FILTER_MENU
         MenuItem
         {
             Identifier = SID_FM_DELETE ;
-            HelpID = SID_FM_DELETE ;
+            HelpId = HID_FM_DELETE;
             Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_EDIT ;
-            HelpID = SID_FM_FILTER_EDIT ;
+            HelpId = HID_FM_FILTER_EDIT;
             Text [ en-US ] = "~Edit" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_IS_NULL ;
-            HelpID = SID_FM_FILTER_IS_NULL ;
+            HelpId = HID_FM_FILTER_IS_NULL;
             Text [ en-US ] = "~Is Null" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_IS_NOT_NULL ;
-            HelpID = SID_FM_FILTER_IS_NOT_NULL ;
+            HelpId = HID_FM_FILTER_IS_NOT_NULL;
             Text [ en-US ] = "I~s not Null" ;
         };
     };
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 7538158a16..16b860402d 100644..100755
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -34,7 +34,7 @@
 #include "fmhelp.hrc"
 #include "fmprop.hrc"
 #include "fmPropBrw.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmpgeimp.hxx"
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index fbbd9eb15c..fbbd9eb15c 100644..100755
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index f812c56f0b..f812c56f0b 100644..100755
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 70aaa82878..70aaa82878 100644..100755
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index bbef532dd0..bbef532dd0 100644..100755
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 899d292381..899d292381 100644..100755
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 013cd2d3eb..eb882db2dc 100644..100755
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -33,7 +33,7 @@
 #include <sot/storage.hxx>
 #include <svl/itempool.hxx>
 
-#include <dbexch.hrc>
+#include <svx/dbexch.hrc>
 #include <sot/formats.hxx>
 #include <svtools/svtreebx.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 6505bc9628..15f2d6d710 100644..100755
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
 
@@ -45,7 +45,7 @@
 
 #include "fmprop.hrc"
 #include <svx/dialmgr.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <fmundo.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index fb7ea13d99..f4d56d3240 100644..100755
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -26,9 +26,12 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
 #include "globlmn.hrc"
+#include <svx/svxcommands.h>
+#include "fmhelp.hrc"
+
 Menu RID_FMEXPLORER_POPUPMENU
 {
     ItemList =
@@ -36,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_NEW ;
-            HelpID = SID_FM_NEW ;
+            HelpId = HID_FM_NEW ;
             Text [ en-US ] = "~New" ;
             SubMenu = Menu
             {
@@ -45,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU
                     MenuItem
                     {
                         Identifier = SID_FM_NEW_FORM ;
-                        HelpID = SID_FM_NEW_FORM ;
+                        HelpId = HID_FM_NEW_FORM ;
                         Text [ en-US ] = "Form" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_NEW_HIDDEN ;
-                        HelpID = SID_FM_NEW_HIDDEN ;
+                        HelpId = HID_FM_NEW_HIDDEN ;
                         Text [ en-US ] = "Hidden Control" ;
                     };
                 };
@@ -60,7 +63,7 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_CHANGECONTROLTYPE ;
-            HelpID = SID_FM_CHANGECONTROLTYPE ;
+            HelpId = CMD_SID_FM_CHANGECONTROLTYPE ;
             Text [ en-US ] = "Replace with";
         };
         MenuItem { ITEM_EDIT_CUT };
@@ -69,37 +72,37 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_DELETE ;
-            HelpID = SID_FM_DELETE ;
+            HelpId = HID_FM_DELETE ;
             Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {
             Identifier = SID_FM_TAB_DIALOG ;
-            HelpID = SID_FM_TAB_DIALOG ;
+            HelpId = CMD_SID_FM_TAB_DIALOG ;
             Text [ en-US ] = "Tab Order..." ;
         };
         MenuItem
         {
             Identifier = SID_FM_RENAME_OBJECT ;
-            HelpID = SID_FM_RENAME_OBJECT ;
+            HelpId = HID_FM_RENAME_OBJECT ;
             Text [ en-US ] = "~Rename" ;
         };
         MenuItem
         {
             Identifier = SID_FM_SHOW_PROPERTY_BROWSER ;
-            HelpID = SID_FM_SHOW_PROPERTY_BROWSER ;
+            HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ;
             Text [ en-US ] = "Propert~ies" ;
         };
         MenuItem
         {
             Identifier = SID_FM_OPEN_READONLY ;
-            HelpID = SID_FM_OPEN_READONLY ;
+            HelpId = CMD_SID_FM_OPEN_READONLY ;
             Text [ en-US ] = "Open in Design Mode" ;
         };
         MenuItem
         {
             Identifier = SID_FM_AUTOCONTROLFOCUS ;
-            HelpID = SID_FM_AUTOCONTROLFOCUS ;
+            HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ;
             Text [ en-US ] = "Automatic Control Focus";
         };
     };
@@ -112,140 +115,140 @@ Menu RID_FMSHELL_CONVERSIONMENU
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_EDIT ;
-            HelpID = SID_FM_CONVERTTO_EDIT ;
+            HelpId = CMD_SID_FM_CONVERTTO_EDIT ;
             Command = ".uno:ConvertToEdit" ;
             Text [ en-US ] = "~Text Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_BUTTON ;
-            HelpID = SID_FM_CONVERTTO_BUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_BUTTON ;
             Command = ".uno:ConvertToButton" ;
             Text [ en-US ] = "~Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FIXEDTEXT ;
-            HelpID = SID_FM_CONVERTTO_FIXEDTEXT ;
+            HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ;
             Command = ".uno:ConvertToFixed" ;
             Text [ en-US ] = "La~bel field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_GROUPBOX ;
-            HelpID = SID_FM_CONVERTTO_GROUPBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ;
             Command = ".uno:ConvertToGroup" ;
             Text [ en-US ] = "G~roup Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_LISTBOX ;
-            HelpID = SID_FM_CONVERTTO_LISTBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ;
             Command = ".uno:ConvertToList" ;
             Text [ en-US ] = "L~ist Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_CHECKBOX ;
-            HelpID = SID_FM_CONVERTTO_CHECKBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ;
             Command = ".uno:ConvertToCheckBox" ;
             Text [ en-US ] = "~Check Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_RADIOBUTTON ;
-            HelpID = SID_FM_CONVERTTO_RADIOBUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ;
             Command = ".uno:ConvertToRadio" ;
             Text [ en-US ] = "~Radio Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_COMBOBOX ;
-            HelpID = SID_FM_CONVERTTO_COMBOBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ;
             Command = ".uno:ConvertToCombo" ;
             Text [ en-US ] = "Combo Bo~x";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ;
-            HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ;
             Command = ".uno:ConvertToImageBtn" ;
             Text [ en-US ] = "I~mage Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FILECONTROL ;
-            HelpID = SID_FM_CONVERTTO_FILECONTROL ;
+            HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ;
             Command = ".uno:ConvertToFileControl" ;
             Text [ en-US ] = "~File Selection";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_DATE ;
-            HelpID = SID_FM_CONVERTTO_DATE ;
+            HelpId = CMD_SID_FM_CONVERTTO_DATE ;
             Command = ".uno:ConvertToDate" ;
             Text [ en-US ] = "~Date Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_TIME ;
-            HelpID = SID_FM_CONVERTTO_TIME ;
+            HelpId = CMD_SID_FM_CONVERTTO_TIME ;
             Command = ".uno:ConvertToTime" ;
             Text [ en-US ] = "Tim~e Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_NUMERIC ;
-            HelpID = SID_FM_CONVERTTO_NUMERIC ;
+            HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ;
             Command = ".uno:ConvertToNumeric" ;
             Text [ en-US ] = "~Numerical Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_CURRENCY ;
-            HelpID = SID_FM_CONVERTTO_CURRENCY ;
+            HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ;
             Command = ".uno:ConvertToCurrency" ;
             Text [ en-US ] = "C~urrency Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_PATTERN ;
-            HelpID = SID_FM_CONVERTTO_PATTERN ;
+            HelpId = CMD_SID_FM_CONVERTTO_PATTERN ;
             Command = ".uno:ConvertToPattern" ;
             Text [ en-US ] = "~Pattern Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_IMAGECONTROL ;
-            HelpID = SID_FM_CONVERTTO_IMAGECONTROL ;
+            HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ;
             Command = ".uno:ConvertToImageControl" ;
             Text [ en-US ] = "Ima~ge Control";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FORMATTED ;
-            HelpID = SID_FM_CONVERTTO_FORMATTED ;
+            HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ;
             Command = ".uno:ConvertToFormatted" ;
             Text [ en-US ] = "Fo~rmatted Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_SCROLLBAR ;
-            HelpID = SID_FM_CONVERTTO_SCROLLBAR ;
+            HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ;
             Command = ".uno:ConvertToScrollBar" ;
             Text [ en-US ] = "Scroll bar";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_SPINBUTTON;
-            HelpID = SID_FM_CONVERTTO_SPINBUTTON;
+            HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON;
             Command = ".uno:ConvertToSpinButton" ;
             Text [ en-US ] = "Spin Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR;
-            HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR;
+            HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR;
             Command = ".uno:ConvertToNavigationBar" ;
             Text [ en-US ] = "Navigation Bar" ;
         };
@@ -297,6 +300,7 @@ ImageList RID_SVXIMGLIST_FMEXPL
 
 ModalDialog RID_SVXDLG_SETFORM
 {
+    HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 200 ) ;
@@ -335,6 +339,7 @@ ModalDialog RID_SVXDLG_SETFORM
 };
 DockingWindow RID_SVX_FMEXPLORER
 {
+    HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 200 ) ;
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 30b2aa01c2..30b2aa01c2 100644..100755
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index ab61edb44b..5c7e0ef266 100644..100755
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -200,7 +200,7 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 |* MovePage
 |*
 \************************************************************************/
-void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
 {
 #ifndef SVX_LIGHT
     m_pImpl->bMovingPage = sal_True;
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index e888bd2fce..de51c8b8e8 100644..100755
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -32,7 +32,7 @@
 #include "fmprop.hrc"
 #include "fmvwimp.hxx"
 #include "fmpgeimp.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index badd945017..2a1d3394a5 100644..100755
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -33,7 +33,7 @@
 #include "svx/fmtools.hxx"
 #include "fmservs.hxx"
 
-#include "fmobjfac.hxx"
+#include "svx/fmobjfac.hxx"
 
 #include <svx/fmglob.hxx>
 
@@ -46,7 +46,7 @@
 #include "tbxform.hxx"
 #include <tools/resid.hxx>
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 #include "fmservs.hxx"
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::svxform;
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 /*************************************************************************
 |*
@@ -98,7 +98,7 @@ FmFormObjFactory::FmFormObjFactory()
         FmFormShell::RegisterInterface(0);
 
         ImplSmartRegisterUnoServices();
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 562566419a..2377875dfc 100644..100755
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -43,7 +43,7 @@
 #endif
 
 #ifndef SVX_LIGHT
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #endif
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
@@ -55,7 +55,7 @@
 #ifndef SVX_LIGHT
 #include <sfx2/objsh.hxx>
 #endif
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdview.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
@@ -161,7 +161,7 @@ SdrPage* FmFormPage::Clone() const
 }
 
 //------------------------------------------------------------------
-void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
+void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
                               const SdrInsertReason* pReason)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" );
@@ -260,7 +260,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
 }
 
 //------------------------------------------------------------------
-SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
+SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" );
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index eed59d1a27..7aeeccc51e 100644..100755
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include "fmpgeimp.hxx"
 #include "fmundo.hxx"
 #include "svx/fmtools.hxx"
@@ -37,8 +37,8 @@
 #include "fmservs.hxx"
 #include "fmobj.hxx"
 #include "formcontrolfactory.hxx"
-#include "svditer.hxx"
-#include "fmresids.hrc"
+#include "svx/svditer.hxx"
+#include "svx/fmresids.hrc"
 #include "svx/dbtoolsclient.hxx"
 #include "treevisitor.hxx"
 
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index e39a17813b..3bc83a42fc 100644..100755
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "fmscriptingenv.hxx"
-#include <svx/fmmodel.hxx>
+#include "svx/fmmodel.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -40,6 +40,7 @@
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 /** === end UNO includes === **/
+
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/implementationreference.hxx>
@@ -48,6 +49,8 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <sfx2/objsh.hxx>
+#include <sfx2/app.hxx>
+#include <basic/basmgr.hxx>
 
 #include <boost/shared_ptr.hpp>
 
@@ -432,60 +435,6 @@ namespace svxform
             }
             m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 );
         }
-
-        //................................................................
-        //. QualifiedBasicScript
-        //................................................................
-        class QualifiedBasicScript : public IScript
-        {
-            SfxObjectShell&         m_rObjectShell;
-            const ::rtl::OUString   m_sMacroLocation;
-            const ::rtl::OUString   m_sScriptCode;
-
-        public:
-            QualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rLocation, const ::rtl::OUString& _rScriptCode )
-                :m_rObjectShell( _rObjectShell )
-                ,m_sMacroLocation( _rLocation )
-                ,m_sScriptCode( _rScriptCode )
-            {
-            }
-
-            // IScript
-            virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult );
-        };
-
-        //................................................................
-        void QualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult )
-        {
-            m_rObjectShell.CallStarBasicScript( m_sScriptCode, m_sMacroLocation,
-                &_rArguments, &_rSynchronousResult );
-        }
-
-        //................................................................
-        //. UnqualifiedBasicScript
-        //................................................................
-        class UnqualifiedBasicScript : public IScript
-        {
-            SfxObjectShell&         m_rObjectShell;
-            const ::rtl::OUString   m_sScriptCode;
-
-        public:
-            UnqualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode )
-                :m_rObjectShell( _rObjectShell )
-                ,m_sScriptCode( _rScriptCode )
-            {
-            }
-
-            // IScript
-            virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult );
-        };
-
-        //................................................................
-        void UnqualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult )
-        {
-            m_rObjectShell.CallScript( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) ), m_sScriptCode,
-                &_rArguments, &_rSynchronousResult );
-        }
     }
 
     //--------------------------------------------------------------------
@@ -497,6 +446,7 @@ namespace svxform
         if ( m_bDisposed )
             return;
 
+        // SfxObjectShellRef is good here since the model controls the lifetime of the object
         SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell();
         if( !xObjectShell.Is() )
             return;
@@ -529,14 +479,24 @@ namespace svxform
                 sScriptCode = sScriptCode.copy( nPrefixLen + 1 );
             }
 
-            if ( sMacroLocation.getLength() )
-            {	// we have a StarBasic macro with fully-qualified macro location
-                pScript.reset( new QualifiedBasicScript( *xObjectShell, sMacroLocation, sScriptCode ) );
-            }
-            else
-            {	// we have a StarBasic macro without qualified location - let the object shell gues ....
-                pScript.reset( new UnqualifiedBasicScript( *xObjectShell, sScriptCode ) );
+            if ( !sMacroLocation.getLength() )
+            {
+                // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic
+                if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) )
+                    sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application" ) );
+                else
+                    sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "document" ) );
             }
+
+            ::rtl::OUStringBuffer aScriptURI;
+            aScriptURI.appendAscii( "vnd.sun.star.script:" );
+            aScriptURI.append( sScriptCode );
+            aScriptURI.appendAscii( "?language=Basic" );
+            aScriptURI.appendAscii( "&location=" );
+            aScriptURI.append( sMacroLocation );
+
+            const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() );
+            pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) );
         }
 
         OSL_ENSURE( pScript.get(), "FormScriptingEnvironment::doFireScriptEvent: no script to execute!" );
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 8e578f5ec0..8e578f5ec0 100644..100755
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e2363d71ac..1c19295b3a 100644..100755
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -61,12 +61,12 @@
 #include <sfx2/objsh.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 
 #include <svx/svxids.hrc>
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmexch.hxx"
 #include <svx/fmglob.hxx>
 #include <svl/eitem.hxx>
@@ -279,7 +279,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
 }
 
 //------------------------------------------------------------------------
-sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
+sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/)
 {
     if ( GetImpl()->didPrepareClose() )
         // we already did a PrepareClose for the current modifications of the current form
@@ -310,10 +310,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
                     if ( bModified && bUI )
                     {
                         QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED));
-                        if (bForBrowsing)
-                            aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK,
-                                BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
-
                         switch (aQry.Execute())
                         {
                             case RET_NO:
@@ -862,7 +858,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
             rReq.Done();
 
             // initially open the filter navigator, the whole form based filter is pretty useless without it
-            SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE );
+            SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True );
             GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
                 &aIdentifierItem, NULL );
         }	break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 36bda9f0a8..c6bd97fadf 100644..100755
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -35,7 +35,7 @@
 #include "fmpgeimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -44,7 +44,7 @@
 #include "fmvwimp.hxx"
 #include "formtoolbars.hxx"
 #include "gridcols.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/dialogs.hrc"
 #include "svx/fmglob.hxx"
@@ -541,7 +541,6 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
 //------------------------------------------------------------------------------
 sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldStepInto" );
     if (_rContainer == m_xStartingPoint)
         // would be quite stupid to step over the root ....
         return sal_True;
@@ -552,7 +551,6 @@ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>&
 //------------------------------------------------------------------------------
 sal_Bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldHandleElement" );
     if (!_rElement.is())
         // NULL element
         return sal_False;
@@ -678,7 +676,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         ,m_bPreparedClose( sal_False )
         ,m_bFirstActivation( sal_True )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::FmXFormShell" );
     DBG_CTOR(FmXFormShell,NULL);
     m_aMarkTimer.SetTimeout(100);
     m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut));
@@ -710,7 +707,6 @@ FmXFormShell::~FmXFormShell()
 //------------------------------------------------------------------
 Reference< XModel > FmXFormShell::getContextDocument() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getContextDocument" );
     Reference< XModel > xModel;
 
     // determine the type of document we live in
@@ -732,14 +728,12 @@ Reference< XModel > FmXFormShell::getContextDocument() const
 //------------------------------------------------------------------
 bool FmXFormShell::isEnhancedForm() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isEnhancedForm" );
     return getDocumentType() == eEnhancedForm;
 }
 
 //------------------------------------------------------------------
 bool FmXFormShell::impl_checkDisposed() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_checkDisposed" );
     if ( !m_pShell )
     {
         OSL_ENSURE( false, "FmXFormShell::impl_checkDisposed: already disposed!" );
@@ -751,7 +745,6 @@ bool FmXFormShell::impl_checkDisposed() const
 //------------------------------------------------------------------
 ::svxform::DocumentType FmXFormShell::getDocumentType() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getDocumentType" );
     if ( m_eDocumentType != eUnknownDocumentType )
         return m_eDocumentType;
 
@@ -772,7 +765,6 @@ bool FmXFormShell::impl_checkDisposed() const
 //------------------------------------------------------------------
 bool FmXFormShell::IsReadonlyDoc() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsReadonlyDoc" );
     if ( impl_checkDisposed() )
         return true;
 
@@ -785,19 +777,16 @@ bool FmXFormShell::IsReadonlyDoc() const
 //------------------------------------------------------------------
 Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::queryInterface" );
     return FmXFormShell_BASE::queryInterface(type);
 }
 //------------------------------------------------------------------------------
 Sequence< Type > SAL_CALL FmXFormShell::getTypes(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getTypes" );
     return FmXFormShell_BASE::getTypes();
 }
 //------------------------------------------------------------------------------
 Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getImplementationId" );
     static ::cppu::OImplementationId* pId = 0;
     if (! pId)
     {
@@ -814,7 +803,6 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
     impl_checkDisposed();
 
     if (m_xActiveController == e.Source)
@@ -854,7 +842,6 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::propertyChange" );
     if ( impl_checkDisposed() )
         return;
 
@@ -891,7 +878,6 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
 //------------------------------------------------------------------------------
 void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::invalidateFeatures" );
     if ( impl_checkDisposed() )
         return;
 
@@ -921,7 +907,6 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formActivated" );
     if ( impl_checkDisposed() )
         return;
 
@@ -933,7 +918,6 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formDeactivated" );
     if ( impl_checkDisposed() )
         return;
 
@@ -944,7 +928,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
 //------------------------------------------------------------------------------
 void FmXFormShell::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" );
     impl_checkDisposed();
 
     FmXFormShell_BASE::disposing();
@@ -1021,7 +1004,6 @@ void FmXFormShell::disposing()
 //------------------------------------------------------------------------------
 void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateSlot" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1043,14 +1025,13 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 //------------------------------------------------------------------------------
 void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::InvalidateSlot" );
     if ( impl_checkDisposed() )
         return;
 
     ::osl::MutexGuard aGuard(m_aInvalidationSafety);
     if (m_nLockSlotInvalidation)
     {
-        BYTE nFlags = ( bWithId ? 0x01 : 0 );
+        sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 );
         m_arrInvalidSlots.push_back( InvalidSlotInfo(nId, nFlags) );
     }
     else
@@ -1063,7 +1044,6 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
 //------------------------------------------------------------------------------
 void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LockSlotInvalidation" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1103,7 +1083,6 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
 //------------------------------------------------------------------------------
 void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForceUpdateSelection" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1125,7 +1104,6 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 //------------------------------------------------------------------------------
 PopupMenu* FmXFormShell::GetConversionMenu()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" );
 
     PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
 
@@ -1142,7 +1120,6 @@ PopupMenu* FmXFormShell::GetConversionMenu()
 //------------------------------------------------------------------------------
 bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isControlConversionSlot" );
     for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
         if (nConvertSlots[i] == nSlotId)
             return true;
@@ -1152,7 +1129,6 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
 //------------------------------------------------------------------------------
 bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" );
     OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" );
     InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin();
     if ( aSelectedElement == m_aCurrentSelection.end() )
@@ -1164,7 +1140,6 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
 //------------------------------------------------------------------------------
 bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" );
     if ( impl_checkDisposed() )
         return false;
 
@@ -1371,7 +1346,6 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
 //------------------------------------------------------------------------------
 bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::canConvertCurrentSelectionToControl" );
     if ( m_aCurrentSelection.empty() )
         return false;
 
@@ -1410,7 +1384,6 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo
 //------------------------------------------------------------------------------
 void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::checkControlConversionSlotsForCurrentSelection" );
     for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i)
         // der Context ist schon von einem Typ, der dem Eitnrag entspricht -> disable
         rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) );
@@ -1419,7 +1392,6 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
 //------------------------------------------------------------------------------
 void FmXFormShell::LoopGrids(sal_Int16 nWhat)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LoopGrids" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1489,7 +1461,6 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
 //------------------------------------------------------------------------------
 Reference< XControlContainer > FmXFormShell::getControlContainerForView()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getControlContainerForView" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1507,7 +1478,6 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView()
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTabOrderDialog" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1556,7 +1526,6 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteSearch()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteSearch" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1703,7 +1672,6 @@ void FmXFormShell::ExecuteSearch()
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetY2KState" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -1743,7 +1711,6 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
 //------------------------------------------------------------------------------
 void FmXFormShell::SetY2KState(sal_uInt16 n)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetY2KState" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1818,7 +1785,6 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
 //------------------------------------------------------------------------------
 void FmXFormShell::CloseExternalFormViewer()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CloseExternalFormViewer" );
     if ( impl_checkDisposed() )
         return;
 
@@ -1840,7 +1806,6 @@ void FmXFormShell::CloseExternalFormViewer()
 //------------------------------------------------------------------------------
 Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1856,7 +1821,6 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet
 //------------------------------------------------------------------------------
 Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" );
     if ( impl_checkDisposed() )
         return NULL;
 
@@ -1885,7 +1849,6 @@ namespace
 //------------------------------------------------------------------------------
 bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsFormSlotEnabled" );
     const ::svx::ControllerFeatures& rController =
             lcl_isNavigationRelevant( _nSlot )
         ?   getNavControllerFeatures()
@@ -1901,7 +1864,6 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete
 //------------------------------------------------------------------------------
 void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteFormSlot" );
     const ::svx::ControllerFeatures& rController =
             lcl_isNavigationRelevant( _nSlot )
         ?   getNavControllerFeatures()
@@ -1937,7 +1899,6 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_switchActiveControllerListening" );
     Reference< XComponent> xComp( m_xActiveController, UNO_QUERY );
     if ( !xComp.is() )
         return;
@@ -1951,7 +1912,6 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 //------------------------------------------------------------------------------
 void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setActiveController" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2060,14 +2020,12 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
 //------------------------------------------------------------------------------
 void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getCurrentSelection" );
     _rSelection = m_aCurrentSelection;
 }
 
 //------------------------------------------------------------------------------
 bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelectionFromMark" );
     m_aLastKnownMarkedControls.clear();
 
     if ( ( _rMarkList.GetMarkCount() > 0 ) && isControlList( _rMarkList ) )
@@ -2079,14 +2037,12 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
 //------------------------------------------------------------------------------
 bool FmXFormShell::selectLastMarkedControls()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectLastMarkedControls" );
     return setCurrentSelection( m_aLastKnownMarkedControls );
 }
 
 //------------------------------------------------------------------------------
 bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelection" );
     if ( impl_checkDisposed() )
         return false;
 
@@ -2168,14 +2124,12 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
 //------------------------------------------------------------------------------
 bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isSolelySelected" );
     return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject );
 }
 
 //------------------------------------------------------------------------------
 void FmXFormShell::forgetCurrentForm()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::forgetCurrentForm" );
     if ( !m_xCurrentForm.is() )
         return;
 
@@ -2190,7 +2144,6 @@ void FmXFormShell::forgetCurrentForm()
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_updateCurrentForm" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2209,7 +2162,6 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo
 //------------------------------------------------------------------------------
 void FmXFormShell::startListening()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startListening" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2289,7 +2241,6 @@ void FmXFormShell::startListening()
 //------------------------------------------------------------------------------
 void FmXFormShell::stopListening()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopListening" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2313,7 +2264,6 @@ void FmXFormShell::stopListening()
 //------------------------------------------------------------------------------
 void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ShowSelectionProperties" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2644,7 +2594,6 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
 //------------------------------------------------------------------------------
 void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementInserted" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2658,7 +2607,6 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::
 //------------------------------------------------------------------------------
 void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementReplaced" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2672,7 +2620,6 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::
 //------------------------------------------------------------------------------
 void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementRemoved" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2685,7 +2632,6 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s
 //------------------------------------------------------------------------------
 void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateForms" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2711,7 +2657,6 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
 //------------------------------------------------------------------------------
 void FmXFormShell::AddElement(const Reference< XInterface>& _xElement)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::AddElement" );
     if ( impl_checkDisposed() )
         return;
     impl_AddElement_nothrow(_xElement);
@@ -2744,7 +2689,6 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element
 //------------------------------------------------------------------------------
 void FmXFormShell::RemoveElement(const Reference< XInterface>& Element)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::RemoveElement" );
     if ( impl_checkDisposed() )
         return;
     impl_RemoveElement_nothrow(Element);
@@ -2781,7 +2725,6 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem
 //------------------------------------------------------------------------------
 void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectionChanged" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2823,7 +2766,6 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------
 void FmXFormShell::SetSelectionDelayed()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelectionDelayed" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2834,7 +2776,6 @@ void FmXFormShell::SetSelectionDelayed()
 //------------------------------------------------------------------------
 void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelection" );
     if ( impl_checkDisposed() )
         return;
 
@@ -2845,7 +2786,6 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
 //------------------------------------------------------------------------
 void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DetermineSelection" );
     if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() )
         ShowSelectionProperties( sal_True );
 }
@@ -2853,7 +2793,6 @@ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
 //------------------------------------------------------------------------------
 sal_Bool FmXFormShell::IsPropBrwOpen() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsPropBrwOpen" );
     if ( impl_checkDisposed() )
         return sal_False;
 
@@ -2890,7 +2829,6 @@ public:
 //------------------------------------------------------------------------------
 void FmXFormShell::SetDesignMode(sal_Bool bDesign)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetDesignMode" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3023,7 +2961,6 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod
 void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint,
     const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< String >& _out_rNames )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_collectFormSearchContexts_nothrow" );
     try
     {
         Reference< XIndexAccess> xContainer( _rxStartingPoint, UNO_QUERY );
@@ -3078,7 +3015,6 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
 //------------------------------------------------------------------------------
 void FmXFormShell::startFiltering()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startFiltering" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3095,12 +3031,14 @@ void FmXFormShell::startFiltering()
     else
         xContainer = getActiveController()->getContainer();
 
-    FmWinRecList::iterator i = pXView->findWindow(xContainer);
-    if (i != pXView->getWindowList().end())
+    PFormViewPageWindowAdapter pAdapter = pXView->findWindow( xContainer );
+    if ( pAdapter.is() )
     {
-        const ::std::vector< Reference< runtime::XFormController> >& rControllerList = (*i)->GetList();
-        for (::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin();
-             j != rControllerList.end(); ++j)
+        const ::std::vector< Reference< runtime::XFormController> >& rControllerList = pAdapter->GetList();
+        for (   ::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin();
+                j != rControllerList.end();
+                ++j
+            )
         {
             Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
             if (xModeSelector.is())
@@ -3153,7 +3091,6 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController)
 //------------------------------------------------------------------------------
 void FmXFormShell::stopFiltering(sal_Bool bSave)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopFiltering" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3171,10 +3108,10 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
     else
         xContainer = getActiveController()->getContainer();
 
-    FmWinRecList::iterator i = pXView->findWindow(xContainer);
-    if (i != pXView->getWindowList().end())
+    PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer);
+    if ( pAdapter.is() )
     {
-        const ::std::vector< Reference< runtime::XFormController > >& rControllerList = (*i)->GetList();
+        const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList();
         ::std::vector < ::rtl::OUString >	aOriginalFilters;
         ::std::vector < sal_Bool >			aOriginalApplyFlags;
 
@@ -3215,7 +3152,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
         }
         if (bSave)	// execute the filter
         {
-            const ::std::vector< Reference< runtime::XFormController > > & rControllers = (*i)->GetList();
+            const ::std::vector< Reference< runtime::XFormController > > & rControllers = pAdapter->GetList();
             for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllers.begin();
                  j != rControllers.end(); ++j)
             {
@@ -3292,7 +3229,6 @@ void clearFilter(const Reference< runtime::XFormController >& _rxController)
 //------------------------------------------------------------------------------
 void FmXFormShell::clearFilter()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::clearFilter" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3308,12 +3244,14 @@ void FmXFormShell::clearFilter()
     else
         xContainer = getActiveController()->getContainer();
 
-    FmWinRecList::iterator i = pXView->findWindow(xContainer);
-    if (i != pXView->getWindowList().end())
+    PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer);
+    if ( pAdapter.is() )
     {
-        const ::std::vector< Reference< runtime::XFormController > > & rControllerList = (*i)->GetList();
-        for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
-             j != rControllerList.end(); ++j)
+        const ::std::vector< Reference< runtime::XFormController > > & rControllerList = pAdapter->GetList();
+        for (   ::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
+                j != rControllerList.end();
+                ++j
+            )
         {
             ::clearFilter(*j);
         }
@@ -3323,7 +3261,6 @@ void FmXFormShell::clearFilter()
 //------------------------------------------------------------------------------
 void FmXFormShell::CreateExternalView()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CreateExternalView" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3738,7 +3675,6 @@ void FmXFormShell::CreateExternalView()
 //------------------------------------------------------------------------
 void FmXFormShell::implAdjustConfigCache()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::implAdjustConfigCache" );
     // get (cache) the wizard usage flag
     Sequence< ::rtl::OUString > aNames(1);
     aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
@@ -3750,7 +3686,6 @@ void FmXFormShell::implAdjustConfigCache()
 //------------------------------------------------------------------------
 void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::Notify" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3771,7 +3706,6 @@ void FmXFormShell::Commit()
 //------------------------------------------------------------------------
 void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetWizardUsing" );
     m_bUseWizards = _bUseThem;
 
     Sequence< ::rtl::OUString > aNames(1);
@@ -3784,7 +3718,6 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 //------------------------------------------------------------------------
 void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" );
 
     if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() )
     {
@@ -3855,7 +3788,6 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
 //------------------------------------------------------------------------
 void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" );
 
     FmFormPage* pPage = _rCurrentView.GetCurPage();
 
@@ -3904,7 +3836,6 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
 //------------------------------------------------------------------------------
 void FmXFormShell::impl_defaultCurrentForm_nothrow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_defaultCurrentForm_nothrow" );
     if ( impl_checkDisposed() )
         return;
 
@@ -3935,7 +3866,6 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow()
 //------------------------------------------------------------------------------
 void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::smartControlReset" );
     if (!_rxModels.is())
     {
         OSL_FAIL("FmXFormShell::smartControlReset: invalid container!");
@@ -4043,7 +3973,6 @@ namespace
 //------------------------------------------------------------------------
 void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::loadForms" );
     DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) )  != ( FORMS_ASYNC | FORMS_UNLOAD ),
         "FmXFormShell::loadForms: async loading not supported - this will heavily fail!" );
 
@@ -4121,41 +4050,35 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
 //------------------------------------------------------------------------
 void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTextAttribute" );
     m_pTextShell->ExecuteTextAttribute( _rReq );
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetTextAttributeState" );
     m_pTextShell->GetTextAttributeState( _rSet );
 }
 
 //------------------------------------------------------------------------
 bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsActiveControl" );
     return m_pTextShell->IsActiveControl( _bCountRichTextOnly );
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::ForgetActiveControl()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForgetActiveControl" );
     m_pTextShell->ForgetActiveControl();
 }
 
 //------------------------------------------------------------------------
 void FmXFormShell::SetControlActivationHandler( const Link& _rHdl )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetControlActivationHandler" );
     m_pTextShell->SetControlActivationHandler( _rHdl );
 }
 //------------------------------------------------------------------------
 void FmXFormShell::handleShowPropertiesRequest()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleShowPropertiesRequest" );
     if ( onlyControlsAreMarked() )
         ShowSelectionProperties( sal_True );
 }
@@ -4163,7 +4086,6 @@ void FmXFormShell::handleShowPropertiesRequest()
 //------------------------------------------------------------------------
 void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleMouseButtonDown" );
     // catch simple double clicks
     if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) )
     {
@@ -4275,7 +4197,6 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
 //------------------------------------------------------------------------------
 ControlConversionMenuController::~ControlConversionMenuController()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ControlConversionMenuController::~ControlConversionMenuController" );
     m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL);
     delete m_pConversionMenu;
 }
@@ -4296,10 +4217,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
             // We can't simply re-insert the item because we have a clear order for all the our items.
             // So first we have to determine the position of the item to insert.
             PopupMenu* pSource = FmXFormShell::GetConversionMenu();
-            USHORT nSourcePos = pSource->GetItemPos(nSID);
+            sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
             DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
-            USHORT nPrevInSource = nSourcePos;
-            USHORT nPrevInConversion = MENU_ITEM_NOTFOUND;
+            sal_uInt16 nPrevInSource = nSourcePos;
+            sal_uInt16 nPrevInConversion = MENU_ITEM_NOTFOUND;
             while (nPrevInSource>0)
             {
                 sal_Int16 nPrevId = pSource->GetItemId(--nPrevInSource);
@@ -4311,7 +4232,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
             }
             if (MENU_ITEM_NOTFOUND == nPrevInConversion)
                 // none of the items which precede the nSID-slot in the source menu are present in our conversion menu
-                nPrevInConversion = sal::static_int_cast< USHORT >(-1);	// put the item at the first position
+                nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1);	// put the item at the first position
             m_pConversionMenu->InsertItem(nSID, pSource->GetItemText(nSID), pSource->GetItemBits(nSID), ++nPrevInConversion);
             m_pConversionMenu->SetItemImage(nSID, pSource->GetItemImage(nSID));
             m_pConversionMenu->SetHelpId(nSID, pSource->GetHelpId(nSID));
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 287b92ef56..263cf3b138 100644..100755
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <svl/filerec.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index db0d05ec4b..8f52a697a6 100644..100755
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -29,9 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/wldcrd.hxx>
@@ -58,7 +58,7 @@
 
 #include "fmprop.hrc"
 #include "fmservs.hxx"
-#include "fmsrcimp.hxx"
+#include "svx/fmsrcimp.hxx"
 #include <svx/fmsearch.hxx>
 
 #include <comphelper/numbers.hxx>
@@ -77,11 +77,6 @@ using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::beans;
 using namespace ::svxform;
 
-// ***************************************************************************************************
-
-// ***************************************************************************************************
-
-SV_IMPL_OBJARR(SvInt32Array, sal_Int32);
 
 //========================================================================
 // = FmSearchThread
@@ -844,7 +839,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
     // analyze the fields
     // additionally, create the mapping: because the list of used columns can be shorter than the list
     // of columns of the cursor, we need a mapping: "used column numer n" -> "cursor column m"
-    m_arrFieldMapping.Remove(0, m_arrFieldMapping.Count());
+    m_arrFieldMapping.clear();
 
     // important: The case of the columns does not need to be exact - for instance:
     // - a user created a form which works on a table, for which the driver returns a column name "COLUMN"
@@ -907,8 +902,8 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
             }
             // set the field selection back to the first
             pFieldNames = seqFieldNames.getArray();;
-            DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Es wurden ungueltige Feldnamen angegeben !");
-            m_arrFieldMapping.Insert(nFoundIndex, m_arrFieldMapping.Count());
+            DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Invalid field name were given !");
+            m_arrFieldMapping.push_back(nFoundIndex);
         }
     }
     catch(Exception&)
@@ -1269,18 +1264,21 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce)
         return;
     // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun)
 
-    DBG_ASSERT((nFieldIndex >= -1) && (nFieldIndex<m_arrFieldMapping.Count()), "FmSearchEngine::RebuildUsedFields : nFieldIndex ist ungueltig !");
+    DBG_ASSERT((nFieldIndex == -1) ||
+               ((nFieldIndex >= 0) &&
+                (static_cast<size_t>(nFieldIndex) < m_arrFieldMapping.size())),
+            "FmSearchEngine::RebuildUsedFields : nFieldIndex is invalid!");
     // alle Felder, die ich durchsuchen muss, einsammeln
     m_arrUsedFields.clear();
     if (nFieldIndex == -1)
     {
         Reference< ::com::sun::star::container::XIndexAccess >  xFields;
-        for (sal_uInt16 i=0; i<m_arrFieldMapping.Count(); ++i)
+        for (size_t i=0; i<m_arrFieldMapping.size(); ++i)
         {
             Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY);
             DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !");
             xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY);
-            BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject(i));
+            BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[i]);
         }
     }
     else
@@ -1289,7 +1287,7 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce)
         Reference< ::com::sun::star::sdbcx::XColumnsSupplier >  xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY);
         DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !");
         xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY);
-        BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject((sal_uInt16)nFieldIndex));
+        BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[static_cast< size_t >(nFieldIndex)]);
     }
 
     m_nCurrentFieldIndex = nFieldIndex;
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index 9456ecba4d..bb0be71840 100644..100755
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 /* Strings fuer Uebersetzung */
 String RID_ERR_CONTEXT_ADDFORM
 {
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index c725eb4554..1848d6a05f 100644..100755
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -34,7 +34,7 @@
 
 #include <editeng/eeitem.hxx>
 
-#include "flagsdef.hxx"
+#include "svx/flagsdef.hxx"
 #include <svl/intitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
@@ -66,7 +66,7 @@ namespace svx
     }
 
     //--------------------------------------------------------------------
-    void TextControlCharAttribDialog::PageCreated( USHORT _nId, SfxTabPage& _rPage )
+    void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 1bf8ea49ef..1bf8ea49ef 100644..100755
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 6461117f39..be4e7688cd 100644..100755
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
@@ -95,7 +95,7 @@ namespace svx
     using namespace ::com::sun::star::container;
 
     //====================================================================
-    typedef USHORT WhichId;
+    typedef sal_uInt16 WhichId;
 
     //====================================================================
     static SfxSlotId pTextControlSlots[] =
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 8664d8c4c5..8664d8c4c5 100644..100755
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 76d7910692..67985e8dd5 100644..100755
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -33,10 +33,10 @@
 #include "fmundo.hxx"
 #include "fmpgeimp.hxx"
 #include "svx/dbtoolsclient.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "fmobj.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "svx/fmglob.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmmodel.hxx"
@@ -132,6 +132,8 @@ private:
                 {
                     Reference< XMultiComponentFactory > xMFac( 
                     xCtx->getServiceManager(), UNO_QUERY );
+
+                    // SfxObjectShellRef is good here since the model controls the lifetime of the shell
                     SfxObjectShellRef xObjSh = pModel->GetObjectShell();
                     Reference< XMultiServiceFactory > xDocFac;
                     if ( xObjSh.Is() )
@@ -152,6 +154,7 @@ private:
         {
             try
             {
+                // SfxObjectShellRef is good here since the model controls the lifetime of the shell
                 SfxObjectShellRef xObjSh = pModel->GetObjectShell();
                 if ( xObjSh.Is() && m_vbaListener.is() )
                 {
@@ -179,8 +182,8 @@ private:
 //------------------------------------------------------------------------------
 struct PropertyInfo
 {
-    BOOL	bIsTransientOrReadOnly	: 1;	// the property is transient or read-only, thus we need no undo action for it
-    BOOL	bIsValueProperty	    : 1;	// the property is the special value property, thus it may be handled
+    sal_Bool	bIsTransientOrReadOnly	: 1;	// the property is transient or read-only, thus we need no undo action for it
+    sal_Bool	bIsValueProperty	    : 1;	// the property is the special value property, thus it may be handled
                                             // as if it's transient or persistent
 };
 
@@ -189,11 +192,11 @@ struct PropertySetInfo
     DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties);
 
     AllProperties	aProps; 				// all properties of this set which we know so far
-    BOOL			bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
+    sal_Bool			bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
                                             // sal_False -> the set has _no_ such property or it's value isn't empty
 };
 
-BOOL operator < (const Reference< XPropertySet >& lhs,
+sal_Bool operator < (const Reference< XPropertySet >& lhs,
                  const Reference< XPropertySet >& rhs)
 {
     return lhs.get() < rhs.get();
@@ -670,7 +673,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
             PropertyInfo aNewEntry;
 
             // the attributes
-            INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
+            sal_Int32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
             aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0);
 
             // check if it is the special "DataFieldProperty"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 97893db621..6e585aa0b9 100644..100755
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -47,11 +47,10 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <basic/sbuno.hxx>
-#include <sfx2/macrconf.hxx>
 #include <basic/sbx.hxx>
 #include "fmitems.hxx"
 #include "fmobj.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/fmview.hxx>
@@ -77,7 +76,7 @@
 #include <vcl/stdtext.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -138,9 +137,7 @@ void FmFormView::Init()
         const SfxPoolItem *pItem=0;
         if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET )
         {
-            Sequence< PropertyValue > aSeq;
-            ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq;
-            ::comphelper::NamedValueCollection aComponentData( aSeq );
+            ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() );
             bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode );
         }
     }
@@ -188,7 +185,7 @@ void FmFormView::MarkListHasChanged()
                 pImpl->m_xWindow->removeFocusListener(pImpl);
                 pImpl->m_xWindow = NULL;
             }
-            SetMoveOutside(FALSE);
+            SetMoveOutside(sal_False);
             //OLMRefreshAllIAOManagers();
         }
 
@@ -505,9 +502,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor
 }
 
 // -----------------------------------------------------------------------------
-BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     const KeyCode& rKeyCode = rKEvt.GetKeyCode();
     if  (   IsDesignMode()
         &&	rKeyCode.GetCode() == KEY_RETURN
@@ -530,10 +527,10 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
                     pImpl->m_xWindow = xWindow;
                     // add as listener to get notified when ESC will be pressed inside the grid
                     pImpl->m_xWindow->addFocusListener(pImpl);
-                    SetMoveOutside(TRUE);
+                    SetMoveOutside(sal_True);
                     //OLMRefreshAllIAOManagers();
                     xWindow->setFocus();
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
             }
         }
@@ -566,9 +563,9 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
 }
 
 // -----------------------------------------------------------------------------
-BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
+sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
 {
-    BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
+    sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
 
     if ( pFormShell && pFormShell->GetImpl() )
     {
@@ -605,7 +602,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
 // -----------------------------------------------------------------------------
 void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
-    sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+    sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
     SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
 {
     FmXFormView::createControlLabelPair(
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index dbc85b5081..ba3e1a3bdf 100644..100755
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -33,15 +33,15 @@
 #include "fmobj.hxx"
 #include "fmpgeimp.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "fmshimp.hxx"
 #include "svx/fmtools.hxx"
 #include "fmundo.hxx"
 #include "fmvwimp.hxx"
 #include "formcontrolfactory.hxx"
-#include "sdrpaintwindow.hxx"
-#include "svditer.hxx"
+#include "svx/sdrpaintwindow.hxx"
+#include "svx/svditer.hxx"
 #include "svx/dataaccessdescriptor.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/fmglob.hxx"
@@ -52,7 +52,7 @@
 #include "svx/sdrpagewindow.hxx"
 #include "svx/svdogrp.hxx"
 #include "svx/svdpagv.hxx"
-#include "xmlexchg.hxx"
+#include "svx/xmlexchg.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -174,20 +174,19 @@ public:
 };
 
 //========================================================================
-DBG_NAME(FmXPageViewWinRec)
+DBG_NAME(FormViewPageWindowAdapter)
 //------------------------------------------------------------------------
-FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl )
+FormViewPageWindowAdapter::FormViewPageWindowAdapter( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl )
 :	m_xControlContainer( _rWindow.GetControlContainer() ),
     m_aContext( _rContext ),
     m_pViewImpl( _pViewImpl ),
     m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::FmXPageViewWinRec" );
-    DBG_CTOR(FmXPageViewWinRec,NULL);
+    DBG_CTOR(FormViewPageWindowAdapter,NULL);
 
     // create an XFormController for every form
     FmFormPage* pFormPage = dynamic_cast< FmFormPage* >( _rWindow.GetPageView().GetPage() );
-    DBG_ASSERT( pFormPage, "FmXPageViewWinRec::FmXPageViewWinRec: no FmFormPage found!" );
+    DBG_ASSERT( pFormPage, "FormViewPageWindowAdapter::FormViewPageWindowAdapter: no FmFormPage found!" );
     if ( pFormPage )
     {
         try
@@ -208,15 +207,14 @@ FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rCo
     }
 }
 // -----------------------------------------------------------------------------
-FmXPageViewWinRec::~FmXPageViewWinRec()
+FormViewPageWindowAdapter::~FormViewPageWindowAdapter()
 {
-    DBG_DTOR(FmXPageViewWinRec,NULL);
+    DBG_DTOR(FormViewPageWindowAdapter,NULL);
 }
 
 //------------------------------------------------------------------
-void FmXPageViewWinRec::dispose()
+void FormViewPageWindowAdapter::dispose()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::dispose" );
     for (   ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
             i != m_aControllerList.end();
             ++i
@@ -250,39 +248,34 @@ void FmXPageViewWinRec::dispose()
 
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXPageViewWinRec::hasElements(void) throw( RuntimeException )
+sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::hasElements" );
     return getCount() != 0;
 }
 
 //------------------------------------------------------------------------------
-Type SAL_CALL  FmXPageViewWinRec::getElementType(void) throw( RuntimeException )
+Type SAL_CALL  FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getElementType" );
     return ::getCppuType((const Reference< XFormController>*)0);
 }
 
 // XEnumerationAccess
 //------------------------------------------------------------------------------
-Reference< XEnumeration >  SAL_CALL FmXPageViewWinRec::createEnumeration(void) throw( RuntimeException )
+Reference< XEnumeration >  SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::createEnumeration" );
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
 // XIndexAccess
 //------------------------------------------------------------------------------
-sal_Int32 SAL_CALL FmXPageViewWinRec::getCount(void) throw( RuntimeException )
+sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getCount" );
     return m_aControllerList.size();
 }
 
 //------------------------------------------------------------------------------
-Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
+Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getByIndex" );
     if (nIndex < 0 ||
         nIndex >= getCount())
         throw IndexOutOfBoundsException();
@@ -293,7 +286,7 @@ Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBo
 }
 
 //------------------------------------------------------------------------
-void SAL_CALL FmXPageViewWinRec::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException)
+void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -332,9 +325,8 @@ Reference< XFormController >  getControllerSearchChilds( const Reference< XIndex
 
 // Search the according controller
 //------------------------------------------------------------------------
-Reference< XFormController >  FmXPageViewWinRec::getController( const Reference< XForm > & xForm ) const
+Reference< XFormController >  FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getController" );
     Reference< XTabControllerModel >  xModel(xForm, UNO_QUERY);
     for (::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
          i != m_aControllerList.end(); i++)
@@ -351,9 +343,9 @@ Reference< XFormController >  FmXPageViewWinRec::getController( const Reference<
 }
 
 //------------------------------------------------------------------------
-void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController )
+void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController )
 {
-    DBG_ASSERT( xForm.is(), "FmXPageViewWinRec::setController: there should be a form!" );
+    DBG_ASSERT( xForm.is(), "FormViewPageWindowAdapter::setController: there should be a form!" );
     Reference< XIndexAccess >  xFormCps(xForm, UNO_QUERY);
     if (!xFormCps.is())
         return;
@@ -411,10 +403,9 @@ void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Re
 }
 
 //------------------------------------------------------------------------
-void FmXPageViewWinRec::updateTabOrder( const Reference< XForm >& _rxForm )
+void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxForm )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::updateTabOrder" );
-    OSL_PRECOND( _rxForm.is(), "FmXPageViewWinRec::updateTabOrder: illegal argument!" );
+    OSL_PRECOND( _rxForm.is(), "FormViewPageWindowAdapter::updateTabOrder: illegal argument!" );
     if ( !_rxForm.is() )
         return;
 
@@ -458,13 +449,11 @@ FmXFormView::FmXFormView(const ::comphelper::ComponentContext& _rContext, FmForm
     ,m_bFirstActivation( true )
     ,m_isTabOrderUpdateSuspended( false )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::FmXFormView" );
 }
 
 //------------------------------------------------------------------------
 void FmXFormView::cancelEvents()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::cancelEvents" );
     if ( m_nActivationEvent )
     {
         Application::RemoveUserEvent( m_nActivationEvent );
@@ -493,7 +482,6 @@ void FmXFormView::cancelEvents()
 //------------------------------------------------------------------------
 void FmXFormView::notifyViewDying( )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::notifyViewDying" );
     DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" );
     m_pView = NULL;
     cancelEvents();
@@ -502,7 +490,17 @@ void FmXFormView::notifyViewDying( )
 //------------------------------------------------------------------------
 FmXFormView::~FmXFormView()
 {
-    DBG_ASSERT(m_aWinList.size() == 0, "FmXFormView::~FmXFormView: Window list not empty!");
+    DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" );
+    if ( !m_aPageWindowAdapters.empty() )
+    {
+        for (   PageWindowAdapterList::const_iterator loop = m_aPageWindowAdapters.begin();
+                loop != m_aPageWindowAdapters.end();
+                ++loop
+            )
+        {
+            (*loop)->dispose();
+        }
+    }
 
     cancelEvents();
 
@@ -514,7 +512,6 @@ FmXFormView::~FmXFormView()
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::disposing" );
     if ( m_xWindow.is() && Source.Source == m_xWindow )
         removeGridWindowListening();
 }
@@ -523,7 +520,6 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formActivated" );
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formActivated( rEvent );
 }
@@ -531,7 +527,6 @@ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( Runti
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formDeactivated" );
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent );
 }
@@ -540,7 +535,6 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementInserted" );
     try
     {
         Reference< XControlContainer > xControlContainer( evt.Source, UNO_QUERY_THROW );
@@ -555,11 +549,9 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
         }
         else
         {
-            FmWinRecList::iterator pos = findWindow( xControlContainer );
-            if ( pos != m_aWinList.end() )
-            {
-                (*pos)->updateTabOrder( xForm );
-            }
+            PFormViewPageWindowAdapter pAdapter = findWindow( xControlContainer );
+            if ( pAdapter.is() )
+                pAdapter->updateTabOrder( xForm );
         }
     }
     catch( const Exception& )
@@ -571,92 +563,80 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementReplaced" );
     elementInserted(evt);
 }
 
 //------------------------------------------------------------------------------
 void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementRemoved" );
 }
 
 //------------------------------------------------------------------------------
-FmWinRecList::const_iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )  const
+PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )  const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" );
-    for (FmWinRecList::const_iterator i = m_aWinList.begin();
-            i != m_aWinList.end(); ++i)
-    {
-        if ( _rxCC == (*i)->getControlContainer() )
-            return i;
-    }
-    return m_aWinList.end();
-}
-
-//------------------------------------------------------------------------------
-FmWinRecList::iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" );
-    for (FmWinRecList::iterator i = m_aWinList.begin();
-            i != m_aWinList.end(); ++i)
+    for (   PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin();
+            i != m_aPageWindowAdapters.end();
+            ++i
+        )
     {
         if ( _rxCC == (*i)->getControlContainer() )
-            return i;
+            return *i;
     }
-    return m_aWinList.end();
+    return NULL;
 }
 
 //------------------------------------------------------------------------------
 void FmXFormView::addWindow(const SdrPageWindow& rWindow)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::addWindow" );
     FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() );
     if ( !pFormPage )
         return;
 
     Reference< XControlContainer > xCC = rWindow.GetControlContainer();
-    if ( xCC.is() && findWindow( xCC ) == m_aWinList.end())
+    if  (   xCC.is()
+        &&  ( !findWindow( xCC ).is() )
+        )
     {
-        FmXPageViewWinRec *pFmRec = new FmXPageViewWinRec( m_aContext, rWindow, this );
-        pFmRec->acquire();
-
-        m_aWinList.push_back(pFmRec);
+        PFormViewPageWindowAdapter pAdapter = new FormViewPageWindowAdapter( m_aContext, rWindow, this );
+        m_aPageWindowAdapters.push_back( pAdapter );
 
         // Am ControlContainer horchen um Aenderungen mitzbekommen
         Reference< XContainer >  xContainer( xCC, UNO_QUERY );
-        if (xContainer.is())
-            xContainer->addContainerListener(this);
+        if ( xContainer.is() )
+            xContainer->addContainerListener( this );
     }
 }
 
 //------------------------------------------------------------------------------
 void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeWindow" );
     // Wird gerufen, wenn
     // - in den Design-Modus geschaltet wird
     // - ein Window geloescht wird, waehrend man im Design-Modus ist
     // - der Control-Container fuer ein Window entfernt wird, waehrend
     //   der aktive Modus eingeschaltet ist.
-    FmWinRecList::iterator i = findWindow( _rxCC );
-    if (i != m_aWinList.end())
+
+    for (   PageWindowAdapterList::iterator i = m_aPageWindowAdapters.begin();
+            i != m_aPageWindowAdapters.end();
+            ++i
+        )
     {
-        // Am ControlContainer horchen um Aenderungen mitzbekommen
+        if ( _rxCC != (*i)->getControlContainer() )
+            continue;
+
         Reference< XContainer >  xContainer( _rxCC, UNO_QUERY );
-        if (xContainer.is())
-            xContainer->removeContainerListener(this);
+        if ( xContainer.is() )
+            xContainer->removeContainerListener( this );
 
         (*i)->dispose();
-        (*i)->release();
-        m_aWinList.erase(i);
+        m_aPageWindowAdapters.erase( i );
+        break;
     }
 }
 
 //------------------------------------------------------------------------------
 void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::displayAsyncErrorMessage" );
     DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" );
         // This should not happen - usually, the PostUserEvent is faster than any possible user
         // interaction which could trigger a new error. If it happens, we need a queue for the events.
@@ -675,7 +655,6 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------------
 void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onFirstViewActivation" );
     if ( _pDocModel && _pDocModel->GetAutoControlFocus() )
         m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) );
 }
@@ -683,7 +662,6 @@ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel )
 //------------------------------------------------------------------------------
 void FmXFormView::suspendTabOrderUpdate()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::suspendTabOrderUpdate" );
     OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" );
     m_isTabOrderUpdateSuspended = true;
 }
@@ -691,7 +669,6 @@ void FmXFormView::suspendTabOrderUpdate()
 //------------------------------------------------------------------------------
 void FmXFormView::resumeTabOrderUpdate()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::resumeTabOrderUpdate" );
     OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" );
     m_isTabOrderUpdateSuspended = false;
 
@@ -701,8 +678,8 @@ void FmXFormView::resumeTabOrderUpdate()
             ++container
         )
     {
-        FmWinRecList::iterator pos = findWindow( container->first );
-        if ( pos == m_aWinList.end() )
+        PFormViewPageWindowAdapter pAdapter = findWindow( container->first );
+        if ( !pAdapter.is() )
             continue;
 
         for (   SetOfForms::const_iterator form = container->second.begin();
@@ -710,7 +687,7 @@ void FmXFormView::resumeTabOrderUpdate()
                 ++form
             )
         {
-            (*pos)->updateTabOrder( *form );
+            pAdapter->updateTabOrder( *form );
         }
     }
     m_aNeedTabOrderUpdate.clear();
@@ -731,41 +708,42 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
     if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW)
     {
         Window* pWindow = const_cast<Window*>(static_cast<const Window*>(m_pView->GetActualOutDev()));
-        FmXPageViewWinRec* pFmRec = m_aWinList.size() ? m_aWinList[0] : NULL;
-        for (FmWinRecList::const_iterator i = m_aWinList.begin();
-            i != m_aWinList.end(); ++i)
+        PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
+        for (   PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin();
+                i != m_aPageWindowAdapters.end();
+                ++i
+            )
         {
-            if (pWindow == (*i)->getWindow())
-                pFmRec =*i;
+            if ( pWindow == (*i)->getWindow() )
+                pAdapter =*i;
         }
 
-        if (pFmRec)
+        if ( pAdapter.get() )
         {
-            for (::std::vector< Reference< XFormController > >::const_iterator i = pFmRec->GetList().begin();
-                i != pFmRec->GetList().end(); i++)
+            for (   ::std::vector< Reference< XFormController > >::const_iterator i = pAdapter->GetList().begin();
+                    i != pAdapter->GetList().end();
+                    ++i
+                )
             {
                 const Reference< XFormController > & xController = *i;
-                if (xController.is())
+                if ( !xController.is() )
+                    continue;
+
+                // only database forms are to be activated
+                Reference< XRowSet >  xForm(xController->getModel(), UNO_QUERY);
+                if ( !xForm.is() || !OStaticDataAccessTools().getRowSetConnection( xForm ).is() )
+                    continue;
+
+                Reference< XPropertySet > xFormSet( xForm, UNO_QUERY );
+                ENSURE_OR_CONTINUE( xFormSet.is(), "FmXFormView::OnActivate: a form which does not have properties?" );
+
+                const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
+                if ( aSource.getLength() )
                 {
-                    // Nur bei Datenbankformularen erfolgt eine aktivierung
-                    Reference< XRowSet >  xForm(xController->getModel(), UNO_QUERY);
-                    if (xForm.is() && OStaticDataAccessTools().getRowSetConnection(xForm).is())
-                    {
-                        Reference< XPropertySet >  xFormSet(xForm, UNO_QUERY);
-                        if (xFormSet.is())
-                        {
-                            // wenn es eine Datenquelle gibt, dann als aktive ::com::sun::star::form setzen
-                            ::rtl::OUString aSource = ::comphelper::getString(xFormSet->getPropertyValue(FM_PROP_COMMAND));
-                            if (aSource.getLength())
-                            {
-                                // benachrichtigung der Shell
-                                FmXFormShell* pShImpl =  m_pView->GetFormShell()->GetImpl();
-                                if (pShImpl)
-                                    pShImpl->setActiveController(xController);
-                                break;
-                            }
-                        }
-                    }
+                    FmXFormShell* pShImpl =  m_pView->GetFormShell()->GetImpl();
+                    if ( pShImpl )
+                        pShImpl->setActiveController( xController );
+                    break;
                 }
             }
         }
@@ -776,7 +754,6 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
 //------------------------------------------------------------------------------
 void FmXFormView::Activate(sal_Bool bSync)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Activate" );
     if (m_nActivationEvent)
     {
         Application::RemoveUserEvent(m_nActivationEvent);
@@ -792,9 +769,8 @@ void FmXFormView::Activate(sal_Bool bSync)
 }
 
 //------------------------------------------------------------------------------
-void FmXFormView::Deactivate(BOOL bDeactivateController)
+void FmXFormView::Deactivate(sal_Bool bDeactivateController)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Deactivate" );
     if (m_nActivationEvent)
     {
         Application::RemoveUserEvent(m_nActivationEvent);
@@ -809,13 +785,11 @@ void FmXFormView::Deactivate(BOOL bDeactivateController)
 //------------------------------------------------------------------------------
 FmFormShell* FmXFormView::GetFormShell() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::GetFormShell" );
     return m_pView ? m_pView->GetFormShell() : NULL;
 }
 // -----------------------------------------------------------------------------
 void FmXFormView::AutoFocus( sal_Bool _bSync )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::AutoFocus" );
     if (m_nAutoFocusEvent)
         Application::RemoveUserEvent(m_nAutoFocusEvent);
 
@@ -928,18 +902,20 @@ namespace
 // -----------------------------------------------------------------------------
 Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::getFormController" );
     Reference< XFormController > xController;
 
-    for ( FmWinRecList::const_iterator rec = m_aWinList.begin(); rec != m_aWinList.end(); ++rec )
+    for (   PageWindowAdapterList::const_iterator pos = m_aPageWindowAdapters.begin();
+            pos != m_aPageWindowAdapters.end();
+            ++pos
+        )
     {
-        const FmXPageViewWinRec* pViewWinRec( *rec );
-        OSL_ENSURE( pViewWinRec, "FmXFormView::getFormController: invalid PageViewWinRec!" );
-        if ( !pViewWinRec || ( pViewWinRec->getWindow() != &_rDevice ) )
+        const PFormViewPageWindowAdapter pAdapter( *pos );
+        ENSURE_OR_CONTINUE( pAdapter.get(), "FmXFormView::getFormController: invalid page window adapter!" );
+        if ( pAdapter->getWindow() != &_rDevice )
             // wrong device
             continue;
 
-        xController = pViewWinRec->getController( _rxForm );
+        xController = pAdapter->getController( _rxForm );
         if ( xController.is() )
             break;
     }
@@ -961,12 +937,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
     FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL;
     Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() );
 
-    const FmXPageViewWinRec* pViewWinRec = m_aWinList.size() ? m_aWinList[0] : NULL;
-    const Window* pWindow = pViewWinRec ? pViewWinRec->getWindow() : NULL;
+    const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
+    const Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL;
 
-    OSL_ENSURE( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" );
-    if ( !xForms.is() || !pWindow )
-        return 0L;
+    ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L );
 
     try
     {
@@ -974,7 +948,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
         if ( !xForms->getCount() )
             break;
         Reference< XForm > xForm( xForms->getByIndex( 0 ), UNO_QUERY_THROW );
-        Reference< XTabController > xTabController( pViewWinRec->getController( xForm ), UNO_QUERY_THROW );
+        Reference< XTabController > xTabController( pAdapter->getController( xForm ), UNO_QUERY_THROW );
 
         // go for the first control of the controller
         Sequence< Reference< XControl > > aControls( xTabController->getControls() );
@@ -1025,7 +999,6 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
 // -----------------------------------------------------------------------------
 void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" );
     FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL;
     FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : NULL;
     OSL_ENSURE( pShellImpl, "FmXFormView::onCreatedFormObject: no form shell!" );
@@ -1156,7 +1129,6 @@ namespace
 // -----------------------------------------------------------------------------
 SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateFieldControl" );
     // not if we're in design mode
     if ( !m_pView->IsDesignMode() )
         return NULL;
@@ -1388,7 +1360,6 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
 // -----------------------------------------------------------------------------
 SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateXFormsControl" );
     // not if we're in design mode
     if ( !m_pView->IsDesignMode() )
         return NULL;
@@ -1524,7 +1495,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
         const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName,
         const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" );
     if  (   !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM,
                 _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT,
                 NULL, NULL, NULL, _rpLabel, _rpControl )
@@ -1549,10 +1519,9 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
 bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext,
     OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField,
     const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
-    const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+    const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
     SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" );
     sal_Int32 nDataType = 0;
     ::rtl::OUString sFieldName;
     Any aFieldName;
@@ -1718,13 +1687,12 @@ void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const S
 //------------------------------------------------------------------------------
 void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::ObjectRemovedInAliveMode" );
     // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht,
     // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen
     // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen)
 
-    ULONG nCount = m_aMark.GetMarkCount();
-    for (ULONG i = 0; i < nCount; ++i)
+    sal_uIntPtr nCount = m_aMark.GetMarkCount();
+    for (sal_uIntPtr i = 0; i < nCount; ++i)
     {
         SdrMark* pMark = m_aMark.GetMark(i);
         SdrObject* pCurrent = pMark->GetMarkedSdrObj();
@@ -1741,7 +1709,6 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
 //------------------------------------------------------------------------------
 void FmXFormView::stopMarkListWatching()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::stopMarkListWatching" );
     if ( m_pWatchStoredList )
     {
         m_pWatchStoredList->EndListeningAll();
@@ -1753,7 +1720,6 @@ void FmXFormView::stopMarkListWatching()
 //------------------------------------------------------------------------------
 void FmXFormView::startMarkListWatching()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::startMarkListWatching" );
     if ( !m_pWatchStoredList )
     {
         m_pWatchStoredList = new ObjectRemoveListener( this );
@@ -1770,14 +1736,13 @@ void FmXFormView::startMarkListWatching()
 //------------------------------------------------------------------------------
 void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::saveMarkList" );
     if ( m_pView )
     {
         m_aMark = m_pView->GetMarkedObjectList();
         if ( _bSmartUnmark )
         {
-            ULONG nCount = m_aMark.GetMarkCount( );
-            for ( ULONG i = 0; i < nCount; ++i )
+            sal_uIntPtr nCount = m_aMark.GetMarkCount( );
+            for ( sal_uIntPtr i = 0; i < nCount; ++i )
             {
                 SdrMark*   pMark = m_aMark.GetMark(i);
                 SdrObject* pObj  = pMark->GetMarkedSdrObj();
@@ -1829,7 +1794,6 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
 //------------------------------------------------------------------------------
 void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::restoreMarkList" );
     if ( !m_pView )
         return;
 
@@ -1844,15 +1808,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
             sal_Bool bMisMatch = sal_False;
 
             // loop through all current marks
-            ULONG nCurrentCount = rCurrentList.GetMarkCount();
-            for ( ULONG i=0; i<nCurrentCount&& !bMisMatch; ++i )
+            sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount();
+            for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i )
             {
                 const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj();
 
                 // loop through all saved marks, check for equality
                 sal_Bool bFound = sal_False;
-                ULONG nSavedCount = m_aMark.GetMarkCount();
-                for ( ULONG j=0; j<nSavedCount && !bFound; ++j )
+                sal_uIntPtr nSavedCount = m_aMark.GetMarkCount();
+                for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j )
                 {
                     if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked )
                         bFound = sal_True;
@@ -1877,8 +1841,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
         sal_Bool bFound = sal_True;
 
         // gibt es noch alle Objecte
-        ULONG nCount = m_aMark.GetMarkCount();
-        for (ULONG i = 0; i < nCount && bFound; i++)
+        sal_uIntPtr nCount = m_aMark.GetMarkCount();
+        for (sal_uIntPtr i = 0; i < nCount && bFound; i++)
         {
             SdrMark*   pMark = m_aMark.GetMark(i);
             SdrObject* pObj  = pMark->GetMarkedSdrObj();
@@ -1899,7 +1863,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
             // Das LastObject auswerten
             if (nCount) // Objecte jetzt Markieren
             {
-                for (ULONG i = 0; i < nCount; i++)
+                for (sal_uIntPtr i = 0; i < nCount; i++)
                 {
                     SdrMark* pMark = m_aMark.GetMark(i);
                     SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1917,33 +1881,30 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusGained" );
     if ( m_xWindow.is() && m_pView )
     {
-        m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() );
+        m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() );
     }
 }
 // -----------------------------------------------------------------------------
 void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusLost" );
     // when switch the focus outside the office the mark didn't change
     // so we can not remove us as focus listener
     if ( m_xWindow.is() && m_pView )
     {
-        m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+        m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
     }
 }
 // -----------------------------------------------------------------------------
 void FmXFormView::removeGridWindowListening()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeGridWindowListening" );
     if ( m_xWindow.is() )
     {
         m_xWindow->removeFocusListener(this);
         if ( m_pView )
         {
-            m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+            m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
         }
         m_xWindow = NULL;
     }
@@ -1952,7 +1913,6 @@ void FmXFormView::removeGridWindowListening()
 // -----------------------------------------------------------------------------
 DocumentType FmXFormView::impl_getDocumentType() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::impl_getDocumentType" );
     if ( GetFormShell() && GetFormShell()->GetImpl() )
         return GetFormShell()->GetImpl()->getDocumentType();
     return eUnknownDocumentType;
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index b2070230fd..bc3080d5cd 100644..100755
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -32,7 +32,7 @@
 #include "formcontrolfactory.hxx"
 #include "fmcontrollayout.hxx"
 #include "fmprop.hrc"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/dialmgr.hxx"
 #include "svx/svdouno.hxx"
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0a9d79a867..a78ba001b1 100644..100755
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -37,7 +37,7 @@
 #include "formcontrolling.hxx"
 #include "fmprop.hrc"
 #include "svx/dialmgr.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmservs.hxx"
 #include "svx/fmtools.hxx"
 #include "fmurl.hxx"
@@ -63,6 +63,7 @@
 #include <com/sun/star/sdb/RowChangeAction.hpp>
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/form/runtime/FormOperations.hpp>
 #include <com/sun/star/form/runtime/FormFeature.hpp>
@@ -81,6 +82,7 @@
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
+#include <comphelper/flagguard.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <toolkit/controls/unocontrol.hxx>
@@ -210,6 +212,7 @@ namespace svxform
     namespace FocusChangeReason = ::com::sun::star::awt::FocusChangeReason;
     namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction;
     namespace FormFeature = ::com::sun::star::form::runtime::FormFeature;
+    namespace DataType = ::com::sun::star::sdbc::DataType;
 
 //==============================================================================
 // ColumnInfo
@@ -478,7 +481,10 @@ class FmXAutoControl: public UnoControl
     friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl();
 
 public:
-    FmXAutoControl(){}
+    FmXAutoControl( const ::comphelper::ComponentContext& i_context )
+        :UnoControl( i_context.getLegacyServiceFactory() )
+    {
+    }
 
     virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));}
     virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException );
@@ -585,6 +591,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB
                   ,m_bAttachEvents(sal_True)
                   ,m_bDetachEvents(sal_True)
                   ,m_bAttemptedHandlerCreation( false )
+                  ,m_bSuspendFilterTextListening( false )
 {
     DBG_CTOR( FormController, NULL );
 
@@ -784,6 +791,9 @@ namespace
 // -----------------------------------------------------------------------------
 void FormController::impl_setTextOnAllFilter_throw()
 {
+    m_bSuspendFilterTextListening = true;
+    ::comphelper::FlagGuard aResetFlag( m_bSuspendFilterTextListening );
+
     // reset the text for all controls
     ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), ResetComponentText() );
 
@@ -857,32 +867,38 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
                         if ( rRow.empty() )
                             continue;
 
-                        if ( aFilter.getLength() )
-                            aFilter.appendAscii( " OR " );
-
-                        aFilter.appendAscii( "( " );
+                        ::rtl::OUStringBuffer aRowFilter;
                         for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition )
                         {
                             // get the field of the controls map
                             Reference< XControl > xControl( condition->first, UNO_QUERY_THROW );
                             Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW );
                             Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW );
-                            if ( condition != rRow.begin() )
-                                aFilter.appendAscii( " AND " );
 
                             ::rtl::OUString sFilterValue( condition->second );
 
                             ::rtl::OUString sErrorMsg, sCriteria;
-                            ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
+                            const ::rtl::Reference< ISQLParseNode > xParseNode =
+                                predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
                             OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" );
                             if ( xParseNode.is() )
                             {
                                 // don't use a parse context here, we need it unlocalized
                                 xParseNode->parseNodeToStr( sCriteria, xConnection, NULL );
-                                aFilter.append( sCriteria );
+                                if ( condition != rRow.begin() )
+                                    aRowFilter.appendAscii( " AND " );
+                                aRowFilter.append( sCriteria );
                             }
                         }
-                        aFilter.appendAscii( " )" );
+                        if ( aRowFilter.getLength() > 0 )
+                        {
+                            if ( aFilter.getLength() )
+                                aFilter.appendAscii( " OR " );
+
+                            aFilter.appendAscii( "( " );
+                            aFilter.append( aRowFilter.makeStringAndClear() );
+                            aFilter.appendAscii( " )" );
+                        }
                     }
                 }
                 catch( const Exception& )
@@ -1440,7 +1456,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
                         &&  ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_AUTOINCREMENT ) )
                         )
                     {
-                        replaceControl( xControl, new FmXAutoControl );
+                        replaceControl( xControl, new FmXAutoControl( m_aContext ) );
                     }
                 }
             }
@@ -1496,50 +1512,54 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
-    if (m_bFiltering)
+    if ( !m_bFiltering )
     {
-        Reference< XTextComponent >  xText(e.Source,UNO_QUERY);
-        ::rtl::OUString aText = xText->getText();
-
-        if ( m_aFilterRows.empty() )
-            appendEmptyDisjunctiveTerm();
+        impl_onModify();
+        return;
+    }
 
-        // Suchen der aktuellen Row
-        if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) )
-        {
-            OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" );
-            return;
-        }
+    if ( m_bSuspendFilterTextListening )
+        return;
 
-        FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ];
+    Reference< XTextComponent >  xText(e.Source,UNO_QUERY);
+    ::rtl::OUString aText = xText->getText();
 
-        // do we have a new filter
-        if (aText.getLength())
-            rRow[xText] = aText;
-        else
-        {
-            // do we have the control in the row
-            FmFilterRow::iterator iter = rRow.find(xText);
-            // erase the entry out of the row
-            if (iter != rRow.end())
-                rRow.erase(iter);
-        }
+    if ( m_aFilterRows.empty() )
+        appendEmptyDisjunctiveTerm();
 
-        // multiplex the event to our FilterControllerListeners
-        FilterEvent aEvent;
-        aEvent.Source = *this;
-        aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin();
-        aEvent.DisjunctiveTerm = getActiveTerm();
-        aEvent.PredicateExpression = aText;
+    // Suchen der aktuellen Row
+    if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) )
+    {
+        OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" );
+        return;
+    }
 
-        aGuard.clear();
-        // <-- SYNCHRONIZED
+    FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ];
 
-        // notify the changed filter expression
-        m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent );
-    }
+    // do we have a new filter
+    if (aText.getLength())
+        rRow[xText] = aText;
     else
-        impl_onModify();
+    {
+        // do we have the control in the row
+        FmFilterRow::iterator iter = rRow.find(xText);
+        // erase the entry out of the row
+        if (iter != rRow.end())
+            rRow.erase(iter);
+    }
+
+    // multiplex the event to our FilterControllerListeners
+    FilterEvent aEvent;
+    aEvent.Source = *this;
+    aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin();
+    aEvent.DisjunctiveTerm = getActiveTerm();
+    aEvent.PredicateExpression = aText;
+
+    aGuard.clear();
+    // <-- SYNCHRONIZED
+
+    // notify the changed filter expression
+    m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent );
 }
 
 // XItemListener
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 81d622d80b..81d622d80b 100644..100755
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 7841d7edc5..7841d7edc5 100644..100755
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index b64ffad561..b64ffad561 100644..100755
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f92b762b84..5b9312a674 100644..100755
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -25,12 +25,13 @@
  *
  ************************************************************************/
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
 #include "globlmn.hrc"
 #include "helpid.hrc"
+#include "fmhelp.hrc"
 
 Menu RID_FM_TEXTATTRIBUTE_MENU
 {
@@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_STYLE;
-            HelpID = MENU_FM_TEXTATTRIBITES_STYLE;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE;
             Text [ en-US ] = "St~yle";
             SubMenu = Menu
             {
@@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
-            HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT;
             Text [ en-US ] = "~Alignment";
             RadioCheck = TRUE;
             SubMenu = Menu
@@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_SPACING;
-            HelpID = MENU_FM_TEXTATTRIBITES_SPACING;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING;
             Text [ en-US ] = "~Line Spacing";
             _MenuItemFlags = MIB_RADIOCHECK;
             SubMenu = Menu
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index a0835a864a..6ca8fa78aa 100644..100755
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -59,7 +59,7 @@ namespace svxform
     }
 
     //--------------------------------------------------------------------
-    void FormToolboxes::toggleToolbox( USHORT _nSlotId ) const
+    void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const
     {
         try
         {
@@ -87,14 +87,14 @@ namespace svxform
     }
 
     //--------------------------------------------------------------------
-    bool FormToolboxes::isToolboxVisible( USHORT _nSlotId ) const
+    bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const
     {
         return m_xLayouter.is() && m_xLayouter->isElementVisible(
             getToolboxResourceName( _nSlotId ) );
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString FormToolboxes::getToolboxResourceName( USHORT _nSlotId ) const
+    ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
     {
         OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
             "FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 64c3805365..64c3805365 100644..100755
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index 44bcd53d23..44bcd53d23 100644..100755
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 2e0a5fa6f9..2780e7763c 100644..100755
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -33,12 +33,12 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmservs.hxx"
 #include "fmundo.hxx"
@@ -58,7 +58,7 @@
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
@@ -698,7 +698,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos )
+    SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" );
         //////////////////////////////////////////////////////////////////////
@@ -760,7 +760,7 @@ namespace svxform
 
         // beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet
         // habe, muss ich mich hinterher darum kuemmern
-        ULONG nExpectedSelectionCount = GetSelectionCount();
+        sal_uIntPtr nExpectedSelectionCount = GetSelectionCount();
 
         if( pEntry )
             GetModel()->Remove( pEntry );
@@ -1738,7 +1738,7 @@ namespace svxform
                     // erstmal die PropertySet-Interfaces der Forms einsammeln
                     for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i )
                     {
-                        FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+                        FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
                         aSelection.insert( pFormData->GetPropertySet().get() );
                     }
                 }
@@ -1748,7 +1748,7 @@ namespace svxform
                     {   // ein MultiSet fuer die Properties der hidden controls
                         for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i )
                         {
-                            FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+                            FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
                             aSelection.insert( pEntryData->GetPropertySet().get() );
                         }
                     }
@@ -1780,7 +1780,7 @@ namespace svxform
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" );
         // die Root darf ich natuerlich nicht mitloeschen
         sal_Bool bRootSelected = IsSelected(m_pRootEntry);
-        ULONG nSelectedEntries = GetSelectionCount();
+        sal_uIntPtr nSelectedEntries = GetSelectionCount();
         if (bRootSelected && (nSelectedEntries > 1))     // die Root plus andere Elemente ?
             Select(m_pRootEntry, sal_False);                // ja -> die Root raus
 
@@ -1821,7 +1821,7 @@ namespace svxform
         // then go on to the strucure. This means I have to delete the forms *after* the normal controls, so
         // that during UNDO, they're restored in the proper order.
         pFormShell->GetImpl()->EnableTrackProperties(sal_False);
-        USHORT i;
+        sal_uInt16 i;
         for (i = m_arrCurrentSelection.Count(); i>0; --i)
         {
             FmEntryData* pCurrent = (FmEntryData*)(m_arrCurrentSelection.GetObject(i - 1)->GetUserData());
@@ -2081,7 +2081,7 @@ namespace svxform
 
         for (sal_uInt32 i=0; i<m_arrCurrentSelection.Count(); ++i)
         {
-            SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((USHORT)i);
+            SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((sal_uInt16)i);
             // Bei Formselektion alle Controls dieser Form markieren
             if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry))
                 MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 3381b2cf78..e7ad4200ab 100644..100755
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -33,7 +33,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmglob.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 
@@ -43,7 +43,7 @@
 #include "fmhelp.hrc"
 #include "fmexpl.hrc"
 #include "fmexpl.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmshimp.hxx"
 #include "fmobj.hxx"
 #include <sfx2/objsh.hxx>
@@ -290,7 +290,7 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel)
+    void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" );
         if (IsListening(*m_pFormModel))
@@ -865,7 +865,7 @@ namespace svxform
         FmNavRequestSelectHint rshRequestSelection;
         sal_Bool bIsMixedSelection = sal_False;
 
-        for (ULONG i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
+        for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++)
         {
             SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj();
             bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent);
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index 084bad82c2..084bad82c2 100644..100755
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index ba8ebe4aac..f50e67d9ca 100644..100755
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include "sqlparserclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 
 //........................................................................
 namespace svxform
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 9e06f0851f..aaa4037513 100644..100755
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -51,7 +51,7 @@ namespace svx
     StringListResource::StringListResource( const ResId& _rResId )
         :Resource( _rResId )
     {
-        USHORT nLocalID = 1;
+        sal_uInt16 nLocalID = 1;
         ResId aLocalID( nLocalID, *_rResId.GetResMgr() );
         while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) )
         {
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index e3632cd731..a75fa9d2da 100644..100755
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -55,7 +55,7 @@
 
 #include "fmprop.hrc"
 
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
 #include <svx/svdpagv.hxx>
@@ -119,9 +119,9 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X
         if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
             xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
         if ( sLabel.getLength() )
-            _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+            _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
         else
-            _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
+            _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) );
     }
 }
 //==================================================================
@@ -158,7 +158,7 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
 }
 
 //------------------------------------------------------------------------------
-BOOL FmFieldWinListBox::DoubleClickHdl()
+sal_Bool FmFieldWinListBox::DoubleClickHdl()
 {
     if ( pTabWin->createSelectionControls() )
         return sal_True;
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index c2cd8dadb8..910554c6ca 100644..100755
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -44,10 +44,10 @@
 #include <vcl/sound.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxform.hxx"
-#include "fmresids.hrc"
+#include "svx/fmresids.hrc"
 #include "fmitems.hxx"
 #include "fmhelp.hrc"
 #include <sfx2/viewfrm.hxx>
@@ -76,7 +76,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle
     SetSizePixel( Size(70,19) );
 
     SetDecimalDigits(0);
-    SetStrictFormat(TRUE);
+    SetStrictFormat(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -96,7 +96,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
             return;
         }
 
-        SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<INT32>(nRecord) );
+        SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<sal_Int32>(nRecord) );
 
         Any a;
         Sequence< PropertyValue > aArgs( 1 );
@@ -132,7 +132,7 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
 
 struct MapSlotToCmd
 {
-    USHORT      nSlotId;
+    sal_uInt16      nSlotId;
     const char* pCommand;
 };
 
@@ -165,7 +165,7 @@ static MapSlotToCmd SlotToCommands[] =
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item );
 
 //-----------------------------------------------------------------------
-SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SfxToolBoxControl( nSlotId, nId, rTbx )
     ,nLastSlot( 0 )
 {
@@ -173,11 +173,11 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if (nSID == SID_FM_CONFIG)
     {
-        UINT16 nSlot   = 0;
+        sal_uInt16 nSlot   = 0;
         if (eState >= SFX_ITEM_AVAILABLE)
             nSlot = ((SfxUInt16Item*)pState)->GetValue();
 
@@ -236,13 +236,13 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
+void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
 {
     //////////////////////////////////////////////////////////////////////
     // Click auf den Button SID_FM_CONFIG in der ObjectBar
     if ( nLastSlot )
     {
-        USHORT n = 0;
+        sal_uInt16 n = 0;
         while( SlotToCommands[n].nSlotId > 0 )
         {
             if ( SlotToCommands[n].nSlotId == nLastSlot )
@@ -267,7 +267,7 @@ void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
 DBG_NAME(SvxFmTbxCtlAbsRec);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
@@ -280,9 +280,9 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    USHORT 				nId = GetId();
+    sal_uInt16 				nId = GetId();
     ToolBox*			pToolBox = &GetToolBox();
     SvxFmAbsRecWin*		pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId) );
 
@@ -295,7 +295,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
         pWin->SetValue( pItem ? pItem->GetValue() : -1 );
     }
 
-    BOOL bEnable = SFX_ITEM_DISABLED != eState && pState;
+    sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
     if (!bEnable)
         pWin->SetText(String());
 
@@ -321,7 +321,7 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecText);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecText,NULL);
@@ -355,7 +355,7 @@ Window*	SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecFromText);
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
@@ -388,7 +388,7 @@ DBG_NAME(SvxFmTbxCtlRecTotal);
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
     ,pFixedText( NULL )
 {
@@ -410,12 +410,12 @@ Window*	SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
     aSize.Width() += 12;
     pFixedText->SetSizePixel( aSize );
     pFixedText->SetBackground();
-    pFixedText->SetPaintTransparent(TRUE);
+    pFixedText->SetPaintTransparent(sal_True);
     return pFixedText;
 }
 
 //-----------------------------------------------------------------------
-void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     //////////////////////////////////////////////////////////////////////
     // Setzen des FixedTextes
@@ -441,7 +441,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
@@ -450,7 +450,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
     MouseSettings aMouseSettings = aSettings.GetMouseSettings();
     aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
     aSettings.SetMouseSettings(aMouseSettings);
-    rTbx.SetSettings(aSettings, TRUE);
+    rTbx.SetSettings(aSettings, sal_True);
 }
 
 //========================================================================
@@ -459,7 +459,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
 
 //-----------------------------------------------------------------------
-SvxFmTbxPrevRec::SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx
index b20b75a7dd..b20b75a7dd 100644..100755
--- a/svx/source/form/typeconversionclient.cxx
+++ b/svx/source/form/typeconversionclient.cxx
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index dfb5a1b79f..ee6002ac34 100644..100755
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -38,7 +38,7 @@
 #include <editeng/cntritem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/postitem.hxx>
-#include "clipfmtitem.hxx"
+#include "svx/clipfmtitem.hxx"
 #include <editeng/fhgtitem.hxx>
 #include "editeng/fontitem.hxx"
 #include <editeng/charreliefitem.hxx>
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 1911c06f81..1911c06f81 100644..100755
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index c9067aa789..127d75348d 100644..100755
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -50,23 +50,23 @@ GalleryCodec::~GalleryCodec()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
+sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
 {
-    const ULONG	nPos = rStm.Tell();
-    BOOL		bRet;
-    BYTE		cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
+    const sal_uIntPtr	nPos = rStm.Tell();
+    sal_Bool		bRet;
+    sal_uInt8		cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
 
     rStm >> cByte1 >> cByte2 >> cByte3 >> cByte4 >> cByte5 >> cByte6;
 
     if ( cByte1 == 'S' && cByte2 == 'V' && cByte3 == 'R' && cByte4 == 'L' && cByte5 == 'E' && ( cByte6 == '1' || cByte6 == '2' ) )
     {
         rVersion = ( ( cByte6 == '1' ) ? 1 : 2 );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     else
     {
         rVersion = 0;
-        bRet = FALSE;
+        bRet = sal_False;
     }
 
     rStm.Seek( nPos );
@@ -78,10 +78,10 @@ BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
 
 void GalleryCodec::Write( SvStream& rStmToWrite )
 {
-    UINT32 nPos, nCompSize;
+    sal_uInt32 nPos, nCompSize;
     
     rStmToWrite.Seek( STREAM_SEEK_TO_END );
-    const UINT32 nSize = rStmToWrite.Tell();
+    const sal_uInt32 nSize = rStmToWrite.Tell();
     rStmToWrite.Seek( 0UL );
 
     rStm << 'S' << 'V' << 'R' << 'L' << 'E' << '2';
@@ -105,11 +105,11 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
 
 void GalleryCodec::Read( SvStream& rStmToRead )
 {
-    UINT32 nVersion = 0;
+    sal_uInt32 nVersion = 0;
 
     if( IsCoded( rStm, nVersion ) )
     {
-        UINT32	nCompressedSize, nUnCompressedSize;
+        sal_uInt32	nCompressedSize, nUnCompressedSize;
 
         rStm.SeekRel( 6 );
         rStm >> nUnCompressedSize >> nCompressedSize;
@@ -117,13 +117,13 @@ void GalleryCodec::Read( SvStream& rStmToRead )
         // decompress
         if( 1 == nVersion )
         {
-            BYTE*   pCompressedBuffer = new BYTE[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
-            BYTE*	pInBuf = pCompressedBuffer;
-            BYTE*	pOutBuf = new BYTE[ nUnCompressedSize ];
-            BYTE*	pTmpBuf = pOutBuf;
-            BYTE*	pLast = pOutBuf + nUnCompressedSize - 1;
-            ULONG   nIndex = 0UL, nCountByte, nRunByte;
-            BOOL    bEndDecoding = FALSE;
+            sal_uInt8*   pCompressedBuffer = new sal_uInt8[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
+            sal_uInt8*	pInBuf = pCompressedBuffer;
+            sal_uInt8*	pOutBuf = new sal_uInt8[ nUnCompressedSize ];
+            sal_uInt8*	pTmpBuf = pOutBuf;
+            sal_uInt8*	pLast = pOutBuf + nUnCompressedSize - 1;
+            sal_uIntPtr   nIndex = 0UL, nCountByte, nRunByte;
+            sal_Bool    bEndDecoding = sal_False;
 
             do
             {
@@ -145,11 +145,11 @@ void GalleryCodec::Read( SvStream& rStmToRead )
                             pInBuf++;
                     }
                     else if ( nRunByte == 1 )   // Ende des Bildes
-                        bEndDecoding = TRUE;
+                        bEndDecoding = sal_True;
                 }
                 else
                 {
-                    const BYTE cVal = *pInBuf++;
+                    const sal_uInt8 cVal = *pInBuf++;
 
                     memset( &pTmpBuf[ nIndex ], cVal, nCountByte );
                     nIndex += nCountByte;
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index d5985dcbd2..d76a41e639 100644..100755
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -48,7 +48,7 @@ public:
     void        Write( SvStream& rStmToWrite );
     void        Read( SvStream& rStmToRead );
 
-    static BOOL IsCoded( SvStream& rStm, UINT32& rVersion );
+    static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 4797e4ecbb..2374aec009 100644..100755
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -39,7 +39,7 @@
 #include "svx/gallery1.hxx"
 #include "galbrws1.hxx"
 #include "galbrws2.hxx"
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -------------------
 // - GallerySplitter -
@@ -82,7 +82,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
 // - SvxGalleryChildWindow -
 // -------------------------
 
-GalleryChildWindow::GalleryChildWindow( Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
+GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
 {
     pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
@@ -117,11 +117,11 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW,
     SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() );
 
     mpBrowser1->SelectTheme( 0 );
-    mpBrowser1->Show( TRUE );
-    mpBrowser2->Show( TRUE );
+    mpBrowser1->Show( sal_True );
+    mpBrowser2->Show( sal_True );
 
     mpSplitter->SetSplitHdl( LINK( this, GalleryBrowser, SplitHdl ) );
-    mpSplitter->Show( TRUE );
+    mpSplitter->Show( sal_True );
 
     InitSettings();
 }
@@ -183,17 +183,17 @@ void GalleryBrowser::Resize()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
+sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
 {
-    const USHORT    nCode = rKEvt.GetKeyCode().GetCode();
-    BOOL            bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
+    const sal_uInt16    nCode = rKEvt.GetKeyCode().GetCode();
+    sal_Bool            bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
                            ( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) );
 
     if( bRet )
     {
         if( !rKEvt.GetKeyCode().IsShift() )
         {
-            if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+            if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
                 mpBrowser2->GetViewWindow()->GrabFocus();
             else if( mpBrowser2->GetViewWindow()->HasFocus() )
                 mpBrowser2->maViewBox.GrabFocus();
@@ -204,7 +204,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
         }
         else
         {
-            if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+            if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
                 mpBrowser1->maNewTheme.GrabFocus();
             else if( mpBrowser1->maNewTheme.HasFocus() )
                 mpBrowser2->maViewBox.GrabFocus();
@@ -220,7 +220,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::Close()
+sal_Bool GalleryBrowser::Close()
 {
     return SfxDockingWindow::Close();
 }
@@ -263,14 +263,14 @@ Graphic GalleryBrowser::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
 {
     return mpBrowser2->GetVCDrawModel( rModel );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser::IsLinkage() const
+sal_Bool GalleryBrowser::IsLinkage() const
 {
     return mpBrowser2->IsLinkage();
 }
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 1b29274dd0..2d909e7fc8 100644..100755
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -36,12 +36,14 @@
 #include <sfx2/app.hxx>
 #include "helpid.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
 #include "gallery.hrc"
 #include <algorithm>
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
 
 #include <svx/svxdlg.hxx>
 
@@ -162,13 +164,14 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
 
     mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
     mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
+    mpThemes->SetAccessibleName(String(SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ) );
 
-    for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
+    for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
         ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) );
 
     ImplAdjustControls();
-    maNewTheme.Show( TRUE );
-    mpThemes->Show( TRUE );
+    maNewTheme.Show( sal_True );
+    mpThemes->Show( sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -184,11 +187,11 @@ GalleryBrowser1::~GalleryBrowser1()
 
 // -----------------------------------------------------------------------------
 
-ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
+sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
 {
-    static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
+    static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
 
-    ULONG nRet = LISTBOX_ENTRY_NOTFOUND;
+    sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND;
 
     if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) )
     {
@@ -255,30 +258,30 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
 
 // -----------------------------------------------------------------------------
 
-::std::vector< USHORT > GalleryBrowser1::ImplGetExecuteVector()
+::std::vector< sal_uInt16 > GalleryBrowser1::ImplGetExecuteVector()
 {
-    ::std::vector< USHORT > aExecVector;
+    ::std::vector< sal_uInt16 > aExecVector;
     GalleryTheme*           pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
 
     if( pTheme )
     {
-        BOOL                bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
-        static const BOOL	bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
+        sal_Bool                bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
+        static const sal_Bool	bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
 
         if( pTheme->IsReadOnly() )
-            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = FALSE;
+            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
         else if( pTheme->IsImported() )
         {
-            bUpdateAllowed = FALSE;
-            bRenameAllowed = bRemoveAllowed = TRUE;
+            bUpdateAllowed = sal_False;
+            bRenameAllowed = bRemoveAllowed = sal_True;
         }
         else if( pTheme->IsDefault() )
         {
-            bUpdateAllowed = bRenameAllowed = TRUE;
-            bRemoveAllowed = FALSE;
+            bUpdateAllowed = bRenameAllowed = sal_True;
+            bRemoveAllowed = sal_False;
         }
         else
-            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = TRUE;
+            bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True;
 
         if( bUpdateAllowed && pTheme->GetObjectCount() )
             aExecVector.push_back( MN_ACTUALIZE );
@@ -341,7 +344,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog
         {
             const String    aOldName( aName );
             String          aTitle( mpExchangeData->aEditedTitle );
-            USHORT          nCount = 0;
+            sal_uInt16          nCount = 0;
 
             while( mpGallery->HasTheme( aTitle ) && ( nCount++ < 16000 ) )
             {
@@ -400,7 +403,7 @@ IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, p
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser1::ImplExecute( USHORT nId )
+void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
 {
     switch( nId )
     {
@@ -446,7 +449,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                 if( aNewName.Len() && ( aNewName != aOldName ) )
                 {
                     String	aName( aNewName );
-                    USHORT	nCount = 0;
+                    sal_uInt16	nCount = 0;
 
                     while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
                     {
@@ -477,7 +480,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
                     DBG_ASSERT(aDlg, "Dialogdiet fail!");
 
                     if( aDlg->Execute() == RET_OK )
-                        pTheme->SetId( aDlg->GetId(), TRUE );
+                        pTheme->SetId( aDlg->GetId(), sal_True );
                     delete aDlg;
                 }
             }
@@ -525,8 +528,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
         case( GALLERY_HINT_THEME_RENAMED ):
         {
-            const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
-            const USHORT nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+            const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+            const sal_uInt16 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
 
             mpThemes->RemoveEntry( rGalleryHint.GetThemeName() );
             ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetStringData() ) );
@@ -547,8 +550,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
         case( GALLERY_HINT_CLOSE_THEME ):
         {
-            const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
-            const USHORT nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+            const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+            const sal_uInt16 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
 
             if( nCurSelectPos == nCloseEntryPos )
             {
@@ -578,15 +581,15 @@ void GalleryBrowser1::ShowContextMenu()
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 {
-    BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+    sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
 
     if( !bRet )
     {
-        ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
-        USHORT                  nExecuteId = 0;
-        BOOL                    bMod1 = rKEvt.GetKeyCode().IsMod1();
+        ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
+        sal_uInt16                  nExecuteId = 0;
+        sal_Bool                    bMod1 = rKEvt.GetKeyCode().IsMod1();
 
         switch( rKEvt.GetKeyCode().GetCode() )
         {
@@ -637,7 +640,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
         if( nExecuteId && ( ::std::find( aExecVector.begin(), aExecVector.end(), nExecuteId ) != aExecVector.end() ) )
         {
             ImplExecute( nExecuteId );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -648,7 +651,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 
 IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG )
 {
-    ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
+    ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
 
     if( aExecVector.size() )
     {
@@ -696,7 +699,7 @@ IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG )
 {
     String	aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) );
     String	aName( aNewTheme );
-    ULONG	nCount = 0;
+    sal_uIntPtr	nCount = 0;
 
     while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
     {
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index fba8a8323d..cf46cfc5fa 100644..100755
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -31,7 +31,7 @@
 #include <vcl/menu.hxx>
 #include <svl/lstner.hxx>
 #include <vector>
-#include "galbrws.hxx"
+#include "svx/galbrws.hxx"
 
 // -----------------
 // - GalleryButton -
@@ -100,10 +100,10 @@ private:
     Image					aImgImported;
 
     void					ImplAdjustControls();
-    ULONG					ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
+    sal_uIntPtr					ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
     void					ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
-    ::std::vector< USHORT > ImplGetExecuteVector();
-    void                    ImplExecute( USHORT nId );
+    ::std::vector< sal_uInt16 > ImplGetExecuteVector();
+    void                    ImplExecute( sal_uInt16 nId );
     void                    ImplGalleryThemeProperties( const String & rThemeName, bool bCreateNew );
     void                    ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew );
 
@@ -128,11 +128,11 @@ public:
                             ~GalleryBrowser1();
 
     void					SelectTheme( const String& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); }
-    void					SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( (USHORT) nThemePos ); SelectThemeHdl( NULL ); }
+    void					SelectTheme( sal_uIntPtr nThemePos ) { mpThemes->SelectEntryPos( (sal_uInt16) nThemePos ); SelectThemeHdl( NULL ); }
     String					GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : String(); }
 
     void					ShowContextMenu();
-    BOOL                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+    sal_Bool                    KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index fc5e4d380b..ef95bbd96d 100644..100755
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -45,17 +45,19 @@
 #include "svtools/filter.hxx"
 #include <editeng/brshitem.hxx>
 #include "helpid.hrc"
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galctrl.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galctrl.hxx"
 #include "svx/galmisc.hxx"
 #include "galbrws2.hxx"
 #include "gallery.hrc"
 #include <vcl/svapp.hxx>
 #include <svx/fmmodel.hxx>
+#include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 
 // -----------
 // - Defines -
@@ -79,20 +81,20 @@ GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON;
 class GalleryBackgroundPopup : public PopupMenu, public SfxControllerItem
 {
     const GalleryTheme* mpTheme;
-    ULONG				mnObjectPos;
+    sal_uIntPtr				mnObjectPos;
 
     virtual void		Select();
-    virtual void		StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void		StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                    GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos );
+                    GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos );
                     ~GalleryBackgroundPopup();
 };
 
 // ------------------------------------------------------------------------
 
-GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos ) :
+GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) :
             SfxControllerItem	( SID_GALLERY_BG_BRUSH, SfxViewFrame::Current()->GetBindings() ),
             mpTheme				( pTheme ),
             mnObjectPos			( nObjectPos )
@@ -109,7 +111,7 @@ GalleryBackgroundPopup::~GalleryBackgroundPopup()
 
 // ------------------------------------------------------------------------
 
-void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
 {
     if ( ( nSID == SID_GALLERY_BG_BRUSH ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
     {
@@ -123,8 +125,8 @@ void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, con
             List* pList = pStrLstItem->GetList();
 
             if( pList )
-                for ( ULONG i = 0, nCount = pList->Count(); i < nCount; i++ )
-                    InsertItem( (USHORT) i + 1, *(String*) pList->GetObject( i ) );
+                for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ )
+                    InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) );
         }
         else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL )
             InsertItem( 1, pStrItem->GetValue() );
@@ -159,20 +161,20 @@ class GalleryThemePopup : public PopupMenu, public SfxControllerItem
 {
     GalleryBackgroundPopup	maBackgroundPopup;
     const GalleryTheme*		mpTheme;
-    ULONG					mnObjectPos;
-    BOOL					mbPreview;
+    sal_uIntPtr					mnObjectPos;
+    sal_Bool					mbPreview;
 
-    virtual void			StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void			StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
 public:
 
-                            GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview );
+                            GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview );
                             ~GalleryThemePopup();
 };
 
 // ------------------------------------------------------------------------
 
-GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview ) :
+GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) :
     PopupMenu			( GAL_RESID( RID_SVXMN_GALLERY2 ) ),
     SfxControllerItem	( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ),
     maBackgroundPopup	( pTheme, nObjectPos ),
@@ -186,7 +188,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
     INetURLObject       aURL;
 
     const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL );
-    const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+    const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
 
     pAddMenu->EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind );
     pAddMenu->EnableItem( MN_ADD_LINK, bValidURL && SGA_OBJ_SVDRAW != eObjKind );
@@ -198,28 +200,28 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
 
     if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() )
     {
-        EnableItem( MN_DELETE, FALSE );
-        EnableItem( MN_TITLE, FALSE );
+        EnableItem( MN_DELETE, sal_False );
+        EnableItem( MN_TITLE, sal_False );
 
         if( mpTheme->IsReadOnly() )
-            EnableItem( MN_PASTECLIPBOARD, FALSE );
+            EnableItem( MN_PASTECLIPBOARD, sal_False );
         
         if( !mpTheme->GetObjectCount() )
-            EnableItem( MN_COPYCLIPBOARD, FALSE );
+            EnableItem( MN_COPYCLIPBOARD, sal_False );
     }
     else
     {
         EnableItem( MN_DELETE, !bPreview );
-        EnableItem( MN_TITLE, TRUE );
-        EnableItem( MN_COPYCLIPBOARD, TRUE );
-        EnableItem( MN_PASTECLIPBOARD, TRUE );
+        EnableItem( MN_TITLE, sal_True );
+        EnableItem( MN_COPYCLIPBOARD, sal_True );
+        EnableItem( MN_PASTECLIPBOARD, sal_True );
     }
 
 #ifdef GALLERY_USE_CLIPBOARD
     if( IsItemEnabled( MN_PASTECLIPBOARD ) )
     {
         TransferableDataHelper	aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( this ) );
-        BOOL					bEnable = FALSE;
+        sal_Bool					bEnable = sal_False;
 
         if( aDataHelper.GetFormatCount() )
         {
@@ -230,23 +232,23 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
                 aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ||
                 aDataHelper.HasFormat( FORMAT_BITMAP ) )
             {
-                bEnable = TRUE;
+                bEnable = sal_True;
             }
         }
 
         if( !bEnable )
-            EnableItem( MN_PASTECLIPBOARD, FALSE );
+            EnableItem( MN_PASTECLIPBOARD, sal_False );
     }
 #else
-    EnableItem( MN_COPYCLIPBOARD, FALSE );
-    EnableItem( MN_PASTECLIPBOARD, FALSE );
+    EnableItem( MN_COPYCLIPBOARD, sal_False );
+    EnableItem( MN_PASTECLIPBOARD, sal_False );
 #endif
 
     if( !maBackgroundPopup.GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) )
-        pAddMenu->EnableItem( MN_BACKGROUND, FALSE );
+        pAddMenu->EnableItem( MN_BACKGROUND, sal_False );
     else
     {
-        pAddMenu->EnableItem( MN_BACKGROUND, TRUE );
+        pAddMenu->EnableItem( MN_BACKGROUND, sal_True );
         pAddMenu->SetPopupMenu( MN_BACKGROUND, &maBackgroundPopup );
     }
 
@@ -262,7 +264,7 @@ GalleryThemePopup::~GalleryThemePopup()
 
 // ------------------------------------------------------------------------
 
-void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
 {
     if( ( nSID == SID_GALLERY_ENABLE_ADDCOPY ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
     {
@@ -315,7 +317,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     mnCurActionPos		( 0xffffffff ),
     meMode              ( GALLERYBROWSERMODE_NONE ),
     meLastMode          ( GALLERYBROWSERMODE_NONE ),
-    mbCurActionIsLinkage( FALSE )
+    mbCurActionIsLinkage( sal_False )
 {
     Image       aDummyImage;
     const Link  aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
@@ -338,6 +340,9 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     maViewBox.SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) );
     maViewBox.Show();
 
+    mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
+    mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
+
     maInfoBar.Show();
     maSeparator.Show();
 
@@ -347,6 +352,12 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
     InitSettings();
 
     SetMode( ( GALLERYBROWSERMODE_PREVIEW != GalleryBrowser2::meInitMode ) ? GalleryBrowser2::meInitMode : GALLERYBROWSERMODE_ICON );
+
+    if(maInfoBar.GetText().Len() == 0)
+        mpIconView->SetAccessibleRelationLabeledBy(mpIconView);
+    else
+        mpIconView->SetAccessibleRelationLabeledBy(&maInfoBar);
+    mpIconView->SetAccessibleRelationMemberOf(mpIconView);
 }
 
 // -----------------------------------------------------------------------------
@@ -439,7 +450,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint )
             if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
                 SetMode( meLastMode );
 
-            ImplUpdateViews( (USHORT) rGalleryHint.GetData1() + 1 );
+            ImplUpdateViews( (sal_uInt16) rGalleryHint.GetData1() + 1 );
         }
         break;
 
@@ -484,8 +495,8 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent
     if( mpCurTheme )
     {
         Point		aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
-        const ULONG	nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
+        const sal_uIntPtr	nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
 
         if( mpCurTheme->IsDragging() )
             mpCurTheme->ChangeObjectPos( mpCurTheme->GetDragPos(), nInsertPos );
@@ -503,7 +514,7 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint )
     if( mpCurTheme )
     {
         Point		aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
 
         if( nItemId )
             mpCurTheme->StartDrag( this, nItemId - 1 );
@@ -523,7 +534,7 @@ void GalleryBrowser2::TogglePreview( Window*, const Point* )
 void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
 {
     Point		aSelPos;
-    const ULONG nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
+    const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
 
     if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) )
     {
@@ -544,31 +555,31 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
 {
     Point		aSelPos;
-    const ULONG	nItemId = ImplGetSelectedItemId( NULL, aSelPos );
-    BOOL        bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+    const sal_uIntPtr	nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+    sal_Bool        bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
 
     if( !bRet && !maViewBox.HasFocus() && nItemId && mpCurTheme )
     {
-        USHORT              nExecuteId = 0;
+        sal_uInt16              nExecuteId = 0;
         const SgaObjKind	eObjKind = mpCurTheme->GetObjectKind( nItemId - 1 );
         INetURLObject       aURL;
 
         const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
         
-        const BOOL  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
-        BOOL        bPreview = bValidURL;
-        BOOL        bAdd = bValidURL;
-        BOOL        bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
-        BOOL        bDelete = FALSE;
-        BOOL        bTitle = FALSE;
+        const sal_Bool  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+        sal_Bool        bPreview = bValidURL;
+        sal_Bool        bAdd = bValidURL;
+        sal_Bool        bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
+        sal_Bool        bDelete = sal_False;
+        sal_Bool        bTitle = sal_False;
 
         if( !mpCurTheme->IsReadOnly() && mpCurTheme->GetObjectCount() )
         {
             bDelete = ( GALLERYBROWSERMODE_PREVIEW != GetMode() );
-            bTitle = TRUE;
+            bTitle = sal_True;
         }
 
         switch( rKEvt.GetKeyCode().GetCode() )
@@ -580,7 +591,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
                 if( bPreview )
                 {
                     TogglePreview( pWindow );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
             break;
@@ -617,7 +628,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
         if( nExecuteId )
         {
             ImplExecute( nExecuteId );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -641,6 +652,10 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
     mpListView = new GalleryListView( this, mpCurTheme );
     mpPreview = new GalleryPreview( this, mpCurTheme );
 
+    mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
+    mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) ));
+    mpPreview->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_PREVIEW ) ));
+
     const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
 
     mpIconView->SetSelectHdl( aSelectHdl );
@@ -652,9 +667,15 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
     Resize();
     ImplUpdateViews( 1 );
 
-    maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-    maViewBox.EnableItem( TBX_ID_LIST, TRUE );
-    maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, TRUE );
+    maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+    maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+    maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True );
+
+    if(maInfoBar.GetText().Len() == 0)
+        mpIconView->SetAccessibleRelationLabeledBy(mpIconView);
+    else
+        mpIconView->SetAccessibleRelationLabeledBy(&maInfoBar);
+    mpIconView->SetAccessibleRelationMemberOf(mpIconView);
 }
 
 // -----------------------------------------------------------------------------
@@ -677,11 +698,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 
                 mpIconView->Show();
 
-                maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-                maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+                maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+                maViewBox.EnableItem( TBX_ID_LIST, sal_True );
 
-                maViewBox.CheckItem( TBX_ID_ICON, TRUE );
-                maViewBox.CheckItem( TBX_ID_LIST, FALSE );
+                maViewBox.CheckItem( TBX_ID_ICON, sal_True );
+                maViewBox.CheckItem( TBX_ID_LIST, sal_False );
             }
             break;
 
@@ -695,11 +716,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
 
                 mpListView->Show();
 
-                maViewBox.EnableItem( TBX_ID_ICON, TRUE );
-                maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+                maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+                maViewBox.EnableItem( TBX_ID_LIST, sal_True );
 
-                maViewBox.CheckItem( TBX_ID_ICON, FALSE );
-                maViewBox.CheckItem( TBX_ID_LIST, TRUE );
+                maViewBox.CheckItem( TBX_ID_ICON, sal_False );
+                maViewBox.CheckItem( TBX_ID_LIST, sal_True );
             }
             break;
 
@@ -707,11 +728,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
             {
                 Graphic		aGraphic;
                 Point		aSelPos;
-                const ULONG	nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+                const sal_uIntPtr	nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
                 if( nItemId )
                 {
-                    const ULONG nPos = nItemId - 1;
+                    const sal_uIntPtr nPos = nItemId - 1;
 
                        mpIconView->Hide();
                     mpListView->Hide();
@@ -725,8 +746,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
                     if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND )
                         mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
 
-                    maViewBox.EnableItem( TBX_ID_ICON, FALSE );
-                    maViewBox.EnableItem( TBX_ID_LIST, FALSE );
+                    maViewBox.EnableItem( TBX_ID_ICON, sal_False );
+                    maViewBox.EnableItem( TBX_ID_LIST, sal_False );
                 }
             }
             break;
@@ -765,11 +786,11 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
     if( mpCurTheme )
     {
         Point		aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
         if( nItemId )
         {
-            ULONG nNewItemId = nItemId;
+            sal_uIntPtr nNewItemId = nItemId;
 
             switch( eTravel )
             {
@@ -794,7 +815,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
                 if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
                 {
                     Graphic		aGraphic;
-                    const ULONG nPos = nNewItemId - 1;
+                    const sal_uIntPtr nPos = nNewItemId - 1;
 
                     mpCurTheme->GetGraphic( nPos, aGraphic );
                     mpPreview->SetGraphic( aGraphic );
@@ -811,7 +832,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
+void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId )
 {
     mpIconView->Hide();
     mpListView->Hide();
@@ -822,10 +843,10 @@ void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
 
     if( mpCurTheme )
     {
-        for( ULONG i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
+        for( sal_uIntPtr i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
         {
             mpListView->RowInserted( i++ );
-            mpIconView->InsertItem( (USHORT) i );
+            mpIconView->InsertItem( (sal_uInt16) i );
         }
 
         ImplSelectItemId( ( ( nSelectionId > mpCurTheme->GetObjectCount() ) ? mpCurTheme->GetObjectCount() : nSelectionId ) );
@@ -853,11 +874,11 @@ void GalleryBrowser2::ImplUpdateInfoBar()
     if( mpCurTheme )
     {
         Point		aSelPos;
-        const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+        const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
         if( nItemId )
         {
-            const ULONG nPos = nItemId - 1;
+            const sal_uIntPtr nPos = nItemId - 1;
 
             aInfoText = mpCurTheme->GetName();
 
@@ -879,10 +900,10 @@ void GalleryBrowser2::ImplUpdateInfoBar()
 
 // -----------------------------------------------------------------------------
 
-ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
+sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
 {
     const Size  aOutputSizePixel( GetOutputSizePixel() );
-    ULONG       nRet = 0;
+    sal_uIntPtr       nRet = 0;
     
     if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
     {
@@ -903,7 +924,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
         else
         {
             nRet = mpIconView->GetSelectItemId();
-            rSelPos = mpIconView->GetItemRect( (USHORT) nRet ).Center();
+            rSelPos = mpIconView->GetItemRect( (sal_uInt16) nRet ).Center();
         }
     }
     else
@@ -916,7 +937,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
         else
         {
             nRet = mpListView->FirstSelectedRow() + 1;
-            rSelPos = mpListView->GetFieldRectPixel( (USHORT) nRet, 1 ).Center();
+            rSelPos = mpListView->GetFieldRectPixel( (sal_uInt16) nRet, 1 ).Center();
         }
     }
 
@@ -933,22 +954,22 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplSelectItemId( ULONG nItemId )
+void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId )
 {
     if( nItemId )
     {
 
-        mpIconView->SelectItem( (USHORT) nItemId );
+        mpIconView->SelectItem( (sal_uInt16) nItemId );
         mpListView->SelectRow( nItemId - 1 );
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void GalleryBrowser2::ImplExecute( USHORT nId )
+void GalleryBrowser2::ImplExecute( sal_uInt16 nId )
 {
     Point		aSelPos;
-    const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+    const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
 
     if( mpCurTheme && nItemId )
     {
@@ -1074,7 +1095,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
 
 // -----------------------------------------------------------------------------
 
-String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags )
+String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags )
 {
     INetURLObject   aURL;
     String          aRet;
@@ -1177,9 +1198,9 @@ Graphic GalleryBrowser2::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( mpCurTheme && mnCurActionPos != 0xffffffff )
         bRet = mpCurTheme->GetModel( mnCurActionPos, rModel );
@@ -1189,7 +1210,7 @@ BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryBrowser2::IsLinkage() const
+sal_Bool GalleryBrowser2::IsLinkage() const
 {
     return mbCurActionIsLinkage;
 }
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index d249ba8736..d492897145 100644..100755
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -35,9 +35,9 @@
 #include <avmedia/mediaplayer.hxx>
 #include "helpid.hrc"
 #include "galbrws2.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
-#include "galctrl.hxx"
+#include "svx/galctrl.hxx"
 #include "editeng/AccessibleStringWrap.hxx"
 #include <editeng/svxfont.hxx>
 #include "galobj.hxx"
@@ -127,11 +127,11 @@ void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
 {
     const Size	aWinSize( GetOutputSizePixel() );
     Size		aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( aNewSize.Width() && aNewSize.Height() )
     {
@@ -154,7 +154,7 @@ BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
                              ( aWinSize.Height() - aNewSize.Height() ) >> 1 );
 
         rResultRect = Rectangle( aNewPos, aNewSize );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -308,7 +308,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
         DragSourceHelper( this ),
         mpTheme	( pTheme )
 {
-    EnableFullItemMode( FALSE );
+    EnableFullItemMode( sal_False );
 
     SetHelpId( HID_GALLERY_WINDOW );
     InitSettings();
@@ -347,7 +347,7 @@ void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt )
 
 void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    const USHORT nId = rUDEvt.GetItemId();
+    const sal_uInt16 nId = rUDEvt.GetItemId();
 
     if( nId && mpTheme )
     {
@@ -458,7 +458,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
 void GalleryIconView::StartDrag( sal_Int8, const Point& )
 {
-    const CommandEvent	aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, TRUE );
+    const CommandEvent	aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True );
     Region				aRegion;
 
     // call this to initiate dragging for ValueSet
@@ -474,7 +474,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
     BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ),
     mpTheme( pTheme ),
     mnCurRow( 0 ),
-    mbInit( FALSE )
+    mbInit( sal_False )
 {
     SetHelpId( HID_GALLERY_WINDOW );
 
@@ -513,15 +513,15 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryListView::SeekRow( long nRow )
+sal_Bool GalleryListView::SeekRow( long nRow )
 {
     mnCurRow = nRow;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------------
 
-String GalleryListView::GetCellText(long _nRow, USHORT nColumnId) const
+String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
 {
     String sRet;
     if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) )
@@ -549,7 +549,7 @@ Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nC
     if ( SeekRow(_nRow) )
     {
         SvxFont aFont( GetFont() );
-        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>( GetColumnId( sal::static_int_cast<USHORT>(_nColumnPos) ) ) ) );
+        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>( GetColumnId( sal::static_int_cast<sal_uInt16>(_nColumnPos) ) ) ) );
         
         // get the bounds inside the string
         aStringWrap.GetCharacterBounds(nIndex, aRect);
@@ -568,7 +568,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
     if ( SeekRow(_nRow) )
     {
         SvxFont aFont( GetFont() );
-        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>(GetColumnId(sal::static_int_cast<USHORT>(_nColumnPos)))) );
+        AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>(GetColumnId(sal::static_int_cast<sal_uInt16>(_nColumnPos)))) );
         nRet = aStringWrap.GetIndexAtPoint(_rPoint);
     }
     return nRet;
@@ -576,7 +576,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
 
 // ------------------------------------------------------------------------
 
-void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
     rDev.Push( PUSH_CLIPREGION );
     rDev.IntersectClipRegion( rRect );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 0770c711a7..22f52b100a 100644..100755
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -32,9 +32,9 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/viewfrm.hxx>
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
-#include "galbrws.hxx"
-#include "gallery.hxx"
+#include "svx/galtheme.hxx"
+#include "svx/galbrws.hxx"
+#include "svx/gallery.hxx"
 #include "galobj.hxx"
 
 // -----------
@@ -95,14 +95,14 @@ Graphic GalleryExplorer::GetGraphic() const
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
 {
     return GALLERYBROWSER()->GetVCDrawModel( rModel );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::IsLinkage() const
+sal_Bool GalleryExplorer::IsLinkage() const
 {
     return GALLERYBROWSER()->IsLinkage();
 }
@@ -115,7 +115,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
 
     if( pGal )
     {
-        for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
+        for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
         {
             const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
 
@@ -129,7 +129,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 {
     Gallery* pGal = ImplGetGallery();
 
@@ -140,7 +140,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
                 rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND );
 
             pGal->ReleaseTheme( pTheme, aListener );
@@ -152,10 +152,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::FillObjList( ULONG nThemeId, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : FALSE );
+    return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
@@ -170,7 +170,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
             {
                 SgaObject*	pObj = pTheme->AcquireObject( i );
                 if ( pObj )
@@ -188,24 +188,24 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
 {
     return InsertURL( rThemeName, rURL, SGA_FORMAT_ALL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL )
 {
     return InsertURL( nThemeId, rURL, SGA_FORMAT_ALL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const ULONG )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const sal_uIntPtr )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -226,18 +226,18 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL, const ULONG nSgaFormat )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL, const sal_uIntPtr nSgaFormat )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : FALSE );
+    return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName )
 {
     Gallery*	pGal = ImplGetGallery();
-    ULONG		nRet = 0;
+    sal_uIntPtr		nRet = 0;
 
     if( pGal )
     {
@@ -256,20 +256,20 @@ ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
                                      Graphic* pGraphic, Bitmap* pThumb,
-                                     BOOL bProgress )
+                                     sal_Bool bProgress )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -293,20 +293,20 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetGraphicObj( ULONG nThemeId, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
                                      Graphic* pGraphic, Bitmap* pThumb,
-                                     BOOL bProgress )
+                                     sal_Bool bProgress )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : FALSE );
+    return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -325,18 +325,18 @@ BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic&
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : FALSE );
+    return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 {
     Gallery*	pGal = ImplGetGallery();
-    ULONG		nRet = 0;
+    sal_uIntPtr		nRet = 0;
 
     if( pGal )
     {
@@ -345,7 +345,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
                 if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
                     nRet++;
 
@@ -358,19 +358,19 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
 
 // ------------------------------------------------------------------------
 
-ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId  )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId  )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
                                  SdrModel* pModel, Bitmap* pThumb )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -379,14 +379,14 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
 
         if( pTheme )
         {
-            for( ULONG i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
+            for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
             {
                 if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
                 {
                     if( nActPos++ == nSdrModelPos )
                     {
                         if( pModel )
-                            bRet = bRet || pTheme->GetModel( i, *pModel, FALSE );
+                            bRet = bRet || pTheme->GetModel( i, *pModel, sal_False );
 
                         if( pThumb )
                             bRet = bRet || pTheme->GetThumb( i, *pThumb );
@@ -403,19 +403,19 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
                                  SdrModel* pModel, Bitmap* pThumb )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE );
+    return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -434,18 +434,18 @@ BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rMode
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryExplorer::InsertSdrObj( ULONG nThemeId, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : FALSE );
+    return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -454,7 +454,7 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
         if( pTheme )
         {
             pTheme->LockTheme();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -463,18 +463,18 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::BeginLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::EndLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::EndLocking( const String& rThemeName )
 {
     Gallery*	pGal = ImplGetGallery();
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pGal )
     {
@@ -483,7 +483,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
 
         if( pTheme )
         {
-            const BOOL bReleaseLockedTheme = pTheme->UnlockTheme();
+            const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme();
 
             // release acquired theme
             pGal->ReleaseTheme( pTheme, aListener );
@@ -492,7 +492,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
             {
                 // release locked theme
                 pGal->ReleaseTheme( pTheme, aLockListener );
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -502,15 +502,15 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::EndLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
 {
     Gallery* pGal = ImplGetGallery();
-    return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+    return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
 {
     return SgaObjectSvDraw::DrawCentered( pOut, rModel );
 }
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 6ac9839b0f..b801b1d3fa 100644..100755
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -35,7 +35,7 @@
 
 DockingWindow RID_SVXDLG_GALLERYBROWSER
 {
-    HelpId = SID_GALLERY;
+    HelpId = "SVX_HID_GALLERY_BROWSER" ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -396,85 +396,3 @@ Menu RID_SVXMN_GALLERY2
     };
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index b5065f1a61..0585de9bba 100644..100755
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -36,10 +36,10 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include "gallery.hrc"
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
@@ -58,8 +58,8 @@ using namespace ::com::sun::star;
 // ---------------------
 
 GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
-                                      UINT32 _nFileNumber, BOOL _bReadOnly, BOOL _bImported,
-                                      BOOL _bNewFile, UINT32 _nId, BOOL _bThemeNameFromResource ) :
+                                      sal_uInt32 _nFileNumber, sal_Bool _bReadOnly, sal_Bool _bImported,
+                                      sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) :
         nFileNumber                             ( _nFileNumber ),
         nId                                     ( _nId ),
         bReadOnly                               ( _bReadOnly || _bImported ),
@@ -82,7 +82,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
     SetModified( _bNewFile );
 
     if( nId && bThemeNameFromResource )
-        aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (USHORT) nId ) );
+        aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) );
 
     if( !aName.Len() )
         aName = rName;
@@ -118,17 +118,17 @@ void GalleryThemeEntry::SetName( const String& rNewName )
     if( aName != rNewName )
     {
         aName = rNewName;
-        SetModified( TRUE );
-        bThemeNameFromResource = FALSE;
+        SetModified( sal_True );
+        bThemeNameFromResource = sal_False;
     }
 }
 
 // -----------------------------------------------------------------------------
 
-void GalleryThemeEntry::SetId( UINT32 nNewId, BOOL bResetThemeName )
+void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName )
 {
     nId = nNewId;
-    SetModified( TRUE );
+    SetModified( sal_True );
     bThemeNameFromResource = ( nId && bResetThemeName );
 }
 
@@ -192,7 +192,7 @@ public:
 Gallery::Gallery( const String& rMultiPath )
 :		nReadTextEncoding	( gsl_getSystemTextEncoding() )
 ,		nLastFileNumber		( 0 )
-,		bMultiPath			( FALSE )
+,		bMultiPath			( sal_False )
 {
     ImplLoad( rMultiPath );
 }
@@ -234,7 +234,7 @@ Gallery* Gallery::GetGalleryInstance()
 
 void Gallery::ImplLoad( const String& rMultiPath )
 {
-    const USHORT    nTokenCount = rMultiPath.GetTokenCount( ';' );
+    const sal_uInt16    nTokenCount = rMultiPath.GetTokenCount( ';' );
     sal_Bool        bIsReadOnlyDir;
 
     bMultiPath = ( nTokenCount > 0 );
@@ -249,7 +249,7 @@ void Gallery::ImplLoad( const String& rMultiPath )
     {
         aRelURL = INetURLObject( rMultiPath.GetToken( 0, ';' ) );
 
-        for( USHORT i = 0UL; i < nTokenCount; i++ )
+        for( sal_uInt16 i = 0UL; i < nTokenCount; i++ )
         {
             aCurURL = INetURLObject(rMultiPath.GetToken( i, ';' ));
 
@@ -425,7 +425,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
 
                                 if( pEntry )
                                 {
-                                    const ULONG nFileNumber = (ULONG) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
+                                    const sal_uIntPtr nFileNumber = (sal_uIntPtr) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
 
                                     aThemeList.push_back( pEntry );
 
@@ -476,11 +476,11 @@ void Gallery::ImplLoadImports()
             GalleryThemeEntry*			pThemeEntry;
             GalleryImportThemeEntry*	pImportEntry;
             INetURLObject               aFile;
-            UINT32                      nInventor;
-            UINT32                      nCount;
-            UINT16                      nId;
-            UINT16                      i;
-            UINT16                      nTempCharSet;
+            sal_uInt32                      nInventor;
+            sal_uInt32                      nCount;
+            sal_uInt16                      nId;
+            sal_uInt16                      i;
+            sal_uInt16                      nTempCharSet;
 
             for ( size_t j = 0, n = aImportList.size(); j < n; ++j )
                 delete aImportList[ j ];
@@ -502,7 +502,7 @@ void Gallery::ImplLoadImports()
                     pThemeEntry = new GalleryThemeEntry( aFile,
                                                          pImportEntry->aUIName,
                                                          String(aFile.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
-                                                         TRUE, TRUE, FALSE, 0, FALSE );
+                                                         sal_True, sal_True, sal_False, 0, sal_False );
 
                     aThemeList.push_back( pThemeEntry );
                 }
@@ -523,10 +523,10 @@ void Gallery::ImplWriteImportList()
 
     if( pOStm )
     {
-        const UINT32 nInventor = (UINT32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
-        const UINT16 nId = 0x0004;
+        const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+        const sal_uInt16 nId = 0x0004;
 
-        *pOStm << nInventor << nId << (UINT32) aImportList.size() << (UINT16) gsl_getSystemTextEncoding();
+        *pOStm << nInventor << nId << (sal_uInt32) aImportList.Count() << (sal_uInt16) gsl_getSystemTextEncoding();
 
         for ( size_t i = 0, n = aImportList.size(); i < n; ++i )
             *pOStm << *aImportList[ i ];
@@ -564,7 +564,7 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport
 
 // ------------------------------------------------------------------------
 
-String Gallery::GetThemeName( ULONG nThemeId ) const
+String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
 {
     GalleryThemeEntry* pFound = NULL;
 
@@ -604,28 +604,28 @@ String Gallery::GetThemeName( ULONG nThemeId ) const
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::HasTheme( const String& rThemeName )
+sal_Bool Gallery::HasTheme( const String& rThemeName )
 {
     return( ImplGetThemeEntry( rThemeName ) != NULL );
 }
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
+sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
     {
         nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1;
         GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
                                                               nLastFileNumber,
-                                                              FALSE, FALSE, TRUE, 0, FALSE );
+                                                              sal_False, sal_False, sal_True, 0, sal_False );
 
         aThemeList.push_back( pNewEntry );
         delete( new GalleryTheme( this, pNewEntry ) );
         Broadcast( GalleryHint( GALLERY_HINT_THEME_CREATED, rThemeName ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -633,10 +633,10 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
+sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
 {
     INetURLObject	aURL( rURL );
-    BOOL			bRet = FALSE;
+    sal_Bool			bRet = sal_False;
 
     DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
@@ -646,8 +646,8 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
 
         if( pIStm )
         {
-            ULONG   nStmErr;
-            UINT16  nId;
+            sal_uIntPtr   nStmErr;
+            sal_uInt16  nId;
 
             *pIStm >> nId;
 
@@ -659,7 +659,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                 String                  aThemeName; *pIStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 );
                 GalleryThemeEntry*      pThemeEntry = new GalleryThemeEntry( aURL, rImportName,
                                                                              String(aURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
-                                                                             TRUE, TRUE, TRUE, 0, FALSE );
+                                                                             sal_True, sal_True, sal_True, 0, sal_False );
                 GalleryTheme*           pImportTheme = new GalleryTheme( this, pThemeEntry );
 
                 pIStm->Seek( STREAM_SEEK_TO_BEGIN );
@@ -675,7 +675,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                 {
                     String  aName( rImportName );
                     String  aNewName( aName );
-                    ULONG   nCount = 0;
+                    sal_uIntPtr   nCount = 0;
 
                     aName += ' ';
 
@@ -695,7 +695,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                     pImportEntry->aImportName = rImportName;
                     aImportList.push_back( pImportEntry );
                     ImplWriteImportList();
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
 
                 delete pImportTheme;
@@ -710,10 +710,10 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
+sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 {
     GalleryThemeEntry*      pThemeEntry = ImplGetThemeEntry( rOldName );
-    BOOL                            bRet = FALSE;
+    sal_Bool                            bRet = sal_False;
 
     // Ueberpruefen, ob neuer Themenname schon vorhanden ist
     if( pThemeEntry && !HasTheme( rNewName ) && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
@@ -743,7 +743,7 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 
             Broadcast( GalleryHint( GALLERY_HINT_THEME_RENAMED, aOldName, pThm->GetName() ) );
             ReleaseTheme( pThm, aListener );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -752,10 +752,10 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
 
 // ------------------------------------------------------------------------
 
-BOOL Gallery::RemoveTheme( const String& rThemeName )
+sal_Bool Gallery::RemoveTheme( const String& rThemeName )
 {
     GalleryThemeEntry*	pThemeEntry = ImplGetThemeEntry( rThemeName );
-    BOOL                bRet = FALSE;
+    sal_Bool                bRet = sal_False;
 
     if( pThemeEntry && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
     {
@@ -808,7 +808,7 @@ BOOL Gallery::RemoveTheme( const String& rThemeName )
 
         Broadcast( GalleryHint( GALLERY_HINT_THEME_REMOVED, rThemeName ) );
 
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -925,7 +925,7 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
     }
 }
 
-BOOL GalleryThemeEntry::IsDefault() const
+sal_Bool GalleryThemeEntry::IsDefault() const 
 { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallerydrawmodel.hxx b/svx/source/gallery2/gallerydrawmodel.hxx
index 0c6bd7d6e6..0c6bd7d6e6 100644..100755
--- a/svx/source/gallery2/gallerydrawmodel.hxx
+++ b/svx/source/gallery2/gallerydrawmodel.hxx
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 3f9bc90b46..80eb92b0b2 100644..100755
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -52,7 +52,7 @@
 #include "codec.hxx"
 #include "gallery.hrc"
 #include "svx/gallery1.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
@@ -113,11 +113,11 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
 // - GalleryGraphicImport -
 // ------------------------
 
-USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
-                             String& rFilterName, BOOL bShowProgress )
+sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
+                             String& rFilterName, sal_Bool bShowProgress )
 {
-    USHORT		nRet = SGA_IMPORT_NONE;
-    SfxMedium	aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
+    sal_uInt16		nRet = SGA_IMPORT_NONE;
+    SfxMedium	aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
     String		aFilterName;
 
     aMedium.DownLoad();
@@ -128,7 +128,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
     {
         GraphicFilter*		pGraphicFilter = GraphicFilter::GetGraphicFilter();
         GalleryProgress*	pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL;
-        USHORT				nFormat;
+        sal_uInt16				nFormat;
 
         if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
         {
@@ -146,10 +146,10 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
 // - GallerySvDrawImport -
 // -----------------------
 
-BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
+sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
 {
-    UINT32  nVersion;
-    BOOL    bRet = FALSE;
+    sal_uInt32  nVersion;
+    sal_Bool    bRet = sal_False;
 
     if( GalleryCodec::IsCoded( rIStm, nVersion ) )
     {
@@ -194,9 +194,9 @@ BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
 // - CreateIMapGraphic -
 // ---------------------
 
-BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
+sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if ( rModel.GetPageCount() )
     {
@@ -205,10 +205,10 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
 
         if ( pPage->GetObjCount() == 1 && pObj->ISA( SdrGrafObj ) )
         {
-            const USHORT nCount = pObj->GetUserDataCount();
+            const sal_uInt16 nCount = pObj->GetUserDataCount();
 
             // gibt es in den User-Daten eine IMap-Information?
-            for ( USHORT i = 0; i < nCount; i++ )
+            for ( sal_uInt16 i = 0; i < nCount; i++ )
             {
                 const SdrObjUserData* pUserData = pObj->GetUserData( i );
 
@@ -216,7 +216,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
                 {
                     rGraphic = ( (SdrGrafObj*) pObj )->GetGraphic();
                     rImageMap = ( (SgaIMapInfo*) pUserData )->GetImageMap();
-                    bRet = TRUE;
+                    bRet = sal_True;
                     break;
                 }
             }
@@ -230,7 +230,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
 // - GetReducedString -
 // --------------------
 
-String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
+String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen )
 {
     String aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
 
@@ -244,7 +244,7 @@ String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
 
         if( aPath.Len() > nMaxLen )
         {
-            aReduced = aPath.Copy( 0, (USHORT)( nMaxLen - aName.Len() - 4 ) );
+            aReduced = aPath.Copy( 0, (sal_uInt16)( nMaxLen - aName.Len() - 4 ) );
             aReduced += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
             aReduced += aDelimiter;
             aReduced += aName;
@@ -273,9 +273,9 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL FileExists( const INetURLObject& rURL )
+sal_Bool FileExists( const INetURLObject& rURL )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
     {
@@ -303,9 +303,9 @@ BOOL FileExists( const INetURLObject& rURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL CreateDir( const INetURLObject& rURL )
+sal_Bool CreateDir( const INetURLObject& rURL )
 {
-    BOOL bRet = FileExists( rURL );
+    sal_Bool bRet = FileExists( rURL );
 
     if( !bRet )
     {
@@ -340,9 +340,9 @@ BOOL CreateDir( const INetURLObject& rURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
+sal_Bool CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     try
     {
@@ -351,7 +351,7 @@ BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
         aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
                                   uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                 rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     catch( const ucb::ContentCreationException& )
     {
@@ -368,9 +368,9 @@ BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
 
 // -----------------------------------------------------------------------------
 
-BOOL KillFile( const INetURLObject& rURL )
+sal_Bool KillFile( const INetURLObject& rURL )
 {
-    BOOL bRet = FileExists( rURL );
+    sal_Bool bRet = FileExists( rURL );
 
     if( bRet )
     {
@@ -381,15 +381,15 @@ BOOL KillFile( const INetURLObject& rURL )
         }
         catch( const ucb::ContentCreationException& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( const uno::RuntimeException& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
         catch( const uno::Exception& )
         {
-            bRet = FALSE;
+            bRet = sal_False;
         }
     }
 
@@ -446,17 +446,17 @@ GalleryProgress::~GalleryProgress()
 
 // ------------------------------------------------------------------------
 
-void GalleryProgress::Update( ULONG nVal, ULONG nMaxVal )
+void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
 {
     if( mxProgressBar.is() && nMaxVal )
-        mxProgressBar->setValue( Min( (ULONG)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (ULONG) GALLERY_PROGRESS_RANGE ) );
+        mxProgressBar->setValue( Min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
 }
 
 // -----------------------
 // - GalleryTransferable -
 // -----------------------
 
-GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ) :
+GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
     mpTheme( pTheme ),
     meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ),
     mnObjectPos( nObjectPos ),
@@ -626,7 +626,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU
 
 void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
 {
-    mpTheme->SetDragging( FALSE );
+    mpTheme->SetDragging( sal_False );
     mpTheme->SetDragPos( 0 );
     if ( nDropAction )
     {
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 6a727c3662..33ee75925d 100644..100755
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -60,16 +60,16 @@ using namespace ::com::sun::star;
 // -------------
 
 SgaObject::SgaObject() :
-        bIsValid    ( FALSE ),
-        bIsThumbBmp	( TRUE )
+        bIsValid    ( sal_False ),
+        bIsThumbBmp	( sal_True )
 {
 }
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
+sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rGraphic.GetType() == GRAPHIC_BITMAP )
     {
@@ -105,7 +105,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
             if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
             {
                 aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else
             {
@@ -117,7 +117,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
                                      (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
                 {
                     aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -138,7 +138,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
         if( !aThumbBmp.IsEmpty() )
         {
             aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -149,15 +149,15 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
 
 void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
 {
-    static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+    static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
 
-    rOut << nInventor << (UINT16) 0x0004 << GetVersion() << (UINT16) GetObjKind();
+    rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind();
     rOut << bIsThumbBmp;
 
     if( bIsThumbBmp )
     {
-        const USHORT	nOldCompressMode = rOut.GetCompressMode();
-        const ULONG		nOldVersion = rOut.GetVersion();
+        const sal_uInt16	nOldCompressMode = rOut.GetCompressMode();
+        const sal_uIntPtr		nOldVersion = rOut.GetVersion();
 
         rOut.SetCompressMode( COMPRESSMODE_ZBITMAP );
         rOut.SetVersion( SOFFICE_FILEFORMAT_50 );
@@ -177,11 +177,11 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObject::ReadData(SvStream& rIn, UINT16& rReadVersion )
+void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
 {
     ByteString	aTmpStr;
-    UINT32		nTmp32;
-    UINT16		nTmp16;
+    sal_uInt32		nTmp32;
+    sal_uInt16		nTmp16;
 
     rIn >> nTmp32 >> nTmp16 >> rReadVersion >> nTmp16 >> bIsThumbBmp;
 
@@ -246,7 +246,7 @@ SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
 
 SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
 {
-    UINT16 nReadVersion;
+    sal_uInt16 nReadVersion;
 
     rObj.ReadData( rIn, nReadVersion );
     rObj.bIsValid = ( rIn.GetError() == ERRCODE_NONE );
@@ -304,7 +304,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObjectBmp::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     ByteString aTmpStr;
 
@@ -336,10 +336,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
     {
         aURL = rURL;
         aThumbBmp = Bitmap( Size( 1, 1 ), 1 );
-        bIsValid = TRUE;
+        bIsValid = sal_True;
     }
     else
-        bIsValid = FALSE;
+        bIsValid = sal_False;
 }
 
 // ------------------------------------------------------------------------
@@ -352,7 +352,7 @@ SgaObjectSound::~SgaObjectSound()
 
 Bitmap SgaObjectSound::GetThumbBmp() const
 {
-    USHORT nId;
+    sal_uInt16 nId;
 
     switch( eSoundType )
     {
@@ -381,19 +381,19 @@ Bitmap SgaObjectSound::GetThumbBmp() const
 void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const
 {
     SgaObject::WriteData( rOut, rDestDir );
-    rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
+    rOut << (sal_uInt16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
 }
 
 // ------------------------------------------------------------------------
 
-void SgaObjectSound::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     SgaObject::ReadData( rIn, rReadVersion );
 
     if( rReadVersion >= 5 )
     {
         ByteString	aTmpStr;
-        UINT16		nTmp16;
+        sal_uInt16		nTmp16;
 
         rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16;
 
@@ -505,11 +505,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
 {
     Graphic		aGraphic;
     ImageMap	aImageMap;
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) )
         bRet = SgaObject::CreateThumb( aGraphic );
@@ -538,10 +538,10 @@ BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
 
 // ------------------------------------------------------------------------
 
-BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
 {
     const FmFormPage*   pPage = static_cast< const FmFormPage* >( rModel.GetPage( 0 ) );
-    BOOL                bRet = FALSE;
+    sal_Bool                bRet = sal_False;
 
     if( pOut && pPage )
     {
@@ -567,11 +567,11 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
             aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top();
             aMap.SetOrigin( aOrigin );
 
-            aView.SetPageVisible( FALSE );
-            aView.SetBordVisible( FALSE );
-            aView.SetGridVisible( FALSE );
-            aView.SetHlplVisible( FALSE );
-            aView.SetGlueVisible( FALSE );
+            aView.SetPageVisible( sal_False );
+            aView.SetBordVisible( sal_False );
+            aView.SetGridVisible( sal_False );
+            aView.SetHlplVisible( sal_False );
+            aView.SetGlueVisible( sal_False );
 
             pOut->Push();
             pOut->SetMapMode( aMap );
@@ -579,7 +579,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
             aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) );
             pOut->Pop();
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -596,7 +596,7 @@ void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const
 
 // ------------------------------------------------------------------------
 
-void SgaObjectSvDraw::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
 {
     SgaObject::ReadData( rIn, rReadVersion );
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 3f25dcd7ba..4350f1ae9e 100644..100755
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -53,7 +53,7 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include "svx/galmisc.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -80,7 +80,7 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
         mnThemeLockCount      ( 0 ),
         mnBroadcasterLockCount( 0 ),
         nDragPos	          ( 0 ),
-        bDragging	          ( FALSE )
+        bDragging	          ( sal_False )
 {
     ImplCreateSvDrawStorage();
 
@@ -97,9 +97,9 @@ GalleryTheme::~GalleryTheme()
     for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
     {
         GalleryObject* pEntry = aObjectList[ i ];
-        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         delete pEntry;
-        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
     }
     aObjectList.clear();
 }
@@ -110,10 +110,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 {
     if( !pThm->IsImported() )
     {
-        aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
+        aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
         // #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
         if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
-            aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+            aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
     }
     else
         aSvDrawStorageRef.Clear();
@@ -121,10 +121,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry )
+sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry )
 {
     SvStream*	pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pOStm )
     {
@@ -154,7 +154,7 @@ BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, Galle
             pEntry->aURL = rObj.GetURL();
             pEntry->nOffset = nOffset;
             pEntry->eObjKind = rObj.GetObjKind();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         delete pOStm;
@@ -251,7 +251,7 @@ void GalleryTheme::ImplWrite()
                 delete pOStm;
             }
 
-            ImplSetModified( FALSE );
+            ImplSetModified( sal_False );
         }
     }
 }
@@ -292,14 +292,14 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
 
 // ------------------------------------------------------------------------
 
-INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat )
+INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat )
 {
     INetURLObject   aDir( GetParent()->GetUserURL() );
     INetURLObject   aInfoFileURL( GetParent()->GetUserURL() );
     INetURLObject   aNewURL;
     sal_uInt32		nNextNumber = 1999;
     sal_Char const* pExt = NULL;
-    BOOL            bExists;
+    sal_Bool            bExists;
 
     aDir.Append( String( RTL_CONSTASCII_USTRINGPARAM( "dragdrop" ) ) );
     CreateDir( aDir );
@@ -348,12 +348,12 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
             String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) );
             aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE );
 
-            bExists = FALSE;
+            bExists = sal_False;
 
             for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
                 if ( aObjectList[ i ]->aURL == aNewURL )
                 {
-                    bExists = TRUE;
+                    bExists = sal_True;
                     break;
                 }
         }
@@ -386,7 +386,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
 
 // ------------------------------------------------------------------------
 
-void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
+void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
 {
     if( !IsBroadcasterLocked() )
     {
@@ -399,16 +399,16 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::UnlockTheme()
+sal_Bool GalleryTheme::UnlockTheme()
 {
     DBG_ASSERT( mnThemeLockCount, "Theme is not locked" );
     
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     
     if( mnThemeLockCount )
     {
         --mnThemeLockCount;
-        bRet = TRUE;
+        bRet = sal_True;
     }
     
     return bRet;
@@ -416,7 +416,7 @@ BOOL GalleryTheme::UnlockTheme()
 
 // ------------------------------------------------------------------------
 
-void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
+void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
 {
     DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" );
 
@@ -426,9 +426,9 @@ void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rObj.IsValid() )
     {
@@ -467,7 +467,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
         else
             ImplWriteSgaObject( rObj, nInsertPos, NULL );
 
-        ImplSetModified( bRet = TRUE );
+        ImplSetModified( bRet = sal_True );
         ImplBroadcast( pFoundEntry ? iFoundPos : nInsertPos );
     }
 
@@ -490,7 +490,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::RemoveObject( size_t nPos )
+bool GalleryTheme::RemoveObject( size_t nPos )
 {
     GalleryObject* pEntry = NULL;
     if ( nPos < aObjectList.size() )
@@ -509,11 +509,11 @@ BOOL GalleryTheme::RemoveObject( size_t nPos )
         if( SGA_OBJ_SVDRAW == pEntry->eObjKind )
             aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
-        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
         delete pEntry;
-        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+        Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
 
-        ImplSetModified( TRUE );
+        ImplSetModified( sal_True );
         ImplBroadcast( nPos );
     }
 
@@ -522,9 +522,9 @@ BOOL GalleryTheme::RemoveObject( size_t nPos )
 
 // ------------------------------------------------------------------------
 
-BOOL GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
+bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if(  nOldPos != nNewPos
       && nOldPos < aObjectList.size()
@@ -542,7 +542,7 @@ BOOL GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
         ::std::advance( it, nOldPos );
         aObjectList.erase( it );
 
-        ImplSetModified( bRet = TRUE );
+        ImplSetModified( bRet = sal_True );
         ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
     }
 
@@ -561,11 +561,11 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         const size_t    nCount = aObjectList.size();
 
         LockBroadcaster();
-        bAbortActualize = FALSE;
+        bAbortActualize = sal_False;
 
         // LoeschFlag zuruecksetzen
         for (size_t i = 0; i < nCount; i++)
-            aObjectList[ i ]->bDummy = FALSE;
+            aObjectList[ i ]->bDummy = sal_False
 
         for(size_t i = 0; ( i < nCount ) && !bAbortActualize; i++)
         {
@@ -588,7 +588,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                 {
                     SgaObjectSound aObjSound( aURL );
                     if( !InsertObject( aObjSound ) )
-                        pEntry->bDummy = TRUE;
+                        pEntry->bDummy = sal_True;
                 }
                 else
                 {
@@ -606,12 +606,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                             pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, aURL, aFormat );
 
                         if( !InsertObject( *pNewObj ) )
-                            pEntry->bDummy = TRUE;
+                            pEntry->bDummy = sal_True;
 
                         delete pNewObj;
                     }
                     else
-                        pEntry->bDummy = TRUE; // Loesch-Flag setzen
+                        pEntry->bDummy = sal_True; // Loesch-Flag setzen
                 }
             }
             else
@@ -628,7 +628,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                         SgaObjectSvDraw aNewObj( *pIStm, pEntry->aURL );
 
                         if( !InsertObject( aNewObj ) )
-                            pEntry->bDummy = TRUE;
+                            pEntry->bDummy = sal_True;
 
                         pIStm->SetBufferSize( 0L );
                     }
@@ -642,7 +642,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
             pEntry = aObjectList[ i ];
             if( pEntry->bDummy )
             {
-                Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+                Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
                 GalleryObjectList::iterator it = aObjectList.begin();
                 ::std::advance( it, i );
                 aObjectList.erase( it );
@@ -704,10 +704,10 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         CopyFile( aTmpURL, aInURL );
         KillFile( aTmpURL );
 
-        ULONG nStorErr = 0;
+        sal_uIntPtr nStorErr = 0;
 
         {
-            SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
+            SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
             aSvDrawStorageRef->CopyTo( aTempStorageRef );
             nStorErr = aSvDrawStorageRef->GetError();
         }
@@ -720,7 +720,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         }
 
         KillFile( aTmpURL );
-        ImplSetModified( TRUE );
+        ImplSetModified( sal_True );
         ImplWrite();
         UnlockBroadcaster();
     }
@@ -728,7 +728,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
 
 // ------------------------------------------------------------------------
 
-GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly )
+GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly )
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
@@ -742,7 +742,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
         {
             String			aThemeName;
             sal_uInt16		nVersion;
-            BOOL			bThemeNameFromResource = FALSE;
+            sal_Bool			bThemeNameFromResource = sal_False;
 
             *pIStm >> nVersion;
 
@@ -795,7 +795,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
                 aPathURL.removeFinalSlash();
                 pRet = new GalleryThemeEntry( aPathURL, aThemeName,
                                               String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(),
-                                              bReadOnly, FALSE, FALSE, nThemeId,
+                                              bReadOnly, sal_False, sal_False, nThemeId,
                                               bThemeNameFromResource );
             }
 
@@ -808,16 +808,16 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
+sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool )
 {
     SgaObject*	pObj = AcquireObject( nPos );
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( pObj )
     {
         rBmp = pObj->GetThumbBmp();
         ReleaseObject( pObj );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -825,10 +825,10 @@ BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
+sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress )
 {
     const GalleryObject*	pObject = ImplGetGalleryObject( nPos );
-    BOOL					bRet = FALSE;
+    sal_Bool					bRet = sal_False;
 
     if( pObject )
     {
@@ -856,7 +856,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                         ImageMap aIMap;
 
                         if( CreateIMapGraphic( *aModel.GetModel(), rGraphic, aIMap ) )
-                            bRet = TRUE;
+                            bRet = sal_True;
                         else
                         {
                             VirtualDevice aVDev;
@@ -867,7 +867,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                             aView.ShowSdrPage(aView.GetModel()->GetPage(0));
                             aView.MarkAll();
                             rGraphic = aView.GetAllMarkedGraphic();
-                            bRet = TRUE;
+                            bRet = sal_True;
                         }
                     }
                 }
@@ -884,7 +884,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
                     aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE );
                     rGraphic = aBmp;
                     ReleaseObject( pObj );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
             break;
@@ -899,13 +899,13 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rGraphic.GetType() != GRAPHIC_NONE )
     {
-        ULONG           nExportFormat = CVT_UNKNOWN;
+        sal_uIntPtr           nExportFormat = CVT_UNKNOWN;
         const GfxLink	aGfxLink( ( (Graphic&) rGraphic ).GetLink() );
 
         if( aGfxLink.GetDataSize() )
@@ -977,10 +977,10 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
+sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool )
 {
     const GalleryObject*	pObject = ImplGetGalleryObject( nPos );
-    BOOL					bRet = FALSE;
+    sal_Bool					bRet = sal_False;
 
     if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
     {
@@ -1006,11 +1006,11 @@ BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos )
 {
     INetURLObject	aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
     SvStorageRef	xStor( GetSvDrawStorage() );
-    BOOL			bRet = FALSE;
+    sal_Bool			bRet = sal_False;
 
     if( xStor.Is() )
     {
@@ -1053,10 +1053,10 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStream, BOOL )
+sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool )
 {
     const GalleryObject*	pObject = ImplGetGalleryObject( nPos );
-    BOOL					bRet = FALSE;
+    sal_Bool					bRet = sal_False;
 
     if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
     {
@@ -1070,7 +1070,7 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
 
             if( xIStm.Is() && !xIStm->GetError() )
             {
-                UINT32 nVersion = 0;
+                sal_uInt32 nVersion = 0;
 
                 xIStm->SetBufferSize( 16348 );
 
@@ -1106,11 +1106,11 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos )
 {
     INetURLObject	aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
     SvStorageRef	xStor( GetSvDrawStorage() );
-    BOOL			bRet = FALSE;
+    sal_Bool			bRet = sal_False;
 
     if( xStor.Is() )
     {
@@ -1142,15 +1142,15 @@ BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream,
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
+sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
 {
     const GalleryObject*	pObject = ImplGetGalleryObject( nPos );
-    BOOL					bRet = FALSE;
+    sal_Bool					bRet = sal_False;
 
     if( pObject )
     {
         rURL = INetURLObject( ImplGetURL( pObject ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -1158,13 +1158,13 @@ BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos )
 {
     Graphic			aGraphic;
     String			aFormat;
     SgaObject*		pNewObj = NULL;
-    const USHORT	nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
-    BOOL			bRet = FALSE;
+    const sal_uInt16	nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
+    sal_Bool			bRet = sal_False;
 
     if( nImportRet != SGA_IMPORT_NONE )
     {
@@ -1179,7 +1179,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
         pNewObj = (SgaObject*) new SgaObjectSound( rURL );
 
     if( pNewObj && InsertObject( *pNewObj, nInsertPos ) )
-        bRet = TRUE;
+        bRet = sal_True;
 
     delete pNewObj;
 
@@ -1188,11 +1188,11 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos )
 {
     INetURLObject                   aURL;
     ::std::vector< INetURLObject >  aURLVector;
-    BOOL                            bRet = FALSE;
+    sal_Bool                            bRet = sal_False;
 
     try
     {
@@ -1244,9 +1244,9 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG
 
 // -----------------------------------------------------------------------------
 
-BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rxTransferable.is() )
     {
@@ -1297,7 +1297,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
         else
         {
             Graphic	aGraphic;
-            ULONG	nFormat = 0;
+            sal_uIntPtr	nFormat = 0;
 
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) )
                 nFormat = SOT_FORMATSTR_ID_SVXB;
@@ -1312,7 +1312,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
 
         if( pGraphic )
         {
-            bRet = FALSE;
+            bRet = sal_False;
 
             if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) )
             {
@@ -1350,7 +1350,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
 
 // -----------------------------------------------------------------------------
 
-void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
+void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos )
 {
     GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false );
     pTransferable->CopyToClipboard( pWindow );
@@ -1358,7 +1358,7 @@ void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
 
 // -----------------------------------------------------------------------------
 
-void GalleryTheme::StartDrag( Window* pWindow, ULONG nPos )
+void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos )
 {
     GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true );
     pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK );
@@ -1372,7 +1372,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     const INetURLObject	aRelURL2( GetParent()->GetUserURL() );
     INetURLObject		aNewURL, aTempURL;
     sal_uInt32			nCount = GetObjectCount();
-    BOOL				bRel;
+    sal_Bool				bRel;
 
     rOStm << (sal_uInt16) 0x0004;
     rOStm << ByteString( GetRealName(), RTL_TEXTENCODING_UTF8 );
@@ -1386,7 +1386,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
         if( SGA_OBJ_SVDRAW == pObj->eObjKind )
         {
             aPath = GetSvDrawStreamNameFromURL( pObj->aURL );
-            bRel = FALSE;
+            bRel = sal_False;
         }
         else
         {
@@ -1418,7 +1418,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     }
 
     // neuerdings wird ein 512-Byte-Reservepuffer gechrieben;
-    // um diesen zu erkennen werden zwei ULONG-Ids geschrieben
+    // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben
     rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' );
 
     const long		nReservePos = rOStm.Tell();
@@ -1457,7 +1457,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
 
     if( nVersion >= 0x0004 )
     {
-        UINT16 nTmp16;
+        sal_uInt16 nTmp16;
         rIStm >> nTmp16;
         nTextEncoding = (rtl_TextEncoding) nTmp16;
     }
@@ -1472,14 +1472,14 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
         INetURLObject	aRelURL1( GetParent()->GetRelativeURL() );
         INetURLObject	aRelURL2( GetParent()->GetUserURL() );
         sal_uInt32		nId1, nId2;
-        BOOL			bRel;
+        sal_Bool			bRel;
 
         for( size_t i = 0, n = aObjectList.size(); i < n; ++i )
         {
             pObj = aObjectList[ i ];
-            Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+            Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
             delete pObj;
-            Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+            Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
         }
         aObjectList.clear();
 
@@ -1559,7 +1559,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
         {
             VersionCompat*	pCompat = new VersionCompat( rIStm, STREAM_READ );
             sal_uInt32		nTemp32;
-            BOOL			bThemeNameFromResource = FALSE;
+            sal_Bool			bThemeNameFromResource = sal_False;
 
             rIStm >> nTemp32;
 
@@ -1575,7 +1575,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
     else
         rIStm.SetError( SVSTREAM_READ_ERROR );
 
-    ImplSetModified( FALSE );
+    ImplSetModified( sal_False );
 
     return rIStm;
 }
@@ -1594,25 +1594,25 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
     return rTheme.ReadData( rIn );
 }
 
-void GalleryTheme::ImplSetModified( BOOL bModified )
+void GalleryTheme::ImplSetModified( sal_Bool bModified ) 
 { pThm->SetModified( bModified ); }
 
 const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
 const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
 const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
 const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
-UINT32 GalleryTheme::GetId() const { return pThm->GetId(); }
-void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
-BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
-BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); }
-BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
-BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
-BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); }
+sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
+void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); }
+sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
+sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
+sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
 const String& GalleryTheme::GetName() const	{ return IsImported() ? aImportName : pThm->GetThemeName(); }
 
 void GalleryTheme::InsertAllThemes( ListBox& rListBox )
 {
-    for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
+    for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
         rListBox.InsertEntry( String( GAL_RESID( i ) ) );
 }
 
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 99de47ab4c..99de47ab4c 100644..100755
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk
index 7f1a3bb7a7..7f1a3bb7a7 100644..100755
--- a/svx/source/gallery2/makefile.mk
+++ b/svx/source/gallery2/makefile.mk
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index a41ef4f287..a41ef4f287 100644..100755
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
deleted file mode 100644
index 2fccd222fc..0000000000
--- a/svx/source/gengal/gengal.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-# enable file locking
-SAL_ENABLE_FILE_LOCKING=1
-export SAL_ENABLE_FILE_LOCKING
-
-# resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
-    sd_basename=`basename "$0"`
-     sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` 
-    cd "`dirname "$0"`"
-    cd "`dirname "$sd_script"`"
-else
-    cd "`dirname "$0"`"
-fi
-
-sd_prog="`pwd`"
-
-cd ..
-sd_binary=`basename "$0"`".bin"
-sd_inst="`pwd`"
-
-# change back directory
-cd "$sd_cwd"
-
-# check if all required patches are installed
-if [ -x "$sd_prog/sopatchlevel.sh" ]; then
-    "$sd_prog/sopatchlevel.sh"
-    if [ $? -eq 1 ]; then
-        exit 0
-    fi
-fi
-
-# set search path for shared libraries
-sd_platform=`uname -s`
-case $sd_platform in
-  AIX)
-    LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}}
-    export LIBPATH
-    ;;
-
-  Darwin)
-    DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-    export DYLD_LIBRARY_PATH
-    ;;
-
-  HP-UX)
-    SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
-    export SHLIB_PATH
-    ;;
-
-  *)
-    LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-    export LD_LIBRARY_PATH
-    ;;
-esac
-
-# misc. environment variables
-unset XENVIRONMENT
-
-# set path so that other apps can be started just by name
-PATH="$sd_prog":$PATH
-export PATH
-
-OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
-if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
-    # Hack for vanilla OOo binaries' split install layout
-    OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
-fi
-
-export OOO_INSTALL_PREFIX
-
-# execute binary
-exec "$sd_prog/$sd_binary" "$@"
diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in
deleted file mode 100644
index 00ae5eb3cd..0000000000
--- a/svx/source/gengal/gengalrc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
-OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
-OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
-OOO_URE_URL=${OOO_BASIS_URL}/ure-link
-#
-#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
-#BaseInstallation=${OOO_BASIS_URL}
-BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
-OOO_BASE_DIR=${OOO_BASIS_URL}
-#
-UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
-UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
index f3e119a8a7..f3e119a8a7 100644..100755
--- a/svx/source/gengal/makefile.mk
+++ b/svx/source/gengal/makefile.mk
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 437a261f8f..437a261f8f 100644..100755
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index ffc75f4cf1..ffc75f4cf1 100644..100755
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 4512b3b0db..83e67a65db 100644..100755
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -181,7 +181,7 @@ public:
 
     //=====  IAccessibleViewforwarder  ========================================
 
-    virtual BOOL IsValid (void) const;
+    virtual sal_Bool IsValid (void) const;
     virtual Rectangle GetVisibleArea() const;
     virtual Point LogicToPixel (const Point& rPoint) const;
     virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 9b9d19009a..9d5b981a37 100644..100755
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -107,14 +107,14 @@ namespace svx
     struct SvxShowCharSetItem
     {
         SvxShowCharSet&				mrParent;
-        USHORT						mnId;
+        sal_uInt16						mnId;
         XubString					maText;
         Rectangle					maRect;
         SvxShowCharSetItemAcc*		m_pItem;
         SvxShowCharSetAcc*			m_pParent;
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc;
 
-        SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*	_pParent,USHORT _nPos );
+        SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*	_pParent,sal_uInt16 _nPos );
         ~SvxShowCharSetItem();
 
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    GetAccessible();
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index 3ed9156625..3ed9156625 100644..100755
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.hxx
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index b41427489d..b41427489d 100644..100755
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index b4bdc3b6e7..b4bdc3b6e7 100644..100755
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 033b11ecbf..c84c93cabe 100644..100755
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -130,7 +130,7 @@ namespace svxform
         ~DataTreeListBox();
 
         virtual PopupMenu* 		CreateContextMenu( void );
-        virtual void			ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry );
+        virtual void			ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry );
         virtual sal_Int8		AcceptDrop( const AcceptDropEvent& rEvt );
         virtual sal_Int8		ExecuteDrop( const ExecuteDropEvent& rEvt );
         virtual void			StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -166,7 +166,7 @@ namespace svxform
         void						AddChildren( SvLBoxEntry* _pParent,
                                                  const ImageList& _rImgLst,
                                                  const XNode_ref& _xNode );
-        bool						DoToolBoxAction( USHORT _nToolBoxID );
+        bool						DoToolBoxAction( sal_uInt16 _nToolBoxID );
         SvLBoxEntry*				AddEntry( ItemNode* _pNewNode, bool _bIsElement );
         SvLBoxEntry*                AddEntry( const XPropertySet_ref& _rPropSet );
         void                        EditEntry( const XPropertySet_ref& _rPropSet );
@@ -182,12 +182,12 @@ namespace svxform
         virtual void				Resize();
 
         inline bool					HasModel() const { return m_bHasModel; }
-        String                      SetModel( const XModel_ref& _xModel, USHORT _nPagePos );
+        String                      SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
         void						ClearModel();
         String                      LoadInstance( const PropertyValue_seq& _xPropSeq,
                                                   const ImageList& _rImgLst );
 
-        bool						DoMenuAction( USHORT _nMenuID );
+        bool						DoMenuAction( sal_uInt16 _nMenuID );
         void						EnableMenuItems( Menu* _pMenu );
 
         inline SvLBoxEntry*			GetSelectedItem() const { return m_aItemList.FirstSelected(); }
@@ -227,7 +227,7 @@ namespace svxform
         long						m_nMinWidth;
         long						m_nMinHeight;
         long						m_nBorderHeight;
-        USHORT						m_nLastSelectedPos;
+        sal_uInt16						m_nLastSelectedPos;
         bool						m_bShowDetails;
         bool                        m_bIsNotifyDisabled;
         Size						m_a2Size;
@@ -249,14 +249,14 @@ namespace svxform
         DECL_LINK(                  ActivatePageHdl, TabControl* );
         DECL_LINK(                  UpdateHdl, Timer* );
 
-        XFormsPage*					GetCurrentPage( USHORT& rCurId );
+        XFormsPage*					GetCurrentPage( sal_uInt16& rCurId );
         void						LoadModels();
         void						SetPageModel();
         void                        ClearAllPageModels( bool bClearPages );
         void						InitPages();
         void                        CreateInstancePage( const PropertyValue_seq& _xPropSeq );
         bool                        HasFirstInstancePage() const;
-        USHORT                      GetNewPageId() const;
+        sal_uInt16                      GetNewPageId() const;
 
     protected:
         virtual void				Resize();
@@ -572,7 +572,7 @@ namespace svxform
         inline void				SetName( const String& _rName ) { m_aNameED.SetText( _rName );}
         inline String			GetURL() const { return m_aURLED.GetText(); }
         inline void				SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );}
-        inline bool				IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); }
+        inline bool				IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); }
         inline void				SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); }
     };
 
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 8f85a52087..001a9e3f6d 100644..100755
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -70,7 +70,7 @@ namespace svxform
 
     private:
         Link    m_aHandler;
-        ULONG   m_nEventId;
+        sal_uLong   m_nEventId;
 
     private:
         DECL_LINK( OnCall, void* );
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 66c70cbb4e..0dd4d52608 100644..100755
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -585,14 +585,14 @@ class RecovDocListEntry : public SvLBoxString
         //---------------------------------------
         /** @short TODO */
         RecovDocListEntry(      SvLBoxEntry* pEntry,
-                                USHORT       nFlags,
+                                sal_uInt16       nFlags,
                           const String&      sText );
 
         //---------------------------------------
         /** @short TODO */
         virtual void Paint(const Point&       aPos   ,
                                  SvLBox&      aDevice,
-                                 USHORT       nFlags ,
+                                 sal_uInt16       nFlags ,
                                  SvLBoxEntry* pEntry );
 };
 
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index d93caef074..d93caef074 100644..100755
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index b4765a799a..b4765a799a 100644..100755
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 3eddf6ce3f..3eddf6ce3f 100644..100755
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index 16000cfd33..16000cfd33 100644..100755
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index f6f528b687..f6f528b687 100644..100755
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index b44293a59b..b44293a59b 100644..100755
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc
index ce4d88ee51..ce4d88ee51 100644..100755
--- a/svx/source/inc/fmexpl.hrc
+++ b/svx/source/inc/fmexpl.hrc
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 67dfae5a42..c0ae2d1b79 100644..100755
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -397,7 +397,7 @@ namespace svxform
         void ClearBranch( FmFormData* pParentData );
         void UpdateContent( FmFormShell* pNewShell );
 
-        void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND,
+        void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND,
                                               sal_Bool bAlterModel = sal_False );
         void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
 
@@ -446,7 +446,7 @@ namespace svxform
         SvLBoxEntry*        m_pRootEntry;
         SvLBoxEntry*        m_pEditEntry;
 
-        ULONG               nEditEvent;
+        sal_uLong               nEditEvent;
 
         SELDATA_ITEMS       m_sdiState;
         Point               m_aTimerTriggered;      // die Position, an der der DropTimer angeschaltet wurde
@@ -471,7 +471,7 @@ namespace svxform
         sal_Bool        IsDeleteAllowed();
         FmControlData*  NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True );
         void            NewForm( SvLBoxEntry* pParentEntry );
-        SvLBoxEntry*    Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND );
+        SvLBoxEntry*    Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND );
         void            Remove( FmEntryData* pEntryData );
 
 
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
new file mode 100755
index 0000000000..f811b9ed9a
--- /dev/null
+++ b/svx/source/inc/fmgroup.hxx
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _SVX_FMGROUP_HXX
+#define _SVX_FMGROUP_HXX
+
+#ifndef _SVX_FMCPONT_HXX
+#include "fmcpont.hxx"
+#endif
+
+#ifndef __DBFORM_HXX
+#include <dbform.hxx>
+#endif
+
+DECLARE_LIST( FmCtrlModelList, XInterface* );
+
+struct FmXGroupModel_Impl;
+
+//==================================================================
+// FmXGroupModel
+//==================================================================
+class FmXGroupModel : public XBoundControl,
+                      public XLoadListener,
+                      public XPropertyChangeListener,
+                      public XGroup,
+                      public FmXControlModel
+{
+    FmFormControlMap		aControlMap;
+
+    friend Reflection*		FmXGroupModel_getReflection();
+    FmXGroupModel_Impl*		pGroupModelData;			// Properties
+
+public:
+    FmXGroupModel();
+    virtual ~FmXGroupModel();
+
+    // UNO Anbindung
+    SMART_UNO_DECLARATION( FmXGroupModel, FmXControlModel );
+    virtual XInterface*		queryInterface(UsrUik);
+    virtual XIdlClassRef	getIdlClass();
+
+    // XGroup
+    virtual sal_Int32 getFormControlCount();
+    virtual XFormControlRef getFormControlByName( const XubString& sName ) const;
+    virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const;
+    virtual void appendFormControl( const XFormControlRef& FormControl );
+    virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl );
+
+    // XFormControl
+    virtual void setParent( const XFormRef& Parent );
+
+    // XEventListener
+    virtual void disposing( const EventObject& Source );
+
+    // XPropertiesChangeListener
+    virtual void propertyChange( const PropertyChangeEvent& evt );
+
+    // XLoadListener
+    virtual void loaded( const EventObject& rEvent );
+    virtual void unloaded( const EventObject& rEvent );
+
+    // XBoundControl
+    virtual void addBoundControlListener( const XBoundControlListenerRef& l );
+    virtual void removeBoundControlListener( const XBoundControlListenerRef& l );
+
+    // XPersistObject
+    virtual XubString getServiceName( void ) const;
+    virtual void write( const XObjectOutputStreamRef& OutStream );
+    virtual void read( const XObjectInputStreamRef& InStream );
+
+    // PropertySetInterface
+    virtual FmXPropertySetInfo* createPropertySetInfo() const;
+    virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName,
+                                   const UsrAny& aValue,
+                                   PropertyChangeEventSequence* pSeq,
+                                   sal_Int32 nIndex );
+    virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const;
+    virtual	void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
+    virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
+};
+
+//==================================================================
+// FmXGroupModelInfo
+// Properties:
+//==================================================================
+class FmXGroupModelInfo : public FmXControlModelInfo
+{
+    friend class FmXGroupModel;
+
+protected:
+    FmXGroupModelInfo( const FmXGroupModel* pCp );
+    virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const;
+};
+
+
+#endif // _SVX_FMGROUP_HXX
+
diff --git a/svx/source/inc/fmhlpids.hrc b/svx/source/inc/fmhlpids.hrc
index 70e7b51004..70e7b51004 100644..100755
--- a/svx/source/inc/fmhlpids.hrc
+++ b/svx/source/inc/fmhlpids.hrc
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 350a39a043..350a39a043 100644..100755
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 3febbb2c1f..54f7f32cb7 100644..100755
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -46,7 +46,7 @@ class FmFormObj: public SdrUnoObj
                 // m_pEnvironmentHistory was created
 
     FmFormView*     m_pControlCreationView;
-    ULONG		m_nControlCreationEvent;
+    sal_uLong		m_nControlCreationEvent;
 
     // Informationen fuer die Controlumgebung
     // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 489aeff47e..489aeff47e 100644..100755
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index d9f49b2fcc..d9f49b2fcc 100644..100755
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.hrc
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 52f5e3cc97..52f5e3cc97 100644..100755
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 3dd289aeac..3dd289aeac 100644..100755
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 08bced577b..8dba04ae7c 100644..100755
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -61,7 +61,7 @@
 #include <svl/svstdarr.hxx>
 #include <sfx2/mnuitem.hxx>
 #include "svx/fmtools.hxx"
-#include "fmsrccfg.hxx"
+#include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <cppuhelper/component.hxx>
@@ -118,11 +118,11 @@ class FmFormPage;
 struct SAL_DLLPRIVATE FmLoadAction
 {
     FmFormPage*	pPage;
-    ULONG		nEventId;
+    sal_uLong		nEventId;
     sal_uInt16	nFlags;
 
     FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { }
-    FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId )
+    FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId )
         :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags )
     {
     }
@@ -199,8 +199,8 @@ class SAL_DLLPRIVATE FmXFormShell   :public FmXFormShell_BASE
     std::vector<long> m_arrRelativeGridColumn;
 
     ::osl::Mutex	m_aMutex;
-    ULONG           m_nInvalidationEvent;
-    ULONG           m_nActivationEvent;
+    sal_uLong           m_nInvalidationEvent;
+    sal_uLong           m_nActivationEvent;
     ::std::queue< FmLoadAction >
                     m_aLoadingPages;
 
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index 8c6a3e2682..d6be1ec5aa 100644..100755
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -36,7 +36,7 @@ namespace svx
 {
 //........................................................................
 
-    typedef USHORT SfxSlotId;
+    typedef sal_uInt16 SfxSlotId;
 
     //====================================================================
     //= ISlotInvalidator
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 56ffb7526b..050f5091c6 100644..100755
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -51,7 +51,7 @@ namespace svx
         ~TextControlCharAttribDialog();
 
     protected:
-        virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage );
+        virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage );
     };
 
     //====================================================================
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 932c40f83a..932c40f83a 100644..100755
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index c65a8f4baf..c65a8f4baf 100644..100755
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 6967fe4424..6967fe4424 100644..100755
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 2b8a686f1e..2b8a686f1e 100644..100755
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 33f82ceb6b..ec50dc4d3d 100644..100755
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -52,6 +52,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/componentcontext.hxx>
+#include <rtl/ref.hxx>
 
 //class SdrPageViewWinRec;
 class SdrPageWindow;
@@ -80,13 +81,13 @@ namespace svx {
 }
 
 //==================================================================
-// FmXPageViewWinRec
+// FormViewPageWindowAdapter
 //==================================================================
 typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::container::XIndexAccess
                                 ,   ::com::sun::star::form::runtime::XFormControllerContext
-                                >   FmXPageViewWinRec_Base;
+                                >   FormViewPageWindowAdapter_Base;
 
-class FmXPageViewWinRec : public FmXPageViewWinRec_Base
+class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base
 {
     friend class FmXFormView;
 
@@ -97,10 +98,10 @@ class FmXPageViewWinRec : public FmXPageViewWinRec_Base
     Window*						m_pWindow;
 
 protected:
-    ~FmXPageViewWinRec();
+    ~FormViewPageWindowAdapter();
 
 public:
-    FmXPageViewWinRec(	const ::comphelper::ComponentContext& _rContext,
+    FormViewPageWindowAdapter(	const ::comphelper::ComponentContext& _rContext,
         const SdrPageWindow&, FmXFormView* pView);
         //const SdrPageViewWinRec*, FmXFormView* pView);
 
@@ -131,7 +132,8 @@ protected:
     Window* getWindow() const {return m_pWindow;}
 };
 
-typedef ::std::vector<FmXPageViewWinRec*> FmWinRecList;
+typedef ::rtl::Reference< FormViewPageWindowAdapter >   PFormViewPageWindowAdapter;
+typedef ::std::vector< PFormViewPageWindowAdapter >     PageWindowAdapterList;
 typedef ::std::set  <   ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
                     ,   ::comphelper::OInterfaceCompare< ::com::sun::star::form::XForm >
                     >   SetOfForms;
@@ -151,7 +153,7 @@ class FmXFormView :	public ::cppu::WeakImplHelper3<
     friend class FmFormView;
     friend class FmFormShell;
     friend class FmXFormShell;
-    friend class FmXPageViewWinRec;
+    friend class FormViewPageWindowAdapter;
     class ObjectRemoveListener;
     friend class ObjectRemoveListener;
 
@@ -169,7 +171,8 @@ class FmXFormView :	public ::cppu::WeakImplHelper3<
     ::com::sun::star::sdb::SQLErrorEvent
                     m_aAsyncError;			// error event which is to be displayed asyn. See m_nErrorMessageEvent.
 
-    FmWinRecList	m_aWinList;				// to be filled in alive mode only
+    PageWindowAdapterList
+                    m_aPageWindowAdapters;  // to be filled in alive mode only
     MapControlContainerToSetOfForms
                     m_aNeedTabOrderUpdate;
 
@@ -216,8 +219,7 @@ public:
     virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
 
     FmFormView* getView() const {return m_pView;}
-    FmWinRecList::const_iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const;
-    const FmWinRecList& getWindowList() const {return m_aWinList;}
+    PFormViewPageWindowAdapter  findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >
             getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
@@ -247,12 +249,11 @@ public:
             );
 
 private:
-    FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
     //void addWindow(const SdrPageViewWinRec*);
     void addWindow(const SdrPageWindow&);
     void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
     void Activate(sal_Bool bSync = sal_False);
-    void Deactivate(BOOL bDeactivateController = TRUE);
+    void Deactivate(sal_Bool bDeactivateController = sal_True);
 
     SdrObject*	implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
     SdrObject*	implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -266,8 +267,8 @@ private:
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
         sal_uInt16 _nControlObjectID,
         const ::rtl::OUString& _rFieldPostfix,
-        UINT32 _nInventor,
-        UINT16 _nLabelObjectID,
+        sal_uInt32 _nInventor,
+        sal_uInt16 _nLabelObjectID,
         SdrPage* _pLabelPage,
         SdrPage* _pControlPage,
         SdrModel* _pModel,
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 2b3a5796c3..2b3a5796c3 100644..100755
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 8d364a9890..8a4a7f518d 100644..100755
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -215,7 +215,8 @@ namespace svxform
         sal_Bool					m_bFiltering                : 1;
         sal_Bool					m_bAttachEvents             : 1;
         sal_Bool					m_bDetachEvents             : 1;
-        sal_Bool                    m_bAttemptedHandlerCreation : 1;
+        bool                        m_bAttemptedHandlerCreation : 1;
+        bool                        m_bSuspendFilterTextListening;          // no bit field, passed around as reference
 
         // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
         // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index f334e30169..f334e30169 100644..100755
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index 4fbaf657b7..4fbaf657b7 100644..100755
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index a042924fdf..a042924fdf 100644..100755
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 29900e4d1d..6da116f179 100644..100755
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -64,19 +64,19 @@ namespace svxform
             on the type of our document
         */
         SVX_DLLPUBLIC ::rtl::OUString
-                getToolboxResourceName( USHORT _nSlotId ) const;
+                getToolboxResourceName( sal_uInt16 _nSlotId ) const;
 
         /** toggles the toolbox associated with the given slot
         */
-        SVX_DLLPUBLIC void    toggleToolbox( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC void    toggleToolbox( sal_uInt16 _nSlotId ) const;
 
         /** determines whether the toolbox associated with the given slot is currently visible
         */
-        SVX_DLLPUBLIC bool    isToolboxVisible( USHORT _nSlotId ) const;
+        SVX_DLLPUBLIC bool    isToolboxVisible( sal_uInt16 _nSlotId ) const;
 
         /** ensures that a given toolbox is visible
         */
-        inline void showToolbox( USHORT _SlotId ) const
+        inline void showToolbox( sal_uInt16 _SlotId ) const
         {
             if ( !isToolboxVisible( _SlotId ) )
                 toggleToolbox( _SlotId );
diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc
index fb6597c6f5..fb6597c6f5 100644..100755
--- a/svx/source/inc/frmsel.hrc
+++ b/svx/source/inc/frmsel.hrc
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 0f602eabec..e40ad84820 100644..100755
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -76,7 +76,7 @@ public:
     void                SetKeyboardNeighbors(
                             FrameBorderType eLeft, FrameBorderType eRight,
                             FrameBorderType eTop, FrameBorderType eBottom );
-    FrameBorderType     GetKeyboardNeighbor( USHORT nKeyCode ) const;
+    FrameBorderType     GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const;
 
 private:
     const FrameBorderType meType;       /// Frame border type (position in control).
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 1f7fad2cc4..78416ce660 100644..100755
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -832,7 +832,7 @@ public:
 
 protected:
     virtual Window* getEventWindow() const;
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     // default implementations call our focus listeners, don't forget to call them if you override this
     virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -948,7 +948,7 @@ public:
     virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
     virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -1000,7 +1000,7 @@ public:
 
 protected:
     virtual Window* getEventWindow() const;
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 };
 
 //==================================================================
@@ -1052,7 +1052,7 @@ public:
     virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 
     DECL_LINK( OnDoubleClick, void* );
 };
@@ -1097,7 +1097,7 @@ public:
     virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException);
 
 protected:
-    virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+    virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
 };
 
 //==================================================================
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index 4eafd5d0b4..4eafd5d0b4 100644..100755
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
diff --git a/svx/source/inc/linectrl.hrc b/svx/source/inc/linectrl.hrc
index ecbffcb00f..ecbffcb00f 100644..100755
--- a/svx/source/inc/linectrl.hrc
+++ b/svx/source/inc/linectrl.hrc
diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx
index 64a9afa28a..64a9afa28a 100644..100755
--- a/svx/source/inc/recoveryui.hxx
+++ b/svx/source/inc/recoveryui.hxx
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index 1f12fc3e42..1f12fc3e42 100644..100755
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 946f11d6aa..41027e998d 100644..100755
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -30,7 +30,7 @@
 #define SVX_SQLPARSERCLIENT_HXX
 
 #include "svx/dbtoolsclient.hxx"
-#include "ParseContext.hxx"
+#include "svx/ParseContext.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 //........................................................................
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 74bc17ab9f..2b4cb89ddf 100644..100755
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -66,7 +66,7 @@ namespace svx
             @return String
                 The string.
         */
-        String getString( USHORT _nResId )
+        String getString( sal_uInt16 _nResId )
         {
             return String( ResId( _nResId, *m_pResMgr ) );
         }
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index e28219fd81..66c1caf573 100644..100755
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -90,9 +90,9 @@ void ImpCalcBmpFillSizes( Size&			   rStartOffset,
                           const Size&      rBmpSize, 
                           const Size&      rBmpPerCent, 
                           const Size&	   rBmpOffPerCent,
-                          BOOL             bBmpLogSize, 
-                          BOOL             bBmpTile, 
-                          BOOL             bBmpStretch, 
+                          sal_Bool             bBmpLogSize, 
+                          sal_Bool             bBmpTile, 
+                          sal_Bool             bBmpStretch, 
                           RECT_POINT       eBmpRectPoint );
 
 
diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx
index bfa824b902..bfa824b902 100644..100755
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 835967b081..835967b081 100644..100755
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index e086854d14..1b42253c6d 100644..100755
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -61,7 +61,7 @@ protected:
     virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
 
     // SvLBox
-    virtual BOOL DoubleClickHdl();
+    virtual sal_Bool DoubleClickHdl();
 
     using SvLBox::ExecuteDrop;
 };
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 1935fcb366..9e786352e3 100644..100755
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -58,7 +58,7 @@ private:
     DECL_LINK( TbxSelectHdl, ToolBox* );
 
 public:
-    SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx );
+    SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx );
     ~SvxFmConfigWin();
 
     void			Update();
@@ -70,7 +70,7 @@ public:
 class SvxFmTbxCtlConfig : public SfxToolBoxControl
 {
 private:
-    UINT16 nLastSlot;
+    sal_uInt16 nLastSlot;
 
 protected:
     using SfxToolBoxControl::Select;
@@ -78,11 +78,11 @@ protected:
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlConfig() {}
 
-    virtual void				Select( USHORT nModifier );
-    virtual void				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void				Select( sal_uInt16 nModifier );
+    virtual void				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow*		CreatePopupWindow();
@@ -95,12 +95,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlAbsRec();
 
     virtual Window*	CreateItemWindow( Window* pParent );
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 };
 
@@ -110,7 +110,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecText();
 
     virtual Window*	CreateItemWindow( Window* pParent );
@@ -122,7 +122,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecFromText();
 
     virtual Window*	CreateItemWindow( Window* pParent );
@@ -136,11 +136,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SvxFmTbxCtlRecTotal();
 
     virtual Window*	CreateItemWindow( Window* pParent );
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
 };
 
@@ -149,7 +149,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();											 
-    SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );	
+    SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );	
 };
 
 //========================================================================
@@ -157,7 +157,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();											 
-    SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );	
+    SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );	
 };					
 
 
diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index 52991b4247..52991b4247 100644..100755
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx
index 11b10d505a..11b10d505a 100644..100755
--- a/svx/source/inc/treevisitor.hxx
+++ b/svx/source/inc/treevisitor.hxx
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index 625ceaac7a..bb9cadcebe 100644..100755
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -61,17 +61,16 @@ namespace svxform
         // --------------------------------------------------------
         inline double getValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
-            const ::com::sun::star::util::Date& _rNullDate,
-            sal_Int16 _nKeyType) const
+            const ::com::sun::star::util::Date& _rNullDate ) const
         {
             double nReturn(0);
             if ( ensureLoaded() )
-                nReturn = m_xTypeConversion->getValue(_rxVariant, _rNullDate, _nKeyType);
+                nReturn = m_xTypeConversion->getValue( _rxVariant, _rNullDate );
             return nReturn;
         }
 
         // --------------------------------------------------------
-        inline ::rtl::OUString getValue(
+        inline ::rtl::OUString getFormattedValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
             const ::com::sun::star::util::Date& _rNullDate,
@@ -80,7 +79,7 @@ namespace svxform
         {
             ::rtl::OUString sReturn;
             if ( ensureLoaded() )
-                sReturn = m_xTypeConversion->getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
+                sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
             return sReturn;
         }
     };
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index d4764f06c6..d4764f06c6 100644..100755
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx
index c682f34f00..c682f34f00 100644..100755
--- a/svx/source/inc/unopolyhelper.hxx
+++ b/svx/source/inc/unopolyhelper.hxx
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index 36ec1896e8..36ec1896e8 100644..100755
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index ac190aaaba..ac190aaaba 100644..100755
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index c10985fabc..c10985fabc 100644..100755
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/about_ooo.hrc
index d789935427..399b2a49c4 100644..100755
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/about_ooo.hrc
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-#include <svx/svxids.hrc>
-
-#define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-
 #define OOO_CONTRIBUTOR_LIST \
 ItemList = \
 { \
@@ -1085,242 +1081,3 @@ ItemList = \
     < "Mattia Zuliani" ; > ; \
 };
 
-
-#define DEVELOPER_LIST \
-ItemList = \
-{ \
-    < "" ; > ; \
-    < "GENERAL MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Bemmer" ; > ; \
-    < "" ; > ; \
-    < "FUNCTIONAL STAFF" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Sabine Huetsch" ; > ; \
-    < "" ; > ; \
-    < "OpenOffice.org COORDINATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Taxhet" ; > ; \
-    < "" ; > ; \
-    < "TECHNICAL ARCHITECT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Matthias Huetsch" ; > ; \
-    < "Kay Ramme" ; > ; \
-    < "" ; > ; \
-    < "PROGRAM MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Joost Andrae" ; > ; \
-    < "Martin Damboldt" ; > ; \
-    < "Martin Hollmichel" ; > ; \
-    < "Andre Kuemmel" ; > ; \
-    < "Marcus Lange" ; > ; \
-    < "Uwe Luebbers" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Dieter Loeschky" ; > ; \
-    < "" ; > ; \
-    < "TECHNICAL ARCHITECT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Brauer" ; > ; \
-    < "Malte Timmermann" ; > ; \
-    < "" ; > ; \
-    < "ODF" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Svante Schubert" ; > ; \
-    < "" ; > ; \
-    < "DESIGN" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stella Schulze" ; > ; \
-    < "" ; > ; \
-    < "Migration" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Michael Bohn" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME WRITER & FRAMEWORK" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Mathias Bauer" ; > ; \
-    < "" ; > ; \
-    < "Henning Brinkmann" ; > ; \
-    < "Steffen Grund" ; > ; \
-    < "Hans-Peter Burow" ; > ; \
-    < "Carsten Driesner" ; > ; \
-    < "Thomas Lange" ; > ; \
-    < "Andreas Martens" ; > ; \
-    < "Frank Meies" ; > ; \
-    < "Bjoern Michaelsen" ; > ; \
-    < "Andreas Schluens" ; > ; \
-    < "Oliver Specht" ; > ; \
-    < "Oliver-Rainer Wittmann" ; > ; \
-    < "Michael Stahl" ; > ; \
-    < "Mikhail Voitenko" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME IMPRESS, GRAPHICS & BASE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Kai Ahrens" ; > ; \
-    < "" ; > ; \
-    < "Volker Ahrendt" ; > ; \
-    < "Herbert Duerr" ; > ; \
-    < "Andre Fischer" ; > ; \
-    < "Ilko Hoepping" ; > ; \
-    < "Sven Jacobi" ; > ; \
-    < "Ocke Janssen" ; > ; \
-    < "Artem Khvat" ; > ; \
-    < "Lars Langhans" ; > ; \
-    < "Armin Le Grand" ; > ; \
-    < "Christian Lippka" ; > ; \
-    < "Philipp Lohmann" ; > ; \
-    < "Frank Schoenheit" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME PROGRAMMABILITY & DEPLOYMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Kai Sommerfeld" ; > ; \
-    < "" ; > ; \
-    < "Stephan Bergmann" ; > ; \
-    < "Andreas Bregas" ; > ; \
-    < "Steffen Grund" ; > ; \
-    < "Mihaela Kedikova" ; > ; \
-    < "Tobias Krause" ; > ; \
-    < "Joachim Lingner" ; > ; \
-    < "Christoph Neumann" ; > ; \
-    < "Hennes Rohling" ; > ; \
-    < "Juergen Schmidt" ; > ; \
-    < "Ingo Schmidt-Rosbiegal" ; > ; \
-    < "Dirk Voelzke" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "%PRODUCTNAME CALC" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stephan Schaefer" ; > ; \
-    < "" ; > ; \
-    < "Thomas Benisch" ; > ; \
-    < "Daniel Boelzle" ; > ; \
-    < "Berend Cornelius" ; > ; \
-    < "Ingrid Halama" ; > ; \
-    < "Bjoern Milcke" ; > ; \
-    < "Niklas Nebel" ; > ; \
-    < "Eike Rathke" ; > ; \
-    < "Daniel Rentz" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "USER EXPERIENCE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Andreas Bartel" ; > ; \
-    < "Bettina Haberer" ; > ; \
-    < "Christian Jansen" ; > ; \
-    < "Frank Loehmann" ; > ; \
-    < "Elizabeth Matthis" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "QUALITY ASSURANCE & COORDINATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Nils Fuhrmann" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "RELEASE ENGINEERING " ; 8 ; > ; \
-    < "" ; > ; \
-    < "Ruediger Timm" ; > ; \
-    < "" ; > ; \
-    < "Oliver Bolte" ; > ; \
-    < "Vladimir Glazounov" ; > ; \
-    < "Ivo Hinkelmann" ; > ; \
-    < "Hans-Joachim Lankenau" ; > ; \
-    < "Jens-Heiner Rechtien" ; > ; \
-    < "Kurt Zenker" ; > ; \
-    < "" ; > ; \
-    < "DEVELOPMENT TOOLS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Joerg Jahnke" ; > ; \
-    < "" ; > ; \
-    < "Bernd Eilers" ; > ; \
-    < "Gregor Hartmann" ; > ; \
-    < "Frank Mau" ; > ; \
-    < "Nikolai Pretzell" ; > ; \
-    < "" ; > ; \
-    < "QUALITY ASSURANCE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Thorsten Ziehm" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME AUTOMATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Thorsten Bosbach" ; > ; \
-    < "Helge Delfs" ; > ; \
-    < "Joerg Sievers" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME WRITER" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Baltzer" ; > ; \
-    < "Hasan Ilter" ; > ; \
-    < "Michael Ruess" ; > ; \
-    < "Eric Savary" ; > ; \
-    < "Ulf Stroehler" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME CALC" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Oliver Craemer" ; > ; \
-    < "Thomas Klarhoefer" ; > ; \
-    < "Frank Stecher" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME IMPRESS & BASE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Christoph Lukasiak" ; > ; \
-    < "Marc Neumann" ; > ; \
-    < "Wolfram Garten" ; > ; \
-    < "Christian Guenther" ; > ; \
-    < "" ; > ; \
-    < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Olaf Felka" ; > ; \
-    < "Thorsten Martens" ; > ; \
-    < "Joerg W. Skottke" ; > ; \
-    < "Andreas Treumann" ; > ; \
-    < "" ; > ; \
-    < "INFORMATION TECHNOLOGY" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Dirk Marquardt" ; > ; \
-    < "Gerd Weiss" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "MANUALS & ONLINE HELP" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Frank Peters" ; > ; \
-    < "" ; > ; \
-    < "Clayton Cornell" ; > ; \
-    < "Uwe Fischer" ; > ; \
-    < "Martina Waller" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
-    < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Rafaella Braconi" ; > ; \
-    < "" ; > ; \
-    < "MARKETING & OPERATIONS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "PRODUCT MANAGMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Goetz Wohlberg" ; > ; \
-    < "Lutz Hoeger" ; > ; \
-    < "" ; > ; \
-    < "MARKETING" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Rosana Ardila Biela" ; > ; \
-    < "Kay Koll" ; > ; \
-    < "Iyer Venkatesan" ; > ; \
-    < "" ; > ; \
-    < "OPERATIONS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Parker Proffitt" ; > ; \
-    < "" ; > ; \
-    < "SUN SIGMA BLACK BELT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Zimmermann" ; > ; \
-    < "" ; > ; \
-};\
-
-#define TEXT_DEFAULTABOUT \
-    Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; \
-    Text [ en-US ] = "About %PRODUCTNAME" ; \
-
-// ******************************************************************* EOF
-
diff --git a/svx/source/intro/about_ooo.src b/svx/source/intro/about_ooo.src
new file mode 100755
index 0000000000..487f9f012b
--- /dev/null
+++ b/svx/source/intro/about_ooo.src
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * 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 <svtools/svtools.hrc>
+#include "about_ooo.hrc"
+
+String ABOUT_STR_COPYRIGHT
+{
+    Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";	
+};
+
+StringArray ABOUT_STR_DEVELOPER_ARY
+{
+    OOO_CONTRIBUTOR_LIST
+};
+
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index be0ec5d20c..be0ec5d20c 100644..100755
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
deleted file mode 100644
index 4d0686baac..0000000000
--- a/svx/source/intro/makefile.mk
+++ /dev/null
@@ -1,66 +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=svx
-TARGET=intro
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES
-
-# --- Allgemein -----------------------------------------------------------
-
-LOCALIZE_ME=intro_tmpl.hrc
-
-SRS1NAME= iso
-SRC1FILES=	\
-    $(SRS1NAME).src
-
-RESLIB1NAME=$(SRS1NAME)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
-    $(SRS)$/$(SRS1NAME).srs
-
-# Version "OpenOffice.org"
-SRS2NAME= ooo
-SRC2FILES=  \
-    $(SRS2NAME).src
-
-RESLIB2NAME=$(SRS2NAME)
-RESLIB2IMAGES=$(PRJ)$/res
-RESLIB2SRSFILES= \
-    $(SRS)$/$(SRS2NAME).srs
-
-.INCLUDE :  target.mk
-
-$(SRS)$/iso.srs: $(INCCOM)$/intro.hrc
-$(SRS)$/ooo.srs: $(INCCOM)$/intro.hrc
-
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 07f3daab9f..07f3daab9f 100644..100755
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index c16a739db4..bc76611c69 100644..100755
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -40,7 +40,7 @@ TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
 
 // class SvxFontItem -----------------------------------------------------
 
-SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
+SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
                                   const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
                                   const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
                                   const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -65,12 +65,12 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
 
 // -----------------------------------------------------------------------
 
-bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
+bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const
 {
     return false;
 }
 // -----------------------------------------------------------------------
-bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
+bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */)
 {
     return false;
 }
@@ -103,14 +103,14 @@ SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxSmartTagItem::Store( SvStream& rStream, USHORT /*nItemVersion*/ ) const
+SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStream;
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxSmartTagItem::Create(SvStream& , USHORT) const
+SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const
 {
     return 0;
 }
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 7d0105902e..13cd264d82 100644..100755
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -66,12 +66,12 @@ TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
 // class SvxOrientationItem ----------------------------------------------
 
 SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
-                                        const USHORT nId):
-    SfxEnumItem( nId, (USHORT)eOrientation )
+                                        const sal_uInt16 nId):
+    SfxEnumItem( nId, (sal_uInt16)eOrientation )
 {
 }
 
-SvxOrientationItem::SvxOrientationItem( INT32 nRotation, BOOL bStacked, const USHORT nId ) :
+SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) :
     SfxEnumItem( nId )
 {
     SetFromRotation( nRotation, bStacked );
@@ -102,7 +102,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     table::CellOrientation eUno = table::CellOrientation_STANDARD;
     switch ( (SvxCellOrientation)GetValue() )
@@ -116,7 +116,7 @@ bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     return true;
 }
 
-bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     table::CellOrientation eOrient;
     if(!(rVal >>= eOrient))
@@ -135,13 +135,13 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
         case table::CellOrientation_STACKED:	eSvx = SVX_ORIENTATION_STACKED;	  break;
         default: ; //prevent warning
     }
-    SetValue( (USHORT)eSvx );
+    SetValue( (sal_uInt16)eSvx );
     return true;
 }
 
 //------------------------------------------------------------------------
 
-XubString SvxOrientationItem::GetValueText( USHORT nVal ) const
+XubString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
 {
     DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" );
     return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal);
@@ -156,30 +156,30 @@ SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() );
 }
 
 //------------------------------------------------------------------------
 
-USHORT SvxOrientationItem::GetValueCount() const
+sal_uInt16 SvxOrientationItem::GetValueCount() const
 {
     return SVX_ORIENTATION_STACKED + 1;	// letzter Enum-Wert + 1
 }
 
 //------------------------------------------------------------------------
 
-BOOL SvxOrientationItem::IsStacked() const
+sal_Bool SvxOrientationItem::IsStacked() const
 {
     return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED;
 }
 
-INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
+sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
 {
-    INT32 nAngle = nStdAngle;
+    sal_Int32 nAngle = nStdAngle;
     switch( static_cast< SvxCellOrientation >( GetValue() ) )
     {
         case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
@@ -189,7 +189,7 @@ INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
     return nAngle;
 }
 
-void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
+void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked )
 {
     if( bStacked )
     {
@@ -205,7 +205,7 @@ void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
 
 // class SvxMarginItem ---------------------------------------------------
 
-SvxMarginItem::SvxMarginItem( const USHORT nId ) :
+SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
 
@@ -222,7 +222,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
                               sal_Int16 nTop,
                               sal_Int16 nRight,
                               sal_Int16 nBottom,
-                              const USHORT nId ) :
+                              const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
 
     nLeftMargin	 ( nLeft ),
@@ -318,7 +318,7 @@ SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     sal_Int16   nLeft;
     sal_Int16   nTop;
@@ -333,7 +333,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
 
 //------------------------------------------------------------------------
 
-SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
     rStream << nLeftMargin;
     rStream << nTopMargin;
@@ -345,7 +345,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
 
 //------------------------------------------------------------------------
 
-bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -373,7 +373,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
 //------------------------------------------------------------------------
 
-bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
     long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX;	// Members sind sal_Int16
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 951ecb4e1c..e6bba7d2c0 100644..100755
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -43,7 +43,7 @@
 #include <float.h>
 #include <rtl/math.hxx>
 
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -51,7 +51,6 @@ using namespace ::com::sun::star;
 
 TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0));
 TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem);
-TYPEINIT1(SvxChartLegendPosItem, SfxEnumItem);
 TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem);
 TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem);
 TYPEINIT1(SvxChartIndicateItem, SfxEnumItem);
@@ -65,14 +64,14 @@ TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
 |*
 *************************************************************************/
 
-SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eStyle)
+SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eStyle)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, USHORT nId) :
+SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -86,7 +85,7 @@ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartStyleItem(rIn, Which());
 }
@@ -98,14 +97,14 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 *************************************************************************/
 
 SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eDataDescr)
+                                             sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eDataDescr)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, USHORT nId) :
+SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -119,59 +118,26 @@ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartDataDescrItem(rIn, Which());
 }
 
 /*************************************************************************
 |*
-|*	SvxChartLegendPosItem
-|*
-*************************************************************************/
-
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eLegendPos)
-{
-}
-
-// -----------------------------------------------------------------------
-
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) :
-    SfxEnumItem(nId, rIn)
-{
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
-{
-    return new SvxChartLegendPosItem(*this);
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
-{
-    return new SvxChartLegendPosItem(rIn, Which());
-}
-
-/*************************************************************************
-|*
 |*	SvxChartTextOrderItem
 |*
 *************************************************************************/
 
 SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
-                                             USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrder)
+                                             sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrder)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -185,14 +151,14 @@ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartTextOrderItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // the order of the two enums is not equal, so a mapping is required
     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -217,7 +183,7 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /
 
 // -----------------------------------------------------------------------
 
-bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // the order of the two enums is not equal, so a mapping is required
     ::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -246,7 +212,7 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
             return false;
     }
 
-    SetValue( (USHORT)eOrder );
+    SetValue( (sal_uInt16)eOrder );
 
     return true;
 }
@@ -258,14 +224,14 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
 *************************************************************************/
 
 SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -279,7 +245,7 @@ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartTextOrientItem(rIn, Which());
 }
@@ -290,7 +256,7 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) cons
 |*
 *************************************************************************/
 
-SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
     SfxPoolItem(nId),
     fVal(fValue)
 {
@@ -298,7 +264,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
 
 // -----------------------------------------------------------------------
 
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
     SfxPoolItem(nId)
 {
     rIn >> fVal;
@@ -354,7 +320,7 @@ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
+SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
 {
     double _fVal;
     rIn >> _fVal;
@@ -363,7 +329,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
+SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
 {
     rOut << fVal;
     return rOut;
@@ -394,14 +360,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
 
 
 // -----------------------------------------------------------------------
-bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= fVal;
     return true;
 }
 
 // -----------------------------------------------------------------------
-bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     return rVal >>= fVal;
 }
@@ -415,14 +381,14 @@ bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 *************************************************************************/
 
 SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, USHORT nId) :
+SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -436,14 +402,14 @@ SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartKindErrorItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
@@ -457,14 +423,14 @@ USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
 *************************************************************************/
 
 SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, USHORT nId) :
+SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -478,14 +444,14 @@ SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartIndicateItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
@@ -499,14 +465,14 @@ USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
 *************************************************************************/
 
 SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient,
-                                               USHORT nId) :
-    SfxEnumItem(nId, (USHORT)eOrient)
+                                               sal_uInt16 nId) :
+    SfxEnumItem(nId, (sal_uInt16)eOrient)
 {
 }
 
 // -----------------------------------------------------------------------
 
-SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, USHORT nId) :
+SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
@@ -520,14 +486,14 @@ SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartRegressItem(rIn, Which());
 }
 
 // -----------------------------------------------------------------------
 
-USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
                ? USHRT_MAX
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 0868a34f35..e52e3e3523 100644..100755
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -33,7 +33,7 @@
 #define _SVSTDARR_STRINGSDTOR
 
 #include <svl/svstdarr.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipfmtitem.hxx>
 #include <com/sun/star/frame/status/ClipboardFormats.hpp>
 
 struct SvxClipboardFmtItem_Impl
@@ -54,7 +54,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
                             const SvxClipboardFmtItem_Impl& rCpy )
 {
     aFmtIds.Insert( &rCpy.aFmtIds, 0 );
-    for( USHORT n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
+    for( sal_uInt16 n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
     {
         String* pStr = rCpy.aFmtNms[ n ];
         if( pStr )
@@ -63,7 +63,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
     }
 }
 
-SvxClipboardFmtItem::SvxClipboardFmtItem( USHORT nId )
+SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
     : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
 {
 }
@@ -79,15 +79,15 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
     delete pImpl;
 }
 
-bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
-    USHORT nCount = Count();
+    sal_uInt16 nCount = Count();
 
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
 
     aClipFormats.Identifiers.realloc( nCount );
     aClipFormats.Names.realloc( nCount );
-    for ( USHORT n=0; n < nCount; n++ )
+    for ( sal_uInt16 n=0; n < nCount; n++ )
     {
         aClipFormats.Identifiers[n] = (sal_Int64)GetClipbrdFormatId( n );
         aClipFormats.Names[n] = GetClipbrdFormatName( n );
@@ -97,17 +97,17 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe
     return true;
 }
 
-bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::ClipboardFormats aClipFormats;
     if ( rVal >>= aClipFormats )
     {
-        USHORT nCount = USHORT( aClipFormats.Identifiers.getLength() );
+        sal_uInt16 nCount = sal_uInt16( aClipFormats.Identifiers.getLength() );
 
         pImpl->aFmtIds.Remove( 0, pImpl->aFmtIds.Count() );
         pImpl->aFmtNms.Remove( 0, pImpl->aFmtNms.Count() );
-        for ( USHORT n=0; n < nCount; n++ )
-            AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
+        for ( sal_uInt16 n=0; n < nCount; n++ )
+            AddClipbrdFormat( sal_uIntPtr( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
 
         return true;
     }
@@ -123,7 +123,7 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
     {
         nRet = 1;
         const String* pStr1, *pStr2;
-        for( USHORT n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
+        for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
         {
             if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] ||
                 ( (0 == ( pStr1 = pImpl->aFmtNms[ n ] )) ^
@@ -143,7 +143,7 @@ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
     return new SvxClipboardFmtItem( *this );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.Count() )
         nPos = pImpl->aFmtNms.Count();
@@ -152,8 +152,8 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
     pImpl->aFmtIds.Insert( nId, nPos );
 }
 
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
-                            USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+                            sal_uInt16 nPos )
 {
     if( nPos > pImpl->aFmtNms.Count() )
         nPos = pImpl->aFmtNms.Count();
@@ -162,17 +162,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
     pImpl->aFmtIds.Insert( nId, nPos );
 }
 
-USHORT SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFmtItem::Count() const
 {
     return pImpl->aFmtIds.Count();
 }
 
-ULONG SvxClipboardFmtItem::GetClipbrdFormatId( USHORT nPos ) const
+sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
 {
     return pImpl->aFmtIds[ nPos ];
 }
 
-const String& SvxClipboardFmtItem::GetClipbrdFormatName( USHORT nPos ) const
+const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
 {
     const String* pS = pImpl->aFmtNms[ nPos ];
     return pS ? *pS : SvxClipboardFmtItem_Impl::sEmptyStr;
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 277de0f666..c3b45ce301 100644..100755
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -61,7 +61,7 @@ size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustom
     return (size_t)r1.first.hashCode() + r1.second.hashCode();
 };
 
-TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new  SdrCustomShapeGeometryItem(0));
+TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new  SdrCustomShapeGeometryItem);
 SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
 :	SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
 {}
@@ -335,12 +335,12 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
 {
     return 1;
 }
-bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= aPropSeq;
     return true;
 }
-bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     if ( ! ( rVal >>= aPropSeq ) )
         return false;
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 05269deeea..045facf489 100644..100755
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -34,7 +34,7 @@
 #include <svx/svxids.hrc>
 
 
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/xtable.hxx>
 
 using namespace ::com::sun::star;
@@ -105,19 +105,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pColorTable );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pColorTable );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -125,7 +125,7 @@ bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*n
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pColorTable = (XColorTable *)(ULONG)aValue;
+        pColorTable = (XColorTable *)(sal_uLong)aValue;
         return true;
     }
 
@@ -189,19 +189,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pGradientList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pGradientList );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -209,7 +209,7 @@ bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pGradientList = (XGradientList *)(ULONG)aValue;
+        pGradientList = (XGradientList *)(sal_uLong)aValue;
         return true;
     }
 
@@ -273,19 +273,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pHatchList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pHatchList );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -293,7 +293,7 @@ bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nM
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pHatchList = (XHatchList *)(ULONG)aValue;
+        pHatchList = (XHatchList *)(sal_uLong)aValue;
         return true;
     }
 
@@ -357,19 +357,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     // Please ask CD if you want to change this.
-    sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pBitmapList );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
@@ -377,7 +377,7 @@ bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*n
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pBitmapList = (XBitmapList *)(ULONG)aValue;
+        pBitmapList = (XBitmapList *)(sal_uLong)aValue;
         return true;
     }
 
@@ -443,25 +443,25 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
-    sal_Int64 aValue = sal_Int64( (ULONG)pDashList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pDashList );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pDashList = (XDashList *)(ULONG)aValue;
+        pDashList = (XDashList *)(sal_uLong)aValue;
         return true;
     }
 
@@ -532,25 +532,25 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
-    sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList );
+    sal_Int64 aValue = sal_Int64( (sal_uLong)pLineEndList );
     rVal = uno::makeAny( aValue );
     return true;
 }
 
 // -----------------------------------------------------------------------
 
-bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     // This is only a quick helper to have UI support for these list items. Don't use
     // this method to query for a valid UNO representation.
     sal_Int64 aValue = 0;
     if ( rVal >>= aValue )
     {
-        pLineEndList = (XLineEndList *)(ULONG)aValue;
+        pLineEndList = (XLineEndList *)(sal_uLong)aValue;
         return true;
     }
 
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 64b6219402..80acfbec84 100644..100755
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -59,7 +59,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem()
 
 // -----------------------------------------------------------------------
 
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rVal ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) :
     SfxPoolItem( _nWhich ),
     aVal( rVal )
 {
@@ -68,7 +68,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rV
 
 // -----------------------------------------------------------------------
 
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, SvStream& rStream ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, SvStream& rStream ) :
     SfxPoolItem( _nWhich )
 {
     DBG_CTOR(SvxB3DVectorItem, 0);
@@ -106,7 +106,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) const
+SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const
 {
     DBG_CHKTHIS(SvxB3DVectorItem, 0);
     basegfx::B3DVector aStr;
@@ -119,7 +119,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) co
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
     DBG_CHKTHIS(SvxB3DVectorItem, 0);
 
@@ -134,7 +134,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
 
 // -----------------------------------------------------------------------
 
-bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     drawing::Direction3D aDirection;
 
@@ -149,7 +149,7 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 
 // -----------------------------------------------------------------------
 
-bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     drawing::Direction3D aDirection;
     if(!(rVal >>= aDirection))
@@ -163,7 +163,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 
 // -----------------------------------------------------------------------
 
-USHORT SvxB3DVectorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
     return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0;
 }
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 3ac7188349..312953bbaa 100644..100755
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -45,13 +45,13 @@ using namespace ::com::sun::star;
  *	Implementierung		class SwCropGrf
  ******************************************************************************/
 
-SvxGrfCrop::SvxGrfCrop( USHORT nItemId )
+SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId )
     : SfxPoolItem( nItemId ),
     nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 )
 {}
 
 SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR,
-                        sal_Int32 nT, sal_Int32 nB, USHORT nItemId )
+                        sal_Int32 nT, sal_Int32 nB, sal_uInt16 nItemId )
     : SfxPoolItem( nItemId ),
     nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB )
 {}
@@ -77,7 +77,7 @@ SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const
 */
 
 /*
-USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
                 SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -87,9 +87,9 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
 }
 */
 
-SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
+SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
-    INT32 top, left, right, bottom;
+    sal_Int32 top, left, right, bottom;
     rStrm >> top >> left >> right >> bottom;
 
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
@@ -104,9 +104,9 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
 }
 
 
-SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
+SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
-    INT32 left = GetLeft(), right = GetRight(),
+    sal_Int32 left = GetLeft(), right = GetRight(),
             top = GetTop(), bottom = GetBottom();
     if( GRFCROP_VERSION_SWDEFAULT == nVersion )
         top = -top, bottom = -bottom, left = -left, right = -right;
@@ -118,7 +118,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
 
 
 
-bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -141,7 +141,7 @@ bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 414c0fd7ba..73a0421e8f 100644..100755
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -37,7 +37,7 @@
 #include <svl/memberid.hrc>
 #include <basic/sbxvar.hxx>
 
-#include "hlnkitem.hxx"
+#include "svx/hlnkitem.hxx"
 
 // -----------------------------------------------------------------------
 
@@ -320,7 +320,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
     pMacroTable = new SvxMacroTableDtor ( rTbl );
 }
 
-bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -348,7 +348,7 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
     return true;
 }
 
-bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index b2f2033719..b2f2033719 100644..100755
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 3d84f3b02c..837fdea456 100644..100755
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -456,7 +456,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
 {
     rpFontColor = NULL;
 
-    ULONG nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
+    sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
     if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
     {
         //	real preview - not implemented in NumberFormatter for text formats
@@ -469,7 +469,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
         //	format exists
 
         //	#50441# if a string was set in addition to the value, use it for text formats
-        BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+        sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
                             ( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) );
         if ( bUseText )
             pFormatter->GetOutputString( aValStr, nExistingFormat,
@@ -1031,7 +1031,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
             aWSStringsDtor,	*pTmpCurrencyEntry, bTmpBanking );
         if ( !bTmpBanking )
             pFormatter->GetCurrencyFormatStrings(
-                aWSStringsDtor, *pTmpCurrencyEntry, TRUE );
+                aWSStringsDtor, *pTmpCurrencyEntry, sal_True );
     }
     else
         nDefault = 0;
@@ -1045,8 +1045,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
             const NfCurrencyEntry* pCurr = rCurrencyTable[i];
             if ( pCurr->GetLanguage() == eLang && pTmpCurrencyEntry != pCurr )
             {
-                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, FALSE );
-                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, TRUE );
+                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_False );
+                pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_True );
             }
         }
     }
@@ -1175,7 +1175,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol
     rpColor = NULL;
 
     //	#50441# if a string was set in addition to the value, use it for text formats
-    BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+    sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
                         ( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) );
 
     if ( bUseText )
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index ca769b2802..ca769b2802 100644..100755
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 1c021c0b8b..f3f7e505f9 100644..100755
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -29,9 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ofaitem.hxx"
+#include "svx/ofaitem.hxx"
 
-OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr )
+OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr )
     : SfxPoolItem( _nWhich ), pPtr( _pPtr )
 {
 
@@ -55,7 +55,7 @@ SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const
 /*
 TYPEINIT1_FACTORY(DashListPtrItem, SvxDashListPtrItem, new DashListPtrItem(0));
 
-DashListPtrItem::DashListPtrItem( USHORT nWhich, SvxDashListItem* pPtr )
+DashListPtrItem::DashListPtrItem( sal_uInt16 nWhich, SvxDashListItem* pPtr )
     : OfaPtrItem( nWhich ), pPtr( pPtr )
 {
 }
@@ -75,11 +75,11 @@ SfxPoolItem* DashListPtrItem::Clone( SfxItemPool *pPool ) const
     return new DashListPtrItem( *this );
 }
 
-sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const
+sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const
 {
 }
 
-sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 )
+sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
 {
     sal_Int64 nHyper;
     if ( rVal >>= nHyper )
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index a98d32c4fd..8d1b135388 100644..100755
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -53,7 +53,7 @@ TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new  SvxPageItem(0));
     Beschreibung: Konstruktor
  --------------------------------------------------------------------*/
 
-SvxPageItem::SvxPageItem( const USHORT nId ) : SfxPoolItem( nId ),
+SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
 
     eNumType	( SVX_ARABIC ),
     bLandscape	( sal_False ),
@@ -95,7 +95,7 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
              eUse 		== rItem.eUse );
 }
 
-inline XubString GetUsageText( const USHORT eU )
+inline XubString GetUsageText( const sal_uInt16 eU )
 {
     if ( eU & SVX_PAGE_LEFT )
         return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT);
@@ -165,7 +165,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
 }
 
 //------------------------------------------------------------------------
-bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -202,7 +202,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 //------------------------------------------------------------------------
-bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     switch( nMemberId )
     {
@@ -245,12 +245,12 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     XubString sStr;
-    BYTE eType;
+    sal_uInt8 eType;
     sal_Bool bLand;
-    USHORT nUse;
+    sal_uInt16 nUse;
 
     // UNICODE: rStream >> sStr;
     rStream.ReadByteString( sStr );
@@ -269,12 +269,12 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
 
 //------------------------------------------------------------------------
 
-SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     // UNICODE: rStrm << aDescName;
     rStrm.WriteByteString(aDescName);
 
-    rStrm << (BYTE)eNumType << bLandscape << eUse;
+    rStrm << (sal_uInt8)eNumType << bLandscape << eUse;
     return rStrm;
 }
 
@@ -282,7 +282,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
     Beschreibung:	HeaderFooterSet
  --------------------------------------------------------------------*/
 
-SvxSetItem::SvxSetItem( const USHORT nId, const SfxItemSet& rSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ) :
 
     SfxSetItem( nId, rSet )
 {
@@ -294,7 +294,7 @@ SvxSetItem::SvxSetItem( const SvxSetItem& rItem ) :
 {
 }
 
-SvxSetItem::SvxSetItem( const USHORT nId, SfxItemSet* _pSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, SfxItemSet* _pSet ) :
 
     SfxSetItem( nId, _pSet )
 {
@@ -319,7 +319,7 @@ SfxItemPresentation SvxSetItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
+SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(),
                                        GetItemSet().GetRanges() );
@@ -329,7 +329,7 @@ SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
     return new SvxSetItem( Which(), *_pSet );
 }
 
-SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const
+SvStream& SvxSetItem::Store(SvStream &rStrm, sal_uInt16 nItemVersion) const
 {
     GetItemSet().Store( rStrm, nItemVersion );
 
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 8f8516204a..21b27d7fb3 100644..100755
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -32,7 +32,7 @@
 // include ---------------------------------------------------------------
 
 #define _SVX_POSTATTR_CXX
-#include "postattr.hxx"
+#include "svx/postattr.hxx"
 #include <editeng/itemtype.hxx>
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index d8ed34e6cf..6b132a1000 100644..100755
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include "rotmodit.hxx"
+#include "svx/rotmodit.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -56,8 +56,8 @@ TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTA
 //	SvxRotateModeItem - Ausrichtung bei gedrehtem Text
 //-----------------------------------------------------------------------
 
-SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, USHORT _nWhich )
-    : SfxEnumItem( _nWhich, (USHORT)eMode )
+SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich )
+    : SfxEnumItem( _nWhich, (sal_uInt16)eMode )
 {
 }
 
@@ -70,9 +70,9 @@ SvxRotateModeItem::~SvxRotateModeItem()
 {
 }
 
-SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
 }
@@ -100,7 +100,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
     return ePres;
 }
 
-String SvxRotateModeItem::GetValueText( USHORT nVal ) const
+String SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const
 {
     String aText;
 
@@ -119,7 +119,7 @@ String SvxRotateModeItem::GetValueText( USHORT nVal ) const
     return aText;
 }
 
-USHORT SvxRotateModeItem::GetValueCount() const
+sal_uInt16 SvxRotateModeItem::GetValueCount() const
 {
     return 4;		// STANDARD, TOP, CENTER, BOTTOM
 }
@@ -129,12 +129,12 @@ SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const
     return new SvxRotateModeItem( *this );
 }
 
-USHORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16 SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return 0;
 }
 
-bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     sal_Int32 nUno = table::CellVertJustify2::STANDARD;
     switch ( (SvxRotateMode)GetValue() )
@@ -148,7 +148,7 @@ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     return true;
 }
 
-bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     sal_Int32 nUno(0);
     if(!(rVal >>= nUno))
@@ -165,7 +165,7 @@ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
         case table::CellVertJustify2::BOTTOM:   eSvx = SVX_ROTATE_MODE_BOTTOM;   break;
         default: ;//prevent warning
     }
-    SetValue( (USHORT)eSvx );
+    SetValue( (sal_uInt16)eSvx );
     return true;
 }
 
diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx
index 8a574d2e8e..8a574d2e8e 100644..100755
--- a/svx/source/items/svxempty.cxx
+++ b/svx/source/items/svxempty.cxx
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index e02c30a767..37b02b906d 100644..100755
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -32,7 +32,7 @@
 // include ---------------------------------------------------------------
 #include <tools/shl.hxx>
 
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 8d27e3fc3e..3bf3294346 100644..100755
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
  // include ---------------------------------------------------------------
 #define __RSC
-#include "svxerr.hxx"
+#include "svx/svxerr.hxx"
 #include <svx/dialogs.hrc>
 #include <editeng/editerr.hxx>
 
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 9b15b00bf5..9b15b00bf5 100644..100755
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index dd879efa33..5ec42b2bd4 100644..100755
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -46,7 +46,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
 
 SvxViewLayoutItem::SvxViewLayoutItem
 (
-    USHORT      nColumns,
+    sal_uInt16      nColumns,
     bool        bBookMode,
     sal_uInt16  _nWhich
 )
@@ -112,7 +112,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
              mbBookMode == rItem.IsBookMode() );
 }
 
-bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -138,7 +138,7 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
     return true;
 }
 
-bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -169,7 +169,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
 
                 if ( bAllConverted && nConvertedCount == VIEWLAYOUT_PARAMS )
                 {
-                    SetValue( (UINT16)nColumns );
+                    SetValue( (sal_uInt16)nColumns );
                     mbBookMode = bBookMode;
                     return true;
                 }
@@ -183,7 +183,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
             sal_Int32 nVal = 0;
             if ( rVal >>= nVal )
             {
-                SetValue( (UINT16)nVal );
+                SetValue( (sal_uInt16)nVal );
                 return true;
             }
             else
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index f914ae9b1c..61a947f382 100644..100755
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -116,7 +116,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
              eType 		== rItem.GetType() 			);
 }
 
-bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -146,7 +146,7 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) c
     return true;
 }
 
-bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -183,7 +183,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId
 
                 if ( bAllConverted && nConvertedCount == ZOOM_PARAMS )
                 {
-                    SetValue( (UINT16)nValueTmp );
+                    SetValue( (sal_uInt16)nValueTmp );
                     nValueSet = nValueSetTmp;
                     eType = SvxZoomType( nTypeTmp );
                     return true;
@@ -198,7 +198,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId
             sal_Int32 nVal = 0;
             if ( rVal >>= nVal )
             {
-                SetValue( (UINT16)nVal );
+                SetValue( (sal_uInt16)nVal );
                 return true;
             }
             else
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 213d12815b..ed706bb147 100644..100755
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -45,7 +45,7 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
 
 // -----------------------------------------------------------------------
 
-SvxZoomSliderItem::SvxZoomSliderItem( USHORT nCurrentZoom, USHORT nMinZoom, USHORT nMaxZoom, USHORT _nWhich )
+SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich )
 :   SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom )
 {
 }
@@ -109,7 +109,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
              mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
 }
 
-bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -157,7 +157,7 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
     return true;
 }
 
-bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -201,10 +201,10 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
     
                     if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
                     {
-                        SetValue( (UINT16)nCurrentZoom );
+                        SetValue( (sal_uInt16)nCurrentZoom );
                         maValues = aValues;
-                        mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
-                        mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
+                        mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom );
+                        mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom );
 
                         return true;
                     }
@@ -218,7 +218,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
                 sal_Int32 nVal = 0;
                 if ( rVal >>= nVal )
                 {
-                    SetValue( (UINT16)nVal );
+                    SetValue( (sal_uInt16)nVal );
                     return true;
                 }
                 else
@@ -241,7 +241,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
                 sal_Int32 nVal = 0;
                 if( rVal >>= nVal )
                 {
-                    mnMinZoom = (UINT16)nVal;
+                    mnMinZoom = (sal_uInt16)nVal;
                     return true;
                 }
                 else
@@ -252,7 +252,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
                 sal_Int32 nVal = 0;
                 if( rVal >>= nVal )
                 {
-                    mnMaxZoom = (UINT16)nVal;
+                    mnMaxZoom = (sal_uInt16)nVal;
                     return true;
                 }
                 else
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index f98541b98d..a3f80dd26a 100644..100755
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -50,7 +50,7 @@ SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
 
 SvxSmartTagsControl::SvxSmartTagsControl
 (
-    USHORT 			_nId,
+    sal_uInt16 			_nId,
     Menu&			rMenu,
     SfxBindings&	/*rBindings*/
 ) :
@@ -63,17 +63,17 @@ SvxSmartTagsControl::SvxSmartTagsControl
 
 //--------------------------------------------------------------------
 
-const USHORT MN_ST_INSERT_START = 500;
+const sal_uInt16 MN_ST_INSERT_START = 500;
 
 void SvxSmartTagsControl::FillMenu()
 {
     if ( !mpSmartTagItem )
         return;
 
-    USHORT nMenuPos = 0;
-    USHORT nSubMenuPos = 0;
-    USHORT nMenuId = 1;
-    USHORT nSubMenuId = MN_ST_INSERT_START;
+    sal_uInt16 nMenuPos = 0;
+    sal_uInt16 nSubMenuPos = 0;
+    sal_uInt16 nMenuId = 1;
+    sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
 
     const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
     const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence();
@@ -84,7 +84,7 @@ void SvxSmartTagsControl::FillMenu()
     const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
     const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
 
-    for ( USHORT j = 0; j < rActionComponentsSequence.getLength(); ++j )
+    for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
     {
         Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
 
@@ -122,7 +122,7 @@ void SvxSmartTagsControl::FillMenu()
         pSbMenu->InsertSeparator( nSubMenuPos++ );
 
         // Add subitem for every action reference for the current smart tag type:
-        for ( USHORT i = 0; i < rActionComponents.getLength(); ++i )
+        for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
         {
             xAction = rActionComponents[i];
 
@@ -148,7 +148,7 @@ void SvxSmartTagsControl::FillMenu()
 
 //--------------------------------------------------------------------
 
-void SvxSmartTagsControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -195,7 +195,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
 
     // ohne dispatcher!!!
     // GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden items, 0L );*/
-    //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, TRUE);
+    //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
     //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
 
     return 0;
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 97ee979548..d3043e0727 100644..100755
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -37,8 +37,8 @@
 #include <sot/exchange.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/toolbox.hxx>
-#include <clipboardctl.hxx>
-#include <clipfmtitem.hxx>
+#include <svx/clipboardctl.hxx>
+#include <svx/clipfmtitem.hxx>
 
 #include <svtools/insdlg.hxx>
 #include <svx/svxids.hrc>
@@ -52,13 +52,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ );
 
 
 SvxClipBoardControl::SvxClipBoardControl(
-        USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+        sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     pClipboardFmtItem( 0 ),
      pPopup		(0),
     nItemId     (nId),
-    bDisabled( FALSE )
+    bDisabled( sal_False )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" )));
     ToolBox& rBox = GetToolBox();
@@ -84,25 +84,25 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow()
         else
             pPopup = new PopupMenu;
 
-        USHORT nCount = pFmtItem->Count();
-        for (USHORT i = 0;  i < nCount;  ++i)
+        sal_uInt16 nCount = pFmtItem->Count();
+        for (sal_uInt16 i = 0;  i < nCount;  ++i)
         {
-            ULONG nFmtID =  pFmtItem->GetClipbrdFormatId( i );
+            sal_uIntPtr nFmtID =  pFmtItem->GetClipbrdFormatId( i );
             String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) );
             if (!aFmtStr.Len())
               aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID );
-            pPopup->InsertItem( (USHORT)nFmtID, aFmtStr );
+            pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr );
         }
 
         ToolBox& rBox = GetToolBox();
-        USHORT nId = GetId();
-        rBox.SetItemDown( nId, TRUE );
+        sal_uInt16 nId = GetId();
+        rBox.SetItemDown( nId, sal_True );
 
         pPopup->Execute( &rBox, rBox.GetItemRect( nId ), 
             (rBox.GetAlign() == WINDOWALIGN_TOP || rBox.GetAlign() == WINDOWALIGN_BOTTOM) ? 
                 POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT );
 
-        rBox.SetItemDown( nId, FALSE );
+        rBox.SetItemDown( nId, sal_False );
 
         SfxUInt32Item aItem( SID_CLIPBOARD_FORMAT_ITEMS, pPopup->GetCurItemId() );
 
@@ -127,7 +127,7 @@ SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
 }
 
 
-void SvxClipBoardControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
     {
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index cbadeaa6e1..4f00a265dd 100644..100755
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -54,7 +54,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem);
 
 SvxFontMenuControl::SvxFontMenuControl
 (
-    USHORT 			_nId,
+    sal_uInt16 			_nId,
     Menu&			rMenu,
     SfxBindings&	rBindings
 ) :
@@ -103,7 +103,7 @@ void SvxFontMenuControl::FillMenu()
 
 void SvxFontMenuControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 53bebaa88d..be22e1f5ed 100644..100755
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -44,7 +44,7 @@
 #include "editeng/fontitem.hxx"
 #include "editeng/flstitem.hxx"
 
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 
 #define LOGIC 	OutputDevice::LogicToLogic
@@ -68,7 +68,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
         return 0;
 
     const SfxItemPool& rPool = pSh->GetPool();
-    USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+    sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
     const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
     long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
     SvxFontHeightItem aItem( nH, 100, GetId() );
@@ -88,7 +88,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
 
 void SvxFontSizeMenuControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -111,7 +111,7 @@ void SvxFontSizeMenuControl::StateChanged(
                     return;
 
                 const SfxItemPool& rPool = pSh->GetPool();
-                USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+                sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
                 const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
                 long nH = pItem->GetHeight() * 10;
                 nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT );
@@ -170,7 +170,7 @@ void SvxFontSizeMenuControl::StateChanged(
 
 SvxFontSizeMenuControl::SvxFontSizeMenuControl
 (
-    USHORT 			_nId,
+    sal_uInt16 			_nId,
     Menu&			rMenu,
     SfxBindings&	rBindings
 ) :
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
deleted file mode 100644
index 9c208d9a78..0000000000
--- a/svx/source/mnuctrls/makefile.mk
+++ /dev/null
@@ -1,71 +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=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-ENABLE_EXCEPTIONS=TRUE
-
-PRJNAME=svx
-TARGET=mnuctrls
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        mnuctrls.src
-
-SLOFILES=	\
-        $(SLO)$/clipboardctl.obj \
-        $(SLO)$/fntctl.obj \
-        $(SLO)$/fntszctl.obj \
-        $(SLO)$/SmartTagCtl.obj
-
-HXX1TARGET=mnuctrls
-HXX1EXT=   hxx
-HXX1EXCL=  -E:*include*
-HXX1DEPN=\
-        $(INC)$/clipboardctl.hxx \
-        $(INC)$/fntctl.hxx	\
-        $(INC)$/fntszctl.hxx \
-        $(INC)$/SmartTagCtl.hxx
-
-EXCEPTIONSFILES= \
-        $(SLO)$/SmartTagCtl.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/mnuctrls/mnuctrls.src b/svx/source/mnuctrls/mnuctrls.src
index 8b27fa22f7..8b27fa22f7 100644..100755
--- a/svx/source/mnuctrls/mnuctrls.src
+++ b/svx/source/mnuctrls/mnuctrls.src
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 343d8d895d..343d8d895d 100644..100755
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
diff --git a/svx/source/sdr/animation/makefile.mk b/svx/source/sdr/animation/makefile.mk
deleted file mode 100644
index a6750647f5..0000000000
--- a/svx/source/sdr/animation/makefile.mk
+++ /dev/null
@@ -1,46 +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=svx
-TARGET=animation
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/animationstate.obj			\
-        $(SLO)$/objectanimator.obj			\
-        $(SLO)$/scheduler.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx
index 2c66eb2a00..2c66eb2a00 100644..100755
--- a/svx/source/sdr/animation/objectanimator.cxx
+++ b/svx/source/sdr/animation/objectanimator.cxx
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 1b299a24be..1b299a24be 100644..100755
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk
deleted file mode 100644
index 177654ff1e..0000000000
--- a/svx/source/sdr/attribute/makefile.mk
+++ /dev/null
@@ -1,50 +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=svx
-TARGET=attribute
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/sdrfilltextattribute.obj			\
-        $(SLO)$/sdrlinefillshadowtextattribute.obj	\
-        $(SLO)$/sdrlineshadowtextattribute.obj		\
-        $(SLO)$/sdrshadowtextattribute.obj			\
-        $(SLO)$/sdrtextattribute.obj				\
-        $(SLO)$/sdrformtextattribute.obj			\
-        $(SLO)$/sdrformtextoutlineattribute.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
index 0cbcafb2ad..0cbcafb2ad 100644..100755
--- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 077455b8e8..077455b8e8 100644..100755
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index f0f79f28cd..f0f79f28cd 100644..100755
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
index d5f58123fc..d5f58123fc 100644..100755
--- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
index 76959f054c..76959f054c 100644..100755
--- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
index 81a7ecb9be..81a7ecb9be 100644..100755
--- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index e03fe04366..e03fe04366 100644..100755
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index 7853da15d9..7853da15d9 100644..100755
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk
deleted file mode 100644
index 9e4356c4aa..0000000000
--- a/svx/source/sdr/contact/makefile.mk
+++ /dev/null
@@ -1,92 +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=..$/..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=svx
-TARGET=contact
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-        $(SLO)$/viewobjectcontactofunocontrol.obj
-
-SLOFILES=\
-        $(EXCEPTIONSFILES)									\
-        $(SLO)$/displayinfo.obj								\
-        $(SLO)$/viewcontact.obj								\
-        $(SLO)$/viewcontactofe3d.obj						\
-        $(SLO)$/viewcontactofsdrobj.obj						\
-        $(SLO)$/viewcontactofvirtobj.obj					\
-        $(SLO)$/viewcontactoftextobj.obj					\
-        $(SLO)$/viewcontactofsdrrectobj.obj					\
-        $(SLO)$/viewcontactofsdrpathobj.obj					\
-        $(SLO)$/viewcontactofsdrole2obj.obj					\
-        $(SLO)$/viewcontactofsdrcircobj.obj					\
-        $(SLO)$/viewcontactofsdrcaptionobj.obj				\
-        $(SLO)$/viewcontactofsdrmeasureobj.obj				\
-        $(SLO)$/viewcontactofsdredgeobj.obj					\
-        $(SLO)$/viewcontactofsdrpage.obj					\
-        $(SLO)$/viewcontactofmasterpagedescriptor.obj		\
-        $(SLO)$/viewcontactofgroup.obj						\
-        $(SLO)$/viewcontactofe3dscene.obj					\
-        $(SLO)$/viewcontactofe3dcube.obj					\
-        $(SLO)$/viewcontactofe3dextrude.obj					\
-        $(SLO)$/viewcontactofe3dlathe.obj					\
-        $(SLO)$/viewcontactofe3dsphere.obj					\
-        $(SLO)$/viewcontactofe3dpolygon.obj					\
-        $(SLO)$/viewcontactofpageobj.obj					\
-        $(SLO)$/viewcontactofgraphic.obj					\
-        $(SLO)$/viewcontactofsdrobjcustomshape.obj			\
-        $(SLO)$/viewcontactofsdrmediaobj.obj				\
-        $(SLO)$/viewcontactofunocontrol.obj					\
-        $(SLO)$/objectcontact.obj							\
-        $(SLO)$/objectcontacttools.obj						\
-        $(SLO)$/objectcontactofobjlistpainter.obj			\
-        $(SLO)$/objectcontactofpageview.obj					\
-        $(SLO)$/viewobjectcontact.obj						\
-        $(SLO)$/viewobjectcontactofe3d.obj					\
-        $(SLO)$/viewobjectcontactredirector.obj				\
-        $(SLO)$/viewobjectcontactofsdrmediaobj.obj			\
-        $(SLO)$/viewobjectcontactofgroup.obj				\
-        $(SLO)$/viewobjectcontactofe3dscene.obj				\
-        $(SLO)$/viewobjectcontactofsdrpage.obj				\
-        $(SLO)$/viewobjectcontactofsdrobj.obj				\
-        $(SLO)$/viewobjectcontactofpageobj.obj				\
-        $(SLO)$/viewobjectcontactofsdrole2obj.obj			\
-        $(SLO)$/viewobjectcontactofgraphic.obj				\
-        $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj	\
-        $(SLO)$/sdrmediawindow.obj					
-        
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 3e30021c3b..3e30021c3b 100644..100755
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 283bbd4a10..0b331bf4ca 100644..100755
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -38,7 +38,7 @@
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -122,7 +122,7 @@ namespace sdr
                         aViewRange, 
                         GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)),
                         0.0, 
-                        0);
+                        com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>());
                     updateViewInformation2D(aNewViewInformation2D);
 
                     // collect primitive data in a sequence; this will already use the updated ViewInformation2D
@@ -152,6 +152,25 @@ namespace sdr
             }
         }
 
+        // VirtualDevice?
+        bool ObjectContactOfObjListPainter::isOutputToVirtualDevice() const
+        {
+            return (OUTDEV_VIRDEV == mrTargetOutputDevice.GetOutDevType());
+        }
+
+        // recording MetaFile?
+        bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const
+        {
+            GDIMetaFile* pMetaFile = mrTargetOutputDevice.GetConnectMetaFile();
+            return (pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause());
+        }
+
+        // pdf export?
+        bool ObjectContactOfObjListPainter::isOutputToPDFFile() const
+        {
+            return (0 != mrTargetOutputDevice.GetPDFWriter());
+        }
+
         OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const
         {
             return &mrTargetOutputDevice;
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 49052fbf74..94da0ae0d1 100644..100755
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -39,13 +39,13 @@
 #include <svx/sdr/animation/objectanimator.hxx>
 #include <svx/sdr/event/eventhandler.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <drawinglayer/processor2d/vclprocessor2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontacttools.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -242,7 +242,7 @@ namespace sdr
                 aViewRange, 
                 GetXDrawPageForSdrPage(GetSdrPage()),
                 fCurrentTime, 
-                0);
+                uno::Sequence<beans::PropertyValue>());
             updateViewInformation2D(aNewViewInformation2D);
             
             // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D
diff --git a/svx/source/sdr/contact/objectcontacttools.cxx b/svx/source/sdr/contact/objectcontacttools.cxx
index aa79df2dac..aa79df2dac 100644..100755
--- a/svx/source/sdr/contact/objectcontacttools.cxx
+++ b/svx/source/sdr/contact/objectcontacttools.cxx
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index ff969c5110..ff969c5110 100644..100755
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 35b12177a7..35b12177a7 100644..100755
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index c96994f0c9..c96994f0c9 100644..100755
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index 032e3cad76..032e3cad76 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index 22be314198..22be314198 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index 20906efa07..20906efa07 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index ca97545e50..ca97545e50 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index 33c6711c01..33c6711c01 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index 47999b4772..47999b4772 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index f08462bcd7..f08462bcd7 100644..100755
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 4397b7ec48..c6dd1d8fc7 100644..100755
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -45,8 +45,8 @@
 #include <svx/sdr/event/eventhandler.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svdstr.hrc"
-#include <svdglob.hxx>
+#include "svx/svdstr.hrc"
+#include <svx/svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
@@ -297,7 +297,7 @@ namespace sdr
 
                     // decompose immediately with neutral ViewInformation. This will
                     // layout the text to more simple TextPrimitives from drawinglayer
-                    const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+                    const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
                     drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(
                         xRetval, 
@@ -327,7 +327,7 @@ namespace sdr
             aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue());
             aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue());
             aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01);
-            aLocalGrafInfo.SetTransparency((BYTE)::basegfx::fround(Min(nTrans, (USHORT)100) * 2.55));
+            aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55));
             aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue());
             aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
             aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index b6a2cb846c..b6a2cb846c 100644..100755
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index f26393811a..f26393811a 100644..100755
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 21d4d2a76a..21d4d2a76a 100644..100755
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index fb1676c083..fb1676c083 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 78151a98a3..78151a98a3 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
index 059a5d94ef..059a5d94ef 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index 61d6f1354a..61d6f1354a 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 20f7d410d4..20f7d410d4 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 05b0f1a3d8..cba1eac035 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -41,7 +41,7 @@
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 8d0a1d5504..d0532060d4 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdoashp.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 1ad45c22c3..1ad45c22c3 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index c9971f7ee6..902bfe48a1 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -45,6 +45,10 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
+#include <vcl/lazydelete.hxx>
+#include <svx/svdstr.hrc>
+#include <svx/svdglob.hxx>
+#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -132,31 +136,54 @@ namespace sdr
 
         drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence() const
         {
+            static bool bUseOldPageShadow(false);
             const SdrPage& rPage = getPage();
             basegfx::B2DHomMatrix aPageMatrix;
             aPageMatrix.set(0, 0, (double)rPage.GetWdt());
             aPageMatrix.set(1, 1, (double)rPage.GetHgt());
 
-            // create page shadow polygon
-            const double fPageBorderFactor(1.0 / 256.0);
-            basegfx::B2DPolygon aPageShadowPolygon;
-            aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor));
-            aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor));
-            aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor));
-            aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor));
-            aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0));
-            aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0));
-            aPageShadowPolygon.setClosed(true);
-            aPageShadowPolygon.transform(aPageMatrix);
-
-            // We have only the page information, not the view information. Use the
-            // svtools::FONTCOLOR color for initialisation
-            const svtools::ColorConfig aColorConfig;
-            const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor);
-            const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor());
-            const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageShadowPolygon), aRGBShadowColor));
-
-            return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            if(bUseOldPageShadow)
+            {
+                // create page shadow polygon
+                const double fPageBorderFactor(1.0 / 256.0);
+                basegfx::B2DPolygon aPageShadowPolygon;
+                aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor));
+                aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor));
+                aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor));
+                aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor));
+                aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0));
+                aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0));
+                aPageShadowPolygon.setClosed(true);
+                aPageShadowPolygon.transform(aPageMatrix);
+
+                // We have only the page information, not the view information. Use the
+                // svtools::FONTCOLOR color for initialisation
+                const svtools::ColorConfig aColorConfig;
+                const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor);
+                const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor());
+                const drawinglayer::primitive2d::Primitive2DReference xReference(
+                    new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
+                        basegfx::B2DPolyPolygon(aPageShadowPolygon), 
+                        aRGBShadowColor));
+
+                return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            }
+            else
+            {
+                static vcl::DeleteOnDeinit<drawinglayer::primitive2d::DiscreteShadow>
+                    aDiscreteShadow(new drawinglayer::primitive2d::DiscreteShadow(
+                        BitmapEx(ResId(SIP_SA_PAGESHADOW35X35, *ImpGetResMgr()))));
+                if (aDiscreteShadow.get() != NULL)
+                {
+                    const drawinglayer::primitive2d::Primitive2DReference xReference(
+                        new drawinglayer::primitive2d::DiscreteShadowPrimitive2D(
+                            aPageMatrix, 
+                                *aDiscreteShadow.get()));
+                    
+                    return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                }
+                return drawinglayer::primitive2d::Primitive2DSequence();
+            }
         }
 
         ViewContactOfPageShadow::ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
@@ -314,11 +341,17 @@ namespace sdr
             const SdrPage& rPage = getPage();
             const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
             
-            // We have only the page information, not the view information. Use the
-            // svtools::FONTCOLOR color for initialisation
-            const svtools::ColorConfig aColorConfig;
-            const Color aBorderColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor);
-            const basegfx::BColor aRGBBorderColor(aBorderColor.getBColor());
+            // Changed to 0x949599 for renaissance, before svtools::FONTCOLOR was used.
+            // Added old case as fallback for HighContrast.
+            basegfx::BColor aRGBBorderColor(0x94 / (double)0xff, 0x95 / (double)0xff, 0x99 / (double)0xff);
+
+            if(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
+            {
+                const svtools::ColorConfig aColorConfig;
+                const Color aBorderColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor);
+   
+                aRGBBorderColor = aBorderColor.getBColor();
+            }
 
             if(rPage.getPageBorderOnlyLeftRight())
             {
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 7e70f0b46a..7e70f0b46a 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index ea5448a51a..ea5448a51a 100644..100755
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx
index b36f7e2cd9..b36f7e2cd9 100644..100755
--- a/svx/source/sdr/contact/viewcontactoftextobj.cxx
+++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index ac3d10c271..6404472290 100644..100755
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/awt/XWindow2.hpp>
 /** === end UNO includes === **/
 
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <tools/diagnose_ex.h>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
index 31d1a2d9a9..31d1a2d9a9 100644..100755
--- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index dc562ba2b4..dc562ba2b4 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
index 40c16bea60..40c16bea60 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
index 40868bc979..40868bc979 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index cb746f5318..f686333174 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -178,7 +178,7 @@ namespace sdr
                 if(rGrafObj.IsLinkedGraphic())
                 {
                     // update graphic link
-                    rGrafObj.ImpUpdateGraphicLink();
+                    rGrafObj.ImpUpdateGraphicLink( sal_False );
                 }
                 else
                 {
@@ -197,7 +197,7 @@ namespace sdr
                         rGrafObj.mbInsidePaint = sal_True;
                         rGrafObj.ForceSwapIn();
                         rGrafObj.mbInsidePaint = sal_False;
-                    }
+                        }
 
                     bRetval = true;
                 }
@@ -253,19 +253,27 @@ namespace sdr
             // prepare primitive generation with evtl. loading the graphic when it's swapped out
             SdrGrafObj& rGrafObj = const_cast< ViewObjectContactOfGraphic* >(this)->getSdrGrafObj();
             bool bDoAsynchronGraphicLoading(rGrafObj.GetModel() && rGrafObj.GetModel()->IsSwapGraphics());
-            static bool bSuppressAsynchLoading(false);
             bool bSwapInDone(false);
+            bool bSwapInExclusive(false);
 
-            if(bDoAsynchronGraphicLoading 
-                && rGrafObj.IsSwappedOut() 
-                && rGrafObj.GetPage() 
-                && rGrafObj.GetPage()->IsMasterPage())
+            if( bDoAsynchronGraphicLoading && rGrafObj.IsSwappedOut() )
             {
-                // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation
-                bDoAsynchronGraphicLoading = false;
+                // sometimes it is needed that each graphic is completely available and swapped in
+                // for these cases a ForceSwapIn is called later at the graphic object
+                if ( rGrafObj.GetPage() && rGrafObj.GetPage()->IsMasterPage() )
+                {
+                    // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation
+                    bDoAsynchronGraphicLoading = false;
+                }
+                else if ( GetObjectContact().isOutputToPrinter()
+                    || GetObjectContact().isOutputToRecordingMetaFile()
+                    || GetObjectContact().isOutputToPDFFile() )
+                {
+                    bDoAsynchronGraphicLoading = false;
+                    bSwapInExclusive = true;
+                }
             }
-
-            if(bDoAsynchronGraphicLoading && !bSuppressAsynchLoading)
+            if( bDoAsynchronGraphicLoading )
             {
                 bSwapInDone = const_cast< ViewObjectContactOfGraphic* >(this)->impPrepareGraphicWithAsynchroniousLoading();
             }
@@ -294,10 +302,8 @@ namespace sdr
                 }
             }
 
-            // if swap in was forced only for printing, swap out again
-            const bool bSwapInExclusiveForPrinting(bSwapInDone && GetObjectContact().isOutputToPrinter());
-
-            if(bSwapInExclusiveForPrinting)
+            // if swap in was forced only for printing metafile and pdf, swap out again
+            if( bSwapInDone && bSwapInExclusive )
             {
                 rGrafObj.ForceSwapOut();
             }
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 6df1f2db07..6df1f2db07 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index 16e58f80dd..16e58f80dd 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index d4622546d3..f92863ceca 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -39,7 +39,7 @@
 #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index af7eeeb220..e92136f987 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -40,7 +40,7 @@
 #include <avmedia/mediaitem.hxx>
 #include "sdrmediawindow.hxx"
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index b469841f9a..b469841f9a 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index ac297d8822..ac297d8822 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 84ad73d2df..aae0fa90e9 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -321,6 +321,12 @@ namespace sdr
                 return false;
             }
 
+            // no page shadow for high contrast mode
+            if(GetObjectContact().isDrawModeHighContrast())
+            {
+                return false;
+            }
+
             return true;
         }
     } // end of namespace contact
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index bb6719aad9..9aae22f426 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -39,7 +39,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -368,6 +368,10 @@ namespace sdr { namespace contact {
         ::basegfx::B2DTuple aViewScale, aViewTranslate;
         double nViewRotate(0), nViewShearX(0);
         _rViewTransformation.decompose( aViewScale, aViewTranslate, nViewRotate, nViewShearX );
+
+        ::basegfx::B2DTuple aZoomScale, aZoomTranslate;
+        double nZoomRotate(0), nZoomShearX(0);
+        _rZoomLevelNormalization.decompose( aZoomScale, aZoomTranslate, nZoomRotate, nZoomShearX );
     #endif
 
         // transform the logic bound rect, using the view transformation, to pixel coordinates
@@ -980,6 +984,10 @@ namespace sdr { namespace contact {
         aScaleNormalization.set( 0, 0, (double)aCurrentDeviceMapMode.GetScaleX() );
         aScaleNormalization.set( 1, 1, (double)aCurrentDeviceMapMode.GetScaleY() );
         m_aZoomLevelNormalization *= aScaleNormalization;
+
+    #if OSL_DEBUG_LEVEL > 1
+        m_aZoomLevelNormalization.decompose( aScale, aTranslate, fRotate, fShearX );
+    #endif
    }
 
     //--------------------------------------------------------------------
@@ -1817,6 +1825,10 @@ namespace sdr { namespace contact {
             // disposed the control though it doesn't own it. So, /me thinks we should not bother here.
             return drawinglayer::primitive2d::Primitive2DSequence();
 
+        if ( GetObjectContact().getViewInformation2D().getViewTransformation().isIdentity() )
+            // remove this when #i115754# is fixed
+            return drawinglayer::primitive2d::Primitive2DSequence();
+
         // ignore existing controls which are in alive mode and manually switched to "invisible"
         // #102090# / 2009-06-05 / frank.schoenheit@sun.com
         const ControlHolder& rControl( m_pImpl->getExistentControl() );
diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
index 1c26d9e2e0..1c26d9e2e0 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 6edef73bcb..6edef73bcb 100644..100755
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
diff --git a/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk
deleted file mode 100644
index ff379af6be..0000000000
--- a/svx/source/sdr/event/makefile.mk
+++ /dev/null
@@ -1,44 +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=svx
-TARGET=event
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/eventhandler.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk
deleted file mode 100644
index 155053826f..0000000000
--- a/svx/source/sdr/overlay/makefile.mk
+++ /dev/null
@@ -1,59 +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=svx
-TARGET=overlay
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/overlayanimatedbitmapex.obj				\
-        $(SLO)$/overlaybitmapex.obj						\
-        $(SLO)$/overlaycrosshair.obj					\
-        $(SLO)$/overlayhatchrect.obj					\
-        $(SLO)$/overlayhelpline.obj						\
-        $(SLO)$/overlayline.obj							\
-        $(SLO)$/overlaymanager.obj						\
-        $(SLO)$/overlaymanagerbuffered.obj				\
-        $(SLO)$/overlayobject.obj						\
-        $(SLO)$/overlayobjectcell.obj					\
-        $(SLO)$/overlayobjectlist.obj					\
-        $(SLO)$/overlaypolypolygon.obj					\
-        $(SLO)$/overlayprimitive2dsequenceobject.obj	\
-        $(SLO)$/overlayrollingrectangle.obj				\
-        $(SLO)$/overlayselection.obj					\
-        $(SLO)$/overlaytools.obj						\
-        $(SLO)$/overlaytriangle.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 4d6c3fe09d..4d6c3fe09d 100644..100755
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 813d778d37..813d778d37 100644..100755
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index a903996c9a..a903996c9a 100644..100755
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
diff --git a/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx
index b459004e92..b459004e92 100644..100755
--- a/svx/source/sdr/overlay/overlayhatchrect.cxx
+++ b/svx/source/sdr/overlay/overlayhatchrect.cxx
diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index 9517438405..9517438405 100644..100755
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index 19dbdd0846..19dbdd0846 100644..100755
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index b71c55934e..00c7b20308 100644..100755
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -139,7 +139,7 @@ namespace sdr
             mnStripeLengthPixel(5),
             maDrawinglayerOpt(),
             maViewTransformation(),
-            maViewInformation2D(0),
+            maViewInformation2D(),
             mfDiscreteOne(0.0)
         {
             // set Property 'ReducedDisplayQuality' to true to allow simpler interaction
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index cec3908406..cec3908406 100644..100755
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 32584c2648..32584c2648 100644..100755
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx
index 79eabbcf0a..79eabbcf0a 100644..100755
--- a/svx/source/sdr/overlay/overlayobjectcell.cxx
+++ b/svx/source/sdr/overlay/overlayobjectcell.cxx
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index f683472655..f683472655 100644..100755
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index 8de6b9f1c6..8de6b9f1c6 100644..100755
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index b81e46a0a6..b81e46a0a6 100644..100755
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index d13171d5d8..d13171d5d8 100644..100755
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 45ff1d0960..45ff1d0960 100644..100755
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index fdd28cd173..fdd28cd173 100644..100755
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index d4b1e4d1a7..d4b1e4d1a7 100644..100755
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk
deleted file mode 100644
index 078bc4bc97..0000000000
--- a/svx/source/sdr/primitive2d/makefile.mk
+++ /dev/null
@@ -1,57 +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=svx
-TARGET=primitive2d
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/primitivefactory2d.obj				\
-        $(SLO)$/sdrdecompositiontools.obj			\
-        $(SLO)$/sdrattributecreator.obj				\
-        $(SLO)$/sdrellipseprimitive2d.obj			\
-        $(SLO)$/sdrrectangleprimitive2d.obj			\
-        $(SLO)$/sdrcustomshapeprimitive2d.obj		\
-        $(SLO)$/sdrcaptionprimitive2d.obj			\
-        $(SLO)$/sdrgrafprimitive2d.obj				\
-        $(SLO)$/sdrole2primitive2d.obj				\
-        $(SLO)$/sdrolecontentprimitive2d.obj		\
-        $(SLO)$/sdrpathprimitive2d.obj				\
-        $(SLO)$/sdrprimitivetools.obj				\
-        $(SLO)$/sdrmeasureprimitive2d.obj			\
-        $(SLO)$/sdrconnectorprimitive2d.obj			\
-        $(SLO)$/sdrtextprimitive2d.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 8ef1f85dd9..d1eed0201e 100644..100755
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -31,7 +31,7 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 1c788312b4..37d99089ee 100644..100755
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -561,7 +561,7 @@ namespace drawinglayer
         {
             const SfxPoolItem* pGradientItem;
 
-            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, TRUE, &pGradientItem) 
+            if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem) 
                 && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
             {
                 // test if float transparence is completely transparent
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 10a78cda73..10a78cda73 100644..100755
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index a87473f7ce..a87473f7ce 100644..100755
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 25e48eb361..25e48eb361 100644..100755
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 4825422655..4825422655 100644..100755
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index cce345bc31..cce345bc31 100644..100755
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index c611b4c7c9..c611b4c7c9 100644..100755
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 0ba9a65cb3..0ba9a65cb3 100644..100755
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 14c23fdcdb..14c23fdcdb 100644..100755
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index a82fbc341f..a82fbc341f 100644..100755
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index a839d978ed..a839d978ed 100644..100755
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 5cc4a4a278..5cc4a4a278 100644..100755
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index c6af6de417..c6af6de417 100644..100755
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 5cd9529c1b..d493c1969c 100644..100755
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -36,7 +36,7 @@
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdoutl.hxx>
diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index f8f28dc936..f8f28dc936 100644..100755
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 81ef0063a1..6ea4fe9480 100644..100755
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -278,7 +278,7 @@ namespace sdr
                         ImpRemoveStyleSheet();
                     }
 
-                    mpItemSet = mpItemSet->Clone(FALSE, pDestPool);
+                    mpItemSet = mpItemSet->Clone(sal_False, pDestPool);
                     GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel);
 
                     // set stylesheet (if used)
@@ -381,7 +381,7 @@ namespace sdr
                             while(pSheet)
                             {
                                 pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask());
-                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), FALSE);
+                                pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False);
 
                                 if(bScaleUnitChanged)
                                 {
@@ -452,7 +452,7 @@ namespace sdr
 
                                 while(nWhich)
                                 {
-                                    if(mpItemSet->GetItemState(nWhich, FALSE) == SFX_ITEM_SET)
+                                    if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET)
                                     {
                                         pNewSet->Put(mpItemSet->Get(nWhich));
                                     }
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 15c480d536..15c480d536 100644..100755
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 4cc3e7fcf2..4cc3e7fcf2 100644..100755
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index f0a9f83e29..f0a9f83e29 100644..100755
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 3abce475f1..3abce475f1 100644..100755
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 2d1e99f14b..878623417a 100644..100755
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -63,7 +63,7 @@ namespace sdr
         {
             if(rProps.mpItemSet)
             {
-                mpItemSet = rProps.mpItemSet->Clone(TRUE);
+                mpItemSet = rProps.mpItemSet->Clone(sal_True);
 
                 // do not keep parent info, this may be changed by later construrtors.
                 // This class just copies the ItemSet, ignore parent.
@@ -163,7 +163,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem))
                 {
                     if(AllowItemChange(nWhich, pPoolItem))
                     {
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 39a6fe42c6..39a6fe42c6 100644..100755
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index a86addb11e..a86addb11e 100644..100755
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index 662070fad5..662070fad5 100644..100755
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index 85fe364ca3..85fe364ca3 100644..100755
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 2c981128cb..fceabea58f 100644..100755
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -33,7 +33,7 @@
 #include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
 #include <svx/scene3d.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -103,13 +103,13 @@ namespace sdr
                         // and always equal.
                         if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
                         {
-                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                             {
                                 mpItemSet->InvalidateItem(nWhich);
                             }
                             else
                             {
-                                mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                                mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                             }
                         }
 
@@ -132,7 +132,7 @@ namespace sdr
             {
                 // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
                 // #i50808# Leak fix, Clone produces a new instance and we get ownership here
-                SfxItemSet* pNewSet = rSet.Clone(TRUE);
+                SfxItemSet* pNewSet = rSet.Clone(sal_True);
                 DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
                 
                 for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
@@ -320,13 +320,13 @@ namespace sdr
             Camera3D aSceneCam(rObj.GetCamera());
 
             // ProjectionType
-            mpItemSet->Put(Svx3DPerspectiveItem((UINT16)aSceneCam.GetProjection()));
+            mpItemSet->Put(Svx3DPerspectiveItem((sal_uInt16)aSceneCam.GetProjection()));
 
             // CamPos
-            mpItemSet->Put(Svx3DDistanceItem((UINT32)(aSceneCam.GetPosition().getZ() + 0.5)));
+            mpItemSet->Put(Svx3DDistanceItem((sal_uInt32)(aSceneCam.GetPosition().getZ() + 0.5)));
 
             // FocalLength
-            mpItemSet->Put(Svx3DFocalLengthItem((UINT32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
+            mpItemSet->Put(Svx3DFocalLengthItem((sal_uInt32)((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
         }
     } // end of namespace properties
 } // end of namespace sdr
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index de636eac0b..de636eac0b 100644..100755
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index cd247b5b1c..cd247b5b1c 100644..100755
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index e2c478831a..a74099656d 100644..100755
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -129,7 +129,7 @@ namespace sdr
             mpItemSet->Put( SdrGrafBlueItem( 0 ) );
             mpItemSet->Put( SdrGrafGamma100Item( 100 ) );
             mpItemSet->Put( SdrGrafTransparenceItem( 0 ) );
-            mpItemSet->Put( SdrGrafInvertItem( FALSE ) );
+            mpItemSet->Put( SdrGrafInvertItem( sal_False ) );
             mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) );
             mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
 
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 3bffbff838..3992cb9897 100644..100755
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -103,13 +103,13 @@ namespace sdr
 
                 while(nWhich)
                 {
-                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                    if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                     {
                         mpItemSet->InvalidateItem(nWhich);
                     }
                     else
                     {
-                        mpItemSet->MergeValue(rSet.Get(nWhich), TRUE);
+                        mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
                     }
 
                     nWhich = aIter.NextWhich();
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index a60661a8aa..db3ecd9619 100644..100755
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -35,7 +35,7 @@
 
 #include <vector>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // class to remember broadcast start positions
@@ -128,7 +128,7 @@ namespace sdr
 
             while(nWhich)
             {
-                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pItem))
+                if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem))
                 {
                     if(pItem->HasMetrics())
                     {
diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk
deleted file mode 100644
index 5296765769..0000000000
--- a/svx/source/sdr/properties/makefile.mk
+++ /dev/null
@@ -1,65 +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=svx
-TARGET=properties
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/properties.obj				\
-        $(SLO)$/emptyproperties.obj			\
-        $(SLO)$/pageproperties.obj			\
-        $(SLO)$/defaultproperties.obj		\
-        $(SLO)$/attributeproperties.obj		\
-        $(SLO)$/textproperties.obj			\
-        $(SLO)$/customshapeproperties.obj	\
-        $(SLO)$/rectangleproperties.obj		\
-        $(SLO)$/oleproperties.obj			\
-        $(SLO)$/captionproperties.obj		\
-        $(SLO)$/circleproperties.obj		\
-        $(SLO)$/connectorproperties.obj		\
-        $(SLO)$/e3dproperties.obj			\
-        $(SLO)$/e3dcompoundproperties.obj	\
-        $(SLO)$/e3dextrudeproperties.obj	\
-        $(SLO)$/e3dlatheproperties.obj		\
-        $(SLO)$/e3dsceneproperties.obj		\
-        $(SLO)$/e3dsphereproperties.obj		\
-        $(SLO)$/graphicproperties.obj		\
-        $(SLO)$/groupproperties.obj			\
-        $(SLO)$/measureproperties.obj		\
-        $(SLO)$/itemsettools.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 971b4de127..0a4465dcac 100644..100755
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -118,9 +118,9 @@ namespace sdr
             GetObjectItemSet();
 
             //#71958# by default, the show units Bool-Item is set as hard
-            // attribute to TRUE to aviod confusion when copying SdrMeasureObj's
+            // attribute to sal_True to aviod confusion when copying SdrMeasureObj's
             // from one application to another
-            mpItemSet->Put(SdrMeasureShowUnitItem(TRUE));
+            mpItemSet->Put(SdrMeasureShowUnitItem(sal_True));
 
             basegfx::B2DPolygon aNewPolygon;
             aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx
index ce51dc1a51..ce51dc1a51 100644..100755
--- a/svx/source/sdr/properties/oleproperties.cxx
+++ b/svx/source/sdr/properties/oleproperties.cxx
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 75b66a8072..75b66a8072 100644..100755
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 80c5035e0e..0046765553 100644..100755
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -32,7 +32,7 @@
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdogrp.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index e686601466..e686601466 100644..100755
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 99eca41001..574279868e 100644..100755
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -489,7 +489,7 @@ namespace sdr
                                     if(bHasURL)
                                     {
                                         SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR );
-                                        aColorSet.Put(aSet, FALSE);
+                                        aColorSet.Put(aSet, sal_False);
 
                                         ESelection aSel((sal_uInt16)nPara, 0);
 
@@ -520,7 +520,7 @@ namespace sdr
 
                                 }
 
-                                aSet.Put(aParaSet, FALSE);
+                                aSet.Put(aParaSet, sal_False);
 
                                 if(bHasURL)
                                 {
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 8b309a0d39..e1e27ba5ef 100644..100755
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -146,7 +146,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
     rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
     rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
 
-    for ( USHORT j = 0; j < rSmartTagTypes.getLength(); ++j )
+    for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
     {
         const rtl::OUString& rSmartTagType = rSmartTagTypes[j];
 
@@ -155,7 +155,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
         Sequence< Reference< smarttags::XSmartTagAction > > aActions( nNumberOfActionRefs );
         Sequence< sal_Int32 > aIndices( nNumberOfActionRefs );
 
-        USHORT i = 0;
+        sal_uInt16 i = 0;
         SmartTagMapIter aActionsIter;
         SmartTagMapIter aEnd = maSmartTagMap.upper_bound( rSmartTagType );
 
diff --git a/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk
deleted file mode 100644
index e92a4c0a6b..0000000000
--- a/svx/source/smarttags/makefile.mk
+++ /dev/null
@@ -1,48 +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=svx
-TARGET=smarttags
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-       $(SLO)$/SmartTagMgr.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 19efa7a88d..69f5766f97 100644..100755
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -24,11 +24,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//========================================================================
-// Resource-Id's f"ur die OFA
-//
-// (C) 1998 - 2000 StarOffice Software Entw. GmbH, Hamburg, Germany
-//------------------------------------------------------------------------
+
+// Resource-Id's for OFA
+
 #ifndef _OFF_APP_HRC
 #define _OFF_APP_HRC
 
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index a5ffd7ecfb..546e393f1e 100644..100755
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -29,6 +29,10 @@
 #include "app.hrc"
 
  //----------------------------------------------------------------------------
+String RID_APPTITLE
+{
+    Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
+};
 
 #define MASKCOLOR		MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
 
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
new file mode 100755
index 0000000000..a8089830df
--- /dev/null
+++ b/svx/source/src/errtxt.src
@@ -0,0 +1,515 @@
+/*************************************************************************
+ *
+ * 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 <svtools/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 Internet connection to $(ARG1)." ;
+    };
+    String ERRCODE_INET_READ
+    {
+        Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
+    };
+    String ERRCODE_INET_WRITE
+    {
+        Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ;
+    };
+    String ERRCODE_INET_GENERAL
+    {
+        Text [ en-US ] = "General Internet error has occurred." ;
+    };
+    String ERRCODE_INET_OFFLINE
+    {
+        Text [ en-US ] = "The requested Internet 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/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc
index afed9a7878..afed9a7878 100644..100755
--- a/svx/source/src/hidgen.hrc
+++ b/svx/source/src/hidgen.hrc
diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
deleted file mode 100644
index fb96866ca0..0000000000
--- a/svx/source/src/makefile.mk
+++ /dev/null
@@ -1,57 +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=svx
-TARGET=ofa
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-RES1FILELIST=\
-    $(SRS)$/app.srs \
-    $(SOLARCOMMONRESDIR)$/svtools.srs \
-    $(SOLARCOMMONRESDIR)$/sfx.srs 	\
-    $(SOLARCOMMONRESDIR)$/basic.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Allgemein -----------------------------------------------------------
-
-SRS1NAME= app
-SRC1FILES=	\
-    app.src
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 95175b8163..dc3a8af972 100644..100755
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -40,7 +40,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "insctrl.hxx"
+#include "svx/insctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #define PAINT_OFFSET	5
@@ -49,14 +49,13 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem);
 
 // class SvxInsertStatusBarControl ---------------------------------------
 
-SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId,
-                                                      USHORT _nId,
+SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
+                                                      sal_uInt16 _nId,
                                                       StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
-    bInsert( TRUE )
+    bInsert( sal_True )
 {
-    rStb.SetHelpId( _nId, _nSlotId );
 }
 
 // -----------------------------------------------------------------------
@@ -67,7 +66,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
 
 // -----------------------------------------------------------------------
 
-void SvxInsertStatusBarControl::StateChanged( USHORT , SfxItemState eState,
+void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -110,14 +109,14 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
 {
-    USHORT _nId = RID_SVXSTR_OVERWRITE_TEXT;
+    sal_uInt16 _nId = RID_SVXSTR_OVERWRITE_TEXT;
 
     if ( bInsert )
         _nId = RID_SVXSTR_INSERT_TEXT;
     GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
 }
 
-ULONG SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
     long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
index ac9445d982..ac9445d982 100644..100755
--- a/svx/source/stbctrls/makefile.mk
+++ b/svx/source/stbctrls/makefile.mk
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 265804c29b..1e6c1c20f6 100644..100755
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -39,6 +39,7 @@
 #include <sfx2/app.hxx>
 
 #include <svx/dialogs.hrc>
+#include "svx/modctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -66,8 +67,8 @@ struct SvxModifyControl::ImplData
     }
 };
 
-SvxModifyControl::SvxModifyControl( USHORT _nSlotId,
-                                    USHORT _nId,
+SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId,
+                                    sal_uInt16 _nId,
                                     StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -77,7 +78,7 @@ SvxModifyControl::SvxModifyControl( USHORT _nSlotId,
 
 // -----------------------------------------------------------------------
 
-void SvxModifyControl::StateChanged( USHORT, SfxItemState eState,
+void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
                                      const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -147,7 +148,7 @@ void SvxModifyControl::DoubleClick()
     execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs);
 }
 
-ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
 {
     return rStb.GetTextWidth(String::CreateFromAscii("XX"));
 }
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 6c6171534a..54d0220b34 100644..100755
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -46,13 +46,13 @@
 #include <svl/intitem.hxx>
 #define _SVX_PSZCTRL_CXX
 
-#include "pszctrl.hxx"
+#include "svx/pszctrl.hxx"
 
 #define PAINT_OFFSET	5
 
 #include <editeng/sizeitem.hxx>
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include "stbctrls.h"
 #include "sfx2/module.hxx"
 
@@ -112,19 +112,19 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem);
 class FunctionPopup_Impl : public PopupMenu
 {
 public:
-    FunctionPopup_Impl( USHORT nCheck );
+    FunctionPopup_Impl( sal_uInt16 nCheck );
 
-    USHORT			GetSelected() const { return nSelected; }
+    sal_uInt16			GetSelected() const { return nSelected; }
 
 private:
-    USHORT			nSelected;
+    sal_uInt16			nSelected;
 
     virtual void    Select();
 };
 
 // -----------------------------------------------------------------------
 
-FunctionPopup_Impl::FunctionPopup_Impl( USHORT nCheck ) :
+FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
     PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ),
     nSelected( 0 )
 {
@@ -157,11 +157,11 @@ struct SvxPosSizeStatusBarControl_Impl
     Point   aPos;		// g"ultig, wenn eine Position angezeigt wird
     Size    aSize;		// g"ultig, wenn eine Gr"o/se angezeigt wird
     String	aStr;		// g"ultig, wenn ein Text angezeigt wird
-    BOOL    bPos;       // show position
-    BOOL	bSize;		// Gr"o/se anzeigen?
-    BOOL	bTable;		// Tabellenindex anzeigen?
-    BOOL	bHasMenu;	// StarCalc Popup-Menue anzeigen?
-    USHORT	nFunction;	// selektierte StarCalc Funktion
+    sal_Bool    bPos;       // show position
+    sal_Bool	bSize;		// Gr"o/se anzeigen?
+    sal_Bool	bTable;		// Tabellenindex anzeigen?
+    sal_Bool	bHasMenu;	// StarCalc Popup-Menue anzeigen?
+    sal_uInt16	nFunction;	// selektierte StarCalc Funktion
     Image	aPosImage; 	// Image f"ur die Positionsanzeige
     Image	aSizeImage;	// Image f"ur die Gr"o/senanzeige
 };
@@ -175,23 +175,27 @@ struct SvxPosSizeStatusBarControl_Impl
     Images fu"r die Position und Gro"sse laden.
 */
 
-SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId,
-                                                        USHORT _nId,
+#define STR_POSITION ".uno:Position"
+#define STR_TABLECELL ".uno:StateTableCell"
+#define STR_FUNC ".uno:StatusBarFunc"
+
+SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
+                                                        sal_uInt16 _nId,
                                                         StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     pImp( new SvxPosSizeStatusBarControl_Impl )
 {
-    pImp->bPos = FALSE;
-    pImp->bSize = FALSE;
-    pImp->bTable = FALSE;
-    pImp->bHasMenu = FALSE;
+    pImp->bPos = sal_False;
+    pImp->bSize = sal_False;
+    pImp->bTable = sal_False;
+    pImp->bHasMenu = sal_False;
     pImp->nFunction = 0;
     pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
     pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
 
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" )));
+    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION )));         // SID_ATTR_POSITION
+    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL )));   // SID_TABLE_CELL
+    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC )));    // SID_PSZ_FUNCTION
 }
 
 // -----------------------------------------------------------------------
@@ -218,32 +222,39 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
 
                 NULL/Void	SfxPointItem	SvxSizeItem		SfxStringItem
     ------------------------------------------------------------------------
-    Zeit		TRUE		FALSE			FALSE			FALSE
-    Position	FALSE										FALSE
+    Zeit		sal_True		sal_False			sal_False			FALSE
+    Position	sal_False										FALSE
     Gro"sse		FALSE						TRUE			FALSE
-    Text		FALSE						FALSE			TRUE
+    Text		sal_False						sal_False			TRUE
 
     Ein anderes Item bewirkt einen Assert, die Zeitanzeige wird enabled.
 */
 
-void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                                const SfxPoolItem* pState )
 {
     // da Kombi-Controller, immer die aktuelle Id als HelpId setzen
     // gecachten HelpText vorher l"oschen
     GetStatusBar().SetHelpText( GetId(), String() );
-    GetStatusBar().SetHelpId( GetId(), nSID );
+
+    switch ( nSID )
+    {
+        case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break;
+        case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break;
+        case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break;
+        default: break;
+    }
 
     if ( nSID == SID_PSZ_FUNCTION )
     {
         if ( eState == SFX_ITEM_AVAILABLE )
         {
-            pImp->bHasMenu = TRUE;
+            pImp->bHasMenu = sal_True;
             if ( pState && pState->ISA(SfxUInt16Item) )
                 pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue();
         }
         else
-            pImp->bHasMenu = FALSE;
+            pImp->bHasMenu = sal_False;
     }
     else if ( SFX_ITEM_AVAILABLE != eState )
     {
@@ -251,11 +262,11 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
         // notified for all display types
 
         if ( nSID == SID_TABLE_CELL )
-            pImp->bTable = FALSE;
+            pImp->bTable = sal_False;
         else if ( nSID == SID_ATTR_POSITION )
-            pImp->bPos = FALSE;
+            pImp->bPos = sal_False;
         else if ( nSID == GetSlotId() )     // controller is registered for SID_ATTR_SIZE
-            pImp->bSize = FALSE;
+            pImp->bSize = sal_False;
         else
         {
             DBG_ERRORFILE("unknown slot id");
@@ -265,31 +276,31 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
     {
         // Position anzeigen
         pImp->aPos = ( (SfxPointItem*)pState )->GetValue();
-        pImp->bPos = TRUE;
-        pImp->bTable = FALSE;
+        pImp->bPos = sal_True;
+        pImp->bTable = sal_False;
     }
     else if ( pState->ISA( SvxSizeItem ) )
     {
         // Groesse anzeigen
         pImp->aSize = ( (SvxSizeItem*)pState )->GetSize();
-        pImp->bSize = TRUE;
-        pImp->bTable = FALSE;
+        pImp->bSize = sal_True;
+        pImp->bTable = sal_False;
     }
     else if ( pState->ISA( SfxStringItem ) )
     {
         // String anzeigen (Tabellen-Zelle oder anderes)
         pImp->aStr = ( (SfxStringItem*)pState )->GetValue();
-        pImp->bTable = TRUE;
-        pImp->bPos = FALSE;
-        pImp->bSize = FALSE;
+        pImp->bTable = sal_True;
+        pImp->bPos = sal_False;
+        pImp->bSize = sal_False;
     }
     else
     {
         DBG_ERRORFILE( "invalid item type" );
         // trotzdem Datum und Zeit anzeigen
-        pImp->bPos = FALSE;
-        pImp->bSize = FALSE;
-        pImp->bTable = FALSE;
+        pImp->bPos = sal_False;
+        pImp->bSize = sal_False;
+        pImp->bTable = sal_False;
     }
 
     if ( GetStatusBar().AreItemsVisible() )
@@ -314,7 +325,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && pImp->bHasMenu )
     {
-        USHORT nSelect = pImp->nFunction;
+        sal_uInt16 nSelect = pImp->nFunction;
         if (!nSelect)
             nSelect = PSZ_FUNC_NONE;
         FunctionPopup_Impl aMenu( nSelect );
@@ -420,12 +431,12 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
 
 // -----------------------------------------------------------------------
 
-ULONG SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     Image aTmpPosImage( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
     Image aTmpSizeImage( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
 
-    ULONG nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
+    sal_uIntPtr nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
     nWidth+=PAINT_OFFSET+aTmpSizeImage.GetSizePixel().Width();
     nWidth+=2*(PAINT_OFFSET+rStb.GetTextWidth(String::CreateFromAscii("XXXX,XX / XXXX,XX")));
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 62a6cb29e1..f96c498ceb 100644..100755
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -38,7 +38,7 @@
 
 #define _SVX_SELCTRL_CXX
 
-#include "selctrl.hxx"
+#include "svx/selctrl.hxx"
 #include <svx/dialmgr.hxx>
 
 #include <svx/dialogs.hrc>
@@ -49,8 +49,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
 
 // class SvxSelectionModeControl -----------------------------------------
 
-SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
-                                                  USHORT _nId,
+SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
+                                                  sal_uInt16 _nId,
                                                   StatusBar& rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
     nState( 0 )
@@ -59,7 +59,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
 
 // -----------------------------------------------------------------------
 
-void SvxSelectionModeControl::StateChanged( USHORT, SfxItemState eState,
+void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
     if ( SFX_ITEM_AVAILABLE != eState )
@@ -107,7 +107,7 @@ void SvxSelectionModeControl::Paint( const UserDrawEvent& )
 void SvxSelectionModeControl::DrawItemText_Impl()
 {
     String sTxt;
-    USHORT _nId = 0;
+    sal_uInt16 _nId = 0;
 
     switch ( nState )
     {
@@ -131,7 +131,7 @@ void SvxSelectionModeControl::DrawItemText_Impl()
     GetStatusBar().SetItemText( GetId(), sTxt );
 }
 
-ULONG SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
     long nWidth2 =  rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 23eb8b0e3a..23eb8b0e3a 100644..100755
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index f4ecdc0027..f4ecdc0027 100644..100755
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 0fc8151904..dfc85e5c97 100644..100755
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -46,7 +46,7 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include "xmlsecctrl.hxx"
+#include "svx/xmlsecctrl.hxx"
 #include <tools/urlobj.hxx>
 
 #define PAINT_OFFSET	5
@@ -58,18 +58,18 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
 {
     Point		maPos;
     Size		maSize;
-    UINT16		mnState;
+    sal_uInt16		mnState;
     Image		maImage;
     Image       maImageBroken;
     Image       maImageNotValidated;
 };
 
 
-XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId,  sal_uInt16 _nId, StatusBar& _rStb )
     :SfxStatusBarControl( _nSlotId, _nId, _rStb )
     ,mpImpl( new XmlSecStatusBarControl_Impl )
 {
-    mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+    mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
 
     mpImpl->maImage             = Image( SVX_RES( RID_SVXBMP_SIGNET              ) );
     mpImpl->maImageBroken       = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN       ) );
@@ -81,15 +81,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
     delete mpImpl;
 }
 
-void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
-    GetStatusBar().SetHelpText( GetId(), String() );// necessary ?
-
-    GetStatusBar().SetHelpId( GetId(), nSID );      // necessary ?
-
     if( SFX_ITEM_AVAILABLE != eState )
     {
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
     else if( pState->ISA( SfxUInt16Item ) )
     {
@@ -98,7 +94,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
     else
     {
         DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
-        mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+        mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
     }
 
     if( GetStatusBar().AreItemsVisible() )				// necessary ?
@@ -106,7 +102,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
 
     GetStatusBar().SetItemText( GetId(), String() );    // necessary ?
 
-    USHORT nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+    sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
     if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
         nResId = RID_SVXSTR_XMLSEC_SIG_OK;
     else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index f311eed28e..44fa48220d 100644..100755
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -36,7 +36,7 @@
 
 #include <svx/dialogs.hrc>
 
-#include "zoomctrl.hxx"
+#include "svx/zoomctrl.hxx"
 #include <svx/zoomitem.hxx>
 #include "stbctrls.h"
 #include <svx/dialmgr.hxx>
@@ -48,27 +48,27 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
 class ZoomPopup_Impl : public PopupMenu
 {
 public:
-    ZoomPopup_Impl( USHORT nZ, USHORT nValueSet );
+    ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet );
 
-    USHORT			GetZoom() const { return nZoom; }
-    USHORT			GetCurId() const { return nCurId; }
+    sal_uInt16			GetZoom() const { return nZoom; }
+    sal_uInt16			GetCurId() const { return nCurId; }
 
 private:
-    USHORT			nZoom;
-    USHORT			nCurId;
+    sal_uInt16			nZoom;
+    sal_uInt16			nCurId;
 
     virtual void	Select();
 };
 
 // -----------------------------------------------------------------------
 
-ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
+ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
 
 :	PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ),
 
     nZoom( nZ )
 {
-    static USHORT aTable[] =
+    static sal_uInt16 aTable[] =
     {
         SVX_ZOOM_ENABLE_50, 		ZOOM_50,
         SVX_ZOOM_ENABLE_100,		ZOOM_100,
@@ -79,9 +79,9 @@ ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
         SVX_ZOOM_ENABLE_PAGEWIDTH,	ZOOM_PAGE_WIDTH
     };
 
-    for ( USHORT nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 )
+    for ( sal_uInt16 nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 )
         if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) )
-            EnableItem( aTable[nPos+1], FALSE );
+            EnableItem( aTable[nPos+1], sal_False );
 }
 
 // -----------------------------------------------------------------------
@@ -107,8 +107,8 @@ void ZoomPopup_Impl::Select()
 
 // class SvxZoomStatusBarControl ------------------------------------------
 
-SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
-                                                  USHORT _nId,
+SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
+                                                  sal_uInt16 _nId,
                                                   StatusBar& rStb ) :
 
     SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -119,7 +119,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
 
 // -----------------------------------------------------------------------
 
-void SvxZoomStatusBarControl::StateChanged( USHORT, SfxItemState eState,
+void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
 {
     if( SFX_ITEM_AVAILABLE != eState )
@@ -210,7 +210,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
         SfxStatusBarControl::Command( rCEvt );
 }
 
-ULONG SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
 {
     long nWidth1 =  rStb.GetTextWidth(String::CreateFromAscii("XXXXX%"));
     return nWidth1;
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 5b9298a0b1..7062870936 100644..100755
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -48,12 +48,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem );
 
 struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 {
-    USHORT                   mnCurrentZoom;
-    USHORT                   mnMinZoom;
-    USHORT                   mnMaxZoom;
-    USHORT                   mnSliderCenter;
+    sal_uInt16                   mnCurrentZoom;
+    sal_uInt16                   mnMinZoom;
+    sal_uInt16                   mnMaxZoom;
+    sal_uInt16                   mnSliderCenter;
     std::vector< long >      maSnappingPointOffsets;
-    std::vector< USHORT >    maSnappingPointZooms;
+    std::vector< sal_uInt16 >    maSnappingPointZooms;
     Image                    maSliderButton;
     Image                    maIncreaseButton;
     Image                    maDecreaseButton;
@@ -90,10 +90,10 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two
 
 // nOffset referes to the origin of the control:
 // + ----------- -
-USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
+sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
 {
     const long nControlWidth = getControlRect().GetWidth();
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
 
     if ( nOffset < nSliderXOffset )
         return mpImpl->mnMinZoom;;
@@ -102,7 +102,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
         return mpImpl->mnMaxZoom;
 
     // check for snapping points:
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     std::vector< long >::iterator aSnappingPointIter;
     for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
           aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
@@ -127,7 +127,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) / nHalfSliderWidth;
             const long nOffsetToSliderLeft = nOffset - nSliderXOffset;
-            nRet = mpImpl->mnMinZoom + USHORT( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
         }
         else
         {
@@ -136,7 +136,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel = 1000 * nSecondHalfRange / nHalfSliderWidth;
             const long nOffsetToSliderCenter = nOffset - nControlWidth/2;
-            nRet = mpImpl->mnSliderCenter + USHORT( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
         }
     }
 
@@ -149,7 +149,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
 }
 
 // returns the offset to the left control border
-long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
+long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
 {
     const long nControlWidth = getControlRect().GetWidth();
     long nRet = nSliderXOffset;
@@ -178,7 +178,7 @@ long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
 
 // -----------------------------------------------------------------------
 
-SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb ) :
+SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nId, StatusBar& _rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, _rStb ),
     mpImpl( new SvxZoomSliderControl_Impl )
 {
@@ -196,7 +196,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl()
 
 // -----------------------------------------------------------------------
 
-void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) )
     {
@@ -213,7 +213,7 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
         mpImpl->mbValuesSet   = true;
 
         if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom )
-            mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (USHORT)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
+            mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
 
 
         DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom &&
@@ -227,20 +227,20 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
         mpImpl->maSnappingPointZooms.clear();
 
         // get all snapping points:
-        std::set< USHORT > aTmpSnappingPoints;
-        for ( USHORT j = 0; j < rSnappingPoints.getLength(); ++j )
+        std::set< sal_uInt16 > aTmpSnappingPoints;
+        for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
         {
             const sal_Int32 nSnappingPoint = rSnappingPoints[j];
-            aTmpSnappingPoints.insert( (USHORT)nSnappingPoint );
+            aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
         }
 
         // remove snapping points that are to close to each other:
-        std::set< USHORT >::iterator aSnappingPointIter;
+        std::set< sal_uInt16 >::iterator aSnappingPointIter;
         long nLastOffset = 0;
 
         for ( aSnappingPointIter = aTmpSnappingPoints.begin(); aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
         {
-            const USHORT nCurrent = *aSnappingPointIter;
+            const sal_uInt16 nCurrent = *aSnappingPointIter;
             const long nCurrentOffset = Zoom2Offset( nCurrent );
 
             if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist )
@@ -343,10 +343,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
 {
     if ( !mpImpl->mbValuesSet )
-        return TRUE;;
+        return sal_True;;
 
     const Rectangle aControlRect = getControlRect();
     const Point aPoint = rEvt.GetPosPixel();
@@ -374,7 +374,7 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
         mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
 
     if ( nOldZoom == mpImpl->mnCurrentZoom )
-        return TRUE;
+        return sal_True;
 
     if ( GetStatusBar().AreItemsVisible() )
         GetStatusBar().SetItemData( GetId(), 0 );    // force repaint
@@ -395,15 +395,15 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
 
     mpImpl->mbOmitPaint = false;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
 {
     if ( !mpImpl->mbValuesSet )
-        return TRUE;;
+        return sal_True;;
 
     const short nButtons = rEvt.GetButtons();
 
@@ -440,7 +440,7 @@ BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 91a79d0123..031ffdfbf7 100644..100755
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "ActionDescriptionProvider.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/ActionDescriptionProvider.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const ::rtl::OUString& rObjectName )
 {
-    USHORT nResID=0;
+    sal_uInt16 nResID=0;
     switch( eActionType )
     {
     case INSERT:
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index a39bb2f1f3..a39bb2f1f3 100644..100755
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index 6b33979da3..6b33979da3 100644..100755
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index ce0f6ee236..ce0f6ee236 100644..100755
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
index f8332089c4..d2cedabab9 100644..100755
--- a/svx/source/svdraw/impgrfll.cxx
+++ b/svx/source/svdraw/impgrfll.cxx
@@ -43,12 +43,12 @@ void ImpCalcBmpFillSizes( Size&			   rStartOffset,
                           const Size&      rBmpSize,
                           const Size&      rBmpPerCent,
                           const Size&	   rBmpOffPerCent,
-                          BOOL             bBmpLogSize,
-                          BOOL             bBmpTile,
-                          BOOL             bBmpStretch,
+                          sal_Bool             bBmpLogSize,
+                          sal_Bool             bBmpTile,
+                          sal_Bool             bBmpStretch,
                           RECT_POINT       eBmpRectPoint )
 {
-    BOOL	bOriginalSize = FALSE, bScaleSize = FALSE;
+    sal_Bool	bOriginalSize = sal_False, bScaleSize = sal_False;
 
     // Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
     // berechnen wir uns die Groesse selber aus der Bitmap
@@ -58,16 +58,16 @@ void ImpCalcBmpFillSizes( Size&			   rStartOffset,
     if( bBmpLogSize )
     {
         if( !rBmpSize.Width() && !rBmpSize.Height() )
-            bOriginalSize = TRUE;
+            bOriginalSize = sal_True;
         else if( !rBmpSize.Width() || !rBmpSize.Height() )
-            bScaleSize = TRUE;
+            bScaleSize = sal_True;
     }
     else
     {
         if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
-            bOriginalSize = TRUE;
+            bOriginalSize = sal_True;
         else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
-            bScaleSize = TRUE;
+            bScaleSize = sal_True;
     }
 
     // entweder Originalgroesse oder angepasste Groesse
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
deleted file mode 100644
index 514c5b6d2c..0000000000
--- a/svx/source/svdraw/makefile.mk
+++ /dev/null
@@ -1,124 +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=svx
-TARGET=svdraw
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-         $(SLO)$/svdxcgv.obj		 \
-         $(SLO)$/svdmodel.obj		\
-         $(SLO)$/svdpage.obj         \
-         $(SLO)$/svdobj.obj          \
-         $(SLO)$/svdedtv1.obj        \
-         $(SLO)$/svdcrtv.obj         \
-         $(SLO)$/svdograf.obj        \
-         $(SLO)$/svdoole2.obj        \
-         $(SLO)$/svdhdl.obj          \
-         $(SLO)$/svdmrkv.obj         \
-         $(SLO)$/svdogrp.obj         \
-         $(SLO)$/svdotxln.obj        \
-         $(SLO)$/svdotextdecomposition.obj		\
-         $(SLO)$/svdotextpathdecomposition.obj	\
-         $(SLO)$/svdouno.obj         \
-         $(SLO)$/svdpagv.obj		 \
-         $(SLO)$/svddrgmt.obj        \
-         $(SLO)$/svdpntv.obj         \
-         $(SLO)$/svdsnpv.obj         \
-         $(SLO)$/svdview.obj         \
-         $(SLO)$/svdtext.obj		\
-         $(SLO)$/svdoashp.obj		 \
-         $(SLO)$/svdoattr.obj        \
-         $(SLO)$/svdotext.obj        \
-         $(SLO)$/svdotxat.obj        \
-         $(SLO)$/svdotxdr.obj        \
-         $(SLO)$/svdotxed.obj        \
-         $(SLO)$/svdotxfl.obj        \
-         $(SLO)$/svdotxtr.obj        \
-         $(SLO)$/svdorect.obj        \
-         $(SLO)$/svdoedge.obj        \
-         $(SLO)$/svdomeas.obj        \
-         $(SLO)$/svdopath.obj        \
-         $(SLO)$/svdocapt.obj        \
-         $(SLO)$/svdocirc.obj        \
-         $(SLO)$/svdopage.obj        \
-         $(SLO)$/svdoutl.obj         \
-         $(SLO)$/svdovirt.obj        \
-         $(SLO)$/svdoutlinercache.obj \
-         $(SLO)$/gradtrns.obj         \
-         $(SLO)$/svdattr.obj         \
-         $(SLO)$/svddrag.obj         \
-         $(SLO)$/svddrgv.obj         \
-         $(SLO)$/svdedtv2.obj        \
-         $(SLO)$/svdedxv.obj         \
-         $(SLO)$/svdetc.obj          \
-         $(SLO)$/sdrhittesthelper.obj          \
-         $(SLO)$/svdfmtf.obj		\
-         $(SLO)$/svdglev.obj         \
-         $(SLO)$/svdglue.obj         \
-         $(SLO)$/svdhlpln.obj        \
-         $(SLO)$/svditer.obj         \
-         $(SLO)$/svdlayer.obj        \
-         $(SLO)$/svdmark.obj         \
-         $(SLO)$/svdmrkv1.obj        \
-         $(SLO)$/sdrcomment.obj         \
-         $(SLO)$/sdrmasterpagedescriptor.obj         \
-         $(SLO)$/sdrpagewindow.obj         \
-         $(SLO)$/sdrpaintwindow.obj         \
-         $(SLO)$/svdpoev.obj         \
-         $(SLO)$/svdtrans.obj        \
-         $(SLO)$/svdundo.obj         \
-         $(SLO)$/svdviter.obj        \
-         $(SLO)$/clonelist.obj		 \
-         $(SLO)$/svdedtv.obj         \
-         $(SLO)$/selectioncontroller.obj \
-         $(SLO)$/polypolygoneditor.obj \
-         $(SLO)$/svdibrow.obj        \
-         $(SLO)$/svdomedia.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-         $(SLO)$/ActionDescriptionProvider.obj \
-         $(SLO)$/impgrfll.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) 
-
-SRS1NAME=svdstr
-SRC1FILES= svdstr.src
-
-.INCLUDE :  target.mk
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 64774e59b3..64774e59b3 100644..100755
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx
index ae6011d6b0..ae6011d6b0 100644..100755
--- a/svx/source/svdraw/sdrcomment.cxx
+++ b/svx/source/svdraw/sdrcomment.cxx
diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index 5b51232cbd..5b51232cbd 100644..100755
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 5f55e4d1d2..5f55e4d1d2 100644..100755
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 5153fb702f..d62e0859a6 100644..100755
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -40,7 +40,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <osl/mutex.hxx>
@@ -80,8 +80,8 @@ using namespace ::com::sun::star;
             // , thus it seems not necessary to make
             // it visible her at all.
             // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX
-            // BOOL bVis = pWindow->IsVisible();
-            // xC->setVisible(TRUE);
+            // sal_Bool bVis = pWindow->IsVisible();
+            // xC->setVisible(sal_True);
             // if ( !bVis )
             // 	pWindow->Hide();
             //	if( !mxContext.is() && bVisible )
@@ -193,6 +193,10 @@ void SdrPageWindow::PrePaint()
     }
 }
 
+void SdrPageWindow::PostPaint()
+{
+}
+
 void SdrPageWindow::PrepareRedraw(const Region& rReg)
 {
     // evtl. give OC the chance to do ProcessDisplay preparations
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index ba77883b38..17ccfde01d 100644..100755
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/overlay/overlaymanagerbuffered.hxx>
 #include <svx/svdpntv.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx
index 375f9bfcb9..375f9bfcb9 100644..100755
--- a/svx/source/svdraw/selectioncontroller.cxx
+++ b/svx/source/svdraw/selectioncontroller.cxx
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 174e7f4239..4682f48cb5 100644..100755
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -55,11 +55,11 @@
 
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>    // fuer RGB_Color()
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>  // fuer DEGREE_CHAR
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"
 #include <svx/sdgcpitm.hxx>
 #include <editeng/adjitem.hxx>
 #include <svx/sdtfchim.hxx>
@@ -300,11 +300,11 @@ SdrItemPool::SdrItemPool(
 
     SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER );
 
-    pBoxInfoItem->SetTable( TRUE );
-    pBoxInfoItem->SetDist( TRUE);        // Abstandsfeld immer anzeigen
-//	pBoxInfoItem->SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen
+    pBoxInfoItem->SetTable( sal_True );
+    pBoxInfoItem->SetDist( sal_True);        // Abstandsfeld immer anzeigen
+//	pBoxInfoItem->SetMinDist( sal_True );// Minimalgroesse in Tabellen und Absaetzen setzen
 //	pBoxInfoItem->SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen
-    pBoxInfoItem->SetValid( VALID_DISABLE, TRUE ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
+    pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
 
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] =  pBoxInfoItem;
 //	mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW );
@@ -330,7 +330,7 @@ SdrItemPool::SdrItemPool(
 /*************************************************************************
 |*
 |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|*            (Parameter 2 = TRUE)
+|*            (Parameter 2 = sal_True)
 |*
 \************************************************************************/
 
@@ -385,7 +385,7 @@ SfxItemPresentation SdrItemPool::GetPresentation(
               const IntlWrapper * pIntlWrapper) const
 {
     if (!IsInvalidItem(&rItem)) {
-        USHORT nWhich=rItem.Which();
+        sal_uInt16 nWhich=rItem.Which();
         if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) {
             rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
                         GetMetric(nWhich),ePresentationMetric,rText,
@@ -405,7 +405,7 @@ SfxItemPresentation SdrItemPool::GetPresentation(
 void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
 {
     ResMgr* pResMgr = ImpGetResMgr();
-    USHORT	nResId = SIP_UNKNOWN_ATTR;
+    sal_uInt16	nResId = SIP_UNKNOWN_ATTR;
 
     switch (nWhich)
     {
@@ -633,10 +633,10 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
 
 TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
 
-SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
+SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn):
     SfxPoolItem(nId)
 {
-    INT32 nMul,nDiv;
+    sal_Int32 nMul,nDiv;
     rIn>>nMul;
     rIn>>nDiv;
     nValue=Fraction(nMul,nDiv);
@@ -654,7 +654,7 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
 {
     if(nValue.IsValid())
     {
-        INT32 nDiv = nValue.GetDenominator();
+        sal_Int32 nDiv = nValue.GetDenominator();
         rText = UniString::CreateFromInt32(nValue.GetNumerator());
 
         if(nDiv != 1)
@@ -681,15 +681,15 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrFractionItem(Which(),rIn);
 }
 
-SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const
+SvStream& SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const
 {
-    rOut<<INT32(nValue.GetNumerator());
-    rOut<<INT32(nValue.GetDenominator());
+    rOut<<sal_Int32(nValue.GetNumerator());
+    rOut<<sal_Int32(nValue.GetDenominator());
     return rOut;
 }
 
@@ -710,7 +710,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
 {
     if(GetValue().IsValid())
     {
-        INT32 nDiv = GetValue().GetDenominator();
+        sal_Int32 nDiv = GetValue().GetDenominator();
 
         rText = UniString::CreateFromInt32(GetValue().GetNumerator());
         rText += sal_Unicode(':');
@@ -734,7 +734,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
     return ePresentation;
 }
 
-SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrScaleItem(Which(),rIn);
 }
@@ -755,12 +755,12 @@ SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrOnOffItem(Which(),GetValue());
 }
 
-SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrOnOffItem(Which(),rIn);
 }
 
-XubString SdrOnOffItem::GetValueTextByVal(BOOL bVal) const
+XubString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValON);
     else return ImpGetResStr(STR_ItemValOFF);
@@ -787,12 +787,12 @@ SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrYesNoItem(Which(),GetValue());
 }
 
-SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrYesNoItem(Which(),rIn);
 }
 
-XubString SdrYesNoItem::GetValueTextByVal(BOOL bVal) const
+XubString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
 {
     if (bVal) return ImpGetResStr(STR_ItemValYES);
     else return ImpGetResStr(STR_ItemValNO);
@@ -823,7 +823,7 @@ SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrPercentItem(Which(),GetValue());
 }
 
-SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrPercentItem(Which(),rIn);
 }
@@ -858,7 +858,7 @@ SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrAngleItem(Which(),GetValue());
 }
 
-SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrAngleItem(Which(),rIn);
 }
@@ -867,8 +867,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper * pIntlWrapper) const
 {
-    INT32 nValue(GetValue());
-    BOOL bNeg(nValue < 0);
+    sal_Int32 nValue(GetValue());
+    sal_Bool bNeg(nValue < 0);
 
     if(bNeg)
         nValue = -nValue;
@@ -894,8 +894,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
             rText.Insert(aUnicodeNull, 0);
 
         xub_StrLen nLen = rText.Len();
-        BOOL bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
-        BOOL bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
+        sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
+        sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
 
         if(bNull2)
         {
@@ -947,14 +947,14 @@ SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrMetricItem(Which(),GetValue());
 }
 
-SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrMetricItem(Which(),rIn);
 }
 
 bool SdrMetricItem::HasMetrics() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
@@ -966,7 +966,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
         aVal/=nDiv;
         SetValue(long(aVal));
     }
-    return TRUE;
+    return sal_True;
 }
 
 SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
@@ -996,11 +996,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
 
 SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const                { return new SdrCaptionTypeItem(*this); }
 
-SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const       { return new SdrCaptionTypeItem(rIn); }
+SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const       { return new SdrCaptionTypeItem(rIn); }
 
-USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; }
 
-XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
 }
@@ -1008,7 +1008,7 @@ XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1023,11 +1023,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
 
 SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const              { return new SdrCaptionEscDirItem(*this); }
 
-SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const     { return new SdrCaptionEscDirItem(rIn); }
+SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const     { return new SdrCaptionEscDirItem(rIn); }
 
-USHORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
+sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; }
 
-XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
 }
@@ -1035,7 +1035,7 @@ XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1055,11 +1055,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
 
 SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const         { return new SdrTextFitToSizeTypeItem(*this); }
 
-SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
+SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
 
-USHORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
 
-XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
 }
@@ -1067,7 +1067,7 @@ XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1078,13 +1078,13 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio
     return ePres;
 }
 
-int  SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; }
+int SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; }
 
-BOOL SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
+sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
 
-void SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
+void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
 
-bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
     rVal <<= eFS;
@@ -1092,7 +1092,7 @@ bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
     return true;
 }
 
-bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextFitToSizeType eFS;
     if(!(rVal >>= eFS))
@@ -1104,7 +1104,7 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
         eFS = (drawing::TextFitToSizeType) nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) );
 
     return true;
 }
@@ -1113,11 +1113,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
 
 SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextVertAdjustItem(*this); }
 
-SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextVertAdjustItem(rIn); }
+SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextVertAdjustItem(rIn); }
 
-USHORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; }
 
-XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
 }
@@ -1125,7 +1125,7 @@ XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1136,13 +1136,13 @@ SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation e
     return ePres;
 }
 
-bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextVerticalAdjust)GetValue();
     return true;
 }
 
-bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextVerticalAdjust eAdj;
     if(!(rVal >>= eAdj))
@@ -1154,7 +1154,7 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eAdj = (drawing::TextVerticalAdjust)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) );
 
     return true;
 }
@@ -1163,11 +1163,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
 
 SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextHorzAdjustItem(*this); }
 
-SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextHorzAdjustItem(rIn); }
+SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextHorzAdjustItem(rIn); }
 
-USHORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
 
-XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
 }
@@ -1175,7 +1175,7 @@ XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1186,13 +1186,13 @@ SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation e
     return ePres;
 }
 
-bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextHorizontalAdjust)GetValue();
     return true;
 }
 
-bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextHorizontalAdjust eAdj;
     if(!(rVal >>= eAdj))
@@ -1204,7 +1204,7 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eAdj = (drawing::TextHorizontalAdjust)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) );
 
     return true;
 }
@@ -1213,11 +1213,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
 
 SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniKindItem(*this); }
 
-SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniKindItem(rIn); }
+SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniKindItem(rIn); }
 
-USHORT SdrTextAniKindItem::GetValueCount() const { return 5; }
+sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; }
 
-XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
 }
@@ -1225,7 +1225,7 @@ XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1236,13 +1236,13 @@ SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePre
     return ePres;
 }
 
-bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationKind)GetValue();
     return true;
 }
 
-bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextAnimationKind eKind;
     if(!(rVal >>= eKind))
@@ -1253,7 +1253,7 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::TextAnimationKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) );
 
     return true;
 }
@@ -1262,11 +1262,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
 
 SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniDirectionItem(*this); }
 
-SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniDirectionItem(rIn); }
+SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniDirectionItem(rIn); }
 
-USHORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; }
 
-XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
 }
@@ -1274,7 +1274,7 @@ XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1285,13 +1285,13 @@ SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation
     return ePres;
 }
 
-bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextAnimationDirection)GetValue();
     return true;
 }
 
-bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextAnimationDirection eDir;
     if(!(rVal >>= eDir))
@@ -1303,7 +1303,7 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
         eDir = (drawing::TextAnimationDirection)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) );
 
     return true;
 }
@@ -1312,7 +1312,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
 
 SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniDelayItem(*this); }
 
-SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniDelayItem(rIn); }
+SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniDelayItem(rIn); }
 
 SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
@@ -1338,7 +1338,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
 
 SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrTextAniAmountItem(*this); }
 
-SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrTextAniAmountItem(rIn); }
+SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrTextAniAmountItem(rIn); }
 
 bool SdrTextAniAmountItem::HasMetrics() const
 {
@@ -1353,15 +1353,15 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
         aVal+=nDiv/2; // fuer korrektes Runden
         aVal/=nDiv;
         SetValue(short(aVal));
-        return TRUE;
-    } else return FALSE;
+        return sal_True;
+    } else return sal_False;
 }
 
 SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
     XubString& rText, const IntlWrapper *) const
 {
-    INT32 nValue(GetValue());
+    sal_Int32 nValue(GetValue());
 
     if(!nValue)
         nValue = -1L;
@@ -1394,12 +1394,12 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
 }
 
 TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
-SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight )
+SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight )
     : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight )
 {
 }
 SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion )
-    : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, FALSE )
+    : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False )
 {
     if ( nVersion )
     {
@@ -1443,13 +1443,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
 {
     return 1;
 }
-bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = (sal_Bool)GetValue();
     rVal <<= bValue;
     return true;
 }
-bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Bool bValue = sal_Bool();
     if( !( rVal >>= bValue ) )
@@ -1572,7 +1572,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer
     return 1;
 }
 
-bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_uInt32 i, nCount = GetCount();
     uno::Sequence< sal_Int32 > aSequence( nCount );
@@ -1586,7 +1586,7 @@ bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*
     return true;
 }
 
-bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     uno::Sequence< sal_Int32 > aSequence;
     if( !( rVal >>= aSequence ) )
@@ -1618,11 +1618,11 @@ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
 
 SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrEdgeKindItem(*this); }
 
-SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrEdgeKindItem(rIn); }
+SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrEdgeKindItem(rIn); }
 
-USHORT SdrEdgeKindItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; }
 
-XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
 }
@@ -1630,7 +1630,7 @@ XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1641,7 +1641,7 @@ SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
     return ePres;
 }
 
-bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
 
@@ -1661,7 +1661,7 @@ bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
     return true;
 }
 
-bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ConnectorType eCT;
     if(!(rVal >>= eCT))
@@ -1683,18 +1683,18 @@ bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         default:
             OSL_FAIL( "SdrEdgeKindItem::PuValue : unknown enum" );
     }
-    SetValue( sal::static_int_cast< USHORT >( eEK ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) );
 
     return true;
 }
 
-bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1704,13 +1704,13 @@ bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return true;
 }
 
-bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1720,13 +1720,13 @@ bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return true;
 }
 
-bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1736,13 +1736,13 @@ bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return true;
 }
 
-bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1752,13 +1752,13 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
     return true;
 }
 
-bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1768,13 +1768,13 @@ bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
     return true;
 }
 
-bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1784,13 +1784,13 @@ bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
     return true;
 }
 
-bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1809,11 +1809,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
 
 SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureKindItem(*this); }
 
-SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureKindItem(rIn); }
+SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureKindItem(rIn); }
 
-USHORT SdrMeasureKindItem::GetValueCount() const { return 2; }
+sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; }
 
-XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
 }
@@ -1821,7 +1821,7 @@ XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1832,13 +1832,13 @@ SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePre
     return ePres;
 }
 
-bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureKind)GetValue();
     return true;
 }
 
-bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureKind eKind;
     if(!(rVal >>= eKind))
@@ -1850,7 +1850,7 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::MeasureKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) );
     return true;
 }
 
@@ -1858,11 +1858,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
 
 SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureTextHPosItem(*this); }
 
-SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureTextHPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureTextHPosItem(rIn); }
 
-USHORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
 
-XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
 }
@@ -1870,7 +1870,7 @@ XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1881,13 +1881,13 @@ SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation
     return ePres;
 }
 
-bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextHorzPos)GetValue();
     return true;
 }
 
-bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureTextHorzPos ePos;
     if(!(rVal >>= ePos))
@@ -1899,7 +1899,7 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         ePos = (drawing::MeasureTextHorzPos)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
     return true;
 }
 
@@ -1907,11 +1907,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
 
 SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureTextVPosItem(*this); }
 
-SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureTextVPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureTextVPosItem(rIn); }
 
-USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
+sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
 
-XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
 }
@@ -1919,7 +1919,7 @@ XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1930,13 +1930,13 @@ SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation
     return ePres;
 }
 
-bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::MeasureTextVertPos)GetValue();
     return true;
 }
 
-bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::MeasureTextVertPos ePos;
     if(!(rVal >>= ePos))
@@ -1948,7 +1948,7 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         ePos = (drawing::MeasureTextVertPos)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
     return true;
 }
 
@@ -1956,11 +1956,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
 
 SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const            { return new SdrMeasureUnitItem(*this); }
 
-SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const   { return new SdrMeasureUnitItem(rIn); }
+SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const   { return new SdrMeasureUnitItem(rIn); }
 
-USHORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
+sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
 
-XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     XubString aRetval;
 
@@ -1975,7 +1975,7 @@ XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -1986,19 +1986,19 @@ SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePre
     return ePres;
 }
 
-bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nMeasure = 0;
     if(!(rVal >>= nMeasure))
         return false;
 
-    SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) );
     return true;
 }
 
@@ -2011,11 +2011,11 @@ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
 
 SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const          { return new SdrCircKindItem(*this); }
 
-SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); }
+SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); }
 
-USHORT SdrCircKindItem::GetValueCount() const { return 4; }
+sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; }
 
-XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
+XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
 }
@@ -2023,7 +2023,7 @@ XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
 SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
                       SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+    rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
     if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
         String aStr;
 
@@ -2034,13 +2034,13 @@ SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
     return ePres;
 }
 
-bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::CircleKind)GetValue();
     return true;
 }
 
-bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::CircleKind eKind;
     if(!(rVal >>= eKind))
@@ -2052,7 +2052,7 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
         eKind = (drawing::CircleKind)nEnum;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) );
     return true;
 }
 
@@ -2068,7 +2068,7 @@ SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrSignedPercentItem( Which(), GetValue() );
 }
 
-SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrSignedPercentItem( Which(), rIn );
 }
@@ -2103,7 +2103,7 @@ SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafRedItem( *this );
 }
 
-SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafRedItem( rIn );
 }
@@ -2119,7 +2119,7 @@ SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafGreenItem( *this );
 }
 
-SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafGreenItem( rIn );
 }
@@ -2135,7 +2135,7 @@ SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafBlueItem( *this );
 }
 
-SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafBlueItem( rIn );
 }
@@ -2151,7 +2151,7 @@ SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafLuminanceItem( *this );
 }
 
-SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafLuminanceItem( rIn );
 }
@@ -2167,7 +2167,7 @@ SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafContrastItem( *this );
 }
 
-SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafContrastItem( rIn );
 }
@@ -2183,24 +2183,24 @@ SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
     return new SdrGrafGamma100Item( *this );
 }
 
-SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafGamma100Item( rIn );
 }
 
-bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= ((double)GetValue()) / 100.0;
     return true;
 }
 
-bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     double nGamma = 0;
     if(!(rVal >>= nGamma))
         return false;
 
-    SetValue( (UINT32)(nGamma * 100.0  ) );
+    SetValue( (sal_uInt32)(nGamma * 100.0  ) );
     return true;
 }
 
@@ -2231,7 +2231,7 @@ SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafTransparenceItem( *this );
 }
 
-SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafTransparenceItem( rIn );
 }
@@ -2247,17 +2247,17 @@ SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
     return new SdrGrafModeItem( *this );
 }
 
-SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SdrGrafModeItem( rIn );
 }
 
-USHORT SdrGrafModeItem::GetValueCount() const
+sal_uInt16 SdrGrafModeItem::GetValueCount() const
 {
     return 4;
 }
 
-XubString SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
+XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
 {
     XubString aStr;
 
@@ -2292,7 +2292,7 @@ SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres,
                                                                SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
                                                                XubString& rText, const IntlWrapper *) const
 {
-    rText = GetValueTextByPos( sal::static_int_cast< USHORT >( GetValue() ) );
+    rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) );
 
     if( ePres == SFX_ITEM_PRESENTATION_COMPLETE )
     {
@@ -2317,12 +2317,12 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const
     return new SdrGrafCropItem( *this );
 }
 
-SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
 }
 
-USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/) const
+sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const
 {
     // GRFCROP_VERSION_MOVETOSVX is 1
     return GRFCROP_VERSION_MOVETOSVX;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index c17133c808..29423e36a0 100644..100755
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdcrtv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/svdundo.hxx>
 #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung
 #include <svx/svdoedge.hxx>
@@ -46,7 +46,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include "fmobj.hxx"
 #include <svx/svdocirc.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
@@ -215,11 +215,11 @@ void SdrCreateView::ImpClearVars()
     nAktIdent=OBJ_NONE;
     pAktCreate=NULL;
     pCreatePV=NULL;
-    bAutoTextEdit=FALSE;
-    b1stPointAsCenter=FALSE;
+    bAutoTextEdit=sal_False;
+    b1stPointAsCenter=sal_False;
     aAktCreatePointer=Pointer(POINTER_CROSS);
-    bUseIncompatiblePathCreateInterface=FALSE;
-    bAutoClosePolys=TRUE;
+    bUseIncompatiblePathCreateInterface=sal_False;
+    bAutoClosePolys=sal_True;
     nAutoCloseDistPix=5;
     nFreeHandMinDistPix=10;
 
@@ -250,7 +250,7 @@ void SdrCreateView::ImpDelCreateAttr()
 {
 }
 
-BOOL SdrCreateView::IsAction() const
+sal_Bool SdrCreateView::IsAction() const
 {
     return SdrDragView::IsAction() || pAktCreate!=NULL;
 }
@@ -297,26 +297,26 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-BOOL SdrCreateView::CheckEdgeMode()
+sal_Bool SdrCreateView::CheckEdgeMode()
 {
-    UINT32 nInv=nAktInvent;
-    UINT16 nIdn=nAktIdent;
+    sal_uInt32 nInv=nAktInvent;
+    sal_uInt16 nIdn=nAktIdent;
     if (pAktCreate!=NULL) 
     {
         nInv=pAktCreate->GetObjInventor();
         nIdn=pAktCreate->GetObjIdentifier();
         // wird vom EdgeObj gemanaged
-        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
+        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False;
     }
     
     if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE) 
     {
         ImpClearConnectMarker();
-        return FALSE;
+        return sal_False;
     } 
     else 
     {
-        // TRUE heisst: MouseMove soll Connect checken
+        // sal_True heisst: MouseMove soll Connect checken
         return !IsAction();
     }
 }
@@ -349,7 +349,7 @@ void SdrCreateView::HideConnectMarker()
     ImpClearConnectMarker();
 }
 
-BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if(CheckEdgeMode() && pWin) 
     {
@@ -359,7 +359,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         {
             // Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!!
             Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel()));
-            BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
+            sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
             SdrObjConnection aCon;
             if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin);
             SetConnectMarker(aCon,*pPV);
@@ -368,22 +368,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
     return SdrDragView::MouseMove(rMEvt,pWin);
 }
 
-BOOL SdrCreateView::IsTextTool() const
+sal_Bool SdrCreateView::IsTextTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
 }
 
-BOOL SdrCreateView::IsEdgeTool() const
+sal_Bool SdrCreateView::IsEdgeTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
 }
 
-BOOL SdrCreateView::IsMeasureTool() const
+sal_Bool SdrCreateView::IsMeasureTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
 }
 
-void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
+void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
 {
     if (nAktInvent!=nInvent || nAktIdent!=nIdent) 
     {
@@ -417,10 +417,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
     ImpSetGlueVisible3(IsEdgeTool());
 }
 
-BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut,
+sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
     short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     UnmarkAllObj();
     BrkAction();
     
@@ -443,7 +443,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             aLay = aMeasureLayer;
         }
 
-        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE);
+        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True);
         if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
         if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer)) 
         {
@@ -466,9 +466,9 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             }
 
             Point aPnt(rPnt);
-            if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) &&
-                                            nAktIdent!=USHORT(OBJ_FREELINE) &&
-                                            nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
+            if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
                 aPnt=GetSnapPos(aPnt,pCreatePV);
             }
             if (pAktCreate!=NULL) 
@@ -539,8 +539,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
                 pDragWin=pOut;
                 if (pAktCreate->BegCreate(aDragStat)) 
                 {
-                    ShowCreateObj(/*pOut,TRUE*/);
-                    bRet=TRUE;
+                    ShowCreateObj(/*pOut,sal_True*/);
+                    bRet=sal_True;
                 } 
                 else 
                 {
@@ -554,7 +554,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
     return bRet;
 }
 
-BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L);
 }
@@ -573,7 +573,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi
     return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject);
 }
 
-BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
+sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
     OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
@@ -600,9 +600,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
         if(bDidLimit && IsOrtho())
         {
             if(aDragStat.IsOrtho8Possible()) 
-                OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False);
             else if(aDragStat.IsOrtho4Possible()) 
-                OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False);
         }
 
         if (aPnt==aDragStat.GetNow()) return;
@@ -624,24 +624,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
     }
 }
 
-BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
+sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrObject* pObjMerk=pAktCreate;
     SdrPageView* pPVMerk=pCreatePV;
     
     if (pAktCreate!=NULL) 
     {
-        ULONG nAnz=aDragStat.GetPointAnz();
+        sal_uIntPtr nAnz=aDragStat.GetPointAnz();
         
         if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND) 
         {
             BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht)
-            return FALSE; // FALSE=Event nicht ausgewertet
+            return sal_False; // sal_False=Event nicht ausgewertet
         }
 
-        BOOL bPntsEq=nAnz>1;
-        ULONG i=1;
+        sal_Bool bPntsEq=nAnz>1;
+        sal_uIntPtr i=1;
         Point aP0=aDragStat.GetPoint(0);
         while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
 
@@ -666,7 +666,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
                 else
                 {
-                    nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+                    nLayer = rAd.GetLayerID(aAktLayer, sal_True);
                 }
 
                 if(SDRLAYER_NOTFOUND == nLayer) 
@@ -677,7 +677,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 pObj->SetLayer(nLayer);
 
                 // #83403# recognize creation of a new 3D object inside a 3D scene
-                BOOL bSceneIntoScene(FALSE);
+                sal_Bool bSceneIntoScene(sal_False);
                 
                 if(pObjMerk 
                     && pObjMerk->ISA(E3dScene) 
@@ -685,7 +685,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                     && pCreatePV->GetAktGroup() 
                     && pCreatePV->GetAktGroup()->ISA(E3dScene))
                 {
-                    BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
+                    sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
                         (E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0));
 
                     if(bDidInsert)
@@ -693,8 +693,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                         // delete object, it's content is cloned and inserted
                         SdrObject::Free( pObjMerk );
                         pObjMerk = 0L;
-                        bRet = FALSE;
-                        bSceneIntoScene = TRUE;
+                        bRet = sal_False;
+                        bSceneIntoScene = sal_True;
                     }
                 }
 
@@ -705,7 +705,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
 
                 pCreatePV=NULL;
-                bRet=TRUE; // TRUE=Event ausgewertet
+                bRet=sal_True; // sal_True=Event ausgewertet
             } 
             else 
             {
@@ -725,7 +725,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 HideCreateObj();
                 ShowCreateObj();
                 aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj()
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
         if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) 
@@ -776,7 +776,7 @@ void SdrCreateView::BrkCreateObj()
     }
 }
 
-void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
+void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
 {
     if(IsCreateObj() && !aDragStat.IsShown()) 
     {
@@ -885,7 +885,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
             }
         }
 
-        aDragStat.SetShown(TRUE);
+        aDragStat.SetShown(sal_True);
     }
 }
 
@@ -898,19 +898,19 @@ void SdrCreateView::HideCreateObj()
         mpCreateViewExtraData->HideOverlay();
 
         //DrawCreateObj(pOut,bFull);
-        aDragStat.SetShown(FALSE);
+        aDragStat.SetShown(sal_False);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /* new interface src537 */
-BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(pAktCreate)
     {
         rTargetSet.Put(pAktCreate->GetMergedItemSet());
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -918,13 +918,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co
     }
 }
 
-BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     if(pAktCreate) 
     {
         pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll);
 
-        return TRUE;
+        return sal_True;
     } 
     else 
     {
@@ -932,11 +932,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
     }
 }
 
-SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const
 {
     if (pAktCreate!=NULL) 
     {
-        //rOk=TRUE;
+        //rOk=sal_True;
         return pAktCreate->GetStyleSheet();
     } 
     else 
@@ -945,12 +945,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV
     }
 }
 
-BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (pAktCreate!=NULL) 
     {
         pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
-        return TRUE;
+        return sal_True;
     } 
     else 
     {
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index c64891bdf5..23c2fe84a5 100644..100755
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -50,20 +50,20 @@ void SdrDragStat::Reset()
 {
     pView=NULL;
     pPageView=NULL;
-    bShown=FALSE;
+    bShown=sal_False;
     nMinMov=1;
-    bMinMoved=FALSE;
-    bHorFixed=FALSE;
-    bVerFixed=FALSE;
-    bWantNoSnap=FALSE;
+    bMinMoved=sal_False;
+    bHorFixed=sal_False;
+    bVerFixed=sal_False;
+    bWantNoSnap=sal_False;
     pHdl=NULL;
-    bOrtho4=FALSE;
-    bOrtho8=FALSE;
+    bOrtho4=sal_False;
+    bOrtho8=sal_False;
     pDragMethod=NULL;
-    bEndDragChangesAttributes=FALSE;
-    bEndDragChangesGeoAndAttributes=FALSE;
-    bMouseIsUp=FALSE;
-    Clear(TRUE);
+    bEndDragChangesAttributes=sal_False;
+    bEndDragChangesGeoAndAttributes=sal_False;
+    bMouseIsUp=sal_False;
+    Clear(sal_True);
     aActionRect=Rectangle();
 }
 
@@ -115,7 +115,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt)
         long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx;
         long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy;
         if (dx>=long(nMinMov) || dy>=long(nMinMov))
-            bMinMoved=TRUE;
+            bMinMoved=sal_True;
     }
     return bMinMoved;
 }
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index f0d2ea7790..f0d2ea7790 100644..100755
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 6276dcbb4a..60c8d4eda0 100644..100755
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -38,7 +38,7 @@
 #include <tools/bigint.hxx>
 #include <vcl/svapp.hxx>
 
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -46,8 +46,8 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svddrgv.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -60,7 +60,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -69,7 +69,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdopath.hxx>
 #include <svx/polypolygoneditor.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
@@ -903,6 +903,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const
 
 bool SdrDragMovHdl::BeginSdrDrag()
 {
+    if( !GetDragHdl() )
+        return false;
+
     DragStat().Ref1()=GetDragHdl()->GetPos();
     DragStat().SetShown(!DragStat().IsShown());
     SdrHdlKind eKind=GetDragHdl()->GetKind();
@@ -932,7 +935,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
 {
     Point aPnt(rNoSnapPnt);
     
-    if (DragStat().CheckMinMoved(rNoSnapPnt)) 
+    if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt)) 
     {
         if (GetDragHdl()->GetKind()==HDL_MIRX) 
         {
@@ -1043,22 +1046,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
 
 bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/)
 {
-    switch (GetDragHdl()->GetKind()) 
+    if( GetDragHdl() )
     {
-        case HDL_REF1: 
-            Ref1()=DragStat().GetNow(); 
-            break;
+        switch (GetDragHdl()->GetKind()) 
+        {
+            case HDL_REF1: 
+                Ref1()=DragStat().GetNow(); 
+                break;
         
-        case HDL_REF2: 
-            Ref2()=DragStat().GetNow(); 
-            break;
+            case HDL_REF2: 
+                Ref2()=DragStat().GetNow(); 
+                break;
 
-        case HDL_MIRX: 
-            Ref1()+=DragStat().GetNow()-DragStat().GetStart();
-            Ref2()+=DragStat().GetNow()-DragStat().GetStart();
-            break;
+            case HDL_MIRX: 
+                Ref1()+=DragStat().GetNow()-DragStat().GetStart();
+                Ref2()+=DragStat().GetNow()-DragStat().GetStart();
+                break;
 
-        default: break;
+            default: break;
+        }
     }
 
     return true;
@@ -1067,7 +1073,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/)
 void SdrDragMovHdl::CancelSdrDrag()
 {
     Hide();
-    GetDragHdl()->SetPos(DragStat().GetRef1());
+
+    SdrHdl* pHdl = GetDragHdl();
+    if( pHdl )
+        pHdl->SetPos(DragStat().GetRef1());
+    
     SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX);
 
     if(pHM)
@@ -1576,13 +1586,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
         { // Klebepunkte aufs BoundRect des Obj limitieren
             aPt1-=DragStat().GetStart();
             const SdrMarkList& rML=GetMarkedObjectList();
-            ULONG nMarkAnz=rML.GetMarkCount();
+            sal_uLong nMarkAnz=rML.GetMarkCount();
         
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
+            for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
             {
                 const SdrMark* pM=rML.GetMark(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-                ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+                sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
             
                 if (nPtAnz!=0) 
                 {
@@ -1590,7 +1600,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
                     Rectangle aBound(pObj->GetCurrentBoundRect());
 
-                    for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) 
+                    for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++) 
                     {
                         sal_uInt16 nId=pPts->GetObject(nPtNum);
                         sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId);
@@ -1679,12 +1689,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
     Fraction aFact1(1,1);
     Point aStart(DragStat().GetStart());
     Point aRef(DragStat().GetRef1());
-    INT32 nXDiv(aStart.X() - aRef.X()); 
+    sal_Int32 nXDiv(aStart.X() - aRef.X()); 
     
     if(!nXDiv) 
         nXDiv = 1;
 
-    INT32 nYDiv(aStart.Y() - aRef.Y()); 
+    sal_Int32 nYDiv(aStart.Y() - aRef.Y()); 
     
     if(!nYDiv) 
         nYDiv = 1;
@@ -2021,7 +2031,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
     ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
     rStr.AppendAscii(" (");
     XubString aStr;
-    INT32 nTmpWink(NormAngle360(nWink));
+    sal_Int32 nTmpWink(NormAngle360(nWink));
     
     if(bRight && nWink) 
     {
@@ -2157,7 +2167,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
     ImpTakeDescriptionStr(STR_DragMethShear, rStr);
     rStr.AppendAscii(" (");
     
-    INT32 nTmpWink(nWink);
+    sal_Int32 nTmpWink(nWink);
     
     if(bUpSideDown) 
         nTmpWink += 18000;
@@ -2749,7 +2759,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
         rStr.AppendAscii(" (");
         
         XubString aStr;
-        INT32 nVal(nWink);
+        sal_Int32 nVal(nWink);
         
         if(bAtCenter) 
             nVal *= 2;
@@ -3344,9 +3354,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
                 if (bCopy) 
                     getSdrDragView().CopyMarkedObj();
 
-                ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
+                sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
                 
-                for (ULONG nm=0; nm<nMarkAnz; nm++) 
+                for (sal_uLong nm=0; nm<nMarkAnz; nm++) 
                 {
                     SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm);
                     SdrObject* pO=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index a6b090eb2d..40f13df9aa 100644..100755
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svddrgv.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -39,12 +39,12 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/svdoashp.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/polypolygoneditor.hxx>
@@ -69,34 +69,34 @@ using namespace sdr;
 
 void SdrDragView::ImpClearVars()
 {
-    bFramDrag=FALSE;
+    bFramDrag=sal_False;
     eDragMode=SDRDRAG_MOVE;
-    bDragLimit=FALSE;
-    bMarkedHitMovesAlways=FALSE;
+    bDragLimit=sal_False;
+    bMarkedHitMovesAlways=sal_False;
     eDragHdl=HDL_MOVE;
     pDragHdl=NULL;
-    bDragHdl=FALSE;
-    bDragSpecial=FALSE;
+    bDragHdl=sal_False;
+    bDragSpecial=sal_False;
     mpCurrentSdrDragMethod=NULL;
-    bDragStripes=FALSE;
-    bMirrRefDragObj=TRUE;
-    bDragWithCopy=FALSE;
+    bDragStripes=sal_False;
+    bMirrRefDragObj=sal_True;
+    bDragWithCopy=sal_False;
     pInsPointUndo=NULL;
-    bInsGluePoint=FALSE;
-    bInsObjPointMode=FALSE;
-    bInsGluePointMode=FALSE;
+    bInsGluePoint=sal_False;
+    bInsObjPointMode=sal_False;
+    bInsGluePointMode=sal_False;
     nDragXorPolyLimit=100;
     nDragXorPointLimit=500;
-    bNoDragXorPolys=FALSE;
-    bAutoVertexCon=TRUE;
-    bAutoCornerCon=FALSE;
-    bRubberEdgeDragging=TRUE;
+    bNoDragXorPolys=sal_False;
+    bAutoVertexCon=sal_True;
+    bAutoCornerCon=sal_False;
+    bRubberEdgeDragging=sal_True;
     nRubberEdgeDraggingLimit=100;
-    bDetailedEdgeDragging=TRUE;
+    bDetailedEdgeDragging=sal_True;
     nDetailedEdgeDraggingLimit=10;
-    bResizeAtCenter=FALSE;
-    bCrookAtCenter=FALSE;
-    bMouseHideWhileDraggingPoints=FALSE;
+    bResizeAtCenter=sal_False;
+    bCrookAtCenter=sal_False;
+    bMouseHideWhileDraggingPoints=sal_False;
 
     // init using default
     mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
@@ -123,7 +123,7 @@ void SdrDragView::ImpDelDragAttr()
 {
 }
 
-BOOL SdrDragView::IsAction() const
+sal_Bool SdrDragView::IsAction() const
 {
     return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction());
 }
@@ -141,7 +141,7 @@ void SdrDragView::EndAction()
 {
     if (mpCurrentSdrDragMethod)
     {
-        EndDragObj(FALSE);
+        EndDragObj(sal_False);
     }
     SdrExchangeView::EndAction();
 }
@@ -187,7 +187,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
+sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
 {
     Rectangle aR;
     TakeActionRect(aR);
@@ -200,8 +200,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
         if (pObj->ISA(SdrCaptionObj)) 
         {
             Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
-            BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
-            BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
+            sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
+            sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
             if (!bTail) 
             { // bei bTail liefert TakeActionRect schon das richtige
                 if (bOwn) 
@@ -217,30 +217,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
                 }
             }
         }
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
+sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
+sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
 {
     BrkAction();
 
     bool bRet=false;
     {
-        SetDragWithCopy(FALSE);
+        SetDragWithCopy(sal_False);
         //ForceEdgesOfMarkedNodes();
         //TODO: aAni.Reset();
         mpCurrentSdrDragMethod=NULL;
-        bDragSpecial=FALSE;
-        bDragLimit=FALSE;
+        bDragSpecial=sal_False;
+        bDragLimit=sal_False;
         SdrDragMode eTmpMode=eDragMode;
         if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
             eTmpMode=SDRDRAG_RESIZE;
@@ -250,7 +250,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
         if (!bFramDrag &&
             (pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
             (pHdl==NULL || pHdl->GetObj()==NULL)) {
-            bFramDrag=TRUE;
+            bFramDrag=sal_True;
         }
         
         Point aPnt(rPnt);
@@ -278,7 +278,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
         bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX;
 
         // #103894# Expand test for HDL_ANCHOR_TR
-        BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
+        sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
         
         if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth )
         {
@@ -300,18 +300,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         case HDL_UPPER: case HDL_LOWER: 
                         {
                             // Sind 3D-Objekte selektiert?
-                            BOOL b3DObjSelected = FALSE;
-                            for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
+                            sal_Bool b3DObjSelected = sal_False;
+                            for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
                             {
                                 SdrObject* pObj = GetMarkedObjectByIndex(a);
                                 if(pObj && pObj->ISA(E3dObject))
-                                    b3DObjSelected = TRUE;
+                                    b3DObjSelected = sal_True;
                             }
                             // Falls ja, Shear auch bei !IsShearAllowed zulassen,
                             // da es sich bei 3D-Objekten um eingeschraenkte
                             // Rotationen handelt
                             if (!b3DObjSelected && !IsShearAllowed())
-                                return FALSE;
+                                return sal_False;
                             mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
                         } break;
                         case HDL_UPLFT: case HDL_UPRGT:
@@ -319,12 +319,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         {
                             if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT) 
                             {
-                                if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE;
+                                if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragDistort(*this);
                             } 
                             else 
                             {
-                                if (!IsRotateAllowed(TRUE)) return FALSE;
+                                if (!IsRotateAllowed(sal_True)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragRotate(*this);
                             }
                         } break;
@@ -332,12 +332,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                         {
                             if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE) 
                             { // HDL_MOVE ist auch wenn Obj direkt getroffen
-                                if (!IsMoveAllowed()) return FALSE;
+                                if (!IsMoveAllowed()) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragMove(*this);
                             } 
                             else 
                             {
-                                if (!IsRotateAllowed(TRUE)) return FALSE;
+                                if (!IsRotateAllowed(sal_True)) return sal_False;
                                 mpCurrentSdrDragMethod = new SdrDragRotate(*this);
                             }
                         }
@@ -347,12 +347,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                 {
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) 
                     {
-                        if (!IsMoveAllowed()) return FALSE;
+                        if (!IsMoveAllowed()) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     } 
                     else 
                     {
-                        if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE;
+                        if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMirror(*this);
                     }
                 } break;
@@ -362,13 +362,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
                     {
                         if (!IsMoveAllowed())
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     }
                     else
                     {
-                        if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE))
-                            return FALSE;
+                        if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False))
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragCrop(*this);
                     }
                 }
@@ -379,15 +379,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) 
                     {
                         if(!IsMoveAllowed()) 
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     } 
                     else 
                     {
                         if(!IsTransparenceAllowed()) 
-                            return FALSE;
+                            return sal_False;
 
-                        mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE);
+                        mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False);
                     }
                     break;
                 } 
@@ -396,13 +396,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) 
                     {
                         if(!IsMoveAllowed()) 
-                            return FALSE;
+                            return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     } 
                     else 
                     {
                         if(!IsGradientAllowed()) 
-                            return FALSE;
+                            return sal_False;
 
                         mpCurrentSdrDragMethod = new SdrDragGradient(*this);
                     }
@@ -413,12 +413,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                 {
                     if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) 
                     {
-                        if (!IsMoveAllowed()) return FALSE;
+                        if (!IsMoveAllowed()) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     } 
                     else 
                     {
-                        if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE;
+                        if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False;
                         mpCurrentSdrDragMethod = new SdrDragCrook(*this);
                     }
                 } break;
@@ -428,7 +428,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     // SDRDRAG_MOVE
                     if((eDragHdl == HDL_MOVE) && !IsMoveAllowed())
                     {
-                        return FALSE;
+                        return sal_False;
                     }
                     else if(eDragHdl == HDL_GLUE)
                     {
@@ -444,9 +444,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                             }
                             else
                             {
-                                if(!IsResizeAllowed(TRUE)) 
+                                if(!IsResizeAllowed(sal_True)) 
                                 {
-                                    return FALSE;
+                                    return sal_False;
                                 }
 
                                 sal_Bool bSingleTextObjMark = sal_False;	// SJ: #i100490#
@@ -489,14 +489,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                                 {
                                     // #i77187# 
                                     // do not allow move of polygon points if object is move or size protected
-                                    return FALSE;
+                                    return sal_False;
                                 }
                             }
 
                             if(!mpCurrentSdrDragMethod)
                             {
                                 // fallback to DragSpecial if no interaction defined
-                                bDragSpecial = TRUE;
+                                bDragSpecial = sal_True;
                                 mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
                             }
                         }
@@ -520,12 +520,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                     // Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen
                     delete mpCurrentSdrDragMethod;
                     mpCurrentSdrDragMethod = 0;
-                    bDragSpecial=FALSE;
+                    bDragSpecial=sal_False;
 
                     if (!IsMoveAllowed()) 
-                        return FALSE;
+                        return sal_False;
                     
-                    bFramDrag=TRUE;
+                    bFramDrag=sal_True;
                     mpCurrentSdrDragMethod = new SdrDragMove(*this);
                     aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
                     bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -553,14 +553,14 @@ void SdrDragView::MovDragObj(const Point& rPnt)
     }
 }
 
-BOOL SdrDragView::EndDragObj(BOOL bCopy)
+sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
 {
     bool bRet(false);
     
     // #i73341# If insert GluePoint, do not insist on last points being different
     if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev())) 
     {
-        ULONG nHdlAnzMerk=0;
+        sal_uIntPtr nHdlAnzMerk=0;
 
         if (bEliminatePolyPoints) 
         { // IBM Special
@@ -593,7 +593,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
         if (bInsPolyPoint) 
         {
             SetMarkHandles();
-            bInsPolyPoint=FALSE;
+            bInsPolyPoint=sal_False;
             if( bUndo )
             {
                 BegUndo(aInsPointUndoStr);
@@ -619,8 +619,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
         BrkDragObj();
     }
 
-    bInsPolyPoint=FALSE;
-    SetInsertGluePoint(FALSE);
+    bInsPolyPoint=sal_False;
+    SetInsertGluePoint(sal_False);
 
     return bRet;
 }
@@ -640,7 +640,7 @@ void SdrDragView::BrkDragObj()
             delete pInsPointUndo;
             pInsPointUndo=NULL;
             SetMarkHandles();
-            bInsPolyPoint=FALSE;
+            bInsPolyPoint=sal_False;
         }
 
         if (IsInsertGluePoint()) 
@@ -648,7 +648,7 @@ void SdrDragView::BrkDragObj()
             pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus
             delete pInsPointUndo;
             pInsPointUndo=NULL;
-            SetInsertGluePoint(FALSE);
+            SetInsertGluePoint(sal_False);
         }
 
         eDragHdl=HDL_MOVE;
@@ -656,7 +656,7 @@ void SdrDragView::BrkDragObj()
     }
 }
 
-BOOL SdrDragView::IsInsObjPointPossible() const
+sal_Bool SdrDragView::IsInsObjPointPossible() const
 {
     return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
 }
@@ -732,51 +732,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
     return bRet;
 }
 
-BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
+sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
 {
     if(IsInsObjPoint()) 
     {
         sal_uInt32 nNextPnt(mnInsPointNum);
         Point aPnt(aDragStat.GetNow());
-        BOOL bOk=EndDragObj(FALSE);
-        if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND) 
+        sal_Bool bOk=EndDragObj(sal_False);
+        if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND) 
         {
             // Ret=True bedeutet: Action ist vorbei.
             bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
         }
 
         return bOk;
-    } else return FALSE;
+    } else return sal_False;
 }
 
-BOOL SdrDragView::IsInsGluePointPossible() const
+sal_Bool SdrDragView::IsInsGluePointPossible() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (IsInsGluePointMode() && AreObjectsMarked()) 
     {
         if (GetMarkedObjectCount()==1) 
         {
-            // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist.
+            // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist.
             const SdrObject* pObj=GetMarkedObjectByIndex(0);
             if (!HAS_BASE(SdrEdgeObj,pObj)) 
             {
-               bRet=TRUE;
+               bRet=sal_True;
             }
         } 
         else 
         {
-            bRet=TRUE;
+            bRet=sal_True;
         }
     }
     return bRet;
 }
 
-BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
+sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrObject* pObj;
     SdrPageView* pPV;
-    ULONG nMarkNum;
+    sal_uIntPtr nMarkNum;
     if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND)) 
     {
         BrkAction();
@@ -792,9 +792,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
         SdrGluePointList* pGPL=pObj->ForceGluePointList();
         if (pGPL!=NULL) 
         {
-            USHORT nGlueIdx=pGPL->Insert(SdrGluePoint());
+            sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint());
             SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
-            USHORT nGlueId=rGP.GetId();
+            sal_uInt16 nGlueId=rGP.GetId();
             rGP.SetAbsolutePos(rPnt,*pObj);
 
             SdrHdl* pHdl=NULL;
@@ -804,7 +804,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
             }
             if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) 
             {
-                SetInsertGluePoint(TRUE);
+                SetInsertGluePoint(sal_True);
                 bRet=BegDragObj(rPnt,NULL,pHdl,0);
                 if (bRet) 
                 {
@@ -813,7 +813,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
                 } 
                 else 
                 {
-                    SetInsertGluePoint(FALSE);
+                    SetInsertGluePoint(sal_False);
                     delete pInsPointUndo;
                     pInsPointUndo=NULL;
                 }
@@ -826,7 +826,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
         else 
         {
             // Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge)
-            SetInsertGluePoint(FALSE);
+            SetInsertGluePoint(sal_False);
             delete pInsPointUndo;
             pInsPointUndo=NULL;
         }
@@ -853,7 +853,7 @@ void SdrDragView::ShowDragObj()
             }
         }
 
-        aDragStat.SetShown(TRUE);
+        aDragStat.SetShown(sal_True);
     }
 }
 
@@ -862,13 +862,13 @@ void SdrDragView::HideDragObj()
     if(mpCurrentSdrDragMethod && aDragStat.IsShown())
     {
         mpCurrentSdrDragMethod->destroyOverlayGeometry();
-        aDragStat.SetShown(FALSE);
+        aDragStat.SetShown(sal_False);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrDragView::SetNoDragXorPolys(BOOL bOn)
+void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
 {
     if (IsNoDragXorPolys()!=bOn) 
     {
@@ -895,7 +895,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn)
     }
 }
 
-void SdrDragView::SetDragStripes(BOOL bOn)
+void SdrDragView::SetDragStripes(sal_Bool bOn)
 {
     if (mpCurrentSdrDragMethod && aDragStat.IsShown()) 
     {
@@ -909,24 +909,24 @@ void SdrDragView::SetDragStripes(BOOL bOn)
     }
 }
 
-BOOL SdrDragView::IsOrthoDesired() const
+sal_Bool SdrDragView::IsOrthoDesired() const
 {
     if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod)))
     {
         return bOrthoDesiredOnMarked;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
+void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn)
 {
     if (bOn!=IsRubberEdgeDragging()) 
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
                  (nRubberEdgeDraggingLimit>=nAnz);
         if (bShowHide) 
             HideDragObj();
@@ -936,12 +936,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
     }
 }
 
-void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
 {
     if (nEdgeObjAnz!=nRubberEdgeDraggingLimit) 
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
                  (nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz);
         if (bShowHide) 
             HideDragObj();
@@ -951,12 +951,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
     }
 }
 
-void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
+void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn)
 {
     if (bOn!=IsDetailedEdgeDragging()) 
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
                  (nDetailedEdgeDraggingLimit>=nAnz);
         if (bShowHide) 
             HideDragObj();
@@ -966,12 +966,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
     }
 }
 
-void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
 {
     if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit) 
     {
-        ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-        BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
+        sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+        sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
                  (nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz);
         if (bShowHide) 
             HideDragObj();
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 023f20b16c..fc93378982 100644..100755
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -41,8 +41,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>  // fuer die PolyPossiblities
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/e3dsceneupdater.hxx>
 
 // #i13033#
@@ -64,55 +64,55 @@
 
 void SdrEditView::ImpResetPossibilityFlags()
 {
-    bReadOnly               =FALSE;
-
-    bGroupPossible          =FALSE;
-    bUnGroupPossible        =FALSE;
-    bGrpEnterPossible       =FALSE;
-    bDeletePossible         =FALSE;
-    bToTopPossible          =FALSE;
-    bToBtmPossible          =FALSE;
-    bReverseOrderPossible   =FALSE;
-
-    bImportMtfPossible      =FALSE;
-    bCombinePossible        =FALSE;
-    bDismantlePossible      =FALSE;
-    bCombineNoPolyPolyPossible =FALSE;
-    bDismantleMakeLinesPossible=FALSE;
-    bOrthoDesiredOnMarked   =FALSE;
-
-    bMoreThanOneNotMovable  =FALSE;
-    bOneOrMoreMovable       =FALSE;
-    bMoreThanOneNoMovRot    =FALSE;
-    bContortionPossible     =FALSE;
-    bAllPolys               =FALSE;
-    bOneOrMorePolys         =FALSE;
-    bMoveAllowed            =FALSE;
-    bResizeFreeAllowed      =FALSE;
-    bResizePropAllowed      =FALSE;
-    bRotateFreeAllowed      =FALSE;
-    bRotate90Allowed        =FALSE;
-    bMirrorFreeAllowed      =FALSE;
-    bMirror45Allowed        =FALSE;
-    bMirror90Allowed        =FALSE;
-    bTransparenceAllowed	=FALSE;
-    bGradientAllowed		=FALSE;
-    bShearAllowed           =FALSE;
-    bEdgeRadiusAllowed		=FALSE;
-    bCanConvToPath          =FALSE;
-    bCanConvToPoly          =FALSE;
-    bCanConvToContour		=FALSE;
-    bCanConvToPathLineToArea=FALSE;
-    bCanConvToPolyLineToArea=FALSE;
-    bMoveProtect            =FALSE;
-    bResizeProtect          =FALSE;
+    bReadOnly               =sal_False;
+
+    bGroupPossible          =sal_False;
+    bUnGroupPossible        =sal_False;
+    bGrpEnterPossible       =sal_False;
+    bDeletePossible         =sal_False;
+    bToTopPossible          =sal_False;
+    bToBtmPossible          =sal_False;
+    bReverseOrderPossible   =sal_False;
+
+    bImportMtfPossible      =sal_False;
+    bCombinePossible        =sal_False;
+    bDismantlePossible      =sal_False;
+    bCombineNoPolyPolyPossible =sal_False;
+    bDismantleMakeLinesPossible=sal_False;
+    bOrthoDesiredOnMarked   =sal_False;
+
+    bMoreThanOneNotMovable  =sal_False;
+    bOneOrMoreMovable       =sal_False;
+    bMoreThanOneNoMovRot    =sal_False;
+    bContortionPossible     =sal_False;
+    bAllPolys               =sal_False;
+    bOneOrMorePolys         =sal_False;
+    bMoveAllowed            =sal_False;
+    bResizeFreeAllowed      =sal_False;
+    bResizePropAllowed      =sal_False;
+    bRotateFreeAllowed      =sal_False;
+    bRotate90Allowed        =sal_False;
+    bMirrorFreeAllowed      =sal_False;
+    bMirror45Allowed        =sal_False;
+    bMirror90Allowed        =sal_False;
+    bTransparenceAllowed	=sal_False;
+    bGradientAllowed		=sal_False;
+    bShearAllowed           =sal_False;
+    bEdgeRadiusAllowed		=sal_False;
+    bCanConvToPath          =sal_False;
+    bCanConvToPoly          =sal_False;
+    bCanConvToContour		=sal_False;
+    bCanConvToPathLineToArea=sal_False;
+    bCanConvToPolyLineToArea=sal_False;
+    bMoveProtect            =sal_False;
+    bResizeProtect          =sal_False;
 }
 
 void SdrEditView::ImpClearVars()
 {
     ImpResetPossibilityFlags();
-    bPossibilitiesDirty=TRUE;   // << war von Purify angemeckert
-    bBundleVirtObj=FALSE;
+    bPossibilitiesDirty=sal_True;   // << war von Purify angemeckert
+    bBundleVirtObj=sal_False;
 }
 
 SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -127,10 +127,10 @@ SdrEditView::~SdrEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos)
 {
     SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
-    USHORT nMax=rLA.GetLayerCount();
+    sal_uInt16 nMax=rLA.GetLayerCount();
     if (nPos>nMax) nPos=nMax;
     SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos);
 
@@ -144,7 +144,7 @@ SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
 #include <svx/svdogrp.hxx>
 #include <svx/scene3d.hxx>
 
-BOOL SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
+sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
 {
     sal_Bool bDelAll(sal_True);
     sal_uInt32 nObjAnz(pOL->GetObjCount());
@@ -225,7 +225,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
 void SdrEditView::DeleteLayer(const XubString& rName)
 {
     SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
-    SdrLayer* pLayer = rLA.GetLayer(rName, TRUE);
+    SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);
     sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
 
     if(SDRLAYER_NOTFOUND != nLayerNum)
@@ -307,11 +307,11 @@ void SdrEditView::DeleteLayer(const XubString& rName)
     }
 }
 
-void SdrEditView::MoveLayer(const XubString& rName, USHORT nNewPos)
+void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos)
 {
     SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
-    SdrLayer* pLayer=rLA.GetLayer(rName,TRUE);
-    USHORT nLayerNum=rLA.GetLayerPos(pLayer);
+    SdrLayer* pLayer=rLA.GetLayer(rName,sal_True);
+    sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer);
     if (nLayerNum!=SDRLAYER_NOTFOUND) 
     {
         if( IsUndoEnabled() )
@@ -383,8 +383,8 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
         }
     }
 
-    ULONG nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
-    USHORT i;
+    sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
+    sal_uInt16 i;
 
     for (i=0; i<nMarkedEdgeAnz; i++) {
         SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i);
@@ -409,95 +409,95 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
 void SdrEditView::MarkListHasChanged()
 {
     SdrMarkView::MarkListHasChanged();
-    bPossibilitiesDirty=TRUE;
+    bPossibilitiesDirty=sal_True;
 }
 
 void SdrEditView::ModelHasChanged()
 {
     SdrMarkView::ModelHasChanged();
-    bPossibilitiesDirty=TRUE;
+    bPossibilitiesDirty=sal_True;
 }
 
-BOOL SdrEditView::IsResizeAllowed(BOOL bProp) const
+sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const
 {
     ForcePossibilities();
-    if (bResizeProtect) return FALSE;
+    if (bResizeProtect) return sal_False;
     if (bProp) return bResizePropAllowed;
     return bResizeFreeAllowed;
 }
 
-BOOL SdrEditView::IsRotateAllowed(BOOL b90Deg) const
+sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const
 {
     ForcePossibilities();
-    if (bMoveProtect) return FALSE;
+    if (bMoveProtect) return sal_False;
     if (b90Deg) return bRotate90Allowed;
     return bRotateFreeAllowed;
 }
 
-BOOL SdrEditView::IsMirrorAllowed(BOOL b45Deg, BOOL b90Deg) const
+sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const
 {
     ForcePossibilities();
-    if (bMoveProtect) return FALSE;
+    if (bMoveProtect) return sal_False;
     if (b90Deg) return bMirror90Allowed;
     if (b45Deg) return bMirror45Allowed;
     return bMirrorFreeAllowed && !bMoveProtect;
 }
 
-BOOL SdrEditView::IsTransparenceAllowed() const
+sal_Bool SdrEditView::IsTransparenceAllowed() const
 {
     ForcePossibilities();
     return bTransparenceAllowed;
 }
 
-BOOL SdrEditView::IsGradientAllowed() const
+sal_Bool SdrEditView::IsGradientAllowed() const
 {
     ForcePossibilities();
     return bGradientAllowed;
 }
 
-BOOL SdrEditView::IsShearAllowed() const
+sal_Bool SdrEditView::IsShearAllowed() const
 {
     ForcePossibilities();
-    if (bResizeProtect) return FALSE;
+    if (bResizeProtect) return sal_False;
     return bShearAllowed;
 }
 
-BOOL SdrEditView::IsEdgeRadiusAllowed() const
+sal_Bool SdrEditView::IsEdgeRadiusAllowed() const
 {
     ForcePossibilities();
     return bEdgeRadiusAllowed;
 }
 
-BOOL SdrEditView::IsCrookAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const
 {
     // CrookMode fehlt hier (weil kein Rotate bei Shear ...)
     ForcePossibilities();
     if (bNoContortion) {
-        if (!bRotateFreeAllowed) return FALSE; // Crook is nich
+        if (!bRotateFreeAllowed) return sal_False; // Crook is nich
         return !bMoveProtect && bMoveAllowed;
     } else {
         return !bResizeProtect && bContortionPossible;
     }
 }
 
-BOOL SdrEditView::IsDistortAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const
 {
     ForcePossibilities();
     if (bNoContortion) {
-        return FALSE;
+        return sal_False;
     } else {
         return !bResizeProtect && bContortionPossible;
     }
 }
 
-BOOL SdrEditView::IsCombinePossible(BOOL bNoPolyPoly) const
+sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const
 {
     ForcePossibilities();
     if (bNoPolyPoly) return bCombineNoPolyPolyPossible;
     else return bCombinePossible;
 }
 
-BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
+sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const
 {
     ForcePossibilities();
     if (bMakeLines) return bDismantleMakeLinesPossible;
@@ -506,7 +506,7 @@ BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
 
 void SdrEditView::CheckPossibilities()
 {
-    if (bSomeObjChgdFlag) bPossibilitiesDirty=TRUE;
+    if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True;
 
     if(bSomeObjChgdFlag)
     {
@@ -519,11 +519,11 @@ void SdrEditView::CheckPossibilities()
     if (bPossibilitiesDirty) {
         ImpResetPossibilityFlags();
         SortMarkedObjects();
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz!=0) {
             bReverseOrderPossible=nMarkAnz>=2;
 
-            ULONG nMovableCount=0;
+            sal_uIntPtr nMovableCount=0;
             bGroupPossible=nMarkAnz>=2;
             bCombinePossible=nMarkAnz>=2;
             if (nMarkAnz==1) {
@@ -531,27 +531,27 @@ void SdrEditView::CheckPossibilities()
                 // fehlt noch ...
                 const SdrObject* pObj=GetMarkedObjectByIndex(0);
                 //const SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
-                BOOL bGroup=pObj->GetSubList()!=NULL;
-                BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL;
+                sal_Bool bGroup=pObj->GetSubList()!=NULL;
+                sal_Bool bHasText=pObj->GetOutlinerParaObject()!=NULL;
                 if (bGroup || bHasText) {
-                    bCombinePossible=TRUE;
+                    bCombinePossible=sal_True;
                 } 
             }
             bCombineNoPolyPolyPossible=bCombinePossible;
-            bDeletePossible=TRUE;
+            bDeletePossible=sal_True;
             // Zu den Transformationen erstmal ja sagen
-            bMoveAllowed      =TRUE;
-            bResizeFreeAllowed=TRUE;
-            bResizePropAllowed=TRUE;
-            bRotateFreeAllowed=TRUE;
-            bRotate90Allowed  =TRUE;
-            bMirrorFreeAllowed=TRUE;
-            bMirror45Allowed  =TRUE;
-            bMirror90Allowed  =TRUE;
-            bShearAllowed     =TRUE;
-            bEdgeRadiusAllowed=FALSE;
-            bContortionPossible=TRUE;
-            bCanConvToContour = TRUE;
+            bMoveAllowed      =sal_True;
+            bResizeFreeAllowed=sal_True;
+            bResizePropAllowed=sal_True;
+            bRotateFreeAllowed=sal_True;
+            bRotate90Allowed  =sal_True;
+            bMirrorFreeAllowed=sal_True;
+            bMirror45Allowed  =sal_True;
+            bMirror90Allowed  =sal_True;
+            bShearAllowed     =sal_True;
+            bEdgeRadiusAllowed=sal_False;
+            bContortionPossible=sal_True;
+            bCanConvToContour = sal_True;
 
             // these ones are only allowed when single object is selected
             bTransparenceAllowed = (nMarkAnz == 1);
@@ -564,7 +564,7 @@ void SdrEditView::CheckPossibilities()
 
                 // maybe group object, so get merged ItemSet
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
-                SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, FALSE);
+                SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False);
 
                 if(SFX_ITEM_DONTCARE != eState)
                 {
@@ -573,67 +573,67 @@ void SdrEditView::CheckPossibilities()
 
                     if(eFillStyle != XFILL_GRADIENT)
                     {
-                        bGradientAllowed = FALSE;
+                        bGradientAllowed = sal_False;
                     }
                 }
             }
 
-            BOOL bNoMovRotFound=FALSE;
+            sal_Bool bNoMovRotFound=sal_False;
             const SdrPageView* pPV0=NULL;
 
-            for (ULONG nm=0; nm<nMarkAnz; nm++) {
+            for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nm);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 const SdrPageView* pPV=pM->GetPageView();
                 if (pPV!=pPV0) {
-                    if (pPV->IsReadOnly()) bReadOnly=TRUE;
+                    if (pPV->IsReadOnly()) bReadOnly=sal_True;
                     pPV0=pPV;
                 }
 
                 SdrObjTransformInfoRec aInfo;
                 pObj->TakeObjInfo(aInfo);
-                BOOL bMovPrt=pObj->IsMoveProtect();
-                BOOL bSizPrt=pObj->IsResizeProtect();
+                sal_Bool bMovPrt=pObj->IsMoveProtect();
+                sal_Bool bSizPrt=pObj->IsResizeProtect();
                 if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // Menge der MovableObjs zaehlen
-                if (bMovPrt) bMoveProtect=TRUE;
-                if (bSizPrt) bResizeProtect=TRUE;
+                if (bMovPrt) bMoveProtect=sal_True;
+                if (bSizPrt) bResizeProtect=sal_True;
 
                 // not allowed when not allowed at one object
                 if(!aInfo.bTransparenceAllowed)
-                    bTransparenceAllowed = FALSE;
+                    bTransparenceAllowed = sal_False;
 
                 // Wenn einer was nicht kann, duerfen's alle nicht
-                if (!aInfo.bMoveAllowed      ) bMoveAllowed      =FALSE;
-                if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=FALSE;
-                if (!aInfo.bResizePropAllowed) bResizePropAllowed=FALSE;
-                if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=FALSE;
-                if (!aInfo.bRotate90Allowed  ) bRotate90Allowed  =FALSE;
-                if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=FALSE;
-                if (!aInfo.bMirror45Allowed  ) bMirror45Allowed  =FALSE;
-                if (!aInfo.bMirror90Allowed  ) bMirror90Allowed  =FALSE;
-                if (!aInfo.bShearAllowed     ) bShearAllowed     =FALSE;
-                if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=TRUE;
-                if (aInfo.bNoContortion      ) bContortionPossible=FALSE;
+                if (!aInfo.bMoveAllowed      ) bMoveAllowed      =sal_False;
+                if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False;
+                if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False;
+                if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False;
+                if (!aInfo.bRotate90Allowed  ) bRotate90Allowed  =sal_False;
+                if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False;
+                if (!aInfo.bMirror45Allowed  ) bMirror45Allowed  =sal_False;
+                if (!aInfo.bMirror90Allowed  ) bMirror90Allowed  =sal_False;
+                if (!aInfo.bShearAllowed     ) bShearAllowed     =sal_False;
+                if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True;
+                if (aInfo.bNoContortion      ) bContortionPossible=sal_False;
                 // Fuer Crook mit Contortion: Alle Objekte muessen
                 // Movable und Rotatable sein, ausser maximal 1
                 if (!bMoreThanOneNoMovRot) {
                     if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) {
                         bMoreThanOneNoMovRot=bNoMovRotFound;
-                        bNoMovRotFound=TRUE;
+                        bNoMovRotFound=sal_True;
                     }
                 }
 
                 // when one member cannot be converted, no conversion is possible
                 if(!aInfo.bCanConvToContour)
-                    bCanConvToContour = FALSE;
+                    bCanConvToContour = sal_False;
 
                 // Ungroup
                 if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL;
                 // ConvertToCurve: Wenn mind. einer konvertiert werden kann ist das ok.
-                if (aInfo.bCanConvToPath          ) bCanConvToPath          =TRUE;
-                if (aInfo.bCanConvToPoly          ) bCanConvToPoly          =TRUE;
-                if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE;
-                if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE;
+                if (aInfo.bCanConvToPath          ) bCanConvToPath          =sal_True;
+                if (aInfo.bCanConvToPoly          ) bCanConvToPoly          =sal_True;
+                if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True;
+                if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True;
                 
                 // Combine/Dismantle
                 if(bCombinePossible) 
@@ -645,15 +645,15 @@ void SdrEditView::CheckPossibilities()
                 if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
                 if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
                 // OrthoDesiredOnMarked checken
-                if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE;
+                if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True;
                 // ImportMtf checken
 
                 if (!bImportMtfPossible) {
-                    BOOL bGraf=HAS_BASE(SdrGrafObj,pObj);
-                    BOOL bOle2=HAS_BASE(SdrOle2Obj,pObj);
+                    sal_Bool bGraf=HAS_BASE(SdrGrafObj,pObj);
+                    sal_Bool bOle2=HAS_BASE(SdrOle2Obj,pObj);
 
                     if( bGraf && ((SdrGrafObj*)pObj)->HasGDIMetaFile() && !((SdrGrafObj*)pObj)->IsEPS() )
-                        bImportMtfPossible = TRUE;
+                        bImportMtfPossible = sal_True;
 
                     if (bOle2)
                         bImportMtfPossible=((SdrOle2Obj*)pObj)->GetObjRef().is();
@@ -666,12 +666,12 @@ void SdrEditView::CheckPossibilities()
         }
         ImpCheckToTopBtmPossible();
         ((SdrPolyEditView*)this)->ImpCheckPolyPossibilities();
-        bPossibilitiesDirty=FALSE;
+        bPossibilitiesDirty=sal_False;
 
         if (bReadOnly) {
-            BOOL bMerker1=bGrpEnterPossible;
+            sal_Bool bMerker1=bGrpEnterPossible;
             ImpResetPossibilityFlags();
-            bReadOnly=TRUE;
+            bReadOnly=sal_True;
             bGrpEnterPossible=bMerker1;
         }
         if (bMoveAllowed) {
@@ -681,9 +681,9 @@ void SdrEditView::CheckPossibilities()
                 SdrObject* pObj=GetMarkedObjectByIndex(0);
                 SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
                 if (pEdge!=NULL) {
-                    SdrObject* pNode1=pEdge->GetConnectedNode(TRUE);
-                    SdrObject* pNode2=pEdge->GetConnectedNode(FALSE);
-                    if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=FALSE;
+                    SdrObject* pNode1=pEdge->GetConnectedNode(sal_True);
+                    SdrObject* pNode2=pEdge->GetConnectedNode(sal_False);
+                    if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False;
                 }
             }
         }
@@ -694,14 +694,14 @@ void SdrEditView::CheckPossibilities()
 
 void SdrEditView::ForceMarkedObjToAnotherPage()
 {
-    BOOL bFlg=FALSE;
-    for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+    sal_Bool bFlg=sal_False;
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         Rectangle aObjRect(pObj->GetCurrentBoundRect());
         Rectangle aPgRect(pM->GetPageView()->GetPageRect());
         if (!aObjRect.IsOver(aPgRect)) {
-            BOOL bFnd=FALSE;
+            sal_Bool bFnd=sal_False;
             SdrPageView* pPV = GetSdrPageView();
 
             if(pPV)
@@ -716,7 +716,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
                 pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason);
                 pM->SetPageView(pPV);
                 InvalidateAllWin(aObjRect);
-                bFlg=TRUE;
+                bFlg=sal_True;
             }
         }
     }
@@ -923,8 +923,8 @@ void SdrEditView::CopyMarkedObj()
     SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList());
     // Folgende Schleife Anstatt MarkList::Merge(), damit
     // ich jeweils mein Flag an die MarkEntries setzen kann.
-    ULONG nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
-    for (ULONG nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
+    sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+    for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
         SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum));
         aM.SetUser(1);
         aSourceObjectsForCopy.InsertEntry(aM);
@@ -938,9 +938,9 @@ void SdrEditView::CopyMarkedObj()
     const bool bUndo = IsUndoEnabled();
 
     GetMarkedObjectListWriteAccess().Clear();
-    ULONG nCloneErrCnt=0;
-    ULONG nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
-    ULONG nm;
+    sal_uIntPtr nCloneErrCnt=0;
+    sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
+    sal_uIntPtr nm;
     for (nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=aSourceObjectsForCopy.GetMark(nm);
         SdrObject* pO=pM->GetMarkedSdrObj()->Clone();
@@ -994,14 +994,14 @@ void SdrEditView::CopyMarkedObj()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
+sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
 {
     if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
-        SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+        SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
         if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
         if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
             SdrObject::Free( pObj ); // Layer gesperrt oder nicht sichtbar
-            return FALSE;
+            return sal_False;
         }
         pObj->NbcSetLayer(nLayer);
     }
@@ -1024,10 +1024,10 @@ BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nO
         if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj();
         MarkObj(pObj,&rPV);
     }
-    return TRUE;
+    return sal_True;
 }
 
-void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark)
+void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark)
 {
     SdrObjList* pOL=pOldObj->GetObjList();
     const bool bUndo = IsUndoEnabled();
@@ -1035,7 +1035,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));
 
     if( IsObjMarked( pOldObj ) )
-        MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ );
+        MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ );
 
     pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum());
             
@@ -1047,46 +1047,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef WIN
-void SdrEditView::BegUndo()             // Undo-Klammerung auf
-{
-    pMod->BegUndo();
-}
-
-void SdrEditView::BegUndo(const String& rComment) // Undo-Klammerung auf
-{
-    pMod->BegUndo(rComment);
-}
-
-void SdrEditView::BegUndo(const String& rComment, const String& rObjDescr,
-        SdrRepeatFunc eFunc) // Undo-Klammerung auf
-{
-    pMod->BegUndo(rComment,rObjDescr,eFunc);
-}
-
-void SdrEditView::BegUndo(SdrUndoGroup* pUndoGrp) // Undo-Klammerung auf
-{
-    pMod->BegUndo(pUndoGrp);
-}
-
-void SdrEditView::AddUndo(SdrUndoAction* pUndo)   // Action hinzufuegen
-{
-    pMod->AddUndo(pUndo);
-}
-    // nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
-void SdrEditView::SetUndoComment(const String& rComment)
-{
-    pMod->SetUndoComment(rComment);
-}
-
-
-void SdrEditView::SetUndoComment(const String& rComment,
-                                const String& rObjDescr)
-{
-    pMod->SetUndoComment(rComment,rObjDescr);
-}
-#endif
-
 bool SdrEditView::IsUndoEnabled() const
 {
     return pMod->IsUndoEnabled();
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 816ec0a169..ca170aecfd 100644..100755
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -41,8 +41,8 @@
 #include <svx/rectenum.hxx>
 #include <svx/svxids.hrc>   // fuer SID_ATTR_TRANSFORM_...
 #include <svx/svdattr.hxx>  // fuer Get/SetGeoAttr
-#include "svditext.hxx"
-#include "svditer.hxx"
+#include "svx/svditext.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdpage.hxx>
@@ -51,8 +51,8 @@
 #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr
 #include <svx/svdetc.hxx>   // fuer SearchOutlinerItems
 #include <svx/svdopath.hxx>  // fuer Crook
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <editeng/eeitem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
@@ -77,11 +77,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
+void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
 {
     DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn");
     if (rRect.IsEmpty()) return;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz==0) return;
     Rectangle aR0(GetMarkedObjRect());
     DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer");
@@ -106,7 +106,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
     if (bCopy)
         CopyMarkedObj();
 
-    for (ULONG nm=0; nm<nAnz; nm++)
+    for (sal_uIntPtr nm=0; nm<nAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -204,8 +204,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
     if (bCopy)
         CopyMarkedObj();
     
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -237,8 +237,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -257,17 +257,17 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
 
 long SdrEditView::GetMarkedObjRotate() const
 {
-    BOOL b1st=TRUE;
-    BOOL bOk=TRUE;
+    sal_Bool b1st=sal_True;
+    sal_Bool bOk=sal_True;
     long nWink=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         long nWink2=pO->GetRotateAngle();
         if (b1st) nWink=nWink2;
-        else if (nWink2!=nWink) bOk=FALSE;
-        b1st=FALSE;
+        else if (nWink2!=nWink) bOk=sal_False;
+        b1st=sal_False;
     }
     if (!bOk) nWink=0;
     return nWink;
@@ -390,7 +390,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
         EndUndo();
 }
 
-void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy)
 {
     Point aCenter(GetMarkedObjRect().Center());
     Point aPt2(aCenter);
@@ -398,7 +398,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
     MirrorMarkedObj(aCenter,aPt2,bCopy);
 }
 
-void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy)
 {
     Point aCenter(GetMarkedObjRect().Center());
     Point aPt2(aCenter);
@@ -408,17 +408,17 @@ void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
 
 long SdrEditView::GetMarkedObjShear() const
 {
-    BOOL b1st=TRUE;
-    BOOL bOk=TRUE;
+    sal_Bool b1st=sal_True;
+    sal_Bool bOk=sal_True;
     long nWink=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         long nWink2=pO->GetShearAngle();
         if (b1st) nWink=nWink2;
-        else if (nWink2!=nWink) bOk=FALSE;
-        b1st=FALSE;
+        else if (nWink2!=nWink) bOk=sal_False;
+        b1st=sal_False;
     }
     if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR;
     if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR;
@@ -443,8 +443,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
         CopyMarkedObj();
 
     double nTan=tan(nWink*nPi180);
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -462,10 +462,10 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
 }
 
 void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad,
-    SdrCrookMode eMode, BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect)
+    SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect)
 {
     SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO);
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     if(pPath!=NULL && !bNoContortion)
     {
@@ -476,7 +476,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
             case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
         } // switch
         pPath->SetPathPoly(aXPP.getB2DPolyPolygon());
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount())
@@ -506,7 +506,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
             pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum);
         }
 
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     if(!bDone)
@@ -545,7 +545,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     Rectangle aMarkRect(GetMarkedObjRect());
     const bool bUndo = IsUndoEnabled();
 
-    bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(FALSE);
+    bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False);
 
     if( bUndo )
     {
@@ -559,8 +559,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -583,7 +583,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
         EndUndo();
 }
 
-void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion)
+void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion)
 {
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO);
 
@@ -633,8 +633,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
     if (bCopy)
         CopyMarkedObj();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -660,47 +660,47 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
 {
     // bReplaceAll hat hier keinerlei Wirkung
     Rectangle aAllSnapRect(GetMarkedObjRect());
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
         SetRef1(Point(n,GetRef1().Y()));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
         SetRef1(Point(GetRef1().X(),n));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
         SetRef2(Point(n,GetRef2().Y()));
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
         SetRef2(Point(GetRef2().X(),n));
     }
-    long nAllPosX=0; BOOL bAllPosX=FALSE;
-    long nAllPosY=0; BOOL bAllPosY=FALSE;
-    long nAllWdt=0;  BOOL bAllWdt=FALSE;
-    long nAllHgt=0;  BOOL bAllHgt=FALSE;
-    BOOL bDoIt=FALSE;
-    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    long nAllPosX=0; sal_Bool bAllPosX=sal_False;
+    long nAllPosY=0; sal_Bool bAllPosY=sal_False;
+    long nAllWdt=0;  sal_Bool bAllWdt=sal_False;
+    long nAllHgt=0;  sal_Bool bAllHgt=sal_False;
+    sal_Bool bDoIt=sal_False;
+    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue();
-        bAllPosX=TRUE; bDoIt=TRUE;
+        bAllPosX=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue();
-        bAllPosY=TRUE; bDoIt=TRUE;
+        bAllPosY=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue();
-        bAllWdt=TRUE; bDoIt=TRUE;
+        bAllWdt=sal_True; bDoIt=sal_True;
     }
-    if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue();
-        bAllHgt=TRUE; bDoIt=TRUE;
+        bAllHgt=sal_True; bDoIt=sal_True;
     }
     if (bDoIt) {
         Rectangle aRect(aAllSnapRect); // !!! fuer PolyPt's und GluePt's aber bitte noch aendern !!!
@@ -710,32 +710,32 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
         if (bAllHgt)  aRect.Bottom()=aAllSnapRect.Top()+nAllHgt;
         SetMarkedObjRect(aRect);
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEXALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue();
         ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1));
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEYALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue();
         ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact);
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue();
         RotateMarkedObj(aAllSnapRect.Center(),nAngle);
     }
-    if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue();
-        ShearMarkedObj(aAllSnapRect.Center(),nAngle,FALSE);
+        ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False);
     }
-    if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue();
-        ShearMarkedObj(aAllSnapRect.Center(),nAngle,TRUE);
+        ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True);
     }
 
     const bool bUndo = IsUndoEnabled();
 
     // Todo: WhichRange nach Notwendigkeit ueberpruefen.
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -747,7 +747,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
     }
 }
 
-void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
 {
     // bOnlyHardAttr hat hier keinerlei Wirkung
     // Hier muss ausserdem noch der Nullpunkt und
@@ -758,24 +758,24 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     long nAllSnapWdt=aAllSnapRect.GetWidth()-1;
     long nAllSnapHgt=aAllSnapRect.GetHeight()-1;
     // koennte mal zu CheckPossibilities mit rein
-    BOOL bMovProtect=FALSE,bMovProtectDC=FALSE;
-    BOOL bSizProtect=FALSE,bSizProtectDC=FALSE;
-    BOOL bPrintable =TRUE ,bPrintableDC=FALSE;
-    BOOL bVisible = TRUE, bVisibleDC=FALSE;
-    SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE;
-    XubString aObjName;     BOOL bObjNameDC=FALSE,bObjNameSet=FALSE;
-    long nSnapPosX=0;      BOOL bSnapPosXDC=FALSE;
-    long nSnapPosY=0;      BOOL bSnapPosYDC=FALSE;
-    long nSnapWdt=0;       BOOL bSnapWdtDC=FALSE;
-    long nSnapHgt=0;       BOOL bSnapHgtDC=FALSE;
-    long nLogicWdt=0;      BOOL bLogicWdtDC=FALSE,bLogicWdtDiff=FALSE;
-    long nLogicHgt=0;      BOOL bLogicHgtDC=FALSE,bLogicHgtDiff=FALSE;
-    long nRotAngle=0;      BOOL bRotAngleDC=FALSE;
-    long nShrAngle=0;      BOOL bShrAngleDC=FALSE;
+    sal_Bool bMovProtect=sal_False,bMovProtectDC=sal_False;
+    sal_Bool bSizProtect=sal_False,bSizProtectDC=sal_False;
+    sal_Bool bPrintable =sal_True ,bPrintableDC=sal_False;
+    sal_Bool bVisible = sal_True, bVisibleDC=sal_False;
+    SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False;
+    XubString aObjName;     sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False;
+    long nSnapPosX=0;      sal_Bool bSnapPosXDC=sal_False;
+    long nSnapPosY=0;      sal_Bool bSnapPosYDC=sal_False;
+    long nSnapWdt=0;       sal_Bool bSnapWdtDC=sal_False;
+    long nSnapHgt=0;       sal_Bool bSnapHgtDC=sal_False;
+    long nLogicWdt=0;      sal_Bool bLogicWdtDC=sal_False,bLogicWdtDiff=sal_False;
+    long nLogicHgt=0;      sal_Bool bLogicHgtDC=sal_False,bLogicHgtDiff=sal_False;
+    long nRotAngle=0;      sal_Bool bRotAngleDC=sal_False;
+    long nShrAngle=0;      sal_Bool bShrAngleDC=sal_False;
     Rectangle aSnapRect;
     Rectangle aLogicRect;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         if (nm==0) {
@@ -797,33 +797,33 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
             nRotAngle=pObj->GetRotateAngle();
             nShrAngle=pObj->GetShearAngle();
         } else {
-            if (!bLayerDC      && nLayerId   !=pObj->GetLayer())        bLayerDC=TRUE;
-            if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect())   bMovProtectDC=TRUE;
-            if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE;
-            if (!bPrintableDC  && bPrintable !=pObj->IsPrintable())     bPrintableDC=TRUE;
-            if (!bVisibleDC	   && bVisible !=pObj->IsVisible())         bVisibleDC=TRUE;
-            if (!bRotAngleDC   && nRotAngle  !=pObj->GetRotateAngle())  bRotAngleDC=TRUE;
-            if (!bShrAngleDC   && nShrAngle  !=pObj->GetShearAngle())   bShrAngleDC=TRUE;
+            if (!bLayerDC      && nLayerId   !=pObj->GetLayer())        bLayerDC=sal_True;
+            if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect())   bMovProtectDC=sal_True;
+            if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=sal_True;
+            if (!bPrintableDC  && bPrintable !=pObj->IsPrintable())     bPrintableDC=sal_True;
+            if (!bVisibleDC	   && bVisible !=pObj->IsVisible())         bVisibleDC=sal_True;
+            if (!bRotAngleDC   && nRotAngle  !=pObj->GetRotateAngle())  bRotAngleDC=sal_True;
+            if (!bShrAngleDC   && nShrAngle  !=pObj->GetShearAngle())   bShrAngleDC=sal_True;
             if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) {
                 aSnapRect=pObj->GetSnapRect();
-                if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=TRUE;
-                if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=TRUE;
-                if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=TRUE;
-                if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=TRUE;
+                if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=sal_True;
+                if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=sal_True;
+                if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=sal_True;
+                if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=sal_True;
             }
             if (!bLogicWdtDC || !bLogicHgtDC || !bLogicWdtDiff || !bLogicHgtDiff) {
                 aLogicRect=pObj->GetLogicRect();
-                if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=TRUE;
-                if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=TRUE;
-                if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=TRUE;
-                if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=TRUE;
+                if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=sal_True;
+                if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=sal_True;
+                if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=sal_True;
+                if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=sal_True;
             }
         }
         if (!bObjNameDC ) {
             if (!bObjNameSet) {
                 aObjName=pObj->GetName();
             } else {
-                if (aObjName!=pObj->GetName()) bObjNameDC=TRUE;
+                if (aObjName!=pObj->GetName()) bObjNameDC=sal_True;
             }
         }
     }
@@ -863,7 +863,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
     }
 }
 
-SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
+SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const
 {
     SfxItemSet aSet(pMod->GetItemPool());
     MergeAttrFromMarked(aSet,bOnlyHardAttr);
@@ -878,7 +878,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
     return aSet;
 }
 
-void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const
+void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const
 {
     sal_uInt32 nMarkAnz(GetMarkedObjectCount());
 
@@ -894,15 +894,15 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
         {
             if(!bOnlyHardAttr)
             {
-                if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                     rAttr.InvalidateItem(nWhich);
                 else
-                    rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+                    rAttr.MergeValue(rSet.Get(nWhich), sal_True);
             }
-            else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+            else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
             {
                 const SfxPoolItem& rItem = rSet.Get(nWhich);
-                rAttr.MergeValue(rItem, TRUE);
+                rAttr.MergeValue(rItem, sal_True);
             }
 
             nWhich = aIter.NextWhich();
@@ -910,19 +910,19 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
     }
 }
 
-void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
 {
     if (AreObjectsMarked()) 
     {
 #ifdef DBG_UTIL
         {
-            BOOL bHasEEFeatureItems=FALSE;
+            sal_Bool bHasEEFeatureItems=sal_False;
             SfxItemIter aIter(rAttr);
             const SfxPoolItem* pItem=aIter.FirstItem();
             while (!bHasEEFeatureItems && pItem!=NULL) {
                 if (!IsInvalidItem(pItem)) {
-                    USHORT nW=pItem->Which();
-                    if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+                    sal_uInt16 nW=pItem->Which();
+                    if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
                 }
                 pItem=aIter.NextItem();
             }
@@ -956,13 +956,13 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
         }
 
         // Joe, 2.7.98: Damit Undo nach Format.Standard auch die Textattribute korrekt restauriert
-        BOOL bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
+        sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
 
         // AW 030100: save additional geom info when para or char attributes
         // are changed and the geom form of the text object might be changed
-        BOOL bPossibleGeomChange(FALSE);
+        sal_Bool bPossibleGeomChange(sal_False);
         SfxWhichIter aIter(rAttr);
-        UINT16 nWhich = aIter.FirstWhich();
+        sal_uInt16 nWhich = aIter.FirstWhich();
         while(!bPossibleGeomChange && nWhich) 
         {
             SfxItemState eState = rAttr.GetItemState(nWhich);
@@ -975,7 +975,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                     || nWhich == SDRATTR_3DOBJ_END_ANGLE
                     || nWhich == SDRATTR_3DSCENE_DISTANCE)
                 {
-                    bPossibleGeomChange = TRUE;
+                    bPossibleGeomChange = sal_True;
                 }
             }
             nWhich = aIter.NextWhich();
@@ -996,12 +996,12 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
         // uses it's second parameter (bInvalidAsDefault) to
         // remove all such items to set them to default.
         SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
-        aAttr.Put(rAttr, TRUE);
+        aAttr.Put(rAttr, sal_True);
         
         // #i38135#
         bool bResetAnimationTimer(false);
 
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1011,7 +1011,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                 std::vector< SdrUndoAction* > vConnectorUndoActions;
                 SdrEdgeObj* pEdgeObj = dynamic_cast< SdrEdgeObj* >( pObj );
                 if ( pEdgeObj )
-                    bPossibleGeomChange = TRUE;
+                    bPossibleGeomChange = sal_True;
                 else if( bUndo )
                     vConnectorUndoActions = CreateConnectorUndo( *pObj );
 
@@ -1036,7 +1036,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
                 const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0;
 
                 // add attribute undo
-                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText));
+                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText));
             }
 
             // set up a scxene updater if object is a 3d object
@@ -1105,19 +1105,19 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
 SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
 {
     SfxStyleSheet* pRet=NULL;
-    BOOL b1st=TRUE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_Bool b1st=sal_True;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet();
         if (b1st) pRet=pSS;
         else if (pRet!=pSS) return NULL; // verschiedene StyleSheets
-        b1st=FALSE;
+        b1st=sal_False;
     }
     return pRet;
 }
 
-void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (AreObjectsMarked())
     {
@@ -1133,8 +1133,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
             BegUndo(aStr);
         }
 
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             if( bUndo )
@@ -1153,12 +1153,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /* new interface src537 */
-BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(GetMarkedObjectCount())
     {
-        rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), FALSE);
-        return TRUE;
+        rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False);
+        return sal_True;
     }
     else
     {
@@ -1166,31 +1166,31 @@ BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) cons
     }
 }
 
-BOOL SdrEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     if (GetMarkedObjectCount()!=0) {
         SetAttrToMarked(rSet,bReplaceAll);
-        return TRUE;
+        return sal_True;
     } else {
         return SdrMarkView::SetAttributes(rSet,bReplaceAll);
     }
 }
 
-SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const
 {
     if (GetMarkedObjectCount()!=0) {
-        //rOk=TRUE;
+        //rOk=sal_True;
         return GetStyleSheetFromMarked();
     } else {
         return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk);
     }
 }
 
-BOOL SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (GetMarkedObjectCount()!=0) {
         SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr);
-        return TRUE;
+        return sal_True;
     } else {
         return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
     }
@@ -1206,7 +1206,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
                        SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS,
                        0);
     if (AreObjectsMarked()) {
-        SfxItemSet aMarkAttr(GetAttrFromMarked(FALSE)); // wg. AutoGrowHeight und Eckenradius
+        SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // wg. AutoGrowHeight und Eckenradius
         Rectangle aRect(GetMarkedObjRect());
         
         if(GetSdrPageView()) 
@@ -1261,16 +1261,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
 
         // Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind
         const SdrMarkList& rMarkList=GetMarkedObjectList();
-        ULONG nMarkCount=rMarkList.GetMarkCount();
+        sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
         SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj();
-        BOOL bPosProt=pObj->IsMoveProtect();
-        BOOL bSizProt=pObj->IsResizeProtect();
-        BOOL bPosProtDontCare=FALSE;
-        BOOL bSizProtDontCare=FALSE;
-        for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
+        sal_Bool bPosProt=pObj->IsMoveProtect();
+        sal_Bool bSizProt=pObj->IsResizeProtect();
+        sal_Bool bPosProtDontCare=sal_False;
+        sal_Bool bSizProtDontCare=sal_False;
+        for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
             pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
-            if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE;
-            if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE;
+            if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True;
+            if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True;
         }
 
         // InvalidateItem setzt das Item auf DONT_CARE
@@ -1286,7 +1286,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
         }
 
         SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH);
-        BOOL bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+        sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
         if (eState==SFX_ITEM_DONTCARE) {
             aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH);
         } else if (eState==SFX_ITEM_SET) {
@@ -1341,7 +1341,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     long nOldRotateAngle=GetMarkedObjRotate();
     long nOldShearAngle=GetMarkedObjShear();
     const SdrMarkList& rMarkList=GetMarkedObjectList();
-    ULONG nMarkCount=rMarkList.GetMarkCount();
+    sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
     SdrObject* pObj=NULL;
 
     RECT_POINT eSizePoint=RP_MM;
@@ -1373,56 +1373,56 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     long nShearAngle=0;
     long nShearX=0;
     long nShearY=0;
-    BOOL bShearVert=FALSE;
+    sal_Bool bShearVert=sal_False;
 
-    BOOL bChgPos=FALSE;
-    BOOL bChgSiz=FALSE;
-    BOOL bRotate=FALSE;
-    BOOL bShear =FALSE;
+    sal_Bool bChgPos=sal_False;
+    sal_Bool bChgSiz=sal_False;
+    sal_Bool bRotate=sal_False;
+    sal_Bool bShear =sal_False;
 
-    BOOL bSetAttr=FALSE;
+    sal_Bool bSetAttr=sal_False;
     SfxItemSet aSetAttr(pMod->GetItemPool());
 
     const SfxPoolItem* pPoolItem=NULL;
 
     // Position
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) {
         nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left();
-        bChgPos=TRUE;
+        bChgPos=sal_True;
     }
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem)){
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){
         nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top();
-        bChgPos=TRUE;
+        bChgPos=sal_True;
     }
     // Groesse
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) {
         nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
-        bChgSiz=TRUE;
+        bChgSiz=sal_True;
     }
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) {
         nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
-        bChgSiz=TRUE;
+        bChgSiz=sal_True;
     }
     if (bChgSiz) {
         eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
     }
 
     // Rotation
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) {
         nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle;
         bRotate = (nRotateAngle != 0);
     }
 
     // #86909# pos rot point x
-    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, TRUE ,&pPoolItem)) 
+    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem)) 
         nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue();
 
     // #86909# pos rot point y
-    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, TRUE ,&pPoolItem)) 
+    if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem)) 
         nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue();
 
     // Shear
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) {
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) {
         long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue();
         if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR;
         if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR;
@@ -1451,23 +1451,23 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     }
 
     // AutoGrow
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,TRUE,&pPoolItem)) {
-        BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) {
+        sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
-    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,TRUE,&pPoolItem)) {
-        BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+    if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) {
+        sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
     // Eckenradius
-    if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,TRUE,&pPoolItem)) {
+    if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) {
         long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue();
         aSetAttr.Put(SdrEckenradiusItem(nRadius));
-        bSetAttr=TRUE;
+        bSetAttr=sal_True;
     }
 
     ForcePossibilities();
@@ -1475,7 +1475,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects());
 
     if (bSetAttr) {
-        SetAttrToMarked(aSetAttr,FALSE);
+        SetAttrToMarked(aSetAttr,sal_False);
     }
 
     // Groesse und Hoehe aendern
@@ -1542,7 +1542,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     }
 
     // protect position
-    if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, TRUE, &pPoolItem))
+    if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem))
     {
         const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue());
         bool bChanged(false);
@@ -1583,7 +1583,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
     if(!bMoveProtect)
     {
         // protect size
-        if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, TRUE, &pPoolItem))
+        if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem))
         {
             const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue());
             bool bChanged(false);
@@ -1614,16 +1614,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrEditView::IsAlignPossible() const
+sal_Bool SdrEditView::IsAlignPossible() const
 {  // Mindestens 2 markierte Objekte, davon mind. 1 beweglich
     ForcePossibilities();
-    ULONG nAnz=GetMarkedObjectCount();
-    if (nAnz==0) return FALSE;         // Nix markiert!
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
+    if (nAnz==0) return sal_False;         // Nix markiert!
     if (nAnz==1) return bMoveAllowed;  // einzelnes Obj an der Seite ausrichten
     return bOneOrMoreMovable;          // ansonsten ist MarkCount>=2
 }
 
-void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects)
+void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects)
 {
     if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE)
         return;
@@ -1668,9 +1668,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
     }
 
     Rectangle aBound;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nm;
-    BOOL bHasFixed=FALSE;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm;
+    sal_Bool bHasFixed=sal_False;
     for (nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1681,7 +1681,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
         {
             Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect());
             aBound.Union(aObjRect);
-            bHasFixed=TRUE;
+            bHasFixed=sal_True;
         }
     }
     if (!bHasFixed)
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index ec02de1239..219da332dd 100644..100755
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -37,11 +37,11 @@
 #include <svx/svdopath.hxx>  // fuer CombineObjects
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdograf.hxx>  // fuer Possibilities
 #include <svx/svdoole2.hxx>  // und Mtf-Import
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -92,13 +92,13 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const
   return NULL;
 }
 
-void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, ULONG /*nOldPos*/, ULONG /*nNewPos*/)
+void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/)
 {
 }
 
 void SdrEditView::MovMarkedToTop()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -107,14 +107,14 @@ void SdrEditView::MovMarkedToTop()
             BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP);
 
         SortMarkedObjects();
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=nAnz; nm>0;)
         {
             nm--;
@@ -123,16 +123,16 @@ void SdrEditView::MovMarkedToTop()
             SdrObjList* pOL=pObj->GetObjList();
             if (pOL!=pOL0)
             {
-                nNewPos=ULONG(pOL->GetObjCount()-1);
+                nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
                 pOL0=pOL;
             }
-            ULONG nNowPos=pObj->GetOrdNumDirect();
+            sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
             const Rectangle& rBR=pObj->GetCurrentBoundRect();
-            ULONG nCmpPos=nNowPos+1;
+            sal_uIntPtr nCmpPos=nNowPos+1;
             SdrObject* pMaxObj=GetMaxToTopObj(pObj);
             if (pMaxObj!=NULL)
             {
-                ULONG nMaxPos=pMaxObj->GetOrdNum();
+                sal_uIntPtr nMaxPos=pMaxObj->GetOrdNum();
                 if (nMaxPos!=0)
                     nMaxPos--;
                 if (nNewPos>nMaxPos)
@@ -140,25 +140,25 @@ void SdrEditView::MovMarkedToTop()
                 if (nNewPos<nNowPos)
                     nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
             }
-            BOOL bEnd=FALSE;
+            sal_Bool bEnd=sal_False;
             while (nCmpPos<nNewPos && !bEnd)
             {
                 SdrObject* pCmpObj=pOL->GetObj(nCmpPos);
                 if (pCmpObj==NULL)
                 {
                     OSL_FAIL("MovMarkedToTop(): Vergleichsobjekt nicht gefunden");
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (pCmpObj==pMaxObj)
                 {
                     nNewPos=nCmpPos;
                     nNewPos--;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
                 {
                     nNewPos=nCmpPos;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else
                 {
@@ -167,7 +167,7 @@ void SdrEditView::MovMarkedToTop()
             }
             if (nNowPos!=nNewPos)
             {
-                bChg=TRUE;
+                bChg=sal_True;
                 pOL->SetObjectOrdNum(nNowPos,nNewPos);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -186,7 +186,7 @@ void SdrEditView::MovMarkedToTop()
 
 void SdrEditView::MovMarkedToBtm()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -195,15 +195,15 @@ void SdrEditView::MovMarkedToBtm()
             BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM);
 
         SortMarkedObjects();
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
 
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=0; nm<nAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -214,19 +214,19 @@ void SdrEditView::MovMarkedToBtm()
                 nNewPos=0;
                 pOL0=pOL;
             }
-            ULONG nNowPos=pObj->GetOrdNumDirect();
+            sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
             const Rectangle& rBR=pObj->GetCurrentBoundRect();
-            ULONG nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
+            sal_uIntPtr nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
             SdrObject* pMaxObj=GetMaxToBtmObj(pObj);
             if (pMaxObj!=NULL)
             {
-                ULONG nMinPos=pMaxObj->GetOrdNum()+1;
+                sal_uIntPtr nMinPos=pMaxObj->GetOrdNum()+1;
                 if (nNewPos<nMinPos)
                     nNewPos=nMinPos; // diesen nicht ueberholen.
                 if (nNewPos>nNowPos)
                     nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
             }
-            BOOL bEnd=FALSE;
+            sal_Bool bEnd=sal_False;
             // nNewPos ist an dieser Stelle noch die maximale Position,
             // an der das Obj hinruecken darf, ohne seinen Vorgaenger
             // (Mehrfachselektion) zu ueberholen.
@@ -236,18 +236,18 @@ void SdrEditView::MovMarkedToBtm()
                 if (pCmpObj==NULL)
                 {
                     OSL_FAIL("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden");
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (pCmpObj==pMaxObj)
                 {
                     nNewPos=nCmpPos;
                     nNewPos++;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
                 {
                     nNewPos=nCmpPos;
-                    bEnd=TRUE;
+                    bEnd=sal_True;
                 }
                 else
                 {
@@ -256,7 +256,7 @@ void SdrEditView::MovMarkedToBtm()
             }
             if (nNowPos!=nNewPos)
             {
-                bChg=TRUE;
+                bChg=sal_True;
                 pOL->SetObjectOrdNum(nNowPos,nNewPos);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -280,7 +280,7 @@ void SdrEditView::PutMarkedToTop()
 
 void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -293,7 +293,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
         {
             // Damit "Vor das Objekt" auch funktioniert wenn die
             // markierten Objekte bereits vor dem Objekt stehen
-            ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+            sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
             SdrMark aRefMark;
             if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
             {
@@ -307,14 +307,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 SortMarkedObjects();
             }
         }
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++)
         { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=nAnz; nm>0;)
         {
             nm--;
@@ -325,14 +325,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 SdrObjList* pOL=pObj->GetObjList();
                 if (pOL!=pOL0)
                 {
-                    nNewPos=ULONG(pOL->GetObjCount()-1);
+                    nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
                     pOL0=pOL;
                 }
-                ULONG nNowPos=pObj->GetOrdNumDirect();
+                sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
                 SdrObject* pMaxObj=GetMaxToTopObj(pObj);
                 if (pMaxObj!=NULL)
                 {
-                    ULONG nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
+                    sal_uIntPtr nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
                     if (nMaxOrd>0)
                         nMaxOrd--;
                     if (nNewPos>nMaxOrd)
@@ -344,7 +344,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 {
                     if (pRefObj->GetObjList()==pObj->GetObjList())
                     {
-                        ULONG nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+                        sal_uIntPtr nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
                         if (nNewPos>nMaxOrd)
                             nNewPos=nMaxOrd; // nicht ueberholen.
                         if (nNewPos<nNowPos)
@@ -357,7 +357,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
                 }
                 if (nNowPos!=nNewPos)
                 {
-                    bChg=TRUE;
+                    bChg=sal_True;
                     pOL->SetObjectOrdNum(nNowPos,nNewPos);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -382,7 +382,7 @@ void SdrEditView::PutMarkedToBtm()
 
 void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz!=0)
     {
         const bool bUndo = IsUndoEnabled();
@@ -395,7 +395,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
         {
             // Damit "Hinter das Objekt" auch funktioniert wenn die
             // markierten Objekte bereits hinter dem Objekt stehen
-            ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+            sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
             SdrMark aRefMark;
             if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
             {
@@ -409,13 +409,13 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                 SortMarkedObjects();
             }
         }
-        ULONG nm;
+        sal_uIntPtr nm;
         for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen!
             GetMarkedObjectByIndex(nm)->GetOrdNum();
         }
-        BOOL bChg=FALSE;
+        sal_Bool bChg=sal_False;
         SdrObjList* pOL0=NULL;
-        ULONG nNewPos=0;
+        sal_uIntPtr nNewPos=0;
         for (nm=0; nm<nAnz; nm++) {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -425,16 +425,16 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                     nNewPos=0;
                     pOL0=pOL;
                 }
-                ULONG nNowPos=pObj->GetOrdNumDirect();
+                sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
                 SdrObject* pMinObj=GetMaxToBtmObj(pObj);
                 if (pMinObj!=NULL) {
-                    ULONG nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
+                    sal_uIntPtr nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
                     if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
                     if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
                 }
                 if (pRefObj!=NULL) {
                     if (pRefObj->GetObjList()==pObj->GetObjList()) {
-                        ULONG nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+                        sal_uIntPtr nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
                         if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
                         if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
                     } else {
@@ -442,7 +442,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
                     }
                 }
                 if (nNowPos!=nNewPos) {
-                    bChg=TRUE;
+                    bChg=sal_True;
                     pOL->SetObjectOrdNum(nNowPos,nNewPos);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -463,32 +463,32 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
 void SdrEditView::ReverseOrderOfMarked()
 {
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
     if (nMarkAnz>0)
     {
-        //BOOL bNeedBundle=FALSE;
-        BOOL bChg=FALSE;
+        //sal_Bool bNeedBundle=sal_False;
+        sal_Bool bChg=sal_False;
 
         bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER);
 
-        ULONG a=0;
+        sal_uIntPtr a=0;
         do {
             // Markierung ueber mehrere PageViews berueksichtigen
-            ULONG b=a+1;
+            sal_uIntPtr b=a+1;
             while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++;
             b--;
             SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList();
-            ULONG c=b;
+            sal_uIntPtr c=b;
             if (a<c) { // Sicherstellen, dass die OrdNums nicht Dirty sind
                 GetMarkedObjectByIndex(a)->GetOrdNum();
             }
             while (a<c) {
                 SdrObject* pObj1=GetMarkedObjectByIndex(a);
                 SdrObject* pObj2=GetMarkedObjectByIndex(c);
-                ULONG nOrd1=pObj1->GetOrdNumDirect();
-                ULONG nOrd2=pObj2->GetOrdNumDirect();
+                sal_uIntPtr nOrd1=pObj1->GetOrdNumDirect();
+                sal_uIntPtr nOrd2=pObj2->GetOrdNumDirect();
                 if( bUndo )
                 {
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj1,nOrd1,nOrd2));
@@ -499,7 +499,7 @@ void SdrEditView::ReverseOrderOfMarked()
                 pOL->SetObjectOrdNum(nOrd2-1,nOrd1);
                 // Verwendung von Replace statt SetOrdNum wg. Performance (Neuberechnung der Ordnums)
                 a++; c--;
-                bChg=TRUE;
+                bChg=sal_True;
             }
             a=b+1;
         } while (a<nMarkAnz);
@@ -514,30 +514,30 @@ void SdrEditView::ReverseOrderOfMarked()
 
 void SdrEditView::ImpCheckToTopBtmPossible()
 {
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     if (nAnz==0)
         return;
     if (nAnz==1)
     { // Sonderbehandlung fuer Einzelmarkierung
         SdrObject* pObj=GetMarkedObjectByIndex(0);
         SdrObjList* pOL=pObj->GetObjList();
-        ULONG nMax=pOL->GetObjCount();
-        ULONG nMin=0;
-        ULONG nObjNum=pObj->GetOrdNum();
+        sal_uIntPtr nMax=pOL->GetObjCount();
+        sal_uIntPtr nMin=0;
+        sal_uIntPtr nObjNum=pObj->GetOrdNum();
         SdrObject* pRestrict=GetMaxToTopObj(pObj);
         if (pRestrict!=NULL) {
-            ULONG nRestrict=pRestrict->GetOrdNum();
+            sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
             if (nRestrict<nMax) nMax=nRestrict;
         }
         pRestrict=GetMaxToBtmObj(pObj);
         if (pRestrict!=NULL) {
-            ULONG nRestrict=pRestrict->GetOrdNum();
+            sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
             if (nRestrict>nMin) nMin=nRestrict;
         }
-        bToTopPossible=nObjNum<ULONG(nMax-1);
+        bToTopPossible=nObjNum<sal_uIntPtr(nMax-1);
         bToBtmPossible=nObjNum>nMin;
     } else { // Mehrfachselektion
-        ULONG nm=0;
+        sal_uIntPtr nm=0;
         SdrObjList* pOL0=NULL;
         long nPos0=-1;
         while (!bToBtmPossible && nm<nAnz) { // 'nach hinten' checken
@@ -547,8 +547,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
                 nPos0=-1;
                 pOL0=pOL;
             }
-            ULONG nPos=pObj->GetOrdNum();
-            bToBtmPossible=nPos>ULONG(nPos0+1);
+            sal_uIntPtr nPos=pObj->GetOrdNum();
+            bToBtmPossible=nPos>sal_uIntPtr(nPos0+1);
             nPos0=long(nPos);
             nm++;
         }
@@ -563,8 +563,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
                 nPos0=pOL->GetObjCount();
                 pOL0=pOL;
             }
-            ULONG nPos=pObj->GetOrdNum();
-            bToTopPossible=nPos+1<ULONG(nPos0);
+            sal_uIntPtr nPos=pObj->GetOrdNum();
+            bToTopPossible=nPos+1<sal_uIntPtr(nPos0);
             nPos0=nPos;
         }
     }
@@ -800,8 +800,8 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
 struct ImpDistributeEntry
 {
     SdrObject*					mpObj;
-    INT32						mnPos;
-    INT32						mnLength;
+    sal_Int32						mnPos;
+    sal_Int32						mnLength;
 };
 
 typedef vector< ImpDistributeEntry*> ImpDistributeEntryList;
@@ -820,7 +820,7 @@ void SdrEditView::DistributeMarkedObjects()
             AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
 
-            UINT16 nResult = pDlg->Execute();
+            sal_uInt16 nResult = pDlg->Execute();
 
             if(nResult == RET_OK)
             {
@@ -885,7 +885,7 @@ void SdrEditView::DistributeMarkedObjects()
                     if(eHor == SvxDistributeHorizontalDistance)
                     {
                         // calc room in-between
-                        INT32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
+                        sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
                         double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.size() - 1);
                         double fStepStart = (double)aEntryList[ 0 ]->mnPos;
                         fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2);
@@ -895,7 +895,7 @@ void SdrEditView::DistributeMarkedObjects()
                         {
                             ImpDistributeEntry* pCurr = aEntryList[ i    ];
                             ImpDistributeEntry* pNext = aEntryList[ i + 1];
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(nDelta, 0));
@@ -905,7 +905,7 @@ void SdrEditView::DistributeMarkedObjects()
                     else
                     {
                         // calc distances
-                        INT32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos;
+                        sal_Int32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos;
                         double fStepWidth = (double)nWidth / (double)(aEntryList.size() - 1);
                         double fStepStart = (double)aEntryList[ 0 ]->mnPos;
                         fStepStart += fStepWidth;
@@ -914,7 +914,7 @@ void SdrEditView::DistributeMarkedObjects()
                         for( size_t i = 1 ; i < aEntryList.size()-1 ; ++i )
                         {
                             ImpDistributeEntry* pCurr = aEntryList[ i ];
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(nDelta, 0));
@@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects()
                     if(eVer == SvxDistributeVerticalDistance)
                     {
                         // calc room in-between
-                        INT32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
+                        sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
                         double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.size() - 1);
                         double fStepStart = (double)aEntryList[ 0 ]->mnPos;
                         fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2);
@@ -989,7 +989,7 @@ void SdrEditView::DistributeMarkedObjects()
                         {
                             ImpDistributeEntry* pCurr = aEntryList[ i     ];
                             ImpDistributeEntry* pNext = aEntryList[ i + 1 ];
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(0, nDelta));
@@ -999,7 +999,7 @@ void SdrEditView::DistributeMarkedObjects()
                     else
                     {
                         // calc distances
-                        INT32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos;
+                        sal_Int32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos;
                         double fStepWidth = (double)nHeight / (double)(aEntryList.size() - 1);
                         double fStepStart = (double)aEntryList[ 0 ]->mnPos;
                         fStepStart += fStepWidth;
@@ -1008,7 +1008,7 @@ void SdrEditView::DistributeMarkedObjects()
                         for(size_t i = 1, n = aEntryList.size()-1; i < n; ++i)
                         {
                             ImpDistributeEntry* pCurr = aEntryList[ i ];
-                            INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+                            sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
                             if( bUndo )
                                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
                             pCurr->mpObj->Move(Size(0, nDelta));
@@ -1047,24 +1047,24 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
         if( bUndo )
             BegUndo();
 
-        UINT32 nInsPos=0xFFFFFFFF;
+        sal_uInt32 nInsPos=0xFFFFFFFF;
         const SdrObject* pAttrObj = NULL;
         basegfx::B2DPolyPolygon aMergePolyPolygonA;
         basegfx::B2DPolyPolygon aMergePolyPolygonB;
 
         SdrObjList* pInsOL = NULL;
         SdrPageView* pInsPV = NULL;
-        BOOL bFirstObjectComplete(FALSE);
+        sal_Bool bFirstObjectComplete(sal_False);
 
         // make sure selected objects are contour objects
         // since now basegfx::tools::adaptiveSubdivide() is used, it is no longer
         // necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old
         // mechanisms. In a next step the polygon clipper will even be able to clip curves...
-        // ConvertMarkedToPolyObj(TRUE);
+        // ConvertMarkedToPolyObj(sal_True);
         ConvertMarkedToPathObj(sal_True);
         OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)");
 
-        for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+        for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
         {
             SdrMark* pM = GetSdrMarkByIndex(a);
             SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1132,7 +1132,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
                 // was there something added to the first poly?
                 if(!bFirstObjectComplete && aMergePolyPolygonA.count())
                 {
-                    bFirstObjectComplete = TRUE;
+                    bFirstObjectComplete = sal_True;
                 }
 
                 // move object to temporary delete list
@@ -1179,7 +1179,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
             pInsOL->InsertObject(pPath, nInsPos, &aReason);
             if( bUndo )
                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
-            MarkObj(pPath, pInsPV, FALSE, TRUE);
+            MarkObj(pPath, pInsPV, sal_False, sal_True);
         }
 
         aRemove.ForceSort();
@@ -1375,7 +1375,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
         // in the UNDO there is no problem, but as soon as they get deleted, the
         // MarkList will contain deleted objects -> GPF.
         UnmarkAllObj(pInsPV);
-        MarkObj(pPath, pInsPV, FALSE, TRUE);
+        MarkObj(pPath, pInsPV, sal_False, sal_True);
     }
 
     // UndoComment aus den tatsaechlich verwendeten Objekten zusammenbauen
@@ -1428,8 +1428,8 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg
 
 sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const
 {
-    sal_Bool bOtherObjs(sal_False);    // TRUE=andere Objekte ausser PathObj's vorhanden
-    sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
+    sal_Bool bOtherObjs(sal_False);    // sal_True=andere Objekte ausser PathObj's vorhanden
+    sal_Bool bMin1PolyPoly(sal_False); // sal_True=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
     SdrObjList* pOL = pObj->GetSubList();
 
     if(pOL)
@@ -1504,7 +1504,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
     return bMin1PolyPoly && !bOtherObjs;
 }
 
-void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines)
+void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines)
 {
     const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj);
     const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj);
@@ -1531,8 +1531,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                 SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
                 rOL.InsertObject(pPath, rPos, &aReason);
                 if( bUndo )
-                    AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
-                MarkObj(pPath, pPV, FALSE, TRUE);
+                    AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+                MarkObj(pPath, pPV, sal_False, sal_True);
                 rPos++;
             }
             else
@@ -1566,8 +1566,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                     SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
                     rOL.InsertObject(pPath, rPos, &aReason);
                     if( bUndo )
-                        AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
-                    MarkObj(pPath, pPV, FALSE, TRUE);
+                        AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+                    MarkObj(pPath, pPV, sal_False, sal_True);
                     rPos++;
                 }
             }
@@ -1603,7 +1603,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                 rOL.InsertObject(pCandidate, rPos, &aReason);
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true));
-                MarkObj(pCandidate, pPV, FALSE, TRUE);
+                MarkObj(pCandidate, pPV, sal_False, sal_True);
 
                 if(pCustomShape->HasText() && !pCustomShape->IsTextPath())
                 {
@@ -1648,16 +1648,16 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                     rOL.InsertObject(pTextObj, rPos + 1, &aReason);
                     if( bUndo )
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true));
-                    MarkObj(pTextObj, pPV, FALSE, TRUE);
+                    MarkObj(pTextObj, pPV, sal_False, sal_True);
                 }
             }
         }
     }
 }
 
-void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
+void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
 {
-    //UINT32 nCnt(0);
+    //sal_uInt32 nCnt(0);
     // Temporaere Marklist
     SdrMarkList aRemoveMerker;
 
@@ -1672,8 +1672,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
             bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS);
     }
 
-    ULONG nm;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm;
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
     SdrObjList* pOL0=NULL;
     for (nm=nAnz; nm>0;) {
         nm--;
@@ -1684,8 +1684,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
         if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen!
         if (ImpCanDismantle(pObj,bMakeLines)) {
             aRemoveMerker.InsertEntry(SdrMark(pObj,pM->GetPageView()));
-            ULONG nPos0=pObj->GetOrdNumDirect();
-            ULONG nPos=nPos0+1;
+            sal_uIntPtr nPos0=pObj->GetOrdNumDirect();
+            sal_uIntPtr nPos=nPos0+1;
             SdrObjList* pSubList=pObj->GetSubList();
             if (pSubList!=NULL && !pObj->Is3DObj()) {
                 SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS);
@@ -1697,7 +1697,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
                 ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines);
             }
             if( bUndo )
-                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,TRUE));
+                AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True));
             pOL->RemoveObject(nPos0);
 
             if( !bUndo )
@@ -1735,8 +1735,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
         {
             BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP);
 
-            const ULONG nAnz = GetMarkedObjectCount();
-            for(ULONG nm = nAnz; nm>0; )
+            const sal_uIntPtr nAnz = GetMarkedObjectCount();
+            for(sal_uIntPtr nm = nAnz; nm>0; )
             {
                 // UndoActions fuer alle betroffenen Objekte anlegen
                 nm--;
@@ -1766,9 +1766,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
             SdrObjList* pDstLst=NULL;
             // Falls alle markierten Objekte aus Fremden Obj-Listen
             // kommen, kommt das Gruppenobjekt an das Ende der Liste.
-            ULONG       nInsPos=pSrcLst->GetObjCount();
-            BOOL    bNeedInsPos=TRUE;
-            for (ULONG nm=GetMarkedObjectCount(); nm>0;)
+            sal_uIntPtr       nInsPos=pSrcLst->GetObjCount();
+            sal_Bool    bNeedInsPos=sal_True;
+            for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;)
             {
                 nm--;
                 SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1790,13 +1790,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
                         if (pSrcLst->IsObjOrdNumsDirty())
                             pSrcLst->RecalcObjOrdNums();
                     }
-                    BOOL bForeignList=pSrcLst!=pAktLst;
-                    BOOL bGrouped=pSrcLst!=pPage;
+                    sal_Bool bForeignList=pSrcLst!=pAktLst;
+                    sal_Bool bGrouped=pSrcLst!=pPage;
                     if (!bForeignList && bNeedInsPos)
                     {
                         nInsPos=pObj->GetOrdNum(); // ua, damit sind alle ObjOrdNum der Page gesetzt
                         nInsPos++;
-                        bNeedInsPos=FALSE;
+                        bNeedInsPos=sal_False;
                     }
                     pSrcLst->RemoveObject(pObj->GetOrdNumDirect());
                     if (!bForeignList)
@@ -1819,13 +1819,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
             if (pGrp!=NULL)
             {
                 aNewMark.InsertEntry(SdrMark(pGrp,pPV));
-                ULONG nAnz=pDstLst->GetObjCount();
+                sal_uIntPtr nAnz=pDstLst->GetObjCount();
                 SdrInsertReason aReason(SDRREASON_VIEWCALL,pRefObj);
                 pAktLst->InsertObject(pGrp,nInsPos,&aReason);
                 if( bUndo )
                 {
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // Kein Recalc!
-                    for (ULONG no=0; no<nAnz; no++)
+                    for (sal_uIntPtr no=0; no<nAnz; no++)
                     {
                         AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pDstLst->GetObj(no)));
                     }
@@ -1858,11 +1858,11 @@ void SdrEditView::UnGroupMarked()
     if( bUndo )
         BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP);
 
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
     XubString aName1;
     XubString aName;
-    BOOL bNameOk=FALSE;
-    for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+    sal_Bool bNameOk=sal_False;
+    for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pGrp=pM->GetMarkedSdrObj();
@@ -1872,7 +1872,7 @@ void SdrEditView::UnGroupMarked()
             if (nCount==1) {
                 pGrp->TakeObjNameSingul(aName);  // Bezeichnung der Gruppe holen
                 pGrp->TakeObjNamePlural(aName1); // Bezeichnung der Gruppe holen
-                bNameOk=TRUE;
+                bNameOk=sal_True;
             } else {
                 if (nCount==2) aName=aName1; // Pluralname setzen
                 if (bNameOk) {
@@ -1880,17 +1880,17 @@ void SdrEditView::UnGroupMarked()
                     pGrp->TakeObjNamePlural(aStr); // Bezeichnung der Gruppe holen
 
                     if(!aStr.Equals(aName))
-                        bNameOk = FALSE;
+                        bNameOk = sal_False;
                 }
             }
-            ULONG nDstCnt=pGrp->GetOrdNum();
+            sal_uIntPtr nDstCnt=pGrp->GetOrdNum();
             SdrObjList* pDstLst=pM->GetPageView()->GetObjList();
 
             // FIRST move contained objects to parent of group, so that
             // the contained objects are NOT migrated to the UNDO-ItemPool
             // when AddUndo(new SdrUndoDelObj(*pGrp)) is called.
-            ULONG nAnz=pSrcLst->GetObjCount();
-            ULONG no;
+            sal_uIntPtr nAnz=pSrcLst->GetObjCount();
+            sal_uIntPtr no;
 
             if( bUndo )
             {
@@ -1912,7 +1912,7 @@ void SdrEditView::UnGroupMarked()
                 // Kein SortCheck beim einfuegen in die MarkList, denn das
                 // wuerde wg. pObj->GetOrdNum() jedesmal ein RecalcOrdNums()
                 // provozieren:
-                aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),FALSE);
+                aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False);
             }
 
             if( bUndo )
@@ -1943,7 +1943,7 @@ void SdrEditView::UnGroupMarked()
 
     if (nCount!=0)
     {
-        GetMarkedObjectListWriteAccess().Merge(aNewMark,TRUE); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
+        GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
         MarkListHasChanged();
     }
 }
@@ -1958,7 +1958,7 @@ void SdrEditView::UnGroupMarked()
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea)
+SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea)
 {
     SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea);
     if (pNewObj!=NULL)
@@ -1980,12 +1980,12 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLine
     return pNewObj;
 }
 
-void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
+void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea)
 {
-    BOOL bMrkChg=FALSE;
+    sal_Bool bMrkChg=sal_False;
     if (AreObjectsMarked()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        USHORT nDscrID=0;
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        sal_uInt16 nDscrID=0;
         if(bLineToArea)
         {
             if(nMarkAnz == 1)
@@ -2007,7 +2007,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
                 BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY);
             }
         }
-        for (ULONG nm=nMarkAnz; nm>0;) {
+        for (sal_uIntPtr nm=nMarkAnz; nm>0;) {
             nm--;
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -2022,7 +2022,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
             } else {
                 SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea);
                 if (pNewObj!=NULL) {
-                    bMrkChg=TRUE;
+                    bMrkChg=sal_True;
                     GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm);
                 }
             }
@@ -2033,14 +2033,14 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
     }
 }
 
-void SdrEditView::ConvertMarkedToPathObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea)
 {
-    ImpConvertTo(TRUE, bLineToArea);
+    ImpConvertTo(sal_True, bLineToArea);
 }
 
-void SdrEditView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
 {
-    ImpConvertTo(FALSE, bLineToArea);
+    ImpConvertTo(sal_False, bLineToArea);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2063,9 +2063,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
     SortMarkedObjects();
     SdrMarkList aForTheDescription;
     SdrMarkList aNewMarked;
-    ULONG nAnz=GetMarkedObjectCount();
+    sal_uIntPtr nAnz=GetMarkedObjectCount();
 
-    for (ULONG nm=nAnz; nm>0;)
+    for (sal_uIntPtr nm=nAnz; nm>0;)
     { // Undo Objekte fuer alle neuen Objekte erzeugen
         // zwischen den Metafiles auf Abbruch testen
         if( pProgrInfo != NULL )
@@ -2080,10 +2080,10 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
         SdrObject*   pObj=pM->GetMarkedSdrObj();
         SdrPageView* pPV=pM->GetPageView();
         SdrObjList*  pOL=pObj->GetObjList();
-        ULONG        nInsPos=pObj->GetOrdNum()+1;
+        sal_uIntPtr        nInsPos=pObj->GetOrdNum()+1;
         SdrGrafObj*  pGraf=PTR_CAST(SdrGrafObj,pObj);
         SdrOle2Obj*  pOle2=PTR_CAST(SdrOle2Obj,pObj);
-        ULONG        nInsAnz=0;
+        sal_uIntPtr        nInsAnz=0;
         if (pGraf!=NULL && pGraf->HasGDIMetaFile())
         {
             ImpSdrGDIMetaFileImport aFilter(*pMod);
@@ -2101,8 +2101,8 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
         }
         if (nInsAnz!=0)
         {
-            ULONG nObj=nInsPos;
-            for (ULONG i=0; i<nInsAnz; i++)
+            sal_uIntPtr nObj=nInsPos;
+            for (sal_uIntPtr i=0; i<nInsAnz; i++)
             {
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj)));
@@ -2131,7 +2131,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
     if(aNewMarked.GetMarkCount())
     {
         // Neue Selektion bilden
-        for(ULONG a(0); a < aNewMarked.GetMarkCount(); a++)
+        for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++)
         {
             GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a));
         }
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 310a05699a..bd6874ea0d 100644..100755
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -50,12 +50,12 @@
 #include <editeng/editobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdoutl.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpage.hxx"
 #include "svx/svdetc.hxx"   // fuer GetDraftFillColor
@@ -67,36 +67,36 @@
 
 #include <svx/svdoutl.hxx>
 #include <svx/svddrgv.hxx>  // fuer SetSolidDragging()
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "globl3d.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/globl3d.hxx"
 #include <editeng/outliner.hxx>
 #include <editeng/adjitem.hxx>
 
 #include <svtools/colorcfg.hxx>
 #include <vcl/svapp.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void SdrObjEditView::ImpClearVars()
 {
-    bQuickTextEditMode=TRUE;
-    bMacroMode=TRUE;
+    bQuickTextEditMode=sal_True;
+    bMacroMode=sal_True;
     pTextEditOutliner=NULL;
     pTextEditOutlinerView=NULL;
     pTextEditPV=NULL;
     pTextEditWin=NULL;
     pTextEditCursorMerker=NULL;
     pEditPara=NULL;
-    bTextEditNewObj=FALSE;
-    bMacroDown=FALSE;
+    bTextEditNewObj=sal_False;
+    bMacroDown=sal_False;
     pMacroObj=NULL;
     pMacroPV=NULL;
     pMacroWin=NULL;
     nMacroTol=0;
-    bTextEditDontDelete=FALSE;
-    bTextEditOnlyOneView=FALSE;
+    bTextEditDontDelete=sal_False;
+    bTextEditOnlyOneView=sal_False;
 }
 
 SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -116,7 +116,7 @@ SdrObjEditView::~SdrObjEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::IsAction() const
+sal_Bool SdrObjEditView::IsAction() const
 {
     return IsMacroObj() || SdrGlueEditView::IsAction();
 }
@@ -184,10 +184,10 @@ void SdrObjEditView::ModelHasChanged()
     if (IsTextEdit()) {
         SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() );
         if (pTextObj!=NULL) {
-            ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount();
-            BOOL bAreaChg=FALSE;
-            BOOL bAnchorChg=FALSE;
-            BOOL bColorChg=FALSE;
+            sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
+            sal_Bool bAreaChg=sal_False;
+            sal_Bool bAnchorChg=sal_False;
+            sal_Bool bColorChg=sal_False;
             bool bContourFrame=pTextObj->IsContourTextFrame();
             EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
             Rectangle aOldArea(aMinTextEditArea);
@@ -211,34 +211,34 @@ void SdrObjEditView::ModelHasChanged()
                     pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) {
                     aTextEditArea=aEditArea1;
                     aMinTextEditArea=aMinArea1;
-                    pTextEditOutliner->SetUpdateMode(FALSE);
+                    pTextEditOutliner->SetUpdateMode(sal_False);
                     pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1);
                     pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1);
                     pTextEditOutliner->SetPaperSize(Size(0,0)); // Damit der Outliner neu formatiert
                     if (!bContourFrame) {
                         pTextEditOutliner->ClearPolygon();
-                        ULONG nStat=pTextEditOutliner->GetControlWord();
+                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
                         nStat|=EE_CNTRL_AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                     } else {
-                        ULONG nStat=pTextEditOutliner->GetControlWord();
+                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
                         nStat&=~EE_CNTRL_AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                         Rectangle aAnchorRect;
                         pTextObj->TakeTextAnchorRect(aAnchorRect);
-                        pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, TRUE);
+                        pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True);
                     }
-                    for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) {
+                    for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) {
                         OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
-                        ULONG nStat0=pOLV->GetControlWord();
-                        ULONG nStat=nStat0;
+                        sal_uIntPtr nStat0=pOLV->GetControlWord();
+                        sal_uIntPtr nStat=nStat0;
                         // AutoViewSize nur wenn nicht KontourFrame.
                         if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
                         else nStat&=~EV_CNTRL_AUTOSIZE;
                         if (nStat!=nStat0) pOLV->SetControlWord(nStat);
                     }
-                    pTextEditOutliner->SetUpdateMode(TRUE);
-                    bAreaChg=TRUE;
+                    pTextEditOutliner->SetUpdateMode(sal_True);
+                    bAreaChg=sal_True;
                 }
             }
             if (pTextEditOutlinerView!=NULL) { // Fuellfarbe und Anker checken
@@ -266,13 +266,13 @@ void SdrObjEditView::ModelHasChanged()
             // again on ModelHasChanged().
             if (bContourFrame || bAreaChg || bAnchorChg || bColorChg)
             {
-                for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++)
+                for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++)
                 {
                     OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
                     { // Alten OutlinerView-Bereich invalidieren
                         Window* pWin=pOLV->GetWindow();
                         Rectangle aTmpRect(aOldArea);
-                        USHORT nPixSiz=pOLV->GetInvalidateMore()+1;
+                        sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1;
                         Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz)));
                         aTmpRect.Left()-=aMore.Width();
                         aTmpRect.Right()+=aMore.Width();
@@ -321,7 +321,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
         aBlankRect.Union(aMinTextEditArea);
         Rectangle aPixRect(pWin->LogicToPixel(aBlankRect));
         aBlankRect.Intersection(rRect);
-        rOutlView.GetOutliner()->SetUpdateMode(TRUE); // Bugfix #22596#
+        rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596#
         rOutlView.Paint(aBlankRect);
 
         if(!bModifyMerk) 
@@ -358,7 +358,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
             aOuterPix.Bottom()+=nPixSiz;
 
             bool bMerk(pWin->IsMapModeEnabled());
-            pWin->EnableMapMode(FALSE);
+            pWin->EnableMapMode(sal_False);
             PolyPolygon aPolyPoly( 2 );
 
             svtools::ColorConfig aColorConfig;
@@ -418,32 +418,32 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
             aOuterPix.Bottom()+=nPixSiz;
 
             bool bMerk(pWin->IsMapModeEnabled());
-            pWin->EnableMapMode(FALSE);
+            pWin->EnableMapMode(sal_False);
             pWin->Invalidate(aOuterPix);
             pWin->EnableMapMode(bMerk);
         }
     }
 }
 
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*/, OutlinerView* pGivenView) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const
 {
     // Hintergrund
     Color aBackground(GetTextEditBackgroundColor(*this));
     SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
-    BOOL bTextFrame=pText!=NULL && pText->IsTextFrame();
-    BOOL bContourFrame=pText!=NULL && pText->IsContourTextFrame();
+    sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame();
+    sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
     // OutlinerView erzeugen
     OutlinerView* pOutlView=pGivenView;
-    pTextEditOutliner->SetUpdateMode(FALSE);
+    pTextEditOutliner->SetUpdateMode(sal_False);
     if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin);
     else pOutlView->SetWindow(pWin);
     // Scrollen verbieten
-    ULONG nStat=pOutlView->GetControlWord();
+    sal_uIntPtr nStat=pOutlView->GetControlWord();
     nStat&=~EV_CNTRL_AUTOSCROLL;
     // AutoViewSize nur wenn nicht KontourFrame.
     if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
     if (bTextFrame) {
-        USHORT nPixSiz=aHdl.GetHdlSize()*2+1;
+        sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1;
         nStat|=EV_CNTRL_INVONEMORE;
         pOutlView->SetInvalidateMore(nPixSiz);
     }
@@ -455,12 +455,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*
         pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
     }
     pOutlView->SetOutputArea(aTextEditArea);
-    pTextEditOutliner->SetUpdateMode(TRUE);
+    pTextEditOutliner->SetUpdateMode(sal_True);
     ImpInvalidateOutlinerView(*pOutlView);
     return pOutlView;
 }
 
-BOOL SdrObjEditView::IsTextEditFrame() const
+sal_Bool SdrObjEditView::IsTextEditFrame() const
 {
     SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
     return pText!=NULL && pText->IsTextFrame();
@@ -488,7 +488,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
     if (pTextObj!=NULL) {
         Color* pTxtCol=NULL;
         Color* pFldCol=NULL;
-        bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),TRUE,pTxtCol,pFldCol,rStr);
+        bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr);
         if (bOk) {
             if (pTxtCol!=NULL) {
                 pFI->SetTxtColor(*pTxtCol);
@@ -506,7 +506,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
     Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
     if (!bOk && aDrawOutlLink.IsSet()) {
         aDrawOutlLink.Call(pFI);
-        bOk = (BOOL)rStr.Len();
+        bOk = (sal_Bool)rStr.Len();
     }
     if (!bOk && aOldCalcFieldValueLink.IsSet()) {
         return aOldCalcFieldValueLink.Call(pFI);
@@ -524,7 +524,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     SdrEndTextEdit();
 
     if( dynamic_cast< SdrTextObj* >( pObj ) == 0 )
-        return FALSE; // currently only possible with text objects
+        return sal_False; // currently only possible with text objects
 
     if(bGrabFocus && pWin)
     {
@@ -605,7 +605,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
         }
 
-        BOOL bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
+        sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
 
         aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
         // Der FieldHdl muss von SdrBeginTextEdit gesetzt sein, da dor ein UpdateFields gerufen wird.
@@ -623,7 +623,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
             DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" );
             if( !pTextObj )
-                return FALSE;
+                return sal_False;
 
             // #111096# Switch off evtl. running TextAnimation
             pTextObj->SetTextAnimationAllowed(sal_False);
@@ -643,8 +643,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
 
             Rectangle aTextRect;
             Rectangle aAnchorRect;
-            pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, TRUE,
-                &aAnchorRect /* #97097# Give TRUE here, not FALSE */);
+            pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True,
+                &aAnchorRect /* #97097# Give sal_True here, not sal_False */);
 
             if ( !pTextObj->IsContourTextFrame() )
             {
@@ -662,7 +662,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y());
             pTextEditCursorMerker=pWin->GetCursor();
 
-            aHdl.SetMoveOutside(TRUE);
+            aHdl.SetMoveOutside(sal_True);
 
             // #i72757#
             // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary
@@ -672,7 +672,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView);
 
             // check if this view is already inserted
-            ULONG i2,nCount = pTextEditOutliner->GetViewCount();
+            sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount();
             for( i2 = 0; i2 < nCount; i2++ )
             {
                 if( pTextEditOutliner->GetView(i2) == pTextEditOutlinerView )
@@ -682,8 +682,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
             if( i2 == nCount )
                 pTextEditOutliner->InsertView(pTextEditOutlinerView,0);
 
-            aHdl.SetMoveOutside(FALSE);
-            aHdl.SetMoveOutside(TRUE);
+            aHdl.SetMoveOutside(sal_False);
+            aHdl.SetMoveOutside(sal_True);
             //OLMRefreshAllIAOManagers();
 
             // alle Wins als OutlinerView beim Outliner anmelden
@@ -783,7 +783,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
     //HMHif (bMarkHdlWhenTextEdit) {
     //HMH    HideMarkHdl();
     //HMH}
-    aHdl.SetMoveOutside(FALSE);
+    aHdl.SetMoveOutside(sal_False);
     //HMHShowMarkHdl();
 
     return sal_False;
@@ -816,7 +816,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
 
     if (pTEOutliner!=NULL)
     {
-        BOOL bModified=pTEOutliner->IsModified();
+        sal_Bool bModified=pTEOutliner->IsModified();
         if (pTEOutlinerView!=NULL)
         {
             pTEOutlinerView->HideCursor();
@@ -870,7 +870,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             }
             // Loeschung des gesamten TextObj checken
             SdrUndoAction* pDelUndo=NULL;
-            BOOL bDelObj=FALSE;
+            sal_Bool bDelObj=sal_False;
             SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj);
             if (pTextObj!=NULL && bTextEditNewObj)
             {
@@ -934,11 +934,11 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
             AdjustMarkHdl();
         }
         // alle OutlinerViews loeschen
-        for (ULONG i=pTEOutliner->GetViewCount(); i>0;)
+        for (sal_uIntPtr i=pTEOutliner->GetViewCount(); i>0;)
         {
             i--;
             OutlinerView* pOLV=pTEOutliner->GetView(i);
-            USHORT nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
+            sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
             Window* pWin=pOLV->GetWindow();
             Rectangle aRect(pOLV->GetOutputArea());
             pTEOutliner->RemoveView(i);
@@ -977,7 +977,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
 //HMH        if (bMarkHdlWhenTextEdit) {
 //HMH            HideMarkHdl();
 //HMH        }
-        aHdl.SetMoveOutside(FALSE);
+        aHdl.SetMoveOutside(sal_False);
         if (eRet!=SDRENDTEXTEDIT_UNCHANGED) 
 //HMH		{
 //HMH            ShowMarkHdl(); // Handles kommen ansonsten via Broadcast
@@ -1029,8 +1029,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const
     if (pWin==NULL) return NULL;
     if (pTextEditOutliner==NULL) return NULL;
     OutlinerView* pNewView=NULL;
-    ULONG nWinAnz=pTextEditOutliner->GetViewCount();
-    for (ULONG i=0; i<nWinAnz && pNewView==NULL; i++) {
+    sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount();
+    for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) {
         OutlinerView* pView=pTextEditOutliner->GetView(i);
         if (pView->GetWindow()==pWin) pNewView=pView;
     }
@@ -1057,9 +1057,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin)
     }
 }
 
-BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
+sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
 {
-    BOOL bOk=FALSE;
+    sal_Bool bOk=sal_False;
     if(mxTextEditObj.is())
     {
         nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1095,9 +1095,9 @@ BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
     return bOk;
 }
 
-BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
+sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
 {
-    BOOL bOk=FALSE;
+    sal_Bool bOk=sal_False;
     if(mxTextEditObj.is())
     {
         SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get());
@@ -1106,7 +1106,7 @@ BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
         {
             Window* pWin=pOLV->GetWindow();
             if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) {
-                USHORT nPixSiz=pOLV->GetInvalidateMore();
+                sal_uInt16 nPixSiz=pOLV->GetInvalidateMore();
                 Rectangle aEditArea(aMinTextEditArea);
                 aEditArea.Union(pOLV->GetOutputArea());
                 if (!aEditArea.IsInside(rHit)) {
@@ -1143,7 +1143,7 @@ void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
     if(pTextEditOutlinerView)
     {
@@ -1172,16 +1172,16 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
             if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
             ImpMakeTextCursorAreaVisible();
-            return TRUE;
+            return sal_True;
         }
     }
     return SdrGlueEditView::KeyInput(rKEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1203,17 +1203,17 @@ BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseButtonDown(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1234,18 +1234,18 @@ BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseButtonUp(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if (pTextEditOutlinerView!=NULL) {
-        BOOL bSelMode=pTextEditOutliner->IsInSelectionMode();
-        BOOL bPostIt=bSelMode;
+        sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode();
+        sal_Bool bPostIt=bSelMode;
         if (!bPostIt) {
             Point aPt(rMEvt.GetPosPixel());
             if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1266,21 +1266,21 @@ BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
     }
     return SdrGlueEditView::MouseMove(rMEvt,pWin);
 }
 
-BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
 {
-    // solange bis die OutlinerView einen BOOL zurueckliefert
+    // solange bis die OutlinerView einen sal_Bool zurueckliefert
     // bekommt sie nur COMMAND_STARTDRAG
     if (pTextEditOutlinerView!=NULL)
     {
         if (rCEvt.GetCommand()==COMMAND_STARTDRAG) {
-            BOOL bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
+            sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
             if (!bPostIt && rCEvt.IsMouseEvent()) {
                 Point aPt(rCEvt.GetMousePosPixel());
                 if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1304,19 +1304,19 @@ BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
                 if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
                 ImpMakeTextCursorAreaVisible();
-                return TRUE;
+                return sal_True;
             }
         }
         else // if (rCEvt.GetCommand() == COMMAND_VOICE )
         {
             pTextEditOutlinerView->Command(rCEvt);
-            return TRUE;
+            return sal_True;
         }
     }
     return SdrGlueEditView::Command(rCEvt,pWin);
 }
 
-BOOL SdrObjEditView::Cut(ULONG nFormat)
+sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         pTextEditOutlinerView->Cut();
@@ -1324,23 +1324,23 @@ BOOL SdrObjEditView::Cut(ULONG nFormat)
         if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
         ImpMakeTextCursorAreaVisible();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Cut(nFormat);
     }
 }
 
-BOOL SdrObjEditView::Yank(ULONG nFormat)
+sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         pTextEditOutlinerView->Copy();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Yank(nFormat);
     }
 }
 
-BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
+sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat)
 {
     if (pTextEditOutliner!=NULL) {
         if (pWin!=NULL) {
@@ -1355,7 +1355,7 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
         if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
         ImpMakeTextCursorAreaVisible();
-        return TRUE;
+        return sal_True;
     } else {
         return SdrGlueEditView::Paste(pWin,nFormat);
     }
@@ -1363,9 +1363,9 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
+sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL)
     {
         if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
@@ -1374,25 +1374,25 @@ BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
             Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 );
 
             ESelection aESel(pTextEditOutlinerView->GetSelection());
-            if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==USHORT(nParaAnz-1))
+            if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1))
             {
                 XubString aStr(pTextEditOutliner->GetText(pLastPara));
 
                 if(aStr.Len() == aESel.nEndPos)
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
             // und nun auch noch fuer den Fall, das rueckwaerts selektiert wurde
-            if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==USHORT(nParaAnz-1))
+            if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1))
             {
                 XubString aStr(pTextEditOutliner->GetText(pLastPara));
 
                 if(aStr.Len() == aESel.nStartPos)
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
         }
         else
         {
-            bRet=TRUE;
+            bRet=sal_True;
         }
     }
     return bRet;
@@ -1411,9 +1411,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible()
     }
 }
 
-USHORT SdrObjEditView::GetScriptType() const
+sal_uInt16 SdrObjEditView::GetScriptType() const
 {
-    USHORT nScriptType = 0;
+    sal_uInt16 nScriptType = 0;
 
     if( IsTextEdit() )
     {
@@ -1445,11 +1445,11 @@ USHORT SdrObjEditView::GetScriptType() const
 }
 
 /* new interface src537 */
-BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if( mxSelectionController.is() )
         if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) )
-            return TRUE;
+            return sal_True;
 
     if(IsTextEdit())
     {
@@ -1469,8 +1469,8 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
         if(pTextEditOutlinerView)
         {
             // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
-            rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
-            rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+            rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+            rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
         }
 
         if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get())
@@ -1478,7 +1478,7 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
             MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr);
         }
 
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -1486,11 +1486,11 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
     }
 }
 
-BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
-    BOOL bRet=FALSE;
-    BOOL bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
-    BOOL bAllTextSelected=ImpIsTextEditAllSelected();
+    sal_Bool bRet=sal_False;
+    sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
+    sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
     SfxItemSet* pModifiedSet=NULL;
     const SfxItemSet* pSet=&rSet;
     //const SvxAdjustItem* pParaJust=NULL;
@@ -1510,16 +1510,16 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
     {
 #ifdef DBG_UTIL
         {
-            BOOL bHasEEFeatureItems=FALSE;
+            sal_Bool bHasEEFeatureItems=sal_False;
             SfxItemIter aIter(rSet);
             const SfxPoolItem* pItem=aIter.FirstItem();
             while (!bHasEEFeatureItems && pItem!=NULL)
             {
                 if (!IsInvalidItem(pItem))
                 {
-                    USHORT nW=pItem->Which();
+                    sal_uInt16 nW=pItem->Which();
                     if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END)
-                        bHasEEFeatureItems=TRUE;
+                        bHasEEFeatureItems=sal_True;
                 }
 
                 pItem=aIter.NextItem();
@@ -1534,8 +1534,8 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
         }
 #endif
 
-        BOOL bOnlyEEItems;
-        BOOL bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
+        sal_Bool bOnlyEEItems;
+        sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
         // alles selektiert? -> Attrs auch an den Rahmen
         // und falls keine EEItems, dann Attrs nur an den Rahmen
         if (bAllTextSelected || bNoEEItems)
@@ -1569,7 +1569,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
                 mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll);
 
                 FlushComeBackTimer(); // Damit ModeHasChanged sofort kommt
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
         else if (!bOnlyEEItems)
@@ -1577,15 +1577,15 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
             // sonst Set ggf. splitten
             // Es wird nun ein ItemSet aSet gemacht, in den die EE_Items von
             // *pSet nicht enhalten ist (ansonsten ist es eine Kopie).
-            USHORT* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
+            sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
             SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable);
             /*90353*/ delete[] pNewWhichTable;
             SfxWhichIter aIter(aSet);
-            USHORT nWhich=aIter.FirstWhich();
+            sal_uInt16 nWhich=aIter.FirstWhich();
             while (nWhich!=0)
             {
                 const SfxPoolItem* pItem;
-                SfxItemState eState=pSet->GetItemState(nWhich,FALSE,&pItem);
+                SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem);
                 if (eState==SFX_ITEM_SET) aSet.Put(*pItem);
                 nWhich=aIter.NextWhich();
             }
@@ -1614,14 +1614,14 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
                 }
             }
             FlushComeBackTimer();
-            bRet=TRUE;
+            bRet=sal_True;
         }
         if(!bNoEEItems)
         {
             // und nun die Attribute auch noch an die EditEngine
             if (bReplaceAll) {
                 // Am Outliner kann man leider nur alle Attribute platthauen
-                pTextEditOutlinerView->RemoveAttribs( TRUE );
+                pTextEditOutlinerView->RemoveAttribs( sal_True );
             }
             pTextEditOutlinerView->SetAttribs(rSet);
 
@@ -1632,7 +1632,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
 
             ImpMakeTextCursorAreaVisible();
         }
-        bRet=TRUE;
+        bRet=sal_True;
     }
     if (pModifiedSet!=NULL)
         delete pModifiedSet;
@@ -1660,12 +1660,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const
     return pSheet;
 }
 
-BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if( mxSelectionController.is() )
     {
         if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) )
-            return TRUE;
+            return sal_True;
     }
 
     // if we are currently in edit mode we must also set the stylesheet
@@ -1675,8 +1675,8 @@ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveH
     {
         Outliner* pOutliner = pTextEditOutlinerView->GetOutliner();
 
-        const ULONG nParaCount = pOutliner->GetParagraphCount();
-        ULONG nPara;
+        const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount();
+        sal_uIntPtr nPara;
         for( nPara = 0; nPara < nParaCount; nPara++ )
         {
             pOutliner->SetStyleSheet( nPara, pStyleSheet );
@@ -1694,7 +1694,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin)
     
     if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) 
     {
-        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,FALSE,NULL);
+        OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL);
         pTextEditOutliner->InsertView(pOutlView);
     }
 }
@@ -1705,7 +1705,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
     
     if(mxTextEditObj.is() && !bTextEditOnlyOneView && pOldWin->GetOutDevType()==OUTDEV_WINDOW) 
     {
-        for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) {
+        for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) {
             i--;
             OutlinerView* pOLV=pTextEditOutliner->GetView(i);
             if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) {
@@ -1715,7 +1715,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
     }
 }
 
-BOOL SdrObjEditView::IsTextEditInSelectionMode() const
+sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const
 {
     return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode();
 }
@@ -1732,17 +1732,17 @@ BOOL SdrObjEditView::IsTextEditInSelectionMode() const
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
+sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     BrkMacroObj();
     if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) {
         nTol=ImpGetHitTolLogic(nTol,NULL);
         pMacroObj=pObj;
         pMacroPV=pPV;
         pMacroWin=pWin;
-        bMacroDown=FALSE;
-        nMacroTol=USHORT(nTol);
+        bMacroDown=sal_False;
+        nMacroTol=sal_uInt16(nTol);
         aMacroDownPos=rPnt;
         MovMacroObj(rPnt);
     }
@@ -1761,7 +1761,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos)
         aHitRec.pPageView=pMacroPV;
         aHitRec.pOut=pMacroWin;
         pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
-        bMacroDown=FALSE;
+        bMacroDown=sal_False;
     }
 }
 
@@ -1775,10 +1775,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos)
         aHitRec.nTol=nMacroTol;
         aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
         aHitRec.pPageView=pMacroPV;
-        aHitRec.bDown=TRUE;
+        aHitRec.bDown=sal_True;
         aHitRec.pOut=pMacroWin;
         pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
-        bMacroDown=TRUE;
+        bMacroDown=sal_True;
     }
 }
 
@@ -1793,7 +1793,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt)
         aHitRec.pPageView=pMacroPV;
         aHitRec.bDown=bMacroDown;
         aHitRec.pOut=pMacroWin;
-        BOOL bDown=pMacroObj->IsMacroHit(aHitRec);
+        sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec);
         if (bDown) ImpMacroDown(rPnt);
         else ImpMacroUp(rPnt);
     }
@@ -1809,7 +1809,7 @@ void SdrObjEditView::BrkMacroObj()
     }
 }
 
-BOOL SdrObjEditView::EndMacroObj()
+sal_Bool SdrObjEditView::EndMacroObj()
 {
     if (pMacroObj!=NULL && bMacroDown) {
         ImpMacroUp(aMacroDownPos);
@@ -1819,7 +1819,7 @@ BOOL SdrObjEditView::EndMacroObj()
         aHitRec.nTol=nMacroTol;
         aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
         aHitRec.pPageView=pMacroPV;
-        aHitRec.bDown=TRUE;
+        aHitRec.bDown=sal_True;
         aHitRec.pOut=pMacroWin;
         bool bRet=pMacroObj->DoMacro(aHitRec);
         pMacroObj=NULL;
@@ -1828,7 +1828,7 @@ BOOL SdrObjEditView::EndMacroObj()
         return bRet;
     } else {
         BrkMacroObj();
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -1921,7 +1921,7 @@ void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* )
     // applications can derive from these virtual methods to do something before a drop or paste operation
 }
 
-bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
+bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const
 {
     if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor )
         return false;
@@ -1971,9 +1971,9 @@ bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nO
     }
 }
 
-static const USHORT* GetFormatRangeImpl( bool bTextOnly )
+static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly )
 {
-    static const USHORT gRanges[] = {
+    static const sal_uInt16 gRanges[] = {
         SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
         SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
         SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST,
@@ -2003,7 +2003,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
         }
         else
         {
-            const BOOL bOnlyHardAttr = FALSE;
+            const sal_Bool bOnlyHardAttr = sal_False;
             rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) );
         }
         return true;
@@ -2012,14 +2012,14 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
     return false;
 }
 
-static SfxItemSet CreatePaintSet( const USHORT *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
+static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
 {
     SfxItemSet aPaintSet( rPool, pRanges );
 
     while( *pRanges )
     {
-        USHORT nWhich = *pRanges++;
-        const USHORT nLastWhich = *pRanges++;
+        sal_uInt16 nWhich = *pRanges++;
+        const sal_uInt16 nLastWhich = *pRanges++;
 
         if( bNoCharacterFormats && (nWhich == EE_CHAR_START) )
             continue;
@@ -2088,7 +2088,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
             // All formating items (see ranges above) that are unequal in selected shape and
             // the format paintbrush are hard set on the selected shape.
 
-            const USHORT* pRanges = rFormatSet.GetRanges();
+            const sal_uInt16* pRanges = rFormatSet.GetRanges();
             bool bTextOnly = true;
             
             while( *pRanges )
@@ -2104,7 +2104,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
             if( !bTextOnly )
             {
                 SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) );
-                const BOOL bReplaceAll = FALSE;
+                const sal_Bool bReplaceAll = sal_False;
                 SetAttrToMarked(aPaintSet, bReplaceAll);
             }
 
@@ -2132,7 +2132,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
                 if( !aSel.HasRange() )
                     pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) );
             
-                const BOOL bRemoveParaAttribs = !bNoParagraphFormats;
+                const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats;
                 pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
                 SfxItemSet aSet( pOLV->GetAttribs() );
                 SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) );
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 50b30f3e7d..6e7c8441db 100644..100755
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -32,12 +32,12 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <svx/svdetc.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "svdviter.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
@@ -152,8 +152,8 @@ void OLEObjCache::UnloadOnDemand()
     {
         // more objects than configured cache size try to remove objects
         // of course not the freshly inserted one at nIndex=0
-        ULONG nCount2 = Count();
-        ULONG nIndex = nCount2-1;
+        sal_uIntPtr nCount2 = Count();
+        sal_uIntPtr nIndex = nCount2-1;
         while( nIndex && nCount2 > nSize )
         {
             SdrOle2Obj* pUnloadObj = (SdrOle2Obj*) GetObject(nIndex--);
@@ -172,7 +172,7 @@ void OLEObjCache::UnloadOnDemand()
                         uno::Reference< frame::XModel > xUnloadModel( xUnloadObj->getComponent(), uno::UNO_QUERY );
                         if ( xUnloadModel.is() )
                         {
-                            for ( ULONG nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
+                            for ( sal_uIntPtr nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
                             {
                                 SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(nCheckInd);
                                 if ( pCacheObj && pCacheObj != pUnloadObj )
@@ -196,7 +196,7 @@ void OLEObjCache::UnloadOnDemand()
     }
 }
 
-void OLEObjCache::SetSize(ULONG nNewSize)
+void OLEObjCache::SetSize(sal_uIntPtr nNewSize)
 {
     nSize = nNewSize;
 }
@@ -212,11 +212,11 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
     }
 
     // get the old position of the object to know whether it is already in container
-    ULONG nOldPos = GetPos( pObj );
+    sal_uIntPtr nOldPos = GetPos( pObj );
 
     // insert object into first position
     Remove( nOldPos );
-    Insert(pObj, (ULONG) 0L);
+    Insert(pObj, (sal_uIntPtr) 0L);
 
     if ( nOldPos == CONTAINER_ENTRY_NOTFOUND )
     {
@@ -230,9 +230,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
     Remove(pObj);
 }
 
-BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
+sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
 {
-    BOOL bUnloaded = FALSE;
+    sal_Bool bUnloaded = sal_False;
     if (pObj)
     {
         //#i80528# The old mechanism is completely useless, only taking into account if
@@ -260,9 +260,9 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/)
     return 0;
 }
 
-void ContainerSorter::DoSort(ULONG a, ULONG b) const
+void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const
 {
-    ULONG nAnz=rCont.Count();
+    sal_uIntPtr nAnz=rCont.Count();
     if (b>nAnz) b=nAnz;
     if (b>0) b--;
     if (a<b) ImpSubSort(a,b);
@@ -307,8 +307,8 @@ public:
 
 int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) const
 {
-    USHORT n1=USHORT(ULONG(pElem1));
-    USHORT n2=USHORT(ULONG(pElem2));
+    sal_uInt16 n1=sal_uInt16(sal_uIntPtr(pElem1));
+    sal_uInt16 n2=sal_uInt16(sal_uIntPtr(pElem2));
     return n1<n2 ? -1 : n1>n2 ? 1 : 0;
 }
 
@@ -330,10 +330,10 @@ public:
         // Kein Clipping in die Metafileaufzeichnung
         GDIMetaFile* pMtf=rOut.GetConnectMetaFile();
         if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL;
-        if (pMtf!=NULL) pMtf->Pause(TRUE);
+        if (pMtf!=NULL) pMtf->Pause(sal_True);
         if (bClip) rOut.SetClipRegion(aClip);
         else rOut.SetClipRegion();
-        if (pMtf!=NULL) pMtf->Pause(FALSE);
+        if (pMtf!=NULL) pMtf->Pause(sal_False);
     }
 };
 
@@ -349,7 +349,7 @@ public:
         aBckgrdColor( rOut.GetBackground().GetColor() ),
         aFont (rOut.GetFont()) {}
 
-    ImpColorMerk(const OutputDevice& rOut, USHORT nMode)
+    ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode)
     {
         if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN )
             aLineColor = rOut.GetLineColor();
@@ -364,7 +364,7 @@ public:
             aFont=rOut.GetFont();
     }
 
-    void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
+    void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
     {
         if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN)
             rOut.SetLineColor( aLineColor );
@@ -386,7 +386,7 @@ public:
     const Color& GetLineColor() const { return aLineColor; }
 };
 
-ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, bool bAutoMerk):
+ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk):
     pFarbMerk(NULL),
     pClipMerk(NULL),
     pLineColorMerk(NULL),
@@ -422,7 +422,7 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
     if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
         pClipMerk=new ImpClipMerk(rOut);
 
-    USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
+    sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
 
     if (nCol==SDRHDC_SAVEPEN)
         pLineColorMerk=new Color( rOut.GetLineColor() );
@@ -432,14 +432,14 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
         pFarbMerk=new ImpColorMerk(rOut,nCol);
 }
 
-void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const
+void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const
 {
     nMask&=nMode; // nur restaurieren, was auch gesichert wurde
 
     if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL)
         pClipMerk->Restore(rOut);
 
-    USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
+    sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
 
     if (nCol==SDRHDC_SAVEPEN)
     {
@@ -565,7 +565,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
                     for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
                     {
                         const BitmapColor& rCol2 = (pAccess->HasPalette())
-                            ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX))
+                            ? pAccess->GetPaletteColor((sal_uInt8)pAccess->GetPixel(nY, nX))
                             : pAccess->GetPixel(nY, nX);
 
                         nRt += rCol2.GetRed();
@@ -579,7 +579,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
                 nGn /= nAnz;
                 nBl /= nAnz;
 
-                rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl));
+                rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl));
 
                 bRetval = true;
             }
@@ -631,7 +631,7 @@ void SdrEngineDefaults::LanguageHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel )
+SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel )
 {
     //SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
 
@@ -697,47 +697,47 @@ String GetResourceString(sal_uInt16 nResID)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE)
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE)
 {
-    BOOL bHas=FALSE;
-    BOOL bOnly=TRUE;
-    BOOL bLookOnly=pbOnlyEE!=NULL;
+    sal_Bool bHas=sal_False;
+    sal_Bool bOnly=sal_True;
+    sal_Bool bLookOnly=pbOnlyEE!=NULL;
     SfxWhichIter aIter(rSet);
-    USHORT nWhich=aIter.FirstWhich();
+    sal_uInt16 nWhich=aIter.FirstWhich();
     while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) {
         // bei bInklDefaults ist der gesamte Which-Range
         // ausschlaggebend, ansonsten nur die gesetzten Items
         // Disabled und DontCare wird als Loch im Which-Range betrachtet
         SfxItemState eState=rSet.GetItemState(nWhich);
         if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) {
-            if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=FALSE;
-            else bHas=TRUE;
+            if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False;
+            else bHas=sal_True;
         }
         nWhich=aIter.NextWhich();
     }
-    if (!bHas) bOnly=FALSE;
+    if (!bHas) bOnly=sal_False;
     if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly;
     return bHas;
 }
 
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd)
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd)
 {
     // insgesamt sind 6 Faelle moeglich (je Range):
     //		   [Beg..End]		   zu entfernender Range
     // [b..e]	 [b..e]    [b..e]  Fall 1,3,2: egal, ganz weg, egal  + Ranges
     // [b........e]  [b........e]  Fall 4,5  : Bereich verkleinern	 | in
     // [b......................e]  Fall 6	 : Splitting			 + pOldWhichTable
-    USHORT nAnz=0;
+    sal_uInt16 nAnz=0;
     while (pOldWhichTable[nAnz]!=0) nAnz++;
     nAnz++; // nAnz muesste nun in jedem Fall eine ungerade Zahl sein (0 am Ende des Arrays)
     DBG_ASSERT((nAnz&1)==1,"Joe: RemoveWhichRange: WhichTable hat keine ungerade Anzahl von Eintraegen");
-    USHORT nAlloc=nAnz;
+    sal_uInt16 nAlloc=nAnz;
     // benoetigte Groesse des neuen Arrays ermitteln
-    USHORT nNum=nAnz-1;
+    sal_uInt16 nNum=nAnz-1;
     while (nNum!=0) {
         nNum-=2;
-        USHORT nBeg=pOldWhichTable[nNum];
-        USHORT nEnd=pOldWhichTable[nNum+1];
+        sal_uInt16 nBeg=pOldWhichTable[nNum];
+        sal_uInt16 nEnd=pOldWhichTable[nNum+1];
         if (nEnd<nRangeBeg)  /*nCase=1*/ ;
         else if (nBeg>nRangeEnd) /* nCase=2 */ ;
         else if (nBeg>=nRangeBeg && nEnd<=nRangeEnd) /* nCase=3 */ nAlloc-=2;
@@ -746,15 +746,15 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
         else /* nCase=6 */ nAlloc+=2;
     }
 
-    USHORT* pNewWhichTable=new USHORT[nAlloc];
-    memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(USHORT));
+    sal_uInt16* pNewWhichTable=new sal_uInt16[nAlloc];
+    memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(sal_uInt16));
     pNewWhichTable[nAlloc-1]=0; // im Falle 3 fehlt die 0 am Ende
     // nun die unerwuenschten Ranges entfernen
     nNum=nAlloc-1;
     while (nNum!=0) {
         nNum-=2;
-        USHORT nBeg=pNewWhichTable[nNum];
-        USHORT nEnd=pNewWhichTable[nNum+1];
+        sal_uInt16 nBeg=pNewWhichTable[nNum];
+        sal_uInt16 nEnd=pNewWhichTable[nNum+1];
         unsigned nCase=0;
         if (nEnd<nRangeBeg) nCase=1;
         else if (nBeg>nRangeEnd) nCase=2;
@@ -764,14 +764,14 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
         else nCase=6;
         switch (nCase) {
             case 3: {
-                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
                 memcpy(&pNewWhichTable[nNum],&pNewWhichTable[nNum+2],nTailBytes);
                 nAnz-=2; // Merken: Array hat sich verkleinert
             } break;
             case 4: pNewWhichTable[nNum+1]=nRangeBeg-1; break;
             case 5: pNewWhichTable[nNum]=nRangeEnd+1;	  break;
             case 6: {
-                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+                unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
                 memcpy(&pNewWhichTable[nNum+4],&pNewWhichTable[nNum+2],nTailBytes);
                 nAnz+=2; // Merken: Array hat sich vergroessert
                 pNewWhichTable[nNum+2]=nRangeEnd+1;
@@ -803,13 +803,13 @@ SvdProgressInfo::SvdProgressInfo( Link *_pLink )
     nCurInsert	 = 0;
 }
 
-void SvdProgressInfo::Init( ULONG _nSumActionCount, ULONG _nObjCount )
+void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount )
 {
     nSumActionCount = _nSumActionCount;
     nObjCount = _nObjCount;
 }
 
-BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
+sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
 {
     nSumCurAction += nAnzActions;
     nCurAction += nAnzActions;
@@ -819,7 +819,7 @@ BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
     return pLink->Call(NULL) == 1L;
 }
 
-BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
+sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
 {
     nSumCurAction += nAnzInserts;
     nCurInsert += nAnzInserts;
@@ -827,23 +827,23 @@ BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
     return pLink->Call(NULL) == 1L;
 }
 
-BOOL SvdProgressInfo::ReportRescales( ULONG nAnzRescales )
+sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
 {
     nSumCurAction += nAnzRescales;
     return pLink->Call(NULL) == 1L;
 }
 
-void SvdProgressInfo::SetActionCount( ULONG _nActionCount )
+void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount )
 {
     nActionCount = _nActionCount;
 }
 
-void SvdProgressInfo::SetInsertCount( ULONG _nInsertCount )
+void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount )
 {
     nInsertCount = _nInsertCount;
 }
 
-BOOL SvdProgressInfo::SetNextObject()
+sal_Bool SvdProgressInfo::SetNextObject()
 {
     nActionCount = 0;
     nCurAction	 = 0;
@@ -879,7 +879,7 @@ namespace
         bool bRet(false);
         bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false);
 
-        for(ULONG no(rList.GetObjCount()); !bRet && no > 0; )
+        for(sal_uIntPtr no(rList.GetObjCount()); !bRet && no > 0; )
         {
             no--;
             SdrObject* pObj = rList.GetObj(no);
@@ -963,17 +963,17 @@ namespace
         if(!rStyleSettings.GetHighContrastMode())
         {
             // search in page
-            const USHORT SPOTCOUNT(5);
+            const sal_uInt16 SPOTCOUNT(5);
             Point aSpotPos[SPOTCOUNT];
             Color aSpotColor[SPOTCOUNT];
-            ULONG nHeight( rArea.GetSize().Height() );
-            ULONG nWidth( rArea.GetSize().Width() );
-            ULONG nWidth14  = nWidth / 4;
-            ULONG nHeight14 = nHeight / 4;
-            ULONG nWidth34  = ( 3 * nWidth ) / 4;
-            ULONG nHeight34 = ( 3 * nHeight ) / 4;
-
-            USHORT i;
+            sal_uIntPtr nHeight( rArea.GetSize().Height() );
+            sal_uIntPtr nWidth( rArea.GetSize().Width() );
+            sal_uIntPtr nWidth14  = nWidth / 4;
+            sal_uIntPtr nHeight14 = nHeight / 4;
+            sal_uIntPtr nWidth34  = ( 3 * nWidth ) / 4;
+            sal_uIntPtr nHeight34 = ( 3 * nHeight ) / 4;
+
+            sal_uInt16 i;
             for ( i = 0; i < SPOTCOUNT; i++ )
             {
                 // five spots are used
@@ -1028,14 +1028,14 @@ namespace
                 impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false);
             }
 
-            USHORT aMatch[SPOTCOUNT];
+            sal_uInt16 aMatch[SPOTCOUNT];
 
             for ( i = 0; i < SPOTCOUNT; i++ )
             {
                 // were same spot colors found?
                 aMatch[i] = 0;
 
-                for ( USHORT j = 0; j < SPOTCOUNT; j++ )
+                for ( sal_uInt16 j = 0; j < SPOTCOUNT; j++ )
                 {
                     if( j != i )
                     {
@@ -1050,7 +1050,7 @@ namespace
             // highest weight to center spot
             aBackground = aSpotColor[0];
 
-            for ( USHORT nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
+            for ( sal_uInt16 nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
             {
                 // which spot color was found most?
                 for ( i = 0; i < SPOTCOUNT; i++ )
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 1984b654db..11c1b06845 100644..100755
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -58,7 +58,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdocirc.hxx>
@@ -83,10 +83,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel):
     maLineJoin(basegfx::B2DLINEJOIN_NONE),
     maDash(XDASH_RECT, 0, 0, 0, 0, 0),
     fScaleX(0.0),fScaleY(0.0),
-    bFntDirty(TRUE),
-    bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE)
+    bFntDirty(sal_True),
+    bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False)
 {
-    aVD.EnableOutput(FALSE);
+    aVD.EnableOutput(sal_False);
 
     // #i111954# init to no fill and no line initially
     aVD.SetLineColor();
@@ -106,15 +106,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport()
     delete pTextAttr;
 }
 
-ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
+sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     SdrObjList& rOL,
-    ULONG nInsPos,
+    sal_uIntPtr nInsPos,
     SvdProgressInfo *pProgrInfo)
 {
     pPage = rOL.GetPage();
     GDIMetaFile* pTmpMtf=NULL;
     GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf;
-    ULONG nActionAnz=pMtf->GetActionCount();
+    sal_uIntPtr nActionAnz=pMtf->GetActionCount();
     sal_Bool bError = sal_False;
 
 
@@ -150,13 +150,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     if(65000 < nActionAnz)
     {
         nActionAnz = 65000;
-        bError = TRUE;
+        bError = sal_True;
     }
 
     if(pProgrInfo)
         pProgrInfo->SetActionCount(nActionAnz);
 
-    ULONG nActionsToReport = 0;
+    sal_uIntPtr nActionsToReport = 0;
 
     for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() )
     {
@@ -221,7 +221,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     // MapMode-Scaling  vornehmen
     MapScaling();
     // Objekte in vorgegebenes Rechteck hineinskalieren
-    ULONG nAnz=aTmpList.GetObjCount();
+    sal_uIntPtr nAnz=aTmpList.GetObjCount();
 
     // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt.
     // Da in aTmpList allerdings weniger eintraege als GetActionCount()
@@ -241,7 +241,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
     // alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen
     if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();
     SdrInsertReason aReason(SDRREASON_VIEWCALL);
-    for (ULONG i=0; i<nAnz; i++)
+    for (sal_uIntPtr i=0; i<nAnz; i++)
     {
          SdrObject* pObj=aTmpList.GetObj(i);
          rOL.NbcInsertObject(pObj,nInsPos,&aReason);
@@ -272,7 +272,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
 
 void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr)
 {
-    bNoLine = FALSE; bNoFill = FALSE;
+    bNoLine = sal_False; bNoFill = sal_False;
     bool bLine = !bForceTextAttr;
     bool bFill = (pObj==NULL) || (pObj->IsClosedObj() && !bForceTextAttr);
     bool bText = bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL);
@@ -322,7 +322,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         }
     }
     else
-        bNoLine = TRUE;
+        bNoLine = sal_True;
 
     if ( bFill )
     {
@@ -335,7 +335,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
             pFillAttr->Put(XFillStyleItem(XFILL_NONE));
     }
     else
-        bNoFill = TRUE;
+        bNoFill = sal_True;
 
     if ( bText && bFntDirty )
     {
@@ -362,7 +362,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
         pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE));
         pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR));
         //... svxfont textitem svditext
-        bFntDirty=FALSE;
+        bFntDirty=sal_False;
     }
     if (pObj!=NULL)
     {
@@ -439,8 +439,8 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
         }
         else
         {
-            bLastObjWasPolyWithoutLine = FALSE;
-            bLastObjWasLine = FALSE;
+            bLastObjWasPolyWithoutLine = sal_False;
+            bLastObjWasLine = sal_False;
         }
     }
 }
@@ -773,7 +773,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
     if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) )
     {
         pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH );
-        pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) );
+        pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
         // don't let the margins eat the space needed for the text
         pText->SetMergedItem ( SdrTextUpperDistItem (0));
         pText->SetMergedItem ( SdrTextLowerDistItem (0));
@@ -787,7 +787,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
     pText->SetModel( pModel );
     pText->SetLayer( nLayer );
     pText->NbcSetText( rStr );
-    SetAttributes( pText, TRUE );
+    SetAttributes( pText, sal_True );
     pText->SetSnapRect( aTextRect );
 
     if (!aFnt.IsTransparent())
@@ -928,8 +928,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct)
 {
     MapScaling();
     rAct.Execute(&aVD);
-    bLastObjWasPolyWithoutLine=FALSE;
-    bLastObjWasLine=FALSE;
+    bLastObjWasPolyWithoutLine=sal_False;
+    bLastObjWasLine=sal_False;
 }
 
 void ImpSdrGDIMetaFileImport::MapScaling()
@@ -979,7 +979,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
                     aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
                     aXGradient.SetStartColor(rGrad.GetStartColor());
                     aXGradient.SetEndColor(rGrad.GetEndColor());
-                    aXGradient.SetAngle((USHORT)rGrad.GetAngle());
+                    aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
                     aXGradient.SetBorder(rGrad.GetBorder());
                     aXGradient.SetXOffset(rGrad.GetOfsX());
                     aXGradient.SetYOffset(rGrad.GetOfsY());
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index aa14791284..b92b6e0170 100644..100755
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -58,11 +58,11 @@ public:
     {}
 
     void Clear() { aList.Clear(); }
-    ULONG GetObjCount() const { return aList.Count(); }
-    SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
-    SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); }
-    void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
-    void RemoveObject(ULONG nPos) { aList.Remove(nPos); }
+    sal_uLong GetObjCount() const { return aList.Count(); }
+    SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+    SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); }
+    void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); }
+    void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); }
 };
 
 //************************************************************
@@ -75,7 +75,7 @@ protected:
     SdrObjRefList				aTmpList;
     VirtualDevice				aVD;
     Rectangle					aScaleRect;
-    ULONG						nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
+    sal_uLong						nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet
     SfxItemSet*					pLineAttr;
     SfxItemSet*					pFillAttr;
     SfxItemSet*					pTextAttr;
@@ -131,12 +131,12 @@ protected:
     void DoAction(MetaFillColorAction		& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaTextColorAction		& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaTextFillColorAction	& rAct) { rAct.Execute(&aVD); }
-    void DoAction(MetaFontAction			& rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
-    void DoAction(MetaTextAlignAction		& rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+    void DoAction(MetaFontAction			& rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
+    void DoAction(MetaTextAlignAction		& rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
     void DoAction(MetaClipRegionAction		& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaRasterOpAction		& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaPushAction			& rAct) { rAct.Execute(&aVD); }
-    void DoAction(MetaPopAction				& rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; }
+    void DoAction(MetaPopAction				& rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; }
     void DoAction(MetaMoveClipRegionAction	& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); }
     void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); }
@@ -154,7 +154,7 @@ protected:
 public:
     ImpSdrGDIMetaFileImport(SdrModel& rModel);
     ~ImpSdrGDIMetaFileImport();
-    ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
+    sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL);
     void SetLayer(SdrLayerID nLay) { nLayer=nLay; }
     SdrLayerID GetLayer() const { return nLayer; }
     void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; }
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 368ff3db61..84aa13e925 100644..100755
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -33,8 +33,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
@@ -58,14 +58,14 @@ SdrGlueEditView::~SdrGlueEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0) {
             SdrGluePointList* pGPL=NULL;
             if (bConst) {
@@ -79,10 +79,10 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
                 if(!bConst && IsUndoEnabled() )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
                 {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                     {
                         SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
@@ -104,38 +104,38 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
 
 static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
     if (nRet!=FUZZY) {
-        USHORT nEsc=rGP.GetEscDir();
-        BOOL bOn=(nEsc & *(USHORT*)pnThisEsc)!=0;
-        if (bFirst) { nRet=bOn; bFirst=FALSE; }
+        sal_uInt16 nEsc=rGP.GetEscDir();
+        sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0;
+        if (bFirst) { nRet=bOn; bFirst=sal_False; }
         else if (nRet!=bOn) nRet=FUZZY;
     }
 }
 
-TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(USHORT nThisEsc) const
+TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    USHORT nRet=FALSE;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,TRUE,&bFirst,&nThisEsc,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_uInt16 nRet=sal_False;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet);
     return (TRISTATE)nRet;
 }
 
 static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*)
 {
-    USHORT nEsc=rGP.GetEscDir();
-    if (*(BOOL*)pbOn) nEsc|=*(USHORT*)pnThisEsc;
-    else nEsc&=~*(USHORT*)pnThisEsc;
+    sal_uInt16 nEsc=rGP.GetEscDir();
+    if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc;
+    else nEsc&=~*(sal_uInt16*)pnThisEsc;
     rGP.SetEscDir(nEsc);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetEscDir,FALSE,&nThisEsc,&bOn);
+    ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn);
     EndUndo();
 }
 
@@ -143,11 +143,11 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
 
 static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
     if (nRet!=FUZZY) {
         bool bOn=rGP.IsPercent();
-        if (bFirst) { nRet=bOn; bFirst=FALSE; }
+        if (bFirst) { nRet=bOn; bFirst=sal_False; }
         else if ((nRet!=0)!=bOn) nRet=FUZZY;
     }
 }
@@ -155,24 +155,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo
 TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    USHORT nRet=TRUE;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,TRUE,&bFirst,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_uInt16 nRet=sal_True;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet);
     return (TRISTATE)nRet;
 }
 
 static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
 {
     Point aPos(rGP.GetAbsolutePos(*pObj));
-    rGP.SetPercent(*(BOOL*)pbOn);
+    rGP.SetPercent(*(sal_Bool*)pbOn);
     rGP.SetAbsolutePos(aPos,*pObj);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetPercent,FALSE,&bOn);
+    ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn);
     EndUndo();
 }
 
@@ -180,61 +180,61 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
 
 static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
 {
-    USHORT& nRet=*(USHORT*)pnRet;
-    BOOL& bFirst=*(BOOL*)pbFirst;
-    BOOL& bDontCare=*(BOOL*)pbDontCare;
-    BOOL bVert=*(BOOL*)pbVert;
+    sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+    sal_Bool& bFirst=*(sal_Bool*)pbFirst;
+    sal_Bool& bDontCare=*(sal_Bool*)pbDontCare;
+    sal_Bool bVert=*(sal_Bool*)pbVert;
     if (!bDontCare) {
-        USHORT nAlg=0;
+        sal_uInt16 nAlg=0;
         if (bVert) {
             nAlg=rGP.GetVertAlign();
         } else {
             nAlg=rGP.GetHorzAlign();
         }
-        if (bFirst) { nRet=nAlg; bFirst=FALSE; }
+        if (bFirst) { nRet=nAlg; bFirst=sal_False; }
         else if (nRet!=nAlg) {
             if (bVert) {
                 nRet=SDRVERTALIGN_DONTCARE;
             } else {
                 nRet=SDRHORZALIGN_DONTCARE;
             }
-            bDontCare=TRUE;
+            bDontCare=sal_True;
         }
     }
 }
 
-USHORT SdrGlueEditView::GetMarkedGluePointsAlign(BOOL bVert) const
+sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bFirst=TRUE;
-    BOOL bDontCare=FALSE;
-    USHORT nRet=0;
-    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,TRUE,&bFirst,&bDontCare,&bVert,&nRet);
+    sal_Bool bFirst=sal_True;
+    sal_Bool bDontCare=sal_False;
+    sal_uInt16 nRet=0;
+    ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet);
     return nRet;
 }
 
 static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*)
 {
     Point aPos(rGP.GetAbsolutePos(*pObj));
-    if (*(BOOL*)pbVert) { // bVert?
-        rGP.SetVertAlign(*(USHORT*)pnAlign);
+    if (*(sal_Bool*)pbVert) { // bVert?
+        rGP.SetVertAlign(*(sal_uInt16*)pnAlign);
     } else {
-        rGP.SetHorzAlign(*(USHORT*)pnAlign);
+        rGP.SetHorzAlign(*(sal_uInt16*)pnAlign);
     }
     rGP.SetAbsolutePos(aPos,*pObj);
 }
 
-void SdrGlueEditView::SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign)
+void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign)
 {
     ForceUndirtyMrkPnt();
     BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
-    ImpDoMarkedGluePoints(ImpSetAlign,FALSE,&bVert,&nAlign);
+    ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign);
     EndUndo();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
+sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
 {
     return HasMarkedGluePoints();
 }
@@ -247,13 +247,13 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
     if( bUndo )
         BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE);
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0)
         {
             SdrGluePointList* pGPL=pObj->ForceGluePointList();
@@ -262,10 +262,10 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
                 if( bUndo )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
                 {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                     {
                         pGPL->Delete(nGlueIdx);
@@ -292,28 +292,28 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
     if( bUndo )
         BegUndo();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         SdrGluePointList* pGPL=pObj->ForceGluePointList();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0 && pGPL!=NULL)
         {
             if( bUndo )
                 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-            for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+            for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
             {
-                USHORT nPtId=pPts->GetObject(nPtNum);
-                USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                 if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
                 {
                     SdrGluePoint aNewGP((*pGPL)[nGlueIdx]);  // GluePoint klonen
-                    USHORT nNewIdx=pGPL->Insert(aNewGP);     // und einfuegen
-                    USHORT nNewId=(*pGPL)[nNewIdx].GetId();  // Id des neuen GluePoints ermitteln
+                    sal_uInt16 nNewIdx=pGPL->Insert(aNewGP);     // und einfuegen
+                    sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId();  // Id des neuen GluePoints ermitteln
                     pPts->Replace(nNewId,nPtNum);            // und diesen markieren (anstelle des alten)
                 }
             }
@@ -330,12 +330,12 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
 
 void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         if (nPtAnz!=0) {
             SdrGluePointList* pGPL=pObj->ForceGluePointList();
             if (pGPL!=NULL)
@@ -343,9 +343,9 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
                 if( IsUndoEnabled() )
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
 
-                for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
-                    USHORT nPtId=pPts->GetObject(nPtNum);
-                    USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+                for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
+                    sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+                    sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
                     if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) {
                         SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
                         Point aPos(rGP.GetAbsolutePos(*pObj));
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index e43faf9d0c..a44cafa62e 100644..100755
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -160,7 +160,7 @@ void SdrGluePoint::SetAlignAngle(long nWink)
     else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM;
 }
 
-long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
+long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const
 {
     switch (nEsc) {
         case SDRESC_RIGHT : return 0;
@@ -171,7 +171,7 @@ long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
     return 0;
 }
 
-USHORT SdrGluePoint::EscAngleToDir(long nWink) const
+sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const
 {
     nWink=NormAngle360(nWink);
     if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT;
@@ -191,8 +191,8 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c
         SetAlignAngle(GetAlignAngle()+nWink);
     }
     // Austrittsrichtungen drehen
-    USHORT nEscDir0=nEscDir;
-    USHORT nEscDir1=0;
+    sal_uInt16 nEscDir0=nEscDir;
+    sal_uInt16 nEscDir1=0;
     if ((nEscDir0&SDRESC_LEFT  )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT  )+nWink);
     if ((nEscDir0&SDRESC_TOP   )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP   )+nWink);
     if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink);
@@ -220,8 +220,8 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
         SetAlignAngle(nAW);
     }
     // Austrittsrichtungen spiegeln
-    USHORT nEscDir0=nEscDir;
-    USHORT nEscDir1=0;
+    sal_uInt16 nEscDir0=nEscDir;
+    sal_uInt16 nEscDir1=0;
     if ((nEscDir0&SDRESC_LEFT)!=0) {
         long nEW=EscDirToAngle(SDRESC_LEFT);
         nEW+=2*(nWink-nEW);
@@ -261,7 +261,7 @@ void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const
     bool bMapMerk=rOut.IsMapModeEnabled();
     Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
     aPt=rOut.LogicToPixel(aPt);
-    rOut.EnableMapMode(FALSE);
+    rOut.EnableMapMode(sal_False);
     long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
 
     rOut.SetLineColor( aBackPenColor );
@@ -296,7 +296,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
     bool bMapMerk=rWin.IsMapModeEnabled();
     Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
     aPt=rWin.LogicToPixel(aPt);
-    rWin.EnableMapMode(FALSE);
+    rWin.EnableMapMode(sal_False);
     long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
 
     // #111096#
@@ -318,8 +318,8 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO
 
 void SdrGluePointList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -328,8 +328,8 @@ void SdrGluePointList::Clear()
 void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 {
     if (GetCount()!=0) Clear();
-    USHORT nAnz=rSrcList.GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rSrcList.GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         Insert(rSrcList[i]);
     }
 }
@@ -337,13 +337,13 @@ void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
 // Die Id's der Klebepunkte in der Liste sind stets streng monoton steigend!
 // Ggf. wird dem neuen Klebepunkt eine neue Id zugewiesen (wenn diese bereits
 // vergeben ist). Die Id 0 ist reserviert.
-USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
+sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
 {
     SdrGluePoint* pGP=new SdrGluePoint(rGP);
-    USHORT nId=pGP->GetId();
-    USHORT nAnz=GetCount();
-    USHORT nInsPos=nAnz;
-    USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
+    sal_uInt16 nId=pGP->GetId();
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nInsPos=nAnz;
+    sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
     DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz");
     bool bHole = nLastId>nAnz;
     if (nId<=nLastId) {
@@ -351,9 +351,9 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
             nId=nLastId+1;
         } else {
             bool bBrk = false;
-            for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) {
+            for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) {
                 const SdrGluePoint* pGP2=GetObject(nNum);
-                USHORT nTmpId=pGP2->GetId();
+                sal_uInt16 nTmpId=pGP2->GetId();
                 if (nTmpId==nId) {
                     nId=nLastId+1; // bereits vorhanden
                     bBrk = true;
@@ -372,35 +372,35 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
 
 void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Invalidate(rWin,pObj);
     }
 }
 
-USHORT SdrGluePointList::FindGluePoint(USHORT nId) const
+sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const
 {
     // Hier noch einen optimaleren Suchalgorithmus implementieren.
     // Die Liste sollte stets sortiert sein!!!!
-    USHORT nAnz=GetCount();
-    USHORT nRet=SDRGLUEPOINT_NOTFOUND;
-    for (USHORT nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+    for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
         const SdrGluePoint* pGP=GetObject(nNum);
         if (pGP->GetId()==nId) nRet=nNum;
     }
     return nRet;
 }
 
-USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, USHORT nId0) const
+sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const
 {
-    USHORT nAnz=GetCount();
-    USHORT nRet=SDRGLUEPOINT_NOTFOUND;
-    USHORT nNum=bBack ? 0 : nAnz;
+    sal_uInt16 nAnz=GetCount();
+    sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+    sal_uInt16 nNum=bBack ? 0 : nAnz;
     while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) {
         if (!bBack) nNum--;
         const SdrGluePoint* pGP=GetObject(nNum);
         if (bNext) {
-            if (pGP->GetId()==nId0) bNext=FALSE;
+            if (pGP->GetId()==nId0) bNext=sal_False;
         } else {
             if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum;
         }
@@ -411,16 +411,16 @@ USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, co
 
 void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->SetReallyAbsolute(bOn,rObj);
     }
 }
 
 void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj);
     }
 }
@@ -434,16 +434,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO
 
 void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj);
     }
 }
 
 void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj)
 {
-    USHORT nAnz=GetCount();
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj);
     }
 }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 0672ae84a0..385e939fa8 100644..100755
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -42,8 +42,8 @@
 #include <vcl/bmpacc.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 #include <svx/svdmodel.hxx>
 #include "gradtrns.hxx"
@@ -63,7 +63,7 @@
 #include <svx/sdr/overlay/overlaytriangle.hxx>
 #include <svx/sdr/overlay/overlayhatchrect.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <vcl/lazydelete.hxx>
@@ -89,10 +89,10 @@ class SdrHdlBitmapSet
     BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle);
 
 public:
-    SdrHdlBitmapSet(UINT16 nResId);
+    SdrHdlBitmapSet(sal_uInt16 nResId);
     ~SdrHdlBitmapSet();
 
-    const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd=0);
+    const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0);
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ public:
 #define INDEX_COUNT         (6)
 #define INDIVIDUAL_COUNT    (4)
 
-SdrHdlBitmapSet::SdrHdlBitmapSet(UINT16 nResId)
+SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
 :   maMarkersBitmap(),
     // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
     maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
@@ -133,7 +133,7 @@ BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const R
 }
 
 // change getting of bitmap to use the big ressource bitmap
-const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd)
+const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
 {
     // fill in size and source position in maMarkersBitmap
     const sal_uInt16 nYPos(nInd * 11);
@@ -298,9 +298,9 @@ SdrHdl::SdrHdl():
     nPolyNum(0),
     nPPntNum(0),
     nSourceHdlNum(0),
-    bSelect(FALSE),
-    b1PixMore(FALSE),
-    bPlusHdl(FALSE),
+    bSelect(sal_False),
+    b1PixMore(sal_False),
+    bPlusHdl(sal_False),
     mbMoveOutside(false),
     mbMouseOver(false)
 {
@@ -317,9 +317,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
     nPolyNum(0),
     nPPntNum(0),
     nSourceHdlNum(0),
-    bSelect(FALSE),
-    b1PixMore(FALSE),
-    bPlusHdl(FALSE),
+    bSelect(sal_False),
+    b1PixMore(sal_False),
+    bPlusHdl(sal_False),
     mbMoveOutside(false),
     mbMouseOver(false)
 {
@@ -330,7 +330,7 @@ SdrHdl::~SdrHdl()
     GetRidOfIAObject();
 }
 
-void SdrHdl::Set1PixMore(BOOL bJa)
+void SdrHdl::Set1PixMore(sal_Bool bJa) 
 {
     if(b1PixMore != bJa)
     {
@@ -375,7 +375,7 @@ void SdrHdl::SetPos(const Point& rPnt)
     }
 }
 
-void SdrHdl::SetSelected(BOOL bJa)
+void SdrHdl::SetSelected(sal_Bool bJa) 
 {
     if(bSelect != bJa)
     {
@@ -435,7 +435,7 @@ void SdrHdl::CreateB2dIAObject()
         BitmapColorIndex eColIndex = LightGreen;
         BitmapMarkerKind eKindOfMarker = Rect_7x7;
 
-        BOOL bRot = pHdlList->IsRotateShear();
+        sal_Bool bRot = pHdlList->IsRotateShear();
         if(pObj)
             eColIndex = (bSelect) ? Cyan : LightCyan;
         if(bRot)
@@ -723,17 +723,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
         {
             // #101688# AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
-                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
-                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
         }
         else
         {
             // create centered handle as default
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
-                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
-                (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, 
+                (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, 
+                (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
         }
     }
     else
@@ -751,7 +751,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
         {
             // #101688# AnchorTR for SW, take top right as (0,0)
             pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
-                (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0);
+                (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0);
         }
         else
         {
@@ -794,9 +794,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
 Pointer SdrHdl::GetPointer() const
 {
     PointerStyle ePtr=POINTER_MOVE;
-    const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
-    const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
-    const BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
+    const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
+    const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
+    const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
     if (bSize && pHdlList!=NULL && (bRot || bDis)) {
         switch (eKind) {
             case HDL_UPLFT: case HDL_UPRGT:
@@ -826,7 +826,7 @@ Pointer SdrHdl::GetPointer() const
             while (nHdlWink<0) nHdlWink+=36000;
             while (nHdlWink>=36000) nHdlWink-=36000;
             nHdlWink/=4500;
-            switch ((BYTE)nHdlWink) {
+            switch ((sal_uInt8)nHdlWink) {
                 case 0: ePtr=POINTER_ESIZE;  break;
                 case 1: ePtr=POINTER_NESIZE; break;
                 case 2: ePtr=POINTER_NSIZE;  break;
@@ -862,7 +862,7 @@ Pointer SdrHdl::GetPointer() const
 }
 
 // #97016# II
-BOOL SdrHdl::IsFocusHdl() const
+sal_Bool SdrHdl::IsFocusHdl() const
 {
     switch(eKind)
     {
@@ -877,9 +877,9 @@ BOOL SdrHdl::IsFocusHdl() const
         {
             // if it's a activated TextEdit, it's moved to extended points
             if(pHdlList && pHdlList->IsMoveOutside())
-                return FALSE;
+                return sal_False;
             else
-                return TRUE;
+                return sal_True;
         }
 
         case HDL_MOVE:		// Handle zum Verschieben des Objekts
@@ -906,12 +906,12 @@ BOOL SdrHdl::IsFocusHdl() const
 
         case HDL_USER:
         {
-            return TRUE;
+            return sal_True;
         }
 
         default:
         {
-            return FALSE;
+            return sal_False;
         }
     }
 }
@@ -932,7 +932,7 @@ bool SdrHdl::isMouseOver() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // class SdrHdlColor
 
-SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, BOOL bLum)
+SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum)
 :	SdrHdl(rRef, HDL_COLR),
     aMarkerSize(rSize),
     bUseLuminance(bLum)
@@ -978,8 +978,8 @@ void SdrHdlColor::CreateB2dIAObject()
                                 ::sdr::overlay::OverlayBitmapEx(
                                     aPosition,
                                     BitmapEx(aBmpCol),
-                                    (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
-                                    (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
+                                    (sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, 
+                                    (sal_uInt16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
 
@@ -1010,8 +1010,8 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
     if(pWrite)
     {
         // draw outer border
-        INT32 nWidth = aMarkerSize.Width();
-        INT32 nHeight = aMarkerSize.Height();
+        sal_Int32 nWidth = aMarkerSize.Width();
+        sal_Int32 nHeight = aMarkerSize.Height();
 
         pWrite->SetLineColor(Color(COL_LIGHTGRAY));
         pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1));
@@ -1047,7 +1047,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
 
 Color SdrHdlColor::GetLuminance(const Color& rCol)
 {
-    UINT8 aLum = rCol.GetLuminance();
+    sal_uInt8 aLum = rCol.GetLuminance();
     Color aRetval(aLum, aLum, aLum);
     return aRetval;
 }
@@ -1057,7 +1057,7 @@ void SdrHdlColor::CallColorChangeLink()
     aColorChangeHdl.Call(this);
 }
 
-void SdrHdlColor::SetColor(Color aNew, BOOL bCallLink)
+void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink)
 {
     if(IsUseLuminance())
         aNew = GetLuminance(aNew);
@@ -1091,7 +1091,7 @@ void SdrHdlColor::SetSize(const Size& rNew)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // class SdrHdlGradient
 
-SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad)
+SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad)
 :	SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS),
     pColHdl1(NULL),
     pColHdl2(NULL),
@@ -1146,8 +1146,8 @@ void SdrHdlGradient::CreateB2dIAObject()
                             double fHalfArrowWidth = (0.05 * 0.5) * fVecLen;
                             aVec.normalize();
                             basegfx::B2DVector aPerpend(-aVec.getY(), aVec.getX());
-                            INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow);
-                            INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
+                            sal_Int32 nMidX = (sal_Int32)(aPos.X() + aVec.getX() * fLongPercentArrow);
+                            sal_Int32 nMidY = (sal_Int32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
                             Point aMidPoint(nMidX, nMidY);
 
                             basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -1164,10 +1164,10 @@ void SdrHdlGradient::CreateB2dIAObject()
                             maOverlayGroup.append(*pNewOverlayObject);
 
                             // arrowhead
-                            Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth),
-                                        aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth));
-                            Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth),
-                                        aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth));
+                            Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), 
+                                        aMidPoint.Y() + (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
+                            Point aRight(aMidPoint.X() - (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), 
+                                        aMidPoint.Y() - (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
 
                             basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y());
                             basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y());
@@ -1195,11 +1195,11 @@ void SdrHdlGradient::CreateB2dIAObject()
 IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/)
 {
     if(GetObj())
-        FromIAOToItem(GetObj(), TRUE, TRUE);
+        FromIAOToItem(GetObj(), sal_True, sal_True);
     return 0;
 }
 
-void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL bUndo)
+void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo)
 {
     // from IAO positions and colors to gradient
     const SfxItemSet& rSet = _pObj->GetMergedItemSet();
@@ -1536,13 +1536,13 @@ Pointer ImpEdgeHdl::GetPointer() const
         return Pointer(POINTER_SSIZE);
 }
 
-BOOL ImpEdgeHdl::IsHorzDrag() const
+sal_Bool ImpEdgeHdl::IsHorzDrag() const
 {
     SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
     if (pEdge==NULL)
-        return FALSE;
+        return sal_False;
     if (nObjHdlNum<=1)
-        return FALSE;
+        return sal_False;
 
     SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
 
@@ -1555,11 +1555,11 @@ BOOL ImpEdgeHdl::IsHorzDrag() const
     {
         long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
         if (nWink==0 || nWink==18000)
-            return TRUE;
+            return sal_True;
         else
-            return FALSE;
+            return sal_False;
     }
-    return FALSE;
+    return sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1742,7 +1742,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
                 { // #48763#
                     if (eKind1==eKind2)
                         return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben
-                    return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1;
+                    return (sal_uInt16)eKind1<(sal_uInt16)eKind2 ? -1 : 1;
                 }
                 else
                     return nNum1<nNum2 ? -1 : 1;
@@ -1863,7 +1863,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
     if(aList.Count())
     {
         // take care of old handle
-        const ULONG nOldHdlNum(mnFocusIndex);
+        const sal_uIntPtr nOldHdlNum(mnFocusIndex);
         SdrHdl* pOld = GetHdl(nOldHdlNum);
         //SDOsal_Bool bRefresh(sal_False);
     
@@ -1890,7 +1890,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
         qsort(pHdlAndIndex, aList.Count(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc);
 
         // #105678# look for old num in sorted array
-        ULONG nOldHdl(nOldHdlNum);
+        sal_uIntPtr nOldHdl(nOldHdlNum);
 
         if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND)
         {
@@ -1905,7 +1905,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
         }
 
         // #105678# build new HdlNum
-        ULONG nNewHdl(nOldHdl);
+        sal_uIntPtr nNewHdl(nOldHdl);
 
         // #105678# do the focus travel
         if(bForward)
@@ -2004,7 +2004,7 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew)
 
         if(!pActual || pActual != pNew)
         {
-            ULONG nNewHdlNum = GetHdlNum(pNew);
+            sal_uIntPtr nNewHdlNum = GetHdlNum(pNew);
 
             if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND)
             {
@@ -2053,10 +2053,10 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
     aList(1024,32,32)
 {
     nHdlSize = 3;
-    bRotateShear = FALSE;
-    bMoveOutside = FALSE;
-    bDistortShear = FALSE;
-    bFineHandles = FALSE;
+    bRotateShear = sal_False; 
+    bMoveOutside = sal_False; 
+    bDistortShear = sal_False; 
+    bFineHandles = sal_False;
 }
 
 SdrHdlList::~SdrHdlList()
@@ -2064,7 +2064,7 @@ SdrHdlList::~SdrHdlList()
     Clear();
 }
 
-void SdrHdlList::SetHdlSize(USHORT nSiz)
+void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
 {
     if(nHdlSize != nSiz)
     {
@@ -2072,7 +2072,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
         nHdlSize = nSiz;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++) 
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2080,7 +2080,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
     }
 }
 
-void SdrHdlList::SetMoveOutside(BOOL bOn)
+void SdrHdlList::SetMoveOutside(sal_Bool bOn)              
 {
     if(bMoveOutside != bOn)
     {
@@ -2088,7 +2088,7 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
         bMoveOutside = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++) 
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2096,17 +2096,17 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
     }
 }
 
-void SdrHdlList::SetRotateShear(BOOL bOn)
+void SdrHdlList::SetRotateShear(sal_Bool bOn)              
 {
     bRotateShear = bOn;
 }
 
-void SdrHdlList::SetDistortShear(BOOL bOn)
+void SdrHdlList::SetDistortShear(sal_Bool bOn)             
 {
     bDistortShear = bOn;
 }
 
-void SdrHdlList::SetFineHdl(BOOL bOn)
+void SdrHdlList::SetFineHdl(sal_Bool bOn)                 
 {
     if(bFineHandles != bOn)
     {
@@ -2114,7 +2114,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
         bFineHandles = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++)
+        for(sal_uInt32 i=0; i<GetHdlCount(); i++) 
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2122,7 +2122,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
     }
 }
 
-SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
+SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum) 
 {
     SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum);
 
@@ -2131,15 +2131,15 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
 
 void SdrHdlList::Clear()
 {
-    for (ULONG i=0; i<GetHdlCount(); i++)
+    for (sal_uIntPtr i=0; i<GetHdlCount(); i++) 
     {
         SdrHdl* pHdl=GetHdl(i);
         delete pHdl;
     }
     aList.Clear();
 
-    bRotateShear=FALSE;
-    bDistortShear=FALSE;
+    bRotateShear=sal_False;
+    bDistortShear=sal_False;
 }
 
 void SdrHdlList::Sort()
@@ -2171,21 +2171,21 @@ void SdrHdlList::Sort()
     }
 }
 
-ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
+sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
 {
     if (pHdl==NULL)
         return CONTAINER_ENTRY_NOTFOUND;
-    ULONG nPos=aList.GetPos(pHdl);
+    sal_uIntPtr nPos=aList.GetPos(pHdl);
     return nPos;
 }
 
-void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
+void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin)
 {
     if (pHdl!=NULL)
     {
         if (bAtBegin)
         {
-            aList.Insert(pHdl,ULONG(0));
+            aList.Insert(pHdl,sal_uIntPtr(0));
         }
         else
         {
@@ -2195,11 +2195,11 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
     }
 }
 
-SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrHdl* pHdl0) const
+SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const
 {
    SdrHdl* pRet=NULL;
-   ULONG nAnz=GetHdlCount();
-   ULONG nNum=bBack ? 0 : nAnz;
+   sal_uIntPtr nAnz=GetHdlCount();
+   sal_uIntPtr nNum=bBack ? 0 : nAnz;
    while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL)
    {
        if (!bBack)
@@ -2208,7 +2208,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
        if (bNext)
        {
            if (pHdl==pHdl0)
-               bNext=FALSE;
+               bNext=sal_False;
        }
        else
        {
@@ -2224,7 +2224,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
 SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const
 {
    SdrHdl* pRet=NULL;
-   for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++)
+   for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++) 
    {
        SdrHdl* pHdl=GetHdl(i);
        if (pHdl->GetKind()==eKind1)
@@ -2347,17 +2347,17 @@ void SdrCropHdl::CreateB2dIAObject()
                         const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
 
                         pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime,
-                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                            (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, 
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, 
+                            (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
                     }
                     else
                     {
                         // create centered handle as default
                         pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(aPosition, aBmpEx1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
-                            (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+                            (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
                     }
 
                     // OVERLAYMANAGER
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index dc03845e52..4445ab5b61 100644..100755
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -48,7 +48,7 @@ Pointer SdrHelpLine::GetPointer() const
     } // switch
 }
 
-bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
 {
     Size a1Pix(rOut.PixelToLogic(Size(1,1)));
     bool bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width();
@@ -64,7 +64,7 @@ bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& r
             }
         } break;
     } // switch
-    return FALSE;
+    return sal_False;
 }
 
 Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
@@ -106,8 +106,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi
 
 void SdrHelpLineList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -116,8 +116,8 @@ void SdrHelpLineList::Clear()
 void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
 {
     Clear();
-    USHORT nAnz=rSrcList.GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rSrcList.GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         Insert(rSrcList[i]);
     }
 }
@@ -125,10 +125,10 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
 bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const
 {
     bool bEqual = false;
-    USHORT nAnz=GetCount();
+    sal_uInt16 nAnz=GetCount();
     if (nAnz==rSrcList.GetCount()) {
         bEqual = true;
-        for (USHORT i=0; i<nAnz && bEqual; i++) {
+        for (sal_uInt16 i=0; i<nAnz && bEqual; i++) {
             if (*GetObject(i)!=*rSrcList.GetObject(i)) {
                 bEqual = false;
             }
@@ -137,10 +137,10 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const
     return bEqual;
 }
 
-USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=nAnz; i>0;) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=nAnz; i>0;) {
         i--;
         if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i;
     }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 97509fde30..0dd549b77b 100644..100755
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -37,7 +37,7 @@
 #define _STDLIB_H
 #endif
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/flditem.hxx>
 #include <editeng/editdata.hxx>
 #include <svx/svdpool.hxx>
@@ -67,7 +67,7 @@
 #include <svl/rectitem.hxx>
 
 #include <svl/rngitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -92,18 +92,18 @@ public:
     XubString					aName;
     XubString					aValue;
     SfxItemState				eState;
-    UINT16						nWhichId;
+    sal_uInt16						nWhichId;
 
     TypeId						pType;
     ItemType					eItemType;
 
-    INT32						nVal;
-    INT32						nMin;
-    INT32						nMax;
+    sal_Int32						nVal;
+    sal_Int32						nMin;
+    sal_Int32						nMax;
 
-    BOOL						bComment;
-    BOOL						bIsNum;
-    BOOL						bCanNum;
+    sal_Bool						bComment;
+    sal_Bool						bIsNum;
+    sal_Bool						bCanNum;
 
 public:
     ImpItemListRow()
@@ -114,14 +114,14 @@ public:
         nVal(0),
         nMin(0),
         nMax(0),
-        bComment(FALSE),
-        bIsNum(FALSE),
-        bCanNum(FALSE)
+        bComment(sal_False),
+        bIsNum(sal_False),
+        bCanNum(sal_False)
     {}
 
     XubString GetItemTypeStr() const;
-    BOOL operator==(const ImpItemListRow& rEntry) const;
-    BOOL operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
+    sal_Bool operator==(const ImpItemListRow& rEntry) const;
+    sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
 };
 
 XubString ImpItemListRow::GetItemTypeStr() const
@@ -156,7 +156,7 @@ XubString ImpItemListRow::GetItemTypeStr() const
     return aStr;
 }
 
-BOOL ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
+sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
 {
     return (aName.Equals(rEntry.aName)
         && aValue.Equals(rEntry.aValue)
@@ -196,7 +196,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
 {
     _SdrItemBrowserControl* pBrowseMerk = pBrowse;
 
-    UINT16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
+    sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
 
     if(nKeyCode == KEY_RETURN)
     {
@@ -248,13 +248,13 @@ void _SdrItemBrowserControl::ImpCtor()
     nLastWhich = 0;
     nLastWhichOben = 0;  // not implemented yet
     nLastWhichUnten = 0; // not implemented yet
-    bWhichesButNames = FALSE;
-    bDontHideIneffectiveItems = FALSE;
-    bDontSortItems = FALSE;
-    bShowWhichIds = FALSE;
-    bShowRealValues = FALSE;
-    bShowWhichIds = TRUE;   // not implemented yet
-    bShowRealValues = TRUE; // not implemented yet
+    bWhichesButNames = sal_False;
+    bDontHideIneffectiveItems = sal_False;
+    bDontSortItems = sal_False;
+    bShowWhichIds = sal_False;
+    bShowRealValues = sal_False;
+    bShowWhichIds = sal_True;   // not implemented yet
+    bShowRealValues = sal_True; // not implemented yet
 
     rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
 
@@ -295,8 +295,8 @@ void _SdrItemBrowserControl::ImpCtor()
 
 void _SdrItemBrowserControl::Clear()
 {
-    ULONG nAnz=aList.Count();
-    for (ULONG nNum=0; nNum<nAnz; nNum++) {
+    sal_uIntPtr nAnz=aList.Count();
+    for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) {
         delete ImpGetEntry(nNum);
     }
     aList.Clear();
@@ -308,13 +308,13 @@ long _SdrItemBrowserControl::GetRowCount() const
     return aList.Count();
 }
 
-BOOL _SdrItemBrowserControl::SeekRow(long nRow)
+sal_Bool _SdrItemBrowserControl::SeekRow(long nRow)
 {
     nAktPaintRow=nRow;
-    return TRUE;
+    return sal_True;
 }
 
-String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
+String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     String sRet;
     if ( _nRow >= 0 && _nRow < (sal_Int32)aList.Count() )
@@ -357,9 +357,9 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
     return sRet;
 }
 
-void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const
+void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
 {
-    if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) {
+    if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) {
         return;
     }
     Rectangle aR(rRect);
@@ -383,22 +383,22 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe
     }
 }
 
-ULONG _SdrItemBrowserControl::GetCurrentPos() const
+sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const
 {
-    ULONG nRet=CONTAINER_ENTRY_NOTFOUND;
+    sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND;
     if (GetSelectRowCount()==1) {
         long nPos=((BrowseBox*)this)->FirstSelectedRow();
-        if (nPos>=0 && (ULONG)nPos<aList.Count()) {
-            nRet=(ULONG)nPos;
+        if (nPos>=0 && (sal_uIntPtr)nPos<aList.Count()) {
+            nRet=(sal_uIntPtr)nPos;
         }
     }
     return nRet;
 }
 
-USHORT _SdrItemBrowserControl::GetCurrentWhich() const
+sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const
 {
-    USHORT nRet=0;
-    ULONG nPos=GetCurrentPos();
+    sal_uInt16 nRet=0;
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         nRet=ImpGetEntry(nPos)->nWhichId;
     }
@@ -407,7 +407,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const
 
 void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 {
-    ULONG nPos=GetCurrentPos();
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         BegChangeEntry(nPos);
     }
@@ -415,9 +415,9 @@ void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 
 void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 {
-    USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
+    sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
     bool bAusgewertet = false;
-    ULONG nPos=GetCurrentPos();
+    sal_uIntPtr nPos=GetCurrentPos();
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         if (nKeyCode==KEY_RETURN) {
             if (BegChangeEntry(nPos)) bAusgewertet = true;
@@ -467,7 +467,7 @@ void _SdrItemBrowserControl::Select()
 
 void _SdrItemBrowserControl::ImpSaveWhich()
 {
-    USHORT nWh=GetCurrentWhich();
+    sal_uInt16 nWh=GetCurrentWhich();
     if (nWh!=0) {
         long nPos=GetCurrentPos();
         long nTop=GetTopRow();
@@ -485,12 +485,12 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
 {
     if (nLastWhich!=0) {
         bool bFnd = false;
-        ULONG nAnz=aList.Count();
-        ULONG nNum;
+        sal_uIntPtr nAnz=aList.Count();
+        sal_uIntPtr nNum;
         for (nNum=0; nNum<nAnz && !bFnd; nNum++) {
             ImpItemListRow* pEntry=ImpGetEntry(nNum);
             if (!pEntry->bComment) {
-                USHORT nWh=pEntry->nWhichId;
+                sal_uInt16 nWh=pEntry->nWhichId;
                 if (nWh==nLastWhich) bFnd = true;
             }
         }
@@ -505,7 +505,7 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
     }
 }
 
-bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
+bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
 {
     BrkChangeEntry();
     bool bRet = false;
@@ -513,7 +513,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
     if (pEntry!=NULL && !pEntry->bComment) {
         SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
         pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/);
-        Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,FALSE));
+        Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False));
         aRect.Left()+=2; // Kleiner Offset fuer's Edit, damit's pixelgenau stimmt
         aRect.Right()--;
         pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
@@ -574,7 +574,7 @@ void _SdrItemBrowserControl::BrkChangeEntry()
     }
 }
 
-void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum)
+void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum)
 {
     ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum);
     if (pAktEntry==NULL) {
@@ -601,19 +601,19 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn
     }
 }
 
-bool ImpGetItem(const SfxItemSet& rSet, USHORT nWhich, const SfxPoolItem*& rpItem)
+bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem)
 {
-    SfxItemState eState=rSet.GetItemState(nWhich,TRUE,&rpItem);
+    SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem);
     if (eState==SFX_ITEM_DEFAULT) {
         rpItem=&rSet.Get(nWhich);
     }
     return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL;
 }
 
-bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
+bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent)
 {
     rIndent=0;
-    if (pSet==NULL) return FALSE;
+    if (pSet==NULL) return sal_False;
     const SfxPoolItem* pItem=NULL;
     bool bRet = false;
     switch (nWhich) {
@@ -630,21 +630,21 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) {
                 XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue();
-                if (eLineStyle==XLINE_NONE) return TRUE;
-                if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return TRUE;
+                if (eLineStyle==XLINE_NONE) return sal_True;
+                if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True;
             }
             if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) {
-                    INT32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
-                    if (nWdt==0) return TRUE;
+                    sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
+                    if (nWdt==0) return sal_True;
                 }
             }
             if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) {
-                    INT32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
-                    if (nWdt==0) return TRUE;
+                    sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
+                    if (nWdt==0) return sal_True;
                 }
             }
         } break;
@@ -658,31 +658,31 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
                 XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle==XFILL_NONE) return TRUE;
+                if (eFillStyle==XFILL_NONE) return sal_True;
                 // Transparenz z.Zt. nur fuer SolidFill
-                if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return TRUE;
-                if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return TRUE;
-                if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return TRUE;
+                if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True;
+                if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True;
+                if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True;
             }
         } break;
         case XATTR_FILLBITMAP          :
         case XATTR_FILLBMP_TILE        :
-        case XATTR_FILLBMP_POS         : /* z.Zt. nur wenn TILE=TRUE */
+        case XATTR_FILLBMP_POS         : /* z.Zt. nur wenn TILE=sal_True */
         case XATTR_FILLBMP_SIZEX       : /* nur wenn nicht Stretch */
         case XATTR_FILLBMP_SIZEY       : /* nur wenn nicht Stretch */
-        case XATTR_FILLBMP_SIZELOG     : /* nur wenn SIZELOG=FALSE zum ruecksetzen auf TRUE (alt) -> doch noch in Gebrauch */
-        case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=TRUE */
-        case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=TRUE */
-        case XATTR_FILLBMP_STRETCH     : /* nur wenn TILE=FALSE */
-        case XATTR_FILLBMP_POSOFFSETX  : /* nur wenn TILE=TRUE*/
-        case XATTR_FILLBMP_POSOFFSETY  : { /* nur wenn TILE=TRUE*/
+        case XATTR_FILLBMP_SIZELOG     : /* nur wenn SIZELOG=sal_False zum ruecksetzen auf sal_True (alt) -> doch noch in Gebrauch */
+        case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=sal_True */
+        case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=sal_True */
+        case XATTR_FILLBMP_STRETCH     : /* nur wenn TILE=sal_False */
+        case XATTR_FILLBMP_POSOFFSETX  : /* nur wenn TILE=sal_True*/
+        case XATTR_FILLBMP_POSOFFSETY  : { /* nur wenn TILE=sal_True*/
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
                 XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
-                if (eFillStyle!=XFILL_BITMAP) return TRUE;
+                if (eFillStyle!=XFILL_BITMAP) return sal_True;
             }
             if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) {
-                return FALSE; // immer anwaehlbar
+                return sal_False; // immer anwaehlbar
             }
             bool bTileTRUE = false;
             bool bTileFALSE = false;
@@ -710,8 +710,8 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             }
             // Noch 2 Items speziell fuer Tile die sich jedoch gegenseitig ausschliessen
             if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) {
-                if (bTileFALSE) return TRUE;
-                USHORT nX=0,nY=0;
+                if (bTileFALSE) return sal_True;
+                sal_uInt16 nX=0,nY=0;
                 bool bX = false,bY = false;
                 if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) {
                     nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue();
@@ -722,19 +722,19 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
                     bY = true;
                 }
                 if (nWhich==XATTR_FILLBMP_TILEOFFSETX) {
-                    if (nX!=0 || !bX) return FALSE;
-                    if (nY!=0) return TRUE;
+                    if (nX!=0 || !bX) return sal_False;
+                    if (nY!=0) return sal_True;
                 } else {
-                    if (nY!=0 || !bY) return FALSE;
-                    if (nX!=0) return TRUE;
+                    if (nY!=0 || !bY) return sal_False;
+                    if (nX!=0) return sal_True;
                 }
             }
             // SizeLog nicht anwaehlbar bei Stretch=TRUE
-            // und sonst auch nur wenn es auf SizeLog=FALSE gesetzt ist.
+            // und sonst auch nur wenn es auf SizeLog=sal_False gesetzt ist.
             // -> wohl doch noch in Gebrauch
-            // (TRUE ist der statische PoolDefault)
+            // (sal_True ist der statische PoolDefault)
             if (nWhich==XATTR_FILLBMP_SIZELOG) {
-                if (bTileFALSE && bStretchTRUE) return TRUE;
+                if (bTileFALSE && bStretchTRUE) return sal_True;
             }
         } break;
 
@@ -753,13 +753,13 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) {
                 XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue();
-                if (eStyle==XFT_NONE) return TRUE;
+                if (eStyle==XFT_NONE) return sal_True;
             }
             if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) {
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) {
                     XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue();
-                    if (eShadow==XFTSHADOW_NONE) return TRUE;
+                    if (eShadow==XFTSHADOW_NONE) return sal_True;
                 }
             }
         } break;
@@ -773,7 +773,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) {
                 bool bShadow=((const SdrShadowItem*)pItem)->GetValue();
-                if (!bShadow) return TRUE;
+                if (!bShadow) return sal_True;
             }
         } break;
 
@@ -781,7 +781,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) {
                 bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue();
-                if (!bFixed) return TRUE;
+                if (!bFixed) return sal_True;
             }
         } break;
         case SDRATTR_CAPTIONESCREL:
@@ -789,15 +789,15 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) {
                 bool bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue();
-                if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return TRUE;
-                if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return TRUE;
+                if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True;
+                if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True;
             }
         } break;
         case SDRATTR_CAPTIONLINELEN: {
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) {
                 bool bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue();
-                if (bFit) return TRUE;
+                if (bFit) return sal_True;
             }
         } break;
 
@@ -806,7 +806,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) {
                 bool bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue();
-                if (!bAutoGrow) return TRUE;
+                if (!bAutoGrow) return sal_True;
             }
         } break;
         case SDRATTR_TEXT_MINFRAMEWIDTH:
@@ -814,14 +814,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) {
                 bool bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue();
-                if (!bAutoGrow) return TRUE;
+                if (!bAutoGrow) return sal_True;
             }
         } break;
         case SDRATTR_TEXT_VERTADJUST:
         case SDRATTR_TEXT_HORZADJUST: {
             if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) {
                 SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue();
-                if (eFit!=SDRTEXTFIT_NONE) return TRUE;
+                if (eFit!=SDRTEXTFIT_NONE) return sal_True;
             }
         } break;
 
@@ -834,30 +834,30 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) {
                 SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue();
-                if (eAniKind==SDRTEXTANI_NONE) return TRUE;
-                if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return TRUE;
-                if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return TRUE;
+                if (eAniKind==SDRTEXTANI_NONE) return sal_True;
+                if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True;
+                if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True;
             }
         } break;
 
-        case SDRATTR_EDGELINEDELTAANZ: return TRUE;
+        case SDRATTR_EDGELINEDELTAANZ: return sal_True;
         case SDRATTR_EDGELINE1DELTA:
         case SDRATTR_EDGELINE2DELTA:
         case SDRATTR_EDGELINE3DELTA: {
             if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) {
                 SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue();
                 if (eKind==SDREDGE_THREELINES) {
-                    if (nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
-                    else return FALSE;
+                    if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+                    else return sal_False;
                 }
-                if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return TRUE;
+                if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True;
             }
             if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) {
-                UINT16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
-                if (nAnz==0) return TRUE;
-                if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return TRUE;
-                if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
-                if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return TRUE;
+                sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
+                if (nAnz==0) return sal_True;
+                if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True;
+                if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+                if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True;
             }
         } break;
 
@@ -866,14 +866,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
             rIndent=1;
             if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) {
                 SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue();
-                if (eKind==SDRCIRC_FULL) return TRUE;
+                if (eKind==SDRCIRC_FULL) return sal_True;
             }
         } break;
     } // switch
     return bRet;
 }
 
-USHORT ImpSortWhich(USHORT nWhich)
+sal_uInt16 ImpSortWhich(sal_uInt16 nWhich)
 {
     switch (nWhich) {
         // Line
@@ -928,11 +928,11 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
     SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
     if (pSet!=NULL) {
         rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
-        USHORT nEntryNum=0;
+        sal_uInt16 nEntryNum=0;
         SfxWhichIter aIter(*pSet);
         const SfxItemPool* pPool=pSet->GetPool();
-        USHORT nWhich0=0;
-        USHORT nWhich=aIter.FirstWhich();
+        sal_uInt16 nWhich0=0;
+        sal_uInt16 nWhich=aIter.FirstWhich();
         while (nWhich!=0) {
             // Nun erstmal etwas umsortieren
             // Geht nur, solange keine InvalidItems, d.h. keine Luecken
@@ -946,12 +946,12 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
             }
             if (eState!=SFX_ITEM_DISABLED) {
                 const SfxPoolItem& rItem=pSet->Get(nWhich);
-                USHORT nIndent=0;
+                sal_uInt16 nIndent=0;
                 if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
                     XubString aCommentStr;
 
                     INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding));
-                    INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L Ä C H E", aTextEncoding));
+                    INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L � C H E", aTextEncoding));
                     INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding));
                     INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding));
                     INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding));
@@ -1039,7 +1039,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
                             if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False");
                             else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal);
                             else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue();
-                            else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((BOOL)aEntry.nVal);
+                            else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal);
                             else aEntry.aValue = String("GPF", aTextEncoding);
                         }
                     } else {
@@ -1053,8 +1053,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
         } // while
 
         if (aList.Count()>nEntryNum) { // evtl. noch zuviele Eintraege
-            ULONG nTooMuch=aList.Count()-nEntryNum;
-            for (ULONG nNum=0; nNum<nTooMuch; nNum++) {
+            sal_uIntPtr nTooMuch=aList.Count()-nEntryNum;
+            for (sal_uIntPtr nNum=0; nNum<nTooMuch; nNum++) {
                 delete ImpGetEntry(nEntryNum);
                 aList.Remove(nEntryNum);
             }
@@ -1097,7 +1097,7 @@ void _SdrItemBrowserWindow::GetFocus()
 SdrItemBrowser::SdrItemBrowser(SdrView& rView):
     _SdrItemBrowserWindow(ImpGetViewWin(rView)),
     pView(&rView),
-    bDirty(FALSE)
+    bDirty(sal_False)
 {
     aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl));
     GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
@@ -1140,7 +1140,7 @@ void SdrItemBrowser::SetDirty()
 void SdrItemBrowser::Undirty()
 {
     aIdleTimer.Stop();
-    bDirty = FALSE;
+    bDirty = sal_False;
 
 //	SfxItemSet aSet(pView->GetAttributes());
     SfxItemSet aSet(pView->GetModel()->GetItemPool());
@@ -1148,9 +1148,9 @@ void SdrItemBrowser::Undirty()
 
     if(pView->AreObjectsMarked())
     {
-        // SfxItemSet a2ndSet(pView->GetAttributes(TRUE));
+        // SfxItemSet a2ndSet(pView->GetAttributes(sal_True));
         SfxItemSet a2ndSet(pView->GetModel()->GetItemPool());
-        pView->GetAttributes(a2ndSet, TRUE);
+        pView->GetAttributes(a2ndSet, sal_True);
 
         SetAttributes(&aSet,&a2ndSet);
     }
@@ -1177,7 +1177,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
 
         SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
         XubString aNewText(pBrowse->GetNewEntryValue());
-        BOOL bDel( aNewText.EqualsAscii("del")
+        sal_Bool bDel( aNewText.EqualsAscii("del")
             || aNewText.EqualsAscii("Del")
             || aNewText.EqualsAscii("DEL")
             || aNewText.EqualsAscii("default")
@@ -1194,7 +1194,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
             }
             bool bPairX = true;
             bool bPairY = false;
-            USHORT nSepLen=1;
+            sal_uInt16 nSepLen=1;
             long nLongX = aNewText.ToInt32();
             long nLongY=0;
             xub_StrLen nPos = aNewText.Search(sal_Unicode('/'));
@@ -1205,13 +1205,13 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                 bPairX=nPos>0;
                 XubString s(aNewText);
                 s.Erase(0,nPos+nSepLen);
-                bPairY = (BOOL)aNewText.Len();
+                bPairY = (sal_Bool)aNewText.Len();
                 nLongY = s.ToInt32();
             }
             switch (pEntry->eItemType) {
-                case ITEM_BYTE  : ((SfxByteItem  *)pNewItem)->SetValue((BYTE  )nLongVal); break;
-                case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((INT16 )nLongVal); break;
-                case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((UINT16)nLongVal); break;
+                case ITEM_BYTE  : ((SfxByteItem  *)pNewItem)->SetValue((sal_uInt8  )nLongVal); break;
+                case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((sal_Int16 )nLongVal); break;
+                case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
                 case ITEM_INT32: {
                     if(HAS_BASE(SdrAngleItem, pNewItem))
                     {
@@ -1219,10 +1219,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                         double nVal = aNewText.ToFloat();
                         nLongVal = (long)(nVal * 100 + 0.5);
                     }
-                    ((SfxInt32Item *)pNewItem)->SetValue((INT32)nLongVal);
+                    ((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal);
                 } break;
                 case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break;
-                case ITEM_ENUM  : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((USHORT)nLongVal); break;
+                case ITEM_ENUM  : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break;
                 case ITEM_BOOL: {
                     aNewText.ToUpperAscii();
                     if (aNewText.EqualsAscii("TRUE")) nLongVal=1;
@@ -1231,15 +1231,15 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                     if (aNewText.EqualsAscii("EIN")) nLongVal=1;
                     if (aNewText.EqualsAscii("ON")) nLongVal=1;
                     if (aNewText.EqualsAscii("YES")) nLongVal=1;
-                    ((SfxBoolItem*)pNewItem)->SetValue((BOOL)nLongVal);
+                    ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
                 } break;
-                case ITEM_FLAG  : ((SfxFlagItem  *)pNewItem)->SetValue((USHORT)nLongVal); break;
+                case ITEM_FLAG  : ((SfxFlagItem  *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
                 case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break;
                 case ITEM_POINT : ((SfxPointItem*)pNewItem)->SetValue(Point(nLongX,nLongY)); break;
                 case ITEM_RECT  : break;
                 case ITEM_RANGE : {
-                    ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongX;
-                    ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongY;
+                    ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongX;
+                    ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongY;
                 } break;
                 case ITEM_LRANGE : {
                 } break;
@@ -1256,19 +1256,19 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
                     ((SvxFontItem*)pNewItem)->GetStyleName().Erase();
                 } break;
                 case ITEM_FONTHEIGHT: {
-                    ULONG nHgt=0;
-                    USHORT nProp=100;
+                    sal_uIntPtr nHgt=0;
+                    sal_uInt16 nProp=100;
                     if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
-                        nProp=(USHORT)nLongVal;
+                        nProp=(sal_uInt16)nLongVal;
                     } else {
                         nHgt=nLongVal;
                     }
                     ((SvxFontHeightItem*)pNewItem)->SetHeight(nHgt,nProp);
                 } break;
                 case ITEM_FONTWIDTH: {
-                    USHORT nProp=100;
+                    sal_uInt16 nProp=100;
                     if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
-                        nProp=(USHORT)nLongVal;
+                        nProp=(sal_uInt16)nLongVal;
                     }
                     ((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp);
                 } break;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 5b1baa75ec..b40f3c17cb 100644..100755
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdobj.hxx>
@@ -37,16 +37,16 @@
 // #99190#
 #include <svx/scene3d.hxx>
 
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bReverse)
 :	maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
 {
-    ImpProcessObjectList(rObjList, eMode, TRUE);
+    ImpProcessObjectList(rObjList, eMode, sal_True);
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode, sal_Bool bReverse)
 :	maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
@@ -55,19 +55,19 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrI
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, sal_Bool bReverse )
 :	maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
 {
     if ( rObj.ISA( SdrObjGroup ) )
-        ImpProcessObjectList(*rObj.GetSubList(), eMode, TRUE);
+        ImpProcessObjectList(*rObj.GetSubList(), eMode, sal_True);
     else
         maObjList.Insert( (void*)&rObj, LIST_APPEND );
     Reset();
 }
 
-SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, sal_Bool bReverse )
 :	maObjList(1024, 64, 64),
     mnIndex(0L),
     mbReverse(bReverse)
@@ -76,9 +76,9 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode,
     Reset();
 }
 
-void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder)
 {
-    for( ULONG nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
+    for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
     {
         SdrObject* pObj = bUseZOrder ?
             rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx );
@@ -90,12 +90,12 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
 
 void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode )
 {
-    for( ULONG nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
+    for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
         if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() )
-            ImpProcessObj( pObj, eMode, FALSE );
+            ImpProcessObj( pObj, eMode, sal_False );
 }
 
-void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder)
 {
     bool bIsGroup = pObj->IsGroupObject();
     // #99190# 3D objects are no group objects, IsGroupObject()
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 7ac1a2ced7..fbd4de18dd 100644..100755
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -32,8 +32,8 @@
 
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx> // fuer Broadcasting
-#include "svdglob.hxx"  // StringCache
-#include "svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // SetOfByte
@@ -158,7 +158,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny )
         sal_Int16 nIndex;
         for( nIndex = 0; nIndex < nCount; nIndex++ )
         {
-            aData[nIndex] = static_cast<BYTE>(aSeq[nIndex]);
+            aData[nIndex] = static_cast<sal_uInt8>(aSeq[nIndex]);
         }
 
         for( ; nIndex < 32; nIndex++ )
@@ -199,7 +199,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const
 
 void SdrLayer::SetStandardLayer(bool bStd)
 {
-    nType=(UINT16)bStd;
+    nType=(sal_uInt16)bStd;
     if (bStd) {
         aName=ImpGetResStr(STR_StandardLayerName);
     }
@@ -277,8 +277,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi
 {
     ClearLayer();
     pParent=rSrcLayerAdmin.pParent;
-    USHORT i;
-    USHORT nAnz=rSrcLayerAdmin.GetLayerCount();
+    sal_uInt16 i;
+    sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount();
     for (i=0; i<nAnz; i++) {
         aLayer.Insert(new SdrLayer(*rSrcLayerAdmin.GetLayer(i)),CONTAINER_APPEND);
     }
@@ -289,10 +289,10 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const
 {
     if (pParent!=rCmpLayerAdmin.pParent ||
         aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() ||
-        aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return FALSE;
+        aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False;
     bool bOk = true;
-    USHORT nAnz=GetLayerCount();
-    USHORT i=0;
+    sal_uInt16 nAnz=GetLayerCount();
+    sal_uInt16 i=0;
     while (bOk && i<nAnz) {
         bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i);
         i++;
@@ -304,8 +304,8 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel)
 {
     if (pNewModel!=pModel) {
         pModel=pNewModel;
-        USHORT nAnz=GetLayerCount();
-        USHORT i;
+        sal_uInt16 nAnz=GetLayerCount();
+        sal_uInt16 i;
         for (i=0; i<nAnz; i++) {
             GetLayer(i)->SetModel(pNewModel);
         }
@@ -321,14 +321,14 @@ void SdrLayerAdmin::Broadcast() const
     }
 }
 
-SdrLayer* SdrLayerAdmin::RemoveLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos)
 {
     SdrLayer* pRetLayer=(SdrLayer*)(aLayer.Remove(nPos));
     Broadcast();
     return pRetLayer;
 }
 
-SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos)
 {
     SdrLayerID nID=GetUniqueLayerID();
     SdrLayer* pLay=new SdrLayer(nID,rName);
@@ -338,7 +338,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
     return pLay;
 }
 
-SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos)
 {
     SdrLayerID nID=GetUniqueLayerID();
     SdrLayer* pLay=new SdrLayer(nID,String());
@@ -349,7 +349,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
     return pLay;
 }
 
-SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
+SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos)
 {
     SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos));
     if (pLayer!=NULL) {
@@ -360,9 +360,9 @@ SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
     return pLayer;
 }
 
-void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
+void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos)
 {
-    ULONG nPos=aLayer.GetPos(pLayer);
+    sal_uIntPtr nPos=aLayer.GetPos(pLayer);
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         aLayer.Remove(nPos);
         aLayer.Insert(pLayer,nNewPos);
@@ -370,21 +370,21 @@ void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
     }
 }
 
-USHORT SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
+sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
 {
-    ULONG nRet=SDRLAYER_NOTFOUND;
+    sal_uIntPtr nRet=SDRLAYER_NOTFOUND;
     if (pLayer!=NULL) {
         nRet=aLayer.GetPos(pLayer);
         if (nRet==CONTAINER_ENTRY_NOTFOUND) {
             nRet=SDRLAYER_NOTFOUND;
         }
     }
-    return USHORT(nRet);
+    return sal_uInt16(nRet);
 }
 
 const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const
 {
-    UINT16 i(0);
+    sal_uInt16 i(0);
     const SdrLayer* pLay = NULL;
 
     while(i < GetLayerCount() && !pLay) 
@@ -397,7 +397,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherite
 
     if(!pLay && pParent) 
     {
-        pLay = pParent->GetLayer(rName, TRUE);
+        pLay = pParent->GetLayer(rName, sal_True);
     }
 
     return pLay;
@@ -411,9 +411,9 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) co
     return nRet;
 }
 
-const SdrLayer* SdrLayerAdmin::GetLayerPerID(USHORT nID) const
+const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const
 {
-    USHORT i=0;
+    sal_uInt16 i=0;
     const SdrLayer* pLay=NULL;
     while (i<GetLayerCount() && pLay==NULL) {
         if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i);
@@ -430,7 +430,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
 {
     SetOfByte aSet;
     sal_Bool bDown = (pParent == NULL);
-    USHORT j;
+    sal_uInt16 j;
     for (j=0; j<GetLayerCount(); j++) 
     {
         aSet.Set(GetLayer((sal_uInt16)j)->GetID());
@@ -439,7 +439,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
     if (!bDown) 
     {
         i=254;
-        while (i && aSet.IsSet(BYTE(i))) 
+        while (i && aSet.IsSet(sal_uInt8(i))) 
             --i;
         if (i == 0) 
             i=254;
@@ -447,7 +447,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
     else 
     {
         i=0;
-        while (i<=254 && aSet.IsSet(BYTE(i))) 
+        while (i<=254 && aSet.IsSet(sal_uInt8(i))) 
             i++;
         if (i>254) 
             i=0;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 439dcdb166..8981cfe1ff 100644..100755
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -35,13 +35,13 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx> // zur Abschaltung
 #include <svx/svdogrp.hxx>  // des Cache bei
 #include <svx/svdorect.hxx> // GetMarkDescription
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include <svx/obj3d.hxx>
@@ -75,7 +75,7 @@ void SdrUShortCont::Sort() const
     aSort.DoSort();
     ((SdrUShortCont*)this)->mbSorted = sal_True;
 
-    ULONG nNum(GetCount());
+    sal_uLong nNum(GetCount());
 
     if(nNum > 1) 
     {
@@ -97,9 +97,9 @@ void SdrUShortCont::Sort() const
     }
 }
 
-void SdrUShortCont::CheckSort(ULONG nPos)
+void SdrUShortCont::CheckSort(sal_uLong nPos)
 {
-    ULONG nAnz(maArray.Count());
+    sal_uLong nAnz(maArray.Count());
 
     if(nPos > nAnz) 
         nPos = nAnz;
@@ -344,7 +344,7 @@ int ImpSdrMarkListSorter::Compare(const void* pElem1, const void* pElem2) const
 
     if (pOL1 == pOL2) 
     {
-        // AF: Note that I reverted a change from sal_uInt32 to ULONG (made
+        // AF: Note that I reverted a change from sal_uInt32 to sal_uLong (made
         // for 64bit compliance, #i78198#) because internally in SdrObject
         // both nOrdNum and mnNavigationPosition are stored as sal_uInt32.
         sal_uInt32 nObjOrd1((pObj1) ? pObj1->GetNavigationPosition() : 0);
@@ -373,7 +373,7 @@ void SdrMarkList::ImpForceSort()
     if(!mbSorted) 
     {
         mbSorted = sal_True;
-        ULONG nAnz = maList.Count();
+        sal_uLong nAnz = maList.Count();
 
         // remove invalid
         if(nAnz > 0 )
@@ -432,7 +432,7 @@ void SdrMarkList::ImpForceSort()
 
 void SdrMarkList::Clear()
 {
-    for(ULONG i(0L); i < GetMarkCount(); i++) 
+    for(sal_uLong i(0L); i < GetMarkCount(); i++) 
     {
         SdrMark* pMark = GetMark(i);
         delete pMark;
@@ -446,7 +446,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
 {
     Clear();
 
-    for(ULONG i(0L); i < rLst.GetMarkCount(); i++) 
+    for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++) 
     {
         SdrMark* pMark = rLst.GetMark(i);
         SdrMark* pNeuMark = new SdrMark(*pMark);
@@ -462,7 +462,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst)
     mbSorted = rLst.mbSorted;
 }
 
-ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
+sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const
 {
     // #109658#
     //
@@ -477,7 +477,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
     // less dangerous to change this method then changing SdrObject::GetOrdNum().
     if(pObj && maList.Count())
     {
-        for(ULONG a(0L); a < maList.Count(); a++)
+        for(sal_uLong a(0L); a < maList.Count(); a++)
         {
             if(((SdrMark*)(maList.GetObject(a)))->GetMarkedSdrObj() == pObj)
             {
@@ -492,7 +492,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const
 void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
 {
     SetNameDirty();
-    ULONG nAnz(maList.Count());
+    sal_uLong nAnz(maList.Count());
 
     if(!bChkSort || !mbSorted || nAnz == 0) 
     {
@@ -503,7 +503,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
     } 
     else 
     {
-        SdrMark* pLast = GetMark(ULONG(nAnz - 1));
+        SdrMark* pLast = GetMark(sal_uLong(nAnz - 1));
         const SdrObject* pLastObj = pLast->GetMarkedSdrObj();
         const SdrObject* pNeuObj = rMark.GetMarkedSdrObj();
 
@@ -528,8 +528,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
 
             if(pLastOL == pNeuOL) 
             {
-                const ULONG nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
-                const ULONG nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
+                const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0);
+                const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0);
 
                 if(nNeuNum < nLastNum) 
                 {
@@ -548,7 +548,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
     return;
 }
 
-void SdrMarkList::DeleteMark(ULONG nNum)
+void SdrMarkList::DeleteMark(sal_uLong nNum)
 {
     SdrMark* pMark = GetMark(nNum);
     DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry nicht gefunden");
@@ -561,7 +561,7 @@ void SdrMarkList::DeleteMark(ULONG nNum)
     }
 }
 
-void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
+void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum)
 {
     SdrMark* pMark = GetMark(nNum);
     DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry nicht gefunden");
@@ -578,7 +578,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum)
 
 void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
 {
-    ULONG nAnz(rSrcList.maList.Count());
+    sal_uLong nAnz(rSrcList.maList.Count());
 
     if(rSrcList.mbSorted) 
     {
@@ -588,7 +588,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
 
     if(!bReverse)
     {
-        for(ULONG i(0L); i < nAnz; i++) 
+        for(sal_uLong i(0L); i < nAnz; i++) 
         {
             SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
             InsertEntry(*pM);
@@ -596,7 +596,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
     }
     else
     {
-        for(ULONG i(nAnz); i > 0;) 
+        for(sal_uLong i(nAnz); i > 0;) 
         {
             i--;
             SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i));
@@ -609,7 +609,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
 {
     sal_Bool bChgd(sal_False);
 
-    for(ULONG i(GetMarkCount()); i > 0; ) 
+    for(sal_uLong i(GetMarkCount()); i > 0; ) 
     {
         i--;
         SdrMark* pMark = GetMark(i);
@@ -632,9 +632,9 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
     DeletePageView(rPV); // erstmal alle raus, dann die ganze Seite hinten dran
     SdrObject* pObj;
     const SdrObjList* pOL = rPV.GetObjList();
-    ULONG nObjAnz(pOL->GetObjCount());
+    sal_uLong nObjAnz(pOL->GetObjCount());
 
-    for(ULONG nO(0L); nO < nObjAnz; nO++) 
+    for(sal_uLong nO(0L); nO < nObjAnz; nO++) 
     {
         pObj = pOL->GetObj(nO);
         sal_Bool bDoIt(rPV.IsObjMarkable(pObj));
@@ -653,7 +653,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
 
 const XubString& SdrMarkList::GetMarkDescription() const
 {
-    ULONG nAnz(GetMarkCount());
+    sal_uLong nAnz(GetMarkCount());
     
     if(mbNameOk && 1L == nAnz) 
     {
@@ -691,7 +691,7 @@ const XubString& SdrMarkList::GetMarkDescription() const
                 XubString aStr1;
                 sal_Bool bEq(sal_True);
                 
-                for(ULONG i = 1; i < GetMarkCount() && bEq; i++) 
+                for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++) 
                 {
                     SdrMark* pMark2 = GetMark(i);
                     pMark2->GetMarkedSdrObj()->TakeObjNamePlural(aStr1);
@@ -719,16 +719,16 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
 {
     sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
     XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName);
-    ULONG nMarkAnz(GetMarkCount());
-    ULONG nMarkPtAnz(0L);
-    ULONG nMarkPtObjAnz(0L);
-    ULONG n1stMarkNum(ULONG_MAX);
+    sal_uLong nMarkAnz(GetMarkCount());
+    sal_uLong nMarkPtAnz(0L);
+    sal_uLong nMarkPtObjAnz(0L);
+    sal_uLong n1stMarkNum(ULONG_MAX);
     
-    for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) 
+    for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) 
     {
         const SdrMark* pMark = GetMark(nMarkNum);
         const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints();
-        ULONG nAnz(pPts ? pPts->GetCount() : 0);
+        sal_uLong nAnz(pPts ? pPts->GetCount() : 0);
         
         if(nAnz) 
         {
@@ -787,7 +787,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
             XubString aStr1;
             sal_Bool bEq(sal_True);
             
-            for(ULONG i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) 
+            for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) 
             {
                 const SdrMark* pMark2 = GetMark(i);
                 const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints();
@@ -833,7 +833,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
     sal_Bool bFnd(sal_False);
     Rectangle aR;
 
-    for(ULONG i(0L); i < GetMarkCount(); i++) 
+    for(sal_uLong i(0L); i < GetMarkCount(); i++) 
     {
         SdrMark* pMark = GetMark(i);
 
@@ -863,7 +863,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
 {
     sal_Bool bFnd(sal_False);
 
-    for(ULONG i(0L); i < GetMarkCount(); i++) 
+    for(sal_uLong i(0L); i < GetMarkCount(); i++) 
     {
         SdrMark* pMark = GetMark(i);
 
@@ -952,7 +952,7 @@ namespace sdr
             {
                 SdrObjList* pList = pObj->GetSubList();
 
-                for(ULONG a(0L); a < pList->GetObjCount(); a++)
+                for(sal_uLong a(0L); a < pList->GetObjCount(); a++)
                 {
                     SdrObject* pObj2 = pList->GetObj(a);
                     ImplCollectCompleteSelection(pObj2);
@@ -974,9 +974,9 @@ namespace sdr
             maAllMarkedObjects.clear();
 
             // #126320# GetMarkCount after ForceSort
-            const ULONG nMarkAnz(maMarkedObjectList.GetMarkCount());
+            const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount());
 
-            for(ULONG a(0L); a < nMarkAnz; a++)
+            for(sal_uLong a(0L); a < nMarkAnz; a++)
             {
                 SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj();
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f3f50ea829..5214cdd204 100644..100755
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -50,12 +50,12 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xlnstit.hxx>
 
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <editeng/editeng.hxx>   // Fuer EditEngine::CreatePool()
 
 #include <svx/xtable.hxx>
 
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
@@ -66,8 +66,8 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include "svdoutlinercache.hxx"
 
 
@@ -124,10 +124,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     eUIUnit=FUNIT_MM;
     aUIScale=Fraction(1,1);
     nUIUnitKomma=0;
-    bUIOnlyKomma=FALSE;
+    bUIOnlyKomma=sal_False;
     pLayerAdmin=NULL;
     pItemPool=pPool;
-    bMyPool=FALSE;
+    bMyPool=sal_False;
     m_pEmbeddedHelper=_pEmbeddedHelper;
     pDrawOutliner=NULL;
     pHitTestOutliner=NULL;
@@ -145,21 +145,21 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     mbUndoEnabled=true;
     nProgressPercent=0;
     nLoadVersion=0;
-    bExtColorTable=FALSE;
+    bExtColorTable=sal_False;
     mbChanged = sal_False;
-    bInfoChanged=FALSE;
-    bPagNumsDirty=FALSE;
-    bMPgNumsDirty=FALSE;
-    bPageNotValid=FALSE;
-    bSavePortable=FALSE;
-    bSaveCompressed=FALSE;
-    bSaveNative=FALSE;
-    bSwapGraphics=FALSE;
+    bInfoChanged=sal_False;
+    bPagNumsDirty=sal_False;
+    bMPgNumsDirty=sal_False;
+    bPageNotValid=sal_False;
+    bSavePortable=sal_False;
+    bSaveCompressed=sal_False;
+    bSaveNative=sal_False;
+    bSwapGraphics=sal_False;
     nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT;
-    bSaveOLEPreview=FALSE;
-    bPasteResize=FALSE;
-    bNoBitmapCaching=FALSE;
-    bReadOnly=FALSE;
+    bSaveOLEPreview=sal_False;
+    bPasteResize=sal_False;
+    bNoBitmapCaching=sal_False;
+    bReadOnly=sal_False;
     nStreamCompressMode=COMPRESSMODE_NONE;
     nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN;
     nDefaultTabulator=0;
@@ -170,8 +170,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     pGradientList=NULL;
     pBitmapList=NULL;
     mpNumberFormatter = NULL;
-    bTransparentTextFrames=FALSE;
-    bStarDrawPreviewMode = FALSE;
+    bTransparentTextFrames=sal_False;
+    bStarDrawPreviewMode = sal_False;
     nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND;
     pModelStorage = NULL;
     mpForbiddenCharactersTable = NULL;
@@ -197,7 +197,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
         // OutlinerPool als SecondaryPool des SdrPool
         pItemPool->SetSecondaryPool(pOutlPool);
         // Merken, dass ich mir die beiden Pools selbst gemacht habe
-        bMyPool=TRUE;
+        bMyPool=sal_True;
     }
     pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit);
 
@@ -208,6 +208,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     else
         nDefTextHgt = SdrEngineDefaults::GetFontHeight();
 
+    pItemPool->SetPoolDefaultItem( SdrTextWordWrapItem( sal_False ) );
+
     SetTextDefaults();
     pLayerAdmin=new SdrLayerAdmin;
     pLayerAdmin->SetModel(this);
@@ -216,10 +218,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
     // den DrawOutliner OnDemand erzeugen geht noch nicht, weil ich den Pool
     // sonst nicht kriege (erst ab 302!)
     pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
-    ImpSetOutlinerDefaults(pDrawOutliner, TRUE);
+    ImpSetOutlinerDefaults(pDrawOutliner, sal_True);
 
     pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
-    ImpSetOutlinerDefaults(pHitTestOutliner, TRUE);
+    ImpSetOutlinerDefaults(pHitTestOutliner, sal_True);
 
     ImpCreateTables();
 }
@@ -233,7 +235,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts);
+    ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
@@ -246,7 +248,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts);
+    ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts):
@@ -400,7 +402,7 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
 bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
 {
     OSL_FAIL("SdrModel::operator==() ist noch nicht implementiert");
-    return FALSE;
+    return sal_False;
 }
 
 void SdrModel::SetSwapGraphics( bool bSwap )
@@ -420,7 +422,7 @@ void SdrModel::SetReadOnly(bool bYes)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrModel::SetMaxUndoActionCount(ULONG nAnz)
+void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz)
 {
     if (nAnz<1) nAnz=1;
     nMaxUndoCount=nAnz;
@@ -466,7 +468,7 @@ bool SdrModel::Undo()
             pDo->Undo();
             if(pRedoStack==NULL)
                 pRedoStack=new Container(1024,16,16);
-            pRedoStack->Insert(pUndoStack->Remove((ULONG)0),(ULONG)0);
+            pRedoStack->Insert(pUndoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
             mbUndoEnabled = bWasUndoEnabled;
         }
     }
@@ -490,7 +492,7 @@ bool SdrModel::Redo()
             pDo->Redo();
             if(pUndoStack==NULL)
                 pUndoStack=new Container(1024,16,16);
-            pUndoStack->Insert(pRedoStack->Remove((ULONG)0),(ULONG)0);
+            pUndoStack->Insert(pRedoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
             mbUndoEnabled = bWasUndoEnabled;
         }
     }
@@ -532,7 +534,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo)
         {
             if (pUndoStack==NULL)
                 pUndoStack=new Container(1024,16,16);
-            pUndoStack->Insert(pUndo,(ULONG)0);
+            pUndoStack->Insert(pUndo,(sal_uIntPtr)0);
             while (pUndoStack->Count()>nMaxUndoCount)
             {
                 delete (SfxUndoAction*)pUndoStack->Remove(pUndoStack->Count()-1);
@@ -781,7 +783,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
     sal_Int32 nAnz=GetPageCount();
     for (i=nAnz-1; i>=0; i--)
     {
-        DeletePage( (USHORT)i );
+        DeletePage( (sal_uInt16)i );
     }
     maPages.Clear();
     // #109538#
@@ -791,7 +793,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
     nAnz=GetMasterPageCount();
     for(i=nAnz-1; i>=0; i--)
     {
-        DeleteMasterPage( (USHORT)i );
+        DeleteMasterPage( (sal_uInt16)i );
     }
     maMaPag.Clear();
     // #109538#
@@ -819,9 +821,9 @@ void SdrModel::SetTextDefaults() const
 
 void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
 {
-    const USHORT nItemCnt = 3;
+    const sal_uInt16 nItemCnt = 3;
     static struct {
-        USHORT nFntType, nLanguage;
+        sal_uInt16 nFntType, nLanguage;
     }  aOutTypeArr[ nItemCnt ] = {
         {  DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
         {  DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
@@ -829,7 +831,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
     };
     SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
 
-    for( USHORT n = 0; n < nItemCnt; ++n )
+    for( sal_uInt16 n = 0; n < nItemCnt; ++n )
     {
         Font aFnt( OutputDevice::GetDefaultFont(
             aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
@@ -843,7 +845,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
     }
 }
 
-void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt )
+void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt )
 {
     // #95114# set application-language specific dynamic pool language defaults
     SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ;
@@ -896,7 +898,7 @@ SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const
 boost::shared_ptr< SdrOutliner > SdrModel::CreateDrawOutliner(const SdrTextObj* pObj)
 {
     boost::shared_ptr< SdrOutliner > xDrawOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ) );
-    ImpSetOutlinerDefaults(xDrawOutliner.get(), TRUE);
+    ImpSetOutlinerDefaults(xDrawOutliner.get(), sal_True);
     xDrawOutliner->SetTextObj(pObj);
     return xDrawOutliner;
 }
@@ -909,7 +911,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const
     return NULL;
 }
 
-void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
+void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit )
 {
     /**************************************************************************
     * Initialisierung der Outliner fuer Textausgabe und HitTest
@@ -917,7 +919,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
     if( bInit )
     {
         pOutliner->EraseVirtualDevice();
-        pOutliner->SetUpdateMode(FALSE);
+        pOutliner->SetUpdateMode(sal_False);
         pOutliner->SetEditTextObjectPool(pItemPool);
         pOutliner->SetDefTab(nDefaultTabulator);
     }
@@ -948,8 +950,8 @@ void SdrModel::ImpReformatAllTextObjects()
     if( isLocked() )
         return;
 
-    USHORT nAnz=GetMasterPageCount();
-    USHORT nNum;
+    sal_uInt16 nAnz=GetMasterPageCount();
+    sal_uInt16 nNum;
     for (nNum=0; nNum<nAnz; nNum++) {
         GetMasterPage(nNum)->ReformatAllTextObjects();
     }
@@ -990,8 +992,8 @@ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) co
 // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
 void SdrModel::BurnInStyleSheetAttributes()
 {
-    USHORT nAnz=GetMasterPageCount();
-    USHORT nNum;
+    sal_uInt16 nAnz=GetMasterPageCount();
+    sal_uInt16 nNum;
     for (nNum=0; nNum<nAnz; nNum++) {
         GetMasterPage(nNum)->BurnInStyleSheetAttributes();
     }
@@ -1007,7 +1009,7 @@ void SdrModel::RefDeviceChanged()
     ImpReformatAllTextObjects();
 }
 
-void SdrModel::SetDefaultFontHeight(ULONG nVal)
+void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal)
 {
     if (nVal!=nDefTextHgt) {
         nDefTextHgt=nVal;
@@ -1016,7 +1018,7 @@ void SdrModel::SetDefaultFontHeight(ULONG nVal)
     }
 }
 
-void SdrModel::SetDefaultTabulator(USHORT nVal)
+void SdrModel::SetDefaultTabulator(sal_uInt16 nVal)
 {
     if (nDefaultTabulator!=nVal) {
         nDefaultTabulator=nVal;
@@ -1403,7 +1405,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_
 
 void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const
 {
-    BOOL bNeg(nWink < 0);
+    sal_Bool bNeg(nWink < 0);
 
     if(bNeg)
         nWink = -nWink;
@@ -1431,9 +1433,9 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const
 
 void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPercentChar) const
 {
-    INT32 nMul(rVal.GetNumerator());
-    INT32 nDiv(rVal.GetDenominator());
-    BOOL bNeg(nMul < 0);
+    sal_Int32 nMul(rVal.GetNumerator());
+    sal_Int32 nDiv(rVal.GetDenominator());
+    sal_Bool bNeg(nMul < 0);
 
     if(nDiv < 0)
         bNeg = !bNeg;
@@ -1465,48 +1467,48 @@ void SdrModel::SetChanged(sal_Bool bFlg)
 void SdrModel::RecalcPageNums(bool bMaster)
 {
     Container& rPL=*(bMaster ? &maMaPag : &maPages);
-    USHORT nAnz=USHORT(rPL.Count());
-    USHORT i;
+    sal_uInt16 nAnz=sal_uInt16(rPL.Count());
+    sal_uInt16 i;
     for (i=0; i<nAnz; i++) {
         SdrPage* pPg=(SdrPage*)(rPL.GetObject(i));
         pPg->SetPageNum(i);
     }
-    if (bMaster) bMPgNumsDirty=FALSE;
-    else bPagNumsDirty=FALSE;
+    if (bMaster) bMPgNumsDirty=sal_False;
+    else bPagNumsDirty=sal_False;
 }
 
-void SdrModel::InsertPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-    USHORT nAnz=GetPageCount();
+    sal_uInt16 nAnz=GetPageCount();
     if (nPos>nAnz) nPos=nAnz;
     maPages.Insert(pPage,nPos);
     // #109538#
     PageListChanged();
-    pPage->SetInserted(TRUE);
+    pPage->SetInserted(sal_True);
     pPage->SetPageNum(nPos);
     pPage->SetModel(this);
-    if (nPos<nAnz) bPagNumsDirty=TRUE;
+    if (nPos<nAnz) bPagNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPage);
     Broadcast(aHint);
 }
 
-void SdrModel::DeletePage(USHORT nPgNum)
+void SdrModel::DeletePage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=RemovePage(nPgNum);
     delete pPg;
 }
 
-SdrPage* SdrModel::RemovePage(USHORT nPgNum)
+SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
     // #109538#
     PageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
     }
-    bPagNumsDirty=TRUE;
+    bPagNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPg);
@@ -1514,29 +1516,29 @@ SdrPage* SdrModel::RemovePage(USHORT nPgNum)
     return pPg;
 }
 
-void SdrModel::MovePage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
 {
     SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
     // #109538#
     PageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
         InsertPage(pPg,nNewPos);
     }
 }
 
-void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-    USHORT nAnz=GetMasterPageCount();
+    sal_uInt16 nAnz=GetMasterPageCount();
     if (nPos>nAnz) nPos=nAnz;
     maMaPag.Insert(pPage,nPos);
     // #109538#
     MasterPageListChanged();
-    pPage->SetInserted(TRUE);
+    pPage->SetInserted(sal_True);
     pPage->SetPageNum(nPos);
     pPage->SetModel(this);
     if (nPos<nAnz) {
-        bMPgNumsDirty=TRUE;
+        bMPgNumsDirty=sal_True;
     }
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
@@ -1544,13 +1546,13 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
     Broadcast(aHint);
 }
 
-void SdrModel::DeleteMasterPage(USHORT nPgNum)
+void SdrModel::DeleteMasterPage(sal_uInt16 nPgNum)
 {
     SdrPage* pPg=RemoveMasterPage(nPgNum);
     if (pPg!=NULL) delete pPg;
 }
 
-SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
+SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
 {
     SdrPage* pRetPg=(SdrPage*)maMaPag.Remove(nPgNum);
     // #109538#
@@ -1566,10 +1568,10 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
             GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg);
         }
 
-        pRetPg->SetInserted(FALSE);
+        pRetPg->SetInserted(sal_False);
     }
 
-    bMPgNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pRetPg);
@@ -1577,18 +1579,18 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
     return pRetPg;
 }
 
-void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
 {
     SdrPage* pPg=(SdrPage*)maMaPag.Remove(nPgNum);
     // #109538#
     MasterPageListChanged();
     if (pPg!=NULL) {
-        pPg->SetInserted(FALSE);
+        pPg->SetInserted(sal_False);
         maMaPag.Insert(pPg,nNewPos);
         // #109538#
         MasterPageListChanged();
     }
-    bMPgNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
     SetChanged();
     SdrHint aHint(HINT_PAGEORDERCHG);
     aHint.SetPage(pPg);
@@ -1609,8 +1611,8 @@ bool SdrModel::CheckConsistence() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // #48289#
-void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
-                         USHORT nDestPos,
+void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                         sal_uInt16 nDestPos,
                          bool bUndo, bool bMoveNoCopy)
 {
     if( bUndo && !IsUndoEnabled() )
@@ -1619,8 +1621,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
     if( bUndo )
         BegUndo(ImpGetResStr(STR_UndoMergeModel));
 
-    USHORT nPageAnz=GetPageCount();
-    USHORT nMaxPage=nPageAnz;
+    sal_uInt16 nPageAnz=GetPageCount();
+    sal_uInt16 nMaxPage=nPageAnz;
     
     if (nMaxPage!=0)
         nMaxPage--;
@@ -1633,10 +1635,10 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
         nDestPos=nPageAnz;
 
     // Zunaechst die Zeiger der betroffenen Seiten in einem Array sichern
-    USHORT nPageNum=nFirstPageNum;
-    USHORT nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
+    sal_uInt16 nPageNum=nFirstPageNum;
+    sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
     SdrPage** pPagePtrs=new SdrPage*[nCopyAnz];
-    USHORT nCopyNum;
+    sal_uInt16 nCopyNum;
     for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
     {
         pPagePtrs[nCopyNum]=GetPage(nPageNum);
@@ -1647,11 +1649,11 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
     }
 
     // Jetzt die Seiten kopieren
-    USHORT nDestNum=nDestPos;
+    sal_uInt16 nDestNum=nDestPos;
     for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
     {
         SdrPage* pPg=pPagePtrs[nCopyNum];
-        USHORT nPageNum2=pPg->GetPageNum();
+        sal_uInt16 nPageNum2=pPg->GetPageNum();
         if (!bMoveNoCopy)
         {
             const SdrPage* pPg1=GetPage(nPageNum2);
@@ -1687,8 +1689,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
 }
 
 void SdrModel::Merge(SdrModel& rSourceModel,
-                     USHORT nFirstPageNum, USHORT nLastPageNum,
-                     USHORT nDestPos,
+                     sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+                     sal_uInt16 nDestPos,
                      bool bMergeMasterPages, bool bAllMasterPages,
                      bool bUndo, bool bTreadSourceAsConst)
 {
@@ -1704,30 +1706,30 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     if (bUndo)
         BegUndo(ImpGetResStr(STR_UndoMergeModel));
 
-    USHORT nSrcPageAnz=rSourceModel.GetPageCount();
-    USHORT nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
-    USHORT nDstMasterPageAnz=GetMasterPageCount();
+    sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount();
+    sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
+    sal_uInt16 nDstMasterPageAnz=GetMasterPageCount();
     bool bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
-    USHORT nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
+    sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
     if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage;
     if (nLastPageNum>nMaxSrcPage)  nLastPageNum =nMaxSrcPage;
     bool bReverse=nLastPageNum<nFirstPageNum;
 
-    USHORT*   pMasterMap=NULL;
+    sal_uInt16*   pMasterMap=NULL;
     bool* pMasterNeed=NULL;
-    USHORT    nMasterNeed=0;
+    sal_uInt16    nMasterNeed=0;
     if (bMergeMasterPages && nSrcMasterPageAnz!=0) {
         // Feststellen, welche MasterPages aus rSrcModel benoetigt werden
-        pMasterMap=new USHORT[nSrcMasterPageAnz];
+        pMasterMap=new sal_uInt16[nSrcMasterPageAnz];
         pMasterNeed=new bool[nSrcMasterPageAnz];
-        memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(USHORT));
+        memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16));
         if (bAllMasterPages) {
             memset(pMasterNeed, true, nSrcMasterPageAnz * sizeof(bool));
         } else {
             memset(pMasterNeed, false, nSrcMasterPageAnz * sizeof(bool));
-            USHORT nAnf= bReverse ? nLastPageNum : nFirstPageNum;
-            USHORT nEnd= bReverse ? nFirstPageNum : nLastPageNum;
-            for (USHORT i=nAnf; i<=nEnd; i++) {
+            sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
+            sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
+            for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
                 const SdrPage* pPg=rSourceModel.GetPage(i);
                 if(pPg->TRG_HasMasterPage())
                 {
@@ -1742,8 +1744,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
             }
         }
         // Nun das Mapping der MasterPages bestimmen
-        USHORT nAktMaPagNum=nDstMasterPageAnz;
-        for (USHORT i=0; i<nSrcMasterPageAnz; i++) {
+        sal_uInt16 nAktMaPagNum=nDstMasterPageAnz;
+        for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) {
             if (pMasterNeed[i]) {
                 pMasterMap[i]=nAktMaPagNum;
                 nAktMaPagNum++;
@@ -1754,7 +1756,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
 
     // rueberholen der Masterpages
     if (pMasterMap!=NULL && pMasterNeed!=NULL && nMasterNeed!=0) {
-        for (USHORT i=nSrcMasterPageAnz; i>0;) {
+        for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) {
             i--;
             if (pMasterNeed[i]) {
                 SdrPage* pPg=NULL;
@@ -1771,9 +1773,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
                     maMaPag.Insert(pPg,nDstMasterPageAnz);
                     // #109538#
                     MasterPageListChanged();
-                    pPg->SetInserted(TRUE);
+                    pPg->SetInserted(sal_True);
                     pPg->SetModel(this);
-                    bMPgNumsDirty=TRUE;
+                    bMPgNumsDirty=sal_True;
                     if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg));
                 } else {
                     OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden");
@@ -1784,8 +1786,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
 
     // rueberholen der Zeichenseiten
     if (bInsPages) {
-        USHORT nSourcePos=nFirstPageNum;
-        USHORT nMergeCount=USHORT(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
+        sal_uInt16 nSourcePos=nFirstPageNum;
+        sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
         if (nDestPos>GetPageCount()) nDestPos=GetPageCount();
         while (nMergeCount>0) {
             SdrPage* pPg=NULL;
@@ -1845,8 +1847,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     delete [] pMasterMap;
     delete [] pMasterNeed;
 
-    bMPgNumsDirty=TRUE;
-    bPagNumsDirty=TRUE;
+    bMPgNumsDirty=sal_True;
+    bPagNumsDirty=sal_True;
 
     SetChanged();
     // Fehlt: Mergen und Mapping der Layer
@@ -1854,12 +1856,12 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     if (bUndo) EndUndo();
 }
 
-void SdrModel::SetStarDrawPreviewMode(BOOL bPreview)
+void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
 {
     if (!bPreview && bStarDrawPreviewMode && GetPageCount())
     {
         // Das Zuruecksetzen ist nicht erlaubt, da das Model ev. nicht vollstaendig geladen wurde
-        DBG_ASSERT(FALSE,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
+        DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
     }
     else
     {
@@ -1916,7 +1918,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
 
         while(nWhich)
         {
-            if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem))
+            if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem))
             {
                 const SfxPoolItem* pItem = pPoolItem;
 
@@ -1982,7 +1984,7 @@ rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() c
     return mpForbiddenCharactersTable;
 }
 
-void SdrModel::SetCharCompressType( UINT16 nType )
+void SdrModel::SetCharCompressType( sal_uInt16 nType )
 {
     if( nType != mnCharCompressType )
     {
@@ -2017,10 +2019,10 @@ void SdrModel::ReformatAllTextObjects()
     ImpReformatAllTextObjects();
 }
 
-bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const
 {
     bool        bRet = false;
-    USHORT		n, nCount;
+    sal_uInt16		n, nCount;
 
     for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ )
         if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
@@ -2036,7 +2038,7 @@ bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
     return bRet;
 }
 
-SdrOutliner* SdrModel::createOutliner( USHORT nOutlinerMode )
+SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode )
 {
     if( NULL == mpOutlinerCache )
         mpOutlinerCache = new SdrOutlinerCache(this);
@@ -2108,6 +2110,11 @@ void SdrModel::SetSdrUndoManager( SfxUndoManager* pUndoManager )
     mpImpl->mpUndoManager = pUndoManager;
 }
 
+SfxUndoManager* SdrModel::GetSdrUndoManager() const
+{
+    return mpImpl->mpUndoManager;
+}
+
 SdrUndoFactory& SdrModel::GetSdrUndoFactory() const
 {
     if( !mpImpl->mpUndoFactory )
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 30bc0892a7..202c187c26 100644..100755
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -32,8 +32,8 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
-#include "svditext.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
@@ -49,14 +49,14 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/svdovirt.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
@@ -147,24 +147,24 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
 void SdrMarkView::ImpClearVars()
 {
     eDragMode=SDRDRAG_MOVE;
-    //HMHbHdlShown=FALSE;
-    bRefHdlShownOnly=FALSE;
+    //HMHbHdlShown=sal_False;
+    bRefHdlShownOnly=sal_False;
     eEditMode=SDREDITMODE_EDIT;
     eEditMode0=SDREDITMODE_EDIT;
-    bDesignMode=FALSE;
+    bDesignMode=sal_False;
     pMarkedObj=NULL;
     pMarkedPV=NULL;
-    bForceFrameHandles=FALSE;
-    bPlusHdlAlways=FALSE;
+    bForceFrameHandles=sal_False;
+    bPlusHdlAlways=sal_False;
     nFrameHandlesLimit=50;
-    bInsPolyPoint=FALSE;
+    bInsPolyPoint=sal_False;
     mnInsPointNum = 0L;
-    bMarkedObjRectDirty=FALSE;
-    bMarkedPointsRectsDirty=FALSE;
+    bMarkedObjRectDirty=sal_False;
+    bMarkedPointsRectsDirty=sal_False;
     mbMarkHandlesHidden = false;
-    bMrkPntDirty=FALSE;
-    bMarkHdlWhenTextEdit=FALSE;
-    bMarkableObjCountDirty=FALSE; // noch nicht implementiert
+    bMrkPntDirty=sal_False;
+    bMarkHdlWhenTextEdit=sal_False;
+    bMarkableObjCountDirty=sal_False; // noch nicht implementiert
     nMarkableObjCount=0;          // noch nicht implementiert
 
     // #114409#-3 Migrate selections
@@ -203,13 +203,13 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 
         if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) 
         {
-            bMarkedObjRectDirty=TRUE;
-            bMarkedPointsRectsDirty=TRUE;
+            bMarkedObjRectDirty=sal_True;
+            bMarkedPointsRectsDirty=sal_True;
         }
 /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects		
         if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
         {
-            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
+            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True );
         }		
 */
     }
@@ -220,14 +220,14 @@ void SdrMarkView::ModelHasChanged()
 {
     SdrPaintView::ModelHasChanged();
     GetMarkedObjectListWriteAccess().SetNameDirty();
-    bMarkedObjRectDirty=TRUE;
-    bMarkedPointsRectsDirty=TRUE;
+    bMarkedObjRectDirty=sal_True;
+    bMarkedPointsRectsDirty=sal_True;
     // Es sind beispielsweise Obj markiert und maMarkedObjectListist Sorted.
     // In einer anderen View 2 wird die ObjOrder veraendert
     // (z.B. MovToTop()). Dann ist Neusortieren der MarkList erforderlich.
     GetMarkedObjectListWriteAccess().SetUnsorted();
     SortMarkedObjects();
-    bMrkPntDirty=TRUE;
+    bMrkPntDirty=sal_True;
     UndirtyMrkPnt();
     SdrView* pV=(SdrView*)this;
     if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!
@@ -237,7 +237,7 @@ void SdrMarkView::ModelHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::IsAction() const
+sal_Bool SdrMarkView::IsAction() const
 {
     return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints();
 }
@@ -539,16 +539,16 @@ void SdrMarkView::BrkMarkGluePoints()
     }
 }
 
-BOOL SdrMarkView::HasMarkableObj() const
+sal_Bool SdrMarkView::HasMarkableObj() const
 {
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
 
     SdrPageView* pPV = GetSdrPageView();
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 nCount++;
@@ -558,16 +558,16 @@ BOOL SdrMarkView::HasMarkableObj() const
     return nCount!=0;
 }
 
-ULONG SdrMarkView::GetMarkableObjCount() const
+sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
 {
-    ULONG nCount=0;
+    sal_uIntPtr nCount=0;
     SdrPageView* pPV = GetSdrPageView();
 
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 nCount++;
@@ -579,26 +579,26 @@ ULONG SdrMarkView::GetMarkableObjCount() const
 
 //HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH	bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH	bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH	if (!bHdlShown) {
-//HMH		bRefHdlShownOnly=FALSE;
-//HMH		bHdlShown=TRUE;
+//HMH		bRefHdlShownOnly=sal_False;
+//HMH		bHdlShown=sal_True;
 //HMH	}
 //HMH}
 
 //HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH	bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH	bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH	ImpShowMarkHdl(bNoRefHdl);
 //HMH}
 
 
 //HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/)
 //HMH{
-//HMH	bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH	bNoRefHdl=sal_False; // geht leider erstmal nicht anders
 //HMH	if (bHdlShown) {
 //HMH		bRefHdlShownOnly=bNoRefHdl;
-//HMH		bHdlShown=FALSE;
+//HMH		bHdlShown=sal_False;
 //HMH	}
 //HMH}
 
@@ -620,29 +620,29 @@ void SdrMarkView::showMarkHandles()
     }
 }
 
-BOOL SdrMarkView::ImpIsFrameHandles() const
+sal_Bool SdrMarkView::ImpIsFrameHandles() const
 {
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
-    BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
+    sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
     if (nMarkAnz==1 && bStdDrag && bFrmHdl)
     {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
         if (pObj->GetObjInventor()==SdrInventor)
         {
-            UINT16 nIdent=pObj->GetObjIdentifier();
+            sal_uInt16 nIdent=pObj->GetObjIdentifier();
             if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE )
             {
-                bFrmHdl=FALSE;
+                bFrmHdl=sal_False;
             }
         }
     }
     if (!bStdDrag && !bFrmHdl) {
         // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles
-        bFrmHdl=TRUE;
+        bFrmHdl=sal_True;
         if (eDragMode==SDRDRAG_ROTATE) {
             // bei Rotate ObjOwn-Drag, wenn mind. 1 PolyObj
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bFrmHdl=!pObj->IsPolyObj();
@@ -651,7 +651,7 @@ BOOL SdrMarkView::ImpIsFrameHandles() const
     }
     if (!bFrmHdl) {
         // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             bFrmHdl=!pObj->hasSpecialDrag();
@@ -691,9 +691,9 @@ void SdrMarkView::SetMarkHandles()
     // are handles enabled at all? Create only then
     if(!areMarkHandlesHidden())
     {
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
-        BOOL bSingleTextObjMark=FALSE;
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+        sal_Bool bSingleTextObjMark=sal_False;
 
         if (nMarkAnz==1) 
         {
@@ -704,13 +704,13 @@ void SdrMarkView::SetMarkHandles()
                 static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame();
         }
         
-        BOOL bFrmHdl=ImpIsFrameHandles();
+        sal_Bool bFrmHdl=ImpIsFrameHandles();
         
         if (nMarkAnz>0) 
         {
             pMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
             
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) 
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) 
             {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             
@@ -736,15 +736,15 @@ void SdrMarkView::SetMarkHandles()
             { // sonst nix gefunden
                 if( bSingleTextObjMark )
                 {
-                    const ULONG nSiz0=aHdl.GetHdlCount();
+                    const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
                     pMarkedObj->AddToHdlList(aHdl);
-                    const ULONG nSiz1=aHdl.GetHdlCount();
-                    for (ULONG i=nSiz0; i<nSiz1; i++) 
+                    const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
+                    for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) 
                     {
                         SdrHdl* pHdl=aHdl.GetHdl(i);
                         pHdl->SetObj(pMarkedObj);
                         pHdl->SetPageView(pMarkedPV);
-                        pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+                        pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
                     }
                 }
                 else if( eDragMode==SDRDRAG_CROP )
@@ -760,8 +760,8 @@ void SdrMarkView::SetMarkHandles()
                 }
                 else
                 {
-                    BOOL bWdt0=aRect.Left()==aRect.Right();
-                    BOOL bHgt0=aRect.Top()==aRect.Bottom();
+                    sal_Bool bWdt0=aRect.Left()==aRect.Right();
+                    sal_Bool bHgt0=aRect.Top()==aRect.Bottom();
                     if (bWdt0 && bHgt0) 
                     {
                         aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
@@ -787,27 +787,27 @@ void SdrMarkView::SetMarkHandles()
         } 
         else 
         {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
             {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 SdrObject* pObj=pM->GetMarkedSdrObj();
                 SdrPageView* pPV=pM->GetPageView();
-                const ULONG nSiz0=aHdl.GetHdlCount();
+                const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
                 pObj->AddToHdlList(aHdl);
-                const ULONG nSiz1=aHdl.GetHdlCount();
+                const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
                 bool bPoly=pObj->IsPolyObj();
                 const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints();
-                for (ULONG i=nSiz0; i<nSiz1; i++) 
+                for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) 
                 {
                     SdrHdl* pHdl=aHdl.GetHdl(i);
                     pHdl->SetObj(pObj);
                     pHdl->SetPageView(pPV);
-                    pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+                    pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
                     if (bPoly) 
                     {
-                        BOOL bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(USHORT(i-nSiz0));
+                        sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0));
                         pHdl->SetSelected(bSelected);
-                        //BOOL bPlus=bPlusHdlAlways;
+                        //sal_Bool bPlus=bPlusHdlAlways;
                         if (bPlusHdlAlways || bSelected) 
                         {
                             sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
@@ -818,7 +818,7 @@ void SdrMarkView::SetMarkHandles()
                                 {
                                     pPlusHdl->SetObj(pObj);
                                     pPlusHdl->SetPageView(pPV);
-                                    pPlusHdl->SetPlusHdl(TRUE);
+                                    pPlusHdl->SetPlusHdl(sal_True);
                                     aHdl.AddHdl(pPlusHdl);
                                 }
                             }
@@ -829,7 +829,7 @@ void SdrMarkView::SetMarkHandles()
         } // if bFrmHdl else
 
         // GluePoint-Handles
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) 
         {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -840,13 +840,13 @@ void SdrMarkView::SetMarkHandles()
                 const SdrGluePointList* pGPL=pObj->GetGluePointList();
                 if (pGPL!=NULL) 
                 {
-                    //USHORT nGlueAnz=pGPL->GetCount();
-                    USHORT nAnz=(USHORT)pMrkGlue->GetCount();
-                    for (USHORT nNum=0; nNum<nAnz; nNum++) 
+                    //sal_uInt16 nGlueAnz=pGPL->GetCount();
+                    sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount();
+                    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) 
                     {
-                        USHORT nId=pMrkGlue->GetObject(nNum);
+                        sal_uInt16 nId=pMrkGlue->GetObject(nNum);
                         //nNum changed to nNumGP because already used in for loop
-                        USHORT nNumGP=pGPL->FindGluePoint(nId);
+                        sal_uInt16 nNumGP=pGPL->FindGluePoint(nId);
                         if (nNumGP!=SDRGLUEPOINT_NOTFOUND) 
                         {
                             const SdrGluePoint& rGP=(*pGPL)[nNumGP];
@@ -947,21 +947,21 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_TRANSPARENCE:
         {
             // add interactive transparence handle
-            ULONG nMarkAnz = GetMarkedObjectCount();
+            sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
             if(nMarkAnz == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
                 SdrModel* pModel = GetModel();
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
 
-                if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, FALSE))
+                if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False))
                 {
                     // add this item, it's not yet there
                     XFillFloatTransparenceItem aNewItem(
                         (const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE));
                     XGradient aGrad = aNewItem.GetGradientValue();
 
-                    aNewItem.SetEnabled(TRUE);
+                    aNewItem.SetEnabled(sal_True);
                     aGrad.SetStartIntens(100);
                     aGrad.SetEndIntens(100);
                     aNewItem.SetGradientValue(aGrad);
@@ -991,9 +991,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
                 // build handles
                 const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
                 const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
-                SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
-                SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
-                SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, FALSE);
+                SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+                SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+                SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False);
                 DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
 
                 // link them
@@ -1012,7 +1012,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_GRADIENT:
         {
             // add interactive gradient handle
-            ULONG nMarkAnz = GetMarkedObjectCount();
+            sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
             if(nMarkAnz == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
@@ -1033,9 +1033,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
                     // build handles
                     const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
                     const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
-                    SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, FALSE);
-                    SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, FALSE);
-                    SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, TRUE);
+                    SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False);
+                    SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False);
+                    SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True);
                     DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
 
                     // link them
@@ -1062,7 +1062,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
 }
 
 /** handle mouse over effects for handles */
-BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if(aHdl.GetHdlCount())
     {
@@ -1074,9 +1074,9 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         }
 
         // notify last mouse over handle that he lost the mouse
-        const ULONG nHdlCount = aHdl.GetHdlCount();
+        const sal_uIntPtr nHdlCount = aHdl.GetHdlCount();
 
-        for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+        for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
         {
             SdrHdl* pCurrentHdl = GetHdl(nHdl);
             if( pCurrentHdl->mbMouseOver )
@@ -1216,13 +1216,13 @@ void SdrMarkView::SetRef2(const Point& rPt)
 
 void SdrMarkView::CheckMarked()
 {
-    for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+    for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         SdrPageView* pPV=pM->GetPageView();
         SdrLayerID nLay=pObj->GetLayer();
-        BOOL bRaus=!pObj->IsInserted(); // Obj geloescht?
+        sal_Bool bRaus=!pObj->IsInserted(); // Obj geloescht?
         if (!pObj->Is3DObj()) {
             bRaus=bRaus || pObj->GetPage()!=pPV->GetPage();   // Obj ploetzlich in anderer Page oder Group
         }
@@ -1261,7 +1261,7 @@ void SdrMarkView::CheckMarked()
 
     // #97995# at least reset the remembered BoundRect to prevent handle
     // generation if bForceFrameHandles is TRUE.
-    bMarkedObjRectDirty = TRUE;
+    bMarkedObjRectDirty = sal_True;
 }
 
 void SdrMarkView::SetMarkRects()
@@ -1275,12 +1275,12 @@ void SdrMarkView::SetMarkRects()
     }
 }
 
-void SdrMarkView::SetFrameHandles(BOOL bOn)
+void SdrMarkView::SetFrameHandles(sal_Bool bOn)
 {
     if (bOn!=bForceFrameHandles) {
-        BOOL bOld=ImpIsFrameHandles();
+        sal_Bool bOld=ImpIsFrameHandles();
         bForceFrameHandles=bOn;
-        BOOL bNew=ImpIsFrameHandles();
+        sal_Bool bNew=ImpIsFrameHandles();
         if (bNew!=bOld) {
             AdjustMarkHdl(); //HMHTRUE);
             MarkListHasChanged();
@@ -1291,12 +1291,12 @@ void SdrMarkView::SetFrameHandles(BOOL bOn)
 void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
 {
     if (eMode!=eEditMode) {
-        BOOL bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
-        BOOL bEdge0=((SdrCreateView*)this)->IsEdgeTool();
+        sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+        sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool();
         eEditMode0=eEditMode;
         eEditMode=eMode;
-        BOOL bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
-        BOOL bEdge1=((SdrCreateView*)this)->IsEdgeTool();
+        sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+        sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool();
         // etwas Aufwand um Flackern zu verhindern beim Umschalten
         // zwischen GlueEdit und EdgeTool
         if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
@@ -1308,7 +1308,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
+sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
 {
     if (pObj)
     {
@@ -1317,65 +1317,65 @@ BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
         {
             // Objekt nicht selektierbar oder
             // SdrUnoObj nicht im DesignMode
-            return FALSE;
+            return sal_False;
         }
     }
-    return pPV!=NULL ? pPV->IsObjMarkable(pObj) : TRUE;
+    return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True;
 }
 
-BOOL SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
+sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
-    for (ULONG nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
-        bRet = 0 != CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
+        bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
     }
     return bRet;
 }
 
-SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, ULONG nOptions, SdrHdl* pHdl0) const
+SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* pHdl0) const
 {
     if (bSomeObjChgdFlag) { // ggf. Handles neu berechnen lassen!
         FlushComeBackTimer();
     }
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
     Point aPt(rPnt);
     return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0);
 }
 
-BOOL SdrMarkView::MarkObj(const Point& rPnt, short nTol, BOOL bToggle, BOOL bDeep)
+sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep)
 {
     SdrObject* pObj;
     SdrPageView* pPV;
     nTol=ImpGetHitTolLogic(nTol,NULL);
-    ULONG nOptions=SDRSEARCH_PICKMARKABLE;
+    sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE;
     if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP;
-    BOOL bRet=PickObj(rPnt,(USHORT)nTol,pObj,pPV,nOptions);
+    sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions);
     if (bRet) {
-        BOOL bUnmark=bToggle && IsObjMarked(pObj);
+        sal_Bool bUnmark=bToggle && IsObjMarked(pObj);
         MarkObj(pObj,pPV,bUnmark);
     }
     return bRet;
 }
 
-BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
 {
     SdrPageView* pPageView = GetSdrPageView();
     
     if(!pPageView)
     {
-        return FALSE;
+        return sal_False;
     }
 
     SortMarkedObjects();
-    ULONG  nMarkAnz=GetMarkedObjectCount();
-    ULONG  nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
-    ULONG  nSearchObjNum = bPrev ? 0 : ULONG_MAX;
+    sal_uIntPtr  nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr  nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
+    sal_uIntPtr  nSearchObjNum = bPrev ? 0 : ULONG_MAX;
     if (nMarkAnz!=0) {
-        nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1);
+        nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1);
         SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
         OSL_ASSERT(pM!=NULL);
         if (pM->GetMarkedSdrObj() != NULL)
@@ -1384,7 +1384,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
 
     SdrObject* pMarkObj=NULL;
     SdrObjList* pSearchObjList=pPageView->GetObjList();
-    ULONG nObjAnz=pSearchObjList->GetObjCount();
+    sal_uIntPtr nObjAnz=pSearchObjList->GetObjCount();
     if (nObjAnz!=0) {
         if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz;
         while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz)))
@@ -1405,7 +1405,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
 
     if(!pMarkObj) 
     {
-        return FALSE;
+        return sal_False;
     }
 
     if (nChgMarkNum!=ULONG_MAX) 
@@ -1413,32 +1413,32 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
         GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum);
     }
     MarkObj(pMarkObj,pPageView); // ruft auch MarkListHasChanged(), AdjustMarkHdl()
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
 {
     SortMarkedObjects();
     nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
     SdrMark* pTopMarkHit=NULL;
     SdrMark* pBtmMarkHit=NULL;
-    ULONG nTopMarkHit=0;
-    ULONG nBtmMarkHit=0;
+    sal_uIntPtr nTopMarkHit=0;
+    sal_uIntPtr nBtmMarkHit=0;
     // oberstes der markierten Objekte suchen, das von rPnt getroffen wird
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nm=0;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nm=0;
     for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) {
         nm--;
         SdrMark* pM=GetSdrMarkByIndex(nm);
-        if(CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) 
+        if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) 
         {
             pTopMarkHit=pM;
             nTopMarkHit=nm;
         }
     }
     // Nichts gefunden, dann ganz normal ein Obj markieren.
-    if (pTopMarkHit==NULL) return MarkObj(rPnt,USHORT(nTol),FALSE);
+    if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False);
 
     SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj();
     SdrObjList* pObjList=pTopObjHit->GetObjList();
@@ -1448,7 +1448,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrPageView* pPV2=pM->GetPageView();
-        if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) 
+        if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) 
         {
             pBtmMarkHit=pM;
             nBtmMarkHit=nm;
@@ -1456,10 +1456,10 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     }
     if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; }
     SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj();
-    ULONG nObjAnz=pObjList->GetObjCount();
+    sal_uIntPtr nObjAnz=pObjList->GetObjCount();
 
     // #110988#
-    //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
+    //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
     sal_uInt32 nSearchBeg;
     E3dScene* pScene = NULL;
     SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit;
@@ -1490,7 +1490,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
         nSearchBeg = nOrdNumTop;
     }
 
-    ULONG no=nSearchBeg;
+    sal_uIntPtr no=nSearchBeg;
     SdrObject* pFndObj=NULL;
     //SdrObject* pAktObj=NULL;
     while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) {
@@ -1506,7 +1506,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
             pObj = pObjList->GetObj(no);
         }
 
-        if (CheckSingleSdrObjectHit(aPt,USHORT(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) 
+        if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) 
         {
             if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) {
                 pFndObj=pObj;
@@ -1526,9 +1526,9 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
     return pFndObj!=NULL;
 }
 
-BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
 {
-    BOOL bFnd=FALSE;
+    sal_Bool bFnd=sal_False;
     Rectangle aR(rRect);
     SdrObject* pObj;
     SdrObjList* pObjList;
@@ -1539,8 +1539,8 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
     {
         pObjList=pPV->GetObjList();
         Rectangle aFrm1(aR);
-        ULONG nObjAnz=pObjList->GetObjCount();
-        for (ULONG nO=0; nO<nObjAnz; nO++) {
+        sal_uIntPtr nObjAnz=pObjList->GetObjCount();
+        for (sal_uIntPtr nO=0; nO<nObjAnz; nO++) {
             pObj=pObjList->GetObj(nO);
             Rectangle aRect(pObj->GetCurrentBoundRect());
             if (aFrm1.IsInside(aRect)) {
@@ -1548,14 +1548,14 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
                     if (IsObjMarkable(pObj,pPV)) 
                     {
                         GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV));
-                        bFnd=TRUE;
+                        bFnd=sal_True;
                     }
                 } else {
-                    ULONG nPos=TryToFindMarkedObject(pObj);
+                    sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
                     if (nPos!=CONTAINER_ENTRY_NOTFOUND) 
                     {
                         GetMarkedObjectListWriteAccess().DeleteMark(nPos);
-                        bFnd=TRUE;
+                        bFnd=sal_True;
                     }
                 }
             }
@@ -1570,7 +1570,7 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
     return bFnd;
 }
 
-void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL bImpNoSetMarkHdl)
+void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl)
 {
     if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) {
         BrkAction();
@@ -1580,7 +1580,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
         } 
         else 
         {
-            ULONG nPos=TryToFindMarkedObject(pObj);
+            sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
             if (nPos!=CONTAINER_ENTRY_NOTFOUND) 
             {
                 GetMarkedObjectListWriteAccess().DeleteMark(nPos);
@@ -1597,20 +1597,20 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
     }
 }
 
-BOOL SdrMarkView::IsObjMarked(SdrObject* pObj) const
+sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
 {
     // nicht so ganz die feine Art: Da FindObject() nicht const ist
     // muss ich mich hier auf non-const casten.
-    ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
+    sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
     return nPos!=CONTAINER_ENTRY_NOTFOUND;
 }
 
-USHORT SdrMarkView::GetMarkHdlSizePixel() const
+sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
 {
     return aHdl.GetHdlSize()*2+1;
 }
 
-void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
+void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn)
 {
     if (bOn!=aHdl.IsFineHdl()) {
         //HMHBOOL bMerk=IsMarkHdlShown();
@@ -1620,7 +1620,7 @@ void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
     }
 }
 
-void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
+void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
 {
     if (nSiz<3) nSiz=3;
     nSiz/=2;
@@ -1633,7 +1633,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
 }
 
 #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const
 {
     if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible()))
     {
@@ -1646,7 +1646,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     const bool bTXT(pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsTextFrame());
     SdrObject* pRet=NULL;
     Rectangle aRect(pObj->GetCurrentBoundRect());
-    USHORT nTol2(nTol);
+    sal_uInt16 nTol2(nTol);
 
     // double tolerance for OLE, text frames and objects in
     // active text edit
@@ -1699,9 +1699,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     return pRet;
 }
 
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
 {
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
     SdrObject* pRet=NULL;
     rpRootObj=NULL;
     if (pOL!=NULL) 
@@ -1710,8 +1710,8 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
         sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
         E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L);
 
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG nObjNum=bBack ? 0 : nObjAnz;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr nObjNum=bBack ? 0 : nObjAnz;
         while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) {
             if (!bBack) nObjNum--;
             SdrObject* pObj;
@@ -1734,12 +1734,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
     return pRet;
 }
 
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
 {
     return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL);
 }
 
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum, USHORT* pnPassNum) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const
 { // Fehlt noch Pass2,Pass3
     SortMarkedObjects();
     if (ppRootObj!=NULL) *ppRootObj=NULL;
@@ -1747,14 +1747,14 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
     if (pnPassNum!=NULL) *pnPassNum=0;
     rpObj=NULL;
     rpPV=NULL;
-    BOOL bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
-    BOOL bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
-    BOOL bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
+    sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
+    sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
 #if OSL_DEBUG_LEVEL > 0
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
-    BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
-    BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
+    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
+    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
 #endif
     if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL);
     Point aPt(rPnt);
@@ -1767,8 +1767,8 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
         pPV=((SdrObjEditView*)this)->GetTextEditPageView();
     }
     if (bMarked) {
-        ULONG nMrkAnz=GetMarkedObjectCount();
-        ULONG nMrkNum=bBack ? 0 : nMrkAnz;
+        sal_uIntPtr nMrkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz;
         while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) {
             if (!bBack) nMrkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMrkNum);
@@ -1785,18 +1785,18 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
         if(pPV)
         {
             SdrPage* pPage=pPV->GetPage();
-            USHORT nPgAnz=1; 
+            sal_uInt16 nPgAnz=1; 
             
             if(bMasters && pPage->TRG_HasMasterPage()) 
             {
                 nPgAnz++;
             }
 
-            BOOL bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
+            sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
             if (bExtraPassForWholePage) nPgAnz++; // Suche erst in AktObjList, dann auf der gesamten Page
-            USHORT nPgNum=bBack ? 0 : nPgAnz;
+            sal_uInt16 nPgNum=bBack ? 0 : nPgAnz;
             while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) {
-                ULONG nTmpOptions=nOptions;
+                sal_uIntPtr nTmpOptions=nOptions;
                 if (!bBack) nPgNum--;
                 const SetOfByte* pMVisLay=NULL;
                 SdrObjList* pObjList=NULL;
@@ -1858,19 +1858,19 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
     return rpObj!=NULL;
 }
 
-BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum, ULONG nOptions) const
+sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
 {
     SortMarkedObjects();
-    BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
-    BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
+    sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
+    sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
     rpObj=NULL;
     rpPV=NULL;
     if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND;
     Point aPt(rPnt);
-    USHORT nTol=(USHORT)nHitTolLog;
-    BOOL bFnd=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nMarkNum;
+    sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
+    sal_Bool bFnd=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkNum;
     for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
         nMarkNum--;
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1886,8 +1886,8 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
     if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) {
         SdrObject* pBestObj=NULL;
         SdrPageView* pBestPV=NULL;
-        ULONG nBestMarkNum=0;
-        ULONG nBestDist=ULONG_MAX;
+        sal_uIntPtr nBestMarkNum=0;
+        sal_uIntPtr nBestDist=ULONG_MAX;
         for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
             nMarkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1899,12 +1899,12 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
             aRect.Right ()+=nTol;
             aRect.Bottom()+=nTol;
             if (aRect.IsInside(aPt)) {
-                bFnd=TRUE;
+                bFnd=sal_True;
                 rpObj=pObj;
                 rpPV=pPV;
                 if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum;
             } else if (bCheckNearestOn3rdPass) {
-                ULONG nDist=0;
+                sal_uIntPtr nDist=0;
                 if (aPt.X()<aRect.Left())   nDist+=aRect.Left()-aPt.X();
                 if (aPt.X()>aRect.Right())  nDist+=aPt.X()-aRect.Right();
                 if (aPt.Y()<aRect.Top())    nDist+=aRect.Top()-aPt.Y();
@@ -1933,7 +1933,7 @@ SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const
     Point aPt(rPnt);
     SdrObject* pObj=NULL;
     SdrPageView* pPV=NULL;
-    if (eRet==SDRHIT_NONE && PickObj(rPnt,USHORT(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
+    if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
         Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz
         Rectangle aBR(pObj->GetCurrentBoundRect());
         if      (aRct1.IsInside(aBR.TopLeft()))      eRet=SDRHIT_BOUNDTL;
@@ -2016,7 +2016,7 @@ void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint)
 Rectangle SdrMarkView::GetMarkedObjBoundRect() const
 {
     Rectangle aRect;
-    for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+    for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         Rectangle aR1(pO->GetCurrentBoundRect());
@@ -2029,9 +2029,9 @@ Rectangle SdrMarkView::GetMarkedObjBoundRect() const
 const Rectangle& SdrMarkView::GetMarkedObjRect() const
 {
     if (bMarkedObjRectDirty) {
-        ((SdrMarkView*)this)->bMarkedObjRectDirty=FALSE;
+        ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False;
         Rectangle aRect;
-        for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+        for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pO=pM->GetMarkedSdrObj();
             Rectangle aR1(pO->GetSnapRect());
@@ -2045,7 +2045,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal, USHORT nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
 {
     rStr = ImpGetResStr(nStrCacheID);
     xub_StrLen nPos = rStr.SearchAscii("%1");
@@ -2079,9 +2079,9 @@ void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::EnterMarkedGroup()
+sal_Bool SdrMarkView::EnterMarkedGroup()
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     // Es wird nur die erste gefundene Gruppe (also nur in einer PageView) geentert
     // Weil PageView::EnterGroup ein AdjustMarkHdl ruft.
     // Das muss ich per Flag mal unterbinden  vvvvvvvv
@@ -2089,7 +2089,7 @@ BOOL SdrMarkView::EnterMarkedGroup()
 
     if(pPV)
     {
-        BOOL bEnter=FALSE;
+        sal_Bool bEnter=sal_False;
         for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;) 
         {
             nm--;
@@ -2098,8 +2098,8 @@ BOOL SdrMarkView::EnterMarkedGroup()
                 SdrObject* pObj=pM->GetMarkedSdrObj();
                 if (pObj->IsGroupObject()) {
                     if (pPV->EnterGroup(pObj)) {
-                        bRet=TRUE;
-                        bEnter=TRUE;
+                        bRet=sal_True;
+                        bEnter=sal_True;
                     }
                 }
             }
@@ -2113,18 +2113,18 @@ BOOL SdrMarkView::EnterMarkedGroup()
 void SdrMarkView::MarkListHasChanged()
 {
     GetMarkedObjectListWriteAccess().SetNameDirty();
-    SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=TRUE;
+    SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True;
 
-    bMarkedObjRectDirty=TRUE;
-    bMarkedPointsRectsDirty=TRUE;
+    bMarkedObjRectDirty=sal_True;
+    bMarkedPointsRectsDirty=sal_True;
 #ifdef DBG_UTIL
     if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
-    BOOL bOneEdgeMarked=FALSE;
+    sal_Bool bOneEdgeMarked=sal_False;
     if (GetMarkedObjectCount()==1) {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
         if (pObj->GetObjInventor()==SdrInventor) {
-            UINT16 nIdent=pObj->GetObjIdentifier();
+            sal_uInt16 nIdent=pObj->GetObjIdentifier();
             bOneEdgeMarked=nIdent==OBJ_EDGE;
         }
     }
@@ -2133,17 +2133,17 @@ void SdrMarkView::MarkListHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SdrMarkView::SetMoveOutside(BOOL bOn)
+void SdrMarkView::SetMoveOutside(sal_Bool bOn)
 {
     aHdl.SetMoveOutside(bOn);
 }
 
-BOOL SdrMarkView::IsMoveOutside() const                     
+sal_Bool SdrMarkView::IsMoveOutside() const                     
 { 
     return aHdl.IsMoveOutside(); 
 }
 
-void SdrMarkView::SetDesignMode( BOOL _bOn )
+void SdrMarkView::SetDesignMode( sal_Bool _bOn )
 {
     if ( bDesignMode != _bOn )
     {
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 9071aa6b69..a4d82bf9e0 100644..100755
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -32,7 +32,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
+#include "svx/svdglob.hxx"
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include "svddrgm1.hxx"
@@ -51,14 +51,14 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::HasMarkablePoints() const
+sal_Bool SdrMarkView::HasMarkablePoints() const
 {
     ForceUndirtyMrkPnt();
     bool bRet=false;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bRet=pObj->IsPolyObj();
@@ -68,14 +68,14 @@ BOOL SdrMarkView::HasMarkablePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkablePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 if (pObj->IsPolyObj()) {
@@ -87,14 +87,14 @@ ULONG SdrMarkView::GetMarkablePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::HasMarkedPoints() const
+sal_Bool SdrMarkView::HasMarkedPoints() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -104,14 +104,14 @@ BOOL SdrMarkView::HasMarkedPoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkedPointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (!ImpIsFrameHandles()) {
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
         if (nMarkAnz<=nFrameHandlesLimit) {
-            for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+            for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -121,33 +121,33 @@ ULONG SdrMarkView::GetMarkedPointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
+sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
 {
     return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj();
 }
 
-BOOL SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
 {
     return ImpMarkPoint( pHdl, pMark, bUnmark );
 }
 
-BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
 {
     if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
-        return FALSE;
+        return sal_False;
     
     if (pHdl->IsSelected() != bUnmark)
-        return FALSE;
+        return sal_False;
 
     SdrObject* pObj=pHdl->GetObj();
     if (pObj==NULL || !pObj->IsPolyObj())
-        return FALSE;
+        return sal_False;
 
     if (pMark==NULL)
     {
-        ULONG nMarkNum=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
         if (nMarkNum==CONTAINER_ENTRY_NOTFOUND)
-            return FALSE;
+            return sal_False;
         pMark=GetSdrMarkByIndex(nMarkNum);
     }
     const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum());
@@ -158,14 +158,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
     }
     else
     {
-        ULONG nBla=pPts->GetPos((sal_uInt16)nHdlNum);
+        sal_uIntPtr nBla=pPts->GetPos((sal_uInt16)nHdlNum);
         if (nBla!=CONTAINER_ENTRY_NOTFOUND)
         {
             pPts->Remove(nBla);
         }
         else
         {
-            return FALSE; // Fehlerfall!
+            return sal_False; // Fehlerfall!
         }
     }
 
@@ -182,14 +182,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
                 {
                     pPlusHdl->SetObj(pObj);
                     pPlusHdl->SetPageView(pMark->GetPageView());
-                    pPlusHdl->SetPlusHdl(TRUE);
+                    pPlusHdl->SetPlusHdl(sal_True);
                     aHdl.AddHdl(pPlusHdl);
                 }
             }
         } 
         else
         {
-            for (ULONG i = aHdl.GetHdlCount(); i>0;)
+            for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;)
             {
                 i--;
                 SdrHdl* pPlusHdl=aHdl.GetHdl(i);
@@ -205,18 +205,18 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
     // #97016# II: Sort handles. This was missing in ImpMarkPoint all the time.
     aHdl.Sort();
 
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
 {
-    if (&rHdl==NULL) return FALSE;
+    if (&rHdl==NULL) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     const SdrObject* pObj=rHdl.GetObj();
     if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) {
-        ULONG nMarkNum=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
         if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) {
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrUShortCont* pPts=pM->ForceMarkedPoints();
@@ -224,7 +224,7 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
             if (ImpMarkPoint(&rHdl,pM,bUnmark)) {
                 pPts->ForceSort();
                 MarkListHasChanged();
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
     }
@@ -232,18 +232,18 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
     return bRet;
 }
 
-BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     const SdrObject* pObj0=NULL;
     const SdrPageView* pPV0=NULL;
     SdrMark* pM=NULL;
     aHdl.Sort();
     //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways;
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) {
         nHdlNum--;
         SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
@@ -254,7 +254,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
                     SdrUShortCont* pPts=pM->GetMarkedPoints();
                     if (pPts!=NULL) pPts->ForceSort();
                 }
-                ULONG nMarkNum=TryToFindMarkedObject(pObj);  // damit ImpMarkPoint() nicht staendig das
+                sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);  // damit ImpMarkPoint() nicht staendig das
                 if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // Objekt in der MarkList suchen muss.
                     pM=GetSdrMarkByIndex(nMarkNum);
                     pObj0=pObj;
@@ -276,7 +276,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
                     //HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl);
                     //HMHif (nAnz!=0L) HideMarkHdl(); // #36987#
                 //HMH}
-                if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=TRUE;
+                if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True;
             }
         }
     }
@@ -292,10 +292,10 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -304,10 +304,10 @@ BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -323,7 +323,7 @@ const Rectangle& SdrMarkView::GetMarkedPointsRect() const
     return aMarkedPointsRect;
 }
 
-void SdrMarkView::SetPlusHandlesAlwaysVisible(BOOL bOn)
+void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn)
 { // HandlePaint optimieren !!!!!!!
     ForceUndirtyMrkPnt();
     if (bOn!=bPlusHdlAlways) {
@@ -344,8 +344,8 @@ void SdrMarkView::ImpSetPointsRects() const
 {
     Rectangle aPnts;
     Rectangle aGlue;
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
         const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         SdrHdlKind eKind=pHdl->GetKind();
         if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) {
@@ -363,7 +363,7 @@ void SdrMarkView::ImpSetPointsRects() const
     }
     ((SdrMarkView*)this)->aMarkedPointsRect=aPnts;
     ((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue;
-    ((SdrMarkView*)this)->bMarkedPointsRectsDirty=FALSE;
+    ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -372,9 +372,9 @@ void SdrMarkView::ImpSetPointsRects() const
 
 void SdrMarkView::UndirtyMrkPnt() const
 {
-    BOOL bChg=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_Bool bChg=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         // PolyPoints
@@ -396,7 +396,7 @@ void SdrMarkView::UndirtyMrkPnt() const
                     if(nPtNum >= nMax) 
                     {
                         pPts->Remove(nIndex);
-                        bChg = TRUE;
+                        bChg = sal_True;
                     }
                 }
             } 
@@ -406,7 +406,7 @@ void SdrMarkView::UndirtyMrkPnt() const
                 if(pPts && pPts->GetCount()) 
                 {
                     pPts->Clear();
-                    bChg = TRUE;
+                    bChg = sal_True;
                 }
             }
         }
@@ -420,37 +420,37 @@ void SdrMarkView::UndirtyMrkPnt() const
                 // Eintraege (Id's) die nicht in der GluePointList des
                 // Objekts enthalten sind
                 pPts->ForceSort();
-                for (ULONG nIndex=pPts->GetCount(); nIndex>0;) {
+                for (sal_uIntPtr nIndex=pPts->GetCount(); nIndex>0;) {
                     nIndex--;
-                    USHORT nId=pPts->GetObject(nIndex);
+                    sal_uInt16 nId=pPts->GetObject(nIndex);
                     if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) {
                         pPts->Remove(nIndex);
-                        bChg=TRUE;
+                        bChg=sal_True;
                     }
                 }
             } else {
                 if (pPts!=NULL && pPts->GetCount()!=0) {
                     pPts->Clear(); // Objekt hat keine Klebepunkte (mehr)
-                    bChg=TRUE;
+                    bChg=sal_True;
                 }
             }
         }
     }
-    if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=TRUE;
-    ((SdrMarkView*)this)->bMrkPntDirty=FALSE;
+    if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True;
+    ((SdrMarkView*)this)->bMrkPntDirty=sal_False;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrMarkView::HasMarkableGluePoints() const
+sal_Bool SdrMarkView::HasMarkableGluePoints() const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     if (IsGluePointEditMode()) {
         ForceUndirtyMrkPnt();
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -462,7 +462,7 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
                 {
                     if((*pGPL)[a].IsUserDefined())
                     {
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -471,13 +471,13 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkableGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const
 {
-    ULONG nAnz=0;
+    sal_uIntPtr nAnz=0;
     if (IsGluePointEditMode()) {
         ForceUndirtyMrkPnt();
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -498,12 +498,12 @@ ULONG SdrMarkView::GetMarkableGluePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::HasMarkedGluePoints() const
+sal_Bool SdrMarkView::HasMarkedGluePoints() const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+    sal_Bool bRet=sal_False;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -511,12 +511,12 @@ BOOL SdrMarkView::HasMarkedGluePoints() const
     return bRet;
 }
 
-ULONG SdrMarkView::GetMarkedGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const
 {
     ForceUndirtyMrkPnt();
-    ULONG nAnz=0;
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_uIntPtr nAnz=0;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -524,14 +524,14 @@ ULONG SdrMarkView::GetMarkedGluePointCount() const
     return nAnz;
 }
 
-BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
 {
-    if (!IsGluePointEditMode() && !bUnmark) return FALSE;
+    if (!IsGluePointEditMode() && !bUnmark) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -539,12 +539,12 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
         if (bUnmark && pRect==NULL) { // UnmarkAll
             if (pPts!=NULL && pPts->GetCount()!=0) {
                 pPts->Clear();
-                bChgd=TRUE;
+                bChgd=sal_True;
             }
         } else {
             if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) {
-                USHORT nGPAnz=pGPL->GetCount();
-                for (USHORT nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
+                sal_uInt16 nGPAnz=pGPL->GetCount();
+                for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
                     const SdrGluePoint& rGP=(*pGPL)[nGPNum];
 
                     // #i38892#
@@ -554,13 +554,13 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
                         if (pRect==NULL || pRect->IsInside(aPos)) {
                             if (pPts==NULL) pPts=pM->ForceMarkedGluePoints();
                             else pPts->ForceSort();
-                            ULONG nPos=pPts->GetPos(rGP.GetId());
+                            sal_uIntPtr nPos=pPts->GetPos(rGP.GetId());
                             if (!bUnmark && nPos==CONTAINER_ENTRY_NOTFOUND) {
-                                bChgd=TRUE;
+                                bChgd=sal_True;
                                 pPts->Insert(rGP.GetId());
                             }
                             if (bUnmark && nPos!=CONTAINER_ENTRY_NOTFOUND) {
-                                bChgd=TRUE;
+                                bChgd=sal_True;
                                 pPts->Remove(nPos);
                             }
                         }
@@ -576,24 +576,24 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
     return bChgd;
 }
 
-BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
 {
     SdrObject* pObj0=rpObj;
     //SdrPageView* pPV0=rpPV;
-    USHORT nId0=rnId;
+    sal_uInt16 nId0=rnId;
     rpObj=NULL; rpPV=NULL; rnId=0;
-    if (!IsGluePointEditMode()) return FALSE;
-    BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
-    BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+    if (!IsGluePointEditMode()) return sal_False;
+    sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+    sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
     OutputDevice* pOut=(OutputDevice*)pActualOutDev;
     if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0);
-    if (pOut==NULL) return FALSE;
+    if (pOut==NULL) return sal_False;
     SortMarkedObjects();
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    ULONG nMarkNum=bBack ? 0 : nMarkAnz;
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz;
     if (bNext) {
         nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0);
-        if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return FALSE;
+        if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False;
         if (!bBack) nMarkNum++;
     }
     while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) {
@@ -603,7 +603,7 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
         SdrPageView* pPV=pM->GetPageView();
         const SdrGluePointList* pGPL=pObj->GetGluePointList();
         if (pGPL!=NULL) {
-            USHORT nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
+            sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
             if (nNum!=SDRGLUEPOINT_NOTFOUND) 
             {
                 // #i38892#
@@ -614,34 +614,34 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
                     rpObj=pObj;
                     rnId=(*pGPL)[nNum].GetId();
                     rpPV=pPV;
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
-        bNext=FALSE; // HitNextGluePoint nur beim ersten Obj
+        bNext=sal_False; // HitNextGluePoint nur beim ersten Obj
         if (bBack) nMarkNum++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* /*pPV*/, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark)
 {
-    if (!IsGluePointEditMode()) return FALSE;
+    if (!IsGluePointEditMode()) return sal_False;
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     if (pObj!=NULL) {
-        ULONG nMarkPos=TryToFindMarkedObject(pObj);
+        sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj);
         if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) {
             SdrMark* pM=GetSdrMarkByIndex(nMarkPos);
             SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints();
             if (pPts!=NULL) {
-                ULONG nPointPos=pPts->GetPos(nId);
+                sal_uIntPtr nPointPos=pPts->GetPos(nId);
                 if (!bUnmark && nPointPos==CONTAINER_ENTRY_NOTFOUND) {
-                    bChgd=TRUE;
+                    bChgd=sal_True;
                     pPts->Insert(nId);
                 }
                 if (bUnmark && nPointPos!=CONTAINER_ENTRY_NOTFOUND) {
-                    bChgd=TRUE;
+                    bChgd=sal_True;
                     pPts->Remove(nPointPos);
                 }
             }
@@ -657,11 +657,11 @@ BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPage
     return bChgd;
 }
 
-BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
+sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
 {
     ForceUndirtyMrkPnt();
-    BOOL bRet=FALSE;
-    ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
+    sal_Bool bRet=sal_False;
+    sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
     if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
         const SdrMark* pM=GetSdrMarkByIndex(nPos);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -672,18 +672,18 @@ BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
     return bRet;
 }
 
-BOOL SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
+sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
 {
     if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) {
-        return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),TRUE);
-    } else return FALSE;
+        return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True);
+    } else return sal_False;
 }
 
-SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
+SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
 {
     ForceUndirtyMrkPnt();
-    ULONG nHdlAnz=aHdl.GetHdlCount();
-    for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+    sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+    for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
         SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
         if (pHdl->GetObj()==pObj &&
             pHdl->GetKind()==HDL_GLUE &&
@@ -692,10 +692,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
     return NULL;
 }
 
-BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
@@ -704,10 +704,10 @@ BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
     return bChgd;
 }
 
-BOOL SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
 {
     ForceUndirtyMrkPnt();
-    BOOL bChgd=FALSE;
+    sal_Bool bChgd=sal_False;
     SortMarkedObjects();
     // ...
     if (bChgd) {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index f8d47926c6..76f43df2b7 100644..100755
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdoashp.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unoshape.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
@@ -53,22 +53,22 @@
 #include <svx/xpoly.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
-#include "../customshapes/EnhancedCustomShapeGeometry.hxx"
-#include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
-#include "../customshapes/EnhancedCustomShape2d.hxx"
+#include "../svx/EnhancedCustomShapeGeometry.hxx"
+#include "../svx/EnhancedCustomShapeTypeNames.hxx"
+#include "../svx/EnhancedCustomShape2d.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -631,7 +631,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
     fObjectRotation( 0.0 ),
     mpLastShadowGeometry(0L)
 {
-    bTextFrame = TRUE;
+    bTextFrame = sal_True;
 }
 
 SdrObjCustomShape::~SdrObjCustomShape()
@@ -1622,17 +1622,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
 void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
-    rInfo.bMirrorFreeAllowed=TRUE;
-    rInfo.bMirror45Allowed  =TRUE;
-    rInfo.bMirror90Allowed  =TRUE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =TRUE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoContortion     =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
+    rInfo.bMirrorFreeAllowed=sal_True;
+    rInfo.bMirror45Allowed  =sal_True;
+    rInfo.bMirror90Allowed  =sal_True;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_True;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoContortion     =sal_True;
 
     // #i37011#
     if ( mXRenderedCustomShape.is() )
@@ -1679,9 +1679,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
     mXRenderedCustomShape.clear();
 }
 
-UINT16 SdrObjCustomShape::GetObjIdentifier() const
+sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
 {
-    return UINT16(OBJ_CUSTOMSHAPE);
+    return sal_uInt16(OBJ_CUSTOMSHAPE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1997,9 +1997,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
     
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -2019,7 +2019,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
@@ -2051,7 +2051,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                 for(a = 0; a < pSource->GetCount(); a++)
                 {
                     SdrGluePoint aCopy((*pSource)[a]);
-                    aCopy.SetUserDefined(FALSE);
+                    aCopy.SetUserDefined(sal_False);
                     aNewList.Insert(aCopy);
                 }
 
@@ -2066,9 +2066,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     Polygon aPoly( aRect );
                     if( nShearWink )
                     {
-                        USHORT nPointCount=aPoly.GetSize();
-                        for (USHORT i=0; i<nPointCount; i++)
-                            ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE );
+                        sal_uInt16 nPointCount=aPoly.GetSize();
+                        for (sal_uInt16 i=0; i<nPointCount; i++)
+                            ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False );
                     }
                     if ( aGeo.nDrehWink )
                         aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
@@ -2463,7 +2463,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
     }
 
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
 }
 
 bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
@@ -2480,7 +2480,7 @@ bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
     }
     DragCreateObject( rStat );
     SetRectsDirty();
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
@@ -2526,7 +2526,7 @@ bool SdrObjCustomShape::IsAutoGrowHeight() const
     const SfxItemSet& rSet = GetMergedItemSet();
     bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowHeight && IsVerticalWriting() )
-        bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+        bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
     return bIsAutoGrowHeight;
 }
 bool SdrObjCustomShape::IsAutoGrowWidth() const
@@ -2534,7 +2534,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const
     const SfxItemSet& rSet = GetMergedItemSet();
     bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowWidth && !IsVerticalWriting() )
-        bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+        bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
     return bIsAutoGrowWidth;
 }
 
@@ -2658,7 +2658,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
             {
                 Outliner& rOutliner=ImpGetDrawOutliner();
                 rOutliner.SetPaperSize(aSiz);
-                rOutliner.SetUpdateMode(TRUE);
+                rOutliner.SetUpdateMode(sal_True);
                 // !!! hier sollte ich wohl auch noch mal die Optimierung mit
                 // bPortionInfoChecked usw einbauen
                 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -2695,9 +2695,9 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
             long nWdtGrow = nWdt-(rR.Right()-rR.Left());
             long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
             if ( nWdtGrow == 0 )
-                bWdtGrow = FALSE;
+                bWdtGrow = sal_False;
             if ( nHgtGrow == 0 )
-                bHgtGrow=FALSE;
+                bHgtGrow=sal_False;
             if ( bWdtGrow || bHgtGrow )
             {
                 if ( bWdtGrow )
@@ -2737,11 +2737,11 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
                     aD2-=aD1;
                     rR.Move(aD2.X(),aD2.Y());
                 }
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt )
@@ -2968,13 +2968,13 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
         SdrTextObj::TakeTextAnchorRect( rAnchorRect );
 }
 void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
-                               Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const
+                               Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const
 {
     Rectangle aAnkRect; // Rect innerhalb dem geankert wird
     TakeTextAnchorRect(aAnkRect);
     SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
     SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
 
     rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -3011,7 +3011,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
 
     if (pPara)
     {
-        BOOL bHitTest = FALSE;
+        sal_Bool bHitTest = sal_False;
         if( pModel )
             bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
 
@@ -3022,7 +3022,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
             if( bHitTest )
                 rOutliner.SetTextObj( this );
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -3033,7 +3033,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
     if (pEdtOutl && !bNoEditText && pPara)
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     SdrText* pText = getActiveText();
@@ -3103,7 +3103,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject
 {
     SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
     SetBoundRectDirty();
-    SetRectsDirty(TRUE);
+    SetRectsDirty(sal_True);
     InvalidateRenderGeometry();
 }
 
@@ -3147,7 +3147,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
     return basegfx::B2DPolyPolygon();
 }
 
-SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // #i37011#
     SdrObject* pRetval = 0L;
@@ -3318,7 +3318,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
         GeoStat aGeoStat;
         aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
     }
 
     // rotation?
@@ -3366,8 +3366,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
 
             Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
             Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
-            USHORT i;
-            USHORT nPntAnz=aPol.GetSize();
+            sal_uInt16 i;
+            sal_uInt16 nPntAnz=aPol.GetSize();
             for (i=0; i<nPntAnz; i++)
             {
                 MirrorPoint(aPol[i],aRef1,aRef2);
@@ -3388,8 +3388,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
 
             Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
             Point aRef2( aRef1.X() + 1000, aRef1.Y() );
-            USHORT i;
-            USHORT nPntAnz=aPol.GetSize();
+            sal_uInt16 i;
+            sal_uInt16 nPntAnz=aPol.GetSize();
             for (i=0; i<nPntAnz; i++)
             {
                 MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index d692ffe9ce..39e00397a7 100644..100755
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -31,7 +31,7 @@
 
 #include <svx/svdoattr.hxx>
 #include <svx/xpool.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdattr.hxx>
@@ -140,7 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
 void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
-    BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
+    sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
 
     if(bDataChg)
     {
@@ -167,12 +167,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
     return nRetval;
 }
 
-BOOL SdrAttrObj::HasFill() const
+sal_Bool SdrAttrObj::HasFill() const
 {
     return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE;
 }
 
-BOOL SdrAttrObj::HasLine() const
+sal_Bool SdrAttrObj::HasLine() const
 {
     return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE;
 }
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 06f1ad999e..f183e53e74 100644..100755
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -48,8 +48,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdovirt.hxx>  // Fuer Add/Del Ref
 #include <svx/svdview.hxx>   // fuer Dragging (Ortho abfragen)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include <svx/svdstr.hrc>    // Objektname
 #include <svx/svdogrp.hxx>   // Factory
 #include <svx/svdopath.hxx>  // Factory
 #include <svx/svdoedge.hxx>  // Factory
@@ -75,7 +75,7 @@
 #include <svx/xlndsit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xflclit.hxx>
-#include "svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xfltrit.hxx>
@@ -151,12 +151,12 @@ void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/)    // nicht impl
 
 sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert
 {
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrObjUserData::~SdrObjUserData()
@@ -165,7 +165,7 @@ SdrObjUserData::~SdrObjUserData()
 
 bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const
@@ -209,7 +209,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec
 
 bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
@@ -219,8 +219,8 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/
 
 void SdrObjUserDataList::Clear()
 {
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetUserData(i);
     }
     aList.Clear();
@@ -232,10 +232,10 @@ DBG_NAME(SdrObjGeoData);
 
 SdrObjGeoData::SdrObjGeoData():
     pGPL(NULL),
-    bMovProt(FALSE),
-    bSizProt(FALSE),
-    bNoPrint(FALSE),
-    bClosedObj(FALSE),
+    bMovProt(sal_False),
+    bSizProt(sal_False),
+    bNoPrint(sal_False),
+    bClosedObj(sal_False),
     mbVisible(true),
     mnLayerID(0)
 {
@@ -272,10 +272,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
 {
     SdrObjPlusData* pNeuPlusData=new SdrObjPlusData;
     if (pUserDataList!=NULL) {
-        USHORT nAnz=pUserDataList->GetUserDataCount();
+        sal_uInt16 nAnz=pUserDataList->GetUserDataCount();
         if (nAnz!=0) {
             pNeuPlusData->pUserDataList=new SdrObjUserDataList;
-            for (USHORT i=0; i<nAnz; i++) {
+            for (sal_uInt16 i=0; i<nAnz; i++) {
                 SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1);
                 if (pNeuUserData!=NULL) {
                     pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData);
@@ -405,17 +405,17 @@ SdrObject::SdrObject()
     ,maWeakUnoShape()
 {
     DBG_CTOR(SdrObject,NULL);
-    bVirtObj         =FALSE;
-    bSnapRectDirty   =TRUE;
-    bNetLock         =FALSE;
-    bInserted        =FALSE;
-    bGrouped         =FALSE;
-    bMovProt         =FALSE;
-    bSizProt         =FALSE;
-    bNoPrint         =FALSE;
-    bEmptyPresObj    =FALSE;
-    bNotVisibleAsMaster=FALSE;
-    bClosedObj       =FALSE;
+    bVirtObj         =sal_False;
+    bSnapRectDirty   =sal_True;
+    bNetLock         =sal_False;
+    bInserted        =sal_False;
+    bGrouped         =sal_False;
+    bMovProt         =sal_False;
+    bSizProt         =sal_False;
+    bNoPrint         =sal_False;
+    bEmptyPresObj    =sal_False;
+    bNotVisibleAsMaster=sal_False;
+    bClosedObj       =sal_False;
     mbVisible		 = true;
 
     // #i25616#
@@ -425,13 +425,13 @@ SdrObject::SdrObject()
     mbSupportTextIndentingOnLineWidthChange = sal_False;
 
     //#110094#-1
-    //bWriterFlyFrame  =FALSE;
+    //bWriterFlyFrame  =sal_False;
 
-    bNotMasterCachable=FALSE;
-    bIsEdge=FALSE;
-    bIs3DObj=FALSE;
-    bMarkProt=FALSE;
-    bIsUnoObj=FALSE;
+    bNotMasterCachable=sal_False;
+    bIsEdge=sal_False;
+    bIs3DObj=sal_False;
+    bMarkProt=sal_False;
+    bIsUnoObj=sal_False;
 }
 
 SdrObject::~SdrObject()
@@ -507,7 +507,7 @@ void SdrObject::SetRectsDirty(sal_Bool bNotMyself)
 {
     if (!bNotMyself) {
         SetBoundRectDirty();
-        bSnapRectDirty=TRUE;
+        bSnapRectDirty=sal_True;
     }
     if (pObjList!=NULL) {
         pObjList->SetRectsDirty();
@@ -587,29 +587,29 @@ SdrItemPool* SdrObject::GetObjectItemPool() const
     return &SdrObject::GetGlobalDrawObjectItemPool();
 }
 
-UINT32 SdrObject::GetObjInventor()   const
+sal_uInt32 SdrObject::GetObjInventor()   const
 {
     return SdrInventor;
 }
 
-UINT16 SdrObject::GetObjIdentifier() const
+sal_uInt16 SdrObject::GetObjIdentifier() const
 {
-    return UINT16(OBJ_NONE);
+    return sal_uInt16(OBJ_NONE);
 }
 
 void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToContour = FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToContour = sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
 }
 
 SdrLayerID SdrObject::GetLayer() const
@@ -622,8 +622,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const
     rSet.Set(GetLayer());
     SdrObjList* pOL=GetSubList();
     if (pOL!=NULL) {
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet);
         }
     }
@@ -681,7 +681,7 @@ AutoTimer* SdrObject::ForceAutoTimer()
 
 bool SdrObject::HasRefPoint() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 Point SdrObject::GetRefPoint() const
@@ -859,7 +859,7 @@ String SdrObject::GetHTMLName() const
     return String();
 }
 
-UINT32 SdrObject::GetOrdNum() const
+sal_uInt32 SdrObject::GetOrdNum() const
 {
     if (pObjList!=NULL) {
         if (pObjList->IsObjOrdNumsDirty()) {
@@ -932,7 +932,7 @@ void SdrObject::RecalcBoundRect()
         if(xPrimitives.hasElements())
         {
             // use neutral ViewInformation and get the range of the primitives
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
             const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D));
 
             if(!aRange.isEmpty())
@@ -998,7 +998,7 @@ sal_Bool SdrObject::SingleObjectPainter(OutputDevice& rOut) const
     return sal_True;
 }
 
-BOOL SdrObject::LineGeometryUsageIsNecessary() const
+sal_Bool SdrObject::LineGeometryUsageIsNecessary() const
 {
     XLineStyle eXLS = (XLineStyle)((const XLineStyleItem&)GetMergedItem(XATTR_LINESTYLE)).GetValue();
     return (eXLS != XLINE_NONE);
@@ -1049,7 +1049,7 @@ void SdrObject::operator=(const SdrObject& rObj)
     bEmptyPresObj =rObj.bEmptyPresObj;
     //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe)
     bNotVisibleAsMaster=rObj.bNotVisibleAsMaster;
-    bSnapRectDirty=TRUE; //rObj.bSnapRectDirty;
+    bSnapRectDirty=sal_True; //rObj.bSnapRectDirty;
     bNotMasterCachable=rObj.bNotMasterCachable;
     if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; }
     if (rObj.pPlusData!=NULL) {
@@ -1080,7 +1080,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const
     rName=ImpGetResStr(STR_ObjNamePluralNONE);
 }
 
-void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal) const
+void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const
 {
     rStr = ImpGetResStr(nStrCacheID);
 
@@ -1160,17 +1160,17 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         {
             // create connections if connector, will be cleaned up when
             // deleting the connector again
-            SdrObject* pLeft = pEdgeObj->GetConnectedNode(TRUE);
-            SdrObject* pRight = pEdgeObj->GetConnectedNode(FALSE);
+            SdrObject* pLeft = pEdgeObj->GetConnectedNode(sal_True);
+            SdrObject* pRight = pEdgeObj->GetConnectedNode(sal_False);
 
             if(pLeft)
             {
-                pClone->ConnectToNode(TRUE, pLeft);
+                pClone->ConnectToNode(sal_True, pLeft);
             }
 
             if(pRight)
             {
-                pClone->ConnectToNode(FALSE, pRight);
+                pClone->ConnectToNode(sal_False, pRight);
             }
         }
 
@@ -1194,7 +1194,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         if(xSequence.hasElements())
         {
             // use neutral ViewInformation
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
             // create extractor, process and get result
             drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D);
@@ -1400,7 +1400,7 @@ bool SdrObject::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     aOutRect = aRect1;
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrObject::MovCreate(SdrDragStat& rStat)
@@ -1415,9 +1415,9 @@ bool SdrObject::MovCreate(SdrDragStat& rStat)
     // cause no further prolems
     //
     // SetBoundRectDirty();
-    // bSnapRectDirty=TRUE;
+    // bSnapRectDirty=sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -1438,7 +1438,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/)
 
 bool SdrObject::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) const
@@ -1488,7 +1488,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
 
 void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     aOutRect.Move(-rRef.X(),-rRef.Y());
     Rectangle R(aOutRect);
     if (sn==1.0 && cs==0.0) { // 90deg
@@ -1511,12 +1511,12 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     aOutRect.Justify(); // Sicherheitshalber
     SetRectsDirty();
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     aOutRect.Move(-rRef1.X(),-rRef1.Y());
     Rectangle R(aOutRect);
     long dx=rRef2.X()-rRef1.X();
@@ -1542,14 +1542,14 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
     aOutRect.Justify(); // Sicherheitshalber
     SetRectsDirty();
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrObject::Move(const Size& rSiz)
@@ -1758,12 +1758,12 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/)
 
 bool SdrObject::HasTextEdit() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
@@ -1815,8 +1815,8 @@ void SdrObject::BurnInStyleSheetAttributes()
 SdrObjUserData* SdrObject::ImpGetMacroUserData() const
 {
     SdrObjUserData* pData=NULL;
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
         nNum--;
         pData=GetUserData(nNum);
         if (!pData->HasMacro(this)) pData=NULL;
@@ -1827,7 +1827,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const
 bool SdrObject::HasMacro() const
 {
     SdrObjUserData* pData=ImpGetMacroUserData();
-    return pData!=NULL ? pData->HasMacro(this) : FALSE;
+    return pData!=NULL ? pData->HasMacro(this) : sal_False;
 }
 
 SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const
@@ -1889,7 +1889,7 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec)
     if (pData!=NULL) {
         return pData->DoMacro(rRec,this);
     }
-    return FALSE;
+    return sal_False;
 }
 
 XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
@@ -2052,41 +2052,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     Point aRef1(rSnap.Center());
     Point aRef2(aRef1); aRef2.Y()++;
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
     }
 
     Rectangle aNewSnap(rSnap);
-    if (rAttr.GetItemState(SDRATTR_MOVEX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_MOVEX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrMoveXItem*)pPoolItem)->GetValue();
         aNewSnap.Move(n,0);
     }
-    if (rAttr.GetItemState(SDRATTR_MOVEY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_MOVEY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrMoveYItem*)pPoolItem)->GetValue();
         aNewSnap.Move(0,n);
     }
-    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue();
         aNewSnap.Move(n-aNewSnap.Left(),0);
     }
-    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue();
         aNewSnap.Move(0,n-aNewSnap.Top());
     }
-    if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue();
         aNewSnap.Right()=aNewSnap.Left()+n;
     }
-    if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue();
         aNewSnap.Bottom()=aNewSnap.Top()+n;
     }
@@ -2098,15 +2098,15 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         }
     }
 
-    if (rAttr.GetItemState(SDRATTR_SHEARANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_SHEARANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrShearAngleItem*)pPoolItem)->GetValue();
         n-=GetShearAngle();
         if (n!=0) {
             double nTan=tan(n*nPi180);
-            NbcShear(aRef1,n,nTan,FALSE);
+            NbcShear(aRef1,n,nTan,sal_False);
         }
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrRotateAngleItem*)pPoolItem)->GetValue();
         n-=GetRotateAngle();
         if (n!=0) {
@@ -2115,28 +2115,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
             NbcRotate(aRef1,n,nSin,nCos);
         }
     }
-    if (rAttr.GetItemState(SDRATTR_ROTATEONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_ROTATEONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrRotateOneItem*)pPoolItem)->GetValue();
         double nSin=sin(n*nPi180);
         double nCos=cos(n*nPi180);
         NbcRotate(aRef1,n,nSin,nCos);
     }
-    if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue();
         double nTan=tan(n*nPi180);
-        NbcShear(aRef1,n,nTan,FALSE);
+        NbcShear(aRef1,n,nTan,sal_False);
     }
-    if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue();
         double nTan=tan(n*nPi180);
-        NbcShear(aRef1,n,nTan,TRUE);
+        NbcShear(aRef1,n,nTan,sal_True);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue();
         SetMoveProtect(b);
     }
-    if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue();
         SetResizeProtect(b);
     }
@@ -2145,25 +2145,25 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     if( IsMoveProtect() )
         SetResizeProtect( true );
 
-    if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue();
         SetPrintable(b);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue();
         SetVisible(b);
     }
 
     SdrLayerID nLayer=SDRLAYER_NOTFOUND;
-    if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
+    if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
         XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
         const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL;
         if (pLayAd!=NULL) {
-            const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, TRUE);
+            const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, sal_True);
             if (pLayer!=NULL) {
                 nLayer=pLayer->GetID();
             }
@@ -2174,16 +2174,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
         NbcSetLayer(nLayer);
     }
 
-    if (rAttr.GetItemState(SDRATTR_OBJECTNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_OBJECTNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
         SetName(aName);
     }
     Rectangle aNewLogic(rLogic);
-    if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue();
         aNewLogic.Right()=aNewLogic.Left()+n;
     }
-    if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue();
         aNewLogic.Bottom()=aNewLogic.Top()+n;
     }
@@ -2192,10 +2192,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
     }
     Fraction aResizeX(1,1);
     Fraction aResizeY(1,1);
-    if (rAttr.GetItemState(SDRATTR_RESIZEXONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEXONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue();
     }
-    if (rAttr.GetItemState(SDRATTR_RESIZEYONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_RESIZEYONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue();
     }
     if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) {
@@ -2205,7 +2205,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
 
 void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem)
 {
-    if (bMerge) rAttr.MergeValue(rItem,TRUE);
+    if (bMerge) rAttr.MergeValue(rItem,sal_True);
     else rAttr.Put(rItem);
 }
 
@@ -2288,7 +2288,7 @@ bool SdrObject::IsNode() const
     return true;
 }
 
-SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
     // #i41936# Use SnapRect for default GluePoints
     const Rectangle aR(GetSnapRect());
@@ -2304,12 +2304,12 @@ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
 
     aPt -= aR.Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
 
     return aGP;
 }
 
-SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const
 {
     Rectangle aR(GetCurrentBoundRect());
     Point aPt;
@@ -2321,7 +2321,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
     }
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
@@ -2410,7 +2410,7 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
 {
     bool bNoChange(true);
 
@@ -2423,7 +2423,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
         if(xSequence.hasElements())
         {
             // use neutral ViewInformation
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
             // create extractor, process and get result
             drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D);
@@ -2471,7 +2471,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
                 aSet.Put(XLineWidthItem(0L));
                 aSet.Put(XLineStyleItem(XLINE_NONE));
                 Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
-                UINT16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
+                sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
                 aSet.Put(XFillColorItem(XubString(), aColorLine));
                 aSet.Put(XFillStyleItem(XFILL_SOLID));
                 aSet.Put(XFillTransparenceItem(nTransLine));
@@ -2584,7 +2584,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
 }
 
 // convert this path object to contour object, even when it is a group
-SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
 {
     if(pRet->ISA(SdrObjGroup))
     {
@@ -2592,7 +2592,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
         SdrObject* pGroup = new SdrObjGroup;
         pGroup->SetModel(pRet->GetModel());
 
-        for(UINT32 a=0;a<pObjList2->GetObjCount();a++)
+        for(sal_uInt32 a=0;a<pObjList2->GetObjCount();a++)
         {
             SdrObject* pIterObj = pObjList2->GetObj(a);
             pGroup->GetSubList()->NbcInsertObject(ConvertToContourObj(pIterObj, bForceLineDash));
@@ -2626,7 +2626,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
+SdrObject* SdrObject::ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const
 {
     SdrObject* pRet = DoConvertToPolyObj(bBezier);
 
@@ -2648,7 +2648,7 @@ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -2723,19 +2723,19 @@ void SdrObject::SetVisible(sal_Bool bVisible)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-USHORT SdrObject::GetUserDataCount() const
+sal_uInt16 SdrObject::GetUserDataCount() const
 {
     if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0;
     return pPlusData->pUserDataList->GetUserDataCount();
 }
 
-SdrObjUserData* SdrObject::GetUserData(USHORT nNum) const
+SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const
 {
     if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL;
     return pPlusData->pUserDataList->GetUserData(nNum);
 }
 
-void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
+void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos)
 {
     if (pData!=NULL) {
         ImpForcePlusData();
@@ -2746,9 +2746,9 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
     }
 }
 
-void SdrObject::DeleteUserData(USHORT nNum)
+void SdrObject::DeleteUserData(sal_uInt16 nNum)
 {
-    USHORT nAnz=GetUserDataCount();
+    sal_uInt16 nAnz=GetUserDataCount();
     if (nNum<nAnz) {
         pPlusData->pUserDataList->DeleteUserData(nNum);
         if (nAnz==1)  {
@@ -2848,7 +2848,7 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S
     }
 }
 
-sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
+sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const
 {
     bool bRet = false;
 
@@ -2865,7 +2865,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
                 ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
                   ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
             {
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else if( pO->ISA( SdrGrafObj ) )
             {
@@ -2873,7 +2873,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
                 if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ||
                     ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) )
                 {
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -2887,7 +2887,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
             ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
               ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
         {
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else if( ISA( SdrGrafObj ) )
         {
@@ -3149,7 +3149,7 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
 {
     nInventor=nInvent;
     nIdentifier=nIdent;
@@ -3160,7 +3160,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, S
     pNewData=NULL;
 }
 
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
 {
     nInventor=nInvent;
     nIdentifier=nIdent;
@@ -3171,7 +3171,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
     pNewData=NULL;
 }
 
-SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel)
+SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel)
 {
     if(pModel == NULL && pPage != NULL)
         pModel = pPage->GetModel();
@@ -3181,37 +3181,37 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
     {
         switch (nIdent)
         {
-            case USHORT(OBJ_NONE       ): pObj=new SdrObject;                   break;
-            case USHORT(OBJ_GRUP       ): pObj=new SdrObjGroup;                 break;
-            case USHORT(OBJ_LINE       ): pObj=new SdrPathObj(OBJ_LINE       ); break;
-            case USHORT(OBJ_POLY       ): pObj=new SdrPathObj(OBJ_POLY       ); break;
-            case USHORT(OBJ_PLIN       ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
-            case USHORT(OBJ_PATHLINE   ): pObj=new SdrPathObj(OBJ_PATHLINE   ); break;
-            case USHORT(OBJ_PATHFILL   ): pObj=new SdrPathObj(OBJ_PATHFILL   ); break;
-            case USHORT(OBJ_FREELINE   ): pObj=new SdrPathObj(OBJ_FREELINE   ); break;
-            case USHORT(OBJ_FREEFILL   ): pObj=new SdrPathObj(OBJ_FREEFILL   ); break;
-            case USHORT(OBJ_PATHPOLY   ): pObj=new SdrPathObj(OBJ_POLY       ); break;
-            case USHORT(OBJ_PATHPLIN   ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
-            case USHORT(OBJ_EDGE       ): pObj=new SdrEdgeObj;                  break;
-            case USHORT(OBJ_RECT       ): pObj=new SdrRectObj;                  break;
-            case USHORT(OBJ_CIRC       ): pObj=new SdrCircObj(OBJ_CIRC       ); break;
-            case USHORT(OBJ_SECT       ): pObj=new SdrCircObj(OBJ_SECT       ); break;
-            case USHORT(OBJ_CARC       ): pObj=new SdrCircObj(OBJ_CARC       ); break;
-            case USHORT(OBJ_CCUT       ): pObj=new SdrCircObj(OBJ_CCUT       ); break;
-            case USHORT(OBJ_TEXT       ): pObj=new SdrRectObj(OBJ_TEXT       ); break;
-            case USHORT(OBJ_TEXTEXT    ): pObj=new SdrRectObj(OBJ_TEXTEXT    ); break;
-            case USHORT(OBJ_TITLETEXT  ): pObj=new SdrRectObj(OBJ_TITLETEXT  ); break;
-            case USHORT(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
-            case USHORT(OBJ_MEASURE    ): pObj=new SdrMeasureObj;               break;
-            case USHORT(OBJ_GRAF       ): pObj=new SdrGrafObj;                  break;
-            case USHORT(OBJ_OLE2       ): pObj=new SdrOle2Obj;                  break;
-            case USHORT(OBJ_FRAME      ): pObj=new SdrOle2Obj(TRUE);            break;
-            case USHORT(OBJ_CAPTION    ): pObj=new SdrCaptionObj;               break;
-            case USHORT(OBJ_PAGE       ): pObj=new SdrPageObj;                  break;
-            case USHORT(OBJ_UNO        ): pObj=new SdrUnoObj(String());			break;
-            case USHORT(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
-            case USHORT(OBJ_MEDIA 	   ): pObj=new SdrMediaObj();           	break;
-            case USHORT(OBJ_TABLE	   ): pObj=new ::sdr::table::SdrTableObj(pModel);	break;
+            case sal_uInt16(OBJ_NONE       ): pObj=new SdrObject;                   break;
+            case sal_uInt16(OBJ_GRUP       ): pObj=new SdrObjGroup;                 break;
+            case sal_uInt16(OBJ_LINE       ): pObj=new SdrPathObj(OBJ_LINE       ); break;
+            case sal_uInt16(OBJ_POLY       ): pObj=new SdrPathObj(OBJ_POLY       ); break;
+            case sal_uInt16(OBJ_PLIN       ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
+            case sal_uInt16(OBJ_PATHLINE   ): pObj=new SdrPathObj(OBJ_PATHLINE   ); break;
+            case sal_uInt16(OBJ_PATHFILL   ): pObj=new SdrPathObj(OBJ_PATHFILL   ); break;
+            case sal_uInt16(OBJ_FREELINE   ): pObj=new SdrPathObj(OBJ_FREELINE   ); break;
+            case sal_uInt16(OBJ_FREEFILL   ): pObj=new SdrPathObj(OBJ_FREEFILL   ); break;
+            case sal_uInt16(OBJ_PATHPOLY   ): pObj=new SdrPathObj(OBJ_POLY       ); break;
+            case sal_uInt16(OBJ_PATHPLIN   ): pObj=new SdrPathObj(OBJ_PLIN       ); break;
+            case sal_uInt16(OBJ_EDGE       ): pObj=new SdrEdgeObj;                  break;
+            case sal_uInt16(OBJ_RECT       ): pObj=new SdrRectObj;                  break;
+            case sal_uInt16(OBJ_CIRC       ): pObj=new SdrCircObj(OBJ_CIRC       ); break;
+            case sal_uInt16(OBJ_SECT       ): pObj=new SdrCircObj(OBJ_SECT       ); break;
+            case sal_uInt16(OBJ_CARC       ): pObj=new SdrCircObj(OBJ_CARC       ); break;
+            case sal_uInt16(OBJ_CCUT       ): pObj=new SdrCircObj(OBJ_CCUT       ); break;
+            case sal_uInt16(OBJ_TEXT       ): pObj=new SdrRectObj(OBJ_TEXT       ); break;
+            case sal_uInt16(OBJ_TEXTEXT    ): pObj=new SdrRectObj(OBJ_TEXTEXT    ); break;
+            case sal_uInt16(OBJ_TITLETEXT  ): pObj=new SdrRectObj(OBJ_TITLETEXT  ); break;
+            case sal_uInt16(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
+            case sal_uInt16(OBJ_MEASURE    ): pObj=new SdrMeasureObj;               break;
+            case sal_uInt16(OBJ_GRAF       ): pObj=new SdrGrafObj;                  break;
+            case sal_uInt16(OBJ_OLE2       ): pObj=new SdrOle2Obj;                  break;
+            case sal_uInt16(OBJ_FRAME      ): pObj=new SdrOle2Obj(sal_True);            break;
+            case sal_uInt16(OBJ_CAPTION    ): pObj=new SdrCaptionObj;               break;
+            case sal_uInt16(OBJ_PAGE       ): pObj=new SdrPageObj;                  break;
+            case sal_uInt16(OBJ_UNO        ): pObj=new SdrUnoObj(String());			break;
+            case sal_uInt16(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();       break;
+            case sal_uInt16(OBJ_MEDIA 	   ): pObj=new SdrMediaObj();           	break;
+            case sal_uInt16(OBJ_TABLE	   ): pObj=new ::sdr::table::SdrTableObj(pModel);	break;
         }
     }
 
@@ -3245,13 +3245,13 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
     return pObj;
 }
 
-SdrObjUserData* SdrObjFactory::MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
 {
     SdrObjUserData* pData=NULL;
     if (nInvent==SdrInventor) {
         switch (nIdent)
         {
-            case USHORT(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
+            case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
         }
     }
     if (pData==NULL) {
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 0688408b22..a884e676b7 100644..100755
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -42,8 +42,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>   // fuer RectSnap
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xflhtit.hxx>
@@ -86,15 +86,15 @@ public:
     ImpCaptParams()
     {
         eType      =SDRCAPT_TYPE3;
-        bFixedAngle=FALSE;
+        bFixedAngle=sal_False;
         nAngle     =4500;
         nGap       =0;
         eEscDir    =SDRCAPT_ESCHORIZONTAL;
-        bEscRel    =TRUE;
+        bEscRel    =sal_True;
         nEscRel    =5000;
         nEscAbs    =0;
         nLineLen   =0;
-        bFitLineLen=TRUE;
+        bFitLineLen=sal_True;
     }
     void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const;
 };
@@ -202,24 +202,24 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj);
 SdrCaptionObj::SdrCaptionObj():
     SdrRectObj(OBJ_TEXT),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
 }
 
 SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect):
     SdrRectObj(OBJ_TEXT,rRect),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
 }
 
 SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail):
     SdrRectObj(OBJ_TEXT,rRect),
     aTailPoly(3),  // Default Groesse: 3 Punkte = 2 Linien
-    mbSpecialTextBoxShadow(FALSE),
-    mbFixedTail(FALSE)
+    mbSpecialTextBoxShadow(sal_False),
+    mbFixedTail(sal_False)
 {
     aTailPoly[0]=maFixedTailPos=rTail;
 }
@@ -230,25 +230,25 @@ SdrCaptionObj::~SdrCaptionObj()
 
 void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =TRUE;
-    rInfo.bCanConvToPoly    =TRUE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_True;
+    rInfo.bCanConvToPoly    =sal_True;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrCaptionObj::GetObjIdentifier() const
+sal_uInt16 SdrCaptionObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_CAPTION);
+    return sal_uInt16(OBJ_CAPTION);
 }
 
 void SdrCaptionObj::operator=(const SdrObject& rObj)
@@ -560,7 +560,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
 
 bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
 {
-    if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect
+    if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect
 
     ImpCaptParams aPara;
     ImpGetCaptParams(aPara);
@@ -568,7 +568,7 @@ bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
     aTailPoly[0]=rStat.GetStart();
     ImpCalcTail(aPara,aTailPoly,aRect);
     rStat.SetActionRect(aRect);
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
@@ -579,8 +579,8 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
     ImpCalcTail(aPara,aTailPoly,aRect);
     rStat.SetActionRect(aRect);
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -595,7 +595,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/)
@@ -756,7 +756,7 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
     aTailPoly=rCGeo.aTailPoly;
 }
 
-SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
 { // #42334# - Convert implementiert
     SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
     SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index ee5bcb009c..a740e5723c 100644..100755
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -48,8 +48,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx> // fuer die Objektkonvertierung
 #include <svx/svdview.hxx>  // Zum Draggen (Ortho)
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
@@ -154,15 +154,15 @@ SdrCircObj::~SdrCircObj()
 void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     bool bCanConv=!HasText() || ImpCanConvTextToCurve();
-    rInfo.bEdgeRadiusAllowed	= FALSE;
+    rInfo.bEdgeRadiusAllowed	= sal_False;
     rInfo.bCanConvToPath=bCanConv;
     rInfo.bCanConvToPoly=bCanConv;
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrCircObj::GetObjIdentifier() const
+sal_uInt16 SdrCircObj::GetObjIdentifier() const
 {
-    return UINT16(meCircleKind);
+    return sal_uInt16(meCircleKind);
 }
 
 bool SdrCircObj::PaintNeedsXPolyCirc() const
@@ -172,10 +172,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
     // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte
     // und Kreis-/Ellipsenboegen (wg. Genauigkeit)
     bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
-#ifndef WIN
     // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!)
     if (meCircleKind!=OBJ_CIRC) bNeed = true;
-#endif
 
     const SfxItemSet& rSet = GetObjectItemSet();
     if(!bNeed)
@@ -298,7 +296,7 @@ void SdrCircObj::RecalcXPoly()
 
 void SdrCircObj::TakeObjNameSingul(XubString& rName) const
 {
-    USHORT nID=STR_ObjNameSingulCIRC;
+    sal_uInt16 nID=STR_ObjNameSingulCIRC;
     if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
@@ -330,7 +328,7 @@ void SdrCircObj::TakeObjNameSingul(XubString& rName) const
 
 void SdrCircObj::TakeObjNamePlural(XubString& rName) const
 {
-    USHORT nID=STR_ObjNamePluralCIRC;
+    sal_uInt16 nID=STR_ObjNamePluralCIRC;
     if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
@@ -388,7 +386,7 @@ public:
         nStart(0),
         nEnd(0),
         nWink(0),
-        bRight(FALSE)
+        bRight(sal_False)
     {}
     void SetCreateParams(SdrDragStat& rStat);
 };
@@ -599,7 +597,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
                 nWink = pU->nEnd;
             }
 
-            aStr += GetWinkStr(nWink,FALSE);
+            aStr += GetWinkStr(nWink,sal_False);
             aStr += sal_Unicode(')');
         }
 
@@ -616,7 +614,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
 
             ImpTakeDescriptionStr(STR_DragCircAngle, aStr);
             aStr.AppendAscii(" (");
-            aStr += GetWinkStr(nWink,FALSE);
+            aStr += GetWinkStr(nWink,sal_False);
             aStr += sal_Unicode(')');
 
             return aStr;
@@ -702,7 +700,7 @@ bool SdrCircObj::BegCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect = aRect1;
     ImpSetCreateParams(rStat);
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrCircObj::MovCreate(SdrDragStat& rStat)
@@ -715,7 +713,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat)
     nStartWink=pU->nStart;
     nEndWink=pU->nEnd;
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
     SetXPolyDirty();
 
     // #i103058# push current angle settings to ItemSet to
@@ -725,7 +723,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat)
         ImpSetCircInfoToAttr();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -1102,8 +1100,8 @@ void SdrCircObj::ImpSetAttrToCircInfo()
     sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
     sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
 
-    BOOL bKindChg = meCircleKind != eNewKind;
-    BOOL bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
+    sal_Bool bKindChg = meCircleKind != eNewKind;
+    sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
 
     if(bKindChg || bWinkChg)
     {
@@ -1159,7 +1157,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
     }
 }
 
-SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
     const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index a5679115ee..2b7175c42b 100644..100755
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -44,8 +44,8 @@
 #include <svx/svdhdl.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
@@ -69,12 +69,12 @@ void SdrObjConnection::ResetVars()
     nConId=0;
     nXDist=0;
     nYDist=0;
-    bBestConn=TRUE;
-    bBestVertex=TRUE;
-    bXDistOvr=FALSE;
-    bYDistOvr=FALSE;
-    bAutoVertex=FALSE;
-    bAutoCorner=FALSE;
+    bBestConn=sal_True;
+    bBestVertex=sal_True;
+    bXDistOvr=sal_False;
+    bYDistOvr=sal_False;
+    bAutoVertex=sal_False;
+    bAutoCorner=sal_False;
 }
 
 bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const
@@ -90,7 +90,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const
         } else {
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
             if (pGPL!=NULL) {
-                USHORT nNum=pGPL->FindGluePoint(nConId);
+                sal_uInt16 nNum=pGPL->FindGluePoint(nConId);
                 if (nNum!=SDRGLUEPOINT_NOTFOUND) {
                     rGP=(*pGPL)[nNum];
                     bRet = true;
@@ -118,7 +118,7 @@ Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode)
     return aMiddleLine;
 }
 
-USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
+sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
 {
     switch (eLineCode) {
         case OBJ1LINE2 : return 1;
@@ -132,7 +132,7 @@ USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon&
 
 bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
 {
-    USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP);
+    sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP);
     bool bHorz=nAngle1==0 || nAngle1==18000;
     if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
         nIdx=rXP.GetPointCount()-nIdx; // #36314#
@@ -186,16 +186,16 @@ SdrEdgeObj::SdrEdgeObj()
     // #110649#
     mbBoundRectCalculationRunning(sal_False)
 {
-    bClosedObj=FALSE;
-    bIsEdge=TRUE;
+    bClosedObj=sal_False;
+    bIsEdge=sal_True;
     pEdgeTrack=new XPolygon;
 
 }
 
 SdrEdgeObj::~SdrEdgeObj()
 {
-    DisconnectFromNode(TRUE);
-    DisconnectFromNode(FALSE);
+    DisconnectFromNode(sal_True);
+    DisconnectFromNode(sal_False);
     delete pEdgeTrack;
 }
 
@@ -244,8 +244,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
     }
     else if(eKind == SDREDGE_THREELINES)
     {
-        BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
-        BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+        sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+        sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
 
         if(bHor1)
         {
@@ -315,8 +315,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
     }
     else if(eKind == SDREDGE_THREELINES)
     {
-        BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
-        BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+        sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+        sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
 
         n = 2;
         nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y();
@@ -365,24 +365,24 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
 
 void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
     bool bCanConv=!HasText() || ImpCanConvTextToCurve();
     rInfo.bCanConvToPath=bCanConv;
     rInfo.bCanConvToPoly=bCanConv;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrEdgeObj::GetObjIdentifier() const
+sal_uInt16 SdrEdgeObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_EDGE);
+    return sal_uInt16(OBJ_EDGE);
 }
 
 const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const
@@ -420,15 +420,15 @@ bool SdrEdgeObj::IsNode() const
     return true;
 }
 
-SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const
 {
     Point aPt;
-    USHORT nPntAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount();
     if (nPntAnz>0)
     {
         Point aOfs = GetSnapRect().Center();
-        if (nNum==2 && GetConnectedNode(TRUE)==NULL) aPt=(*pEdgeTrack)[0];
-        else if (nNum==3 && GetConnectedNode(FALSE)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
+        if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0];
+        else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
         else {
             if ((nPntAnz & 1) ==1) {
                 aPt=(*pEdgeTrack)[nPntAnz/2];
@@ -444,11 +444,11 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
         aPt-=aOfs;
     }
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrGluePoint SdrEdgeObj::GetCornerGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
 {
     return GetVertexGluePoint(nNum);
 }
@@ -499,13 +499,13 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const
 {
     bool bRet = false;
     const SdrObjConnection& rCon=GetConnection(bTail1);
-    USHORT nPtAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
     if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) {
         const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList();
-        USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
-        USHORT nGesAnz=nConAnz+8;
-        Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[USHORT(nPtAnz-1)]);
-        for (USHORT i=0; i<nGesAnz && !bRet; i++) {
+        sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+        sal_uInt16 nGesAnz=nConAnz+8;
+        Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]);
+        for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) {
             if (i<nConAnz) { // UserDefined
                 bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj);
             } else if (i<nConAnz+4) { // Vertex
@@ -522,7 +522,7 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const
 
 void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
 {
-    USHORT nPtAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
     if (nPtAnz==0) {
         (*pEdgeTrack)[0]=rPt;
         (*pEdgeTrack)[1]=rPt;
@@ -530,7 +530,7 @@ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
         if (!bTail1) (*pEdgeTrack)[1]=rPt;
         else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; }
     } else {
-        if (!bTail1) (*pEdgeTrack)[USHORT(nPtAnz-1)]=rPt;
+        if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt;
         else (*pEdgeTrack)[0]=rPt;
     }
     ImpRecalcEdgeTrack();
@@ -598,7 +598,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
     }
 }
 
-USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
+sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
 {
     if (pObj==NULL) return SDRESC_ALL;
     Rectangle aR(pObj->GetSnapRect());
@@ -613,7 +613,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
     bool bDiag=Abs(dx-dy)<2;
     if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte
     if (bDiag) {  // diagonal
-        USHORT nRet=0;
+        sal_uInt16 nRet=0;
         if (byMitt) nRet|=SDRESC_VERT;
         if (bxMitt) nRet|=SDRESC_HORZ;
         if (dxl<dxr) { // Links
@@ -639,7 +639,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
 bool SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const
 {
     // fehlende Implementation !!!
-    return FALSE;
+    return sal_False;
 }
 
 XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const
@@ -705,7 +705,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
 {
     Point aPt1,aPt2;
     SdrGluePoint aGP1,aGP2;
-    USHORT nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
+    sal_uInt16 nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
     Rectangle aBoundRect1;
     Rectangle aBoundRect2;
     Rectangle aBewareRect1;
@@ -713,7 +713,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
     // Erstmal die alten Endpunkte wiederholen
     if (rTrack0.GetPointCount()!=0) {
         aPt1=rTrack0[0];
-        USHORT nSiz=rTrack0.GetPointCount();
+        sal_uInt16 nSiz=rTrack0.GetPointCount();
         nSiz--;
         aPt2=rTrack0[nSiz];
     } else {
@@ -775,36 +775,36 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
         aBewareRect2=aBoundRect2;
     }
     XPolygon aBestXP;
-    ULONG nBestQual=0xFFFFFFFF;
+    sal_uIntPtr nBestQual=0xFFFFFFFF;
     SdrEdgeInfoRec aBestInfo;
     bool bAuto1=bCon1 && rCon1.bBestVertex;
     bool bAuto2=bCon2 && rCon2.bBestVertex;
-    if (bAuto1) rCon1.bAutoVertex=TRUE;
-    if (bAuto2) rCon2.bAutoVertex=TRUE;
-    USHORT nBestAuto1=0;
-    USHORT nBestAuto2=0;
-    USHORT nAnz1=bAuto1 ? 4 : 1;
-    USHORT nAnz2=bAuto2 ? 4 : 1;
-    for (USHORT nNum1=0; nNum1<nAnz1; nNum1++) {
+    if (bAuto1) rCon1.bAutoVertex=sal_True;
+    if (bAuto2) rCon2.bAutoVertex=sal_True;
+    sal_uInt16 nBestAuto1=0;
+    sal_uInt16 nBestAuto2=0;
+    sal_uInt16 nAnz1=bAuto1 ? 4 : 1;
+    sal_uInt16 nAnz2=bAuto2 ? 4 : 1;
+    for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) {
         if (bAuto1) rCon1.nConId=nNum1;
-        if (bCon1 && rCon1.TakeGluePoint(aGP1,TRUE)) {
+        if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) {
             aPt1=aGP1.GetPos();
             nEsc1=aGP1.GetEscDir();
             if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs);
         }
-        for (USHORT nNum2=0; nNum2<nAnz2; nNum2++) {
+        for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) {
             if (bAuto2) rCon2.nConId=nNum2;
-            if (bCon2 && rCon2.TakeGluePoint(aGP2,TRUE)) {
+            if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) {
                 aPt2=aGP2.GetPos();
                 nEsc2=aGP2.GetEscDir();
                 if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs);
             }
             for (long nA1=0; nA1<36000; nA1+=9000) {
-                USHORT nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
+                sal_uInt16 nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
                 for (long nA2=0; nA2<36000; nA2+=9000) {
-                    USHORT nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
+                    sal_uInt16 nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
                     if ((nEsc1&nE1)!=0 && (nEsc2&nE2)!=0) {
-                        ULONG nQual=0;
+                        sal_uIntPtr nQual=0;
                         SdrEdgeInfoRec aInfo;
                         if (pInfo!=NULL) aInfo=*pInfo;
                         XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo));
@@ -828,7 +828,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
 
 XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
     const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
-    ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const
+    sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const
 {
     SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
     bool bRts1=nAngle1==0;
@@ -903,7 +903,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         return aXP;
     }
-    USHORT nIntersections=0;
+    sal_uInt16 nIntersections=0;
     {
         Point aC1(aBewareRect1.Center());
         Point aC2(aBewareRect2.Center());
@@ -941,8 +941,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right());
         long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top());
         long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
-        //bool bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
-        //                       aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom();
         bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
                             aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
         unsigned nMainCase=3;
@@ -971,21 +969,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         } else if (nMainCase==2) {
             // Fall 2:
             if (bHor1) { // beide waagerecht
-                /* 9 Moeglichkeiten:                   ù ù ù                    */
-                /*   2.1 Gegenueber, Ueberschneidung   Ã ´ ù                    */
-                /*       nur auf der Y-Achse           ù ù ù                    */
-                /*   2.2, 2.3 Gegenueber, vertikal versetzt. Ã ù ù   ù ù ù      */
-                /*            Ueberschneidung weder auf der  ù ´ ù   ù ´ ù      */
-                /*            X- noch auf der Y-Achse        ù ù ù   Ã ù ù      */
-                /*   2.4, 2.5 Untereinander,   ù Ã ù   ù ù ù                    */
-                /*            Ueberschneidung  ù ´ ù   ù ´ ù                    */
-                /*            nur auf X-Achse  ù ù ù   ù Ã ù                    */
-                /*   2.6, 2.7 Gegeneinander, vertikal versetzt. ù ù Ã   ù ù ù   */
-                /*            Ueberschneidung weder auf der     ù ´ ù   ù ´ ù   */
-                /*            X- noch auf der Y-Achse.          ù ù ù   ù ù Ã   */
-                /*   2.8 Gegeneinander.       ù ù ù                             */
-                /*       Ueberschneidung nur  ù ´ Ã                             */
-                /*       auf der Y-Achse.     ù ù ù                             */
+                /* 9 Moeglichkeiten:                   � � �                    */
+                /*   2.1 Gegenueber, Ueberschneidung   � � �                    */
+                /*       nur auf der Y-Achse           � � �                    */
+                /*   2.2, 2.3 Gegenueber, vertikal versetzt. � � �   � � �      */
+                /*            Ueberschneidung weder auf der  � � �   � � �      */
+                /*            X- noch auf der Y-Achse        � � �   � � �      */
+                /*   2.4, 2.5 Untereinander,   � � �   � � �                    */
+                /*            Ueberschneidung  � � �   � � �                    */
+                /*            nur auf X-Achse  � � �   � � �                    */
+                /*   2.6, 2.7 Gegeneinander, vertikal versetzt. � � �   � � �   */
+                /*            Ueberschneidung weder auf der     � � �   � � �   */
+                /*            X- noch auf der Y-Achse.          � � �   � � �   */
+                /*   2.8 Gegeneinander.       � � �                             */
+                /*       Ueberschneidung nur  � � �                             */
+                /*       auf der Y-Achse.     � � �                             */
                 /*   2.9 Die BewareRects der Objekte ueberschneiden             */
                 /*       sich auf X- und Y-Achse.                               */
                 /* Die Faelle gelten entsprechend umgesetzt auch fuer           */
@@ -1004,7 +1002,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                     // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
                     if (aBewR1.Right()>aBewR2.Left()) {
                         // Faelle 2.8, 2.9
-                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
                         // Fall 2.9 kann auch Direktverbindung sein (bei geringer
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
@@ -1062,7 +1060,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                     // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
                     if (aBewR1.Bottom()>aBewR2.Top()) {
                         // Faelle 2.8, 2.9
-                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+                        // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
                         // Fall 2.9 kann auch Direktverbindung sein (bei geringer
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
@@ -1113,39 +1111,39 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                 }
             }
         } else if (nMainCase==3) { // Fall 3: Einer waagerecht und der andere senkrecht. Sehr viele Fallunterscheidungen
-            /* Kleine Legende: ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung.                   */
-            /*                 ú ú ú ú ú -> Ueberschneidung                                             */
-            /*                 ù ú Ã ú ù -> Selbe Hoehe                                                 */
-            /*                 ú ú ú ú ú -> Ueberschneidung                                             */
-            /*                 ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung.                   */
-            /* Linienaustritte links ´, rechts Ã, oben Á und unten Â.                                   */
+            /* Kleine Legende: � � � � � -> Ohne Ueberschneidung, maximal Beruehrung.                   */
+            /*                 � � � � � -> Ueberschneidung                                             */
+            /*                 � � � � � -> Selbe Hoehe                                                 */
+            /*                 � � � � � -> Ueberschneidung                                             */
+            /*                 � � � � � -> Ohne Ueberschneidung, maximal Beruehrung.                   */
+            /* Linienaustritte links �, rechts �, oben � und unten �.                                   */
             /* Insgesamt sind 96 Konstellationen moeglich, wobei einige nicht einmal                    */
             /* eindeutig einem Fall und damit einer Behandlungsmethode zugeordnet werden                */
             /* koennen.                                                                                 */
             /* 3.1: Hierzu moegen alle Konstellationen zaehlen, die durch den                           */
             /*      Default-MeetingPoint zufriedenstellend abgedeckt sind (20+12).                      */
-            /*   Â Â Â ú Á    Á ú Â Â Â   Diese 12  ù ú ù Â ù    ù ú ù ú ù    ù Â ù ú ù    ù ú ù ú ù    */
-            /*   ú ú ú ú Á    Á ú ú ú ú   Konstel.  ú ú ú ú ú    ú ú ú ú Â    ú ú ú ú ú    Â ú ú ú ú    */
-            /*   ù ú Ã ú ù    ù ú ´ ú ù   jedoch    ù ú Ã ú Á    ù ú Ã ú Â    Á ú ´ ú ù    Â ú ´ ú ù    */
-            /*   ú ú ú ú Â    Â ú ú ú ú   nur zum   ú ú ú ú Á    ú ú ú ú ú    Á ú ú ú ú    ú ú ú ú ú    */
-            /*   Á Á Á ú Â    Â ú Á Á Á   Teil:     ù ú ù Á ù    ù ú ù ú ù    ù Á ù ú ù    ù ú ù ú ù    */
+            /*   � � � � �    � � � � �   Diese 12  � � � � �    � � � � �    � � � � �    � � � � �    */
+            /*   � � � � �    � � � � �   Konstel.  � � � � �    � � � � �    � � � � �    � � � � �    */
+            /*   � � � � �    � � � � �   jedoch    � � � � �    � � � � �    � � � � �    � � � � �    */
+            /*   � � � � �    � � � � �   nur zum   � � � � �    � � � � �    � � � � �    � � � � �    */
+            /*   � � � � �    � � � � �   Teil:     � � � � �    � � � � �    � � � � �    � � � � �    */
             /*   Letztere 16 Faelle scheiden aus, sobald sich die Objekte offen                         */
             /*   gegenueberstehen (siehe Fall 3.2).                                                     */
             /* 3.2: Die Objekte stehen sich offen gegenueber und somit ist eine                         */
             /*      Verbindung mit lediglich 2 Linien moeglich (4+20).                                  */
             /*      Dieser Fall hat 1. Prioritaet.                                                      */
-            /*   ù ú ù ú Â   Â ú ù ú ù   Diese 20  ù ú ù Â ù   ù Â ù ú ù   ù ú ù ú ù   ù ú ù ú ù        */
-            /*   ú ú ú ú ú   ú ú ú ú ú   Konstel.  ú ú ú Â Â   Â Â ú ú ú   ú ú ú ú ú   ú ú ú ú ú        */
-            /*   ù ú Ã ú ù   ù ú ´ ú ù   jedoch    ù ú Ã Á Á   Á Á ´ ú ù   ù ú Ã Â Â   Â Â ´ ú ù        */
-            /*   ú ú ú ú ú   ú ú ú ú ú   nur zum   ú ú ú Á Á   Á Á ú ú ú   ú ú ú ú ú   ú ú ú ú ú        */
-            /*   ù ú ù ú Á   Á ú ù ú ù   Teil:     ù ú ù Á ù   ù Á ù ú ù   ù ú ù ú ù   ù ú ù ú ù        */
+            /*   � � � � �   � � � � �   Diese 20  � � � � �   � � � � �   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   Konstel.  � � � � �   � � � � �   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   jedoch    � � � � �   � � � � �   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   nur zum   � � � � �   � � � � �   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   Teil:     � � � � �   � � � � �   � � � � �   � � � � �        */
             /* 3.3: Die Linienaustritte zeigen vom anderen Objekt weg bzw. hinter                       */
             /*      dessen Ruecken vorbei (52+4).                                                       */
-            /*   Á Á Á Á ù   ù Á Á Á Á   ù ú ú ú ù   ù ú ù ú ù   Diese 4   ù ú ù ú ù   ù ú ù ú ù        */
-            /*   Á Á Á Á ú   ú Á Á Á Á   Â Â Â ú ú   ú ú Â Â Â   Konstel.  ú ú ú Â ú   ú Â ú ú ú        */
-            /*   Á Á Ã ú ù   ù ú ´ Á Á   Â Â Ã ú ù   ù ú ´ Â Â   jedoch    ù ú Ã ú ù   ù ú ´ ú ù        */
-            /*   Á Á Á ú ú   ú ú Á Á Á   Â Â Â Â ú   ú Â Â Â Â   nur zum   ú ú ú Á ú   ú Á ú ú ú        */
-            /*   ù ú ù ú ù   ù ú ù ú ù   Â Â Â Â ù   ù Â Â Â Â   Teil:     ù ú ù ú ù   ù ú ù ú ù        */
+            /*   � � � � �   � � � � �   � � � � �   � � � � �   Diese 4   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   � � � � �   � � � � �   Konstel.  � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   � � � � �   � � � � �   jedoch    � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   � � � � �   � � � � �   nur zum   � � � � �   � � � � �        */
+            /*   � � � � �   � � � � �   � � � � �   � � � � �   Teil:     � � � � �   � � � � �        */
 
             // Fall 3.2
             Rectangle aTmpR1(aBewareRect1);
@@ -1189,8 +1187,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
 
     XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting));
     XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting));
-    USHORT nXP1Anz=aXP1.GetPointCount();
-    USHORT nXP2Anz=aXP2.GetPointCount();
+    sal_uInt16 nXP1Anz=aXP1.GetPointCount();
+    sal_uInt16 nXP2Anz=aXP2.GetPointCount();
     if (bInfo) {
         pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--;
         pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--;
@@ -1228,13 +1226,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         // Dies wird die Mittellinie.
         pInfo->nMiddleLine=nXP1Anz-1;
     }
-    USHORT nNum=aXP2.GetPointCount();
+    sal_uInt16 nNum=aXP2.GetPointCount();
     if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--;
     while (nNum>0) {
         nNum--;
         aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL);
     }
-    USHORT nPntAnz=aXP1.GetPointCount();
+    sal_uInt16 nPntAnz=aXP1.GetPointCount();
     char cForm=0;
     if (bInfo || pnQuality!=NULL) {
         cForm='?';
@@ -1243,8 +1241,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         else if (nPntAnz==4) { // Z oder U
             if (nAngle1==nAngle2) cForm='U';
             else cForm='Z';
-        } else if (nPntAnz==4) { /* Ú-¿  Ú-¿  */
-            /* ...                 -Ù     -Ù  */
+        } else if (nPntAnz==4) { /* �-�  �-�  */
+            /* ...                 -�     -�  */
         } else if (nPntAnz==6) { // S oder C oder ...
             if (nAngle1!=nAngle2) {
                 // Fuer Typ S hat Linie2 dieselbe Richtung wie Linie4.
@@ -1281,11 +1279,11 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
     }
     if (pnQuality!=NULL) {
-        ULONG nQual=0;
-        ULONG nQual0=nQual; // Ueberlaeufe vorbeugen
+        sal_uIntPtr nQual=0;
+        sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen
         bool bOverflow = false;
         Point aPt0(aXP1[0]);
-        for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
+        for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
             Point aPt1b(aXP1[nPntNum]);
             nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y());
             if (nQual<nQual0) bOverflow = true;
@@ -1293,14 +1291,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             aPt0=aPt1b;
         }
 
-        USHORT nTmp=nPntAnz;
+        sal_uInt16 nTmp=nPntAnz;
         if (cForm=='Z') {
             nTmp=2; // Z-Form hat gute Qualitaet (nTmp=2 statt 4)
-            ULONG n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
-            ULONG n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
-            ULONG n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
+            sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
+            sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
+            sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
             // fuer moeglichst gleichlange Linien sorgen
-            ULONG nBesser=0;
+            sal_uIntPtr nBesser=0;
             n1+=n3;
             n3=n2/4;
             if (n1>=n2) nBesser=6;
@@ -1311,7 +1309,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         if (nTmp>=3) {
             nQual0=nQual;
-            nQual+=(ULONG)nTmp*0x01000000;
+            nQual+=(sal_uIntPtr)nTmp*0x01000000;
             if (nQual<nQual0 || nTmp>15) bOverflow = true;
         }
         if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen
@@ -1331,13 +1329,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         aBewareRect1=rBewareRect1;
         aBewareRect2=rBewareRect2;
 
-        for (USHORT i=0; i<nPntAnz; i++) {
+        for (sal_uInt16 i=0; i<nPntAnz; i++) {
             Point aPt1b(aXP1[i]);
             bool b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
                         aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom();
             bool b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
                         aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom();
-            USHORT nInt0=nIntersections;
+            sal_uInt16 nInt0=nIntersections;
             if (i==0 || i==nPntAnz-1) {
                 if (b1 && b2) nIntersections++;
             } else {
@@ -1366,7 +1364,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         if (nPntAnz<=1) nIntersections++;
         nQual0=nQual;
-        nQual+=(ULONG)nIntersections*0x10000000;
+        nQual+=(sal_uIntPtr)nIntersections*0x10000000;
         if (nQual<nQual0 || nIntersections>15) bOverflow = true;
 
         if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE;
@@ -1374,7 +1372,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
     }
     if (bInfo) { // nun die Linienversaetze auf aXP1 anwenden
         if (pInfo->nMiddleLine!=0xFFFF) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
             if (pInfo->ImpIsHorzLine(MIDDLELINE,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aMiddleLine.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aMiddleLine.Y();
@@ -1384,7 +1382,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj1Lines>=2) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ1LINE2,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj1Line2.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj1Line2.Y();
@@ -1394,7 +1392,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj1Lines>=3) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ1LINE3,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj1Line3.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj1Line3.Y();
@@ -1404,7 +1402,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj2Lines>=2) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ2LINE2,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj2Line2.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj2Line2.Y();
@@ -1414,7 +1412,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             }
         }
         if (pInfo->nObj2Lines>=3) {
-            USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
+            sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
             if (pInfo->ImpIsHorzLine(OBJ2LINE3,aXP1)) {
                 aXP1[nIdx].Y()+=pInfo->aObj2Line3.Y();
                 aXP1[nIdx+1].Y()+=pInfo->aObj2Line3.Y();
@@ -1502,17 +1500,17 @@ Normalisiert auf 1. Austrittswinkel nach rechts bleiben dann noch 31.
 Dann noch eine vertikale Spiegelung wegnormalisiert bleiben noch 16
 characteristische Verlaufszuege mit 1-5 Linien:
 Mit 1 Linie (Typ 'I'):  --
-Mit 2 Linien (Typ 'L'): -Ù
-Mit 3 Linien (Typ 'U'):  -¿  (Typ 'Z'):  Ú-
-                         -Ù             -Ù
+Mit 2 Linien (Typ 'L'): -�
+Mit 3 Linien (Typ 'U'):  -�  (Typ 'Z'):  �-
+                         -�             -�
 Mit 4 Linien: 1 ist nicht plausibel, 3 ist=2 (90deg Drehung). Verbleibt 2,4
-     Ú-Ù  Ú¿  À¿  Ú¿                               Ú¿  Ú-¿
-    -Ù   -Ù   -Ù  -Ù                              -Ù    -Ù
+     �-�  ڿ  �  ڿ                               ڿ  �-�
+    -�   -�   -�  -�                              -�    -�
 Mit 5 Linien: nicht plausibel sind 1,2,4,5. 7 ist identisch mit 3 (Richtungsumkehr)
               Bleibt also 3,6 und 8.              '4'  'S'  'C'
-       ¿    Ú             -¿   Ú-  Ú-¿                  Ú-
-     Ú-Ù  Ú-Ù  Ú-¿   Ú-¿   À¿  À¿ -Ù ³ Ú-¿         Ú-¿  À¿  Ú-¿
-    -Ù   -Ù   -Ù Ù  -Ù À-  -Ù  -Ù  --Ù À Ù        -Ù Ù  -Ù  À Ù
+       �    �             -�   �-  �-�                  �-
+     �-�  �-�  �-�   �-�   �  � -� � �-�         �-�  �  �-�
+    -�   -�   -� �  -� �-  -�  -�  --� � �        -� �  -�  � �
 Insgesamt sind also 9 Grundtypen zu unterscheiden die den 400 Konstellationen
 aus Objektposition und Austrittswinkeln zuzuordnen sind.
 4 der 9 Grundtypen haben eine 'Mittellinie'. Die Anzahl der zu Objektabstaende
@@ -1532,7 +1530,7 @@ je Objekt variiert von 0-3:
 void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
-    ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
+    sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId();
     bool bDataChg=nId==SFX_HINT_DATACHANGED;
     bool bDying=nId==SFX_HINT_DYING;
     bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
@@ -1693,10 +1691,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const
         } 
         else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L) 
         {
-            if(GetConnectedNode(TRUE)) 
+            if(GetConnectedNode(sal_True)) 
                 nHdlAnz++;
 
-            if(GetConnectedNode(FALSE)) 
+            if(GetConnectedNode(sal_False)) 
                 nHdlAnz++;
         }
     }
@@ -1711,10 +1709,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
     if (nPntAnz!=0) {
         if (nHdlNum==0) {
             pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY);
-            if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(TRUE);
+            if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True);
         } else if (nHdlNum==1) {
-            pHdl=new ImpEdgeHdl((*pEdgeTrack)[USHORT(nPntAnz-1)],HDL_POLY);
-            if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(TRUE);
+            pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY);
+            if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True);
         } else {
             SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
             if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) {
@@ -1754,7 +1752,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
                 }
             } else if (eKind==SDREDGE_THREELINES) {
                 sal_uInt32 nNum(nHdlNum);
-                if (GetConnectedNode(TRUE)==NULL) nNum++;
+                if (GetConnectedNode(sal_True)==NULL) nNum++;
                 Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]);
                 pHdl=new ImpEdgeHdl(aPos,HDL_POLY);
                 if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2);
@@ -1884,7 +1882,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
 
     // force recalc EdgeTrack
     *pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo);
-    bEdgeTrackDirty=FALSE;
+    bEdgeTrackDirty=sal_False;
 
     // save EdgeInfos and mark object as user modified
     ImpSetEdgeInfoToAttr();
@@ -1986,40 +1984,40 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth
 
 bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat)
 {
-    rDragStat.SetNoSnap(TRUE);
+    rDragStat.SetNoSnap(sal_True);
     pEdgeTrack->SetPointCount(2);
     (*pEdgeTrack)[0]=rDragStat.GetStart();
     (*pEdgeTrack)[1]=rDragStat.GetNow();
     if (rDragStat.GetPageView()!=NULL) {
         ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this);
-        ConnectToNode(TRUE,aCon1.pObj);
+        ConnectToNode(sal_True,aCon1.pObj);
     }
     *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
 {
-    USHORT nMax=pEdgeTrack->GetPointCount();
+    sal_uInt16 nMax=pEdgeTrack->GetPointCount();
     (*pEdgeTrack)[nMax-1]=rDragStat.GetNow();
     if (rDragStat.GetPageView()!=NULL) {
         ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this);
         rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView());
     }
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    ConnectToNode(FALSE,aCon2.pObj);
+    bSnapRectDirty=sal_True;
+    ConnectToNode(sal_False,aCon2.pObj);
     *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
-    bEdgeTrackDirty=FALSE;
-    return TRUE;
+    bEdgeTrackDirty=sal_False;
+    return sal_True;
 }
 
 bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
 {
     bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2);
     if (bOk) {
-        ConnectToNode(TRUE,aCon1.pObj);
-        ConnectToNode(FALSE,aCon2.pObj);
+        ConnectToNode(sal_True,aCon1.pObj);
+        ConnectToNode(sal_False,aCon2.pObj);
         if (rDragStat.GetView()!=NULL) {
             rDragStat.GetView()->HideConnectMarker();
         }
@@ -2034,7 +2032,7 @@ bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat)
     if (rDragStat.GetView()!=NULL) {
         rDragStat.GetView()->HideConnectMarker();
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat)
@@ -2060,11 +2058,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
 {
     rCon.ResetVars();
     if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0);
-    if (pOut==NULL) return FALSE;
+    if (pOut==NULL) return sal_False;
     SdrObjList* pOL=rPV.GetObjList();
     const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
     // Sensitiver Bereich der Konnektoren ist doppelt so gross wie die Handles:
-    USHORT nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
+    sal_uInt16 nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
     Size aHalfConSiz(nMarkHdSiz,nMarkHdSiz);
     aHalfConSiz=pOut->PixelToLogic(aHalfConSiz);
     Size aHalfCenterSiz(2*aHalfConSiz.Width(),2*aHalfConSiz.Height());
@@ -2073,8 +2071,8 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
     aMouseRect.Top()   -=aHalfConSiz.Height();
     aMouseRect.Right() +=aHalfConSiz.Width();
     aMouseRect.Bottom()+=aHalfConSiz.Height();
-    USHORT nBoundHitTol=(USHORT)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
-    ULONG no=pOL->GetObjCount();
+    sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
+    sal_uIntPtr no=pOL->GetObjCount();
     bool bFnd = false;
     SdrObjConnection aTestCon;
     SdrObjConnection aBestCon;
@@ -2095,11 +2093,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                 // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert.
                 // Zum Schluss kommt noch ein HitTest aufs Obj.
                 const SdrGluePointList* pGPL=pObj->GetGluePointList();
-                USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
-                USHORT nGesAnz=nConAnz+9;
+                sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+                sal_uInt16 nGesAnz=nConAnz+9;
                 bool bUserFnd = false;
-                ULONG nBestDist=0xFFFFFFFF;
-                for (USHORT i=0; i<nGesAnz; i++)
+                sal_uIntPtr nBestDist=0xFFFFFFFF;
+                for (sal_uInt16 i=0; i<nGesAnz; i++) 
                 {
                     bool bUser=i<nConAnz;
                     bool bVertex=i>=nConAnz+0 && i<nConAnz+4;
@@ -2107,7 +2105,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     bool bCenter=i==nConAnz+8;
                     bool bOk = false;
                     Point aConPos;
-                    USHORT nConNum=i;
+                    sal_uInt16 nConNum=i;
                     if (bUser) {
                         const SdrGluePoint& rGP=(*pGPL)[nConNum];
                         aConPos=rGP.GetAbsolutePos(*pObj);
@@ -2143,14 +2141,14 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     if (bOk && aMouseRect.IsInside(aConPos)) {
                         if (bUser) bUserFnd = true;
                         bFnd = true;
-                        ULONG nDist=(ULONG)Abs(aConPos.X()-rPt.X())+(ULONG)Abs(aConPos.Y()-rPt.Y());
+                        sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y());
                         if (nDist<nBestDist) {
                             nBestDist=nDist;
                             aTestCon.pObj=pObj;
                             aTestCon.nConId=nConNum;
                             aTestCon.bAutoCorner=bCorner;
                             aTestCon.bAutoVertex=bVertex;
-                            aTestCon.bBestConn=FALSE; // bCenter;
+                            aTestCon.bBestConn=sal_False; // bCenter;
                             aTestCon.bBestVertex=bCenter;
                         }
                     }
@@ -2167,7 +2165,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     {
                         bFnd = true;
                         aTestCon.pObj=pObj;
-                        aTestCon.bBestConn=TRUE;
+                        aTestCon.bBestConn=sal_True;
                     }
                 }
                 if (bFnd) {
@@ -2238,7 +2236,7 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
     }
 }
 
-SdrObject* SdrEdgeObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     basegfx::B2DPolyPolygon aPolyPolygon;
     aPolyPolygon.append(pEdgeTrack->getB2DPolygon());
@@ -2256,7 +2254,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const
 Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const
 {
     ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (i==0) return (*pEdgeTrack)[0];
     else return (*pEdgeTrack)[nAnz-1];
 }
@@ -2274,7 +2272,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const
 Point SdrEdgeObj::GetPoint(sal_uInt32 i) const
 {
     ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (0L == i) 
         return (*pEdgeTrack)[0];
     else 
@@ -2285,7 +2283,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
 {
     // ToDo: Umconnekten fehlt noch
     ImpUndirtyEdgeTrack();
-    USHORT nAnz=pEdgeTrack->GetPointCount();
+    sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
     if (0L == i) 
         (*pEdgeTrack)[0]=rPnt;
     if (1L == i) 
@@ -2341,7 +2339,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
     aEdgeInfo      =rEGeo.aEdgeInfo;
 }
 
-Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
+Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const
 {
     if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0)
     {
@@ -2352,7 +2350,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
         }
         else
         {
-            const USHORT nSiz = rTrack0.GetPointCount() - 1;
+            const sal_uInt16 nSiz = rTrack0.GetPointCount() - 1;
             return rTrack0[nSiz];
         }
     }
@@ -2366,7 +2364,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
 
 }
 
-void SdrEdgeObj::SetTailPoint( BOOL bTail, const Point& rPt )
+void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
 {
     ImpSetTailPoint( bTail, rPt );
     SetChanged();
@@ -2404,12 +2402,12 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
         nIndex = 0;
     }
 
-    rConn1.SetConnectorId( (USHORT)nIndex );
+    rConn1.SetConnectorId( (sal_uInt16)nIndex );
 
     SetChanged();
     SetRectsDirty();
     ImpRecalcEdgeTrack();
-    // bEdgeTrackDirty=TRUE;
+    // bEdgeTrackDirty=sal_True;
 }
 
 /** this method is used by the api to return a glue point id for a connection.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 99f3cebcf9..d292e46e18 100644..100755
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -46,15 +46,16 @@
 #include <vcl/svapp.hxx>
 
 #include <sfx2/linkmgr.hxx>
+#include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include "svtools/filter.hxx"
 #include <svx/svdograf.hxx>
@@ -70,6 +71,8 @@
 #include <svx/sdr/contact/viewcontactofgraphic.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <osl/thread.hxx>
+#include <vos/mutex.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
@@ -81,13 +84,48 @@ using namespace ::com::sun::star::io;
 #define GRAFSTREAMPOS_INVALID   0xffffffff
 #define SWAPGRAPHIC_TIMEOUT     5000
 
+
 // ------------------
 // - SdrGraphicLink	-
 // ------------------
 
+
+const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilterName )
+{
+    Graphic aGraphic;
+
+    SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True );
+    xMed.DownLoad();
+
+    SvStream* pInStrm = xMed.GetInStream();
+    if ( pInStrm )
+    {
+        pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
+        GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
+
+        const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
+                            ? pGF->GetImportFormatNumber( rFilterName )
+                            : GRFILTER_FORMAT_DONTKNOW;
+
+        String aEmptyStr;
+        com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 );
+
+        // Room for improvment:
+        // As this is a linked graphic the GfxLink is not needed if saving/loading our own format.
+        // But this link is required by some filters to access the native graphic (pdf export/ms export),
+        // there we should create a new service to provide this data if needed
+        aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) );
+        aFilterData[ 0 ].Value = Any( sal_True );
+        pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData );
+    }
+    return aGraphic;
+}
+
+class SdrGraphicUpdater;
 class SdrGraphicLink : public sfx2::SvBaseLink
 {
     SdrGrafObj*			pGrafObj;
+    SdrGraphicUpdater*	pGraphicUpdater;
 
 public:
                         SdrGraphicLink(SdrGrafObj* pObj);
@@ -96,24 +134,111 @@ public:
     virtual void		Closed();
     virtual void		DataChanged( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
+    void				DataChanged( const Graphic& rGraphic );
 
-    BOOL				Connect() { return 0 != GetRealObject(); }
-    void				UpdateSynchron();
+    sal_Bool				Connect() { return 0 != GetRealObject(); }
+    void				UpdateAsynchron();
+    void				RemoveGraphicUpdater();
 };
 
+class SdrGraphicUpdater : public ::osl::Thread
+{
+public:
+    SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& );
+    virtual ~SdrGraphicUpdater( void );
+
+    void SAL_CALL Terminate( void );
+
+    sal_Bool GraphicLinkChanged( const String& rFileName ){ return mrFileName != rFileName;	};
+
+protected:
+
+    /**	is called from the inherited create method and acts as the
+        main function of this thread.
+    */
+    virtual void SAL_CALL run(void);
+
+    /**	Called after the thread is terminated via the terminate
+        method.  Used to kill the thread by calling delete on this.
+    */	
+    virtual void SAL_CALL onTerminated(void);
+
+private:
+
+    ::osl::Mutex	maMutex;
+    const String&	mrFileName;
+    const String&	mrFilterName;
+    SdrGraphicLink& mrGraphicLink;
+
+    volatile bool mbIsTerminated;
+};
+
+SdrGraphicUpdater::SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& rGraphicLink )
+: mrFileName( rFileName )
+, mrFilterName( rFilterName )
+, mrGraphicLink( rGraphicLink )
+, mbIsTerminated( sal_False )
+{
+    create();
+}
+
+SdrGraphicUpdater::~SdrGraphicUpdater( void )
+{
+}
+
+void SdrGraphicUpdater::Terminate()
+{
+    ::osl::MutexGuard aGuard( maMutex );
+    mbIsTerminated = sal_True;
+}
+
+void SAL_CALL SdrGraphicUpdater::onTerminated(void)
+{
+    delete this;
+}
+
+void SAL_CALL SdrGraphicUpdater::run(void)
+{
+    Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) );
+    ::osl::MutexGuard aGuard(maMutex);
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    if ( !mbIsTerminated )
+    {
+        mrGraphicLink.DataChanged( aGraphic );
+        mrGraphicLink.RemoveGraphicUpdater();
+    }
+}
+
 // -----------------------------------------------------------------------------
 
-SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj):
-    ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
-    pGrafObj(pObj)
+SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj)
+: ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB )
+, pGrafObj( pObj )
+, pGraphicUpdater( NULL )
 {
-    SetSynchron( FALSE );
+    SetSynchron( sal_False );
 }
 
 // -----------------------------------------------------------------------------
 
 SdrGraphicLink::~SdrGraphicLink()
 {
+    if ( pGraphicUpdater )
+        pGraphicUpdater->Terminate();
+}
+
+// -----------------------------------------------------------------------------
+
+void SdrGraphicLink::DataChanged( const Graphic& rGraphic )
+{
+    pGrafObj->ImpSetLinkedGraphic( rGraphic );
+}
+
+// -----------------------------------------------------------------------------
+
+void SdrGraphicLink::RemoveGraphicUpdater()
+{
+    pGraphicUpdater = NULL;
 }
 
 // -----------------------------------------------------------------------------
@@ -136,9 +261,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType,
         }
         else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != sfx2::LinkManager::RegisterStatusInfoId() )
         {
-            // only repaint, no objectchange
-            pGrafObj->ActionChanged();
-            // pGrafObj->BroadcastObjectChange();
+            // broadcasting, to update slidesorter
+            pGrafObj->BroadcastObjectChange();
         }
     }
 }
@@ -156,14 +280,20 @@ void SdrGraphicLink::Closed()
 
 // -----------------------------------------------------------------------------
 
-void SdrGraphicLink::UpdateSynchron()
+void SdrGraphicLink::UpdateAsynchron()
 {
     if( GetObj() )
     {
-        String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
-        ::com::sun::star::uno::Any aValue;
-        GetObj()->GetData( aValue, aMimeType, TRUE );
-        DataChanged( aMimeType, aValue );
+        if ( pGraphicUpdater )
+        {
+            if ( pGraphicUpdater->GraphicLinkChanged( pGrafObj->GetFileName() ) )
+            {
+                pGraphicUpdater->Terminate();
+                pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this );
+            }
+        }
+        else
+            pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this );
     }
 }
 
@@ -196,11 +326,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj);
 SdrGrafObj::SdrGrafObj()
 :	SdrRectObj(),
     pGraphicLink	( NULL ),
-    bMirrored		( FALSE )
+    bMirrored		( sal_False )
 {
     pGraphic = new GraphicObject;
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -219,11 +349,11 @@ SdrGrafObj::SdrGrafObj()
 SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
 :	SdrRectObj		( rRect ),
     pGraphicLink	( NULL ),
-    bMirrored		( FALSE )
+    bMirrored		( sal_False )
 {
     pGraphic = new GraphicObject( rGrf );
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -242,11 +372,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
 SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
 :	SdrRectObj(),
     pGraphicLink	( NULL ),
-    bMirrored		( FALSE )
+    bMirrored		( sal_False )
 {
     pGraphic = new GraphicObject( rGrf );
     pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
-    bNoShear = TRUE;
+    bNoShear = sal_True;
 
     // #111096#
     mbGrafAnimationAllowed = sal_True;
@@ -318,7 +448,7 @@ const Graphic& SdrGrafObj::GetGraphic() const
 
 // -----------------------------------------------------------------------------
 
-Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
+Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
 {
     // #107947# Refactored most of the code to GraphicObject, where
     // everybody can use e.g. the cropping functionality
@@ -326,8 +456,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
     GraphicType	    eType = GetGraphicType();
     MapMode   		aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() );
     const Size      aDestSize( GetLogicRect().GetSize() );
-    const BOOL      bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
-    const BOOL      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
+    const sal_Bool      bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
+    const sal_Bool      bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
         ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
 
     // #104115# Need cropping info earlier
@@ -343,7 +473,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
 
         if( bMirror )
         {
-            USHORT nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
+            sal_uInt16		nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
             bool bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
             bool bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
 
@@ -448,8 +578,10 @@ void SdrGrafObj::ForceSwapIn() const
 
         const_cast< SdrGrafObj* >( this )->mbIsPreview = sal_False;
     }
-
-    pGraphic->FireSwapInRequest();
+    if ( pGraphicLink && pGraphic->IsSwappedOut() )
+        ImpUpdateGraphicLink( sal_False );
+    else
+        pGraphic->FireSwapInRequest();
 
     if( pGraphic->IsSwappedOut() ||
         ( pGraphic->GetType() == GRAPHIC_NONE ) ||
@@ -533,57 +665,69 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
                                aGeo.nDrehWink % 18000 == 0 ||
                                aGeo.nDrehWink % 27000 == 0;
 
-    rInfo.bResizePropAllowed = TRUE;
+    rInfo.bResizePropAllowed = sal_True;
     rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim;
     rInfo.bRotate90Allowed = bNoPresGrf && !bAnim;
     rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim;
     rInfo.bMirror45Allowed = bNoPresGrf && !bAnim;
     rInfo.bMirror90Allowed = !bEmptyPresObj;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed = FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath = FALSE;
-    rInfo.bCanConvToPathLineToArea = FALSE;
-    rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed = sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath = sal_False;
+    rInfo.bCanConvToPathLineToArea = sal_False;
+    rInfo.bCanConvToPolyLineToArea = sal_False;
     rInfo.bCanConvToPoly = !IsEPS();
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
 // -----------------------------------------------------------------------------
 
-UINT16 SdrGrafObj::GetObjIdentifier() const
+sal_uInt16 SdrGrafObj::GetObjIdentifier() const
 {
-    return UINT16( OBJ_GRAF );
+    return sal_uInt16( OBJ_GRAF );
 }
 
 // -----------------------------------------------------------------------------
 
-sal_Bool SdrGrafObj::ImpUpdateGraphicLink() const
+/* The graphic of the GraphicLink will be loaded. If it is called with
+   bAsynchron = true then the graphic will be set later via DataChanged
+*/ 
+sal_Bool SdrGrafObj::ImpUpdateGraphicLink( sal_Bool bAsynchron ) const
 {
-    sal_Bool	bRet = sal_False;
-
+    sal_Bool bRet = sal_False;
     if( pGraphicLink )
     {
-        const sal_Bool bIsChanged = pModel->IsChanged();
-        pGraphicLink->UpdateSynchron();
-        pModel->SetChanged( bIsChanged );
-
+        if ( bAsynchron )
+            pGraphicLink->UpdateAsynchron();
+        else
+            pGraphicLink->DataChanged( ImpLoadLinkedGraphic( aFileName, aFilterName ) );
         bRet = sal_True;
     }
-
     return bRet;
 }
 
 // -----------------------------------------------------------------------------
 
+void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic )
+{
+    const sal_Bool bIsChanged = GetModel()->IsChanged();
+    NbcSetGraphic( rGraphic );
+    ActionChanged();
+    BroadcastObjectChange();
+    GetModel()->SetChanged( bIsChanged );
+}
+
+// -----------------------------------------------------------------------------
+
 void SdrGrafObj::TakeObjNameSingul(XubString& rName) const
 {
     switch( pGraphic->GetType() )
     {
         case GRAPHIC_BITMAP:
         {
-            const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+            const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                  ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
                                  ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
 
@@ -622,7 +766,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const
     {
         case GRAPHIC_BITMAP:
         {
-            const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+            const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
                                  ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
                                  ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
 
@@ -781,7 +925,6 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect)
 
 void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect)
 {
-    //bool bChg=rRect.GetSize()!=aRect.GetSize();
     SdrRectObj::NbcSetLogicRect(rRect);
 }
 
@@ -805,9 +948,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const
 
 void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo)
 {
-    //long		nDrehMerk = aGeo.nDrehWink;
-    //long		nShearMerk = aGeo.nShearWink;
-    //bool	bMirrMerk = bMirrored;
     Size		aSizMerk( aRect.GetSize() );
 
     SdrRectObj::RestGeoData(rGeo);
@@ -898,7 +1038,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const
 
 // -----------------------------------------------------------------------------
 
-SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     SdrObject* pRetval = NULL;
 
@@ -915,7 +1055,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
             aFilter.SetScaleRect(GetSnapRect());
             aFilter.SetLayer(GetLayer());
 
-            UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
+            sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
             if(nInsAnz)
             {
                 pRetval = pGrp;
@@ -961,7 +1101,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
                 Bitmap aBitmap( GetTransformedGraphic().GetBitmap() );
                 XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH);
                 aSet.Put(XFillBitmapItem(String(), aXBmp));
-                aSet.Put(XFillBmpTileItem(FALSE));
+                aSet.Put(XFillBmpTileItem(sal_False));
 
                 pRetval->SetMergedItemSet(aSet);
             }
@@ -999,7 +1139,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
     aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() );
     aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() );
     aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 );
-    aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 )  * 2.55 ) );
+    aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 )  * 2.55 ) );
     aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() );
     aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() );
     aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() );
@@ -1018,7 +1158,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr()
     SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) );
     SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) );
     SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) );
-    SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
+    SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
     SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) );
     SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) );
     SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) );
@@ -1091,12 +1231,12 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
             // ## test only if there are VOCs other than the preview renderer
             if(!GetViewContact().HasViewObjectContacts(true))
             {
-                const ULONG	nSwapMode = pModel->GetSwapGraphicsMode();
+                const sal_uIntPtr	nSwapMode = pModel->GetSwapGraphicsMode();
 
                 if( ( pGraphic->HasUserData() || pGraphicLink ) &&
                     ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) )
                 {
-                    pRet = NULL;
+                    pRet = GRFMGR_AUTOSWAPSTREAM_LINK;
                 }
                 else if( nSwapMode & SDR_SWAPGRAPHICSMODE_TEMP )
                 {
@@ -1123,7 +1263,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
             {
                 SdrDocumentStreamInfo aStreamInfo;
 
-                aStreamInfo.mbDeleteAfterUse = FALSE;
+                aStreamInfo.mbDeleteAfterUse = sal_False;
                 aStreamInfo.maUserData = pGraphic->GetUserData();
 
                 SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
@@ -1181,7 +1321,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
                     }
                 }
             }
-            else if( !ImpUpdateGraphicLink() )
+            else if( !ImpUpdateGraphicLink( sal_False ) )
             {
                 pRet = GRFMGR_AUTOSWAPSTREAM_TEMP;
             }
@@ -1241,7 +1381,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
         {
             SdrDocumentStreamInfo aStreamInfo;
 
-            aStreamInfo.mbDeleteAfterUse = FALSE;
+            aStreamInfo.mbDeleteAfterUse = sal_False;
             aStreamInfo.maUserData = pGraphic->GetUserData();
 
             SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 6d36fd1b60..5c73ea0a78 100644..100755
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -46,14 +46,14 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
@@ -101,10 +101,10 @@ SdrObjGroup::SdrObjGroup()
     pSub=new SdrObjList(NULL,NULL);
     pSub->SetOwnerObj(this);
     pSub->SetListKind(SDROBJLIST_GROUPOBJ);
-    bRefPoint=FALSE;
+    bRefPoint=sal_False;
     nDrehWink=0;
     nShearWink=0;
-    bClosedObj=FALSE;
+    bClosedObj=sal_False;
 }
 
 
@@ -115,51 +115,51 @@ SdrObjGroup::~SdrObjGroup()
 
 void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bNoContortion=FALSE;
+    rInfo.bNoContortion=sal_False;
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         SdrObjTransformInfoRec aInfo;
         pObj->TakeObjInfo(aInfo);
-        if (!aInfo.bMoveAllowed            ) rInfo.bMoveAllowed            =FALSE;
-        if (!aInfo.bResizeFreeAllowed      ) rInfo.bResizeFreeAllowed      =FALSE;
-        if (!aInfo.bResizePropAllowed      ) rInfo.bResizePropAllowed      =FALSE;
-        if (!aInfo.bRotateFreeAllowed      ) rInfo.bRotateFreeAllowed      =FALSE;
-        if (!aInfo.bRotate90Allowed        ) rInfo.bRotate90Allowed        =FALSE;
-        if (!aInfo.bMirrorFreeAllowed      ) rInfo.bMirrorFreeAllowed      =FALSE;
-        if (!aInfo.bMirror45Allowed        ) rInfo.bMirror45Allowed        =FALSE;
-        if (!aInfo.bMirror90Allowed        ) rInfo.bMirror90Allowed        =FALSE;
-        if (!aInfo.bShearAllowed           ) rInfo.bShearAllowed           =FALSE;
-        if (!aInfo.bEdgeRadiusAllowed	   ) rInfo.bEdgeRadiusAllowed	   =FALSE;
-        if (!aInfo.bNoOrthoDesired         ) rInfo.bNoOrthoDesired         =FALSE;
-        if (aInfo.bNoContortion            ) rInfo.bNoContortion           =TRUE;
-        if (!aInfo.bCanConvToPath          ) rInfo.bCanConvToPath          =FALSE;
+        if (!aInfo.bMoveAllowed            ) rInfo.bMoveAllowed            =sal_False;
+        if (!aInfo.bResizeFreeAllowed      ) rInfo.bResizeFreeAllowed      =sal_False;
+        if (!aInfo.bResizePropAllowed      ) rInfo.bResizePropAllowed      =sal_False;
+        if (!aInfo.bRotateFreeAllowed      ) rInfo.bRotateFreeAllowed      =sal_False;
+        if (!aInfo.bRotate90Allowed        ) rInfo.bRotate90Allowed        =sal_False;
+        if (!aInfo.bMirrorFreeAllowed      ) rInfo.bMirrorFreeAllowed      =sal_False;
+        if (!aInfo.bMirror45Allowed        ) rInfo.bMirror45Allowed        =sal_False;
+        if (!aInfo.bMirror90Allowed        ) rInfo.bMirror90Allowed        =sal_False;
+        if (!aInfo.bShearAllowed           ) rInfo.bShearAllowed           =sal_False;
+        if (!aInfo.bEdgeRadiusAllowed	   ) rInfo.bEdgeRadiusAllowed	   =sal_False;
+        if (!aInfo.bNoOrthoDesired         ) rInfo.bNoOrthoDesired         =sal_False;
+        if (aInfo.bNoContortion            ) rInfo.bNoContortion           =sal_True;
+        if (!aInfo.bCanConvToPath          ) rInfo.bCanConvToPath          =sal_False;
 
         if(!aInfo.bCanConvToContour)
-            rInfo.bCanConvToContour = FALSE;
+            rInfo.bCanConvToContour = sal_False;
 
-        if (!aInfo.bCanConvToPoly          ) rInfo.bCanConvToPoly          =FALSE;
-        if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE;
-        if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE;
+        if (!aInfo.bCanConvToPoly          ) rInfo.bCanConvToPoly          =sal_False;
+        if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False;
+        if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False;
     }
     if (nObjAnz==0) {
-        rInfo.bRotateFreeAllowed=FALSE;
-        rInfo.bRotate90Allowed  =FALSE;
-        rInfo.bMirrorFreeAllowed=FALSE;
-        rInfo.bMirror45Allowed  =FALSE;
-        rInfo.bMirror90Allowed  =FALSE;
-        rInfo.bTransparenceAllowed = FALSE;
-        rInfo.bGradientAllowed = FALSE;
-        rInfo.bShearAllowed     =FALSE;
-        rInfo.bEdgeRadiusAllowed=FALSE;
-        rInfo.bNoContortion     =TRUE;
+        rInfo.bRotateFreeAllowed=sal_False;
+        rInfo.bRotate90Allowed  =sal_False;
+        rInfo.bMirrorFreeAllowed=sal_False;
+        rInfo.bMirror45Allowed  =sal_False;
+        rInfo.bMirror90Allowed  =sal_False;
+        rInfo.bTransparenceAllowed = sal_False;
+        rInfo.bGradientAllowed = sal_False;
+        rInfo.bShearAllowed     =sal_False;
+        rInfo.bEdgeRadiusAllowed=sal_False;
+        rInfo.bNoContortion     =sal_True;
     }
     if(nObjAnz != 1)
     {
         // only allowed if single object selected
-        rInfo.bTransparenceAllowed = FALSE;
-        rInfo.bGradientAllowed = FALSE;
+        rInfo.bTransparenceAllowed = sal_False;
+        rInfo.bGradientAllowed = sal_False;
     }
 }
 
@@ -170,9 +170,9 @@ void SdrObjGroup::SetBoundRectDirty()
     // not re-creatable view data
 }
 
-UINT16 SdrObjGroup::GetObjIdentifier() const
+sal_uInt16 SdrObjGroup::GetObjIdentifier() const
 {
-    return UINT16(OBJ_GRUP);
+    return sal_uInt16(OBJ_GRUP);
 }
 
 
@@ -181,8 +181,8 @@ SdrLayerID SdrObjGroup::GetLayer() const
     bool b1st = true;
     SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer());
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrLayerID nLay1=pOL->GetObj(i)->GetLayer();
         if (b1st) { nLay=nLay1; b1st = false; }
         else if (nLay1!=nLay) return 0;
@@ -195,8 +195,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer)
 {
     SdrObject::NbcSetLayer(nLayer);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         pOL->GetObj(i)->NbcSetLayer(nLayer);
     }
 }
@@ -260,7 +260,7 @@ Point SdrObjGroup::GetRefPoint() const
 
 void SdrObjGroup::SetRefPoint(const Point& rPnt)
 {
-    bRefPoint=TRUE;
+    bRefPoint=sal_True;
     aRefPoint=rPnt;
 }
 
@@ -384,7 +384,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const
 
 bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -431,8 +431,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
     MovePoint(aRefPoint,rSiz);
     if (pSub->GetObjCount()!=0) {
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG i=0; i<nObjAnz; i++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             pObj->NbcMove(rSiz);
         }
@@ -463,8 +463,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
     ResizePoint(aRefPoint,rRef,xFact,yFact);
     if (pSub->GetObjCount()!=0) {
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG i=0; i<nObjAnz; i++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             pObj->NbcResize(rRef,xFact,yFact);
         }
@@ -477,48 +477,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
 
 void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     nDrehWink=NormAngle360(nDrehWink+nWink);
     RotatePoint(aRefPoint,rRef,sn,cs);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcRotate(rRef,nWink,sn,cs);
     }
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
 void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcMirror(rRef1,rRef2);
     }
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
 void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     nShearWink+=nWink;
     ShearPoint(aRefPoint,rRef,tn);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcShear(rRef,nWink,tn,bVShear);
     }
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 
@@ -528,8 +528,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
     Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
     MovePoint(aRefPoint,aSiz);
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    for (ULONG i=0; i<nObjAnz; i++) {
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    for (sal_uIntPtr i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         pObj->NbcSetAnchorPos(rPnt);
     }
@@ -575,8 +575,8 @@ void SdrObjGroup::Move(const Size& rSiz)
         if (pSub->GetObjCount()!=0) {
             // #32383# Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
-            ULONG nObjAnz=pOL->GetObjCount();
-            ULONG i;
+            sal_uIntPtr nObjAnz=pOL->GetObjCount();
+            sal_uIntPtr i;
             for (i=0; i<nObjAnz; i++) {
                 SdrObject* pObj=pOL->GetObj(i);
                 if (pObj->IsEdgeObj()) pObj->Move(rSiz);
@@ -621,8 +621,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
         if (pSub->GetObjCount()!=0) {
             // #32383# Erst die Verbinder verschieben, dann den Rest
             SdrObjList* pOL=pSub;
-            ULONG nObjAnz=pOL->GetObjCount();
-            ULONG i;
+            sal_uIntPtr nObjAnz=pOL->GetObjCount();
+            sal_uIntPtr i;
             for (i=0; i<nObjAnz; i++) {
                 SdrObject* pObj=pOL->GetObj(i);
                 if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
@@ -647,14 +647,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
 void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
 {
     if (nWink!=0) {
-        SetGlueReallyAbsolute(TRUE);
+        SetGlueReallyAbsolute(sal_True);
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nDrehWink=NormAngle360(nDrehWink+nWink);
         RotatePoint(aRefPoint,rRef,sn,cs);
         // #32383# Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG i;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr i;
         for (i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
@@ -664,7 +664,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
             if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
         }
         NbcRotateGluePoints(rRef,nWink,sn,cs);
-        SetGlueReallyAbsolute(FALSE);
+        SetGlueReallyAbsolute(sal_False);
         SetChanged();
         BroadcastObjectChange();
         SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -674,13 +674,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
 
 void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
     // #32383# Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    ULONG i;
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
@@ -690,7 +690,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
         if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
     }
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
     SetChanged();
     BroadcastObjectChange();
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -700,14 +700,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
 void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
 {
     if (nWink!=0) {
-        SetGlueReallyAbsolute(TRUE);
+        SetGlueReallyAbsolute(sal_True);
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
         nShearWink+=nWink;
         ShearPoint(aRefPoint,rRef,tn);
         // #32383# Erst die Verbinder verschieben, dann den Rest
         SdrObjList* pOL=pSub;
-        ULONG nObjAnz=pOL->GetObjCount();
-        ULONG i;
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        sal_uIntPtr i;
         for (i=0; i<nObjAnz; i++) {
             SdrObject* pObj=pOL->GetObj(i);
             if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
@@ -717,7 +717,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
             if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
         }
         NbcShearGluePoints(rRef,nWink,tn,bVShear);
-        SetGlueReallyAbsolute(FALSE);
+        SetGlueReallyAbsolute(sal_False);
         SetChanged();
         BroadcastObjectChange();
         SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -734,8 +734,8 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
     MovePoint(aRefPoint,aSiz);
     // #32383# Erst die Verbinder verschieben, dann den Rest
     SdrObjList* pOL=pSub;
-    ULONG nObjAnz=pOL->GetObjCount();
-    ULONG i;
+    sal_uIntPtr nObjAnz=pOL->GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nObjAnz; i++) {
         SdrObject* pObj=pOL->GetObj(i);
         if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt);
@@ -777,12 +777,12 @@ void SdrObjGroup::ReformatText()
     pSub->ReformatAllTextObjects();
 }
 
-SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     SdrObject* pGroup = new SdrObjGroup;
     pGroup->SetModel(GetModel());
 
-    for(UINT32 a=0;a<pSub->GetObjCount();a++)
+    for(sal_uInt32 a=0;a<pSub->GetObjCount();a++)
     {
         SdrObject* pIterObj = pSub->GetObj(a);
         SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index f56ca8ecd9..f27f6db300 100644..100755
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -31,7 +31,7 @@
 
 #include <svx/svdomeas.hxx>
 #include <math.h>
-#include "svditext.hxx" //
+#include "svx/svditext.hxx" //
 #include <svx/xpoly.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdhdl.hxx>
@@ -41,8 +41,8 @@
 #include <svx/svdattrx.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdglob.hxx"   // StringCache
-#include "svdstr.hrc"    // Objektname
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
@@ -80,8 +80,8 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
 {
     rStr.Erase();
     Fraction aMeasureScale(1, 1);
-    BOOL bTextRota90(FALSE);
-    BOOL bShowUnit(FALSE);
+    sal_Bool bTextRota90(sal_False);
+    sal_Bool bShowUnit(sal_False);
     FieldUnit eMeasureUnit(FUNIT_NONE);
     FieldUnit eModUIUnit(FUNIT_NONE);
 
@@ -105,7 +105,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
                 if(eMeasureUnit == FUNIT_NONE)
                     eMeasureUnit = eModUIUnit;
 
-                INT32 nLen(GetLen(aPt2 - aPt1));
+                sal_Int32 nLen(GetLen(aPt2 - aPt1));
                 Fraction aFact(1,1);
 
                 if(eMeasureUnit != eModUIUnit)
@@ -125,7 +125,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
                     nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator());
                 }
 
-                pModel->TakeMetricStr(nLen, rStr, TRUE, nNumDigits);
+                pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits);
 
                 if(!aFact.IsValid())
                 {
@@ -216,7 +216,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact()
 TYPEINIT1(SdrMeasureObj,SdrTextObj);
 
 SdrMeasureObj::SdrMeasureObj():
-    bTextDirty(FALSE)
+    bTextDirty(sal_False)
 {
     // #i25616#
     mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -225,7 +225,7 @@ SdrMeasureObj::SdrMeasureObj():
 SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2):
     aPt1(rPt1),
     aPt2(rPt2),
-    bTextDirty(FALSE)
+    bTextDirty(sal_False)
 {
     // #i25616#
     mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -237,31 +237,31 @@ SdrMeasureObj::~SdrMeasureObj()
 
 void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bSelectAllowed    =TRUE;
-    rInfo.bMoveAllowed      =TRUE;
-    rInfo.bResizeFreeAllowed=TRUE;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
-    rInfo.bMirrorFreeAllowed=TRUE;
-    rInfo.bMirror45Allowed  =TRUE;
-    rInfo.bMirror90Allowed  =TRUE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =TRUE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =TRUE;
-    rInfo.bNoContortion     =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =TRUE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bSelectAllowed    =sal_True;
+    rInfo.bMoveAllowed      =sal_True;
+    rInfo.bResizeFreeAllowed=sal_True;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
+    rInfo.bMirrorFreeAllowed=sal_True;
+    rInfo.bMirror45Allowed  =sal_True;
+    rInfo.bMirror90Allowed  =sal_True;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_True;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_True;
+    rInfo.bNoContortion     =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_True;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrMeasureObj::GetObjIdentifier() const
+sal_uInt16 SdrMeasureObj::GetObjIdentifier() const
 {
-    return (UINT16)OBJ_MEASURE;
+    return (sal_uInt16)OBJ_MEASURE;
 }
 
 struct ImpMeasureRec : public SdrDragStatUserData
@@ -313,7 +313,7 @@ struct ImpMeasurePoly
     double						nLineCos;
     double						nHlpSin;
     double						nHlpCos;
-    USHORT						nMainlineAnz;
+    sal_uInt16						nMainlineAnz;
     SdrMeasureTextHPos			eUsedTextHPos;
     SdrMeasureTextVPos			eUsedTextVPos;
     long						nLineWdt2;  // Halbe Strichstaerke
@@ -426,7 +426,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
         OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
         if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
         {
-            bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz.
+            bBrkLine=sal_True; // Unterbrochene Linie, wenn nur 1 Absatz.
         }
     }
     rPol.bBreakedLine=bBrkLine;
@@ -462,12 +462,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
     rPol.nTextWink=rPol.nLineWink;
     if (rRec.bTextRota90) rPol.nTextWink+=9000;
 
-    rPol.bAutoUpsideDown=FALSE;
+    rPol.bAutoUpsideDown=sal_False;
     if (rRec.bTextAutoAngle) {
         long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView);
         if (nTmpWink>=18000) {
             rPol.nTextWink+=18000;
-            rPol.bAutoUpsideDown=TRUE;
+            rPol.bAutoUpsideDown=sal_True;
         }
     }
 
@@ -582,7 +582,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
     return aRetval;
 }
 
-bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
     bool bEdit,
     Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const
 {
@@ -597,7 +597,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USH
                 rpFldColor=NULL;
             }
         }
-        return TRUE;
+        return sal_True;
     } else {
         return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet);
     }
@@ -629,14 +629,14 @@ void SdrMeasureObj::UndirtyText() const
             rOutliner.SetText(*pOutlinerParaObject);
         }
 
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         rOutliner.UpdateFields();
         Size aSiz(rOutliner.CalcTextSize());
         rOutliner.Clear();
         // 3x casting auf nonconst
         ((SdrMeasureObj*)this)->aTextSize=aSiz;
-        ((SdrMeasureObj*)this)->bTextSizeDirty=FALSE;
-        ((SdrMeasureObj*)this)->bTextDirty=FALSE;
+        ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False;
+        ((SdrMeasureObj*)this)->bTextDirty=sal_False;
     }
 }
 
@@ -978,7 +978,7 @@ bool SdrMeasureObj::BegCreate(SdrDragStat& rStat)
     aPt1=rStat.GetStart();
     aPt2=rStat.GetNow();
     SetTextDirty();
-    return TRUE;
+    return sal_True;
 }
 
 bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
@@ -992,8 +992,8 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
     }
     SetTextDirty();
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -1159,7 +1159,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo)
     SetTextDirty();
 }
 
-SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // get XOR Poly as base
     XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
@@ -1175,8 +1175,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     // prepare parameters
     basegfx::B2DPolyPolygon aPolyPoly;
     SdrPathObj* pPath;
-    UINT16 nCount(aTmpPolyPolygon.Count());
-    UINT16 nLoopStart(0);
+    sal_uInt16 nCount(aTmpPolyPolygon.Count());
+    sal_uInt16 nLoopStart(0);
 
     if(nCount == 3)
     {
@@ -1197,8 +1197,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     {
         // four lines, middle line with gap, so there are two lines used
         // which have one arrow each
-        //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
-        INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+        sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
         aSet.Put(XLineEndWidthItem(0L));
 
         aPolyPoly.clear();
@@ -1228,8 +1228,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
     else if(nCount == 5)
     {
         // five lines, first two are the outer ones
-        //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
-        INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+        //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+        sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
 
         aSet.Put(XLineEndWidthItem(0L));
 
@@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
 }
 
 void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
-    Rectangle* pAnchorRect, BOOL bLineWidth ) const
+    Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
 {
     if (bTextDirty) UndirtyText();
     SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1318,7 +1318,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle
     SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin);
 }
 
-USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
 {
     if (bTextDirty) UndirtyText();
     ImpMeasureRec aRec;
@@ -1331,7 +1331,6 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
     SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos;
     SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
     bool bTextRota90=aRec.bTextRota90;
-    //bool bTextUpsideDown=aRec.bTextUpsideDown;
     bool bBelowRefEdge=aRec.bBelowRefEdge;
 
     // bTextUpsideDown muss hier noch ausgewertet werden!!!!
@@ -1370,7 +1369,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
         else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER;
         else eRet=ANCHOR_VCENTER_HCENTER;
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index a7f3e5bff9..c5f61c9d62 100644..100755
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -32,8 +32,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdomedia.hxx>
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
@@ -104,9 +104,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
 
 // ------------------------------------------------------------------------------
 
-UINT16 SdrMediaObj::GetObjIdentifier() const
+sal_uInt16 SdrMediaObj::GetObjIdentifier() const
 {
-    return UINT16( OBJ_MEDIA );
+    return sal_uInt16( OBJ_MEDIA );
 }
 
 // ------------------------------------------------------------------------------
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index db5f5eb65a..f744a0131c 100644..100755
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -78,8 +78,8 @@
 
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
@@ -394,7 +394,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
         xParentFrame->setActiveFrame( xOwnFrame );
 
     OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
-    const ULONG nCount = rObjCache.Count();
+    const sal_uIntPtr nCount = rObjCache.Count();
     for(sal_Int32 i = nCount-1 ; i >= 0;--i)
     {
         SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i));
@@ -624,7 +624,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
     ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
     pObj(pObject)
 {
-    SetSynchron( FALSE );
+    SetSynchron( sal_False );
 }
 
 // -----------------------------------------------------------------------------
@@ -754,7 +754,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false)
 ,m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
     bFrame=bFrame_;
 }
@@ -766,13 +766,13 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_)
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -787,14 +787,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     mpImpl->aPersistName = rNewObjName;
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -810,14 +810,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef&  rNewObjRef, const XubStri
     , m_bChart(false)
 {
     DBG_CTOR( SdrOle2Obj,NULL);
-    bInDestruction = FALSE;
+    bInDestruction = sal_False;
     Init();
 
     mpImpl->aPersistName = rNewObjName;
     bFrame=bFrame_;
 
     if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-        SetResizeProtect(TRUE);
+        SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
     if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -834,7 +834,7 @@ void SdrOle2Obj::Init()
     mpImpl->pGraphicObject=NULL;
     mpImpl->pLightClient = 0;
 
-    xObjRef.Lock( TRUE );
+    xObjRef.Lock( sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -842,7 +842,7 @@ void SdrOle2Obj::Init()
 SdrOle2Obj::~SdrOle2Obj()
 {
     DBG_DTOR( SdrOle2Obj,NULL);
-    bInDestruction = TRUE;
+    bInDestruction = sal_True;
 
     if ( mpImpl->mbConnected )
         Disconnect();
@@ -1121,7 +1121,7 @@ void SdrOle2Obj::Connect_Impl()
                 {
                     xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName );
                     mpImpl->mbConnected = true;
-                    xObjRef.Lock( TRUE );
+                    xObjRef.Lock( sal_True );
                 }
             }
 
@@ -1172,7 +1172,7 @@ void SdrOle2Obj::Connect_Impl()
             pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
         {
             // Kein RefDevice oder RefDevice kein Printer
-            BOOL bModified = (*ppObjRef)->IsModified();
+            sal_Bool bModified = (*ppObjRef)->IsModified();
             Printer* pPrinter = (Printer*) pModel->GetRefDevice();
             (*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
             (*ppObjRef)->SetModified( bModified );
@@ -1440,7 +1440,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
     // MBA: the caller of the method is responsible to control the old object, it will not be closed here
     // Otherwise WW8 import crashes because it tranfers control to OLENode by this method
     if ( xObjRef.GetObject().is() )
-        xObjRef.Lock( FALSE );
+        xObjRef.Lock( sal_False );
 
     // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
     // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
@@ -1457,7 +1457,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
         DELETEZ( pGraphic );
 
         if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
-            SetResizeProtect(TRUE);
+            SetResizeProtect(sal_True);
 
         // #108759# For math objects, set closed state to transparent
         if( ImplIsMathObj( rNewObjRef ) )
@@ -1550,28 +1550,28 @@ String SdrOle2Obj::GetPersistName() const
 
 void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-UINT16 SdrOle2Obj::GetObjIdentifier() const
+sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
 {
-    return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2);
+    return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
 }
 
 // -----------------------------------------------------------------------------
@@ -1973,23 +1973,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrOle2Obj::Unload()
+sal_Bool SdrOle2Obj::Unload()
 {
-    BOOL bUnloaded = FALSE;
+    sal_Bool bUnloaded = sal_False;
 
     if( xObjRef.is() )
     {
         //TODO/LATER: no refcounting tricks anymore!
         //"customers" must register as state change listeners
         //Nicht notwendig im Doc DTor (MM)
-        //ULONG nRefCount = (*ppObjRef)->GetRefCount();
+        //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
         // prevent Unload if there are external references
         //if( nRefCount > 2 )
-        //    return FALSE;
+        //    return sal_False;
         //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
     }
     else
-        bUnloaded = TRUE;
+        bUnloaded = sal_True;
 
     if ( pModel && xObjRef.is() )
     {
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 81ffba500f..06ae40cae9 100644..100755
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -30,8 +30,8 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdopage.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
@@ -145,27 +145,27 @@ void SdrPageObj::SetBoundRectDirty()
     // not re-creatable view data
 }
 
-UINT16 SdrPageObj::GetObjIdentifier() const
+sal_uInt16 SdrPageObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_PAGE);
+    return sal_uInt16(OBJ_PAGE);
 }
 
 void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bNoOrthoDesired   =FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bNoOrthoDesired   =sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
 }
 
 void SdrPageObj::operator=(const SdrObject& rObj)
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index a4edebba4f..f070780ece 100644..100755
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -42,8 +42,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>  // fuer MovCreate bei Freihandlinien
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 
 #ifdef _MSC_VER
 #pragma optimize ("",off)
@@ -81,7 +81,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
 
 using namespace sdr;
 
-inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
+inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed)
 {
     if (nPnt>0) {
         nPnt--;
@@ -92,7 +92,7 @@ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
     return nPnt;
 }
 
-inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
+inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed)
 {
     nPnt++;
     if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0;
@@ -104,43 +104,43 @@ struct ImpSdrPathDragData  : public SdrDragStatUserData
     XPolygon					aXP;            // Ausschnitt aud dem Originalpolygon
     bool                        bValid;         // FALSE = zu wenig Punkte
     bool                        bClosed;        // geschlossenes Objekt?
-    USHORT						nPoly;          // Nummer des Polygons im PolyPolygon
-    USHORT						nPnt;           // Punktnummer innerhalb des obigen Polygons
-    USHORT						nPntAnz;        // Punktanzahl des Polygons
-    USHORT						nPntMax;        // Maximaler Index
+    sal_uInt16						nPoly;          // Nummer des Polygons im PolyPolygon
+    sal_uInt16						nPnt;           // Punktnummer innerhalb des obigen Polygons
+    sal_uInt16						nPntAnz;        // Punktanzahl des Polygons
+    sal_uInt16						nPntMax;        // Maximaler Index
     bool                        bBegPnt;        // Gedraggter Punkt ist der Anfangspunkt einer Polyline
     bool                        bEndPnt;        // Gedraggter Punkt ist der Endpunkt einer Polyline
-    USHORT						nPrevPnt;       // Index des vorherigen Punkts
-    USHORT						nNextPnt;       // Index des naechsten Punkts
+    sal_uInt16						nPrevPnt;       // Index des vorherigen Punkts
+    sal_uInt16						nNextPnt;       // Index des naechsten Punkts
     bool                        bPrevIsBegPnt;  // Vorheriger Punkt ist Anfangspunkt einer Polyline
     bool                        bNextIsEndPnt;  // Folgepunkt ist Endpunkt einer Polyline
-    USHORT						nPrevPrevPnt;   // Index des vorvorherigen Punkts
-    USHORT						nNextNextPnt;   // Index des uebernaechsten Punkts
+    sal_uInt16						nPrevPrevPnt;   // Index des vorvorherigen Punkts
+    sal_uInt16						nNextNextPnt;   // Index des uebernaechsten Punkts
     bool                        bControl;       // Punkt ist ein Kontrollpunkt
     bool                        bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
     bool                        bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
     bool                        bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
     bool                        bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
-    USHORT						nPrevPrevPnt0;
-    USHORT						nPrevPnt0;
-    USHORT						nPnt0;
-    USHORT						nNextPnt0;
-    USHORT						nNextNextPnt0;
+    sal_uInt16						nPrevPrevPnt0;
+    sal_uInt16						nPrevPnt0;
+    sal_uInt16						nPnt0;
+    sal_uInt16						nNextPnt0;
+    sal_uInt16						nNextNextPnt0;
     bool                        bEliminate;     // Punkt loeschen? (wird von MovDrag gesetzt)
 
     // ##
-    BOOL						mbMultiPointDrag;
+    sal_Bool						mbMultiPointDrag;
     const XPolyPolygon			maOrig;
     XPolyPolygon				maMove;
     Container					maHandles;
 
 public:
-    ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag);
+    ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag);
     void ResetPoly(const SdrPathObj& rPO);
-    BOOL IsMultiPointDrag() const { return mbMultiPointDrag; }
+    sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; }
 };
 
-ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag)
+ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag)
 :	aXP(5),
     mbMultiPointDrag(bMuPoDr),
     maOrig(rPO.GetPathPoly()),
@@ -164,11 +164,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         }
 
         maMove = maOrig;
-        bValid = TRUE;
+        bValid = sal_True;
     }
     else
     {
-        bValid=FALSE;
+        bValid=sal_False;
         bClosed=rPO.IsClosed();          // geschlossenes Objekt?
         nPoly=(sal_uInt16)rHdl.GetPolyNum();            // Nummer des Polygons im PolyPolygon
         nPnt=(sal_uInt16)rHdl.GetPointNum();            // Punktnummer innerhalb des obigen Polygons
@@ -193,10 +193,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed);
         if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed);
         bControl=rHdl.IsPlusHdl();          // Punkt ist ein Kontrollpunkt
-        bIsPrevControl=FALSE;               // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
-        bIsNextControl=FALSE;               // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
-        bPrevIsControl=FALSE;               // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
-        bNextIsControl=FALSE;               // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+        bIsPrevControl=sal_False;               // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+        bIsNextControl=sal_False;               // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+        bPrevIsControl=sal_False;               // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+        bNextIsControl=sal_False;               // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
         if (bControl) {
             bIsPrevControl=aTmpXP.IsControl(nPrevPnt);
             bIsNextControl=!bIsPrevControl;
@@ -214,9 +214,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
         nPnt=2;
         nNextPnt=3;
         nNextNextPnt=4;
-        bEliminate=FALSE;
+        bEliminate=sal_False;
         ResetPoly(rPO);
-        bValid=TRUE;
+        bValid=sal_True;
     }
 }
 
@@ -259,21 +259,20 @@ struct ImpPathCreateUser  : public SdrDragStatUserData
     bool                    bLine90;
     bool                    bRect;
     bool                    bMixedCreate;
-    USHORT					nBezierStartPoint;
+    sal_uInt16					nBezierStartPoint;
     SdrObjKind				eStartKind;
     SdrObjKind				eAktKind;
 
 public:
     ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0),
-        bBezier(FALSE),bBezHasCtrl0(FALSE),bCurve(FALSE),bCircle(FALSE),bAngleSnap(FALSE),bLine(FALSE),bLine90(FALSE),bRect(FALSE),
-        bMixedCreate(FALSE),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
+        bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False),
+        bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
 
-    void ResetFormFlags() { bBezier=FALSE; bCurve=FALSE; bCircle=FALSE; bLine=FALSE; bRect=FALSE; }
+    void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; }
     bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
     XPolygon GetFormPoly() const;
     bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown);
     XPolygon GetBezierPoly() const;
-    //bool CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return FALSE; }
     XPolygon GetCurvePoly() const { return XPolygon(); }
     bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
     XPolygon GetCirclePoly() const;
@@ -362,7 +361,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi
         }
     }
     nCircRadius=nRad;
-    if (nRad==0 || Abs(nCircRelWink)<5) bRet=FALSE;
+    if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False;
     bCircle=bRet;
     return bRet;
 }
@@ -371,17 +370,17 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const
 {
     if (nCircRelWink>=0) {
         XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
-                     USHORT((nCircStWink+5)/10),USHORT((nCircStWink+nCircRelWink+5)/10),FALSE);
+                     sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False);
         aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH);
         if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd;
         return aXP;
     } else {
         XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
-                     USHORT(NormAngle360(nCircStWink+nCircRelWink+5)/10),USHORT((nCircStWink+5)/10),FALSE);
-        USHORT nAnz=aXP.GetPointCount();
-        for (USHORT nNum=nAnz/2; nNum>0;) {
+                     sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False);
+        sal_uInt16 nAnz=aXP.GetPointCount();
+        for (sal_uInt16 nNum=nAnz/2; nNum>0;) {
             nNum--; // XPoly Punktreihenfolge umkehren
-            USHORT n2=nAnz-nNum-1;
+            sal_uInt16 n2=nAnz-nNum-1;
             Point aPt(aXP[nNum]);
             aXP[nNum]=aXP[n2];
             aXP[n2]=aPt;
@@ -418,8 +417,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point
 {
     aLineStart=rP1;
     aLineEnd=rP2;
-    bLine90=FALSE;
-    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=FALSE; return FALSE; }
+    bLine90=sal_False;
+    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; }
     Point aTmpPt(rP2-rP1);
     long nDirX=rDir.X();
     long nDirY=rDir.Y();
@@ -432,8 +431,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point
     } else {          // rechtwinkliger Uebergang
         aLineEnd+=aP2;
     }
-    bLine=TRUE;
-    return TRUE;
+    bLine=sal_True;
+    return sal_True;
 }
 
 XPolygon ImpPathCreateUser::GetLinePoly() const
@@ -449,7 +448,7 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
     aRectP1=rP1;
     aRectP2=rP1;
     aRectP3=rP2;
-    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=FALSE; return FALSE; }
+    if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; }
     Point aTmpPt(rP2-rP1);
     long nDirX=rDir.X();
     long nDirY=rDir.Y();
@@ -493,8 +492,8 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
             aRectP3.Y()+=ytemp;
         }
     }
-    bRect=TRUE;
-    return TRUE;
+    bRect=sal_True;
+    return sal_True;
 }
 
 XPolygon ImpPathCreateUser::GetRectPoly() const
@@ -569,12 +568,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag )  const
 {
     const SdrHdl* pHdl=rDrag.GetHdl();
     if(!pHdl) 
-        return FALSE;
+        return sal_False;
 
-    BOOL bMultiPointDrag(TRUE);
+    sal_Bool bMultiPointDrag(sal_True);
 
     if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum()))
-        bMultiPointDrag = FALSE;
+        bMultiPointDrag = sal_False;
 
     if(bMultiPointDrag)
     {
@@ -595,7 +594,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag )  const
         }
 
         if(nSelectedPoints <= 1)
-            bMultiPointDrag = FALSE;
+            bMultiPointDrag = sal_False;
     }
 
     ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag);
@@ -633,7 +632,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex];
                 XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex];
                 const sal_uInt16 nPointCount(rOrig.GetPointCount());
-                BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]);
+                sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]);
 
                 // move point itself
                 rMove[nPointIndex] = rOrig[nPointIndex] + aDelta;
@@ -671,17 +670,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
         bool bClosed           =mpSdrPathDragData->bClosed       ; // geschlossenes Objekt?
-        USHORT   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des obigen Polygons
+        sal_uInt16   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des obigen Polygons
         bool bBegPnt           =mpSdrPathDragData->bBegPnt       ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
         bool bEndPnt           =mpSdrPathDragData->bEndPnt       ; // Gedraggter Punkt ist der Endpunkt einer Polyline
-        USHORT   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
-        USHORT   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
+        sal_uInt16   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
+        sal_uInt16   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
         bool bPrevIsBegPnt     =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
         bool bNextIsEndPnt     =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
-        USHORT   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
-        USHORT   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
+        sal_uInt16   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
+        sal_uInt16   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
         bool bControl          =mpSdrPathDragData->bControl      ; // Punkt ist ein Kontrollpunkt
-        //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
         bool bIsNextControl    =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
         bool bPrevIsControl    =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
         bool bNextIsControl    =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
@@ -691,7 +689,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
             bool bBigOrtho=rDrag.GetView()->IsBigOrtho();
             Point  aPos(rDrag.GetNow());      // die aktuelle Position
             Point  aPnt(mpSdrPathDragData->aXP[nPnt]);      // der gedraggte Punkt
-            USHORT nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
+            sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
             Point  aNeuPos1,aNeuPos2;         // die neuen Alternativen fuer aPos
             bool bPnt1 = false, bPnt2 = false; // die neuen Alternativen gueltig?
             if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien
@@ -711,7 +709,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 if (!bHLin || !bVLin) {
                     long ndx=aPos.X()-aPnt1.X();
                     long ndy=aPos.Y()-aPnt1.Y();
-                    bPnt1=TRUE;
+                    bPnt1=sal_True;
                     double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
                     double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
                     bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -732,7 +730,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 if (!bHLin || !bVLin) {
                     long ndx=aPos.X()-aPnt2.X();
                     long ndy=aPos.Y()-aPnt2.Y();
-                    bPnt2=TRUE;
+                    bPnt2=sal_True;
                     double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
                     double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
                     bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -752,7 +750,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
                 nX1+=nY1; // Korrekturabstand zum Quadrat
                 nX2+=nY2; // Korrekturabstand zum Quadrat
                 // Die Alternative mit dem geringeren Korrekturbedarf gewinnt
-                if (nX1<nX2) bPnt2=FALSE; else bPnt1=FALSE;
+                if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False;
             }
             if (bPnt1) rDrag.Now()=aNeuPos1;
             if (bPnt2) rDrag.Now()=aNeuPos2;
@@ -801,8 +799,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
 
         // Nun symmetrische PlusHandles etc. checken
         if (bControl) { // Faelle 5,6,7,8
-            USHORT   nSt=nPnt;   // der zugehoerige Stuetzpunkt
-            USHORT   nFix=nPnt;  // der gegenueberliegende Kontrollpunkt
+            sal_uInt16   nSt=nPnt;   // der zugehoerige Stuetzpunkt
+            sal_uInt16   nFix=nPnt;  // der gegenueberliegende Kontrollpunkt
             if (bIsNextControl) { // Wenn der naechste ein Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein
                 nSt=nPrevPnt;
                 nFix=nPrevPrevPnt;
@@ -977,26 +975,26 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
             mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr); 
             aStr += aMetr;
             aStr.AppendAscii(" r="); 
-            mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, TRUE); 
+            mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True); 
             aStr += aMetr;
         }
 
         aStr.AppendAscii("dx=");  
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, TRUE); 
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True); 
         aStr += aMetr;
 
         aStr.AppendAscii(" dy="); 
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, TRUE); 
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True); 
         aStr += aMetr;
         
         if(!IsFreeHand(meObjectKind)) 
         {
-            INT32 nLen(GetLen(aNow));
+            sal_Int32 nLen(GetLen(aNow));
             aStr.AppendAscii("  l="); 
-            mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); 
+            mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); 
             aStr += aMetr;
 
-            INT32 nWink(GetAngle(aNow));
+            sal_Int32 nWink(GetAngle(aNow));
             aStr += sal_Unicode(' '); 
             mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); 
             aStr += aMetr;
@@ -1043,27 +1041,27 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
         }
 
         // dx=0.00 dy=0.00                // Beide Seiten Bezier
-        // dx=0.00 dy=0.00  l=0.00 0.00ø  // Anfang oder Ende oder eine Seite Bezier bzw. Hebel
-        // dx=0.00 dy=0.00  l=0.00 0.00ø / l=0.00 0.00ø   // Mittendrin
+        // dx=0.00 dy=0.00  l=0.00 0.00�  // Anfang oder Ende oder eine Seite Bezier bzw. Hebel
+        // dx=0.00 dy=0.00  l=0.00 0.00� / l=0.00 0.00�   // Mittendrin
         XubString aMetr;
         Point aBeg(rDrag.GetStart());
         Point aNow(rDrag.GetNow());
 
         aStr = String();
         aStr.AppendAscii("dx=");   
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, TRUE); 
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True); 
         aStr += aMetr;
 
         aStr.AppendAscii(" dy="); 
-        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, TRUE); 
+        mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True); 
         aStr += aMetr;
 
         if(!pDragData->IsMultiPointDrag())
         {
-            UINT16 nPntNum((sal_uInt16)pHdl->GetPointNum());
+            sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum());
             const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
-            UINT16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
-            BOOL bClose(IsClosed(meObjectKind));
+            sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
+            sal_Bool bClose(IsClosed(meObjectKind));
             
             if(bClose) 
                 nPntAnz--;
@@ -1071,7 +1069,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
             if(pHdl->IsPlusHdl()) 
             { 
                 // Hebel
-                UINT16 nRef(nPntNum);
+                sal_uInt16 nRef(nPntNum);
                 
                 if(rXPoly.IsControl(nPntNum + 1)) 
                     nRef--; 
@@ -1080,31 +1078,31 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
 
                 aNow -= rXPoly[nRef];
                 
-                INT32 nLen(GetLen(aNow));
+                sal_Int32 nLen(GetLen(aNow));
                 aStr.AppendAscii("  l="); 
-                mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); 
+                mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); 
                 aStr += aMetr;
                 
-                INT32 nWink(GetAngle(aNow));
+                sal_Int32 nWink(GetAngle(aNow));
                 aStr += sal_Unicode(' ');
                 mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); 
                 aStr += aMetr;
             } 
             else if(nPntAnz > 1) 
             {
-                UINT16 nPntMax(nPntAnz - 1);
+                sal_uInt16 nPntMax(nPntAnz - 1);
                 Point aPt1,aPt2;
-                BOOL bIsClosed(IsClosed(meObjectKind));
-                BOOL bPt1(nPntNum > 0);
-                BOOL bPt2(nPntNum < nPntMax);
+                sal_Bool bIsClosed(IsClosed(meObjectKind));
+                sal_Bool bPt1(nPntNum > 0);
+                sal_Bool bPt2(nPntNum < nPntMax);
                 
                 if(bIsClosed && nPntAnz > 2) 
                 {
-                    bPt1 = TRUE;
-                    bPt2 = TRUE;
+                    bPt1 = sal_True;
+                    bPt2 = sal_True;
                 }
 
-                UINT16 nPt1,nPt2;
+                sal_uInt16 nPt1,nPt2;
 
                 if(nPntNum > 0) 
                     nPt1 = nPntNum - 1; 
@@ -1117,22 +1115,22 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
                     nPt2 = 0;
 
                 if(bPt1 && rXPoly.IsControl(nPt1)) 
-                    bPt1 = FALSE; // Keine Anzeige
+                    bPt1 = sal_False; // Keine Anzeige
 
                 if(bPt2 && rXPoly.IsControl(nPt2)) 
-                    bPt2 = FALSE; // von Bezierdaten
+                    bPt2 = sal_False; // von Bezierdaten
 
                 if(bPt1) 
                 {
                     Point aPt(aNow);
                     aPt -= rXPoly[nPt1];
                     
-                    INT32 nLen(GetLen(aPt));
+                    sal_Int32 nLen(GetLen(aPt));
                     aStr.AppendAscii("  l="); 
-                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); 
+                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); 
                     aStr += aMetr;
                     
-                    INT32 nWink(GetAngle(aPt));
+                    sal_Int32 nWink(GetAngle(aPt));
                     aStr += sal_Unicode(' '); 
                     mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); 
                     aStr += aMetr;
@@ -1148,12 +1146,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
                     Point aPt(aNow);
                     aPt -= rXPoly[nPt2];
                     
-                    INT32 nLen(GetLen(aPt));
+                    sal_Int32 nLen(GetLen(aPt));
                     aStr.AppendAscii("l="); 
-                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); 
+                    mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); 
                     aStr += aMetr;
                     
-                    INT32 nWink(GetAngle(aPt));
+                    sal_Int32 nWink(GetAngle(aPt));
                     aStr += sal_Unicode(' '); 
                     mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); 
                     aStr += aMetr;
@@ -1190,18 +1188,17 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
         }
         // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
         bool bClosed           =mpSdrPathDragData->bClosed       ; // geschlossenes Objekt?
-        USHORT   nPntAnz       =mpSdrPathDragData->nPntAnz       ; // Punktanzahl
-        USHORT   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des Polygons
+        sal_uInt16   nPntAnz       =mpSdrPathDragData->nPntAnz       ; // Punktanzahl
+        sal_uInt16   nPnt          =mpSdrPathDragData->nPnt          ; // Punktnummer innerhalb des Polygons
         bool bBegPnt           =mpSdrPathDragData->bBegPnt       ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
         bool bEndPnt           =mpSdrPathDragData->bEndPnt       ; // Gedraggter Punkt ist der Endpunkt einer Polyline
-        USHORT   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
-        USHORT   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
+        sal_uInt16   nPrevPnt      =mpSdrPathDragData->nPrevPnt      ; // Index des vorherigen Punkts
+        sal_uInt16   nNextPnt      =mpSdrPathDragData->nNextPnt      ; // Index des naechsten Punkts
         bool bPrevIsBegPnt     =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
         bool bNextIsEndPnt     =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
-        USHORT   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
-        USHORT   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
+        sal_uInt16   nPrevPrevPnt  =mpSdrPathDragData->nPrevPrevPnt  ; // Index des vorvorherigen Punkts
+        sal_uInt16   nNextNextPnt  =mpSdrPathDragData->nNextNextPnt  ; // Index des uebernaechsten Punkts
         bool bControl          =mpSdrPathDragData->bControl      ; // Punkt ist ein Kontrollpunkt
-        //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
         bool bIsNextControl    =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
         bool bPrevIsControl    =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
         bool bNextIsControl    =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
@@ -1265,7 +1262,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
             }
             if (bClosed) { // "Birnenproblem": 2 Linien, 1 Kurve, alles Smooth, Punkt zw. beiden Linien wird gedraggt
                 if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) {
-                    USHORT a=aXPoly.GetPointCount();
+                    sal_uInt16 a=aXPoly.GetPointCount();
                     aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2));
                     aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3));
                     aXPoly.Remove(0,3);
@@ -1288,7 +1285,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
     rStat.SetNoSnap(bFreeHand);
     rStat.SetOrtho8Possible();
     aPathPolygon.Clear();
-    mbCreating=TRUE;
+    mbCreating=sal_True;
     bool bMakeStartPoint = true;
     SdrView* pView=rStat.GetView();
     if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() &&
@@ -1314,8 +1311,8 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
     XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
     if (pView!=NULL && pView->IsCreateMode()) {
         // ggf. auf anderes CreateTool umschalten
-        UINT16 nIdent;
-        UINT32 nInvent;
+        sal_uInt16 nIdent;
+        sal_uInt32 nInvent;
         pView->TakeCurrentObj(nIdent,nInvent);
         if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) {
             SdrObjKind eNewKind=(SdrObjKind)nIdent;
@@ -1327,7 +1324,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
                 case OBJ_FREELINE: case OBJ_FREEFILL:
                 case OBJ_SPLNLINE: case OBJ_SPLNFILL: {
                     pU->eAktKind=eNewKind;
-                    pU->bMixedCreate=TRUE;
+                    pU->bMixedCreate=sal_True;
                     pU->nBezierStartPoint=rXPoly.GetPointCount();
                     if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--;
                 } break;
@@ -1335,7 +1332,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
             } // switch
         }
     }
-    USHORT nActPoint=rXPoly.GetPointCount();
+    sal_uInt16 nActPoint=rXPoly.GetPointCount();
     if (aPathPolygon.Count()>1 && rStat.IsMouseDown() && nActPoint<2) {
         rXPoly[0]=rStat.GetPos0();
         rXPoly[1]=rStat.GetNow();
@@ -1371,7 +1368,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
             Point aPt1(rStat.Now());
             long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx;
             long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy;
-            if (dx<nMinDist && dy<nMinDist) return FALSE;
+            if (dx<nMinDist && dy<nMinDist) return sal_False;
 
             // folgendes ist aus EndCreate kopiert (nur kleine Modifikationen)
             // und sollte dann mal in eine Methode zusammengefasst werden:
@@ -1421,7 +1418,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     SdrView* pView=rStat.GetView();
     bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface();
     XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
-    USHORT nActPoint=rXPoly.GetPointCount()-1;
+    sal_uInt16 nActPoint=rXPoly.GetPointCount()-1;
     Point aAktMerk(rXPoly[nActPoint]);
     rXPoly[nActPoint]=rStat.Now();
     if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) {
@@ -1439,7 +1436,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
         if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
         bRet=eCmd==SDRCREATE_FORCEEND;
         if (bRet) {
-            mbCreating=FALSE;
+            mbCreating=sal_False;
             delete pU;
             rStat.SetUser(NULL);
         }
@@ -1463,15 +1460,15 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
             } else {
                 if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) {
                     pU->aBezControl0=rStat.GetNow();;
-                    pU->bBezHasCtrl0=TRUE;
+                    pU->bBezHasCtrl0=sal_True;
                     nActPoint--;
                 }
                 if (pU->IsFormFlag()) {
-                    USHORT nPtAnz0=rXPoly.GetPointCount();
+                    sal_uInt16 nPtAnz0=rXPoly.GetPointCount();
                     rXPoly.Remove(nActPoint-1,2); // die letzten beiden Punkte entfernen und durch die Form ersetzen
                     rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly());
-                    USHORT nPtAnz1=rXPoly.GetPointCount();
-                    for (USHORT i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
+                    sal_uInt16 nPtAnz1=rXPoly.GetPointCount();
+                    for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
                         if (!rXPoly.IsControl(i)) rStat.NextPoint();
                     }
                     nActPoint=rXPoly.GetPointCount()-1;
@@ -1482,7 +1479,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
         }
         if (eCmd==SDRCREATE_NEXTOBJECT) {
             if (rXPoly.GetPointCount()>=2) {
-                pU->bBezHasCtrl0=FALSE;
+                pU->bBezHasCtrl0=sal_False;
                 // nur einzelnes Polygon kann offen sein, deshalb schliessen
                 rXPoly[nActPoint]=rXPoly[0];
                 XPolygon aXP;
@@ -1492,12 +1489,12 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
         }
     }
 
-    USHORT nPolyAnz=aPathPolygon.Count();
+    sal_uInt16 nPolyAnz=aPathPolygon.Count();
     if (nPolyAnz!=0) {
         // den letzten Punkt ggf. wieder loeschen
         if (eCmd==SDRCREATE_FORCEEND) {
             XPolygon& rXP=aPathPolygon[nPolyAnz-1];
-            USHORT nPtAnz=rXP.GetPointCount();
+            sal_uInt16 nPtAnz=rXP.GetPointCount();
             if (nPtAnz>=2) {
                 if (!rXP.IsControl(nPtAnz-2)) {
                     if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) {
@@ -1510,10 +1507,10 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
                 }
             }
         }
-        for (USHORT nPolyNum=nPolyAnz; nPolyNum>0;) {
+        for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) {
             nPolyNum--;
             XPolygon& rXP=aPathPolygon[nPolyNum];
-            USHORT nPtAnz=rXP.GetPointCount();
+            sal_uInt16 nPtAnz=rXP.GetPointCount();
             // Polygone mit zu wenig Punkten werden geloescht
             if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) {
                 if (nPtAnz<2) aPathPolygon.Remove(nPolyNum);
@@ -1523,7 +1520,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     pU->ResetFormFlags();
     bRet=eCmd==SDRCREATE_FORCEEND;
     if (bRet) {
-        mbCreating=FALSE;
+        mbCreating=sal_False;
         delete pU;
         rStat.SetUser(NULL);
     }
@@ -1535,7 +1532,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
     ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
     if (aPathPolygon.Count()>0) {
         XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
-        USHORT nActPoint=rXPoly.GetPointCount();
+        sal_uInt16 nActPoint=rXPoly.GetPointCount();
         if (nActPoint>0) {
             nActPoint--;
             // Das letzte Stueck einer Bezierkurve wird erstmal zu 'ner Linie
@@ -1559,7 +1556,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
         }
         if (aPathPolygon.Count()>0) {
             XPolygon& rLocalXPoly=aPathPolygon[aPathPolygon.Count()-1];
-            USHORT nLocalActPoint=rLocalXPoly.GetPointCount();
+            sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount();
             if (nLocalActPoint>0) {
                 nLocalActPoint--;
                 rLocalXPoly[nLocalActPoint]=rStat.Now();
@@ -1574,7 +1571,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat)
 {
     ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
     aPathPolygon.Clear();
-    mbCreating=FALSE;
+    mbCreating=sal_False;
     delete pU;
     rStat.SetUser(NULL);
 }
@@ -1845,7 +1842,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
             default: break;
         }
         
-        bClosedObj = TRUE;
+        bClosedObj = sal_True;
     } 
     else 
     {
@@ -1858,7 +1855,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
             default: break;
         }
 
-        bClosedObj = FALSE;
+        bClosedObj = sal_False;
     }
 
     ImpForceKind();
@@ -1866,20 +1863,20 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
 
 void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bNoContortion=FALSE;
+    rInfo.bNoContortion=sal_False;
 
     bool bCanConv = !HasText() || ImpCanConvTextToCurve();
     bool bIsPath = IsBezier() || IsSpline();
 
-    rInfo.bEdgeRadiusAllowed	= FALSE;
+    rInfo.bEdgeRadiusAllowed	= sal_False;
     rInfo.bCanConvToPath = bCanConv && !bIsPath;
     rInfo.bCanConvToPoly = bCanConv && bIsPath;
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrPathObj::GetObjIdentifier() const
+sal_uInt16 SdrPathObj::GetObjIdentifier() const
 {
-    return USHORT(meKind);
+    return sal_uInt16(meKind);
 }
 
 void SdrPathObj::operator=(const SdrObject& rObj)
@@ -2061,16 +2058,16 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const
 {
     // keep old stuff to be able to keep old SdrHdl stuff, too
     const XPolyPolygon aOldPathPolygon(GetPathPoly());
-    USHORT nPolyCnt=aOldPathPolygon.Count();
+    sal_uInt16 nPolyCnt=aOldPathPolygon.Count();
     bool bClosed=IsClosed();
-    USHORT nIdx=0;
+    sal_uInt16 nIdx=0;
 
-    for (USHORT i=0; i<nPolyCnt; i++) {
+    for (sal_uInt16 i=0; i<nPolyCnt; i++) {
         const XPolygon& rXPoly=aOldPathPolygon.GetObject(i);
-        USHORT nPntCnt=rXPoly.GetPointCount();
+        sal_uInt16 nPntCnt=rXPoly.GetPointCount();
         if (bClosed && nPntCnt>1) nPntCnt--;
 
-        for (USHORT j=0; j<nPntCnt; j++) {
+        for (sal_uInt16 j=0; j<nPntCnt; j++) {
             if (rXPoly.GetFlags(j)!=XPOLY_CONTROL) {
                 const Point& rPnt=rXPoly[j];
                 SdrHdl* pHdl=new SdrHdl(rPnt,HDL_POLY);
@@ -2154,7 +2151,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const
                 }
 
                 pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
-                pHdl->SetPlusHdl(TRUE);
+                pHdl->SetPlusHdl(sal_True);
             }
         }
     }
@@ -2480,7 +2477,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
     sal_uInt32 nPoly,nPnt;
     if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt)) 
     {
-        DBG_ASSERT(FALSE,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
+        DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
     }
 
     const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt));
@@ -2740,7 +2737,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
     return pNewObj;
 }
 
-SdrObject* SdrPathObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     // #i89784# check for FontWork with activated HideContour
     const drawinglayer::attribute::SdrTextAttribute aText(
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index cdce360858..9d320925e6 100644..100755
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -46,8 +46,8 @@
 #include <svx/svdview.hxx> // das
 #include <svx/svdundo.hxx> // Macro-Beispiel
 #include <svx/svdopath.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
@@ -80,14 +80,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj);
 SdrRectObj::SdrRectObj()
 :	mpXPoly(0L)
 {
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(const Rectangle& rRect)
 :	SdrTextObj(rRect),
     mpXPoly(NULL)
 {
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
@@ -97,7 +97,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
@@ -107,17 +107,17 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
-SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 :    SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat),
     mpXPoly(NULL)
 {
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
                "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
-    bClosedObj=TRUE;
+    bClosedObj=sal_True;
 }
 
 SdrRectObj::~SdrRectObj()
@@ -186,22 +186,22 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     bool bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
     rInfo.bMirrorFreeAllowed=bNoTextFrame;
     rInfo.bMirror45Allowed  =bNoTextFrame;
     rInfo.bMirror90Allowed  =bNoTextFrame;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
 
     rInfo.bShearAllowed     =bNoTextFrame;
-    rInfo.bEdgeRadiusAllowed=TRUE;
+    rInfo.bEdgeRadiusAllowed=sal_True;
 
     bool bCanConv=!HasText() || ImpCanConvTextToCurve();
     if (bCanConv && !bNoTextFrame && !HasText()) {
@@ -212,10 +212,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrRectObj::GetObjIdentifier() const
+sal_uInt16 SdrRectObj::GetObjIdentifier() const
 {
-    if (IsTextFrame()) return UINT16(eTextKind);
-    else return UINT16(OBJ_RECT);
+    if (IsTextFrame()) return sal_uInt16(eTextKind);
+    else return sal_uInt16(OBJ_RECT);
 }
 
 void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
@@ -244,7 +244,7 @@ void SdrRectObj::TakeObjNameSingul(XubString& rName) const
     }
     else
     {
-        USHORT nResId=STR_ObjNameSingulRECT;
+        sal_uInt16 nResId=STR_ObjNameSingulRECT;
         if (aGeo.nShearWink!=0) {
             nResId+=4;  // Parallelogramm oder Raute
             // Raute ist nicht, weil Shear die vertikalen Kanten verlaengert!
@@ -270,7 +270,7 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const
 {
     if (IsTextFrame()) SdrTextObj::TakeObjNamePlural(rName);
     else {
-        USHORT nResId=STR_ObjNamePluralRECT;
+        sal_uInt16 nResId=STR_ObjNamePluralRECT;
         if (aGeo.nShearWink!=0) {
             nResId+=4;  // Parallelogramm oder Raute
         } else {
@@ -532,9 +532,9 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
     return SdrTextObj::GetMacroPopupComment(rRec);
 }
 
-SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
     
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -554,13 +554,13 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
 {
-    INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+    sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
     
     // #i25616#
     if(!LineIsOutsideGeometry())
@@ -580,11 +580,11 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
     if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
-    aGP.SetPercent(FALSE);
+    aGP.SetPercent(sal_False);
     return aGP;
 }
 
-SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
     { // #40608# Nur Uebergangsweise bis zum neuen TakeContour()
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 06bb02a233..f3fbe632bb 100644..100755
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -30,15 +30,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdpagv.hxx>  // fuer Abfrage im Paint, ob das
 #include <svx/svdview.hxx>  // Objekt gerade editiert wird
 #include <svx/svdpage.hxx>  // und fuer AnimationHandler (Laufschrift)
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>  // OutlinerDefaults
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
@@ -117,15 +117,15 @@ SdrTextObj::SdrTextObj()
     pFormTextBoundRect(NULL),
     eTextKind(OBJ_TEXT)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=FALSE;
-    bNoShear=FALSE;
-    bNoRotate=FALSE;
-    bNoMirror=FALSE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_False;
+    bNoShear=sal_False;
+    bNoRotate=sal_False;
+    bNoMirror=sal_False;
+    bDisableAutoWidthOnDragging=sal_False;
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -148,16 +148,16 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
     pEdtOutl(NULL),
     pFormTextBoundRect(NULL)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=FALSE;
-    bNoShear=FALSE;
-    bNoRotate=FALSE;
-    bNoMirror=FALSE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_False;
+    bNoShear=sal_False;
+    bNoRotate=sal_False;
+    bNoMirror=sal_False;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -180,15 +180,15 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -212,16 +212,16 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -237,7 +237,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
     mbSupportTextIndentingOnLineWidthChange = sal_True;
 }
 
-SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 :	SdrAttrObj(),
     aRect(rNewRect),
     mpText(NULL),
@@ -245,18 +245,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
     pFormTextBoundRect(NULL),
     eTextKind(eNewTextKind)
 {
-    bTextSizeDirty=FALSE;
-    bTextFrame=TRUE;
-    bNoShear=TRUE;
-    bNoRotate=FALSE;
-    bNoMirror=TRUE;
-    bDisableAutoWidthOnDragging=FALSE;
+    bTextSizeDirty=sal_False;
+    bTextFrame=sal_True;
+    bNoShear=sal_True;
+    bNoRotate=sal_False;
+    bNoMirror=sal_True;
+    bDisableAutoWidthOnDragging=sal_False;
     ImpJustifyRect(aRect);
 
     NbcSetText(rInput, rBaseURL, eFormat);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 
     // #111096#
     mbTextHidden = sal_False;
@@ -300,7 +300,7 @@ void SdrTextObj::FitFrameToTextSize()
     {
         SdrOutliner& rOutliner=ImpGetDrawOutliner();
         rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top()));
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         rOutliner.SetText(*pText->GetOutlinerParaObject());
         Rectangle aTextRect;
         Size aNewSize(rOutliner.CalcTextSize());
@@ -322,7 +322,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
     //OutputDevice* pRef1=rOutliner.GetRefDevice();
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
     OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
     Size aSiz(rOutliner.CalcTextSize());
@@ -330,7 +330,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
     rOutliner.Clear();
     NbcSetOutlinerParaObject(pNewText);
     aTextSize=aSiz;
-    bTextSizeDirty=FALSE;
+    bTextSizeDirty=sal_False;
 }
 
 void SdrTextObj::SetText(const XubString& rStr)
@@ -346,21 +346,21 @@ void SdrTextObj::SetText(const XubString& rStr)
     //}
 }
 
-void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 {
     SdrOutliner& rOutliner=ImpGetDrawOutliner();
     rOutliner.SetStyleSheet( 0, GetStyleSheet());
     rOutliner.Read(rInput,rBaseURL,eFormat);
     OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     Size aSiz(rOutliner.CalcTextSize());
     rOutliner.Clear();
     NbcSetOutlinerParaObject(pNewText);
     aTextSize=aSiz;
-    bTextSizeDirty=FALSE;
+    bTextSizeDirty=sal_False;
 }
 
-void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
 {
     Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
     // #110094#-14 SendRepaintBroadcast();
@@ -380,13 +380,13 @@ const Size& SdrTextObj::GetTextSize() const
         {
             SdrOutliner& rOutliner=ImpGetDrawOutliner();
             rOutliner.SetText(*pText->GetOutlinerParaObject());
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             aSiz=rOutliner.CalcTextSize();
             rOutliner.Clear();
         }
         // 2x casting auf nonconst
         ((SdrTextObj*)this)->aTextSize=aSiz;
-        ((SdrTextObj*)this)->bTextSizeDirty=FALSE;
+        ((SdrTextObj*)this)->bTextSizeDirty=sal_False;
     }
     return aTextSize;
 }
@@ -394,10 +394,10 @@ const Size& SdrTextObj::GetTextSize() const
 bool SdrTextObj::IsAutoGrowHeight() const
 {
     if(!bTextFrame)
-        return FALSE; // AutoGrow nur bei TextFrames
+        return sal_False; // AutoGrow nur bei TextFrames
 
     const SfxItemSet& rSet = GetObjectItemSet();
-    BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+    sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
 
     if(bRet)
     {
@@ -409,7 +409,7 @@ bool SdrTextObj::IsAutoGrowHeight() const
 
             if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN)
             {
-                bRet = FALSE;
+                bRet = sal_False;
             }
         }
     }
@@ -419,13 +419,13 @@ bool SdrTextObj::IsAutoGrowHeight() const
 bool SdrTextObj::IsAutoGrowWidth() const
 {
     if(!bTextFrame)
-        return FALSE; // AutoGrow nur bei TextFrames
+        return sal_False; // AutoGrow nur bei TextFrames
 
     const SfxItemSet& rSet = GetObjectItemSet();
-    BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+    sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
 
     // #101684#
-    BOOL bInEditMOde = IsInEditMode();
+    sal_Bool bInEditMOde = IsInEditMode();
 
     if(!bInEditMOde && bRet)
     {
@@ -437,7 +437,7 @@ bool SdrTextObj::IsAutoGrowWidth() const
 
             if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT)
             {
-                bRet = FALSE;
+                bRet = sal_False;
             }
         }
     }
@@ -457,7 +457,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
     SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
 
     // #101684#
-    BOOL bInEditMode = IsInEditMode();
+    sal_Bool bInEditMode = IsInEditMode();
 
     if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
     {
@@ -489,7 +489,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
 
     // #103516# Take care for vertical text animation here
     SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
-    BOOL bInEditMode = IsInEditMode();
+    sal_Bool bInEditMode = IsInEditMode();
 
     // #103516# Take care for vertical text animation here
     if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
@@ -531,21 +531,21 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
     bool bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=TRUE;
-    rInfo.bRotate90Allowed  =TRUE;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_True;
+    rInfo.bRotate90Allowed  =sal_True;
     rInfo.bMirrorFreeAllowed=bNoTextFrame;
     rInfo.bMirror45Allowed  =bNoTextFrame;
     rInfo.bMirror90Allowed  =bNoTextFrame;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
     rInfo.bShearAllowed     =bNoTextFrame;
-    rInfo.bEdgeRadiusAllowed=TRUE;
+    rInfo.bEdgeRadiusAllowed=sal_True;
     bool bCanConv=ImpCanConvTextToCurve();
     rInfo.bCanConvToPath    =bCanConv;
     rInfo.bCanConvToPoly    =bCanConv;
@@ -554,9 +554,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-UINT16 SdrTextObj::GetObjIdentifier() const
+sal_uInt16 SdrTextObj::GetObjIdentifier() const
 {
-    return USHORT(eTextKind);
+    return sal_uInt16(eTextKind);
 }
 
 bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
@@ -565,7 +565,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
     if(pOutliner)
     {
         Paragraph* p1stPara=pOutliner->GetParagraph( 0 );
-        ULONG nParaAnz=pOutliner->GetParagraphCount();
+        sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount();
         if(p1stPara==NULL)
             nParaAnz=0;
 
@@ -664,8 +664,8 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
         // bDisableAutoHeightOnDragging if vertical.
         if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
-            bDisableAutoWidthOnDragging = FALSE;
-            SetObjectItem(SdrTextAutoGrowHeightItem(FALSE));
+            bDisableAutoWidthOnDragging = sal_False;
+            SetObjectItem(SdrTextAutoGrowHeightItem(sal_False));
         }
 
         return true;
@@ -703,8 +703,8 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
         // when not vertical.
         if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
         {
-            bDisableAutoWidthOnDragging = FALSE;
-            SetObjectItem(SdrTextAutoGrowWidthItem(FALSE));
+            bDisableAutoWidthOnDragging = sal_False;
+            SetObjectItem(SdrTextAutoGrowWidthItem(sal_False));
         }
 
         return true;
@@ -732,7 +732,7 @@ bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
     return false;
 }
 
-void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const
+void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const
 {
     basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly());
     basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L;
@@ -767,7 +767,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
         {
             // #86258# force shadow off
             SdrObject* pCopy = Clone();
-            pCopy->SetMergedItem(SdrShadowItem(FALSE));
+            pCopy->SetMergedItem(SdrShadowItem(sal_False));
             *pContourPolyPolygon = pCopy->TakeContour();
             SdrObject::Free( pCopy );
         }
@@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
 }
 
 void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
-                               Rectangle* pAnchorRect, BOOL bLineWidth ) const
+                               Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
 {
     Rectangle aAnkRect; // Rect innerhalb dem geankert wird
     TakeTextAnchorRect(aAnkRect);
@@ -844,7 +844,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
     bool bContourFrame=IsContourTextFrame();
 
     bool bFrame=IsTextFrame();
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
     if (!bContourFrame)
     {
@@ -863,7 +863,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
             long nHgt=nAnkHgt;
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
             {
@@ -898,7 +898,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
 
     if (pPara)
     {
-        BOOL bHitTest = FALSE;
+        sal_Bool bHitTest = sal_False;
         if( pModel )
             bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
 
@@ -912,7 +912,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
                 rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
             }
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -924,7 +924,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
     if (pEdtOutl && !bNoEditText && pPara)
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     if( pText )
@@ -1004,7 +1004,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
 void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const
 {
     OutputDevice* pOut = rOutliner.GetRefDevice();
-    BOOL bNoStretching(FALSE);
+    sal_Bool bNoStretching(sal_False);
 
     if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
     {
@@ -1016,7 +1016,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
             pMtf = NULL;
 
         if(pMtf)
-            pMtf->Pause(TRUE);
+            pMtf->Pause(sal_True);
 
         Font aFontMerk(pOut->GetFont());
         Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
@@ -1030,7 +1030,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
         pOut->SetFont(aFontMerk);
 
         if(pMtf)
-            pMtf->Pause(FALSE);
+            pMtf->Pause(sal_False);
 
         bNoStretching = (aSize1 == aSize2);
 
@@ -1039,7 +1039,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
         // Und das finden wir nicht so schoen.
         if(aSize2.Height() >= aSize1.Height() * 2)
         {
-            bNoStretching = TRUE;
+            bNoStretching = sal_True;
         }
 #endif
     }
@@ -1062,7 +1062,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
     long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
     bool bChkX = true;
     if (bNoStretching) { // #35762# evtl. nur proportional moeglich
-        if (nX>nY) { nX=nY; bChkX=FALSE; }
+        if (nX>nY) { nX=nY; bChkX=sal_False; }
         else { nY=nX; }
     }
 
@@ -1089,7 +1089,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
             bNoMoreLoop = true;
         }
 
-        rOutliner.SetGlobalCharStretching((USHORT)nX,(USHORT)nY);
+        rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY);
         nLoopCount++;
         Size aSiz(rOutliner.CalcTextSize());
         long nXDiff=aSiz.Width()-nWantWdt;
@@ -1276,7 +1276,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
 
         Rectangle aAnchor2;
         Rectangle aR;
-        TakeTextRect(rOutliner,aR,FALSE,&aAnchor2);
+        TakeTextRect(rOutliner,aR,sal_False,&aAnchor2);
         rOutliner.Clear();
         bool bFitToSize(IsFitToSize());
         if (bFitToSize) aR=aAnchor2;
@@ -1323,7 +1323,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
 
 void SdrTextObj::ImpCheckMasterCachable()
 {
-    bNotMasterCachable=FALSE;
+    bNotMasterCachable=sal_False;
 
     OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
 
@@ -1349,14 +1349,14 @@ void SdrTextObj::ImpCheckMasterCachable()
 // #101029#: Extracted from ImpGetDrawOutliner()
 void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
 {
-    rOutl.SetUpdateMode(FALSE);
-    USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+    rOutl.SetUpdateMode(sal_False);
+    sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
     if ( !IsOutlText() )
         nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
     rOutl.Init( nOutlinerMode );
 
     rOutl.SetGlobalCharStretching(100,100);
-    ULONG nStat=rOutl.GetControlWord();
+    sal_uIntPtr nStat=rOutl.GetControlWord();
     nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
     rOutl.SetControlWord(nStat);
     Size aNullSize;
@@ -1397,13 +1397,13 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool             bContourFrame,
         // FitToSize erstmal nicht mit ContourFrame
         if (IsFitToSize() || IsAutoFit())
         {
-            ULONG nStat=rOutliner.GetControlWord();
+            sal_uIntPtr nStat=rOutliner.GetControlWord();
             nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE;
             rOutliner.SetControlWord(nStat);
         }
     }
     rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
-    TakeTextRect(rOutliner, rTextRect, FALSE, &rAnchorRect);
+    TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect);
     rPaintRect = rTextRect;
 
     if (!bContourFrame)
@@ -1492,8 +1492,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint
 
     bool bContourFrame=IsContourTextFrame();
 
-    ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg );
-
     if( GetModel() )
     {
         MapMode aMapMode(GetModel()->GetScaleUnit(), Point(0,0),
@@ -1501,6 +1499,8 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint
                          GetModel()->GetScaleFraction());
         rOutl.SetRefMapMode(aMapMode);
     }
+
+    ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1640,7 +1640,7 @@ void SdrTextObj::ForceOutlinerParaObject()
     SdrText* pText = getActiveText();
     if( pText && (pText->GetOutlinerParaObject() == 0) )
     {
-        USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+        sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
         if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT )
             nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
 
@@ -1872,7 +1872,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
         GeoStat aGeoStat;
         aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
     }
 
     // rotation?
@@ -2151,20 +2151,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
 // Konzept des TextObjekts:
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 // Attribute/Varianten:
-// - BOOL Textrahmen / beschriftetes Zeichenobjekt
-// - BOOL FontWork                 (wenn nicht Textrahmen und nicht ContourTextFrame)
-// - BOOL ContourTextFrame         (wenn nicht Textrahmen und nicht Fontwork)
+// - sal_Bool Textrahmen / beschriftetes Zeichenobjekt
+// - sal_Bool FontWork                 (wenn nicht Textrahmen und nicht ContourTextFrame)
+// - sal_Bool ContourTextFrame         (wenn nicht Textrahmen und nicht Fontwork)
 // - long Drehwinkel               (wenn nicht FontWork)
 // - long Textrahmenabstaende      (wenn nicht FontWork)
-// - BOOL FitToSize                (wenn nicht FontWork)
-// - BOOL AutoGrowingWidth/Height  (wenn nicht FitToSize und nicht FontWork)
+// - sal_Bool FitToSize                (wenn nicht FontWork)
+// - sal_Bool AutoGrowingWidth/Height  (wenn nicht FitToSize und nicht FontWork)
 // - long Min/MaxFrameWidth/Height (wenn AutoGrowingWidth/Height)
 // - enum Horizontale Textverankerung Links,Mitte,Rechts,Block,Stretch(ni)
 // - enum Vertikale Textverankerung Oben,Mitte,Unten,Block,Stretch(ni)
 // - enum Laufschrift              (wenn nicht FontWork)
 //
-// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=TRUE)
-// oder ein beschriftetes Zeichenobjekt (bTextFrame=FALSE).
+// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=sal_True)
+// oder ein beschriftetes Zeichenobjekt (bTextFrame=sal_False).
 //
 // Defaultverankerung von Textrahmen:
 //   SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP
@@ -2192,8 +2192,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
 // ContourTextFrame:
 // - long Drehwinkel
 // - long Textrahmenabstaende         spaeter vielleicht
-// - BOOL FitToSize                   spaeter vielleicht
-// - BOOL AutoGrowingWidth/Height     viel spaeter vielleicht
+// - sal_Bool FitToSize                   spaeter vielleicht
+// - sal_Bool AutoGrowingWidth/Height     viel spaeter vielleicht
 // - long Min/MaxFrameWidth/Height    viel spaeter vielleicht
 // - enum Horizontale Textverankerung spaeter vielleicht, erstmal Links, Absatz zentr.
 // - enum Vertikale Textverankerung   spaeter vielleicht, erstmal oben
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 60a6903517..621e2591e8 100644..100755
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -54,7 +54,7 @@
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index b419403d0d..4698277e69 100644..100755
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -65,7 +65,7 @@
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <editeng/editstat.hxx>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx>
 
@@ -569,7 +569,7 @@ namespace
                             }
                         }
 
-                        // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here
+                        // consume from portion // no += here, xub_StrLen is sal_uInt16 and the compiler will gererate a warning here
                         nUsedTextLength = nUsedTextLength + nNextGlyphLen;
 
                         // consume from polygon
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 12f47689bd..d4b5945d5b 100644..100755
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -31,7 +31,7 @@
 
 #include <svl/style.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool
 #include <svx/svdoutl.hxx>
 #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight
@@ -122,7 +122,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
             if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if(!bInEditMode)
             {
@@ -143,7 +143,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
             } else {
                 Outliner& rOutliner=ImpGetDrawOutliner();
                 rOutliner.SetPaperSize(aSiz);
-                rOutliner.SetUpdateMode(TRUE);
+                rOutliner.SetUpdateMode(sal_True);
                 // !!! hier sollte ich wohl auch noch mal die Optimierung mit
                 // bPortionInfoChecked usw einbauen
                 OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -172,8 +172,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
             if (nHgt<1) nHgt=1; // nVDist kann auch negativ sein
             long nWdtGrow=nWdt-(rR.Right()-rR.Left());
             long nHgtGrow=nHgt-(rR.Bottom()-rR.Top());
-            if (nWdtGrow==0) bWdtGrow=FALSE;
-            if (nHgtGrow==0) bHgtGrow=FALSE;
+            if (nWdtGrow==0) bWdtGrow=sal_False;
+            if (nHgtGrow==0) bHgtGrow=sal_False;
             if (bWdtGrow || bHgtGrow) {
                 if (bWdtGrow) {
                     SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
@@ -203,11 +203,11 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
                     aD2-=aD1;
                     rR.Move(aD2.X(),aD2.Y());
                 }
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
@@ -262,22 +262,22 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
             XubString aStyleName;
             SfxStyleFamily eStyleFam;
-            USHORT nParaAnz=rTextObj.GetParagraphCount();
+            sal_uInt16 nParaAnz=rTextObj.GetParagraphCount();
 
-            for(UINT16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
+            for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
             {
                 rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
 
                 if(aStyleName.Len())
                 {
-                    XubString aFam = UniString::CreateFromInt32((UINT16)eStyleFam);
+                    XubString aFam = UniString::CreateFromInt32((sal_uInt16)eStyleFam);
                     aFam.Expand(5);
 
                     aStyleName += sal_Unicode('|');
                     aStyleName += aFam;
 
-                    BOOL bFnd(FALSE);
-                    UINT32 nNum(aStyles.Count());
+                    sal_Bool bFnd(sal_False);
+                    sal_uInt32 nNum(aStyles.Count());
 
                     while(!bFnd && nNum > 0)
                     {
@@ -295,7 +295,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
         }
 
         // nun die Strings im Container durch StyleSheet* ersetzten
-        ULONG nNum=aStyles.Count();
+        sal_uIntPtr nNum=aStyles.Count();
         while (nNum>0) {
             nNum--;
             XubString* pName=(XubString*)aStyles.GetObject(nNum);
@@ -306,8 +306,8 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             aFam.Erase(0,1);
             aFam.EraseTrailingChars();
 
-            // UNICODE: USHORT nFam=USHORT(aFam);
-            UINT16 nFam = (UINT16)aFam.ToInt32();
+            // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam);
+            sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32();
 
             SfxStyleFamily eFam=(SfxStyleFamily)nFam;
             SfxStyleSheetBase* pStyleBase=pStylePool->Find(*pName,eFam);
@@ -323,7 +323,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
         nNum=GetBroadcasterCount();
         while (nNum>0) {
             nNum--;
-            SfxBroadcaster* pBroadcast=GetBroadcasterJOE((USHORT)nNum);
+            SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum);
             SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast);
             if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // Sonderbehandlung fuer den StyleSheet des Objekts
                 if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) {
@@ -337,7 +337,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
             nNum--;
             SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum);
             // StartListening soll selbst nachsehen, ob hier nicht evtl. schon gehorcht wird
-            StartListening(*pStyle,TRUE);
+            StartListening(*pStyle,sal_True);
         }
     }
 }
@@ -383,13 +383,13 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction&
             if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF;
 
             // und nun attributieren
-            SetObjectItem(SvxCharScaleWidthItem( (USHORT) nRelWdt, EE_CHAR_FONTWIDTH));
-            SetObjectItem(SvxFontHeightItem(nAbsHgt,(USHORT)nRelHgt, EE_CHAR_FONTHEIGHT));
+            SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH));
+            SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT));
             // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects
             Outliner& rOutliner=ImpGetDrawOutliner();
             rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
             rOutliner.SetText(*pOutlinerParaObject);
-            rOutliner.DoStretchChars((USHORT)nX,(USHORT)nY);
+            rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY);
             OutlinerParaObject* pNewPara=rOutliner.CreateParaObject();
             NbcSetOutlinerParaObject(pNewPara);
             rOutliner.Clear();
@@ -452,7 +452,7 @@ bool SdrTextObj::HasText() const
     if( pOPO )
     {
         const EditTextObject& rETO = pOPO->GetTextObject();
-        USHORT nParaCount = rETO.GetParagraphCount();
+        sal_uInt16 nParaCount = rETO.GetParagraphCount();
 
         if( nParaCount > 0 )
             bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0);
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 76ebf0c19e..05e2bdbf89 100644..100755
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -34,8 +34,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -223,7 +223,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect=aRect1; // fuer ObjName
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
     if (HAS_BASE(SdrRectObj,this)) {
         ((SdrRectObj*)this)->SetXPolyDirty();
     }
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index e679d76bca..b337cb6a36 100644..100755
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize
 #include <svx/svdoutl.hxx>
 #include <editeng/outliner.hxx>
@@ -66,9 +66,9 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     pEdtOutl=&rOutl;
 
     // #101684#
-    mbInEditMode = TRUE;
+    mbInEditMode = sal_True;
 
-    USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+    sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
     if ( !IsOutlText() )
         nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
     rOutl.Init( nOutlinerMode );
@@ -79,7 +79,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     ImpSetTextEditParams();
 
     if (!bContourFrame) {
-        ULONG nStat=rOutl.GetControlWord();
+        sal_uIntPtr nStat=rOutl.GetControlWord();
         nStat|=EE_CNTRL_AUTOPAGESIZE;
         if (bFitToSize || IsAutoFit())
             nStat|=EE_CNTRL_STRETCHING;
@@ -119,8 +119,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     {
         Rectangle aAnchorRect;
         Rectangle aTextRect;
-        TakeTextRect(rOutl, aTextRect, FALSE, 
-            &aAnchorRect/* #97097# give TRUE here, not FALSE */);
+        TakeTextRect(rOutl, aTextRect, sal_False, 
+            &aAnchorRect/* #97097# give sal_True here, not sal_False */);
         Fraction aFitXKorreg(1,1);
         ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg);
     }
@@ -134,7 +134,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
         // #78476# also repaint when animated text is put to edit mode
         // to not make appear the text double
         // #111096# should now repaint automatically.
-        // BOOL bIsAnimated(pPlusData && pPlusData->pAnimator);
+        // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator);
 
         if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/)
         {
@@ -196,7 +196,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
             SdrTextAniDirection eAniDirection=GetTextAniDirection();
 
             // #101684#
-            BOOL bInEditMode = IsInEditMode();
+            sal_Bool bInEditMode = IsInEditMode();
 
             if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) 
             {
@@ -280,26 +280,26 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
         // need to end edit mode early since SetOutlinerParaObject already
         // uses GetCurrentBoundRect() which needs to take the text into account
         // to work correct
-        mbInEditMode = FALSE;
+        mbInEditMode = sal_False;
         SetOutlinerParaObject(pNewText);
     }
 
     pEdtOutl = NULL;
     rOutl.Clear();
-    UINT32 nStat = rOutl.GetControlWord();
+    sal_uInt32 nStat = rOutl.GetControlWord();
     nStat &= ~EE_CNTRL_AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
     // #101684#
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 }
 
-USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const
 {
     SdrTextHorzAdjust eH=GetTextHorizontalAdjust();
     SdrTextVertAdjust eV=GetTextVerticalAdjust();
     EVAnchorMode eRet=ANCHOR_TOP_LEFT;
-    if (IsContourTextFrame()) return (USHORT)eRet;
+    if (IsContourTextFrame()) return (sal_uInt16)eRet;
     if (eH==SDRTEXTHORZADJUST_LEFT) {
         if (eV==SDRTEXTVERTADJUST_TOP) {
             eRet=ANCHOR_TOP_LEFT;
@@ -325,14 +325,14 @@ USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
             eRet=ANCHOR_VCENTER_HCENTER;
         }
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 void SdrTextObj::ImpSetTextEditParams() const
 {
     if (pEdtOutl!=NULL) {
         bool bUpdMerk=pEdtOutl->GetUpdateMode();
-        if (bUpdMerk) pEdtOutl->SetUpdateMode(FALSE);
+        if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False);
         Size aPaperMin;
         Size aPaperMax;
         Rectangle aEditArea;
@@ -341,16 +341,16 @@ void SdrTextObj::ImpSetTextEditParams() const
         //bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
         bool bContourFrame=IsContourTextFrame();
         //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode();
-        //ULONG nViewAnz=pEdtOutl->GetViewCount();
+        //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount();
         pEdtOutl->SetMinAutoPaperSize(aPaperMin);
         pEdtOutl->SetMaxAutoPaperSize(aPaperMax);
         pEdtOutl->SetPaperSize(Size());
         if (bContourFrame) {
             Rectangle aAnchorRect;
             TakeTextAnchorRect(aAnchorRect);
-            ImpSetContourPolygon(*pEdtOutl,aAnchorRect, TRUE);
+            ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True);
         }
-        if (bUpdMerk) pEdtOutl->SetUpdateMode(TRUE);
+        if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True);
     }
 }
 
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index 2cba5d849d..b5a7d90d2e 100644..100755
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -34,7 +34,7 @@
 #include <svx/svdotext.hxx>
 #include <svx/svdfield.hxx>
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 // Do not remove this, it is still used in src536a!
 void SdrRegisterFieldClasses()
@@ -45,16 +45,16 @@ void SdrRegisterFieldClasses()
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField);
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField);
         SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField);
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////// */
 
-bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/,
+bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/,
     bool /*bEdit*/,	Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index a59d31bf99..1f4fd0332c 100644..100755
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -35,7 +35,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/datetime.hxx>
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdmodel.hxx>
 #include <editeng/editdata.hxx>
 #include <sfx2/lnkbase.hxx>
@@ -79,7 +79,7 @@ public:
     virtual void DataChanged( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue );
 
-    BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
+    sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
 };
 
 ImpSdrObjTextLink::~ImpSdrObjTextLink()
@@ -199,8 +199,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName,
 void SdrTextObj::ReleaseTextLink()
 {
     ImpLinkAbmeldung();
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0;) {
         nNum--;
         SdrObjUserData* pData=GetUserData(nNum);
         if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) {
@@ -218,11 +218,11 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
     {
         ::ucbhelper::ContentBroker*	pBroker = ::ucbhelper::ContentBroker::get();
         DateTime				    aFileDT;
-        BOOL					    bExists = FALSE, bLoad = FALSE;
+        sal_Bool					    bExists = sal_False, bLoad = sal_False;
 
         if( pBroker )
         {
-            bExists = TRUE;
+            bExists = sal_True;
 
             try
             {
@@ -238,14 +238,14 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
             }
             catch( ... )
             {
-                bExists = FALSE;
+                bExists = sal_False;
             }
         }
 
         if( bExists )
         {
             if( bForceLoad )
-                bLoad = TRUE;
+                bLoad = sal_True;
             else
                 bLoad = ( aFileDT > pData->aFileDate0 );
 
@@ -264,7 +264,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
 bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
 {
     INetURLObject	aFileURL( rFileName );
-    BOOL			bRet = FALSE;
+    sal_Bool			bRet = sal_False;
 
     if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
     {
@@ -289,14 +289,14 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
         cRTF[4] = 0;
         pIStm->Read(cRTF, 5);
 
-        BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
+        sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
 
         pIStm->Seek(0);
 
         if( !pIStm->GetError() )
         {
-            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
-            bRet = TRUE;
+            SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
+            bRet = sal_True;
         }
 
         delete pIStm;
@@ -308,8 +308,8 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
 ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const
 {
     ImpSdrObjTextLinkUserData* pData=NULL;
-    USHORT nAnz=GetUserDataCount();
-    for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+    sal_uInt16 nAnz=GetUserDataCount();
+    for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
         nNum--;
         pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum);
         if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) {
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 2896dbf359..90033c0a6f 100644..100755
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdotext.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
@@ -42,7 +42,7 @@
 #include <svx/sdr/properties/properties.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svl/itemset.hxx>
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/xflclit.hxx>
@@ -231,7 +231,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
 
 void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     long dx=aRect.Right()-aRect.Left();
     long dy=aRect.Bottom()-aRect.Top();
     Point aP(aRect.TopLeft());
@@ -250,18 +250,18 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     }
     SetRectsDirty();
     NbcRotateGluePoints(rRef,nWink,sn,cs);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // #75889# when this is a SdrPathObj aRect maybe not initialized
     Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
     
-    USHORT nPointCount=aPol.GetSize();
-    for (USHORT i=0; i<nPointCount; i++) {
+    sal_uInt16 nPointCount=aPol.GetSize();
+    for (sal_uInt16 i=0; i<nPointCount; i++) {
          ShearPoint(aPol[i],rRef,tn,bVShear);
     }
     Poly2Rect(aPol,aRect,aGeo);
@@ -272,12 +272,12 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
     ImpCheckShear();
     SetRectsDirty();
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
     bool bNoShearMerk=aGeo.nShearWink==0;
     bool bRota90Merk = false;
     if (bNoShearMerk &&
@@ -286,8 +286,8 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
         bRota90Merk=aGeo.nDrehWink % 9000 ==0;
     }
     Polygon aPol(Rect2Poly(aRect,aGeo));
-    USHORT i;
-    USHORT nPntAnz=aPol.GetSize();
+    sal_uInt16 i;
+    sal_uInt16 nPntAnz=aPol.GetSize();
     for (i=0; i<nPntAnz; i++) {
          MirrorPoint(aPol[i],rRef1,rRef2);
     }
@@ -325,7 +325,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     ImpCheckShear();
     SetRectsDirty();
     NbcMirrorGluePoints(rRef1,rRef2);
-    SetGlueReallyAbsolute(FALSE);
+    SetGlueReallyAbsolute(sal_False);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -346,7 +346,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
     if(xSequence.hasElements())
     {
         // create an extractor with neutral ViewInformation
-        const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+        const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
         drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D);
 
         // extract text as polygons
@@ -453,7 +453,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
 
 //////////////////////////////////////////////////////////////////////////////
 
-SdrObject* SdrTextObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier) const
 {
     return ImpConvertContainedTextToSdrPathObjs(!bBezier);
 }
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 5586987e79..b112f80efc 100644..100755
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -48,17 +48,17 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"  // Stringcache
-#include "svdstr.hrc"   // Objektname
+#include "svx/svdglob.hxx"  // Stringcache
+#include "svx/svdstr.hrc"   // Objektname
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <rtl/ref.hxx>
 #include <set>
 #include <memory>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/svdograf.hxx>
 
@@ -165,11 +165,11 @@ namespace
 
 TYPEINIT1(SdrUnoObj, SdrRectObj);
 
-SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
+SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel)
 :	m_pImpl( new SdrUnoObjDataHolder ),
     bOwnUnoControlModel( _bOwnUnoControlModel )
 {
-    bIsUnoObj = TRUE;
+    bIsUnoObj = sal_True;
 
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
@@ -180,11 +180,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
 
 SdrUnoObj::SdrUnoObj(const String& rModelName,
                      const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
-                     BOOL _bOwnUnoControlModel)
+                     sal_Bool _bOwnUnoControlModel)
 :	m_pImpl( new SdrUnoObjDataHolder ),
     bOwnUnoControlModel( _bOwnUnoControlModel )
 {
-    bIsUnoObj = TRUE;
+    bIsUnoObj = sal_True;
 
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
@@ -228,26 +228,26 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage)
 
 void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bRotateFreeAllowed		=	FALSE;
-    rInfo.bRotate90Allowed			=	FALSE;
-    rInfo.bMirrorFreeAllowed		=	FALSE;
-    rInfo.bMirror45Allowed			=	FALSE;
-    rInfo.bMirror90Allowed			=	FALSE;
-    rInfo.bTransparenceAllowed = FALSE;
-    rInfo.bGradientAllowed = FALSE;
-    rInfo.bShearAllowed 			=	FALSE;
-    rInfo.bEdgeRadiusAllowed		=	FALSE;
-    rInfo.bNoOrthoDesired			=	FALSE;
-    rInfo.bCanConvToPath			=	FALSE;
-    rInfo.bCanConvToPoly			=	FALSE;
-    rInfo.bCanConvToPathLineToArea	=	FALSE;
-    rInfo.bCanConvToPolyLineToArea	=	FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bRotateFreeAllowed		=	sal_False;
+    rInfo.bRotate90Allowed			=	sal_False;
+    rInfo.bMirrorFreeAllowed		=	sal_False;
+    rInfo.bMirror45Allowed			=	sal_False;
+    rInfo.bMirror90Allowed			=	sal_False;
+    rInfo.bTransparenceAllowed = sal_False;
+    rInfo.bGradientAllowed = sal_False;
+    rInfo.bShearAllowed 			=	sal_False;
+    rInfo.bEdgeRadiusAllowed		=	sal_False;
+    rInfo.bNoOrthoDesired			=	sal_False;
+    rInfo.bCanConvToPath			=	sal_False;
+    rInfo.bCanConvToPoly			=	sal_False;
+    rInfo.bCanConvToPathLineToArea	=	sal_False;
+    rInfo.bCanConvToPolyLineToArea	=	sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
-UINT16 SdrUnoObj::GetObjIdentifier() const
+sal_uInt16 SdrUnoObj::GetObjIdentifier() const
 {
-    return UINT16(OBJ_UNO);
+    return sal_uInt16(OBJ_UNO);
 }
 
 void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 506f4272e2..f8d8aff55e 100644..100755
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -42,7 +42,7 @@ DBG_NAME(SdrOutliner)
 |* Ctor
 |*
 \************************************************************************/
-SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, USHORT nMode )
+SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
 :	Outliner( pItemPool, nMode ),
     //mpPaintInfoRec( NULL )
     mpVisualizedPage(0)
@@ -71,15 +71,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 {
     if( pObj && pObj != mpTextObj.get() )
     {
-        SetUpdateMode(FALSE);
-        USHORT nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
+        SetUpdateMode(sal_False);
+        sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
         if ( !pObj->IsOutlText() )
             nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT;
         Init( nOutlinerMode2 );
 
         SetGlobalCharStretching(100,100);
 
-        ULONG nStat = GetControlWord();
+        sal_uIntPtr nStat = GetControlWord();
         nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE );
         SetControlWord(nStat);
 
@@ -109,14 +109,14 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
 |*
 |*
 \************************************************************************/
-XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
                                      Color*& rpTxtColor, Color*& rpFldColor)
 {
     bool bOk = false;
     XubString aRet;
 
     if(mpTextObj.is())
-        bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, FALSE, rpTxtColor, rpFldColor, aRet);
+        bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet);
 
     if (!bOk)
         aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor);
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 9d96e2a5ad..1bcdb16f0f 100644..100755
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -34,7 +34,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
 
-extern SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel );
+extern SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel );
 
 SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel )
 :	mpModel( pModel ),
@@ -86,7 +86,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
 {
     if( pOutliner )
     {
-        USHORT nOutlMode = pOutliner->GetOutlinerMode();
+        sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode();
 
         if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) )
         {
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index cc72b2ff30..8d32538408 100644..100755
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -61,7 +61,7 @@ TYPEINIT1(SdrVirtObj,SdrObject);
 SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
     rRefObj(rNewObj)
 {
-    bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+    bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
     rRefObj.AddReference(*this);
     bClosedObj=rRefObj.IsClosedObj();
 }
@@ -70,7 +70,7 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos):
     rRefObj(rNewObj)
 {
     aAnchor=rAnchorPos;
-    bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+    bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
     rRefObj.AddReference(*this);
     bClosedObj=rRefObj.IsClosedObj();
 }
@@ -120,12 +120,12 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rRefObj.TakeObjInfo(rInfo);
 }
 
-UINT32 SdrVirtObj::GetObjInventor() const
+sal_uInt32 SdrVirtObj::GetObjInventor() const
 {
     return rRefObj.GetObjInventor();
 }
 
-UINT16 SdrVirtObj::GetObjIdentifier() const
+sal_uInt16 SdrVirtObj::GetObjIdentifier() const
 {
     return rRefObj.GetObjIdentifier();
 }
@@ -198,7 +198,7 @@ void SdrVirtObj::TakeObjNamePlural(XubString& rName) const
 void operator +=(PolyPolygon& rPoly, const Point& rOfs)
 {
     if (rOfs.X()!=0 || rOfs.Y()!=0) {
-        USHORT i,j;
+        sal_uInt16 i,j;
         for (j=0; j<rPoly.Count(); j++) {
             Polygon aP1(rPoly.GetObject(j));
             for (i=0; i<aP1.GetSize(); i++) {
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index d13f133046..f76ac387b0 100644..100755
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -50,7 +50,7 @@
 #include <svx/svdograf.hxx> // fuer SwapInAll()
 #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren
 #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdotext.hxx>
@@ -112,8 +112,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
     pModel=pNewModel;
     pPage=pNewPage;
     pUpList=pNewUpList;
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty=sal_False;
     pOwnerObj=NULL;
     eListKind=SDROBJLIST_UNKNOWN;
 }
@@ -128,8 +128,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
     pModel=NULL;
     pPage=NULL;
     pUpList=NULL;
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty=sal_False;
     pOwnerObj=NULL;
     eListKind=SDROBJLIST_UNKNOWN;
     *this=rSrcList;
@@ -158,12 +158,12 @@ void SdrObjList::operator=(const SdrObjList& rSrcList)
 void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
 {
     Clear();
-    bObjOrdNumsDirty=FALSE;
-    bRectsDirty     =FALSE;
-    ULONG nCloneErrCnt=0;
-    ULONG nAnz=rSrcList.GetObjCount();
+    bObjOrdNumsDirty=sal_False;
+    bRectsDirty     =sal_False;
+    sal_uIntPtr nCloneErrCnt=0;
+    sal_uIntPtr nAnz=rSrcList.GetObjCount();
     SdrInsertReason aReason(SDRREASON_COPY);
-    ULONG no;
+    sal_uIntPtr no;
     for (no=0; no<nAnz; no++) {
         SdrObject* pSO=rSrcList.GetObj(no);
 
@@ -193,8 +193,8 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
             const SdrObject* pSrcOb=rSrcList.GetObj(no);
             SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb);
             if (pSrcEdge!=NULL) {
-                SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(TRUE);
-                SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(FALSE);
+                SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True);
+                SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False);
                 if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // Listenuebergreifend
                 if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // ist (noch) nicht
                 if (pSrcNode1!=NULL || pSrcNode2!=NULL) {
@@ -202,19 +202,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
                     SdrEdgeObj* pDstEdge=PTR_CAST(SdrEdgeObj,pEdgeObjTmp);
                     if (pDstEdge!=NULL) {
                         if (pSrcNode1!=NULL) {
-                            ULONG nDstNode1=pSrcNode1->GetOrdNum();
+                            sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
                             SdrObject* pDstNode1=GetObj(nDstNode1);
                             if (pDstNode1!=NULL) { // Sonst grober Fehler!
-                                pDstEdge->ConnectToNode(TRUE,pDstNode1);
+                                pDstEdge->ConnectToNode(sal_True,pDstNode1);
                             } else {
                                 OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!");
                             }
                         }
                         if (pSrcNode2!=NULL) {
-                            ULONG nDstNode2=pSrcNode2->GetOrdNum();
+                            sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
                             SdrObject* pDstNode2=GetObj(nDstNode2);
                             if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert
-                                pDstEdge->ConnectToNode(FALSE,pDstNode2);
+                                pDstEdge->ConnectToNode(sal_False,pDstNode2);
                             } else {
                                 OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!");
                             }
@@ -291,8 +291,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage)
 {
     if (pPage!=pNewPage) {
         pPage=pNewPage;
-        ULONG nAnz=GetObjCount();
-        for (ULONG no=0; no<nAnz; no++) {
+        sal_uIntPtr nAnz=GetObjCount();
+        for (sal_uIntPtr no=0; no<nAnz; no++) {
             SdrObject* pObj=GetObj(no);
             pObj->SetPage(pPage);
         }
@@ -308,8 +308,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
 {
     if (pModel!=pNewModel) {
         pModel=pNewModel;
-        ULONG nAnz=GetObjCount();
-        for (ULONG i=0; i<nAnz; i++) {
+        sal_uIntPtr nAnz=GetObjCount();
+        for (sal_uIntPtr i=0; i<nAnz; i++) {
             SdrObject* pObj=GetObj(i);
             pObj->SetModel(pModel);
         }
@@ -318,20 +318,20 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
 
 void SdrObjList::RecalcObjOrdNums()
 {
-    ULONG nAnz=GetObjCount();
-    for (ULONG no=0; no<nAnz; no++) {
+    sal_uIntPtr nAnz=GetObjCount();
+    for (sal_uIntPtr no=0; no<nAnz; no++) {
         SdrObject* pObj=GetObj(no);
         pObj->SetOrdNum(no);
     }
-    bObjOrdNumsDirty=FALSE;
+    bObjOrdNumsDirty=sal_False;
 }
 
 void SdrObjList::RecalcRects()
 {
     aOutRect=Rectangle();
     aSnapRect=aOutRect;
-    ULONG nAnz=GetObjCount();
-    ULONG i;
+    sal_uIntPtr nAnz=GetObjCount();
+    sal_uIntPtr i;
     for (i=0; i<nAnz; i++) {
         SdrObject* pObj=GetObj(i);
         if (i==0) {
@@ -346,7 +346,7 @@ void SdrObjList::RecalcRects()
 
 void SdrObjList::SetRectsDirty()
 {
-    bRectsDirty=TRUE;
+    bRectsDirty=sal_True;
     if (pUpList!=NULL) pUpList->SetRectsDirty();
 }
 
@@ -360,16 +360,16 @@ void SdrObjList::impChildInserted(SdrObject& rChild) const
     }
 }
 
-void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* /*pReason*/)
+void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* /*pReason*/)
 {
     DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)");
     if (pObj!=NULL) {
         DBG_ASSERT(!pObj->IsInserted(),"ZObjekt hat bereits Inserted-Status");
-        ULONG nAnz=GetObjCount();
+        sal_uIntPtr nAnz=GetObjCount();
         if (nPos>nAnz) nPos=nAnz;
         InsertObjectIntoContainer(*pObj,nPos);
 
-        if (nPos<nAnz) bObjOrdNumsDirty=TRUE;
+        if (nPos<nAnz) bObjOrdNumsDirty=sal_True;
         pObj->SetOrdNum(nPos);
         pObj->SetObjList(this);
         pObj->SetPage(pPage);
@@ -382,11 +382,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
             aOutRect.Union(pObj->GetCurrentBoundRect());
             aSnapRect.Union(pObj->GetSnapRect());
         }
-        pObj->SetInserted(TRUE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_True); // Ruft u.a. den UserCall
     }
 }
 
-void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)");
 
@@ -429,7 +429,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
     }
 }
 
-SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -437,7 +437,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
         return NULL;
     }
 
-    ULONG nAnz=GetObjCount();
+    sal_uIntPtr nAnz=GetObjCount();
     SdrObject* pObj=maList[nObjNum];
     RemoveObjectFromContainer(nObjNum);
 
@@ -447,12 +447,12 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
     DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden");
     if (pObj!=NULL) {
         DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status");
-        pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
-            if (nObjNum!=ULONG(nAnz-1)) {
-                bObjOrdNumsDirty=TRUE;
+            if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+                bObjOrdNumsDirty=sal_True;
             }
         }
         SetRectsDirty();
@@ -460,7 +460,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -468,7 +468,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
         return NULL;
     }
 
-    ULONG nAnz=GetObjCount();
+    sal_uIntPtr nAnz=GetObjCount();
     SdrObject* pObj=maList[nObjNum];
     RemoveObjectFromContainer(nObjNum);
 
@@ -488,12 +488,12 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
             }
             pModel->SetChanged();
         }
-        pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+        pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
-            if (nObjNum!=ULONG(nAnz-1)) {
-                bObjOrdNumsDirty=TRUE;
+            if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+                bObjOrdNumsDirty=sal_True;
             }
         }
         SetRectsDirty();
@@ -508,7 +508,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size() || pNewObj == NULL)
     {
@@ -521,7 +521,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
     DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Object zum Removen nicht gefunden");
     if (pObj!=NULL) {
         DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt hat keinen Inserted-Status");
-        pObj->SetInserted(FALSE);
+        pObj->SetInserted(sal_False);
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -537,13 +537,13 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
-        pNewObj->SetInserted(TRUE);
+        pNewObj->SetInserted(sal_True);
         SetRectsDirty();
     }
     return pObj;
 }
 
-SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
 {
     if (nObjNum >= maList.size())
     {
@@ -568,7 +568,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
                 pModel->Broadcast(aHint);
             }
         }
-        pObj->SetInserted(FALSE);
+        pObj->SetInserted(sal_False);
         pObj->SetObjList(NULL);
         pObj->SetPage(NULL);
         ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -584,7 +584,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
         // evtl. existing parent visualisations
         impChildInserted(*pNewObj);
 
-        pNewObj->SetInserted(TRUE);
+        pNewObj->SetInserted(sal_True);
         if (pModel!=NULL) {
             // Hier muss ein anderer Broadcast her!
             if (pNewObj->GetPage()!=NULL) {
@@ -599,7 +599,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
     return pObj;
 }
 
-SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
 {
     if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
     {
@@ -622,12 +622,12 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
         pObj->ActionChanged();
 
         pObj->SetOrdNum(nNewObjNum);
-        bObjOrdNumsDirty=TRUE;
+        bObjOrdNumsDirty=sal_True;
     }
     return pObj;
 }
 
-SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
 {
     if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
     {
@@ -649,7 +649,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
         pObj->ActionChanged();
 
         pObj->SetOrdNum(nNewObjNum);
-        bObjOrdNumsDirty=TRUE;
+        bObjOrdNumsDirty=sal_True;
         if (pModel!=NULL) 
         {
             // Hier muss ein anderer Broadcast her!
@@ -664,7 +664,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const
 {
     if (bRectsDirty) {
         ((SdrObjList*)this)->RecalcRects();
-        ((SdrObjList*)this)->bRectsDirty=FALSE;
+        ((SdrObjList*)this)->bRectsDirty=sal_False;
     }
     return aSnapRect;
 }
@@ -679,15 +679,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const
     if (bRectsDirty || aOutRect.IsEmpty())
     {
         ((SdrObjList*)this)->RecalcRects();
-        ((SdrObjList*)this)->bRectsDirty=FALSE;
+        ((SdrObjList*)this)->bRectsDirty=sal_False;
     }
     return aOutRect;
 }
 
 void SdrObjList::NbcReformatAllTextObjects()
 {
-    ULONG nAnz=GetObjCount();
-    ULONG nNum=0;
+    sal_uIntPtr nAnz=GetObjCount();
+    sal_uIntPtr nNum=0;
 
     Printer* pPrinter = NULL;
 
@@ -752,7 +752,7 @@ void SdrObjList::BurnInStyleSheetAttributes()
     }
 }
 
-ULONG SdrObjList::GetObjCount() const
+sal_uIntPtr SdrObjList::GetObjCount() const
 {
     return maList.size();
 }
@@ -760,7 +760,7 @@ ULONG SdrObjList::GetObjCount() const
 
 
 
-SdrObject* SdrObjList::GetObj(ULONG nNum) const
+SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const
 {
     if (nNum >= maList.size())
     {
@@ -781,11 +781,11 @@ bool SdrObjList::IsReadOnly() const
     return bRet;
 }
 
-ULONG SdrObjList::CountAllObjects() const
+sal_uIntPtr SdrObjList::CountAllObjects() const
 {
-    ULONG nCnt=GetObjCount();
-    ULONG nAnz=nCnt;
-    for (USHORT nNum=0; nNum<nAnz; nNum++) {
+    sal_uIntPtr nCnt=GetObjCount();
+    sal_uIntPtr nAnz=nCnt;
+    for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
         SdrObjList* pSubOL=GetObj(nNum)->GetSubList();
         if (pSubOL!=NULL) {
             nCnt+=pSubOL->CountAllObjects();
@@ -796,8 +796,8 @@ ULONG SdrObjList::CountAllObjects() const
 
 void SdrObjList::ForceSwapInObjects() const
 {
-    ULONG nObjAnz=GetObjCount();
-    for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+    sal_uIntPtr nObjAnz=GetObjCount();
+    for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
         SdrObject* pObj=GetObj(--nObjNum);
         SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
         if (pGrafObj!=NULL) {
@@ -812,8 +812,8 @@ void SdrObjList::ForceSwapInObjects() const
 
 void SdrObjList::ForceSwapOutObjects() const
 {
-    ULONG nObjAnz=GetObjCount();
-    for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+    sal_uIntPtr nObjAnz=GetObjCount();
+    for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
         SdrObject* pObj=GetObj(--nObjNum);
         SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
         if (pGrafObj!=NULL) {
@@ -834,7 +834,7 @@ void SdrObjList::FlattenGroups()
         UnGroupObj(i);
 }
 
-void SdrObjList::UnGroupObj( ULONG nObjNum )
+void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum )
 {
     // if the given object is no group, this method is a noop
     SdrObject* pUngroupObj = GetObj( nObjNum );
@@ -1052,7 +1052,7 @@ void SdrObjList::InsertObjectIntoContainer (
         maList.push_back(&rObject);
     else
         maList.insert(maList.begin()+nInsertPosition, &rObject);
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1089,7 +1089,7 @@ void SdrObjList::ReplaceObjectInContainer (
     }
 
     maList[nObjectPosition] = &rNewObject;
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1118,7 +1118,7 @@ void SdrObjList::RemoveObjectFromContainer (
     }
 
     maList.erase(maList.begin()+nObjectPosition);
-    bObjOrdNumsDirty=TRUE;
+    bObjOrdNumsDirty=sal_True;
 }
 
 
@@ -1128,8 +1128,8 @@ void SdrObjList::RemoveObjectFromContainer (
 
 void SdrPageGridFrameList::Clear()
 {
-    USHORT nAnz=GetCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=GetCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         delete GetObject(i);
     }
     aList.Clear();
@@ -1532,7 +1532,7 @@ Size SdrPage::GetSize() const
     return Size(nWdt,nHgt);
 }
 
-INT32 SdrPage::GetWdt() const
+sal_Int32 SdrPage::GetWdt() const
 {
     return nWdt;
 }
@@ -1557,12 +1557,12 @@ Orientation SdrPage::GetOrientation() const
     return eRet;
 }
 
-INT32 SdrPage::GetHgt() const
+sal_Int32 SdrPage::GetHgt() const
 {
     return nHgt;
 }
 
-void  SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
+void  SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr)
 {
     bool bChanged(false);
 
@@ -1596,7 +1596,7 @@ void  SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
     }
 }
 
-void  SdrPage::SetLftBorder(INT32 nBorder)
+void  SdrPage::SetLftBorder(sal_Int32 nBorder)
 {
     if(nBordLft != nBorder)
     {
@@ -1605,7 +1605,7 @@ void  SdrPage::SetLftBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetUppBorder(INT32 nBorder)
+void  SdrPage::SetUppBorder(sal_Int32 nBorder)
 {
     if(nBordUpp != nBorder)
     {
@@ -1614,7 +1614,7 @@ void  SdrPage::SetUppBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetRgtBorder(INT32 nBorder)
+void  SdrPage::SetRgtBorder(sal_Int32 nBorder)
 {
     if(nBordRgt != nBorder)
     {
@@ -1623,7 +1623,7 @@ void  SdrPage::SetRgtBorder(INT32 nBorder)
     }
 }
 
-void  SdrPage::SetLwrBorder(INT32 nBorder)
+void  SdrPage::SetLwrBorder(sal_Int32 nBorder)
 {
     if(nBordLwr != nBorder)
     {
@@ -1632,22 +1632,22 @@ void  SdrPage::SetLwrBorder(INT32 nBorder)
     }
 }
 
-INT32 SdrPage::GetLftBorder() const
+sal_Int32 SdrPage::GetLftBorder() const
 {
     return nBordLft;
 }
 
-INT32 SdrPage::GetUppBorder() const
+sal_Int32 SdrPage::GetUppBorder() const
 {
     return nBordUpp;
 }
 
-INT32 SdrPage::GetRgtBorder() const
+sal_Int32 SdrPage::GetRgtBorder() const
 {
     return nBordRgt;
 }
 
-INT32 SdrPage::GetLwrBorder() const
+sal_Int32 SdrPage::GetLwrBorder() const
 {
     return nBordLwr;
 }
@@ -1707,17 +1707,17 @@ void SdrPage::SetPageNum(sal_uInt16 nNew)
     }
 }
 
-USHORT SdrPage::GetPageNum() const
+sal_uInt16 SdrPage::GetPageNum() const
 {
     if (!mbInserted) 
         return 0;
 
     if (mbMaster) {
         if (pModel && pModel->IsMPgNumsDirty())
-            ((SdrModel*)pModel)->RecalcPageNums(TRUE);
+            ((SdrModel*)pModel)->RecalcPageNums(sal_True);
     } else {
         if (pModel && pModel->IsPagNumsDirty())
-            ((SdrModel*)pModel)->RecalcPageNums(FALSE);
+            ((SdrModel*)pModel)->RecalcPageNums(sal_False);
     }
     return nPageNum;
 }
@@ -1857,11 +1857,11 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const
     return pObj->GetStyleSheet();
 }
 
-bool SdrPage::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const
 {
     bool bRet = false;
 
-    for( ULONG n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
+    for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
         if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) )
             bRet = true;
 
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 6f5c4247be..6da408c2e7 100644..100755
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -48,7 +48,7 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdview.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdogrp.hxx>
 #include <svx/svdtypes.hxx>
 
@@ -67,7 +67,7 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 TYPEINIT1(SdrPageView, SfxListener);
 DBG_NAME(SdrPageView);
@@ -332,8 +332,8 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect)
     //const SdrObject* pTextObjTmp=GetView().GetTextEditObject();
     //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp);
     //bool bTextFrame=pText!=NULL && pText->IsTextFrame();
-    ULONG nViewAnz=GetView().pTextEditOutliner->GetViewCount();
-    for (ULONG i=0; i<nViewAnz; i++) {
+    sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount();
+    for (sal_uIntPtr i=0; i<nViewAnz; i++) {
         OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i);
         if (pOLV->GetWindow()==pOut) {
             GetView().ImpPaintOutlinerView(*pOLV, rRect);
@@ -359,6 +359,21 @@ void SdrPageView::PrePaint()
     }
 }
 
+void SdrPageView::PostPaint()
+{
+    const sal_uInt32 nCount(PageWindowCount());
+
+    for(sal_uInt32 a(0); a < nCount; a++)
+    {
+        SdrPageWindow* pCandidate = GetPageWindow(a);
+        
+        if(pCandidate)
+        {
+            pCandidate->PostPaint();
+        }
+    }
+}
+
 void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const
 {
     if(GetPage())
@@ -483,7 +498,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef OS2
-#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16)))
+#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16)))
 #endif
 
 void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor)
@@ -581,10 +596,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
         rOut.SetLineColor( aColor );
 
         bool bMap0=rOut.IsMapModeEnabled();
-#ifdef WIN // SetPixel-Profiling fuer Windows
-       COLORREF aWinColRef=PALETTERGB(aColor.GetRed()>>8,aColor.GetGreen()>>8,aColor.GetBlue()>>8);
-       HDC aWinhDC=Sysdepen::GethDC(rOut);
-#endif
 
         long nWrX=0;//aWriterPageOffset.X();
         long nWrY=0;//aWriterPageOffset.Y();
@@ -594,11 +605,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
         long y1=GetPage()->GetUppBorder()+1+nWrX;
         long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
         const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL);
-        //USHORT nBufSiz=1024; // 4k Buffer = max. 512 Punkte
+        //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte
         // #90353# long* pBuf = NULL;
-        USHORT nGridPaintAnz=1;
+        sal_uInt16 nGridPaintAnz=1;
         if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount();
-        for (USHORT nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
+        for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
             if (pFrames!=NULL) {
                 const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum];
                 nWrX=rGF.GetPaperRect().Left();
@@ -639,13 +650,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
             {
                 if( bHoriLines )
                 {
-                    ULONG nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
-                    UINT16 nSteps = sal_uInt16(nx1 / nx2);
-                    UINT32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
-                    UINT32 nStepOffset = 0;
-                    UINT16 nPointOffset = 0;
+                    sal_uIntPtr nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
+                    sal_uInt16 nSteps = sal_uInt16(nx1 / nx2);
+                    sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
+                    sal_uInt32 nStepOffset = 0;
+                    sal_uInt16 nPointOffset = 0;
 
-                    for(UINT16 a=0;a<nSteps;a++)
+                    for(sal_uInt16 a=0;a<nSteps;a++)
                     {
                         // Zeichnen
                         rOut.DrawGrid(
@@ -664,13 +675,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
 
                 if( bVertLines )
                 {
-                    ULONG nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
-                    UINT16 nSteps = sal_uInt16(ny1 / ny2);
-                    UINT32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
-                    UINT32 nStepOffset = 0;
-                    UINT16 nPointOffset = 0;
+                    sal_uIntPtr nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
+                    sal_uInt16 nSteps = sal_uInt16(ny1 / ny2);
+                    sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
+                    sal_uInt32 nStepOffset = 0;
+                    sal_uInt16 nPointOffset = 0;
 
-                    for(UINT16 a=0;a<nSteps;a++)
+                    for(sal_uInt16 a=0;a<nSteps;a++)
                     {
                         // Zeichnen
                         rOut.DrawGrid(
@@ -796,7 +807,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
         {
             // Der Layer muss sichtbar und darf nicht gesperrt sein
             SdrLayerID nL = pObj->GetLayer();
-            return (aLayerVisi.IsSet(BYTE(nL)) && !aLayerLock.IsSet(BYTE(nL)));
+            return (aLayerVisi.IsSet(sal_uInt8(nL)) && !aLayerLock.IsSet(sal_uInt8(nL)));
         }
     }
 
@@ -813,7 +824,7 @@ void SdrPageView::SetPageOrigin(const Point& rOrg)
     }
 }
 
-void SdrPageView::ImpInvalidateHelpLineArea(USHORT nNum) const
+void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
 {
     if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) {
         const SdrHelpLine& rHL=aHelpLines[nNum];
@@ -843,7 +854,7 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL)
     InvalidateAllWin();
 }
 
-void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
+void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
 {
     if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) {
         bool bNeedRedraw = true;
@@ -860,7 +871,7 @@ void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
     }
 }
 
-void SdrPageView::DeleteHelpLine(USHORT nNum)
+void SdrPageView::DeleteHelpLine(sal_uInt16 nNum)
 {
     if (nNum<aHelpLines.GetCount()) {
         ImpInvalidateHelpLineArea(nNum);
@@ -868,7 +879,7 @@ void SdrPageView::DeleteHelpLine(USHORT nNum)
     }
 }
 
-void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum)
+void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum)
 {
     if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount();
     aHelpLines.Insert(rHL,nNum);
@@ -951,7 +962,7 @@ void SdrPageView::LeaveOneGroup()
 {
     if(GetAktGroup())
     {
-        BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+        sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
 
         if(bGlueInvalidate)
             GetView().GlueInvalidate();
@@ -989,7 +1000,7 @@ void SdrPageView::LeaveAllGroup()
 {
     if(GetAktGroup())
     {
-        BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+        sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
 
         if(bGlueInvalidate)
             GetView().GlueInvalidate();
@@ -1023,9 +1034,9 @@ void SdrPageView::LeaveAllGroup()
     }
 }
 
-USHORT SdrPageView::GetEnteredLevel() const
+sal_uInt16 SdrPageView::GetEnteredLevel() const
 {
-    USHORT nAnz=0;
+    sal_uInt16 nAnz=0;
     SdrObject* pGrp=GetAktGroup();
     while (pGrp!=NULL) {
         nAnz++;
@@ -1052,7 +1063,7 @@ XubString SdrPageView::GetActualGroupName() const
 XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
 {
     XubString aStr;
-    BOOL bNamFnd(FALSE);
+    sal_Bool bNamFnd(sal_False);
     SdrObject* pGrp = GetAktGroup();
 
     while(pGrp)
@@ -1062,7 +1073,7 @@ XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
         if(!aStr1.Len())
             aStr1 += sal_Unicode('?');
         else
-            bNamFnd = TRUE;
+            bNamFnd = sal_True;
 
         aStr += aStr1;
         pGrp = pGrp->GetUpGroup();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 57e535184c..cbbd76874b 100644..100755
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <svx/svdpntv.hxx>
 #include <vcl/msgbox.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svtools/grfmgr.hxx>
 #include <svx/svdmodel.hxx>
 
@@ -55,7 +55,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdattrx.hxx>
 #include "svdibrow.hxx"
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlayrollingrectangle.hxx>
@@ -223,23 +223,23 @@ void SdrPaintView::ImpClearVars()
 #ifdef DBG_UTIL
     pItemBrowser=NULL;
 #endif
-    bPageVisible=TRUE;
-    bPageBorderVisible=TRUE;
-    bBordVisible=TRUE;
-    bGridVisible=TRUE;
-    bGridFront	=FALSE;
-    bHlplVisible=TRUE;
-    bHlplFront	=TRUE;
-    bGlueVisible=FALSE;
-    bGlueVisible2=FALSE;
-    bGlueVisible3=FALSE;
-    bGlueVisible4=FALSE;
-    bSwapAsynchron=FALSE;
-    bPrintPreview=FALSE;
-    mbPreviewRenderer=FALSE;
+    bPageVisible=sal_True;
+    bPageBorderVisible=sal_True;
+    bBordVisible=sal_True;
+    bGridVisible=sal_True;
+    bGridFront	=sal_False;
+    bHlplVisible=sal_True;
+    bHlplFront	=sal_True;
+    bGlueVisible=sal_False;
+    bGlueVisible2=sal_False;
+    bGlueVisible3=sal_False;
+    bGlueVisible4=sal_False;
+    bSwapAsynchron=sal_False;
+    bPrintPreview=sal_False;
+    mbPreviewRenderer=sal_False;
 
     eAnimationMode = SDR_ANIMATION_ANIMATE;
-    bAnimationPause = FALSE;
+    bAnimationPause = sal_False;
 
     nHitTolPix=2;
     nMinMovPix=3;
@@ -247,16 +247,16 @@ void SdrPaintView::ImpClearVars()
     nMinMovLog=0;
     pActualOutDev=NULL;
     pDragWin=NULL;
-    bRestoreColors=TRUE;
+    bRestoreColors=sal_True;
     pDefaultStyleSheet=NULL;
-    bSomeObjChgdFlag=FALSE;
+    bSomeObjChgdFlag=sal_False;
     nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
     aComeBackTimer.SetTimeout(1);
     aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
     String aNam;	// System::GetUserName() just return an empty string
 
     if (pMod)
-        SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), TRUE);
+        SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True);
 
     aNam.ToUpperAscii();
 
@@ -286,7 +286,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
     }
 
     // Flag zur Visualisierung von Gruppen
-    bVisualizeEnteredGroup = TRUE;
+    bVisualizeEnteredGroup = sal_True;
 
     maColorConfig.AddListener(this);
     onChangeColorConfig();
@@ -331,14 +331,14 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
         return;
     }
 
-    BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
+    sal_Bool bObjChg=!bSomeObjChgdFlag; // sal_True= auswerten fuer ComeBack-Timer
     if (bObjChg) {
         SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
         if (pSdrHint!=NULL) {
             SdrHintKind eKind=pSdrHint->GetKind();
             if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
                 if (bObjChg) {
-                    bSomeObjChgdFlag=TRUE;
+                    bSomeObjChgdFlag=sal_True;
                     aComeBackTimer.Start();
                 }
             }
@@ -368,7 +368,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
 IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
 {
     if (bSomeObjChgdFlag) {
-        bSomeObjChgdFlag=FALSE;
+        bSomeObjChgdFlag=sal_False;
         ModelHasChanged();
     }
     return 0;
@@ -408,7 +408,7 @@ void SdrPaintView::ModelHasChanged()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrPaintView::IsAction() const
+sal_Bool SdrPaintView::IsAction() const
 {
     return IsEncirclement();
 }
@@ -462,9 +462,9 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
 {
-    if (nMinMov>=0) return USHORT(nMinMov);
+    if (nMinMov>=0) return sal_uInt16(nMinMov);
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
@@ -476,9 +476,9 @@ USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut)
     }
 }
 
-USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
 {
-    if (nHitTol>=0) return USHORT(nHitTol);
+    if (nHitTol>=0) return sal_uInt16(nHitTol);
     if (pOut==NULL)
     {
         pOut = GetFirstOutputDevice();
@@ -493,8 +493,8 @@ USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut)
 void SdrPaintView::TheresNewMapMode()
 {
     if (pActualOutDev!=NULL) {
-        nHitTolLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
-        nMinMovLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
+        nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
+        nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
     }
 }
 
@@ -644,7 +644,7 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
 #endif
 }
 
-void SdrPaintView::SetLayerVisible(const XubString& rName, BOOL bShow)
+void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow)
 {
     if(mpPageView)
     {
@@ -664,7 +664,7 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersVisible(BOOL bShow)
+void SdrPaintView::SetAllLayersVisible(sal_Bool bShow)
 {
     if(mpPageView)
     {
@@ -674,7 +674,7 @@ void SdrPaintView::SetAllLayersVisible(BOOL bShow)
     InvalidateAllWin();
 }
 
-void SdrPaintView::SetLayerLocked(const XubString& rName, BOOL bLock)
+void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
 {
     if(mpPageView)
     {
@@ -692,7 +692,7 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersLocked(BOOL bLock)
+void SdrPaintView::SetAllLayersLocked(sal_Bool bLock)
 {
     if(mpPageView)
     {
@@ -700,7 +700,7 @@ void SdrPaintView::SetAllLayersLocked(BOOL bLock)
     }
 }
 
-void SdrPaintView::SetLayerPrintable(const XubString& rName, BOOL bPrn)
+void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
 {
     if(mpPageView)
     {
@@ -718,7 +718,7 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const
     return false;
 }
 
-void SdrPaintView::SetAllLayersPrintable(BOOL bPrn)
+void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn)
 {
     if(mpPageView)
     {
@@ -734,6 +734,14 @@ void SdrPaintView::PrePaint()
     }
 }
 
+void SdrPaintView::PostPaint()
+{
+    if(mpPageView)
+    {
+        mpPageView->PostPaint();
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // #define SVX_REPAINT_TIMER_TEST
 
@@ -1063,9 +1071,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
+sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrPaintView::GlueInvalidate() const
@@ -1083,8 +1091,8 @@ void SdrPaintView::GlueInvalidate() const
             if(mpPageView)
             {
                 const SdrObjList* pOL=mpPageView->GetObjList();
-                ULONG nObjAnz=pOL->GetObjCount();
-                for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+                sal_uIntPtr nObjAnz=pOL->GetObjCount();
+                for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
                     const SdrObject* pObj=pOL->GetObj(nObjNum);
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
                     if (pGPL!=NULL && pGPL->GetCount()!=0) {
@@ -1111,7 +1119,7 @@ void SdrPaintView::InvalidateAllWin()
     }
 }
 
-void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix)
+void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
 {
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
@@ -1186,12 +1194,12 @@ bool SdrPaintView::IsGroupEntered() const
     return false;
 }
 
-void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
 {
     // bReplaceAll hat hier keinerlei Wirkung
-    BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+    sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
     const SfxPoolItem *pPoolItem=NULL;
-    if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue();
         const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId);
         if (pLayer!=NULL) {
@@ -1199,35 +1207,35 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bRep
             else aAktLayer=pLayer->GetName();
         }
     }
-    if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+    if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
         if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
         else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
     }
 }
 
-void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
 {
     // bOnlyHardAttr hat hier keinerlei Wirkung
-    BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+    sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
     const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
     rAttr.Put(SdrLayerNameItem(aNam));
-    SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,TRUE);
+    SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
     if (nLayer!=SDRLAYER_NOTFOUND) {
         rAttr.Put(SdrLayerIdItem(nLayer));
     }
 }
 
-void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
 {
 #ifdef DBG_UTIL
     {
-        BOOL bHasEEFeatureItems=FALSE;
+        sal_Bool bHasEEFeatureItems=sal_False;
         SfxItemIter aIter(rAttr);
         const SfxPoolItem* pItem=aIter.FirstItem();
         while (!bHasEEFeatureItems && pItem!=NULL) {
             if (!IsInvalidItem(pItem)) {
-                USHORT nW=pItem->Which();
-                if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+                sal_uInt16 nW=pItem->Which();
+                if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
             }
             pItem=aIter.NextItem();
         }
@@ -1241,14 +1249,14 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
     }
 #endif
     if (bReplaceAll) aDefaultAttr.Set(rAttr);
-    else aDefaultAttr.Put(rAttr,FALSE); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+    else aDefaultAttr.Put(rAttr,sal_False); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten
     SetNotPersistDefaultAttr(rAttr,bReplaceAll);
 #ifdef DBG_UTIL
     if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
 #endif
 }
 
-void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (pDefaultStyleSheet)
         EndListening(*pDefaultStyleSheet);
@@ -1258,9 +1266,9 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 
     if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
         SfxWhichIter aIter(pStyleSheet->GetItemSet());
-        USHORT nWhich=aIter.FirstWhich();
+        sal_uInt16 nWhich=aIter.FirstWhich();
         while (nWhich!=0) {
-            if (pStyleSheet->GetItemSet().GetItemState(nWhich,TRUE)==SFX_ITEM_SET) {
+            if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) {
                 aDefaultAttr.ClearItem(nWhich);
             }
             nWhich=aIter.NextWhich();
@@ -1272,49 +1280,49 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
 }
 
 /* new interface src537 */
-BOOL SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(bOnlyHardAttr || !pDefaultStyleSheet)
     {
-        rTargetSet.Put(aDefaultAttr, FALSE);
+        rTargetSet.Put(aDefaultAttr, sal_False);
     }
     else
     {
         // sonst DefStyleSheet dazumergen
-        rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), FALSE);
-        rTargetSet.Put(aDefaultAttr, FALSE);
+        rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False);
+        rTargetSet.Put(aDefaultAttr, sal_False);
     }
     MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrPaintView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     SetDefaultAttr(rSet,bReplaceAll);
-    return TRUE;
+    return sal_True;
 }
 
-SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const
 {
-    //rOk=TRUE;
+    //rOk=sal_True;
     return GetDefaultStyleSheet();
 }
 
-BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr);
-    return TRUE;
+    return sal_True;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef DBG_UTIL
-void SdrPaintView::ShowItemBrowser(BOOL bShow)
+void SdrPaintView::ShowItemBrowser(sal_Bool bShow)
 {
     if (bShow) {
         if (pItemBrowser==NULL) {
             pItemBrowser=new SdrItemBrowser(*(SdrView*)this);
-            pItemBrowser->SetFloatingMode(TRUE);
+            pItemBrowser->SetFloatingMode(sal_True);
         }
         pItemBrowser->Show();
         pItemBrowser->GrabFocus();
@@ -1336,12 +1344,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin)
     if( aActualSize.Height() > 0 && aActualSize.Width() > 0 )
     {
         Size aNewSize(rRect.GetSize());
-        BOOL bNewScale=FALSE;
-        BOOL bNeedMoreX=aNewSize.Width()>aActualSize.Width();
-        BOOL bNeedMoreY=aNewSize.Height()>aActualSize.Height();
+        sal_Bool bNewScale=sal_False;
+        sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width();
+        sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height();
         if (bNeedMoreX || bNeedMoreY)
         {
-            bNewScale=TRUE;
+            bNewScale=sal_True;
             // Neuen MapMode (Size+Org) setzen und dabei alles invalidieren
             Fraction aXFact(aNewSize.Width(),aActualSize.Width());
             Fraction aYFact(aNewSize.Height(),aActualSize.Height());
@@ -1381,7 +1389,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/)
 {
 }
 
-void SdrPaintView::SetAnimationEnabled( BOOL bEnable )
+void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable ) 
 {
     SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE );
 }
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 13bd3956ed..dbcc5a7fd2 100644..100755
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -35,8 +35,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -52,8 +52,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
 {
     eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
     eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE;
-    bSetMarkedPointsSmoothPossible=FALSE;
-    bSetMarkedSegmentsKindPossible=FALSE;
+    bSetMarkedPointsSmoothPossible=sal_False;
+    bSetMarkedSegmentsKindPossible=sal_False;
 }
 
 void SdrPolyEditView::ImpClearVars()
@@ -74,7 +74,7 @@ SdrPolyEditView::~SdrPolyEditView()
 void SdrPolyEditView::ImpCheckPolyPossibilities()
 {
     ImpResetPolyPossibilityFlags();
-    const ULONG nMarkAnz(GetMarkedObjectCount());
+    const sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
 
     if(nMarkAnz && !ImpIsFrameHandles())
     {
@@ -85,7 +85,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
         bool bSegmFuz(false);
         basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
 
-        for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) 
+        for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) 
         {
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
             CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -215,9 +215,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
-        ULONG nMarkAnz(GetMarkedObjectCount());
+        sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
 
-        for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) 
+        for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) 
         {
             nMarkNum--;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -250,9 +250,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
-        ULONG nMarkAnz(GetMarkedObjectCount());
+        sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
         
-        for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) 
+        for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) 
         {
             nMarkNum--;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -276,7 +276,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
     }
 }
 
-BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
 {
     ForcePossibilities();
     return bSetMarkedPointsSmoothPossible;
@@ -288,7 +288,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const
     return eMarkedPointsSmooth;
 }
 
-BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
 {
     ForcePossibilities();
     return bSetMarkedSegmentsKindPossible;
@@ -300,7 +300,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const
     return eMarkedSegmentsKind;
 }
 
-BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const
+sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
 {
     return HasMarkedPoints();
 }
@@ -311,7 +311,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
     {
         BrkAction();
         SortMarkedObjects();
-        ULONG nMarkAnz=GetMarkedObjectCount();
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
 
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
@@ -320,7 +320,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
             BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
         }
 
-        for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
+        for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
         {
             nMarkNum--;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -399,13 +399,13 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
                         pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
                         if( bUndo )
                             AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
-                        MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE);
+                        MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True);
                     }
 
                     if(nNewPt0Idx) 
                     { 
                         // Korrektur notwendig?
-                        DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
+                        DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
                         if(!bKorregFlag) 
                         {
                             bKorregFlag = sal_True;
@@ -554,7 +554,7 @@ void SdrPolyEditView::ShutMarkedObjects()
     CloseMarkedObjects();
 }
 
-void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance)
+void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
 {
     if (AreObjectsMarked())
     {
@@ -563,12 +563,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp
             BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints());
 
         bool bChg=false;
-        ULONG nMarkAnz=GetMarkedObjectCount();
-        for (ULONG nm=0; nm<nMarkAnz; nm++)
+        sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+        for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pO=pM->GetMarkedSdrObj();
-            BOOL bClosed=pO->IsClosedObj();
+            sal_Bool bClosed=pO->IsClosedObj();
             if ((pO->IsPolyObj() && (bClosed==bOpen)) || bToggle)
             {
                 if( bUndo )
@@ -604,13 +604,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
 {
     const bool bUndo = IsUndoEnabled();
 
-    ULONG nMarkAnz=GetMarkedObjectCount();
-    for (ULONG nm=0; nm<nMarkAnz; nm++)
+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+    for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedPoints();
-        ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+        sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
         SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
         if (nPtAnz!=0 && pPath!=NULL) 
         {
@@ -684,7 +684,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
 
 void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditMove));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -706,7 +706,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
 
 void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditResize));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -728,7 +728,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
 
 void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy)
 {
-    bCopy=FALSE; // noch nicht implementiert
+    bCopy=sal_False; // noch nicht implementiert
     ForceUndirtyMrkPnt();
     XubString aStr(ImpGetResStr(STR_EditResize));
     if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index e67e36402d..2641c30913 100644..100755
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -36,13 +36,13 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include "svditer.hxx"
+#include "svx/svditer.hxx"
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlaycrosshair.hxx>
 #include <svx/sdr/overlay/overlayhelpline.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // #114409#-1 Migrate PageOrigin
@@ -204,29 +204,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
 void SdrSnapView::ClearVars()
 {
     nMagnSizPix=4;
-    bSnapEnab=TRUE;
-    bGridSnap=TRUE;
-    bSnapTo1Pix=TRUE;
-    bBordSnap=TRUE;
-    bHlplSnap=TRUE;
-    bOFrmSnap=TRUE;
-    bOPntSnap=FALSE;
-    bOConSnap=TRUE;
-    bMoveMFrmSnap=TRUE;
-    bMoveOFrmSnap=TRUE;
-    bMoveOPntSnap=TRUE;
-    bMoveOConSnap=TRUE;
-    bMoveSnapOnlyTopLeft=FALSE;
-    bOrtho=FALSE;
-    bBigOrtho=TRUE;
+    bSnapEnab=sal_True;
+    bGridSnap=sal_True;
+    bSnapTo1Pix=sal_True;
+    bBordSnap=sal_True;
+    bHlplSnap=sal_True;
+    bOFrmSnap=sal_True;
+    bOPntSnap=sal_False;
+    bOConSnap=sal_True;
+    bMoveMFrmSnap=sal_True;
+    bMoveOFrmSnap=sal_True;
+    bMoveOPntSnap=sal_True;
+    bMoveOConSnap=sal_True;
+    bMoveSnapOnlyTopLeft=sal_False;
+    bOrtho=sal_False;
+    bBigOrtho=sal_True;
     nSnapAngle=1500;
-    bAngleSnapEnab=FALSE;
-    bMoveOnlyDragging=FALSE;
-    bSlantButShear=FALSE;
-    bCrookNoContortion=FALSE;
+    bAngleSnapEnab=sal_False;
+    bMoveOnlyDragging=sal_False;
+    bSlantButShear=sal_False;
+    bCrookNoContortion=sal_False;
     eCrookMode=SDRCROOK_ROTATE;
-    bHlplFixed=FALSE;
-    bEliminatePolyPoints=FALSE;
+    bHlplFixed=sal_False;
+    bEliminatePolyPoints=sal_False;
     nEliminatePolyPointLimitAngle=0;
 
     // #114409#-1 Migrate PageOrigin
@@ -258,7 +258,7 @@ SdrSnapView::~SdrSnapView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrSnapView::IsAction() const
+sal_Bool SdrSnapView::IsAction() const
 {
     return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction();
 }
@@ -318,7 +318,7 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const
 }
 
 #define NOT_SNAPPED 0x7FFFFFFF
-USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
+sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
 {
     if (!bSnapEnab) return SDRSNAP_NOTSNAPPED;
     long x=rPnt.X();
@@ -336,8 +336,8 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
     if (bHlplVisible && bHlplSnap && !IsDragHelpLine()) 
     {
         const SdrHelpLineList& rHLL=pPV->GetHelpLines();
-        USHORT nAnz=rHLL.GetCount();
-        for (USHORT i=nAnz; i>0;) {
+        sal_uInt16 nAnz=rHLL.GetCount();
+        for (sal_uInt16 i=nAnz; i>0;) {
             i--;
             const SdrHelpLine& rHL=rHLL[i];
             const Point& rPos=rHL.GetPos();
@@ -380,11 +380,11 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
         a=y- ys     ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante
     }
     if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) {
-        ULONG nMaxPointSnapCount=200;
-        ULONG nMaxFrameSnapCount=200;
+        sal_uIntPtr nMaxPointSnapCount=200;
+        sal_uIntPtr nMaxFrameSnapCount=200;
         
         // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
-        SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,TRUE);
+        SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True);
 
         while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) {
             SdrObject* pO=aIter.Next();
@@ -460,7 +460,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
             dy = 0;
         }
     }
-    BOOL bRet=SDRSNAP_NOTSNAPPED;
+    sal_Bool bRet=SDRSNAP_NOTSNAPPED;
     if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED;
     if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED;
     rPnt.X()=x+dx;
@@ -471,7 +471,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
 void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const
 {
     Point aPt(rPt);
-    USHORT nRet=SnapPos(aPt,pPV);
+    sal_uInt16 nRet=SnapPos(aPt,pPV);
     aPt-=rPt;
     if ((nRet & SDRSNAP_XSNAPPED) !=0) {
         if (bXSnapped) {
@@ -480,7 +480,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
             }
         } else {
             nBestXSnap=aPt.X();
-            bXSnapped=TRUE;
+            bXSnapped=sal_True;
         }
     }
     if ((nRet & SDRSNAP_YSNAPPED) !=0) {
@@ -490,17 +490,17 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
             }
         } else {
             nBestYSnap=aPt.Y();
-            bYSnapped=TRUE;
+            bYSnapped=sal_True;
         }
     }
 }
 
-USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
+sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
 {
     long nBestXSnap=0;
     long nBestYSnap=0;
-    bool bXSnapped=FALSE;
-    bool bYSnapped=FALSE;
+    bool bXSnapped=sal_False;
+    bool bYSnapped=sal_False;
     CheckSnap(rRect.TopLeft()    ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
     if (!bMoveSnapOnlyTopLeft) {
         CheckSnap(rRect.TopRight()   ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
@@ -509,7 +509,7 @@ USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, lon
     }
     rDX=nBestXSnap;
     rDY=nBestYSnap;
-    USHORT nRet=0;
+    sal_uInt16 nRet=0;
     if (bXSnapped) nRet+=SDRSNAP_XSNAPPED;
     if (bYSnapped) nRet+=SDRSNAP_YSNAPPED;
     return nRet;
@@ -574,7 +574,7 @@ void SdrSnapView::BrkSetPageOrg()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const
+sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const
 {
     rpPV=NULL;
     nTol=ImpGetHitTolLogic(nTol,&rOut);
@@ -583,7 +583,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
     if(pPV)
     {
         Point aPnt(rPnt);
-        USHORT nIndex=pPV->GetHelpLines().HitTest(aPnt,USHORT(nTol),rOut);
+        sal_uInt16 nIndex=pPV->GetHelpLines().HitTest(aPnt,sal_uInt16(nTol),rOut);
         if (nIndex!=SDRHELPLINE_NOTFOUND) {
             rpPV=pPV;
             rnHelpLineNum=nIndex;
@@ -594,7 +594,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
 }
 
 // start HelpLine drag for new HelpLine
-sal_Bool SdrSnapView::BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV)
+sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
 {
     sal_Bool bRet(sal_False);
 
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 05f00c9f3f..2616ec516d 100644..100755
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 /* StarView resource file */
 
-#include "svdstr.hrc"
+#include "svx/svdstr.hrc"
  // Ab hier gecachte Strings
 String STR_ObjNameSingulNONE
 {
@@ -2745,6 +2745,11 @@ String SIP_SA_GRAFRESERVE4 { Text = "" ; };
 String SIP_SA_GRAFRESERVE5 { Text = "" ; };
 String SIP_SA_GRAFRESERVE6 { Text = "" ; };
 
+Bitmap SIP_SA_PAGESHADOW35X35
+{
+    File = "pageshadow35x35.png";
+};
+
 Bitmap SIP_SA_MARKERS
 {
     File = "markers.png";
@@ -2848,4 +2853,12 @@ Bitmap SIP_SA_CROP_FINE_MARKERS
     File = "cropmarkers2.png";
 };
 
-// ******************************************************************* EOF
+String STR_ObjNameSingulFONTWORK
+{
+    Text [ en-US ] = "font work" ;
+};
+String STR_ObjNamePluralFONTWORK
+{
+    Text [ en-US ] = "font works" ;
+};
+
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 1e270a8239..6252bdd5ab 100644..100755
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -77,7 +77,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner )
 
 void SdrText::ReformatText()
 {
-    mbPortionInfoChecked=FALSE;
+    mbPortionInfoChecked=sal_False;
     mpOutlinerParaObject->ClearPortionInfo();
 }
 
@@ -141,7 +141,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
 
     if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL)
     {
-        bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, TRUE) == SFX_ITEM_SET;
+        bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET;
 
         MapUnit aOldUnit(pOldModel->GetScaleUnit());
         MapUnit aNewUnit(pNewModel->GetScaleUnit());
@@ -150,10 +150,10 @@ void SdrText::SetModel( SdrModel* pNewModel )
         // !!! Hier muss noch DefTab und RefDevice der beiden Models
         // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!!
         // !!! fehlende Implementation !!!
-        ULONG nOldFontHgt=pOldModel->GetDefaultFontHeight();
-        ULONG nNewFontHgt=pNewModel->GetDefaultFontHeight();
-        BOOL bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
-        BOOL bSetHgtItem=bDefHgtChanged && !bHgtSet;
+        sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight();
+        sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight();
+        sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
+        sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
         if (bSetHgtItem)
         { // #32665#
             // zunaechst das HeightItem festklopfen, damit
@@ -173,7 +173,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
             // Funktioniert nicht richtig:
             // Geht am Outliner leider nur in %
             // double nPercFloat=double(aMetricFactor)*100+0.5;
-            // USHORT nPerc=(USHORT)nPercFloat;
+            // sal_uInt16 nPerc=(sal_uInt16)nPercFloat;
             // rOutliner.DoStretchChars(100,nPerc);
 
             if (bSetHgtItem)
@@ -185,12 +185,12 @@ void SdrText::SetModel( SdrModel* pNewModel )
         }
         SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494#
         mpOutlinerParaObject->ClearPortionInfo();
-        mbPortionInfoChecked=FALSE;
+        mbPortionInfoChecked=sal_False;
         rOutliner.Clear();
     }
 }
 
-void SdrText::ForceOutlinerParaObject( USHORT nOutlMode )
+void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode )
 {
     if( mpModel && !mpOutlinerParaObject )
     {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 6b8935662c..1a0fd40052 100644..100755
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -93,32 +93,32 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
 
 void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoint(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoint(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizePoly(rPoly[i],rRef,xFact,yFact);
     }
 }
 
 void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ResizeXPoly(rPoly[i],rRef,xFact,yFact);
     }
 }
@@ -127,32 +127,32 @@ void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact,
 
 void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoint(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoint(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotatePoly(rPoly[i],rRef,sn,cs);
     }
 }
 
 void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         RotateXPoly(rPoly[i],rRef,sn,cs);
     }
 }
@@ -202,32 +202,32 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
 
 void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoint(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoint(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorPoly(rPoly[i],rRef1,rRef2);
     }
 }
 
 void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         MirrorXPoly(rPoly[i],rRef1,rRef2);
     }
 }
@@ -236,32 +236,32 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
 
 void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear)
 {
-    USHORT nAnz=rPoly.GetSize();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetSize();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoint(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
 {
-    USHORT nAnz=rPoly.GetPointCount();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.GetPointCount();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoint(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearPoly(rPoly[i],rRef,tn,bVShear);
     }
 }
 
 void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
 {
-    USHORT nAnz=rPoly.Count();
-    for (USHORT i=0; i<nAnz; i++) {
+    sal_uInt16 nAnz=rPoly.Count();
+    for (sal_uInt16 i=0; i<nAnz; i++) {
         ShearXPoly(rPoly[i],rRef,tn,bVShear);
     }
 }
@@ -400,8 +400,8 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
 void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -423,8 +423,8 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, b
 void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -446,8 +446,8 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bo
 void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect)
 {
     double nSin,nCos;
-    USHORT nPointAnz=rPoly.GetPointCount();
-    USHORT i=0;
+    sal_uInt16 nPointAnz=rPoly.GetPointCount();
+    sal_uInt16 i=0;
     while (i<nPointAnz) {
         Point* pPnt=&rPoly[i];
         Point* pC1=NULL;
@@ -470,24 +470,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad,
 
 void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert);
     }
 }
 
 void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert);
     }
 }
 
 void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect)
 {
-    USHORT nPolyAnz=rPoly.Count();
-    for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+    sal_uInt16 nPolyAnz=rPoly.Count();
+    for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
         CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect);
     }
 }
@@ -522,7 +522,7 @@ long NormAngle360(long a)
     return a;
 }
 
-USHORT GetAngleSector(long nWink)
+sal_uInt16 GetAngleSector(long nWink)
 {
     while (nWink<0) nWink+=36000;
     while (nWink>=36000) nWink-=36000;
@@ -701,17 +701,17 @@ long BigMulDiv(long nVal, long nMul, long nDiv)
 
 void Kuerzen(Fraction& rF, unsigned nDigits)
 {
-    INT32 nMul=rF.GetNumerator();
-    INT32 nDiv=rF.GetDenominator();
+    sal_Int32 nMul=rF.GetNumerator();
+    sal_Int32 nDiv=rF.GetDenominator();
     bool bNeg = false;
     if (nMul<0) { nMul=-nMul; bNeg=!bNeg; }
     if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; }
     if (nMul==0 || nDiv==0) return;
-    UINT32 a;
-    a=UINT32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
+    sal_uInt32 a;
+    a=sal_uInt32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
     while (a<0x00800000) { nMulZ+=8; a<<=8; }
     while (a<0x80000000) { nMulZ++; a<<=1; }
-    a=UINT32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
+    a=sal_uInt32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
     while (a<0x00800000) { nDivZ+=8; a<<=8; }
     while (a<0x80000000) { nDivZ++; a<<=1; }
     // Anzahl der verwendeten Digits bestimmen
@@ -948,7 +948,7 @@ void SdrFormatter::Undirty()
     nMul_=nMul1;
     nDiv_=nDiv1;
     nKomma_=nKomma1;
-    bDirty=FALSE;
+    bDirty=sal_False;
 }
 
 
@@ -964,7 +964,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const
     }
 
     // Hier fallen trotzdem evtl. Nachkommastellen weg, wg. MulDiv statt Real
-    BOOL bNeg(nVal < 0);
+    sal_Bool bNeg(nVal < 0);
     SvtSysLocale aSysLoc;
     const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 2121e02df3..50c22eb2e3 100644..100755
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -30,15 +30,15 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdundo.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/scene3d.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdogrp.hxx>
@@ -48,7 +48,7 @@
 #include <svl/whiter.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -58,7 +58,7 @@ static void ImplUnmarkObject( SdrObject* pObj )
     SdrViewIter aIter( pObj );
     for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
     {
-        pView->MarkObj( pObj, pView->GetSdrPageView(), TRUE );
+        pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True );
     }
 }
 
@@ -66,11 +66,11 @@ static void ImplUnmarkObject( SdrObject* pObj )
 
 TYPEINIT1(SdrUndoAction,SfxUndoAction);
 
-BOOL SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
+sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
 {
     SdrView* pV=PTR_CAST(SdrView,&rView);
     if (pV!=NULL) return CanSdrRepeat(*pV);
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
@@ -89,7 +89,7 @@ XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
 
 bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
@@ -123,7 +123,7 @@ SdrUndoGroup::~SdrUndoGroup()
 
 void SdrUndoGroup::Clear()
 {
-    for (ULONG nu=0; nu<GetActionCount(); nu++) {
+    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         delete pAct;
     }
@@ -137,12 +137,12 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct)
 
 void SdrUndoGroup::push_front( SdrUndoAction* pAct )
 {
-    aBuf.Insert(pAct, (ULONG)0 );
+    aBuf.Insert(pAct, (sal_uIntPtr)0 );
 }
 
 void SdrUndoGroup::Undo()
 {
-    for (ULONG nu=GetActionCount(); nu>0;) {
+    for (sal_uIntPtr nu=GetActionCount(); nu>0;) {
         nu--;
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Undo();
@@ -151,7 +151,7 @@ void SdrUndoGroup::Undo()
 
 void SdrUndoGroup::Redo()
 {
-    for (ULONG nu=0; nu<GetActionCount(); nu++) {
+    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Redo();
     }
@@ -171,14 +171,14 @@ XubString SdrUndoGroup::GetComment() const
 bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
 {
     switch (eFunction) {
-        case SDRREPFUNC_OBJ_NONE			:  return FALSE;
+        case SDRREPFUNC_OBJ_NONE			:  return sal_False;
         case SDRREPFUNC_OBJ_DELETE          :  return rView.AreObjectsMarked();
-        case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  return rView.IsCombinePossible(FALSE);
-        case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  return rView.IsCombinePossible(TRUE);
-        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  return rView.IsDismantlePossible(FALSE);
-        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  return rView.IsDismantlePossible(TRUE);
-        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  return rView.IsConvertToPolyObjPossible(FALSE);
-        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  return rView.IsConvertToPathObjPossible(FALSE);
+        case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  return rView.IsCombinePossible(sal_False);
+        case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  return rView.IsCombinePossible(sal_True);
+        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  return rView.IsDismantlePossible(sal_False);
+        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  return rView.IsDismantlePossible(sal_True);
+        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  return rView.IsConvertToPolyObjPossible(sal_False);
+        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  return rView.IsConvertToPathObjPossible(sal_False);
         case SDRREPFUNC_OBJ_GROUP           :  return rView.IsGroupPossible();
         case SDRREPFUNC_OBJ_UNGROUP         :  return rView.IsUnGroupPossible();
         case SDRREPFUNC_OBJ_PUTTOTOP        :  return rView.IsToTopPossible();
@@ -189,7 +189,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
         case SDRREPFUNC_OBJ_IMPORTMTF       :  return rView.IsImportMtfPossible();
         default: break;
     } // switch
-    return FALSE;
+    return sal_False;
 }
 
 void SdrUndoGroup::SdrRepeat(SdrView& rView)
@@ -199,10 +199,10 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
         case SDRREPFUNC_OBJ_DELETE          :  rView.DeleteMarked();                break;
         case SDRREPFUNC_OBJ_COMBINE_POLYPOLY:  rView.CombineMarkedObjects(sal_False);   break;
         case SDRREPFUNC_OBJ_COMBINE_ONEPOLY :  rView.CombineMarkedObjects(sal_True);    break;
-        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  rView.DismantleMarkedObjects(FALSE); break;
-        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  rView.DismantleMarkedObjects(TRUE);  break;
-        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  rView.ConvertMarkedToPolyObj(FALSE); break;
-        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  rView.ConvertMarkedToPathObj(FALSE); break;
+        case SDRREPFUNC_OBJ_DISMANTLE_POLYS :  rView.DismantleMarkedObjects(sal_False); break;
+        case SDRREPFUNC_OBJ_DISMANTLE_LINES :  rView.DismantleMarkedObjects(sal_True);  break;
+        case SDRREPFUNC_OBJ_CONVERTTOPOLY   :  rView.ConvertMarkedToPolyObj(sal_False); break;
+        case SDRREPFUNC_OBJ_CONVERTTOPATH   :  rView.ConvertMarkedToPathObj(sal_False); break;
         case SDRREPFUNC_OBJ_GROUP           :  rView.GroupMarked();                 break;
         case SDRREPFUNC_OBJ_UNGROUP         :  rView.UnGroupMarked();               break;
         case SDRREPFUNC_OBJ_PUTTOTOP        :  rView.PutMarkedToTop();              break;
@@ -246,7 +246,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
 {
 }
 
-void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat )
+void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat )
 {
     rStr = ImpGetResStr(nStrCacheID);
 
@@ -272,7 +272,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, US
     }
 }
 
-void SdrUndoObj::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, bool bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, bool bRepeat) const
 {
     if ( pObj )
         GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
@@ -303,7 +303,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave
     pUndoStyleSheet(NULL),
     pRedoStyleSheet(NULL),
     pRepeatStyleSheet(NULL),
-    bHaveToTakeRedoSet(TRUE),
+    bHaveToTakeRedoSet(sal_True),
     pTextUndo(NULL),
 
     // #i8508#
@@ -314,8 +314,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave
     bStyleSheet = bStyleSheet1;
 
     SdrObjList* pOL = rNewObj.GetSubList();
-    BOOL bIsGroup(pOL!=NULL && pOL->GetObjCount());
-    BOOL bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
+    sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount());
+    sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
 
     if(bIsGroup)
     {
@@ -380,7 +380,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
 void SdrUndoAttrObj::Undo()
 {
     E3DModifySceneSnapRectUpdater aUpdater(pObj);
-    BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+    sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
 
     // #94278# Trigger PageChangeCall
     ImpShowPageOfThisObject();
@@ -389,7 +389,7 @@ void SdrUndoAttrObj::Undo()
     {
         if(bHaveToTakeRedoSet)
         {
-            bHaveToTakeRedoSet = FALSE;
+            bHaveToTakeRedoSet = sal_False;
 
             if(pRedoSet)
             {
@@ -414,7 +414,7 @@ void SdrUndoAttrObj::Undo()
         if(bStyleSheet)
         {
             pRedoStyleSheet = pObj->GetStyleSheet();
-            pObj->SetStyleSheet(pUndoStyleSheet, TRUE);
+            pObj->SetStyleSheet(pUndoStyleSheet, sal_True);
         }
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -481,14 +481,14 @@ void SdrUndoAttrObj::Undo()
 void SdrUndoAttrObj::Redo()
 {
     E3DModifySceneSnapRectUpdater aUpdater(pObj);
-    BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+    sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
 
     if(!pUndoGroup || bIs3DScene)
     {
         if(bStyleSheet)
         {
             pUndoStyleSheet = pObj->GetStyleSheet();
-            pObj->SetStyleSheet(pRedoStyleSheet, TRUE);
+            pObj->SetStyleSheet(pRedoStyleSheet, sal_True);
         }
 
         sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -571,7 +571,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView)
 {
     if(pRepeatSet)
     {
-        rView.SetAttrToMarked(*pRepeatSet, FALSE);
+        rView.SetAttrToMarked(*pRepeatSet, sal_False);
     }
 }
 
@@ -586,11 +586,11 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 
     if(bStyleSheet)
     {
-        ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, TRUE);
+        ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True);
     }
     else
     {
-        ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, TRUE);
+        ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True);
     }
 
     return aStr;
@@ -634,7 +634,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
 XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_EditMove,aStr,TRUE);
+    ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True);
     return aStr;
 }
 
@@ -652,8 +652,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
         // Aha, Gruppenobjekt
         // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen
         pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
-        ULONG nObjAnz=pOL->GetObjCount();
-        for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+        sal_uIntPtr nObjAnz=pOL->GetObjCount();
+        for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
             pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum)));
         }
     } else {
@@ -721,7 +721,7 @@ XubString SdrUndoGeoObj::GetComment() const
 
 SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
 :	SdrUndoObj(rNewObj),
-    bOwner(FALSE),
+    bOwner(sal_False),
     pView(NULL),
     pPageView(NULL)
 {
@@ -738,7 +738,7 @@ SdrUndoObjList::~SdrUndoObjList()
     if (pObj!=NULL && IsOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetOwner(FALSE);
+        SetOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pObj );
@@ -854,14 +854,14 @@ void SdrUndoDelObj::Undo()
 {
     SdrUndoRemoveObj::Undo();
     DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj gehoert nicht der UndoAction");
-    SetOwner(FALSE);
+    SetOwner(sal_False);
 }
 
 void SdrUndoDelObj::Redo()
 {
     SdrUndoRemoveObj::Redo();
     DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der UndoAction");
-    SetOwner(TRUE);
+    SetOwner(sal_True);
 }
 
 XubString SdrUndoDelObj::GetComment() const
@@ -884,7 +884,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
 XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_EditDelete,aStr,TRUE);
+    ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True);
     return aStr;
 }
 
@@ -894,14 +894,14 @@ void SdrUndoNewObj::Undo()
 {
     SdrUndoInsertObj::Undo();
     DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der UndoAction");
-    SetOwner(TRUE);
+    SetOwner(sal_True);
 }
 
 void SdrUndoNewObj::Redo()
 {
     SdrUndoInsertObj::Redo();
     DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction");
-    SetOwner(FALSE);
+    SetOwner(sal_False);
 }
 
 String SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
@@ -920,11 +920,11 @@ XubString SdrUndoNewObj::GetComment() const
 
 SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect)
 :	SdrUndoObj(rOldObj1),
-    bOldOwner(FALSE),
-    bNewOwner(FALSE),
+    bOldOwner(sal_False),
+    bNewOwner(sal_False),
     pNewObj(&rNewObj1)
 {
-    SetOldOwner(TRUE);
+    SetOldOwner(sal_True);
 
     pObjList=pObj->GetObjList();
     if (bOrdNumDirect) {
@@ -939,7 +939,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
     if (pObj!=NULL && IsOldOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetOldOwner(FALSE);
+        SetOldOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pObj );
@@ -947,7 +947,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
     if (pNewObj!=NULL && IsNewOwner())
     {
         // Attribute muessen wieder in den regulaeren Pool
-        SetNewOwner(FALSE);
+        SetNewOwner(sal_False);
 
         // nun loeschen
         SdrObject::Free( pNewObj );
@@ -963,8 +963,8 @@ void SdrUndoReplaceObj::Undo()
     {
         DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Altes Objekt ist bereits inserted!");
         DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Neues Objekt ist nicht inserted!");
-        SetOldOwner(FALSE);
-        SetNewOwner(TRUE);
+        SetOldOwner(sal_False);
+        SetNewOwner(sal_True);
 
         ImplUnmarkObject( pNewObj );
         pObjList->ReplaceObject(pObj,nOrdNum);
@@ -981,8 +981,8 @@ void SdrUndoReplaceObj::Redo()
     {
         DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Neues Objekt ist bereits inserted!");
         DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Altes Objekt ist nicht inserted!");
-        SetOldOwner(TRUE);
-        SetNewOwner(FALSE);
+        SetOldOwner(sal_True);
+        SetNewOwner(sal_False);
 
         ImplUnmarkObject( pObj );
         pObjList->ReplaceObject(pNewObj,nOrdNum);
@@ -1040,7 +1040,7 @@ void SdrUndoObjectLayerChange::Redo()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1):
+SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1):
     SdrUndoObj(rNewObj),
     nOldOrdNum(nOldOrdNum1),
     nNewOrdNum(nNewOrdNum1)
@@ -1086,8 +1086,8 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText)
 : SdrUndoObj(rNewObj)
 , pOldText(NULL)
 , pNewText(NULL)
-, bNewTextAvailable(FALSE)
-, bEmptyPresObj(FALSE)
+, bNewTextAvailable(sal_False)
+, bEmptyPresObj(sal_False)
 , mnText(nText)
 {
     SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText);
@@ -1112,7 +1112,7 @@ void SdrUndoObjSetText::AfterSetText()
         SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
         if( pText && pText->GetOutlinerParaObject() )
             pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject());
-        bNewTextAvailable=TRUE;
+        bNewTextAvailable=sal_True;
     }
 }
 
@@ -1184,8 +1184,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
             rView.BegUndo(aStr);
         }
 
-        ULONG nAnz=rML.GetMarkCount();
-        for (ULONG nm=0; nm<nAnz; nm++)
+        sal_uIntPtr nAnz=rML.GetMarkCount();
+        for (sal_uIntPtr nm=0; nm<nAnz; nm++)
         {
             SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj();
             SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2);
@@ -1210,7 +1210,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
 {
     bool bOk = false;
     if (bNewTextAvailable && rView.AreObjectsMarked()) {
-        bOk=TRUE;
+        bOk=sal_True;
     }
     return bOk;
 }
@@ -1318,12 +1318,12 @@ String SdrUndoObjStrAttr::GetComment() const
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrUndoLayer::SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
+SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
     SdrUndoAction(rNewModel),
     pLayer(rNewLayerAdmin.GetLayer(nLayerNum)),
     pLayerAdmin(&rNewLayerAdmin),
     nNum(nLayerNum),
-    bItsMine(FALSE)
+    bItsMine(sal_False)
 {
 }
 
@@ -1339,7 +1339,7 @@ SdrUndoLayer::~SdrUndoLayer()
 void SdrUndoNewLayer::Undo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 #ifdef DBG_UTIL
     SdrLayer* pCmpLayer=
 #endif
@@ -1350,7 +1350,7 @@ void SdrUndoNewLayer::Undo()
 void SdrUndoNewLayer::Redo()
 {
     DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
@@ -1364,14 +1364,14 @@ XubString SdrUndoNewLayer::GetComment() const
 void SdrUndoDelLayer::Undo()
 {
     DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
 void SdrUndoDelLayer::Redo()
 {
     DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 #ifdef DBG_UTIL
     SdrLayer* pCmpLayer=
 #endif
@@ -1431,7 +1431,7 @@ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg)
 {
 }
 
-void SdrUndoPage::ImpInsertPage(USHORT nNum)
+void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum)
 {
     DBG_ASSERT(!mrPage.IsInserted(),"SdrUndoPage::ImpInsertPage(): mrPage ist bereits Inserted");
     if (!mrPage.IsInserted()) {
@@ -1443,7 +1443,7 @@ void SdrUndoPage::ImpInsertPage(USHORT nNum)
     }
 }
 
-void SdrUndoPage::ImpRemovePage(USHORT nNum)
+void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum)
 {
     DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage ist nicht Inserted");
     if (mrPage.IsInserted()) {
@@ -1458,7 +1458,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum)
     }
 }
 
-void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
+void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
 {
     DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpMovePage(): mrPage ist nicht Inserted");
     if (mrPage.IsInserted()) {
@@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
     }
 }
 
-void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT /*n*/, bool /*bRepeat*/) const
+void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const
 {
     rStr=ImpGetResStr(nStrCacheID);
 }
@@ -1479,7 +1479,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
 
 SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg):
     SdrUndoPage(rNewPg),
-    bItsMine(FALSE)
+    bItsMine(sal_False)
 {
     nPageNum=rNewPg.GetPageNum();
 }
@@ -1498,7 +1498,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg):
     SdrUndoPageList(rNewPg),
     pUndoGroup(NULL)
 {
-    bItsMine = TRUE;
+    bItsMine = sal_True;
 
     // Und nun ggf. die MasterPage-Beziehungen merken
     if(mrPage.IsMasterPage())
@@ -1541,7 +1541,7 @@ void SdrUndoDelPage::Undo()
         pUndoGroup->Undo();
     }
     DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
 }
 
 void SdrUndoDelPage::Redo()
@@ -1549,20 +1549,20 @@ void SdrUndoDelPage::Redo()
     ImpRemovePage(nPageNum);
     // Die MasterPage-Beziehungen werden ggf. von selbst geloesst
     DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 }
 
 XubString SdrUndoDelPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
     return aStr;
 }
 
 XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1581,20 +1581,20 @@ void SdrUndoNewPage::Undo()
 {
     ImpRemovePage(nPageNum);
     DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage gehoert bereits der UndoAction");
-    bItsMine=TRUE;
+    bItsMine=sal_True;
 }
 
 void SdrUndoNewPage::Redo()
 {
     ImpInsertPage(nPageNum);
     DBG_ASSERT(bItsMine,"RedoNewPage: mrPage gehoert nicht der UndoAction");
-    bItsMine=FALSE;
+    bItsMine=sal_False;
 }
 
 XubString SdrUndoNewPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1603,14 +1603,14 @@ XubString SdrUndoNewPage::GetComment() const
 XubString SdrUndoCopyPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
     return aStr;
 }
 
 XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1639,7 +1639,7 @@ void SdrUndoSetPageNum::Redo()
 XubString SdrUndoSetPageNum::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1695,7 +1695,7 @@ void SdrUndoPageRemoveMasterPage::Redo()
 XubString SdrUndoPageRemoveMasterPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1740,7 +1740,7 @@ void SdrUndoPageChangeMasterPage::Redo()
 XubString SdrUndoPageChangeMasterPage::GetComment() const
 {
     XubString aStr;
-    ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,FALSE);
+    ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False);
     return aStr;
 }
 
@@ -1764,32 +1764,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject )
 
 SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
 {
-    return new SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE );
+    return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoInsertObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoDelObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoNewObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect )
 {
-    return new SdrUndoCopyObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1)
@@ -1799,7 +1799,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u
 
 SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
 {
-    return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE );
+    return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False );
 }
 
 SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 0998ee361a..76d1fd2c87 100644..100755
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -30,8 +30,8 @@
 #include "precompiled_svx.hxx"
 #include <editeng/eeitem.hxx>
 
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
@@ -56,7 +56,7 @@
 #include <tools/tenccvt.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
 
@@ -77,20 +77,20 @@ SdrViewEvent::SdrViewEvent()
       nMouseCode(0),
       nHlplIdx(0),
       nGlueId(0),
-      bMouseDown(FALSE),
-      bMouseUp(FALSE),
-      bDoubleHdlSize(FALSE),
-      bIsAction(FALSE),
-      bIsTextEdit(FALSE),
-      bTextEditHit(FALSE),
-      bAddMark(FALSE),
-      bUnmark(FALSE),
-      bPrevNextMark(FALSE),
-      bMarkPrev(FALSE),
-      bInsPointNewObj(FALSE),
-      bDragWithCopy(FALSE),
-      bCaptureMouse(FALSE),
-      bReleaseMouse(FALSE)
+      bMouseDown(sal_False),
+      bMouseUp(sal_False),
+      bDoubleHdlSize(sal_False),
+      bIsAction(sal_False),
+      bIsTextEdit(sal_False),
+      bTextEditHit(sal_False),
+      bAddMark(sal_False),
+      bUnmark(sal_False),
+      bPrevNextMark(sal_False),
+      bMarkPrev(sal_False),
+      bInsPointNewObj(sal_False),
+      bDragWithCopy(sal_False),
+      bCaptureMouse(sal_False),
+      bReleaseMouse(sal_False)
 {
 }
 
@@ -176,12 +176,12 @@ TYPEINIT1(SdrView,SdrCreateView);
 
 SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
 :	SdrCreateView(pModel1,pOut),
-    bNoExtendedMouseDispatcher(FALSE),
-    bNoExtendedKeyDispatcher(FALSE),
-    bNoExtendedCommandDispatcher(FALSE),
+    bNoExtendedMouseDispatcher(sal_False),
+    bNoExtendedKeyDispatcher(sal_False),
+    bNoExtendedCommandDispatcher(sal_False),
     mbMasterPagePaintCaching(sal_False)
 {
-    bTextEditOnObjectsWithoutTextIfTextTool=FALSE;
+    bTextEditOnObjectsWithoutTextIfTextTool=sal_False;
 
     maAccessibilityOptions.AddListener(this);
 
@@ -193,12 +193,12 @@ SdrView::~SdrView()
     maAccessibilityOptions.RemoveListener(this);
 }
 
-BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    BOOL bRet=SdrCreateView::KeyInput(rKEvt,pWin);
+    sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin);
     if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
-        bRet=TRUE;
+        bRet=sal_True;
         switch (rKEvt.GetKeyCode().GetFullFunction()) {
             case KEYFUNC_CUT   : Cut(); break;
             case KEYFUNC_COPY  : Yank(); break;
@@ -222,7 +222,7 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
                     case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break;
                     case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break;
                     case KEY_MOD1+KEY_A: MarkAll(); break;
-                    default: bRet=FALSE;
+                    default: bRet=sal_False;
                 } // switch
             }
         } // switch
@@ -236,11 +236,11 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(TRUE);
-    BOOL bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
+    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True);
+    sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
     if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt);
@@ -249,12 +249,12 @@ BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(FALSE);
-    BOOL bAction=IsAction();
-    BOOL bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
+    if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False);
+    sal_Bool bAction=IsAction();
+    sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
     if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt);
@@ -263,15 +263,15 @@ BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     SetActualWin(pWin);
     aDragStat.SetMouseDown(rMEvt.IsLeft());
-    BOOL bRet=SdrCreateView::MouseMove(rMEvt,pWin);
+    sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin);
     if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) {
         SdrViewEvent aVEvt;
         PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt);
-        if (DoMouseEvent(aVEvt)) bRet=TRUE;
+        if (DoMouseEvent(aVEvt)) bRet=sal_True;
     }
 
     // #87792# Removed code which did let the mouse snap on object
@@ -280,26 +280,26 @@ BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
     return bRet;
 }
 
-BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
 {
     SetActualWin(pWin);
-    BOOL bRet=SdrCreateView::Command(rCEvt,pWin);
+    sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin);
     return bRet;
 }
 
 /* new interface src537 */
-BOOL SdrView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr);
 }
 
 SfxStyleSheet* SdrView::GetStyleSheet() const
 {
-    //BOOL bOk=FALSE;
+    //sal_Bool bOk=sal_False;
     return SdrCreateView::GetStyleSheet(); //bOk);
 }
 
-SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, USHORT nEventKind, SdrViewEvent& rVEvt) const
+SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const
 {
     rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN;
     rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP;
@@ -353,29 +353,29 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     // #i73628# Use a non-changeable copy of he logic pos
     const Point aLocalLogicPosition(rLogicPos);
 
-    BOOL bEditMode=IsEditMode();
-    BOOL bPointMode=bEditMode && HasMarkablePoints();
-    BOOL bGluePointMode=IsGluePointEditMode();
-    BOOL bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
-    BOOL bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
-    BOOL bIsTextEdit=IsTextEdit();
-    BOOL bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
-    BOOL bTextEditSel=IsTextEditInSelectionMode();
-    BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
-    BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
-    BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+    sal_Bool bEditMode=IsEditMode();
+    sal_Bool bPointMode=bEditMode && HasMarkablePoints();
+    sal_Bool bGluePointMode=IsGluePointEditMode();
+    sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
+    sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
+    sal_Bool bIsTextEdit=IsTextEdit();
+    sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
+    sal_Bool bTextEditSel=IsTextEditInSelectionMode();
+    sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+    sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+    sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
     SdrHitKind eHit=SDRHIT_NONE;
     SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL;
     SdrPageView* pPV=NULL;
     SdrObject* pObj=NULL;
     SdrObject* pHitObj=NULL;
-    USHORT nHitPassNum=0;
-    USHORT nHlplIdx=0;
-    USHORT nGlueId=0;
+    sal_uInt16 nHitPassNum=0;
+    sal_uInt16 nHlplIdx=0;
+    sal_uInt16 nGlueId=0;
     if (bTextEditHit || bTextEditSel)
     {
         eHit=SDRHIT_TEXTEDIT;
-        bTextEditHit=TRUE;
+        bTextEditHit=sal_True;
     }
     else if (pHdl!=NULL)
     {
@@ -437,8 +437,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT)
     {
         bool bRoot=pObj->HasMacro();
-        BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro();
-        BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen?
+        sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
+        sal_Bool bMid=sal_False; // Gruppierte Gruppe mit Macro getroffen?
         SdrObject* pMidObj=NULL;
         if (pObj!=pHitObj)
         {
@@ -449,7 +449,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
             {
                 if (pObjTmp->HasMacro())
                 {
-                    bMid=TRUE;
+                    bMid=sal_True;
                     pMidObj=pObjTmp;
                 }
                 pObjTmp=pObjTmp->GetUpGroup();
@@ -495,7 +495,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
                 if( pTextObj->GetModel() )
                     pOutliner = &pTextObj->GetModel()->GetHitTestOutliner();
 
-                pTextObj->TakeTextRect( *pOutliner, aTextRect, FALSE, &aAnchor, FALSE );
+                pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False );
                 
                 // #i73628# Use a text-relative position for hit test in hit test outliner
                 Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft());
@@ -568,7 +568,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
             // TextEdit an Objekten im gesperrten Layer
             if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer()))
             {
-                bTEHit=FALSE;
+                bTEHit=sal_False;
             }
 
             if (bTEHit)
@@ -584,12 +584,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
         pObj=NULL;
         pPV=NULL;
     }
-    BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
-    BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
-    BOOL bMouseDown=rVEvt.bMouseDown;
-    BOOL bMouseUp=rVEvt.bMouseUp;
+    sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+    sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+    sal_Bool bMouseDown=rVEvt.bMouseDown;
+    sal_Bool bMouseUp=rVEvt.bMouseUp;
     SdrEventKind eEvent=SDREVENT_NONE;
-    BOOL bIsAction=IsAction();
+    sal_Bool bIsAction=IsAction();
 
     if (bIsAction)
     {
@@ -658,21 +658,21 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
         else if (eHit==SDRHIT_HANDLE)
         {
             eEvent=SDREVENT_BEGDRAGOBJ;    // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark
-            BOOL bGlue=pHdl->GetKind()==HDL_GLUE;
-            BOOL bPoly=!bGlue && IsPointMarkable(*pHdl);
-            BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected());
+            sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE;
+            sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl);
+            sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected());
             if (bGlue || bPoly)
             {
                 eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
                 if (MODKEY_DeepMark)
                 {
-                    rVEvt.bAddMark=TRUE;
-                    rVEvt.bPrevNextMark=TRUE;
+                    rVEvt.bAddMark=sal_True;
+                    rVEvt.bPrevNextMark=sal_True;
                     rVEvt.bMarkPrev=MODKEY_DeepBackw;
                 }
                 else if (MODKEY_MultiMark)
                 {
-                    rVEvt.bAddMark=TRUE;
+                    rVEvt.bAddMark=sal_True;
                     rVEvt.bUnmark=bMarked; // Toggle
                     if (bGlue)
                     {
@@ -778,23 +778,23 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
     return eHit;
 }
 
-BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
+sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrHitKind eHit=rVEvt.eHit;
     Point aLogicPos(rVEvt.aLogicPos);
 
-    BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
-    BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
-    BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
-    BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
-    //BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
-    BOOL bMouseDown=rVEvt.bMouseDown;
-    BOOL bMouseUp=rVEvt.bMouseUp;
+    sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+    sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+    sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+    sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+    //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+    sal_Bool bMouseDown=rVEvt.bMouseDown;
+    sal_Bool bMouseUp=rVEvt.bMouseUp;
     if (bMouseDown) {
-        if (bMouseLeft) aDragStat.SetMouseDown(TRUE);
+        if (bMouseLeft) aDragStat.SetMouseDown(sal_True);
     } else if (bMouseUp) {
-        if (bMouseLeft) aDragStat.SetMouseDown(FALSE);
+        if (bMouseLeft) aDragStat.SetMouseDown(sal_False);
     } else { // ansonsten MoueMove
         aDragStat.SetMouseDown(bMouseLeft);
     }
@@ -825,13 +825,13 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
         // sein muesste (wg. eHit).
     }
     switch (rVEvt.eEvent) {
-        case SDREVENT_NONE: bRet=FALSE; break;
-        case SDREVENT_TEXTEDIT: bRet=FALSE; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
-        case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=TRUE; break;
-        case SDREVENT_ENDACTION: EndAction(); bRet=TRUE; break;
-        case SDREVENT_BCKACTION: BckAction(); bRet=TRUE; break;
-        case SDREVENT_BRKACTION: BrkAction(); bRet=TRUE; break;
-        case SDREVENT_ENDMARK  : EndAction(); bRet=TRUE; break;
+        case SDREVENT_NONE: bRet=sal_False; break;
+        case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
+        case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break;
+        case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break;
+        case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break;
+        case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break;
+        case SDREVENT_ENDMARK  : EndAction(); bRet=sal_True; break;
         case SDREVENT_BRKMARK  : {
             BrkAction();
             if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) {
@@ -841,7 +841,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                 // - und ansonsten Objekte
                 if (!rVEvt.bAddMark) UnmarkAll();
             }
-            bRet=TRUE;
+            bRet=sal_True;
         } break;
         case SDREVENT_ENDCREATE: { // ggf. MarkObj
             SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT;
@@ -852,7 +852,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                     MarkObj(rVEvt.pRootObj,rVEvt.pPV);
                     if (eHit==SDRHIT_TEXTEDIT) 
                     {
-                        BOOL bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
+                        sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
                             SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L));
                     
                         if(bRet2) 
@@ -867,9 +867,9 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
                             }
                         }
                     }
-                    bRet=TRUE; // Obj markiert und ggf. TextEdit gestartet
-                } else bRet=FALSE; // Create abgebrochen, sonst nix weiter.
-            } else bRet=TRUE; // EndCreate mit TRUE returniert
+                    bRet=sal_True; // Obj markiert und ggf. TextEdit gestartet
+                } else bRet=sal_False; // Create abgebrochen, sonst nix weiter.
+            } else bRet=sal_True; // EndCreate mit sal_True returniert
         } break;
         case SDREVENT_ENDDRAG: {
             bRet=EndDragObj(IsDragWithCopy());
@@ -877,20 +877,20 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
         } break;
         case SDREVENT_MARKOBJ: { // + ggf. BegDrag
             if (!rVEvt.bAddMark) UnmarkAllObj();
-            BOOL bUnmark=rVEvt.bUnmark;
+            sal_Bool bUnmark=rVEvt.bUnmark;
             if (rVEvt.bPrevNextMark) {
                 bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev);
             } else {
                 SortMarkedObjects();
-                ULONG nAnz0=GetMarkedObjectCount();
+                sal_uIntPtr nAnz0=GetMarkedObjectCount();
                 bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark);
                 SortMarkedObjects();
-                ULONG nAnz1=GetMarkedObjectCount();
+                sal_uIntPtr nAnz1=GetMarkedObjectCount();
                 bUnmark=nAnz1<nAnz0;
             }
             if (!bUnmark) {
                 BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_MARKPOINT: { // + ggf. BegDrag
@@ -902,7 +902,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             }
             if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
                 BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_MARKGLUEPOINT: { // + ggf. BegDrag
@@ -915,7 +915,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
                 SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId);
                 BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog);
-                bRet=TRUE;
+                bRet=sal_True;
             }
         } break;
         case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break;
@@ -925,7 +925,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
             if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT;
             if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND;
             EndInsObjPoint(eCmd);
-            bRet=TRUE;
+            bRet=sal_True;
         } break;
         case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break;
         case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break;
@@ -959,14 +959,14 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
     if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) {
         Window* pWin=(Window*)pActualOutDev;
         // Maus links gedrueckt?
-        BOOL bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
+        sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
         // Maus links losgelassen?
-        BOOL bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
+        sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
         // Maus links gedrueckt oder gehalten?
-        BOOL bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
+        sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
         pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin,
                 rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1));
-        BOOL bAction=IsAction();
+        sal_Bool bAction=IsAction();
         if (bLeftDown && bAction) pWin->CaptureMouse();
         else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse();
     }
@@ -974,7 +974,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
 }
 #include <editeng/outlobj.hxx>
 
-Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const
+Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
 {
     // Actions
     if (IsCreateObj()) 
@@ -986,8 +986,6 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints())
             return Pointer(POINTER_NULL);
 
-        OSL_TRACE("SdrView::GetPreferedPointer(%lx) %lx\n", this, mpCurrentSdrDragMethod);
-
         return mpCurrentSdrDragMethod->GetSdrDragPointer();
     }
     if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW);
@@ -1003,7 +1001,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         aHitRec.bDown=bMacroDown;
         return pMacroObj->GetMacroPointer(aHitRec);
     }
-    //USHORT nTol=nHitTolLog;
+    //sal_uInt16 nTol=nHitTolLog;
     // TextEdit, ObjEdit, Macro
     if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/))) 
     {
@@ -1087,30 +1085,30 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         default: break;
     }
 
-    BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
+    sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
     SdrHdl* pHdl=aVEvt.pHdl;
     // Nun die Pointer fuer Dragging checken
     if (pHdl!=NULL || bMarkHit) {
         SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE;
-        BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
-        BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
-        BOOL bMov=eHdl==HDL_MOVE;
+        sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
+        sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
+        sal_Bool bMov=eHdl==HDL_MOVE;
         if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
             if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // weil Doppelklick oder Drag&Drop moeglich
             return Pointer(POINTER_MOVE);
         }
         switch (eDragMode) {
             case SDRDRAG_ROTATE: {
-                if ((bCorner || bMov) && !IsRotateAllowed(TRUE))
+                if ((bCorner || bMov) && !IsRotateAllowed(sal_True))
                     return Pointer(POINTER_NOTALLOWED);
 
                 // Sind 3D-Objekte selektiert?
-                BOOL b3DObjSelected = FALSE;
+                sal_Bool b3DObjSelected = sal_False;
 #ifndef SVX_LIGHT
-                for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
+                for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
                     SdrObject* pObj = GetMarkedObjectByIndex(a);
                     if(pObj && pObj->ISA(E3dObject))
-                        b3DObjSelected = TRUE;
+                        b3DObjSelected = sal_True;
                 }
 #endif
                 // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed
@@ -1123,7 +1121,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
             } break;
             case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: {
                 if (bCorner) {
-                    if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+                    if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
                     else return Pointer(POINTER_REFHAND);
                 }
                 if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED);
@@ -1136,18 +1134,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
                 if (bCorner || bVertex || bMov) {
                     SdrHdl* pH1=aHdl.GetHdl(HDL_REF1);
                     SdrHdl* pH2=aHdl.GetHdl(HDL_REF2);
-                    BOOL b90=FALSE;
-                    BOOL b45=FALSE;
+                    sal_Bool b90=sal_False;
+                    sal_Bool b45=sal_False;
                     Point aDif;
                     if (pH1!=NULL && pH2!=NULL) {
                         aDif=pH2->GetPos()-pH1->GetPos();
                         b90=(aDif.X()==0) || aDif.Y()==0;
                         b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
                     }
-                    BOOL bNo=FALSE;
-                    if (!IsMirrorAllowed(TRUE,TRUE)) bNo=TRUE; // Spiegeln ueberhaupt nicht erlaubt
-                    if (!IsMirrorAllowed(FALSE,FALSE) && !b45) bNo=TRUE; // freies Spiegeln nicht erlaubt
-                    if (!IsMirrorAllowed(TRUE,FALSE) && !b90) bNo=TRUE;  // Spiegeln hor/ver erlaubt
+                    sal_Bool bNo=sal_False;
+                    if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt
+                    if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt
+                    if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True;  // Spiegeln hor/ver erlaubt
                     if (bNo) return Pointer(POINTER_NOTALLOWED);
                     if (b90) {
                         return Pointer(POINTER_MIRROR);
@@ -1174,7 +1172,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
 
             case SDRDRAG_CROOK: {
                 if (bCorner || bVertex || bMov) {
-                    if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+                    if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
                     return Pointer(POINTER_CROOK);
                 }
             }
@@ -1185,7 +1183,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
             }
 
             default: {
-                if ((bCorner || bVertex) && !IsResizeAllowed(TRUE)) return Pointer(POINTER_NOTALLOWED);
+                if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED);
             }
         }
         if (pHdl!=NULL) return pHdl->GetPointer();
@@ -1267,7 +1265,7 @@ XubString SdrView::GetStatusText()
         ESelection aSel(pTextEditOutlinerView->GetSelection());
         long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
         if (aSel.nEndPara>0) {
-            for (USHORT nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
+            for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
                 nLin+=pTextEditOutliner->GetLineCount(nParaNum);
             }
         }
@@ -1275,18 +1273,18 @@ XubString SdrView::GetStatusText()
         // Am Ende einer Zeile eines mehrzeiligen Absatzes wird die Position
         // der naechsten Zeile des selben Absatzes angezeigt, so es eine solche
         // gibt.
-        USHORT nParaLine=0;
-        ULONG nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
-        BOOL bBrk=FALSE;
+        sal_uInt16 nParaLine=0;
+        sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
+        sal_Bool bBrk=sal_False;
         while (!bBrk) {
-            USHORT nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
-            BOOL bLastLine=(nParaLine==nParaLineAnz-1);
+            sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
+            sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
             if (nCol>nLen || (!bLastLine && nCol==nLen)) {
                 nCol-=nLen;
                 nLin++;
                 nParaLine++;
-            } else bBrk=TRUE;
-            if (nLen==0) bBrk=TRUE; // Sicherheitshalber
+            } else bBrk=sal_True;
+            if (nLen==0) bBrk=sal_True; // Sicherheitshalber
         }
 
         aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
@@ -1336,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const
     if( IsGluePointEditMode() )
         return SDRCONTEXT_GLUEPOINTEDIT;
 
-    const ULONG nMarkAnz = GetMarkedObjectCount();
+    const sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
 
     if( HasMarkablePoints() && !IsFrameHandles() )
     {
-        BOOL bPath=TRUE;
-        for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
+        sal_Bool bPath=sal_True;
+        for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
             if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj))
-                bPath=FALSE;
+                bPath=sal_False;
 
         if( bPath )
             return SDRCONTEXT_POINTEDIT;
@@ -1351,9 +1349,9 @@ SdrViewContext SdrView::GetContext() const
 
     if( GetMarkedObjectCount() )
     {
-        BOOL bGraf = TRUE, bMedia = TRUE, bTable = TRUE;
+        sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True;
         
-        for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
+        for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
         {
             const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
             DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );
@@ -1362,13 +1360,13 @@ SdrViewContext SdrView::GetContext() const
                 continue;
 
             if( !pMarkObj->ISA( SdrGrafObj ) )
-                bGraf = FALSE;
+                bGraf = sal_False;
             
             if( !pMarkObj->ISA( SdrMediaObj ) )
-                bMedia = FALSE;
+                bMedia = sal_False;
 
             if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) )
-                bTable = FALSE;
+                bTable = sal_False;
         }
 
         if( bGraf )
@@ -1409,24 +1407,24 @@ void SdrView::UnmarkAll()
     else UnmarkAllObj();
 }
 
-BOOL SdrView::IsAllMarked() const
+sal_Bool SdrView::IsAllMarked() const
 {
     if (IsTextEdit()) {
         return ImpIsTextEditAllSelected();
     }
     if (IsGluePointEditMode()) {
-        ULONG nAnz=GetMarkableGluePointCount();
+        sal_uIntPtr nAnz=GetMarkableGluePointCount();
         return nAnz!=0 && nAnz==GetMarkedGluePointCount();
     }
     if (HasMarkedPoints()) {
-        ULONG nAnz=GetMarkablePointCount();
+        sal_uIntPtr nAnz=GetMarkablePointCount();
         return nAnz!=0 && nAnz==GetMarkedPointCount();
     }
-    ULONG nAnz=GetMarkableObjCount();
+    sal_uIntPtr nAnz=GetMarkableObjCount();
     return nAnz!=0 && nAnz == GetMarkedObjectCount();
 }
 
-BOOL SdrView::IsMarkPossible() const
+sal_Bool SdrView::IsMarkPossible() const
 {
     if(IsTextEdit())
     {
@@ -1446,10 +1444,10 @@ BOOL SdrView::IsMarkPossible() const
     return HasMarkableObj();
 }
 
-BOOL SdrView::IsAllMarkPrevNextPossible() const
+sal_Bool SdrView::IsAllMarkPrevNextPossible() const
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode()) {
         return HasMarkableGluePoints();
@@ -1460,10 +1458,10 @@ BOOL SdrView::IsAllMarkPrevNextPossible() const
     return HasMarkableObj();
 }
 
-BOOL SdrView::MarkNext(BOOL bPrev)
+sal_Bool SdrView::MarkNext(sal_Bool bPrev)
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode() && HasMarkedGluePoints()) {
         return MarkNextGluePoint(bPrev);
@@ -1474,10 +1472,10 @@ BOOL SdrView::MarkNext(BOOL bPrev)
     return MarkNextObj(bPrev);
 }
 
-BOOL SdrView::MarkNext(const Point& rPnt, BOOL bPrev)
+sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev)
 {
     if (IsTextEdit()) {
-        return FALSE;
+        return sal_False;
     }
     if (IsGluePointEditMode() && HasMarkedGluePoints()) {
         //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!!
@@ -1535,9 +1533,9 @@ void SdrView::DeleteMarked()
     }
 }
 
-BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
+sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark)
 {
-    if (bUnmark) bAddMark=TRUE;
+    if (bUnmark) bAddMark=sal_True;
     if (IsGluePointEditMode()) {
         if (!bAddMark) UnmarkAllGluePoints();
         return BegMarkGluePoints(rPnt,bUnmark);
@@ -1550,12 +1548,12 @@ BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
     }
 }
 
-BOOL SdrView::IsDeleteMarkedPossible() const
+sal_Bool SdrView::IsDeleteMarkedPossible() const
 {
-    if (IsReadOnly()) return FALSE;
-    if (IsTextEdit()) return TRUE;
-    if (IsGluePointEditMode() && HasMarkedGluePoints()) return TRUE;
-    if (HasMarkedPoints()) return TRUE;
+    if (IsReadOnly()) return sal_False;
+    if (IsTextEdit()) return sal_True;
+    if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True;
+    if (HasMarkedPoints()) return sal_True;
     return IsDeleteMarkedObjPossible();
 }
 
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index e23fbeb78d..4b9c63470d 100644..100755
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -37,7 +37,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdsob.hxx>
 #include <svl/brdcst.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -135,7 +135,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
 
                             if(!aObjLay.IsEmpty()) 
                             {
-                                return TRUE;
+                                return sal_True;
                             } // ansonsten die naechste MasterPage der Page ansehen...
                         } 
                         else 
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 3bd42220de..490448c222 100644..100755
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -31,11 +31,11 @@
 
 #include <vector>
 #include <editeng/editeng.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/svdxcgv.hxx>
 #include <svx/svdoutl.hxx>
-#include "svditext.hxx"
+#include "svx/svditext.hxx"
 #include <svx/svdetc.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdograf.hxx>
@@ -46,9 +46,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel
-#include "svdstr.hrc"   // Namen aus der Resource
-#include "svdglob.hxx"  // StringCache
-#include "xoutbmp.hxx"
+#include "svx/svdstr.hrc"   // Namen aus der Resource
+#include "svx/svdglob.hxx"  // StringCache
+#include "svx/xoutbmp.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
@@ -105,34 +105,34 @@ Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut)
     return aP;
 }
 
-BOOL SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
+sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
 {
-    BOOL bRet(FALSE);
+    sal_Bool bRet(sal_False);
 
     if(!aMaxWorkArea.IsEmpty())
     {
         if(rPt.X()<aMaxWorkArea.Left())
         {
             rPt.X() = aMaxWorkArea.Left();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.X()>aMaxWorkArea.Right())
         {
             rPt.X() = aMaxWorkArea.Right();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.Y()<aMaxWorkArea.Top())
         {
             rPt.Y() = aMaxWorkArea.Top();
-            bRet = TRUE;
+            bRet = sal_True;
         }
 
         if(rPt.Y()>aMaxWorkArea.Bottom())
         {
             rPt.Y() = aMaxWorkArea.Bottom();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
@@ -150,14 +150,14 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst)
     }
 }
 
-BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
+sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     rLayer=0;
     if (pObjList!=NULL) {
         const SdrPage* pPg=pObjList->GetPage();
         if (pPg!=NULL) {
-            rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+            rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
             if (rLayer==SDRLAYER_NOTFOUND) rLayer=0;
             SdrPageView* pPV = GetSdrPageView();
             if (pPV!=NULL) {
@@ -170,50 +170,50 @@ BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOL SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf));
     pObj->SetLayer(nLayer);
     ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp));
     pObj->SetLayer(nLayer);
     ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     if(!rStr.Len())
-        return FALSE;
+        return sal_False;
 
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     Rectangle aTextRect(0,0,500,500);
     SdrPage* pPage=pLst->GetPage();
@@ -239,18 +239,18 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList
     MapUnit eMap=pMod->GetScaleUnit();
     Fraction aMap=pMod->GetScaleFraction();
     ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions);
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     Point aPos(rPos);
     ImpGetPasteObjList(aPos,pLst);
     ImpLimitToWorkArea( aPos );
-    if (pLst==NULL) return FALSE;
+    if (pLst==NULL) return sal_False;
     SdrLayerID nLayer;
-    if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark) UnmarkAllObj();
     Rectangle aTextRect(0,0,500,500);
     SdrPage* pPage=pLst->GetPage();
@@ -297,14 +297,14 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFo
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     const SdrModel* pSrcMod=&rMod;
     if (pSrcMod==pMod)
-        return FALSE; // na so geht's ja nun nicht
+        return sal_False; // na so geht's ja nun nicht
 
     const bool bUndo = IsUndoEnabled();
 
@@ -315,7 +315,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     {
         if( bUndo )
             EndUndo();
-        return TRUE;
+        return sal_True;
     }
 
     Point aPos(rPos);
@@ -331,9 +331,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
 
     ImpLimitToWorkArea( aPos );
     if (pLst==NULL)
-        return FALSE;
+        return sal_False;
 
-    BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+    sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
     if (bUnmark)
         UnmarkAllObj();
 
@@ -341,7 +341,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     // Dafuer erstmal die Faktoren berechnen
     MapUnit eSrcUnit=pSrcMod->GetScaleUnit();
     MapUnit eDstUnit=pMod->GetScaleUnit();
-    BOOL bResize=eSrcUnit!=eDstUnit;
+    sal_Bool bResize=eSrcUnit!=eDstUnit;
     Fraction xResize,yResize;
     Point aPt0;
     if (bResize)
@@ -351,7 +351,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
         yResize=aResize.Y();
     }
     SdrObjList*  pDstLst=pLst;
-    USHORT nPg,nPgAnz=pSrcMod->GetPageCount();
+    sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount();
     for (nPg=0; nPg<nPgAnz; nPg++)
     {
         const SdrPage* pSrcPg=pSrcMod->GetPage(nPg);
@@ -363,10 +363,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
             ResizeRect(aR,aPt0,xResize,yResize);
         Point aDist(aPos-aR.Center());
         Size  aSiz(aDist.X(),aDist.Y());
-        //ULONG nDstObjAnz0=pDstLst->GetObjCount();
-        ULONG nCloneErrCnt=0;
-        ULONG nOb,nObAnz=pSrcPg->GetObjCount();
-        BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+        //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount();
+        sal_uIntPtr nCloneErrCnt=0;
+        sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount();
+        sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
 
         // #i13033#
         // New mechanism to re-create the connections of cloned connectors
@@ -383,9 +383,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
             {
                 if(bResize) 
                 {
-                    pNeuObj->GetModel()->SetPasteResize(TRUE); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139#
                     pNeuObj->NbcResize(aPt0,xResize,yResize);
-                    pNeuObj->GetModel()->SetPasteResize(FALSE); // #51139#
+                    pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139#
                 }
                 
                 // #i39861#
@@ -409,7 +409,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
                     }
                     else
                     {
-                        nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+                        nLayer = rAd.GetLayerID(aAktLayer, sal_True);
                     }
                     
                     if(SDRLAYER_NOTFOUND == nLayer) 
@@ -429,7 +429,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
                 if (bMark) {
                     // Markhandles noch nicht sofort setzen!
                     // Das erledigt das ModelHasChanged der MarkView.
-                    MarkObj(pNeuObj,pMarkPV,FALSE,TRUE);
+                    MarkObj(pNeuObj,pMarkPV,sal_False,sal_True);
                 }
 
                 // #i13033#
@@ -471,10 +471,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
     if( bUndo )
         EndUndo();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
+sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const
 {
     return( FORMAT_PRIVATE == nFormat ||
             FORMAT_GDIMETAFILE == nFormat ||
@@ -485,7 +485,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
             SOT_FORMATSTR_ID_EDITENGINE == nFormat );
 }
 
-void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions)
+void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions)
 {
     BigInt nSizX(rSiz.Width());
     BigInt nSizY(rSiz.Height());
@@ -525,7 +525,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
             pMarkPV=pPV;
     }
 
-    BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+    sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
     if (bMark)
     { // Obj in der ersten gefundenen PageView markieren
         MarkObj(pObj,pMarkPV);
@@ -534,7 +534,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
+Bitmap SdrExchangeView::GetMarkedObjBitmap( sal_Bool bNoVDevIfOneBmpMarked ) const
 {
     Bitmap aBmp;
 
@@ -571,7 +571,7 @@ Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
 
 // -----------------------------------------------------------------------------
 
-GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const
+GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarked ) const
 {
     GDIMetaFile aMtf;
 
@@ -609,7 +609,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked )
             Size            aDummySize( 2, 2 );
 
             aOut.SetOutputSizePixel( aDummySize );
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
 
             aMtf.Clear();
@@ -650,7 +650,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const
         if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) )
             aRet = SdrExchangeView::GetObjGraphic( pMod, GetMarkedObjectByIndex( 0 ) );
         else
-            aRet = GetMarkedObjMetaFile( FALSE );
+            aRet = GetMarkedObjMetaFile( sal_False );
     }
 
     return aRet;
@@ -692,7 +692,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
                                   pModel->GetScaleFraction(),
                                   pModel->GetScaleFraction() );
 
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
             aMtf.Record( &aOut );
             pObj->SingleObjectPainter( aOut ); // #110094#-17
@@ -726,7 +726,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
     ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
     ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
     const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
-    const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+    const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
     sal_uInt32                                  n, nCount;
 
     for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -760,7 +760,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
     // werde ich sie mir wohl kopieren muessen.
     SortMarkedObjects();
     SdrModel* pNeuMod=pMod->AllocModel();
-    SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE);
+    SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False);
     pNeuMod->InsertPage(pNeuPag);
 
     if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
@@ -769,7 +769,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
         ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
         ::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
         const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
-        const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+        const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
         sal_uInt32                                  n, nCount, nCloneErrCnt = 0;
 
         for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -858,40 +858,40 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Cut( ULONG /*nFormat */)
+sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
 {
     OSL_FAIL( "SdrExchangeView::Cut: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-void SdrExchangeView::CutMarked( ULONG /*nFormat */)
+void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */)
 {
     OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Yank(ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
 {
     OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-void SdrExchangeView::YankMarked(ULONG /*nFormat*/)
+void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/)
 {
     OSL_FAIL( "YankMarked: Not supported anymore" );
 }
 
 // -----------------------------------------------------------------------------
 
-BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
 {
     OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" );
-    return FALSE;
+    return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 9c8b0edb85..bb73444cd6 100644..100755
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -31,7 +31,7 @@
 
 #include <accessiblecell.hxx>
 
-#include "DescriptionGenerator.hxx"
+#include "svx/DescriptionGenerator.hxx"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 7d2fd221c1..7d2fd221c1 100644..100755
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index ac07c84873..ac07c84873 100644..100755
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0f3095f7a2..9eb36e7db7 100644..100755
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -400,7 +400,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
     if( xSourceCell->hasText() )
     {
         SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner();
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
 
         if( hasText() )
         {
@@ -658,7 +658,7 @@ sal_Int32 Cell::getMinimumHeight()
     {
         Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
         rOutliner.SetPaperSize(aSize);
-        rOutliner.SetUpdateMode(TRUE);
+        rOutliner.SetUpdateMode(sal_True);
         ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
 
         if( GetOutlinerParaObject() )
@@ -1418,7 +1418,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
                 case XATTR_FILLHATCH:
                 case XATTR_LINEDASH:
                     {
-                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                         if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
                             eState = PropertyState_DEFAULT_VALUE;
                     }
@@ -1433,7 +1433,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
                 case XATTR_LINESTART:
                 case XATTR_FILLFLOATTRANSPARENCE:
                     {
-                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                        NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                         if( ( pItem == NULL ) )
                             eState = PropertyState_DEFAULT_VALUE;
                     }
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 32ba7b388f..32ba7b388f 100644..100755
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 40351db1bd..ef762a04c5 100644..100755
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -34,8 +34,8 @@
 #include "tablelayouter.hxx"
 #include "cell.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 // -----------------------------------------------------------------------------
 
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index 8876abe7ea..8876abe7ea 100644..100755
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 3ee05610b9..9d30be2acf 100644..100755
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -56,7 +56,7 @@
 #include "svx/svdpage.hxx"
 #include "editeng/editeng.hxx"
 #include "editeng/unotext.hxx"
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 
 //------------------------------------------------------------------------
 
@@ -153,7 +153,7 @@ public:
     void 					lock();
     void 					unlock();
 
-    BOOL					IsValid() const;
+    sal_Bool					IsValid() const;
 
     Rectangle				GetVisArea();
     Point					LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -320,7 +320,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
         {
             case HINT_OBJCHG:
             {
-                mbDataValid = FALSE;						// Text muss neu geholt werden
+                mbDataValid = sal_False;						// Text muss neu geholt werden
 
                 if( HasView() )
                 {
@@ -353,7 +353,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                         mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) );
 
                     // #104157# Only now we're really in edit mode
-                    mbShapeIsEditMode = TRUE;
+                    mbShapeIsEditMode = sal_True;
 
                     Broadcast( *pSdrHint );
                 }
@@ -367,7 +367,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     Broadcast( *pSdrHint );
 
                     // #104157# We're no longer in edit mode
-                    mbShapeIsEditMode = FALSE;
+                    mbShapeIsEditMode = sal_False;
 
                     // remove as listener - outliner might outlive ourselves
                     if( mpView && mpView->GetTextEditOutliner() )
@@ -800,9 +800,9 @@ void CellEditSourceImpl::unlock()
     }
 }
 
-BOOL CellEditSourceImpl::IsValid() const
+sal_Bool CellEditSourceImpl::IsValid() const
 {
-    return mpView && mpWindow ? TRUE : FALSE;
+    return mpView && mpWindow ? sal_True : sal_False;
 }
 
 Rectangle CellEditSourceImpl::GetVisArea()
@@ -997,7 +997,7 @@ void CellEditSource::unlock()
 
 //------------------------------------------------------------------------
 
-BOOL CellEditSource::IsValid() const
+sal_Bool CellEditSource::IsValid() const
 {
     return mpImpl->IsValid();
 }
diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx
index cc9249a5b1..e9d833f98a 100644..100755
--- a/svx/source/table/celleditsource.hxx
+++ b/svx/source/table/celleditsource.hxx
@@ -72,7 +72,7 @@ public:
     void unlock();
 
     // the SvxViewForwarder interface
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point		PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 4adb71dd71..4adb71dd71 100644..100755
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 49725fa1c1..49725fa1c1 100644..100755
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx
index 9f28ebbb67..9f28ebbb67 100644..100755
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/table/celltypes.hxx
diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk
deleted file mode 100644
index 1eaaef12aa..0000000000
--- a/svx/source/table/makefile.mk
+++ /dev/null
@@ -1,80 +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=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=table
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-        $(SLO)$/propertyset.obj\
-        $(SLO)$/cell.obj\
-        $(SLO)$/cellrange.obj\
-        $(SLO)$/cellcursor.obj\
-        $(SLO)$/tablerow.obj\
-        $(SLO)$/tablerows.obj\
-        $(SLO)$/tablecolumn.obj\
-        $(SLO)$/tablecolumns.obj\
-        $(SLO)$/tablemodel.obj\
-        $(SLO)$/svdotable.obj\
-        $(SLO)$/viewcontactoftableobj.obj\
-        $(SLO)$/tablelayouter.obj\
-        $(SLO)$/tablehandles.obj\
-        $(SLO)$/tablecontroller.obj\
-        $(SLO)$/tableundo.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-        $(SLO)$/celleditsource.obj \
-        $(SLO)$/tabledesign.obj \
-        $(SLO)$/accessibletableshape.obj \
-        $(SLO)$/accessiblecell.obj \
-        $(SLO)$/tablertfexporter.obj \
-        $(SLO)$/tablertfimporter.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=table
-SRC1FILES= table.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index c3f643b05e..c3f643b05e 100644..100755
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 213867aaf4..213867aaf4 100644..100755
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 2947c5469b..9461fd077d 100644..100755
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -64,8 +64,8 @@
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "editeng/writingmodeitem.hxx"
 #include "editeng/frmdiritem.hxx"
 #include "svx/xflhtit.hxx"
@@ -758,7 +758,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
 
 void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
 {
-    bClosedObj = TRUE;
+    bClosedObj = sal_True;
 
     mpImpl = new SdrTableObjImpl;
     mpImpl->acquire();
@@ -1401,34 +1401,34 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
 
 void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bResizeFreeAllowed=TRUE;
-    rInfo.bResizePropAllowed=TRUE;
-    rInfo.bRotateFreeAllowed=FALSE;
-    rInfo.bRotate90Allowed  =FALSE;
-    rInfo.bMirrorFreeAllowed=FALSE;
-    rInfo.bMirror45Allowed  =FALSE;
-    rInfo.bMirror90Allowed  =FALSE;
+    rInfo.bResizeFreeAllowed=sal_True;
+    rInfo.bResizePropAllowed=sal_True;
+    rInfo.bRotateFreeAllowed=sal_False;
+    rInfo.bRotate90Allowed  =sal_False;
+    rInfo.bMirrorFreeAllowed=sal_False;
+    rInfo.bMirror45Allowed  =sal_False;
+    rInfo.bMirror90Allowed  =sal_False;
 
     // allow transparence
-    rInfo.bTransparenceAllowed = TRUE;
+    rInfo.bTransparenceAllowed = sal_True;
 
     // gradient depends on fillstyle
     XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
-    rInfo.bShearAllowed     =FALSE;
-    rInfo.bEdgeRadiusAllowed=FALSE;
-    rInfo.bCanConvToPath    =FALSE;
-    rInfo.bCanConvToPoly    =FALSE;
-    rInfo.bCanConvToPathLineToArea=FALSE;
-    rInfo.bCanConvToPolyLineToArea=FALSE;
-    rInfo.bCanConvToContour = FALSE;
+    rInfo.bShearAllowed     =sal_False;
+    rInfo.bEdgeRadiusAllowed=sal_False;
+    rInfo.bCanConvToPath    =sal_False;
+    rInfo.bCanConvToPoly    =sal_False;
+    rInfo.bCanConvToPathLineToArea=sal_False;
+    rInfo.bCanConvToPolyLineToArea=sal_False;
+    rInfo.bCanConvToContour = sal_False;
 }
 
 // --------------------------------------------------------------------
 
-UINT16 SdrTableObj::GetObjIdentifier() const
+sal_uInt16 SdrTableObj::GetObjIdentifier() const
 {
-    return static_cast<UINT16>(OBJ_TABLE);
+    return static_cast<sal_uInt16>(OBJ_TABLE);
 }
 
 // --------------------------------------------------------------------
@@ -1462,7 +1462,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
 
 // --------------------------------------------------------------------
 
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const
 {
     if( mpImpl )
         TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1470,7 +1470,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bo
 
 // --------------------------------------------------------------------
 
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
 {
     if( !mpImpl )
         return;
@@ -1485,7 +1485,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
 //	SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust();
 
-    ULONG nStat0=rOutliner.GetControlWord();
+    sal_uIntPtr nStat0=rOutliner.GetControlWord();
     Size aNullSize;
     nStat0 |= EE_CNTRL_AUTOPAGESIZE;
     rOutliner.SetControlWord(nStat0);
@@ -1521,7 +1521,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
             if( bHitTest ) // #i33696# take back fix #i27510#
                 rOutliner.SetTextObj( this );
 
-            rOutliner.SetUpdateMode(TRUE);
+            rOutliner.SetUpdateMode(sal_True);
             rOutliner.SetText(*pPara);
         }
     }
@@ -1533,7 +1533,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
         delete pPara;
 
-    rOutliner.SetUpdateMode(TRUE);
+    rOutliner.SetUpdateMode(sal_True);
     rOutliner.SetControlWord(nStat0);
 
     Point aTextPos(aAnkRect.TopLeft());
@@ -1752,7 +1752,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
 
 // --------------------------------------------------------------------
 
-USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
 {
     EVAnchorMode eRet=ANCHOR_TOP_LEFT;
     CellRef xCell( getActiveCell() );
@@ -1809,7 +1809,7 @@ USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
         }
 */
     }
-    return (USHORT)eRet;
+    return (sal_uInt16)eRet;
 }
 
 // --------------------------------------------------------------------
@@ -2046,14 +2046,14 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
 
 //	ForceOutlinerParaObject();
 
-    mbInEditMode = TRUE;
+    mbInEditMode = sal_True;
 
     rOutl.Init( OUTLINERMODE_TEXTOBJECT );
     rOutl.SetRefDevice( pModel->GetRefDevice() );
 
 // --
         bool bUpdMerk=rOutl.GetUpdateMode();
-        if (bUpdMerk) rOutl.SetUpdateMode(FALSE);
+        if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
         Size aPaperMin;
         Size aPaperMax;
         Rectangle aEditArea;
@@ -2063,10 +2063,10 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
         rOutl.SetMaxAutoPaperSize(aPaperMax);
         rOutl.SetPaperSize(aPaperMax);
 
-        if (bUpdMerk) rOutl.SetUpdateMode(TRUE);
+        if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
 //---
 
-    ULONG nStat=rOutl.GetControlWord();
+    sal_uIntPtr nStat=rOutl.GetControlWord();
 //	nStat	&= ~EE_CNTRL_AUTOPAGESIZE;
     nStat	|= EE_CNTRL_AUTOPAGESIZE;
     nStat	&=~EE_CNTRL_STRETCHING;
@@ -2095,7 +2095,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 
         OutlinerParaObject* pNewText = 0;
         Paragraph* p1stPara = rOutl.GetParagraph( 0 );
-        UINT32 nParaAnz = rOutl.GetParagraphCount();
+        sal_uInt32 nParaAnz = rOutl.GetParagraphCount();
 
         if(p1stPara)
         {
@@ -2125,11 +2125,11 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 
     pEdtOutl = 0;
     rOutl.Clear();
-    UINT32 nStat = rOutl.GetControlWord();
+    sal_uInt32 nStat = rOutl.GetControlWord();
     nStat &= ~EE_CNTRL_AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
-    mbInEditMode = FALSE;
+    mbInEditMode = sal_False;
 }
 
 // --------------------------------------------------------------------
@@ -2237,7 +2237,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
 bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const
 {
     if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
-        return FALSE;
+        return sal_False;
 
     Rectangle aRectangle( rR );
     mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
@@ -2245,11 +2245,11 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo
     if( aRectangle != rR )
     {
         rR = aRectangle;
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -2441,8 +2441,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
     rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true );
     rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true );
 
-    ULONG nHdlCount = rHdlList.GetHdlCount();
-    for( ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+    sal_uIntPtr nHdlCount = rHdlList.GetHdlCount();
+    for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
         rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this);
 }
 
@@ -2621,7 +2621,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     aRect=aRect1; // fuer ObjName
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
+    bSnapRectDirty=sal_True;
     return true;
 }
 
diff --git a/svx/source/table/table.src b/svx/source/table/table.src
index 4a696f9e0c..4a696f9e0c 100644..100755
--- a/svx/source/table/table.src
+++ b/svx/source/table/table.src
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 62258ee8af..62258ee8af 100644..100755
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 37e041101b..37e041101b 100644..100755
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index f05492061e..f05492061e 100644..100755
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index 6fd9f21f72..6fd9f21f72 100644..100755
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 911d9beb8b..355072bcfe 100644..100755
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -60,15 +60,15 @@
 #include "svx/sdrpagewindow.hxx"
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
-#include "sdrpaintwindow.hxx"
+#include "svx/sdrpaintwindow.hxx"
 #include <svx/svxdlg.hxx>
 #include <editeng/boxitem.hxx>
 #include "cell.hxx"
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
 #include "editeng/bolnitem.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
@@ -401,7 +401,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
 
     // Iterate over all requested items in the set.
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -419,7 +419,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
                         if( !pSet )
                         {
                             pSet = new SfxItemSet( mxTableObj->GetModel()->GetItemPool() );
-                            MergeAttrFromSelectedCells(*pSet, FALSE);
+                            MergeAttrFromSelectedCells(*pSet, sal_False);
                         }
 
                         SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK;
@@ -505,11 +505,11 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
         if( pArgs )
         {
             const SfxPoolItem* pItem = 0;
-            pArgs->GetItemState(nSId, FALSE, &pItem);
+            pArgs->GetItemState(nSId, sal_False, &pItem);
             if (pItem)
             {
                 nCount = ((const SfxInt16Item* )pItem)->GetValue();
-                if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, TRUE, &pItem))
+                if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, sal_True, &pItem))
                     bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue();
             }
         }
@@ -723,14 +723,14 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
     if( !pArgs && pTableObj->GetModel() )
     {
         SfxItemSet aNewAttr( pTableObj->GetModel()->GetItemPool() );
-        MergeAttrFromSelectedCells(aNewAttr, FALSE);
+        MergeAttrFromSelectedCells(aNewAttr, sal_False);
 
         // merge drawing layer text distance items into SvxBoxItem used by the dialog
         SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
-        aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
+        aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
         aNewAttr.Put( aBoxItem );
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -753,7 +753,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
             if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) )
                 aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
 
-            SetAttrToSelectedCells(aNewSet, FALSE);
+            SetAttrToSelectedCells(aNewSet, sal_False);
         }
         UpdateTableShape();
     }
@@ -844,7 +844,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
     SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
     SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
 
-    if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, FALSE)) )
+    if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, sal_False)) )
         return;
 
     const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) );
@@ -883,7 +883,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
                         bool bChanges = false;                        
                         const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet();
 
-                        for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
+                        for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
                         {
                             if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
                             {
@@ -931,22 +931,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs )
 
     const SfxPoolItem *pPoolItem=NULL;
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
-    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, FALSE,&pPoolItem)) )
+    if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, sal_False,&pPoolItem)) )
         aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
 
     if( aSettings == pTableObj->getTableStyleSettings() )
@@ -1678,7 +1678,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
         if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
         {
             ::Outliner* pOutl = mpView->GetTextEditOutliner();
-            ULONG nParaAnz = pOutl->GetParagraphCount();
+            sal_uIntPtr nParaAnz = pOutl->GetParagraphCount();
             Paragraph* p1stPara = pOutl->GetParagraph( 0 );
 
             if(nParaAnz==1 && p1stPara)
@@ -1704,7 +1704,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
             // create new outliner, owner will be the SdrObjEditView
             SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel );
             if( pTableObj->IsVerticalWriting() )
-                pOutl->SetVertical( TRUE );
+                pOutl->SetVertical( sal_True );
 
             if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl))
             {
@@ -2021,15 +2021,15 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
                     {
                         if(!bOnlyHardAttr)
                         {
-                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+                            if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
                                 rAttr.InvalidateItem(nWhich);
                             else
-                                rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+                                rAttr.MergeValue(rSet.Get(nWhich), sal_True);
                         }
-                        else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+                        else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
                         {
                             const SfxPoolItem& rItem = rSet.Get(nWhich);
-                            rAttr.MergeValue(rItem, TRUE);
+                            rAttr.MergeValue(rItem, sal_True);
                         }
 
                         nWhich = aIter.NextWhich();
@@ -2058,7 +2058,7 @@ const sal_uInt16 CELL_LOWER  = 0x0080;
 
 // --------------------------------------------------------------------
 
-static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, USHORT nLine )
+static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine )
 {
     if( pNew )
     {
@@ -2127,14 +2127,14 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
 
         // apply distance to borders
         if( pBoxInfoItem->IsValid( VALID_DISTANCE ) )
-            for( USHORT nLine = 0; nLine < 4; ++nLine )
+            for( sal_uInt16 nLine = 0; nLine < 4; ++nLine )
                 rNewFrame.SetDistance( pBoxItem->GetDistance( nLine ), nLine );
     }
 }
 
 // --------------------------------------------------------------------
 
-static void ImplSetLineColor( SvxBoxItem& rNewFrame, USHORT nLine, const Color& rColor )
+static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor )
 {
     const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine );
     if( pSourceLine )
@@ -2221,19 +2221,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
         if( nRowCount && nColCount )
         {
             const SvxBoxItem* pBoxItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, sal_False) )
                 pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) );
 
             const SvxBoxInfoItem* pBoxInfoItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_False) )
                 pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) );
 
             const SvxColorItem* pLineColorItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, sal_False) )
                 pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) );
 
             const SvxBorderLine* pBorderLineItem = 0;
-            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, FALSE) )
+            if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, sal_False) )
                 pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine();
 
             if( pBoxInfoItem && !pBoxItem )
@@ -2328,7 +2328,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
         getSelectedCells( aStart, aEnd );
 
         SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
-        aAttr.Put(rAttr, TRUE);
+        aAttr.Put(rAttr, sal_True);
 
         const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
 
@@ -2382,8 +2382,8 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt
             if(pTextEditOutlinerView)
             {
                 // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
-                rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
-                rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+                rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+                rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
             }
         }
 
@@ -2535,7 +2535,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
         getSelectedCells( aStart, aEnd );
 
         SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges());
-        aAttr.Put(rFormatSet, TRUE);
+        aAttr.Put(rFormatSet, sal_True);
 
         const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
 
@@ -2545,7 +2545,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
             aAttr.ClearItem( SDRATTR_TABLE_BORDER_INNER );
         }
         
-        const USHORT* pRanges = rFormatSet.GetRanges();
+        const sal_uInt16* pRanges = rFormatSet.GetRanges();
         bool bTextOnly = true;
         
         while( *pRanges )
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index b0e199e899..e659b551a5 100644..100755
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -162,7 +162,7 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener;
 
-    ULONG mnUpdateEvent;
+    sal_uLong mnUpdateEvent;
 };
 
 } }
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 9c46944f07..9c46944f07 100644..100755
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index a1501aa78c..c626e6abe0 100644..100755
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -43,7 +43,7 @@
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index b243e1d82a..b243e1d82a 100644..100755
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 59d9250cf5..4984fec1d3 100644..100755
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -45,8 +45,8 @@
 #include "editeng/borderline.hxx"
 #include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::awt::XLayoutConstrains;
@@ -926,8 +926,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine
     if (!pOther || (pOther == &gEmptyBorder))
         return true;
 
-    USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
-    USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+    sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
+    sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
 
     if (nThisSize > nOtherSize)
         return true;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 1bbe0c474d..1bbe0c474d 100644..100755
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 66e997af1b..b08cd40f40 100644..100755
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -47,8 +47,8 @@
 #include "tableundo.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdmodel.hxx"
-#include "svdstr.hrc"
-#include "svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/svdglob.hxx"
 
 using ::rtl::OUString;
 using namespace ::osl;
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 518bf1caba..518bf1caba 100644..100755
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 16764e2bc1..16764e2bc1 100644..100755
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 9d7e506101..9d7e506101 100644..100755
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index ed04a5d81c..ed04a5d81c 100644..100755
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index e8e82281a2..e8e82281a2 100644..100755
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index ac9006433f..ec26cb06be 100644..100755
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -64,7 +64,7 @@ class SdrTableRtfExporter
 {
 public:
     SdrTableRtfExporter( SvStream& rStrmP, SdrTableObj& rObj );
-    ULONG Write();
+    sal_uLong Write();
     void WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart );
     void WriteCell( sal_Int32 nCol, sal_Int32 nRow );
 
@@ -95,7 +95,7 @@ long HundMMToTwips( long nIn )
     return nRet;
 }
 
-ULONG SdrTableRtfExporter::Write()
+sal_uLong SdrTableRtfExporter::Write()
 {
     mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
     mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine;
@@ -185,7 +185,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
     }
     mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine;
 
-    ULONG nStrmPos = mrStrm.Tell();
+    sal_uLong nStrmPos = mrStrm.Tell();
     for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
     {
         WriteCell( nCol, nRow );
@@ -232,7 +232,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
     }
 
     bool bResetPar, bResetAttr;
-    bResetPar = bResetAttr = FALSE;
+    bResetPar = bResetAttr = sal_False;
 
     SdrTextHorzAdjust eHAdj = xCell->GetTextHorizontalAdjust();
 
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index ccd258bbe4..f8a0fa1fd9 100644..100755
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -63,7 +63,7 @@ struct RTFCellDefault
 {
     SfxItemSet			maItemSet;
     sal_Int32			mnCol;
-    USHORT				mnTwips;         // right border of the cell
+    sal_uInt16				mnTwips;         // right border of the cell
     sal_Int32			mnColSpan;	 // MergeCell if >1, merged cells if 0
 
     RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {}
@@ -120,7 +120,7 @@ private:
     sal_Int32		mnLastWidth;
     bool			mbNewDef;
 
-    USHORT			mnStartPara;
+    sal_uInt16			mnStartPara;
 
     sal_Int32		mnColCnt;
     sal_Int32		mnRowCnt;
@@ -152,7 +152,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
 , mpDefMerge( 0 )
 , mxTable( rTableObj.getTable() )
 {
-    mpOutliner->SetUpdateMode(TRUE);
+    mpOutliner->SetUpdateMode(sal_True);
     mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() );
     mpInsDefault = new RTFCellDefault( &mrItemPool );
 }
@@ -283,16 +283,16 @@ void SdrTableRTFParser::FillTable()
                 if( xCell.is() && xCellInfo.get() )
                 {
                     const SfxPoolItem *pPoolItem = 0;
-                    if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,FALSE,&pPoolItem)==SFX_ITEM_SET) 
+                    if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET) 
                         xCell->SetMergedItem( *pPoolItem );
 
                     String sDebug = mpOutliner->GetText( mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount );
 
-                    OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (USHORT)xCellInfo->mnStartPara, (USHORT)xCellInfo->mnParaCount );
+                    OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount );
                     if( pTextObject )
                     {
                         SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
-                        rOutliner.SetUpdateMode(TRUE);
+                        rOutliner.SetUpdateMode(sal_True);
                         rOutliner.SetText( *pTextObject );
                         mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() );
                         delete pTextObject;
@@ -317,7 +317,7 @@ void SdrTableRTFParser::NewCellRow()
 {
     if( mbNewDef )
     {	
-        mbNewDef = FALSE;
+        mbNewDef = sal_False;
 
         maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) );
     }
@@ -374,7 +374,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
         break;
         case RTF_CELLX:			// closes cell default
         {
-            mbNewDef = TRUE;
+            mbNewDef = sal_True;
             mpInsDefault->mnCol = mnColCnt;
             maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) );
             
@@ -428,10 +428,10 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
             switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) )
             {
                 case RTF_SHADINGDEF:
-//					((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+//					((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
                 break;
                 case RTF_BRDRDEF:
-                    ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+                    ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
                 break;
             }
         }
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 67b36aaf0b..56b4a8bcac 100644..100755
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -108,16 +108,16 @@ void CellUndo::Redo()
     }
 }
 
-BOOL CellUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool CellUndo::Merge( SfxUndoAction *pNextAction )
 {
     CellUndo* pNext = dynamic_cast< CellUndo* >( pNextAction );
     if( pNext && pNext->mxCell.get() == mxCell.get() )
     {
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -414,7 +414,7 @@ void TableColumnUndo::Redo()
 
 // -----------------------------------------------------------------------------
 
-BOOL TableColumnUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableColumnUndo::Merge( SfxUndoAction *pNextAction )
 {
     TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction );
     return pNext && pNext->mxCol == mxCol;
@@ -483,7 +483,7 @@ void TableRowUndo::Redo()
 
 // -----------------------------------------------------------------------------
 
-BOOL TableRowUndo::Merge( SfxUndoAction *pNextAction )
+sal_Bool TableRowUndo::Merge( SfxUndoAction *pNextAction )
 {
     TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction );
     return pNext && pNext->mxRow == mxRow;
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 185a816c64..7223e4363f 100644..100755
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -56,7 +56,7 @@ public:
 
     virtual void			Undo();
     virtual void			Redo();
-    virtual BOOL			Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool			Merge( SfxUndoAction *pNextAction );
 
     void dispose();
     virtual void ObjectInDestruction(const SdrObject& rObject);
@@ -173,7 +173,7 @@ public:
 
     virtual void			Undo();
     virtual void			Redo();
-    virtual BOOL			Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool			Merge( SfxUndoAction *pNextAction );
 
 private:
     struct Data
@@ -205,7 +205,7 @@ public:
 
     virtual void			Undo();
     virtual void			Redo();
-    virtual BOOL			Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool			Merge( SfxUndoAction *pNextAction );
 
 private:
     struct Data
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index b2e24ed4e8..b2e24ed4e8 100644..100755
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index 3a7b5e4c83..3a7b5e4c83 100644..100755
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index fc49d0577e..1e027b4ceb 100644..100755
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -19,7 +19,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow
     using FloatingWindow::StateChanged;
 
 private:
-    const USHORT   theSlotId;
+    const sal_uInt16 theSlotId;
     ValueSet       aColorSet;
     rtl::OUString  maCommand;
     const Color    mLastColor;
@@ -30,11 +30,11 @@ private:
 
 protected:
     virtual void    Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 public:
     SvxColorWindow_Impl( const rtl::OUString& rCommand, 
-                         USHORT nSlotId,
+                         sal_uInt16 nSlotId,
                          const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                          const String& rWndTitle,
                          Window* pParentWindow,
@@ -43,7 +43,7 @@ public:
     void                StartSelection();
 
     virtual void        KeyInput( const KeyEvent& rKEvt );
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
     virtual SfxPopupWindow* Clone() const;
 };
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index e02741dec9..4d5bdb6f8a 100644..100755
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -39,12 +39,12 @@
 #include <svx/colrctrl.hxx>
 
 #include <svx/svdview.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <editeng/colritem.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 #include <vcl/svapp.hxx>
 
 SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL )
@@ -110,8 +110,9 @@ sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*,
 SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
     ValueSet( _pParent, nWinStyle ),
     DragSourceHelper( this ),
-    bLeft (TRUE)
+    bLeft (sal_True)
 {
+    SetAccessibleName(String( SVX_RES( STR_COLORTABLE ) ) );
 }
 
 /*************************************************************************
@@ -123,8 +124,9 @@ SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
 SvxColorValueSet::SvxColorValueSet( Window* _pParent, const ResId& rResId ) :
     ValueSet( _pParent, rResId ),
     DragSourceHelper( this ),
-    bLeft (TRUE)
+    bLeft (sal_True)
 {
+    SetAccessibleName(String( SVX_RES( STR_COLORTABLE )  ));
 }
 
 /*************************************************************************
@@ -138,12 +140,12 @@ void SvxColorValueSet::MouseButtonDown( const MouseEvent& rMEvt )
     // Fuer Mac noch anders handlen !
     if( rMEvt.IsLeft() )
     {
-        bLeft = TRUE;
+        bLeft = sal_True;
         ValueSet::MouseButtonDown( rMEvt );
     }
     else
     {
-        bLeft = FALSE;
+        bLeft = sal_False;
         MouseEvent aMEvt( rMEvt.GetPosPixel(),
                           rMEvt.GetClicks(),
                           rMEvt.GetMode(),
@@ -166,12 +168,12 @@ void SvxColorValueSet::MouseButtonUp( const MouseEvent& rMEvt )
     // Fuer Mac noch anders handlen !
     if( rMEvt.IsLeft() )
     {
-        bLeft = TRUE;
+        bLeft = sal_True;
         ValueSet::MouseButtonUp( rMEvt );
     }
     else
     {
-        bLeft = FALSE;
+        bLeft = sal_False;
         MouseEvent aMEvt( rMEvt.GetPosPixel(),
                           rMEvt.GetClicks(),
                           rMEvt.GetMode(),
@@ -214,7 +216,7 @@ void SvxColorValueSet::StartDrag( sal_Int8 , const Point&  )
 void SvxColorValueSet::DoDrag()
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
-    USHORT			nItemId = GetItemId( aDragPosPixel );
+    sal_uInt16			nItemId = GetItemId( aDragPosPixel );
 
     if( pDocSh && nItemId )
     {
@@ -251,7 +253,7 @@ IMPL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*, EMPTYARG)
 \************************************************************************/
 
 SvxColorChildWindow::SvxColorChildWindow( Window* _pParent,
-                                          USHORT nId,
+                                          sal_uInt16 nId,
                                           SfxBindings* pBindings,
                                           SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -332,7 +334,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
 
     SetSize();
     aColorSet.Show();
-    StartListening( *_pBindings, TRUE );
+    StartListening( *_pBindings, sal_True );
 }
 
 
@@ -389,7 +391,7 @@ void SvxColorDockingWindow::FillValueSet()
 
         Bitmap aBmp( aVD.GetBitmap( Point(), aColorSize ) );
 
-        aColorSet.InsertItem( (USHORT)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
+        aColorSet.InsertItem( (sal_uInt16)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
 
         XColorEntry* pEntry;
         nCount = pColorTable->Count();
@@ -397,7 +399,7 @@ void SvxColorDockingWindow::FillValueSet()
         for( long i = 0; i < nCount; i++ )
         {
             pEntry = pColorTable->GetColor( i );
-            aColorSet.InsertItem( (USHORT)i+2,
+            aColorSet.InsertItem( (sal_uInt16)i+2,
                             pEntry->GetColor(), pEntry->GetName() );
         }
     }
@@ -417,8 +419,8 @@ void SvxColorDockingWindow::SetSize()
     aSize.Height() -= 4;
 
     // Zeilen und Spalten berechnen
-    nCols = (USHORT) ( aSize.Width() / aItemSize.Width() );
-    nLines = (USHORT) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
+    nCols = (sal_uInt16) ( aSize.Width() / aItemSize.Width() );
+    nLines = (sal_uInt16) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
     if( nLines == 0 )
         nLines++;
 
@@ -435,7 +437,7 @@ void SvxColorDockingWindow::SetSize()
     if( nScrollWidth > 0 )
     {
         // Spalten mit ScrollBar berechnen
-        nCols = (USHORT) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
+        nCols = (sal_uInt16) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
     }
     aColorSet.SetColCount( nCols );
 
@@ -456,13 +458,13 @@ void SvxColorDockingWindow::SetSize()
 |*
 \************************************************************************/
 
-BOOL SvxColorDockingWindow::Close()
+sal_Bool SvxColorDockingWindow::Close()
 {
-    SfxBoolItem aItem( SID_COLOR_CONTROL, FALSE );
+    SfxBoolItem aItem( SID_COLOR_CONTROL, sal_False );
     GetBindings().GetDispatcher()->Execute(
         SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     SfxDockingWindow::Close();
-    return( TRUE );
+    return( sal_True );
 }
 
 /*************************************************************************
@@ -474,7 +476,7 @@ BOOL SvxColorDockingWindow::Close()
 IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
 {
     SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
-    USHORT nPos = aColorSet.GetSelectItemId();
+    sal_uInt16 nPos = aColorSet.GetSelectItemId();
     Color  aColor( aColorSet.GetItemColor( nPos ) );
     String aStr( aColorSet.GetItemText( nPos ) );
 
@@ -489,7 +491,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
             }
             else
             {
-                BOOL bDone = FALSE;
+                sal_Bool bDone = sal_False;
 
                 // Wenn wir eine DrawView haben und uns im TextEdit-Modus befinden,
                 // wird nicht die Flaechen-, sondern die Textfarbe zugewiesen
@@ -502,7 +504,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
                         SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR );
                         pDispatcher->Execute(
                             SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L );
-                        bDone = TRUE;
+                        bDone = sal_True;
                     }
                 }
                 if ( !bDone )
@@ -580,8 +582,8 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     rNewSize.Height() -= 4;
 
     // Spalten und Reihen ermitteln
-    nCols = (USHORT) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
-    nLines = (USHORT) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
+    nCols = (sal_uInt16) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
+    nLines = (sal_uInt16) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
     if( nLines == 0 )
         nLines = 1;
 
@@ -598,7 +600,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     if( nScrollWidth > 0 )
     {
         // Spalten mit ScrollBar berechnen
-        nCols = (USHORT) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
+        nCols = (sal_uInt16) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
                             / (float) aItemSize.Width() + 0.5 );
     }
     if( nCols <= 1 )
@@ -609,7 +611,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
     if( nCount %  nCols )
         nMaxLines++;
 
-    nLines = sal::static_int_cast< USHORT >(
+    nLines = sal::static_int_cast< sal_uInt16 >(
         std::min< long >( nLines, nMaxLines ) );
 
     // Groesse des Windows setzen
@@ -646,7 +648,7 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
     if( ( rNEvt.GetType() == EVENT_KEYINPUT ) )
     {
         KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
-        USHORT	 nKeyCode = aKeyEvt.GetKeyCode().GetCode();
+        sal_uInt16	 nKeyCode = aKeyEvt.GetKeyCode().GetCode();
         switch( nKeyCode )
         {
             case KEY_ESCAPE:
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
index 151261ee15..0854c3f469 100644..100755
--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.src
@@ -52,32 +52,11 @@ DockingWindow RID_SVXCTRL_COLOR
         Border = FALSE ;
     };
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+// IAccessibility2 implementation 2009. ------
+String STR_COLORTABLE
+{
+    Text [ en-US ] = "Color Palette" ;
+};
+// ------ IAccessibility2 implementation 2009.
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 913ea76c84..6d782582a1 100644..100755
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -38,6 +38,7 @@
 
 #include <osl/mutex.hxx>
 
+#include <svtools/toolbarmenu.hxx>
 #include <vcl/toolbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
@@ -63,7 +64,7 @@
 ////////////
 
 using ::rtl::OUString;
-using ::svtools::ToolbarMenu;
+//using ::svtools::ToolbarMenu;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -97,7 +98,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 {
     SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
     {
         maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) );
@@ -109,7 +110,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
 
     mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
     mpDirectionSet->SetColCount( 3 );
-    mpDirectionSet->EnableFullItemMode( FALSE );
+    mpDirectionSet->EnableFullItemMode( sal_False );
 
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
     {
@@ -138,7 +139,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
+        for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
         {
             mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] );
         }
@@ -154,7 +155,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
 {
     if( mpDirectionSet )
     {
-        USHORT nItemId;
+        sal_uInt16 nItemId;
         for( nItemId = DIRECTION_NW; nItemId <= DIRECTION_SE; nItemId++ )
         {
             if( gSkewList[nItemId] == nSkew )
@@ -403,7 +404,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
 void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 {
     meUnit = eUnit;
-    USHORT nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
+    sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
 
     for( int i = 0; i < 5; i++ )
     {
@@ -593,7 +594,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
 , msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" ))
 , msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" ))
 {
-    USHORT i;
+    sal_uInt16 i;
     for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
     {
         if( i != FROM_FRONT )
@@ -612,7 +613,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
 
     mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
     mpLightingSet->SetColCount( 3 );
-    mpLightingSet->EnableFullItemMode( FALSE );
+    mpLightingSet->EnableFullItemMode( sal_False );
 
     for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
     {
@@ -665,7 +666,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
     if( !bEnabled )
         nDirection = FROM_FRONT;
 
-    USHORT nItemId;
+    sal_uInt16 nItemId;
     for( nItemId = FROM_TOP_LEFT; nItemId <= FROM_BOTTOM_RIGHT; nItemId++ )
     {
         if( nItemId == FROM_FRONT )
@@ -988,7 +989,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(
 SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem );
 
 ExtrusionColorControl::ExtrusionColorControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 : SfxToolBoxControl ( nSlotId, nId, rTbx ),
   mLastColor( COL_AUTO )
 {
@@ -1029,9 +1030,9 @@ SfxPopupWindow*	ExtrusionColorControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     if( nSID == SID_EXTRUSION_3D_COLOR )
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index 0ff7e0ddc2..0ff7e0ddc2 100644..100755
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 2279095aa9..2279095aa9 100644..100755
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 7c48986ed3..457b27be21 100644..100755
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -32,6 +32,7 @@
 
 DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -147,6 +148,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
     
 DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -207,6 +209,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
 
 DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -379,6 +382,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
 
 DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -439,6 +443,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 
 ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
 {
+    HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Moveable = TRUE;
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index cfa327ecee..dc82353ac7 100644..100755
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -45,8 +45,8 @@
 #define TMP_STR_BEGIN	'['
 #define TMP_STR_END		']'
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/itemwin.hxx>
@@ -67,7 +67,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem );
 |*
 \************************************************************************/
 
-SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
 
     pStyleItem		( NULL ),
@@ -78,8 +78,8 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBo
     pFillControl	( NULL ),
     pFillTypeLB		( NULL ),
     pFillAttrLB		( NULL ),
-    bUpdate			( FALSE ),
-    bIgnoreStatusUpdate( FALSE ),
+    bUpdate			( sal_False ),
+    bIgnoreStatusUpdate( sal_False ),
     eLastXFS        ( XFILL_NONE )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
@@ -107,7 +107,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl()
 
 void SvxFillToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     bool bEnableControls = false;
@@ -136,11 +136,11 @@ void SvxFillToolBoxControl::StateChanged(
                 pFillTypeLB->Enable();
 
                 eLastXFS = pFillTypeLB->GetSelectEntryPos();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
 
                 XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
                 pFillTypeLB->SelectEntryPos(
-                    sal::static_int_cast< USHORT >( eXFS ) );
+                    sal::static_int_cast< sal_uInt16 >( eXFS ) );
                 pFillAttrLB->Enable();
             }
             else if( pStyleItem )
@@ -185,7 +185,7 @@ void SvxFillToolBoxControl::StateChanged(
                 //pFillTypeLB->Enable();
                 pFillAttrLB->Enable();
 
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         
             Update( pState );
@@ -198,7 +198,7 @@ void SvxFillToolBoxControl::StateChanged(
                 pFillTypeLB->SetNoSelection();
                 pFillAttrLB->Disable();
                 pFillAttrLB->SetNoSelection();
-                bUpdate = FALSE;
+                bUpdate = sal_False;
             }
             else
             {
@@ -212,7 +212,7 @@ void SvxFillToolBoxControl::StateChanged(
                     ( nSID == SID_ATTR_FILL_BITMAP 	 && eXFS == XFILL_BITMAP ) )
                 {
                     pFillAttrLB->SetNoSelection();
-                    //bUpdate = FALSE;
+                    //bUpdate = sal_False;
                 }
             }
         }
@@ -232,7 +232,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
 {
     if ( pStyleItem && pState && bUpdate )
     {
-        bUpdate = FALSE;
+        bUpdate = sal_False;
 
         XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
 
@@ -266,7 +266,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         LISTBOX_ENTRY_NOTFOUND ||
                         pFillAttrLB->GetSelectEntryColor() != aColor )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -282,9 +282,9 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         aTmpStr += aString;
                         aTmpStr += TMP_STR_END;
 
-                        //pFillAttrLB->SetUpdateMode( FALSE );
-                        USHORT nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
-                        //pFillAttrLB->SetUpdateMode( TRUE );
+                        //pFillAttrLB->SetUpdateMode( sal_False );
+                        sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
+                        //pFillAttrLB->SetUpdateMode( sal_True );
                         pFillAttrLB->SelectEntryPos( nPos );
                     }
                     // NEU
@@ -304,7 +304,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -324,7 +324,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         String aEmptyString = String();
                          XGradientList aGradientList( aEmptyString );
                         aGradientList.Insert( pEntry );
-                        aGradientList.SetDirty( FALSE );
+                        aGradientList.SetDirty( sal_False );
                         Bitmap* pBmp = aGradientList.CreateBitmapForUI( 0 );
 
                         if( pBmp )
@@ -354,7 +354,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -374,7 +374,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         String aEmptyString = String();
                         XHatchList aHatchList( aEmptyString );
                         aHatchList.Insert( pEntry );
-                        aHatchList.SetDirty( FALSE );
+                        aHatchList.SetDirty( sal_False );
                         Bitmap* pBmp = aHatchList.CreateBitmapForUI( 0 );
 
                         if( pBmp )
@@ -411,7 +411,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                     // Pruefen, ob Eintrag nicht in der Liste ist
                     if( pFillAttrLB->GetSelectEntry() != aString )
                     {
-                        USHORT nCount = pFillAttrLB->GetEntryCount();
+                        sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
                         String aTmpStr;
                         if( nCount > 0 )
                         {
@@ -430,7 +430,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
                         XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr );
                         XBitmapList aBitmapList( String::CreateFromAscii("TmpList") );
                         aBitmapList.Insert( pEntry );
-                        aBitmapList.SetDirty( FALSE );
+                        aBitmapList.SetDirty( sal_False );
                         //Bitmap* pBmp = aBitmapList.GetBitmap( 0 );
                         //( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), *pBmp );
                         pFillAttrLB->Fill( &aBitmapList );
@@ -678,7 +678,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 {
     XFillStyle eXFS = (XFillStyle)pLbFillType->GetSelectEntryPos();
     XFillStyleItem aXFillStyleItem( eXFS );
-    BOOL bAction = pBox && !pLbFillAttr->IsTravelSelect();
+    sal_Bool bAction = pBox && !pLbFillAttr->IsTravelSelect();
 
     SfxObjectShell* pSh = SfxObjectShell::Current();
     if ( bAction )
@@ -690,10 +690,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
         aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
         aXFillStyleItem.QueryValue(  a );
         aArgs[0].Value = a;
-        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( TRUE );
+        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
         ((SvxFillToolBoxControl*)GetData())->Dispatch( 
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
-        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( FALSE );
+        ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
 
         switch( eXFS )
         {
@@ -724,7 +724,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
             break;
             case XFILL_GRADIENT:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_GRADIENT_LIST ) )
                 {
@@ -748,7 +748,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 
             case XFILL_HATCH:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_HATCH_LIST ) )
                 {
@@ -771,7 +771,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 
             case XFILL_BITMAP:
             {
-                USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+                sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
 
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) )
                 {
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 73b6ab1d9d..06f3e992ca 100644..100755
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -54,10 +54,10 @@
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 
-#include "gallery.hxx"
-#include <dlgutil.hxx>
+#include "svx/gallery.hxx"
+#include <svx/dlgutil.hxx>
 
-#include "fontworkgallery.hxx"
+#include <svx/fontworkgallery.hxx>
 #include "fontworkgallery.hrc"
 
 #include <algorithm>
@@ -84,8 +84,8 @@ const int nLineCount = 4;
 \************************************************************************/
 FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent, sal_uInt16 /*nSID*/ ) :
         ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_GALLERY ) ),
-        maCtlFavorites		( this, SVX_RES( CTL_FAVORITES ) ),
         maFLFavorites		( this, SVX_RES( FL_FAVORITES ) ),
+        maCtlFavorites		( this, SVX_RES( CTL_FAVORITES ) ),
         maOKButton			( this, SVX_RES( BTN_OK ) ),
         maCancelButton		( this, SVX_RES( BTN_CANCEL ) ),
         maHelpButton        ( this, SVX_RES( BTN_HELP ) ),
@@ -122,7 +122,7 @@ FontWorkGalleryDialog::~FontWorkGalleryDialog()
 void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites)
 {
     // Ueber die Gallery werden die Favoriten eingelesen
-    ULONG nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
+    sal_uIntPtr nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
 
     // Gallery thema locken
     GalleryExplorer::BeginLocking(nThemeId);
@@ -198,10 +198,10 @@ void FontWorkGalleryDialog::changeText( SdrTextObj* pObj )
     {
         SdrOutliner& rOutl = mpModel->GetDrawOutliner(pObj);
 
-        USHORT nOutlMode = rOutl.GetMode();
+        sal_uInt16 nOutlMode = rOutl.GetMode();
         Size aPaperSize = rOutl.GetPaperSize();
-        BOOL bUpdateMode = rOutl.GetUpdateMode();
-        rOutl.SetUpdateMode(FALSE);
+        sal_Bool bUpdateMode = rOutl.GetUpdateMode();
+        rOutl.SetUpdateMode(sal_False);
         rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() );
 
         // #95114# Always set the object's StyleSheet at the Outliner to
@@ -233,7 +233,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel*
 
 void FontWorkGalleryDialog::insertSelectedFontwork()
 {
-    USHORT nItemId = maCtlFavorites.GetSelectItemId();
+    sal_uInt16 nItemId = maCtlFavorites.GetSelectItemId();
 
     if( nItemId > 0 )
     {
@@ -308,7 +308,7 @@ IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG )
 //------------------------------------------------------------------------
 
 SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
-FontWorkShapeTypeControl::FontWorkShapeTypeControl(	USHORT nSlotId, USHORT nId, ToolBox &rTbx )
+FontWorkShapeTypeControl::FontWorkShapeTypeControl(	sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
 : SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -339,7 +339,7 @@ SfxPopupWindow*	FontWorkShapeTypeControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void FontWorkShapeTypeControl::Select( BOOL )
+void FontWorkShapeTypeControl::Select( sal_Bool )
 {
 
 }
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index c7873dcff9..ea09e3e8d7 100644..100755
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -37,6 +37,7 @@
 
 ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
 {
+    HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Moveable = TRUE;
@@ -94,6 +95,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
 
 DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -179,6 +181,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
 
 DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
 {
+    HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING";
     Border = FALSE ;
     Hide = TRUE ;
     SVLook = TRUE ;
@@ -221,6 +224,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
 
 ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
 {
+    HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 139 , 64 ) ;
@@ -256,6 +260,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
     };
     MetricField MF_VALUE
     {
+        HelpID = "svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE";
         Border = FALSE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 32 , 12 ) ;
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index a06289269d..9fbb5240f6 100644..100755
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "formatpaintbrushctrl.hxx"
+#include "svx/formatpaintbrushctrl.hxx"
 
 // header for class SfxBoolItem
 #include <svl/eitem.hxx>
@@ -50,12 +50,12 @@ using namespace ::com::sun::star::beans;
 
 SFX_IMPL_TOOLBOX_CONTROL( FormatPaintBrushToolBoxControl, SfxBoolItem );
 
-FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl(	USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl(	sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SfxToolBoxControl( nSlotId, nId, rTbx )
     , m_bPersistentCopy(false)
     , m_aDoubleClickTimer()
 {
-    ULONG nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
+    sal_uIntPtr nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
 
     m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) );
     m_aDoubleClickTimer.SetTimeout(nDblClkTime);
@@ -103,12 +103,12 @@ IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::Select( BOOL )
+void FormatPaintBrushToolBoxControl::Select( sal_Bool )
 {
 }
 
 // -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState,
+void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                 const SfxPoolItem* pState )
 {
     if( ( eState & SFX_ITEM_SET ) == 0 )
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 079223be59..ae5a158295 100644..100755
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -61,8 +61,8 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdtrans.hxx>
-#include "grafctrl.hxx"
-#include "tbxcolor.hxx"
+#include "svx/grafctrl.hxx"
+#include "svx/tbxcolor.hxx"
 
 // namespaces
 using ::rtl::OUString;
@@ -89,7 +89,7 @@ TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item );
 
 //---------------------------------------------------------
 
-TbxImageItem::TbxImageItem( USHORT _nWhich, UINT16 nImage ) :
+TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) :
     SfxUInt16Item( _nWhich, nImage )
 {
 }
@@ -252,10 +252,10 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem )
 struct CommandToRID
 {
     const char* pCommand;
-    USHORT      nResId;
+    sal_uInt16      nResId;
 };
 
-static USHORT ImplGetRID( const OUString& aCommand )
+static sal_uInt16 ImplGetRID( const OUString& aCommand )
 {
     static const CommandToRID aImplCommandToResMap[] =
     {
@@ -269,7 +269,7 @@ static USHORT ImplGetRID( const OUString& aCommand )
         { 0, 0 }
     };
 
-    USHORT nRID = 0;
+    sal_uInt16 nRID = 0;
 
     sal_Int32 i( 0 );
     while ( aImplCommandToResMap[ i ].pCommand )
@@ -300,7 +300,7 @@ protected:
 
 public:
 
-                            ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
+                            ImplGrafControl( Window* pParent, sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
                             ~ImplGrafControl();
 
     void					Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); }
@@ -311,7 +311,7 @@ public:
 
 ImplGrafControl::ImplGrafControl(
     Window* pParent,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const rtl::OUString& rCmd,
     const Reference< XFrame >& rFrame
 )   : Control( pParent, WB_TABSTOP )
@@ -346,8 +346,7 @@ ImplGrafControl::ImplGrafControl(
     
     maImage.Show();
 
-    maField.SetHelpId( nSlotId );
-    maField.SetSmartHelpId( SmartId( rCmd ));
+    maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) );
     maField.Show();
 }
 
@@ -372,7 +371,7 @@ class ImplGrafModeControl : public ListBox
 {
     using Window::Update;
 private:
-    USHORT			    mnCurPos;
+    sal_uInt16			    mnCurPos;
     Reference< XFrame > mxFrame;
 
     virtual void 	Select();
@@ -437,7 +436,7 @@ void ImplGrafModeControl::Select()
 
 long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         mnCurPos = GetSelectEntryPos();
@@ -508,7 +507,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -523,7 +522,7 @@ SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafFilterToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
 {
     GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
 }
@@ -554,7 +553,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafToolBoxControl, SfxVoidItem );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafToolBoxControl::SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx) :
+SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -569,7 +568,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     ImplGrafControl* pCtrl = (ImplGrafControl*) GetToolBox().GetItemWindow( GetId() );
@@ -606,7 +605,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafRedToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -619,7 +618,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGreenToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl(	USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl(	sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -632,7 +631,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafBlueToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -645,7 +644,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafLuminanceToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -658,7 +657,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafContrastToolBoxControl, SfxInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -671,7 +670,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGammaToolBoxControl, SfxUInt32Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -684,7 +683,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafTransparenceToolBoxControl, SfxUInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxGrafToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -697,7 +696,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafModeToolBoxControl, SfxUInt16Item );
 
 // -----------------------------------------------------------------------------
 
-SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
 }
@@ -710,7 +709,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl()
 
 // -----------------------------------------------------------------------------
 
-void SvxGrafModeToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     ImplGrafModeControl* pCtrl = (ImplGrafModeControl*) GetToolBox().GetItemWindow( GetId() );
@@ -760,9 +759,9 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 
     const SfxItemSet*	pArgs = rReq.GetArgs();
     const SfxPoolItem*	pItem;
-    USHORT				nSlot = rReq.GetSlot();
+    sal_uInt16				nSlot = rReq.GetSlot();
 
-    if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, FALSE, &pItem ))
+    if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem ))
         pItem = 0;
     
     switch( nSlot )
@@ -1030,13 +1029,13 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
     SfxItemPool&	rPool = rView.GetModel()->GetItemPool();
     SfxItemSet		aAttrSet( rPool );
     SfxWhichIter	aIter( rSet );
-    USHORT			nWhich = aIter.FirstWhich();
+    sal_uInt16			nWhich = aIter.FirstWhich();
 
     rView.GetAttributes( aAttrSet );
 
     while( nWhich )
     {
-        USHORT nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
+        sal_uInt16 nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
 
         switch( nSlotId )
         {
@@ -1045,7 +1044,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                 if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) )
                 {
                     rSet.Put( SfxUInt16Item( nSlotId,
-                        sal::static_int_cast< UINT16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
+                        sal::static_int_cast< sal_uInt16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
                 }
             }
             break;
@@ -1115,9 +1114,9 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                 if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) )
                 {
                     const SdrMarkList&	rMarkList = rView.GetMarkedObjectList();
-                    BOOL				bEnable = TRUE;
+                    sal_Bool				bEnable = sal_True;
 
-                    for( USHORT i = 0, nCount = (USHORT) rMarkList.GetMarkCount();
+                    for( sal_uInt16 i = 0, nCount = (sal_uInt16) rMarkList.GetMarkCount();
                          ( i < nCount ) && bEnable; i++ )
                     {
                         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -1126,7 +1125,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                             ( (SdrGrafObj*) pObj )->HasGDIMetaFile() ||
                             ( (SdrGrafObj*) pObj )->IsAnimated() )
                         {
-                            bEnable = FALSE;
+                            bEnable = sal_False;
                         }
                     }
 
@@ -1142,7 +1141,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
             case( SID_ATTR_GRAF_CROP ):
             {
                 const SdrMarkList&	rMarkList = rView.GetMarkedObjectList();
-                BOOL				bDisable = TRUE;
+                sal_Bool				bDisable = sal_True;
 
                 if( 1 == rMarkList.GetMarkCount() )
                 {
@@ -1155,7 +1154,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
                         if(	( pGrafObj->GetGraphicType() != GRAPHIC_NONE ) &&
                             ( pGrafObj->GetGraphicType() != GRAPHIC_DEFAULT ) )
                         {
-                            bDisable = FALSE;
+                            bDisable = sal_False;
                         }
                     }
                 }
diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc
index 10eafae0a6..10eafae0a6 100644..100755
--- a/svx/source/tbxctrls/grafctrl.hrc
+++ b/svx/source/tbxctrls/grafctrl.hrc
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
index a0d437ff9c..a0d437ff9c 100644..100755
--- a/svx/source/tbxctrls/grafctrl.src
+++ b/svx/source/tbxctrls/grafctrl.src
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index addec7eb18..9852f9ac79 100644..100755
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -50,11 +50,11 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xtable.hxx>
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/itemwin.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svtools/colorcfg.hxx>
 
 #include "linectrl.hrc"
@@ -74,7 +74,7 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB
     LineLB( pParent, nBits ),
     nCurPos		( 0 ),
     aLogicalSize(40,140),
-    bRelease    ( TRUE ),
+    bRelease    ( sal_True ),
     mpSh		( NULL ),
     mxFrame     ( rFrame )
 {
@@ -114,7 +114,7 @@ void SvxLineBox::Select()
     if ( !IsTravelSelect() )
     {
         XLineStyle eXLS;
-        USHORT nPos = GetSelectEntryPos();
+        sal_uInt16 nPos = GetSelectEntryPos();
 
         switch ( nPos )
         {
@@ -173,7 +173,7 @@ void SvxLineBox::Select()
 
 long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     switch(nType)
     {
@@ -189,7 +189,7 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
             const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
             if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
             {
-                bRelease = FALSE;
+                bRelease = sal_False;
                 Select();
             }
         }
@@ -231,7 +231,7 @@ void SvxLineBox::ReleaseFocus_Impl()
 {
     if(!bRelease)
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
 
@@ -283,7 +283,7 @@ SvxColorBox::SvxColorBox(
     ColorLB( pParent, nBits ),
     nCurPos		( 0 ),
     aLogicalSize(45,80),
-    bRelease    ( TRUE ),
+    bRelease    ( sal_True ),
     maCommand   ( rCommand ),
     mxFrame     ( rFrame )
 {
@@ -362,7 +362,7 @@ void SvxColorBox::Select()
 
 long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     switch(nType)
     {
@@ -379,7 +379,7 @@ long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 
             if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
             {
-                bRelease = FALSE;
+                bRelease = sal_False;
                 Select();
             }
         }
@@ -433,7 +433,7 @@ void SvxColorBox::ReleaseFocus_Impl()
 {
     if(!bRelease)
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
 
@@ -469,7 +469,7 @@ SvxMetricField::SvxMetricField(
     SetFirst( 0 );
 
     eDlgUnit = SfxModule::GetCurrentFieldUnit();
-    SetFieldUnit( *this, eDlgUnit, FALSE );
+    SetFieldUnit( *this, eDlgUnit, sal_False );
     Show();
 }
 
@@ -556,7 +556,7 @@ void SvxMetricField::RefreshDlgUnit()
     if ( eDlgUnit != eTmpUnit )
     {
         eDlgUnit = eTmpUnit;
-        SetFieldUnit( *this, eDlgUnit, FALSE );
+        SetFieldUnit( *this, eDlgUnit, sal_False );
     }
 }
 
@@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit()
 
 long SvxMetricField::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         aCurTxt = GetText();
@@ -632,8 +632,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
 SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) :
     FillTypeLB( pParent, nBits | WB_TABSTOP ),
     nCurPos	( 0 ),
-    bSelect ( FALSE ),
-    bRelease(TRUE)
+    bSelect ( sal_False ),
+    bRelease(sal_True)
 {
     SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT ));
     Fill();
@@ -651,18 +651,18 @@ SvxFillTypeBox::~SvxFillTypeBox()
 
 long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurPos = GetSelectEntryPos();
     else if ( EVENT_LOSEFOCUS == nType
         && Application::GetFocusWindow()
-        && !IsWindowOrChild( Application::GetFocusWindow(), TRUE ) )
+        && !IsWindowOrChild( Application::GetFocusWindow(), sal_True ) )
     {
         if ( !bSelect )
             SelectEntryPos( nCurPos );
         else
-            bSelect = FALSE;
+            bSelect = sal_False;
     }
 
     return FillTypeLB::PreNotify( rNEvt );
@@ -684,9 +684,9 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
                 ( (Link&)GetSelectHdl() ).Call( this );
             break;
             case KEY_TAB:
-                bRelease = FALSE;
+                bRelease = sal_False;
                 ( (Link&)GetSelectHdl() ).Call( this );
-                bRelease = TRUE;
+                bRelease = sal_True;
                 break;
 
             case KEY_ESCAPE:
@@ -721,7 +721,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) :
     FillAttrLB( pParent, nBits | WB_TABSTOP ),
 
     nCurPos( 0 ),
-    bRelease( TRUE )
+    bRelease( sal_True )
 
 {
     SetPosPixel( Point( 90, 0 ) );
@@ -739,7 +739,7 @@ SvxFillAttrBox::~SvxFillAttrBox()
 
 long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurPos = GetSelectEntryPos();
@@ -764,9 +764,9 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
                 nHandled = 1;
             break;
             case KEY_TAB:
-                bRelease = FALSE;
+                bRelease = sal_False;
                 GetSelectHdl().Call( this );
-                bRelease = TRUE;
+                bRelease = sal_True;
             break;
             case KEY_ESCAPE:
                 SelectEntryPos( nCurPos );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index c88d9059f5..48e7747a3b 100644..100755
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/app.hxx>
 
 #include <svx/dialogs.hrc>
-#include "layctrl.hxx"
+#include "svx/layctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svtools/colorcfg.hxx>
@@ -77,8 +77,8 @@ private:
     ::Color			    aBackgroundColor;
     long                nCol;
     long                nLine;
-    BOOL                bInitialKeyInput;
-    BOOL                m_bMod1;
+    sal_Bool                bInitialKeyInput;
+    sal_Bool                m_bMod1;
     ToolBox&            rTbx;
     Reference< XFrame > mxFrame;
     rtl::OUString       maCommand;
@@ -86,7 +86,7 @@ private:
     DECL_LINK( SelectHdl, void * );
 
 public:
-                            TableWindow( USHORT                     nSlotId,
+                            TableWindow( sal_uInt16                     nSlotId,
                                          const rtl::OUString&       rCmd,
                                          const String&              rText,
                                          ToolBox&                   rParentTbx,
@@ -116,13 +116,11 @@ IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
-TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ),
     aTableButton( this ),
     nCol( 0 ),
     nLine( 0 ),
-    bInitialKeyInput(TRUE),
-    m_bMod1(FALSE),
     rTbx(rParentTbx),
     mxFrame( rFrame ),
     maCommand( rCmd )
@@ -139,7 +137,7 @@ TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const Strin
     Font aFont = GetFont();
     aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor )  );
     aFont.SetFillColor( aBackgroundColor );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
     SetFont( aFont );
 
     SetText( rText );
@@ -185,8 +183,8 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt )
 void TableWindow::KeyInput( const KeyEvent& rKEvt )
 {
     bool bHandled = false;
-    USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
-    USHORT nKey = rKEvt.GetKeyCode().GetCode();
+    sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+    sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
     if ( !nModifier )
     {
         bHandled = true;
@@ -235,7 +233,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
             //make sure that a table can initially be created
             if(bInitialKeyInput)
             {
-                bInitialKeyInput = FALSE;
+                bInitialKeyInput = sal_False;
                 if(!nNewLine)
                     nNewLine = 1;
                 if(!nNewCol)
@@ -246,7 +244,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
     }
     else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
     {
-        m_bMod1 = TRUE;
+        m_bMod1 = sal_True;
         EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
     }
 
@@ -373,7 +371,7 @@ void TableWindow::Update( long nNewCol, long nNewLine )
 void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
 {
     Window* pParent = rTbx.GetParent();
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
 
     Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY );
@@ -417,15 +415,15 @@ private:
     long                nWidth;
     long                nMX;
     long                nTextHeight;
-    BOOL                bInitialKeyInput;
-    BOOL                m_bMod1;
+    sal_Bool                bInitialKeyInput;
+    sal_Bool                m_bMod1;
     ToolBox&            rTbx;
     Reference< XFrame > mxFrame;
     ::rtl::OUString            maCommand;
 
     void UpdateSize_Impl( long nNewCol );
 public:
-                            ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
+                            ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
 
     void                    KeyInput( const KeyEvent& rKEvt );
     virtual void            MouseMove( const MouseEvent& rMEvt );
@@ -435,15 +433,15 @@ public:
     virtual void    		PopupModeEnd();
     virtual SfxPopupWindow*	Clone() const;
 
-    USHORT          		GetColCount() const { return (USHORT)nCol; }
+    sal_uInt16          		GetColCount() const { return (sal_uInt16)nCol; }
 };
 
 // -----------------------------------------------------------------------
 
-ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
-    bInitialKeyInput(TRUE),
-    m_bMod1(FALSE),
+    bInitialKeyInput(sal_True),
+    m_bMod1(sal_False),
     rTbx(rParentTbx),
     mxFrame(rFrame),
     maCommand( rCmd )
@@ -461,7 +459,7 @@ ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const Str
     Font aFont( GetFont() );
     aFont.SetColor( aLineColor );
     aFont.SetFillColor( aFaceColor );
-    aFont.SetTransparent( FALSE );
+    aFont.SetTransparent( sal_False );
     SetFont( aFont );
 
     nCol        = 0;
@@ -572,16 +570,16 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
 
 void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    BOOL bHandled = FALSE;
-    USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
-    USHORT nKey = rKEvt.GetKeyCode().GetCode();
+    sal_Bool bHandled = sal_False;
+    sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+    sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
     if(!nModifier)
     {
         if( KEY_LEFT == nKey || KEY_RIGHT == nKey ||
             KEY_RETURN == nKey ||KEY_ESCAPE == nKey ||
             KEY_UP == nKey)
         {
-            bHandled = TRUE;
+            bHandled = sal_True;
             long nNewCol = nCol;
             switch(nKey)
             {
@@ -605,7 +603,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
             //make sure that a table can initially be created
             if(bInitialKeyInput)
             {
-                bInitialKeyInput = FALSE;
+                bInitialKeyInput = sal_False;
                 if(!nNewCol)
                     nNewCol = 1;
             }
@@ -614,7 +612,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
     }
     else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
     {
-        m_bMod1 = TRUE;
+        m_bMod1 = sal_True;
         if(IsMouseCaptured())
             ReleaseMouse();
         EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -696,7 +694,7 @@ void ColumnsWindow::PopupModeEnd()
 {
     if ( !IsPopupModeCanceled() && nCol )
     {
-        USHORT nId = GetId();
+        sal_uInt16 nId = GetId();
         Window* pParent = rTbx.GetParent();
         pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
 
@@ -717,9 +715,9 @@ void ColumnsWindow::PopupModeEnd()
 
 // class SvxTableToolBoxControl ------------------------------------------
 
-SvxTableToolBoxControl::SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
-    bEnabled( TRUE )
+    bEnabled( sal_True )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
     rTbx.Invalidate();
@@ -764,17 +762,17 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
 
 // -----------------------------------------------------------------------
 
-void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( pState && pState->ISA(SfxUInt16Item) )
     {
-        INT16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
+        sal_Int16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
         bEnabled = ( nValue != 0 );
     }
     else
         bEnabled = SFX_ITEM_DISABLED != eState;
 
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -784,7 +782,7 @@ void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const Sf
 
 // class SvxColumnsToolBoxControl ------------------------------------------
 
-SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -831,7 +829,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
     return pWin;
 }
 
-void SvxColumnsToolBoxControl::StateChanged( USHORT nSID,
+void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 6dff1e0653..434d318398 100644..100755
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -47,7 +47,7 @@
 #include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <svx/dialmgr.hxx>
-#include <lboxctrl.hxx>
+#include <svx/lboxctrl.hxx>
 #include <vcl/mnemonic.hxx>
 #include <tools/urlobj.hxx>
 
@@ -71,47 +71,47 @@ class SvxPopupWindowListBox : public SfxPopupWindow
 
     ListBox	*		pListBox;
     ToolBox &		rToolBox;
-    BOOL			bUserSel;
-    USHORT          nTbxId;
+    sal_Bool			bUserSel;
+    sal_uInt16          nTbxId;
     rtl::OUString   maCommandURL;
     // disallow copy-constructor and assignment-operator
 
     SvxPopupWindowListBox(const int& );
     SvxPopupWindowListBox & operator = (const int& );
 
-//	SvxPopupWindowListBox( USHORT nSlotId, ToolBox& rTbx, USHORT nTbxItemId );
+//	SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId );
 
 public:
-    SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nTbxId, ToolBox& rTbx );
+    SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx );
     virtual ~SvxPopupWindowListBox();
 
     // SfxPopupWindow
     virtual SfxPopupWindow * 	Clone() const;
     virtual void 				PopupModeEnd();
-    virtual void 				StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void 				StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState );
 
     void 						StartSelection();
     inline ListBox &			GetListBox()	{ return *pListBox; }
 
-    BOOL						IsUserSelected() const			{ return bUserSel; }
-    void						SetUserSelected( BOOL bVal )	{ bUserSel = bVal; }
+    sal_Bool						IsUserSelected() const			{ return bUserSel; }
+    void						SetUserSelected( sal_Bool bVal )	{ bUserSel = bVal; }
     /*virtual*/Window*                     GetPreferredKeyInputWindow();
 };
 
 /////////////////////////////////////////////////////////////////
 
-SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) :
+SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ),
     rToolBox	( rTbx ),
-    bUserSel	( FALSE ),
+    bUserSel	( sal_False ),
     nTbxId      ( nId ),
     maCommandURL( rCommandURL )
 {
     DBG_ASSERT( nSlotId == GetId(), "id mismatch" );
     pListBox = new ListBox( this, SVX_RES( LB_SVXTBX_UNDO_REDO_CTRL ) );
     FreeResource();
-    pListBox->EnableMultiSelection( TRUE, TRUE );
+    pListBox->EnableMultiSelection( sal_True, sal_True );
     SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     AddStatusListener( rCommandURL );
 }
@@ -145,7 +145,7 @@ void SvxPopupWindowListBox::PopupModeEnd()
 
 
 void SvxPopupWindowListBox::StateChanged(
-        USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+        sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SFX_ITEM_DISABLED) );
     SfxPopupWindow::StateChanged( nSID, eState, pState );
@@ -169,7 +169,7 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow()
 SFX_IMPL_TOOLBOX_CONTROL( SvxListBoxControl, SfxStringItem );
 
 
-SvxListBoxControl::SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx ),
     pPopupWin	( 0 )
 {
@@ -197,7 +197,7 @@ SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
 
 
 void SvxListBoxControl::StateChanged(
-        USHORT, SfxItemState, const SfxPoolItem* pState )
+        sal_uInt16, SfxItemState, const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(),
                             SFX_ITEM_DISABLED != GetItemState(pState) );
@@ -209,7 +209,7 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
     if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags()  &&
         pPopupWin->IsUserSelected() )
     {
-        USHORT nCount = pPopupWin->GetListBox().GetSelectEntryCount();
+        sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount();
         
         INetURLObject aObj( m_aCommandURL );
         
@@ -222,13 +222,13 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
 }
 
 
-void SvxListBoxControl::Impl_SetInfo( USHORT nCount )
+void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount )
 {
     DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" );
 
 //    ListBox &rListBox = pPopupWin->GetListBox();
 
-    USHORT nId;
+    sal_uInt16 nId;
     if (nCount == 1)
         nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
     else
@@ -246,14 +246,14 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
 {
     if (pPopupWin)
     {
-        //pPopupWin->SetUserSelected( FALSE );
+        //pPopupWin->SetUserSelected( sal_False );
 
         ListBox &rListBox = pPopupWin->GetListBox();
         if (rListBox.IsTravelSelect())
             Impl_SetInfo( rListBox.GetSelectEntryCount() );
         else
         {
-            pPopupWin->SetUserSelected( TRUE );
+            pPopupWin->SetUserSelected( sal_True );
             pPopupWin->EndPopupMode( 0 );
         }
     }
@@ -264,7 +264,7 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem );
 
-SvxUndoRedoControl::SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SvxListBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -277,7 +277,7 @@ SvxUndoRedoControl::~SvxUndoRedoControl()
 }
 
 void SvxUndoRedoControl::StateChanged( 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( nSID == SID_UNDO || nSID == SID_REDO )
     {
diff --git a/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc
index 6f744ae1c2..6f744ae1c2 100644..100755
--- a/svx/source/tbxctrls/lboxctrl.hrc
+++ b/svx/source/tbxctrls/lboxctrl.hrc
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index 149627ef16..b82be11fb5 100644..100755
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.src
@@ -40,6 +40,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
 
     ListBox LB_SVXTBX_UNDO_REDO_CTRL
     {
+        HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL";
         Pos = MAP_APPFONT ( 0 , 0 ) ;
         Size = MAP_APPFONT ( 100 , 85 ) ;
         Border = TRUE ;
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 8f74252f35..79e4abefab 100644..100755
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -41,10 +41,10 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
-#include "drawitem.hxx"
-#include "xattr.hxx"
+#include "svx/drawitem.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
-#include "linectrl.hxx"
+#include "svx/linectrl.hxx"
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 
@@ -87,13 +87,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl,   SfxBoolItem );
 |*
 \************************************************************************/
 
-SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( USHORT nSlotId,
-                                                        USHORT nId,
+SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId,
+                                                        sal_uInt16 nId,
                                                         ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     pStyleItem		( NULL ),
     pDashItem		( NULL ),
-    bUpdate			( FALSE )
+    bUpdate			( sal_False )
 {
     addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )));
     addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" )));
@@ -111,7 +111,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl()
 
 void SvxLineStyleToolBoxControl::StateChanged (
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
@@ -139,7 +139,7 @@ void SvxLineStyleToolBoxControl::StateChanged (
                 pDashItem = (XLineDashItem*)pState->Clone();
             }
 
-            bUpdate = TRUE;
+            bUpdate = sal_True;
             Update( pState );
         }
         else if ( nSID != SID_DASH_LIST )
@@ -156,7 +156,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
 {
     if ( pState && bUpdate )
     {
-        bUpdate = FALSE;
+        bUpdate = sal_False;
 
         SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
         DBG_ASSERT( pBox, "Window not found!" );
@@ -231,7 +231,7 @@ Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" )));
@@ -246,7 +246,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl()
 //========================================================================
 
 void SvxLineWidthToolBoxControl::StateChanged(
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     SvxMetricField* pFld = (SvxMetricField*)
                            GetToolBox().GetItemWindow( GetId() );
@@ -298,7 +298,7 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
@@ -314,7 +314,7 @@ SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl()
 
 void SvxLineColorToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() );
@@ -376,7 +376,7 @@ Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent )
 \************************************************************************/
 
 SvxLineEndWindow::SvxLineEndWindow(
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const Reference< XFrame >& rFrame,
     const String& rWndTitle ) :
     SfxPopupWindow( nSlotId,
@@ -387,7 +387,7 @@ SvxLineEndWindow::SvxLineEndWindow(
     nCols			( 2 ),
     nLines			( 12 ),
     nLineEndWidth	( 400 ),
-    bPopupMode		( TRUE ),
+    bPopupMode		( sal_True ),
     mbInResize		( false ),
     mxFrame         ( rFrame )
 {
@@ -396,7 +396,7 @@ SvxLineEndWindow::SvxLineEndWindow(
 }
 
 SvxLineEndWindow::SvxLineEndWindow(
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const Reference< XFrame >& rFrame,
     Window* pParentWindow,
     const String& rWndTitle ) :
@@ -409,7 +409,7 @@ SvxLineEndWindow::SvxLineEndWindow(
     nCols			( 2 ),
     nLines			( 12 ),
     nLineEndWidth	( 400 ),
-    bPopupMode		( TRUE ),
+    bPopupMode		( sal_True ),
     mbInResize		( false ),
     mxFrame         ( rFrame )
 {
@@ -466,7 +466,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
 {
     XLineEndItem*   		pLineEndItem = NULL;
     XLineStartItem* 		pLineStartItem = NULL;
-    USHORT 					nId = aLineEndSet.GetSelectItemId();
+    sal_uInt16 					nId = aLineEndSet.GetSelectItemId();
 
     if( nId == 1 )
     {
@@ -542,7 +542,7 @@ void SvxLineEndWindow::FillValueSet()
         DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
 
         aBmpSize = pBmp->GetSizePixel();
-        aVD.SetOutputSizePixel( aBmpSize, FALSE );
+        aVD.SetOutputSizePixel( aBmpSize, sal_False );
         aBmpSize.Width() = aBmpSize.Width() / 2;
         Point aPt0( 0, 0 );
         Point aPt1( aBmpSize.Width(), 0 );
@@ -561,10 +561,10 @@ void SvxLineEndWindow::FillValueSet()
             DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
 
             aVD.DrawBitmap( aPt0, *pBmp );
-            aLineEndSet.InsertItem( (USHORT)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
-            aLineEndSet.InsertItem( (USHORT)((i+2L)*2L), 	aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
+            aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
+            aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L), 	aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
         }
-        nLines = Min( (USHORT)(nCount + 1), (USHORT) MAX_LINES );
+        nLines = Min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
         aLineEndSet.SetLineCount( nLines );
 
         SetSize();
@@ -608,21 +608,21 @@ void SvxLineEndWindow::Resizing( Size& rNewSize )
     Size aItemSize = aLineEndSet.CalcItemSizePixel( aBitmapSize );  // -> Member
     //Size aOldSize = GetOutputSizePixel(); // fuer Breite
 
-    USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
+    sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
 
     // Spalten ermitteln
     long nItemW = aItemSize.Width();
     long nW = rNewSize.Width();
-    nCols = (USHORT) Max( ( (ULONG)(( nW + nItemW ) / ( nItemW * 2 ) )),
-                                            (ULONG) 1L );
+    nCols = (sal_uInt16) Max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )),
+                                            (sal_uIntPtr) 1L );
     nCols *= 2;
 
     // Reihen ermitteln
     long nItemH = aItemSize.Height();
     long nH = rNewSize.Height();
-    nLines = (USHORT) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
+    nLines = (sal_uInt16) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
 
-    USHORT nMaxCols  = nItemCount / nLines;
+    sal_uInt16 nMaxCols  = nItemCount / nLines;
     if( nItemCount % nLines )
         nMaxCols++;
     if( nCols > nMaxCols )
@@ -632,9 +632,9 @@ void SvxLineEndWindow::Resizing( Size& rNewSize )
     // Keine ungerade Anzahl von Spalten
     if( nCols % 2 )
         nCols--;
-    nCols = Max( nCols, (USHORT) 2 );
+    nCols = Max( nCols, (sal_uInt16) 2 );
 
-    USHORT nMaxLines  = nItemCount / nCols;
+    sal_uInt16 nMaxLines  = nItemCount / nCols;
     if( nItemCount % nCols )
         nMaxLines++;
     if( nLines > nMaxLines )
@@ -653,7 +653,7 @@ void SvxLineEndWindow::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineEndWindow::Close()
+sal_Bool SvxLineEndWindow::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -661,7 +661,7 @@ BOOL SvxLineEndWindow::Close()
 // -----------------------------------------------------------------------
 
 void SvxLineEndWindow::StateChanged(
-    USHORT nSID, SfxItemState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState )
 {
     if ( nSID == SID_LINEEND_LIST )
     {
@@ -687,7 +687,7 @@ void SvxLineEndWindow::PopupModeEnd()
 {
     if ( IsVisible() )
     {
-        bPopupMode = FALSE;
+        bPopupMode = sal_False;
         SetSize();
     }
     SfxPopupWindow::PopupModeEnd();
@@ -700,8 +700,8 @@ void SvxLineEndWindow::SetSize()
     //if( !bPopupMode )
     if( !IsInPopupMode() )
     {
-        USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
-        USHORT nMaxLines  = nItemCount / nCols; // -> Member ?
+        sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
+        sal_uInt16 nMaxLines  = nItemCount / nCols; // -> Member ?
         if( nItemCount % nCols )
             nMaxLines++;
 
@@ -739,7 +739,7 @@ void SvxLineEndWindow::GetFocus (void)
 |*
 \************************************************************************/
 
-SvxLineEndToolBoxControl::SvxLineEndToolBoxControl(	USHORT nSlotId, USHORT nId, ToolBox &rTbx ) :
+SvxLineEndToolBoxControl::SvxLineEndToolBoxControl(	sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -773,9 +773,9 @@ SfxPopupWindow*	SvxLineEndToolBoxControl::CreatePopupWindow()
 
 // -----------------------------------------------------------------------
 
-void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/tbxctrls/linectrl.src b/svx/source/tbxctrls/linectrl.src
index 6ed613bb20..6ed613bb20 100644..100755
--- a/svx/source/tbxctrls/linectrl.src
+++ b/svx/source/tbxctrls/linectrl.src
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
deleted file mode 100644
index a9ea745f3c..0000000000
--- a/svx/source/tbxctrls/makefile.mk
+++ /dev/null
@@ -1,84 +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=svx
-TARGET=tbxctrls
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-        $(SLO)$/fontworkgallery.obj\
-        $(SLO)$/extrusioncontrols.obj \
-        $(SLO)$/tbcontrl.obj	\
-        $(SLO)$/tbxcolorupdate.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-        $(SLO)$/formatpaintbrushctrl.obj\
-        $(SLO)$/colrctrl.obj	\
-        $(SLO)$/fillctrl.obj	\
-        $(SLO)$/grafctrl.obj	\
-        $(SLO)$/itemwin.obj		\
-        $(SLO)$/layctrl.obj		\
-        $(SLO)$/lboxctrl.obj	\
-        $(SLO)$/linectrl.obj	\
-        $(SLO)$/tbxalign.obj	\
-        $(SLO)$/tbxdrctl.obj    \
-        $(SLO)$/verttexttbxctrl.obj \
-        $(SLO)$/subtoolboxcontrol.obj \
-        $(SLO)$/tbxcolor.obj \
-        $(SLO)$/tbunocontroller.obj \
-        $(SLO)$/tbunosearchcontrollers.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
-        fontworkgallery.src		\
-        extrusioncontrols.src		\
-        colrctrl.src			\
-        lboxctrl.src			\
-        linectrl.src			\
-        tbcontrl.src			\
-        tbunosearchcontrollers.src			\
-        tbxdraw.src				\
-        grafctrl.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 96d98ebc67..cfc084c93f 100644..100755
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -42,7 +42,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxSubToolBoxControl, SfxUInt16Item );
 
 **********************************************************************/
 
-SvxSubToolBoxControl::SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxSubToolBoxControl::SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 : SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 41662cc353..ddb126e822 100644..100755
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -74,7 +74,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
 #include "helpid.hrc"
-#include "htmlmode.hxx"
+#include "svx/htmlmode.hxx"
 #include <svx/xtable.hxx>
 #include "editeng/fontitem.hxx"
 #include <editeng/fhgtitem.hxx>
@@ -83,9 +83,9 @@
 #include <editeng/colritem.hxx>
 #include "editeng/flstitem.hxx"
 #include "editeng/bolnitem.hxx"
-#include "drawitem.hxx"
+#include "svx/drawitem.hxx"
 #include <svx/tbcontrl.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
 #include "colorwindow.hxx"
 #include <memory>
@@ -106,11 +106,11 @@
 #define DELETEZ(p) (delete (p), (p)=NULL)
 #endif
 // don't make more than 15 entries visible at once
-#define MAX_STYLES_ENTRIES          static_cast< USHORT >( 15 )
+#define MAX_STYLES_ENTRIES          static_cast< sal_uInt16 >( 15 )
 
 void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
 void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
-BOOL lcl_FontChangedHint( const SfxHint &rHint );
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
 
 // namespaces
 using ::rtl::OUString;
@@ -141,12 +141,12 @@ class SvxStyleBox_Impl : public ComboBox
 {
     using Window::IsVisible;
 public:
-    SvxStyleBox_Impl( Window* pParent, USHORT nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
-                        const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, BOOL bInSpecialMode );
+    SvxStyleBox_Impl( Window* pParent, sal_uInt16 nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
+                        const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode );
     ~SvxStyleBox_Impl();
 
     void 			SetFamily( SfxStyleFamily eNewFamily );
-    inline BOOL     IsVisible() { return bVisible; }
+    inline sal_Bool     IsVisible() { return bVisible; }
 
     virtual long	PreNotify( NotifyEvent& rNEvt );
     virtual long	Notify( NotifyEvent& rNEvt );
@@ -163,20 +163,20 @@ protected:
     virtual void	Select();
 
 private:
-    USHORT			                nSlotId;
+    sal_uInt16			                nSlotId;
     SfxStyleFamily	                eStyleFamily;
-    USHORT			                nCurSel;
-    BOOL			                bRelease;
+    sal_uInt16			                nCurSel;
+    sal_Bool			                bRelease;
     Size                            aLogicalSize;
     Link			                aVisibilityListener;
-    BOOL			                bVisible;
+    sal_Bool			                bVisible;
     Reference< XDispatchProvider >  m_xDispatchProvider;
     Reference< XFrame >             m_xFrame;
     OUString                        m_aCommand;
     String							aClearFormatKey;
     String							aMoreKey;
     String                          sDefaultStyle;
-    BOOL							bInSpecialMode;
+    sal_Bool							bInSpecialMode;
 
     void			ReleaseFocus();
 };
@@ -194,8 +194,8 @@ private:
     Font			               aCurFont;
     Size                           aLogicalSize;
     String			               aCurText;
-    USHORT			               nFtCount;
-    BOOL			               bRelease;
+    sal_uInt16			               nFtCount;
+    sal_Bool			               bRelease;
     Reference< XDispatchProvider > m_xDispatchProvider;
     Reference< XFrame >            m_xFrame;
 
@@ -213,7 +213,7 @@ public:
 
     void			FillList();
     void			Update( const SvxFontItem* pFontItem );
-    USHORT			GetListCount() { return nFtCount; }
+    sal_uInt16			GetListCount() { return nFtCount; }
     void			Clear() { FontNameBox::Clear(); nFtCount = 0; }
     void			Fill( const FontList* pList )
                         { FontNameBox::Fill( pList );
@@ -233,12 +233,12 @@ public:
 
 class SvxFrmValueSet_Impl : public ValueSet
 {
-    USHORT			nModifier;
+    sal_uInt16			nModifier;
     virtual void    MouseButtonUp( const MouseEvent& rMEvt );
 public:
     SvxFrmValueSet_Impl(Window* pParent,  WinBits nWinStyle)
         : ValueSet(pParent, nWinStyle), nModifier(0) {}
-    USHORT			GetModifier() const {return nModifier;}
+    sal_uInt16			GetModifier() const {return nModifier;}
 
 };
 
@@ -263,16 +263,16 @@ private:
 
 protected:
     virtual void    Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     virtual Window*	GetPreferredKeyInputWindow();
     virtual void	GetFocus();
 
 public:
-    SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+    SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
     ~SvxFrameWindow_Impl();
     void            StartSelection();
 
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
     virtual SfxPopupWindow* Clone() const;
     virtual void	DataChanged( const DataChangedEvent& rDCEvt );
@@ -288,20 +288,20 @@ private:
     bool				m_bIsWriter;
 
 #if _SOLAR__PRIVATE
-    void			MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+    void			MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
                                     const ::Color& rLine, const ::Color& rBack );
     DECL_LINK( SelectHdl, void * );
 #endif
 
 protected:
     virtual void    Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     virtual Window*	GetPreferredKeyInputWindow();
     virtual void	GetFocus();
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
     void			CreateBitmaps( void );
 public:
-    SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+    SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
 
     void					StartSelection();
     virtual SfxPopupWindow* Clone() const;
@@ -318,12 +318,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
 {
     public:
         SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider,
-                                     USHORT nSlotId,
+                                     sal_uInt16 nSlotId,
                                      const rtl::OUString& rCommand,
                                      SvxStyleToolBoxControl& rTbxCtl );
 
     protected:
-        virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+        virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
     private:
         SvxStyleToolBoxControl& rControl;
@@ -335,21 +335,21 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
 
 SvxStyleBox_Impl::SvxStyleBox_Impl(
     Window*                                 pParent,
-    USHORT                                  nSlot,
+    sal_uInt16                                  nSlot,
     const rtl::OUString&                    rCommand,
     SfxStyleFamily                          eFamily,
     const Reference< XDispatchProvider >&   rDispatchProvider,
     const Reference< XFrame >&              _xFrame,
     const String&							rClearFormatKey,
     const String&							rMoreKey,
-    BOOL									bInSpec) :
+    sal_Bool									bInSpec) :
 
     ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ),
 
     nSlotId		( nSlot ),
     eStyleFamily( eFamily ),
-    bRelease	( TRUE ),
-    bVisible(FALSE),
+    bRelease	( sal_True ),
+    bVisible(sal_False),
     m_xDispatchProvider( rDispatchProvider ),
     m_xFrame(_xFrame),
     m_aCommand  ( rCommand ),
@@ -358,7 +358,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(
     bInSpecialMode	( bInSpec )
 {
     aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT );
-    EnableAutocomplete( TRUE );
+    EnableAutocomplete( sal_True );
 }
 
 SvxStyleBox_Impl::~SvxStyleBox_Impl()
@@ -371,7 +371,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
 {
     if ( !bRelease )
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
     if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -459,7 +459,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
 
 long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
         nCurSel = GetSelectEntryPos();
@@ -480,7 +480,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -488,7 +488,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    bRelease = FALSE;
+                    bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
@@ -530,7 +530,7 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange )
     }
     else if ( nStateChange == STATE_CHANGE_INITSHOW )
     {
-        bVisible = TRUE;
+        bVisible = sal_True;
         if ( aVisibilityListener.IsSet() )
             aVisibilityListener.Call( this );
     }
@@ -548,9 +548,9 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
 
 // -----------------------------------------------------------------------
 
-BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
+sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     const SfxObjectShell* pDocSh = SfxObjectShell::Current();
     SvxFontListItem* pFontListItem = NULL;
 
@@ -562,7 +562,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
         ::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
         *ppFontList = aFontList.get();
         pBox->SetOwnFontList(aFontList);
-        bChanged = TRUE;
+        bChanged = sal_True;
     }
 
     if ( pFontListItem )
@@ -575,7 +575,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
         {
             // => "ubernehmen
             *ppFontList = pNewFontList;
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
         else
         {
@@ -628,7 +628,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDis
     pFontList	       ( NULL ),
     aLogicalSize       ( 75,160 ),
     nFtCount	       ( 0 ),
-    bRelease	       ( TRUE ),
+    bRelease	       ( sal_True ),
     m_xDispatchProvider( rDispatchProvider ),
     m_xFrame (_xFrame)
 {
@@ -668,7 +668,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
 
 long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
 
     if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
     {
@@ -686,7 +686,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -694,7 +694,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    bRelease = FALSE;
+                    bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
@@ -737,7 +737,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
 {
     if ( !bRelease )
     {
-        bRelease = TRUE;
+        bRelease = sal_True;
         return;
     }
     if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -749,8 +749,8 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
 void SvxFontNameBox_Impl::EnableControls_Impl()
 {
     SvtFontOptions aFontOpt;
-    BOOL bEnable = aFontOpt.IsFontHistoryEnabled();
-    USHORT nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
+    sal_Bool bEnable = aFontOpt.IsFontHistoryEnabled();
+    sal_uInt16 nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
     if ( GetMaxMRUCount() != nEntries )
     {
         // refill in the next GetFocus-Handler
@@ -818,7 +818,7 @@ void SvxFontNameBox_Impl::Select()
 #define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
 
 SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
-                                          USHORT                     nSlotId,
+                                          sal_uInt16                     nSlotId,
                                           const Reference< XFrame >& rFrame,
                                           const String&              rWndTitle,
                                           Window*                    pParentWindow,
@@ -835,7 +835,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     const SfxPoolItem* pItem = NULL;
     XColorTable* pColorTable = NULL;
-    BOOL bKillTable = FALSE;
+    sal_Bool bKillTable = sal_False;
     const Size aSize12( 13, 13 );
 
     if ( pDocSh )
@@ -845,13 +845,14 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     if ( !pColorTable )
     {
         pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
-        bKillTable = TRUE;
+        bKillTable = sal_True;
     }
 
     if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
     {
         aColorSet.SetStyle( aColorSet.GetStyle() | WB_NONEFIELD );
         aColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
+        aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
     }
     else if ( SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId )
     {
@@ -866,8 +867,13 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
         {
             aColorSet.SetStyle( aColorSet.GetStyle() | WB_NONEFIELD );
             aColorSet.SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
+            aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) );
         }
     }
+    else
+    {
+        aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
+    }
 
     if ( pColorTable )
     {
@@ -932,7 +938,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const
 
 IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
 {
-    USHORT nItemId = aColorSet.GetSelectItemId();
+    sal_uInt16 nItemId = aColorSet.GetSelectItemId();
     SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId );
     /*  #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls.
         This instance may be deleted in the meantime (i.e. when a dialog is opened
@@ -996,14 +1002,14 @@ void SvxColorWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxColorWindow_Impl::Close()
+sal_Bool SvxColorWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
 
 // -----------------------------------------------------------------------
 
-void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if (( SFX_ITEM_DISABLED != eState ) && pState )
     {
@@ -1050,7 +1056,7 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
 // class SvxFrameWindow_Impl --------------------------------------------------
 //========================================================================
 
-SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
 
     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
     aFrameSet   ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
@@ -1072,7 +1078,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
      *                                             abgeschaltet werden
      */
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
 
     for ( i=1; i<9; i++ )
         aFrameSet.InsertItem( i, aImgList.GetImage(i) );
@@ -1089,6 +1095,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
 
     SetHelpId( HID_POPUP_FRAME );
     SetText( SVX_RESSTR(RID_SVXSTR_FRAME) );
+    aFrameSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME) );
     aFrameSet.Show();
 }
 
@@ -1121,9 +1128,9 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     {
         aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
 
-        USHORT	nNumOfItems = aFrameSet.GetItemCount();
+        sal_uInt16	nNumOfItems = aFrameSet.GetItemCount();
 
-        for( USHORT i = 1 ; i <= nNumOfItems ; ++i )
+        for( sal_uInt16 i = 1 ; i <= nNumOfItems ; ++i )
             aFrameSet.SetItemImage( i, aImgList.GetImage( i ) );
     }
 }
@@ -1152,9 +1159,9 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
                         *pRight = 0,
                         *pTop = 0,
                         *pBottom = 0;
-    USHORT				nSel = aFrameSet.GetSelectItemId();
-    USHORT 				nModifier = aFrameSet.GetModifier();
-    BYTE 				nValidFlags = 0;
+    sal_uInt16				nSel = aFrameSet.GetSelectItemId();
+    sal_uInt16 				nModifier = aFrameSet.GetModifier();
+    sal_uInt8 				nValidFlags = 0;
 
     theDefLine.SetOutWidth( DEF_LINE_WIDTH_0 );
     switch ( nSel )
@@ -1228,8 +1235,8 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
     aBorderInner.SetValid( VALID_RIGHT, 	0 != (nValidFlags&FRM_VALID_RIGHT ));
     aBorderInner.SetValid( VALID_HORI, 		0 != (nValidFlags&FRM_VALID_HINNER ));
     aBorderInner.SetValid( VALID_VERT, 		0 != (nValidFlags&FRM_VALID_VINNER));
-    aBorderInner.SetValid( VALID_DISTANCE, TRUE );
-    aBorderInner.SetValid( VALID_DISABLE, FALSE );
+    aBorderInner.SetValid( VALID_DISTANCE, sal_True );
+    aBorderInner.SetValid( VALID_DISABLE, sal_False );
 
     if ( IsInPopupMode() )
         EndPopupMode();
@@ -1265,7 +1272,7 @@ void SvxFrameWindow_Impl::Resize()
 
 void SvxFrameWindow_Impl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
     if ( pState && nSID == SID_BORDER_REDUCED_MODE)
@@ -1274,24 +1281,24 @@ void SvxFrameWindow_Impl::StateChanged(
 
         if ( pItem )
         {
-            bParagraphMode = (BOOL)pItem->GetValue();
+            bParagraphMode = (sal_Bool)pItem->GetValue();
             //initial calls mustn't insert or remove elements
             if(aFrameSet.GetItemCount())
             {
-                BOOL bTableMode = ( aFrameSet.GetItemCount() == 12 );
-                BOOL bResize    = FALSE;
+                sal_Bool bTableMode = ( aFrameSet.GetItemCount() == 12 );
+                sal_Bool bResize    = sal_False;
 
                 if ( bTableMode && bParagraphMode )
                 {
-                    for ( USHORT i = 9; i < 13; i++ )
+                    for ( sal_uInt16 i = 9; i < 13; i++ )
                         aFrameSet.RemoveItem(i);
-                    bResize = TRUE;
+                    bResize = sal_True;
                 }
                 else if ( !bTableMode && !bParagraphMode )
                 {
-                    for ( USHORT i = 9; i < 13; i++ )
+                    for ( sal_uInt16 i = 9; i < 13; i++ )
                         aFrameSet.InsertItem( i, aImgList.GetImage(i) );
-                    bResize = TRUE;
+                    bResize = sal_True;
                 }
 
                 if ( bResize )
@@ -1313,7 +1320,7 @@ void SvxFrameWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxFrameWindow_Impl::Close()
+sal_Bool SvxFrameWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -1322,7 +1329,7 @@ BOOL SvxFrameWindow_Impl::Close()
 // class SvxLineWindow_Impl --------------------------------------------------
 //========================================================================
 
-SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
 
     SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
 
@@ -1343,6 +1350,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
     aLineSet.SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl ) );
     aLineSet.SetText( SVX_RESSTR(STR_NONE) );
 
+    aLineSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) );
     lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize );
 
     SetHelpId( HID_POPUP_LINE );
@@ -1357,7 +1365,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
 
 // -----------------------------------------------------------------------
 
-void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
                                             const ::Color& rLineCol, const ::Color& rBackCol )
 {
     VirtualDevice	aVirDev( *this );
@@ -1383,14 +1391,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 5;
             aRect.Bottom()	= 6;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_1/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_1/20;
             break;
 
         case 3: // DEF_LINE_WIDTH_2
             aRect.Top() 	= 5;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_2/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_2/20;
             break;
 
         case 4: // DEF_LINE_WIDTH_3
@@ -1398,14 +1406,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
             aVirDev.DrawRect( Rectangle( Point(2,4), Point(37,7) ) );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_3/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_3/20;
             break;
 
         case 5: // DEF_LINE_WIDTH_4
             aRect.Top() 	= 4;
             aRect.Bottom()	= 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) DEF_LINE_WIDTH_4/20;
+            nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_4/20;
             break;
 
         case 6: // DEF_DOUBLE_LINE0
@@ -1415,7 +1423,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
             break;
 
         case 7: // DEF_DOUBLE_LINE7
@@ -1425,7 +1433,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
             break;
 
         case 8: // DEF_DOUBLE_LINE1
@@ -1435,7 +1443,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
             break;
 
         case 9: // DEF_DOUBLE_LINE2
@@ -1445,7 +1453,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 8;
             aRect.Bottom()	= 10;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
             break;
 
         case 10: // DEF_DOUBLE_LINE8
@@ -1455,7 +1463,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
             break;
 
         case 11: // DEF_DOUBLE_LINE9
@@ -1465,7 +1473,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 8;
             aRect.Bottom()	= 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
             break;
 
         case 12: // DEF_DOUBLE_LINE10
@@ -1475,7 +1483,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 8;
             aRect.Bottom()	= 8;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
             break;
 
         case 13: // DEF_DOUBLE_LINE3
@@ -1485,7 +1493,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
             break;
 
         case 14: // DEF_DOUBLE_LINE4
@@ -1495,7 +1503,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 6;
             aRect.Bottom()	= 7;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
             break;
 
         case 15: // DEF_DOUBLE_LINE5
@@ -1505,7 +1513,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 8;
             aRect.Bottom()	= 9;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
             break;
 
         case 16: // DEF_DOUBLE_LINE6
@@ -1515,7 +1523,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
             aRect.Top() 	= 7;
             aRect.Bottom()	= 9;
             aVirDev.DrawRect( aRect );
-            nLineWidth = (USHORT) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
+            nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
             break;
         case 17: // Dotted line
             aRect.Top() 	= 6;
@@ -1549,11 +1557,11 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
 IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
 {
     SvxLineItem     aLineItem( SID_FRAME_LINESTYLE );
-    USHORT			n1 = 0,
+    sal_uInt16			n1 = 0,
                     n2 = 0,
                     n3 = 0;
     SvxBorderStyle  nStyle = SOLID;
-    BOOL			bSetLine = TRUE;
+    sal_Bool			bSetLine = sal_True;
 
     switch ( aLineSet.GetSelectItemId() )
     {
@@ -1606,7 +1614,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
                  break;
         case  0:
         default:
-            bSetLine = FALSE;
+            bSetLine = sal_False;
             break;
     }
     if ( bSetLine )
@@ -1653,7 +1661,7 @@ void SvxLineWindow_Impl::StartSelection()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineWindow_Impl::Close()
+sal_Bool SvxLineWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
@@ -1695,7 +1703,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
     ::Color					aBackCol( rStyleSettings.GetWindowColor() );
     aLineSet.Clear();
 
-    for( USHORT i = 1 ; i < 19 ; ++i )
+    for( sal_uInt16 i = 1 ; i < 19 ; ++i )
     {
         MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol );
         aLineSet.InsertItem( i, aBmp, aStr );
@@ -1713,7 +1721,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
 
 SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
     const Reference< XDispatchProvider >& rDispatchProvider,
-    USHORT			                      nSlotId,      // Family-ID
+    sal_uInt16			                      nSlotId,      // Family-ID
     const rtl::OUString&                  rCommand,     // .uno: command bound to this item
     SvxStyleToolBoxControl&	              rTbxCtl )     // Controller-Instanz, dem dieses Item zugeordnet ist.
     :	SfxStatusListener( rDispatchProvider, nSlotId, rCommand ),
@@ -1724,7 +1732,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
 // -----------------------------------------------------------------------
 
 void SfxStyleControllerItem_Impl::StateChanged(
-    USHORT, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     switch ( GetId() )
     {
@@ -1734,7 +1742,7 @@ void SfxStyleControllerItem_Impl::StateChanged(
         case SID_STYLE_FAMILY4:
         case SID_STYLE_FAMILY5:
         {
-            const USHORT nIdx = GetId() - SID_STYLE_FAMILY_START;
+            const sal_uInt16 nIdx = GetId() - SID_STYLE_FAMILY_START;
 
             if ( SFX_ITEM_AVAILABLE == eState )
             {
@@ -1761,16 +1769,16 @@ struct SvxStyleToolBoxControl::Impl
     String						        aClearForm;
     String						        aMore;
     ::std::vector< ::rtl::OUString >    aDefaultStyles;
-    BOOL						bListening;
-    BOOL						bSpecModeWriter;
-    BOOL						bSpecModeCalc;
+    sal_Bool						bListening;
+    sal_Bool						bSpecModeWriter;
+    sal_Bool						bSpecModeCalc;
 
     inline Impl( void )
         :aClearForm			( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
         ,aMore				( SVX_RESSTR( RID_SVXSTR_MORE ) )
-        ,bListening			( FALSE )
-        ,bSpecModeWriter	( FALSE )
-        ,bSpecModeCalc		( FALSE )
+        ,bListening			( sal_False )
+        ,bSpecModeWriter	( sal_False )
+        ,bSpecModeCalc		( sal_False )
     {
 
 
@@ -1819,8 +1827,7 @@ struct SvxStyleToolBoxControl::Impl
                 static const sal_Char* aCalcStyles[] =
                 {
                     "Default",
-                    "Heading 1",
-                    "Heading 2",
+                    "Heading1",
                     "Result",
                     "Result2"
                 };
@@ -1832,12 +1839,15 @@ struct SvxStyleToolBoxControl::Impl
                 {
                     try
                     {
-                        Reference< beans::XPropertySet > xStyle;
-                        xCellStyles->getByName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] )) >>= xStyle;
-                        ::rtl::OUString sName;
-                        xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")))>>= sName;
-                        if( sName.getLength() )
-                            aDefaultStyles.push_back(sName);
+                        const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) );
+                        if( xCellStyles->hasByName( sStyleName ) )
+                        {
+                            Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW );
+                            ::rtl::OUString sName;
+                            xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
+                            if( sName.getLength() )
+                                aDefaultStyles.push_back(sName);
+                        }
                     }
                     catch( const uno::Exception& )
                     {}
@@ -1865,14 +1875,14 @@ static const char* StyleSlotToStyleCommand[MAX_FAMILIES] =
 };
 
 SvxStyleToolBoxControl::SvxStyleToolBoxControl(
-    USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+    sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :	SfxToolBoxControl	( nSlotId, nId, rTbx ),
         pStyleSheetPool		( NULL ),
         nActFamily			( 0xffff ),
-        bListening			( FALSE ),
+        bListening			( sal_False ),
         pImpl				( new Impl )
 {
-    for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+    for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
     {
         pBoundItems[i] = 0;
         m_xBoundItems[i] = Reference< XComponent >();
@@ -1897,7 +1907,7 @@ throw ( Exception, RuntimeException)
     {
         pImpl->InitializeStyles(m_xFrame->getController()->getModel());
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY );
-        for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+        for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
         {
             pBoundItems[i]   = new SfxStyleControllerItem_Impl( xDispatchProvider,
                                                                 SID_STYLE_FAMILY_START + i,
@@ -1915,7 +1925,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     SfxToolBoxControl::dispose();
 
-    for( USHORT i=0; i<MAX_FAMILIES; i++ )
+    for( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
     {
         if ( m_xBoundItems[i].is() )
         {
@@ -1981,9 +1991,9 @@ void SvxStyleToolBoxControl::FillStyleBox()
     if ( pStyleSheetPool && pBox && nActFamily!=0xffff )
     {
         const SfxStyleFamily	eFamily 	= GetActFamily();
-        USHORT					nCount  	= pStyleSheetPool->Count();
+        sal_uInt16					nCount  	= pStyleSheetPool->Count();
         SfxStyleSheetBase*		pStyle  	= NULL;
-        BOOL 					bDoFill 	= FALSE;
+        sal_Bool 					bDoFill 	= sal_False;
 
         pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED );
 
@@ -1996,7 +2006,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
         //!!! so the list doesn't show the count
         if ( nCount != pBox->GetEntryCount() )
         {
-            bDoFill = TRUE;
+            bDoFill = sal_True;
         }
         else
         {
@@ -2011,11 +2021,11 @@ void SvxStyleToolBoxControl::FillStyleBox()
 
         if ( bDoFill )
         {
-            pBox->SetUpdateMode( FALSE );
+            pBox->SetUpdateMode( sal_False );
             pBox->Clear();
 
             {
-                USHORT	_i;
+                sal_uInt16	_i;
                 sal_uInt32  nCnt = pImpl->aDefaultStyles.size();
 
                 pStyle = pStyleSheetPool->First();
@@ -2055,9 +2065,9 @@ void SvxStyleToolBoxControl::FillStyleBox()
             if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc )
             {
                 // insert default styles
-                USHORT	_i;
+                sal_uInt16	_i;
                 sal_uInt32  nCnt = pImpl->aDefaultStyles.size();
-                USHORT nPos = 1;
+                sal_uInt16 nPos = 1;
                 for( _i = 0 ; _i < nCnt ; ++_i )
                 {
                     pBox->InsertEntry( pImpl->aDefaultStyles[_i], nPos );
@@ -2079,10 +2089,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
                 pBox->SetStyle( nWinBits );
             }
 
-            pBox->SetUpdateMode( TRUE );
+            pBox->SetUpdateMode( sal_True );
             pBox->SetFamily( eFamily );
 
-            USHORT nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
+            sal_uInt16 nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
             pBox->SetDropDownLineCount( nLines );
         }
     }
@@ -2122,7 +2132,7 @@ void SvxStyleToolBoxControl::Update()
     if ( pDocShell )
         pPool = pDocShell->GetStyleSheetPool();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0; i<MAX_FAMILIES; i++ )
         if( pFamilyState[i] )
             break;
@@ -2166,7 +2176,7 @@ void SvxStyleToolBoxControl::Update()
 
 // -----------------------------------------------------------------------
 
-void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
+void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
                                              const SfxTemplateItem* pItem )
 {
     DELETEZ( pFamilyState[nIdx] );
@@ -2182,7 +2192,7 @@ void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
 IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
 {
 
-    USHORT i;
+    sal_uInt16 i;
 
     // Call ReBind() && UnBind() according to visibility
     SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)( GetToolBox().GetItemWindow( GetId() ));
@@ -2207,10 +2217,10 @@ IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
 
 void SvxStyleToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT 		 nId	= GetId();
+    sal_uInt16 		 nId	= GetId();
     ToolBox&	 rTbx   = GetToolBox();
     SvxStyleBox_Impl* pBox   = (SvxStyleBox_Impl*)(rTbx.GetItemWindow( nId ));
     TriState	 eTri	= STATE_NOCHECK;
@@ -2269,8 +2279,8 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
 //========================================================================
 
 SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
-                                            USHORT          nSlotId,
-                                            USHORT			nId,
+                                            sal_uInt16          nSlotId,
+                                            sal_uInt16			nId,
                                             ToolBox&		rTbx )
 
     :	SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2281,10 +2291,10 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
 
 void SvxFontNameToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT 			     nId	= GetId();
+    sal_uInt16 			     nId	= GetId();
     ToolBox&		     rTbx   = GetToolBox();
     SvxFontNameBox_Impl* pBox   = (SvxFontNameBox_Impl*)(rTbx.GetItemWindow( nId ));
 
@@ -2330,8 +2340,8 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
 //========================================================================
 
 SvxFontColorToolBoxControl::SvxFontColorToolBoxControl(
-    USHORT          nSlotId,
-    USHORT			nId,
+    sal_uInt16          nSlotId,
+    sal_uInt16			nId,
     ToolBox&		rTbx )
 
     :	SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2380,10 +2390,10 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
 
 void SvxFontColorToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     const SvxColorItem* pItem = 0;
 
@@ -2404,7 +2414,7 @@ void SvxFontColorToolBoxControl::StateChanged(
 // class SvxColorToolBoxControl --------------------------------
 //========================================================================
 
-SvxColorToolBoxControl::SvxColorToolBoxControl(	USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColorToolBoxControl::SvxColorToolBoxControl(	sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     mLastColor( COL_AUTO )
@@ -2435,7 +2445,7 @@ SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
 
 SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
 {
-    USHORT nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
+    sal_uInt16 nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
                         RID_SVXSTR_BACKGROUND : RID_SVXSTR_COLOR;
     SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
         OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" )),
@@ -2455,7 +2465,7 @@ SfxPopupWindow*	SvxColorToolBoxControl::CreatePopupWindow()
 // -----------------------------------------------------------------------
 
 void SvxColorToolBoxControl::StateChanged(
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 {
     const SvxColorItem* pItem = 0;
     if ( SFX_ITEM_DONTCARE != eState )
@@ -2466,7 +2476,7 @@ void SvxColorToolBoxControl::StateChanged(
         mLastColor= pItem->GetValue();
     }
 
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
     rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2477,8 +2487,8 @@ void SvxColorToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
-    USHORT nSlotId,
-    USHORT nId,
+    sal_uInt16 nSlotId,
+    sal_uInt16 nId,
     ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2492,7 +2502,7 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
     else
         addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )));
 
-    USHORT nMode =	SID_ATTR_CHAR_COLOR2 == nSlotId
+    sal_uInt16 nMode =	SID_ATTR_CHAR_COLOR2 == nSlotId
         ? TBX_UPDATER_MODE_CHAR_COLOR_NEW :	TBX_UPDATER_MODE_CHAR_COLOR_NEW;
     pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode );
 }
@@ -2538,10 +2548,10 @@ SfxPopupWindow*	SvxFontColorExtToolBoxControl::CreatePopupWindow()
 
 void SvxFontColorExtToolBoxControl::StateChanged(
 
-    USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     const SvxColorItem*	pItem = 0;
 
@@ -2570,7 +2580,7 @@ void SvxFontColorExtToolBoxControl::StateChanged(
 
 // -----------------------------------------------------------------------
 
-void SvxFontColorExtToolBoxControl::Select( BOOL )
+void SvxFontColorExtToolBoxControl::Select( sal_Bool )
 {
     OUString aCommand;
     OUString aParamName;
@@ -2596,8 +2606,8 @@ void SvxFontColorExtToolBoxControl::Select( BOOL )
 //========================================================================
 
 SvxFrameToolBoxControl::SvxFrameToolBoxControl(
-    USHORT      nSlotId,
-    USHORT      nId,
+    sal_uInt16      nSlotId,
+    sal_uInt16      nId,
     ToolBox&    rTbx )
 
     :   SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2630,10 +2640,10 @@ SfxPopupWindow*	SvxFrameToolBoxControl::CreatePopupWindow()
 
 void SvxFrameToolBoxControl::StateChanged(
 
-    USHORT, SfxItemState eState, const SfxPoolItem*  )
+    sal_uInt16, SfxItemState eState, const SfxPoolItem*  )
 
 {
-    USHORT 					nId		= GetId();
+    sal_uInt16 					nId		= GetId();
     ToolBox&	 			rTbx	= GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2647,8 +2657,8 @@ void SvxFrameToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
-    USHORT          nSlotId,
-    USHORT   		nId,
+    sal_uInt16          nSlotId,
+    sal_uInt16   		nId,
     ToolBox& 		rTbx )
 
     :    SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2679,9 +2689,9 @@ SfxPopupWindow*	SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 
 void SvxFrameLineStyleToolBoxControl::StateChanged(
 
-    USHORT , SfxItemState eState, const SfxPoolItem*  )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem*  )
 {
-    USHORT 		 nId	= GetId();
+    sal_uInt16 		 nId	= GetId();
     ToolBox&	 rTbx   = GetToolBox();
 
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2695,8 +2705,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged(
 //========================================================================
 
 SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl(
-    USHORT      nSlotId,
-    USHORT      nId,
+    sal_uInt16      nSlotId,
+    sal_uInt16      nId,
     ToolBox&    rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2743,9 +2753,9 @@ SfxPopupWindow*	SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 // -----------------------------------------------------------------------
 
 void SvxFrameLineColorToolBoxControl::StateChanged(
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 {
-    USHORT nId = GetId();
+    sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
     rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2785,7 +2795,7 @@ public:
 
 // -----------------------------------------------------------------------
 
-SvxReloadControllerItem::SvxReloadControllerItem( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxReloadControllerItem::SvxReloadControllerItem( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
 :	SfxToolBoxControl( nSlotId, nId, rTbx )
 ,	pImpl( new SvxReloadControllerItem_Impl )
 {
@@ -2802,7 +2812,7 @@ SvxReloadControllerItem::~SvxReloadControllerItem()
 // -----------------------------------------------------------------------
 
 void SvxReloadControllerItem::StateChanged(
-    USHORT , SfxItemState eState, const SfxPoolItem* pState )
+    sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
 {
     SfxBoolItem* pItem = PTR_CAST( SfxBoolItem, pState );
     ToolBox& rBox = GetToolBox();
@@ -2819,7 +2829,7 @@ void SvxReloadControllerItem::StateChanged(
 // class SvxSimpleUndoRedoController -------------------------------------
 //========================================================================
 
-SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx  )
+SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx  )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     aDefaultText = rTbx.GetItemText( nId );
@@ -2833,7 +2843,7 @@ SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
 
 // -----------------------------------------------------------------------
 
-void SvxSimpleUndoRedoController::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
     SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState );
     ToolBox& rBox = GetToolBox();
@@ -2869,7 +2879,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
 
 // -----------------------------------------------------------------------
 
-BOOL lcl_FontChangedHint( const SfxHint &rHint )
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint )
 {
     SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
     if ( pItemHint )
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index c0f8874a3b..46cf9adaeb 100644..100755
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -158,5 +158,11 @@ String RID_SVXSTR_MORE
     Text [ en-US ] = "More...";
 };
 
+//IAccessibility2 Implementation 2009-----
+String RID_SVXSTR_TEXTCOLOR
+{
+    Text [ en-US ] = "Font color";
+};
+//-----IAccessibility2 Implementation 2009
 // ********************************************************************** EOF
 
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index b4cd3375e6..4bcee1be70 100644..100755
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -73,7 +73,7 @@ private:
     FontHeightToolBoxControl*	               m_pCtrl;
     String							           m_aCurText;
     Size                                       m_aLogicalSize;
-    BOOL							           m_bRelease;
+    sal_Bool							           m_bRelease;
     uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
     uno::Reference< frame::XFrame >            m_xFrame;
     uno::Reference< awt::XWindow >             m_xOldFocusWindow;
@@ -95,7 +95,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
 
     m_pCtrl		        ( &_rCtrl ),
     m_aLogicalSize      ( 30,100 ),
-    m_bRelease	        ( TRUE ),
+    m_bRelease	        ( sal_True ),
     m_xDispatchProvider ( _rDispatchProvider ),
     m_xFrame            ( _xFrame )
 {
@@ -110,7 +110,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
 {
     if ( !m_bRelease )
     {
-        m_bRelease = TRUE;
+        m_bRelease = sal_True;
         return;
     }
 
@@ -198,7 +198,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
@@ -206,7 +206,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
             case KEY_TAB:
             {
                 if ( KEY_TAB == nCode )
-                    m_bRelease = FALSE;
+                    m_bRelease = sal_False;
                 else
                     nHandled = 1;
                 Select();
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 3b468489f0..b25415ab2e 100644..100755
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -97,14 +97,14 @@ void FindTextFieldControl::InitControls_Impl()
     SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_FIND ) );
     SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor());
 
-    EnableAutocomplete(TRUE, TRUE);
+    EnableAutocomplete(sal_True, sal_True);
 }
 
 void FindTextFieldControl::Remember_Impl(const String& rStr)
 {
-    USHORT nCount = GetEntryCount();
+    sal_uInt16 nCount = GetEntryCount();
 
-    for (USHORT i=0; i<nCount; ++i)
+    for (sal_uInt16 i=0; i<nCount; ++i)
     {
         if ( rStr == GetEntry(i))
             return;
@@ -371,8 +371,8 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
@@ -542,8 +542,8 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -671,8 +671,8 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
     ToolBox* pToolBox = (ToolBox*)pWindow;
     if ( pToolBox )
     {
-        USHORT nItemCount = pToolBox->GetItemCount();
-        for ( USHORT i=0; i<nItemCount; ++i )
+        sal_uInt16 nItemCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 i=0; i<nItemCount; ++i )
         {
             ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
             if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -836,8 +836,8 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
         ToolBox* pToolBox = (ToolBox*)pWindow;
         if ( pToolBox )
         {
-            USHORT nItemCount = pToolBox->GetItemCount();
-            for ( USHORT i=0; i<nItemCount; ++i )
+            sal_uInt16 nItemCount = pToolBox->GetItemCount();
+            for ( sal_uInt16 i=0; i<nItemCount; ++i )
             {
                 ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
                 if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FindText")) )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.src b/svx/source/tbxctrls/tbunosearchcontrollers.src
index ff1565e2d2..ff1565e2d2 100644..100755
--- a/svx/source/tbxctrls/tbunosearchcontrollers.src
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.src
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index bf1d01592c..b11badfa70 100644..100755
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -33,8 +33,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxalign.hxx"
-#include "tbxdraw.hxx"
+#include "svx/tbxalign.hxx"
+#include "svx/tbxdraw.hxx"
 #include "tbxdraw.hrc"
 #include <tools/shl.hxx>
 #include <sfx2/imagemgr.hxx>
@@ -52,7 +52,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem);
 |*
 \************************************************************************/
 
-SvxTbxCtlAlign::SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
     ,   m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" ))
     ,   m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" ))
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 24008a9384..206903d080 100644..100755
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "tbxcolor.hxx"
+#include "svx/tbxcolor.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 705542a9bc..60f920fe84 100644..100755
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -48,10 +48,10 @@ namespace svx
     //====================================================================
 
     ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
-        USHORT nId,
-        USHORT nTbxBtnId,
+        sal_uInt16 nId,
+        sal_uInt16 nTbxBtnId,
         ToolBox* ptrTbx,
-        USHORT nMode ) :
+        sal_uInt16 nMode ) :
         mnDrawMode        ( nMode ),
         mnBtnId           ( nTbxBtnId ),
         mnSlotId           ( nId ),
@@ -61,7 +61,7 @@ namespace svx
         if (mnSlotId == SID_BACKGROUND_COLOR)
             mnDrawMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
         DBG_ASSERT( ptrTbx, "ToolBox not found :-(" );
-        mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : FALSE;
+        mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : sal_False;
         Update(mnSlotId == SID_ATTR_CHAR_COLOR2 ? COL_BLACK : COL_GRAY);
     }
 
diff --git a/svx/source/tbxctrls/tbxdraw.hrc b/svx/source/tbxctrls/tbxdraw.hrc
index 3dd9eafd91..3dd9eafd91 100644..100755
--- a/svx/source/tbxctrls/tbxdraw.hrc
+++ b/svx/source/tbxctrls/tbxdraw.hrc
diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src
deleted file mode 100644
index e4c7c1d296..0000000000
--- a/svx/source/tbxctrls/tbxdraw.src
+++ /dev/null
@@ -1,265 +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.
- *
- ************************************************************************/
- // include ---------------------------------------------------------------
-#include "tbxdraw.hrc"
-#include <svx/dialogs.hrc>
-#include "helpid.hrc"
-#include <svx/svxids.hrc>
- // pragma ----------------------------------------------------------------
-
- // -----------------------------------------------------------------------
-#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-FloatingWindow RID_SVXTBX_DRAW
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_DRAWTOOL_TBX ;
-    ToolBox TBX_DRAW
-    {
-        HelpId = HID_SVXTBX_DRAW ;
-        SVLook = TRUE ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_SELECT ;
-                HelpID = SID_OBJECT_SELECT ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Selection" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_LINE ;
-                HelpID = SID_DRAW_LINE ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Line" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_RECT ;
-                HelpID = SID_DRAW_RECT ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Rectangle" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_ELLIPSE ;
-                HelpID = SID_DRAW_ELLIPSE ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Ellipse" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_POLYGON_NOFILL ;
-                HelpID = SID_DRAW_POLYGON_NOFILL ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Polygon" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_BEZIER_NOFILL ;
-                HelpID = SID_DRAW_BEZIER_NOFILL ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Curve";
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_FREELINE_NOFILL ;
-                HelpID = SID_DRAW_FREELINE_NOFILL ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Freeform Line";
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_ARC ;
-                HelpID = SID_DRAW_ARC ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Arc" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_PIE ;
-                HelpID = SID_DRAW_PIE ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Ellipse Pie" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_CIRCLECUT ;
-                HelpID = SID_DRAW_CIRCLECUT ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Circle Segment" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_TEXT ;
-                HelpID = SID_DRAW_TEXT ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Text" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_TEXT_VERTICAL ;
-                HelpID = SID_DRAW_TEXT_VERTICAL ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Vertical Text";
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_TEXT_MARQUEE ;
-                HelpID = SID_DRAW_TEXT_MARQUEE ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Text Animation" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_CAPTION ;
-                HelpID = SID_DRAW_CAPTION ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Callouts" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_DRAW_CAPTION_VERTICAL ;
-                HelpID = SID_DRAW_CAPTION_VERTICAL ;
-                RadioCheck = TRUE ;
-                Text [ en-US ] = "Vertical Callout";
-            };
-        };
-    };
-    Text [ en-US ] = "Draw Functions" ;
-};
-FloatingWindow RID_SVXTBX_ALIGNMENT
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    HelpID = HID_ALIGN_TBX ;
-    SVLook = TRUE ;
-    Text [ en-US ] = "Alignment" ;
-    ToolBox TBX_ALIGNMENT
-    {
-        HelpId = HID_SVXTBX_ALIGNMENT ;
-        SVLook = TRUE ;
-        HelpID = SID_OBJECT_ALIGN ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_LEFT ;
-                HelpID = SID_OBJECT_ALIGN_LEFT ;
-                Text [ en-US ] = "Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_CENTER ;
-                HelpID = SID_OBJECT_ALIGN_CENTER ;
-                Text [ en-US ] = "Center" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_RIGHT ;
-                HelpID = SID_OBJECT_ALIGN_RIGHT ;
-                Text [ en-US ] = "Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_UP ;
-                HelpID = SID_OBJECT_ALIGN_UP ;
-                Text [ en-US ] = "Top" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_MIDDLE ;
-                HelpID = SID_OBJECT_ALIGN_MIDDLE ;
-                Text [ en-US ] = "Centered" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_OBJECT_ALIGN_DOWN ;
-                HelpID = SID_OBJECT_ALIGN_DOWN ;
-                Text [ en-US ] = "Bottom" ;
-            };
-        };
-    };
-};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index cff4b1bc9f..036a0f1ac6 100644..100755
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -43,9 +43,9 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 
-#include "tbxctl.hxx"
-#include "tbxdraw.hxx"
-#include "tbxcolor.hxx"
+#include "svx/tbxctl.hxx"
+#include "svx/tbxdraw.hxx"
+#include "svx/tbxcolor.hxx"
 #include "tbxdraw.hrc"
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
@@ -56,7 +56,7 @@ using namespace ::com::sun::star::frame;
 
 // -----------------------------------------------------------------------
 
-SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
     SfxToolBoxControl( nSlotId, nId, rTbx ),
 
@@ -69,7 +69,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlDraw::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
@@ -95,7 +95,7 @@ void SvxTbxCtlDraw::toggleToolbox()
     Reference< XLayoutManager > xLayoutMgr = getLayoutManager();
     if ( xLayoutMgr.is() )
     {
-        BOOL bCheck = FALSE;
+        sal_Bool bCheck = sal_False;
         if ( xLayoutMgr->isElementVisible( m_sToolboxName ) )
         {
             xLayoutMgr->hideElement( m_sToolboxName );
@@ -103,7 +103,7 @@ void SvxTbxCtlDraw::toggleToolbox()
         }
         else
         {
-            bCheck = TRUE;
+            bCheck = sal_True;
             xLayoutMgr->createElement( m_sToolboxName );
             xLayoutMgr->showElement( m_sToolboxName );
         }
@@ -114,7 +114,7 @@ void SvxTbxCtlDraw::toggleToolbox()
 
 // -----------------------------------------------------------------------
 
-void SvxTbxCtlDraw::Select( BOOL )
+void SvxTbxCtlDraw::Select( sal_Bool )
 {
     toggleToolbox();
 }
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index e6846ea62a..422f89a331 100644..100755
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -31,7 +31,7 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
-#include <verttexttbxctrl.hxx>
+#include <svx/verttexttbxctrl.hxx>
 #include <svl/languageoptions.hxx>
 #include <sfx2/app.hxx>
 #include <svl/eitem.hxx>
@@ -41,22 +41,22 @@
 SFX_IMPL_TOOLBOX_CONTROL(SvxCTLTextTbxCtrl, SfxBoolItem);
 SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
 
-SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-    SetVert(FALSE);
+    SetVert(sal_False);
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" )));
 }
 
-SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
-    SetVert(TRUE);
+    SetVert(sal_True);
     addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" )));
 }
 
 /* ---------------------------------------------------------------------------*/
-SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     bCheckVertical(sal_True)
 {
@@ -67,13 +67,13 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( )
 }
 
 void SvxVertCTLTextTbxCtrl::StateChanged( 
-    USHORT nSID, 
+    sal_uInt16 nSID, 
     SfxItemState eState,
     const SfxPoolItem* pState )
 {
     SvtLanguageOptions aLangOptions;
-    BOOL bCalc = sal_False;
-    BOOL bVisible = GetToolBox().IsItemVisible(GetId());
+    sal_Bool bCalc = sal_False;
+    sal_Bool bVisible = GetToolBox().IsItemVisible(GetId());
     sal_Bool bEnabled = sal_False;
     if ( nSID == SID_VERTICALTEXT_STATE )
         bEnabled = aLangOptions.IsVerticalTextEnabled();
@@ -89,7 +89,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
     {
         if(!bVisible)
         {
-            GetToolBox().ShowItem( GetId(), TRUE );
+            GetToolBox().ShowItem( GetId(), sal_True );
             bCalc = sal_True;
         }
     }
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 06296ac02f..0666bc9d13 100644..100755
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -47,7 +47,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
 
 #include <svx/extrusionbar.hxx>
 #include "extrusiondepthdialog.hxx"
@@ -575,7 +575,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                 nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-            ULONG nCount = rMarkList.GetMarkCount(), i;
+            sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
             for(i=0; i<nCount; i++)
             {
@@ -613,7 +613,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
                 FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue();
 
                 ExtrusionDepthDialog aDlg( 0L, fDepth, eUnit );
-                USHORT nRet = aDlg.Execute();
+                sal_uInt16 nRet = aDlg.Execute();
                 if( nRet != 0 )
                 {
                     fDepth = aDlg.getDepth();
@@ -628,7 +628,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
 
     if( nSID == SID_EXTRUSION_TOOGLE )
     {
-            static USHORT SidArray[] = {
+            static sal_uInt16 SidArray[] = {
                 SID_EXTRUSION_TILT_DOWN, 
                 SID_EXTRUSION_TILT_UP,
                 SID_EXTRUSION_TILT_LEFT,
@@ -653,7 +653,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
 void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
@@ -804,7 +804,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
@@ -860,7 +860,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
@@ -949,7 +949,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
@@ -1001,7 +1001,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
     if( pSdrView->GetModel() )
     {
         FieldUnit eUnit = pSdrView->GetModel()->GetUIUnit();
-        rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (USHORT)eUnit ) );
+        rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)eUnit ) );
     }
 
     if( bHasCustomShape )
@@ -1029,7 +1029,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
 void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
@@ -1110,7 +1110,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString	sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
@@ -1178,7 +1178,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
 void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
     static const rtl::OUString  sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
@@ -1253,7 +1253,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
     static const rtl::OUString	sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
     bool bFound = false;
 
     for(i=0;(i<nCount) && !bFound ; i++)
diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src
index 3e6c6ad7e5..dd6f3066a5 100644..100755
--- a/svx/source/toolbars/extrusionbar.src
+++ b/svx/source/toolbars/extrusionbar.src
@@ -1,65 +1,6 @@
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 
-ToolBox RID_SVX_EXTRUSION_BAR
-{
-    HelpId = RID_SVX_EXTRUSION_BAR ;
-    Align = BOXALIGN_BOTTOM ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_TOOGLE ;
-            HelpID = SID_EXTRUSION_TOOGLE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_TILT_DOWN ;
-            HelpID = SID_EXTRUSION_TILT_DOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_TILT_UP ;
-            HelpID = SID_EXTRUSION_TILT_UP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_TILT_LEFT ;
-            HelpID = SID_EXTRUSION_TILT_LEFT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_TILT_RIGHT ;
-            HelpID = SID_EXTRUSION_TILT_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_DEPTH_FLOATER ;
-            HelpID = SID_EXTRUSION_DEPTH_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_DIRECTION_FLOATER ;
-            HelpID = SID_EXTRUSION_DIRECTION_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_LIGHTING_FLOATER ;
-            HelpID = SID_EXTRUSION_LIGHTING_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_SURFACE_FLOATER ;
-            HelpID = SID_EXTRUSION_SURFACE_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_EXTRUSION_3D_COLOR ;
-            HelpID = SID_EXTRUSION_3D_COLOR ;
-        };
-    };
-};
-
 String RID_SVX_EXTRUSION_BAR
 {
     Text [ en-US ] = "Extrusion";
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 719e8ebf5d..838964371f 100644..100755
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -33,7 +33,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
@@ -47,11 +47,11 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/kernitem.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
-#include "fontworkgallery.hxx"
+#include "svx/fontworkgallery.hxx"
 
 using ::rtl::OUString;
 
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno;
 void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Int32	nAlignment = -1;
     for( i = 0; i < nCount; i++ )
@@ -101,7 +101,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Int32	nCharacterSpacing = -1;
     for( i = 0; i < nCount; i++ )
@@ -126,7 +126,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     sal_Bool	bChecked = sal_False;
     for( i = 0; i < nCount; i++ )
@@ -145,7 +145,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
 void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
 {
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
     rtl::OUString aFontWorkShapeType;
 
@@ -257,7 +257,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
     static const rtl::OUString	sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount(), i;
+    sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
     sal_Bool bFound = sal_False;
     for(i=0;(i<nCount) && !bFound ; i++)
     {
@@ -348,7 +348,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     }
 }
 
-#include "gallery.hxx"
+#include "svx/gallery.hxx"
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svl/itempool.hxx>
@@ -525,7 +525,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
             {
                 sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue();
                 FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing );
-                USHORT nRet = aDlg.Execute();
+                sal_uInt16 nRet = aDlg.Execute();
                 if( nRet != 0 )
                 {
                     SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() );
@@ -558,7 +558,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
                 nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
 
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-            ULONG nCount = rMarkList.GetMarkCount(), i;
+            sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
             for( i = 0; i < nCount; i++ )
             {
                 SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
index ed9b152fe4..a3a686b51a 100644..100755
--- a/svx/source/toolbars/fontworkbar.src
+++ b/svx/source/toolbars/fontworkbar.src
@@ -27,40 +27,6 @@
 
 #include <svx/dialogs.hrc>
 
-ToolBox RID_SVX_FONTWORK_BAR
-{
-    HelpId = RID_SVX_FONTWORK_BAR ;
-    Align = BOXALIGN_BOTTOM ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_FONTWORK_GALLERY_FLOATER ;
-            HelpID = SID_FONTWORK_GALLERY_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FONTWORK_SHAPE_TYPE ;
-            HelpID = SID_FONTWORK_SHAPE_TYPE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ;
-            HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ;
-            HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ;
-            HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ;
-        };
-    };
-};
-
 String RID_SVX_FONTWORK_BAR
 {
     Text [ en-US ] = "Fontwork";
diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk
deleted file mode 100644
index 40c7f2ccb7..0000000000
--- a/svx/source/toolbars/makefile.mk
+++ /dev/null
@@ -1,56 +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=..$/..
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=toolbars
-ENABLE_EXCEPTIONS=TRUE;
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=toolbars
-SRC1FILES =  \
-        extrusionbar.src \
-        fontworkbar.src
-
-SLOFILES=	\
-        $(SLO)$/extrusionbar.obj \
-        $(SLO)$/fontworkbar.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
index 8385627295..8385627295 100644..100755
--- a/svx/source/unodialogs/inc/buttongroup.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
new file mode 100755
index 0000000000..1b0b227712
--- /dev/null
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src
@@ -0,0 +1,293 @@
+/*************************************************************************
+ *
+ * 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 "chinese_dictionarydialog.hrc"
+#include "chinese_translationdialog.hrc"
+
+#include <svtools/controldims.hrc>
+
+#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \
+RadioButton RB_TO_SIMPLIFIED \
+{ \
+    Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \
+    Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \
+    Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \
+}; \
+RadioButton RB_TO_TRADITIONAL \
+{ \
+    Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \
+    Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \
+    Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \
+};
+
+//-----------------------------------------------------------------------------
+//defines for positions and sizes:
+
+#define FULL_WIDTH (245)
+#define FULL_HEIGHT (165)
+
+#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
+#define ROW_2 (ROW_1+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_3 (ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
+
+#define ROW_5a (ROW_5+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_5b (ROW_5a+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+
+#define ROW_8 (FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
+#define ROW_7 (ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2)
+
+#define LIST_HEIGHT (ROW_7-RSC_SP_CTRL_Y-ROW_6)
+
+#define COL_WIDTH 60
+#define BUTTONCOL_WIDTH 40
+#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_FLGR_SPACE_X)
+#define COL_2 (COL_1+COL_WIDTH+1)
+#define COL_3 (COL_2+COL_WIDTH+1)
+#define COL_4 (FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-BUTTONCOL_WIDTH)
+
+#define REST_COL_WIDTH (COL_4-COL_3-RSC_SP_CTRL_GROUP_X)
+
+//-----------------------------------------------------------------------------
+
+ModalDialog DLG_CHINESEDICTIONARY
+{
+    HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY";
+    //HelpId = ;
+    Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT );
+    OutputSize = TRUE;
+    Closeable = TRUE ;
+    Moveable = TRUE ;
+    SVLook = TRUE;
+
+    Text [ en-US ] = "Edit Dictionary";
+
+    DIRECTION_RADIOBUTTONS( COL_1, ROW_1, FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT )
+
+    CheckBox CB_REVERSE
+    {
+        HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE";
+        Pos = MAP_APPFONT ( COL_1, ROW_3 ) ;
+        Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ;
+        
+        Text [ en-US ] = "Reverse mapping";
+    };
+    
+    FixedText FT_TERM
+    {
+        Pos = MAP_APPFONT ( COL_1 , ROW_4 ) ;
+        Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Term";
+    };
+    Edit ED_TERM
+    {
+        HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM";
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ;
+        Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+    };
+    
+    
+    FixedText FT_MAPPING
+    {
+        Pos = MAP_APPFONT ( COL_2 , ROW_4 ) ;
+        Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Mapping";
+    };
+    Edit ED_MAPPING
+    {
+        HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING";
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ;
+        Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+    };
+    
+    FixedText FT_PROPERTY
+    {
+        Pos = MAP_APPFONT ( COL_3 , ROW_4 ) ;
+        Size = MAP_APPFONT ( REST_COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Property";
+    };
+    ListBox LB_PROPERTY
+    {
+        HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY";
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ;
+        Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+        DropDown = TRUE ;
+        
+        stringlist [ en-US ] =
+        {
+            < "Other" ; Default ; > ;
+            < "Foreign" ; > ;
+            < "First name" ; > ;
+            < "Last name" ; > ;
+            < "Title" ; > ;
+            < "Status" ; > ;
+            < "Place name" ; > ;
+            < "Business" ; > ;
+            < "Adjective" ; > ;
+            < "Idiom" ; > ;
+            < "Abbreviation" ; > ;
+            < "Numerical" ; > ;
+            < "Noun" ; > ;
+            < "Verb" ; > ;
+            < "Brand name" ; > ;
+        };
+    };
+    
+    Control CT_MAPPINGLIST
+    {
+        Pos = MAP_APPFONT ( COL_1, ROW_6 ) ;
+        Size = MAP_APPFONT ( COL_4 - COL_1 - RSC_SP_CTRL_GROUP_X, LIST_HEIGHT ) ;
+        TabStop = TRUE ;
+    };
+    
+    PushButton PB_ADD
+    {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD";
+        Pos = MAP_APPFONT( COL_4, ROW_5 );
+        Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+        Text [ en-US ] = "~Add";
+    };
+    PushButton PB_MODIFY
+    {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY";
+        Pos = MAP_APPFONT( COL_4, ROW_5a );
+        Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+        Text [ en-US ] = "~Modify";
+    };
+    PushButton PB_DELETE
+    {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE";
+        Pos = MAP_APPFONT( COL_4, ROW_5b );
+        Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
+
+        Text [ en-US ] = "~Delete";
+    };
+        
+    FixedLine FL_BOTTOMLINE
+    {
+        Pos = MAP_APPFONT ( 0 , ROW_7 ) ;
+        Size = MAP_APPFONT ( FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+    };
+    
+    BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 )
+};
+
+//-----------------------------------------------------------------------------
+//defines for positions and sizes:
+
+#define T_FULL_WIDTH (220)
+#define T_FULL_HEIGHT (120)
+#define T_EDITBUTTON_WIDTH (75)
+
+#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
+#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X)
+#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT)
+#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH)
+
+#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
+#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y)
+#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y)
+
+#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT)
+#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2)
+
+//-----------------------------------------------------------------------------
+
+ModalDialog DLG_CHINESETRANSLATION
+{
+    HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION";
+    //HelpId = ;
+    Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT );
+    OutputSize = TRUE;
+    Closeable = TRUE ;
+    Moveable = TRUE ;
+    SVLook = TRUE;
+
+    Text [ en-US ] = "Chinese Conversion";
+
+    FixedLine FL_DIRECTION
+    {
+        Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ;
+        Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Conversion direction";
+    };
+
+    DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) )
+
+    CheckBox CB_USE_VARIANTS
+    {
+        HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS";
+        Pos = MAP_APPFONT( T_COL_3, T_ROW_4 );
+        Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ;
+
+        Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants";
+    };
+
+    FixedLine FL_COMMONTERMS
+    {
+        Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ;
+        Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Common terms";
+    };
+
+    CheckBox CB_TRANSLATE_COMMONTERMS
+    {
+        HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS";
+        Pos = MAP_APPFONT( T_COL_2, T_ROW_6 );
+        Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ;
+
+        Text [ en-US ] = "Translate ~common terms";
+    };
+
+    PushButton PB_EDITTERMS
+    {
+        HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS";
+        Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 );
+        Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+
+        Text [ en-US ] = "~Edit Terms...";
+    };
+
+    FixedLine T_FL_BOTTOMLINE
+    {
+        Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ;
+        Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+    };
+
+    BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 )
+};
+
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 7b46be498c..009a1b89ca 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -94,7 +94,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType )
     if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount())
         return String();
 
-    USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1;
+    sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1;
     if(nPos<m_pPropertyTypeNameListBox->GetEntryCount())
         return m_pPropertyTypeNameListBox->GetEntry(nPos);
     return m_pPropertyTypeNameListBox->GetEntry(0);
@@ -113,7 +113,7 @@ String DictionaryList::makeTabString( const DictionaryEntry& rEntry ) const
 void DictionaryList::initDictionaryControl( const Reference< linguistic2::XConversionDictionary>& xDictionary
                                            , ListBox* pPropertyTypeNameListBox )
 {
-    SetWindowBits( WB_VSCROLL );
+    SetStyle( WB_VSCROLL | WB_TABSTOP );
     SetSelectionMode( SINGLE_SELECTION );
     SetBorderStyle( WINDOW_BORDER_MONO );
     SetHighlightRange();
@@ -257,7 +257,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const
 }
 
 void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-                              , sal_Int16 nConversionPropertyType, ULONG nPos )
+                              , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos )
 {
     if( hasTerm( rTerm ) )
         return;
@@ -283,9 +283,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos  )
     }
 }
 
-ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm )
+sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm )
 {
-    ULONG nPos = LIST_APPEND;
+    sal_uIntPtr nPos = LIST_APPEND;
     for( sal_Int32 nN=GetRowCount(); nN--; )
     {
         DictionaryEntry* pCurEntry = getEntryOnPos( nN );
@@ -352,7 +352,7 @@ void DictionaryList::Resize()
     m_pHeaderBar->SetSizePixel( aBarSize );
 }
 
-void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
+void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ )
 {
     m_nSortColumnIndex=nSortColumnIndex;
     if( nSortColumnIndex<3 )
@@ -369,7 +369,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
         GetModel()->SetSortMode(SortNone);
 }
 
-USHORT DictionaryList::getSortColumn() const
+sal_uInt16 DictionaryList::getSortColumn() const
 {
     return m_nSortColumnIndex;
 }
@@ -390,8 +390,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
 
     if(pLeftItem != NULL && pRightItem != NULL)
     {
-        USHORT nLeftKind=pLeftItem->IsA();
-        USHORT nRightKind=pRightItem->IsA();
+        sal_uInt16 nLeftKind=pLeftItem->IsA();
+        sal_uInt16 nRightKind=pRightItem->IsA();
 
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
@@ -409,12 +409,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
     return eCompare;
 }
 
-SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const
+SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const
 {
     SvLBoxItem* pItem = NULL;
     if( pEntry )
     {
-        USHORT nCount = pEntry->ItemCount();
+        sal_uInt16 nCount = pEntry->ItemCount();
         nColumn++;
         if( nTreeFlags & TREEFLAG_CHKBTN )
             nColumn++;
@@ -788,12 +788,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
         {
             if( m_aCB_Reverse.IsChecked() )
             {
-                ULONG nPos = rReverse.deleteEntries( pE->m_aMapping );
+                sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping );
                 nPos = rReverse.deleteEntries( aMapping );
                 rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos );
             }
 
-            ULONG nPos = rActive.deleteEntries( aTerm );
+            sal_uIntPtr nPos = rActive.deleteEntries( aTerm );
             rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos );
         }
     }
@@ -866,7 +866,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG )
 {
     if(m_pHeaderBar)
     {
-        USHORT nId = m_pHeaderBar->GetCurItemId();
+        sal_uInt16 nId = m_pHeaderBar->GetCurItemId();
         HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId);
         if( nBits & HIB_CLICKABLE )
         {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
index 6ba634335f..6ba634335f 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 3f97c1df8a..73a170954f 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -93,14 +93,14 @@ public:
     bool hasTerm( const rtl::OUString& rTerm ) const;
 
     void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND );
-    ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
+            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND );
+    sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
     void deleteEntryOnPos( sal_Int32 nPos  );
     DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const;
     DictionaryEntry* getFirstSelectedEntry() const;
 
-    void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ );
-    USHORT getSortColumn() const;
+    void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
+    sal_uInt16 getSortColumn() const;
     
     virtual void Resize();
 
@@ -110,7 +110,7 @@ private:
 
     DECL_LINK( CompareHdl, SvSortData* );
     StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight );
-    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const;
+    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const;
 
 public:
     ::com::sun::star::uno::Reference<
@@ -122,7 +122,7 @@ private:
 
     std::vector< DictionaryEntry* > m_aToBeDeleted;
 
-    USHORT      m_nSortColumnIndex;
+    sal_uInt16      m_nSortColumnIndex;
 };
 
 class ChineseDictionaryDialog : public ModalDialog
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
index 2a0c9b2f28..4c6b76c2ae 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
@@ -66,6 +66,7 @@
 
 ModalDialog DLG_CHINESEDICTIONARY
 {
+    HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY";
     //HelpId = ;
     Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT );
     OutputSize = TRUE;
@@ -79,6 +80,7 @@ ModalDialog DLG_CHINESEDICTIONARY
 
     CheckBox CB_REVERSE
     {
+        HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE";
         Pos = MAP_APPFONT ( COL_1, ROW_3 ) ;
         Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ;
         
@@ -93,6 +95,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     };
     Edit ED_TERM
     {
+        HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ;
         Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -107,6 +110,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     };
     Edit ED_MAPPING
     {
+        HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ;
         Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -120,6 +124,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     };
     ListBox LB_PROPERTY
     {
+        HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ;
         Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -154,6 +159,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     
     PushButton PB_ADD
     {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD";
         Pos = MAP_APPFONT( COL_4, ROW_5 );
         Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -161,6 +167,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     };
     PushButton PB_MODIFY
     {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY";
         Pos = MAP_APPFONT( COL_4, ROW_5a );
         Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -168,6 +175,7 @@ ModalDialog DLG_CHINESEDICTIONARY
     };
     PushButton PB_DELETE
     {
+        HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE";
         Pos = MAP_APPFONT( COL_4, ROW_5b );
         Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT );
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
index 161add1e73..161add1e73 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
index 956f6232a4..956f6232a4 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index b0706e5af7..b0706e5af7 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 9a2924c8ef..9a2924c8ef 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index f7878d4a78..29c1325c1f 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -63,7 +63,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
     , m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) )
     , m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) )
     , m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) )
-    , m_aFL_Bottomline( this, TextConversionDlgs_ResId( FL_BOTTOMLINE ) )
+    , m_aFL_Bottomline( this, TextConversionDlgs_ResId( T_FL_BOTTOMLINE ) )
     , m_aBP_OK( this, TextConversionDlgs_ResId( PB_OK ) )
     , m_aBP_Cancel( this, TextConversionDlgs_ResId( PB_CANCEL ) )
     , m_aBP_Help( this, TextConversionDlgs_ResId( PB_HELP ) )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
index bc35405016..f3ab26ee45 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
@@ -35,10 +35,9 @@
 
 #define CB_USE_VARIANTS             1
 #define CB_TRANSLATE_COMMONTERMS    2
-#define CB_REVERSE                  3
 
 #define FL_DIRECTION        1
 #define FL_COMMONTERMS      2
-#define FL_BOTTOMLINE       3
+#define T_FL_BOTTOMLINE       3
 
 #endif
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 2805217c77..2805217c77 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
index 52dfd00909..714e0a407e 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
@@ -58,6 +58,7 @@
 
 ModalDialog DLG_CHINESETRANSLATION
 {
+    HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION";
     //HelpId = ;
     Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT );
     OutputSize = TRUE;
@@ -78,6 +79,7 @@ ModalDialog DLG_CHINESETRANSLATION
 
     CheckBox CB_USE_VARIANTS
     {
+        HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS";
         Pos = MAP_APPFONT( COL_3, ROW_4 );
         Size = MAP_APPFONT ( FULL_WIDTH - COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ;
 
@@ -93,6 +95,7 @@ ModalDialog DLG_CHINESETRANSLATION
 
     CheckBox CB_TRANSLATE_COMMONTERMS
     {
+        HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS";
         Pos = MAP_APPFONT( COL_2, ROW_6 );
         Size = MAP_APPFONT ( COL_4 - COL_2, RSC_CD_CHECKBOX_HEIGHT ) ;
 
@@ -101,6 +104,7 @@ ModalDialog DLG_CHINESETRANSLATION
 
     PushButton PB_EDITTERMS
     {
+        HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS";
         Pos = MAP_APPFONT( COL_4, ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 );
         Size = MAP_APPFONT( EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk
deleted file mode 100644
index b5013ca9d1..0000000000
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ /dev/null
@@ -1,90 +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=svx
-TARGET=textconversiondlgs
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-LOCALIZE_ME=chinese_direction_tmpl.hrc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=           \
-                    $(SLO)$/services.obj\
-                    $(SLO)$/resid.obj\
-                    $(SLO)$/chinese_dictionarydialog.obj\
-                    $(SLO)$/chinese_translationdialog.obj\
-                    $(SLO)$/chinese_translation_unodialog.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=          \
-                    chinese_translationdialog.src\
-                    chinese_dictionarydialog.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-.IF "$(GUI)" == "OS2"
-SHL1TARGET= txcnvdlg
-.ELSE
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-.ENDIF
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(CPPULIB)  \
-        $(SALLIB)   \
-        $(CPPUHELPERLIB) \
-        $(UNOTOOLSLIB) \
-        $(COMPHELPERLIB) \
-        $(TOOLSLIB)  \
-        $(TKLIB)	 \
-        $(SVTOOLLIB) \
-        $(SVLLIB) \
-        $(VCLLIB)
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-
-
-# --- Targets ------------------------------------------------------
-.INCLUDE :	target.mk
-
-$(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc
-$(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc
-$(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc
-
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index bb0a62be9e..9ea569ed88 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -43,7 +43,7 @@ static ResMgr* getTextConversionResMgr()
         pMgr = ResMgr::CreateResMgr( "textconversiondlgs" );
     return pMgr;
 }
-TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId)
+TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId)
          : ResId( nId, *getTextConversionResMgr() )
 {
 }
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index f920fd3a90..9d6c5710df 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx
@@ -42,7 +42,7 @@ namespace textconversiondlgs
 class TextConversionDlgs_ResId : public ResId
 {
  public:
-    TextConversionDlgs_ResId(USHORT nId);
+    TextConversionDlgs_ResId(sal_uInt16 nId);
 };
 
 //.............................................................................
diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc
index 8581baed1d..8581baed1d 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/resids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 1035c41d1a..59ec79e5ab 100644..100755
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -48,20 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
 extern "C"
 {
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation );
-}
-//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index b8a996d0a6..ff67870eac 100644..100755
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
 
+#include <comphelper/interaction.hxx>
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
 #include <com/sun/star/util/URL.hpp>
@@ -66,9 +67,9 @@
 #include <editeng/numitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include "svtools/filter.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/fmview.hxx>
@@ -178,7 +179,7 @@ namespace svx
         virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException);
         virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames(  ) throw (RuntimeException);
 
-        VirtualDevice* CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const;
+        VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
 
         DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
 
@@ -220,7 +221,7 @@ namespace svx
 
     /** creates a bitmap that is optionaly transparent from a metafile
     */
-    BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, BOOL bTransparent, const Size* pSize )
+    BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize )
     {
         Graphic     aGraphic( rMtf );
         BitmapEx	aBmpEx;
@@ -348,7 +349,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             if( pField && pField->ISA( SvxPageField ) )
             {
                 String aPageNumValue;
-                BOOL bUpper = FALSE;
+                sal_Bool bUpper = sal_False;
 
                 switch(mpDoc->GetPageNumType())
                 {
@@ -359,7 +360,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
                         aPageNumValue += (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a');
                         break;
                     case SVX_ROMAN_UPPER:
-                        bUpper = TRUE;
+                        bUpper = sal_True;
                     case SVX_ROMAN_LOWER:
                         aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
                         break;
@@ -390,7 +391,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
 
     @return	the returned VirtualDevice is owned by the caller
 */
-VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const
+VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
 {
     VirtualDevice*	pVDev = new VirtualDevice();
     MapMode			aMM( MAP_100TH_MM );
@@ -421,17 +422,17 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixe
 
     pVDev->SetMapMode( aMM );
 #ifdef DBG_UTIL
-    BOOL bAbort = !
+    sal_Bool bAbort = !
 #endif
         pVDev->SetOutputSize(aPageSize);
     DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
 
     SdrView* pView = new SdrView(mpDoc, pVDev);
-    pView->SetPageVisible( FALSE );
-    pView->SetBordVisible( FALSE );
-    pView->SetGridVisible( FALSE );
-    pView->SetHlplVisible( FALSE );
-    pView->SetGlueVisible( FALSE );
+    pView->SetPageVisible( sal_False );
+    pView->SetBordVisible( sal_False );
+    pView->SetGridVisible( sal_False );
+    pView->SetHlplVisible( sal_False );
+    pView->SetGlueVisible( sal_False );
     pView->ShowSdrPage(pPage);
     Region aRegion (Rectangle( aPoint, aPageSize ) );
 
@@ -718,7 +719,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 aVDev.SetMapMode( aMap );
                 if( rSettings.mbUseHighContrast )
                     aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-                aVDev.EnableOutput( FALSE );
+                aVDev.EnableOutput( sal_False );
                 aMtf.Record( &aVDev );
                 Size aNewSize;
 
@@ -734,14 +735,14 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                     pView = new SdrView( mpDoc, &aVDev );
                 }
 
-                pView->SetBordVisible( FALSE );
-                pView->SetPageVisible( FALSE );
+                pView->SetBordVisible( sal_False );
+                pView->SetPageVisible( sal_False );
                 pView->ShowSdrPage( pPage );
 
                 if ( pView && pPage )
                 {
-                    pView->SetBordVisible( FALSE );
-                    pView->SetPageVisible( FALSE );
+                    pView->SetBordVisible( sal_False );
+                    pView->SetPageVisible( sal_False );
                     pView->ShowSdrPage( pPage );
 
                     const Point	aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
@@ -787,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 if( rSettings.mbTranslucent )
                 {
                     Size aOutSize;
-                    aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), TRUE, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
+                    aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
                 }
             }
         }
@@ -886,11 +887,11 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
 
                     pMtf->AddAction( new MetaCommentAction(
                                          "XTEXT_SCROLLRECT", 0,
-                                         reinterpret_cast<BYTE const*>(&aScrollRectangle),
+                                         reinterpret_cast<sal_uInt8 const*>(&aScrollRectangle),
                                          sizeof( Rectangle ) ) );
                     pMtf->AddAction( new MetaCommentAction(
                                          "XTEXT_PAINTRECT", 0,
-                                         reinterpret_cast<BYTE const*>(&aPaintRectangle),
+                                         reinterpret_cast<sal_uInt8 const*>(&aPaintRectangle),
                                          sizeof( Rectangle ) ) );
                     
                     aGraphic = Graphic( *pMtf );
@@ -923,7 +924,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
                 }
             }
 
-            aOut.EnableOutput( FALSE );
+            aOut.EnableOutput( sal_False );
             aOut.SetMapMode( aMap );
             if( rSettings.mbUseHighContrast )
                 aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
@@ -1021,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     // create the output stuff
     Graphic aGraphic;
 
-    USHORT nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
+    sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
 
     if( nStatus == GRFILTER_OK )
     {
@@ -1066,15 +1067,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     {
         Any aInteraction;
         Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1);
-        ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove();
+        ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove();
         lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY);
 
         GraphicFilterRequest aErrorCode;
         aErrorCode.ErrCode = nStatus;
         aInteraction <<= aErrorCode;
-        framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations );
-        Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY );
-        aSettings.mxInteractionHandler->handle( xRequest ); 
+        aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) );
     }
     return nStatus == GRFILTER_OK;
 }
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index 775e6acaa3..775e6acaa3 100644..100755
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 1b5009e138..7fbc341d0f 100644..100755
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -40,13 +40,13 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::cppu;
 
-SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw()
+SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw()
 : mpModel( pModel ),
   mpModelPool( pModel ? &pModel->GetItemPool() : NULL ),
   mnWhich( nWhich ), mnMemberId( nMemberId )
@@ -93,11 +93,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const  OUString& Service
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement )
@@ -201,11 +201,11 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
     // if it is not in our own sets, modify the pool!
     sal_Bool bFound = sal_False;
 
-    USHORT nSurrogate;
-    USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0;
+    sal_uInt32 nSurrogate;
+    sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
     for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate);
         if( pItem && pItem->GetName() == aSearchName )
         {
             pItem->PutValue( aElement, mnMemberId );
@@ -238,12 +238,12 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
     {
         const String aSearchName( aName );
         NameOrIndex *pItem;
-        sal_Int32 nSurrogate;
+        sal_uInt32 nSurrogate;
 
-        sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0;
+        sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
         for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ )
         {
-            pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate );
+            pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate );
 
             if( isValid( pItem ) && (pItem->GetName() == aSearchName) )
             {
@@ -266,11 +266,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames(  )
     NameOrIndex *pItem;
     OUString aApiName;
 
-    const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0;
-    sal_Int32 nSurrogate;
+    const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
+    sal_uInt32 nSurrogate;
     for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate );
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate );
 
         if( !isValid( pItem ) )
             continue;
@@ -305,14 +305,14 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
         return sal_False;
 
     const String aSearchName( aName );
-    USHORT nSurrogate;
+    sal_uInt32 nSurrogate;
 
     const NameOrIndex *pItem;
 
-    USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0;
+    sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
     for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate );
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate );
         if( isValid( pItem ) && (pItem->GetName() == aSearchName) )
             return sal_True;
     }
@@ -327,11 +327,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements(  )
 
     const NameOrIndex *pItem;
 
-    sal_Int32 nSurrogate;
-    const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0;
+    sal_uInt32 nSurrogate;
+    const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0;
     for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate );
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate );
 
         if( isValid( pItem ) )
             return sal_True;
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index fe919c2a97..cd5f149ea6 100644..100755
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -51,15 +51,15 @@ class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::contai
 private:
     SdrModel*		mpModel;
     SfxItemPool*	mpModelPool;
-    USHORT			mnWhich;
-    BYTE			mnMemberId;
+    sal_uInt16			mnWhich;
+    sal_uInt8			mnMemberId;
 
     ItemPoolVector maItemSetVector;
 
     void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement );
 
 public:
-    SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw();
+    SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw();
     virtual	~SvxUnoNameItemTable() throw();
 
     virtual NameOrIndex* createItem() const throw() = 0;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index ff12910777..ccab088399 100644..100755
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -31,7 +31,7 @@
 
 #include <set>
 
-#include "UnoNamespaceMap.hxx"
+#include "svx/UnoNamespaceMap.hxx"
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -40,7 +40,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/stl_types.hxx>
 #include <svl/itempool.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "editeng/xmlcnitm.hxx"
 
 
@@ -117,8 +117,8 @@ namespace svx
 
         sal_uInt16* mpWhichId;
 
-        sal_uInt16 mnItemCount;
-        sal_uInt16 mnItem;
+        sal_uInt32 mnItemCount;
+        sal_uInt32 mnItem;
 
         const SvXMLAttrContainerItem* mpCurrentAttr;
         sal_uInt16 mnCurrentAttr;
@@ -144,7 +144,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool
     mpWhichId = pWhichIds;
 
     mnItem = 0;
-    mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0;
+    mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0;
 }
 
 sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL )
@@ -164,7 +164,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString&
 
     const SfxPoolItem* pItem = 0;
     // look for the next available item in the current pool
-    while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem( *mpWhichId, mnItem ) ) ) )
+    while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem2( *mpWhichId, mnItem ) ) ) )
         mnItem++;
 
     // are we finished with the current whichid?
@@ -176,7 +176,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString&
         if( 0 != *mpWhichId )
         {
             mnItem = 0;
-            mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0;
+            mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0;
             return next( rPrefix, rURL );
         }
 
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index e2f63cce8b..b09b2444db 100644..100755
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
@@ -43,7 +43,7 @@
 #include "unopolyhelper.hxx"
 #include <svx/xdef.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
@@ -457,7 +457,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw()
 
     drawing::LineDash aLineDash;
 
-    aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+    aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
     aLineDash.Dots = rXD.GetDots();
     aLineDash.DotLen = rXD.GetDotLen();
     aLineDash.Dashes = rXD.GetDashes();
@@ -477,7 +477,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An
 
     XDash aXDash;
 
-    aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
     aXDash.SetDots(aLineDash.Dots);
     aXDash.SetDotLen(aLineDash.DotLen);
     aXDash.SetDashes(aLineDash.Dashes);
@@ -616,8 +616,8 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro
     awt::Gradient aGradient;
 
     aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle();
-    aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-    aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+    aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+    aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
     aGradient.Angle = (short)aXGradient.GetAngle();
     aGradient.Border = aXGradient.GetBorder();
     aGradient.XOffset = aXGradient.GetXOffset();
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 79675e8511..f5b10ac850 100644..100755
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
 using namespace ::rtl;
 using namespace ::cppu;
 
-const USHORT NON_USER_DEFINED_GLUE_POINTS = 4;
+const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4;
 
 class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer >
 {
@@ -236,7 +236,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr
             {
                 SdrGluePoint aSdrGlue;
                 convert( aUnoGlue, aSdrGlue );
-                USHORT nId = pList->Insert( aSdrGlue );
+                sal_uInt16 nId = pList->Insert( aSdrGlue );
 
                 // only repaint, no objectchange
                 mpObject->ActionChanged();
@@ -256,11 +256,11 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier )
 {
     if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS ))
     {
-        const USHORT nId = (USHORT)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
+        const sal_uInt16 nId = (sal_uInt16)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
 
         SdrGluePointList* pList = const_cast<SdrGluePointList*>(mpObject->GetGluePointList());
-        const USHORT nCount = pList ? pList->GetCount() : 0;
-        USHORT i;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+        sal_uInt16 i;
 
         for( i = 0; i < nCount; i++ )
         {
@@ -289,11 +289,11 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c
         if( (Identifier < NON_USER_DEFINED_GLUE_POINTS) || !(aElement >>= aGluePoint))
             throw lang::IllegalArgumentException();
 
-        const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+        const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
 
         SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
-        const USHORT nCount = pList ? pList->GetCount() : 0;
-        USHORT i;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+        sal_uInt16 i;
         for( i = 0; i < nCount; i++ )
         {
             if( (*pList)[i].GetId() == nId )
@@ -323,18 +323,18 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
 
         if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point?
         {
-            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Identifier );
+            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Identifier );
             aGluePoint.IsUserDefined = sal_False;
             convert( aTempPoint, aGluePoint );
             return uno::makeAny( aGluePoint );
         }
         else
         {
-            const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+            const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
 
             const SdrGluePointList* pList = mpObject->GetGluePointList();		
-            const USHORT nCount = pList ? pList->GetCount() : 0;
-            for( USHORT i = 0; i < nCount; i++ )
+            const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+            for( sal_uInt16 i = 0; i < nCount; i++ )
             {
                 const SdrGluePoint& rTempPoint = (*pList)[i];
                 if( rTempPoint.GetId() == nId )
@@ -360,9 +360,9 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro
     if( mpObject.is() )
     { 
         const SdrGluePointList* pList = mpObject->GetGluePointList();
-        const USHORT nCount = pList ? pList->GetCount() : 0;
+        const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
 
-        USHORT i;
+        sal_uInt16 i;
 
         uno::Sequence< sal_Int32 > aIdSequence( nCount + NON_USER_DEFINED_GLUE_POINTS );
         sal_Int32 *pIdentifier = aIdSequence.getArray();
@@ -427,7 +427,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index )
             Index -= 4;
             if( Index >= 0 && Index < pList->GetCount() )
             {
-                pList->Delete( (USHORT)Index );
+                pList->Delete( (sal_uInt16)Index );
                 
                 // only repaint, no objectchange
                 mpObject->ActionChanged();
@@ -456,7 +456,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno:
         SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
         if( pList && Index < pList->GetCount() )
         {
-            SdrGluePoint& rGlue = (*pList)[(USHORT)Index];
+            SdrGluePoint& rGlue = (*pList)[(sal_uInt16)Index];
             convert( aUnoGlue, rGlue );
 
             // only repaint, no objectchange
@@ -499,7 +499,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
 
         if( Index < 4 ) // default glue point?
         {
-            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Index );
+            SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Index );
             aGluePoint.IsUserDefined = sal_False;
             convert( aTempPoint, aGluePoint );
             uno::Any aAny;
@@ -512,7 +512,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
             const SdrGluePointList* pList = mpObject->GetGluePointList();
             if( pList && Index < pList->GetCount() )
             {
-                const SdrGluePoint& rTempPoint = (*pList)[(USHORT)Index];
+                const SdrGluePoint& rTempPoint = (*pList)[(sal_uInt16)Index];
                 aGluePoint.IsUserDefined = sal_True;
                 convert( rTempPoint, aGluePoint );
                 uno::Any aAny;
diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk
deleted file mode 100644
index 6815f28f4c..0000000000
--- a/svx/source/unodraw/makefile.mk
+++ /dev/null
@@ -1,83 +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=svx
-TARGET=unodraw
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-        $(SLO)$/UnoGraphicExporter.obj \
-        $(SLO)$/XPropertyTable.obj \
-        $(SLO)$/UnoNameItemTable.obj \
-        $(SLO)$/unoshape.obj	\
-        $(SLO)$/unoshap2.obj	\
-        $(SLO)$/unoshap3.obj	\
-        $(SLO)$/unoshap4.obj	\
-        $(SLO)$/unopage.obj		\
-        $(SLO)$/unoshtxt.obj	\
-        $(SLO)$/unoprov.obj		\
-        $(SLO)$/unomod.obj      \
-        $(SLO)$/unomlstr.obj	\
-        $(SLO)$/unogtabl.obj	\
-        $(SLO)$/unohtabl.obj	\
-        $(SLO)$/unobtabl.obj	\
-        $(SLO)$/unottabl.obj	\
-        $(SLO)$/unomtabl.obj	\
-        $(SLO)$/unodtabl.obj	\
-        $(SLO)$/gluepts.obj     \
-        $(SLO)$/tableshape.obj  \
-        $(SLO)$/shapepropertynotifier.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-        $(SLO)$/UnoNamespaceMap.obj \
-        $(SLO)$/unopool.obj \
-        $(SLO)$/unoctabl.obj	\
-        $(SLO)$/unoshcol.obj	\
-        $(SLO)$/recoveryui.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=unodraw
-SRC1FILES =  \
-        unodraw.src
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index e131ffc5ad..e131ffc5ad 100644..100755
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index f1b460c427..f1b460c427 100644..100755
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 1e2f91e00e..1e2f91e00e 100644..100755
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 1f9c93c13a..1f9c93c13a 100644..100755
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index d5512ebe61..d6f99cbf93 100644..100755
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -37,10 +37,10 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <editeng/memberids.hrc>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index e9ac802095..064b007fee 100644..100755
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -36,9 +36,9 @@
 #include "../customshapes/EnhancedCustomShapeEngine.hxx"
 
 #include <svx/xtable.hxx>
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include "recoveryui.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "tbunocontroller.hxx"
 #include "tbunosearchcontrollers.hxx"
 
@@ -101,11 +101,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceNam
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException )
@@ -133,7 +133,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
     if( hasByName( aName ) )
         throw container::ElementExistException();
 
-    INT32 nColor = 0;
+    sal_Int32 nColor = 0;
     if( !(aElement >>= nColor) )
         throw lang::IllegalArgumentException();
 
@@ -158,7 +158,7 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
 void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement )
     throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
 {
-    INT32 nColor = 0;
+    sal_Int32 nColor = 0;
     if( !(aElement >>= nColor) )
         throw lang::IllegalArgumentException();
 
@@ -262,60 +262,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-static void writeInfo (
-    registry::XRegistryKey * pRegistryKey,
-    const OUString& rImplementationName,
-    const uno::Sequence< OUString >& rServices)
-{
-    uno::Reference< registry::XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * , void * pRegistryKey)
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-
-            writeInfo( pKey, SvxShapeCollection::getImplementationName_Static(), SvxShapeCollection::getSupportedServiceNames_Static() );
-            writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() );
-            writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() );
-            writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() );
-            writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() );
-            writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() );
-
-            writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() );
-            writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() );
-            writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() );
-            writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() );
-
-            writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() );
-
-            // XPrimitiveFactory2D
-            writeInfo( pKey,
-                drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(),
-                drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() );
-
-            writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() );
-            writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() );
-//			writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() );
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
diff --git a/svx/source/unodraw/unodraw.src b/svx/source/unodraw/unodraw.src
index f905e651cf..f905e651cf 100644..100755
--- a/svx/source/unodraw/unodraw.src
+++ b/svx/source/unodraw/unodraw.src
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 8fe41f3836..31bc9c28a9 100644..100755
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -39,7 +39,7 @@
 
 #include <svx/xdash.hxx>
 #include <svx/svdmodel.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 243b6bc445..a6f7562138 100644..100755
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -37,7 +37,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflgrit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 17a03e652e..971f9c7d69 100644..100755
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -38,7 +38,7 @@
 #include <svx/xdef.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/unomid.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 925d447e96..925d447e96 100644..100755
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index f4e8a529b2..f7d4cebb2b 100644..100755
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -41,17 +41,17 @@
 #include <comphelper/serviceinfohelper.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include <unofill.hxx>
+#include <svx/unofill.hxx>
 #include <editeng/unonrule.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <sfx2/sfx.hrc>
-#include <unoapi.hxx>
+#include <svx/unoapi.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
@@ -192,8 +192,8 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
         sal_uInt32 nType = UHashMap::getId( rServiceSpecifier );
         if( nType != UHASHMAP_NOTFOUND )
         {
-            UINT16 nT = (UINT16)(nType & ~E3D_INVENTOR_FLAG);
-            UINT32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
+            sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG);
+            sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor;
 
             return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) );
         }
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index c675dd56cf..8ea424ab94 100644..100755
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -51,9 +51,9 @@
 #include <vcl/svapp.hxx>
 
 
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
@@ -145,11 +145,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceNa
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException )
@@ -276,11 +276,11 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
     // if it is not in our own sets, modify the pool!
     sal_Bool bFound = sal_False;
 
-    USHORT nSurrogate;
-    const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0;
+    sal_uInt32 nSurrogate;
+    const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0;
     for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate);
         if( pItem && pItem->GetName() == aSearchName )
         {
             pItem->PutValue( aElement );
@@ -289,10 +289,10 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
         }
     }
 
-    const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0;
+    const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0;
     for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate);
         if( pItem && pItem->GetName() == aSearchName )
         {
             pItem->PutValue( aElement );
@@ -307,13 +307,13 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
         throw container::NoSuchElementException();
 }
 
-static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, USHORT nWhich, uno::Any& rAny )
+static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny )
 {
     NameOrIndex *pItem;
-    const sal_Int32 nSurrogateCount = pPool ? (sal_Int32)pPool->GetItemCount( nWhich ) : 0;
-    for( sal_Int32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ )
+    const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0;
+    for( sal_uInt32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate );
+        pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate );
 
         if( pItem && pItem->GetName() == rSearchName )
         {
@@ -355,17 +355,17 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
     return aAny;
 }
 
-static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
+static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
 {
-    const sal_Int32 nSuroCount = pPool->GetItemCount( nWhich );
-    sal_Int32 nSurrogate;
+    const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich );
+    sal_uInt32 nSurrogate;
 
-    NameOrIndex *pItem;
+    NameOrIndex* pItem;
     OUString aName;
 
     for( nSurrogate = 0; nSurrogate < nSuroCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate );
+        pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate );
 
         if( pItem == NULL || pItem->GetName().Len() == 0 )
             continue;
@@ -415,20 +415,20 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
     NameOrIndex *pItem;
 
     SvxUnogetInternalNameForItem( XATTR_LINESTART, aName, aSearchName );
-    USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0;
-    USHORT nSurrogate;
+    sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0;
+    sal_uInt32 nSurrogate;
     for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate);
         if( pItem && pItem->GetName() == aSearchName )
             return sal_True;
     }
 
     SvxUnogetInternalNameForItem( XATTR_LINEEND, aName, aSearchName );
-    USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0;
+    sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0;
     for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate);
         if( pItem && pItem->GetName() == aSearchName )
             return sal_True;
     }
@@ -450,19 +450,19 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements(  )
 
     NameOrIndex *pItem;
 
-    const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0;
-    USHORT nSurrogate;
+    const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0;
+    sal_uInt32 nSurrogate;
     for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate);
         if( pItem && pItem->GetName().Len() != 0 )
             return sal_True;
     }
 
-    const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0;
+    const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0;
     for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate);
+        pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate);
         if( pItem && pItem->GetName().Len() != 0 )
             return sal_True;
     }
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 77909512c3..d9f52bed9a 100644..100755
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -50,15 +50,16 @@
 #include <svx/svdpagv.hxx>
 #include <svx/unopage.hxx>
 #include "shapeimpl.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/polysc3d.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/svdopath.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdomeas.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 using ::rtl::OUString;
 using namespace ::cppu;
@@ -299,7 +300,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
 {
     SolarMutexGuard aGuard;
 
-    if( (mpModel == 0) || (mpPage == 0) )
+    if ( ( mpModel == NULL ) || ( mpPage == NULL ) )
         throw lang::DisposedException();
 
     SvxShape* pShape = SvxShape::getImplementation( xShape );
@@ -312,6 +313,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
     if(!pObj)
     {
         pObj = CreateSdrObject( xShape );
+        ENSURE_OR_RETURN_VOID( pObj != NULL, "SvxDrawPage::add: no SdrObject was created!" );
     }
     else if ( !pObj->IsInserted() )
     {
@@ -319,13 +321,10 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
         mpPage->InsertObject( pObj );
     }
 
-    if(pObj == NULL)
-        return;
-
     pShape->Create( pObj, this );
+    OSL_ENSURE( pShape->GetSdrObject() == pObj, "SvxDrawPage::add: shape does not know about its newly created SdrObject!" );
 
-    if( mpModel )
-        mpModel->SetChanged();
+    mpModel->SetChanged();
 }
 
 //----------------------------------------------------------------------
@@ -438,7 +437,7 @@ namespace
 
 //----------------------------------------------------------------------
 // ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen
-//         SdrPageView. Dies muß nicht die sichtbare SdrPageView sein.
+//         SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein.
 //----------------------------------------------------------------------
 void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
 {
@@ -462,7 +461,7 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS
 
 //----------------------------------------------------------------------
 // ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen
-//         SdrPageView. Dies muß nicht die sichtbare SdrPageView sein.
+//         SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein.
 //----------------------------------------------------------------------
 void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
 {
@@ -617,7 +616,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.setClosed(true);
                 pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
 
-                // #107245# pObj->SetExtrudeCharacterMode(TRUE);
+                // #107245# pObj->SetExtrudeCharacterMode(sal_True);
                 pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
             }
             else if(pNewObj->ISA(E3dLatheObj))
@@ -630,7 +629,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.setClosed(true);
                 pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
 
-                // #107245# pObj->SetLatheCharacterMode(TRUE);
+                // #107245# pObj->SetLatheCharacterMode(sal_True);
                 pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
             }
         }
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index bcfc40c055..da4a6ba2e4 100644..100755
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -35,7 +35,7 @@
 #include <rtl/uuid.h>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "unopool.hxx"
+#include "svx/unopool.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
@@ -47,7 +47,7 @@
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <memory>
 
 using namespace ::com::sun::star;
@@ -123,22 +123,22 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
         }
     default:
         {
-            const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
+            const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
 
-            BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+            sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
             if( eMapUnit == SFX_MAPUNIT_100TH_MM )
                 nMemberId &= (~CONVERT_TWIPS);
 
             // DVO, OD 10.10.2003 #i18732#
             // Assure, that ID is a Which-ID (it could be a Slot-ID.)
             // Thus, convert handle to Which-ID.
-            pPool->GetDefaultItem( pPool->GetWhich( (USHORT)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
+            pPool->GetDefaultItem( pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
         }
     }
 
 
     // check for needed metric translation
-    const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+    const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
     if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
     {
         SvxUnoConvertToMM( eMapUnit, rValue );
@@ -158,7 +158,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
 {
     uno::Any aValue( rValue );
 
-    const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+    const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
     if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
     {
         SvxUnoConvertFromMM( eMapUnit, aValue );
@@ -192,7 +192,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
     default:
         {
             ::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
-            BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+            sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
             if( !pPool || (pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM) )
                 nMemberId &= (~CONVERT_TWIPS);
 
@@ -307,7 +307,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
     // OD 10.10.2003 #i18732#
     // Assure, that ID is a Which-ID (it could be a Slot-ID.)
     // Thus, convert handle to Which-ID.
-    const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+    const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
     if ( pPool && pPool != mpDefaultsPool )
     {
         // OD 13.10.2003 #i18732# - use method <ResetPoolDefaultItem(..)>
@@ -325,7 +325,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
     // using probably incompatible item pool <mpDefaultsPool>
     uno::Any aAny;
     SfxItemPool* pPool = getModelPool( sal_True );
-    const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+    const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
     const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
     pItem->QueryValue( aAny, pEntry->mnMemberId );
 
@@ -408,11 +408,11 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName
     uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
     const OUString * pArray = aSNL.getConstArray();
 
-    for( INT32 i = 0; i < aSNL.getLength(); i++ )
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 9f18162554..c6fe02b9a2 100644..100755
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -43,17 +43,17 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <boost/unordered_map.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/shl.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <svx/dialmgr.hxx>
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/dialogs.hrc>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
@@ -652,7 +652,6 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap()
         { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE),	SDRATTR_OBJPRINTABLE			, &::getBooleanCppuType(),						0,	0}, \
         { MAP_CHAR_LEN("Visible"),						SDRATTR_OBJVISIBLE				, &::getBooleanCppuType(),						0,	0}, \
         {0,0,0,0,0,0}
-
     };
 
     return aControlPropertyMap_Impl;
@@ -954,7 +953,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger )
 
 SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 {
-    for(UINT16 i=0;i<SVXMAP_END; i++)
+    for(sal_uInt16 i=0;i<SVXMAP_END; i++)
     {
         aSetArr[i] = 0;
         aMapArr[i] = 0;
@@ -963,23 +962,23 @@ SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 
 SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider()
 {
-    for(UINT16 i=0;i<SVXMAP_END; i++)
+    for(sal_uInt16 i=0;i<SVXMAP_END; i++)
         delete aSetArr[i];
 }
 
 // ---------------------------------------------------------------------
 
-/*void SvxUnoPropertyMapProvider::Sort(USHORT nId)
+/*void SvxUnoPropertyMapProvider::Sort(sal_uInt16 nId)
 {
     SfxItemPropertyMapEntry* pTemp = aMapArr[nId];
-    UINT16 i = 0;
+    sal_uInt16 i = 0;
     while(pTemp[i].pName) { i++; }
     qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMapEntry), Svx_CompareMap);
 }*/
 
 // ---------------------------------------------------------------------
 
-const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropertyId)
+const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId)
 {
     DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" );
     if(!aMapArr[nPropertyId]) {
@@ -1018,7 +1017,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert
     }
     return aMapArr[nPropertyId];
 }
-const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool)
+const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool)
 {
     if( !aSetArr[nPropertyId] )
         aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ), rPool );
@@ -1175,10 +1174,10 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
         break;
 
     default:
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName )
@@ -1227,29 +1226,29 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
     int i;
     for( i = 0; i < nCount; i++ )
     {
-        USHORT nResId = (USHORT)(nSourceResIds + i);
+        sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i);
         const ResId aRes( SVX_RES(nResId));
         const String aCompare( aRes );
         if( aShortString == aCompare )
         {
-            USHORT nNewResId = (USHORT)(nDestResIds + i);
+            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
             ResId aNewRes( SVX_RES( nNewResId ));
             rString.Replace( 0, aShortString.Len(), String( aNewRes ) );
-            return TRUE;
+            return sal_True;
         }
         else if( rString == aCompare )
         {
-            USHORT nNewResId = (USHORT)(nDestResIds + i);
+            sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
             ResId aNewRes( SVX_RES( nNewResId ));
             rString = String( aNewRes );
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-static USHORT const SvxUnoColorNameDefResId[] =
+static sal_uInt16 SvxUnoColorNameDefResId[] =
 {
     RID_SVXSTR_BLUEGREY_DEF,
     RID_SVXSTR_BLACK_DEF,
@@ -1280,7 +1279,7 @@ static USHORT const SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_CHART_DEF
 };
 
-static USHORT const SvxUnoColorNameResId[] =
+static sal_uInt16 SvxUnoColorNameResId[] =
 {
     RID_SVXSTR_BLUEGREY,
     RID_SVXSTR_BLACK,
@@ -1311,7 +1310,7 @@ static USHORT const SvxUnoColorNameResId[] =
     RID_SVXSTR_COLOR_CHART
 };
 
-bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, int nCount, String& rString ) throw()
+bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
 {
     //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
     //replace "Red Hat 1" with the translation of Red :-)
@@ -1351,7 +1350,7 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameResId, (USHORT*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+        if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameResId, (sal_uInt16*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
         {
             rApiName = aNew;
             return;
@@ -1388,7 +1387,7 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString&
 
     if( nWhich == XATTR_LINECOLOR )
     {
-        if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameDefResId, (USHORT*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+        if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameDefResId, (sal_uInt16*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
         {
             rInternalName = aNew;
             return;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1c41d4c380..fad2c8b1ff 100644..100755
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -66,7 +66,7 @@
 #include "unopolyhelper.hxx"
 
 // #i29181#
-#include "svdviter.hxx"
+#include "svx/svdviter.hxx"
 #include <svx/svdview.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -1714,7 +1714,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
                 // normal link
                 String				aFilterName;
                 const SfxFilter*	pSfxFilter = NULL;
-                SfxMedium			aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE );
+                SfxMedium			aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False );
 
                 SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
 
@@ -1801,6 +1801,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
     {
     case OWN_ATTR_VALUE_FILLBITMAP:
     {
+        sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
         const Graphic& rGraphic = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic();
 
         if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE)
@@ -1819,6 +1820,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
                 aDestStrm.GetEndOfData());
             rValue <<= aSeq;
         }
+        if ( bSwapped )
+            static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut();
         break;
     }
 
@@ -1830,10 +1833,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
         }
         else
         {
+            sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
             const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true);
             OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
             aURL += OUString::createFromAscii( rGrafObj.GetUniqueID().GetBuffer() );
             rValue <<= aURL;
+            if ( bSwapped )
+                static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut();
         }
         break;
     }
@@ -1848,8 +1854,11 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
 
     case OWN_ATTR_VALUE_GRAPHIC:
     {
+        sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut();
         Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() ); 
         rValue <<= xGraphic;
+        if ( bSwapped )
+            static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut();
         break;
     }
 
@@ -1985,8 +1994,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
 
                 Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
                 Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
-                USHORT i;
-                USHORT nPntAnz=aPol.GetSize();
+                sal_uInt16 i;
+                sal_uInt16 nPntAnz=aPol.GetSize();
                 for (i=0; i<nPntAnz; i++)
                 {
                     MirrorPoint(aPol[i],aRef1,aRef2);
@@ -2007,8 +2016,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
 
                 Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
                 Point aRef2( aRef1.X() + 1000, aRef1.Y() );
-                USHORT i;
-                USHORT nPntAnz=aPol.GetSize();
+                sal_uInt16 i;
+                sal_uInt16 nPntAnz=aPol.GetSize();
                 for (i=0; i<nPntAnz; i++)
                 {
                     MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index a9be7f6cc6..ae9b9389f2 100644..100755
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -46,7 +46,7 @@
 #include <svx/unopage.hxx>
 #include <editeng/unoprnms.hxx>
 #include <svx/polysc3d.hxx>
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/lathe3d.hxx>
@@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue )
 }
 
 //----------------------------------------------------------------------
-#include <svditer.hxx>
+#include <svx/svditer.hxx>
 
 struct ImpRememberTransAndRect
 {
@@ -394,7 +394,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
             double fCamFocal = 
                 (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
 
-            aCam.SetAutoAdjustProjection(FALSE);
+            aCam.SetAutoAdjustProjection(sal_False);
             aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
             basegfx::B3DPoint aLookAt;
             basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ);
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index bd514901aa..d26684b3d8 100644..100755
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -59,11 +59,11 @@
 
 #include <svx/unoshprp.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdview.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
 
 ///////////////////////////////////////////////////////////////////////
 
@@ -283,13 +283,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
             Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
-                BOOL bIsWMF = FALSE;
+                sal_Bool bIsWMF = sal_False;
                 if ( pGraphic->IsLink() )
                 {
                     GfxLink aLnk = pGraphic->GetLink();
                     if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
                     {
-                        bIsWMF = TRUE;
+                        bIsWMF = sal_True;
                         uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
                         rValue <<= aSeq;
                     }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index ef321fc011..bd74a8cfed 100644..100755
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -62,7 +62,7 @@
 #include "svx/svdogrp.hxx"
 #include "svx/scene3d.hxx"
 #include "svx/svdmodel.hxx"
-#include "globl3d.hxx"
+#include "svx/globl3d.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/unopage.hxx"
 #include "svx/view3d.hxx"
@@ -73,7 +73,7 @@
 #include "svx/unoshprp.hxx"
 #include "svx/sxciaitm.hxx" // todo: remove
 #include "svx/svdograf.hxx"
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
 #include "svx/svdpool.hxx"
@@ -91,9 +91,9 @@
 #include "svx/xlnedit.hxx"
 #include "svx/xlnstit.hxx"
 #include "svx/xlndsit.hxx"
-#include "svdglob.hxx"
-#include "svdstr.hrc"
-#include "unomaster.hxx"
+#include "svx/svdglob.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/unomaster.hxx"
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -147,7 +147,7 @@ struct SvxShapeImpl
      *  SdrObject so a multiple call to SvxShape::Create() with same SdrObject
      *  is prohibited.
      */
-    SdrObject*      mpCreatedObj;
+    ::tools::WeakReference< SdrObject > mpCreatedObj;
 
     // for xComponent
     ::cppu::OInterfaceContainerHelper   maDisposeListeners;
@@ -160,7 +160,7 @@ struct SvxShapeImpl
         ,mpMaster( NULL )
         ,mbHasSdrObjectOwnership( false )
         ,mbDisposing( false )
-        ,mpCreatedObj( NULL )
+        ,mpCreatedObj()
         ,maDisposeListeners( _rMutex )
         ,maPropertyNotifier( _rAntiImpl, _rMutex )
     {
@@ -468,11 +468,12 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
     if ( !pNewObj )
         return;
 
-    OSL_ENSURE( ( mpImpl->mpCreatedObj == NULL ) || ( mpImpl->mpCreatedObj == pNewObj ),
+    SdrObject* pCreatedObj = mpImpl->mpCreatedObj.get();
+    OSL_ENSURE( ( pCreatedObj == NULL ) || ( pCreatedObj == pNewObj ),
         "SvxShape::Create: the same shape used for two different objects?! Strange ..." );
 
     // Correct condition (#i52126#)
-    if ( mpImpl->mpCreatedObj != pNewObj )
+    if ( pCreatedObj != pNewObj )
     {
         DBG_ASSERT( pNewObj->GetModel(), "no model for SdrObject?" );
         // Correct condition (#i52126#)
@@ -1501,7 +1502,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re
 
 sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
 {
-    SfxItemSet aSet( mpModel->GetItemPool(),	(USHORT)nWID, (USHORT)nWID );
+    SfxItemSet aSet( mpModel->GetItemPool(),	(sal_uInt16)nWID, (sal_uInt16)nWID );
 
     if( SetFillAttribute( nWID, rName, aSet, mpModel ) )
     {
@@ -1686,12 +1687,12 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     const SfxItemPool* pPool = rSet.GetPool();
 
     const String aSearchName( aName );
-    const USHORT nCount = pPool->GetItemCount((USHORT)nWID);
-    const NameOrIndex *pItem;
+    const sal_uInt32 nCount = pPool->GetItemCount2((sal_uInt16)nWID);
+    const NameOrIndex* pItem;
 
-    for( USHORT nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
+    for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
     {
-        pItem = (NameOrIndex*)pPool->GetItem((USHORT)nWID, nSurrogate);
+        pItem = (NameOrIndex*)pPool->GetItem2((sal_uInt16)nWID, nSurrogate);
         if( pItem && ( pItem->GetName() == aSearchName ) )
         {
             rSet.Put( *pItem );
@@ -2169,7 +2170,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
             case XATTR_FILLHATCH:
             case XATTR_LINEDASH:
                 {
-                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                     if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
                         eState = beans::PropertyState_DEFAULT_VALUE;
                 }
@@ -2184,7 +2185,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
             case XATTR_LINESTART:
             case XATTR_FILLFLOATTRANSPARENCE:
                 {
-                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+                    NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
                     if( ( pItem == NULL ) )
                         eState = beans::PropertyState_DEFAULT_VALUE;
                 }
@@ -2268,7 +2269,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
 #ifdef DBG_UTIL
                 SdrObject* pCheck =
 #endif
-                            pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (ULONG)nNewOrdNum );
+                            pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (sal_uIntPtr)nNewOrdNum );
                 DBG_ASSERT( pCheck == mpObj.get(), "GetOrdNum() failed!" );
             }
             return true;
@@ -2444,7 +2445,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         OUString aLayerName;
         if( rValue >>= aLayerName )
         {
-            const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, TRUE);
+            const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True);
             if( pLayer != NULL )
             {
                 mpObj->SetLayer( pLayer->GetID() );
@@ -2482,7 +2483,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             {
                 Point aRef1(mpObj->GetSnapRect().Center());
                 double nTan=tan(nShear*nPi180);
-                mpObj->Shear(aRef1,nShear,nTan,FALSE);
+                mpObj->Shear(aRef1,nShear,nTan,sal_False);
                 return true;
             }
         }
@@ -2968,13 +2969,13 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             Graphic* pGraphic = pObj->GetGraphic();
             if( pGraphic )
             {
-                BOOL bIsWMF = FALSE;
+                sal_Bool bIsWMF = sal_False;
                 if ( pGraphic->IsLink() )
                 {
                     GfxLink aLnk = pGraphic->GetLink();
                     if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
                     {
-                        bIsWMF = TRUE;
+                        bIsWMF = sal_True;
                         uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
                         rValue <<= aSeq;
                     }
@@ -3185,7 +3186,7 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException)
     }
 
     // #i68523# special handling for Svx3DCharacterModeItem, this is not saved
-    // but needs to be TRUE in svx, pool default (false) in sch. Since sch
+    // but needs to be sal_True in svx, pool default (false) in sch. Since sch
     // does not load lathe or extrude objects, it is possible to set the items
     // here.
     // For other solution possibilities, see task description.
@@ -3295,7 +3296,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 
     if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor)
     {
-        const UINT16 nIdent = mpObj->GetObjIdentifier();
+        const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
 
         switch(nIdent)
         {
@@ -3810,7 +3811,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
     else if( mpObj.is() && mpObj->GetObjInventor() == FmFormInventor)
     {
 #if OSL_DEBUG_LEVEL > 0
-        const UINT16 nIdent = mpObj->GetObjIdentifier();
+        const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
         OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" );
 #endif
         static uno::Sequence< OUString > *pSeq = 0;
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 14e32c0a09..6d82c989b0 100644..100755
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 #include <com/sun/star/document/EventObject.hpp>
 
-#include "unoshcol.hxx"
+#include "svx/unoshcol.hxx"
 #include <svx/unoprov.hxx>
 #include <comphelper/serviceinfohelper.hxx>
 
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index ae97b5b6b4..80898cc32e 100644..100755
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -56,7 +56,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
-#include <sdrpaintwindow.hxx>
+#include <svx/sdrpaintwindow.hxx>
 
 using namespace ::osl;
 using namespace ::rtl;
@@ -105,14 +105,14 @@ private:
     SvxDrawOutlinerViewForwarder*	mpViewForwarder;	// if non-NULL, use GetViewModeTextForwarder text forwarder
     css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLinguServiceManager;
     Point							maTextOffset;
-    BOOL							mbDataValid;
-    BOOL							mbDestroyed;
-    BOOL							mbIsLocked;
-    BOOL							mbNeedsUpdate;
-    BOOL							mbOldUndoMode;
-    BOOL							mbForwarderIsEditMode;		// have to reflect that, since ENDEDIT can happen more often
-    BOOL							mbShapeIsEditMode;			// #104157# only true, if HINT_BEGEDIT was received
-    BOOL							mbNotificationsDisabled;	// prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
+    sal_Bool							mbDataValid;
+    sal_Bool							mbDestroyed;
+    sal_Bool							mbIsLocked;
+    sal_Bool							mbNeedsUpdate;
+    sal_Bool							mbOldUndoMode;
+    sal_Bool							mbForwarderIsEditMode;		// have to reflect that, since ENDEDIT can happen more often
+    sal_Bool							mbShapeIsEditMode;			// #104157# only true, if HINT_BEGEDIT was received
+    sal_Bool							mbNotificationsDisabled;	// prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
 
     XInterface*						mpOwner;
     SvxUnoTextRangeBaseList			maTextRanges;
@@ -122,7 +122,6 @@ private:
     SvxDrawOutlinerViewForwarder*	CreateViewForwarder();
 
     void 							SetupOutliner();
-    void 							UpdateOutliner();
 
     sal_Bool						HasView() const { return mpView ? sal_True : sal_False; }
     sal_Bool						IsEditMode() const 
@@ -157,7 +156,7 @@ public:
     void 					lock();
     void 					unlock();
 
-    BOOL					IsValid() const;
+    sal_Bool					IsValid() const;
 
     Rectangle				GetVisArea();
     Point					LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -168,6 +167,8 @@ public:
     virtual void ObjectInDestruction(const SdrObject& rObject);
 
     void ChangeModel( SdrModel* pNewModel );
+
+    void                    UpdateOutliner();
 };
 
 //------------------------------------------------------------------------
@@ -182,14 +183,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
     mpOutliner		( NULL ),
     mpTextForwarder	( NULL ),
     mpViewForwarder	( NULL ),
-    mbDataValid		( FALSE ),
-    mbDestroyed		( FALSE ),
-    mbIsLocked		( FALSE ),
-    mbNeedsUpdate	( FALSE ),
-    mbOldUndoMode	( FALSE ),
-    mbForwarderIsEditMode ( FALSE ),
-    mbShapeIsEditMode	  ( FALSE ),
-    mbNotificationsDisabled ( FALSE ),
+    mbDataValid		( sal_False ),
+    mbDestroyed		( sal_False ),
+    mbIsLocked		( sal_False ),
+    mbNeedsUpdate	( sal_False ),
+    mbOldUndoMode	( sal_False ),
+    mbForwarderIsEditMode ( sal_False ),
+    mbShapeIsEditMode	  ( sal_False ),
+    mbNotificationsDisabled ( sal_False ),
     mpOwner( pOwner )
 {
     DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -220,14 +221,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
     mpOutliner		( NULL ),
     mpTextForwarder	( NULL ),
     mpViewForwarder	( NULL ),
-    mbDataValid		( FALSE ),
-    mbDestroyed		( FALSE ),
-    mbIsLocked		( FALSE ),
-    mbNeedsUpdate	( FALSE ),
-    mbOldUndoMode	( FALSE ),
-    mbForwarderIsEditMode ( FALSE ),
-    mbShapeIsEditMode	  ( TRUE ),
-    mbNotificationsDisabled ( FALSE ),
+    mbDataValid		( sal_False ),
+    mbDestroyed		( sal_False ),
+    mbIsLocked		( sal_False ),
+    mbNeedsUpdate	( sal_False ),
+    mbOldUndoMode	( sal_False ),
+    mbForwarderIsEditMode ( sal_False ),
+    mbShapeIsEditMode	  ( sal_True ),
+    mbNotificationsDisabled ( sal_False ),
     mpOwner(0)
 {
     if( !mpText )
@@ -368,7 +369,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
         {
             case HINT_OBJCHG:
             {
-                mbDataValid = FALSE;						// Text muss neu geholt werden
+                mbDataValid = sal_False;						// Text muss neu geholt werden
 
                 if( HasView() )
                 {
@@ -400,7 +401,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                         mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
 
                     // #104157# Only now we're really in edit mode
-                    mbShapeIsEditMode = TRUE;
+                    mbShapeIsEditMode = sal_True;
 
                     Broadcast( *pSdrHint );
                 }
@@ -412,7 +413,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     Broadcast( *pSdrHint );
 
                     // #104157# We're no longer in edit mode
-                    mbShapeIsEditMode = FALSE;
+                    mbShapeIsEditMode = sal_False;
 
                     // remove as listener - outliner might outlive ourselves
                     if( mpView && mpView->GetTextEditOutliner() )
@@ -564,7 +565,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
         if( mpOutliner == NULL )
         {
             SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
-            USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+            sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
             if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_OUTLINETEXT )
                 nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
 
@@ -637,7 +638,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             // #91254# put text to object and set EmptyPresObj to FALSE
             if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
             {
-                mpObject->SetEmptyPresObj( FALSE );
+                mpObject->SetEmptyPresObj( sal_False );
                 static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
 
                 // #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the
@@ -678,7 +679,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
             }
         }
 
-        mbDataValid = TRUE;
+        mbDataValid = sal_True;
 
         if( bOwnParaObj )
             delete pOutlinerParaObject;
@@ -911,9 +912,9 @@ void SvxTextEditSourceImpl::unlock()
     }
 }
 
-BOOL SvxTextEditSourceImpl::IsValid() const
+sal_Bool SvxTextEditSourceImpl::IsValid() const
 {
-    return mpView && mpWindow ? TRUE : FALSE;
+    return mpView && mpWindow ? sal_True : sal_False;
 }
 
 Rectangle SvxTextEditSourceImpl::GetVisArea()
@@ -1108,7 +1109,7 @@ void SvxTextEditSource::unlock()
     mpImpl->unlock();
 }
 
-BOOL SvxTextEditSource::IsValid() const
+sal_Bool SvxTextEditSource::IsValid() const
 {
     return mpImpl->IsValid();
 }
@@ -1148,4 +1149,9 @@ void SvxTextEditSource::ChangeModel( SdrModel* pNewModel )
     mpImpl->ChangeModel( pNewModel );
 }
 
+void SvxTextEditSource::UpdateOutliner()
+{
+    mpImpl->UpdateOutliner();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index e20263cf92..261432b244 100644..100755
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -36,7 +36,7 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "unofill.hxx"
+#include "svx/unofill.hxx"
 #include <svx/unomid.hxx>
 #include "UnoNameItemTable.hxx"
 
@@ -85,7 +85,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService
 NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
 {
     XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem();
-    pNewItem->SetEnabled( TRUE );
+    pNewItem->SetEnabled( sal_True );
     return pNewItem;
 }
 
diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk
deleted file mode 100755
index 113bd70db0..0000000000
--- a/svx/source/unogallery/makefile.mk
+++ /dev/null
@@ -1,48 +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=svx
-TARGET=unogallery
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	\
-            $(SLO)$/unogalthemeprovider.obj	\
-            $(SLO)$/unogaltheme.obj			\
-            $(SLO)$/unogalitem.obj		
-
-# --- Target -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 015c3c1cf4..ad78ee4766 100644..100755
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -31,7 +31,7 @@
 
 #include "unogalitem.hxx"	
 #include "unogaltheme.hxx"	
-#include "galtheme.hxx"	
+#include "svx/galtheme.hxx"	
 #include "svx/galmisc.hxx"	
 #include <svx/fmmodel.hxx>
 #include <rtl/uuid.h>
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 71e6b6ea94..71e6b6ea94 100644..100755
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 9e5a1e8bc2..a1ec703c82 100644..100755
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -33,7 +33,7 @@
 
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
-#include "galtheme.hxx"
+#include "svx/galtheme.hxx"
 #include "svx/gallery1.hxx"
 #include "svx/galmisc.hxx"
 #include <svx/fmmodel.hxx>
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 8c9f1de670..8c9f1de670 100644..100755
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index ac50cb36d0..ac50cb36d0 100644..100755
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk
deleted file mode 100644
index 02e6f3ae1f..0000000000
--- a/svx/source/xml/makefile.mk
+++ /dev/null
@@ -1,49 +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=svx
-TARGET=xml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-SLOFILES = \
-        $(SLO)$/xmlexport.obj		\
-        $(SLO)$/xmlxtimp.obj		\
-        $(SLO)$/xmlxtexp.obj		\
-        $(SLO)$/xmlgrhlp.obj		\
-        $(SLO)$/xmleohlp.obj		
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 29d5534cc3..e37305997a 100644..100755
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -53,7 +53,7 @@
 
 #include <sot/clsids.hxx>
 #include <map>
-#include "xmleohlp.hxx"
+#include "svx/xmleohlp.hxx"
 
 // -----------
 // - Defines -
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 5a8a47948e..c2fa556bdc 100644..100755
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -45,8 +45,8 @@
 #include <unotools/streamwrap.hxx>
 #include <sot/storage.hxx>
 #include <svx/svdmodel.hxx>
-#include <xmleohlp.hxx>
-#include <xmlgrhlp.hxx>
+#include <svx/xmleohlp.hxx>
+#include <svx/xmlgrhlp.hxx>
 
 #include <svx/unomodel.hxx>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 0c3b7a106b..cb18793049 100644..100755
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -47,7 +47,7 @@
 #include <tools/zcodec.hxx>
 
 #include "svtools/filter.hxx"
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include <algorithm>
 
@@ -329,8 +329,8 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
         Graphic aGraphic;
 
         mpOStm->Seek( 0 );
-        USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
-        USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
+        sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
+        sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
         GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat );
 
         if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
@@ -338,17 +338,17 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
             //Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format
             //unzip them and try again
 
-            BYTE    sFirstBytes[ 2 ];
+            sal_uInt8    sFirstBytes[ 2 ];
 
             mpOStm->Seek( STREAM_SEEK_TO_END );
-            ULONG nStreamLen = mpOStm->Tell();
+            sal_uIntPtr nStreamLen = mpOStm->Tell();
             mpOStm->Seek( 0 );
 
             if ( !nStreamLen )
             {
                 SvLockBytes* pLockBytes = mpOStm->GetLockBytes();
                 if ( pLockBytes  )
-                    pLockBytes->SetSynchronMode( TRUE );
+                    pLockBytes->SetSynchronMode( sal_True );
 
                 mpOStm->Seek( STREAM_SEEK_TO_END );
                 nStreamLen = mpOStm->Tell();
@@ -370,7 +370,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
                     if (aZCodec.EndCompression() && pDest )
                     {
                         pDest->Seek( STREAM_SEEK_TO_END );
-                        ULONG nStreamLen_ = pDest->Tell();
+                        sal_uIntPtr nStreamLen_ = pDest->Tell();
                         if (nStreamLen_)
                         {
                             pDest->Seek(0L);
@@ -500,7 +500,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co
 
 SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
                                                               const ::rtl::OUString& rPictureStreamName,
-                                                              BOOL bTruncate )
+                                                              sal_Bool bTruncate )
 {
     SvxGraphicHelperStream_Impl aRet;
     aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName );
@@ -565,7 +565,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor
                                              const ::rtl::OUString& rPictureStreamName )
 {
     Graphic				aGraphic;
-    SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+    SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
     if( aStream.xStream.is() )
     {
         SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
@@ -588,7 +588,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
 
     if( aGrfObject.GetType() != GRAPHIC_NONE )
     {
-        SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+        SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
         if( aStream.xStream.is() )
         {
             Graphic			aGraphic( (Graphic&) aGrfObject.GetGraphic() );
@@ -637,7 +637,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
                     if ( pComment )
                     {
                         sal_uInt32	nSize = pComment->GetDataSize();
-                        const BYTE* pData = pComment->GetData();
+                        const sal_uInt8* pData = pComment->GetData();
                         if ( nSize && pData )
                             pStream->Write( pData, nSize );
 
@@ -706,8 +706,8 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
         else
         {
             const String		aGraphicObjectId( aPictureStreamName );
-            const GraphicObject	aGrfObject( ByteString( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US ) );
-
+            const ByteString    aAsciiObjectID( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US );
+            const GraphicObject	aGrfObject( aAsciiObjectID );
             if( aGrfObject.GetType() != GRAPHIC_NONE )
             {
                 String			aStreamName( aGraphicObjectId );
@@ -781,6 +781,15 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
                 rURLPair.second = sPictures;
                 rURLPair.second += aStreamName;
             }
+#if OSL_DEBUG_LEVEL > 0
+            else
+            {
+                ByteString sMessage = "graphic object with ID '";
+                sMessage += aAsciiObjectID;
+                sMessage += "' has an unknown type";
+                OSL_ENSURE( false, sMessage.GetBuffer() );
+            }
+#endif
         }
 
         maURLSet.insert( aURLString );
@@ -791,7 +800,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
 
 void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage,
                                SvXMLGraphicHelperMode eCreateMode,
-                               BOOL bDirect )
+                               sal_Bool bDirect )
 {
     mxRootStorage = rXMLStorage;
     meCreateMode = eCreateMode;
@@ -802,7 +811,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto
 
 SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage,
                                                 SvXMLGraphicHelperMode eCreateMode,
-                                                BOOL bDirect )
+                                                sal_Bool bDirect )
 {
     SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper;
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 39317880fd..0b035db2cf 100644..100755
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -55,7 +55,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 
 #include "xmlxtexp.hxx"
 
@@ -201,14 +201,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
             if( !xServiceFactory.is() )
             {
                 OSL_FAIL( "got no service manager" );
-                return FALSE;
+                return sal_False;
             }
 
             uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
             if( !xWriter.is() )
             {
                 OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
-                return FALSE;
+                return sal_False;
             }
 
             uno::Reference<xml::sax::XDocumentHandler>	xHandler( xWriter, uno::UNO_QUERY );
@@ -232,7 +232,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref
             }
             else
             {
-                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, TRUE );
+                pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
                 pMedium->IsRemote();
 
                 SvStream* pStream = pMedium->GetOutStream();
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index ad5887ef15..88f4fe8b44 100644..100755
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -59,7 +59,7 @@
 #include "xmloff/ImageStyle.hxx"
 #include "xmloff/MarkerStyle.hxx"
 #include <xmloff/xmlictxt.hxx>
-#include "xmlgrhlp.hxx"
+#include "svx/xmlgrhlp.hxx"
 #include "xmloff/attrlist.hxx"
 
 #include "xmlxtimp.hxx"
@@ -91,21 +91,21 @@ enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, st
 class SvxXMLTableImportContext : public SvXMLImportContext
 {
 public:
-    SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, 
+    SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, 
         sal_Bool bOOoFormat );
     virtual ~SvxXMLTableImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
 
     SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
 
 protected:
-    void importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
-    void importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+    void importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
 
 private:
     uno::Reference< XNameContainer > mxTable;
@@ -115,7 +115,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////
 
-SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
+SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
 : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ),
     mbOOoFormat( bOOoFormat )
 {
@@ -125,7 +125,7 @@ SvxXMLTableImportContext::~SvxXMLTableImportContext()
 {
 }
 
-SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
+SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
 {
     if( XML_NAMESPACE_DRAW == nPrefix )
     {
@@ -222,7 +222,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix
     return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
 }
 
-void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -251,7 +251,7 @@ void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocal
     }
 }
 
-void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -267,7 +267,7 @@ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLoca
     }
 }
 
-void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -283,7 +283,7 @@ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalN
     }
 }
 
-void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -299,7 +299,7 @@ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocal
     }
 }
 
-void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -315,7 +315,7 @@ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLo
     }
 }
 
-void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 {
     (void)nPrfx;
     (void)rLocalName;
@@ -372,7 +372,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X
     {
         do
         {
-            SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, TRUE );
+            SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, sal_True );
 
             uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
             if( !xServiceFactory.is() )
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index a371addc95..365c7316b3 100644..100755
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -39,7 +39,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "xoutbmp.hxx"
+#include "svx/xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
 
@@ -130,7 +130,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
 // UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
 #ifdef UNX
                 const Size	aBmpSize( aBmp.GetSizePixel() );
-                BOOL		bFullTrans = FALSE;
+                sal_Bool		bFullTrans = sal_False;
 
                 if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
                 {
@@ -140,7 +140,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
                     if( pMAcc )
                     {
                         if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
-                            bFullTrans = TRUE;
+                            bFullTrans = sal_True;
 
                         aTrans.ReleaseAccess( pMAcc );
                     }
@@ -208,7 +208,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
     const long		nBottom = aPixRect.Bottom();
     const long		nRight = aPixRect.Right();
     const long		nLeft = nXPos;
-    const BOOL		bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
+    const sal_Bool		bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
 
     pOutDev->Push();
     pOutDev->SetMapMode( MapMode() );
@@ -240,14 +240,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
 
 // ------------------------------------------------------------------------
 
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
 {
     Animation aNewAnim( rAnimation );
 
     if( bHMirr || bVMirr )
     {
         const Size&	rGlobalSize = aNewAnim.GetDisplaySizePixel();
-        ULONG		nMirrorFlags = 0L;
+        sal_uIntPtr		nMirrorFlags = 0L;
 
         if( bHMirr )
             nMirrorFlags |= BMP_MIRROR_HORZ;
@@ -255,7 +255,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
         if( bVMirr )
             nMirrorFlags |= BMP_MIRROR_VERT;
 
-        for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
+        for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
         {
             AnimationBitmap	aAnimBmp( aNewAnim.Get( i ) );
 
@@ -281,7 +281,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
 
 // ------------------------------------------------------------------------
 
-Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags )
+Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags )
 {
     Graphic	aRetGraphic;
 
@@ -319,8 +319,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF
 
 // ------------------------------------------------------------------------
 
-USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
-                                 const String& rFilterName, const ULONG nFlags,
+sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
+                                 const String& rFilterName, const sal_uIntPtr nFlags,
                                  const Size* pMtfSize_100TH_MM )
 {
     if( rGraphic.GetType() != GRAPHIC_NONE )
@@ -329,8 +329,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         Graphic			aGraphic;
         String			aExt;
         GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
-        USHORT			nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
-        BOOL			bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+        sal_uInt16			nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
+        sal_Bool			bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
 
         DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
 
@@ -371,7 +371,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
                 aURL.setExtension( aExt );
                 rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
-                SfxMedium	aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+                SfxMedium	aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
                 SvStream*	pOStm = aMedium.GetOutStream();
 
                 if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -388,7 +388,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         if( GRFILTER_OK != nErr )
         {
             String	aFilter( rFilterName );
-            BOOL	bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
+            sal_Bool	bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) ||
                                      ( aFilter.EqualsIgnoreCaseAscii( "gif" ) ) ||
                                      ( nFlags & XOUTBMP_USE_GIF_IF_POSSIBLE ) ||
                                      ( ( nFlags & XOUTBMP_USE_GIF_IF_SENSIBLE ) && ( bAnimated || bTransparent ) );
@@ -494,15 +494,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
 #pragma optimize ( "", off )
 #endif
 
-USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
-                                  GraphicFilter& rFilter, const USHORT nFormat,
+sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+                                  GraphicFilter& rFilter, const sal_uInt16 nFormat,
                                   const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
 
-    SfxMedium	aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+    SfxMedium	aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
     SvStream*	pOStm = aMedium.GetOutStream();
-    USHORT		nRet = GRFILTER_IOERROR;
+    sal_uInt16		nRet = GRFILTER_IOERROR;
 
     if( pOStm )
     {
@@ -526,11 +526,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
 
 // ------------------------------------------------------------------------
 
-Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
+Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
 {
     const Size	aSize( rBmp.GetSizePixel() );
     Bitmap		aRetBmp;
-    BOOL		bRet = FALSE;
+    sal_Bool		bRet = sal_False;
 
     if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
     {
@@ -549,8 +549,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                 const long			nHeight = aSize.Height();
                 const long			nHeight2 = nHeight - 2L;
                 const long			lThres2 = (long) cThreshold * cThreshold;
-                const BitmapColor	aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
-                const BitmapColor	aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+                const BitmapColor	aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
+                const BitmapColor	aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
                 long				nSum1;
                 long				nSum2;
                 long				lGray;
@@ -568,18 +568,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                     {
                         nXTmp = nX;
 
-                        nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) );
-                        nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
+                        nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) );
+                        nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
                         nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) );
                         nSum2 += lGray;
 
-                        nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
-                        nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
+                        nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
+                        nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
 
-                        nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) );
+                        nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) );
                         nSum2 += lGray;
-                        nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
-                        nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) );
+                        nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
+                        nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) );
                         nSum2 -= lGray;
 
                         if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
@@ -589,7 +589,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
                     }
                 }
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
 
             aWorkBmp.ReleaseAccess( pReadAcc );
@@ -613,8 +613,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
 
 // ------------------------------------------------------------------------
 
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
-                                 const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+                                 const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
 {
     Bitmap		aWorkBmp;
     Polygon		aRetPoly;
@@ -654,7 +654,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
             Point*				pPoints1 = NULL;
             Point*				pPoints2 = NULL;
             long				nX, nY;
-            USHORT				nPolyPos = 0;
+            sal_uInt16				nPolyPos = 0;
             const BitmapColor	aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
 
             if( nFlags & XOUTBMP_CONTOUR_VERT )
@@ -675,7 +675,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                             nY = nStartY2;
 
                             // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
-                            while( TRUE )
+                            while( sal_True )
                             {
                                 if( aBlack == pAcc->GetPixel( nY, nX ) )
                                 {
@@ -712,7 +712,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                             nX = nStartX2;
 
                             // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
-                            while( TRUE )
+                            while( sal_True )
                             {
                                 if( aBlack == pAcc->GetPixel( nY, nX ) )
                                 {
@@ -732,13 +732,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
                 }
             }
 
-            const USHORT nNewSize1 = nPolyPos << 1;
+            const sal_uInt16 nNewSize1 = nPolyPos << 1;
 
             aRetPoly = Polygon( nPolyPos, pPoints1 );
             aRetPoly.SetSize( nNewSize1 + 1 );
             aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
 
-            for( USHORT j = nPolyPos; nPolyPos < nNewSize1; )
+            for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
                 aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
 
             if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
@@ -756,14 +756,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
 // - DitherBitmap -
 // ----------------
 
-BOOL DitherBitmap( Bitmap& rBitmap )
+sal_Bool DitherBitmap( Bitmap& rBitmap )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
         bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
     else
-        bRet = FALSE;
+        bRet = sal_False;
 
     return bRet;
 }
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 40203de99a..671d382393 100644..100755
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -54,11 +54,11 @@ DBG_NAME(XPolyPolygon);
 |*
 *************************************************************************/
 
-ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize )
+ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
 {
     pPointAry               = NULL;
     pFlagAry                = NULL;
-    bDeleteOldPoints        = FALSE;
+    bDeleteOldPoints        = sal_False;
     nSize                   = 0;
     nResize					= _nResize;
     nPoints                 = 0;
@@ -79,7 +79,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
 
     pPointAry               = NULL;
     pFlagAry                = NULL;
-    bDeleteOldPoints        = FALSE;
+    bDeleteOldPoints        = sal_False;
     nSize                   = 0;
     ImpXPolygon::nResize    = rImpXPoly.nResize;
     nPoints                 = 0;
@@ -126,7 +126,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
 |*
 |*    ImpXPolygon::Resize()
 |*
-|*    !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den
+|*    !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den
 |*    Point-Array nicht loeschen, sondern in pOldPointAry sichern und
 |*    das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird
 |*    das Array dann geloescht.
@@ -136,13 +136,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
 |*
 *************************************************************************/
 
-void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
 {
     if( nNewSize == nSize )
         return;
 
-    BYTE*   pOldFlagAry  = pFlagAry;
-    USHORT  nOldSize     = nSize;
+    sal_uInt8*   pOldFlagAry  = pFlagAry;
+    sal_uInt16  nOldSize     = nSize;
 
     CheckPointDelete();
     pOldPointAry = pPointAry;
@@ -160,7 +160,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
     memset( pPointAry, 0, nSize*sizeof( Point ) );
 
     // Flag Array erzeugen
-    pFlagAry = new BYTE[ nSize ];
+    pFlagAry = new sal_uInt8[ nSize ];
     memset( pFlagAry, 0, nSize );
 
     // Eventuell umkopieren
@@ -181,7 +181,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
                 nPoints = nSize;
         }
         if ( bDeletePoints )    delete[] (char*) pOldPointAry;
-        else                    bDeleteOldPoints = TRUE;
+        else                    bDeleteOldPoints = sal_True;
         delete[] pOldFlagAry;
     }
 }
@@ -193,7 +193,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
 |*
 *************************************************************************/
 
-void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
+void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckPointDelete();
 
@@ -208,7 +208,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
     // den Rest nach hinten schieben
     if( nPos < nPoints )
     {
-        USHORT nMove = nPoints - nPos;
+        sal_uInt16 nMove = nPoints - nPos;
         memmove( &pPointAry[nPos+nCount], &pPointAry[nPos],
                  nMove * sizeof(Point) );
         memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove );
@@ -226,13 +226,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
 |*
 *************************************************************************/
 
-void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
+void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckPointDelete();
 
     if( (nPos + nCount) <= nPoints )
     {
-        USHORT nMove = nPoints - nPos - nCount;
+        sal_uInt16 nMove = nPoints - nPos - nCount;
 
         if( nMove )
         {
@@ -253,7 +253,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
 |*
 *************************************************************************/
 
-XPolygon::XPolygon( USHORT nSize, USHORT nResize )
+XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
 {
     DBG_CTOR(XPolygon,NULL);
     pImpXPolygon = new ImpXPolygon( nSize, nResize );
@@ -284,14 +284,14 @@ XPolygon::XPolygon( const Polygon& rPoly )
 {
     DBG_CTOR(XPolygon,NULL);
 
-    USHORT nSize = rPoly.GetSize();
+    sal_uInt16 nSize = rPoly.GetSize();
     pImpXPolygon = new ImpXPolygon( nSize );
     pImpXPolygon->nPoints = nSize;
 
-    for( USHORT i = 0; i < nSize;  i++ )
+    for( sal_uInt16 i = 0; i < nSize;  i++ )
     {
         pImpXPolygon->pPointAry[i] = rPoly[i];
-        pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i );
+        pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i );
     }
 }
 
@@ -319,13 +319,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
     // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
     long    nXHdl = (long)(0.552284749 * nRx);
     long    nYHdl = (long)(0.552284749 * nRy);
-    USHORT  nPos = 0;
+    sal_uInt16  nPos = 0;
 
     if ( nRx && nRy )
     {
         Point aCenter;
 
-        for (USHORT nQuad = 0; nQuad < 4; nQuad++)
+        for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++)
         {
             switch ( nQuad )
             {
@@ -347,8 +347,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
                         break;
             }
             GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos);
-            pImpXPolygon->pFlagAry[nPos  ] = (BYTE) XPOLY_SMOOTH;
-            pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos  ] = (sal_uInt8) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH;
             nPos += 4;
         }
     }
@@ -372,31 +372,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
 *************************************************************************/
 
 XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
-                   USHORT nStartAngle, USHORT nEndAngle, BOOL bClose)
+                   sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
 {
     DBG_CTOR(XPolygon,NULL);
     pImpXPolygon = new ImpXPolygon(17);
 
     nStartAngle %= 3600;
     if ( nEndAngle > 3600 ) nEndAngle %= 3600;
-    BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600);
+    sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600);
 
     // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
     long    nXHdl = (long)(0.552284749 * nRx);
     long    nYHdl = (long)(0.552284749 * nRy);
-    USHORT  nPos = 0;
-    BOOL    bLoopEnd = FALSE;
+    sal_uInt16  nPos = 0;
+    sal_Bool    bLoopEnd = sal_False;
 
     do
     {
-        USHORT nA1, nA2;
-        USHORT nQuad = nStartAngle / 900;
+        sal_uInt16 nA1, nA2;
+        sal_uInt16 nQuad = nStartAngle / 900;
         if ( nQuad == 4 ) nQuad = 0;
         bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2);
         GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
         nPos += 3;
         if ( !bLoopEnd )
-            pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+            pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
 
     } while ( !bLoopEnd );
 
@@ -406,8 +406,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
 
     if ( bFull )
     {
-        pImpXPolygon->pFlagAry[0   ] = (BYTE) XPOLY_SMOOTH;
-        pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+        pImpXPolygon->pFlagAry[0   ] = (sal_uInt8) XPOLY_SMOOTH;
+        pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
     }
     pImpXPolygon->nPoints = nPos + 1;
 }
@@ -450,7 +450,7 @@ void XPolygon::CheckReference()
 |*
 *************************************************************************/
 
-void XPolygon::SetSize( USHORT nNewSize )
+void XPolygon::SetSize( sal_uInt16 nNewSize )
 {
     CheckReference();
     pImpXPolygon->Resize( nNewSize );
@@ -462,7 +462,7 @@ void XPolygon::SetSize( USHORT nNewSize )
 |*
 *************************************************************************/
 
-USHORT XPolygon::GetSize() const
+sal_uInt16 XPolygon::GetSize() const
 {
     pImpXPolygon->CheckPointDelete();
     return pImpXPolygon->nSize;
@@ -474,7 +474,7 @@ USHORT XPolygon::GetSize() const
 |*
 *************************************************************************/
 
-void XPolygon::SetPointCount( USHORT nPoints )
+void XPolygon::SetPointCount( sal_uInt16 nPoints )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
@@ -484,7 +484,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
 
     if ( nPoints < pImpXPolygon->nPoints )
     {
-        USHORT nSize = pImpXPolygon->nPoints - nPoints;
+        sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
         memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) );
         memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize );
     }
@@ -497,7 +497,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
 |*
 *************************************************************************/
 
-USHORT XPolygon::GetPointCount() const
+sal_uInt16 XPolygon::GetPointCount() const
 {
     pImpXPolygon->CheckPointDelete();
     return pImpXPolygon->nPoints;
@@ -509,13 +509,13 @@ USHORT XPolygon::GetPointCount() const
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
+void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
     pImpXPolygon->InsertSpace( nPos, 1 );
     pImpXPolygon->pPointAry[nPos] = rPt;
-    pImpXPolygon->pFlagAry[nPos]  = (BYTE)eFlags;
+    pImpXPolygon->pFlagAry[nPos]  = (sal_uInt8)eFlags;
 }
 
 /*************************************************************************
@@ -524,12 +524,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
 
-    USHORT nPoints = rXPoly.GetPointCount();
+    sal_uInt16 nPoints = rXPoly.GetPointCount();
 
     pImpXPolygon->InsertSpace( nPos, nPoints );
 
@@ -547,16 +547,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
 |*
 *************************************************************************/
 
-void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
 {
     CheckReference();
     if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
 
-    USHORT nPoints = rPoly.GetSize();
+    sal_uInt16 nPoints = rPoly.GetSize();
 
     pImpXPolygon->InsertSpace( nPos, nPoints );
 
-    USHORT i;
+    sal_uInt16 i;
     for( i=0; i < nPoints; i++ )
         pImpXPolygon->pPointAry[i] = rPoly[i];
 
@@ -569,7 +569,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
 |*
 *************************************************************************/
 
-void XPolygon::Remove( USHORT nPos, USHORT nCount )
+void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
 {
     CheckReference();
     pImpXPolygon->Remove( nPos, nCount );
@@ -589,8 +589,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
     CheckReference();
 
     // Punkte verschieben
-    USHORT nCount = pImpXPolygon->nPoints;
-    for ( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = pImpXPolygon->nPoints;
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         Point* pPt = &(pImpXPolygon->pPointAry[i]);
         pPt->X() += nHorzMove;
@@ -632,7 +632,7 @@ Rectangle XPolygon::GetBoundRect() const
 |*
 *************************************************************************/
 
-const Point& XPolygon::operator[]( USHORT nPos ) const
+const Point& XPolygon::operator[]( sal_uInt16 nPos ) const
 {
     DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon");
 
@@ -646,7 +646,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const
 |*
 *************************************************************************/
 
-Point& XPolygon::operator[]( USHORT nPos )
+Point& XPolygon::operator[]( sal_uInt16 nPos )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
@@ -654,7 +654,7 @@ Point& XPolygon::operator[]( USHORT nPos )
     if( nPos >= pImpXPolygon->nSize )
     {
         DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
-        pImpXPolygon->Resize(nPos + 1, FALSE);
+        pImpXPolygon->Resize(nPos + 1, sal_False);
     }
     if( nPos >= pImpXPolygon->nPoints )
         pImpXPolygon->nPoints = nPos + 1;
@@ -693,10 +693,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
 |*
 *************************************************************************/
 
-BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
 {
     pImpXPolygon->CheckPointDelete();
-    if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE;
+    if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
     return *rXPoly.pImpXPolygon == *pImpXPolygon;
 }
 
@@ -708,10 +708,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
 |*
 *************************************************************************/
 
-BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
 {
     pImpXPolygon->CheckPointDelete();
-    if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE;
+    if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
     return *rXPoly.pImpXPolygon != *pImpXPolygon;
 }
 
@@ -723,7 +723,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
 |*
 *************************************************************************/
 
-XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
+XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
 {
     pImpXPolygon->CheckPointDelete();
     return (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
@@ -737,11 +737,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
 |*
 *************************************************************************/
 
-void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
+void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
 {
     pImpXPolygon->CheckPointDelete();
     CheckReference();
-    pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags;
+    pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags;
 }
 
 /*************************************************************************
@@ -752,7 +752,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
 |*
 *************************************************************************/
 
-BOOL XPolygon::IsControl(USHORT nPos) const
+sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
 {
     return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
 }
@@ -765,7 +765,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const
 |*
 *************************************************************************/
 
-BOOL XPolygon::IsSmooth(USHORT nPos) const
+sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
 {
     XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
     return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -779,7 +779,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const
 |*
 *************************************************************************/
 
-double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
+double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
 {
     const Point& rP1 = pImpXPolygon->pPointAry[nP1];
     const Point& rP2 = pImpXPolygon->pPointAry[nP2];
@@ -796,7 +796,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
 |*
 *************************************************************************/
 
-void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
 {
     Point*  pPoints = pImpXPolygon->pPointAry;
     double  fT2 = fT * fT;
@@ -804,7 +804,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
     double  fU = 1.0 - fT;
     double  fU2 = fU * fU;
     double  fU3 = fU * fU2;
-    USHORT  nIdx = nPos;
+    sal_uInt16  nIdx = nPos;
     short   nPosInc, nIdxInc;
 
     if ( bCalcFirst )
@@ -845,8 +845,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
 /************************************************************************/
 
 void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
-                         long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
-                         USHORT nQuad, USHORT nFirst)
+                         long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+                         sal_uInt16 nQuad, sal_uInt16 nFirst)
 {
     Point* pPoints = pImpXPolygon->pPointAry;
     pPoints[nFirst  ] = rCenter;
@@ -881,29 +881,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
         pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
     }
     if ( nStart > 0 )
-        SubdivideBezier(nFirst, FALSE, (double)nStart / 900);
+        SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
     if ( nEnd < 900 )
-        SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart));
+        SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
     SetFlags(nFirst+1, XPOLY_CONTROL);
     SetFlags(nFirst+2, XPOLY_CONTROL);
 }
 
 /************************************************************************/
 
-BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2)
+sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
 {
     if ( nStart == 3600 ) nStart = 0;
     if ( nEnd == 0 ) nEnd = 3600;
-    USHORT nStPrev = nStart;
-    USHORT nMax = (nStart / 900 + 1) * 900;
-    USHORT nMin = nMax - 900;
+    sal_uInt16 nStPrev = nStart;
+    sal_uInt16 nMax = (nStart / 900 + 1) * 900;
+    sal_uInt16 nMin = nMax - 900;
 
     if ( nEnd >= nMax || nEnd <= nStart )   nA2 = 900;
     else                                    nA2 = nEnd - nMin;
     nA1 = nStart - nMin;
     nStart = nMax;
 
-    // TRUE zurueck, falls letztes Segment berechnet wurde
+    // sal_True zurueck, falls letztes Segment berechnet wurde
     return (nStPrev < nEnd && nStart >= nEnd);
 }
 
@@ -922,11 +922,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2
 |*
 \************************************************************************/
 
-void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
+void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt)
 {
     CheckReference();
 
-//	USHORT  nMaxPnt = pImpXPolygon->nPoints - 1;
+//	sal_uInt16  nMaxPnt = pImpXPolygon->nPoints - 1;
 
 //  if ( nCenter == nMaxPnt )   nPnt = 1;
 //  else if ( nCenter == 0 )    nPnt = nMaxPnt - 1;
@@ -935,7 +935,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
     // statt dessen nDrag auf der Achse nCenter-nPnt verschieben
     if ( !IsControl(nPnt) )
     {
-        USHORT nTmp = nDrag;
+        sal_uInt16 nTmp = nDrag;
         nDrag = nPnt;
         nPnt = nTmp;
     }
@@ -967,7 +967,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
 |*
 \************************************************************************/
 
-void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
+void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext)
 {
     CheckReference();
 
@@ -1003,7 +1003,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
 |*
 \************************************************************************/
 
-void XPolygon::PointsToBezier(USHORT nFirst)
+void XPolygon::PointsToBezier(sal_uInt16 nFirst)
 {
     double  nFullLength, nPart1Length, nPart2Length;
     double  fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3;
@@ -1084,9 +1084,9 @@ void XPolygon::Translate(const Point& rTrans)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
         pImpXPolygon->pPointAry[i] += rTrans;
 }
 
@@ -1111,9 +1111,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
     long nCenterX = rCenter.X();
     long nCenterY = rCenter.Y();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point *pPt = &(pImpXPolygon->pPointAry[i]);
         nX = pPt->X()-nCenterX;
@@ -1125,9 +1125,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
 
     /* und so stand das in einem anderen File auf T:
        dass ich am 29-11-1995 gegettet habe. Joe M.
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point P = pImpXPolygon->pPointAry[i] - rCenter;
         long X = P.X();
@@ -1148,7 +1148,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
 |*
 *************************************************************************/
 
-void XPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
 {
     nAngle %= 3600;
 
@@ -1174,9 +1174,9 @@ void XPolygon::Scale(double fSx, double fSy)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         rPnt.X() = (long)(fSx * rPnt.X());
@@ -1198,9 +1198,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         long nDy = rPnt.Y() - nYRef;
@@ -1223,9 +1223,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos)
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    USHORT nPntCnt = pImpXPolygon->nPoints;
+    sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-    for (USHORT i = 0; i < nPntCnt; i++)
+    for (sal_uInt16 i = 0; i < nPntCnt; i++)
     {
         Point& rPnt = pImpXPolygon->pPointAry[i];
         long nDx = rPnt.X() - nXRef;
@@ -1278,9 +1278,9 @@ void XPolygon::Distort(const Rectangle& rRefRect,
         X4 = rDistortedRect[2].X();
         Y4 = rDistortedRect[2].Y();
 
-        USHORT nPntCnt = pImpXPolygon->nPoints;
+        sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
 
-        for (USHORT i = 0; i < nPntCnt; i++)
+        for (sal_uInt16 i = 0; i < nPntCnt; i++)
         {
             double  fTx, fTy, fUx, fUy;
             Point& rPnt = pImpXPolygon->pPointAry[i];
@@ -1356,14 +1356,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
     DBG_CTOR(XPolygon,NULL);
 
     const Polygon aSource(rPolygon);
-    USHORT nSize = aSource.GetSize();
+    sal_uInt16 nSize = aSource.GetSize();
     pImpXPolygon = new ImpXPolygon( nSize );
     pImpXPolygon->nPoints = nSize;
 
-    for( USHORT i = 0; i < nSize;  i++ )
+    for( sal_uInt16 i = 0; i < nSize;  i++ )
     {
         pImpXPolygon->pPointAry[i] = aSource[i];
-        pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i );
+        pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i );
     }
 }
 
@@ -1415,7 +1415,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
 {
     size_t nAnz = aXPolyList.size();
     const XPolygonList& rCmpList = rImpXPolyPoly.aXPolyList;
-    if ( nAnz != rCmpList.size() ) return FALSE;
+    if ( nAnz != rCmpList.size() ) return false;
     bool bEq=true;
     for ( size_t i = nAnz; i > 0 && bEq; )
     {
@@ -1431,7 +1431,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
 |*
 *************************************************************************/
 
-XPolyPolygon::XPolyPolygon( USHORT /* nInitSize */, USHORT /* nResize */ )
+XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize )
 {
     DBG_CTOR(XPolyPolygon,NULL);
     pImpXPolyPolygon = new ImpXPolyPolygon();
@@ -1477,7 +1477,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly )
     DBG_CTOR(XPolyPolygon,NULL);
     pImpXPolyPolygon = new ImpXPolyPolygon;
 
-    for (USHORT i = 0; i < rPolyPoly.Count(); i++)
+    for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++)
         pImpXPolyPolygon->aXPolyList.push_back(
                                     new XPolygon(rPolyPoly.GetObject(i)) );
 }
@@ -1520,7 +1520,7 @@ void XPolyPolygon::CheckReference()
 |*
 *************************************************************************/
 
-void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
 {
     CheckReference();
     XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1542,7 +1542,7 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
 {
     CheckReference();
 
@@ -1568,7 +1568,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-XPolygon XPolyPolygon::Remove( USHORT nPos )
+XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
 {
     CheckReference();
     XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin();
@@ -1587,7 +1587,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos )
 |*
 *************************************************************************/
 
-XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
+XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos )
 {
     CheckReference();
     XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1605,7 +1605,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
 |*
 *************************************************************************/
 
-const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const
+const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const
 {
     return *(pImpXPolyPolygon->aXPolyList[ nPos ]);
 }
@@ -1639,9 +1639,9 @@ void XPolyPolygon::Clear()
 |*
 *************************************************************************/
 
-USHORT XPolyPolygon::Count() const
+sal_uInt16 XPolyPolygon::Count() const
 {
-    return (USHORT)( pImpXPolyPolygon->aXPolyList.size() );
+    return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.size());
 }
 
 
@@ -1695,7 +1695,7 @@ Rectangle XPolyPolygon::GetBoundRect() const
 |*
 *************************************************************************/
 
-XPolygon& XPolyPolygon::operator[]( USHORT nPos )
+XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos )
 {
     CheckReference();
     return *( pImpXPolyPolygon->aXPolyList[ nPos ] );
@@ -1727,9 +1727,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
 |*
 *************************************************************************/
 
-BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
 {
-    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE;
+    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
     return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
 }
 
@@ -1740,9 +1740,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
 |*
 *************************************************************************/
 
-BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
 {
-    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE;
+    if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
     return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
 }
 
@@ -1803,7 +1803,7 @@ void XPolyPolygon::Rotate20()
 |*
 *************************************************************************/
 
-void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
 {
     nAngle %= 3600;
 
diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk
deleted file mode 100644
index 1ed48bc71f..0000000000
--- a/svx/source/xoutdev/makefile.mk
+++ /dev/null
@@ -1,59 +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=svx
-PROJECTPCH=xout
-PROJECTPCHSOURCE=xoutpch
-TARGET=xout
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/xattr.obj  		\
-        $(SLO)$/xattr2.obj  	\
-        $(SLO)$/xattrbmp.obj	\
-        $(SLO)$/xpool.obj  		\
-        $(SLO)$/xtable.obj 		\
-        $(SLO)$/xtabcolr.obj	\
-        $(SLO)$/xtablend.obj	\
-        $(SLO)$/xtabdash.obj	\
-        $(SLO)$/xtabhtch.obj	\
-        $(SLO)$/xtabgrdt.obj	\
-        $(SLO)$/xtabbtmp.obj	\
-        $(SLO)$/xexch.obj		\
-        $(SLO)$/_xpoly.obj  	\
-        $(SLO)$/_xoutbmp.obj
-
-.INCLUDE :  target.mk
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index cb3ed6dd58..d87f26f226 100644..100755
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -45,15 +45,15 @@
 #include <editeng/memberids.hrc>
 #include <tools/stream.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svl/style.hxx>
 #include "unopolyhelper.hxx"
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
 #include <svx/dialogs.hrc>
-#include "svdstr.hrc"
-#include "xattr.hxx"
+#include "svx/svdstr.hrc"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
 
 /************************************************************************/
 
-#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol))
+#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
 
 /************************************************************************/
 
@@ -108,11 +108,11 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
 
 /*************************************************************************
 |*
-|*	  NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
+|*	  NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex)
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
     SfxStringItem(_nWhich, aNameOrIndexEmptyString),
     nPalIndex(nIndex)
 {
@@ -120,11 +120,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
 
 /*************************************************************************
 |*
-|*	  NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName)
+|*	  NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName)
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) :
     SfxStringItem(_nWhich, rName),
     nPalIndex(-1)
 {
@@ -132,11 +132,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
 
 /*************************************************************************
 |*
-|*	  NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn)
+|*	  NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn)
 |*
 *************************************************************************/
 
-NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) :
     SfxStringItem(_nWhich, rIn)
 {
     rIn >> nPalIndex;
@@ -180,11 +180,11 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new NameOrIndex(Which(), rIn);
 }
@@ -195,7 +195,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     SfxStringItem::Store( rOut, nItemVersion );
     rOut << nPalIndex;
@@ -207,7 +207,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
     Argument pPool2 can be null.
     If returned string equals NameOrIndex->GetName(), the name was already unique.
 */
-String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults )
+String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults )
 {
     sal_Bool bForceNew = sal_False;
 
@@ -219,12 +219,12 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn
 
     if( aUniqueName.Len() && pPool1 )
     {
-        const sal_uInt16 nCount = pPool1->GetItemCount( nWhich );
+        const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich );
 
         const NameOrIndex *pItem;
-        for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
+        for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
         {
-            pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate );
+            pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate );
 
             if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) )
             {
@@ -301,11 +301,11 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn
 
         if( (aUniqueName.Len() == 0) && pPool1 )
         {
-            const sal_uInt16 nCount = pPool1->GetItemCount( nWhich );
+            const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich );
             const NameOrIndex *pItem;
-            for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
+            for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
             {
-                pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate );
+                pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate );
 
                 if( pItem && pItem->GetName().Len() )
                 {
@@ -337,11 +337,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
+|*	  XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
     NameOrIndex(_nWhich, nIndex),
     aColor(rTheColor)
 {
@@ -349,11 +349,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
 
 /*************************************************************************
 |*
-|*	  XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor)
+|*	  XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) :
     NameOrIndex(_nWhich, rName),
     aColor(rTheColor)
 {
@@ -373,11 +373,11 @@ XColorItem::XColorItem(const XColorItem& rItem) :
 
 /*************************************************************************
 |*
-|*	  XColorItem::XColorItem(USHORT nWhich, SvStream& rIn)
+|*	  XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn)
 |*
 \************************************************************************/
 
-XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
     NameOrIndex(_nWhich, rIn)
 {
     if (!IsIndex())
@@ -411,11 +411,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XColorItem(Which(), rIn);
 }
@@ -426,7 +426,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \************************************************************************/
 
-SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -453,13 +453,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
 
 }
 
-bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return true;
 }
 
-bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -485,7 +485,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) :
-    SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle))
+    SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
 {
 }
 
@@ -513,11 +513,11 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStyleItem(rIn);
 }
@@ -541,9 +541,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
-            switch( (USHORT)GetValue() )
+            switch( (sal_uInt16)GetValue() )
             {
                 case XLINE_NONE:
                     nId = RID_SVXSTR_INVISIBLE;
@@ -562,14 +562,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
     }
 }
 
-bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
     rVal <<= eLS;
     return true;
 }
 
-bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     ::com::sun::star::drawing::LineStyle eLS;
     if(!(rVal >>= eLS ))
@@ -581,13 +581,13 @@ bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
         eLS = (::com::sun::star::drawing::LineStyle)nLS;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eLS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
     return true;
 }
 
 //------------------------------------------------------------------------
 
-USHORT XLineStyleItem::GetValueCount() const
+sal_uInt16 XLineStyleItem::GetValueCount() const
 {
     return 3;
 }
@@ -598,12 +598,12 @@ USHORT XLineStyleItem::GetValueCount() const
 // ------------
 /*************************************************************************
 |*
-|*	  XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG)
+|*	  XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr)
 |*
 *************************************************************************/
 
-XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen,
-             USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) :
+XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+             sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
     eDash(eTheDash),
     nDots(nTheDots),
     nDotLen(nTheDotLen),
@@ -828,11 +828,11 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
+|*	  XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
 |*
 *************************************************************************/
 
-XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
     NameOrIndex(XATTR_LINEDASH, nIndex),
     aDash(rTheDash)
 {
@@ -873,9 +873,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
 {
     if (!IsIndex())
     {
-        USHORT	nSTemp;
-        UINT32	nLTemp;
-        INT32   nITemp;
+        sal_uInt16	nSTemp;
+        sal_uInt32	nLTemp;
+        sal_Int32   nITemp;
 
         rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp);
         rIn >> nSTemp; aDash.SetDots(nSTemp);
@@ -926,11 +926,11 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineDashItem(rIn);
 }
@@ -941,18 +941,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT32) aDash.GetDashStyle();
+        rOut << (sal_Int32) aDash.GetDashStyle();
         rOut << aDash.GetDots();
-        rOut << (UINT32) aDash.GetDotLen();
+        rOut << (sal_uInt32) aDash.GetDotLen();
         rOut << aDash.GetDashes();
-        rOut << (UINT32) aDash.GetDashLen();
-        rOut << (UINT32) aDash.GetDistance();
+        rOut << (sal_uInt32) aDash.GetDashLen();
+        rOut << (sal_uInt32) aDash.GetDistance();
     }
 
     return rOut;
@@ -1013,7 +1013,7 @@ bool XLineDashItem::ScaleMetrics(long nMul, long nDiv)
     return true;
 }
 
-bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1027,7 +1027,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
             ::com::sun::star::drawing::LineDash aLineDash;
 
             const XDash& rXD = GetDashValue();
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -1058,7 +1058,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
 
             ::com::sun::star::drawing::LineDash aLineDash;
 
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -1117,7 +1117,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
     return true;
 }
 
-bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1149,7 +1149,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
                 {
                     XDash aXDash;
 
-                    aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+                    aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
                     aXDash.SetDots(aLineDash.Dots);
                     aXDash.SetDotLen(aLineDash.DotLen);
                     aXDash.SetDashes(aLineDash.Dashes);
@@ -1185,7 +1185,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
 
             XDash aXDash;
 
-            aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
             aXDash.SetDots(aLineDash.Dots);
             aXDash.SetDotLen(aLineDash.DotLen);
             aXDash.SetDashes(aLineDash.Dashes);
@@ -1206,7 +1206,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
                 return false;
 
             XDash aXDash = GetDashValue();
-            aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
+            aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
 
             if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
                 aXDash.SetDots(1);
@@ -1263,7 +1263,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb
     return true;
 }
 
-BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
 }
@@ -1330,11 +1330,11 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineWidthItem(rIn);
 }
@@ -1365,7 +1365,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
     }
 }
 
-bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Int32 nValue = GetValue();
     if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1375,7 +1375,7 @@ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
     return true;
 }
 
-bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -1393,11 +1393,11 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
 
 /*************************************************************************
 |*
-|*	  XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
+|*	  XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor)
 |*
 *************************************************************************/
 
-XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
 {
 }
@@ -1437,11 +1437,11 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineColorItem(rIn);
 }
@@ -1470,13 +1470,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
     }
 }
 
-bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return true;
 }
 
-bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1592,11 +1592,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XLineStartItem::XLineStartItem(INT32 nIndex)
+|*	  XLineStartItem::XLineStartItem(sal_Int32 nIndex)
 |*
 *************************************************************************/
 
-XLineStartItem::XLineStartItem(INT32 nIndex) 
+XLineStartItem::XLineStartItem(sal_Int32 nIndex) 
 :	NameOrIndex(XATTR_LINESTART, nIndex)
 {
 }
@@ -1680,11 +1680,11 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartItem(rIn);
 }
@@ -1695,7 +1695,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -1750,7 +1750,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
     }
 }
 
-bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1770,7 +1770,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
     return true;
 }
 
-bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -1840,16 +1840,16 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
         // 2. if we have a name check if there is already an item with the
         // same name in the documents pool with a different line end or start
 
-        sal_uInt16 nCount, nSurrogate;
+        sal_uInt32 nCount, nSurrogate;
 
         const SfxItemPool* pPool1 = &pModel->GetItemPool();
         if( aUniqueName.Len() && pPool1 )
         {
-            nCount = pPool1->GetItemCount( XATTR_LINESTART );
+            nCount = pPool1->GetItemCount2( XATTR_LINESTART );
 
             for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
             {
-                const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate );
+                const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate );
 
                 if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
                 {
@@ -1867,11 +1867,11 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( !bForceNew )
             {
-                nCount = pPool1->GetItemCount( XATTR_LINEEND );
+                nCount = pPool1->GetItemCount2( XATTR_LINEEND );
 
                 for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate );
 
                     if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
                     {
@@ -1892,10 +1892,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
         const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
         if( aUniqueName.Len() && pPool2)
         {
-            nCount = pPool2->GetItemCount( XATTR_LINESTART );
+            nCount = pPool2->GetItemCount2( XATTR_LINESTART );
             for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
             {
-                const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate );
+                const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate );
 
                 if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
                 {
@@ -1913,10 +1913,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( !bForceNew )
             {
-                nCount = pPool2->GetItemCount( XATTR_LINEEND );
+                nCount = pPool2->GetItemCount2( XATTR_LINEEND );
                 for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate );
 
                     if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) )
                     {
@@ -1946,12 +1946,12 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( pPool1 )
             {
-                nCount = pPool1->GetItemCount( XATTR_LINESTART );
-                sal_uInt16 nSurrogate2;
+                nCount = pPool1->GetItemCount2( XATTR_LINESTART );
+                sal_uInt32 nSurrogate2;
 
                 for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
                 {
-                    const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 );
+                    const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 );
 
                     if( pItem && pItem->GetName().Len() )
                     {
@@ -1971,10 +1971,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const
                     }
                 }
 
-                nCount = pPool1->GetItemCount( XATTR_LINEEND );
+                nCount = pPool1->GetItemCount2( XATTR_LINEEND );
                 for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 );
 
                     if( pItem && pItem->GetName().Len() )
                     {
@@ -2028,11 +2028,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XLineEndItem::XLineEndItem(INT32 nIndex)
+|*	  XLineEndItem::XLineEndItem(sal_Int32 nIndex)
 |*
 *************************************************************************/
 
-XLineEndItem::XLineEndItem(INT32 nIndex) 
+XLineEndItem::XLineEndItem(sal_Int32 nIndex) 
 :	NameOrIndex(XATTR_LINEEND, nIndex)
 {
 }
@@ -2116,11 +2116,11 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndItem(rIn);
 }
@@ -2131,7 +2131,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
@@ -2207,11 +2207,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
         const SfxItemPool* pPool1 = &pModel->GetItemPool();
         if( aUniqueName.Len() && pPool1 )
         {
-            nCount = pPool1->GetItemCount( XATTR_LINESTART );
+            nCount = pPool1->GetItemCount2( XATTR_LINESTART );
 
             for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
             {
-                const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate );
+                const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate );
 
                 if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
                 {
@@ -2229,11 +2229,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( !bForceNew )
             {
-                nCount = pPool1->GetItemCount( XATTR_LINEEND );
+                nCount = pPool1->GetItemCount2( XATTR_LINEEND );
 
                 for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate );
 
                     if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
                     {
@@ -2254,10 +2254,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
         const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL;
         if( aUniqueName.Len() && pPool2)
         {
-            nCount = pPool2->GetItemCount( XATTR_LINESTART );
+            nCount = pPool2->GetItemCount2( XATTR_LINESTART );
             for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
             {
-                const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate );
+                const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate );
 
                 if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
                 {
@@ -2275,10 +2275,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( !bForceNew )
             {
-                nCount = pPool2->GetItemCount( XATTR_LINEEND );
+                nCount = pPool2->GetItemCount2( XATTR_LINEEND );
                 for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate );
 
                     if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) )
                     {
@@ -2308,12 +2308,12 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
 
             if( pPool1 )
             {
-                nCount = pPool1->GetItemCount( XATTR_LINESTART );
-                sal_uInt16 nSurrogate2;
+                nCount = pPool1->GetItemCount2( XATTR_LINESTART );
+                sal_uInt32 nSurrogate2;
 
                 for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
                 {
-                    const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 );
+                    const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 );
 
                     if( pItem && pItem->GetName().Len() )
                     {
@@ -2333,10 +2333,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const
                     }
                 }
 
-                nCount = pPool1->GetItemCount( XATTR_LINEEND );
+                nCount = pPool1->GetItemCount2( XATTR_LINEEND );
                 for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ )
                 {
-                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 );
+                    const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 );
 
                     if( pItem && pItem->GetName().Len() )
                     {
@@ -2408,7 +2408,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
     }
 }
 
-bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2427,7 +2427,7 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId
     return true;
 }
 
-bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -2464,7 +2464,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
 
 /*************************************************************************
 |*
-|*	  XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
+|*	  XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth)
 |*
 *************************************************************************/
 
@@ -2497,12 +2497,12 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartWidthItem(rIn);
 }
@@ -2533,13 +2533,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
     }
 }
 
-bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -2589,11 +2589,11 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndWidthItem(rIn);
 }
@@ -2624,13 +2624,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
     }
 }
 
-bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -2646,11 +2646,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*	  XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter)
+|*	  XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter)
 |*
 *************************************************************************/
 
-XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
     SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
 {
 }
@@ -2679,12 +2679,12 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineStartCenterItem(rIn);
 }
@@ -2714,14 +2714,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
     }
 }
 
-bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
     return true;
 }
 
-bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
         return false;
@@ -2738,11 +2738,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*	  XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter)
+|*	  XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter)
 |*
 *************************************************************************/
 
-XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
     SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
 {
 }
@@ -2771,12 +2771,12 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineEndCenterItem(rIn);
 }
@@ -2806,14 +2806,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
     }
 }
 
-bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, ::getCppuBooleanType()  );
     return true;
 }
 
-bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
         return false;
@@ -2839,7 +2839,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
-    SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle))
+    SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
 {
 }
 
@@ -2867,11 +2867,11 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillStyleItem(rIn);
 }
@@ -2896,9 +2896,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
-            switch( (USHORT)GetValue() )
+            switch( (sal_uInt16)GetValue() )
             {
                 case XFILL_NONE:
                     nId = RID_SVXSTR_INVISIBLE;
@@ -2928,13 +2928,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-USHORT XFillStyleItem::GetValueCount() const
+sal_uInt16 XFillStyleItem::GetValueCount() const
 {
     return 5;
 }
 
 // -----------------------------------------------------------------------
-bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
 
@@ -2944,7 +2944,7 @@ bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
 }
 
 // -----------------------------------------------------------------------
-bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     ::com::sun::star::drawing::FillStyle eFS;
     if(!(rVal >>= eFS))
@@ -2956,7 +2956,7 @@ bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
         eFS = (::com::sun::star::drawing::FillStyle)nFS;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eFS ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
 
     return true;
 }
@@ -2969,11 +2969,11 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
 
 /*************************************************************************
 |*
-|*	  XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
+|*	  XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor)
 |*
 *************************************************************************/
 
-XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3013,11 +3013,11 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillColorItem(rIn);
 }
@@ -3048,7 +3048,7 @@ SfxItemPresentation XFillColorItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
 
@@ -3057,7 +3057,7 @@ bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
 
 // -----------------------------------------------------------------------
 
-bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue ))
@@ -3072,7 +3072,7 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
 // -----------------------------
 TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
 
-XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
     XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
 {
 }
@@ -3092,14 +3092,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const
     return new XSecondaryFillColorItem(*this);
 }
 
-SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     if ( nVer >= 2 )
         return new XSecondaryFillColorItem( rIn );
     else
         return new XSecondaryFillColorItem( String(), Color(0,184,255) );
 }
-USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
 {
     return 2;
 }
@@ -3152,15 +3152,15 @@ XGradient::XGradient() :
 /*************************************************************************
 |*
 |*    XGradient::XGradient(XGradientStyle, const Color&, const Color&,
-|*                         long, USHORT, USHORT, USHORT)
+|*                         long, sal_uInt16, sal_uInt16, sal_uInt16)
 |*
 *************************************************************************/
 
 XGradient::XGradient(const Color& rStart, const Color& rEnd,
-                     XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs,
-                     USHORT nYOfs, USHORT nTheBorder,
-                     USHORT nStartIntens, USHORT nEndIntens,
-                     USHORT nSteps) :
+                     XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+                     sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
+                     sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
+                     sal_uInt16 nSteps) :
     eStyle(eTheStyle),
     aStartColor(rStart),
     aEndColor(rEnd),
@@ -3202,12 +3202,12 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XFillGradientItem::XFillGradientItem(INT32 nIndex,
+|*	  XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
 |*										 const XGradient& rTheGradient)
 |*
 *************************************************************************/
 
-XFillGradientItem::XFillGradientItem(INT32 nIndex,
+XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
                                    const XGradient& rTheGradient) :
     NameOrIndex(XATTR_FILLGRADIENT, nIndex),
     aGradient(rTheGradient)
@@ -3246,31 +3246,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
 |*
 *************************************************************************/
 
-XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) :
+XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
     NameOrIndex(XATTR_FILLGRADIENT, rIn),
     aGradient(COL_BLACK, COL_WHITE)
 {
     if (!IsIndex())
     {
-        USHORT nUSTemp;
-        USHORT nRed;
-        USHORT nGreen;
-        USHORT nBlue;
-        INT16  nITemp;
-        INT32  nLTemp;
+        sal_uInt16 nUSTemp;
+        sal_uInt16 nRed;
+        sal_uInt16 nGreen;
+        sal_uInt16 nBlue;
+        sal_Int16  nITemp;
+        sal_Int32  nLTemp;
 
         rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp);
         rIn >> nRed;
         rIn >> nGreen;
         rIn >> nBlue;
         Color aCol;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aGradient.SetStartColor( aCol );
 
         rIn >> nRed;
         rIn >> nGreen;
         rIn >> nBlue;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aGradient.SetEndColor(aCol);
         rIn >> nLTemp; aGradient.SetAngle(nLTemp);
         rIn >> nUSTemp; aGradient.SetBorder(nUSTemp);
@@ -3328,11 +3328,11 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 {
     return new XFillGradientItem(rIn, nVer);
 }
@@ -3343,15 +3343,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
 |*
 *************************************************************************/
 
-SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16)aGradient.GetGradientStyle();
+        rOut << (sal_Int16)aGradient.GetGradientStyle();
 
-        USHORT nTmp;
+        sal_uInt16 nTmp;
 
         nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp;
@@ -3360,7 +3360,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
         nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp;
 
-        rOut << (INT32) aGradient.GetAngle();
+        rOut << (sal_Int32) aGradient.GetAngle();
         rOut << aGradient.GetBorder();
         rOut << aGradient.GetXOffset();
         rOut << aGradient.GetYOffset();
@@ -3390,11 +3390,11 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
 
 /*************************************************************************
 |*
-|*	  USHORT XFillGradientItem::GetVersion() const
+|*	  sal_uInt16 XFillGradientItem::GetVersion() const
 |*
 *************************************************************************/
 
-USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     // !!! this version number also represents the version number of superclasses
     // !!! (e.g. XFillFloatTransparenceItem); if you make any changes here,
@@ -3427,7 +3427,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
 }
 
 // -----------------------------------------------------------------------
-bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3441,8 +3441,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
 
             const XGradient& aXGradient = GetGradientValue();
             aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
-            aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-            aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+            aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+            aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
             aGradient2.Border = aXGradient.GetBorder();
             aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3467,8 +3467,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
             ::com::sun::star::awt::Gradient aGradient2;
 
             aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
-            aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
-            aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+            aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+            aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
             aGradient2.Border = aXGradient.GetBorder();
             aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3507,7 +3507,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
 }
 
 // -----------------------------------------------------------------------
-bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -3651,7 +3651,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
     return true;
 }
 
-BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
 }
@@ -3687,14 +3687,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
 // -----------------------------------------------------------------------------
 
 XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
-    bEnabled( FALSE )
+    bEnabled( sal_False )
 {
     SetWhich( XATTR_FILLFLOATTRANSPARENCE );
 }
 
 //------------------------------------------------------------------------
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
     XFillGradientItem	( nIndex, rGradient ),
     bEnabled			( bEnable )
 {
@@ -3703,7 +3703,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra
 
 //------------------------------------------------------------------------
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
     XFillGradientItem	( rName, rGradient ),
     bEnabled			( bEnable )
 {
@@ -3721,7 +3721,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
 
 //------------------------------------------------------------------------
 
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) :
+//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
 //	XFillGradientItem	( rIn, nVer )
 //{
 //	SetWhich( XATTR_FILLFLOATTRANSPARENCE );
@@ -3730,7 +3730,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
 
 //*************************************************************************
 
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
 : 	XFillGradientItem	( -1, rTheGradient ),
     bEnabled			( bEnable )
 {
@@ -3762,14 +3762,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
 
 //------------------------------------------------------------------------
 
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 //{
 //	return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) );
 //}
 
 //------------------------------------------------------------------------
 
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 //{
 //	XFillGradientItem::Store( rOut, nItemVersion );
 //	rOut << bEnabled;
@@ -3778,7 +3778,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
 
 //------------------------------------------------------------------------
 
-USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
 {
     // !!! if version number of this object must be increased, please	!!!
     // !!! increase version number of base class XFillGradientItem		!!!
@@ -3787,14 +3787,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
 
 //------------------------------------------------------------------------
 
-bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     return XFillGradientItem::QueryValue( rVal, nMemberId );
 }
 
 //------------------------------------------------------------------------
 
-bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     return XFillGradientItem::PutValue( rVal, nMemberId );
 }
@@ -3809,7 +3809,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation(	SfxItemPresenta
     return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
 }
 
-BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return	((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
             ((XFillFloatTransparenceItem*)p1)->GetGradientValue()  == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -3833,7 +3833,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
             // if the given name is not valid, replace it!
             if( aUniqueName != GetName() )
             {
-                return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE );
+                return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
             }
         }
     }
@@ -3842,7 +3842,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
         // #85953# if disabled, force name to empty string
         if(GetName().Len())
         {
-            return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE);
+            return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
         }
     }
 
@@ -3890,12 +3890,12 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
 
 /*************************************************************************
 |*
-|*	  XFillHatchItem::XFillHatchItem(INT32 nIndex,
+|*	  XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
 |*								   const XHatch& rTheHatch)
 |*
 *************************************************************************/
 
-XFillHatchItem::XFillHatchItem(INT32 nIndex,
+XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
                              const XHatch& rTheHatch) :
     NameOrIndex(XATTR_FILLHATCH, nIndex),
     aHatch(rTheHatch)
@@ -3940,11 +3940,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
 {
     if (!IsIndex())
     {
-        USHORT nRed;
-        USHORT nGreen;
-        USHORT nBlue;
-        INT16  nITemp;
-        INT32  nLTemp;
+        sal_uInt16 nRed;
+        sal_uInt16 nGreen;
+        sal_uInt16 nBlue;
+        sal_Int16  nITemp;
+        sal_Int32  nLTemp;
 
         rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp);
         rIn >> nRed;
@@ -3952,7 +3952,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
         rIn >> nBlue;
 
         Color aCol;
-        aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+        aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
         aHatch.SetColor(aCol);
         rIn >> nLTemp; aHatch.SetDistance(nLTemp);
         rIn >> nLTemp; aHatch.SetAngle(nLTemp);
@@ -3999,11 +3999,11 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillHatchItem(rIn);
 }
@@ -4014,21 +4014,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 *************************************************************************/
 
-SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16)aHatch.GetHatchStyle();
+        rOut << (sal_Int16)aHatch.GetHatchStyle();
 
-        USHORT nTmp;
+        sal_uInt16 nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp;
         nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp;
 
-        rOut << (INT32) aHatch.GetDistance();
-        rOut << (INT32) aHatch.GetAngle();
+        rOut << (sal_Int32) aHatch.GetDistance();
+        rOut << (sal_Int32) aHatch.GetAngle();
     }
 
     return rOut;
@@ -4088,7 +4088,7 @@ bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
 }
 
 // -----------------------------------------------------------------------
-bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4152,7 +4152,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI
 }
 
 // -----------------------------------------------------------------------
-bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -4248,7 +4248,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMem
     return true;
 }
 
-BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
 }
@@ -4291,7 +4291,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
 *************************************************************************/
 
 XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
-    SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle))
+    SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
 {
 }
 
@@ -4319,11 +4319,11 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStyleItem(rIn);
 }
@@ -4334,7 +4334,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextStyleItem::GetValueCount() const
+sal_uInt16 XFormTextStyleItem::GetValueCount() const
 {
     return 5;
 }
@@ -4346,7 +4346,7 @@ USHORT XFormTextStyleItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
@@ -4359,11 +4359,11 @@ bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return true;
 }
@@ -4380,7 +4380,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
 *************************************************************************/
 
 XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
-    SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust))
+    SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
 {
 }
 
@@ -4408,11 +4408,11 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextAdjustItem(rIn);
 }
@@ -4423,7 +4423,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextAdjustItem::GetValueCount() const
+sal_uInt16 XFormTextAdjustItem::GetValueCount() const
 {
     return 4;
 }
@@ -4435,7 +4435,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
@@ -4448,11 +4448,11 @@ bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return true;
 }
@@ -4497,11 +4497,11 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextDistanceItem(rIn);
 }
@@ -4546,11 +4546,11 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStartItem(rIn);
 }
@@ -4562,11 +4562,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*	  XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror)
+|*	  XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror)
 |*
 *************************************************************************/
 
-XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
     SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
 {
 }
@@ -4595,12 +4595,12 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextMirrorItem(rIn);
 }
@@ -4617,7 +4617,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
     SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
 {
 }
@@ -4646,12 +4646,12 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextOutlineItem(rIn);
 }
@@ -4669,7 +4669,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
 
 XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
     SfxEnumItem(
-        XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow))
+        XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow))
 {
 }
 
@@ -4697,11 +4697,11 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowItem(rIn);
 }
@@ -4713,7 +4713,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextShadowItem::GetValueCount() const
+sal_uInt16 XFormTextShadowItem::GetValueCount() const
 {
     return 3;
 }
@@ -4725,7 +4725,7 @@ USHORT XFormTextShadowItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
@@ -4738,11 +4738,11 @@ bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return true;
 }
@@ -4758,7 +4758,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
 |*
 *************************************************************************/
 
-XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
                                                      const Color& rTheColor) :
     XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
 {
@@ -4800,11 +4800,11 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowColorItem(rIn);
 }
@@ -4849,11 +4849,11 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowXValItem(rIn);
 }
@@ -4898,11 +4898,11 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowYValItem(rIn);
 }
@@ -4920,7 +4920,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
 
 XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
     SfxEnumItem(
-        XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm))
+        XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
 {
 }
 
@@ -4948,11 +4948,11 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextStdFormItem(rIn);
 }
@@ -4964,7 +4964,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
 |*
 \*************************************************************************/
 
-USHORT XFormTextStdFormItem::GetValueCount() const
+sal_uInt16 XFormTextStdFormItem::GetValueCount() const
 {
     return 3;
 }
@@ -4976,7 +4976,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
@@ -4989,11 +4989,11 @@ bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
 \*************************************************************************/
 
 // #FontWork#
-bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
-    SetValue(sal::static_int_cast< USHORT >(nValue));
+    SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
 
     return true;
 }
@@ -5009,7 +5009,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
 |*
 *************************************************************************/
 
-XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
     SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
 {
 }
@@ -5038,12 +5038,12 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer)
+|*	  SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer)
 |*												const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextHideFormItem(rIn);
 }
@@ -5107,7 +5107,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
                                     XATTR_LINE_FIRST, XATTR_LINE_LAST);
@@ -5121,7 +5121,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
 |*
 \************************************************************************/
 
-SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
 {
     return SfxSetItem::Store( rStream, nItemVersion );
 }
@@ -5180,7 +5180,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const
 |*
 \************************************************************************/
 
-SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
 {
     SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
                                     XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -5194,7 +5194,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
 |*
 \************************************************************************/
 
-SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
 {
     return SfxSetItem::Store( rStream, nItemVersion );
 }
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index c552d74ad3..b4a7805fad 100644..100755
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/Any.hxx>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
@@ -53,11 +53,11 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*	  XLineTransparenceItem::XLineTransparenceItem(USHORT)
+|*	  XLineTransparenceItem::XLineTransparenceItem(sal_uInt16)
 |*
 *************************************************************************/
 
-XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) :
+XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
     SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
 {
 }
@@ -86,11 +86,11 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XLineTransparenceItem(rIn);
 }
@@ -115,7 +115,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) );
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -132,7 +132,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
 // -----------------------------------------------------------------------------
 
 XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) :
-    SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint))
+    SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
 {
 }
 
@@ -145,14 +145,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) :
 
 // -----------------------------------------------------------------------------
 
-USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     return 1;
 }
 
 // -----------------------------------------------------------------------------
 
-SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
 {
     XLineJointItem* pRet = new XLineJointItem( rIn );
 
@@ -183,7 +183,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
         case SFX_ITEM_PRESENTATION_COMPLETE:
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            USHORT nId = 0;
+            sal_uInt16 nId = 0;
 
             switch( GetValue() )
             {
@@ -223,7 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
 
 // -----------------------------------------------------------------------------
 
-bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
 
@@ -253,7 +253,7 @@ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe
 
 // -----------------------------------------------------------------------------
 
-bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     XLineJoint eJoint = XLINEJOINT_NONE;
     ::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -285,14 +285,14 @@ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
         break;
     }
 
-    SetValue( sal::static_int_cast< USHORT >( eJoint ) );
+    SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) );
 
     return true;
 }
 
 // -----------------------------------------------------------------------------
 
-USHORT XLineJointItem::GetValueCount() const
+sal_uInt16 XLineJointItem::GetValueCount() const
 {
     // don't forget to update the api interface also
     return 5;
@@ -305,11 +305,11 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*	  XFillTransparenceItem::XFillTransparenceItem(USHORT)
+|*	  XFillTransparenceItem::XFillTransparenceItem(sal_uInt16)
 |*
 *************************************************************************/
 
-XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) :
+XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
     SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
 {
 }
@@ -338,11 +338,11 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillTransparenceItem(rIn);
 }
@@ -367,7 +367,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -382,11 +382,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*	  XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT)
+|*	  XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16)
 |*
 *************************************************************************/
 
-XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) :
+XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
     SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
 {
 }
@@ -415,11 +415,11 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFormTextShadowTranspItem(rIn);
 }
@@ -432,11 +432,11 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
 
 /*************************************************************************
 |*
-|*	  XGradientStepCountItem::XGradientStepCountItem( USHORT )
+|*	  XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 )
 |*
 *************************************************************************/
 
-XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) :
+XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
     SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
 {
 }
@@ -465,11 +465,11 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XGradientStepCountItem( rIn );
 }
@@ -494,7 +494,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //			rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
 //			rText += ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
@@ -507,7 +507,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
 
-XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
             SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
 {
 }
@@ -522,7 +522,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpTileItem( *this );
 }
 
-SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileItem( rIn );
 }
@@ -556,7 +556,7 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation
 TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
 
 XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
-    SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) )
+    SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
 {
 }
 
@@ -570,7 +570,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpPosItem( *this );
 }
 
-SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosItem( rIn );
 }
@@ -597,7 +597,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
     }
 }
 
-USHORT XFillBmpPosItem::GetValueCount() const
+sal_uInt16 XFillBmpPosItem::GetValueCount() const
 {
     return 9;
 }
@@ -623,7 +623,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpSizeXItem( *this );
 }
 
-SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeXItem( rIn );
 }
@@ -676,7 +676,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpSizeYItem( *this );
 }
 
-SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeYItem( rIn );
 }
@@ -719,7 +719,7 @@ bool XFillBmpSizeYItem::HasMetrics() const
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
 
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
             SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
 {
 }
@@ -734,7 +734,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpSizeLogItem( *this );
 }
 
-SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpSizeLogItem( rIn );
 }
@@ -767,7 +767,7 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
 
-XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) :
+XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
             SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
 {
 }
@@ -782,7 +782,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpTileOffsetXItem( *this );
 }
 
-SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileOffsetXItem( rIn );
 }
@@ -815,7 +815,7 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
 
-XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) :
+XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
             SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
 {
 }
@@ -830,7 +830,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpTileOffsetYItem( *this );
 }
 
-SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpTileOffsetYItem( rIn );
 }
@@ -863,7 +863,7 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
 
-XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
             SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
 {
 }
@@ -878,7 +878,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpStretchItem( *this );
 }
 
-SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpStretchItem( rIn );
 }
@@ -911,7 +911,7 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
 
-XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) :
+XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
 {
 }
@@ -926,7 +926,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpPosOffsetXItem( *this );
 }
 
-SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosOffsetXItem( rIn );
 }
@@ -959,7 +959,7 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation
 //------------------------------
 TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
 
-XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) :
+XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
             SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
 {
 }
@@ -974,7 +974,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
     return new XFillBmpPosOffsetYItem( *this );
 }
 
-SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBmpPosOffsetYItem( rIn );
 }
@@ -1008,11 +1008,11 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
 
 /*************************************************************************
 |*
-|*	  XFillBackgroundItem::XFillBackgroundItem( BOOL )
+|*	  XFillBackgroundItem::XFillBackgroundItem( sal_Bool )
 |*
 *************************************************************************/
 
-XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
     SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
 {
 }
@@ -1041,11 +1041,11 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
 
 /*************************************************************************
 |*
-|*	  SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+|*	  SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new XFillBackgroundItem( rIn );
 }
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index deb7e51a27..ec095f82eb 100644..100755
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -39,13 +39,13 @@
 #include <editeng/memberids.hrc>
 
 #include <svx/dialogs.hrc>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
 
-#include "unoapi.hxx"
+#include "svx/unoapi.hxx"
 #include <svx/svdmodel.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
@@ -67,7 +67,7 @@ XOBitmap::XOBitmap() :
     eType			( XBITMAP_NONE ),
     eStyle			( XBITMAP_STRETCH ),
     pPixelArray		( NULL ),
-    bGraphicDirty	( FALSE )
+    bGraphicDirty	( sal_False )
 {
 }
 
@@ -82,7 +82,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) :
     eStyle			( eInStyle ),
     aGraphicObject	( rBmp ),
     pPixelArray		( NULL ),
-    bGraphicDirty	( FALSE )
+    bGraphicDirty	( sal_False )
 {
 }
 
@@ -97,19 +97,19 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
     eStyle			( eInStyle ),
     aGraphicObject	( rGraphicObject ),
     pPixelArray		( NULL ),
-    bGraphicDirty	( FALSE )
+    bGraphicDirty	( sal_False )
 {
 }
 
 /*************************************************************************
 |*
-|*    XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor,
+|*    XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor,
 |*          const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
 |*          XBitmapStyle eStyle = XBITMAP_TILE )
 |*
 *************************************************************************/
 
-XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
+XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor,
             const Color& rBckgrColor, const Size& rSize,
             XBitmapStyle eInStyle ) :
     eStyle			( eInStyle ),
@@ -117,15 +117,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
     aArraySize		( rSize ),
     aPixelColor		( rPixelColor ),
     aBckgrColor		( rBckgrColor ),
-    bGraphicDirty	( TRUE )
+    bGraphicDirty	( sal_True )
 
 {
     if( aArraySize.Width() == 8 && aArraySize.Height() == 8 )
     {
         eType = XBITMAP_8X8;
-        pPixelArray = new USHORT[ 64 ];
+        pPixelArray = new sal_uInt16[ 64 ];
 
-        for( USHORT i = 0; i < 64; i++ )
+        for( sal_uInt16 i = 0; i < 64; i++ )
             *( pPixelArray + i ) = *( pArray + i );
     }
     else
@@ -155,9 +155,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
     {
         if( eType == XBITMAP_8X8 )
         {
-            pPixelArray = new USHORT[ 64 ];
+            pPixelArray = new sal_uInt16[ 64 ];
 
-            for( USHORT i = 0; i < 64; i++ )
+            for( sal_uInt16 i = 0; i < 64; i++ )
                 *( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
         }
     }
@@ -195,9 +195,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
     {
         if( eType == XBITMAP_8X8 )
         {
-            pPixelArray = new USHORT[ 64 ];
+            pPixelArray = new sal_uInt16[ 64 ];
 
-            for( USHORT i = 0; i < 64; i++ )
+            for( sal_uInt16 i = 0; i < 64; i++ )
                 *( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
         }
     }
@@ -220,40 +220,40 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
         aBckgrColor != rXOBitmap.aBckgrColor ||
         bGraphicDirty != rXOBitmap.bGraphicDirty )
     {
-        return( FALSE );
+        return( sal_False );
     }
 
     if( pPixelArray && rXOBitmap.pPixelArray )
     {
-        USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() );
-        for( USHORT i = 0; i < nCount; i++ )
+        sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() );
+        for( sal_uInt16 i = 0; i < nCount; i++ )
         {
             if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
-                return( FALSE );
+                return( sal_False );
         }
     }
-    return( TRUE );
+    return( sal_True );
 }
 
 /*************************************************************************
 |*
-|*    void SetPixelArray( const USHORT* pArray )
+|*    void SetPixelArray( const sal_uInt16* pArray )
 |*
 *************************************************************************/
 
-void XOBitmap::SetPixelArray( const USHORT* pArray )
+void XOBitmap::SetPixelArray( const sal_uInt16* pArray )
 {
     if( eType == XBITMAP_8X8 )
     {
         if( pPixelArray )
             delete []pPixelArray;
 
-        pPixelArray = new USHORT[ 64 ];
+        pPixelArray = new sal_uInt16[ 64 ];
 
-        for( USHORT i = 0; i < 64; i++ )
+        for( sal_uInt16 i = 0; i < 64; i++ )
             *( pPixelArray + i ) = *( pArray + i );
 
-        bGraphicDirty = TRUE;
+        bGraphicDirty = sal_True;
     }
     else
     {
@@ -298,12 +298,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const
 void XOBitmap::Bitmap2Array()
 {
     VirtualDevice   aVD;
-    BOOL            bPixelColor = FALSE;
+    sal_Bool            bPixelColor = sal_False;
     const Bitmap	aBitmap( GetBitmap() );
-    const USHORT	nLines = 8; // von Type abhaengig
+    const sal_uInt16	nLines = 8; // von Type abhaengig
 
     if( !pPixelArray )
-        pPixelArray = new USHORT[ nLines * nLines ];
+        pPixelArray = new sal_uInt16[ nLines * nLines ];
 
     aVD.SetOutputSizePixel( aBitmap.GetSizePixel() );
     aVD.DrawBitmap( Point(), aBitmap );
@@ -311,9 +311,9 @@ void XOBitmap::Bitmap2Array()
 
     // Aufbau des Arrays und Ermittlung der Vorder-, bzw.
     // Hintergrundfarbe
-    for( USHORT i = 0; i < nLines; i++ )
+    for( sal_uInt16 i = 0; i < nLines; i++ )
     {
-        for( USHORT j = 0; j < nLines; j++ )
+        for( sal_uInt16 j = 0; j < nLines; j++ )
         {
             if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor )
                 *( pPixelArray + j + i * nLines ) = 0;
@@ -323,7 +323,7 @@ void XOBitmap::Bitmap2Array()
                 if( !bPixelColor )
                 {
                     aPixelColor = aVD.GetPixel( Point( j, i ) );
-                    bPixelColor = TRUE;
+                    bPixelColor = sal_True;
                 }
             }
         }
@@ -342,7 +342,7 @@ void XOBitmap::Bitmap2Array()
 void XOBitmap::Array2Bitmap()
 {
     VirtualDevice   aVD;
-    USHORT          nLines = 8; // von Type abhaengig
+    sal_uInt16          nLines = 8; // von Type abhaengig
 
     if( !pPixelArray )
         return;
@@ -350,9 +350,9 @@ void XOBitmap::Array2Bitmap()
     aVD.SetOutputSizePixel( Size( nLines, nLines ) );
 
     // Aufbau der Bitmap
-    for( USHORT i = 0; i < nLines; i++ )
+    for( sal_uInt16 i = 0; i < nLines; i++ )
     {
-        for( USHORT j = 0; j < nLines; j++ )
+        for( sal_uInt16 j = 0; j < nLines; j++ )
         {
             if( *( pPixelArray + j + i * nLines ) == 0 )
                 aVD.DrawPixel( Point( j, i ), aBckgrColor );
@@ -362,7 +362,7 @@ void XOBitmap::Array2Bitmap()
     }
 
     aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
-    bGraphicDirty = FALSE;
+    bGraphicDirty = sal_False;
 }
 
 // -----------------------
@@ -416,7 +416,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) :
 |*
 *************************************************************************/
 
-XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
+XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) :
     NameOrIndex( XATTR_FILLBITMAP, rIn )
 {
     if( nVer == 0 )
@@ -445,7 +445,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
     {
         if (!IsIndex())
         {
-            INT16 iTmp;
+            sal_Int16 iTmp;
             rIn >> iTmp;
             aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp );
             rIn >> iTmp;
@@ -459,10 +459,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
             }
             else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
             {
-                USHORT* pArray = new USHORT[ 64 ];
+                sal_uInt16* pArray = new sal_uInt16[ 64 ];
                 Color   aColor;
 
-                for( USHORT i = 0; i < 64; i++ )
+                for( sal_uInt16 i = 0; i < 64; i++ )
                     rIn >> *( pArray + i );
                 aXOBitmap.SetPixelArray( pArray );
 
@@ -520,11 +520,11 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
 
 /*************************************************************************
 |*
-|*    SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+|*    SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 |*
 *************************************************************************/
 
-SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
 {
     return new XFillBitmapItem( rIn, nVer );
 }
@@ -535,22 +535,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
 |*
 *************************************************************************/
 
-SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 {
     NameOrIndex::Store( rOut, nItemVersion );
 
     if (!IsIndex())
     {
-        rOut << (INT16) aXOBitmap.GetBitmapStyle();
+        rOut << (sal_Int16) aXOBitmap.GetBitmapStyle();
         if( !aXOBitmap.GetBitmap() )
-            rOut << (INT16) XBITMAP_NONE;
+            rOut << (sal_Int16) XBITMAP_NONE;
         else
         {
-            rOut << (INT16) aXOBitmap.GetBitmapType();
+            rOut << (sal_Int16) aXOBitmap.GetBitmapType();
             if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT )
             {
-                const USHORT    nOldComprMode = rOut.GetCompressMode();
-                USHORT          nNewComprMode = nOldComprMode;
+                const sal_uInt16    nOldComprMode = rOut.GetCompressMode();
+                sal_uInt16          nNewComprMode = nOldComprMode;
 
                 if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 )
                     nNewComprMode |= COMPRESSMODE_ZBITMAP;
@@ -563,9 +563,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
             }
             else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
             {
-                USHORT* pArray = aXOBitmap.GetPixelArray();
-                for( USHORT i = 0; i < 64; i++ )
-                    rOut << (USHORT) *( pArray + i );
+                sal_uInt16* pArray = aXOBitmap.GetPixelArray();
+                for( sal_uInt16 i = 0; i < 64; i++ )
+                    rOut << (sal_uInt16) *( pArray + i );
 
                 rOut << aXOBitmap.GetPixelColor();
                 rOut << aXOBitmap.GetBackgroundColor();
@@ -593,11 +593,11 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
 
 /*************************************************************************
 |*
-|*    USHORT XFillBitmapItem::GetVersion() const
+|*    sal_uInt16 XFillBitmapItem::GetVersion() const
 |*
 *************************************************************************/
 
-USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
 {
     // 2. Version
     return( 1 );
@@ -629,7 +629,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -695,7 +695,7 @@ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMember
 
 //------------------------------------------------------------------------
 
-bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
     nMemberId &= ~CONVERT_TWIPS;
@@ -778,7 +778,7 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMe
     return (bSetName || bSetURL || bSetBitmap);
 }
 
-BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
 {
     return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() ==
            ((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 5335967f37..b7d3766a9e 100644..100755
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -40,7 +40,7 @@
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
-#include "xexch.hxx"
+#include "svx/xexch.hxx"
 
 
 TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream );
@@ -85,7 +85,7 @@ XFillExchangeData::~XFillExchangeData()
 |*
 |*
 *************************************************************************/
-ULONG XFillExchangeData::RegisterClipboardFormatName()
+sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName()
 {
     return( SOT_FORMATSTR_ID_XFA );
 }
@@ -101,7 +101,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
     if( rData.pXFillAttrSetItem )
     {
         SfxWhichIter		aIter( rData.pXFillAttrSetItem->GetItemSet() );
-        USHORT				nWhich = aIter.FirstWhich();
+        sal_uInt16				nWhich = aIter.FirstWhich();
         const SfxPoolItem*	pItem;
         sal_uInt32 			nItemCount = 0;
         sal_Size 			nFirstPos = rOStm.Tell();
@@ -110,10 +110,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
         
         while( nWhich )
         {
-            if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) )
+            if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
             {
                 VersionCompat	aCompat( rOStm, STREAM_WRITE );
-                const USHORT	nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() );
+                const sal_uInt16	nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
 
                 rOStm << nWhich << nItemVersion2;
                 pItem->Store( rOStm, nItemVersion2 );
@@ -124,7 +124,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
             nWhich = aIter.NextWhich();
         }
 
-        const ULONG nLastPos = rOStm.Tell();
+        const sal_uIntPtr nLastPos = rOStm.Tell();
         rOStm.Seek( nFirstPos );
         rOStm << nItemCount;
         rOStm.Seek( nLastPos );
@@ -147,7 +147,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
     SfxItemSet*		pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST );
     SfxPoolItem*	pNewItem;
     sal_uInt32 		nItemCount = 0;
-    USHORT			nWhich, nItemVersion;
+    sal_uInt16			nWhich, nItemVersion;
 
     rIStm >> nItemCount;
 
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 36abdb07cf..e46545ed46 100644..100755
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/xtable.hxx>
-#include "xattr.hxx"
+#include "svx/xattr.hxx"
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
@@ -53,8 +53,8 @@ XOutdevItemPool::XOutdevItemPool(
     const XubString aNullStr;
     const Bitmap aNullBmp;
     const basegfx::B2DPolyPolygon aNullPol;
-    const Color aNullLineCol(RGB_Color(COL_BLACK));
-    const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING));  // "Blue 8"
+    const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
+    const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING));
     const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
     const XDash aNullDash;
     const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE));
@@ -109,7 +109,7 @@ XOutdevItemPool::XOutdevItemPool(
     mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH		-XATTR_START] = new XFillBmpStretchItem;
     mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX		-XATTR_START] = new XFillBmpPosOffsetXItem;
     mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY		-XATTR_START] = new XFillBmpPosOffsetYItem;
-    mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE	-XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, FALSE );
+    mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE	-XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False );
     mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR		-XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
     mppLocalPoolDefaults[XATTR_FILLBACKGROUND			-XATTR_START] = new XFillBackgroundItem;
     mppLocalPoolDefaults[XATTR_FORMTXTSTYLE       -XATTR_START] = new XFormTextStyleItem;
@@ -179,12 +179,12 @@ XOutdevItemPool::XOutdevItemPool(
 /*************************************************************************
 |*
 |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|*            (Parameter 2 = TRUE)
+|*            (Parameter 2 = sal_True)
 |*
 \************************************************************************/
 
 XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool) 
-:	SfxItemPool(rPool, TRUE),
+:	SfxItemPool(rPool, sal_True),
     mppLocalPoolDefaults(0L),
     mpLocalItemInfos(0L)
 {
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 85271170cd..124428868b 100644..100755
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -32,7 +32,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
@@ -74,7 +74,7 @@ static char const aChckXML[]     = { 'P', 'K', 0x03, 0x04 };		// = 6.0
 
 XBitmapTable::XBitmapTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -109,35 +109,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const
 
 /************************************************************************/
 
-BOOL XBitmapTable::Load()
+sal_Bool XBitmapTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::Save()
+sal_Bool XBitmapTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::Create()
+sal_Bool XBitmapTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapTable::CreateBitmapsForUI()
+sal_Bool XBitmapTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -154,7 +154,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
 
 XBitmapList::XBitmapList( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyList( rPath, pInPool, nInitSize, nReSize)
 {
     // pBmpList = new List( nInitSize, nReSize );
@@ -189,18 +189,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const
 
 /************************************************************************/
 
-BOOL XBitmapList::Load()
+sal_Bool XBitmapList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -211,19 +211,19 @@ BOOL XBitmapList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XBitmapList::Save()
+sal_Bool XBitmapList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -238,7 +238,7 @@ BOOL XBitmapList::Save()
 /************************************************************************/
 // Umgestellt am 27.07.95 auf XBitmap
 
-BOOL XBitmapList::Create()
+sal_Bool XBitmapList::Create()
 {
     // Array der Bitmap
     //-----------------------
@@ -254,7 +254,7 @@ BOOL XBitmapList::Create()
     String	aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
     Color	aColWhite( RGB_Color( COL_WHITE ) );
     xub_StrLen nLen;
-    USHORT	aArray[64];
+    sal_uInt16	aArray[64];
 
     memset( aArray, 0, sizeof( aArray ) );
     aStr.AppendAscii(" 1");
@@ -276,19 +276,19 @@ BOOL XBitmapList::Create()
     aStr.SetChar(nLen, sal_Unicode('4'));
     Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) );
 
-    return( TRUE );
+    return( sal_True );
 }
 
 /************************************************************************/
 
-BOOL XBitmapList::CreateBitmapsForUI()
+sal_Bool XBitmapList::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index a79f663669..512fe6a4bf 100644..100755
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -32,7 +32,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <unotools/pathoptions.hxx>
@@ -75,7 +75,7 @@ static XColorTable* pTable=0;
 
 XColorTable::XColorTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     // ColorTable braucht keine eigene BmpTable
@@ -118,18 +118,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const
 
 /************************************************************************/
 
-BOOL XColorTable::Load()
+sal_Bool XColorTable::Load()
 {
     if( bTableDirty )
     {
-        bTableDirty = FALSE;
+        bTableDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -140,19 +140,19 @@ BOOL XColorTable::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorTable::Save()
+sal_Bool XColorTable::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -166,13 +166,13 @@ BOOL XColorTable::Save()
 
 /************************************************************************/
 
-BOOL XColorTable::Create()
+sal_Bool XColorTable::Create()
 {
     XubString aStr;
     xub_StrLen nLen;
     ResMgr& rRes = DIALOG_MGR();
 
-    static USHORT const aResId[] =
+    static sal_uInt16 aResId[] =
     {
         RID_SVXSTR_BLACK,
         RID_SVXSTR_BLUE,
@@ -221,7 +221,7 @@ BOOL XColorTable::Create()
         COL_WHITE
     };
 
-    for( USHORT n = 0; n < 16; ++n )
+    for( sal_uInt16 n = 0; n < 16; ++n )
     {
         Insert( n, new XColorEntry( Color( aColTab[n] ),
                                     String( ResId( aResId[ n ], rRes )) ) );
@@ -455,14 +455,14 @@ BOOL XColorTable::Create()
 
 /************************************************************************/
 
-BOOL XColorTable::CreateBitmapsForUI()
+sal_Bool XColorTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -479,7 +479,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
 
 XColorList::XColorList( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyList( rPath, pInPool, nInitSize, nReSize)
 {
     // pBmpList = new List( nInitSize, nReSize );
@@ -514,35 +514,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const
 
 /************************************************************************/
 
-BOOL XColorList::Load()
+sal_Bool XColorList::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::Save()
+sal_Bool XColorList::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::Create()
+sal_Bool XColorList::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XColorList::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3e1134d432..3d215b6352 100644..100755
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
@@ -88,7 +88,7 @@ char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
 XDashTable::XDashTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -123,35 +123,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const
 
 /************************************************************************/
 
-BOOL XDashTable::Load()
+sal_Bool XDashTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::Save()
+sal_Bool XDashTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::Create()
+sal_Bool XDashTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XDashTable::CreateBitmapsForUI()
+sal_Bool XDashTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -270,18 +270,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const
     return (XDashEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XDashList::Load()
+sal_Bool XDashList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -292,17 +292,17 @@ BOOL XDashList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XDashList::Save()
+sal_Bool XDashList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -314,7 +314,7 @@ BOOL XDashList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XDashList::Create()
+sal_Bool XDashList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
     xub_StrLen nLen;
@@ -327,16 +327,16 @@ BOOL XDashList::Create()
     aStr.SetChar(nLen, sal_Unicode('3'));
     Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XDashList::CreateBitmapsForUI()
+sal_Bool XDashList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -345,10 +345,10 @@ BOOL XDashList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 54454a7658..bbdac48050 100644..100755
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
@@ -85,7 +85,7 @@ char const aChckXML[]       = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
 XGradientTable::XGradientTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -120,35 +120,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
 
 /************************************************************************/
 
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -257,18 +257,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
     return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
 }
 
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -280,17 +280,17 @@ BOOL XGradientList::Load()
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -302,7 +302,7 @@ BOOL XGradientList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
     xub_StrLen nLen;
@@ -321,16 +321,16 @@ BOOL XGradientList::Create()
     aStr.SetChar(nLen, sal_Unicode('6'));
     Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT	  , 1900,60,60,50,100,100),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -339,10 +339,10 @@ BOOL XGradientList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( FALSE );
+    return( sal_False );
 }
 
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index a35389ee8f..67f5fe0f8c 100644..100755
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 
@@ -51,7 +51,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
-#include "dlgutil.hxx"
+#include "svx/dlgutil.hxx"
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfillit0.hxx>
@@ -83,7 +83,7 @@ char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
 XHatchTable::XHatchTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -118,35 +118,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const
 
 /************************************************************************/
 
-BOOL XHatchTable::Load()
+sal_Bool XHatchTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::Save()
+sal_Bool XHatchTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::Create()
+sal_Bool XHatchTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XHatchTable::CreateBitmapsForUI()
+sal_Bool XHatchTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
@@ -265,18 +265,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const
     return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XHatchList::Load()
+sal_Bool XHatchList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -287,17 +287,17 @@ BOOL XHatchList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XHatchList::Save()
+sal_Bool XHatchList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -309,7 +309,7 @@ BOOL XHatchList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XHatchList::Create()
+sal_Bool XHatchList::Create()
 {
     XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
     xub_StrLen nLen;
@@ -322,16 +322,16 @@ BOOL XHatchList::Create()
     aStr.SetChar(nLen, sal_Unicode('3'));
     Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120,  0),aStr));
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XHatchList::CreateBitmapsForUI()
+sal_Bool XHatchList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
@@ -340,10 +340,10 @@ BOOL XHatchList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 9feadc9e44..18b46663d4 100644..100755
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -58,19 +58,19 @@ Color RGB_Color( ColorData nColorName )
 
 XPropertyTable::XPropertyTable( const String& rPath,
                                 XOutdevItemPool* pInPool,
-                                USHORT nInitSize, USHORT nReSize ) :
+                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
             aName			( pszStandard, 8 ),
             aPath			( rPath ),
             pXPool			( pInPool ),
             aTable			( nInitSize, nReSize ),
             pBmpTable		( NULL ),
-            bTableDirty		( TRUE ),
-            bBitmapsDirty	( TRUE ),
-            bOwnPool		( FALSE )
+            bTableDirty		( sal_True ),
+            bBitmapsDirty	( sal_True ),
+            bOwnPool		( sal_False )
 {
     if( !pXPool )
     {
-        bOwnPool = TRUE;
+        bOwnPool = sal_True;
         pXPool = new XOutdevItemPool;
         DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
     }
@@ -97,7 +97,7 @@ XPropertyTable::~XPropertyTable()
 {
     XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
     Bitmap* pBitmap = NULL;
-    for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
+    for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
     {
         delete pEntry;
         pEntry = (XPropertyEntry*)aTable.Next();
@@ -107,7 +107,7 @@ XPropertyTable::~XPropertyTable()
     {
         pBitmap = (Bitmap*) pBmpTable->First();
 
-        for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
+        for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
         {
             delete pBitmap;
             pBitmap = (Bitmap*) pBmpTable->Next();
@@ -141,7 +141,7 @@ long XPropertyTable::Count() const
 {
     if( bTableDirty )
     {
-        // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+        // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
         if( !( (XPropertyTable*) this )->Load() )
             ( (XPropertyTable*) this )->Create();
     }
@@ -154,15 +154,15 @@ long XPropertyTable::Count() const
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
 {
     if( bTableDirty )
     {
-        // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+        // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
         if( !( (XPropertyTable*) this )->Load() )
             ( (XPropertyTable*) this )->Create();
     }
-    return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
+    return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
 }
 
 /*************************************************************************
@@ -175,7 +175,7 @@ long XPropertyTable::Get(const XubString& rName)
 {
     if( bTableDirty )
     {
-        // bTableDirty = FALSE;
+        // bTableDirty = sal_False;
         if( !Load() )
             Create();
     }
@@ -202,12 +202,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
     {
         if( bBitmapsDirty )
         {
-            ( (XPropertyTable*) this )->bBitmapsDirty = FALSE;
+            ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
             ( (XPropertyTable*) this )->CreateBitmapsForUI();
         }
 
-        if( pBmpTable->Count() >= (ULONG) nIndex )
-            return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex );
+        if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
+            return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
     }
     return( NULL );
 }
@@ -218,14 +218,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
 |*
 *************************************************************************/
 
-BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
+sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
 {
-    BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
+    sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
 
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        pBmpTable->Insert( (ULONG) nIndex, pBmp );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
     }
     return bReturn;
 }
@@ -238,12 +238,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
 
 XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
 {
-    XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
+    XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
 
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
         if( pOldBmp )
             delete pOldBmp;
     }
@@ -256,15 +256,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
 {
     if( pBmpTable && !bBitmapsDirty )
     {
-        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
-    return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
+    return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
 }
 
 /************************************************************************/
@@ -290,19 +290,19 @@ void XPropertyTable::SetName( const String& rString )
 
 XPropertyList::XPropertyList( const String& rPath,
                                 XOutdevItemPool* pInPool,
-                                USHORT nInitSize, USHORT nReSize ) :
+                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
             aName			( pszStandard, 8 ),
             aPath			( rPath ),
             pXPool			( pInPool ),
             aList			( nInitSize, nReSize ),
             pBmpList		( NULL ),
-            bListDirty		( TRUE ),
-            bBitmapsDirty	( TRUE ),
-            bOwnPool		( FALSE )
+            bListDirty		( sal_True ),
+            bBitmapsDirty	( sal_True ),
+            bOwnPool		( sal_False )
 {
     if( !pXPool )
     {
-        bOwnPool = TRUE;
+        bOwnPool = sal_True;
         pXPool = new XOutdevItemPool;
         DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
     }
@@ -329,7 +329,7 @@ XPropertyList::~XPropertyList()
 {
     XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
     Bitmap* pBitmap = NULL;
-    for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ )
+    for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
     {
         delete pEntry;
         pEntry = (XPropertyEntry*)aList.Next();
@@ -339,7 +339,7 @@ XPropertyList::~XPropertyList()
     {
         pBitmap = (Bitmap*) pBmpList->First();
 
-        for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
+        for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
         {
             delete pBitmap;
             pBitmap = (Bitmap*) pBmpList->Next();
@@ -373,7 +373,7 @@ long XPropertyList::Count() const
 {
     if( bListDirty )
     {
-        // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+        // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
@@ -386,15 +386,15 @@ long XPropertyList::Count() const
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
 {
     if( bListDirty )
     {
-        // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+        // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
-    return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex );
+    return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
 }
 
 /*************************************************************************
@@ -407,7 +407,7 @@ long XPropertyList::Get(const XubString& rName)
 {
     if( bListDirty )
     {
-        //bListDirty = FALSE;
+        //bListDirty = sal_False;
         if( !Load() )
             Create();
     }
@@ -434,11 +434,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
     {
         if( bBitmapsDirty )
         {
-            ( (XPropertyList*) this )->bBitmapsDirty = FALSE;
+            ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
             ( (XPropertyList*) this )->CreateBitmapsForUI();
         }
-        if( pBmpList->Count() >= (ULONG) nIndex )
-            return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex );
+        if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
+            return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
     }
     return( NULL );
 }
@@ -451,13 +451,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
 
 void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 {
-    aList.Insert( pEntry, (ULONG) nIndex );
+    aList.Insert( pEntry, (sal_uIntPtr) nIndex );
 
     if( pBmpList && !bBitmapsDirty )
     {
         Bitmap* pBmp = CreateBitmapForUI(
-                (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
-        pBmpList->Insert( pBmp, (ULONG) nIndex );
+                (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
+        pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
     }
 }
 
@@ -469,12 +469,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 
 XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 {
-    XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex );
+    XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
 
     if( pBmpList && !bBitmapsDirty )
     {
-        Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex );
+        Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
@@ -487,15 +487,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
 {
     if( pBmpList && !bBitmapsDirty )
     {
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex );
+        Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
         if( pOldBmp )
             delete pOldBmp;
     }
-    return (XPropertyEntry*) aList.Remove( (ULONG) nIndex );
+    return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
 }
 
 /************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 4ccbe0c606..f8d586b634 100644..100755
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -34,7 +34,7 @@
 #ifndef SVX_LIGHT
 
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "XPropertyTable.hxx"
+#include "svx/XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
 
 #include "xmlxtexp.hxx"
@@ -95,7 +95,7 @@ static char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };		// = 6.0
 
 XLineEndTable::XLineEndTable( const String& rPath,
                             XOutdevItemPool* pInPool,
-                            USHORT nInitSize, USHORT nReSize ) :
+                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
                 XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
@@ -130,37 +130,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
 
 /************************************************************************/
 
-BOOL XLineEndTable::Load()
+sal_Bool XLineEndTable::Load()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::Save()
+sal_Bool XLineEndTable::Save()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::Create()
+sal_Bool XLineEndTable::Create()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 /************************************************************************/
 
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 {
     return( NULL );
 }
 
 /************************************************************************/
 
-BOOL XLineEndTable::CreateBitmapsForUI()
+sal_Bool XLineEndTable::CreateBitmapsForUI()
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 // --------------------
@@ -277,18 +277,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
     return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
 }
 
-BOOL XLineEndList::Load()
+sal_Bool XLineEndList::Load()
 {
     if( bListDirty )
     {
-        bListDirty = FALSE;
+        bListDirty = sal_False;
 
         INetURLObject aURL( aPath );
 
         if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( !aPath.Len(), "invalid URL" );
-            return FALSE;
+            return sal_False;
         }
 
         aURL.Append( aName );
@@ -299,17 +299,17 @@ BOOL XLineEndList::Load()
         uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
     }
-    return( FALSE );
+    return( sal_False );
 }
 
-BOOL XLineEndList::Save()
+sal_Bool XLineEndList::Save()
 {
     INetURLObject aURL( aPath );
 
     if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( !aPath.Len(), "invalid URL" );
-        return FALSE;
+        return sal_False;
     }
 
     aURL.Append( aName );
@@ -321,7 +321,7 @@ BOOL XLineEndList::Save()
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
 }
 
-BOOL XLineEndList::Create()
+sal_Bool XLineEndList::Create()
 {
     basegfx::B2DPolygon aTriangle;
     aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -341,16 +341,16 @@ BOOL XLineEndList::Create()
     basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
     Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL XLineEndList::CreateBitmapsForUI()
+sal_Bool XLineEndList::CreateBitmapsForUI()
 {
     impCreate();
 
     for( long i = 0; i < Count(); i++)
     {
-        Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+        Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
         OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
 
         if( pBmp )
@@ -359,10 +359,10 @@ BOOL XLineEndList::CreateBitmapsForUI()
 
     impDestroy();
 
-    return( TRUE );
+    return( sal_True );
 }
 
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
 {
     impCreate();
     VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/uiconfig/layout/delzip b/svx/uiconfig/layout/delzip
index 7b4d68d70f..7b4d68d70f 100644..100755
--- a/svx/uiconfig/layout/delzip
+++ b/svx/uiconfig/layout/delzip
diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk
index f6bea876d8..f6bea876d8 100644..100755
--- a/svx/uiconfig/layout/layout.mk
+++ b/svx/uiconfig/layout/layout.mk
diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
index e75ae5e8d2..e75ae5e8d2 100644..100755
--- a/svx/uiconfig/layout/makefile.mk
+++ b/svx/uiconfig/layout/makefile.mk
diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml
index 78e30ee11d..78e30ee11d 100644..100755
--- a/svx/uiconfig/layout/zoom.xml
+++ b/svx/uiconfig/layout/zoom.xml
diff --git a/svx/util/cui.dxp b/svx/util/cui.dxp
deleted file mode 100644
index cfee3729bf..0000000000
--- a/svx/util/cui.dxp
+++ /dev/null
@@ -1 +0,0 @@
-CreateDialogFactory
diff --git a/svx/util/cui.flt b/svx/util/cui.flt
deleted file mode 100644
index 8ab7afd3bf..0000000000
--- a/svx/util/cui.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/dl.flt b/svx/util/dl.flt
deleted file mode 100644
index 8ab7afd3bf..0000000000
--- a/svx/util/dl.flt
+++ /dev/null
@@ -1,139 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-DialogsResMgr
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-+ImpGetResStr
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridControl
-+FmXGridPeer
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-___CT
-_alloc
-_CT
-exception::exception
-_TI2
-___CT
diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp
index 227006cc4e..e8f2e0a948 100644..100755
--- a/svx/util/gal.dxp
+++ b/svx/util/gal.dxp
@@ -17,5 +17,4 @@ Gallery_InsertSdrObj
 Gallery_GetThemeNameFromId
 Gallery_BeginLocking
 Gallery_EndLocking
-component_writeInfo
 component_getFactory
diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc
index 209e5fe97c..209e5fe97c 100644..100755
--- a/svx/util/hidother.hrc
+++ b/svx/util/hidother.hrc
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index f00cb22137..a0be09063f 100644..100755
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -25,8 +25,6 @@
  *
  ************************************************************************/
 #include "../inc/helpid.hrc"			// HID_XXX
-#include "hidother.hrc"
-#include <svx/svxids.hrc>
 #include "../inc/fmhelp.hrc"
 
 /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE        HID_AUTOCORR_HELP_START+20 */
@@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST             { HelpID = HID_GRID_TRAVEL_LAST ;};
 hidspecial HID_GRID_TRAVEL_NEW              { HelpID = HID_GRID_TRAVEL_NEW ;};
 hidspecial HID_GRID_TRAVEL_NEXT             { HelpID = HID_GRID_TRAVEL_NEXT ;};
 hidspecial HID_GRID_TRAVEL_PREV             { HelpID = HID_GRID_TRAVEL_PREV ;};
-hidspecial HID_INTERFACE_BASIDE_VIEWSH      { HelpID = HID_INTERFACE_BASIDE_VIEWSH; };
 hidspecial HID_POPUP_COLOR                  { HelpID = HID_POPUP_COLOR; };
 hidspecial HID_POPUP_COLOR_CTRL             { HelpID = HID_POPUP_COLOR_CTRL; };
 hidspecial HID_POPUP_FRAME                  { HelpID = HID_POPUP_FRAME; };
@@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI
 hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; };
 hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; };
 hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; };
-hidspecial SID_DSBROWSER_EXPLORER               { HelpID =  SID_DSBROWSER_EXPLORER          ;};
-hidspecial SID_GALLERY_IMPORTTHEME          { HelpID = SID_GALLERY_IMPORTTHEME; };
 hidspecial UID_FORMPROPBROWSER_FRAME            { HelpID =  UID_FORMPROPBROWSER_FRAME       ;};
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 2e756b5aa3..2e756b5aa3 100644..100755
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
diff --git a/svx/util/svx.component b/svx/util/svx.component
new file mode 100755
index 0000000000..5907d69fef
--- /dev/null
+++ b/svx/util/svx.component
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Draw.GraphicExporter">
+    <service name="com.sun.star.drawing.GraphicExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Svx.GraphicExportHelper">
+    <service name="com.sun.star.document.BinaryStreamResolver"/>
+    <service name="com.sun.star.document.GraphicObjectResolver"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Svx.GraphicImportHelper">
+    <service name="com.sun.star.document.BinaryStreamResolver"/>
+    <service name="com.sun.star.document.GraphicObjectResolver"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider">
+    <service name="com.sun.star.gallery.GalleryThemeProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D">
+    <service name="com.sun.star.graphic.PrimitiveFactory2D"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher">
+    <service name="com.sun.star.comp.svx.FindbarDispatcher"/>
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.RecoveryUI">
+    <service name="com.sun.star.dialog.RecoveryUI"/>
+  </implementation>
+  <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine">
+    <service name="com.sun.star.drawing.CustomShapeEngine"/>
+  </implementation>
+  <implementation name="com.sun.star.drawing.SvxShapeCollection">
+    <service name="com.sun.star.drawing.ShapeCollection"/>
+  </implementation>
+  <implementation name="com.sun.star.drawing.SvxUnoColorTable">
+    <service name="com.sun.star.drawing.ColorTable"/>
+  </implementation>
+  <implementation name="com.sun.star.svx.DownSearchToolboxController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.svx.FindTextToolboxController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.svx.FontHeightToolBoxController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.svx.UpSearchToolboxController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+</component>
diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp
index 9630d7e067..f0e1c69934 100644..100755
--- a/svx/util/svx.dxp
+++ b/svx/util/svx.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/svx/util/svx.flt b/svx/util/svx.flt
deleted file mode 100644
index 26520493b8..0000000000
--- a/svx/util/svx.flt
+++ /dev/null
@@ -1,134 +0,0 @@
-lcl
-+getImplementation
-Impl
-IMPL
-START
-CharAttribList
-CharPosArray
-ContentAttribs
-ContentAttribsInfo
-ContentInfo
-ContentNode
-DeletedNodeInfo
-EditAttrib
-EditCharAttrib
-EditDbg
-EditDoc
-EditEngineItemPool
-EditHTMLParser
-EditLine
-EditNodeIdx
-EditPaM
-EditPosition
-EditRTFParser
-EditSel
-EditSpellWrapper
-EditStyleSheet
-EditUndoConnectParas
-EditUndoDelContent
-EditUndoInsertChars
-EditUndoInsertFeature
-EditUndoManager
-EditUndoMoveParagraphs
-EditUndoRemoveChars
-EditUndoRemoveFeature
-EditUndoSetAttribs
-EditUndoSetParaAttribs
-EditUndoSetStyleSheet
-EditUndoSplitPara
-GlobalEditData
-IdleFormattter
-ImpEditEngine
-ImpEditView
-InternalEditStatus
-ParaPortion
-ParagraphList
-RTFPardAttrMapIds
-RTFPlainAttrMapIds
-SelRange
-SortedPositions_SAR
-SvxACorrChars
-SvxColorList
-SvxFontTable
-SvxRTFStyleType
-SvxTabStopArr_SAR
-TextPortionList
-XEditAttrib
-XParaPortionList
-BinTextObject
-E3dDragMethod
-E3dTriangle
-GetImp
-ImpA
-ImpB
-ImpBrw
-ImpC
-ImpCheck
-ImpColor
-ImpD
-ImpDrag
-ImpEdCtrl
-ImpEdit
-ImpF
-ImpGet
-ImpH
-ImpHide
-ImpI
-ImpItem
-ImpJ
-ImpL
-ImpList
-ImpM
-ImpMulti
-ImportInfo
-ImpP
-ImpPaint
-ImpPast
-ImpRecalc
-ImpReset
-ImpRemove
-ImpRef
-ImpReset
-ImpS
-ImpScroll
-ImpSdrGDIMetaFileImport
-ImpSet
-ImpShow
-ImpT
-ImpX
-OLUndoAttr
-OLUndoDepth
-OLUndoExpand
-OLUndoHeight
-OutlinerEditEng
-SdrGraphicLink
-SdrItemBrowser
-SdrOleLink
-SpellCache
-SvFileObject
-WrongList
-WrongRanges
-XIOCompat
-_SdrItemBrowserControl
-_SdrItemBrowserWindow
-+FmXGridPeer
-+FmXGridControl
-FmX
-FmExp
-ODatabaseForm
-WEP
-LIBMAIN
-LibMain
-??_5
-??_7
-??_8
-??_9
-??_C
-??_E
-??_F
-??_G
-??_H
-??_I
-__CT
-union_impl
-alternative
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
new file mode 100755
index 0000000000..2f829cb52a
--- /dev/null
+++ b/svx/util/svxcore.component
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
+    <service name="com.sun.star.frame.PopupMenuController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.ExtrusionDirectionController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.ExtrusionLightingController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+</component>
diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx
index 3f1a898da8..11f80e4101 100644..100755
--- a/svx/util/svxpch.cxx
+++ b/svx/util/svxpch.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_svx.hxx"
 #include <thread.hxx>
 #include <sysdep.hxx>
-#if defined(WNT) || defined (WIN)
+#if defined(WNT)
 #include <svwin.h>
 #endif
 #include <tlintl.hxx>
diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component
new file mode 100755
index 0000000000..1847435836
--- /dev/null
+++ b/svx/util/textconversiondlgs.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog">
+    <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/>
+  </implementation>
+</component>
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
new file mode 100755
index 0000000000..f579ed46fa
--- /dev/null
+++ b/svx/workben/edittest.cxx
@@ -0,0 +1,1795 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svx.hxx"
+
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <eerdll.hxx>
+#include <editeng/flditem.hxx>
+#include <tools/urlobj.hxx>
+#include <svx/svxacorr.hxx>
+#include <tools/fsys.hxx>
+#include <svx/xpoly.hxx>
+#include <svtools/filedlg.hxx>
+
+#include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/font.hxx>
+#include <vcl/sound.hxx>
+#include <vcl/print.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/help.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/msgbox.hxx>
+
+#include <dialdll.hxx>
+
+
+#define SERVICE_SIMPLEREGISTRY             "com.sun.star.registry.SimpleRegistry"
+#include <comphelper/processfactory.hxx>
+#include <comphelper/regpathhelper.hxx>
+#include <cppuhelper/servicefactory.hxx>
+#include <cppuhelper/bootstrap.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/registry/XSimpleRegistry.hpp>
+#include <sfx2/sfxuno.hxx>
+
+// SVX
+#include <editeng/lrspitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <fwdtitem.hxx>
+
+// SVTOOLS
+#include <svl/undo.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svtools/printdlg.hxx>
+
+#include <osl/file.hxx>
+#include <osl/process.h>
+#include <rtl/bootstrap.hxx>
+
+#define TB_LEFT			 1
+#define TB_RIGHT		 2
+#define TB_CENTER		 3
+#define TB_UNDO			 4
+#define TB_REDO			 5
+#define TB_FONT1		 6
+#define TB_FONT2		 7
+#define TB_ITALIC		 8
+#define TB_BOLD			 9
+#define TB_UNDERLINE	10
+#define TB_BLACK		11
+#define TB_GREEN		12
+#define TB_OPEN			13
+#define TB_SAVE			14
+#define TB_SBL			15
+#define TB_SBSA			16
+#define TB_LR			17
+#define TB_DRAW			18
+#define TB_DEFTAB		19
+#define TB_OPEN2		20
+#define TB_SAVE2		21
+#define TB_STDSEL		33
+#define TB_MOVE			34
+#define TB_PARATTR1		35
+#define TB_ROTATE		38
+#define TB_RED			43
+#define TB_FLAT			46
+#define TB_BINOBJ1		47
+#define TB_BINOBJ3		49
+#define TB_BINOBJ4		50
+#define TB_BINOBJ1b		51
+#define TB_BINOBJ2b		52
+#define TB_ATTRIBS		54
+#define TB_IDLE			55
+#define TB_BLOCK		56
+#define TB_CLONEBIN		57
+#define TB_INSERT		58
+#define TB_PKERN		59
+#define TB_KERN			60
+#define TB_SUPER		61
+#define TB_SUB			62
+#define TB_PRINT		63
+#define TB_FONT			64
+#define TB_COLORS		65
+#define TB_WLM			66
+#define TB_OUTL			67
+#define TB_INSFLD		68
+#define TB_UPDFLD		69
+#define TB_ONLINESPELL  70
+#define TB_REDLINES		71
+#define TB_AUTOCORRECT	72
+#define TB_POLY			73
+#define TB_HYPH			74
+
+// VARS...
+short nRotation = 0;
+USHORT nZoom = 100;
+sal_Bool bURLClicked = sal_False;
+
+using namespace ::com::sun::star::connection;
+using namespace ::vos;
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::registry;
+using namespace ::com::sun::star::lang;
+
+
+
+Reference< XMultiServiceFactory > createApplicationServiceManager()
+{
+    Reference< XMultiServiceFactory > xMS;
+    try
+    {
+        Reference< XComponentContext >    xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
+        if ( xComponentContext.is() )
+            xMS = xMS.query( xComponentContext->getServiceManager() );
+    }
+    catch( ::com::sun::star::uno::Exception& )
+    {
+    }
+
+    return xMS;
+}
+
+// --- class EditApp -------------------------------------------------
+
+SV_DECL_PTRARR_DEL( StringList, String*, 0, 4 );
+SV_IMPL_PTRARR( StringList, String* );
+StringList aSimpleHistory;
+
+class EditApp : public Application
+{
+public:
+    virtual void Main();
+};
+
+class MyEditEngine : public EditEngine
+{
+public:
+    MyEditEngine( SfxItemPool* pPool ) : EditEngine( pPool ) { ; }
+    virtual String	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void	FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
+    virtual void	FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
+};
+
+XubString __EXPORT MyEditEngine::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+{
+    const SvxFieldData* pField = rField.GetField();
+    if ( !pField )
+        return String( RTL_CONSTASCII_USTRINGPARAM( "<Empty>" ) );
+
+    if ( pField->ISA( SvxDateField ) )
+        return ((const SvxDateField*)pField)->GetFormatted( LANGUAGE_SYSTEM, LANGUAGE_SYSTEM );
+    else if ( pField->ISA( SvxURLField ) )
+    {
+        const SvxURLField* pURL = (const SvxURLField*)pField;
+        if ( !bURLClicked )
+        {
+            delete rpTxtColor;
+            rpTxtColor = new Color( COL_BLUE );
+        }
+        else
+        {
+            delete rpTxtColor;
+            rpTxtColor = new Color( COL_RED );
+            delete rpFldColor;
+            rpFldColor = new Color( COL_YELLOW );
+        }
+        if ( pURL->GetFormat() == SVXURLFORMAT_URL )
+            return pURL->GetURL();
+        return pURL->GetRepresentation();
+    }
+    return String( RTL_CONSTASCII_USTRINGPARAM( "???" ) );
+}
+
+void __EXPORT MyEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+{
+    EditEngine::FieldClicked( rField, nPara, nPos );	// Falls URL
+    const SvxFieldData* pField = rField.GetField();
+    if ( !pField )
+        return;
+
+    if ( pField->ISA( SvxURLField ) )
+    {
+        bURLClicked = TRUE;
+        UpdateFields();
+    }
+    else
+        Sound::Beep();
+}
+
+void __EXPORT MyEditEngine::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+{
+    const SvxFieldData* pField = rField.GetField();
+    if ( !pField )
+        return;
+
+    InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "Feld selektiert!" ) ) ).Execute();
+}
+
+
+class MyView : public WorkWindow
+{
+private:
+    EditEngine*		pEditEngine;
+    EditView*		pEditView;
+
+public:
+                    MyView( Window* pParent, EditEngine* pEditEngine );
+                    ~MyView();
+
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    BOOL    		Drop( const DropEvent& rEvt );
+    BOOL    		QueryDrop( DropEvent& rEvt );
+};
+
+MyView::MyView( Window* pParent, EditEngine* pEE ) : WorkWindow( pParent, WinBits( WB_STDWORK ) )
+{
+    pEditEngine = pEE;
+    pEditView = new EditView( pEditEngine, this );
+    pEditEngine->InsertView( pEditView );
+    SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Another View..." ) ) );
+//	EnableDrop();
+    SetBackgroundBrush( Brush( Color( COL_LIGHTBLUE ) ) );
+    Show();
+}
+
+MyView::~MyView()
+{
+    pEditEngine->RemoveView( pEditView );
+    delete pEditView;
+}
+
+void __EXPORT MyView::Paint( const Rectangle& rRec )
+{
+    pEditView->Paint( rRec );
+}
+
+void __EXPORT MyView::Resize()
+{
+    Size aPaperSz( GetOutputSize() );
+//	aPaperSz.Width() /= 2;
+//	aPaperSz.Height() /= 2;
+    pEditView->SetOutputArea( Rectangle( Point( 0,0 ), aPaperSz ) );
+    pEditView->SetVisArea( Rectangle( Point( 0,0 ), aPaperSz ) );
+    Invalidate();
+    pEditView->ShowCursor();
+}
+
+// --- MyView::KeyInput() --------------------------------------
+void __EXPORT MyView::KeyInput( const KeyEvent& rKEvt )
+{
+    pEditView->PostKeyEvent( rKEvt );
+}
+
+void __EXPORT MyView::MouseMove( const MouseEvent& rMEvt )
+{
+    Point aPos = PixelToLogic( rMEvt.GetPosPixel() );
+    if ( pEditView->GetOutputArea().IsInside( aPos ) )
+        SetPointer( pEditView->GetPointer() );
+    else
+        SetPointer( Pointer() );
+
+
+    pEditView->MouseMove( rMEvt );
+}
+
+void __EXPORT MyView::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    pEditView->MouseButtonDown( rMEvt );
+}
+
+void __EXPORT MyView::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    pEditView->MouseButtonUp( rMEvt );
+}
+
+void __EXPORT MyView::Command( const CommandEvent& rCEvt )
+{
+    if ( rCEvt.GetCommand() == COMMAND_STARTDRAG )
+        pEditView->Command(rCEvt);
+}
+
+BOOL __EXPORT MyView::Drop( const DropEvent& rEvt )
+{
+    return pEditView->Drop( rEvt );
+}
+
+BOOL __EXPORT MyView::QueryDrop( DropEvent& rEvt )
+{
+    return pEditView->QueryDrop( rEvt );
+}
+
+// --- class EditMainWindow --------------------------------------------
+DECLARE_LIST( ViewList, MyView* );
+
+class EditViewWindow : public Window
+{
+private:
+    MyEditEngine*			pEditEngine;
+    EditView*				pEditView;
+    Pointer 				aStdPtr;
+    Pointer 				aURLPtr;
+    WorkWindow* 			pTmpWindow;
+    ViewList 				aViewList;
+
+    XubString 				aTestStr;
+
+
+public:
+                    EditViewWindow( Window* pParent );
+                    ~EditViewWindow();
+
+    virtual void	Paint( const Rectangle& );
+    virtual void	Resize();
+    virtual void	KeyInput( const KeyEvent& rKeyEvt );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    void			MarkOutputArea();
+    BOOL    		Drop( const DropEvent& rEvt );
+    BOOL    		QueryDrop( DropEvent& rEvt );
+
+    EditView*		GetEditView() 		{ return pEditView; }
+};
+
+class EditMainWindow : public WorkWindow
+{
+private:
+    ToolBox 				aToolBox;
+    ScrollBar				aHScrollBar;
+    ScrollBar				aVScrollBar;
+    EditViewWindow			aViewWin;
+    Printer*				pPrinter;
+
+    WorkWindow* 			pTmpWindow;
+
+    EditTextObject*			pRTFObj;
+    EditTextObject*			pBinObj;
+
+    FileDialog*				pFileDialogBox;
+    FileDialog*				pFileDialogBox2;
+
+
+protected:
+    void			SetScrollBars();
+    void			SetScrollBarRanges();
+    void			CreatePolygon();
+
+    virtual void	GetFocus();
+
+public:
+                    EditMainWindow();
+                    ~EditMainWindow();
+
+    virtual void	Resize();
+
+    DECL_LINK( TBSelect, ToolBox * );
+    void			UpdateToolBox();
+
+    DECL_LINK( HScrollHdl, ScrollBar * );
+    DECL_LINK( VScrollHdl, ScrollBar * );
+    DECL_LINK( ShowStatus, EditStatus * );
+    void			SetTitle();
+};
+
+
+EditMainWindow::~EditMainWindow()
+{
+    delete pRTFObj;
+    delete pBinObj;
+    delete pFileDialogBox;
+    delete pFileDialogBox2;
+    delete pTmpWindow;
+    delete pPrinter;
+}
+
+EditMainWindow::EditMainWindow() :
+                WorkWindow( NULL, WB_APP | WB_STDWORK | WB_SVLOOK | WB_CLIPCHILDREN ) ,
+                aViewWin( this ),
+                aToolBox( this, WinBits( WB_BORDER | WB_SVLOOK | WB_SCROLL | WB_LINESPACING ) ),
+                aHScrollBar( this, WinBits( WB_HSCROLL | WB_DRAG ) ),
+                aVScrollBar( this, WinBits( WB_VSCROLL | WB_DRAG ) )
+{
+    pRTFObj = 0;
+    pBinObj = 0;
+
+    pFileDialogBox = new FileDialog( this, WinBits( WB_OPEN | WB_SVLOOK ) );
+    pFileDialogBox->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) );
+    pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" )), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) );
+    pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) );
+    pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm;*.html" ) ) );
+    pFileDialogBox->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) );
+
+    pFileDialogBox2 = new FileDialog( this, WinBits( WB_SAVEAS| WB_SVLOOK ) );
+    pFileDialogBox2->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) );
+    pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) );
+    pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) );
+    pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm" ) ) );
+    pFileDialogBox2->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) );
+
+    pPrinter = new Printer;
+    pPrinter->SetMapMode( MAP_100TH_MM );
+    aViewWin.SetMapMode( pPrinter->GetMapMode() );
+    aViewWin.GetEditView()->GetEditEngine()->SetRefDevice( pPrinter );
+
+
+
+    pTmpWindow = new WorkWindow( this, WB_STDWORK );
+
+    aToolBox.SetButtonType( BUTTON_TEXT );
+    aToolBox.SetLineCount( 4 );
+
+    {
+    aToolBox.InsertItem( TB_OPEN, String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) );
+    aToolBox.InsertItem( TB_SAVE, String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) );
+    aToolBox.InsertItem( TB_PRINT, String( RTL_CONSTASCII_USTRINGPARAM( "Print" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_LEFT, String( RTL_CONSTASCII_USTRINGPARAM( "L" ) ) );
+    aToolBox.InsertItem( TB_CENTER, String( RTL_CONSTASCII_USTRINGPARAM( "C" ) ) );
+    aToolBox.InsertItem( TB_RIGHT, String( RTL_CONSTASCII_USTRINGPARAM( "R" ) ) );
+    aToolBox.InsertItem( TB_BLOCK, String( RTL_CONSTASCII_USTRINGPARAM( "B" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_UNDO, String( RTL_CONSTASCII_USTRINGPARAM( "Undo" ) ) );
+    aToolBox.InsertItem( TB_REDO, String( RTL_CONSTASCII_USTRINGPARAM( "Redo" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_FONT1, String( RTL_CONSTASCII_USTRINGPARAM( "Font1" ) ) );
+    aToolBox.InsertItem( TB_FONT2, String( RTL_CONSTASCII_USTRINGPARAM( "Font2" ) ) );
+    aToolBox.InsertItem( TB_DEFTAB, String( RTL_CONSTASCII_USTRINGPARAM( "DefTab" ) ) );
+    aToolBox.InsertBreak();
+    aToolBox.InsertItem( TB_OPEN2, String( RTL_CONSTASCII_USTRINGPARAM( "Read" ) ) );
+    aToolBox.InsertItem( TB_SAVE2, String( RTL_CONSTASCII_USTRINGPARAM( "Write" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_FONT, String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ) );
+    aToolBox.InsertItem( TB_ITALIC, String( RTL_CONSTASCII_USTRINGPARAM( "K" ) ) );
+    aToolBox.InsertItem( TB_BOLD, String( RTL_CONSTASCII_USTRINGPARAM( "F" ) ) );
+    aToolBox.InsertItem( TB_UNDERLINE, String( RTL_CONSTASCII_USTRINGPARAM( "U" ) ) );
+    aToolBox.InsertItem( TB_SUPER, String( RTL_CONSTASCII_USTRINGPARAM( "SP" ) ) );
+    aToolBox.InsertItem( TB_SUB, String( RTL_CONSTASCII_USTRINGPARAM( "SB" ) ) );
+    aToolBox.InsertItem( TB_PKERN, String( RTL_CONSTASCII_USTRINGPARAM( "PK" ) ) );
+    aToolBox.InsertItem( TB_KERN, String( RTL_CONSTASCII_USTRINGPARAM( "TK" ) ) );
+    aToolBox.InsertItem( TB_WLM, String( RTL_CONSTASCII_USTRINGPARAM( "W!" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_BLACK, String( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
+    aToolBox.InsertItem( TB_GREEN, String( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
+    aToolBox.InsertItem( TB_RED, String( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_SBL, String( RTL_CONSTASCII_USTRINGPARAM( "SBL" ) ) );
+    aToolBox.InsertItem( TB_SBSA, String( RTL_CONSTASCII_USTRINGPARAM( "SBSA" ) ) );
+    aToolBox.InsertItem( TB_LR, String( RTL_CONSTASCII_USTRINGPARAM( "LR" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_DRAW, String( RTL_CONSTASCII_USTRINGPARAM( "Draw!" ) ) );
+    aToolBox.InsertItem( TB_ROTATE, String( RTL_CONSTASCII_USTRINGPARAM( "Rotate!" ) ) );
+    aToolBox.InsertItem( TB_MOVE, String( RTL_CONSTASCII_USTRINGPARAM( "Move->2" ) ) );
+    aToolBox.InsertItem( TB_PARATTR1, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAttr0" ) ) );
+    aToolBox.InsertItem( TB_ATTRIBS, String( RTL_CONSTASCII_USTRINGPARAM( "GetAttribs" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_INSFLD, String( RTL_CONSTASCII_USTRINGPARAM( "InsFld" ) ) );
+    aToolBox.InsertItem( TB_UPDFLD, String( RTL_CONSTASCII_USTRINGPARAM( "UpdFld" ) ) );
+    }
+    aToolBox.InsertBreak();
+    {
+    aToolBox.InsertItem( TB_ONLINESPELL, String( RTL_CONSTASCII_USTRINGPARAM( "Spell" ) ) );
+    aToolBox.InsertItem( TB_REDLINES, String( RTL_CONSTASCII_USTRINGPARAM( "RedLine" ) ) );
+    aToolBox.InsertItem( TB_AUTOCORRECT, String( RTL_CONSTASCII_USTRINGPARAM( "Auto*" ) ) );
+    aToolBox.InsertItem( TB_HYPH, String( RTL_CONSTASCII_USTRINGPARAM( "Hyph" ) ) );
+    aToolBox.InsertItem( TB_STDSEL, String( RTL_CONSTASCII_USTRINGPARAM( "StdSel" ) ) );
+    aToolBox.InsertItem( TB_FLAT, String( RTL_CONSTASCII_USTRINGPARAM( "FlatMode" ) ) );
+    aToolBox.InsertItem( TB_OUTL, String( RTL_CONSTASCII_USTRINGPARAM( "Ocomphelper" ) ) );
+    aToolBox.InsertItem( TB_POLY, String( RTL_CONSTASCII_USTRINGPARAM( "Poly" ) ) );
+    aToolBox.InsertItem( TB_COLORS, String( RTL_CONSTASCII_USTRINGPARAM( "Colors" ) ));
+    aToolBox.InsertItem( TB_IDLE, String( RTL_CONSTASCII_USTRINGPARAM( "Idle!" ) ) );
+    aToolBox.InsertItem( TB_INSERT, String( RTL_CONSTASCII_USTRINGPARAM( "Insert" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_BINOBJ1, String( RTL_CONSTASCII_USTRINGPARAM( ">BINObj" ) ) );
+    aToolBox.InsertItem( TB_BINOBJ1b, String( RTL_CONSTASCII_USTRINGPARAM( ">>BINObj" ) ) );
+    aToolBox.InsertItem( TB_BINOBJ2b, String( RTL_CONSTASCII_USTRINGPARAM( "<<BINObj" ) ) );
+    aToolBox.InsertItem( TB_CLONEBIN, String( RTL_CONSTASCII_USTRINGPARAM( "Clone" ) ) );
+    aToolBox.InsertSeparator();
+    aToolBox.InsertItem( TB_BINOBJ3, String( RTL_CONSTASCII_USTRINGPARAM( "StoreBin" ) ) );
+    aToolBox.InsertItem( TB_BINOBJ4, String( RTL_CONSTASCII_USTRINGPARAM( "CreatBin" ) ) );
+    }
+
+    aToolBox.SetPosPixel( Point( 0, 0 ) );
+    aToolBox.SetSelectHdl( LINK( this, EditMainWindow, TBSelect ) );
+
+    SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) );
+
+    SetPen( PEN_NULL );
+    Show();
+
+    aVScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, VScrollHdl ) );
+    aVScrollBar.SetLineSize( 300 );
+    aVScrollBar.SetPageSize( 2000 );
+    aHScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, HScrollHdl ) );
+    aHScrollBar.SetLineSize( 300 );
+    aHScrollBar.SetPageSize( 2000 );
+    aHScrollBar.Enable();
+    aVScrollBar.Enable();
+
+    aViewWin.GetEditView()->GetEditEngine()->SetStatusEventHdl( LINK( this, EditMainWindow, ShowStatus ) );
+
+    SetTitle();
+
+    UpdateToolBox();
+    aToolBox.Show();
+    aViewWin.Show();
+}
+
+void EditMainWindow::SetTitle()
+{
+    String aHeading( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit!  -  Zoom " ) ) );
+    aHeading += String::CreateFromInt32(nZoom);
+    aHeading += '%';
+    EditEngine* pEditEngine = aViewWin.GetEditView()->GetEditEngine();
+    if ( pEditEngine->GetControlWord() & EE_CNTRL_STRETCHING )
+    {
+        USHORT nX, nY;
+        pEditEngine->GetGlobalCharStretching( nX, nY );
+        aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", Stretch=(" ) );
+        aHeading += String::CreateFromInt32(nX);
+        aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
+        aHeading += String::CreateFromInt32(nY);
+        aHeading += ')';
+    }
+    SetText( aHeading );
+}
+
+void EditMainWindow::UpdateToolBox()
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    EditEngine* pEditEngine = pEditView->GetEditEngine();
+    SfxItemSet aCurSet( pEditView->GetAttribs() );
+
+    ULONG nControl = pEditEngine->GetControlWord();
+    aToolBox.EnableItem( TB_UNDO, (BOOL)pEditEngine->GetUndoManager().GetUndoActionCount() );
+    aToolBox.EnableItem( TB_REDO, (BOOL)pEditEngine->GetUndoManager().GetRedoActionCount() );
+    aToolBox.EnableItem( TB_BINOBJ2b, (BOOL)(long)pBinObj );
+    aToolBox.EnableItem( TB_MOVE, pEditEngine->GetParagraphCount() > 3 );
+    aToolBox.CheckItem( TB_ONLINESPELL, nControl & EE_CNTRL_ONLINESPELLING ? TRUE : FALSE );
+    aToolBox.CheckItem( TB_AUTOCORRECT, nControl & EE_CNTRL_AUTOCORRECT ? TRUE : FALSE );
+//	aToolBox.CheckItem( TB_HYPH, nControl & EE_CNTRL_HYPHENATE ? TRUE : FALSE );
+    aToolBox.CheckItem( TB_REDLINES, nControl & EE_CNTRL_NOREDLINES ? FALSE : TRUE );
+    aToolBox.CheckItem( TB_STDSEL, pEditView->GetSelectionMode() == EE_SELMODE_STD );
+    aToolBox.CheckItem( TB_FLAT, pEditEngine->IsFlatMode() );
+    aToolBox.CheckItem( TB_OUTL, ( nControl & EE_CNTRL_OUTLINER ) ? TRUE : FALSE );
+    aToolBox.CheckItem( TB_POLY, pEditEngine->GetPolygon() ? TRUE : FALSE );
+    aToolBox.CheckItem( TB_COLORS, ( nControl & EE_CNTRL_NOCOLORS ) ? FALSE : TRUE );
+    aToolBox.CheckItem( TB_IDLE, pEditEngine->IsIdleFormatterEnabled() );
+    aToolBox.CheckItem( TB_INSERT, pEditView->IsInsertMode() );
+
+    for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++)
+    {
+//		if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
+//			;
+//		else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE )
+//			;
+//		else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
+        {
+            const SfxPoolItem& rItem = aCurSet.Get( nWhich );
+            switch ( nWhich )
+            {
+                case EE_PARA_HYPHENATE:
+                    aToolBox.CheckItem( TB_HYPH, ((SfxBoolItem&)rItem).GetValue() != 0 );
+                break;
+                case EE_PARA_LRSPACE:
+                    aToolBox.CheckItem( TB_LR, ((SvxLRSpaceItem&)rItem).GetTxtLeft() != 0 );
+                break;
+                case EE_PARA_ULSPACE:
+                    aToolBox.CheckItem( TB_SBSA, ((SvxULSpaceItem&)rItem).GetUpper() != 0 );
+                break;
+                case EE_PARA_SBL:
+                    aToolBox.CheckItem( TB_SBL, ((SvxLineSpacingItem&)rItem).GetPropLineSpace() != 100 );
+                break;
+                case EE_PARA_JUST:
+                {
+                    SvxAdjust e = ((SvxAdjustItem&)rItem).GetAdjust();
+                    aToolBox.CheckItem( TB_LEFT, e == SVX_ADJUST_LEFT );
+                    aToolBox.CheckItem( TB_RIGHT, e == SVX_ADJUST_RIGHT);
+                    aToolBox.CheckItem( TB_CENTER, e == SVX_ADJUST_CENTER);
+                    aToolBox.CheckItem( TB_BLOCK, e == SVX_ADJUST_BLOCK );
+                }
+                break;
+                case EE_PARA_TABS:
+                break;
+                case EE_CHAR_COLOR:
+                {
+                    Color aColor( ((SvxColorItem&)rItem).GetValue() );
+                    aToolBox.CheckItem( TB_BLACK, aColor == COL_BLACK );
+                    aToolBox.CheckItem( TB_GREEN, aColor == COL_GREEN );
+                    aToolBox.CheckItem( TB_RED, aColor == COL_RED );
+                }
+                break;
+                case EE_CHAR_FONTINFO:
+                {
+                    FontFamily e = ((SvxFontItem&)rItem).GetFamily();
+                    aToolBox.CheckItem( TB_FONT1, e == FAMILY_ROMAN );
+                    aToolBox.CheckItem( TB_FONT2, e == FAMILY_SWISS );
+                }
+                break;
+                case EE_CHAR_FONTHEIGHT:
+                break;
+                case EE_CHAR_WEIGHT:
+                {
+                    FontWeight e = ((SvxWeightItem&)rItem).GetWeight();
+                    aToolBox.CheckItem( TB_BOLD, e == WEIGHT_BOLD );
+                }
+                break;
+                case EE_CHAR_UNDERLINE:
+                {
+                    aToolBox.CheckItem( TB_UNDERLINE, ((SvxUnderlineItem&)rItem).GetLineStyle() );
+                }
+                break;
+                case EE_CHAR_WLM:
+                {
+                    aToolBox.CheckItem( TB_WLM, ((SvxWordLineModeItem&)rItem).GetValue() );
+                }
+                break;
+                case EE_CHAR_PAIRKERNING:
+                {
+                    aToolBox.CheckItem( TB_PKERN, ((SvxAutoKernItem&)rItem).GetValue() );
+                }
+                break;
+                case EE_CHAR_KERNING:
+                {
+                    aToolBox.CheckItem( TB_KERN, (BOOL)((SvxKerningItem&)rItem).GetValue() );
+                }
+                break;
+                case EE_CHAR_ESCAPEMENT:
+                {
+                    aToolBox.CheckItem( TB_SUPER, ((SvxEscapementItem&)rItem).GetEsc() > 0 );
+                    aToolBox.CheckItem( TB_SUB, ((SvxEscapementItem&)rItem).GetEsc() < 0 );
+                }
+                break;
+                case EE_CHAR_STRIKEOUT:
+                break;
+                case EE_CHAR_ITALIC:
+                {
+                    FontItalic e = ((SvxPostureItem&)rItem).GetPosture();
+                    aToolBox.CheckItem( TB_ITALIC, e == ITALIC_NORMAL );
+                }
+                break;
+                case EE_CHAR_OUTLINE:
+                break;
+                case EE_CHAR_SHADOW:
+                break;
+            }
+        }
+    }
+}
+
+IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    EditEngine* pEditEngine = pEditView->GetEditEngine();
+    USHORT nId = aToolBox.GetCurItemId();
+    BOOL bChecked = aToolBox.IsItemChecked( nId );
+    SfxPoolItem* pNewItem = 0;
+    switch ( nId )
+    {
+        case TB_LEFT:	pNewItem = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST );
+                        break;
+        case TB_RIGHT:	pNewItem = new SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST );
+                        break;
+        case TB_CENTER:	pNewItem = new SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST );
+                        break;
+        case TB_BLOCK:	pNewItem = new SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST );
+                        break;
+        case TB_HYPH: 	pNewItem = new SfxBoolItem( EE_PARA_HYPHENATE, !bChecked );
+                        break;
+        case TB_UNDO:	pEditView->Undo();
+                        pEditView->ShowCursor();
+                        break;
+        case TB_REDO:	pEditView->Redo();
+                        pEditView->ShowCursor();
+                        break;
+        case TB_ONLINESPELL: {
+                            ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
+                            if ( bChecked )
+                                nControl = nControl & ~EE_CNTRL_ONLINESPELLING;
+                            else
+                                nControl = nControl | EE_CNTRL_ONLINESPELLING;
+                            pEditView->GetEditEngine()->SetControlWord( nControl );
+                            }
+                            break;
+        case TB_REDLINES: {
+                            ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
+                            if ( !bChecked )
+                                nControl = nControl & ~EE_CNTRL_NOREDLINES;
+                            else
+                                nControl = nControl | EE_CNTRL_NOREDLINES;
+                            pEditView->GetEditEngine()->SetControlWord( nControl );
+                            }
+                            break;
+        case TB_AUTOCORRECT: {
+                            ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
+                            if ( bChecked )
+                                nControl = nControl & ~EE_CNTRL_AUTOCORRECT;
+                            else
+                                nControl = nControl | EE_CNTRL_AUTOCORRECT;
+                            pEditView->GetEditEngine()->SetControlWord( nControl );
+                            }
+                            break;
+        case TB_STDSEL:	if ( bChecked )
+                            pEditView->SetSelectionMode( EE_SELMODE_TXTONLY );
+                        else
+                            pEditView->SetSelectionMode( EE_SELMODE_STD );
+                        break;
+        case TB_FLAT:	pEditEngine->SetFlatMode( !pEditEngine->IsFlatMode() );
+                        break;
+        case TB_COLORS:	{
+                            ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
+                            if ( bChecked )
+                                nControl = nControl | EE_CNTRL_NOCOLORS;
+                            else
+                                nControl = nControl & ~EE_CNTRL_NOCOLORS;
+                            pEditView->GetEditEngine()->SetControlWord( nControl );
+                        }
+//						aViewWin.Invalidate();
+                        pEditView->GetEditEngine()->Draw( pEditView->GetWindow(), pEditView->GetOutputArea(), pEditView->GetVisArea().TopLeft() );
+                        break;
+        case TB_OUTL:	{
+                            ULONG nControl = pEditView->GetEditEngine()->GetControlWord();
+                            if ( !bChecked )
+                                nControl = nControl | EE_CNTRL_OUTLINER;
+                            else
+                                nControl = nControl & ~EE_CNTRL_OUTLINER;
+                            pEditView->GetEditEngine()->SetControlWord( nControl );
+                        }
+                        break;
+        case TB_POLY:	{
+                            if ( !bChecked )
+                                CreatePolygon();
+                            else
+                                pEditView->GetEditEngine()->ClearPolygon();
+                        }
+                        break;
+        case TB_IDLE:	pEditEngine->EnableIdleFormatter( !pEditEngine->IsIdleFormatterEnabled() );
+                        break;
+        case TB_INSFLD:	{
+                        static BYTE nFld = 0;
+                        if ( nFld > 2 )
+                            nFld = 0;
+                        if ( nFld == 0 )
+                        {
+                            SvxFieldItem aFld( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Bla" ) ), SVXURLFORMAT_REPR ), EE_FEATURE_FIELD  );
+                            pEditView->InsertField( aFld );
+                        }
+                        else if ( nFld == 1 )
+                            pEditView->InsertField( SvxFieldItem( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Morgenpost" ) ), SVXURLFORMAT_URL ), EE_FEATURE_FIELD  ) );
+                        else if ( nFld == 2 )
+                            pEditView->InsertField( SvxFieldItem( SvxDateField( Date( 1,1,1995 ), SVXDATETYPE_FIX, SVXDATEFORMAT_D ), EE_FEATURE_FIELD ) );
+
+                        nFld++;
+        }
+                        break;
+        case TB_UPDFLD:	pEditEngine->UpdateFields();
+                        break;
+        case TB_INSERT:	pEditView->SetInsertMode( !pEditView->IsInsertMode() );
+                        break;
+        case TB_FONT1:	pNewItem = new SvxFontItem( FAMILY_ROMAN, String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
+                        break;
+        case TB_FONT2:	pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO );
+                        break;
+/*
+        case TB_FONT:
+        {
+            FontDialog* pDlg = new FontDialog( this, WB_SVLOOK );
+            pDlg->SetPrinter( pPrinter );
+            Font aFont = pEditEngine->CreateFontFromItemSet( pEditView->GetAttribs() );
+            MapMode aPntMode( MAP_POINT );
+            MapMode aCurrent( aViewWin.GetMapMode() );
+            Size aSz(  aViewWin.LogicToLogic( aFont.GetSize(), &aCurrent, &aPntMode ) );
+            aSz.Width() *= 10;
+            aSz.Height() *= 10;
+            aFont.SetSize(  aSz );
+            pDlg->SetSelectFont( aFont );
+            if ( pDlg->Execute() )
+            {
+                Font aNewFont( pDlg->GetSelectFont() );
+                aSz = aViewWin.LogicToLogic( aNewFont.GetSize(), &aPntMode, &aCurrent );
+                aSz.Width() /= 10;
+                aSz.Height() /= 10;
+                aNewFont.SetSize( aSz );
+
+                SfxItemSet aSet( pEditEngine->GetEmptyItemSet() );
+
+                pEditEngine->SetFontInfoInItemSet( aSet, aNewFont );
+                pEditView->SetAttribs( aSet );
+            }
+            delete pDlg;
+        }
+        break;
+*/
+        case TB_BOLD:	if ( bChecked )
+                            pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT);
+                        else
+                            pNewItem = new SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT);
+                        break;
+        case TB_ITALIC:	if ( bChecked )
+                            pNewItem = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
+                        else
+                            pNewItem = new SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC );
+                        break;
+        case TB_UNDERLINE:	if ( bChecked )
+                                pNewItem = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE );
+                            else
+                                pNewItem = new SvxUnderlineItem( UNDERLINE_SINGLE, EE_CHAR_UNDERLINE );
+                        break;
+        case TB_WLM:	pNewItem = new SvxWordLineModeItem( !bChecked, EE_CHAR_WLM );
+                        break;
+        case TB_PKERN:	pNewItem = new SvxAutoKernItem( !bChecked, EE_CHAR_PAIRKERNING );
+                        break;
+        case TB_KERN:	if ( bChecked )
+                                pNewItem = new SvxKerningItem( 0, EE_CHAR_KERNING );
+                            else
+                                pNewItem = new SvxKerningItem( 100, EE_CHAR_KERNING);
+                        break;
+        case TB_SUPER:	if ( bChecked )
+                                pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT);
+                            else
+//								pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT);
+                                pNewItem = new SvxEscapementItem( 50, 100, EE_CHAR_ESCAPEMENT );
+                        break;
+        case TB_SUB:	if ( bChecked )
+                                pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT);
+                            else
+//								pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT);
+                                pNewItem = new SvxEscapementItem( -50, 100, EE_CHAR_ESCAPEMENT );
+                        break;
+        case TB_GREEN:	pNewItem = new SvxColorItem( Color(COL_GREEN), EE_CHAR_COLOR);
+                        break;
+        case TB_RED:	pNewItem = new SvxColorItem( Color(COL_RED), EE_CHAR_COLOR);
+                        break;
+        case TB_BLACK:	pNewItem = new SvxColorItem( Color(COL_BLACK), EE_CHAR_COLOR);
+                        break;
+        case TB_SBL:	pNewItem = new SvxLineSpacingItem( 0, EE_PARA_SBL );
+                        if ( bChecked )
+                        {
+                            ((SvxLineSpacingItem*)pNewItem)->SetInterLineSpace( 0 );
+                        }
+                        else
+                        {
+                            ((SvxLineSpacingItem*)pNewItem)->SetPropLineSpace( 150 );
+                        }
+                        break;
+        case TB_SBSA:	pNewItem = new SvxULSpaceItem( EE_PARA_ULSPACE );
+                        if ( !bChecked )
+                        {
+                            ((SvxULSpaceItem*)pNewItem)->SetUpper( 400 );
+                            ((SvxULSpaceItem*)pNewItem)->SetLower( 400 );
+                        }
+                        break;
+        case TB_LR:		pNewItem = new SvxLRSpaceItem( EE_PARA_LRSPACE );
+                        if ( !bChecked )
+                        {
+                            ((SvxLRSpaceItem*)pNewItem)->SetTxtLeft( 1000 );
+                            ((SvxLRSpaceItem*)pNewItem)->SetTxtFirstLineOfst( -500 );
+                            ((SvxLRSpaceItem*)pNewItem)->SetRight( 500 );
+                        }
+                        break;
+        case TB_DEFTAB:	if ( bChecked )
+                            pEditEngine->SetDefTab( 2000 );
+                        else
+                            pEditEngine->SetDefTab( 600 );
+                        pEditView->ShowCursor();
+                        aToolBox.CheckItem( nId, !bChecked );
+                        break;
+        case TB_DRAW:   {
+                            pTmpWindow->SetMapMode( aViewWin.GetMapMode() );
+                            pTmpWindow->SetBackgroundBrush( Brush( Color( COL_GRAY ) ) );
+                            pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) );
+                            pTmpWindow->Show();
+                            pTmpWindow->Invalidate();
+                            pTmpWindow->Update();
+                            pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) );
+                            Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) );
+                            pTmpWindow->DrawRect( aRect );
+                            pEditEngine->Draw( pTmpWindow, aRect, Point( 0, 0 ) );
+                            nRotation = 0;
+                        }
+                        break;
+        case TB_ROTATE:   {
+                            nRotation += 100;
+                            if ( nRotation == 3600 )
+                                nRotation = 0;
+                            pTmpWindow->SetMapMode( aViewWin.GetMapMode() );
+                            pTmpWindow->SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) );
+                            pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) );
+                            pTmpWindow->Show();
+                            pTmpWindow->Invalidate();
+                            pTmpWindow->Update();
+                            pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) );
+                            Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) );
+                            pEditEngine->Draw( pTmpWindow, Point( 2000, 4000 ), nRotation );
+                        }
+                        break;
+
+        case TB_MOVE:
+        {
+            ESelection aESel = pEditView->GetSelection();
+            USHORT nStartPara = Min( aESel.nStartPara, aESel.nEndPara );
+            USHORT nEndPara = Max( aESel.nStartPara, aESel.nEndPara );
+            pEditView->MoveParagraphs( Range(nStartPara,nEndPara), 2 );
+        }
+        break;
+        case TB_PARATTR1:
+        {
+            pEditEngine->SetUpdateMode( FALSE );
+            USHORT nPara = 0;
+            SfxItemSet aSet( pEditEngine->GetEmptyItemSet() );
+            aSet.Put( SvxFontItem( FAMILY_DECORATIVE, String( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) ), String(),PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ) );
+            aSet.Put( SvxColorItem( Color(COL_MAGENTA), EE_CHAR_COLOR ) );
+            aSet.Put( SvxFontHeightItem(600, 100, EE_CHAR_FONTHEIGHT) );
+            aSet.Put( SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC ) );
+            aSet.Put( SvxLRSpaceItem( 0, 0, 1000, 0, EE_PARA_LRSPACE ) );
+            pEditView->SetParaAttribs( aSet, nPara );
+            pEditEngine->SetUpdateMode( TRUE );
+            pEditView->ShowCursor();
+        }
+        break;
+        case TB_BINOBJ1:
+        {
+            delete pBinObj;
+            pBinObj = pEditEngine->CreateTextObject();
+        }
+        break;
+        case TB_BINOBJ1b:
+        {
+            delete pBinObj;
+            pBinObj = pEditView->CreateTextObject();
+        }
+        break;
+        case TB_CLONEBIN:
+        {
+            if ( pBinObj )
+            {
+                EditTextObject* p = pBinObj->Clone();
+                delete pBinObj;
+                pBinObj = p;
+            }
+        }
+        break;
+        case TB_BINOBJ2b:
+        {
+            if ( pBinObj )
+            {
+                pEditView->InsertText( *pBinObj );
+            }
+        }
+        break;
+        case TB_BINOBJ3:
+        {
+            if ( !pFileDialogBox2->Execute() )
+                return FALSE;
+            DirEntry aDirEntry( pFileDialogBox2->GetPath() );
+            SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC );
+            EditTextObject* pTmpObj = pEditEngine->CreateTextObject();
+            pTmpObj->Store( aStrm );
+            DBG_ASSERT( !aStrm.GetError(), "Store: Error!" );
+            delete pTmpObj;
+        }
+        break;
+        case TB_BINOBJ4:
+        {
+            if ( !pFileDialogBox->Execute() )
+                return FALSE;
+            DirEntry aDirEntry( pFileDialogBox->GetPath() );
+            SvFileStream aStrm( aDirEntry.GetFull(), STREAM_READ );
+            delete pBinObj;
+            pBinObj = EditTextObject::Create( aStrm );
+//			EditTextObject* pTmpObj = pEditEngine->CreateTextObject( aStrm );
+//			pEditEngine->SetText( *pTmpObj );
+//			pEditView->ShowCursor();
+//			delete pTmpObj;
+        }
+        break;
+        case TB_OPEN:
+        case TB_OPEN2:
+        {
+            if ( !pFileDialogBox->Execute() )
+                return FALSE;
+            DirEntry aDirEntry( pFileDialogBox->GetPath() );
+            aDirEntry.ToAbs();
+            String aFileName( aDirEntry.GetFull() );
+            SvFileStream aStrm( aFileName, STREAM_READ );
+            if ( aStrm.GetError() )
+                InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "StreamError!" ) ) ).Execute();
+            Application::EnterWait();
+            if ( nId == TB_OPEN )
+            {
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) )
+                    pEditEngine->Read( aStrm, EE_FORMAT_RTF );
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) )
+                    pEditEngine->Read( aStrm, EE_FORMAT_HTML );
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) )
+                    pEditEngine->Read( aStrm, EE_FORMAT_HTML );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) )
+                    pEditEngine->Read( aStrm, EE_FORMAT_BIN );
+                else
+                    pEditEngine->Read( aStrm, EE_FORMAT_TEXT );
+
+                pEditView->ShowCursor();
+            }
+            else
+            {
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) )
+                    pEditView->Read( aStrm, EE_FORMAT_RTF );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) )
+                    pEditView->Read( aStrm, EE_FORMAT_BIN );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) )
+                    pEditView->Read( aStrm, EE_FORMAT_HTML );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) )
+                    pEditView->Read( aStrm, EE_FORMAT_HTML );
+                else
+                    pEditView->Read( aStrm, EE_FORMAT_TEXT );
+            }
+
+            Application::LeaveWait();
+
+        }
+        break;
+        case TB_PRINT:
+        {
+            pPrinter->SetPageQueueSize( 1 );
+            PrintDialog aPrnDlg( this );
+            aPrnDlg.SetPrinter( pPrinter );
+            if ( aPrnDlg.Execute() )
+            {
+                pPrinter->StartJob( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit - PrinterTest" ) ) );
+                pPrinter->StartPage();
+                Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() );
+                Pen aPen( PEN_SOLID );
+                aPen.SetColor( Color( COL_BLACK ) );
+                pPrinter->SetPen( aPen );
+                Rectangle aR( Point( 2000, 4000 ), aSz );
+                pPrinter->DrawRect( aR );
+                // So folgt auf IIISi, 75DPI kein Ausdruck!
+//				pPrinter->SetClipRegion( Region( aR ) );
+                pEditEngine->Draw( pPrinter, Point( 2000, 4000 ), nRotation );
+//				pPrinter->SetClipRegion();
+                pPrinter->EndPage();
+                pPrinter->EndJob();
+            }
+        }
+        break;
+        case TB_SAVE:
+        case TB_SAVE2:
+        {
+            if ( !pFileDialogBox2->Execute() )
+                return FALSE;
+            DirEntry aDirEntry( pFileDialogBox2->GetPath() );
+//			DirEntry aDirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\xxx.rtf" ) ) );
+            SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC );
+            Application::EnterWait();
+            if ( nId == TB_SAVE )
+            {
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf") )
+                    pEditEngine->Write( aStrm, EE_FORMAT_RTF );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) )
+                    pEditEngine->Write( aStrm, EE_FORMAT_BIN );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) )
+                    pEditEngine->Write( aStrm, EE_FORMAT_HTML );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) )
+                    pEditEngine->Write( aStrm, EE_FORMAT_HTML );
+                else
+                    pEditEngine->Write( aStrm, EE_FORMAT_TEXT );
+            }
+            else
+            {
+                if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) )
+                    pEditView->Write( aStrm, EE_FORMAT_RTF );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) )
+                    pEditView->Write( aStrm, EE_FORMAT_BIN );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) )
+                    pEditView->Write( aStrm, EE_FORMAT_HTML );
+                else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) )
+                    pEditView->Write( aStrm, EE_FORMAT_HTML );
+                else
+                    pEditView->Write( aStrm, EE_FORMAT_TEXT );
+            }
+            Application::LeaveWait();
+        }
+        break;
+        case TB_ATTRIBS:
+        {
+            SfxItemSet aCurSet = pEditView->GetAttribs();
+            XubString aDebStr( String( RTL_CONSTASCII_USTRINGPARAM( "Attribute in Selektion:" ) ) );
+            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\nVorlage:" ) );
+            XubString aStyle;
+//			pEditView->GetStyleSheet( aStyle, eFam );
+            aDebStr += aStyle;
+            for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++)
+            {
+                aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
+                aDebStr += String::CreateFromInt32( nWhich );
+                aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\t" ) );
+                if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
+                    aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "---" ) );
+                else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE )
+                    aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) );
+                else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON )
+                {
+                    const SfxPoolItem& rItem = aCurSet.Get( nWhich );
+                    switch ( nWhich )
+                    {
+                        case EE_PARA_LRSPACE:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FI=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst() );
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", LI=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtLeft() );
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", RI=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetRight() );
+                        break;
+                        case EE_PARA_ULSPACE:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SB=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetUpper() );
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", SA=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetLower() );
+                        break;
+                        case EE_PARA_SBL:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SBL=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxLineSpacingItem&)rItem).GetInterLineSpace() );
+                        break;
+                        case EE_PARA_JUST:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SvxAdust=" ) );
+                            aDebStr += String::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() );
+                        break;
+                        case EE_PARA_TABS:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Tabs = ?" ) );
+                        break;
+                        case EE_CHAR_COLOR:
+                        {
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Color= " ) );
+                            Color aColor( ((SvxColorItem&)rItem).GetValue() );
+                            aDebStr += String::CreateFromInt32( aColor.GetRed() );
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
+                            aDebStr += String::CreateFromInt32( aColor.GetGreen() );
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
+                            aDebStr += String::CreateFromInt32( aColor.GetBlue() );
+                        }
+                        break;
+                        case EE_CHAR_FONTINFO:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Font=" ) );
+                            aDebStr += ((SvxFontItem&)rItem).GetFamilyName();
+                        break;
+                        case EE_CHAR_FONTHEIGHT:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Groesse=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxFontHeightItem&)rItem).GetHeight() );
+                        break;
+                        case EE_CHAR_WEIGHT:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontWeight=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxWeightItem&)rItem).GetWeight() );
+                        break;
+                        case EE_CHAR_UNDERLINE:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontUnderline=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxUnderlineItem&)rItem).GetLineStyle() );
+                        break;
+                        case EE_CHAR_WLM:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "WordLineMode=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxWordLineModeItem&)rItem).GetValue() );
+                        break;
+                        case EE_CHAR_STRIKEOUT:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontStrikeout=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxCrossedOutItem&)rItem).GetStrikeout() );
+                        break;
+                        case EE_CHAR_ITALIC:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontPosture=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxPostureItem&)rItem).GetPosture() );
+                        break;
+                        case EE_CHAR_OUTLINE:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOutline=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxContourItem&)rItem).GetValue() );
+                        break;
+                        case EE_CHAR_SHADOW:
+                            aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontShadowed=" ) );
+                            aDebStr += String::CreateFromInt32( ((SvxShadowedItem&)rItem).GetValue() );
+                        break;
+                    }
+                }
+                else
+                    aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "?" ) );
+            }
+            InfoBox( 0, aDebStr ).Execute();
+        }
+        break;
+    }
+
+    if ( pNewItem )
+    {
+        SfxItemSet aSet = pEditView->GetEmptyItemSet();
+        aSet.Put( *pNewItem );
+        pEditView->SetAttribs( aSet );
+        delete pNewItem;
+    }
+    UpdateToolBox();
+    return 0;
+}
+
+void EditMainWindow::CreatePolygon()
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    Size aSz = pEditView->GetWindow()->GetOutputSize();
+    Point aOffset( aSz.Width()/8, aSz.Height()/8 );
+    aSz.Width() *= 3;
+    aSz.Width() /= 4;
+    aSz.Height() *= 3;
+    aSz.Height() /= 4;
+    Polygon aPoly( 5 );
+    aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 0 );
+    aPoly.SetPoint( Point( aSz.Width(), aSz.Height()/3 ), 1 );
+    aPoly.SetPoint( Point( aSz.Width()/2, aSz.Height() ), 2 );
+    aPoly.SetPoint( Point( 0, aSz.Height()/2 ), 3 );
+    aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 4 );
+    PolyPolygon aPPoly( aPoly );
+    pEditView->GetEditEngine()->SetPolygon( aPPoly );
+    pEditView->SetOutputArea( Rectangle( aOffset, aSz ) );
+    ULONG nWord = pEditView->GetControlWord();
+    nWord &= ~(EV_CNTRL_AUTOSCROLL);
+    pEditView->SetControlWord( nWord );
+    aViewWin.Invalidate();
+}
+
+void __EXPORT EditMainWindow::GetFocus()
+{
+    aViewWin.GrabFocus();
+}
+
+IMPL_LINK_INLINE_START( EditMainWindow, HScrollHdl, ScrollBar *, pScrl )
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    pEditView->Scroll( -pScrl->GetDelta(), 0, RGCHK_PAPERSZ1 );
+    return 0;
+}
+IMPL_LINK_INLINE_END( EditMainWindow, HScrollHdl, ScrollBar *, pScrl )
+
+IMPL_LINK_INLINE_START( EditMainWindow, VScrollHdl, ScrollBar *, pScrl )
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    pEditView->Scroll( 0, -pScrl->GetDelta(), RGCHK_PAPERSZ1 );
+    return 0;
+}
+IMPL_LINK_INLINE_END( EditMainWindow, VScrollHdl, ScrollBar *, pScrl )
+
+void EditMainWindow::SetScrollBarRanges()
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    long y = pEditView->GetEditEngine()->GetTextHeight();
+    long x = pEditView->GetEditEngine()->GetPaperSize().Width();
+
+    aHScrollBar.SetRange( Range( 0, x ) );
+    aVScrollBar.SetRange( Range( 0, y ) );
+}
+
+void EditMainWindow::SetScrollBars()
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    Size aSz = GetOutputSizePixel();
+    Size aRealSz( aSz );
+    long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width();
+    long nTBHeight = aToolBox.GetSizePixel().Height();
+    aSz.Height() -= nTBHeight;
+    Size aOrgSz( aSz );
+
+    // VScroll...
+    aSz.Height() += 2;
+    Point aPoint( ( aSz.Width()- nScrollbarWidthPixel+1 ), -1+nTBHeight);
+    aSz.Width() = nScrollbarWidthPixel;
+    aVScrollBar.SetPosSizePixel( aPoint, aSz );
+
+    // HScroll...
+    aSz = aOrgSz;
+    Point aPoint2( 0, aRealSz.Height()-aHScrollBar.GetSizePixel().Height()+1 ); // TB-Height schon drin!
+    aSz.Width() -= aVScrollBar.GetSizePixel().Width();
+    aSz.Width() += 2;
+
+    aSz.Height() = nScrollbarWidthPixel;
+    aHScrollBar.SetPosSizePixel( aPoint2, aSz );
+
+    aHScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetWidth() );
+    aVScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetHeight() );
+
+    SetScrollBarRanges();
+
+    aVScrollBar.Show();
+    aHScrollBar.Show();
+}
+
+void __EXPORT EditMainWindow::Resize()
+{
+    long nBorder = aVScrollBar.GetSizePixel().Width();
+    long nExtra = 10;
+    Size aTBSz = aToolBox.CalcWindowSizePixel();
+    Size aOutSzPixel( GetOutputSizePixel() );
+    aToolBox.SetSizePixel( Size( aOutSzPixel.Width(), aTBSz.Height()) );
+
+    aViewWin.SetSizePixel( Size( aOutSzPixel.Width()-nBorder-2*nExtra, aOutSzPixel.Height()-aTBSz.Height()-2*nExtra-nBorder) );
+
+    aViewWin.SetPosPixel( Point( nExtra, aTBSz.Height()+nExtra ) );
+
+    SetScrollBars();
+
+    EditView* pEditView = aViewWin.GetEditView();
+    if ( pEditView && pEditView->GetEditEngine()->GetPolygon() )
+        CreatePolygon();
+}
+
+IMPL_LINK( EditMainWindow, ShowStatus, EditStatus *, pStat )
+{
+    EditView* pEditView = aViewWin.GetEditView();
+    EditEngine* pEditEngine = pEditView->GetEditEngine();
+    if ( ( pStat->GetStatusWord() & EE_STAT_TEXTWIDTHCHANGED ) || ( pStat->GetStatusWord() & EE_STAT_TEXTHEIGHTCHANGED ) )
+    {
+        aViewWin.MarkOutputArea();
+        if ( pEditEngine->GetTextHeight() < (ULONG)pEditView->GetOutputArea().GetHeight() )
+        {
+            // Wird durch RGCHK_PAPERSZ1 'geklippt'
+            if ( !( pEditEngine->GetControlWord() & EE_CNTRL_AUTOPAGESIZE) )
+                pEditView->Scroll( -(long)pEditEngine->CalcTextWidth(), -(long)pEditEngine->GetTextHeight(), RGCHK_PAPERSZ1 );
+        }
+        SetScrollBarRanges();
+    }
+    if ( pStat->GetStatusWord() & EE_STAT_HSCROLL )
+        aHScrollBar.SetThumbPos( pEditView->GetVisArea().Left() );
+    if ( pStat->GetStatusWord() & EE_STAT_VSCROLL )
+        aVScrollBar.SetThumbPos( pEditView->GetVisArea().Top() );
+
+    return 0;
+}
+
+
+EditViewWindow::~EditViewWindow()
+{
+    // erst die angemeldeten Views zerstoeren
+    // (melden sich selbst ab)
+    MyView* pView = aViewList.First();
+    while ( pView )
+    {
+        delete pView;
+        pView = aViewList.Next();
+    }
+
+    pEditEngine->RemoveView( pEditView );
+    delete pEditView;
+    // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt,
+    // wird der Handler gerufen, ich zerstore hier aber schon die View!
+    pEditEngine->SetStatusEventHdl( Link() );
+//	SvxAutoCorrect* pAutoCorrekt = pEditEngine->GetAutoCorrect();
+//	pEditEngine->SetAutoCorrect( 0 );
+//	delete pAutoCorrekt;
+    delete pEditEngine;
+}
+
+EditViewWindow::EditViewWindow( Window* pParent ) :
+                Window( pParent ), aURLPtr( POINTER_HAND )
+{
+    SetBackgroundBrush( Brush( Color( COL_WHITE ) ) );
+    SetMapMode( MAP_100TH_MM );	
+//	EnableDrop();
+
+    SfxItemPool* pPool = EditEngine::CreatePool();
+    Font aFont = GetSettings().GetStyleSettings().GetAppFont();
+    MapMode aPntMode( MAP_POINT );
+    MapMode aCurrent( GetMapMode() );
+    Size aSz( LogicToLogic( Size( 12, 0 ), &aPntMode, &aCurrent ) );
+    aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) );
+    pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(),aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+    pPool->SetPoolDefaultItem( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT ) );
+    pEditEngine = new MyEditEngine( pPool );
+
+    Size aPaperSz( 10000,8000 );
+    pEditEngine->SetPaperSize( aPaperSz );
+
+    pEditView = new EditView( pEditEngine, this );
+    pEditView->SetBackgroundColor( Color( COL_WHITE ) );
+    pEditView->SetOutputArea( Rectangle( Point( 100, 100 ), aPaperSz ) );
+    pEditEngine->SetDefaultLanguage( LANGUAGE_ENGLISH );
+    pEditEngine->InsertView( pEditView );
+
+    SetPosSizePixel( Point( 10, 10 ), Size( 600, 400 ) );
+    SetPen( PEN_NULL );
+    Show();
+
+    // Feldbefehle grau hinterlegen
+    ULONG n = pEditEngine->GetControlWord();
+    n = n | (EE_CNTRL_MARKFIELDS|EE_CNTRL_AUTOCOMPLETE);
+    pEditEngine->SetControlWord( n );
+
+    // Test: Autozentrierung
+//	ULONG n = pEditEngine->GetControlWord();
+//	n = n | EE_CNTRL_AUTOPAGESIZE;
+//	pEditEngine->SetControlWord( n );
+
+    // OneLineSpeling
+#ifdef WNT
+//	pEditEngine->CreateSpeller( DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ),
+//								DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ) );
+//	pEditEngine->GetSpeller()->SetActualLanguage( LANGUAGE_GERMAN );
+//	pEditEngine->GetSpeller()->SetDefaultLanguage( LANGUAGE_GERMAN );
+//	pEditEngine->GetSpeller()->SetMinTrail( 2 );
+
+    // AutoCorrect wird nie zerstoert
+//	pEditEngine->SetAutoCorrect( new SvxAutoCorrect( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\prj\\office\\autotext\\autocorr.dat" ) ) ) );
+#endif
+}
+
+void __EXPORT EditViewWindow::Paint( const Rectangle& rRec )
+{
+    if ( pEditView->GetEditEngine()->GetPolygon() )
+    {
+        // Die Punkte des Polygons beziehen sich auf die View...
+        MapMode aMapMode( GetMapMode() );
+        aMapMode.SetOrigin( pEditView->GetOutputArea().TopLeft() );
+        SetMapMode( aMapMode );
+        DrawPolyPolygon( *pEditView->GetEditEngine()->GetPolygon() );
+        aMapMode.SetOrigin( Point() );
+        SetMapMode( aMapMode );
+    }
+    pEditView->Paint( rRec );
+    MarkOutputArea();
+}
+
+void EditViewWindow::MarkOutputArea()
+{
+    static Rectangle aCurFrame;
+    Rectangle aOutArea( pEditView->GetOutputArea() );
+    aOutArea = LogicToPixel( aOutArea );
+    aOutArea.Left()--;
+    aOutArea.Right()++;
+    aOutArea.Top()--;
+    aOutArea.Bottom()++;
+    aOutArea = PixelToLogic( aOutArea );
+    SetPen( Pen( Color( COL_RED ) ) );
+    SetFillInBrush( Brush( BRUSH_NULL ) );
+    DrawRect( aOutArea );
+    if ( !aCurFrame.IsEmpty() )
+    {
+        if ( aCurFrame.Left() < aOutArea.Left() )
+            Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aOutArea.Left()-aCurFrame.Left(), aCurFrame.GetHeight() ) ) );
+        if ( aCurFrame.Right() > aOutArea.Right() )
+        {
+            long nW = aCurFrame.Right() - aOutArea.Right();
+            Point aPos( aCurFrame.TopRight() );
+            aPos.X() -= nW;
+            Invalidate( Rectangle( aPos, Size( nW, aCurFrame.GetHeight() ) ) );
+        }
+        if ( aCurFrame.Top() < aOutArea.Top() )
+            Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aCurFrame.GetWidth(), aOutArea.Top() - aCurFrame.Top() ) ) );
+        if ( aCurFrame.Bottom() > aOutArea.Bottom() )
+        {
+            long nH = aCurFrame.Bottom() - aOutArea.Bottom();
+            Point aPos( aCurFrame.BottomLeft() );
+            aPos.Y() -= nH;
+            Invalidate( Rectangle( aPos, Size( aCurFrame.GetWidth(), nH ) ) );
+        }
+    }
+    aCurFrame = aOutArea;
+}
+
+void __EXPORT EditViewWindow::Resize()
+{
+    Size aPaperSz( GetOutputSize() );
+    pEditView->SetOutputArea( Rectangle( Point(0,0), aPaperSz ) );
+    pEditEngine->SetPaperSize( Size( aPaperSz.Width()*1, aPaperSz.Height()*1 ) );
+    pEditView->ShowCursor();
+    Invalidate();
+}
+
+void __EXPORT EditViewWindow::KeyInput( const KeyEvent& rKEvt )
+{
+    sal_Unicode nCharCode = rKEvt.GetCharCode();
+
+    USHORT nCode = rKEvt.GetKeyCode().GetCode();
+    // Auswertung fuer besondere Einstellungen....
+    if ( ( nCode == KEY_A) && rKEvt.GetKeyCode().IsMod1() )
+        pEditView->SetSelection( ESelection( 0, 0, 0xFFFF, 0xFFFF ) );
+    else if ( ( nCode == KEY_R ) && rKEvt.GetKeyCode().IsMod2() )
+        Invalidate();
+    else if ( ( nCode == KEY_L ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        ULONG n = pEditEngine->GetControlWord();
+        n = n | EE_CNTRL_ONECHARPERLINE;
+        pEditEngine->SetControlWord( n );
+        pEditEngine->QuickFormatDoc();
+    }
+    else if ( ( nCode == KEY_Z ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        pEditView->RemoveAttribs();
+    }
+    else if ( ( nCode == KEY_V ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        pEditEngine->SetVertical( TRUE );
+        Invalidate();
+    }
+    else if ( ( ( nCode == KEY_ADD ) || ( nCode == KEY_SUBTRACT ) )&& rKEvt.GetKeyCode().IsMod2() )
+    {
+        short nDiff = ( nCode == KEY_ADD ) ? (+5) : (-5);
+        if ( nZoom > 1000 )
+            nDiff *= 20;
+        if ( nZoom <= 25 )
+            nDiff /= 5;
+        if ( ( nZoom + nDiff ) > 0 )
+            nZoom += nDiff;
+        MapMode aMapMode( MAP_100TH_MM, Point(0,0), Fraction(nZoom,100), Fraction(nZoom,100) );
+        SetMapMode( aMapMode );
+        ((EditMainWindow*)GetParent())->SetTitle();
+
+        if ( rKEvt.GetKeyCode().IsMod1() )
+        {
+            InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "ChangingRefMapMode..." ) ) ).Execute();
+            pEditEngine->SetRefMapMode( aMapMode );
+        }
+        Invalidate();
+    }
+    else if ( rKEvt.GetKeyCode().IsMod2() &&
+            ( ( nCode == KEY_UP) || ( nCode == KEY_DOWN ) ||
+              ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) )
+    {
+        if( rKEvt.GetKeyCode().IsMod1() )
+        {
+            ULONG nCtrl = pEditEngine->GetControlWord();
+            if ( ! ( nCtrl & EE_CNTRL_STRETCHING ) )
+            {
+                nCtrl |= EE_CNTRL_STRETCHING;
+                pEditEngine->SetControlWord( nCtrl );
+            }
+            USHORT nX, nY;
+            pEditEngine->GetGlobalCharStretching( nX, nY );
+            if ( ( nCode == KEY_DOWN ) && ( nY > 5 ) )
+                nY += 5;
+            else if ( nCode == KEY_UP )
+                nY -= 5;
+            else if ( nCode == KEY_RIGHT )
+                nX += 5;
+            else if ( ( nCode == KEY_LEFT ) && ( nX > 5 ) )
+                nX -= 5;
+            pEditEngine->SetGlobalCharStretching( nX, nY );
+            ((EditMainWindow*)GetParent())->SetTitle();
+        }
+        else	// ZeichenAttr
+        {
+            SfxItemSet aAttrs( pEditView->GetAttribs() );
+            SfxItemSet aNewAttrs( pEditEngine->GetEmptyItemSet() );
+            const SvxFontWidthItem& rItem = (const SvxFontWidthItem&)aAttrs.Get( EE_CHAR_FONTWIDTH );
+            USHORT nProp = rItem.GetProp();
+            if ( nCode == KEY_RIGHT )
+                nProp += 5;
+            else if ( ( nCode == KEY_LEFT ) && ( nProp > 5 ) )
+                nProp -= 5;
+            aNewAttrs.Put( SvxFontWidthItem( 0, nProp, EE_CHAR_FONTWIDTH ) );
+            pEditView->SetAttribs( aNewAttrs );
+        }
+    }
+    else if ( ( nCode == KEY_O ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        MapMode aMapMode( GetMapMode() );
+        aMapMode.SetOrigin( Point( 41, 41 ) );
+        SetMapMode( aMapMode );
+        Invalidate();
+    }
+    else if ( ( nCode == KEY_B ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        SfxItemSet aSet = pEditView->GetEmptyItemSet();
+        aSet.Put( SvxFontHeightItem(800, 100, EE_CHAR_FONTHEIGHT) );
+        pEditView->SetAttribs( aSet );
+    }
+    else if ( ( nCode == KEY_P ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+//				ESelection aSel = pEditView->GetSelection();
+//				for ( ULONG n = aSel.nStartPara; n <= aSel.nEndPara; n++ )
+//				{
+//					InfoBox( 0, pEditEngine->GetText( n ) ).Execute();
+//				}
+        InfoBox( 0, pEditView->GetSelected() ).Execute();
+
+    }
+    else if ( rKEvt.GetKeyCode().IsMod2() &&
+                ( nCode >= KEY_1 ) && ( nCode <= KEY_9 ) )
+    {
+        ULONG nEECtrl = pEditEngine->GetControlWord();
+        nEECtrl = nEECtrl | EE_CNTRL_AUTOPAGESIZE;
+        pEditEngine->SetControlWord( nEECtrl );
+
+        ULONG nEVCtrl = pEditView->GetControlWord();
+        nEVCtrl |= EV_CNTRL_AUTOSIZE;
+        pEditView->SetControlWord( nEVCtrl );
+
+        pEditView->SetAnchorMode( (EVAnchorMode)(nCode-KEY_1) );
+        pEditView->SetOutputArea( Rectangle( Point(0,0), GetOutputSize() ) );
+        pEditEngine->SetMaxAutoPaperSize( GetOutputSize() );
+        pEditEngine->SetPaperSize( Size( 0, 0 ) );
+    }
+    else if ( rKEvt.GetKeyCode().IsMod2() && ( nCode == KEY_0 ) )
+    {
+        ULONG nEVCtrl = pEditView->GetControlWord();
+        nEVCtrl = nEVCtrl | EV_CNTRL_AUTOSIZE;
+        pEditView->SetControlWord( nEVCtrl );
+
+        Size aOutSz( GetOutputSize() );
+        Size aPaperSz( aOutSz.Width() / 2, 0 );
+        pEditView->SetOutputArea( Rectangle( Point(), aPaperSz ) );
+        pEditEngine->SetPaperSize( aPaperSz );
+        // Max-Height wird bei View verwendet,
+        // MinSize/MaxSize nur, wenn AUTOPAGESIZE ( KEY_1 - KEY_9 )
+        pEditEngine->SetMaxAutoPaperSize( Size( aOutSz.Width() / 2, aOutSz.Height() / 2 ) );
+        pEditEngine->SetMinAutoPaperSize( Size( aOutSz.Width() / 8, aOutSz.Height() / 8 ) );
+    }
+    else if ( ( nCode == KEY_J ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        Size aTextSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() );
+        Rectangle aRect( pEditView->GetOutputArea().TopLeft(), aTextSz );
+        Brush aTmpBrush( Color( COL_LIGHTBLUE ), BRUSH_25 );
+        Brush aOldBrush( GetFillInBrush() );
+        SetFillInBrush( aTmpBrush );
+        DrawRect( aRect );
+        SetFillInBrush( aOldBrush );
+        pEditView->Paint( aRect );
+    }
+    else if ( ( nCode == KEY_H ) && rKEvt.GetKeyCode().IsMod2() )
+    {
+        Push();
+        Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() );
+        Pen aPen( PEN_SOLID );
+        Brush aBrush( Color( COL_GRAY ), BRUSH_SOLID );
+        aPen.SetColor( Color( COL_BLACK ) );
+        SetPen( aPen );
+        SetFillInBrush( aBrush );
+        Rectangle aR( pEditView->GetOutputArea().TopLeft(), aSz );
+        DrawRect( aR );
+        Pop();
+        pEditEngine->Draw( this, pEditView->GetOutputArea() );
+        pEditView->ShowCursor( TRUE, TRUE );
+    }
+
+    // Eingabe an EditEngine...
+    else
+    {
+        BOOL bDone = pEditView->PostKeyEvent( rKEvt );
+        if ( !bDone )
+            Window::KeyInput( rKEvt );
+    }
+
+    ((EditMainWindow*)GetParent())->UpdateToolBox();
+}
+
+void __EXPORT EditViewWindow::MouseMove( const MouseEvent& rMEvt )
+{
+    Point aPos = PixelToLogic( rMEvt.GetPosPixel() );
+    if ( pEditView->GetOutputArea().IsInside( aPos ) )
+    {
+        const SvxFieldItem* pField = pEditView->GetFieldUnderMousePointer();
+        if ( pField )
+            SetPointer( aURLPtr );
+        else
+            SetPointer( pEditView->GetPointer() );
+
+//		aPos -= pEditView->GetOutputArea().TopLeft();
+//		aPos += pEditView->GetVisArea().TopLeft();
+//		if ( pEditView->GetEditEngine()->IsTextPos( aPos, PixelToLogic( Size( 5, 0 ) ).Width() ) )
+//			SetPointer( pEditView->GetPointer() );
+//		else
+//			SetPointer( Pointer( POINTER_REFHAND ) );
+
+    }
+    else
+        SetPointer( aStdPtr );
+
+//	static long x = 0;
+//	x++;
+//	DBG_ASSERT( x < 1000, String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ) );
+    pEditView->MouseMove( rMEvt );
+}
+
+void __EXPORT EditViewWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    GrabFocus();
+    pEditView->MouseButtonDown( rMEvt );
+}
+
+void __EXPORT EditViewWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    pEditView->MouseButtonUp( rMEvt );
+    ((EditMainWindow*)GetParent())->UpdateToolBox();
+}
+
+void __EXPORT EditViewWindow::Command( const CommandEvent& rCEvt )
+{
+    if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
+    {
+        if( pEditView->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel() ) )
+            pEditView->ExecuteSpellPopup( rCEvt.GetMousePosPixel() );
+    }
+    else
+        pEditView->Command(rCEvt);
+
+}
+
+BOOL __EXPORT EditViewWindow::Drop( const DropEvent& rEvt )
+{
+    return pEditView->Drop( rEvt );
+}
+
+BOOL __EXPORT EditViewWindow::QueryDrop( DropEvent& rEvt )
+{
+    return pEditView->QueryDrop( rEvt );
+}
+
+// --- aEditApp ------------------------------------------------------
+
+void __EXPORT EditApp::Main()
+{
+#ifdef WNT
+    SvFactory::Init();
+#endif
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  xSMgr = createApplicationServiceManager();
+    ::comphelper::setProcessServiceFactory( xSMgr );
+    
+    EditDLL aEditDll;
+    SvxGlobalItemData aItemData;
+    SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxDateField );
+    SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxURLField );
+    
+    Help::EnableQuickHelp();
+    
+    EditMainWindow aWindow;
+    Execute();
+}
+
+EditApp aEditApp;
diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
index 2ce9d573de..2ce9d573de 100644..100755
--- a/svx/workben/msview/makefile.mk
+++ b/svx/workben/msview/makefile.mk
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index bd08ee1188..bd08ee1188 100644..100755
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
diff --git a/svx/workben/msview/msview.xml b/svx/workben/msview/msview.xml
index 6daffa62be..6daffa62be 100644..100755
--- a/svx/workben/msview/msview.xml
+++ b/svx/workben/msview/msview.xml
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index fa47e4bace..fa47e4bace 100644..100755
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx
index abea4351d7..abea4351d7 100644..100755
--- a/svx/workben/msview/xmlconfig.hxx
+++ b/svx/workben/msview/xmlconfig.hxx
diff --git a/svx/xml/AccessibleControlShape.xml b/svx/xml/AccessibleControlShape.xml
index cc88998836..cc88998836 100644..100755
--- a/svx/xml/AccessibleControlShape.xml
+++ b/svx/xml/AccessibleControlShape.xml
diff --git a/svx/xml/AccessibleEditableTextPara.xml b/svx/xml/AccessibleEditableTextPara.xml
index affb15f4dd..affb15f4dd 100644..100755
--- a/svx/xml/AccessibleEditableTextPara.xml
+++ b/svx/xml/AccessibleEditableTextPara.xml
diff --git a/svx/xml/AccessibleGraphicShape.xml b/svx/xml/AccessibleGraphicShape.xml
index 74e41df3a7..74e41df3a7 100644..100755
--- a/svx/xml/AccessibleGraphicShape.xml
+++ b/svx/xml/AccessibleGraphicShape.xml
diff --git a/svx/xml/AccessibleImageBullet.xml b/svx/xml/AccessibleImageBullet.xml
index c6a2afdba9..c6a2afdba9 100644..100755
--- a/svx/xml/AccessibleImageBullet.xml
+++ b/svx/xml/AccessibleImageBullet.xml
diff --git a/svx/xml/AccessibleOLEShape.xml b/svx/xml/AccessibleOLEShape.xml
index 27a9cafd46..27a9cafd46 100644..100755
--- a/svx/xml/AccessibleOLEShape.xml
+++ b/svx/xml/AccessibleOLEShape.xml
diff --git a/svx/xml/AccessibleShape.xml b/svx/xml/AccessibleShape.xml
index 6469448e54..6469448e54 100644..100755
--- a/svx/xml/AccessibleShape.xml
+++ b/svx/xml/AccessibleShape.xml
diff --git a/svx/xml/SvxDrawPage.xml b/svx/xml/SvxDrawPage.xml
index 29ea110a00..29ea110a00 100644..100755
--- a/svx/xml/SvxDrawPage.xml
+++ b/svx/xml/SvxDrawPage.xml
diff --git a/svx/xml/SvxGraphCtrlAccessibleContext.xml b/svx/xml/SvxGraphCtrlAccessibleContext.xml
index ad436f5dc2..ad436f5dc2 100644..100755
--- a/svx/xml/SvxGraphCtrlAccessibleContext.xml
+++ b/svx/xml/SvxGraphCtrlAccessibleContext.xml
diff --git a/svx/xml/SvxGraphicExporter.xml b/svx/xml/SvxGraphicExporter.xml
index 6a4d9fef2f..6a4d9fef2f 100644..100755
--- a/svx/xml/SvxGraphicExporter.xml
+++ b/svx/xml/SvxGraphicExporter.xml
diff --git a/svx/xml/SvxGraphicObject.xml b/svx/xml/SvxGraphicObject.xml
index 7c756ad3e0..7c756ad3e0 100644..100755
--- a/svx/xml/SvxGraphicObject.xml
+++ b/svx/xml/SvxGraphicObject.xml
diff --git a/svx/xml/SvxShape.xml b/svx/xml/SvxShape.xml
index 6cf5e00a1a..6cf5e00a1a 100644..100755
--- a/svx/xml/SvxShape.xml
+++ b/svx/xml/SvxShape.xml
diff --git a/svx/xml/SvxShapeCircle.xml b/svx/xml/SvxShapeCircle.xml
index fc37a09e93..fc37a09e93 100644..100755
--- a/svx/xml/SvxShapeCircle.xml
+++ b/svx/xml/SvxShapeCircle.xml
diff --git a/svx/xml/SvxShapeCollection.xml b/svx/xml/SvxShapeCollection.xml
index ad9781dfd3..ad9781dfd3 100644..100755
--- a/svx/xml/SvxShapeCollection.xml
+++ b/svx/xml/SvxShapeCollection.xml
diff --git a/svx/xml/SvxShapeConnector.xml b/svx/xml/SvxShapeConnector.xml
index e80596b91d..e80596b91d 100644..100755
--- a/svx/xml/SvxShapeConnector.xml
+++ b/svx/xml/SvxShapeConnector.xml
diff --git a/svx/xml/SvxShapeControl.xml b/svx/xml/SvxShapeControl.xml
index c2c95e1abe..c2c95e1abe 100644..100755
--- a/svx/xml/SvxShapeControl.xml
+++ b/svx/xml/SvxShapeControl.xml
diff --git a/svx/xml/SvxShapeDimensioning.xml b/svx/xml/SvxShapeDimensioning.xml
index 4a30960107..4a30960107 100644..100755
--- a/svx/xml/SvxShapeDimensioning.xml
+++ b/svx/xml/SvxShapeDimensioning.xml
diff --git a/svx/xml/SvxShapeGroup.xml b/svx/xml/SvxShapeGroup.xml
index e24fa8c703..e24fa8c703 100644..100755
--- a/svx/xml/SvxShapeGroup.xml
+++ b/svx/xml/SvxShapeGroup.xml
diff --git a/svx/xml/SvxShapePolyPolygon.xml b/svx/xml/SvxShapePolyPolygon.xml
index 203bc1df98..203bc1df98 100644..100755
--- a/svx/xml/SvxShapePolyPolygon.xml
+++ b/svx/xml/SvxShapePolyPolygon.xml
diff --git a/svx/xml/SvxShapePolyPolygonBezier.xml b/svx/xml/SvxShapePolyPolygonBezier.xml
index aadabb6df6..aadabb6df6 100644..100755
--- a/svx/xml/SvxShapePolyPolygonBezier.xml
+++ b/svx/xml/SvxShapePolyPolygonBezier.xml
diff --git a/svx/xml/SvxUnoNumberingRules.xml b/svx/xml/SvxUnoNumberingRules.xml
index fe5b13ed49..fe5b13ed49 100644..100755
--- a/svx/xml/SvxUnoNumberingRules.xml
+++ b/svx/xml/SvxUnoNumberingRules.xml
diff --git a/svx/xml/SvxUnoText.xml b/svx/xml/SvxUnoText.xml
index c3b26aa743..c3b26aa743 100644..100755
--- a/svx/xml/SvxUnoText.xml
+++ b/svx/xml/SvxUnoText.xml
diff --git a/svx/xml/SvxUnoTextContent.xml b/svx/xml/SvxUnoTextContent.xml
index 2732d480b5..2732d480b5 100644..100755
--- a/svx/xml/SvxUnoTextContent.xml
+++ b/svx/xml/SvxUnoTextContent.xml
diff --git a/svx/xml/SvxUnoTextContentEnum.xml b/svx/xml/SvxUnoTextContentEnum.xml
index ecbc78b5d3..ecbc78b5d3 100644..100755
--- a/svx/xml/SvxUnoTextContentEnum.xml
+++ b/svx/xml/SvxUnoTextContentEnum.xml
diff --git a/svx/xml/SvxUnoTextCursor.xml b/svx/xml/SvxUnoTextCursor.xml
index fbebd7cf17..fbebd7cf17 100644..100755
--- a/svx/xml/SvxUnoTextCursor.xml
+++ b/svx/xml/SvxUnoTextCursor.xml
diff --git a/svx/xml/SvxUnoTextField.xml b/svx/xml/SvxUnoTextField.xml
index fa64d6b123..fa64d6b123 100644..100755
--- a/svx/xml/SvxUnoTextField.xml
+++ b/svx/xml/SvxUnoTextField.xml
diff --git a/svx/xml/SvxUnoTextRange.xml b/svx/xml/SvxUnoTextRange.xml
index 04b4610fb5..04b4610fb5 100644..100755
--- a/svx/xml/SvxUnoTextRange.xml
+++ b/svx/xml/SvxUnoTextRange.xml
diff --git a/svx/xml/SvxUnoTextRangeEnumeration.xml b/svx/xml/SvxUnoTextRangeEnumeration.xml
index c8fc25adf5..c8fc25adf5 100644..100755
--- a/svx/xml/SvxUnoTextRangeEnumeration.xml
+++ b/svx/xml/SvxUnoTextRangeEnumeration.xml
diff --git a/sysui/desktop/cleanversion/makefile.mk b/sysui/desktop/cleanversion/makefile.mk
index 71a0d7e3df..40651af2d1 100644..100755
--- a/sysui/desktop/cleanversion/makefile.mk
+++ b/sysui/desktop/cleanversion/makefile.mk
@@ -43,7 +43,7 @@ ALLTAR: $(MISC)$/cleanup.flag
 
 # version changed - bin previous trees
 $(MISC)$/cleanup.flag : ..$/productversion.mk
-    rm -rf `ls $(MISC) | grep -v -x $(MISC)$/logs` && $(TOUCH) $@
+    rm -rf `ls -d $(MISC)$/* | sed '/\/logs$/d'` && $(TOUCH) $@
     
 .ENDIF			# "$(MISC)"!=""
     
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index da25ee4542..da25ee4542 100644..100755
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index f0f4e42886..45e0f331f7 100644..100755
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -45,7 +45,7 @@ TARGET=debian
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.3-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -60,22 +60,22 @@ ALLTAR : $(DEBFILES)
 
 %/DEBIAN/control : $$(@:f)
     @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-    ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.3//)) $*$/etc$/
-    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.3//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.3//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.3//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.3//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.3//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.3//)
-    echo "Package: $(*:f:s/_/ /:1:s/3.3//)" > $@
-    cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.3//))/" >> $@
-    echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.3//))-$(PKGREV)" >> $@
+    ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//)) $*$/etc$/
+    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
+    echo "Package: $(*:f:s/_/ /:1:s/3.4//)" > $@
+    cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))/" >> $@
+    echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV)" >> $@
     @du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
 
 %/DEBIAN/postinst : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.3//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
 
 %/DEBIAN/postrm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.3//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
 
 %/DEBIAN/prerm : $$(@:f)
-     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.3//))/g" > $@
+     @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
 
 # --- packaging ---------------------------------------------------
 
diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus
index c477d73635..c477d73635 100644..100755
--- a/sysui/desktop/debian/openoffice.org-debian-menus
+++ b/sysui/desktop/debian/openoffice.org-debian-menus
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index 67161dfa2e..67161dfa2e 100644..100755
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
diff --git a/sysui/desktop/debian/postrm b/sysui/desktop/debian/postrm
index adb9cf448e..adb9cf448e 100644..100755
--- a/sysui/desktop/debian/postrm
+++ b/sysui/desktop/debian/postrm
diff --git a/sysui/desktop/debian/prerm b/sysui/desktop/debian/prerm
index d83e09f841..d83e09f841 100644..100755
--- a/sysui/desktop/debian/prerm
+++ b/sysui/desktop/debian/prerm
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 30c2dd61e8..30c2dd61e8 100644..100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk
index a93aafd71a..a93aafd71a 100644..100755
--- a/sysui/desktop/freedesktop/makefile.mk
+++ b/sysui/desktop/freedesktop/makefile.mk
diff --git a/sysui/desktop/icons/base.icns b/sysui/desktop/icons/base.icns
index e1ed62c262..e1ed62c262 100644..100755
--- a/sysui/desktop/icons/base.icns
+++ b/sysui/desktop/icons/base.icns
diff --git a/sysui/desktop/icons/calc.icns b/sysui/desktop/icons/calc.icns
index a3d4edc572..a3d4edc572 100644..100755
--- a/sysui/desktop/icons/calc.icns
+++ b/sysui/desktop/icons/calc.icns
diff --git a/sysui/desktop/icons/configuration.icns b/sysui/desktop/icons/configuration.icns
index fe0f094682..fe0f094682 100644..100755
--- a/sysui/desktop/icons/configuration.icns
+++ b/sysui/desktop/icons/configuration.icns
diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
index 9fa0bbf3ed..9fa0bbf3ed 100644..100755
--- a/sysui/desktop/icons/database.icns
+++ b/sysui/desktop/icons/database.icns
diff --git a/sysui/desktop/icons/draw.icns b/sysui/desktop/icons/draw.icns
index da511e30dd..da511e30dd 100644..100755
--- a/sysui/desktop/icons/draw.icns
+++ b/sysui/desktop/icons/draw.icns
diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns
index 64c373ecaa..64c373ecaa 100644..100755
--- a/sysui/desktop/icons/drawing-template.icns
+++ b/sysui/desktop/icons/drawing-template.icns
diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns
index d179d041a6..d179d041a6 100644..100755
--- a/sysui/desktop/icons/drawing.icns
+++ b/sysui/desktop/icons/drawing.icns
diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/empty-document.icns
+++ b/sysui/desktop/icons/empty-document.icns
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/empty-document.ico
+++ b/sysui/desktop/icons/empty-document.ico
diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/empty-template.icns
+++ b/sysui/desktop/icons/empty-template.icns
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/empty-template.ico
+++ b/sysui/desktop/icons/empty-template.ico
diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns
index f6dc588095..f6dc588095 100644..100755
--- a/sysui/desktop/icons/formula.icns
+++ b/sysui/desktop/icons/formula.icns
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 9614ca81d6..9614ca81d6 100644..100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
index 59efe6991d..59efe6991d 100644..100755
--- a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
index e396624efe..e396624efe 100644..100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
index 9614ca81d6..9614ca81d6 100644..100755
--- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 3465f32dde..3465f32dde 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/base.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 3f1f4ae93c..3f1f4ae93c 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index 94bc2aa856..94bc2aa856 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index 75d94f0030..75d94f0030 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
index 2459b2a5d6..2459b2a5d6 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/main.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index ab945b1ecf..ab945b1ecf 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/math.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
index 4e8eb0e49d..4e8eb0e49d 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
index 2459b2a5d6..2459b2a5d6 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 1aacbb52b5..1aacbb52b5 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png
index bbf485561e..bbf485561e 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png
index 74770d5d48..74770d5d48 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png
index 30303797ba..30303797ba 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png
index 3eb7f884f9..3eb7f884f9 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png
index c424e4fbf4..c424e4fbf4 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
index 3465f32dde..3465f32dde 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
index 456b8108b6..456b8108b6 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
index 94bc2aa856..94bc2aa856 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index ab945b1ecf..ab945b1ecf 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
index 40777f7276..40777f7276 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
index 99d38d75af..99d38d75af 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
index 75d94f0030..75d94f0030 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
index 74c312c272..74c312c272 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
index 3f1f4ae93c..3f1f4ae93c 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
index 9d7c277546..9d7c277546 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
index 1aacbb52b5..1aacbb52b5 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
index 16bf02e1b5..16bf02e1b5 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png
index bb20d139e1..bb20d139e1 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png
index b82ddf7209..b82ddf7209 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
index 3546349b59..3546349b59 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png
index df164ff2ca..df164ff2ca 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png
index 4d89528825..4d89528825 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png
index 6ff2517af4..6ff2517af4 100644..100755
--- a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png
+++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index 549bcb7eea..549bcb7eea 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/base.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index 162f69c447..162f69c447 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index 2e05ffe8e5..2e05ffe8e5 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index a046ed3fda..a046ed3fda 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
index dba5f4e030..dba5f4e030 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/main.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index f392014275..f392014275 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/math.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
index 2c7a0c03f8..2c7a0c03f8 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
index dba5f4e030..dba5f4e030 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 1942e73d02..1942e73d02 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png
index 709903d46c..709903d46c 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png
index 76e5abdab9..76e5abdab9 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png
index 380c60a7df..380c60a7df 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png
index 37306ac617..37306ac617 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png
index 1f3e799276..1f3e799276 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
index 549bcb7eea..549bcb7eea 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
index 3bd738714a..3bd738714a 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
index 2e05ffe8e5..2e05ffe8e5 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
index f392014275..f392014275 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
index 2cf6741bbf..2cf6741bbf 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
index ea8579d405..ea8579d405 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
index a046ed3fda..a046ed3fda 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
index 0b2b6c5379..0b2b6c5379 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
index 162f69c447..162f69c447 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
index cfd3907193..cfd3907193 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
index 1942e73d02..1942e73d02 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
index c08fd88c04..c08fd88c04 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png
index 0edabbc86f..0edabbc86f 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png
index 0eee1162ce..0eee1162ce 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
index 158a63a58c..158a63a58c 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png
index f7352ab517..f7352ab517 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png
index cfba261023..cfba261023 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png
index 77f87e777b..77f87e777b 100644..100755
--- a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png
+++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index 4851d31c55..4851d31c55 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/base.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/base.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index c3deeb0737..c3deeb0737 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/calc.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 56a835cf9c..56a835cf9c 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/draw.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index 09bbb42bae..09bbb42bae 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/impress.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
index 7f3c00c4a3..7f3c00c4a3 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/main.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 8e2c0a1c1b..8e2c0a1c1b 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/math.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/math.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
index 41971c9652..41971c9652 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
index 7f3c00c4a3..7f3c00c4a3 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 37c931ce31..37c931ce31 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/apps/writer.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png
index 224943b0e9..224943b0e9 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png
index 043dd5dfae..043dd5dfae 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png
index 8857034ce2..8857034ce2 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png
index 45f6d91938..45f6d91938 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png
index 191a619f7c..191a619f7c 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
index 4851d31c55..4851d31c55 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
index e4bec3bff9..e4bec3bff9 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
index 56a835cf9c..56a835cf9c 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
index 8e2c0a1c1b..8e2c0a1c1b 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
index 01bf4e91aa..01bf4e91aa 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
index e072bcd8fb..e072bcd8fb 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
index 09bbb42bae..09bbb42bae 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
index d8ae2c5b02..d8ae2c5b02 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
index c3deeb0737..c3deeb0737 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
index 58aaedd736..58aaedd736 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
index 37c931ce31..37c931ce31 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
index 2b4f9043cb..2b4f9043cb 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png
index 2193c98931..2193c98931 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png
index bd59fbbbaf..bd59fbbbaf 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
index 34c60c2819..34c60c2819 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png
index 6868f577ce..6868f577ce 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png
index 52a28fb3af..52a28fb3af 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png
index 7ead079cad..7ead079cad 100644..100755
--- a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png
+++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png
diff --git a/sysui/desktop/icons/impress.icns b/sysui/desktop/icons/impress.icns
index 22a9475ae6..22a9475ae6 100644..100755
--- a/sysui/desktop/icons/impress.icns
+++ b/sysui/desktop/icons/impress.icns
diff --git a/sysui/desktop/icons/locolor/16x16/apps/base.png b/sysui/desktop/icons/locolor/16x16/apps/base.png
index 347d030bc7..347d030bc7 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/base.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/base.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/calc.png b/sysui/desktop/icons/locolor/16x16/apps/calc.png
index 060d78d2ea..060d78d2ea 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/calc.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/calc.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/draw.png b/sysui/desktop/icons/locolor/16x16/apps/draw.png
index bc4f8cb803..bc4f8cb803 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/draw.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/draw.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/impress.png b/sysui/desktop/icons/locolor/16x16/apps/impress.png
index b780901ee3..b780901ee3 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/impress.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/impress.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/math.png b/sysui/desktop/icons/locolor/16x16/apps/math.png
index 4c7f8e8833..4c7f8e8833 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/math.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/math.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png
index c64e48f6d5..c64e48f6d5 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
index 347d030bc7..347d030bc7 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png
diff --git a/sysui/desktop/icons/locolor/16x16/apps/writer.png b/sysui/desktop/icons/locolor/16x16/apps/writer.png
index c452804daf..c452804daf 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/apps/writer.png
+++ b/sysui/desktop/icons/locolor/16x16/apps/writer.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/database.png b/sysui/desktop/icons/locolor/16x16/mimetypes/database.png
index bbf485561e..bbf485561e 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/database.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/database.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png
index 74770d5d48..74770d5d48 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png
index 30303797ba..30303797ba 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png
index 3eb7f884f9..3eb7f884f9 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png
index c424e4fbf4..c424e4fbf4 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png
index ce87e664b4..ce87e664b4 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png
index 53fe069ca4..53fe069ca4 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png
index 42f31de4c7..42f31de4c7 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png
index f01150fc9c..f01150fc9c 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png
index d2bf0065fa..d2bf0065fa 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png
index ccbe7bfc6d..ccbe7bfc6d 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png
index d87f465af1..d87f465af1 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png
index dd6b36a874..dd6b36a874 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png
index 907cff3dc2..907cff3dc2 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png
index df779f6713..df779f6713 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png
index 2148e49d3c..2148e49d3c 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png
index fed7af4f2a..fed7af4f2a 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png
index bb20d139e1..bb20d139e1 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png
index b82ddf7209..b82ddf7209 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png
index 3546349b59..3546349b59 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png
index df164ff2ca..df164ff2ca 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png
index 4d89528825..4d89528825 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png
diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/text.png b/sysui/desktop/icons/locolor/16x16/mimetypes/text.png
index 6ff2517af4..6ff2517af4 100644..100755
--- a/sysui/desktop/icons/locolor/16x16/mimetypes/text.png
+++ b/sysui/desktop/icons/locolor/16x16/mimetypes/text.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/base.png b/sysui/desktop/icons/locolor/32x32/apps/base.png
index cfaaaba07a..cfaaaba07a 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/base.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/base.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/calc.png b/sysui/desktop/icons/locolor/32x32/apps/calc.png
index 4aff7baf77..4aff7baf77 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/calc.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/calc.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/draw.png b/sysui/desktop/icons/locolor/32x32/apps/draw.png
index 3efa6d4a7d..3efa6d4a7d 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/draw.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/draw.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/impress.png b/sysui/desktop/icons/locolor/32x32/apps/impress.png
index 56dde6ba6c..56dde6ba6c 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/impress.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/impress.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/math.png b/sysui/desktop/icons/locolor/32x32/apps/math.png
index 3b730e50ea..3b730e50ea 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/math.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/math.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png
index 2ad360fe1b..2ad360fe1b 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
index cfaaaba07a..cfaaaba07a 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png
diff --git a/sysui/desktop/icons/locolor/32x32/apps/writer.png b/sysui/desktop/icons/locolor/32x32/apps/writer.png
index eb433dcbb3..eb433dcbb3 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/apps/writer.png
+++ b/sysui/desktop/icons/locolor/32x32/apps/writer.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/database.png b/sysui/desktop/icons/locolor/32x32/mimetypes/database.png
index 709903d46c..709903d46c 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/database.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/database.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png
index 76e5abdab9..76e5abdab9 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png
index 380c60a7df..380c60a7df 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png
index 37306ac617..37306ac617 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png
index 1f3e799276..1f3e799276 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png
index 59316672d4..59316672d4 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png
index 8379765438..8379765438 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png
index cae97d401f..cae97d401f 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png
index 5a90e75eb8..5a90e75eb8 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png
index 19863a5b93..19863a5b93 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png
index d6d2b1d68c..d6d2b1d68c 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png
index da3fbe6e01..da3fbe6e01 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png
index dd0c002fee..dd0c002fee 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png
index 7556a2d60f..7556a2d60f 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png
index d559e565ca..d559e565ca 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png
index 2a5ea8ff42..2a5ea8ff42 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png
index a7dcefd1c2..a7dcefd1c2 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png
index 0edabbc86f..0edabbc86f 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png
index 0eee1162ce..0eee1162ce 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png
index 158a63a58c..158a63a58c 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png
index f7352ab517..f7352ab517 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png
index cfba261023..cfba261023 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png
diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/text.png b/sysui/desktop/icons/locolor/32x32/mimetypes/text.png
index 77f87e777b..77f87e777b 100644..100755
--- a/sysui/desktop/icons/locolor/32x32/mimetypes/text.png
+++ b/sysui/desktop/icons/locolor/32x32/mimetypes/text.png
diff --git a/sysui/desktop/icons/macro.icns b/sysui/desktop/icons/macro.icns
index 00c3978396..00c3978396 100644..100755
--- a/sysui/desktop/icons/macro.icns
+++ b/sysui/desktop/icons/macro.icns
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/main.icns
+++ b/sysui/desktop/icons/main.icns
diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/main.ico
+++ b/sysui/desktop/icons/main.ico
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index ac32cdbe45..ac32cdbe45 100644..100755
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns
index 4b0cf1bb7e..4b0cf1bb7e 100644..100755
--- a/sysui/desktop/icons/master-document.icns
+++ b/sysui/desktop/icons/master-document.icns
diff --git a/sysui/desktop/icons/math.icns b/sysui/desktop/icons/math.icns
index 283c176e90..283c176e90 100644..100755
--- a/sysui/desktop/icons/math.icns
+++ b/sysui/desktop/icons/math.icns
diff --git a/sysui/desktop/icons/oasis-chart.icns b/sysui/desktop/icons/oasis-chart.icns
index acdb9709de..acdb9709de 100644..100755
--- a/sysui/desktop/icons/oasis-chart.icns
+++ b/sysui/desktop/icons/oasis-chart.icns
diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns
index 9fa0bbf3ed..9fa0bbf3ed 100644..100755
--- a/sysui/desktop/icons/oasis-database.icns
+++ b/sysui/desktop/icons/oasis-database.icns
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
index 02cf7a4840..02cf7a4840 100644..100755
--- a/sysui/desktop/icons/oasis-database.ico
+++ b/sysui/desktop/icons/oasis-database.ico
diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns
index 64c373ecaa..64c373ecaa 100644..100755
--- a/sysui/desktop/icons/oasis-drawing-template.icns
+++ b/sysui/desktop/icons/oasis-drawing-template.icns
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
index af2e9ffd93..af2e9ffd93 100644..100755
--- a/sysui/desktop/icons/oasis-drawing-template.ico
+++ b/sysui/desktop/icons/oasis-drawing-template.ico
diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns
index d179d041a6..d179d041a6 100644..100755
--- a/sysui/desktop/icons/oasis-drawing.icns
+++ b/sysui/desktop/icons/oasis-drawing.icns
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
index 5297daeee5..5297daeee5 100644..100755
--- a/sysui/desktop/icons/oasis-drawing.ico
+++ b/sysui/desktop/icons/oasis-drawing.ico
diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/oasis-empty-document.icns
+++ b/sysui/desktop/icons/oasis-empty-document.icns
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/oasis-empty-document.ico
+++ b/sysui/desktop/icons/oasis-empty-document.ico
diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/oasis-empty-template.icns
+++ b/sysui/desktop/icons/oasis-empty-template.icns
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/oasis-empty-template.ico
+++ b/sysui/desktop/icons/oasis-empty-template.ico
diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns
index f6dc588095..f6dc588095 100644..100755
--- a/sysui/desktop/icons/oasis-formula.icns
+++ b/sysui/desktop/icons/oasis-formula.icns
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
index fb2f6515bd..fb2f6515bd 100644..100755
--- a/sysui/desktop/icons/oasis-formula.ico
+++ b/sysui/desktop/icons/oasis-formula.ico
diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns
index 4b0cf1bb7e..4b0cf1bb7e 100644..100755
--- a/sysui/desktop/icons/oasis-master-document.icns
+++ b/sysui/desktop/icons/oasis-master-document.icns
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
index bb849c6e01..bb849c6e01 100644..100755
--- a/sysui/desktop/icons/oasis-master-document.ico
+++ b/sysui/desktop/icons/oasis-master-document.ico
diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns
index 324dc7aae3..324dc7aae3 100644..100755
--- a/sysui/desktop/icons/oasis-presentation-template.icns
+++ b/sysui/desktop/icons/oasis-presentation-template.icns
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
index 7e99e381a3..7e99e381a3 100644..100755
--- a/sysui/desktop/icons/oasis-presentation-template.ico
+++ b/sysui/desktop/icons/oasis-presentation-template.ico
diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns
index c9bc5d0204..c9bc5d0204 100644..100755
--- a/sysui/desktop/icons/oasis-presentation.icns
+++ b/sysui/desktop/icons/oasis-presentation.icns
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
index 9e96c3e576..9e96c3e576 100644..100755
--- a/sysui/desktop/icons/oasis-presentation.ico
+++ b/sysui/desktop/icons/oasis-presentation.ico
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns
index f527a14b79..f527a14b79 100644..100755
--- a/sysui/desktop/icons/oasis-spreadsheet-template.icns
+++ b/sysui/desktop/icons/oasis-spreadsheet-template.icns
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
index a4723714d6..a4723714d6 100644..100755
--- a/sysui/desktop/icons/oasis-spreadsheet-template.ico
+++ b/sysui/desktop/icons/oasis-spreadsheet-template.ico
diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns
index 9d61c699c4..9d61c699c4 100644..100755
--- a/sysui/desktop/icons/oasis-spreadsheet.icns
+++ b/sysui/desktop/icons/oasis-spreadsheet.icns
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
index a9dd6462e7..a9dd6462e7 100644..100755
--- a/sysui/desktop/icons/oasis-spreadsheet.ico
+++ b/sysui/desktop/icons/oasis-spreadsheet.ico
diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns
index accd48b9bd..accd48b9bd 100644..100755
--- a/sysui/desktop/icons/oasis-text-template.icns
+++ b/sysui/desktop/icons/oasis-text-template.icns
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
index 4d33ca0d5a..4d33ca0d5a 100644..100755
--- a/sysui/desktop/icons/oasis-text-template.ico
+++ b/sysui/desktop/icons/oasis-text-template.ico
diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns
index 9b7a301ee0..9b7a301ee0 100644..100755
--- a/sysui/desktop/icons/oasis-text.icns
+++ b/sysui/desktop/icons/oasis-text.icns
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
index cb08cc50e2..cb08cc50e2 100644..100755
--- a/sysui/desktop/icons/oasis-text.ico
+++ b/sysui/desktop/icons/oasis-text.ico
diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns
index 7352237328..7352237328 100644..100755
--- a/sysui/desktop/icons/oasis-web-template.icns
+++ b/sysui/desktop/icons/oasis-web-template.icns
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
index 70c5d61ce4..70c5d61ce4 100644..100755
--- a/sysui/desktop/icons/oasis-web-template.ico
+++ b/sysui/desktop/icons/oasis-web-template.ico
diff --git a/sysui/desktop/icons/ooo-base-app.ico b/sysui/desktop/icons/ooo-base-app.ico
index e9af06abd9..e9af06abd9 100644..100755
--- a/sysui/desktop/icons/ooo-base-app.ico
+++ b/sysui/desktop/icons/ooo-base-app.ico
diff --git a/sysui/desktop/icons/ooo-base-doc.ico b/sysui/desktop/icons/ooo-base-doc.ico
index 62411deef5..62411deef5 100644..100755
--- a/sysui/desktop/icons/ooo-base-doc.ico
+++ b/sysui/desktop/icons/ooo-base-doc.ico
diff --git a/sysui/desktop/icons/ooo-calc-app.ico b/sysui/desktop/icons/ooo-calc-app.ico
index 8d91367e5a..8d91367e5a 100644..100755
--- a/sysui/desktop/icons/ooo-calc-app.ico
+++ b/sysui/desktop/icons/ooo-calc-app.ico
diff --git a/sysui/desktop/icons/ooo-calc-doc.ico b/sysui/desktop/icons/ooo-calc-doc.ico
index 06c49654b4..06c49654b4 100644..100755
--- a/sysui/desktop/icons/ooo-calc-doc.ico
+++ b/sysui/desktop/icons/ooo-calc-doc.ico
diff --git a/sysui/desktop/icons/ooo-calc-tem.ico b/sysui/desktop/icons/ooo-calc-tem.ico
index cb34adc84d..cb34adc84d 100644..100755
--- a/sysui/desktop/icons/ooo-calc-tem.ico
+++ b/sysui/desktop/icons/ooo-calc-tem.ico
diff --git a/sysui/desktop/icons/ooo-chart-doc.ico b/sysui/desktop/icons/ooo-chart-doc.ico
index 4a50158b40..4a50158b40 100644..100755
--- a/sysui/desktop/icons/ooo-chart-doc.ico
+++ b/sysui/desktop/icons/ooo-chart-doc.ico
diff --git a/sysui/desktop/icons/ooo-configuration.ico b/sysui/desktop/icons/ooo-configuration.ico
index 9bae70b68b..9bae70b68b 100644..100755
--- a/sysui/desktop/icons/ooo-configuration.ico
+++ b/sysui/desktop/icons/ooo-configuration.ico
diff --git a/sysui/desktop/icons/ooo-draw-app.ico b/sysui/desktop/icons/ooo-draw-app.ico
index 9f4f0c35af..9f4f0c35af 100644..100755
--- a/sysui/desktop/icons/ooo-draw-app.ico
+++ b/sysui/desktop/icons/ooo-draw-app.ico
diff --git a/sysui/desktop/icons/ooo-draw-doc.ico b/sysui/desktop/icons/ooo-draw-doc.ico
index 96d0710455..96d0710455 100644..100755
--- a/sysui/desktop/icons/ooo-draw-doc.ico
+++ b/sysui/desktop/icons/ooo-draw-doc.ico
diff --git a/sysui/desktop/icons/ooo-draw-tem.ico b/sysui/desktop/icons/ooo-draw-tem.ico
index 6b18169708..6b18169708 100644..100755
--- a/sysui/desktop/icons/ooo-draw-tem.ico
+++ b/sysui/desktop/icons/ooo-draw-tem.ico
diff --git a/sysui/desktop/icons/ooo-empty-doc.ico b/sysui/desktop/icons/ooo-empty-doc.ico
index bd3aa12af5..bd3aa12af5 100644..100755
--- a/sysui/desktop/icons/ooo-empty-doc.ico
+++ b/sysui/desktop/icons/ooo-empty-doc.ico
diff --git a/sysui/desktop/icons/ooo-empty-tem.ico b/sysui/desktop/icons/ooo-empty-tem.ico
index b68f0f15f5..b68f0f15f5 100644..100755
--- a/sysui/desktop/icons/ooo-empty-tem.ico
+++ b/sysui/desktop/icons/ooo-empty-tem.ico
diff --git a/sysui/desktop/icons/ooo-image-doc.ico b/sysui/desktop/icons/ooo-image-doc.ico
index 96d0710455..96d0710455 100644..100755
--- a/sysui/desktop/icons/ooo-image-doc.ico
+++ b/sysui/desktop/icons/ooo-image-doc.ico
diff --git a/sysui/desktop/icons/ooo-impress-app.ico b/sysui/desktop/icons/ooo-impress-app.ico
index 7dcd17aba2..7dcd17aba2 100644..100755
--- a/sysui/desktop/icons/ooo-impress-app.ico
+++ b/sysui/desktop/icons/ooo-impress-app.ico
diff --git a/sysui/desktop/icons/ooo-impress-doc.ico b/sysui/desktop/icons/ooo-impress-doc.ico
index 9da080cefa..9da080cefa 100644..100755
--- a/sysui/desktop/icons/ooo-impress-doc.ico
+++ b/sysui/desktop/icons/ooo-impress-doc.ico
diff --git a/sysui/desktop/icons/ooo-impress-tem.ico b/sysui/desktop/icons/ooo-impress-tem.ico
index aa861d8bfb..aa861d8bfb 100644..100755
--- a/sysui/desktop/icons/ooo-impress-tem.ico
+++ b/sysui/desktop/icons/ooo-impress-tem.ico
diff --git a/sysui/desktop/icons/ooo-macro-doc.ico b/sysui/desktop/icons/ooo-macro-doc.ico
index 266e35d047..266e35d047 100644..100755
--- a/sysui/desktop/icons/ooo-macro-doc.ico
+++ b/sysui/desktop/icons/ooo-macro-doc.ico
diff --git a/sysui/desktop/icons/ooo-main-app.ico b/sysui/desktop/icons/ooo-main-app.ico
index fa01babdb9..fa01babdb9 100644..100755
--- a/sysui/desktop/icons/ooo-main-app.ico
+++ b/sysui/desktop/icons/ooo-main-app.ico
diff --git a/sysui/desktop/icons/ooo-master-doc.ico b/sysui/desktop/icons/ooo-master-doc.ico
index 4a157a9c27..4a157a9c27 100644..100755
--- a/sysui/desktop/icons/ooo-master-doc.ico
+++ b/sysui/desktop/icons/ooo-master-doc.ico
diff --git a/sysui/desktop/icons/ooo-math-app.ico b/sysui/desktop/icons/ooo-math-app.ico
index d182fd54bc..d182fd54bc 100644..100755
--- a/sysui/desktop/icons/ooo-math-app.ico
+++ b/sysui/desktop/icons/ooo-math-app.ico
diff --git a/sysui/desktop/icons/ooo-math-doc.ico b/sysui/desktop/icons/ooo-math-doc.ico
index 786127ab26..786127ab26 100644..100755
--- a/sysui/desktop/icons/ooo-math-doc.ico
+++ b/sysui/desktop/icons/ooo-math-doc.ico
diff --git a/sysui/desktop/icons/ooo-open.ico b/sysui/desktop/icons/ooo-open.ico
index 78987aec34..78987aec34 100644..100755
--- a/sysui/desktop/icons/ooo-open.ico
+++ b/sysui/desktop/icons/ooo-open.ico
diff --git a/sysui/desktop/icons/ooo-printer.ico b/sysui/desktop/icons/ooo-printer.ico
index 14882d1d1a..14882d1d1a 100644..100755
--- a/sysui/desktop/icons/ooo-printer.ico
+++ b/sysui/desktop/icons/ooo-printer.ico
diff --git a/sysui/desktop/icons/ooo-web-doc.ico b/sysui/desktop/icons/ooo-web-doc.ico
index f03da4e65d..f03da4e65d 100644..100755
--- a/sysui/desktop/icons/ooo-web-doc.ico
+++ b/sysui/desktop/icons/ooo-web-doc.ico
diff --git a/sysui/desktop/icons/ooo-writer-app.ico b/sysui/desktop/icons/ooo-writer-app.ico
index 22c9661f1c..22c9661f1c 100644..100755
--- a/sysui/desktop/icons/ooo-writer-app.ico
+++ b/sysui/desktop/icons/ooo-writer-app.ico
diff --git a/sysui/desktop/icons/ooo-writer-doc.ico b/sysui/desktop/icons/ooo-writer-doc.ico
index 694a166d45..694a166d45 100644..100755
--- a/sysui/desktop/icons/ooo-writer-doc.ico
+++ b/sysui/desktop/icons/ooo-writer-doc.ico
diff --git a/sysui/desktop/icons/ooo-writer-tem.ico b/sysui/desktop/icons/ooo-writer-tem.ico
index 9379f9bc0c..9379f9bc0c 100644..100755
--- a/sysui/desktop/icons/ooo-writer-tem.ico
+++ b/sysui/desktop/icons/ooo-writer-tem.ico
diff --git a/sysui/desktop/icons/ooo3_base_app.icns b/sysui/desktop/icons/ooo3_base_app.icns
index 9fa0bbf3ed..9fa0bbf3ed 100644..100755
--- a/sysui/desktop/icons/ooo3_base_app.icns
+++ b/sysui/desktop/icons/ooo3_base_app.icns
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
index 02cf7a4840..02cf7a4840 100644..100755
--- a/sysui/desktop/icons/ooo3_base_app.ico
+++ b/sysui/desktop/icons/ooo3_base_app.ico
diff --git a/sysui/desktop/icons/ooo3_base_doc.ico b/sysui/desktop/icons/ooo3_base_doc.ico
index 87c58e600e..87c58e600e 100644..100755
--- a/sysui/desktop/icons/ooo3_base_doc.ico
+++ b/sysui/desktop/icons/ooo3_base_doc.ico
diff --git a/sysui/desktop/icons/ooo3_calc_app.icns b/sysui/desktop/icons/ooo3_calc_app.icns
index 9d61c699c4..9d61c699c4 100644..100755
--- a/sysui/desktop/icons/ooo3_calc_app.icns
+++ b/sysui/desktop/icons/ooo3_calc_app.icns
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
index a9dd6462e7..a9dd6462e7 100644..100755
--- a/sysui/desktop/icons/ooo3_calc_app.ico
+++ b/sysui/desktop/icons/ooo3_calc_app.ico
diff --git a/sysui/desktop/icons/ooo3_calc_doc.ico b/sysui/desktop/icons/ooo3_calc_doc.ico
index 92741f3c6e..92741f3c6e 100644..100755
--- a/sysui/desktop/icons/ooo3_calc_doc.ico
+++ b/sysui/desktop/icons/ooo3_calc_doc.ico
diff --git a/sysui/desktop/icons/ooo3_calc_tem.ico b/sysui/desktop/icons/ooo3_calc_tem.ico
index 2a72a5ad4d..2a72a5ad4d 100644..100755
--- a/sysui/desktop/icons/ooo3_calc_tem.ico
+++ b/sysui/desktop/icons/ooo3_calc_tem.ico
diff --git a/sysui/desktop/icons/ooo3_chart_doc.ico b/sysui/desktop/icons/ooo3_chart_doc.ico
index 5c46bd4626..5c46bd4626 100644..100755
--- a/sysui/desktop/icons/ooo3_chart_doc.ico
+++ b/sysui/desktop/icons/ooo3_chart_doc.ico
diff --git a/sysui/desktop/icons/ooo3_draw_app.icns b/sysui/desktop/icons/ooo3_draw_app.icns
index d179d041a6..d179d041a6 100644..100755
--- a/sysui/desktop/icons/ooo3_draw_app.icns
+++ b/sysui/desktop/icons/ooo3_draw_app.icns
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
index 5297daeee5..5297daeee5 100644..100755
--- a/sysui/desktop/icons/ooo3_draw_app.ico
+++ b/sysui/desktop/icons/ooo3_draw_app.ico
diff --git a/sysui/desktop/icons/ooo3_draw_doc.ico b/sysui/desktop/icons/ooo3_draw_doc.ico
index 47ed3efbc4..47ed3efbc4 100644..100755
--- a/sysui/desktop/icons/ooo3_draw_doc.ico
+++ b/sysui/desktop/icons/ooo3_draw_doc.ico
diff --git a/sysui/desktop/icons/ooo3_draw_tem.ico b/sysui/desktop/icons/ooo3_draw_tem.ico
index 4a55c995be..4a55c995be 100644..100755
--- a/sysui/desktop/icons/ooo3_draw_tem.ico
+++ b/sysui/desktop/icons/ooo3_draw_tem.ico
diff --git a/sysui/desktop/icons/ooo3_empty_doc.ico b/sysui/desktop/icons/ooo3_empty_doc.ico
index 67e3c345e6..67e3c345e6 100644..100755
--- a/sysui/desktop/icons/ooo3_empty_doc.ico
+++ b/sysui/desktop/icons/ooo3_empty_doc.ico
diff --git a/sysui/desktop/icons/ooo3_empty_tem.ico b/sysui/desktop/icons/ooo3_empty_tem.ico
index eecd336bc4..eecd336bc4 100644..100755
--- a/sysui/desktop/icons/ooo3_empty_tem.ico
+++ b/sysui/desktop/icons/ooo3_empty_tem.ico
diff --git a/sysui/desktop/icons/ooo3_global_doc.ico b/sysui/desktop/icons/ooo3_global_doc.ico
index c7113f89e0..c7113f89e0 100644..100755
--- a/sysui/desktop/icons/ooo3_global_doc.ico
+++ b/sysui/desktop/icons/ooo3_global_doc.ico
diff --git a/sysui/desktop/icons/ooo3_html_doc.ico b/sysui/desktop/icons/ooo3_html_doc.ico
index 2c8b5c527e..2c8b5c527e 100644..100755
--- a/sysui/desktop/icons/ooo3_html_doc.ico
+++ b/sysui/desktop/icons/ooo3_html_doc.ico
diff --git a/sysui/desktop/icons/ooo3_impress_app.icns b/sysui/desktop/icons/ooo3_impress_app.icns
index c9bc5d0204..c9bc5d0204 100644..100755
--- a/sysui/desktop/icons/ooo3_impress_app.icns
+++ b/sysui/desktop/icons/ooo3_impress_app.icns
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
index 9e96c3e576..9e96c3e576 100644..100755
--- a/sysui/desktop/icons/ooo3_impress_app.ico
+++ b/sysui/desktop/icons/ooo3_impress_app.ico
diff --git a/sysui/desktop/icons/ooo3_impress_doc.ico b/sysui/desktop/icons/ooo3_impress_doc.ico
index 0e80d9b01d..0e80d9b01d 100644..100755
--- a/sysui/desktop/icons/ooo3_impress_doc.ico
+++ b/sysui/desktop/icons/ooo3_impress_doc.ico
diff --git a/sysui/desktop/icons/ooo3_impress_tem.ico b/sysui/desktop/icons/ooo3_impress_tem.ico
index 15f988dcd5..15f988dcd5 100644..100755
--- a/sysui/desktop/icons/ooo3_impress_tem.ico
+++ b/sysui/desktop/icons/ooo3_impress_tem.ico
diff --git a/sysui/desktop/icons/ooo3_macro_doc.ico b/sysui/desktop/icons/ooo3_macro_doc.ico
index 6c614ad05d..6c614ad05d 100644..100755
--- a/sysui/desktop/icons/ooo3_macro_doc.ico
+++ b/sysui/desktop/icons/ooo3_macro_doc.ico
diff --git a/sysui/desktop/icons/ooo3_main_app.icns b/sysui/desktop/icons/ooo3_main_app.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/ooo3_main_app.icns
+++ b/sysui/desktop/icons/ooo3_main_app.icns
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/ooo3_main_app.ico
+++ b/sysui/desktop/icons/ooo3_main_app.ico
diff --git a/sysui/desktop/icons/ooo3_math_app.icns b/sysui/desktop/icons/ooo3_math_app.icns
index f6dc588095..f6dc588095 100644..100755
--- a/sysui/desktop/icons/ooo3_math_app.icns
+++ b/sysui/desktop/icons/ooo3_math_app.icns
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
index fb2f6515bd..fb2f6515bd 100644..100755
--- a/sysui/desktop/icons/ooo3_math_app.ico
+++ b/sysui/desktop/icons/ooo3_math_app.ico
diff --git a/sysui/desktop/icons/ooo3_math_doc.ico b/sysui/desktop/icons/ooo3_math_doc.ico
index 9e349dcfcb..9e349dcfcb 100644..100755
--- a/sysui/desktop/icons/ooo3_math_doc.ico
+++ b/sysui/desktop/icons/ooo3_math_doc.ico
diff --git a/sysui/desktop/icons/ooo3_open.icns b/sysui/desktop/icons/ooo3_open.icns
index c5c80a01e7..c5c80a01e7 100644..100755
--- a/sysui/desktop/icons/ooo3_open.icns
+++ b/sysui/desktop/icons/ooo3_open.icns
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
index 20e665faa5..20e665faa5 100644..100755
--- a/sysui/desktop/icons/ooo3_open.ico
+++ b/sysui/desktop/icons/ooo3_open.ico
diff --git a/sysui/desktop/icons/ooo3_writer_app.icns b/sysui/desktop/icons/ooo3_writer_app.icns
index 9b7a301ee0..9b7a301ee0 100644..100755
--- a/sysui/desktop/icons/ooo3_writer_app.icns
+++ b/sysui/desktop/icons/ooo3_writer_app.icns
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
index cb08cc50e2..cb08cc50e2 100644..100755
--- a/sysui/desktop/icons/ooo3_writer_app.ico
+++ b/sysui/desktop/icons/ooo3_writer_app.ico
diff --git a/sysui/desktop/icons/ooo3_writer_doc.ico b/sysui/desktop/icons/ooo3_writer_doc.ico
index 1ed299a865..1ed299a865 100644..100755
--- a/sysui/desktop/icons/ooo3_writer_doc.ico
+++ b/sysui/desktop/icons/ooo3_writer_doc.ico
diff --git a/sysui/desktop/icons/ooo3_writer_tem.ico b/sysui/desktop/icons/ooo3_writer_tem.ico
index f609be128a..f609be128a 100644..100755
--- a/sysui/desktop/icons/ooo3_writer_tem.ico
+++ b/sysui/desktop/icons/ooo3_writer_tem.ico
diff --git a/sysui/desktop/icons/open.icns b/sysui/desktop/icons/open.icns
index 620f8e125b..620f8e125b 100644..100755
--- a/sysui/desktop/icons/open.icns
+++ b/sysui/desktop/icons/open.icns
diff --git a/sysui/desktop/icons/oxt-extension.ico b/sysui/desktop/icons/oxt-extension.ico
index b6c1808d43..b6c1808d43 100644..100755
--- a/sysui/desktop/icons/oxt-extension.ico
+++ b/sysui/desktop/icons/oxt-extension.ico
diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns
index 324dc7aae3..324dc7aae3 100644..100755
--- a/sysui/desktop/icons/presentation-template.icns
+++ b/sysui/desktop/icons/presentation-template.icns
diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns
index c9bc5d0204..c9bc5d0204 100644..100755
--- a/sysui/desktop/icons/presentation.icns
+++ b/sysui/desktop/icons/presentation.icns
diff --git a/sysui/desktop/icons/printer.icns b/sysui/desktop/icons/printer.icns
index a1eb599345..a1eb599345 100644..100755
--- a/sysui/desktop/icons/printer.icns
+++ b/sysui/desktop/icons/printer.icns
diff --git a/sysui/desktop/icons/so7-base-doc.ico b/sysui/desktop/icons/so7-base-doc.ico
index e4beab7270..e4beab7270 100644..100755
--- a/sysui/desktop/icons/so7-base-doc.ico
+++ b/sysui/desktop/icons/so7-base-doc.ico
diff --git a/sysui/desktop/icons/so7-calc-doc.ico b/sysui/desktop/icons/so7-calc-doc.ico
index 8b34fc606c..8b34fc606c 100644..100755
--- a/sysui/desktop/icons/so7-calc-doc.ico
+++ b/sysui/desktop/icons/so7-calc-doc.ico
diff --git a/sysui/desktop/icons/so7-calc-tem.ico b/sysui/desktop/icons/so7-calc-tem.ico
index d074a214a9..d074a214a9 100644..100755
--- a/sysui/desktop/icons/so7-calc-tem.ico
+++ b/sysui/desktop/icons/so7-calc-tem.ico
diff --git a/sysui/desktop/icons/so7-chart-doc.ico b/sysui/desktop/icons/so7-chart-doc.ico
index bdc613fb30..bdc613fb30 100644..100755
--- a/sysui/desktop/icons/so7-chart-doc.ico
+++ b/sysui/desktop/icons/so7-chart-doc.ico
diff --git a/sysui/desktop/icons/so7-draw-doc.ico b/sysui/desktop/icons/so7-draw-doc.ico
index c288186205..c288186205 100644..100755
--- a/sysui/desktop/icons/so7-draw-doc.ico
+++ b/sysui/desktop/icons/so7-draw-doc.ico
diff --git a/sysui/desktop/icons/so7-draw-tem.ico b/sysui/desktop/icons/so7-draw-tem.ico
index 8d713d0f47..8d713d0f47 100644..100755
--- a/sysui/desktop/icons/so7-draw-tem.ico
+++ b/sysui/desktop/icons/so7-draw-tem.ico
diff --git a/sysui/desktop/icons/so7-impress-doc.ico b/sysui/desktop/icons/so7-impress-doc.ico
index a8f9518e62..a8f9518e62 100644..100755
--- a/sysui/desktop/icons/so7-impress-doc.ico
+++ b/sysui/desktop/icons/so7-impress-doc.ico
diff --git a/sysui/desktop/icons/so7-impress-tem.ico b/sysui/desktop/icons/so7-impress-tem.ico
index ac140b2692..ac140b2692 100644..100755
--- a/sysui/desktop/icons/so7-impress-tem.ico
+++ b/sysui/desktop/icons/so7-impress-tem.ico
diff --git a/sysui/desktop/icons/so7-master-doc.ico b/sysui/desktop/icons/so7-master-doc.ico
index 1c30687159..1c30687159 100644..100755
--- a/sysui/desktop/icons/so7-master-doc.ico
+++ b/sysui/desktop/icons/so7-master-doc.ico
diff --git a/sysui/desktop/icons/so7-math-doc.ico b/sysui/desktop/icons/so7-math-doc.ico
index d1cd9bd4c6..d1cd9bd4c6 100644..100755
--- a/sysui/desktop/icons/so7-math-doc.ico
+++ b/sysui/desktop/icons/so7-math-doc.ico
diff --git a/sysui/desktop/icons/so7-writer-doc.ico b/sysui/desktop/icons/so7-writer-doc.ico
index b8eb3df205..b8eb3df205 100644..100755
--- a/sysui/desktop/icons/so7-writer-doc.ico
+++ b/sysui/desktop/icons/so7-writer-doc.ico
diff --git a/sysui/desktop/icons/so7-writer-tem.ico b/sysui/desktop/icons/so7-writer-tem.ico
index 318cce4bc9..318cce4bc9 100644..100755
--- a/sysui/desktop/icons/so7-writer-tem.ico
+++ b/sysui/desktop/icons/so7-writer-tem.ico
diff --git a/sysui/desktop/icons/so8-base-app.ico b/sysui/desktop/icons/so8-base-app.ico
index 4a22d35296..4a22d35296 100644..100755
--- a/sysui/desktop/icons/so8-base-app.ico
+++ b/sysui/desktop/icons/so8-base-app.ico
diff --git a/sysui/desktop/icons/so8-base-doc.ico b/sysui/desktop/icons/so8-base-doc.ico
index bcddbf9576..bcddbf9576 100644..100755
--- a/sysui/desktop/icons/so8-base-doc.ico
+++ b/sysui/desktop/icons/so8-base-doc.ico
diff --git a/sysui/desktop/icons/so8-calc-app.ico b/sysui/desktop/icons/so8-calc-app.ico
index a28cab5615..a28cab5615 100644..100755
--- a/sysui/desktop/icons/so8-calc-app.ico
+++ b/sysui/desktop/icons/so8-calc-app.ico
diff --git a/sysui/desktop/icons/so8-calc-doc.ico b/sysui/desktop/icons/so8-calc-doc.ico
index 5f293dd82c..5f293dd82c 100644..100755
--- a/sysui/desktop/icons/so8-calc-doc.ico
+++ b/sysui/desktop/icons/so8-calc-doc.ico
diff --git a/sysui/desktop/icons/so8-calc-tem.ico b/sysui/desktop/icons/so8-calc-tem.ico
index 98bf906785..98bf906785 100644..100755
--- a/sysui/desktop/icons/so8-calc-tem.ico
+++ b/sysui/desktop/icons/so8-calc-tem.ico
diff --git a/sysui/desktop/icons/so8-chart-doc.ico b/sysui/desktop/icons/so8-chart-doc.ico
index 01ff836543..01ff836543 100644..100755
--- a/sysui/desktop/icons/so8-chart-doc.ico
+++ b/sysui/desktop/icons/so8-chart-doc.ico
diff --git a/sysui/desktop/icons/so8-configuration.ico b/sysui/desktop/icons/so8-configuration.ico
index 57f3b6701b..57f3b6701b 100644..100755
--- a/sysui/desktop/icons/so8-configuration.ico
+++ b/sysui/desktop/icons/so8-configuration.ico
diff --git a/sysui/desktop/icons/so8-draw-app.ico b/sysui/desktop/icons/so8-draw-app.ico
index 6003ccb3d7..6003ccb3d7 100644..100755
--- a/sysui/desktop/icons/so8-draw-app.ico
+++ b/sysui/desktop/icons/so8-draw-app.ico
diff --git a/sysui/desktop/icons/so8-draw-doc.ico b/sysui/desktop/icons/so8-draw-doc.ico
index f4f169bd6f..f4f169bd6f 100644..100755
--- a/sysui/desktop/icons/so8-draw-doc.ico
+++ b/sysui/desktop/icons/so8-draw-doc.ico
diff --git a/sysui/desktop/icons/so8-draw-tem.ico b/sysui/desktop/icons/so8-draw-tem.ico
index d3f63c38db..d3f63c38db 100644..100755
--- a/sysui/desktop/icons/so8-draw-tem.ico
+++ b/sysui/desktop/icons/so8-draw-tem.ico
diff --git a/sysui/desktop/icons/so8-empty-doc.ico b/sysui/desktop/icons/so8-empty-doc.ico
index b71d2b939c..b71d2b939c 100644..100755
--- a/sysui/desktop/icons/so8-empty-doc.ico
+++ b/sysui/desktop/icons/so8-empty-doc.ico
diff --git a/sysui/desktop/icons/so8-empty-tem.ico b/sysui/desktop/icons/so8-empty-tem.ico
index 9368b0a81a..9368b0a81a 100644..100755
--- a/sysui/desktop/icons/so8-empty-tem.ico
+++ b/sysui/desktop/icons/so8-empty-tem.ico
diff --git a/sysui/desktop/icons/so8-image-doc.ico b/sysui/desktop/icons/so8-image-doc.ico
index 11b4f0f6c7..11b4f0f6c7 100644..100755
--- a/sysui/desktop/icons/so8-image-doc.ico
+++ b/sysui/desktop/icons/so8-image-doc.ico
diff --git a/sysui/desktop/icons/so8-impress-app.ico b/sysui/desktop/icons/so8-impress-app.ico
index 8fae43dab2..8fae43dab2 100644..100755
--- a/sysui/desktop/icons/so8-impress-app.ico
+++ b/sysui/desktop/icons/so8-impress-app.ico
diff --git a/sysui/desktop/icons/so8-impress-doc.ico b/sysui/desktop/icons/so8-impress-doc.ico
index 9a91f89f29..9a91f89f29 100644..100755
--- a/sysui/desktop/icons/so8-impress-doc.ico
+++ b/sysui/desktop/icons/so8-impress-doc.ico
diff --git a/sysui/desktop/icons/so8-impress-tem.ico b/sysui/desktop/icons/so8-impress-tem.ico
index f84f813f99..f84f813f99 100644..100755
--- a/sysui/desktop/icons/so8-impress-tem.ico
+++ b/sysui/desktop/icons/so8-impress-tem.ico
diff --git a/sysui/desktop/icons/so8-macro-doc.ico b/sysui/desktop/icons/so8-macro-doc.ico
index f3742e1274..f3742e1274 100644..100755
--- a/sysui/desktop/icons/so8-macro-doc.ico
+++ b/sysui/desktop/icons/so8-macro-doc.ico
diff --git a/sysui/desktop/icons/so8-main-app.ico b/sysui/desktop/icons/so8-main-app.ico
index aa044ad9c7..aa044ad9c7 100644..100755
--- a/sysui/desktop/icons/so8-main-app.ico
+++ b/sysui/desktop/icons/so8-main-app.ico
diff --git a/sysui/desktop/icons/so8-master-doc.ico b/sysui/desktop/icons/so8-master-doc.ico
index 27a1d2f61c..27a1d2f61c 100644..100755
--- a/sysui/desktop/icons/so8-master-doc.ico
+++ b/sysui/desktop/icons/so8-master-doc.ico
diff --git a/sysui/desktop/icons/so8-math-app.ico b/sysui/desktop/icons/so8-math-app.ico
index 956c259c75..956c259c75 100644..100755
--- a/sysui/desktop/icons/so8-math-app.ico
+++ b/sysui/desktop/icons/so8-math-app.ico
diff --git a/sysui/desktop/icons/so8-math-doc.ico b/sysui/desktop/icons/so8-math-doc.ico
index e7b8844999..e7b8844999 100644..100755
--- a/sysui/desktop/icons/so8-math-doc.ico
+++ b/sysui/desktop/icons/so8-math-doc.ico
diff --git a/sysui/desktop/icons/so8-open.ico b/sysui/desktop/icons/so8-open.ico
index b77a741b33..b77a741b33 100644..100755
--- a/sysui/desktop/icons/so8-open.ico
+++ b/sysui/desktop/icons/so8-open.ico
diff --git a/sysui/desktop/icons/so8-printer.ico b/sysui/desktop/icons/so8-printer.ico
index 25e61f8de5..25e61f8de5 100644..100755
--- a/sysui/desktop/icons/so8-printer.ico
+++ b/sysui/desktop/icons/so8-printer.ico
diff --git a/sysui/desktop/icons/so8-web-doc.ico b/sysui/desktop/icons/so8-web-doc.ico
index 12eeb63cff..12eeb63cff 100644..100755
--- a/sysui/desktop/icons/so8-web-doc.ico
+++ b/sysui/desktop/icons/so8-web-doc.ico
diff --git a/sysui/desktop/icons/so8-writer-app.ico b/sysui/desktop/icons/so8-writer-app.ico
index 15f7f92d4b..15f7f92d4b 100644..100755
--- a/sysui/desktop/icons/so8-writer-app.ico
+++ b/sysui/desktop/icons/so8-writer-app.ico
diff --git a/sysui/desktop/icons/so8-writer-doc.ico b/sysui/desktop/icons/so8-writer-doc.ico
index da774be1d3..da774be1d3 100644..100755
--- a/sysui/desktop/icons/so8-writer-doc.ico
+++ b/sysui/desktop/icons/so8-writer-doc.ico
diff --git a/sysui/desktop/icons/so8-writer-tem.ico b/sysui/desktop/icons/so8-writer-tem.ico
index 1bdb86c809..1bdb86c809 100644..100755
--- a/sysui/desktop/icons/so8-writer-tem.ico
+++ b/sysui/desktop/icons/so8-writer-tem.ico
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
index 56a323c07e..56a323c07e 100644..100755
--- a/sysui/desktop/icons/so9_base_app.ico
+++ b/sysui/desktop/icons/so9_base_app.ico
diff --git a/sysui/desktop/icons/so9_base_doc.ico b/sysui/desktop/icons/so9_base_doc.ico
index 8cc1d4433c..8cc1d4433c 100644..100755
--- a/sysui/desktop/icons/so9_base_doc.ico
+++ b/sysui/desktop/icons/so9_base_doc.ico
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
index 81e6948d39..81e6948d39 100644..100755
--- a/sysui/desktop/icons/so9_calc_app.ico
+++ b/sysui/desktop/icons/so9_calc_app.ico
diff --git a/sysui/desktop/icons/so9_calc_doc.ico b/sysui/desktop/icons/so9_calc_doc.ico
index 2b9e514cb9..2b9e514cb9 100644..100755
--- a/sysui/desktop/icons/so9_calc_doc.ico
+++ b/sysui/desktop/icons/so9_calc_doc.ico
diff --git a/sysui/desktop/icons/so9_calc_tem.ico b/sysui/desktop/icons/so9_calc_tem.ico
index 17f4823c43..17f4823c43 100644..100755
--- a/sysui/desktop/icons/so9_calc_tem.ico
+++ b/sysui/desktop/icons/so9_calc_tem.ico
diff --git a/sysui/desktop/icons/so9_chart_doc.ico b/sysui/desktop/icons/so9_chart_doc.ico
index b116c81903..b116c81903 100644..100755
--- a/sysui/desktop/icons/so9_chart_doc.ico
+++ b/sysui/desktop/icons/so9_chart_doc.ico
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
index a2c108ad6f..a2c108ad6f 100644..100755
--- a/sysui/desktop/icons/so9_draw_app.ico
+++ b/sysui/desktop/icons/so9_draw_app.ico
diff --git a/sysui/desktop/icons/so9_draw_doc.ico b/sysui/desktop/icons/so9_draw_doc.ico
index 51f9504670..51f9504670 100644..100755
--- a/sysui/desktop/icons/so9_draw_doc.ico
+++ b/sysui/desktop/icons/so9_draw_doc.ico
diff --git a/sysui/desktop/icons/so9_draw_tem.ico b/sysui/desktop/icons/so9_draw_tem.ico
index e4b341175b..e4b341175b 100644..100755
--- a/sysui/desktop/icons/so9_draw_tem.ico
+++ b/sysui/desktop/icons/so9_draw_tem.ico
diff --git a/sysui/desktop/icons/so9_empty_doc.ico b/sysui/desktop/icons/so9_empty_doc.ico
index a3970775e3..a3970775e3 100644..100755
--- a/sysui/desktop/icons/so9_empty_doc.ico
+++ b/sysui/desktop/icons/so9_empty_doc.ico
diff --git a/sysui/desktop/icons/so9_empty_tem.ico b/sysui/desktop/icons/so9_empty_tem.ico
index 1b0088b802..1b0088b802 100644..100755
--- a/sysui/desktop/icons/so9_empty_tem.ico
+++ b/sysui/desktop/icons/so9_empty_tem.ico
diff --git a/sysui/desktop/icons/so9_global_doc.ico b/sysui/desktop/icons/so9_global_doc.ico
index ea4ccb3839..ea4ccb3839 100644..100755
--- a/sysui/desktop/icons/so9_global_doc.ico
+++ b/sysui/desktop/icons/so9_global_doc.ico
diff --git a/sysui/desktop/icons/so9_html_doc.ico b/sysui/desktop/icons/so9_html_doc.ico
index 4e5b8bc99c..4e5b8bc99c 100644..100755
--- a/sysui/desktop/icons/so9_html_doc.ico
+++ b/sysui/desktop/icons/so9_html_doc.ico
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
index 0fe4cea9f2..0fe4cea9f2 100644..100755
--- a/sysui/desktop/icons/so9_impress_app.ico
+++ b/sysui/desktop/icons/so9_impress_app.ico
diff --git a/sysui/desktop/icons/so9_impress_doc.ico b/sysui/desktop/icons/so9_impress_doc.ico
index 5258a8b6aa..5258a8b6aa 100644..100755
--- a/sysui/desktop/icons/so9_impress_doc.ico
+++ b/sysui/desktop/icons/so9_impress_doc.ico
diff --git a/sysui/desktop/icons/so9_impress_tem.ico b/sysui/desktop/icons/so9_impress_tem.ico
index dcdbddb3b6..dcdbddb3b6 100644..100755
--- a/sysui/desktop/icons/so9_impress_tem.ico
+++ b/sysui/desktop/icons/so9_impress_tem.ico
diff --git a/sysui/desktop/icons/so9_macro_doc.ico b/sysui/desktop/icons/so9_macro_doc.ico
index cd004015e6..cd004015e6 100644..100755
--- a/sysui/desktop/icons/so9_macro_doc.ico
+++ b/sysui/desktop/icons/so9_macro_doc.ico
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
index 197b924d33..197b924d33 100644..100755
--- a/sysui/desktop/icons/so9_main_app.ico
+++ b/sysui/desktop/icons/so9_main_app.ico
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
index 4d947c2e59..4d947c2e59 100644..100755
--- a/sysui/desktop/icons/so9_math_app.ico
+++ b/sysui/desktop/icons/so9_math_app.ico
diff --git a/sysui/desktop/icons/so9_math_doc.ico b/sysui/desktop/icons/so9_math_doc.ico
index 622ae939d2..622ae939d2 100644..100755
--- a/sysui/desktop/icons/so9_math_doc.ico
+++ b/sysui/desktop/icons/so9_math_doc.ico
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
index 2df20830d9..2df20830d9 100644..100755
--- a/sysui/desktop/icons/so9_writer_app.ico
+++ b/sysui/desktop/icons/so9_writer_app.ico
diff --git a/sysui/desktop/icons/so9_writer_doc.ico b/sysui/desktop/icons/so9_writer_doc.ico
index b0cf11a993..b0cf11a993 100644..100755
--- a/sysui/desktop/icons/so9_writer_doc.ico
+++ b/sysui/desktop/icons/so9_writer_doc.ico
diff --git a/sysui/desktop/icons/so9_writer_tem.ico b/sysui/desktop/icons/so9_writer_tem.ico
index 2e62a19346..2e62a19346 100644..100755
--- a/sysui/desktop/icons/so9_writer_tem.ico
+++ b/sysui/desktop/icons/so9_writer_tem.ico
diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns
index f527a14b79..f527a14b79 100644..100755
--- a/sysui/desktop/icons/spreadsheet-template.icns
+++ b/sysui/desktop/icons/spreadsheet-template.icns
diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns
index 9d61c699c4..9d61c699c4 100644..100755
--- a/sysui/desktop/icons/spreadsheet.icns
+++ b/sysui/desktop/icons/spreadsheet.icns
diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns
index accd48b9bd..accd48b9bd 100644..100755
--- a/sysui/desktop/icons/text-template.icns
+++ b/sysui/desktop/icons/text-template.icns
diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns
index 9b7a301ee0..9b7a301ee0 100644..100755
--- a/sysui/desktop/icons/text.icns
+++ b/sysui/desktop/icons/text.icns
diff --git a/sysui/desktop/icons/writer.icns b/sysui/desktop/icons/writer.icns
index d0f44815e8..d0f44815e8 100644..100755
--- a/sysui/desktop/icons/writer.icns
+++ b/sysui/desktop/icons/writer.icns
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 8100df25d2..8100df25d2 100644..100755
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
diff --git a/sysui/desktop/macosx/delzip b/sysui/desktop/macosx/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/sysui/desktop/macosx/delzip
+++ b/sysui/desktop/macosx/delzip
diff --git a/sysui/desktop/macosx/gen_strings.pl b/sysui/desktop/macosx/gen_strings.pl
index 65e81710ce..65e81710ce 100644..100755
--- a/sysui/desktop/macosx/gen_strings.pl
+++ b/sysui/desktop/macosx/gen_strings.pl
diff --git a/sysui/desktop/macosx/list_icons.pl b/sysui/desktop/macosx/list_icons.pl
index a2fc6efcbe..a2fc6efcbe 100644..100755
--- a/sysui/desktop/macosx/list_icons.pl
+++ b/sysui/desktop/macosx/list_icons.pl
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 9d551600d7..89f23562f3 100644..100755
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -59,8 +59,11 @@ ULFDIR:=..$/share
 
 .INCLUDE : target.mk
 
+.IF "$(ZIP1TARGETN)"!=""
 ZIP1TARGETN : Info.plist extract_icons_names.pl
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} $(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip
 
 $(COMMONMISC)$/PkgInfo :
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 011b52e417..011b52e417 100644..100755
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index f068788577..f068788577 100644..100755
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 40f7e79ebc..40f7e79ebc 100644..100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 3ae2bcb0b1..3ae2bcb0b1 100644..100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index f609d35f69..f609d35f69 100644..100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 814ee1d1fd..814ee1d1fd 100644..100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop
index 8b9c30a2f7..8b9c30a2f7 100644..100755
--- a/sysui/desktop/menus/javafilter.desktop
+++ b/sysui/desktop/menus/javafilter.desktop
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 55fcc29f31..55fcc29f31 100644..100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop
index 3da4d82a33..3da4d82a33 100644..100755
--- a/sysui/desktop/menus/printeradmin.desktop
+++ b/sysui/desktop/menus/printeradmin.desktop
diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop
index 52ac185b9d..52ac185b9d 100644..100755
--- a/sysui/desktop/menus/qstart.desktop
+++ b/sysui/desktop/menus/qstart.desktop
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 390dd93f3a..390dd93f3a 100644..100755
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 59b4f5778e..59b4f5778e 100644..100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
diff --git a/sysui/desktop/mimetypes/drawing-template.desktop b/sysui/desktop/mimetypes/drawing-template.desktop
index e7bb7108e1..e7bb7108e1 100644..100755
--- a/sysui/desktop/mimetypes/drawing-template.desktop
+++ b/sysui/desktop/mimetypes/drawing-template.desktop
diff --git a/sysui/desktop/mimetypes/drawing-template.keys b/sysui/desktop/mimetypes/drawing-template.keys
index 2c6e8449e1..2c6e8449e1 100644..100755
--- a/sysui/desktop/mimetypes/drawing-template.keys
+++ b/sysui/desktop/mimetypes/drawing-template.keys
diff --git a/sysui/desktop/mimetypes/drawing.desktop b/sysui/desktop/mimetypes/drawing.desktop
index 36b74bffc9..36b74bffc9 100644..100755
--- a/sysui/desktop/mimetypes/drawing.desktop
+++ b/sysui/desktop/mimetypes/drawing.desktop
diff --git a/sysui/desktop/mimetypes/drawing.keys b/sysui/desktop/mimetypes/drawing.keys
index 2fbd27e432..2fbd27e432 100644..100755
--- a/sysui/desktop/mimetypes/drawing.keys
+++ b/sysui/desktop/mimetypes/drawing.keys
diff --git a/sysui/desktop/mimetypes/extension.desktop b/sysui/desktop/mimetypes/extension.desktop
index 80cadae7e9..80cadae7e9 100644..100755
--- a/sysui/desktop/mimetypes/extension.desktop
+++ b/sysui/desktop/mimetypes/extension.desktop
diff --git a/sysui/desktop/mimetypes/extension.keys b/sysui/desktop/mimetypes/extension.keys
index a307e5097c..a307e5097c 100644..100755
--- a/sysui/desktop/mimetypes/extension.keys
+++ b/sysui/desktop/mimetypes/extension.keys
diff --git a/sysui/desktop/mimetypes/formula.desktop b/sysui/desktop/mimetypes/formula.desktop
index 9ebaa2f468..9ebaa2f468 100644..100755
--- a/sysui/desktop/mimetypes/formula.desktop
+++ b/sysui/desktop/mimetypes/formula.desktop
diff --git a/sysui/desktop/mimetypes/formula.keys b/sysui/desktop/mimetypes/formula.keys
index 845cdff824..845cdff824 100644..100755
--- a/sysui/desktop/mimetypes/formula.keys
+++ b/sysui/desktop/mimetypes/formula.keys
diff --git a/sysui/desktop/mimetypes/master-document.desktop b/sysui/desktop/mimetypes/master-document.desktop
index 1e30554bc4..1e30554bc4 100644..100755
--- a/sysui/desktop/mimetypes/master-document.desktop
+++ b/sysui/desktop/mimetypes/master-document.desktop
diff --git a/sysui/desktop/mimetypes/master-document.keys b/sysui/desktop/mimetypes/master-document.keys
index a9882a059b..a9882a059b 100644..100755
--- a/sysui/desktop/mimetypes/master-document.keys
+++ b/sysui/desktop/mimetypes/master-document.keys
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
index 06718a915a..06718a915a 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
index be746d9ad8..be746d9ad8 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
index b9156ebb7f..b9156ebb7f 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
index 091cff6214..091cff6214 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
+++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.desktop b/sysui/desktop/mimetypes/ms-excel-sheet.desktop
index 7af20a0eb6..7af20a0eb6 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-sheet.desktop
diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.keys b/sysui/desktop/mimetypes/ms-excel-sheet.keys
index fde5f41b0d..fde5f41b0d 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-sheet.keys
+++ b/sysui/desktop/mimetypes/ms-excel-sheet.keys
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.desktop b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
index 04688e10f5..04688e10f5 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-excel-template-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.keys b/sysui/desktop/mimetypes/ms-excel-template-12.keys
index 8eb36cc1b2..8eb36cc1b2 100644..100755
--- a/sysui/desktop/mimetypes/ms-excel-template-12.keys
+++ b/sysui/desktop/mimetypes/ms-excel-template-12.keys
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
index 082c9681f4..082c9681f4 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
index 2e86010f4b..2e86010f4b 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
index 5408638e7e..5408638e7e 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
index f808f5dcc2..f808f5dcc2 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
+++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
index 8e984e5f51..8e984e5f51 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
index 07f2562693..07f2562693 100644..100755
--- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
+++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys
diff --git a/sysui/desktop/mimetypes/ms-word-document-12.desktop b/sysui/desktop/mimetypes/ms-word-document-12.desktop
index d787d2b59b..d787d2b59b 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document-12.desktop
+++ b/sysui/desktop/mimetypes/ms-word-document-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-word-document-12.keys b/sysui/desktop/mimetypes/ms-word-document-12.keys
index 456564c1a1..456564c1a1 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document-12.keys
+++ b/sysui/desktop/mimetypes/ms-word-document-12.keys
diff --git a/sysui/desktop/mimetypes/ms-word-document.desktop b/sysui/desktop/mimetypes/ms-word-document.desktop
index e47ed43ac4..e47ed43ac4 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document.desktop
+++ b/sysui/desktop/mimetypes/ms-word-document.desktop
diff --git a/sysui/desktop/mimetypes/ms-word-document.keys b/sysui/desktop/mimetypes/ms-word-document.keys
index aefa450376..aefa450376 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document.keys
+++ b/sysui/desktop/mimetypes/ms-word-document.keys
diff --git a/sysui/desktop/mimetypes/ms-word-document2.desktop b/sysui/desktop/mimetypes/ms-word-document2.desktop
index cf2395c8cd..cf2395c8cd 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document2.desktop
+++ b/sysui/desktop/mimetypes/ms-word-document2.desktop
diff --git a/sysui/desktop/mimetypes/ms-word-document2.keys b/sysui/desktop/mimetypes/ms-word-document2.keys
index 260ee7f3a1..260ee7f3a1 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-document2.keys
+++ b/sysui/desktop/mimetypes/ms-word-document2.keys
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.desktop b/sysui/desktop/mimetypes/ms-word-template-12.desktop
index 9ea1ce4c7a..9ea1ce4c7a 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-template-12.desktop
+++ b/sysui/desktop/mimetypes/ms-word-template-12.desktop
diff --git a/sysui/desktop/mimetypes/ms-word-template-12.keys b/sysui/desktop/mimetypes/ms-word-template-12.keys
index 8b49db7015..8b49db7015 100644..100755
--- a/sysui/desktop/mimetypes/ms-word-template-12.keys
+++ b/sysui/desktop/mimetypes/ms-word-template-12.keys
diff --git a/sysui/desktop/mimetypes/oasis-database.desktop b/sysui/desktop/mimetypes/oasis-database.desktop
index 27f95fe97e..27f95fe97e 100644..100755
--- a/sysui/desktop/mimetypes/oasis-database.desktop
+++ b/sysui/desktop/mimetypes/oasis-database.desktop
diff --git a/sysui/desktop/mimetypes/oasis-database.keys b/sysui/desktop/mimetypes/oasis-database.keys
index 19e97202b5..19e97202b5 100644..100755
--- a/sysui/desktop/mimetypes/oasis-database.keys
+++ b/sysui/desktop/mimetypes/oasis-database.keys
diff --git a/sysui/desktop/mimetypes/oasis-drawing-template.desktop b/sysui/desktop/mimetypes/oasis-drawing-template.desktop
index fcb57c942d..fcb57c942d 100644..100755
--- a/sysui/desktop/mimetypes/oasis-drawing-template.desktop
+++ b/sysui/desktop/mimetypes/oasis-drawing-template.desktop
diff --git a/sysui/desktop/mimetypes/oasis-drawing-template.keys b/sysui/desktop/mimetypes/oasis-drawing-template.keys
index 8638fec329..8638fec329 100644..100755
--- a/sysui/desktop/mimetypes/oasis-drawing-template.keys
+++ b/sysui/desktop/mimetypes/oasis-drawing-template.keys
diff --git a/sysui/desktop/mimetypes/oasis-drawing.desktop b/sysui/desktop/mimetypes/oasis-drawing.desktop
index c10aaef87b..c10aaef87b 100644..100755
--- a/sysui/desktop/mimetypes/oasis-drawing.desktop
+++ b/sysui/desktop/mimetypes/oasis-drawing.desktop
diff --git a/sysui/desktop/mimetypes/oasis-drawing.keys b/sysui/desktop/mimetypes/oasis-drawing.keys
index c659749ddb..c659749ddb 100644..100755
--- a/sysui/desktop/mimetypes/oasis-drawing.keys
+++ b/sysui/desktop/mimetypes/oasis-drawing.keys
diff --git a/sysui/desktop/mimetypes/oasis-formula.desktop b/sysui/desktop/mimetypes/oasis-formula.desktop
index f81a25acc6..f81a25acc6 100644..100755
--- a/sysui/desktop/mimetypes/oasis-formula.desktop
+++ b/sysui/desktop/mimetypes/oasis-formula.desktop
diff --git a/sysui/desktop/mimetypes/oasis-formula.keys b/sysui/desktop/mimetypes/oasis-formula.keys
index 60618cb214..60618cb214 100644..100755
--- a/sysui/desktop/mimetypes/oasis-formula.keys
+++ b/sysui/desktop/mimetypes/oasis-formula.keys
diff --git a/sysui/desktop/mimetypes/oasis-master-document.desktop b/sysui/desktop/mimetypes/oasis-master-document.desktop
index d4aeeabea9..d4aeeabea9 100644..100755
--- a/sysui/desktop/mimetypes/oasis-master-document.desktop
+++ b/sysui/desktop/mimetypes/oasis-master-document.desktop
diff --git a/sysui/desktop/mimetypes/oasis-master-document.keys b/sysui/desktop/mimetypes/oasis-master-document.keys
index f950763205..f950763205 100644..100755
--- a/sysui/desktop/mimetypes/oasis-master-document.keys
+++ b/sysui/desktop/mimetypes/oasis-master-document.keys
diff --git a/sysui/desktop/mimetypes/oasis-presentation-template.desktop b/sysui/desktop/mimetypes/oasis-presentation-template.desktop
index f4a441c878..f4a441c878 100644..100755
--- a/sysui/desktop/mimetypes/oasis-presentation-template.desktop
+++ b/sysui/desktop/mimetypes/oasis-presentation-template.desktop
diff --git a/sysui/desktop/mimetypes/oasis-presentation-template.keys b/sysui/desktop/mimetypes/oasis-presentation-template.keys
index b504592a72..b504592a72 100644..100755
--- a/sysui/desktop/mimetypes/oasis-presentation-template.keys
+++ b/sysui/desktop/mimetypes/oasis-presentation-template.keys
diff --git a/sysui/desktop/mimetypes/oasis-presentation.desktop b/sysui/desktop/mimetypes/oasis-presentation.desktop
index 2aad0beec6..2aad0beec6 100644..100755
--- a/sysui/desktop/mimetypes/oasis-presentation.desktop
+++ b/sysui/desktop/mimetypes/oasis-presentation.desktop
diff --git a/sysui/desktop/mimetypes/oasis-presentation.keys b/sysui/desktop/mimetypes/oasis-presentation.keys
index 07c10cfcad..07c10cfcad 100644..100755
--- a/sysui/desktop/mimetypes/oasis-presentation.keys
+++ b/sysui/desktop/mimetypes/oasis-presentation.keys
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop b/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop
index 5d6d2d6f7b..5d6d2d6f7b 100644..100755
--- a/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop
+++ b/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys b/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
index e616a4f3a9..e616a4f3a9 100644..100755
--- a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
+++ b/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet.desktop b/sysui/desktop/mimetypes/oasis-spreadsheet.desktop
index 611a61a2c9..611a61a2c9 100644..100755
--- a/sysui/desktop/mimetypes/oasis-spreadsheet.desktop
+++ b/sysui/desktop/mimetypes/oasis-spreadsheet.desktop
diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet.keys b/sysui/desktop/mimetypes/oasis-spreadsheet.keys
index 009f630e16..009f630e16 100644..100755
--- a/sysui/desktop/mimetypes/oasis-spreadsheet.keys
+++ b/sysui/desktop/mimetypes/oasis-spreadsheet.keys
diff --git a/sysui/desktop/mimetypes/oasis-text-template.desktop b/sysui/desktop/mimetypes/oasis-text-template.desktop
index 9c0d989bbb..9c0d989bbb 100644..100755
--- a/sysui/desktop/mimetypes/oasis-text-template.desktop
+++ b/sysui/desktop/mimetypes/oasis-text-template.desktop
diff --git a/sysui/desktop/mimetypes/oasis-text-template.keys b/sysui/desktop/mimetypes/oasis-text-template.keys
index 3ce0868d69..3ce0868d69 100644..100755
--- a/sysui/desktop/mimetypes/oasis-text-template.keys
+++ b/sysui/desktop/mimetypes/oasis-text-template.keys
diff --git a/sysui/desktop/mimetypes/oasis-text.desktop b/sysui/desktop/mimetypes/oasis-text.desktop
index 769c5cc6d7..769c5cc6d7 100644..100755
--- a/sysui/desktop/mimetypes/oasis-text.desktop
+++ b/sysui/desktop/mimetypes/oasis-text.desktop
diff --git a/sysui/desktop/mimetypes/oasis-text.keys b/sysui/desktop/mimetypes/oasis-text.keys
index acc8a29162..acc8a29162 100644..100755
--- a/sysui/desktop/mimetypes/oasis-text.keys
+++ b/sysui/desktop/mimetypes/oasis-text.keys
diff --git a/sysui/desktop/mimetypes/oasis-web-template.desktop b/sysui/desktop/mimetypes/oasis-web-template.desktop
index 716225f17d..716225f17d 100644..100755
--- a/sysui/desktop/mimetypes/oasis-web-template.desktop
+++ b/sysui/desktop/mimetypes/oasis-web-template.desktop
diff --git a/sysui/desktop/mimetypes/oasis-web-template.keys b/sysui/desktop/mimetypes/oasis-web-template.keys
index 888e45870e..888e45870e 100644..100755
--- a/sysui/desktop/mimetypes/oasis-web-template.keys
+++ b/sysui/desktop/mimetypes/oasis-web-template.keys
diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications
index d2621020e7..d2621020e7 100644..100755
--- a/sysui/desktop/mimetypes/openoffice.applications
+++ b/sysui/desktop/mimetypes/openoffice.applications
diff --git a/sysui/desktop/mimetypes/openoffice.mime b/sysui/desktop/mimetypes/openoffice.mime
index 67c5648253..67c5648253 100644..100755
--- a/sysui/desktop/mimetypes/openoffice.mime
+++ b/sysui/desktop/mimetypes/openoffice.mime
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop
index b7648c76c4..b7648c76c4 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
index 7061ccc880..7061ccc880 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop
index 32e177ef56..32e177ef56 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
index 362b1eea1b..362b1eea1b 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop
index d65a50aac9..d65a50aac9 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys
index cf7a4babbe..cf7a4babbe 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop
index c095099bc1..c095099bc1 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
index ab5a5918ba..ab5a5918ba 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop
index e5886f17d5..e5886f17d5 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
index 4e8f28bdba..4e8f28bdba 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop
index d2559d8125..d2559d8125 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop
diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
index 8951ca3b59..8951ca3b59 100644..100755
--- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
+++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
diff --git a/sysui/desktop/mimetypes/presentation-template.desktop b/sysui/desktop/mimetypes/presentation-template.desktop
index 5d69e22404..5d69e22404 100644..100755
--- a/sysui/desktop/mimetypes/presentation-template.desktop
+++ b/sysui/desktop/mimetypes/presentation-template.desktop
diff --git a/sysui/desktop/mimetypes/presentation-template.keys b/sysui/desktop/mimetypes/presentation-template.keys
index a909f737da..a909f737da 100644..100755
--- a/sysui/desktop/mimetypes/presentation-template.keys
+++ b/sysui/desktop/mimetypes/presentation-template.keys
diff --git a/sysui/desktop/mimetypes/presentation.desktop b/sysui/desktop/mimetypes/presentation.desktop
index bf34928149..bf34928149 100644..100755
--- a/sysui/desktop/mimetypes/presentation.desktop
+++ b/sysui/desktop/mimetypes/presentation.desktop
diff --git a/sysui/desktop/mimetypes/presentation.keys b/sysui/desktop/mimetypes/presentation.keys
index 4620867abe..4620867abe 100644..100755
--- a/sysui/desktop/mimetypes/presentation.keys
+++ b/sysui/desktop/mimetypes/presentation.keys
diff --git a/sysui/desktop/mimetypes/spreadsheet-template.desktop b/sysui/desktop/mimetypes/spreadsheet-template.desktop
index 2ade1dadb2..2ade1dadb2 100644..100755
--- a/sysui/desktop/mimetypes/spreadsheet-template.desktop
+++ b/sysui/desktop/mimetypes/spreadsheet-template.desktop
diff --git a/sysui/desktop/mimetypes/spreadsheet-template.keys b/sysui/desktop/mimetypes/spreadsheet-template.keys
index 604cca7def..604cca7def 100644..100755
--- a/sysui/desktop/mimetypes/spreadsheet-template.keys
+++ b/sysui/desktop/mimetypes/spreadsheet-template.keys
diff --git a/sysui/desktop/mimetypes/spreadsheet.desktop b/sysui/desktop/mimetypes/spreadsheet.desktop
index 4fd14aa426..4fd14aa426 100644..100755
--- a/sysui/desktop/mimetypes/spreadsheet.desktop
+++ b/sysui/desktop/mimetypes/spreadsheet.desktop
diff --git a/sysui/desktop/mimetypes/spreadsheet.keys b/sysui/desktop/mimetypes/spreadsheet.keys
index d108e64284..d108e64284 100644..100755
--- a/sysui/desktop/mimetypes/spreadsheet.keys
+++ b/sysui/desktop/mimetypes/spreadsheet.keys
diff --git a/sysui/desktop/mimetypes/text-template.desktop b/sysui/desktop/mimetypes/text-template.desktop
index 584f66007c..584f66007c 100644..100755
--- a/sysui/desktop/mimetypes/text-template.desktop
+++ b/sysui/desktop/mimetypes/text-template.desktop
diff --git a/sysui/desktop/mimetypes/text-template.keys b/sysui/desktop/mimetypes/text-template.keys
index ef9d424be5..ef9d424be5 100644..100755
--- a/sysui/desktop/mimetypes/text-template.keys
+++ b/sysui/desktop/mimetypes/text-template.keys
diff --git a/sysui/desktop/mimetypes/text.desktop b/sysui/desktop/mimetypes/text.desktop
index 695a1aadab..695a1aadab 100644..100755
--- a/sysui/desktop/mimetypes/text.desktop
+++ b/sysui/desktop/mimetypes/text.desktop
diff --git a/sysui/desktop/mimetypes/text.keys b/sysui/desktop/mimetypes/text.keys
index e42244f263..e42244f263 100644..100755
--- a/sysui/desktop/mimetypes/text.keys
+++ b/sysui/desktop/mimetypes/text.keys
diff --git a/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk
index 7d1637254a..7d1637254a 100644..100755
--- a/sysui/desktop/os2/makefile.mk
+++ b/sysui/desktop/os2/makefile.mk
diff --git a/sysui/desktop/os2/ooo-base-app.ico b/sysui/desktop/os2/ooo-base-app.ico
index e55abae344..e55abae344 100644..100755
--- a/sysui/desktop/os2/ooo-base-app.ico
+++ b/sysui/desktop/os2/ooo-base-app.ico
diff --git a/sysui/desktop/os2/ooo-base-doc.ico b/sysui/desktop/os2/ooo-base-doc.ico
index e1b033ad10..e1b033ad10 100644..100755
--- a/sysui/desktop/os2/ooo-base-doc.ico
+++ b/sysui/desktop/os2/ooo-base-doc.ico
diff --git a/sysui/desktop/os2/ooo-calc-app.ico b/sysui/desktop/os2/ooo-calc-app.ico
index 66adbc6635..66adbc6635 100644..100755
--- a/sysui/desktop/os2/ooo-calc-app.ico
+++ b/sysui/desktop/os2/ooo-calc-app.ico
diff --git a/sysui/desktop/os2/ooo-calc-doc.ico b/sysui/desktop/os2/ooo-calc-doc.ico
index 0cfc09f9c9..0cfc09f9c9 100644..100755
--- a/sysui/desktop/os2/ooo-calc-doc.ico
+++ b/sysui/desktop/os2/ooo-calc-doc.ico
diff --git a/sysui/desktop/os2/ooo-calc-tem.ico b/sysui/desktop/os2/ooo-calc-tem.ico
index 363703e353..363703e353 100644..100755
--- a/sysui/desktop/os2/ooo-calc-tem.ico
+++ b/sysui/desktop/os2/ooo-calc-tem.ico
diff --git a/sysui/desktop/os2/ooo-chart-doc.ico b/sysui/desktop/os2/ooo-chart-doc.ico
index fee582f29d..fee582f29d 100644..100755
--- a/sysui/desktop/os2/ooo-chart-doc.ico
+++ b/sysui/desktop/os2/ooo-chart-doc.ico
diff --git a/sysui/desktop/os2/ooo-configuration.ico b/sysui/desktop/os2/ooo-configuration.ico
index 2723b37fcb..2723b37fcb 100644..100755
--- a/sysui/desktop/os2/ooo-configuration.ico
+++ b/sysui/desktop/os2/ooo-configuration.ico
diff --git a/sysui/desktop/os2/ooo-draw-app.ico b/sysui/desktop/os2/ooo-draw-app.ico
index 1524d99895..1524d99895 100644..100755
--- a/sysui/desktop/os2/ooo-draw-app.ico
+++ b/sysui/desktop/os2/ooo-draw-app.ico
diff --git a/sysui/desktop/os2/ooo-draw-doc.ico b/sysui/desktop/os2/ooo-draw-doc.ico
index a63a39b787..a63a39b787 100644..100755
--- a/sysui/desktop/os2/ooo-draw-doc.ico
+++ b/sysui/desktop/os2/ooo-draw-doc.ico
diff --git a/sysui/desktop/os2/ooo-draw-tem.ico b/sysui/desktop/os2/ooo-draw-tem.ico
index cac9513cb3..cac9513cb3 100644..100755
--- a/sysui/desktop/os2/ooo-draw-tem.ico
+++ b/sysui/desktop/os2/ooo-draw-tem.ico
diff --git a/sysui/desktop/os2/ooo-empty-doc.ico b/sysui/desktop/os2/ooo-empty-doc.ico
index 350e6ac37d..350e6ac37d 100644..100755
--- a/sysui/desktop/os2/ooo-empty-doc.ico
+++ b/sysui/desktop/os2/ooo-empty-doc.ico
diff --git a/sysui/desktop/os2/ooo-empty-tem.ico b/sysui/desktop/os2/ooo-empty-tem.ico
index 3cdff3d8c7..3cdff3d8c7 100644..100755
--- a/sysui/desktop/os2/ooo-empty-tem.ico
+++ b/sysui/desktop/os2/ooo-empty-tem.ico
diff --git a/sysui/desktop/os2/ooo-image-doc.ico b/sysui/desktop/os2/ooo-image-doc.ico
index b1fed4dca8..b1fed4dca8 100644..100755
--- a/sysui/desktop/os2/ooo-image-doc.ico
+++ b/sysui/desktop/os2/ooo-image-doc.ico
diff --git a/sysui/desktop/os2/ooo-impress-app.ico b/sysui/desktop/os2/ooo-impress-app.ico
index e58eaad5cd..e58eaad5cd 100644..100755
--- a/sysui/desktop/os2/ooo-impress-app.ico
+++ b/sysui/desktop/os2/ooo-impress-app.ico
diff --git a/sysui/desktop/os2/ooo-impress-doc.ico b/sysui/desktop/os2/ooo-impress-doc.ico
index ba1b6df74e..ba1b6df74e 100644..100755
--- a/sysui/desktop/os2/ooo-impress-doc.ico
+++ b/sysui/desktop/os2/ooo-impress-doc.ico
diff --git a/sysui/desktop/os2/ooo-impress-tem.ico b/sysui/desktop/os2/ooo-impress-tem.ico
index 93a3509ad5..93a3509ad5 100644..100755
--- a/sysui/desktop/os2/ooo-impress-tem.ico
+++ b/sysui/desktop/os2/ooo-impress-tem.ico
diff --git a/sysui/desktop/os2/ooo-macro-doc.ico b/sysui/desktop/os2/ooo-macro-doc.ico
index 2fe6c55f58..2fe6c55f58 100644..100755
--- a/sysui/desktop/os2/ooo-macro-doc.ico
+++ b/sysui/desktop/os2/ooo-macro-doc.ico
diff --git a/sysui/desktop/os2/ooo-main-app.ico b/sysui/desktop/os2/ooo-main-app.ico
index f7edd4524b..f7edd4524b 100644..100755
--- a/sysui/desktop/os2/ooo-main-app.ico
+++ b/sysui/desktop/os2/ooo-main-app.ico
diff --git a/sysui/desktop/os2/ooo-master-doc.ico b/sysui/desktop/os2/ooo-master-doc.ico
index 2861de24d1..2861de24d1 100644..100755
--- a/sysui/desktop/os2/ooo-master-doc.ico
+++ b/sysui/desktop/os2/ooo-master-doc.ico
diff --git a/sysui/desktop/os2/ooo-math-app.ico b/sysui/desktop/os2/ooo-math-app.ico
index c3c3c81c91..c3c3c81c91 100644..100755
--- a/sysui/desktop/os2/ooo-math-app.ico
+++ b/sysui/desktop/os2/ooo-math-app.ico
diff --git a/sysui/desktop/os2/ooo-math-doc.ico b/sysui/desktop/os2/ooo-math-doc.ico
index a605e9e1ae..a605e9e1ae 100644..100755
--- a/sysui/desktop/os2/ooo-math-doc.ico
+++ b/sysui/desktop/os2/ooo-math-doc.ico
diff --git a/sysui/desktop/os2/ooo-open.ico b/sysui/desktop/os2/ooo-open.ico
index 508909ea38..508909ea38 100644..100755
--- a/sysui/desktop/os2/ooo-open.ico
+++ b/sysui/desktop/os2/ooo-open.ico
diff --git a/sysui/desktop/os2/ooo-printer.ico b/sysui/desktop/os2/ooo-printer.ico
index 30ed6cd00c..30ed6cd00c 100644..100755
--- a/sysui/desktop/os2/ooo-printer.ico
+++ b/sysui/desktop/os2/ooo-printer.ico
diff --git a/sysui/desktop/os2/ooo-web-doc.ico b/sysui/desktop/os2/ooo-web-doc.ico
index d8b4976335..d8b4976335 100644..100755
--- a/sysui/desktop/os2/ooo-web-doc.ico
+++ b/sysui/desktop/os2/ooo-web-doc.ico
diff --git a/sysui/desktop/os2/ooo-writer-app.ico b/sysui/desktop/os2/ooo-writer-app.ico
index c6a5e1fdfc..c6a5e1fdfc 100644..100755
--- a/sysui/desktop/os2/ooo-writer-app.ico
+++ b/sysui/desktop/os2/ooo-writer-app.ico
diff --git a/sysui/desktop/os2/ooo-writer-doc.ico b/sysui/desktop/os2/ooo-writer-doc.ico
index 02a95ecee4..02a95ecee4 100644..100755
--- a/sysui/desktop/os2/ooo-writer-doc.ico
+++ b/sysui/desktop/os2/ooo-writer-doc.ico
diff --git a/sysui/desktop/os2/ooo-writer-tem.ico b/sysui/desktop/os2/ooo-writer-tem.ico
index b356cffbdc..b356cffbdc 100644..100755
--- a/sysui/desktop/os2/ooo-writer-tem.ico
+++ b/sysui/desktop/os2/ooo-writer-tem.ico
diff --git a/sysui/desktop/os2/ooo11-base-doc.ico b/sysui/desktop/os2/ooo11-base-doc.ico
index dda0cba1e2..dda0cba1e2 100644..100755
--- a/sysui/desktop/os2/ooo11-base-doc.ico
+++ b/sysui/desktop/os2/ooo11-base-doc.ico
diff --git a/sysui/desktop/os2/ooo11-calc-doc.ico b/sysui/desktop/os2/ooo11-calc-doc.ico
index d891a04c86..d891a04c86 100644..100755
--- a/sysui/desktop/os2/ooo11-calc-doc.ico
+++ b/sysui/desktop/os2/ooo11-calc-doc.ico
diff --git a/sysui/desktop/os2/ooo11-calc-tem.ico b/sysui/desktop/os2/ooo11-calc-tem.ico
index d891a04c86..d891a04c86 100644..100755
--- a/sysui/desktop/os2/ooo11-calc-tem.ico
+++ b/sysui/desktop/os2/ooo11-calc-tem.ico
diff --git a/sysui/desktop/os2/ooo11-chart-doc.ico b/sysui/desktop/os2/ooo11-chart-doc.ico
index dda0cba1e2..dda0cba1e2 100644..100755
--- a/sysui/desktop/os2/ooo11-chart-doc.ico
+++ b/sysui/desktop/os2/ooo11-chart-doc.ico
diff --git a/sysui/desktop/os2/ooo11-draw-doc.ico b/sysui/desktop/os2/ooo11-draw-doc.ico
index 61312fbe56..61312fbe56 100644..100755
--- a/sysui/desktop/os2/ooo11-draw-doc.ico
+++ b/sysui/desktop/os2/ooo11-draw-doc.ico
diff --git a/sysui/desktop/os2/ooo11-draw-tem.ico b/sysui/desktop/os2/ooo11-draw-tem.ico
index 61312fbe56..61312fbe56 100644..100755
--- a/sysui/desktop/os2/ooo11-draw-tem.ico
+++ b/sysui/desktop/os2/ooo11-draw-tem.ico
diff --git a/sysui/desktop/os2/ooo11-impress-doc.ico b/sysui/desktop/os2/ooo11-impress-doc.ico
index cebf5e56bc..cebf5e56bc 100644..100755
--- a/sysui/desktop/os2/ooo11-impress-doc.ico
+++ b/sysui/desktop/os2/ooo11-impress-doc.ico
diff --git a/sysui/desktop/os2/ooo11-impress-tem.ico b/sysui/desktop/os2/ooo11-impress-tem.ico
index cebf5e56bc..cebf5e56bc 100644..100755
--- a/sysui/desktop/os2/ooo11-impress-tem.ico
+++ b/sysui/desktop/os2/ooo11-impress-tem.ico
diff --git a/sysui/desktop/os2/ooo11-master-doc.ico b/sysui/desktop/os2/ooo11-master-doc.ico
index dda0cba1e2..dda0cba1e2 100644..100755
--- a/sysui/desktop/os2/ooo11-master-doc.ico
+++ b/sysui/desktop/os2/ooo11-master-doc.ico
diff --git a/sysui/desktop/os2/ooo11-math-doc.ico b/sysui/desktop/os2/ooo11-math-doc.ico
index ab8c160077..ab8c160077 100644..100755
--- a/sysui/desktop/os2/ooo11-math-doc.ico
+++ b/sysui/desktop/os2/ooo11-math-doc.ico
diff --git a/sysui/desktop/os2/ooo11-writer-doc.ico b/sysui/desktop/os2/ooo11-writer-doc.ico
index 901d8ec3df..901d8ec3df 100644..100755
--- a/sysui/desktop/os2/ooo11-writer-doc.ico
+++ b/sysui/desktop/os2/ooo11-writer-doc.ico
diff --git a/sysui/desktop/os2/ooo11-writer-tem.ico b/sysui/desktop/os2/ooo11-writer-tem.ico
index 901d8ec3df..901d8ec3df 100644..100755
--- a/sysui/desktop/os2/ooo11-writer-tem.ico
+++ b/sysui/desktop/os2/ooo11-writer-tem.ico
diff --git a/sysui/desktop/os2/so7-base-doc.ico b/sysui/desktop/os2/so7-base-doc.ico
index 5ffd7549cc..5ffd7549cc 100644..100755
--- a/sysui/desktop/os2/so7-base-doc.ico
+++ b/sysui/desktop/os2/so7-base-doc.ico
diff --git a/sysui/desktop/os2/so7-calc-doc.ico b/sysui/desktop/os2/so7-calc-doc.ico
index ead58e51ff..ead58e51ff 100644..100755
--- a/sysui/desktop/os2/so7-calc-doc.ico
+++ b/sysui/desktop/os2/so7-calc-doc.ico
diff --git a/sysui/desktop/os2/so7-calc-tem.ico b/sysui/desktop/os2/so7-calc-tem.ico
index bdbeb0406c..bdbeb0406c 100644..100755
--- a/sysui/desktop/os2/so7-calc-tem.ico
+++ b/sysui/desktop/os2/so7-calc-tem.ico
diff --git a/sysui/desktop/os2/so7-chart-doc.ico b/sysui/desktop/os2/so7-chart-doc.ico
index 5412287c37..5412287c37 100644..100755
--- a/sysui/desktop/os2/so7-chart-doc.ico
+++ b/sysui/desktop/os2/so7-chart-doc.ico
diff --git a/sysui/desktop/os2/so7-draw-doc.ico b/sysui/desktop/os2/so7-draw-doc.ico
index 3e4ab09807..3e4ab09807 100644..100755
--- a/sysui/desktop/os2/so7-draw-doc.ico
+++ b/sysui/desktop/os2/so7-draw-doc.ico
diff --git a/sysui/desktop/os2/so7-draw-tem.ico b/sysui/desktop/os2/so7-draw-tem.ico
index ca46a39a5f..ca46a39a5f 100644..100755
--- a/sysui/desktop/os2/so7-draw-tem.ico
+++ b/sysui/desktop/os2/so7-draw-tem.ico
diff --git a/sysui/desktop/os2/so7-impress-doc.ico b/sysui/desktop/os2/so7-impress-doc.ico
index 4df2d73d3c..4df2d73d3c 100644..100755
--- a/sysui/desktop/os2/so7-impress-doc.ico
+++ b/sysui/desktop/os2/so7-impress-doc.ico
diff --git a/sysui/desktop/os2/so7-impress-tem.ico b/sysui/desktop/os2/so7-impress-tem.ico
index 0c29d09ebf..0c29d09ebf 100644..100755
--- a/sysui/desktop/os2/so7-impress-tem.ico
+++ b/sysui/desktop/os2/so7-impress-tem.ico
diff --git a/sysui/desktop/os2/so7-master-doc.ico b/sysui/desktop/os2/so7-master-doc.ico
index 70a7fa52af..70a7fa52af 100644..100755
--- a/sysui/desktop/os2/so7-master-doc.ico
+++ b/sysui/desktop/os2/so7-master-doc.ico
diff --git a/sysui/desktop/os2/so7-math-doc.ico b/sysui/desktop/os2/so7-math-doc.ico
index 9e1f3bb4db..9e1f3bb4db 100644..100755
--- a/sysui/desktop/os2/so7-math-doc.ico
+++ b/sysui/desktop/os2/so7-math-doc.ico
diff --git a/sysui/desktop/os2/so7-writer-doc.ico b/sysui/desktop/os2/so7-writer-doc.ico
index 01e1fcc897..01e1fcc897 100644..100755
--- a/sysui/desktop/os2/so7-writer-doc.ico
+++ b/sysui/desktop/os2/so7-writer-doc.ico
diff --git a/sysui/desktop/os2/so7-writer-tem.ico b/sysui/desktop/os2/so7-writer-tem.ico
index c6bc74e0e2..c6bc74e0e2 100644..100755
--- a/sysui/desktop/os2/so7-writer-tem.ico
+++ b/sysui/desktop/os2/so7-writer-tem.ico
diff --git a/sysui/desktop/os2/so8-base-app.ico b/sysui/desktop/os2/so8-base-app.ico
index 8480d3cf50..8480d3cf50 100644..100755
--- a/sysui/desktop/os2/so8-base-app.ico
+++ b/sysui/desktop/os2/so8-base-app.ico
diff --git a/sysui/desktop/os2/so8-base-doc.ico b/sysui/desktop/os2/so8-base-doc.ico
index c539d1f4a7..c539d1f4a7 100644..100755
--- a/sysui/desktop/os2/so8-base-doc.ico
+++ b/sysui/desktop/os2/so8-base-doc.ico
diff --git a/sysui/desktop/os2/so8-calc-app.ico b/sysui/desktop/os2/so8-calc-app.ico
index fc129ca977..fc129ca977 100644..100755
--- a/sysui/desktop/os2/so8-calc-app.ico
+++ b/sysui/desktop/os2/so8-calc-app.ico
diff --git a/sysui/desktop/os2/so8-calc-doc.ico b/sysui/desktop/os2/so8-calc-doc.ico
index b5184ff419..b5184ff419 100644..100755
--- a/sysui/desktop/os2/so8-calc-doc.ico
+++ b/sysui/desktop/os2/so8-calc-doc.ico
diff --git a/sysui/desktop/os2/so8-calc-tem.ico b/sysui/desktop/os2/so8-calc-tem.ico
index 6c6b6dbbd4..6c6b6dbbd4 100644..100755
--- a/sysui/desktop/os2/so8-calc-tem.ico
+++ b/sysui/desktop/os2/so8-calc-tem.ico
diff --git a/sysui/desktop/os2/so8-chart-doc.ico b/sysui/desktop/os2/so8-chart-doc.ico
index a3b8ae3c0a..a3b8ae3c0a 100644..100755
--- a/sysui/desktop/os2/so8-chart-doc.ico
+++ b/sysui/desktop/os2/so8-chart-doc.ico
diff --git a/sysui/desktop/os2/so8-configuration.ico b/sysui/desktop/os2/so8-configuration.ico
index eebd9d899a..eebd9d899a 100644..100755
--- a/sysui/desktop/os2/so8-configuration.ico
+++ b/sysui/desktop/os2/so8-configuration.ico
diff --git a/sysui/desktop/os2/so8-draw-app.ico b/sysui/desktop/os2/so8-draw-app.ico
index c491094c5f..c491094c5f 100644..100755
--- a/sysui/desktop/os2/so8-draw-app.ico
+++ b/sysui/desktop/os2/so8-draw-app.ico
diff --git a/sysui/desktop/os2/so8-draw-doc.ico b/sysui/desktop/os2/so8-draw-doc.ico
index 28d1b32e16..28d1b32e16 100644..100755
--- a/sysui/desktop/os2/so8-draw-doc.ico
+++ b/sysui/desktop/os2/so8-draw-doc.ico
diff --git a/sysui/desktop/os2/so8-draw-tem.ico b/sysui/desktop/os2/so8-draw-tem.ico
index caf6ddc8c9..caf6ddc8c9 100644..100755
--- a/sysui/desktop/os2/so8-draw-tem.ico
+++ b/sysui/desktop/os2/so8-draw-tem.ico
diff --git a/sysui/desktop/os2/so8-empty-doc.ico b/sysui/desktop/os2/so8-empty-doc.ico
index 23b1bfa008..23b1bfa008 100644..100755
--- a/sysui/desktop/os2/so8-empty-doc.ico
+++ b/sysui/desktop/os2/so8-empty-doc.ico
diff --git a/sysui/desktop/os2/so8-empty-tem.ico b/sysui/desktop/os2/so8-empty-tem.ico
index 08d0ff0373..08d0ff0373 100644..100755
--- a/sysui/desktop/os2/so8-empty-tem.ico
+++ b/sysui/desktop/os2/so8-empty-tem.ico
diff --git a/sysui/desktop/os2/so8-image-doc.ico b/sysui/desktop/os2/so8-image-doc.ico
index 2c734453e6..2c734453e6 100644..100755
--- a/sysui/desktop/os2/so8-image-doc.ico
+++ b/sysui/desktop/os2/so8-image-doc.ico
diff --git a/sysui/desktop/os2/so8-impress-app.ico b/sysui/desktop/os2/so8-impress-app.ico
index f77ba1d055..f77ba1d055 100644..100755
--- a/sysui/desktop/os2/so8-impress-app.ico
+++ b/sysui/desktop/os2/so8-impress-app.ico
diff --git a/sysui/desktop/os2/so8-impress-doc.ico b/sysui/desktop/os2/so8-impress-doc.ico
index 9bf3ea37f1..9bf3ea37f1 100644..100755
--- a/sysui/desktop/os2/so8-impress-doc.ico
+++ b/sysui/desktop/os2/so8-impress-doc.ico
diff --git a/sysui/desktop/os2/so8-impress-tem.ico b/sysui/desktop/os2/so8-impress-tem.ico
index fe6a1ffbc6..fe6a1ffbc6 100644..100755
--- a/sysui/desktop/os2/so8-impress-tem.ico
+++ b/sysui/desktop/os2/so8-impress-tem.ico
diff --git a/sysui/desktop/os2/so8-macro-doc.ico b/sysui/desktop/os2/so8-macro-doc.ico
index e828c0cd7a..e828c0cd7a 100644..100755
--- a/sysui/desktop/os2/so8-macro-doc.ico
+++ b/sysui/desktop/os2/so8-macro-doc.ico
diff --git a/sysui/desktop/os2/so8-main-app.ico b/sysui/desktop/os2/so8-main-app.ico
index d158dd3bdb..d158dd3bdb 100644..100755
--- a/sysui/desktop/os2/so8-main-app.ico
+++ b/sysui/desktop/os2/so8-main-app.ico
diff --git a/sysui/desktop/os2/so8-master-doc.ico b/sysui/desktop/os2/so8-master-doc.ico
index 1b2ba16e5d..1b2ba16e5d 100644..100755
--- a/sysui/desktop/os2/so8-master-doc.ico
+++ b/sysui/desktop/os2/so8-master-doc.ico
diff --git a/sysui/desktop/os2/so8-math-app.ico b/sysui/desktop/os2/so8-math-app.ico
index 0299bedde7..0299bedde7 100644..100755
--- a/sysui/desktop/os2/so8-math-app.ico
+++ b/sysui/desktop/os2/so8-math-app.ico
diff --git a/sysui/desktop/os2/so8-math-doc.ico b/sysui/desktop/os2/so8-math-doc.ico
index cacbcd9777..cacbcd9777 100644..100755
--- a/sysui/desktop/os2/so8-math-doc.ico
+++ b/sysui/desktop/os2/so8-math-doc.ico
diff --git a/sysui/desktop/os2/so8-open.ico b/sysui/desktop/os2/so8-open.ico
index 6dcee498e5..6dcee498e5 100644..100755
--- a/sysui/desktop/os2/so8-open.ico
+++ b/sysui/desktop/os2/so8-open.ico
diff --git a/sysui/desktop/os2/so8-printer.ico b/sysui/desktop/os2/so8-printer.ico
index 49780f9cc7..49780f9cc7 100644..100755
--- a/sysui/desktop/os2/so8-printer.ico
+++ b/sysui/desktop/os2/so8-printer.ico
diff --git a/sysui/desktop/os2/so8-web-doc.ico b/sysui/desktop/os2/so8-web-doc.ico
index 15a4d860c5..15a4d860c5 100644..100755
--- a/sysui/desktop/os2/so8-web-doc.ico
+++ b/sysui/desktop/os2/so8-web-doc.ico
diff --git a/sysui/desktop/os2/so8-writer-app.ico b/sysui/desktop/os2/so8-writer-app.ico
index 9b36afd755..9b36afd755 100644..100755
--- a/sysui/desktop/os2/so8-writer-app.ico
+++ b/sysui/desktop/os2/so8-writer-app.ico
diff --git a/sysui/desktop/os2/so8-writer-doc.ico b/sysui/desktop/os2/so8-writer-doc.ico
index 12bc54839c..12bc54839c 100644..100755
--- a/sysui/desktop/os2/so8-writer-doc.ico
+++ b/sysui/desktop/os2/so8-writer-doc.ico
diff --git a/sysui/desktop/os2/so8-writer-tem.ico b/sysui/desktop/os2/so8-writer-tem.ico
index ff1a9fe2e2..ff1a9fe2e2 100644..100755
--- a/sysui/desktop/os2/so8-writer-tem.ico
+++ b/sysui/desktop/os2/so8-writer-tem.ico
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 6f41333370..6f41333370 100644..100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index a633cfe244..a633cfe244 100644..100755
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 663fe23145..663fe23145 100644..100755
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
diff --git a/sysui/desktop/share/add_specfile_triggers.sed b/sysui/desktop/share/add_specfile_triggers.sed
index a8d9d2932a..a8d9d2932a 100644..100755
--- a/sysui/desktop/share/add_specfile_triggers.sed
+++ b/sysui/desktop/share/add_specfile_triggers.sed
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 38c0632f0c..38c0632f0c 100644..100755
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl
index b16524ea2d..b16524ea2d 100644..100755
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index fded41ef03..fded41ef03 100644..100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf
index 88fd05c879..88fd05c879 100644..100755
--- a/sysui/desktop/share/documents.ulf
+++ b/sysui/desktop/share/documents.ulf
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
index e36949263f..e36949263f 100644..100755
--- a/sysui/desktop/share/launcher_comment.ulf
+++ b/sysui/desktop/share/launcher_comment.ulf
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index ff8041a155..ff8041a155 100644..100755
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
diff --git a/sysui/desktop/share/launcher_name.ulf b/sysui/desktop/share/launcher_name.ulf
index db97e2686d..db97e2686d 100644..100755
--- a/sysui/desktop/share/launcher_name.ulf
+++ b/sysui/desktop/share/launcher_name.ulf
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 45a1b11c85..45a1b11c85 100644..100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
diff --git a/sysui/desktop/share/openoffice.sh b/sysui/desktop/share/openoffice.sh
index d3ecf978ee..d3ecf978ee 100644..100755
--- a/sysui/desktop/share/openoffice.sh
+++ b/sysui/desktop/share/openoffice.sh
diff --git a/sysui/desktop/share/printeradmin.sh b/sysui/desktop/share/printeradmin.sh
index 9f7ff6bde5..9f7ff6bde5 100644..100755
--- a/sysui/desktop/share/printeradmin.sh
+++ b/sysui/desktop/share/printeradmin.sh
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index cb209e484b..cb209e484b 100644..100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index bc4c74c0cf..4da439ed43 100644..100755
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -40,7 +40,7 @@ TARGET=slackware
 
 # --- Files --------------------------------------------------------
 
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.3-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.4-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
 
 # --- Targets -------------------------------------------------------
 
@@ -59,26 +59,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
 # FIXME: removal of *-extension.* only to create identical packages to OOF680
 %/usr/share/applications : 
     @$(MKDIRHIER) $@
-    /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.3//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+    /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.4//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
     $(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png	
     $(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop 
     $(RM) $*$/usr$/share$/applications$/*.desktop
     $(RM) $*$/usr$/bin$/soffice
 
 %$/install$/doinst.sh : update-script
-    @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//)) )" > $@
-    @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//)) )" >> $@
+    @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" > $@
+    @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//)) )" >> $@
     @echo "( cd usr/bin ; rm -rf soffice )" >> $@
-    @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/program/soffice soffice )" >> $@
-    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )") >> $@
+    @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/program/soffice soffice )" >> $@
+    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.4//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))-$i )") >> $@
     @cat $< >> $@
 
 %$/install$/slack-desc : slack-desc
     @$(MKDIRHIER) $(@:d)
-    @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.3//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.3//))/g" \
-        -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.3//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.3//))/g" \
-        -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.3//))/g" \
-        -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/g" $< > $@
+    @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.4//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
+        -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.4//))/g" \
+        -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.4//))/g" \
+        -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.4//))/g" $< > $@
 
 # needed to satisfy the slackware package tools - they need
 # the entries like this
diff --git a/sysui/desktop/slackware/slack-desc b/sysui/desktop/slackware/slack-desc
index d191373712..d191373712 100644..100755
--- a/sysui/desktop/slackware/slack-desc
+++ b/sysui/desktop/slackware/slack-desc
diff --git a/sysui/desktop/slackware/update-script b/sysui/desktop/slackware/update-script
index f7f957ac9e..f7f957ac9e 100644..100755
--- a/sysui/desktop/slackware/update-script
+++ b/sysui/desktop/slackware/update-script
diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
index bc2059a3ef..bc2059a3ef 100644..100755
--- a/sysui/desktop/solaris/copyright
+++ b/sysui/desktop/solaris/copyright
diff --git a/sysui/desktop/solaris/depend b/sysui/desktop/solaris/depend
index 050e13593a..050e13593a 100644..100755
--- a/sysui/desktop/solaris/depend
+++ b/sysui/desktop/solaris/depend
diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap
index 5c8a1d5135..5c8a1d5135 100644..100755
--- a/sysui/desktop/solaris/mailcap
+++ b/sysui/desktop/solaris/mailcap
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index f74dae146e..f74dae146e 100644..100755
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
diff --git a/sysui/desktop/solaris/mime.types b/sysui/desktop/solaris/mime.types
index 1b0a203f3b..1b0a203f3b 100644..100755
--- a/sysui/desktop/solaris/mime.types
+++ b/sysui/desktop/solaris/mime.types
diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo
index 4f7f42df83..4f7f42df83 100644..100755
--- a/sysui/desktop/solaris/pkginfo
+++ b/sysui/desktop/solaris/pkginfo
diff --git a/sysui/desktop/solaris/postinstall b/sysui/desktop/solaris/postinstall
index 2f775ba6d7..2f775ba6d7 100644..100755
--- a/sysui/desktop/solaris/postinstall
+++ b/sysui/desktop/solaris/postinstall
diff --git a/sysui/desktop/solaris/postremove b/sysui/desktop/solaris/postremove
index 460c3f2fa1..460c3f2fa1 100644..100755
--- a/sysui/desktop/solaris/postremove
+++ b/sysui/desktop/solaris/postremove
diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype
index ef541c3134..ef541c3134 100644..100755
--- a/sysui/desktop/solaris/prototype
+++ b/sysui/desktop/solaris/prototype
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 31ac8c6cf5..31ac8c6cf5 100644..100755
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index fe709694c3..fe709694c3 100644..100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index 6fab6e748a..6fab6e748a 100644..100755
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 8255cc08ca..8255cc08ca 100644..100755
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/util/makefile.mk
diff --git a/sysui/desktop/util/pkgdiff.pl b/sysui/desktop/util/pkgdiff.pl
index ac42fbc020..ac42fbc020 100644..100755
--- a/sysui/desktop/util/pkgdiff.pl
+++ b/sysui/desktop/util/pkgdiff.pl
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index 1530997a3e..b5f26eb936 100644..100755
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -1,4 +1,4 @@
-su	sysui	:	l10n offapi xml2cmp rdbmaker l10ntools setup_native NULL
+su	sysui	:	L10N:l10n offapi xml2cmp rdbmaker l10ntools setup_native NULL
 su	sysui\source\win32\QuickStart		nmake	-	w	su_win32_quickstart NULL
 su	sysui\source\win32\QuickStart\so	nmake	-	w	su_win32_quickstart_so su_win32_quickstart.w NULL
 su	sysui\desktop\icons					nmake	-	w	su_iconsw NULL
diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index c6019cea9a..c6019cea9a 100644..100755
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
diff --git a/sysui/source/win32/QuickStart/OOQuickStart.rc b/sysui/source/win32/QuickStart/OOQuickStart.rc
index 0dc4dab256..0dc4dab256 100644..100755
--- a/sysui/source/win32/QuickStart/OOQuickStart.rc
+++ b/sysui/source/win32/QuickStart/OOQuickStart.rc
diff --git a/sysui/source/win32/QuickStart/QuickStart.cpp b/sysui/source/win32/QuickStart/QuickStart.cpp
index 204b3d3a06..204b3d3a06 100644..100755
--- a/sysui/source/win32/QuickStart/QuickStart.cpp
+++ b/sysui/source/win32/QuickStart/QuickStart.cpp
diff --git a/sysui/source/win32/QuickStart/QuickStart.h b/sysui/source/win32/QuickStart/QuickStart.h
index b61a04075e..b61a04075e 100644..100755
--- a/sysui/source/win32/QuickStart/QuickStart.h
+++ b/sysui/source/win32/QuickStart/QuickStart.h
diff --git a/sysui/source/win32/QuickStart/StdAfx.h b/sysui/source/win32/QuickStart/StdAfx.h
index 88c24f4535..88c24f4535 100644..100755
--- a/sysui/source/win32/QuickStart/StdAfx.h
+++ b/sysui/source/win32/QuickStart/StdAfx.h
diff --git a/sysui/source/win32/QuickStart/makefile.mk b/sysui/source/win32/QuickStart/makefile.mk
index 41242d849d..41242d849d 100644..100755
--- a/sysui/source/win32/QuickStart/makefile.mk
+++ b/sysui/source/win32/QuickStart/makefile.mk
diff --git a/sysui/source/win32/QuickStart/resource.h b/sysui/source/win32/QuickStart/resource.h
index cd47c2ad1f..cd47c2ad1f 100644..100755
--- a/sysui/source/win32/QuickStart/resource.h
+++ b/sysui/source/win32/QuickStart/resource.h
diff --git a/sysui/source/win32/QuickStart/so/QuickStart.rc b/sysui/source/win32/QuickStart/so/QuickStart.rc
index c48dc2358d..c48dc2358d 100644..100755
--- a/sysui/source/win32/QuickStart/so/QuickStart.rc
+++ b/sysui/source/win32/QuickStart/so/QuickStart.rc
diff --git a/sysui/source/win32/QuickStart/so/makefile.mk b/sysui/source/win32/QuickStart/so/makefile.mk
index 6c78972325..6c78972325 100644..100755
--- a/sysui/source/win32/QuickStart/so/makefile.mk
+++ b/sysui/source/win32/QuickStart/so/makefile.mk
diff --git a/sysui/source/win32/misc/AutoBuffer.cxx b/sysui/source/win32/misc/AutoBuffer.cxx
index c9f6a31812..c9f6a31812 100644..100755
--- a/sysui/source/win32/misc/AutoBuffer.cxx
+++ b/sysui/source/win32/misc/AutoBuffer.cxx
diff --git a/sysui/source/win32/misc/AutoBuffer.hxx b/sysui/source/win32/misc/AutoBuffer.hxx
index 6e4b2d8206..6e4b2d8206 100644..100755
--- a/sysui/source/win32/misc/AutoBuffer.hxx
+++ b/sysui/source/win32/misc/AutoBuffer.hxx
diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index de51993794..de51993794 100644..100755
--- a/sysui/source/win32/misc/WinImplHelper.cxx
+++ b/sysui/source/win32/misc/WinImplHelper.cxx
diff --git a/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx
index 397c63c193..397c63c193 100644..100755
--- a/sysui/source/win32/misc/WinImplHelper.hxx
+++ b/sysui/source/win32/misc/WinImplHelper.hxx
diff --git a/sysui/source/win32/misc/makefile.mk b/sysui/source/win32/misc/makefile.mk
index b3b94be764..b3b94be764 100644..100755
--- a/sysui/source/win32/misc/makefile.mk
+++ b/sysui/source/win32/misc/makefile.mk
diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx
index b74e62996d..b74e62996d 100644..100755
--- a/sysui/source/win32/misc/resourceprovider.cxx
+++ b/sysui/source/win32/misc/resourceprovider.cxx
diff --git a/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx
index 870585bfc6..870585bfc6 100644..100755
--- a/sysui/source/win32/misc/resourceprovider.hxx
+++ b/sysui/source/win32/misc/resourceprovider.hxx
diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl
index 0909966e07..0909966e07 100644..100755
--- a/sysui/util/checksize.pl
+++ b/sysui/util/checksize.pl
diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp
index 028ac41759..f0e1c69934 100644..100755
--- a/sysui/util/exports.dxp
+++ b/sysui/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo	
 component_getFactory
diff --git a/sysui/util/makefile.mk b/sysui/util/makefile.mk
index bea3077193..bea3077193 100644..100755
--- a/sysui/util/makefile.mk
+++ b/sysui/util/makefile.mk
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
index 1ed22bada6..1ed22bada6 100644..100755
--- a/ucb/inc/makefile.mk
+++ b/ucb/inc/makefile.mk
diff --git a/ucb/inc/pch/precompiled_ucb.cxx b/ucb/inc/pch/precompiled_ucb.cxx
index 4d49c571cf..4d49c571cf 100644..100755
--- a/ucb/inc/pch/precompiled_ucb.cxx
+++ b/ucb/inc/pch/precompiled_ucb.cxx
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 953d7d65b8..953d7d65b8 100644..100755
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index e58d23926b..7e9d2d4046 100644..100755
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
@@ -17,3 +17,6 @@ uc	ucb\source\ucp\expand		nmake	-	all	uc_expand uc_inc NULL
 uc	ucb\source\ucp\ext		    nmake	-	all	uc_ext uc_inc NULL
 uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL
 uc	ucb\source\ucp\odma			nmake	-	w	uc_odma uc_inc NULL
+uc      ucb\qa\complex\ucb              nmake   -       all     uc_complex_ucb uc_inc NULL
+# fails, please fix
+# uc      ucb\qa\complex\tdoc             nmake   -       all     uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL
diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 7b15e5b7fa..a8242541a5 100644..100755
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -36,5 +36,16 @@
 ..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml
 ..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml%_EXT%\ucptdoc.xml
 
-..\%__SRC%\misc\ucpgvfs-ucd.txt  %_DEST%\bin%_EXT%\ucpgvfs-ucd.txt
-..\%__SRC%\misc\ucpgio-ucd.txt  %_DEST%\bin%_EXT%\ucpgio-ucd.txt
+..\%__SRC%\misc\ucpgvfs.component  %_DEST%\xml%_EXT%\ucpgvfs.component
+..\%__SRC%\misc\ucpgio.component  %_DEST%\xml%_EXT%\ucpgio.component
+..\%__SRC%\misc\cached1.component %_DEST%\xml%_EXT%\cached1.component
+..\%__SRC%\misc\srtrs1.component %_DEST%\xml%_EXT%\srtrs1.component
+..\%__SRC%\misc\ucb1.component %_DEST%\xml%_EXT%\ucb1.component
+..\%__SRC%\misc\ucpdav1.component %_DEST%\xml%_EXT%\ucpdav1.component
+..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml%_EXT%\ucpexpand1.component
+..\%__SRC%\misc\ucpext.component %_DEST%\xml%_EXT%\ucpext.component
+..\%__SRC%\misc\ucpfile1.component %_DEST%\xml%_EXT%\ucpfile1.component
+..\%__SRC%\misc\ucpftp1.component %_DEST%\xml%_EXT%\ucpftp1.component
+..\%__SRC%\misc\ucphier1.component %_DEST%\xml%_EXT%\ucphier1.component
+..\%__SRC%\misc\ucppkg1.component %_DEST%\xml%_EXT%\ucppkg1.component
+..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml%_EXT%\ucptdoc1.component
diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java
index 86a6d08de7..5112f7da79 100755
--- a/ucb/qa/complex/tdoc/CheckContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckContentProvider.java
@@ -42,20 +42,15 @@ import com.sun.star.ucb.XContentIdentifier;
 import com.sun.star.ucb.XContentIdentifierFactory;
 import com.sun.star.ucb.XContentProvider;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
-import complex.tdoc.interfaces._XChild;
-import complex.tdoc.interfaces._XCommandInfoChangeNotifier;
-import complex.tdoc.interfaces._XComponent;
-import complex.tdoc.interfaces._XServiceInfo;
-import complex.tdoc.interfaces._XTypeProvider;
-import complex.tdoc.interfaces._XCommandProcessor;
-import complex.tdoc.interfaces._XContent;
-import complex.tdoc.interfaces._XPropertiesChangeNotifier;
-import complex.tdoc.interfaces._XPropertyContainer;
-import complex.tdoc.interfaces._XPropertySetInfoChangeNotifier;
-import lib.TestEnvironment;
 import util.WriterTools;
-import util.utils;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /**
  * Check the TransientDocumentsContentProvider (TDOC). Three documents are
@@ -66,7 +61,7 @@ import util.utils;
  * with an accept parameter (writer is initially opened). Otherwise loaded
  * documents are not found.
  */
-public class CheckContentProvider extends ComplexTestCase {
+public class CheckContentProvider {
     private final String testDocuments[] = new String[]{"filter.sxw", "chinese.sxw", "Iterator.sxw"};
     private final int countDocs = testDocuments.length;
     private XMultiServiceFactory xMSF = null;
@@ -89,37 +84,38 @@ public class CheckContentProvider extends ComplexTestCase {
      * Important is, that the test of the element comes first, then the test of
      * its interfaces.
      **/
-    public String[] getTestMethodNames() {
-        return new String[]{"checkTDOCRoot", 
-                            "checkTDOCRootInterfaces",
-                            "checkTDOCDocument",
-                            "checkTDOCDocumentInterfaces",
-                            "checkTDOCFolder",
-                            "checkTDOCFolderInterfaces", 
-                            "checkTDOCStream",
-                            "checkTDOCStreamInterfaces",
-                            };
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkTDOCRoot",
+//                            "checkTDOCRootInterfaces",
+//                            "checkTDOCDocument",
+//                            "checkTDOCDocumentInterfaces",
+//                            "checkTDOCFolder",
+//                            "checkTDOCFolderInterfaces",
+//                            "checkTDOCStream",
+//                            "checkTDOCStreamInterfaces",
+//                            };
+//    }
     
     /**
      * Open some documents before the test
      */
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
+    @Before public void before() {
+        xMSF = getMSF();
         xTextDoc = new XTextDocument[countDocs];
-        log.println("Open some new documents.");
+        System.out.println("Open some new documents.");
         for (int i=0; i<countDocs; i++) {
-            String fileName = utils.getFullTestURL(testDocuments[i]);
+            String fileName = TestDocument.getUrl(testDocuments[i]);
             System.out.println("Doc " + i + ": " + fileName);
             xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName);
+            assertNotNull("Can't load document " + fileName, xTextDoc[i]);
         }
     }
     
     /**
      * Close the documents
      */
-    public void after() {
-        log.println("Close all documents.");
+    @After public void after() {
+        System.out.println("Close all documents.");
         for (int i=0; i<countDocs; i++) {
             xTextDoc[i].dispose();
         }
@@ -128,18 +124,16 @@ public class CheckContentProvider extends ComplexTestCase {
     /**
      * Check the tdcp root.
      */
-    public void checkTDOCRoot() {
+    @Test public void checkTDOCRoot() {
         try {
             // create a content provider
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o);
+                            UnoRuntime.queryInterface(XContentProvider.class, o);
             
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                             xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/");
@@ -147,7 +141,7 @@ public class CheckContentProvider extends ComplexTestCase {
             xContent = xContentProvider.queryContent(xContentIdentifier);
             
             String content = xContent.getContentType();
-            log.println("#### Content root: " + content);
+            System.out.println("#### Content root: " + content);
             
             // try to get some documents: should be "countDocs" at least.
             XContentIdentifier[] xContentId = new XContentIdentifier[countDocs+5];
@@ -160,66 +154,68 @@ public class CheckContentProvider extends ComplexTestCase {
                 int returnVal = xContentProvider.compareContentIds(xContentId[i], xContentIdentifier);
                 String cont = null;
                 if (xCont[i] != null)
+                {
                     cont = xCont[i].getContentType();
-                log.println("Document Content " + i + ": " + cont + "  compare with root: " + returnVal);
+                }
+                System.out.println("Document Content " + i + ": " + cont + "  compare with root: " + returnVal);
 
                 xContentId[i] = xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/" + i + "/content.xml");
                 // get content
                 xCont[i] = xContentProvider.queryContent(xContentId[i]);
                 cont = null;
                 if (xCont[i] != null)
+                {
                     cont = xCont[i].getContentType();
-                log.println("\tContent.xml Content " + i + ": " + cont);
+                }
+                System.out.println("\tContent.xml Content " + i + ": " + cont);
             }
             
             util.dbg.printInterfaces(xContent);
         }
         catch(Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Unexpected Exception: " + e.getMessage());
+            e.printStackTrace();
+            fail("Unexpected Exception: " + e.getMessage());
         }
     }
     
     /**
      * Check the interfaces of the root.
      */
-    public void checkTDOCRootInterfaces() {
+    @Test public void checkTDOCRootInterfaces() {
         checkInterfaces(false);
     }
     
     /**
      * Check the tdcp document: document 3 is used.
      */
-    public void checkTDOCDocument() {
+    @Test public void checkTDOCDocument() {
         try {
             xContent = null;
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o);
+                            UnoRuntime.queryInterface(XContentProvider.class, o);
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                             xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/3");
             // get content
             xContent = xContentProvider.queryContent(xContentIdentifier);
-
+            // assertNotNull(xContent);
             String content = xContent.getContentType();
-            log.println("#### Document root: " + content);
+            System.out.println("#### Document root: " + content);
         }
         catch(Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Unexpected Exception: " + e.getMessage());
+            e.printStackTrace();
+            fail("Unexpected Exception: " + e.getMessage());
         }
     }
     
     /**
      * Check the interfaces on the document.
      */
-    public void checkTDOCDocumentInterfaces() {
+    @Test public void checkTDOCDocumentInterfaces() {
         checkInterfaces(true);
     }
  
@@ -227,17 +223,15 @@ public class CheckContentProvider extends ComplexTestCase {
      * Check a folder on document 2 (document 2 contains an embedded picture and 
      * therefore contans a subfolder "Pictures"
      */
-    public void checkTDOCFolder() {
+    @Test public void checkTDOCFolder() {
         try {
             xContent = null;
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o);
+                            UnoRuntime.queryInterface(XContentProvider.class, o);
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                             xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/2/Pictures");
@@ -245,36 +239,34 @@ public class CheckContentProvider extends ComplexTestCase {
             xContent = xContentProvider.queryContent(xContentIdentifier);
 
             String content = xContent.getContentType();
-            log.println("#### Folder type: " + content);
+            System.out.println("#### Folder type: " + content);
         }
         catch(Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Unexpected Exception: " + e.getMessage());
+            e.printStackTrace();
+            fail("Unexpected Exception: " + e.getMessage());
         }
     }
     
     /**
      * Check the interfaces on the folder.
      */
-    public void checkTDOCFolderInterfaces() {
+    @Test public void checkTDOCFolderInterfaces() {
         checkInterfaces(true);
     }
 
     /**
      * Open a stream to the embedded picture of document 1.
      */
-    public void checkTDOCStream() {
+    @Test public void checkTDOCStream() {
         try {
             xContent = null;
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o);
+                            UnoRuntime.queryInterface(XContentProvider.class, o);
 
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                             xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/1/Pictures/10000000000000640000004B9C743800.gif");
@@ -282,18 +274,18 @@ public class CheckContentProvider extends ComplexTestCase {
             xContent = xContentProvider.queryContent(xContentIdentifier);
 
             String content = xContent.getContentType();
-            log.println("#### Folder type: " + content);
+            System.out.println("#### Folder type: " + content);
         }
         catch(Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Unexpected Exception: " + e.getMessage());
+            e.printStackTrace();
+            fail("Unexpected Exception: " + e.getMessage());
         }
     }
     
     /**
      * Check the interfaces on the stream.
      */
-    public void checkTDOCStreamInterfaces() {
+    @Test public void checkTDOCStreamInterfaces() {
         checkInterfaces(true);
     }
  
@@ -319,80 +311,105 @@ public class CheckContentProvider extends ComplexTestCase {
     private void checkInterfaces(boolean hasParent) {
         // check the XTypeProvider interface
         _XTypeProvider xTypeProvider = new _XTypeProvider();
-        xTypeProvider.oObj = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xContent);
-        xTypeProvider.log = log;
-        assure("getImplementationId()", xTypeProvider._getImplementationId());
-        assure("getTypes()", xTypeProvider._getTypes());
+        xTypeProvider.oObj = UnoRuntime.queryInterface(XTypeProvider.class, xContent);
+        // xTypeProvider.log = log;
+        assertNotNull("getImplementationId()", xTypeProvider._getImplementationId());
+        assertNotNull("getTypes()", xTypeProvider._getTypes());
         
         // check the XSewrviceInfo interface
         _XServiceInfo xServiceInfo = new _XServiceInfo();
-        xServiceInfo.oObj = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, xContent);
-        xServiceInfo.log = log;
-        assure("getImplementationName()", xServiceInfo._getImplementationName());
-        assure("getSupportedServiceNames()", xServiceInfo._getSupportedServiceNames());
-        assure("supportsService()", xServiceInfo._supportsService());
+        xServiceInfo.oObj = UnoRuntime.queryInterface(XServiceInfo.class, xContent);
+        // xServiceInfo.log = log;
+        assertNotNull("getImplementationName()", xServiceInfo._getImplementationName());
+        assertNotNull("getSupportedServiceNames()", xServiceInfo._getSupportedServiceNames());
+        assertNotNull("supportsService()", xServiceInfo._supportsService());
         
         // check the XCommandProcessor interface
         _XCommandProcessor xCommandProcessor = new _XCommandProcessor();
-        xCommandProcessor.oObj = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
-        xCommandProcessor.log = log;
-        xCommandProcessor.before((XMultiServiceFactory)param.getMSF());
-        assure("createCommandIdentifier()", xCommandProcessor._createCommandIdentifier());
-        assure("execute()", xCommandProcessor._execute());
-        assure("abort()", xCommandProcessor._abort());
+        xCommandProcessor.oObj = UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
+        // xCommandProcessor.log = log;
+        xCommandProcessor.before(getMSF());
+        assertNotNull("createCommandIdentifier()", xCommandProcessor._createCommandIdentifier());
+        assertNotNull("execute()", xCommandProcessor._execute());
+        assertNotNull("abort()", xCommandProcessor._abort());
         
         // check the XChild interface
         _XChild xChild = new _XChild();
-        xChild.oObj = (XChild)UnoRuntime.queryInterface(XChild.class, xContent);
-        xChild.log = log;
+        xChild.oObj = UnoRuntime.queryInterface(XChild.class, xContent);
+        // xChild.log = log;
         // hasParent dermines, if this content has a parent
-        assure("getParent()", xChild._getParent(hasParent));
+        assertNotNull("getParent()", xChild._getParent(hasParent));
         // parameter does dermine, if this funczion is supported: generally not supported with tdcp content
-        assure("setParent()", xChild._setParent(false));
+        assertNotNull("setParent()", xChild._setParent(false));
 
         // check the XPropertyChangeNotifier interface
         _XPropertiesChangeNotifier xPropChange = new _XPropertiesChangeNotifier();
-        xPropChange.oObj = (XPropertiesChangeNotifier)UnoRuntime.queryInterface(XPropertiesChangeNotifier.class, xContent);
-        xPropChange.log = log;
-        assure("addPropertiesChangeListener()", xPropChange._addPropertiesChangeListener());
-        assure("removePropertiesChangeListener()", xPropChange._removePropertiesChangeListener());
+        xPropChange.oObj = UnoRuntime.queryInterface(XPropertiesChangeNotifier.class, xContent);
+        // xPropChange.log = log;
+        assertNotNull("addPropertiesChangeListener()", xPropChange._addPropertiesChangeListener());
+    assertNotNull("removePropertiesChangeListener()", xPropChange._removePropertiesChangeListener());
 
         // check the XPropertySetInfoChangeNotifier interface
         _XPropertySetInfoChangeNotifier xPropSetInfo = new _XPropertySetInfoChangeNotifier();
-        xPropSetInfo.oObj = (XPropertySetInfoChangeNotifier)UnoRuntime.queryInterface(XPropertySetInfoChangeNotifier.class, xContent);
-        xPropSetInfo.log = log;
-        assure("addPropertiesChangeListener()", xPropSetInfo._addPropertiesChangeListener());
-        assure("removePropertiesChangeListener()", xPropSetInfo._removePropertiesChangeListener());
+        xPropSetInfo.oObj = UnoRuntime.queryInterface(XPropertySetInfoChangeNotifier.class, xContent);
+        // xPropSetInfo.log = log;
+        assertNotNull("addPropertiesChangeListener()", xPropSetInfo._addPropertiesChangeListener());
+    assertNotNull("removePropertiesChangeListener()", xPropSetInfo._removePropertiesChangeListener());
 
         // check the XCommandInfoChangeNotifier interface
         _XCommandInfoChangeNotifier xCommandChange = new _XCommandInfoChangeNotifier();
-        xCommandChange.oObj = (XCommandInfoChangeNotifier)UnoRuntime.queryInterface(XCommandInfoChangeNotifier.class, xContent);
-        xCommandChange.log = log;
-        assure("addCommandInfoChangeListener()", xCommandChange._addCommandInfoChangeListener());
-        assure("removeCommandInfoChangeListener()", xCommandChange._removeCommandInfoChangeListener());
+        xCommandChange.oObj = UnoRuntime.queryInterface(XCommandInfoChangeNotifier.class, xContent);
+        // xCommandChange.log = log;
+        assertNotNull("addCommandInfoChangeListener()", xCommandChange._addCommandInfoChangeListener());
+        assertNotNull("removeCommandInfoChangeListener()", xCommandChange._removeCommandInfoChangeListener());
         
         // check the XContent interface
         _XContent xCont = new _XContent();
-        xCont.oObj = (XContent)UnoRuntime.queryInterface(XContent.class, xContent);
-        xCont.log = log;
-        assure("addContentEventListener()", xCont._addContentEventListener());
-        assure("getContentType()", xCont._getContentType());
-        assure("getIdentifier()", xCont._getIdentifier());
-        assure("removeContentEventListener()", xCont._removeContentEventListener());
+        xCont.oObj = UnoRuntime.queryInterface(XContent.class, xContent);
+        // xCont.log = log;
+        assertNotNull("addContentEventListener()", xCont._addContentEventListener());
+        assertNotNull("getContentType()", xCont._getContentType());
+        assertNotNull("getIdentifier()", xCont._getIdentifier());
+        assertNotNull("removeContentEventListener()", xCont._removeContentEventListener());
         
         // check the XPropertyContainer interface
         _XPropertyContainer xPropCont = new _XPropertyContainer();
-        xPropCont.oObj = (XPropertyContainer)UnoRuntime.queryInterface(XPropertyContainer.class, xContent);
-        xPropCont.log = log;
-        assure("addProperty()", xPropCont._addProperty());
-        assure("removeProperty()", xPropCont._removeProperty());
+        xPropCont.oObj = UnoRuntime.queryInterface(XPropertyContainer.class, xContent);
+        // xPropCont.log = log;
+        assertNotNull("addProperty()", xPropCont._addProperty());
+        assertNotNull("removeProperty()", xPropCont._removeProperty());
 
         // check the XComponent interface
         _XComponent xComponent = new _XComponent();
-        xComponent.oObj = (XComponent)UnoRuntime.queryInterface(XComponent.class, xContent);
-        xComponent.log = log;
-        assure("addEventListener()", xComponent._addEventListener());
-        assure("removeEventListener()", xComponent._removeEventListener());
+        xComponent.oObj = UnoRuntime.queryInterface(XComponent.class, xContent);
+        // xComponent.log = log;
+        assertNotNull("addEventListener()", xComponent._addEventListener());
+        assertNotNull("removeEventListener()", xComponent._removeEventListener());
 //        assure("dispose()", xComponent._dispose());
     }
+
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
index 9d244af245..203cfbe996 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
@@ -30,28 +30,28 @@ import com.sun.star.beans.Property;
 import com.sun.star.beans.XPropertySetInfo;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.sdbc.XResultSet;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.ucb.Command;
-import com.sun.star.ucb.OpenCommandArgument2;
-import com.sun.star.ucb.OpenMode;
 import com.sun.star.ucb.XCommandProcessor;
 import com.sun.star.ucb.XContent;
-import com.sun.star.ucb.XContentAccess;
 import com.sun.star.ucb.XContentIdentifier;
 import com.sun.star.ucb.XContentIdentifierFactory;
 import com.sun.star.ucb.XContentProvider;
-import com.sun.star.ucb.XDynamicResultSet;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
 import util.WriterTools;
-import util.utils;
 
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 /**
  *
  */
-public class CheckTransientDocumentsContent extends ComplexTestCase{
+public class CheckTransientDocumentsContent {
+    // TODO: document doesn't exists
     private final String testDocuments[] = new String[]{"sForm.sxw"};//, "chinese.sxw", "Iterator.sxw"};
     private final int countDocs = testDocuments.length;
     private XMultiServiceFactory xMSF = null;
@@ -61,17 +61,18 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{
         return new String[] {"checkTransientDocumentsContent"};
     }
    
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
+    @Before public void before() {
+        xMSF = getMSF();
         xTextDoc = new XTextDocument[countDocs];
-        log.println("Open some documents.");
+        System.out.println("Open some documents.");
         for (int i=0; i<countDocs; i++) {
-            String fileName = utils.getFullTestURL(testDocuments[i]);
+            String fileName = TestDocument.getUrl(testDocuments[i]);
             xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName);
+            assertNotNull("Can't load document " + fileName, xTextDoc[i]);
         }
     }
-    public void after() {
-        log.println("Close all documents.");
+    @After public void after() {
+        System.out.println("Close all documents.");
         for (int i=0; i<countDocs; i++) {
             xTextDoc[i].dispose();
         }
@@ -80,15 +81,13 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{
     /**
      * Check the content of one document
      */
-    public void checkTransientDocumentsContent() {
+    @Test public void checkTransientDocumentsContent() {
         try {
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, xContentIdentifierFactory);
+                            UnoRuntime.queryInterface(XContentProvider.class, xContentIdentifierFactory);
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                                xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/1");
@@ -96,7 +95,7 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{
             XContent xContent = xContentProvider.queryContent(xContentIdentifier);
 
             // actual test: commands to get some properties
-            XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
+            XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
             // build up the command
             Command command = new Command();
             command.Name = "getPropertySetInfo";
@@ -106,16 +105,16 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{
             Object result = xCommandProcessor.execute(command, 0, null);
             
             // check the result
-            log.println("Result: "+ result.getClass().toString());
-            XPropertySetInfo xPropertySetInfo = (XPropertySetInfo)UnoRuntime.queryInterface(XPropertySetInfo.class, result);
+            System.out.println("Result: "+ result.getClass().toString());
+            XPropertySetInfo xPropertySetInfo = UnoRuntime.queryInterface(XPropertySetInfo.class, result);
             Property[] props = xPropertySetInfo.getProperties();
             boolean res = false;
             for(int i=0; i<props.length; i++) {
                 String propName = props[i].Name;
                 res |= propName.equals("DocumentModel");
-                log.println("Found property: " + propName + "   type: " + props[i].Type.getTypeName());
+                System.out.println("Found property: " + propName + "   type: " + props[i].Type.getTypeName());
             }
-            assure("Did not find property 'DocumentModel' in the Property array.", res);
+            assertNotNull("Did not find property 'DocumentModel' in the Property array.", res);
             
             // get on property
             command.Name = "getPropertyValues";
@@ -130,16 +129,38 @@ public class CheckTransientDocumentsContent extends ComplexTestCase{
             result = xCommandProcessor.execute(command, 0, null);
             
             // check the result
-            log.println("Result: "+ result.getClass().toString());
+            System.out.println("Result: "+ result.getClass().toString());
 
-            XModel xModel = (XModel)UnoRuntime.queryInterface(XModel.class, result);
-            assure("Did not get property 'DocumentModel'.", xModel == null);
+            XModel xModel = UnoRuntime.queryInterface(XModel.class, result);
+            assertTrue("Did not get property 'DocumentModel'.", xModel == null);
         }
         catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Could not create test objects.");
+            e.printStackTrace();
+            fail("Could not create test objects.");
         }
         
     }
+
+     private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
     
 }
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index ba67a76b3e..2ac35777ed 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
@@ -41,15 +41,23 @@ import com.sun.star.ucb.XContentIdentifierFactory;
 import com.sun.star.ucb.XContentProvider;
 import com.sun.star.ucb.XDynamicResultSet;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
+// import complexlib.ComplexTestCase;
 import util.WriterTools;
-import util.utils;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /**
  *
  */
-public class CheckTransientDocumentsContentProvider extends ComplexTestCase {
-    private final String testDocuments[] = new String[]{"sForm.sxw", "chinese.sxw", "Iterator.sxw"};
+public class CheckTransientDocumentsContentProvider {
+    // TODO: document doesn't exists
+    private final String testDocuments[] = new String[]{/*"sForm.sxw",*/ "chinese.sxw", "Iterator.sxw"};
     private final int countDocs = testDocuments.length;
     private XMultiServiceFactory xMSF = null;
     private XTextDocument[] xTextDoc = null;
@@ -58,17 +66,18 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase {
         return new String[]{"checkTransientDocumentsContentProvider"};
     }
     
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
+    @Before public void before() {
+        xMSF = getMSF();
         xTextDoc = new XTextDocument[countDocs];
-        log.println("Open some documents.");
+        System.out.println("Open some documents.");
         for (int i=0; i<countDocs; i++) {
-            String fileName = utils.getFullTestURL(testDocuments[i]);
+            String fileName = TestDocument.getUrl(testDocuments[i]);
             xTextDoc[i] = WriterTools.loadTextDoc(xMSF, fileName);
+            assertNotNull("Can't load document " + fileName, xTextDoc[i]);
         }
     }
-    public void after() {
-        log.println("Close all documents.");
+    @After public void after() {
+        System.out.println("Close all documents.");
         for (int i=0; i<countDocs; i++) {
             xTextDoc[i].dispose();
         }
@@ -78,18 +87,16 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase {
      * Check the provider of document content: open some documents
      * and look if they are accessible.
      */
-    public void checkTransientDocumentsContentProvider() {
+    @Test public void checkTransientDocumentsContentProvider() {
         try {
             // create a content provider
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider = 
-                            (XContentProvider)UnoRuntime.queryInterface(XContentProvider.class, o);
+                            UnoRuntime.queryInterface(XContentProvider.class, o);
             
             // create the ucb
             XContentIdentifierFactory xContentIdentifierFactory = 
-                            (XContentIdentifierFactory)UnoRuntime.queryInterface(
-                            XContentIdentifierFactory.class, xMSF.createInstance(
-                            "com.sun.star.ucb.UniversalContentBroker"));
+                            UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
             XContentIdentifier xContentIdentifier = 
                             xContentIdentifierFactory.createContentIdentifier("vnd.sun.star.tdoc:/");
@@ -97,7 +104,7 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase {
             XContent xContent = xContentProvider.queryContent(xContentIdentifier);
             
             // actual test: execute an "open" command with the content
-            XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
+            XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
             // build up the command
             Command command = new Command();
             OpenCommandArgument2 commandarg2 = new OpenCommandArgument2();
@@ -109,35 +116,59 @@ public class CheckTransientDocumentsContentProvider extends ComplexTestCase {
             Object result = xCommandProcessor.execute(command, 0, null);
             
             // check the result
-            log.println("Result: "+ result.getClass().toString());
-            XDynamicResultSet xDynamicResultSet = (XDynamicResultSet)UnoRuntime.queryInterface(XDynamicResultSet.class, result);
+            System.out.println("Result: "+ result.getClass().toString());
+            XDynamicResultSet xDynamicResultSet = UnoRuntime.queryInterface(XDynamicResultSet.class, result);
             
             // check bug of wrong returned service name.
-            XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, xDynamicResultSet);
+            XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, xDynamicResultSet);
             String[] sNames = xServiceInfo.getSupportedServiceNames();
             String serviceName = sNames[0];
             if (sNames.length > 1)
-                failed("Implementation has been changed. Check this test!");
-            assure("The service name '" + serviceName + "' is not valid.", !serviceName.equals("com.sun.star.ucb.DynamicContentResultSet"), true);
+            {
+                fail("Implementation has been changed. Check this test!");
+            }
+            assertTrue("The service name '" + serviceName + "' is not valid.", !serviceName.equals("com.sun.star.ucb.DynamicContentResultSet"));
 
             XResultSet xResultSet = xDynamicResultSet.getStaticResultSet();
-            XContentAccess xContentAccess = (XContentAccess)UnoRuntime.queryInterface(XContentAccess.class, xResultSet);
+            XContentAccess xContentAccess = UnoRuntime.queryInterface(XContentAccess.class, xResultSet);
             // iterate over the result: three docs were opened, we should have at least three content identifier strings
             int countContentIdentifiers = 0;
             while(xResultSet.next()) {
                 countContentIdentifiers++;
                 String identifier = xContentAccess.queryContentIdentifierString();
-                log.println("Identifier of row " + xResultSet.getRow() + ": " + identifier);
+                System.out.println("Identifier of row " + xResultSet.getRow() + ": " + identifier);
             }
             // some feeble test: if the amount >2, we're ok. 
             // 2do: check better
-            assure("Did only find " + countContentIdentifiers + " open documents." +
+            assertTrue("Did only find " + countContentIdentifiers + " open documents." +
                         " Should have been at least 3.", countContentIdentifiers>2);
         }
         catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Could not create test objects.");
+            e.printStackTrace();
+            fail("Could not create test objects.");
         }
         
     }
+
+     private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
index a89f948b19..0758ba7ef8 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
@@ -34,49 +34,50 @@ import com.sun.star.embed.XStorage;
 import com.sun.star.frame.XModel;
 import com.sun.star.frame.XTransientDocumentsDocumentContentFactory;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.ucb.Command;
 import com.sun.star.ucb.ContentInfo;
-import com.sun.star.ucb.InsertCommandArgument;
 import com.sun.star.ucb.OpenCommandArgument2;
 import com.sun.star.ucb.OpenMode;
 import com.sun.star.ucb.XCommandProcessor;
 import com.sun.star.ucb.XContent;
-import com.sun.star.ucb.XContentAccess;
-import com.sun.star.ucb.XContentIdentifier;
-import com.sun.star.ucb.XContentIdentifierFactory;
-import com.sun.star.ucb.XContentProvider;
 import com.sun.star.ucb.XDynamicResultSet;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
 import util.WriterTools;
 import util.utils;
 
-
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 /**
  *
  */
-public class CheckTransientDocumentsDocumentContent extends ComplexTestCase {
+public class CheckTransientDocumentsDocumentContent {
+    // TODO: document doesn't exists
     private final String testDocuments = "sForm.sxw";
     private final String folderName = "TestFolder";
     private XMultiServiceFactory xMSF = null;
     private XTextDocument xTextDoc = null;
 
-    public String[] getTestMethodNames() {
-        return new String[]{"checkTransientDocumentsDocumentContent"};
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[]{"checkTransientDocumentsDocumentContent"};
+//    }
 
-    public void before() {
-        xMSF = (XMultiServiceFactory)param.getMSF();
-        log.println("Open a document.");
-        String fileName = utils.getFullTestURL(testDocuments);
+    @Before public void before() {
+        xMSF = getMSF();
+        System.out.println("Open a document.");
+        String fileName = TestDocument.getUrl(testDocuments);
         xTextDoc = WriterTools.loadTextDoc(xMSF, fileName);
+        assertNotNull(xTextDoc);
     }
-    public void after() {
-        log.println("Close all documents.");
+    @After public void after() {
+        System.out.println("Close all documents.");
         xTextDoc.dispose();
     }
 
@@ -84,30 +85,28 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase {
      * Check the provider of document content: open some documents
      * and look if they are accessible.
      */
-    public void checkTransientDocumentsDocumentContent() {
+    @Test public void checkTransientDocumentsDocumentContent() {
         try {
             // create a content provider
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory");
 
             XTransientDocumentsDocumentContentFactory xTransientDocumentsDocumentContentFactory =
-                            (XTransientDocumentsDocumentContentFactory)UnoRuntime.queryInterface(
-                            XTransientDocumentsDocumentContentFactory.class, o);
+                            UnoRuntime.queryInterface(XTransientDocumentsDocumentContentFactory.class, o);
             // get the model from the opened document
             XModel xModel = xTextDoc.getCurrentController().getModel();
 
             // a little additional check for 114733
-            XDocumentSubStorageSupplier xDocumentSubStorageSupplier = (XDocumentSubStorageSupplier)
-                            UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class, xModel);
+            XDocumentSubStorageSupplier xDocumentSubStorageSupplier = UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class, xModel);
             String[]names = xDocumentSubStorageSupplier.getDocumentSubStoragesNames();
             for (int i=0; i<names.length; i++) {
-                log.println("SubStorage names " + i + ": " +names[i]);
+                System.out.println("SubStorage names " + i + ": " +names[i]);
             }
             XStorage xStorage = xDocumentSubStorageSupplier.getDocumentSubStorage(names[0], ElementModes.READWRITE);
-            assure("Could not get a storage from the XDocumentStorageSupplier.", xStorage != null);
+            assertTrue("Could not get a storage from the XDocumentStorageSupplier.", xStorage != null);
             // get content
             XContent xContent = xTransientDocumentsDocumentContentFactory.createDocumentContent(xModel);
             // actual test: execute some commands
-            XCommandProcessor xCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
+            XCommandProcessor xCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
 
             // create the command and arguments
             Command command = new Command();
@@ -123,19 +122,19 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase {
             command.Argument = cmargs2;
 
             Object result = xCommandProcessor.execute(command, 0, null);
-            XDynamicResultSet xDynamicResultSet = (XDynamicResultSet)UnoRuntime.queryInterface(XDynamicResultSet.class, result);
+            XDynamicResultSet xDynamicResultSet = UnoRuntime.queryInterface(XDynamicResultSet.class, result);
             XResultSet xResultSet = xDynamicResultSet.getStaticResultSet();
-            XRow xRow = (XRow)UnoRuntime.queryInterface(XRow.class, xResultSet);
+            XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
             // create the new folder 'folderName': first, check if it's already there
             while(xResultSet.next()) {
                 String existingFolderName = xRow.getString(1);
-                log.println("Found existing folder: '" + existingFolderName + "'");
+                System.out.println("Found existing folder: '" + existingFolderName + "'");
                 if (folderName.equals(existingFolderName)) {
-                    failed("Cannot create a new folder: folder already exists: adapt test or choose a different document.");
+                    fail("Cannot create a new folder: folder already exists: adapt test or choose a different document.");
                 }
             }
             // create a folder
-            log.println("Create new folder "+ folderName);
+            System.out.println("Create new folder "+ folderName);
             ContentInfo contentInfo = new ContentInfo();
             contentInfo.Type = "application/vnd.sun.star.tdoc-folder";
 
@@ -143,10 +142,10 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase {
             command.Argument = contentInfo;
 
             result = xCommandProcessor.execute(command, 0, null);
-            XContent xNewFolder = (XContent)UnoRuntime.queryInterface(XContent.class, result);
+            XContent xNewFolder = UnoRuntime.queryInterface(XContent.class, result);
 
-            XCommandProcessor xFolderCommandProcessor = (XCommandProcessor)UnoRuntime.queryInterface(XCommandProcessor.class, xNewFolder);
-            log.println("Got the new folder: " + utils.getImplName(xNewFolder));
+            XCommandProcessor xFolderCommandProcessor = UnoRuntime.queryInterface(XCommandProcessor.class, xNewFolder);
+            System.out.println("Got the new folder: " + utils.getImplName(xNewFolder));
 
             // name the new folder
             PropertyValue[] titleProp = new PropertyValue[1];
@@ -170,10 +169,33 @@ public class CheckTransientDocumentsDocumentContent extends ComplexTestCase {
             xFolderCommandProcessor.execute(commitCommand, 0, null); */
         }
         catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace((java.io.PrintWriter)log);
-            failed("Could not create test objects.");
+            e.printStackTrace();
+            fail("Could not create test objects.");
         }
 
     }
 
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+
 }
diff --git a/ucb/qa/complex/tdoc/TestDocument.java b/ucb/qa/complex/tdoc/TestDocument.java
new file mode 100755
index 0000000000..875b75ccb0
--- /dev/null
+++ b/ucb/qa/complex/tdoc/TestDocument.java
@@ -0,0 +1,39 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+package complex.tdoc;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument {
+    public static String getUrl(String name) {
+        return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+    }
+
+    private TestDocument() {}
+}
diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java
index 0ef43e9550..efc77f4bee 100644..100755
--- a/ucb/qa/complex/tdoc/interfaces/_XChild.java
+++ b/ucb/qa/complex/tdoc/_XChild.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import lib.MultiMethodTest;
 import lib.Status;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
index 905dffee4b..cc0f51ede4 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.ucb.XCommandInfoChangeListener;
 import com.sun.star.ucb.XCommandInfoChangeNotifier;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java
index cb5a203820..fe6bbd517e 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
+++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.beans.Property;
 import com.sun.star.beans.XPropertySetInfo;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java
index a37f14bbdf..c9765d56b0 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java
+++ b/ucb/qa/complex/tdoc/_XComponent.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.container.XNameContainer;
 import lib.MultiMethodTest;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java
index 929e9b2b0a..3ebca751c3 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XContent.java
+++ b/ucb/qa/complex/tdoc/_XContent.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.ucb.XContent;
 import com.sun.star.ucb.XContentEventListener;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
index e182271107..98b96c889d 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.beans.XPropertiesChangeListener;
 import com.sun.star.beans.XPropertiesChangeNotifier;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/_XPropertyContainer.java
index 882fdd3877..67f13f02cf 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
+++ b/ucb/qa/complex/tdoc/_XPropertyContainer.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.beans.XPropertyContainer;
 import share.LogWriter;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
index a6de169cde..cdfd9dac58 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import com.sun.star.beans.XPropertySetInfoChangeListener;
 import com.sun.star.beans.XPropertySetInfoChangeNotifier;
diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java
index 79cc1f9a75..3a074ea971 100644..100755
--- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/_XServiceInfo.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import lib.MultiMethodTest;
 
diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java
index d8a787b41f..a5a0b1d5b8 100644..100755
--- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/_XTypeProvider.java
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-package complex.tdoc.interfaces;
+package complex.tdoc;
 
 import lib.MultiMethodTest;
 
diff --git a/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk
index 3a57d1501c..5399383f19 100755
--- a/ucb/qa/complex/tdoc/interfaces/makefile.mk
+++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk
@@ -25,10 +25,10 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..$/..
+PRJ = ../../../..
 TARGET  = TransientDocument
 PRJNAME = $(TARGET)
-PACKAGE = complex$/tdoc$/interfaces
+PACKAGE = complex/tdoc/interfaces
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 175184de0f..01f8ec0f76 100755
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -25,62 +25,49 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = TransientDocument
-PRJNAME = $(TARGET)
-PACKAGE = complex.tdoc
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES = CheckContentProvider.java \
-            CheckTransientDocumentsContent.java \
-            CheckTransientDocumentsContentProvider.java \
-            CheckTransientDocumentsDocumentContent.java
-
-#            CheckSimpleFileAccess.java \
-#----- make a jar from compiled files ------------------------------
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-MAXLINELENGTH = 100000
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_tdoc
 
-JARCLASSDIRS  = $(PACKAGE)
-JARTARGET     = $(TARGET).jar
-JARCOMPRESS   = TRUE
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/tdoc
 
-# --- Parameters for the test --------------------------------------
+JAVATESTFILES = \
+   CheckContentProvider.java \
+   CheckTransientDocumentsContent.java \
+   CheckTransientDocumentsContentProvider.java \
+   CheckTransientDocumentsDocumentContent.java
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand \
-            "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+JAVAFILES = $(JAVATESTFILES) \
+    TestDocument.java \
+    _XChild.java \
+    _XCommandInfoChangeNotifier.java \
+    _XCommandProcessor.java \
+    _XComponent.java \
+    _XContent.java \
+    _XPropertiesChangeNotifier.java \
+    _XPropertyContainer.java \
+    _XPropertySetInfoChangeNotifier.java \
+    _XServiceInfo.java \
+    _XTypeProvider.java
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# replace $/ with . in package name
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.END
 
-# test document path
-CT_TESTDOCS = -tdoc $(PWD)$/..$/test_documents
-
-# --- Targets ------------------------------------------------------
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run: ALLTAR
-    @echo .
-    @echo "The followig tests are available:"
-    @echo $(foreach,i,$(JAVAFILES) "dmake $(i:b)     ")
+ALLTAR : javatest
 
-.INCLUDE :  target.mk
+.END
 
-Check%:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_TESTDOCS) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).$@
diff --git a/ucb/qa/complex/test_documents/Iterator.sxw b/ucb/qa/complex/tdoc/test_documents/Iterator.sxw
index 9a7f8961bb..9a7f8961bb 100644..100755
--- a/ucb/qa/complex/test_documents/Iterator.sxw
+++ b/ucb/qa/complex/tdoc/test_documents/Iterator.sxw
diff --git a/ucb/qa/complex/test_documents/chinese.sxw b/ucb/qa/complex/tdoc/test_documents/chinese.sxw
index 53b242a292..53b242a292 100644..100755
--- a/ucb/qa/complex/test_documents/chinese.sxw
+++ b/ucb/qa/complex/tdoc/test_documents/chinese.sxw
diff --git a/ucb/qa/complex/test_documents/filter.sxw b/ucb/qa/complex/tdoc/test_documents/filter.sxw
index e4b077c65f..e4b077c65f 100644..100755
--- a/ucb/qa/complex/test_documents/filter.sxw
+++ b/ucb/qa/complex/tdoc/test_documents/filter.sxw
diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index d01b4fde15..7ae46c4f97 100755
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.java
@@ -34,7 +34,6 @@ package complex.ucb;
  * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
 
-import complexlib.ComplexTestCase;
 import java.util.List;
 import java.util.Vector;
 
@@ -42,13 +41,22 @@ import com.sun.star.beans.Property;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
-import com.sun.star.uno.XComponentContext;
+// import com.sun.star.uno.XComponentContext;
 import com.sun.star.ucb.*;
-import com.sun.star.bridge.XUnoUrlResolver;
+// import com.sun.star.bridge.XUnoUrlResolver;
 import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.beans.XPropertySet;
+// import com.sun.star.uno.XComponentContext;
+// import com.sun.star.lang.XMultiComponentFactory;
+// import com.sun.star.beans.XPropertySet;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
 /**
  * @author rpiterman
  * This class is used to copy the content of a folder to
@@ -56,12 +64,12 @@ import com.sun.star.beans.XPropertySet;
  * There is an incosistency with argument order.
  * It should be always: dir,filename.
  */
-public class UCB extends ComplexTestCase {
+public class UCB  {
     private Object ucb;
 
-    public String[] getTestMethodNames() {
-        return new String[] {"checkWrongFtpConnection"};
-    }
+//	public String[] getTestMethodNames() {
+//		return new String[] {"checkWrongFtpConnection"};
+//	}
 
     public void init(XMultiServiceFactory xmsf) throws Exception {
         String[] keys = new String[2];
@@ -79,11 +87,13 @@ public class UCB extends ComplexTestCase {
 
     /**
      * target name can be "", in which case the name stays lige the source name
-     * @param sourceDir
-     * @param filename
-     * @param targetDir
-     * @param targetName
-     * @return
+    
+         * @param xContent
+         * @param aCommandName 
+         * @param aArgument 
+         * @return
+         * @throws com.sun.star.ucb.CommandAbortedException
+         * @throws com.sun.star.uno.Exception
      */
 
     public Object executeCommand(
@@ -92,9 +102,7 @@ public class UCB extends ComplexTestCase {
         Object aArgument)
         throws com.sun.star.ucb.CommandAbortedException, com.sun.star.uno.Exception {
         XCommandProcessor xCmdProcessor =
-            (XCommandProcessor) UnoRuntime.queryInterface(
-                XCommandProcessor.class,
-                xContent);
+            UnoRuntime.queryInterface(XCommandProcessor.class, xContent);
         Command aCommand = new Command();
         aCommand.Name = aCommandName;
         aCommand.Handle = -1; // not available
@@ -118,39 +126,44 @@ public class UCB extends ComplexTestCase {
         XDynamicResultSet xSet;
 
         xSet =
-            (XDynamicResultSet) UnoRuntime.queryInterface(
-                XDynamicResultSet.class,
-                executeCommand(xContent, "open", aArg));
+            UnoRuntime.queryInterface(XDynamicResultSet.class, executeCommand(xContent, "open", aArg));
 
         XResultSet xResultSet = xSet.getStaticResultSet();
 
         List files = new Vector();
 
-        if (xResultSet.first()) {
+        if (xResultSet.first())
+                {
             // obtain XContentAccess interface for child content access and XRow for properties
-            XContentAccess xContentAccess =
-                (XContentAccess) UnoRuntime.queryInterface(
-                    XContentAccess.class,
-                    xResultSet);
-            XRow xRow =
-                (XRow) UnoRuntime.queryInterface(XRow.class, xResultSet);
-            do {
+            XContentAccess xContentAccess =	UnoRuntime.queryInterface(XContentAccess.class, xResultSet);
+            XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
+            do
+                        {
                 // Obtain URL of child.
                 String aId = xContentAccess.queryContentIdentifierString();
                 // First column: Title (column numbers are 1-based!)
                 String aTitle = xRow.getString(1);
-                if (aTitle.length() == 0 && xRow.wasNull());
-                //ignore
+                if (aTitle.length() == 0 && xRow.wasNull())
+                                {
+                                    //ignore
+                                }
                 else
-                    files.add(aTitle);
+                                {
+                                    files.add(aTitle);
+                                }
             } while (xResultSet.next()); // next child
         }
 
         if (verifier != null)
-            for (int i = 0; i < files.size(); i++)
-                if (!verifier.verify(files.get(i)))
-                    files.remove(i--);
-
+                {
+                    for (int i = 0; i < files.size(); i++)
+                    {
+                        if (!verifier.verify(files.get(i)))
+                        {
+                            files.remove(i--);
+                        }
+                    }
+                }
         return files;
     }
 
@@ -165,45 +178,46 @@ public class UCB extends ComplexTestCase {
         pv[0].Handle = -1;
 
         Object row = executeCommand(content, "getPropertyValues", pv);
-        XRow xrow = (XRow) UnoRuntime.queryInterface(XRow.class, row);
+        XRow xrow = UnoRuntime.queryInterface(XRow.class, row);
         if (type.equals(String.class))
-            return xrow.getString(1);
+                {
+                    return xrow.getString(1);
+                }
         else if (type.equals(Boolean.class))
-            return xrow.getBoolean(1) ? Boolean.TRUE : Boolean.FALSE;
+                {
+                    return xrow.getBoolean(1) ? Boolean.TRUE : Boolean.FALSE;
+                }
         else if (type.equals(Integer.class))
-            return new Integer(xrow.getInt(1));
+                {
+                    return new Integer(xrow.getInt(1));
+                }
         else if (type.equals(Short.class))
-            return new Short(xrow.getShort(1));
+                {
+                    return new Short(xrow.getShort(1));
+                }
         else
-            return null;
+                {
+                    return null;
+                }
 
     }
 
-    public Object getContent(String path) throws Exception {
-        XContentIdentifier id =
-            (
-                (XContentIdentifierFactory) UnoRuntime.queryInterface(
-                    XContentIdentifierFactory.class,
-                    ucb)).createContentIdentifier(
-                path);
-
-        return (
-            (XContentProvider) UnoRuntime.queryInterface(
-                XContentProvider.class,
-                ucb)).queryContent(
-            id);
+    public Object getContent(String path) throws Exception
+        {
+        XContentIdentifier id =	(UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb)).createContentIdentifier(path);
+        return (UnoRuntime.queryInterface(XContentProvider.class, ucb)).queryContent(id);
     }
 
     public static interface Verifier {
         public boolean verify(Object object);
     }
 
-    public void checkWrongFtpConnection() {
+    @Test public void checkWrongFtpConnection() {
         //localhost  ;Lo-1.Germany.sun.com; 10.16.65.155
         try {
-            XMultiServiceFactory xLocMSF = (XMultiServiceFactory)param.getMSF();
+            XMultiServiceFactory xLocMSF = getMSF();
             String acountUrl = "ftp://noname:nopasswd@nohost";
-            log.println(acountUrl);
+            System.out.println(acountUrl);
             init(xLocMSF);
             Object content = getContent(acountUrl);
 
@@ -211,22 +225,45 @@ public class UCB extends ComplexTestCase {
             aArg.Mode = OpenMode.ALL; // FOLDER, DOCUMENTS -> simple filter
             aArg.Priority = 32768; // Ignored by most implementations
 
-            log.println("now executing open");
+            System.out.println("now executing open");
             executeCommand(content, "open", aArg);
-            failed("Expected 'IllegalArgumentException' was not thrown.");
+            fail("Expected 'IllegalArgumentException' was not thrown.");
         } catch (com.sun.star.lang.IllegalArgumentException ex) {
             //TODO error message;
-            log.println("Correct exception thrown: " + ex.getClass().toString());
-        } catch(com.sun.star.ucb.InteractiveNetworkResolveNameException ex) {
-            log.println("This Exception is correctly thrown when no Proxy in StarOffice is used.");
-            log.println("To reproduce the bug behaviour, use a Proxy and try again.");
+            System.out.println("Correct exception thrown: " + ex.getClass().toString());
+        } catch(com.sun.star.ucb.InteractiveNetworkException ex) {
+            System.out.println("This Exception is correctly thrown when no Proxy in StarOffice is used.");
+            System.out.println("To reproduce the bug behaviour, use a Proxy and try again.");
         } catch (Exception ex) {
-            ex.printStackTrace((java.io.PrintWriter)log);
+            ex.printStackTrace();
             String exceptionName = ex.toString();
-            log.println("ExName: '"+exceptionName+"'");
-            failed("Wrong exception thrown: " + exceptionName);
+            System.out.println("ExName: '"+exceptionName+"'");
+            fail("Wrong exception thrown: " + exceptionName);
         }
 //		System.exit(0);
     }
 
+
+
+         private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk
index 4664bd3cfa..4ac3928c9e 100755
--- a/ucb/qa/complex/ucb/makefile.mk
+++ b/ucb/qa/complex/ucb/makefile.mk
@@ -25,54 +25,38 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = UCB
-PRJNAME = $(TARGET)
-PACKAGE = complex$/ucb
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES 		= mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = UCB.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-#----- make a jar from compiled files ------------------------------
+PRJ = ../../..
+PRJNAME = UCB
+TARGET = qa_complex_ucb
 
-MAXLINELENGTH = 100000
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/ucb
+JAVATESTFILES = \
+    UCB.java
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+JAVAFILES = $(JAVATESTFILES) 
 
-# --- Parameters for the test --------------------------------------
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+.END
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+ALLTAR : javatest
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.END
 
-# --- Targets ------------------------------------------------------
 
-.INCLUDE :  target.mk
 
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST)
 
-run: RUN
 
 
diff --git a/ucb/qa/unoapi/Test.java b/ucb/qa/unoapi/Test.java
index 145716d871..145716d871 100644..100755
--- a/ucb/qa/unoapi/Test.java
+++ b/ucb/qa/unoapi/Test.java
diff --git a/ucb/qa/unoapi/knownissues.xcl b/ucb/qa/unoapi/knownissues.xcl
index 7929c1612c..7929c1612c 100644..100755
--- a/ucb/qa/unoapi/knownissues.xcl
+++ b/ucb/qa/unoapi/knownissues.xcl
diff --git a/ucb/qa/unoapi/makefile.mk b/ucb/qa/unoapi/makefile.mk
index 80c7caae73..80c7caae73 100644..100755
--- a/ucb/qa/unoapi/makefile.mk
+++ b/ucb/qa/unoapi/makefile.mk
diff --git a/ucb/qa/unoapi/ucb.sce b/ucb/qa/unoapi/ucb.sce
index 6d8cd4584e..6d8cd4584e 100644..100755
--- a/ucb/qa/unoapi/ucb.sce
+++ b/ucb/qa/unoapi/ucb.sce
diff --git a/ucb/source/cacher/cached.xml b/ucb/source/cacher/cached.xml
index 9e88aa74f2..9e88aa74f2 100644..100755
--- a/ucb/source/cacher/cached.xml
+++ b/ucb/source/cacher/cached.xml
diff --git a/ucb/source/cacher/cached1.component b/ucb/source/cacher/cached1.component
new file mode 100755
index 0000000000..aa19e54b5d
--- /dev/null
+++ b/ucb/source/cacher/cached1.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.CachedContentResultSetFactory">
+    <service name="com.sun.star.ucb.CachedContentResultSetFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.CachedContentResultSetStubFactory">
+    <service name="com.sun.star.ucb.CachedContentResultSetStubFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.CachedDynamicResultSetFactory">
+    <service name="com.sun.star.ucb.CachedDynamicResultSetFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory">
+    <service name="com.sun.star.ucb.CachedDynamicResultSetStubFactory"/>
+  </implementation>
+</component>
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 06fd429beb..06fd429beb 100644..100755
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 44e48e7dc5..44e48e7dc5 100644..100755
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 452fa503f5..452fa503f5 100644..100755
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 217022d4e9..217022d4e9 100644..100755
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 5c79514590..5c79514590 100644..100755
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 54f2f090d4..54f2f090d4 100644..100755
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 0373ca409c..0373ca409c 100644..100755
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f84c67e1cb..f84c67e1cb 100644..100755
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 5f335ab187..edfd93a3e4 100644..100755
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -43,45 +43,6 @@ using namespace com::sun::star::registry;
 using ::rtl::OUString;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const OUString & rImplementationName,
-                              Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-    aKeyName += rImplementationName;
-    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
@@ -89,44 +50,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // CachedContentResultSetFactory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       CachedContentResultSetFactory::getImplementationName_Static(),
-       CachedContentResultSetFactory::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // CachedContentResultSetStubFactory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       CachedContentResultSetStubFactory::getImplementationName_Static(),
-       CachedContentResultSetStubFactory::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // CachedDynamicResultSetFactory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       CachedDynamicResultSetFactory::getImplementationName_Static(),
-       CachedDynamicResultSetFactory::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // CachedDynamicResultSetStubFactory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       CachedDynamicResultSetStubFactory::getImplementationName_Static(),
-       CachedDynamicResultSetStubFactory::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index f0e2c5f5f0..f0e2c5f5f0 100644..100755
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index aa0c73eada..aa0c73eada 100644..100755
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 801e932aca..801e932aca 100644..100755
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 83416e1066..83416e1066 100644..100755
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index 600fefc174..24d245ec6c 100644..100755
--- a/ucb/source/cacher/makefile.mk
+++ b/ucb/source/cacher/makefile.mk
@@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/cached1.component
+
+$(MISC)/cached1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        cached1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt cached1.component
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 4248b2e6cd..4248b2e6cd 100644..100755
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index 09a3dff8d1..09a3dff8d1 100644..100755
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp
index a1936474f7..8091459f4d 100644..100755
--- a/ucb/source/core/exports2.dxp
+++ b/ucb/source/core/exports2.dxp
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 
 _ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index 9b024395df..9b024395df 100644..100755
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index e2a25a5eb6..e2a25a5eb6 100644..100755
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 34765eb742..6360f82320 100644..100755
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -74,3 +74,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucb1.component
+
+$(MISC)/ucb1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucb1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucb1.component
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 292707ea31..292707ea31 100644..100755
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index d54c830c06..d54c830c06 100644..100755
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 32c9a5aab3..32c9a5aab3 100644..100755
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 8325bacb5f..8325bacb5f 100644..100755
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 8c5b434313..8c5b434313 100644..100755
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
diff --git a/ucb/source/core/ucb.xml b/ucb/source/core/ucb.xml
index 1eeb7b5983..1eeb7b5983 100644..100755
--- a/ucb/source/core/ucb.xml
+++ b/ucb/source/core/ucb.xml
diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component
new file mode 100755
index 0000000000..e9d408822c
--- /dev/null
+++ b/ucb/source/core/ucb1.component
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.CommandEnvironment">
+    <service name="com.sun.star.ucb.CommandEnvironment"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.UcbContentProviderProxyFactory">
+    <service name="com.sun.star.ucb.ContentProviderProxyFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.UcbPropertiesManager">
+    <service name="com.sun.star.ucb.PropertiesManager"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.UcbStore">
+    <service name="com.sun.star.ucb.Store"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.UniversalContentBroker">
+    <service name="com.sun.star.ucb.UniversalContentBroker"/>
+  </implementation>
+</component>
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 6aad4da227..6aad4da227 100644..100755
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index 4a760367d6..4a760367d6 100644..100755
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index e75e449ea1..e75e449ea1 100644..100755
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 444dbf802a..444dbf802a 100644..100755
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index b5eb9d0602..94e5a08b35 100644..100755
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_ucb.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "ucb.hxx"
 #include "ucbstore.hxx"
 #include "ucbprops.hxx"
@@ -39,48 +38,8 @@
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
-
 using ::rtl::OUString;
 
-//=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const OUString & rImplementationName,
-                               Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
 
 //=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
@@ -90,52 +49,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Universal Content Broker.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               UniversalContentBroker::getImplementationName_Static(),
-               UniversalContentBroker::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UCB Store.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               UcbStore::getImplementationName_Static(),
-               UcbStore::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UCB PropertiesManager.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               UcbPropertiesManager::getImplementationName_Static(),
-               UcbPropertiesManager::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UCP Proxy Factory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       UcbContentProviderProxyFactory::getImplementationName_Static(),
-       UcbContentProviderProxyFactory::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Command Environment.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       ucb_cmdenv::UcbCommandEnvironment::getImplementationName_Static(),
-       ucb_cmdenv::UcbCommandEnvironment::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 82e6245896..1f9cccd7c8 100644..100755
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -321,7 +321,7 @@ struct PropertySetRegistry_Impl
     sal_Bool			  			  m_bTriedToGetRootWriteAccess; // #82494#
 
     PropertySetRegistry_Impl( const Sequence< Any > &rInitArgs )
-        : m_aInitArgs( rInitArgs ),
+    : m_aInitArgs( rInitArgs ),
       m_bTriedToGetRootReadAccess( sal_False ),
       m_bTriedToGetRootWriteAccess( sal_False )
     {
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 6adeab8f6d..6adeab8f6d 100644..100755
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx
index 84beaba797..84beaba797 100644..100755
--- a/ucb/source/inc/regexp.hxx
+++ b/ucb/source/inc/regexp.hxx
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index 9f3c6383bf..9f3c6383bf 100644..100755
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 9d4a7fb69c..9d4a7fb69c 100644..100755
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
diff --git a/ucb/source/regexp/makefile.mk b/ucb/source/regexp/makefile.mk
index e748f054ea..e748f054ea 100644..100755
--- a/ucb/source/regexp/makefile.mk
+++ b/ucb/source/regexp/makefile.mk
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index b61772efb9..b61772efb9 100644..100755
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
index 68a9959589..008e39b4bc 100644..100755
--- a/ucb/source/sorter/makefile.mk
+++ b/ucb/source/sorter/makefile.mk
@@ -61,3 +61,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/srtrs1.component
+
+$(MISC)/srtrs1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        srtrs1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt srtrs1.component
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index b36c25e381..b36c25e381 100644..100755
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index adf60a4fbd..adf60a4fbd 100644..100755
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index 1e87bd2ba3..78ad84e3e5 100644..100755
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -31,52 +31,11 @@
 #include <sortdynres.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace com::sun::star::registry;
-
 using ::rtl::OUString;
 
-//=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const OUString & rImplementationName,
-                              Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
 
 //=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
@@ -86,20 +45,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // SortedDynamicResultSetFactory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-       SortedDynamicResultSetFactory::getImplementationName_Static(),
-       SortedDynamicResultSetFactory::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 0e868e4b97..b933bc9543 100644..100755
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SortedResultSet::getRow()
  @param row
     is the number of rows to move. Could be negative.
  @returns
-    <sal_True/> if the cursor is on a row; <sal_False/> otherwise
+    <TRUE/> if the cursor is on a row; <FALSE/> otherwise
  @throws SQLException
     if a database access error occurs or if row is 0, or the result set
     type is FORWARD_ONLY.
@@ -554,7 +554,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
  @param rows
     is the number of rows to move. Could be negative.
  @returns
-    <sal_True/> if the cursor is on a valid row; <sal_False/> if it is off
+    <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off
     the result set.
  @throws SQLException
     if a database access error occurs or if there is no
@@ -599,7 +599,7 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
  <p>Note: <code>previous()</code> is not the same as
  <code>relative(-1)</code> because it makes sense to call
  <code>previous()</code> when there is no current row.
- @returns <sal_True/> if the cursor is on a valid row; <sal_False/> if it is off
+ @returns <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off
     the result set.
  @throws SQLException
     if a database access error occurs or the result set type
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 5c337ec081..5c337ec081 100644..100755
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
diff --git a/ucb/source/sorter/srtrs.xml b/ucb/source/sorter/srtrs.xml
index 622293a5c8..622293a5c8 100644..100755
--- a/ucb/source/sorter/srtrs.xml
+++ b/ucb/source/sorter/srtrs.xml
diff --git a/ucb/source/sorter/srtrs1.component b/ucb/source/sorter/srtrs1.component
new file mode 100755
index 0000000000..c32705160c
--- /dev/null
+++ b/ucb/source/sorter/srtrs1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.SortedDynamicResultSetFactory">
+    <service name="com.sun.star.ucb.SortedDynamicResultSetFactory"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
index 32de160318..70e441171a 100644..100755
--- a/ucb/source/ucp/expand/makefile.mk
+++ b/ucb/source/ucp/expand/makefile.mk
@@ -59,3 +59,11 @@ DEF1NAME = $(SHL1TARGET)
 .ENDIF # L10N_framework
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ucpexpand1.component
+
+$(MISC)/ucpexpand1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpexpand1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpexpand1.component
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index b40e7f7d47..f5fb2dbe86 100644..100755
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -274,14 +274,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    lang::XMultiServiceFactory * pServiceManager,
-    registry::XRegistryKey * pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, s_entries );
-}
-
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
diff --git a/ucb/source/ucp/expand/ucpexpand1.component b/ucb/source/ucp/expand/ucpexpand1.component
new file mode 100755
index 0000000000..c8a7e8e18c
--- /dev/null
+++ b/ucb/source/ucp/expand/ucpexpand1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.ExpandContentProvider">
+    <service name="com.sun.star.ucb.ExpandContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
index fde2d8eb0b..b5f2734a69 100644..100755
--- a/ucb/source/ucp/ext/makefile.mk
+++ b/ucb/source/ucp/ext/makefile.mk
@@ -59,3 +59,11 @@ SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ucpext.component
+
+$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpext.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpext.component
diff --git a/ucb/source/ucp/ext/ucpext.component b/ucb/source/ucp/ext/ucpext.component
new file mode 100755
index 0000000000..2982529e53
--- /dev/null
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.comp.ucp.ext.ContentProvider">
+    <service name="com.sun.star.ucb.ExtensionContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index cd5f3e47cc..cd5f3e47cc 100644..100755
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
index 95881ba1fc..95881ba1fc 100644..100755
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 703d2df379..703d2df379 100644..100755
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index e13ad3de62..e13ad3de62 100644..100755
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index b41f36e424..b41f36e424 100644..100755
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx
index 0a0ea062ca..0a0ea062ca 100644..100755
--- a/ucb/source/ucp/ext/ucpext_provider.hxx
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index 0d41422599..0d41422599 100644..100755
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx
index 6b2475618f..6b2475618f 100644..100755
--- a/ucb/source/ucp/ext/ucpext_resultset.hxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 7310f9ed6d..2e1f26a317 100644..100755
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -81,12 +81,6 @@ extern "C"
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::ucb::ucp::ext::s_aServiceEntries );
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
     void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
         return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 7d63e9117b..7d63e9117b 100644..100755
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 5b4298fb1d..5b4298fb1d 100644..100755
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp
index 6c42314f22..4804c8d0ae 100644..100755
--- a/ucb/source/ucp/file/exports2.dxp
+++ b/ucb/source/ucp/file/exports2.dxp
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 
 _ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index c86608dbc3..c86608dbc3 100644..100755
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index 10285ac3bd..10285ac3bd 100644..100755
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
diff --git a/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx
index 67bc001a53..67bc001a53 100644..100755
--- a/ucb/source/ucp/file/filerror.hxx
+++ b/ucb/source/ucp/file/filerror.hxx
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 3b7af59ede..3b7af59ede 100644..100755
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index e4e745aa67..e4e745aa67 100644..100755
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.hxx
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 3a4ba0797d..3a4ba0797d 100644..100755
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index bf3c4e5238..bf3c4e5238 100644..100755
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index dea296572b..dea296572b 100644..100755
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 368a1299e0..368a1299e0 100644..100755
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index bdc35d8320..bdc35d8320 100644..100755
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 6597713c35..6597713c35 100644..100755
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 6b069cb3f0..6b069cb3f0 100644..100755
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index ea128f382d..ea128f382d 100644..100755
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index f5c5af9b22..f5c5af9b22 100644..100755
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 1db269e4df..1db269e4df 100644..100755
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 879a1c65af..879a1c65af 100644..100755
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index a4a07b02ca..a4a07b02ca 100644..100755
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 432e005889..432e005889 100644..100755
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index deac6efdf6..deac6efdf6 100644..100755
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index baca86162e..baca86162e 100644..100755
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 84a94bb2fd..84a94bb2fd 100644..100755
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 83e17fe6ef..83e17fe6ef 100644..100755
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 5a28a4c138..5a28a4c138 100644..100755
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index c846c73f7c..c846c73f7c 100644..100755
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index dd151311d8..dd151311d8 100644..100755
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index f34ef10c88..f34ef10c88 100644..100755
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index 8007a24923..3d97cb2387 100644..100755
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -78,3 +78,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucpfile1.component
+
+$(MISC)/ucpfile1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpfile1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpfile1.component
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 4f9d19bdb3..8e2d074dc4 100644..100755
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -32,7 +32,6 @@
 #include <osl/file.hxx>
 #include <osl/socket.h>
 #include <cppuhelper/factory.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ucb/FileSystemNotation.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
@@ -52,45 +51,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::container;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                              Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
@@ -98,20 +58,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // File Content Provider.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               fileaccess::shell::getImplementationName_static(),
-               fileaccess::shell::getSupportedServiceNames_static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index be5d9356e2..be5d9356e2 100644..100755
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 415419d752..691f88363f 100644..100755
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1806,14 +1806,26 @@ shell::write( sal_Int32 CommandId,
         {
             aFile.close();
             err = aFile.open( osl_File_OpenFlag_Write );
-        }
 
-        if( err != osl::FileBase::E_None )
-        {
-            installError( CommandId,
-                          TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE,
-                          err );
-            return sal_False;
+            if( err != osl::FileBase::E_None )
+            {
+                installError( CommandId,
+                              TASKHANDLING_NO_OPEN_FILE_FOR_OVERWRITE,
+                              err );
+                return sal_False;
+            }
+
+            // the existing file was just opened and should be overwritten now,
+            // truncate it first
+
+            err = aFile.setSize( 0 );
+            if( err != osl::FileBase::E_None  )
+            {
+                installError( CommandId,
+                              TASKHANDLING_FILESIZE_FOR_WRITE,
+                              err );
+                return sal_False;
+            }
         }
     }
     else
@@ -1845,7 +1857,6 @@ shell::write( sal_Int32 CommandId,
 
     sal_Bool bSuccess = sal_True;
 
-    sal_uInt64 nTotalNumberOfBytes = 0;
     sal_uInt64 nWrittenBytes;
     sal_Int32 nReadBytes = 0, nRequestedBytes = 32768 /*32k*/;
     uno::Sequence< sal_Int8 > seq( nRequestedBytes );
@@ -1902,20 +1913,9 @@ shell::write( sal_Int32 CommandId,
                 bSuccess = sal_False;
                 break;
             }
-
-            nTotalNumberOfBytes += nWrittenBytes;
         }
     } while( nReadBytes == nRequestedBytes );
 
-    err = aFile.setSize( nTotalNumberOfBytes );
-    if( err != osl::FileBase::E_None  )
-    {
-        installError( CommandId,
-                      TASKHANDLING_FILESIZE_FOR_WRITE,
-                      err );
-        bSuccess = sal_False;
-    }
-
     err = aFile.close();
     if( err != osl::FileBase::E_None  )
     {
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 32f9e5e7a8..32f9e5e7a8 100644..100755
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
diff --git a/ucb/source/ucp/file/ucpfile.xml b/ucb/source/ucp/file/ucpfile.xml
index 8d876fd9dd..8d876fd9dd 100644..100755
--- a/ucb/source/ucp/file/ucpfile.xml
+++ b/ucb/source/ucp/file/ucpfile.xml
diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component
new file mode 100755
index 0000000000..2803245122
--- /dev/null
+++ b/ucb/source/ucp/file/ucpfile1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.FileProvider">
+    <service name="com.sun.star.ucb.FileContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/ftp/curl.hxx b/ucb/source/ucp/ftp/curl.hxx
index fdfeefeb63..fdfeefeb63 100644..100755
--- a/ucb/source/ucp/ftp/curl.hxx
+++ b/ucb/source/ucp/ftp/curl.hxx
diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx
index 6a7244c866..6a7244c866 100644..100755
--- a/ucb/source/ucp/ftp/ftpcfunc.cxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.cxx
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 9d6427ab1d..9d6427ab1d 100644..100755
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
diff --git a/ucb/source/ucp/ftp/ftpcontainer.hxx b/ucb/source/ucp/ftp/ftpcontainer.hxx
index 8f0f3286b4..8f0f3286b4 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontainer.hxx
+++ b/ucb/source/ucp/ftp/ftpcontainer.hxx
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 8a7f878623..8a7f878623 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index ee73d7f231..ee73d7f231 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 73abe6cd45..73abe6cd45 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 5c61a36937..5c61a36937 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index e4cb3d0778..e4cb3d0778 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 3eef2d911d..3eef2d911d 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 79d1fb83e1..79d1fb83e1 100644..100755
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 4c8c2d5b1d..4c8c2d5b1d 100644..100755
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index b55727069c..b55727069c 100644..100755
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx
index 2e351f5023..2e351f5023 100644..100755
--- a/ucb/source/ucp/ftp/ftpdynresultset.cxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx
index 5781aaf8e6..5781aaf8e6 100644..100755
--- a/ucb/source/ucp/ftp/ftpdynresultset.hxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx
diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx
index b050601ea4..b050601ea4 100644..100755
--- a/ucb/source/ucp/ftp/ftphandleprovider.hxx
+++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx
diff --git a/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx
index c1f7558d45..c1f7558d45 100644..100755
--- a/ucb/source/ucp/ftp/ftpinpstr.cxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.cxx
diff --git a/ucb/source/ucp/ftp/ftpinpstr.hxx b/ucb/source/ucp/ftp/ftpinpstr.hxx
index cb6f4c8887..cb6f4c8887 100644..100755
--- a/ucb/source/ucp/ftp/ftpinpstr.hxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.hxx
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index ac668c4541..ac668c4541 100644..100755
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 69b5f69850..69b5f69850 100644..100755
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index 100782b218..100782b218 100644..100755
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index 2ece821b42..2ece821b42 100644..100755
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 056a87ed61..056a87ed61 100644..100755
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index a0ea618a6a..a0ea618a6a 100644..100755
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 210d7d4167..210d7d4167 100644..100755
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index f257dc96a2..f257dc96a2 100644..100755
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
index a6b9066532..a6b9066532 100644..100755
--- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index c229ad8928..86ccaaf142 100644..100755
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -37,45 +37,6 @@ using namespace com::sun::star;
 using namespace ftp;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                           uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
@@ -83,21 +44,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-        
-        //////////////////////////////////////////////////////////////////////
-        // FTP Content Provider.
-        //////////////////////////////////////////////////////////////////////
-
-        writeInfo( pRegistryKey,
-                   FTPContentProvider::getImplementationName_Static(),
-                   FTPContentProvider::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx
index 1afadd3cd9..1afadd3cd9 100644..100755
--- a/ucb/source/ucp/ftp/ftpstrcont.hxx
+++ b/ucb/source/ucp/ftp/ftpstrcont.hxx
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 376c77205b..376c77205b 100644..100755
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index bc94e8ed57..bc94e8ed57 100644..100755
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index a0f1410040..6f55fed25f 100644..100755
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -92,15 +92,10 @@ DEF1NAME=$(SHL1TARGET)
 .ENDIF # L10N_framework
 .INCLUDE: target.mk
 
+ALLTAR : $(MISC)/ucpftp1.component
 
-
-
-
-
-
-
-
-
-
-
-
+$(MISC)/ucpftp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpftp1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpftp1.component
diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx
index e3d89e43fc..e3d89e43fc 100644..100755
--- a/ucb/source/ucp/ftp/test.cxx
+++ b/ucb/source/ucp/ftp/test.cxx
diff --git a/ucb/source/ucp/ftp/test.py b/ucb/source/ucp/ftp/test.py
index 931d9a3ec8..931d9a3ec8 100644..100755
--- a/ucb/source/ucp/ftp/test.py
+++ b/ucb/source/ucp/ftp/test.py
diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx
index 29798c671b..29798c671b 100644..100755
--- a/ucb/source/ucp/ftp/test_activedatasink.cxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.cxx
diff --git a/ucb/source/ucp/ftp/test_activedatasink.hxx b/ucb/source/ucp/ftp/test_activedatasink.hxx
index b9930babcb..b9930babcb 100644..100755
--- a/ucb/source/ucp/ftp/test_activedatasink.hxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.hxx
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx
index 8cb80dc97c..8cb80dc97c 100644..100755
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
diff --git a/ucb/source/ucp/ftp/test_ftpurl.hxx b/ucb/source/ucp/ftp/test_ftpurl.hxx
index 1f7356a690..1f7356a690 100644..100755
--- a/ucb/source/ucp/ftp/test_ftpurl.hxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.hxx
diff --git a/ucb/source/ucp/ftp/test_interactionhandler.hxx b/ucb/source/ucp/ftp/test_interactionhandler.hxx
index 6a0f4f6013..6a0f4f6013 100644..100755
--- a/ucb/source/ucp/ftp/test_interactionhandler.hxx
+++ b/ucb/source/ucp/ftp/test_interactionhandler.hxx
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx
index 82452f316b..82452f316b 100644..100755
--- a/ucb/source/ucp/ftp/test_multiservicefac.cxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx
index 7947962946..7947962946 100644..100755
--- a/ucb/source/ucp/ftp/test_multiservicefac.hxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx
diff --git a/ucb/source/ucp/ftp/ucpftp.xml b/ucb/source/ucp/ftp/ucpftp.xml
index ce9bfe35f9..ce9bfe35f9 100644..100755
--- a/ucb/source/ucp/ftp/ucpftp.xml
+++ b/ucb/source/ucp/ftp/ucpftp.xml
diff --git a/ucb/source/ucp/ftp/ucpftp1.component b/ucb/source/ucp/ftp/ucpftp1.component
new file mode 100755
index 0000000000..fa4cfe6e75
--- /dev/null
+++ b/ucb/source/ucp/ftp/ucpftp1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.FTPContentProvider">
+    <service name="com.sun.star.ucb.FTPContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 612ea7fff4..612ea7fff4 100644..100755
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 9e6ed77602..9e6ed77602 100644..100755
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 93c66947c7..93c66947c7 100644..100755
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index b68a24f704..b68a24f704 100644..100755
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index 3519ccc581..3519ccc581 100644..100755
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 154d803602..154d803602 100644..100755
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index fb721303dd..fb721303dd 100644..100755
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx
index 31d1a749ce..31d1a749ce 100644..100755
--- a/ucb/source/ucp/gio/gio_mount.hxx
+++ b/ucb/source/ucp/gio/gio_mount.hxx
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 492126e385..492126e385 100644..100755
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index f330e401a1..f330e401a1 100644..100755
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 951a895440..3b9b4fc39b 100644..100755
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -103,55 +103,12 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
 }
 
-static sal_Bool writeInfo( void *pRegistryKey,
-    const rtl::OUString &rImplementationName, uno::Sequence< rtl::OUString > const &rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * > (pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {}
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-   return bSuccess;
-}
-
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char  **ppEnvTypeName, uno_Environment **)
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" sal_Bool SAL_CALL component_writeInfo( void *, void *pRegistryKey )
-{
-    return pRegistryKey &&
-        writeInfo( pRegistryKey,
-            ::gio::ContentProvider::getImplementationName_Static(),
-            ::gio::ContentProvider::getSupportedServiceNames_Static() );
-}
-
 extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName,
     void *pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 03cd826080..03cd826080 100644..100755
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx
index a0f9505182..a0f9505182 100644..100755
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_resultset.cxx
diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index ca32febd40..ca32febd40 100644..100755
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_resultset.hxx
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index e3c9a0ae33..e3c9a0ae33 100644..100755
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index e41b37ee95..e41b37ee95 100644..100755
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk
index 86b32fbc07..4cca611c7e 100644..100755
--- a/ucb/source/ucp/gio/makefile.mk
+++ b/ucb/source/ucp/gio/makefile.mk
@@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
-UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt
-
 .IF "$(ENABLE_GIO)"!=""
 COMPILER_WARN_ALL=TRUE
 PKGCONFIG_MODULES=gio-2.0
@@ -79,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 .ENDIF # L10N_framework
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/ucpgio.component
+
+$(MISC)/ucpgio.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpgio.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpgio.component
diff --git a/ucb/source/ucp/gio/ucpgio-ucd.txt b/ucb/source/ucp/gio/ucpgio-ucd.txt
deleted file mode 100644
index ce7657fa73..0000000000
--- a/ucb/source/ucp/gio/ucpgio-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.GIOContentProvider
-ComponentName=ucpgio1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ucb.GIOContentProvider
diff --git a/ucb/source/ucp/gio/ucpgio.component b/ucb/source/ucp/gio/ucpgio.component
new file mode 100755
index 0000000000..caa8fc361f
--- /dev/null
+++ b/ucb/source/ucp/gio/ucpgio.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.GIOContentProvider">
+    <service name="com.sun.star.ucb.GIOContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/gio/ucpgio.xml b/ucb/source/ucp/gio/ucpgio.xml
index c77118476b..c77118476b 100644..100755
--- a/ucb/source/ucp/gio/ucpgio.xml
+++ b/ucb/source/ucp/gio/ucpgio.xml
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index ce73cef471..ce73cef471 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index cb59674a6a..cb59674a6a 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index fe2763e515..fe2763e515 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index f5ba511f26..f5ba511f26 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 86c9bda2d2..d6fdcf194b 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -144,42 +144,6 @@ ContentProvider::queryContent(
 
 //============================ shlib entry points =============================================
 
-
-// cut and paste verbatim from webdav (that sucks).
-static sal_Bool
-writeInfo( void                                 *pRegistryKey,
-       const rtl::OUString                  &rImplementationName,
-       uno::Sequence< rtl::OUString > const &rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try {
-        xKey = static_cast< registry::XRegistryKey * >
-            (pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & ) {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) {
-        try {
-            xKey->createKey( rServiceNames[ n ] );
-
-        } catch ( registry::InvalidRegistryException const & ) {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
 extern "C" void SAL_CALL
 component_getImplementationEnvironment( const sal_Char  **ppEnvTypeName,
                     uno_Environment **/*ppEnv*/ )
@@ -187,15 +151,6 @@ component_getImplementationEnvironment( const sal_Char  **ppEnvTypeName,
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" sal_Bool SAL_CALL
-component_writeInfo( void */*pServiceManager*/,
-             void *pRegistryKey )
-{
-    return pRegistryKey &&
-        writeInfo( pRegistryKey,
-               ::gvfs::ContentProvider::getImplementationName_Static(),
-               ::gvfs::ContentProvider::getSupportedServiceNames_Static() );
-}
 extern "C" void * SAL_CALL
 component_getFactory( const sal_Char *pImplName,
               void           *pServiceManager,
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 884dd648c5..884dd648c5 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 9ead4bc64e..9ead4bc64e 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
index 6a20606f10..6a20606f10 100644..100755
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.hxx
diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
index a0e8a0bda3..87fcca87cf 100644..100755
--- a/ucb/source/ucp/gvfs/makefile.mk
+++ b/ucb/source/ucp/gvfs/makefile.mk
@@ -37,8 +37,6 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 .IF "$(L10N_framework)"==""
 
-UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt
-
 .IF "$(ENABLE_GNOMEVFS)"!=""
 COMPILER_WARN_ALL=TRUE
 PKGCONFIG_MODULES=gnome-vfs-2.0
@@ -84,3 +82,10 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE: target.mk
 
+ALLTAR : $(MISC)/ucpgvfs.component
+
+$(MISC)/ucpgvfs.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpgvfs.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpgvfs.component
diff --git a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt b/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt
deleted file mode 100644
index e9ecce6eff..0000000000
--- a/ucb/source/ucp/gvfs/ucpgvfs-ucd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[ComponentDescriptor]
-ImplementationName=com.sun.star.comp.GnomeVFSContentProvider
-ComponentName=ucpgvfs1.uno.so
-LoaderName=com.sun.star.loader.SharedLibrary
-[SupportedServices]
-com.sun.star.ucb.GnomeVFSContentProvider
diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component
new file mode 100755
index 0000000000..cec3e4d1e2
--- /dev/null
+++ b/ucb/source/ucp/gvfs/ucpgvfs.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.GnomeVFSContentProvider">
+    <service name="com.sun.star.ucb.GnomeVFSContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/gvfs/ucpgvfs.xml b/ucb/source/ucp/gvfs/ucpgvfs.xml
index dc761d6a22..dc761d6a22 100644..100755
--- a/ucb/source/ucp/gvfs/ucpgvfs.xml
+++ b/ucb/source/ucp/gvfs/ucpgvfs.xml
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
index 6b03e98e78..6b03e98e78 100644..100755
--- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
index 1775801b21..1775801b21 100644..100755
--- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 42322a745c..42322a745c 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index e9ad79cd28..e9ad79cd28 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index f5d0912abd..f5d0912abd 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 20acffd829..20acffd829 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index a20db23348..a20db23348 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index d4b9967682..d4b9967682 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index f221c110d8..f221c110d8 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 456b59ad87..456b59ad87 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index 504ba68fc5..504ba68fc5 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index e040babf18..e040babf18 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index e714e6af8c..e714e6af8c 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 6247b68566..132fc55217 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_ucb.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include "hierarchyprovider.hxx"
 #include "hierarchydatasource.hxx"
 
@@ -38,45 +37,6 @@ using namespace com::sun::star;
 using namespace hierarchy_ucp;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                           uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
@@ -84,29 +44,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Hierarchy Content Provider.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               HierarchyContentProvider::getImplementationName_Static(),
-               HierarchyContentProvider::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Hierarchy Data Source.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               HierarchyDataSource::getImplementationName_Static(),
-               HierarchyDataSource::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 9891d8c96e..9891d8c96e 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index a1c9265697..a1c9265697 100644..100755
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk
index 00b481b5e7..9263faa24b 100644..100755
--- a/ucb/source/ucp/hierarchy/makefile.mk
+++ b/ucb/source/ucp/hierarchy/makefile.mk
@@ -82,3 +82,11 @@ DEF1NAME=$(SHL1TARGET)
 .ENDIF # L10N_framework
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucphier1.component
+
+$(MISC)/ucphier1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucphier1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucphier1.component
diff --git a/ucb/source/ucp/hierarchy/ucphier.xml b/ucb/source/ucp/hierarchy/ucphier.xml
index 7fd75b1d5e..7fd75b1d5e 100644..100755
--- a/ucb/source/ucp/hierarchy/ucphier.xml
+++ b/ucb/source/ucp/hierarchy/ucphier.xml
diff --git a/ucb/source/ucp/hierarchy/ucphier1.component b/ucb/source/ucp/hierarchy/ucphier1.component
new file mode 100755
index 0000000000..5483187d86
--- /dev/null
+++ b/ucb/source/ucp/hierarchy/ucphier1.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.HierarchyContentProvider">
+    <service name="com.sun.star.ucb.HierarchyContentProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.HierarchyDataSource">
+    <service name="com.sun.star.ucb.DefaultHierarchyDataSource"/>
+    <service name="com.sun.star.ucb.HierarchyDataSource"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index bc0e17e2a6..bc0e17e2a6 100644..100755
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/inc/urihelper.hxx
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 643b4fa278..643b4fa278 100644..100755
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
diff --git a/ucb/source/ucp/odma/odma.h b/ucb/source/ucp/odma/odma.h
index a46c38f7d9..a46c38f7d9 100644..100755
--- a/ucb/source/ucp/odma/odma.h
+++ b/ucb/source/ucp/odma/odma.h
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index e578ebd78f..e578ebd78f 100644..100755
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
diff --git a/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx
index a0b567ec30..a0b567ec30 100644..100755
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_content.hxx
diff --git a/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx
index b745670c61..b745670c61 100644..100755
--- a/ucb/source/ucp/odma/odma_contentcaps.cxx
+++ b/ucb/source/ucp/odma/odma_contentcaps.cxx
diff --git a/ucb/source/ucp/odma/odma_contentprops.hxx b/ucb/source/ucp/odma/odma_contentprops.hxx
index a4b65726a7..a4b65726a7 100644..100755
--- a/ucb/source/ucp/odma/odma_contentprops.hxx
+++ b/ucb/source/ucp/odma/odma_contentprops.hxx
diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index b7154c9988..b7154c9988 100644..100755
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
diff --git a/ucb/source/ucp/odma/odma_datasupplier.hxx b/ucb/source/ucp/odma/odma_datasupplier.hxx
index 5d64fede70..5d64fede70 100644..100755
--- a/ucb/source/ucp/odma/odma_datasupplier.hxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.hxx
diff --git a/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx
index 81cc385d1b..81cc385d1b 100644..100755
--- a/ucb/source/ucp/odma/odma_inputstream.cxx
+++ b/ucb/source/ucp/odma/odma_inputstream.cxx
diff --git a/ucb/source/ucp/odma/odma_inputstream.hxx b/ucb/source/ucp/odma/odma_inputstream.hxx
index 39ffd440c1..39ffd440c1 100644..100755
--- a/ucb/source/ucp/odma/odma_inputstream.hxx
+++ b/ucb/source/ucp/odma/odma_inputstream.hxx
diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 0038a17edb..e83962feef 100644..100755
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -80,9 +80,6 @@ namespace odma
             return bLoaded;
 
         ::rtl::OUString sPath;
-    #ifdef WIN
-        sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA.DLL"));
-    #endif
     #ifdef WNT
         sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA32.DLL"));
     #endif
diff --git a/ucb/source/ucp/odma/odma_lib.hxx b/ucb/source/ucp/odma/odma_lib.hxx
index 72ee5162ab..72ee5162ab 100644..100755
--- a/ucb/source/ucp/odma/odma_lib.hxx
+++ b/ucb/source/ucp/odma/odma_lib.hxx
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index 974c95035b..974c95035b 100644..100755
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index b52d7df268..b52d7df268 100644..100755
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
diff --git a/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index ce0e3d179f..ce0e3d179f 100644..100755
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_provider.hxx
diff --git a/ucb/source/ucp/odma/odma_resultset.cxx b/ucb/source/ucp/odma/odma_resultset.cxx
index d176d881c6..d176d881c6 100644..100755
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_resultset.cxx
diff --git a/ucb/source/ucp/odma/odma_resultset.hxx b/ucb/source/ucp/odma/odma_resultset.hxx
index d0b32a5541..d0b32a5541 100644..100755
--- a/ucb/source/ucp/odma/odma_resultset.hxx
+++ b/ucb/source/ucp/odma/odma_resultset.hxx
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 83eabab41d..d6c5106533 100644..100755
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -39,45 +39,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                               Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/ucb/source/ucp/odma/ucpodma.xml b/ucb/source/ucp/odma/ucpodma.xml
index 390245e41a..390245e41a 100644..100755
--- a/ucb/source/ucp/odma/ucpodma.xml
+++ b/ucb/source/ucp/odma/ucpodma.xml
diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk
index a8cdf74307..b78150aed2 100644..100755
--- a/ucb/source/ucp/package/makefile.mk
+++ b/ucb/source/ucp/package/makefile.mk
@@ -87,3 +87,11 @@ DEF1NAME=$(SHL1TARGET)
 .ENDIF # L10N_framework
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucppkg1.component
+
+$(MISC)/ucppkg1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucppkg1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucppkg1.component
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 8242315b02..8242315b02 100644..100755
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index e93726daa6..e93726daa6 100644..100755
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index 276e47fa50..276e47fa50 100644..100755
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index 631eeabfbd..631eeabfbd 100644..100755
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index a888275854..a888275854 100644..100755
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index ba9a13b112..ba9a13b112 100644..100755
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index e02d1b25d2..e02d1b25d2 100644..100755
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx
index 0f19ac5d6d..0f19ac5d6d 100644..100755
--- a/ucb/source/ucp/package/pkgresultset.cxx
+++ b/ucb/source/ucp/package/pkgresultset.cxx
diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx
index 40115f9c43..40115f9c43 100644..100755
--- a/ucb/source/ucp/package/pkgresultset.hxx
+++ b/ucb/source/ucp/package/pkgresultset.hxx
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 559a9fbcb4..36a43dee8f 100644..100755
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -35,50 +35,6 @@
 
 using namespace com::sun::star;
 
-namespace {
-
-//=========================================================================
-sal_Bool writeInfo( 
-    void * pRegistryKey,
-    const rtl::OUString & rImplementationName,
-    uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-} // namespace
-
 //=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
@@ -87,21 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Write info into registry.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               ::package_ucp::ContentProvider::getImplementationName_Static(),
-               ::package_ucp::ContentProvider::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index 67d1c13d0d..67d1c13d0d 100644..100755
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 0adb48074f..0adb48074f 100644..100755
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
diff --git a/ucb/source/ucp/package/ucppkg.xml b/ucb/source/ucp/package/ucppkg.xml
index 5d23c3cb68..5d23c3cb68 100644..100755
--- a/ucb/source/ucp/package/ucppkg.xml
+++ b/ucb/source/ucp/package/ucppkg.xml
diff --git a/ucb/source/ucp/package/ucppkg1.component b/ucb/source/ucp/package/ucppkg1.component
new file mode 100755
index 0000000000..a2e2418b56
--- /dev/null
+++ b/ucb/source/ucp/package/ucppkg1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.PackageContentProvider">
+    <service name="com.sun.star.ucb.PackageContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk
index 83e9599eed..82c76b34b2 100644..100755
--- a/ucb/source/ucp/tdoc/makefile.mk
+++ b/ucb/source/ucp/tdoc/makefile.mk
@@ -92,3 +92,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucptdoc1.component
+
+$(MISC)/ucptdoc1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucptdoc1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucptdoc1.component
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 8ffdcb0116..8ffdcb0116 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 5877c0d783..5877c0d783 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index dbc61176f4..dbc61176f4 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index bed9e49bcb..bed9e49bcb 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index 403f372ac1..403f372ac1 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index be75f490ff..ae46e4a739 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -28,14 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_ucb.hxx"
+
 /**************************************************************************
                                 TODO
  **************************************************************************
 
- - filter unwanted models notified by global document event broadcaster
-   - help documents
-   - others, which I don't know yet
-
  *************************************************************************/
 
 #include "osl/diagnose.h"
@@ -45,12 +42,13 @@
 #include "comphelper/namedvaluecollection.hxx"
 #include "comphelper/documentinfo.hxx"
 
+#include "com/sun/star/awt/XTopWindow.hpp"
 #include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/document/XStorageBasedDocument.hpp"
 #include "com/sun/star/frame/XStorable.hpp"
 #include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/document/XStorageBasedDocument.hpp"
-#include "com/sun/star/awt/XTopWindow.hpp"
+#include "com/sun/star/util/XCloseBroadcaster.hpp"
 
 #include "tdoc_docmgr.hxx"
 
@@ -61,6 +59,53 @@ using ::comphelper::DocumentInfo;
 //=========================================================================
 //=========================================================================
 //
+// OfficeDocumentsCloseListener Implementation.
+//
+//=========================================================================
+//=========================================================================
+
+//=========================================================================
+//
+// util::XCloseListener
+//
+//=========================================================================
+
+// virtual
+void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing(
+         const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ )
+    throw ( util::CloseVetoException,
+            uno::RuntimeException )
+{
+}
+
+//=========================================================================
+void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosing(
+         const lang::EventObject& Source )
+    throw ( uno::RuntimeException )
+{
+    document::EventObject aDocEvent;
+    aDocEvent.Source = Source.Source;
+    aDocEvent.EventName = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) );
+    m_pManager->notifyEvent( aDocEvent );
+}
+
+//=========================================================================
+//
+// lang::XEventListener (base of util::XCloseListener)
+//
+//=========================================================================
+
+// virtual
+void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing(
+        const lang::EventObject& /*Source*/ )
+    throw ( uno::RuntimeException )
+{
+}
+
+//=========================================================================
+//=========================================================================
+//
 // OfficeDocumentsManager Implementation.
 //
 //=========================================================================
@@ -71,7 +116,8 @@ OfficeDocumentsManager::OfficeDocumentsManager(
             OfficeDocumentsEventListener * pDocEventListener )
 : m_xSMgr( xSMgr ),
   m_xDocEvtNotifier( createDocumentEventNotifier( xSMgr ) ),
-  m_pDocEventListener( pDocEventListener )
+  m_pDocEventListener( pDocEventListener ),
+  m_xDocCloseListener( new OfficeDocumentsCloseListener( this ) )
 {
     if ( m_xDocEvtNotifier.is() )
     {
@@ -189,10 +235,19 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
                 OSL_ENSURE( xStorage.is(), "Got no document storage!" );
 
                 rtl:: OUString aDocId = getDocumentId( Event.Source );
-                rtl:: OUString aTitle = DocumentInfo::getDocumentTitle( uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
+                rtl:: OUString aTitle = DocumentInfo::getDocumentTitle(
+                    uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
 
                 m_aDocs[ aDocId ] = StorageInfo( aTitle, xStorage, xModel );
 
+                uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
+                    Event.Source, uno::UNO_QUERY );
+                OSL_ENSURE( xCloseBroadcaster.is(),
+                    "OnLoadFinished/OnCreate event: got no close broadcaster!" );
+
+                if ( xCloseBroadcaster.is() )
+                    xCloseBroadcaster->addCloseListener( m_xDocCloseListener );
+
                 // Propagate document closure.
                 OSL_ENSURE( m_pDocEventListener,
                     "OnLoadFinished/OnCreate event: no owner for insert event propagation!" );
@@ -203,12 +258,18 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
         }
     }
     else if ( Event.EventName.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM( "OnUnload" ) ) )
+                RTL_CONSTASCII_STRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) ) )
     {
         if ( isOfficeDocument( Event.Source ) )
         {
             // Document has been closed (unloaded)
 
+            // #163732# - Official event "OnUnload" does not work here. Event
+            // gets fired to early. Other OnUnload listeners called after this
+            // listener may still need TDOC access to the document. Remove the
+            // document from TDOC docs list on XCloseListener::notifyClosing.
+            // See OfficeDocumentsManager::OfficeDocumentsListener::notifyClosing.
+
             osl::MutexGuard aGuard( m_aMtx );
 
             uno::Reference< frame::XModel >
@@ -229,8 +290,6 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
                         rtl::OUString aDocId( (*it).first );
                         m_pDocEventListener->notifyDocumentClosed( aDocId );
                     }
-
-
                     break;
                 }
                 ++it;
@@ -239,8 +298,18 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
             OSL_ENSURE( it != m_aDocs.end(),
                         "OnUnload event notified for unknown document!" );
 
-            if( it != m_aDocs.end() )
+            if ( it != m_aDocs.end() )
+            {
+                uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
+                    Event.Source, uno::UNO_QUERY );
+                OSL_ENSURE( xCloseBroadcaster.is(),
+                    "OnUnload event: got no XCloseBroadcaster from XModel" );
+
+                if ( xCloseBroadcaster.is() )
+                    xCloseBroadcaster->removeCloseListener( m_xDocCloseListener );
+
                 m_aDocs.erase( it );
+            }
         }
     }
     else if ( Event.EventName.equalsAsciiL(
@@ -308,7 +377,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
                     (*it).second.xStorage = xStorage;
 
                     // Adjust title.
-                    (*it).second.aTitle = DocumentInfo::getDocumentTitle( uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
+                    (*it).second.aTitle = DocumentInfo::getDocumentTitle( xModel );
                     break;
                 }
                 ++it;
@@ -335,7 +404,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent(
                 if ( (*it).second.xModel == xModel )
                 {
                     // Adjust title.
-                    rtl:: OUString aTitle = DocumentInfo::getDocumentTitle( uno::Reference< frame::XModel >( Event.Source, uno::UNO_QUERY ) );
+                    rtl:: OUString aTitle = DocumentInfo::getDocumentTitle( xModel );
                     (*it).second.aTitle = aTitle;
 
                     // Adjust storage.
@@ -476,6 +545,14 @@ void OfficeDocumentsManager::buildDocumentsList()
 
                         m_aDocs[ aDocId ]
                             = StorageInfo( aTitle, xStorage, xModel );
+
+                        uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster(
+                            xModel, uno::UNO_QUERY );
+                        OSL_ENSURE( xCloseBroadcaster.is(),
+                            "buildDocumentsList: got no close broadcaster!" );
+
+                        if ( xCloseBroadcaster.is() )
+                            xCloseBroadcaster->addCloseListener( m_xDocCloseListener );
                     }
                 }
             }
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index cc1f3d3bac..e1e478bfcc 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -40,6 +40,7 @@
 #include "com/sun/star/embed/XStorage.hpp"
 #include "com/sun/star/frame/XModel.hpp"
 #include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
 
 namespace tdoc_ucp {
 
@@ -89,6 +90,33 @@ namespace tdoc_ucp {
     class OfficeDocumentsManager :
         public cppu::WeakImplHelper1< com::sun::star::document::XEventListener >
     {
+        class OfficeDocumentsCloseListener :
+           public cppu::WeakImplHelper1< com::sun::star::util::XCloseListener >
+
+        {
+        public:
+            OfficeDocumentsCloseListener( OfficeDocumentsManager * pMgr )
+            : m_pManager( pMgr ) {};
+
+            // util::XCloseListener
+            virtual void SAL_CALL queryClosing(
+                    const ::com::sun::star::lang::EventObject& Source,
+                    ::sal_Bool GetsOwnership )
+                throw (::com::sun::star::util::CloseVetoException,
+                       ::com::sun::star::uno::RuntimeException);
+
+            virtual void SAL_CALL notifyClosing(
+                    const ::com::sun::star::lang::EventObject& Source )
+                throw (::com::sun::star::uno::RuntimeException);
+
+            // lang::XEventListener (base of util::XCloseListener)
+            virtual void SAL_CALL disposing(
+                    const com::sun::star::lang::EventObject & Source )
+                throw ( com::sun::star::uno::RuntimeException );
+        private:
+            OfficeDocumentsManager * m_pManager;
+        };
+
     public:
         OfficeDocumentsManager(
             const com::sun::star::uno::Reference<
@@ -132,7 +160,9 @@ namespace tdoc_ucp {
         createDocumentEventNotifier(
             const com::sun::star::uno::Reference<
                 com::sun::star::lang::XMultiServiceFactory >& rXSMgr );
+
         void buildDocumentsList();
+
         bool
         isOfficeDocument(
             const com::sun::star::uno::Reference<
@@ -164,9 +194,11 @@ namespace tdoc_ucp {
         com::sun::star::uno::Reference<
             com::sun::star::document::XEventBroadcaster >   m_xDocEvtNotifier;
         com::sun::star::uno::Reference<
-            com::sun::star::frame::XModuleManager > m_xModuleMgr;
+            com::sun::star::frame::XModuleManager >         m_xModuleMgr;
         DocumentList                                        m_aDocs;
         OfficeDocumentsEventListener *                      m_pDocEventListener;
+        com::sun::star::uno::Reference<
+            com::sun::star::util::XCloseListener >          m_xDocCloseListener;
     };
 
 } // namespace tdoc_ucp
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index fb99ca1811..fb99ca1811 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 314820e9c8..314820e9c8 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index f3b340de04..f3b340de04 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
index 1c4c49e56c..1c4c49e56c 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index cd06aabd82..cd06aabd82 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 46c67081bf..46c67081bf 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
index a584fec66c..a584fec66c 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
index 7370709bd6..7370709bd6 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 29fcd29625..46f11b0353 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -40,45 +40,6 @@ using namespace com::sun::star;
 using namespace tdoc_ucp;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                           uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
@@ -86,29 +47,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Transient Documents Content Provider.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               ContentProvider::getImplementationName_Static(),
-               ContentProvider::getSupportedServiceNames_Static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Transient Documents Document Content Factory.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               DocumentContentFactory::getImplementationName_Static(),
-               DocumentContentFactory::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index f9b65886f0..f9b65886f0 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 05be27b5dc..05be27b5dc 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index c94b2f2209..c94b2f2209 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index 3249e04606..3249e04606 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 9c9871584a..9c9871584a 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 6352fe313b..6352fe313b 100644..100755
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
diff --git a/ucb/source/ucp/tdoc/ucptdoc.xml b/ucb/source/ucp/tdoc/ucptdoc.xml
index f1260a9c07..f1260a9c07 100644..100755
--- a/ucb/source/ucp/tdoc/ucptdoc.xml
+++ b/ucb/source/ucp/tdoc/ucptdoc.xml
diff --git a/ucb/source/ucp/tdoc/ucptdoc1.component b/ucb/source/ucp/tdoc/ucptdoc1.component
new file mode 100755
index 0000000000..8ba1471bd9
--- /dev/null
+++ b/ucb/source/ucp/tdoc/ucptdoc1.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.ucb.TransientDocumentsContentProvider">
+    <service name="com.sun.star.ucb.TransientDocumentsContentProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory">
+    <service name="com.sun.star.frame.TransientDocumentsDocumentContentFactory"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 24bcaf9e71..5332f23533 100644..100755
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -106,29 +106,29 @@ ContentProperties::ContentProperties( const DAVResource& rResource )
         m_aEscapedTitle = aURI.GetPathBaseName();
 
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
-            = PropertyValue( 
+            = PropertyValue(
                 uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true );
     }
     catch ( DAVException const & )
     {
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
-            = PropertyValue( 
-                uno::makeAny( 
-                    rtl::OUString( 
-                        RTL_CONSTASCII_USTRINGPARAM( "*** unknown ***" ) ) ), 
+            = PropertyValue(
+                uno::makeAny(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM( "*** unknown ***" ) ) ),
                 true );
     }
 
     std::vector< DAVPropertyValue >::const_iterator it
         = rResource.properties.begin();
-      std::vector< DAVPropertyValue >::const_iterator end
+    std::vector< DAVPropertyValue >::const_iterator end
         = rResource.properties.end();
 
-      while ( it != end )
-      {
+    while ( it != end )
+    {
         addProperty( (*it) );
         ++it;
-      }
+    }
 
     if ( rResource.uri.getStr()[ rResource.uri.getLength() - 1 ]
         == sal_Unicode( '/' ) )
@@ -159,6 +159,13 @@ ContentProperties::ContentProperties( const rtl::OUString & rTitle )
 }
 
 //=========================================================================
+ContentProperties::ContentProperties()
+: m_xProps( new PropertyValueMap ),
+  m_bTrailingSlash( sal_False )
+{
+}
+
+//=========================================================================
 ContentProperties::ContentProperties( const ContentProperties & rOther )
 : m_aEscapedTitle( rOther.m_aEscapedTitle ),
   m_xProps( rOther.m_xProps.get()
@@ -202,7 +209,7 @@ const PropertyValue * ContentProperties::get(
         {
             if ( (*it).first.equalsIgnoreAsciiCase( rName ) )
                 return &(*it).second;
-            
+
             ++it;
         }
         return 0;
@@ -255,7 +262,7 @@ void ContentProperties::UCBNamesToDAVNames(
         {
             if ( !bCreationDate )
             {
-                   propertyNames.push_back( DAVProperties::CREATIONDATE );
+                    propertyNames.push_back( DAVProperties::CREATIONDATE );
                 bCreationDate = sal_True;
             }
         }
@@ -266,7 +273,7 @@ void ContentProperties::UCBNamesToDAVNames(
         {
             if ( !bLastModified )
             {
-                   propertyNames.push_back(
+                    propertyNames.push_back(
                     DAVProperties::GETLASTMODIFIED );
                 bLastModified = sal_True;
             }
@@ -278,7 +285,7 @@ void ContentProperties::UCBNamesToDAVNames(
         {
             if ( !bContentType )
             {
-                   propertyNames.push_back(
+                    propertyNames.push_back(
                         DAVProperties::GETCONTENTTYPE );
                 bContentType = sal_True;
             }
@@ -290,7 +297,7 @@ void ContentProperties::UCBNamesToDAVNames(
         {
             if ( !bContentLength )
             {
-                   propertyNames.push_back(
+                    propertyNames.push_back(
                     DAVProperties::GETCONTENTLENGTH );
                 bContentLength = sal_True;
             }
@@ -308,7 +315,7 @@ void ContentProperties::UCBNamesToDAVNames(
         {
             if ( !bResourceType )
             {
-                   propertyNames.push_back( DAVProperties::RESOURCETYPE );
+                    propertyNames.push_back( DAVProperties::RESOURCETYPE );
                 bResourceType = sal_True;
             }
         }
@@ -408,7 +415,7 @@ void ContentProperties::addProperties(
             {
                 // Add it.
                 addProperty( rName, pProp->value(), pProp->isCaseSensitive() );
-            } 
+            }
             else
             {
                 addProperty( rName, uno::Any(), false );
@@ -423,27 +430,27 @@ void ContentProperties::addProperties( const ContentProperties & rProps )
 {
     PropertyValueMap::const_iterator it = rProps.m_xProps->begin();
     const PropertyValueMap::const_iterator end = rProps.m_xProps->end();
-    
+
     while ( it != end )
     {
-        addProperty(  
+        addProperty(
             (*it).first, (*it).second.value(), (*it).second.isCaseSensitive() );
         ++it;
     }
 }
 
 //=========================================================================
-void ContentProperties::addProperties( 
+void ContentProperties::addProperties(
     const std::vector< DAVPropertyValue > & rProps )
 {
     std::vector< DAVPropertyValue >::const_iterator it  = rProps.begin();
-    std::vector< DAVPropertyValue >::const_iterator end = rProps.end();
-    
+    const std::vector< DAVPropertyValue >::const_iterator end = rProps.end();
+
     while ( it != end )
     {
         addProperty( (*it) );
         ++it;
-    }		
+    }
 }
 
 //=========================================================================
@@ -464,7 +471,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         rValue >>= aValue;
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateCreated")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
@@ -475,11 +482,11 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     //  {
     //  }
     else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) )
-    {	
+    {
         // Map DAV:getcontentlength to UCP:Size
         rtl::OUString aValue;
         rValue >>= aValue;
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ]
             = PropertyValue( uno::makeAny( aValue.toInt64() ), true );
     }
@@ -488,11 +495,11 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     {
         // Do NOT map Content-Lenght entity header to DAV:getcontentlength!
         // Only DAV resources have this property.
-        
+
         // Map Content-Length entity header to UCP:Size
         rtl::OUString aValue;
         rValue >>= aValue;
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ]
             = PropertyValue( uno::makeAny( aValue.toInt64() ), true );
     }
@@ -506,7 +513,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     {
         // Do NOT map Content-Type entity header to DAV:getcontenttype!
         // Only DAV resources have this property.
-        
+
         // Map DAV:getcontenttype to UCP:MediaType (1:1)
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ]
             = PropertyValue( rValue, true );
@@ -521,7 +528,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         rValue >>= aValue;
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
@@ -530,13 +537,13 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     {
         // Do not map Last-Modified entity header to DAV:getlastmodified!
         // Only DAV resources have this property.
-        
+
         // Map the Last-Modified entity header to UCP:DateModified
         rtl::OUString aValue;
         rValue >>= aValue;
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
@@ -547,12 +554,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     {
         rtl::OUString aValue;
         rValue >>= aValue;
-        
+
         // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
         sal_Bool bFolder =
             aValue.equalsIgnoreAsciiCaseAsciiL(
                 RTL_CONSTASCII_STRINGPARAM( "collection" ) );
-        
+
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ]
             = PropertyValue( uno::makeAny( bFolder ), true );
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) ]
@@ -568,9 +575,102 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
     //  else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) )
     //  {
     //  }
-    
+
     // Save property.
     (*m_xProps)[ rName ] = PropertyValue( rValue, bIsCaseSensitive );
 }
 
+//=========================================================================
+//=========================================================================
+//
+// CachableContentProperties Implementation.
+//
+//=========================================================================
+//=========================================================================
+
+namespace
+{
+    bool isCachable( rtl::OUString const & rName,
+                     bool isCaseSensitive )
+    {
+        static rtl::OUString aNonCachableProps [] =
+        {
+            DAVProperties::LOCKDISCOVERY,
+
+            DAVProperties::GETETAG,
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ETag" ) ),
+
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Last-Modified" ) ),
+            DAVProperties::GETLASTMODIFIED,
+
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content-Length" ) ),
+            DAVProperties::GETCONTENTLENGTH,
+
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Date" ) )
+        };
+
+        for ( sal_uInt32 n = 0;
+              n <  ( sizeof( aNonCachableProps )
+                     / sizeof( aNonCachableProps[ 0 ] ) );
+              ++n )
+        {
+            if ( isCaseSensitive )
+            {
+                if ( rName.equals( aNonCachableProps[ n ] ) )
+                    return false;
+            }
+            else
+                if ( rName.equalsIgnoreAsciiCase( aNonCachableProps[ n ] ) )
+                    return false;
+        }
+        return true;
+    }
+
+} // namespace
+
+//=========================================================================
+CachableContentProperties::CachableContentProperties(
+    const ContentProperties & rProps )
+{
+    addProperties( rProps );
+}
+
+//=========================================================================
+void CachableContentProperties::addProperties(
+    const ContentProperties & rProps )
+{
+    const std::auto_ptr< PropertyValueMap > & props = rProps.getProperties();
+
+    PropertyValueMap::const_iterator it = props->begin();
+    const PropertyValueMap::const_iterator end = props->end();
+
+    while ( it != end )
+    {
+        if ( isCachable( (*it).first, (*it).second.isCaseSensitive() ) )
+            m_aProps.addProperty( (*it).first,
+                                  (*it).second.value(),
+                                  (*it).second.isCaseSensitive() );
+
+        ++it;
+    }
+}
+
+//=========================================================================
+void CachableContentProperties::addProperties(
+    const std::vector< DAVPropertyValue > & rProps )
+{
+    std::vector< DAVPropertyValue >::const_iterator it  = rProps.begin();
+    const std::vector< DAVPropertyValue >::const_iterator end = rProps.end();
+
+    while ( it != end )
+    {
+        if ( isCachable( (*it).Name, (*it).IsCaseSensitive ) )
+            m_aProps.addProperty( (*it) );
+
+        ++it;
+     }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index f2137a8abb..bf9af15f6b 100644..100755
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -72,13 +72,13 @@ struct hashString
 class PropertyValue
 {
 private:
-    ::com::sun::star::uno::Any m_aValue;   
+    ::com::sun::star::uno::Any m_aValue;
     bool                       m_bIsCaseSensitive;
 
 public:
     PropertyValue()
     : m_bIsCaseSensitive( true ) {}
-    
+
     PropertyValue( const ::com::sun::star::uno::Any & rValue,
                    bool bIsCaseSensitive )
     : m_aValue( rValue),
@@ -86,7 +86,7 @@ public:
 
     bool isCaseSensitive() const { return m_bIsCaseSensitive; }
     const ::com::sun::star::uno::Any & value() const { return m_aValue; }
-    
+
 };
 
 typedef boost::unordered_map
@@ -103,10 +103,12 @@ struct DAVResource;
 class ContentProperties
 {
 public:
-      ContentProperties( const DAVResource& rResource );
+    ContentProperties();
+
+    ContentProperties( const DAVResource& rResource );
 
     // Mini props for transient contents.
-      ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder );
+    ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder );
 
     // Micro props for non-existing contents.
     ContentProperties( const rtl::OUString & rTitle );
@@ -168,10 +170,10 @@ public:
     void addProperty( const rtl::OUString & rName,
                      const com::sun::star::uno::Any & rValue,
                      bool bIsCaseSensitive );
-    
+
     // overwrites probably existing entry.
     void addProperty( const DAVPropertyValue & rProp );
-    
+
     bool isTrailingSlash() const { return m_bTrailingSlash; }
 
     const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; }
@@ -182,7 +184,7 @@ public:
     { return m_xProps; }
 
 private:
-    ::rtl::OUString m_aEscapedTitle;  // escaped Title
+    ::rtl::OUString m_aEscapedTitle;
     std::auto_ptr< PropertyValueMap > m_xProps;
     bool m_bTrailingSlash;
 
@@ -193,7 +195,35 @@ private:
     const PropertyValue * get( const rtl::OUString & rName ) const;
 };
 
-}
+class CachableContentProperties
+{
+private:
+    ContentProperties m_aProps;
+
+    CachableContentProperties & operator=( const CachableContentProperties & ); // n.i.
+    CachableContentProperties( const CachableContentProperties & ); // n.i.
+
+public:
+    CachableContentProperties( const ContentProperties & rProps );
+
+    void addProperties( const ContentProperties & rProps );
+
+    void addProperties( const std::vector< DAVPropertyValue > & rProps );
+
+    bool containsAllNames(
+                    const com::sun::star::uno::Sequence<
+                        com::sun::star::beans::Property >& rProps,
+                    std::vector< rtl::OUString > & rNamesNotContained ) const
+    { return m_aProps.containsAllNames( rProps, rNamesNotContained ); }
+
+    const com::sun::star::uno::Any &
+    getValue( const rtl::OUString & rName ) const
+    { return m_aProps.getValue( rName ); }
+
+    operator const ContentProperties & () const { return m_aProps; }
+};
+
+} // namespace webdav_ucp
 
 #endif /* !_WEBDAV_UCP_CONTENTPROPERTIES_HXX */
 
diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx
index 7e4a34b565..7e4a34b565 100644..100755
--- a/ucb/source/ucp/webdav/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx
diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
index db5f446556..db5f446556 100644..100755
--- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx
index 014f864f1f..014f864f1f 100644..100755
--- a/ucb/source/ucp/webdav/DAVException.hxx
+++ b/ucb/source/ucp/webdav/DAVException.hxx
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index aa3d380632..aa3d380632 100644..100755
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index 153148c16d..153148c16d 100644..100755
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
index e19c6de2d2..e19c6de2d2 100644..100755
--- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
+++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx
index 45d9c9698d..45d9c9698d 100644..100755
--- a/ucb/source/ucp/webdav/DAVResource.hxx
+++ b/ucb/source/ucp/webdav/DAVResource.hxx
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 0024eb7340..0024eb7340 100644..100755
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 89191971fc..89191971fc 100644..100755
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index 03cb6a23fe..03cb6a23fe 100644..100755
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index 6438c7eca8..6438c7eca8 100644..100755
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 4dfd94e4ab..4dfd94e4ab 100644..100755
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx
index 647d7b81f1..647d7b81f1 100644..100755
--- a/ucb/source/ucp/webdav/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav/DAVTypes.hxx
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index 7547c01dc0..7547c01dc0 100644..100755
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx
index 6c598c9931..6c598c9931 100644..100755
--- a/ucb/source/ucp/webdav/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx
diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx
index 63faf0c088..f29a8b3a90 100644..100755
--- a/ucb/source/ucp/webdav/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav/LinkSequence.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -167,11 +167,7 @@ bool LinkSequence::createFromXML( const rtl::OString & rInData,
                       rInData.getStr() + nStart,
                       nEnd - nStart + TOKEN_LENGTH );
 
-#if NEON_VERSION >= 0x0250
         success = !ne_xml_failed( parser );
-#else
-        success = !!ne_xml_valid( parser );
-#endif
 
         ne_xml_destroy( parser );
 
diff --git a/ucb/source/ucp/webdav/LinkSequence.hxx b/ucb/source/ucp/webdav/LinkSequence.hxx
index d9f82491ee..d9f82491ee 100644..100755
--- a/ucb/source/ucp/webdav/LinkSequence.hxx
+++ b/ucb/source/ucp/webdav/LinkSequence.hxx
diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 28c59326df..8819111ef8 100644..100755
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -216,11 +216,7 @@ bool LockEntrySequence::createFromXML( const rtl::OString & rInData,
                       rInData.getStr() + nStart,
                       nEnd - nStart + TOKEN_LENGTH );
 
-#if NEON_VERSION >= 0x0250
         success = !ne_xml_failed( parser );
-#else
-        success = !!ne_xml_valid( parser );
-#endif
 
         ne_xml_destroy( parser );
 
diff --git a/ucb/source/ucp/webdav/LockEntrySequence.hxx b/ucb/source/ucp/webdav/LockEntrySequence.hxx
index e28ee31dcd..e28ee31dcd 100644..100755
--- a/ucb/source/ucp/webdav/LockEntrySequence.hxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.hxx
diff --git a/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx
index 61c414dfaf..896117152a 100644..100755
--- a/ucb/source/ucp/webdav/LockSequence.cxx
+++ b/ucb/source/ucp/webdav/LockSequence.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -36,6 +36,8 @@
 using namespace webdav_ucp;
 using namespace com::sun::star;
 
+#define BEEHIVE_BUGS_WORKAROUND
+
 //////////////////////////////////////////////////////////////////////////
 
 struct LockSequenceParseContext
@@ -129,7 +131,11 @@ extern "C" int LockSequence_startelement_callback(
 extern "C" int LockSequence_chardata_callback(
     void *userdata,
     int state,
+#ifdef BEEHIVE_BUGS_WORKAROUND
+    const char *buf1,
+#else
     const char *buf,
+#endif
     size_t len )
 {
     LockSequenceParseContext * pCtx
@@ -137,6 +143,15 @@ extern "C" int LockSequence_chardata_callback(
     if ( !pCtx->pLock )
         pCtx->pLock = new ucb::Lock;
 
+#ifdef BEEHIVE_BUGS_WORKAROUND
+    // Beehive sends XML values containing trailing newlines.
+    if ( buf1[ len - 1 ] == 0x0a )
+        len--;
+
+    char * buf = new char[ len + 1 ]();
+    strncpy( buf, buf1, len );
+#endif
+
     switch ( state )
     {
         case STATE_DEPTH:
@@ -208,7 +223,7 @@ extern "C" int LockSequence_chardata_callback(
                 pCtx->pLock->Timeout = sal_Int64( -1 );
                 pCtx->hasTimeout = true;
                 OSL_ENSURE( sal_False,
-                        "LockSequence_chardata_callback - Unknown timeout!" );
+                            "LockSequence_chardata_callback - Unknown timeout!" );
             }
             break;
 
@@ -224,6 +239,11 @@ extern "C" int LockSequence_chardata_callback(
         }
 
     }
+
+#ifdef BEEHIVE_BUGS_WORKAROUND
+    delete [] buf;
+#endif
+
     return 0; // zero to continue, non-zero to abort parsing
 }
 
@@ -324,11 +344,7 @@ bool LockSequence::createFromXML( const rtl::OString & rInData,
                       rInData.getStr() + nStart,
                       nEnd - nStart + TOKEN_LENGTH );
 
-#if NEON_VERSION >= 0x0250
         success = !ne_xml_failed( parser );
-#else
-        success = !!ne_xml_valid( parser );
-#endif
 
         ne_xml_destroy( parser );
 
diff --git a/ucb/source/ucp/webdav/LockSequence.hxx b/ucb/source/ucp/webdav/LockSequence.hxx
index c5cff554e1..c5cff554e1 100644..100755
--- a/ucb/source/ucp/webdav/LockSequence.hxx
+++ b/ucb/source/ucp/webdav/LockSequence.hxx
diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
index 877e903959..d33ff2a517 100644..100755
--- a/ucb/source/ucp/webdav/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -38,16 +38,15 @@ using namespace com::sun::star;
 
 namespace {
 
-#if NEON_VERSION >= 0x0250
-void process_headers(ne_request *req,
-                     DAVResource &rResource,
-                     const std::vector< ::rtl::OUString > &rHeaderNames)
+void process_headers( ne_request * req,
+                      DAVResource & rResource,
+                      const std::vector< ::rtl::OUString > & rHeaderNames )
 {
-    void *cursor = NULL;
-    const char *name, *value;
+    void * cursor = NULL;
+    const char * name, *value;
 
-    while ((cursor = ne_response_header_iterate(req, cursor,
-                                                &name, &value)) != NULL) {
+    while ( ( cursor = ne_response_header_iterate( req, cursor,
+                                                   &name, &value ) ) != NULL ) {
         rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) );
         rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) );
 
@@ -87,69 +86,6 @@ void process_headers(ne_request *req,
         }
     }
 }
-#else
-struct NeonHeadRequestContext
-{
-    DAVResource * pResource;
-    const std::vector< ::rtl::OUString > * pHeaderNames;
-
-    NeonHeadRequestContext( DAVResource * p,
-                            const std::vector< ::rtl::OUString > * pHeaders )
-    : pResource( p ), pHeaderNames( pHeaders ) {}
-};
-
-extern "C" void NHR_ResponseHeaderCatcher( void * userdata,
-                                           const char * value )
-{
-    rtl::OUString aHeader( rtl::OUString::createFromAscii( value ) );
-    sal_Int32 nPos = aHeader.indexOf( ':' );
-
-    if ( nPos != -1 )
-    {
-        rtl::OUString aHeaderName( aHeader.copy( 0, nPos ) );
-
-        NeonHeadRequestContext * pCtx
-            = static_cast< NeonHeadRequestContext * >( userdata );
-
-        // Note: Empty vector means that all headers are requested.
-        bool bIncludeIt = ( pCtx->pHeaderNames->size() == 0 );
-
-        if ( !bIncludeIt )
-        {
-            // Check whether this header was requested.
-            std::vector< ::rtl::OUString >::const_iterator it(
-                pCtx->pHeaderNames->begin() );
-            const std::vector< ::rtl::OUString >::const_iterator end(
-                pCtx->pHeaderNames->end() );
-
-            while ( it != end )
-            {
-                if ( (*it) == aHeaderName )
-                    break;
-
-                ++it;
-            }
-
-            if ( it != end )
-                bIncludeIt = true;
-        }
-
-        if ( bIncludeIt )
-        {
-            // Create & set the PropertyValue
-            DAVPropertyValue thePropertyValue;
-            thePropertyValue.Name = aHeaderName;
-            thePropertyValue.IsCaseSensitive = false;
-
-            if ( nPos < aHeader.getLength() )
-                thePropertyValue.Value <<= aHeader.copy( nPos + 1 ).trim();
-
-            // Add the newly created PropertyValue
-            pCtx->pResource->properties.push_back( thePropertyValue );
-        }
-    }
-}
-#endif
 
 } // namespace
 
@@ -159,7 +95,7 @@ extern "C" void NHR_ResponseHeaderCatcher( void * userdata,
 
 extern osl::Mutex aGlobalNeonMutex;
 
-NeonHeadRequest::NeonHeadRequest( HttpSession* inSession,
+NeonHeadRequest::NeonHeadRequest( HttpSession * inSession,
                                   const rtl::OUString & inPath,
                                   const std::vector< ::rtl::OUString > &
                                     inHeaderNames,
@@ -177,19 +113,12 @@ NeonHeadRequest::NeonHeadRequest( HttpSession* inSession,
                                             inPath,
                                             RTL_TEXTENCODING_UTF8 ) );
 
-#if NEON_VERSION < 0x0250
-    NeonHeadRequestContext aCtx( &ioResource, &inHeaderNames );
-    ne_add_response_header_catcher( req, NHR_ResponseHeaderCatcher, &aCtx );
-#endif
-
     {
         osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
         nError = ne_request_dispatch( req );
     }
 
-#if NEON_VERSION >= 0x0250
-    process_headers(req, ioResource, inHeaderNames);
-#endif
+    process_headers( req, ioResource, inHeaderNames );
 
     if ( nError == NE_OK && ne_get_status( req )->klass != 2 )
         nError = NE_ERROR;
diff --git a/ucb/source/ucp/webdav/NeonHeadRequest.hxx b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
index 4f58a3e2cc..4f58a3e2cc 100644..100755
--- a/ucb/source/ucp/webdav/NeonHeadRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
diff --git a/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 53f816b4a1..53f816b4a1 100644..100755
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
diff --git a/ucb/source/ucp/webdav/NeonInputStream.hxx b/ucb/source/ucp/webdav/NeonInputStream.hxx
index 20d0c9c080..20d0c9c080 100644..100755
--- a/ucb/source/ucp/webdav/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.hxx
diff --git a/ucb/source/ucp/webdav/NeonLockStore.cxx b/ucb/source/ucp/webdav/NeonLockStore.cxx
index 7868a64816..7868a64816 100644..100755
--- a/ucb/source/ucp/webdav/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.cxx
diff --git a/ucb/source/ucp/webdav/NeonLockStore.hxx b/ucb/source/ucp/webdav/NeonLockStore.hxx
index c36f922c6a..c36f922c6a 100644..100755
--- a/ucb/source/ucp/webdav/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.hxx
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 8256d97d49..7c1e2b07a3 100644..100755
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -195,22 +195,13 @@ extern "C" int NPFR_propfind_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propfind_results( void* userdata,
-#if NEON_VERSION >= 0x0260
                                        const ne_uri* uri,
-#else
-                                       const char* href,
-#endif
                                        const NeonPropFindResultSet* set )
 {
     // @@@ href is not the uri! DAVResource ctor wants uri!
 
-#if NEON_VERSION >= 0x0260
     DAVResource theResource(
         OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
-#else
-    DAVResource theResource(
-        OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
-#endif
 
     ne_propset_iterate( set, NPFR_propfind_iter, &theResource );
 
@@ -237,22 +228,13 @@ extern "C" int NPFR_propnames_iter( void* userdata,
 
 // -------------------------------------------------------------------
 extern "C" void NPFR_propnames_results( void* userdata,
-#if NEON_VERSION >= 0x0260
                                         const ne_uri* uri,
-#else
-                                        const char* href,
-#endif
                                         const NeonPropFindResultSet* results )
 {
     // @@@ href is not the uri! DAVResourceInfo ctor wants uri!
     // Create entry for the resource.
-#if NEON_VERSION >= 0x0260
     DAVResourceInfo theResource(
         OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
-#else
-    DAVResourceInfo theResource(
-        OStringToOUString( href, RTL_TEXTENCODING_UTF8 ) );
-#endif
 
     // Fill entry.
     ne_propset_iterate( results, NPFR_propnames_iter, &theResource );
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
index cd4b5ded17..cd4b5ded17 100644..100755
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 9d3232b6e9..7df353ea85 100644..100755
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -185,11 +185,7 @@ struct NeonRequestContext
 // A simple Neon response_block_reader for use with an XInputStream
 // -------------------------------------------------------------------
 
-#if NEON_VERSION >= 0x0250
 extern "C" int NeonSession_ResponseBlockReader(void * inUserData,
-#else
-extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
-#endif
                                                const char * inBuf,
                                                size_t inLen )
 {
@@ -205,9 +201,7 @@ extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
         if ( xInputStream.is() )
             xInputStream->AddToStream( inBuf, inLen );
     }
-#if NEON_VERSION >= 0x0250
     return 0;
-#endif
 }
 
 // -------------------------------------------------------------------
@@ -215,11 +209,7 @@ extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
 // A simple Neon response_block_reader for use with an XOutputStream
 // -------------------------------------------------------------------
 
-#if NEON_VERSION >= 0x0250
 extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
-#else
-extern "C" void NeonSession_ResponseBlockWriter( void * inUserData,
-#endif
                                                 const char * inBuf,
                                                 size_t inLen )
 {
@@ -237,9 +227,7 @@ extern "C" void NeonSession_ResponseBlockWriter( void * inUserData,
             xOutputStream->writeBytes( aSeq );
         }
     }
-#if NEON_VERSION >= 0x0250
     return 0;
-#endif
 }
 
 // -------------------------------------------------------------------
@@ -1923,11 +1911,6 @@ int NeonSession::GET( ne_session * sess,
     ne_request * req = ne_request_create( sess, "GET", uri );
     int ret;
 
-#if NEON_VERSION < 0x0250
-    if ( getheaders )
-        ne_add_response_header_catcher(
-            req, runResponseHeaderHandler, userdata );
-#endif
     ne_decompress * dc
         = ne_decompress_reader( req, ne_accept_2xx, reader, userdata );
 
@@ -1936,7 +1919,6 @@ int NeonSession::GET( ne_session * sess,
         ret = ne_request_dispatch( req );
     }
 
-#if NEON_VERSION >= 0x0250
     if ( getheaders )
     {
         void *cursor = NULL;
@@ -1950,7 +1932,7 @@ int NeonSession::GET( ne_session * sess,
             runResponseHeaderHandler(userdata, buffer);
         }
     }
-#endif
+
     if ( ret == NE_OK && ne_get_status( req )->klass != 2 )
         ret = NE_ERROR;
 
diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx
index c6586ea4fd..c6586ea4fd 100644..100755
--- a/ucb/source/ucp/webdav/NeonSession.hxx
+++ b/ucb/source/ucp/webdav/NeonSession.hxx
diff --git a/ucb/source/ucp/webdav/NeonTypes.hxx b/ucb/source/ucp/webdav/NeonTypes.hxx
index 5b77368697..5b77368697 100644..100755
--- a/ucb/source/ucp/webdav/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav/NeonTypes.hxx
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index e36965373f..fd88795bef 100644..100755
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -60,36 +60,24 @@ using namespace webdav_ucp;
 namespace {
 
 const ne_uri g_sUriDefaultsHTTP  = { "http",
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      DEFAULT_HTTP_PORT,
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      NULL };
 const ne_uri g_sUriDefaultsHTTPS = { "https",
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      DEFAULT_HTTPS_PORT,
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      NULL };
 const ne_uri g_sUriDefaultsFTP   = { "ftp",
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      DEFAULT_FTP_PORT,
-#if NEON_VERSION >= 0x0260
                                      NULL,
-#endif
                                      NULL,
                                      NULL };
 } // namespace
@@ -175,11 +163,7 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
                     pUri->scheme ? pUri->scheme : pUriDefs->scheme,
                     RTL_TEXTENCODING_UTF8 );
     mUserInfo = rtl::OStringToOUString(
-#if NEON_VERSION >= 0x0260
                     pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo,
-#else
-                    pUri->authinfo ? pUri->authinfo : pUriDefs->authinfo,
-#endif
                     RTL_TEXTENCODING_UTF8 );
     mHostName = rtl::OStringToOUString(
                     pUri->host ? pUri->host : pUriDefs->host,
@@ -189,7 +173,6 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
                     pUri->path ? pUri->path : pUriDefs->path,
                     RTL_TEXTENCODING_UTF8 );
 
-#if NEON_VERSION >= 0x0260
     if ( pUri->query )
     {
         mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
@@ -203,7 +186,6 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
         mPath += rtl::OStringToOUString(
             pUri->fragment,  RTL_TEXTENCODING_UTF8 );
     }
-#endif
 }
 
 // -------------------------------------------------------------------
diff --git a/ucb/source/ucp/webdav/NeonUri.hxx b/ucb/source/ucp/webdav/NeonUri.hxx
index 47dd22a6ea..47dd22a6ea 100644..100755
--- a/ucb/source/ucp/webdav/NeonUri.hxx
+++ b/ucb/source/ucp/webdav/NeonUri.hxx
diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index 01d5dd0844..01d5dd0844 100644..100755
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index c89158b110..ef76f5784c 100644..100755
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -362,11 +362,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
 
         ne_xml_parse( parser, rInData.getStr(), rInData.getLength() );
 
-#if NEON_VERSION >= 0x0250
         success = !ne_xml_failed( parser );
-#else
-        success = !!ne_xml_valid( parser );
-#endif
 
         ne_xml_destroy( parser );
 
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
index 5720df28b4..5720df28b4 100644..100755
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 73ee298697..162d582664 100644..100755
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -158,3 +158,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ----------------------------------------------------------
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/ucpdav1.component
+
+$(MISC)/ucpdav1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpdav1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpdav1.component
diff --git a/ucb/source/ucp/webdav/ucpdav.xml b/ucb/source/ucp/webdav/ucpdav.xml
index 3a462c21f7..3a462c21f7 100644..100755
--- a/ucb/source/ucp/webdav/ucpdav.xml
+++ b/ucb/source/ucp/webdav/ucpdav.xml
diff --git a/ucb/source/ucp/webdav/ucpdav1.component b/ucb/source/ucp/webdav/ucpdav1.component
new file mode 100755
index 0000000000..4e18b566e1
--- /dev/null
+++ b/ucb/source/ucp/webdav/ucpdav1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.WebDAVContentProvider">
+    <service name="com.sun.star.ucb.WebDAVContentProvider"/>
+  </implementation>
+</component>
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 69f5a69d37..2f5adff8e2 100644..100755
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -1163,7 +1163,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     std::auto_ptr< ContentProperties > xProps;
     std::auto_ptr< ContentProperties > xCachedProps;
     std::auto_ptr< DAVResourceAccess > xResAccess;
-    rtl::OUString aEscapedTitle;
+    rtl::OUString aUnescapedTitle;
     bool bHasAll = false;
     uno::Reference< lang::XMultiServiceFactory > xSMgr;
     uno::Reference< ucb::XContentIdentifier > xIdentifier;
@@ -1172,7 +1172,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-        aEscapedTitle = NeonUri::unescape( m_aEscapedTitle );
+        aUnescapedTitle = NeonUri::unescape( m_aEscapedTitle );
         xSMgr.set( m_xSMgr );
         xIdentifier.set( m_xIdentifier );
         xProvider.set( m_xProvider.get() );
@@ -1345,7 +1345,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                         if ( m_eResourceType == NON_DAV )
                             xProps->addProperties( aMissingProps,
                                                    ContentProperties(
-                                                       aEscapedTitle,
+                                                       aUnescapedTitle,
                                                        false ) );
                     }
                     catch ( DAVException const & e )
@@ -1366,32 +1366,33 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         // might trigger HTTP redirect.
         // Therefore, title must be updated here.
         NeonUri aUri( xResAccess->getURL() );
-        aEscapedTitle = aUri.GetPathBaseName();
+        aUnescapedTitle = aUri.GetPathBaseNameUnescaped();
 
-        if ( UNKNOWN == rType )
+        if ( rType == UNKNOWN )
         {
-            xProps.reset( new ContentProperties( aEscapedTitle ) );
+            xProps.reset( new ContentProperties( aUnescapedTitle ) );
         }
 
         // For DAV resources we only know the Title, for non-DAV
         // resources we additionally know that it is a document.
-        if ( DAV == rType  )
+
+        if ( rType == DAV )
         {
             //xProps.reset(
-            //    new ContentProperties( aEscapedTitle ) );
+            //    new ContentProperties( aUnescapedTitle ) );
             xProps->addProperty(
                 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
-                uno::makeAny( aEscapedTitle ),
+                uno::makeAny( aUnescapedTitle ),
                 true );
         }
         else
         {
             if ( !xProps.get() )
-                xProps.reset( new ContentProperties( aEscapedTitle, false ) );
+                xProps.reset( new ContentProperties( aUnescapedTitle, false ) );
             else
                 xProps->addProperty(
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
-                    uno::makeAny( aEscapedTitle ),
+                    uno::makeAny( aUnescapedTitle ),
                     true );
 
             xProps->addProperty(
@@ -1409,7 +1410,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         // No server access for just created (not yet committed) objects.
         // Only a minimal set of properties supported at this stage.
         if (m_bTransient)
-            xProps.reset( new ContentProperties( aEscapedTitle,
+            xProps.reset( new ContentProperties( aUnescapedTitle,
                                                  m_bCollection ) );
     }
 
@@ -1455,12 +1456,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
         if ( !m_xCachedProps.get() )
-            m_xCachedProps.reset( new ContentProperties( *xProps.get() ) );
+            m_xCachedProps.reset( new CachableContentProperties( *xProps.get() ) );
         else
             m_xCachedProps->addProperties( *xProps.get() );
 
         m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
-        m_aEscapedTitle = aEscapedTitle;
+        m_aEscapedTitle = NeonUri::escapeSegment( aUnescapedTitle );
     }
 
     return xResultRow;
@@ -1991,7 +1992,7 @@ uno::Any Content::open(
                     // cache headers.
                     if ( !m_xCachedProps.get())
                         m_xCachedProps.reset(
-                            new ContentProperties( aResource ) );
+                            new CachableContentProperties( aResource ) );
                     else
                         m_xCachedProps->addProperties( aResource );
 
@@ -2037,7 +2038,7 @@ uno::Any Content::open(
                         // cache headers.
                         if ( !m_xCachedProps.get())
                             m_xCachedProps.reset(
-                                new ContentProperties( aResource ) );
+                                new CachableContentProperties( aResource ) );
                         else
                             m_xCachedProps->addProperties(
                                 aResource.properties );
@@ -2927,6 +2928,20 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
     // Map DAVException...
     uno::Any aException;
 
+    rtl::OUString aURL;
+    if ( m_bTransient )
+    {
+        aURL = getParentURL();
+        if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) )
+            aURL += rtl::OUString::createFromAscii( "/" );
+
+        aURL += m_aEscapedTitle;
+    }
+    else
+    {
+        aURL = m_xIdentifier->getContentIdentifier();
+    }
+
     switch ( e.getStatus() )
     {
         case SC_NOT_FOUND:
@@ -2934,7 +2949,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
             uno::Sequence< uno::Any > aArgs( 1 );
             aArgs[ 0 ] <<= beans::PropertyValue(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
-                uno::makeAny(m_xIdentifier->getContentIdentifier()),
+                uno::makeAny(aURL),
                 beans::PropertyState_DIRECT_VALUE);
 
             aException <<=
@@ -3024,14 +3039,14 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
-                m_xIdentifier->getContentIdentifier(),
-                sal_True );
+                aURL,
+                sal_False ); // not SelfOwned
 #else
         {
             uno::Sequence< uno::Any > aArgs( 1 );
             aArgs[ 0 ] <<= beans::PropertyValue(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
-                uno::makeAny(m_xIdentifier->getContentIdentifier()),
+                uno::makeAny(aURL),
                 beans::PropertyState_DIRECT_VALUE);
 
             aException <<=
@@ -3051,8 +3066,8 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked (self)!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
-                m_xIdentifier->getContentIdentifier(),
-                sal_True );
+                aURL,
+                sal_True ); // SelfOwned
         break;
 
     case DAVException::DAV_NOT_LOCKED:
@@ -3061,7 +3076,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not locked!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
-                m_xIdentifier->getContentIdentifier() );
+                aURL );
         break;
 
     case DAVException::DAV_LOCK_EXPIRED:
@@ -3070,7 +3085,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lock expired!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
-                m_xIdentifier->getContentIdentifier() );
+                aURL );
         break;
 
     default:
@@ -3194,7 +3209,7 @@ const Content::ResourceType & Content::getResourceType(
                 if ( resources.size() == 1 )
                 {
                     m_xCachedProps.reset(
-                        new ContentProperties( resources[ 0 ] ) );
+                        new CachableContentProperties( resources[ 0 ] ) );
                     m_xCachedProps->containsAllNames(
                         aProperties, m_aFailedPropNames );
                 }
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index b18369866f..051e6382e7 100644..100755
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -69,6 +69,7 @@ namespace webdav_ucp
 
 class ContentProvider;
 class ContentProperties;
+class CachableContentProperties;
 
 class Content : public ::ucbhelper::ContentImplHelper,
                 public com::sun::star::ucb::XContentCreator
@@ -82,7 +83,8 @@ class Content : public ::ucbhelper::ContentImplHelper,
     };
 
     std::auto_ptr< DAVResourceAccess > m_xResAccess;
-    std::auto_ptr< ContentProperties > m_xCachedProps; // locally cached props
+    std::auto_ptr< CachableContentProperties >
+                      m_xCachedProps; // locally cached props
     rtl::OUString     m_aEscapedTitle;
     ResourceType      m_eResourceType;
     ContentProvider*  m_pProvider; // No need for a ref, base class holds object
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 412e883a44..412e883a44 100644..100755
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index cfafcdbd84..cfafcdbd84 100644..100755
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
index 8b2d9e1a20..8b2d9e1a20 100644..100755
--- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 000de00c4b..000de00c4b 100644..100755
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index aeff294269..aeff294269 100644..100755
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index c60e55a58c..c60e55a58c 100644..100755
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx
index 84d9d92d2e..84d9d92d2e 100644..100755
--- a/ucb/source/ucp/webdav/webdavresultset.hxx
+++ b/ucb/source/ucp/webdav/webdavresultset.hxx
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index deaec146fc..a3acc8d3b1 100644..100755
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -36,45 +36,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                           uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
@@ -82,21 +43,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // WebDAV Content Provider.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               ::webdav_ucp::ContentProvider::getImplementationName_Static(),
-               ::webdav_ucp::ContentProvider::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
index 3453a78193..3453a78193 100644..100755
--- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
+++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
diff --git a/ucb/test/com/sun/star/comp/ucb/makefile.mk b/ucb/test/com/sun/star/comp/ucb/makefile.mk
index bab29edc8f..bab29edc8f 100644..100755
--- a/ucb/test/com/sun/star/comp/ucb/makefile.mk
+++ b/ucb/test/com/sun/star/comp/ucb/makefile.mk
diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx
index ed8bc4d38f..ed8bc4d38f 100644..100755
--- a/ucb/workben/cachemap/cachemapobject1.cxx
+++ b/ucb/workben/cachemap/cachemapobject1.cxx
diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index e65033928c..e65033928c 100644..100755
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
diff --git a/ucb/workben/cachemap/cachemapobject2.hxx b/ucb/workben/cachemap/cachemapobject2.hxx
index 55eca26a3d..55eca26a3d 100644..100755
--- a/ucb/workben/cachemap/cachemapobject2.hxx
+++ b/ucb/workben/cachemap/cachemapobject2.hxx
diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx
index a2bf08c0fb..a2bf08c0fb 100644..100755
--- a/ucb/workben/cachemap/cachemapobject3.cxx
+++ b/ucb/workben/cachemap/cachemapobject3.cxx
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index 94c33849be..94c33849be 100644..100755
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
index 127306fee0..127306fee0 100644..100755
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
index 6c927e2669..6c927e2669 100644..100755
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx
index 76495abb7d..76495abb7d 100644..100755
--- a/ucb/workben/cachemap/cachemaptest.cxx
+++ b/ucb/workben/cachemap/cachemaptest.cxx
diff --git a/ucb/workben/cachemap/makefile.mk b/ucb/workben/cachemap/makefile.mk
index 53d50fcd21..53d50fcd21 100644..100755
--- a/ucb/workben/cachemap/makefile.mk
+++ b/ucb/workben/cachemap/makefile.mk
diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index a711ef7df9..a711ef7df9 100644..100755
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index adee652451..adee652451 100644..100755
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
diff --git a/ucb/workben/ucb/srcharg.hxx b/ucb/workben/ucb/srcharg.hxx
index 54ecf0e69c..54ecf0e69c 100644..100755
--- a/ucb/workben/ucb/srcharg.hxx
+++ b/ucb/workben/ucb/srcharg.hxx
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 5c75d298bb..5c75d298bb 100644..100755
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
diff --git a/uui/prj/build.lst b/uui/prj/build.lst
index dbe31cb1b5..b4a009cd0b 100644..100755
--- a/uui/prj/build.lst
+++ b/uui/prj/build.lst
@@ -1,4 +1,4 @@
-uu	uui :    l10n vcl svtools NULL
+uu	uui :    L10N:l10n vcl svtools LIBXSLT:libxslt NULL
 uu	uui				usr1	-	all	uu_mkout NULL
 uu	uui\source	    nmake	-	all	uu_source NULL
 uu	uui\util	    nmake	-	all	uu_util uu_source NULL
diff --git a/uui/prj/d.lst b/uui/prj/d.lst
index 30c6f812fd..46b0118319 100644..100755
--- a/uui/prj/d.lst
+++ b/uui/prj/d.lst
@@ -7,3 +7,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib
 
 ..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml
+..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 3c5cba966f..3c5cba966f 100644..100755
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index fc1f74d989..fc1f74d989 100644..100755
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index 7541396d54..7541396d54 100644..100755
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index 3f987477a5..d81a5b3c42 100644..100755
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -77,7 +77,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     maCookieFB.SetPosSizePixel( LogicToPixel( aPoint ), aSize );
     maCookieFB.Show();
 
-    USHORT nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
+    sal_uInt16 nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
         ? 0 : STR_COOKIES_SEND_START - STR_COOKIES_RECV_START;
     INetURLObject aObj( mpCookieRequest->m_rURL );
     SetText( String( ResId( STR_COOKIES_RECV_TITLE + nOffset, *pResMgr ) ) );
@@ -88,7 +88,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     List& rList =mpCookieRequest->m_rCookieList;
     String aPair, aCookie;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
         CntHTTPCookie* pCookie = (CntHTTPCookie*)rList.GetObject(i);
 
@@ -104,7 +104,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
             aMsg += aCookie;
         }
     }
-    maInFutureInteractiveBtn.Check( TRUE );
+    maInFutureInteractiveBtn.Check( sal_True );
     maCookieFT.SetText( aMsg );
 }
 
@@ -114,7 +114,7 @@ short CookiesDialog::Execute()
 {
     maSendBtn.GrabFocus();
     short nRet = ModalDialog::Execute();
-    USHORT nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
+    sal_uInt16 nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
 
     if ( maInFutureSendBtn.IsChecked() )
         nStatus = CNTHTTP_COOKIE_POLICY_ACCEPTED;
@@ -123,9 +123,9 @@ short CookiesDialog::Execute()
         nStatus = CNTHTTP_COOKIE_POLICY_BANNED;
     List& rList = mpCookieRequest->m_rCookieList;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
-        USHORT& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
+        sal_uInt16& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
 
         if ( rStatus == CNTHTTP_COOKIE_POLICY_INTERACTIVE )
             rStatus = nStatus;
diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc
index b51309d2e5..b51309d2e5 100644..100755
--- a/uui/source/cookiedg.hrc
+++ b/uui/source/cookiedg.hrc
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
index 70e797d7a5..70e797d7a5 100644..100755
--- a/uui/source/cookiedg.hxx
+++ b/uui/source/cookiedg.hxx
diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
index 0737ff3f5c..6120acaefb 100644..100755
--- a/uui/source/cookiedg.src
+++ b/uui/source/cookiedg.src
@@ -64,18 +64,21 @@ ModalDialog DLG_COOKIES
     };
     RadioButton RB_INFUTURE_SEND
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND";
         Pos = MAP_APPFONT ( 12 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "~Send" ;
     };
     RadioButton RB_INFUTURE_IGNORE
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE";
         Pos = MAP_APPFONT ( 67 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "I~gnore" ;
     };
     RadioButton RB_INFUTURE_INTERACTIVE
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE";
         Pos = MAP_APPFONT ( 122 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "I~nteractive" ;
@@ -90,12 +93,14 @@ ModalDialog DLG_COOKIES
     };
     PushButton BTN_COOKIES_CANCEL
     {
+        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL";
         Pos = MAP_APPFONT ( 186 , 173 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Ignore" ;
     };
     PushButton BTN_COOKIES_OK
     {
+        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK";
         Pos = MAP_APPFONT ( 239 , 173 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 75b5684286..75b5684286 100644..100755
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index 54bfde22b1..54bfde22b1 100644..100755
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index b566f6344b..d538d6c445 100644..100755
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -33,7 +33,7 @@
 
 String STR_FILECHANGED_TITLE
 {
-    Text = "Document Has Been Changed by Others";
+    Text [ en-US ] = "Document Has Been Changed by Others";
 };
 String STR_FILECHANGED_MSG
 {
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index a90ddedc18..44eb65472d 100644..100755
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -134,15 +134,15 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
 /*-************************************************************************************************************//**
     @short      ask user for his decision
     @descr      We show the dialog and if user finish it with "OK" - we try to find selected item in internal saved
-                name list (which you must set in "ChangeFilters()"!). If we return TRUE as result, you can use out
+                name list (which you must set in "ChangeFilters()"!). If we return sal_True as result, you can use out
                 parameter "pSelectedItem" as pointer into your FilterNameList to get selected item realy ...
-                but if we return FALSE ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
+                but if we return sal_False ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
                 set to any valid value then. We don't change them ...
 
     @seealso    method ChangeFilters()
 
     @param      "pSelectedItem", returns result of selection as pointer into set list of filter names
-                                 (valid for function return TRUE only!)
+                                 (valid for function return sal_True only!)
     @return     true  => pSelectedItem parameter points into name list and represent use decision
                 false => use has cancelled dialog (pSelectedItem isnt valid then!)
 
diff --git a/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc
index 3fe7f792d2..3fe7f792d2 100644..100755
--- a/uui/source/fltdlg.hrc
+++ b/uui/source/fltdlg.hrc
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index 5098512f9b..5098512f9b 100644..100755
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
index 82b230e38f..e2c6162f97 100644..100755
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.src
@@ -53,6 +53,7 @@ ModalDialog DLG_FILTER_SELECT
 
     ListBox LB_FILTERS
     {
+        HelpID = "uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS";
         Border 		= TRUE ;
         Pos 		= MAP_APPFONT (   6 ,  19 ) ;
         Size 		= MAP_APPFONT ( 182 , 175 ) ;
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index 019749895d..019749895d 100644..100755
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 82e413fe01..c556ef4450 100644..100755
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -53,7 +53,6 @@
 #include "logindlg.hxx"
 #include "masterpasscrtdlg.hxx"
 #include "masterpassworddlg.hxx"
-#include "passcrtdlg.hxx"
 #include "passworddlg.hxx"
 
 #include "iahndl.hxx"
@@ -519,7 +518,8 @@ executePasswordDialog(
     task::PasswordRequestMode nMode,
     ::rtl::OUString aDocName,
     bool bMSCryptoMode,
-    bool bIsPasswordToModify )
+    bool bIsPasswordToModify,
+    bool bIsSimplePasswordRequest )
        SAL_THROW((uno::RuntimeException))
 {
     try
@@ -530,21 +530,36 @@ executePasswordDialog(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
-            const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 0 -> allow any length
+            if (bIsSimplePasswordRequest)
+            {
+                std::auto_ptr< PasswordDialog > pDialog(
+                    new PasswordDialog( pParent, nMode, xManager.get(), aDocName, 
+                    bIsPasswordToModify, bIsSimplePasswordRequest ) );
+                pDialog->SetMinLen(0);
+
+                rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
+                rInfo.SetPassword( pDialog->GetPassword() );
+            }
+            else
+            {
+                const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 0 -> allow any length
 
-            VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
-            AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
-            std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
+                VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
+                AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
+                std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
 
-            rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
-            rInfo.SetPassword( pDialog->GetPasswordToOpen() );
-            rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
-            rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
+                rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
+                rInfo.SetPassword( pDialog->GetPasswordToOpen() );
+                rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
+                rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
+            }
         }
-        else
+        else // enter password or reenter password
         {
             std::auto_ptr< PasswordDialog > pDialog(
-                new PasswordDialog( pParent, nMode, xManager.get(), aDocName, bIsPasswordToModify ) );
+                new PasswordDialog( pParent, nMode, xManager.get(), aDocName, 
+                bIsPasswordToModify, bIsSimplePasswordRequest ) );
+            pDialog->SetMinLen(0);
 
             rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
             rInfo.SetPassword( bIsPasswordToModify ? String() : pDialog->GetPassword() );
@@ -567,7 +582,8 @@ handlePasswordRequest_(
         rContinuations,
     ::rtl::OUString aDocumentName,
     bool bMSCryptoMode,
-    bool bIsPasswordToModify )
+    bool bIsPasswordToModify,
+    bool bIsSimplePasswordRequest = false )
     SAL_THROW((uno::RuntimeException))
 {
     uno::Reference< task::XInteractionRetry > xRetry;
@@ -582,7 +598,7 @@ handlePasswordRequest_(
     LoginErrorInfo aInfo;
 
     executePasswordDialog( pParent, aInfo, nMode,
-            aDocumentName, bMSCryptoMode, bIsPasswordToModify );
+            aDocumentName, bMSCryptoMode, bIsPasswordToModify, bIsSimplePasswordRequest );
 
     switch (aInfo.GetResult())
     {
@@ -742,7 +758,8 @@ UUIInteractionHelper::handlePasswordRequest(
                                rRequest->getContinuations(),
                                rtl::OUString(),
                                false /* bool bMSCryptoMode */,
-                               false /* bool bIsPasswordToModify */);
+                               false /* bool bIsPasswordToModify */,
+                               true  /* bool bIsSimplePasswordRequest */ );
         return true;
     }
 
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index bb2a4a5056..bb2a4a5056 100644..100755
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 065dd888e8..f61a5e7835 100644..100755
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
 
 namespace {
 
-USHORT
+sal_uInt16
 executeErrorDialog(
     Window * pParent,
     task::InteractionClassification eClassification,
@@ -113,7 +113,7 @@ executeErrorDialog(
             uno::Reference< uno::XInterface >());
     }
 
-    USHORT aResult = xBox->Execute();
+    sal_uInt16 aResult = xBox->Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -165,7 +165,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
                 CREATEVERSIONRESMGR_NAME(cnt),
                 CREATEVERSIONRESMGR_NAME(svx),
                 CREATEVERSIONRESMGR_NAME(uui) };
-        static USHORT const aId[4]
+        static sal_uInt16 const aId[4]
             = { RID_ERRHDL,
                 RID_CHAOS_START + 12,
                 // cf. chaos/source/inc/cntrids.hrc, where
@@ -277,7 +277,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             }
         }
 
-        USHORT nResult = executeErrorDialog(
+        sal_uInt16 nResult = executeErrorDialog(
             getParentProperty(), eClassification, aContext, aMessage, nButtonMask );
 
         switch (nResult)
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 18481c419f..18481c419f 100644..100755
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index b259ef996d..b259ef996d 100644..100755
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index ee8c0742b0..ee8c0742b0 100644..100755
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index e4bf947ba1..e4bf947ba1 100644..100755
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index c36a50cd33..3bdeb7b1d9 100644..100755
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -90,6 +90,7 @@
 #include "newerverwarn.hxx"
 
 #include "iahndl.hxx"
+#include "nameclashdlg.hxx"
 
 /** === begin UNO using === **/
 using ::com::sun::star::uno::Sequence;
@@ -186,7 +187,7 @@ UUIInteractionHelper::handleRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,handlerequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.bHandled;
@@ -247,7 +248,7 @@ UUIInteractionHelper::getStringFromRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,getstringfromrequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.m_aResult;
@@ -868,6 +869,14 @@ UUIInteractionHelper::handleRequest_impl(
             if ( handleCertificateValidationRequest( rRequest ) )
                 return true;
 
+            ucb::NameClashResolveRequest aNameClashResolveRequest;
+            if (aAnyRequest >>= aNameClashResolveRequest)
+            {
+                handleNameClashResolveRequest(aNameClashResolveRequest,
+                                              rRequest->getContinuations());
+                return true;
+            }
+
             if ( handleMasterPasswordRequest( rRequest ) )
                 return true;
 
@@ -1144,7 +1153,7 @@ UUIInteractionHelper::getInteractionHandler()
 
 namespace {
 
-USHORT
+sal_uInt16
 executeMessageBox(
     Window * pParent,
     rtl::OUString const & rTitle,
@@ -1156,7 +1165,7 @@ executeMessageBox(
 
     MessBox xBox( pParent, nButtonMask, rTitle, rMessage );
 
-    USHORT aResult = xBox.Execute();
+    sal_uInt16 aResult = xBox.Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -1179,9 +1188,84 @@ executeMessageBox(
     return aResult;
 }
 
+NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent,
+                                                                  rtl::OUString const & rTargetFolderURL,
+                                                                  rtl::OUString const & rClashingName,
+                                                                  rtl::OUString & rProposedNewName,
+                                                                  bool bAllowOverwrite )
+{
+    std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
+    if ( !xManager.get() )
+        return ABORT;
+
+    NameClashDialog aDialog( pParent, xManager.get(), rTargetFolderURL,
+                             rClashingName, rProposedNewName, bAllowOverwrite );
+
+    NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog.Execute();
+    rProposedNewName = aDialog.getNewName();
+    return eResult;
+}
+
 } // namespace
 
 void
+UUIInteractionHelper::handleNameClashResolveRequest(
+    ucb::NameClashResolveRequest const & rRequest,
+    uno::Sequence< uno::Reference<
+        task::XInteractionContinuation > > const & rContinuations)
+  SAL_THROW((uno::RuntimeException))
+{
+    OSL_ENSURE(
+        rRequest.TargetFolderURL.getLength() > 0,
+        "NameClashResolveRequest must not contain empty TargetFolderURL" );
+
+    OSL_ENSURE(
+        rRequest.ClashingName.getLength() > 0,
+        "NameClashResolveRequest must not contain empty ClashingName" );
+
+    uno::Reference< task::XInteractionAbort > xAbort;
+    uno::Reference< ucb::XInteractionSupplyName > xSupplyName;
+    uno::Reference< ucb::XInteractionReplaceExistingData > xReplaceExistingData;
+    getContinuations(
+        rContinuations, &xAbort, &xSupplyName, &xReplaceExistingData);
+
+    OSL_ENSURE( xAbort.is(),
+        "NameClashResolveRequest must contain Abort continuation" );
+
+    OSL_ENSURE( xSupplyName.is(),
+        "NameClashResolveRequest must contain SupplyName continuation" );
+
+    NameClashResolveDialogResult eResult = ABORT;
+    rtl::OUString aProposedNewName( rRequest.ProposedNewName );
+
+    eResult = executeSimpleNameClashResolveDialog( getParentProperty(),
+                    rRequest.TargetFolderURL,
+                    rRequest.ClashingName,
+                    aProposedNewName,
+                    xReplaceExistingData.is() );
+
+    switch ( eResult )
+    {
+    case ABORT:
+        xAbort->select();
+        break;
+
+    case RENAME:
+        xSupplyName->setName( aProposedNewName );
+        xSupplyName->select();
+        break;
+
+    case OVERWRITE:
+        OSL_ENSURE(
+            xReplaceExistingData.is(),
+            "Invalid NameClashResolveDialogResult: OVERWRITE - "
+            "No ReplaceExistingData continuation available!" );
+        xReplaceExistingData->select();
+        break;
+    }
+}
+
+void
 UUIInteractionHelper::handleGenericErrorRequest(
     sal_Int32 nErrorCode,
     uno::Sequence< uno::Reference<
@@ -1493,7 +1577,7 @@ ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString)
     const SAL_THROW(())
 {
     OSL_ENSURE(pString, "specification violation");
-    ResId aResId(static_cast< USHORT >(nErrorCode & ERRCODE_RES_MASK),
+    ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK),
                  *m_pResMgr);
     aResId.SetRT(RSC_STRING);
     if (!IsAvailableRes(aResId))
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 3b0571af7a..1610987daa 100644..100755
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -40,10 +40,10 @@
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/task/InteractionClassification.hpp"
 
-#include "tools/solar.h" // USHORT
+#include "tools/solar.h" // sal_uInt16
 #include "tools/errcode.hxx" // ErrCode
 #include "tools/rc.hxx" // Resource
-#include "vcl/wintypes.hxx" // WinBits
+#include "tools/wintypes.hxx" // WinBits
 
 namespace com { namespace sun { namespace star {
     namespace awt {
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 2641c5d329..23e377f4dd 100755
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -48,13 +48,15 @@
 #define DLG_FILTER_SELECT                               (RID_UUI_START + 10)
 // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM
 #define DLG_UUI_MASTERPASSWORD                          (RID_UUI_START + 12)
+#define DLG_SIMPLE_NAME_CLASH                           (RID_UUI_START + 13)
 #define STR_ERROR_PASSWORDS_NOT_IDENTICAL               (RID_UUI_START + 13)
 #define STR_ERROR_MASTERPASSWORD_WRONG                  (RID_UUI_START + 14)
 // RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
+
 #define RID_UUI_ERRHDL                                  (RID_UUI_START + 20)
 #define DLG_UUI_MASTERPASSWORD_CRT                      (RID_UUI_START + 21)
 #define DLG_UUI_PASSWORD                                (RID_UUI_START + 22)
-#define DLG_UUI_PASSWORD_CRT                            (RID_UUI_START + 23)
+#define STR_ERROR_SIMPLE_PASSWORD_WRONG                 (RID_UUI_START + 23)
 #define STR_ERROR_PASSWORD_TO_OPEN_WRONG                (RID_UUI_START + 24)
 #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG              (RID_UUI_START + 25)
 #define DLG_UUI_UNKNOWNAUTH                             (RID_UUI_START + 26)
@@ -89,6 +91,11 @@
 #define STR_WARNING_BROKENSIGNATURE_TITLE               (RID_UUI_START + 55)
 #define STR_ENTER_PASSWORD_TO_OPEN                      (RID_UUI_START + 56)
 #define STR_ENTER_PASSWORD_TO_MODIFY                    (RID_UUI_START + 57)
+#define STR_RENAME_OR_REPLACE                           (RID_UUI_START + 58)
+#define STR_NAME_CLASH_RENAME_ONLY                      (RID_UUI_START + 59)
+#define STR_SAME_NAME_USED                              (RID_UUI_START + 60)
+#define STR_ENTER_SIMPLE_PASSWORD                       (RID_UUI_START + 61)
+#define STR_CONFIRM_SIMPLE_PASSWORD                     (RID_UUI_START + 62)
 
 #define ERRCODE_UUI_IO_ABORT                                    (ERRCODE_AREA_UUI + 0)
 #define ERRCODE_UUI_IO_ACCESSDENIED                             (ERRCODE_AREA_UUI + 1)
@@ -170,25 +177,26 @@
 #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1)
 #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
 
-#define HID_DLG_LOGIN                           (HID_UUI_START + 0)
-#define HID_DLG_COOKIES                         (HID_UUI_START + 1)
-#define HID_DLG_MASTERPASSWORD_UUI              (HID_UUI_START + 2)
-#define HID_DLG_MASTERPASSWORD_CRT              (HID_UUI_START + 3)
-#define	HID_DLG_FILTER_SELECT                   (HID_UUI_START + 4)
-#define HID_DLG_PASSWORD_UUI                    (HID_UUI_START + 5)
-#define HID_DLG_PASSWORD_CRT                    (HID_UUI_START + 6)
-#define HID_DLG_UNKNOWNAUTH_UUI                 (HID_UUI_START + 7)
-#define HID_DLG_SSLWARN_UUI                     (HID_UUI_START + 8)
-#define HID_XMLSECDLG_MACROWARN                 (HID_UUI_START + 9)
-#define HID_DLG_NEWERVERSIONWARNING             (HID_UUI_START +10)
+#define HID_DLG_LOGIN                                          "UUI_HID_DLG_LOGIN"
+#define HID_DLG_COOKIES                                        "UUI_HID_DLG_COOKIES"
+#define HID_DLG_MASTERPASSWORD_UUI                             "UUI_HID_DLG_MASTERPASSWORD_UUI"
+#define HID_DLG_MASTERPASSWORD_CRT                             "UUI_HID_DLG_MASTERPASSWORD_CRT"
+#define HID_DLG_FILTER_SELECT                                  "UUI_HID_DLG_FILTER_SELECT"
+#define HID_DLG_PASSWORD_UUI                                   "UUI_HID_DLG_PASSWORD_UUI"
+#define HID_DLG_PASSWORD_CRT                                   "UUI_HID_DLG_PASSWORD_CRT"
+#define HID_DLG_UNKNOWNAUTH_UUI                                "UUI_HID_DLG_UNKNOWNAUTH_UUI"
+#define HID_DLG_SSLWARN_UUI                                    "UUI_HID_DLG_SSLWARN_UUI"
+#define HID_XMLSECDLG_MACROWARN                                "UUI_HID_XMLSECDLG_MACROWARN"
+#define HID_DLG_NEWERVERSIONWARNING                            "UUI_HID_DLG_NEWERVERSIONWARNING"
 
-#define HID_LOGIN_DLG_PATH                      (HID_UUI_START +11)
-#define HID_LOGIN_DLG_BROWSE                    (HID_UUI_START +12)
-#define HID_LOGIN_DLG_USER_NAME                 (HID_UUI_START +13)
-#define HID_LOGIN_DLG_PASSWORD                  (HID_UUI_START +14)
-#define HID_LOGIN_DLG_ACCOUNT                   (HID_UUI_START +15)
-#define HID_LOGIN_DLG_REMEMBER_PASSWORD         (HID_UUI_START +16)
-#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS    (HID_UUI_START +17)
+#define HID_LOGIN_DLG_PATH                      "UUI_HID_LOGIN_DLG_PATH"
+#define HID_LOGIN_DLG_BROWSE                    "UUI_HID_LOGIN_DLG_BROWSE"
+#define HID_LOGIN_DLG_USER_NAME                 "UUI_HID_LOGIN_DLG_USER_NAME"
+#define HID_LOGIN_DLG_PASSWORD                  "UUI_HID_LOGIN_DLG_PASSWORD"
+#define HID_LOGIN_DLG_ACCOUNT                   "UUI_HID_LOGIN_DLG_ACCOUNT"
+#define HID_LOGIN_DLG_REMEMBER_PASSWORD         "UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD"
+#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS    "UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS"
+#define HID_DLG_SIMPLE_NAME_CLASH               "UUI_HID_DLG_SIMPLE_NAME_CLASH"
 
 // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in
 // sfx2/util/hidother.src
diff --git a/uui/source/ids.src b/uui/source/ids.src
index efff262861..efff262861 100644..100755
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 264367718c..264367718c 100644..100755
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index 508032d043..508032d043 100644..100755
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 109ba5b904..109ba5b904 100644..100755
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index 0f96b1554b..0f96b1554b 100644..100755
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index 4ccc1c78b3..4ccc1c78b3 100644..100755
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index b7ce1f6827..e280333ae1 100644..100755
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -52,24 +52,24 @@ static void lcl_Move( Window &rWin, long nOffset )
 }
 
 
-void LoginDialog::HideControls_Impl( USHORT nFlags )
+void LoginDialog::HideControls_Impl( sal_uInt16 nFlags )
 {
-    bool bPathHide = FALSE;
-    bool bErrorHide = FALSE;
-    bool bAccountHide = FALSE;
-    bool bUseSysCredsHide = FALSE;
+    bool bPathHide = sal_False;
+    bool bErrorHide = sal_False;
+    bool bAccountHide = sal_False;
+    bool bUseSysCredsHide = sal_False;
 
     if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
     {
         aPathFT.Hide();
         aPathED.Hide();
         aPathBtn.Hide();
-        bPathHide = TRUE;
+        bPathHide = sal_True;
     }
     else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
     {
-        aPathED.Enable( FALSE );
-        aPathBtn.Enable( FALSE );
+        aPathED.Enable( sal_False );
+        aPathBtn.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
@@ -79,7 +79,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     }
     else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
     {
-        aNameED.Enable( FALSE );
+        aNameED.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
@@ -96,20 +96,20 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
         aErrorInfo.Hide();
         aErrorFT.Hide();
         aLogin1FL.Hide();
-        bErrorHide = TRUE;
+        bErrorHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
     {
         aAccountFT.Hide();
         aAccountED.Hide();
-        bAccountHide = TRUE;
+        bAccountHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_USESYSCREDS ) == LF_NO_USESYSCREDS )
     {
         aUseSysCredsCB.Hide();
-        bUseSysCredsHide = TRUE;
+        bUseSysCredsHide = sal_True;
     }
 
     if ( bErrorHide )
@@ -193,7 +193,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 };
 
 // -----------------------------------------------------------------------
-void LoginDialog::EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled )
+void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled )
 {
     aErrorInfo.Enable( !bUseSysCredsEnabled );
     aErrorFT.Enable( !bUseSysCredsEnabled );
@@ -249,7 +249,7 @@ IMPL_LINK( LoginDialog, UseSysCredsHdl_Impl, CheckBox *, EMPTYARG )
 LoginDialog::LoginDialog
 (
     Window* pParent,
-    USHORT nFlags,
+    sal_uInt16 nFlags,
     const String& rServer,
     const String* pRealm,
     ResMgr* pResMgr
@@ -314,7 +314,7 @@ LoginDialog::~LoginDialog()
 
 // -----------------------------------------------------------------------
 
-void LoginDialog::SetUseSystemCredentials( BOOL bUse )
+void LoginDialog::SetUseSystemCredentials( sal_Bool bUse )
 { 
     if ( aUseSysCredsCB.IsVisible() )
     {
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 170a0be135..667f6c129c 100644..100755
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -73,15 +73,15 @@ class LoginDialog : public ModalDialog
     CancelButton	aCancelBtn;
     HelpButton		aHelpBtn;
 
-    void			HideControls_Impl( USHORT nFlags );
-    void            EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled );
+    void			HideControls_Impl( sal_uInt16 nFlags );
+    void            EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled );
 
     DECL_LINK( OKHdl_Impl, OKButton * );
     DECL_LINK( PathHdl_Impl, PushButton * );
     DECL_LINK( UseSysCredsHdl_Impl, CheckBox * );
 
 public:
-    LoginDialog( Window* pParent, USHORT nFlags,
+    LoginDialog( Window* pParent, sal_uInt16 nFlags,
                  const String& rServer, const String* pRealm,
                  ResMgr * pResMgr );
     virtual ~LoginDialog();
@@ -94,11 +94,11 @@ public:
     void            SetPassword( const String& rNew )           { aPasswordED.SetText( rNew ); }
     String          GetAccount() const                          { return aAccountED.GetText(); }
     void            SetAccount( const String& rNew )            { aAccountED.SetText( rNew ); }
-    BOOL            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
-    void            SetSavePassword( BOOL bSave )               { aSavePasswdBtn.Check( bSave ); }
+    sal_Bool            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
+    void            SetSavePassword( sal_Bool bSave )               { aSavePasswdBtn.Check( bSave ); }
     void            SetSavePasswordText( const String& rTxt )   { aSavePasswdBtn.SetText( rTxt ); }
-    BOOL            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
-    void            SetUseSystemCredentials( BOOL bUse );
+    sal_Bool            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
+    void            SetUseSystemCredentials( sal_Bool bUse );
     void            SetErrorText( const String& rTxt )          { aErrorInfo.SetText( rTxt ); }
     void            SetLoginRequestText( const String& rTxt )   { aRequestInfo.SetText( rTxt ); }
     void			ClearPassword();
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index d9a0e538c9..822547faf3 100755
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -174,21 +174,21 @@ ModalDialog DLG_UUI_LOGIN
         Pos = MAP_APPFONT( 0 , 216 ) ;
         Size = MAP_APPFONT( 177 , 8 ) ;
     };
-    
-    OKButton BTN_LOGIN_OK
+
+    HelpButton BTN_LOGIN_HELP
     {
         Pos = MAP_APPFONT( 6 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
-        DefButton = TRUE ;
     };
-    
-    CancelButton BTN_LOGIN_CANCEL
+
+    OKButton BTN_LOGIN_OK
     {
         Pos = MAP_APPFONT( 66 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
+        DefButton = TRUE ;
     };
     
-    HelpButton BTN_LOGIN_HELP
+    CancelButton BTN_LOGIN_CANCEL
     {
         Pos = MAP_APPFONT( 121 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index d8cc696ad8..bdab13f97a 100644..100755
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -52,8 +52,8 @@ private:
     String m_aPasswordToModify;
     String m_aPath;
     String m_aErrorText;
-    BYTE   m_nFlags;
-    USHORT m_nRet;
+    sal_uInt8   m_nFlags;
+    sal_uInt16 m_nRet;
     bool   m_bRecommendToOpenReadonly;
 
 public:
@@ -72,17 +72,17 @@ public:
     bool            IsRecommendToOpenReadonly() const   { return m_bRecommendToOpenReadonly; }
     const String&   GetPath() const                     { return m_aPath; }
     const String&   GetErrorText() const                { return m_aErrorText; }
-    BOOL            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
-    BOOL            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
-    BOOL            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
+    sal_Bool            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
+    sal_Bool            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
+    sal_Bool            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
 
-    BOOL            GetCanUseSystemCredentials() const
+    sal_Bool            GetCanUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_CAN_USE_SYSCREDS ); }
-    BOOL            GetIsUseSystemCredentials() const
+    sal_Bool            GetIsUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_IS_USE_SYSCREDS ) ==
                              LOGINERROR_FLAG_IS_USE_SYSCREDS; }
-    BYTE            GetFlags() const        { return m_nFlags; }
-    USHORT          GetResult() const       { return m_nRet; }
+    sal_uInt8            GetFlags() const        { return m_nFlags; }
+    sal_uInt16          GetResult() const       { return m_nRet; }
 
     void            SetTitle( const String& aTitle )
                     { m_aTitle = aTitle; }
@@ -102,23 +102,23 @@ public:
                     { m_aPath = aPath; }
     void            SetErrorText( const String& aErrorText )
                     { m_aErrorText = aErrorText; }
-    void            SetFlags( BYTE nFlags )
+    void            SetFlags( sal_uInt8 nFlags )
                     { m_nFlags = nFlags; }
 
-    inline void     SetCanRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPersistent( BOOL bSet );
+    inline void     SetCanRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPersistent( sal_Bool bSet );
 
-    inline void     SetCanUseSystemCredentials( BOOL bSet );
-    inline void     SetIsUseSystemCredentials( BOOL bSet );
-    inline void     SetModifyAccount( BOOL bSet );
-    inline void     SetModifyUserName( BOOL bSet );
+    inline void     SetCanUseSystemCredentials( sal_Bool bSet );
+    inline void     SetIsUseSystemCredentials( sal_Bool bSet );
+    inline void     SetModifyAccount( sal_Bool bSet );
+    inline void     SetModifyUserName( sal_Bool bSet );
 
-    void            SetResult( USHORT nRet )
+    void            SetResult( sal_uInt16 nRet )
                     { m_nRet = nRet; }
 };
 
-inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetCanRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
@@ -126,7 +126,7 @@ inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
@@ -134,7 +134,7 @@ inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPersistent( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_REMEMBER_PERSISTENT;
@@ -142,7 +142,7 @@ inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_REMEMBER_PERSISTENT;
 }
 
-inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetCanUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_USE_SYSCREDS;
@@ -150,7 +150,7 @@ inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetIsUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_USE_SYSCREDS;
@@ -158,7 +158,7 @@ inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
+inline void LoginErrorInfo::SetModifyAccount( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_ACCOUNT;
@@ -166,7 +166,7 @@ inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_MODIFY_ACCOUNT;
 }
 
-inline void LoginErrorInfo::SetModifyUserName( BOOL bSet )
+inline void LoginErrorInfo::SetModifyUserName( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_USER_NAME;
diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk
index 5c20e59304..e09f5c01e9 100644..100755
--- a/uui/source/makefile.mk
+++ b/uui/source/makefile.mk
@@ -48,7 +48,6 @@ SLOFILES = \
     $(SLO)$/masterpasscrtdlg.obj \
     $(SLO)$/openlocked.obj \
     $(SLO)$/passworddlg.obj \
-    $(SLO)$/passcrtdlg.obj \
     $(SLO)$/fltdlg.obj \
     $(SLO)$/interactionhandler.obj \
     $(SLO)$/requeststringresolver.obj \
@@ -60,6 +59,7 @@ SLOFILES = \
     $(SLO)$/lockfailed.obj \
     $(SLO)$/trylater.obj \
     $(SLO)$/newerverwarn.obj \
+    $(SLO)$/nameclashdlg.obj \
     $(SLO)$/passwordcontainer.obj
 
 SRS1NAME=$(TARGET)
@@ -71,7 +71,6 @@ SRC1FILES = \
     masterpasscrtdlg.src \
     openlocked.src \
     passworddlg.src \
-    passcrtdlg.src \
     passworderrs.src \
     fltdlg.src \
     unknownauthdlg.src\
@@ -81,6 +80,7 @@ SRC1FILES = \
     alreadyopen.src\
     lockfailed.src\
     trylater.src\
+    nameclashdlg.src\
     newerverwarn.src
 
 .INCLUDE: target.mk
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index cda0ca0f58..dc69ed12de 100644..100755
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -91,7 +91,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
     aHelpBtn				( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ),
 
     pResourceMgr            ( pResMgr ),
-    nMinLen                 ( 5 )
+    nMinLen                 ( 1 )
 {
     FreeResource();
 
diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc
index 634a047478..634a047478 100644..100755
--- a/uui/source/masterpasscrtdlg.hrc
+++ b/uui/source/masterpasscrtdlg.hrc
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index e9e0a98b0c..e9e0a98b0c 100644..100755
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index 65e24205a5..211f9959ec 100644..100755
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -63,6 +63,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
     };
     Edit ED_MASTERPASSWORD_CRT
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT";
         Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
@@ -76,6 +77,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
     };
     Edit ED_MASTERPASSWORD_REPEAT
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT";
         Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
@@ -86,7 +88,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
         Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
         WordBreak = TRUE ;
-        Text [ en-US ] = "Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long.";
+        Text [ en-US ] = "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case-sensitive.";
     };
     FixedLine FL_CAUTIONTEXT
     {
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 163fbe6e23..163fbe6e23 100644..100755
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc
index ae6b95b1df..ae6b95b1df 100644..100755
--- a/uui/source/masterpassworddlg.hrc
+++ b/uui/source/masterpassworddlg.hrc
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 8c4037502b..8c4037502b 100644..100755
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 29d799c5cc..c08250e2a7 100644..100755
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -50,6 +50,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD
     };
     Edit ED_MASTERPASSWORD
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 3 , 17 ) ;
         Size = MAP_APPFONT ( 169 , 13 ) ;
diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx
index 933a21c595..933a21c595 100644..100755
--- a/uui/source/mphndl.hxx
+++ b/uui/source/mphndl.hxx
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
new file mode 100755
index 0000000000..3393dff289
--- /dev/null
+++ b/uui/source/nameclashdlg.cxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * 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 "vcl/msgbox.hxx"
+#include "osl/file.hxx"
+
+#include "ids.hrc"
+#include "nameclashdlg.hrc"
+#include "nameclashdlg.hxx"
+
+// NameClashDialog ---------------------------------------------------------
+
+IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
+{
+    long nRet = (long) ABORT;
+    if ( &maBtnRename == pBtn )
+    {
+        nRet = (long) RENAME;
+        rtl::OUString aNewName = maEDNewName.GetText();
+        if ( ( aNewName == maNewName ) || !aNewName.getLength() )
+        {
+            ErrorBox aError( NULL, WB_OK, maSameName );
+            aError.Execute();
+            return 1;
+        }
+        maNewName = aNewName;
+    }
+    else if ( &maBtnOverwrite == pBtn )
+        nRet = (long) OVERWRITE;
+
+    EndDialog( nRet );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------
+NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
+                                  rtl::OUString const & rTargetFolderURL,
+                                  rtl::OUString const & rClashingName,
+                                  rtl::OUString const & rProposedNewName,
+                                  bool bAllowOverwrite )
+    : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ),
+    maFTMessage            ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ),
+    maEDNewName            ( this, ResId( EDIT_NEW_NAME, *pResMgr ) ),
+    maBtnOverwrite         ( this, ResId( BTN_OVERWRITE, *pResMgr ) ),
+    maBtnRename            ( this, ResId( BTN_RENAME, *pResMgr ) ),
+    maBtnCancel            ( this, ResId( BTN_CANCEL, *pResMgr ) ),
+    maBtnHelp              ( this, ResId( BTN_HELP, *pResMgr ) ),
+    maNewName              ( rClashingName )
+{
+    FreeResource();
+
+    Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) );
+    maBtnOverwrite.SetClickHdl( aLink );
+    maBtnRename.SetClickHdl( aLink );
+    maBtnCancel.SetClickHdl( aLink );
+
+    String aInfo;
+    if ( bAllowOverwrite )
+    {
+        aInfo = String( ResId( STR_RENAME_OR_REPLACE, *pResMgr ) );
+    }
+    else
+    {
+        aInfo = String( ResId( STR_NAME_CLASH_RENAME_ONLY, *pResMgr ) );
+        maBtnOverwrite.Hide();
+    }
+
+    rtl::OUString aPath;
+    if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) )
+        aPath = rTargetFolderURL;
+
+    maSameName = String ( ResId( STR_SAME_NAME_USED, *pResMgr ) );
+
+    aInfo.SearchAndReplaceAscii( "%NAME", rClashingName );
+    aInfo.SearchAndReplaceAscii( "%FOLDER", aPath );
+    maFTMessage.SetText( aInfo );
+    if ( rProposedNewName.getLength() )
+        maEDNewName.SetText( rProposedNewName );
+    else
+        maEDNewName.SetText( rClashingName );
+}
+
diff --git a/svx/inc/srchitem.hxx b/uui/source/nameclashdlg.hrc
index 5555922a55..81d112f25d 100644..100755
--- a/svx/inc/srchitem.hxx
+++ b/uui/source/nameclashdlg.hrc
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,12 +24,18 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_SRCHITEM_HXX
-#define _SVX_SRCHITEM_HXX
 
-#include <svl/srchitem.hxx>
+#ifndef UUI_NAMECLASHDLG_HRC
+#define UUI_NAMECLASHDLG_HRC
 
-#endif
+//============================================================================
 
+#define FT_FILE_EXISTS_WARNING  20
+#define EDIT_NEW_NAME			21
+#define BTN_OVERWRITE           22
+#define BTN_RENAME              23
+#define BTN_CANCEL              24
+#define BTN_HELP                25
+
+#endif // UUI_NAMECLASHDLG_HRC
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passcrtdlg.hxx b/uui/source/nameclashdlg.hxx
index 4d95af006c..da3bf54d90 100644..100755
--- a/uui/source/passcrtdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -26,41 +26,40 @@
  *
  ************************************************************************/
 
-#ifndef UUI_PASSCRTDLG_HXX
-#define UUI_PASSCRTDLG_HXX
+#ifndef UUI_NAMECLASHDLG_HXX
+#define UUI_NAMECLASHDLG_HXX
 
-#include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <svtools/stdctrl.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
+#include "vcl/button.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/edit.hxx"
 
 //============================================================================
-class PasswordCreateDialog : public ModalDialog
-{
-    FixedText		aFTPasswordCrt;
-    Edit			aEDPasswordCrt;
-    FixedText		aFTPasswordRepeat;
-    Edit			aEDPasswordRepeat;
-    FixedText       aFTWarning;
-    FixedLine       aFixedLine1;
-    OKButton		aOKBtn;
-    CancelButton	aCancelBtn;
-    HelpButton		aHelpBtn;
 
-    ResMgr*											pResourceMgr;
-    sal_uInt16										nMinLen;
+enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
+
+class NameClashDialog : public ModalDialog
+{
+    FixedText     maFTMessage;
+    Edit          maEDNewName;
+    PushButton    maBtnOverwrite;
+    PushButton    maBtnRename;
+    CancelButton  maBtnCancel;
+    HelpButton    maBtnHelp;
+    rtl::OUString maSameName;
+    rtl::OUString maNewName;
 
-    DECL_LINK( OKHdl_Impl, OKButton * );
-    DECL_LINK( EditHdl_Impl, Edit * );
+    DECL_LINK( ButtonHdl_Impl, PushButton * );
 
 public:
-    PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false );
-
-    String			GetPassword() const { return aEDPasswordCrt.GetText(); }
+    NameClashDialog( Window* pParent, ResMgr* pResMgr,
+                     rtl::OUString const & rTargetFolderURL,
+                     rtl::OUString const & rClashingName,
+                     rtl::OUString const & rProposedNewName,
+                     bool bAllowOverwrite );
+    rtl::OUString getNewName() const { return maNewName; }
 };
 
-#endif // UUI_PASSCRTDLG_HXX
+#endif // UUI_COOKIEDG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
new file mode 100755
index 0000000000..4a3a457a0d
--- /dev/null
+++ b/uui/source/nameclashdlg.src
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * 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
+
+#ifndef UUI_IDS_HRC
+#include "ids.hrc"
+#endif
+
+#ifndef UUI_NAMECLASHDLG_HRC
+#include "nameclashdlg.hrc"
+#endif
+
+#define DLG_WIDTH       250
+#define DLG_HEIGTH       75
+#define BORDER_OFFSET     6
+#define EDIT_HEIGTH      12
+#define BTN_WIDTH        50
+#define BTN_HEIGTH       14
+
+ModalDialog DLG_SIMPLE_NAME_CLASH
+{
+    HelpId 		= HID_DLG_SIMPLE_NAME_CLASH ;
+    OutputSize 	= TRUE ;
+    SVLook 		= TRUE ;
+    Size 		= MAP_APPFONT ( DLG_WIDTH , DLG_HEIGTH ) ;
+    Moveable 	= TRUE ;
+    Text [ en-US ] = "File Exists" ;
+
+    FixedText FT_FILE_EXISTS_WARNING
+    {
+        Pos       = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
+        Size      = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 4*BORDER_OFFSET ) ;
+        WordBreak = TRUE ;
+    };
+
+    Edit EDIT_NEW_NAME
+    {
+        HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME";
+        Border 		= TRUE ;
+        Pos 		= MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ;
+        Size 		= MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGTH ) ;
+    };
+
+    PushButton BTN_OVERWRITE
+    {
+        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE";
+        Pos 		= MAP_APPFONT (  DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size 		= MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop 	= TRUE ;
+        Text [ en-US ] = "Replace" ;
+    };
+
+    PushButton BTN_RENAME
+    {
+        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME";
+        Pos 		= MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size 		= MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop 	= TRUE ;
+        Text [ en-US ] = "Rename" ;
+        DefButton 	= TRUE ;
+    };
+
+    CancelButton BTN_CANCEL
+    {
+        Pos 	= MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size 	= MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop = TRUE ;
+    };
+
+    HelpButton BTN_HELP
+    {
+        Pos 	= MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size 	= MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop = TRUE ;
+    };
+};
+
+String STR_RENAME_OR_REPLACE
+{
+    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.";
+};
+
+String STR_NAME_CLASH_RENAME_ONLY
+{
+    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.";
+};
+
+String STR_SAME_NAME_USED
+{
+    Text = "Please provide a different file name!";
+};
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index ed860428cf..ed860428cf 100644..100755
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
diff --git a/uui/source/newerverwarn.hrc b/uui/source/newerverwarn.hrc
index 96551021cb..96551021cb 100644..100755
--- a/uui/source/newerverwarn.hrc
+++ b/uui/source/newerverwarn.hrc
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index ed8ebac754..ed8ebac754 100644..100755
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src
index c9889e6648..076aaae697 100644..100755
--- a/uui/source/newerverwarn.src
+++ b/uui/source/newerverwarn.src
@@ -66,6 +66,7 @@ ModalDialog RID_DLG_NEWER_VERSION_WARNING
     };
     PushButton PB_UPDATE
     {
+        HelpID = "uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE";
         Pos = MAP_APPFONT ( COL_3 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 4734a486d3..4734a486d3 100644..100755
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 259a355553..259a355553 100644..100755
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 0e862064bc..0e862064bc 100644..100755
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
deleted file mode 100644
index 6b9b605b41..0000000000
--- a/uui/source/passcrtdlg.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 <sal/macros.h>
-#include <svtools/filedlg.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <ids.hrc>
-#include <passcrtdlg.hrc>
-#include <passcrtdlg.hxx>
-
-// PasswordCreateDialog---------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG )
-{
-    aOKBtn.Enable( aEDPasswordCrt.GetText().Len() >= nMinLen );
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
-{
-    // compare both passwords and show message box if there are not equal!!
-    if( aEDPasswordCrt.GetText() == aEDPasswordRepeat.GetText() )
-        EndDialog( RET_OK );
-    else
-    {
-        String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
-        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
-        aErrorBox.Execute();
-        aEDPasswordCrt.SetText( String() );
-        aEDPasswordRepeat.SetText( String() );
-        aEDPasswordCrt.GrabFocus();
-    }
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, bool bMSCryptoMode)
-    :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) )
-    ,aFTPasswordCrt           ( this, ResId( FT_PASSWORD_CRT, *pResMgr )             )
-    ,aEDPasswordCrt       ( this, ResId( ED_PASSWORD_CRT, *pResMgr )        )
-    ,aFTPasswordRepeat           ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr )             )
-    ,aEDPasswordRepeat       ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr )        )
-    ,aFTWarning           ( this, ResId( bMSCryptoMode ? FT_MSPASSWORD_WARNING : FT_PASSWORD_WARNING, *pResMgr )             )
-    ,aFixedLine1       ( this, ResId( FL_FIXED_LINE_1, *pResMgr )        )
-    ,aOKBtn   ( this, ResId( BTN_PASSCRT_OK, *pResMgr )    )
-    ,aCancelBtn   ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr )    )
-    ,aHelpBtn   ( this, ResId( BTN_PASSCRT_HELP, *pResMgr )    )
-    ,pResourceMgr			( pResMgr )
-    ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode
-{
-    FreeResource();
-
-    aOKBtn.SetClickHdl( LINK( this, PasswordCreateDialog, OKHdl_Impl ) );
-    aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) );
-
-    aOKBtn.Enable( sal_False );
-
-    if ( bMSCryptoMode )
-    {
-        aEDPasswordCrt.SetMaxTextLen( 15 );
-        aEDPasswordRepeat.SetMaxTextLen( 15 );
-    }
-
-    long nLabelWidth = aFTWarning.GetSizePixel().Width();
-    long nLabelHeight = aFTWarning.GetSizePixel().Height();
-    long nTextWidth = aFTWarning.GetCtrlTextWidth( aFTWarning.GetText() );
-    long nTextHeight = aFTWarning.GetTextHeight();
-
-    Rectangle aLabelRect( aFTWarning.GetPosPixel(), aFTWarning.GetSizePixel() );
-    Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() );
-
-    long nNewLabelHeight = 0;
-    for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight; 
-        nNewLabelHeight < aRect.GetHeight();
-        nNewLabelHeight += nTextHeight ) {} ;
-
-    long nDelta = nNewLabelHeight - nLabelHeight;
-
-    Size aNewDlgSize = GetSizePixel();
-    aNewDlgSize.Height() += nDelta;
-    SetSizePixel( aNewDlgSize );
-
-    Size aNewWarningSize = aFTWarning.GetSizePixel();
-    aNewWarningSize.Height() = nNewLabelHeight;
-    aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize );
-
-    Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
-    const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls );
-    for ( int i = 0; i < nCCount; ++i )
-    {
-        Point aNewPos =(*pControls[i]).GetPosPixel();
-        aNewPos.Y() += nDelta;
-        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
deleted file mode 100644
index b4ba3f2125..0000000000
--- a/uui/source/passcrtdlg.src
+++ /dev/null
@@ -1,108 +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
-
-#ifndef UUI_IDS_HRC
-#include <ids.hrc>
-#endif
-#ifndef UUI_PASSCRTDLG_HRC
-#include "passcrtdlg.hrc"
-#endif
-
-ModalDialog DLG_UUI_PASSWORD_CRT
-{
-    HelpId = HID_DLG_PASSWORD_CRT ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT( 145, 129 );
-    FixedText FT_PASSWORD_CRT
-    {
-        Pos = MAP_APPFONT( 3, 4 );
-        Size = MAP_APPFONT( 139, 9 );
-        Text [ en-US ] = "Enter password";
-    };
-    Edit ED_PASSWORD_CRT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT( 3, 17 );
-        Size = MAP_APPFONT( 139, 13 );
-        PassWord = TRUE ;
-    };
-    Edit ED_PASSWORD_REPEAT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT( 3, 47 );
-        Size = MAP_APPFONT( 139, 13 );
-        PassWord = TRUE ;
-    };
-    OKButton BTN_PASSCRT_OK
-    {
-        Pos = MAP_APPFONT( 27, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_PASSCRT_CANCEL
-    {
-        Pos = MAP_APPFONT( 66, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-    };
-    HelpButton BTN_PASSCRT_HELP
-    {
-        Pos = MAP_APPFONT( 105, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-    };	
-    FixedText FT_PASSWORD_REPEAT
-    {
-        Pos = MAP_APPFONT( 3, 34 );
-        Size = MAP_APPFONT( 139, 9 );
-        Text [ en-US ] = "Reenter password";
-    };
-    FixedText FT_PASSWORD_WARNING
-    {
-        Pos = MAP_APPFONT( 4, 64 );
-        Size = MAP_APPFONT( 137, 40 );
-        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive.";
-        WordBreak = TRUE;
-    };
-    FixedText FT_MSPASSWORD_WARNING
-    {
-        Pos = MAP_APPFONT( 4, 64 );
-        Size = MAP_APPFONT( 137, 40 );
-        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at most fifteen characters long.";
-        WordBreak = TRUE;
-    };
-    FixedLine FL_FIXED_LINE_1
-    {
-        Pos = MAP_APPFONT( 0, 104 );
-        Size = MAP_APPFONT( 145, 6 );
-    };	
-    Text [ en-US ] = "Enter Password";
-};
-
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 359aa977d1..359aa977d1 100644..100755
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index cd29fb308a..cd29fb308a 100644..100755
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 4875a032d5..5f286df3e3 100644..100755
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -26,64 +26,119 @@
  *
  ************************************************************************/
 
-#include <sal/macros.h>
+#include "passworddlg.hxx"
+#include "passworddlg.hrc"
+#include "ids.hrc"
+
 #include <svtools/filedlg.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <ids.hrc>
-#include <passworddlg.hrc>
-#include <passworddlg.hxx>
 
-// PasswordDialog---------------------------------------------------------
+using namespace ::com::sun::star;
+
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+static void lcl_Move( Window &rWin, long nOffset )
 {
-    EndDialog( RET_OK );
-    return 1;
+    Point aTmp( rWin.GetPosPixel() );
+    aTmp.Y() += nOffset;
+    rWin.SetPosPixel( aTmp );
 }
 
 // -----------------------------------------------------------------------
 
 PasswordDialog::PasswordDialog(
     Window* _pParent,
-    ::com::sun::star::task::PasswordRequestMode nDlgMode,
+    task::PasswordRequestMode nDlgMode,
     ResMgr * pResMgr,
     rtl::OUString& aDocURL,
-    bool bOpenToModify )
+    bool bOpenToModify,
+    bool bIsSimplePasswordRequest )
     
     :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) )
     ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr ))
     ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr ))
+    ,aFTConfirmPassword( this, ResId( FT_CONFIRM_PASSWORD, *pResMgr ))
+    ,aEDConfirmPassword( this, ResId( ED_CONFIRM_PASSWORD, *pResMgr ))
     ,aOKBtn ( this, ResId( BTN_PASSWORD_OK, *pResMgr ))
     ,aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL, *pResMgr ))
     ,aHelpBtn ( this, ResId( BTN_PASSWORD_HELP, *pResMgr ))
     ,aFixedLine1( this, ResId( FL_FIXED_LINE_1, *pResMgr ))
+    ,nMinLen(1)
+    ,aPasswdMismatch( ResId( STR_PASSWORD_MISMATCH, *pResMgr ))
     ,nDialogMode( nDlgMode )
     ,pResourceMgr ( pResMgr )
 {
-    if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
+    if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        USHORT nErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
         String aErrorMsg( ResId( nErrStrId, *pResourceMgr ));
-        ErrorBox aErrorBox( _pParent, WB_OK, aErrorMsg );
+        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
         aErrorBox.Execute();
     }
 
-    USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
-    aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) );
+    // default settings for enter password or reenter passwd...
+    String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) );
+    aFTConfirmPassword.Hide();
+    aEDConfirmPassword.Hide();
+    aFTConfirmPassword.Enable( sal_False );
+    aEDConfirmPassword.Enable( sal_False );
 
-    FreeResource();
+    // settings for create password
+    if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE)
+    {
+        aTitle = String( ResId( STR_TITLE_CREATE_PASSWORD, *pResourceMgr ) );
+
+        aFTConfirmPassword.SetText( String( ResId( STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr ) ) );
+
+        aFTConfirmPassword.Show();
+        aEDConfirmPassword.Show();
+        aFTConfirmPassword.Enable( sal_True );
+        aEDConfirmPassword.Enable( sal_True );
+    }
+    else
+    {
+        // shrink dialog by size of hidden controls and move rest up accordingly
+
+        long nDelta = aFixedLine1.GetPosPixel().Y() - aFTConfirmPassword.GetPosPixel().Y();
+
+        lcl_Move( aFixedLine1, -nDelta );
+        lcl_Move( aOKBtn, -nDelta );
+        lcl_Move( aCancelBtn, -nDelta );
+        lcl_Move( aHelpBtn, -nDelta );
+
+        Size aNewDlgSize = GetSizePixel();
+        aNewDlgSize.Height() -= nDelta;
+        SetSizePixel( aNewDlgSize );
+    }
+    
+    SetText( aTitle );
 
+    sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
+    aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) );
     aFTPassword.SetText( aFTPassword.GetText() + aDocURL );
+    if (bIsSimplePasswordRequest)
+    {
+        DBG_ASSERT( aDocURL.getLength() == 0, "A simple password request should not have a document URL! Use document password request instead." );
+        aFTPassword.SetText( String( ResId( STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr ) ) );
+    }
+
+    FreeResource();
 
     aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) );
 
-    long nLabelWidth = aFTPassword.GetSizePixel().Width();
-    long nLabelHeight = aFTPassword.GetSizePixel().Height();
-    long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() );
-    long nTextHeight = aFTPassword.GetTextHeight();
+
+    //
+    // move controls down by extra height needed for aFTPassword 
+    // (usually only needed if a URL was provided)
+    // 
+
+    long nLabelWidth    = aFTPassword.GetSizePixel().Width();
+    long nLabelHeight   = aFTPassword.GetSizePixel().Height();
+    long nTextWidth     = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() );
+    long nTextHeight    = aFTPassword.GetTextHeight();
 
     Rectangle aLabelRect( aFTPassword.GetPosPixel(), aFTPassword.GetSizePixel() );
     Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() );
@@ -103,15 +158,33 @@ PasswordDialog::PasswordDialog(
     aNewLabelSize.Height() = nNewLabelHeight;
     aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize );
 
-    Window* pControls[] = { &aEDPassword, &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
-    const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls );
-    for ( int i = 0; i < nCCount; ++i )
+    lcl_Move( aEDPassword, nDelta );
+    lcl_Move( aFTConfirmPassword, nDelta );
+    lcl_Move( aEDConfirmPassword, nDelta );
+    lcl_Move( aFixedLine1, nDelta );
+    lcl_Move( aOKBtn, nDelta );
+    lcl_Move( aCancelBtn, nDelta );
+    lcl_Move( aHelpBtn, nDelta );
+}
+
+
+IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+{
+    bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen;
+    bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText();
+    bool bValid = (!aEDConfirmPassword.IsVisible() && bEDPasswdValid) ||
+            (aEDConfirmPassword.IsVisible() && bEDPasswdValid && !bPasswdMismatch);
+
+    if (aEDConfirmPassword.IsVisible() && bPasswdMismatch)
     {
-        Point aNewPos =(*pControls[i]).GetPosPixel();
-        aNewPos.Y() += nDelta;
-        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
+        ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch );
+        aErrorBox.Execute();
     }
+    else if (bValid)
+        EndDialog( RET_OK );
 
+    return 1;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index edda2504c1..24ec8aca9d 100644..100755
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.hrc
@@ -29,12 +29,18 @@
 #define PASSWORDDLG_HRC
 
 // local identifiers
-#define BTN_PASSWORD_OK     1
-#define ED_PASSWORD         2
-#define FT_PASSWORD 3
-#define FL_FIXED_LINE_1         4
-#define BTN_PASSWORD_HELP     5
-#define BTN_PASSWORD_CANCEL     6
+#define BTN_PASSWORD_OK         1
+#define ED_PASSWORD             2
+#define FT_PASSWORD             3
+#define FT_CONFIRM_PASSWORD     4
+#define ED_CONFIRM_PASSWORD     5
+#define FL_FIXED_LINE_1         6
+#define BTN_PASSWORD_HELP       7
+#define BTN_PASSWORD_CANCEL     8
+
+#define STR_TITLE_CREATE_PASSWORD   9
+#define STR_TITLE_ENTER_PASSWORD   10 
+#define STR_PASSWORD_MISMATCH      11 
 
 
 #endif // PASSWORDDLG_HRC
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index a0ff98c8d9..1538d636f8 100644..100755
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -38,21 +38,28 @@
 #include <vcl/fixed.hxx>
 
 //============================================================================
+
 class PasswordDialog : public ModalDialog
 {
     FixedText		aFTPassword;
     Edit			aEDPassword;
+    FixedText       aFTConfirmPassword;
+    Edit            aEDConfirmPassword;
     OKButton		aOKBtn;
     CancelButton	aCancelBtn;
     HelpButton		aHelpBtn;
     FixedLine       aFixedLine1;
+    sal_uInt16          nMinLen;
+    String          aPasswdMismatch;
 
 
     DECL_LINK( OKHdl_Impl, OKButton * );
 
 public:
-    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, bool bOpenToModify = false );
+    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, 
+            bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
 
+    void            SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
     String			GetPassword() const { return aEDPassword.GetText(); }
 
 private:
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 7a96c4aa5a..96c3699370 100755
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -41,48 +41,63 @@ ModalDialog DLG_UUI_PASSWORD
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT( 145, 91 );
-    Text [ en-US ] = "Enter password";
+    Size = MAP_APPFONT( 165, 95 );
 
     FixedText FT_PASSWORD
     {
-        Pos = MAP_APPFONT( 3, 4 );
-        Size = MAP_APPFONT( 139, 28 );
+        Pos = MAP_APPFONT( 3, 6 );
+        Size = MAP_APPFONT( 159, 8 );
         WordBreak = TRUE;
     };
 
     Edit ED_PASSWORD
     {
-        Pos = MAP_APPFONT( 3, 51 );
-        Size = MAP_APPFONT( 139, 13 );
+        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD";
+        Pos = MAP_APPFONT( 3, 17 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
 
-    FixedLine FL_FIXED_LINE_1
+    FixedText FT_CONFIRM_PASSWORD
     {
-        Pos = MAP_APPFONT( 0, 66 );
-        Size = MAP_APPFONT( 145, 6 );
+        Pos = MAP_APPFONT( 3, 34 );
+        Size = MAP_APPFONT( 159, 8 );
+        WordBreak = TRUE;
     };
 
-    OKButton BTN_PASSWORD_OK
+    Edit ED_CONFIRM_PASSWORD
     {
-        Pos = MAP_APPFONT( 27, 72 );
-        Size = MAP_APPFONT( 37, 15 );
-        DefButton = TRUE ;
-        DefButton = TRUE;
+        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_CONFIRM_PASSWORD";
+        Pos = MAP_APPFONT( 3, 45 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
     };
 
-    CancelButton BTN_PASSWORD_CANCEL
+    FixedLine FL_FIXED_LINE_1
     {
-        Pos = MAP_APPFONT( 66, 72 );
-        Size = MAP_APPFONT( 37, 15 );
+        Pos = MAP_APPFONT( 0, 63 );
+        Size = MAP_APPFONT( 165, 8 );
     };
 
     HelpButton BTN_PASSWORD_HELP
     {
-        Pos = MAP_APPFONT( 105, 72 );
-        Size = MAP_APPFONT( 37, 15 );
+        Pos = MAP_APPFONT( 3, 76 );
+        Size = MAP_APPFONT( 50, 14 );
+    };
+
+    OKButton BTN_PASSWORD_OK
+    {
+        Pos = MAP_APPFONT( 59, 76 );
+        Size = MAP_APPFONT( 50, 14 );
+        DefButton = TRUE ;
+    };
+
+    CancelButton BTN_PASSWORD_CANCEL
+    {
+        Pos = MAP_APPFONT( 112, 76 );
+        Size = MAP_APPFONT( 50, 14 );
     };
 
     String STR_ENTER_PASSWORD_TO_OPEN
@@ -94,5 +109,30 @@ ModalDialog DLG_UUI_PASSWORD
     {
         Text [ en-US ] = "Enter password to modify file: \n";
     };
+
+    String STR_ENTER_SIMPLE_PASSWORD
+    {
+        Text [ en-US ] = "Enter password: ";
+    };
+
+    String STR_CONFIRM_SIMPLE_PASSWORD
+    {
+        Text [ en-US ] = "Confirm password: ";
+    };
+
+    String STR_TITLE_CREATE_PASSWORD
+    {
+        Text [ en-US ] = "Set Password";
+    };
+
+    String STR_TITLE_ENTER_PASSWORD
+    {
+        Text [ en-US ] = "Enter Password";
+    };
+
+    String STR_PASSWORD_MISMATCH
+    {
+        Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
+    };
 };
 
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 6476e28319..249aa1f559 100755
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
@@ -43,7 +43,12 @@ String STR_ERROR_PASSWORD_TO_MODIFY_WRONG
 
 String STR_ERROR_MASTERPASSWORD_WRONG
 {
-    Text [ en-US ] = "The wrong Master Password has been entered. %PRODUCTNAME could not access web login information protected by Master Password.\n\nNote: Passwords are case-sensitive and at least five characters long.";
+    Text [ en-US ] = "The master password is incorrect.";
+};
+
+String STR_ERROR_SIMPLE_PASSWORD_WRONG
+{
+    Text [ en-US ] = "The password is incorrect.";
 };
 
 String STR_ERROR_PASSWORDS_NOT_IDENTICAL
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 3fd7bebf2c..3fd7bebf2c 100644..100755
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 6346c7851e..6346c7851e 100644..100755
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index f17bbf4130..f17bbf4130 100644..100755
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc
index 38ea65952e..38ea65952e 100644..100755
--- a/uui/source/secmacrowarnings.hrc
+++ b/uui/source/secmacrowarnings.hrc
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 04bd6f6565..04bd6f6565 100644..100755
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src
index 9ae4186ec8..3e71a2cecd 100644..100755
--- a/uui/source/secmacrowarnings.src
+++ b/uui/source/secmacrowarnings.src
@@ -74,6 +74,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN
     };
     PushButton PB_VIEWSIGNS
     {
+        HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS";
         Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View Signatures...";
@@ -87,6 +88,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN
     };
     CheckBox CB_ALWAYSTRUST
     {
+        HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST";
         Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
         Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Always trust macros from this source";
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 40be26577d..f60733d657 100644..100755
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -43,49 +43,6 @@ using namespace com::sun::star::registry;
 
 using ::rtl::OUString;
 
-namespace {
-
-sal_Bool writeInfo( void * pRegistryKey,
-                    const OUString & rImplementationName,
-                    Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
-    aKeyName += rImplementationName;
-    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-    {
-        return sal_False;
-    }
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-} // namespace
-
 //============================================================================
 //
 //  component_getImplementationEnvironment
@@ -101,43 +58,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
 
 //============================================================================
 //
-//  component_writeInfo
-//
-//============================================================================
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey)
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Interaction Handler.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            OUString::createFromAscii(
-                UUIInteractionHandler::m_aImplementationName ),
-            UUIInteractionHandler::getSupportedServiceNames_static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Interaction Request String Resolver.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            OUString::createFromAscii(
-                UUIInteractionRequestStringResolver::m_aImplementationName ),
-            UUIInteractionRequestStringResolver::getSupportedServiceNames_static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Password Container Interaction Handler.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            uui::PasswordContainerInteractionHandler::getImplementationName_Static(),
-            uui::PasswordContainerInteractionHandler::getSupportedServiceNames_Static() );
-}
-
-//============================================================================
-//
 //  component_getFactory
 //
 //============================================================================
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index a613d48816..a613d48816 100644..100755
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc
index 6dc5822bf6..6dc5822bf6 100644..100755
--- a/uui/source/sslwarndlg.hrc
+++ b/uui/source/sslwarndlg.hrc
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 65326ad14c..65326ad14c 100644..100755
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index bea7d06da3..cbcdeef3a8 100644..100755
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.src
@@ -1,7 +1,7 @@
 /*************************************************************************
 *
  * 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
@@ -41,7 +41,6 @@ ModalDialog DLG_UUI_SSLWARN
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Pos = MAP_APPFONT( 221, 158 );
     Size = MAP_APPFONT( DLG_WIDTH, DLG_HEIGHT );
 
     Text [ en-US ] = "Security Warning: ";
@@ -59,6 +58,7 @@ ModalDialog DLG_UUI_SSLWARN
 
     PushButton PB_VIEW__CERTIFICATE
     {
+        HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_VIEW__CERTIFICATE";
         Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -77,6 +77,7 @@ ModalDialog DLG_UUI_SSLWARN
 
     PushButton PB_OK
     {
+        HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_OK";
         Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -88,15 +89,15 @@ ModalDialog DLG_UUI_SSLWARN
     {
         Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP );
         Size = MAP_APPFONT( DLG_WARMIMG_WIDTH , DLG_WARMIMG_HEIGHT );
-        
+
         Fixed = Image
         {
             /* ImageBitmap = Bitmap { File = "certificate_40x56.png"; }; */
             MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;};
         };
-        
+
     };
-    
+
     FixedLine FL_LINE
     {
         Pos = MAP_APPFONT( 0, DLG_CTLBTN_START_Y - RSC_SP_FLGR_INNERBORDER_TOP -  RSC_CD_FIXEDLINE_HEIGHT );
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 35b65271f4..35b65271f4 100644..100755
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index fd9915261d..fd9915261d 100644..100755
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
index acc799ac16..acc799ac16 100644..100755
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 63af5fed31..63af5fed31 100644..100755
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc
index 9bb6b0dea6..9bb6b0dea6 100644..100755
--- a/uui/source/unknownauthdlg.hrc
+++ b/uui/source/unknownauthdlg.hrc
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 4b15f7d20f..4b15f7d20f 100644..100755
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src
index aadb52282d..a9e518df07 100644..100755
--- a/uui/source/unknownauthdlg.src
+++ b/uui/source/unknownauthdlg.src
@@ -62,6 +62,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
         
     PushButton PB_VIEW__CERTIFICATE
     {
+        HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y );
         Size = MAP_APPFONT( 70, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -80,6 +81,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     PushButton PB_OK
     {
+        HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK";
         Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -96,6 +98,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     RadioButton RB_ACCEPT_1
     {
+        HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y );
         Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
 
@@ -106,6 +109,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     RadioButton RB_DONTACCEPT_2
     {
+        HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y + RSC_CD_RADIOBUTTON_HEIGHT  );
         Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
 
diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk
index 163a7bb550..8a77e71b5e 100644..100755
--- a/uui/util/makefile.mk
+++ b/uui/util/makefile.mk
@@ -62,3 +62,11 @@ RESLIB1SRSFILES = \
     $(SRS)$/source.srs
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/uui.component
+
+$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        uui.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt uui.component
diff --git a/uui/util/uui.component b/uui/util/uui.component
new file mode 100755
index 0000000000..0a15ad6eb8
--- /dev/null
+++ b/uui/util/uui.component
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation
+      name="com.sun.star.comp.uui.PasswordContainerInteractionHandler">
+    <service name="com.sun.star.task.PasswordContainerInteractionHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.uui.UUIInteractionHandler">
+    <service name="com.sun.star.configuration.backend.InteractionHandler"/>
+    <service name="com.sun.star.task.InteractionHandler"/>
+    <service name="com.sun.star.uui.InteractionHandler"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.uui.UUIInteractionRequestStringResolver">
+    <service name="com.sun.star.task.InteractionRequestStringResolver"/>
+  </implementation>
+</component>
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index d5a2537a53..d5a2537a53 100644..100755
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
new file mode 100755
index 0000000000..3e23c492f3
--- /dev/null
+++ b/vbahelper/Library_msforms.mk
@@ -0,0 +1,94 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+# MODULE is the name of the module the makefile is located in
+
+# declare a library
+# LIB is the name of the library as it is found in Repository.mk
+$(eval $(call gb_Library_Library,msforms))
+
+# for platforms supporting PCH: declare the location of the pch file
+# this is the name of the cxx file (without extension)
+#$(eval $(call gb_Library_add_precompiled_header,msforms,$(SRCDIR)/vbahelper/PCH_FILE))
+
+# in case UNO services are exported: declare location of component file
+$(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,msforms,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+# add libraries to be linked to LIB; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,msforms,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    svl \
+    svt \
+    tl \
+    sal \
+    vbahelper \
+    sfx \
+    svx \
+    vcl \
+    tk \
+    sb \
+    stl \
+    $(gb_STDLIBS) \
+))
+
+# add all source files that shall be compiled with exceptions enabled
+# the name is relative to $(SRCROOT) and must not contain an extension
+$(eval $(call gb_Library_add_exception_objects,msforms,\
+    vbahelper/source/msforms/service \
+    vbahelper/source/msforms/vbabutton \
+    vbahelper/source/msforms/vbacheckbox \
+    vbahelper/source/msforms/vbacombobox \
+    vbahelper/source/msforms/vbacontrol \
+    vbahelper/source/msforms/vbacontrols \
+    vbahelper/source/msforms/vbaframe \
+    vbahelper/source/msforms/vbaimage \
+    vbahelper/source/msforms/vbalabel \
+    vbahelper/source/msforms/vbalistbox \
+    vbahelper/source/msforms/vbalistcontrolhelper \
+    vbahelper/source/msforms/vbamultipage \
+    vbahelper/source/msforms/vbapages \
+    vbahelper/source/msforms/vbaprogressbar \
+    vbahelper/source/msforms/vbaradiobutton \
+    vbahelper/source/msforms/vbascrollbar \
+    vbahelper/source/msforms/vbaspinbutton \
+    vbahelper/source/msforms/vbasystemaxcontrol \
+    vbahelper/source/msforms/vbatextbox \
+    vbahelper/source/msforms/vbatogglebutton \
+    vbahelper/source/msforms/vbauserform \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
new file mode 100755
index 0000000000..722b66d709
--- /dev/null
+++ b/vbahelper/Library_vbahelper.mk
@@ -0,0 +1,100 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vbahelper))
+
+$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc))
+
+# for platforms supporting PCH: declare the location of the pch file
+# this is the name of the cxx file (without extension)
+#$(eval $(call gb_Library_add_precompiled_header,vbahelper,$(SRCDIR)/vbahelper/PCH_FILE))
+
+# in case UNO services are exported: declare location of component file
+#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,vbahelper,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,vbahelper,\
+    $$(DEFS) \
+    -DVBAHELPER_DLLIMPLEMENTATION \
+))
+
+# add libraries to be linked to vbahelper; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,vbahelper,\
+    cppu \
+    cppuhelper \
+    comphelper \
+    sb \
+    tl \
+    sal \
+    sfx \
+    stl \
+    svt \
+    vcl \
+    svl \
+    msfilter \
+    tk \
+    $(gb_STDLIBS) \
+))
+
+# add all source files that shall be compiled with exceptions enabled
+# the name is relative to $(SRCROOT) and must not contain an extension
+$(eval $(call gb_Library_add_exception_objects,vbahelper,\
+    vbahelper/source/vbahelper/vbaapplicationbase \
+    vbahelper/source/vbahelper/vbacolorformat \
+    vbahelper/source/vbahelper/vbacommandbar \
+    vbahelper/source/vbahelper/vbacommandbarcontrol \
+    vbahelper/source/vbahelper/vbacommandbarcontrols \
+    vbahelper/source/vbahelper/vbacommandbarhelper \
+    vbahelper/source/vbahelper/vbacommandbars \
+    vbahelper/source/vbahelper/vbadialogbase \
+    vbahelper/source/vbahelper/vbadialogsbase \
+    vbahelper/source/vbahelper/vbadocumentbase \
+    vbahelper/source/vbahelper/vbadocumentsbase \
+    vbahelper/source/vbahelper/vbaeventshelperbase \
+    vbahelper/source/vbahelper/vbafillformat \
+    vbahelper/source/vbahelper/vbafontbase \
+    vbahelper/source/vbahelper/vbaglobalbase \
+    vbahelper/source/vbahelper/vbahelper \
+    vbahelper/source/vbahelper/vbalineformat \
+    vbahelper/source/vbahelper/vbapagesetupbase \
+    vbahelper/source/vbahelper/vbapictureformat \
+    vbahelper/source/vbahelper/vbapropvalue \
+    vbahelper/source/vbahelper/vbashape \
+    vbahelper/source/vbahelper/vbashaperange \
+    vbahelper/source/vbahelper/vbashapes \
+    vbahelper/source/vbahelper/vbatextframe \
+    vbahelper/source/vbahelper/vbawindowbase \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/vbahelper/Makefile b/vbahelper/Makefile
new file mode 100755
index 0000000000..a79aff8310
--- /dev/null
+++ b/vbahelper/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/source/rtf/makefile.mk b/vbahelper/Module_vbahelper.mk
index 1af1f0c026..8fe6c15b6a 100644..100755
--- a/editeng/source/rtf/makefile.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,23 +25,22 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+$(eval $(call gb_Module_Module,vbahelper))
 
-PRJNAME=editeng
-TARGET=rtf
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
+# the targets to be inserted are their file names without .mk extension
+$(eval $(call gb_Module_add_targets,vbahelper,\
+    Library_vbahelper \
+    Library_msforms \
+    Package_inc \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# --- Files --------------------------------------------------------
+# add any runtime tests (unit tests) here
+# remove if no tests
+#$(eval $(call gb_Module_add_check_targets,vbahelper,\
+#))
 
-SLOFILES= \
-        $(SLO)$/svxrtf.obj \
-        $(SLO)$/rtfgrf.obj \
-        $(SLO)$/rtfitem.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
+# add any subsequent checks (e.g. complex tests) here
+#$(eval $(call gb_Module_add_subsequentcheck_targets,vbahelper,\
+#))
 
+# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk
new file mode 100755
index 0000000000..6d8033aa5b
--- /dev/null
+++ b/vbahelper/Package_inc.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,vbahelper_inc,$(SRCDIR)/vbahelper/inc))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/helperdecl.hxx,vbahelper/helperdecl.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaaccesshelper.hxx,vbahelper/vbaaccesshelper.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaapplicationbase.hxx,vbahelper/vbaapplicationbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbacollectionimpl.hxx,vbahelper/vbacollectionimpl.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogbase.hxx,vbahelper/vbadialogbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogsbase.hxx,vbahelper/vbadialogsbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadllapi.h,vbahelper/vbadllapi.h))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentbase.hxx,vbahelper/vbadocumentbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentsbase.hxx,vbahelper/vbadocumentsbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaeventshelperbase.hxx,vbahelper/vbaeventshelperbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbafontbase.hxx,vbahelper/vbafontbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaglobalbase.hxx,vbahelper/vbaglobalbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelper.hxx,vbahelper/vbahelper.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelperinterface.hxx,vbahelper/vbahelperinterface.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapagesetupbase.hxx,vbahelper/vbapagesetupbase.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapropvalue.hxx,vbahelper/vbapropvalue.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashape.hxx,vbahelper/vbashape.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashaperange.hxx,vbahelper/vbashaperange.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashapes.hxx,vbahelper/vbashapes.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbatextframe.hxx,vbahelper/vbatextframe.hxx))
+$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbawindowbase.hxx,vbahelper/vbawindowbase.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/vbahelper/inc/vbahelper/helperdecl.hxx
index 8419be6a35..8419be6a35 100644..100755
--- a/vbahelper/inc/vbahelper/helperdecl.hxx
+++ b/vbahelper/inc/vbahelper/helperdecl.hxx
diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
index ca3b3778db..16214d4f15 100644..100755
--- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
+++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
@@ -33,7 +33,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
-#define VBAHELPER_DLLIMPLEMENTATION
+//#define VBAHELPER_DLLIMPLEMENTATION
 #include <vbahelper/vbadllapi.h>
 #include <memory>
 namespace css = ::com::sun::star;
diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
index a7cd8af230..a7cd8af230 100644..100755
--- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 2c114a4c76..f3f7cb4c19 100644..100755
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
@@ -151,7 +151,7 @@ public:
 typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
+class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
 {
 public:
 typedef std::vector< css::uno::Reference< Ifc1 > >  XNamedVec;
@@ -349,7 +349,7 @@ public:
 };
 
 template <typename Ifc> // where Ifc must implement XCollectionTest
-class VBAHELPER_DLLPUBLIC CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
+class CollTestImplHelper :  public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
 {
 typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc >  > ImplBase1;
 
diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx
index 6353df3d01..6353df3d01 100644..100755
--- a/vbahelper/inc/vbahelper/vbadialogbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
index 36c4df6ab9..36c4df6ab9 100644..100755
--- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/vbahelper/inc/vbahelper/vbadllapi.h
index 0db6078e0c..0db6078e0c 100644..100755
--- a/vbahelper/inc/vbahelper/vbadllapi.h
+++ b/vbahelper/inc/vbahelper/vbadllapi.h
diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
index 4a7dc837bf..4a7dc837bf 100644..100755
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
index 4193b6f2c0..f617728237 100644..100755
--- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
@@ -58,10 +58,10 @@ public:
     // VbaDocumentsBase_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
 
-    // XDocumentsBase
-    virtual css::uno::Any SAL_CALL Add() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
+protected:
+    css::uno::Any createDocument() throw (css::uno::RuntimeException);
+    void closeDocuments() throw (css::uno::RuntimeException);
+    css::uno::Any openDocument( const ::rtl::OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
 };
 
 #endif /* SC_VBA_WORKBOOKS_HXX */
diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
index 3f08378024..b07dc1358c 100644..100755
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -59,6 +59,17 @@ public:
     // XEventListener
     virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException);
 
+    // little helpers ---------------------------------------------------------
+    
+    /** Throws, if the passed sequence does not contain a value at the specified index. */
+    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
+
+    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
+    template< typename Type >
+    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+        { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
+
 protected:
     // ------------------------------------------------------------------------
     
@@ -74,7 +85,7 @@ protected:
 
     /** Registers a supported event handler.
 
-        @param nEventId  Event identifier from com.sun.star.script.vba.EventIdentifier.
+        @param nEventId  Event identifier from com.sun.star.script.vba.VBAEventId.
         @param pcMacroName  Name of the associated VBA event handler macro.
         @param eType  Document event or global event.
         @param nCancelIndex  0-based index of Cancel parameter, or -1.
@@ -86,15 +97,6 @@ protected:
             sal_Int32 nCancelIndex = -1,
             const css::uno::Any& rUserData = css::uno::Any() );
 
-    /** Throws, if the passed sequence does not contain a value at the specified index. */
-    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( rArgs.getLength() <= nIndex ) throw css::lang::IllegalArgumentException(); }
-
-    /** Throws, if the passed sequence does not contain a value of a specific at the specified index. */
-    template< typename Type >
-    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
-        { if( (rArgs.getLength() <= nIndex) || !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
-
     // ------------------------------------------------------------------------
 
     struct EventQueueEntry
@@ -106,10 +108,6 @@ protected:
     };
     typedef ::std::deque< EventQueueEntry > EventQueue;
     
-    /** Derived classes return whether event processing is enabled. Throws if
-        the instance is in an invalid state. */
-    virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0;
-
     /** Derived classes do additional prpeparations and return whether the
         event handler has to be called. */
     virtual bool implPrepareEvent(
diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/vbahelper/inc/vbahelper/vbafontbase.hxx
index e2fe222b12..e2fe222b12 100644..100755
--- a/vbahelper/inc/vbahelper/vbafontbase.hxx
+++ b/vbahelper/inc/vbahelper/vbafontbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
index 491f8d5d24..491f8d5d24 100644..100755
--- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index 8f9f6dcc1e..f48f9f9ae1 100644..100755
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -83,7 +83,7 @@ namespace ooo
 
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString& aUrl );
      VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const rtl::OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps, const css::uno::Reference< css::frame::XDispatchResultListener >& rListener = css::uno::Reference< css::frame::XDispatchResultListener >(), const sal_Bool bSilent = sal_True );
-        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+        VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
         VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
         VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
@@ -193,6 +193,7 @@ public:
     virtual void setHeight( double nHeight );
     virtual double getWidth();
     virtual void setWidth( double nWidth);
+    virtual ~ConcreteXShapeGeometryAttributes();
 };
 
 #define VBA_LEFT "PositionX"
@@ -201,11 +202,8 @@ public:
 #define VBA_WIDTH "Width"
 class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
 {
-    css::uno::Reference< css::awt::XUnitConversion > mxControlUnits;
-    css::uno::Reference< css::beans::XPropertySet > mxModel;
-
-    sal_Int32 ConvertLogicToPixel( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nSourceUnit );
-    sal_Int32 ConvertPixelToLogic( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nTargetUnit );
+    css::uno::Reference< css::awt::XWindow > mxWindow;
+    sal_Bool mbDialog;
 
 public:
     UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
index 37d11b874b..657a6b7cfa 100644..100755
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
@@ -64,7 +64,7 @@
 const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1
+class InheritedHelperInterfaceImpl : public Ifc1
 {
 protected: 
     css::uno::WeakReference< ov::XHelperInterface > mxParent;
@@ -110,7 +110,7 @@ public:
  };
 
 template< typename Ifc1 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
+class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
 public:
@@ -120,7 +120,7 @@ public:
 };
 
 template< typename Ifc1, typename Ifc2 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
+class InheritedHelperInterfaceImpl2 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper2< Ifc1, Ifc2 > > Base;
 public:
@@ -130,7 +130,7 @@ public:
 };
 
 template< typename Ifc1, typename Ifc2, typename Ifc3 >
-class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
+class InheritedHelperInterfaceImpl3 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > >
 {
     typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper3< Ifc1, Ifc2, Ifc3 > > Base;
 public:
diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
index 4454343049..4454343049 100644..100755
--- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
+++ b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx
index 5068f3235d..5068f3235d 100644..100755
--- a/vbahelper/inc/vbahelper/vbapropvalue.hxx
+++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx
diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx
index 9bc507190b..9bc507190b 100644..100755
--- a/vbahelper/inc/vbahelper/vbashape.hxx
+++ b/vbahelper/inc/vbahelper/vbashape.hxx
diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx
index 1aad3bd9f7..1aad3bd9f7 100644..100755
--- a/vbahelper/inc/vbahelper/vbashaperange.hxx
+++ b/vbahelper/inc/vbahelper/vbashaperange.hxx
diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx
index 212810b907..212810b907 100644..100755
--- a/vbahelper/inc/vbahelper/vbashapes.hxx
+++ b/vbahelper/inc/vbahelper/vbashapes.hxx
diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx
index d08902096f..d08902096f 100644..100755
--- a/vbahelper/inc/vbahelper/vbatextframe.hxx
+++ b/vbahelper/inc/vbahelper/vbatextframe.hxx
diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx
index 963ae4d510..963ae4d510 100644..100755
--- a/vbahelper/inc/vbahelper/vbawindowbase.hxx
+++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index ded9ee23b3..8c411d422e 100644..100755
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,6 +1,3 @@
-vba     vbahelper       :       oovbaapi oox basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
+vba     vbahelper       :    offuh oox basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal LIBXSLT:libxslt NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
-#vba	vbahelper\inc								nmake	-	all	vba_inc NULL
-vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
-vba	vbahelper\source\msforms                        nmake	-	all	vba_msforms NULL
-vba	vbahelper\util								nmake	-	all	vba_util vba_vbahelper vba_msforms NULL
+vba	vbahelper\prj	nmake	-	all	vba_prj NULL
diff --git a/vbahelper/prj/d.lst b/vbahelper/prj/d.lst
index 92b01be839..c317c4de1e 100644..100755
--- a/vbahelper/prj/d.lst
+++ b/vbahelper/prj/d.lst
@@ -1,30 +1 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
-..\%__SRC%\lib\ivbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
-..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
-..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.*
-..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.*
-
-mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx
-..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx
-..\inc\vbahelper\vbaaccesshelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbaaccesshelper.hxx
-..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
-..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
-..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
-..\inc\vbahelper\vbafontbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbafontbase.hxx
-..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h
-..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx
-..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx
-..\inc\vbahelper\vbadocumentsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentsbase.hxx
-..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx
-..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx
-..\inc\vbahelper\vbadialogbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogbase.hxx
-..\inc\vbahelper\vbadialogsbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadialogsbase.hxx
-..\inc\vbahelper\vbashape.hxx %_DEST%\inc%_EXT%\vbahelper\vbashape.hxx
-..\inc\vbahelper\vbashapes.hxx %_DEST%\inc%_EXT%\vbahelper\vbashapes.hxx
-..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx
-..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx
-..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx
-..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx
 ..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx
diff --git a/vbahelper/prj/makefile.mk b/vbahelper/prj/makefile.mk
new file mode 100755
index 0000000000..e312a7ccab
--- /dev/null
+++ b/vbahelper/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index 30ce22139c..30ce22139c 100644..100755
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 432552254b..3388051eae 100644..100755
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -58,16 +58,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( 
-        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
-    {
-        OSL_TRACE("In component_writeInfo");
-
-    // Component registration
-         return component_writeInfoHelper( pServiceManager, pRegistryKey, 
-        controlprovider::serviceDecl, userform::serviceDecl );
-    }
-
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( 
         const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
         registry::XRegistryKey * pRegistryKey )
diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx
index 69e4733c5d..69e4733c5d 100644..100755
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx
index 1a01d69165..1a01d69165 100644..100755
--- a/vbahelper/source/msforms/vbabutton.hxx
+++ b/vbahelper/source/msforms/vbabutton.hxx
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx
index fea0853b68..fea0853b68 100644..100755
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx
index 0dbba7412e..0dbba7412e 100644..100755
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index d0446bca77..d0446bca77 100644..100755
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 77a546e678..77a546e678 100644..100755
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 6b14bed48e..2d100caa2e 100644..100755
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -241,7 +241,6 @@ void SAL_CALL
 ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
 {
     mpGeometryHelper->setLeft( _left );
-
 }
 
 double SAL_CALL
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index ed7004a1e4..b97a502ad3 100644..100755
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -43,6 +43,7 @@
 #include <memory>
 
 //typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
+//template SAL_DLLPUBLIC_IMPORT InheritedHelperInterfaceImpl1< ov::msforms::XControl >;
 typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
 
 class ScVbaControl : public ControlImpl_BASE
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 9dbe1e3588..9dbe1e3588 100644..100755
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx
index cbbb4fcafe..cbbb4fcafe 100644..100755
--- a/vbahelper/source/msforms/vbacontrols.hxx
+++ b/vbahelper/source/msforms/vbacontrols.hxx
diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index 09d3b3c7fb..09d3b3c7fb 100644..100755
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx
index 9b2c77252f..9b2c77252f 100644..100755
--- a/vbahelper/source/msforms/vbaframe.hxx
+++ b/vbahelper/source/msforms/vbaframe.hxx
diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx
index fbe0d10e1b..fbe0d10e1b 100644..100755
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx
index c1098fdd8b..c1098fdd8b 100644..100755
--- a/vbahelper/source/msforms/vbaimage.hxx
+++ b/vbahelper/source/msforms/vbaimage.hxx
diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index 29c8dfa834..29c8dfa834 100644..100755
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index 3619c06e15..3619c06e15 100644..100755
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index a29c1312ee..a29c1312ee 100644..100755
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index a35f100f4b..a35f100f4b 100644..100755
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index 696b52bfb4..696b52bfb4 100644..100755
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
index 82ac338765..82ac338765 100644..100755
--- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 1ca77dc436..1ca77dc436 100644..100755
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index 34fdb01a93..34fdb01a93 100644..100755
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx
index 7f6b2d5be8..7f6b2d5be8 100644..100755
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx
index f19c6120f4..f19c6120f4 100644..100755
--- a/vbahelper/source/msforms/vbapages.hxx
+++ b/vbahelper/source/msforms/vbapages.hxx
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx
index 80b05467ce..80b05467ce 100644..100755
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx
index e022bd9f52..e022bd9f52 100644..100755
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx
index aa08851902..aa08851902 100644..100755
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx
index 0bcbb33f15..0bcbb33f15 100644..100755
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx
index 0cf4e6c963..0cf4e6c963 100644..100755
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx
index de36b51398..de36b51398 100644..100755
--- a/vbahelper/source/msforms/vbascrollbar.hxx
+++ b/vbahelper/source/msforms/vbascrollbar.hxx
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx
index 42f025a45f..42f025a45f 100644..100755
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx
index 66d2b906ef..66d2b906ef 100644..100755
--- a/vbahelper/source/msforms/vbaspinbutton.hxx
+++ b/vbahelper/source/msforms/vbaspinbutton.hxx
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index 171986ac6c..171986ac6c 100644..100755
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx
index 45bcb3a630..45bcb3a630 100644..100755
--- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 3fc94c7a17..3fc94c7a17 100644..100755
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 548ae2ab47..548ae2ab47 100644..100755
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index 297e30c103..297e30c103 100644..100755
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index 540069de3d..540069de3d 100644..100755
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index afbe84830d..7152523e26 100644..100755
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -30,8 +30,10 @@
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyConcept.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/util/MeasureUnit.hpp>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
@@ -69,9 +71,28 @@ ScVbaUserForm::Show(  ) throw (uno::RuntimeException)
 {
     OSL_TRACE("ScVbaUserForm::Show(  )");
     short aRet = 0;
-        mbDispose = true;
+    mbDispose = true;
+
     if ( m_xDialog.is() )
+    {
+        // try to center dialog on model window
+        if( m_xModel.is() ) try
+        {
+            uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_SET_THROW );
+            uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
+            uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
+            awt::Rectangle aPosSize = xWindow->getPosSize();    // already in pixel
+
+            uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
+            uno::Reference< awt::XWindow > xControlWindow( xControl->getPeer(), uno::UNO_QUERY_THROW );
+            xControlWindow->setPosSize( (aPosSize.Width - getWidth()) / 2.0, (aPosSize.Height - getHeight()) / 2.0, 0, 0, awt::PosSize::POS );
+        }
+        catch( uno::Exception& )
+        {
+        }
+
         aRet = m_xDialog->execute();
+    }
     OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
     if ( mbDispose )
     {
@@ -228,13 +249,16 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un
         uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
         uno::Reference< awt::XControl > xControl = nestedSearch( aPropertyName, xContainer );
         xContainer->getControl( aPropertyName );
-        ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
-            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
-            ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
-            pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
-        if ( m_sLibName.getLength() )
-            pControl->setLibraryAndCodeName( m_sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( getName() ) );
-        aResult = uno::makeAny( xVBAControl );
+        if ( xControl.is() )
+        {
+            ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+                uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+                ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
+                pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+            if ( m_sLibName.getLength() )
+                pControl->setLibraryAndCodeName( m_sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( getName() ) );
+            aResult = uno::makeAny( xVBAControl );
+        }
     }
 
     return aResult;
diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx
index 625d1fae02..625d1fae02 100644..100755
--- a/vbahelper/source/msforms/vbauserform.hxx
+++ b/vbahelper/source/msforms/vbauserform.hxx
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index 31fefa8430..31fefa8430 100644..100755
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 33809cb205..57baee722b 100644..100755
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -52,6 +52,7 @@
 #include <basic/sbuno.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
+#include <basic/vbahelper.hxx>
 
 #include "vbacommandbars.hxx"
 
@@ -202,12 +203,8 @@ void SAL_CALL
 VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-    if( bUpdate != xModel->hasControllersLocked() )
-        return;
-    if (bUpdate)
-        xModel->unlockControllers();
-    else
-        xModel->lockControllers();
+    // #163808# use helper from module "basic" to lock all documents of this application
+    ::basic::vba::lockControllersOfAllDocuments( xModel, !bUpdate );
 }
 
 sal_Bool SAL_CALL
@@ -266,10 +263,8 @@ void SAL_CALL VbaApplicationBase::setInteractive( ::sal_Bool bInteractive )
     throw (uno::RuntimeException)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
-    uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
-    uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
-
-    xWindow->setEnable( bInteractive );
+    // #163808# use helper from module "basic" to enable/disable all container windows of all documents of this application
+    ::basic::vba::enableContainerWindowsOfAllDocuments( xModel, bInteractive );
 }
 
 sal_Bool SAL_CALL VbaApplicationBase::getVisible() throw (uno::RuntimeException)
@@ -301,54 +296,24 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, con
 {
     ::rtl::OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
     ::rtl::OUString sMacroSeparator(RTL_CONSTASCII_USTRINGPARAM("!"));
-    ::rtl::OUString sMacro_only_Name;
-    sal_Int32 Position_MacroSeparator = MacroName.indexOf(sMacroSeparator);
-
-    uno::Reference< frame::XModel > aMacroDocumentModel;
-    if (-1 != Position_MacroSeparator)
-    {
-        uno::Reference< container::XEnumerationAccess > xComponentEnumAccess;
-        uno::Reference< lang::XMultiComponentFactory > xServiceManager = mxContext->getServiceManager();
-        try
-        {
-            uno::Reference< frame::XDesktop > xDesktop (xServiceManager->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )),mxContext ), uno::UNO_QUERY_THROW );
-            xComponentEnumAccess = xDesktop->getComponents();
-        }
-        catch(uno::Exception&)
-        {
-        }
-
-        //rem look for the name of the document in the cmpoonents collection
-        uno::Reference < container::XEnumeration > xEnum = xComponentEnumAccess->createEnumeration();
+    ::rtl::OUString aMacroName = MacroName.trim();
+    if (0 == aMacroName.indexOf('!'))
+        aMacroName = aMacroName.copy(1).trim();
 
-        // iterate through the collection by name
-        while (xEnum->hasMoreElements())
-        {
-            // get the next element as a UNO Any
-            uno::Any aComponentHelper = xEnum->nextElement();
-            uno::Reference <frame::XModel> xDocModel( aComponentHelper, uno::UNO_QUERY_THROW );
-                                                                                                             
-            // get the name of the sheet from its XNamed interface
-            ::rtl::OUString  aName = xDocModel->getURL();
-
-
-            if (aName.match(MacroName.copy(0,Position_MacroSeparator-1),aName.lastIndexOf(sSeparator)+1))
-            {
-                aMacroDocumentModel = xDocModel;
-                sMacro_only_Name = MacroName.copy(Position_MacroSeparator+1);
-            }
-        }
-    }
-    else
+    uno::Reference< frame::XModel > xModel;
+    SbMethod* pMeth = StarBASIC::GetActiveMethod();
+    if ( pMeth )
     {
-        aMacroDocumentModel = getCurrentDocument(); 
-        sMacro_only_Name = MacroName.copy(0);
+        SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() );
+        if ( pMod )
+            xModel = StarBASIC::GetModelFromBasic( pMod );
     }
 
-    
-    // search the global tempalte
-    VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( aMacroDocumentModel ), sMacro_only_Name, sal_True );
-    if( aMacroInfo.IsResolved() )
+    if ( !xModel.is() )
+        xModel = getCurrentDocument();
+
+    MacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( xModel ), aMacroName );
+    if( aMacroInfo.mbFound )
     {
         // handle the arguments
         const uno::Any* aArgsPtrArray[] = { &varg1, &varg2, &varg3, &varg4, &varg5, &varg6, &varg7, &varg8, &varg9, &varg10, &varg11, &varg12, &varg13, &varg14, &varg15, &varg16, &varg17, &varg18, &varg19, &varg20, &varg21, &varg22, &varg23, &varg24, &varg25, &varg26, &varg27, &varg28, &varg29, &varg30 };
@@ -369,7 +334,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, con
 
         uno::Any aRet;
         uno::Any aDummyCaller;
-        executeMacro( aMacroInfo.MacroDocContext(), aMacroInfo.ResolvedMacro(), aArgs, aRet, aDummyCaller );
+        executeMacro( aMacroInfo.mpDocContext, aMacroInfo.msResolvedMacro, aArgs, aRet, aDummyCaller );
 
         return aRet;
     }
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index 0df920e0b2..0df920e0b2 100644..100755
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx
index e29ea90cb9..e29ea90cb9 100644..100755
--- a/vbahelper/source/vbahelper/vbacolorformat.hxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.hxx
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 68fada22d5..68fada22d5 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx
index a8fd71a164..a8fd71a164 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 642ec2c3c7..1151fdccaa 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -79,10 +79,10 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
 {
     // get the current model
     uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); 
-    VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
-    if ( aResolvedMacro.IsResolved() )
+    MacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
+    if ( aResolvedMacro.mbFound )
     {
-        rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
+        rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.msResolvedMacro );
         OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
         setPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandURL")), uno::makeAny( aCommandURL ) );
         ApplyChange();
@@ -92,11 +92,13 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
 ::sal_Bool SAL_CALL 
 ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
 {
-    sal_Bool bVisible = sal_True;
+    /*sal_Bool bVisible = sal_True;
     uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
     if( aValue.hasValue() )
         aValue >>= bVisible;
-    return bVisible;
+    return bVisible;*/
+    return getEnabled();
+
 }
 void SAL_CALL 
 ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
@@ -107,12 +109,16 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc
         setPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), uno::makeAny( _visible ) );
         ApplyChange();
     }
+    setEnabled( _visible);
 }
 
 ::sal_Bool SAL_CALL 
 ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
 {
     sal_Bool bEnabled = sal_True;
+    rtl::OUString aCommandURLappendix = rtl::OUString::createFromAscii("___");
+    rtl::OUString aCommandURL ;
+
     if( m_xParentMenu.is() )
     {
         // currently only the menu in the MenuBat support Enable/Disable
@@ -122,7 +128,14 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
     else
     {
         // emulated with Visible
-        bEnabled = getVisible();
+        //bEnabled = getVisible();
+        uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") );
+        if (aValue >>= aCommandURL){
+            if (0 == aCommandURL.indexOf(aCommandURLappendix)){
+                    bEnabled = sal_False;
+                }
+            }		
+
     }    
     return bEnabled;
 }
@@ -130,6 +143,9 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException)
 void SAL_CALL
 ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
 {
+    rtl::OUString aCommandURL ;
+    rtl::OUString aCommandURLappendix = rtl::OUString::createFromAscii("___");
+    rtl::OUStringBuffer aCommandURLSringBuffer;
     if( m_xParentMenu.is() )
     {
         // currently only the menu in the MenuBat support Enable/Disable
@@ -137,8 +153,20 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep
     }
     else
     {
+        uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") );
+        if (aValue >>= aCommandURL){
+            if (0 == aCommandURL.indexOf(aCommandURLappendix)){
+                aCommandURL = aCommandURL.copy(3);
+                }
+            if (false == _enabled){ 
+                aCommandURLSringBuffer = aCommandURLappendix;
+            }
+            aCommandURLSringBuffer.append(aCommandURL);
+            setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURLSringBuffer.makeStringAndClear()) );
+            ApplyChange();
+        }
         // emulated with Visible
-        setVisible( _enabled );
+        //setVisible( _enabled );
     }    
 }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index c599472682..c599472682 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 3c8c531628..3c8c531628 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
index 834c99d8ca..834c99d8ca 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index a78ed0cc37..a78ed0cc37 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index 139e5de906..139e5de906 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index cc1cbb2284..cc1cbb2284 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx
index 27af1dbd10..27af1dbd10 100644..100755
--- a/vbahelper/source/vbahelper/vbacommandbars.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.hxx
diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx
index 302a565cf4..302a565cf4 100644..100755
--- a/vbahelper/source/vbahelper/vbadialogbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogbase.cxx
diff --git a/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx
index e60d3f5be5..e60d3f5be5 100644..100755
--- a/vbahelper/source/vbahelper/vbadialogsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index 5230945e6e..141e69bcc4 100644..100755
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -29,15 +29,19 @@
 #include "vbahelper/vbadocumentbase.hxx"
 #include "vbahelper/helperdecl.hxx"
 
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XProtectable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp> //Michael E. Bohn
 #include <com/sun/star/beans/XPropertySet.hpp>
 
+#include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/unwrapargs.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
@@ -72,25 +76,29 @@ VbaDocumentBase::getName() throw (uno::RuntimeException)
     {
         uno::Reference< frame::XTitle > xTitle( getModel(), uno::UNO_QUERY_THROW );
         sName = xTitle->getTitle();
+        sName = sName.trim();	
     }
     return sName;
 }
 ::rtl::OUString
 VbaDocumentBase::getPath() throw (uno::RuntimeException)
 {
-       INetURLObject aURL( getModel()->getURL() );
-    rtl::OUString sURL( aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
-    sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
-        rtl::OUString sPath;
-    ::osl::File::getSystemPathFromFileURL( sURL, sPath );
+    INetURLObject aURL( getModel()->getURL() );
+    rtl::OUString sURL = aURL.GetMainURL( INetURLObject::DECODE_TO_IURI );
+    rtl::OUString sPath;
+    if( sURL.getLength() > 0 )
+    {
+       sURL = sURL.copy( 0, sURL.getLength() - aURL.GetLastName().getLength() - 1 );
+       ::osl::File::getSystemPathFromFileURL( sURL, sPath );
+    }
     return sPath;
 }
 
 ::rtl::OUString
 VbaDocumentBase::getFullName() throw (uno::RuntimeException)
 {
-        rtl::OUString sPath;
-    ::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
+    rtl::OUString sPath = getName();
+    //::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
     return sPath;
 }
 
@@ -124,38 +132,69 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
     else
         xModifiable->setModified( false );
 
-    uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
-
-    if( xCloseable.is() )
+    // first try to close the document using UI dispatch functionality
+    sal_Bool bUIClose = sal_False;
+    try
     {
-        // use close(boolean DeliverOwnership)
+        uno::Reference< frame::XController > xController( getModel()->getCurrentController(), uno::UNO_SET_THROW );
+        uno::Reference< frame::XDispatchProvider > xDispatchProvider( xController->getFrame(), uno::UNO_QUERY_THROW );
 
-        // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
-        // assume ownership if they object the closure by throwing a CloseVetoException
-        // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
-        try{
-            xCloseable->close(sal_True);
-        }
-        catch( util::CloseVetoException )
-        {
-            //close is cancelled, nothing to do
-        }
+        uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+        uno::Reference< util::XURLTransformer > xURLTransformer(
+                        xServiceManager->createInstanceWithContext(
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ),
+                            mxContext ),
+                        uno::UNO_QUERY_THROW );
+
+        util::URL aURL;
+        aURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseDoc" ) );
+        xURLTransformer->parseStrict( aURL );
+
+        uno::Reference< css::frame::XDispatch > xDispatch(
+                xDispatchProvider->queryDispatch( aURL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ), 0 ),
+                uno::UNO_SET_THROW );
+        xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() );
+        bUIClose = sal_True;
     }
-    // If close is not supported by this model - try to dispose it.
-    // But if the model disagree with a reset request for the modify state
-    // we shouldn't do so. Otherwhise some strange things can happen.
-    else
+    catch( uno::Exception& )
+    {
+    }
+
+    if ( !bUIClose )
     {
-        uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
-        if ( xDisposable.is() )
+        // if it is not possible to use UI dispatch, try to close the model directly
+        uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
+        if( xCloseable.is() )
         {
-            // To be on the safe side, catch possible veto exception anyway.
-            try
+            // use close(boolean DeliverOwnership)
+        
+            // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
+            // assume ownership if they object the closure by throwing a CloseVetoException
+            // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
+            try{
+                xCloseable->close(sal_True);
+            }
+            catch( util::CloseVetoException )
             {
-                xDisposable->dispose();
+                //close is cancelled, nothing to do
             }
-            catch( uno::Exception& )
+        }
+        // If close is not supported by this model - try to dispose it.
+        // But if the model disagree with a reset request for the modify state
+        // we shouldn't do so. Otherwhise some strange things can happen.
+        else
+        {
+            uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY );
+            if ( xDisposable.is() )
             {
+                // To be on the safe side, catch possible veto exception anyway.
+                try
+                {
+                    xDisposable->dispose();
+                }
+                catch( uno::Exception& )
+                {
+                }
             }
         }
     }
@@ -195,7 +234,22 @@ void
 VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
 {
     uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
-    xModifiable->setModified( !bSave );
+    try
+    {
+        xModifiable->setModified( !bSave );
+    }
+    catch ( lang::DisposedException& )
+    {
+        // impossibility to set the modified state on disposed document should not trigger an error
+    }
+    catch ( beans::PropertyVetoException& )
+    {
+        uno::Any aCaught( ::cppu::getCaughtException() );
+        throw lang::WrappedTargetRuntimeException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't change modified state of model!" ) ),
+                uno::Reference< uno::XInterface >(),
+                aCaught );
+    }
 }
 
 sal_Bool
@@ -227,7 +281,7 @@ VbaDocumentBase::getVBProject() throw (uno::RuntimeException)
     {
         uno::Sequence< uno::Any > aArgs( 2 );
         aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
-        aArgs[ 1 ] <<= mxModel;
+        aArgs[ 1 ] <<= getModel();
         uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
         uno::Reference< uno::XInterface > xVBProjects = xServiceManager->createInstanceWithArgumentsAndContext(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBProject" ) ), aArgs, mxContext );
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 0765521971..0e5782d632 100644..100755
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -25,7 +25,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <vbahelper/vbadocumentsbase.hxx>
+ 
+#include "vbahelper/vbadocumentsbase.hxx"
+
+#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
@@ -50,11 +53,13 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sfx2/objsh.hxx>
 #include <tools/urlobj.hxx>
-#include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbadocumentbase.hxx>
 #include <boost/unordered_map.hpp>
 #include <osl/file.hxx>
 
+#include "vbahelper/vbahelper.hxx"
+#include "vbahelper/vbaapplicationbase.hxx"
+
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
@@ -220,10 +225,40 @@ VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xP
 {
 }
 
-uno::Any SAL_CALL
-VbaDocumentsBase::Add() throw (uno::RuntimeException)
+namespace {
+
+void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, sal_Bool bScreenUpdating, sal_Bool bInteractive )
 {
-    uno::Reference< lang::XMultiComponentFactory > xSMgr(
+    if( !bScreenUpdating ) try
+    {
+        uno::Reference< frame::XModel >( rxComponent, uno::UNO_QUERY_THROW )->lockControllers();
+    }
+    catch( uno::Exception& )
+    {
+    }
+
+    if( !bInteractive ) try
+    {
+        uno::Reference< frame::XModel > xModel( rxComponent, uno::UNO_QUERY_THROW );
+        uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
+        uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
+        uno::Reference< awt::XWindow >( xFrame->getContainerWindow(), uno::UNO_SET_THROW )->setEnable( sal_False );
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
+} // namespace
+
+uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException)
+{
+    // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
+    uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
+    sal_Bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
+    sal_Bool bInteractive = !xApplication.is() || xApplication->getInteractive();
+
+     uno::Reference< lang::XMultiComponentFactory > xSMgr(
         mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
 
      uno::Reference< frame::XComponentLoader > xLoader(
@@ -237,15 +272,25 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException)
         sURL = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc") );
     else
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
+
+    // prepare the media descriptor
+    ::comphelper::MediaDescriptor aMediaDesc;
+    aMediaDesc[ ::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE() ] <<= document::MacroExecMode::USE_CONFIG;
+    aMediaDesc.setComponentDataEntry( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ApplyFormDesignMode" ) ), uno::Any( false ) );
+
+    // craete the new document
     uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL(
                                        sURL ,
-                                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, 
-                                       uno::Sequence< beans::PropertyValue >(0) );			   
+                                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0,
+                                       aMediaDesc.getAsConstPropertyValueList() );
+
+    // #163808# lock document controllers and container window if specified by application
+    lclSetupComponent( xComponent, bScreenUpdating, bInteractive );
+
     return uno::makeAny( xComponent );
 }
 
-void
-VbaDocumentsBase::Close() throw (uno::RuntimeException)
+void VbaDocumentsBase::closeDocuments() throw (uno::RuntimeException)
 {
 // #FIXME this *MUST* be wrong documents::close surely closes ALL documents
 // in the collection, use of getCurrentDocument here is totally wrong
@@ -259,9 +304,13 @@ VbaDocumentsBase::Close() throw (uno::RuntimeException)
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
-uno::Any
-VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
+uno::Any VbaDocumentsBase::openDocument( const rtl::OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
 {
+    // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
+    uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
+    sal_Bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating();
+    sal_Bool bInteractive = !xApplication.is() || xApplication->getInteractive();
+
     // we need to detect if this is a URL, if not then assume its a file path
         rtl::OUString aURL;
         INetURLObject aObj;
@@ -285,19 +334,16 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly
     uno::Sequence< beans::PropertyValue > sProps( rProps );
     sProps.realloc( sProps.getLength() + 1 );
     sProps[ sProps.getLength() - 1 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode") );
-    sProps[ sProps.getLength() - 1 ].Value <<= uno::makeAny( document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
+    sProps[ sProps.getLength() - 1 ].Value <<= document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
 
-    sal_Int32 nIndex = sProps.getLength() - 1;
-    
     if ( ReadOnly.hasValue()  )
     {
         sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly;
         if ( bIsReadOnly )
         {
-            static const rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
             sProps.realloc( sProps.getLength() + 1 );
-            sProps[ nIndex ].Name = sReadOnly;
-            sProps[ nIndex++ ].Value = uno::makeAny( (sal_Bool)sal_True );
+            sProps[ sProps.getLength() - 1 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
+            sProps[ sProps.getLength() - 1 ].Value <<= true;
         }
     }
 
@@ -305,6 +351,10 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly
         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") ),
         frame::FrameSearchFlag::CREATE,
         sProps);
+
+    // #163808# lock document controllers and container window if specified by application
+    lclSetupComponent( xComponent, bScreenUpdating, bInteractive );
+
     return uno::makeAny( xComponent );
 }
 
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index c222b04e4d..e17d1e0005 100644..100755
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -75,10 +75,6 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
     EventQueue aEventQueue;
     aEventQueue.push_back( EventQueueEntry( nEventId, rArgs ) );
     
-    /*  bEnabled will track if event processing is enabled. Every event handler
-        may disable handling of other events. */
-    bool bEnabled = true;
-    
     /*  bCancel will contain the current Cancel value. It is possible that
         multiple events will try to modify the Cancel value. Every event
         handler receives the Cancel value of the previous event handler. */
@@ -88,10 +84,10 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
         executed successfully. */
     bool bSuccess = false;
 
-    /*  Loop as long as there are more events to be processed, and as event
-        handling is still enabled. Derived classes may add new events to be
-        processed in the virtual implPrepareEvent() function. */
-    while( bEnabled && !aEventQueue.empty() )
+    /*  Loop as long as there are more events to be processed. Derived classes
+        may add new events to be processed in the virtual implPrepareEvent()
+        function. */
+    while( !aEventQueue.empty() )
     {
         /*  Check that all class members are available, and that we are not
             disposed (this may have happened at any time during execution of
@@ -104,14 +100,14 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
         uno::Sequence< uno::Any > aEventArgs = aEventQueue.front().maArgs;
         aEventQueue.pop_front();
 
-        // let derived classes decide whether event processing is still enabled
-        bEnabled = implEventsEnabled();
-        // let derived classes prepare the event, they may add new events for next iteration
-        if( bEnabled && implPrepareEvent( aEventQueue, rInfo, aEventArgs ) )
+        /*  Let derived classes prepare the event, they may add new events for
+            next iteration. If false is returned, the event handler must not be
+            called. */
+        bool bEventSuccess = false;
+        if( implPrepareEvent( aEventQueue, rInfo, aEventArgs ) )
         {
             // search the event handler macro in the document
             ::rtl::OUString aMacroPath = getEventHandlerPath( rInfo, aEventArgs );
-            bool bEventSuccess = false;
             if( aMacroPath.getLength() > 0 )
             {
                 // build the argument list
@@ -140,11 +136,11 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
                         bCancel = nNewCancel != 0;
                 }
             }
-            // post processing (also, if event handler does not exist, or on error
-            implPostProcessEvent( aEventQueue, rInfo, bEventSuccess, bCancel );
             // global success, if at least one event handler succeeded
             bSuccess |= bEventSuccess;
         }
+        // post processing (also, if event handler does not exist, or disabled, or on error
+        implPostProcessEvent( aEventQueue, rInfo, bEventSuccess, bCancel );
     }
 
     // if event handlers want to cancel the event, do so regardless of any errors
@@ -201,7 +197,8 @@ const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandle
                 append( sal_Unicode( '.' ) ).append( rInfo.maMacroName ).makeStringAndClear();
         break;
     }
-    return resolveVBAMacro( mpShell, aMacroName ).ResolvedMacro();
+    MacroResolvedInfo aMacroInfo = resolveVBAMacro( mpShell, aMacroName, false );
+    return aMacroInfo.mbFound ? ::rtl::OUString( aMacroInfo.msResolvedMacro ) : ::rtl::OUString();
 }
 
 void VbaEventsHelperBase::stopListening()
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx
index 23a6e469dd..23a6e469dd 100644..100755
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx
index c2db69f525..c2db69f525 100644..100755
--- a/vbahelper/source/vbahelper/vbafillformat.hxx
+++ b/vbahelper/source/vbahelper/vbafillformat.hxx
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx
index e807a1842c..e807a1842c 100644..100755
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index fd85d99a95..fd85d99a95 100644..100755
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index dc70f58356..149221d3e7 100644..100755
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -41,6 +41,9 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XIntrospection.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
 
 #include <ooo/vba/msforms/XShape.hpp>
 
@@ -142,7 +145,7 @@ aNULL()
     return aNULLL;
 }
 
-void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
+void dispatchExecute(SfxViewShell* pViewShell, sal_uInt16 nSlot, SfxCallMode nCall)
 {
     SfxViewFrame* pViewFrame = NULL;
     if ( pViewShell )
@@ -461,7 +464,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
                 }
             }
             else
-                pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
         }
 
     }
@@ -733,6 +736,9 @@ ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::u
 {
     m_pShapeHelper.reset( new ShapeHelper( xShape ) );
 }
+ConcreteXShapeGeometryAttributes::~ConcreteXShapeGeometryAttributes()
+{
+}
 
 sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel )
 {
@@ -875,277 +881,122 @@ void setOrAppendPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, con
 // ====UserFormGeomentryHelper====
 //---------------------------------------------
 UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
+: mbDialog( uno::Reference< awt::XDialog >( xControl, uno::UNO_QUERY ).is() )
 {
     if ( !xControl.is() )
-        throw uno::RuntimeException();
-
-    mxControlUnits.set( xControl->getPeer(), uno::UNO_QUERY_THROW );
-    mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
-}
-
-//---------------------------------------------
-sal_Int32 UserFormGeometryHelper::ConvertPixelToLogic( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nTargetUnit )
-{
-    sal_Int32 nResult = 0;
-    if ( bIsPoint )
-    {
-        // conversion for a point
-        awt::Point aPixelPoint( 0, 0 );
-        ( bIsX ? aPixelPoint.X : aPixelPoint.Y ) = nValue;
-        awt::Point aTargetPoint( 0, 0 );
-        aTargetPoint = mxControlUnits->convertPointToLogic( aPixelPoint, nTargetUnit );
-
-        nResult = bIsX ? aTargetPoint.X : aTargetPoint.Y;
-    }
-    else
-    {
-        // conversion for a size
-        awt::Size aPixelSize( 0, 0 );
-        ( bIsX ? aPixelSize.Width : aPixelSize.Height ) = nValue;
-        awt::Size aTargetSize( 0, 0 );
-        aTargetSize = mxControlUnits->convertSizeToLogic( aPixelSize, nTargetUnit );
+        throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No control is provided!" ) ),
+                                     uno::Reference< uno::XInterface >() );
 
-        nResult = bIsX ? aTargetSize.Width : aTargetSize.Height;
-    }
-
-    return nResult;
+    mxWindow.set( xControl->getPeer(), uno::UNO_QUERY_THROW );
 }
 
 //---------------------------------------------
-sal_Int32 UserFormGeometryHelper::ConvertLogicToPixel( sal_Int32 nValue, sal_Bool bIsPoint, sal_Bool bIsX, sal_Int16 nSourceUnit )
-{
-    sal_Int32 nResult = 0;
-    if ( bIsPoint )
-    {
-        // conversion for a point
-        awt::Point aSourcePoint( 0, 0 );
-        ( bIsX ? aSourcePoint.X : aSourcePoint.Y ) = nValue;
-
-        awt::Point aPixelPoint( 0, 0 );
-        aPixelPoint = mxControlUnits->convertPointToPixel( aSourcePoint, nSourceUnit );
-
-        nResult = bIsX ? aPixelPoint.X : aPixelPoint.Y;
-    }
-    else
-    {
-        // conversion for a size
-        awt::Size aSourceSize( 0, 0 );
-        ( bIsX ? aSourceSize.Width : aSourceSize.Height ) = nValue;
-
-        awt::Size aPixelSize( 0, 0 );
-        aPixelSize = mxControlUnits->convertSizeToPixel( aSourceSize, nSourceUnit );
-
-        nResult = bIsX ? aPixelSize.Width : aPixelSize.Height;
-    }
-
-    return nResult;
-}
-//---------------------------------------------
 double UserFormGeometryHelper::getLeft()
 {
-    double nResult = 0;
-
-    try
-    {
-        sal_Int32 nLeft = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
-        nResult = ConvertLogicToPixel( nLeft,
-                                       sal_True, // Point
-                                       sal_True, // X
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
-
-    return nResult;
+    return mxWindow->getPosSize().X;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setLeft( double nLeft )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ),
-                uno::makeAny( ConvertPixelToLogic( nLeft,
-                                                   sal_True, // Point
-                                                   sal_True, // X
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
+    mxWindow->setPosSize( nLeft, mxWindow->getPosSize().Y, 0, 0, awt::PosSize::POS );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getTop()
 {
-    double nResult = 0;
-
-    try
-    {
-        sal_Int32 nTop = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
-        nResult = ConvertLogicToPixel( nTop,
-                                       sal_True, // Point
-                                       sal_False, // Y
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get position Y!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
-
-    return nResult;
+    return mxWindow->getPosSize().Y;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setTop( double nTop )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ),
-                uno::makeAny( ConvertPixelToLogic( nTop,
-                                                   sal_True, // Point
-                                                   sal_False, // Y
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set position X!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
-    }
+    mxWindow->setPosSize( mxWindow->getPosSize().X, nTop, 0, 0, awt::PosSize::POS );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getWidth()
 {
-    double nResult = 0;
-
-    try
-    {
-        sal_Int32 nWidth = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_WIDTH ) ) ) >>= nWidth;
-        nResult = ConvertLogicToPixel( nWidth,
-                                       sal_False, // Size
-                                       sal_True, // X
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
+    if ( mbDialog )
     {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get width!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // get the size with decoration
+            Rectangle aResult = pWindow->GetWindowExtentsRelative( NULL );
+            return aResult.getWidth();
+        }
     }
 
-    return nResult;
+    return mxWindow->getPosSize().Width;
 }
 
 //---------------------------------------------
-void UserFormGeometryHelper::setWidth( double nWidth)
+void UserFormGeometryHelper::setWidth( double nWidth )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_WIDTH ) ),
-                uno::makeAny( ConvertPixelToLogic( nWidth,
-                                                   sal_False, // Size
-                                                   sal_True, // X
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
+    sal_Int64 nNewWidth = nWidth;
+
+    if ( mbDialog )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set width!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // set the size with decoration
+            Rectangle aRDecor = pWindow->GetWindowExtentsRelative( NULL );
+            if ( !aRDecor.IsEmpty() )
+            {
+                sal_Int64 nDecor = aRDecor.getWidth();
+                sal_Int64 nUnDecor = mxWindow->getPosSize().Width;
+                if ( nWidth < nDecor - nUnDecor )
+                    nUnDecor = nDecor - nWidth; // avoid negative size
+                nNewWidth = nWidth + nUnDecor - nDecor;
+            }
+        }
     }
+
+    mxWindow->setPosSize( 0, 0, nNewWidth, 0, awt::PosSize::WIDTH );
 }
 
 //---------------------------------------------
 double UserFormGeometryHelper::getHeight()
 {
-    double nResult = 0;
-
-    try
+    if ( mbDialog )
     {
-        sal_Int32 nHeight = 0;
-        mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_HEIGHT ) ) ) >>= nHeight;
-        nResult = ConvertLogicToPixel( nHeight,
-                                       sal_False, // Size
-                                       sal_False, // Y
-                                       util::MeasureUnit::APPFONT );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
-    {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not get height!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // get the size with decoration
+            Rectangle aResult = pWindow->GetWindowExtentsRelative( NULL );
+            return aResult.getHeight();
+        }
     }
 
-    return nResult;
+    return mxWindow->getPosSize().Height;
 }
 
 //---------------------------------------------
 void UserFormGeometryHelper::setHeight( double nHeight )
 {
-    try
-    {
-        mxModel->setPropertyValue(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_HEIGHT ) ),
-                uno::makeAny( ConvertPixelToLogic( nHeight,
-                                                   sal_False, // Size
-                                                   sal_False, // Y
-                                                   util::MeasureUnit::APPFONT ) ) );
-    }
-    catch ( uno::RuntimeException& )
-    {
-        throw;
-    }
-    catch ( uno::Exception& e )
+    sal_Int64 nNewHeight = nHeight;
+    if ( mbDialog )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not set height!" ) ),
-                uno::Reference< uno::XInterface >(),
-                uno::makeAny( e ) );
+        const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow );
+        if ( pWindow )
+        {
+            // set the size with decoration
+            Rectangle aRDecor = pWindow->GetWindowExtentsRelative( NULL );
+            if ( !aRDecor.IsEmpty() )
+            {
+                sal_Int64 nDecor = aRDecor.getHeight();
+                sal_Int64 nUnDecor = mxWindow->getPosSize().Height;
+                if ( nHeight < nDecor - nUnDecor )
+                    nUnDecor = nDecor - nHeight; // avoid negative size
+                nNewHeight = nHeight + nUnDecor - nDecor;
+            }
+        }
     }
+
+    mxWindow->setPosSize( 0, 0, 0, nNewHeight, awt::PosSize::HEIGHT );
 }
 
 // ============
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx
index 1953804085..1953804085 100644..100755
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx
index d4eaadb1de..d4eaadb1de 100644..100755
--- a/vbahelper/source/vbahelper/vbalineformat.hxx
+++ b/vbahelper/source/vbahelper/vbalineformat.hxx
diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index 7b509f9288..7b509f9288 100644..100755
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 34d3cf736d..34d3cf736d 100644..100755
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx
index d11d8aecee..d11d8aecee 100644..100755
--- a/vbahelper/source/vbahelper/vbapictureformat.hxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.hxx
diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx
index e75a7a45dd..e75a7a45dd 100644..100755
--- a/vbahelper/source/vbahelper/vbapropvalue.cxx
+++ b/vbahelper/source/vbahelper/vbapropvalue.cxx
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index ca368e4471..ca368e4471 100644..100755
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index ec15b5fe5e..ec15b5fe5e 100644..100755
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 570e4030b3..570e4030b3 100644..100755
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx
index e215416a59..e215416a59 100644..100755
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 2a6d92421b..2f9556f79e 100644..100755
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -81,7 +81,7 @@ css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
     return aRect;
 }
 
-void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
+void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, sal_uInt16 nFlag )
 {
     uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
index a09ffa5944..a09ffa5944 100644..100755
--- a/vbahelper/util/makefile.mk
+++ b/vbahelper/util/makefile.mk
diff --git a/vbahelper/util/msforms.component b/vbahelper/util/msforms.component
new file mode 100755
index 0000000000..98ce4a8451
--- /dev/null
+++ b/vbahelper/util/msforms.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="ControlProviderImpl">
+    <service name="ooo.vba.ControlProvider"/>
+  </implementation>
+  <implementation name="ScVbaUserForm">
+    <service name="ooo.vba.msforms.UserForm"/>
+  </implementation>
+</component>
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
index d75d3614c0..d75d3614c0 100644..100755
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/inc/makefile.mk
diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
index 7b35c1d755..7b35c1d755 100644..100755
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
diff --git a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
index 258bdd062f..258bdd062f 100644..100755
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 00e285cde8..00e285cde8 100644..100755
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst
index 67fe323757..740ff554ee 100644..100755
--- a/xmlhelp/prj/d.lst
+++ b/xmlhelp/prj/d.lst
@@ -7,4 +7,6 @@
 ..\util\*.xsl %_DEST%\bin%_EXT%\*.*
 ..\%__SRC%\lib\ihelplinker.lib %_DEST%\lib%_EXT%\ihelplinker.lib
 ..\%__SRC%\bin\helpxsl.zip %_DEST%\pck%_EXT%\helpxsl.zip
-
+..\%__SRC%\misc\LuceneHelpWrapper.component %_DEST%\xml%_EXT%\LuceneHelpWrapper.component
+..\%__SRC%\misc\tvhlp1.component %_DEST%\xml%_EXT%\tvhlp1.component
+..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml%_EXT%\ucpchelp1.component
diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index 3156041bc0..836f2f5a78 100755
--- a/xmlhelp/source/com/sun/star/help/HelpComponent.java
+++ b/xmlhelp/source/com/sun/star/help/HelpComponent.java
@@ -31,10 +31,8 @@ import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lang.XSingleComponentFactory;
 import com.sun.star.registry.XRegistryKey;
 
-/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+/** This class capsulates the class, that implements the minimal component and a
+ * factory for creating the service (<CODE>__getComponentFactory</CODE>).
  */
 public class HelpComponent
 {
@@ -61,25 +59,6 @@ public class HelpComponent
         return xFactory;
     }
 
-    /**
-     * Writes the service information into the given registry key.
-     * This method is called by the <code>JavaLoader</code>
-     * <p>
-     * @return  returns true if the operation succeeded
-     * @param   regKey the registryKey
-     * @see     com.sun.star.comp.loader.JavaLoader
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
-    {
-        boolean bSuccessHelpSearch = Factory.writeRegistryServiceInfo
-            (HelpSearch._HelpSearch.class.getName(),
-             HelpSearch._HelpSearch.getServiceNames(), regKey);
-        boolean bSuccessHelpIndexer = Factory.writeRegistryServiceInfo
-            (HelpIndexer.class.getName(),
-             HelpIndexer.getServiceNames(), regKey);
-
-        return bSuccessHelpSearch && bSuccessHelpIndexer;
-    }
     /** This method is a member of the interface for initializing an object
      * directly after its creation.
      * @param object This array of arbitrary objects will be passed to the
diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
index 0c03265295..0c03265295 100644..100755
--- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index 714bb75a52..d140d3093a 100644..100755
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -54,10 +54,8 @@ import org.apache.lucene.search.WildcardQuery;
 import com.sun.star.script.XInvocation;
 import com.sun.star.beans.XIntrospectionAccess;
 
-/** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (<CODE>__getComponentFactory</CODE>) and a
- * method, that writes the information into the given registry key
- * (<CODE>__writeRegistryServiceInfo</CODE>).
+/** This class capsulates the class, that implements the minimal component and a
+ * factory for creating the service (<CODE>__getComponentFactory</CODE>).
  */
 public class HelpSearch
 {
@@ -314,19 +312,6 @@ public class HelpSearch
         return xFactory;
     }
 
-    /**
-     * Writes the service information into the given registry key.
-     * This method is called by the <code>JavaLoader</code>
-     * <p>
-     * @return  returns true if the operation succeeded
-     * @param   regKey the registryKey
-     * @see     com.sun.star.comp.loader.JavaLoader
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-        return Factory.writeRegistryServiceInfo(_HelpSearch.class.getName(),
-                                                _HelpSearch.getServiceNames(),
-                                                regKey);
-    }
         /** This method is a member of the interface for initializing an object
          * directly after its creation.
          * @param object This array of arbitrary objects will be passed to the
diff --git a/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
new file mode 100755
index 0000000000..04b35bcb12
--- /dev/null
+++ b/xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.help.HelpIndexer">
+    <service name="com.sun.star.help.HelpIndexer"/>
+  </implementation>
+  <implementation name="com.sun.star.help.HelpSearch$_HelpSearch">
+    <service name="com.sun.star.help.HelpSearch"/>
+  </implementation>
+</component>
diff --git a/xmlhelp/source/com/sun/star/help/MANIFEST.MF b/xmlhelp/source/com/sun/star/help/MANIFEST.MF
index a4c5d50fde..a4c5d50fde 100644..100755
--- a/xmlhelp/source/com/sun/star/help/MANIFEST.MF
+++ b/xmlhelp/source/com/sun/star/help/MANIFEST.MF
diff --git a/xmlhelp/source/com/sun/star/help/helplinker.pmk b/xmlhelp/source/com/sun/star/help/helplinker.pmk
index 6e99d322f4..6e99d322f4 100644..100755
--- a/xmlhelp/source/com/sun/star/help/helplinker.pmk
+++ b/xmlhelp/source/com/sun/star/help/helplinker.pmk
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index ffa08b30cf..a67f755a1c 100644..100755
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -76,6 +76,14 @@ fix_system_lucene:
     @echo "Fix Java Class-Path entry for Lucene libraries from system."
     @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
     -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
+
+ALLTAR : $(MISC)/LuceneHelpWrapper.component
+
+$(MISC)/LuceneHelpWrapper.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt LuceneHelpWrapper.component
 .ELSE
 all:
         @echo java disabled
diff --git a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
index d7890e20ed..d7890e20ed 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
index a6f80b3952..a6f80b3952 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
+++ b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 6ee522ab16..6ee522ab16 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index 78f9a8af5c..78f9a8af5c 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
index a14859a329..a14859a329 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
index 4f5d15f976..4f5d15f976 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 8e0e41c9c6..8e0e41c9c6 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
index c4ecca2da2..c4ecca2da2 100644..100755
--- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
index dd96b7a2a5..dd96b7a2a5 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index acaf34945a..acaf34945a 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index fb5ccc63f9..fb5ccc63f9 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 6a4386854e..6a4386854e 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 3e150b83e0..3e150b83e0 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index dadb58fbf9..7c289dac34 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -42,6 +42,7 @@
 #include <string.h>
 
 // Extensible help
+#include "com/sun/star/deployment/ExtensionManager.hpp"
 #include "com/sun/star/deployment/thePackageManagerFactory.hpp"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -1573,10 +1574,9 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
 
     if( !m_bUserPackagesLoaded )
     {
-        Reference< XPackageManager > xUserManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) );
-        m_aUserPackagesSeq = xUserManager->getDeployedPackages
-            ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
+        m_aUserPackagesSeq = xExtensionManager->getDeployedExtensions
+            ( rtl::OUString::createFromAscii("user"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bUserPackagesLoaded = true;
     }
 
@@ -1602,10 +1602,9 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
 
     if( !m_bSharedPackagesLoaded )
     {
-        Reference< XPackageManager > xSharedManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) );
-        m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
-            ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
+        m_aSharedPackagesSeq = xExtensionManager->getDeployedExtensions
+            ( rtl::OUString::createFromAscii("shared"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bSharedPackagesLoaded = true;
     }
 
@@ -1631,10 +1630,9 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
 
     if( !m_bBundledPackagesLoaded )
     {
-        Reference< XPackageManager > xBundledManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) );
-        m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
-            ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        Reference< XExtensionManager > xExtensionManager = ExtensionManager::get(m_xContext);
+        m_aBundledPackagesSeq = xExtensionManager->getDeployedExtensions
+            ( rtl::OUString::createFromAscii("bundled"), Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bBundledPackagesLoaded = true;
     }
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 67c5737a6c..67c5737a6c 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index c6fae9f753..c6fae9f753 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 1982ccdf6b..1982ccdf6b 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index b668a7da93..b668a7da93 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index c2e7aafa79..c2e7aafa79 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index 38f57c63e7..38f57c63e7 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index f97724644e..f97724644e 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 0acb16b7f7..0acb16b7f7 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index e232168f06..e232168f06 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index 09f2ac3ecb..09f2ac3ecb 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 89831c0c64..89831c0c64 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 32665e3f5c..32665e3f5c 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx
index 4eca33cc26..4eca33cc26 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 5b417010cb..5b417010cb 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index 54a8227ddc..54a8227ddc 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 46f292644c..46f292644c 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 7140c00121..7140c00121 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index a3c2f15e23..e4beadfeb6 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -37,46 +37,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-static sal_Bool writeInfo( 
-    void * pRegistryKey,
-    const rtl::OUString & rImplementationName,
-    uno::Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-
-    uno::Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-//=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
@@ -84,21 +44,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // Write info into registry.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-               ::chelp::ContentProvider::getImplementationName_Static(),
-               ::chelp::ContentProvider::getSupportedServiceNames_Static() );
-}
-
-//=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, 
     void * pServiceManager, 
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 2cbf115a5c..2cbf115a5c 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index dead76953e..dead76953e 100644..100755
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index 9020e0e6fd..9020e0e6fd 100644..100755
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
index e55bb9eb3e..e55bb9eb3e 100644..100755
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ b/xmlhelp/source/cxxhelp/qe/makefile.mk
diff --git a/xmlhelp/source/cxxhelp/test/abidebug.hxx b/xmlhelp/source/cxxhelp/test/abidebug.hxx
index 3f15ace9fc..3f15ace9fc 100644..100755
--- a/xmlhelp/source/cxxhelp/test/abidebug.hxx
+++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx
diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk
index 4521f909e4..4521f909e4 100644..100755
--- a/xmlhelp/source/cxxhelp/test/makefile.mk
+++ b/xmlhelp/source/cxxhelp/test/makefile.mk
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 1ed77376f9..1ed77376f9 100644..100755
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
diff --git a/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
index 8530131082..8530131082 100644..100755
--- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx
+++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
index a375e7d55c..a375e7d55c 100644..100755
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ b/xmlhelp/source/cxxhelp/util/makefile.mk
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
index 3dc6545701..d6334efa04 100644..100755
--- a/xmlhelp/source/treeview/makefile.mk
+++ b/xmlhelp/source/treeview/makefile.mk
@@ -68,3 +68,11 @@ DEF1DES=UCB : Treeview help
 .INCLUDE: target.mk
 
 
+
+ALLTAR : $(MISC)/tvhlp1.component
+
+$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        tvhlp1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt tvhlp1.component
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 9d64a6429e..02cc3aecc1 100644..100755
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -256,49 +256,6 @@ TVFactory::CreateInstance(
     return Reference< XInterface >::query( xP );
 }
 
-
-
-//=========================================================================
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const rtl::OUString & rImplementationName,
-                              Sequence< rtl::OUString > const & rServiceNames )
-{
-    rtl::OUString aKeyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
-    aKeyName += rImplementationName;
-    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-    
-    Reference< registry::XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< registry::XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( registry::InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( registry::InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-
-
 //=========================================================================
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
@@ -308,20 +265,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-
-
-//=========================================================================
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    (void)pServiceManager;
-
-    return pRegistryKey && writeInfo( pRegistryKey,
-                                      TVFactory::getImplementationName_static(),
-                                      TVFactory::getSupportedServiceNames_static() );
-}
-
-
 //=========================================================================
 extern "C" void * SAL_CALL component_getFactory(
     const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey )
diff --git a/xmlhelp/source/treeview/tvfactory.hxx b/xmlhelp/source/treeview/tvfactory.hxx
index 4d46b0242c..4d46b0242c 100644..100755
--- a/xmlhelp/source/treeview/tvfactory.hxx
+++ b/xmlhelp/source/treeview/tvfactory.hxx
diff --git a/xmlhelp/source/treeview/tvhlp1.component b/xmlhelp/source/treeview/tvhlp1.component
new file mode 100755
index 0000000000..525de73e00
--- /dev/null
+++ b/xmlhelp/source/treeview/tvhlp1.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.help.TreeViewImpl">
+    <service name="com.sun.star.help.TreeView"/>
+    <service name="com.sun.star.ucb.HiearchyDataSource"/>
+  </implementation>
+</component>
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index a4a6860b62..a4a6860b62 100644..100755
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx
index 16f28a589d..16f28a589d 100644..100755
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
diff --git a/xmlhelp/util/delzip b/xmlhelp/util/delzip
index e69de29bb2..e69de29bb2 100644..100755
--- a/xmlhelp/util/delzip
+++ b/xmlhelp/util/delzip
diff --git a/xmlhelp/util/embed.xsl b/xmlhelp/util/embed.xsl
index 3a4e3ef80f..3a4e3ef80f 100644..100755
--- a/xmlhelp/util/embed.xsl
+++ b/xmlhelp/util/embed.xsl
diff --git a/xmlhelp/util/idxcaption.xsl b/xmlhelp/util/idxcaption.xsl
index 7570fa5c78..7570fa5c78 100644..100755
--- a/xmlhelp/util/idxcaption.xsl
+++ b/xmlhelp/util/idxcaption.xsl
diff --git a/xmlhelp/util/idxcontent.xsl b/xmlhelp/util/idxcontent.xsl
index aa371d7f92..aa371d7f92 100644..100755
--- a/xmlhelp/util/idxcontent.xsl
+++ b/xmlhelp/util/idxcontent.xsl
diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl
index 0f5cb021f4..0f5cb021f4 100644..100755
--- a/xmlhelp/util/main_transform.xsl
+++ b/xmlhelp/util/main_transform.xsl
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index a1e73bf8a7..5e1a85f857 100644..100755
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -82,3 +82,11 @@ ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl
 
 .INCLUDE: target.mk
 
+
+ALLTAR : $(MISC)/ucpchelp1.component
+
+$(MISC)/ucpchelp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ucpchelp1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ucpchelp1.component
diff --git a/xmlhelp/util/ucpchelp.xml b/xmlhelp/util/ucpchelp.xml
index 9ca78dff2d..9ca78dff2d 100644..100755
--- a/xmlhelp/util/ucpchelp.xml
+++ b/xmlhelp/util/ucpchelp.xml
diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component
new file mode 100755
index 0000000000..a8bb64124e
--- /dev/null
+++ b/xmlhelp/util/ucpchelp1.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="CHelpContentProvider">
+    <service name="com.sun.star.help.XMLHelp"/>
+    <service name="com.sun.star.ucb.HelpContentProvider"/>
+  </implementation>
+</component>
diff --git a/editeng/source/misc/makefile.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index 0b4dbbecf2..8ac3a5aedf 100644..100755
--- a/editeng/source/misc/makefile.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -24,40 +24,30 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PRJNAME=editeng
-TARGET=misc
+$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi))
 
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/xmloff/qa/unoapi/xmloff.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/xmloff/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \
+))
 
-# --- Settings -----------------------------------------------------------
+$(eval $(call gb_JunitTest_add_jars,xmloff_unoapi,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_JunitTest_add_sourcefiles,xmloff_unoapi,\
+    xmloff/qa/unoapi/Test \
+))
 
-# --- General ----------------------------------------------------------
-
-.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
-CDEFS+=-DEDITDEBUG
-.ENDIF
-
-SLOFILES =	\
-    $(SLO)$/edtdlg.obj \
-    $(SLO)$/unolingu.obj \
-    $(SLO)$/acorrcfg.obj \
-    $(SLO)$/forbiddencharacterstable.obj \
-    $(SLO)$/hangulhanja.obj \
-    $(SLO)$/splwrap.obj \
-    $(SLO)$/svxacorr.obj \
-    $(SLO)$/SvXMLAutoCorrectExport.obj \
-    $(SLO)$/SvXMLAutoCorrectImport.obj \
-    $(SLO)$/swafopt.obj \
-    $(SLO)$/txtrange.obj
-
-SRS1NAME=misc
-SRC1FILES =  \
-        lingu.src
-
-.INCLUDE :  target.mk
+$(eval $(call gb_JunitTest_add_classes,xmloff_unoapi,\
+    org.openoffice.xmloff.qa.unoapi.Test \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
new file mode 100755
index 0000000000..0544171dbf
--- /dev/null
+++ b/xmloff/Library_xo.mk
@@ -0,0 +1,385 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,xo))
+
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+
+$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/precompiled_xmloff))
+
+$(eval $(call gb_Library_set_include,xo,\
+    $$(SOLARINC) \
+    -I. \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,xo,\
+    $$(DEFS) \
+    -DXMLOFF_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xo,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    stl \
+    svl \
+    tl \
+    utl \
+    vos3 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xo,\
+    xmloff/source/chart/ColorPropertySet \
+    xmloff/source/chart/PropertyMaps \
+    xmloff/source/chart/SchXMLAutoStylePoolP \
+    xmloff/source/chart/SchXMLAxisContext \
+    xmloff/source/chart/SchXMLCalculationSettingsContext \
+    xmloff/source/chart/SchXMLChartContext \
+    xmloff/source/chart/SchXMLEnumConverter \
+    xmloff/source/chart/SchXMLExport \
+    xmloff/source/chart/SchXMLImport \
+    xmloff/source/chart/SchXMLLegendContext \
+    xmloff/source/chart/SchXMLParagraphContext \
+    xmloff/source/chart/SchXMLPlotAreaContext \
+    xmloff/source/chart/SchXMLSeries2Context \
+    xmloff/source/chart/SchXMLSeriesHelper \
+    xmloff/source/chart/SchXMLTableContext \
+    xmloff/source/chart/SchXMLTextListContext \
+    xmloff/source/chart/SchXMLTools \
+    xmloff/source/chart/XMLAxisPositionPropertyHdl \
+    xmloff/source/chart/XMLChartPropertyContext \
+    xmloff/source/chart/XMLChartStyleContext \
+    xmloff/source/chart/XMLErrorBarStylePropertyHdl \
+    xmloff/source/chart/XMLErrorIndicatorPropertyHdl \
+    xmloff/source/chart/XMLLabelSeparatorContext \
+    xmloff/source/chart/XMLSymbolImageContext \
+    xmloff/source/chart/XMLSymbolTypePropertyHdl \
+    xmloff/source/chart/XMLTextOrientationHdl \
+    xmloff/source/chart/contexts \
+    xmloff/source/chart/transporttypes \
+    xmloff/source/core/DocumentSettingsContext \
+    xmloff/source/core/DomBuilderContext \
+    xmloff/source/core/DomExport \
+    xmloff/source/core/ProgressBarHelper \
+    xmloff/source/core/PropertySetMerger \
+    xmloff/source/core/RDFaExportHelper \
+    xmloff/source/core/RDFaImportHelper \
+    xmloff/source/core/SettingsExportHelper \
+    xmloff/source/core/XMLBase64Export \
+    xmloff/source/core/XMLBase64ImportContext \
+    xmloff/source/core/XMLBasicExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectExportFilter \
+    xmloff/source/core/XMLEmbeddedObjectImportContext \
+    xmloff/source/core/attrlist \
+    xmloff/source/core/facreg \
+    xmloff/source/core/i18nmap \
+    xmloff/source/core/nmspmap \
+    xmloff/source/core/unoatrcn \
+    xmloff/source/core/unointerfacetouniqueidentifiermapper \
+    xmloff/source/core/xmlcnitm \
+    xmloff/source/core/xmlehelp \
+    xmloff/source/core/xmlerror \
+    xmloff/source/core/xmlexp \
+    xmloff/source/core/xmlictxt \
+    xmloff/source/core/xmlimp \
+    xmloff/source/core/xmltkmap \
+    xmloff/source/core/xmltoken \
+    xmloff/source/core/xmluconv \
+    xmloff/source/draw/EnhancedCustomShapeToken \
+    xmloff/source/draw/XMLGraphicsDefaultStyle \
+    xmloff/source/draw/XMLImageMapContext \
+    xmloff/source/draw/XMLImageMapExport \
+    xmloff/source/draw/XMLNumberStyles \
+    xmloff/source/draw/XMLReplacementImageContext \
+    xmloff/source/draw/XMLShapePropertySetContext \
+    xmloff/source/draw/XMLShapeStyleContext \
+    xmloff/source/draw/animationexport \
+    xmloff/source/draw/animationimport \
+    xmloff/source/draw/animexp \
+    xmloff/source/draw/animimp \
+    xmloff/source/draw/descriptionimp \
+    xmloff/source/draw/eventimp \
+    xmloff/source/draw/layerexp \
+    xmloff/source/draw/layerimp \
+    xmloff/source/draw/numithdl \
+    xmloff/source/draw/propimp0 \
+    xmloff/source/draw/sdpropls \
+    xmloff/source/draw/sdxmlexp \
+    xmloff/source/draw/sdxmlimp \
+    xmloff/source/draw/shapeexport \
+    xmloff/source/draw/shapeexport2 \
+    xmloff/source/draw/shapeexport3 \
+    xmloff/source/draw/shapeexport4 \
+    xmloff/source/draw/shapeimport \
+    xmloff/source/draw/viewcontext \
+    xmloff/source/draw/xexptran \
+    xmloff/source/draw/ximp3dobject \
+    xmloff/source/draw/ximp3dscene \
+    xmloff/source/draw/ximpbody \
+    xmloff/source/draw/ximpcustomshape \
+    xmloff/source/draw/ximpgrp \
+    xmloff/source/draw/ximplink \
+    xmloff/source/draw/ximpnote \
+    xmloff/source/draw/ximppage \
+    xmloff/source/draw/ximpshap \
+    xmloff/source/draw/ximpshow \
+    xmloff/source/draw/ximpstyl \
+    xmloff/source/forms/attriblistmerge \
+    xmloff/source/forms/controlelement \
+    xmloff/source/forms/controlpropertyhdl \
+    xmloff/source/forms/controlpropertymap \
+    xmloff/source/forms/elementexport \
+    xmloff/source/forms/elementimport \
+    xmloff/source/forms/eventexport \
+    xmloff/source/forms/eventimport \
+    xmloff/source/forms/formattributes \
+    xmloff/source/forms/formcellbinding \
+    xmloff/source/forms/formenums \
+    xmloff/source/forms/formevents \
+    xmloff/source/forms/formlayerexport \
+    xmloff/source/forms/formlayerimport \
+    xmloff/source/forms/formsimp \
+    xmloff/source/forms/formstyles \
+    xmloff/source/forms/gridcolumnproptranslator \
+    xmloff/source/forms/layerexport \
+    xmloff/source/forms/layerimport \
+    xmloff/source/forms/logging \
+    xmloff/source/forms/officeforms \
+    xmloff/source/forms/propertyexport \
+    xmloff/source/forms/propertyimport \
+    xmloff/source/forms/property_meta_data \
+    xmloff/source/forms/strings \
+    xmloff/source/forms/valueproperties \
+    xmloff/source/forms/handler/form_handler_factory \
+    xmloff/source/forms/handler/property_handler_base \
+    xmloff/source/forms/handler/vcl_date_handler \
+    xmloff/source/forms/handler/vcl_time_handler \
+    xmloff/source/meta/MetaExportComponent \
+    xmloff/source/meta/MetaImportComponent \
+    xmloff/source/meta/xmlmetae \
+    xmloff/source/meta/xmlmetai \
+    xmloff/source/meta/xmlversion \
+    xmloff/source/script/XMLEventExport \
+    xmloff/source/script/XMLEventImportHelper \
+    xmloff/source/script/XMLEventsImportContext \
+    xmloff/source/script/XMLScriptContextFactory \
+    xmloff/source/script/XMLScriptExportHandler \
+    xmloff/source/script/XMLStarBasicContextFactory \
+    xmloff/source/script/XMLStarBasicExportHandler \
+    xmloff/source/script/xmlbasici \
+    xmloff/source/script/xmlscripti \
+    xmloff/source/style/AttributeContainerHandler \
+    xmloff/source/style/DashStyle \
+    xmloff/source/style/DrawAspectHdl \
+    xmloff/source/style/EnumPropertyHdl \
+    xmloff/source/style/FillStyleContext \
+    xmloff/source/style/GradientStyle \
+    xmloff/source/style/HatchStyle \
+    xmloff/source/style/ImageStyle \
+    xmloff/source/style/MarkerStyle \
+    xmloff/source/style/MultiPropertySetHelper \
+    xmloff/source/style/NamedBoolPropertyHdl \
+    xmloff/source/style/PageHeaderFooterContext \
+    xmloff/source/style/PageMasterExportPropMapper \
+    xmloff/source/style/PageMasterImportContext \
+    xmloff/source/style/PageMasterImportPropMapper \
+    xmloff/source/style/PageMasterPropHdl \
+    xmloff/source/style/PageMasterPropHdlFactory \
+    xmloff/source/style/PageMasterPropMapper \
+    xmloff/source/style/PageMasterStyleMap \
+    xmloff/source/style/PagePropertySetContext \
+    xmloff/source/style/SinglePropertySetInfoCache \
+    xmloff/source/style/StyleMap \
+    xmloff/source/style/TransGradientStyle \
+    xmloff/source/style/VisAreaContext \
+    xmloff/source/style/VisAreaExport \
+    xmloff/source/style/WordWrapPropertyHdl \
+    xmloff/source/style/XMLBackgroundImageContext \
+    xmloff/source/style/XMLBackgroundImageExport \
+    xmloff/source/style/XMLBitmapLogicalSizePropertyHandler \
+    xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler \
+    xmloff/source/style/XMLClipPropertyHandler \
+    xmloff/source/style/XMLConstantsPropertyHandler \
+    xmloff/source/style/XMLElementPropertyContext \
+    xmloff/source/style/XMLFillBitmapSizePropertyHandler \
+    xmloff/source/style/XMLFontAutoStylePool \
+    xmloff/source/style/XMLFontStylesContext \
+    xmloff/source/style/XMLFootnoteSeparatorExport \
+    xmloff/source/style/XMLFootnoteSeparatorImport \
+    xmloff/source/style/XMLIsPercentagePropertyHandler \
+    xmloff/source/style/XMLPageExport \
+    xmloff/source/style/XMLPercentOrMeasurePropertyHandler \
+    xmloff/source/style/XMLRectangleMembersHandler \
+    xmloff/source/style/adjushdl \
+    xmloff/source/style/backhdl \
+    xmloff/source/style/bordrhdl \
+    xmloff/source/style/breakhdl \
+    xmloff/source/style/cdouthdl \
+    xmloff/source/style/chrhghdl \
+    xmloff/source/style/chrlohdl \
+    xmloff/source/style/csmaphdl \
+    xmloff/source/style/durationhdl \
+    xmloff/source/style/escphdl \
+    xmloff/source/style/fonthdl \
+    xmloff/source/style/impastp1 \
+    xmloff/source/style/impastp2 \
+    xmloff/source/style/impastp3 \
+    xmloff/source/style/impastp4 \
+    xmloff/source/style/kernihdl \
+    xmloff/source/style/lspachdl \
+    xmloff/source/style/numehelp \
+    xmloff/source/style/opaquhdl \
+    xmloff/source/style/postuhdl \
+    xmloff/source/style/prhdlfac \
+    xmloff/source/style/prstylei \
+    xmloff/source/style/shadwhdl \
+    xmloff/source/style/shdwdhdl \
+    xmloff/source/style/styleexp \
+    xmloff/source/style/tabsthdl \
+    xmloff/source/style/undlihdl \
+    xmloff/source/style/uniref \
+    xmloff/source/style/weighhdl \
+    xmloff/source/style/xmlaustp \
+    xmloff/source/style/xmlbahdl \
+    xmloff/source/style/xmlexppr \
+    xmloff/source/style/xmlimppr \
+    xmloff/source/style/xmlnume \
+    xmloff/source/style/xmlnumfe \
+    xmloff/source/style/xmlnumfi \
+    xmloff/source/style/xmlnumi \
+    xmloff/source/style/xmlprcon \
+    xmloff/source/style/xmlprhdl \
+    xmloff/source/style/xmlprmap \
+    xmloff/source/style/xmlstyle \
+    xmloff/source/style/xmltabe \
+    xmloff/source/style/xmltabi \
+    xmloff/source/table/XMLTableExport \
+    xmloff/source/table/XMLTableImport \
+    xmloff/source/text/XMLAutoMarkFileContext \
+    xmloff/source/text/XMLAutoTextContainerEventImport \
+    xmloff/source/text/XMLAutoTextEventExport \
+    xmloff/source/text/XMLAutoTextEventImport \
+    xmloff/source/text/XMLCalculationSettingsContext \
+    xmloff/source/text/XMLChangeElementImportContext \
+    xmloff/source/text/XMLChangeImportContext \
+    xmloff/source/text/XMLChangeInfoContext \
+    xmloff/source/text/XMLChangedRegionImportContext \
+    xmloff/source/text/XMLFootnoteBodyImportContext \
+    xmloff/source/text/XMLFootnoteConfigurationImportContext \
+    xmloff/source/text/XMLFootnoteImportContext \
+    xmloff/source/text/XMLIndexAlphabeticalSourceContext \
+    xmloff/source/text/XMLIndexBibliographyConfigurationContext \
+    xmloff/source/text/XMLIndexBibliographyEntryContext \
+    xmloff/source/text/XMLIndexBibliographySourceContext \
+    xmloff/source/text/XMLIndexBodyContext \
+    xmloff/source/text/XMLIndexChapterInfoEntryContext \
+    xmloff/source/text/XMLIndexIllustrationSourceContext \
+    xmloff/source/text/XMLIndexMarkExport \
+    xmloff/source/text/XMLIndexObjectSourceContext \
+    xmloff/source/text/XMLIndexSimpleEntryContext \
+    xmloff/source/text/XMLIndexSourceBaseContext \
+    xmloff/source/text/XMLIndexSpanEntryContext \
+    xmloff/source/text/XMLIndexTOCContext \
+    xmloff/source/text/XMLIndexTOCSourceContext \
+    xmloff/source/text/XMLIndexTOCStylesContext \
+    xmloff/source/text/XMLIndexTabStopEntryContext \
+    xmloff/source/text/XMLIndexTableSourceContext \
+    xmloff/source/text/XMLIndexTemplateContext \
+    xmloff/source/text/XMLIndexTitleTemplateContext \
+    xmloff/source/text/XMLIndexUserSourceContext \
+    xmloff/source/text/XMLLineNumberingExport \
+    xmloff/source/text/XMLLineNumberingImportContext \
+    xmloff/source/text/XMLLineNumberingSeparatorImportContext \
+    xmloff/source/text/XMLPropertyBackpatcher \
+    xmloff/source/text/XMLRedlineExport \
+    xmloff/source/text/XMLSectionExport \
+    xmloff/source/text/XMLSectionFootnoteConfigExport \
+    xmloff/source/text/XMLSectionFootnoteConfigImport \
+    xmloff/source/text/XMLSectionImportContext \
+    xmloff/source/text/XMLSectionSourceDDEImportContext \
+    xmloff/source/text/XMLSectionSourceImportContext \
+    xmloff/source/text/XMLStringBufferImportContext \
+    xmloff/source/text/XMLTextCharStyleNamesElementExport \
+    xmloff/source/text/XMLTextColumnsContext \
+    xmloff/source/text/XMLTextColumnsExport \
+    xmloff/source/text/XMLTextFrameContext \
+    xmloff/source/text/XMLTextFrameHyperlinkContext \
+    xmloff/source/text/XMLTextHeaderFooterContext \
+    xmloff/source/text/XMLTextListAutoStylePool \
+    xmloff/source/text/XMLTextListBlockContext \
+    xmloff/source/text/XMLTextListItemContext \
+    xmloff/source/text/XMLTextMarkImportContext \
+    xmloff/source/text/XMLTextMasterPageContext \
+    xmloff/source/text/XMLTextMasterPageExport \
+    xmloff/source/text/XMLTextMasterStylesContext \
+    xmloff/source/text/XMLTextNumRuleInfo \
+    xmloff/source/text/XMLTextPropertySetContext \
+    xmloff/source/text/XMLTextShapeImportHelper \
+    xmloff/source/text/XMLTextShapeStyleContext \
+    xmloff/source/text/XMLTextTableContext \
+    xmloff/source/text/XMLTrackedChangesImportContext \
+    xmloff/source/text/txtdrope \
+    xmloff/source/text/txtdropi \
+    xmloff/source/text/txtexppr \
+    xmloff/source/text/txtflde \
+    xmloff/source/text/txtfldi \
+    xmloff/source/text/txtftne \
+    xmloff/source/text/txtimp \
+    xmloff/source/text/txtimppr \
+    xmloff/source/text/txtlists \
+    xmloff/source/text/txtparae \
+    xmloff/source/text/txtparai \
+    xmloff/source/text/txtprhdl \
+    xmloff/source/text/txtprmap \
+    xmloff/source/text/txtsecte \
+    xmloff/source/text/txtstyle \
+    xmloff/source/text/txtstyli \
+    xmloff/source/text/txtvfldi \
+    xmloff/source/xforms/SchemaContext \
+    xmloff/source/xforms/SchemaRestrictionContext \
+    xmloff/source/xforms/SchemaSimpleTypeContext \
+    xmloff/source/xforms/TokenContext \
+    xmloff/source/xforms/XFormsBindContext \
+    xmloff/source/xforms/XFormsInstanceContext \
+    xmloff/source/xforms/XFormsModelContext \
+    xmloff/source/xforms/XFormsSubmissionContext \
+    xmloff/source/xforms/xformsapi \
+    xmloff/source/xforms/xformsexport \
+    xmloff/source/xforms/xformsimport \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
new file mode 100755
index 0000000000..455daadaf6
--- /dev/null
+++ b/xmloff/Library_xof.mk
@@ -0,0 +1,93 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,xof))
+
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+
+$(eval $(call gb_Library_set_include,xof,\
+    -I$(SRCDIR)/xmloff/inc/pch \
+    -I$(SRCDIR)/xmloff/inc \
+    -I$(SRCDIR)/xmloff/source/inc \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xof,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+    stl \
+    xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xof,\
+    xmloff/source/transform/ChartOASISTContext \
+    xmloff/source/transform/ChartOOoTContext \
+    xmloff/source/transform/ChartPlotAreaOASISTContext \
+    xmloff/source/transform/ChartPlotAreaOOoTContext \
+    xmloff/source/transform/ControlOASISTContext \
+    xmloff/source/transform/ControlOOoTContext \
+    xmloff/source/transform/CreateElemTContext \
+    xmloff/source/transform/DeepTContext \
+    xmloff/source/transform/DlgOASISTContext \
+    xmloff/source/transform/DocumentTContext \
+    xmloff/source/transform/EventMap \
+    xmloff/source/transform/EventOASISTContext \
+    xmloff/source/transform/EventOOoTContext \
+    xmloff/source/transform/FlatTContext \
+    xmloff/source/transform/FormPropOASISTContext \
+    xmloff/source/transform/FormPropOOoTContext \
+    xmloff/source/transform/FrameOASISTContext \
+    xmloff/source/transform/FrameOOoTContext \
+    xmloff/source/transform/IgnoreTContext \
+    xmloff/source/transform/MergeElemTContext \
+    xmloff/source/transform/MetaTContext \
+    xmloff/source/transform/MutableAttrList \
+    xmloff/source/transform/NotesTContext \
+    xmloff/source/transform/OOo2Oasis \
+    xmloff/source/transform/Oasis2OOo \
+    xmloff/source/transform/PersAttrListTContext \
+    xmloff/source/transform/PersMixedContentTContext \
+    xmloff/source/transform/ProcAddAttrTContext \
+    xmloff/source/transform/ProcAttrTContext \
+    xmloff/source/transform/PropertyActionsOASIS \
+    xmloff/source/transform/PropertyActionsOOo \
+    xmloff/source/transform/RenameElemTContext \
+    xmloff/source/transform/StyleOASISTContext \
+    xmloff/source/transform/StyleOOoTContext \
+    xmloff/source/transform/TransformerActions \
+    xmloff/source/transform/TransformerBase \
+    xmloff/source/transform/TransformerContext \
+    xmloff/source/transform/TransformerTokenMap \
+    xmloff/source/transform/XMLFilterRegistration \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Makefile b/xmloff/Makefile
new file mode 100755
index 0000000000..a79aff8310
--- /dev/null
+++ b/xmloff/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/source/sdr/primitive3d/makefile.mk b/xmloff/Module_xmloff.mk
index c845cadc90..74a1aa3aaa 100644..100755
--- a/svx/source/sdr/primitive3d/makefile.mk
+++ b/xmloff/Module_xmloff.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,18 +25,20 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-PRJNAME=svx
-TARGET=primitive3d
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Module_Module,xmloff))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,xmloff,\
+    Library_xo \
+    Library_xof \
+    Package_dtd \
+    Package_inc \
+))
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
+    JunitTest_xmloff_unoapi \
+))
 
-# --- Files --------------------------------------------------------
+#todo: map file
+#todo: xmlkywd.lib - built, but never used?!
 
-SLOFILES=\
-        $(SLO)$/sdrattributecreator3d.obj
-
-.INCLUDE :  target.mk
+# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
new file mode 100755
index 0000000000..7f2d5a4e0f
--- /dev/null
+++ b/xmloff/Package_dtd.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod))
+$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod))
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
new file mode 100755
index 0000000000..4e11c2b4b5
--- /dev/null
+++ b/xmloff/Package_inc.mk
@@ -0,0 +1,131 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaExport.hxx,xmloff/VisAreaExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyle.hxx,xmloff/txtstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlkywd.hxx,xmloff/xmlkywd.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx))
+$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx))
diff --git a/xmloff/dtd/Blocklist.dtd b/xmloff/dtd/Blocklist.dtd
index f7bb8eb321..f7bb8eb321 100644..100755
--- a/xmloff/dtd/Blocklist.dtd
+++ b/xmloff/dtd/Blocklist.dtd
diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod
index e72bab68c3..e72bab68c3 100644..100755
--- a/xmloff/dtd/chart.mod
+++ b/xmloff/dtd/chart.mod
diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod
index daacfad66f..daacfad66f 100644..100755
--- a/xmloff/dtd/datastyl.mod
+++ b/xmloff/dtd/datastyl.mod
diff --git a/xmloff/dtd/defs.mod b/xmloff/dtd/defs.mod
index 98c964fe99..98c964fe99 100644..100755
--- a/xmloff/dtd/defs.mod
+++ b/xmloff/dtd/defs.mod
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index 93d7544b4f..93d7544b4f 100644..100755
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod
index 4de538ced1..4de538ced1 100644..100755
--- a/xmloff/dtd/dtypes.mod
+++ b/xmloff/dtd/dtypes.mod
diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod
index 511fb180f4..511fb180f4 100644..100755
--- a/xmloff/dtd/form.mod
+++ b/xmloff/dtd/form.mod
diff --git a/xmloff/dtd/meta.mod b/xmloff/dtd/meta.mod
index 1ea845bcb0..1ea845bcb0 100644..100755
--- a/xmloff/dtd/meta.mod
+++ b/xmloff/dtd/meta.mod
diff --git a/xmloff/dtd/nmspace.mod b/xmloff/dtd/nmspace.mod
index addcdc5922..addcdc5922 100644..100755
--- a/xmloff/dtd/nmspace.mod
+++ b/xmloff/dtd/nmspace.mod
diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd
index c66bc8d2ad..c66bc8d2ad 100644..100755
--- a/xmloff/dtd/office.dtd
+++ b/xmloff/dtd/office.dtd
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index a7d50df0cf..a7d50df0cf 100644..100755
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
diff --git a/xmloff/dtd/openoffice-2.0-schema.rng b/xmloff/dtd/openoffice-2.0-schema.rng
index 36a3198766..36a3198766 100644..100755
--- a/xmloff/dtd/openoffice-2.0-schema.rng
+++ b/xmloff/dtd/openoffice-2.0-schema.rng
diff --git a/xmloff/dtd/script.mod b/xmloff/dtd/script.mod
index 5e255ac6df..5e255ac6df 100644..100755
--- a/xmloff/dtd/script.mod
+++ b/xmloff/dtd/script.mod
diff --git a/xmloff/dtd/settings.mod b/xmloff/dtd/settings.mod
index bb9224237f..bb9224237f 100644..100755
--- a/xmloff/dtd/settings.mod
+++ b/xmloff/dtd/settings.mod
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index fef8f73630..fef8f73630 100644..100755
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod
index be30da5429..be30da5429 100644..100755
--- a/xmloff/dtd/table.mod
+++ b/xmloff/dtd/table.mod
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 909321312d..909321312d 100644..100755
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index be052573e8..be052573e8 100644..100755
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 159c7f58c3..027749d7df 100644..100755
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -67,12 +67,12 @@ public:
 
     /** default constructor: create new DOM tree */
     DomBuilderContext( SvXMLImport& rImport, 
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName );
 
     /** constructor: create DOM subtree under the given node */
     DomBuilderContext( SvXMLImport& rImport, 
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const ::rtl::OUString& rLocalName,
                        com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& );
 
@@ -95,7 +95,7 @@ public:
     //
 
     virtual SvXMLImportContext* CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index 4eb463ab54..4eb463ab54 100644..100755
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index df3ebbceb8..df3ebbceb8 100644..100755
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index de9d6c2551..de9d6c2551 100644..100755
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 17e7b1f4a7..17e7b1f4a7 100644..100755
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index c399b87df2..c399b87df2 100644..100755
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 0ec6c8ce0e..0ec6c8ce0e 100644..100755
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index 5ba830c269..5ba830c269 100644..100755
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 9228e6fd72..9228e6fd72 100644..100755
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 5e854b9535..5e854b9535 100644..100755
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index f27fc49803..f27fc49803 100644..100755
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index ce878a138a..c033eadaf0 100644..100755
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -91,13 +91,6 @@ enum SchXMLSeriesElemTokenMap
     XML_TOK_SERIES_ERROR_INDICATOR
 };
 
-enum SchXMLAxisElemTokenMap
-{
-    XML_TOK_AXIS_TITLE,
-    XML_TOK_AXIS_CATEGORIES,
-    XML_TOK_AXIS_GRID
-};
-
 // ----------------------------------------
 
 enum SchXMLChartAttrMap
@@ -135,21 +128,6 @@ enum SchXMLPlotAreaAttrTokenMap
     XML_TOK_PA_LIGHTING_MODE
 };
 
-enum SchXMLAxisAttrTokenMap
-{
-    XML_TOK_AXIS_DIMENSION,
-    XML_TOK_AXIS_NAME,
-    XML_TOK_AXIS_STYLE_NAME
-};
-
-enum SchXMLLegendAttrMap
-{
-    XML_TOK_LEGEND_POSITION,
-    XML_TOK_LEGEND_X,
-    XML_TOK_LEGEND_Y,
-    XML_TOK_LEGEND_STYLE_NAME
-};
-
 enum SchXMLAutoStyleAttrMap
 {
     XML_TOK_AS_FAMILY,
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 1805133ffc..1805133ffc 100644..100755
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index 15f875c3f2..15f875c3f2 100644..100755
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 9db309d367..9db309d367 100644..100755
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index 16190b8f0e..16190b8f0e 100644..100755
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index 15b7be83b8..15b7be83b8 100644..100755
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index b3fc4611f3..b3fc4611f3 100644..100755
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index 57e22d7152..57e22d7152 100644..100755
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 90597b5bb9..90597b5bb9 100644..100755
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index dee7623615..dee7623615 100644..100755
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index f7d4c4d882..f7d4c4d882 100644..100755
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index e67f4dd86a..e67f4dd86a 100644..100755
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 6d9355eda9..6d9355eda9 100644..100755
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 329a1e5451..fa8ae86e60 100644..100755
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -53,14 +53,14 @@ public:
     // #100592#
     const ::rtl::OUString& GetFilterCLSID() const { return sCLSID; }
 
-    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLEmbeddedObjectImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index df376472c1..df376472c1 100644..100755
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index e52035dab6..e52035dab6 100644..100755
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index d85275fcd9..96067991e6 100644..100755
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -93,7 +93,7 @@ public:
 
     /// for footnotes, also parse begin and end notices
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 2803333706..76b1f6fc15 100644..100755
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -66,7 +66,7 @@ public:
     virtual ~XMLImageMapContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 8d298eb77d..8d298eb77d 100644..100755
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 5ed828d135..5ed828d135 100644..100755
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index 275dc30cdd..275dc30cdd 100644..100755
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index d7e589817c..d7e589817c 100644..100755
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 84260eca28..7a1570c886 100644..100755
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -70,7 +70,7 @@ public:
 
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     sal_Int32 GetDrawKey() const { return mnKey; }
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index a3195d0cba..a3195d0cba 100644..100755
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 0bc73833fb..0bc73833fb 100644..100755
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index a0769d936c..a0769d936c 100644..100755
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index 9d9872aae9..9d9872aae9 100644..100755
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index 2223f3fb15..2223f3fb15 100644..100755
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index 6b1f526714..8dfd62d886 100644..100755
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -53,7 +53,7 @@ public:
     virtual void EndElement();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index c317c1539e..c317c1539e 100644..100755
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 4a1060eef0..4a1060eef0 100644..100755
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index ce095a0716..68bafaf6ce 100644..100755
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -56,7 +56,7 @@ public:
     virtual ~XMLStringBufferImportContext();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 779f2e78aa..779f2e78aa 100644..100755
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index abbaeeee58..abbaeeee58 100644..100755
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index a8ae44638e..a8ae44638e 100644..100755
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 62462b3f57..62462b3f57 100644..100755
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 37a388725f..37a388725f 100644..100755
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
diff --git a/xmloff/inc/animationexport.hxx b/xmloff/inc/animationexport.hxx
index aab13d8593..aab13d8593 100644..100755
--- a/xmloff/inc/animationexport.hxx
+++ b/xmloff/inc/animationexport.hxx
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 3b4d3b3203..f372d25820 100644..100755
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -61,7 +61,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps );
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index c0f879b189..c0f879b189 100644..100755
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index e23128f713..537319f840 100644..100755
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -50,7 +50,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLAnimationsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/connectivity/qa/connectivity/GeneralTest.java b/xmloff/inc/forms/form_handler_factory.hxx
index 374f76cf73..8752b8384f 100644..100755
--- a/connectivity/qa/connectivity/GeneralTest.java
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -1,7 +1,6 @@
 /*************************************************************************
- *
  * 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
@@ -24,39 +23,28 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-package complex.connectivity;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.sdbc.*;
 
-import com.sun.star.lang.XMultiServiceFactory;
+#ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX
+#define XMLOFF_FORM_HANDLER_FACTORY_HXX
 
-import complexlib.ComplexTestCase;
+#include "forms/property_handler.hxx"
 
- 
-//import complex.connectivity.DBaseStringFunctions;
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
 
-public class GeneralTest  extends ComplexTestCase {
+    //==================================================================================================================
+    //= FormHandlerFactory
+    //==================================================================================================================
+    class FormHandlerFactory
+    {
+    public:
+        static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId );
+    };
 
-    public String[] getTestMethodNames() {
-        return new String[] { "test" };
-    }
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
 
-    public String getTestObjectName() {
-        return "GeneralTest";
-    }
-    public void assure2(String s,boolean b){
-        assure(s,b);
-    }
-    
-    public void test() throws com.sun.star.uno.Exception,com.sun.star.beans.UnknownPropertyException {
-        try
-        {
-            XDriverManager driverManager = UnoRuntime.queryInterface( XDriverManager.class, ((XMultiServiceFactory)param.getMSF()).createInstance( "com.sun.star.sdbc.DriverManager" ) );
-            String databaseURL = "sdbc:calc:singin' in the rain" ;
-            XConnection catalogConnection = driverManager.getConnection(databaseURL);
-            failed();
-        }
-        catch(SQLException e){}
-    }
-}
+#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
new file mode 100755
index 0000000000..d2675ba58a
--- /dev/null
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_HANDLER_HXX
+#define XMLOFF_PROPERTY_HANDLER_HXX
+
+#include "forms/property_ids.hxx"
+
+#include <com/sun/star/uno/Any.hxx>
+
+#include <rtl/ref.hxx>
+
+#include <map>
+#include <vector>
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    typedef ::std::map< PropertyId, ::com::sun::star::uno::Any >    PropertyValues;
+
+    //==================================================================================================================
+    //= IPropertyHandler
+    //==================================================================================================================
+    class IPropertyHandler : public ::rtl::IReference
+    {
+    public:
+        /** retrieves the XML attribute value for the given property values
+        */
+        virtual ::rtl::OUString
+            getAttributeValue( const PropertyValues& i_propertyValues ) const = 0;
+
+        /** is a convenience method for XML attributes whose value comprises of only one UNO API property
+        */
+        virtual ::rtl::OUString
+            getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0;
+
+        /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value
+        */
+        virtual bool
+            getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0;
+
+        virtual ~IPropertyHandler() { }
+    };
+
+    //==================================================================================================================
+    //= PPropertyHandler
+    //==================================================================================================================
+    typedef ::rtl::Reference< IPropertyHandler >    PPropertyHandler;
+
+    //==================================================================================================================
+    //= PropertyHandlerFactory
+    //==================================================================================================================
+    typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId );
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_HANDLER_HXX
diff --git a/xmloff/inc/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
new file mode 100755
index 0000000000..31004f2d9f
--- /dev/null
+++ b/xmloff/inc/forms/property_ids.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_IDS_HXX
+#define XMLOFF_PROPERTY_IDS_HXX
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PropertyId
+    //==================================================================================================================
+    enum PropertyId
+    {
+        PID_DATE_MIN,
+        PID_DATE_MAX,
+        PID_DEFAULT_DATE,
+        PID_DATE,
+        PID_TIME_MIN,
+        PID_TIME_MAX,
+        PID_DEFAULT_TIME,
+        PID_TIME,
+
+        PID_INVALID
+    };
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_IDS_HXX
diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/functional.hxx
index e3ebb6d004..e3ebb6d004 100644..100755
--- a/xmloff/inc/functional.hxx
+++ b/xmloff/inc/functional.hxx
diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk
deleted file mode 100644
index db706e2930..0000000000
--- a/xmloff/inc/makefile.mk
+++ /dev/null
@@ -1,48 +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=xmloff
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/xmloff/inc/pch/precompiled_xmloff.cxx b/xmloff/inc/pch/precompiled_xmloff.cxx
index 17974bf080..17974bf080 100644..100755
--- a/xmloff/inc/pch/precompiled_xmloff.cxx
+++ b/xmloff/inc/pch/precompiled_xmloff.cxx
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 22f11be546..22f11be546 100644..100755
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 97b6113b58..1893c38a90 100644..100755
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -34,7 +34,7 @@
 #define _XMLOFF_TXTFLDE_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 6e17b123e2..1db9f75793 100644..100755
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1384,7 +1384,7 @@ protected:
         ::com::sun::star::beans::XPropertySet> & xPropertySet);
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -1480,7 +1480,7 @@ public:
                                     const ::rtl::OUString& sLocalName);
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index ac90f7f024..ac90f7f024 100644..100755
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 3899aba81d..3899aba81d 100644..100755
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
diff --git a/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx b/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx
index bc8e3a7cf9..bc8e3a7cf9 100644..100755
--- a/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx
+++ b/xmloff/inc/unointerfacetouniqueidentifiermapper.hxx
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 1036650bb2..1036650bb2 100644..100755
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx
index 3b844b9189..3b844b9189 100644..100755
--- a/xmloff/inc/xmlehelp.hxx
+++ b/xmloff/inc/xmlehelp.hxx
diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/xmloff/DashStyle.hxx
index 7f6e553a98..7f6e553a98 100644..100755
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/xmloff/DashStyle.hxx
diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
index 171bbd1c40..8985abe4e2 100644..100755
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
@@ -44,12 +44,12 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
     ::std::auto_ptr< XMLDocumentSettingsContext_Data >  m_pData;
 
 public:
-    XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLDocumentSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
index 8d67995284..8d67995284 100644..100755
--- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/xmloff/GradientStyle.hxx
index 6ccd3c942d..6ccd3c942d 100644..100755
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/xmloff/GradientStyle.hxx
diff --git a/xmloff/inc/HatchStyle.hxx b/xmloff/inc/xmloff/HatchStyle.hxx
index a9a178f6cf..a9a178f6cf 100644..100755
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/xmloff/HatchStyle.hxx
diff --git a/xmloff/inc/ImageStyle.hxx b/xmloff/inc/xmloff/ImageStyle.hxx
index aadc84a9c9..aadc84a9c9 100644..100755
--- a/xmloff/inc/ImageStyle.hxx
+++ b/xmloff/inc/xmloff/ImageStyle.hxx
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/xmloff/MarkerStyle.hxx
index d876830211..d876830211 100644..100755
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/xmloff/MarkerStyle.hxx
diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
index 2cb3b50d77..2cb3b50d77 100644..100755
--- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index 741d933798..741d933798 100644..100755
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index ff35ded204..ff35ded204 100644..100755
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
diff --git a/xmloff/inc/xmloff/PropertySetInfoHash.hxx b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
index ee02e1b8c7..ee02e1b8c7 100644..100755
--- a/xmloff/inc/xmloff/PropertySetInfoHash.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
diff --git a/xmloff/inc/xmloff/PropertySetInfoKey.hxx b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
index 3cbbe6d3f8..3cbbe6d3f8 100644..100755
--- a/xmloff/inc/xmloff/PropertySetInfoKey.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index 3a909f3743..3a909f3743 100644..100755
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index 55e518a5e3..9fe277b901 100644..100755
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -81,12 +81,9 @@ private:
     SvXMLTokenMap* mpChartElemTokenMap;
     SvXMLTokenMap* mpPlotAreaElemTokenMap;
     SvXMLTokenMap* mpSeriesElemTokenMap;
-    SvXMLTokenMap* mpAxisElemTokenMap;
 
     SvXMLTokenMap* mpChartAttrTokenMap;
     SvXMLTokenMap* mpPlotAreaAttrTokenMap;
-    SvXMLTokenMap* mpAxisAttrTokenMap;
-    SvXMLTokenMap* mpLegendAttrTokenMap;
     SvXMLTokenMap* mpAutoStyleAttrTokenMap;
     SvXMLTokenMap* mpCellAttrTokenMap;
     SvXMLTokenMap* mpSeriesAttrTokenMap;
@@ -124,12 +121,9 @@ public:
     const SvXMLTokenMap& GetChartElemTokenMap();
     const SvXMLTokenMap& GetPlotAreaElemTokenMap();
     const SvXMLTokenMap& GetSeriesElemTokenMap();
-    const SvXMLTokenMap& GetAxisElemTokenMap();
-
+    
     const SvXMLTokenMap& GetChartAttrTokenMap();
     const SvXMLTokenMap& GetPlotAreaAttrTokenMap();
-    const SvXMLTokenMap& GetAxisAttrTokenMap();
-    const SvXMLTokenMap& GetLegendAttrTokenMap();
     const SvXMLTokenMap& GetAutoStyleAttrTokenMap();
     const SvXMLTokenMap& GetCellAttrTokenMap();
     const SvXMLTokenMap& GetSeriesAttrTokenMap();
@@ -137,9 +131,9 @@ public:
 
     static sal_uInt16 GetChartFamilyID() { return XML_STYLE_FAMILY_SCH_CHART_ID; }
 
-    /** @param bPushLastChartType If </FALSE>, in case a new chart type has to
+    /** @param bPushLastChartType If </sal_False>, in case a new chart type has to
                be added (because it does not exist yet), it is appended at the
-               end of the chart-type container.  When </TRUE>, a new chart type
+               end of the chart-type container.  When </sal_True>, a new chart type
                is added at one position before the last one, i.e. the formerly
                last chart type is pushed back, so that it remains the last one.
 
diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx
index 115ddadeb8..115ddadeb8 100644..100755
--- a/xmloff/inc/xmloff/SettingsExportHelper.hxx
+++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx
diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
index fa9a69de03..fa9a69de03 100644..100755
--- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
+++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
index bf5768cffc..14f1d9a55c 100644..100755
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/xmloff/VisAreaContext.hxx
@@ -42,19 +42,19 @@ class XMLVisAreaContext : public SvXMLImportContext
 {
 public:
     // read all attributes and set the values in rRect
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       Rectangle& rRect, const MapUnit aMapUnit);
 
-    XMLVisAreaContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit);
 
     virtual ~XMLVisAreaContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/xmloff/VisAreaExport.hxx
index 46643659a3..46643659a3 100644..100755
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/xmloff/VisAreaExport.hxx
diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
index ea57ad3154..ea57ad3154 100644..100755
--- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
index f12cd1ebaa..7273ba6212 100644..100755
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
@@ -46,7 +46,7 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext
 public:
     TYPEINFO();
 
-    XMLBase64ImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                             const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/xmloff/inc/xmloff/XMLCharContext.hxx
index 06881b274e..06881b274e 100644..100755
--- a/xmloff/inc/xmloff/XMLCharContext.hxx
+++ b/xmloff/inc/xmloff/XMLCharContext.hxx
diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
index 41c063753f..41c063753f 100644..100755
--- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 3d98a51189..3d98a51189 100644..100755
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx
index cd030fb62c..cd030fb62c 100644..100755
--- a/xmloff/inc/xmloff/XMLEventExport.hxx
+++ b/xmloff/inc/xmloff/XMLEventExport.hxx
diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
index 669190a9fb..669190a9fb 100644..100755
--- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
diff --git a/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/xmloff/XMLFilterServiceNames.h
index 31be57ee6a..31be57ee6a 100644..100755
--- a/xmloff/inc/XMLFilterServiceNames.h
+++ b/xmloff/inc/xmloff/XMLFilterServiceNames.h
diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
index 114b790a8e..114b790a8e 100644..100755
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index ec891cd6f8..ec891cd6f8 100644..100755
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
index de6f2fc069..de6f2fc069 100644..100755
--- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx
index 914462693c..914462693c 100644..100755
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLPageExport.hxx
diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
index 2847cf0dee..2847cf0dee 100644..100755
--- a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
+++ b/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
index 27a428e690..27a428e690 100644..100755
--- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/xmloff/inc/xmloff/XMLStringVector.hxx
index 6e933fbe50..6e933fbe50 100644..100755
--- a/xmloff/inc/xmloff/XMLStringVector.hxx
+++ b/xmloff/inc/xmloff/XMLStringVector.hxx
diff --git a/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
index 05df26c09b..05df26c09b 100644..100755
--- a/xmloff/inc/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
index 45c9e00984..45c9e00984 100644..100755
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
index ef12331b7c..ef12331b7c 100644..100755
--- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
index 632de6592a..632de6592a 100644..100755
--- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
index ca6907660c..ca6907660c 100644..100755
--- a/xmloff/source/text/XMLTextShapeImportHelper.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
index 60b837917f..60b837917f 100644..100755
--- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/xmloff/inc/xmloff/XMLTextTableContext.hxx
index e07cda5855..e07cda5855 100644..100755
--- a/xmloff/inc/xmloff/XMLTextTableContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextTableContext.hxx
diff --git a/xmloff/inc/xmloff/animexp.hxx b/xmloff/inc/xmloff/animexp.hxx
index 3af1585b29..3af1585b29 100644..100755
--- a/xmloff/inc/xmloff/animexp.hxx
+++ b/xmloff/inc/xmloff/animexp.hxx
diff --git a/xmloff/inc/xmloff/attrlist.hxx b/xmloff/inc/xmloff/attrlist.hxx
index efc034da46..efc034da46 100644..100755
--- a/xmloff/inc/xmloff/attrlist.hxx
+++ b/xmloff/inc/xmloff/attrlist.hxx
diff --git a/xmloff/inc/xmloff/contextid.hxx b/xmloff/inc/xmloff/contextid.hxx
index 4e81e79bdb..4e81e79bdb 100644..100755
--- a/xmloff/inc/xmloff/contextid.hxx
+++ b/xmloff/inc/xmloff/contextid.hxx
diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx
index cc06f1a3dc..cc06f1a3dc 100644..100755
--- a/xmloff/inc/xmloff/controlpropertyhdl.hxx
+++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx
diff --git a/xmloff/inc/xmloff/dllapi.h b/xmloff/inc/xmloff/dllapi.h
index 61bd1ce03d..61bd1ce03d 100644..100755
--- a/xmloff/inc/xmloff/dllapi.h
+++ b/xmloff/inc/xmloff/dllapi.h
diff --git a/xmloff/inc/xmloff/families.hxx b/xmloff/inc/xmloff/families.hxx
index 74e7c51f08..74e7c51f08 100644..100755
--- a/xmloff/inc/xmloff/families.hxx
+++ b/xmloff/inc/xmloff/families.hxx
diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx
index 1ff5491015..7ea504276f 100644..100755
--- a/xmloff/inc/xmloff/formlayerexport.hxx
+++ b/xmloff/inc/xmloff/formlayerexport.hxx
@@ -166,9 +166,6 @@ namespace xmloff
         */
         bool documentContainsXForms() const;
 
-        /// retrieves the property mapper for control styles
-        ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper();
-
         /** exports the controls number styles
         */
         void exportControlNumberStyles();
diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx
index 6dcdcda414..3330786c4e 100644..100755
--- a/xmloff/inc/xmloff/formlayerimport.hxx
+++ b/xmloff/inc/xmloff/formlayerimport.hxx
@@ -63,11 +63,6 @@ namespace xmloff
         OFormLayerXMLImport(SvXMLImport& _rImporter);
         ~OFormLayerXMLImport();
 
-        /** retrieves the property mapper form form related auto styles.
-        */
-        ::rtl::Reference< SvXMLImportPropertyMapper >
-                getStylePropertyMapper() const;
-
         /** start importing the forms of the given page
 
             <p>starting the import of a new page (by using this method) invalidates the current page position
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
index 2e28ee2965..4c4fafccaa 100644..100755
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ b/xmloff/inc/xmloff/formsimp.hxx
@@ -42,7 +42,7 @@ public:
     XMLFormsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName);
     virtual ~XMLFormsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/sfx2/source/appl/sfxdll.cxx b/xmloff/inc/xmloff/functional.hxx
index 0064118a53..0951d7dbff 100644..100755
--- a/sfx2/source/appl/sfxdll.cxx
+++ b/xmloff/inc/xmloff/functional.hxx
@@ -26,40 +26,31 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
+#ifndef _XMLOFF_FUNCTIONAL_HXX
+#define _XMLOFF_FUNCTIONAL_HXX
 
-#ifdef WIN
-#include <svwin.h>
+#include <rtl/ustring.hxx>
 
-// Static DLL Administrative variables
-static HINSTANCE hDLLInst = 0;
+/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */
 
-//==========================================================================
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-
-//--------------------------------------------------------------------------
+/** @#file
+ *
+ * re-implement STL functors as needed
+ *
+ * The standard comparison operators from the STL cause warnings with
+ * several compilers about our sal_Bool (=unsigned char) being
+ * converted to bool (C++ bool). We wish to avoid that.
+ */
 
-extern "C" int CALLBACK WEP( int )
+struct less_functor
 {
-    return 1;
-}
+    bool operator()(const ::rtl::OUString& x, 
+                    const ::rtl::OUString& y) const
+    {
+        return 0 != (x<y);
+    }
+};
 
 
-//==========================================================================
-
 #endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/i18nmap.hxx b/xmloff/inc/xmloff/i18nmap.hxx
index 94e0975200..6083ad299f 100644..100755
--- a/xmloff/inc/i18nmap.hxx
+++ b/xmloff/inc/xmloff/i18nmap.hxx
@@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC SvI18NMap
 {
     SvI18NMap_Impl		*pImpl;
 
-    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( USHORT nKind,
+    SAL_DLLPRIVATE SvI18NMapEntry_Impl *_Find( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 
 public:
@@ -56,12 +56,12 @@ public:
     ~SvI18NMap();
 
     // Add a name mapping
-    void Add( USHORT nKind, const ::rtl::OUString& rName,
+    void Add( sal_uInt16 nKind, const ::rtl::OUString& rName,
               const ::rtl::OUString& rNewName );
     
     // Return a mapped name. If the name could not be found, return the
     // original name.
-    const ::rtl::OUString& Get( USHORT nKind,
+    const ::rtl::OUString& Get( sal_uInt16 nKind,
                                 const ::rtl::OUString& rName ) const;
 };
 
diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx
index d96e28bf82..d96e28bf82 100644..100755
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/xmloff/inc/xmloff/maptype.hxx
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 7b4e0f01f9..7b4e0f01f9 100644..100755
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx
index 2d1d981e0c..2d1d981e0c 100644..100755
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/xmloff/numehelp.hxx
diff --git a/xmloff/inc/xmloff/odffields.hxx b/xmloff/inc/xmloff/odffields.hxx
index 4d772c18de..4d772c18de 100644..100755
--- a/xmloff/inc/xmloff/odffields.hxx
+++ b/xmloff/inc/xmloff/odffields.hxx
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/xmloff/inc/xmloff/prhdlfac.hxx
index 0d906f63bc..0d906f63bc 100644..100755
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/xmloff/inc/xmloff/prhdlfac.hxx
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index bf90a2ecd5..bf90a2ecd5 100644..100755
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx
index 2f8ef85c17..2f8ef85c17 100644..100755
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/xmloff/inc/xmloff/shapeexport.hxx
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index 4473aef0f4..c2660853e8 100644..100755
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -204,8 +204,8 @@ public:
 
     const Color& GetDiffuseColor() { return maDiffuseColor; }
     const ::basegfx::B3DVector& GetDirection() { return maDirection; }
-    BOOL GetEnabled() { return mbEnabled; }
-    BOOL GetSpecular() { return mbSpecular; }
+    sal_Bool GetEnabled() { return mbEnabled; }
+    sal_Bool GetSpecular() { return mbSpecular; }
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -222,7 +222,7 @@ protected:
 
     // local parameters which need to be read
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    BOOL						mbSetTransform;
+    sal_Bool						mbSetTransform;
 
     com::sun::star::drawing::ProjectionMode mxPrjMode;
     sal_Int32					mnDistance;
@@ -235,9 +235,9 @@ protected:
     ::basegfx::B3DVector		maVRP;
     ::basegfx::B3DVector		maVPN;
     ::basegfx::B3DVector		maVUP;
-    BOOL						mbVRPUsed;
-    BOOL						mbVPNUsed;
-    BOOL						mbVUPUsed;
+    sal_Bool						mbVRPUsed;
+    sal_Bool						mbVPNUsed;
+    sal_Bool						mbVUPUsed;
 
 public:
     SdXML3DSceneAttributesHelper( SvXMLImport& rImporter );
@@ -263,7 +263,7 @@ protected:
     rtl::OUString														msHyperlink;
 
 public:
-    SvXMLShapeContext( SvXMLImport& rImp, USHORT nPrfx,
+    SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {}
 
     TYPEINFO();
@@ -338,7 +338,7 @@ public:
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList);
     SvXMLImportContext* CreateFrameChildContext(
-        SvXMLImportContext *pThisContext, USHORT nPrefix, const rtl::OUString& rLocalName,
+        SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     SvXMLShapeContext* Create3DSceneChildContext(
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index 663b8942fe..663b8942fe 100644..100755
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/xmloff/inc/xmloff/table/XMLTableExport.hxx
index a9ce59ab11..a9ce59ab11 100644..100755
--- a/xmloff/inc/xmloff/table/XMLTableExport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableExport.hxx
diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx
index 211c4548cd..013768776b 100644..100755
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx
@@ -55,10 +55,10 @@ public:
     XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef );
     virtual ~XMLTableImport();
 
-    SvXMLImportContext* CreateTableContext( USHORT nPrfx, const ::rtl::OUString& rLName, 
+    SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, 
                                             ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange );
 
-    SvXMLStyleContext* CreateTableTemplateContext( USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; }
     rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; }
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 877f4a9a9c..14602758e6 100644..100755
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -40,7 +40,7 @@
 
 #include <xmloff/xmltkmap.hxx>
 
-// functional.hxx is obsolete and should be replaced by its comphelper
+// xmloff/functional.hxx is obsolete and should be replaced by its comphelper
 // counterpart
 #include <comphelper/stl_types.hxx>
 #include <xmloff/uniref.hxx>
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/xmloff/txtimppr.hxx
index 776d9d14bd..776d9d14bd 100644..100755
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/xmloff/txtimppr.hxx
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index dcb2d6f9d2..dcb2d6f9d2 100644..100755
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/xmloff/inc/xmloff/txtprmap.hxx
index 6d0e3faca6..6d0e3faca6 100644..100755
--- a/xmloff/inc/xmloff/txtprmap.hxx
+++ b/xmloff/inc/xmloff/txtprmap.hxx
diff --git a/xmloff/inc/xmloff/txtstyle.hxx b/xmloff/inc/xmloff/txtstyle.hxx
index 208a45b347..208a45b347 100644..100755
--- a/xmloff/inc/xmloff/txtstyle.hxx
+++ b/xmloff/inc/xmloff/txtstyle.hxx
diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx
index dbe777e5af..dbe777e5af 100644..100755
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/xmloff/inc/xmloff/txtstyli.hxx
diff --git a/xmloff/inc/xmloff/uniref.hxx b/xmloff/inc/xmloff/uniref.hxx
index 5ed097a541..5ed097a541 100644..100755
--- a/xmloff/inc/xmloff/uniref.hxx
+++ b/xmloff/inc/xmloff/uniref.hxx
diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx
index 2cd1b81972..2cd1b81972 100644..100755
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/xmloff/unoatrcn.hxx
diff --git a/xmloff/inc/xformsexport.hxx b/xmloff/inc/xmloff/xformsexport.hxx
index e29ef4d5ec..e29ef4d5ec 100644..100755
--- a/xmloff/inc/xformsexport.hxx
+++ b/xmloff/inc/xmloff/xformsexport.hxx
diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx
index f6f0e1a194..9f59121219 100644..100755
--- a/xmloff/inc/xformsimport.hxx
+++ b/xmloff/inc/xmloff/xformsimport.hxx
@@ -31,7 +31,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 
-#include <tools/solar.h> // for USHORT
+#include <tools/solar.h> // for sal_uInt16
 #include <com/sun/star/uno/Reference.hxx>
 
 class SvXMLImport;
@@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star {
 /** create import context for xforms:model element. */
 XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext(
     SvXMLImport& rImport,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName );
 
 /** perform the actual binding of an XForms-binding with the suitable control
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index 40ecda1558..40ecda1558 100644..100755
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index a4c2303c66..2aedb8e096 100644..100755
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -59,10 +59,10 @@ public:
 
     int  operator ==( const SvXMLAttrContainerData& rCmp ) const;
 
-    BOOL AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
+    sal_Bool AddAttr( const ::rtl::OUString& rLName, const rtl::OUString& rValue );
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                     const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL AddAttr( const ::rtl::OUString& rPrefix,
+    sal_Bool AddAttr( const ::rtl::OUString& rPrefix,
                   const ::rtl::OUString& rLName,
                   const ::rtl::OUString& rValue );
 
@@ -77,12 +77,12 @@ public:
     inline const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
     inline const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
 
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
                 const ::rtl::OUString& rLName, const rtl::OUString& rValue );
-    BOOL SetAt( sal_uInt16 i,
+    sal_Bool SetAt( sal_uInt16 i,
                 const ::rtl::OUString& rPrefix,
                 const ::rtl::OUString& rLName,
                 const ::rtl::OUString& rValue );
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
index 1940505a31..c4fa12ae11 100644..100755
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmloff/xmlcnitm.hxx
@@ -62,8 +62,8 @@ public:
 
     virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
 
-    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     virtual SfxPoolItem *Clone( SfxItemPool * = 0) const
     { return new SvXMLAttrContainerItem( *this ); }
diff --git a/xmloff/inc/xmloff/xmlement.hxx b/xmloff/inc/xmloff/xmlement.hxx
index 3977320d43..3977320d43 100644..100755
--- a/xmloff/inc/xmloff/xmlement.hxx
+++ b/xmloff/inc/xmloff/xmlement.hxx
diff --git a/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx
index bc071fa765..bc071fa765 100644..100755
--- a/xmloff/inc/xmlerror.hxx
+++ b/xmloff/inc/xmloff/xmlerror.hxx
diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/xmloff/inc/xmloff/xmlevent.hxx
index a1b3d54d13..a1b3d54d13 100644..100755
--- a/xmloff/inc/xmloff/xmlevent.hxx
+++ b/xmloff/inc/xmloff/xmlevent.hxx
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index dd9e935652..dd9e935652 100644..100755
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx
index b285c9348d..b285c9348d 100644..100755
--- a/xmloff/inc/xmloff/xmlexppr.hxx
+++ b/xmloff/inc/xmloff/xmlexppr.hxx
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index 8ac88f7442..049ef9d0cc 100644..100755
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public SvRefBase
 
     SvXMLImport& mrImport;
 
-    USHORT		 mnPrefix;
+    sal_uInt16		 mnPrefix;
     ::rtl::OUString maLocalName;
 
     SvXMLNamespaceMap	*mpRewindMap;
@@ -64,14 +64,14 @@ protected:
 public:
     TYPEINFO();
 
-    USHORT GetPrefix() const { return mnPrefix; }
+    sal_uInt16 GetPrefix() const { return mnPrefix; }
     const ::rtl::OUString& GetLocalName() const { return maLocalName; }
 
     // A contexts constructor does anything that is required if an element
     // starts. Namespace processing has been done already.
     // Note that virtual methods cannot be used inside constructors. Use
     // StartElement instead if this is required.
-    SvXMLImportContext( SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName );
 
     // A contexts destructor does anything that is required if an element
@@ -82,7 +82,7 @@ public:
 
     // Create a childs element context. By default, the import's
     // CreateContext method is called to create a new default context.
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index eb9a5f6daf..eb9a5f6daf 100644..100755
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index b9bf336a17..b9bf336a17 100644..100755
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
new file mode 100755
index 0000000000..ff40e7daab
--- /dev/null
+++ b/xmloff/inc/xmloff/xmlkywd.hxx
@@ -0,0 +1,1998 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _XMLOFF_XMLKYWD_HXX
+#define _XMLOFF_XMLKYWD_HXX
+
+#include <tools/string.hxx>
+
+/*
+ * THIS FILE IS DEPRECATED. IT IS SUPERSEDED BY XMLTOKEN.HXX.
+ *
+ * Please use xmltoken.hxx / xmltoken.cxx from now on.
+ */
+
+
+/* if XML_DEFINE_KEYWORDS is defined the variables are
+   defined rather than declared. So this file MUST be included
+   WITHOUT this define.
+
+   (Except the xmlkywd.cxx file that actually defines the
+    variables which sets this define.)
+ */
+
+#ifndef XML_DEFINE_KEYWORDS
+#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#else
+#define XML_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#endif
+
+// common XML
+XML_CONSTASCII_ACTION( sXML_CDATA, "CDATA" );
+XML_CONSTASCII_ACTION( sXML_WS, " " );
+XML_CONSTASCII_ACTION( sXML_xml, "xml" );
+XML_CONSTASCII_ACTION( sXML_xmlns, "xmlns" );
+XML_CONSTASCII_ACTION( sXML_xml_pi, "version=\"1.0\" encoding=\"UTF-8\"" );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_prefix, "<!DOCTYPE " );
+XML_CONSTASCII_ACTION( sXML_xml_doctype_suffix, " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" );
+
+// namespace prefixes and names
+XML_CONSTASCII_ACTION( sXML_np_office, "office" );
+XML_CONSTASCII_ACTION( sXML_n_office, "http://openoffice.org/2000/office" );
+XML_CONSTASCII_ACTION( sXML_n_office_old, "http://sun.com/xmlns/staroffice/office" );
+XML_CONSTASCII_ACTION( sXML_np_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta, "http://openoffice.org/2000/meta" );
+XML_CONSTASCII_ACTION( sXML_n_meta_old, "http://sun.com/xmlns/staroffice/meta" );
+XML_CONSTASCII_ACTION( sXML_np_style, "style" );
+XML_CONSTASCII_ACTION( sXML_n_style, "http://openoffice.org/2000/style" );
+XML_CONSTASCII_ACTION( sXML_n_style_old, "http://sun.com/xmlns/staroffice/style" );
+XML_CONSTASCII_ACTION( sXML_np_number, "number" );
+XML_CONSTASCII_ACTION( sXML_n_number, "http://openoffice.org/2000/datastyle" );
+XML_CONSTASCII_ACTION( sXML_n_number_old, "http://sun.com/xmlns/staroffice/number" );
+XML_CONSTASCII_ACTION( sXML_np_text, "text" );
+XML_CONSTASCII_ACTION( sXML_n_text, "http://openoffice.org/2000/text" );
+XML_CONSTASCII_ACTION( sXML_n_text_old, "http://sun.com/xmlns/staroffice/text" );
+XML_CONSTASCII_ACTION( sXML_np_table, "table" );
+XML_CONSTASCII_ACTION( sXML_n_table, "http://openoffice.org/2000/table" );
+XML_CONSTASCII_ACTION( sXML_n_table_old, "http://sun.com/xmlns/staroffice/table" );
+XML_CONSTASCII_ACTION( sXML_np_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_n_draw, "http://openoffice.org/2000/drawing" );
+XML_CONSTASCII_ACTION( sXML_np_dr3d, "dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_dr3d, "http://openoffice.org/2000/dr3d" );
+XML_CONSTASCII_ACTION( sXML_n_draw_old, "http://sun.com/xmlns/staroffice/draw" );
+XML_CONSTASCII_ACTION( sXML_np_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation, "http://openoffice.org/2000/presentation" );
+XML_CONSTASCII_ACTION( sXML_n_presentation_old, "http://sun.com/xmlns/staroffice/presentation" );
+XML_CONSTASCII_ACTION( sXML_np_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_n_chart, "http://openoffice.org/2000/chart" );
+XML_CONSTASCII_ACTION( sXML_np_config, "config" );
+XML_CONSTASCII_ACTION( sXML_n_config, "http://openoffice.org/2001/config" );
+XML_CONSTASCII_ACTION( sXML_n_chart_old, "http://sun.com/xmlns/staroffice/chart" );
+XML_CONSTASCII_ACTION( sXML_np_fo, "fo" );
+XML_CONSTASCII_ACTION( sXML_n_fo_old, "http://www.w3.org/1999/XSL/Format/" );
+XML_CONSTASCII_ACTION( sXML_n_fo, "http://www.w3.org/1999/XSL/Format" );
+XML_CONSTASCII_ACTION( sXML_np_xlink, "xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink, "http://www.w3.org/1999/xlink" );
+XML_CONSTASCII_ACTION( sXML_n_xlink_old, "http://www.w3.org/1999/xlink/namespace" );
+XML_CONSTASCII_ACTION( sXML_np_dc, "dc" );
+XML_CONSTASCII_ACTION( sXML_n_dc, "http://purl.org/dc/elements/1.1/" );
+XML_CONSTASCII_ACTION( sXML_np_svg, "svg" );
+XML_CONSTASCII_ACTION( sXML_n_svg, "http://www.w3.org/2000/svg" );
+XML_CONSTASCII_ACTION( sXML_namespace_form, "form" );
+XML_CONSTASCII_ACTION( sXML_url_form, "http://openoffice.org/2000/form" );
+XML_CONSTASCII_ACTION( sXML_namespace_script, "script" );
+XML_CONSTASCII_ACTION( sXML_url_script, "http://openoffice.org/2000/script" );
+
+XML_CONSTASCII_ACTION( sXML_np_block_list, "block-list");
+XML_CONSTASCII_ACTION( sXML_n_block_list, "http://openoffice.org/2001/block-list" );
+
+XML_CONSTASCII_ACTION( sXML_np_math, "math");
+XML_CONSTASCII_ACTION( sXML_n_math, "http://www.w3.org/1998/Math/MathML" );
+
+XML_CONSTASCII_ACTION( sXML_np_versions_list, "VL");
+XML_CONSTASCII_ACTION( sXML_n_versions_list, "http://openoffice.org/2001/versions-list" );
+
+// units
+XML_CONSTASCII_ACTION( sXML_unit_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_unit_m, "m" );
+XML_CONSTASCII_ACTION( sXML_unit_km, "km" );
+XML_CONSTASCII_ACTION( sXML_unit_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_unit_pt, "pt" );
+XML_CONSTASCII_ACTION( sXML_unit_pc, "pc" );
+XML_CONSTASCII_ACTION( sXML_unit_foot, "ft" );
+XML_CONSTASCII_ACTION( sXML_unit_miles, "mi" );
+XML_CONSTASCII_ACTION( sXML_unit_inch, "inch" );
+
+// any other
+XML_CONSTASCII_ACTION( sXML_1, "1" );
+XML_CONSTASCII_ACTION( sXML_10, "10" );
+XML_CONSTASCII_ACTION( sXML_2, "2" );
+XML_CONSTASCII_ACTION( sXML_3, "3" );
+XML_CONSTASCII_ACTION( sXML_4, "4" );
+XML_CONSTASCII_ACTION( sXML_5, "5" );
+XML_CONSTASCII_ACTION( sXML_6, "6" );
+XML_CONSTASCII_ACTION( sXML_7, "7" );
+XML_CONSTASCII_ACTION( sXML_8, "8" );
+XML_CONSTASCII_ACTION( sXML_9, "9" );
+XML_CONSTASCII_ACTION( sXML_A, "A" );
+XML_CONSTASCII_ACTION( sXML_I, "I" );
+XML_CONSTASCII_ACTION( sXML_IBM437, "IBM437" );
+XML_CONSTASCII_ACTION( sXML_IBM850, "IBM850" );
+XML_CONSTASCII_ACTION( sXML_IBM860, "IBM860" );
+XML_CONSTASCII_ACTION( sXML_IBM861, "IBM861" );
+XML_CONSTASCII_ACTION( sXML_IBM863, "IBM863" );
+XML_CONSTASCII_ACTION( sXML_IBM865, "IBM865" );
+XML_CONSTASCII_ACTION( sXML_ISO_8859_1, "ISO-8859-1" );
+XML_CONSTASCII_ACTION( sXML_OLE2, "ole2" );
+XML_CONSTASCII_ACTION( sXML__colon, ":" );
+XML_CONSTASCII_ACTION( sXML__empty, "" );
+XML_CONSTASCII_ACTION( sXML__unknown_, "_unknown_" );
+XML_CONSTASCII_ACTION( sXML_a, "a" );
+XML_CONSTASCII_ACTION( sXML_abbreviated_name, "abbreviated-name" );
+XML_CONSTASCII_ACTION( sXML_above, "above" );
+XML_CONSTASCII_ACTION( sXML_abs, "abs" );
+XML_CONSTASCII_ACTION( sXML_accent, "accent" );
+XML_CONSTASCII_ACTION( sXML_accentunder, "accentunder" );
+XML_CONSTASCII_ACTION( sXML_acceptance_state, "acceptance-state" );
+XML_CONSTASCII_ACTION( sXML_accepted, "accepted" );
+XML_CONSTASCII_ACTION( sXML_action, "action" );
+XML_CONSTASCII_ACTION( sXML_active, "active" );
+XML_CONSTASCII_ACTION( sXML_active_split_range, "active-split-range" );
+XML_CONSTASCII_ACTION( sXML_active_table, "active-table" );
+XML_CONSTASCII_ACTION( sXML_actuate, "actuate" );
+XML_CONSTASCII_ACTION( sXML_add_in, "add-in" );
+XML_CONSTASCII_ACTION( sXML_add_in_name, "add-in-name" );
+XML_CONSTASCII_ACTION( sXML_address, "address" );
+XML_CONSTASCII_ACTION( sXML_adjustment, "adjustment" );
+XML_CONSTASCII_ACTION( sXML_algorithm, "algorithm" );
+XML_CONSTASCII_ACTION( sXML_align, "align" );
+XML_CONSTASCII_ACTION( sXML_all, "all" );
+XML_CONSTASCII_ACTION( sXML_allow_empty_cell, "allow-empty-cell" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index, "alphabetical-index" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_auto_mark_file, "alphabetical-index-auto-mark-file" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_entry_template, "alphabetical-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark, "alphabetical-index-mark" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_end, "alphabetical-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_mark_start, "alphabetical-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_index_source, "alphabetical-index-source" );
+XML_CONSTASCII_ACTION( sXML_alphabetical_separators, "alphabetical-separators" );
+XML_CONSTASCII_ACTION( sXML_alternate, "alternate" );
+XML_CONSTASCII_ACTION( sXML_am_pm, "am-pm" );
+XML_CONSTASCII_ACTION( sXML_ambient_color, "ambient-color");
+XML_CONSTASCII_ACTION( sXML_anchor_page_number, "anchor-page-number" );
+XML_CONSTASCII_ACTION( sXML_anchor_type, "anchor-type" );
+XML_CONSTASCII_ACTION( sXML_and, "and" );
+XML_CONSTASCII_ACTION( sXML_animation, "animation" );
+XML_CONSTASCII_ACTION( sXML_animation_direction, "animation-direction" );
+XML_CONSTASCII_ACTION( sXML_animation_start_inside, "animation-start-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_stop_inside, "animation-stop-inside" );
+XML_CONSTASCII_ACTION( sXML_animation_repeat, "animation-repeat" );
+XML_CONSTASCII_ACTION( sXML_animation_delay, "animation-delay" );
+XML_CONSTASCII_ACTION( sXML_animation_steps, "animation-steps" );
+XML_CONSTASCII_ACTION( sXML_annotation, "annotation" );
+XML_CONSTASCII_ACTION( sXML_annotations, "annotations" );
+XML_CONSTASCII_ACTION( sXML_annote, "annote" );
+XML_CONSTASCII_ACTION( sXML_applet, "applet");
+XML_CONSTASCII_ACTION( sXML_applet_name, "applet-name");
+XML_CONSTASCII_ACTION( sXML_application_data, "application-data");
+XML_CONSTASCII_ACTION( sXML_application_xml, "application-xml");
+XML_CONSTASCII_ACTION( sXML_apply, "apply" );
+XML_CONSTASCII_ACTION( sXML_apply_style_name, "apply-style-name" );
+XML_CONSTASCII_ACTION( sXML_aqua, "aqua" );
+XML_CONSTASCII_ACTION( sXML_arccos, "arccos" );
+XML_CONSTASCII_ACTION( sXML_archive, "archive" );
+XML_CONSTASCII_ACTION( sXML_arcsin, "arcsin" );
+XML_CONSTASCII_ACTION( sXML_arctan, "arctan" );
+XML_CONSTASCII_ACTION( sXML_area, "area" );
+XML_CONSTASCII_ACTION( sXML_area_circle, "area-circle" );
+XML_CONSTASCII_ACTION( sXML_area_polygon, "area-polygon" );
+XML_CONSTASCII_ACTION( sXML_area_rectangle, "area-rectangle" );
+XML_CONSTASCII_ACTION( sXML_article, "article" );
+XML_CONSTASCII_ACTION( sXML_as_char, "as-char" );
+XML_CONSTASCII_ACTION( sXML_ascending, "ascending");
+XML_CONSTASCII_ACTION( sXML_attached_axis, "attached-axis" );
+XML_CONSTASCII_ACTION( sXML_attractive, "attractive");
+XML_CONSTASCII_ACTION( sXML_author, "author" );
+XML_CONSTASCII_ACTION( sXML_author_initials, "author-initials" );
+XML_CONSTASCII_ACTION( sXML_author_name, "author-name" );
+XML_CONSTASCII_ACTION( sXML_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_height, "auto-grow-height" );
+XML_CONSTASCII_ACTION( sXML_auto_grow_width, "auto-grow-width" );
+XML_CONSTASCII_ACTION( sXML_auto_reload, "auto-reload" );
+XML_CONSTASCII_ACTION( sXML_auto_text, "auto-text" );
+XML_CONSTASCII_ACTION( sXML_auto_text_events, "auto-text-events" );
+XML_CONSTASCII_ACTION( sXML_auto_text_group, "auto-text-group" );
+XML_CONSTASCII_ACTION( sXML_auto_text_indent, "auto-text-indent" );
+XML_CONSTASCII_ACTION( sXML_up, "up" );
+XML_CONSTASCII_ACTION( sXML_auto_update, "auto-update" );
+XML_CONSTASCII_ACTION( sXML_automatic, "automatic");
+XML_CONSTASCII_ACTION( sXML_automatic_find_labels, "automatic-find-labels" );
+XML_CONSTASCII_ACTION( sXML_automatic_order, "automatic-order" );
+XML_CONSTASCII_ACTION( sXML_automatic_styles, "automatic-styles" );
+XML_CONSTASCII_ACTION( sXML_automatic_update, "automatic-update" );
+XML_CONSTASCII_ACTION( sXML_average, "average" );
+XML_CONSTASCII_ACTION( sXML_axis, "axis" );
+XML_CONSTASCII_ACTION( sXML_back_scale, "back-scale" );
+XML_CONSTASCII_ACTION( sXML_backface_culling, "backface-culling" );
+XML_CONSTASCII_ACTION( sXML_background, "background" );
+XML_CONSTASCII_ACTION( sXML_background_color, "background-color" );
+XML_CONSTASCII_ACTION( sXML_background_image, "background-image" );
+XML_CONSTASCII_ACTION( sXML_background_no_repeat, "no-repeat" );
+XML_CONSTASCII_ACTION( sXML_background_objects_visible, "background-objects-visible" );
+XML_CONSTASCII_ACTION( sXML_background_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_background_stretch, "stretch" );
+XML_CONSTASCII_ACTION( sXML_background_visible, "background-visible" );
+XML_CONSTASCII_ACTION( sXML_bar, "bar" );
+XML_CONSTASCII_ACTION( sXML_base64Binary, "base64Binary");
+XML_CONSTASCII_ACTION( sXML_base_cell_address, "base-cell-address");
+XML_CONSTASCII_ACTION( sXML_baseline, "baseline" );
+XML_CONSTASCII_ACTION( sXML_before_date_time, "before-date-time" );
+XML_CONSTASCII_ACTION( sXML_below , "below" );
+XML_CONSTASCII_ACTION( sXML_between_date_times, "between-date-times" );
+XML_CONSTASCII_ACTION( sXML_bevel , "bevel" );
+XML_CONSTASCII_ACTION( sXML_bibiliographic_type, "bibiliographic-type" );
+XML_CONSTASCII_ACTION( sXML_bibliography, "bibliography" );
+XML_CONSTASCII_ACTION( sXML_bibliography_configuration, "bibliography-configuration" );
+XML_CONSTASCII_ACTION( sXML_bibliography_data_field, "bibliography-data-field" );
+XML_CONSTASCII_ACTION( sXML_bibliography_entry_template, "bibliography-entry-template" );
+XML_CONSTASCII_ACTION( sXML_bibliography_mark, "bibliography-mark" );
+XML_CONSTASCII_ACTION( sXML_bibliography_source, "bibliography-source" );
+XML_CONSTASCII_ACTION( sXML_bibliography_type, "bibliography-type" );
+XML_CONSTASCII_ACTION( sXML_bind_styles_to_content, "bind-styles-to-content");
+XML_CONSTASCII_ACTION( sXML_bitmap , "bitmap" );
+XML_CONSTASCII_ACTION( sXML_black, "black" );
+XML_CONSTASCII_ACTION( sXML_blend, "blend" );
+XML_CONSTASCII_ACTION( sXML_blinking, "blinking" );
+XML_CONSTASCII_ACTION( sXML_block, "block" );
+XML_CONSTASCII_ACTION( sXML_block_list, "block-list" );
+XML_CONSTASCII_ACTION( sXML_blue , "blue" );
+XML_CONSTASCII_ACTION( sXML_body, "body" );
+XML_CONSTASCII_ACTION( sXML_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_book, "book" );
+XML_CONSTASCII_ACTION( sXML_booklet, "booklet" );
+XML_CONSTASCII_ACTION( sXML_bookmark, "bookmark" );
+XML_CONSTASCII_ACTION( sXML_bookmark_end, "bookmark-end" );
+XML_CONSTASCII_ACTION( sXML_bookmark_ref, "bookmark-ref" );
+XML_CONSTASCII_ACTION( sXML_bookmark_start, "bookmark-start" );
+XML_CONSTASCII_ACTION( sXML_booktitle, "booktitle" );
+XML_CONSTASCII_ACTION( sXML_boolean, "boolean");
+XML_CONSTASCII_ACTION( sXML_boolean_style, "boolean-style" );
+XML_CONSTASCII_ACTION( sXML_boolean_value, "boolean-value");
+XML_CONSTASCII_ACTION( sXML_border, "border" );
+XML_CONSTASCII_ACTION( sXML_border_bottom, "border-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_color, "border-color" );
+XML_CONSTASCII_ACTION( sXML_border_left, "border-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width, "border-line-width" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_bottom, "border-line-width-bottom" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_left, "border-line-width-left" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_right, "border-line-width-right" );
+XML_CONSTASCII_ACTION( sXML_border_line_width_top, "border-line-width-top" );
+XML_CONSTASCII_ACTION( sXML_border_right, "border-right" );
+XML_CONSTASCII_ACTION( sXML_border_top, "border-top" );
+XML_CONSTASCII_ACTION( sXML_both, "both");
+XML_CONSTASCII_ACTION( sXML_bottom, "bottom" );
+XML_CONSTASCII_ACTION( sXML_bottom_percent, "bottom percent");
+XML_CONSTASCII_ACTION( sXML_bottom_values, "bottom values");
+XML_CONSTASCII_ACTION( sXML_break_after, "break-after" );
+XML_CONSTASCII_ACTION( sXML_break_before, "break-before" );
+XML_CONSTASCII_ACTION( sXML_break_inside, "break-inside" );
+XML_CONSTASCII_ACTION( sXML_bubble, "bubble" );
+XML_CONSTASCII_ACTION( sXML_bullet_char, "bullet-char" );
+XML_CONSTASCII_ACTION( sXML_bullet_relative_size, "bullet-relative-size" );
+XML_CONSTASCII_ACTION( sXML_buttons, "buttons");
+XML_CONSTASCII_ACTION( sXML_bvar, "bvar");
+XML_CONSTASCII_ACTION( sXML_c, "c" );
+XML_CONSTASCII_ACTION( sXML_cm, "cm" );
+XML_CONSTASCII_ACTION( sXML_calculation_settings, "calculation-settings" );
+XML_CONSTASCII_ACTION( sXML_calendar, "calendar" );
+XML_CONSTASCII_ACTION( sXML_capitalize_entries, "capitalize-entries" );
+XML_CONSTASCII_ACTION( sXML_caption, "caption" );
+XML_CONSTASCII_ACTION( sXML_caption_point_x, "caption-point-x" );
+XML_CONSTASCII_ACTION( sXML_caption_point_y, "caption-point-y" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_format, "caption-sequence-format" );
+XML_CONSTASCII_ACTION( sXML_caption_sequence_name, "caption-sequence-name" );
+XML_CONSTASCII_ACTION( sXML_case_sensitive, "case-sensitive");
+XML_CONSTASCII_ACTION( sXML_casemap_capitalize, "capitalize" );
+XML_CONSTASCII_ACTION( sXML_casemap_lowercase, "lowercase" );
+XML_CONSTASCII_ACTION( sXML_casemap_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_casemap_small_caps, "small-caps" );
+XML_CONSTASCII_ACTION( sXML_casemap_uppercase, "uppercase" );
+XML_CONSTASCII_ACTION( sXML_categories, "categories" );
+XML_CONSTASCII_ACTION( sXML_category, "category" );
+XML_CONSTASCII_ACTION( sXML_category_and_value, "category-and-value" );
+XML_CONSTASCII_ACTION( sXML_cell_address, "cell-address");
+XML_CONSTASCII_ACTION( sXML_cell_content_change, "cell-content-change");
+XML_CONSTASCII_ACTION( sXML_cell_content_deletion, "cell-content-deletion");
+XML_CONSTASCII_ACTION( sXML_cell_count, "cell-count");
+XML_CONSTASCII_ACTION( sXML_cell_protect, "cell-protect");
+XML_CONSTASCII_ACTION( sXML_cell_range_address, "cell-range-address");
+XML_CONSTASCII_ACTION( sXML_cell_range_address_list, "cell-range-address-list");
+XML_CONSTASCII_ACTION( sXML_cell_range_source, "cell-range-source");
+XML_CONSTASCII_ACTION( sXML_center, "center" );
+XML_CONSTASCII_ACTION( sXML_chain_next_name, "chain-next-name" );
+XML_CONSTASCII_ACTION( sXML_change, "change" );
+XML_CONSTASCII_ACTION( sXML_change_deletion, "change-deletion" );
+XML_CONSTASCII_ACTION( sXML_change_end, "change-end" );
+XML_CONSTASCII_ACTION( sXML_change_id, "change-id" );
+XML_CONSTASCII_ACTION( sXML_change_info, "change-info" );
+XML_CONSTASCII_ACTION( sXML_change_start, "change-start" );
+XML_CONSTASCII_ACTION( sXML_change_track_table_cell, "change-track-table-cell" );
+XML_CONSTASCII_ACTION( sXML_change_view_conditions, "change-view-conditions" );
+XML_CONSTASCII_ACTION( sXML_change_view_settings, "change-view-settings" );
+XML_CONSTASCII_ACTION( sXML_changed_region, "changed-region" );
+XML_CONSTASCII_ACTION( sXML_chapter, "chapter");
+XML_CONSTASCII_ACTION( sXML_char, "char" );
+XML_CONSTASCII_ACTION( sXML_character_count, "character-count" );
+XML_CONSTASCII_ACTION( sXML_chart, "chart" );
+XML_CONSTASCII_ACTION( sXML_charts, "charts" );
+XML_CONSTASCII_ACTION( sXML_chg_author, "chg-author" );
+XML_CONSTASCII_ACTION( sXML_chg_comment, "chg-comment" );
+XML_CONSTASCII_ACTION( sXML_chg_date_time, "chg-date-time" );
+XML_CONSTASCII_ACTION( sXML_ci, "ci" );
+XML_CONSTASCII_ACTION( sXML_circle, "circle" );
+XML_CONSTASCII_ACTION( sXML_citation_body_style_name, "citation-body-style-name" );
+XML_CONSTASCII_ACTION( sXML_citation_style_name, "citation-style-name" );
+XML_CONSTASCII_ACTION( sXML_class, "class" );
+XML_CONSTASCII_ACTION( sXML_class_id, "class-id" );
+XML_CONSTASCII_ACTION( sXML_clip, "clip" );
+XML_CONSTASCII_ACTION( sXML_clockwise, "clockwise" );
+XML_CONSTASCII_ACTION( sXML_close, "close" );
+XML_CONSTASCII_ACTION( sXML_close_horizontal, "close-horizontal" );
+XML_CONSTASCII_ACTION( sXML_close_vertical, "close-vertical" );
+XML_CONSTASCII_ACTION( sXML_cn, "cn" );
+XML_CONSTASCII_ACTION( sXML_code, "code" );
+XML_CONSTASCII_ACTION( sXML_codebase, "codebase" );
+XML_CONSTASCII_ACTION( sXML_collapse, "collapse" );
+XML_CONSTASCII_ACTION( sXML_color, "color" );
+XML_CONSTASCII_ACTION( sXML_color_inversion , "color-inversion" );
+XML_CONSTASCII_ACTION( sXML_color_mode , "color-mode" );
+XML_CONSTASCII_ACTION( sXML_column, "column" );
+XML_CONSTASCII_ACTION( sXML_column_count, "column-count" );
+XML_CONSTASCII_ACTION( sXML_column_gap, "column-gap" );
+XML_CONSTASCII_ACTION( sXML_column_name, "column-name" );
+XML_CONSTASCII_ACTION( sXML_column_sep, "column-sep" );
+XML_CONSTASCII_ACTION( sXML_column_width, "column-width" );
+XML_CONSTASCII_ACTION( sXML_columns, "columns" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_auto, "auto" );
+XML_CONSTASCII_ACTION( sXML_columnsplit_avoid, "avoid" );
+XML_CONSTASCII_ACTION( sXML_combine_entries, "combine-entries" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_dash, "combine-entries-with-dash" );
+XML_CONSTASCII_ACTION( sXML_combine_entries_with_pp, "combine-entries-with-pp" );
+XML_CONSTASCII_ACTION( sXML_comma_separated, "comma-separated" );
+XML_CONSTASCII_ACTION( sXML_command, "command" );
+XML_CONSTASCII_ACTION( sXML_comment, "comment" );
+XML_CONSTASCII_ACTION( sXML_compose, "compose" );
+XML_CONSTASCII_ACTION( sXML_cond_style_name, "cond-style-name" );
+XML_CONSTASCII_ACTION( sXML_condition, "condition" );
+XML_CONSTASCII_ACTION( sXML_condition_source, "condition-source");
+XML_CONSTASCII_ACTION( sXML_condition_source_range_address, "condition-source-range-address");
+XML_CONSTASCII_ACTION( sXML_conditional_text, "conditional-text" );
+XML_CONSTASCII_ACTION( sXML_cone, "cone" );
+XML_CONSTASCII_ACTION( sXML_conference, "conference" );
+XML_CONSTASCII_ACTION( sXML_config_item, "config-item" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_indexed, "config-item-map-indexed" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_named, "config-item-map-named" );
+XML_CONSTASCII_ACTION( sXML_config_item_map_entry, "config-item-map-entry" );
+XML_CONSTASCII_ACTION( sXML_config_item_set, "config-item-set" );
+XML_CONSTASCII_ACTION( sXML_configuration_settings, "configuration-settings" );
+XML_CONSTASCII_ACTION( sXML_conjugate, "conjugate" );
+XML_CONSTASCII_ACTION( sXML_connect_bars, "connect-bars" );
+XML_CONSTASCII_ACTION( sXML_connection_name, "connection-name" );
+XML_CONSTASCII_ACTION( sXML_connector, "connector" );
+XML_CONSTASCII_ACTION( sXML_consecutive_numbering, "consecutive-numbering" );
+XML_CONSTASCII_ACTION( sXML_consolidation, "consolidation" );
+XML_CONSTASCII_ACTION( sXML_constant, "constant" );
+XML_CONSTASCII_ACTION( sXML_contains_error, "contains-error");
+XML_CONSTASCII_ACTION( sXML_contains_header, "contains-header");
+XML_CONSTASCII_ACTION( sXML_content, "content" );
+XML_CONSTASCII_ACTION( sXML_content_validation, "content-validation");
+XML_CONSTASCII_ACTION( sXML_content_validation_name, "validation-name");
+XML_CONSTASCII_ACTION( sXML_content_validations, "content-validations");
+XML_CONSTASCII_ACTION( sXML_continue, "continue" );
+XML_CONSTASCII_ACTION( sXML_continue_numbering, "continue-numbering" );
+XML_CONSTASCII_ACTION( sXML_contour_path, "contour-path" );
+XML_CONSTASCII_ACTION( sXML_contour_polygon, "contour-polygon" );
+XML_CONSTASCII_ACTION( sXML_contrast , "contrast" );
+XML_CONSTASCII_ACTION( sXML_control, "control" );
+XML_CONSTASCII_ACTION( sXML_conversion_mode, "conversion-mode" );
+XML_CONSTASCII_ACTION( sXML_copy_back, "copy-back" );
+XML_CONSTASCII_ACTION( sXML_copy_formulas, "copy-formulas" );
+XML_CONSTASCII_ACTION( sXML_copy_outline_levels, "copy-outline-levels" );
+XML_CONSTASCII_ACTION( sXML_copy_results_only, "copy-results-only" );
+XML_CONSTASCII_ACTION( sXML_copy_styles, "copy-styles" );
+XML_CONSTASCII_ACTION( sXML_corner_radius , "corner-radius" );
+XML_CONSTASCII_ACTION( sXML_correct, "correct");
+XML_CONSTASCII_ACTION( sXML_cos, "cos" );
+XML_CONSTASCII_ACTION( sXML_cosh, "cosh" );
+XML_CONSTASCII_ACTION( sXML_cot, "cot" );
+XML_CONSTASCII_ACTION( sXML_coth, "coth" );
+XML_CONSTASCII_ACTION( sXML_count, "count" );
+XML_CONSTASCII_ACTION( sXML_count_empty_lines, "count-empty-lines" );
+XML_CONSTASCII_ACTION( sXML_count_in_floating_frames, "count-in-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_counterclockwise, "counterclockwise" );
+XML_CONSTASCII_ACTION( sXML_countnums, "countnums" );
+XML_CONSTASCII_ACTION( sXML_country, "country" );
+XML_CONSTASCII_ACTION( sXML_country_asian, "country-asian" );
+XML_CONSTASCII_ACTION( sXML_country_complex, "country-complex" );
+XML_CONSTASCII_ACTION( sXML_covered_table_cell, "covered-table-cell" );
+XML_CONSTASCII_ACTION( sXML_create_date, "create-date" );
+XML_CONSTASCII_ACTION( sXML_create_date_string, "create-date-string" );
+XML_CONSTASCII_ACTION( sXML_creation_date, "creation-date" );
+XML_CONSTASCII_ACTION( sXML_creation_time, "creation-time" );
+XML_CONSTASCII_ACTION( sXML_creator, "creator" );
+XML_CONSTASCII_ACTION( sXML_crossedout_cross, "X" );
+XML_CONSTASCII_ACTION( sXML_crossedout_double, "double-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_none, "none" );
+XML_CONSTASCII_ACTION( sXML_crossedout_single, "single-line" );
+XML_CONSTASCII_ACTION( sXML_crossedout_slash, "slash" );
+XML_CONSTASCII_ACTION( sXML_crossedout_thick, "thick-line" );
+XML_CONSTASCII_ACTION( sXML_csc, "csc" );
+XML_CONSTASCII_ACTION( sXML_csch, "csch" );
+XML_CONSTASCII_ACTION( sXML_cube, "cube" );
+XML_CONSTASCII_ACTION( sXML_cuboid, "cuboid" );
+XML_CONSTASCII_ACTION( sXML_currency, "currency");
+XML_CONSTASCII_ACTION( sXML_currency_style, "currency-style" );
+XML_CONSTASCII_ACTION( sXML_currency_symbol, "currency-symbol" );
+XML_CONSTASCII_ACTION( sXML_current, "current" );
+XML_CONSTASCII_ACTION( sXML_current_value, "current-value" );
+XML_CONSTASCII_ACTION( sXML_cursor_position, "cursor-position" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_x, "cursor-position-x" );
+XML_CONSTASCII_ACTION( sXML_cursor_position_y, "cursor-position-y" );
+XML_CONSTASCII_ACTION( sXML_custom1, "custom1" );
+XML_CONSTASCII_ACTION( sXML_custom2, "custom2" );
+XML_CONSTASCII_ACTION( sXML_custom3, "custom3" );
+XML_CONSTASCII_ACTION( sXML_custom4, "custom4" );
+XML_CONSTASCII_ACTION( sXML_custom5, "custom5" );
+XML_CONSTASCII_ACTION( sXML_cut_offs, "cut_offs" );
+XML_CONSTASCII_ACTION( sXML_cx, "cx" );
+XML_CONSTASCII_ACTION( sXML_cy, "cy" );
+XML_CONSTASCII_ACTION( sXML_cylinder, "cylinder" );
+XML_CONSTASCII_ACTION( sXML_d, "d" );
+XML_CONSTASCII_ACTION( sXML_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_dashed, "dashed" );
+XML_CONSTASCII_ACTION( sXML_data, "data");
+XML_CONSTASCII_ACTION( sXML_data_cell_range_address, "data-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_data_label_number, "data-label-number" );
+XML_CONSTASCII_ACTION( sXML_data_label_symbol, "data-label-symbol" );
+XML_CONSTASCII_ACTION( sXML_data_label_text, "data-label-text" );
+XML_CONSTASCII_ACTION( sXML_data_pilot_field, "data-pilot-field");
+XML_CONSTASCII_ACTION( sXML_data_pilot_level, "data-pilot-level");
+XML_CONSTASCII_ACTION( sXML_data_pilot_member, "data-pilot-member");
+XML_CONSTASCII_ACTION( sXML_data_pilot_members, "data-pilot-members");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotal, "data-pilot-subtotal");
+XML_CONSTASCII_ACTION( sXML_data_pilot_subtotals, "data-pilot-subtotals");
+XML_CONSTASCII_ACTION( sXML_data_pilot_table, "data-pilot-table");
+XML_CONSTASCII_ACTION( sXML_data_pilot_tables, "data-pilot-tables");
+XML_CONSTASCII_ACTION( sXML_data_point, "data-point" );
+XML_CONSTASCII_ACTION( sXML_data_style, "data-style" );
+XML_CONSTASCII_ACTION( sXML_data_style_name, "data-style-name" );
+XML_CONSTASCII_ACTION( sXML_data_type, "data-type");
+XML_CONSTASCII_ACTION( sXML_database_display, "database-display" );
+XML_CONSTASCII_ACTION( sXML_database_name, "database-name");
+XML_CONSTASCII_ACTION( sXML_database_next, "database-next" );
+XML_CONSTASCII_ACTION( sXML_database_range, "database-range");
+XML_CONSTASCII_ACTION( sXML_database_ranges, "database-ranges");
+XML_CONSTASCII_ACTION( sXML_database_row_number, "database-row-number" );
+XML_CONSTASCII_ACTION( sXML_database_select, "database-select" );
+XML_CONSTASCII_ACTION( sXML_database_source_query, "database-source-query");
+XML_CONSTASCII_ACTION( sXML_database_source_sql, "database-source-sql");
+XML_CONSTASCII_ACTION( sXML_database_source_table, "database-source-table");
+XML_CONSTASCII_ACTION( sXML_date, "date" );
+XML_CONSTASCII_ACTION( sXML_datetime, "datetime" );
+XML_CONSTASCII_ACTION( sXML_date_adjust, "date-adjust" );
+XML_CONSTASCII_ACTION( sXML_date_style, "date-style" );
+XML_CONSTASCII_ACTION( sXML_date_time, "date-time" );
+XML_CONSTASCII_ACTION( sXML_date_value, "date-value");
+XML_CONSTASCII_ACTION( sXML_day, "day" );
+XML_CONSTASCII_ACTION( sXML_day_of_week, "day-of-week" );
+XML_CONSTASCII_ACTION( sXML_dde_application, "dde-application" );
+XML_CONSTASCII_ACTION( sXML_dde_connection, "dde-connection" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decl, "dde-connection-decl" );
+XML_CONSTASCII_ACTION( sXML_dde_connection_decls, "dde-connection-decls" );
+XML_CONSTASCII_ACTION( sXML_dde_item, "dde-item" );
+XML_CONSTASCII_ACTION( sXML_dde_link, "dde-link" );
+XML_CONSTASCII_ACTION( sXML_dde_links, "dde-links" );
+XML_CONSTASCII_ACTION( sXML_dde_source, "dde-source" );
+XML_CONSTASCII_ACTION( sXML_dde_topic, "dde-topic" );
+XML_CONSTASCII_ACTION( sXML_decimal_places, "decimal-places" );
+XML_CONSTASCII_ACTION( sXML_decimal_replacement, "decimal-replacement" );
+XML_CONSTASCII_ACTION( sXML_declare, "declare" );
+XML_CONSTASCII_ACTION( sXML_decorate_words_only, "decorate-words-only" );
+XML_CONSTASCII_ACTION( sXML_decorative, "decorative" );
+XML_CONSTASCII_ACTION( sXML_deep, "deep" );
+XML_CONSTASCII_ACTION( sXML_default, "default" );
+XML_CONSTASCII_ACTION( sXML_default_cell_style_name, "default-cell-style-name" );
+XML_CONSTASCII_ACTION( sXML_default_style, "default-style" );
+XML_CONSTASCII_ACTION( sXML_default_style_name, "default-style-name" );
+XML_CONSTASCII_ACTION( sXML_degree, "degree" );
+XML_CONSTASCII_ACTION( sXML_delay, "delay" );
+XML_CONSTASCII_ACTION( sXML_deletion, "deletion" );
+XML_CONSTASCII_ACTION( sXML_deletions, "deletions" );
+XML_CONSTASCII_ACTION( sXML_depth, "depth" );
+XML_CONSTASCII_ACTION( sXML_desc, "desc" );
+XML_CONSTASCII_ACTION( sXML_descending, "descending");
+XML_CONSTASCII_ACTION( sXML_description, "description" );
+XML_CONSTASCII_ACTION( sXML_detective, "detective" );
+XML_CONSTASCII_ACTION( sXML_determinant, "determinant" );
+XML_CONSTASCII_ACTION( sXML_diff, "diff");
+XML_CONSTASCII_ACTION( sXML_diffuse_color, "diffuse-color" );
+XML_CONSTASCII_ACTION( sXML_dependences, "dependences");
+XML_CONSTASCII_ACTION( sXML_dependence, "dependence");
+XML_CONSTASCII_ACTION( sXML_direction, "direction");
+XML_CONSTASCII_ACTION( sXML_disabled, "disabled" );
+XML_CONSTASCII_ACTION( sXML_disc, "disc" );
+XML_CONSTASCII_ACTION( sXML_display, "display" );
+XML_CONSTASCII_ACTION( sXML_display_border, "display-border");
+XML_CONSTASCII_ACTION( sXML_display_details, "display-details");
+XML_CONSTASCII_ACTION( sXML_display_duplicates, "display-duplicates");
+XML_CONSTASCII_ACTION( sXML_display_empty, "display-empty");
+XML_CONSTASCII_ACTION( sXML_display_filter_buttons, "display-filter-buttons");
+XML_CONSTASCII_ACTION( sXML_display_formula, "display-formula" );
+XML_CONSTASCII_ACTION( sXML_display_label, "display-label" );
+XML_CONSTASCII_ACTION( sXML_display_levels, "display-levels" );
+XML_CONSTASCII_ACTION( sXML_display_name, "display-name" );
+XML_CONSTASCII_ACTION( sXML_display_outline_level, "display-outline-level" );
+XML_CONSTASCII_ACTION( sXML_dissolve, "dissolve" );
+XML_CONSTASCII_ACTION( sXML_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_distribute_letter, "distribute-letter" );
+XML_CONSTASCII_ACTION( sXML_distribute_space, "distribute-space" );
+XML_CONSTASCII_ACTION( sXML_divide, "divide" );
+XML_CONSTASCII_ACTION( sXML_document, "document" );
+XML_CONSTASCII_ACTION( sXML_document_content, "document-content" );
+XML_CONSTASCII_ACTION( sXML_document_meta, "document-meta" );
+XML_CONSTASCII_ACTION( sXML_document_settings, "document-settings" );
+XML_CONSTASCII_ACTION( sXML_document_styles, "document-styles" );
+XML_CONSTASCII_ACTION( sXML_document_statistic, "document-statistic" );
+XML_CONSTASCII_ACTION( sXML_domain, "domain" );
+XML_CONSTASCII_ACTION( sXML_dot, "dot" );
+XML_CONSTASCII_ACTION( sXML_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_double, "double" );
+XML_CONSTASCII_ACTION( sXML_double_sided, "double-sided" );
+XML_CONSTASCII_ACTION( sXML_down, "down" );
+XML_CONSTASCII_ACTION( sXML_draft, "draft");
+XML_CONSTASCII_ACTION( sXML_draw, "draw" );
+XML_CONSTASCII_ACTION( sXML_draw_aspect, "ole-draw-aspect" );
+XML_CONSTASCII_ACTION( sXML_drawing, "drawing" );
+XML_CONSTASCII_ACTION( sXML_drawings, "drawings" );
+XML_CONSTASCII_ACTION( sXML_drawpool , "drawpool" );
+XML_CONSTASCII_ACTION( sXML_drop_cap, "drop-cap" );
+XML_CONSTASCII_ACTION( sXML_dynamic, "dynamic" );
+XML_CONSTASCII_ACTION( sXML_edge_rounding, "edge-rounding" );
+XML_CONSTASCII_ACTION( sXML_editable, "editable" );
+XML_CONSTASCII_ACTION( sXML_editing_cycles, "editing-cycles" );
+XML_CONSTASCII_ACTION( sXML_editing_duration, "editing-duration" );
+XML_CONSTASCII_ACTION( sXML_edition, "edition" );
+XML_CONSTASCII_ACTION( sXML_editor, "editor" );
+XML_CONSTASCII_ACTION( sXML_ellipse , "ellipse" );
+XML_CONSTASCII_ACTION( sXML_email, "email" );
+XML_CONSTASCII_ACTION( sXML_embed, "embed" );
+XML_CONSTASCII_ACTION( sXML_embedded_visible_area, "embedded-visible-area" );
+XML_CONSTASCII_ACTION( sXML_embossed, "embossed" );
+XML_CONSTASCII_ACTION( sXML_emissive_color, "emissive-color" );
+XML_CONSTASCII_ACTION( sXML_empty, "empty");
+XML_CONSTASCII_ACTION( sXML_enabled, "enabled" );
+XML_CONSTASCII_ACTION( sXML_encoding, "encoding" );
+XML_CONSTASCII_ACTION( sXML_end, "end" );
+XML_CONSTASCII_ACTION( sXML_end_angle, "end-angle" );
+XML_CONSTASCII_ACTION( sXML_end_cell_address, "end-cell-address" );
+XML_CONSTASCII_ACTION( sXML_end_color, "end-color" );
+XML_CONSTASCII_ACTION( sXML_end_column, "end-column" );
+XML_CONSTASCII_ACTION( sXML_end_intensity, "end-intensity" );
+XML_CONSTASCII_ACTION( sXML_end_position, "end-position" );
+XML_CONSTASCII_ACTION( sXML_end_row, "end-row" );
+XML_CONSTASCII_ACTION( sXML_end_table, "end-table" );
+XML_CONSTASCII_ACTION( sXML_end_x, "end-x" );
+XML_CONSTASCII_ACTION( sXML_end_y, "end-y" );
+XML_CONSTASCII_ACTION( sXML_endless, "endless" );
+XML_CONSTASCII_ACTION( sXML_endnote, "endnote" );
+XML_CONSTASCII_ACTION( sXML_endnote_body, "endnote-body" );
+XML_CONSTASCII_ACTION( sXML_endnote_citation, "endnote-citation" );
+XML_CONSTASCII_ACTION( sXML_endnote_ref, "endnote-ref" );
+XML_CONSTASCII_ACTION( sXML_endnotes_configuration, "endnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_engraved, "engraved" );
+XML_CONSTASCII_ACTION( sXML_eq, "eq");
+XML_CONSTASCII_ACTION( sXML_equal_author, "equal-author");
+XML_CONSTASCII_ACTION( sXML_equal_comment, "equal-comment");
+XML_CONSTASCII_ACTION( sXML_equal_date, "equal-date");
+XML_CONSTASCII_ACTION( sXML_era, "era" );
+XML_CONSTASCII_ACTION( sXML_ergo_sum, "ergo-sum" );
+XML_CONSTASCII_ACTION( sXML_error_category, "error-category" );
+XML_CONSTASCII_ACTION( sXML_error_lower_indicator, "error-lower-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_lower_limit, "error-lower-limit" );
+XML_CONSTASCII_ACTION( sXML_error_macro, "error-macro" );
+XML_CONSTASCII_ACTION( sXML_error_margin, "error-margin" );
+XML_CONSTASCII_ACTION( sXML_error_message, "error-message" );
+XML_CONSTASCII_ACTION( sXML_error_percentage, "error-percentage" );
+XML_CONSTASCII_ACTION( sXML_error_upper_indicator, "error-upper-indicator" );
+XML_CONSTASCII_ACTION( sXML_error_upper_limit, "error-upper-limit" );
+XML_CONSTASCII_ACTION( sXML_escapement_sub, "sub" );
+XML_CONSTASCII_ACTION( sXML_escapement_super, "super" );
+XML_CONSTASCII_ACTION( sXML_even_page, "even-page" );
+XML_CONSTASCII_ACTION( sXML_event, "event" );
+XML_CONSTASCII_ACTION( sXML_event_name, "event-name" );
+XML_CONSTASCII_ACTION( sXML_events, "events" );
+XML_CONSTASCII_ACTION( sXML_execute, "execute" );
+XML_CONSTASCII_ACTION( sXML_execute_macro, "execute-macro" );
+XML_CONSTASCII_ACTION( sXML_exists, "exists" );
+XML_CONSTASCII_ACTION( sXML_exp, "exp" );
+XML_CONSTASCII_ACTION( sXML_exponential, "exponential" );
+XML_CONSTASCII_ACTION( sXML_expression, "expression");
+XML_CONSTASCII_ACTION( sXML_extra, "extra");
+XML_CONSTASCII_ACTION( sXML_extrude, "extrude" );
+XML_CONSTASCII_ACTION( sXML_factorial, "factorial" );
+XML_CONSTASCII_ACTION( sXML_fade_from_bottom, "fade-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_fade_from_center, "fade-from-center" );
+XML_CONSTASCII_ACTION( sXML_fade_from_left, "fade-from-left" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerleft, "fade-from-lowerleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_lowerright, "fade-from-lowerright" );
+XML_CONSTASCII_ACTION( sXML_fade_from_right, "fade-from-right" );
+XML_CONSTASCII_ACTION( sXML_fade_from_top, "fade-from-top" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperleft, "fade-from-upperleft" );
+XML_CONSTASCII_ACTION( sXML_fade_from_upperright, "fade-from-upperright" );
+XML_CONSTASCII_ACTION( sXML_fade_to_center, "fade-to-center" );
+XML_CONSTASCII_ACTION( sXML_fade_out, "fade-out" );
+XML_CONSTASCII_ACTION( sXML_false, "false" );
+XML_CONSTASCII_ACTION( sXML_family, "family" );
+XML_CONSTASCII_ACTION( sXML_fast, "fast" );
+XML_CONSTASCII_ACTION( sXML_field_number, "field-number");
+XML_CONSTASCII_ACTION( sXML_file_name, "file-name" );
+XML_CONSTASCII_ACTION( sXML_fill, "fill" );
+XML_CONSTASCII_ACTION( sXML_fill_color , "fill-color" );
+XML_CONSTASCII_ACTION( sXML_fill_gradient_name, "fill-gradient-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_name, "fill-hatch-name" );
+XML_CONSTASCII_ACTION( sXML_fill_hatch_solid, "fill-hatch-solid" );
+XML_CONSTASCII_ACTION( sXML_fill_image, "fill-image" );
+XML_CONSTASCII_ACTION( sXML_fill_image_height, "fill-image-height" );
+XML_CONSTASCII_ACTION( sXML_fill_image_name, "fill-image-name" );
+XML_CONSTASCII_ACTION( sXML_fill_image_width, "fill-image-width" );
+XML_CONSTASCII_ACTION( sXML_filter, "filter");
+XML_CONSTASCII_ACTION( sXML_filter_and, "filter-and");
+XML_CONSTASCII_ACTION( sXML_filter_condition, "filter-condition");
+XML_CONSTASCII_ACTION( sXML_filter_name, "filter-name" );
+XML_CONSTASCII_ACTION( sXML_filter_options, "filter-options" );
+XML_CONSTASCII_ACTION( sXML_filter_or, "filter-or");
+XML_CONSTASCII_ACTION( sXML_first_date_time, "first-date-time");
+XML_CONSTASCII_ACTION( sXML_first_page, "first-page");
+XML_CONSTASCII_ACTION( sXML_first_page_number, "first-page-number");
+XML_CONSTASCII_ACTION( sXML_fit_to_contour, "fit-to-contour");
+XML_CONSTASCII_ACTION( sXML_fit_to_size, "fit-to-size" );
+XML_CONSTASCII_ACTION( sXML_fix, "fix" );
+XML_CONSTASCII_ACTION( sXML_fixed, "fixed" );
+XML_CONSTASCII_ACTION( sXML_flat, "flat" );
+XML_CONSTASCII_ACTION( sXML_float, "float");
+XML_CONSTASCII_ACTION( sXML_floating_frame, "floating-frame");
+XML_CONSTASCII_ACTION( sXML_floor, "floor" );
+XML_CONSTASCII_ACTION( sXML_fn, "fn" );
+XML_CONSTASCII_ACTION( sXML_focal_length, "focal-length");
+XML_CONSTASCII_ACTION( sXML_font_char_width, "font-char-width" );
+XML_CONSTASCII_ACTION( sXML_font_charset, "font-charset" );
+XML_CONSTASCII_ACTION( sXML_font_charset_asian, "font-charset-asian" );
+XML_CONSTASCII_ACTION( sXML_font_charset_complex, "font-charset-complex" );
+XML_CONSTASCII_ACTION( sXML_font_color, "font-color" );
+XML_CONSTASCII_ACTION( sXML_font_decl, "font-decl" );
+XML_CONSTASCII_ACTION( sXML_font_decls, "font-decls" );
+XML_CONSTASCII_ACTION( sXML_font_family, "font-family" );
+XML_CONSTASCII_ACTION( sXML_font_family_asian, "font-family-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_complex, "font-family-complex" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic, "font-family-generic" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_asian, "font-family-generic-asian" );
+XML_CONSTASCII_ACTION( sXML_font_family_generic_complex, "font-family-generic-complex" );
+XML_CONSTASCII_ACTION( sXML_font_kerning, "font-kerning" );
+XML_CONSTASCII_ACTION( sXML_font_name, "font-name" );
+XML_CONSTASCII_ACTION( sXML_font_name_asian, "font-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_name_complex, "font-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_pitch, "font-pitch" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_asian, "font-pitch-asian" );
+XML_CONSTASCII_ACTION( sXML_font_pitch_complex, "font-pitch-complex" );
+XML_CONSTASCII_ACTION( sXML_font_relief, "font-relief" );
+XML_CONSTASCII_ACTION( sXML_font_size, "font-size" );
+XML_CONSTASCII_ACTION( sXML_font_size_asian, "font-size-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_complex, "font-size-complex" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel, "font-size-rel" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_asian, "font-size-rel-asian" );
+XML_CONSTASCII_ACTION( sXML_font_size_rel_complex, "font-size-rel-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style, "font-style" );
+XML_CONSTASCII_ACTION( sXML_font_style_asian, "font-style-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_complex, "font-style-complex" );
+XML_CONSTASCII_ACTION( sXML_font_style_name, "font-style-name" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_asian, "font-style-name-asian" );
+XML_CONSTASCII_ACTION( sXML_font_style_name_complex, "font-style-name-complex" );
+XML_CONSTASCII_ACTION( sXML_font_variant, "font-variant" );
+XML_CONSTASCII_ACTION( sXML_font_weight, "font-weight" );
+XML_CONSTASCII_ACTION( sXML_font_weight_asian, "font-weight-asian" );
+XML_CONSTASCII_ACTION( sXML_font_weight_complex, "font-weight-complex" );
+XML_CONSTASCII_ACTION( sXML_font_width, "font-width" );
+XML_CONSTASCII_ACTION( sXML_font_word_line_mode, "font-word-line-mode" );
+XML_CONSTASCII_ACTION( sXML_fontfamily, "fontfamily" );
+XML_CONSTASCII_ACTION( sXML_fontsize, "fontsize" );
+XML_CONSTASCII_ACTION( sXML_fontstyle, "fontstyle" );
+XML_CONSTASCII_ACTION( sXML_fontweight, "fontweight" );
+XML_CONSTASCII_ACTION( sXML_fontwork_adjust, "fontwork-adjust" );
+XML_CONSTASCII_ACTION( sXML_fontwork_distance, "fontwork-distance" );
+XML_CONSTASCII_ACTION( sXML_fontwork_form, "fontwork-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_hide_form, "fontwork-hide-form" );
+XML_CONSTASCII_ACTION( sXML_fontwork_mirror, "fontwork-mirror" );
+XML_CONSTASCII_ACTION( sXML_fontwork_outline, "fontwork-outline" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow, "fontwork-shadow" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_color, "fontwork-shadow-color" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_x, "fontwork-shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_offset_y, "fontwork-shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_fontwork_shadow_transparence, "fontwork-shadow-transparence" );
+XML_CONSTASCII_ACTION( sXML_fontwork_start, "fontwork-start" );
+XML_CONSTASCII_ACTION( sXML_fontwork_style, "fontwork-style" );
+XML_CONSTASCII_ACTION( sXML_footer, "footer" );
+XML_CONSTASCII_ACTION( sXML_footer_left, "footer-left" );
+XML_CONSTASCII_ACTION( sXML_footer_style, "footer-style" );
+XML_CONSTASCII_ACTION( sXML_footnote, "footnote" );
+XML_CONSTASCII_ACTION( sXML_footnote_body, "footnote-body" );
+XML_CONSTASCII_ACTION( sXML_footnote_citation, "footnote-citation" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_backward, "footnote-continuation-notice-backward" );
+XML_CONSTASCII_ACTION( sXML_footnote_continuation_notice_forward, "footnote-continuation-notice-forward" );
+XML_CONSTASCII_ACTION( sXML_footnote_max_height, "footnote-max-height" );
+XML_CONSTASCII_ACTION( sXML_distance_after_sep, "distance-after-sep" );
+XML_CONSTASCII_ACTION( sXML_distance_before_sep, "distance-before-sep" );
+XML_CONSTASCII_ACTION( sXML_footnote_ref, "footnote-ref" );
+XML_CONSTASCII_ACTION( sXML_footnote_sep, "footnote-sep" );
+XML_CONSTASCII_ACTION( sXML_footnotes_configuration, "footnotes-configuration");
+XML_CONSTASCII_ACTION( sXML_footnotes_position, "footnotes-position" );
+XML_CONSTASCII_ACTION( sXML_forall, "forall" );
+XML_CONSTASCII_ACTION( sXML_force_manual, "force-manual" );
+XML_CONSTASCII_ACTION( sXML_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_foreign_object, "foreign-object" );
+XML_CONSTASCII_ACTION( sXML_format_change, "format-change" );
+XML_CONSTASCII_ACTION( sXML_format_source, "format-source" );
+XML_CONSTASCII_ACTION( sXML_forms, "forms" );
+XML_CONSTASCII_ACTION( sXML_formula, "formula");
+XML_CONSTASCII_ACTION( sXML_formula_hidden, "formula-hidden");
+XML_CONSTASCII_ACTION( sXML_formulas, "formulas");
+XML_CONSTASCII_ACTION( sXML_fraction, "fraction" );
+XML_CONSTASCII_ACTION( sXML_frame, "frame" );
+XML_CONSTASCII_ACTION( sXML_frame_content, "frame-content" );
+XML_CONSTASCII_ACTION( sXML_frame_display_scrollbar, "frame-display-scrollbar" );
+XML_CONSTASCII_ACTION( sXML_frame_display_border, "frame-display-border" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_horizontal, "frame-margin-horizontal" );
+XML_CONSTASCII_ACTION( sXML_frame_margin_vertical, "frame-margin-vertical" );
+XML_CONSTASCII_ACTION( sXML_frame_end_margin, "frame-end-margin" );
+XML_CONSTASCII_ACTION( sXML_frame_name, "frame-name" );
+XML_CONSTASCII_ACTION( sXML_frame_start_margin, "frame-start-margin" );
+XML_CONSTASCII_ACTION( sXML_freeze, "freeze" );
+XML_CONSTASCII_ACTION( sXML_freeze_position, "freeze-position" );
+XML_CONSTASCII_ACTION( sXML_from_another_table, "from-another-table" );
+XML_CONSTASCII_ACTION( sXML_from_inside, "from-inside" );
+XML_CONSTASCII_ACTION( sXML_from_left, "from-left" );
+XML_CONSTASCII_ACTION( sXML_from_same_table, "from-same-table" );
+XML_CONSTASCII_ACTION( sXML_from_top, "from-top" );
+XML_CONSTASCII_ACTION( sXML_fuchsia, "fuchsia");
+XML_CONSTASCII_ACTION( sXML_full, "full" );
+XML_CONSTASCII_ACTION( sXML_full_screen, "full-screen" );
+XML_CONSTASCII_ACTION( sXML_function, "function");
+XML_CONSTASCII_ACTION( sXML_g , "g" );
+XML_CONSTASCII_ACTION( sXML_gamma , "gamma" );
+XML_CONSTASCII_ACTION( sXML_gap, "gap" );
+XML_CONSTASCII_ACTION( sXML_gap_width, "gap-width" );
+XML_CONSTASCII_ACTION( sXML_gcd, "gcd" );
+XML_CONSTASCII_ACTION( sXML_generator, "generator" );
+XML_CONSTASCII_ACTION( sXML_geq, "geq" );
+XML_CONSTASCII_ACTION( sXML_gouraud, "gouraud");
+XML_CONSTASCII_ACTION( sXML_gradient , "gradient" );
+XML_CONSTASCII_ACTION( sXML_gradient_angle, "angle" );
+XML_CONSTASCII_ACTION( sXML_gradient_border, "border" );
+XML_CONSTASCII_ACTION( sXML_gradient_step_count , "gradient-step-count" );
+XML_CONSTASCII_ACTION( sXML_gradient_style, "gradient-style" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_axial, "axial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_ellipsoid, "ellipsoid" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_radial, "radial" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_rectangular, "rectangular" );
+XML_CONSTASCII_ACTION( sXML_gradientstyle_square, "square" );
+XML_CONSTASCII_ACTION( sXML_grand_total, "grand-total");
+XML_CONSTASCII_ACTION( sXML_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_gray, "gray" );
+XML_CONSTASCII_ACTION( sXML_green , "green" );
+XML_CONSTASCII_ACTION( sXML_greyscale, "greyscale" );
+XML_CONSTASCII_ACTION( sXML_grid, "grid" );
+XML_CONSTASCII_ACTION( sXML_groove, "groove" );
+XML_CONSTASCII_ACTION( sXML_group_by_field_number, "group-by-field-number");
+XML_CONSTASCII_ACTION( sXML_group_name, "group-name" );
+XML_CONSTASCII_ACTION( sXML_grouping, "grouping" );
+XML_CONSTASCII_ACTION( sXML_gt, "gt" );
+XML_CONSTASCII_ACTION( sXML_h, "h" );
+XML_CONSTASCII_ACTION( sXML_hanging, "hanging" );
+XML_CONSTASCII_ACTION( sXML_has_persistent_data, "has-persistent-data");
+XML_CONSTASCII_ACTION( sXML_hatch , "hatch" );
+XML_CONSTASCII_ACTION( sXML_hatch_distance, "distance" );
+XML_CONSTASCII_ACTION( sXML_hatch_style, "style" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_double, "double" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_single, "single" );
+XML_CONSTASCII_ACTION( sXML_hatchstyle_triple, "triple" );
+XML_CONSTASCII_ACTION( sXML_header, "header" );
+XML_CONSTASCII_ACTION( sXML_header_left, "header-left" );
+XML_CONSTASCII_ACTION( sXML_header_style, "header-style" );
+XML_CONSTASCII_ACTION( sXML_headers, "headers" );
+XML_CONSTASCII_ACTION( sXML_height, "height" );
+XML_CONSTASCII_ACTION( sXML_help_file_name, "help-file-name" );
+XML_CONSTASCII_ACTION( sXML_help_id, "help-id" );
+XML_CONSTASCII_ACTION( sXML_help_message, "help-message" );
+XML_CONSTASCII_ACTION( sXML_hidden, "hidden" );
+XML_CONSTASCII_ACTION( sXML_hidden_and_protected, "hidden-and-protected");
+XML_CONSTASCII_ACTION( sXML_hidden_paragraph, "hidden-paragraph" );
+XML_CONSTASCII_ACTION( sXML_hidden_text, "hidden-text" );
+XML_CONSTASCII_ACTION( sXML_highlighted_range, "highlighted-range" );
+XML_CONSTASCII_ACTION( sXML_horizontal, "horizontal" );
+XML_CONSTASCII_ACTION( sXML_horizontal_lines, "horizontal-lines" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_left_pages, "horizontal-on-left-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_on_right_pages, "horizontal-on-right-pages" );
+XML_CONSTASCII_ACTION( sXML_horizontal_pos, "horizontal-pos" );
+XML_CONSTASCII_ACTION( sXML_horizontal_rel, "horizontal-rel" );
+XML_CONSTASCII_ACTION( sXML_horizontal_scrollbar_width, "horizontal-scrollbar-width" );
+XML_CONSTASCII_ACTION( sXML_horizontal_segments, "horizontal-segments" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_mode, "horizontal-split-mode" );
+XML_CONSTASCII_ACTION( sXML_horizontal_split_position, "horizontal-split-position" );
+XML_CONSTASCII_ACTION( sXML_horizontal_stripes, "horizontal-stripes" );
+XML_CONSTASCII_ACTION( sXML_hours, "hours" );
+XML_CONSTASCII_ACTION( sXML_howpublished, "howpublished" );
+XML_CONSTASCII_ACTION( sXML_href, "href" );
+XML_CONSTASCII_ACTION( sXML_html, "html");
+XML_CONSTASCII_ACTION( sXML_hyperlink_behaviour, "hyperlink-behaviour" );
+XML_CONSTASCII_ACTION( sXML_hyphenate, "hyphenate" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_keep, "hyphenation-keep" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_ladder_count, "hyphenation-ladder-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_push_char_count, "hyphenation-push-char-count" );
+XML_CONSTASCII_ACTION( sXML_hyphenation_remain_char_count, "hyphenation-remain-char-count" );
+XML_CONSTASCII_ACTION( sXML_i, "i" );
+XML_CONSTASCII_ACTION( sXML_icon, "icon" );
+XML_CONSTASCII_ACTION( sXML_id, "id" );
+XML_CONSTASCII_ACTION( sXML_ident, "ident");
+XML_CONSTASCII_ACTION( sXML_identifier, "identifier" );
+XML_CONSTASCII_ACTION( sXML_identify_categories, "identify-categories");
+XML_CONSTASCII_ACTION( sXML_ideograph_alpha, "ideograph-alpha");
+XML_CONSTASCII_ACTION( sXML_ignore_case, "ignore-case" );
+XML_CONSTASCII_ACTION( sXML_ignore_empty_rows, "ignore-empty-rows");
+XML_CONSTASCII_ACTION( sXML_illustration_index, "illustration-index" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_entry_template, "illustration-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_illustration_index_source, "illustration-index-source" );
+XML_CONSTASCII_ACTION( sXML_image, "image" );
+XML_CONSTASCII_ACTION( sXML_image_count, "image-count" );
+XML_CONSTASCII_ACTION( sXML_image_map, "image-map" );
+XML_CONSTASCII_ACTION( sXML_implies, "implies" );
+XML_CONSTASCII_ACTION( sXML_in, "in");
+XML_CONSTASCII_ACTION( sXML_in_range, "in-range");
+XML_CONSTASCII_ACTION( sXML_inbook, "inbook" );
+XML_CONSTASCII_ACTION( sXML_incollection, "incollection" );
+XML_CONSTASCII_ACTION( sXML_increment, "increment" );
+XML_CONSTASCII_ACTION( sXML_index, "index");
+XML_CONSTASCII_ACTION( sXML_index_body, "index-body");
+XML_CONSTASCII_ACTION( sXML_index_entry_bibliography, "index-entry-bibliography" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter, "index-entry-chapter" );
+XML_CONSTASCII_ACTION( sXML_index_entry_chapter_number, "index-entry-chapter-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_end, "index-entry-link-end" );
+XML_CONSTASCII_ACTION( sXML_index_entry_link_start, "index-entry-link-start" );
+XML_CONSTASCII_ACTION( sXML_index_entry_page_number, "index-entry-page-number" );
+XML_CONSTASCII_ACTION( sXML_index_entry_span, "index-entry-span" );
+XML_CONSTASCII_ACTION( sXML_index_entry_tab_stop, "index-entry-tab-stop" );
+XML_CONSTASCII_ACTION( sXML_index_entry_template, "index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_index_entry_text, "index-entry-text" );
+XML_CONSTASCII_ACTION( sXML_index_name, "index-name" );
+XML_CONSTASCII_ACTION( sXML_index_scope, "index-scope" );
+XML_CONSTASCII_ACTION( sXML_index_source_style, "index-source-style" );
+XML_CONSTASCII_ACTION( sXML_index_source_styles, "index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_index_title, "index-title" );
+XML_CONSTASCII_ACTION( sXML_index_title_template, "index-title-template" );
+XML_CONSTASCII_ACTION( sXML_information, "information" );
+XML_CONSTASCII_ACTION( sXML_initial_creator, "initial-creator" );
+XML_CONSTASCII_ACTION( sXML_inproceedings, "inproceedings" );
+XML_CONSTASCII_ACTION( sXML_insertion, "insertion" );
+XML_CONSTASCII_ACTION( sXML_insertion_cut_off, "insertion-cut-off" );
+XML_CONSTASCII_ACTION( sXML_inset, "inset" );
+XML_CONSTASCII_ACTION( sXML_inside, "inside" );
+XML_CONSTASCII_ACTION( sXML_institution, "institution" );
+XML_CONSTASCII_ACTION( sXML_int, "int" );
+XML_CONSTASCII_ACTION( sXML_intensity, "intensity" );
+XML_CONSTASCII_ACTION( sXML_intersect, "intersect" );
+XML_CONSTASCII_ACTION( sXML_interval, "interval" );
+XML_CONSTASCII_ACTION( sXML_interval_major, "interval-major" );
+XML_CONSTASCII_ACTION( sXML_interval_minor, "interval-minor" );
+XML_CONSTASCII_ACTION( sXML_into_english_number, "into-english-number" );
+XML_CONSTASCII_ACTION( sXML_inverse, "inverse" );
+XML_CONSTASCII_ACTION( sXML_is_active, "is-active");
+XML_CONSTASCII_ACTION( sXML_is_data_layout_field, "is-data-layout-field");
+XML_CONSTASCII_ACTION( sXML_is_hidden, "is-hidden" );
+XML_CONSTASCII_ACTION( sXML_is_selection, "is-selection");
+XML_CONSTASCII_ACTION( sXML_isbn, "isbn" );
+XML_CONSTASCII_ACTION( sXML_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_iteration, "iteration" );
+XML_CONSTASCII_ACTION( sXML_journal, "journal" );
+XML_CONSTASCII_ACTION( sXML_justified, "justified" );
+XML_CONSTASCII_ACTION( sXML_justify, "justify" );
+XML_CONSTASCII_ACTION( sXML_justify_single_word, "justify-single-word" );
+XML_CONSTASCII_ACTION( sXML_keep_with_next, "keep-with-next" );
+XML_CONSTASCII_ACTION( sXML_kerning_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_key, "key" );
+XML_CONSTASCII_ACTION( sXML_key1, "key1" );
+XML_CONSTASCII_ACTION( sXML_key2, "key2" );
+XML_CONSTASCII_ACTION( sXML_keyword, "keyword" );
+XML_CONSTASCII_ACTION( sXML_keywords, "keywords" );
+XML_CONSTASCII_ACTION( sXML_km, "km" );
+XML_CONSTASCII_ACTION( sXML_label, "label" );
+XML_CONSTASCII_ACTION( sXML_label_arrangement, "label-arrangement" );
+XML_CONSTASCII_ACTION( sXML_label_cell_address, "label-cell-address" );
+XML_CONSTASCII_ACTION( sXML_label_cell_range_address, "label-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_label_range, "label-range" );
+XML_CONSTASCII_ACTION( sXML_label_ranges, "label-ranges" );
+XML_CONSTASCII_ACTION( sXML_layer, "layer" );
+XML_CONSTASCII_ACTION( sXML_layer_set, "layer-set" );
+XML_CONSTASCII_ACTION( sXML_lambda, "lambda" );
+XML_CONSTASCII_ACTION( sXML_landscape, "landscape" );
+XML_CONSTASCII_ACTION( sXML_language, "language" );
+XML_CONSTASCII_ACTION( sXML_language_asian, "language-asian" );
+XML_CONSTASCII_ACTION( sXML_language_complex, "language-complex" );
+XML_CONSTASCII_ACTION( sXML_last_column_spanned, "last-column-spanned" );
+XML_CONSTASCII_ACTION( sXML_last_page, "last-page" );
+XML_CONSTASCII_ACTION( sXML_last_row_spanned, "last-row-spanned" );
+XML_CONSTASCII_ACTION( sXML_leader_char, "leader-char" );
+XML_CONSTASCII_ACTION( sXML_left, "left" );
+XML_CONSTASCII_ACTION( sXML_left_outside, "left-outside" );
+XML_CONSTASCII_ACTION( sXML_left_top_position, "left-top-position" );
+XML_CONSTASCII_ACTION( sXML_legend, "legend" );
+XML_CONSTASCII_ACTION( sXML_legend_position, "legend-position" );
+XML_CONSTASCII_ACTION( sXML_length, "length" );
+XML_CONSTASCII_ACTION( sXML_leq, "leq" );
+XML_CONSTASCII_ACTION( sXML_let_text, "let-text" );
+XML_CONSTASCII_ACTION( sXML_letter_kerning, "letter-kerning" );
+XML_CONSTASCII_ACTION( sXML_letter_spacing, "letter-spacing" );
+XML_CONSTASCII_ACTION( sXML_letters, "letters" );
+XML_CONSTASCII_ACTION( sXML_level, "level" );
+XML_CONSTASCII_ACTION( sXML_library, "library" );
+XML_CONSTASCII_ACTION( sXML_library_embedded, "library-embedded" );
+XML_CONSTASCII_ACTION( sXML_library_linked, "library-linked" );
+XML_CONSTASCII_ACTION( sXML_light, "light");
+XML_CONSTASCII_ACTION( sXML_lighting_mode, "lighting-mode");
+XML_CONSTASCII_ACTION( sXML_lime, "lime" );
+XML_CONSTASCII_ACTION( sXML_limit, "limit" );
+XML_CONSTASCII_ACTION( sXML_line, "line" );
+XML_CONSTASCII_ACTION( sXML_line_break, "line-break" );
+XML_CONSTASCII_ACTION( sXML_line_height, "line-height" );
+XML_CONSTASCII_ACTION( sXML_line_height_at_least, "line-height-at-least" );
+XML_CONSTASCII_ACTION( sXML_line_spacing, "line-spacing" );
+XML_CONSTASCII_ACTION( sXML_linear, "linear" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_configuration, "linenumbering-configuration" );
+XML_CONSTASCII_ACTION( sXML_linenumbering_separator, "linenumbering-separator" );
+XML_CONSTASCII_ACTION( sXML_lines, "lines" );
+XML_CONSTASCII_ACTION( sXML_lines_used, "lines-used" );
+XML_CONSTASCII_ACTION( sXML_link_data_style_to_source, "link-data-style-to-source" );
+XML_CONSTASCII_ACTION( sXML_link_to_source_data, "link-to-source-data" );
+XML_CONSTASCII_ACTION( sXML_list, "list");
+XML_CONSTASCII_ACTION( sXML_list_block, "list-block" );
+XML_CONSTASCII_ACTION( sXML_list_header, "list-header" );
+XML_CONSTASCII_ACTION( sXML_list_info, "list-info" );
+XML_CONSTASCII_ACTION( sXML_list_item, "list-item" );
+XML_CONSTASCII_ACTION( sXML_list_level, "list-level" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_bullet, "list-level-style-bullet" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_image, "list-level-style-image" );
+XML_CONSTASCII_ACTION( sXML_list_level_style_number, "list-level-style-number" );
+XML_CONSTASCII_ACTION( sXML_list_name, "list-name" );
+XML_CONSTASCII_ACTION( sXML_list_style, "list-style" );
+XML_CONSTASCII_ACTION( sXML_list_style_name, "list-style-name" );
+XML_CONSTASCII_ACTION( sXML_ln, "ln" );
+XML_CONSTASCII_ACTION( sXML_locked, "locked" );
+XML_CONSTASCII_ACTION( sXML_log, "log" );
+XML_CONSTASCII_ACTION( sXML_logarithmic, "logarithmic" );
+XML_CONSTASCII_ACTION( sXML_logbase, "logbase" );
+XML_CONSTASCII_ACTION( sXML_long, "long" );
+XML_CONSTASCII_ACTION( sXML_lowlimit, "lowlimit" );
+XML_CONSTASCII_ACTION( sXML_lr_tb, "lr-tb" );
+XML_CONSTASCII_ACTION( sXML_lt, "lt");
+XML_CONSTASCII_ACTION( sXML_ltr, "ltr");
+XML_CONSTASCII_ACTION( sXML_luminance , "luminance" );
+XML_CONSTASCII_ACTION( sXML_macro_name, "macro-name");
+XML_CONSTASCII_ACTION( sXML_maction, "maction");
+XML_CONSTASCII_ACTION( sXML_main_entry_style_name, "main-entry-style-name" );
+XML_CONSTASCII_ACTION( sXML_major, "major" );
+XML_CONSTASCII_ACTION( sXML_maligngroup, "maligngroup");
+XML_CONSTASCII_ACTION( sXML_malignmark, "malignmark");
+XML_CONSTASCII_ACTION( sXML_manual, "manual" );
+XML_CONSTASCII_ACTION( sXML_map, "map" );
+XML_CONSTASCII_ACTION( sXML_margin_bottom, "margin-bottom" );
+XML_CONSTASCII_ACTION( sXML_margin_left, "margin-left" );
+XML_CONSTASCII_ACTION( sXML_margin_right, "margin-right" );
+XML_CONSTASCII_ACTION( sXML_margin_top, "margin-top" );
+XML_CONSTASCII_ACTION( sXML_margins, "margins" );
+XML_CONSTASCII_ACTION( sXML_marker, "marker" );
+XML_CONSTASCII_ACTION( sXML_marker_end , "marker-end" );
+XML_CONSTASCII_ACTION( sXML_marker_end_center , "marker-end-center" );
+XML_CONSTASCII_ACTION( sXML_marker_end_width , "marker-end-width" );
+XML_CONSTASCII_ACTION( sXML_marker_start , "marker-start" );
+XML_CONSTASCII_ACTION( sXML_marker_start_center , "marker-start-center" );
+XML_CONSTASCII_ACTION( sXML_marker_start_width , "marker-start-width" );
+XML_CONSTASCII_ACTION( sXML_maroon, "maroon" );
+XML_CONSTASCII_ACTION( sXML_master_page, "master-page" );
+XML_CONSTASCII_ACTION( sXML_master_page_name , "master-page-name" );
+XML_CONSTASCII_ACTION( sXML_master_styles, "master-styles" );
+XML_CONSTASCII_ACTION( sXML_mastersthesis, "mastersthesis" );
+XML_CONSTASCII_ACTION( sXML_match, "match");
+XML_CONSTASCII_ACTION( sXML_math, "math");
+XML_CONSTASCII_ACTION( sXML_matrix, "matrix");
+XML_CONSTASCII_ACTION( sXML_matrix_covered, "matrix-covered");
+XML_CONSTASCII_ACTION( sXML_matrixrow, "matrixrow");
+XML_CONSTASCII_ACTION( sXML_max, "max" );
+XML_CONSTASCII_ACTION( sXML_max_edge, "max-edge");
+XML_CONSTASCII_ACTION( sXML_max_height, "max-height");
+XML_CONSTASCII_ACTION( sXML_max_width, "max-width");
+XML_CONSTASCII_ACTION( sXML_maximum, "maximum" );
+XML_CONSTASCII_ACTION( sXML_maximum_difference, "maximum-difference" );
+XML_CONSTASCII_ACTION( sXML_may_break_between_rows, "may-break-between-rows" );
+XML_CONSTASCII_ACTION( sXML_may_script, "may-script" );
+XML_CONSTASCII_ACTION( sXML_mean, "mean" );
+XML_CONSTASCII_ACTION( sXML_mean_value, "mean-value" );
+XML_CONSTASCII_ACTION( sXML_measure, "measure" );
+XML_CONSTASCII_ACTION( sXML_measure_align, "measure-align" );
+XML_CONSTASCII_ACTION( sXML_measure_vertical_align, "measure-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_median, "median" );
+XML_CONSTASCII_ACTION( sXML_medium, "medium" );
+XML_CONSTASCII_ACTION( sXML_merror, "merror" );
+XML_CONSTASCII_ACTION( sXML_message_type, "message-type" );
+XML_CONSTASCII_ACTION( sXML_meta, "meta" );
+XML_CONSTASCII_ACTION( sXML_mfenced, "mfenced" );
+XML_CONSTASCII_ACTION( sXML_mfrac, "mfrac" );
+XML_CONSTASCII_ACTION( sXML_mi, "mi" ); //MathML Math Identifier
+XML_CONSTASCII_ACTION( sXML_middle, "middle" );
+XML_CONSTASCII_ACTION( sXML_mime_type, "mime-type" );
+XML_CONSTASCII_ACTION( sXML_min, "min" );
+XML_CONSTASCII_ACTION( sXML_min_denominator_digits, "min-denominator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_edge, "min-edge");
+XML_CONSTASCII_ACTION( sXML_min_exponent_digits, "min-exponent-digits" );
+XML_CONSTASCII_ACTION( sXML_min_height, "min-height" );
+XML_CONSTASCII_ACTION( sXML_min_width, "min-width" );
+XML_CONSTASCII_ACTION( sXML_min_integer_digits, "min-integer-digits" );
+XML_CONSTASCII_ACTION( sXML_min_label_distance, "min-label-distance" );
+XML_CONSTASCII_ACTION( sXML_min_label_width, "min-label-width" );
+XML_CONSTASCII_ACTION( sXML_min_line_height, "min-line-height" );
+XML_CONSTASCII_ACTION( sXML_min_numerator_digits, "min-numerator-digits" );
+XML_CONSTASCII_ACTION( sXML_min_row_height, "min-row-height" );
+XML_CONSTASCII_ACTION( sXML_minimum, "minimum" );
+XML_CONSTASCII_ACTION( sXML_minor, "minor" );
+XML_CONSTASCII_ACTION( sXML_minus, "minus" );
+XML_CONSTASCII_ACTION( sXML_minutes, "minutes" );
+XML_CONSTASCII_ACTION( sXML_mirror, "mirror" );
+XML_CONSTASCII_ACTION( sXML_mirrored, "mirrored" );
+XML_CONSTASCII_ACTION( sXML_misc, "misc" );
+XML_CONSTASCII_ACTION( sXML_miter , "miter" );
+XML_CONSTASCII_ACTION( sXML_mmultiscripts, "mmultiscripts" );
+XML_CONSTASCII_ACTION( sXML_mm, "mm" );
+XML_CONSTASCII_ACTION( sXML_mn, "mn" );
+XML_CONSTASCII_ACTION( sXML_mo, "mo" );
+XML_CONSTASCII_ACTION( sXML_mode, "mode" );
+XML_CONSTASCII_ACTION( sXML_modern, "modern" );
+XML_CONSTASCII_ACTION( sXML_modification_date, "modification-date" );
+XML_CONSTASCII_ACTION( sXML_modification_time, "modification-time" );
+XML_CONSTASCII_ACTION( sXML_modulate, "modulate" );
+XML_CONSTASCII_ACTION( sXML_module, "module" );
+XML_CONSTASCII_ACTION( sXML_moment, "moment" );
+XML_CONSTASCII_ACTION( sXML_mono, "mono" );
+XML_CONSTASCII_ACTION( sXML_month, "month" );
+XML_CONSTASCII_ACTION( sXML_move_from_bottom, "move-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_move_from_left, "move-from-left" );
+XML_CONSTASCII_ACTION( sXML_move_from_right, "move-from-right" );
+XML_CONSTASCII_ACTION( sXML_move_from_top, "move-from-top" );
+XML_CONSTASCII_ACTION( sXML_move_protect, "move-protect" );
+XML_CONSTASCII_ACTION( sXML_mover, "mover" );
+XML_CONSTASCII_ACTION( sXML_movement, "movement" );
+XML_CONSTASCII_ACTION( sXML_movement_cut_off, "movement-cut-off" );
+XML_CONSTASCII_ACTION( sXML_mouse_as_pen, "mouse-as-pen" );
+XML_CONSTASCII_ACTION( sXML_mouse_visible, "mouse-visible" );
+XML_CONSTASCII_ACTION( sXML_mpadded, "mpadded");
+XML_CONSTASCII_ACTION( sXML_mphantom, "mphantom");
+XML_CONSTASCII_ACTION( sXML_mprescripts, "mprescripts");
+XML_CONSTASCII_ACTION( sXML_mroot, "mroot");
+XML_CONSTASCII_ACTION( sXML_mrow, "mrow");
+XML_CONSTASCII_ACTION( sXML_ms, "ms");
+XML_CONSTASCII_ACTION( sXML_mspace, "mspace");
+XML_CONSTASCII_ACTION( sXML_msqrt, "msqrt");
+XML_CONSTASCII_ACTION( sXML_mstyle, "mstyle");
+XML_CONSTASCII_ACTION( sXML_msub, "msub");
+XML_CONSTASCII_ACTION( sXML_msubsup, "msubsup");
+XML_CONSTASCII_ACTION( sXML_msup, "msup");
+XML_CONSTASCII_ACTION( sXML_mtable, "mtable");
+XML_CONSTASCII_ACTION( sXML_mtd, "mtd");
+XML_CONSTASCII_ACTION( sXML_mtext, "mtext");
+XML_CONSTASCII_ACTION( sXML_mtr, "mtr");
+XML_CONSTASCII_ACTION( sXML_multi_deletion_spanned, "multi-deletion-spanned");
+XML_CONSTASCII_ACTION( sXML_munder, "munder");
+XML_CONSTASCII_ACTION( sXML_munderover, "munderover");
+XML_CONSTASCII_ACTION( sXML_name, "name" );
+XML_CONSTASCII_ACTION( sXML_name_and_extension, "name-and-extension" );
+XML_CONSTASCII_ACTION( sXML_named_expression, "named-expression");
+XML_CONSTASCII_ACTION( sXML_named_expressions, "named-expressions");
+XML_CONSTASCII_ACTION( sXML_named_range, "named-range");
+XML_CONSTASCII_ACTION( sXML_navy, "navy");
+XML_CONSTASCII_ACTION( sXML_neq, "neq" );
+XML_CONSTASCII_ACTION( sXML_new, "new" );
+XML_CONSTASCII_ACTION( sXML_next, "next" );
+XML_CONSTASCII_ACTION( sXML_next_page, "next-page" );
+XML_CONSTASCII_ACTION( sXML_next_style_name, "next-style-name" );
+XML_CONSTASCII_ACTION( sXML_nohref, "nohref" );
+XML_CONSTASCII_ACTION( sXML_no_limit, "no-limit" );
+XML_CONSTASCII_ACTION( sXML_no_wrap, "no-wrap" );
+XML_CONSTASCII_ACTION( sXML_noempty, "!empty");
+XML_CONSTASCII_ACTION( sXML_nomatch, "!match");
+XML_CONSTASCII_ACTION( sXML_none, "none" );
+XML_CONSTASCII_ACTION( sXML_noprtsubset, "notprsubset" );
+XML_CONSTASCII_ACTION( sXML_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_normals_direction, "normals-direction" );
+XML_CONSTASCII_ACTION( sXML_normals_kind, "normals-kind" );
+XML_CONSTASCII_ACTION( sXML_not, "not" );
+XML_CONSTASCII_ACTION( sXML_not_equal_date, "not-equal-date" );
+XML_CONSTASCII_ACTION( sXML_note, "note" );
+XML_CONSTASCII_ACTION( sXML_notes, "notes" );
+XML_CONSTASCII_ACTION( sXML_notin, "notin" );
+XML_CONSTASCII_ACTION( sXML_notsubset, "notsubset" );
+XML_CONSTASCII_ACTION( sXML_null_date, "null-date" );
+XML_CONSTASCII_ACTION( sXML_null_year, "null-year" );
+XML_CONSTASCII_ACTION( sXML_num_format, "num-format" );
+XML_CONSTASCII_ACTION( sXML_num_letter_sync, "num-letter-sync" );
+XML_CONSTASCII_ACTION( sXML_num_prefix, "num-prefix" );
+XML_CONSTASCII_ACTION( sXML_num_suffix, "num-suffix" );
+XML_CONSTASCII_ACTION( sXML_number, "number" );
+XML_CONSTASCII_ACTION( sXML_number_and_name, "number-and-name" );
+XML_CONSTASCII_ACTION( sXML_number_columns_repeated, "number-columns-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_columns_spanned, "number-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_lines, "number-lines" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_columns_spanned, "number-matrix-columns-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_matrix_rows_spanned, "number-matrix-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_position, "number-position" );
+XML_CONSTASCII_ACTION( sXML_number_rows_repeated, "number-rows-repeated" );
+XML_CONSTASCII_ACTION( sXML_number_rows_spanned, "number-rows-spanned" );
+XML_CONSTASCII_ACTION( sXML_number_style, "number-style" );
+XML_CONSTASCII_ACTION( sXML_number_wrapped_paragraphs, "number-wrapped-paragraphs" );
+XML_CONSTASCII_ACTION( sXML_numbered_entries, "numbered-entries" );
+XML_CONSTASCII_ACTION( sXML_object, "object" );
+XML_CONSTASCII_ACTION( sXML_object_count, "object-count" );
+XML_CONSTASCII_ACTION( sXML_object_index, "object-index" );
+XML_CONSTASCII_ACTION( sXML_object_index_entry_template, "object-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_object_index_source, "object-index-source" );
+XML_CONSTASCII_ACTION( sXML_object_name, "object-name");
+XML_CONSTASCII_ACTION( sXML_object_ole, "object-ole" );
+XML_CONSTASCII_ACTION( sXML_objects, "objects" );
+XML_CONSTASCII_ACTION( sXML_odd_page, "odd-page" );
+XML_CONSTASCII_ACTION( sXML_offset, "offset" );
+XML_CONSTASCII_ACTION( sXML_olive, "olive" );
+XML_CONSTASCII_ACTION( sXML_online, "online" );
+XML_CONSTASCII_ACTION( sXML_online_text, "online-text" );
+XML_CONSTASCII_ACTION( sXML_onLoad, "onLoad" );
+XML_CONSTASCII_ACTION( sXML_onRequest, "onRequest" );
+XML_CONSTASCII_ACTION( sXML_on_update_keep_size, "on-update-keep-size");
+XML_CONSTASCII_ACTION( sXML_on_update_keep_styles, "on-update-keep-styles");
+XML_CONSTASCII_ACTION( sXML_opaque_background, "background" );
+XML_CONSTASCII_ACTION( sXML_opaque_foreground, "foreground" );
+XML_CONSTASCII_ACTION( sXML_open, "open" );
+XML_CONSTASCII_ACTION( sXML_open_horizontal, "open-horizontal" );
+XML_CONSTASCII_ACTION( sXML_open_vertical, "open-vertical" );
+XML_CONSTASCII_ACTION( sXML_operation, "operation");
+XML_CONSTASCII_ACTION( sXML_operator, "operator");
+XML_CONSTASCII_ACTION( sXML_optimal, "optimal");
+XML_CONSTASCII_ACTION( sXML_or, "or");
+XML_CONSTASCII_ACTION( sXML_order, "order");
+XML_CONSTASCII_ACTION( sXML_ordered_list, "ordered-list" );
+XML_CONSTASCII_ACTION( sXML_organizations, "organizations" );
+XML_CONSTASCII_ACTION( sXML_orientation, "orientation");
+XML_CONSTASCII_ACTION( sXML_orientation_landscape, "orientation-landscape" );
+XML_CONSTASCII_ACTION( sXML_orientation_portrait, "orientation-portrait" );
+XML_CONSTASCII_ACTION( sXML_origin, "origin" );
+XML_CONSTASCII_ACTION( sXML_orphans, "orphans" );
+XML_CONSTASCII_ACTION( sXML_outline_level, "outline-level" );
+XML_CONSTASCII_ACTION( sXML_outline_level_style, "outline-level-style" );
+XML_CONSTASCII_ACTION( sXML_outline_style, "outline-style" );
+XML_CONSTASCII_ACTION( sXML_outset, "outset" );
+XML_CONSTASCII_ACTION( sXML_outside, "outside" );
+XML_CONSTASCII_ACTION( sXML_overlap, "overlap" );
+XML_CONSTASCII_ACTION( sXML_p, "p" );
+XML_CONSTASCII_ACTION( sXML_package_name, "package-name" );
+XML_CONSTASCII_ACTION( sXML_padding, "padding" );
+XML_CONSTASCII_ACTION( sXML_padding_bottom, "padding-bottom" );
+XML_CONSTASCII_ACTION( sXML_padding_left, "padding-left" );
+XML_CONSTASCII_ACTION( sXML_padding_right, "padding-right" );
+XML_CONSTASCII_ACTION( sXML_padding_top, "padding-top" );
+XML_CONSTASCII_ACTION( sXML_page, "page" );
+XML_CONSTASCII_ACTION( sXML_page_adjust, "page-adjust" );
+XML_CONSTASCII_ACTION( sXML_page_breaks_on_group_change, "page-breaks-on-group-change");
+XML_CONSTASCII_ACTION( sXML_page_content, "page-content" );
+XML_CONSTASCII_ACTION( sXML_page_continuation_string, "page-continuation-string" );
+XML_CONSTASCII_ACTION( sXML_page_count, "page-count" );
+XML_CONSTASCII_ACTION( sXML_page_end_margin, "page-end-margin" );
+XML_CONSTASCII_ACTION( sXML_page_height, "page-height" );
+XML_CONSTASCII_ACTION( sXML_page_master, "page-master" );
+XML_CONSTASCII_ACTION( sXML_page_master_name, "page-master-name" );
+XML_CONSTASCII_ACTION( sXML_page_number, "page-number" );
+XML_CONSTASCII_ACTION( sXML_page_start_margin, "page-start-margin" );
+XML_CONSTASCII_ACTION( sXML_page_style_name, "page-style-name" );
+XML_CONSTASCII_ACTION( sXML_page_thumbnail, "page-thumbnail" );
+XML_CONSTASCII_ACTION( sXML_page_usage, "page-usage" );
+XML_CONSTASCII_ACTION( sXML_page_variable_get, "page-variable-get" );
+XML_CONSTASCII_ACTION( sXML_page_variable_set, "page-variable-set" );
+XML_CONSTASCII_ACTION( sXML_page_view_zoom_value, "page-view-zoom-value" );
+XML_CONSTASCII_ACTION( sXML_page_width, "page-width" );
+XML_CONSTASCII_ACTION( sXML_pages, "pages" );
+XML_CONSTASCII_ACTION( sXML_paper_tray_number, "paper-tray-number" );
+XML_CONSTASCII_ACTION( sXML_paragraph, "paragraph" );
+XML_CONSTASCII_ACTION( sXML_paragraph_content, "paragraph-content" );
+XML_CONSTASCII_ACTION( sXML_paragraph_count, "paragraph-count" );
+XML_CONSTASCII_ACTION( sXML_paragraph_end_margin, "paragraph-end-margin" );
+XML_CONSTASCII_ACTION( sXML_paragraph_start_margin, "paragraph-start-margin" );
+XML_CONSTASCII_ACTION( sXML_param, "param" );
+XML_CONSTASCII_ACTION( sXML_parallel, "parallel" );
+XML_CONSTASCII_ACTION( sXML_parent_style_name, "parent-style-name" );
+XML_CONSTASCII_ACTION( sXML_parse_sql_statement, "parse-sql-statement");
+XML_CONSTASCII_ACTION( sXML_parsed, "parsed" );
+XML_CONSTASCII_ACTION( sXML_pause, "pause" );
+XML_CONSTASCII_ACTION( sXML_partialdiff, "partialdiff");
+XML_CONSTASCII_ACTION( sXML_password, "password");
+XML_CONSTASCII_ACTION( sXML_passwort, "passwort");
+XML_CONSTASCII_ACTION( sXML_path , "path" );
+XML_CONSTASCII_ACTION( sXML_pending , "pending" );
+XML_CONSTASCII_ACTION( sXML_percentage, "percentage");
+XML_CONSTASCII_ACTION( sXML_percentage_style, "percentage-style" );
+XML_CONSTASCII_ACTION( sXML_perspective, "perspective");
+XML_CONSTASCII_ACTION( sXML_phdthesis, "phdthesis" );
+XML_CONSTASCII_ACTION( sXML_phong, "phong");
+XML_CONSTASCII_ACTION( sXML_pie_offset, "pie-offset" );
+XML_CONSTASCII_ACTION( sXML_placeholder, "placeholder" );
+XML_CONSTASCII_ACTION( sXML_placeholder_type, "placeholder-type" );
+XML_CONSTASCII_ACTION( sXML_placing, "placing" );
+XML_CONSTASCII_ACTION( sXML_plain_number, "plain-number" );
+XML_CONSTASCII_ACTION( sXML_plain_number_and_name, "plain-number-and-name" );
+XML_CONSTASCII_ACTION( sXML_plot_area, "plot-area" );
+XML_CONSTASCII_ACTION( sXML_plugin, "plugin" );
+XML_CONSTASCII_ACTION( sXML_plus, "plus" );
+XML_CONSTASCII_ACTION( sXML_points, "points" );
+XML_CONSTASCII_ACTION( sXML_polygon , "polygon" );
+XML_CONSTASCII_ACTION( sXML_polyline , "polyline" );
+XML_CONSTASCII_ACTION( sXML_polynomial, "polynomial" );
+XML_CONSTASCII_ACTION( sXML_pool_id, "pool-id" );
+XML_CONSTASCII_ACTION( sXML_portrait, "portrait" );
+XML_CONSTASCII_ACTION( sXML_position, "position" );
+XML_CONSTASCII_ACTION( sXML_position_bottom, "position-bottom" );
+XML_CONSTASCII_ACTION( sXML_position_left, "position-left" );
+XML_CONSTASCII_ACTION( sXML_position_right, "position-right" );
+XML_CONSTASCII_ACTION( sXML_position_top, "position-top" );
+XML_CONSTASCII_ACTION( sXML_posture_italic, "italic" );
+XML_CONSTASCII_ACTION( sXML_posture_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_posture_oblique, "oblique" );
+XML_CONSTASCII_ACTION( sXML_power, "power" );
+XML_CONSTASCII_ACTION( sXML_precision_as_shown, "precision-as-shown" );
+XML_CONSTASCII_ACTION( sXML_prefix, "prefix" );
+XML_CONSTASCII_ACTION( sXML_presentation, "presentation" );
+XML_CONSTASCII_ACTION( sXML_presentation_chart , "chart" );
+XML_CONSTASCII_ACTION( sXML_presentation_graphic , "graphic" );
+XML_CONSTASCII_ACTION( sXML_presentation_notes , "notes" );
+XML_CONSTASCII_ACTION( sXML_presentation_object , "object" );
+XML_CONSTASCII_ACTION( sXML_presentation_orgchart , "orgchart" );
+XML_CONSTASCII_ACTION( sXML_presentation_outline , "outline" );
+XML_CONSTASCII_ACTION( sXML_presentation_page , "page" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout, "presentation-page-layout" );
+XML_CONSTASCII_ACTION( sXML_presentation_page_layout_name, "presentation-page-layout-name" );
+XML_CONSTASCII_ACTION( sXML_presentation_subtitle , "subtitle" );
+XML_CONSTASCII_ACTION( sXML_presentation_table , "table" );
+XML_CONSTASCII_ACTION( sXML_presentation_title , "title" );
+XML_CONSTASCII_ACTION( sXML_previous, "previous" );
+XML_CONSTASCII_ACTION( sXML_previous_page, "previous-page" );
+XML_CONSTASCII_ACTION( sXML_print, "print" );
+XML_CONSTASCII_ACTION( sXML_printable, "printable" );
+XML_CONSTASCII_ACTION( sXML_print_content, "print-content");
+XML_CONSTASCII_ACTION( sXML_print_date, "print-date" );
+XML_CONSTASCII_ACTION( sXML_print_orientation, "print-orientation");
+XML_CONSTASCII_ACTION( sXML_print_page_order, "print-page-order");
+XML_CONSTASCII_ACTION( sXML_print_range, "print-range");
+XML_CONSTASCII_ACTION( sXML_print_ranges, "print-ranges");
+XML_CONSTASCII_ACTION( sXML_print_time, "print-time" );
+XML_CONSTASCII_ACTION( sXML_printed_by, "printed-by" );
+XML_CONSTASCII_ACTION( sXML_proceedings, "proceedings" );
+XML_CONSTASCII_ACTION( sXML_product, "product" );
+XML_CONSTASCII_ACTION( sXML_projection, "projection");
+XML_CONSTASCII_ACTION( sXML_properties, "properties" );
+XML_CONSTASCII_ACTION( sXML_protect, "protect" );
+XML_CONSTASCII_ACTION( sXML_protect_content, "content" );
+XML_CONSTASCII_ACTION( sXML_protect_position, "position" );
+XML_CONSTASCII_ACTION( sXML_protect_size, "size" );
+XML_CONSTASCII_ACTION( sXML_protected, "protected" );
+XML_CONSTASCII_ACTION( sXML_protection_key, "protection-key" );
+XML_CONSTASCII_ACTION( sXML_prsubset, "prsubset" );
+XML_CONSTASCII_ACTION( sXML_publisher, "publisher" );
+XML_CONSTASCII_ACTION( sXML_punctuation_wrap, "punctuation-wrap" );
+XML_CONSTASCII_ACTION( sXML_purple, "purple" );
+XML_CONSTASCII_ACTION( sXML_pyramid, "pyramid" );
+XML_CONSTASCII_ACTION( sXML_quarter, "quarter" );
+XML_CONSTASCII_ACTION( sXML_query_name, "query-name");
+XML_CONSTASCII_ACTION( sXML_quo_vadis, "quo-vadis" );
+XML_CONSTASCII_ACTION( sXML_quotient, "quotient" );
+XML_CONSTASCII_ACTION( sXML_r, "r" );
+XML_CONSTASCII_ACTION( sXML_radar, "radar" );
+XML_CONSTASCII_ACTION( sXML_random, "random" );
+XML_CONSTASCII_ACTION( sXML_range_address, "range-address");
+XML_CONSTASCII_ACTION( sXML_range_usable_as, "range-usable-as");
+XML_CONSTASCII_ACTION( sXML_recreate_on_edit , "recreate-on-edit" );
+XML_CONSTASCII_ACTION( sXML_rect , "rect" );
+XML_CONSTASCII_ACTION( sXML_red , "red" );
+XML_CONSTASCII_ACTION( sXML_ref_name, "ref-name" );
+XML_CONSTASCII_ACTION( sXML_reference, "reference" );
+XML_CONSTASCII_ACTION( sXML_reference_end, "reference-end" );
+XML_CONSTASCII_ACTION( sXML_reference_format, "reference-format" );
+XML_CONSTASCII_ACTION( sXML_reference_mark, "reference-mark" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_end, "reference-mark-end" );
+XML_CONSTASCII_ACTION( sXML_reference_mark_start, "reference-mark-start" );
+XML_CONSTASCII_ACTION( sXML_reference_ref, "reference-ref" );
+XML_CONSTASCII_ACTION( sXML_reference_start, "reference-start" );
+XML_CONSTASCII_ACTION( sXML_reference_type, "reference-type" );
+XML_CONSTASCII_ACTION( sXML_refresh_delay, "refresh-delay" );
+XML_CONSTASCII_ACTION( sXML_region_center, "region-center" );
+XML_CONSTASCII_ACTION( sXML_region_left, "region-left" );
+XML_CONSTASCII_ACTION( sXML_region_right, "region-right" );
+XML_CONSTASCII_ACTION( sXML_register_true, "register-true" );
+XML_CONSTASCII_ACTION( sXML_register_truth_ref_style_name, "register-truth-ref-style-name" );
+XML_CONSTASCII_ACTION( sXML_regression_type, "regression-type" );
+XML_CONSTASCII_ACTION( sXML_rejected, "rejected" );
+XML_CONSTASCII_ACTION( sXML_rejecting_change_id, "rejecting-change-id" );
+XML_CONSTASCII_ACTION( sXML_rejection, "rejection" );
+XML_CONSTASCII_ACTION( sXML_rel_column_width, "rel-column-width" );
+XML_CONSTASCII_ACTION( sXML_rel_height, "rel-height" );
+XML_CONSTASCII_ACTION( sXML_rel_width, "rel-width" );
+XML_CONSTASCII_ACTION( sXML_relative, "relative" ) ;
+XML_CONSTASCII_ACTION( sXML_relative_tab_stop_position, "relative-tab-stop-position" );
+XML_CONSTASCII_ACTION( sXML_reln, "reln" ) ;
+XML_CONSTASCII_ACTION( sXML_rem, "rem" ) ;
+XML_CONSTASCII_ACTION( sXML_remove_dependents, "remove-dependents" );
+XML_CONSTASCII_ACTION( sXML_remove_precedents, "remove-precedents" );
+XML_CONSTASCII_ACTION( sXML_repeat, "repeat" );
+XML_CONSTASCII_ACTION( sXML_repeat_column, "repeat-column");
+XML_CONSTASCII_ACTION( sXML_repeat_row, "repeat-row");
+XML_CONSTASCII_ACTION( sXML_repeated, "repeated" );
+XML_CONSTASCII_ACTION( sXML_replace, "replace" );
+XML_CONSTASCII_ACTION( sXML_report_type, "report-type" );
+XML_CONSTASCII_ACTION( sXML_restart_on_page, "restart-on-page" );
+XML_CONSTASCII_ACTION( sXML_revision, "revision" );
+XML_CONSTASCII_ACTION( sXML_ridge, "ridge" );
+XML_CONSTASCII_ACTION( sXML_right, "right" );
+XML_CONSTASCII_ACTION( sXML_right_outside, "right-outside" );
+XML_CONSTASCII_ACTION( sXML_ring, "ring" );
+XML_CONSTASCII_ACTION( sXML_role, "role" );
+XML_CONSTASCII_ACTION( sXML_roll_from_bottom, "roll-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_roll_from_left, "roll-from-left" );
+XML_CONSTASCII_ACTION( sXML_roll_from_right, "roll-from-right" );
+XML_CONSTASCII_ACTION( sXML_roman, "roman" );
+XML_CONSTASCII_ACTION( sXML_root, "root" );
+XML_CONSTASCII_ACTION( sXML_rotate, "rotate" );
+XML_CONSTASCII_ACTION( sXML_rotation, "rotation" );
+XML_CONSTASCII_ACTION( sXML_rotation_align, "rotation-align" );
+XML_CONSTASCII_ACTION( sXML_rotation_angle, "rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_round , "round" );
+XML_CONSTASCII_ACTION( sXML_row, "row");
+XML_CONSTASCII_ACTION( sXML_rows, "rows");
+XML_CONSTASCII_ACTION( sXML_row_height, "row-height" );
+XML_CONSTASCII_ACTION( sXML_row_number, "row-number" );
+XML_CONSTASCII_ACTION( sXML_ruby, "ruby" );
+XML_CONSTASCII_ACTION( sXML_ruby_align, "ruby-align" );
+XML_CONSTASCII_ACTION( sXML_ruby_base, "ruby-base" );
+XML_CONSTASCII_ACTION( sXML_ruby_position, "ruby-position" );
+XML_CONSTASCII_ACTION( sXML_ruby_text, "ruby-text" );
+XML_CONSTASCII_ACTION( sXML_run_through, "run-through" );
+XML_CONSTASCII_ACTION( sXML_rx, "rx" );
+XML_CONSTASCII_ACTION( sXML_ry, "ry" );
+XML_CONSTASCII_ACTION( sXML_s, "s" );
+XML_CONSTASCII_ACTION( sXML_scale, "scale" );
+XML_CONSTASCII_ACTION( sXML_scale_min, "scale-min" );
+XML_CONSTASCII_ACTION( sXML_scale_text, "scale-text" );
+XML_CONSTASCII_ACTION( sXML_scale_to, "scale-to" );
+XML_CONSTASCII_ACTION( sXML_scale_to_pages, "scale-to-pages" );
+XML_CONSTASCII_ACTION( sXML_scatter, "scatter" );
+XML_CONSTASCII_ACTION( sXML_scenario, "scenario" );
+XML_CONSTASCII_ACTION( sXML_scenario_ranges, "scenario-ranges" );
+XML_CONSTASCII_ACTION( sXML_scene, "scene");
+XML_CONSTASCII_ACTION( sXML_school, "school" );
+XML_CONSTASCII_ACTION( sXML_scientific_number, "scientific-number" );
+XML_CONSTASCII_ACTION( sXML_score_spaces, "score-spaces" );
+XML_CONSTASCII_ACTION( sXML_script, "script" );
+XML_CONSTASCII_ACTION( sXML_scroll, "scroll" );
+XML_CONSTASCII_ACTION( sXML_sdev, "sdev" );
+XML_CONSTASCII_ACTION( sXML_search_criteria_must_apply_to_whole_cell, "search-criteria-must-apply-to-whole-cell" );
+XML_CONSTASCII_ACTION( sXML_sec, "sec" );
+XML_CONSTASCII_ACTION( sXML_sech, "sech" );
+XML_CONSTASCII_ACTION( sXML_second_date_time, "second-date-time" );
+XML_CONSTASCII_ACTION( sXML_seconds, "seconds" );
+XML_CONSTASCII_ACTION( sXML_section, "section" );
+XML_CONSTASCII_ACTION( sXML_section_desc, "section-desc" );
+XML_CONSTASCII_ACTION( sXML_section_name, "section-name" );
+XML_CONSTASCII_ACTION( sXML_section_source, "section-source" );
+XML_CONSTASCII_ACTION( sXML_select_page, "select-page" );
+XML_CONSTASCII_ACTION( sXML_selector, "selector" );
+XML_CONSTASCII_ACTION( sXML_semantics, "semantics" );
+XML_CONSTASCII_ACTION( sXML_semi_automatic, "semi-automatic" );
+XML_CONSTASCII_ACTION( sXML_sender_city, "sender-city" );
+XML_CONSTASCII_ACTION( sXML_sender_company, "sender-company" );
+XML_CONSTASCII_ACTION( sXML_sender_country, "sender-country" );
+XML_CONSTASCII_ACTION( sXML_sender_email, "sender-email" );
+XML_CONSTASCII_ACTION( sXML_sender_fax, "sender-fax" );
+XML_CONSTASCII_ACTION( sXML_sender_firstname, "sender-firstname" );
+XML_CONSTASCII_ACTION( sXML_sender_initials, "sender-initials" );
+XML_CONSTASCII_ACTION( sXML_sender_lastname, "sender-lastname" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_private, "sender-phone-private" );
+XML_CONSTASCII_ACTION( sXML_sender_phone_work, "sender-phone-work" );
+XML_CONSTASCII_ACTION( sXML_sender_position, "sender-position" );
+XML_CONSTASCII_ACTION( sXML_sender_postal_code, "sender-postal-code" );
+XML_CONSTASCII_ACTION( sXML_sender_state_or_province, "sender-state-or-province" );
+XML_CONSTASCII_ACTION( sXML_sender_street, "sender-street" );
+XML_CONSTASCII_ACTION( sXML_sender_title, "sender-title" );
+XML_CONSTASCII_ACTION( sXML_sep, "sep" );
+XML_CONSTASCII_ACTION( sXML_separation_character, "separation-character" );
+XML_CONSTASCII_ACTION( sXML_separator, "separator" );
+XML_CONSTASCII_ACTION( sXML_sequence, "sequence" );
+XML_CONSTASCII_ACTION( sXML_sequence_decl, "sequence-decl" );
+XML_CONSTASCII_ACTION( sXML_sequence_decls, "sequence-decls" );
+XML_CONSTASCII_ACTION( sXML_sequence_ref, "sequence-ref" );
+XML_CONSTASCII_ACTION( sXML_series, "series" );
+XML_CONSTASCII_ACTION( sXML_series_source, "series-source" );
+XML_CONSTASCII_ACTION( sXML_server_map, "server-map" );
+XML_CONSTASCII_ACTION( sXML_set, "set" );
+XML_CONSTASCII_ACTION( sXML_setdiff, "setdiff" );
+XML_CONSTASCII_ACTION( sXML_settings, "settings" );
+XML_CONSTASCII_ACTION( sXML_shade_mode, "shade-mode");
+XML_CONSTASCII_ACTION( sXML_shadow, "shadow" );
+XML_CONSTASCII_ACTION( sXML_shadow_color , "shadow-color" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_x , "shadow-offset-x" );
+XML_CONSTASCII_ACTION( sXML_shadow_offset_y , "shadow-offset-y" );
+XML_CONSTASCII_ACTION( sXML_shadow_slant, "shadow-slant");
+XML_CONSTASCII_ACTION( sXML_shadow_transparency , "shadow-transparency" );
+XML_CONSTASCII_ACTION( sXML_shape, "shape" );
+XML_CONSTASCII_ACTION( sXML_shapes, "shapes" );
+XML_CONSTASCII_ACTION( sXML_sheet_name, "sheet-name" );
+XML_CONSTASCII_ACTION( sXML_shininess, "shininess" );
+XML_CONSTASCII_ACTION( sXML_short, "short" );
+XML_CONSTASCII_ACTION( sXML_show, "show" );
+XML_CONSTASCII_ACTION( sXML_show_accepted_changes, "show-accepted-changes" );
+XML_CONSTASCII_ACTION( sXML_show_rejected_changes, "show-rejected-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes, "show-changes" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author, "show-changes-by-author" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_author_name, "show-changes-by-author-name" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment, "show-changes-by-comment" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_comment_text, "show-changes-by-comment-text" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime, "show-changes-by-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_mode, "show-changes-by-datetime-mode" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_first_datetime, "show-changes-by-datetime-first-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_datetime_second_datetime, "show-changes-by-datetime-second-datetime" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges, "show-changes-by-ranges" );
+XML_CONSTASCII_ACTION( sXML_show_changes_by_ranges_list, "show-changes-by-ranges-list" );
+XML_CONSTASCII_ACTION( sXML_show_logo, "show-logo" );
+XML_CONSTASCII_ACTION( sXML_show_unit, "show-unit" );
+XML_CONSTASCII_ACTION( sXML_shows, "shows" );
+XML_CONSTASCII_ACTION( sXML_side_by_side, "side-by-side" );
+XML_CONSTASCII_ACTION( sXML_silver, "silver" );
+XML_CONSTASCII_ACTION( sXML_simple, "simple" );
+XML_CONSTASCII_ACTION( sXML_sin, "sin" );
+XML_CONSTASCII_ACTION( sXML_since_date_time, "since-date-time" );
+XML_CONSTASCII_ACTION( sXML_since_save, "since-save" );
+XML_CONSTASCII_ACTION( sXML_sinh, "sinh" );
+XML_CONSTASCII_ACTION( sXML_size, "size" );
+XML_CONSTASCII_ACTION( sXML_size_protect, "size-protect" );
+XML_CONSTASCII_ACTION( sXML_slide, "slide" );
+XML_CONSTASCII_ACTION( sXML_slow, "slow" );
+XML_CONSTASCII_ACTION( sXML_soft_page_break, "soft-page-break" );
+XML_CONSTASCII_ACTION( sXML_solid, "solid" );
+XML_CONSTASCII_ACTION( sXML_solid_type, "solid-type" );
+XML_CONSTASCII_ACTION( sXML_sort, "sort");
+XML_CONSTASCII_ACTION( sXML_sort_ascending, "sort-ascending" );
+XML_CONSTASCII_ACTION( sXML_sort_by, "sort-by");
+XML_CONSTASCII_ACTION( sXML_sort_by_position, "sort-by-position" );
+XML_CONSTASCII_ACTION( sXML_sort_groups, "sort-groups");
+XML_CONSTASCII_ACTION( sXML_sort_key, "sort-key");
+XML_CONSTASCII_ACTION( sXML_sort_by_x_values, "sort-by-x-values" );
+XML_CONSTASCII_ACTION( sXML_source_cell_range, "source-cell-range");
+XML_CONSTASCII_ACTION( sXML_source_cell_range_addresses, "source-cell-range-addresses");
+XML_CONSTASCII_ACTION( sXML_source_field_name, "source-field-name");
+XML_CONSTASCII_ACTION( sXML_source_name, "source-name");
+XML_CONSTASCII_ACTION( sXML_source_range_address, "source-range-address");
+XML_CONSTASCII_ACTION( sXML_source_service, "source-service");
+XML_CONSTASCII_ACTION( sXML_space_before, "space-before" );
+XML_CONSTASCII_ACTION( sXML_span, "span" );
+XML_CONSTASCII_ACTION( sXML_specular, "specular");
+XML_CONSTASCII_ACTION( sXML_specular_color, "specular-color" );
+XML_CONSTASCII_ACTION( sXML_sphere, "sphere" );
+XML_CONSTASCII_ACTION( sXML_spiralin_left, "spiralin-left" );
+XML_CONSTASCII_ACTION( sXML_spiralin_right, "spiralin-right" );
+XML_CONSTASCII_ACTION( sXML_spiralout_left, "spiralout-left" );
+XML_CONSTASCII_ACTION( sXML_spiralout_right, "spiralout-right" );
+XML_CONSTASCII_ACTION( sXML_splines, "splines" );
+XML_CONSTASCII_ACTION( sXML_split, "split" );
+XML_CONSTASCII_ACTION( sXML_split_column, "split-column" );
+XML_CONSTASCII_ACTION( sXML_split_position, "split-position" );
+XML_CONSTASCII_ACTION( sXML_split_row, "split-row" );
+XML_CONSTASCII_ACTION( sXML_spreadsheet , "spreadsheet" );
+XML_CONSTASCII_ACTION( sXML_sql_statement, "sql-statement");
+XML_CONSTASCII_ACTION( sXML_stacked, "stacked" );
+XML_CONSTASCII_ACTION( sXML_stagger_even, "stagger-even" );
+XML_CONSTASCII_ACTION( sXML_stagger_odd, "stagger-odd" );
+XML_CONSTASCII_ACTION( sXML_standard, "standard" );
+XML_CONSTASCII_ACTION( sXML_standard_deviation, "standard-deviation" );
+XML_CONSTASCII_ACTION( sXML_starbasic, "starbasic" );
+XML_CONSTASCII_ACTION( sXML_start, "start" );
+XML_CONSTASCII_ACTION( sXML_start_color, "start-color" );
+XML_CONSTASCII_ACTION( sXML_start_column, "start-column" );
+XML_CONSTASCII_ACTION( sXML_start_intensity, "start-intensity" );
+XML_CONSTASCII_ACTION( sXML_start_numbering_at, "start-numbering-at" );
+XML_CONSTASCII_ACTION( sXML_start_page, "start-page" );
+XML_CONSTASCII_ACTION( sXML_start_position, "start-position" );
+XML_CONSTASCII_ACTION( sXML_start_row, "start-row" );
+XML_CONSTASCII_ACTION( sXML_start_table, "start-table" );
+XML_CONSTASCII_ACTION( sXML_start_value, "start-value" );
+XML_CONSTASCII_ACTION( sXML_start_with_navigator, "start-with-navigator" );
+XML_CONSTASCII_ACTION( sXML_statistics, "statistics" );
+XML_CONSTASCII_ACTION( sXML_status, "status" );
+XML_CONSTASCII_ACTION( sXML_stay_on_top, "stay-on-top" );
+XML_CONSTASCII_ACTION( sXML_stdev, "stdev" );
+XML_CONSTASCII_ACTION( sXML_stdevp, "stdevp" );
+XML_CONSTASCII_ACTION( sXML_steps, "steps" );
+XML_CONSTASCII_ACTION( sXML_stock, "stock" );
+XML_CONSTASCII_ACTION( sXML_stock_updown_bars, "stock-updown-bars" );
+XML_CONSTASCII_ACTION( sXML_stock_with_volume, "stock-with-volume" );
+XML_CONSTASCII_ACTION( sXML_stop, "stop" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_bottom, "stretch-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_left, "stretch-from-left" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_right, "stretch-from-right" );
+XML_CONSTASCII_ACTION( sXML_stretch_from_top, "stretch-from-top" );
+XML_CONSTASCII_ACTION( sXML_stretchy, "stretchy" );
+XML_CONSTASCII_ACTION( sXML_strict , "strict" );
+XML_CONSTASCII_ACTION( sXML_string, "string");
+XML_CONSTASCII_ACTION( sXML_string_value, "string-value");
+XML_CONSTASCII_ACTION( sXML_string_value_if_false, "string-value-if-false" );
+XML_CONSTASCII_ACTION( sXML_string_value_if_true, "string-value-if-true" );
+XML_CONSTASCII_ACTION( sXML_stroke , "stroke" );
+XML_CONSTASCII_ACTION( sXML_stroke_color , "stroke-color" );
+XML_CONSTASCII_ACTION( sXML_stroke_dash , "stroke-dash" );
+XML_CONSTASCII_ACTION( sXML_stroke_linejoin , "stroke-linejoin" );
+XML_CONSTASCII_ACTION( sXML_stroke_opacity, "stroke-opacity" );
+XML_CONSTASCII_ACTION( sXML_stroke_width, "stroke-width" );
+XML_CONSTASCII_ACTION( sXML_structure_protected, "structure-protected" );
+XML_CONSTASCII_ACTION( sXML_style, "style" );
+XML_CONSTASCII_ACTION( sXML_style_name, "style-name" );
+XML_CONSTASCII_ACTION( sXML_styles, "styles" );
+XML_CONSTASCII_ACTION( sXML_stylesheet, "stylesheet" );
+XML_CONSTASCII_ACTION( sXML_sub_table, "sub-table" );
+XML_CONSTASCII_ACTION( sXML_subject, "subject" );
+XML_CONSTASCII_ACTION( sXML_subset, "subset" );
+XML_CONSTASCII_ACTION( sXML_subtitle, "subtitle" );
+XML_CONSTASCII_ACTION( sXML_subtotal_field, "subtotal-field");
+XML_CONSTASCII_ACTION( sXML_subtotal_rule, "subtotal-rule");
+XML_CONSTASCII_ACTION( sXML_subtotal_rules, "subtotal-rules");
+XML_CONSTASCII_ACTION( sXML_suffix, "suffix" );
+XML_CONSTASCII_ACTION( sXML_sum, "sum" );
+XML_CONSTASCII_ACTION( sXML_swiss, "swiss" );
+XML_CONSTASCII_ACTION( sXML_symbol, "symbol" );
+XML_CONSTASCII_ACTION( sXML_symbol_height, "symbol-height" );
+XML_CONSTASCII_ACTION( sXML_symbol_image_name, "symbol-image-name" );
+XML_CONSTASCII_ACTION( sXML_symbol_width, "symbol-width" );
+XML_CONSTASCII_ACTION( sXML_system, "system" );
+XML_CONSTASCII_ACTION( sXML_tab_stop, "tab-stop" );
+XML_CONSTASCII_ACTION( sXML_tab_stops, "tab-stops" );
+XML_CONSTASCII_ACTION( sXML_table, "table" );
+XML_CONSTASCII_ACTION( sXML_tables, "tables" );
+XML_CONSTASCII_ACTION( sXML_table_background, "table-background" );
+XML_CONSTASCII_ACTION( sXML_table_cell, "table-cell" );
+XML_CONSTASCII_ACTION( sXML_table_centering, "table-centering" );
+XML_CONSTASCII_ACTION( sXML_table_column, "table-column" );
+XML_CONSTASCII_ACTION( sXML_table_column_group, "table-column-group" );
+XML_CONSTASCII_ACTION( sXML_table_columns, "table-columns" );
+XML_CONSTASCII_ACTION( sXML_table_count, "table-count" );
+XML_CONSTASCII_ACTION( sXML_table_header, "table-header" );
+XML_CONSTASCII_ACTION( sXML_table_header_columns, "table-header-columns" );
+XML_CONSTASCII_ACTION( sXML_table_header_rows, "table-header-rows" );
+XML_CONSTASCII_ACTION( sXML_table_index, "table-index" );
+XML_CONSTASCII_ACTION( sXML_table_index_entry_template, "table-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_index_source, "table-index-source" );
+XML_CONSTASCII_ACTION( sXML_table_name, "table-name");
+XML_CONSTASCII_ACTION( sXML_table_number_list, "table-number-list");
+XML_CONSTASCII_ACTION( sXML_table_of_content, "table-of-content" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_entry_template, "table-of-content-entry-template" );
+XML_CONSTASCII_ACTION( sXML_table_of_content_source, "table-of-content-source" );
+XML_CONSTASCII_ACTION( sXML_table_page, "table-page" );
+XML_CONSTASCII_ACTION( sXML_table_row, "table-row" );
+XML_CONSTASCII_ACTION( sXML_table_row_group, "table-row-group" );
+XML_CONSTASCII_ACTION( sXML_table_rows, "table-rows" );
+XML_CONSTASCII_ACTION( sXML_table_source, "table-source" );
+XML_CONSTASCII_ACTION( sXML_table_view, "table-view" );
+XML_CONSTASCII_ACTION( sXML_tab_stop_distance, "tab-stop-distance" );
+XML_CONSTASCII_ACTION( sXML_tan, "tan" );
+XML_CONSTASCII_ACTION( sXML_tanh, "tanh" );
+XML_CONSTASCII_ACTION( sXML_target_cell_address, "target-cell-address");
+XML_CONSTASCII_ACTION( sXML_target_frame_name, "target-frame-name" );
+XML_CONSTASCII_ACTION( sXML_target_range_address, "target-range-address");
+XML_CONSTASCII_ACTION( sXML_tb_rl, "tb-rl" );
+XML_CONSTASCII_ACTION( sXML_teal, "teal" );
+XML_CONSTASCII_ACTION( sXML_techreport, "techreport" );
+XML_CONSTASCII_ACTION( sXML_template, "template" );
+XML_CONSTASCII_ACTION( sXML_template_name, "template-name" );
+XML_CONSTASCII_ACTION( sXML_tendsto, "tendsto" );
+XML_CONSTASCII_ACTION( sXML_tex_filter, "texture-filter" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_x, "texture-generation-mode-x" );
+XML_CONSTASCII_ACTION( sXML_tex_generation_mode_y, "texture-generation-mode-y" );
+XML_CONSTASCII_ACTION( sXML_tex_kind, "texture-kind" );
+XML_CONSTASCII_ACTION( sXML_tex_mode, "texture-mode" );
+XML_CONSTASCII_ACTION( sXML_text, "text" );
+XML_CONSTASCII_ACTION( sXML_text_align, "text-align" );
+XML_CONSTASCII_ACTION( sXML_text_align_last, "text-align-last" );
+XML_CONSTASCII_ACTION( sXML_text_align_source, "text-align-source" );
+XML_CONSTASCII_ACTION( sXML_text_autospace, "text-autospace" );
+XML_CONSTASCII_ACTION( sXML_text_background_color, "text-background-color" );
+XML_CONSTASCII_ACTION( sXML_text_blinking, "text-blinking" );
+XML_CONSTASCII_ACTION( sXML_text_box, "text-box" );
+XML_CONSTASCII_ACTION( sXML_text_combine, "text-combine" );
+XML_CONSTASCII_ACTION( sXML_text_combine_end_char, "text-combine-end-char" );
+XML_CONSTASCII_ACTION( sXML_text_combine_start_char, "text-combine-start-char" );
+XML_CONSTASCII_ACTION( sXML_text_content, "text-content" );
+XML_CONSTASCII_ACTION( sXML_text_crossing_out, "text-crossing-out" );
+XML_CONSTASCII_ACTION( sXML_text_emphasize, "text-emphasize" );
+XML_CONSTASCII_ACTION( sXML_text_global, "text-global" );
+XML_CONSTASCII_ACTION( sXML_text_indent, "text-indent" );
+XML_CONSTASCII_ACTION( sXML_text_input, "text-input" );
+XML_CONSTASCII_ACTION( sXML_text_outline, "text-outline" );
+XML_CONSTASCII_ACTION( sXML_text_position, "text-position" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_angle, "text-rotation-angle" );
+XML_CONSTASCII_ACTION( sXML_text_rotation_scale, "text-rotation-scale" );
+XML_CONSTASCII_ACTION( sXML_text_scale, "text-scale" );
+XML_CONSTASCII_ACTION( sXML_text_shadow, "text-shadow" );
+XML_CONSTASCII_ACTION( sXML_text_style, "text-style" );
+XML_CONSTASCII_ACTION( sXML_text_transform, "text-transform" );
+XML_CONSTASCII_ACTION( sXML_text_underline, "text-underline" );
+XML_CONSTASCII_ACTION( sXML_text_underline_color, "text-underline-color" );
+XML_CONSTASCII_ACTION( sXML_textarea_horizontal_align, "textarea-horizontal-align" );
+XML_CONSTASCII_ACTION( sXML_textarea_vertical_align, "textarea-vertical-align" );
+XML_CONSTASCII_ACTION( sXML_textual, "textual" );
+XML_CONSTASCII_ACTION( sXML_thick, "thick" );
+XML_CONSTASCII_ACTION( sXML_thin, "thin" );
+XML_CONSTASCII_ACTION( sXML_three_dimensional, "three-dimensional" );
+XML_CONSTASCII_ACTION( sXML_thumbnail, "thumbnail" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_inner, "tick-marks-major-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_major_outer, "tick-marks-major-outer" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_inner, "tick-marks-minor-inner" );
+XML_CONSTASCII_ACTION( sXML_tick_marks_minor_outer, "tick-marks-minor-outer" );
+XML_CONSTASCII_ACTION( sXML_tile_repeat_offset, "tile-repeat-offset" );
+XML_CONSTASCII_ACTION( sXML_time, "time");
+XML_CONSTASCII_ACTION( sXML_time_adjust, "time-adjust" );
+XML_CONSTASCII_ACTION( sXML_time_style, "time-style" );
+XML_CONSTASCII_ACTION( sXML_time_value, "time-value");
+XML_CONSTASCII_ACTION( sXML_times, "times");
+XML_CONSTASCII_ACTION( sXML_title, "title" );
+XML_CONSTASCII_ACTION( sXML_to_another_table, "to-another-table" );
+XML_CONSTASCII_ACTION( sXML_toc_mark, "toc-mark" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_end, "toc-mark-end" );
+XML_CONSTASCII_ACTION( sXML_toc_mark_start, "toc-mark-start" );
+XML_CONSTASCII_ACTION( sXML_top, "top" );
+XML_CONSTASCII_ACTION( sXML_top_percent, "top percent");
+XML_CONSTASCII_ACTION( sXML_top_values, "top values");
+XML_CONSTASCII_ACTION( sXML_trace_dependents, "trace-dependents" );
+XML_CONSTASCII_ACTION( sXML_trace_errors, "trace-errors" );
+XML_CONSTASCII_ACTION( sXML_trace_precedents, "trace-precedents" );
+XML_CONSTASCII_ACTION( sXML_track_changes, "track-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes, "tracked-changes" );
+XML_CONSTASCII_ACTION( sXML_tracked_changes_view_settings, "tracked-changes-view-settings" );
+XML_CONSTASCII_ACTION( sXML_transform , "transform" );
+XML_CONSTASCII_ACTION( sXML_transition_on_click, "transition-on-click" );
+XML_CONSTASCII_ACTION( sXML_transparency, "transparency" );
+XML_CONSTASCII_ACTION( sXML_transparency_name, "transparency-name" );
+XML_CONSTASCII_ACTION( sXML_transparent, "transparent" );
+XML_CONSTASCII_ACTION( sXML_transpose, "transpose" );
+XML_CONSTASCII_ACTION( sXML_true, "true" );
+XML_CONSTASCII_ACTION( sXML_truncate_on_overflow, "truncate-on-overflow" );
+XML_CONSTASCII_ACTION( sXML_ttb, "ttb");
+XML_CONSTASCII_ACTION( sXML_type, "type" );
+XML_CONSTASCII_ACTION( sXML_underline_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dash, "bold-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dash, "bold-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dot_dot_dash, "bold-dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_dotted, "bold-dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_long_dash, "bold-long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_bold_wave, "bold-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_dash, "dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dash, "dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dot_dot_dash, "dot-dot-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_dotted, "dotted" );
+XML_CONSTASCII_ACTION( sXML_underline_double, "double" );
+XML_CONSTASCII_ACTION( sXML_underline_double_wave, "double-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_long_dash, "long-dash" );
+XML_CONSTASCII_ACTION( sXML_underline_none, "none" );
+XML_CONSTASCII_ACTION( sXML_underline_single, "single" );
+XML_CONSTASCII_ACTION( sXML_underline_small_wave, "small-wave" );
+XML_CONSTASCII_ACTION( sXML_underline_wave, "wave" );
+XML_CONSTASCII_ACTION( sXML_unformatted_text, "unformatted-text" );
+XML_CONSTASCII_ACTION( sXML_union, "union" );
+XML_CONSTASCII_ACTION( sXML_unit, "unit" );
+XML_CONSTASCII_ACTION( sXML_unordered_list, "unordered-list" );
+XML_CONSTASCII_ACTION( sXML_unpublished, "unpublished" );
+XML_CONSTASCII_ACTION( sXML_uplimit, "uplimit" );
+XML_CONSTASCII_ACTION( sXML_url, "url" );
+XML_CONSTASCII_ACTION( sXML_use_caption, "use-caption" );
+XML_CONSTASCII_ACTION( sXML_use_cell_protection, "use-cell-protection" );
+XML_CONSTASCII_ACTION( sXML_use_chart_objects, "use-chart-objects" );
+XML_CONSTASCII_ACTION( sXML_use_condition, "use-condition" );
+XML_CONSTASCII_ACTION( sXML_use_draw_objects, "use-draw-objects" );
+XML_CONSTASCII_ACTION( sXML_use_floating_frames, "use-floating-frames" );
+XML_CONSTASCII_ACTION( sXML_use_graphics, "use-graphics" );
+XML_CONSTASCII_ACTION( sXML_use_image_objects, "use-image-objects" );
+XML_CONSTASCII_ACTION( sXML_use_index_marks, "use-index-marks" );
+XML_CONSTASCII_ACTION( sXML_use_index_source_styles, "use-index-source-styles" );
+XML_CONSTASCII_ACTION( sXML_use_keys_as_entries, "use-keys-as-entries" );
+XML_CONSTASCII_ACTION( sXML_use_label, "use-label" );
+XML_CONSTASCII_ACTION( sXML_use_math_objects, "use-math-objects" );
+XML_CONSTASCII_ACTION( sXML_use_objects, "use-objects" );
+XML_CONSTASCII_ACTION( sXML_use_optimal_column_width, "use-optimal-column-width");
+XML_CONSTASCII_ACTION( sXML_use_optimal_row_height, "use-optimal-row-height");
+XML_CONSTASCII_ACTION( sXML_use_other_objects, "use-other-objects" );
+XML_CONSTASCII_ACTION( sXML_use_soft_page_breaks, "use-soft-page-breaks" );
+XML_CONSTASCII_ACTION( sXML_use_spreadsheet_objects, "use-spreadsheet-objects" );
+XML_CONSTASCII_ACTION( sXML_use_styles, "use-styles" );
+XML_CONSTASCII_ACTION( sXML_use_tables, "use-tables" );
+XML_CONSTASCII_ACTION( sXML_use_window_font_color, "use-window-font-color" );
+XML_CONSTASCII_ACTION( sXML_used_hierarchy, "used-hierarchy");
+XML_CONSTASCII_ACTION( sXML_user_defined, "user-defined" );
+XML_CONSTASCII_ACTION( sXML_user_field_decl, "user-field-decl" );
+XML_CONSTASCII_ACTION( sXML_user_field_decls, "user-field-decls" );
+XML_CONSTASCII_ACTION( sXML_user_field_get, "user-field-get" );
+XML_CONSTASCII_ACTION( sXML_user_field_input, "user-field-input" );
+XML_CONSTASCII_ACTION( sXML_user_index, "user-index" );
+XML_CONSTASCII_ACTION( sXML_user_index_entry_template, "user-index-entry-template" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark, "user-index-mark" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_end, "user-index-mark-end" );
+XML_CONSTASCII_ACTION( sXML_user_index_mark_start, "user-index-mark-start" );
+XML_CONSTASCII_ACTION( sXML_user_index_source, "user-index-source" );
+XML_CONSTASCII_ACTION( sXML_user_transformed, "user-transformed" );
+XML_CONSTASCII_ACTION( sXML_username, "username");
+XML_CONSTASCII_ACTION( sXML_value, "value");
+XML_CONSTASCII_ACTION( sXML_value_type, "value-type");
+XML_CONSTASCII_ACTION( sXML_values_cell_range_address, "values-cell-range-address" );
+XML_CONSTASCII_ACTION( sXML_var, "var" );
+XML_CONSTASCII_ACTION( sXML_variable, "variable" );
+XML_CONSTASCII_ACTION( sXML_variable_decl, "variable-decl" );
+XML_CONSTASCII_ACTION( sXML_variable_decls, "variable-decls" );
+XML_CONSTASCII_ACTION( sXML_variable_get, "variable-get" );
+XML_CONSTASCII_ACTION( sXML_variable_input, "variable-input" );
+XML_CONSTASCII_ACTION( sXML_variable_set, "variable-set" );
+XML_CONSTASCII_ACTION( sXML_variance, "variance" );
+XML_CONSTASCII_ACTION( sXML_varp, "varp" );
+XML_CONSTASCII_ACTION( sXML_vector, "vector" );
+XML_CONSTASCII_ACTION( sXML_verb, "verb" );
+XML_CONSTASCII_ACTION( sXML_version, "version" );
+XML_CONSTASCII_ACTION( sXML_version_entry, "version-entry" );
+XML_CONSTASCII_ACTION( sXML_version_list, "version-list" );
+XML_CONSTASCII_ACTION( sXML_vertical, "vertical" );
+XML_CONSTASCII_ACTION( sXML_vertical_align, "vertical-align" );
+XML_CONSTASCII_ACTION( sXML_vertical_lines, "vertical-lines" );
+XML_CONSTASCII_ACTION( sXML_vertical_pos, "vertical-pos" );
+XML_CONSTASCII_ACTION( sXML_vertical_rel, "vertical-rel" );
+XML_CONSTASCII_ACTION( sXML_vertical_segments, "vertical-segments" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_mode, "vertical-split-mode" );
+XML_CONSTASCII_ACTION( sXML_vertical_split_position, "vertical-split-position" );
+XML_CONSTASCII_ACTION( sXML_vertical_stripes, "vertical-stripes" );
+XML_CONSTASCII_ACTION( sXML_view, "view" );
+XML_CONSTASCII_ACTION( sXML_viewBox, "viewBox" );
+XML_CONSTASCII_ACTION( sXML_view_id, "view-id" );
+XML_CONSTASCII_ACTION( sXML_view_settings, "view-settings" );
+XML_CONSTASCII_ACTION( sXML_visibility, "visibility" );
+XML_CONSTASCII_ACTION( sXML_visible, "visible" );
+XML_CONSTASCII_ACTION( sXML_visible_area, "visible-area" );
+XML_CONSTASCII_ACTION( sXML_visible_area_height, "visible-area-height" );
+XML_CONSTASCII_ACTION( sXML_visible_area_left, "visible-area-left" );
+XML_CONSTASCII_ACTION( sXML_visible_area_top, "visible-area-top" );
+XML_CONSTASCII_ACTION( sXML_visible_area_width, "visible-area-width" );
+XML_CONSTASCII_ACTION( sXML_visited_style_name, "visited-style-name" );
+XML_CONSTASCII_ACTION( sXML_volatile, "volatile" );
+XML_CONSTASCII_ACTION( sXML_volume, "volume" );
+XML_CONSTASCII_ACTION( sXML_vpn, "vpn");
+XML_CONSTASCII_ACTION( sXML_vrp, "vrp");
+XML_CONSTASCII_ACTION( sXML_vup, "vup");
+XML_CONSTASCII_ACTION( sXML_wall, "wall" );
+XML_CONSTASCII_ACTION( sXML_warning, "warning" );
+XML_CONSTASCII_ACTION( sXML_watermark, "watermark" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_bottom, "wavyline-from-bottom" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_left, "wavyline-from-left" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_right, "wavyline-from-right" );
+XML_CONSTASCII_ACTION( sXML_wavyline_from_top, "wavyline-from-top" );
+XML_CONSTASCII_ACTION( sXML_week_of_year, "week-of-year" );
+XML_CONSTASCII_ACTION( sXML_weight_bold, "bold" );
+XML_CONSTASCII_ACTION( sXML_weight_normal, "normal" );
+XML_CONSTASCII_ACTION( sXML_white, "white" );
+XML_CONSTASCII_ACTION( sXML_whole_page, "whole-page" );
+XML_CONSTASCII_ACTION( sXML_widows, "widows" );
+XML_CONSTASCII_ACTION( sXML_width, "width" );
+XML_CONSTASCII_ACTION( sXML_word, "word" );
+XML_CONSTASCII_ACTION( sXML_word_count, "word-count" );
+XML_CONSTASCII_ACTION( sXML_wrap, "wrap" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour, "wrap-contour" );
+XML_CONSTASCII_ACTION( sXML_wrap_contour_mode, "wrap-contour-mode" );
+XML_CONSTASCII_ACTION( sXML_wrap_option, "wrap-option" );
+XML_CONSTASCII_ACTION( sXML_writing_mode, "writing-mode" );
+XML_CONSTASCII_ACTION( sXML_www, "www" );
+XML_CONSTASCII_ACTION( sXML_x, "x" );
+XML_CONSTASCII_ACTION( sXML_x1, "x1" );
+XML_CONSTASCII_ACTION( sXML_x2, "x2" );
+XML_CONSTASCII_ACTION( sXML_x_mac_roman, "x-mac-roman" );
+XML_CONSTASCII_ACTION( sXML_x_symbol, "x-symbol" );
+XML_CONSTASCII_ACTION( sXML_x_system, "x-system" );
+XML_CONSTASCII_ACTION( sXML_xor, "xor" );
+XML_CONSTASCII_ACTION( sXML_y, "y" );
+XML_CONSTASCII_ACTION( sXML_y1, "y1" );
+XML_CONSTASCII_ACTION( sXML_y2, "y2" );
+XML_CONSTASCII_ACTION( sXML_year, "year" );
+XML_CONSTASCII_ACTION( sXML_yellow, "yellow" );
+XML_CONSTASCII_ACTION( sXML_zero_values, "zero-values" );
+XML_CONSTASCII_ACTION( sXML_zindex, "z-index" );
+XML_CONSTASCII_ACTION( sXML_zoom_type, "zoom-type" );
+XML_CONSTASCII_ACTION( sXML_zoom_value, "zoom-value" );
+
+XML_CONSTASCII_ACTION( sXML_start_shape, "start-shape");
+XML_CONSTASCII_ACTION( sXML_start_glue_point, "start-glue-point");
+XML_CONSTASCII_ACTION( sXML_end_shape, "end-shape");
+XML_CONSTASCII_ACTION( sXML_end_glue_point, "end-glue-point");
+XML_CONSTASCII_ACTION( sXML_line_number, "line-number");
+XML_CONSTASCII_ACTION( sXML_line_skew, "line-skew");
+XML_CONSTASCII_ACTION( sXML_curve, "curve" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_horizontal, "start-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_start_line_spacing_vertical, "start-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_horizontal, "end-line-spacing-horizontal" );
+XML_CONSTASCII_ACTION( sXML_end_line_spacing_vertical, "end-line-spacing-vertical" );
+XML_CONSTASCII_ACTION( sXML_line_distance, "line-distance" );
+XML_CONSTASCII_ACTION( sXML_guide_overhang, "guide-overhang" );
+XML_CONSTASCII_ACTION( sXML_guide_distance, "guide-distance" );
+XML_CONSTASCII_ACTION( sXML_start_guide, "start-guide" );
+XML_CONSTASCII_ACTION( sXML_end_guide, "end-guide" );
+
+XML_CONSTASCII_ACTION( sXML_dots1, "dots1" );
+XML_CONSTASCII_ACTION( sXML_dots1_length, "dots1-length" );
+XML_CONSTASCII_ACTION( sXML_dots2, "dots2" );
+XML_CONSTASCII_ACTION( sXML_dots2_length, "dots2-length" );
+XML_CONSTASCII_ACTION( sXML_enable_numbering, "enable-numbering" );
+
+XML_CONSTASCII_ACTION( sXML_top_left, "top-left" );
+XML_CONSTASCII_ACTION( sXML_top_right, "top-right" );
+XML_CONSTASCII_ACTION( sXML_bottom_left, "bottom-left" );
+XML_CONSTASCII_ACTION( sXML_bottom_right, "bottom-right" );
+
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point,	"fill-image-ref-point" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_x, "fill-image-ref-point-x" );
+XML_CONSTASCII_ACTION( sXML_fill_image_ref_point_y, "fill-image-ref-point-y" );
+
+XML_CONSTASCII_ACTION( sXML_from_right, "from-right" );
+XML_CONSTASCII_ACTION( sXML_from_bottom, "from-bottom" );
+XML_CONSTASCII_ACTION( sXML_from_center, "from-center" );
+XML_CONSTASCII_ACTION( sXML_from_upper_left, "from-upper-left" );
+XML_CONSTASCII_ACTION( sXML_from_upper_right, "from-upper-right" );
+XML_CONSTASCII_ACTION( sXML_from_lower_left, "from-lower-left" );
+XML_CONSTASCII_ACTION( sXML_from_lower_right, "from-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_left, "to-left" );
+XML_CONSTASCII_ACTION( sXML_to_top, "to-top" );
+XML_CONSTASCII_ACTION( sXML_to_right, "to-right" );
+XML_CONSTASCII_ACTION( sXML_to_bottom, "to-bottom" );
+XML_CONSTASCII_ACTION( sXML_to_upper_left, "to-upper-left" );
+XML_CONSTASCII_ACTION( sXML_to_upper_right, "to-upper-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_right, "to-lower-right" );
+XML_CONSTASCII_ACTION( sXML_to_lower_left, "to-lower-left" );
+XML_CONSTASCII_ACTION( sXML_to_center, "to-center" );
+XML_CONSTASCII_ACTION( sXML_counter_clockwise, "counter-clockwise" );
+
+XML_CONSTASCII_ACTION( sXML_fade, "fade" );
+XML_CONSTASCII_ACTION( sXML_move, "move" );
+XML_CONSTASCII_ACTION( sXML_stripes, "stripes" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_left, "spiral-inward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_inward_right, "spiral-inward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_left, "spiral-outward-left" );
+XML_CONSTASCII_ACTION( sXML_spiral_outward_right, "spiral-outward-right" );
+XML_CONSTASCII_ACTION( sXML_spiral, "spiral" );
+XML_CONSTASCII_ACTION( sXML_spiral_in, "spiral-in" );
+XML_CONSTASCII_ACTION( sXML_spiral_out, "spiral-out" );
+XML_CONSTASCII_ACTION( sXML_wavyline, "wavyline" );
+XML_CONSTASCII_ACTION( sXML_laser, "laser" );
+XML_CONSTASCII_ACTION( sXML_appear, "appear" );
+XML_CONSTASCII_ACTION( sXML_hide, "hide" );
+XML_CONSTASCII_ACTION( sXML_move_short, "move-short" );
+XML_CONSTASCII_ACTION( sXML_checkerboard, "checkerboard" );
+XML_CONSTASCII_ACTION( sXML_stretch, "stretch" );
+
+XML_CONSTASCII_ACTION( sXML_shape_id, "shape-id" );
+XML_CONSTASCII_ACTION( sXML_effect, "effect" );
+XML_CONSTASCII_ACTION( sXML_speed, "speed" );
+XML_CONSTASCII_ACTION( sXML_start_scale, "start-scale" );
+XML_CONSTASCII_ACTION( sXML_show_shape, "show-shape" );
+XML_CONSTASCII_ACTION( sXML_show_text, "show-text" );
+XML_CONSTASCII_ACTION( sXML_hide_shape, "hide-shape" );
+XML_CONSTASCII_ACTION( sXML_hide_text, "hide-text" );
+XML_CONSTASCII_ACTION( sXML_dim, "dim" );
+XML_CONSTASCII_ACTION( sXML_sound, "sound" );
+XML_CONSTASCII_ACTION( sXML_play_full, "play-full" );
+XML_CONSTASCII_ACTION( sXML_path_id, "path-id" );
+
+XML_CONSTASCII_ACTION( sXML_animations, "animations" );
+
+XML_CONSTASCII_ACTION( sXML_kind, "kind" );
+XML_CONSTASCII_ACTION( sXML_start_angle, "start-angle" );
+XML_CONSTASCII_ACTION( sXML_cut, "cut" );
+XML_CONSTASCII_ACTION( sXML_arc, "arc" );
+
+XML_CONSTASCII_ACTION( sXML_upright, "upright" );
+XML_CONSTASCII_ACTION( sXML_slant_x, "slant-x" );
+XML_CONSTASCII_ACTION( sXML_slant_y, "slant-y" );
+XML_CONSTASCII_ACTION( sXML_autosize, "autosize" );
+XML_CONSTASCII_ACTION( sXML_slant, "slant" );
+XML_CONSTASCII_ACTION( sXML_topcircle, "top-circle" );
+XML_CONSTASCII_ACTION( sXML_bottomcircle, "bottom-circle" );
+XML_CONSTASCII_ACTION( sXML_leftcircle, "left-circle" );
+XML_CONSTASCII_ACTION( sXML_rightcircle, "right-circle" );
+XML_CONSTASCII_ACTION( sXML_toparc, "top-arc" );
+XML_CONSTASCII_ACTION( sXML_bottomarc, "bottom-arc" );
+XML_CONSTASCII_ACTION( sXML_leftarc, "left-arc" );
+XML_CONSTASCII_ACTION( sXML_rightarc, "right-arc" );
+XML_CONSTASCII_ACTION( sXML_button1, "button1" );
+XML_CONSTASCII_ACTION( sXML_button2, "button2" );
+XML_CONSTASCII_ACTION( sXML_button3, "button3" );
+XML_CONSTASCII_ACTION( sXML_button4, "button4" );
+
+XML_CONSTASCII_ACTION( sXML_caption_type, "caption-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle_type, "caption-angle-type" );
+XML_CONSTASCII_ACTION( sXML_caption_angle, "caption-angle" );
+XML_CONSTASCII_ACTION( sXML_caption_gap, "caption-gap" );
+XML_CONSTASCII_ACTION( sXML_caption_escape_direction, "caption-escape-direction" );
+XML_CONSTASCII_ACTION( sXML_caption_escape, "caption-escape" );
+XML_CONSTASCII_ACTION( sXML_caption_line_length, "caption-line-length" );
+XML_CONSTASCII_ACTION( sXML_caption_fit_line_length, "caption-fit-line-length" );
+XML_CONSTASCII_ACTION( sXML_free, "free" );
+
+XML_CONSTASCII_ACTION( sXML_straight_line, "straight-line" );
+XML_CONSTASCII_ACTION( sXML_angled_line, "angled-line" );
+XML_CONSTASCII_ACTION( sXML_angled_connector_line, "angled-connector-line" );
+
+XML_CONSTASCII_ACTION( sXML_data_source_has_labels, "data-source-has-labels" );
+
+XML_CONSTASCII_ACTION( sXML_play, "play" );
+XML_CONSTASCII_ACTION( sXML_handout_master, "handout-master" );
+
+XML_CONSTASCII_ACTION( sXML_escape_direction, "escape-direction" );
+XML_CONSTASCII_ACTION( sXML_glue_point, "glue-point" );
+
+XML_CONSTASCII_ACTION( sXML_text_style_name, "text-style-name" );
+
+XML_CONSTASCII_ACTION( sXML_sort_algorithm, "sort-algorithm" );
+XML_CONSTASCII_ACTION( sXML_roll_from_top, "roll-from-top" );
+
+XML_CONSTASCII_ACTION( sXML_script_data, "script-data" );
+XML_CONSTASCII_ACTION( sXML_libraries, "libraries" );
+XML_CONSTASCII_ACTION( sXML_source_code, "source-code" );
+XML_CONSTASCII_ACTION( sXML_readonly, "readonly" );
+
+XML_CONSTASCII_ACTION( sXML_page_continuation, "page-continuation" );
+
+XML_CONSTASCII_ACTION( sXML_contains, "contains" );
+XML_CONSTASCII_ACTION( sXML_does_not_contain, "does-not-contain" );
+XML_CONSTASCII_ACTION( sXML_begins_with, "begins-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_begin_with, "does-not-begin-with" );
+XML_CONSTASCII_ACTION( sXML_ends_with, "ends-with" );
+XML_CONSTASCII_ACTION( sXML_does_not_end_with, "does-not-end-with" );
+
+#endif
diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/xmloff/inc/xmloff/xmlmetae.hxx
index 9af30233ca..9af30233ca 100644..100755
--- a/xmloff/inc/xmloff/xmlmetae.hxx
+++ b/xmloff/inc/xmloff/xmlmetae.hxx
diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx
index 88020e4c2a..fff0fc3bad 100644..100755
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/xmloff/inc/xmloff/xmlmetai.hxx
@@ -51,7 +51,7 @@ private:
         ::com::sun::star::xml::sax::XDocumentHandler> mxDocBuilder;
 
 public:
-    SvXMLMetaDocumentContext(SvXMLImport& rImport, USHORT nPrfx,
+    SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::document::XDocumentProperties>& xDocProps,
@@ -60,7 +60,7 @@ public:
 
     virtual ~SvXMLMetaDocumentContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmloff/xmlnmspe.hxx
index c7d3466385..c7d3466385 100644..100755
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmloff/xmlnmspe.hxx
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index ffa16adda2..ffa16adda2 100644..100755
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx
index 7e69d2735e..7e69d2735e 100644..100755
--- a/xmloff/inc/xmloff/xmlnumfe.hxx
+++ b/xmloff/inc/xmloff/xmlnumfe.hxx
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index eae060a208..fda8fff04c 100644..100755
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -98,7 +98,7 @@ public:
     ~SvXMLNumFmtHelper();
 
     SvXMLStyleContext*	CreateChildContext( SvXMLImport& rImport,
-                USHORT nPrefix, const rtl::OUString& rLocalName,
+                sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                     SvXMLStylesContext& rStyles);
@@ -169,13 +169,13 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
     SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
 
 public:
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles );
-                SvXMLNumFormatContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -183,7 +183,7 @@ public:
                                     SvXMLStylesContext& rStyles );
     virtual		~SvXMLNumFormatContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/xmloff/inc/xmloff/xmlnumi.hxx
index ba26c0f849..ba26c0f849 100644..100755
--- a/xmloff/inc/xmloff/xmlnumi.hxx
+++ b/xmloff/inc/xmloff/xmlnumi.hxx
diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx
index be949ac88e..31191cb081 100644..100755
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/xmloff/inc/xmloff/xmlprcon.hxx
@@ -50,7 +50,7 @@ protected:
 public:
 
     SvXMLPropertySetContext(
-            SvXMLImport& rImport, USHORT nPrfx,
+            SvXMLImport& rImport, sal_uInt16 nPrfx,
             const ::rtl::OUString& rLName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
             sal_uInt32 nFamily,
@@ -60,14 +60,14 @@ public:
 
     virtual ~SvXMLPropertySetContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     // This method is called from this instance implementation of
     // CreateChildContext if the element matches an entry in the
     // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/xmloff/inc/xmloff/xmlprhdl.hxx
index 748991f068..748991f068 100644..100755
--- a/xmloff/inc/xmloff/xmlprhdl.hxx
+++ b/xmloff/inc/xmloff/xmlprhdl.hxx
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index 5e9121b552..5e9121b552 100644..100755
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmloff/xmlreg.hxx
index df5e6f3666..df5e6f3666 100644..100755
--- a/xmloff/inc/xmlreg.hxx
+++ b/xmloff/inc/xmloff/xmlreg.hxx
diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/xmloff/inc/xmloff/xmlscripti.hxx
index b441fae78d..b441fae78d 100644..100755
--- a/xmloff/inc/xmloff/xmlscripti.hxx
+++ b/xmloff/inc/xmloff/xmlscripti.hxx
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index 049530b311..df72812bb2 100644..100755
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -128,10 +128,10 @@ public:
 
     sal_uInt16 GetFamily() const { return mnFamily; }
 
-    BOOL IsValid() const { return mbValid; }
+    sal_Bool IsValid() const { return mbValid; }
     void SetValid( sal_Bool b ) { mbValid = b; }
 
-    BOOL IsNew() const { return mbNew; }
+    sal_Bool IsNew() const { return mbNew; }
     void SetNew( sal_Bool b ) { mbNew = b; }
 
     // This method is called for every default style
@@ -159,7 +159,7 @@ public:
         and Finish() will not be called.
         The default return value is false
     */
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmloff/xmltabe.hxx
index c3bfa0d82c..c3bfa0d82c 100644..100755
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmloff/xmltabe.hxx
diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/xmloff/inc/xmloff/xmltkmap.hxx
index b869bb9d96..b869bb9d96 100644..100755
--- a/xmloff/inc/xmloff/xmltkmap.hxx
+++ b/xmloff/inc/xmloff/xmltkmap.hxx
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 064596a8eb..ba8f59fd1f 100644..100755
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -3117,6 +3117,23 @@ namespace xmloff { namespace token {
 
         XML_OUTSIDE_MINIMUM,//#i114142#
         XML_OUTSIDE_MAXIMUM,//#i114142#
+        
+        XML_LEGEND_EXPANSION, //#i28760#
+        XML_LEGEND_EXPANSION_ASPECT_RATIO, //#i28760#
+        XML_BALANCED, //#i28760#
+        XML_HIGH, //#i28760#
+        XML_WIDE, //#i28760#
+
+        XML_AXIS_TYPE, //#i25706#
+        XML_DATE_SCALE,
+        XML_BASE_TIME_UNIT,
+        XML_MAJOR_INTERVAL_VALUE,
+        XML_MINOR_INTERVAL_VALUE,
+        XML_MAJOR_INTERVAL_UNIT,
+        XML_MINOR_INTERVAL_UNIT,
+        
+        XML_MIN_VALUE,
+        XML_MAX_VALUE,
 
         XML_TOKEN_END
     };
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx
index c248e03421..c248e03421 100644..100755
--- a/xmloff/inc/xmloff/xmltypes.hxx
+++ b/xmloff/inc/xmloff/xmltypes.hxx
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index d1960e0b8c..66eba41b55 100644..100755
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -224,7 +224,7 @@ public:
         this method will either use the given default or return
         false if not default is set */
     static sal_Bool convertEnum( ::rtl::OUStringBuffer& rBuffer,
-                                 USHORT nValue,
+                                 sal_uInt16 nValue,
                                  const SvXMLEnumStringMapEntry *pMap,
                                  sal_Char* pDefault = NULL );
 
@@ -259,18 +259,18 @@ public:
     /** convert double number to string (using ::rtl::math) and DO
         convert to export MapUnit */
     void convertDouble(::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits) const;
+        double fNumber, sal_Bool bWriteUnits) const;
 
     /** convert double number to string (using ::rtl::math) and
         DO convert from eSrcUnit to export MapUnit */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer,
-        double fNumber, BOOL bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
+        double fNumber, sal_Bool bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit);
 
     /** convert double number to string (using ::rtl::math) without unit conversion */
     static void convertDouble( ::rtl::OUStringBuffer& rBuffer, double fNumber);
 
     /** convert string to double number (using ::rtl::math) and DO convert. */
-    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, BOOL bLookForUnits) const;
+    sal_Bool convertDouble(double& rValue, const ::rtl::OUString& rString, sal_Bool bLookForUnits) const;
 
     /** convert string to double number (using ::rtl::math) and DO convert from
         SrcUnit to DstUnit. */
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index 3859c8e002..3859c8e002 100644..100755
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 96690c3859..314a6c2c4b 100644..100755
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 
 // ------------------------------------------------------------------------
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 71a7ca4394..1a8261d7a3 100644..100755
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,17 +1,2 @@
-xo	xmloff	:	offapi svl NULL
-xo	xmloff									usr1	-	all	xo_mkout NULL
-xo	xmloff\prj								get		-	all	xo_prj NULL
-xo	xmloff\inc								nmake	-	all	xo_inc NULL
-xo	xmloff\source\core						nmake	-	all	xo_core xo_inc NULL
-xo	xmloff\source\meta						nmake	-	all	xo_meta xo_inc NULL
-xo	xmloff\source\style						nmake	-	all	xo_style xo_inc NULL
-xo	xmloff\source\text						nmake	-	all	xo_text xo_inc NULL
-xo	xmloff\source\draw						nmake	-	all	xo_draw xo_inc NULL
-xo	xmloff\source\chart						nmake	-	all	xo_chart xo_inc NULL
-xo	xmloff\source\forms						nmake	-	all	xo_forms xo_inc NULL
-xo	xmloff\source\script					nmake	-	all	xo_script xo_inc NULL
-xo  xmloff\source\transform                 nmake   -   all xo_transform xo_util xo_inc NULL
-xo  xmloff\source\xforms                    nmake   -   all xo_xforms xo_inc NULL
-xo  xmloff\source\table						nmake   -   all xo_table xo_inc NULL
-xo  xmloff\util                             nmake   -   all xo_util xo_chart xo_core xo_draw xo_forms xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL
-xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL
+xo	xmloff	: LIBXSLT:libxslt offapi svl NULL
+xo	xmloff\prj								nmake	-	all	xo_prj NULL
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 7784bca047..e69de29bb2 100644..100755
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -1,118 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\xmloff
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
-..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
-..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\dtd\* %_DEST%\bin%_EXT%
-
-..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx
-..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h
-..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx
-..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx
-..\inc\xmloff\nmspmap.hxx %_DEST%\inc%_EXT%\xmloff\nmspmap.hxx
-..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx
-..\inc\xmloff\xmlcnimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnimp.hxx
-..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx
-..\inc\xmloff\xmlement.hxx %_DEST%\inc%_EXT%\xmloff\xmlement.hxx
-..\inc\xmloff\xmlictxt.hxx %_DEST%\inc%_EXT%\xmloff\xmlictxt.hxx
-..\inc\xmloff\xmlimp.hxx %_DEST%\inc%_EXT%\xmloff\xmlimp.hxx
-..\inc\xmloff\xmlmetae.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetae.hxx
-..\inc\xmloff\xmlmetai.hxx %_DEST%\inc%_EXT%\xmloff\xmlmetai.hxx
-..\inc\xmloff\xmlscripti.hxx %_DEST%\inc%_EXT%\xmloff\xmlscripti.hxx
-..\inc\xmloff\xmlstyle.hxx %_DEST%\inc%_EXT%\xmloff\xmlstyle.hxx
-..\inc\xmloff\xmltkmap.hxx %_DEST%\inc%_EXT%\xmloff\xmltkmap.hxx
-..\inc\xmloff\xmluconv.hxx %_DEST%\inc%_EXT%\xmloff\xmluconv.hxx
-..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx
-..\inc\xmloff\xmlnumfi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfi.hxx
-..\inc\xmloff\xmlnumfe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfe.hxx
-..\inc\xmloff\xmlexp.hxx %_DEST%\inc%_EXT%\xmloff\xmlexp.hxx
-..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx
-..\inc\xmloff\xmlnumi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumi.hxx
-..\inc\xmloff\xmlnume.hxx %_DEST%\inc%_EXT%\xmloff\xmlnume.hxx
-..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx
-..\inc\xmloff\maptype.hxx %_DEST%\inc%_EXT%\xmloff\maptype.hxx
-..\inc\xmloff\uniref.hxx %_DEST%\inc%_EXT%\xmloff\uniref.hxx
-..\inc\xmloff\xmlaustp.hxx %_DEST%\inc%_EXT%\xmloff\xmlaustp.hxx
-..\inc\xmloff\xmlexppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlexppr.hxx
-..\inc\xmloff\xmlimppr.hxx %_DEST%\inc%_EXT%\xmloff\xmlimppr.hxx
-..\inc\xmloff\xmlprcon.hxx %_DEST%\inc%_EXT%\xmloff\xmlprcon.hxx
-..\inc\xmloff\xmlprhdl.hxx %_DEST%\inc%_EXT%\xmloff\xmlprhdl.hxx
-..\inc\xmloff\xmlprmap.hxx %_DEST%\inc%_EXT%\xmloff\xmlprmap.hxx
-..\inc\xmloff\xmltypes.hxx %_DEST%\inc%_EXT%\xmloff\xmltypes.hxx
-..\inc\xmloff\families.hxx %_DEST%\inc%_EXT%\xmloff\families.hxx
-..\inc\xmloff\styleexp.hxx %_DEST%\inc%_EXT%\xmloff\styleexp.hxx
-..\inc\xmloff\txtstyle.hxx %_DEST%\inc%_EXT%\xmloff\txtstyle.hxx
-..\inc\xmloff\prstylei.hxx %_DEST%\inc%_EXT%\xmloff\prstylei.hxx
-..\inc\xmloff\txtstyli.hxx %_DEST%\inc%_EXT%\xmloff\txtstyli.hxx
-..\inc\xmloff\txtprmap.hxx %_DEST%\inc%_EXT%\xmloff\txtprmap.hxx
-..\inc\xmloff\txtparae.hxx %_DEST%\inc%_EXT%\xmloff\txtparae.hxx
-..\inc\xmloff\txtimp.hxx %_DEST%\inc%_EXT%\xmloff\txtimp.hxx
-..\inc\xmloff\prhdlfac.hxx %_DEST%\inc%_EXT%\xmloff\prhdlfac.hxx
-..\inc\xmloff\EnumPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\EnumPropertyHdl.hxx
-..\inc\xmloff\NamedBoolPropertyHdl.hxx %_DEST%\inc%_EXT%\xmloff\NamedBoolPropertyHdl.hxx
-..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx
-..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx
-..\inc\xmloff\shapeexport.hxx %_DEST%\inc%_EXT%\xmloff\shapeexport.hxx
-..\inc\xmloff\shapeimport.hxx %_DEST%\inc%_EXT%\xmloff\shapeimport.hxx
-..\inc\xmloff\SchXMLExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLExportHelper.hxx
-..\inc\xmloff\SchXMLImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SchXMLImportHelper.hxx
-..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx
-..\inc\xmloff\XMLPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLPageExport.hxx
-..\inc\xmloff\PageMasterStyleMap.hxx %_DEST%\inc%_EXT%\xmloff\PageMasterStyleMap.hxx
-..\inc\xmloff\XMLTextMasterPageExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageExport.hxx
-..\inc\xmloff\XMLTextMasterStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterStylesContext.hxx
-..\inc\xmloff\XMLTextMasterPageContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextMasterPageContext.hxx
-..\inc\xmloff\XMLTextTableContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextTableContext.hxx
-..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx
-..\inc\xmloff\XMLShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLShapeStyleContext.hxx
-..\inc\xmloff\XMLTextShapeStyleContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeStyleContext.hxx
-..\inc\xmloff\XMLFontAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontAutoStylePool.hxx
-..\inc\xmloff\XMLFontStylesContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLFontStylesContext.hxx
-..\inc\xmloff\ProgressBarHelper.hxx %_DEST%\inc%_EXT%\xmloff\ProgressBarHelper.hxx
-..\inc\xmloff\formlayerexport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerexport.hxx
-..\inc\xmloff\formlayerimport.hxx %_DEST%\inc%_EXT%\xmloff\formlayerimport.hxx
-..\inc\xmloff\animexp.hxx %_DEST%\inc%_EXT%\xmloff\animexp.hxx
-..\inc\xmloff\contextid.hxx %_DEST%\inc%_EXT%\xmloff\contextid.hxx
-..\inc\xmloff\formsimp.hxx %_DEST%\inc%_EXT%\xmloff\formsimp.hxx
-..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx
-..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx
-..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx
-..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx
-..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx
-..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx
-..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx
-..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx
-..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx
-..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx
-..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx
-..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx
-..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h
-..\inc\xmloff\XMLBase64ImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLBase64ImportContext.hxx
-..\inc\xmloff\xmltoken.hxx %_DEST%\inc%_EXT%\xmloff\xmltoken.hxx
-..\inc\xmloff\XMLEventExport.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventExport.hxx
-..\inc\xmloff\xmlevent.hxx %_DEST%\inc%_EXT%\xmloff\xmlevent.hxx
-..\inc\xmloff\XMLEventsImportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLEventsImportContext.hxx
-..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx
-..\inc\xmloff\SinglePropertySetInfoCache.hxx %_DEST%\inc%_EXT%\xmloff\SinglePropertySetInfoCache.hxx
-..\inc\xmloff\PropertySetInfoHash.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoHash.hxx
-..\inc\xmloff\PropertySetInfoKey.hxx %_DEST%\inc%_EXT%\xmloff\PropertySetInfoKey.hxx
-..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx
-..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx
-..\inc\xmloff\controlpropertyhdl.hxx %_DEST%\inc%_EXT%\xmloff\controlpropertyhdl.hxx
-..\inc\xmloff\ControlBorderHandler.hxx %_DEST%\inc%_EXT%\xmloff\ControlBorderHandler.hxx
-..\inc\xmloff\XMLConstantsPropertyHandler.hxx %_DEST%\inc%_EXT%\xmloff\XMLConstantsPropertyHandler.hxx
-..\inc\xmloff\XMLStringVector.hxx %_DEST%\inc%_EXT%\xmloff\XMLStringVector.hxx
-..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx
-..\inc\xmloff\XMLCharContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLCharContext.hxx
-..\xml\components.xml %_DEST%\xml%_EXT%\components.xml
-
-mkdir: %_DEST%\inc%_EXT%\xmloff\table
-..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx
-..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
new file mode 100755
index 0000000000..e312a7ccab
--- /dev/null
+++ b/xmloff/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/xmloff/qa/unoapi/Test.java b/xmloff/qa/unoapi/Test.java
index d66144f108..833c2d770c 100644..100755
--- a/xmloff/qa/unoapi/Test.java
+++ b/xmloff/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.xmloff.qa.unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -43,8 +44,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "xmloff.sce", "-xcl", "knownissues.xcl", "-tdoc",
-                "testdocuments", "-cs", connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc",
+                Argument.get("tdoc"), "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();
diff --git a/xmloff/qa/unoapi/knownissues.xcl b/xmloff/qa/unoapi/knownissues.xcl
index ac15aad11e..974280f032 100644..100755
--- a/xmloff/qa/unoapi/knownissues.xcl
+++ b/xmloff/qa/unoapi/knownissues.xcl
@@ -14,3 +14,12 @@ xmloff.Impress.XMLStylesImporter::com::sun::star::xml::sax::XDocumentHandler
 xmloff.Draw.XMLStylesExporter
 xmloff.Impress.XMLStylesExporter
 #-> disabled in xmloff.sce
+
+### i112778 ###
+xmloff.Draw.XMLContentExporter::com::sun::star::document::XFilter
+xmloff.Draw.XMLMetaExporter::com::sun::star::document::XFilter
+xmloff.Impress.XMLMetaExporter::com::sun::star::document::XFilter
+
+### i114211 ###
+xmloff.Draw.XMLStylesImporter::com::sun::star::lang::XInitialization
+xmloff.Impress.XMLStylesImporter::com::sun::star::lang::XInitialization
diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk
deleted file mode 100644
index 3cbbc5f2a7..0000000000
--- a/xmloff/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +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.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = xmloff
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/xmloff/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/xmloff/qa/unoapi/testdocuments/emptyChart.sds b/xmloff/qa/unoapi/testdocuments/emptyChart.sds
index 853a44a12c..853a44a12c 100644..100755
--- a/xmloff/qa/unoapi/testdocuments/emptyChart.sds
+++ b/xmloff/qa/unoapi/testdocuments/emptyChart.sds
diff --git a/xmloff/qa/unoapi/xmloff.sce b/xmloff/qa/unoapi/xmloff.sce
index 69166aec62..69166aec62 100644..100755
--- a/xmloff/qa/unoapi/xmloff.sce
+++ b/xmloff/qa/unoapi/xmloff.sce
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index f2f3a826ce..f2f3a826ce 100644..100755
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index d29edc7422..d29edc7422 100644..100755
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index cd1280b8d5..7269980ae6 100644..100755
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -160,9 +160,9 @@ public:
             (i.e. for an UnknownPropertyExcption) or if the interface is not
             supported it uses the XPropertySet interface.
         @return	If none of the two interfaces is supported or using them both
-            fails then FALSE is returned.  Else True is returned.
+            fails then sal_False is returned.  Else True is returned.
     */
-    inline	BOOL	GetProperties	(void);
+    inline	sal_Bool	GetProperties	(void);
     
 private:
     /**	@descr	Try to use the XMultiPropertySet interface to get the property
@@ -171,7 +171,7 @@ private:
             containing the properties names.
         @return	True if values could be derived.
     */
-    inline	BOOL	MultiGet	(const ::com::sun::star::uno::Sequence<
+    inline	sal_Bool	MultiGet	(const ::com::sun::star::uno::Sequence<
         ::rtl::OUString> & rNameList);
     
     /**	@descr	Try to use the XPropertySet interface to get the property
@@ -180,7 +180,7 @@ private:
             containing the properties names.
         @return	True if values could be derived.
     */
-    inline	BOOL	SingleGet	(const ::com::sun::star::uno::Sequence<	
+    inline	sal_Bool	SingleGet	(const ::com::sun::star::uno::Sequence<	
         ::rtl::OUString> & rNameList);
     
     /**	@descr	STL map that maps from property names to polymorphic instances of
@@ -215,7 +215,7 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void)
 
 
 
-BOOL	MultiPropertySetHandler::GetProperties	(void)
+sal_Bool	MultiPropertySetHandler::GetProperties	(void)
 {
     ::std::map< ::rtl::OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
     ::com::sun::star::uno::Sequence< ::rtl::OUString> aNameList (aPropertyList.size());
@@ -224,14 +224,14 @@ BOOL	MultiPropertySetHandler::GetProperties	(void)
         aNameList[i++] = I->second->msName;
     if ( ! MultiGet(aNameList))
         if ( ! SingleGet(aNameList))
-            return FALSE;
-    return TRUE;
+            return sal_False;
+    return sal_True;
 }
 
 
 
 
-BOOL	MultiPropertySetHandler::MultiGet	(const ::com::sun::star::uno::Sequence<
+sal_Bool	MultiPropertySetHandler::MultiGet	(const ::com::sun::star::uno::Sequence<
     ::rtl::OUString> & rNameList)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet (
@@ -248,18 +248,18 @@ BOOL	MultiPropertySetHandler::MultiGet	(const ::com::sun::star::uno::Sequence<
         }
         catch (::com::sun::star::beans::UnknownPropertyException e)
         {
-            return FALSE;
+            return sal_False;
         }
     else
-        return FALSE;
+        return sal_False;
         
-    return TRUE;
+    return sal_True;
 }
 
 
 
 
-BOOL	MultiPropertySetHandler::SingleGet	(const ::com::sun::star::uno::Sequence<
+sal_Bool	MultiPropertySetHandler::SingleGet	(const ::com::sun::star::uno::Sequence<
     ::rtl::OUString> & rNameList)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet (
@@ -274,12 +274,12 @@ BOOL	MultiPropertySetHandler::SingleGet	(const ::com::sun::star::uno::Sequence<
         }
         catch (::com::sun::star::beans::UnknownPropertyException e)
         {
-            return FALSE;
+            return sal_False;
         }
     else
-        return FALSE;
+        return sal_False;
             
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index 356e31f097..39ac16b797 100644..100755
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -29,7 +29,7 @@
 #define _PROPERTYMAP_HXX_
 
 #include <xmloff/maptype.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/contextid.hxx>
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index f65dbbdcb6..f65dbbdcb6 100644..100755
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 4768c13878..4768c13878 100644..100755
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index d725139a42..d725139a42 100644..100755
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
new file mode 100755
index 0000000000..43e35c9c40
--- /dev/null
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -0,0 +1,1053 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmloff.hxx"
+
+#include "SchXMLAxisContext.hxx"
+#include "SchXMLChartContext.hxx"
+#include "SchXMLTools.hxx"
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlement.hxx>
+#include <xmloff/xmlstyle.hxx>
+#include <xmloff/prstylei.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmluconv.hxx>
+
+#include <tools/debug.hxx>
+
+#include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
+#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
+#include <com/sun/star/chart/ChartAxisPosition.hpp>
+#include <com/sun/star/chart/ChartAxisType.hpp>
+#include <com/sun/star/chart/TimeIncrement.hpp>
+#include <com/sun/star/chart/TimeInterval.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
+#include <com/sun/star/chart/XAxis.hpp>
+#include <com/sun/star/chart/XAxisSupplier.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+
+#include <com/sun/star/drawing/LineStyle.hpp>
+
+using namespace ::xmloff::token;
+using namespace com::sun::star;
+
+using rtl::OUString;
+using com::sun::star::uno::Reference;
+
+//----------------------------------------
+//----------------------------------------
+
+static SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
+{
+    { XML_X,  SCH_XML_AXIS_X  },
+    { XML_Y,  SCH_XML_AXIS_Y  },
+    { XML_Z,  SCH_XML_AXIS_Z  },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+static SvXMLEnumMapEntry aXMLAxisTypeMap[] =
+{
+    { XML_AUTO,  ::com::sun::star::chart::ChartAxisType::AUTOMATIC },
+    { XML_TEXT,  ::com::sun::star::chart::ChartAxisType::CATEGORY },
+    { XML_DATE,  ::com::sun::star::chart::ChartAxisType::DATE },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+//----------------------------------------
+//----------------------------------------
+
+class SchXMLCategoriesContext : public SvXMLImportContext
+{
+private:
+    SchXMLImportHelper& m_rImportHelper;
+    OUString& mrAddress;
+
+public:
+    SchXMLCategoriesContext( SchXMLImportHelper& rImpHelper,
+                                   SvXMLImport& rImport,
+                                   sal_uInt16 nPrefix,
+                                   const OUString& rLocalName,
+                                   OUString& rAddress );
+    virtual ~SchXMLCategoriesContext();
+    virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+};
+
+//----------------------------------------
+//----------------------------------------
+
+
+class DateScaleContext : public SvXMLImportContext
+{
+public:
+    DateScaleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport,
+                        sal_uInt16 nPrefix, const OUString& rLocalName,
+                        const Reference< beans::XPropertySet > xAxisProps );
+
+    virtual ~DateScaleContext();
+    virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+    SchXMLImportHelper& m_rImportHelper;
+    Reference< beans::XPropertySet > m_xAxisProps;
+};
+
+
+//----------------------------------------
+//----------------------------------------
+
+SchXMLAxisContext::SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
+                                      SvXMLImport& rImport, const OUString& rLocalName,
+                                      Reference< chart::XDiagram > xDiagram,
+                                      std::vector< SchXMLAxis >& rAxes,
+                                      OUString & rCategoriesAddress,
+                                      bool bAddMissingXAxisForNetCharts,
+                                      bool bAdaptWrongPercentScaleValues,
+                                      bool bAdaptXAxisOrientationForOld2DBarCharts,
+                                      bool& rbAxisPositionAttributeImported ) :
+        SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+        m_rImportHelper( rImpHelper ),
+        m_xDiagram( xDiagram ),
+        m_rAxes( rAxes ),
+        m_rCategoriesAddress( rCategoriesAddress ),
+        m_nAxisType(chart::ChartAxisType::AUTOMATIC),
+        m_bAxisTypeImported(false),
+        m_bDateScaleImported(false),
+        m_bAddMissingXAxisForNetCharts( bAddMissingXAxisForNetCharts ),
+        m_bAdaptWrongPercentScaleValues( bAdaptWrongPercentScaleValues ),
+        m_bAdaptXAxisOrientationForOld2DBarCharts( bAdaptXAxisOrientationForOld2DBarCharts ),
+        m_rbAxisPositionAttributeImported( rbAxisPositionAttributeImported )
+{
+}
+
+SchXMLAxisContext::~SchXMLAxisContext()
+{}
+
+Reference< chart::XAxis > lcl_getChartAxis( SchXMLAxis aCurrentAxis, const Reference< chart::XDiagram > xDiagram )
+{
+    Reference< chart::XAxis > xAxis;
+    Reference< chart::XAxisSupplier > xAxisSuppl( xDiagram, uno::UNO_QUERY );
+    if( !xAxisSuppl.is() )
+        return xAxis;
+    if( aCurrentAxis.nAxisIndex == 0 )
+        xAxis = xAxisSuppl->getAxis(aCurrentAxis.eDimension);
+    else
+        xAxis = xAxisSuppl->getSecondaryAxis(aCurrentAxis.eDimension);
+    return xAxis;
+}
+
+/* returns a shape for the current axis's title. The property
+   "Has...AxisTitle" is set to "True" to get the shape
+ */
+Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
+{
+    Reference< drawing::XShape > xResult;
+    Reference< beans::XPropertySet > xDiaProp( m_rImportHelper.GetChartDocument()->getDiagram(), uno::UNO_QUERY );
+    Reference< chart::XAxis > xAxis( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ) );
+    if( !xDiaProp.is() || !xAxis.is() )
+        return xResult;
+
+    rtl::OUString aPropName;
+    switch( m_aCurrentAxis.eDimension )
+    {
+        case SCH_XML_AXIS_X:
+            if( m_aCurrentAxis.nAxisIndex == 0 )
+                aPropName = OUString::createFromAscii( "HasXAxisTitle" );
+            else
+                aPropName = OUString::createFromAscii( "HasSecondaryXAxisTitle" );
+            break;
+        case SCH_XML_AXIS_Y:
+            if( m_aCurrentAxis.nAxisIndex == 0 )
+                aPropName = OUString::createFromAscii( "HasYAxisTitle" );
+            else
+                aPropName = OUString::createFromAscii( "HasSecondaryYAxisTitle" );
+            break;
+        case SCH_XML_AXIS_Z:
+            aPropName = OUString::createFromAscii( "HasZAxisTitle" );
+            break;
+        case SCH_XML_AXIS_UNDEF:
+            DBG_ERROR( "Invalid axis" );
+            break;
+    }
+    xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+    xResult = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xResult;
+}
+
+void SchXMLAxisContext::CreateGrid( OUString sAutoStyleName, bool bIsMajor )
+{
+    Reference< beans::XPropertySet > xDiaProp( m_rImportHelper.GetChartDocument()->getDiagram(), uno::UNO_QUERY );
+    Reference< chart::XAxis > xAxis( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ) );
+    if( !xDiaProp.is() || !xAxis.is() )
+        return;
+
+    rtl::OUString aPropName;
+    switch( m_aCurrentAxis.eDimension )
+    {
+        case SCH_XML_AXIS_X:
+            if( bIsMajor )
+                aPropName = OUString::createFromAscii("HasXAxisGrid");
+            else
+                aPropName = OUString::createFromAscii("HasXAxisHelpGrid");
+            break;
+        case SCH_XML_AXIS_Y:
+            if( bIsMajor )
+                aPropName = OUString::createFromAscii("HasYAxisGrid");
+            else
+                aPropName = OUString::createFromAscii("HasYAxisHelpGrid");
+            break;
+        case SCH_XML_AXIS_Z:
+            if( bIsMajor )
+                aPropName = OUString::createFromAscii("HasZAxisGrid");
+            else
+                aPropName = OUString::createFromAscii("HasZAxisHelpGrid");
+            break;
+        case SCH_XML_AXIS_UNDEF:
+            DBG_ERROR( "Invalid axis" );
+            break;
+    }
+    xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+
+    Reference< beans::XPropertySet > xGridProp;
+    if( bIsMajor )
+        xGridProp = xAxis->getMajorGrid();
+    else
+        xGridProp = xAxis->getMinorGrid();
+    
+    // set properties
+    if( xGridProp.is())
+    {
+        // the line color is black as default, in the model it is a light gray
+        xGridProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
+                                     uno::makeAny( COL_BLACK ));
+        if( sAutoStyleName.getLength())
+        {
+            const SvXMLStylesContext* pStylesCtxt = m_rImportHelper.GetAutoStylesContext();
+            if( pStylesCtxt )
+            {
+                const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
+                    m_rImportHelper.GetChartFamilyID(), sAutoStyleName );
+
+                if( pStyle && pStyle->ISA( XMLPropStyleContext ))
+                    (( XMLPropStyleContext* )pStyle )->FillPropertySet( xGridProp );
+            }
+        }
+    }
+}
+
+namespace
+{
+enum AxisAttributeTokens
+{
+    XML_TOK_AXIS_DIMENSION,
+    XML_TOK_AXIS_NAME,
+    XML_TOK_AXIS_STYLE_NAME,
+    XML_TOK_AXIS_TYPE,
+    XML_TOK_AXIS_TYPE_EXT
+};
+
+SvXMLTokenMapEntry aAxisAttributeTokenMap[] =
+{
+    { XML_NAMESPACE_CHART,      XML_DIMENSION,  XML_TOK_AXIS_DIMENSION      },
+    { XML_NAMESPACE_CHART,      XML_NAME,       XML_TOK_AXIS_NAME           },
+    { XML_NAMESPACE_CHART,      XML_STYLE_NAME, XML_TOK_AXIS_STYLE_NAME     },
+    { XML_NAMESPACE_CHART,      XML_AXIS_TYPE,  XML_TOK_AXIS_TYPE           },
+    { XML_NAMESPACE_CHART_EXT,  XML_AXIS_TYPE,  XML_TOK_AXIS_TYPE_EXT       },
+    XML_TOKEN_MAP_END
+};
+
+class AxisAttributeTokenMap : public SvXMLTokenMap
+{
+public:
+    AxisAttributeTokenMap(): SvXMLTokenMap( aAxisAttributeTokenMap ) {}
+    virtual ~AxisAttributeTokenMap() {}
+};
+
+//a AxisAttributeTokenMap Singleton
+struct theAxisAttributeTokenMap : public rtl::Static< AxisAttributeTokenMap, theAxisAttributeTokenMap > {};
+}
+
+void SchXMLAxisContext::StartElement( const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    // parse attributes
+    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+    SchXMLImport& rImport = ( SchXMLImport& )GetImport();
+    const SvXMLTokenMap& rAttrTokenMap = theAxisAttributeTokenMap::get();
+
+    for( sal_Int16 i = 0; i < nAttrCount; i++ )
+    {
+        OUString sAttrName = xAttrList->getNameByIndex( i );
+        OUString aLocalName;
+        OUString aValue = xAttrList->getValueByIndex( i );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+        switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+        {
+            case XML_TOK_AXIS_DIMENSION:
+                {
+                    sal_uInt16 nEnumVal;
+                    if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisDimensionMap ))
+                        m_aCurrentAxis.eDimension = ( SchXMLAxisDimension )nEnumVal;
+                }
+                break;
+            case XML_TOK_AXIS_NAME:
+                m_aCurrentAxis.aName = aValue;
+                break;
+            case XML_TOK_AXIS_TYPE:
+            case XML_TOK_AXIS_TYPE_EXT:
+                sal_uInt16 nEnumVal;
+                if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisTypeMap ))
+                {
+                    m_nAxisType = nEnumVal;
+                    m_bAxisTypeImported = true;
+                }
+                break;
+            case XML_TOK_AXIS_STYLE_NAME:
+                m_aAutoStyleName = aValue;
+                break;
+        }
+    }
+
+    // check for number of axes with same dimension
+    m_aCurrentAxis.nAxisIndex = 0;
+    sal_Int32 nNumOfAxes = m_rAxes.size();
+    for( sal_Int32 nCurrent = 0; nCurrent < nNumOfAxes; nCurrent++ )
+    {
+        if( m_rAxes[ nCurrent ].eDimension == m_aCurrentAxis.eDimension )
+            m_aCurrentAxis.nAxisIndex++;
+    }
+    CreateAxis();
+}
+namespace
+{
+
+Reference< chart2::XAxis > lcl_getAxis( const Reference< frame::XModel >& xChartModel,
+                                            sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+{
+    Reference< chart2::XAxis > xAxis;
+
+    try
+    {
+        Reference< chart2::XChartDocument > xChart2Document( xChartModel, uno::UNO_QUERY );
+        if( xChart2Document.is() )
+        {
+            Reference< chart2::XDiagram > xDiagram( xChart2Document->getFirstDiagram());
+            Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
+            uno::Sequence< Reference< chart2::XCoordinateSystem > >
+                aCooSysSeq( xCooSysCnt->getCoordinateSystems());
+            sal_Int32 nCooSysIndex = 0;
+            if( nCooSysIndex < aCooSysSeq.getLength() )
+            {
+                Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[nCooSysIndex] );
+                if( xCooSys.is() && nDimensionIndex < xCooSys->getDimension() )
+                {
+                    const sal_Int32 nMaxAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nDimensionIndex);
+                    if( nAxisIndex <= nMaxAxisIndex )
+                        xAxis = xCooSys->getAxisByDimension( nDimensionIndex, nAxisIndex );
+                }
+            }
+        }
+    }
+    catch( uno::Exception & )
+    {
+        DBG_ERROR( "Couldn't get axis" );
+    }
+
+    return xAxis;
+}
+
+bool lcl_divideBy100( uno::Any& rDoubleAny )
+{
+    bool bChanged = false;
+    double fValue=0.0;
+    if( (rDoubleAny>>=fValue) && (fValue!=0.0) )
+    {
+        fValue/=100.0;
+        rDoubleAny = uno::makeAny(fValue);
+        bChanged = true;
+    }
+    return bChanged;
+}
+
+bool lcl_AdaptWrongPercentScaleValues(chart2::ScaleData& rScaleData)
+{
+    bool bChanged = lcl_divideBy100( rScaleData.Minimum );
+    bChanged = lcl_divideBy100( rScaleData.Maximum ) || bChanged;
+    bChanged = lcl_divideBy100( rScaleData.Origin ) || bChanged;
+    bChanged = lcl_divideBy100( rScaleData.IncrementData.Distance ) || bChanged;
+    return bChanged;
+}
+
+}//end anonymous namespace
+
+void SchXMLAxisContext::CreateAxis()
+{
+    m_rAxes.push_back( m_aCurrentAxis );
+
+    Reference< beans::XPropertySet > xDiaProp( m_rImportHelper.GetChartDocument()->getDiagram(), uno::UNO_QUERY );
+    if( !xDiaProp.is() )
+        return;
+    rtl::OUString aPropName;
+    switch( m_aCurrentAxis.eDimension )
+    {
+        case SCH_XML_AXIS_X:
+            if( m_aCurrentAxis.nAxisIndex == 0 )
+                aPropName = OUString::createFromAscii("HasXAxis");
+            else
+                aPropName = OUString::createFromAscii("HasSecondaryXAxis");
+            break;
+        case SCH_XML_AXIS_Y:
+            if( m_aCurrentAxis.nAxisIndex == 0 )
+                aPropName = OUString::createFromAscii("HasYAxis");
+            else
+                aPropName = OUString::createFromAscii("HasSecondaryYAxis");
+            break;
+        case SCH_XML_AXIS_Z:
+            if( m_aCurrentAxis.nAxisIndex == 0 )
+                aPropName = OUString::createFromAscii("HasXAxis");
+            else
+                aPropName = OUString::createFromAscii("HasSecondaryXAxis");
+            break;
+        case SCH_XML_AXIS_UNDEF:
+            DBG_ERROR( "Invalid axis" );
+            break;
+    }
+    try
+    {
+        xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
+    }
+    catch( beans::UnknownPropertyException & )
+    {
+        DBG_ERROR( "Couldn't turn on axis" );
+    }
+    if( m_aCurrentAxis.eDimension==SCH_XML_AXIS_Z )
+    {
+        bool bSettingZAxisSuccedded = false;
+        try
+        {
+            xDiaProp->getPropertyValue( aPropName ) >>= bSettingZAxisSuccedded;
+        }
+        catch( beans::UnknownPropertyException & )
+        {
+            DBG_ERROR( "Couldn't turn on z axis" );
+        }
+        if( !bSettingZAxisSuccedded )
+            return;
+    }
+
+    
+    m_xAxisProps = Reference<beans::XPropertySet>( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ), uno::UNO_QUERY );
+    
+    if( m_bAddMissingXAxisForNetCharts && m_aCurrentAxis.eDimension==SCH_XML_AXIS_Y && m_aCurrentAxis.nAxisIndex==0 )
+    {
+        try
+        {
+            xDiaProp->setPropertyValue( OUString::createFromAscii( "HasXAxis" ), uno::makeAny(sal_True) );
+        }
+        catch( beans::UnknownPropertyException & )
+        {
+            DBG_ERROR( "Couldn't turn on x axis" );
+        }
+    }
+
+    // set properties
+    if( m_xAxisProps.is())
+    {
+        uno::Any aTrueBool( uno::makeAny( sal_True ));
+        uno::Any aFalseBool( uno::makeAny( sal_False ));
+
+        // #i109879# the line color is black as default, in the model it is a light gray
+        m_xAxisProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
+                                     uno::makeAny( COL_BLACK ));
+
+        m_xAxisProps->setPropertyValue( OUString::createFromAscii( "DisplayLabels" ), aFalseBool );
+
+        // #88077# AutoOrigin 'on' is default
+        m_xAxisProps->setPropertyValue( OUString::createFromAscii( "AutoOrigin" ), aTrueBool );
+
+        if( m_bAxisTypeImported )
+            m_xAxisProps->setPropertyValue( OUString::createFromAscii( "AxisType" ), uno::makeAny(m_nAxisType) );
+        
+        if( m_aAutoStyleName.getLength())
+        {
+            const SvXMLStylesContext* pStylesCtxt = m_rImportHelper.GetAutoStylesContext();
+            if( pStylesCtxt )
+            {
+                const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
+                    m_rImportHelper.GetChartFamilyID(), m_aAutoStyleName );
+
+                if( pStyle && pStyle->ISA( XMLPropStyleContext ))
+                {
+                    // note: SvXMLStyleContext::FillPropertySet is not const
+                    XMLPropStyleContext * pPropStyleContext = const_cast< XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle ));
+                    if( pPropStyleContext )
+                        pPropStyleContext->FillPropertySet( m_xAxisProps );
+
+                    if( m_bAdaptWrongPercentScaleValues && m_aCurrentAxis.eDimension==SCH_XML_AXIS_Y )
+                    {
+                        //set scale data of added x axis back to default
+                        Reference< chart2::XAxis > xAxis( lcl_getAxis( GetImport().GetModel(),
+                                            m_aCurrentAxis.eDimension, m_aCurrentAxis.nAxisIndex ) );
+                        if( xAxis.is() )
+                        {
+                            chart2::ScaleData aScaleData( xAxis->getScaleData());
+                            if( lcl_AdaptWrongPercentScaleValues(aScaleData) )
+                                xAxis->setScaleData( aScaleData );
+                        }
+                    }
+
+                    if( m_bAddMissingXAxisForNetCharts )
+                    {
+                        //copy style from y axis to added x axis:
+                        
+                        Reference< chart::XAxisSupplier > xAxisSuppl( xDiaProp, uno::UNO_QUERY );
+                        if( xAxisSuppl.is() )
+                        {
+                            Reference< beans::XPropertySet > xXAxisProp( xAxisSuppl->getAxis(0), uno::UNO_QUERY );
+                            (( XMLPropStyleContext* )pStyle )->FillPropertySet( xXAxisProp );
+                        }
+
+                        //set scale data of added x axis back to default
+                        Reference< chart2::XAxis > xAxis( lcl_getAxis( GetImport().GetModel(),
+                                            0 /*nDimensionIndex*/, 0 /*nAxisIndex*/ ) );
+                        if( xAxis.is() )
+                        {
+                            chart2::ScaleData aScaleData;
+                            aScaleData.AxisType = chart2::AxisType::CATEGORY;
+                            aScaleData.Orientation = chart2::AxisOrientation_MATHEMATICAL;
+                            xAxis->setScaleData( aScaleData );
+                        }
+
+                        //set line style of added x axis to invisible
+                        Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY );
+                        if( xNewAxisProp.is() )
+                        {
+                            xNewAxisProp->setPropertyValue( OUString::createFromAscii("LineStyle")
+                                , uno::makeAny(drawing::LineStyle_NONE));
+                        }
+                    }
+
+                    if( m_bAdaptXAxisOrientationForOld2DBarCharts && m_aCurrentAxis.eDimension == SCH_XML_AXIS_X )
+                    {
+                        bool bIs3DChart = false;
+                        if( xDiaProp.is() && ( xDiaProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3DChart ) 
+                            && !bIs3DChart )
+                        {	
+                            Reference< chart2::XChartDocument > xChart2Document( GetImport().GetModel(), uno::UNO_QUERY );
+                            if( xChart2Document.is() )
+                            {
+                                Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xChart2Document->getFirstDiagram(), uno::UNO_QUERY );
+                                if( xCooSysCnt.is() )
+                                {
+                                    uno::Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems() );
+                                    if( aCooSysSeq.getLength() )
+                                    {
+                                        bool bSwapXandYAxis = false;
+                                        Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[0] );
+                                        Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY );
+                                        if( xCooSysProp.is() && ( xCooSysProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXandYAxis )
+                                            && bSwapXandYAxis )
+                                        {
+                                            Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension( 0, m_aCurrentAxis.nAxisIndex );
+                                            if( xAxis.is() )
+                                            {
+                                                chart2::ScaleData aScaleData = xAxis->getScaleData();
+                                                aScaleData.Orientation = chart2::AxisOrientation_REVERSE;
+                                                xAxis->setScaleData( aScaleData );
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    m_rbAxisPositionAttributeImported = m_rbAxisPositionAttributeImported || SchXMLTools::getPropertyFromContext(
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")), pPropStyleContext, pStylesCtxt ).hasValue();
+                }
+            }
+        }
+    }
+}
+
+void SchXMLAxisContext::SetAxisTitle()
+{
+    if( !m_aCurrentAxis.aTitle.getLength() )
+        return;
+
+    Reference< chart::XAxis > xAxis( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ) );
+    if( !xAxis.is() )
+        return;
+
+    Reference< beans::XPropertySet > xTitleProp( xAxis->getAxisTitle() );
+    if( xTitleProp.is() )
+    {
+        try
+        {
+            xTitleProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), uno::makeAny(m_aCurrentAxis.aTitle) );
+        }
+        catch( beans::UnknownPropertyException & )
+        {
+            DBG_ERROR( "Property String for Title not available" );
+        }
+    }
+}
+
+//-----------------------------------------------------------------------
+namespace
+{
+enum AxisChildTokens
+{
+    XML_TOK_AXIS_TITLE,
+    XML_TOK_AXIS_CATEGORIES,
+    XML_TOK_AXIS_GRID,
+    XML_TOK_AXIS_DATE_SCALE,
+    XML_TOK_AXIS_DATE_SCALE_EXT
+};
+
+SvXMLTokenMapEntry aAxisChildTokenMap[] =
+{
+    { XML_NAMESPACE_CHART,      XML_TITLE,              XML_TOK_AXIS_TITLE          },
+    { XML_NAMESPACE_CHART,      XML_CATEGORIES,         XML_TOK_AXIS_CATEGORIES     },
+    { XML_NAMESPACE_CHART,      XML_GRID,               XML_TOK_AXIS_GRID           },
+    { XML_NAMESPACE_CHART,      XML_DATE_SCALE,         XML_TOK_AXIS_DATE_SCALE     },
+    { XML_NAMESPACE_CHART_EXT,  XML_DATE_SCALE,         XML_TOK_AXIS_DATE_SCALE_EXT },
+    XML_TOKEN_MAP_END
+};
+
+class AxisChildTokenMap : public SvXMLTokenMap
+{
+public:
+    AxisChildTokenMap(): SvXMLTokenMap( aAxisChildTokenMap ) {}
+    virtual ~AxisChildTokenMap() {}
+};
+
+//a AxisChildTokenMap Singleton
+struct theAxisChildTokenMap : public rtl::Static< AxisChildTokenMap, theAxisChildTokenMap > {};
+}
+
+SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
+    sal_uInt16 p_nPrefix,
+    const OUString& rLocalName,
+    const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    SvXMLImportContext* pContext = 0;
+    const SvXMLTokenMap& rTokenMap = theAxisChildTokenMap::get();
+
+    switch( rTokenMap.Get( p_nPrefix, rLocalName ))
+    {
+        case XML_TOK_AXIS_TITLE:
+        {
+            Reference< drawing::XShape > xTitleShape = getTitleShape();
+            pContext = new SchXMLTitleContext( m_rImportHelper, GetImport(), rLocalName,
+                                               m_aCurrentAxis.aTitle,
+                                               xTitleShape );
+        }
+        break;
+
+        case XML_TOK_AXIS_CATEGORIES:
+            pContext = new SchXMLCategoriesContext( m_rImportHelper, GetImport(),
+                                                          p_nPrefix, rLocalName,
+                                                          m_rCategoriesAddress );
+            m_aCurrentAxis.bHasCategories = true;
+            break;
+
+        case XML_TOK_AXIS_DATE_SCALE:
+        case XML_TOK_AXIS_DATE_SCALE_EXT:
+            pContext = new DateScaleContext( m_rImportHelper, GetImport(),
+                            p_nPrefix, rLocalName, m_xAxisProps );
+            m_bDateScaleImported = true;
+            break;
+
+        case XML_TOK_AXIS_GRID:
+        {
+            sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+            bool bIsMajor = true;		// default value for class is "major"
+            OUString sAutoStyleName;
+
+            for( sal_Int16 i = 0; i < nAttrCount; i++ )
+            {
+                OUString sAttrName = xAttrList->getNameByIndex( i );
+                OUString aLocalName;
+                sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+                if( nPrefix == XML_NAMESPACE_CHART )
+                {
+                    if( IsXMLToken( aLocalName, XML_CLASS ) )
+                    {
+                        if( IsXMLToken( xAttrList->getValueByIndex( i ), XML_MINOR ) )
+                            bIsMajor = false;
+                    }
+                    else if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+                        sAutoStyleName = xAttrList->getValueByIndex( i );
+                }
+            }
+
+            CreateGrid( sAutoStyleName, bIsMajor );
+
+            // don't create a context => use default context. grid elements are empty
+            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
+        }
+        break;
+
+        default:
+            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
+            break;
+    }
+
+    return pContext;
+}
+
+void SchXMLAxisContext::EndElement()
+{
+    if( !m_bDateScaleImported && m_nAxisType==chart::ChartAxisType::AUTOMATIC )
+    {
+        Reference< chart2::XAxis > xAxis( lcl_getAxis( GetImport().GetModel(), m_aCurrentAxis.eDimension, m_aCurrentAxis.nAxisIndex ) );
+        if( xAxis.is() )
+        {
+            chart2::ScaleData aScaleData( xAxis->getScaleData());
+            aScaleData.AutoDateAxis = false;//different default for older documents
+            xAxis->setScaleData( aScaleData );
+        }
+    }
+
+    SetAxisTitle();
+}
+
+// ========================================
+
+namespace
+{
+
+Reference< chart2::XAxis > lcl_getAxis( const Reference< chart2::XCoordinateSystem > xCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+{
+    Reference< chart2::XAxis > xAxis;
+    try
+    {
+        xAxis = xCooSys->getAxisByDimension( nDimensionIndex, nAxisIndex );
+    }
+    catch( uno::Exception & )
+    {
+    }
+    return xAxis;
+}
+
+} // anonymous namespace
+
+void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDocument >& xNewDoc,
+                          const OUString& rChartTypeServiceName,
+                          const OUString& rODFVersionOfFile,
+                          bool bAxisPositionAttributeImported )
+{
+    if( ( !rODFVersionOfFile.getLength() || rODFVersionOfFile.equalsAscii("1.0")
+        || rODFVersionOfFile.equalsAscii("1.1")
+        || ( rODFVersionOfFile.equalsAscii("1.2") && !bAxisPositionAttributeImported ) ) )
+    {
+        try
+        {
+            Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xNewDoc->getFirstDiagram(), uno::UNO_QUERY_THROW );
+            uno::Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
+            if( aCooSysSeq.getLength() )
+            {
+                Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[0] );
+                if( xCooSys.is() )
+                {
+                    Reference< chart2::XAxis > xMainXAxis = lcl_getAxis( xCooSys, 0, 0 );
+                    Reference< chart2::XAxis > xMainYAxis = lcl_getAxis( xCooSys, 1, 0 );
+                    //Reference< chart2::XAxis > xMajorZAxis = lcl_getAxis( xCooSys, 2, 0 );
+                    Reference< chart2::XAxis > xSecondaryXAxis = lcl_getAxis( xCooSys, 0, 1 );
+                    Reference< chart2::XAxis > xSecondaryYAxis = lcl_getAxis( xCooSys, 1, 1 );
+                    
+                    Reference< beans::XPropertySet > xMainXAxisProp( xMainXAxis, uno::UNO_QUERY );
+                    Reference< beans::XPropertySet > xMainYAxisProp( xMainYAxis, uno::UNO_QUERY );
+                    Reference< beans::XPropertySet > xSecondaryXAxisProp( xSecondaryXAxis, uno::UNO_QUERY );
+                    Reference< beans::XPropertySet > xSecondaryYAxisProp( xSecondaryYAxis, uno::UNO_QUERY );
+                    
+                    if( xMainXAxisProp.is() && xMainYAxisProp.is() )
+                    {
+                        chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
+                        if( 0 == rChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
+                        {
+                            xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
+                            double fCrossoverValue = 0.0;
+                            aMainXScale.Origin >>= fCrossoverValue;
+                            xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverValue")
+                                    , uno::makeAny( fCrossoverValue ) );
+
+                            if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
+                            {
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
+                                if( xSecondaryYAxisProp.is() )
+                                    xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
+                            }
+                            else
+                            {
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
+                                if( xSecondaryYAxisProp.is() )
+                                    xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
+                            }    
+                        }
+                        else
+                        {
+                            if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
+                            {
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
+                                if( xSecondaryYAxisProp.is() )
+                                    xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                        , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
+                            }
+                            else
+                            {
+                                xMainYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
+                                if( xSecondaryYAxisProp.is() )
+                                    xSecondaryYAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                        , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
+                            }
+                        }
+
+                        chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
+                        xMainXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
+                        double fCrossoverValue = 0.0;
+                        aMainYScale.Origin >>= fCrossoverValue;
+                        xMainXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverValue")
+                                , uno::makeAny( fCrossoverValue ) );
+
+                        if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
+                        {
+                            xMainXAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
+                            xMainXAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
+                            if( xSecondaryXAxisProp.is() )
+                                xSecondaryXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
+                        }
+                        else
+                        {
+                            xMainXAxisProp->setPropertyValue( OUString::createFromAscii("LabelPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
+                            xMainXAxisProp->setPropertyValue( OUString::createFromAscii("MarkPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
+                            if( xSecondaryXAxisProp.is() )
+                                xSecondaryXAxisProp->setPropertyValue( OUString::createFromAscii("CrossoverPosition")
+                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
+                        }
+                    }
+                }
+            }
+        }
+        catch( uno::Exception & )
+        {
+        }
+    }
+}
+
+// ========================================
+
+SchXMLCategoriesContext::SchXMLCategoriesContext(
+    SchXMLImportHelper& rImpHelper,
+    SvXMLImport& rImport,
+    sal_uInt16 nPrefix,
+    const OUString& rLocalName,
+    OUString& rAddress ) :
+        SvXMLImportContext( rImport, nPrefix, rLocalName ),
+        m_rImportHelper( rImpHelper ),
+        mrAddress( rAddress )
+{
+}
+
+SchXMLCategoriesContext::~SchXMLCategoriesContext()
+{
+}
+
+void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+
+    for( sal_Int16 i = 0; i < nAttrCount; i++ )
+    {
+        OUString sAttrName = xAttrList->getNameByIndex( i );
+        OUString aLocalName;
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+        if( nPrefix == XML_NAMESPACE_TABLE &&
+            IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
+        {
+            Reference< chart2::XChartDocument > xNewDoc( GetImport().GetModel(), uno::UNO_QUERY );
+            mrAddress = xAttrList->getValueByIndex( i );
+        }
+    }
+}
+
+// ========================================
+
+DateScaleContext::DateScaleContext(
+    SchXMLImportHelper& rImpHelper,
+    SvXMLImport& rImport,
+    sal_uInt16 nPrefix,
+    const OUString& rLocalName,
+    const Reference< beans::XPropertySet > xAxisProps ) :
+        SvXMLImportContext( rImport, nPrefix, rLocalName ),
+        m_rImportHelper( rImpHelper ),
+        m_xAxisProps( xAxisProps )
+{
+}
+
+DateScaleContext::~DateScaleContext()
+{
+}
+
+namespace
+{
+enum DateScaleAttributeTokens
+{
+    XML_TOK_DATESCALE_BASE_TIME_UNIT,
+    XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE,
+    XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT,
+    XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE,
+    XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT
+};
+
+SvXMLTokenMapEntry aDateScaleAttributeTokenMap[] =
+{
+    { XML_NAMESPACE_CHART,  XML_BASE_TIME_UNIT,         XML_TOK_DATESCALE_BASE_TIME_UNIT  },
+    { XML_NAMESPACE_CHART,  XML_MAJOR_INTERVAL_VALUE,   XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE  },
+    { XML_NAMESPACE_CHART,  XML_MAJOR_INTERVAL_UNIT,    XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT  },
+    { XML_NAMESPACE_CHART,  XML_MINOR_INTERVAL_VALUE,   XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE  },
+    { XML_NAMESPACE_CHART,  XML_MINOR_INTERVAL_UNIT,    XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT  },
+    XML_TOKEN_MAP_END
+};
+
+class DateScaleAttributeTokenMap : public SvXMLTokenMap
+{
+public:
+    DateScaleAttributeTokenMap(): SvXMLTokenMap( aDateScaleAttributeTokenMap ) {}
+    virtual ~DateScaleAttributeTokenMap() {}
+};
+
+struct theDateScaleAttributeTokenMap : public rtl::Static< DateScaleAttributeTokenMap, theDateScaleAttributeTokenMap > {};
+
+sal_Int32 lcl_getTimeUnit( const OUString& rValue )
+{
+    sal_Int32 nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY;
+    if( IsXMLToken( rValue, XML_DAYS ) )
+        nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY;
+    else if( IsXMLToken( rValue, XML_MONTHS ) )
+        nTimeUnit = ::com::sun::star::chart::TimeUnit::MONTH;
+    else if( IsXMLToken( rValue, XML_YEARS ) )
+        nTimeUnit = ::com::sun::star::chart::TimeUnit::YEAR;
+    return nTimeUnit;
+}
+
+}
+
+void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    if( !m_xAxisProps.is() )
+        return;
+
+    // parse attributes
+    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+    const SvXMLTokenMap& rAttrTokenMap = theDateScaleAttributeTokenMap::get();
+
+    bool bSetNewIncrement=false;
+    chart::TimeIncrement aIncrement;
+    m_xAxisProps->getPropertyValue( OUString::createFromAscii( "TimeIncrement" )) >>= aIncrement;
+
+    for( sal_Int16 i = 0; i < nAttrCount; i++ )
+    {
+        OUString sAttrName = xAttrList->getNameByIndex( i );
+        OUString aLocalName;
+        OUString aValue = xAttrList->getValueByIndex( i );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+        switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+        {
+            case XML_TOK_DATESCALE_BASE_TIME_UNIT:
+                {
+                    aIncrement.TimeResolution = uno::makeAny( lcl_getTimeUnit(aValue) );
+                    bSetNewIncrement = true;
+                }
+                break;
+            case XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE:
+                {
+                    chart::TimeInterval aInterval(1,0);
+                    aIncrement.MajorTimeInterval >>= aInterval;
+                    SvXMLUnitConverter::convertNumber( aInterval.Number, aValue );
+                    aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+                    bSetNewIncrement = true;
+                }
+                break;
+            case XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT:
+                {
+                    chart::TimeInterval aInterval(1,0);
+                    aIncrement.MajorTimeInterval >>= aInterval;
+                    aInterval.TimeUnit = lcl_getTimeUnit(aValue);
+                    aIncrement.MajorTimeInterval = uno::makeAny(aInterval);
+                    bSetNewIncrement = true;
+                }
+                break;
+            case XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE:
+                {
+                    chart::TimeInterval aInterval(1,0);
+                    aIncrement.MinorTimeInterval >>= aInterval;
+                    SvXMLUnitConverter::convertNumber( aInterval.Number, aValue );
+                    aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+                    bSetNewIncrement = true;
+                }
+                break;
+            case XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT:
+                {
+                    chart::TimeInterval aInterval(1,0);
+                    aIncrement.MinorTimeInterval >>= aInterval;
+                    aInterval.TimeUnit = lcl_getTimeUnit(aValue);
+                    aIncrement.MinorTimeInterval = uno::makeAny(aInterval);
+                    bSetNewIncrement = true;
+                }
+                break;
+        }
+    }
+
+    if( bSetNewIncrement )
+        m_xAxisProps->setPropertyValue( OUString::createFromAscii( "TimeIncrement" ), uno::makeAny( aIncrement ) );
+}
+
+// ========================================
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
new file mode 100755
index 0000000000..96c74fe893
--- /dev/null
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _SCH_XMLAXISCONTEXT_HXX_
+#define _SCH_XMLAXISCONTEXT_HXX_
+
+#include "SchXMLImport.hxx"
+#include "transporttypes.hxx"
+
+// ----------------------------------------
+
+class SchXMLAxisContext : public SvXMLImportContext
+{
+public:
+    SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
+                       SvXMLImport& rImport, const rtl::OUString& rLocalName,
+                       ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram,
+                       std::vector< SchXMLAxis >& aAxes,
+                       ::rtl::OUString& rCategoriesAddress,
+                       bool bAddMissingXAxisForNetCharts,
+                       bool bAdaptWrongPercentScaleValues,
+                       bool bAdaptXAxisOrientationForOld2DBarCharts,
+                       bool& rbAxisPositionAttributeImported );
+    virtual ~SchXMLAxisContext();
+
+    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    virtual void EndElement();
+    virtual SvXMLImportContext* CreateChildContext(
+        sal_uInt16 nPrefix,
+        const rtl::OUString& rLocalName,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+    static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc,
+                          const ::rtl::OUString& rChartTypeServiceName,
+                          const ::rtl::OUString& rODFVersionOfFile,
+                          bool bAxisPositionAttributeImported );
+
+private:
+    SchXMLImportHelper& m_rImportHelper;
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > m_xDiagram;
+    SchXMLAxis m_aCurrentAxis;
+    std::vector< SchXMLAxis >& m_rAxes;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps;
+    rtl::OUString m_aAutoStyleName;
+    rtl::OUString& m_rCategoriesAddress;
+    sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType
+    bool m_bAxisTypeImported;
+    bool m_bDateScaleImported;
+    bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions 
+    bool m_bAdaptWrongPercentScaleValues; //to correct errors from older versions 
+    bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions 
+    bool& m_rbAxisPositionAttributeImported;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape();
+    void CreateGrid( ::rtl::OUString sAutoStyleName, bool bIsMajor );
+    void CreateAxis();
+    void SetAxisTitle();
+};
+
+#endif	// _SCH_XMLAXISCONTEXT_HXX_
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index c3425e33d9..88030a4221 100644..100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
@@ -69,7 +69,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport&
         }
     }
 }
-SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index f63f33ca59..7f50124e11 100644..100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -41,7 +41,7 @@ public:
                                      const ::com::sun::star::uno::Reference<
                                          ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index a676bed843..9433df4ed4 100644..100755
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -31,6 +31,7 @@
 
 #include "SchXMLChartContext.hxx"
 #include "SchXMLImport.hxx"
+#include "SchXMLLegendContext.hxx"
 #include "SchXMLPlotAreaContext.hxx"
 #include "SchXMLParagraphContext.hxx"
 #include "SchXMLTableContext.hxx"
@@ -41,7 +42,7 @@
 #include <tools/debug.hxx>
 // header for class ByteString
 #include <tools/string.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -53,7 +54,6 @@
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagram.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/chart/ChartLegendPosition.hpp>
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
@@ -61,10 +61,8 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -79,48 +77,6 @@ using namespace ::SchXMLTools;
 
 namespace
 {
-uno::Reference< chart2::XChartTypeTemplate > lcl_getTemplate( const uno::Reference< chart2::XChartDocument > & xDoc )
-{
-    uno::Reference< chart2::XChartTypeTemplate > xResult;
-    try
-    {
-        if( !xDoc.is())
-            return xResult;
-        uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( xDoc->getChartTypeManager(), uno::UNO_QUERY );
-        if( !xChartTypeManager.is())
-            return xResult;
-        uno::Reference< chart2::XDiagram > xDiagram( xDoc->getFirstDiagram());
-        if( !xDiagram.is())
-            return xResult;
-
-        uno::Sequence< ::rtl::OUString > aServiceNames( xChartTypeManager->getAvailableServiceNames());
-        const sal_Int32 nLength = aServiceNames.getLength();
-
-        for( sal_Int32 i = 0; i < nLength; ++i )
-        {
-            try
-            {
-                uno::Reference< chart2::XChartTypeTemplate > xTempl(
-                    xChartTypeManager->createInstance( aServiceNames[ i ] ), uno::UNO_QUERY_THROW );
-
-                if( xTempl->matchesTemplate( xDiagram, sal_True ))
-                {
-                    xResult.set( xTempl );
-                    break;
-                }
-            }
-            catch( uno::Exception & )
-            {
-                OSL_FAIL( "Exception during determination of chart type template" );
-            }
-        }
-    }
-    catch( uno::Exception & )
-    {
-        OSL_FAIL( "Exception during import lcl_getTemplate" );
-    }
-    return xResult;
-}
 
 void lcl_setRoleAtLabeledSequence(
     const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq,
@@ -278,17 +234,6 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin
 
 } // anonymous namespace
 
-static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
-{
-    // #i35421#
-    { XML_START, 		chart::ChartLegendPosition_LEFT		},
-    { XML_TOP,			chart::ChartLegendPosition_TOP		},
-    // #i35421#
-    { XML_END,			chart::ChartLegendPosition_RIGHT	},
-    { XML_BOTTOM,		chart::ChartLegendPosition_BOTTOM	},
-    { XML_TOKEN_INVALID, 0 }
-};
-
 // ----------------------------------------
 
 SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper,
@@ -331,7 +276,7 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -667,10 +612,6 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
     if( !xNewDia.is() || !xDataProvider.is() )
         return;
 
-    uno::Reference< chart2::XChartTypeTemplate > xTemplate( lcl_getTemplate( xNewDoc ));
-    if(!xTemplate.is())
-        return;
-
     sal_Bool bFirstCellAsLabel =
         (eDataRowSource==chart::ChartDataRowSource_COLUMNS)? bRowHasLabels : bColHasLabels;
     sal_Bool bHasCateories =
@@ -736,13 +677,17 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
     uno::Reference< chart2::data::XDataSource > xDataSource(
         xDataProvider->createDataSource( aArgs ));
     
-    aArgs.realloc( aArgs.getLength() + 1 );
-    aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+    aArgs.realloc( aArgs.getLength() + 2 );
+    aArgs[ aArgs.getLength() - 2 ] = beans::PropertyValue(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )),
         -1, uno::makeAny( bHasCateories ),
         beans::PropertyState_DIRECT_VALUE );
+    aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
+        ::rtl::OUString::createFromAscii("UseCategoriesAsX"),
+        -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui)
+        beans::PropertyState_DIRECT_VALUE );
 
-    xTemplate->changeDiagramData( xNewDia, xDataSource, aArgs );
+    xNewDia->setDiagramData( xDataSource, aArgs );
 }
 
 void SchXMLChartContext::EndElement()
@@ -792,8 +737,7 @@ void SchXMLChartContext::EndElement()
     // cleanup: remove empty chart type groups
     lcl_removeEmptyChartTypeGroups( xNewDoc );
 
-    // set stack mode before a potential template detection (in case we have a
-    // rectangular range)
+    // set stack mode before a potential chart type detection (in case we have a rectangular range)
     uno::Reference< chart::XDiagram > xDiagram( xDoc->getDiagram() );
     uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
     if( xDiaProp.is())
@@ -872,8 +816,7 @@ void SchXMLChartContext::EndElement()
         {
             //apply data from rectangular range
 
-            // create datasource from data provider with rectangular range
-            // parameters and change the diagram via template mechanism
+            // create datasource from data provider with rectangular range parameters and change the diagram setDiagramData
             try
             {
                 if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly
@@ -1058,7 +1001,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
 }
 
 SvXMLImportContext* SchXMLChartContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -1237,7 +1180,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_SVG )
         {
@@ -1282,7 +1225,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
 }
 
 SvXMLImportContext* SchXMLTitleContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -1301,116 +1244,5 @@ SvXMLImportContext* SchXMLTitleContext::CreateChildContext(
 
 // ----------------------------------------
 
-SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper,
-                                          SvXMLImport& rImport, const rtl::OUString& rLocalName ) :
-        SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
-        mrImportHelper( rImpHelper )
-{
-}
-
-void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-{
-    uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
-    if( ! xDoc.is())
-        return;
-
-    // turn on legend
-    uno::Reference< beans::XPropertySet > xDocProp( xDoc, uno::UNO_QUERY );
-    if( xDocProp.is())
-    {
-        uno::Any aTrueBool;
-        aTrueBool <<= (sal_Bool)(sal_True);
-        try
-        {
-            xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), aTrueBool );
-        }
-        catch( beans::UnknownPropertyException )
-        {
-            OSL_FAIL( "Property HasLegend not found" );
-        }
-    }
-
-    // parse attributes
-    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-    const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetLegendAttrTokenMap();
-
-    awt::Point aLegendPos;
-    bool bHasXPosition=false;
-    bool bHasYPosition=false;
-
-    rtl::OUString sAutoStyleName;
-
-    for( sal_Int16 i = 0; i < nAttrCount; i++ )
-    {
-        rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-        rtl::OUString aLocalName;
-        rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
-        switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
-        {
-            case XML_TOK_LEGEND_POSITION:
-                {
-                    // set anchor position
-                    uno::Reference< beans::XPropertySet > xProp( xDoc->getLegend(), uno::UNO_QUERY );
-                    if( xProp.is())
-                    {
-                        try
-                        {
-                            USHORT nEnumVal;
-                            if( GetImport().GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLLegendAlignmentMap ))
-                            {
-                                uno::Any aAny;
-                                aAny <<= (chart::ChartLegendPosition)(nEnumVal);
-                                xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny );
-                            }
-                        }
-                        catch( beans::UnknownPropertyException )
-                        {
-                            OSL_FAIL( "Property Alignment (legend) not found" );
-                        }
-                    }
-                }
-                break;
-
-            case XML_TOK_LEGEND_X:
-                GetImport().GetMM100UnitConverter().convertMeasure( aLegendPos.X, aValue );
-                bHasXPosition = true;
-                break;
-            case XML_TOK_LEGEND_Y:
-                GetImport().GetMM100UnitConverter().convertMeasure( aLegendPos.Y, aValue );
-                bHasYPosition = true;
-                break;
-            case XML_TOK_LEGEND_STYLE_NAME:
-                sAutoStyleName = aValue;
-        }
-    }
-
-    uno::Reference< drawing::XShape > xLegendShape( xDoc->getLegend(), uno::UNO_QUERY );
-    if( xLegendShape.is() && bHasXPosition && bHasYPosition )
-        xLegendShape->setPosition( aLegendPos );
-
-    // set auto-styles for Legend
-    uno::Reference< beans::XPropertySet > xProp( xLegendShape, uno::UNO_QUERY );
-    if( xProp.is())
-    {
-        // the fill style has the default "none" in XML, but "solid" in the model.
-        xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )),
-                                 uno::makeAny( drawing::FillStyle_NONE ));
-        const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
-        if( pStylesCtxt )
-        {
-            const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
-                mrImportHelper.GetChartFamilyID(), sAutoStyleName );
-
-            if( pStyle && pStyle->ISA( XMLPropStyleContext ))
-                (( XMLPropStyleContext* )pStyle )->FillPropertySet( xProp );
-        }
-    }
-}
-
-SchXMLLegendContext::~SchXMLLegendContext()
-{
-}
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 54151a93a4..3e2435a025 100644..100755
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -101,7 +101,7 @@ public:
                                      com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -167,26 +167,11 @@ public:
     virtual void StartElement( const com::sun::star::uno::Reference<
                                com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
 
-// ----------------------------------------
-
-class SchXMLLegendContext : public SvXMLImportContext
-{
-private:
-    SchXMLImportHelper& mrImportHelper;
-
-public:
-    SchXMLLegendContext( SchXMLImportHelper& rImpHelper,
-                         SvXMLImport& rImport, const rtl::OUString& rLocalName );
-    virtual ~SchXMLLegendContext();
-
-    virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
-};
-
 #endif	// _SCH_XMLCHARTCONTEXT_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
new file mode 100755
index 0000000000..c34e6f55da
--- /dev/null
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmloff.hxx"
+#include "SchXMLEnumConverter.hxx"
+
+#include <com/sun/star/chart/ChartLegendPosition.hpp>
+#include <com/sun/star/chart/ChartLegendExpansion.hpp>
+#include <com/sun/star/uno/Any.hxx>
+
+// header for rtl::Static
+#include <rtl/instance.hxx>
+
+using ::rtl::OUString;
+using namespace ::xmloff::token;
+using namespace ::com::sun::star;
+
+namespace
+{
+//-----------------------------------------------------------------------
+
+SvXMLEnumMapEntry aXMLLegendPositionEnumMap[] =
+{
+    { XML_START,    chart::ChartLegendPosition_LEFT     },
+    { XML_TOP,      chart::ChartLegendPosition_TOP      },
+    { XML_END,      chart::ChartLegendPosition_RIGHT    },
+    { XML_BOTTOM,   chart::ChartLegendPosition_BOTTOM   },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+class XMLLegendPositionPropertyHdl : public XMLEnumPropertyHdl
+{
+public:
+    XMLLegendPositionPropertyHdl()
+        : XMLEnumPropertyHdl( aXMLLegendPositionEnumMap, ::getCppuType((const chart::ChartLegendPosition*)0) ) {}
+    virtual ~XMLLegendPositionPropertyHdl() {};
+};
+
+struct TheLegendPositionPropertyHdl : public rtl::Static< XMLLegendPositionPropertyHdl, TheLegendPositionPropertyHdl >
+{
+};
+
+//-----------------------------------------------------------------------
+
+SvXMLEnumMapEntry aXMLLegendExpansionEnumMap[] =
+{
+    { XML_WIDE,        chart::ChartLegendExpansion_WIDE },
+    { XML_HIGH,        chart::ChartLegendExpansion_HIGH },
+    { XML_BALANCED,    chart::ChartLegendExpansion_BALANCED },
+    { XML_CUSTOM,      chart::ChartLegendExpansion_CUSTOM },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+class XMLLegendExpansionPropertyHdl : public XMLEnumPropertyHdl
+{
+public:
+    XMLLegendExpansionPropertyHdl()
+        : XMLEnumPropertyHdl( aXMLLegendExpansionEnumMap, ::getCppuType((const chart::ChartLegendExpansion*)0) ) {}
+    virtual ~XMLLegendExpansionPropertyHdl() {};
+};
+
+struct TheLegendExpansionPropertyHdl : public rtl::Static< XMLLegendExpansionPropertyHdl, TheLegendExpansionPropertyHdl >
+{
+};
+
+//-----------------------------------------------------------------------
+
+}//end anonymous namespace
+
+//-----------------------------------------------------------------------
+
+XMLEnumPropertyHdl& SchXMLEnumConverter::getLegendPositionConverter()
+{
+    return TheLegendPositionPropertyHdl::get();
+}
+XMLEnumPropertyHdl& SchXMLEnumConverter::getLegendExpansionConverter()
+{
+    return TheLegendExpansionPropertyHdl::get();
+}
diff --git a/sfx2/source/config/config.hrc b/xmloff/source/chart/SchXMLEnumConverter.hxx
index ef4e36f6b4..4200ce5fb2 100644..100755
--- a/sfx2/source/config/config.hrc
+++ b/xmloff/source/chart/SchXMLEnumConverter.hxx
@@ -24,18 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _XML_CHART_ENUM_CONVERTER_HXX_
+#define _XML_CHART_ENUM_CONVERTER_HXX_
 
-#ifndef _SFX_CONFIG_HRC
-#define _SFX_CONFIG_HRC
+#include <xmloff/EnumPropertyHdl.hxx>
 
-#include <sfx2/sfx.hrc>
-
-// #defines *****************************************************************
-
-#define BTN_OK							2
-#define BTN_CANCEL						3
-#define FT_OK                           4
-#define FT_CANCEL                       5
-
-#endif
+class SchXMLEnumConverter
+{
+public:
+    static XMLEnumPropertyHdl& getLegendPositionConverter();//returns a singleton
+    static XMLEnumPropertyHdl& getLegendExpansionConverter();//returns a singleton
+};
 
+#endif	// _XML_CHART_ENUM_CONVERTER_HXX_
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index b0c0a4f8de..8f30f18010 100644..100755
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -36,6 +36,8 @@
 #include "SchXMLSeriesHelper.hxx"
 #include "ColorPropertySet.hxx"
 #include "SchXMLTools.hxx"
+#include "SchXMLEnumConverter.hxx"
+
 #include <tools/debug.hxx>
 #include <rtl/logfile.hxx>
 #include <comphelper/processfactory.hxx>
@@ -43,7 +45,7 @@
 #include <sot/clsids.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlaustp.hxx>
@@ -65,20 +67,25 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 
+#include <com/sun/star/chart/XAxis.hpp>
+#include <com/sun/star/chart/XAxisSupplier.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/ChartLegendPosition.hpp>
-#include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
-#include <com/sun/star/chart/XTwoAxisYSupplier.hpp>
-#include <com/sun/star/chart/XAxisZSupplier.hpp>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
+#include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart/ChartAxisAssign.hpp>
+#include <com/sun/star/chart/ChartAxisType.hpp>
+#include <com/sun/star/chart/TimeIncrement.hpp>
+#include <com/sun/star/chart/TimeInterval.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
 
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
@@ -202,6 +209,13 @@ public:
     void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram,
                                     const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
                                     sal_Bool bExportContent );
+    void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName,
+                    const Reference< beans::XPropertySet > xAxisProps, const Reference< chart2::XAxis >& xChart2Axis,
+                    const OUString& rCategoriesRanges,
+                    bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid, bool bExportContent );
+    void exportGrid( const Reference< beans::XPropertySet > xGridProperties, bool bMajor, bool bExportContent );
+    void exportDateScale( const Reference< beans::XPropertySet > xAxisProps );
+    void exportAxisTitle( const Reference< beans::XPropertySet > xTitleProps, bool bExportContent );
 
     void exportSeries(
         const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram,
@@ -235,8 +249,8 @@ public:
     void addPosition( const ::com::sun::star::awt::Point & rPosition );
     void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
     /// add svg size as attribute for current element
-    void addSize( const ::com::sun::star::awt::Size & rSize );
-    void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
+    void addSize( const ::com::sun::star::awt::Size & rSize, bool bIsOOoNamespace = false );
+    void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, bool bIsOOoNamespace = false  );
     /// fills the member msString with the appropriate String (i.e. "A3")
     void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
     /// exports a string as a paragraph element
@@ -696,6 +710,7 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque
 }
 
 typedef vector< OUString > tStringVector;
+typedef vector< double > tDoubleVector;
 typedef vector< vector< OUString > > t2DStringVector;
 typedef vector< vector< double > > t2DNumberContainer;
 
@@ -710,8 +725,8 @@ struct lcl_TableData
     tStringVector       aRowDescriptions;
     tStringVector       aRowDescriptions_Ranges;
 
-    Sequence< Sequence< OUString > >    aComplexColumnDescriptions;//outer index is columns - inner index is level
-    Sequence< Sequence< OUString > >    aComplexRowDescriptions;//outer index is rows - inner index is level
+    Sequence< Sequence< uno::Any > >    aComplexColumnDescriptions;//outer index is columns - inner index is level
+    Sequence< Sequence< uno::Any > >    aComplexRowDescriptions;//outer index is rows - inner index is level
 
     ::std::vector< sal_Int32 > aHiddenColumns; 
 };
@@ -778,7 +793,7 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
 
 lcl_TableData lcl_getDataForLocalTable(
     const SchXMLExportHelper_Impl::tDataSequenceCont & aSequencesToExport,
-    const Reference< chart::XComplexDescriptionAccess >& xComplexDescriptionAccess,
+    const Reference< chart2::XAnyDescriptionAccess >& xAnyDescriptionAccess,
     const OUString& rCategoriesRange,
     bool bSeriesFromColumns,
     const Reference< chart2::data::XRangeXMLConversion > & xRangeConversion )
@@ -788,15 +803,15 @@ lcl_TableData lcl_getDataForLocalTable(
     try
     {
         Sequence< OUString > aSimpleCategories;
-        if( xComplexDescriptionAccess.is() )
+        if( xAnyDescriptionAccess.is() )
         {
             if( bSeriesFromColumns )
-                aSimpleCategories = xComplexDescriptionAccess->getRowDescriptions();
+                aSimpleCategories = xAnyDescriptionAccess->getRowDescriptions();
             else
-                aSimpleCategories = xComplexDescriptionAccess->getColumnDescriptions();
+                aSimpleCategories = xAnyDescriptionAccess->getColumnDescriptions();
 
-            aResult.aComplexColumnDescriptions = xComplexDescriptionAccess->getComplexColumnDescriptions();
-            aResult.aComplexRowDescriptions = xComplexDescriptionAccess->getComplexRowDescriptions();
+            aResult.aComplexColumnDescriptions = xAnyDescriptionAccess->getAnyColumnDescriptions();
+            aResult.aComplexRowDescriptions = xAnyDescriptionAccess->getAnyRowDescriptions();
         }
 
         SchXMLExportHelper_Impl::tDataSequenceCont::size_type nNumSequences = aSequencesToExport.size();
@@ -1413,49 +1428,50 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
             Reference< beans::XPropertySet > xProp( rChartDoc->getLegend(), uno::UNO_QUERY );
             if( xProp.is())
             {
-                chart::ChartLegendPosition aLegendPos = chart::ChartLegendPosition_NONE;
+                // export legend anchor position
                 try
                 {
-                    Any aAny( xProp->getPropertyValue(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM( "Alignment" ))));
-                    aAny >>= aLegendPos;
+                    Any aAny( xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Alignment" ))));
+                    if( SchXMLEnumConverter::getLegendPositionConverter().exportXML( msString, aAny, mrExport.GetMM100UnitConverter() ) )
+                        mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LEGEND_POSITION, msString );
                 }
                 catch( beans::UnknownPropertyException & )
                 {
                     DBG_WARNING( "Property Align not found in ChartLegend" );
                 }
-
-                switch( aLegendPos )
+                
+                // export absolute legend position
+                Reference< drawing::XShape > xLegendShape( xProp, uno::UNO_QUERY );
+                addPosition( xLegendShape );
+                    
+                // export legend size
+                const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+                if( xLegendShape.is() && nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 && nCurrentODFVersion == SvtSaveOptions::ODFVER_LATEST )//do not export legend-expansion to ODF 1.0 and export size only if extensions are enabled //#i28670# todo: change this dependent on fileformat evolution
                 {
-                    case chart::ChartLegendPosition_LEFT:
-                        // #i35421# change left->start (not clear why this was done)
-                        msString = GetXMLToken(XML_START);
-                        break;
-                    case chart::ChartLegendPosition_RIGHT:
-                        // #i35421# change right->end (not clear why this was done)
-                        msString = GetXMLToken(XML_END);
-                        break;
-                    case chart::ChartLegendPosition_TOP:
-                        msString = GetXMLToken(XML_TOP);
-                        break;
-                    case chart::ChartLegendPosition_BOTTOM:
-                        msString = GetXMLToken(XML_BOTTOM);
-                        break;
-                    case chart::ChartLegendPosition_NONE:
-                    case chart::ChartLegendPosition_MAKE_FIXED_SIZE:
-                        // nothing
-                        break;
+                    try
+                    {
+                        chart::ChartLegendExpansion nLegendExpansion = chart::ChartLegendExpansion_HIGH;
+                        OUString aExpansionString;
+                        Any aAny( xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Expansion" ))));
+                        bool bHasExpansion = (aAny >>= nLegendExpansion);
+                        if( bHasExpansion && SchXMLEnumConverter::getLegendExpansionConverter().exportXML( aExpansionString, aAny, mrExport.GetMM100UnitConverter() ) )
+                        {
+                            mrExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION, aExpansionString );
+                            if( nLegendExpansion == chart::ChartLegendExpansion_CUSTOM)
+                            {
+                                awt::Size aSize( xLegendShape->getSize() );
+                                addSize( aSize, true );
+                                rtl::OUStringBuffer aAspectRatioString;
+                                SvXMLUnitConverter::convertDouble(aAspectRatioString, double(aSize.Width)/double(aSize.Height));
+                                mrExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION_ASPECT_RATIO, aAspectRatioString.makeStringAndClear() );
+                            }
+                        }
+                    }
+                    catch( beans::UnknownPropertyException & )
+                    {
+                        DBG_WARNING( "Property Expansion not found in ChartLegend" );
+                    }
                 }
-
-                // export anchor position
-                if( msString.getLength())
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LEGEND_POSITION, msString );
-
-                // export absolute position
-                msString = OUString();
-                Reference< drawing::XShape > xShape( xProp, uno::UNO_QUERY );
-                if( xShape.is())
-                    addPosition( xShape );
             }
 
             // write style name
@@ -1574,7 +1590,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
         delete pElChart;
 }
 
-void lcl_exportComplexLabel( const Sequence< OUString >& rComplexLabel, SvXMLExport& rExport )
+void lcl_exportComplexLabel( const Sequence< uno::Any >& rComplexLabel, SvXMLExport& rExport )
 {
     sal_Int32 nLength = rComplexLabel.getLength();
     if( nLength<=1 )
@@ -1583,7 +1599,12 @@ void lcl_exportComplexLabel( const Sequence< OUString >& rComplexLabel, SvXMLExp
     for(sal_Int32 nN=0; nN<nLength; nN++)
     {
         SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, sal_True, sal_True );
-        SchXMLTools::exportText( rExport, rComplexLabel[nN], false /*bConvertTabsLFs*/ );
+        OUString aString;
+        if( !(rComplexLabel[nN]>>=aString) )
+        {
+            //todo?
+        }
+        SchXMLTools::exportText( rExport, aString, false /*bConvertTabsLFs*/ );
     }
 }
 
@@ -1592,6 +1613,21 @@ void SchXMLExportHelper_Impl::exportTable()
     // table element
     // -------------
     mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, msTableName );
+
+    try
+    {
+        bool bProtected = false;
+        Reference< beans::XPropertySet > xProps( mrExport.GetModel(), uno::UNO_QUERY_THROW );
+        if ( ( xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bProtected ) &&
+             bProtected )
+        {
+            mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE );
+        }
+    }
+    catch ( uno::Exception& )
+    {
+    }
+
     SvXMLElementExport aTable( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True );
 
     bool bHasOwnData = false;
@@ -1603,17 +1639,17 @@ void SchXMLExportHelper_Impl::exportTable()
         xRangeConversion.set( xNewDoc->getDataProvider(), uno::UNO_QUERY );
     }
 
-    Reference< chart::XComplexDescriptionAccess > xComplexDescriptionAccess;
+    Reference< chart2::XAnyDescriptionAccess > xAnyDescriptionAccess;
     {
         Reference< chart::XChartDocument > xChartDoc( mrExport.GetModel(), uno::UNO_QUERY );
         if( xChartDoc.is() )
-            xComplexDescriptionAccess = Reference< chart::XComplexDescriptionAccess >( xChartDoc->getData(), uno::UNO_QUERY ); 
+            xAnyDescriptionAccess = Reference< chart2::XAnyDescriptionAccess >( xChartDoc->getData(), uno::UNO_QUERY ); 
     }
     
     if( bHasOwnData )
         lcl_ReorderInternalSequencesAccordingToTheirRangeName( m_aDataSequencesToExport );
     lcl_TableData aData( lcl_getDataForLocalTable( m_aDataSequencesToExport
-                                , xComplexDescriptionAccess, maCategoriesRange
+                                , xAnyDescriptionAccess, maCategoriesRange
                                 , mbRowSourceColumns, xRangeConversion ));
 
     tStringVector::const_iterator aDataRangeIter( aData.aDataRangeRepresentations.begin());
@@ -1674,17 +1710,40 @@ void SchXMLExportHelper_Impl::exportTable()
         //export column descriptions
         tStringVector::const_iterator aColumnDescriptions_RangeIter( aData.aColumnDescriptions_Ranges.begin());
         const tStringVector::const_iterator aColumnDescriptions_RangeEnd( aData.aColumnDescriptions_Ranges.end());
-        const Sequence< Sequence< OUString > >& rComplexColumnDescriptions = aData.aComplexColumnDescriptions;
+        const Sequence< Sequence< uno::Any > >& rComplexColumnDescriptions = aData.aComplexColumnDescriptions;
         sal_Int32 nComplexCount = rComplexColumnDescriptions.getLength();
         sal_Int32 nC = 0;
-        for( tStringVector::const_iterator aIt( aData.aColumnDescriptions.begin());
-             aIt != aData.aColumnDescriptions.end(); ++aIt )
+        for( tStringVector::const_iterator aIt( aData.aColumnDescriptions.begin())
+             ; (aIt != aData.aColumnDescriptions.end())
+             ; aIt++, nC++ )
         {
-            mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
+            bool bExportString = true;
+            if( nC < nComplexCount )
+            {
+                const Sequence< uno::Any >& rComplexLabel = rComplexColumnDescriptions[nC];
+                if( rComplexLabel.getLength()>0 )
+                {
+                    double fValue=0.0;
+                    if( rComplexLabel[0] >>=fValue )
+                    {
+                        bExportString = false;
+
+                        SvXMLUnitConverter::convertDouble( msStringBuffer, fValue );
+                        msString = msStringBuffer.makeStringAndClear();
+                        mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT );
+                        mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString );
+                    }
+                }
+            }
+            if( bExportString )
+            {
+                mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
+            }
+            
             SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
             exportText( *aIt );
             if( nC < nComplexCount )
-                lcl_exportComplexLabel( rComplexColumnDescriptions[nC++], mrExport );
+                lcl_exportComplexLabel( rComplexColumnDescriptions[nC], mrExport );
             if( !bHasOwnData && aColumnDescriptions_RangeIter != aColumnDescriptions_RangeEnd )
             {
                 // remind the original range to allow a correct re-association when copying via clipboard
@@ -1700,25 +1759,47 @@ void SchXMLExportHelper_Impl::exportTable()
     {
         SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, sal_True, sal_True );
         tStringVector::const_iterator aRowDescriptionsIter( aData.aRowDescriptions.begin());
-        const Sequence< Sequence< OUString > >& rComplexRowDescriptions = aData.aComplexRowDescriptions;
+        const Sequence< Sequence< uno::Any > >& rComplexRowDescriptions = aData.aComplexRowDescriptions;
         sal_Int32 nComplexCount = rComplexRowDescriptions.getLength();
         sal_Int32 nC = 0;
 
-        for( t2DNumberContainer::const_iterator aRowIt( aData.aDataInRows.begin());
-             aRowIt != aData.aDataInRows.end(); ++aRowIt )
+        for( t2DNumberContainer::const_iterator aRowIt( aData.aDataInRows.begin())
+            ; aRowIt != aData.aDataInRows.end()
+            ; aRowIt++, nC++, aRowDescriptionsIter++ )
         {
             SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
 
             //export row descriptions
             {
-                mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
+                bool bExportString = true;
+                if( nC < nComplexCount )
+                {
+                    const Sequence< uno::Any >& rComplexLabel = rComplexRowDescriptions[nC];
+                    if( rComplexLabel.getLength()>0 )
+                    {
+                        double fValue=0.0;
+                        if( rComplexLabel[0] >>=fValue )
+                        {
+                            bExportString = false;
+
+                            SvXMLUnitConverter::convertDouble( msStringBuffer, fValue );
+                            msString = msStringBuffer.makeStringAndClear();
+                            mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT );
+                            mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString );
+                        }
+                    }
+                }
+                if( bExportString )
+                {
+                    mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
+                }
+                
                 SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
                 if( aRowDescriptionsIter != aData.aRowDescriptions.end())
                 {
                     exportText( *aRowDescriptionsIter );
-                    ++aRowDescriptionsIter;
                     if( nC < nComplexCount )
-                        lcl_exportComplexLabel( rComplexRowDescriptions[nC++], mrExport );
+                        lcl_exportComplexLabel( rComplexRowDescriptions[nC], mrExport );
                     if( !bHasOwnData && aRowDescriptions_RangeIter != aRowDescriptions_RangeEnd )
                     {
                         // remind the original range to allow a correct re-association when copying via clipboard
@@ -1754,6 +1835,57 @@ void SchXMLExportHelper_Impl::exportTable()
     OSL_ASSERT( bHasOwnData || (aRowDescriptions_RangeIter == aRowDescriptions_RangeEnd) );
 }
 
+namespace
+{
+
+Reference< chart2::XCoordinateSystem > lcl_getCooSys( const Reference< chart2::XDiagram > & xNewDiagram )
+{
+    Reference< chart2::XCoordinateSystem > xCooSys;
+    Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xNewDiagram, uno::UNO_QUERY );
+    if(xCooSysCnt.is())
+    {
+        Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems() );
+        if(aCooSysSeq.getLength()>0)
+            xCooSys = aCooSysSeq[0];
+    }
+    return xCooSys;
+}
+
+Reference< chart2::XAxis > lcl_getAxis( const Reference< chart2::XCoordinateSystem >& xCooSys,
+        enum XMLTokenEnum eDimension, bool bPrimary=true )
+{
+    Reference< chart2::XAxis > xNewAxis;
+    try
+    {
+        if( xCooSys.is() )
+        {
+            sal_Int32 nDimensionIndex=0;
+            switch( eDimension )
+            {
+            case XML_X:
+                nDimensionIndex=0;
+                break;
+            case XML_Y:
+                nDimensionIndex=1;
+                break;
+            case XML_Z:
+                nDimensionIndex=2;
+                break;
+            default:
+                break;
+            }
+
+            xNewAxis = xCooSys->getAxisByDimension( nDimensionIndex, bPrimary ? 0 : 1 );
+        }
+    }
+    catch( const uno::Exception & )
+    {
+    }
+    return xNewAxis;
+}
+
+}
+
 void SchXMLExportHelper_Impl::exportPlotArea(
     Reference< chart::XDiagram > xDiagram,
     Reference< chart2::XDiagram > xNewDiagram,
@@ -1769,8 +1901,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
     Reference< beans::XPropertySet > xPropSet;
     std::vector< XMLPropertyState > aPropertyStates;
 
-    OUString aASName;
-    sal_Bool bHasTwoYAxes = sal_False;
     sal_Bool bIs3DChart = sal_False;
     drawing::HomogenMatrix aTransMatrix;
 
@@ -1878,17 +2008,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
         if( xPropSet.is())
         {
             Any aAny;
-            try
-            {
-                aAny = xPropSet->getPropertyValue(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )));
-                aAny >>= bHasTwoYAxes;
-            }
-            catch( beans::UnknownPropertyException & )
-            {
-                OSL_FAIL( "Property HasSecondaryYAxis not found in Diagram" );
-            }
-
+        
             // 3d attributes
             try
             {
@@ -1938,7 +2058,8 @@ void SchXMLExportHelper_Impl::exportPlotArea(
 
     // series elements
     // ---------------
-    exportSeries( xNewDiagram, rPageSize, bExportContent, bHasTwoYAxes );
+    Reference< chart2::XAxis > xSecondYAxis = lcl_getAxis( lcl_getCooSys( xNewDiagram ), XML_Y, false );
+    exportSeries( xNewDiagram, rPageSize, bExportContent, xSecondYAxis.is() );
 
     // stock-chart elements
     OUString sChartType ( xDiagram->getDiagramType());
@@ -2100,6 +2221,222 @@ void SchXMLExportHelper_Impl::exportCoordinateRegion( const uno::Reference< char
     SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, sal_True, sal_True );//#i100778# todo: change to chart namespace in future - dependent on fileformat
 }
 
+namespace
+{
+    XMLTokenEnum lcl_getTimeUnitToken( sal_Int32 nTimeUnit )
+    {
+        XMLTokenEnum eToken = XML_DAYS;
+        switch( nTimeUnit )
+        {
+        case ::com::sun::star::chart::TimeUnit::YEAR:
+            eToken = XML_YEARS;
+            break;
+        case ::com::sun::star::chart::TimeUnit::MONTH:
+            eToken = XML_MONTHS;
+            break;
+        default://days
+            break;
+        }
+        return eToken;
+    }
+}
+
+void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XPropertySet > xAxisProps )
+{
+    if( !xAxisProps.is() )
+        return;
+
+    chart::TimeIncrement aIncrement;
+    if( (xAxisProps->getPropertyValue( OUString::createFromAscii( "TimeIncrement" )) >>= aIncrement) )
+    {
+        sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY;
+        if( aIncrement.TimeResolution >>= nTimeResolution )
+            mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, lcl_getTimeUnitToken( nTimeResolution ) );
+
+        OUStringBuffer aValue;
+        chart::TimeInterval aInterval;
+        if( aIncrement.MajorTimeInterval >>= aInterval )
+        {
+            SvXMLUnitConverter::convertNumber( aValue, aInterval.Number );
+            mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_VALUE, aValue.makeStringAndClear() );
+            mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_UNIT, lcl_getTimeUnitToken( aInterval.TimeUnit ) );
+        }
+        if( aIncrement.MinorTimeInterval >>= aInterval )
+        {
+            SvXMLUnitConverter::convertNumber( aValue, aInterval.Number );
+            mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_VALUE, aValue.makeStringAndClear() );
+            mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_UNIT, lcl_getTimeUnitToken( aInterval.TimeUnit ) );
+        }
+        
+        SvXMLElementExport aDateScale( mrExport, XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, sal_True, sal_True );//#i25706#todo: change namespace for next ODF version
+    }
+}
+
+void SchXMLExportHelper_Impl::exportAxisTitle( const Reference< beans::XPropertySet > xTitleProps, bool bExportContent )
+{
+    if( !xTitleProps.is() )
+        return;
+    std::vector< XMLPropertyState > aPropertyStates = mxExpPropMapper->Filter( xTitleProps );
+    if( bExportContent )
+    {
+        OUString aText;
+        Any aAny( xTitleProps->getPropertyValue(
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
+        aAny >>= aText;
+
+        Reference< drawing::XShape > xShape( xTitleProps, uno::UNO_QUERY );
+        if( xShape.is())
+            addPosition( xShape );
+
+        AddAutoStyleAttribute( aPropertyStates );
+        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
+
+        // paragraph containing title
+        exportText( aText );
+    }
+    else
+    {
+        CollectAutoStyle( aPropertyStates );
+    }
+    aPropertyStates.clear();
+}
+
+void SchXMLExportHelper_Impl::exportGrid( const Reference< beans::XPropertySet > xGridProperties, bool bMajor, bool bExportContent )
+{
+    if( !xGridProperties.is() )
+        return;
+    std::vector< XMLPropertyState > aPropertyStates = mxExpPropMapper->Filter( xGridProperties );
+    if( bExportContent )
+    {
+        AddAutoStyleAttribute( aPropertyStates );
+        mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, bMajor ? XML_MAJOR : XML_MINOR );
+        SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
+    }
+    else
+    {
+        CollectAutoStyle( aPropertyStates );
+    }
+    aPropertyStates.clear();
+}
+
+namespace
+{
+
+//returns true if a date scale needs to be exported
+bool lcl_exportAxisType( const Reference< chart2::XAxis > xChart2Axis, SvXMLExport& rExport)
+{
+    bool bExportDateScale = false;
+    if( !xChart2Axis.is() )
+        return bExportDateScale;
+
+    const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+    if( nCurrentODFVersion != SvtSaveOptions::ODFVER_LATEST ) //#i25706#todo: change version for next ODF version
+        return bExportDateScale;
+
+    chart2::ScaleData aScale( xChart2Axis->getScaleData() );
+    //#i25706#todo: change namespace for next ODF version
+    sal_uInt16 nNameSpace = XML_NAMESPACE_CHART_EXT;
+
+    switch(aScale.AxisType)
+    {
+    case chart2::AxisType::CATEGORY:
+        if( aScale.AutoDateAxis )
+        {
+            rExport.AddAttribute( nNameSpace, XML_AXIS_TYPE, XML_AUTO );
+            bExportDateScale = true;
+        }
+        else
+            rExport.AddAttribute( nNameSpace, XML_AXIS_TYPE, XML_TEXT );
+        break;
+    case chart2::AxisType::DATE:
+        rExport.AddAttribute( nNameSpace, XML_AXIS_TYPE, XML_DATE );
+        bExportDateScale = true;
+        break;
+    default: //AUTOMATIC
+        rExport.AddAttribute( nNameSpace, XML_AXIS_TYPE, XML_AUTO );
+        break;
+    }
+
+    return bExportDateScale;
+}
+
+}
+
+void SchXMLExportHelper_Impl::exportAxis(
+    enum XMLTokenEnum eDimension,
+    enum XMLTokenEnum eAxisName,
+    const Reference< beans::XPropertySet > xAxisProps,
+    const Reference< chart2::XAxis >& xChart2Axis,
+    const OUString& rCategoriesRange,
+    bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid,
+    bool bExportContent )
+{
+    static const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
+    std::vector< XMLPropertyState > aPropertyStates;
+    SvXMLElementExport* pAxis = NULL;
+
+    // get property states for autostyles
+    if( xAxisProps.is() && mxExpPropMapper.is() )
+    {
+        lcl_exportNumberFormat( sNumFormat, xAxisProps, mrExport );
+        aPropertyStates = mxExpPropMapper->Filter( xAxisProps );
+    }
+
+    bool bExportDateScale = false;
+    if( bExportContent )
+    {
+        mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, eDimension );
+        mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, eAxisName );
+        AddAutoStyleAttribute( aPropertyStates ); // write style name
+        if( rCategoriesRange.getLength() )
+            bExportDateScale = lcl_exportAxisType( xChart2Axis, mrExport );
+        
+        // open axis element
+        pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
+    }
+    else
+    {
+        CollectAutoStyle( aPropertyStates );
+    }
+    aPropertyStates.clear();
+
+    //date scale
+    if( bExportDateScale )
+        exportDateScale( xAxisProps );
+
+    Reference< beans::XPropertySet > xTitleProps;
+    Reference< beans::XPropertySet > xMajorGridProps;
+    Reference< beans::XPropertySet > xMinorGridProps;
+    Reference< chart::XAxis > xAxis( xAxisProps, uno::UNO_QUERY );
+    if( xAxis.is() )
+    {
+        xTitleProps = bHasTitle ? xAxis->getAxisTitle() : 0;
+        xMajorGridProps = bHasMajorGrid ? xAxis->getMajorGrid() : 0;
+        xMinorGridProps = bHasMinorGrid ? xAxis->getMinorGrid() : 0;
+    }
+    
+    // axis-title
+    exportAxisTitle( xTitleProps , bExportContent );
+
+    // categories if we have a categories chart
+    if( bExportContent && rCategoriesRange.getLength() )
+    {
+        mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, rCategoriesRange );
+        SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, sal_True, sal_True );
+    }
+
+    // grid
+    exportGrid( xMajorGridProps, true, bExportContent );
+    exportGrid( xMinorGridProps, false, bExportContent );
+
+    if( pAxis )
+    {
+        //close axis element
+        delete pAxis;
+        pAxis = NULL;
+    }
+}
+
 void SchXMLExportHelper_Impl::exportAxes(
     const Reference< chart::XDiagram > & xDiagram,
     const Reference< chart2::XDiagram > & xNewDiagram,
@@ -2109,13 +2446,6 @@ void SchXMLExportHelper_Impl::exportAxes(
     if( ! xDiagram.is())
         return;
 
-    // variables for autostyles
-    const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )));
-    Reference< beans::XPropertySet > xPropSet;
-    std::vector< XMLPropertyState > aPropertyStates;
-
-    OUString aASName;
-
     // get some properties from document first
     sal_Bool bHasXAxis = sal_False,
         bHasYAxis = sal_False,
@@ -2133,46 +2463,20 @@ void SchXMLExportHelper_Impl::exportAxes(
         bHasYAxisMinorGrid = sal_False,
         bHasZAxisMajorGrid = sal_False,
         bHasZAxisMinorGrid = sal_False;
-    sal_Bool bIs3DChart = sal_False;
 
     // get multiple properties using XMultiPropertySet
     MultiPropertySetHandler	aDiagramProperties (xDiagram);
 
-    //	Check for supported services and then the properties provided by this service.
-    Reference<lang::XServiceInfo> xServiceInfo (xDiagram, uno::UNO_QUERY);
-    if (xServiceInfo.is())
-    {
-        if (xServiceInfo->supportsService(
-            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier"))))
-        {
-            aDiagramProperties.Add (
-                OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis);
-        }
-        if (xServiceInfo->supportsService(
-            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier"))))
-        {
-            aDiagramProperties.Add (
-                OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis);
-        }
-        if (xServiceInfo->supportsService(
-            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier"))))
-        {
-            aDiagramProperties.Add (
-                OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis);
-        }
-        if (xServiceInfo->supportsService(
-            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier"))))
-        {
-            aDiagramProperties.Add (
-                OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis);
-        }
-        if (xServiceInfo->supportsService(
-            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier"))))
-        {
-            aDiagramProperties.Add (
-                OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis);
-        }
-    }
+    aDiagramProperties.Add (
+        OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis);
+    aDiagramProperties.Add (
+        OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis);
+    aDiagramProperties.Add (
+        OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis);
+    aDiagramProperties.Add (
+        OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis);
+    aDiagramProperties.Add (
+        OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis);
 
     aDiagramProperties.Add (
         OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisTitle")), bHasXAxisTitle);
@@ -2199,506 +2503,139 @@ void SchXMLExportHelper_Impl::exportAxes(
     aDiagramProperties.Add (
         OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisHelpGrid")), bHasZAxisMinorGrid);
 
-    aDiagramProperties.Add(
-        OUString (RTL_CONSTASCII_USTRINGPARAM ("Dim3D")), bIs3DChart);
-
     if ( ! aDiagramProperties.GetProperties ())
     {
         DBG_WARNING ("Required properties not found in Chart diagram");
     }
 
-    SvXMLElementExport* pAxis = NULL;
+    Reference< chart2::XCoordinateSystem > xCooSys( lcl_getCooSys(xNewDiagram) );
+    
+    // write an axis element also if the axis itself is not visible, but a grid or a title
+
+    OUString aCategoriesRange;
+    Reference< chart::XAxisSupplier > xAxisSupp( xDiagram, uno::UNO_QUERY );
 
     // x axis
     // -------
-
-    // write axis element also if the axis itself is not visible, but a grid or
-    // title
-    Reference< chart::XAxisXSupplier > xAxisXSupp( xDiagram, uno::UNO_QUERY );
-    if( xAxisXSupp.is())
+    Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X );
+    if( xNewAxis.is() )
     {
-        bool bHasAxisProperties = false;
-        // get property states for autostyles
-        if( mxExpPropMapper.is())
-        {
-            xPropSet = xAxisXSupp->getXAxis();
-            if( xPropSet.is())
-            {
-                bHasAxisProperties = true;
-                lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
-                aPropertyStates = mxExpPropMapper->Filter( xPropSet );
-            }
-        }
-
-        if( bHasXAxis ||
-            bHasXAxisTitle || bHasXAxisMajorGrid || bHasXAxisMinorGrid ||
-            mbHasCategoryLabels || bHasAxisProperties )
+        Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : 0, uno::UNO_QUERY );
+        if( mbHasCategoryLabels && bExportContent )
         {
-            if( bExportContent )
-            {
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, XML_X );
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, XML_PRIMARY_X );
-
-                // write style name
-                AddAutoStyleAttribute( aPropertyStates );
-
-                // element
-                pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
-            }
-            else	// autostyles
-            {
-                CollectAutoStyle( aPropertyStates );
-            }
-            aPropertyStates.clear();
-
-            // axis-title
-            if( bHasXAxisTitle )
+            Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xNewDiagram ) );
+            if( xCategories.is() )
             {
-                Reference< beans::XPropertySet > xTitleProp( xAxisXSupp->getXAxisTitle(), uno::UNO_QUERY );
-                if( xTitleProp.is())
+                Reference< chart2::data::XDataSequence > xValues( xCategories->getValues() );
+                if( xValues.is() )
                 {
-                    aPropertyStates = mxExpPropMapper->Filter( xTitleProp );
-                    if( bExportContent )
-                    {
-                        OUString aText;
-                        Any aAny( xTitleProp->getPropertyValue(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
-                        aAny >>= aText;
-
-                        Reference< drawing::XShape > xShape( xTitleProp, uno::UNO_QUERY );
-                        if( xShape.is())
-                            addPosition( xShape );
-
-                        AddAutoStyleAttribute( aPropertyStates );
-                        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
-
-                        // paragraph containing title
-                        exportText( aText );
-                    }
-                    else
-                    {
-                        CollectAutoStyle( aPropertyStates );
-                    }
-                    aPropertyStates.clear();
-                }
-            }
-
-            // categories if we have a categories chart
-            if( bExportContent &&
-                mbHasCategoryLabels )
-            {
-                OUString aCategoriesRange;
-                // fill msString with cell-range-address of categories
-                // export own table references
-                if( xNewDiagram.is())
-                {
-                    Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xNewDiagram ) );
-                    if( xCategories.is() )
-                    {
-                        Reference< chart2::data::XDataSequence > xValues( xCategories->getValues() );
-                        if( xValues.is())
-                        {
-                            Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY );
-                            maCategoriesRange = xValues->getSourceRangeRepresentation();
-                            aCategoriesRange = lcl_ConvertRange( maCategoriesRange, xNewDoc );
-                        }
-                    }
-                }
-
-                if( aCategoriesRange.getLength())
-                    mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aCategoriesRange );
-                SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, sal_True, sal_True );
-            }
-
-            // grid
-            Reference< beans::XPropertySet > xMajorGrid( xAxisXSupp->getXMainGrid(), uno::UNO_QUERY );
-            if( bHasXAxisMajorGrid && xMajorGrid.is())
-            {
-                aPropertyStates = mxExpPropMapper->Filter( xMajorGrid );
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MAJOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
-                }
-                aPropertyStates.clear();
-            }
-            Reference< beans::XPropertySet > xMinorGrid( xAxisXSupp->getXHelpGrid(), uno::UNO_QUERY );
-            if( bHasXAxisMinorGrid && xMinorGrid.is())
-            {
-                aPropertyStates = mxExpPropMapper->Filter( xMinorGrid );
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MINOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
+                    Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY );
+                    maCategoriesRange = xValues->getSourceRangeRepresentation();
+                    aCategoriesRange = lcl_ConvertRange( maCategoriesRange, xNewDoc );
                 }
-                aPropertyStates.clear();
-            }
-            if( pAxis )
-            {
-                delete pAxis;
-                pAxis = NULL;
             }
         }
+        exportAxis( XML_X, XML_PRIMARY_X, xAxisProps, xNewAxis, aCategoriesRange, bHasXAxisTitle, bHasXAxisMajorGrid, bHasXAxisMinorGrid, bExportContent );
+        aCategoriesRange = OUString();
     }
 
     // secondary x axis
-    if( bHasSecondaryXAxis || bHasSecondaryXAxisTitle )
+    // -------
+    Reference< chart::XSecondAxisTitleSupplier > xSecondTitleSupp( xDiagram, uno::UNO_QUERY );
+    xNewAxis = lcl_getAxis( xCooSys, XML_X, false );
+    if( xNewAxis.is() )
     {
-        Reference< chart::XTwoAxisXSupplier > xAxisTwoXSupp( xDiagram, uno::UNO_QUERY );
-        if( xAxisTwoXSupp.is())
-        {
-            // get property states for autostyles
-            if( mxExpPropMapper.is())
-            {
-                xPropSet = xAxisTwoXSupp->getSecondaryXAxis();
-                lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
-                if( xPropSet.is())
-                    aPropertyStates = mxExpPropMapper->Filter( xPropSet );
-            }
-            if( bExportContent )
-            {
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, XML_X );
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, XML_SECONDARY_X );
-                AddAutoStyleAttribute( aPropertyStates );
-                pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
-            }
-            else	// autostyles
-            {
-                CollectAutoStyle( aPropertyStates );
-            }
-            aPropertyStates.clear();
-
-            if( bHasSecondaryXAxisTitle )
-            {
-                Reference< chart::XSecondAxisTitleSupplier > xAxisSupp( xDiagram, uno::UNO_QUERY );
-                Reference< beans::XPropertySet > xTitleProp( xAxisSupp->getSecondXAxisTitle(), uno::UNO_QUERY );
-                if( xTitleProp.is())
-                {
-                    aPropertyStates = mxExpPropMapper->Filter( xTitleProp );
-                    if( bExportContent )
-                    {
-                        OUString aText;
-                        Any aAny( xTitleProp->getPropertyValue(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
-                        aAny >>= aText;
-
-                        Reference< drawing::XShape > xShape( xTitleProp, uno::UNO_QUERY );
-                        if( xShape.is())
-                            addPosition( xShape );
-
-                        AddAutoStyleAttribute( aPropertyStates );
-                        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
-
-                        exportText( aText );
-                    }
-                    else
-                    {
-                        CollectAutoStyle( aPropertyStates );
-                    }
-                    aPropertyStates.clear();
-                }
-            }
-
-            if( pAxis )
-            {
-                delete pAxis;
-                pAxis = NULL;
-            }
-        }
+        Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(0) : 0, uno::UNO_QUERY );
+        exportAxis( XML_X, XML_SECONDARY_X, xAxisProps, xNewAxis, aCategoriesRange, bHasSecondaryXAxisTitle, false, false, bExportContent );
     }
 
     // y axis
     // -------
-
-    // write axis element also if the axis itself is not visible, but a grid or
-    // title
-    Reference< chart::XAxisYSupplier > xAxisYSupp( xDiagram, uno::UNO_QUERY );
-    if( xAxisYSupp.is())
+    xNewAxis = lcl_getAxis( xCooSys, XML_Y );
+    if( xNewAxis.is() )
     {
-        bool bHasAxisProperties = false;
-        // get property states for autostyles
-        if( mxExpPropMapper.is())
-        {
-            xPropSet = xAxisYSupp->getYAxis();
-            if( xPropSet.is())
-            {
-                bHasAxisProperties = true;
-                lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
-                aPropertyStates = mxExpPropMapper->Filter( xPropSet );
-            }
-        }
-
-        if( bHasYAxis ||
-            bHasYAxisTitle || bHasYAxisMajorGrid || bHasYAxisMinorGrid || bHasAxisProperties )
-        {
-            if( bExportContent )
-            {
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, XML_Y );
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, XML_PRIMARY_Y );
-                AddAutoStyleAttribute( aPropertyStates );
-                pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
-            }
-            else
-            {
-                CollectAutoStyle( aPropertyStates );
-            }
-            aPropertyStates.clear();
-
-            // axis-title
-            if( bHasYAxisTitle )
-            {
-                Reference< beans::XPropertySet > xTitleProp( xAxisYSupp->getYAxisTitle(), uno::UNO_QUERY );
-                if( xTitleProp.is())
-                {
-                    aPropertyStates = mxExpPropMapper->Filter( xTitleProp );
-                    if( bExportContent )
-                    {
-                        OUString aText;
-                        Any aAny( xTitleProp->getPropertyValue(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
-                        aAny >>= aText;
-
-                        Reference< drawing::XShape > xShape( xTitleProp, uno::UNO_QUERY );
-                        if( xShape.is())
-                            addPosition( xShape );
-
-                        AddAutoStyleAttribute( aPropertyStates );
-                        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
-
-                        // paragraph containing title
-                        exportText( aText );
-                    }
-                    else
-                    {
-                        CollectAutoStyle( aPropertyStates );
-                    }
-                    aPropertyStates.clear();
-                }
-            }
-
-            // grid
-            Reference< beans::XPropertySet > xMajorGrid( xAxisYSupp->getYMainGrid(), uno::UNO_QUERY );
-            if( bHasYAxisMajorGrid && xMajorGrid.is())
-            {
-                aPropertyStates = mxExpPropMapper->Filter( xMajorGrid );
-
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MAJOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
-                }
-                aPropertyStates.clear();
-            }
-            // minor grid
-            Reference< beans::XPropertySet > xMinorGrid( xAxisYSupp->getYHelpGrid(), uno::UNO_QUERY );
-            if( bHasYAxisMinorGrid && xMinorGrid.is())
-            {
-                aPropertyStates = mxExpPropMapper->Filter( xMinorGrid );
-
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MINOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
-                }
-                aPropertyStates.clear();
-            }
-            if( pAxis )
-            {
-                delete pAxis;
-                pAxis = NULL;
-            }
-        }
+        Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(1) : 0, uno::UNO_QUERY );
+        exportAxis( XML_Y, XML_PRIMARY_Y, xAxisProps, xNewAxis, aCategoriesRange, bHasYAxisTitle, bHasYAxisMajorGrid, bHasYAxisMinorGrid, bExportContent );
     }
 
-    if( bHasSecondaryYAxis || bHasSecondaryYAxisTitle )
+    // secondary y axis
+    // -------
+    xNewAxis = lcl_getAxis( xCooSys, XML_Y, false );
+    if( xNewAxis.is() )
     {
-        Reference< chart::XTwoAxisYSupplier > xAxisTwoYSupp( xDiagram, uno::UNO_QUERY );
-        if( xAxisTwoYSupp.is())
-        {
-            // get property states for autostyles
-            if( mxExpPropMapper.is())
-            {
-                xPropSet = xAxisTwoYSupp->getSecondaryYAxis();
-                lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
-                if( xPropSet.is())
-                    aPropertyStates = mxExpPropMapper->Filter( xPropSet );
-            }
-            if( bExportContent )
-            {
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, XML_Y );
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, XML_SECONDARY_Y );
-                AddAutoStyleAttribute( aPropertyStates );
-                pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
-            }
-            else	// autostyles
-            {
-                CollectAutoStyle( aPropertyStates );
-            }
-            aPropertyStates.clear();
-            if( bHasSecondaryYAxisTitle )
-            {
-                Reference< chart::XSecondAxisTitleSupplier > xAxisSupp( xDiagram, uno::UNO_QUERY );
-                Reference< beans::XPropertySet > xTitleProp( xAxisSupp->getSecondYAxisTitle(), uno::UNO_QUERY );
-                if( xTitleProp.is())
-                {
-                    aPropertyStates = mxExpPropMapper->Filter( xTitleProp );
-                    if( bExportContent )
-                    {
-                        OUString aText;
-                        Any aAny( xTitleProp->getPropertyValue(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
-                        aAny >>= aText;
-
-                        Reference< drawing::XShape > xShape( xTitleProp, uno::UNO_QUERY );
-                        if( xShape.is())
-                            addPosition( xShape );
-
-                        AddAutoStyleAttribute( aPropertyStates );
-                        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
-
-                        exportText( aText );
-                    }
-                    else
-                    {
-                        CollectAutoStyle( aPropertyStates );
-                    }
-                    aPropertyStates.clear();
-                }
-            }
-
-            if( pAxis )
-            {
-                delete pAxis;
-                pAxis = NULL;
-            }
-        }
+        Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(1) : 0, uno::UNO_QUERY );
+        exportAxis( XML_Y, XML_SECONDARY_Y, xAxisProps, xNewAxis, aCategoriesRange, bHasSecondaryYAxisTitle, false, false, bExportContent );
     }
 
     // z axis
     // -------
+    xNewAxis = lcl_getAxis( xCooSys, XML_Z );
+    if( xNewAxis.is() )
+    {
+        Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(2) : 0, uno::UNO_QUERY );
+        exportAxis( XML_Z, XML_PRIMARY_Z, xAxisProps, xNewAxis, aCategoriesRange, bHasZAxisTitle, bHasZAxisMajorGrid, bHasZAxisMinorGrid, bExportContent );
+    }
+}
 
-    if( bHasZAxis &&
-        bIs3DChart )
+namespace
+{
+    bool lcl_hasNoValuesButText( const uno::Reference< chart2::data::XDataSequence >& xDataSequence )
     {
-        Reference< chart::XAxisZSupplier > xAxisZSupp( xDiagram, uno::UNO_QUERY );
-        if( xAxisZSupp.is())
-        {
-            // get property states for autostyles
-            if( mxExpPropMapper.is())
-            {
-                xPropSet = xAxisZSupp->getZAxis();
-                lcl_exportNumberFormat( sNumFormat, xPropSet, mrExport );
-                if( xPropSet.is())
-                    aPropertyStates = mxExpPropMapper->Filter( xPropSet );
-            }
-            if( bExportContent )
-            {
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, XML_Z );
-                mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_NAME, XML_PRIMARY_Z );
+        if( !xDataSequence.is() )
+            return false;//have no data
 
-                AddAutoStyleAttribute( aPropertyStates );
-                pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
-            }
-            else
+        Sequence< uno::Any > aData;
+        Reference< chart2::data::XNumericalDataSequence > xNumericalDataSequence( xDataSequence, uno::UNO_QUERY );
+        if( xNumericalDataSequence.is() )
+        {
+            Sequence< double >  aDoubles( xNumericalDataSequence->getNumericalData() );
+            sal_Int32 nCount = aDoubles.getLength();
+            for( sal_Int32 i = 0; i < nCount; ++i )
             {
-                CollectAutoStyle( aPropertyStates );
+                if( !::rtl::math::isNan( aDoubles[i] ) )
+                    return false;//have double value
             }
-            aPropertyStates.clear();
-
-            // axis-title
-            if( bHasZAxisTitle )
+        }
+        else
+        {
+            aData = xDataSequence->getData();
+            double fDouble = 0.0;
+            sal_Int32 nCount = aData.getLength();
+            for( sal_Int32 i = 0; i < nCount; ++i )
             {
-                Reference< beans::XPropertySet > xTitleProp( xAxisZSupp->getZAxisTitle(), uno::UNO_QUERY );
-                if( xTitleProp.is())
-                {
-                    aPropertyStates = mxExpPropMapper->Filter( xTitleProp );
-                    if( bExportContent )
-                    {
-                        OUString aText;
-                        Any aAny( xTitleProp->getPropertyValue(
-                            OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))));
-                        aAny >>= aText;
-
-                        Reference< drawing::XShape > xShape( xTitleProp, uno::UNO_QUERY );
-                        if( xShape.is())
-                            addPosition( xShape );
-
-                        AddAutoStyleAttribute( aPropertyStates );
-                        SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
-
-                        // paragraph containing title
-                        exportText( aText );
-                    }
-                    else
-                    {
-                        CollectAutoStyle( aPropertyStates );
-                    }
-                    aPropertyStates.clear();
-                }
+                if( (aData[i] >>= fDouble) && !::rtl::math::isNan( fDouble ) )
+                    return false;//have double value
             }
+            
+        }
+        //no values found
 
-            // grid
-            Reference< beans::XPropertySet > xMajorGrid( xAxisZSupp->getZMainGrid(), uno::UNO_QUERY );
-            if( bHasZAxisMajorGrid && xMajorGrid.is())
-            {
-                aPropertyStates = mxExpPropMapper->Filter( xMajorGrid );
-
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MAJOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
-                }
-                aPropertyStates.clear();
-            }
-            // minor grid
-            Reference< beans::XPropertySet > xMinorGrid( xAxisZSupp->getZHelpGrid(), uno::UNO_QUERY );
-            if( bHasZAxisMinorGrid && xMinorGrid.is())
+        Reference< chart2::data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY );
+        if( xTextualDataSequence.is() )
+        {
+            uno::Sequence< rtl::OUString > aStrings( xTextualDataSequence->getTextualData() );
+            sal_Int32 nCount = aStrings.getLength();
+            for( sal_Int32 i = 0; i < nCount; ++i )
             {
-                aPropertyStates = mxExpPropMapper->Filter( xMinorGrid );
-
-                if( bExportContent )
-                {
-                    AddAutoStyleAttribute( aPropertyStates );
-                    mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, XML_MINOR );
-                    SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
-                }
-                else
-                {
-                    CollectAutoStyle( aPropertyStates );
-                }
-                aPropertyStates.clear();
+                if( aStrings[i].getLength() )
+                    return true;//have text
             }
         }
-        if( pAxis )
+        else
         {
-            delete pAxis;
-            pAxis = NULL;
+            if( !aData.getLength() )
+                aData = xDataSequence->getData();
+            uno::Any aAny;
+            OUString aString;
+            sal_Int32 nCount = aData.getLength();
+            for( sal_Int32 i = 0; i < nCount; ++i )
+            {
+                if( (aData[i]>>=aString) && aString.getLength() )
+                    return true;//have text
+            }
         }
+        //no doubles and no texts
+        return false;
     }
 }
 
@@ -2943,6 +2880,17 @@ void SchXMLExportHelper_Impl::exportSeries(
                                     if( lcl_exportDomainForThisSequence( xValues, aFirstXDomainRange, mrExport ) )
                                         m_aDataSequencesToExport.push_back( tLabelValuesDataPair( 0, xValues ));
                                 }
+                                else if( nSeriesIdx==0 )
+                                {
+                                    //might be that the categories are used as x-values (e.g. for date axis) -> export them accordingly
+                                    Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xNewDiagram ) );
+                                    if( xCategories.is() )
+                                    {
+                                        Reference< chart2::data::XDataSequence > xValues( xCategories->getValues() );
+                                        if( !lcl_hasNoValuesButText( xValues ) )
+                                            lcl_exportDomainForThisSequence( xValues, aFirstXDomainRange, mrExport );
+                                    }
+                                }
                             }
                             if( xYValuesForBubbleChart.is() )
                                 m_aDataSequencesToExport.push_back( tLabelValuesDataPair( 0, xYValuesForBubbleChart ));
@@ -3576,21 +3524,22 @@ void SchXMLExportHelper_Impl::addPosition( Reference< drawing::XShape > xShape )
         addPosition( xShape->getPosition());
 }
 
-void SchXMLExportHelper_Impl::addSize( const awt::Size & rSize )
+void SchXMLExportHelper_Impl::addSize( const awt::Size & rSize, bool bIsOOoNamespace)
 {
     mrExport.GetMM100UnitConverter().convertMeasure( msStringBuffer, rSize.Width );
     msString = msStringBuffer.makeStringAndClear();
-    mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH,  msString );
+    mrExport.AddAttribute( bIsOOoNamespace ? XML_NAMESPACE_CHART_EXT : XML_NAMESPACE_SVG , XML_WIDTH,  msString );
+   
 
-    mrExport.GetMM100UnitConverter().convertMeasure( msStringBuffer, rSize.Height );
+    mrExport.GetMM100UnitConverter().convertMeasure( msStringBuffer, rSize.Height);
     msString = msStringBuffer.makeStringAndClear();
-    mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_HEIGHT, msString );
+    mrExport.AddAttribute( bIsOOoNamespace ? XML_NAMESPACE_CHART_EXT : XML_NAMESPACE_SVG, XML_HEIGHT, msString );
 }
 
-void SchXMLExportHelper_Impl::addSize( Reference< drawing::XShape > xShape )
+void SchXMLExportHelper_Impl::addSize( Reference< drawing::XShape > xShape, bool bIsOOoNamespace )
 {
     if( xShape.is())
-        addSize( xShape->getSize() );
+        addSize( xShape->getSize(), bIsOOoNamespace );
 }
 
 awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) const
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index c3cf8d37af..bb13585a46 100644..100755
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -40,7 +40,7 @@
 // header for class ByteString
 #include <tools/string.hxx>
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -144,12 +144,9 @@ SchXMLImportHelper::SchXMLImportHelper() :
         mpChartElemTokenMap( 0 ),
         mpPlotAreaElemTokenMap( 0 ),
         mpSeriesElemTokenMap( 0 ),
-        mpAxisElemTokenMap( 0 ),
 
         mpChartAttrTokenMap( 0 ),
         mpPlotAreaAttrTokenMap( 0 ),
-        mpAxisAttrTokenMap( 0 ),
-        mpLegendAttrTokenMap( 0 ),
         mpAutoStyleAttrTokenMap( 0 ),
         mpCellAttrTokenMap( 0 ),
         mpSeriesAttrTokenMap( 0 ),
@@ -170,17 +167,11 @@ SchXMLImportHelper::~SchXMLImportHelper()
         delete mpPlotAreaElemTokenMap;
     if( mpSeriesElemTokenMap )
         delete mpSeriesElemTokenMap;
-    if( mpAxisElemTokenMap )
-        delete mpAxisElemTokenMap;
 
     if( mpChartAttrTokenMap )
         delete mpChartAttrTokenMap;
     if( mpPlotAreaAttrTokenMap )
         delete mpPlotAreaAttrTokenMap;
-    if( mpAxisAttrTokenMap )
-        delete mpAxisAttrTokenMap;
-    if( mpLegendAttrTokenMap )
-        delete mpLegendAttrTokenMap;
     if( mpAutoStyleAttrTokenMap )
         delete mpAutoStyleAttrTokenMap;
     if( mpCellAttrTokenMap )
@@ -321,24 +312,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
     return *mpSeriesElemTokenMap;
 }
 
-const SvXMLTokenMap& SchXMLImportHelper::GetAxisElemTokenMap()
-{
-    if( ! mpAxisElemTokenMap )
-    {
-        static SvXMLTokenMapEntry aAxisElemTokenMap[] =
-{
-    { XML_NAMESPACE_CHART,	XML_TITLE,				    XML_TOK_AXIS_TITLE		},
-    { XML_NAMESPACE_CHART,	XML_CATEGORIES,			    XML_TOK_AXIS_CATEGORIES	},
-    { XML_NAMESPACE_CHART,	XML_GRID,				    XML_TOK_AXIS_GRID		},
-    XML_TOKEN_MAP_END
-};
-
-        mpAxisElemTokenMap = new SvXMLTokenMap( aAxisElemTokenMap );
-    } // if( ! mpAxisElemTokenMap )
-
-    return *mpAxisElemTokenMap;
-}
-
 // ----------------------------------------
 
 const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
@@ -396,43 +369,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
     return *mpPlotAreaAttrTokenMap;
 }
 
-const SvXMLTokenMap& SchXMLImportHelper::GetAxisAttrTokenMap()
-{
-    if( ! mpAxisAttrTokenMap )
-    {
-        static SvXMLTokenMapEntry aAxisAttrTokenMap[] =
-{
-    { XML_NAMESPACE_CHART,	XML_DIMENSION,				XML_TOK_AXIS_DIMENSION		},
-    { XML_NAMESPACE_CHART,	XML_NAME,					XML_TOK_AXIS_NAME			},
-    { XML_NAMESPACE_CHART,	XML_STYLE_NAME,		    	XML_TOK_AXIS_STYLE_NAME		},
-    XML_TOKEN_MAP_END
-};
-
-        mpAxisAttrTokenMap = new SvXMLTokenMap( aAxisAttrTokenMap );
-    } // if( ! mpAxisAttrTokenMap )
-
-    return *mpAxisAttrTokenMap;
-}
-
-const SvXMLTokenMap& SchXMLImportHelper::GetLegendAttrTokenMap()
-{
-    if( ! mpLegendAttrTokenMap )
-    {
-        static SvXMLTokenMapEntry aLegendAttrTokenMap[] =
-{
-    { XML_NAMESPACE_CHART,	XML_LEGEND_POSITION,		XML_TOK_LEGEND_POSITION		},
-    { XML_NAMESPACE_SVG,	XML_X,						XML_TOK_LEGEND_X			},
-    { XML_NAMESPACE_SVG,	XML_Y,						XML_TOK_LEGEND_Y			},
-    { XML_NAMESPACE_CHART,	XML_STYLE_NAME,			    XML_TOK_LEGEND_STYLE_NAME	},
-    XML_TOKEN_MAP_END
-};
-
-        mpLegendAttrTokenMap = new SvXMLTokenMap( aLegendAttrTokenMap );
-    } // if( ! mpLegendAttrTokenMap )
-
-    return *mpLegendAttrTokenMap;
-}
-
 const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap()
 {
     if( ! mpAutoStyleAttrTokenMap )
@@ -718,7 +654,7 @@ SchXMLImport::~SchXMLImport() throw ()
 
 // create the main context (subcontexts are created
 // by the one created here)
-SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString& rLocalName,
+SvXMLImportContext *SchXMLImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = 0;
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
new file mode 100755
index 0000000000..b50dd6ab44
--- /dev/null
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -0,0 +1,229 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmloff.hxx"
+#include "SchXMLLegendContext.hxx"
+#include "SchXMLEnumConverter.hxx"
+
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlement.hxx>
+#include <xmloff/prstylei.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmluconv.hxx>
+
+#include <tools/debug.hxx>
+
+#include <com/sun/star/chart/ChartLegendPosition.hpp>
+#include <com/sun/star/chart/ChartLegendExpansion.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
+
+using namespace ::xmloff::token;
+using namespace com::sun::star;
+
+using rtl::OUString;
+using com::sun::star::uno::Reference;
+
+//----------------------------------------
+
+namespace
+{
+
+enum LegendAttributeTokens
+{
+    XML_TOK_LEGEND_POSITION,
+    XML_TOK_LEGEND_X,
+    XML_TOK_LEGEND_Y,
+    XML_TOK_LEGEND_STYLE_NAME,
+    XML_TOK_LEGEND_EXPANSION,
+    XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO,
+    XML_TOK_LEGEND_WIDTH,
+    XML_TOK_LEGEND_WIDTH_EXT,
+    XML_TOK_LEGEND_HEIGHT,
+    XML_TOK_LEGEND_HEIGHT_EXT
+};
+
+SvXMLTokenMapEntry aLegendAttributeTokenMap[] =
+{
+    { XML_NAMESPACE_CHART,      XML_LEGEND_POSITION,    XML_TOK_LEGEND_POSITION     },
+    { XML_NAMESPACE_SVG,        XML_X,                  XML_TOK_LEGEND_X            },
+    { XML_NAMESPACE_SVG,        XML_Y,                  XML_TOK_LEGEND_Y            },
+    { XML_NAMESPACE_CHART,      XML_STYLE_NAME,         XML_TOK_LEGEND_STYLE_NAME   },
+    { XML_NAMESPACE_STYLE,      XML_LEGEND_EXPANSION,   XML_TOK_LEGEND_EXPANSION    },
+    { XML_NAMESPACE_STYLE,      XML_LEGEND_EXPANSION_ASPECT_RATIO,   XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO    },
+    { XML_NAMESPACE_SVG,        XML_WIDTH,              XML_TOK_LEGEND_WIDTH        },
+    { XML_NAMESPACE_CHART_EXT,  XML_WIDTH,              XML_TOK_LEGEND_WIDTH_EXT    },
+    { XML_NAMESPACE_SVG,        XML_HEIGHT,             XML_TOK_LEGEND_HEIGHT       },
+    { XML_NAMESPACE_CHART_EXT,  XML_HEIGHT,             XML_TOK_LEGEND_HEIGHT_EXT   },
+    XML_TOKEN_MAP_END
+};
+
+class LegendAttributeTokenMap : public SvXMLTokenMap
+{
+public:
+    LegendAttributeTokenMap(): SvXMLTokenMap( aLegendAttributeTokenMap ) {}
+    virtual ~LegendAttributeTokenMap() {}
+};
+
+//a LegendAttributeTokenMap Singleton
+struct theLegendAttributeTokenMap : public rtl::Static< LegendAttributeTokenMap, theLegendAttributeTokenMap > {};
+
+}//end anonymous namespace
+
+//----------------------------------------
+
+SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const rtl::OUString& rLocalName ) :
+    SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+    mrImportHelper( rImpHelper )
+{
+}
+
+void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+{
+    uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
+    if( !xDoc.is() )
+        return;
+
+    // turn on legend
+    uno::Reference< beans::XPropertySet > xDocProp( xDoc, uno::UNO_QUERY );
+    if( xDocProp.is() )
+    {
+        try
+        {
+            xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "HasLegend" ), uno::makeAny( sal_True ) );
+        }
+        catch( beans::UnknownPropertyException )
+        {
+            DBG_ERROR( "Property HasLegend not found" );
+        }
+    }
+
+    uno::Reference< drawing::XShape > xLegendShape( xDoc->getLegend(), uno::UNO_QUERY );
+    uno::Reference< beans::XPropertySet > xLegendProps( xLegendShape, uno::UNO_QUERY );
+    if( !xLegendShape.is() || !xLegendProps.is() )
+    {
+        DBG_ERROR( "legend could not be created" );
+        return;
+    }
+
+    // parse attributes
+    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
+    const SvXMLTokenMap& rAttrTokenMap = theLegendAttributeTokenMap::get();
+
+    awt::Point aLegendPos;
+    bool bHasXPosition=false;
+    bool bHasYPosition=false;
+    awt::Size aLegendSize;
+    bool bHasWidth=false;
+    bool bHasHeight=false;
+    chart::ChartLegendExpansion nLegendExpansion = chart::ChartLegendExpansion_HIGH;
+    bool bHasExpansion=false;
+    
+    rtl::OUString sAutoStyleName;
+    uno::Any aAny;
+
+    for( sal_Int16 i = 0; i < nAttrCount; i++ )
+    {
+        rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
+        rtl::OUString aLocalName;
+        rtl::OUString aValue = xAttrList->getValueByIndex( i );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+
+        switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+        {
+            case XML_TOK_LEGEND_POSITION:
+                {
+                    try
+                    {
+                        if( SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, GetImport().GetMM100UnitConverter() ) )
+                            xLegendProps->setPropertyValue( rtl::OUString::createFromAscii( "Alignment" ), aAny );
+                    }
+                    catch( beans::UnknownPropertyException )
+                    {
+                        DBG_ERROR( "Property Alignment (legend) not found" );
+                    }
+                }
+                break;
+    
+            case XML_TOK_LEGEND_X:
+                GetImport().GetMM100UnitConverter().convertMeasure( aLegendPos.X, aValue );
+                bHasXPosition = true;
+                break;
+            case XML_TOK_LEGEND_Y:
+                GetImport().GetMM100UnitConverter().convertMeasure( aLegendPos.Y, aValue );
+                bHasYPosition = true;
+                break;
+            case XML_TOK_LEGEND_STYLE_NAME:
+                sAutoStyleName = aValue;
+                break;
+            case XML_TOK_LEGEND_EXPANSION:
+                SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, GetImport().GetMM100UnitConverter() );
+                bHasExpansion = (aAny>>=nLegendExpansion);
+                break;
+            case XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO:
+                break;
+            case XML_TOK_LEGEND_WIDTH:
+            case XML_TOK_LEGEND_WIDTH_EXT:
+                GetImport().GetMM100UnitConverter().convertMeasure( aLegendSize.Width, aValue );
+                bHasWidth = true;
+                break;
+            case XML_TOK_LEGEND_HEIGHT:
+            case XML_TOK_LEGEND_HEIGHT_EXT:
+                GetImport().GetMM100UnitConverter().convertMeasure( aLegendSize.Height, aValue );
+                bHasHeight = true;
+                break;
+            default:
+                break;
+        }
+    }
+
+    if( bHasXPosition && bHasYPosition )
+        xLegendShape->setPosition( aLegendPos );
+
+    if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM )
+        xLegendProps->setPropertyValue( rtl::OUString::createFromAscii( "Expansion" ), uno::makeAny(nLegendExpansion) );
+    else if( bHasHeight && bHasWidth )
+        xLegendShape->setSize( aLegendSize );
+
+    // the fill style has the default "none" in XML, but "solid" in the model.
+    xLegendProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), uno::makeAny( drawing::FillStyle_NONE ));
+
+    // set auto-styles for Legend
+    const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
+    if( pStylesCtxt )
+    {
+        const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
+            mrImportHelper.GetChartFamilyID(), sAutoStyleName );
+
+        if( pStyle && pStyle->ISA( XMLPropStyleContext ))
+            (( XMLPropStyleContext* )pStyle )->FillPropertySet( xLegendProps );
+    }
+}
+
+SchXMLLegendContext::~SchXMLLegendContext()
+{
+}
diff --git a/svx/inc/svx/linkwarn.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx
index 4be65cc75a..a2b692e935 100644..100755
--- a/svx/inc/svx/linkwarn.hxx
+++ b/xmloff/source/chart/SchXMLLegendContext.hxx
@@ -2,9 +2,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
- * Copyright 2010 Novell, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -26,32 +25,25 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _SCH_XMLLEGENDCONTEXT_HXX_
+#define _SCH_XMLLEGENDCONTEXT_HXX_
 
-#ifndef _SFX_LINKWARN_HXX
-#define _SFX_LINKWARN_HXX
+#include "SchXMLImport.hxx"
 
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <sfx2/basedlgs.hxx>
-#include "svx/svxdllapi.h"
+// ----------------------------------------
 
-class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog
+class SchXMLLegendContext : public SvXMLImportContext
 {
-private:
-    FixedImage              m_aQueryImage;
-    FixedText               m_aInfoText;
-    OKButton                m_aLinkGraphicBtn;
-    CancelButton            m_aEmbedGraphicBtn;
-    FixedLine               m_aOptionLine;
-    CheckBox                m_aWarningOnBox;
+public:
+    SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const rtl::OUString& rLocalName );
+    virtual ~SchXMLLegendContext();
 
-    void                    InitSize();
+    virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-public:
-             SvxLinkWarningDialog( Window* pParent, const String& _rFileName );
-    virtual ~SvxLinkWarningDialog();
+private:
+    SchXMLImportHelper& mrImportHelper;
 };
 
-#endif // #ifndef _SFX_LINKWARN_HXX
+#endif	// _SCH_XMLLEGENDCONTEXT_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 8a4b9a3f04..ac041ca8d6 100644..100755
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -32,7 +32,7 @@
 #include "SchXMLImport.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
@@ -67,7 +67,7 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if (IsXMLToken(aLocalName, XML_ID))
             {
@@ -94,7 +94,7 @@ void SchXMLParagraphContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLParagraphContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 7b49e4f988..6776eaf6d5 100644..100755
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -55,7 +55,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 55b370497f..8a30f8a35f 100644..100755
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -31,6 +31,7 @@
 
 #include "SchXMLPlotAreaContext.hxx"
 #include "SchXMLImport.hxx"
+#include "SchXMLAxisContext.hxx"
 #include "SchXMLSeries2Context.hxx"
 #include "SchXMLTools.hxx"
 #include <tools/debug.hxx>
@@ -39,8 +40,7 @@
 #endif
 
 #include <comphelper/processfactory.hxx>
-#include "xmlnmspe.hxx"
-#include <xmloff/xmltoken.hxx>
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -52,29 +52,18 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 
-#include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
-#include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
-#include <com/sun/star/chart/ChartAxisPosition.hpp>
-#include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
-#include <com/sun/star/chart/XTwoAxisYSupplier.hpp>
-#include <com/sun/star/chart/XAxisZSupplier.hpp>
-#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XStringMapping.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -85,14 +74,6 @@ using namespace ::xmloff::token;
 using ::rtl::OUString;
 using com::sun::star::uno::Reference;
 
-static SvXMLEnumMapEntry aXMLAxisClassMap[] =
-{
-    { XML_X,  SCH_XML_AXIS_X  },
-    { XML_Y,  SCH_XML_AXIS_Y  },
-    { XML_Z,  SCH_XML_AXIS_Z  },
-    { XML_TOKEN_INVALID, 0 }
-};
-
 namespace
 {
 
@@ -116,19 +97,6 @@ OUString lcl_ConvertRange( const ::rtl::OUString & rRange, const uno::Reference<
     return aResult;
 }
 
-Reference< chart2::XAxis > lcl_getAxis( const Reference< chart2::XCoordinateSystem > xCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
-{
-    Reference< chart2::XAxis > xAxis;
-    try
-    {
-        xAxis = xCooSys->getAxisByDimension( nDimensionIndex, nAxisIndex );
-    }
-    catch( uno::Exception & )
-    {
-    }
-    return xAxis;
-}
-
 } // anonymous namespace
 
 SchXML3DSceneAttributesHelper::SchXML3DSceneAttributesHelper( SvXMLImport& rImporter )
@@ -240,47 +208,33 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
     {
         try
         {
-            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ))))
-            {
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisDescription" )), aFalseBool );
-            }
-            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisXSupplier" ))))
-            {
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisDescription" )), aFalseBool );
-            }
-
-            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ))))
-            {
-                xProp->setPropertyValue(
+            
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisDescription" )), aFalseBool );
-            }
-            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisYSupplier" ))))
-            {
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisDescription" )), aFalseBool );
-            }
-
-            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisZSupplier" ))))
-            {
-                xProp->setPropertyValue(
+            
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )), aFalseBool );
-                xProp->setPropertyValue(
+            xProp->setPropertyValue(
                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisDescription" )), aFalseBool );
-            }
+
             uno::Any aAny;
             chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
             aAny <<= eSource;
@@ -308,7 +262,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -512,7 +466,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
 }
 
 SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -624,7 +578,7 @@ void SchXMLPlotAreaContext::EndElement()
         ::std::vector< SchXMLAxis >::const_iterator aIt(
             ::std::find_if( maAxes.begin(), maAxes.end(), lcl_AxisHasCategories()));
         if( aIt != maAxes.end())
-            nDimension = static_cast< sal_Int32 >( (*aIt).eClass );
+            nDimension = static_cast< sal_Int32 >( (*aIt).eDimension );
         SchXMLTools::CreateCategories(
             xDataProvider, mxNewDoc, mrCategoriesAddress,
             0 /* nCooSysIndex */,
@@ -709,874 +663,7 @@ void SchXMLPlotAreaContext::EndElement()
         }
     }
 
-    CorrectAxisPositions();
-}
-
-void SchXMLPlotAreaContext::CorrectAxisPositions()
-{
-    ::rtl::OUString aODFVersionOfFile( GetImport().GetODFVersion() );
-    
-    if( ( !aODFVersionOfFile.getLength() || aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.0"))
-        || aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.1"))
-        || ( aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2")) && !m_bAxisPositionAttributeImported ) ) )
-    {
-        uno::Reference< chart2::XChartDocument > xNewDoc( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
-
-        try
-        {
-            Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xNewDoc->getFirstDiagram(), uno::UNO_QUERY_THROW );
-            uno::Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
-            if( aCooSysSeq.getLength() )
-            {
-                Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[0] );
-                if( xCooSys.is() )
-                {
-                    Reference< chart2::XAxis > xMainXAxis = lcl_getAxis( xCooSys, 0, 0 );
-                    Reference< chart2::XAxis > xMainYAxis = lcl_getAxis( xCooSys, 1, 0 );
-                    Reference< chart2::XAxis > xSecondaryXAxis = lcl_getAxis( xCooSys, 0, 1 );
-                    Reference< chart2::XAxis > xSecondaryYAxis = lcl_getAxis( xCooSys, 1, 1 );
-                    
-                    uno::Reference< beans::XPropertySet > xMainXAxisProp( xMainXAxis, uno::UNO_QUERY );
-                    uno::Reference< beans::XPropertySet > xMainYAxisProp( xMainYAxis, uno::UNO_QUERY );
-                    uno::Reference< beans::XPropertySet > xSecondaryXAxisProp( xSecondaryXAxis, uno::UNO_QUERY );
-                    uno::Reference< beans::XPropertySet > xSecondaryYAxisProp( xSecondaryYAxis, uno::UNO_QUERY );
-                    
-                    if( xMainXAxisProp.is() && xMainYAxisProp.is() )
-                    {
-                        chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
-                        if( 0 == maChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
-                        {
-                            xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
-                            double fCrossoverValue = 0.0;
-                            aMainXScale.Origin >>= fCrossoverValue;
-                            xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
-                                    , uno::makeAny( fCrossoverValue ) );
-
-                            if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
-                            {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
-                                if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
-                            }
-                            else
-                            {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
-                                if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
-                            }    
-                        }
-                        else
-                        {
-                            if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
-                            {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
-                                if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                        , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
-                            }
-                            else
-                            {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                    , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
-                                if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                        , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
-                            }
-                        }
-
-                        chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
-                        xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
-                        double fCrossoverValue = 0.0;
-                        aMainYScale.Origin >>= fCrossoverValue;
-                        xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
-                                , uno::makeAny( fCrossoverValue ) );
-
-                        if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
-                        {
-                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
-                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
-                            if( xSecondaryXAxisProp.is() )
-                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
-                        }
-                        else
-                        {
-                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
-                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
-                            if( xSecondaryXAxisProp.is() )
-                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
-                                , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
-                        }
-                    }
-                }
-            }
-        }
-        catch( uno::Exception & )
-        {
-        }
-    }
-}
-
-// ========================================
-
-SchXMLAxisContext::SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
-                                      SvXMLImport& rImport, const rtl::OUString& rLocalName,
-                                      uno::Reference< chart::XDiagram > xDiagram,
-                                      std::vector< SchXMLAxis >& aAxes,
-                                      ::rtl::OUString & rCategoriesAddress,
-                                      bool bAddMissingXAxisForNetCharts,
-                                      bool bAdaptWrongPercentScaleValues,
-                                      bool bAdaptXAxisOrientationForOld2DBarCharts,
-                                      bool& rbAxisPositionAttributeImported ) :
-        SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
-        mrImportHelper( rImpHelper ),
-        mxDiagram( xDiagram ),
-        maAxes( aAxes ),
-        mrCategoriesAddress( rCategoriesAddress ),
-        mbAddMissingXAxisForNetCharts( bAddMissingXAxisForNetCharts ),
-        mbAdaptWrongPercentScaleValues( bAdaptWrongPercentScaleValues ),
-        mbAdaptXAxisOrientationForOld2DBarCharts( bAdaptXAxisOrientationForOld2DBarCharts ),
-        m_rbAxisPositionAttributeImported( rbAxisPositionAttributeImported )
-{
-}
-
-SchXMLAxisContext::~SchXMLAxisContext()
-{}
-
-/* returns a shape for the current axis's title. The property
-   "Has...AxisTitle" is set to "True" to get the shape
- */
-uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
-{
-    uno::Reference< drawing::XShape > xResult;
-    uno::Any aTrueBool;
-    aTrueBool <<= (sal_Bool)(sal_True);
-    uno::Reference< beans::XPropertySet > xDiaProp( mxDiagram, uno::UNO_QUERY );
-
-    switch( maCurrentAxis.eClass )
-    {
-        case SCH_XML_AXIS_X:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                uno::Reference< chart::XAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                {
-                    if( xDiaProp.is())
-                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisTitle" )), aTrueBool );
-                    xResult = uno::Reference< drawing::XShape >( xSuppl->getXAxisTitle(), uno::UNO_QUERY );
-                }
-            }
-            else
-            {
-                uno::Reference< chart::XSecondAxisTitleSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() )
-                {
-                    if( xDiaProp.is() )
-                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisTitle" )), aTrueBool );
-                    xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondXAxisTitle(), uno::UNO_QUERY );
-                }
-            }
-            break;
-        case SCH_XML_AXIS_Y:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                uno::Reference< chart::XAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                {
-                    if( xDiaProp.is())
-                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisTitle" )), aTrueBool );
-                    xResult = uno::Reference< drawing::XShape >( xSuppl->getYAxisTitle(), uno::UNO_QUERY );
-                }
-            }
-            else
-            {
-                uno::Reference< chart::XSecondAxisTitleSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() )
-                {
-                    if( xDiaProp.is() )
-                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisTitle" )), aTrueBool );
-                    xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondYAxisTitle(), uno::UNO_QUERY );
-                }
-            }
-            break;
-        case SCH_XML_AXIS_Z:
-        {
-            uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-            if( xSuppl.is())
-            {
-                if( xDiaProp.is())
-                    xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
-                xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
-            }
-            break;
-        }
-        case SCH_XML_AXIS_UNDEF:
-            OSL_FAIL( "Invalid axis" );
-            break;
-    }
-
-    return xResult;
-}
-
-void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
-                                    sal_Bool bIsMajor )
-{
-    uno::Reference< chart::XDiagram > xDia = mrImportHelper.GetChartDocument()->getDiagram();
-    uno::Reference< beans::XPropertySet > xGridProp;
-    ::rtl::OUString sPropertyName;
-    DBG_ASSERT( xDia.is(), "diagram object is invalid!" );
-
-    uno::Reference< beans::XPropertySet > xDiaProp( xDia, uno::UNO_QUERY );
-    uno::Any aTrueBool( uno::makeAny( true ));
-
-    switch( maCurrentAxis.eClass )
-    {
-        case SCH_XML_AXIS_X:
-            {
-                uno::Reference< chart::XAxisXSupplier > xSuppl( xDia, uno::UNO_QUERY );
-                if( xSuppl.is())
-                {
-                    if( bIsMajor )
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getXMainGrid();
-                    }
-                    else
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisHelpGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getXHelpGrid();
-                    }
-                }
-            }
-            break;
-        case SCH_XML_AXIS_Y:
-            {
-                uno::Reference< chart::XAxisYSupplier > xSuppl( xDia, uno::UNO_QUERY );
-                if( xSuppl.is())
-                {
-                    if( bIsMajor )
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getYMainGrid();
-                    }
-                    else
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisHelpGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getYHelpGrid();
-                    }
-                }
-            }
-            break;
-        case SCH_XML_AXIS_Z:
-            {
-                uno::Reference< chart::XAxisZSupplier > xSuppl( xDia, uno::UNO_QUERY );
-                if( xSuppl.is())
-                {
-                    if( bIsMajor )
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getZMainGrid();
-                    }
-                    else
-                    {
-                        if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisHelpGrid" )), aTrueBool );
-                        xGridProp = xSuppl->getZHelpGrid();
-                    }
-                }
-            }
-            break;
-        case SCH_XML_AXIS_UNDEF:
-            OSL_FAIL( "Invalid axis" );
-            break;
-    }
-
-    // set properties
-    if( xGridProp.is())
-    {
-        // the line color is black as default, in the model it is a light gray
-        xGridProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
-                                     uno::makeAny( COL_BLACK ));
-        if( sAutoStyleName.getLength())
-        {
-            const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
-            if( pStylesCtxt )
-            {
-                const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
-                    mrImportHelper.GetChartFamilyID(), sAutoStyleName );
-
-                if( pStyle && pStyle->ISA( XMLPropStyleContext ))
-                    (( XMLPropStyleContext* )pStyle )->FillPropertySet( xGridProp );
-            }
-        }
-    }
-}
-
-void SchXMLAxisContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-{
-    // parse attributes
-    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-    SchXMLImport& rImport = ( SchXMLImport& )GetImport();
-    const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetAxisAttrTokenMap();
-
-    for( sal_Int16 i = 0; i < nAttrCount; i++ )
-    {
-        rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-        rtl::OUString aLocalName;
-        rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
-        switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
-        {
-            case XML_TOK_AXIS_DIMENSION:
-                {
-                    USHORT nEnumVal;
-                    if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisClassMap ))
-                        maCurrentAxis.eClass = ( SchXMLAxisClass )nEnumVal;
-                }
-                break;
-            case XML_TOK_AXIS_NAME:
-                maCurrentAxis.aName = aValue;
-                break;
-            case XML_TOK_AXIS_STYLE_NAME:
-                msAutoStyleName = aValue;
-                break;
-        }
-    }
-
-    // check for number of axes with same category
-    maCurrentAxis.nIndexInCategory = 0;
-    sal_Int32 nNumOfAxes = maAxes.size();
-    for( sal_Int32 nCurrent = 0; nCurrent < nNumOfAxes; nCurrent++ )
-    {
-        if( maAxes[ nCurrent ].eClass == maCurrentAxis.eClass )
-            maCurrentAxis.nIndexInCategory++;
-    }
-    CreateAxis();
-}
-namespace
-{
-
-uno::Reference< chart2::XAxis > lcl_getAxis( const uno::Reference< frame::XModel >& xChartModel,
-                                            sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
-{
-    uno::Reference< chart2::XAxis > xAxis;
-
-    try
-    {
-        uno::Reference< chart2::XChartDocument > xChart2Document( xChartModel, uno::UNO_QUERY );
-        if( xChart2Document.is() )
-        {
-            uno::Reference< chart2::XDiagram > xDiagram( xChart2Document->getFirstDiagram());
-            uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
-            uno::Sequence< uno::Reference< chart2::XCoordinateSystem > >
-                aCooSysSeq( xCooSysCnt->getCoordinateSystems());
-            sal_Int32 nCooSysIndex = 0;
-            if( nCooSysIndex < aCooSysSeq.getLength() )
-            {
-                uno::Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[nCooSysIndex] );
-                if( xCooSys.is() && nDimensionIndex < xCooSys->getDimension() )
-                {
-                    const sal_Int32 nMaxAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nDimensionIndex);
-                    if( nAxisIndex <= nMaxAxisIndex )
-                        xAxis = xCooSys->getAxisByDimension( nDimensionIndex, nAxisIndex );
-                }
-            }
-        }
-    }
-    catch( uno::Exception & )
-    {
-        OSL_FAIL( "Couldn't get axis" );
-    }
-
-    return xAxis;
-}
-
-bool lcl_divideBy100( uno::Any& rDoubleAny )
-{
-    bool bChanged = false;
-    double fValue=0.0;
-    if( (rDoubleAny>>=fValue) && (fValue!=0.0) )
-    {
-        fValue/=100.0;
-        rDoubleAny = uno::makeAny(fValue);
-        bChanged = true;
-    }
-    return bChanged;
-}
-
-bool lcl_AdaptWrongPercentScaleValues(chart2::ScaleData& rScaleData)
-{
-    bool bChanged = lcl_divideBy100( rScaleData.Minimum );
-    bChanged = lcl_divideBy100( rScaleData.Maximum ) || bChanged;
-    bChanged = lcl_divideBy100( rScaleData.Origin ) || bChanged;
-    bChanged = lcl_divideBy100( rScaleData.IncrementData.Distance ) || bChanged;
-    return bChanged;
-}
-
-}//end anonymous namespace
-
-void SchXMLAxisContext::CreateAxis()
-{
-    // add new Axis to list
-    maAxes.push_back( maCurrentAxis );
-
-    // set axis at chart
-    uno::Reference< beans::XPropertySet > xDiaProp( mxDiagram, uno::UNO_QUERY );
-    uno::Reference< beans::XPropertySet > xProp;
-    uno::Any aTrueBool;
-    aTrueBool <<= (sal_Bool)(sal_True);
-    uno::Any aFalseBool;
-    aFalseBool <<= (sal_Bool)(sal_False);
-    uno::Reference< frame::XModel > xDoc( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
-
-    switch( maCurrentAxis.eClass )
-    {
-        case SCH_XML_AXIS_X:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                try
-                {
-                    xDiaProp->setPropertyValue(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aTrueBool );
-                }
-                catch( beans::UnknownPropertyException & )
-                {
-                    OSL_FAIL( "Couldn't turn on x axis" );
-                }
-                uno::Reference< chart::XAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                    xProp = xSuppl->getXAxis();
-            }
-            else
-            {
-                try
-                {
-                    xDiaProp->setPropertyValue(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aTrueBool );
-                }
-                catch( beans::UnknownPropertyException & )
-                {
-                    OSL_FAIL( "Couldn't turn on second x axis" );
-                }
-                uno::Reference< chart::XTwoAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                    xProp = xSuppl->getSecondaryXAxis();
-            }
-            break;
-
-        case SCH_XML_AXIS_Y:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                try
-                {
-                    xDiaProp->setPropertyValue(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aTrueBool );
-                }
-                catch( beans::UnknownPropertyException & )
-                {
-                    OSL_FAIL( "Couldn't turn on y axis" );
-                }
-                uno::Reference< chart::XAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                    xProp = xSuppl->getYAxis();
-
-
-                if( mbAddMissingXAxisForNetCharts )
-                {
-                    if( xDiaProp.is() )
-                    {
-                        try
-                        {
-                            xDiaProp->setPropertyValue(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), uno::makeAny(sal_True) );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                            OSL_FAIL( "Couldn't turn on x axis" );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                try
-                {
-                    xDiaProp->setPropertyValue(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aTrueBool );
-                }
-                catch( beans::UnknownPropertyException & )
-                {
-                    OSL_FAIL( "Couldn't turn on second y axis" );
-                }
-                uno::Reference< chart::XTwoAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is())
-                    xProp = xSuppl->getSecondaryYAxis();
-            }
-            break;
-
-        case SCH_XML_AXIS_Z:
-            {
-                bool bSettingZAxisSuccedded = false;
-                try
-                {
-                    rtl::OUString sHasZAxis( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )) );
-                    xDiaProp->setPropertyValue( sHasZAxis, aTrueBool );
-                    xDiaProp->getPropertyValue( sHasZAxis ) >>= bSettingZAxisSuccedded;
-                }
-                catch( beans::UnknownPropertyException & )
-                {
-                    OSL_FAIL( "Couldn't turn on z axis" );
-                }
-                if( bSettingZAxisSuccedded )
-                {
-                    uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                    if( xSuppl.is())
-                        xProp = xSuppl->getZAxis();
-                }
-            }
-            break;
-        case SCH_XML_AXIS_UNDEF:
-            // nothing
-            break;
-    }
-
-    // set properties
-    if( xProp.is())
-    {
-        // #i109879# the line color is black as default, in the model it is a light gray
-        xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
-                                     uno::makeAny( COL_BLACK ));
-
-        xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DisplayLabels" )), aFalseBool );
-
-        // #88077# AutoOrigin 'on' is default
-        xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )), aTrueBool );
-
-        if( msAutoStyleName.getLength())
-        {
-            const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext();
-            if( pStylesCtxt )
-            {
-                const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(
-                    mrImportHelper.GetChartFamilyID(), msAutoStyleName );
-
-                if( pStyle && pStyle->ISA( XMLPropStyleContext ))
-                {
-                    // note: SvXMLStyleContext::FillPropertySet is not const
-                    XMLPropStyleContext * pPropStyleContext = const_cast< XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle ));
-                    if( pPropStyleContext )
-                        pPropStyleContext->FillPropertySet( xProp );
-
-                    if( mbAdaptWrongPercentScaleValues && maCurrentAxis.eClass==SCH_XML_AXIS_Y )
-                    {
-                        //set scale data of added x axis back to default
-                        uno::Reference< chart2::XAxis > xAxis( lcl_getAxis( GetImport().GetModel(),
-                                            1 /*nDimensionIndex*/, maCurrentAxis.nIndexInCategory /*nAxisIndex*/ ) );
-                        if( xAxis.is() )
-                        {
-                            chart2::ScaleData aScaleData( xAxis->getScaleData());
-                            if( lcl_AdaptWrongPercentScaleValues(aScaleData) )
-                                xAxis->setScaleData( aScaleData );
-                        }
-                    }
-
-                    if( mbAddMissingXAxisForNetCharts )
-                    {
-                        //copy style from y axis to added x axis:
-                        
-                        uno::Reference< chart::XAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                        if( xSuppl.is() )
-                        {
-                            uno::Reference< beans::XPropertySet > xXAxisProp( xSuppl->getXAxis() );
-                            (( XMLPropStyleContext* )pStyle )->FillPropertySet( xXAxisProp );
-                        }
-
-                        //set scale data of added x axis back to default
-                        uno::Reference< chart2::XAxis > xAxis( lcl_getAxis( GetImport().GetModel(),
-                                            0 /*nDimensionIndex*/, 0 /*nAxisIndex*/ ) );
-                        if( xAxis.is() )
-                        {
-                            chart2::ScaleData aScaleData;
-                            aScaleData.AxisType = chart2::AxisType::CATEGORY;
-                            aScaleData.Orientation = chart2::AxisOrientation_MATHEMATICAL;
-                            xAxis->setScaleData( aScaleData );
-                        }
-
-                        //set line style of added x axis to invisible
-                        uno::Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY );
-                        if( xNewAxisProp.is() )
-                        {
-                            xNewAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ))
-                                , uno::makeAny(drawing::LineStyle_NONE));
-                        }
-                    }
-
-                    if( mbAdaptXAxisOrientationForOld2DBarCharts && maCurrentAxis.eClass == SCH_XML_AXIS_X )
-                    {
-                        bool bIs3DChart = false;
-                        if( xDiaProp.is() && ( xDiaProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3DChart ) 
-                            && !bIs3DChart )
-                        {	
-                            uno::Reference< chart2::XChartDocument > xChart2Document( GetImport().GetModel(), uno::UNO_QUERY );
-                            if( xChart2Document.is() )
-                            {
-                                uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xChart2Document->getFirstDiagram(), uno::UNO_QUERY );
-                                if( xCooSysCnt.is() )
-                                {
-                                    uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems() );
-                                    if( aCooSysSeq.getLength() )
-                                    {
-                                        bool bSwapXandYAxis = false;
-                                        uno::Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[0] );
-                                        uno::Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY );
-                                        if( xCooSysProp.is() && ( xCooSysProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwapXAndYAxis"))) >>= bSwapXandYAxis )
-                                            && bSwapXandYAxis )
-                                        {
-                                            uno::Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension( 0, maCurrentAxis.nIndexInCategory );
-                                            if( xAxis.is() )
-                                            {
-                                                chart2::ScaleData aScaleData = xAxis->getScaleData();
-                                                aScaleData.Orientation = chart2::AxisOrientation_REVERSE;
-                                                xAxis->setScaleData( aScaleData );
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    m_rbAxisPositionAttributeImported = m_rbAxisPositionAttributeImported || SchXMLTools::getPropertyFromContext(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CrossoverPosition")), pPropStyleContext, pStylesCtxt ).hasValue();
-                }
-            }
-        }
-    }
-}
-
-void SchXMLAxisContext::SetAxisTitle()
-{
-    // add new Axis to list
-    maAxes.push_back( maCurrentAxis );
-
-    // set axis at chart
-    sal_Bool bHasTitle = ( maCurrentAxis.aTitle.getLength() > 0 );
-    uno::Reference< frame::XModel > xDoc( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
-
-    switch( maCurrentAxis.eClass )
-    {
-        case SCH_XML_AXIS_X:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                uno::Reference< chart::XAxisXSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() &&
-                    bHasTitle )
-                {
-                    uno::Reference< beans::XPropertySet > xTitleProp( xSuppl->getXAxisTitle(), uno::UNO_QUERY );
-                    if( xTitleProp.is())
-                    {
-                        try
-                        {
-                            uno::Any aAny;
-                            aAny <<= maCurrentAxis.aTitle;
-                            xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                            OSL_FAIL( "Property String for Title not available" );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                uno::Reference< chart::XSecondAxisTitleSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() &&
-                    bHasTitle )
-                {
-                    uno::Reference< beans::XPropertySet > xTitleProp( xSuppl->getSecondXAxisTitle(), uno::UNO_QUERY );
-                    if( xTitleProp.is())
-                    {
-                        try
-                        {
-                            uno::Any aAny;
-                            aAny <<= maCurrentAxis.aTitle;
-                            xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                            OSL_FAIL( "Property String for Title not available" );
-                        }
-                    }
-                }
-            }
-            break;
-
-        case SCH_XML_AXIS_Y:
-            if( maCurrentAxis.nIndexInCategory == 0 )
-            {
-                uno::Reference< chart::XAxisYSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() &&
-                    bHasTitle )
-                {
-                    uno::Reference< beans::XPropertySet > xTitleProp( xSuppl->getYAxisTitle(), uno::UNO_QUERY );
-                    if( xTitleProp.is())
-                    {
-                        try
-                        {
-                            uno::Any aAny;
-                            aAny <<= maCurrentAxis.aTitle;
-                            xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                                OSL_FAIL( "Property String for Title not available" );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                uno::Reference< chart::XSecondAxisTitleSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() &&
-                    bHasTitle )
-                {
-                    uno::Reference< beans::XPropertySet > xTitleProp( xSuppl->getSecondYAxisTitle(), uno::UNO_QUERY );
-                    if( xTitleProp.is())
-                    {
-                        try
-                        {
-                            uno::Any aAny;
-                            aAny <<= maCurrentAxis.aTitle;
-                            xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                            OSL_FAIL( "Property String for Title not available" );
-                        }
-                    }
-                }
-            }
-            break;
-
-        case SCH_XML_AXIS_Z:
-            {
-                uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
-                if( xSuppl.is() &&
-                    bHasTitle )
-                {
-                    uno::Reference< beans::XPropertySet > xTitleProp( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
-                    if( xTitleProp.is())
-                    {
-                        try
-                        {
-                            uno::Any aAny;
-                            aAny <<= maCurrentAxis.aTitle;
-                            xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny );
-                        }
-                        catch( beans::UnknownPropertyException & )
-                        {
-                            OSL_FAIL( "Property String for Title not available" );
-                        }
-                    }
-                }
-            }
-            break;
-        case SCH_XML_AXIS_UNDEF:
-            // nothing
-            break;
-    }
-}
-
-SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
-    USHORT p_nPrefix,
-    const rtl::OUString& rLocalName,
-    const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-{
-    SvXMLImportContext* pContext = 0;
-    const SvXMLTokenMap& rTokenMap = mrImportHelper.GetAxisElemTokenMap();
-
-    switch( rTokenMap.Get( p_nPrefix, rLocalName ))
-    {
-        case XML_TOK_AXIS_TITLE:
-        {
-            uno::Reference< drawing::XShape > xTitleShape = getTitleShape();
-            pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), rLocalName,
-                                               maCurrentAxis.aTitle,
-                                               xTitleShape );
-        }
-        break;
-
-        case XML_TOK_AXIS_CATEGORIES:
-            pContext = new SchXMLCategoriesContext( mrImportHelper, GetImport(),
-                                                          p_nPrefix, rLocalName,
-                                                          mrCategoriesAddress );
-            maCurrentAxis.bHasCategories = true;
-            break;
-
-        case XML_TOK_AXIS_GRID:
-        {
-            sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-            sal_Bool bIsMajor = sal_True;		// default value for class is "major"
-            rtl::OUString sAutoStyleName;
-
-            for( sal_Int16 i = 0; i < nAttrCount; i++ )
-            {
-                rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-                rtl::OUString aLocalName;
-                USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
-                if( nPrefix == XML_NAMESPACE_CHART )
-                {
-                    if( IsXMLToken( aLocalName, XML_CLASS ) )
-                    {
-                        if( IsXMLToken( xAttrList->getValueByIndex( i ), XML_MINOR ) )
-                            bIsMajor = sal_False;
-                    }
-                    else if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
-                        sAutoStyleName = xAttrList->getValueByIndex( i );
-                }
-            }
-
-            CreateGrid( sAutoStyleName, bIsMajor );
-
-            // don't create a context => use default context. grid elements are empty
-            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
-        }
-        break;
-
-        default:
-            pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
-            break;
-    }
-
-    return pContext;
-}
-
-void SchXMLAxisContext::EndElement()
-{
-    SetAxisTitle();
+    SchXMLAxisContext::CorrectAxisPositions( uno::Reference< chart2::XChartDocument >( mrImportHelper.GetChartDocument(), uno::UNO_QUERY ), maChartTypeServiceName, GetImport().GetODFVersion(), m_bAxisPositionAttributeImported );
 }
 
 // ========================================
@@ -1612,7 +699,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_CHART )
         {
@@ -1636,43 +723,6 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
 
 // ========================================
 
-SchXMLCategoriesContext::SchXMLCategoriesContext(
-    SchXMLImportHelper& rImpHelper,
-    SvXMLImport& rImport,
-    sal_uInt16 nPrefix,
-    const rtl::OUString& rLocalName,
-    rtl::OUString& rAddress ) :
-        SvXMLImportContext( rImport, nPrefix, rLocalName ),
-        mrImportHelper( rImpHelper ),
-        mrAddress( rAddress )
-{
-}
-
-SchXMLCategoriesContext::~SchXMLCategoriesContext()
-{
-}
-
-void SchXMLCategoriesContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-{
-    sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-
-    for( sal_Int16 i = 0; i < nAttrCount; i++ )
-    {
-        rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-        rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
-        if( nPrefix == XML_NAMESPACE_TABLE &&
-            IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
-        {
-            uno::Reference< chart2::XChartDocument > xNewDoc( GetImport().GetModel(), uno::UNO_QUERY );
-            mrAddress = xAttrList->getValueByIndex( i );
-        }
-    }
-}
-
-// ========================================
-
 SchXMLPositonAttributesHelper::SchXMLPositonAttributesHelper( SvXMLImport& rImporter )
     : m_rImport( rImporter )
     , m_aPosition(0,0)
@@ -1794,7 +844,7 @@ void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         m_rPositioning.readPositioningAttribute( nPrefix, aLocalName, aValue );
     }
 }
@@ -1830,7 +880,7 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if( nPrefix == XML_NAMESPACE_CHART &&
                 IsXMLToken( aLocalName, XML_STYLE_NAME ) )
@@ -1893,7 +943,7 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
         {
             rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
             rtl::OUString aLocalName;
-            USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+            sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
             if( nPrefix == XML_NAMESPACE_CHART &&
                 IsXMLToken( aLocalName, XML_STYLE_NAME ) )
@@ -1970,7 +1020,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_CHART )
         {
@@ -2003,7 +1053,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
 }
 
 SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -2063,7 +1113,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index f16a60ef3a..8bc0410efe 100644..100755
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -127,13 +127,11 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    void CorrectAxisPositions();
-
 private:
     SchXMLImportHelper& mrImportHelper;
     ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram;
@@ -167,47 +165,6 @@ private:
     ::com::sun::star::awt::Size maChartSize;
 };
 
-// ----------------------------------------
-
-class SchXMLAxisContext : public SvXMLImportContext
-{
-private:
-    SchXMLImportHelper& mrImportHelper;
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > mxDiagram;
-    SchXMLAxis maCurrentAxis;
-    std::vector< SchXMLAxis >& maAxes;
-    rtl::OUString msAutoStyleName;
-    rtl::OUString& mrCategoriesAddress;
-    bool mbAddMissingXAxisForNetCharts; //to correct errors from older versions 
-    bool mbAdaptWrongPercentScaleValues; //to correct errors from older versions 
-    bool mbAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions 
-    bool& m_rbAxisPositionAttributeImported;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape();
-    void CreateGrid( ::rtl::OUString sAutoStyleName, sal_Bool bIsMajor );
-    void CreateAxis();
-    void SetAxisTitle();
-
-public:
-    SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
-                       SvXMLImport& rImport, const rtl::OUString& rLocalName,
-                       ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram,
-                       std::vector< SchXMLAxis >& aAxes,
-                       ::rtl::OUString& rCategoriesAddress,
-                       bool bAddMissingXAxisForNetCharts,
-                       bool bAdaptWrongPercentScaleValues,
-                       bool bAdaptXAxisOrientationForOld2DBarCharts,
-                       bool& rbAxisPositionAttributeImported );
-    virtual ~SchXMLAxisContext();
-
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
-    virtual void EndElement();
-    virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
-        const rtl::OUString& rLocalName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
-};
-
 //----------------------------------------
 
 class SchXMLDataPointContext : public SvXMLImportContext
@@ -234,24 +191,6 @@ public:
 
 // ----------------------------------------
 
-class SchXMLCategoriesContext : public SvXMLImportContext
-{
-private:
-    SchXMLImportHelper& mrImportHelper;
-    rtl::OUString& mrAddress;
-
-public:
-    SchXMLCategoriesContext( SchXMLImportHelper& rImpHelper,
-                                   SvXMLImport& rImport,
-                                   sal_uInt16 nPrefix,
-                                   const rtl::OUString& rLocalName,
-                                   rtl::OUString& rAddress );
-    virtual ~SchXMLCategoriesContext();
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
-};
-
-// ----------------------------------------
-
 class SchXMLCoordinateRegionContext : public SvXMLImportContext
 {
 public:
@@ -349,7 +288,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 248a282437..73146c4490 100644..100755
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -53,7 +53,7 @@
 // header for define DBG_ERROR1
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "SchXMLImport.hxx"
@@ -116,7 +116,7 @@ void SchXMLDomain2Context::StartElement( const uno::Reference< xml::sax::XAttrib
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_TABLE &&
             IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
@@ -317,7 +317,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
         rtl::OUString aValue = xAttrList->getValueByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -335,7 +335,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
                     for( sal_Int32 nCurrent = 0; nCurrent < nNumOfAxes; nCurrent++ )
                     {
                         if( aValue.equals( mrAxes[ nCurrent ].aName ) &&
-                            mrAxes[ nCurrent ].eClass == SCH_XML_AXIS_Y )
+                            mrAxes[ nCurrent ].eDimension == SCH_XML_AXIS_Y )
                         {
                             mpAttachedAxis = &( mrAxes[ nCurrent ] );
                         }
@@ -363,7 +363,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
 
     if( mpAttachedAxis )
     {
-        if( mpAttachedAxis->nIndexInCategory > 0 )
+        if( mpAttachedAxis->nAxisIndex > 0 )
         {
             // secondary axis => property has to be set (primary is default)
             mnAttachedAxis = 2;
@@ -634,7 +634,7 @@ void SchXMLSeries2Context::EndElement()
 }
 
 SvXMLImportContext* SchXMLSeries2Context::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >&  )
 {
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 274eaa24a2..6327421da0 100644..100755
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -97,7 +97,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index c2a07cae75..c2a07cae75 100644..100755
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index 0c5b03eee7..0c5b03eee7 100644..100755
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 615dd2f083..a79420c9e3 100644..100755
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -38,16 +38,16 @@
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -328,7 +328,7 @@ SchXMLTableContext::~SchXMLTableContext()
 }
 
 SvXMLImportContext *SchXMLTableContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -375,13 +375,20 @@ void SchXMLTableContext::StartElement( const uno::Reference< xml::sax::XAttribut
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
-
-        if( nPrefix == XML_NAMESPACE_TABLE &&
-            IsXMLToken( aLocalName, XML_NAME ) )
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        if ( nPrefix == XML_NAMESPACE_TABLE )
         {
-            mrTable.aTableNameOfFile = xAttrList->getValueByIndex( i );
-            break;	 // we only need this attribute
+            if ( IsXMLToken( aLocalName, XML_NAME ) )
+            {
+                mrTable.aTableNameOfFile = xAttrList->getValueByIndex( i );
+            }
+            else if ( IsXMLToken( aLocalName, XML_PROTECTED ) )
+            {
+                if ( IsXMLToken( xAttrList->getValueByIndex( i ), XML_TRUE ) )
+                {
+                    mrTable.bProtected = true;
+                }
+            }
         }
     }
 }
@@ -518,7 +525,7 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext()
 }
 
 SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -561,7 +568,7 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if( nPrefix == XML_NAMESPACE_TABLE &&
             IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
@@ -623,7 +630,7 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext()
 }
 
 SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -669,7 +676,7 @@ SchXMLTableRowContext::~SchXMLTableRowContext()
 }
 
 SvXMLImportContext* SchXMLTableRowContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -705,12 +712,13 @@ private:
 
 public:
     SchXMLRangeSomewhereContext( SvXMLImport& rImport,
+                            sal_uInt16 nPrefix,
                             const ::rtl::OUString& rLocalName,
                             ::rtl::OUString& rRangeString );
     virtual ~SchXMLRangeSomewhereContext();
     
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
@@ -754,7 +762,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
     for( sal_Int16 i = 0; i < nAttrCount; i++ )
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
         {
@@ -794,7 +802,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
 }
 
 SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -819,7 +827,7 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
     {
         //#i113950# previously the range was exported to attribute text:id, but that attribute does not allow arbitrary strings anymore
         //so we need to find an alternative to save that range info for copy/paste scenario ... -> use description at an empty group element for now
-        pContext = new SchXMLRangeSomewhereContext( GetImport(), rLocalName, maRangeId );
+        pContext = new SchXMLRangeSomewhereContext( GetImport(), nPrefix, rLocalName, maRangeId );
     }
     else
     {
@@ -839,15 +847,25 @@ void SchXMLTableCellContext::EndElement()
 
 // ========================================
 
-void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< OUString >& rComplexLabel )
+void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< uno::Any >& rComplexLabel )
 {
     if( rCell.eType == SCH_CELL_TYPE_STRING )
     {
         rComplexLabel.realloc(1);
-        rComplexLabel[0] = rCell.aString;
+        rComplexLabel[0] = uno::makeAny( rCell.aString );
     }
     else if( rCell.pComplexString && rCell.eType == SCH_CELL_TYPE_COMPLEX_STRING )
-        rComplexLabel = *rCell.pComplexString;
+    {
+        sal_Int32 nCount = rCell.pComplexString->getLength();
+        rComplexLabel.realloc( nCount );
+        for( sal_Int32 nN=0; nN<nCount; nN++)
+            rComplexLabel[nN] = uno::makeAny((*rCell.pComplexString)[nN]);
+    }
+    else if( rCell.eType == SCH_CELL_TYPE_FLOAT )
+    {
+        rComplexLabel.realloc(1);
+        rComplexLabel[0] = uno::makeAny( rCell.fValue );
+    }
 }
 
 void SchXMLTableHelper::applyTableToInternalDataProvider(
@@ -878,8 +896,8 @@ void SchXMLTableHelper::applyTableToInternalDataProvider(
     }
     
     Sequence< Sequence< double > > aDataInRows( nNumRows );
-    Sequence< Sequence< OUString > > aComplexRowDescriptions( nNumRows );
-    Sequence< Sequence< OUString > > aComplexColumnDescriptions( nNumColumns );
+    Sequence< Sequence< uno::Any > > aComplexRowDescriptions( nNumRows );
+    Sequence< Sequence< uno::Any > > aComplexColumnDescriptions( nNumColumns );
     for( sal_Int32 i=0; i<nNumRows; ++i )
         aDataInRows[i].realloc( nNumColumns );
 
@@ -919,15 +937,28 @@ void SchXMLTableHelper::applyTableToInternalDataProvider(
     }
 
     //apply the collected data to the chart
-    Reference< chart::XComplexDescriptionAccess > xDataAccess( xDataProv, uno::UNO_QUERY );
+    Reference< chart2::XAnyDescriptionAccess > xDataAccess( xDataProv, uno::UNO_QUERY );
     if( !xDataAccess.is() )
         return;
 
     xDataAccess->setData( aDataInRows );
     if( rTable.bHasHeaderColumn )
-        xDataAccess->setComplexRowDescriptions( aComplexRowDescriptions );
+        xDataAccess->setAnyRowDescriptions( aComplexRowDescriptions );
     if( rTable.bHasHeaderRow )
-        xDataAccess->setComplexColumnDescriptions( aComplexColumnDescriptions );
+        xDataAccess->setAnyColumnDescriptions( aComplexColumnDescriptions );
+
+    if ( rTable.bProtected )
+    {
+        try
+        {
+            Reference< beans::XPropertySet > xProps( xChartDoc, uno::UNO_QUERY_THROW );
+            xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ), uno::makeAny( sal_True ) );
+            xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ), uno::makeAny( sal_True ) );
+        }
+        catch ( uno::Exception& )
+        {
+        }
+    }
 }
 
 void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
@@ -1189,9 +1220,10 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
 //---------------------------------------------------------------------------------------------------
 
 SchXMLRangeSomewhereContext::SchXMLRangeSomewhereContext( SvXMLImport& rImport,
+                                                sal_uInt16 nPrefix,
                                                 const OUString& rLocalName,
                                                 OUString& rRangeString ) :
-        SvXMLImportContext( rImport, XML_NAMESPACE_TEXT, rLocalName ),
+        SvXMLImportContext( rImport, nPrefix, rLocalName ),
         mrRangeString( rRangeString )
 {
 }
@@ -1201,7 +1233,7 @@ SchXMLRangeSomewhereContext::~SchXMLRangeSomewhereContext()
 }
 
 SvXMLImportContext* SchXMLRangeSomewhereContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 6106033199..428dc34069 100644..100755
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -69,7 +69,7 @@ public:
     virtual ~SchXMLTableContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -132,7 +132,7 @@ public:
     virtual ~SchXMLTableColumnsContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -172,7 +172,7 @@ public:
     virtual ~SchXMLTableRowsContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -193,7 +193,7 @@ public:
     virtual ~SchXMLTableRowContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
@@ -219,7 +219,7 @@ public:
     virtual ~SchXMLTableCellContext();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index d3c42b0a5d..8ee635dc0e 100644..100755
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -33,7 +33,7 @@
 #include "SchXMLTextListContext.hxx"
 #include "SchXMLParagraphContext.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
@@ -53,7 +53,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -82,7 +82,7 @@ void SchXMLListItemContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLListItemContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName,
+    sal_uInt16 nPrefix, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
@@ -122,7 +122,7 @@ void SchXMLTextListContext::EndElement()
 }
 
 SvXMLImportContext* SchXMLTextListContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName,
+    sal_uInt16 nPrefix, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
index 1e7cb5bb66..94d518690c 100644..100755
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -47,7 +47,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext* CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 41a0fc9dab..bef5c27e87 100644..100755
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -46,7 +46,7 @@
 // header for class XMLPropertySetMapper
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -179,7 +179,7 @@ static SvXMLEnumMapEntry aXMLChartClassMap[] =
 
 SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName )
 {
-    USHORT nEnumVal = XML_CHART_CLASS_UNKNOWN;
+    sal_uInt16 nEnumVal = XML_CHART_CLASS_UNKNOWN;
     if( !SvXMLUnitConverter::convertEnum(
                                     nEnumVal, rClassName, aXMLChartClassMap ) )
         nEnumVal = XML_CHART_CLASS_UNKNOWN;
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 3027585f43..3027585f43 100644..100755
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index ff60b399f9..ff60b399f9 100644..100755
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index be77844740..be77844740 100644..100755
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index 168d931887..168d931887 100644..100755
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index 12969e74db..12969e74db 100644..100755
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index d64317cc00..9176e196e8 100644..100755
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLChartStyleContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/families.hxx>
 
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 57c0311a61..57c0311a61 100644..100755
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
index a77c25b06f..a77c25b06f 100644..100755
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 9cc566a8a4..9cc566a8a4 100644..100755
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index a09a055938..a09a055938 100644..100755
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 2865424730..8b40a87380 100644..100755
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -33,7 +33,7 @@
 #include "SchXMLParagraphContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 813f400b67..6388af63dc 100644..100755
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -43,7 +43,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index 4a14dcc435..64b3ec8ec7 100644..100755
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -31,7 +31,7 @@
 #include "XMLSymbolImageContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index f25b739fe1..79ee35a4bd 100644..100755
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -47,7 +47,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index b2d224104b..b2d224104b 100644..100755
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index f8787dcbee..f8787dcbee 100644..100755
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx
index 6ed303ae7e..6ed303ae7e 100644..100755
--- a/xmloff/source/chart/XMLTextOrientationHdl.cxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx
index 76684c09b7..76684c09b7 100644..100755
--- a/xmloff/source/chart/XMLTextOrientationHdl.hxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index b5a9d959bc..6983cfab35 100644..100755
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "SchXMLImport.hxx"
@@ -86,7 +86,7 @@ SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext(
 
 SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper,
                                     SvXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const rtl::OUString& rLName ) :
         SvXMLImportContext( rImport, nPrefix, rLName ),
         mrImportHelper( rImpHelper )
@@ -151,7 +151,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
 SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl(
         SchXMLImportHelper& i_rImpHelper,
         SchXMLImport& i_rImport,
-        USHORT i_nPrefix, const ::rtl::OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
     SvXMLImportContext(i_rImport, i_nPrefix, i_rLName),
@@ -165,7 +165,7 @@ SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { }
 
 
 SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
-    USHORT i_nPrefix, const ::rtl::OUString& i_rLocalName,
+    sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
 {
     // behave like meta base class iff we encounter office:meta
@@ -184,7 +184,7 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
 
 SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper,
                                       SvXMLImport& rImport,
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const rtl::OUString& rLName ) :
         SvXMLImportContext( rImport, nPrefix, rLName ),
         mrImportHelper( rImpHelper )
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index f5d9186b17..e817df4a8e 100644..100755
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -78,14 +78,14 @@ public:
     SchXMLFlatDocContext_Impl(
         SchXMLImportHelper& i_rImpHelper,
         SchXMLImport& i_rImport,
-        USHORT i_nPrefix, const ::rtl::OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString & i_rLName,
         const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>& i_xDocBuilder);
 
     virtual ~SchXMLFlatDocContext_Impl();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT i_nPrefix, const ::rtl::OUString& i_rLocalName,
+        sal_uInt16 i_nPrefix, const ::rtl::OUString& i_rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList);
 };
 
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
index bfdc9aeb5e..3151d633d1 100644..100755
--- a/xmloff/source/chart/makefile.mk
+++ b/xmloff/source/chart/makefile.mk
@@ -45,11 +45,14 @@ SLOFILES =	$(SLO)$/ColorPropertySet.obj \
             $(SLO)$/contexts.obj \
             $(SLO)$/SchXMLTableContext.obj \
             $(SLO)$/SchXMLChartContext.obj \
+            $(SLO)$/SchXMLLegendContext.obj \
             $(SLO)$/SchXMLPlotAreaContext.obj \
+            $(SLO)$/SchXMLAxisContext.obj \
             $(SLO)$/SchXMLParagraphContext.obj \
             $(SLO)$/SchXMLTextListContext.obj \
             $(SLO)$/SchXMLSeriesHelper.obj \
             $(SLO)$/SchXMLSeries2Context.obj \
+            $(SLO)$/SchXMLEnumConverter.obj \
             $(SLO)$/PropertyMaps.obj \
             $(SLO)$/XMLChartStyleContext.obj \
             $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \
diff --git a/xmloff/source/chart/transporttypes.cxx b/xmloff/source/chart/transporttypes.cxx
index 7e58c701c2..7e58c701c2 100644..100755
--- a/xmloff/source/chart/transporttypes.cxx
+++ b/xmloff/source/chart/transporttypes.cxx
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 0f5d569a8c..2563764856 100644..100755
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -88,12 +88,15 @@ struct SchXMLTable
 
     ::std::vector< sal_Int32 > aHiddenColumns;
 
+    bool bProtected;
+
     SchXMLTable() : nRowIndex( -1 ),
                     nColumnIndex( -1 ),
                     nMaxColumnIndex( -1 ),
                     nNumberOfColsEstimate( 0 ),
                     bHasHeaderRow( false ),
-                    bHasHeaderColumn( false )
+                    bHasHeaderColumn( false ),
+                    bProtected( false )
     {}
 };
 
@@ -133,7 +136,7 @@ struct SchNumericCellRangeAddress
 
 // ----------------------------------------
 
-enum SchXMLAxisClass
+enum SchXMLAxisDimension
 {
     SCH_XML_AXIS_X = 0,
     SCH_XML_AXIS_Y,
@@ -143,13 +146,13 @@ enum SchXMLAxisClass
 
 struct SchXMLAxis
 {
-    enum SchXMLAxisClass eClass;
-    sal_Int8 nIndexInCategory;
+    enum SchXMLAxisDimension eDimension;
+    sal_Int8 nAxisIndex;//0->primary axis; 1->secondary axis
     rtl::OUString aName;
     rtl::OUString aTitle;
     bool bHasCategories;
 
-    SchXMLAxis() : eClass( SCH_XML_AXIS_UNDEF ), nIndexInCategory( 0 ), bHasCategories( false ) {}
+    SchXMLAxis() : eDimension( SCH_XML_AXIS_UNDEF ), nAxisIndex( 0 ), bHasCategories( false ) {}
 };
 
 // ----------------------------------------
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 337879b674..f0a9922a93 100644..100755
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
@@ -167,7 +167,7 @@ protected:
     com::sun::star::uno::Any&	mrAny;
     XMLConfigBaseContext*		mpBaseContext;
 public:
-    XMLConfigBaseContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigBaseContext();
@@ -187,7 +187,7 @@ class XMLConfigItemContext : public SvXMLImportContext
     XMLConfigBaseContext*		mpBaseContext;
 
 public:
-    XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
@@ -195,7 +195,7 @@ public:
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -211,14 +211,14 @@ public:
 class XMLConfigItemSetContext : public XMLConfigBaseContext
 {
 public:
-    XMLConfigItemSetContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemSetContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -231,14 +231,14 @@ public:
 class XMLConfigItemMapNamedContext : public XMLConfigBaseContext
 {
 public:
-    XMLConfigItemMapNamedContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rAny,
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemMapNamedContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -254,7 +254,7 @@ private:
     rtl::OUString maConfigItemName;
 
 public:
-    XMLConfigItemMapIndexedContext(SvXMLImport& rImport, USHORT nPrfx,
+    XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -263,7 +263,7 @@ public:
                                     XMLConfigBaseContext* pBaseContext);
     virtual ~XMLConfigItemMapIndexedContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -273,7 +273,7 @@ public:
 
 //=============================================================================
 
-SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT p_nPrefix,
+SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix,
                         const rtl::OUString& rLocalName,
                         const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                         beans::PropertyValue& rProp, XMLConfigBaseContext* pBaseContext)
@@ -286,7 +286,7 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, USHORT p_nPrefix
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -347,7 +347,7 @@ struct XMLDocumentSettingsContext_Data
 
 //=============================================================================
 
-XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                     const uno::Reference<xml::sax::XAttributeList>& )
     : SvXMLImportContext( rImport, nPrfx, rLName )
     , m_pData( new XMLDocumentSettingsContext_Data )
@@ -359,7 +359,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext()
 {
 }
 
-SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT p_nPrefix,
+SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -372,7 +372,7 @@ SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( USHORT p_nPr
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -508,7 +508,7 @@ void XMLDocumentSettingsContext::EndElement()
 
 //=============================================================================
 
-XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLName, com::sun::star::uno::Any& rTempAny,
         XMLConfigBaseContext* pTempBaseContext)
     : SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -526,7 +526,7 @@ XMLConfigBaseContext::~XMLConfigBaseContext()
 
 //=============================================================================
 
-XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
@@ -541,7 +541,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -558,7 +558,7 @@ void XMLConfigItemSetContext::EndElement()
 
 //=============================================================================
 
-XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                     com::sun::star::uno::Any& rTempAny,
@@ -574,7 +574,7 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, USHORT nPrfx, c
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -590,7 +590,7 @@ XMLConfigItemContext::~XMLConfigItemContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& )
@@ -760,7 +760,7 @@ void XMLConfigItemContext::ManipulateConfigItem()
 
 //=============================================================================
 
-XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
                                     com::sun::star::uno::Any& rAny,
@@ -773,7 +773,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -795,7 +795,7 @@ void XMLConfigItemMapNamedContext::EndElement()
 
 //=============================================================================
 
-XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, USHORT nPrfx,
+XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::xml::sax::XAttributeList>&,
@@ -811,7 +811,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext()
 {
 }
 
-SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index aedc4989e1..439b035ff7 100644..100755
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -33,7 +33,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
@@ -69,13 +69,13 @@ using rtl::OUString;
 // helper functions; implemented below
 Reference<XNode> lcl_createDomInstance();
 Reference<XNode> lcl_createElement( SvXMLImport& rImport,
-                                    USHORT nPrefix, 
+                                    sal_uInt16 nPrefix, 
                                     const OUString rLocalName,
                                     Reference<XNode> xParent);
 
 
 DomBuilderContext::DomBuilderContext( SvXMLImport& rImport, 
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const OUString& rLocalName ) :
     SvXMLImportContext( rImport, nPrefix, rLocalName ),
     mxNode( lcl_createElement( rImport, nPrefix, rLocalName, 
@@ -87,7 +87,7 @@ DomBuilderContext::DomBuilderContext( SvXMLImport& rImport,
 }
 
 DomBuilderContext::DomBuilderContext( SvXMLImport& rImport, 
-                                      USHORT nPrefix,
+                                      sal_uInt16 nPrefix,
                                       const OUString& rLocalName,
                                       Reference<XNode>& xParent ) :
     SvXMLImportContext( rImport, nPrefix, rLocalName ),
@@ -115,7 +115,7 @@ Reference<XNode> DomBuilderContext::getNode()
 
 
 SvXMLImportContext* DomBuilderContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& )
 {
@@ -215,7 +215,7 @@ Reference<XNode> lcl_createDomInstance()
 }
 
 Reference<XNode> lcl_createElement( SvXMLImport& rImport,
-                                    USHORT nPrefix, 
+                                    sal_uInt16 nPrefix, 
                                     const OUString rLocalName,
                                     Reference<XNode> xParent)
 {
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index 5ea88ceba6..1f179a88a5 100644..100755
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -33,7 +33,7 @@
 
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index d20c9a0a73..d20c9a0a73 100644..100755
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 584c924c57..584c924c57 100644..100755
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index c972cfe584..2d859fd68a 100644..100755
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -30,7 +30,7 @@
 
 #include "RDFaExportHelper.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index a31f9dff71..a31f9dff71 100644..100755
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 3d0c2370c5..12444ec6d9 100644..100755
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <xmloff/SettingsExportHelper.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
@@ -204,6 +204,7 @@ void XMLSettingsExportHelper::exportBool(const sal_Bool bValue, const rtl::OUStr
 
 void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUString& rName) const
 {
+#if 0
     DBG_ASSERT(rName.getLength(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_BYTE );
@@ -212,6 +213,13 @@ void XMLSettingsExportHelper::exportByte(const sal_Int8 nValue, const rtl::OUStr
     SvXMLUnitConverter::convertNumber(sBuffer, sal_Int32(nValue));
     m_rContext.Characters( sBuffer.makeStringAndClear() );
     m_rContext.EndElement( sal_False );
+#else
+    (void) nValue; (void) rName;
+    OSL_ENSURE(false, "XMLSettingsExportHelper::exportByte(): #i114162#:\n"
+        "config-items of type \"byte\" are not valid ODF, "
+        "so storing them is disabled!\n"
+        "Use a different type instead (e.g. \"short\").");
+#endif
 }
 void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const rtl::OUString& rName) const
 {
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index d07067ee4f..bab3e02212 100644..100755
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index a32b1e8ce5..9bfecaf1fe 100644..100755
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -46,7 +46,7 @@ TYPEINIT1( XMLBase64ImportContext, SvXMLImportContext );
 
 
 XMLBase64ImportContext::XMLBase64ImportContext(
-        SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
+        SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList >&,
         const Reference< XOutputStream >& rOut ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index 36cb0469d9..36cb0469d9 100644..100755
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index f076788a99..a978054923 100644..100755
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 
 using ::rtl::OUString;
 
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index a46a783d7a..28d4990f93 100644..100755
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -38,11 +38,11 @@
 #include <sot/clsids.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/attrlist.hxx>
-#include "XMLFilterServiceNames.h"
+#include "xmloff/XMLFilterServiceNames.h"
 #include "XMLEmbeddedObjectImportContext.hxx"
 
 using ::rtl::OUString;
@@ -88,14 +88,14 @@ class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext
 public:
     TYPEINFO();
 
-    XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, USHORT nPrfx,
+    XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::xml::sax::XDocumentHandler >& rHandler );
 
     virtual ~XMLEmbeddedObjectImportContext_Impl();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -109,7 +109,7 @@ public:
 TYPEINIT1( XMLEmbeddedObjectImportContext_Impl, SvXMLImportContext );
 
 XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl(
-        SvXMLImport& rImport, USHORT nPrfx,
+        SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
         const Reference< XDocumentHandler >& rHandler ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -122,7 +122,7 @@ XMLEmbeddedObjectImportContext_Impl::~XMLEmbeddedObjectImportContext_Impl()
 }
 
 SvXMLImportContext *XMLEmbeddedObjectImportContext_Impl::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const Reference< XAttributeList >& )
 {
@@ -190,7 +190,7 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
 }
 
 XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
-        SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName,
+        SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList >& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
@@ -280,7 +280,7 @@ XMLEmbeddedObjectImportContext::~XMLEmbeddedObjectImportContext()
 }
 
 SvXMLImportContext *XMLEmbeddedObjectImportContext::CreateChildContext(
-        USHORT nPrefix, const OUString& rLocalName,
+        sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< XAttributeList >& )
 {
     if( xHandler.is() )
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index b70de47183..b70de47183 100644..100755
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 5234c8dfec..c6b07dcb87 100644..100755
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -41,7 +41,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
-#include "xmlreg.hxx"
+#include "xmloff/xmlreg.hxx"
 
 using namespace com::sun::star;
 
@@ -169,117 +169,6 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices )
-{
-    uno::Reference< registry::XRegistryKey > xNewKey(
-        pRegistryKey->createKey(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) );
-
-    for( sal_Int32 i = 0; i < rServices.getLength(); i++ )
-        xNewKey->createKey( rServices.getConstArray()[i]);
-}
-
-#define WRITEINFO(className)\
-    writeInfo( pKey, className##_getImplementationName(), className##_getSupportedServiceNames() )
-
-XMLOFF_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-
-            // impress oasis import
-            WRITEINFO( XMLImpressImportOasis );
-            WRITEINFO( XMLImpressStylesImportOasis );
-            WRITEINFO( XMLImpressContentImportOasis );
-            WRITEINFO( XMLImpressMetaImportOasis );
-            WRITEINFO( XMLImpressSettingsImportOasis );
-
-            // impress oasis export
-            WRITEINFO( XMLImpressExportOasis );
-            WRITEINFO( XMLImpressStylesExportOasis );
-            WRITEINFO( XMLImpressContentExportOasis );
-            WRITEINFO( XMLImpressMetaExportOasis );
-            WRITEINFO( XMLImpressSettingsExportOasis );
-
-            // animation import
-            WRITEINFO( AnimationsImport );
-
-            // impress OOo export
-            WRITEINFO( XMLImpressExportOOO );
-            WRITEINFO( XMLImpressStylesExportOOO );
-            WRITEINFO( XMLImpressContentExportOOO );
-            WRITEINFO( XMLImpressMetaExportOOO );
-            WRITEINFO( XMLImpressSettingsExportOOO );
-
-            // draw oasis import
-            WRITEINFO( XMLDrawImportOasis );
-            WRITEINFO( XMLDrawStylesImportOasis );
-            WRITEINFO( XMLDrawContentImportOasis );
-            WRITEINFO( XMLDrawMetaImportOasis );
-            WRITEINFO( XMLDrawSettingsImportOasis );
-
-            // draw oasis export
-            WRITEINFO( XMLDrawExportOasis );
-            WRITEINFO( XMLDrawStylesExportOasis );
-            WRITEINFO( XMLDrawContentExportOasis );
-            WRITEINFO( XMLDrawMetaExportOasis );
-            WRITEINFO( XMLDrawSettingsExportOasis );
-
-            // draw OOo export
-            WRITEINFO( XMLDrawExportOOO );
-            WRITEINFO( XMLDrawStylesExportOOO );
-            WRITEINFO( XMLDrawContentExportOOO );
-            WRITEINFO( XMLDrawMetaExportOOO );
-            WRITEINFO( XMLDrawSettingsExportOOO );
-
-            // drawing layer export
-            WRITEINFO( XMLDrawingLayerExport );
-
-            // impress xml clipboard export
-            WRITEINFO( XMLImpressClipboardExport );
-
-            // chart oasis import
-            WRITEINFO( SchXMLImport );
-            WRITEINFO( SchXMLImport_Meta );
-            WRITEINFO( SchXMLImport_Styles );
-            WRITEINFO( SchXMLImport_Content );
-
-            // chart oasis export
-            WRITEINFO( SchXMLExport_Oasis );
-            WRITEINFO( SchXMLExport_Oasis_Meta );
-            WRITEINFO( SchXMLExport_Oasis_Styles );
-            WRITEINFO( SchXMLExport_Oasis_Content );
-
-            // chart OOo export
-            WRITEINFO( SchXMLExport );
-            WRITEINFO( SchXMLExport_Styles );
-            WRITEINFO( SchXMLExport_Content );
-
-            // meta
-            WRITEINFO( XMLMetaImportComponent );
-            WRITEINFO( XMLMetaExportComponent );
-
-            WRITEINFO( XMLVersionListPersistence );
-
-            // meta OOo
-            WRITEINFO( XMLMetaExportOOO );
-
-            // writer auto text events
-            WRITEINFO( XMLAutoTextEventExport );
-            WRITEINFO( XMLAutoTextEventImport );
-            WRITEINFO( XMLAutoTextEventExportOOO );
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_True;
-}
-
 #define SINGLEFACTORY(classname)\
         if( classname##_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )\
         {\
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 225a5f1219..e3fb3d9828 100644..100755
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -31,13 +31,13 @@
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
 #include <svl/svarray.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 
 using ::rtl::OUString;
 
 class SvI18NMapEntry_Impl
 {
-    USHORT			nKind;
+    sal_uInt16			nKind;
     OUString		aName;
     OUString		aNewName;
 
@@ -45,25 +45,25 @@ public:
 
     const OUString& GetNewName() const { return aNewName; }
 
-    SvI18NMapEntry_Impl( USHORT nKnd, const OUString& rName,
+    SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName,
                          const OUString& rNewName ) :
         nKind( nKnd ),
         aName( rName ),
         aNewName( rNewName )
     {}
 
-    SvI18NMapEntry_Impl( USHORT nKnd, const OUString& rName ) :
+    SvI18NMapEntry_Impl( sal_uInt16 nKnd, const OUString& rName ) :
         nKind( nKnd ),
         aName( rName )
     {}
 
-    BOOL operator==( const SvI18NMapEntry_Impl& r ) const
+    sal_Bool operator==( const SvI18NMapEntry_Impl& r ) const
     {
         return nKind == r.nKind &&
                aName == r.aName;
     }
 
-    BOOL operator<( const SvI18NMapEntry_Impl& r ) const
+    sal_Bool operator<( const SvI18NMapEntry_Impl& r ) const
     {
         return nKind < r.nKind ||
                ( nKind == r.nKind &&
@@ -77,13 +77,13 @@ SV_IMPL_OP_PTRARR_SORT( SvI18NMap_Impl, SvI18NMapEntry_ImplPtr )
 
 // ---------------------------------------------------------------------
 
-SvI18NMapEntry_Impl *SvI18NMap::_Find( USHORT nKind,
+SvI18NMapEntry_Impl *SvI18NMap::_Find( sal_uInt16 nKind,
                                      const OUString& rName ) const
 {
     SvI18NMapEntry_Impl *pRet = 0;
     SvI18NMapEntry_Impl aTst( nKind, rName );
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     if( pImpl->Seek_Entry( &aTst, &nPos ) )
     {
         pRet = (*pImpl)[nPos];
@@ -103,7 +103,7 @@ SvI18NMap::~SvI18NMap()
     delete pImpl;
 }
 
-void SvI18NMap::Add( USHORT nKind, const OUString& rName, 
+void SvI18NMap::Add( sal_uInt16 nKind, const OUString& rName, 
                      const OUString& rNewName )
 {
     SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
@@ -115,7 +115,7 @@ void SvI18NMap::Add( USHORT nKind, const OUString& rName,
     }
 }
 
-const OUString& SvI18NMap::Get( USHORT nKind, const OUString& rName ) const
+const OUString& SvI18NMap::Get( sal_uInt16 nKind, const OUString& rName ) const
 {
     SvI18NMapEntry_Impl *pEntry = _Find( nKind, rName );
     if( pEntry )
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
deleted file mode 100644
index 4d663d3218..0000000000
--- a/xmloff/source/core/makefile.mk
+++ /dev/null
@@ -1,76 +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=xmloff
-TARGET=core
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/unointerfacetouniqueidentifiermapper.obj \
-        $(SLO)$/facreg.obj		\
-        $(SLO)$/xmlcnitm.obj	\
-        $(SLO)$/attrlist.obj	\
-        $(SLO)$/i18nmap.obj		\
-        $(SLO)$/nmspmap.obj		\
-        $(SLO)$/unoatrcn.obj	\
-        $(SLO)$/xmlehelp.obj	\
-        $(SLO)$/xmlerror.obj	\
-        $(SLO)$/xmlexp.obj		\
-        $(SLO)$/xmlictxt.obj	\
-        $(SLO)$/xmlimp.obj		\
-        $(SLO)$/xmltkmap.obj	\
-        $(SLO)$/xmltoken.obj	\
-        $(SLO)$/xmluconv.obj	\
-        $(SLO)$/DomBuilderContext.obj \
-        $(SLO)$/DomExport.obj \
-        $(SLO)$/ProgressBarHelper.obj	\
-        $(SLO)$/PropertySetMerger.obj	\
-        $(SLO)$/SettingsExportHelper.obj	\
-        $(SLO)$/DocumentSettingsContext.obj \
-        $(SLO)$/XMLEmbeddedObjectExportFilter.obj \
-        $(SLO)$/XMLEmbeddedObjectImportContext.obj \
-        $(SLO)$/XMLBase64Export.obj \
-        $(SLO)$/XMLBase64ImportContext.obj \
-        $(SLO)$/XMLBasicExportFilter.obj \
-        $(SLO)$/RDFaImportHelper.obj \
-        $(SLO)$/RDFaExportHelper.obj \
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 813e8a5f80..bc2fae8ee8 100644..100755
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
@@ -469,7 +469,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
                                             OUString *pPrefix,
                                             OUString *pLocalName,
                                             OUString *pNamespace,
-                                            USHORT /*nIdxGuess*/ ) const
+                                            sal_uInt16 /*nIdxGuess*/ ) const
 {
     return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace );
 }
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 8a9fe6d217..9fa6dbe718 100644..100755
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -36,7 +36,7 @@
 
 #include <xmloff/xmlcnimp.hxx>
 
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index e95d09f976..e95d09f976 100644..100755
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index 18b35822bf..fe26cd3250 100644..100755
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <xmloff/xmlcnimp.hxx>
-#include "unoatrcn.hxx"
+#include "xmloff/unoatrcn.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
@@ -53,8 +53,8 @@ SvXMLAttrContainerData::SvXMLAttrContainerData(
     pLNames( new SvXMLAttrContainerData_Impl ),
     pValues( new SvXMLAttrContainerData_Impl )
 {
-    USHORT nCount = rImpl.pLNames->Count();
-    for( USHORT i=0; i<nCount; i++ )
+    sal_uInt16 nCount = rImpl.pLNames->Count();
+    for( sal_uInt16 i=0; i<nCount; i++ )
     {
         aPrefixPoss.Insert( rImpl.aPrefixPoss[i], i );
         pLNames->Insert( new OUString( *(*rImpl.pLNames)[i] ), i );
@@ -77,12 +77,12 @@ SvXMLAttrContainerData::~SvXMLAttrContainerData()
 int SvXMLAttrContainerData::operator ==(
                         const SvXMLAttrContainerData& rCmp ) const
 {
-    BOOL bRet = pLNames->Count() == rCmp.pLNames->Count() &&
+    sal_Bool bRet = pLNames->Count() == rCmp.pLNames->Count() &&
                 aNamespaceMap == rCmp.aNamespaceMap;
     if( bRet )
     {
-        USHORT nCount = pLNames->Count();
-        USHORT i;
+        sal_uInt16 nCount = pLNames->Count();
+        sal_uInt16 i;
         for( i=0; bRet && i < nCount; i++ )
             bRet = aPrefixPoss[i] == rCmp.aPrefixPoss[i];
 
@@ -97,95 +97,95 @@ int SvXMLAttrContainerData::operator ==(
     return (int)bRet;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rLName,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName,
                                               const OUString& rValue )
 {
     aPrefixPoss.Insert( USHRT_MAX, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
                                               const OUString& rNamespace,
                                            const OUString& rLName,
                                             const OUString& rValue )
 {
-    USHORT nPos = aNamespaceMap.Add( rPrefix, rNamespace );
+    sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace );
     aPrefixPoss.Insert( nPos, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
                                            const OUString& rLName,
                                             const OUString& rValue )
 {
-    USHORT nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
+    sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     aPrefixPoss.Insert( nPos, aPrefixPoss.Count() );
     pLNames->Insert( new OUString(rLName), pLNames->Count() );
     pValues->Insert( new OUString(rValue), pValues->Count() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rLName, const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = USHRT_MAX;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rPrefix, const rtl::OUString& rNamespace,
             const rtl::OUString& rLName, const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
-    USHORT nPos = aNamespaceMap.Add( rPrefix, rNamespace );
+    sal_uInt16 nPos = aNamespaceMap.Add( rPrefix, rNamespace );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = nPos;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SvXMLAttrContainerData::SetAt( USHORT i,
+sal_Bool SvXMLAttrContainerData::SetAt( sal_uInt16 i,
             const rtl::OUString& rPrefix,
             const rtl::OUString& rLName,
             const rtl::OUString& rValue )
 {
     if( i >= GetAttrCount() )
-        return FALSE;
+        return sal_False;
 
-    USHORT nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
+    sal_uInt16 nPos = aNamespaceMap.GetIndexByPrefix( rPrefix );
     if( USHRT_MAX == nPos )
-        return FALSE;
+        return sal_False;
 
     *(*pLNames)[i] = rLName;
     *(*pValues)[i] = rValue;
     aPrefixPoss[i] = nPos;
 
-    return TRUE;
+    return sal_True;
 }
 
-void SvXMLAttrContainerData::Remove( USHORT i )
+void SvXMLAttrContainerData::Remove( sal_uInt16 i )
 {
     if( i < GetAttrCount() )
     {
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index 4951fab73e..f4281c516a 100644..100755
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -166,7 +166,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
 
 
     sal_Int32 nLongVal = 0;
-    BOOL bOutLongVal = TRUE;
+    sal_Bool bOutLongVal = sal_True;
     if( nValue > SAL_MAX_INT32 / nMul )
     {
         // A big int is required for calculation
@@ -196,7 +196,7 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
                     rOut.append( (sal_Int32)((nBigVal / nBigFac) % nBig10 ) );
                 }
             }
-            bOutLongVal = FALSE;
+            bOutLongVal = sal_False;
         }
     }
     else
@@ -415,7 +415,7 @@ double SvXMLExportHelper::GetConversionFactor(::rtl::OUStringBuffer& rUnit,
 
 MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, MapUnit eDefaultUnit)
 {
-    sal_Int32 nPos = 0L;
+    sal_Int32 nPos = 0;
     sal_Int32 nLen = rString.getLength();
     MapUnit eRetUnit = eDefaultUnit;
 
diff --git a/xmloff/source/core/xmlenums.hxx b/xmloff/source/core/xmlenums.hxx
index 059d309a46..059d309a46 100644..100755
--- a/xmloff/source/core/xmlenums.hxx
+++ b/xmloff/source/core/xmlenums.hxx
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 91247b08fc..9951eaedcb 100644..100755
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index e7d0ee46b3..9d3e61a245 100644..100755
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -49,7 +49,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -64,20 +64,20 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <GradientStyle.hxx>
-#include <HatchStyle.hxx>
-#include <ImageStyle.hxx>
+#include <xmloff/GradientStyle.hxx>
+#include <xmloff/HatchStyle.hxx>
+#include <xmloff/ImageStyle.hxx>
 #include <TransGradientStyle.hxx>
-#include <MarkerStyle.hxx>
-#include <DashStyle.hxx>
+#include <xmloff/MarkerStyle.hxx>
+#include <xmloff/DashStyle.hxx>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLBase64Export.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "XMLFilterServiceNames.h"
-#include "XMLEmbeddedObjectExportFilter.hxx"
+#include "xmloff/XMLFilterServiceNames.h"
+#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
 #include "XMLBasicExportFilter.hxx"
 #include <osl/mutex.hxx>
 #include <rtl/logfile.hxx>
@@ -86,7 +86,7 @@
 #include "PropertySetMerger.hxx"
 
 #include "svl/urihelper.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include <unotools/docinfohelper.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 34feaa1de0..60c1c89010 100644..100755
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star;
 
 DBG_NAME(SvXMLImportContext)
 TYPEINIT0( SvXMLImportContext );
-SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, USHORT nPrfx,
+SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
                               const OUString& rLName ) :
     mrImport( rImp ),
     mnPrefix( nPrfx ),
@@ -63,7 +63,7 @@ SvXMLImportContext::~SvXMLImportContext()
     DBG_DTOR(SvXMLImportContext,NULL);
 }
 
-SvXMLImportContext *SvXMLImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLImportContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const OUString& rLocalName,
                                             const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0ba243d585..0698e447d9 100644..100755
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -38,7 +38,7 @@
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/xmlictxt.hxx>
@@ -50,7 +50,7 @@
 #include "StyleMap.hxx"
 #include <xmloff/ProgressBarHelper.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -225,7 +225,7 @@ typedef SvXMLImportContext *SvXMLImportContextPtr;
 SV_DECL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr, 20, 5 )
 SV_IMPL_PTRARR( SvXMLImportContexts_Impl, SvXMLImportContextPtr )
 
-SvXMLImportContext *SvXMLImport::CreateContext( USHORT nPrefix,
+SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix,
                                          const OUString& rLocalName,
                                          const uno::Reference< xml::sax::XAttributeList >& )
 {
@@ -653,8 +653,8 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
 
     // Process namespace attributes. This must happen before creating the
     // context, because namespace decaration apply to the element name itself.
-    INT16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-    for( INT16 i=0; i < nAttrCount; i++ )
+    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+    for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
         const OUString& rAttrName = xAttrList->getNameByIndex( i );
         if ( rAttrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:version")) )
@@ -709,13 +709,13 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
 
     // Get element's namespace and local name.
     OUString aLocalName;
-    USHORT nPrefix =
+    sal_uInt16 nPrefix =
         mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
 
     // If there are contexts already, call a CreateChildContext at the topmost
     // context. Otherwise, create a default context.
     SvXMLImportContext *pContext;
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     if( nCount > 0 )
     {
         pContext = (*mpContexts)[nCount - 1]->CreateChildContext( nPrefix,
@@ -773,7 +773,7 @@ rName
 )
     throw(xml::sax::SAXException, uno::RuntimeException)
 {
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     DBG_ASSERT( nCount, "SvXMLImport::endElement: no context left" );
     if( nCount > 0 )
     {
@@ -784,7 +784,7 @@ rName
 #ifdef DBG_UTIL
         // Non product only: check if endElement call matches startELement call.
         OUString aLocalName;
-        USHORT nPrefix =
+        sal_uInt16 nPrefix =
             mpNamespaceMap->GetKeyByAttrName( rName, &aLocalName );
         DBG_ASSERT( pContext->GetPrefix() == nPrefix,
                 "SvXMLImport::endElement: popped context has wrong prefix" );
@@ -814,7 +814,7 @@ rName
 void SAL_CALL SvXMLImport::characters( const OUString& rChars )
     throw(xml::sax::SAXException, uno::RuntimeException)
 {
-    USHORT nCount = mpContexts->Count();
+    sal_uInt16 nCount = mpContexts->Count();
     if( nCount > 0 )
     {
         (*mpContexts)[nCount - 1]->Characters( rChars );
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 505937dd44..901d2978f2 100644..100755
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -61,13 +61,13 @@ public:
         nToken( rEntry.nToken )
     {}
 
-    BOOL operator==( const SvXMLTokenMapEntry_Impl& r ) const
+    sal_Bool operator==( const SvXMLTokenMapEntry_Impl& r ) const
     {
         return nPrefixKey == r.nPrefixKey &&
                sLocalName == r.sLocalName;
     }
 
-    BOOL operator<( const SvXMLTokenMapEntry_Impl& r ) const
+    sal_Bool operator<( const SvXMLTokenMapEntry_Impl& r ) const
     {
         return nPrefixKey < r.nPrefixKey ||
                ( nPrefixKey == r.nPrefixKey &&
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index bdc2678aba..fa7026cd88 100644..100755
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3115,6 +3115,23 @@ namespace xmloff { namespace token {
 
         TOKEN( "outside-minimum",       XML_OUTSIDE_MINIMUM ),
         TOKEN( "outside-maximum",       XML_OUTSIDE_MAXIMUM ),
+        
+        TOKEN( "legend-expansion",      XML_LEGEND_EXPANSION),
+        TOKEN( "legend-expansion-aspect-ratio", XML_LEGEND_EXPANSION_ASPECT_RATIO),
+        TOKEN( "balanced",              XML_BALANCED),
+        TOKEN( "high",                  XML_HIGH),
+        TOKEN( "wide",                  XML_WIDE),
+
+        TOKEN( "axis-type",             XML_AXIS_TYPE ), //#i25706#
+        TOKEN( "date-scale",            XML_DATE_SCALE ),
+        TOKEN( "base-time-unit",        XML_BASE_TIME_UNIT ),
+        TOKEN( "major-interval-value",  XML_MAJOR_INTERVAL_VALUE ),
+        TOKEN( "minor-interval-value",  XML_MINOR_INTERVAL_VALUE ),
+        TOKEN( "major-interval-unit",   XML_MAJOR_INTERVAL_UNIT ),
+        TOKEN( "minor-interval-unit",   XML_MINOR_INTERVAL_UNIT ),
+        
+        TOKEN( "min-value", XML_MIN_VALUE ),
+        TOKEN( "max-value", XML_MAX_VALUE ),
 
 #if OSL_DEBUG_LEVEL > 0
         { 0, NULL, NULL,                       XML_TOKEN_END }
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 86c6e8911c..b40258afa7 100644..100755
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -183,7 +183,7 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue,
     sal_Bool bNeg = sal_False;
     double nVal = 0;
 
-    sal_Int32 nPos = 0L;
+    sal_Int32 nPos = 0;
     const sal_Int32 nLen = rString.getLength();
 
     // skip white space
@@ -576,15 +576,15 @@ sal_Bool SvXMLUnitConverter::convertColor( Color& rColor,
         return sal_False;
 
     rColor.SetRed(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[1] ) * 16 + lcl_gethex( rValue[2] ) ) );
 
     rColor.SetGreen(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[3] ) * 16 + lcl_gethex( rValue[4] ) ) );
 
     rColor.SetBlue(
-        sal::static_int_cast< UINT8 >(
+        sal::static_int_cast< sal_uInt8 >(
             lcl_gethex( rValue[5] ) * 16 + lcl_gethex( rValue[6] ) ) );
 
     return sal_True;
@@ -646,7 +646,7 @@ sal_Bool SvXMLUnitConverter::convertNumber64( sal_Int64& rValue,
     sal_Bool bNeg = sal_False;
     rValue = 0;
 
-    sal_Int32 nPos = 0L;
+    sal_Int32 nPos = 0;
     const sal_Int32 nLen = rString.getLength();
 
     // skip white space
@@ -678,7 +678,7 @@ sal_Bool SvXMLUnitConverter::convertNumber64( sal_Int64& rValue,
 
 /** convert double number to string (using ::rtl::math) */
 void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer,
-    double fNumber, BOOL bWriteUnits) const
+    double fNumber, sal_Bool bWriteUnits) const
 {
     SvXMLUnitConverter::convertDouble(rBuffer, fNumber,
         bWriteUnits, meCoreMeasureUnit, meXMLMeasureUnit);
@@ -686,7 +686,7 @@ void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer,
 
 /** convert double number to string (using ::rtl::math) */
 void SvXMLUnitConverter::convertDouble( OUStringBuffer& rBuffer,
-    double fNumber, BOOL bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit)
+    double fNumber, sal_Bool bWriteUnits, MapUnit eCoreUnit, MapUnit eDstUnit)
 {
     if(MAP_RELATIVE == eCoreUnit)
     {
@@ -715,7 +715,7 @@ void SvXMLUnitConverter::convertDouble( OUStringBuffer& rBuffer, double fNumber)
 
 /** convert string to double number (using ::rtl::math) */
 sal_Bool SvXMLUnitConverter::convertDouble(double& rValue,
-    const OUString& rString, BOOL bLookForUnits) const
+    const ::rtl::OUString& rString, sal_Bool bLookForUnits) const
 {
     if(bLookForUnits)
     {
@@ -841,32 +841,27 @@ void SvXMLUnitConverter::convertTime( OUStringBuffer& rBuffer,
 }
 
 /** convert ISO Time String to double; negative durations allowed */
-sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
-                            const OUString& rString)
+static bool lcl_convertTime( const ::rtl::OUString& rString, sal_Int32& o_rDays, sal_Int32& o_rHours, sal_Int32& o_rMins,
+                        sal_Int32& o_rSecs, sal_Bool& o_rIsNegativeTime, double& o_rFractionalSecs )
 {
     OUString aTrimmed = rString.trim().toAsciiUpperCase();
     const sal_Unicode* pStr = aTrimmed.getStr();
 
     // negative time duration?
-    sal_Bool bIsNegativeDuration = sal_False;
     if ( sal_Unicode('-') == (*pStr) )
     {
-        bIsNegativeDuration = sal_True;
+        o_rIsNegativeTime = sal_True;
         pStr++;
     }
 
     if ( *(pStr++) != sal_Unicode('P') )            // duration must start with "P"
-        return sal_False;
+        return false;
 
-    OUString sDoubleStr;
-    sal_Bool bSuccess = sal_True;
+    ::rtl::OUString sDoubleStr;
+    sal_Bool bSuccess = true;
     sal_Bool bDone = sal_False;
     sal_Bool bTimePart = sal_False;
     sal_Bool bIsFraction = sal_False;
-    sal_Int32 nDays  = 0;
-    sal_Int32 nHours = 0;
-    sal_Int32 nMins  = 0;
-    sal_Int32 nSecs  = 0;
     sal_Int32 nTemp = 0;
 
     while ( bSuccess && !bDone )
@@ -877,7 +872,7 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
         else if ( sal_Unicode('0') <= c && sal_Unicode('9') >= c )
         {
             if ( nTemp >= SAL_MAX_INT32 / 10 )
-                bSuccess = sal_False;
+                bSuccess = false;
             else
             {
                 if ( !bIsFraction )
@@ -895,17 +890,17 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
         {
             if ( c == sal_Unicode('H') )
             {
-                nHours = nTemp;
+                o_rHours = nTemp;
                 nTemp = 0;
             }
             else if ( c == sal_Unicode('M') )
             {
-                nMins = nTemp;
+                o_rMins = nTemp;
                 nTemp = 0;
             }
             else if ( (c == sal_Unicode(',')) || (c == sal_Unicode('.')) )
             {
-                nSecs = nTemp;
+                o_rSecs = nTemp;
                 nTemp = 0;
                 bIsFraction = sal_True;
                 sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0."));
@@ -914,13 +909,13 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
             {
                 if ( !bIsFraction )
                 {
-                    nSecs = nTemp;
+                    o_rSecs = nTemp;
                     nTemp = 0;
                     sDoubleStr = OUString(RTL_CONSTASCII_USTRINGPARAM("0.0"));
                 }
             }
             else
-                bSuccess = sal_False;               // invalid character
+                bSuccess = false;                   // invalid character
         }
         else
         {
@@ -928,7 +923,7 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
                 bTimePart = sal_True;
             else if ( c == sal_Unicode('D') )
             {
-                nDays = nTemp;
+                o_rDays = nTemp;
                 nTemp = 0;
             }
             else if ( c == sal_Unicode('Y') || c == sal_Unicode('M') )
@@ -936,14 +931,28 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
                 //! how many days is a year or month?
 
                 OSL_FAIL("years or months in duration: not implemented");
-                bSuccess = sal_False;
+                bSuccess = false;
             }
             else
-                bSuccess = sal_False;               // invalid character
+                bSuccess = false;                   // invalid character
         }
     }
 
     if ( bSuccess )
+        o_rFractionalSecs = sDoubleStr.toDouble();
+    return bSuccess;
+}
+
+sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
+                            const ::rtl::OUString& rString)
+{
+    sal_Int32 nDays  = 0;
+    sal_Int32 nHours = 0;
+    sal_Int32 nMins  = 0;
+    sal_Int32 nSecs  = 0;
+    sal_Bool bIsNegativeDuration = sal_False;
+    double fFractionalSecs = 0.0;
+    if ( lcl_convertTime( rString, nDays, nHours, nMins, nSecs, bIsNegativeDuration, fFractionalSecs ) )
     {
         if ( nDays )
             nHours += nDays * 24;               // add the days to the hours part
@@ -952,12 +961,11 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
         double fMin = nMins;
         double fSec = nSecs;
         double fSec100 = 0.0;
-        double fFraction = sDoubleStr.toDouble();
         fTempTime = fHour / 24;
         fTempTime += fMin / (24 * 60);
         fTempTime += fSec / (24 * 60 * 60);
         fTempTime += fSec100 / (24 * 60 * 60 * 60);
-        fTempTime += fFraction / (24 * 60 * 60);
+        fTempTime += fFractionalSecs / (24 * 60 * 60);
 
         // negative duration?
         if ( bIsNegativeDuration )
@@ -966,8 +974,9 @@ sal_Bool SvXMLUnitConverter::convertTime( double& fTime,
         }
 
         fTime = fTempTime;
+        return sal_True;
     }
-    return bSuccess;
+    return sal_False;
 }
 
 /** convert util::DateTime to ISO Time String */
@@ -989,33 +998,18 @@ void SvXMLUnitConverter::convertTime( OUStringBuffer& rBuffer,
 sal_Bool SvXMLUnitConverter::convertTime( ::com::sun::star::util::DateTime& rDateTime,
                              const OUString& rString )
 {
-    double fCalculatedTime = 0.0;
-    if( convertTime( fCalculatedTime, rString ) )
-    {
-        // #101357# declare as volatile to prevent optimization
-        // (gcc 3.0.1 Linux)
-        volatile double fTempTime = fCalculatedTime;
-        fTempTime *= 24;
-        double fHoursValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fHoursValue;
-        fTempTime *= 60;
-        double fMinsValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fMinsValue;
-        fTempTime *= 60;
-        double fSecsValue = ::rtl::math::approxFloor (fTempTime);
-        fTempTime -= fSecsValue;
-        double f100SecsValue = 0.0;
-
-        if( fTempTime > 0.00001 )
-            f100SecsValue = fTempTime;
-
+    sal_Int32 nDays = 0, nHours = 0, nMins = 0, nSecs = 0;
+    sal_Bool bIsNegativeDuration = sal_False;
+    double fFractionalSecs = 0.0;
+    if ( lcl_convertTime( rString, nDays, nHours, nMins, nSecs, bIsNegativeDuration, fFractionalSecs ) )
+    {
         rDateTime.Year = 0;
         rDateTime.Month = 0;
         rDateTime.Day = 0;
-        rDateTime.Hours = static_cast < sal_uInt16 > ( fHoursValue );
-        rDateTime.Minutes = static_cast < sal_uInt16 > ( fMinsValue );
-        rDateTime.Seconds = static_cast < sal_uInt16 > ( fSecsValue );
-        rDateTime.HundredthSeconds = static_cast < sal_uInt16 > ( f100SecsValue * 100.0 );
+        rDateTime.Hours = static_cast < sal_uInt16 > ( nHours );
+        rDateTime.Minutes = static_cast < sal_uInt16 > ( nMins );
+        rDateTime.Seconds = static_cast < sal_uInt16 > ( nSecs );
+        rDateTime.HundredthSeconds = static_cast < sal_uInt16 > ( fFractionalSecs * 100.0 );
 
         return sal_True;
     }
@@ -1086,7 +1080,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer,
     }
     rBuffer.append( sal_Int32( aDate.GetYear()));
     rBuffer.append( sal_Unicode('-'));
-    USHORT nTemp = aDate.GetMonth();
+    sal_uInt16 nTemp = aDate.GetMonth();
     if (nTemp < 10)
         rBuffer.append( sal_Unicode('0'));
     rBuffer.append( sal_Int32( nTemp));
@@ -2061,7 +2055,7 @@ bool SvXMLUnitConverter::convertTimeDuration( const OUString& rString, Time& rTi
         else
         {
             if ( c == sal_Unicode('T') )            // "T" starts time part
-                bTimePart = TRUE;
+                bTimePart = sal_True;
             else if ( c == sal_Unicode('D') )
             {
                 nDays = nTemp;
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index fc9dacffa4..fc9dacffa4 100644..100755
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 82f851a0ef..f4b1e0e6fa 100644..100755
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -32,7 +32,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include <xmloff/families.hxx>
@@ -103,6 +103,24 @@ void XMLGraphicsDefaultStyle::SetDefaults()
     Reference< XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), UNO_QUERY ); 
     if( !xDefaults.is() )
         return;
+                                            // SJ: #i114750# 
+    sal_Bool bWordWrapDefault = sal_True;	// initializing with correct odf fo:wrap-option default
+    sal_Int32 nUPD( 0 );
+    sal_Int32 nBuild( 0 );
+    const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild );
+    if ( bBuildIdFound && (
+        ((nUPD >= 600) &&  (nUPD < 700))
+        ||
+        ((nUPD == 300) && (nBuild <= 9535))
+        ||
+        ((nUPD > 300) && (nUPD <= 330))
+    ) )
+        bWordWrapDefault = sal_False;		
+
+    const OUString sTextWordWrap( RTL_CONSTASCII_USTRINGPARAM( "TextWordWrap" ) );
+    Reference< XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo() );
+    if ( xInfo->hasPropertyByName( sTextWordWrap ) )
+        xDefaults->setPropertyValue( sTextWordWrap, Any( bWordWrapDefault ) );
 
     FillPropertySet( xDefaults );
 }
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 28240adda0..5edefd5be8 100644..100755
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -43,11 +43,11 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "XMLStringBufferImportContext.hxx"
 #include <tools/debug.hxx>
@@ -157,7 +157,7 @@ public:
     void EndElement();
 
     SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
@@ -255,7 +255,7 @@ void XMLImageMapObjectContext::EndElement()
 }
 
 SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
@@ -679,7 +679,7 @@ XMLImageMapContext::~XMLImageMapContext()
 }
 
 SvXMLImportContext *XMLImageMapContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 6c381ab953..3e28543678 100644..100755
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 7dce0b8940..12907b4e47 100644..100755
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <XMLNumberStylesExport.hxx>
 #include <XMLNumberStylesImport.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
@@ -521,7 +521,7 @@ public:
         SvXMLImportContext* pSlaveContext );
     virtual ~SdXMLNumberFormatMemberImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
@@ -575,7 +575,7 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext()
 {
 }
 
-SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix,
                            const ::rtl::OUString& rLocalName,
                            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 {
@@ -739,7 +739,7 @@ void SdXMLNumberFormatImportContext::EndElement()
     }
 }
 
-SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) );
 }
diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx
index e2fbec51e5..e2fbec51e5 100644..100755
--- a/xmloff/source/draw/XMLNumberStylesExport.hxx
+++ b/xmloff/source/draw/XMLNumberStylesExport.hxx
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 9af23ddde3..db1abfb844 100644..100755
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 18e8c8d746..18e8c8d746 100644..100755
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 9c0ef4343a..3e8299d62e 100644..100755
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -38,9 +38,9 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/maptype.hxx>
 
 #include "sdpropls.hxx"
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 54c0f67ef5..f4d81c6fe5 100644..100755
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -68,7 +68,7 @@
 #include "sdxmlexp_impl.hxx"
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
@@ -603,12 +603,12 @@ void AnimationsExporterImpl::exportTransitionNode()
                 sTmp.append( sal_Unicode('s'));
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
 
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
                 if( nSubtype != TransitionSubType::DEFAULT )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
                 }
 
@@ -806,28 +806,28 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         nTemp = xNode->getFill();
         if( nTemp != AnimationFill::DEFAULT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Fill) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Fill) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILL, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getFillDefault();
         if( nTemp != AnimationFill::INHERIT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_FillDefault) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_FillDefault) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FILLDEFAULT, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestart();
         if( nTemp != AnimationRestart::DEFAULT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Restart) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Restart) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTART, sTmp.makeStringAndClear() );
         }
 
         nTemp = xNode->getRestartDefault();
         if( nTemp != AnimationRestart::INHERIT )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_RestartDefault) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_RestartDefault) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, sTmp.makeStringAndClear() );
         }
 
@@ -885,7 +885,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
         {
             if( aTemp >>= nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_Endsync) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_Endsync) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ENDSYNC, sTmp.makeStringAndClear() );
             }
         }
@@ -904,7 +904,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                 {
                     if( (pValue->Value >>= nContainerNodeType) && (nContainerNodeType != EffectNodeType::DEFAULT) )
                     {
-                        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nContainerNodeType, getAnimationsEnumMap(Animations_EnumMap_EffectNodeType) );
+                        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nContainerNodeType, getAnimationsEnumMap(Animations_EnumMap_EffectNodeType) );
                         mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, sTmp.makeStringAndClear() );
                     }
                 }
@@ -928,7 +928,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod
                     sal_Int16 nEffectPresetClass = sal_Int16();
                     if( pValue->Value >>= nEffectPresetClass )
                     {
-                        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nEffectPresetClass, getAnimationsEnumMap(Animations_EnumMap_EffectPresetClass) );
+                        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nEffectPresetClass, getAnimationsEnumMap(Animations_EnumMap_EffectPresetClass) );
                         mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, sTmp.makeStringAndClear() );
                     }
                 }
@@ -1027,14 +1027,14 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
             sal_Int16 nTemp = xIter->getSubItem();
             if( nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
                 mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
             }
 
             nTemp = xIter->getIterateType();
             if( nTemp )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_IterateType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_IterateType) );
                 mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, sTmp.makeStringAndClear() );
             }
 
@@ -1106,7 +1106,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
         nTemp = xAnimate->getSubItem();
         if( nTemp )
         {
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_SubItem) );
             mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, sTmp.makeStringAndClear() );
         }
 
@@ -1212,7 +1212,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                 if( ((nNodeType == AnimationNodeType::ANIMATEMOTION ) && (nTemp != AnimationCalcMode::PACED)) || 
                     ((nNodeType != AnimationNodeType::ANIMATEMOTION ) && (nTemp != AnimationCalcMode::LINEAR)) )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_CalcMode) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_CalcMode) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_CALCMODE, sTmp.makeStringAndClear() );
                 }
                     
@@ -1223,7 +1223,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                 nTemp = xAnimate->getAdditive();
                 if( nTemp != AnimationAdditiveMode::REPLACE )
                 {
-                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) );
+                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) );
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ADDITIVE, sTmp.makeStringAndClear() );
                 }
             }
@@ -1302,7 +1302,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
 
             Reference< XAnimateTransform > xTransform( xAnimate, UNO_QUERY_THROW );
             nTemp = xTransform->getTransformType();
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_TransformType) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTemp, getAnimationsEnumMap(Animations_EnumMap_TransformType) );
             mrExport.AddAttribute( XML_NAMESPACE_SVG, XML_TYPE, sTmp.makeStringAndClear() );
         }
         break;
@@ -1313,13 +1313,13 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             eElementToken = XML_TRANSITIONFILTER;
 
             sal_Int16 nTransition = xTransitionFilter->getTransition();
-            SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
             mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
             sal_Int16 nSubtype = xTransitionFilter->getSubtype();
             if( nSubtype != TransitionSubType::DEFAULT )
             {
-                SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
                 mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
             }
 
@@ -1397,7 +1397,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
         }
 
         sal_Int16 nCommand = xCommand->getCommand();
-        SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) );
+        SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) );
         mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() );
 
 // todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0;
@@ -1581,7 +1581,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
                 sTmp.append( (sal_Unicode)'.' );
             }
 
-            SvXMLUnitConverter::convertEnum( sTmp2, (USHORT)pEvent->Trigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) );
+            SvXMLUnitConverter::convertEnum( sTmp2, (sal_uInt16)pEvent->Trigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) );
             
             sTmp.append( sTmp2.makeStringAndClear() );
         }
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 7507a2ac0b..bc795e4a75 100644..100755
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -68,7 +68,7 @@
 #include "sdpropls.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <osl/mutex.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -1263,7 +1263,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
     }
 }
 
-SvXMLImportContext * AnimationNodeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( mxNode.is())
@@ -1280,7 +1280,7 @@ public:
     AnimationsImport( const Reference< XMultiServiceFactory > & rSMgr );
     ~AnimationsImport() throw ();
 
-    SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList);
+    SvXMLImportContext* CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList);
 
     // XInterface
     virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
@@ -1349,7 +1349,7 @@ void SAL_CALL AnimationsImport::release() throw ()
     SvXMLImport::release();
 }
 
-SvXMLImportContext *AnimationsImport::CreateContext(USHORT nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList)
+SvXMLImportContext *AnimationsImport::CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList)
 {
     SvXMLImportContext* pContext = 0;
 
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 0ea5b1b861..faec6fd9f8 100644..100755
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -38,7 +38,7 @@
 #include <comphelper/extract.hxx>
 #include <tools/color.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 05203a7a87..696e0053aa 100644..100755
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -42,7 +42,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 /*
 #include <xmloff/xmlement.hxx>
@@ -413,7 +413,7 @@ public:
 
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< XAttributeList >& xAttrList );
 };
 
@@ -532,13 +532,13 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,  s
         case XML_NAMESPACE_PRESENTATION:
             if( IsXMLToken( aLocalName, XML_EFFECT ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
                     meEffect = (XMLEffect)eEnum;
             }
             else if( IsXMLToken(aLocalName, XML_DIRECTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
                     meDirection = (XMLEffectDirection)eEnum;
             }
@@ -550,7 +550,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport,  s
             }
             else if( IsXMLToken( aLocalName, XML_SPEED ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
                     meSpeed = (AnimationSpeed)eEnum;
             }
@@ -567,7 +567,7 @@ XMLAnimationsEffectContext::~XMLAnimationsEffectContext()
 {
 }
 
-SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     return new XMLAnimationsSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
 }
@@ -688,7 +688,7 @@ XMLAnimationsContext::~XMLAnimationsContext()
     delete mpImpl;
 }
 
-SvXMLImportContext * XMLAnimationsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName,  xAttrList, mpImpl );
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 0ffd547078..a70fe2717a 100644..100755
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include "descriptionimp.hxx"
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index 7ba7f9c294..7ba7f9c294 100644..100755
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index d49659f6bc..29d2c44b0f 100644..100755
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -40,7 +40,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "eventimp.hxx"
@@ -97,7 +97,7 @@ public:
     SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape );
     virtual ~SdXMLEventContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const OUString& rLocalName,	const Reference< XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,	const Reference< XAttributeList>& xAttrList );
     virtual void EndElement();
 
     sal_Bool mbValid;
@@ -206,19 +206,19 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
         case XML_NAMESPACE_PRESENTATION:
             if( IsXMLToken( aAttrLocalName, XML_ACTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_EventActions_EnumMap ) )
                     meClickAction = (ClickAction)eEnum;
             }
             if( IsXMLToken( aAttrLocalName, XML_EFFECT ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationEffect_EnumMap ) )
                     meEffect = (XMLEffect)eEnum;
             }
             else if( IsXMLToken( aAttrLocalName, XML_DIRECTION ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationDirection_EnumMap ) )
                     meDirection = (XMLEffectDirection)eEnum;
             }
@@ -230,7 +230,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  sal_uInt16 nPrfx, cons
             }
             else if( IsXMLToken( aAttrLocalName, XML_SPEED ) )
             {
-                USHORT eEnum;
+                sal_uInt16 eEnum;
                 if( SvXMLUnitConverter::convertEnum( eEnum, sValue, aXML_AnimationSpeed_EnumMap ) )
                     meSpeed = (AnimationSpeed)eEnum;
             }
@@ -292,7 +292,7 @@ SdXMLEventContext::~SdXMLEventContext()
 {
 }
 
-SvXMLImportContext * SdXMLEventContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLEventContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this );
 }
@@ -519,7 +519,7 @@ SdXMLEventsContext::~SdXMLEventsContext()
 {
 }
 
-SvXMLImportContext * SdXMLEventsContext::CreateChildContext( USHORT nPrfx, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLEventContext( GetImport(), nPrfx, rLocalName,  xAttrList, mxShape );
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index 9041b01163..a5982c1a58 100644..100755
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -50,7 +50,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape );
     virtual ~SdXMLEventsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 9352c598ff..189bb036ef 100644..100755
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index 69d45cb8ba..69d45cb8ba 100644..100755
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 9e668964e2..1b0b3b1226 100644..100755
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -37,7 +37,7 @@
 #include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "layerimp.hxx"
@@ -66,7 +66,7 @@ public:
     SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager );
     virtual ~SdXMLLayerContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
     virtual void EndElement();
 
 private:
@@ -106,7 +106,7 @@ SdXMLLayerContext::~SdXMLLayerContext()
 {
 }
 
-SvXMLImportContext * SdXMLLayerContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& )
+SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& )
 {
     if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) )
     {
@@ -174,7 +174,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext()
 {
 }
 
-SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager );
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index b914d5ddde..3aa3fcca16 100644..100755
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -51,7 +51,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLLayerSetContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
deleted file mode 100644
index 3c9f7ae024..0000000000
--- a/xmloff/source/draw/makefile.mk
+++ /dev/null
@@ -1,85 +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=xmloff
-TARGET=draw
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/animationexport.obj\
-        $(SLO)$/animationimport.obj\
-        $(SLO)$/XMLNumberStyles.obj\
-        $(SLO)$/XMLGraphicsDefaultStyle.obj\
-        $(SLO)$/viewcontext.obj\
-        $(SLO)$/eventimp.obj\
-        $(SLO)$/layerexp.obj\
-        $(SLO)$/layerimp.obj\
-        $(SLO)$/ximpshow.obj\
-        $(SLO)$/animimp.obj\
-        $(SLO)$/animexp.obj\
-        $(SLO)$/numithdl.obj\
-        $(SLO)$/sdxmlimp.obj \
-        $(SLO)$/sdxmlexp.obj \
-        $(SLO)$/ximpstyl.obj \
-        $(SLO)$/ximpbody.obj \
-        $(SLO)$/ximpshap.obj \
-        $(SLO)$/ximpgrp.obj \
-        $(SLO)$/ximp3dscene.obj \
-        $(SLO)$/ximp3dobject.obj \
-        $(SLO)$/ximpnote.obj \
-        $(SLO)$/sdpropls.obj \
-        $(SLO)$/propimp0.obj \
-        $(SLO)$/xexptran.obj \
-        $(SLO)$/shapeexport.obj \
-        $(SLO)$/shapeexport2.obj \
-        $(SLO)$/shapeexport3.obj \
-        $(SLO)$/shapeexport4.obj \
-        $(SLO)$/shapeimport.obj \
-        $(SLO)$/XMLImageMapExport.obj \
-        $(SLO)$/XMLImageMapContext.obj \
-        $(SLO)$/XMLShapePropertySetContext.obj \
-        $(SLO)$/XMLShapeStyleContext.obj \
-        $(SLO)$/ximppage.obj \
-        $(SLO)$/ximpcustomshape.obj \
-        $(SLO)$/EnhancedCustomShapeToken.obj \
-        $(SLO)$/XMLReplacementImageContext.obj \
-        $(SLO)$/descriptionimp.obj \
-        $(SLO)$/ximplink.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index 7a72d32116..7a72d32116 100644..100755
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index 49bc519a0d..49bc519a0d 100644..100755
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 085398bbe6..085398bbe6 100644..100755
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index 9998a95c1e..9998a95c1e 100644..100755
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index a98aaef789..a87690d5ab 100644..100755
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -61,7 +61,7 @@
 #include "sdpropls.hxx"
 #include "propimp0.hxx"
 #include <xmloff/xmlexp.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <com/sun/star/drawing/TextureKind.hpp>
@@ -956,7 +956,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
             case XML_SD_TYPE_BACKFACE_CULLING:
             {
                 // #87922# DoubleSided -> BackfaceCulling
-                // This BOOL needs to be flipped, DoubleSided TRUE -> NO Backface culling
+                // This sal_Bool needs to be flipped, DoubleSided sal_True -> NO Backface culling
                 // and vice versa.
                 pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_DISABLED), GetXMLToken(XML_ENABLED) );
                 break;
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index b919d174c8..82a3567ca5 100644..100755
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexppr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 6a6f1f5bf5..67fefbbc77 100644..100755
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "unointerfacetouniqueidentifiermapper.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
@@ -76,7 +76,7 @@
 #include "layerexp.hxx"
 
 
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include "XMLNumberStylesExport.hxx"
 #include <tools/string.hxx>
 
@@ -117,7 +117,7 @@ class ImpXMLEXPPageMasterInfo
 
 public:
     ImpXMLEXPPageMasterInfo(const SdXMLExport& rExp, const Reference<XDrawPage>& xPage);
-    BOOL operator==(const ImpXMLEXPPageMasterInfo& rInfo) const;
+    sal_Bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const;
     void SetName(const OUString& rStr);
 
     const OUString& GetName() const { return msName; }
@@ -187,7 +187,7 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo(
     }
 }
 
-BOOL ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const
+sal_Bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const
 {
     return ((mnBorderBottom == rInfo.mnBorderBottom)
         && (mnBorderLeft == rInfo.mnBorderLeft)
@@ -220,7 +220,7 @@ class ImpXMLAutoLayoutInfo
 public:
     ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterInfo* pInf);
 
-    BOOL operator==(const ImpXMLAutoLayoutInfo& rInfo) const;
+    sal_Bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const;
 
     sal_uInt16 GetLayoutType() const { return mnType; }
     sal_Int32 GetGapX() const { return mnGapX; }
@@ -232,19 +232,19 @@ public:
     const Rectangle& GetTitleRectangle() const { return maTitleRect; }
     const Rectangle& GetPresRectangle() const { return maPresRect; }
 
-    static BOOL IsCreateNecessary(sal_uInt16 nTyp);
+    static sal_Bool IsCreateNecessary(sal_uInt16 nTyp);
 };
 
-BOOL ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp)
+sal_Bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp)
 {
     if(nTyp == 5 /* AUTOLAYOUT_ORG */
         || nTyp == 20 /* AUTOLAYOUT_NONE */
         || nTyp >= IMP_AUTOLAYOUT_INFO_MAX)
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
-BOOL ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const
+sal_Bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const
 {
     return ((mnType == rInfo.mnType
         && mpPageMasterInfo == rInfo.mpPageMasterInfo));
@@ -422,8 +422,8 @@ SdXMLExport::SdXMLExport(
     mpPropertySetMapper(0L),
     mpPresPagePropsMapper(0L),
     mbIsDraw(bIsDraw),
-    mbFamilyGraphicUsed(FALSE),
-    mbFamilyPresentationUsed(FALSE),
+    mbFamilyGraphicUsed(sal_False),
+    mbFamilyPresentationUsed(sal_False),
     msZIndex( GetXMLToken(XML_ZINDEX) ),
     msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
     msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
@@ -824,7 +824,7 @@ void SdXMLExport::ImpPrepAutoLayoutInfos()
         }
 
         // prepare name creation
-        for(sal_Int32 nCnt = 0L; nCnt < mnDocDrawPageCount; nCnt++)
+        for (sal_Int32 nCnt = 0; nCnt < mnDocDrawPageCount; nCnt++)
         {
             Any aAny(mxDocDrawPages->getByIndex(nCnt));
             Reference<XDrawPage> xDrawPage;
@@ -838,10 +838,10 @@ void SdXMLExport::ImpPrepAutoLayoutInfos()
     }
 }
 
-BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
+sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName)
 {
     rName = OUString();
-    BOOL bRetval(FALSE);
+    sal_Bool bRetval(sal_False);
 
     Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY);
     if(xPropSet.is())
@@ -874,7 +874,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
 
                 // create entry and look for existance
                 ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo);
-                BOOL bDidExist(FALSE);
+                sal_Bool bDidExist(sal_False);
 
                 for( size_t nCnt = 0; !bDidExist && nCnt < mpAutoLayoutInfoList->size(); nCnt++)
                 {
@@ -882,7 +882,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
                     {
                         delete pNew;
                         pNew = mpAutoLayoutInfoList->at( nCnt );
-                        bDidExist = TRUE;
+                        bDidExist = sal_True;
                     }
                 }
 
@@ -897,7 +897,7 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
                 }
 
                 rName = pNew->GetLayoutName();
-                bRetval = TRUE;
+                bRetval = sal_True;
             }
         }
     }
@@ -1178,11 +1178,11 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
 
                         Point aTmpPos(aPartPos);
 
-                        for(sal_Int32 a = 0L; a < nRowCnt; a++)
+                        for (sal_Int32 a = 0; a < nRowCnt; a++)
                         {
                             aTmpPos.X() = aPartPos.X();
 
-                            for(sal_Int32 b = 0L; b < nColCnt; b++)
+                            for (sal_Int32 b = 0; b < nColCnt; b++)
                             {
                                 Rectangle aTmpRect(aTmpPos, aPartSize);
 
@@ -1388,7 +1388,7 @@ void SdXMLExport::ImpPrepPageMasterInfos()
     if(mnDocMasterPageCount)
     {
         // look for needed page-masters, create these
-        for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++)
+        for (sal_Int32 nMPageId = 0; nMPageId < mnDocMasterPageCount; nMPageId++)
         {
             Reference< XDrawPage > xMasterPage( mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY );
             ImpXMLEXPPageMasterInfo* pNewInfo = 0L;
@@ -1813,7 +1813,7 @@ void SdXMLExport::ImpWritePresentationStyles()
 {
     if(IsImpress())
     {
-        for(sal_Int32 nCnt = 0L; nCnt < mnDocMasterPageCount; nCnt++)
+        for (sal_Int32 nCnt = 0; nCnt < mnDocMasterPageCount; nCnt++)
         {
             Any aAny(mxDocMasterPages->getByIndex(nCnt));
             Reference<container::XNamed> xNamed;
@@ -1831,7 +1831,7 @@ void SdXMLExport::ImpWritePresentationStyles()
                     aPrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
                     aStEx.exportStyleFamily(xNamed->getName(),
                         OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)),
-                        aMapperRef, FALSE,
+                        aMapperRef, sal_False,
                         XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix);
                 }
             }
@@ -2244,7 +2244,7 @@ void SdXMLExport::exportPresentationSettings()
 
 //////////////////////////////////////////////////////////////////////////////
 
-void SdXMLExport::_ExportStyles(BOOL bUsed)
+void SdXMLExport::_ExportStyles(sal_Bool bUsed)
 {
     GetPropertySetMapper()->SetAutoStyles( sal_False );
 
@@ -2254,7 +2254,9 @@ void SdXMLExport::_ExportStyles(BOOL bUsed)
     // write draw:style-name for object graphic-styles
     GetShapeExport()->ExportGraphicDefaults();
 
-    GetShapeExport()->GetShapeTableExport()->exportTableStyles();
+    // do not export in ODF 1.1 or older
+    if( getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
+        GetShapeExport()->GetShapeTableExport()->exportTableStyles();
 
     // write presentation styles
     ImpWritePresentationStyles();
@@ -2524,7 +2526,7 @@ void SdXMLExport::_ExportMasterStyles()
     }
 
     // export MasterPages in master-styles section
-    for(sal_Int32 nMPageId = 0L; nMPageId < mnDocMasterPageCount; nMPageId++)
+    for (sal_Int32 nMPageId = 0; nMPageId < mnDocMasterPageCount; nMPageId++)
     {
         Reference< XDrawPage > xMasterPage( mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY );
         if(xMasterPage.is())
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index e98c6d46c7..a18b59027c 100644..100755
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -153,7 +153,7 @@ class SdXMLExport : public SvXMLExport
     const rtl::OUString			msEndShape;
     const rtl::OUString			msPageLayoutNames;
 
-    virtual void _ExportStyles(BOOL bUsed);
+    virtual void _ExportStyles(sal_Bool bUsed);
     virtual void _ExportAutoStyles();
     virtual void _ExportMasterStyles();
     virtual void _ExportContent();
@@ -173,7 +173,7 @@ class SdXMLExport : public SvXMLExport
     void ImpWritePresentationStyles();
     ::rtl::OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true );
 
-    BOOL ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName);
+    sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName);
     void ImpWriteAutoLayoutInfos();
     void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect);
     void ImpWriteHeaderFooterDecls();
@@ -211,13 +211,13 @@ public:
     XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; }
     XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; }
 
-    BOOL IsDraw() const { return mbIsDraw; }
-    BOOL IsImpress() const { return !mbIsDraw; }
+    sal_Bool IsDraw() const { return mbIsDraw; }
+    sal_Bool IsImpress() const { return !mbIsDraw; }
 
-    BOOL IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; }
-    void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = TRUE; }
-    BOOL IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; }
-    void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = TRUE; }
+    sal_Bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; }
+    void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = sal_True; }
+    sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; }
+    void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; }
 
     virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False );
     virtual void exportDataStyles();
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c7acbbf856..47fcac2a7f 100644..100755
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -37,7 +37,7 @@
 
 #include <xmloff/xmlmetai.hxx>
 #include "ximpstyl.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
@@ -48,7 +48,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include "sdpropls.hxx"
 #include <xmloff/xmlexppr.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 
@@ -127,14 +127,14 @@ protected:
 public:
     SdXMLDocContext_Impl(
         SdXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLDocContext_Impl();
 
     TYPEINFO();
 
-    virtual SvXMLImportContext *CreateChildContext(USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList);
 };
@@ -143,7 +143,7 @@ public:
 
 SdXMLDocContext_Impl::SdXMLDocContext_Impl(
     SdXMLImport& rImport,
-    USHORT nPrfx,
+    sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference<xml::sax::XAttributeList>&)
 :	SvXMLImportContext(rImport, nPrfx, rLName)
@@ -161,7 +161,7 @@ TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext );
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
@@ -251,7 +251,7 @@ class SdXMLFlatDocContext_Impl
 {
 public:
     SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
-        USHORT i_nPrefix, const OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const OUString & i_rLName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder);
@@ -259,12 +259,12 @@ public:
     virtual ~SdXMLFlatDocContext_Impl();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT i_nPrefix, const OUString& i_rLocalName,
+        sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList);
 };
 
 SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
-        USHORT i_nPrefix, const OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const OUString & i_rLName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
@@ -278,7 +278,7 @@ SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
 SdXMLFlatDocContext_Impl::~SdXMLFlatDocContext_Impl() { }
 
 SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext(
-    USHORT i_nPrefix, const OUString& i_rLocalName,
+    sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
 {
     // behave like meta base class iff we encounter office:meta
@@ -713,7 +713,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
+SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
@@ -793,7 +793,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
         return GetShapeImport()->GetStylesContext();
 
     GetShapeImport()->SetStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, FALSE));
+        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_False));
 
     return GetShapeImport()->GetStylesContext();
 }
@@ -807,7 +807,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
         return GetShapeImport()->GetAutoStylesContext();
 
     GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, TRUE));
+        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_True));
 
     return GetShapeImport()->GetAutoStylesContext();
 }
@@ -903,10 +903,12 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::
     {
         xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), uno::makeAny( aVisArea )  );
     }
-    catch( com::sun::star::uno::Exception e )
+    catch( com::sun::star::uno::Exception /*e*/ )
     {
+/* #i79978# since old documents may contain invalid view settings, this is nothing to worry the user about.
         uno::Sequence<OUString> aSeq(0);
         SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+*/
     }
 }
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index f0c10ae38b..f0c10ae38b 100644..100755
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 4790caf63e..f6541a71ec 100644..100755
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -64,7 +64,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -81,7 +81,7 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
     maShapesInfos(),
     maCurrentShapesIter(maShapesInfos.end()),
     mbExportLayer( sal_False ),
-    // #88546# init to FALSE
+    // #88546# init to sal_False
     mbHandleProgressBar( sal_False ),
     msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ),
     msPrintable( RTL_CONSTASCII_USTRINGPARAM("Printable") ),
@@ -1257,7 +1257,7 @@ void XMLShapeExport::ExportGraphicDefaults()
                 aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper );
 
                 // write graphic family styles
-                aStEx.exportStyleFamily("graphics", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+                aStEx.exportStyleFamily("graphics", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
             }
         }
         catch( lang::ServiceNotRegisteredException& )
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index f330c917cc..e7a1820696 100644..100755
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -54,7 +54,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 
@@ -181,7 +181,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR
     mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr);
 
     // decide if transformation is neccessary
-    BOOL bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0);
+    sal_Bool bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0);
 
     if(bTransformationIsNeccessary)
     {
@@ -629,8 +629,8 @@ void XMLShapeExport::ImpExportTextBoxShape(
         uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
 
         // presentation attribute (if presentation)
-        sal_Bool bIsPresShape(FALSE);
-        sal_Bool bIsEmptyPresObj(FALSE);
+        sal_Bool bIsPresShape(sal_False);
+        sal_Bool bIsEmptyPresObj(sal_False);
         OUString aStr;
 
         switch(eShapeType)
@@ -638,49 +638,49 @@ void XMLShapeExport::ImpExportTextBoxShape(
             case XmlShapeTypePresSubtitleShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresTitleTextShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_TITLE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresOutlinerShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_OUTLINE);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresNotesShape:
             {
                 aStr = GetXMLToken(XML_PRESENTATION_NOTES);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresHeaderShape:
             {
                 aStr = GetXMLToken(XML_HEADER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresFooterShape:
             {
                 aStr = GetXMLToken(XML_FOOTER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresSlideNumberShape:
             {
                 aStr = GetXMLToken(XML_PAGE_NUMBER);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             case XmlShapeTypePresDateTimeShape:
             {
                 aStr = GetXMLToken(XML_DATE_TIME);
-                bIsPresShape = TRUE;
+                bIsPresShape = sal_True;
                 break;
             }
             default:
@@ -877,7 +877,7 @@ void XMLShapeExport::ImpExportEllipseShape(
         awt::Size aSize = xShape->getSize();
         sal_Int32 nRx((aSize.Width + 1) / 2);
         sal_Int32 nRy((aSize.Height + 1) / 2);
-        BOOL bCircle(nRx == nRy);
+        sal_Bool bCircle(nRx == nRy);
 
         // Transformation
         ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
@@ -896,7 +896,7 @@ void XMLShapeExport::ImpExportEllipseShape(
             const double dEndAngle = nEndAngle / 100.0;
 
             // export circle kind
-            SvXMLUnitConverter::convertEnum( sStringBuffer, (USHORT)eKind, aXML_CircleKind_EnumMap );
+            SvXMLUnitConverter::convertEnum( sStringBuffer, (sal_uInt16)eKind, aXML_CircleKind_EnumMap );
             mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_KIND, sStringBuffer.makeStringAndClear() );
 
             // export start angle
@@ -942,9 +942,9 @@ void XMLShapeExport::ImpExportPolygonShape(
     const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
     if(xPropSet.is())
     {
-        BOOL bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape
+        sal_Bool bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape
             || eShapeType == XmlShapeTypeDrawClosedBezierShape);
-        BOOL bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape
+        sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape
             || eShapeType == XmlShapeTypeDrawOpenBezierShape);
 
         // get matrix
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index 515cc2c160..b9edd3964e 100644..100755
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -48,7 +48,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -211,13 +211,13 @@ void XMLShapeExport::ImpExport3DShape(
                 double fXMax = 0;
                 double fYMin = 0;
                 double fYMax = 0;
-                BOOL bInit(FALSE);
+                sal_Bool bInit(sal_False);
                 sal_Int32 nOuterSequenceCount(xPolyPolygon3D.SequenceX.getLength());
                 drawing::DoubleSequence* pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray();
                 drawing::DoubleSequence* pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray();
 
                 sal_Int32 a;
-                for( a= 0L; a < nOuterSequenceCount; a++)
+                for (a = 0; a < nOuterSequenceCount; a++)
                 {
                     sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength());
                     double* pArrayX = pInnerSequenceX->getArray();
@@ -246,7 +246,7 @@ void XMLShapeExport::ImpExport3DShape(
                         {
                             fXMin = fXMax = fX;
                             fYMin = fYMax = fY;
-                            bInit = TRUE;
+                            bInit = sal_True;
                         }
                     }
 
@@ -267,7 +267,7 @@ void XMLShapeExport::ImpExport3DShape(
                 pInnerSequenceX = xPolyPolygon3D.SequenceX.getArray();
                 pInnerSequenceY = xPolyPolygon3D.SequenceY.getArray();
 
-                for(a = 0L; a < nOuterSequenceCount; a++)
+                for (a = 0; a < nOuterSequenceCount; a++)
                 {
                     sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength());
                     double* pArrayX = pInnerSequenceX->getArray();
@@ -287,7 +287,7 @@ void XMLShapeExport::ImpExport3DShape(
                     // calculate closed flag
                     awt::Point* pFirst = aPoly.getArray();
                     awt::Point* pLast = pFirst + (nInnerSequenceCount - 1);
-                    BOOL bClosed = (pFirst->X == pLast->X && pFirst->Y == pLast->Y);
+                    sal_Bool bClosed = (pFirst->X == pLast->X && pFirst->Y == pLast->Y);
 
                     aSvgDElement.AddPolygon(&aPoly, 0L, aMinPoint, 
                         aMaxSize, bClosed);
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index c7345415fa..78128d11b7 100644..100755
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -69,7 +69,7 @@
 #include <tools/string.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLBase64Export.hxx"
 
 using ::rtl::OUString;
@@ -1114,38 +1114,46 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
 
         SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True );
 
-        if( !bIsEmptyPresObj )
+        // do not export in ODF 1.1 or older
+        if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
         {
-            uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), uno::UNO_QUERY );
-            if( xTemplate.is() )
+            if( !bIsEmptyPresObj )
             {
-                const OUString sTemplate( xTemplate->getName() );
-                if( sTemplate.getLength() )
+                uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), uno::UNO_QUERY );
+                if( xTemplate.is() )
                 {
-                    mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sTemplate );
-
-                    for( const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0]; pEntry->msApiName; pEntry++ )
+                    const OUString sTemplate( xTemplate->getName() );
+                    if( sTemplate.getLength() )
                     {
-                        try
-                        {
-                            sal_Bool bBool = sal_False;
-                            const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) );
+                        mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TEMPLATE_NAME, sTemplate );
 
-                            xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool;
-                            if( bBool )
-                                mrExport.AddAttribute(pEntry->mnNameSpace, pEntry->meXMLName, XML_TRUE );
-                        }
-                        catch( uno::Exception& )
+                        for( const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0]; pEntry->msApiName; pEntry++ )
                         {
+                            try
+                            {
+                                sal_Bool bBool = sal_False;
+                                const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) );
+
+                                xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool;
+                                if( bBool )
+                                    mrExport.AddAttribute(pEntry->mnNameSpace, pEntry->meXMLName, XML_TRUE );
+                            }
+                            catch( uno::Exception& )
+                            {
                             OSL_FAIL("XMLShapeExport::ImpExportTableShape(), exception caught!");
+                            }
                         }
                     }
                 }
+
+
+                uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW );
+                GetShapeTableExport()->exportTable( xRange );
             }
-            uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW );
-            
-            GetShapeTableExport()->exportTable( xRange );
+        }
 
+        if( !bIsEmptyPresObj )
+        {
             uno::Reference< graphic::XGraphic > xGraphic( xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReplacementGraphic" ) ) ), uno::UNO_QUERY );
             if( xGraphic.is() ) try
             {	
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index d3280655cd..cf8c2a72b3 100644..100755
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -40,7 +40,7 @@
 
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpstyl.hxx"
 #include "ximpshap.hxx"
@@ -158,7 +158,7 @@ XMLShapeImportHelper::XMLShapeImportHelper(
     mpImpl = new XMLShapeImportHelperImpl();
     mpImpl->mpSortContext = 0;
 
-    // #88546# init to FALSE
+    // #88546# init to sal_False
     mpImpl->mbHandleProgressBar = sal_False;
 
     mpSdPropHdlFactory = new XMLSdPropHdlFactory( rModel, rImporter );
@@ -518,7 +518,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
 
 SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes)
@@ -598,7 +598,7 @@ void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
 
 SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -647,7 +647,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
         {
             // draw:polygon or draw:polyline inside group context
             pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes,
-                rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? TRUE : FALSE, bTemporaryShape );
+                rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? sal_True : sal_False, bTemporaryShape );
             break;
         }
         case XML_TOK_GROUP_PATH:
@@ -731,7 +731,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
 // This method is called from SdXMLFrameContext to create children of drawe:frame
 SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
     SvXMLImport& rImport,
-    USHORT p_nPrefix,
+    sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& rAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -819,7 +819,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
 
 SvXMLImportContext *XMLShapeImportHelper::CreateFrameChildContext(
     SvXMLImportContext *pThisContext,
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 08818ebfeb..7f0fbac05b 100644..100755
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -31,9 +31,9 @@
 #include "viewcontext.hxx"
 #include "sdxmlimp_impl.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 
 using namespace com::sun::star;
 using ::xmloff::token::IsXMLToken;
@@ -44,7 +44,7 @@ using ::rtl::OUString;
 
 //------------------------------------------------------------------
 
-SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
+SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
 }
@@ -53,7 +53,7 @@ SdXMLViewSettingsContext::~SdXMLViewSettingsContext()
 {
 }
 
-SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLViewSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index af92bdbabc..c7faa2f5a8 100644..100755
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -40,12 +40,12 @@ class SdXMLViewSettingsContext : public SvXMLImportContext
     ::com::sun::star::awt::Rectangle maVisArea;
 
 public:
-    SdXMLViewSettingsContext( SdXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLName,
+    SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLViewSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 28a05f1330..7cd9a0417f 100644..100755
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1456,8 +1456,8 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
     // second loop
     if(nNumPoints)
     {
-        nPos = 0L;
-        maPoly.realloc(1L);
+        nPos = 0;
+        maPoly.realloc(1);
         drawing::PointSequence* pOuterSequence = maPoly.getArray();
         pOuterSequence->realloc(nNumPoints);
         awt::Point* pInnerSequence = pOuterSequence->getArray();
@@ -2648,8 +2648,8 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
 
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
@@ -2679,8 +2679,8 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
                     
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
@@ -2710,7 +2710,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
 
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
                         sal_Int32 nY(mnLastY);
 
                         if(bRelative)
@@ -2738,7 +2738,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
                         sal_Int32 nX(mnLastX);
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                             nY += mnLastY;
@@ -2766,10 +2766,10 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
                     {
                         sal_Int32 nX1;
                         sal_Int32 nY1;
-                        sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX2(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY2(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
@@ -2827,12 +2827,12 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
 
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
-                        sal_Int32 nX1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY1(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nX2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY2(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX1(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY1(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX2(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY2(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
@@ -2876,10 +2876,10 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
 
                     while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
                     {
-                        sal_Int32 nXX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nYY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nXX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nYY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
@@ -2929,8 +2929,8 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
                     {
                         sal_Int32 nXX;
                         sal_Int32 nYY;
-                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
-                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
+                        sal_Int32 nX(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
+                        sal_Int32 nY(Imp_ImportNumberAndSpaces(0, aStr, nPos, nLen, rConv));
 
                         if(bRelative)
                         {
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 64cc139a67..04742eec3d 100644..100755
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -61,7 +61,7 @@ SdXML3DObjectContext::SdXML3DObjectContext(
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
 :	SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
-    mbSetTransform( FALSE )
+    mbSetTransform( sal_False )
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -139,8 +139,8 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
 :	SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maMinEdge(-2500.0, -2500.0, -2500.0),
     maMaxEdge(2500.0, 2500.0, 2500.0),
-    mbMinEdgeUsed(FALSE),
-    mbMaxEdgeUsed(FALSE)
+    mbMinEdgeUsed(sal_False),
+    mbMaxEdgeUsed(sal_False)
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -161,7 +161,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
                 if(aNewVec != maMinEdge)
                 {
                     maMinEdge = aNewVec;
-                    mbMinEdgeUsed = TRUE;
+                    mbMinEdgeUsed = sal_True;
                 }
                 break;
             }
@@ -173,7 +173,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
                 if(aNewVec != maMaxEdge)
                 {
                     maMaxEdge = aNewVec;
-                    mbMaxEdgeUsed = TRUE;
+                    mbMaxEdgeUsed = sal_True;
                 }
                 break;
             }
@@ -250,8 +250,8 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
 :	SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maCenter(0.0, 0.0, 0.0),
     maSize(5000.0, 5000.0, 5000.0),
-    mbCenterUsed(FALSE),
-    mbSizeUsed(FALSE)
+    mbCenterUsed(sal_False),
+    mbSizeUsed(sal_False)
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for(sal_Int16 i=0; i < nAttrCount; i++)
@@ -272,7 +272,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
                 if(aNewVec != maCenter)
                 {
                     maCenter = aNewVec;
-                    mbCenterUsed = TRUE;
+                    mbCenterUsed = sal_True;
                 }
                 break;
             }
@@ -284,7 +284,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
                 if(aNewVec != maSize)
                 {
                     maSize = aNewVec;
-                    mbSizeUsed = TRUE;
+                    mbSizeUsed = sal_True;
                 }
                 break;
             }
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index c18e02b3de..c81f61f4a0 100644..100755
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -48,7 +48,7 @@ protected:
     // the shape group this object should be created inside
 
     com::sun::star::drawing::HomogenMatrix mxHomMat;
-    BOOL						mbSetTransform;
+    sal_Bool						mbSetTransform;
 
 public:
     TYPEINFO();
@@ -72,8 +72,8 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
 {
     ::basegfx::B3DVector	maMinEdge;
     ::basegfx::B3DVector	maMaxEdge;
-    BOOL					mbMinEdgeUsed;
-    BOOL					mbMaxEdgeUsed;
+    sal_Bool					mbMinEdgeUsed;
+    sal_Bool					mbMaxEdgeUsed;
 
 public:
     TYPEINFO();
@@ -96,8 +96,8 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
 {
     ::basegfx::B3DVector	maCenter;
     ::basegfx::B3DVector	maSize;
-    BOOL					mbCenterUsed;
-    BOOL					mbSizeUsed;
+    sal_Bool					mbCenterUsed;
+    sal_Bool					mbSizeUsed;
 
 public:
     TYPEINFO();
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index c2c993ddd2..0c9c79514b 100644..100755
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include "eventimp.hxx"
@@ -104,7 +104,7 @@ TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
 
 SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
     SvXMLImport& rImport,
-    USHORT nPrfx,
+    sal_uInt16 nPrfx, 
     const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
@@ -181,7 +181,7 @@ void SdXML3DSceneShapeContext::EndElement()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -225,7 +225,7 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix
 
 SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter )
 :	mrImport( rImporter ),
-    mbSetTransform( FALSE ),
+    mbSetTransform( sal_False ),
     mxPrjMode(drawing::ProjectionMode_PERSPECTIVE),
     mnDistance(1000),
     mnFocalLength(1000),
@@ -236,9 +236,9 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
     maVRP(0.0, 0.0, 1.0),
     maVPN(0.0, 0.0, 1.0),
     maVUP(0.0, 1.0, 0.0),
-    mbVRPUsed(FALSE),
-    mbVPNUsed(FALSE),
-    mbVUPUsed(FALSE)
+    mbVRPUsed(sal_False),
+    mbVPNUsed(sal_False),
+    mbVUPUsed(sal_False)
 {
 }
 
@@ -285,7 +285,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVRP)
             {
                 maVRP = aNewVec;
-                mbVRPUsed = TRUE;
+                mbVRPUsed = sal_True;
             }
             return;
         }
@@ -297,7 +297,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVPN)
             {
                 maVPN = aNewVec;
-                mbVPNUsed = TRUE;
+                mbVPNUsed = sal_True;
             }
             return;
         }
@@ -309,7 +309,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
             if(aNewVec != maVUP)
             {
                 maVUP = aNewVec;
-                mbVUPUsed = TRUE;
+                mbVUPUsed = sal_True;
             }
             return;
         }
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 24d0bd1aad..8dcea30f0f 100644..100755
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -58,7 +58,7 @@ public:
 
     SdXML3DSceneShapeContext( 
         SvXMLImport& rImport, 
-        USHORT nPrfx, 
+        sal_uInt16 nPrfx, 
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
@@ -69,7 +69,7 @@ public:
     virtual void EndElement();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index fb54f83222..98b4c315c3 100644..100755
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star;
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes) 
 :	SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
@@ -72,7 +72,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         OUString sValue = xAttrList->getValueByIndex( i );
         const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetDrawPageAttrTokenMap();
 
@@ -167,7 +167,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
 
         if(xDrawPage.is() && xMasterPages.is())
         {
-            sal_Bool bDone(FALSE);
+            sal_Bool bDone(sal_False);
             OUString sDisplayName( rImport.GetStyleDisplayName( 
                             XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) );
 
@@ -187,7 +187,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
                             sMasterPageName.equals(sDisplayName))
                         {
                             xDrawPage->setMasterPage(xMasterPage);
-                            bDone = TRUE;
+                            bDone = sal_True;
                         }
                     }
                 }
@@ -232,7 +232,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
@@ -305,7 +305,7 @@ void SdXMLDrawPageContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName ) 
+    sal_uInt16 nPrfx, const OUString& rLocalName ) 
 :	SvXMLImportContext( rImport, nPrfx, rLocalName )
 {
 }
@@ -319,7 +319,7 @@ SdXMLBodyContext::~SdXMLBodyContext()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext *SdXMLBodyContext::CreateChildContext( 
-    USHORT nPrefix, 
+    sal_uInt16 nPrefix, 
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index 1fe2a5b4d1..b8910380d9 100644..100755
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -46,14 +46,14 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext
 
     bool						mbHadSMILNodes;
 public:
-    SdXMLDrawPageContext( SdXMLImport& rImport, USHORT nPrfx,
+    SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
         const rtl::OUString& rLocalName, 
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLDrawPageContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
@@ -68,11 +68,11 @@ class SdXMLBodyContext : public SvXMLImportContext
     SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
 
 public:
-    SdXMLBodyContext( SdXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName );
+    SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName );
     virtual ~SdXMLBodyContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName, 
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName, 
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index f272bc0423..e13b5eceea 100644..100755
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -42,11 +42,11 @@
 #include "EnhancedCustomShapeToken.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -150,7 +150,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest,
                          const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp,
                         const SvXMLEnumMapEntry& rMap )
 {
-    USHORT eKind;
+    sal_uInt16 eKind;
     if( SvXMLUnitConverter::convertEnum( eKind, rValue, &rMap ) )
     {
         sal_Int16 nEnum = (sal_Int16)eKind;
@@ -1260,7 +1260,6 @@ void XMLEnhancedCustomShapeContext::EndElement()
             {
                 switch( EASGet( pValues->Name ) )
                 {
-                    case EAS_Position :
                     case EAS_RangeYMinimum :
                     case EAS_RangeYMaximum :
                     case EAS_RangeXMinimum :
@@ -1272,6 +1271,8 @@ void XMLEnhancedCustomShapeContext::EndElement()
                             pValues->Value.getValue()), pH );
                     }
                     break;
+
+                    case EAS_Position :
                     case EAS_Polar :
                     {
                         CheckAndResolveEquationParameter( (*((com::sun::star::drawing::EnhancedCustomShapeParameterPair*)
@@ -1298,7 +1299,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
         SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) );
 }
 
-SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( USHORT nPrefix,const rtl::OUString& rLocalName,
+SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName,
                                                                     const uno::Reference< xml::sax::XAttributeList> & xAttrList )
 {
     EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName );
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 12c0a6ac40..94013fac3a 100644..100755
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -71,7 +71,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    SvXMLImportContext *CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index b46c51ce33..8fd181f55d 100644..100755
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximpgrp.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "ximpshap.hxx"
@@ -47,7 +47,7 @@ TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext );
 
 SdXMLGroupShapeContext::SdXMLGroupShapeContext( 
     SvXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape) 
@@ -63,7 +63,7 @@ SdXMLGroupShapeContext::~SdXMLGroupShapeContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index d0f2d2883f..90873af099 100644..100755
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -51,14 +51,14 @@ protected:
 public:
     TYPEINFO();
 
-    SdXMLGroupShapeContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
         sal_Bool bTemporaryShape);
     virtual ~SdXMLGroupShapeContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index c3f103ae00..86ddaa6a87 100644..100755
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include "ximplink.hxx"
 #include <xmloff/xmltoken.hxx>
 
@@ -42,7 +42,7 @@ using namespace ::xmloff::token;
 
 TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext );
 
-SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) 
+SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) 
 : SvXMLShapeContext( rImport, nPrfx, rLocalName, false )
 , mxParent( rShapes )
 {
@@ -52,7 +52,7 @@ SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = rImport.GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) )
         {
             msHyperlink = xAttrList->getValueByIndex( i );
@@ -69,7 +69,7 @@ SdXMLShapeLinkContext::~SdXMLShapeLinkContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 8d9ca87889..0f9101bfbc 100644..100755
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -51,13 +51,13 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext
 public:
     TYPEINFO();
 
-    SdXMLShapeLinkContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLShapeLinkContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 9f8999be8d..efe6259076 100644..100755
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
 //////////////////////////////////////////////////////////////////////////////
 
 SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
     uno::Reference< drawing::XShapes >& rShapes) 
 :	SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes )
@@ -112,7 +112,7 @@ SdXMLNotesContext::~SdXMLNotesContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLNotesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index bf6108373d..f0170be88a 100644..100755
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -43,14 +43,14 @@ private:
     rtl::OUString msPageMasterName;
 
 public:
-    SdXMLNotesContext( SdXMLImport& rImport, USHORT nPrfx,
+    SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx,
     const rtl::OUString& rLocalName, 
     const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLNotesContext();
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 };
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 78427b6303..10aa257560 100644..100755
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlstyle.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ximppage.hxx"
 #include "ximpshap.hxx"
 #include "animimp.hxx"
@@ -75,9 +75,9 @@ class DrawAnnotationContext : public SvXMLImportContext
 {
 
 public:
-    DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess );
+    DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess );
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
 private:
@@ -88,7 +88,7 @@ private:
     OUStringBuffer maDateBuffer;
 };
 
-DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess )
+DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess )
 : SvXMLImportContext( rImport, nPrfx, rLocalName )
 , mxAnnotation( xAnnotationAccess->createAndInsertAnnotation() )
 {
@@ -142,7 +142,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, USHORT nPrfx
     }
 }
 
-SvXMLImportContext * DrawAnnotationContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * DrawAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     SvXMLImportContext * pContext = NULL;
 
@@ -215,7 +215,7 @@ TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext );
 
 SdXMLGenericPageContext::SdXMLGenericPageContext( 
     SvXMLImport& rImport,
-    USHORT nPrfx, const OUString& rLocalName,
+    sal_uInt16 nPrfx, const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList>& xAttrList,
     Reference< drawing::XShapes >& rShapes) 
 : SvXMLImportContext( rImport, nPrfx, rLocalName )
@@ -228,7 +228,7 @@ SdXMLGenericPageContext::SdXMLGenericPageContext(
     {
         OUString sAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName;
-        USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
         if( (nPrefix == XML_NAMESPACE_DRAW) && IsXMLToken( aLocalName, XML_NAV_ORDER ) )
         {
             msNavOrder = xAttrList->getValueByIndex( i );
@@ -255,7 +255,7 @@ void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::x
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference< xml::sax::XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 96f8fd5bc6..5a75962970 100644..100755
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -76,14 +76,14 @@ protected:
 public:
     TYPEINFO();
 
-    SdXMLGenericPageContext( SvXMLImport& rImport, USHORT nPrfx, const rtl::OUString& rLocalName,
+    SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
     virtual ~SdXMLGenericPageContext();
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix, const rtl::OUString& rLocalName,
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f52fb7bcd2..7e0d3d7d13 100644..100755
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -72,7 +72,7 @@
 #include "PropertySetMerger.hxx"
 #include <xmloff/families.hxx>
 #include "ximpstyl.hxx"
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "EnhancedCustomShapeToken.hxx"
 #include "XMLReplacementImageContext.hxx"
@@ -83,7 +83,7 @@
 #include "descriptionimp.hxx"
 #include "ximpcustomshape.hxx"
 #include "XMLEmbeddedObjectImportContext.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
@@ -159,9 +159,9 @@ SdXMLShapeContext::SdXMLShapeContext(
 ,	mxAttrList(xAttrList)
 ,	mbListContextPushed( false )
 ,	mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID)
-,	mbIsPlaceholder(FALSE)
+,	mbIsPlaceholder(sal_False)
 ,	mbClearDefaultAttributes( true )
-,	mbIsUserTransformed(FALSE)
+,	mbIsUserTransformed(sal_False)
 ,	mnZOrder(-1)
 ,	maSize(1, 1)
 ,	maPosition(0, 0)
@@ -178,7 +178,7 @@ SdXMLShapeContext::~SdXMLShapeContext()
 
 //////////////////////////////////////////////////////////////////////////////
 
-SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT p_nPrefix,
+SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -310,7 +310,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
             }
             else if( IsXMLToken( aLocalName, XML_ALIGN ) )
             {
-                USHORT eKind;
+                sal_uInt16 eKind;
                 if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) )
                 {
                     aGluePoint.PositionAlignment = (drawing::Alignment)eKind;
@@ -319,7 +319,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
             }
             else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) )
             {
-                USHORT eKind;
+                sal_uInt16 eKind;
                 if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueEscapeDirection_EnumMap ) )
                 {
                     aGluePoint.Escape = (drawing::EscapeDirection)eKind;
@@ -615,13 +615,13 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
                 break;
 
             const SvXMLStyleContext* pStyle = 0L;
-            sal_Bool bAutoStyle(FALSE);
+            sal_Bool bAutoStyle(sal_False);
 
             if(GetImport().GetShapeImport()->GetAutoStylesContext())
                 pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
 
             if(pStyle)
-                bAutoStyle = TRUE;
+                bAutoStyle = sal_True;
 
             if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
                 pStyle = GetImport().GetShapeImport()->GetStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
@@ -1189,7 +1189,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
     {
         if( IsXMLToken( rLocalName, XML_KIND ) )
         {
-            USHORT eKind;
+            sal_uInt16 eKind;
             if( SvXMLUnitConverter::convertEnum( eKind, rValue, aXML_CircleKind_EnumMap ) )
             {
                 meKind = eKind;
@@ -1357,7 +1357,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
     uno::Reference< drawing::XShapes >& rShapes,
     sal_Bool bTemporaryShape)
 :	SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
-    mbClosed( TRUE )
+    mbClosed( sal_True )
 {
 }
 
@@ -1578,7 +1578,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 // XmlShapeTypePresTitleTextShape
                 pService = "com.sun.star.presentation.TitleTextShape";
             }
-            bIsPresShape = TRUE;
+            bIsPresShape = sal_True;
         }
     }
 
@@ -1742,7 +1742,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
 :	SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
     maStart(0,0),
     maEnd(1,1),
-    mnType( (USHORT)drawing::ConnectorType_STANDARD ),
+    mnType( (sal_uInt16)drawing::ConnectorType_STANDARD ),
     mnStartGlueId(-1),
     mnEndGlueId(-1),
     mnDelta1(0),
@@ -2141,7 +2141,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
     {
         if(bIsPresentation && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) )
         {
-            bIsPresentation = FALSE;
+            bIsPresentation = sal_False;
         }
 
         if(bIsPresentation)
@@ -2425,7 +2425,7 @@ void SdXMLGraphicObjectShapeContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -2562,7 +2562,7 @@ void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars )
         mpChartContext->Characters( rChars );
 }
 
-SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( mpChartContext )
@@ -2726,7 +2726,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
 }
 
 SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     // #100592#
@@ -2892,7 +2892,7 @@ void SdXMLAppletShapeContext::EndElement()
     SdXMLShapeContext::EndElement();
 }
 
-SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
     {
@@ -3164,7 +3164,7 @@ void SdXMLPluginShapeContext::EndElement()
     SdXMLShapeContext::EndElement();
 }
 
-SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
     {
@@ -3328,7 +3328,7 @@ SdXMLFrameShapeContext::~SdXMLFrameShapeContext()
 {
 }
 
-SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -3604,7 +3604,7 @@ void SdXMLCustomShapeContext::EndElement()
 //////////////////////////////////////////////////////////////////////////////
 
 SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -3770,7 +3770,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::
     SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
 }
 
-SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) )
         return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList);
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index e17a35cf86..0ed5fe3de1 100644..100755
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -117,7 +117,7 @@ public:
     virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -181,7 +181,7 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext
     sal_Int32					mnRX;
     sal_Int32					mnRY;
 
-    USHORT						meKind;
+    sal_uInt16						meKind;
     sal_Int32					mnStartAngle;
     sal_Int32					mnEndAngle;
 public:
@@ -300,7 +300,7 @@ private:
     ::com::sun::star::awt::Point maStart;
     ::com::sun::star::awt::Point maEnd;
 
-    USHORT		mnType;
+    sal_uInt16		mnType;
 
     rtl::OUString	maStartShapeId;
     sal_Int32		mnStartGlueId;
@@ -420,7 +420,7 @@ public:
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -447,7 +447,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
     virtual void Characters( const ::rtl::OUString& rChars );
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
@@ -477,7 +477,7 @@ public:
     virtual void EndElement();
 
     // #100592#
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -510,7 +510,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -542,7 +542,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -595,7 +595,7 @@ public:
         sal_Bool bTemporaryShape);
     virtual ~SdXMLFrameShapeContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -627,7 +627,7 @@ public:
     virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
@@ -651,7 +651,7 @@ public:
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
     virtual void EndElement();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     // this is called from the parent group for each unparsed attribute in the attribute list
     virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue );
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index e0b7d61d3c..d0c2f36e76 100644..100755
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <comphelper/extract.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpshow.hxx"
@@ -211,7 +211,7 @@ SdXMLShowsContext::~SdXMLShowsContext()
     delete mpImpl;
 }
 
-SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLShowsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList )
 {
     if( mpImpl && p_nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) )
     {
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index a8086a0212..15701ab7e2 100644..100755
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -50,7 +50,7 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
     virtual ~SdXMLShowsContext();
 
-    virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index d51a9522e0..077cfbaabd 100644..100755
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -32,7 +32,7 @@
 
 #include "ximpstyl.hxx"
 #include <xmloff/XMLShapeStyleContext.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpnote.hxx"
@@ -56,7 +56,7 @@
 #include "layerimp.hxx"
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include "XMLNumberStylesImport.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -84,7 +84,7 @@ public:
     virtual ~SdXMLDrawingPagePropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
@@ -1630,9 +1630,9 @@ SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport
     }
 }
 
-BOOL SdXMLHeaderFooterDeclContext::IsTransient() const
+sal_Bool SdXMLHeaderFooterDeclContext::IsTransient() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 void SdXMLHeaderFooterDeclContext::EndElement()
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 093cc17c88..482a94c669 100644..100755
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -289,7 +289,7 @@ public:
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<	::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
     virtual void EndElement();
     virtual void Characters( const ::rtl::OUString& rChars );
 
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 1b2926b277..1b2926b277 100644..100755
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 8039281497..8039281497 100644..100755
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index 1b53a6de78..1b53a6de78 100644..100755
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx
index 8685566c59..d8e0362af3 100644..100755
--- a/xmloff/source/forms/controlelement.cxx
+++ b/xmloff/source/forms/controlelement.cxx
@@ -60,6 +60,8 @@ namespace xmloff
             case HIDDEN: return "hidden";
             case GRID: return "grid";
             case VALUERANGE: return "value-range";
+            case TIME: return "time";
+            case DATE: return "date";
 
             default: return "generic-control";
         }
diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index b2d5918cad..e150f447ff 100644..100755
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -64,6 +64,8 @@ namespace xmloff
             GRID,
             VALUERANGE,
             GENERIC_CONTROL,
+            TIME,
+            DATE,
 
             UNKNOWN	// must be the last element
         };
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 88e5b47559..88e5b47559 100644..100755
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index a3c9b7d964..6322350079 100644..100755
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index 984bb7a777..984bb7a777 100644..100755
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 246053a1d9..9e7167232d 100644..100755
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -31,12 +31,13 @@
 
 #include "elementexport.hxx"
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventexport.hxx"
 #include "formenums.hxx"
 #include "formcellbinding.hxx"
 #include "formcellbinding.hxx"
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
+#include "property_meta_data.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
@@ -323,6 +324,9 @@ namespace xmloff
         #endif
         }
 
+        // "new-style" properties ...
+        exportGenericHandlerAttributes();
+
         // common control attributes
         exportCommonControlAttributes();
 
@@ -476,6 +480,84 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
+    void OControlExport::exportGenericHandlerAttributes()
+    {
+        const Sequence< Property > aProperties = m_xPropertyInfo->getProperties();
+        for (   const Property* prop = aProperties.getConstArray();
+                prop != aProperties.getConstArray() + aProperties.getLength();
+                ++prop
+            )
+        {
+            try
+            {
+                // see if this property can already be handled with an IPropertyHandler (which, on the long
+                // term, should be the case for most, if not all, properties)
+                const PropertyDescription* propDescription = metadata::getPropertyDescription( prop->Name );
+                if ( propDescription == NULL )
+                    continue;
+
+                // let the factory provide the concrete handler. Note that caching, if desired, is the task
+                // of the factory
+                PPropertyHandler handler = (*propDescription->factory)( propDescription->propertyId );
+                ENSURE_OR_CONTINUE( handler.get() != NULL,
+                    "OControlExport::exportGenericHandlerAttributes: invalid property handler provided by the factory!" );
+
+                ::rtl::OUString attributeValue;
+                if ( propDescription->propertyGroup == NO_GROUP )
+                {
+                    // that's a property which has a direct mapping to an attribute
+                    if ( !shouldExportProperty( prop->Name ) )
+                        // TODO: in the future, we surely need a more sophisticated approach to this, involving the property
+                        // handler, or the property description
+                    {
+                        exportedProperty( prop->Name );
+                        continue;
+                    }
+
+                    const Any propValue = m_xProps->getPropertyValue( prop->Name );
+                    attributeValue = handler->getAttributeValue( propValue );
+                }
+                else
+                {
+                    // that's a property which is part of a group of properties, whose values, in their entity, comprise
+                    // a single attribute value
+
+                    // retrieve the descriptions of all other properties which add to the attribute value
+                    PropertyDescriptionList descriptions;
+                    metadata::getPropertyGroup( propDescription->propertyGroup, descriptions );
+
+                    // retrieve the values for all those properties
+                    PropertyValues aValues;
+                    for (   PropertyDescriptionList::iterator desc = descriptions.begin();
+                            desc != descriptions.end();
+                            ++desc
+                        )
+                    {
+                        // TODO: XMultiPropertySet?
+                        const Any propValue = m_xProps->getPropertyValue( (*desc)->propertyName );
+                        aValues[ (*desc)->propertyId ] = propValue;
+                    }
+
+                    // let the handler translate into an XML attribute value
+                    attributeValue = handler->getAttributeValue( aValues );
+                }
+
+                AddAttribute(
+                    propDescription->attribute.namespacePrefix,
+                    token::GetXMLToken( propDescription->attribute.attributeToken ),
+                    attributeValue
+                );
+
+                exportedProperty( prop->Name );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+    }
+
+    //---------------------------------------------------------------------
     void OControlExport::exportCommonControlAttributes()
     {
         size_t i=0;
@@ -1414,21 +1496,35 @@ namespace xmloff
         m_nClassId = FormComponentType::CONTROL;
         DBG_CHECK_PROPERTY( PROPERTY_CLASSID, sal_Int16 );
         m_xProps->getPropertyValue(PROPERTY_CLASSID) >>= m_nClassId;
+        bool knownType = false;
         switch (m_nClassId)
         {
             case FormComponentType::DATEFIELD:
+                m_eType = DATE;
+                knownType = true;
+                // NO BREAK
             case FormComponentType::TIMEFIELD:
+                if ( !knownType )
+                {
+                    m_eType = TIME;
+                    knownType = true;
+                }
+                m_nIncludeSpecial |= SCA_VALIDATION;
+                // NO BREAK
             case FormComponentType::NUMERICFIELD:
             case FormComponentType::CURRENCYFIELD:
             case FormComponentType::PATTERNFIELD:
-                m_eType = FORMATTED_TEXT;
+                if ( !knownType )
+                {
+                    m_eType = FORMATTED_TEXT;
+                    knownType = true;
+                }
                 // NO BREAK
             case FormComponentType::TEXTFIELD:
             {	// it's some kind of edit. To know which type we need further investigation
 
-                if (FORMATTED_TEXT != m_eType)
-                {	// not coming from the previous cases which had a class id .ne. TEXTFIELD
-
+                if ( !knownType )
+                {
                     // check if it's a formatted field
                     if (m_xPropertyInfo->hasPropertyByName(PROPERTY_FORMATKEY))
                     {
@@ -1464,14 +1560,21 @@ namespace xmloff
                                 m_eType = TEXT;
                         }
                     }
+                    knownType = true;
                 }
 
-                // attributes which are common to all the four types:
+                // attributes which are common to all the types:
                 // common attributes
                 m_nIncludeCommon =
-                    CCA_NAME | CCA_SERVICE_NAME | CCA_DISABLED | CCA_VALUE |
+                    CCA_NAME | CCA_SERVICE_NAME | CCA_DISABLED |
                     CCA_PRINTABLE | CCA_TAB_INDEX | CCA_TAB_STOP | CCA_TITLE;
 
+                if  (   ( m_nClassId != FormComponentType::DATEFIELD )
+                    &&  ( m_nClassId != FormComponentType::TIMEFIELD )
+                    )
+                    // date and time field values are handled differently nowadays
+                    m_nIncludeCommon |= CCA_VALUE;
+
                 // database attributes
                 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
 
@@ -1495,8 +1598,7 @@ namespace xmloff
                 // max and min values and validation:
                 if (FORMATTED_TEXT == m_eType)
                 {	// in general all controls represented as formatted-text have these props
-                    if (FormComponentType::PATTERNFIELD != m_nClassId)
-                        // but the PatternField does not have value limits
+                    if  ( FormComponentType::PATTERNFIELD != m_nClassId )   // except the PatternField
                         m_nIncludeSpecial |= SCA_MAX_VALUE | SCA_MIN_VALUE;
 
                     if (FormComponentType::TEXTFIELD != m_nClassId)
@@ -1505,8 +1607,13 @@ namespace xmloff
                 }
 
                 // if it's not a password field or rich text control, the CurrentValue needs to be stored, too
-                if ( PASSWORD != m_eType )
+                if  (   ( PASSWORD != m_eType )
+                    &&  ( DATE != m_eType )
+                    &&  ( TIME != m_eType )
+                    )
+                {
                     m_nIncludeCommon |= CCA_CURRENT_VALUE;
+                }
             }
             break;
 
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index c24609309b..269e086da3 100644..100755
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -162,6 +162,13 @@ namespace xmloff
         */
         void exportSubTags() throw (::com::sun::star::uno::Exception);
 
+        /** adds the attributes which are handled via generic IPropertyHandlers
+
+            <p>In the future, this really should be *all* attribiutes, instead of this shitload of
+            hand-crafted code we have currently ...</p>
+        */
+        void exportGenericHandlerAttributes();
+
         /**	adds common control attributes to the XMLExport context given
 
             <p>The attribute list of the context is not cleared initially, this is the responsibility of the caller.</p>
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 2322e5d386..e57aa4e8de 100644..100755
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -29,22 +29,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include <algorithm>
 #include "elementimport.hxx"
-#include <xmloff/xmlimp.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmluconv.hxx>
+#include "xmloff/xmlimp.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmluconv.hxx"
 #include "strings.hxx"
 #include "callbacks.hxx"
 #include "attriblistmerge.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "eventimport.hxx"
-#include <xmloff/txtstyli.hxx>
+#include "xmloff/txtstyli.hxx"
 #include "formenums.hxx"
-#include <xmloff/xmltoken.hxx>
+#include "xmloff/xmltoken.hxx"
 #include "gridcolumnproptranslator.hxx"
-#include <comphelper/extract.hxx>
-#include <comphelper/types.hxx>
+#include "property_description.hxx"
+#include "property_meta_data.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
@@ -55,9 +54,13 @@
 #include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 /** === end UNO includes === **/
+
 #include <tools/urlobj.hxx>
+#include <tools/diagnose_ex.h>
 #include <tools/time.hxx>
 #include <rtl/logfile.hxx>
+#include <comphelper/extract.hxx>
+#include <comphelper/types.hxx>
 
 #include <algorithm>
 #include <functional>
@@ -158,6 +161,7 @@ namespace xmloff
         ,m_rEventManager(_rEventManager)
         ,m_pStyleElement( NULL )
         ,m_xParentContainer(_rxParentContainer)
+        ,m_bImplicitGenericAttributeHandling( true )
     {
         OSL_ENSURE(m_xParentContainer.is(), "OElementImport::OElementImport: invalid parent container!");
     }
@@ -168,17 +172,41 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
+    ::rtl::OUString OElementImport::determineDefaultServiceName() const
+    {
+        return ::rtl::OUString();
+    }
+
+    //---------------------------------------------------------------------
     void OElementImport::StartElement(const Reference< sax::XAttributeList >& _rxAttrList)
     {
         ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" );
-        // call the base class. This should give us enough information (especially the service name)
-        // to create our UNO element
-        OPropertyImport::StartElement(_rxAttrList);
 
-        // create the element
+        const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap();
+        const ::rtl::OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) );
+        const ::rtl::OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute );
+
+        // retrieve the service name
+        if ( sControlImplementation.getLength() > 0 )
+        {
+            ::rtl::OUString sOOoImplementationName;
+            const sal_uInt16 nImplPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sControlImplementation, &sOOoImplementationName );
+            m_sServiceName = ( nImplPrefix == XML_NAMESPACE_OOO ) ? sOOoImplementationName : sControlImplementation;
+        }
+
+        if ( !m_sServiceName.getLength() )
+            determineDefaultServiceName();
+
+        // create the object *now*. This allows setting properties in the various handleAttribute methods.
+        // (Though currently not all code is migrated to this pattern, most attributes are still handled
+        // by remembering the value (via implPushBackPropertyValue), and setting the correct property value
+        // later (in OControlImport::StartElement).)
         m_xElement = createElement();
-        if ( !m_xInfo.is() && m_xElement.is() )
+        if ( m_xElement.is() )
             m_xInfo = m_xElement->getPropertySetInfo();
+
+        // call the base class
+        OPropertyImport::StartElement( _rxAttrList );
     }
 
     //---------------------------------------------------------------------
@@ -198,26 +226,61 @@ namespace xmloff
         if (!m_xElement.is())
             return;
 
+        // apply the non-generic properties
+        implApplySpecificProperties();
+
+        // set the generic properties
+        implApplyGenericProperties();
+
+        // set the style properties
+        if ( m_pStyleElement && m_xElement.is() )
+        {
+            Reference< XPropertySet > xPropTranslation =
+                new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) );
+            const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation );
+
+            const ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( );
+            if ( sNumberStyleName.getLength() )
+                // the style also has a number (sub) style
+                m_rContext.applyControlNumberStyle( m_xElement, sNumberStyleName );
+        }
+
+        // insert the element into the parent container
+        if (!m_sName.getLength())
+        {
+            OSL_ENSURE(sal_False, "OElementImport::EndElement: did not find a name attribute!");
+            m_sName = implGetDefaultName();
+        }
+
+        m_xParentContainer->insertByName(m_sName, makeAny(m_xElement));
+        LEAVE_LOG_CONTEXT( );
+    }
+
+    //---------------------------------------------------------------------
+    void OElementImport::implApplySpecificProperties()
+    {
+        if ( m_aValues.empty() )
+            return;
+
         // set all the properties we collected
 #if OSL_DEBUG_LEVEL > 0
         // check if the object has all the properties
         // (We do this in the non-pro version only. Doing it all the time would be much to expensive)
         if ( m_xInfo.is() )
         {
-            PropertyValueArray::iterator aEnd = m_aValues.end();
+            PropertyValueArray::const_iterator aEnd = m_aValues.end();
             for (	PropertyValueArray::iterator aCheck = m_aValues.begin();
                     aCheck != aEnd;
                     ++aCheck
                 )
             {
                 OSL_ENSURE(m_xInfo->hasPropertyByName(aCheck->Name),
-                        ::rtl::OString("OElementImport::EndElement: read a property (")
+                        ::rtl::OString("OElementImport::implApplySpecificProperties: read a property (")
                     +=	::rtl::OString(aCheck->Name.getStr(), aCheck->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
                     +=	::rtl::OString(") which does not exist on the element!"));
             }
         }
 #endif
-        OSL_ENSURE(!m_aValues.empty(), "OElementImport::EndElement: no properties read!");
 
         // set the properties
         const Reference< XMultiPropertySet > xMultiProps(m_xElement, UNO_QUERY);
@@ -254,7 +317,7 @@ namespace xmloff
             }
             catch(Exception&)
             {
-                OSL_ENSURE(sal_False, "OElementImport::EndElement: could not set the properties (using the XMultiPropertySet)!");
+                OSL_ENSURE(sal_False, "OElementImport::implApplySpecificProperties: could not set the properties (using the XMultiPropertySet)!");
             }
         }
 
@@ -275,42 +338,16 @@ namespace xmloff
                 catch(Exception&)
                 {
                     OSL_ENSURE(sal_False,
-                            ::rtl::OString("OElementImport::EndElement: could not set the property \"")
+                            ::rtl::OString("OElementImport::implApplySpecificProperties: could not set the property \"")
                         +=	::rtl::OString(aPropValues->Name.getStr(), aPropValues->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
                         +=	::rtl::OString("\"!"));
                 }
             }
         }
-
-        // set the generic properties
-        implImportGenericProperties();
-
-        // set the style properties
-        if ( m_pStyleElement && m_xElement.is() )
-        {
-            Reference< XPropertySet > xPropTranslation =
-                new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) );
-            const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation );
-
-            const ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( );
-            if ( sNumberStyleName.getLength() )
-                // the style also has a number (sub) style
-                m_rContext.applyControlNumberStyle( m_xElement, sNumberStyleName );
-        }
-
-        // insert the element into the parent container
-        if (!m_sName.getLength())
-        {
-            OSL_ENSURE(sal_False, "OElementImport::EndElement: did not find a name attribute!");
-            m_sName = implGetDefaultName();
-        }
-
-        m_xParentContainer->insertByName(m_sName, makeAny(m_xElement));
-        LEAVE_LOG_CONTEXT( );
     }
 
     //---------------------------------------------------------------------
-    void OElementImport::implImportGenericProperties()
+    void OElementImport::implApplyGenericProperties()
     {
         if ( m_aGenericValues.empty() )
             return;
@@ -335,7 +372,7 @@ namespace xmloff
                     if ( !xDynamicProperties.is() )
                     {
                     #if OSL_DEBUG_LEVEL > 0
-                        ::rtl::OString aMessage( "OElementImport::implImportGenericProperties: encountered an unknown property (" );
+                        ::rtl::OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" );
                         aMessage += ::rtl::OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US );
                         aMessage += "), but component is no PropertyBag!";
                         OSL_ENSURE( false, aMessage.getStr() );
@@ -353,7 +390,7 @@ namespace xmloff
                     m_xInfo = m_xElement->getPropertySetInfo();
                 }
 
-                // determine the type of the value (source forthe following conversion)
+                // determine the type of the value (source for the following conversion)
                 TypeClass eValueTypeClass = aPropValues->Value.getValueTypeClass();
                 const sal_Bool bValueIsSequence = TypeClass_SEQUENCE == eValueTypeClass;
                 if ( bValueIsSequence )
@@ -362,7 +399,7 @@ namespace xmloff
                     eValueTypeClass = aSimpleType.getTypeClass();
                 }
 
-                // determine the type of the property (target forthe following conversion)
+                // determine the type of the property (target for the following conversion)
                 const Property aProperty( m_xInfo->getPropertyByName( aPropValues->Name ) );
                 TypeClass ePropTypeClass = aProperty.Type.getTypeClass();
                 const sal_Bool bPropIsSequence = TypeClass_SEQUENCE == ePropTypeClass;
@@ -374,18 +411,18 @@ namespace xmloff
 
                 if ( bPropIsSequence != bValueIsSequence )
                 {
-                    OSL_ENSURE( false, "OElementImport::implImportGenericProperties: either both value and property should be a sequence, or none of them!" );
+                    OSL_ENSURE( false, "OElementImport::implApplyGenericProperties: either both value and property should be a sequence, or none of them!" );
                     continue;
                 }
 
                 if ( bValueIsSequence )
                 {
                     OSL_ENSURE( eValueTypeClass == TypeClass_ANY,
-                        "OElementImport::implImportGenericProperties: only ANYs should have been imported as generic list property!" );
+                        "OElementImport::implApplyGenericProperties: only ANYs should have been imported as generic list property!" );
                         // (OPropertyImport should produce only Sequencer< Any >, since it cannot know the real type
 
                     OSL_ENSURE( ePropTypeClass == TypeClass_SHORT,
-                        "OElementImport::implImportGenericProperties: conversion to sequences other than 'sequence< short >' not implemented, yet!" );
+                        "OElementImport::implApplyGenericProperties: conversion to sequences other than 'sequence< short >' not implemented, yet!" );
 
                     Sequence< Any > aXMLValueList;
                     aPropValues->Value >>= aXMLValueList;
@@ -428,13 +465,13 @@ namespace xmloff
                             aPropValues->Value <<= static_cast< sal_Int64 >( nVal );
                             break;
                         default:
-                            OSL_ENSURE( false, "OElementImport::implImportGenericProperties: unsupported value type!" );
+                            OSL_ENSURE( false, "OElementImport::implApplyGenericProperties: unsupported value type!" );
                             break;
                         }
                     }
                     break;
                     default:
-                        OSL_ENSURE( false, "OElementImport::implImportGenericProperties: non-double values not supported!" );
+                        OSL_ENSURE( false, "OElementImport::implApplyGenericProperties: non-double values not supported!" );
                         break;
                     }
                 }
@@ -485,38 +522,117 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    PropertyGroups::const_iterator OElementImport::impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const
     {
-        if (!m_sServiceName.getLength() &&
-            token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION))
-        {	// it's the service name
+        ENSURE_OR_RETURN( m_xInfo.is(), "OElementImport::impl_matchPropertyGroup: no property set info!", i_propertyGroups.end() );
 
-            ::rtl::OUString sImplName;
-            const sal_uInt16 nImplPrefix =
-                GetImport().GetNamespaceMap().GetKeyByAttrName( _rValue,
-                                                                &sImplName );
-            m_sServiceName = XML_NAMESPACE_OOO==nImplPrefix ? sImplName
-                                                            :_rValue;
+        for (   PropertyGroups::const_iterator group = i_propertyGroups.begin();
+                group != i_propertyGroups.end();
+                ++group
+            )
+        {
+            bool missingProp = false;
+            for (   PropertyDescriptionList::const_iterator prop = group->begin();
+                    prop != group->end();
+                    ++prop
+                )
+            {
+                if ( !m_xInfo->hasPropertyByName( (*prop)->propertyName ) )
+                {
+                    missingProp = true;
+                    break;
+                }
+            }
+
+            if ( missingProp )
+                // try next group
+                continue;
+
+            return group;
         }
-        else
+
+        return i_propertyGroups.end();
+    }
+
+    //---------------------------------------------------------------------
+    bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue )
+    {
+        // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers
+        const AttributeDescription attribute( metadata::getAttributeDescription( _nNamespaceKey, _rLocalName ) );
+        if ( attribute.attributeToken != XML_TOKEN_INVALID )
         {
-            if (!m_sName.getLength() &&
-                token::IsXMLToken( _rLocalName, token::XML_NAME))
-                // remember the name for later use in EndElement
-                m_sName = _rValue;
+            PropertyGroups propertyGroups;
+            metadata::getPropertyGroupList( attribute, propertyGroups );
+            const PropertyGroups::const_iterator pos = impl_matchPropertyGroup( propertyGroups );
+            if ( pos == propertyGroups.end() )
+                return false;
 
-            // maybe it's the style attribute?
-            if ( token::IsXMLToken( _rLocalName, token::XML_TEXT_STYLE_NAME ) )
+            do
             {
-                const SvXMLStyleContext* pStyleContext = m_rContext.getStyleElement( _rValue );
-                OSL_ENSURE( pStyleContext, "OPropertyImport::handleAttribute: do not know the style!" );
-                // remember the element for later usage.
-                m_pStyleElement = PTR_CAST( XMLTextStyleContext, pStyleContext );
+                const PropertyDescriptionList& rProperties( *pos );
+                const PropertyDescription* first = *rProperties.begin();
+                ENSURE_OR_BREAK( first != NULL, "OElementImport::handleAttribute: invalid property description!" );
+                const PPropertyHandler handler = (*first->factory)( first->propertyId );
+                ENSURE_OR_BREAK( handler.get() != NULL, "OElementImport::handleAttribute: invalid property handler!" );
+
+                PropertyValues aValues;
+                for (   PropertyDescriptionList::const_iterator propDesc = rProperties.begin();
+                        propDesc != rProperties.end();
+                        ++propDesc
+                    )
+                {
+                    aValues[ (*propDesc)->propertyId ] = Any();
+                }
+                if ( handler->getPropertyValues( _rValue, aValues ) )
+                {
+                    for (   PropertyDescriptionList::const_iterator propDesc = rProperties.begin();
+                            propDesc != rProperties.end();
+                            ++propDesc
+                        )
+                    {
+                        implPushBackPropertyValue( (*propDesc)->propertyName, aValues[ (*propDesc)->propertyId ] );
+                    }
+                }
             }
-            else
-                // let the base class handle it
-                OPropertyImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+            while ( false );
+
+            // handled
+            return true;
         }
+        return false;
+    }
+
+    //---------------------------------------------------------------------
+    bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    {
+        if ( token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION ) )
+            // ignore this, it has already been handled in OElementImport::StartElement
+            return true;
+
+        if ( token::IsXMLToken( _rLocalName, token::XML_NAME ) )
+        {
+            if ( !m_sName.getLength() )
+                // remember the name for later use in EndElement
+                m_sName = _rValue;
+            return true;
+        }
+
+        // maybe it's the style attribute?
+        if ( token::IsXMLToken( _rLocalName, token::XML_TEXT_STYLE_NAME ) )
+        {
+            const SvXMLStyleContext* pStyleContext = m_rContext.getStyleElement( _rValue );
+            OSL_ENSURE( pStyleContext, "OElementImport::handleAttribute: do not know the style!" );
+            // remember the element for later usage.
+            m_pStyleElement = PTR_CAST( XMLTextStyleContext, pStyleContext );
+            return true;
+        }
+
+        if ( m_bImplicitGenericAttributeHandling )
+            if ( tryGenericAttribute( _nNamespaceKey, _rLocalName, _rValue ) )
+                return true;
+
+        // let the base class handle it
+        return OPropertyImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
     }
 
     //---------------------------------------------------------------------
@@ -554,7 +670,7 @@ namespace xmloff
         {
             ::rtl::OUString sLocalAttrName = ::rtl::OUString::createFromAscii(_pAttributeName);
             if ( !encounteredAttribute( sLocalAttrName ) )
-                handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, ::rtl::OUString::createFromAscii( _pAttributeDefault ) );
+                OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, ::rtl::OUString::createFromAscii( _pAttributeDefault ) ) );
         }
     }
 
@@ -567,6 +683,7 @@ namespace xmloff
         :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer)
         ,m_eElementType(OControlElement::UNKNOWN)
     {
+        disableImplicitGenericAttributeHandling();
     }
 
     //---------------------------------------------------------------------
@@ -575,6 +692,38 @@ namespace xmloff
         :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer)
         ,m_eElementType(_eType)
     {
+        disableImplicitGenericAttributeHandling();
+    }
+
+    //---------------------------------------------------------------------
+    ::rtl::OUString OControlImport::determineDefaultServiceName() const
+    {
+        const sal_Char* pServiceName = NULL;
+        switch ( m_eElementType )
+        {
+        case OControlElement::TEXT:
+        case OControlElement::TEXT_AREA:
+        case OControlElement::PASSWORD:          pServiceName = "com.sun.star.form.component.TextField"; break;
+        case OControlElement::FILE:              pServiceName = "com.sun.star.form.component.FileControl"; break;
+        case OControlElement::FORMATTED_TEXT:    pServiceName = "com.sun.star.form.component.FormattedField"; break;
+        case OControlElement::FIXED_TEXT:        pServiceName = "com.sun.star.form.component.FixedText"; break;
+        case OControlElement::COMBOBOX:          pServiceName = "com.sun.star.form.component.ComboBox"; break;
+        case OControlElement::LISTBOX:           pServiceName = "com.sun.star.form.component.ListBox"; break;
+        case OControlElement::BUTTON:            pServiceName = "com.sun.star.form.component.CommandButton"; break;
+        case OControlElement::IMAGE:             pServiceName = "com.sun.star.form.component.ImageButton"; break;
+        case OControlElement::CHECKBOX:          pServiceName = "com.sun.star.form.component.CheckBox"; break;
+        case OControlElement::RADIO:             pServiceName = "com.sun.star.form.component.RadioButton"; break;
+        case OControlElement::FRAME:             pServiceName = "com.sun.star.form.component.GroupBox"; break;
+        case OControlElement::IMAGE_FRAME:       pServiceName = "com.sun.star.form.component.DatabaseImageControl"; break;
+        case OControlElement::HIDDEN:            pServiceName = "com.sun.star.form.component.HiddenControl"; break;
+        case OControlElement::GRID:              pServiceName = "com.sun.star.form.component.GridControl"; break;
+        case OControlElement::TIME:              pServiceName = "com.sun.star.form.component.DateField"; break;
+        case OControlElement::DATE:              pServiceName = "com.sun.star.form.component.TimeField"; break;
+        default:                                 break;
+        }
+        if ( pServiceName != NULL )
+            return ::rtl::OUString::createFromAscii( pServiceName );
+        return ::rtl::OUString();
     }
 
     //---------------------------------------------------------------------
@@ -585,7 +734,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL);
 
@@ -602,66 +751,84 @@ namespace xmloff
                     m_sControlId = _rValue;
                 }
             }
+            return true;
         }
-        else if ( _rLocalName.equalsAscii( pLinkedCellAttributeName ) )
+
+        if ( _rLocalName.equalsAscii( pLinkedCellAttributeName ) )
         {   // it's the address of a spreadsheet cell
             m_sBoundCellAddress = _rValue;
+            return true;
         }
-        else if ( _nNamespaceKey == XML_NAMESPACE_XFORMS && IsXMLToken( _rLocalName, XML_BIND ) )
+
+        if ( _nNamespaceKey == XML_NAMESPACE_XFORMS && IsXMLToken( _rLocalName, XML_BIND ) )
         {
             m_sBindingID = _rValue;
+            return true;
         }
-        else if ( _nNamespaceKey == XML_NAMESPACE_FORM && IsXMLToken( _rLocalName, XML_XFORMS_LIST_SOURCE )  )
+
+        if ( _nNamespaceKey == XML_NAMESPACE_FORM && IsXMLToken( _rLocalName, XML_XFORMS_LIST_SOURCE )  )
         {
             m_sListBindingID = _rValue;
+            return true;
         }
-        else if ( (_nNamespaceKey == XML_NAMESPACE_FORM && IsXMLToken( _rLocalName, XML_XFORMS_SUBMISSION ) ) ||
-                  ( _nNamespaceKey == XML_NAMESPACE_XFORMS && IsXMLToken( _rLocalName, XML_SUBMISSION ) ) )
+
+        if  (   (   ( _nNamespaceKey == XML_NAMESPACE_FORM )
+                &&  IsXMLToken( _rLocalName, XML_XFORMS_SUBMISSION )
+                )
+            ||  (   ( _nNamespaceKey == XML_NAMESPACE_XFORMS )
+                &&  IsXMLToken( _rLocalName, XML_SUBMISSION )
+                )
+            )
         {
             m_sSubmissionID = _rValue;
+            return true;
         }
-        else
+
+        if ( OElementImport::tryGenericAttribute( _nNamespaceKey, _rLocalName, _rValue ) )
+            return true;
+
+        static const sal_Char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCA_VALUE);
+        static const sal_Char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_VALUE);
+        static const sal_Char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCA_MIN_VALUE);
+        static const sal_Char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCA_MAX_VALUE);
+        static const sal_Char* pRepeatDelayAttributeName = OAttributeMetaData::getSpecialAttributeName( SCA_REPEAT_DELAY );
+
+        sal_Int32 nHandle = -1;
+        if ( _rLocalName.equalsAscii( pValueAttributeName ) )
+            nHandle = PROPID_VALUE;
+        else if ( _rLocalName.equalsAscii( pCurrentValueAttributeName ) )
+            nHandle = PROPID_CURRENT_VALUE;
+        else if ( _rLocalName.equalsAscii( pMinValueAttributeName ) )
+            nHandle = PROPID_MIN_VALUE;
+        else if ( _rLocalName.equalsAscii( pMaxValueAttributeName ) )
+            nHandle = PROPID_MAX_VALUE;
+        if ( nHandle != -1 )
         {
-            static const sal_Char* pValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCA_VALUE);
-            static const sal_Char* pCurrentValueAttributeName = OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_VALUE);
-            static const sal_Char* pMinValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCA_MIN_VALUE);
-            static const sal_Char* pMaxValueAttributeName = OAttributeMetaData::getSpecialAttributeName(SCA_MAX_VALUE);
-            static const sal_Char* pRepeatDelayAttributeName = OAttributeMetaData::getSpecialAttributeName( SCA_REPEAT_DELAY );
-
-            sal_Int32 nHandle = -1;
-            if ( _rLocalName.equalsAscii( pValueAttributeName ) )
-                nHandle = PROPID_VALUE;
-            else if ( _rLocalName.equalsAscii( pCurrentValueAttributeName ) )
-                nHandle = PROPID_CURRENT_VALUE;
-            else if ( _rLocalName.equalsAscii( pMinValueAttributeName ) )
-                nHandle = PROPID_MIN_VALUE;
-            else if ( _rLocalName.equalsAscii( pMaxValueAttributeName ) )
-                nHandle = PROPID_MAX_VALUE;
-            if ( nHandle != -1 )
+            // for the moment, simply remember the name and the value
+            PropertyValue aProp;
+            aProp.Name = _rLocalName;
+            aProp.Handle = nHandle;
+            aProp.Value <<= _rValue;
+            m_aValueProperties.push_back(aProp);
+            return true;
+        }
+
+        if ( _rLocalName.equalsAscii( pRepeatDelayAttributeName ) )
+        {
+            ::Time aTime;
+            sal_Int32 nFractions = 0;
+            if ( SvXMLUnitConverter::convertTimeDuration( _rValue, aTime, &nFractions ) )
             {
-                // for the moment, simply remember the name and the value
                 PropertyValue aProp;
-                aProp.Name = _rLocalName;
-                aProp.Handle = nHandle;
-                aProp.Value <<= _rValue;
-                m_aValueProperties.push_back(aProp);
-            }
-            else if ( _rLocalName.equalsAscii( pRepeatDelayAttributeName ) )
-            {
-                ::Time aTime;
-                sal_Int32 nFractions = 0;
-                if ( SvXMLUnitConverter::convertTimeDuration( _rValue, aTime, &nFractions ) )
-                {
-                    PropertyValue aProp;
-                    aProp.Name = PROPERTY_REPEAT_DELAY;
-                    aProp.Value <<= (sal_Int32)( ( ( aTime.GetMSFromTime() / 1000 ) * 1000 ) + nFractions );
+                aProp.Name = PROPERTY_REPEAT_DELAY;
+                aProp.Value <<= (sal_Int32)( ( ( aTime.GetMSFromTime() / 1000 ) * 1000 ) + nFractions );
 
-                    implPushBackPropertyValue(aProp);
-                }
+                implPushBackPropertyValue(aProp);
             }
-            else
-                OElementImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+            return true;
         }
+
+        return OElementImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
     }
 
     //---------------------------------------------------------------------
@@ -714,6 +881,7 @@ namespace xmloff
                     ++aValueProps
                 )
             {
+                bool bSuccess = false;
                 switch (aValueProps->Handle)
                 {
                     case PROPID_VALUE:
@@ -723,6 +891,7 @@ namespace xmloff
                         if (!bRetrievedValues)
                         {
                             getValuePropertyNames(m_eElementType, nClassId, pCurrentValueProperty, pValueProperty);
+                            ENSURE_OR_BREAK( pCurrentValueProperty && pValueProperty, "OControlImport::StartElement: illegal value property names!" );
                             bRetrievedValues = sal_True;
                         }
                         OSL_ENSURE((PROPID_VALUE != aValueProps->Handle) || pValueProperty,
@@ -735,6 +904,7 @@ namespace xmloff
                             aValueProps->Name = ::rtl::OUString::createFromAscii(pValueProperty);
                         else
                             aValueProps->Name = ::rtl::OUString::createFromAscii(pCurrentValueProperty);
+                        bSuccess = true;
                     }
                     break;
                     case PROPID_MIN_VALUE:
@@ -744,6 +914,7 @@ namespace xmloff
                         if (!bRetrievedValueLimits)
                         {
                             getValueLimitPropertyNames(nClassId, pMinValueProperty, pMaxValueProperty);
+                            ENSURE_OR_BREAK( pMinValueProperty && pMaxValueProperty, "OControlImport::StartElement: illegal value limit property names!" );
                             bRetrievedValueLimits = sal_True;
                         }
                         OSL_ENSURE((PROPID_MIN_VALUE != aValueProps->Handle) || pMinValueProperty,
@@ -756,10 +927,14 @@ namespace xmloff
                             aValueProps->Name = ::rtl::OUString::createFromAscii(pMinValueProperty);
                         else
                             aValueProps->Name = ::rtl::OUString::createFromAscii(pMaxValueProperty);
+                        bSuccess = true;
                     }
                     break;
                 }
 
+                if ( !bSuccess )
+                    continue;
+
                 // translate the value
                 implTranslateValueProperty(m_xInfo, *aValueProps);
                 // add the property to the base class' array
@@ -980,7 +1155,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName,
+    bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName,
         const ::rtl::OUString& _rValue )
     {
         if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) )
@@ -990,16 +1165,19 @@ namespace xmloff
                 _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition )
             ) >>= m_nImagePosition );
             m_bHaveImagePosition = sal_True;
+            return true;
         }
-        else if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) )
+
+        if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) )
         {
             OSL_VERIFY( PropertyConversion::convertString(
                 m_rContext.getGlobalContext(), ::getCppuType( &m_nImageAlign ),
                 _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImageAlign )
             ) >>= m_nImageAlign );
+            return true;
         }
-        else
-            OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
+
+        return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
     }
 
     //---------------------------------------------------------------------
@@ -1047,14 +1225,16 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName,
+    bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName,
         const ::rtl::OUString& _rValue)
     {
         static const ::rtl::OUString s_sReferenceAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR));
         if (_rLocalName == s_sReferenceAttributeName)
+        {
             m_sReferringControls = _rValue;
-        else
-            OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+            return true;
+        }
+        return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
     }
 
     //=====================================================================
@@ -1068,7 +1248,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         static const ::rtl::OUString s_sEchoCharAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR));
         if (_rLocalName == s_sEchoCharAttributeName)
@@ -1083,9 +1263,9 @@ namespace xmloff
             else
                 aEchoChar.Value <<= (sal_Int16)0;
             implPushBackPropertyValue(aEchoChar);
+            return true;
         }
-        else
-            OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+        return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
     }
 
     //=====================================================================
@@ -1099,7 +1279,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         // need special handling for the State & CurrentState properties:
         // they're stored as booleans, but expected to be int16 properties
@@ -1122,9 +1302,9 @@ namespace xmloff
 
                 implPushBackPropertyValue(aNewValue);
             }
+            return true;
         }
-        else
-            OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
+        return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
     }
 
     //=====================================================================
@@ -1138,7 +1318,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         static const sal_Char* s_pTargetLocationAttributeName	= OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION );
         static const sal_Char* s_pImageDataAttributeName		= OAttributeMetaData::getCommonControlAttributeName( CCA_IMAGE_DATA );
@@ -1157,18 +1337,18 @@ namespace xmloff
         if ( bMakeAbsolute && ( _rValue.getLength() > 0  ) )
         {
             // make a global URL out of the local one
-                        ::rtl::OUString sAdjustedValue;
-                        // only resolve image related url
-                        // we don't want say form url targets to be resolved
-                        // using ResolveGraphicObjectURL
-                        if ( 0 == _rLocalName.compareToAscii( s_pImageDataAttributeName ) )
-                                sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE );
-                        else
-                                 sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
-                        OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
+            ::rtl::OUString sAdjustedValue;
+            // only resolve image related url
+            // we don't want say form url targets to be resolved
+            // using ResolveGraphicObjectURL
+            if ( 0 == _rLocalName.compareToAscii( s_pImageDataAttributeName ) )
+                sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, sal_False );
+            else
+                sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
+            return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
         }
-        else
-            OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
+
+        return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
     }
 
     //=====================================================================
@@ -1205,14 +1385,14 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue )
+    bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue )
     {
         if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) )
         {
             GetImport().GetMM100UnitConverter().convertNumber( m_nStepSizeValue, _rValue );
+            return true;
         }
-        else
-            OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
+        return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
     }
 
     //---------------------------------------------------------------------
@@ -1338,7 +1518,7 @@ namespace xmloff
                 }
             }
 
-            // additionally, we need to set the "RichText" property of our element to TRUE
+            // additionally, we need to set the "RichText" property of our element to sal_True
             // (the presence of the text:p is used as indicator for the value of the RichText property)
             sal_Bool bHasRichTextProperty = sal_False;
             if ( m_xInfo.is() )
@@ -1535,7 +1715,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE);
         if ( _rLocalName.equalsAscii(pListSourceAttributeName) )
@@ -1560,12 +1740,16 @@ namespace xmloff
             }
 
             implPushBackPropertyValue( aListSource );
+            return true;
         }
-        else if ( _rLocalName.equalsAscii( OAttributeMetaData::getBindingAttributeName( BA_LIST_CELL_RANGE ) ) )
+
+        if ( _rLocalName.equalsAscii( OAttributeMetaData::getBindingAttributeName( BA_LIST_CELL_RANGE ) ) )
         {
             m_sCellListSource = _rValue;
+            return true;
         }
-        else if ( _rLocalName.equalsAscii( OAttributeMetaData::getBindingAttributeName( BA_LIST_LINKING_TYPE ) ) )
+
+        if ( _rLocalName.equalsAscii( OAttributeMetaData::getBindingAttributeName( BA_LIST_LINKING_TYPE ) ) )
         {
             sal_Int16 nLinkageType = 0;
             PropertyConversion::convertString(
@@ -1576,9 +1760,10 @@ namespace xmloff
             ) >>= nLinkageType;
 
             m_bLinkWithIndexes = ( nLinkageType != 0 );
+            return true;
         }
-        else
-            OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+
+        return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
     }
 
     //---------------------------------------------------------------------
@@ -1776,7 +1961,9 @@ namespace xmloff
                 ||	(OControlElement::FORMATTED_TEXT == _eType)
                 ||	(OControlElement::CHECKBOX == _eType)
                 ||	(OControlElement::LISTBOX == _eType)
-                ||	(OControlElement::COMBOBOX == _eType),
+                ||	(OControlElement::COMBOBOX == _eType)
+                ||	(OControlElement::TIME == _eType)
+                ||	(OControlElement::DATE == _eType),
                 "OColumnWrapperImport::implCreateChildContext: invalid or unrecognized sub element!");
 
         switch (_eType)
@@ -1871,19 +2058,25 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    void OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+    bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
     {
         // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them)
         static const ::rtl::OUString s_sMasterFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields));
         static const ::rtl::OUString s_sDetailFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels));
 
-        if (s_sMasterFieldsAttributeName == _rLocalName)
+        if ( s_sMasterFieldsAttributeName == _rLocalName )
+        {
             implTranslateStringListProperty(PROPERTY_MASTERFIELDS, _rValue);
-        else if (s_sDetailFieldsAttributeName == _rLocalName)
+            return true;
+        }
+
+        if ( s_sDetailFieldsAttributeName == _rLocalName )
+        {
             implTranslateStringListProperty(PROPERTY_DETAILFIELDS, _rValue);
+            return true;
+        }
 
-        else
-            OFormImport_Base::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
+        return OFormImport_Base::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
     }
 
     //---------------------------------------------------------------------
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 4f5dd8e7e0..bd6af1501b 100644..100755
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -32,6 +32,9 @@
 #include "propertyimport.hxx"
 #include "controlelement.hxx"
 #include "valueproperties.hxx"
+#include "eventimport.hxx"
+#include "logging.hxx"
+#include "property_description.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XTextCursor.hpp>
@@ -40,9 +43,8 @@
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 /** === end UNO includes === **/
+
 #include <comphelper/stl_types.hxx>
-#include "eventimport.hxx"
-#include "logging.hxx"
 
 class XMLTextStyleContext;
 //.........................................................................
@@ -84,22 +86,25 @@ namespace xmloff
                 ,public OStackedLogging
     {
     protected:
-        ::rtl::OUString			m_sServiceName;		// the service name as extracted from the service-name attribute
-        ::rtl::OUString			m_sName;			// the name of the object (redundant, already contained in the base class' array)
+        ::rtl::OUString			    m_sServiceName;		// the service name as extracted from the service-name attribute
+        ::rtl::OUString			    m_sName;			// the name of the object (redundant, already contained in the base class' array)
         OFormLayerXMLImport_Impl&	m_rFormImport;		// the form import context
-        IEventAttacherManager&	m_rEventManager;	// the event attacher manager
+        IEventAttacherManager&	    m_rEventManager;	// the event attacher manager
 
         const XMLTextStyleContext*	m_pStyleElement;	// the XML element which describes the style we encountered
                                                         // while reading our element
 
+        /// the parent container to insert the new element into
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
-                        m_xParentContainer;
-            // the parent container to insert the new element into
+                                    m_xParentContainer;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
-                        m_xInfo;
+        /// the element we're creating. Valid after StartElement
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                        m_xElement;				// the element we're creating. Valid after StartElement
+                                    m_xElement;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+                                    m_xInfo;
+
+        bool                        m_bImplicitGenericAttributeHandling;
 
     public:
         /** ctor
@@ -133,7 +138,7 @@ namespace xmloff
         virtual void	EndElement();
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
 
@@ -159,13 +164,28 @@ namespace xmloff
         */
         void		simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault);
 
+        /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic
+            attribute handler mechanisms
+        */
+        bool        tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue );
+
+        /** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class
+            must do this explicitly at a suitable place in its own |handleAttribute|
+        */
+        void        disableImplicitGenericAttributeHandling() { m_bImplicitGenericAttributeHandling = false; }
+
     private:
         ::rtl::OUString implGetDefaultName() const;
-        void implImportGenericProperties();
+        void implApplyGenericProperties();
+        void implApplySpecificProperties();
 
         /** sets the style properties which have been read for the element (if any)
         */
         void implSetStyleProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject );
+
+        PropertyGroups::const_iterator impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const;
+
+        virtual ::rtl::OUString determineDefaultServiceName() const;
     };
 
     //=====================================================================
@@ -226,7 +246,7 @@ namespace xmloff
         virtual void	EndElement();
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
 
@@ -240,6 +260,8 @@ namespace xmloff
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo,
             ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue);
 
+        virtual ::rtl::OUString determineDefaultServiceName() const;
+
         /** registers the given cell address as value binding address for our element
 
             <p>The default implementation simply calls registerCellValueBinding at our import
@@ -266,7 +288,6 @@ namespace xmloff
         // OElementImport overridables
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                         createElement();
-
     };
 
     // TODO:
@@ -296,7 +317,7 @@ namespace xmloff
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
 
         // OPropertyImport overridables
-        virtual void	handleAttribute( sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute( sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue
        );
@@ -322,7 +343,7 @@ namespace xmloff
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
     };
@@ -340,7 +361,7 @@ namespace xmloff
         );
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
     };
@@ -359,7 +380,7 @@ namespace xmloff
 
     protected:
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
     };
@@ -381,7 +402,7 @@ namespace xmloff
 
     protected:
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
     };
@@ -431,7 +452,7 @@ namespace xmloff
             const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList );
 
         // OPropertyImport overridables
-        virtual void	handleAttribute( sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute( sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue );
     };
@@ -517,7 +538,7 @@ namespace xmloff
         virtual void	EndElement();
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
 
@@ -716,7 +737,7 @@ namespace xmloff
             sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName);
 
         // OPropertyImport overridables
-        virtual void	handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool    handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
 
diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
index 5b92da41d3..5b92da41d3 100644..100755
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ b/xmloff/source/forms/elementimport_impl.hxx
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 9d898b6102..9d898b6102 100644..100755
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index 262ba421a2..262ba421a2 100644..100755
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index cc3f7833ef..cc3f7833ef 100644..100755
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index b7ae845907..b7ae845907 100644..100755
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index bc3f74a511..a91695640f 100644..100755
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formattributes.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index e3908e989b..e3908e989b 100644..100755
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 58d3b252f6..58d3b252f6 100644..100755
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index 02aa33f8ad..02aa33f8ad 100644..100755
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 3207344b45..3207344b45 100644..100755
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 5b34d8f5b2..5b34d8f5b2 100644..100755
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index 91b6ac4019..e783d240fe 100644..100755
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "formevents.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlevent.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index e0d356519d..e0d356519d 100644..100755
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 3d8ef0e911..c2edb3f19d 100644..100755
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/formlayerexport.hxx>
 #include "strings.hxx"
 #include "elementexport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "layerexport.hxx"
 #include "propertyexport.hxx"
@@ -94,12 +94,6 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
-    {
-        return m_pImpl->getStylePropertyMapper();
-    }
-
-    //---------------------------------------------------------------------
     void OFormLayerXMLExport::initialize()
     {
         m_pImpl->clear();
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 4217b95ab7..d172da6904 100644..100755
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -61,12 +61,6 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    ::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
-    {
-        return m_pImpl->getStylePropertyMapper();
-    }
-
-    //---------------------------------------------------------------------
     void OFormLayerXMLImport::setAutoStyleContext(SvXMLStylesContext* _pNewContext)
     {
         m_pImpl->setAutoStyleContext(_pNewContext);
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index a07d65a780..29e1d41703 100644..100755
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include <xmloff/formsimp.hxx>
@@ -50,7 +50,7 @@ XMLFormsContext::~XMLFormsContext()
 {
 }
 
-SvXMLImportContext * XMLFormsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * XMLFormsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
     return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
diff --git a/xmloff/source/forms/formstyles.cxx b/xmloff/source/forms/formstyles.cxx
index 5c02f64ff2..5c02f64ff2 100644..100755
--- a/xmloff/source/forms/formstyles.cxx
+++ b/xmloff/source/forms/formstyles.cxx
diff --git a/xmloff/source/forms/formstyles.hxx b/xmloff/source/forms/formstyles.hxx
index bc15ae032b..bc15ae032b 100644..100755
--- a/xmloff/source/forms/formstyles.hxx
+++ b/xmloff/source/forms/formstyles.hxx
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index 86b317d7a7..86b317d7a7 100644..100755
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index bf2b18ada8..bf2b18ada8 100644..100755
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
new file mode 100755
index 0000000000..72a9edf38f
--- /dev/null
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -0,0 +1,90 @@
+/*************************************************************************
+ * 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 "precompiled_xmloff.hxx"
+
+#include "forms/form_handler_factory.hxx"
+#include "vcl_date_handler.hxx"
+#include "vcl_time_handler.hxx"
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    namespace
+    {
+        static PPropertyHandler s_pVCLDateHandler = NULL;
+        static PPropertyHandler s_pVCLTimeHandler = NULL;
+    }
+
+    //==================================================================================================================
+    //= FormHandlerFactory
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    PPropertyHandler FormHandlerFactory::getFormPropertyHandler( const PropertyId i_propertyId )
+    {
+        PPropertyHandler pHandler( NULL );
+
+        switch ( i_propertyId )
+        {
+        case PID_DATE_MIN:
+        case PID_DATE_MAX:
+        case PID_DEFAULT_DATE:
+        case PID_DATE:
+            if ( s_pVCLDateHandler.get() == NULL )
+            {
+                ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+                if ( s_pVCLDateHandler == NULL )
+                    s_pVCLDateHandler = new VCLDateHandler();
+            }
+            pHandler = s_pVCLDateHandler;
+            break;
+
+        case PID_TIME_MIN:
+        case PID_TIME_MAX:
+        case PID_DEFAULT_TIME:
+        case PID_TIME:
+            if ( s_pVCLTimeHandler.get() == NULL )
+            {
+                ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+                if ( s_pVCLTimeHandler == NULL )
+                    s_pVCLTimeHandler = new VCLTimeHandler();
+            }
+            pHandler = s_pVCLTimeHandler;
+            break;
+
+        default:
+            OSL_ENSURE( false, "FormHandlerFactory::getFormPropertyHandler: unknown property ID!" );
+            break;
+        }
+
+        return pHandler;
+    }
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx
new file mode 100755
index 0000000000..d599e0e259
--- /dev/null
+++ b/xmloff/source/forms/handler/property_handler_base.cxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ * 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 "precompiled_xmloff.hxx"
+
+#include "property_handler_base.hxx"
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PropertyHandlerBase
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    PropertyHandlerBase::~PropertyHandlerBase()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    oslInterlockedCount SAL_CALL PropertyHandlerBase::acquire()
+    {
+        return osl_incrementInterlockedCount( &m_refCount );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    oslInterlockedCount SAL_CALL PropertyHandlerBase::release()
+    {
+        oslInterlockedCount decremented = osl_decrementInterlockedCount( &m_refCount );
+        if ( 0 == decremented )
+            delete this;
+        return decremented;
+    }
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
new file mode 100755
index 0000000000..01f2a9e843
--- /dev/null
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_HANDLER_BASE_HXX
+#define XMLOFF_PROPERTY_HANDLER_BASE_HXX
+
+#include "forms/property_handler.hxx"
+
+#include <osl/interlck.h>
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PropertyHandlerBase
+    //==================================================================================================================
+    class PropertyHandlerBase : public IPropertyHandler
+    {
+    protected:
+        PropertyHandlerBase()
+            :m_refCount( 0 )
+        {
+        }
+
+        virtual ~PropertyHandlerBase();
+
+        // IReference
+        virtual oslInterlockedCount SAL_CALL acquire();
+        virtual oslInterlockedCount SAL_CALL release();
+
+    private:
+        oslInterlockedCount m_refCount;
+    };
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_HANDLER_BASE_HXX
diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx
new file mode 100755
index 0000000000..a8404ed04e
--- /dev/null
+++ b/xmloff/source/forms/handler/vcl_date_handler.cxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ * 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 "precompiled_xmloff.hxx"
+
+#include "vcl_date_handler.hxx"
+#include "xmloff/xmluconv.hxx"
+
+#include <com/sun/star/util/DateTime.hpp>
+
+#include <tools/diagnose_ex.h>
+#include <tools/date.hxx>
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::util::DateTime;
+
+    //==================================================================================================================
+    //= VCLDateHandler
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    VCLDateHandler::VCLDateHandler()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const
+    {
+        OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" );
+        return ::rtl::OUString();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const
+    {
+        sal_Int32 nVCLDate(0);
+        OSL_VERIFY( i_propertyValue >>= nVCLDate );
+        ::Date aVCLDate( nVCLDate );
+
+        DateTime aDateTime; // default-inited to 0
+        aDateTime.Day = aVCLDate.GetDay();
+        aDateTime.Month = aVCLDate.GetMonth();
+        aDateTime.Year = aVCLDate.GetYear();
+
+        ::rtl::OUStringBuffer aBuffer;
+        SvXMLUnitConverter::convertDateTime( aBuffer, aDateTime, sal_False );
+        return aBuffer.makeStringAndClear();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool VCLDateHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const
+    {
+        sal_Int32 nVCLDate(0);
+
+        DateTime aDateTime;
+        if ( SvXMLUnitConverter::convertDateTime( aDateTime, i_attributeValue ) )
+        {
+            ::Date aVCLDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
+            nVCLDate = aVCLDate.GetDate();
+        }
+        else
+        {
+            // compatibility format, before we wrote those values in XML-schema compatible form
+            if ( !SvXMLUnitConverter::convertNumber( nVCLDate, i_attributeValue ) )
+            {
+                OSL_ENSURE( false, "VCLDateHandler::getPropertyValues: unknown date format (no XML-schema date, no legacy integer)!" );
+                return false;
+            }
+        }
+
+        const Any aPropertyValue( makeAny( nVCLDate ) );
+
+        OSL_ENSURE( o_propertyValues.size() == 1, "VCLDateHandler::getPropertyValues: date strings represent exactly one property - not more, not less!" );
+        for (   PropertyValues::iterator prop = o_propertyValues.begin();
+                prop != o_propertyValues.end();
+                ++prop
+            )
+        {
+            prop->second = aPropertyValue;
+        }
+        return true;
+    }
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx
new file mode 100755
index 0000000000..44a7f7395c
--- /dev/null
+++ b/xmloff/source/forms/handler/vcl_date_handler.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_VCL_DATE_HANDLER_HXX
+#define XMLOFF_VCL_DATE_HANDLER_HXX
+
+#include "property_handler_base.hxx"
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= VCLDateHandler
+    //==================================================================================================================
+    class VCLDateHandler : public PropertyHandlerBase
+    {
+    public:
+        VCLDateHandler();
+
+        // IPropertyHandler
+        virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const;
+        virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const;
+        virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const;
+    };
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_VCL_DATE_HANDLER_HXX
diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx
new file mode 100755
index 0000000000..98ea739d04
--- /dev/null
+++ b/xmloff/source/forms/handler/vcl_time_handler.cxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ * 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 "precompiled_xmloff.hxx"
+
+#include "vcl_time_handler.hxx"
+#include "xmloff/xmluconv.hxx"
+
+#include <com/sun/star/util/DateTime.hpp>
+
+#include <tools/diagnose_ex.h>
+#include <tools/time.hxx>
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::util::DateTime;
+
+    //==================================================================================================================
+    //= VCLTimeHandler
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    VCLTimeHandler::VCLTimeHandler()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const
+    {
+        OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" );
+        return ::rtl::OUString();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const
+    {
+        sal_Int32 nVCLTime(0);
+        OSL_VERIFY( i_propertyValue >>= nVCLTime );
+        ::Time aVCLTime( nVCLTime );
+
+        DateTime aDateTime; // default-inited to 0
+        aDateTime.Hours = aVCLTime.GetHour();
+        aDateTime.Minutes = aVCLTime.GetMin();
+        aDateTime.Seconds = aVCLTime.GetSec();
+        aDateTime.HundredthSeconds = aVCLTime.Get100Sec();
+
+        ::rtl::OUStringBuffer aBuffer;
+        SvXMLUnitConverter::convertTime( aBuffer, aDateTime );
+        return aBuffer.makeStringAndClear();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool VCLTimeHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const
+    {
+        sal_Int32 nVCLTime(0);
+
+        DateTime aDateTime;
+        if ( SvXMLUnitConverter::convertTime( aDateTime, i_attributeValue ) )
+        {
+            ::Time aVCLTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds );
+            nVCLTime = aVCLTime.GetTime();
+        }
+        else
+        {
+            // compatibility format, before we wrote those values in XML-schema compatible form
+            if ( !SvXMLUnitConverter::convertNumber( nVCLTime, i_attributeValue ) )
+            {
+                OSL_ENSURE( false, "VCLTimeHandler::getPropertyValues: unknown time format (no XML-schema time, no legacy integer)!" );
+                return false;
+            }
+        }
+
+        const Any aPropertyValue( makeAny( nVCLTime ) );
+
+        OSL_ENSURE( o_propertyValues.size() == 1, "VCLTimeHandler::getPropertyValues: time strings represent exactly one property - not more, not less!" );
+        for (   PropertyValues::iterator prop = o_propertyValues.begin();
+                prop != o_propertyValues.end();
+                ++prop
+            )
+        {
+            prop->second = aPropertyValue;
+        }
+        return true;
+    }
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx
new file mode 100755
index 0000000000..0d84be983b
--- /dev/null
+++ b/xmloff/source/forms/handler/vcl_time_handler.hxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_VCL_TIME_HANDLER_HXX
+#define XMLOFF_VCL_TIME_HANDLER_HXX
+
+#include "property_handler_base.hxx"
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= VCLTimeHandler
+    //==================================================================================================================
+    class VCLTimeHandler : public PropertyHandlerBase
+    {
+    public:
+        VCLTimeHandler();
+
+        // IPropertyHandler
+        virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const;
+        virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const;
+        virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const;
+    };
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_VCL_TIME_HANDLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx
index d457e2bf3d..d457e2bf3d 100644..100755
--- a/xmloff/source/forms/ifacecompare.hxx
+++ b/xmloff/source/forms/ifacecompare.hxx
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index a01e6400f7..7718f73fe7 100644..100755
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -34,7 +34,7 @@
 #include "strings.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/prhdlfac.hxx>
@@ -55,7 +55,7 @@
 #include <xmloff/XMLEventExport.hxx>
 #include "formevents.hxx"
 #include <xmloff/xmlnumfe.hxx>
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/text/XText.hpp>
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 11a665014e..11a665014e 100644..100755
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 7205a87081..6d958df6c1 100644..100755
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -59,9 +59,9 @@
 #include "controlpropertymap.hxx"
 #include "formevents.hxx"
 #include "formcellbinding.hxx"
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/logfile.hxx>
 #include <algorithm>
 
@@ -240,11 +240,6 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
         TabulatorCycle_RECORDS, OEnumMapper::getEnumMap(OEnumMapper::epTabCyle),
         &::getCppuType( static_cast<TabulatorCycle*>(NULL) ));
 
-    // initialize our style map
-    m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
-        ::rtl::Reference< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.get());
-        m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.get(), _rImporter);
-
     // 'initialize'
     m_aCurrentPageIds = m_aControlIds.end();
 }
@@ -419,12 +414,6 @@ void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPrope
 }
 
 //---------------------------------------------------------------------
-::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport_Impl::getStylePropertyMapper() const
-{
-    return m_xImportMapper;
-}
-
-//---------------------------------------------------------------------
 void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPage)
 {
     m_xCurrentPageFormsSupp.clear();
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 2a87dced67..81146a64f2 100644..100755
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -93,10 +93,6 @@ namespace xmloff
         SvXMLStylesContext*					m_pAutoStyles;
 
     protected:
-        // style handling
-        ::rtl::Reference< XMLPropertyHandlerFactory >	m_xPropertyHandlerFactory;
-        ::rtl::Reference< SvXMLImportPropertyMapper >	m_xImportMapper;
-
         DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, MapString2PropertySet );
         DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map);
 
@@ -169,10 +165,6 @@ namespace xmloff
         OFormLayerXMLImport_Impl(SvXMLImport& _rImporter);
         virtual ~OFormLayerXMLImport_Impl();
 
-        /** retrieves the property mapper form form related auto styles.
-        */
-        ::rtl::Reference< SvXMLImportPropertyMapper > getStylePropertyMapper() const;
-
         /** start importing the forms of the given page
         */
         void startPage(
diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx
index 2e2fa89c9c..2e2fa89c9c 100644..100755
--- a/xmloff/source/forms/logging.cxx
+++ b/xmloff/source/forms/logging.cxx
diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx
index ade78f81a4..ade78f81a4 100644..100755
--- a/xmloff/source/forms/logging.hxx
+++ b/xmloff/source/forms/logging.hxx
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
deleted file mode 100644
index 8c46a4fbf3..0000000000
--- a/xmloff/source/forms/makefile.mk
+++ /dev/null
@@ -1,70 +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=xmloff
-TARGET=forms
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/officeforms.obj \
-        $(SLO)$/formevents.obj \
-        $(SLO)$/eventimport.obj \
-        $(SLO)$/eventexport.obj \
-        $(SLO)$/controlpropertyhdl.obj \
-        $(SLO)$/controlpropertymap.obj \
-        $(SLO)$/valueproperties.obj \
-        $(SLO)$/attriblistmerge.obj \
-        $(SLO)$/controlelement.obj \
-        $(SLO)$/formlayerexport.obj \
-        $(SLO)$/layerexport.obj \
-        $(SLO)$/elementexport.obj \
-        $(SLO)$/propertyexport.obj \
-        $(SLO)$/elementimport.obj \
-        $(SLO)$/layerimport.obj \
-        $(SLO)$/propertyimport.obj \
-        $(SLO)$/formlayerimport.obj \
-        $(SLO)$/formattributes.obj \
-        $(SLO)$/formenums.obj \
-        $(SLO)$/formsimp.obj \
-        $(SLO)$/strings.obj \
-        $(SLO)$/logging.obj \
-        $(SLO)$/formcellbinding.obj \
-        $(SLO)$/gridcolumnproptranslator.obj \
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 7f6d0cb25f..2e96afe6a6 100644..100755
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -31,7 +31,7 @@
 #include "officeforms.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -66,7 +66,7 @@ namespace xmloff
     }
 
     //-------------------------------------------------------------------------
-    SvXMLImportContext* OFormsRootImport::CreateChildContext( USHORT _nPrefix, const ::rtl::OUString& _rLocalName,
+    SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
             const Reference< sax::XAttributeList>& xAttrList )
     {
         return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index ca473879d0..f0caea5e7e 100644..100755
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -55,7 +55,7 @@ namespace xmloff
         virtual ~OFormsRootImport();
 
         // SvXMLImportContext overriabled
-        virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+        virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
             const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
         virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList );
         virtual void EndElement();
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
new file mode 100755
index 0000000000..4edab2e649
--- /dev/null
+++ b/xmloff/source/forms/property_description.hxx
@@ -0,0 +1,140 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_DESCRIPTION_HXX
+#define XMLOFF_PROPERTY_DESCRIPTION_HXX
+
+#include "forms/property_handler.hxx"
+#include "property_group.hxx"
+
+#include "xmloff/xmltoken.hxx"
+
+#include <vector>
+#include <list>
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PropertyDescription
+    //==================================================================================================================
+    struct AttributeDescription
+    {
+        sal_uInt16                      namespacePrefix;    // usually XML_NAMESPACE_FORM
+        ::xmloff::token::XMLTokenEnum   attributeToken;
+
+        AttributeDescription()
+            :namespacePrefix( 0 )
+            ,attributeToken( ::xmloff::token::XML_TOKEN_INVALID )
+        {
+        }
+
+        AttributeDescription(
+                const sal_uInt16                    i_namespacePrefix,
+                const ::xmloff::token::XMLTokenEnum i_attributeToken
+            )
+            :namespacePrefix( i_namespacePrefix )
+            ,attributeToken( i_attributeToken )
+        {
+        }
+    };
+
+    //..................................................................................................................
+    inline bool operator==( const AttributeDescription& i_lhs, const AttributeDescription& i_rhs )
+    {
+        return  ( i_lhs.namespacePrefix == i_rhs.namespacePrefix )
+            &&  ( i_lhs.attributeToken == i_rhs.attributeToken );
+    }
+
+    //==================================================================================================================
+    //= PropertyDescription
+    //==================================================================================================================
+    struct PropertyDescription
+    {
+        /// is the name of the property
+        const ::rtl::OUString               propertyName;
+        /** denotes the attribute which represents the property. Note that multiple properties might comprise a single
+            attribute value.
+        */
+        const AttributeDescription          attribute;
+        /// is the factory for creating a handler for reading and writing the property
+        const PropertyHandlerFactory        factory;
+        /// the unique ID of the property. The property meta data table must not contain two entries with the same property ID
+        const PropertyId                    propertyId;
+        /** the group which the property belongs to. Multiple properties belonging to the same group will, all together,
+            define the attribute value to be written into the ODF file.
+
+            Consequently, properties which have the same |propertyGroup| value must also have the same |attribute|
+            and the same |factory| value, with the only exception being NO_GROUP properties.
+
+            Note that the other direction is not given: It is perfectly legitimate to map the same attribute to different
+            (disjunct) property groups.
+        */
+        const PropertyGroup                 propertyGroup;
+
+        PropertyDescription()
+            :propertyName()
+            ,attribute()
+            ,factory( NULL )
+            ,propertyId( PID_INVALID )
+            ,propertyGroup( NO_GROUP )
+        {
+        }
+
+        PropertyDescription(
+            const ::rtl::OUString&              i_propertyName,
+            const sal_uInt16                    i_namespacePrefix,
+            const ::xmloff::token::XMLTokenEnum i_attributeToken,
+            const PropertyHandlerFactory        i_factory,
+            const PropertyId                    i_propertyId,
+            const PropertyGroup                 i_propertyGroup
+        )
+            :propertyName( i_propertyName )
+            ,attribute( i_namespacePrefix, i_attributeToken )
+            ,factory( i_factory )
+            ,propertyId( i_propertyId )
+            ,propertyGroup( i_propertyGroup )
+        {
+        }
+    };
+
+    //==================================================================================================================
+    //= PropertyDescriptionList
+    //==================================================================================================================
+    typedef ::std::vector< const PropertyDescription* > PropertyDescriptionList;
+
+    //==================================================================================================================
+    //= PropertyGroups
+    //==================================================================================================================
+    typedef ::std::list< PropertyDescriptionList >  PropertyGroups;
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_DESCRIPTION_HXX
diff --git a/xmloff/source/forms/property_group.hxx b/xmloff/source/forms/property_group.hxx
new file mode 100755
index 0000000000..bca354f14e
--- /dev/null
+++ b/xmloff/source/forms/property_group.hxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_GROUP_HXX
+#define XMLOFF_PROPERTY_GROUP_HXX
+
+//......................................................................................................................
+namespace xmloff
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= PropertyGroup
+    //==================================================================================================================
+    enum PropertyGroup
+    {
+        NO_GROUP
+    };
+
+//......................................................................................................................
+} // namespace xmloff
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_GROUP_HXX
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
new file mode 100755
index 0000000000..5930d12357
--- /dev/null
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -0,0 +1,270 @@
+/*************************************************************************
+ * 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 "precompiled_xmloff.hxx"
+
+#include "property_description.hxx"
+#include "forms/form_handler_factory.hxx"
+#include "strings.hxx"
+#include "xmloff/xmltoken.hxx"
+#include "xmloff/xmlnmspe.hxx"
+
+#include <tools/diagnose_ex.h>
+#include <tools/debug.hxx>
+
+#include <hash_map>
+
+//......................................................................................................................
+namespace xmloff { namespace metadata
+{
+//......................................................................................................................
+
+    using namespace ::xmloff::token;
+
+#define FORM_SINGLE_PROPERTY( id, att ) \
+    PropertyDescription( PROPERTY_##id, XML_NAMESPACE_FORM, att, &FormHandlerFactory::getFormPropertyHandler, PID_##id, NO_GROUP )
+
+    //==================================================================================================================
+    //= property meta data
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        const PropertyDescription* lcl_getPropertyMetaData()
+        {
+            static const PropertyDescription s_propertyMetaData[] =
+            {
+                FORM_SINGLE_PROPERTY( DATE_MIN,        XML_MIN_VALUE        ),
+                FORM_SINGLE_PROPERTY( DATE_MAX,        XML_MAX_VALUE        ),
+                FORM_SINGLE_PROPERTY( DEFAULT_DATE,    XML_VALUE            ),
+                FORM_SINGLE_PROPERTY( DATE,            XML_CURRENT_VALUE    ),
+                FORM_SINGLE_PROPERTY( TIME_MIN,        XML_MIN_VALUE        ),
+                FORM_SINGLE_PROPERTY( TIME_MAX,        XML_MAX_VALUE        ),
+                FORM_SINGLE_PROPERTY( DEFAULT_TIME,    XML_VALUE            ),
+                FORM_SINGLE_PROPERTY( TIME,            XML_CURRENT_VALUE    ),
+
+                PropertyDescription()
+            };
+            return s_propertyMetaData;
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        // TODO: instead of having all of the below static, it should be some per-instance data. This way, the
+        // approach used here would scale much better.
+        // That is, if you have multiple "meta data instances", which manage a small, but closed set of properties,
+        // then looking looking through those multiple instances would probably be faster than searching within
+        // one big instance, since in this case, every instance can quickly decide whether it is responsible
+        // for some attribute or property, and otherwise delegate to the next instance.
+
+        //..............................................................................................................
+        typedef ::std::hash_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName;
+
+        //..............................................................................................................
+        const DescriptionsByName& lcl_getPropertyDescriptions()
+        {
+            DBG_TESTSOLARMUTEX();
+            static DescriptionsByName s_propertyDescriptionsByName;
+            if ( s_propertyDescriptionsByName.empty() )
+            {
+                const PropertyDescription* desc = lcl_getPropertyMetaData();
+                while ( desc->propertyName.getLength() != 0 )
+                {
+                    s_propertyDescriptionsByName[ desc->propertyName ] = desc;
+                    ++desc;
+                }
+            }
+            return s_propertyDescriptionsByName;
+        }
+
+        //..............................................................................................................
+        typedef ::std::map< PropertyGroup, PropertyDescriptionList > IndexedPropertyGroups;
+
+        //..............................................................................................................
+        const IndexedPropertyGroups& lcl_getIndexedPropertyGroups()
+        {
+            DBG_TESTSOLARMUTEX();
+            static IndexedPropertyGroups s_indexedPropertyGroups;
+            if ( s_indexedPropertyGroups.empty() )
+            {
+                const PropertyDescription* desc = lcl_getPropertyMetaData();
+                while ( desc->propertyName.getLength() != 0 )
+                {
+                    if ( desc->propertyGroup != NO_GROUP )
+                        s_indexedPropertyGroups[ desc->propertyGroup ].push_back( desc );
+                    ++desc;
+                }
+            }
+            return s_indexedPropertyGroups;
+        }
+
+        //..............................................................................................................
+        typedef ::std::hash_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup;
+
+        //..............................................................................................................
+        const ReverseTokenLookup& getReverseTokenLookup()
+        {
+            DBG_TESTSOLARMUTEX();
+            static ReverseTokenLookup s_reverseTokenLookup;
+            if ( s_reverseTokenLookup.empty() )
+            {
+                const PropertyDescription* desc = lcl_getPropertyMetaData();
+                while ( desc->propertyName.getLength() != 0 )
+                {
+                    s_reverseTokenLookup[ token::GetXMLToken( desc->attribute.attributeToken ) ] = desc->attribute.attributeToken;
+                    ++desc;
+                }
+            }
+            return s_reverseTokenLookup;
+        }
+
+        //..............................................................................................................
+        struct AttributeHash : public ::std::unary_function< AttributeDescription, size_t >
+        {
+            size_t operator()( const AttributeDescription& i_attribute ) const
+            {
+                return size_t( i_attribute.attributeToken * 100 ) + size_t( i_attribute.namespacePrefix );
+            }
+        };
+
+        //..............................................................................................................
+        typedef ::std::hash_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
+
+        //..............................................................................................................
+        const AttributeGroups& lcl_getAttributeGroups()
+        {
+            DBG_TESTSOLARMUTEX();
+            static AttributeGroups s_attributeGroups;
+            if ( s_attributeGroups.empty() )
+            {
+                const PropertyDescription* desc = lcl_getPropertyMetaData();
+                while ( desc->propertyName.getLength() != 0 )
+                {
+                    if ( desc->propertyGroup != NO_GROUP )
+                        s_attributeGroups.insert( AttributeGroups::value_type( desc->attribute, desc->propertyGroup ) );
+                    ++desc;
+                }
+            }
+            return s_attributeGroups;
+        }
+
+        //..............................................................................................................
+        typedef ::std::hash_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
+
+        //..............................................................................................................
+        const AttributesWithoutGroup& lcl_getAttributesWithoutGroups()
+        {
+            DBG_TESTSOLARMUTEX();
+            static AttributesWithoutGroup s_attributesWithoutGroup;
+            if ( s_attributesWithoutGroup.empty() )
+            {
+                const PropertyDescription* desc = lcl_getPropertyMetaData();
+                while ( desc->propertyName.getLength() != 0 )
+                {
+                    if ( desc->propertyGroup == NO_GROUP )
+                    {
+                        PropertyDescriptionList singleElementList;
+                        singleElementList.push_back( desc );
+
+                        s_attributesWithoutGroup[ desc->attribute ].push_back( singleElementList );
+                    }
+                    ++desc;
+                }
+            }
+            return s_attributesWithoutGroup;
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName )
+    {
+        const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() );
+        DescriptionsByName::const_iterator pos = rAllDescriptions.find( i_propertyName );
+        if ( pos != rAllDescriptions.end() )
+            return pos->second;
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void getPropertyGroup( const PropertyGroup i_propertyGroup, PropertyDescriptionList& o_propertyDescriptions )
+    {
+        OSL_ENSURE( i_propertyGroup != NO_GROUP, "xmloff::metadata::getPropertyGroup: illegal group!" );
+
+        const IndexedPropertyGroups& rPropertyGroups( lcl_getIndexedPropertyGroups() );
+        const IndexedPropertyGroups::const_iterator pos = rPropertyGroups.find( i_propertyGroup );
+        if ( pos != rPropertyGroups.end() )
+            o_propertyDescriptions = pos->second;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void getPropertyGroupList( const AttributeDescription& i_attribute, PropertyGroups& o_propertyGroups )
+    {
+        const AttributeGroups& rAttributeGroups = lcl_getAttributeGroups();
+
+        ::std::pair< AttributeGroups::const_iterator, AttributeGroups::const_iterator >
+            range = rAttributeGroups.equal_range( i_attribute );
+
+        if ( range.first == range.second )
+        {
+            // the attribute is not used for any non-trivial group, which means it is mapped directly to
+            // a single property
+            const AttributesWithoutGroup& attributesWithoutGroups( lcl_getAttributesWithoutGroups() );
+            const AttributesWithoutGroup::const_iterator pos = attributesWithoutGroups.find( i_attribute );
+            if ( pos != attributesWithoutGroups.end() )
+                o_propertyGroups = pos->second;
+        }
+        else
+        {
+            const IndexedPropertyGroups& rPropertyGroups = lcl_getIndexedPropertyGroups();
+            for ( AttributeGroups::const_iterator group = range.first; group != range.second; ++group )
+            {
+                const PropertyGroup propGroup = group->second;
+                const IndexedPropertyGroups::const_iterator groupPos = rPropertyGroups.find( propGroup );
+                ENSURE_OR_CONTINUE( groupPos != rPropertyGroups.end(), "getPropertyGroupList: inconsistency!" );
+                o_propertyGroups.push_back( groupPos->second );
+            }
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName )
+    {
+        AttributeDescription attribute;
+        const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() );
+        const ReverseTokenLookup::const_iterator pos = rTokenLookup.find( i_attributeName );
+        if ( pos != rTokenLookup.end() )
+        {
+            attribute.namespacePrefix = i_namespacePrefix;
+            attribute.attributeToken = pos->second;
+        }
+        return attribute;
+    }
+
+//......................................................................................................................
+} } // namespace xmloff::metadata
+//......................................................................................................................
diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx
new file mode 100755
index 0000000000..a0f2aa6a10
--- /dev/null
+++ b/xmloff/source/forms/property_meta_data.hxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef XMLOFF_PROPERTY_META_DATA_HXX
+#define XMLOFF_PROPERTY_META_DATA_HXX
+
+#include "property_description.hxx"
+
+//......................................................................................................................
+namespace xmloff { namespace metadata
+{
+//......................................................................................................................
+
+    const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName );
+
+    /** retries the descriptions of all properties which add to the given XML attribute
+
+        <p>Effectively, the complete property map is search for all entries which have the given
+        namespace/attribute values.</p>
+    */
+    void getPropertyGroup(
+            const PropertyGroup i_propertyGroup,
+            PropertyDescriptionList& o_propertyDescriptions
+        );
+
+    /** retrieves all known property groups which are mapped to the given attribute
+    */
+    void getPropertyGroupList(
+        const AttributeDescription& i_attribute,
+        PropertyGroups& o_propertyGroups
+    );
+
+    /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name
+    */
+    AttributeDescription
+        getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName );
+
+//......................................................................................................................
+} } // namespace xmloff::metadata
+//......................................................................................................................
+
+#endif // XMLOFF_PROPERTY_META_DATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 3f00142c26..292ef71114 100644..100755
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -33,12 +33,11 @@
 #include "propertyexport.hxx"
 #include <xmloff/xmlexp.hxx>
 #include "strings.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -73,6 +72,8 @@ namespace xmloff
     OPropertyExport::OPropertyExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxProps)
         :m_rContext(_rContext)
         ,m_xProps(_rxProps)
+        ,m_xPropertyInfo( m_xProps->getPropertySetInfo() )
+        ,m_xPropertyState( _rxProps, UNO_QUERY )
     {
         // caching
         ::rtl::OUStringBuffer aBuffer;
@@ -81,7 +82,6 @@ namespace xmloff
         m_rContext.getGlobalContext().GetMM100UnitConverter().convertBool(aBuffer, sal_False);
         m_sValueFalse = aBuffer.makeStringAndClear();
 
-        m_xPropertyInfo = m_xProps->getPropertySetInfo();
         OSL_ENSURE(m_xPropertyInfo.is(), "OPropertyExport::OPropertyExport: need an XPropertySetInfo!");
 
         // collect the properties which need to be exported
@@ -89,6 +89,18 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
+    bool OPropertyExport::shouldExportProperty( const ::rtl::OUString& i_propertyName ) const
+    {
+        // if the property state is DEFAULT, it does not need to be written - at least
+        // if it's a built-in property, and not a dynamically-added one.
+        bool bIsDefaultValue =    m_xPropertyState.is()
+                            &&  ( PropertyState_DEFAULT_VALUE == m_xPropertyState->getPropertyState( i_propertyName ) );
+        bool bIsDynamicProperty =  m_xPropertyInfo.is()
+                                && ( ( m_xPropertyInfo->getPropertyByName( i_propertyName ).Attributes & PropertyAttribute::REMOVEABLE ) != 0 );
+        return ( !bIsDefaultValue || bIsDynamicProperty );
+    }
+
+    //---------------------------------------------------------------------
     void OPropertyExport::exportRemainingProperties()
     {
         // the properties tag (will be created if we have at least one no-default property)
@@ -96,9 +108,6 @@ namespace xmloff
 
         try
         {
-            Reference< XPropertyState > xPropertyState( m_xProps, UNO_QUERY );
-            Reference< XPropertySetInfo > xPSI( m_xProps->getPropertySetInfo() );
-
             Any aValue;
             ::rtl::OUString sValue;
 
@@ -113,13 +122,7 @@ namespace xmloff
     #if OSL_DEBUG_LEVEL > 0
                 const ::rtl::OUString sPropertyName = *aProperty; (void)sPropertyName;
     #endif
-                // if the property state is DEFAULT, it does not need to be written - at least
-                // if it's a built-in property, and not a dynamically-added one.
-                bool bIsDefaultValue =    xPropertyState.is()
-                                    &&  ( PropertyState_DEFAULT_VALUE == xPropertyState->getPropertyState( *aProperty ) );
-                bool bIsDynamicProperty =  xPSI.is()
-                                        && ( ( xPSI->getPropertyByName( *aProperty ).Attributes & PropertyAttribute::REMOVEABLE ) != 0 );
-                if ( bIsDefaultValue && !bIsDynamicProperty )
+                if ( !shouldExportProperty( *aProperty ) )
                     continue;
 
                 // now that we have the first sub-tag we need the form:properties element
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 44df479ad9..80db1ea9dc 100644..100755
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -32,6 +32,7 @@
 #include "formattributes.hxx"
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <callbacks.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "callbacks.hxx"
@@ -75,10 +76,12 @@ namespace xmloff
     protected:
         IFormsExportContext&	m_rContext;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                        m_xProps;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
-                        m_xPropertyInfo;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                                m_xProps;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+                                m_xPropertyInfo;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >
+                                m_xPropertyState;
 
         // caching
         ::rtl::OUString		m_sValueTrue;
@@ -309,6 +312,14 @@ namespace xmloff
             const sal_Unicode _aQuoteCharacter = '"',
             const sal_Unicode _aListSeparator = ',');
 
+        /** determines whether the given property is to be exported
+
+            <p>Currently, the method simply checks whether the property's state is <em>not</em> PropertyState.DEFAULT,
+            or whether the property is a dynamic property (i.e. added via an <code>XPropertyContainer</code>).
+            So, take care when using the method - the heuristics is not applicable for all properties.</p>
+        */
+        bool shouldExportProperty( const ::rtl::OUString& i_propertyName ) const;
+
         /** tries to convert an arbitrary <type scope="com.sun:star.uno">Any</type> into an string
 
             <p>If the type contained in the Any is not supported, the returned string will be empty. In the
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index c80daed029..4ecfd3a42e 100644..100755
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -35,7 +35,7 @@
 #include <osl/diagnose.h>
 #include <comphelper/extract.hxx>
 #include "callbacks.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
@@ -350,7 +350,7 @@ _rChars
 }
 
 //---------------------------------------------------------------------
-void OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
+bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue)
 {
     const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName);
     if (pProperty)
@@ -362,18 +362,21 @@ void OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl
         // convert the value string into the target type
         aNewValue.Value = PropertyConversion::convertString(m_rContext.getGlobalContext(), pProperty->aPropertyType, _rValue, pProperty->pEnumMap, pProperty->bInverseSemantics);
         implPushBackPropertyValue( aNewValue );
+        return true;
     }
-#if OSL_DEBUG_LEVEL > 0
-    else if (!token::IsXMLToken(_rLocalName, token::XML_TYPE))  // xlink:type is valid but ignored for <form:form>
+    if (!token::IsXMLToken(_rLocalName, token::XML_TYPE))  // xlink:type is valid but ignored for <form:form>
     {
+#if OSL_DEBUG_LEVEL > 0
         ::rtl::OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" );
         sMessage += ::rtl::OString( "  Attribute name: " );
         sMessage += ::rtl::OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() );
         sMessage += ::rtl::OString( "\n  value: " );
         sMessage += ::rtl::OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() );
         OSL_ENSURE( sal_False, sMessage.getStr() );
-    }
 #endif
+        return false;
+    }
+    return true;
 }
 
 //=====================================================================
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index a122de5044..daa6a647c8 100644..100755
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -120,7 +120,7 @@ namespace xmloff
             @param _rValue
                 attribute value
         */
-        virtual void handleAttribute(sal_uInt16 _nNamespaceKey,
+        virtual bool handleAttribute(sal_uInt16 _nNamespaceKey,
             const ::rtl::OUString& _rLocalName,
             const ::rtl::OUString& _rValue);
 
diff --git a/xmloff/source/forms/strings.cxx b/xmloff/source/forms/strings.cxx
index d9dfed159e..d9dfed159e 100644..100755
--- a/xmloff/source/forms/strings.cxx
+++ b/xmloff/source/forms/strings.cxx
diff --git a/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx
index 1311c29ca7..1311c29ca7 100644..100755
--- a/xmloff/source/forms/strings.hxx
+++ b/xmloff/source/forms/strings.hxx
diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index 1923d1715f..d7b57173bb 100644..100755
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -66,16 +66,6 @@ namespace xmloff
                 }
                 break;
 
-            case FormComponentType::DATEFIELD:
-                _rpCurrentValuePropertyName = PROPERTY_DATE;
-                _rpValuePropertyName = PROPERTY_DEFAULT_DATE;
-                break;
-
-            case FormComponentType::TIMEFIELD:
-                _rpCurrentValuePropertyName = PROPERTY_TIME;
-                _rpValuePropertyName = PROPERTY_DEFAULT_TIME;
-                break;
-
             case FormComponentType::NUMERICFIELD:
             case FormComponentType::CURRENCYFIELD:
                 _rpCurrentValuePropertyName = PROPERTY_VALUE;
@@ -109,6 +99,10 @@ namespace xmloff
                 _rpCurrentValuePropertyName = PROPERTY_SPINVALUE;
                 _rpValuePropertyName = PROPERTY_DEFAULT_SPINVALUE;
                 break;
+
+            default:
+                OSL_ENSURE( false, "OValuePropertiesMetaData::getValuePropertyNames: unsupported component type!" );
+                break;
         }
     }
     
@@ -120,16 +114,6 @@ namespace xmloff
         _rpMinValuePropertyName = _rpMaxValuePropertyName = NULL;
         switch (_nFormComponentType)
         {
-            case FormComponentType::DATEFIELD:
-                _rpMinValuePropertyName = PROPERTY_DATE_MIN;
-                _rpMaxValuePropertyName = PROPERTY_DATE_MAX;
-                break;
-
-            case FormComponentType::TIMEFIELD:
-                _rpMinValuePropertyName = PROPERTY_TIME_MIN;
-                _rpMaxValuePropertyName = PROPERTY_TIME_MAX;
-                break;
-
             case FormComponentType::NUMERICFIELD:
             case FormComponentType::CURRENCYFIELD:
                 _rpMinValuePropertyName = PROPERTY_VALUE_MIN;
@@ -150,6 +134,10 @@ namespace xmloff
                 _rpMinValuePropertyName = PROPERTY_SPINVALUE_MIN;
                 _rpMaxValuePropertyName = PROPERTY_SPINVALUE_MAX;
                 break;
+
+            default:
+                OSL_ENSURE( false, "OValuePropertiesMetaData::getValueLimitPropertyNames: unsupported component type!" );
+                break;
         }
     }
 
@@ -176,7 +164,15 @@ namespace xmloff
                 break;
 
             case FormComponentType::DATEFIELD:
+                _rpValuePropertyName = PROPERTY_DATE;
+                _rpDefaultValuePropertyName = PROPERTY_DEFAULT_DATE;
+                break;
+
             case FormComponentType::TIMEFIELD:
+                _rpValuePropertyName = PROPERTY_TIME;
+                _rpDefaultValuePropertyName = PROPERTY_DEFAULT_TIME;
+                break;
+
             case FormComponentType::NUMERICFIELD:
             case FormComponentType::CURRENCYFIELD:
             case FormComponentType::PATTERNFIELD:
diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx
index be5d0f602f..be5d0f602f 100644..100755
--- a/xmloff/source/forms/valueproperties.hxx
+++ b/xmloff/source/forms/valueproperties.hxx
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index a07310b672..ce5c26b2da 100644..100755
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index acf935186b..0d04e8217f 100644..100755
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "MetaImportComponent.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetai.hxx>
diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
deleted file mode 100644
index 5efb538c98..0000000000
--- a/xmloff/source/meta/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=xmloff
-TARGET=meta
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/xmlmetae.obj \
-        $(SLO)$/xmlmetai.obj \
-        $(SLO)$/MetaExportComponent.obj \
-                $(SLO)$/MetaImportComponent.obj \
-                $(SLO)$/xmlversion.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index e4c2afa22b..d6b42adbe0 100644..100755
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 62d738c677..0278307eda 100644..100755
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
@@ -59,7 +59,7 @@ private:
         ::com::sun::star::xml::sax::XDocumentHandler> mxDocBuilder;
 
 public:
-    XMLDocumentBuilderContext(SvXMLImport& rImport, USHORT nPrfx,
+    XMLDocumentBuilderContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -68,7 +68,7 @@ public:
 
     virtual ~XMLDocumentBuilderContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -82,7 +82,7 @@ public:
 };
 
 XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport,
-        USHORT nPrfx, const ::rtl::OUString& rLName,
+        sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const uno::Reference<xml::sax::XAttributeList>&,
         const uno::Reference<xml::sax::XDocumentHandler>& rDocBuilder) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -95,7 +95,7 @@ XMLDocumentBuilderContext::~XMLDocumentBuilderContext()
 }
 
 SvXMLImportContext *
-XMLDocumentBuilderContext::CreateChildContext( USHORT nPrefix,
+XMLDocumentBuilderContext::CreateChildContext( sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList>& rAttrs)
 {
@@ -126,7 +126,7 @@ void XMLDocumentBuilderContext::EndElement()
 //===========================================================================
 
 SvXMLMetaDocumentContext::SvXMLMetaDocumentContext(SvXMLImport& rImport,
-            USHORT nPrfx, const rtl::OUString& rLName,
+            sal_uInt16 nPrfx, const rtl::OUString& rLName,
             const uno::Reference<document::XDocumentProperties>& xDocProps,
             const uno::Reference<xml::sax::XDocumentHandler>& xDocBuilder) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -143,7 +143,7 @@ SvXMLMetaDocumentContext::~SvXMLMetaDocumentContext()
 }
 
 SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext(
-             USHORT nPrefix, const rtl::OUString& rLocalName,
+             sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
              const uno::Reference<xml::sax::XAttributeList>& rAttrs)
 {
     if (  (XML_NAMESPACE_OFFICE == nPrefix) &&
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 51e87ab7a0..51e87ab7a0 100644..100755
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index 41dd0d808f..0fef57a237 100644..100755
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -38,7 +38,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index 12a9e65826..3b5fa65e66 100644..100755
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -33,8 +33,8 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
-#include "xmlerror.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::com::sun::star::xml::sax::XAttributeList;
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index 928dac8ed5..333e301574 100644..100755
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -36,9 +36,9 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::xmloff::token;
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 50e598b59e..9b96eede4f 100644..100755
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -33,7 +33,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index cce202e7c0..5c1bc09386 100644..100755
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index a69f9af798..3067b82591 100644..100755
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -33,7 +33,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index be5469837f..38b72fc735 100644..100755
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
deleted file mode 100644
index 4109ae6fc5..0000000000
--- a/xmloff/source/script/makefile.mk
+++ /dev/null
@@ -1,56 +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=xmloff
-TARGET=script
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLEventExport.obj \
-        $(SLO)$/XMLEventImportHelper.obj \
-        $(SLO)$/XMLEventsImportContext.obj \
-        $(SLO)$/XMLScriptContextFactory.obj \
-        $(SLO)$/XMLScriptExportHandler.obj \
-        $(SLO)$/XMLStarBasicContextFactory.obj \
-        $(SLO)$/XMLStarBasicExportHandler.obj \
-        $(SLO)$/xmlscripti.obj \
-        $(SLO)$/xmlbasici.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index 86a06ecb4f..f9d1eb324b 100644..100755
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno;
 // XMLBasicImportContext
 // =============================================================================
 
-XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< frame::XModel >& rxModel )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xModel( rxModel )
@@ -74,7 +74,7 @@ XMLBasicImportContext::~XMLBasicImportContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLBasicImportContext::CreateChildContext( 
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& )
 {
     SvXMLImportContext* pContext = 0;
@@ -141,7 +141,7 @@ void XMLBasicImportContext::Characters( const ::rtl::OUString& rChars )
 // XMLBasicImportChildContext
 // =============================================================================
 
-XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< xml::sax::XDocumentHandler >& rxHandler )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xHandler( rxHandler )
@@ -157,7 +157,7 @@ XMLBasicImportChildContext::~XMLBasicImportChildContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext( 
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& )
 {    
     return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler );
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index b2a52d0ba4..d25dc83fb8 100644..100755
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -45,12 +45,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xHandler;
 
 public:
-    XMLBasicImportContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
                         
     virtual ~XMLBasicImportContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& rxAttrList );
@@ -71,12 +71,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xHandler;
 
 public:
-    XMLBasicImportChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler );
                         
     virtual ~XMLBasicImportChildContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index ac67323a80..01cc652087 100644..100755
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include <xmloff/xmlscripti.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -63,12 +63,12 @@ private:
     ::rtl::OUString m_aLanguage;
 
 public:
-    XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& rxModel,
         const ::rtl::OUString& rLanguage );
     virtual ~XMLScriptChildContext();
 
-    virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual void EndElement();
@@ -76,7 +76,7 @@ public:
 
 // -----------------------------------------------------------------------------
 
-XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
         const Reference< frame::XModel >& rxModel, const ::rtl::OUString& rLanguage )
     :SvXMLImportContext( rImport, nPrfx, rLName )
     ,m_xModel( rxModel )
@@ -94,7 +94,7 @@ XMLScriptChildContext::~XMLScriptChildContext()
 // -----------------------------------------------------------------------------
 
 SvXMLImportContext* XMLScriptChildContext::CreateChildContext( 
-    USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
     const Reference< xml::sax::XAttributeList >& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx
index 39fdea500e..39fdea500e 100644..100755
--- a/xmloff/source/style/AttributeContainerHandler.cxx
+++ b/xmloff/source/style/AttributeContainerHandler.cxx
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 3babd4352f..19adc69baa 100644..100755
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -30,11 +30,11 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/drawing/DashStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
-#include "DashStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx
index 1cef9990fe..1cef9990fe 100644..100755
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx
index 972b7b79cb..972b7b79cb 100644..100755
--- a/xmloff/source/style/DrawAspectHdl.hxx
+++ b/xmloff/source/style/DrawAspectHdl.hxx
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index fdbdd09308..32003adef3 100644..100755
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -53,7 +53,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl()
 
 sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
 {
-    USHORT nValue = 0;
+    sal_uInt16 nValue = 0;
 
     if( SvXMLUnitConverter::convertEnum( nValue, rStrImpValue, mpEnumMap ) )
     {
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 163373e991..73a3413834 100644..100755
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -31,15 +31,15 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "FillStyleContext.hxx"
 #include <xmloff/xmlimp.hxx>
-#include "GradientStyle.hxx"
-#include "HatchStyle.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include "TransGradientStyle.hxx"
-#include "MarkerStyle.hxx"
-#include "DashStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/DashStyle.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/XMLBase64ImportContext.hxx>
 
 using namespace ::com::sun::star;
@@ -91,7 +91,7 @@ void XMLGradientStyleContext::EndElement()
     {}
 }
 
-BOOL XMLGradientStyleContext::IsTransient() const
+sal_Bool XMLGradientStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -137,7 +137,7 @@ void XMLHatchStyleContext::EndElement()
     {}
 }
 
-BOOL XMLHatchStyleContext::IsTransient() const
+sal_Bool XMLHatchStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -217,7 +217,7 @@ void XMLBitmapStyleContext::EndElement()
     {}
 }
 
-BOOL XMLBitmapStyleContext::IsTransient() const
+sal_Bool XMLBitmapStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -264,7 +264,7 @@ void XMLTransGradientStyleContext::EndElement()
     {}
 }
 
-BOOL XMLTransGradientStyleContext::IsTransient() const
+sal_Bool XMLTransGradientStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -310,7 +310,7 @@ void XMLMarkerStyleContext::EndElement()
     {}
 }
 
-BOOL XMLMarkerStyleContext::IsTransient() const
+sal_Bool XMLMarkerStyleContext::IsTransient() const
 {
     return sal_True;
 }
@@ -356,7 +356,7 @@ void XMLDashStyleContext::EndElement()
     {}
 }
 
-BOOL XMLDashStyleContext::IsTransient() const
+sal_Bool XMLDashStyleContext::IsTransient() const
 {
     return sal_True;
 }
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 9da9ee5cc7..1f857d1977 100644..100755
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -51,7 +51,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -162,7 +162,7 @@ public:
 
     virtual void EndElement();
 
-    virtual BOOL IsTransient() const;
+    virtual sal_Bool IsTransient() const;
 };
 
 #endif	// _XMLOFF_FILLSTYLECONTEXTS_HXX_
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 2f2f8d4a32..58e234ff6b 100644..100755
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -28,12 +28,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "GradientStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
 #include <com/sun/star/awt/Gradient.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index d3e766a0d0..bdb6425e44 100644..100755
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -28,11 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "HatchStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 3b78ea72a6..6fa4dee4bb 100644..100755
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -28,12 +28,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "ImageStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include"xmlnmspe.hxx"
+#include"xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index edf8991797..661d2a85e9 100644..100755
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -28,12 +28,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "MarkerStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
 #include "xexptran.hxx"
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -213,7 +213,7 @@ sal_Bool XMLMarkerStyleExport::exportXML(
             sal_Int32 a, b;
             sal_Bool bClosed(sal_False);
 
-            for(a = 0L; a < nOuterCnt; a++)
+            for (a = 0; a < nOuterCnt; a++)
             {
                 drawing::PointSequence* pSequence = pOuterSequence++;
                 const awt::Point *pPoints = pSequence->getConstArray();
@@ -230,7 +230,7 @@ sal_Bool XMLMarkerStyleExport::exportXML(
                     }
                 }
 
-                for(b = 0L; b < nPointCount; b++)
+                for (b = 0; b < nPointCount; b++)
                 {
                     const awt::Point aPoint = pPoints[b];
 
@@ -260,7 +260,7 @@ sal_Bool XMLMarkerStyleExport::exportXML(
             drawing::FlagSequence*  pOuterFlags = aBezier.Flags.getArray();
             SdXMLImExSvgDElement aSvgDElement(aViewBox);
             
-            for(a = 0L; a < nOuterCnt; a++)
+            for (a = 0; a < nOuterCnt; a++)
             {
                 drawing::PointSequence* pSequence = pOuterSequence++;
                 drawing::FlagSequence* pFlags = pOuterFlags++;
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index 4c0ae5abf3..4c0ae5abf3 100644..100755
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index 0af524e957..0af524e957 100644..100755
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index 18c6f4398d..be6df728c9 100644..100755
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -35,7 +35,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "PageHeaderFooterContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PagePropertySetContext.hxx"
 
@@ -46,7 +46,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES;
 //------------------------------------------------------------------
 
 PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>&,
@@ -67,7 +67,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext()
 {
 }
 
-SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index df812dba23..4340591205 100644..100755
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -40,7 +40,7 @@ class PageHeaderFooterContext : public SvXMLImportContext
 
 public:
 
-    PageHeaderFooterContext( SvXMLImport& rImport, USHORT nPrfx,
+    PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                        const rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -51,7 +51,7 @@ public:
 
     virtual ~PageHeaderFooterContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index a64b257629..a64b257629 100644..100755
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 5a90b9f872..5a90b9f872 100644..100755
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index e417117938..ac412a997a 100644..100755
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -31,7 +31,7 @@
 
 
 #include "PageMasterImportContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "PageMasterPropHdl.hxx"
 #include "PagePropertySetContext.hxx"
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 77f5d4f662..77f5d4f662 100644..100755
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index 9832abc786..9832abc786 100644..100755
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index 0bfbbee23b..0bfbbee23b 100644..100755
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index d8d593449d..d8d593449d 100644..100755
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 7199dadadd..7199dadadd 100644..100755
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx
index f0db3a88a1..f0db3a88a1 100644..100755
--- a/xmloff/source/style/PageMasterPropHdlFactory.hxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx
index 2b7f9082a7..2b7f9082a7 100644..100755
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index 655f127db5..655f127db5 100644..100755
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 93696a356e..75ef5b0ae5 100644..100755
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include <xmloff/PageMasterStyleMap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::xmloff::token;
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 12893df589..12893df589 100644..100755
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx
index 45b712bd26..5d9003afb1 100644..100755
--- a/xmloff/source/style/PagePropertySetContext.hxx
+++ b/xmloff/source/style/PagePropertySetContext.hxx
@@ -56,7 +56,7 @@ public:
     virtual ~PagePropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx
index 07154be303..07154be303 100644..100755
--- a/xmloff/source/style/SinglePropertySetInfoCache.cxx
+++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 71cf07975a..71cf07975a 100644..100755
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 79767296ae..e00097a66e 100644..100755
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
@@ -170,7 +170,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
                 sal_Int32 aStartTransparency;
                 SvXMLUnitConverter::convertPercent( aStartTransparency, rStrValue );
 
-                UINT8 n = sal::static_int_cast< UINT8 >(
+                sal_uInt8 n = sal::static_int_cast< sal_uInt8 >(
                     ( (100 - aStartTransparency) * 255 ) / 100 );
                 
                 Color aColor( n, n, n );
@@ -182,7 +182,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
                 sal_Int32 aEndTransparency;
                 SvXMLUnitConverter::convertPercent( aEndTransparency, rStrValue );
 
-                UINT8 n = sal::static_int_cast< UINT8 >(
+                sal_uInt8 n = sal::static_int_cast< sal_uInt8 >(
                     ( (100 - aEndTransparency) * 255 ) / 100 );
 
                 Color aColor( n, n, n );
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index d63d1ac04e..c0c790262c 100644..100755
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -33,9 +33,9 @@
 
 
 // INCLUDE ---------------------------------------------------------------
-#include "VisAreaContext.hxx"
+#include "xmloff/VisAreaContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -47,7 +47,7 @@ using namespace ::xmloff::token;
 //------------------------------------------------------------------
 
 XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                               Rectangle& rRect, const MapUnit aMapUnit ) :
@@ -63,7 +63,7 @@ XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
 }
 
 XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
-                                         USHORT nPrfx,
+                                         sal_uInt16 nPrfx,
                                                    const rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) :
@@ -89,7 +89,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -119,7 +119,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>
     }
 }
 
-SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLVisAreaContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& )
diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx
index 225f710a3b..502176ebcc 100644..100755
--- a/xmloff/source/style/VisAreaExport.cxx
+++ b/xmloff/source/style/VisAreaExport.cxx
@@ -29,9 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "VisAreaExport.hxx"
+#include "xmloff/VisAreaExport.hxx"
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx
index a8168c4b47..a8168c4b47 100644..100755
--- a/xmloff/source/style/WordWrapPropertyHdl.cxx
+++ b/xmloff/source/style/WordWrapPropertyHdl.cxx
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 0820ce13b3..4306146b09 100644..100755
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index 3cdf1814e8..d01b3663bb 100644..100755
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <com/sun/star/style/GraphicLocation.hpp>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
index d91570633a..d91570633a 100644..100755
--- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
index 32639c657e..32639c657e 100644..100755
--- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index 8e981b7de8..8e981b7de8 100644..100755
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
index e70aad38bc..e70aad38bc 100644..100755
--- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx
+++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx
index 0a1174d3b4..0a1174d3b4 100644..100755
--- a/xmloff/source/style/XMLElementPropertyContext.cxx
+++ b/xmloff/source/style/XMLElementPropertyContext.cxx
diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
index 3c961a1728..3c961a1728 100644..100755
--- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 2af797866e..98d66f3a31 100644..100755
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -28,12 +28,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-
 #include <tools/debug.hxx>
 #include <svl/cntnrsrt.hxx>
 #include <tools/fontenum.hxx>
-
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
@@ -175,7 +173,7 @@ OUString XMLFontAutoStylePool::Add(
     OUString sPoolName;
     XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
                                           nPitch, eEnc );
-    ULONG nPos;
+    sal_uLong nPos;
     if( pPool->Seek_Entry( &aTmp, &nPos ) )
     {
         sPoolName = pPool->GetObject( nPos )->GetName();
@@ -229,7 +227,7 @@ OUString XMLFontAutoStylePool::Add(
     OUString sName;
     XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
                                           nPitch, eEnc );
-    ULONG nPos;
+    sal_uLong nPos;
     if( pPool->Seek_Entry( &aTmp, &nPos ) )
     {
         sName = pPool->GetObject( nPos )->GetName();
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 9583e1c3e3..5017e8f874 100644..100755
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -35,7 +35,7 @@
 #include <rtl/logfile.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 712cf988c5..90b0e8dcc6 100644..100755
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -31,7 +31,7 @@
 #include "XMLFootnoteSeparatorExport.hxx"
 #include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprmap.hxx>
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
index 324c41b149..324c41b149 100644..100755
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index 29890d3abf..c0d0e32336 100644..100755
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index 36b3419fcb..36b3419fcb 100644..100755
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
index 69f0e0e3e3..69f0e0e3e3 100644..100755
--- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
+++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index ad3e022895..83229caa85 100644..100755
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/XMLPageExport.hxx>
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
index 47d36b894d..47d36b894d 100644..100755
--- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
+++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx
index 8461ee8d32..8461ee8d32 100644..100755
--- a/xmloff/source/style/XMLRectangleMembersHandler.cxx
+++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index a1d0263289..a1d0263289 100644..100755
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx
index 39b7e8b350..39b7e8b350 100644..100755
--- a/xmloff/source/style/adjushdl.hxx
+++ b/xmloff/source/style/adjushdl.hxx
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index 41598b42f7..41598b42f7 100644..100755
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx
index 602dd2105c..602dd2105c 100644..100755
--- a/xmloff/source/style/backhdl.hxx
+++ b/xmloff/source/style/backhdl.hxx
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 836c9895e9..836c9895e9 100644..100755
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx
index fe895e0fcc..fe895e0fcc 100644..100755
--- a/xmloff/source/style/bordrhdl.hxx
+++ b/xmloff/source/style/bordrhdl.hxx
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index 4bd6e84f4e..4bd6e84f4e 100644..100755
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx
index 1056d665d5..1056d665d5 100644..100755
--- a/xmloff/source/style/breakhdl.hxx
+++ b/xmloff/source/style/breakhdl.hxx
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index 1a2ea816e6..1a2ea816e6 100644..100755
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx
index 150b72d3a6..150b72d3a6 100644..100755
--- a/xmloff/source/style/cdouthdl.hxx
+++ b/xmloff/source/style/cdouthdl.hxx
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 18bcf2debd..45f75114ac 100644..100755
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -80,7 +80,7 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
     float fSize = 0;
     if( rValue >>= fSize )
     {
-        SvXMLUnitConverter::convertDouble( aOut, (double)fSize, TRUE, MAP_POINT, MAP_POINT );
+        SvXMLUnitConverter::convertDouble( aOut, (double)fSize, sal_True, MAP_POINT, MAP_POINT );
         aOut.append( sal_Unicode('p'));
         aOut.append( sal_Unicode('t'));
     }
diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx
index dd23d88b9d..dd23d88b9d 100644..100755
--- a/xmloff/source/style/chrhghdl.hxx
+++ b/xmloff/source/style/chrhghdl.hxx
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index c053631907..c053631907 100644..100755
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx
index 0845fe8cd5..0845fe8cd5 100644..100755
--- a/xmloff/source/style/chrlohdl.hxx
+++ b/xmloff/source/style/chrlohdl.hxx
diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx
index 5dd160b2b2..5dd160b2b2 100644..100755
--- a/xmloff/source/style/csmaphdl.cxx
+++ b/xmloff/source/style/csmaphdl.cxx
diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx
index d6b8c69d70..d6b8c69d70 100644..100755
--- a/xmloff/source/style/csmaphdl.hxx
+++ b/xmloff/source/style/csmaphdl.hxx
diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx
index 9921aed5a8..9921aed5a8 100644..100755
--- a/xmloff/source/style/durationhdl.cxx
+++ b/xmloff/source/style/durationhdl.cxx
diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx
index 0cd0ec3285..0cd0ec3285 100644..100755
--- a/xmloff/source/style/durationhdl.hxx
+++ b/xmloff/source/style/durationhdl.hxx
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index b22ac44878..b22ac44878 100644..100755
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx
index dd889f8fbd..dd889f8fbd 100644..100755
--- a/xmloff/source/style/escphdl.hxx
+++ b/xmloff/source/style/escphdl.hxx
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index de1864a441..88bd9178d1 100644..100755
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -137,12 +137,12 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno:
     if( rValue >>= aStrFamilyName )
     {
         OUStringBuffer sValue( aStrFamilyName.getLength() + 2L );
-        sal_Int32 nPos = 0L;
+        sal_Int32 nPos = 0;
         do
         {
             sal_Int32 nFirst = nPos;
             nPos = aStrFamilyName.indexOf( sal_Unicode(';'), nPos );
-            sal_Int32 nLast = (-1L == nPos ? aStrFamilyName.getLength() : nPos);
+            sal_Int32 nLast = (-1 == nPos ? aStrFamilyName.getLength() : nPos);
 
             // Set position to the character behind the ';', so we won't
             // forget this.
@@ -174,7 +174,7 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno:
                     sValue.append( sal_Unicode( ',' ) );
                     sValue.append( sal_Unicode( ' ' ));
                 }
-                sal_Int32 nLen = nLast-nFirst+1L;
+                sal_Int32 nLen = nLast-nFirst+1;
                 OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) );
                 sal_Bool bQuote = sal_False;
                 for( sal_Int32 i=0; i < nLen; i++ )
@@ -292,7 +292,7 @@ XMLFontPitchPropHdl::~XMLFontPitchPropHdl()
 
 sal_Bool XMLFontPitchPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const
 { 
-    USHORT eNewPitch;
+    sal_uInt16 eNewPitch;
     sal_Bool bRet = SvXMLUnitConverter::convertEnum( eNewPitch, rStrImpValue, aFontPitchMapping );
     if( bRet )
         rValue <<= (sal_Int16)eNewPitch;
diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx
index f4747f41c0..f4747f41c0 100644..100755
--- a/xmloff/source/style/fonthdl.hxx
+++ b/xmloff/source/style/fonthdl.hxx
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 786b0027be..786b0027be 100644..100755
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index dbeb870246..dbeb870246 100644..100755
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index 0c51db505b..0c51db505b 100644..100755
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 0a4ec52782..c627f4d49a 100644..100755
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/attrlist.hxx>
 #include "impastpl.hxx"
 #include <xmloff/xmlexppr.hxx>
@@ -66,7 +66,7 @@ SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
 SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
 {
     for (;;) {
-        XMLFamilyData_Impl* pData = maFamilyList.Remove( ULONG(0) );
+        XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uLong(0) );
         if (pData == NULL) {
             break;
         }
@@ -87,7 +87,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
         sal_Bool bAsFamily )
 {
     // store family in a list if not already stored
-    ULONG nPos;
+    sal_uLong nPos;
 
     sal_uInt16 nExportFlags = GetExport().getExportFlags();
     sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
@@ -115,7 +115,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString&
 {
     SvXMLAutoStylePoolNamesP_Impl *pNames = 0;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
         pNames = maFamilyList.GetObject( nPos )->mpNameList;
@@ -186,7 +186,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
                 bool bDontSeek )
 {
     sal_Bool bRet(sal_False);
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTemporary( nFamily );
@@ -235,7 +235,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
 {
     // get family and parent the same way as in Add()
     sal_Bool bRet(sal_False);
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTemporary( nFamily );
@@ -274,7 +274,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
 OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
                                          const OUString& rParent )
 {
-    ULONG nPos;
+    sal_uLong nPos;
 
     XMLFamilyData_Impl *pFamily = 0;
     XMLFamilyData_Impl aTmp( nFamily );
@@ -305,7 +305,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
 {
     OUString sName;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTemporary( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
@@ -332,7 +332,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
 {
     OUString sName;
 
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
@@ -375,7 +375,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
     sal_uInt32 nCount = 0;
 
     // Get list of parents for current family (nFamily)
-    ULONG nPos;
+    sal_uLong nPos;
     XMLFamilyData_Impl aTmp( nFamily );
     XMLFamilyData_Impl *pFamily = 0;
     if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 3ed2748426..3ed2748426 100644..100755
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index f6d56cfd6b..f6d56cfd6b 100644..100755
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx
index 0fcb0344c2..0fcb0344c2 100644..100755
--- a/xmloff/source/style/kernihdl.hxx
+++ b/xmloff/source/style/kernihdl.hxx
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index 26315c7537..26315c7537 100644..100755
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx
index bd7f3b2213..bd7f3b2213 100644..100755
--- a/xmloff/source/style/lspachdl.hxx
+++ b/xmloff/source/style/lspachdl.hxx
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
deleted file mode 100644
index 3436b33b65..0000000000
--- a/xmloff/source/style/makefile.mk
+++ /dev/null
@@ -1,219 +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=xmloff
-TARGET=style
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES = \
-        XMLPercentOrMeasurePropertyHandler.cxx \
-        XMLIsPercentagePropertyHandler.cxx \
-        XMLRectangleMembersHandler.cxx \
-        adjushdl.cxx	\
-        backhdl.cxx		\
-        bordrhdl.cxx	\
-        breakhdl.cxx	\
-        cdouthdl.cxx	\
-        chrhghdl.cxx	\
-        chrlohdl.cxx	\
-        csmaphdl.cxx	\
-        escphdl.cxx		\
-        fonthdl.cxx		\
-        impastp1.cxx    \
-        impastp2.cxx    \
-        impastp3.cxx    \
-        impastp4.cxx    \
-        kernihdl.cxx	\
-        lspachdl.cxx	\
-        numehelp.cxx	\
-        opaquhdl.cxx	\
-        postuhdl.cxx	\
-        prhdlfac.cxx	\
-        prstylei.cxx	\
-        shadwhdl.cxx	\
-        shdwdhdl.cxx	\
-        styleexp.cxx	\
-        tabsthdl.cxx	\
-        undlihdl.cxx	\
-        uniref.cxx		\
-        weighhdl.cxx	\
-        xmlaustp.cxx	\
-        xmlbahdl.cxx	\
-        xmlexppr.cxx	\
-        xmlimppr.cxx	\
-        xmlnume.cxx		\
-        xmlnumfe.cxx	\
-        xmlnumfi.cxx	\
-        xmlnumi.cxx		\
-        xmlprcon.cxx	\
-        xmlprhdl.cxx	\
-        xmlprmap.cxx	\
-        xmlstyle.cxx	\
-        xmltabe.cxx		\
-        xmltabi.cxx		\
-        DashStyle.cxx					\
-        EnumPropertyHdl.cxx				\
-        FillStyleContext.cxx			\
-        GradientStyle.cxx				\
-        HatchStyle.cxx					\
-        ImageStyle.cxx					\
-        MarkerStyle.cxx					\
-        MultiPropertySetHelper.cxx		\
-        SinglePropertySetInfoCache.cxx	\
-        DashStyle.cxx					\
-        AttributeContainerHandler.cxx	\
-        NamedBoolPropertyHdl.cxx		\
-        TransGradientStyle.cxx			\
-        XMLBackgroundImageContext.cxx	\
-        XMLBackgroundImageExport.cxx	\
-        XMLClipPropertyHandler.cxx		\
-        XMLConstantsPropertyHandler.cxx	\
-        XMLElementPropertyContext.cxx	\
-        XMLFootnoteSeparatorExport.cxx	\
-        XMLFootnoteSeparatorImport.cxx	\
-        XMLFontAutoStylePool.cxx		\
-        XMLFontStylesContext.cxx		\
-        XMLPageExport.cxx				\
-        PageMasterPropHdl.cxx			\
-        PageMasterPropHdlFactory.cxx	\
-        PageMasterStyleMap.cxx			\
-        PageMasterPropMapper.cxx		\
-        PageMasterExportPropMapper.cxx	\
-        PageMasterImportPropMapper.cxx	\
-        PageMasterImportContext.cxx		\
-        PagePropertySetContext.cxx		\
-        PageHeaderFooterContext.cxx		\
-        StyleMap.cxx		\
-        XMLBitmapRepeatOffsetPropertyHandler.cxx \
-        XMLFillBitmapSizePropertyHandler.cxx \
-        XMLBitmapLogicalSizePropertyHandler.cxx \
-        durationhdl.cxx \
-        VisAreaExport.cxx \
-        VisAreaContext.cxx \
-        DrawAspectHdl.cxx
-
-
-SLOFILES =	\
-        $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \
-        $(SLO)$/XMLIsPercentagePropertyHandler.obj \
-        $(SLO)$/XMLRectangleMembersHandler.obj \
-        $(SLO)$/adjushdl.obj	\
-        $(SLO)$/backhdl.obj		\
-        $(SLO)$/bordrhdl.obj	\
-        $(SLO)$/breakhdl.obj	\
-        $(SLO)$/cdouthdl.obj	\
-        $(SLO)$/chrhghdl.obj	\
-        $(SLO)$/chrlohdl.obj	\
-        $(SLO)$/csmaphdl.obj	\
-        $(SLO)$/escphdl.obj		\
-        $(SLO)$/fonthdl.obj		\
-        $(SLO)$/impastp1.obj    \
-        $(SLO)$/impastp2.obj    \
-        $(SLO)$/impastp3.obj    \
-        $(SLO)$/impastp4.obj    \
-        $(SLO)$/kernihdl.obj	\
-        $(SLO)$/lspachdl.obj	\
-        $(SLO)$/numehelp.obj	\
-        $(SLO)$/opaquhdl.obj	\
-        $(SLO)$/postuhdl.obj	\
-        $(SLO)$/prhdlfac.obj	\
-        $(SLO)$/prstylei.obj	\
-        $(SLO)$/shadwhdl.obj	\
-        $(SLO)$/shdwdhdl.obj	\
-        $(SLO)$/styleexp.obj	\
-        $(SLO)$/tabsthdl.obj	\
-        $(SLO)$/undlihdl.obj	\
-        $(SLO)$/uniref.obj		\
-        $(SLO)$/weighhdl.obj	\
-        $(SLO)$/xmlaustp.obj	\
-        $(SLO)$/xmlbahdl.obj	\
-        $(SLO)$/xmlexppr.obj	\
-        $(SLO)$/xmlimppr.obj	\
-        $(SLO)$/xmlnume.obj		\
-        $(SLO)$/xmlnumfe.obj	\
-        $(SLO)$/xmlnumfi.obj	\
-        $(SLO)$/xmlnumi.obj		\
-        $(SLO)$/xmlprcon.obj	\
-        $(SLO)$/xmlprhdl.obj	\
-        $(SLO)$/xmlprmap.obj	\
-        $(SLO)$/xmlstyle.obj	\
-        $(SLO)$/xmltabe.obj		\
-        $(SLO)$/xmltabi.obj		\
-        $(SLO)$/DashStyle.obj					\
-        $(SLO)$/EnumPropertyHdl.obj				\
-        $(SLO)$/FillStyleContext.obj			\
-        $(SLO)$/GradientStyle.obj				\
-        $(SLO)$/HatchStyle.obj					\
-        $(SLO)$/ImageStyle.obj					\
-        $(SLO)$/MarkerStyle.obj					\
-        $(SLO)$/MultiPropertySetHelper.obj		\
-        $(SLO)$/SinglePropertySetInfoCache.obj	\
-        $(SLO)$/NamedBoolPropertyHdl.obj		\
-        $(SLO)$/TransGradientStyle.obj			\
-        $(SLO)$/XMLBackgroundImageContext.obj	\
-        $(SLO)$/XMLBackgroundImageExport.obj	\
-        $(SLO)$/XMLClipPropertyHandler.obj		\
-        $(SLO)$/XMLConstantsPropertyHandler.obj	\
-        $(SLO)$/AttributeContainerHandler.obj	\
-        $(SLO)$/XMLElementPropertyContext.obj	\
-        $(SLO)$/XMLFootnoteSeparatorExport.obj	\
-        $(SLO)$/XMLFootnoteSeparatorImport.obj	\
-        $(SLO)$/XMLFontAutoStylePool.obj		\
-        $(SLO)$/XMLFontStylesContext.obj		\
-        $(SLO)$/XMLPageExport.obj				\
-        $(SLO)$/PageMasterPropHdl.obj			\
-        $(SLO)$/PageMasterPropHdlFactory.obj	\
-        $(SLO)$/PageMasterStyleMap.obj			\
-        $(SLO)$/PageMasterPropMapper.obj		\
-        $(SLO)$/PageMasterExportPropMapper.obj	\
-        $(SLO)$/PageMasterImportPropMapper.obj	\
-        $(SLO)$/PageMasterImportContext.obj		\
-        $(SLO)$/PagePropertySetContext.obj		\
-        $(SLO)$/PageHeaderFooterContext.obj		\
-        $(SLO)$/StyleMap.obj					\
-        $(SLO)$/WordWrapPropertyHdl.obj			\
-        $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \
-        $(SLO)$/XMLFillBitmapSizePropertyHandler.obj	\
-        $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj	\
-        $(SLO)$/durationhdl.obj	\
-        $(SLO)$/VisAreaExport.obj \
-        $(SLO)$/VisAreaContext.obj \
-        $(SLO)$/DrawAspectHdl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 9f70e141c1..ad9e856448 100644..100755
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -29,10 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx
index 037867990d..037867990d 100644..100755
--- a/xmloff/source/style/opaquhdl.cxx
+++ b/xmloff/source/style/opaquhdl.cxx
diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx
index e1646f9ddb..e1646f9ddb 100644..100755
--- a/xmloff/source/style/opaquhdl.hxx
+++ b/xmloff/source/style/opaquhdl.hxx
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index 07c4c978de..07c4c978de 100644..100755
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx
index e05d89e6c6..e05d89e6c6 100644..100755
--- a/xmloff/source/style/postuhdl.hxx
+++ b/xmloff/source/style/postuhdl.hxx
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index edc1143d25..edc1143d25 100644..100755
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 554d39496b..70d99aa0f4 100644..100755
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -32,7 +32,7 @@
 
 #include <tools/debug.hxx>
 #include <set>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprcon.hxx>
 #include <com/sun/star/style/XStyle.hpp>
@@ -46,7 +46,7 @@
 
 #include <xmloff/prstylei.hxx>
 #include <xmloff/attrlist.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index c753e76d5d..c753e76d5d 100644..100755
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx
index f5e9667ca8..f5e9667ca8 100644..100755
--- a/xmloff/source/style/shadwhdl.hxx
+++ b/xmloff/source/style/shadwhdl.hxx
diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index fd3761ead9..fd3761ead9 100644..100755
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx
index b5d3f8ce61..b5d3f8ce61 100644..100755
--- a/xmloff/source/style/shdwdhdl.hxx
+++ b/xmloff/source/style/shdwdhdl.hxx
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 6efc7d19cb..ec372576e4 100644..100755
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -34,7 +34,7 @@
 #include <svl/svstdarr.hxx>
 #endif
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/attrlist.hxx>
@@ -439,7 +439,7 @@ void XMLStyleExport::exportStyleFamily(
         {
             if( !bUsed || xStyle->isInUse() )
             {
-                BOOL bExported = exportStyle( xStyle, rXMLFamily, rPropMapper,
+                sal_Bool bExported = exportStyle( xStyle, rXMLFamily, rPropMapper,
                                               xStyles,pPrefix );
                 if( bUsed && bFirstStyle && bExported  )
                 {
diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx
index d5fd586064..d5fd586064 100644..100755
--- a/xmloff/source/style/tabsthdl.cxx
+++ b/xmloff/source/style/tabsthdl.cxx
diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx
index 6ad74823ff..6ad74823ff 100644..100755
--- a/xmloff/source/style/tabsthdl.hxx
+++ b/xmloff/source/style/tabsthdl.hxx
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 322dedcb58..322dedcb58 100644..100755
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx
index fd25053f4a..fd25053f4a 100644..100755
--- a/xmloff/source/style/undlihdl.hxx
+++ b/xmloff/source/style/undlihdl.hxx
diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx
index 8129c25f76..8129c25f76 100644..100755
--- a/xmloff/source/style/uniref.cxx
+++ b/xmloff/source/style/uniref.cxx
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index dffe274605..1aedc3a9ab 100644..100755
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -52,7 +52,7 @@ using namespace ::xmloff::token;
 struct FontWeightMapper
 {
     float fWeight;
-    USHORT nValue;
+    sal_uInt16 nValue;
 };
 
 FontWeightMapper const aFontWeightMap[] =	
diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx
index d63270f747..d63270f747 100644..100755
--- a/xmloff/source/style/weighhdl.hxx
+++ b/xmloff/source/style/weighhdl.hxx
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 9a878b64b9..f23fa4f6f5 100644..100755
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -35,10 +35,10 @@
 #include "impastpl.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 
 #include <xmloff/PageMasterStyleMap.hxx>
 #include "PageMasterExportPropMapper.hxx"
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 926a83d96e..926a83d96e 100644..100755
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 907a760f10..907a760f10 100644..100755
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 7ee5039730..cff57a92c2 100644..100755
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -44,7 +44,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/PropertySetInfoHash.hxx>
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 4739d7195e..8d5928e5cd 100644..100755
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -41,10 +41,10 @@
 #include <xmloff/xmlimppr.hxx>
 #include <xmloff/xmlimp.hxx>
 
-#include "unoatrcn.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/unoatrcn.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <tools/debug.hxx>
 
 #include "xmloff/contextid.hxx"
@@ -137,7 +137,7 @@ void SvXMLImportPropertyMapper::importXML(
         sal_Int32 nStartIdx,
         sal_Int32 nEndIdx ) const
 {
-    INT16 nAttr = xAttrList->getLength();
+    sal_Int16 nAttr = xAttrList->getLength();
 
     Reference< XNameContainer > xAttrContainer;
 
@@ -145,11 +145,11 @@ void SvXMLImportPropertyMapper::importXML(
         nStartIdx = 0;
     if( -1 == nEndIdx )
         nEndIdx = maPropMapper->GetEntryCount();
-    for( INT16 i=0; i < nAttr; i++ )
+    for( sal_Int16 i=0; i < nAttr; i++ )
     {
         const OUString& rAttrName = xAttrList->getNameByIndex( i );
         OUString aLocalName, aPrefix, aNamespace;
-        USHORT nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix,
+        sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix,
                                                     &aLocalName, &aNamespace );
 
         if( XML_NAMESPACE_XMLNS == nPrefix )
@@ -369,7 +369,7 @@ bool SvXMLImportPropertyMapper::handleSpecialItem(
         return mxNextMapper->handleSpecialItem( rProperty, rProperties, rValue,
                                                rUnitConverter, rNamespaceMap );
     else
-        return FALSE;
+        return sal_False;
 }
 
 void SvXMLImportPropertyMapper::FillPropertySequence(
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 41df7a5e31..8f048d4efc 100644..100755
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -49,11 +49,11 @@
 #include <tools/debug.hxx>
 
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <tools/fontenum.hxx>
@@ -110,7 +110,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s
     }
 }
 
-void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
+void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
                                     const uno::Sequence<beans::PropertyValue>& rProps,
                                     sal_Bool bOutline )
 {
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index fe280a2785..bf0d8db82b 100644..100755
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 
 #include <xmloff/xmlnumfe.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -800,7 +800,7 @@ xub_StrLen lcl_FindSymbol( const String& sUpperStr, const String& sCurString )
 sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
                             const ::com::sun::star::lang::Locale& rLocale )
 {
-    //	returns TRUE if currency element was written
+    //	returns sal_True if currency element was written
 
     sal_Bool bRet = sal_False;
 
@@ -834,7 +834,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
     else
         AddToTextElement_Impl( rString );		// simple text
 
-    return bRet;		// TRUE: currency element written
+    return bRet;		// sal_True: currency element written
 }
 
 //-------------------------------------------------------------------------
@@ -876,7 +876,7 @@ sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sa
     return sal_False;		// not found
 }
 
-BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
+sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn )
 {
     //	make an extra loop to collect date elements, to check if it is a default format
     //	before adding the automatic-order attribute
@@ -937,7 +937,7 @@ BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDat
     }
 
     if ( bDateNoDefault )
-        return FALSE;						// additional elements
+        return sal_False;						// additional elements
     else
     {
         NfIndexTableOffset eFound = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat(
@@ -1046,7 +1046,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
 
     //	automatic ordering for currency and date formats
     //	only used for some built-in formats
-    BOOL bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT     || eBuiltIn == NF_CURRENCY_1000DEC2 ||
+    sal_Bool bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT     || eBuiltIn == NF_CURRENCY_1000DEC2 ||
                         eBuiltIn == NF_CURRENCY_1000INT_RED || eBuiltIn == NF_CURRENCY_1000DEC2_RED ||
                         eBuiltIn == NF_CURRENCY_1000DEC2_DASHED ||
                         eBuiltIn == NF_DATE_SYSTEM_SHORT	|| eBuiltIn == NF_DATE_SYSTEM_LONG ||
@@ -1059,16 +1059,16 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
 
     //	format source (for date and time formats)
     //	only used for some built-in formats
-    BOOL bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT ||
+    sal_Bool bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT ||
                          eBuiltIn == NF_DATE_SYSTEM_LONG  ||
                          eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM );
-    BOOL bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG );
+    sal_Bool bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG );
 
     // check if the format definition matches the key
     if ( bAutoOrder && ( nFmtType == NUMBERFORMAT_DATE || nFmtType == NUMBERFORMAT_DATETIME ) &&
             !lcl_IsDefaultDateFormat( rFormat, bSystemDate, eBuiltIn ) )
     {
-        bAutoOrder = bSystemDate = bLongSysDate = FALSE;		// don't write automatic-order attribute then
+        bAutoOrder = bSystemDate = bLongSysDate = sal_False;		// don't write automatic-order attribute then
     }
 
     if ( bAutoOrder &&
@@ -1183,7 +1183,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     if ( bExpFound && pElemStr )
                         nExpDigits += pElemStr->Len();
                     else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' )
-                        bDecDashes = TRUE;
+                        bDecDashes = sal_True;
                     else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' )
                     {
                         //	If the decimal digits string starts with a '#', variable
@@ -1206,7 +1206,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     bInInteger = sal_False;
                     break;
                 case NF_SYMBOLTYPE_CURRENCY:
-                    bCurrFound = TRUE;
+                    bCurrFound = sal_True;
                     break;
                 case NF_SYMBOLTYPE_CURREXT:
                     if (pElemStr)
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index cea207e0da..f8ec72d89f 100644..100755
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -43,7 +43,7 @@
 
 #include <xmloff/xmlnumfi.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -81,8 +81,8 @@ struct SvXMLEmbeddedElement
         nFormatPos(nFP), aText(rT) {}
 
     //	comparison operators for PTRARR sorting - sorted by position
-    BOOL operator ==( const SvXMLEmbeddedElement& r ) const	{ return nFormatPos == r.nFormatPos; }
-    BOOL operator < ( const SvXMLEmbeddedElement& r ) const	{ return nFormatPos <  r.nFormatPos; }
+    sal_Bool operator ==( const SvXMLEmbeddedElement& r ) const	{ return nFormatPos == r.nFormatPos; }
+    sal_Bool operator < ( const SvXMLEmbeddedElement& r ) const	{ return nFormatPos <  r.nFormatPos; }
 };
 
 typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr;
@@ -154,14 +154,14 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext
     rtl::OUString			sCalendar;
 
 public:
-                SvXMLNumFmtElementContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual		~SvXMLNumFmtElementContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -179,14 +179,14 @@ class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext
     sal_Int32					nTextPosition;
 
 public:
-                SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFmtElementContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual		~SvXMLNumFmtEmbeddedTextContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -202,14 +202,14 @@ class SvXMLNumFmtMapContext : public SvXMLImportContext
     rtl::OUString			sName;
 
 public:
-                SvXMLNumFmtMapContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual		~SvXMLNumFmtMapContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -225,14 +225,14 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext
     sal_Bool				bColSet;
 
 public:
-                SvXMLNumFmtPropContext( SvXMLImport& rImport, USHORT nPrfx,
+                SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual		~SvXMLNumFmtPropContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                     const rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -414,8 +414,8 @@ SvXMLNumImpData::~SvXMLNumImpData()
 
 sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName )
 {
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->aName == rName )
@@ -431,8 +431,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B
         //	if there is already an entry for this key without the bRemoveAfterUse flag,
         //	clear the flag for this entry, too
 
-        USHORT nCount = aNameEntries.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = aNameEntries.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             SvXMLNumFmtEntry* pObj = aNameEntries[i];
             if ( pObj->nKey == nKey && !pObj->bRemoveAfterUse )
@@ -454,8 +454,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B
 
 void SvXMLNumImpData::SetUsed( sal_uInt32 nKey )
 {
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->nKey == nKey )
@@ -478,8 +478,8 @@ void SvXMLNumImpData::RemoveVolatileFormats()
     if ( !pFormatter )
         return;
 
-    USHORT nCount = aNameEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aNameEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const SvXMLNumFmtEntry* pObj = aNameEntries[i];
         if ( pObj->bRemoveAfterUse )
@@ -622,7 +622,7 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang )
 //
 
 SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -650,7 +650,7 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -673,7 +673,7 @@ void SvXMLNumFmtMapContext::EndElement()
 //
 
 SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -697,7 +697,7 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -721,7 +721,7 @@ void SvXMLNumFmtPropContext::EndElement()
 //
 
 SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFmtElementContext& rParentContext,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -750,7 +750,7 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& )
 {
     // no elements supported - use default context
@@ -925,15 +925,15 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat
 //
 
 SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     rParent( rParentContext ),
     nType( nNewType ),
     nElementLang( LANGUAGE_SYSTEM ),
-    bLong( FALSE ),
-    bTextual( FALSE )
+    bLong( sal_False ),
+    bTextual( sal_False )
 {
     OUString sLanguage, sCountry;
     sal_Int32 nAttrVal;
@@ -1021,7 +1021,7 @@ SvXMLNumFmtElementContext::~SvXMLNumFmtElementContext()
 }
 
 SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     //	only number:number supports number:embedded-text child element
@@ -1050,8 +1050,8 @@ void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const
             //	there's already an element at this position - append text to existing element
 
             delete pObj;
-            USHORT nElementCount = aNumInfo.aEmbeddedElements.Count();
-            for (USHORT i=0; i<nElementCount; i++)
+            sal_uInt16 nElementCount = aNumInfo.aEmbeddedElements.Count();
+            for (sal_uInt16 i=0; i<nElementCount; i++)
             {
                 pObj = aNumInfo.aEmbeddedElements[i];
                 if ( pObj->nFormatPos == nFormatPos )
@@ -1264,7 +1264,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
 //
 
 SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                     SvXMLStylesContext& rStyles ) :
@@ -1275,15 +1275,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
     nType( nNewType ),
     nKey(-1),
     nFormatLang( LANGUAGE_SYSTEM ),
-    bAutoOrder( FALSE ),
-    bFromSystem( FALSE ),
-    bTruncate( TRUE ),
-    bAutoDec( FALSE ),
-    bAutoInt( FALSE ),
-    bHasExtraText( FALSE ),
-    bHasLongDoW( FALSE ),
-    bHasEra( FALSE ),
-    bHasDateTime( FALSE ),
+    bAutoOrder( sal_False ),
+    bFromSystem( sal_False ),
+    bTruncate( sal_True ),
+    bAutoDec( sal_False ),
+    bAutoInt( sal_False ),
+    bHasExtraText( sal_False ),
+    bHasLongDoW( sal_False ),
+    bHasEra( sal_False ),
+    bHasDateTime( sal_False ),
     bRemoveAfterUse( sal_False ),
     eDateDOW( XML_DEA_NONE ),
     eDateDay( XML_DEA_NONE ),
@@ -1386,7 +1386,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
 }
 
 SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                     const sal_Int32 nTempKey,
                                     SvXMLStylesContext& rStyles ) :
@@ -1397,15 +1397,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport,
     nType( 0 ),
     nKey(nTempKey),
     nFormatLang( LANGUAGE_SYSTEM ),
-    bAutoOrder( FALSE ),
-    bFromSystem( FALSE ),
-    bTruncate( TRUE ),
-    bAutoDec( FALSE ),
-    bAutoInt( FALSE ),
-    bHasExtraText( FALSE ),
-    bHasLongDoW( FALSE ),
-    bHasEra( FALSE ),
-    bHasDateTime( FALSE ),
+    bAutoOrder( sal_False ),
+    bFromSystem( sal_False ),
+    bTruncate( sal_True ),
+    bAutoDec( sal_False ),
+    bAutoInt( sal_False ),
+    bHasExtraText( sal_False ),
+    bHasLongDoW( sal_False ),
+    bHasEra( sal_False ),
+    bHasDateTime( sal_False ),
     bRemoveAfterUse( sal_False ),
     eDateDOW( XML_DEA_NONE ),
     eDateDay( XML_DEA_NONE ),
@@ -1424,7 +1424,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext()
 }
 
 SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext(
-                                    USHORT nPrfx, const rtl::OUString& rLName,
+                                    sal_uInt16 nPrfx, const rtl::OUString& rLName,
                                     const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
     SvXMLImportContext* pContext = NULL;
@@ -1752,7 +1752,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
         nGenPrec = 0;				// generate format without decimals...
 
     sal_Bool bGrouping = rInfo.bGrouping;
-    USHORT nEmbeddedCount = rInfo.aEmbeddedElements.Count();
+    sal_uInt16 nEmbeddedCount = rInfo.aEmbeddedElements.Count();
     if ( nEmbeddedCount )
         bGrouping = sal_False;		// grouping and embedded characters can't be used together
 
@@ -1795,7 +1795,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo )
         }
 
         //	aEmbeddedElements is sorted with ascending positions - loop is from right to left
-        for (USHORT nElement = 0; nElement < nEmbeddedCount; nElement++)
+        for (sal_uInt16 nElement = 0; nElement < nEmbeddedCount; nElement++)
         {
             const SvXMLEmbeddedElement* pObj = rInfo.aEmbeddedElements[nElement];
             sal_Int32 nFormatPos = pObj->nFormatPos;
@@ -2127,7 +2127,7 @@ void SvXMLNumFormatContext::AddColor( const Color& rColor )
     for ( sal_uInt16 i=0; i<XML_NUMF_COLORCOUNT; i++ )
         if ( rColor == aNumFmtStdColors[i] )
         {
-            aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< USHORT >(NF_KEY_FIRSTCOLOR + i) ) );
+            aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< sal_uInt16 >(NF_KEY_FIRSTCOLOR + i) ) );
             break;
         }
 
@@ -2199,7 +2199,7 @@ SvXMLNumFmtHelper::~SvXMLNumFmtHelper()
 }
 
 SvXMLStyleContext*	SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport,
-                USHORT nPrefix, const OUString& rLocalName,
+                sal_uInt16 nPrefix, const OUString& rLocalName,
                 const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                 SvXMLStylesContext& rStyles )
 {
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 1bf7d3e517..d3865ffe2f 100644..100755
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -50,12 +50,12 @@
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include "i18nmap.hxx"
+#include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "fonthdl.hxx"
 #include <xmloff/XMLFontStylesContext.hxx>
@@ -364,7 +364,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
             if( nLevel >= 1L )
                 nLevel--;
             else
-                nLevel = 0L;
+                nLevel = 0;
             break;
         case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME:
             sTextStyleName = rValue;
@@ -461,7 +461,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
 {
     sal_Int16 eType;
 
-    sal_Int32 nCount = 0L;
+    sal_Int32 nCount = 0;
     if( bBullet )
     {
         eType = NumberingType::CHAR_SPECIAL;
@@ -470,7 +470,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
     if( bImage )
     {
         eType = NumberingType::BITMAP;
-        nCount = 15L;
+        nCount = 15;
 
         if( (sImageURL.getLength() > 0L) || xBase64Stream.is() )
             nCount++;
@@ -480,7 +480,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
         eType = NumberingType::ARABIC;
         GetImport().GetMM100UnitConverter().convertNumFormat(
                 eType, sNumFormat, sNumLetterSync, sal_True );
-        nCount = 15L;
+        nCount = 15;
     }
 
     if( ( bBullet || bNum ) && nRelSize )
@@ -495,7 +495,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
     if( nCount > 0 )
     {
         beans::PropertyValue *pProps = aPropSeq.getArray();
-        sal_Int32 nPos = 0L;
+        sal_Int32 nPos = 0;
         pProps[nPos].Name =
                 OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
         pProps[nPos++].Value <<= (sal_Int16)eType ;
diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx
index e67f1501cc..c5941c1f76 100644..100755
--- a/xmloff/source/style/xmlprcon.cxx
+++ b/xmloff/source/style/xmlprcon.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
 using namespace ::std;
 
 SvXMLPropertySetContext::SvXMLPropertySetContext(
-    SvXMLImport& rImp, USHORT nPrfx,
+    SvXMLImport& rImp, sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     sal_uInt32 nFam,
@@ -65,7 +65,7 @@ SvXMLPropertySetContext::~SvXMLPropertySetContext()
 }
 
 SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -93,7 +93,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
     SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT
 */
 SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName,
     const uno::Reference< xml::sax::XAttributeList >&,
     ::std::vector< XMLPropertyState > &,
diff --git a/xmloff/source/style/xmlprhdl.cxx b/xmloff/source/style/xmlprhdl.cxx
index e8cf1844ca..e8cf1844ca 100644..100755
--- a/xmloff/source/style/xmlprhdl.cxx
+++ b/xmloff/source/style/xmlprhdl.cxx
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 8687c56fa9..8687c56fa9 100644..100755
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 21fabba714..a25bf543e5 100644..100755
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -44,7 +44,7 @@
 #include <svl/cntnrsrt.hxx>
 #include <svl/itemset.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include <xmloff/families.hxx>
@@ -211,7 +211,7 @@ void SvXMLStyleContext::Finish( sal_Bool /*bOverwrite*/ )
 {
 }
 
-BOOL SvXMLStyleContext::IsTransient() const
+sal_Bool SvXMLStyleContext::IsTransient() const
 {
     return sal_False;
 }
@@ -360,7 +360,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
 #endif
         ((SvXMLStylesContext_Impl *)this)->pIndices =
             new SvXMLStyleIndices_Impl(
-                sal::static_int_cast< USHORT >( aStyles.size() ), 5 );
+                sal::static_int_cast< sal_uInt16 >( aStyles.size() ), 5 );
         for( size_t i = 0; i < aStyles.size(); i++ )
         {
             SvXMLStyleIndex_Impl* pStyleIndex = new SvXMLStyleIndex_Impl( aStyles[ i ] );
@@ -378,7 +378,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
     if( pIndices )
     {
         SvXMLStyleIndex_Impl aIndex( nFamily, rName );
-        ULONG nPos = 0;
+        sal_uLong nPos = 0;
         if( pIndices->Seek_Entry( &aIndex, &nPos ) )
             pStyle = pIndices->GetObject( nPos )->GetStyle();
     }
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index e27187731f..8c1b8a527b 100644..100755
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -34,11 +34,11 @@
 #include <com/sun/star/style/TabAlign.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 8027537e79..4bfe96384a 100644..100755
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -32,11 +32,11 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/style/TabStop.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmluconv.hxx>
 
 #include "xmltabi.hxx"
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 58ba22f94e..7b5f9a004f 100644..100755
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 
 #include "xmloff/table/XMLTableExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexppr.hxx>
 #include <xmloff/xmlexp.hxx>
@@ -496,7 +496,7 @@ void XMLTableExport::exportTableStyles()
     XMLStyleExport aStEx(mrExport, OUString(), mrExport.GetAutoStylePool().get());
 
     // write graphic family styles
-    aStEx.exportStyleFamily("cell", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), mxCellExportPropertySetMapper.get(), TRUE, XML_STYLE_FAMILY_TABLE_CELL);
+    aStEx.exportStyleFamily("cell", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), mxCellExportPropertySetMapper.get(), sal_True, XML_STYLE_FAMILY_TABLE_CELL);
 
     exportTableTemplates();
 }
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index d546c8de5a..32c6e405a8 100644..100755
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -49,7 +49,7 @@
 #include "xmloff/prstylei.hxx"
 #include "xmloff/xmlimp.hxx"
 
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "table.hxx"
 
 #include <boost/shared_ptr.hpp>
@@ -81,9 +81,9 @@ struct ColumnInfo
 class XMLProxyContext : public SvXMLImportContext
 {
 public:
-    XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, USHORT nPrfx, const OUString& rLName );
+    XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
 private:
     SvXMLImportContextRef mxParent;
@@ -109,10 +109,10 @@ typedef std::vector< boost::shared_ptr< MergeInfo > > MergeInfoVector;
 class XMLTableImportContext : public SvXMLImportContext
 {
 public:
-    XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, USHORT nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange );
+    XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange );
     virtual ~XMLTableImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void StartElement( const Reference< XAttributeList >& xAttrList );
 
@@ -120,9 +120,9 @@ public:
 
     void InitColumns();
 
-    SvXMLImportContext * ImportColumn( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
-    SvXMLImportContext * ImportRow( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
-    SvXMLImportContext * ImportCell( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    SvXMLImportContext * ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     OUString GetDefaultCellStyleName() const;
 
@@ -149,12 +149,12 @@ public:
     XMLCellImportContext( SvXMLImport& rImport,
                           const Reference< XMergeableCell >& xCell,
                           const OUString& sDefaultCellStyleName,
-                          USHORT nPrfx, const OUString& rLName,
+                          sal_uInt16 nPrfx, const OUString& rLName,
                           const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLCellImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void EndElement();
 
@@ -175,9 +175,9 @@ public:
 class XMLTableTemplateContext : public SvXMLStyleContext
 {
 public:
-    XMLTableTemplateContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList );
+    XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList );
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList );
 
     virtual void StartElement( const Reference< XAttributeList >& xAttrList );
 
@@ -192,7 +192,7 @@ private:
 // class XMLProxyContext
 // --------------------------------------------------------------------
 
-XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, USHORT nPrfx, const OUString& rLName )
+XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName )
 : SvXMLImportContext( rImport, nPrfx, rLName )
 , mxParent( xParent )
 {
@@ -200,7 +200,7 @@ XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContext
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLProxyContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxParent.Is() )
         return mxParent->CreateChildContext( nPrefix, rLocalName, xAttrList );
@@ -234,7 +234,7 @@ XMLTableImport::~XMLTableImport()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext* XMLTableImport::CreateTableContext( USHORT nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
+SvXMLImportContext* XMLTableImport::CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
 {
     rtl::Reference< XMLTableImport > xThis( this );
     return new XMLTableImportContext( xThis, nPrfx, rLName, xColumnRowRange );
@@ -242,7 +242,7 @@ SvXMLImportContext* XMLTableImport::CreateTableContext( USHORT nPrfx, const OUSt
 
 // --------------------------------------------------------------------
 
-SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
+SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
 {
     return new XMLTableTemplateContext( mrImport, nPrfx, rLName, xAttrList );
 }
@@ -315,7 +315,7 @@ void XMLTableImport::finishStyles()
 // --------------------------------------------------------------------
 
 
-XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, USHORT nPrfx, const OUString& rLName,	Reference< XColumnRowRange >& xColumnRowRange )
+XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName,	Reference< XColumnRowRange >& xColumnRowRange )
 : SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
 , mxTableImporter( xImporter )
 , mxTable( xColumnRowRange, UNO_QUERY )
@@ -334,7 +334,7 @@ XMLTableImportContext::~XMLTableImportContext()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportColumn( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxColumns.is() && (mnCurrentRow == -1) ) try
     {
@@ -435,7 +435,7 @@ void XMLTableImportContext::InitColumns()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( mxRows.is() )
     {
@@ -517,7 +517,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUS
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     mnCurrentColumn++;
     if( mxColumns.is() ) try
@@ -552,7 +552,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( USHORT nPrefix, const OU
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext *XMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( nPrefix == XML_NAMESPACE_TABLE )
     {
@@ -620,7 +620,7 @@ OUString XMLTableImportContext::GetDefaultCellStyleName() const
 // XMLCellImportContext
 // --------------------------------------------------------------------
 
-XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, USHORT nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
+XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 : SvXMLImportContext( rImport, nPrfx, rLName )
 , mxCell( xCell )
 , mbListContextPushed( false )
@@ -698,7 +698,7 @@ XMLCellImportContext::~XMLCellImportContext()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLCellImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     // create text cursor on demand
     if( !mxCursor.is() )
@@ -764,7 +764,7 @@ void XMLCellImportContext::EndElement()
 // class XMLTableTemplateContext
 // --------------------------------------------------------------------
 
-XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
+XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
 : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, sal_False )
 {
 }
@@ -777,7 +777,7 @@ void XMLTableTemplateContext::StartElement( const Reference< XAttributeList >& x
     for(sal_Int16 i=0; i < nAttrCount; i++)
     {
         OUString sAttrName;
-        USHORT nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
+        sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
         if( (nAttrPrefix == XML_NAMESPACE_TEXT ) && IsXMLToken( sAttrName, XML_STYLE_NAME ) )
         {
             msTemplateStyleName = xAttrList->getValueByIndex( i );
@@ -797,7 +797,7 @@ void XMLTableTemplateContext::EndElement()
 
 // --------------------------------------------------------------------
 
-SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
+SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
 {
     if( nPrefix == XML_NAMESPACE_TABLE )
     {
@@ -811,7 +811,7 @@ SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( USHORT nPrefix
             for(sal_Int16 i=0; i < nAttrCount; i++)
             {
                 OUString sAttrName;
-                USHORT nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
+                sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
                 if( (nAttrPrefix == XML_NAMESPACE_TEXT) && IsXMLToken( sAttrName, XML_STYLE_NAME ) )
                 {
                     maTableTemplate[pElements->msStyleName] = xAttrList->getValueByIndex( i );
diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk
deleted file mode 100644
index 6f8c8efab7..0000000000
--- a/xmloff/source/table/makefile.mk
+++ /dev/null
@@ -1,48 +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=xmloff
-TARGET=table
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/XMLTableExport.obj\
-        $(SLO)$/XMLTableImport.obj
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index a5378b4995..a5378b4995 100644..100755
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/table.hxx
diff --git a/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx
deleted file mode 100644
index 6838c8f623..0000000000
--- a/xmloff/source/table/tabledesignsimporter.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_xmloff.hxx"
-
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/table/XTableRows.hpp>
-#include <com/sun/star/table/XMergeableCell.hpp>
-#include <com/sun/star/table/XMergeableCellRange.hpp>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "xmloff/table/XMLTableImport.hxx"
-#include "xmloff/xmltkmap.hxx"
-#include "xmloff/maptype.hxx"
-#include "xmloff/xmlprmap.hxx"
-#include "xmloff/txtimp.hxx"
-#include "xmloff/xmlimp.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/xmlstyle.hxx"
-#include "xmloff/prstylei.hxx"
-#include "xmloff/xmlimp.hxx"
-
-#include "xmlnmspe.hxx"
-#include "table.hxx"
-
-#include <boost/shared_ptr.hpp>
-
-// --------------------------------------------------------------------
-
-using ::rtl::OUString;
-using namespace ::xmloff::token;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-
-// --------------------------------------------------------------------
-
-class TabelDesignsImporter : public SvXMLImport
-{
-    TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr );
-    ~TabelDesignsImporter() throw ();
-
-    SvXMLImportContext* CreateContext(USHORT nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::TabelDesignsImporter( const Reference< XMultiServiceFactory > & rSMgr )
-: SvXMLImport( rSMgr, true )
-{
-    // add namespaces
-    GetNamespaceMap().Add(
-        GetXMLToken(XML_NP_PRESENTATION),
-        GetXMLToken(XML_N_PRESENTATION), 
-        XML_NAMESPACE_PRESENTATION);
-}
-
-// --------------------------------------------------------------------
-
-TabelDesignsImporter::~TabelDesignsImporter()
-{
-}
-
-// --------------------------------------------------------------------
-
-SvXMLImportContext* TabelDesignsImporter::CreateContext(USHORT nPrefix, const OUString& rLocalName,	const Reference<XAttributeList>& xAttrList)
-{
-}
-
-// --------------------------------------------------------------------
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
index c3ffd7fffc..c3ffd7fffc 100644..100755
--- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx
+++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index ffe6bacd20..a35f4876e1 100644..100755
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <rtl/ustring.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index 9b72819ea1..9b72819ea1 100644..100755
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index 286b8c9ecd..b6ff6dd6d7 100644..100755
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
@@ -55,7 +55,7 @@ TYPEINIT1(XMLAutoTextContainerEventImport, SvXMLImportContext);
 
 XMLAutoTextContainerEventImport::XMLAutoTextContainerEventImport(
     SvXMLImport& rImport, 
-    USHORT nPrfx,
+    sal_uInt16 nPrfx,
     const OUString& rLName,
     const Reference<XNameReplace> & rEvnts ) :
         SvXMLImportContext(rImport, nPrfx, rLName),
@@ -68,7 +68,7 @@ XMLAutoTextContainerEventImport::~XMLAutoTextContainerEventImport()
 }
 
 SvXMLImportContext* XMLAutoTextContainerEventImport::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & )
 {
diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index e8702d32bb..1b908ee794 100644..100755
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -56,7 +56,7 @@ public:
 
     XMLAutoTextContainerEventImport(
         SvXMLImport& rImport, 
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< 
                 ::com::sun::star::container::XNameReplace > & rEvents );
@@ -67,7 +67,7 @@ public:
 protected:
 
     virtual SvXMLImportContext *CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList );
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index c5149f4052..90279eed6d 100644..100755
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <rtl/ustrbuf.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 216e23eefd..216e23eefd 100644..100755
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index a3b11fcdd4..ad00180313 100644..100755
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "XMLAutoTextContainerEventImport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <tools/debug.hxx>
 
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index a3f0525219..a3f0525219 100644..100755
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx
index 730a570fad..e149afde33 100644..100755
--- a/xmloff/source/text/XMLCalculationSettingsContext.cxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx
index cd3b7b4f35..cd3b7b4f35 100644..100755
--- a/xmloff/source/text/XMLCalculationSettingsContext.hxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 4bf12f195a..1efd6dcf6c 100644..100755
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -33,7 +33,7 @@
 #include "XMLChangeInfoContext.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 6daa849668..6daa849668 100644..100755
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index bf94feaa6f..7aeb967452 100644..100755
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/text/XTextRange.hpp>
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index 22afa34f3b..22afa34f3b 100644..100755
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 88c34a1fea..e9f63182d2 100644..100755
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -32,7 +32,7 @@
 #include "XMLChangedRegionImportContext.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <com/sun/star/uno/Reference.h>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -70,7 +70,7 @@ void XMLChangeInfoContext::StartElement(const Reference<XAttributeList> &)
 }
 
 SvXMLImportContext* XMLChangeInfoContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList >& xAttrList )
 {
diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index ec1cc03710..bd644ae249 100644..100755
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -76,7 +76,7 @@ public:
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const ::rtl::OUString& rLocalName,
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index db82f1c676..2cd50aab74 100644..100755
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index 924bda2a72..924bda2a72 100644..100755
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index 9a5dfd312d..7ef08ec5b7 100644..100755
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 7528a5f373..7528a5f373 100644..100755
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 18cf0ebd8e..a318c334ab 100644..100755
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -36,7 +36,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include <xmloff/families.hxx>
@@ -302,7 +302,7 @@ void XMLFootnoteConfigurationImportContext::StartElement(
 }
 
 SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> & xAttrList )
 {
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 12b43d2062..9afab7e033 100644..100755
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 #include "XMLFootnoteBodyImportContext.hxx"
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx
index a4379e7ca0..a4379e7ca0 100644..100755
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index ea9190ac93..a99eacdd92 100644..100755
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index a6ba716795..a6ba716795 100644..100755
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index abbb2cc05e..a443b9ea08 100644..100755
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index da30a93b59..e574436429 100644..100755
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/BibliographyDataField.hpp>
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index 471a8302dc..471a8302dc 100644..100755
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index 108e42c215..1872def466 100644..100755
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index eb12a2dbbd..eb12a2dbbd 100644..100755
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx
index 64e7a051dc..64e7a051dc 100644..100755
--- a/xmloff/source/text/XMLIndexBodyContext.cxx
+++ b/xmloff/source/text/XMLIndexBodyContext.cxx
diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx
index ecc2f317cb..ecc2f317cb 100644..100755
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index 64ff1d48d6..24f5254f12 100644..100755
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/text/ChapterFormat.hpp>
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index 2b80c88098..2b80c88098 100644..100755
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index b66f471fa1..e0133dc7c4 100644..100755
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index 74a205f34c..74a205f34c 100644..100755
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index f6770a2cc2..49029c8763 100644..100755
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index 2aeb754ee5..2aeb754ee5 100644..100755
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 2c44c26150..f5eabce234 100644..100755
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 18795e945f..18795e945f 100644..100755
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 5ae4df5336..4701243fc1 100644..100755
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index b76b126588..b76b126588 100644..100755
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index a1b4b672a4..42784e4cf6 100644..100755
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 29c6610c65..29c6610c65 100644..100755
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
index fd1ad830e5..fd1ad830e5 100644..100755
--- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index 954faeea3d..954faeea3d 100644..100755
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 4dddabd8d9..5022dafd7f 100644..100755
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -50,10 +50,10 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/prstylei.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index 392e457223..392e457223 100644..100755
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index 433f4ae2a9..2be57b3a72 100644..100755
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index 33d5dc3493..33d5dc3493 100644..100755
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index 36d2bac083..5f96083510 100644..100755
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index d3be1f888c..d3be1f888c 100644..100755
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 82b118c9c6..356deaafc8 100644..100755
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index ca18acbaec..ca18acbaec 100644..100755
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 4cc8198795..738eb23a54 100644..100755
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -41,7 +41,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index d89ac3c845..d89ac3c845 100644..100755
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 46619c37c9..24176b926d 100644..100755
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index cf82864b8d..cf82864b8d 100644..100755
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index b7b1b4cdb6..a9bca1a22a 100644..100755
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index ff18dad1e2..ff18dad1e2 100644..100755
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index aa84ad3029..e50fcc1154 100644..100755
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 31f9bb57b1..31f9bb57b1 100644..100755
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 28f09c1f04..16af7a8212 100644..100755
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/style/LineNumberPosition.hpp>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
 
diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index 4a8bc28dae..4a8bc28dae 100644..100755
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 6d817f5171..cd588dde9d 100644..100755
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index 1f8ef584d9..8b9508cf85 100644..100755
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -32,7 +32,7 @@
 #include "XMLLineNumberingImportContext.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 2d2a0acb18..2d2a0acb18 100644..100755
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index f951660024..f951660024 100644..100755
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index c52c07b1c6..c52c07b1c6 100644..100755
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 3536eb0066..9fb2f4ef73 100644..100755
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/text/XTextSection.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index 41061cb355..41061cb355 100644..100755
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index b8b675f41d..0ace6d7899 100644..100755
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -54,7 +54,7 @@
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include <com/sun/star/text/ChapterFormat.hpp> //i90246
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index c3c95b7d0c..c3c95b7d0c 100644..100755
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index b7b022d8ca..46d01c12d1 100644..100755
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -36,7 +36,7 @@
 
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
index 71ff0427c5..71ff0427c5 100644..100755
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index b7ba346764..89e0bc4b6c 100644..100755
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlprmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlnumi.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 667cffe2b6..667cffe2b6 100644..100755
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index bd957e503a..bc402adedf 100644..100755
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index 330497ed8f..330497ed8f 100644..100755
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index 1e6064464d..8efb923fd1 100644..100755
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index fe15dca0a4..fe15dca0a4 100644..100755
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index a8737cdece..c917511194 100644..100755
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -35,7 +35,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index b9d6a2a91d..b9d6a2a91d 100644..100755
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index 15ea439f09..9a141c9f24 100644..100755
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "XMLStringBufferImportContext.hxx"
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 using ::rtl::OUString;
@@ -58,7 +58,7 @@ XMLStringBufferImportContext::~XMLStringBufferImportContext()
 }
 
 SvXMLImportContext *XMLStringBufferImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList> &)
 {
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index 280436f148..97227cb3db 100644..100755
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "XMLTextCharStyleNamesElementExport.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlexp.hxx>
 
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
index 0782267166..0782267166 100644..100755
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 9bacb702e9..f843cc57d1 100644..100755
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextColumnsContext.hxx"
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 2fd81e6089..b22af2581e 100644..100755
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -39,7 +39,7 @@
 
 
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "XMLTextColumnsExport.hxx"
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 892c080671..3a8d1746ea 100644..100755
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLAnchorTypePropHdl.hxx"
@@ -51,7 +51,7 @@
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include "XMLReplacementImageContext.hxx"
 #include <xmloff/prstylei.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "xexptran.hxx"
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/XMLEventsImportContext.hxx>
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 68ff6f518b..68ff6f518b 100644..100755
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index ecf5bf6440..897334cc97 100644..100755
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 9a4d614558..9a4d614558 100644..100755
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 0249c2c336..f08ea269fd 100644..100755
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XRelativeTextContentRemove.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "XMLTextHeaderFooterContext.hxx"
 #include <xmloff/XMLTextTableContext.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 580b7aa1ab..fdf5e076ef 100644..100755
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/xmlexp.hxx>
 
 using ::rtl::OUString;
@@ -186,7 +186,15 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
 
 XMLTextListAutoStylePool::~XMLTextListAutoStylePool()
 {
+    // The XMLTextListAutoStylePoolEntry_Impl object in the pool need delete explicitly in dtor.
+    sal_uLong nCount = pPool->Count();
+    while ( nCount-- )
+        delete pPool->Remove(nCount);
     delete pPool;
+
+    nCount = pNames->Count();
+    while ( nCount-- )
+        delete pNames->Remove(nCount);
     delete pNames;
 }
 
@@ -204,7 +212,7 @@ sal_Bool XMLTextListAutoStylePool::HasName( const OUString& rName ) const
 
 sal_uInt32 XMLTextListAutoStylePool::Find( XMLTextListAutoStylePoolEntry_Impl* pEntry ) const
 {
-    ULONG nPos;
+    sal_uLong nPos;
     if( !pEntry->IsNamed() && mxNumRuleCompare.is() )
     {
         const sal_uInt32 nCount = pPool->Count();
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 6efff1ade3..be416e9459 100644..100755
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -36,7 +36,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index ae9ebc3ff9..ae9ebc3ff9 100644..100755
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index fb62ad0f59..663782a49e 100644..100755
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -31,7 +31,7 @@
 #include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "txtparai.hxx"
 #include "txtlists.hxx"
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index ac4c6bdbb2..ac4c6bdbb2 100644..100755
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 0453f9a271..5c7cc66c80 100644..100755
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -39,8 +39,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/odffields.hxx>
-#include "xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -293,7 +293,12 @@ void XMLTextMarkImportContext::EndElement()
                             Reference<XTextCursor> xInsertionCursor =
                                 m_rHelper.GetText()->createTextCursorByRange(
                                     xEndRange);
+                            try {
                             xInsertionCursor->gotoRange(xStartRange, sal_True);
+                            } catch (uno::Exception&) {
+                                OSL_ENSURE(false,
+                                    "cannot go to end position of bookmark");
+                            }
 
                             //DBG_ASSERT(! xInsertionCursor->isCollapsed(), 
                             // 				"we want no point mark");
@@ -355,7 +360,7 @@ void XMLTextMarkImportContext::EndElement()
     }
 }
 
-SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix,
                                         const ::rtl::OUString& rLocalName,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >&  )
 {
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index beb11fcef0..950b63b714 100644..100755
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -102,7 +102,7 @@ protected:
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
     virtual void EndElement();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 908736023c..9ae8155919 100644..100755
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/XMLTextMasterPageContext.hxx>
 #include "XMLTextHeaderFooterContext.hxx"
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index d4c40d0fa7..2eecd2ed25 100644..100755
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index d5c5330e33..8a98545ea9 100644..100755
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -32,7 +32,7 @@
 
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
 
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index a7ef73c611..57506e7ec3 100644..100755
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include "XMLTextNumRuleInfo.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 
 using ::rtl::OUString;
 
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 2c487c2ced..2c487c2ced 100644..100755
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index 8470aea7ca..8470aea7ca 100644..100755
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx
index 15a18c184a..8171ba4692 100644..100755
--- a/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -52,7 +52,7 @@ public:
     virtual ~XMLTextPropertySetContext();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const ::rtl::OUString& rLocalName,
                                    const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 6a7667fb28..b2c309a22c 100644..100755
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -38,7 +38,7 @@
 #include "XMLAnchorTypePropHdl.hxx"
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include "XMLTextShapeImportHelper.hxx"
+#include "xmloff/XMLTextShapeImportHelper.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index cc137e19ad..a1445c5bf9 100644..100755
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "XMLTextPropertySetContext.hxx"
 #include <xmloff/xmlimp.hxx>
@@ -65,7 +65,7 @@ public:
     virtual ~XMLTextShapePropertySetContext_Impl();
 
     using SvXMLPropertySetContext::CreateChildContext;
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const Reference< XAttributeList >& xAttrList,
         ::std::vector< XMLPropertyState > &rProperties,
diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx
index 5eae3a5cb6..5eae3a5cb6 100644..100755
--- a/xmloff/source/text/XMLTextTableContext.cxx
+++ b/xmloff/source/text/XMLTextTableContext.cxx
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index c288e2bf8e..598e5efc84 100644..100755
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index b906ffe97b..b906ffe97b 100644..100755
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
deleted file mode 100644
index 658de22044..0000000000
--- a/xmloff/source/text/makefile.mk
+++ /dev/null
@@ -1,127 +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=xmloff
-TARGET=text
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES =	\
-        $(SLO)$/txtdrope.obj \
-        $(SLO)$/txtdropi.obj \
-        $(SLO)$/txtexppr.obj \
-        $(SLO)$/txtflde.obj \
-        $(SLO)$/txtfldi.obj \
-        $(SLO)$/txtftne.obj \
-        $(SLO)$/txtimp.obj \
-        $(SLO)$/txtimppr.obj \
-                $(SLO)$/txtlists.obj \
-        $(SLO)$/txtparae.obj \
-        $(SLO)$/txtparai.obj \
-        $(SLO)$/txtprhdl.obj \
-        $(SLO)$/txtprmap.obj \
-        $(SLO)$/txtsecte.obj \
-        $(SLO)$/txtstyle.obj \
-        $(SLO)$/txtstyli.obj \
-        $(SLO)$/txtvfldi.obj \
-        $(SLO)$/XMLAutoMarkFileContext.obj \
-        $(SLO)$/XMLAutoTextEventExport.obj \
-        $(SLO)$/XMLAutoTextEventImport.obj \
-        $(SLO)$/XMLAutoTextContainerEventImport.obj \
-        $(SLO)$/XMLChangedRegionImportContext.obj \
-        $(SLO)$/XMLChangeElementImportContext.obj \
-        $(SLO)$/XMLChangeInfoContext.obj \
-        $(SLO)$/XMLFootnoteBodyImportContext.obj \
-        $(SLO)$/XMLFootnoteConfigurationImportContext.obj \
-        $(SLO)$/XMLFootnoteImportContext.obj \
-        $(SLO)$/XMLIndexAlphabeticalSourceContext.obj \
-        $(SLO)$/XMLIndexBodyContext.obj \
-        $(SLO)$/XMLIndexBibliographyConfigurationContext.obj \
-        $(SLO)$/XMLIndexBibliographyEntryContext.obj \
-        $(SLO)$/XMLIndexBibliographySourceContext.obj \
-        $(SLO)$/XMLIndexChapterInfoEntryContext.obj \
-        $(SLO)$/XMLIndexIllustrationSourceContext.obj \
-        $(SLO)$/XMLIndexMarkExport.obj \
-        $(SLO)$/XMLIndexObjectSourceContext.obj \
-        $(SLO)$/XMLIndexSimpleEntryContext.obj \
-        $(SLO)$/XMLIndexSpanEntryContext.obj \
-        $(SLO)$/XMLIndexSourceBaseContext.obj \
-        $(SLO)$/XMLIndexTOCContext.obj \
-        $(SLO)$/XMLIndexTOCSourceContext.obj \
-        $(SLO)$/XMLIndexTOCStylesContext.obj \
-        $(SLO)$/XMLIndexTableSourceContext.obj \
-        $(SLO)$/XMLIndexTabStopEntryContext.obj \
-        $(SLO)$/XMLIndexTemplateContext.obj \
-        $(SLO)$/XMLIndexTitleTemplateContext.obj \
-        $(SLO)$/XMLIndexUserSourceContext.obj \
-        $(SLO)$/XMLLineNumberingExport.obj \
-        $(SLO)$/XMLLineNumberingImportContext.obj \
-        $(SLO)$/XMLLineNumberingSeparatorImportContext.obj \
-        $(SLO)$/XMLPropertyBackpatcher.obj \
-        $(SLO)$/XMLRedlineExport.obj \
-        $(SLO)$/XMLSectionExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigExport.obj \
-        $(SLO)$/XMLSectionFootnoteConfigImport.obj \
-        $(SLO)$/XMLSectionImportContext.obj \
-        $(SLO)$/XMLSectionSourceDDEImportContext.obj \
-        $(SLO)$/XMLSectionSourceImportContext.obj \
-        $(SLO)$/XMLTextCharStyleNamesElementExport.obj \
-        $(SLO)$/XMLTextColumnsContext.obj \
-        $(SLO)$/XMLTextColumnsExport.obj \
-        $(SLO)$/XMLTextFrameContext.obj \
-        $(SLO)$/XMLTextFrameHyperlinkContext.obj \
-        $(SLO)$/XMLTextHeaderFooterContext.obj \
-        $(SLO)$/XMLTextListAutoStylePool.obj \
-        $(SLO)$/XMLTextListBlockContext.obj \
-        $(SLO)$/XMLTextListItemContext.obj \
-        $(SLO)$/XMLTextMarkImportContext.obj \
-        $(SLO)$/XMLTextMasterPageContext.obj \
-        $(SLO)$/XMLTextMasterPageExport.obj \
-        $(SLO)$/XMLTextMasterStylesContext.obj \
-        $(SLO)$/XMLTextNumRuleInfo.obj \
-        $(SLO)$/XMLTextPropertySetContext.obj \
-        $(SLO)$/XMLTextShapeImportHelper.obj \
-        $(SLO)$/XMLTextShapeStyleContext.obj \
-        $(SLO)$/XMLTextTableContext.obj \
-        $(SLO)$/XMLChangeImportContext.obj \
-        $(SLO)$/XMLStringBufferImportContext.obj \
-        $(SLO)$/XMLTrackedChangesImportContext.obj \
-        $(SLO)$/XMLCalculationSettingsContext.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index d718abe305..0b090b26db 100644..100755
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "txtdrope.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index b6faee61c5..b6faee61c5 100644..100755
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 5b5d852067..e7f708e07e 100644..100755
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -33,7 +33,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 19c83ba6b0..19c83ba6b0 100644..100755
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 16ec08ece7..16ec08ece7 100644..100755
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index 1eafa31a40..4b6e67d811 100644..100755
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -31,7 +31,7 @@
 
 #include <xmloff/xmlexppr.hxx>
 #include "txtdrope.hxx"
-#include "xmltabe.hxx"
+#include "xmloff/xmltabe.hxx"
 #include "XMLTextColumnsExport.hxx"
 #include "XMLBackgroundImageExport.hxx"
 
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index e8b4b696e6..57212e6b94 100644..100755
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -40,7 +40,7 @@
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlnume.hxx>
-#include "numehelp.hxx"
+#include "xmloff/numehelp.hxx"
 
 #include <xmloff/families.hxx>
 #include <xmloff/XMLEventExport.hxx>
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 7cbd3a8299..9812273ab5 100644..100755
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -39,7 +39,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/txtimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -210,7 +210,7 @@ const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage";
 const sal_Char sAPI_is_visible[]		= "IsVisible";
 const sal_Char sAPI_TextRange[]			= "TextRange";
 
-const sal_Char sAPI_true[] = "TRUE";
+const sal_Char sAPI_true[] = "sal_True";
 
 
 TYPEINIT1( XMLTextFieldImportContext, SvXMLImportContext);
@@ -3657,7 +3657,7 @@ void XMLAnnotationImportContext::ProcessAttribute(
 }
 
 SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext(
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList >& xAttrList )
 {
@@ -3965,7 +3965,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport,
 }
 
 SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 89c8dfec93..906369e936 100644..100755
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/text/FootnoteNumbering.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlnumfe.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b56acc0f4c..552ce2683c 100644..100755
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtstyli.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlnumfi.hxx>
@@ -70,10 +70,10 @@
 #include "txtparai.hxx"
 #include <xmloff/txtimp.hxx>
 #include <xmloff/txtprmap.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 #include <xmloff/xmlimp.hxx>
 #include "txtvfldi.hxx"
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include "XMLTextListItemContext.hxx"
 #include "XMLTextListBlockContext.hxx"
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 92b80ac8db..5015a9b73f 100644..100755
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -38,7 +38,7 @@
 #include <xmloff/XMLFontStylesContext.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "txtimppr.hxx"
+#include "xmloff/txtimppr.hxx"
 
 #define XML_LINE_LEFT 0
 #define XML_LINE_RIGHT 1
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 88640d1cc1..88640d1cc1 100644..100755
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index ff1e5b1224..04282bb8b6 100644..100755
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -91,7 +91,7 @@
 #include <com/sun/star/text/XEndnotesSupplier.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/util/DateTime.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/families.hxx>
 #include "txtexppr.hxx"
@@ -107,7 +107,7 @@
 #include <xmloff/txtprmap.hxx>
 #include "XMLImageMapExport.hxx"
 #include "XMLTextNumRuleInfo.hxx"
-#include "XMLTextListAutoStylePool.hxx"
+#include "xmloff/XMLTextListAutoStylePool.hxx"
 #include <xmloff/txtparae.hxx>
 #include "XMLSectionExport.hxx"
 #include "XMLIndexMarkExport.hxx"
@@ -3273,7 +3273,7 @@ void XMLTextParagraphExport::exportTextRange(
 void XMLTextParagraphExport::exportText( const OUString& rText,
                                            sal_Bool& rPrevCharIsSpace )
 {
-    sal_Int32 nExpStartPos = 0L;
+    sal_Int32 nExpStartPos = 0;
     sal_Int32 nEndPos = rText.getLength();
     sal_Int32 nSpaceChars = 0;
     for( sal_Int32 nPos = 0; nPos < nEndPos; nPos++ )
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index a2760c6e60..7873a1c117 100644..100755
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -50,7 +50,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/txtimp.hxx>
 #include "txtparai.hxx"
 #include "txtfldi.hxx"
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index a2bdfb7a53..a2bdfb7a53 100644..100755
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index a285f9dcfd..a285f9dcfd 100644..100755
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index ed9810d4a6..ed9810d4a6 100644..100755
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index 48ca7b4be3..48ca7b4be3 100644..100755
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index b6fb3be237..8cf954a868 100644..100755
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include <tools/debug.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "txtprhdl.hxx"
 #include <xmloff/txtprmap.hxx>
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 1eb331c83e..2a3380aca3 100644..100755
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/text/SectionFileLink.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/XDocumentIndex.hpp>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index 83e696969e..c9a73e042a 100644..100755
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -34,11 +34,8 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-
-
 #include <xmloff/xmltoken.hxx>
-
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/families.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/xmlnume.hxx>
@@ -48,7 +45,6 @@
 #include "txtexppr.hxx"
 #include <xmloff/txtprmap.hxx>
 
-
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 7e4861fd77..28283b6243 100644..100755
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 
 #include "XMLTextPropertySetContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "xmloff/XMLEventsImportContext.hxx"
 #include "xmloff/attrlist.hxx"
 #include "xmloff/families.hxx"
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 8b41774831..b99c69476e 100644..100755
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -37,9 +37,9 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/xmlnumi.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "i18nmap.hxx"
+#include "xmloff/i18nmap.hxx"
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlement.hxx>
@@ -966,7 +966,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
     // rename field
     // currently: no family in use! Use 0.
     OUString sName = rImportHelper.GetRenameMap().Get(
-        sal::static_int_cast< USHORT >(eVarType), sVarName);
+        sal::static_int_cast< sal_uInt16 >(eVarType), sVarName);
 
     // get text fields supplier and field masters
     Reference<XTextFieldsSupplier> xTextFieldsSupp(rImport.GetModel(), 
@@ -1018,7 +1018,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
             sNew = aBuf.makeStringAndClear();
 
             rImportHelper.GetRenameMap().Add(
-                sal::static_int_cast< USHORT >(eVarType), sName, sNew);
+                sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew);
 
             // call FindFieldMaster recursively to create new master
             return FindFieldMaster(xMaster, rImport, rImportHelper,
@@ -1043,7 +1043,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
             sNew = aBuf.makeStringAndClear();
 
             rImportHelper.GetRenameMap().Add(
-                sal::static_int_cast< USHORT >(eVarType), sName, sNew);
+                sal::static_int_cast< sal_uInt16 >(eVarType), sName, sNew);
 
             // call FindFieldMaster recursively to create new master
             return FindFieldMaster(xMaster, rImport, rImportHelper,
diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index d974832492..d974832492 100644..100755
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
diff --git a/xmloff/source/transform/ActionMapTypesOOo.hxx b/xmloff/source/transform/ActionMapTypesOOo.hxx
index 6ac91753f7..6ac91753f7 100644..100755
--- a/xmloff/source/transform/ActionMapTypesOOo.hxx
+++ b/xmloff/source/transform/ActionMapTypesOOo.hxx
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index 30ff898507..30ff898507 100644..100755
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index c9817b02f3..5a1f2d4759 100644..100755
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx
index c96b09cc67..c96b09cc67 100644..100755
--- a/xmloff/source/transform/ChartOASISTContext.hxx
+++ b/xmloff/source/transform/ChartOASISTContext.hxx
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index fe7acbb26c..b30c2415fa 100644..100755
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "ChartOOoTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOOo.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx
index 443d43f556..443d43f556 100644..100755
--- a/xmloff/source/transform/ChartOOoTContext.hxx
+++ b/xmloff/source/transform/ChartOOoTContext.hxx
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index 7ed40f73b3..b1df9cf622 100644..100755
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -31,7 +31,7 @@
 #include "ChartPlotAreaOASISTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOASIS.hxx"
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
index 6a3d1af743..6a3d1af743 100644..100755
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index d2069b55a7..83c1599773 100644..100755
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -31,7 +31,7 @@
 #include "ChartPlotAreaOOoTContext.hxx"
 #include "TransformerBase.hxx"
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "ActionMapTypesOOo.hxx"
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
index 53381f6f85..53381f6f85 100644..100755
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx
index 53438d37e8..029824e01b 100644..100755
--- a/xmloff/source/transform/ControlOASISTContext.cxx
+++ b/xmloff/source/transform/ControlOASISTContext.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx
index 012fe52e42..012fe52e42 100644..100755
--- a/xmloff/source/transform/ControlOASISTContext.hxx
+++ b/xmloff/source/transform/ControlOASISTContext.hxx
diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index 623af6268e..08fb07d97f 100644..100755
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -31,7 +31,7 @@
 #include "ControlOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOOo.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx
index da9d0ed986..da9d0ed986 100644..100755
--- a/xmloff/source/transform/ControlOOoTContext.hxx
+++ b/xmloff/source/transform/ControlOOoTContext.hxx
diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx
index 11dcf69420..11dcf69420 100644..100755
--- a/xmloff/source/transform/CreateElemTContext.cxx
+++ b/xmloff/source/transform/CreateElemTContext.cxx
diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx
index 8fb39c785e..8fb39c785e 100644..100755
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx
index d1307d2753..d1307d2753 100644..100755
--- a/xmloff/source/transform/DeepTContext.cxx
+++ b/xmloff/source/transform/DeepTContext.cxx
diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx
index 16ac4954a1..16ac4954a1 100644..100755
--- a/xmloff/source/transform/DeepTContext.hxx
+++ b/xmloff/source/transform/DeepTContext.hxx
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 5aba9e9b3c..962e9d3dcb 100644..100755
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_xmloff.hxx"
 #include "DlgOASISTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx
index 16d47434b6..16d47434b6 100644..100755
--- a/xmloff/source/transform/DlgOASISTContext.hxx
+++ b/xmloff/source/transform/DlgOASISTContext.hxx
diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx
index c0b106c9cf..57beee3c76 100644..100755
--- a/xmloff/source/transform/DocumentTContext.cxx
+++ b/xmloff/source/transform/DocumentTContext.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include "TransformerBase.hxx"
 #include "MutableAttrList.hxx"
diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx
index 3f79f6f298..3f79f6f298 100644..100755
--- a/xmloff/source/transform/DocumentTContext.hxx
+++ b/xmloff/source/transform/DocumentTContext.hxx
diff --git a/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx
index 27564eff3e..27564eff3e 100644..100755
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index 1a1c7d8798..0e37aa0f37 100644..100755
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "EventMap.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 
 XMLTransformerEventMapEntry aTransformerEventMap[] =
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index dcf7f31260..dcf7f31260 100644..100755
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index a158ce8730..ad77eb49a4 100644..100755
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -31,7 +31,7 @@
 #include "EventOASISTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
@@ -153,7 +153,7 @@ bool ParseURLAsString(
     sal_Int32 params = rAttrValue.indexOf( '?' );
     if ( rAttrValue.indexOf( SCHEME ) != 0 || params < 0 )
     {
-        return FALSE;
+        return sal_False;
     }
 
     sal_Int32 start = SCHEME.getLength();
@@ -187,9 +187,9 @@ bool ParseURLAsString(
 
     if ( aLanguage.equalsIgnoreAsciiCaseAscii( "basic" ) )
     {
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 bool ParseURL(
@@ -235,11 +235,11 @@ bool ParseURL(
                     {
                         *pLocation = GetXMLToken( XML_APPLICATION );
                     }
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
-        return FALSE;
+        return sal_False;
     }
     else
     {
diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx
index 124f69772f..124f69772f 100644..100755
--- a/xmloff/source/transform/EventOASISTContext.hxx
+++ b/xmloff/source/transform/EventOASISTContext.hxx
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 5e6bc69c70..b1548afea2 100644..100755
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -31,7 +31,7 @@
 #include "EventOOoTContext.hxx"
 #include "EventMap.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOOo.hxx"
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx
index c5b92c0a33..c5b92c0a33 100644..100755
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
diff --git a/xmloff/source/transform/FamilyType.hxx b/xmloff/source/transform/FamilyType.hxx
index 46dd78195c..46dd78195c 100644..100755
--- a/xmloff/source/transform/FamilyType.hxx
+++ b/xmloff/source/transform/FamilyType.hxx
diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx
index 5109ef0a61..5109ef0a61 100644..100755
--- a/xmloff/source/transform/FlatTContext.cxx
+++ b/xmloff/source/transform/FlatTContext.cxx
diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx
index fedd0a01f8..fedd0a01f8 100644..100755
--- a/xmloff/source/transform/FlatTContext.hxx
+++ b/xmloff/source/transform/FlatTContext.hxx
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index 8cdbd5658c..7405ef3196 100644..100755
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOASIS.hxx"
 #include "AttrTransformerAction.hxx"
@@ -52,7 +52,7 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType(
     sal_Bool bNeg = sal_False;
     sal_uInt32 nVal = 0;
 
-    sal_Int32 nPos = 0L;
+    sal_Int32 nPos = 0;
     sal_Int32 nLen = rValue.getLength();
 
     // skip white space
diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx
index 2c360e210a..2c360e210a 100644..100755
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index fd63e79bef..d3a4902ae6 100644..100755
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "IgnoreTContext.hxx"
 #include "ActionMapTypesOOo.hxx"
diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx
index 0b40c6228a..0b40c6228a 100644..100755
--- a/xmloff/source/transform/FormPropOOoTContext.hxx
+++ b/xmloff/source/transform/FormPropOOoTContext.hxx
diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index 3a166355d5..e3f5beeffe 100644..100755
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -31,7 +31,7 @@
 #include "FrameOASISTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "ActionMapTypesOASIS.hxx"
 #include "ElemTransformerAction.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx
index 7c3b90e375..7c3b90e375 100644..100755
--- a/xmloff/source/transform/FrameOASISTContext.hxx
+++ b/xmloff/source/transform/FrameOASISTContext.hxx
diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index cf088c5d3f..c448795de9 100644..100755
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -31,7 +31,7 @@
 #include "FrameOOoTContext.hxx"
 #include "IgnoreTContext.hxx"
 #include "MutableAttrList.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "ActionMapTypesOOo.hxx"
 #include "AttrTransformerAction.hxx"
diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx
index 3193ae6c97..3193ae6c97 100644..100755
--- a/xmloff/source/transform/FrameOOoTContext.hxx
+++ b/xmloff/source/transform/FrameOOoTContext.hxx
diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx
index ac13d31943..ac13d31943 100644..100755
--- a/xmloff/source/transform/IgnoreTContext.cxx
+++ b/xmloff/source/transform/IgnoreTContext.cxx
diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx
index e9a3aa5cbf..e9a3aa5cbf 100644..100755
--- a/xmloff/source/transform/IgnoreTContext.hxx
+++ b/xmloff/source/transform/IgnoreTContext.hxx
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index d60c4a5604..972d0fe102 100644..100755
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -35,7 +35,7 @@
 #include "AttrTransformerAction.hxx"
 #include "ElemTransformerAction.hxx"
 #include "IgnoreTContext.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx
index f79e0c93b1..f79e0c93b1 100644..100755
--- a/xmloff/source/transform/MergeElemTContext.hxx
+++ b/xmloff/source/transform/MergeElemTContext.hxx
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 7c57f37d67..7dc2876430 100644..100755
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include "TransformerBase.hxx"
 #include "MutableAttrList.hxx"
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index 39396a41d1..0778aff126 100644..100755
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -30,7 +30,7 @@
 #define _XMLOFF_METATCONTEXT_HXX
 
 #include <rtl/ref.hxx>
-#include "functional.hxx"
+#include "xmloff/functional.hxx"
 
 #include <map>
 
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index 28d75ffc60..28d75ffc60 100644..100755
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index f7e41836c3..f7e41836c3 100644..100755
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 2f352262e0..20f506d551 100644..100755
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include "TransformerBase.hxx"
 #include "TransformerActions.hxx"
diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index 62f02d8c99..62f02d8c99 100644..100755
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 1af1ff83a2..4492d7ff53 100644..100755
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -32,7 +32,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "MutableAttrList.hxx"
 #include "DeepTContext.hxx"
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index d20f6c930f..d20f6c930f 100644..100755
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 997158c82f..8d4509a336 100644..100755
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -32,7 +32,7 @@
 #include <rtl/uuid.h>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "DeepTContext.hxx"
 #include "MetaTContext.hxx"
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 164872f567..164872f567 100644..100755
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx
index 44d4769414..44d4769414 100644..100755
--- a/xmloff/source/transform/PersAttrListTContext.cxx
+++ b/xmloff/source/transform/PersAttrListTContext.cxx
diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx
index 58b21bc8ac..58b21bc8ac 100644..100755
--- a/xmloff/source/transform/PersAttrListTContext.hxx
+++ b/xmloff/source/transform/PersAttrListTContext.hxx
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index b144439852..b144439852 100644..100755
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx
index ed641bddf2..ed641bddf2 100644..100755
--- a/xmloff/source/transform/PersMixedContentTContext.hxx
+++ b/xmloff/source/transform/PersMixedContentTContext.hxx
diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx
index 4e96d3f4db..4e96d3f4db 100644..100755
--- a/xmloff/source/transform/ProcAddAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.cxx
diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx
index 5b0121e30f..5b0121e30f 100644..100755
--- a/xmloff/source/transform/ProcAddAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.hxx
diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx
index c258765bc4..c258765bc4 100644..100755
--- a/xmloff/source/transform/ProcAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAttrTContext.cxx
diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx
index 23cd447ce1..23cd447ce1 100644..100755
--- a/xmloff/source/transform/ProcAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAttrTContext.hxx
diff --git a/xmloff/source/transform/PropType.hxx b/xmloff/source/transform/PropType.hxx
index e9fc958da6..e9fc958da6 100644..100755
--- a/xmloff/source/transform/PropType.hxx
+++ b/xmloff/source/transform/PropType.hxx
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index b4589990c2..2a1c03f3e4 100644..100755
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "FamilyType.hxx"
 #include "PropertyActionsOASIS.hxx"
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 1cda7c2d46..1cda7c2d46 100644..100755
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 02b8f4b3ce..265f42f1e1 100644..100755
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "PropertyActionsOOo.hxx"
 
@@ -644,6 +644,10 @@ XMLTransformerActionInit aTextPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_FO, XML_HYPHENATION_PUSH_CHAR_COUNT, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
+    { XML_NAMESPACE_STYLE, XML_TEXT_OVERLINE_STYLE, XML_ATACTION_REMOVE,
+        NO_PARAMS }, /* #i113645# */
+    { XML_NAMESPACE_STYLE, XML_TEXT_OVERLINE_COLOR, XML_ATACTION_REMOVE,
+        NO_PARAMS }, /* #i113645# */
 
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index 2493c2f958..2493c2f958 100644..100755
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
diff --git a/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx
index 668a4c3753..668a4c3753 100644..100755
--- a/xmloff/source/transform/RenameElemTContext.cxx
+++ b/xmloff/source/transform/RenameElemTContext.cxx
diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx
index 19393d974d..19393d974d 100644..100755
--- a/xmloff/source/transform/RenameElemTContext.hxx
+++ b/xmloff/source/transform/RenameElemTContext.hxx
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 9f52f8f731..19f7d74979 100644..100755
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -35,7 +35,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "ProcAttrTContext.hxx"
diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index 768fea6d45..768fea6d45 100644..100755
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 74dafbffc6..bfcc344990 100644..100755
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "PropType.hxx"
 #include "DeepTContext.hxx"
 #include "RenameElemTContext.hxx"
diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx
index c5ad231c7f..c5ad231c7f 100644..100755
--- a/xmloff/source/transform/StyleOOoTContext.hxx
+++ b/xmloff/source/transform/StyleOOoTContext.hxx
diff --git a/xmloff/source/transform/TContextVector.hxx b/xmloff/source/transform/TContextVector.hxx
index b8fbab29cc..b8fbab29cc 100644..100755
--- a/xmloff/source/transform/TContextVector.hxx
+++ b/xmloff/source/transform/TContextVector.hxx
diff --git a/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx
index c6ff7b730a..c6ff7b730a 100644..100755
--- a/xmloff/source/transform/Transformer.hxx
+++ b/xmloff/source/transform/Transformer.hxx
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index d9cacc1e03..d9cacc1e03 100644..100755
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
diff --git a/xmloff/source/transform/TransformerActionInit.hxx b/xmloff/source/transform/TransformerActionInit.hxx
index ca01b0c3c5..ca01b0c3c5 100644..100755
--- a/xmloff/source/transform/TransformerActionInit.hxx
+++ b/xmloff/source/transform/TransformerActionInit.hxx
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index a5d335071a..a5d335071a 100644..100755
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index 0fd85c96a1..0fd85c96a1 100644..100755
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 0d2b4c8858..8e8eb34df3 100644..100755
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include "IgnoreTContext.hxx"
 #include "RenameElemTContext.hxx"
 #include "ProcAttrTContext.hxx"
@@ -80,7 +80,7 @@ bool lcl_ConvertAttr( OUString & rOutAttribute, sal_Int32 nParam )
 }
 } // anonymous namespace
 
-XMLTransformerContext *XMLTransformerBase::CreateContext( USHORT nPrefix,
+XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix,
     const OUString& rLocalName, const OUString& rQName )
 {
     XMLTransformerActions::key_type aKey( nPrefix, rLocalName );
@@ -606,8 +606,8 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
 
                                 // #i13778#,#i36248# apply correct twip-to-1/100mm
                                 nMeasure = (sal_Int32)( nMeasure >= 0
-                                                        ? ((nMeasure*127L+36L)/72L)
-                                                        : ((nMeasure*127L-36L)/72L) );
+                                                        ? ((nMeasure*127+36)/72)
+                                                        : ((nMeasure*127-36)/72) );
 
                                 rtl::OUStringBuffer aBuffer;
                                 SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit );
@@ -766,8 +766,8 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList(
 
                                 // #i13778#,#i36248#/ apply correct 1/100mm-to-twip conversion
                                 nMeasure = (sal_Int32)( nMeasure >= 0
-                                                        ? ((nMeasure*72L+63L)/127L)
-                                                        : ((nMeasure*72L-63L)/127L) );
+                                                        ? ((nMeasure*72+63)/127)
+                                                        : ((nMeasure*72-63)/127) );
 
                                 OUStringBuffer aBuffer;
                                 SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit );
@@ -1187,7 +1187,7 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue )
     sal_Bool bNeg = sal_False;
     double nVal = 0;
 
-    sal_Int32 nPos = 0L;
+    sal_Int32 nPos = 0;
     sal_Int32 nLen = rValue.getLength();
 
     // skip white space
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index cb8156bab7..cb8156bab7 100644..100755
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx
index 7129259d29..7129259d29 100644..100755
--- a/xmloff/source/transform/TransformerContext.cxx
+++ b/xmloff/source/transform/TransformerContext.cxx
diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index fda058aec5..fda058aec5 100644..100755
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
diff --git a/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx
index 91fa222c47..91fa222c47 100644..100755
--- a/xmloff/source/transform/TransformerTokenMap.cxx
+++ b/xmloff/source/transform/TransformerTokenMap.cxx
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index 4b8539d2cd..4b8539d2cd 100644..100755
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 85da0a0e25..a1098cb9cf 100644..100755
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -142,45 +142,12 @@ extern "C"
 {
 #endif
 
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xMasterKey( reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ) );
-
-            const ServiceDescriptor* pDescriptor = getServiceDescriptors();
-            while ( pDescriptor->getImplementationName )
-            {
-                ::rtl::OUString sNewKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
-                sNewKeyName += pDescriptor->getImplementationName();
-                sNewKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-                uno::Reference< registry::XRegistryKey > xNewKey( xMasterKey->createKey( sNewKeyName ) );
-
-                uno::Sequence< ::rtl::OUString > aServices = pDescriptor->getSupportedServiceNames();
-                const ::rtl::OUString* pServices = aServices.getConstArray();
-                for( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices )
-                    xNewKey->createKey( *pServices);
-
-                ++pDescriptor;
-            }
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "xof::component_writeInfo: InvalidRegistryException!" );
-        }
-    }
-    return sal_True;
-}
-
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = NULL;
     if( pServiceManager )
diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
deleted file mode 100644
index bba8deb6db..0000000000
--- a/xmloff/source/transform/makefile.mk
+++ /dev/null
@@ -1,95 +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 := xmloff
-TARGET := xof
-LIBTARGET=NO
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS = \
-    $(SLO)$/ChartOASISTContext.obj \
-    $(SLO)$/ChartOOoTContext.obj \
-    $(SLO)$/ChartPlotAreaOASISTContext.obj \
-    $(SLO)$/ChartPlotAreaOOoTContext.obj \
-    $(SLO)$/ControlOASISTContext.obj \
-    $(SLO)$/ControlOOoTContext.obj \
-    $(SLO)$/CreateElemTContext.obj \
-    $(SLO)$/DeepTContext.obj \
-    $(SLO)$/DlgOASISTContext.obj \
-    $(SLO)$/DocumentTContext.obj \
-    $(SLO)$/EventMap.obj \
-    $(SLO)$/EventOASISTContext.obj \
-    $(SLO)$/EventOOoTContext.obj \
-    $(SLO)$/FlatTContext.obj \
-    $(SLO)$/FormPropOASISTContext.obj \
-    $(SLO)$/FormPropOOoTContext.obj \
-    $(SLO)$/FrameOASISTContext.obj \
-    $(SLO)$/FrameOOoTContext.obj \
-    $(SLO)$/IgnoreTContext.obj \
-    $(SLO)$/MergeElemTContext.obj \
-    $(SLO)$/MetaTContext.obj \
-    $(SLO)$/MutableAttrList.obj \
-    $(SLO)$/NotesTContext.obj \
-    $(SLO)$/OOo2Oasis.obj \
-    $(SLO)$/Oasis2OOo.obj \
-    $(SLO)$/PersAttrListTContext.obj \
-    $(SLO)$/PersMixedContentTContext.obj \
-    $(SLO)$/ProcAddAttrTContext.obj \
-    $(SLO)$/ProcAttrTContext.obj \
-    $(SLO)$/PropertyActionsOASIS.obj \
-    $(SLO)$/PropertyActionsOOo.obj \
-    $(SLO)$/RenameElemTContext.obj \
-    $(SLO)$/StyleOASISTContext.obj \
-    $(SLO)$/StyleOOoTContext.obj \
-    $(SLO)$/TransformerActions.obj \
-    $(SLO)$/TransformerBase.obj \
-    $(SLO)$/TransformerContext.obj \
-    $(SLO)$/TransformerTokenMap.obj \
-    $(SLO)$/XMLFilterRegistration.obj
-
-SHL1STDLIBS = \
-    $(COMPHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB)
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
-    SHL1STDLIBS += -lxo$(DLLPOSTFIX)
-.ELSE
-    SHL1STDLIBS += ixo.lib
-.ENDIF
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component
new file mode 100755
index 0000000000..8f9c88f7fa
--- /dev/null
+++ b/xmloff/source/transform/xof.component
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Calc.XMLContentImporter">
+    <service name="com.sun.star.comp.Calc.XMLContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLImporter">
+    <service name="com.sun.star.comp.Calc.XMLImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLMetaImporter">
+    <service name="com.sun.star.comp.Calc.XMLMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLSettingsImporter">
+    <service name="com.sun.star.comp.Calc.XMLSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Calc.XMLStylesImporter">
+    <service name="com.sun.star.comp.Calc.XMLStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Chart.XMLContentImporter">
+    <service name="com.sun.star.comp.Chart.XMLContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Chart.XMLImporter">
+    <service name="com.sun.star.comp.Chart.XMLImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Chart.XMLStylesImporter">
+    <service name="com.sun.star.comp.Chart.XMLStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.XMLContentImporter">
+    <service name="com.sun.star.comp.Draw.XMLContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.XMLImporter">
+    <service name="com.sun.star.comp.Draw.XMLImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.XMLMetaImporter">
+    <service name="com.sun.star.comp.Draw.XMLMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.XMLSettingsImporter">
+    <service name="com.sun.star.comp.Draw.XMLSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Draw.XMLStylesImporter">
+    <service name="com.sun.star.comp.Draw.XMLStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Impress.XMLContentImporter">
+    <service name="com.sun.star.comp.Impress.XMLContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Impress.XMLImporter">
+    <service name="com.sun.star.comp.Impress.XMLImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Impress.XMLMetaImporter">
+    <service name="com.sun.star.comp.Impress.XMLMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Impress.XMLSettingsImporter">
+    <service name="com.sun.star.comp.Impress.XMLSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Impress.XMLStylesImporter">
+    <service name="com.sun.star.comp.Impress.XMLStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLMetaImporter">
+    <service name="com.sun.star.comp.Math.XMLMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLSettingsImporter">
+    <service name="com.sun.star.comp.Math.XMLSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.OOo2OasisTransformer">
+    <service name="com.sun.star.comp.OOo2OasisTransformer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Oasis2OOoTransformer">
+    <service name="com.sun.star.comp.Oasis2OOoTransformer"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter">
+    <service name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLContentImporter">
+    <service name="com.sun.star.comp.Writer.XMLContentImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLImporter">
+    <service name="com.sun.star.comp.Writer.XMLImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLMetaImporter">
+    <service name="com.sun.star.comp.Writer.XMLMetaImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLSettingsImporter">
+    <service name="com.sun.star.comp.Writer.XMLSettingsImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLStylesImporter">
+    <service name="com.sun.star.comp.Writer.XMLStylesImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.document.XMLMetaImporter">
+    <service name="com.sun.star.document.XMLMetaImporter"/>
+  </implementation>
+</component>
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index fcc2929498..3d2c336340 100644..100755
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -35,7 +35,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
@@ -70,7 +70,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaContext::SchemaContext(
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XDataTypeRepository>& rRepository ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 20e218eb86..c002938ba3 100644..100755
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -59,7 +59,7 @@ class SchemaContext : public TokenContext
 public:
 
     SchemaContext( SvXMLImport& rImport, 
-                   USHORT nPrfx,
+                   sal_uInt16 nPrfx,
                    const ::rtl::OUString& rLName,
                    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
     virtual ~SchemaContext();
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index cf0b652b2e..cc77b1c0e3 100644..100755
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -34,7 +34,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -94,7 +94,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaRestrictionContext::SchemaRestrictionContext(
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
     const OUString& sTypeName ) :
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 10f52926b4..d9dba5c0c4 100644..100755
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -62,7 +62,7 @@ class SchemaRestrictionContext : public TokenContext
 public:
 
     SchemaRestrictionContext( SvXMLImport& rImport, 
-                              USHORT nPrfx,
+                              sal_uInt16 nPrfx,
                               const ::rtl::OUString& rLName,
                               com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository,
                               const ::rtl::OUString& sTypeName );
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index 116c308493..52d684efca 100644..100755
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -34,7 +34,7 @@
 #include "SchemaRestrictionContext.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
@@ -70,7 +70,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 SchemaSimpleTypeContext::SchemaSimpleTypeContext(
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XDataTypeRepository>& rRepository ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index 4972da2056..bfa785729b 100644..100755
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -60,7 +60,7 @@ class SchemaSimpleTypeContext : public TokenContext
 public:
 
     SchemaSimpleTypeContext( SvXMLImport& rImport, 
-                             USHORT nPrfx,
+                             sal_uInt16 nPrfx,
                              const ::rtl::OUString& rLName,
                              const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
 
diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index f9fe2ea691..950980dc4e 100644..100755
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -32,7 +32,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <tools/debug.hxx>
 
@@ -48,7 +48,7 @@ struct SvXMLTokenMapEntry aEmptyMap[1] =
 
 
 TokenContext::TokenContext( SvXMLImport& rImport, 
-                            USHORT nPrefix,
+                            sal_uInt16 nPrefix,
                             const OUString& rLocalName,
                             const SvXMLTokenMapEntry* pAttributes,
                             const SvXMLTokenMapEntry* pChildren )
@@ -101,7 +101,7 @@ void TokenContext::StartElement(
 }
 
 SvXMLImportContext* TokenContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& xAttrList )
 {
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index e05a78abc4..1b45bf9e9b 100644..100755
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -62,7 +62,7 @@ protected:
 public:
 
     TokenContext( SvXMLImport& rImport, 
-                  USHORT nPrefix,
+                  sal_uInt16 nPrefix,
                   const ::rtl::OUString& rLocalName,
                   const SvXMLTokenMapEntry* pAttributes = NULL,
                   const SvXMLTokenMapEntry* pChildren = NULL );
@@ -85,7 +85,7 @@ public:
      * CreateChildCotnenxt may want to call the parent method for
      * handling of defaults. */
     virtual SvXMLImportContext* CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index bed9f19e37..f1abd24454 100644..100755
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -34,10 +34,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -78,7 +78,7 @@ void lcl_fillNamespaceContainer( const SvXMLNamespaceMap&,
 
 XFormsBindContext::XFormsBindContext( 
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XPropertySet>& xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 85f556b645..c9c87c9e42 100644..100755
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -61,7 +61,7 @@ class XFormsBindContext : public TokenContext
 public:
 
     XFormsBindContext( SvXMLImport& rImport, 
-                       USHORT nPrefix,
+                       sal_uInt16 nPrefix,
                        const rtl::OUString& rLocalName,
                        const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
     virtual ~XFormsBindContext();
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index 13c1f8ddff..f11344d525 100644..100755
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -42,10 +42,10 @@
 #include <com/sun/star/xforms/XModel.hpp>
 #include <tools/debug.hxx>
 
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <xmlerror.hxx>
+#include <xmloff/xmlerror.hxx>
 #include <xmloff/nmspmap.hxx>
 
 
@@ -73,7 +73,7 @@ static SvXMLTokenMapEntry aAttributes[] =
 
 XFormsInstanceContext::XFormsInstanceContext( 
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     Reference<XPropertySet> xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributes, aEmptyMap ),
@@ -87,7 +87,7 @@ XFormsInstanceContext::~XFormsInstanceContext()
 }
 
 SvXMLImportContext* XFormsInstanceContext::CreateChildContext( 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XAttributeList>& )
 {
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index 07f63a1158..f709b36e6a 100644..100755
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -64,7 +64,7 @@ class XFormsInstanceContext : public TokenContext
 public:
 
     XFormsInstanceContext( SvXMLImport& rImport, 
-                           USHORT nPrfx,
+                           sal_uInt16 nPrfx,
                            const ::rtl::OUString& rLName,
                            com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xModel );
     virtual ~XFormsInstanceContext();
@@ -78,7 +78,7 @@ public:
     //
 
     virtual SvXMLImportContext* CreateChildContext( 
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
 
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index af2a403716..6ccba6eae6 100644..100755
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -38,10 +38,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
@@ -79,7 +79,7 @@ static SvXMLTokenMapEntry aChildren[] =
 
 
 XFormsModelContext::XFormsModelContext( SvXMLImport& rImport, 
-                                        USHORT nPrefix,
+                                        sal_uInt16 nPrefix,
                                         const OUString& rLocalName ) :
     TokenContext( rImport, nPrefix, rLocalName, aAttributes, aChildren ),
     mxModel( lcl_createXFormsModel() )
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index f55d5d9134..b16356e363 100644..100755
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -58,7 +58,7 @@ class XFormsModelContext : public TokenContext
 public:
 
     XFormsModelContext( SvXMLImport& rImport, 
-                        USHORT nPrfx,
+                        sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName );
     virtual ~XFormsModelContext();
 
diff --git a/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx
index 6e22358ac9..6e22358ac9 100644..100755
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 8b153dca16..11bebcff48 100644..100755
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -34,10 +34,10 @@
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlimp.hxx>
-#include "xmlerror.hxx"
+#include "xmloff/xmlerror.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltkmap.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
@@ -84,7 +84,7 @@ void lcl_fillNamespaceContainer( const SvXMLNamespaceMap&,
 
 XFormsSubmissionContext::XFormsSubmissionContext( 
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference<XPropertySet>& xModel ) :
         TokenContext( rImport, nPrefix, rLocalName, aAttributeMap, aEmptyMap ),
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 75dd130380..243a4c6d61 100644..100755
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -59,7 +59,7 @@ class XFormsSubmissionContext : public TokenContext
 public:
 
     XFormsSubmissionContext( SvXMLImport& rImport, 
-                             USHORT nPrefix,
+                             sal_uInt16 nPrefix,
                              const rtl::OUString& rLocalName,
                              const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xModel );
     virtual ~XFormsSubmissionContext();
diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk
deleted file mode 100644
index f1238a6036..0000000000
--- a/xmloff/source/xforms/makefile.mk
+++ /dev/null
@@ -1,58 +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=xmloff
-TARGET=xforms
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/xformsapi.obj \
-    $(SLO)$/XFormsBindContext.obj \
-    $(SLO)$/xformsimport.obj \
-    $(SLO)$/XFormsModelContext.obj \
-    $(SLO)$/XFormsInstanceContext.obj \
-    $(SLO)$/XFormsSubmissionContext.obj \
-    $(SLO)$/SchemaContext.obj \
-    $(SLO)$/SchemaRestrictionContext.obj \
-    $(SLO)$/SchemaSimpleTypeContext.obj \
-    $(SLO)$/TokenContext.obj \
-    $(SLO)$/xformsexport.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 25324a26c5..530991fded 100644..100755
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -46,7 +46,7 @@
 
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmlnmspe.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltkmap.hxx>
 
 using rtl::OUString;
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 973bfb573a..973bfb573a 100644..100755
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index c14f9ea382..b01f9ad74a 100644..100755
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -29,14 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_xmloff.hxx"
 
-#include "xformsexport.hxx"
+#include "xmloff/xformsexport.hxx"
 
 #include "XFormsModelExport.hxx"
 #include "xformsapi.hxx"
 
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include "DomExport.hxx"
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index d8e0b43361..5ffae552dd 100644..100755
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -32,7 +32,7 @@
 #include "XFormsModelContext.hxx"
 #include <vector>
 #include <utility>
-#include "xformsimport.hxx"
+#include "xmloff/xformsimport.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
@@ -69,7 +69,7 @@ using rtl::OUString;
 
 SvXMLImportContext* createXFormsModelContext( 
     SvXMLImport& rImport, 
-    USHORT nPrefix,
+    sal_uInt16 nPrefix,
     const rtl::OUString& rLocalName )
 {
     return new XFormsModelContext( rImport, nPrefix, rLocalName );
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
deleted file mode 100644
index fb0979f4cf..0000000000
--- a/xmloff/util/makefile.mk
+++ /dev/null
@@ -1,83 +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=xmloff
-TARGET=xo
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------
-.IF "$(L10N_framework)"==""
-LIB1TARGET= $(SLB)$/xo.lib
-LIB1FILES=	\
-    $(SLB)$/core.lib \
-    $(SLB)$/meta.lib \
-    $(SLB)$/script.lib \
-    $(SLB)$/style.lib \
-    $(SLB)$/text.lib \
-    $(SLB)$/draw.lib \
-    $(SLB)$/chart.lib \
-    $(SLB)$/forms.lib \
-    $(SLB)$/xforms.lib \
-    $(SLB)$/table.lib
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET= xo$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS= \
-        $(TOOLSLIB)		\
-        $(I18NISOLANGLIB) \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)\
-        $(COMPHELPERLIB)\
-        $(SVLLIB)		\
-        $(SALLIB)		\
-        $(SALHELPERLIB)		\
-        $(UNOTOOLSLIB)	\
-        $(BASEGFXLIB)
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=   $(LIB1TARGET)
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME    =$(SHL1TARGET)
-DEFLIB1NAME =xo
-DEF1DES     =XML Office Lib
-
-# --- Targets ----------------------------------------------------------
-.ENDIF
-.INCLUDE :  target.mk
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
new file mode 100755
index 0000000000..7fe2119636
--- /dev/null
+++ b/xmloff/util/xo.component
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="SchXMLExport.Compact">
+    <service name="com.sun.star.comp.Chart.XMLExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Content">
+    <service name="com.sun.star.comp.Chart.XMLContentExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Oasis.Compact">
+    <service name="com.sun.star.comp.Chart.XMLOasisExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Oasis.Content">
+    <service name="com.sun.star.comp.Chart.XMLOasisContentExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Oasis.Meta">
+    <service name="com.sun.star.comp.Chart.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Oasis.Styles">
+    <service name="com.sun.star.comp.Chart.XMLOasisStylesExporter"/>
+  </implementation>
+  <implementation name="SchXMLExport.Styles">
+    <service name="com.sun.star.comp.Chart.XMLStylesExporter"/>
+  </implementation>
+  <implementation name="SchXMLImport">
+    <service name="com.sun.star.comp.Chart.XMLOasisImporter"/>
+  </implementation>
+  <implementation name="SchXMLImport.Content">
+    <service name="com.sun.star.comp.Chart.XMLOasisContentImporter"/>
+  </implementation>
+  <implementation name="SchXMLImport.Meta">
+    <service name="com.sun.star.comp.Chart.XMLOasisMetaImporter"/>
+  </implementation>
+  <implementation name="SchXMLImport.Styles">
+    <service name="com.sun.star.comp.Chart.XMLOasisStylesImporter"/>
+  </implementation>
+  <implementation name="XMLDrawContentExportOOO">
+    <service name="com.sun.star.comp.Draw.XMLContentExporter"/>
+  </implementation>
+  <implementation name="XMLDrawContentExportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/>
+  </implementation>
+  <implementation name="XMLDrawExportOOO">
+    <service name="com.sun.star.comp.Draw.XMLExporter"/>
+  </implementation>
+  <implementation name="XMLDrawExportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisExporter"/>
+  </implementation>
+  <implementation name="XMLDrawImportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisImporter"/>
+  </implementation>
+  <implementation name="XMLDrawMetaExportOOO">
+    <service name="com.sun.star.comp.Draw.XMLMetaExporter"/>
+  </implementation>
+  <implementation name="XMLDrawMetaExportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="XMLDrawSettingsExportOOO">
+    <service name="com.sun.star.comp.Draw.XMLSettingsExporter"/>
+  </implementation>
+  <implementation name="XMLDrawSettingsExportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
+  </implementation>
+  <implementation name="XMLDrawStylesExportOOO">
+    <service name="com.sun.star.comp.Draw.XMLStylesExporter"/>
+  </implementation>
+  <implementation name="XMLDrawStylesExportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>
+  </implementation>
+  <implementation name="XMLDrawingLayerExport">
+    <service name="com.sun.star.comp.DrawingLayer.XMLExporter"/>
+  </implementation>
+  <implementation name="XMLImpressClipboardExport">
+    <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/>
+  </implementation>
+  <implementation name="XMLImpressContentExportOOO">
+    <service name="com.sun.star.comp.Impress.XMLContentExporter"/>
+  </implementation>
+  <implementation name="XMLImpressContentExportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/>
+  </implementation>
+  <implementation name="XMLImpressContentImportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisContentImporter"/>
+    <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/>
+  </implementation>
+  <implementation name="XMLImpressExportOOO">
+    <service name="com.sun.star.comp.Impress.XMLExporter"/>
+  </implementation>
+  <implementation name="XMLImpressExportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisExporter"/>
+  </implementation>
+  <implementation name="XMLImpressImportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisImporter"/>
+  </implementation>
+  <implementation name="XMLImpressMetaExportOOO">
+    <service name="com.sun.star.comp.Impress.XMLMetaExporter"/>
+  </implementation>
+  <implementation name="XMLImpressMetaExportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="XMLImpressMetaImportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisMetaImporter"/>
+    <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
+  </implementation>
+  <implementation name="XMLImpressSettingsExportOOO">
+    <service name="com.sun.star.comp.Impress.XMLSettingsExporter"/>
+  </implementation>
+  <implementation name="XMLImpressSettingsExportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/>
+  </implementation>
+  <implementation name="XMLImpressSettingsImportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/>
+    <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/>
+  </implementation>
+  <implementation name="XMLImpressStylesExportOOO">
+    <service name="com.sun.star.comp.Impress.XMLStylesExporter"/>
+  </implementation>
+  <implementation name="XMLImpressStylesExportOasis">
+    <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/>
+  </implementation>
+  <implementation name="XMLImpressStylesImportOasis">
+    <service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
+    <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/>
+  </implementation>
+  <implementation name="XMLMetaExportComponent">
+    <service name="com.sun.star.document.XMLOasisMetaExporter"/>
+  </implementation>
+  <implementation name="XMLMetaExportOOo">
+    <service name="com.sun.star.document.XMLMetaExporter"/>
+  </implementation>
+  <implementation name="XMLMetaImportComponent">
+    <service name="com.sun.star.document.XMLOasisMetaImporter"/>
+  </implementation>
+  <implementation name="XMLVersionListPersistence">
+    <service name="com.sun.star.document.DocumentRevisionListPersistence"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsExporter">
+    <service name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter">
+    <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"/>
+  </implementation>
+  <implementation name="xmloff::AnimationsImport">
+    <service name="com.sun.star.comp.Xmloff.AnimationsImport"/>
+  </implementation>
+</component>
diff --git a/xmloff/xml/components.xml b/xmloff/xml/components.xml
index 3929fa25df..3929fa25df 100644..100755
--- a/xmloff/xml/components.xml
+++ b/xmloff/xml/components.xml
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
index 020ceedd5a..020ceedd5a 100644..100755
--- a/xmlscript/dtd/dialog.dtd
+++ b/xmlscript/dtd/dialog.dtd
diff --git a/xmlscript/dtd/libraries.dtd b/xmlscript/dtd/libraries.dtd
index 383f37e213..383f37e213 100644..100755
--- a/xmlscript/dtd/libraries.dtd
+++ b/xmlscript/dtd/libraries.dtd
diff --git a/xmlscript/dtd/library.dtd b/xmlscript/dtd/library.dtd
index 80f687b9bf..80f687b9bf 100644..100755
--- a/xmlscript/dtd/library.dtd
+++ b/xmlscript/dtd/library.dtd
diff --git a/xmlscript/dtd/module.dtd b/xmlscript/dtd/module.dtd
index e0e7c843d4..e0e7c843d4 100644..100755
--- a/xmlscript/dtd/module.dtd
+++ b/xmlscript/dtd/module.dtd
diff --git a/xmlscript/inc/makefile.mk b/xmlscript/inc/makefile.mk
index 4141e88a28..4141e88a28 100644..100755
--- a/xmlscript/inc/makefile.mk
+++ b/xmlscript/inc/makefile.mk
diff --git a/xmlscript/inc/pch/precompiled_xmlscript.cxx b/xmlscript/inc/pch/precompiled_xmlscript.cxx
index b547ee8592..b547ee8592 100644..100755
--- a/xmlscript/inc/pch/precompiled_xmlscript.cxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.cxx
diff --git a/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx
index de77773593..de77773593 100644..100755
--- a/xmlscript/inc/pch/precompiled_xmlscript.hxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index b04d51521c..b04d51521c 100644..100755
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_helper.hxx
diff --git a/xmlscript/inc/xmlscript/xml_import.hxx b/xmlscript/inc/xmlscript/xml_import.hxx
index 93888bbc11..93888bbc11 100644..100755
--- a/xmlscript/inc/xmlscript/xml_import.hxx
+++ b/xmlscript/inc/xmlscript/xml_import.hxx
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 30d92bfc1b..30d92bfc1b 100644..100755
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index 874e56df04..874e56df04 100644..100755
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 6e1e042b2b..6e1e042b2b 100644..100755
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmlns.h b/xmlscript/inc/xmlscript/xmlns.h
index 79fe4e09c5..79fe4e09c5 100644..100755
--- a/xmlscript/inc/xmlscript/xmlns.h
+++ b/xmlscript/inc/xmlscript/xmlns.h
diff --git a/xmlscript/prj/build.lst b/xmlscript/prj/build.lst
index f3410c6686..388a59f134 100644..100755
--- a/xmlscript/prj/build.lst
+++ b/xmlscript/prj/build.lst
@@ -1,4 +1,4 @@
-xt	xmlscript :	comphelper tools offapi NULL
+xt	xmlscript :	comphelper tools offapi LIBXSLT:libxslt NULL
 xt	xmlscript							usr1	-	all	xt_mkout NULL
 xt	xmlscript\inc						nmake	-	all	xt_inc NULL
 xt	xmlscript\source\xml_helper			nmake	-	all	xt_xml_helper xt_inc NULL
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index 51b2891e49..2f1ff7e377 100644..100755
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -11,3 +11,4 @@ mkdir: %_DEST%\inc%_EXT%\xmlscript
 ..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
 
 ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
+..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index 817a06752c..817a06752c 100644..100755
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
diff --git a/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk
index dfac81bfa6..dfac81bfa6 100644..100755
--- a/xmlscript/source/misc/makefile.mk
+++ b/xmlscript/source/misc/makefile.mk
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 582b7184ef..ddf1f6c96f 100644..100755
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -114,15 +114,6 @@ extern "C"
 
     // -----------------------------------------------------------------------------
 
-    sal_Bool SAL_CALL component_writeInfo(
-        void * pServiceManager, void * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, ::xmlscript::s_entries );
-    }
-
-    // -----------------------------------------------------------------------------
-
     void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
diff --git a/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk
index 7b48695bae..7b48695bae 100644..100755
--- a/xmlscript/source/xml_helper/makefile.mk
+++ b/xmlscript/source/xml_helper/makefile.mk
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 777e3c6cae..777e3c6cae 100644..100755
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index dc12562c5c..dc12562c5c 100644..100755
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 66030642f3..66030642f3 100644..100755
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index 8cb48d6544..8cb48d6544 100644..100755
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 97800963dc..97800963dc 100644..100755
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 0717e32720..0717e32720 100644..100755
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
diff --git a/xmlscript/source/xmldlg_imexp/makefile.mk b/xmlscript/source/xmldlg_imexp/makefile.mk
index e0583aa78d..e0583aa78d 100644..100755
--- a/xmlscript/source/xmldlg_imexp/makefile.mk
+++ b/xmlscript/source/xmldlg_imexp/makefile.mk
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index 6564ee336f..6564ee336f 100644..100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 01f1efee03..01f1efee03 100644..100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 86e748815d..86e748815d 100644..100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index e09f2d6b51..e09f2d6b51 100644..100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index b5d61fd7dc..b5d61fd7dc 100644..100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
diff --git a/xmlscript/source/xmlflat_imexp/makefile.mk b/xmlscript/source/xmlflat_imexp/makefile.mk
index ed4d434afb..ed4d434afb 100644..100755
--- a/xmlscript/source/xmlflat_imexp/makefile.mk
+++ b/xmlscript/source/xmlflat_imexp/makefile.mk
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index ad84d720fb..ad84d720fb 100644..100755
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index b963521ae7..b963521ae7 100644..100755
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 21468d4205..21468d4205 100644..100755
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 567c5b6a31..567c5b6a31 100644..100755
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index f2ab0cc340..f2ab0cc340 100644..100755
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
diff --git a/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk
index c6ef65a433..c6ef65a433 100644..100755
--- a/xmlscript/source/xmllib_imexp/makefile.mk
+++ b/xmlscript/source/xmllib_imexp/makefile.mk
diff --git a/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index 62b2552ba0..62b2552ba0 100644..100755
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 15d29264e7..15d29264e7 100644..100755
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index 8a567294b7..8a567294b7 100644..100755
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
diff --git a/xmlscript/source/xmlmod_imexp/makefile.mk b/xmlscript/source/xmlmod_imexp/makefile.mk
index 174bf94c75..174bf94c75 100644..100755
--- a/xmlscript/source/xmlmod_imexp/makefile.mk
+++ b/xmlscript/source/xmlmod_imexp/makefile.mk
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
index 7ed227c9ef..7ed227c9ef 100644..100755
--- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 932d5cf8d6..932d5cf8d6 100644..100755
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index e481d87f61..e481d87f61 100644..100755
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
diff --git a/xmlscript/test/makefile.mk b/xmlscript/test/makefile.mk
index 2bf8f21161..2bf8f21161 100644..100755
--- a/xmlscript/test/makefile.mk
+++ b/xmlscript/test/makefile.mk
diff --git a/xmlscript/test/test.xml b/xmlscript/test/test.xml
index 41d45827a6..41d45827a6 100644..100755
--- a/xmlscript/test/test.xml
+++ b/xmlscript/test/test.xml
diff --git a/xmlscript/test/w3c.jpg b/xmlscript/test/w3c.jpg
index c541c20dcd..c541c20dcd 100644..100755
--- a/xmlscript/test/w3c.jpg
+++ b/xmlscript/test/w3c.jpg
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index a916c42e29..c10f31946a 100644..100755
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/util/makefile.mk
@@ -75,3 +75,11 @@ $(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt
     @echo ------------------------------
     @echo Making: $@
     $(TYPE) xcr.flt > $@
+
+ALLTAR : $(MISC)/xcr.component
+
+$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        xcr.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xcr.component
diff --git a/xmlscript/util/target.pmk b/xmlscript/util/target.pmk
index 907ec41dd9..907ec41dd9 100644..100755
--- a/xmlscript/util/target.pmk
+++ b/xmlscript/util/target.pmk
diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component
new file mode 100755
index 0000000000..5ffe7f862f
--- /dev/null
+++ b/xmlscript/util/xcr.component
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.xml.input.SaxDocumentHandler">
+    <service name="com.sun.star.xml.input.SaxDocumentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLBasicExporter">
+    <service name="com.sun.star.document.XMLBasicExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter">
+    <service name="com.sun.star.document.XMLBasicImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicExporter">
+    <service name="com.sun.star.document.XMLOasisBasicExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter">
+    <service name="com.sun.star.document.XMLOasisBasicImporter"/>
+  </implementation>
+</component>
diff --git a/xmlscript/util/xcr.flt b/xmlscript/util/xcr.flt
index e9a7f03440..e9a7f03440 100644..100755
--- a/xmlscript/util/xcr.flt
+++ b/xmlscript/util/xcr.flt